From 66864b58ed7bc2ef73c6d7c5bc17d018ee93c5fb Mon Sep 17 00:00:00 2001
From: David Puplava <dpuplava@lavatg.com>
Date: Tue, 30 Apr 2024 17:24:20 -0500
Subject: [PATCH 01/13] Rename workflow task to match updated view names to
 resolve missing shape runtime error

---
 .../Views/Items/UpdateXStatusTask.Fields.Design.cshtml      | 2 +-
 .../{UpdateTwitterStatusTask.cs => UpdateXStatusTask.cs}    | 6 +++---
 .../Drivers/UpdateTwitterStatusTaskDisplayDriver.cs         | 6 +++---
 .../OrchardCore.Twitter/Workflows/Startup.cs                | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/{UpdateTwitterStatusTask.cs => UpdateXStatusTask.cs} (92%)

diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXStatusTask.Fields.Design.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXStatusTask.Fields.Design.cshtml
index 0cea65299ce..746cc079599 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXStatusTask.Fields.Design.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXStatusTask.Fields.Design.cshtml
@@ -2,7 +2,7 @@
 @using OrchardCore.Workflows.ViewModels
 @using OrchardCore.Twitter.Workflows.Activities
 
-@model ActivityViewModel<UpdateTwitterStatusTask>
+@model ActivityViewModel<UpdateXStatusTask>
 
 <header>
     <h4><i class="fa-brands fa-x-twitter" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Update X Status"])</h4>
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateTwitterStatusTask.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateXStatusTask.cs
similarity index 92%
rename from src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateTwitterStatusTask.cs
rename to src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateXStatusTask.cs
index e2263c9d37d..b0ad9ce66d4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateTwitterStatusTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateXStatusTask.cs
@@ -9,16 +9,16 @@
 
 namespace OrchardCore.Twitter.Workflows.Activities
 {
-    public class UpdateTwitterStatusTask : TaskActivity<UpdateTwitterStatusTask>
+    public class UpdateXStatusTask : TaskActivity<UpdateXStatusTask>
     {
         private readonly TwitterClient _twitterClient;
         private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
         protected readonly IStringLocalizer S;
 
-        public UpdateTwitterStatusTask(
+        public UpdateXStatusTask(
             TwitterClient twitterClient,
             IWorkflowExpressionEvaluator expressionEvaluator,
-            IStringLocalizer<UpdateTwitterStatusTask> localizer
+            IStringLocalizer<UpdateXStatusTask> localizer
             )
         {
             _twitterClient = twitterClient;
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Drivers/UpdateTwitterStatusTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Drivers/UpdateTwitterStatusTaskDisplayDriver.cs
index c1d2bc26daa..45f4ecc0a3f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Drivers/UpdateTwitterStatusTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Drivers/UpdateTwitterStatusTaskDisplayDriver.cs
@@ -5,14 +5,14 @@
 
 namespace OrchardCore.Twitter.Workflows.Drivers
 {
-    public class UpdateTwitterStatusTaskDisplayDriver : ActivityDisplayDriver<UpdateTwitterStatusTask, UpdateTwitterStatusTaskViewModel>
+    public class UpdateTwitterStatusTaskDisplayDriver : ActivityDisplayDriver<UpdateXStatusTask, UpdateTwitterStatusTaskViewModel>
     {
-        protected override void EditActivity(UpdateTwitterStatusTask activity, UpdateTwitterStatusTaskViewModel model)
+        protected override void EditActivity(UpdateXStatusTask activity, UpdateTwitterStatusTaskViewModel model)
         {
             model.StatusTemplate = activity.StatusTemplate.Expression;
         }
 
-        protected override void UpdateActivity(UpdateTwitterStatusTaskViewModel model, UpdateTwitterStatusTask activity)
+        protected override void UpdateActivity(UpdateTwitterStatusTaskViewModel model, UpdateXStatusTask activity)
         {
             activity.StatusTemplate = new WorkflowExpression<string>(model.StatusTemplate);
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
index 3cb8bd5625e..279b1b772c2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
@@ -11,7 +11,7 @@ public class Startup : StartupBase
     {
         public override void ConfigureServices(IServiceCollection services)
         {
-            services.AddActivity<UpdateTwitterStatusTask, UpdateTwitterStatusTaskDisplayDriver>();
+            services.AddActivity<UpdateXStatusTask, UpdateTwitterStatusTaskDisplayDriver>();
         }
     }
 }

From 62af19b47fe6c3b551462488e03e51b5a50ae8e2 Mon Sep 17 00:00:00 2001
From: David Puplava <dpuplava@lavatg.com>
Date: Wed, 1 May 2024 23:04:24 -0500
Subject: [PATCH 02/13] Add data migration to update existing workflows to use
 updated Twiiter/X task name

---
 .../Migrations/TwitterMigrations.cs           | 53 +++++++++++++++++++
 .../OrchardCore.Twitter/Workflows/Startup.cs  |  3 ++
 2 files changed, 56 insertions(+)
 create mode 100644 src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterMigrations.cs

diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterMigrations.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterMigrations.cs
new file mode 100644
index 00000000000..6a0c63eeb9f
--- /dev/null
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterMigrations.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using OrchardCore.ContentManagement.Metadata;
+using OrchardCore.Data.Migration;
+using OrchardCore.Environment.Shell;
+using YesSql;
+
+namespace OrchardCore.Twitter.Migrations;
+
+public class TwitterMigrations : DataMigration
+{
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IStore _store;
+    private readonly ShellSettings _shellSettings;
+
+    public TwitterMigrations(IContentDefinitionManager contentDefinitionManager, IStore store, ShellSettings shellSettings)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+        _store = store;
+        _shellSettings = shellSettings;
+    }
+
+    public int Create()
+    {
+        return 2;
+    }
+
+    public int UpdateFrom1()
+    {
+        using var connection = _store.Configuration.ConnectionFactory.CreateConnection();
+        var tablePrefix = string.IsNullOrEmpty(_store.Configuration.TablePrefix) ? "" : _store.Configuration.TablePrefix + "_";
+        var sql = $@"
+                -- Updates Existing Workflows
+                UPDATE {tablePrefix}Document SET Content = REPLACE(content, 'UpdateTwitterStatusTask', 'UpdateXStatusTask')
+                WHERE Type = 'OrchardCore.Workflows.Models.WorkflowType, OrchardCore.Workflows.Abstractions';
+                ";
+
+        using var transaction = connection.BeginTransaction();
+        using var command = transaction.Connection.CreateCommand();
+
+        command.CommandText = sql;
+        command.CommandType = System.Data.CommandType.Text;
+
+        command.ExecuteNonQuery();
+
+        return 2;
+    }
+
+
+}
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
index 279b1b772c2..a08d4b94e57 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
@@ -1,5 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
+using OrchardCore.Data.Migration;
 using OrchardCore.Modules;
+using OrchardCore.Twitter.Migrations;
 using OrchardCore.Twitter.Workflows.Activities;
 using OrchardCore.Twitter.Workflows.Drivers;
 using OrchardCore.Workflows.Helpers;
@@ -12,6 +14,7 @@ public class Startup : StartupBase
         public override void ConfigureServices(IServiceCollection services)
         {
             services.AddActivity<UpdateXStatusTask, UpdateTwitterStatusTaskDisplayDriver>();
+            services.AddDataMigration<TwitterMigrations>();
         }
     }
 }

From ae4d618ba5a9b24e0544005ca9f1ae7e0b688e6d Mon Sep 17 00:00:00 2001
From: David Puplava <dpuplava@lavatg.com>
Date: Thu, 2 May 2024 23:39:49 -0500
Subject: [PATCH 03/13] Refactor content item migrations to match how it's done
 in Lucene Search and Users modules

---
 .../Migrations/TwitterMigrations.cs           | 75 ++++++++++++-------
 .../OrchardCore.Twitter.csproj                |  1 +
 .../OrchardCore.Twitter/Startup.cs            |  3 +
 .../OrchardCore.Twitter/Workflows/Startup.cs  |  1 -
 4 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterMigrations.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterMigrations.cs
index 6a0c63eeb9f..26ba03ea20c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterMigrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterMigrations.cs
@@ -1,52 +1,73 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using OrchardCore.ContentManagement.Metadata;
+using Dapper;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using OrchardCore.Data;
 using OrchardCore.Data.Migration;
 using OrchardCore.Environment.Shell;
+using OrchardCore.Environment.Shell.Descriptor.Models;
+using OrchardCore.Environment.Shell.Scope;
 using YesSql;
 
 namespace OrchardCore.Twitter.Migrations;
 
 public class TwitterMigrations : DataMigration
 {
-    private readonly IContentDefinitionManager _contentDefinitionManager;
-    private readonly IStore _store;
-    private readonly ShellSettings _shellSettings;
+    private readonly ShellDescriptor _shellDescriptor;
 
-    public TwitterMigrations(IContentDefinitionManager contentDefinitionManager, IStore store, ShellSettings shellSettings)
+    public TwitterMigrations(ShellDescriptor shellDescriptor)
     {
-        _contentDefinitionManager = contentDefinitionManager;
-        _store = store;
-        _shellSettings = shellSettings;
+        _shellDescriptor = shellDescriptor;
     }
 
     public int Create()
     {
-        return 2;
+        if (_shellDescriptor.WasFeatureAlreadyInstalled("OrchardCore.Twitter"))
+        {
+            Upgrade();
+        }
+
+        return 1;
     }
 
-    public int UpdateFrom1()
+    private void Upgrade()
     {
-        using var connection = _store.Configuration.ConnectionFactory.CreateConnection();
-        var tablePrefix = string.IsNullOrEmpty(_store.Configuration.TablePrefix) ? "" : _store.Configuration.TablePrefix + "_";
-        var sql = $@"
-                -- Updates Existing Workflows
-                UPDATE {tablePrefix}Document SET Content = REPLACE(content, 'UpdateTwitterStatusTask', 'UpdateXStatusTask')
-                WHERE Type = 'OrchardCore.Workflows.Models.WorkflowType, OrchardCore.Workflows.Abstractions';
-                ";
+        ShellScope.AddDeferredTask(async scope =>
+        {
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
+            var dbConnectionAccessor = scope.ServiceProvider.GetService<IDbConnectionAccessor>();
+            var logger = scope.ServiceProvider.GetService<ILogger<TwitterMigrations>>();
+            var tablePrefix = session.Store.Configuration.TablePrefix;
+            var documentTableName = session.Store.Configuration.TableNameConvention.GetDocumentTable();
+            var table = $"{session.Store.Configuration.TablePrefix}{documentTableName}";
+
+            logger.LogDebug("Updating Twitter/X Workflow Items");
+
+            await using var connection = dbConnectionAccessor.CreateConnection();
+            await connection.OpenAsync();
+            await using var transaction = await connection.BeginTransactionAsync(session.Store.Configuration.IsolationLevel);
+            var dialect = session.Store.Configuration.SqlDialect;
+
+            try
+            {
+                var quotedTableName = dialect.QuoteForTableName(table, session.Store.Configuration.Schema);
+                var quotedContentColumnName = dialect.QuoteForColumnName("Content");
+                var quotedTypeColumnName = dialect.QuoteForColumnName("Type");
 
-        using var transaction = connection.BeginTransaction();
-        using var command = transaction.Connection.CreateCommand();
+                var updateCmd = $"UPDATE {quotedTableName} SET {quotedContentColumnName} = REPLACE({quotedContentColumnName}, 'UpdateTwitterStatusTask', 'UpdateXStatusTask') WHERE {quotedTypeColumnName} = 'OrchardCore.Workflows.Models.WorkflowType, OrchardCore.Workflows.Abstractions'";
 
-        command.CommandText = sql;
-        command.CommandType = System.Data.CommandType.Text;
+                await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
 
-        command.ExecuteNonQuery();
+                await transaction.CommitAsync();
+            }
+            catch (Exception e)
+            {
+                await transaction.RollbackAsync();
+                logger.LogError(e, "An error occurred while updating Twitter/X Workflow Items");
 
-        return 2;
+                throw;
+            }
+        });
     }
 
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/OrchardCore.Twitter.csproj b/src/OrchardCore.Modules/OrchardCore.Twitter/OrchardCore.Twitter.csproj
index e5ae7e3dc0b..4a3f0c8417e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/OrchardCore.Twitter.csproj
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/OrchardCore.Twitter.csproj
@@ -20,6 +20,7 @@
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Admin.Abstractions\OrchardCore.Admin.Abstractions.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.ContentManagement.Abstractions\OrchardCore.ContentManagement.Abstractions.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Data.Abstractions\OrchardCore.Data.Abstractions.csproj" />
+    <ProjectReference Include="..\..\OrchardCore\OrchardCore.Data.YesSql\OrchardCore.Data.YesSql.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.DisplayManagement\OrchardCore.DisplayManagement.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Module.Targets\OrchardCore.Module.Targets.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Navigation.Core\OrchardCore.Navigation.Core.csproj" />
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs
index fbf9b8990a7..3f69bfc2583 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs
@@ -8,6 +8,7 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Http.Resilience;
 using Microsoft.Extensions.Options;
+using OrchardCore.Data.Migration;
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.Modules;
 using OrchardCore.Navigation;
@@ -15,6 +16,7 @@
 using OrchardCore.Security.Permissions;
 using OrchardCore.Settings;
 using OrchardCore.Twitter.Drivers;
+using OrchardCore.Twitter.Migrations;
 using OrchardCore.Twitter.Recipes;
 using OrchardCore.Twitter.Services;
 using OrchardCore.Twitter.Settings;
@@ -62,6 +64,7 @@ public override void ConfigureServices(IServiceCollection services)
                         }
                     })
                 );
+            services.AddDataMigration<TwitterMigrations>();
         }
 
         public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
index a08d4b94e57..568744037b8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
@@ -14,7 +14,6 @@ public class Startup : StartupBase
         public override void ConfigureServices(IServiceCollection services)
         {
             services.AddActivity<UpdateXStatusTask, UpdateTwitterStatusTaskDisplayDriver>();
-            services.AddDataMigration<TwitterMigrations>();
         }
     }
 }

From b3dd976c47b93feb09196116678657afef1a98f7 Mon Sep 17 00:00:00 2001
From: David Puplava <dpuplava@lavatg.com>
Date: Wed, 8 May 2024 09:03:17 -0500
Subject: [PATCH 04/13] Refactor unnecessary method call inline to calling
 method to remove warning as error build failure

---
 .../Migrations/TwitterMigrations.cs           | 69 +++++++++----------
 1 file changed, 31 insertions(+), 38 deletions(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterMigrations.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterMigrations.cs
index 26ba03ea20c..61fa9fa6d18 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterMigrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterMigrations.cs
@@ -24,51 +24,44 @@ public int Create()
     {
         if (_shellDescriptor.WasFeatureAlreadyInstalled("OrchardCore.Twitter"))
         {
-            Upgrade();
-        }
+            ShellScope.AddDeferredTask(async scope =>
+            {
+                var session = scope.ServiceProvider.GetRequiredService<ISession>();
+                var dbConnectionAccessor = scope.ServiceProvider.GetService<IDbConnectionAccessor>();
+                var logger = scope.ServiceProvider.GetService<ILogger<TwitterMigrations>>();
+                var tablePrefix = session.Store.Configuration.TablePrefix;
+                var documentTableName = session.Store.Configuration.TableNameConvention.GetDocumentTable();
+                var table = $"{session.Store.Configuration.TablePrefix}{documentTableName}";
 
-        return 1;
-    }
+                logger.LogDebug("Updating Twitter/X Workflow Items");
 
-    private void Upgrade()
-    {
-        ShellScope.AddDeferredTask(async scope =>
-        {
-            var session = scope.ServiceProvider.GetRequiredService<ISession>();
-            var dbConnectionAccessor = scope.ServiceProvider.GetService<IDbConnectionAccessor>();
-            var logger = scope.ServiceProvider.GetService<ILogger<TwitterMigrations>>();
-            var tablePrefix = session.Store.Configuration.TablePrefix;
-            var documentTableName = session.Store.Configuration.TableNameConvention.GetDocumentTable();
-            var table = $"{session.Store.Configuration.TablePrefix}{documentTableName}";
+                await using var connection = dbConnectionAccessor.CreateConnection();
+                await connection.OpenAsync();
+                await using var transaction = await connection.BeginTransactionAsync(session.Store.Configuration.IsolationLevel);
+                var dialect = session.Store.Configuration.SqlDialect;
 
-            logger.LogDebug("Updating Twitter/X Workflow Items");
+                try
+                {
+                    var quotedTableName = dialect.QuoteForTableName(table, session.Store.Configuration.Schema);
+                    var quotedContentColumnName = dialect.QuoteForColumnName("Content");
+                    var quotedTypeColumnName = dialect.QuoteForColumnName("Type");
 
-            await using var connection = dbConnectionAccessor.CreateConnection();
-            await connection.OpenAsync();
-            await using var transaction = await connection.BeginTransactionAsync(session.Store.Configuration.IsolationLevel);
-            var dialect = session.Store.Configuration.SqlDialect;
+                    var updateCmd = $"UPDATE {quotedTableName} SET {quotedContentColumnName} = REPLACE({quotedContentColumnName}, 'UpdateTwitterStatusTask', 'UpdateXStatusTask') WHERE {quotedTypeColumnName} = 'OrchardCore.Workflows.Models.WorkflowType, OrchardCore.Workflows.Abstractions'";
 
-            try
-            {
-                var quotedTableName = dialect.QuoteForTableName(table, session.Store.Configuration.Schema);
-                var quotedContentColumnName = dialect.QuoteForColumnName("Content");
-                var quotedTypeColumnName = dialect.QuoteForColumnName("Type");
+                    await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
 
-                var updateCmd = $"UPDATE {quotedTableName} SET {quotedContentColumnName} = REPLACE({quotedContentColumnName}, 'UpdateTwitterStatusTask', 'UpdateXStatusTask') WHERE {quotedTypeColumnName} = 'OrchardCore.Workflows.Models.WorkflowType, OrchardCore.Workflows.Abstractions'";
+                    await transaction.CommitAsync();
+                }
+                catch (Exception e)
+                {
+                    await transaction.RollbackAsync();
+                    logger.LogError(e, "An error occurred while updating Twitter/X Workflow Items");
 
-                await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
-
-                await transaction.CommitAsync();
-            }
-            catch (Exception e)
-            {
-                await transaction.RollbackAsync();
-                logger.LogError(e, "An error occurred while updating Twitter/X Workflow Items");
+                    throw;
+                }
+            });
+        }
 
-                throw;
-            }
-        });
+        return 1;
     }
-
-
 }

From b95fec767efda42642bfb10a58095d1d24f3927d Mon Sep 17 00:00:00 2001
From: David Puplava <dpuplava@lavatg.com>
Date: Thu, 15 Aug 2024 22:03:05 -0500
Subject: [PATCH 05/13] Format code

---
 .editorconfig                                 |    6 +-
 .gitattributes                                |    4 -
 Directory.Packages.props                      |    1 +
 .../OrchardCore.Commons.props                 |    5 +-
 .../AdminAreaControllerRouteMapper.cs         |   77 +-
 .../OrchardCore.Admin/AdminFilter.cs          |   85 +-
 .../OrchardCore.Admin/AdminMenu.cs            |   57 +-
 .../OrchardCore.Admin/AdminMenuFilter.cs      |  105 +-
 .../AdminPageRouteModelConvention.cs          |   41 +-
 .../AdminPageRouteModelProvider.cs            |  129 +-
 .../OrchardCore.Admin/AdminThemeSelector.cs   |   63 +-
 .../OrchardCore.Admin/AdminThemeService.cs    |   59 +-
 .../OrchardCore.Admin/AdminZoneFilter.cs      |   37 +-
 .../Controllers/AdminController.cs            |   13 +-
 .../Drivers/AdminSiteSettingsDisplayDriver.cs |   87 +-
 .../OrchardCore.Admin/Startup.cs              |  147 +-
 .../ViewModels/AdminSettingsViewModel.cs      |   15 +-
 .../Controllers/DashboardController.cs        |  283 ++-
 .../DashboardFeature.cs                       |    9 +-
 .../Drivers/DashboardContentDisplayDriver.cs  |  147 +-
 .../Drivers/DashboardPartDisplayDriver.cs     |   51 +-
 .../Indexes/DashboardPartIndex.cs             |   51 +-
 .../OrchardCore.AdminDashboard/Migrations.cs  |   87 +-
 .../Models/DashboardPart.cs                   |   13 +-
 .../Services/AdminDashboardService.cs         |   33 +-
 .../Services/IAdminDashboardService.cs        |   15 +-
 .../OrchardCore.AdminDashboard/Startup.cs     |   61 +-
 .../ViewModels/AdminDashboardViewModel.cs     |   19 +-
 .../ViewModels/DashboardPartViewModel.cs      |   23 +-
 .../ViewModels/DashboardWrapper.cs            |   14 +-
 .../OrchardCore.AdminMenu/AdminMenu.cs        |   55 +-
 .../AdminNodes/LinkAdminNode.cs               |   25 +-
 .../AdminNodes/LinkAdminNodeDriver.cs         |  119 +-
 .../LinkAdminNodeNavigationBuilder.cs         |  127 +-
 .../AdminNodes/LinkAdminNodeViewModel.cs      |   29 +-
 .../AdminNodes/PermissionViewModel.cs         |   11 +-
 .../AdminNodes/PlaceholderAdminNode.cs        |   21 +-
 .../AdminNodes/PlaceholderAdminNodeDriver.cs  |  103 +-
 .../PlaceholderAdminNodeNavigationBuilder.cs  |   81 +-
 .../PlaceholderAdminNodeViewModel.cs          |   23 +-
 .../Controllers/MenuController.cs             |  431 ++--
 .../Controllers/NodeController.cs             |  509 +++--
 .../Deployment/AdminMenuDeploymentSource.cs   |   57 +-
 .../Deployment/AdminMenuDeploymentStep.cs     |   17 +-
 .../AdminMenuDeploymentStepDriver.cs          |   27 +-
 .../Models/AdminMenuList.cs                   |   15 +-
 .../Recipes/AdminMenuStep.cs                  |   71 +-
 ...AdminMenuNavigationProvidersCoordinator.cs |   99 +-
 .../Services/AdminMenuService.cs              |   79 +-
 .../Services/IAdminMenuService.cs             |   57 +-
 .../OrchardCore.AdminMenu/Startup.cs          |   31 +-
 .../ViewModels/AdminMenuCreateViewModel.cs    |   11 +-
 .../ViewModels/AdminMenuEditViewModel.cs      |   13 +-
 .../ViewModels/AdminMenuListViewModel.cs      |   63 +-
 .../ViewModels/AdminNodeEditViewModel.cs      |   23 +-
 .../ViewModels/AdminNodeListViewModel.cs      |   11 +-
 .../Drivers/AliasPartDisplayDriver.cs         |   63 +-
 .../GraphQL/AliasInputObjectType.cs           |   15 +-
 .../GraphQL/AliasPartIndexAliasProvider.cs    |   29 +-
 .../GraphQL/AliasQueryObjectType.cs           |   15 +-
 .../OrchardCore.Alias/GraphQL/Startup.cs      |   19 +-
 .../Handlers/AliasPartHandler.cs              |  209 +-
 .../Indexes/AliasPartIndex.cs                 |  113 +-
 .../Indexing/AliasPartIndexHandler.cs         |   21 +-
 .../OrchardCore.Alias/Migrations.cs           |  143 +-
 .../OrchardCore.Alias/Models/AliasPart.cs     |   19 +-
 .../Models/AliasPartExtensions.cs             |   33 +-
 .../AliasPartContentHandleProvider.cs         |   45 +-
 .../Settings/AliasPartSettings.cs             |   31 +-
 .../AliasPartSettingsDisplayDriver.cs         |   79 +-
 .../Settings/AliasPartSettingsViewModel.cs    |   15 +-
 .../OrchardCore.Alias/Startup.cs              |   65 +-
 .../ViewModels/AliasPartViewModel.cs          |   21 +-
 .../OrchardCore.Apis.GraphQL/AdminMenu.cs     |   43 +-
 .../Controllers/AdminController.cs            |   15 +-
 .../Extensions/DocumentWriterExtensions.cs    |   41 +-
 .../GraphQLMiddleware.cs                      |  275 ++-
 .../GraphQLNamedQueryRequest.cs               |   17 +-
 .../OrchardFieldNameConverter.cs              |   39 +-
 .../Services/SchemaService.cs                 |  145 +-
 .../OrchardCore.Apis.GraphQL/Startup.cs       |  115 +-
 .../MaxNumberOfResultsValidationRule.cs       |   97 +-
 .../RequiresPermissionValidationRule.cs       |  173 +-
 .../Controllers/AdminController.cs            |  243 ++-
 .../Drivers/AuditTrailEventDisplayDriver.cs   |   53 +-
 .../Drivers/AuditTrailOptionsDisplayDriver.cs |  107 +-
 .../AuditTrailSettingsDisplayDriver.cs        |  167 +-
 ...AuditTrailTrimmingSettingsDisplayDriver.cs |   75 +-
 .../Indexes/AuditTrailEventIndexProvider.cs   |   37 +-
 .../OrchardCore.AuditTrail/Migrations.cs      |   55 +-
 .../Navigation/AuditTrailAdminMenu.cs         |   53 +-
 .../Navigation/AuditTrailSettingsAdminMenu.cs |   59 +-
 .../Services/AuditTrailBackgroundTask.cs      |   79 +-
 .../Services/AuditTrailIdGenerator.cs         |   19 +-
 .../Services/AuditTrailManager.cs             |  273 ++-
 .../Services/CorrelationIdFilterNode.cs       |   25 +-
 .../Services/DateTimeParser.cs                |  381 ++--
 .../DefaultAuditTrailAdminListFilterParser.cs |   21 +-
 ...efaultAuditTrailAdminListFilterProvider.cs |  357 ++--
 .../DefaultAuditTrailAdminListQueryService.cs |  191 +-
 .../Settings/AuditTrailCategorySettings.cs    |   11 +-
 .../Settings/AuditTrailEventSettings.cs       |   13 +-
 .../Settings/AuditTrailSettings.cs            |   11 +-
 .../Settings/AuditTrailTrimmingSettings.cs    |   13 +-
 .../OrchardCore.AuditTrail/Startup.cs         |  153 +-
 .../AuditTrailCategorySettingsViewModel.cs    |   15 +-
 .../AuditTrailEventSettingsViewModel.cs       |   23 +-
 .../ViewModels/AuditTrailEventViewModel.cs    |   11 +-
 .../ViewModels/AuditTrailItemViewModel.cs     |   11 +-
 .../ViewModels/AuditTrailListViewModel.cs     |   15 +-
 .../ViewModels/AuditTrailSettingsViewModel.cs |   11 +-
 .../AuditTrailTrimmingSettingsViewModel.cs    |   13 +-
 .../AutoSetupMiddleware.cs                    |  429 ++--
 .../Extensions/DistributedLockExtensions.cs   |   73 +-
 .../Options/AutoSetupOptions.cs               |   93 +-
 .../Options/LockOptions.cs                    |   25 +-
 .../Options/TenantSetupOptions.cs             |  291 ++-
 .../OrchardCore.AutoSetup/Startup.cs          |  165 +-
 .../Drivers/AutoroutePartDisplayDriver.cs     |  181 +-
 .../GraphQL/AutorouteInputObjectType.cs       |   15 +-
 .../AutoroutePartIndexAliasProvider.cs        |   29 +-
 .../GraphQL/AutorouteQueryObjectType.cs       |   15 +-
 .../OrchardCore.Autoroute/GraphQL/Startup.cs  |   19 +-
 .../Handlers/AutorouteContentHandler.cs       |   47 +-
 .../Handlers/AutoroutePartHandler.cs          |  629 +++---
 .../Handlers/DefaultRouteContentHandler.cs    |   45 +-
 .../Indexing/AutoroutePartIndexHandler.cs     |   25 +-
 .../OrchardCore.Autoroute/Migrations.cs       |  109 +-
 .../Models/AutoroutePartExtensions.cs         |   71 +-
 .../Models/AutoroutePartSettings.cs           |   87 +-
 .../AutorouteMetaWeblogDriver.cs              |   43 +-
 .../RemotePublishingStartup.cs                |   13 +-
 .../Routing/AutorouteTransformer.cs           |   53 +-
 .../Routing/AutorouteValuesAddressScheme.cs   |  127 +-
 .../AutoroutePartSettingsDisplayDriver.cs     |  115 +-
 .../Sitemaps/AutorouteContentTypeProvider.cs  |   59 +-
 .../OrchardCore.Autoroute/Startup.cs          |  117 +-
 .../AutoroutePartSettingsViewModel.cs         |   25 +-
 .../ViewModels/AutoroutePartViewModel.cs      |   33 +-
 .../OrchardCore.BackgroundTasks/AdminMenu.cs  |   41 +-
 .../Controllers/BackgroundTaskController.cs   |  409 ++--
 .../Services/AlwaysHasChangedToken.cs         |   49 +-
 .../Services/BackgroundTaskManager.cs         |   75 +-
 .../BackgroundTaskSettingsProvider.cs         |   37 +-
 .../OrchardCore.BackgroundTasks/Startup.cs    |   19 +-
 .../BackgroundTaskIndexViewModel.cs           |   31 +-
 .../ViewModels/BackgroundTaskViewModel.cs     |   29 +-
 .../ContentPickerAdminController.cs           |  147 +-
 ...lizationSetContentPickerAdminController.cs |  119 +-
 .../Controllers/UserPickerAdminController.cs  |  109 +-
 .../Drivers/BooleanFieldDisplayDriver.cs      |   53 +-
 .../ContentPickerFieldDisplayDriver.cs        |  167 +-
 .../Drivers/DateFieldDisplayDriver.cs         |   71 +-
 .../Drivers/DateTimeFieldDisplayDriver.cs     |   97 +-
 .../Drivers/HtmlFieldDisplayDriver.cs         |  143 +-
 .../Drivers/LinkFieldDisplayDriver.cs         |  177 +-
 ...ationSetContentPickerFieldDisplayDriver.cs |  139 +-
 .../Drivers/MultiTextFieldDisplayDriver.cs    |   93 +-
 .../Drivers/NumericFieldDisplayDriver.cs      |  151 +-
 .../Drivers/TextFieldDisplayDriver.cs         |   73 +-
 .../Drivers/TimeFieldDisplayDriver.cs         |   71 +-
 .../Drivers/UserPickerFieldDisplayDriver.cs   |  125 +-
 .../UserPickerFieldUserNamesDisplayDriver.cs  |   23 +-
 .../Drivers/YoutubeFieldDisplayDriver.cs      |  121 +-
 .../Fields/BooleanField.cs                    |    9 +-
 .../Fields/ContentPickerField.cs              |    9 +-
 .../Fields/DateField.cs                       |    9 +-
 .../Fields/DateTimeField.cs                   |    9 +-
 .../Fields/HtmlField.cs                       |    9 +-
 .../Fields/LinkField.cs                       |   13 +-
 .../LocalizationSetContentPickerField.cs      |   11 +-
 .../Fields/MultiTextField.cs                  |    9 +-
 .../Fields/NumericField.cs                    |    9 +-
 .../Fields/TextField.cs                       |    9 +-
 .../Fields/TimeField.cs                       |    9 +-
 .../Fields/UserNamesExtensions.cs             |   45 +-
 .../Fields/UserPickerField.cs                 |    9 +-
 .../Fields/YoutubeField.cs                    |   11 +-
 .../GraphQL/Fields/ContentFieldsProvider.cs   |  249 ++-
 .../Fields/ObjectGraphTypeFieldProvider.cs    |   81 +-
 .../GraphQL/Startup.cs                        |   35 +-
 .../ContentPickerFieldQueryObjectType.cs      |   45 +-
 .../GraphQL/Types/HtmlFieldQueryObjectType.cs |   91 +-
 .../GraphQL/Types/LinkFieldQueryObjectType.cs |   17 +-
 .../Types/UserPickerFieldQueryObjectType.cs   |   69 +-
 .../Indexing/BooleanFieldIndexHandler.cs      |   21 +-
 .../ContentPickerFieldIndexHandler.cs         |   35 +-
 .../Indexing/DateFieldIndexHandler.cs         |   21 +-
 .../Indexing/DateTimeFieldIndexHandler.cs     |   21 +-
 .../Indexing/HtmlFieldIndexHandler.cs         |   21 +-
 .../Indexing/LinkFieldIndexHandler.cs         |   25 +-
 ...zationSetContentPickerFieldIndexHandler.cs |   37 +-
 .../Indexing/MultiTextFieldIndexHandler.cs    |   23 +-
 .../Indexing/NumericFieldIndexHandler.cs      |   31 +-
 .../Indexing/SQL/BooleanFieldIndexProvider.cs |  123 +-
 .../Indexing/SQL/ContentFieldIndexProvider.cs |   27 +-
 .../SQL/ContentPickerFieldIndexProvider.cs    |  129 +-
 .../Indexing/SQL/DateFieldIndexProvider.cs    |  119 +-
 .../SQL/DateTimeFieldIndexProvider.cs         |  123 +-
 .../Indexing/SQL/HtmlFieldIndexProvider.cs    |  123 +-
 .../Indexing/SQL/LinkFieldIndexProvider.cs    |  147 +-
 .../Indexing/SQL/Migrations.cs                | 1555 ++++++++-------
 .../SQL/MultiTextFieldIndexProvider.cs        |  141 +-
 .../Indexing/SQL/NumericFieldIndexProvider.cs |  123 +-
 .../Indexing/SQL/TextFieldIndexProvider.cs    |  137 +-
 .../Indexing/SQL/TimeFieldIndexProvider.cs    |  123 +-
 .../SQL/UserPickerFieldIndexProvider.cs       |  127 +-
 .../Indexing/SQL/UserPickerMigrations.cs      |  147 +-
 .../Indexing/TextFieldIndexHandler.cs         |   21 +-
 .../Indexing/TimeFieldIndexHandler.cs         |   31 +-
 .../Indexing/UserPickerFieldIndexHandler.cs   |   47 +-
 .../Indexing/YoutubeFieldIndexHandler.cs      |   21 +-
 .../Media/MediaShapes.cs                      |   39 +-
 .../Media/Startup.cs                          |   13 +-
 .../OrchardCore.ContentFields/Migrations.cs   |  139 +-
 .../DefaultContentPickerResultProvider.cs     |   89 +-
 .../DefaultUserPickerResultProvider.cs        |   77 +-
 .../Settings/BooleanFieldSettings.cs          |   13 +-
 .../Settings/BooleanFieldSettingsDriver.cs    |   35 +-
 .../Settings/ContentPickerFieldSettings.cs    |   29 +-
 .../ContentPickerFieldSettingsDriver.cs       |  173 +-
 .../Settings/DateFieldSettings.cs             |   11 +-
 .../Settings/DateFieldSettingsDriver.cs       |   33 +-
 .../Settings/DateTimeFieldSettings.cs         |   11 +-
 .../Settings/DateTimeFieldSettingsDriver.cs   |   33 +-
 .../Settings/HtmlFieldMonacoEditorSettings.cs |    9 +-
 .../HtmlFieldMonacoEditorSettingsDriver.cs    |   81 +-
 .../Settings/HtmlFieldSettings.cs             |   13 +-
 .../Settings/HtmlFieldSettingsDriver.cs       |   39 +-
 .../HtmlFieldTrumbowygEditorSettings.cs       |   11 +-
 .../HtmlFieldTrumbowygEditorSettingsDriver.cs |   83 +-
 .../Settings/LinkFieldSettings.cs             |   53 +-
 .../Settings/LinkFieldSettingsDriver.cs       |   47 +-
 ...calizationSetContentPickerFieldSettings.cs |   17 +-
 ...tionSetContentPickerFieldSettingsDriver.cs |   39 +-
 .../Settings/MultiTextFieldSettings.cs        |   31 +-
 .../Settings/MultiTextFieldSettingsDriver.cs  |   69 +-
 .../Settings/NumericFieldSettings.cs          |   21 +-
 .../Settings/NumericFieldSettingsDriver.cs    |   43 +-
 .../TextFieldHeaderDisplaySettings.cs         |    9 +-
 .../TextFieldHeaderDisplaySettingsDriver.cs   |   39 +-
 .../Settings/TextFieldMonacoEditorSettings.cs |    9 +-
 .../TextFieldMonacoEditorSettingsDriver.cs    |   71 +-
 .../TextFieldPredefinedListEditorSettings.cs  |   55 +-
 ...FieldPredefinedListEditorSettingsDriver.cs |   77 +-
 .../Settings/TextFieldSettings.cs             |   13 +-
 .../Settings/TextFieldSettingsDriver.cs       |   35 +-
 .../Settings/TimeFieldSettings.cs             |   13 +-
 .../Settings/TimeFieldSettingsDriver.cs       |   35 +-
 .../Settings/UserPickerFieldSettings.cs       |   19 +-
 .../Settings/UserPickerFieldSettingsDriver.cs |  103 +-
 .../UserPickerFieldSettingsViewModel.cs       |   27 +-
 .../Settings/YoutubeFieldSettings.cs          |   17 +-
 .../Settings/YoutubeFieldSettingsDriver.cs    |   33 +-
 .../OrchardCore.ContentFields/Startup.cs      |  349 ++--
 .../DisplayBooleanFieldViewModel.cs           |   15 +-
 .../DisplayContentPickerFieldViewModel.cs     |   15 +-
 .../ViewModels/DisplayDateFieldViewModel.cs   |   15 +-
 .../DisplayDateTimeFieldViewModel.cs          |   17 +-
 .../ViewModels/DisplayHtmlFieldViewModel.cs   |   15 +-
 .../ViewModels/DisplayLinkFieldViewModel.cs   |   19 +-
 ...alizationSetContentPickerFieldViewModel.cs |   15 +-
 .../DisplayMultiTextFieldViewModel.cs         |   15 +-
 .../DisplayNumericFieldViewModel.cs           |   15 +-
 .../ViewModels/DisplayTextFieldViewModel.cs   |   15 +-
 .../ViewModels/DisplayTimeFieldViewModel.cs   |   15 +-
 ...isplayUserPickerFieldUserNamesViewModel.cs |   17 +-
 .../DisplayUserPickerFieldViewModel.cs        |   15 +-
 .../ViewModels/EditBooleanFieldViewModel.cs   |   15 +-
 .../EditContentPickerFieldViewModel.cs        |   19 +-
 .../ViewModels/EditDateFieldViewModel.cs      |   15 +-
 .../ViewModels/EditDateTimeFieldViewModel.cs  |   15 +-
 .../ViewModels/EditHtmlFieldViewModel.cs      |   15 +-
 .../ViewModels/EditLinkFieldViewModel.cs      |   19 +-
 ...alizationSetContentPickerFieldViewModel.cs |   19 +-
 .../ViewModels/EditMultiTextFieldViewModel.cs |   21 +-
 .../ViewModels/EditNumericFieldViewModel.cs   |   15 +-
 .../ViewModels/EditTextFieldViewModel.cs      |   15 +-
 .../ViewModels/EditTimeFieldViewModel.cs      |   15 +-
 .../EditUserPickerFieldViewModel.cs           |   41 +-
 .../ViewModels/EditYoutubeFieldViewModel.cs   |   19 +-
 .../ViewModels/HeaderSettingsViewModel.cs     |    9 +-
 .../ViewModels/HtmlSettingsViewModel.cs       |   11 +-
 .../ViewModels/MonacoSettingsViewModel.cs     |   11 +-
 .../MultiTextFieldSettingsViewModel.cs        |   13 +-
 .../PredefinedListSettingsViewModel.cs        |   13 +-
 .../ViewModels/TrumbowygSettingsViewModel.cs  |   11 +-
 .../ViewModels/VueMultiselectItemViewModel.cs |   19 +-
 .../YoutubeFieldDisplayViewModel.cs           |   17 +-
 .../AdminMenu.cs                              |   85 +-
 .../ContentRequestCultureProvider.cs          |   39 +-
 .../Controllers/AdminController.cs            |  127 +-
 .../ContentCulturePickerController.cs         |  101 +-
 .../CulturePickerOptions.cs                   |    9 +-
 .../DefaultContentLocalizationManager.cs      |  273 ++-
 .../ContentCulturePickerSettingsDriver.cs     |   75 +-
 ...entRequestCultureProviderSettingsDriver.cs |   73 +-
 ...alizationContentsAdminListDisplayDriver.cs |   99 +-
 .../Drivers/LocalizationPartDisplayDriver.cs  |  143 +-
 .../GraphQL/LocalizationInputObjectType.cs    |   17 +-
 .../LocalizationPartIndexAliasProvider.cs     |   29 +-
 .../GraphQL/LocalizationQueryObjectType.cs    |   47 +-
 .../GraphQL/Startup.cs                        |   19 +-
 ...ntentLocalizationPartHandlerCoordinator.cs |   93 +-
 .../Handlers/LocalizationPartHandler.cs       |  131 +-
 .../Indexing/LocalizationPartIndexHandler.cs  |   23 +-
 .../Liquid/ContentLocalizationFilter.cs       |   47 +-
 .../Liquid/SwitchCultureUrlFilter.cs          |   51 +-
 .../Migrations.cs                             |  141 +-
 .../Models/ContentCulturePickerSettings.cs    |   11 +-
 .../ContentRequestCultureProviderSettings.cs  |    9 +-
 .../LocalizeContentAuthorizationHandler.cs    |  103 +-
 .../ServiceCollectionExtensions.cs            |   29 +-
 .../Services/ContentCulturePickerService.cs   |  159 +-
 .../Services/IContentCulturePickerService.cs  |   45 +-
 .../Services/ILocalizationEntries.cs          |   13 +-
 .../Services/LocalizationEntries.cs           |  309 ++-
 ...LocalizationPartContentsAdminListFilter.cs |   43 +-
 ...tionPartContentsAdminListFilterProvider.cs |   45 +-
 .../Services/LocalizationStateDocument.cs     |    7 +-
 .../LocalizedContentItemsQueryProvider.cs     |  169 +-
 ...emapUrlHrefLangExtendedMetadataProvider.cs |   83 +-
 .../Startup.cs                                |  101 +-
 ...ocalizationContentsAdminFilterViewModel.cs |   15 +-
 .../ViewModels/LocalizationPartViewModel.cs   |   35 +-
 .../Controllers/PreviewController.cs          |  301 ++-
 .../Drivers/ContentPreviewDriver.cs           |   13 +-
 .../Handlers/PreviewPartHandler.cs            |   75 +-
 .../OrchardCore.ContentPreview/Migrations.cs  |   29 +-
 .../Models/PreviewPart.cs                     |   15 +-
 .../Models/PreviewPartSettings.cs             |   15 +-
 .../PreviewStartupFilter.cs                   |   67 +-
 .../ResourceManagementOptionsConfiguration.cs |   33 +-
 .../PreviewPartSettingsDisplayDriver.cs       |   73 +-
 .../OrchardCore.ContentPreview/Startup.cs     |   25 +-
 .../PreviewPartSettingsViewModel.cs           |   11 +-
 .../ViewModels/PreviewPartViewModel.cs        |   17 +-
 .../OrchardCore.ContentTypes/AdminMenu.cs     |   59 +-
 .../Controllers/AdminController.cs            | 1457 +++++++-------
 .../ContentDefinitionDeploymentSource.cs      |   59 +-
 .../ContentDefinitionDeploymentStep.cs        |   25 +-
 .../ContentDefinitionDeploymentStepDriver.cs  |   79 +-
 ...DeleteContentDefinitionDeploymentSource.cs |   29 +-
 .../DeleteContentDefinitionDeploymentStep.cs  |   23 +-
 ...teContentDefinitionDeploymentStepDriver.cs |   55 +-
 ...eplaceContentDefinitionDeploymentSource.cs |   59 +-
 .../ReplaceContentDefinitionDeploymentStep.cs |   19 +-
 ...ceContentDefinitionDeploymentStepDriver.cs |   79 +-
 .../ContentDefinitionDisplayCoordinator.cs    |  169 +-
 .../ContentPartSettingsDisplayDriver.cs       |   45 +-
 .../ContentTypePartSettingsDisplayDriver.cs   |   11 +-
 .../ContentTypeSettingsDisplayDriver.cs       |  175 +-
 .../DefaultContentDefinitionDisplayManager.cs |  355 ++--
 .../DefaultContentTypeDisplayDriver.cs        |   51 +-
 .../GraphQLContentTypePartSettingsDriver.cs   |   63 +-
 .../GraphQL/Startup.cs                        |   15 +-
 ...GraphQLContentTypePartSettingsViewModel.cs |   13 +-
 .../GraphQLContentTypeSettingsViewModel.cs    |   17 +-
 .../RecipeSteps/ContentDefinitionStep.cs      |  145 +-
 .../DeleteContentDefinitionStep.cs            |   59 +-
 .../ReplaceContentDefinitionStep.cs           |  117 +-
 .../Recipes/LuceneRecipeEventHandler.cs       |  101 +-
 .../Services/ContentDefinitionService.cs      |  765 ++++----
 .../Services/StereotypeService.cs             |   65 +-
 .../OrchardCore.ContentTypes/Startup.cs       |   59 +-
 .../ViewModels/AddFieldViewModel.cs           |   59 +-
 .../ViewModels/AddPartsViewModel.cs           |   55 +-
 .../ContentDefinitionStepViewModel.cs         |   13 +-
 .../ContentPartSettingsViewModel.cs           |   19 +-
 .../ContentTypeSettingsViewModel.cs           |   25 +-
 .../ViewModels/ContentTypeViewModel.cs        |   11 +-
 .../ViewModels/CreatePartViewModel.cs         |    9 +-
 .../ViewModels/CreateTypeViewModel.cs         |   11 +-
 .../DeleteContentDefinitionStepViewModel.cs   |   11 +-
 .../ViewModels/EditFieldViewModel.cs          |   49 +-
 .../ViewModels/EditPartViewModel.cs           |   69 +-
 .../ViewModels/EditTypePartViewModel.cs       |   61 +-
 .../ViewModels/EditTypeViewModel.cs           |   47 +-
 .../ViewModels/ListContentPartsViewModel.cs   |   11 +-
 .../ViewModels/ListContentTypesViewModel.cs   |   11 +-
 .../ReplaceContentDefinitionStepViewModel.cs  |    7 +-
 .../OrchardCore.Contents/AdminMenu.cs         |  153 +-
 .../AdminNodes/ContentTypesAdminNode.cs       |   23 +-
 .../AdminNodes/ContentTypesAdminNodeDriver.cs |  137 +-
 .../ContentTypesAdminNodeNavigationBuilder.cs |  187 +-
 .../ContentTypesAdminNodeViewModel.cs         |   25 +-
 .../AuditTrailContentController.cs            |  177 +-
 .../AuditTrailContentEventDisplayDriver.cs    |  177 +-
 .../Drivers/AuditTrailContentsDriver.cs       |   39 +-
 .../Drivers/AuditTrailPartDisplayDriver.cs    |   37 +-
 .../AuditTrailPartSettingsDisplayDriver.cs    |   51 +-
 .../ContentAuditTrailSettingsDisplayDriver.cs |   71 +-
 .../ContentOrchardHelperExtensions.cs         |   49 +-
 .../Handlers/AuditTrailContentHandler.cs      |  137 +-
 .../AuditTrail/Migrations.cs                  |   31 +-
 .../Models/AuditTrailContentEvent.cs          |   15 +-
 .../AuditTrail/Models/AuditTrailPart.cs       |   11 +-
 .../ContentAuditTrailEventConfiguration.cs    |   43 +-
 .../Services/ContentAuditTrailEventHandler.cs |   31 +-
 .../Settings/AuditTrailPartSettings.cs        |   11 +-
 .../Settings/ContentAuditTrailSettings.cs     |    9 +-
 .../AuditTrail/Startup.cs                     |   31 +-
 .../AuditTrailContentEventDetailViewModel.cs  |   13 +-
 .../AuditTrailContentEventViewModel.cs        |   29 +-
 .../AuditTrailPartSettingsViewModel.cs        |    9 +-
 .../ViewModels/AuditTrailPartViewModel.cs     |    9 +-
 .../ContentAuditTrailSettingsViewModel.cs     |    9 +-
 .../Controllers/AdminController.cs            | 1197 ++++++------
 .../Controllers/ItemController.cs             |   89 +-
 .../AddToDeploymentPlanContentDriver.cs       |   37 +-
 ...ymentPlanContentsAdminListDisplayDriver.cs |   33 +-
 .../AddToDeploymentPlanController.cs          |  191 +-
 .../AddToDeploymentPlanStartup.cs             |   17 +-
 .../ContentItemDeploymentSource.cs            |   67 +-
 .../ContentItemDeploymentStep.cs              |   21 +-
 .../ContentItemDeploymentStepDriver.cs        |   77 +-
 .../ContentItemDeploymentStepViewModel.cs     |   11 +-
 .../Deployment/AllContentDeploymentSource.cs  |   71 +-
 .../Deployment/AllContentDeploymentStep.cs    |   21 +-
 .../AllContentDeploymentStepDriver.cs         |   41 +-
 .../Deployment/ContentDeploymentSource.cs     |   79 +-
 .../Deployment/ContentDeploymentStep.cs       |   23 +-
 .../Deployment/ContentDeploymentStepDriver.cs |   47 +-
 .../DisplayJsonContentItemViewModel.cs        |   11 +-
 .../Download/DownloadContentDriver.cs         |   37 +-
 .../Deployment/Download/DownloadController.cs |  113 +-
 .../Deployment/Download/DownloadStartup.cs    |   13 +-
 ...xportContentToDeploymentTargetAdminMenu.cs |   57 +-
 ...tContentToDeploymentTargetContentDriver.cs |   83 +-
 ...entTargetContentsAdminListDisplayDriver.cs |   47 +-
 ...ntentToDeploymentTargetDeploymentSource.cs |  101 +-
 ...ContentToDeploymentTargetDeploymentStep.cs |   17 +-
 ...tToDeploymentTargetDeploymentStepDriver.cs |   27 +-
 ...portContentToDeploymentTargetMigrations.cs |   57 +-
 ...ExportContentToDeploymentTargetSettings.cs |   15 +-
 ...ToDeploymentTargetSettingsDisplayDriver.cs |   65 +-
 ...tentToDeploymentTargetSettingsViewModel.cs |    9 +-
 .../ExportContentToDeploymentTargetStartup.cs |   25 +-
 .../Drivers/ContentOptionsDisplayDriver.cs    |  109 +-
 .../Drivers/ContentsDriver.cs                 |  153 +-
 .../Drivers/DateEditorDriver.cs               |   71 +-
 .../Drivers/OwnerEditorDriver.cs              |  117 +-
 .../Feeds/CommonFeedItemBuilder.cs            |  109 +-
 .../OrchardCore.Contents/GraphQL/Startup.cs   |   13 +-
 .../Handlers/ContentsHandler.cs               |  121 +-
 .../Handlers/FullTextAspectContentHandler.cs  |   93 +-
 .../Indexing/AspectsContentIndexHandler.cs    |   61 +-
 .../Indexing/ContentItemIndexCoordinator.cs   |  113 +-
 .../Indexing/DefaultContentIndexHandler.cs    |   93 +-
 .../Indexing/FullTextContentIndexHandler.cs   |   39 +-
 .../Liquid/BuildDisplayFilter.cs              |   99 +-
 .../Liquid/ContentAnchorTag.cs                |  303 ++-
 .../Liquid/ContentItemFilter.cs               |   35 +-
 .../Liquid/ContentItemRecursionHelper.cs      |   51 +-
 .../Liquid/ContentItemTag.cs                  |   21 +-
 .../Liquid/DisplayTextFilter.cs               |   21 +-
 .../Liquid/DisplayUrlFilter.cs                |   65 +-
 .../Liquid/FullTextFilter.cs                  |  119 +-
 .../OrchardCore.Contents/Migrations.cs        |   29 +-
 .../OrchardCore.Contents/Models/CommonPart.cs |   15 +-
 .../Models/CommonPartSettings.cs              |   11 +-
 .../Models/FullTextAspectSettings.cs          |   43 +-
 .../Recipes/ContentStep.cs                    |   61 +-
 .../Scripting/ContentMethodsProvider.cs       |  119 +-
 .../OrchardCore.Contents/Scripting/Startup.cs |   15 +-
 .../Scripting/UrlMethodsProvider.cs           |   65 +-
 .../ContentTypeAuthorizationHandler.cs        |  129 +-
 .../Services/ContentItemIdHandleProvider.cs   |   23 +-
 .../Services/ContentTypeFilterNode.cs         |   25 +-
 .../DefaultContentsAdminListFilterParser.cs   |   21 +-
 .../DefaultContentsAdminListFilterProvider.cs |  385 ++--
 .../CommonPartSettingsDisplayDriver.cs        |   41 +-
 .../FullTextAspectSettingsDisplayDriver.cs    |   95 +-
 .../OrchardCore.Contents/Shapes.cs            |  127 +-
 .../ContentTypesSitemapSourceBuilder.cs       |  235 ++-
 .../ContentTypesSitemapSourceDriver.cs        |  193 +-
 ...tTypesSitemapSourceModifiedDateProvider.cs |   87 +-
 .../ContentTypesSitemapSourceUpdateHandler.cs |   91 +-
 .../ContentTypesSitemapSourceViewModel.cs     |   59 +-
 .../ContentTypesSitemapUpdateHandler.cs       |   33 +-
 .../DefaultContentItemsQueryProvider.cs       |   93 +-
 .../OrchardCore.Contents/Startup.cs           |  381 ++--
 .../DisplayContentItemViewComponent.cs        |   55 +-
 .../SelectContentTypesViewComponent.cs        |   47 +-
 .../AllContentDeploymentStepViewModel.cs      |    9 +-
 .../ViewModels/CommonPartSettingsViewModel.cs |   11 +-
 .../ContentDeploymentStepViewModel.cs         |   11 +-
 .../ViewModels/DateEditorViewModel.cs         |    9 +-
 .../FullTextAspectSettingsViewModel.cs        |   15 +-
 .../ViewModels/IndexingEditorViewModel.cs     |    9 +-
 .../ViewModels/ListContentTypesViewModel.cs   |    9 +-
 .../ViewModels/ListContentsViewModel.cs       |   21 +-
 .../ViewModels/OwnerEditorViewModel.cs        |    9 +-
 .../ViewModels/SelectContentTypesViewModel.cs |   45 +-
 .../Workflows/Activities/ContentActivity.cs   |  259 ++-
 .../Activities/ContentCreatedEvent.cs         |   23 +-
 .../Activities/ContentDeletedEvent.cs         |   23 +-
 .../Activities/ContentDraftSavedEvent.cs      |   23 +-
 .../Workflows/Activities/ContentEvent.cs      |   65 +-
 .../Activities/ContentPublishedEvent.cs       |   23 +-
 .../Workflows/Activities/ContentTask.cs       |   17 +-
 .../Activities/ContentUnpublishedEvent.cs     |   23 +-
 .../Activities/ContentUpdatedEvent.cs         |   23 +-
 .../Activities/ContentVersionedEvent.cs       |   21 +-
 .../Workflows/Activities/CreateContentTask.cs |  175 +-
 .../Workflows/Activities/DeleteContentTask.cs |   73 +-
 .../Activities/PublishContentTask.cs          |   75 +-
 .../Activities/RetrieveContentTask.cs         |   61 +-
 .../Activities/UnpublishContentTask.cs        |   75 +-
 .../Workflows/Activities/UpdateContentTask.cs |  227 ++-
 .../ContentCreatedEventDisplayDriver.cs       |   11 +-
 .../ContentDeletedEventDisplayDriver.cs       |   11 +-
 .../ContentDraftSavedEventDisplayDriver.cs    |   11 +-
 .../Drivers/ContentEventDisplayDriver.cs      |   79 +-
 .../ContentPublishedEventDisplayDriver.cs     |   11 +-
 .../Drivers/ContentTaskDisplayDriver.cs       |   17 +-
 .../ContentUnpublishedEventDisplayDriver.cs   |   11 +-
 .../ContentUpdatedEventDisplayDriver.cs       |   11 +-
 .../ContentVersionedEventDisplayDriver.cs     |   11 +-
 .../Drivers/CreateContentTaskDisplayDriver.cs |   45 +-
 .../Drivers/DeleteContentTaskDisplayDriver.cs |   19 +-
 .../PublishContentTaskDisplayDriver.cs        |   19 +-
 .../RetrieveContentTaskDisplayDriver.cs       |   19 +-
 .../UnpublishContentTaskDisplayDriver.cs      |   19 +-
 .../Drivers/UpdateContentTaskDisplayDriver.cs |   45 +-
 .../Handlers/ContentItemSerializer.cs         |   51 +-
 .../Workflows/Handlers/ContentsHandler.cs     |   99 +-
 .../OrchardCore.Contents/Workflows/Startup.cs |   41 +-
 .../ContentCreatedEventViewModel.cs           |    7 +-
 .../ContentDeletedEventViewModel.cs           |    7 +-
 .../ContentDraftSavedEventViewModel.cs        |    7 +-
 .../ViewModels/ContentEventViewModel.cs       |   23 +-
 .../ContentPublishedEventViewModel.cs         |    7 +-
 .../ViewModels/ContentTaskViewModel.cs        |   17 +-
 .../ContentUnpublishedEventViewModel.cs       |    7 +-
 .../ContentUpdatedEventViewModel.cs           |    7 +-
 .../ContentVersionedEventViewModel.cs         |    7 +-
 .../ViewModels/CreateContentTaskViewModel.cs  |   17 +-
 .../ViewModels/DeleteContentTaskViewModel.cs  |   15 +-
 .../ViewModels/PublishContentTaskViewModel.cs |   15 +-
 .../RetrieveContentTaskViewModel.cs           |   15 +-
 .../UnpublishContentTaskViewModel.cs          |   15 +-
 .../ViewModels/UpdateContentTaskViewModel.cs  |   19 +-
 .../OrchardCore.Cors/AdminMenu.cs             |   49 +-
 .../Controllers/AdminController.cs            |  207 +-
 .../Services/CorsOptionsConfiguration.cs      |  117 +-
 .../OrchardCore.Cors/Services/CorsService.cs  |   35 +-
 .../Settings/CorsPolicySetting.cs             |   27 +-
 .../OrchardCore.Cors/Settings/CorsSettings.cs |    9 +-
 .../OrchardCore.Cors/Startup.cs               |   33 +-
 .../ViewModels/CorsPolicyViewModel.cs         |   27 +-
 .../ViewModels/CorsSettingsViewModel.cs       |   11 +-
 .../OrchardCore.CustomSettings/AdminMenu.cs   |   79 +-
 .../CustomSettingsDeploymentSource.cs         |   63 +-
 .../CustomSettingsDeploymentStep.cs           |   17 +-
 .../CustomSettingsDeploymentStepDriver.cs     |   73 +-
 .../Drivers/CustomSettingsDisplayDriver.cs    |   93 +-
 .../Recipes/CustomSettingsStep.cs             |   49 +-
 .../CustomSettingsAuthorizationHandler.cs     |   57 +-
 .../Services/CustomSettingsService.cs         |  175 +-
 .../OrchardCore.CustomSettings/Startup.cs     |   53 +-
 .../CustomSettingsDeploymentStepViewModel.cs  |   13 +-
 .../ViewModels/CustomSettingsEditViewModel.cs |    9 +-
 .../OrchardCore.Demo/AdminMenu.cs             |   85 +-
 .../OrchardCore.Demo/Commands/DemoCommands.cs |   31 +-
 .../Components/FakeViewComponent.cs           |   11 +-
 .../TestContentElementDisplayDriver.cs        |  119 +-
 .../Controllers/AdminController.cs            |   11 +-
 .../Controllers/ContentApiController.cs       |   91 +-
 .../Controllers/ContentController.cs          |  137 +-
 .../Controllers/DemoController.cs             |   35 +-
 .../Controllers/HomeController.cs             |  213 +-
 .../Controllers/TodoController.cs             |  157 +-
 .../Drivers/UserProfileDisplayDriver.cs       |   63 +-
 .../OrchardCore.Demo/GraphQL/Startup.cs       |  135 +-
 .../GraphQL/TestQueryObjectType.cs            |   17 +-
 .../Middlewares/BlockingMiddleware.cs         |   29 +-
 .../Middlewares/NonBlockingMiddleware.cs      |   27 +-
 .../OrchardCore.Demo/Migrations.cs            |   31 +-
 .../Models/CustomViewModel.cs                 |    9 +-
 .../OrchardCore.Demo/Models/FakeShape.cs      |    9 +-
 .../OrchardCore.Demo/Models/HomeViewModel.cs  |   11 +-
 .../Models/TestContentField.cs                |    9 +-
 .../Models/TestContentPartA.cs                |   11 +-
 .../Models/TestContentPartAShape.cs           |    9 +-
 .../OrchardCore.Demo/Models/TodoModel.cs      |   15 +-
 .../OrchardCore.Demo/Models/UserProfile.cs    |   15 +-
 .../Pages/Foo/Admin/Edit.cshtml.cs            |  127 +-
 .../OrchardCore.Demo/Pages/Foo/List.cshtml.cs |   85 +-
 .../Services/TestBackgroundTask.cs            |   17 +-
 .../Services/TestDependency.cs                |   27 +-
 .../Services/UserProfileClaimsProvider.cs     |   69 +-
 .../OrchardCore.Demo/Shapes/BazTagHelper.cs   |   23 +-
 .../Shapes/DemoShapeProvider.cs               |   37 +-
 .../OrchardCore.Demo/Startup.cs               |  179 +-
 .../TagHelpers/BazTagHelper.cs                |   15 +-
 .../ViewModels/EditUserProfileViewModel.cs    |   13 +-
 .../ViewModels/TodoViewModel.cs               |   55 +-
 .../AdminMenu.cs                              |   55 +-
 .../ExportRemoteInstanceController.cs         |  171 +-
 .../ImportRemoteInstanceController.cs         |  155 +-
 .../Controllers/RemoteClientController.cs     |  383 ++--
 .../Controllers/RemoteInstanceController.cs   |  407 ++--
 .../Models/RemoteClient.cs                    |   13 +-
 .../Models/RemoteClientList.cs                |    9 +-
 .../Models/RemoteInstance.cs                  |   17 +-
 .../Models/RemoteInstanceList.cs              |    9 +-
 .../Services/RemoteClientService.cs           |  125 +-
 .../RemoteInstanceDeploymentTargetProvider.cs |   57 +-
 .../Services/RemoteInstanceService.cs         |  113 +-
 .../OrchardCore.Deployment.Remote/Startup.cs  |   21 +-
 .../ViewModels/EditRemoteClientViewModel.cs   |   13 +-
 .../ViewModels/EditRemoteInstanceViewModel.cs |   17 +-
 .../ViewModels/ImportViewModel.cs             |   13 +-
 .../ViewModels/RemoteClientIndexViewModel.cs  |   43 +-
 .../RemoteInstanceIndexViewModel.cs           |   15 +-
 .../OrchardCore.Deployment/AdminMenu.cs       |   65 +-
 .../Controllers/DeploymentPlanController.cs   |  473 +++--
 .../Controllers/ExportFileController.cs       |   99 +-
 .../Controllers/ImportController.cs           |  261 ++-
 .../Controllers/StepController.cs             |  369 ++--
 .../DeploymentPlanDeploymentSource.cs         |  109 +-
 .../DeploymentPlanDeploymentStep.cs           |   23 +-
 .../DeploymentPlanDeploymentStepDriver.cs     |   73 +-
 .../DeploymentPlanService.cs                  |  155 +-
 .../Indexes/DeploymentPlanIndex.cs            |   33 +-
 .../OrchardCore.Deployment/Migrations.cs      |   17 +-
 .../Recipes/DeploymentPlansRecipeStep.cs      |  135 +-
 .../FileDownloadDeploymentTargetProvider.cs   |   49 +-
 .../OrchardCore.Deployment/Startup.cs         |   37 +-
 .../Steps/CustomFileDeploymentSource.cs       |   17 +-
 .../Steps/CustomFileDeploymentStep.cs         |   25 +-
 .../Steps/CustomFileDeploymentStepDriver.cs   |   43 +-
 .../Steps/JsonRecipeDeploymentSource.cs       |   19 +-
 .../Steps/JsonRecipeDeploymentStep.cs         |   21 +-
 .../Steps/JsonRecipeDeploymentStepDriver.cs   |   89 +-
 .../Steps/RecipeFileDeploymentStep.cs         |   37 +-
 .../Steps/RecipeFileDeploymentStepDriver.cs   |   75 +-
 .../CreateDeploymentPlanViewModel.cs          |   11 +-
 .../CustomFileDeploymentStepViewModel.cs      |   11 +-
 .../DeploymentPlanDeploymentStepViewModel.cs  |   13 +-
 .../DeploymentPlanIndexViewModel.cs           |   47 +-
 .../DisplayDeploymentPlanViewModel.cs         |   13 +-
 .../EditDeploymentPlanStepViewModel.cs        |   19 +-
 .../ViewModels/EditDeploymentPlanViewModel.cs |   13 +-
 .../ViewModels/ImportJsonViewModel.cs         |    9 +-
 .../JsonRecipeDeploymentStepViewModel.cs      |   13 +-
 .../RecipeFileDeploymentStepViewModel.cs      |   25 +-
 .../DiagnosticsStartupFilter.cs               |   59 +-
 .../OrchardCore.Diagnostics/Startup.cs        |   29 +-
 .../CacheContextEntryExtensions.cs            |   21 +-
 .../CacheOptionsConfiguration.cs              |   61 +-
 .../CachedShapeWrapperShapes.cs               |   45 +-
 .../DynamicCacheShapeDisplayEvents.cs         |  175 +-
 .../Models/CacheContextModel.cs               |   85 +-
 .../Services/DefaultDynamicCache.cs           |   39 +-
 .../Services/DefaultDynamicCacheService.cs    |  289 ++-
 .../OrchardCore.DynamicCache/Startup.cs       |   47 +-
 .../TagHelpers/CacheDependencyTagHelper.cs    |   55 +-
 .../TagHelpers/DynamicCacheTagHelper.cs       |  431 ++--
 .../DynamicCacheTagHelperService.cs           |    9 +-
 .../Models/DefaultAzureEmailOptions.cs        |    2 +-
 .../OrchardCore.Email/AdminMenu.cs            |   73 +-
 .../OrchardCoreBuilderExtensions.cs           |   27 +-
 .../OrchardCore.Email/Startup.cs              |   19 +-
 .../ViewModels/EmailSettingsBaseViewModel.cs  |    2 +-
 .../Workflows/Activities/EmailTask.cs         |  213 +-
 .../Drivers/EmailTaskDisplayDriver.cs         |   51 +-
 .../OrchardCore.Email/Workflows/Startup.cs    |   13 +-
 .../ViewModels/EmailTaskViewModel.cs          |   25 +-
 .../FacebookLoginDeploymentSource.cs          |   41 +-
 .../Deployment/FacebookLoginDeploymentStep.cs |   17 +-
 .../FacebookLoginDeploymentStepDriver.cs      |   27 +-
 .../Drivers/FacebookSettingsDisplayDriver.cs  |  149 +-
 .../OrchardCoreBuilderExtensions.cs           |   19 +-
 .../Filters/FBInitFilter.cs                   |   47 +-
 .../FacebookLoginConfiguration.cs             |  173 +-
 .../FacebookLoginSettingsDisplayDriver.cs     |   81 +-
 .../Recipes/FacebookLoginSettingsStep.cs      |   47 +-
 .../Login/Services/FacebookLoginService.cs    |   67 +-
 .../Login/Services/IFacebookLoginService.cs   |   15 +-
 .../Login/Settings/FacebookLoginSettings.cs   |   11 +-
 .../FacebookLoginSettingsViewModel.cs         |   13 +-
 .../Recipes/FacebookSettingsStep.cs           |   71 +-
 .../ResourceManagementOptionsConfiguration.cs |   33 +-
 .../OrchardCore.Facebook/ScriptsMiddleware.cs |   73 +-
 .../Services/FacebookService.cs               |   77 +-
 .../Services/IFacebookService.cs              |   13 +-
 .../Settings/FacebookSettings.cs              |   19 +-
 .../OrchardCore.Facebook/Startup.cs           |   39 +-
 .../OrchardCore.Facebook/StartupLogin.cs      |   51 +-
 .../OrchardCore.Facebook/StartupWidgets.cs    |   23 +-
 .../ViewModels/ErrorViewModel.cs              |   11 +-
 .../ViewModels/FacebookSettingsViewModel.cs   |   29 +-
 .../FacebookPluginPartDisplayDriver.cs        |  123 +-
 .../Handlers/FacebookPluginPartHandler.cs     |   57 +-
 .../Widgets/Models/FacebookPluginPart.cs      |    9 +-
 .../Settings/FacebookPluginPartSettings.cs    |    9 +-
 ...FacebookPluginPartSettingsDisplayDriver.cs |   63 +-
 .../FacebookPluginPartSettingsViewModel.cs    |   13 +-
 .../ViewModels/FacebookPluginPartViewModel.cs |   23 +-
 .../Widgets/WidgetMigrations.cs               |   39 +-
 .../OrchardCore.Features/AdminMenu.cs         |   55 +-
 .../Controllers/AdminController.cs            |  335 ++--
 .../Deployment/AllFeaturesDeploymentSource.cs |   45 +-
 .../Deployment/AllFeaturesDeploymentStep.cs   |   21 +-
 .../AllFeaturesDeploymentStepDriver.cs        |   41 +-
 .../Models/ModuleEntry.cs                     |   61 +-
 .../Recipes/Executors/FeatureStep.cs          |   57 +-
 .../Services/IModuleService.cs                |   61 +-
 .../Services/ModuleService.cs                 |  271 ++-
 .../OrchardCore.Features/Startup.cs           |   25 +-
 .../AllFeaturesDeploymentStepViewModel.cs     |    9 +-
 .../ViewModels/FeaturesViewModel.cs           |   19 +-
 .../ViewModels/ModulesIndexViewModel.cs       |   23 +-
 .../Controllers/FeedController.cs             |  117 +-
 .../OrchardCore.Feeds/Startup.cs              |   11 +-
 .../Controllers/AdminController.cs            |  197 +-
 .../Drivers/BagPartDisplayDriver.cs           |  367 ++--
 .../Drivers/FlowMetadataDisplayDriver.cs      |   47 +-
 .../Drivers/FlowPartDisplayDriver.cs          |  191 +-
 .../GraphQL/BagPartQueryObjectType.cs         |   21 +-
 .../GraphQL/FlowAlignmentEnum.cs              |   21 +-
 .../GraphQL/FlowMetadataContentTypeBuilder.cs |   19 +-
 .../GraphQL/FlowMetadataQueryObjectType.cs    |   15 +-
 .../GraphQL/FlowPartQueryObjectType.cs        |   19 +-
 .../OrchardCore.Flows/GraphQL/Startup.cs      |   19 +-
 .../Handlers/BagPartHandler.cs                |   25 +-
 .../Indexing/BagPartIndexHandler.cs           |   55 +-
 .../Indexing/FlowPartIndexHandler.cs          |   55 +-
 .../OrchardCore.Flows/Migrations.cs           |   85 +-
 .../OrchardCore.Flows/Models/BagPart.cs       |   11 +-
 .../Models/BagPartSettings.cs                 |   13 +-
 .../OrchardCore.Flows/Models/FlowMetadata.cs  |   25 +-
 .../OrchardCore.Flows/Models/FlowPart.cs      |   11 +-
 .../Models/FlowPartSettings.cs                |    9 +-
 .../Settings/BagPartSettingsDisplayDriver.cs  |  149 +-
 .../Settings/FlowPartSettingsDisplayDriver.cs |   61 +-
 .../OrchardCore.Flows/Startup.cs              |   63 +-
 .../ViewModels/BagPartEditViewModel.cs        |   35 +-
 .../ViewModels/BagPartSettingsViewModel.cs    |   19 +-
 .../ViewModels/BagPartViewModel.cs            |   21 +-
 .../ViewModels/BagPartWidgetViewModel.cs      |   17 +-
 .../ViewModels/BuildEditorViewModel.cs        |    9 +-
 .../ViewModels/FlowPartEditViewModel.cs       |   35 +-
 .../ViewModels/FlowPartSettingsViewModel.cs   |   13 +-
 .../ViewModels/FlowPartViewModel.cs           |   15 +-
 .../Drivers/ButtonPartDisplayDriver.cs        |   43 +-
 .../Drivers/FormContentDisplayDriver.cs       |   27 +-
 .../Drivers/FormElementPartDisplayDriver.cs   |   29 +-
 .../FormInputElementPartDisplayDriver.cs      |   51 +-
 .../Drivers/FormPartDisplayDriver.cs          |   49 +-
 .../Drivers/InputPartDisplayDriver.cs         |   45 +-
 .../Drivers/LabelPartDisplayDriver.cs         |   37 +-
 .../Drivers/SelectPartDisplayDriver.cs        |   71 +-
 .../Drivers/TextAreaPartDisplayDriver.cs      |   41 +-
 .../Drivers/ValidationPartDisplayDriver.cs    |   37 +-
 .../ValidationSummaryPartDisplayDriver.cs     |   39 +-
 .../Filters/ExportModelStateAttribute.cs      |   47 +-
 .../Filters/ImportModelStateAttribute.cs      |   39 +-
 .../Filters/ImportModelStatePageFilter.cs     |   49 +-
 .../Filters/ModelStateTransferAttribute.cs    |    9 +-
 .../GraphQL/ButtonPartQueryObjectType.cs      |   15 +-
 .../GraphQL/FormElementPartQueryObjectType.cs |   13 +-
 .../FormInputElementPartQueryObjectType.cs    |   13 +-
 .../GraphQL/FormPartQueryObjectType.cs        |   17 +-
 .../GraphQL/InputPartQueryObjectType.cs       |   17 +-
 .../GraphQL/LabelPartQueryObjectType.cs       |   15 +-
 .../OrchardCore.Forms/GraphQL/Startup.cs      |   31 +-
 .../GraphQL/TextAreaPartQueryObjectType.cs    |   15 +-
 .../GraphQL/ValidationPartQueryObjectType.cs  |   13 +-
 .../ValidationSummaryPartQueryObjectType.cs   |   11 +-
 .../Helpers/ModelStateHelpers.cs              |   61 +-
 .../OrchardCore.Forms/Migrations.cs           |  523 +++--
 .../OrchardCore.Forms/Models/ButtonPart.cs    |   11 +-
 .../Models/FormElementPart.cs                 |   15 +-
 .../Models/FormInputElementPart.cs            |   15 +-
 .../OrchardCore.Forms/Models/FormPart.cs      |   23 +-
 .../OrchardCore.Forms/Models/InputPart.cs     |   13 +-
 .../OrchardCore.Forms/Models/LabelPart.cs     |    9 +-
 .../OrchardCore.Forms/Models/SelectPart.cs    |   35 +-
 .../OrchardCore.Forms/Models/TextAreaPart.cs  |   11 +-
 .../Models/ValidationPart.cs                  |    9 +-
 .../Models/ValidationSummaryPart.cs           |    9 +-
 .../OrchardCore.Forms/Startup.cs              |  109 +-
 .../ViewModels/ButtonPartEditViewModel.cs     |   13 +-
 .../FormElementPartEditViewModel.cs           |    9 +-
 .../FormInputElementPartEditViewModel.cs      |    9 +-
 .../ViewModels/FormPartEditViewModel.cs       |   19 +-
 .../ViewModels/InputPartEditViewModel.cs      |   13 +-
 .../ViewModels/LabelPartEditViewModel.cs      |    9 +-
 .../ViewModels/SelectPartEditViewModel.cs     |   13 +-
 .../ViewModels/TextAreaPartEditViewModel.cs   |   11 +-
 .../ViewModels/ValidationPartEditViewModel.cs |   11 +-
 .../Activities/AddModelValidationErrorTask.cs |   85 +-
 .../Activities/BindModelStateTask.cs          |   65 +-
 .../ValidateAntiforgeryTokenTask.cs           |   61 +-
 .../Activities/ValidateFormFieldTask.cs       |   89 +-
 .../Workflows/Activities/ValidateFormTask.cs  |   67 +-
 ...ddModelValidationErrorTaskDisplayDriver.cs |   23 +-
 .../BindModelStateTaskDisplayDriver.cs        |    7 +-
 ...lidateAntiforgeryTokenTaskDisplayDriver.cs |    7 +-
 .../ValidateFormFieldTaskDisplayDriver.cs     |   23 +-
 .../Drivers/ValidateFormTaskDisplayDriver.cs  |    7 +-
 .../OrchardCore.Forms/Workflows/Startup.cs    |   21 +-
 .../AddModelValidationErrorTaskViewModel.cs   |   11 +-
 .../ValidateFormFieldTaskViewModel.cs         |   15 +-
 .../AdminMenuGitHubLogin.cs                   |   59 +-
 .../Configuration/GithubHandler.cs            |  143 +-
 .../Configuration/GithubOptions.cs            |   33 +-
 .../GithubOptionsConfiguration.cs             |  115 +-
 ...thubAuthenticationSettingsDisplayDriver.cs |  137 +-
 .../OrchardCoreBuilderExtensions.cs           |   19 +-
 .../OrchardCore.GitHub/GithubConstants.cs     |   11 +-
 .../GithubAuthenticationSettingsStep.cs       |   55 +-
 .../Services/GithubAuthenticationService.cs   |   79 +-
 .../Services/IGithubAuthenticationService.cs  |   15 +-
 .../Settings/GithubAuthenticationSettings.cs  |   15 +-
 .../OrchardCore.GitHub/Startup.cs             |   49 +-
 .../GithubAuthenticationSettingsViewModel.cs  |   23 +-
 .../GoogleAnalyticsSettingsDisplayDriver.cs   |   77 +-
 .../Analytics/GoogleAnalyticsFilter.cs        |   59 +-
 .../Services/GoogleAnalyticsService.cs        |   23 +-
 .../Services/IGoogleAnalyticsService.cs       |    9 +-
 .../Settings/GoogleAnalyticsSettings.cs       |    9 +-
 .../GoogleAnalyticsSettingsViewModel.cs       |   11 +-
 .../GoogleOptionsConfiguration.cs             |  111 +-
 ...ogleAuthenticationSettingsDisplayDriver.cs |  139 +-
 .../Services/GoogleAuthenticationService.cs   |  101 +-
 .../Settings/GoogleAuthenticationSettings.cs  |   15 +-
 .../GoogleAuthenticationSettingsViewModel.cs  |   23 +-
 .../OrchardCoreBuilderExtensions.cs           |   19 +-
 .../GoogleAuthenticationAdminMenu.cs          |  173 +-
 .../GoogleAuthenticationStartup.cs            |  131 +-
 .../OrchardCore.Google/GoogleConstants.cs     |   15 +-
 .../GoogleTagManagerSettingsDisplayDriver.cs  |   77 +-
 .../TagManager/GoogleTagManagerFilter.cs      |   59 +-
 .../Services/GoogleTagManagerService.cs       |   21 +-
 .../Services/IGoogleTagManagerService.cs      |    9 +-
 .../Settings/GoogleTagManagerSettings.cs      |    9 +-
 .../GoogleTagManagerSettingsViewModel.cs      |   11 +-
 .../OrchardCore.HealthChecks/Startup.cs       |   65 +-
 .../Routing/HomeRouteTransformer.cs           |   33 +-
 .../Routing/HomeRouteValuesAddressScheme.cs   |   87 +-
 .../OrchardCore.HomeRoute/Startup.cs          |   27 +-
 .../Drivers/HtmlBodyPartDisplayDriver.cs      |  133 +-
 .../GraphQL/HtmlBodyQueryObjectType.cs        |   71 +-
 .../OrchardCore.Html/GraphQL/Startup.cs       |   13 +-
 .../Handlers/HtmlBodyPartHandler.cs           |   97 +-
 .../Indexing/HtmlBodyPartIndexHandler.cs      |   21 +-
 .../OrchardCore.Html/Media/Startup.cs         |   13 +-
 .../OrchardCore.Html/Migrations.cs            |  189 +-
 .../OrchardCore.Html/Models/HtmlBodyPart.cs   |    9 +-
 .../HtmlBodyMetaWeblogDriver.cs               |   29 +-
 .../RemotePublishingStartup.cs                |   13 +-
 .../HtmlBodyPartMonacoEditorSettings.cs       |   13 +-
 .../HtmlBodyPartMonacoEditorSettingsDriver.cs |   75 +-
 .../Settings/HtmlBodyPartSettings.cs          |   19 +-
 .../HtmlBodyPartSettingsDisplayDriver.cs      |   35 +-
 .../HtmlBodyPartTrumbowygEditorSettings.cs    |   13 +-
 ...mlBodyPartTrumbowygEditorSettingsDriver.cs |   83 +-
 .../OrchardCore.Html/Startup.cs               |   29 +-
 .../HtmlBodyPartSettingsViewModel.cs          |    9 +-
 .../ViewModels/HtmlBodyPartViewModel.cs       |   21 +-
 .../ViewModels/MonacoSettingsViewModel.cs     |    9 +-
 .../ViewModels/TrumbowygSettingsViewModel.cs  |   11 +-
 .../OrchardCore.Https/AdminMenu.cs            |   55 +-
 .../Drivers/HttpsSettingsDisplayDriver.cs     |  125 +-
 .../Services/HttpsService.cs                  |   21 +-
 .../Services/IHttpsService.cs                 |    9 +-
 .../Settings/HttpsSettings.cs                 |   15 +-
 .../OrchardCore.Https/Startup.cs              |   81 +-
 .../ViewModels/HttpsSettingsViewModel.cs      |   17 +-
 .../CreateIndexingTaskContentHandler.cs       |   51 +-
 .../IndexingTaskManager.cs                    |  265 ++-
 .../OrchardCore.Indexing/Migrations.cs        |   29 +-
 .../OrchardCore.Indexing/Startup.cs           |   21 +-
 .../OrchardCore.Layers/AdminMenu.cs           |   61 +-
 .../Controllers/AdminController.cs            |  517 +++--
 .../Controllers/LayerRuleController.cs        |  501 +++--
 .../Deployment/AllLayersDeploymentSource.cs   |   71 +-
 .../Deployment/AllLayersDeploymentStep.cs     |   17 +-
 .../AllLayersDeploymentStepDriver.cs          |   27 +-
 .../Drivers/LayerMetadataWelder.cs            |  117 +-
 .../Drivers/LayerSiteSettingsDisplayDriver.cs |   77 +-
 .../GraphQL/LayerQueryObjectType.cs           |   75 +-
 .../GraphQL/LayerWidgetQueryObjectType.cs     |   35 +-
 .../GraphQL/SiteLayersQuery.cs                |   65 +-
 .../OrchardCore.Layers/GraphQL/Startup.cs     |   17 +-
 .../Handlers/LayerMetadataHandler.cs          |   45 +-
 .../Indexes/LayerMetadataIndex.cs             |   43 +-
 .../OrchardCore.Layers/Migrations.cs          |   83 +-
 .../OrchardCore.Layers/Models/Layer.cs        |   13 +-
 .../Models/LayerMetadata.cs                   |   15 +-
 .../Models/LayerSettings.cs                   |    9 +-
 .../Models/LayersDocument.cs                  |    9 +-
 .../OrchardCore.Layers/Recipes/LayerStep.cs   |  201 +-
 .../Services/DefaultLayersMethodProvider.cs   |  171 +-
 .../Services/ILayerService.cs                 |   35 +-
 .../Services/LayerFilter.cs                   |  203 +-
 .../Services/LayerService.cs                  |   89 +-
 .../OrchardCore.Layers/Startup.cs             |   47 +-
 .../ViewModels/LayerEditViewModel.cs          |   15 +-
 .../ViewModels/LayerMetadataEditViewModel.cs  |   13 +-
 .../ViewModels/LayerRuleCreateViewModel.cs    |   15 +-
 .../ViewModels/LayerRuleEditViewModel.cs      |   17 +-
 .../ViewModels/LayerSettingsViewModel.cs      |    9 +-
 .../ViewModels/LayersIndexViewModel.cs        |   19 +-
 .../ViewModels/WidgetWrapper.cs               |   15 +-
 .../Drivers/LiquidPartDisplayDriver.cs        |   87 +-
 .../Filters/AbsoluteUrlFilter.cs              |   33 +-
 .../Filters/ContentUrlFilter.cs               |   25 +-
 .../OrchardCore.Liquid/Filters/JsonFilter.cs  |   63 +-
 .../Filters/JsonParseFilter.cs                |   19 +-
 .../Filters/LiquidFilter.cs                   |   29 +-
 .../Filters/LocalTimeZoneFilter.cs            |   67 +-
 .../Filters/ShortCodeFilter.cs                |   41 +-
 .../Filters/SlugifyFilter.cs                  |   25 +-
 .../Filters/UtcTimeZoneFilter.cs              |   67 +-
 .../Handlers/LiquidPartHandler.cs             |   55 +-
 .../Indexing/LiquidPartIndexHandler.cs        |   21 +-
 .../OrchardCore.Liquid/Migrations.cs          |   29 +-
 .../OrchardCore.Liquid/Models/LiquidPart.cs   |    9 +-
 .../ResourceManagementOptionsConfiguration.cs |   41 +-
 .../OrchardCore.Liquid/ScriptsMiddleware.cs   |   77 +-
 .../Services/LiquidTemplateManager.cs         |  179 +-
 .../OrchardCore.Liquid/Startup.cs             |  123 +-
 .../ViewModels/LiquidPartViewModel.cs         |   19 +-
 .../AdminNodes/ListsAdminNode.cs              |   15 +-
 .../AdminNodes/ListsAdminNodeDriver.cs        |   91 +-
 .../ListsAdminNodeNavigationBuilder.cs        |  181 +-
 .../AdminNodes/ListsAdminNodeViewModel.cs     |   17 +-
 .../Controllers/OrderController.cs            |  119 +-
 .../Controllers/RemotePublishingController.cs |   91 +-
 .../Drivers/ContainedPartDisplayDriver.cs     |  261 ++-
 .../ListPartContentsAdminListDisplayDriver.cs |   45 +-
 .../Drivers/ListPartDisplayDriver.cs          |  295 ++-
 .../Feeds/ListFeedEditViewModel.cs            |   15 +-
 .../OrchardCore.Lists/Feeds/ListFeedQuery.cs  |  149 +-
 .../Feeds/ListFeedQueryViewModel.cs           |    9 +-
 .../Feeds/ListPartFeedDisplayDriver.cs        |   57 +-
 .../Feeds/ListPartFeedHandler.cs              |   21 +-
 .../GraphQL/ContainedInputObjectType.cs       |   15 +-
 .../ContainedPartIndexAliasProvider.cs        |   29 +-
 .../GraphQL/ContainedQueryObjectType.cs       |   17 +-
 .../GraphQL/ListQueryObjectType.cs            |   77 +-
 .../OrchardCore.Lists/GraphQL/Startup.cs      |   21 +-
 .../Handlers/ContainedPartHandler.cs          |   49 +-
 .../ContainedPartLocalizationHandler.cs       |   85 +-
 .../Handlers/ListPartHandler.cs               |   27 +-
 .../Handlers/ListPartLocalizationHandler.cs   |   53 +-
 .../Helpers/ListQueryHelpers.cs               |   31 +-
 .../ContainedPartContentIndexHandler.cs       |   37 +-
 .../Indexes/ContainedPartIndex.cs             |   79 +-
 .../Liquid/ContainerFilter.cs                 |   39 +-
 .../Liquid/ListCountFilter.cs                 |   39 +-
 .../Liquid/ListItemsFilter.cs                 |   39 +-
 .../OrchardCore.Lists/Migrations.cs           |  207 +-
 .../Models/ContainedItemOptions.cs            |   25 +-
 .../OrchardCore.Lists/Models/ContainedPart.cs |   33 +-
 .../OrchardCore.Lists/Models/ListPart.cs      |    7 +-
 .../Models/ListPartSettings.cs                |   15 +-
 .../RemotePublishing/ListMetaWeblogDriver.cs  |   17 +-
 .../RemotePublishing/MetaWeblogHandler.cs     |  753 ++++---
 .../RemotePublishingStartup.cs                |   35 +-
 .../Services/ContainerService.cs              |  563 +++---
 .../Services/IContainerService.cs             |   41 +-
 .../ListPartContentsAdminListFilter.cs        |   51 +-
 .../Settings/ListPartSettingsDisplayDriver.cs |  107 +-
 .../OrchardCore.Lists/Startup.cs              |  117 +-
 .../ViewModels/EditContainedPartViewModel.cs  |   15 +-
 .../ListPartContentsAdminFilterViewModel.cs   |   11 +-
 .../ViewModels/ListPartFilterViewModel.cs     |   11 +-
 .../ViewModels/ListPartSettingsViewModel.cs   |   19 +-
 .../ViewModels/ListPartViewModel.cs           |   21 +-
 .../OrchardCore.Localization/AdminMenu.cs     |   79 +-
 .../LocalizationSettingsDisplayDriver.cs      |  185 +-
 .../GraphQL/CultureQueryObjectType.cs         |   23 +-
 .../GraphQL/SiteCulture.cs                    |   25 +-
 .../GraphQL/SiteCulturesQuery.cs              |   97 +-
 .../GraphQL/Startup.cs                        |   23 +-
 .../Models/CultureEntry.cs                    |   33 +-
 .../Models/LocalizationSettings.cs            |   43 +-
 .../ModularPoFileLocationProvider.cs          |  121 +-
 .../Services/LocalizationService.cs           |   83 +-
 .../OrchardCore.Localization/Startup.cs       |  123 +-
 .../LocalizationSettingsViewModel.cs          |   37 +-
 .../Drivers/MarkdownBodyPartDisplayDriver.cs  |  155 +-
 .../Drivers/MarkdownFieldDisplayDriver.cs     |  151 +-
 .../Fields/MarkdownField.cs                   |    9 +-
 .../Filters/Markdownify.cs                    |   23 +-
 .../GraphQL/MarkdownBodyQueryObjectType.cs    |  105 +-
 .../GraphQL/MarkdownFieldQueryObjectType.cs   |  123 +-
 .../OrchardCore.Markdown/GraphQL/Startup.cs   |   15 +-
 .../Handlers/MarkdownBodyPartHandler.cs       |  121 +-
 .../Indexing/MarkdownBodyPartIndexHandler.cs  |   21 +-
 .../Indexing/MarkdownFieldIndexHandler.cs     |   21 +-
 .../OrchardCore.Markdown/Media/Startup.cs     |   13 +-
 .../OrchardCore.Markdown/Migrations.cs        |  103 +-
 .../Models/MarkdownBodyPart.cs                |    9 +-
 .../MarkdownBodyMetaWeblogDriver.cs           |   29 +-
 .../RemotePublishing/Startup.cs               |   13 +-
 .../Services/DefaultMarkdownService.cs        |   29 +-
 .../Services/MarkdownPipelineOptions.cs       |    9 +-
 .../MarkdownPipelineOptionsExtensions.cs      |   21 +-
 .../Settings/MarkdownBodyPartSettings.cs      |   11 +-
 .../MarkdownBodyPartSettingsDisplayDriver.cs  |   35 +-
 .../Settings/MarkdownFieldSettings.cs         |   13 +-
 .../Settings/MarkdownFieldSettingsDriver.cs   |   39 +-
 .../OrchardCore.Markdown/Startup.cs           |   71 +-
 .../ViewModels/EditMarkdownFieldViewModel.cs  |   15 +-
 .../MarkdownBodyPartSettingsViewModel.cs      |    9 +-
 .../ViewModels/MarkdownBodyPartViewModel.cs   |   23 +-
 .../MarkdownFieldSettingsViewModel.cs         |   11 +-
 .../ViewModels/MarkdownFieldViewModel.cs      |   17 +-
 .../OrchardCore.Media.AmazonS3/AdminMenu.cs   |   43 +-
 .../Controllers/AdminController.cs            |   65 +-
 .../ViewModels/OptionsViewModel.cs            |   13 +-
 .../OrchardCore.Media.Azure/AdminMenu.cs      |   43 +-
 .../Controllers/AdminController.cs            |   51 +-
 .../OrchardCore.Media.Azure/Startup.cs        |  285 ++-
 .../ViewModels/OptionsViewModel.cs            |   15 +-
 .../Services/PdfMediaFileTextProvider.cs      |   61 +-
 .../OrchardCore.Media/AdminMenu.cs            |  113 +-
 .../Controllers/AdminController.cs            |  867 +++++----
 .../Controllers/MediaCacheController.cs       |  107 +-
 .../Controllers/MediaProfilesController.cs    |  539 +++--
 .../AllMediaProfilesDeploymentSource.cs       |   37 +-
 .../AllMediaProfilesDeploymentStep.cs         |   17 +-
 .../AllMediaProfilesDeploymentStepDriver.cs   |   27 +-
 .../Deployment/MediaDeploymentSource.cs       |   81 +-
 .../Deployment/MediaDeploymentStep.cs         |   25 +-
 .../Deployment/MediaDeploymentStepDriver.cs   |  111 +-
 .../Drivers/MediaFieldDisplayDriver.cs        |  219 ++-
 .../OrchardCore.Media/Fields/Anchor.cs        |   19 +-
 .../Fields/MediaFieldAnchorExtensions.cs      |   35 +-
 .../MediaFieldAttachedFileNameExtensions.cs   |   39 +-
 .../Filters/AssetUrlFilter.cs                 |   27 +-
 .../OrchardCore.Media/Filters/MediaFilters.cs |   25 +-
 .../Filters/ResizeUrlFilter.cs                |  177 +-
 .../GraphQL/MediaAssetObjectType.cs           |   37 +-
 .../GraphQL/MediaAssetQuery.cs                |  105 +-
 .../GraphQL/MediaFieldQueryObjectType.cs      |  169 +-
 .../OrchardCore.Media/GraphQL/Startup.cs      |   17 +-
 .../AttachedMediaFieldContentHandler.cs       |   31 +-
 .../Indexing/MediaFieldIndexHandler.cs        |  127 +-
 .../Liquid/MediaAnchorTag.cs                  |  119 +-
 .../OrchardCore.Media/Migrations.cs           |   49 +-
 .../Models/MediaProfilesDocument.cs           |   29 +-
 .../Processing/BackwardsCompatibleCacheKey.cs |   41 +-
 .../Processing/ImageSharpUrlFormatter.cs      |  119 +-
 .../Processing/ImageVersionProcessor.cs       |   29 +-
 .../MediaImageSharpConfiguration.cs           |  189 +-
 .../Processing/MediaResizingFileProvider.cs   |  101 +-
 .../Processing/MediaTokenOptions.cs           |    9 +-
 .../MediaTokenOptionsConfiguration.cs         |   29 +-
 .../Processing/MediaTokenService.cs           |  315 ++-
 .../Processing/MediaTokenSettings.cs          |    9 +-
 .../Processing/MediaTokenSettingsUpdater.cs   |   89 +-
 .../Processing/TokenCommandProcessor.cs       |   31 +-
 .../Recipes/MediaProfileStep.cs               |   47 +-
 .../OrchardCore.Media/Recipes/MediaStep.cs    |  201 +-
 .../RemotePublishing/MediaMetaWeblogDriver.cs |   11 +-
 .../RemotePublishingStartup.cs                |   13 +-
 .../ResourceManifestOptionsConfiguration.cs   |   41 +-
 .../SecureMediaPermissions.cs                 |  243 ++-
 .../Services/AttachedMediaFieldFileService.cs |  225 ++-
 .../DefaultUserAssetFolderNameProvider.cs     |   11 +-
 .../Services/IMediaProfileService.cs          |    9 +-
 .../ManageMediaFolderAuthorizationHandler.cs  |  167 +-
 .../Services/MediaFileProvider.cs             |   23 +-
 .../MediaFileStoreResolverMiddleware.cs       |  163 +-
 .../Services/MediaOptionsConfiguration.cs     |  227 ++-
 .../Services/MediaProfileService.cs           |   89 +-
 .../Services/MediaProfilesManager.cs          |   49 +-
 .../NullMediaNameNormalizerService.cs         |   11 +-
 .../Services/SecureMediaExtensions.cs         |   27 +-
 .../Services/SecureMediaMarker.cs             |    7 +-
 .../Services/SecureMediaMiddleware.cs         |   65 +-
 .../SlugifyMediaNameNormalizerService.cs      |   31 +-
 .../Services/TempDirCleanerService.cs         |   75 +-
 .../ViewMediaFolderAuthorizationHandler.cs    |  335 ++--
 .../Settings/MediaFieldSettingsDriver.cs      |  145 +-
 .../Shortcodes/AssetUrlShortcodeProvider.cs   |  139 +-
 .../Shortcodes/ImageShortcodeProvider.cs      |  207 +-
 .../OrchardCore.Media/Startup.cs              |  421 ++--
 .../TagHelpers/AnchorTagHelper.cs             |   99 +-
 .../TagHelpers/ImageResizeTagHelper.cs        |  137 +-
 .../TagHelpers/ImageTagHelper.cs              |   91 +-
 .../ViewModels/DisplayMediaFieldViewModel.cs  |   15 +-
 .../ViewModels/EditMediaFieldViewModel.cs     |   61 +-
 .../ViewModels/MediaCacheViewModel.cs         |    9 +-
 .../MediaDeploymentStepViewModel.cs           |   17 +-
 .../ViewModels/MediaProfileIndexViewModel.cs  |   65 +-
 .../ViewModels/MediaProfileViewModel.cs       |   43 +-
 .../ViewModels/MediaStoreEntryViewModel.cs    |   15 +-
 .../OrchardCore.Menu/AdminMenu.cs             |   57 +-
 .../Controllers/AdminController.cs            |  433 +++--
 .../ContentMenuItemPartDisplayDriver.cs       |   61 +-
 .../Drivers/HtmlMenuItemPartDisplayDriver.cs  |  163 +-
 .../Drivers/LinkMenuItemPartDisplayDriver.cs  |  149 +-
 .../Drivers/MenuPartDisplayDriver.cs          |  197 +-
 .../GraphQL/HtmlMenuItemQueryObjectType.cs    |   17 +-
 .../GraphQL/LinkMenuItemQueryObjectType.cs    |   13 +-
 .../GraphQL/MenuItemContentTypeBuilder.cs     |   29 +-
 .../GraphQL/MenuItemInterface.cs              |   13 +-
 .../GraphQL/MenuItemsListQueryObjectType.cs   |   17 +-
 .../OrchardCore.Menu/GraphQL/Startup.cs       |   19 +-
 .../Handlers/MenuContentHandler.cs            |   21 +-
 .../OrchardCore.Menu/MenuShapes.cs            |  305 ++-
 .../OrchardCore.Menu/Migrations.cs            |  103 +-
 .../Models/ContentMenuItemPart.cs             |    7 +-
 .../Models/HtmlMenuItemPart.cs                |   31 +-
 .../Models/LinkMenuItemPart.cs                |   23 +-
 .../Models/MenuItemsListPart.cs               |   13 +-
 .../OrchardCore.Menu/Models/MenuPart.cs       |    9 +-
 .../Settings/HtmlMenuItemPartSettings.cs      |   17 +-
 .../HtmlMenuItemPartSettingsDisplayDriver.cs  |   35 +-
 .../OrchardCore.Menu/Startup.cs               |   51 +-
 .../TagHelper/MenuTagHelper.cs                |   15 +-
 .../ContentMenuItemPartEditViewModel.cs       |   13 +-
 .../HtmlMenuItemPartEditViewModel.cs          |   19 +-
 .../HtmlMenuItemPartSettingsViewModel.cs      |    9 +-
 .../LinkMenuItemPartEditViewModel.cs          |   17 +-
 .../ViewModels/MenuPartEditViewModel.cs       |   17 +-
 .../AdminMenuMicrosoftAccount.cs              |  107 +-
 .../AzureADOptionsConfiguration.cs            |  129 +-
 .../CookieOptionsConfiguration.cs             |   45 +-
 .../MicrosoftAccountOptionsConfiguration.cs   |  115 +-
 .../OpenIdConnectOptionsConfiguration.cs      |   57 +-
 .../Deployment/AzureADDeploymentSource.cs     |   33 +-
 .../Deployment/AzureADDeploymentStep.cs       |   17 +-
 .../Deployment/AzureADDeploymentStepDriver.cs |   27 +-
 .../Drivers/AzureADSettingsDisplayDriver.cs   |   97 +-
 .../MicrosoftAccountSettingsDisplayDriver.cs  |  139 +-
 .../OrchardCoreBuilderExtensions.cs           |   35 +-
 .../MIcrosoftAuthenticationConstants.cs       |   13 +-
 .../MicrosoftAccountStartup.cs                |   97 +-
 .../Recipes/AzureADSettingsStep.cs            |   59 +-
 .../Recipes/MicrosoftAccountSettingsStep.cs   |   55 +-
 .../Services/AzureADService.cs                |   89 +-
 .../Services/IAzureADService.cs               |   15 +-
 .../Services/IMicrosoftAccountService.cs      |   15 +-
 .../Services/MicrosoftAccountService.cs       |   79 +-
 .../Settings/AzureADSettings.cs               |   17 +-
 .../Settings/MicrosoftAccountSettings.cs      |   15 +-
 .../ViewModels/AzureADSettingsViewModel.cs    |   25 +-
 .../ViewModels/ErrorViewModel.cs              |   11 +-
 .../MicrosoftAccountSettingsViewModel.cs      |   23 +-
 .../CurrentDbProfiler.cs                      |   29 +-
 .../MiniProfilerConnectionFactory.cs          |   31 +-
 .../MiniProfilerFilter.cs                     |   65 +-
 .../OrchardCore.MiniProfiler/ShapeStep.cs     |   51 +-
 .../OrchardCore.MiniProfiler/Startup.cs       |   41 +-
 .../Controllers/HomeController.cs             |   11 +-
 .../OrchardCore.Mvc.HelloWorld/Startup.cs     |   39 +-
 .../NavigationShapes.cs                       |  151 +-
 .../PagerShapesTableProvider.cs               |  889 +++++----
 .../OrchardCore.Navigation/Startup.cs         |   33 +-
 .../OrchardCore.OpenId/AdminMenu.cs           |  133 +-
 .../OpenIdClientConfiguration.cs              |  181 +-
 .../OpenIdServerConfiguration.cs              |  365 ++--
 .../OpenIdValidationConfiguration.cs          |  411 ++--
 .../Controllers/AccessController.cs           | 1041 +++++-----
 .../Controllers/ApplicationController.cs      |  619 +++---
 .../Controllers/ScopeController.cs            |  395 ++--
 .../ServerConfigurationController.cs          |  133 +-
 .../Controllers/UserInfoController.cs         |  225 ++-
 .../ValidationConfigurationController.cs      |  133 +-
 .../OpenIdServerDeploymentSource.cs           |  107 +-
 .../Deployment/OpenIdServerDeploymentStep.cs  |   17 +-
 .../OpenIdServerDeploymentStepDriver.cs       |   27 +-
 .../OpenIdValidationDeploymentSource.cs       |   41 +-
 .../OpenIdValidationDeploymentStep.cs         |   17 +-
 .../OpenIdValidationDeploymentStepDriver.cs   |   27 +-
 .../OpenIdClientSettingsDisplayDriver.cs      |  315 ++-
 .../OpenIdServerSettingsDisplayDriver.cs      |  201 +-
 .../OpenIdValidationSettingsDisplayDriver.cs  |   83 +-
 ...penIdApplicationRoleRemovedEventHandler.cs |   23 +-
 .../OpenIdApplicationSettings.cs              |  401 ++--
 .../OrchardCore.OpenId/OpenIdExtensions.cs    |   75 +-
 .../Recipes/OpenIdApplicationStep.cs          |   81 +-
 .../Recipes/OpenIdApplicationStepModel.cs     |   59 +-
 .../Recipes/OpenIdClientSettingsStep.cs       |   93 +-
 .../Recipes/OpenIdScopeStep.cs                |   87 +-
 .../Recipes/OpenIdScopeStepModel.cs           |   15 +-
 .../Recipes/OpenIdServerSettingsStep.cs       |   97 +-
 .../Recipes/OpenIdServerSettingsStepModel.cs  |   57 +-
 .../Recipes/OpenIdValidationSettingsStep.cs   |   47 +-
 .../OpenIdValidationSettingsStepModel.cs      |   17 +-
 .../Services/IOpenIdClientService.cs          |   15 +-
 .../Services/IOpenIdServerService.cs          |   23 +-
 .../Services/IOpenIdValidationService.cs      |   15 +-
 .../Services/OpenIdClientService.cs           |  153 +-
 .../Services/OpenIdServerService.cs           |  919 +++++----
 .../Services/OpenIdValidationService.cs       |  309 ++-
 .../Settings/OpenIdClientSettings.cs          |   41 +-
 .../Settings/OpenIdServerSettings.cs          |   63 +-
 .../Settings/OpenIdValidationSettings.cs      |   17 +-
 .../OrchardCore.OpenId/Startup.cs             |  377 ++--
 .../Tasks/OpenIdBackgroundTask.cs             |  135 +-
 .../ViewModels/AuthorizeViewModel.cs          |   13 +-
 .../CreateOpenIdApplicationViewModel.cs       |   71 +-
 .../ViewModels/CreateOpenIdScopeViewModel.cs  |   31 +-
 .../EditOpenIdApplicationViewModel.cs         |   75 +-
 .../ViewModels/EditOpenIdScopeViewModel.cs    |   35 +-
 .../ViewModels/ErrorViewModel.cs              |   11 +-
 .../ViewModels/LogoutViewModel.cs             |    9 +-
 .../OpenIdApplicationsIndexViewModel.cs       |   27 +-
 .../OpenIdClientSettingsViewModel.cs          |   55 +-
 .../ViewModels/OpenIdScopeIndexViewModel.cs   |   27 +-
 .../ViewModels/OpenIdScopeStepViewModel.cs    |   15 +-
 .../OpenIdServerSettingsViewModel.cs          |   83 +-
 .../OpenIdValidationSettingsViewModel.cs      |   23 +-
 .../OrchardCore.Placements/AdminMenu.cs       |   43 +-
 .../Controllers/AdminController.cs            |  487 +++--
 .../Deployment/PlacementsDeploymentSource.cs  |   55 +-
 .../Deployment/PlacementsDeploymentStep.cs    |   17 +-
 .../PlacementsDeploymentStepDriver.cs         |   27 +-
 .../Models/PlacementsDocument.cs              |    9 +-
 .../Recipes/PlacementStep.cs                  |   41 +-
 .../Services/DatabasePlacementsStore.cs       |   29 +-
 .../Services/FilePlacementsStore.cs           |   29 +-
 .../Services/IPlacementStore.cs               |   31 +-
 .../Services/PlacementProvider.cs             |  149 +-
 .../Services/PlacementsManager.cs             |   71 +-
 .../PlacementContentPartDefinitionDriver.cs   |   87 +-
 ...ContentPartFieldDefinitionDisplayDriver.cs |   93 +-
 ...lacementContentTypePartDefinitionDriver.cs |  101 +-
 .../OrchardCore.Placements/Startup.cs         |   57 +-
 .../ViewModels/ContentSettingsViewModel.cs    |   27 +-
 .../ViewModels/EditShapePlacementViewModel.cs |   13 +-
 .../ListShapePlacementsViewModel.cs           |   41 +-
 .../ViewModels/ShapePlacementViewModel.cs     |    9 +-
 .../Drivers/PublishLaterPartDisplayDriver.cs  |  101 +-
 .../OrchardCore.PublishLater/Startup.cs       |   31 +-
 .../ViewModels/PublishLaterPartViewModel.cs   |   15 +-
 .../OrchardCore.Queries/AdminMenu.cs          |   53 +-
 .../Controllers/AdminController.cs            |  401 ++--
 .../Controllers/QueryApiController.cs         |   87 +-
 .../Deployment/AllQueriesDeploymentSource.cs  |   49 +-
 .../Deployment/AllQueriesDeploymentStep.cs    |   17 +-
 .../AllQueriesDeploymentStepDriver.cs         |   27 +-
 .../QueryBasedContentDeploymentSource.cs      |  125 +-
 .../QueryBasedContentDeploymentStep.cs        |   27 +-
 .../QueryBasedContentDeploymentStepDriver.cs  |  111 +-
 .../Drivers/QueryDisplayDriver.cs             |  145 +-
 .../Liquid/LiquidQueriesAccessor.cs           |   13 +-
 .../OrchardCore.Queries/Liquid/QueryFilter.cs |   45 +-
 .../QueryGlobalMethodProvider.cs              |   55 +-
 .../OrchardCore.Queries/Recipes/QueryStep.cs  |  119 +-
 .../OrchardCore.Queries/Sql/AdminMenu.cs      |   45 +-
 .../Sql/Controllers/AdminController.cs        |  143 +-
 .../Sql/Drivers/SqlQueryDisplayDriver.cs      |  113 +-
 .../Sql/GraphQL/SqlQueryFieldTypeProvider.cs  |  315 ++-
 .../Sql/GraphQL/Startup.cs                    |   21 +-
 .../OrchardCore.Queries/Sql/SqlGrammar.cs     |  429 ++--
 .../OrchardCore.Queries/Sql/SqlParser.cs      | 1309 +++++++------
 .../Sql/SqlParserException.cs                 |    9 +-
 .../OrchardCore.Queries/Sql/SqlQuerySource.cs |  151 +-
 .../OrchardCore.Queries/Sql/Startup.cs        |   29 +-
 .../Sql/ViewModels/AdminQueryViewModel.cs     |   29 +-
 .../Sql/ViewModels/SqlQueryViewModel.cs       |   11 +-
 .../OrchardCore.Queries/Startup.cs            |   73 +-
 .../ViewModels/EditQueryViewModel.cs          |   19 +-
 .../ViewModels/QueriesIndexViewModel.cs       |   67 +-
 ...ueryBasedContentDeploymentStepViewModel.cs |   17 +-
 .../OrchardCore.ReCaptcha/AdminMenu.cs        |   55 +-
 .../Drivers/ReCaptchaSettingsDisplayDriver.cs |   89 +-
 .../OrchardCore.ReCaptcha/Forms/Migrations.cs |   33 +-
 .../Forms/ReCaptchaPart.cs                    |    7 +-
 .../Forms/ReCaptchaPartDisplayDriver.cs       |   43 +-
 .../Forms/ReCaptchaPartViewModel.cs           |    9 +-
 .../OrchardCore.ReCaptcha/Forms/Startup.cs    |   23 +-
 .../OrchardCore.ReCaptcha/Startup.cs          |   81 +-
 .../Handlers/LoginFormEventEventHandler.cs    |   57 +-
 .../PasswordRecoveryFormEventEventHandler.cs  |   47 +-
 .../Handlers/RegistrationFormEventHandler.cs  |   31 +-
 .../ViewModels/ReCaptchaSettingsViewModel.cs  |   11 +-
 .../Workflows/Startup.cs                      |   13 +-
 .../Workflows/ValidateReCaptchaTask.cs        |   67 +-
 .../ValidateReCaptchaTaskDisplayDriver.cs     |    7 +-
 .../OrchardCore.Recipes/AdminMenu.cs          |   47 +-
 .../Commands/RecipesCommands.cs               |   63 +-
 .../Controllers/AdminController.cs            |  213 +-
 .../RecipeSteps/CommandStep.cs                |   79 +-
 .../RecipeSteps/RecipesStep.cs                |   83 +-
 .../Services/RecipeDeploymentTargetHandler.cs |   65 +-
 .../OrchardCore.Recipes/Startup.cs            |   35 +-
 .../ViewModels/RecipeViewModel.cs             |   23 +-
 .../Options/RedisCacheOptionsSetup.cs         |   41 +-
 .../Options/RedisKeyManagementOptionsSetup.cs |   41 +-
 .../OrchardCore.Redis/Services/RedisBus.cs    |  107 +-
 .../OrchardCore.Redis/Services/RedisLock.cs   |  297 ++-
 .../Services/RedisService.cs                  |   31 +-
 .../Services/RedisTagCache.cs                 |  151 +-
 .../OrchardCore.Redis/Startup.cs              |  141 +-
 .../OrchardCore.Resources/Liquid/LinkTag.cs   |  113 +-
 .../OrchardCore.Resources/Liquid/MetaTag.cs   |   65 +-
 .../Liquid/ResourcesTag.cs                    |   47 +-
 .../Liquid/ScriptBlock.cs                     |  231 ++-
 .../OrchardCore.Resources/Liquid/ScriptTag.cs |  419 ++--
 .../Liquid/StyleBlock.cs                      |  237 ++-
 .../OrchardCore.Resources/Liquid/StyleTag.cs  |  383 ++--
 .../ResourceManagementOptionsConfiguration.cs | 1055 +++++-----
 .../OrchardCore.Resources/Startup.cs          |   47 +-
 .../Startup.cs                                |   23 +-
 .../OrchardCore.ReverseProxy/AdminMenu.cs     |   59 +-
 .../ReverseProxySettingsDisplayDriver.cs      |  115 +-
 .../OrchardCoreBuilderExtensions.cs           |   19 +-
 .../ForwardedHeadersOptionsConfiguration.cs   |   31 +-
 .../Services/ReverseProxyService.cs           |   21 +-
 .../Settings/ReverseProxySettings.cs          |    9 +-
 .../OrchardCore.ReverseProxy/Startup.cs       |   47 +-
 .../ReverseProxySettingsViewModel.cs          |   13 +-
 .../OrchardCore.Roles/AdminMenu.cs            |   45 +-
 .../Controllers/AdminController.cs            |  433 +++--
 .../Deployment/AllRolesDeploymentSource.cs    |   79 +-
 .../Deployment/AllRolesDeploymentStep.cs      |   17 +-
 .../AllRolesDeploymentStepDriver.cs           |   27 +-
 .../OrchardCore.Roles/Models/RolesDocument.cs |   11 +-
 .../OrchardCore.Roles/Recipes/RolesStep.cs    |  103 +-
 .../OrchardCore.Roles/Services/RoleStore.cs   |  299 ++-
 .../OrchardCore.Roles/Services/RoleUpdater.cs |  325 ++--
 .../Services/RolesPermissionsHandler.cs       |   87 +-
 .../OrchardCore.Roles/Startup.cs              |   57 +-
 .../SelectRolesViewComponent.cs               |   83 +-
 .../ViewModels/CreateRoleViewModel.cs         |   13 +-
 .../ViewModels/EditRoleViewModel.cs           |   23 +-
 .../ViewModels/RolesViewModel.cs              |   21 +-
 .../Drivers/AllConditionDisplayDriver.cs      |   53 +-
 .../Drivers/AnyConditionDisplayDriver.cs      |   53 +-
 .../Drivers/BooleanConditionDisplayDriver.cs  |   43 +-
 .../ContentTypeConditionDisplayDriver.cs      |   73 +-
 .../ContentTypeConditionEvaluatorDriver.cs    |   75 +-
 .../Drivers/CultureConditionDisplayDriver.cs  |   75 +-
 .../Drivers/HomepageConditionDisplayDriver.cs |   43 +-
 .../IsAnonymousConditionDisplayDriver.cs      |   27 +-
 .../IsAuthenticatedConditionDisplayDriver.cs  |   27 +-
 .../JavascriptConditionDisplayDriver.cs       |  137 +-
 .../Drivers/RoleConditionDisplayDriver.cs     |   75 +-
 .../Drivers/RuleDisplayDriver.cs              |   25 +-
 .../Drivers/UrlConditionDisplayDriver.cs      |   73 +-
 .../Models/AllConditionGroup.cs               |    7 +-
 .../Models/AnyConditionGroup.cs               |    7 +-
 .../Models/BooleanCondition.cs                |    9 +-
 .../Models/ContentTypeCondition.cs            |   11 +-
 .../Models/CultureCondition.cs                |   11 +-
 .../Models/HomepageCondition.cs               |    9 +-
 .../Models/IsAnonymousCondition.cs            |    7 +-
 .../Models/IsAuthenticatedCondition.cs        |    7 +-
 .../Models/JavascriptCondition.cs             |    9 +-
 .../OrchardCore.Rules/Models/RoleCondition.cs |   11 +-
 .../Models/StringOperators.cs                 |   57 +-
 .../OrchardCore.Rules/Models/UrlCondition.cs  |   11 +-
 .../Services/AllConditionEvaluator.cs         |   43 +-
 .../Services/AnyConditionEvaluator.cs         |   33 +-
 .../Services/BooleanConditionEvaluator.cs     |   11 +-
 .../Services/ConditionIdGenerator.cs          |   23 +-
 .../ConditionOperatorConfigureOptions.cs      |  111 +-
 .../Services/ConditionOperatorResolver.cs     |   27 +-
 .../Services/ConditionResolver.cs             |   33 +-
 .../Services/CultureConditionEvaluator.cs     |   31 +-
 .../Services/HomepageConditionEvaluator.cs    |   35 +-
 .../Services/IsAnonymousConditionEvaluator.cs |   21 +-
 .../IsAuthenticatedConditionEvaluator.cs      |   21 +-
 .../Services/JavascriptConditionEvaluator.cs  |   37 +-
 .../Services/RoleConditionEvaluator.cs        |   59 +-
 .../OrchardCore.Rules/Services/RuleService.cs |   43 +-
 .../Services/StringOperatorComparer.cs        |  113 +-
 .../Services/UrlConditionEvaluator.cs         |   47 +-
 .../OrchardCore.Rules/Startup.cs              |   93 +-
 .../SelectStringOperationViewComponent.cs     |   53 +-
 .../ViewModels/AllConditionViewModel.cs       |   13 +-
 .../ViewModels/AnyConditionViewModel.cs       |   13 +-
 .../ViewModels/BooleanConditionViewModel.cs   |   13 +-
 .../ViewModels/ConditionGroupViewModel.cs     |   23 +-
 .../ContentTypeConditionViewModel.cs          |   15 +-
 .../ViewModels/CultureConditionViewModel.cs   |   15 +-
 .../ViewModels/HomepageConditionViewModel.cs  |   13 +-
 .../JavascriptConditionViewModel.cs           |   13 +-
 .../ViewModels/RoleConditionViewModel.cs      |   15 +-
 .../SelectStringOperationViewModel.cs         |   11 +-
 .../ViewModels/UrlConditionViewModel.cs       |   15 +-
 .../Providers/LogProvider.cs                  |   75 +-
 .../OrchardCore.Scripting/Startup.cs          |   13 +-
 .../Controllers/AdminController.cs            |  955 +++++----
 .../Controllers/ElasticsearchApiController.cs |  135 +-
 ...tentPartFieldIndexSettingsDisplayDriver.cs |   59 +-
 ...tPickerFieldElasticEditorSettingsDriver.cs |   57 +-
 ...ntentTypePartIndexSettingsDisplayDriver.cs |   59 +-
 .../ElasticIndexDeploymentStepDriver.cs       |   73 +-
 ...ElasticIndexRebuildDeploymentStepDriver.cs |   65 +-
 .../ElasticIndexResetDeploymentStepDriver.cs  |   65 +-
 .../Drivers/ElasticQueryDisplayDriver.cs      |  131 +-
 .../ElasticSettingsDeploymentStepDriver.cs    |   27 +-
 .../GraphQL/ElasticQueryFieldTypeProvider.cs  |  301 ++-
 .../GraphQL/Startup.cs                        |   19 +-
 .../Startup.cs                                |  175 +-
 .../ViewModels/AdminIndexViewModel.cs         |   47 +-
 .../ViewModels/AdminQueryViewModel.cs         |   33 +-
 .../ViewModels/ElasticApiQueryViewModel.cs    |   13 +-
 .../ElasticContentIndexSettingsViewModel.cs   |    9 +-
 .../ElasticIndexDeploymentStepViewModel.cs    |   13 +-
 ...sticIndexRebuildDeploymentStepViewModel.cs |   13 +-
 ...lasticIndexResetDeploymentStepViewModel.cs |   13 +-
 .../ElasticIndexSettingsViewModel.cs          |   33 +-
 .../ViewModels/ElasticQueryViewModel.cs       |   15 +-
 .../ViewModels/ElasticSettingsViewModel.cs    |   23 +-
 .../ViewModels/IndexViewModel.cs              |   13 +-
 .../ViewModels/MappingsViewModel.cs           |   11 +-
 .../ViewModels/QueryIndexViewModel.cs         |   19 +-
 .../Controllers/AdminController.cs            |  753 ++++---
 .../Controllers/LuceneApiController.cs        |  137 +-
 .../Deployment/LuceneIndexDeploymentSource.cs |   59 +-
 .../Deployment/LuceneIndexDeploymentStep.cs   |   23 +-
 .../LuceneIndexDeploymentStepDriver.cs        |   73 +-
 .../LuceneIndexRebuildDeploymentSource.cs     |   35 +-
 .../LuceneIndexRebuildDeploymentStep.cs       |   23 +-
 .../LuceneIndexRebuildDeploymentStepDriver.cs |   65 +-
 .../LuceneIndexResetDeploymentSource.cs       |   35 +-
 .../LuceneIndexResetDeploymentStep.cs         |   23 +-
 .../LuceneIndexResetDeploymentStepDriver.cs   |   65 +-
 .../LuceneSettingsDeploymentSource.cs         |   39 +-
 .../LuceneSettingsDeploymentStep.cs           |   17 +-
 .../LuceneSettingsDeploymentStepDriver.cs     |   27 +-
 .../Drivers/LuceneQueryDisplayDriver.cs       |  131 +-
 .../Drivers/LuceneSettingsDisplayDriver.cs    |   91 +-
 .../GraphQL/LuceneQueryFieldTypeProvider.cs   |  307 ++-
 .../GraphQL/Startup.cs                        |   19 +-
 .../Handler/LuceneIndexingContentHandler.cs   |  161 +-
 .../OrchardCore.Search.Lucene/Migrations.cs   |  283 ++-
 .../Model/LuceneContentIndexSettings.cs       |   41 +-
 .../Model/LuceneIndexSettings.cs              |   29 +-
 .../Model/LuceneQueryModel.cs                 |   13 +-
 .../Model/LuceneSettings.cs                   |   19 +-
 .../Recipes/LuceneIndexRebuildStep.cs         |   65 +-
 .../Recipes/LuceneIndexResetStep.cs           |   77 +-
 .../Recipes/LuceneIndexStep.cs                |   67 +-
 .../Services/IndexingBackgroundTask.cs        |   33 +-
 .../Services/LuceneAnalyzer.cs                |   33 +-
 .../Services/LuceneAnalyzerManager.cs         |   49 +-
 .../LuceneContentPickerResultProvider.cs      |   89 +-
 .../Services/LuceneIndexInitializerService.cs |   51 +-
 .../Services/LuceneIndexManager.cs            |  811 ++++----
 .../Services/LuceneIndexSettingsService.cs    |  125 +-
 .../Services/LuceneIndexingService.cs         |  445 +++--
 .../Services/LuceneIndexingState.cs           |   89 +-
 .../Services/LuceneQuerySource.cs             |  141 +-
 .../Services/LuceneSearchQueryService.cs      |   53 +-
 ...tentPartFieldIndexSettingsDisplayDriver.cs |   59 +-
 .../ContentPickerFieldLuceneEditorSettings.cs |   13 +-
 ...ntPickerFieldLuceneEditorSettingsDriver.cs |   57 +-
 ...ntentTypePartIndexSettingsDisplayDriver.cs |   59 +-
 .../LuceneContentPickerShapeProvider.cs       |   31 +-
 .../OrchardCore.Search.Lucene/Startup.cs      |  131 +-
 .../ViewModels/AdminIndexViewModel.cs         |   47 +-
 .../ViewModels/AdminQueryViewModel.cs         |   29 +-
 .../ViewModels/IndexViewModel.cs              |   13 +-
 .../LuceneContentIndexSettingsViewModel.cs    |    9 +-
 .../LuceneIndexDeploymentStepViewModel.cs     |   13 +-
 ...ceneIndexRebuildDeploymentStepViewModel.cs |   13 +-
 ...LuceneIndexResetDeploymentStepViewModel.cs |   13 +-
 .../LuceneIndexSettingsViewModel.cs           |   33 +-
 .../ViewModels/LuceneQueryViewModel.cs        |   15 +-
 .../ViewModels/LuceneSettingsViewModel.cs     |   17 +-
 .../ViewModels/QueryIndexViewModel.cs         |   19 +-
 .../OrchardCore.Search/AdminMenu.cs           |   61 +-
 .../SearchSettingsDeploymentSource.cs         |   37 +-
 .../SearchSettingsDeploymentStep.cs           |   17 +-
 .../SearchSettingsDeploymentStepDriver.cs     |   27 +-
 .../Drivers/SearchSettingsDisplayDriver.cs    |   97 +-
 .../Model/SearchSettings.cs                   |   13 +-
 .../Services/SearchSettingsConfiguration.cs   |   29 +-
 .../OrchardCore.Search/Startup.cs             |   79 +-
 .../ViewModel/SearchSettingsViewModel.cs      |   17 +-
 .../OrchardCore.Security/AdminMenu.cs         |   59 +-
 .../Drivers/SecuritySettingsDisplayDriver.cs  |  159 +-
 .../OrchardCoreBuilderExtensions.cs           |   29 +-
 ...rityHeadersApplicationBuilderExtensions.cs |   43 +-
 .../ContentSecurityPolicyOriginValue.cs       |   13 +-
 .../Options/ContentSecurityPolicyValue.cs     |   41 +-
 .../Options/ContentTypeOptionsValue.cs        |    9 +-
 .../Options/PermissionsPolicyOriginValue.cs   |   13 +-
 .../Options/PermissionsPolicyValue.cs         |   67 +-
 .../Options/ReferrerPolicyValue.cs            |   23 +-
 .../Options/SecurityHeadersOptions.cs         |  101 +-
 .../SecurityHeaderDefaults.cs                 |  117 +-
 ...ntentSecurityPolicyHeaderPolicyProvider.cs |   27 +-
 .../ContentTypeOptionsHeaderPolicyProvider.cs |   11 +-
 .../Services/HeaderPolicyProvider.cs          |   19 +-
 .../Services/IHeaderPolicyProvider.cs         |   11 +-
 .../Services/ISecurityService.cs              |    9 +-
 .../PermissionsHeaderPolicyProvider.cs        |   27 +-
 .../Services/ReferrerHeaderPolicyProvider.cs  |   11 +-
 .../Services/SecurityHeadersMiddleware.cs     |   37 +-
 .../Services/SecurityService.cs               |   21 +-
 .../Services/SecuritySettingsConfiguration.cs |   29 +-
 .../Settings/SecuritySettings.cs              |   79 +-
 .../OrchardCore.Security/Startup.cs           |   47 +-
 .../ViewModels/SecuritySettingsViewModel.cs   |   65 +-
 .../Drivers/SeoContentDriver.cs               |  441 +++--
 .../Drivers/SeoMetaPartDisplayDriver.cs       |  197 +-
 .../Handlers/SeoMetaPartHandler.cs            |  345 ++--
 .../Handlers/SeoMetaSettingsHandler.cs        |  301 ++-
 .../OrchardCore.Seo/Migrations.cs             |   81 +-
 .../OrchardCore.Seo/Models/SeoAspect.cs       |   75 +-
 .../OrchardCore.Seo/Models/SeoMetaPart.cs     |   49 +-
 .../Models/SeoMetaPartSettings.cs             |   17 +-
 .../SeoMetaPartSettingsDisplayDriver.cs       |   63 +-
 .../OrchardCore.Seo/Startup.cs                |   43 +-
 .../SeoMetaPartGoogleSchemaViewModel.cs       |   13 +-
 .../SeoMetaPartOpenGraphViewModel.cs          |   17 +-
 .../SeoMetaPartSettingsViewModel.cs           |   19 +-
 .../ViewModels/SeoMetaPartTwitterViewModel.cs |   21 +-
 .../ViewModels/SeoMetaPartViewModel.cs        |   29 +-
 .../OrchardCore.Settings/AdminMenu.cs         |   65 +-
 .../Controllers/AdminController.cs            |  153 +-
 .../SiteSettingsDeploymentSource.cs           |  169 +-
 .../Deployment/SiteSettingsDeploymentStep.cs  |   21 +-
 .../SiteSettingsDeploymentStepDriver.cs       |   45 +-
 .../Drivers/ButtonsSettingsDisplayDriver.cs   |   19 +-
 .../DefaultSiteSettingsDisplayDriver.cs       |  165 +-
 .../Liquid/LiquidSiteSettingsAccessor.cs      |   13 +-
 .../Recipes/SettingsStep.cs                   |  175 +-
 .../Services/DefaultTimeZoneSelector.cs       |   39 +-
 .../RecipeEnvironmentSiteNameProvider.cs      |   29 +-
 .../Services/SetupEventHandler.cs             |   41 +-
 .../Services/SiteService.cs                   |   99 +-
 .../Services/SuperUserHandler.cs              |   51 +-
 .../OrchardCore.Settings/SiteSettings.cs      |   79 +-
 .../OrchardCore.Settings/Startup.cs           |  101 +-
 .../ViewModels/AdminIndexViewModel.cs         |   11 +-
 .../ViewModels/SiteCulturesViewModel.cs       |   13 +-
 .../SiteSettingsDeploymentStepViewModel.cs    |    9 +-
 .../ViewModels/SiteSettingsViewModel.cs       |   31 +-
 .../Controllers/SetupController.cs            |  381 ++--
 .../OrchardCore.Setup/Startup.cs              |  133 +-
 .../ViewModels/SetupViewModel.cs              |   65 +-
 .../OrchardCore.Shortcodes/AdminMenu.cs       |   43 +-
 .../Controllers/AdminController.cs            |  507 +++--
 .../AllShortcodeTemplatesDeploymentSource.cs  |   47 +-
 .../AllShortcodeTemplatesDeploymentStep.cs    |   11 +-
 ...lShortcodeTemplatesDeploymentStepDriver.cs |   27 +-
 .../ShortcodeDescriptorDisplayDriver.cs       |   17 +-
 .../Models/ShortcodeTemplatesDocument.cs      |   25 +-
 .../Providers/LocaleShortcodeProvider.cs      |   65 +-
 .../Recipes/ShortcodeTemplateStep.cs          |   41 +-
 .../DefaultShortcodeContextProvider.cs        |   29 +-
 .../Services/OptionsShortcodeProvider.cs      |   35 +-
 .../Services/ShortcodeDescriptorManager.cs    |   45 +-
 .../ShortcodeOptionsDescriptorProvider.cs     |   37 +-
 .../Services/ShortcodeService.cs              |   39 +-
 .../ShortcodeTemplatesDescriptorProvider.cs   |   41 +-
 .../Services/ShortcodeTemplatesManager.cs     |   49 +-
 .../Services/TemplateShortcodeProvider.cs     |  101 +-
 .../OrchardCore.Shortcodes/Startup.cs         |  115 +-
 .../ShortcodeTemplateIndexViewModel.cs        |   65 +-
 .../ViewModels/ShortcodeTemplateViewModel.cs  |   21 +-
 .../ViewModels/ShortcodeViewModel.cs          |   13 +-
 .../OrchardCore.Sitemaps/AdminMenu.cs         |   61 +-
 .../CustomPathSitemapSourceBuilder.cs         |   99 +-
 ...omPathSitemapSourceModifiedDateProvider.cs |   11 +-
 .../Builders/DefaultSitemapBuilder.cs         |   39 +-
 .../DefaultSitemapModifiedDateProvider.cs     |   37 +-
 .../Builders/SitemapIndexTypeBuilder.cs       |   99 +-
 .../Builders/SitemapTypeBuilder.cs            |   37 +-
 .../Cache/DefaultSitemapCacheProvider.cs      |  241 ++-
 .../Cache/PhysicalSitemapCacheFileResolver.cs |   23 +-
 .../Cache/SitemapCacheBackgroundTask.cs       |   25 +-
 .../Controllers/AdminController.cs            |  517 +++--
 .../Controllers/SitemapCacheController.cs     |  121 +-
 .../Controllers/SitemapController.cs          |  167 +-
 .../Controllers/SitemapIndexController.cs     |  531 +++--
 .../Controllers/SourceController.cs           |  327 ++--
 .../Deployment/AllSitemapsDeploymentSource.cs |   47 +-
 .../Deployment/AllSitemapsDeploymentStep.cs   |   11 +-
 .../AllSitemapsDeploymentStepDriver.cs        |   27 +-
 .../Drivers/CustomPathSitemapSourceDriver.cs  |   93 +-
 .../Drivers/SitemapPartDisplayDriver.cs       |   71 +-
 .../CustomPathSitemapSourceUpdateHandler.cs   |   49 +-
 .../Handlers/DefaultSitemapUpdateHandler.cs   |   51 +-
 .../Handlers/SitemapIndexTypeUpdateHandler.cs |   93 +-
 .../Handlers/SitemapPartHandler.cs            |   25 +-
 .../Handlers/SitemapTypeUpdateHandler.cs      |   25 +-
 .../OrchardCore.Sitemaps/Migrations.cs        |   29 +-
 .../Models/SitemapDocument.cs                 |    9 +-
 .../Models/SitemapIndex.cs                    |    7 +-
 .../Models/SitemapIndexSource.cs              |   21 +-
 .../Models/SitemapPart.cs                     |   21 +-
 .../Recipes/SitemapsStep.cs                   |   57 +-
 .../Routing/SitemapEntries.cs                 |   91 +-
 .../Routing/SitemapRouteDocument.cs           |   11 +-
 .../Routing/SitemapRouteTransformer.cs        |   47 +-
 .../Routing/SitemapValuesAddressScheme.cs     |  113 +-
 .../DefaultRouteableContentTypeCoordinator.cs |   49 +-
 .../Services/RazorPagesContentTypeProvider.cs |   61 +-
 .../Services/SitemapHelperService.cs          |  115 +-
 .../Services/SitemapIdGenerator.cs            |   23 +-
 .../Services/SitemapManager.cs                |  117 +-
 .../OrchardCore.Sitemaps/Startup.cs           |  181 +-
 .../ViewModels/CreateSitemapIndexViewModel.cs |   31 +-
 .../ViewModels/CreateSitemapViewModel.cs      |   15 +-
 .../ViewModels/CreateSourceViewModel.cs       |   19 +-
 .../CustomPathSitemapSourceViewModel.cs       |   31 +-
 .../ViewModels/DisplaySitemapViewModel.cs     |   13 +-
 .../ViewModels/EditSitemapIndexViewModel.cs   |   15 +-
 .../ViewModels/EditSitemapViewModel.cs        |   17 +-
 .../ViewModels/EditSourceViewModel.cs         |   17 +-
 .../ViewModels/ListSitemapCacheViewModel.cs   |    9 +-
 .../ViewModels/ListSitemapIndexViewModel.cs   |   25 +-
 .../ViewModels/ListSitemapViewModel.cs        |   64 +-
 .../ViewModels/SitemapPartViewModel.cs        |   19 +-
 .../Drivers/GeoPointFieldDisplayDriver.cs     |  129 +-
 .../Drivers/GeoPointFieldSettingsDriver.cs    |   33 +-
 .../Fields/GeoPointField.cs                   |   11 +-
 .../Indexing/GeoPointFieldIndexHandler.cs     |   41 +-
 .../ResourceManagementOptionsConfiguration.cs |   47 +-
 .../Settings/GeoPointFieldSettings.cs         |   11 +-
 .../OrchardCore.Spatial/Startup.cs            |   37 +-
 .../DisplayGeoPointFieldViewModel.cs          |   13 +-
 .../ViewModels/EditGeoPointFieldViewModel.cs  |   23 +-
 .../OrchardCore.Taxonomies/AdminMenu.cs       |   59 +-
 .../Controllers/AdminController.cs            |  555 +++---
 .../Controllers/TagController.cs              |  171 +-
 .../TaxonomyContentsAdminListDisplayDriver.cs |  243 ++-
 .../Drivers/TaxonomyFieldDisplayDriver.cs     |  115 +-
 .../Drivers/TaxonomyFieldDriverHelper.cs      |   53 +-
 .../Drivers/TaxonomyFieldTagsDisplayDriver.cs |  149 +-
 .../Drivers/TaxonomyPartDisplayDriver.cs      |  155 +-
 .../Drivers/TermPartContentDriver.cs          |  227 ++-
 .../Fields/TagNamesExtensions.cs              |   39 +-
 .../Fields/TaxonomyField.cs                   |   11 +-
 .../GraphQL/TaxonomyFieldQueryObjectType.cs   |   95 +-
 .../GraphQL/TaxonomyPartQueryObjectType.cs    |   21 +-
 .../Handlers/TaxonomyPartHandler.cs           |   21 +-
 .../Handlers/TermPartContentHandler.cs        |   27 +-
 .../Indexing/TaxonomyFieldIndexHandler.cs     |   63 +-
 .../Indexing/TaxonomyIndex.cs                 |  167 +-
 .../Liquid/InheritedTermsFilter.cs            |   47 +-
 .../Liquid/TaxonomyTermsFilter.cs             |   95 +-
 .../OrchardCore.Taxonomies/Migrations.cs      |  323 ++-
 .../Models/TaxonomyPart.cs                    |   13 +-
 .../OrchardCore.Taxonomies/Models/TermPart.cs |   11 +-
 .../TaxonomyContentsAdminListFilter.cs        |   63 +-
 .../TaxonomyContentsAdminListSettings.cs      |    9 +-
 ...yContentsAdminListSettingsDisplayDriver.cs |   85 +-
 .../Settings/TaxonomyFieldSettings.cs         |   49 +-
 .../Settings/TaxonomyFieldSettingsDriver.cs   |   41 +-
 .../TaxonomyFieldTagsEditorSettings.cs        |   21 +-
 .../TaxonomyFieldTagsEditorSettingsDriver.cs  |   35 +-
 .../OrchardCore.Taxonomies/Startup.cs         |  117 +-
 .../OrchardCore.Taxonomies/TermShapes.cs      |  451 +++--
 .../ViewModels/CreatedTagViewModel.cs         |   11 +-
 .../DisplayTaxonomyFieldTagsViewModel.cs      |    9 +-
 .../DisplayTaxonomyFieldViewModel.cs          |   17 +-
 .../EditTagTaxonomyFieldViewModel.cs          |   43 +-
 .../ViewModels/EditTaxonomyFieldViewModel.cs  |   47 +-
 .../TaxonomyContentsAdminFilterViewModel.cs   |   17 +-
 ...onomyContentsAdminListSettingsViewModel.cs |   21 +-
 .../ViewModels/TaxonomyPartEditViewModel.cs   |   15 +-
 .../ViewModels/TaxonomyPartViewModel.cs       |   17 +-
 .../ViewModels/TermPartViewModel.cs           |   19 +-
 .../OrchardCore.Templates/AdminMenu.cs        |   43 +-
 .../AdminTemplatesAdminMenu.cs                |   43 +-
 .../Controllers/PreviewController.cs          |  141 +-
 .../Controllers/TemplateController.cs         |  597 +++---
 .../AllAdminTemplatesDeploymentSource.cs      |   65 +-
 .../AllAdminTemplatesDeploymentStep.cs        |   19 +-
 .../AllAdminTemplatesDeploymentStepDriver.cs  |   41 +-
 .../AllTemplatesDeploymentSource.cs           |   69 +-
 .../Deployment/AllTemplatesDeploymentStep.cs  |   19 +-
 .../AllTemplatesDeploymentStepDriver.cs       |   41 +-
 .../Models/AdminTemplatesDocument.cs          |    7 +-
 .../Models/TemplatesDocument.cs               |   19 +-
 .../Recipes/AdminTemplateStep.cs              |   41 +-
 .../Recipes/TemplateStep.cs                   |   43 +-
 .../ResourceManagementOptionsConfiguration.cs |   31 +-
 .../Services/AdminPreviewTemplatesProvider.cs |   57 +-
 .../Services/AdminTemplatesManager.cs         |   49 +-
 .../AdminTemplatesShapeBindingResolver.cs     |  101 +-
 .../Services/PreviewTemplatesProvider.cs      |   57 +-
 .../Services/TemplatesManager.cs              |   49 +-
 .../Services/TemplatesShapeBindingResolver.cs |   99 +-
 .../TemplateContentPartDefinitionDriver.cs    |   49 +-
 .../TemplateContentTypeDefinitionDriver.cs    |   55 +-
 ...TemplateContentTypePartDefinitionDriver.cs |   53 +-
 .../OrchardCore.Templates/Startup.cs          |   57 +-
 ...llAdminTemplatesDeploymentStepViewModel.cs |    9 +-
 .../AllTemplatesDeploymentStepViewModel.cs    |    9 +-
 .../ViewModels/ContentSettingsViewModel.cs    |   19 +-
 .../ViewModels/TemplateIndexViewModel.cs      |   67 +-
 .../ViewModels/TemplateViewModel.cs           |   15 +-
 .../OrchardCore.Tenants/AdminMenu.cs          |   61 +-
 .../Controllers/AdminController.cs            | 1057 +++++-----
 .../Controllers/FeatureProfilesController.cs  |  403 ++--
 .../Controllers/TenantApiController.cs        |  737 ++++---
 .../AllFeatureProfilesDeploymentSource.cs     |   47 +-
 .../AllFeatureProfilesDeploymentStep.cs       |   11 +-
 .../AllFeatureProfilesDeploymentStepDriver.cs |   27 +-
 .../FeatureProfilesAdminMenu.cs               |   59 +-
 .../Recipes/FeatureProfilesStep.cs            |   41 +-
 .../Services/FeatureProfilesManager.cs        |   49 +-
 .../Services/FeatureProfilesSchemaService.cs  |   75 +-
 .../Services/FeatureProfilesService.cs        |   25 +-
 .../Services/IFeatureProfilesSchemaService.cs |    9 +-
 .../Services/ITenantFileProvider.cs           |    7 +-
 .../Services/ITenantValidator.cs              |    9 +-
 .../Services/TenantFileProvider.cs            |   15 +-
 .../Services/TenantValidator.cs               |  237 ++-
 .../OrchardCore.Tenants/Startup.cs            |  179 +-
 .../ViewModels/AdminIndexViewModel.cs         |  125 +-
 .../ViewModels/CreateApiViewModel.cs          |    7 +-
 .../ViewModels/EditTenantViewModel.cs         |   15 +-
 .../ViewModels/FeatureProfileViewModel.cs     |   19 +-
 .../FeatureProfilesIndexViewModel.cs          |   55 +-
 .../ViewModels/SetupApiViewModel.cs           |   53 +-
 .../ViewModels/TenantViewModel.cs             |    7 +-
 .../Workflows/Activities/CreateTenantTask.cs  |  269 ++-
 .../Workflows/Activities/DisableTenantTask.cs |   75 +-
 .../Workflows/Activities/EnableTenantTask.cs  |   75 +-
 .../Workflows/Activities/SetupTenantTask.cs   |  323 ++-
 .../Workflows/Activities/TenantActivity.cs    |   69 +-
 .../Workflows/Activities/TenantTask.cs        |   11 +-
 .../Drivers/CreateTenantTaskDisplayDriver.cs  |   55 +-
 .../Drivers/DisableTenantTaskDisplayDriver.cs |   19 +-
 .../Drivers/EnableTenantTaskDisplayDriver.cs  |   19 +-
 .../Drivers/SetupTenantTaskDisplayDriver.cs   |   55 +-
 .../Drivers/TenantTaskDisplayDriver.cs        |   23 +-
 .../OrchardCore.Tenants/Workflows/Startup.cs  |   19 +-
 .../ViewModels/CreateTenantTaskViewModel.cs   |   25 +-
 .../ViewModels/DisableTenantTaskViewModel.cs  |    7 +-
 .../ViewModels/EnableTenantTaskViewModel.cs   |    7 +-
 .../ViewModels/SetupTenantTaskViewModel.cs    |   25 +-
 .../ViewModels/TenantTaskViewModel.cs         |   21 +-
 .../OrchardCore.Themes/AdminMenu.cs           |   45 +-
 .../ThemeCacheContextProvider.cs              |   27 +-
 .../Controllers/AdminController.cs            |  337 ++--
 .../Deployment/ThemesDeploymentSource.cs      |   43 +-
 .../Deployment/ThemesDeploymentStep.cs        |   17 +-
 .../Deployment/ThemesDeploymentStepDriver.cs  |   25 +-
 .../Models/SelectThemesViewModel.cs           |   13 +-
 .../OrchardCore.Themes/Models/ThemeEntry.cs   |  117 +-
 .../OrchardCore.Themes/Recipes/ThemesStep.cs  |   67 +-
 .../Services/ISiteThemeService.cs             |   13 +-
 .../Services/IThemeService.cs                 |   11 +-
 .../Services/SiteThemeSelector.cs             |   45 +-
 .../Services/SiteThemeService.cs              |   59 +-
 .../Services/ThemeService.cs                  |  215 +-
 .../OrchardCore.Themes/Startup.cs             |   37 +-
 .../ViewModels/SelectThemesViewModel.cs       |   13 +-
 .../Drivers/TitlePartDisplayDriver.cs         |   83 +-
 .../Handlers/TitlePartHandler.cs              |  141 +-
 .../Indexing/TitlePartIndexHandler.cs         |   21 +-
 .../OrchardCore.Title/Migrations.cs           |  145 +-
 .../OrchardCore.Title/Models/TitlePart.cs     |    9 +-
 .../Models/TitlePartSettings.cs               |   49 +-
 .../RemotePublishingStartup.cs                |   13 +-
 .../RemotePublishing/TitleMetaWeblogDriver.cs |   37 +-
 .../TitlePartSettingsDisplayDriver.cs         |   75 +-
 .../OrchardCore.Title/Startup.cs              |   31 +-
 .../ViewModels/TitlePartSettingsViewModel.cs  |   17 +-
 .../ViewModels/TitlePartViewModel.cs          |   21 +-
 .../OrchardCore.Twitter/AdminMenuSignin.cs    |  115 +-
 .../Drivers/TwitterSettingsDisplayDriver.cs   |  159 +-
 .../OrchardCoreBuilderExtensions.cs           |   29 +-
 .../Recipes/TwitterSettingsStep.cs            |   59 +-
 .../Services/ITwitterSettingsService.cs       |   15 +-
 .../Services/TwitterClient.cs                 |   77 +-
 .../Services/TwitterClientMessageHandler.cs   |  157 +-
 .../Services/TwitterSettingsService.cs        |   97 +-
 .../Settings/TwitterSettings.cs               |   15 +-
 .../TwitterOptionsConfiguration.cs            |  173 +-
 .../TwitterSigninSettingsDisplayDriver.cs     |   85 +-
 .../Signin/Services/ITwitterSigninService.cs  |   13 +-
 .../Signin/Services/TwitterSigninService.cs   |   49 +-
 .../Signin/Settings/TwitterSigninSettings.cs  |   11 +-
 .../TwitterSigninSettingsViewModel.cs         |   13 +-
 .../OrchardCore.Twitter/Startup.cs            |   93 +-
 .../OrchardCore.Twitter/TwitterConstants.cs   |   13 +-
 .../ViewModels/TwitterSettingsViewModel.cs    |   25 +-
 .../Workflows/Activities/UpdateXStatusTask.cs |   85 +-
 .../UpdateTwitterStatusTaskDisplayDriver.cs   |   19 +-
 .../OrchardCore.Twitter/Workflows/Startup.cs  |   13 +-
 .../UpdateTwitterStatusTaskViewModel.cs       |   11 +-
 .../OrchardCore.Users/AdminMenu.cs            |  235 ++-
 .../AuditTrailUserEventDisplayDriver.cs       |   31 +-
 .../AuditTrail/Handlers/UserEventHandler.cs   |  165 +-
 .../AuditTrail/Models/AuditTrailUserEvent.cs  |   15 +-
 .../AuditTrail/Registration/Startup.cs        |   15 +-
 ...egistrationAuditTrailEventConfiguration.cs |   19 +-
 .../UserRegistrationEventHandler.cs           |   89 +-
 .../AuditTrail/ResetPassword/Startup.cs       |   15 +-
 ...setPasswordAuditTrailEventConfiguration.cs |   23 +-
 .../UserResetPasswordEventHandler.cs          |   97 +-
 .../UserAuditTrailEventConfiguration.cs       |   49 +-
 .../OrchardCore.Users/AuditTrail/Startup.cs   |   21 +-
 .../AuditTrailUserEventDetailViewModel.cs     |    7 +-
 .../AuditTrailUserEventViewModel.cs           |   21 +-
 .../CacheTicketStoreStartup.cs                |   13 +-
 .../Commands/UserCommands.cs                  |   71 +-
 .../Controllers/AccountController.cs          | 1391 +++++++------
 .../Controllers/AdminController.cs            |  841 ++++----
 .../Controllers/ChangeEmailController.cs      |  129 +-
 .../Controllers/RegistrationController.cs     |  171 +-
 .../Controllers/ResetPasswordController.cs    |  267 ++-
 .../CookieAuthenticationOptionsConfigure.cs   |   49 +-
 .../CustomUserSettingsDeploymentStepDriver.cs |   59 +-
 .../ChangeEmailSettingsDisplayDriver.cs       |   73 +-
 .../CustomUserSettingsDisplayDriver.cs        |  153 +-
 .../Drivers/LoginSettingsDisplayDriver.cs     |   75 +-
 .../RegistrationSettingsDisplayDriver.cs      |   87 +-
 .../ResetPasswordSettingsDisplayDriver.cs     |   75 +-
 .../Drivers/UserButtonsDisplayDriver.cs       |   11 +-
 .../Drivers/UserDisplayDriver.cs              |  213 +-
 .../Drivers/UserInformationDisplayDriver.cs   |  201 +-
 .../Drivers/UserOptionsDisplayDriver.cs       |  105 +-
 .../Drivers/UserRoleDisplayDriver.cs          |  271 ++-
 .../Extensions/ControllerExtensions.cs        |  163 +-
 .../ScriptExternalLoginEventHandler.cs        |  143 +-
 .../Liquid/HasPermissionFilter.cs             |   47 +-
 .../Liquid/IsInRoleFilter.cs                  |   45 +-
 .../Liquid/LiquidUserAccessor.cs              |   13 +-
 .../Liquid/UserEmailFilter.cs                 |   57 +-
 .../OrchardCore.Users/Liquid/UserFilters.cs   |   57 +-
 .../Liquid/UsersByIdFilter.cs                 |   69 +-
 .../Localization/UserLocalizationConstants.cs |    9 +-
 .../OrchardCore.Users/Migrations.cs           |  489 +++--
 .../Models/ChangeEmailSettings.cs             |    9 +-
 .../Models/RegistrationSettings.cs            |   25 +-
 .../Models/ResetPasswordSettings.cs           |   11 +-
 .../Models/UserRegistrationType.cs            |   13 +-
 ...ppProviderTwoFactorOptionsConfiguration.cs |    2 +-
 .../Services/DefaultUserIdGenerator.cs        |   23 +-
 .../DefaultUsersAdminListFilterParser.cs      |   21 +-
 .../DefaultUsersAdminListFilterProvider.cs    |  231 ++-
 .../Services/EmailClaimsProvider.cs           |   43 +-
 .../Services/MembershipService.cs             |   57 +-
 .../RecipeEnvironmentSuperUserProvider.cs     |   69 +-
 .../Services/SetupEventHandler.cs             |   49 +-
 .../Services/UserRoleRemovedEventHandler.cs   |   27 +-
 .../Services/UsersThemeSelector.cs            |  135 +-
 .../OrchardCore.Users/Startup.cs              |  847 ++++----
 .../Drivers/UserTimeZoneDisplayDriver.cs      |   45 +-
 .../TimeZone/Models/UserTimeZone.cs           |    9 +-
 .../OrchardCore.Users/TimeZone/Startup.cs     |   17 +-
 .../ViewModel/UserTimeZoneViewModel.cs        |    9 +-
 .../UserOptionsConfiguration.cs               |   39 +-
 .../ViewModels/ChangeEmailViewModel.cs        |   13 +-
 .../ViewModels/ChangePasswordViewModel.cs     |   25 +-
 .../ViewModels/ConfirmEmailViewModel.cs       |   17 +-
 .../ViewModels/EditUserRoleViewModel.cs       |   19 +-
 .../ViewModels/EditUserViewModel.cs           |   29 +-
 .../ViewModels/ExternalLoginsViewModel.cs     |   15 +-
 .../ViewModels/ForgotPasswordViewModel.cs     |   17 +-
 .../ViewModels/LinkExternalLoginViewModel.cs  |   13 +-
 .../ViewModels/LoginViewModel.cs              |   21 +-
 .../ViewModels/LostPasswordViewModel.cs       |   17 +-
 .../RegisterExternalLoginViewModel.cs         |   81 +-
 .../ViewModels/RegisterViewModel.cs           |   29 +-
 .../ViewModels/RemoveLoginViewModel.cs        |   11 +-
 .../ViewModels/ResetPasswordViewModel.cs      |   31 +-
 .../ViewModels/SummaryAdminUserViewModel.cs   |    9 +-
 .../ViewModels/UsersIndexViewModel.cs         |   25 +-
 .../Activities/AssignUserRoleTask.cs          |   99 +-
 .../Workflows/Activities/RegisterUserTask.cs  |  217 ++-
 .../Workflows/Activities/UserActivity.cs      |   69 +-
 .../Workflows/Activities/UserCreatedEvent.cs  |   15 +-
 .../Workflows/Activities/UserDeletedEvent.cs  |   15 +-
 .../Workflows/Activities/UserDisabledEvent.cs |   15 +-
 .../Workflows/Activities/UserEnabledEvent.cs  |   15 +-
 .../Workflows/Activities/UserEvent.cs         |   25 +-
 .../Workflows/Activities/UserLoggedInEvent.cs |   15 +-
 .../Workflows/Activities/UserUpdatedEvent.cs  |   15 +-
 .../Workflows/Activities/ValidateUserTask.cs  |   99 +-
 .../AssignUserRoleTaskDisplayDriver.cs        |   23 +-
 .../Drivers/RegisterUserTaskDisplayDriver.cs  |   67 +-
 .../Drivers/UserCreatedEventDisplayDriver.cs  |   29 +-
 .../Drivers/UserDeletedEventDisplayDriver.cs  |   29 +-
 .../Drivers/UserDisabledEventDisplayDriver.cs |   29 +-
 .../Drivers/UserEnabledEventDisplayDriver.cs  |   29 +-
 .../Drivers/UserLoggedInEventDisplayDriver.cs |   29 +-
 .../Drivers/UserUpdatedEventDisplayDriver.cs  |   29 +-
 .../Drivers/ValidateUserTaskDisplayDriver.cs  |   23 +-
 .../Workflows/Handlers/UserEventHandler.cs    |   81 +-
 .../OrchardCore.Users/Workflows/Startup.cs    |   41 +-
 .../ViewModels/AssignUserRoleTaskViewModel.cs |   15 +-
 .../ViewModels/RegisterUserTaskViewModel.cs   |   15 +-
 .../ViewModels/UserCreatedEventViewModel.cs   |   17 +-
 .../ViewModels/UserDeletedEventViewModel.cs   |   17 +-
 .../ViewModels/UserDisabledEventViewModel.cs  |   17 +-
 .../ViewModels/UserEnabledEventViewModel.cs   |   17 +-
 .../ViewModels/UserEventViewModel.cs          |   17 +-
 .../ViewModels/UserLoggedInEventViewModel.cs  |   17 +-
 .../ViewModels/UserUpdatedEventViewModel.cs   |   17 +-
 .../ViewModels/ValidateUserTaskViewModel.cs   |   11 +-
 .../OrchardCore.Widgets/ContentCardShapes.cs  |  257 ++-
 .../Controllers/AdminController.cs            |  127 +-
 .../Drivers/WidgetsListPartDisplayDriver.cs   |  169 +-
 .../OrchardCore.Widgets/Migrations.cs         |   31 +-
 .../Models/WidgetMetadata.cs                  |   11 +-
 .../Models/WidgetsListPart.cs                 |   11 +-
 .../Settings/WidgetsListPartSettings.cs       |    9 +-
 .../WidgetsListPartSettingsDisplayDriver.cs   |   37 +-
 .../WidgetsListPartSettingsViewModel.cs       |   11 +-
 .../OrchardCore.Widgets/Startup.cs            |   29 +-
 .../ViewModels/BuildEditorViewModel.cs        |    9 +-
 .../WidgetsListPartEditViewModel.cs           |   25 +-
 .../Activities/CommitTransactionTask.cs       |   57 +-
 .../Activities/CorrelateTask.cs               |   80 +-
 .../Activities/ForEachTask.cs                 |  129 +-
 .../Activities/ForLoopTask.cs                 |  157 +-
 .../Activities/ForkTask.cs                    |   45 +-
 .../Activities/IfElseTask.cs                  |   67 +-
 .../Activities/JoinTask.cs                    |  167 +-
 .../Activities/LogTask.cs                     |   83 +-
 .../Activities/MissingActivity.cs             |   53 +-
 .../Activities/NotifyTask.cs                  |   97 +-
 .../Activities/ScriptTask.cs                  |   83 +-
 .../Activities/SetOutputTask.cs               |   77 +-
 .../Activities/SetPropertyTask.cs             |   77 +-
 .../Activities/WhileLoopTask.cs               |   67 +-
 .../OrchardCore.Workflows/AdminMenu.cs        |   43 +-
 .../Controllers/ActivityController.cs         |  271 ++-
 .../Controllers/WorkflowController.cs         |  515 +++--
 .../Controllers/WorkflowTypeController.cs     |  893 +++++----
 .../AllWorkflowTypeDeploymentSource.cs        |   65 +-
 .../AllWorkflowTypeDeploymentStep.cs          |   11 +-
 .../AllWorkflowTypeDeploymentStepDriver.cs    |   27 +-
 .../Drivers/ActivityMetadataDisplayDriver.cs  |   29 +-
 .../CommitTransactionTaskDisplayDriver.cs     |   15 +-
 .../Drivers/CorrelateTaskDisplayDriver.cs     |   23 +-
 .../Drivers/ForEachTaskDisplayDriver.cs       |   23 +-
 .../Drivers/ForLoopTaskDisplayDriver.cs       |   31 +-
 .../Drivers/ForkTaskDisplayDriver.cs          |   19 +-
 .../Drivers/IfElseTaskDisplayDriver.cs        |   19 +-
 .../Drivers/JoinTaskDisplayDriver.cs          |   19 +-
 .../Drivers/LogTaskDisplayDriver.cs           |   23 +-
 .../Drivers/MissingActivityDisplayDriver.cs   |   13 +-
 .../Drivers/NotifyTaskDisplayDriver.cs        |   23 +-
 .../Drivers/ScriptTaskDisplayDriver.cs        |   23 +-
 .../Drivers/SetOutputTaskDisplayDriver.cs     |   23 +-
 .../Drivers/SetVariableTaskDisplayDriver.cs   |   23 +-
 .../Drivers/WhileLoopTaskDisplayDriver.cs     |   19 +-
 .../WorkflowFaultEventDisplayDriver.cs        |   19 +-
 .../Events/WorkflowFaultEvent.cs              |   83 +-
 .../LiquidWorkflowExpressionEvaluator.cs      |   77 +-
 .../DefaultWorkflowExecutionContextHandler.cs |   13 +-
 .../Handlers/DefaultWorkflowFaultHandler.cs   |   51 +-
 .../Http/Activities/HttpRedirectTask.cs       |   93 +-
 .../Http/Activities/HttpRequestEvent.cs       |  147 +-
 .../Http/Activities/HttpRequestFilterEvent.cs |  153 +-
 .../Http/Activities/HttpRequestTask.cs        |  365 ++--
 .../Http/Activities/HttpResponseTask.cs       |  159 +-
 .../Http/Activities/SignalEvent.cs            |   73 +-
 .../Controllers/HttpWorkflowController.cs     |  391 ++--
 .../Drivers/HttpRedirectTaskDisplayDriver.cs  |   23 +-
 .../Drivers/HttpRequestEventDisplayDriver.cs  |   35 +-
 .../HttpRequestFilterEventDisplayDriver.cs    |   39 +-
 .../Drivers/HttpRequestTaskDisplayDriver.cs   |   39 +-
 .../Drivers/HttpResponseTaskDisplayDriver.cs  |   31 +-
 .../Http/Drivers/SignalEventDisplayDriver.cs  |   19 +-
 .../Http/Filters/WorkflowActionFilter.cs      |  169 +-
 .../SignalWorkflowExecutionContextHandler.cs  |   25 +-
 .../Http/Handlers/WorkflowRoutesHandler.cs    |   79 +-
 .../Handlers/WorkflowTypeRoutesHandler.cs     |   53 +-
 .../Http/Liquid/SignalUrlFilter.cs            |   53 +-
 .../Http/Models/SignalPayload.cs              |   39 +-
 .../Http/Models/WorkflowPayload.cs            |   19 +-
 .../Http/Models/WorkflowRouteDocument.cs      |    9 +-
 .../Http/Models/WorkflowRoutesEntry.cs        |   21 +-
 .../Http/Models/WorkflowTypeRouteDocument.cs  |    7 +-
 .../Http/Scripting/HttpMethodsProvider.cs     |  336 ++--
 .../Http/Scripting/SignalMethodProvider.cs    |   85 +-
 .../Services/IWorkflowInstanceRouteEntries.cs |    7 +-
 .../Http/Services/IWorkflowRouteEntries.cs    |   13 +-
 .../Services/IWorkflowTypeRouteEntries.cs     |    7 +-
 .../Services/WorkflowInstanceRouteEntries.cs  |   93 +-
 .../Http/Services/WorkflowRouteEntriesOfT.cs  |  109 +-
 .../Http/Services/WorkflowTypeRouteEntries.cs |   57 +-
 .../OrchardCore.Workflows/Http/Startup.cs     |   77 +-
 .../ViewModels/HttpRedirectTaskViewModel.cs   |   13 +-
 .../ViewModels/HttpRequestEventViewModel.cs   |   39 +-
 .../HttpRequestFilterEventViewModel.cs        |   21 +-
 .../ViewModels/HttpRequestTaskViewModel.cs    |   23 +-
 .../ViewModels/HttpResponseTaskViewModel.cs   |   15 +-
 .../Indexes/WorkflowIndexProvider.cs          |   89 +-
 .../Indexes/WorkflowTypeIndexProvider.cs      |   85 +-
 .../OrchardCore.Workflows/Migrations.cs       |  275 ++-
 .../OrchardCore.Workflows/Permissions.cs      |    2 +-
 .../Recipes/WorkflowTypeStep.cs               |  125 +-
 .../ResourceManagementOptionsConfiguration.cs |   49 +-
 .../JavaScriptWorkflowScriptEvaluator.cs      |   53 +-
 .../Scripting/OutcomeMethodProvider.cs        |   29 +-
 .../Scripting/WorkflowMethodsProvider.cs      |  125 +-
 .../Services/ActivityDisplayManager.cs        |   57 +-
 .../Services/ActivityIdGenerator.cs           |   23 +-
 .../Services/ActivityLibrary.cs               |   93 +-
 .../Services/LocalizedStringComparer.cs       |   19 +-
 .../Services/Resolver.cs                      |   27 +-
 .../Services/SecurityTokenService.cs          |   61 +-
 .../Services/WorkflowIdGenerator.cs           |   23 +-
 .../Services/WorkflowManager.cs               |  891 +++++----
 .../Services/WorkflowStore.cs                 |  219 ++-
 .../Services/WorkflowTypeIdGenerator.cs       |   23 +-
 .../Services/WorkflowTypeStore.cs             |  121 +-
 .../OrchardCore.Workflows/Startup.cs          |  117 +-
 .../OrchardCore.Workflows/Timers/Startup.cs   |   15 +-
 .../Timers/TimerBackgroundTask.cs             |   21 +-
 .../Timers/TimerEvent.cs                      |   91 +-
 .../Timers/TimerEventDisplayDriver.cs         |   19 +-
 .../Timers/TimerEventViewModel.cs             |   11 +-
 .../UserTasks/Activities/UserTaskEvent.cs     |   91 +-
 .../Drivers/UserTaskEventContentDriver.cs     |  187 +-
 .../Drivers/UserTaskEventDisplayDriver.cs     |   23 +-
 .../UserTasks/Startup.cs                      |   15 +-
 .../UserTaskEventContentViewModel.cs          |    9 +-
 .../ViewModels/UserTaskEventViewModel.cs      |   11 +-
 .../SelectWorkflowTypeViewComponent.cs        |   33 +-
 .../ViewModels/ActivityEditViewModel.cs       |   17 +-
 .../ActivityMetadataEditViewModel.cs          |    9 +-
 .../CommitTransactionTaskViewModel.cs         |    7 +-
 .../ViewModels/CorrelateTaskViewModel.cs      |   11 +-
 .../ViewModels/ForEachTaskViewModel.cs        |   15 +-
 .../ViewModels/ForLoopTaskViewModel.cs        |   15 +-
 .../ViewModels/ForkTaskViewModel.cs           |    9 +-
 .../ViewModels/IfElseTaskViewModel.cs         |    9 +-
 .../ViewModels/JoinTaskViewModel.cs           |    9 +-
 .../ViewModels/LogTaskViewModel.cs            |   13 +-
 .../ViewModels/NotifyTaskViewModel.cs         |   13 +-
 .../ViewModels/ScriptTaskViewModel.cs         |   15 +-
 .../ViewModels/SelectWorkflowTypeViewModel.cs |   45 +-
 .../ViewModels/SetOutputTaskViewModel.cs      |   13 +-
 .../ViewModels/SetPropertyTaskViewModel.cs    |   13 +-
 .../ViewModels/SignalEventViewModel.cs        |   11 +-
 .../ViewModels/WhileLoopTaskViewModel.cs      |   11 +-
 .../ViewModels/WorkflowFaultViewModel.cs      |   11 +-
 .../ViewModels/WorkflowIndexViewModel.cs      |   97 +-
 .../ViewModels/WorkflowTypeIndexViewModel.cs  |   89 +-
 .../WorkflowTypePropertiesViewModel.cs        |   25 +-
 .../ViewModels/WorkflowTypeUpdateModel.cs     |   11 +-
 .../ViewModels/WorkflowTypeViewModel.cs       |   25 +-
 .../ViewModels/WorkflowViewModel.cs           |   17 +-
 .../WorkflowPruning/AdminMenu.cs              |    2 +-
 .../Drivers/WorkflowPruningDisplayDriver.cs   |    2 +-
 .../Models/WorkflowPruningSettings.cs         |    2 +-
 .../Controllers/HomeController.cs             |  125 +-
 .../Controllers/MetaWeblogController.cs       |   77 +-
 .../MethodCallModelBinder.cs                  |   33 +-
 .../Services/XmlRpcReader.cs                  |  215 +-
 .../Services/XmlRpcWriter.cs                  |  195 +-
 .../OrchardCore.XmlRpc/Startup.cs             |   53 +-
 .../ResourceManagementOptionsConfiguration.cs |   51 +-
 src/OrchardCore.Themes/TheAdmin/Startup.cs    |   25 +-
 .../ResourceManagementOptionsConfiguration.cs |   69 +-
 .../TheAgencyTheme/Startup.cs                 |   11 +-
 .../ResourceManagementOptionsConfiguration.cs |   69 +-
 .../TheBlogTheme/Startup.cs                   |   11 +-
 .../ResourceManagementOptionsConfiguration.cs |   67 +-
 .../TheComingSoonTheme/Startup.cs             |   11 +-
 .../TheTheme/Controllers/HomeController.cs    |   11 +-
 .../BackgroundJobs/HttpBackgroundJob.cs       |    2 +-
 .../BackgroundTaskAttribute.cs                |   83 +-
 .../BackgroundTaskEventContext.cs             |   27 +-
 .../BackgroundTaskExtensions.cs               |   53 +-
 .../BackgroundTasks/BackgroundTaskSettings.cs |  103 +-
 .../BackgroundTasks/BackgroundTaskState.cs    |   11 +-
 .../DistributedLockExtensions.cs              |   29 +-
 .../BackgroundTasks/IBackgroundTask.cs        |    9 +-
 .../IBackgroundTaskEventHandler.cs            |   27 +-
 .../IBackgroundTaskSettingsProvider.cs        |   11 +-
 .../Caching/Distributed/IMessageBus.cs        |   11 +-
 .../Caching/ISignal.cs                        |   27 +-
 .../Extensions/ExtensionEntry.cs              |   15 +-
 .../ExtensionsEnvironmentExtensions.cs        |   19 +-
 .../Features/IFeatureBuilderEvents.cs         |   53 +-
 .../Extensions/Features/IFeatureHash.cs       |   47 +-
 .../Extensions/Features/IFeatureInfo.cs       |   27 +-
 .../Extensions/Features/IFeaturesProvider.cs  |   27 +-
 .../Features/ITypeFeatureProvider.cs          |   67 +-
 .../IExtensionDependencyStrategy.cs           |    9 +-
 .../Extensions/IExtensionInfo.cs              |   47 +-
 .../Extensions/IExtensionManager.cs           |   25 +-
 .../Extensions/IExtensionPriorityStrategy.cs  |    9 +-
 .../Extensions/Manifests/IManifestInfo.cs     |   25 +-
 .../Manifests/NotFoundManifestInfo.cs         |   25 +-
 .../Extensions/NotFoundExtensionInfo.cs       |   29 +-
 .../Extensions/Utility/DependencyOrdering.cs  |  127 +-
 .../IOrchardHelper.cs                         |    9 +-
 .../OrchardCore.Abstractions/IdGenerator.cs   |   83 +-
 .../Json/Nodes/JNode.cs                       |    4 +-
 .../Localization/CalendarName.cs              |   27 +-
 .../Localization/CalendarSelectorResult.cs    |   25 +-
 .../Localization/CultureScope.cs              |  137 +-
 .../Localization/ICalendarManager.cs          |   19 +-
 .../Localization/ICalendarSelector.cs         |   19 +-
 .../Localization/ILocalizationService.cs      |   55 +-
 .../Locking/Distributed/IDistributedLock.cs   |    7 +-
 .../Locking/ILocalLock.cs                     |    7 +-
 .../OrchardCore.Abstractions/Locking/ILock.cs |   35 +-
 .../Locking/ILocker.cs                        |    7 +-
 .../Modules/Application.cs                    |   77 +-
 .../AssemblyAttributeModuleNamesProvider.cs   |   25 +-
 .../OrchardCore.Abstractions/Modules/Asset.cs |   37 +-
 .../Modules/BackgroundServiceOptions.cs       |    9 +-
 .../Modules/Builder/OrchardCoreBuilder.cs     |  233 ++-
 .../Modules/Builder/StartupActions.cs         |   21 +-
 .../Modules/Builder/StartupActionsStartup.cs  |   65 +-
 .../Modules/Exceptions/ExceptionExtensions.cs |   35 +-
 .../Modules/Extensions/InvokeExtensions.cs    |  419 ++--
 .../Modules/Extensions/StringExtensions.cs    |   31 +-
 .../Modules/FeatureAttribute.cs               |   33 +-
 .../EmbeddedDirectoryContents.cs              |   41 +-
 .../FileProviders/EmbeddedDirectoryInfo.cs    |   97 +-
 .../FileProviders/FileInfoExtensions.cs       |   33 +-
 .../FileProviders/IStaticFileProvider.cs      |   15 +-
 .../FileProviders/IVirtualPathBaseProvider.cs |    9 +-
 .../Modules/FileProviders/NormalizedPaths.cs  |   65 +-
 .../Modules/IAsyncStartup.cs                  |   23 +-
 .../Modules/IModularTenantEvents.cs           |   53 +-
 .../Modules/IModuleNamesProvider.cs           |    9 +-
 .../Modules/IModuleStaticFileProvider.cs      |   15 +-
 .../Modules/IStartup.cs                       |   53 +-
 .../Modules/Manifest/FeatureAttribute.cs      |  609 +++---
 .../Modules/Manifest/ModuleAssetAttribute.cs  |   29 +-
 .../Modules/Manifest/ModuleAttribute.cs       |  637 +++---
 .../Modules/Manifest/ModuleMarkerAttribute.cs |   33 +-
 .../Modules/Manifest/ModuleNameAttribute.cs   |   29 +-
 .../Modules/Model/ITimeZone.cs                |   15 +-
 .../Modules/ModularApplicationContext.cs      |   77 +-
 .../Modules/Module.cs                         |  245 ++-
 .../ModuleCompositeStaticFileProvider.cs      |   23 +-
 .../Modules/ModuleEmbeddedFileProvider.cs     |  157 +-
 .../ModuleEmbeddedStaticFileProvider.cs       |   89 +-
 .../ModuleProjectStaticFileProvider.cs        |  181 +-
 .../TenantJsonConfigurationExtensions.cs      |  171 +-
 .../TenantJsonConfigurationProvider.cs        |   29 +-
 .../TenantJsonConfigurationSource.cs          |   25 +-
 .../TenantJsonStreamConfigurationProvider.cs  |   33 +-
 .../TenantJsonStreamConfigurationSource.cs    |   23 +-
 .../Modules/RequireFeaturesAttribute.cs       |   51 +-
 .../Modules/Services/ClockExtensions.cs       |   55 +-
 .../Modules/Services/IClock.cs                |   61 +-
 .../Modules/Services/ILocalClock.cs           |   41 +-
 .../Modules/Services/ISlugService.cs          |   35 +-
 .../Modules/Services/ITimeZoneSelector.cs     |   15 +-
 .../Services/TimeZoneSelectorResult.cs        |   11 +-
 .../Modules/ShellRequestPipeline.cs           |   11 +-
 .../Modules/StartupBase.cs                    |   35 +-
 .../Routing/FormValueRequiredAttribute.cs     |   17 +-
 .../Routing/FormValueRequiredMatcherPolicy.cs |   85 +-
 .../Routing/IShellRouteValuesAddressScheme.cs |   13 +-
 .../Routing/PathStringExtensions.cs           |   59 +-
 .../Routing/ShellRouteValuesAddressScheme.cs  |   77 +-
 .../Setup/SetupConstants.cs                   |   31 +-
 .../Extensions/ClonedSingletonDescriptor.cs   |   47 +-
 .../Extensions/ServiceDescriptorExtensions.cs |  105 +-
 .../Extensions/ServiceProviderExtensions.cs   |   53 +-
 .../Shell/Builders/ICompositionStrategy.cs    |   19 +-
 .../Shell/Builders/IShellContainerFactory.cs  |    9 +-
 .../Shell/Builders/IShellContextFactory.cs    |   39 +-
 .../Shell/Builders/IShellPipeline.cs          |   15 +-
 .../Shell/Builders/Models/ShellBlueprint.cs   |   23 +-
 .../Shell/Builders/ShellContext.cs            |  445 +++--
 .../Shell/Builders/ShellContextExtensions.cs  |   91 +-
 .../Shell/Builders/ShellContextOptions.cs     |   51 +-
 .../ConfigurationSectionExtensions.cs         |   85 +-
 .../Configuration/IShellConfiguration.cs      |    7 +-
 .../IShellConfigurationSources.cs             |   25 +-
 .../IShellsConfigurationSources.cs            |   21 +-
 .../Configuration/IShellsSettingsSources.cs   |   35 +-
 .../Internal/ConfigurationExtensions.cs       |    2 +-
 .../Internal/UpdatableDataProvider.cs         |   69 +-
 .../Shell/Configuration/ShellConfiguration.cs |  219 ++-
 .../Descriptor/IShellDescriptorManager.cs     |   33 +-
 .../Descriptor/Models/ShellDescriptor.cs      |   37 +-
 .../Shell/Descriptor/Models/ShellFeature.cs   |   55 +-
 .../DistributedShellMarkerService.cs          |    7 +-
 .../Shell/Events/IShellEvents.cs              |   39 +-
 .../Shell/Events/ShellEvent.cs                |   13 +-
 .../Shell/Events/ShellsEvent.cs               |   13 +-
 .../ShellFeaturesManagerExtensions.cs         |   81 +-
 .../Shell/Extensions/ShellHostExtensions.cs   |  109 +-
 .../Shell/IFeatureProfilesService.cs          |    9 +-
 .../Shell/IFeatureValidationProvider.cs       |   15 +-
 .../Shell/IRunningShellTable.cs               |   13 +-
 .../Shell/IShellDescriptorFeaturesManager.cs  |   15 +-
 .../IShellDescriptorManagerEventHandler.cs    |   17 +-
 .../Shell/IShellFeaturesManager.cs            |   21 +-
 .../Shell/IShellHost.cs                       |  123 +-
 .../Shell/IShellSettingsManager.cs            |   65 +-
 .../Shell/Models/FeatureProfile.cs            |   27 +-
 .../Models/FeatureProfilesRuleOptions.cs      |   15 +-
 .../Shell/Models/TenantState.cs               |   49 +-
 .../Shell/Scope/ShellScope.cs                 |  959 +++++----
 .../Shell/Scope/ShellScopeExtensions.cs       |  153 +-
 .../Shell/ShellContextFeature.cs              |   33 +-
 .../Shell/ShellHostReloadException.cs         |   21 +-
 .../Shell/ShellOptions.cs                     |   23 +-
 .../Shell/ShellSettings.cs                    |  301 ++-
 .../StringUriExtensions.cs                    |   49 +-
 .../AdminAttribute.cs                         |   97 +-
 .../AdminOptions.cs                           |   17 +-
 .../Constants.cs                              |    9 +-
 .../IAdminThemeService.cs                     |   13 +-
 .../Models/AdminMenu.cs                       |   85 +-
 .../Models/AdminNode.cs                       |  119 +-
 .../Services/IAdminMenuPermissionService.cs   |    9 +-
 .../Services/IAdminNodeNavigationBuilder.cs   |   15 +-
 .../Services/IAdminNodeProviderFactory.cs     |   27 +-
 .../FieldBuilderResolverExtensions.cs         |   11 +-
 .../Extensions/PermissionsExtensions.cs       |   53 +-
 .../ResolveFieldContextExtensions.cs          |   93 +-
 .../GraphQLFieldNameAttribute.cs              |   21 +-
 .../GraphQLPermissionContext.cs               |   19 +-
 .../GraphQLSettings.cs                        |   37 +-
 .../GraphQLUserContext.cs                     |   11 +-
 .../ISchemaBuilder.cs                         |   29 +-
 .../ISchemaFactory.cs                         |   17 +-
 .../Queries/INamedQueryProvider.cs            |    9 +-
 .../Queries/Types/TimeSpanGraphType.cs        |   67 +-
 .../Queries/WhereInputObjectGraphType.cs      |  199 +-
 .../Resolvers/LockedAsyncFieldResolver.cs     |   63 +-
 .../ContentPartBuilder.cs                     |   73 +-
 .../ContentResource.cs                        |   93 +-
 .../ContentTypeCreateResourceBuilder.cs       |   89 +-
 .../ContentTypeQueryResourceBuilder.cs        |  267 ++-
 .../Extensions/HttpContentExtensions.cs       |   19 +-
 .../Extensions/HttpRequestExtensions.cs       |  367 ++--
 .../OrchardGraphQLClient.cs                   |   13 +-
 .../ServiceExtensions.cs                      |   91 +-
 .../AuditTrailEventSectionDisplayDriver.cs    |   25 +-
 .../Indexes/AuditTrailEventIndex.cs           |   27 +-
 .../Models/AuditTrailEvent.cs                 |  105 +-
 .../Services/AuditTrailEventHandlerBase.cs    |   11 +-
 .../AuditTrailFilterEngineModelBinder.cs      |   49 +-
 .../Services/AuditTrailQueryContext.cs        |   15 +-
 .../IAuditTrailAdminListFilterParser.cs       |    7 +-
 .../IAuditTrailAdminListFilterProvider.cs     |    9 +-
 .../IAuditTrailAdminListQueryService.cs       |   21 +-
 .../Services/IAuditTrailEventHandler.cs       |   25 +-
 .../Services/IAuditTrailIdGenerator.cs        |    9 +-
 .../Services/IAuditTrailManager.cs            |   75 +-
 .../Models/AuditTrailAdminListOption.cs       |   39 +-
 .../AuditTrailAdminListOptionBuilder.cs       |  101 +-
 .../Models/AuditTrailAdminListOptions.cs      |   57 +-
 .../Models/AuditTrailCategoryDescriptor.cs    |   45 +-
 .../AuditTrailCategoryDescriptorBuilder.cs    |   99 +-
 .../Services/Models/AuditTrailContext.cs      |   69 +-
 .../Models/AuditTrailCreateContext.cs         |   53 +-
 .../Models/AuditTrailEventDescriptor.cs       |   55 +-
 .../Models/AuditTrailEventQueryResult.cs      |   11 +-
 .../Services/Models/AuditTrailOptions.cs      |   47 +-
 .../Settings/AuditTrailSettingsGroup.cs       |    9 +-
 .../ViewModels/AuditTrailIndexOptions.cs      |   91 +-
 .../Indexes/AutoroutePartIndex.cs             |  285 ++-
 .../Model/AutoroutePart.cs                    |   59 +-
 .../Model/AutorouteStateDocument.cs           |    7 +-
 .../Services/AutorouteEntries.cs              |  341 ++--
 .../Services/AutorouteHandleProvider.cs       |   45 +-
 .../AzureKeyVaultConfigurationExtension.cs    |  135 +-
 .../Services/AzureKeyVaultSecretManager.cs    |   11 +-
 .../CultureAspect.cs                          |   19 +-
 .../ContentLocalizationHandlerBase.cs         |   19 +-
 .../ContentLocalizationPartHandlerBase.cs     |   27 +-
 .../Handlers/IContentLocalizationHandler.cs   |   11 +-
 .../IContentLocalizationPartHandler.cs        |   11 +-
 .../Handlers/LocalizationContentContext.cs    |   23 +-
 .../IContentLocalizationManager.cs            |   91 +-
 .../ILocalizable.cs                           |   11 +-
 .../Models/LocalizationEntry.cs               |   15 +-
 .../Models/LocalizationPart.cs                |   11 +-
 .../Records/LocalizedContentItemIndex.cs      |  147 +-
 .../ContentDefinitionManagerExtensions.cs     |  191 +-
 .../ContentExtensions.cs                      |  503 +++--
 .../ContentField.cs                           |    7 +-
 .../ContentFieldOption.cs                     |   31 +-
 .../ContentFieldOptionBase.cs                 |   17 +-
 .../ContentFieldOptionBuilder.cs              |   19 +-
 .../ContentItem.cs                            |  123 +-
 .../ContentItemConverter.cs                   |  171 +-
 .../ContentItemExtensions.cs                  |  401 ++--
 .../ContentItemMetadata.cs                    |   21 +-
 .../ContentOptions.cs                         |  115 +-
 .../ContentPart.cs                            |    7 +-
 .../ContentPartOption.cs                      |   31 +-
 .../ContentPartOptionBase.cs                  |   17 +-
 .../ContentPartOptionBuilder.cs               |   19 +-
 .../ContentQueryExtensions.cs                 |   59 +-
 .../ContentQueryOfTIndexExtensions.cs         |   65 +-
 .../GroupInfo.cs                              |   31 +-
 .../Handlers/ActivatedContentContext.cs       |    9 +-
 .../Handlers/ActivatingContentContext.cs      |   15 +-
 .../Handlers/CloneContentContext.cs           |   17 +-
 .../Handlers/ContentContextBase.cs            |   15 +-
 .../Handlers/ContentFieldContextBase.cs       |   19 +-
 .../Handlers/ContentHandlerBase.cs            |  289 ++-
 .../Handlers/ContentItemAspectContext.cs      |   31 +-
 .../Handlers/ContentItemMetadataContext.cs    |   11 +-
 .../Handlers/ContentPartHandler.cs            |  403 ++--
 .../Handlers/ContentValidateResult.cs         |   29 +-
 .../Handlers/CreateContentContext.cs          |    9 +-
 .../Handlers/IContentFieldHandler.cs          |   67 +-
 .../Handlers/IContentFieldHandlerResolver.cs  |    9 +-
 .../Handlers/IContentHandler.cs               |   65 +-
 .../Handlers/IContentPartHandler.cs           |   67 +-
 .../Handlers/IContentPartHandlerResolver.cs   |    9 +-
 .../Handlers/ImportContentContext.cs          |   21 +-
 .../Handlers/InitializingContentContext.cs    |    9 +-
 .../Handlers/LoadContentContext.cs            |    9 +-
 .../Handlers/PublishContentContext.cs         |   21 +-
 .../Handlers/RemoveContentContext.cs          |   15 +-
 .../Handlers/RestoreContentContext.cs         |    9 +-
 .../Handlers/SaveDraftContentContext.cs       |    9 +-
 .../Handlers/UpdateContentContext.cs          |   15 +-
 .../Handlers/ValidateContentContext.cs        |   37 +-
 .../Handlers/VersionContentContext.cs         |   15 +-
 .../IContent.cs                               |    9 +-
 .../IContentDefinitionStore.cs                |   31 +-
 .../IContentHandleManager.cs                  |    9 +-
 .../IContentHandleProvider.cs                 |   11 +-
 .../IContentItemIdGenerator.cs                |    9 +-
 .../IContentManager.cs                        |  261 ++-
 .../IContentManagerSession.cs                 |   15 +-
 .../IContentPickerResultProvider.cs           |   37 +-
 .../ITypeActivatorFactory.cs                  |   37 +-
 .../IUserPickerResultProvider.cs              |   37 +-
 .../Builders/ContentBuilderSettings.cs        |   41 +-
 .../Builders/ContentPartDefinitionBuilder.cs  |  369 ++--
 .../ContentPartFieldDefinitionBuilder.cs      |   95 +-
 .../Builders/ContentTypeDefinitionBuilder.cs  |  317 ++-
 .../ContentTypePartDefinitionBuilder.cs       |   85 +-
 .../Metadata/Models/ContentDefinition.cs      |   69 +-
 .../Metadata/Models/ContentFieldDefinition.cs |   15 +-
 .../Metadata/Models/ContentPartDefinition.cs  |   37 +-
 .../Models/ContentPartFieldDefinition.cs      |   23 +-
 .../ContentPartFieldDefinitionExtensions.cs   |   11 +-
 .../ContentPartFieldSettingsExtensions.cs     |   45 +-
 .../Metadata/Models/ContentTypeDefinition.cs  |   65 +-
 .../Models/ContentTypePartDefinition.cs       |   27 +-
 .../Models/ContentTypePartExtensions.cs       |   71 +-
 .../Records/ContentDefinitionRecord.cs        |   21 +-
 .../Records/ContentFieldDefinitionRecord.cs   |   15 +-
 .../Records/ContentPartDefinitionRecord.cs    |   29 +-
 .../ContentPartFieldDefinitionRecord.cs       |   33 +-
 .../Records/ContentTypeDefinitionRecord.cs    |   21 +-
 .../ContentTypePartDefinitionRecord.cs        |   33 +-
 .../Settings/ContentPartFieldSettings.cs      |   47 +-
 .../ContentPartFieldSettingsExtensions.cs     |   43 +-
 .../Metadata/Settings/ContentPartSettings.cs  |   47 +-
 .../Settings/ContentPartSettingsExtensions.cs |   93 +-
 .../Settings/ContentTypePartSettings.cs       |   47 +-
 .../ContentTypePartSettingsExtensions.cs      |   43 +-
 .../Metadata/Settings/ContentTypeSettings.cs  |   63 +-
 .../Settings/ContentTypeSettingsExtensions.cs |   71 +-
 .../Models/BodyAspect.cs                      |    9 +-
 .../Models/FullTextAspect.cs                  |   15 +-
 .../PreviewAspect.cs                          |    9 +-
 .../Routing/AutorouteEntry.cs                 |   75 +-
 .../Routing/AutorouteOptions.cs               |   17 +-
 .../Routing/ContainedContentItemsAspect.cs    |   15 +-
 .../Routing/IAutorouteEntries.cs              |   13 +-
 .../Routing/RouteHandlerAspect.cs             |   31 +-
 .../ServiceCollectionExtensions.cs            |  257 ++-
 .../Utilities/StringExtensions.cs             |  527 +++--
 .../Workflows/ContentEventConstants.cs        |   13 +-
 .../Workflows/ContentEventContext.cs          |   17 +-
 .../ContentDisplay/ContentDisplayOptions.cs   |  169 +-
 .../ContentFieldDisplayDriver.cs              |  429 ++--
 .../ContentFieldDisplayDriverOption.cs        |   33 +-
 .../ContentFieldDisplayDriverResolver.cs      |   67 +-
 .../ContentFieldDisplayOption.cs              |   73 +-
 ...ContentFieldServiceCollectionExtensions.cs |  289 ++-
 .../ContentItemDisplayCoordinator.cs          |  569 +++---
 .../ContentPartDisplayDriverOption.cs         |   33 +-
 .../ContentPartDisplayDriverResolver.cs       |   67 +-
 .../ContentPartDisplayDriverTPart.cs          |  509 +++--
 .../ContentPartDisplayOption.cs               |   77 +-
 .../ContentPartServiceCollectionExtensions.cs |  277 ++-
 .../ContentDisplay/IContentDisplayDriver.cs   |    7 +-
 .../ContentDisplay/IContentDisplayHandler.cs  |   21 +-
 .../IContentFieldDisplayDriver.cs             |   13 +-
 .../IContentFieldDisplayDriverResolver.cs     |   11 +-
 .../IContentPartDisplayDriver.cs              |   13 +-
 .../IContentPartDisplayDriverResolver.cs      |   11 +-
 .../ContentItemDisplayManager.cs              |  315 ++-
 .../IContentItemDisplayManager.cs             |   21 +-
 .../Liquid/ConsoleLogFilter.cs                |   91 +-
 .../Models/BuildFieldDisplayContext.cs        |   25 +-
 .../Models/BuildFieldEditorContext.cs         |   25 +-
 .../Models/BuildPartDisplayContext.cs         |   17 +-
 .../Models/BuildPartEditorContext.cs          |   19 +-
 .../Models/UpdateFieldEditorContext.cs        |   11 +-
 .../Models/UpdatePartEditorContext.cs         |   15 +-
 .../ContentPartPlacementNodeFilterProvider.cs |  137 +-
 .../ServiceCollectionExtensions.cs            |   35 +-
 .../ViewModels/ContentItemViewModel.cs        |   21 +-
 .../ViewModels/ContentPartViewModel.cs        |   21 +-
 .../Extensions/DataLoaderExtensions.cs        |   31 +-
 .../Extensions/StringExtensions.cs            |   11 +-
 .../Options/GraphQLContentOptions.cs          |  297 ++-
 .../Options/GraphQLContentPartOption.cs       |   29 +-
 .../Options/GraphQLContentTypeOption.cs       |   53 +-
 .../Options/GraphQLField.cs                   |   31 +-
 .../Queries/ContentItemQuery.cs               |   77 +-
 .../Queries/ContentItemsFieldType.cs          |  583 +++---
 .../Queries/ContentTypeQuery.cs               |  137 +-
 .../Queries/GraphQLFilter.cs                  |   19 +-
 .../Queries/IGraphQLFilter.cs                 |   11 +-
 .../Queries/IIndexAliasProvider.cs            |    9 +-
 .../Queries/IIndexPropertyProvider.cs         |   11 +-
 .../Queries/IndexAlias.cs                     |   13 +-
 .../Queries/IndexPropertyProvider.cs          |   33 +-
 .../Queries/Predicates/AndExpression.cs       |   33 +-
 .../Queries/Predicates/Conjunction.cs         |   21 +-
 .../Queries/Predicates/Disjunction.cs         |   21 +-
 .../Queries/Predicates/Expression.cs          |  235 ++-
 .../Queries/Predicates/IPredicate.cs          |   19 +-
 .../Queries/Predicates/IPredicateQuery.cs     |   95 +-
 .../Queries/Predicates/InExpression.cs        |   67 +-
 .../Queries/Predicates/Junction.cs            |   99 +-
 .../Queries/Predicates/LikeExpression.cs      |   53 +-
 .../Queries/Predicates/LogicalExpression.cs   |   75 +-
 .../Queries/Predicates/MatchOptions.cs        |  103 +-
 .../Queries/Predicates/NotExpression.cs       |   43 +-
 .../Queries/Predicates/OrExpression.cs        |   33 +-
 .../Queries/Predicates/PredicateQuery.cs      |  205 +-
 .../Queries/Predicates/SimpleExpression.cs    |   77 +-
 .../Queries/PublicationStatusEnum.cs          |   15 +-
 .../Queries/Types/ContentItemInterface.cs     |   53 +-
 .../Queries/Types/ContentItemOrderByInput.cs  |   59 +-
 .../Queries/Types/ContentItemType.cs          |   95 +-
 .../Queries/Types/ContentItemWhereInput.cs    |   59 +-
 .../Types/DynamicContentTypeBuilder.cs        |  265 ++-
 .../Queries/Types/DynamicPartGraphType.cs     |   47 +-
 .../Queries/Types/IContentFieldProvider.cs    |   25 +-
 .../Queries/Types/IContentTypeBuilder.cs      |   11 +-
 .../Queries/Types/TypedContentTypeBuilder.cs  |  203 +-
 .../ServiceCollectionExtensions.cs            |   81 +-
 .../GraphQLContentTypePartSettings.cs         |   13 +-
 .../ContentDefinitionCacheContextProvider.cs  |   29 +-
 .../PublishedContentItemById.cs               |   25 +-
 .../ContentDefinitionManager.cs               |  589 +++---
 .../ContentFieldFactory.cs                    |   53 +-
 .../ContentHandleManager.cs                   |   33 +-
 .../ContentPartFactory.cs                     |   53 +-
 .../DatabaseContentDefinitionStore.cs         |   29 +-
 .../DefaultContentItemIdGenerator.cs          |   23 +-
 .../DefaultContentManager.cs                  | 1725 ++++++++---------
 .../DefaultContentManagerSession.cs           |   79 +-
 .../FileContentDefinitionStore.cs             |   29 +-
 .../GenericTypeActivator.cs                   |   19 +-
 .../Handlers/ContentFieldHandlerResolver.cs   |   43 +-
 .../Handlers/ContentPartHandlerCoordinator.cs |  777 ++++----
 .../Handlers/ContentPartHandlerResolver.cs    |   43 +-
 .../Handlers/UpdateContentsHandler.cs         |  121 +-
 .../Records/ContentItemIndex.cs               |  119 +-
 .../Records/Migrations.cs                     |  397 ++--
 .../ServiceCollectionExtensions.cs            |   55 +-
 .../ContentPreviewFeature.cs                  |   15 +-
 .../ContentPartDefinitionDisplayDriver.cs     |   11 +-
 ...ContentPartFieldDefinitionDisplayDriver.cs |   57 +-
 .../ContentTypeDefinitionDisplayDriver.cs     |   11 +-
 .../ContentTypePartDefinitionDisplayDriver.cs |   49 +-
 .../IContentDefinitionDisplayHandler.cs       |   23 +-
 .../IContentDefinitionDisplayManager.cs       |   23 +-
 .../IContentPartDefinitionDisplayDriver.cs    |    7 +-
 ...ContentPartFieldDefinitionDisplayDriver.cs |    7 +-
 .../IContentTypeDefinitionDisplayDriver.cs    |    7 +-
 ...IContentTypePartDefinitionDisplayDriver.cs |    7 +-
 .../UpdateContentDefinitionEditorContext.cs   |   31 +-
 .../Editors/UpdatePartEditorContext.cs        |   25 +-
 .../Editors/UpdatePartFieldEditorContext.cs   |   25 +-
 .../Editors/UpdateTypeEditorContext.cs        |   25 +-
 .../Editors/UpdateTypePartEditorContext.cs    |   25 +-
 .../Events/ContentFieldAttachedContext.cs     |   11 +-
 .../Events/ContentFieldDetachedContext.cs     |    7 +-
 .../Events/ContentFieldUpdatedContext.cs      |    7 +-
 .../Events/ContentPartAttachedContext.cs      |    7 +-
 .../Events/ContentPartContext.cs              |    9 +-
 .../Events/ContentPartCreatedContext.cs       |    7 +-
 .../Events/ContentPartDetachedContext.cs      |    7 +-
 .../Events/ContentPartFieldContext.cs         |   11 +-
 .../Events/ContentPartFieldUpdatedContext.cs  |    7 +-
 .../Events/ContentPartImportedContext.cs      |    7 +-
 .../Events/ContentPartImportingContext.cs     |    9 +-
 .../Events/ContentPartRemovedContext.cs       |    7 +-
 .../Events/ContentPartUpdatedContext.cs       |    7 +-
 .../Events/ContentTypeContext.cs              |    9 +-
 .../Events/ContentTypeCreatedContext.cs       |    7 +-
 .../Events/ContentTypeImportedContext.cs      |    7 +-
 .../Events/ContentTypeImportingContext.cs     |    9 +-
 .../Events/ContentTypePartContext.cs          |   11 +-
 .../Events/ContentTypePartUpdatedContext.cs   |    7 +-
 .../Events/ContentTypeRemovedContext.cs       |    7 +-
 .../Events/ContentTypeUpdatedContext.cs       |    7 +-
 .../Events/IContentDefinitionEventHandler.cs  |   41 +-
 .../AuthorizationServiceExtensions.cs         |  137 +-
 .../Indexing/IndexingConstants.cs             |   51 +-
 .../ContentItemFilterEngineModelBinder.cs     |   49 +-
 .../Services/ContentQueryContext.cs           |   15 +-
 .../Services/IContentsAdminListFilter.cs      |   19 +-
 .../IContentsAdminListFilterParser.cs         |    7 +-
 .../IContentsAdminListFilterProvider.cs       |   15 +-
 .../IContentsAdminListQueryService.cs         |    9 +-
 .../ViewModels/ContentOptionsViewModel.cs     |  125 +-
 .../ContentItemTagHelper.cs                   |   15 +-
 .../ContentLinkTagHelper.cs                   |  303 ++-
 .../DatabaseProvider.cs                       |   19 +-
 .../Documents/Document.cs                     |   25 +-
 .../Documents/DocumentStoreCommitException.cs |   39 +-
 .../DocumentStoreCommitFailureDelegate.cs     |   13 +-
 .../DocumentStoreCommitSuccessDelegate.cs     |   13 +-
 .../Documents/FileDocumentStoreAttribute.cs   |   11 +-
 .../Documents/IDocument.cs                    |   23 +-
 .../Documents/IDocumentStore.cs               |   85 +-
 .../Documents/IFileDocumentStore.cs           |   15 +-
 .../IDataMigrationManager.cs                  |   57 +-
 .../IDbConnectionAccessor.cs                  |   17 +-
 .../ServiceCollectionExtensions.cs            |   53 +-
 .../StoreCollectionOptions.cs                 |    9 +-
 .../DataMigration.cs                          |   47 +-
 .../IDataMigration.cs                         |   19 +-
 .../IScopedIndexProvider.cs                   |   15 +-
 .../DbConnectionAccessor.cs                   |   37 +-
 .../DefaultContentJsonSerializer.cs           |   33 +-
 .../Documents/DocumentStore.cs                |  199 +-
 .../Migration/DataMigrationManager.cs         |  485 +++--
 .../Options/SqliteOptions.cs                  |   29 +-
 .../Options/SqliteOptionsConfiguration.cs     |   25 +-
 .../OrchardCoreBuilderExtensions.cs           |  317 ++-
 .../OrchardCore.Data.YesSql/SqliteHelper.cs   |    3 +-
 .../Documents/FileDocumentStore.cs            |  195 +-
 .../Migration/AutomaticDataMigrations.cs      |   63 +-
 .../Migration/Records/DataMigration.cs        |   25 +-
 .../Migration/Records/DataMigrationRecord.cs  |   37 +-
 .../DeploymentPlan.cs                         |   19 +-
 .../DeploymentPlanResult.cs                   |   59 +-
 .../DeploymentStep.cs                         |   11 +-
 .../DeploymentTarget.cs                       |   23 +-
 .../IDeploymentPlanService.cs                 |   19 +-
 .../IDeploymentSource.cs                      |   15 +-
 .../IDeploymentStepFactory.cs                 |   27 +-
 .../IDeploymentTargetHandler.cs               |    9 +-
 .../IDeploymentTargetProvider.cs              |    9 +-
 .../IFileBuilder.cs                           |   21 +-
 .../Services/IDeploymentManager.cs            |   13 +-
 .../Mvc/DeleteFileResultFilter.cs             |   27 +-
 .../ServiceCollectionExtensions.cs            |   13 +-
 .../Services/DeploymentManager.cs             |   73 +-
 .../Services/TemporaryFileBuilder.cs          |   67 +-
 .../ModelBinding/IUpdateModel.cs              |   19 +-
 .../ModelBinding/IUpdateModelAccessor.cs      |    9 +-
 .../ModelStateDictionaryExtensions.cs         |   71 +-
 .../TagHelpers/AssemblyTagHelpersProvider.cs  |   29 +-
 .../Cache/CacheDependencyTag.cs               |   27 +-
 .../Cache/CacheExpiresAfterTag.cs             |   55 +-
 .../Cache/CacheExpiresOnTag.cs                |   73 +-
 .../Cache/CacheExpiresSlidingTag.cs           |   55 +-
 .../Cache/CacheTag.cs                         |  183 +-
 .../Filters/AppendVersionFilter.cs            |   31 +-
 .../Filters/LiquidViewFilters.cs              |   65 +-
 .../Filters/NewShapeFilter.cs                 |   51 +-
 .../Filters/ResourceUrlFilter.cs              |   59 +-
 .../Filters/SanitizeHtmlFilter.cs             |   27 +-
 .../Filters/ShapeRenderFilter.cs              |   39 +-
 .../Filters/ShapeStringifyFilter.cs           |   47 +-
 .../HtmlContentValue.cs                       |  139 +-
 .../LiquidCultureAccessor.cs                  |   13 +-
 .../LiquidHttpContextAccessor.cs              |   13 +-
 .../LiquidPage.cs                             |    9 +-
 .../LiquidRequestAccessor.cs                  |   13 +-
 .../LiquidShapeTemplateOptionsSetup.cs        |   23 +-
 .../LiquidViewExtensionProvider.cs            |    9 +-
 .../LiquidViewOptions.cs                      |   29 +-
 .../LiquidViewOptionsSetup.cs                 |   57 +-
 .../LiquidViewParser.cs                       |  123 +-
 .../LiquidViewTemplate.cs                     |  407 ++--
 .../LiquidViewsFeatureProvider.cs             |   73 +-
 .../ModuleProjectLiquidFileProvider.cs        |  129 +-
 .../OrchardCoreBuilderExtensions.cs           |  321 ++-
 .../TagHelpers/LiquidTagHelperActivator.cs    |  359 ++--
 .../TagHelpers/LiquidTagHelperFactory.cs      |  181 +-
 .../TagHelpers/LiquidTagHelperMatching.cs     |  107 +-
 .../TagHelpers/RequiredAttributeParser.cs     |  417 ++--
 .../Tags/AddAlternatesTag.cs                  |   39 +-
 .../Tags/AddAttributesTag.cs                  |   25 +-
 .../Tags/AddClassesTag.cs                     |   39 +-
 .../Tags/AddWrappersTag.cs                    |   39 +-
 .../Tags/AnchorTag.cs                         |  313 ++-
 .../Tags/AntiForgeryTokenTag.cs               |   31 +-
 .../Tags/ClearAlternatesTag.cs                |   21 +-
 .../Tags/ClearAttributesTag.cs                |   21 +-
 .../Tags/ClearClassesTag.cs                   |   21 +-
 .../Tags/ClearWrappersTag.cs                  |   21 +-
 .../Tags/DefaultAnchorTag.cs                  |   25 +-
 .../Tags/FluidTagHelper.cs                    |  149 +-
 .../Tags/HttpContextAddItemTag.cs             |   23 +-
 .../Tags/HttpContextRemoveItemTag.cs          |   29 +-
 .../Tags/IAnchorTag.cs                        |   13 +-
 .../Tags/LayoutTag.cs                         |   25 +-
 .../Tags/RenderBodyTag.cs                     |   21 +-
 .../Tags/RenderSectionTag.cs                  |   45 +-
 .../Tags/RenderTitleSegmentsTag.cs            |   33 +-
 .../Tags/ShapeAddPropertyTag.cs               |   25 +-
 .../Tags/ShapeCacheTag.cs                     |   71 +-
 .../Tags/ShapeDisplayTypeTag.cs               |   23 +-
 .../Tags/ShapePagerTag.cs                     |  149 +-
 .../Tags/ShapePositionTag.cs                  |   23 +-
 .../Tags/ShapeRemoveItemTag.cs                |   23 +-
 .../Tags/ShapeRemovePropertyTag.cs            |   25 +-
 .../Tags/ShapeTabTag.cs                       |   23 +-
 .../Tags/ShapeTag.cs                          |  147 +-
 .../Tags/ShapeTypeTag.cs                      |   23 +-
 .../Tags/ZoneTag.cs                           |  113 +-
 .../TemplateOptionsFileProviderSetup.cs       |   41 +-
 .../ViewBufferTextWriterContent.cs            |  471 +++--
 .../Arguments.cs                              |  307 ++-
 .../BaseDisplayManager.cs                     |   89 +-
 .../Descriptors/DefaultShapeTableManager.cs   |  287 ++-
 .../Descriptors/FeatureShapeDescriptor.cs     |  229 ++-
 .../Descriptors/PlacementInfo.cs              |  237 ++-
 .../Descriptors/PlacementInfoExtensions.cs    |  105 +-
 .../Descriptors/ShapeAlteration.cs            |   33 +-
 .../Descriptors/ShapeAlterationBuilder.cs     |  349 ++--
 .../ShapeAttributeBindingStrategy.cs          |  391 ++--
 .../ShapeAttributeOccurrence.cs               |   23 +-
 .../IPlacementNodeFilterProvider.cs           |   11 +-
 .../PathPlacementNodeFilterProvider.cs        |   91 +-
 .../ShapePlacementStrategy/PlacementFile.cs   |   41 +-
 .../ShapePlacementParsingStrategy.cs          |  185 +-
 .../Descriptors/ShapeTable.cs                 |   19 +-
 .../Descriptors/ShapeTableBuilder.cs          |   41 +-
 .../ShapeTablePlacementProvider.cs            |   75 +-
 .../BasicShapeTemplateHarvester.cs            |   89 +-
 .../ShapeTemplateStrategy/HarvestShapeHit.cs  |   11 +-
 .../ShapeTemplateStrategy/HarvestShapeInfo.cs |   15 +-
 .../IShapeTemplateFileProviderAccessor.cs     |   17 +-
 .../IShapeTemplateHarvester.cs                |   19 +-
 .../IShapeTemplateViewEngine.cs               |   11 +-
 .../ShapeTemplateBindingStrategy.cs           |  231 ++-
 .../ShapeTemplateFileProviderAccessor.cs      |   53 +-
 .../ShapeTemplateOptions.cs                   |   27 +-
 .../ShapeTemplateOptionsSetup.cs              |   51 +-
 .../DisplayManager.cs                         |  209 +-
 .../Events/ThemeFeatureBuilderEvents.cs       |   33 +-
 .../Extensions/ExtensionInfoExtensions.cs     |   17 +-
 .../Extensions/ServiceCollectionExtensions.cs |   35 +-
 .../ThemeExtensionDependencyStrategy.cs       |   19 +-
 .../Extensions/ThemeExtensionInfo.cs          |   59 +-
 .../FileProviders/ContentFileInfo.cs          |   49 +-
 .../FileProviders/DirectoryContents.cs        |   41 +-
 .../Handlers/BuildDisplayContext.cs           |   17 +-
 .../Handlers/BuildEditorContext.cs            |   19 +-
 .../Handlers/BuildShapeContext.cs             |   51 +-
 .../Handlers/DisplayDriver.cs                 |  249 ++-
 .../Handlers/DisplayDriverBase.cs             |  267 ++-
 .../Handlers/FindPlacementDelegate.cs         |   31 +-
 .../Handlers/IBuildShapeContext.cs            |   27 +-
 .../Handlers/IDisplayDriver.cs                |   25 +-
 .../Handlers/IDisplayHandler.cs               |   13 +-
 .../Handlers/UpdateEditorContext.cs           |   17 +-
 .../Html/HtmlContentString.cs                 |   41 +-
 .../IAsyncViewActionFilter.cs                 |    9 +-
 .../IDisplayHelper.cs                         |    9 +-
 .../IDisplayManager.cs                        |   13 +-
 .../INamedEnumerable.cs                       |   11 +-
 .../IPositioned.cs                            |    9 +-
 .../OrchardCore.DisplayManagement/IShape.cs   |  169 +-
 .../IShapeBindingResolver.cs                  |   19 +-
 .../IShapeFactory.cs                          |  227 ++-
 .../Implementation/DefaultHtmlDisplay.cs      |  439 +++--
 .../Implementation/DefaultShapeFactory.cs     |  205 +-
 .../Implementation/DisplayContext.cs          |   33 +-
 .../Implementation/DisplayHelper.cs           |  151 +-
 .../Implementation/IHtmlDisplay.cs            |   15 +-
 .../Implementation/IShapeDisplayEvents.cs     |   19 +-
 .../Implementation/IShapeFactoryEvents.cs     |   63 +-
 .../Implementation/ShapeDisplayContext.cs     |   15 +-
 .../Layout/ILayoutAccessor.cs                 |    9 +-
 .../Layout/LayoutAccessor.cs                  |   41 +-
 .../ThemeViewLocationExpanderProvider.cs      |  127 +-
 .../Manifest/ThemeAttribute.cs                |  393 ++--
 .../ModelBinding/ControllerModelUpdater.cs    |   69 +-
 .../ModelBinding/LocalModelBinderAccessor.cs  |   31 +-
 .../ModelBinding/ModelBinderAccessorFilter.cs |   51 +-
 .../ModelBinding/ModelStateWrapperUpdater.cs  |   99 +-
 .../ModelBinding/NullModelUpdater.cs          |   23 +-
 .../ModelBinding/PageModelUpdater.cs          |   21 +-
 .../ModelBinding/PrefixedModelUpdater.cs      |   47 +-
 .../Notify/INotifier.cs                       |   41 +-
 .../Notify/Notifier.cs                        |   35 +-
 .../Notify/NotifierExtensions.cs              |   71 +-
 .../Notify/NotifyEntry.cs                     |   71 +-
 .../Notify/NotifyEntryComparer.cs             |   31 +-
 .../Notify/NotifyEntryConverter.cs            |   73 +-
 .../Notify/NotifyFilter.cs                    |  307 ++-
 .../ObjectPool.cs                             |  379 ++--
 .../OrchardCoreBuilderExtensions.cs           |  187 +-
 .../OrchardDisplayHelper.cs                   |   19 +-
 .../PositionWrapper.cs                        |  105 +-
 .../Razor/IRazorViewExtensionProvider.cs      |    9 +-
 .../Razor/RazorPage.cs                        |  493 +++--
 .../Razor/RazorShapeTemplateViewEngine.cs     |  249 ++-
 .../Razor/RazorViewActionFilter.cs            |  109 +-
 .../Razor/RazorViewFeature.cs                 |   33 +-
 .../RazorPages/Page.cs                        |  415 ++--
 .../ShapeAttribute.cs                         |   23 +-
 .../Shapes/AlternatesCollection.cs            |  169 +-
 .../Shapes/Composite.cs                       |  335 ++--
 .../Shapes/CoreShapes.cs                      |  181 +-
 .../Shapes/DateTimeShapes.cs                  |  227 ++-
 .../Shapes/GroupShapes.cs                     |  315 ++-
 .../Shapes/PageTitleShapes.cs                 |   43 +-
 .../Shapes/Shape.cs                           |  335 ++--
 .../Shapes/ShapeDebugView.cs                  |   75 +-
 .../Shapes/ShapeMetadata.cs                   |  131 +-
 .../Shapes/ShapeSerializer.cs                 |  147 +-
 .../TagHelpers/AddAlternateTagHelper.cs       |   19 +-
 .../TagHelpers/AddClassTagHelper.cs           |   19 +-
 .../TagHelpers/AddPropertyTagHelper.cs        |    6 +-
 .../TagHelpers/AddWrapperTagHelper.cs         |   19 +-
 .../TagHelpers/BaseShapeTagHelper.cs          |  259 ++-
 .../TagHelpers/ClearAlternatesTagHelper.cs    |   19 +-
 .../TagHelpers/ClearClassesTagHelper.cs       |   19 +-
 .../TagHelpers/ClearWrappersTagHelper.cs      |   19 +-
 .../TagHelpers/DateTimeTagHelper.cs           |   53 +-
 .../TagHelpers/InputIsDisabledTagHelper.cs    |   27 +-
 .../TagHelpers/RemoveAlternateTagHelper.cs    |   19 +-
 .../TagHelpers/RemoveClassTagHelper.cs        |   19 +-
 .../TagHelpers/RemoveWrapperTagHelper.cs      |   19 +-
 .../TagHelpers/ShapeMetadataTagHelper.cs      |   27 +-
 .../TagHelpers/ShapeTagHelper.cs              |   15 +-
 .../TagHelpers/TimeSpanTagHelper.cs           |   53 +-
 .../TagHelpers/ValidationMessageTagHelper.cs  |  113 +-
 .../TagHelpers/ZoneTagHelper.cs               |   79 +-
 .../Theming/IThemeManager.cs                  |    9 +-
 .../Theming/IThemeSelector.cs                 |   25 +-
 .../Theming/ThemeLayout.cs                    |   89 +-
 .../Theming/ThemeManager.cs                   |   81 +-
 .../Theming/ThemeSelectorResult.cs            |   27 +-
 .../Theming/ThemeViewStart.cs                 |   33 +-
 .../Theming/ThemingViewsFeatureProvider.cs    |   45 +-
 .../Title/IPageTitleBuilder.cs                |   67 +-
 .../Title/PageTitleBuilder.cs                 |  125 +-
 .../ViewContextAccessor.cs                    |    9 +-
 .../ViewModels/GroupViewModel.cs              |   25 +-
 .../Views/CombinedResult.cs                   |   51 +-
 .../Views/IDisplayResult.cs                   |   11 +-
 .../Views/ShapeResult.cs                      |  449 +++--
 .../Views/ShapeViewModel.cs                   |  107 +-
 .../Views/ShapeViewModelOfT.cs                |   25 +-
 .../Zones/FlatPositionComparer.cs             |  147 +-
 .../Zones/ZoneOnDemand.cs                     |  187 +-
 .../Zones/ZoneShapes.cs                       |  615 +++---
 .../DynamicCacheOptions.cs                    |    9 +-
 .../IDynamicCache.cs                          |   13 +-
 .../IDynamicCacheService.cs                   |   11 +-
 .../MailMessage.cs                            |   97 +-
 .../MailMessageAttachment.cs                  |   25 +-
 .../MailMessageRecipients.cs                  |    2 +-
 .../SmtpDeliveryMethod.cs                     |   17 +-
 .../SmtpEncryptionMethod.cs                   |   19 +-
 .../Models/ModuleFeature.cs                   |   99 +-
 .../Extensions/FeedBuilderExtensions.cs       |   11 +-
 .../IFeedBuilder.cs                           |   13 +-
 .../IFeedBuilderProvider.cs                   |   19 +-
 .../IFeedItemBuilder.cs                       |    9 +-
 .../IFeedQuery.cs                             |    9 +-
 .../IFeedQueryProvider.cs                     |   19 +-
 .../Models/ContextualizeContext.cs            |   11 +-
 .../Models/FeedContext.cs                     |   25 +-
 .../Models/FeedItem.cs                        |   37 +-
 .../Models/FeedMetadata.cs                    |   17 +-
 .../Models/FeedResponse.cs                    |   17 +-
 .../Rss/RssFeedBuilder.cs                     |   61 +-
 .../Rss/RssFeedBuilderProvider.cs             |   23 +-
 .../ServiceCollectionExtensions.cs            |   13 +-
 .../FileStoreException.cs                     |   15 +-
 .../IFileStore.cs                             |  321 ++-
 .../IFileStoreCache.cs                        |   17 +-
 .../IFileStoreEntry.cs                        |   57 +-
 .../BlobDirectory.cs                          |   43 +-
 .../BlobFile.cs                               |   59 +-
 .../BlobFileStore.cs                          |  669 ++++---
 .../BlobStorageOptions.cs                     |   43 +-
 .../FileSystemStore.cs                        |  531 +++--
 .../FileSystemStoreEntry.cs                   |   37 +-
 .../BuildFieldIndexContext.cs                 |   35 +-
 .../BuildIndexContext.cs                      |   37 +-
 .../BuildPartIndexContext.cs                  |   27 +-
 .../ContentFieldIndexHandler.cs               |   75 +-
 .../ContentPartIndexHandler.cs                |   51 +-
 .../DocumentIndexOptions.cs                   |   33 +-
 .../IContentFieldIndexHandler.cs              |   17 +-
 .../IContentIndexSettings.cs                  |   17 +-
 .../IContentItemIndexHandler.cs               |   15 +-
 .../IContentPartIndexHandler.cs               |   17 +-
 .../IIndexingTaskManager.cs                   |   27 +-
 .../IndexingTask.cs                           |   49 +-
 .../StorableAttribute.cs                      |   17 +-
 .../Cache/CacheContext.cs                     |  149 +-
 .../Cache/CacheContextEntry.cs                |   19 +-
 .../Cache/CacheOptions.cs                     |   11 +-
 .../Cache/ICacheContextManager.cs             |   17 +-
 .../Cache/ICacheContextProvider.cs            |   19 +-
 .../Cache/ICacheScopeManager.cs               |   37 +-
 .../Cache/ITagCache.cs                        |   21 +-
 .../Commands/CommandContext.cs                |   19 +-
 .../Commands/CommandDescriptor.cs             |   13 +-
 .../Commands/CommandHandlerDescriptor.cs      |    9 +-
 .../Commands/CommandNameAttribute.cs          |   61 +-
 .../Commands/CommandParameters.cs             |   15 +-
 .../Commands/CommandReturnCodes.cs            |   19 +-
 .../Commands/DefaultCommandHandler.cs         |  271 ++-
 .../Commands/ICommandHandler.cs               |    9 +-
 .../Commands/ICommandManager.cs               |   11 +-
 .../Commands/OrchardSwitchAttribute.cs        |    9 +-
 .../Commands/OrchardSwitchesAttribute.cs      |   27 +-
 .../Parameters/ICommandParametersParser.cs    |    9 +-
 .../Commands/Parameters/ICommandParser.cs     |  217 ++-
 .../Documents/IDocumentEntity.cs              |   13 +-
 .../Documents/IDocumentEntityManager.cs       |   33 +-
 .../Documents/IDocumentEntityManagerOfT.cs    |   15 +-
 .../Documents/IDocumentManager.cs             |   33 +-
 .../Documents/IDocumentManagerOfT.cs          |   15 +-
 .../Documents/IDocumentSerializer.cs          |   25 +-
 .../IVolatileDocumentEntityManager.cs         |   13 +-
 .../Documents/IVolatileDocumentManager.cs     |   19 +-
 .../Documents/Options/DocumentNamedOptions.cs |   11 +-
 .../Documents/Options/DocumentOptions.cs      |   17 +-
 .../Documents/Options/DocumentOptionsBase.cs  |   25 +-
 .../Options/DocumentSharedOptions.cs          |    9 +-
 .../Email/EmailAddressAttribute.cs            |   31 +-
 .../Email/IEmailAddressValidator.cs           |   21 +-
 .../Entities/IIdGenerator.cs                  |    9 +-
 .../Files/FileProviderExtensions.cs           |   17 +-
 .../Files/PathExtensions.cs                   |  195 +-
 .../Html/IHtmlSanitizerService.cs             |    9 +-
 .../Scripting/GlobalMethod.cs                 |   11 +-
 .../Scripting/IGlobalMethodProvider.cs        |   21 +-
 .../Scripting/IScriptingEngine.cs             |   13 +-
 .../Scripting/IScriptingManager.cs            |   51 +-
 .../Scripting/IScriptingScope.cs              |    7 +-
 .../Security/ApiAuthorizationOptions.cs       |    9 +-
 .../AuthorizationServiceExtensions.cs         |   25 +-
 .../Security/IPermissionGrantingService.cs    |   21 +-
 .../Security/IRole.cs                         |   11 +-
 .../Security/IRoleCreatedEventHandler.cs      |    9 +-
 .../Security/IRoleRemovedEventHandler.cs      |    9 +-
 .../Security/PermissionRequirement.cs         |   17 +-
 .../Permissions/IPermissionProvider.cs        |   29 +-
 .../Security/Permissions/Permission.cs        |   63 +-
 .../Security/Role.cs                          |   39 +-
 .../Security/RoleClaim.cs                     |   39 +-
 .../Security/SecurityHeaderNames.cs           |   15 +-
 .../Security/Services/IRoleService.cs         |   13 +-
 .../Services/RoleServiceExtensions.cs         |   55 +-
 .../Settings/CacheMode.cs                     |   15 +-
 .../Settings/ISiteService.cs                  |   33 +-
 .../Cache/CacheContextManager.cs              |   31 +-
 .../FeaturesCacheContextProvider.cs           |   43 +-
 .../KnownValueCacheContextProvider.cs         |   19 +-
 .../QueryCacheContextProvider.cs              |   67 +-
 .../RolesCacheContextProvider.cs              |   41 +-
 .../RouteCacheContextProvider.cs              |   31 +-
 .../UserCacheContextProvider.cs               |   41 +-
 .../Cache/CacheScopeManager.cs                |  191 +-
 .../Cache/DefaultTagCache.cs                  |   97 +-
 .../Cache/OrchardCoreBuilderExtensions.cs     |   81 +-
 .../Commands/Builtin/HelpCommand.cs           |   97 +-
 .../CommandHandlerDescriptorBuilder.cs        |   77 +-
 .../Commands/DefaultCommandManager.cs         |  141 +-
 .../Commands/OrchardCoreBuilderExtensions.cs  |   27 +-
 .../Parameters/CommandParametersParser.cs     |   55 +-
 .../Documents/DefaultDocumentSerializer.cs    |  131 +-
 .../Documents/DocumentEntityManager.cs        |   59 +-
 .../Documents/DocumentEntityManagerOfT.cs     |   19 +-
 .../Documents/DocumentManager.cs              |  557 +++---
 .../Documents/DocumentManagerOfT.cs           |   29 +-
 .../Documents/Options/DocumentOptionsSetup.cs |  125 +-
 .../Documents/OrchardCoreBuilderExtensions.cs |   33 +-
 .../VolatileDocumentEntityManager.cs          |   17 +-
 .../Documents/VolatileDocumentManager.cs      |  167 +-
 .../Email/EmailAddressValidator.cs            |   19 +-
 .../Email/OrchardCoreBuilderExtensions.cs     |   27 +-
 .../Entities/DefaultIdGenerator.cs            |   99 +-
 .../Entities/OrchardCoreBuilderExtensions.cs  |   27 +-
 .../Entities/Scripting/IdGeneratorMethod.cs   |   29 +-
 .../Entities/ServiceCollectionExtensions.cs   |   15 +-
 .../Html/HtmlSanitizerOptions.cs              |    9 +-
 .../Html/HtmlSanitizerOptionsExtensions.cs    |   21 +-
 .../Html/HtmlSanitizerService.cs              |   21 +-
 .../Html/OrchardCoreBuilderExtensions.cs      |   37 +-
 .../Scripting/CommonGeneratorMethods.cs       |   77 +-
 .../Scripting/DefaultScriptingManager.cs      |   69 +-
 .../Scripting/Files/FilesScriptEngine.cs      |   83 +-
 .../Scripting/Files/FilesScriptScope.cs       |   19 +-
 .../Scripting/OrchardCoreBuilderExtensions.cs |   33 +-
 .../Scripting/ServiceCollectionExtensions.cs  |   17 +-
 .../Security/ApiAuthenticationHandler.cs      |   93 +-
 .../PermissionHandler.cs                      |   39 +-
 .../DefaultPermissionGrantingService.cs       |   65 +-
 .../Security/OrchardCoreBuilderExtensions.cs  |   39 +-
 .../Shell/ShellDescriptorManager.cs           |  205 +-
 .../ShellOrchardCoreBuilderExtensions.cs      |   55 +-
 .../DatabaseShellConfigurationSources.cs      |  211 +-
 .../DatabaseShellsSettingsSources.cs          |  203 +-
 .../DatabaseShellsStorageOptions.cs           |   17 +-
 .../DatabaseShellContextFactoryExtensions.cs  |   35 +-
 ...abaseShellsOrchardCoreBuilderExtensions.cs |   23 +-
 .../Models/DatabaseShellConfigurations.cs     |    9 +-
 .../Models/DatabaseShellsSettings.cs          |    9 +-
 .../ILiquidFilter.cs                          |    9 +-
 .../ILiquidTemplateManager.cs                 |   83 +-
 .../LiquidContentAccessor.cs                  |   13 +-
 .../LiquidFilterDelegateResolver.cs           |   19 +-
 .../LiquidPropertyAccessor.cs                 |   39 +-
 .../LiquidTemplateContext.cs                  |   25 +-
 .../ServiceCollectionExtensions.cs            |   15 +-
 .../CultureDictionary.cs                      |  135 +-
 .../CultureDictionaryRecord.cs                |   96 +-
 .../CultureDictionaryRecordKey.cs             |   37 +-
 .../Extensions/HtmlLocalizerExtensions.cs     |   73 +-
 .../Extensions/StringLocalizerExtensions.cs   |   71 +-
 .../Extensions/ViewLocalizerExtensions.cs     |   73 +-
 .../ILocalizationFileLocationProvider.cs      |   21 +-
 .../ILocalizationManager.cs                   |   21 +-
 .../IPluralRuleProvider.cs                    |   35 +-
 .../IPluralStringLocalizer.cs                 |   23 +-
 .../ITranslationProvider.cs                   |   21 +-
 .../PluralForm.cs                             |   73 +-
 .../PluralFormNotFoundException.cs            |   87 +-
 .../PluralizationArgument.cs                  |   33 +-
 .../PluralizationRuleDelegate.cs              |   17 +-
 .../DataAnnotationsDefaultErrorMessages.cs    |  119 +-
 .../LocalizedDataAnnotationsMvcOptions.cs     |   25 +-
 .../LocalizedValidationMetadataProvider.cs    |   75 +-
 .../DefaultPluralRuleProvider.cs              |  113 +-
 ...LocalizationServiceCollectionExtensions.cs |   81 +-
 .../LocalizationManager.cs                    |   87 +-
 .../ContentRootPoFileLocationProvider.cs      |   41 +-
 .../PoFilesTranslationsProvider.cs            |   55 +-
 .../PortableObject/PoParser.cs                |  323 ++-
 .../PortableObjectHtmlLocalizer.cs            |   69 +-
 .../PortableObjectHtmlLocalizerFactory.cs     |   37 +-
 .../PortableObjectStringLocalizer.cs          |  331 ++--
 .../PortableObjectStringLocalizerFactory.cs   |  113 +-
 .../TenantLayoutRenderer.cs                   |   29 +-
 .../ApplicationBuilderExtensions.cs           |   11 +-
 .../SerilogTenantNameLoggingMiddleware.cs     |   27 +-
 .../WebHostBuilderExtensions.cs               |   17 +-
 .../Services/IMarkdownService.cs              |    9 +-
 .../Events/IMediaCreatingEventHandler.cs      |   21 +-
 .../Events/IMediaEventHandler.cs              |   29 +-
 .../Events/MediaContextBase.cs                |   15 +-
 .../Events/MediaCreatedContext.cs             |    9 +-
 .../Events/MediaCreatingContext.cs            |    7 +-
 .../Events/MediaDeletedContext.cs             |    9 +-
 .../Events/MediaDeletingContext.cs            |    7 +-
 .../Events/MediaMoveContext.cs                |   11 +-
 .../IMediaFileProvider.cs                     |    7 +-
 .../IMediaFileStore.cs                        |   21 +-
 .../IMediaFileStoreCache.cs                   |   19 +-
 .../IMediaFileStoreCacheFileProvider.cs       |   13 +-
 .../IMediaNameNormalizerService.cs            |   11 +-
 .../IMediaTokenService.cs                     |   19 +-
 .../IUserAssetFolderNameProvider.cs           |    9 +-
 .../Indexing/IMediaFileTextProvider.cs        |   23 +-
 .../Indexing/MediaFileIndexingOptions.cs      |   57 +-
 .../Indexing/ServiceCollectionExtensions.cs   |   43 +-
 .../MediaOptions.cs                           |  187 +-
 .../DefaultMediaFileStore.cs                  |  309 ++-
 .../DefaultMediaFileStoreCacheFileProvider.cs |  225 ++-
 .../DefaultMediaFileStoreCacheEventHandler.cs |   45 +-
 .../Events/MediaEventHandlerBase.cs           |   69 +-
 .../Fields/MediaField.cs                      |   11 +-
 .../Services/MediaSizeLimitAttribute.cs       |   83 +-
 .../Settings/MediaFieldSettings.cs            |   23 +-
 .../IMetaWeblogDriver.cs                      |   13 +-
 .../MetaWeblogDriver.cs                       |   21 +-
 .../ApplicationViewFileProvider.cs            |  157 +-
 .../DevelopmentViewsFeature.cs                |    7 +-
 .../Extensions/ControllerBaseExtensions.cs    |  113 +-
 .../ModelStateDictionaryExtensions.cs         |   33 +-
 .../OrchardCoreBuilderExtensions.cs           |   41 +-
 .../FileProviders/FileProviderExtensions.cs   |   67 +-
 .../ComponentViewLocationExpanderProvider.cs  |  189 +-
 .../CompositeViewLocationExpanderProvider.cs  |   57 +-
 .../IViewLocationExpanderProvider.cs          |    9 +-
 .../SharedViewLocationExpanderProvider.cs     |  199 +-
 .../ModelBinding/CheckMarkModelBinder.cs      |   43 +-
 .../CheckMarkModelBinderProvider.cs           |   29 +-
 .../ModelBinding/ModelError.cs                |   19 +-
 .../ModularApplicationModelProvider.cs        |   95 +-
 .../ModularRazorViewEngineOptionsSetup.cs     |   17 +-
 .../ModuleProjectRazorFileProvider.cs         |  343 ++--
 .../RazorCompilationFileProviderAccessor.cs   |   49 +-
 .../RazorCompilationOptionsSetup.cs           |   53 +-
 .../ModularPageApplicationModelProvider.cs    |   63 +-
 .../ModularPageMvcCoreBuilderExtensions.cs    |   33 +-
 .../ModularPageRazorPagesOptionsSetup.cs      |   45 +-
 .../ModularPageViewEnginePathFilter.cs        |   37 +-
 .../PageConventionCollectionExtensions.cs     |  117 +-
 .../RazorPages/PageEndpointComparerPolicy.cs  |   19 +-
 .../DefaultAreaControllerRouteMapper.cs       |   29 +-
 .../SharedViewCompilerProvider.cs             |   49 +-
 .../ShellFeatureApplicationPart.cs            |  109 +-
 .../ShellFileVersionProvider.cs               |  187 +-
 .../ShellViewFeatureProvider.cs               |  239 ++-
 .../OrchardCore.Mvc.Core/Startup.cs           |  169 +-
 .../Utilities/ControllerTypeExtensions.cs     |   21 +-
 .../Utilities/StringExtensions.cs             |  737 ++++---
 .../Utilities/UrlHelperExtensions.cs          |   37 +-
 .../INavigationManager.cs                     |    9 +-
 .../INavigationProvider.cs                    |    9 +-
 .../OrchardCore.Navigation.Core/MenuItem.cs   |  183 +-
 .../NavigationBuilder.cs                      |  165 +-
 .../NavigationExtensions.cs                   |   25 +-
 .../NavigationItemBuilder.cs                  |  265 ++-
 .../NavigationManager.cs                      |  383 ++--
 .../OrchardCore.Navigation.Core/Pager.cs      |   87 +-
 .../PagerParameters.cs                        |   25 +-
 .../OrchardCore.Navigation.Core/PagerSlim.cs  |   71 +-
 .../PagerSlimParameters.cs                    |   27 +-
 .../ServiceCollectionExtensions.cs            |   23 +-
 .../Services/EmailNotificationProvider.cs     |    2 +-
 .../OpenIdApplicationDescriptor.cs            |   15 +-
 .../OpenIdAuthorizationDescriptor.cs          |    7 +-
 .../Descriptors/OpenIdScopeDescriptor.cs      |    7 +-
 .../Descriptors/OpenIdTokenDescriptor.cs      |    7 +-
 .../Managers/IOpenIdApplicationManager.cs     |   33 +-
 .../Managers/IOpenIdAuthorizationManager.cs   |   27 +-
 .../Managers/IOpenIdScopeManager.cs           |   27 +-
 .../Managers/IOpenIdTokenManager.cs           |   27 +-
 .../Stores/IOpenIdApplicationStore.cs         |   17 +-
 .../Stores/IOpenIdAuthorizationStore.cs       |   11 +-
 .../Abstractions/Stores/IOpenIdScopeStore.cs  |   11 +-
 .../Abstractions/Stores/IOpenIdTokenStore.cs  |   11 +-
 .../OpenIdConstants.cs                        |   53 +-
 .../OpenIdExtensions.cs                       |  127 +-
 .../Managers/OpenIdApplicationManager.cs      |  317 ++-
 .../Managers/OpenIdAuthorizationManager.cs    |   99 +-
 .../Services/Managers/OpenIdScopeManager.cs   |   97 +-
 .../Services/Managers/OpenIdTokenManager.cs   |   97 +-
 .../YesSql/Indexes/OpenIdApplicationIndex.cs  |  171 +-
 .../Indexes/OpenIdAuthorizationIndex.cs       |   55 +-
 .../YesSql/Indexes/OpenIdScopeIndex.cs        |   83 +-
 .../YesSql/Indexes/OpenIdTokenIndex.cs        |   67 +-
 .../YesSql/Migrations/OpenIdMigrations.cs     |  947 +++++----
 .../YesSql/Models/OpenIdApplication.cs        |  195 +-
 .../YesSql/Models/OpenIdAuthorization.cs      |  107 +-
 .../YesSql/Models/OpenIdScope.cs              |  109 +-
 .../YesSql/Models/OpenIdToken.cs              |  131 +-
 .../OpenIdApplicationStoreResolver.cs         |   69 +-
 .../OpenIdAuthorizationStoreResolver.cs       |   69 +-
 .../Resolvers/OpenIdScopeStoreResolver.cs     |   69 +-
 .../Resolvers/OpenIdTokenStoreResolver.cs     |   69 +-
 .../YesSql/Stores/OpenIdApplicationStore.cs   |  709 ++++---
 .../YesSql/Stores/OpenIdAuthorizationStore.cs |  655 ++++---
 .../YesSql/Stores/OpenIdScopeStore.cs         |  475 +++--
 .../YesSql/Stores/OpenIdTokenStore.cs         |  793 ++++----
 .../IQueryResults.cs                          |   17 +-
 .../Models/DeletingQueryContext.cs            |    2 +-
 .../Models/UpdatedQueryContext.cs             |    2 +-
 .../ActionFilters/Detection/IDetectRobots.cs  |   43 +-
 .../Detection/IPAddressRobotDetector.cs       |   85 +-
 .../ActionFilters/ReCaptchaMode.cs            |   23 +-
 .../ValidateReCaptchaAttribute.cs             |   87 +-
 .../Configuration/ReCaptchaSettings.cs        |   33 +-
 .../ReCaptchaSettingsConfiguration.cs         |   31 +-
 .../OrchardCore.ReCaptcha.Core/Constants.cs   |   13 +-
 .../ServiceCollectionExtensions.cs            |   55 +-
 .../Services/ReCaptchaService.cs              |  221 ++-
 .../TagHelpers/ReCaptchaTagHelper.cs          |  191 +-
 .../Events/IRecipeEventHandler.cs             |   27 +-
 .../Models/RecipeDescriptor.cs                |   41 +-
 .../Models/RecipeEnvironmentFeature.cs        |    9 +-
 .../Models/RecipeResult.cs                    |   15 +-
 .../ServiceCollectionExtensions.cs            |   17 +-
 .../Services/IRecipeEnvironmentProvider.cs    |   11 +-
 .../Services/IRecipeExecutor.cs               |    9 +-
 .../Services/IRecipeHarvester.cs              |   15 +-
 .../Services/IRecipeMigrator.cs               |    9 +-
 .../Services/IRecipeReader.cs                 |    9 +-
 .../Services/IRecipeStepHandler.cs            |   21 +-
 .../ConfigurationMethodProvider.cs            |   29 +-
 .../ParametersMethodProvider.cs               |   37 +-
 .../ServiceCollectionExtensions.cs            |   23 +-
 .../Services/ApplicationRecipeHarvester.cs    |   33 +-
 .../RecipeEnvironmentFeatureProvider.cs       |   55 +-
 .../Services/RecipeExecutor.cs                |  359 ++--
 .../Services/RecipeHarvester.cs               |   89 +-
 .../Services/RecipeMigrator.cs                |   83 +-
 .../Services/RecipeReader.cs                  |   51 +-
 .../VariablesMethodProvider.cs                |   67 +-
 .../IRedisService.cs                          |   15 +-
 .../RedisOptions.cs                           |   33 +-
 .../IResourceManager.cs                       |  249 ++-
 .../LinkEntry.cs                              |  125 +-
 .../MetaEntry.cs                              |  177 +-
 .../RequireSettings.cs                        |  475 +++--
 .../ResourceDebugMode.cs                      |   13 +-
 .../ResourceDefinition.cs                     |  573 +++---
 .../ResourceLocation.cs                       |   15 +-
 .../ResourceManagementOptions.cs              |   27 +-
 .../ResourceManifest.cs                       |   61 +-
 .../ResourcePosition.cs                       |   13 +-
 .../ResourceRequiredContext.cs                |   63 +-
 .../ResourceDictionary.cs                     |   61 +-
 .../ResourceManager.cs                        | 1031 +++++-----
 .../ServiceCollectionExtensions.cs            |   19 +-
 .../TagHelpers/LinkTagHelper.cs               |  107 +-
 .../TagHelpers/MetaTagHelper.cs               |   65 +-
 .../TagHelpers/ResourcesTagHelper.cs          |   69 +-
 .../TagHelpers/ScriptTagHelper.cs             |  365 ++--
 .../TagHelpers/StyleTagHelper.cs              |  509 +++--
 .../Condition.cs                              |   11 +-
 .../ConditionEvaluator.cs                     |   17 +-
 .../ConditionGroup.cs                         |   17 +-
 .../ConditionOperator.cs                      |    7 +-
 .../ConditionOperatorOptions.cs               |   79 +-
 .../ConditionOptions.cs                       |   31 +-
 .../IConditionFactory.cs                      |   31 +-
 .../IConditionOperatorFactory.cs              |   25 +-
 .../INegateOperator.cs                        |    7 +-
 .../IOperatorComparer.cs                      |    9 +-
 .../OperatorComparer.cs                       |   13 +-
 .../OrchardCore.Rules.Abstractions/Rule.cs    |    7 +-
 .../ServiceCollectionExtensions.cs            |   71 +-
 .../Services/IConditionIdGenerator.cs         |    9 +-
 .../Services/IConditionOperatorResolver.cs    |    9 +-
 .../Services/IConditionResolver.cs            |    9 +-
 .../Services/IRuleService.cs                  |    9 +-
 .../JavaScriptEngine.cs                       |   89 +-
 .../JavaScriptScope.cs                        |   19 +-
 .../ServiceCollectionExtensions.cs            |   13 +-
 .../ViewModels/SearchFormViewModel.cs         |   29 +-
 .../ViewModels/SearchIndexViewModel.cs        |   45 +-
 .../ViewModels/SearchResultsViewModel.cs      |   27 +-
 .../AzureAISearchFieldIndexEventsBase.cs      |    4 +-
 .../ElasticQueryResults.cs                    |   11 +-
 .../ElasticTopDocs.cs                         |   13 +-
 .../IElasticAnalyzer.cs                       |   17 +-
 .../IElasticQueryService.cs                   |   31 +-
 .../IElasticsearchQueryService.cs             |   17 +-
 .../ElasticIndexDeploymentSource.cs           |   59 +-
 .../Deployment/ElasticIndexDeploymentStep.cs  |   23 +-
 .../ElasticIndexRebuildDeploymentSource.cs    |   39 +-
 .../ElasticIndexRebuildDeploymentStep.cs      |   23 +-
 .../ElasticIndexResetDeploymentSource.cs      |   41 +-
 .../ElasticIndexResetDeploymentStep.cs        |   23 +-
 .../ElasticSettingsDeploymentSource.cs        |   39 +-
 .../ElasticSettingsDeploymentStep.cs          |   17 +-
 .../Handlers/ElasticIndexingContentHandler.cs |  167 +-
 .../Mappings/ContainedPartModel.cs            |   15 +-
 .../Mappings/DisplayTextModel.cs              |   19 +-
 ...ContentPickerFieldElasticEditorSettings.cs |   13 +-
 .../Models/ElasticConnectionOptions.cs        |   97 +-
 .../Models/ElasticContentIndexSettings.cs     |   23 +-
 .../ElasticContentPickerResultProvider.cs     |  163 +-
 .../Recipes/ElasticIndexRebuildStep.cs        |   75 +-
 .../Recipes/ElasticIndexResetStep.cs          |   75 +-
 .../Recipes/ElasticIndexStep.cs               |   59 +-
 .../Recipes/ElasticSettingsStep.cs            |   41 +-
 .../Services/ElasticAnalyzer.cs               |   33 +-
 .../ElasticIndexInitializerService.cs         |  125 +-
 .../Services/ElasticIndexManager.cs           |  955 +++++----
 .../Services/ElasticIndexSettingsService.cs   |  161 +-
 .../Services/ElasticIndexingService.cs        |  469 +++--
 .../Services/ElasticQueryService.cs           |  121 +-
 .../Services/ElasticQuerySource.cs            |  115 +-
 .../Services/ElasticSearchQueryService.cs     |   35 +-
 .../ElasticContentPickerShapeProvider.cs      |   33 +-
 .../ILuceneAnalyzer.cs                        |   17 +-
 .../ILuceneQueryProvider.cs                   |    9 +-
 .../ILuceneQueryService.cs                    |   25 +-
 .../ILuceneSearchQueryService.cs              |   25 +-
 .../Indexing/Index.cs                         |   41 +-
 .../Indexing/Mapping.cs                       |   17 +-
 .../Indexing/Property.cs                      |  103 +-
 .../Indexing/Types.cs                         |   33 +-
 .../LuceneOptions.cs                          |    9 +-
 .../LuceneQueryContext.cs                     |   23 +-
 .../LuceneQueryResults.cs                     |   11 +-
 .../LuceneTopDocs.cs                          |   11 +-
 .../LuceneQueryService.cs                     |  183 +-
 .../QueryProviders/BooleanQueryProvider.cs    |  169 +-
 .../Filters/FuzzyFilterProvider.cs            |   89 +-
 .../Filters/GeoBoundingBoxFilterProvider.cs   |   75 +-
 .../Filters/GeoDistanceFilterProvider.cs      |  291 ++-
 .../Filters/ILuceneBooleanFilterProvider.cs   |    9 +-
 .../Filters/MatchAllFilterProvider.cs         |   31 +-
 .../Filters/MatchFilterProvider.cs            |  109 +-
 .../Filters/MatchPhraseFilterProvider.cs      |   83 +-
 .../Filters/PrefixFilterProvider.cs           |   89 +-
 .../Filters/RangeFilterProvider.cs            |  177 +-
 .../Filters/TermFilterProvider.cs             |   81 +-
 .../Filters/TermsFilterProvider.cs            |   67 +-
 .../Filters/WildcardFilterProvider.cs         |   93 +-
 .../QueryProviders/FuzzyQueryProvider.cs      |   83 +-
 .../QueryProviders/MatchAllQueryProvider.cs   |   27 +-
 .../MatchPhraseQueryProvider.cs               |   69 +-
 .../QueryProviders/MatchQueryProvider.cs      |   85 +-
 .../QueryProviders/PrefixQueryProvider.cs     |   85 +-
 .../QueryStringQueryProvider.cs               |   23 +-
 .../QueryProviders/RangeQueryProvider.cs      |  157 +-
 .../QueryProviders/RegexpQueryProvider.cs     |   53 +-
 .../SimpleQueryStringQueryProvider.cs         |   61 +-
 .../QueryProviders/TermQueryProvider.cs       |   47 +-
 .../QueryProviders/TermsQueryProvider.cs      |   51 +-
 .../QueryProviders/WildcardQueryProvider.cs   |   51 +-
 .../ServiceCollectionExtensions.cs            |   67 +-
 .../Deployment/ServiceCollectionExtensions.cs |   31 +-
 .../SiteSettingsPropertyDeploymentSource.cs   |   51 +-
 .../SiteSettingsPropertyDeploymentStep.cs     |   17 +-
 ...iteSettingsPropertyDeploymentStepDriver.cs |   57 +-
 ...teSettingsPropertyDeploymentStepFactory.cs |   19 +-
 ...SettingsPropertyDeploymentStepViewModel.cs |   11 +-
 .../ISetupService.cs                          |   31 +-
 .../ISetupUserIdGenerator.cs                  |    9 +-
 .../SetupContext.cs                           |   49 +-
 .../ServiceCollectionExtensions.cs            |   23 +-
 .../OrchardCore.Setup.Core/SetupService.cs    |  409 ++--
 .../SetupUserIdGenerator.cs                   |   23 +-
 .../BlobShellConfigurationSources.cs          |  149 +-
 .../Configuration/BlobShellStorageOptions.cs  |    9 +-
 .../BlobShellsConfigurationSources.cs         |  115 +-
 .../BlobShellsSettingsSources.cs              |  157 +-
 .../BlobShellsOrchardCoreBuilderExtensions.cs |   93 +-
 .../Services/BlobShellsFileStore.cs           |   43 +-
 .../Services/IShellsFileStore.cs              |   15 +-
 .../ServiceCollectionExtensions.cs            |   35 +-
 .../Services/IShortcodeContextProvider.cs     |   15 +-
 .../Services/IShortcodeDescriptorManager.cs   |    9 +-
 .../Services/IShortcodeDescriptorProvider.cs  |    9 +-
 .../Services/IShortcodeService.cs             |    9 +-
 .../ShortcodeDescriptor.cs                    |   71 +-
 .../ShortcodeOption.cs                        |   71 +-
 .../ShortcodeOptions.cs                       |   49 +-
 .../Aspects/SitemapMetadataAspect.cs          |   13 +-
 .../Builders/ContentItemsQueryContext.cs      |   23 +-
 .../Builders/IContentItemsQueryProvider.cs    |   15 +-
 .../Builders/ISitemapBuilder.cs               |   15 +-
 ...emapContentItemExtendedMetadataProvider.cs |   25 +-
 .../Builders/ISitemapModifiedDateProvider.cs  |   15 +-
 .../Builders/ISitemapSourceBuilder.cs         |   15 +-
 .../ISitemapSourceModifiedDateProvider.cs     |   15 +-
 .../Builders/ISitemapTypeBuilder.cs           |   15 +-
 .../Builders/SitemapBuilderContext.cs         |   21 +-
 .../Builders/SitemapSourceBuilderBase.cs      |   25 +-
 .../SitemapSourceModifiedDateProviderBase.cs  |   39 +-
 .../Builders/SitemapTypeBuilderBase.cs        |   25 +-
 .../Cache/ISitemapCacheFileResolver.cs        |   15 +-
 .../Cache/ISitemapCacheProvider.cs            |   27 +-
 .../Handlers/ISitemapSourceUpdateHandler.cs   |   15 +-
 .../Handlers/ISitemapTypeUpdateHandler.cs     |   15 +-
 .../Handlers/ISitemapUpdateHandler.cs         |   15 +-
 .../Handlers/SitemapUpdateContext.cs          |    9 +-
 .../Models/ChangeFrequency.cs                 |   21 +-
 .../Models/ContentTypesSitemapSource.cs       |   89 +-
 .../Models/CustomPathSitemapSource.cs         |   43 +-
 .../Models/Sitemap.cs                         |    9 +-
 .../Models/SitemapSource.cs                   |    9 +-
 .../Models/SitemapType.cs                     |   77 +-
 .../Services/ISitemapHelperService.cs         |   17 +-
 .../Services/ISitemapIdGenerator.cs           |    9 +-
 .../Services/ISitemapManager.cs               |   91 +-
 .../Services/ISitemapSourceFactory.cs         |   41 +-
 .../SitemapsOptions.cs                        |   11 +-
 .../SitemapsRazorPagesContentTypeOption.cs    |   39 +-
 .../SitemapsRazorPagesOptions.cs              |   25 +-
 .../ClaimsPrincipalExtensions.cs              |   39 +-
 .../Events/ILoginFormEvent.cs                 |   61 +-
 .../Events/IPasswordRecoveryFormEvents.cs     |   45 +-
 .../Events/IRegistrationFormEvents.cs         |   29 +-
 .../Events/PasswordRecoveryContext.cs         |   23 +-
 .../Handlers/IExternalLoginEventHandler.cs    |   35 +-
 .../Handlers/IUserEventHandler.cs             |  105 +-
 .../Handlers/UpdateUserContext.cs             |  113 +-
 .../Handlers/UserContext.cs                   |   17 +-
 .../Handlers/UserContextBase.cs               |   31 +-
 .../Handlers/UserCreateContext.cs             |   21 +-
 .../Handlers/UserDeleteContext.cs             |   21 +-
 .../Handlers/UserEventHandlerBase.cs          |   39 +-
 .../Handlers/UserUpdateContext.cs             |   21 +-
 .../OrchardCore.Users.Abstractions/IUser.cs   |   17 +-
 .../Models/UserClaim.cs                       |   31 +-
 .../SerializableClaim.cs                      |   77 +-
 .../Services/IMembershipService.cs            |   47 +-
 .../Services/IUserClaimsProvider.cs           |    9 +-
 .../Services/IUserIdGenerator.cs              |    9 +-
 .../Services/IUserService.cs                  |  153 +-
 .../UserOptions.cs                            |   77 +-
 .../UsersServiceCollectionExtensions.cs       |   81 +-
 .../Handlers/UserDisabledEventHandler.cs      |   21 +-
 .../Indexes/UserByClaimIndex.cs               |   31 +-
 .../Indexes/UserByLoginInfoIndex.cs           |   31 +-
 .../Indexes/UserByRoleNameIndex.cs            |   91 +-
 .../Indexes/UserIndex.cs                      |   57 +-
 .../OrchardCore.Users.Core/Models/User.cs     |   55 +-
 .../Models/UserToken.cs                       |   13 +-
 ...faultUserClaimsPrincipalProviderFactory.cs |   47 +-
 .../Services/IUsersAdminListFilterParser.cs   |    7 +-
 .../Services/IUsersAdminListFilterProvider.cs |    9 +-
 .../Services/IUsersAdminListQueryService.cs   |    9 +-
 .../Services/UserFilterEngineModelBinder.cs   |   49 +-
 .../Services/UserQueryContext.cs              |   15 +-
 .../Services/UserService.cs                   |  483 +++--
 .../Services/UserStore.cs                     | 1283 ++++++------
 .../ViewModels/UserIndexOptions.cs            |   97 +-
 .../Activities/Activity.cs                    |  283 ++-
 .../Activities/ActivityExecutionResult.cs     |   33 +-
 .../Activities/EventActivity.cs               |   13 +-
 .../Activities/IActivity.cs                   |  123 +-
 .../Activities/IEvent.cs                      |    7 +-
 .../Activities/ITask.cs                       |    7 +-
 .../Converters/LocalizedStringConverter.cs    |   25 +-
 .../Display/ActivityDisplayDriver.cs          |  127 +-
 .../Helpers/ActivityExtensions.cs             |   55 +-
 .../Helpers/DictionaryExtensions.cs           |   63 +-
 .../Helpers/DistributedLockExtensions.cs      |   69 +-
 .../Helpers/ListExtensions.cs                 |   23 +-
 .../Helpers/ServiceCollectionExtensions.cs    |   11 +-
 .../Models/ActivityContext.cs                 |   11 +-
 .../Models/ActivityMetadata.cs                |   17 +-
 .../Models/ActivityRecord.cs                  |   41 +-
 .../Models/BlockingActivity.cs                |   27 +-
 .../Models/ExecutedActivity.cs                |   11 +-
 .../Models/Outcome.cs                         |   27 +-
 .../Models/Transition.cs                      |   37 +-
 .../Models/Workflow.cs                        |   97 +-
 .../Models/WorkflowContext.cs                 |   15 +-
 .../Models/WorkflowCreatedContext.cs          |    9 +-
 .../Models/WorkflowDeletedContext.cs          |    9 +-
 .../Models/WorkflowExecutionContext.cs        |  195 +-
 .../WorkflowExecutionExpressionContext.cs     |   15 +-
 .../WorkflowExecutionHandlerContextBase.cs    |   15 +-
 .../Models/WorkflowExecutionScriptContext.cs  |   13 +-
 .../Models/WorkflowExpression.cs              |   27 +-
 .../Models/WorkflowFaultModel.cs              |   27 +-
 .../Models/WorkflowState.cs                   |   59 +-
 .../Models/WorkflowStatus.cs                  |   23 +-
 .../Models/WorkflowType.cs                    |  103 +-
 .../Models/WorkflowTypeContext.cs             |   15 +-
 .../Models/WorkflowTypeCreatedContext.cs      |    9 +-
 .../Models/WorkflowTypeDeletedContext.cs      |    9 +-
 .../Models/WorkflowTypeUpdatedContext.cs      |    9 +-
 .../Models/WorkflowUpdatedContext.cs          |    9 +-
 .../Options/ActivityRegistration.cs           |   27 +-
 .../Options/WorkflowOptions.cs                |  105 +-
 .../Services/IActivityDisplayManager.cs       |    7 +-
 .../Services/IActivityIdGenerator.cs          |    9 +-
 .../Services/IActivityLibrary.cs              |   89 +-
 .../Services/ISecurityTokenService.cs         |   23 +-
 .../IWorkflowExecutionContextHandler.cs       |   15 +-
 .../Services/IWorkflowExpressionEvaluator.cs  |    9 +-
 .../Services/IWorkflowFaultHandler.cs         |   17 +-
 .../Services/IWorkflowHandler.cs              |   13 +-
 .../Services/IWorkflowIdGenerator.cs          |    9 +-
 .../Services/IWorkflowManager.cs              |  135 +-
 .../Services/IWorkflowScriptEvaluator.cs      |    9 +-
 .../Services/IWorkflowStore.cs                |   33 +-
 .../Services/IWorkflowTypeEventHandler.cs     |   13 +-
 .../Services/IWorkflowTypeIdGenerator.cs      |    9 +-
 .../Services/IWorkflowTypeStore.cs            |   21 +-
 .../Services/IWorkflowValueSerializer.cs      |   21 +-
 .../Services/SerializeWorkflowValueContext.cs |   19 +-
 .../WorkflowExecutionContextHandlerBase.cs    |   35 +-
 .../Services/WorkflowHandlerBase.cs           |   27 +-
 .../Services/WorkflowTypeHandlerBase.cs       |   27 +-
 .../ViewModels/ActivityViewModel.cs           |   23 +-
 .../IXmlRpcDriver.cs                          |    9 +-
 .../IXmlRpcHandler.cs                         |   11 +-
 .../Models/XRpcArray.cs                       |   31 +-
 .../Models/XRpcData.cs                        |   93 +-
 .../Models/XRpcMethodCall.cs                  |   11 +-
 .../Models/XRpcMethodResponse.cs              |   25 +-
 .../Models/XRpcStruct.cs                      |   45 +-
 .../Services/IXmlRpcReader.cs                 |   57 +-
 .../Services/IXmlRpcWriter.cs                 |   57 +-
 .../XmlRpcContext.cs                          |   19 +-
 .../BackgroundTaskScheduler.cs                |   83 +-
 .../Caching/Distributed/DistributedSignal.cs  |   31 +-
 src/OrchardCore/OrchardCore/Caching/Signal.cs |   81 +-
 .../Extensions/ExtensionDependencyStrategy.cs |   11 +-
 .../OrchardCore/Extensions/ExtensionInfo.cs   |   49 +-
 .../Extensions/ExtensionManager.cs            |  527 +++--
 .../Extensions/ExtensionPriorityStrategy.cs   |   11 +-
 .../Extensions/Features/FeatureHash.cs        |   73 +-
 .../Extensions/Features/FeatureInfo.cs        |   83 +-
 .../Extensions/Features/FeaturesProvider.cs   |  189 +-
 .../Features/TypeFeatureProvider.cs           |   75 +-
 .../Extensions/Manifests/ManifestInfo.cs      |   31 +-
 .../Extensions/ServiceCollectionExtensions.cs |   31 +-
 .../OrchardCore/Localization/BclCalendars.cs  |  175 +-
 .../Localization/DefaultCalendarManager.cs    |   75 +-
 .../Localization/DefaultCalendarSelector.cs   |   25 +-
 .../DefaultLocalizationService.cs             |   25 +-
 .../OrchardCore/Locking/LocalLock.cs          |  229 ++-
 .../Modules/DefaultOrchardHelper.cs           |   15 +-
 .../ApplicationBuilderExtensions.cs           |   45 +-
 .../OrchardCoreBuilderExtensions.cs           |  173 +-
 .../PoweredByOrchardCoreExtensions.cs         |   59 +-
 .../Extensions/RunningShellTableExtensions.cs |   29 +-
 .../Extensions/ServiceCollectionExtensions.cs |  879 +++++----
 .../OrchardCore/Modules/Model/TimeZone.cs     |   35 +-
 .../Modules/ModularBackgroundService.cs       |  619 +++---
 .../ModularTenantContainerMiddleware.cs       |  103 +-
 .../Modules/ModularTenantRouterMiddleware.cs  |   69 +-
 .../HttpClient/ActiveHandlerTrackingEntry.cs  |  159 +-
 .../HttpClient/ExpiredHandlerTrackingEntry.cs |   37 +-
 .../LifetimeTrackingHttpMessageHandler.cs     |   25 +-
 .../Overrides/HttpClient/NonCapturingTimer.cs |   47 +-
 .../HttpClient/TenantHttpClientFactory.cs     |  679 ++++---
 .../Modules/PoweredByMiddleware.cs            |   65 +-
 .../OrchardCore/Modules/Services/Clock.cs     |  129 +-
 .../Modules/Services/LocalClock.cs            |  127 +-
 .../Modules/Services/SlugService.cs           |  109 +-
 .../Shell/Builders/CompositionStrategy.cs     |   97 +-
 .../Extensions/ServiceCollectionExtensions.cs |   73 +-
 .../Extensions/ServiceProviderExtensions.cs   |  161 +-
 .../Builders/FeatureAwareServiceCollection.cs |  151 +-
 .../Shell/Builders/ShellContainerFactory.cs   |  247 ++-
 .../Shell/Builders/ShellContextFactory.cs     |  173 +-
 .../Builders/ShellContextOptionsSetup.cs      |   55 +-
 .../Shell/Builders/StartupBaseMock.cs         |  107 +-
 .../ShellConfigurationSources.cs              |  113 +-
 .../ShellsConfigurationSources.cs             |   33 +-
 .../Configuration/ShellsSettingsSources.cs    |   89 +-
 ...aultTenantOnlyFeatureValidationProvider.cs |   45 +-
 .../AllFeaturesShellDescriptorManager.cs      |   47 +-
 ...onfiguredFeaturesShellDescriptorManager.cs |   97 +-
 .../SetFeaturesShellDescriptorManager.cs      |   73 +-
 .../Shell/Distributed/DistributedContext.cs   |  193 +-
 .../DistributedShellHostedService.cs          | 1279 ++++++------
 .../Shell/Distributed/ShellIdentifier.cs      |   11 +-
 .../FeatureProfilesValidationProvider.cs      |  149 +-
 .../Shell/NullFeatureProfilesService.cs       |   13 +-
 .../OrchardCore/Shell/RunningShellTable.cs    |  237 ++-
 .../Shell/ServiceCollectionExtensions.cs      |  115 +-
 .../Shell/ShellDescriptorFeaturesManager.cs   |  303 ++-
 .../OrchardCore/Shell/ShellFeaturesManager.cs |  119 +-
 .../OrchardCore/Shell/ShellHost.cs            |  841 ++++----
 .../OrchardCore/Shell/ShellOptionsSetup.cs    |   43 +-
 .../OrchardCore/Shell/ShellSettingsManager.cs |  459 +++--
 .../Shell/SingleShellSettingsManager.cs       |   23 +-
 .../FeatureAttributeTests.Attribute.cs        |  629 +++---
 .../Modules/Manifest/FeatureAttributeTests.cs |  803 ++++----
 .../ModuleAttributeTests.Attribute.cs         |  345 ++--
 .../Modules/Manifest/ModuleAttributeTests.cs  | 1315 +++++++------
 .../Modules/Manifest/ThemeAttributeTests.cs   | 1121 ++++++-----
 .../Modules/StringExtensionsTests.cs          |   71 +-
 .../FluidShapeRenderBenchmark.cs              |  189 +-
 .../MediaTokenServiceBenchmark.cs             |  155 +-
 test/OrchardCore.Benchmarks/Program.cs        |   11 +-
 .../ResourceManagerBenchmark.cs               |   75 +-
 test/OrchardCore.Benchmarks/RuleBenchmark.cs  |   83 +-
 .../ShapeFactoryBenchmark.cs                  |   87 +-
 .../ShapeProxyBenchmark.cs                    |   99 +-
 test/OrchardCore.Benchmarks/SlugBenchmark.cs  |   39 +-
 .../Support/FakeFileProvider.cs               |   27 +-
 .../Support/FakeWebHostEnvironment.cs         |   19 +-
 .../Examples.Features.AssyAttrib/Root.cs      |   13 +-
 .../BaseThemeSample/DependentTypes.cs         |    6 +-
 .../Errors.OrchardCoreModules.TwoPlus/Root.cs |   13 +-
 .../Examples.Modules.AssyAttrib.Alpha/Root.cs |   13 +-
 .../Examples.Modules.AssyAttrib.Bravo/Root.cs |   13 +-
 .../Root.cs                                   |   13 +-
 .../Examples.OrchardCoreModules.Alpha/Root.cs |   13 +-
 .../ModuleSample/DependentTypes.cs            |    4 +-
 .../OrchardCore.Application.Pages/Program.cs  |   25 +-
 .../OrchardCore.Application.Pages/Startup.cs  |   27 +-
 .../Module.Pages/Startup.cs                   |   25 +-
 .../Theme.Pages/PlaceHolder.cs                |    9 +-
 .../Root.cs                                   |   13 +-
 .../Errors.OrchardCoreThemes.TwoPlus/Root.cs  |   13 +-
 .../Examples.OrchardCoreThemes.Alpha/Root.cs  |   13 +-
 .../Examples.Themes.AssyAttrib.Alpha/Root.cs  |   13 +-
 .../Examples.Themes.AssyAttrib.Bravo/Root.cs  |   13 +-
 .../Root.cs                                   |   13 +-
 .../BlogPostApiControllerTests.cs             |  523 +++--
 .../BlogPostContentStepIdempotentTests.cs     |  121 +-
 .../BlogPostCreateDeploymentPlanTests.cs      |  319 ++-
 .../BlogPostUpdateDeploymentPlanTests.cs      |  193 +-
 .../ContentStepLuceneQueryTests.cs            |   79 +-
 .../Apis/Context/AgencyContext.cs             |   17 +-
 .../Apis/Context/AuthenticationContext.cs     |  141 +-
 .../Apis/Context/BlogContext.cs               |   47 +-
 .../Context/BlogPostApiControllerContext.cs   |   51 +-
 .../Apis/Context/BlogPostDeploymentContext.cs |  133 +-
 .../Extensions/HttpContentExtensions.cs       |   19 +-
 .../Extensions/HttpRequestExtensions.cs       |  367 ++--
 .../Apis/Context/MvcTestFixture.cs            |   41 +-
 .../Apis/Context/SiteContext.cs               |  315 ++-
 .../Apis/Context/SiteStartup.cs               |   93 +-
 .../Apis/Context/TablePrefixGenerator.cs      |   45 +-
 .../Apis/Context/TablePrefixGeneratorTests.cs |   25 +-
 .../Apis/Context/TestRecipeHarvester.cs       |   69 +-
 .../Apis/GraphQL/Blog/BlogPostTests.cs        |  533 +++--
 .../ContentTypeQueryResourceBuilderTests.cs   |  227 ++-
 .../GraphQL/ContentItemsFieldTypeTests.cs     |  909 +++++----
 .../GraphQL/Queries/PredicateQueryTests.cs    |    2 +-
 .../Queries/RecentBlogPostsQueryTests.cs      |   89 +-
 .../RequiresPermissionValidationRuleTests.cs  |  257 ++-
 .../Apis/Lucene/LuceneContext.cs              |   17 +-
 .../Apis/Lucene/LuceneQueryTests.cs           |  231 ++-
 .../CommandHandlerDescriptorBuilderTests.cs   |  139 +-
 .../Commands/CommandHandlerTests.cs           |  439 +++--
 .../Commands/CommandManagerTests.cs           |   77 +-
 .../Data/ContentItemExtensions.cs             |  229 ++-
 .../Data/ContentItemTests.cs                  |  543 +++---
 .../Data/JsonDynamicTests.cs                  |    4 +-
 .../DisplayManagement/ArgsUtility.cs          |   51 +-
 .../DisplayManagement/CompositeTests.cs       |  105 +-
 .../BasicShapeTemplateHarvesterTests.cs       |  263 ++-
 .../DefaultShapeTableManagerTests.cs          |  793 ++++----
 .../Decriptors/LocationParserTests.cs         |  549 +++---
 .../DefaultDisplayManagerTests.cs             |  679 ++++---
 .../DisplayManagement/NilTests.cs             |   87 +-
 .../DisplayManagement/ShapeFactoryTests.cs    |  197 +-
 .../DisplayManagement/ShapeHelperTests.cs     |   91 +-
 .../DisplayManagement/ShapeSerializerTests.cs |   83 +-
 .../Title/PageTitleBuilderTests.cs            |  241 ++-
 .../ViewBufferTextWriterContentTests.cs       |  177 +-
 .../DisplayManagement/ZoneonDemandTests.cs    |  369 ++--
 .../Email/EmailAddressValidatorTests.cs       |   59 +-
 test/OrchardCore.Tests/Email/EmailTests.cs    |  445 +++--
 .../Extensions/ExtensionManagerTests.cs       |  463 +++--
 .../Hosting/Console/CommandParserTests.cs     |  359 ++--
 .../Html/HtmlSanitizerTests.cs                |  101 +-
 .../Localization/CultureDictionaryTests.cs    |  117 +-
 .../Localization/CultureScopeTests.cs         |  105 +-
 .../DefaultPluralRuleProviderTests.cs         |   41 +-
 .../Localization/LocalizationManagerTests.cs  |  109 +-
 .../Localization/NullHtmlLocalizerTests.cs    |   39 +-
 .../Localization/NullStringLocalizerTests.cs  |   73 +-
 .../Localization/PoParserTests.cs             |  413 ++--
 ...rtableObjectStringLocalizerFactoryTests.cs |   69 +-
 .../PortableObjectStringLocalizerTests.cs     |  587 +++---
 .../DateTimeParserTests.cs                    |   37 +-
 .../Feeds/RssFeedTests.cs                     |  155 +-
 .../Workflows/EmailTaskTests.cs               |  133 +-
 .../OrchardCore.Markdown/MarkdownTests.cs     |   75 +-
 .../AssetUrlShortcodeTests.cs                 |   91 +-
 .../OrchardCore.Media/ImageShortcodeTests.cs  |   99 +-
 .../OrchardCore.Media/MediaEventTests.cs      |  111 +-
 .../OrchardCore.Media/MediaTokenTests.cs      |  259 ++-
 .../ApplicationControllerTests.cs             |  305 ++-
 .../OpenIdApplicationStepTests.cs             |  309 ++-
 .../OpenIdApplicationStepTestsData.cs         |  127 +-
 .../OpenIdScopeStepTests.cs                   |  295 ++-
 .../OpenIdServerDeploymentSourceTests.cs      |  213 +-
 .../OrchardCore.Roles/RolesMockHelper.cs      |   23 +-
 .../RolesPermissionsHandlerTests.cs           |  231 ++-
 .../Modules/OrchardCore.Rules/RuleTests.cs    |  347 ++--
 ...eadersApplicationBuilderExtensionsTests.cs |  173 +-
 .../SecurityHeadersMiddlewareTests.cs         |  235 ++-
 .../LocaleShortcodeTests.cs                   |   35 +-
 .../Services/TenantValidatorTests.cs          |  237 ++-
 .../OrchardCore.Twitter/TwitterClientTests.cs |  185 +-
 .../Modules/PoweredByMiddlewareTests.cs       |   97 +-
 .../Orchard.Queries/SqlParserTests.cs         |  483 +++--
 .../CacheScopeManagerTests.cs                 |  561 +++---
 .../AccountControllerTests.cs                 |    2 +-
 ...UserClaimsPrincipalProviderFactoryTests.cs |   80 +-
 .../OrchardCore.Users/UserValidatorTests.cs   |  265 ++-
 .../OrchardCore.Users/UsersMockHelper.cs      |   43 +-
 .../Recipes/RecipeExecutorTests.cs            |  165 +-
 .../ResourceDefinitionTests.cs                |  491 +++--
 .../ResourceManagerTests.cs                   | 1549 ++++++++-------
 .../Routing/AutorouteEntriesTests.cs          |  359 ++--
 .../Security/PermissionHandlerHelper.cs       |   69 +-
 .../Security/PermissionHandlerTests.cs        |  173 +-
 .../Shell/RunningShellTableTests.cs           |  673 ++++---
 .../Shell/ShellContainerFactoryTests.cs       |  407 ++--
 .../Stubs/MemoryFileBuilder.cs                |   47 +-
 .../Stubs/StubExtensionManager.cs             |   93 +-
 .../Stubs/StubHostingEnvironment.cs           |   49 +-
 .../Stubs/StubPoFileLocationProvider.cs       |   29 +-
 .../Stubs/TestShapeBindingResolver.cs         |   37 +-
 .../Tokens.Content/SlugServiceTests.cs        |  133 +-
 .../Utilities/StartupRunner.cs                |   27 +-
 .../Workflows/Activities/AddTask.cs           |   81 +-
 .../Workflows/Activities/WriteLineTask.cs     |   67 +-
 .../Workflows/WorkflowManagerTests.cs         |  227 ++-
 3586 files changed, 144641 insertions(+), 148198 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index e591a9cd54c..2cf117a4d88 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,7 +1,6 @@
 root = true
 
 [*]
-end_of_line = crlf
 charset = utf-8
 indent_style = space
 indent_size = 4
@@ -32,7 +31,10 @@ dotnet_sort_system_directives_first                        = true
 # Code-block preferences
 csharp_prefer_braces = true
 csharp_prefer_simple_using_statement                       = true
-csharp_style_namespace_declarations                        = file_scoped:suggestion
+csharp_style_namespace_declarations                        = file_scoped:warning
+# Note that currently both IDE* rules and csharp_style_* rules are necessary, because only IDE rules will be enforced
+# during build, see: https://github.com/dotnet/roslyn/issues/44201.
+dotnet_diagnostic.IDE0161.severity                         = warning
 
 # Range operator
 csharp_style_prefer_range_operator                         = false:warning
diff --git a/.gitattributes b/.gitattributes
index b175f24ba07..afbe3b25f10 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,3 @@
 * text=auto
 
 **/wwwroot/Scripts/* linguist-vendored
-
-# Keep LF line endings in webroot assets files. Otherwise, building them under Windows would change the line endings to CLRF and cause changes without actually editing the source files.
-**/wwwroot/**/*.js text eol=lf
-**/wwwroot/**/*.css text eol=lf
diff --git a/Directory.Packages.props b/Directory.Packages.props
index a3effff50d5..674edaf3f9c 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -56,6 +56,7 @@
     <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.0.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.10.0"/>
     <PackageVersion Include="MimeKit" Version="4.7.1" />
     <PackageVersion Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
     <PackageVersion Include="Moq" Version="4.20.70" />
diff --git a/src/OrchardCore.Build/OrchardCore.Commons.props b/src/OrchardCore.Build/OrchardCore.Commons.props
index 1b3d5fcbd2c..8679acba8de 100644
--- a/src/OrchardCore.Build/OrchardCore.Commons.props
+++ b/src/OrchardCore.Build/OrchardCore.Commons.props
@@ -13,7 +13,6 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-
     <!-- Common NuGet properties-->
     <OCFrameworkDescription>Orchard Core Framework is an application framework for building modular, multi-tenant applications on ASP.NET Core.</OCFrameworkDescription>
     <OCCMSDescription>Orchard Core CMS is a Web Content Management System (CMS) built on top of the Orchard Core Framework.</OCCMSDescription>
@@ -48,6 +47,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="StyleCop.Analyzers" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/AdminAreaControllerRouteMapper.cs b/src/OrchardCore.Modules/OrchardCore.Admin/AdminAreaControllerRouteMapper.cs
index fb6677e135d..5b58e37e7ba 100644
--- a/src/OrchardCore.Modules/OrchardCore.Admin/AdminAreaControllerRouteMapper.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Admin/AdminAreaControllerRouteMapper.cs
@@ -5,53 +5,52 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Mvc.Routing;
 
-namespace OrchardCore.Admin
+namespace OrchardCore.Admin;
+
+public class AdminAreaControllerRouteMapper : IAreaControllerRouteMapper
 {
-    public class AdminAreaControllerRouteMapper : IAreaControllerRouteMapper
+    private const string _defaultAreaPattern = "{area}/{controller}/{action}/{id?}";
+    private readonly string _adminUrlPrefix;
+
+    public int Order => -1000;
+
+    public AdminAreaControllerRouteMapper(IOptions<AdminOptions> adminOptions)
     {
-        private const string _defaultAreaPattern = "{area}/{controller}/{action}/{id?}";
-        private readonly string _adminUrlPrefix;
+        _adminUrlPrefix = adminOptions.Value.AdminUrlPrefix;
+    }
 
-        public int Order => -1000;
+    public bool TryMapAreaControllerRoute(IEndpointRouteBuilder routes, ControllerActionDescriptor descriptor)
+    {
+        var controllerAttribute = descriptor.ControllerTypeInfo.GetCustomAttribute<AdminAttribute>();
+        var actionAttribute = descriptor.MethodInfo.GetCustomAttribute<AdminAttribute>();
 
-        public AdminAreaControllerRouteMapper(IOptions<AdminOptions> adminOptions)
+        if (descriptor.ControllerName != "Admin" && controllerAttribute == null && actionAttribute == null)
         {
-            _adminUrlPrefix = adminOptions.Value.AdminUrlPrefix;
+            return false;
         }
 
-        public bool TryMapAreaControllerRoute(IEndpointRouteBuilder routes, ControllerActionDescriptor descriptor)
+        string name = null;
+        var pattern = _defaultAreaPattern;
+
+        if (!string.IsNullOrWhiteSpace(actionAttribute?.Template))
         {
-            var controllerAttribute = descriptor.ControllerTypeInfo.GetCustomAttribute<AdminAttribute>();
-            var actionAttribute = descriptor.MethodInfo.GetCustomAttribute<AdminAttribute>();
-
-            if (descriptor.ControllerName != "Admin" && controllerAttribute == null && actionAttribute == null)
-            {
-                return false;
-            }
-
-            string name = null;
-            var pattern = _defaultAreaPattern;
-
-            if (!string.IsNullOrWhiteSpace(actionAttribute?.Template))
-            {
-                name = actionAttribute.RouteName;
-                pattern = actionAttribute.Template;
-            }
-            else if (!string.IsNullOrWhiteSpace(controllerAttribute?.Template))
-            {
-                name = controllerAttribute.RouteName;
-                pattern = controllerAttribute.Template;
-            }
-
-            var (area, controller, action) = RoutingHelper.GetMvcRouteValues(descriptor);
-
-            routes.MapControllerRoute(
-                name: RoutingHelper.ReplaceMvcPlaceholders(name, area, controller, action) ?? descriptor.DisplayName,
-                pattern: $"{_adminUrlPrefix}/{RoutingHelper.ReplaceMvcPlaceholders(pattern.TrimStart('/'), area, controller, action)}",
-                defaults: new { area, controller, action }
-            );
-
-            return true;
+            name = actionAttribute.RouteName;
+            pattern = actionAttribute.Template;
         }
+        else if (!string.IsNullOrWhiteSpace(controllerAttribute?.Template))
+        {
+            name = controllerAttribute.RouteName;
+            pattern = controllerAttribute.Template;
+        }
+
+        var (area, controller, action) = RoutingHelper.GetMvcRouteValues(descriptor);
+
+        routes.MapControllerRoute(
+            name: RoutingHelper.ReplaceMvcPlaceholders(name, area, controller, action) ?? descriptor.DisplayName,
+            pattern: $"{_adminUrlPrefix}/{RoutingHelper.ReplaceMvcPlaceholders(pattern.TrimStart('/'), area, controller, action)}",
+            defaults: new { area, controller, action }
+        );
+
+        return true;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/AdminFilter.cs b/src/OrchardCore.Modules/OrchardCore.Admin/AdminFilter.cs
index 9c9197e0822..b48f79ddbcf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Admin/AdminFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Admin/AdminFilter.cs
@@ -4,63 +4,62 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 
-namespace OrchardCore.Admin
+namespace OrchardCore.Admin;
+
+/// <summary>
+/// Intercepts any request to check whether it applies to the admin site.
+/// If so it marks the request as such and ensures the user as the right to access it.
+/// </summary>
+public sealed class AdminFilter : ActionFilterAttribute, IAsyncPageFilter
 {
-    /// <summary>
-    /// Intercepts any request to check whether it applies to the admin site.
-    /// If so it marks the request as such and ensures the user as the right to access it.
-    /// </summary>
-    public sealed class AdminFilter : ActionFilterAttribute, IAsyncPageFilter
+    private readonly IAuthorizationService _authorizationService;
+
+    public AdminFilter(IAuthorizationService authorizationService)
     {
-        private readonly IAuthorizationService _authorizationService;
+        _authorizationService = authorizationService;
+    }
 
-        public AdminFilter(IAuthorizationService authorizationService)
-        {
-            _authorizationService = authorizationService;
-        }
+    public override async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+    {
+        ArgumentNullException.ThrowIfNull(context);
 
-        public override async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+        if (!await AuthorizeAsync(context.HttpContext))
         {
-            ArgumentNullException.ThrowIfNull(context);
+            context.Result = context.HttpContext.User?.Identity?.IsAuthenticated ?? false
+                ? new ForbidResult()
+                : new ChallengeResult();
+            return;
+        }
 
-            if (!await AuthorizeAsync(context.HttpContext))
-            {
-                context.Result = context.HttpContext.User?.Identity?.IsAuthenticated ?? false
-                    ? new ForbidResult()
-                    : new ChallengeResult();
-                return;
-            }
+        await base.OnActionExecutionAsync(context, next);
+    }
 
-            await base.OnActionExecutionAsync(context, next);
-        }
+    public async Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next)
+    {
+        ArgumentNullException.ThrowIfNull(context);
 
-        public async Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next)
+        if (!await AuthorizeAsync(context.HttpContext))
         {
-            ArgumentNullException.ThrowIfNull(context);
+            context.Result = new ChallengeResult();
+            return;
+        }
 
-            if (!await AuthorizeAsync(context.HttpContext))
-            {
-                context.Result = new ChallengeResult();
-                return;
-            }
+        // Do post work.
+        await next.Invoke();
+    }
 
-            // Do post work.
-            await next.Invoke();
-        }
+    public Task OnPageHandlerSelectionAsync(PageHandlerSelectedContext context)
+    {
+        return Task.CompletedTask;
+    }
 
-        public Task OnPageHandlerSelectionAsync(PageHandlerSelectedContext context)
+    private Task<bool> AuthorizeAsync(Microsoft.AspNetCore.Http.HttpContext context)
+    {
+        if (AdminAttribute.IsApplied(context))
         {
-            return Task.CompletedTask;
+            return _authorizationService.AuthorizeAsync(context.User, AdminPermissions.AccessAdminPanel);
         }
 
-        private Task<bool> AuthorizeAsync(Microsoft.AspNetCore.Http.HttpContext context)
-        {
-            if (AdminAttribute.IsApplied(context))
-            {
-                return _authorizationService.AuthorizeAsync(context.User, AdminPermissions.AccessAdminPanel);
-            }
-
-            return Task.FromResult(true);
-        }
+        return Task.FromResult(true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs
index 5a38b1e0527..ebd71358a49 100644
--- a/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs
@@ -4,43 +4,42 @@
 using OrchardCore.Admin.Drivers;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Admin
+namespace OrchardCore.Admin;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", AdminSiteSettingsDisplayDriver.GroupId },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", AdminSiteSettingsDisplayDriver.GroupId },
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
-        {
-            S = localizer;
-        }
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["Settings"], settings => settings
-                        .Add(S["Admin"], S["Admin"].PrefixPosition(), admin => admin
-                            .AddClass("admin").Id("admin")
-                            .Action("Index", "Admin", _routeValues)
-                            .Permission(PermissionsAdminSettings.ManageAdminSettings)
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["Settings"], settings => settings
+                    .Add(S["Admin"], S["Admin"].PrefixPosition(), admin => admin
+                        .AddClass("admin").Id("admin")
+                        .Action("Index", "Admin", _routeValues)
+                        .Permission(PermissionsAdminSettings.ManageAdminSettings)
+                        .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenuFilter.cs b/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenuFilter.cs
index 00d313ea21f..6f8d1bd28a0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenuFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenuFilter.cs
@@ -5,73 +5,72 @@
 using OrchardCore.DisplayManagement.Shapes;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Admin
+namespace OrchardCore.Admin;
+
+/// <summary>
+/// This filter inject a Navigation shape in the Navigation zone of the Layout
+/// for any ViewResult returned from an Admin controller.
+/// </summary>
+public sealed class AdminMenuFilter : IAsyncResultFilter
 {
-    /// <summary>
-    /// This filter inject a Navigation shape in the Navigation zone of the Layout
-    /// for any ViewResult returned from an Admin controller.
-    /// </summary>
-    public sealed class AdminMenuFilter : IAsyncResultFilter
+    private readonly ILayoutAccessor _layoutAccessor;
+    private readonly IShapeFactory _shapeFactory;
+
+    public AdminMenuFilter(ILayoutAccessor layoutAccessor,
+        IShapeFactory shapeFactory)
     {
-        private readonly ILayoutAccessor _layoutAccessor;
-        private readonly IShapeFactory _shapeFactory;
+        _layoutAccessor = layoutAccessor;
+        _shapeFactory = shapeFactory;
+    }
 
-        public AdminMenuFilter(ILayoutAccessor layoutAccessor,
-            IShapeFactory shapeFactory)
+    public async Task OnResultExecutionAsync(ResultExecutingContext filterContext, ResultExecutionDelegate next)
+    {
+        // Should only run on a full view rendering result
+        if (!filterContext.IsViewOrPageResult())
         {
-            _layoutAccessor = layoutAccessor;
-            _shapeFactory = shapeFactory;
+            await next();
+            return;
         }
 
-        public async Task OnResultExecutionAsync(ResultExecutingContext filterContext, ResultExecutionDelegate next)
+        // Should only run on the Admin
+        if (!AdminAttribute.IsApplied(filterContext.HttpContext))
         {
-            // Should only run on a full view rendering result
-            if (!filterContext.IsViewOrPageResult())
-            {
-                await next();
-                return;
-            }
+            await next();
+            return;
+        }
 
-            // Should only run on the Admin
-            if (!AdminAttribute.IsApplied(filterContext.HttpContext))
-            {
-                await next();
-                return;
-            }
+        // Should only run for authenticated users
+        if (!(filterContext.HttpContext.User?.Identity?.IsAuthenticated ?? false))
+        {
+            await next();
+            return;
+        }
 
-            // Should only run for authenticated users
-            if (!(filterContext.HttpContext.User?.Identity?.IsAuthenticated ?? false))
-            {
-                await next();
-                return;
-            }
+        // Don't create the menu if the status code is 3xx
+        var statusCode = filterContext.HttpContext.Response.StatusCode;
+        if (statusCode >= 300 && statusCode < 400)
+        {
+            await next();
+            return;
+        }
 
-            // Don't create the menu if the status code is 3xx
-            var statusCode = filterContext.HttpContext.Response.StatusCode;
-            if (statusCode >= 300 && statusCode < 400)
+        // Populate main nav
+        var menuShape = await _shapeFactory.CreateAsync("Navigation",
+            Arguments.From(new
             {
-                await next();
-                return;
-            }
-
-            // Populate main nav
-            var menuShape = await _shapeFactory.CreateAsync("Navigation",
-                Arguments.From(new
-                {
-                    MenuName = NavigationConstants.AdminId,
-                    filterContext.RouteData,
-                }));
+                MenuName = NavigationConstants.AdminId,
+                filterContext.RouteData,
+            }));
 
-            var layout = await _layoutAccessor.GetLayoutAsync();
+        var layout = await _layoutAccessor.GetLayoutAsync();
 
-            var navigation = layout.Zones["Navigation"];
+        var navigation = layout.Zones["Navigation"];
 
-            if (navigation is Shape shape)
-            {
-                await shape.AddAsync(menuShape);
-            }
-
-            await next();
+        if (navigation is Shape shape)
+        {
+            await shape.AddAsync(menuShape);
         }
+
+        await next();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/AdminPageRouteModelConvention.cs b/src/OrchardCore.Modules/OrchardCore.Admin/AdminPageRouteModelConvention.cs
index 3ff8e6a0b50..852397c5cc1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Admin/AdminPageRouteModelConvention.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Admin/AdminPageRouteModelConvention.cs
@@ -1,35 +1,34 @@
 using System.Linq;
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
 
-namespace OrchardCore.Admin
+namespace OrchardCore.Admin;
+
+public class AdminPageRouteModelConvention : IPageRouteModelConvention
 {
-    public class AdminPageRouteModelConvention : IPageRouteModelConvention
+    private readonly string _adminUrlPrefixTemplate;
+
+    public AdminPageRouteModelConvention(string adminUrlPrefix)
+    {
+        _adminUrlPrefixTemplate = adminUrlPrefix;
+    }
+
+    public void Apply(PageRouteModel model)
     {
-        private readonly string _adminUrlPrefixTemplate;
+        var route = model.Selectors.FirstOrDefault()?.AttributeRouteModel;
 
-        public AdminPageRouteModelConvention(string adminUrlPrefix)
+        if (route == null)
         {
-            _adminUrlPrefixTemplate = adminUrlPrefix;
+            return;
         }
 
-        public void Apply(PageRouteModel model)
+        if (!route.Template.StartsWith(model.AreaName))
         {
-            var route = model.Selectors.FirstOrDefault()?.AttributeRouteModel;
-
-            if (route == null)
-            {
-                return;
-            }
-
-            if (!route.Template.StartsWith(model.AreaName))
-            {
-                return;
-            }
+            return;
+        }
 
-            if (route.Template.Contains("/Admin/") || model.Properties.ContainsKey("Admin"))
-            {
-                route.Template = AttributeRouteModel.CombineTemplates(_adminUrlPrefixTemplate, route.Template);
-            }
+        if (route.Template.Contains("/Admin/") || model.Properties.ContainsKey("Admin"))
+        {
+            route.Template = AttributeRouteModel.CombineTemplates(_adminUrlPrefixTemplate, route.Template);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/AdminPageRouteModelProvider.cs b/src/OrchardCore.Modules/OrchardCore.Admin/AdminPageRouteModelProvider.cs
index 4ac4f126eb7..f76a60dfd63 100644
--- a/src/OrchardCore.Modules/OrchardCore.Admin/AdminPageRouteModelProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Admin/AdminPageRouteModelProvider.cs
@@ -10,98 +10,97 @@
 using Microsoft.Extensions.Hosting;
 using OrchardCore.Mvc;
 
-namespace OrchardCore.Admin
+namespace OrchardCore.Admin;
+
+internal sealed class AdminPageRouteModelProvider : IPageRouteModelProvider
 {
-    internal sealed class AdminPageRouteModelProvider : IPageRouteModelProvider
-    {
-        private readonly IHostEnvironment _hostingEnvironment;
-        private readonly ApplicationPartManager _applicationManager;
+    private readonly IHostEnvironment _hostingEnvironment;
+    private readonly ApplicationPartManager _applicationManager;
 
-        public AdminPageRouteModelProvider(IHostEnvironment hostingEnvironment, ApplicationPartManager applicationManager)
-        {
-            _hostingEnvironment = hostingEnvironment;
-            _applicationManager = applicationManager;
-        }
+    public AdminPageRouteModelProvider(IHostEnvironment hostingEnvironment, ApplicationPartManager applicationManager)
+    {
+        _hostingEnvironment = hostingEnvironment;
+        _applicationManager = applicationManager;
+    }
 
-        public int Order => 1000;
+    public int Order => 1000;
 
-        public void OnProvidersExecuting(PageRouteModelProviderContext context)
-        {
-            ArgumentNullException.ThrowIfNull(context);
+    public void OnProvidersExecuting(PageRouteModelProviderContext context)
+    {
+        ArgumentNullException.ThrowIfNull(context);
 
-            IEnumerable<CompiledViewDescriptor> descriptors;
+        IEnumerable<CompiledViewDescriptor> descriptors;
 
-            var refsFolderExists = Directory.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "refs"));
+        var refsFolderExists = Directory.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "refs"));
 
-            if (_hostingEnvironment.IsDevelopment() && refsFolderExists)
-            {
-                descriptors = GetPageDescriptors<DevelopmentViewsFeature>(_applicationManager);
-            }
-            else
-            {
-                descriptors = GetPageDescriptors<ViewsFeature>(_applicationManager);
-            }
+        if (_hostingEnvironment.IsDevelopment() && refsFolderExists)
+        {
+            descriptors = GetPageDescriptors<DevelopmentViewsFeature>(_applicationManager);
+        }
+        else
+        {
+            descriptors = GetPageDescriptors<ViewsFeature>(_applicationManager);
+        }
 
-            var adminPaths = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        var adminPaths = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
-            foreach (var descriptor in descriptors)
+        foreach (var descriptor in descriptors)
+        {
+            foreach (var type in descriptor.Type.GetNestedTypes())
             {
-                foreach (var type in descriptor.Type.GetNestedTypes())
-                {
-                    var attribute = type.GetCustomAttribute<AdminAttribute>();
-
-                    if (attribute != null)
-                    {
-                        adminPaths.Add(descriptor.RelativePath);
-                        break;
-                    }
-                }
-            }
+                var attribute = type.GetCustomAttribute<AdminAttribute>();
 
-            foreach (var model in context.RouteModels.ToArray())
-            {
-                if (adminPaths.Contains(model.RelativePath))
+                if (attribute != null)
                 {
-                    model.Properties["Admin"] = null;
+                    adminPaths.Add(descriptor.RelativePath);
+                    break;
                 }
             }
         }
 
-        public void OnProvidersExecuted(PageRouteModelProviderContext context)
+        foreach (var model in context.RouteModels.ToArray())
         {
+            if (adminPaths.Contains(model.RelativePath))
+            {
+                model.Properties["Admin"] = null;
+            }
         }
+    }
 
-        private static IEnumerable<CompiledViewDescriptor> GetPageDescriptors<T>(ApplicationPartManager applicationManager)
-            where T : ViewsFeature, new()
-        {
-            ArgumentNullException.ThrowIfNull(applicationManager);
+    public void OnProvidersExecuted(PageRouteModelProviderContext context)
+    {
+    }
 
-            var viewsFeature = GetViewFeature<T>(applicationManager);
+    private static IEnumerable<CompiledViewDescriptor> GetPageDescriptors<T>(ApplicationPartManager applicationManager)
+        where T : ViewsFeature, new()
+    {
+        ArgumentNullException.ThrowIfNull(applicationManager);
 
-            var visited = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        var viewsFeature = GetViewFeature<T>(applicationManager);
 
-            foreach (var viewDescriptor in viewsFeature.ViewDescriptors)
+        var visited = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+        foreach (var viewDescriptor in viewsFeature.ViewDescriptors)
+        {
+            if (!visited.Add(viewDescriptor.RelativePath))
             {
-                if (!visited.Add(viewDescriptor.RelativePath))
-                {
-                    continue;
-                }
+                continue;
+            }
 
-                if (IsRazorPage(viewDescriptor))
-                {
-                    yield return viewDescriptor;
-                }
+            if (IsRazorPage(viewDescriptor))
+            {
+                yield return viewDescriptor;
             }
         }
+    }
 
-        private static bool IsRazorPage(CompiledViewDescriptor viewDescriptor) =>
-            viewDescriptor.Item?.Kind == RazorPageDocumentClassifierPass.RazorPageDocumentKind;
+    private static bool IsRazorPage(CompiledViewDescriptor viewDescriptor) =>
+        viewDescriptor.Item?.Kind == RazorPageDocumentClassifierPass.RazorPageDocumentKind;
 
-        private static T GetViewFeature<T>(ApplicationPartManager applicationManager) where T : ViewsFeature, new()
-        {
-            var viewsFeature = new T();
-            applicationManager.PopulateFeature(viewsFeature);
-            return viewsFeature;
-        }
+    private static T GetViewFeature<T>(ApplicationPartManager applicationManager) where T : ViewsFeature, new()
+    {
+        var viewsFeature = new T();
+        applicationManager.PopulateFeature(viewsFeature);
+        return viewsFeature;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/AdminThemeSelector.cs b/src/OrchardCore.Modules/OrchardCore.Admin/AdminThemeSelector.cs
index a5c3659139b..ade57f59e8b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Admin/AdminThemeSelector.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Admin/AdminThemeSelector.cs
@@ -2,45 +2,44 @@
 using Microsoft.AspNetCore.Http;
 using OrchardCore.DisplayManagement.Theming;
 
-namespace OrchardCore.Admin
+namespace OrchardCore.Admin;
+
+/// <summary>
+/// Provides the theme defined in the site configuration for the current scope (request).
+/// The same <see cref="ThemeSelectorResult"/> is returned if called multiple times
+/// during the same scope.
+/// </summary>
+public class AdminThemeSelector : IThemeSelector
 {
-    /// <summary>
-    /// Provides the theme defined in the site configuration for the current scope (request).
-    /// The same <see cref="ThemeSelectorResult"/> is returned if called multiple times
-    /// during the same scope.
-    /// </summary>
-    public class AdminThemeSelector : IThemeSelector
-    {
-        private readonly IAdminThemeService _adminThemeService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAdminThemeService _adminThemeService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public AdminThemeSelector(
-            IAdminThemeService adminThemeService,
-            IHttpContextAccessor httpContextAccessor
-            )
-        {
-            _adminThemeService = adminThemeService;
-            _httpContextAccessor = httpContextAccessor;
-        }
+    public AdminThemeSelector(
+        IAdminThemeService adminThemeService,
+        IHttpContextAccessor httpContextAccessor
+        )
+    {
+        _adminThemeService = adminThemeService;
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        public async Task<ThemeSelectorResult> GetThemeAsync()
+    public async Task<ThemeSelectorResult> GetThemeAsync()
+    {
+        if (AdminAttribute.IsApplied(_httpContextAccessor.HttpContext))
         {
-            if (AdminAttribute.IsApplied(_httpContextAccessor.HttpContext))
+            var adminThemeName = await _adminThemeService.GetAdminThemeNameAsync();
+            if (string.IsNullOrEmpty(adminThemeName))
             {
-                var adminThemeName = await _adminThemeService.GetAdminThemeNameAsync();
-                if (string.IsNullOrEmpty(adminThemeName))
-                {
-                    return null;
-                }
-
-                return new ThemeSelectorResult
-                {
-                    Priority = 100,
-                    ThemeName = adminThemeName
-                };
+                return null;
             }
 
-            return null;
+            return new ThemeSelectorResult
+            {
+                Priority = 100,
+                ThemeName = adminThemeName
+            };
         }
+
+        return null;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/AdminThemeService.cs b/src/OrchardCore.Modules/OrchardCore.Admin/AdminThemeService.cs
index 08a0f538e8e..8d3e75d1fd8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Admin/AdminThemeService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Admin/AdminThemeService.cs
@@ -2,43 +2,42 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Admin
+namespace OrchardCore.Admin;
+
+public class AdminThemeService : IAdminThemeService
 {
-    public class AdminThemeService : IAdminThemeService
+    private readonly ISiteService _siteService;
+    private readonly IExtensionManager _extensionManager;
+
+    public AdminThemeService(
+        ISiteService siteService,
+        IExtensionManager extensionManager)
     {
-        private readonly ISiteService _siteService;
-        private readonly IExtensionManager _extensionManager;
+        _siteService = siteService;
+        _extensionManager = extensionManager;
+    }
 
-        public AdminThemeService(
-            ISiteService siteService,
-            IExtensionManager extensionManager)
+    public async Task<IExtensionInfo> GetAdminThemeAsync()
+    {
+        var currentThemeName = await GetAdminThemeNameAsync();
+        if (string.IsNullOrEmpty(currentThemeName))
         {
-            _siteService = siteService;
-            _extensionManager = extensionManager;
+            return null;
         }
 
-        public async Task<IExtensionInfo> GetAdminThemeAsync()
-        {
-            var currentThemeName = await GetAdminThemeNameAsync();
-            if (string.IsNullOrEmpty(currentThemeName))
-            {
-                return null;
-            }
-
-            return _extensionManager.GetExtension(currentThemeName);
-        }
+        return _extensionManager.GetExtension(currentThemeName);
+    }
 
-        public async Task SetAdminThemeAsync(string themeName)
-        {
-            var site = await _siteService.LoadSiteSettingsAsync();
-            site.Properties["CurrentAdminThemeName"] = themeName;
-            await _siteService.UpdateSiteSettingsAsync(site);
-        }
+    public async Task SetAdminThemeAsync(string themeName)
+    {
+        var site = await _siteService.LoadSiteSettingsAsync();
+        site.Properties["CurrentAdminThemeName"] = themeName;
+        await _siteService.UpdateSiteSettingsAsync(site);
+    }
 
-        public async Task<string> GetAdminThemeNameAsync()
-        {
-            var site = await _siteService.GetSiteSettingsAsync();
-            return (string)site.Properties["CurrentAdminThemeName"];
-        }
+    public async Task<string> GetAdminThemeNameAsync()
+    {
+        var site = await _siteService.GetSiteSettingsAsync();
+        return (string)site.Properties["CurrentAdminThemeName"];
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/AdminZoneFilter.cs b/src/OrchardCore.Modules/OrchardCore.Admin/AdminZoneFilter.cs
index 63abff0170b..d40a4575467 100644
--- a/src/OrchardCore.Modules/OrchardCore.Admin/AdminZoneFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Admin/AdminZoneFilter.cs
@@ -3,32 +3,31 @@
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace OrchardCore.Admin
+namespace OrchardCore.Admin;
+
+/// <summary>
+/// This filter makes an controller that starts with Admin and Razor Pages in /Pages/Admin folder behave as
+/// it had the <see cref="AdminAttribute"/>.
+/// </summary>
+public sealed class AdminZoneFilter : IAsyncResourceFilter
 {
-    /// <summary>
-    /// This filter makes an controller that starts with Admin and Razor Pages in /Pages/Admin folder behave as
-    /// it had the <see cref="AdminAttribute"/>.
-    /// </summary>
-    public sealed class AdminZoneFilter : IAsyncResourceFilter
+    public Task OnResourceExecutionAsync(ResourceExecutingContext context, ResourceExecutionDelegate next)
     {
-        public Task OnResourceExecutionAsync(ResourceExecutingContext context, ResourceExecutionDelegate next)
+        if (context.ActionDescriptor is ControllerActionDescriptor action)
         {
-            if (context.ActionDescriptor is ControllerActionDescriptor action)
+            if (action.ControllerName == "Admin")
             {
-                if (action.ControllerName == "Admin")
-                {
-                    AdminAttribute.Apply(context.HttpContext);
-                }
+                AdminAttribute.Apply(context.HttpContext);
             }
-            else if (context.ActionDescriptor is PageActionDescriptor page)
+        }
+        else if (context.ActionDescriptor is PageActionDescriptor page)
+        {
+            if (page.ViewEnginePath.Contains("/Admin/"))
             {
-                if (page.ViewEnginePath.Contains("/Admin/"))
-                {
-                    AdminAttribute.Apply(context.HttpContext);
-                }
+                AdminAttribute.Apply(context.HttpContext);
             }
-
-            return next();
         }
+
+        return next();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Admin/Controllers/AdminController.cs
index 0d020a8dc5b..95687dd2bdd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Admin/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Admin/Controllers/AdminController.cs
@@ -1,14 +1,13 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace OrchardCore.Admin.Controllers
+namespace OrchardCore.Admin.Controllers;
+
+[Authorize]
+public class AdminController : Controller
 {
-    [Authorize]
-    public class AdminController : Controller
+    public IActionResult Index()
     {
-        public IActionResult Index()
-        {
-            return View();
-        }
+        return View();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Drivers/AdminSiteSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Admin/Drivers/AdminSiteSettingsDisplayDriver.cs
index 73b9ff6e8e1..ef8fb39f354 100644
--- a/src/OrchardCore.Modules/OrchardCore.Admin/Drivers/AdminSiteSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Admin/Drivers/AdminSiteSettingsDisplayDriver.cs
@@ -9,64 +9,63 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Admin.Drivers
+namespace OrchardCore.Admin.Drivers;
+
+public sealed class AdminSiteSettingsDisplayDriver : SiteDisplayDriver<AdminSettings>
 {
-    public sealed class AdminSiteSettingsDisplayDriver : SiteDisplayDriver<AdminSettings>
+    public const string GroupId = "admin";
+
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+
+    public AdminSiteSettingsDisplayDriver(
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService)
     {
-        public const string GroupId = "admin";
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
 
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+    protected override string SettingsGroupId
+        => GroupId;
 
-        public AdminSiteSettingsDisplayDriver(
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService)
+    public override async Task<IDisplayResult> EditAsync(ISite site, AdminSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+
+        if (!await _authorizationService.AuthorizeAsync(user, PermissionsAdminSettings.ManageAdminSettings))
         {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
+            return null;
         }
 
-        protected override string SettingsGroupId
-            => GroupId;
-
-        public override async Task<IDisplayResult> EditAsync(ISite site, AdminSettings settings, BuildEditorContext context)
+        return Initialize<AdminSettingsViewModel>("AdminSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, PermissionsAdminSettings.ManageAdminSettings))
-            {
-                return null;
-            }
+            model.DisplayThemeToggler = settings.DisplayThemeToggler;
+            model.DisplayMenuFilter = settings.DisplayMenuFilter;
+            model.DisplayNewMenu = settings.DisplayNewMenu;
+            model.DisplayTitlesInTopbar = settings.DisplayTitlesInTopbar;
+        }).Location("Content:3")
+        .OnGroup(SettingsGroupId);
+    }
 
-            return Initialize<AdminSettingsViewModel>("AdminSettings_Edit", model =>
-            {
-                model.DisplayThemeToggler = settings.DisplayThemeToggler;
-                model.DisplayMenuFilter = settings.DisplayMenuFilter;
-                model.DisplayNewMenu = settings.DisplayNewMenu;
-                model.DisplayTitlesInTopbar = settings.DisplayTitlesInTopbar;
-            }).Location("Content:3")
-            .OnGroup(SettingsGroupId);
-        }
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, AdminSettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, AdminSettings settings, UpdateEditorContext context)
+        if (!await _authorizationService.AuthorizeAsync(user, PermissionsAdminSettings.ManageAdminSettings))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, PermissionsAdminSettings.ManageAdminSettings))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var model = new AdminSettingsViewModel();
+        var model = new AdminSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            settings.DisplayThemeToggler = model.DisplayThemeToggler;
-            settings.DisplayMenuFilter = model.DisplayMenuFilter;
-            settings.DisplayNewMenu = model.DisplayNewMenu;
-            settings.DisplayTitlesInTopbar = model.DisplayTitlesInTopbar;
+        settings.DisplayThemeToggler = model.DisplayThemeToggler;
+        settings.DisplayMenuFilter = model.DisplayMenuFilter;
+        settings.DisplayNewMenu = model.DisplayNewMenu;
+        settings.DisplayTitlesInTopbar = model.DisplayTitlesInTopbar;
 
-            return await EditAsync(site, settings, context);
-        }
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs
index d52f4a06e78..821441a2107 100644
--- a/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs
@@ -26,102 +26,101 @@
 using OrchardCore.Settings;
 using OrchardCore.Settings.Deployment;
 
-namespace OrchardCore.Admin
+namespace OrchardCore.Admin;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    private readonly AdminOptions _adminOptions;
+    private readonly IShellConfiguration _configuration;
+
+    public Startup(IOptions<AdminOptions> adminOptions, IShellConfiguration configuration)
     {
-        private readonly AdminOptions _adminOptions;
-        private readonly IShellConfiguration _configuration;
+        _adminOptions = adminOptions.Value;
+        _configuration = configuration;
+    }
 
-        public Startup(IOptions<AdminOptions> adminOptions, IShellConfiguration configuration)
-        {
-            _adminOptions = adminOptions.Value;
-            _configuration = configuration;
-        }
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddNavigation();
 
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<MvcOptions>((options) =>
         {
-            services.AddNavigation();
+            options.Filters.Add<AdminFilter>();
+            options.Filters.Add<AdminMenuFilter>();
 
-            services.Configure<MvcOptions>((options) =>
-            {
-                options.Filters.Add<AdminFilter>();
-                options.Filters.Add<AdminMenuFilter>();
-
-                // Ordered to be called before any global filter.
-                options.Filters.Add<AdminZoneFilter>(-1000);
-            });
-
-            services.AddTransient<IAreaControllerRouteMapper, AdminAreaControllerRouteMapper>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<IThemeSelector, AdminThemeSelector>();
-            services.AddScoped<IAdminThemeService, AdminThemeService>();
-            services.AddScoped<IDisplayDriver<ISite>, AdminSiteSettingsDisplayDriver>();
-            services.AddScoped<IPermissionProvider, PermissionsAdminSettings>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddSingleton<IPageRouteModelProvider, AdminPageRouteModelProvider>();
-            services.AddScoped<IDisplayDriver<Navbar>, VisitSiteNavbarDisplayDriver>();
-
-            services.Configure<AdminOptions>(_configuration.GetSection("OrchardCore_Admin"));
-        }
-
-        public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            routes.MapAreaControllerRoute(
-                name: "Admin",
-                areaName: "OrchardCore.Admin",
-                pattern: _adminOptions.AdminUrlPrefix,
-                defaults: new { controller = typeof(AdminController).ControllerName(), action = nameof(AdminController.Index) }
-            );
-        }
+            // Ordered to be called before any global filter.
+            options.Filters.Add<AdminZoneFilter>(-1000);
+        });
+
+        services.AddTransient<IAreaControllerRouteMapper, AdminAreaControllerRouteMapper>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<IThemeSelector, AdminThemeSelector>();
+        services.AddScoped<IAdminThemeService, AdminThemeService>();
+        services.AddScoped<IDisplayDriver<ISite>, AdminSiteSettingsDisplayDriver>();
+        services.AddScoped<IPermissionProvider, PermissionsAdminSettings>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddSingleton<IPageRouteModelProvider, AdminPageRouteModelProvider>();
+        services.AddScoped<IDisplayDriver<Navbar>, VisitSiteNavbarDisplayDriver>();
+
+        services.Configure<AdminOptions>(_configuration.GetSection("OrchardCore_Admin"));
     }
 
-    public sealed class AdminPagesStartup : StartupBase
+    public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
     {
-        public override int Order
-            => OrchardCoreConstants.ConfigureOrder.AdminPages;
+        routes.MapAreaControllerRoute(
+            name: "Admin",
+            areaName: "OrchardCore.Admin",
+            pattern: _adminOptions.AdminUrlPrefix,
+            defaults: new { controller = typeof(AdminController).ControllerName(), action = nameof(AdminController.Index) }
+        );
+    }
+}
+
+public sealed class AdminPagesStartup : StartupBase
+{
+    public override int Order
+        => OrchardCoreConstants.ConfigureOrder.AdminPages;
 
-        public override void ConfigureServices(IServiceCollection services)
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.Configure<RazorPagesOptions>((options) =>
         {
-            services.Configure<RazorPagesOptions>((options) =>
-            {
-                var adminOptions = ShellScope.Services.GetRequiredService<IOptions<AdminOptions>>().Value;
-                options.Conventions.Add(new AdminPageRouteModelConvention(adminOptions.AdminUrlPrefix));
-            });
-        }
+            var adminOptions = ShellScope.Services.GetRequiredService<IOptions<AdminOptions>>().Value;
+            options.Conventions.Add(new AdminPageRouteModelConvention(adminOptions.AdminUrlPrefix));
+        });
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class DeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class DeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
-        }
+        services.AddSiteSettingsPropertyDeploymentStep<AdminSettings, DeploymentStartup>(S => S["Admin settings"], S => S["Exports the admin settings."]);
     }
+}
 
-    [RequireFeatures("OrchardCore.Liquid")]
-    public sealed class LiquidStartup : StartupBase
+[RequireFeatures("OrchardCore.Liquid")]
+public sealed class LiquidStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
+            o.Scope.SetValue(nameof(Navbar), new FunctionValue(async (args, ctx) =>
             {
-                o.Scope.SetValue(nameof(Navbar), new FunctionValue(async (args, ctx) =>
+                if (ctx is LiquidTemplateContext context)
                 {
-                    if (ctx is LiquidTemplateContext context)
-                    {
-                        var displayManager = context.Services.GetRequiredService<IDisplayManager<Navbar>>();
-                        var updateModelAccessor = context.Services.GetRequiredService<IUpdateModelAccessor>();
+                    var displayManager = context.Services.GetRequiredService<IDisplayManager<Navbar>>();
+                    var updateModelAccessor = context.Services.GetRequiredService<IUpdateModelAccessor>();
 
-                        var shape = await displayManager.BuildDisplayAsync(updateModelAccessor.ModelUpdater);
+                    var shape = await displayManager.BuildDisplayAsync(updateModelAccessor.ModelUpdater);
 
-                        return FluidValue.Create(shape, ctx.Options);
-                    }
+                    return FluidValue.Create(shape, ctx.Options);
+                }
 
-                    return NilValue.Instance;
-                }));
-            });
-        }
+                return NilValue.Instance;
+            }));
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/ViewModels/AdminSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Admin/ViewModels/AdminSettingsViewModel.cs
index f0149d2b2f5..d94df30eaaf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Admin/ViewModels/AdminSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Admin/ViewModels/AdminSettingsViewModel.cs
@@ -1,13 +1,12 @@
-namespace OrchardCore.Admin.ViewModels
+namespace OrchardCore.Admin.ViewModels;
+
+public class AdminSettingsViewModel
 {
-    public class AdminSettingsViewModel
-    {
-        public bool DisplayThemeToggler { get; set; }
+    public bool DisplayThemeToggler { get; set; }
 
-        public bool DisplayMenuFilter { get; set; }
+    public bool DisplayMenuFilter { get; set; }
 
-        public bool DisplayNewMenu { get; set; }
+    public bool DisplayNewMenu { get; set; }
 
-        public bool DisplayTitlesInTopbar { get; set; }
-    }
+    public bool DisplayTitlesInTopbar { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Controllers/DashboardController.cs b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Controllers/DashboardController.cs
index 6fc1b3d8ee1..31d0ea22f2f 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Controllers/DashboardController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Controllers/DashboardController.cs
@@ -16,196 +16,195 @@
 using OrchardCore.Contents;
 using OrchardCore.DisplayManagement.ModelBinding;
 
-namespace OrchardCore.AdminDashboard.Controllers
+namespace OrchardCore.AdminDashboard.Controllers;
+
+[Admin]
+public class DashboardController : Controller
 {
-    [Admin]
-    public class DashboardController : Controller
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IAdminDashboardService _adminDashboardService;
+    private readonly IContentManager _contentManager;
+    private readonly IContentItemDisplayManager _contentItemDisplayManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly YesSql.ISession _session;
+
+    public DashboardController(
+        IAuthorizationService authorizationService,
+        IAdminDashboardService adminDashboardService,
+        IContentManager contentManager,
+        IContentItemDisplayManager contentItemDisplayManager,
+        IContentDefinitionManager contentDefinitionManager,
+        IUpdateModelAccessor updateModelAccessor,
+        YesSql.ISession session)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IAdminDashboardService _adminDashboardService;
-        private readonly IContentManager _contentManager;
-        private readonly IContentItemDisplayManager _contentItemDisplayManager;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly YesSql.ISession _session;
-
-        public DashboardController(
-            IAuthorizationService authorizationService,
-            IAdminDashboardService adminDashboardService,
-            IContentManager contentManager,
-            IContentItemDisplayManager contentItemDisplayManager,
-            IContentDefinitionManager contentDefinitionManager,
-            IUpdateModelAccessor updateModelAccessor,
-            YesSql.ISession session)
+        _authorizationService = authorizationService;
+        _adminDashboardService = adminDashboardService;
+        _contentManager = contentManager;
+        _contentItemDisplayManager = contentItemDisplayManager;
+        _contentDefinitionManager = contentDefinitionManager;
+        _updateModelAccessor = updateModelAccessor;
+        _session = session;
+    }
+
+    public async Task<IActionResult> Index()
+    {
+        var model = new AdminDashboardViewModel()
         {
-            _authorizationService = authorizationService;
-            _adminDashboardService = adminDashboardService;
-            _contentManager = contentManager;
-            _contentItemDisplayManager = contentItemDisplayManager;
-            _contentDefinitionManager = contentDefinitionManager;
-            _updateModelAccessor = updateModelAccessor;
-            _session = session;
-        }
+            CanManageDashboard = await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminDashboard),
+        };
 
-        public async Task<IActionResult> Index()
+        if (model.CanManageDashboard || await _authorizationService.AuthorizeAsync(User, Permissions.AccessAdminDashboard))
         {
-            var model = new AdminDashboardViewModel()
-            {
-                CanManageDashboard = await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminDashboard),
-            };
+            var wrappers = new List<DashboardWrapper>();
+            var widgetContentTypes = await GetDashboardWidgetsAsync();
 
-            if (model.CanManageDashboard || await _authorizationService.AuthorizeAsync(User, Permissions.AccessAdminDashboard))
+            var widgets = await _adminDashboardService.GetWidgetsAsync(x => x.Published);
+            foreach (var widget in widgets)
             {
-                var wrappers = new List<DashboardWrapper>();
-                var widgetContentTypes = await GetDashboardWidgetsAsync();
+                if (!widgetContentTypes.ContainsKey(widget.ContentType))
+                {
+                    continue;
+                }
 
-                var widgets = await _adminDashboardService.GetWidgetsAsync(x => x.Published);
-                foreach (var widget in widgets)
+                if (!model.CanManageDashboard && !await _authorizationService.AuthorizeAsync(User, CommonPermissions.ViewContent, widget))
                 {
-                    if (!widgetContentTypes.ContainsKey(widget.ContentType))
-                    {
-                        continue;
-                    }
-
-                    if (!model.CanManageDashboard && !await _authorizationService.AuthorizeAsync(User, CommonPermissions.ViewContent, widget))
-                    {
-                        continue;
-                    }
-
-                    wrappers.Add(new DashboardWrapper
-                    {
-                        Dashboard = widget,
-                        Content = await _contentItemDisplayManager.BuildDisplayAsync(widget, _updateModelAccessor.ModelUpdater, "DetailAdmin")
-                    });
+                    continue;
                 }
 
-                model.Dashboards = wrappers.ToArray();
+                wrappers.Add(new DashboardWrapper
+                {
+                    Dashboard = widget,
+                    Content = await _contentItemDisplayManager.BuildDisplayAsync(widget, _updateModelAccessor.ModelUpdater, "DetailAdmin")
+                });
             }
 
-            return View(model);
+            model.Dashboards = wrappers.ToArray();
         }
 
-        [Admin("dashboard/manage", "AdminDashboard")]
-        public async Task<IActionResult> Manage()
+        return View(model);
+    }
+
+    [Admin("dashboard/manage", "AdminDashboard")]
+    public async Task<IActionResult> Manage()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminDashboard))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminDashboard))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            // Set Manage Dashboard Feature.
-            Request.HttpContext.Features.Set(new DashboardFeature()
-            {
-                IsManageRequest = true
-            });
+        // Set Manage Dashboard Feature.
+        Request.HttpContext.Features.Set(new DashboardFeature()
+        {
+            IsManageRequest = true
+        });
 
-            var dashboardCreatable = new List<SelectListItem>();
-            var widgetContentTypes = await GetDashboardWidgetsAsync();
+        var dashboardCreatable = new List<SelectListItem>();
+        var widgetContentTypes = await GetDashboardWidgetsAsync();
 
-            var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
+        var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
 
-            foreach (var ctd in widgetContentTypes.Values.OrderBy(x => x.DisplayName))
+        foreach (var ctd in widgetContentTypes.Values.OrderBy(x => x.DisplayName))
+        {
+            if (!await _authorizationService.AuthorizeContentTypeAsync(User, CommonPermissions.EditContent, ctd.Name, userId))
             {
-                if (!await _authorizationService.AuthorizeContentTypeAsync(User, CommonPermissions.EditContent, ctd.Name, userId))
-                {
-                    continue;
-                }
-
-                dashboardCreatable.Add(new SelectListItem(ctd.DisplayName, ctd.Name));
+                continue;
             }
 
-            var widgets = await _adminDashboardService.GetWidgetsAsync(x => x.Latest);
-            var wrappers = new List<DashboardWrapper>();
-            foreach (var widget in widgets)
-            {
-                if (!widgetContentTypes.ContainsKey(widget.ContentType)
-                    || !await _authorizationService.AuthorizeContentTypeAsync(User, CommonPermissions.EditContent, widget.ContentType, userId))
-                {
-                    continue;
-                }
-
-                var wrapper = new DashboardWrapper
-                {
-                    Dashboard = widget,
-                    Content = await _contentItemDisplayManager.BuildDisplayAsync(widget, _updateModelAccessor.ModelUpdater, "DetailAdmin")
-                };
+            dashboardCreatable.Add(new SelectListItem(ctd.DisplayName, ctd.Name));
+        }
 
-                wrappers.Add(wrapper);
+        var widgets = await _adminDashboardService.GetWidgetsAsync(x => x.Latest);
+        var wrappers = new List<DashboardWrapper>();
+        foreach (var widget in widgets)
+        {
+            if (!widgetContentTypes.ContainsKey(widget.ContentType)
+                || !await _authorizationService.AuthorizeContentTypeAsync(User, CommonPermissions.EditContent, widget.ContentType, userId))
+            {
+                continue;
             }
 
-            var model = new AdminDashboardViewModel
+            var wrapper = new DashboardWrapper
             {
-                Dashboards = wrappers.ToArray(),
-                Creatable = dashboardCreatable
+                Dashboard = widget,
+                Content = await _contentItemDisplayManager.BuildDisplayAsync(widget, _updateModelAccessor.ModelUpdater, "DetailAdmin")
             };
 
-            return View(model);
+            wrappers.Add(wrapper);
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Update([FromForm] DashboardPartViewModel[] parts)
+        var model = new AdminDashboardViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminDashboard))
-            {
-                return Unauthorized();
-            }
+            Dashboards = wrappers.ToArray(),
+            Creatable = dashboardCreatable
+        };
 
-            var contentItemIds = parts.Select(i => i.ContentItemId).ToArray();
+        return View(model);
+    }
 
-            // Load the latest version first if any.
-            var latestItems = await _contentManager.GetAsync(contentItemIds, VersionOptions.Latest);
+    [HttpPost]
+    public async Task<IActionResult> Update([FromForm] DashboardPartViewModel[] parts)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminDashboard))
+        {
+            return Unauthorized();
+        }
 
-            if (latestItems == null)
-            {
-                return NotFound();
-            }
+        var contentItemIds = parts.Select(i => i.ContentItemId).ToArray();
+
+        // Load the latest version first if any.
+        var latestItems = await _contentManager.GetAsync(contentItemIds, VersionOptions.Latest);
+
+        if (latestItems == null)
+        {
+            return NotFound();
+        }
 
-            var publishedItems = await _contentManager.GetAsync(contentItemIds, VersionOptions.Published);
+        var publishedItems = await _contentManager.GetAsync(contentItemIds, VersionOptions.Published);
 
-            foreach (var contentItem in latestItems)
+        foreach (var contentItem in latestItems)
+        {
+            var dashboardPart = contentItem.As<DashboardPart>();
+            if (dashboardPart == null)
             {
-                var dashboardPart = contentItem.As<DashboardPart>();
-                if (dashboardPart == null)
-                {
-                    return Forbid();
-                }
+                return Forbid();
+            }
 
-                var partViewModel = parts.FirstOrDefault(m => m.ContentItemId == contentItem.ContentItemId);
+            var partViewModel = parts.FirstOrDefault(m => m.ContentItemId == contentItem.ContentItemId);
 
-                dashboardPart.Position = partViewModel?.Position ?? 0;
-                dashboardPart.Width = partViewModel?.Width ?? 1;
-                dashboardPart.Height = partViewModel?.Height ?? 1;
+            dashboardPart.Position = partViewModel?.Position ?? 0;
+            dashboardPart.Width = partViewModel?.Width ?? 1;
+            dashboardPart.Height = partViewModel?.Height ?? 1;
 
-                contentItem.Apply(dashboardPart);
+            contentItem.Apply(dashboardPart);
 
-                await _session.SaveAsync(contentItem);
+            await _session.SaveAsync(contentItem);
 
-                if (contentItem.IsPublished() == false)
+            if (contentItem.IsPublished() == false)
+            {
+                var publishedVersion = publishedItems.FirstOrDefault(p => p.ContentItemId == contentItem.ContentItemId);
+                var publishedMetaData = publishedVersion?.As<DashboardPart>();
+                if (publishedMetaData != null)
                 {
-                    var publishedVersion = publishedItems.FirstOrDefault(p => p.ContentItemId == contentItem.ContentItemId);
-                    var publishedMetaData = publishedVersion?.As<DashboardPart>();
-                    if (publishedMetaData != null)
-                    {
-                        publishedMetaData.Position = partViewModel.Position;
-                        publishedMetaData.Width = partViewModel.Width;
-                        publishedMetaData.Height = partViewModel.Height;
-                        publishedVersion.Apply(publishedMetaData);
-                        await _session.SaveAsync(publishedVersion);
-                    }
+                    publishedMetaData.Position = partViewModel.Position;
+                    publishedMetaData.Width = partViewModel.Width;
+                    publishedMetaData.Height = partViewModel.Height;
+                    publishedVersion.Apply(publishedMetaData);
+                    await _session.SaveAsync(publishedVersion);
                 }
             }
+        }
 
-            if (Request.Headers != null && Request.Headers.XRequestedWith == "XMLHttpRequest")
-            {
-                return Ok();
-            }
-
-            return RedirectToAction(nameof(Manage));
+        if (Request.Headers != null && Request.Headers.XRequestedWith == "XMLHttpRequest")
+        {
+            return Ok();
         }
 
-        private async Task<Dictionary<string, ContentTypeDefinition>> GetDashboardWidgetsAsync()
-            => (await _contentDefinitionManager.ListTypeDefinitionsAsync())
-            .Where(t => t.StereotypeEquals("DashboardWidget"))
-            .ToDictionary(ctd => ctd.Name, ctd => ctd);
+        return RedirectToAction(nameof(Manage));
     }
+
+    private async Task<Dictionary<string, ContentTypeDefinition>> GetDashboardWidgetsAsync()
+        => (await _contentDefinitionManager.ListTypeDefinitionsAsync())
+        .Where(t => t.StereotypeEquals("DashboardWidget"))
+        .ToDictionary(ctd => ctd.Name, ctd => ctd);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/DashboardFeature.cs b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/DashboardFeature.cs
index 7a2c03bec42..02dc15fc564 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/DashboardFeature.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/DashboardFeature.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.AdminDashboard
+namespace OrchardCore.AdminDashboard;
+
+public class DashboardFeature
 {
-    public class DashboardFeature
-    {
-        public bool IsManageRequest { get; set; }
-    }
+    public bool IsManageRequest { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Drivers/DashboardContentDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Drivers/DashboardContentDisplayDriver.cs
index 214069b6a7e..fc4b36422d6 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Drivers/DashboardContentDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Drivers/DashboardContentDisplayDriver.cs
@@ -10,99 +10,98 @@
 using OrchardCore.DisplayManagement.Views;
 
 
-namespace OrchardCore.AdminDashboard.Drivers
+namespace OrchardCore.AdminDashboard.Drivers;
+
+public sealed class DashboardContentDisplayDriver : ContentDisplayDriver
 {
-    public sealed class DashboardContentDisplayDriver : ContentDisplayDriver
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IContentManager _contentManager;
+
+    public DashboardContentDisplayDriver(IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService,
+        IContentManager contentManager)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IContentManager _contentManager;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+        _contentManager = contentManager;
+    }
 
-        public DashboardContentDisplayDriver(IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService,
-            IContentManager contentManager)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-            _contentManager = contentManager;
-        }
+    public override async Task<IDisplayResult> DisplayAsync(ContentItem model, BuildDisplayContext context)
+    {
+        var httpContext = _httpContextAccessor.HttpContext;
+        var dashboardFeature = httpContext.Features.Get<DashboardFeature>();
 
-        public override async Task<IDisplayResult> DisplayAsync(ContentItem model, BuildDisplayContext context)
+        // Return if it's not Manage dashboard request 
+        if (dashboardFeature == null || !dashboardFeature.IsManageRequest)
         {
-            var httpContext = _httpContextAccessor.HttpContext;
-            var dashboardFeature = httpContext.Features.Get<DashboardFeature>();
+            return null;
+        }
 
-            // Return if it's not Manage dashboard request 
-            if (dashboardFeature == null || !dashboardFeature.IsManageRequest)
-            {
-                return null;
-            }
+        var results = new List<IDisplayResult>();
+        var hasPublished = await _contentManager.HasPublishedVersionAsync(model);
+        var hasDraft = model.HasDraft();
+        var hasEditPermission = await _authorizationService.AuthorizeAsync(httpContext.User, CommonPermissions.EditContent, model);
+        var hasDeletePermission = await _authorizationService.AuthorizeAsync(httpContext.User, CommonPermissions.DeleteContent, model);
+        var hasPublishPermission = await _authorizationService.AuthorizeAsync(httpContext.User, CommonPermissions.PublishContent, model);
 
-            var results = new List<IDisplayResult>();
-            var hasPublished = await _contentManager.HasPublishedVersionAsync(model);
-            var hasDraft = model.HasDraft();
-            var hasEditPermission = await _authorizationService.AuthorizeAsync(httpContext.User, CommonPermissions.EditContent, model);
-            var hasDeletePermission = await _authorizationService.AuthorizeAsync(httpContext.User, CommonPermissions.DeleteContent, model);
-            var hasPublishPermission = await _authorizationService.AuthorizeAsync(httpContext.User, CommonPermissions.PublishContent, model);
+        var dragHandle = Initialize<ContentItemViewModel>("Dashboard_DragHandle", m =>
+        {
+            m.ContentItem = model;
+        }).Location("Leading:before");
+        results.Add(dragHandle);
 
-            var dragHandle = Initialize<ContentItemViewModel>("Dashboard_DragHandle", m =>
+        if (hasEditPermission)
+        {
+            var editButton = Initialize<ContentItemViewModel>("Dashboard_EditButton", m =>
             {
                 m.ContentItem = model;
-            }).Location("Leading:before");
-            results.Add(dragHandle);
-
-            if (hasEditPermission)
-            {
-                var editButton = Initialize<ContentItemViewModel>("Dashboard_EditButton", m =>
-                {
-                    m.ContentItem = model;
-                }).Location("ActionsMenu:after");
-                results.Add(editButton);
-            }
-
-            if (hasDeletePermission)
-            {
-                var deleteButton = Initialize<ContentItemViewModel>("Dashboard_DeleteButton", m =>
-                {
-                    m.ContentItem = model;
-                }).Location("ActionsMenu:after");
-                results.Add(deleteButton);
-            }
+            }).Location("ActionsMenu:after");
+            results.Add(editButton);
+        }
 
-            if (hasPublished && hasPublishPermission)
+        if (hasDeletePermission)
+        {
+            var deleteButton = Initialize<ContentItemViewModel>("Dashboard_DeleteButton", m =>
             {
-                var unpublishButton = Initialize<ContentItemViewModel>("Dashboard_UnpublishButton", m =>
-                {
-                    m.ContentItem = model;
-                }).Location("ActionsMenu:after");
-                results.Add(unpublishButton);
-            }
+                m.ContentItem = model;
+            }).Location("ActionsMenu:after");
+            results.Add(deleteButton);
+        }
 
-            if (hasDraft && hasPublishPermission)
+        if (hasPublished && hasPublishPermission)
+        {
+            var unpublishButton = Initialize<ContentItemViewModel>("Dashboard_UnpublishButton", m =>
             {
-                var publishButton = Initialize<ContentItemViewModel>("Dashboard_PublishButton", m =>
-                {
-                    m.ContentItem = model;
-                }).Location("ActionsMenu:after");
-                results.Add(publishButton);
-            }
+                m.ContentItem = model;
+            }).Location("ActionsMenu:after");
+            results.Add(unpublishButton);
+        }
 
-            if (hasDraft && hasEditPermission)
+        if (hasDraft && hasPublishPermission)
+        {
+            var publishButton = Initialize<ContentItemViewModel>("Dashboard_PublishButton", m =>
             {
-                var discardDraftButton = Initialize<ContentItemViewModel>("Dashboard_DiscardDraftButton", m =>
-                {
-                    m.ContentItem = model;
-                }).Location("ActionsMenu:after");
-                results.Add(discardDraftButton);
-            }
+                m.ContentItem = model;
+            }).Location("ActionsMenu:after");
+            results.Add(publishButton);
+        }
 
-            var shapeTag = Initialize<ContentItemViewModel>("DashboardWidget_DetailAdmin__ContentsTags", m =>
+        if (hasDraft && hasEditPermission)
+        {
+            var discardDraftButton = Initialize<ContentItemViewModel>("Dashboard_DiscardDraftButton", m =>
             {
                 m.ContentItem = model;
-            }).Location("DetailAdmin", "Tags:10");
-            results.Add(shapeTag);
-
-            return Combine(results.ToArray());
+            }).Location("ActionsMenu:after");
+            results.Add(discardDraftButton);
         }
+
+        var shapeTag = Initialize<ContentItemViewModel>("DashboardWidget_DetailAdmin__ContentsTags", m =>
+        {
+            m.ContentItem = model;
+        }).Location("DetailAdmin", "Tags:10");
+        results.Add(shapeTag);
+
+        return Combine(results.ToArray());
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Drivers/DashboardPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Drivers/DashboardPartDisplayDriver.cs
index 2d502ed7903..f105cb79fbd 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Drivers/DashboardPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Drivers/DashboardPartDisplayDriver.cs
@@ -6,37 +6,36 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.AdminDashboard.Drivers
+namespace OrchardCore.AdminDashboard.Drivers;
+
+public sealed class DashboardPartDisplayDriver : ContentPartDisplayDriver<DashboardPart>
 {
-    public sealed class DashboardPartDisplayDriver : ContentPartDisplayDriver<DashboardPart>
+    public override Task<IDisplayResult> DisplayAsync(DashboardPart part, BuildPartDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(DashboardPart part, BuildPartDisplayContext context)
-        {
-            return Task.FromResult<IDisplayResult>(null);
-        }
+        return Task.FromResult<IDisplayResult>(null);
+    }
 
-        public override IDisplayResult Edit(DashboardPart dashboardPart, BuildPartEditorContext context)
-        {
-            return Initialize<DashboardPartViewModel>(GetEditorShapeType(context), m => BuildViewModel(m, dashboardPart));
-        }
+    public override IDisplayResult Edit(DashboardPart dashboardPart, BuildPartEditorContext context)
+    {
+        return Initialize<DashboardPartViewModel>(GetEditorShapeType(context), m => BuildViewModel(m, dashboardPart));
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(DashboardPart model, UpdatePartEditorContext context)
-        {
-            await context.Updater.TryUpdateModelAsync(model, Prefix,
-                t => t.Position,
-                t => t.Width,
-                t => t.Height);
+    public override async Task<IDisplayResult> UpdateAsync(DashboardPart model, UpdatePartEditorContext context)
+    {
+        await context.Updater.TryUpdateModelAsync(model, Prefix,
+            t => t.Position,
+            t => t.Width,
+            t => t.Height);
 
-            return Edit(model, context);
-        }
+        return Edit(model, context);
+    }
 
-        private static void BuildViewModel(DashboardPartViewModel model, DashboardPart part)
-        {
-            model.Position = part.Position;
-            model.Width = part.Width;
-            model.Height = part.Height;
-            model.DashboardPart = part;
-            model.ContentItem = part.ContentItem;
-        }
+    private static void BuildViewModel(DashboardPartViewModel model, DashboardPart part)
+    {
+        model.Position = part.Position;
+        model.Width = part.Width;
+        model.Height = part.Height;
+        model.DashboardPart = part;
+        model.ContentItem = part.ContentItem;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Indexes/DashboardPartIndex.cs b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Indexes/DashboardPartIndex.cs
index 4e70965687d..40927b0bc46 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Indexes/DashboardPartIndex.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Indexes/DashboardPartIndex.cs
@@ -2,38 +2,37 @@
 using OrchardCore.ContentManagement;
 using YesSql.Indexes;
 
-namespace OrchardCore.AdminDashboard.Indexes
+namespace OrchardCore.AdminDashboard.Indexes;
+
+public class DashboardPartIndex : MapIndex
 {
-    public class DashboardPartIndex : MapIndex
-    {
-        public double Position { get; set; }
-    }
+    public double Position { get; set; }
+}
 
-    public class DashboardPartIndexProvider : IndexProvider<ContentItem>
+public class DashboardPartIndexProvider : IndexProvider<ContentItem>
+{
+    public override void Describe(DescribeContext<ContentItem> context)
     {
-        public override void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<DashboardPartIndex>()
-                .Map(contentItem =>
-                {
-                    var dashboardPart = contentItem.As<DashboardPart>();
+        context.For<DashboardPartIndex>()
+            .Map(contentItem =>
+            {
+                var dashboardPart = contentItem.As<DashboardPart>();
 
-                    // Store only published and latest versions
-                    if (!contentItem.Published && !contentItem.Latest)
-                    {
-                        return null;
-                    }
+                // Store only published and latest versions
+                if (!contentItem.Published && !contentItem.Latest)
+                {
+                    return null;
+                }
 
-                    if (dashboardPart != null)
+                if (dashboardPart != null)
+                {
+                    return new DashboardPartIndex
                     {
-                        return new DashboardPartIndex
-                        {
-                            Position = dashboardPart.Position,
-                        };
-                    }
+                        Position = dashboardPart.Position,
+                    };
+                }
 
-                    return null;
-                });
-        }
+                return null;
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Migrations.cs
index e31897c300a..a7664223ea8 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Migrations.cs
@@ -7,61 +7,60 @@
 using OrchardCore.Recipes.Services;
 using YesSql.Sql;
 
-namespace OrchardCore.AdminDashboard
+namespace OrchardCore.AdminDashboard;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IRecipeMigrator _recipeMigrator;
+
+    public Migrations(
+        IContentDefinitionManager contentDefinitionManager,
+        IRecipeMigrator recipeMigrator)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IRecipeMigrator _recipeMigrator;
+        _contentDefinitionManager = contentDefinitionManager;
+        _recipeMigrator = recipeMigrator;
+    }
 
-        public Migrations(
-            IContentDefinitionManager contentDefinitionManager,
-            IRecipeMigrator recipeMigrator)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _recipeMigrator = recipeMigrator;
-        }
+    public async Task<int> CreateAsync()
+    {
+        await SchemaBuilder.CreateMapIndexTableAsync<DashboardPartIndex>(table => table
+           .Column<double>("Position")
+        );
 
-        public async Task<int> CreateAsync()
-        {
-            await SchemaBuilder.CreateMapIndexTableAsync<DashboardPartIndex>(table => table
-               .Column<double>("Position")
-            );
+        await SchemaBuilder.AlterIndexTableAsync<DashboardPartIndex>(table => table
+            .CreateIndex("IDX_DashboardPart_DocumentId",
+                "DocumentId",
+                "Position")
+        );
 
-            await SchemaBuilder.AlterIndexTableAsync<DashboardPartIndex>(table => table
-                .CreateIndex("IDX_DashboardPart_DocumentId",
-                    "DocumentId",
-                    "Position")
+        await _contentDefinitionManager.AlterPartDefinitionAsync("DashboardPart", builder => builder
+            .Attachable()
+            .WithDescription("Provides a way to add widgets to a dashboard.")
             );
 
-            await _contentDefinitionManager.AlterPartDefinitionAsync("DashboardPart", builder => builder
-                .Attachable()
-                .WithDescription("Provides a way to add widgets to a dashboard.")
-                );
-
-            await _recipeMigrator.ExecuteAsync($"dashboard-widgets{RecipesConstants.RecipeExtension}", this);
+        await _recipeMigrator.ExecuteAsync($"dashboard-widgets{RecipesConstants.RecipeExtension}", this);
 
-            // Shortcut other migration steps on new content definition schemas.
-            return 3;
-        }
+        // Shortcut other migration steps on new content definition schemas.
+        return 3;
+    }
 
-        public async Task<int> UpdateFrom1Async()
-        {
-            await _recipeMigrator.ExecuteAsync($"dashboard-widgets{RecipesConstants.RecipeExtension}", this);
+    public async Task<int> UpdateFrom1Async()
+    {
+        await _recipeMigrator.ExecuteAsync($"dashboard-widgets{RecipesConstants.RecipeExtension}", this);
 
-            return 2;
-        }
+        return 2;
+    }
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom2Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<DashboardPartIndex>(table => table
-                .CreateIndex("IDX_DashboardPart_DocumentId",
-                    "DocumentId",
-                    "Position")
-            );
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom2Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<DashboardPartIndex>(table => table
+            .CreateIndex("IDX_DashboardPart_DocumentId",
+                "DocumentId",
+                "Position")
+        );
 
-            return 3;
-        }
+        return 3;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Models/DashboardPart.cs b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Models/DashboardPart.cs
index 8403922180d..721a5115692 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Models/DashboardPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Models/DashboardPart.cs
@@ -1,11 +1,10 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.AdminDashboard.Models
+namespace OrchardCore.AdminDashboard.Models;
+
+public class DashboardPart : ContentPart
 {
-    public class DashboardPart : ContentPart
-    {
-        public double Position { get; set; }
-        public double Width { get; set; } = 1.0;
-        public double Height { get; set; } = 1.0;
-    }
+    public double Position { get; set; }
+    public double Width { get; set; } = 1.0;
+    public double Height { get; set; } = 1.0;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Services/AdminDashboardService.cs b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Services/AdminDashboardService.cs
index f9d03c02c90..188c55d608a 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Services/AdminDashboardService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Services/AdminDashboardService.cs
@@ -7,26 +7,25 @@
 using OrchardCore.ContentManagement.Records;
 using YesSql;
 
-namespace OrchardCore.AdminDashboard.Services
+namespace OrchardCore.AdminDashboard.Services;
+
+public class AdminDashboardService : IAdminDashboardService
 {
-    public class AdminDashboardService : IAdminDashboardService
-    {
-        private readonly ISession _session;
+    private readonly ISession _session;
 
-        public AdminDashboardService(ISession session)
-        {
-            _session = session;
-        }
+    public AdminDashboardService(ISession session)
+    {
+        _session = session;
+    }
 
-        public async Task<IEnumerable<ContentItem>> GetWidgetsAsync(Expression<Func<ContentItemIndex, bool>> predicate)
-        {
-            var widgets = await _session
-                .Query<ContentItem, DashboardPartIndex>()
-                .OrderBy(w => w.Position)
-                .With(predicate)
-                .ListAsync();
+    public async Task<IEnumerable<ContentItem>> GetWidgetsAsync(Expression<Func<ContentItemIndex, bool>> predicate)
+    {
+        var widgets = await _session
+            .Query<ContentItem, DashboardPartIndex>()
+            .OrderBy(w => w.Position)
+            .With(predicate)
+            .ListAsync();
 
-            return widgets;
-        }
+        return widgets;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Services/IAdminDashboardService.cs b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Services/IAdminDashboardService.cs
index bfac84c58e6..35ec639a5d9 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Services/IAdminDashboardService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Services/IAdminDashboardService.cs
@@ -5,13 +5,12 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Records;
 
-namespace OrchardCore.AdminDashboard.Services
+namespace OrchardCore.AdminDashboard.Services;
+
+/// <summary>
+/// Provides services to manage the Admin Dashboards.
+/// </summary>
+public interface IAdminDashboardService
 {
-    /// <summary>
-    /// Provides services to manage the Admin Dashboards.
-    /// </summary>
-    public interface IAdminDashboardService
-    {
-        Task<IEnumerable<ContentItem>> GetWidgetsAsync(Expression<Func<ContentItemIndex, bool>> predicate);
-    }
+    Task<IEnumerable<ContentItem>> GetWidgetsAsync(Expression<Func<ContentItemIndex, bool>> predicate);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Startup.cs b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Startup.cs
index 1881c834fb2..8073e6c7844 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Startup.cs
@@ -17,45 +17,44 @@
 using OrchardCore.Mvc.Core.Utilities;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.AdminDashboard
-{
-    public sealed class Startup : StartupBase
-    {
-        public override int ConfigureOrder => -10;
+namespace OrchardCore.AdminDashboard;
 
-        private readonly AdminOptions _adminOptions;
+public sealed class Startup : StartupBase
+{
+    public override int ConfigureOrder => -10;
 
-        public Startup(IOptions<AdminOptions> adminOptions)
-        {
-            _adminOptions = adminOptions.Value;
-        }
+    private readonly AdminOptions _adminOptions;
 
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IPermissionProvider, Permissions>();
+    public Startup(IOptions<AdminOptions> adminOptions)
+    {
+        _adminOptions = adminOptions.Value;
+    }
 
-            services.AddScoped<IAdminDashboardService, AdminDashboardService>();
-            services.AddIndexProvider<DashboardPartIndexProvider>();
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddScoped<IPermissionProvider, Permissions>();
 
-            services.AddContentPart<DashboardPart>()
-                .UseDisplayDriver<DashboardPartDisplayDriver>();
+        services.AddScoped<IAdminDashboardService, AdminDashboardService>();
+        services.AddIndexProvider<DashboardPartIndexProvider>();
 
-            services.AddScoped<IContentDisplayDriver, DashboardContentDisplayDriver>();
+        services.AddContentPart<DashboardPart>()
+            .UseDisplayDriver<DashboardPartDisplayDriver>();
 
-            services.AddDataMigration<Migrations>();
-        }
+        services.AddScoped<IContentDisplayDriver, DashboardContentDisplayDriver>();
 
-        public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            // Dashboard
-            var dashboardControllerName = typeof(DashboardController).ControllerName();
+        services.AddDataMigration<Migrations>();
+    }
 
-            routes.MapAreaControllerRoute(
-                name: "AdminDashboard",
-                areaName: "OrchardCore.AdminDashboard",
-                pattern: _adminOptions.AdminUrlPrefix,
-                defaults: new { controller = dashboardControllerName, action = nameof(DashboardController.Index) }
-            );
-        }
+    public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        // Dashboard
+        var dashboardControllerName = typeof(DashboardController).ControllerName();
+
+        routes.MapAreaControllerRoute(
+            name: "AdminDashboard",
+            areaName: "OrchardCore.AdminDashboard",
+            pattern: _adminOptions.AdminUrlPrefix,
+            defaults: new { controller = dashboardControllerName, action = nameof(DashboardController.Index) }
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/ViewModels/AdminDashboardViewModel.cs b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/ViewModels/AdminDashboardViewModel.cs
index 7805a8ec978..9be1b519701 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/ViewModels/AdminDashboardViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/ViewModels/AdminDashboardViewModel.cs
@@ -2,17 +2,16 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.AdminDashboard.ViewModels
+namespace OrchardCore.AdminDashboard.ViewModels;
+
+public class AdminDashboardViewModel
 {
-    public class AdminDashboardViewModel
-    {
-        [BindNever]
-        public bool CanManageDashboard { get; set; }
+    [BindNever]
+    public bool CanManageDashboard { get; set; }
 
-        [BindNever]
-        public DashboardWrapper[] Dashboards { get; set; }
+    [BindNever]
+    public DashboardWrapper[] Dashboards { get; set; }
 
-        [BindNever]
-        public List<SelectListItem> Creatable { get; set; }
-    }
+    [BindNever]
+    public List<SelectListItem> Creatable { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/ViewModels/DashboardPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/ViewModels/DashboardPartViewModel.cs
index 6a11b04c0ff..095394cb00d 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/ViewModels/DashboardPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/ViewModels/DashboardPartViewModel.cs
@@ -2,19 +2,18 @@
 using OrchardCore.AdminDashboard.Models;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.AdminDashboard.ViewModels
+namespace OrchardCore.AdminDashboard.ViewModels;
+
+public class DashboardPartViewModel
 {
-    public class DashboardPartViewModel
-    {
-        public string ContentItemId { get; set; }
-        public double Position { get; set; }
-        public double Width { get; set; }
-        public double Height { get; set; }
+    public string ContentItemId { get; set; }
+    public double Position { get; set; }
+    public double Width { get; set; }
+    public double Height { get; set; }
 
-        [BindNever]
-        public ContentItem ContentItem { get; set; }
+    [BindNever]
+    public ContentItem ContentItem { get; set; }
 
-        [BindNever]
-        public DashboardPart DashboardPart { get; set; }
-    }
+    [BindNever]
+    public DashboardPart DashboardPart { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/ViewModels/DashboardWrapper.cs b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/ViewModels/DashboardWrapper.cs
index cf293deeb7b..f08533c0c64 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/ViewModels/DashboardWrapper.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/ViewModels/DashboardWrapper.cs
@@ -2,16 +2,14 @@
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.AdminDashboard.ViewModels
+namespace OrchardCore.AdminDashboard.ViewModels;
+
+public class DashboardWrapper : ShapeViewModel
 {
-    public class DashboardWrapper : ShapeViewModel
+    public DashboardWrapper() : base("Dashboard_Wrapper")
     {
-        public DashboardWrapper() : base("Dashboard_Wrapper")
-        {
-        }
-
-        public ContentItem Dashboard { get; set; }
-        public IShape Content { get; set; }
     }
 
+    public ContentItem Dashboard { get; set; }
+    public IShape Content { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs
index 01196918b0d..76ad7d16913 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs
@@ -3,40 +3,39 @@
 using OrchardCore.AdminMenu.Services;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.AdminMenu
+namespace OrchardCore.AdminMenu;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
-    {
-        private readonly AdminMenuNavigationProvidersCoordinator _adminMenuNavigationProvider;
+    private readonly AdminMenuNavigationProvidersCoordinator _adminMenuNavigationProvider;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenu(AdminMenuNavigationProvidersCoordinator adminMenuNavigationProvider,
-            IStringLocalizer<AdminMenu> localizer)
-        {
-            _adminMenuNavigationProvider = adminMenuNavigationProvider;
-            S = localizer;
-        }
+    public AdminMenu(AdminMenuNavigationProvidersCoordinator adminMenuNavigationProvider,
+        IStringLocalizer<AdminMenu> localizer)
+    {
+        _adminMenuNavigationProvider = adminMenuNavigationProvider;
+        S = localizer;
+    }
 
-        public async Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public async Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return;
-            }
+            return;
+        }
 
-            // Configuration and settings menus for the AdminMenu module
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["Admin Menus"], S["Admin Menus"].PrefixPosition(), adminMenu => adminMenu
-                        .Permission(Permissions.ManageAdminMenu)
-                        .Action("List", "Menu", "OrchardCore.AdminMenu")
-                        .LocalNav()
-                    )
-                );
+        // Configuration and settings menus for the AdminMenu module
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["Admin Menus"], S["Admin Menus"].PrefixPosition(), adminMenu => adminMenu
+                    .Permission(Permissions.ManageAdminMenu)
+                    .Action("List", "Menu", "OrchardCore.AdminMenu")
+                    .LocalNav()
+                )
+            );
 
-            // This is the entry point for the adminMenu: dynamically generated custom admin menus
-            await _adminMenuNavigationProvider.BuildNavigationAsync(NavigationConstants.AdminMenuId, builder);
-        }
+        // This is the entry point for the adminMenu: dynamically generated custom admin menus
+        await _adminMenuNavigationProvider.BuildNavigationAsync(NavigationConstants.AdminMenuId, builder);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/LinkAdminNode.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/LinkAdminNode.cs
index 6c522d97827..be4788e73bd 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/LinkAdminNode.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/LinkAdminNode.cs
@@ -1,21 +1,20 @@
 using System.ComponentModel.DataAnnotations;
 using OrchardCore.AdminMenu.Models;
 
-namespace OrchardCore.AdminMenu.AdminNodes
+namespace OrchardCore.AdminMenu.AdminNodes;
+
+public class LinkAdminNode : AdminNode
 {
-    public class LinkAdminNode : AdminNode
-    {
-        [Required]
-        public string LinkText { get; set; }
+    [Required]
+    public string LinkText { get; set; }
 
-        [Required]
-        public string LinkUrl { get; set; }
+    [Required]
+    public string LinkUrl { get; set; }
 
-        public string IconClass { get; set; }
+    public string IconClass { get; set; }
 
-        /// <summary>
-        /// The names of the permissions required to view this admin menu node.
-        /// </summary>
-        public string[] PermissionNames { get; set; } = [];
-    }
+    /// <summary>
+    /// The names of the permissions required to view this admin menu node.
+    /// </summary>
+    public string[] PermissionNames { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/LinkAdminNodeDriver.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/LinkAdminNodeDriver.cs
index b0068519ac1..5690f12d5b6 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/LinkAdminNodeDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/LinkAdminNodeDriver.cs
@@ -6,78 +6,77 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.AdminMenu.AdminNodes
+namespace OrchardCore.AdminMenu.AdminNodes;
+
+public sealed class LinkAdminNodeDriver : DisplayDriver<MenuItem, LinkAdminNode>
 {
-    public sealed class LinkAdminNodeDriver : DisplayDriver<MenuItem, LinkAdminNode>
-    {
-        private readonly IAdminMenuPermissionService _adminMenuPermissionService;
+    private readonly IAdminMenuPermissionService _adminMenuPermissionService;
 
-        public LinkAdminNodeDriver(IAdminMenuPermissionService adminMenuPermissionService)
-        {
-            _adminMenuPermissionService = adminMenuPermissionService;
-        }
+    public LinkAdminNodeDriver(IAdminMenuPermissionService adminMenuPermissionService)
+    {
+        _adminMenuPermissionService = adminMenuPermissionService;
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(LinkAdminNode treeNode, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                View("LinkAdminNode_Fields_TreeSummary", treeNode).Location("TreeSummary", "Content"),
-                View("LinkAdminNode_Fields_TreeThumbnail", treeNode).Location("TreeThumbnail", "Content")
-            );
-        }
+    public override Task<IDisplayResult> DisplayAsync(LinkAdminNode treeNode, BuildDisplayContext context)
+    {
+        return CombineAsync(
+            View("LinkAdminNode_Fields_TreeSummary", treeNode).Location("TreeSummary", "Content"),
+            View("LinkAdminNode_Fields_TreeThumbnail", treeNode).Location("TreeThumbnail", "Content")
+        );
+    }
 
-        public override IDisplayResult Edit(LinkAdminNode treeNode, BuildEditorContext context)
+    public override IDisplayResult Edit(LinkAdminNode treeNode, BuildEditorContext context)
+    {
+        return Initialize<LinkAdminNodeViewModel>("LinkAdminNode_Fields_TreeEdit", async model =>
         {
-            return Initialize<LinkAdminNodeViewModel>("LinkAdminNode_Fields_TreeEdit", async model =>
-            {
-                model.LinkText = treeNode.LinkText;
-                model.LinkUrl = treeNode.LinkUrl;
-                model.IconClass = treeNode.IconClass;
-                model.Target = treeNode.Target;
+            model.LinkText = treeNode.LinkText;
+            model.LinkUrl = treeNode.LinkUrl;
+            model.IconClass = treeNode.IconClass;
+            model.Target = treeNode.Target;
 
-                var permissions = await _adminMenuPermissionService.GetPermissionsAsync();
+            var permissions = await _adminMenuPermissionService.GetPermissionsAsync();
 
-                var selectedPermissions = permissions.Where(p => treeNode.PermissionNames.Contains(p.Name));
+            var selectedPermissions = permissions.Where(p => treeNode.PermissionNames.Contains(p.Name));
 
-                model.SelectedItems = selectedPermissions
-                    .Select(p => new PermissionViewModel
-                    {
-                        Name = p.Name,
-                        DisplayText = p.Description
-                    }).ToList();
-                model.AllItems = permissions
-                    .Select(p => new PermissionViewModel
-                    {
-                        Name = p.Name,
-                        DisplayText = p.Description
-                    }).ToList();
-            }).Location("Content");
-        }
+            model.SelectedItems = selectedPermissions
+                .Select(p => new PermissionViewModel
+                {
+                    Name = p.Name,
+                    DisplayText = p.Description
+                }).ToList();
+            model.AllItems = permissions
+                .Select(p => new PermissionViewModel
+                {
+                    Name = p.Name,
+                    DisplayText = p.Description
+                }).ToList();
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(LinkAdminNode treeNode, UpdateEditorContext context)
-        {
-            var model = new LinkAdminNodeViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix,
-                x => x.LinkUrl,
-                x => x.LinkText,
-                x => x.Target,
-                x => x.IconClass,
-                x => x.SelectedPermissionNames);
+    public override async Task<IDisplayResult> UpdateAsync(LinkAdminNode treeNode, UpdateEditorContext context)
+    {
+        var model = new LinkAdminNodeViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix,
+            x => x.LinkUrl,
+            x => x.LinkText,
+            x => x.Target,
+            x => x.IconClass,
+            x => x.SelectedPermissionNames);
 
-            treeNode.LinkText = model.LinkText;
-            treeNode.LinkUrl = model.LinkUrl;
-            treeNode.Target = model.Target;
-            treeNode.IconClass = model.IconClass;
+        treeNode.LinkText = model.LinkText;
+        treeNode.LinkUrl = model.LinkUrl;
+        treeNode.Target = model.Target;
+        treeNode.IconClass = model.IconClass;
 
-            var selectedPermissions = model.SelectedPermissionNames == null
-                ? []
-                : model.SelectedPermissionNames.Split(',', StringSplitOptions.RemoveEmptyEntries);
+        var selectedPermissions = model.SelectedPermissionNames == null
+            ? []
+            : model.SelectedPermissionNames.Split(',', StringSplitOptions.RemoveEmptyEntries);
 
-            var permissions = await _adminMenuPermissionService.GetPermissionsAsync();
-            treeNode.PermissionNames = permissions
-                .Where(p => selectedPermissions.Contains(p.Name))
-                .Select(p => p.Name).ToArray();
+        var permissions = await _adminMenuPermissionService.GetPermissionsAsync();
+        treeNode.PermissionNames = permissions
+            .Where(p => selectedPermissions.Contains(p.Name))
+            .Select(p => p.Name).ToArray();
 
-            return Edit(treeNode, context);
-        }
+        return Edit(treeNode, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/LinkAdminNodeNavigationBuilder.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/LinkAdminNodeNavigationBuilder.cs
index b8f8d3035e6..a7806298fcd 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/LinkAdminNodeNavigationBuilder.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/LinkAdminNodeNavigationBuilder.cs
@@ -9,88 +9,87 @@
 using OrchardCore.AdminMenu.Services;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.AdminMenu.AdminNodes
+namespace OrchardCore.AdminMenu.AdminNodes;
+
+public class LinkAdminNodeNavigationBuilder : IAdminNodeNavigationBuilder
 {
-    public class LinkAdminNodeNavigationBuilder : IAdminNodeNavigationBuilder
+    private readonly ILogger _logger;
+    private readonly IAdminMenuPermissionService _adminMenuPermissionService;
+    private readonly AdminOptions _adminOptions;
+
+
+    public LinkAdminNodeNavigationBuilder(
+        IAdminMenuPermissionService adminMenuPermissionService,
+        IOptions<AdminOptions> adminOptions,
+        ILogger<LinkAdminNodeNavigationBuilder> logger)
     {
-        private readonly ILogger _logger;
-        private readonly IAdminMenuPermissionService _adminMenuPermissionService;
-        private readonly AdminOptions _adminOptions;
+        _adminMenuPermissionService = adminMenuPermissionService;
+        _adminOptions = adminOptions.Value;
+        _logger = logger;
+    }
 
+    public string Name => nameof(LinkAdminNode);
 
-        public LinkAdminNodeNavigationBuilder(
-            IAdminMenuPermissionService adminMenuPermissionService,
-            IOptions<AdminOptions> adminOptions,
-            ILogger<LinkAdminNodeNavigationBuilder> logger)
+    public Task BuildNavigationAsync(MenuItem menuItem, NavigationBuilder builder, IEnumerable<IAdminNodeNavigationBuilder> treeNodeBuilders)
+    {
+        var node = menuItem as LinkAdminNode;
+        if (node == null || string.IsNullOrEmpty(node.LinkText) || !node.Enabled)
         {
-            _adminMenuPermissionService = adminMenuPermissionService;
-            _adminOptions = adminOptions.Value;
-            _logger = logger;
+            return Task.CompletedTask;
         }
 
-        public string Name => nameof(LinkAdminNode);
-
-        public Task BuildNavigationAsync(MenuItem menuItem, NavigationBuilder builder, IEnumerable<IAdminNodeNavigationBuilder> treeNodeBuilders)
+        return builder.AddAsync(new LocalizedString(node.LinkText, node.LinkText), async itemBuilder =>
         {
-            var node = menuItem as LinkAdminNode;
-            if (node == null || string.IsNullOrEmpty(node.LinkText) || !node.Enabled)
+            var nodeLinkUrl = node.LinkUrl;
+            if (!string.IsNullOrEmpty(nodeLinkUrl) && nodeLinkUrl[0] != '/' && !nodeLinkUrl.Contains("://"))
             {
-                return Task.CompletedTask;
-            }
-
-            return builder.AddAsync(new LocalizedString(node.LinkText, node.LinkText), async itemBuilder =>
-            {
-                var nodeLinkUrl = node.LinkUrl;
-                if (!string.IsNullOrEmpty(nodeLinkUrl) && nodeLinkUrl[0] != '/' && !nodeLinkUrl.Contains("://"))
+                if (nodeLinkUrl.StartsWith("~/", StringComparison.Ordinal))
                 {
-                    if (nodeLinkUrl.StartsWith("~/", StringComparison.Ordinal))
-                    {
-                        nodeLinkUrl = nodeLinkUrl[2..];
-                    }
+                    nodeLinkUrl = nodeLinkUrl[2..];
+                }
 
-                    // Check if the first segment of 'nodeLinkUrl' is not equal to the admin prefix.
-                    if (!nodeLinkUrl.StartsWith($"{_adminOptions.AdminUrlPrefix}", StringComparison.OrdinalIgnoreCase) ||
-                        (nodeLinkUrl.Length != _adminOptions.AdminUrlPrefix.Length
-                        && nodeLinkUrl[_adminOptions.AdminUrlPrefix.Length] != '/'))
-                    {
-                        nodeLinkUrl = $"{_adminOptions.AdminUrlPrefix}/{nodeLinkUrl}";
-                    }
+                // Check if the first segment of 'nodeLinkUrl' is not equal to the admin prefix.
+                if (!nodeLinkUrl.StartsWith($"{_adminOptions.AdminUrlPrefix}", StringComparison.OrdinalIgnoreCase) ||
+                    (nodeLinkUrl.Length != _adminOptions.AdminUrlPrefix.Length
+                    && nodeLinkUrl[_adminOptions.AdminUrlPrefix.Length] != '/'))
+                {
+                    nodeLinkUrl = $"{_adminOptions.AdminUrlPrefix}/{nodeLinkUrl}";
                 }
+            }
 
-                // Add the actual link.
-                itemBuilder.Url(nodeLinkUrl);
-                itemBuilder.Target(node.Target);
-                itemBuilder.Priority(node.Priority);
-                itemBuilder.Position(node.Position);
+            // Add the actual link.
+            itemBuilder.Url(nodeLinkUrl);
+            itemBuilder.Target(node.Target);
+            itemBuilder.Priority(node.Priority);
+            itemBuilder.Position(node.Position);
 
-                if (node.PermissionNames.Length > 0)
-                {
-                    var permissions = await _adminMenuPermissionService.GetPermissionsAsync();
+            if (node.PermissionNames.Length > 0)
+            {
+                var permissions = await _adminMenuPermissionService.GetPermissionsAsync();
 
-                    // Find the actual permissions and apply them to the menu.
-                    var selectedPermissions = permissions.Where(p => node.PermissionNames.Contains(p.Name));
-                    itemBuilder.Permissions(selectedPermissions);
-                }
+                // Find the actual permissions and apply them to the menu.
+                var selectedPermissions = permissions.Where(p => node.PermissionNames.Contains(p.Name));
+                itemBuilder.Permissions(selectedPermissions);
+            }
 
-                // Add adminNode's IconClass property values to menuItem.Classes.
-                // Add them with a prefix so that later the shape template can extract them to use them on a <i> tag.
-                node.IconClass?.Split(' ').ToList().ForEach(c => itemBuilder.AddClass("icon-class-" + c));
+            // Add adminNode's IconClass property values to menuItem.Classes.
+            // Add them with a prefix so that later the shape template can extract them to use them on a <i> tag.
+            node.IconClass?.Split(' ').ToList().ForEach(c => itemBuilder.AddClass("icon-class-" + c));
 
-                // Let children build themselves inside this MenuItem.
-                // Todo: This logic can be shared by all TreeNodeNavigationBuilders.
-                foreach (var childTreeNode in menuItem.Items)
+            // Let children build themselves inside this MenuItem.
+            // Todo: This logic can be shared by all TreeNodeNavigationBuilders.
+            foreach (var childTreeNode in menuItem.Items)
+            {
+                try
                 {
-                    try
-                    {
-                        var treeBuilder = treeNodeBuilders.FirstOrDefault(x => x.Name == childTreeNode.GetType().Name);
-                        await treeBuilder.BuildNavigationAsync(childTreeNode, itemBuilder, treeNodeBuilders);
-                    }
-                    catch (Exception e)
-                    {
-                        _logger.LogError(e, "An exception occurred while building the '{MenuItem}' child Menu Item.", childTreeNode.GetType().Name);
-                    }
+                    var treeBuilder = treeNodeBuilders.FirstOrDefault(x => x.Name == childTreeNode.GetType().Name);
+                    await treeBuilder.BuildNavigationAsync(childTreeNode, itemBuilder, treeNodeBuilders);
                 }
-            });
-        }
+                catch (Exception e)
+                {
+                    _logger.LogError(e, "An exception occurred while building the '{MenuItem}' child Menu Item.", childTreeNode.GetType().Name);
+                }
+            }
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/LinkAdminNodeViewModel.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/LinkAdminNodeViewModel.cs
index b2335ee58e7..31ca1efc603 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/LinkAdminNodeViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/LinkAdminNodeViewModel.cs
@@ -2,26 +2,25 @@
 using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.AdminMenu.AdminNodes
+namespace OrchardCore.AdminMenu.AdminNodes;
+
+public class LinkAdminNodeViewModel
 {
-    public class LinkAdminNodeViewModel
-    {
-        [Required]
-        public string LinkText { get; set; }
+    [Required]
+    public string LinkText { get; set; }
 
-        [Required]
-        public string LinkUrl { get; set; }
+    [Required]
+    public string LinkUrl { get; set; }
 
-        public string Target { get; set; }
+    public string Target { get; set; }
 
-        public string IconClass { get; set; }
+    public string IconClass { get; set; }
 
-        public string SelectedPermissionNames { get; set; }
+    public string SelectedPermissionNames { get; set; }
 
-        [BindNever]
-        public IList<PermissionViewModel> SelectedItems { get; set; }
+    [BindNever]
+    public IList<PermissionViewModel> SelectedItems { get; set; }
 
-        [BindNever]
-        public IList<PermissionViewModel> AllItems { get; set; }
-    }
+    [BindNever]
+    public IList<PermissionViewModel> AllItems { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PermissionViewModel.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PermissionViewModel.cs
index 306c75f373b..73ed1b3cc90 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PermissionViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PermissionViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.AdminMenu.AdminNodes
+namespace OrchardCore.AdminMenu.AdminNodes;
+
+public class PermissionViewModel
 {
-    public class PermissionViewModel
-    {
-        public string Name { get; set; }
-        public string DisplayText { get; set; }
-    }
+    public string Name { get; set; }
+    public string DisplayText { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PlaceholderAdminNode.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PlaceholderAdminNode.cs
index afa2d8d07cd..fd829667feb 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PlaceholderAdminNode.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PlaceholderAdminNode.cs
@@ -1,18 +1,17 @@
 using System.ComponentModel.DataAnnotations;
 using OrchardCore.AdminMenu.Models;
 
-namespace OrchardCore.AdminMenu.AdminNodes
+namespace OrchardCore.AdminMenu.AdminNodes;
+
+public class PlaceholderAdminNode : AdminNode
 {
-    public class PlaceholderAdminNode : AdminNode
-    {
-        [Required]
-        public string LinkText { get; set; }
+    [Required]
+    public string LinkText { get; set; }
 
-        public string IconClass { get; set; }
+    public string IconClass { get; set; }
 
-        /// <summary>
-        /// The names of the permissions required to view this admin menu node.
-        /// </summary>
-        public string[] PermissionNames { get; set; } = [];
-    }
+    /// <summary>
+    /// The names of the permissions required to view this admin menu node.
+    /// </summary>
+    public string[] PermissionNames { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PlaceholderAdminNodeDriver.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PlaceholderAdminNodeDriver.cs
index a650ee28582..f523c5449b4 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PlaceholderAdminNodeDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PlaceholderAdminNodeDriver.cs
@@ -6,69 +6,68 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.AdminMenu.AdminNodes
+namespace OrchardCore.AdminMenu.AdminNodes;
+
+public sealed class PlaceholderAdminNodeDriver : DisplayDriver<MenuItem, PlaceholderAdminNode>
 {
-    public sealed class PlaceholderAdminNodeDriver : DisplayDriver<MenuItem, PlaceholderAdminNode>
-    {
-        private readonly IAdminMenuPermissionService _adminMenuPermissionService;
+    private readonly IAdminMenuPermissionService _adminMenuPermissionService;
 
-        public PlaceholderAdminNodeDriver(IAdminMenuPermissionService adminMenuPermissionService)
-        {
-            _adminMenuPermissionService = adminMenuPermissionService;
-        }
+    public PlaceholderAdminNodeDriver(IAdminMenuPermissionService adminMenuPermissionService)
+    {
+        _adminMenuPermissionService = adminMenuPermissionService;
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(PlaceholderAdminNode treeNode, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                View("PlaceholderAdminNode_Fields_TreeSummary", treeNode).Location("TreeSummary", "Content"),
-                View("PlaceholderAdminNode_Fields_TreeThumbnail", treeNode).Location("TreeThumbnail", "Content")
-            );
-        }
+    public override Task<IDisplayResult> DisplayAsync(PlaceholderAdminNode treeNode, BuildDisplayContext context)
+    {
+        return CombineAsync(
+            View("PlaceholderAdminNode_Fields_TreeSummary", treeNode).Location("TreeSummary", "Content"),
+            View("PlaceholderAdminNode_Fields_TreeThumbnail", treeNode).Location("TreeThumbnail", "Content")
+        );
+    }
 
-        public override IDisplayResult Edit(PlaceholderAdminNode treeNode, BuildEditorContext context)
+    public override IDisplayResult Edit(PlaceholderAdminNode treeNode, BuildEditorContext context)
+    {
+        return Initialize<PlaceholderAdminNodeViewModel>("PlaceholderAdminNode_Fields_TreeEdit", async model =>
         {
-            return Initialize<PlaceholderAdminNodeViewModel>("PlaceholderAdminNode_Fields_TreeEdit", async model =>
-            {
-                model.LinkText = treeNode.LinkText;
-                model.IconClass = treeNode.IconClass;
+            model.LinkText = treeNode.LinkText;
+            model.IconClass = treeNode.IconClass;
 
-                var permissions = await _adminMenuPermissionService.GetPermissionsAsync();
+            var permissions = await _adminMenuPermissionService.GetPermissionsAsync();
 
-                var selectedPermissions = permissions.Where(p => treeNode.PermissionNames.Contains(p.Name));
+            var selectedPermissions = permissions.Where(p => treeNode.PermissionNames.Contains(p.Name));
 
-                model.SelectedItems = selectedPermissions
-                    .Select(p => new PermissionViewModel
-                    {
-                        Name = p.Name,
-                        DisplayText = p.Description
-                    }).ToList();
-                model.AllItems = permissions
-                    .Select(p => new PermissionViewModel
-                    {
-                        Name = p.Name,
-                        DisplayText = p.Description
-                    }).ToList();
-            }).Location("Content");
-        }
+            model.SelectedItems = selectedPermissions
+                .Select(p => new PermissionViewModel
+                {
+                    Name = p.Name,
+                    DisplayText = p.Description
+                }).ToList();
+            model.AllItems = permissions
+                .Select(p => new PermissionViewModel
+                {
+                    Name = p.Name,
+                    DisplayText = p.Description
+                }).ToList();
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(PlaceholderAdminNode treeNode, UpdateEditorContext context)
-        {
-            var model = new PlaceholderAdminNodeViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix,
-                x => x.LinkText,
-                x => x.IconClass,
-                x => x.SelectedPermissionNames);
+    public override async Task<IDisplayResult> UpdateAsync(PlaceholderAdminNode treeNode, UpdateEditorContext context)
+    {
+        var model = new PlaceholderAdminNodeViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix,
+            x => x.LinkText,
+            x => x.IconClass,
+            x => x.SelectedPermissionNames);
 
-            treeNode.LinkText = model.LinkText;
-            treeNode.IconClass = model.IconClass;
+        treeNode.LinkText = model.LinkText;
+        treeNode.IconClass = model.IconClass;
 
-            var selectedPermissions = (model.SelectedPermissionNames == null ? Array.Empty<string>() : model.SelectedPermissionNames.Split(',', StringSplitOptions.RemoveEmptyEntries));
-            var permissions = await _adminMenuPermissionService.GetPermissionsAsync();
-            treeNode.PermissionNames = permissions
-                .Where(p => selectedPermissions.Contains(p.Name))
-                .Select(p => p.Name).ToArray();
+        var selectedPermissions = (model.SelectedPermissionNames == null ? Array.Empty<string>() : model.SelectedPermissionNames.Split(',', StringSplitOptions.RemoveEmptyEntries));
+        var permissions = await _adminMenuPermissionService.GetPermissionsAsync();
+        treeNode.PermissionNames = permissions
+            .Where(p => selectedPermissions.Contains(p.Name))
+            .Select(p => p.Name).ToArray();
 
-            return Edit(treeNode, context);
-        }
+        return Edit(treeNode, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PlaceholderAdminNodeNavigationBuilder.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PlaceholderAdminNodeNavigationBuilder.cs
index d3128008e47..1ad01a4046d 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PlaceholderAdminNodeNavigationBuilder.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PlaceholderAdminNodeNavigationBuilder.cs
@@ -7,62 +7,61 @@
 using OrchardCore.AdminMenu.Services;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.AdminMenu.AdminNodes
+namespace OrchardCore.AdminMenu.AdminNodes;
+
+public class PlaceholderAdminNodeNavigationBuilder : IAdminNodeNavigationBuilder
 {
-    public class PlaceholderAdminNodeNavigationBuilder : IAdminNodeNavigationBuilder
+    private readonly ILogger _logger;
+    private readonly IAdminMenuPermissionService _adminMenuPermissionService;
+
+    public PlaceholderAdminNodeNavigationBuilder(IAdminMenuPermissionService adminMenuPermissionService, ILogger<PlaceholderAdminNodeNavigationBuilder> logger)
     {
-        private readonly ILogger _logger;
-        private readonly IAdminMenuPermissionService _adminMenuPermissionService;
+        _adminMenuPermissionService = adminMenuPermissionService;
+        _logger = logger;
+    }
+
+    public string Name => nameof(PlaceholderAdminNode);
 
-        public PlaceholderAdminNodeNavigationBuilder(IAdminMenuPermissionService adminMenuPermissionService, ILogger<PlaceholderAdminNodeNavigationBuilder> logger)
+    public Task BuildNavigationAsync(MenuItem menuItem, NavigationBuilder builder, IEnumerable<IAdminNodeNavigationBuilder> treeNodeBuilders)
+    {
+        var node = menuItem as PlaceholderAdminNode;
+
+        if (node == null || string.IsNullOrEmpty(node.LinkText) || !node.Enabled)
         {
-            _adminMenuPermissionService = adminMenuPermissionService;
-            _logger = logger;
+            return Task.CompletedTask;
         }
 
-        public string Name => nameof(PlaceholderAdminNode);
-
-        public Task BuildNavigationAsync(MenuItem menuItem, NavigationBuilder builder, IEnumerable<IAdminNodeNavigationBuilder> treeNodeBuilders)
+        return builder.AddAsync(new LocalizedString(node.LinkText, node.LinkText), async itemBuilder =>
         {
-            var node = menuItem as PlaceholderAdminNode;
+            itemBuilder.Priority(node.Priority);
+            itemBuilder.Position(node.Position);
 
-            if (node == null || string.IsNullOrEmpty(node.LinkText) || !node.Enabled)
+            if (node.PermissionNames.Length > 0)
             {
-                return Task.CompletedTask;
+                var permissions = await _adminMenuPermissionService.GetPermissionsAsync();
+                // Find the actual permissions and apply them to the menu.
+                var selectedPermissions = permissions.Where(p => node.PermissionNames.Contains(p.Name));
+                itemBuilder.Permissions(selectedPermissions);
             }
 
-            return builder.AddAsync(new LocalizedString(node.LinkText, node.LinkText), async itemBuilder =>
-            {
-                itemBuilder.Priority(node.Priority);
-                itemBuilder.Position(node.Position);
+            // Add adminNode's IconClass property values to menuItem.Classes.
+            // Add them with a prefix so that later the shape template can extract them to use them on a <i> tag.
+            node.IconClass?.Split(' ').ToList().ForEach(c => itemBuilder.AddClass("icon-class-" + c));
 
-                if (node.PermissionNames.Length > 0)
+            // Let children build themselves inside this MenuItem
+            // todo: this logic can be shared by all TreeNodeNavigationBuilders
+            foreach (var childTreeNode in menuItem.Items)
+            {
+                try
                 {
-                    var permissions = await _adminMenuPermissionService.GetPermissionsAsync();
-                    // Find the actual permissions and apply them to the menu.
-                    var selectedPermissions = permissions.Where(p => node.PermissionNames.Contains(p.Name));
-                    itemBuilder.Permissions(selectedPermissions);
+                    var treeBuilder = treeNodeBuilders.FirstOrDefault(x => x.Name == childTreeNode.GetType().Name);
+                    await treeBuilder.BuildNavigationAsync(childTreeNode, itemBuilder, treeNodeBuilders);
                 }
-
-                // Add adminNode's IconClass property values to menuItem.Classes.
-                // Add them with a prefix so that later the shape template can extract them to use them on a <i> tag.
-                node.IconClass?.Split(' ').ToList().ForEach(c => itemBuilder.AddClass("icon-class-" + c));
-
-                // Let children build themselves inside this MenuItem
-                // todo: this logic can be shared by all TreeNodeNavigationBuilders
-                foreach (var childTreeNode in menuItem.Items)
+                catch (Exception e)
                 {
-                    try
-                    {
-                        var treeBuilder = treeNodeBuilders.FirstOrDefault(x => x.Name == childTreeNode.GetType().Name);
-                        await treeBuilder.BuildNavigationAsync(childTreeNode, itemBuilder, treeNodeBuilders);
-                    }
-                    catch (Exception e)
-                    {
-                        _logger.LogError(e, "An exception occurred while building the '{MenuItem}' child Menu Item.", childTreeNode.GetType().Name);
-                    }
+                    _logger.LogError(e, "An exception occurred while building the '{MenuItem}' child Menu Item.", childTreeNode.GetType().Name);
                 }
-            });
-        }
+            }
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PlaceholderAdminNodeViewModel.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PlaceholderAdminNodeViewModel.cs
index 4a380af3212..3224d92824d 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PlaceholderAdminNodeViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminNodes/PlaceholderAdminNodeViewModel.cs
@@ -2,21 +2,20 @@
 using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.AdminMenu.AdminNodes
+namespace OrchardCore.AdminMenu.AdminNodes;
+
+public class PlaceholderAdminNodeViewModel
 {
-    public class PlaceholderAdminNodeViewModel
-    {
-        [Required]
-        public string LinkText { get; set; }
+    [Required]
+    public string LinkText { get; set; }
 
-        public string IconClass { get; set; }
+    public string IconClass { get; set; }
 
-        public string SelectedPermissionNames { get; set; }
+    public string SelectedPermissionNames { get; set; }
 
-        [BindNever]
-        public IList<PermissionViewModel> SelectedItems { get; set; }
+    [BindNever]
+    public IList<PermissionViewModel> SelectedItems { get; set; }
 
-        [BindNever]
-        public IList<PermissionViewModel> AllItems { get; set; }
-    }
+    [BindNever]
+    public IList<PermissionViewModel> AllItems { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Controllers/MenuController.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Controllers/MenuController.cs
index 639adf36476..60707c3fbbc 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Controllers/MenuController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Controllers/MenuController.cs
@@ -18,284 +18,283 @@
 using OrchardCore.Navigation;
 using OrchardCore.Routing;
 
-namespace OrchardCore.AdminMenu.Controllers
+namespace OrchardCore.AdminMenu.Controllers;
+
+[Admin("AdminMenu/{action}/{id?}", "AdminMenu{action}")]
+public class MenuController : Controller
 {
-    [Admin("AdminMenu/{action}/{id?}", "AdminMenu{action}")]
-    public class MenuController : Controller
+    private const string _optionsSearch = "Options.Search";
+
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IAdminMenuService _adminMenuService;
+    private readonly PagerOptions _pagerOptions;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly INotifier _notifier;
+    private readonly ILogger _logger;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public MenuController(
+        IAuthorizationService authorizationService,
+        IAdminMenuService adminMenuService,
+        IOptions<PagerOptions> pagerOptions,
+        IShapeFactory shapeFactory,
+        INotifier notifier,
+        IStringLocalizer<MenuController> stringLocalizer,
+        IHtmlLocalizer<MenuController> htmlLocalizer,
+        ILogger<MenuController> logger)
     {
-        private const string _optionsSearch = "Options.Search";
-
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IAdminMenuService _adminMenuService;
-        private readonly PagerOptions _pagerOptions;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly INotifier _notifier;
-        private readonly ILogger _logger;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public MenuController(
-            IAuthorizationService authorizationService,
-            IAdminMenuService adminMenuService,
-            IOptions<PagerOptions> pagerOptions,
-            IShapeFactory shapeFactory,
-            INotifier notifier,
-            IStringLocalizer<MenuController> stringLocalizer,
-            IHtmlLocalizer<MenuController> htmlLocalizer,
-            ILogger<MenuController> logger)
-        {
-            _authorizationService = authorizationService;
-            _adminMenuService = adminMenuService;
-            _pagerOptions = pagerOptions.Value;
-            _shapeFactory = shapeFactory;
-            _notifier = notifier;
-            S = stringLocalizer;
-            H = htmlLocalizer;
-            _logger = logger;
-        }
+        _authorizationService = authorizationService;
+        _adminMenuService = adminMenuService;
+        _pagerOptions = pagerOptions.Value;
+        _shapeFactory = shapeFactory;
+        _notifier = notifier;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+        _logger = logger;
+    }
 
-        public async Task<IActionResult> List(ContentOptions options, PagerParameters pagerParameters)
+    public async Task<IActionResult> List(ContentOptions options, PagerParameters pagerParameters)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
-            {
-                return Forbid();
-            }
-
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+            return Forbid();
+        }
 
-            var adminMenuList = (await _adminMenuService.GetAdminMenuListAsync()).AdminMenu;
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
 
-            if (!string.IsNullOrWhiteSpace(options.Search))
-            {
-                adminMenuList = adminMenuList.Where(x => x.Name.Contains(options.Search, StringComparison.OrdinalIgnoreCase)).ToList();
-            }
+        var adminMenuList = (await _adminMenuService.GetAdminMenuListAsync()).AdminMenu;
 
-            var startIndex = pager.GetStartIndex();
-            var pageSize = pager.PageSize;
-            IEnumerable<Models.AdminMenu> results = [];
-
-            // todo: handle the case where there is a deserialization exception on some of the presets.
-            // load at least the ones without error. Provide a way to delete the ones on error.
-            try
-            {
-                results = adminMenuList
-                .Skip(startIndex)
-                .Take(pageSize)
-                .ToList();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error when retrieving the list of admin menus.");
-                await _notifier.ErrorAsync(H["Error when retrieving the list of admin menus."]);
-            }
-
-            // Maintain previous route data when generating page links.
-            var routeData = new RouteData();
-
-            if (!string.IsNullOrEmpty(options.Search))
-            {
-                routeData.Values.TryAdd(_optionsSearch, options.Search);
-            }
+        if (!string.IsNullOrWhiteSpace(options.Search))
+        {
+            adminMenuList = adminMenuList.Where(x => x.Name.Contains(options.Search, StringComparison.OrdinalIgnoreCase)).ToList();
+        }
 
-            var pagerShape = await _shapeFactory.PagerAsync(pager, adminMenuList.Count, routeData);
+        var startIndex = pager.GetStartIndex();
+        var pageSize = pager.PageSize;
+        IEnumerable<Models.AdminMenu> results = [];
 
-            var model = new AdminMenuListViewModel
-            {
-                AdminMenu = results.Select(x => new AdminMenuEntry { AdminMenu = x }).ToList(),
-                Options = options,
-                Pager = pagerShape,
-            };
+        // todo: handle the case where there is a deserialization exception on some of the presets.
+        // load at least the ones without error. Provide a way to delete the ones on error.
+        try
+        {
+            results = adminMenuList
+            .Skip(startIndex)
+            .Take(pageSize)
+            .ToList();
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error when retrieving the list of admin menus.");
+            await _notifier.ErrorAsync(H["Error when retrieving the list of admin menus."]);
+        }
 
-            model.Options.ContentsBulkAction =
-            [
-                new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
-            ];
+        // Maintain previous route data when generating page links.
+        var routeData = new RouteData();
 
-            return View(model);
+        if (!string.IsNullOrEmpty(options.Search))
+        {
+            routeData.Values.TryAdd(_optionsSearch, options.Search);
         }
 
-        [HttpPost, ActionName(nameof(List))]
-        [FormValueRequired("submit.Filter")]
-        public ActionResult IndexFilterPOST(AdminMenuListViewModel model)
-            => RedirectToAction(nameof(List), new RouteValueDictionary
-            {
-                {_optionsSearch, model.Options.Search }
-            });
+        var pagerShape = await _shapeFactory.PagerAsync(pager, adminMenuList.Count, routeData);
 
-        public async Task<IActionResult> Create()
+        var model = new AdminMenuListViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
-            {
-                return Forbid();
-            }
+            AdminMenu = results.Select(x => new AdminMenuEntry { AdminMenu = x }).ToList(),
+            Options = options,
+            Pager = pagerShape,
+        };
 
-            var model = new AdminMenuCreateViewModel();
+        model.Options.ContentsBulkAction =
+        [
+            new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+        ];
 
-            return View(model);
-        }
+        return View(model);
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> Create(AdminMenuCreateViewModel model)
+    [HttpPost, ActionName(nameof(List))]
+    [FormValueRequired("submit.Filter")]
+    public ActionResult IndexFilterPOST(AdminMenuListViewModel model)
+        => RedirectToAction(nameof(List), new RouteValueDictionary
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
-            {
-                return Forbid();
-            }
+            {_optionsSearch, model.Options.Search }
+        });
 
-            if (ModelState.IsValid)
-            {
-                var tree = new Models.AdminMenu { Name = model.Name };
+    public async Task<IActionResult> Create()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        {
+            return Forbid();
+        }
 
-                await _adminMenuService.SaveAsync(tree);
+        var model = new AdminMenuCreateViewModel();
 
-                return RedirectToAction(nameof(List));
-            }
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost]
+    public async Task<IActionResult> Create(AdminMenuCreateViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        {
+            return Forbid();
         }
 
-        public async Task<IActionResult> Edit(string id)
+        if (ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
-            {
-                return Forbid();
-            }
+            var tree = new Models.AdminMenu { Name = model.Name };
 
-            var adminMenuList = await _adminMenuService.GetAdminMenuListAsync();
-            var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, id);
-
-            if (adminMenu == null)
-            {
-                return NotFound();
-            }
-
-            var model = new AdminMenuEditViewModel
-            {
-                Id = adminMenu.Id,
-                Name = adminMenu.Name
-            };
+            await _adminMenuService.SaveAsync(tree);
 
-            return View(model);
+            return RedirectToAction(nameof(List));
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Edit(AdminMenuEditViewModel model)
+        return View(model);
+    }
+
+    public async Task<IActionResult> Edit(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var adminMenuList = await _adminMenuService.LoadAdminMenuListAsync();
-            var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, model.Id);
+        var adminMenuList = await _adminMenuService.GetAdminMenuListAsync();
+        var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, id);
 
-            if (adminMenu == null)
-            {
-                return NotFound();
-            }
+        if (adminMenu == null)
+        {
+            return NotFound();
+        }
 
-            if (ModelState.IsValid)
-            {
-                adminMenu.Name = model.Name;
+        var model = new AdminMenuEditViewModel
+        {
+            Id = adminMenu.Id,
+            Name = adminMenu.Name
+        };
 
-                await _adminMenuService.SaveAsync(adminMenu);
+        return View(model);
+    }
 
-                await _notifier.SuccessAsync(H["Admin menu updated successfully."]);
+    [HttpPost]
+    public async Task<IActionResult> Edit(AdminMenuEditViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        {
+            return Forbid();
+        }
 
-                return RedirectToAction(nameof(List));
-            }
+        var adminMenuList = await _adminMenuService.LoadAdminMenuListAsync();
+        var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, model.Id);
 
-            return View(model);
+        if (adminMenu == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(string id)
+        if (ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
-            {
-                return Forbid();
-            }
-
-            var adminMenuList = await _adminMenuService.LoadAdminMenuListAsync();
-            var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, id);
+            adminMenu.Name = model.Name;
 
-            if (adminMenu == null)
-            {
-                await _notifier.ErrorAsync(H["Can't find the admin menu."]);
-                return RedirectToAction(nameof(List));
-            }
-
-            var removed = await _adminMenuService.DeleteAsync(adminMenu);
+            await _adminMenuService.SaveAsync(adminMenu);
 
-            if (removed == 1)
-            {
-                await _notifier.SuccessAsync(H["Admin menu deleted successfully."]);
-            }
-            else
-            {
-                await _notifier.ErrorAsync(H["Can't delete the admin menu."]);
-            }
+            await _notifier.SuccessAsync(H["Admin menu updated successfully."]);
 
             return RedirectToAction(nameof(List));
         }
 
-        [HttpPost, ActionName(nameof(List))]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<string> itemIds)
+        return View(model);
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Delete(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            if (itemIds?.Count() > 0)
-            {
-                var adminMenuList = (await _adminMenuService.GetAdminMenuListAsync()).AdminMenu;
-                var checkedContentItems = adminMenuList.Where(x => itemIds.Contains(x.Id));
-                switch (options.BulkAction)
-                {
-                    case ContentsBulkAction.None:
-                        break;
-                    case ContentsBulkAction.Remove:
-                        foreach (var item in checkedContentItems)
-                        {
-                            var adminMenu = adminMenuList.FirstOrDefault(x => string.Equals(x.Id, item.Id, StringComparison.OrdinalIgnoreCase));
-                            await _adminMenuService.DeleteAsync(adminMenu);
-                        }
-                        await _notifier.SuccessAsync(H["Admin menus successfully removed."]);
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException(options.BulkAction.ToString(), "Invalid bulk action.");
-                }
-            }
+        var adminMenuList = await _adminMenuService.LoadAdminMenuListAsync();
+        var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, id);
 
+        if (adminMenu == null)
+        {
+            await _notifier.ErrorAsync(H["Can't find the admin menu."]);
             return RedirectToAction(nameof(List));
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Toggle(string id)
+        var removed = await _adminMenuService.DeleteAsync(adminMenu);
+
+        if (removed == 1)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
-            {
-                return Forbid();
-            }
+            await _notifier.SuccessAsync(H["Admin menu deleted successfully."]);
+        }
+        else
+        {
+            await _notifier.ErrorAsync(H["Can't delete the admin menu."]);
+        }
+
+        return RedirectToAction(nameof(List));
+    }
 
-            var adminMenuList = await _adminMenuService.LoadAdminMenuListAsync();
-            var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, id);
+    [HttpPost, ActionName(nameof(List))]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<string> itemIds)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        {
+            return Forbid();
+        }
 
-            if (adminMenu == null)
+        if (itemIds?.Count() > 0)
+        {
+            var adminMenuList = (await _adminMenuService.GetAdminMenuListAsync()).AdminMenu;
+            var checkedContentItems = adminMenuList.Where(x => itemIds.Contains(x.Id));
+            switch (options.BulkAction)
             {
-                return NotFound();
+                case ContentsBulkAction.None:
+                    break;
+                case ContentsBulkAction.Remove:
+                    foreach (var item in checkedContentItems)
+                    {
+                        var adminMenu = adminMenuList.FirstOrDefault(x => string.Equals(x.Id, item.Id, StringComparison.OrdinalIgnoreCase));
+                        await _adminMenuService.DeleteAsync(adminMenu);
+                    }
+                    await _notifier.SuccessAsync(H["Admin menus successfully removed."]);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(options.BulkAction.ToString(), "Invalid bulk action.");
             }
+        }
 
-            adminMenu.Enabled = !adminMenu.Enabled;
+        return RedirectToAction(nameof(List));
+    }
 
-            await _adminMenuService.SaveAsync(adminMenu);
+    [HttpPost]
+    public async Task<IActionResult> Toggle(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        {
+            return Forbid();
+        }
 
-            await _notifier.SuccessAsync(H["Admin menu toggled successfully."]);
+        var adminMenuList = await _adminMenuService.LoadAdminMenuListAsync();
+        var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, id);
 
-            return RedirectToAction(nameof(List));
+        if (adminMenu == null)
+        {
+            return NotFound();
         }
+
+        adminMenu.Enabled = !adminMenu.Enabled;
+
+        await _adminMenuService.SaveAsync(adminMenu);
+
+        await _notifier.SuccessAsync(H["Admin menu toggled successfully."]);
+
+        return RedirectToAction(nameof(List));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Controllers/NodeController.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Controllers/NodeController.cs
index 56567072107..a7990a7b9f0 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Controllers/NodeController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Controllers/NodeController.cs
@@ -12,337 +12,336 @@
 using OrchardCore.DisplayManagement.Notify;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.AdminMenu.Controllers
+namespace OrchardCore.AdminMenu.Controllers;
+
+[Admin("AdminMenu/Node/{action}", "AdminMenuNode{action}")]
+public class NodeController : Controller
 {
-    [Admin("AdminMenu/Node/{action}", "AdminMenuNode{action}")]
-    public class NodeController : Controller
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IDisplayManager<MenuItem> _displayManager;
+    private readonly IEnumerable<IAdminNodeProviderFactory> _factories;
+    private readonly IAdminMenuService _adminMenuService;
+    private readonly INotifier _notifier;
+    protected readonly IHtmlLocalizer H;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+
+
+    public NodeController(
+        IAuthorizationService authorizationService,
+        IDisplayManager<MenuItem> displayManager,
+        IEnumerable<IAdminNodeProviderFactory> factories,
+        IAdminMenuService adminMenuService,
+        IHtmlLocalizer<NodeController> htmlLocalizer,
+        INotifier notifier,
+        IUpdateModelAccessor updateModelAccessor)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IDisplayManager<MenuItem> _displayManager;
-        private readonly IEnumerable<IAdminNodeProviderFactory> _factories;
-        private readonly IAdminMenuService _adminMenuService;
-        private readonly INotifier _notifier;
-        protected readonly IHtmlLocalizer H;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-
-
-        public NodeController(
-            IAuthorizationService authorizationService,
-            IDisplayManager<MenuItem> displayManager,
-            IEnumerable<IAdminNodeProviderFactory> factories,
-            IAdminMenuService adminMenuService,
-            IHtmlLocalizer<NodeController> htmlLocalizer,
-            INotifier notifier,
-            IUpdateModelAccessor updateModelAccessor)
-        {
-            _displayManager = displayManager;
-            _factories = factories;
-            _adminMenuService = adminMenuService;
-            _authorizationService = authorizationService;
-            _notifier = notifier;
-            _updateModelAccessor = updateModelAccessor;
-            H = htmlLocalizer;
-        }
+        _displayManager = displayManager;
+        _factories = factories;
+        _adminMenuService = adminMenuService;
+        _authorizationService = authorizationService;
+        _notifier = notifier;
+        _updateModelAccessor = updateModelAccessor;
+        H = htmlLocalizer;
+    }
 
-        public async Task<IActionResult> List(string id)
+    public async Task<IActionResult> List(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var adminMenuList = await _adminMenuService.GetAdminMenuListAsync();
-            var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, id);
+        var adminMenuList = await _adminMenuService.GetAdminMenuListAsync();
+        var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, id);
 
-            if (adminMenu == null)
-            {
-                return NotFound();
-            }
+        if (adminMenu == null)
+        {
+            return NotFound();
+        }
+
+        return View(await BuildDisplayViewModel(adminMenu));
+    }
 
-            return View(await BuildDisplayViewModel(adminMenu));
+    private async Task<AdminNodeListViewModel> BuildDisplayViewModel(Models.AdminMenu tree)
+    {
+        var thumbnails = new Dictionary<string, dynamic>();
+        foreach (var factory in _factories)
+        {
+            var treeNode = factory.Create();
+            var thumbnail = await _displayManager.BuildDisplayAsync(treeNode, _updateModelAccessor.ModelUpdater, "TreeThumbnail");
+            thumbnail.Properties["TreeNode"] = treeNode;
+            thumbnails.Add(factory.Name, thumbnail);
         }
 
-        private async Task<AdminNodeListViewModel> BuildDisplayViewModel(Models.AdminMenu tree)
+        var model = new AdminNodeListViewModel
         {
-            var thumbnails = new Dictionary<string, dynamic>();
-            foreach (var factory in _factories)
-            {
-                var treeNode = factory.Create();
-                var thumbnail = await _displayManager.BuildDisplayAsync(treeNode, _updateModelAccessor.ModelUpdater, "TreeThumbnail");
-                thumbnail.Properties["TreeNode"] = treeNode;
-                thumbnails.Add(factory.Name, thumbnail);
-            }
+            AdminMenu = tree,
+            Thumbnails = thumbnails,
+        };
 
-            var model = new AdminNodeListViewModel
-            {
-                AdminMenu = tree,
-                Thumbnails = thumbnails,
-            };
+        return model;
+    }
 
-            return model;
+    public async Task<IActionResult> Create(string id, string type)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        {
+            return Forbid();
         }
+        var adminMenuList = await _adminMenuService.GetAdminMenuListAsync();
+        var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, id);
 
-        public async Task<IActionResult> Create(string id, string type)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
-            {
-                return Forbid();
-            }
-            var adminMenuList = await _adminMenuService.GetAdminMenuListAsync();
-            var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, id);
-
-            if (adminMenu == null)
-            {
-                return NotFound();
-            }
-
-            var treeNode = _factories.FirstOrDefault(x => x.Name == type)?.Create();
-
-            if (treeNode == null)
-            {
-                return NotFound();
-            }
-
-            var model = new AdminNodeEditViewModel
-            {
-                AdminMenuId = id,
-                AdminNode = treeNode,
-                AdminNodeId = treeNode.UniqueId,
-                AdminNodeType = type,
-                Editor = await _displayManager.BuildEditorAsync(treeNode, updater: _updateModelAccessor.ModelUpdater, isNew: true, "", "")
-            };
-
-            return View(model);
+        if (adminMenu == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Create(AdminNodeEditViewModel model)
+        var treeNode = _factories.FirstOrDefault(x => x.Name == type)?.Create();
+
+        if (treeNode == null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
-            {
-                return Forbid();
-            }
+            return NotFound();
+        }
 
-            var adminMenuList = await _adminMenuService.LoadAdminMenuListAsync();
-            var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, model.AdminMenuId);
+        var model = new AdminNodeEditViewModel
+        {
+            AdminMenuId = id,
+            AdminNode = treeNode,
+            AdminNodeId = treeNode.UniqueId,
+            AdminNodeType = type,
+            Editor = await _displayManager.BuildEditorAsync(treeNode, updater: _updateModelAccessor.ModelUpdater, isNew: true, "", "")
+        };
+
+        return View(model);
+    }
 
-            if (adminMenu == null)
-            {
-                return NotFound();
-            }
+    [HttpPost]
+    public async Task<IActionResult> Create(AdminNodeEditViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        {
+            return Forbid();
+        }
 
-            var treeNode = _factories.FirstOrDefault(x => x.Name == model.AdminNodeType)?.Create();
+        var adminMenuList = await _adminMenuService.LoadAdminMenuListAsync();
+        var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, model.AdminMenuId);
 
-            if (treeNode == null)
-            {
-                return NotFound();
-            }
+        if (adminMenu == null)
+        {
+            return NotFound();
+        }
 
-            var editor = await _displayManager.UpdateEditorAsync(treeNode, updater: _updateModelAccessor.ModelUpdater, isNew: true, "", "");
-            editor.Properties["TreeNode"] = treeNode;
+        var treeNode = _factories.FirstOrDefault(x => x.Name == model.AdminNodeType)?.Create();
 
-            if (ModelState.IsValid)
-            {
-                treeNode.UniqueId = model.AdminNodeId;
-                adminMenu.MenuItems.Add(treeNode);
-                await _adminMenuService.SaveAsync(adminMenu);
+        if (treeNode == null)
+        {
+            return NotFound();
+        }
 
-                await _notifier.SuccessAsync(H["Admin node added successfully."]);
-                return RedirectToAction(nameof(List), new { id = model.AdminMenuId });
-            }
+        var editor = await _displayManager.UpdateEditorAsync(treeNode, updater: _updateModelAccessor.ModelUpdater, isNew: true, "", "");
+        editor.Properties["TreeNode"] = treeNode;
 
-            model.Editor = editor;
+        if (ModelState.IsValid)
+        {
+            treeNode.UniqueId = model.AdminNodeId;
+            adminMenu.MenuItems.Add(treeNode);
+            await _adminMenuService.SaveAsync(adminMenu);
 
-            // If we got this far, something failed, redisplay form
-            return View(model);
+            await _notifier.SuccessAsync(H["Admin node added successfully."]);
+            return RedirectToAction(nameof(List), new { id = model.AdminMenuId });
         }
 
-        public async Task<IActionResult> Edit(string id, string treeNodeId)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
-            {
-                return Forbid();
-            }
-
-            var adminMenuList = await _adminMenuService.GetAdminMenuListAsync();
-            var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, id);
+        model.Editor = editor;
 
-            if (adminMenu == null)
-            {
-                return NotFound();
-            }
+        // If we got this far, something failed, redisplay form
+        return View(model);
+    }
 
-            var treeNode = adminMenu.GetMenuItemById(treeNodeId);
+    public async Task<IActionResult> Edit(string id, string treeNodeId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        {
+            return Forbid();
+        }
 
-            if (treeNode == null)
-            {
-                return NotFound();
-            }
+        var adminMenuList = await _adminMenuService.GetAdminMenuListAsync();
+        var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, id);
 
-            var model = new AdminNodeEditViewModel
-            {
-                AdminMenuId = id,
-                AdminNode = treeNode,
-                AdminNodeId = treeNode.UniqueId,
-                AdminNodeType = treeNode.GetType().Name,
-                Priority = treeNode.Priority,
-                Position = treeNode.Position,
-                Editor = await _displayManager.BuildEditorAsync(treeNode, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "")
-            };
+        if (adminMenu == null)
+        {
+            return NotFound();
+        }
 
-            model.Editor.TreeNode = treeNode;
+        var treeNode = adminMenu.GetMenuItemById(treeNodeId);
 
-            return View(model);
+        if (treeNode == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Edit(AdminNodeEditViewModel model)
+        var model = new AdminNodeEditViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
-            {
-                return Forbid();
-            }
-
-            var adminMenuList = await _adminMenuService.LoadAdminMenuListAsync();
-            var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, model.AdminMenuId);
+            AdminMenuId = id,
+            AdminNode = treeNode,
+            AdminNodeId = treeNode.UniqueId,
+            AdminNodeType = treeNode.GetType().Name,
+            Priority = treeNode.Priority,
+            Position = treeNode.Position,
+            Editor = await _displayManager.BuildEditorAsync(treeNode, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "")
+        };
+
+        model.Editor.TreeNode = treeNode;
+
+        return View(model);
+    }
 
-            if (adminMenu == null)
-            {
-                return NotFound();
-            }
+    [HttpPost]
+    public async Task<IActionResult> Edit(AdminNodeEditViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
+        {
+            return Forbid();
+        }
 
-            var treeNode = adminMenu.GetMenuItemById(model.AdminNodeId);
+        var adminMenuList = await _adminMenuService.LoadAdminMenuListAsync();
+        var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, model.AdminMenuId);
 
-            if (treeNode == null)
-            {
-                return NotFound();
-            }
+        if (adminMenu == null)
+        {
+            return NotFound();
+        }
 
-            var editor = await _displayManager.UpdateEditorAsync(treeNode, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "");
+        var treeNode = adminMenu.GetMenuItemById(model.AdminNodeId);
 
-            if (ModelState.IsValid)
-            {
-                treeNode.Priority = model.Priority;
-                treeNode.Position = model.Position;
+        if (treeNode == null)
+        {
+            return NotFound();
+        }
 
-                await _adminMenuService.SaveAsync(adminMenu);
+        var editor = await _displayManager.UpdateEditorAsync(treeNode, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "");
 
-                await _notifier.SuccessAsync(H["Admin node updated successfully."]);
-                return RedirectToAction(nameof(List), new { id = model.AdminMenuId });
-            }
+        if (ModelState.IsValid)
+        {
+            treeNode.Priority = model.Priority;
+            treeNode.Position = model.Position;
 
-            await _notifier.ErrorAsync(H["The admin node has validation errors."]);
-            model.Editor = editor;
+            await _adminMenuService.SaveAsync(adminMenu);
 
-            // If we got this far, something failed, redisplay form
-            return View(model);
+            await _notifier.SuccessAsync(H["Admin node updated successfully."]);
+            return RedirectToAction(nameof(List), new { id = model.AdminMenuId });
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(string id, string treeNodeId)
+        await _notifier.ErrorAsync(H["The admin node has validation errors."]);
+        model.Editor = editor;
+
+        // If we got this far, something failed, redisplay form
+        return View(model);
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Delete(string id, string treeNodeId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var adminMenuList = await _adminMenuService.LoadAdminMenuListAsync();
-            var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, id);
+        var adminMenuList = await _adminMenuService.LoadAdminMenuListAsync();
+        var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, id);
 
-            if (adminMenu == null)
-            {
-                return NotFound();
-            }
+        if (adminMenu == null)
+        {
+            return NotFound();
+        }
 
-            var treeNode = adminMenu.GetMenuItemById(treeNodeId);
+        var treeNode = adminMenu.GetMenuItemById(treeNodeId);
 
-            if (treeNode == null)
-            {
-                return NotFound();
-            }
+        if (treeNode == null)
+        {
+            return NotFound();
+        }
 
-            if (adminMenu.RemoveMenuItem(treeNode) == false)
-            {
-                return this.InternalServerError();
-            }
+        if (adminMenu.RemoveMenuItem(treeNode) == false)
+        {
+            return this.InternalServerError();
+        }
 
-            await _adminMenuService.SaveAsync(adminMenu);
+        await _adminMenuService.SaveAsync(adminMenu);
 
-            await _notifier.SuccessAsync(H["Admin node deleted successfully."]);
+        await _notifier.SuccessAsync(H["Admin node deleted successfully."]);
 
-            return RedirectToAction(nameof(List), new { id });
-        }
+        return RedirectToAction(nameof(List), new { id });
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> Toggle(string id, string treeNodeId)
+    [HttpPost]
+    public async Task<IActionResult> Toggle(string id, string treeNodeId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var adminMenuList = await _adminMenuService.LoadAdminMenuListAsync();
-            var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, id);
+        var adminMenuList = await _adminMenuService.LoadAdminMenuListAsync();
+        var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, id);
 
-            if (adminMenu == null)
-            {
-                return NotFound();
-            }
+        if (adminMenu == null)
+        {
+            return NotFound();
+        }
 
-            var treeNode = adminMenu.GetMenuItemById(treeNodeId);
+        var treeNode = adminMenu.GetMenuItemById(treeNodeId);
 
-            if (treeNode == null)
-            {
-                return NotFound();
-            }
+        if (treeNode == null)
+        {
+            return NotFound();
+        }
 
-            treeNode.Enabled = !treeNode.Enabled;
+        treeNode.Enabled = !treeNode.Enabled;
 
-            await _adminMenuService.SaveAsync(adminMenu);
+        await _adminMenuService.SaveAsync(adminMenu);
 
-            await _notifier.SuccessAsync(H["Admin node toggled successfully."]);
+        await _notifier.SuccessAsync(H["Admin node toggled successfully."]);
 
-            return RedirectToAction(nameof(List), new { id });
-        }
+        return RedirectToAction(nameof(List), new { id });
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> MoveNode(string treeId, string nodeToMoveId,
-            string destinationNodeId, int position)
+    [HttpPost]
+    public async Task<IActionResult> MoveNode(string treeId, string nodeToMoveId,
+        string destinationNodeId, int position)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAdminMenu))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var adminMenuList = await _adminMenuService.LoadAdminMenuListAsync();
-            var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, treeId);
+        var adminMenuList = await _adminMenuService.LoadAdminMenuListAsync();
+        var adminMenu = _adminMenuService.GetAdminMenuById(adminMenuList, treeId);
 
-            if ((adminMenu == null) || (adminMenu.MenuItems == null))
-            {
-                return NotFound();
-            }
+        if ((adminMenu == null) || (adminMenu.MenuItems == null))
+        {
+            return NotFound();
+        }
 
-            var nodeToMove = adminMenu.GetMenuItemById(nodeToMoveId);
-            if (nodeToMove == null)
-            {
-                return NotFound();
-            }
+        var nodeToMove = adminMenu.GetMenuItemById(nodeToMoveId);
+        if (nodeToMove == null)
+        {
+            return NotFound();
+        }
 
-            var destinationNode = adminMenu.GetMenuItemById(destinationNodeId); // don't check for null. When null the item will be moved to the root.
+        var destinationNode = adminMenu.GetMenuItemById(destinationNodeId); // don't check for null. When null the item will be moved to the root.
 
-            if (adminMenu.RemoveMenuItem(nodeToMove) == false)
-            {
-                return StatusCode(500);
-            }
+        if (adminMenu.RemoveMenuItem(nodeToMove) == false)
+        {
+            return StatusCode(500);
+        }
 
-            if (adminMenu.InsertMenuItemAt(nodeToMove, destinationNode, position) == false)
-            {
-                return StatusCode(500);
-            }
+        if (adminMenu.InsertMenuItemAt(nodeToMove, destinationNode, position) == false)
+        {
+            return StatusCode(500);
+        }
 
-            await _adminMenuService.SaveAsync(adminMenu);
+        await _adminMenuService.SaveAsync(adminMenu);
 
-            return Ok();
-        }
+        return Ok();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Deployment/AdminMenuDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Deployment/AdminMenuDeploymentSource.cs
index e585f1d7626..9ee17c3b5a6 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Deployment/AdminMenuDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Deployment/AdminMenuDeploymentSource.cs
@@ -6,43 +6,42 @@
 using OrchardCore.Deployment;
 using OrchardCore.Json;
 
-namespace OrchardCore.AdminMenu.Deployment
+namespace OrchardCore.AdminMenu.Deployment;
+
+public class AdminMenuDeploymentSource : IDeploymentSource
 {
-    public class AdminMenuDeploymentSource : IDeploymentSource
+    private readonly IAdminMenuService _adminMenuService;
+    private readonly JsonSerializerOptions _serializationOptions;
+
+    public AdminMenuDeploymentSource(IAdminMenuService adminMenuService,
+        IOptions<DocumentJsonSerializerOptions> serializationOptions)
+    {
+        _adminMenuService = adminMenuService;
+        _serializationOptions = serializationOptions.Value.SerializerOptions;
+    }
+
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
     {
-        private readonly IAdminMenuService _adminMenuService;
-        private readonly JsonSerializerOptions _serializationOptions;
+        var adminMenuStep = step as AdminMenuDeploymentStep;
 
-        public AdminMenuDeploymentSource(IAdminMenuService adminMenuService,
-            IOptions<DocumentJsonSerializerOptions> serializationOptions)
+        if (adminMenuStep == null)
         {
-            _adminMenuService = adminMenuService;
-            _serializationOptions = serializationOptions.Value.SerializerOptions;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        var data = new JsonArray();
+        result.Steps.Add(new JsonObject
         {
-            var adminMenuStep = step as AdminMenuDeploymentStep;
-
-            if (adminMenuStep == null)
-            {
-                return;
-            }
-
-            var data = new JsonArray();
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "AdminMenu",
-                ["data"] = data,
-            });
-
-            foreach (var adminMenu in (await _adminMenuService.GetAdminMenuListAsync()).AdminMenu)
-            {
-                var objectData = JObject.FromObject(adminMenu, _serializationOptions);
-                data.Add(objectData);
-            }
+            ["name"] = "AdminMenu",
+            ["data"] = data,
+        });
 
-            return;
+        foreach (var adminMenu in (await _adminMenuService.GetAdminMenuListAsync()).AdminMenu)
+        {
+            var objectData = JObject.FromObject(adminMenu, _serializationOptions);
+            data.Add(objectData);
         }
+
+        return;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Deployment/AdminMenuDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Deployment/AdminMenuDeploymentStep.cs
index 213fec69df6..834535ec055 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Deployment/AdminMenuDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Deployment/AdminMenuDeploymentStep.cs
@@ -1,15 +1,14 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.AdminMenu.Deployment
+namespace OrchardCore.AdminMenu.Deployment;
+
+/// <summary>
+/// Adds all admin menus to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class AdminMenuDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds all admin menus to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class AdminMenuDeploymentStep : DeploymentStep
+    public AdminMenuDeploymentStep()
     {
-        public AdminMenuDeploymentStep()
-        {
-            Name = "AdminMenu";
-        }
+        Name = "AdminMenu";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Deployment/AdminMenuDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Deployment/AdminMenuDeploymentStepDriver.cs
index 1704d77ec50..1d93d456a62 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Deployment/AdminMenuDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Deployment/AdminMenuDeploymentStepDriver.cs
@@ -3,22 +3,21 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.AdminMenu.Deployment
+namespace OrchardCore.AdminMenu.Deployment;
+
+public sealed class AdminMenuDeploymentStepDriver : DisplayDriver<DeploymentStep, AdminMenuDeploymentStep>
 {
-    public sealed class AdminMenuDeploymentStepDriver : DisplayDriver<DeploymentStep, AdminMenuDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(AdminMenuDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(AdminMenuDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("AdminMenuDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("AdminMenuDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("AdminMenuDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("AdminMenuDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(AdminMenuDeploymentStep step, BuildEditorContext context)
-        {
-            return View("AdminMenuDeploymentStep_Fields_Edit", step).Location("Content");
-        }
+    public override IDisplayResult Edit(AdminMenuDeploymentStep step, BuildEditorContext context)
+    {
+        return View("AdminMenuDeploymentStep_Fields_Edit", step).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Models/AdminMenuList.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Models/AdminMenuList.cs
index a9f30621d85..b9e58b2fb14 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Models/AdminMenuList.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Models/AdminMenuList.cs
@@ -1,13 +1,12 @@
 using System.Collections.Generic;
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.AdminMenu.Models
+namespace OrchardCore.AdminMenu.Models;
+
+/// <summary>
+/// The list of all the AdminMenu stored on the system.
+/// </summary>
+public class AdminMenuList : Document
 {
-    /// <summary>
-    /// The list of all the AdminMenu stored on the system.
-    /// </summary>
-    public class AdminMenuList : Document
-    {
-        public List<AdminMenu> AdminMenu { get; set; } = [];
-    }
+    public List<AdminMenu> AdminMenu { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Recipes/AdminMenuStep.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Recipes/AdminMenuStep.cs
index f0fc4e30796..6ea3b102f05 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Recipes/AdminMenuStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Recipes/AdminMenuStep.cs
@@ -9,54 +9,53 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.AdminMenu.Recipes
+namespace OrchardCore.AdminMenu.Recipes;
+
+/// <summary>
+/// This recipe step creates a set of admin menus.
+/// </summary>
+public sealed class AdminMenuStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step creates a set of admin menus.
-    /// </summary>
-    public sealed class AdminMenuStep : IRecipeStepHandler
+    private readonly IAdminMenuService _adminMenuService;
+    private readonly JsonSerializerOptions _serializationOptions;
+
+    public AdminMenuStep(
+        IAdminMenuService adminMenuService,
+        IOptions<DocumentJsonSerializerOptions> serializationOptions)
     {
-        private readonly IAdminMenuService _adminMenuService;
-        private readonly JsonSerializerOptions _serializationOptions;
+        _adminMenuService = adminMenuService;
 
-        public AdminMenuStep(
-            IAdminMenuService adminMenuService,
-            IOptions<DocumentJsonSerializerOptions> serializationOptions)
-        {
-            _adminMenuService = adminMenuService;
+        // The recipe step contains polymorphic types (menu items) which need to be resolved
+        _serializationOptions = serializationOptions.Value.SerializerOptions;
+    }
 
-            // The recipe step contains polymorphic types (menu items) which need to be resolved
-            _serializationOptions = serializationOptions.Value.SerializerOptions;
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "AdminMenu", StringComparison.OrdinalIgnoreCase))
+        {
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, "AdminMenu", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
+        var model = context.Step.ToObject<AdminMenuStepModel>(_serializationOptions);
 
-            var model = context.Step.ToObject<AdminMenuStepModel>(_serializationOptions);
+        foreach (var token in model.Data.Cast<JsonObject>())
+        {
+            var adminMenu = token.ToObject<Models.AdminMenu>(_serializationOptions);
 
-            foreach (var token in model.Data.Cast<JsonObject>())
+            // When the id is not supplied generate an id, otherwise replace the menu if it exists, or create a new menu.
+            if (string.IsNullOrEmpty(adminMenu.Id))
             {
-                var adminMenu = token.ToObject<Models.AdminMenu>(_serializationOptions);
-
-                // When the id is not supplied generate an id, otherwise replace the menu if it exists, or create a new menu.
-                if (string.IsNullOrEmpty(adminMenu.Id))
-                {
-                    adminMenu.Id = IdGenerator.GenerateId();
-                }
-
-                await _adminMenuService.SaveAsync(adminMenu);
+                adminMenu.Id = IdGenerator.GenerateId();
             }
 
-            return;
+            await _adminMenuService.SaveAsync(adminMenu);
         }
-    }
 
-    public class AdminMenuStepModel
-    {
-        public JsonArray Data { get; set; }
+        return;
     }
 }
+
+public class AdminMenuStepModel
+{
+    public JsonArray Data { get; set; }
+}
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/AdminMenuNavigationProvidersCoordinator.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/AdminMenuNavigationProvidersCoordinator.cs
index 0568e3d24ae..ed4e778e283 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/AdminMenuNavigationProvidersCoordinator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/AdminMenuNavigationProvidersCoordinator.cs
@@ -6,70 +6,69 @@
 using Microsoft.Extensions.Logging;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.AdminMenu.Services
+namespace OrchardCore.AdminMenu.Services;
+
+// Retrieves all instances of 'IAdminNodeNavigationBuilder'.
+// Those are classes that add new 'AdminNodes' to a 'NavigationBuilder' using custom logic specific to the module that register them.
+// This class handles their inclusion on the admin menu.
+// This class is itself one more 'INavigationProvider' so it can be called from this module's AdminMenu.cs.
+public sealed class AdminMenuNavigationProvidersCoordinator : INavigationProvider
 {
-    // Retrieves all instances of 'IAdminNodeNavigationBuilder'.
-    // Those are classes that add new 'AdminNodes' to a 'NavigationBuilder' using custom logic specific to the module that register them.
-    // This class handles their inclusion on the admin menu.
-    // This class is itself one more 'INavigationProvider' so it can be called from this module's AdminMenu.cs.
-    public sealed class AdminMenuNavigationProvidersCoordinator : INavigationProvider
+    private readonly IAdminMenuService _adminMenuService;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IEnumerable<IAdminNodeNavigationBuilder> _nodeBuilders;
+    private readonly ILogger _logger;
+
+    public AdminMenuNavigationProvidersCoordinator(
+        IAdminMenuService adminMenuService,
+        IAuthorizationService authorizationService,
+        IHttpContextAccessor httpContextAccessor,
+        IEnumerable<IAdminNodeNavigationBuilder> nodeBuilders,
+        ILogger<AdminMenuNavigationProvidersCoordinator> logger)
     {
-        private readonly IAdminMenuService _adminMenuService;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IEnumerable<IAdminNodeNavigationBuilder> _nodeBuilders;
-        private readonly ILogger _logger;
+        _adminMenuService = adminMenuService;
+        _authorizationService = authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+        _nodeBuilders = nodeBuilders;
+        _logger = logger;
+    }
 
-        public AdminMenuNavigationProvidersCoordinator(
-            IAdminMenuService adminMenuService,
-            IAuthorizationService authorizationService,
-            IHttpContextAccessor httpContextAccessor,
-            IEnumerable<IAdminNodeNavigationBuilder> nodeBuilders,
-            ILogger<AdminMenuNavigationProvidersCoordinator> logger)
+    public async Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        // We only add them if the caller uses the string "adminMenu".
+        if (name != NavigationConstants.AdminMenuId)
         {
-            _adminMenuService = adminMenuService;
-            _authorizationService = authorizationService;
-            _httpContextAccessor = httpContextAccessor;
-            _nodeBuilders = nodeBuilders;
-            _logger = logger;
+            return;
         }
 
-        public async Task BuildNavigationAsync(string name, NavigationBuilder builder)
+        var trees = (await _adminMenuService.GetAdminMenuListAsync())
+            .AdminMenu.Where(m => m.Enabled && m.MenuItems.Count > 0);
+
+        foreach (var tree in trees)
         {
-            // We only add them if the caller uses the string "adminMenu".
-            if (name != NavigationConstants.AdminMenuId)
+            if (await _authorizationService.AuthorizeAsync(
+                _httpContextAccessor.HttpContext?.User,
+                Permissions.CreatePermissionForAdminMenu(tree.Name)))
             {
-                return;
+                await BuildTreeAsync(tree, builder);
             }
+        }
+    }
 
-            var trees = (await _adminMenuService.GetAdminMenuListAsync())
-                .AdminMenu.Where(m => m.Enabled && m.MenuItems.Count > 0);
+    private async Task BuildTreeAsync(Models.AdminMenu tree, NavigationBuilder builder)
+    {
+        foreach (var node in tree.MenuItems)
+        {
+            var nodeBuilder = _nodeBuilders.FirstOrDefault(x => x.Name == node.GetType().Name);
 
-            foreach (var tree in trees)
+            if (nodeBuilder != null)
             {
-                if (await _authorizationService.AuthorizeAsync(
-                    _httpContextAccessor.HttpContext?.User,
-                    Permissions.CreatePermissionForAdminMenu(tree.Name)))
-                {
-                    await BuildTreeAsync(tree, builder);
-                }
+                await nodeBuilder.BuildNavigationAsync(node, builder, _nodeBuilders);
             }
-        }
-
-        private async Task BuildTreeAsync(Models.AdminMenu tree, NavigationBuilder builder)
-        {
-            foreach (var node in tree.MenuItems)
+            else
             {
-                var nodeBuilder = _nodeBuilders.FirstOrDefault(x => x.Name == node.GetType().Name);
-
-                if (nodeBuilder != null)
-                {
-                    await nodeBuilder.BuildNavigationAsync(node, builder, _nodeBuilders);
-                }
-                else
-                {
-                    _logger.LogError("No Builder registered for admin node of type '{TreeNodeName}'", node.GetType().Name);
-                }
+                _logger.LogError("No Builder registered for admin node of type '{TreeNodeName}'", node.GetType().Name);
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/AdminMenuService.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/AdminMenuService.cs
index 6eec990cb21..97e14ef9ded 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/AdminMenuService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/AdminMenuService.cs
@@ -4,58 +4,57 @@
 using OrchardCore.AdminMenu.Models;
 using OrchardCore.Documents;
 
-namespace OrchardCore.AdminMenu.Services
+namespace OrchardCore.AdminMenu.Services;
+
+public class AdminMenuService : IAdminMenuService
 {
-    public class AdminMenuService : IAdminMenuService
-    {
-        private readonly IDocumentManager<AdminMenuList> _documentManager;
+    private readonly IDocumentManager<AdminMenuList> _documentManager;
 
-        public AdminMenuService(IDocumentManager<AdminMenuList> documentManager) => _documentManager = documentManager;
+    public AdminMenuService(IDocumentManager<AdminMenuList> documentManager) => _documentManager = documentManager;
 
-        /// <summary>
-        /// Loads the admin menus from the store for updating and that should not be cached.
-        /// </summary>
-        public Task<AdminMenuList> LoadAdminMenuListAsync() => _documentManager.GetOrCreateMutableAsync();
+    /// <summary>
+    /// Loads the admin menus from the store for updating and that should not be cached.
+    /// </summary>
+    public Task<AdminMenuList> LoadAdminMenuListAsync() => _documentManager.GetOrCreateMutableAsync();
 
-        /// <summary>
-        /// Gets the admin menus from the cache for sharing and that should not be updated.
-        /// </summary>
-        public Task<AdminMenuList> GetAdminMenuListAsync() => _documentManager.GetOrCreateImmutableAsync();
+    /// <summary>
+    /// Gets the admin menus from the cache for sharing and that should not be updated.
+    /// </summary>
+    public Task<AdminMenuList> GetAdminMenuListAsync() => _documentManager.GetOrCreateImmutableAsync();
+
+    public async Task SaveAsync(Models.AdminMenu tree)
+    {
+        var adminMenuList = await LoadAdminMenuListAsync();
 
-        public async Task SaveAsync(Models.AdminMenu tree)
+        var preexisting = adminMenuList.AdminMenu.FirstOrDefault(x => string.Equals(x.Id, tree.Id, StringComparison.OrdinalIgnoreCase));
+
+        // it's new? add it
+        if (preexisting == null)
         {
-            var adminMenuList = await LoadAdminMenuListAsync();
-
-            var preexisting = adminMenuList.AdminMenu.FirstOrDefault(x => string.Equals(x.Id, tree.Id, StringComparison.OrdinalIgnoreCase));
-
-            // it's new? add it
-            if (preexisting == null)
-            {
-                adminMenuList.AdminMenu.Add(tree);
-            }
-            else // not new: replace it
-            {
-                var index = adminMenuList.AdminMenu.IndexOf(preexisting);
-                adminMenuList.AdminMenu[index] = tree;
-            }
-
-            await _documentManager.UpdateAsync(adminMenuList);
+            adminMenuList.AdminMenu.Add(tree);
         }
-
-        public Models.AdminMenu GetAdminMenuById(AdminMenuList adminMenuList, string id)
+        else // not new: replace it
         {
-            return adminMenuList.AdminMenu.FirstOrDefault(x => string.Equals(x.Id, id, StringComparison.OrdinalIgnoreCase));
+            var index = adminMenuList.AdminMenu.IndexOf(preexisting);
+            adminMenuList.AdminMenu[index] = tree;
         }
 
-        public async Task<int> DeleteAsync(Models.AdminMenu tree)
-        {
-            var adminMenuList = await LoadAdminMenuListAsync();
+        await _documentManager.UpdateAsync(adminMenuList);
+    }
 
-            var count = adminMenuList.AdminMenu.RemoveAll(x => string.Equals(x.Id, tree.Id, StringComparison.OrdinalIgnoreCase));
+    public Models.AdminMenu GetAdminMenuById(AdminMenuList adminMenuList, string id)
+    {
+        return adminMenuList.AdminMenu.FirstOrDefault(x => string.Equals(x.Id, id, StringComparison.OrdinalIgnoreCase));
+    }
 
-            await _documentManager.UpdateAsync(adminMenuList);
+    public async Task<int> DeleteAsync(Models.AdminMenu tree)
+    {
+        var adminMenuList = await LoadAdminMenuListAsync();
 
-            return count;
-        }
+        var count = adminMenuList.AdminMenu.RemoveAll(x => string.Equals(x.Id, tree.Id, StringComparison.OrdinalIgnoreCase));
+
+        await _documentManager.UpdateAsync(adminMenuList);
+
+        return count;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/IAdminMenuService.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/IAdminMenuService.cs
index 614ad53e5e9..37a6d2b0046 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/IAdminMenuService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/IAdminMenuService.cs
@@ -1,39 +1,38 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.AdminMenu.Services
+namespace OrchardCore.AdminMenu.Services;
+
+/// <summary>
+/// Provides services to manage the admin menus.
+/// </summary>
+public interface IAdminMenuService
 {
     /// <summary>
-    /// Provides services to manage the admin menus.
+    /// Loads the admin menus from the store for updating and that should not be cached.
     /// </summary>
-    public interface IAdminMenuService
-    {
-        /// <summary>
-        /// Loads the admin menus from the store for updating and that should not be cached.
-        /// </summary>
-        Task<Models.AdminMenuList> LoadAdminMenuListAsync();
+    Task<Models.AdminMenuList> LoadAdminMenuListAsync();
 
-        /// <summary>
-        /// Gets the admin menus from the cache for sharing and that should not be updated.
-        /// </summary>
-        Task<Models.AdminMenuList> GetAdminMenuListAsync();
+    /// <summary>
+    /// Gets the admin menus from the cache for sharing and that should not be updated.
+    /// </summary>
+    Task<Models.AdminMenuList> GetAdminMenuListAsync();
 
-        /// <summary>
-        /// Persist an admin menu.
-        /// </summary>
-        /// <param name="tree"></param>
-        /// <returns></returns>
-        Task SaveAsync(Models.AdminMenu tree);
+    /// <summary>
+    /// Persist an admin menu.
+    /// </summary>
+    /// <param name="tree"></param>
+    /// <returns></returns>
+    Task SaveAsync(Models.AdminMenu tree);
 
-        /// <summary>
-        /// Returns an admin menu.
-        /// </summary>
-        Models.AdminMenu GetAdminMenuById(Models.AdminMenuList adminMenuList, string id);
+    /// <summary>
+    /// Returns an admin menu.
+    /// </summary>
+    Models.AdminMenu GetAdminMenuById(Models.AdminMenuList adminMenuList, string id);
 
-        /// <summary>
-        /// Deletes an admin menu.
-        /// </summary>
-        /// <param name="tree"></param>
-        /// <returns>The count of deleted items.</returns>
-        Task<int> DeleteAsync(Models.AdminMenu tree);
-    }
+    /// <summary>
+    /// Deletes an admin menu.
+    /// </summary>
+    /// <param name="tree"></param>
+    /// <returns>The count of deleted items.</returns>
+    Task<int> DeleteAsync(Models.AdminMenu tree);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Startup.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Startup.cs
index 2b2099f5f02..9a639e053c4 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Startup.cs
@@ -9,28 +9,27 @@
 using OrchardCore.Recipes;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.AdminMenu
+namespace OrchardCore.AdminMenu;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IAdminMenuPermissionService, AdminMenuPermissionService>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IAdminMenuPermissionService, AdminMenuPermissionService>();
 
-            services.AddScoped<IAdminMenuService, AdminMenuService>();
-            services.AddScoped<AdminMenuNavigationProvidersCoordinator>();
+        services.AddScoped<IAdminMenuService, AdminMenuService>();
+        services.AddScoped<AdminMenuNavigationProvidersCoordinator>();
 
-            services.AddRecipeExecutionStep<AdminMenuStep>();
+        services.AddRecipeExecutionStep<AdminMenuStep>();
 
-            services.AddDeployment<AdminMenuDeploymentSource, AdminMenuDeploymentStep, AdminMenuDeploymentStepDriver>();
+        services.AddDeployment<AdminMenuDeploymentSource, AdminMenuDeploymentStep, AdminMenuDeploymentStepDriver>();
 
-            // placeholder treeNode
-            services.AddAdminNode<PlaceholderAdminNode, PlaceholderAdminNodeNavigationBuilder, PlaceholderAdminNodeDriver>();
+        // placeholder treeNode
+        services.AddAdminNode<PlaceholderAdminNode, PlaceholderAdminNodeNavigationBuilder, PlaceholderAdminNodeDriver>();
 
-            // link treeNode
-            services.AddAdminNode<LinkAdminNode, LinkAdminNodeNavigationBuilder, LinkAdminNodeDriver>();
-        }
+        // link treeNode
+        services.AddAdminNode<LinkAdminNode, LinkAdminNodeNavigationBuilder, LinkAdminNodeDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminMenuCreateViewModel.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminMenuCreateViewModel.cs
index 54292c428e4..ce360f15f4c 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminMenuCreateViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminMenuCreateViewModel.cs
@@ -1,10 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.AdminMenu.ViewModels
+namespace OrchardCore.AdminMenu.ViewModels;
+
+public class AdminMenuCreateViewModel
 {
-    public class AdminMenuCreateViewModel
-    {
-        [Required]
-        public string Name { get; set; }
-    }
+    [Required]
+    public string Name { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminMenuEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminMenuEditViewModel.cs
index 0478a97a188..823f9cebc67 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminMenuEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminMenuEditViewModel.cs
@@ -1,12 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.AdminMenu.ViewModels
+namespace OrchardCore.AdminMenu.ViewModels;
+
+public class AdminMenuEditViewModel
 {
-    public class AdminMenuEditViewModel
-    {
-        public string Id { get; set; }
+    public string Id { get; set; }
 
-        [Required]
-        public string Name { get; set; }
-    }
+    [Required]
+    public string Name { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminMenuListViewModel.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminMenuListViewModel.cs
index 965d97f926c..9ea3bfb0c81 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminMenuListViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminMenuListViewModel.cs
@@ -2,37 +2,36 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.AdminMenu.ViewModels
+namespace OrchardCore.AdminMenu.ViewModels;
+
+public class AdminMenuListViewModel
+{
+    public IList<AdminMenuEntry> AdminMenu { get; set; }
+    public ContentOptions Options { get; set; } = new ContentOptions();
+    public dynamic Pager { get; set; }
+}
+
+public class AdminMenuEntry
+{
+    public Models.AdminMenu AdminMenu { get; set; }
+    public bool IsChecked { get; set; }
+}
+
+public class ContentOptions
+{
+    public string Search { get; set; }
+    public ContentsBulkAction BulkAction { get; set; }
+
+    #region Lists to populate
+
+    [BindNever]
+    public List<SelectListItem> ContentsBulkAction { get; set; }
+
+    #endregion Lists to populate
+}
+
+public enum ContentsBulkAction
 {
-    public class AdminMenuListViewModel
-    {
-        public IList<AdminMenuEntry> AdminMenu { get; set; }
-        public ContentOptions Options { get; set; } = new ContentOptions();
-        public dynamic Pager { get; set; }
-    }
-
-    public class AdminMenuEntry
-    {
-        public Models.AdminMenu AdminMenu { get; set; }
-        public bool IsChecked { get; set; }
-    }
-
-    public class ContentOptions
-    {
-        public string Search { get; set; }
-        public ContentsBulkAction BulkAction { get; set; }
-
-        #region Lists to populate
-
-        [BindNever]
-        public List<SelectListItem> ContentsBulkAction { get; set; }
-
-        #endregion Lists to populate
-    }
-
-    public enum ContentsBulkAction
-    {
-        None,
-        Remove
-    }
+    None,
+    Remove
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminNodeEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminNodeEditViewModel.cs
index 294f97ba1bd..8ee2c8c1cff 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminNodeEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminNodeEditViewModel.cs
@@ -1,20 +1,19 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.AdminMenu.Models;
 
-namespace OrchardCore.AdminMenu.ViewModels
+namespace OrchardCore.AdminMenu.ViewModels;
+
+public class AdminNodeEditViewModel
 {
-    public class AdminNodeEditViewModel
-    {
-        public string AdminMenuId { get; set; }
-        public string AdminNodeId { get; set; }
-        public string AdminNodeType { get; set; }
+    public string AdminMenuId { get; set; }
+    public string AdminNodeId { get; set; }
+    public string AdminNodeType { get; set; }
 
-        public int Priority { get; set; }
-        public string Position { get; set; }
+    public int Priority { get; set; }
+    public string Position { get; set; }
 
-        public dynamic Editor { get; set; }
+    public dynamic Editor { get; set; }
 
-        [BindNever]
-        public AdminNode AdminNode { get; set; }
-    }
+    [BindNever]
+    public AdminNode AdminNode { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminNodeListViewModel.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminNodeListViewModel.cs
index d2f084a5b21..2200f1303cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminNodeListViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/ViewModels/AdminNodeListViewModel.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.AdminMenu.ViewModels
+namespace OrchardCore.AdminMenu.ViewModels;
+
+public class AdminNodeListViewModel
 {
-    public class AdminNodeListViewModel
-    {
-        public Models.AdminMenu AdminMenu { get; set; }
-        public IDictionary<string, dynamic> Thumbnails { get; set; }
-    }
+    public Models.AdminMenu AdminMenu { get; set; }
+    public IDictionary<string, dynamic> Thumbnails { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/Drivers/AliasPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Alias/Drivers/AliasPartDisplayDriver.cs
index dbaa430ff9c..b50cce1f4dd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/Drivers/AliasPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/Drivers/AliasPartDisplayDriver.cs
@@ -9,46 +9,45 @@
 using OrchardCore.Mvc.ModelBinding;
 using YesSql;
 
-namespace OrchardCore.Alias.Drivers
+namespace OrchardCore.Alias.Drivers;
+
+public sealed class AliasPartDisplayDriver : ContentPartDisplayDriver<AliasPart>
 {
-    public sealed class AliasPartDisplayDriver : ContentPartDisplayDriver<AliasPart>
+    private readonly ISession _session;
+
+    internal readonly IStringLocalizer S;
+
+    public AliasPartDisplayDriver(
+        ISession session,
+        IStringLocalizer<AliasPartDisplayDriver> localizer
+    )
     {
-        private readonly ISession _session;
+        _session = session;
+        S = localizer;
+    }
 
-        internal readonly IStringLocalizer S;
+    public override IDisplayResult Edit(AliasPart aliasPart, BuildPartEditorContext context)
+    {
+        return Initialize<AliasPartViewModel>(GetEditorShapeType(context), m => BuildViewModel(m, aliasPart, context.TypePartDefinition.GetSettings<AliasPartSettings>()));
+    }
 
-        public AliasPartDisplayDriver(
-            ISession session,
-            IStringLocalizer<AliasPartDisplayDriver> localizer
-        )
-        {
-            _session = session;
-            S = localizer;
-        }
+    public override async Task<IDisplayResult> UpdateAsync(AliasPart model, UpdatePartEditorContext context)
+    {
+        await context.Updater.TryUpdateModelAsync(model, Prefix, t => t.Alias);
 
-        public override IDisplayResult Edit(AliasPart aliasPart, BuildPartEditorContext context)
+        await foreach (var item in model.ValidateAsync(S, _session))
         {
-            return Initialize<AliasPartViewModel>(GetEditorShapeType(context), m => BuildViewModel(m, aliasPart, context.TypePartDefinition.GetSettings<AliasPartSettings>()));
+            context.Updater.ModelState.BindValidationResult(Prefix, item);
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(AliasPart model, UpdatePartEditorContext context)
-        {
-            await context.Updater.TryUpdateModelAsync(model, Prefix, t => t.Alias);
-
-            await foreach (var item in model.ValidateAsync(S, _session))
-            {
-                context.Updater.ModelState.BindValidationResult(Prefix, item);
-            }
-
-            return Edit(model, context);
-        }
+        return Edit(model, context);
+    }
 
-        private static void BuildViewModel(AliasPartViewModel model, AliasPart part, AliasPartSettings settings)
-        {
-            model.Alias = part.Alias;
-            model.AliasPart = part;
-            model.ContentItem = part.ContentItem;
-            model.Settings = settings;
-        }
+    private static void BuildViewModel(AliasPartViewModel model, AliasPart part, AliasPartSettings settings)
+    {
+        model.Alias = part.Alias;
+        model.AliasPart = part;
+        model.ContentItem = part.ContentItem;
+        model.Settings = settings;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/AliasInputObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/AliasInputObjectType.cs
index 29781175cf6..e6f61ee738e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/AliasInputObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/AliasInputObjectType.cs
@@ -3,16 +3,15 @@
 using OrchardCore.Alias.Models;
 using OrchardCore.Apis.GraphQL.Queries;
 
-namespace OrchardCore.Alias.GraphQL
+namespace OrchardCore.Alias.GraphQL;
+
+public class AliasInputObjectType : WhereInputObjectGraphType<AliasPart>
 {
-    public class AliasInputObjectType : WhereInputObjectGraphType<AliasPart>
+    public AliasInputObjectType(IStringLocalizer<AliasInputObjectType> S)
     {
-        public AliasInputObjectType(IStringLocalizer<AliasInputObjectType> S)
-        {
-            Name = "AliasPartInput";
-            Description = S["the alias part of the content item"];
+        Name = "AliasPartInput";
+        Description = S["the alias part of the content item"];
 
-            AddScalarFilterFields<StringGraphType>("alias", S["the alias of the content item"]);
-        }
+        AddScalarFilterFields<StringGraphType>("alias", S["the alias of the content item"]);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/AliasPartIndexAliasProvider.cs b/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/AliasPartIndexAliasProvider.cs
index 3e6b18dc6ae..75612939d6b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/AliasPartIndexAliasProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/AliasPartIndexAliasProvider.cs
@@ -3,23 +3,22 @@
 using OrchardCore.Alias.Indexes;
 using OrchardCore.ContentManagement.GraphQL.Queries;
 
-namespace OrchardCore.Alias.GraphQL
-{
-    public class AliasPartIndexAliasProvider : IIndexAliasProvider
-    {
-        private static readonly IndexAlias[] _aliases =
-        [
-            new IndexAlias
-            {
-                Alias = "aliasPart",
-                Index = "AliasPartIndex",
-                IndexType = typeof(AliasPartIndex)
-            }
-        ];
+namespace OrchardCore.Alias.GraphQL;
 
-        public ValueTask<IEnumerable<IndexAlias>> GetAliasesAsync()
+public class AliasPartIndexAliasProvider : IIndexAliasProvider
+{
+    private static readonly IndexAlias[] _aliases =
+    [
+        new IndexAlias
         {
-            return ValueTask.FromResult<IEnumerable<IndexAlias>>(_aliases);
+            Alias = "aliasPart",
+            Index = "AliasPartIndex",
+            IndexType = typeof(AliasPartIndex)
         }
+    ];
+
+    public ValueTask<IEnumerable<IndexAlias>> GetAliasesAsync()
+    {
+        return ValueTask.FromResult<IEnumerable<IndexAlias>>(_aliases);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/AliasQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/AliasQueryObjectType.cs
index 4b4c635966e..0ef09ae31f2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/AliasQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/AliasQueryObjectType.cs
@@ -2,16 +2,15 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Alias.Models;
 
-namespace OrchardCore.Alias.GraphQL
+namespace OrchardCore.Alias.GraphQL;
+
+public class AliasQueryObjectType : ObjectGraphType<AliasPart>
 {
-    public class AliasQueryObjectType : ObjectGraphType<AliasPart>
+    public AliasQueryObjectType(IStringLocalizer<AliasQueryObjectType> S)
     {
-        public AliasQueryObjectType(IStringLocalizer<AliasQueryObjectType> S)
-        {
-            Name = "AliasPart";
-            Description = S["Alternative path for the content item"];
+        Name = "AliasPart";
+        Description = S["Alternative path for the content item"];
 
-            Field("alias", x => x.Alias, true);
-        }
+        Field("alias", x => x.Alias, true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/Startup.cs
index a52c2196878..ac5587c2b82 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/Startup.cs
@@ -6,17 +6,16 @@
 using OrchardCore.ContentManagement.GraphQL.Queries;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Alias.GraphQL
+namespace OrchardCore.Alias.GraphQL;
+
+[RequireFeatures("OrchardCore.Apis.GraphQL")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Apis.GraphQL")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddObjectGraphType<AliasPart, AliasQueryObjectType>();
-            services.AddInputObjectGraphType<AliasPart, AliasInputObjectType>();
-            services.AddTransient<IIndexAliasProvider, AliasPartIndexAliasProvider>();
-            services.AddWhereInputIndexPropertyProvider<AliasPartIndex>();
-        }
+        services.AddObjectGraphType<AliasPart, AliasQueryObjectType>();
+        services.AddInputObjectGraphType<AliasPart, AliasInputObjectType>();
+        services.AddTransient<IIndexAliasProvider, AliasPartIndexAliasProvider>();
+        services.AddWhereInputIndexPropertyProvider<AliasPartIndex>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/Handlers/AliasPartHandler.cs b/src/OrchardCore.Modules/OrchardCore.Alias/Handlers/AliasPartHandler.cs
index e3cf7c4210c..437e4dd3395 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/Handlers/AliasPartHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/Handlers/AliasPartHandler.cs
@@ -15,147 +15,146 @@
 using OrchardCore.Liquid;
 using YesSql;
 
-namespace OrchardCore.Alias.Handlers
+namespace OrchardCore.Alias.Handlers;
+
+public class AliasPartHandler : ContentPartHandler<AliasPart>
 {
-    public class AliasPartHandler : ContentPartHandler<AliasPart>
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ITagCache _tagCache;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly ISession _session;
+    protected readonly IStringLocalizer S;
+
+    public AliasPartHandler(
+        IContentDefinitionManager contentDefinitionManager,
+        ITagCache tagCache,
+        ILiquidTemplateManager liquidTemplateManager,
+        ISession session,
+        IStringLocalizer<AliasPartHandler> stringLocalizer)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+        _tagCache = tagCache;
+        _liquidTemplateManager = liquidTemplateManager;
+        _session = session;
+        S = stringLocalizer;
+    }
+
+    public override async Task ValidatingAsync(ValidateContentContext context, AliasPart part)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly ITagCache _tagCache;
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly ISession _session;
-        protected readonly IStringLocalizer S;
-
-        public AliasPartHandler(
-            IContentDefinitionManager contentDefinitionManager,
-            ITagCache tagCache,
-            ILiquidTemplateManager liquidTemplateManager,
-            ISession session,
-            IStringLocalizer<AliasPartHandler> stringLocalizer)
+        // Only validate the alias if it's not empty.
+        if (string.IsNullOrWhiteSpace(part.Alias))
         {
-            _contentDefinitionManager = contentDefinitionManager;
-            _tagCache = tagCache;
-            _liquidTemplateManager = liquidTemplateManager;
-            _session = session;
-            S = stringLocalizer;
+            return;
         }
 
-        public override async Task ValidatingAsync(ValidateContentContext context, AliasPart part)
+        await foreach (var item in part.ValidateAsync(S, _session))
         {
-            // Only validate the alias if it's not empty.
-            if (string.IsNullOrWhiteSpace(part.Alias))
-            {
-                return;
-            }
-
-            await foreach (var item in part.ValidateAsync(S, _session))
-            {
-                context.Fail(item);
-            }
+            context.Fail(item);
         }
+    }
 
-        public async override Task UpdatedAsync(UpdateContentContext context, AliasPart part)
+    public async override Task UpdatedAsync(UpdateContentContext context, AliasPart part)
+    {
+        // Compute the Alias only if it's empty.
+        if (!string.IsNullOrEmpty(part.Alias))
         {
-            // Compute the Alias only if it's empty.
-            if (!string.IsNullOrEmpty(part.Alias))
-            {
-                return;
-            }
+            return;
+        }
 
-            var pattern = await GetPatternAsync(part);
+        var pattern = await GetPatternAsync(part);
 
-            if (!string.IsNullOrEmpty(pattern))
+        if (!string.IsNullOrEmpty(pattern))
+        {
+            var model = new AliasPartViewModel()
             {
-                var model = new AliasPartViewModel()
-                {
-                    Alias = part.Alias,
-                    AliasPart = part,
-                    ContentItem = part.ContentItem
-                };
+                Alias = part.Alias,
+                AliasPart = part,
+                ContentItem = part.ContentItem
+            };
 
-                part.Alias = await _liquidTemplateManager.RenderStringAsync(pattern, NullEncoder.Default, model,
-                    new Dictionary<string, FluidValue>() { [nameof(ContentItem)] = new ObjectValue(model.ContentItem) });
+            part.Alias = await _liquidTemplateManager.RenderStringAsync(pattern, NullEncoder.Default, model,
+                new Dictionary<string, FluidValue>() { [nameof(ContentItem)] = new ObjectValue(model.ContentItem) });
 
-                part.Alias = part.Alias.Replace("\r", string.Empty).Replace("\n", string.Empty);
+            part.Alias = part.Alias.Replace("\r", string.Empty).Replace("\n", string.Empty);
 
-                if (part.Alias?.Length > AliasPart.MaxAliasLength)
-                {
-                    part.Alias = part.Alias[..AliasPart.MaxAliasLength];
-                }
-
-                if (!await part.IsAliasUniqueAsync(_session, part.Alias))
-                {
-                    part.Alias = await GenerateUniqueAliasAsync(part.Alias, part);
-                }
-
-                part.Apply();
+            if (part.Alias?.Length > AliasPart.MaxAliasLength)
+            {
+                part.Alias = part.Alias[..AliasPart.MaxAliasLength];
             }
-        }
-
-        public override Task PublishedAsync(PublishContentContext context, AliasPart instance)
-        {
-            return _tagCache.RemoveTagAsync($"alias:{instance.Alias}");
-        }
 
-        public override Task RemovedAsync(RemoveContentContext context, AliasPart instance)
-        {
-            if (context.NoActiveVersionLeft)
+            if (!await part.IsAliasUniqueAsync(_session, part.Alias))
             {
-                return _tagCache.RemoveTagAsync($"alias:{instance.Alias}");
+                part.Alias = await GenerateUniqueAliasAsync(part.Alias, part);
             }
 
-            return Task.CompletedTask;
+            part.Apply();
         }
+    }
+
+    public override Task PublishedAsync(PublishContentContext context, AliasPart instance)
+    {
+        return _tagCache.RemoveTagAsync($"alias:{instance.Alias}");
+    }
 
-        public override Task UnpublishedAsync(PublishContentContext context, AliasPart instance)
+    public override Task RemovedAsync(RemoveContentContext context, AliasPart instance)
+    {
+        if (context.NoActiveVersionLeft)
         {
             return _tagCache.RemoveTagAsync($"alias:{instance.Alias}");
         }
 
-        public override async Task CloningAsync(CloneContentContext context, AliasPart part)
-        {
-            var clonedPart = context.CloneContentItem.As<AliasPart>();
-            clonedPart.Alias = await GenerateUniqueAliasAsync(part.Alias, clonedPart);
+        return Task.CompletedTask;
+    }
 
-            clonedPart.Apply();
-        }
+    public override Task UnpublishedAsync(PublishContentContext context, AliasPart instance)
+    {
+        return _tagCache.RemoveTagAsync($"alias:{instance.Alias}");
+    }
 
-        /// <summary>
-        /// Get the pattern from the AliasPartSettings property for its type.
-        /// </summary>
-        private async Task<string> GetPatternAsync(AliasPart part)
-        {
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(part.ContentItem.ContentType);
-            var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, nameof(AliasPart), StringComparison.Ordinal));
-            var pattern = contentTypePartDefinition.GetSettings<AliasPartSettings>().Pattern;
+    public override async Task CloningAsync(CloneContentContext context, AliasPart part)
+    {
+        var clonedPart = context.CloneContentItem.As<AliasPart>();
+        clonedPart.Alias = await GenerateUniqueAliasAsync(part.Alias, clonedPart);
 
-            return pattern;
-        }
+        clonedPart.Apply();
+    }
 
-        private async Task<string> GenerateUniqueAliasAsync(string alias, AliasPart context)
+    /// <summary>
+    /// Get the pattern from the AliasPartSettings property for its type.
+    /// </summary>
+    private async Task<string> GetPatternAsync(AliasPart part)
+    {
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(part.ContentItem.ContentType);
+        var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, nameof(AliasPart), StringComparison.Ordinal));
+        var pattern = contentTypePartDefinition.GetSettings<AliasPartSettings>().Pattern;
+
+        return pattern;
+    }
+
+    private async Task<string> GenerateUniqueAliasAsync(string alias, AliasPart context)
+    {
+        var version = 1;
+        var unversionedAlias = alias;
+
+        var versionSeparatorPosition = alias.LastIndexOf('-');
+        if (versionSeparatorPosition > -1 && int.TryParse(alias[versionSeparatorPosition..].TrimStart('-'), out version))
         {
-            var version = 1;
-            var unversionedAlias = alias;
+            unversionedAlias = alias[..versionSeparatorPosition];
+        }
 
-            var versionSeparatorPosition = alias.LastIndexOf('-');
-            if (versionSeparatorPosition > -1 && int.TryParse(alias[versionSeparatorPosition..].TrimStart('-'), out version))
+        while (true)
+        {
+            // Unversioned length + separator char + version length.
+            var quantityCharactersToTrim = unversionedAlias.Length + 1 + version.ToString().Length - AliasPart.MaxAliasLength;
+            if (quantityCharactersToTrim > 0)
             {
-                unversionedAlias = alias[..versionSeparatorPosition];
+                unversionedAlias = unversionedAlias[..^quantityCharactersToTrim];
             }
 
-            while (true)
+            var versionedAlias = $"{unversionedAlias}-{version++}";
+            if (await context.IsAliasUniqueAsync(_session, versionedAlias))
             {
-                // Unversioned length + separator char + version length.
-                var quantityCharactersToTrim = unversionedAlias.Length + 1 + version.ToString().Length - AliasPart.MaxAliasLength;
-                if (quantityCharactersToTrim > 0)
-                {
-                    unversionedAlias = unversionedAlias[..^quantityCharactersToTrim];
-                }
-
-                var versionedAlias = $"{unversionedAlias}-{version++}";
-                if (await context.IsAliasUniqueAsync(_session, versionedAlias))
-                {
-                    return versionedAlias;
-                }
+                return versionedAlias;
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/Indexes/AliasPartIndex.cs b/src/OrchardCore.Modules/OrchardCore.Alias/Indexes/AliasPartIndex.cs
index 632d326e7b2..026182a6ff8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/Indexes/AliasPartIndex.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/Indexes/AliasPartIndex.cs
@@ -10,80 +10,79 @@
 using OrchardCore.Data;
 using YesSql.Indexes;
 
-namespace OrchardCore.Alias.Indexes
+namespace OrchardCore.Alias.Indexes;
+
+public class AliasPartIndex : MapIndex
 {
-    public class AliasPartIndex : MapIndex
+    public string ContentItemId { get; set; }
+    public string Alias { get; set; }
+    public bool Latest { get; set; }
+    public bool Published { get; set; }
+}
+
+public class AliasPartIndexProvider : ContentHandlerBase, IIndexProvider, IScopedIndexProvider
+{
+    private readonly IServiceProvider _serviceProvider;
+    private readonly HashSet<string> _partRemoved = [];
+    private IContentDefinitionManager _contentDefinitionManager;
+
+    public AliasPartIndexProvider(IServiceProvider serviceProvider)
     {
-        public string ContentItemId { get; set; }
-        public string Alias { get; set; }
-        public bool Latest { get; set; }
-        public bool Published { get; set; }
+        _serviceProvider = serviceProvider;
     }
 
-    public class AliasPartIndexProvider : ContentHandlerBase, IIndexProvider, IScopedIndexProvider
+    public override async Task UpdatedAsync(UpdateContentContext context)
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly HashSet<string> _partRemoved = [];
-        private IContentDefinitionManager _contentDefinitionManager;
+        var part = context.ContentItem.As<AliasPart>();
 
-        public AliasPartIndexProvider(IServiceProvider serviceProvider)
+        // Validate that the content definition contains this part, this prevents indexing parts
+        // that have been removed from the type definition, but are still present in the elements.            
+        if (part != null)
         {
-            _serviceProvider = serviceProvider;
-        }
-
-        public override async Task UpdatedAsync(UpdateContentContext context)
-        {
-            var part = context.ContentItem.As<AliasPart>();
+            // Lazy initialization because of ISession cyclic dependency.
+            _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-            // Validate that the content definition contains this part, this prevents indexing parts
-            // that have been removed from the type definition, but are still present in the elements.            
-            if (part != null)
+            // Search for this part.
+            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
+            if (contentTypeDefinition?.Parts is not null && !contentTypeDefinition.Parts.Any(ctd => string.Equals(ctd.Name, nameof(AliasPart), StringComparison.Ordinal)))
             {
-                // Lazy initialization because of ISession cyclic dependency.
-                _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
-
-                // Search for this part.
-                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
-                if (contentTypeDefinition?.Parts is not null && !contentTypeDefinition.Parts.Any(ctd => string.Equals(ctd.Name, nameof(AliasPart), StringComparison.Ordinal)))
-                {
-                    context.ContentItem.Remove<AliasPart>();
-                    _partRemoved.Add(context.ContentItem.ContentItemId);
-                }
+                context.ContentItem.Remove<AliasPart>();
+                _partRemoved.Add(context.ContentItem.ContentItemId);
             }
         }
+    }
 
-        public string CollectionName { get; set; }
+    public string CollectionName { get; set; }
 
-        public Type ForType() => typeof(ContentItem);
+    public Type ForType() => typeof(ContentItem);
 
-        public void Describe(IDescriptor context) => Describe((DescribeContext<ContentItem>)context);
+    public void Describe(IDescriptor context) => Describe((DescribeContext<ContentItem>)context);
 
-        public void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<AliasPartIndex>()
-                .When(contentItem => contentItem.Has<AliasPart>() || _partRemoved.Contains(contentItem.ContentItemId))
-                .Map(contentItem =>
+    public void Describe(DescribeContext<ContentItem> context)
+    {
+        context.For<AliasPartIndex>()
+            .When(contentItem => contentItem.Has<AliasPart>() || _partRemoved.Contains(contentItem.ContentItemId))
+            .Map(contentItem =>
+            {
+                // Remove index records of soft deleted items.
+                if (!contentItem.Published && !contentItem.Latest)
                 {
-                    // Remove index records of soft deleted items.
-                    if (!contentItem.Published && !contentItem.Latest)
-                    {
-                        return null;
-                    }
+                    return null;
+                }
 
-                    var part = contentItem.As<AliasPart>();
-                    if (part == null || string.IsNullOrEmpty(part.Alias))
-                    {
-                        return null;
-                    }
+                var part = contentItem.As<AliasPart>();
+                if (part == null || string.IsNullOrEmpty(part.Alias))
+                {
+                    return null;
+                }
 
-                    return new AliasPartIndex
-                    {
-                        Alias = part.Alias.ToLowerInvariant(),
-                        ContentItemId = contentItem.ContentItemId,
-                        Latest = contentItem.Latest,
-                        Published = contentItem.Published
-                    };
-                });
-        }
+                return new AliasPartIndex
+                {
+                    Alias = part.Alias.ToLowerInvariant(),
+                    ContentItemId = contentItem.ContentItemId,
+                    Latest = contentItem.Latest,
+                    Published = contentItem.Published
+                };
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/Indexing/AliasPartIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.Alias/Indexing/AliasPartIndexHandler.cs
index 3268267d6bf..12d4549754a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/Indexing/AliasPartIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/Indexing/AliasPartIndexHandler.cs
@@ -2,20 +2,19 @@
 using OrchardCore.Alias.Models;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.Alias.Indexing
+namespace OrchardCore.Alias.Indexing;
+
+public class AliasPartIndexHandler : ContentPartIndexHandler<AliasPart>
 {
-    public class AliasPartIndexHandler : ContentPartIndexHandler<AliasPart>
+    public override Task BuildIndexAsync(AliasPart part, BuildPartIndexContext context)
     {
-        public override Task BuildIndexAsync(AliasPart part, BuildPartIndexContext context)
-        {
-            var options = DocumentIndexOptions.Keyword | DocumentIndexOptions.Store;
-
-            foreach (var key in context.Keys)
-            {
-                context.DocumentIndex.Set(key, part.Alias, options);
-            }
+        var options = DocumentIndexOptions.Keyword | DocumentIndexOptions.Store;
 
-            return Task.CompletedTask;
+        foreach (var key in context.Keys)
+        {
+            context.DocumentIndex.Set(key, part.Alias, options);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Alias/Migrations.cs
index c837411c4a6..88fe28fcd6d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/Migrations.cs
@@ -6,91 +6,90 @@
 using OrchardCore.Data.Migration;
 using YesSql.Sql;
 
-namespace OrchardCore.Alias
+namespace OrchardCore.Alias;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        public Migrations(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public Migrations(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public async Task<int> CreateAsync()
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync(nameof(AliasPart), builder => builder
-                .Attachable()
-                .WithDescription("Provides a way to define custom aliases for content items."));
+    public async Task<int> CreateAsync()
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync(nameof(AliasPart), builder => builder
+            .Attachable()
+            .WithDescription("Provides a way to define custom aliases for content items."));
 
-            await SchemaBuilder.CreateMapIndexTableAsync<AliasPartIndex>(table => table
-                .Column<string>("Alias", col => col.WithLength(AliasPart.MaxAliasLength))
-                .Column<string>("ContentItemId", c => c.WithLength(26))
-                .Column<bool>("Latest", c => c.WithDefault(false))
-                .Column<bool>("Published", c => c.WithDefault(true))
-            );
+        await SchemaBuilder.CreateMapIndexTableAsync<AliasPartIndex>(table => table
+            .Column<string>("Alias", col => col.WithLength(AliasPart.MaxAliasLength))
+            .Column<string>("ContentItemId", c => c.WithLength(26))
+            .Column<bool>("Latest", c => c.WithDefault(false))
+            .Column<bool>("Published", c => c.WithDefault(true))
+        );
 
-            await SchemaBuilder.AlterIndexTableAsync<AliasPartIndex>(table => table
-                .CreateIndex("IDX_AliasPartIndex_DocumentId",
-                    "DocumentId",
-                    "Alias",
-                    "ContentItemId",
-                    "Published",
-                    "Latest")
-            );
+        await SchemaBuilder.AlterIndexTableAsync<AliasPartIndex>(table => table
+            .CreateIndex("IDX_AliasPartIndex_DocumentId",
+                "DocumentId",
+                "Alias",
+                "ContentItemId",
+                "Published",
+                "Latest")
+        );
 
-            // Shortcut other migration steps on new content definition schemas.
-            return 4;
-        }
+        // Shortcut other migration steps on new content definition schemas.
+        return 4;
+    }
 
-        // This code can be removed in a later version as Latest and Published are alterations.
-        public async Task<int> UpdateFrom1Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<AliasPartIndex>(table => table
-                .AddColumn<bool>("Latest", c => c.WithDefault(false))
-            );
+    // This code can be removed in a later version as Latest and Published are alterations.
+    public async Task<int> UpdateFrom1Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<AliasPartIndex>(table => table
+            .AddColumn<bool>("Latest", c => c.WithDefault(false))
+        );
 
-            await SchemaBuilder.AlterIndexTableAsync<AliasPartIndex>(table => table
-                .AddColumn<bool>("Published", c => c.WithDefault(true))
-            );
+        await SchemaBuilder.AlterIndexTableAsync<AliasPartIndex>(table => table
+            .AddColumn<bool>("Published", c => c.WithDefault(true))
+        );
 
-            return 2;
-        }
+        return 2;
+    }
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom2Async()
-        {
-            // Can't be fully created on existing databases where the 'Alias' may be of 767 chars.
-            await SchemaBuilder.AlterIndexTableAsync<AliasPartIndex>(table => table
-                // .CreateIndex("IDX_AliasPartIndex_DocumentId",
-                //    "DocumentId",
-                //    "Alias",
-                //    "ContentItemId",
-                //    "Latest",
-                //    "Published")
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom2Async()
+    {
+        // Can't be fully created on existing databases where the 'Alias' may be of 767 chars.
+        await SchemaBuilder.AlterIndexTableAsync<AliasPartIndex>(table => table
+            // .CreateIndex("IDX_AliasPartIndex_DocumentId",
+            //    "DocumentId",
+            //    "Alias",
+            //    "ContentItemId",
+            //    "Latest",
+            //    "Published")
 
-                .CreateIndex("IDX_AliasPartIndex_DocumentId",
-                    "DocumentId",
-                    "Alias")
-            );
+            .CreateIndex("IDX_AliasPartIndex_DocumentId",
+                "DocumentId",
+                "Alias")
+        );
 
-            return 3;
-        }
+        return 3;
+    }
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom3Async()
-        {
-            // In the previous migration step, an index was not fully created,
-            // but here, we can create a separate one for the missing columns.
-            await SchemaBuilder.AlterIndexTableAsync<AliasPartIndex>(table => table
-                .CreateIndex("IDX_AliasPartIndex_DocumentId_ContentItemId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "Published",
-                    "Latest")
-            );
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom3Async()
+    {
+        // In the previous migration step, an index was not fully created,
+        // but here, we can create a separate one for the missing columns.
+        await SchemaBuilder.AlterIndexTableAsync<AliasPartIndex>(table => table
+            .CreateIndex("IDX_AliasPartIndex_DocumentId_ContentItemId",
+                "DocumentId",
+                "ContentItemId",
+                "Published",
+                "Latest")
+        );
 
-            return 4;
-        }
+        return 4;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/Models/AliasPart.cs b/src/OrchardCore.Modules/OrchardCore.Alias/Models/AliasPart.cs
index 52c2517702d..2dc87f91382 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/Models/AliasPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/Models/AliasPart.cs
@@ -1,15 +1,14 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Alias.Models
+namespace OrchardCore.Alias.Models;
+
+public class AliasPart : ContentPart
 {
-    public class AliasPart : ContentPart
-    {
-        // Maximum length that MySql can support in an index under utf8mb4 collation is 768,
-        // minus 2 for the `DocumentId` integer (bigint size = 8 bytes = 2 character size),
-        // minus 26 for the `ContentItemId` and 1 for the 'Published' and 'Latest' bools.
-        // minus 4 to allow at least to add a new integer column.
-        public const int MaxAliasLength = 735;
+    // Maximum length that MySql can support in an index under utf8mb4 collation is 768,
+    // minus 2 for the `DocumentId` integer (bigint size = 8 bytes = 2 character size),
+    // minus 26 for the `ContentItemId` and 1 for the 'Published' and 'Latest' bools.
+    // minus 4 to allow at least to add a new integer column.
+    public const int MaxAliasLength = 735;
 
-        public string Alias { get; set; }
-    }
+    public string Alias { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/Models/AliasPartExtensions.cs b/src/OrchardCore.Modules/OrchardCore.Alias/Models/AliasPartExtensions.cs
index 2d780605935..027fef2a245 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/Models/AliasPartExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/Models/AliasPartExtensions.cs
@@ -5,30 +5,29 @@
 using OrchardCore.Alias.Indexes;
 using YesSql;
 
-namespace OrchardCore.Alias.Models
+namespace OrchardCore.Alias.Models;
+
+public static class AliasPartExtensions
 {
-    public static class AliasPartExtensions
+    public static async IAsyncEnumerable<ValidationResult> ValidateAsync(this AliasPart part, IStringLocalizer S, ISession session)
     {
-        public static async IAsyncEnumerable<ValidationResult> ValidateAsync(this AliasPart part, IStringLocalizer S, ISession session)
+        if (!string.IsNullOrWhiteSpace(part.Alias))
         {
-            if (!string.IsNullOrWhiteSpace(part.Alias))
+            if (part.Alias.Length > AliasPart.MaxAliasLength)
             {
-                if (part.Alias.Length > AliasPart.MaxAliasLength)
-                {
-                    yield return new ValidationResult(S["Your alias is too long. The alias can only be up to {0} characters. \"{1}\"", AliasPart.MaxAliasLength, part.Alias], new string[] { nameof(part.Alias) });
-                }
-
-                if (!await IsAliasUniqueAsync(part, session, part.Alias))
-                {
-                    yield return new ValidationResult(S["Your alias is already in use. \"{0}\"", part.Alias], new[] { nameof(part.Alias) });
-                }
+                yield return new ValidationResult(S["Your alias is too long. The alias can only be up to {0} characters. \"{1}\"", AliasPart.MaxAliasLength, part.Alias], new string[] { nameof(part.Alias) });
             }
-        }
 
-        public static async Task<bool> IsAliasUniqueAsync(this AliasPart context, ISession session, string alias)
-        {
-            return (await session.QueryIndex<AliasPartIndex>(o => o.Alias == alias && o.ContentItemId != context.ContentItem.ContentItemId).CountAsync()) == 0;
+            if (!await IsAliasUniqueAsync(part, session, part.Alias))
+            {
+                yield return new ValidationResult(S["Your alias is already in use. \"{0}\"", part.Alias], new[] { nameof(part.Alias) });
+            }
         }
+    }
 
+    public static async Task<bool> IsAliasUniqueAsync(this AliasPart context, ISession session, string alias)
+    {
+        return (await session.QueryIndex<AliasPartIndex>(o => o.Alias == alias && o.ContentItemId != context.ContentItem.ContentItemId).CountAsync()) == 0;
     }
+
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/Services/AliasPartContentHandleProvider.cs b/src/OrchardCore.Modules/OrchardCore.Alias/Services/AliasPartContentHandleProvider.cs
index 8388a62709d..bf2dcda5bb9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/Services/AliasPartContentHandleProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/Services/AliasPartContentHandleProvider.cs
@@ -4,38 +4,37 @@
 using OrchardCore.ContentManagement;
 using YesSql;
 
-namespace OrchardCore.Alias.Services
+namespace OrchardCore.Alias.Services;
+
+public class AliasPartContentHandleProvider : IContentHandleProvider
 {
-    public class AliasPartContentHandleProvider : IContentHandleProvider
-    {
-        private readonly ISession _session;
+    private readonly ISession _session;
 
-        public AliasPartContentHandleProvider(ISession session)
-        {
-            _session = session;
-        }
+    public AliasPartContentHandleProvider(ISession session)
+    {
+        _session = session;
+    }
 
-        public int Order => 100;
+    public int Order => 100;
 
-        public async Task<string> GetContentItemIdAsync(string handle)
+    public async Task<string> GetContentItemIdAsync(string handle)
+    {
+        if (handle.StartsWith("alias:", StringComparison.OrdinalIgnoreCase))
         {
-            if (handle.StartsWith("alias:", StringComparison.OrdinalIgnoreCase))
-            {
-                handle = handle[6..];
+            handle = handle[6..];
 
-                var aliasPartIndex = await AliasPartContentHandleHelper.QueryAliasIndex(_session, handle);
-                return aliasPartIndex?.ContentItemId;
-            }
-
-            return null;
+            var aliasPartIndex = await AliasPartContentHandleHelper.QueryAliasIndex(_session, handle);
+            return aliasPartIndex?.ContentItemId;
         }
+
+        return null;
     }
+}
 
-    internal sealed class AliasPartContentHandleHelper
-    {
+internal sealed class AliasPartContentHandleHelper
+{
 #pragma warning disable CA1862 // Use the 'StringComparison' method overloads to perform case-insensitive string comparisons
-        internal static Task<ContentItem> QueryAliasIndex(ISession session, string alias) =>
-            session.Query<ContentItem, AliasPartIndex>(x => x.Alias == alias.ToLowerInvariant()).FirstOrDefaultAsync();
+    internal static Task<ContentItem> QueryAliasIndex(ISession session, string alias) =>
+        session.Query<ContentItem, AliasPartIndex>(x => x.Alias == alias.ToLowerInvariant()).FirstOrDefaultAsync();
 #pragma warning restore CA1862 // Use the 'StringComparison' method overloads to perform case-insensitive string comparisons
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/Settings/AliasPartSettings.cs b/src/OrchardCore.Modules/OrchardCore.Alias/Settings/AliasPartSettings.cs
index 015b3012083..c0a800266a9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/Settings/AliasPartSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/Settings/AliasPartSettings.cs
@@ -1,22 +1,21 @@
 using System.ComponentModel;
 
-namespace OrchardCore.Alias.Settings
+namespace OrchardCore.Alias.Settings;
+
+public enum AliasPartOptions
 {
-    public enum AliasPartOptions
-    {
-        Editable,
-        GeneratedDisabled
-    }
+    Editable,
+    GeneratedDisabled
+}
 
-    public class AliasPartSettings
-    {
-        [DefaultValue("{{ Model.ContentItem.DisplayText | slugify }}")]
-        public string Pattern { get; set; } = "{{ Model.ContentItem.DisplayText | slugify }}";
+public class AliasPartSettings
+{
+    [DefaultValue("{{ Model.ContentItem.DisplayText | slugify }}")]
+    public string Pattern { get; set; } = "{{ Model.ContentItem.DisplayText | slugify }}";
 
-        /// <summary>
-        /// Gets or sets whether a user can define a custom alias.
-        /// </summary>
-        [DefaultValue(AliasPartOptions.Editable)]
-        public AliasPartOptions Options { get; set; } = AliasPartOptions.Editable;
-    }
+    /// <summary>
+    /// Gets or sets whether a user can define a custom alias.
+    /// </summary>
+    [DefaultValue(AliasPartOptions.Editable)]
+    public AliasPartOptions Options { get; set; } = AliasPartOptions.Editable;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/Settings/AliasPartSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Alias/Settings/AliasPartSettingsDisplayDriver.cs
index 7c8ddf74974..ed68168ce4f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/Settings/AliasPartSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/Settings/AliasPartSettingsDisplayDriver.cs
@@ -7,56 +7,55 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Alias.Settings
+namespace OrchardCore.Alias.Settings;
+
+public sealed class AliasPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<AliasPart>
 {
-    public sealed class AliasPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<AliasPart>
-    {
-        private readonly ILiquidTemplateManager _templateManager;
+    private readonly ILiquidTemplateManager _templateManager;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AliasPartSettingsDisplayDriver(
-            ILiquidTemplateManager templateManager,
-            IStringLocalizer<AliasPartSettingsDisplayDriver> localizer)
-        {
-            _templateManager = templateManager;
-            S = localizer;
-        }
+    public AliasPartSettingsDisplayDriver(
+        ILiquidTemplateManager templateManager,
+        IStringLocalizer<AliasPartSettingsDisplayDriver> localizer)
+    {
+        _templateManager = templateManager;
+        S = localizer;
+    }
 
-        public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    {
+        return Initialize<AliasPartSettingsViewModel>("AliasPartSettings_Edit", model =>
         {
-            return Initialize<AliasPartSettingsViewModel>("AliasPartSettings_Edit", model =>
-            {
-                var settings = contentTypePartDefinition.GetSettings<AliasPartSettings>();
+            var settings = contentTypePartDefinition.GetSettings<AliasPartSettings>();
 
-                model.Pattern = settings.Pattern;
-                model.Options = settings.Options;
-                model.AliasPartSettings = settings;
-            }).Location("Content");
-        }
+            model.Pattern = settings.Pattern;
+            model.Options = settings.Options;
+            model.AliasPartSettings = settings;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
-        {
-            var model = new AliasPartSettingsViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    {
+        var model = new AliasPartSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix,
-                m => m.Pattern,
-                m => m.Options);
+        await context.Updater.TryUpdateModelAsync(model, Prefix,
+            m => m.Pattern,
+            m => m.Options);
 
-            if (!string.IsNullOrEmpty(model.Pattern) && !_templateManager.Validate(model.Pattern, out var errors))
-            {
-                context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-            }
-            else
+        if (!string.IsNullOrEmpty(model.Pattern) && !_templateManager.Validate(model.Pattern, out var errors))
+        {
+            context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+        }
+        else
+        {
+            context.Builder.WithSettings(new AliasPartSettings
             {
-                context.Builder.WithSettings(new AliasPartSettings
-                {
-                    Pattern = model.Pattern,
-                    Options = model.Options,
-                });
-            }
-
-            return Edit(contentTypePartDefinition, context);
+                Pattern = model.Pattern,
+                Options = model.Options,
+            });
         }
+
+        return Edit(contentTypePartDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/Settings/AliasPartSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Alias/Settings/AliasPartSettingsViewModel.cs
index 55e8dfb5868..df40019ca54 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/Settings/AliasPartSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/Settings/AliasPartSettingsViewModel.cs
@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Alias.Settings
+namespace OrchardCore.Alias.Settings;
+
+public class AliasPartSettingsViewModel
 {
-    public class AliasPartSettingsViewModel
-    {
-        public string Pattern { get; set; }
-        public AliasPartOptions Options { get; set; }
-        [BindNever]
-        public AliasPartSettings AliasPartSettings { get; set; }
-    }
+    public string Pattern { get; set; }
+    public AliasPartOptions Options { get; set; }
+    [BindNever]
+    public AliasPartSettings AliasPartSettings { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Alias/Startup.cs
index f04e959f197..36f54299b5b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/Startup.cs
@@ -20,56 +20,55 @@
 using OrchardCore.Modules;
 using YesSql;
 
-namespace OrchardCore.Alias
+namespace OrchardCore.Alias;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
+            o.MemberAccessStrategy.Register<AliasPartViewModel>();
+
+            o.MemberAccessStrategy.Register<LiquidContentAccessor, LiquidPropertyAccessor>("Alias", (obj, context) =>
             {
-                o.MemberAccessStrategy.Register<AliasPartViewModel>();
+                var liquidTemplateContext = (LiquidTemplateContext)context;
 
-                o.MemberAccessStrategy.Register<LiquidContentAccessor, LiquidPropertyAccessor>("Alias", (obj, context) =>
+                return new LiquidPropertyAccessor(liquidTemplateContext, async (alias, context) =>
                 {
-                    var liquidTemplateContext = (LiquidTemplateContext)context;
-
-                    return new LiquidPropertyAccessor(liquidTemplateContext, async (alias, context) =>
-                    {
-                        var session = context.Services.GetRequiredService<ISession>();
+                    var session = context.Services.GetRequiredService<ISession>();
 
 #pragma warning disable CA1862 // Use the 'StringComparison' method overloads to perform case-insensitive string comparisons
-                        var contentItem = await session.Query<ContentItem, AliasPartIndex>(x =>
-                            x.Published && x.Alias == alias.ToLowerInvariant()).FirstOrDefaultAsync();
+                    var contentItem = await session.Query<ContentItem, AliasPartIndex>(x =>
+                        x.Published && x.Alias == alias.ToLowerInvariant()).FirstOrDefaultAsync();
 #pragma warning restore CA1862 // Use the 'StringComparison' method overloads to perform case-insensitive string comparisons
 
-                        if (contentItem == null)
-                        {
-                            return NilValue.Instance;
-                        }
+                    if (contentItem == null)
+                    {
+                        return NilValue.Instance;
+                    }
 
-                        var contentManager = context.Services.GetRequiredService<IContentManager>();
-                        contentItem = await contentManager.LoadAsync(contentItem);
+                    var contentManager = context.Services.GetRequiredService<IContentManager>();
+                    contentItem = await contentManager.LoadAsync(contentItem);
 
-                        return new ObjectValue(contentItem);
-                    });
+                    return new ObjectValue(contentItem);
                 });
             });
+        });
 
-            services.AddScoped<AliasPartIndexProvider>();
-            services.AddScoped<IScopedIndexProvider>(sp => sp.GetRequiredService<AliasPartIndexProvider>());
-            services.AddScoped<IContentHandler>(sp => sp.GetRequiredService<AliasPartIndexProvider>());
+        services.AddScoped<AliasPartIndexProvider>();
+        services.AddScoped<IScopedIndexProvider>(sp => sp.GetRequiredService<AliasPartIndexProvider>());
+        services.AddScoped<IContentHandler>(sp => sp.GetRequiredService<AliasPartIndexProvider>());
 
-            services.AddDataMigration<Migrations>();
-            services.AddScoped<IContentHandleProvider, AliasPartContentHandleProvider>();
+        services.AddDataMigration<Migrations>();
+        services.AddScoped<IContentHandleProvider, AliasPartContentHandleProvider>();
 
-            // Identity Part
-            services.AddContentPart<AliasPart>()
-                .UseDisplayDriver<AliasPartDisplayDriver>()
-                .AddHandler<AliasPartHandler>();
+        // Identity Part
+        services.AddContentPart<AliasPart>()
+            .UseDisplayDriver<AliasPartDisplayDriver>()
+            .AddHandler<AliasPartHandler>();
 
-            services.AddScoped<IContentPartIndexHandler, AliasPartIndexHandler>();
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, AliasPartSettingsDisplayDriver>();
-        }
+        services.AddScoped<IContentPartIndexHandler, AliasPartIndexHandler>();
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, AliasPartSettingsDisplayDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/ViewModels/AliasPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Alias/ViewModels/AliasPartViewModel.cs
index b303a689c5f..8fd3f279941 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/ViewModels/AliasPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/ViewModels/AliasPartViewModel.cs
@@ -3,19 +3,18 @@
 using OrchardCore.Alias.Settings;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Alias.ViewModels
+namespace OrchardCore.Alias.ViewModels;
+
+public class AliasPartViewModel
 {
-    public class AliasPartViewModel
-    {
-        public string Alias { get; set; }
+    public string Alias { get; set; }
 
-        [BindNever]
-        public ContentItem ContentItem { get; set; }
+    [BindNever]
+    public ContentItem ContentItem { get; set; }
 
-        [BindNever]
-        public AliasPart AliasPart { get; set; }
+    [BindNever]
+    public AliasPart AliasPart { get; set; }
 
-        [BindNever]
-        public AliasPartSettings Settings { get; set; }
-    }
+    [BindNever]
+    public AliasPartSettings Settings { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs
index 1d7749194fb..25a0d7bd706 100644
--- a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs
@@ -2,34 +2,33 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Apis.GraphQL
+namespace OrchardCore.Apis.GraphQL;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    internal readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["GraphiQL"], S["GraphiQL"].PrefixPosition(), graphiQL => graphiQL
-                        .Action("Index", "Admin", "OrchardCore.Apis.GraphQL")
-                        .Permission(CommonPermissions.ExecuteGraphQL)
-                        .LocalNav()
-                    )
-                );
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["GraphiQL"], S["GraphiQL"].PrefixPosition(), graphiQL => graphiQL
+                    .Action("Index", "Admin", "OrchardCore.Apis.GraphQL")
+                    .Permission(CommonPermissions.ExecuteGraphQL)
+                    .LocalNav()
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Controllers/AdminController.cs
index a2d7c115910..c4ad09d5536 100644
--- a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Controllers/AdminController.cs
@@ -1,15 +1,14 @@
 using Microsoft.AspNetCore.Mvc;
 using OrchardCore.Admin;
 
-namespace OrchardCore.Apis.GraphQL.Controllers
+namespace OrchardCore.Apis.GraphQL.Controllers;
+
+public class AdminController : Controller
 {
-    public class AdminController : Controller
+    [HttpGet]
+    [Admin("GraphQL", "GraphQL")]
+    public IActionResult Index()
     {
-        [HttpGet]
-        [Admin("GraphQL", "GraphQL")]
-        public IActionResult Index()
-        {
-            return View();
-        }
+        return View();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Extensions/DocumentWriterExtensions.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Extensions/DocumentWriterExtensions.cs
index 1163977934a..2bcc26dca0d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Extensions/DocumentWriterExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Extensions/DocumentWriterExtensions.cs
@@ -5,32 +5,31 @@
 using GraphQL;
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Apis.GraphQL
+namespace OrchardCore.Apis.GraphQL;
+
+internal static class DocumentWriterExtensions
 {
-    internal static class DocumentWriterExtensions
+    public static async Task WriteErrorAsync(this IGraphQLSerializer graphQLSerializer, HttpContext context, string message, Exception e = null)
     {
-        public static async Task WriteErrorAsync(this IGraphQLSerializer graphQLSerializer, HttpContext context, string message, Exception e = null)
-        {
-            ArgumentNullException.ThrowIfNull(message);
+        ArgumentNullException.ThrowIfNull(message);
 
-            var errorResult = new ExecutionResult
-            {
-                Errors = []
-            };
+        var errorResult = new ExecutionResult
+        {
+            Errors = []
+        };
 
-            if (e == null)
-            {
-                errorResult.Errors.Add(new ExecutionError(message));
-            }
-            else
-            {
-                errorResult.Errors.Add(new ExecutionError(message, e));
-            }
+        if (e == null)
+        {
+            errorResult.Errors.Add(new ExecutionError(message));
+        }
+        else
+        {
+            errorResult.Errors.Add(new ExecutionError(message, e));
+        }
 
-            context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
-            context.Response.ContentType = MediaTypeNames.Application.Json;
+        context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
+        context.Response.ContentType = MediaTypeNames.Application.Json;
 
-            await graphQLSerializer.WriteAsync(context.Response.Body, errorResult);
-        }
+        await graphQLSerializer.WriteAsync(context.Response.Body, errorResult);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/GraphQLMiddleware.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/GraphQLMiddleware.cs
index 83d167d995c..d6483af0908 100644
--- a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/GraphQLMiddleware.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/GraphQLMiddleware.cs
@@ -23,188 +23,187 @@
 using OrchardCore.Apis.GraphQL.ValidationRules;
 using OrchardCore.Routing;
 
-namespace OrchardCore.Apis.GraphQL
+namespace OrchardCore.Apis.GraphQL;
+
+public class GraphQLMiddleware : IMiddleware
 {
-    public class GraphQLMiddleware : IMiddleware
+    private readonly ILogger _logger;
+    private readonly GraphQLSettings _settings;
+    private readonly IGraphQLTextSerializer _graphQLTextSerializer;
+    private readonly IGraphQLSerializer _serializer;
+    private readonly IDocumentExecuter _executer;
+    internal static readonly Encoding _utf8Encoding = new UTF8Encoding(false);
+    private static readonly MediaType _jsonMediaType = new("application/json");
+    private static readonly MediaType _graphQlMediaType = new("application/graphql");
+
+    public GraphQLMiddleware(
+        IOptions<GraphQLSettings> settingsOption,
+        IDocumentExecuter executer,
+        IGraphQLSerializer serializer,
+        IGraphQLTextSerializer graphQLTextSerializer,
+        ILogger<GraphQLMiddleware> logger)
+    {
+        _settings = settingsOption.Value;
+        _executer = executer;
+        _serializer = serializer;
+        _graphQLTextSerializer = graphQLTextSerializer;
+        _logger = logger;
+    }
+    public async Task InvokeAsync(HttpContext context, RequestDelegate next)
     {
-        private readonly ILogger _logger;
-        private readonly GraphQLSettings _settings;
-        private readonly IGraphQLTextSerializer _graphQLTextSerializer;
-        private readonly IGraphQLSerializer _serializer;
-        private readonly IDocumentExecuter _executer;
-        internal static readonly Encoding _utf8Encoding = new UTF8Encoding(false);
-        private static readonly MediaType _jsonMediaType = new("application/json");
-        private static readonly MediaType _graphQlMediaType = new("application/graphql");
-
-        public GraphQLMiddleware(
-            IOptions<GraphQLSettings> settingsOption,
-            IDocumentExecuter executer,
-            IGraphQLSerializer serializer,
-            IGraphQLTextSerializer graphQLTextSerializer,
-            ILogger<GraphQLMiddleware> logger)
+        if (!IsGraphQLRequest(context))
         {
-            _settings = settingsOption.Value;
-            _executer = executer;
-            _serializer = serializer;
-            _graphQLTextSerializer = graphQLTextSerializer;
-            _logger = logger;
+            await next(context);
         }
-        public async Task InvokeAsync(HttpContext context, RequestDelegate next)
+        else
         {
-            if (!IsGraphQLRequest(context))
+            var authenticationService = context.RequestServices.GetService<IAuthenticationService>();
+            var authenticateResult = await authenticationService.AuthenticateAsync(context, "Api");
+            if (authenticateResult.Succeeded)
             {
-                await next(context);
+                context.User = authenticateResult.Principal;
+            }
+            var authorizationService = context.RequestServices.GetService<IAuthorizationService>();
+            var authorized = await authorizationService.AuthorizeAsync(context.User, CommonPermissions.ExecuteGraphQL);
+
+            if (authorized)
+            {
+                await ExecuteAsync(context);
             }
             else
             {
-                var authenticationService = context.RequestServices.GetService<IAuthenticationService>();
-                var authenticateResult = await authenticationService.AuthenticateAsync(context, "Api");
-                if (authenticateResult.Succeeded)
-                {
-                    context.User = authenticateResult.Principal;
-                }
-                var authorizationService = context.RequestServices.GetService<IAuthorizationService>();
-                var authorized = await authorizationService.AuthorizeAsync(context.User, CommonPermissions.ExecuteGraphQL);
-
-                if (authorized)
-                {
-                    await ExecuteAsync(context);
-                }
-                else
-                {
-                    await context.ChallengeAsync("Api");
-                }
+                await context.ChallengeAsync("Api");
             }
         }
-        private bool IsGraphQLRequest(HttpContext context)
-        {
-            return context.Request.Path.StartsWithNormalizedSegments(_settings.Path, StringComparison.OrdinalIgnoreCase);
-        }
+    }
+    private bool IsGraphQLRequest(HttpContext context)
+    {
+        return context.Request.Path.StartsWithNormalizedSegments(_settings.Path, StringComparison.OrdinalIgnoreCase);
+    }
 
-        private async Task ExecuteAsync(HttpContext context)
-        {
-            GraphQLNamedQueryRequest request = null;
+    private async Task ExecuteAsync(HttpContext context)
+    {
+        GraphQLNamedQueryRequest request = null;
 
-            // c.f. https://graphql.org/learn/serving-over-http/#post-request
+        // c.f. https://graphql.org/learn/serving-over-http/#post-request
 
-            try
+        try
+        {
+            if (HttpMethods.IsPost(context.Request.Method))
             {
-                if (HttpMethods.IsPost(context.Request.Method))
-                {
-                    var mediaType = new MediaType(context.Request.ContentType);
+                var mediaType = new MediaType(context.Request.ContentType);
 
-                    if (mediaType.IsSubsetOf(_jsonMediaType) || mediaType.IsSubsetOf(_graphQlMediaType))
+                if (mediaType.IsSubsetOf(_jsonMediaType) || mediaType.IsSubsetOf(_graphQlMediaType))
+                {
+                    using var sr = new StreamReader(context.Request.Body);
+                    if (mediaType.IsSubsetOf(_graphQlMediaType))
                     {
-                        using var sr = new StreamReader(context.Request.Body);
-                        if (mediaType.IsSubsetOf(_graphQlMediaType))
-                        {
-                            request = new GraphQLNamedQueryRequest
-                            {
-                                Query = await sr.ReadToEndAsync()
-                            };
-                        }
-                        else
+                        request = new GraphQLNamedQueryRequest
                         {
-                            request = _graphQLTextSerializer.Deserialize<GraphQLNamedQueryRequest>(await sr.ReadToEndAsync());
-                        }
+                            Query = await sr.ReadToEndAsync()
+                        };
                     }
                     else
                     {
-                        request = CreateRequestFromQueryString(context);
+                        request = _graphQLTextSerializer.Deserialize<GraphQLNamedQueryRequest>(await sr.ReadToEndAsync());
                     }
                 }
-                else if (HttpMethods.IsGet(context.Request.Method))
-                {
-                    request = CreateRequestFromQueryString(context, true);
-                }
-
-                if (request == null)
+                else
                 {
-                    throw new InvalidOperationException("Unable to create a graphqlrequest from this request");
+                    request = CreateRequestFromQueryString(context);
                 }
             }
-            catch (Exception e)
+            else if (HttpMethods.IsGet(context.Request.Method))
             {
-                await _serializer.WriteErrorAsync(context, "An error occurred while processing the GraphQL query", e);
-                _logger.LogError(e, "An error occurred while processing the GraphQL query.");
+                request = CreateRequestFromQueryString(context, true);
+            }
 
-                return;
+            if (request == null)
+            {
+                throw new InvalidOperationException("Unable to create a graphqlrequest from this request");
             }
+        }
+        catch (Exception e)
+        {
+            await _serializer.WriteErrorAsync(context, "An error occurred while processing the GraphQL query", e);
+            _logger.LogError(e, "An error occurred while processing the GraphQL query.");
 
-            var queryToExecute = request.Query;
+            return;
+        }
 
-            if (!string.IsNullOrEmpty(request.NamedQuery))
-            {
-                var namedQueries = context.RequestServices.GetServices<INamedQueryProvider>();
+        var queryToExecute = request.Query;
 
-                var queries = namedQueries
-                    .SelectMany(dict => dict.Resolve())
-                    .ToDictionary(pair => pair.Key, pair => pair.Value);
+        if (!string.IsNullOrEmpty(request.NamedQuery))
+        {
+            var namedQueries = context.RequestServices.GetServices<INamedQueryProvider>();
 
-                queryToExecute = queries[request.NamedQuery];
-            }
+            var queries = namedQueries
+                .SelectMany(dict => dict.Resolve())
+                .ToDictionary(pair => pair.Key, pair => pair.Value);
 
-            var schemaService = context.RequestServices.GetService<ISchemaFactory>();
-            var schema = await schemaService.GetSchemaAsync();
-            var dataLoaderDocumentListener = context.RequestServices.GetRequiredService<IDocumentExecutionListener>();
-            var result = await _executer.ExecuteAsync(options =>
-            {
-                options.Schema = schema;
-                options.Query = queryToExecute;
-                options.OperationName = request.OperationName;
-                options.Variables = request.Variables;
-                options.UserContext = _settings.BuildUserContext?.Invoke(context);
-                options.ValidationRules = DocumentValidator.CoreRules
-                    .Concat(context.RequestServices.GetServices<IValidationRule>())
-                    .Append(new ComplexityValidationRule(new ComplexityConfiguration
-                    {
-                        MaxDepth = _settings.MaxDepth,
-                        MaxComplexity = _settings.MaxComplexity,
-                        FieldImpact = _settings.FieldImpact
-                    }));
-                options.Listeners.Add(dataLoaderDocumentListener);
-                options.RequestServices = context.RequestServices;
-            });
-
-            context.Response.StatusCode = (int)(result.Errors == null || result.Errors.Count == 0
-                ? HttpStatusCode.OK
-                : result.Errors.Any(x => x is ValidationError ve && ve.Number == RequiresPermissionValidationRule.ErrorCode)
-                    ? HttpStatusCode.Unauthorized
-                    : HttpStatusCode.BadRequest);
-
-            context.Response.ContentType = MediaTypeNames.Application.Json;
-
-            await _serializer.WriteAsync(context.Response.Body, result);
+            queryToExecute = queries[request.NamedQuery];
         }
 
-        private GraphQLNamedQueryRequest CreateRequestFromQueryString(HttpContext context, bool validateQueryKey = false)
+        var schemaService = context.RequestServices.GetService<ISchemaFactory>();
+        var schema = await schemaService.GetSchemaAsync();
+        var dataLoaderDocumentListener = context.RequestServices.GetRequiredService<IDocumentExecutionListener>();
+        var result = await _executer.ExecuteAsync(options =>
         {
-            if (!context.Request.Query.ContainsKey("query"))
-            {
-                if (validateQueryKey)
+            options.Schema = schema;
+            options.Query = queryToExecute;
+            options.OperationName = request.OperationName;
+            options.Variables = request.Variables;
+            options.UserContext = _settings.BuildUserContext?.Invoke(context);
+            options.ValidationRules = DocumentValidator.CoreRules
+                .Concat(context.RequestServices.GetServices<IValidationRule>())
+                .Append(new ComplexityValidationRule(new ComplexityConfiguration
                 {
-                    throw new InvalidOperationException("The 'query' query string parameter is missing");
-                }
+                    MaxDepth = _settings.MaxDepth,
+                    MaxComplexity = _settings.MaxComplexity,
+                    FieldImpact = _settings.FieldImpact
+                }));
+            options.Listeners.Add(dataLoaderDocumentListener);
+            options.RequestServices = context.RequestServices;
+        });
+
+        context.Response.StatusCode = (int)(result.Errors == null || result.Errors.Count == 0
+            ? HttpStatusCode.OK
+            : result.Errors.Any(x => x is ValidationError ve && ve.Number == RequiresPermissionValidationRule.ErrorCode)
+                ? HttpStatusCode.Unauthorized
+                : HttpStatusCode.BadRequest);
+
+        context.Response.ContentType = MediaTypeNames.Application.Json;
+
+        await _serializer.WriteAsync(context.Response.Body, result);
+    }
 
-                return null;
+    private GraphQLNamedQueryRequest CreateRequestFromQueryString(HttpContext context, bool validateQueryKey = false)
+    {
+        if (!context.Request.Query.ContainsKey("query"))
+        {
+            if (validateQueryKey)
+            {
+                throw new InvalidOperationException("The 'query' query string parameter is missing");
             }
 
-            var request = new GraphQLNamedQueryRequest
-            {
-                Query = context.Request.Query["query"]
-            };
+            return null;
+        }
 
-            if (context.Request.Query.ContainsKey("variables"))
-            {
-                request.Variables = _graphQLTextSerializer.Deserialize<Inputs>(context.Request.Query["variables"]);
-            }
+        var request = new GraphQLNamedQueryRequest
+        {
+            Query = context.Request.Query["query"]
+        };
 
-            if (context.Request.Query.ContainsKey("operationName"))
-            {
-                request.OperationName = context.Request.Query["operationName"];
-            }
+        if (context.Request.Query.ContainsKey("variables"))
+        {
+            request.Variables = _graphQLTextSerializer.Deserialize<Inputs>(context.Request.Query["variables"]);
+        }
 
-            return request;
+        if (context.Request.Query.ContainsKey("operationName"))
+        {
+            request.OperationName = context.Request.Query["operationName"];
         }
+
+        return request;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/GraphQLNamedQueryRequest.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/GraphQLNamedQueryRequest.cs
index 146b17b1b98..6e44c520cc5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/GraphQLNamedQueryRequest.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/GraphQLNamedQueryRequest.cs
@@ -2,14 +2,13 @@
 using GraphQL.Transport;
 using OrchardCore.Apis.GraphQL.Queries;
 
-namespace OrchardCore.Apis.GraphQL
+namespace OrchardCore.Apis.GraphQL;
+
+public class GraphQLNamedQueryRequest : GraphQLRequest
 {
-    public class GraphQLNamedQueryRequest : GraphQLRequest
-    {
-        /// <summary>
-        /// Used to store some graphql query on the server, and then the client only needs to submit the name of that query to reduce the size of the network request
-        /// <see cref="INamedQueryProvider"/>
-        /// </summary>
-        public string NamedQuery { get; set; }
-    }
+    /// <summary>
+    /// Used to store some graphql query on the server, and then the client only needs to submit the name of that query to reduce the size of the network request
+    /// <see cref="INamedQueryProvider"/>
+    /// </summary>
+    public string NamedQuery { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/OrchardFieldNameConverter.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/OrchardFieldNameConverter.cs
index b8a7bc27986..4ce6a657d53 100644
--- a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/OrchardFieldNameConverter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/OrchardFieldNameConverter.cs
@@ -2,35 +2,34 @@
 using GraphQL.Conversion;
 using GraphQL.Types;
 
-namespace OrchardCore.Apis.GraphQL
+namespace OrchardCore.Apis.GraphQL;
+
+public class OrchardFieldNameConverter : INameConverter
 {
-    public class OrchardFieldNameConverter : INameConverter
+    private readonly CamelCaseNameConverter _defaultConverter = new();
+
+    // todo: custom argument name?
+    public string NameForArgument(string argumentName, IComplexGraphType parentGraphType, FieldType field)
     {
-        private readonly CamelCaseNameConverter _defaultConverter = new();
+        return _defaultConverter.NameForArgument(argumentName, parentGraphType, field);
+    }
 
-        // todo: custom argument name?
-        public string NameForArgument(string argumentName, IComplexGraphType parentGraphType, FieldType field)
-        {
-            return _defaultConverter.NameForArgument(argumentName, parentGraphType, field);
-        }
+    // TODO: check functionality.
+    public string NameForField(string fieldName, IComplexGraphType parentGraphType)
+    {
+        var attributes = parentGraphType?.GetType().GetCustomAttributes(typeof(GraphQLFieldNameAttribute), true);
 
-        // TODO: check functionality.
-        public string NameForField(string fieldName, IComplexGraphType parentGraphType)
+        if (attributes != null)
         {
-            var attributes = parentGraphType?.GetType().GetCustomAttributes(typeof(GraphQLFieldNameAttribute), true);
-
-            if (attributes != null)
+            foreach (var attribute in attributes.Cast<GraphQLFieldNameAttribute>())
             {
-                foreach (var attribute in attributes.Cast<GraphQLFieldNameAttribute>())
+                if (attribute.Field == fieldName)
                 {
-                    if (attribute.Field == fieldName)
-                    {
-                        return attribute.Mapped;
-                    }
+                    return attribute.Mapped;
                 }
             }
-
-            return _defaultConverter.NameForField(fieldName, parentGraphType);
         }
+
+        return _defaultConverter.NameForField(fieldName, parentGraphType);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Services/SchemaService.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Services/SchemaService.cs
index b0be8eb9661..f3e24912370 100644
--- a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Services/SchemaService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Services/SchemaService.cs
@@ -8,27 +8,45 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Environment.Shell.Scope;
 
-namespace OrchardCore.Apis.GraphQL.Services
+namespace OrchardCore.Apis.GraphQL.Services;
+
+public class SchemaService : ISchemaFactory
 {
-    public class SchemaService : ISchemaFactory
+    private readonly IEnumerable<ISchemaBuilder> _schemaBuilders;
+    private readonly IServiceProvider _serviceProvider;
+    private readonly SemaphoreSlim _schemaGenerationSemaphore = new(1, 1);
+    private readonly ConcurrentDictionary<ISchemaBuilder, string> _identifiers = new();
+
+    private ISchema _schema;
+
+    public SchemaService(IEnumerable<ISchemaBuilder> schemaBuilders, IServiceProvider serviceProvider)
     {
-        private readonly IEnumerable<ISchemaBuilder> _schemaBuilders;
-        private readonly IServiceProvider _serviceProvider;
-        private readonly SemaphoreSlim _schemaGenerationSemaphore = new(1, 1);
-        private readonly ConcurrentDictionary<ISchemaBuilder, string> _identifiers = new();
+        _schemaBuilders = schemaBuilders;
+        _serviceProvider = serviceProvider;
+    }
 
-        private ISchema _schema;
+    public async Task<ISchema> GetSchemaAsync()
+    {
+        var hasChanged = false;
 
-        public SchemaService(IEnumerable<ISchemaBuilder> schemaBuilders, IServiceProvider serviceProvider)
+        foreach (var builder in _schemaBuilders)
         {
-            _schemaBuilders = schemaBuilders;
-            _serviceProvider = serviceProvider;
+            if (_identifiers.TryGetValue(builder, out var identifier) && await builder.GetIdentifierAsync() != identifier)
+            {
+                hasChanged = true;
+                break;
+            }
         }
 
-        public async Task<ISchema> GetSchemaAsync()
+        if (_schema is object && !hasChanged)
         {
-            var hasChanged = false;
+            return _schema;
+        }
+
+        await _schemaGenerationSemaphore.WaitAsync();
 
+        try
+        {
             foreach (var builder in _schemaBuilders)
             {
                 if (_identifiers.TryGetValue(builder, out var identifier) && await builder.GetIdentifierAsync() != identifier)
@@ -43,83 +61,64 @@ public async Task<ISchema> GetSchemaAsync()
                 return _schema;
             }
 
-            await _schemaGenerationSemaphore.WaitAsync();
+            var serviceProvider = ShellScope.Services;
 
-            try
+            var schema = new Schema(new SelfActivatingServiceProvider(_serviceProvider))
             {
-                foreach (var builder in _schemaBuilders)
-                {
-                    if (_identifiers.TryGetValue(builder, out var identifier) && await builder.GetIdentifierAsync() != identifier)
-                    {
-                        hasChanged = true;
-                        break;
-                    }
-                }
-
-                if (_schema is object && !hasChanged)
-                {
-                    return _schema;
-                }
-
-                var serviceProvider = ShellScope.Services;
+                Query = new ObjectGraphType { Name = "Query" },
+                Mutation = new ObjectGraphType { Name = "Mutation" },
+                Subscription = new ObjectGraphType { Name = "Subscription" },
+                NameConverter = new OrchardFieldNameConverter(),
+            };
 
-                var schema = new Schema(new SelfActivatingServiceProvider(_serviceProvider))
-                {
-                    Query = new ObjectGraphType { Name = "Query" },
-                    Mutation = new ObjectGraphType { Name = "Mutation" },
-                    Subscription = new ObjectGraphType { Name = "Subscription" },
-                    NameConverter = new OrchardFieldNameConverter(),
-                };
+            foreach (var type in serviceProvider.GetServices<IInputObjectGraphType>())
+            {
+                schema.RegisterType(type);
+            }
 
-                foreach (var type in serviceProvider.GetServices<IInputObjectGraphType>())
-                {
-                    schema.RegisterType(type);
-                }
+            foreach (var type in serviceProvider.GetServices<IObjectGraphType>())
+            {
+                schema.RegisterType(type);
+            }
 
-                foreach (var type in serviceProvider.GetServices<IObjectGraphType>())
-                {
-                    schema.RegisterType(type);
-                }
+            foreach (var builder in _schemaBuilders)
+            {
+                var identifier = await builder.GetIdentifierAsync();
 
-                foreach (var builder in _schemaBuilders)
+                // Null being a valid value not yet updated.
+                if (identifier != string.Empty)
                 {
-                    var identifier = await builder.GetIdentifierAsync();
-
-                    // Null being a valid value not yet updated.
-                    if (identifier != string.Empty)
-                    {
-                        _identifiers[builder] = identifier;
-                    }
-
-                    await builder.BuildAsync(schema);
+                    _identifiers[builder] = identifier;
                 }
 
+                await builder.BuildAsync(schema);
+            }
 
-                // Clean Query, Mutation and Subscription if they have no fields
-                // to prevent GraphQL configuration errors.
-
-                if (schema.Query.Fields.Count == 0)
-                {
-                    schema.Query = null;
-                }
 
-                if (schema.Mutation.Fields.Count == 0)
-                {
-                    schema.Mutation = null;
-                }
+            // Clean Query, Mutation and Subscription if they have no fields
+            // to prevent GraphQL configuration errors.
 
-                if (schema.Subscription.Fields.Count == 0)
-                {
-                    schema.Subscription = null;
-                }
+            if (schema.Query.Fields.Count == 0)
+            {
+                schema.Query = null;
+            }
 
-                schema.Initialize();
-                return _schema = schema;
+            if (schema.Mutation.Fields.Count == 0)
+            {
+                schema.Mutation = null;
             }
-            finally
+
+            if (schema.Subscription.Fields.Count == 0)
             {
-                _schemaGenerationSemaphore.Release();
+                schema.Subscription = null;
             }
+
+            schema.Initialize();
+            return _schema = schema;
+        }
+        finally
+        {
+            _schemaGenerationSemaphore.Release();
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Startup.cs
index 1115d8b45e2..9248a17a326 100644
--- a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Startup.cs
@@ -19,77 +19,76 @@
 using OrchardCore.Navigation;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Apis.GraphQL
+namespace OrchardCore.Apis.GraphQL;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    private readonly IHostEnvironment _hostingEnvironment;
+
+    public Startup(IHostEnvironment hostingEnvironment)
     {
-        private readonly IHostEnvironment _hostingEnvironment;
+        _hostingEnvironment = hostingEnvironment;
+    }
 
-        public Startup(IHostEnvironment hostingEnvironment)
-        {
-            _hostingEnvironment = hostingEnvironment;
-        }
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddSingleton<IDocumentExecuter, DocumentExecuter>();
+        services.AddSingleton<IDataLoaderContextAccessor, DataLoaderContextAccessor>();
+        services.AddSingleton<IDocumentExecutionListener, DataLoaderDocumentListener>();
+
+        services.AddSingleton<ISchemaFactory, SchemaService>();
+        services.AddScoped<IValidationRule, MaxNumberOfResultsValidationRule>();
+        services.AddScoped<IValidationRule, RequiresPermissionValidationRule>();
 
-        public override void ConfigureServices(IServiceCollection services)
+        services.AddSingleton<IErrorInfoProvider>(services =>
         {
-            services.AddSingleton<IDocumentExecuter, DocumentExecuter>();
-            services.AddSingleton<IDataLoaderContextAccessor, DataLoaderContextAccessor>();
-            services.AddSingleton<IDocumentExecutionListener, DataLoaderDocumentListener>();
+            var settings = services.GetRequiredService<IOptions<GraphQLSettings>>();
+            return new ErrorInfoProvider(new ErrorInfoProviderOptions { ExposeExceptionDetails = settings.Value.ExposeExceptions });
+        });
 
-            services.AddSingleton<ISchemaFactory, SchemaService>();
-            services.AddScoped<IValidationRule, MaxNumberOfResultsValidationRule>();
-            services.AddScoped<IValidationRule, RequiresPermissionValidationRule>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddTransient<INavigationProvider, AdminMenu>();
+        services.AddSingleton<GraphQLMiddleware>();
 
-            services.AddSingleton<IErrorInfoProvider>(services =>
-            {
-                var settings = services.GetRequiredService<IOptions<GraphQLSettings>>();
-                return new ErrorInfoProvider(new ErrorInfoProviderOptions { ExposeExceptionDetails = settings.Value.ExposeExceptions });
-            });
+        services.AddGraphQL(builder => builder.AddSystemTextJson((options, sp) =>
+        {
+            // Common types of converters are already configured in the assembly "GraphQL.SystemTextJson".
+            options.Converters.Add(GraphQLNamedQueryRequestJsonConverter.Instance);
 
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddTransient<INavigationProvider, AdminMenu>();
-            services.AddSingleton<GraphQLMiddleware>();
+            var documentJsonSerializerOptions = sp.GetRequiredService<IOptions<DocumentJsonSerializerOptions>>().Value;
+            options.Merge(documentJsonSerializerOptions.SerializerOptions);
+        }));
 
-            services.AddGraphQL(builder => builder.AddSystemTextJson((options, sp) =>
-            {
-                // Common types of converters are already configured in the assembly "GraphQL.SystemTextJson".
-                options.Converters.Add(GraphQLNamedQueryRequestJsonConverter.Instance);
+        services.AddOptions<GraphQLSettings>().Configure<IShellConfiguration>((c, configuration) =>
+        {
+            var exposeExceptions = configuration.GetValue(
+                $"OrchardCore_Apis_GraphQL:{nameof(GraphQLSettings.ExposeExceptions)}",
+                _hostingEnvironment.IsDevelopment());
 
-                var documentJsonSerializerOptions = sp.GetRequiredService<IOptions<DocumentJsonSerializerOptions>>().Value;
-                options.Merge(documentJsonSerializerOptions.SerializerOptions);
-            }));
+            var maxNumberOfResultsValidationMode = configuration.GetValue<MaxNumberOfResultsValidationMode?>($"OrchardCore_Apis_GraphQL:{nameof(GraphQLSettings.MaxNumberOfResultsValidationMode)}")
+                                                    ?? MaxNumberOfResultsValidationMode.Default;
 
-            services.AddOptions<GraphQLSettings>().Configure<IShellConfiguration>((c, configuration) =>
+            if (maxNumberOfResultsValidationMode == MaxNumberOfResultsValidationMode.Default)
             {
-                var exposeExceptions = configuration.GetValue(
-                    $"OrchardCore_Apis_GraphQL:{nameof(GraphQLSettings.ExposeExceptions)}",
-                    _hostingEnvironment.IsDevelopment());
-
-                var maxNumberOfResultsValidationMode = configuration.GetValue<MaxNumberOfResultsValidationMode?>($"OrchardCore_Apis_GraphQL:{nameof(GraphQLSettings.MaxNumberOfResultsValidationMode)}")
-                                                        ?? MaxNumberOfResultsValidationMode.Default;
-
-                if (maxNumberOfResultsValidationMode == MaxNumberOfResultsValidationMode.Default)
-                {
-                    maxNumberOfResultsValidationMode = _hostingEnvironment.IsDevelopment() ? MaxNumberOfResultsValidationMode.Enabled : MaxNumberOfResultsValidationMode.Disabled;
-                }
+                maxNumberOfResultsValidationMode = _hostingEnvironment.IsDevelopment() ? MaxNumberOfResultsValidationMode.Enabled : MaxNumberOfResultsValidationMode.Disabled;
+            }
 
-                c.BuildUserContext = ctx => new GraphQLUserContext
-                {
-                    User = ctx.User,
-                };
-                c.ExposeExceptions = exposeExceptions;
-                c.MaxDepth = configuration.GetValue<int?>($"OrchardCore_Apis_GraphQL:{nameof(GraphQLSettings.MaxDepth)}") ?? 100;
-                c.MaxComplexity = configuration.GetValue<int?>($"OrchardCore_Apis_GraphQL:{nameof(GraphQLSettings.MaxComplexity)}");
-                c.FieldImpact = configuration.GetValue<double?>($"OrchardCore_Apis_GraphQL:{nameof(GraphQLSettings.FieldImpact)}");
-                c.MaxNumberOfResults = configuration.GetValue<int?>($"OrchardCore_Apis_GraphQL:{nameof(GraphQLSettings.MaxNumberOfResults)}") ?? 1000;
-                c.MaxNumberOfResultsValidationMode = maxNumberOfResultsValidationMode;
-                c.DefaultNumberOfResults = configuration.GetValue<int?>($"OrchardCore_Apis_GraphQL:{nameof(GraphQLSettings.DefaultNumberOfResults)}") ?? 100;
-            });
-        }
+            c.BuildUserContext = ctx => new GraphQLUserContext
+            {
+                User = ctx.User,
+            };
+            c.ExposeExceptions = exposeExceptions;
+            c.MaxDepth = configuration.GetValue<int?>($"OrchardCore_Apis_GraphQL:{nameof(GraphQLSettings.MaxDepth)}") ?? 100;
+            c.MaxComplexity = configuration.GetValue<int?>($"OrchardCore_Apis_GraphQL:{nameof(GraphQLSettings.MaxComplexity)}");
+            c.FieldImpact = configuration.GetValue<double?>($"OrchardCore_Apis_GraphQL:{nameof(GraphQLSettings.FieldImpact)}");
+            c.MaxNumberOfResults = configuration.GetValue<int?>($"OrchardCore_Apis_GraphQL:{nameof(GraphQLSettings.MaxNumberOfResults)}") ?? 1000;
+            c.MaxNumberOfResultsValidationMode = maxNumberOfResultsValidationMode;
+            c.DefaultNumberOfResults = configuration.GetValue<int?>($"OrchardCore_Apis_GraphQL:{nameof(GraphQLSettings.DefaultNumberOfResults)}") ?? 100;
+        });
+    }
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            app.UseMiddleware<GraphQLMiddleware>();
-        }
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        app.UseMiddleware<GraphQLMiddleware>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/ValidationRules/MaxNumberOfResultsValidationRule.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/ValidationRules/MaxNumberOfResultsValidationRule.cs
index 8f3ce387f3d..435275672b0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/ValidationRules/MaxNumberOfResultsValidationRule.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/ValidationRules/MaxNumberOfResultsValidationRule.cs
@@ -5,69 +5,68 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Apis.GraphQL.ValidationRules
+namespace OrchardCore.Apis.GraphQL.ValidationRules;
+
+public class MaxNumberOfResultsValidationRule : IValidationRule
 {
-    public class MaxNumberOfResultsValidationRule : IValidationRule
-    {
-        private readonly int _maxNumberOfResults;
-        private readonly MaxNumberOfResultsValidationMode _maxNumberOfResultsValidationMode;
-        protected readonly IStringLocalizer S;
-        private readonly ILogger _logger;
+    private readonly int _maxNumberOfResults;
+    private readonly MaxNumberOfResultsValidationMode _maxNumberOfResultsValidationMode;
+    protected readonly IStringLocalizer S;
+    private readonly ILogger _logger;
 
-        public MaxNumberOfResultsValidationRule(
-            IOptions<GraphQLSettings> options,
-            IStringLocalizer<MaxNumberOfResultsValidationRule> localizer,
-            ILogger<MaxNumberOfResultsValidationRule> logger)
-        {
-            var settings = options.Value;
-            _maxNumberOfResults = settings.MaxNumberOfResults;
-            _maxNumberOfResultsValidationMode = settings.MaxNumberOfResultsValidationMode;
-            S = localizer;
-            _logger = logger;
-        }
+    public MaxNumberOfResultsValidationRule(
+        IOptions<GraphQLSettings> options,
+        IStringLocalizer<MaxNumberOfResultsValidationRule> localizer,
+        ILogger<MaxNumberOfResultsValidationRule> logger)
+    {
+        var settings = options.Value;
+        _maxNumberOfResults = settings.MaxNumberOfResults;
+        _maxNumberOfResultsValidationMode = settings.MaxNumberOfResultsValidationMode;
+        S = localizer;
+        _logger = logger;
+    }
 
-        public ValueTask<INodeVisitor> ValidateAsync(ValidationContext validationContext)
+    public ValueTask<INodeVisitor> ValidateAsync(ValidationContext validationContext)
+    {
+        return ValueTask.FromResult((INodeVisitor)new NodeVisitors(
+        new MatchingNodeVisitor<GraphQLArgument>((arg, visitorContext) =>
         {
-            return ValueTask.FromResult((INodeVisitor)new NodeVisitors(
-            new MatchingNodeVisitor<GraphQLArgument>((arg, visitorContext) =>
+            if ((arg.Name == "first" || arg.Name == "last") && arg.Value != null)
             {
-                if ((arg.Name == "first" || arg.Name == "last") && arg.Value != null)
-                {
-                    var context = (GraphQLUserContext)validationContext.UserContext;
+                var context = (GraphQLUserContext)validationContext.UserContext;
 
-                    int? value = null;
+                int? value = null;
 
-                    if (arg.Value is GraphQLIntValue)
+                if (arg.Value is GraphQLIntValue)
+                {
+                    value = int.Parse((arg.Value as GraphQLIntValue).Value);
+                }
+                else
+                {
+                    if (validationContext.Variables.TryGetValue(arg.Value.ToString(), out var input))
                     {
-                        value = int.Parse((arg.Value as GraphQLIntValue).Value);
+                        value = (int?)input;
                     }
-                    else
+                }
+
+                if (value.HasValue && value > _maxNumberOfResults)
+                {
+                    if (_maxNumberOfResultsValidationMode == MaxNumberOfResultsValidationMode.Enabled)
                     {
-                        if (validationContext.Variables.TryGetValue(arg.Value.ToString(), out var input))
-                        {
-                            value = (int?)input;
-                        }
+                        validationContext.ReportError(new ValidationError(
+                            validationContext.Document.Source,
+                            "ArgumentInputError",
+                            S["'{0}' exceeds the maximum number of results for '{1}' ({2})", value.Value, arg.Name, _maxNumberOfResults],
+                            arg));
                     }
-
-                    if (value.HasValue && value > _maxNumberOfResults)
+                    else
                     {
-                        if (_maxNumberOfResultsValidationMode == MaxNumberOfResultsValidationMode.Enabled)
-                        {
-                            validationContext.ReportError(new ValidationError(
-                                validationContext.Document.Source,
-                                "ArgumentInputError",
-                                S["'{0}' exceeds the maximum number of results for '{1}' ({2})", value.Value, arg.Name, _maxNumberOfResults],
-                                arg));
-                        }
-                        else
-                        {
-                            _logger.LogInformation("'{value}' exceeds the maximum number of results for '{name}' ({total})", value.Value, arg.Name, _maxNumberOfResults);
+                        _logger.LogInformation("'{value}' exceeds the maximum number of results for '{name}' ({total})", value.Value, arg.Name, _maxNumberOfResults);
 
-                            arg = new GraphQLArgument(arg.Name, new GraphQLIntValue(_maxNumberOfResults)); // if disabled mode we just log info and override the arg to be maxvalue
-                        }
+                        arg = new GraphQLArgument(arg.Name, new GraphQLIntValue(_maxNumberOfResults)); // if disabled mode we just log info and override the arg to be maxvalue
                     }
                 }
-            })));
-        }
+            }
+        })));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/ValidationRules/RequiresPermissionValidationRule.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/ValidationRules/RequiresPermissionValidationRule.cs
index 8766d949501..729943e36d6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/ValidationRules/RequiresPermissionValidationRule.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/ValidationRules/RequiresPermissionValidationRule.cs
@@ -8,117 +8,116 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Apis.GraphQL.ValidationRules
+namespace OrchardCore.Apis.GraphQL.ValidationRules;
+
+public class RequiresPermissionValidationRule : IValidationRule
 {
-    public class RequiresPermissionValidationRule : IValidationRule
-    {
-        public static readonly string ErrorCode = "Unauthorized";
-        private readonly IAuthorizationService _authorizationService;
-        protected readonly IStringLocalizer S;
+    public static readonly string ErrorCode = "Unauthorized";
+    private readonly IAuthorizationService _authorizationService;
+    protected readonly IStringLocalizer S;
 
-        public RequiresPermissionValidationRule(
-            IAuthorizationService authorizationService,
-            IStringLocalizer<RequiresPermissionValidationRule> localizer)
-        {
-            _authorizationService = authorizationService;
-            S = localizer;
-        }
+    public RequiresPermissionValidationRule(
+        IAuthorizationService authorizationService,
+        IStringLocalizer<RequiresPermissionValidationRule> localizer)
+    {
+        _authorizationService = authorizationService;
+        S = localizer;
+    }
 
-        public async ValueTask<INodeVisitor> ValidateAsync(ValidationContext validationContext)
-        {
-            // shouldn't we access UserContext from validation-context inside MatchingNodeVisitor actions?
-            var userContext = (GraphQLUserContext)validationContext.UserContext;
+    public async ValueTask<INodeVisitor> ValidateAsync(ValidationContext validationContext)
+    {
+        // shouldn't we access UserContext from validation-context inside MatchingNodeVisitor actions?
+        var userContext = (GraphQLUserContext)validationContext.UserContext;
 
-            return await Task.FromResult(new NodeVisitors(
-                new MatchingNodeVisitor<GraphQLOperationDefinition>(async (operationDefinition, validationContext) =>
-                {
-                    await AuthorizeOperationAsync(operationDefinition, validationContext, userContext, operationDefinition.Operation, operationDefinition?.Name?.StringValue);
-                }),
-                new MatchingNodeVisitor<GraphQLObjectField>(async (objectFieldAst, validationContext) =>
-                {
-                    if (validationContext.TypeInfo.GetArgument()?.ResolvedType.GetNamedType() is IComplexGraphType argumentType)
-                    {
-                        var fieldType = argumentType.GetField(objectFieldAst.Name);
-                        await AuthorizeNodePermissionAsync(objectFieldAst, fieldType, validationContext, userContext);
-                    }
-                }),
-                new MatchingNodeVisitor<GraphQLField>(async (fieldAst, validationContext) =>
+        return await Task.FromResult(new NodeVisitors(
+            new MatchingNodeVisitor<GraphQLOperationDefinition>(async (operationDefinition, validationContext) =>
+            {
+                await AuthorizeOperationAsync(operationDefinition, validationContext, userContext, operationDefinition.Operation, operationDefinition?.Name?.StringValue);
+            }),
+            new MatchingNodeVisitor<GraphQLObjectField>(async (objectFieldAst, validationContext) =>
+            {
+                if (validationContext.TypeInfo.GetArgument()?.ResolvedType.GetNamedType() is IComplexGraphType argumentType)
                 {
-                    var fieldDef = validationContext.TypeInfo.GetFieldDef();
+                    var fieldType = argumentType.GetField(objectFieldAst.Name);
+                    await AuthorizeNodePermissionAsync(objectFieldAst, fieldType, validationContext, userContext);
+                }
+            }),
+            new MatchingNodeVisitor<GraphQLField>(async (fieldAst, validationContext) =>
+            {
+                var fieldDef = validationContext.TypeInfo.GetFieldDef();
 
-                    if (fieldDef == null)
-                        return;
+                if (fieldDef == null)
+                    return;
 
-                    // check target field
-                    await AuthorizeNodePermissionAsync(fieldAst, fieldDef, validationContext, userContext);
-                    // check returned graph type
-                    //   AuthorizeNodePermissionAsync(fieldAst, fieldDef.ResolvedType.GetNamedType(), validationContext, userContext).GetAwaiter().GetResult(); // TODO: need to think of something to avoid this
-                })
-            ));
-        }
+                // check target field
+                await AuthorizeNodePermissionAsync(fieldAst, fieldDef, validationContext, userContext);
+                // check returned graph type
+                //   AuthorizeNodePermissionAsync(fieldAst, fieldDef.ResolvedType.GetNamedType(), validationContext, userContext).GetAwaiter().GetResult(); // TODO: need to think of something to avoid this
+            })
+        ));
+    }
 
-        private async Task AuthorizeOperationAsync(ASTNode node, ValidationContext validationContext, GraphQLUserContext userContext, OperationType? operationType, string operationName)
+    private async Task AuthorizeOperationAsync(ASTNode node, ValidationContext validationContext, GraphQLUserContext userContext, OperationType? operationType, string operationName)
+    {
+        if (operationType == OperationType.Mutation && !(await _authorizationService.AuthorizeAsync(userContext.User, CommonPermissions.ExecuteGraphQLMutations)))
         {
-            if (operationType == OperationType.Mutation && !(await _authorizationService.AuthorizeAsync(userContext.User, CommonPermissions.ExecuteGraphQLMutations)))
-            {
-                validationContext.ReportError(new ValidationError(
-                    validationContext.Document.Source,
-                    ErrorCode,
-                    S["Authorization is required to access {0}.", operationName],
-                    node));
-            }
+            validationContext.ReportError(new ValidationError(
+                validationContext.Document.Source,
+                ErrorCode,
+                S["Authorization is required to access {0}.", operationName],
+                node));
         }
+    }
+
+    private async Task AuthorizeNodePermissionAsync(ASTNode node, FieldType fieldType, ValidationContext validationContext, GraphQLUserContext userContext)
+    {
+        var permissions = fieldType?.GetPermissions();
 
-        private async Task AuthorizeNodePermissionAsync(ASTNode node, FieldType fieldType, ValidationContext validationContext, GraphQLUserContext userContext)
+        if (permissions == null)
         {
-            var permissions = fieldType?.GetPermissions();
+            return;
+        }
 
-            if (permissions == null)
-            {
-                return;
-            }
+        var totalPermissions = permissions.Count();
 
-            var totalPermissions = permissions.Count();
+        if (totalPermissions == 0)
+        {
+            return;
+        }
 
-            if (totalPermissions == 0)
+        if (totalPermissions == 1)
+        {
+            var permission = permissions.First();
+            // small optimization for the single policy - no 'new List<>()', no 'await Task.WhenAll()'
+            if (!await _authorizationService.AuthorizeAsync(userContext.User, permission.Permission, permission.Resource))
             {
-                return;
+                AddPermissionValidationError(validationContext, node, fieldType.Name);
             }
+        }
+        else
+        {
+            var tasks = new List<Task<bool>>();
 
-            if (totalPermissions == 1)
+            foreach (var permission in permissions)
             {
-                var permission = permissions.First();
-                // small optimization for the single policy - no 'new List<>()', no 'await Task.WhenAll()'
-                if (!await _authorizationService.AuthorizeAsync(userContext.User, permission.Permission, permission.Resource))
-                {
-                    AddPermissionValidationError(validationContext, node, fieldType.Name);
-                }
+                tasks.Add(_authorizationService.AuthorizeAsync(userContext.User, permission.Permission, permission.Resource));
             }
-            else
-            {
-                var tasks = new List<Task<bool>>();
 
-                foreach (var permission in permissions)
-                {
-                    tasks.Add(_authorizationService.AuthorizeAsync(userContext.User, permission.Permission, permission.Resource));
-                }
-
-                var authorizationResults = await Task.WhenAll(tasks);
+            var authorizationResults = await Task.WhenAll(tasks);
 
-                if (authorizationResults.Any(isAuthorized => !isAuthorized))
-                {
-                    AddPermissionValidationError(validationContext, node, fieldType.Name);
-                }
+            if (authorizationResults.Any(isAuthorized => !isAuthorized))
+            {
+                AddPermissionValidationError(validationContext, node, fieldType.Name);
             }
         }
+    }
 
-        private void AddPermissionValidationError(ValidationContext validationContext, ASTNode node, string nodeName)
-        {
-            validationContext.ReportError(new ValidationError(
-                       validationContext.Document.Source,
-                       ErrorCode,
-                       S["Authorization is required to access the node. {0}", nodeName],
-                       node));
-        }
+    private void AddPermissionValidationError(ValidationContext validationContext, ASTNode node, string nodeName)
+    {
+        validationContext.ReportError(new ValidationError(
+                   validationContext.Document.Source,
+                   ErrorCode,
+                   S["Authorization is required to access the node. {0}", nodeName],
+                   node));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Controllers/AdminController.cs
index 257ea9ed920..bc8e3336a61 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Controllers/AdminController.cs
@@ -16,147 +16,146 @@
 using OrchardCore.Routing;
 using YesSql.Filters.Query;
 
-namespace OrchardCore.AuditTrail.Controllers
+namespace OrchardCore.AuditTrail.Controllers;
+
+public class AdminController : Controller
 {
-    public class AdminController : Controller
+    private readonly PagerOptions _pagerOptions;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly IAuditTrailManager _auditTrailManager;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IAuditTrailAdminListQueryService _auditTrailAdminListQueryService;
+    private readonly IDisplayManager<AuditTrailEvent> _displayManager;
+    private readonly IDisplayManager<AuditTrailIndexOptions> _auditTrailOptionsDisplayManager;
+    protected readonly IStringLocalizer S;
+
+    public AdminController(
+        IOptions<PagerOptions> pagerOptions,
+        IShapeFactory shapeFactory,
+        IAuditTrailManager auditTrailManager,
+        IUpdateModelAccessor updateModelAccessor,
+        IAuthorizationService authorizationService,
+        IAuditTrailAdminListQueryService auditTrailAdminListQueryService,
+        IDisplayManager<AuditTrailEvent> displayManager,
+        IDisplayManager<AuditTrailIndexOptions> auditTrailOptionsDisplayManager,
+        IStringLocalizer<AdminController> stringLocalizer)
+    {
+        _pagerOptions = pagerOptions.Value;
+        _shapeFactory = shapeFactory;
+        _auditTrailManager = auditTrailManager;
+        _updateModelAccessor = updateModelAccessor;
+        _authorizationService = authorizationService;
+        _auditTrailAdminListQueryService = auditTrailAdminListQueryService;
+        _displayManager = displayManager;
+        _auditTrailOptionsDisplayManager = auditTrailOptionsDisplayManager;
+        S = stringLocalizer;
+    }
+
+    [Admin("AuditTrail/{correlationId?}", "AuditTrailIndex")]
+    public async Task<ActionResult> Index([ModelBinder(BinderType = typeof(AuditTrailFilterEngineModelBinder), Name = "q")] QueryFilterResult<AuditTrailEvent> queryFilterResult, PagerParameters pagerParameters, string correlationId = "")
     {
-        private readonly PagerOptions _pagerOptions;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly IAuditTrailManager _auditTrailManager;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IAuditTrailAdminListQueryService _auditTrailAdminListQueryService;
-        private readonly IDisplayManager<AuditTrailEvent> _displayManager;
-        private readonly IDisplayManager<AuditTrailIndexOptions> _auditTrailOptionsDisplayManager;
-        protected readonly IStringLocalizer S;
-
-        public AdminController(
-            IOptions<PagerOptions> pagerOptions,
-            IShapeFactory shapeFactory,
-            IAuditTrailManager auditTrailManager,
-            IUpdateModelAccessor updateModelAccessor,
-            IAuthorizationService authorizationService,
-            IAuditTrailAdminListQueryService auditTrailAdminListQueryService,
-            IDisplayManager<AuditTrailEvent> displayManager,
-            IDisplayManager<AuditTrailIndexOptions> auditTrailOptionsDisplayManager,
-            IStringLocalizer<AdminController> stringLocalizer)
+        if (!await _authorizationService.AuthorizeAsync(User, AuditTrailPermissions.ViewAuditTrail))
         {
-            _pagerOptions = pagerOptions.Value;
-            _shapeFactory = shapeFactory;
-            _auditTrailManager = auditTrailManager;
-            _updateModelAccessor = updateModelAccessor;
-            _authorizationService = authorizationService;
-            _auditTrailAdminListQueryService = auditTrailAdminListQueryService;
-            _displayManager = displayManager;
-            _auditTrailOptionsDisplayManager = auditTrailOptionsDisplayManager;
-            S = stringLocalizer;
+            return Forbid();
         }
 
-        [Admin("AuditTrail/{correlationId?}", "AuditTrailIndex")]
-        public async Task<ActionResult> Index([ModelBinder(BinderType = typeof(AuditTrailFilterEngineModelBinder), Name = "q")] QueryFilterResult<AuditTrailEvent> queryFilterResult, PagerParameters pagerParameters, string correlationId = "")
+        var options = new AuditTrailIndexOptions
         {
-            if (!await _authorizationService.AuthorizeAsync(User, AuditTrailPermissions.ViewAuditTrail))
-            {
-                return Forbid();
-            }
-
-            var options = new AuditTrailIndexOptions
-            {
-                FilterResult = queryFilterResult
-            };
-
-            // This is used by Contents feature for routing so needs to be passed into the options.
-            if (!string.IsNullOrEmpty(correlationId))
-            {
-                options.CorrelationId = correlationId;
-                options.CorrelationIdFromRoute = true;
-            }
-
-            if (options.CorrelationIdFromRoute)
-            {
-                // When the correlation id is provided via the route or options a placeholder node is used to apply a filter.
-                options.FilterResult.TryAddOrReplace(new CorrelationIdFilterNode(options.CorrelationId));
-            }
-
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
-
-            // With the options populated we filter the query, allowing the filters to alter the options.
-            var result = await _auditTrailAdminListQueryService.QueryAsync(pager.Page, pager.PageSize, options);
-
-            // The search text is provided back to the UI.
-            options.SearchText = options.FilterResult.ToString();
-            options.OriginalSearchText = options.SearchText;
-
-            // Populate route values to maintain previous route data when generating page links.
-            options.RouteValues.TryAdd("q", options.FilterResult.ToString());
-
-            var pagerShape = await _shapeFactory.PagerAsync(pager, result.TotalCount, options.RouteValues);
-            var items = new List<IShape>();
-
-            foreach (var auditTrailEvent in result.Events)
-            {
-                items.Add(
-                    await _displayManager.BuildDisplayAsync(auditTrailEvent, updater: _updateModelAccessor.ModelUpdater, displayType: "SummaryAdmin")
-                );
-            }
-
-            var startIndex = (pager.Page - 1) * pager.PageSize + 1;
-            options.StartIndex = startIndex;
-            options.EndIndex = startIndex + items.Count - 1;
-            options.EventsCount = items.Count;
-            options.TotalItemCount = result.TotalCount;
-
-            var header = await _auditTrailOptionsDisplayManager.BuildEditorAsync(options, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
-
-            var shapeViewModel = await _shapeFactory.CreateAsync<AuditTrailListViewModel>("AuditTrailAdminList", viewModel =>
-            {
-                viewModel.Events = items;
-                viewModel.Pager = pagerShape;
-                viewModel.Options = options;
-                viewModel.Header = header;
-            });
-
-            return View(shapeViewModel);
+            FilterResult = queryFilterResult
+        };
+
+        // This is used by Contents feature for routing so needs to be passed into the options.
+        if (!string.IsNullOrEmpty(correlationId))
+        {
+            options.CorrelationId = correlationId;
+            options.CorrelationIdFromRoute = true;
         }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.Filter")]
-        public async Task<ActionResult> IndexFilterPOST(AuditTrailIndexOptions options)
+        if (options.CorrelationIdFromRoute)
         {
-            await _auditTrailOptionsDisplayManager.UpdateEditorAsync(options, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
-            // When the user has typed something into the search input no further evaluation of the form post is required.
-            if (!string.Equals(options.SearchText, options.OriginalSearchText, StringComparison.OrdinalIgnoreCase))
-            {
-                return RedirectToAction(nameof(Index), new RouteValueDictionary { { "q", options.SearchText } });
-            }
+            // When the correlation id is provided via the route or options a placeholder node is used to apply a filter.
+            options.FilterResult.TryAddOrReplace(new CorrelationIdFilterNode(options.CorrelationId));
+        }
 
-            // Evaluate the values provided in the form post and map them to the filter result and route values.
-            await _auditTrailOptionsDisplayManager.UpdateEditorAsync(options, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
 
-            // The route value must always be added after the editors have updated the models.
-            options.RouteValues.TryAdd("q", options.FilterResult.ToString());
+        // With the options populated we filter the query, allowing the filters to alter the options.
+        var result = await _auditTrailAdminListQueryService.QueryAsync(pager.Page, pager.PageSize, options);
 
-            return RedirectToAction(nameof(Index), options.RouteValues);
+        // The search text is provided back to the UI.
+        options.SearchText = options.FilterResult.ToString();
+        options.OriginalSearchText = options.SearchText;
+
+        // Populate route values to maintain previous route data when generating page links.
+        options.RouteValues.TryAdd("q", options.FilterResult.ToString());
+
+        var pagerShape = await _shapeFactory.PagerAsync(pager, result.TotalCount, options.RouteValues);
+        var items = new List<IShape>();
+
+        foreach (var auditTrailEvent in result.Events)
+        {
+            items.Add(
+                await _displayManager.BuildDisplayAsync(auditTrailEvent, updater: _updateModelAccessor.ModelUpdater, displayType: "SummaryAdmin")
+            );
         }
 
-        [Admin("AuditTrail/Display/{auditTrailEventId}", "AuditTrailDisplay")]
-        public async Task<ActionResult> Display(string auditTrailEventId)
+        var startIndex = (pager.Page - 1) * pager.PageSize + 1;
+        options.StartIndex = startIndex;
+        options.EndIndex = startIndex + items.Count - 1;
+        options.EventsCount = items.Count;
+        options.TotalItemCount = result.TotalCount;
+
+        var header = await _auditTrailOptionsDisplayManager.BuildEditorAsync(options, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
+
+        var shapeViewModel = await _shapeFactory.CreateAsync<AuditTrailListViewModel>("AuditTrailAdminList", viewModel =>
+        {
+            viewModel.Events = items;
+            viewModel.Pager = pagerShape;
+            viewModel.Options = options;
+            viewModel.Header = header;
+        });
+
+        return View(shapeViewModel);
+    }
+
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.Filter")]
+    public async Task<ActionResult> IndexFilterPOST(AuditTrailIndexOptions options)
+    {
+        await _auditTrailOptionsDisplayManager.UpdateEditorAsync(options, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
+        // When the user has typed something into the search input no further evaluation of the form post is required.
+        if (!string.Equals(options.SearchText, options.OriginalSearchText, StringComparison.OrdinalIgnoreCase))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, AuditTrailPermissions.ViewAuditTrail))
-            {
-                return Forbid();
-            }
+            return RedirectToAction(nameof(Index), new RouteValueDictionary { { "q", options.SearchText } });
+        }
+
+        // Evaluate the values provided in the form post and map them to the filter result and route values.
+        await _auditTrailOptionsDisplayManager.UpdateEditorAsync(options, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
 
-            var auditTrailEvent = await _auditTrailManager.GetEventAsync(auditTrailEventId);
-            if (auditTrailEvent == null)
-            {
-                return NotFound();
-            }
+        // The route value must always be added after the editors have updated the models.
+        options.RouteValues.TryAdd("q", options.FilterResult.ToString());
 
+        return RedirectToAction(nameof(Index), options.RouteValues);
+    }
 
-            var shape = await _displayManager.BuildDisplayAsync(auditTrailEvent, updater: _updateModelAccessor.ModelUpdater, displayType: "DetailAdmin");
+    [Admin("AuditTrail/Display/{auditTrailEventId}", "AuditTrailDisplay")]
+    public async Task<ActionResult> Display(string auditTrailEventId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, AuditTrailPermissions.ViewAuditTrail))
+        {
+            return Forbid();
+        }
 
-            return View(new AuditTrailItemViewModel { Shape = shape });
+        var auditTrailEvent = await _auditTrailManager.GetEventAsync(auditTrailEventId);
+        if (auditTrailEvent == null)
+        {
+            return NotFound();
         }
+
+
+        var shape = await _displayManager.BuildDisplayAsync(auditTrailEvent, updater: _updateModelAccessor.ModelUpdater, displayType: "DetailAdmin");
+
+        return View(new AuditTrailItemViewModel { Shape = shape });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Drivers/AuditTrailEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Drivers/AuditTrailEventDisplayDriver.cs
index 6243e2a01de..37f5002015c 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Drivers/AuditTrailEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Drivers/AuditTrailEventDisplayDriver.cs
@@ -6,37 +6,36 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.AuditTrail.Drivers
+namespace OrchardCore.AuditTrail.Drivers;
+
+public sealed class AuditTrailEventDisplayDriver : DisplayDriver<AuditTrailEvent>
 {
-    public sealed class AuditTrailEventDisplayDriver : DisplayDriver<AuditTrailEvent>
-    {
-        private readonly IAuditTrailManager _auditTrailManager;
+    private readonly IAuditTrailManager _auditTrailManager;
 
-        public AuditTrailEventDisplayDriver(IAuditTrailManager auditTrailManager)
-        {
-            _auditTrailManager = auditTrailManager;
-        }
+    public AuditTrailEventDisplayDriver(IAuditTrailManager auditTrailManager)
+    {
+        _auditTrailManager = auditTrailManager;
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(AuditTrailEvent auditTrailEvent, BuildDisplayContext context)
-        {
-            var descriptor = _auditTrailManager.DescribeEvent(auditTrailEvent);
+    public override Task<IDisplayResult> DisplayAsync(AuditTrailEvent auditTrailEvent, BuildDisplayContext context)
+    {
+        var descriptor = _auditTrailManager.DescribeEvent(auditTrailEvent);
 
-            return CombineAsync(
-                Initialize<AuditTrailEventViewModel>("AuditTrailEventTags_SummaryAdmin", model => BuildViewModel(auditTrailEvent, model, descriptor))
-                    .Location("SummaryAdmin", "EventTags:10"),
-                Initialize<AuditTrailEventViewModel>("AuditTrailEventMeta_SummaryAdmin", model => BuildViewModel(auditTrailEvent, model, descriptor))
-                    .Location("SummaryAdmin", "EventMeta:10"),
-                Initialize<AuditTrailEventViewModel>("AuditTrailEventActions_SummaryAdmin", model => BuildViewModel(auditTrailEvent, model, descriptor))
-                    .Location("SummaryAdmin", "Actions:10"),
-                Initialize<AuditTrailEventViewModel>("AuditTrailEventDetail_DetailAdmin", model => BuildViewModel(auditTrailEvent, model, descriptor))
-                    .Location("DetailAdmin", "Content:before")
-            );
-        }
+        return CombineAsync(
+            Initialize<AuditTrailEventViewModel>("AuditTrailEventTags_SummaryAdmin", model => BuildViewModel(auditTrailEvent, model, descriptor))
+                .Location("SummaryAdmin", "EventTags:10"),
+            Initialize<AuditTrailEventViewModel>("AuditTrailEventMeta_SummaryAdmin", model => BuildViewModel(auditTrailEvent, model, descriptor))
+                .Location("SummaryAdmin", "EventMeta:10"),
+            Initialize<AuditTrailEventViewModel>("AuditTrailEventActions_SummaryAdmin", model => BuildViewModel(auditTrailEvent, model, descriptor))
+                .Location("SummaryAdmin", "Actions:10"),
+            Initialize<AuditTrailEventViewModel>("AuditTrailEventDetail_DetailAdmin", model => BuildViewModel(auditTrailEvent, model, descriptor))
+                .Location("DetailAdmin", "Content:before")
+        );
+    }
 
-        public static void BuildViewModel(AuditTrailEvent auditTrailEvent, AuditTrailEventViewModel model, AuditTrailEventDescriptor descriptor)
-        {
-            model.AuditTrailEvent = auditTrailEvent;
-            model.Descriptor = descriptor;
-        }
+    public static void BuildViewModel(AuditTrailEvent auditTrailEvent, AuditTrailEventViewModel model, AuditTrailEventDescriptor descriptor)
+    {
+        model.AuditTrailEvent = auditTrailEvent;
+        model.Descriptor = descriptor;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Drivers/AuditTrailOptionsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Drivers/AuditTrailOptionsDisplayDriver.cs
index ff58038d201..a7474365b2c 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Drivers/AuditTrailOptionsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Drivers/AuditTrailOptionsDisplayDriver.cs
@@ -3,67 +3,66 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.AuditTrail.Drivers
+namespace OrchardCore.AuditTrail.Drivers;
+
+public sealed class AuditTrailOptionsDisplayDriver : DisplayDriver<AuditTrailIndexOptions>
 {
-    public sealed class AuditTrailOptionsDisplayDriver : DisplayDriver<AuditTrailIndexOptions>
+    // Maintain the Options prefix for compatibility with binding.
+    protected override void BuildPrefix(AuditTrailIndexOptions options, string htmlFieldPrefix)
     {
-        // Maintain the Options prefix for compatibility with binding.
-        protected override void BuildPrefix(AuditTrailIndexOptions options, string htmlFieldPrefix)
-        {
-            Prefix = "Options";
-        }
+        Prefix = "Options";
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(AuditTrailIndexOptions model, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                View("AuditTrailAdminFilters_Thumbnail__Category", model).Location("Thumbnail", "Content:10"),
-                View("AuditTrailAdminFilters_Thumbnail__Event", model).Location("Thumbnail", "Content:10"),
-                View("AuditTrailAdminFilters_Thumbnail__Date", model).Location("Thumbnail", "Content:20"),
-                View("AuditTrailAdminFilters_Thumbnail__UserName", model).Location("Thumbnail", "Content:30"),
-                View("AuditTrailAdminFilters_Thumbnail__UserId", model).Location("Thumbnail", "Content:40"),
-                View("AuditTrailAdminFilters_Thumbnail__CorrelationId", model).Location("Thumbnail", "Content:50")
-            );
-        }
+    public override Task<IDisplayResult> DisplayAsync(AuditTrailIndexOptions model, BuildDisplayContext context)
+    {
+        return CombineAsync(
+            View("AuditTrailAdminFilters_Thumbnail__Category", model).Location("Thumbnail", "Content:10"),
+            View("AuditTrailAdminFilters_Thumbnail__Event", model).Location("Thumbnail", "Content:10"),
+            View("AuditTrailAdminFilters_Thumbnail__Date", model).Location("Thumbnail", "Content:20"),
+            View("AuditTrailAdminFilters_Thumbnail__UserName", model).Location("Thumbnail", "Content:30"),
+            View("AuditTrailAdminFilters_Thumbnail__UserId", model).Location("Thumbnail", "Content:40"),
+            View("AuditTrailAdminFilters_Thumbnail__CorrelationId", model).Location("Thumbnail", "Content:50")
+        );
+    }
 
-        public override Task<IDisplayResult> EditAsync(AuditTrailIndexOptions model, BuildEditorContext context)
-        {
-            // Map the filter result to a model so the ui can reflect current selections.
-            model.FilterResult.MapTo(model);
+    public override Task<IDisplayResult> EditAsync(AuditTrailIndexOptions model, BuildEditorContext context)
+    {
+        // Map the filter result to a model so the ui can reflect current selections.
+        model.FilterResult.MapTo(model);
 
-            return CombineAsync(
-                Initialize<AuditTrailIndexOptions>("AuditTrailAdminListSearch", m => BuildUserOptionsViewModel(m, model)).Location("Search:10"),
-                Initialize<AuditTrailIndexOptions>("AuditTrailAdminListSummary", m => BuildUserOptionsViewModel(m, model)).Location("Summary:10"),
-                Initialize<AuditTrailIndexOptions>("AuditTrailAdminListFilters", m => BuildUserOptionsViewModel(m, model)).Location("Actions:10.1")
-            );
-        }
+        return CombineAsync(
+            Initialize<AuditTrailIndexOptions>("AuditTrailAdminListSearch", m => BuildUserOptionsViewModel(m, model)).Location("Search:10"),
+            Initialize<AuditTrailIndexOptions>("AuditTrailAdminListSummary", m => BuildUserOptionsViewModel(m, model)).Location("Summary:10"),
+            Initialize<AuditTrailIndexOptions>("AuditTrailAdminListFilters", m => BuildUserOptionsViewModel(m, model)).Location("Actions:10.1")
+        );
+    }
 
-        public override Task<IDisplayResult> UpdateAsync(AuditTrailIndexOptions model, UpdateEditorContext context)
-        {
-            // Map the incoming values from a form post to the filter result.
-            model.FilterResult.MapFrom(model);
+    public override Task<IDisplayResult> UpdateAsync(AuditTrailIndexOptions model, UpdateEditorContext context)
+    {
+        // Map the incoming values from a form post to the filter result.
+        model.FilterResult.MapFrom(model);
 
-            return EditAsync(model, context);
-        }
+        return EditAsync(model, context);
+    }
 
-        private static void BuildUserOptionsViewModel(AuditTrailIndexOptions m, AuditTrailIndexOptions model)
-        {
-            m.SearchText = model.SearchText;
-            m.OriginalSearchText = model.OriginalSearchText;
-            m.Category = model.Category;
-            m.CorrelationId = model.CorrelationId;
-            m.CorrelationIdFromRoute = model.CorrelationIdFromRoute;
-            m.Categories = model.Categories;
-            m.Event = model.Event;
-            m.Events = model.Events;
-            m.Sort = model.Sort;
-            m.AuditTrailSorts = model.AuditTrailSorts;
-            m.Date = model.Date;
-            m.AuditTrailDates = model.AuditTrailDates;
-            m.StartIndex = model.StartIndex;
-            m.EndIndex = model.EndIndex;
-            m.EventsCount = model.EventsCount;
-            m.TotalItemCount = model.TotalItemCount;
-            m.FilterResult = model.FilterResult;
-        }
+    private static void BuildUserOptionsViewModel(AuditTrailIndexOptions m, AuditTrailIndexOptions model)
+    {
+        m.SearchText = model.SearchText;
+        m.OriginalSearchText = model.OriginalSearchText;
+        m.Category = model.Category;
+        m.CorrelationId = model.CorrelationId;
+        m.CorrelationIdFromRoute = model.CorrelationIdFromRoute;
+        m.Categories = model.Categories;
+        m.Event = model.Event;
+        m.Events = model.Events;
+        m.Sort = model.Sort;
+        m.AuditTrailSorts = model.AuditTrailSorts;
+        m.Date = model.Date;
+        m.AuditTrailDates = model.AuditTrailDates;
+        m.StartIndex = model.StartIndex;
+        m.EndIndex = model.EndIndex;
+        m.EventsCount = model.EventsCount;
+        m.TotalItemCount = model.TotalItemCount;
+        m.FilterResult = model.FilterResult;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Drivers/AuditTrailSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Drivers/AuditTrailSettingsDisplayDriver.cs
index 10d1e871ca2..b36e79c7c42 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Drivers/AuditTrailSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Drivers/AuditTrailSettingsDisplayDriver.cs
@@ -11,108 +11,107 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Settings;
 
-namespace OrchardCore.AuditTrail.Drivers
+namespace OrchardCore.AuditTrail.Drivers;
+
+public sealed class AuditTrailSettingsDisplayDriver : SiteDisplayDriver<AuditTrailSettings>
 {
-    public sealed class AuditTrailSettingsDisplayDriver : SiteDisplayDriver<AuditTrailSettings>
+    private readonly IAuditTrailManager _auditTrailManager;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IServiceProvider _serviceProvider;
+
+    public AuditTrailSettingsDisplayDriver(
+        IAuditTrailManager auditTrailManager,
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService,
+        IServiceProvider serviceProvider)
     {
-        private readonly IAuditTrailManager _auditTrailManager;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IServiceProvider _serviceProvider;
+        _auditTrailManager = auditTrailManager;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+        _serviceProvider = serviceProvider;
+    }
 
-        public AuditTrailSettingsDisplayDriver(
-            IAuditTrailManager auditTrailManager,
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService,
-            IServiceProvider serviceProvider)
+    protected override string SettingsGroupId
+        => AuditTrailSettingsGroup.Id;
+
+    public override async Task<IDisplayResult> EditAsync(ISite site, AuditTrailSettings settings, BuildEditorContext context)
+    {
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User, AuditTrailPermissions.ManageAuditTrailSettings))
         {
-            _auditTrailManager = auditTrailManager;
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-            _serviceProvider = serviceProvider;
+            return null;
         }
 
-        protected override string SettingsGroupId
-            => AuditTrailSettingsGroup.Id;
-
-        public override async Task<IDisplayResult> EditAsync(ISite site, AuditTrailSettings settings, BuildEditorContext context)
+        return Initialize<AuditTrailSettingsViewModel>("AuditTrailSettings_Edit", model =>
         {
-            if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User, AuditTrailPermissions.ManageAuditTrailSettings))
-            {
-                return null;
-            }
+            var categories = _auditTrailManager.DescribeCategories();
 
-            return Initialize<AuditTrailSettingsViewModel>("AuditTrailSettings_Edit", model =>
-            {
-                var categories = _auditTrailManager.DescribeCategories();
+            var settingsGroups = settings.Categories
+                .ToLookup(category => category.Events
+                .FirstOrDefault()?.Category ?? "");
 
-                var settingsGroups = settings.Categories
-                    .ToLookup(category => category.Events
-                    .FirstOrDefault()?.Category ?? "");
+            var categoriesViewModel = categories
+                .Select(category => new AuditTrailCategorySettingsViewModel()
+                {
+                    Name = category.Name,
+                    LocalizedName = category.LocalizedName(_serviceProvider),
+                    Events = category.Events.Values
+                        .Select(auditTrailEvent =>
+                        {
+                            var settings = settingsGroups[auditTrailEvent.Category]
+                                .FirstOrDefault()?.Events
+                                .FirstOrDefault(settings => settings.Name == auditTrailEvent.Name);
 
-                var categoriesViewModel = categories
-                    .Select(category => new AuditTrailCategorySettingsViewModel()
-                    {
-                        Name = category.Name,
-                        LocalizedName = category.LocalizedName(_serviceProvider),
-                        Events = category.Events.Values
-                            .Select(auditTrailEvent =>
+                            return new AuditTrailEventSettingsViewModel()
                             {
-                                var settings = settingsGroups[auditTrailEvent.Category]
-                                    .FirstOrDefault()?.Events
-                                    .FirstOrDefault(settings => settings.Name == auditTrailEvent.Name);
+                                Name = auditTrailEvent.Name,
+                                Category = auditTrailEvent.Category,
+                                LocalizedName = auditTrailEvent.LocalizedName(_serviceProvider),
+                                Description = auditTrailEvent.Description(_serviceProvider),
+                                IsEnabled = auditTrailEvent.IsMandatory || (settings?.IsEnabled ?? auditTrailEvent.IsEnabledByDefault),
+                                IsMandatory = auditTrailEvent.IsMandatory
+                            };
+                        })
+                    .ToArray()
+                })
+            .ToArray();
 
-                                return new AuditTrailEventSettingsViewModel()
-                                {
-                                    Name = auditTrailEvent.Name,
-                                    Category = auditTrailEvent.Category,
-                                    LocalizedName = auditTrailEvent.LocalizedName(_serviceProvider),
-                                    Description = auditTrailEvent.Description(_serviceProvider),
-                                    IsEnabled = auditTrailEvent.IsMandatory || (settings?.IsEnabled ?? auditTrailEvent.IsEnabledByDefault),
-                                    IsMandatory = auditTrailEvent.IsMandatory
-                                };
-                            })
-                        .ToArray()
-                    })
-                .ToArray();
+            model.Categories = categoriesViewModel;
+            model.ClientIpAddressAllowed = settings.ClientIpAddressAllowed;
+        }).Location("Content:1#Events")
+        .OnGroup(SettingsGroupId);
+    }
 
-                model.Categories = categoriesViewModel;
-                model.ClientIpAddressAllowed = settings.ClientIpAddressAllowed;
-            }).Location("Content:1#Events")
-            .OnGroup(SettingsGroupId);
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, AuditTrailSettings settings, UpdateEditorContext context)
+    {
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User, AuditTrailPermissions.ManageAuditTrailSettings))
+        {
+            return null;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, AuditTrailSettings settings, UpdateEditorContext context)
+        if (context.GroupId == AuditTrailSettingsGroup.Id)
         {
-            if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User, AuditTrailPermissions.ManageAuditTrailSettings))
-            {
-                return null;
-            }
-
-            if (context.GroupId == AuditTrailSettingsGroup.Id)
-            {
-                var model = new AuditTrailSettingsViewModel();
-                await context.Updater.TryUpdateModelAsync(model, Prefix);
-
-                settings.Categories = model.Categories
-                    .Select(categorySettings => new AuditTrailCategorySettings()
-                    {
-                        Name = categorySettings.Name,
-                        Events = categorySettings.Events
-                            .Select(settings => new AuditTrailEventSettings()
-                            {
-                                Name = settings.Name,
-                                Category = settings.Category,
-                                IsEnabled = settings.IsEnabled
-                            })
-                            .ToArray()
-                    })
-                    .ToArray();
+            var model = new AuditTrailSettingsViewModel();
+            await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-                settings.ClientIpAddressAllowed = model.ClientIpAddressAllowed;
-            }
+            settings.Categories = model.Categories
+                .Select(categorySettings => new AuditTrailCategorySettings()
+                {
+                    Name = categorySettings.Name,
+                    Events = categorySettings.Events
+                        .Select(settings => new AuditTrailEventSettings()
+                        {
+                            Name = settings.Name,
+                            Category = settings.Category,
+                            IsEnabled = settings.IsEnabled
+                        })
+                        .ToArray()
+                })
+                .ToArray();
 
-            return await EditAsync(site, settings, context);
+            settings.ClientIpAddressAllowed = model.ClientIpAddressAllowed;
         }
+
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Drivers/AuditTrailTrimmingSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Drivers/AuditTrailTrimmingSettingsDisplayDriver.cs
index 383dda9d18f..9aba9a6f5a1 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Drivers/AuditTrailTrimmingSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Drivers/AuditTrailTrimmingSettingsDisplayDriver.cs
@@ -8,53 +8,52 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Settings;
 
-namespace OrchardCore.AuditTrail.Drivers
+namespace OrchardCore.AuditTrail.Drivers;
+
+public sealed class AuditTrailTrimmingSettingsDisplayDriver : SiteDisplayDriver<AuditTrailTrimmingSettings>
 {
-    public sealed class AuditTrailTrimmingSettingsDisplayDriver : SiteDisplayDriver<AuditTrailTrimmingSettings>
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+
+    public AuditTrailTrimmingSettingsDisplayDriver(IHttpContextAccessor httpContextAccessor, IAuthorizationService authorizationService)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
 
-        public AuditTrailTrimmingSettingsDisplayDriver(IHttpContextAccessor httpContextAccessor, IAuthorizationService authorizationService)
+    protected override string SettingsGroupId
+        => AuditTrailSettingsGroup.Id;
+
+    public override async Task<IDisplayResult> EditAsync(ISite site, AuditTrailTrimmingSettings section, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, AuditTrailPermissions.ManageAuditTrailSettings))
         {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
+            return null;
         }
 
-        protected override string SettingsGroupId
-            => AuditTrailSettingsGroup.Id;
-
-        public override async Task<IDisplayResult> EditAsync(ISite site, AuditTrailTrimmingSettings section, BuildEditorContext context)
+        return Initialize<AuditTrailTrimmingSettingsViewModel>("AuditTrailTrimmingSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, AuditTrailPermissions.ManageAuditTrailSettings))
-            {
-                return null;
-            }
-
-            return Initialize<AuditTrailTrimmingSettingsViewModel>("AuditTrailTrimmingSettings_Edit", model =>
-            {
-                model.RetentionDays = section.RetentionDays;
-                model.LastRunUtc = section.LastRunUtc;
-                model.Disabled = section.Disabled;
-            }).Location("Content:10#Trimming;0")
-            .OnGroup(SettingsGroupId);
-        }
+            model.RetentionDays = section.RetentionDays;
+            model.LastRunUtc = section.LastRunUtc;
+            model.Disabled = section.Disabled;
+        }).Location("Content:10#Trimming;0")
+        .OnGroup(SettingsGroupId);
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, AuditTrailTrimmingSettings section, UpdateEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, AuditTrailTrimmingSettings section, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, AuditTrailPermissions.ManageAuditTrailSettings))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, AuditTrailPermissions.ManageAuditTrailSettings))
-            {
-                return null;
-            }
-
-            var model = new AuditTrailTrimmingSettingsViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
-            section.RetentionDays = model.RetentionDays;
-            section.Disabled = model.Disabled;
-
-            return await EditAsync(site, section, context);
+            return null;
         }
+
+        var model = new AuditTrailTrimmingSettingsViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
+        section.RetentionDays = model.RetentionDays;
+        section.Disabled = model.Disabled;
+
+        return await EditAsync(site, section, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Indexes/AuditTrailEventIndexProvider.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Indexes/AuditTrailEventIndexProvider.cs
index 2234cdbfa2f..841c60f8b7f 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Indexes/AuditTrailEventIndexProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Indexes/AuditTrailEventIndexProvider.cs
@@ -1,26 +1,25 @@
 using OrchardCore.AuditTrail.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.AuditTrail.Indexes
+namespace OrchardCore.AuditTrail.Indexes;
+
+public class AuditTrailEventIndexProvider : IndexProvider<AuditTrailEvent>
 {
-    public class AuditTrailEventIndexProvider : IndexProvider<AuditTrailEvent>
-    {
-        public AuditTrailEventIndexProvider() => CollectionName = AuditTrailEvent.Collection;
+    public AuditTrailEventIndexProvider() => CollectionName = AuditTrailEvent.Collection;
 
-        public override void Describe(DescribeContext<AuditTrailEvent> context) =>
-            context.For<AuditTrailEventIndex>()
-                .Map(auditTrailEvent =>
+    public override void Describe(DescribeContext<AuditTrailEvent> context) =>
+        context.For<AuditTrailEventIndex>()
+            .Map(auditTrailEvent =>
+            {
+                return new AuditTrailEventIndex
                 {
-                    return new AuditTrailEventIndex
-                    {
-                        EventId = auditTrailEvent.EventId,
-                        Category = auditTrailEvent.Category,
-                        Name = auditTrailEvent.Name,
-                        CorrelationId = auditTrailEvent.CorrelationId,
-                        UserId = auditTrailEvent.UserId,
-                        NormalizedUserName = auditTrailEvent.NormalizedUserName,
-                        CreatedUtc = auditTrailEvent.CreatedUtc
-                    };
-                });
-    }
+                    EventId = auditTrailEvent.EventId,
+                    Category = auditTrailEvent.Category,
+                    Name = auditTrailEvent.Name,
+                    CorrelationId = auditTrailEvent.CorrelationId,
+                    UserId = auditTrailEvent.UserId,
+                    NormalizedUserName = auditTrailEvent.NormalizedUserName,
+                    CreatedUtc = auditTrailEvent.CreatedUtc
+                };
+            });
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Migrations.cs
index c82bfc3419f..152ada1109d 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Migrations.cs
@@ -5,37 +5,36 @@
 using OrchardCore.Data.Migration;
 using YesSql.Sql;
 
-namespace OrchardCore.AuditTrail
+namespace OrchardCore.AuditTrail;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
+    public async Task<int> CreateAsync()
     {
-        public async Task<int> CreateAsync()
-        {
-            await SchemaBuilder.CreateMapIndexTableAsync<AuditTrailEventIndex>(table => table
-                .Column<string>(nameof(AuditTrailEventIndex.EventId), column => column.WithLength(26))
-                .Column<string>(nameof(AuditTrailEventIndex.Category), column => column.WithLength(64))
-                .Column<string>(nameof(AuditTrailEventIndex.Name), column => column.WithLength(64))
-                .Column<string>(nameof(AuditTrailEventIndex.CorrelationId), column => column.WithLength(26))
-                .Column<string>(nameof(AuditTrailEventIndex.UserId), column => column.WithLength(26))
-                .Column<string>(nameof(AuditTrailEventIndex.NormalizedUserName), column => column.Nullable().WithLength(255))
-                .Column<DateTime>(nameof(AuditTrailEventIndex.CreatedUtc), column => column.Nullable()),
-                collection: AuditTrailEvent.Collection);
+        await SchemaBuilder.CreateMapIndexTableAsync<AuditTrailEventIndex>(table => table
+            .Column<string>(nameof(AuditTrailEventIndex.EventId), column => column.WithLength(26))
+            .Column<string>(nameof(AuditTrailEventIndex.Category), column => column.WithLength(64))
+            .Column<string>(nameof(AuditTrailEventIndex.Name), column => column.WithLength(64))
+            .Column<string>(nameof(AuditTrailEventIndex.CorrelationId), column => column.WithLength(26))
+            .Column<string>(nameof(AuditTrailEventIndex.UserId), column => column.WithLength(26))
+            .Column<string>(nameof(AuditTrailEventIndex.NormalizedUserName), column => column.Nullable().WithLength(255))
+            .Column<DateTime>(nameof(AuditTrailEventIndex.CreatedUtc), column => column.Nullable()),
+            collection: AuditTrailEvent.Collection);
 
-            await SchemaBuilder.AlterIndexTableAsync<AuditTrailEventIndex>(table => table
-                .CreateIndex("IDX_AuditTrailEventIndex_DocumentId",
-                    "DocumentId",
-                    "EventId",
-                    "Category",
-                    "Name",
-                    "CorrelationId",
-                    "UserId",
-                    "NormalizedUserName",
-                    "CreatedUtc"
-                    ),
-                collection: AuditTrailEvent.Collection
-            );
+        await SchemaBuilder.AlterIndexTableAsync<AuditTrailEventIndex>(table => table
+            .CreateIndex("IDX_AuditTrailEventIndex_DocumentId",
+                "DocumentId",
+                "EventId",
+                "Category",
+                "Name",
+                "CorrelationId",
+                "UserId",
+                "NormalizedUserName",
+                "CreatedUtc"
+                ),
+            collection: AuditTrailEvent.Collection
+        );
 
-            return 1;
-        }
+        return 1;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs
index ee7b52f4b40..10278fb70fa 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs
@@ -4,40 +4,39 @@
 using OrchardCore.AuditTrail.Controllers;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.AuditTrail.Navigation
+namespace OrchardCore.AuditTrail.Navigation;
+
+public sealed class AuditTrailAdminMenu : INavigationProvider
 {
-    public sealed class AuditTrailAdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.AuditTrail" },
-            { "correlationId", string.Empty },
-        };
+        { "area", "OrchardCore.AuditTrail" },
+        { "correlationId", string.Empty },
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AuditTrailAdminMenu(IStringLocalizer<AuditTrailAdminMenu> stringLocalizer)
-        {
-            S = stringLocalizer;
-        }
+    public AuditTrailAdminMenu(IStringLocalizer<AuditTrailAdminMenu> stringLocalizer)
+    {
+        S = stringLocalizer;
+    }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
-                    .AddClass("audittrail")
-                    .Id("audittrail")
-                    .Action(nameof(AdminController.Index), "Admin", _routeValues)
-                    .Permission(AuditTrailPermissions.ViewAuditTrail)
-                    .LocalNav()
-                );
-
             return Task.CompletedTask;
         }
+
+        builder
+            .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration
+                .AddClass("audittrail")
+                .Id("audittrail")
+                .Action(nameof(AdminController.Index), "Admin", _routeValues)
+                .Permission(AuditTrailPermissions.ViewAuditTrail)
+                .LocalNav()
+            );
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailSettingsAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailSettingsAdminMenu.cs
index b83b86a79fc..d7f215049b0 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailSettingsAdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailSettingsAdminMenu.cs
@@ -4,44 +4,43 @@
 using OrchardCore.AuditTrail.Settings;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.AuditTrail.Navigation
+namespace OrchardCore.AuditTrail.Navigation;
+
+public sealed class AuditTrailSettingsAdminMenu : INavigationProvider
 {
-    public sealed class AuditTrailSettingsAdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", AuditTrailSettingsGroup.Id },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", AuditTrailSettingsGroup.Id },
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AuditTrailSettingsAdminMenu(IStringLocalizer<AuditTrailSettingsAdminMenu> stringLocalizer)
-        {
-            S = stringLocalizer;
-        }
+    public AuditTrailSettingsAdminMenu(IStringLocalizer<AuditTrailSettingsAdminMenu> stringLocalizer)
+    {
+        S = stringLocalizer;
+    }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            builder
-                 .Add(S["Configuration"], configuration => configuration
-                     .Add(S["Settings"], settings => settings
-                        .Add(S["Audit Trail"], S["Audit Trail"].PrefixPosition(), auditTrail => auditTrail
-                            .AddClass("audittrail")
-                            .Id("audittrailSettings")
-                            .Action("Index", "Admin", _routeValues)
-                            .Permission(AuditTrailPermissions.ManageAuditTrailSettings)
-                            .LocalNav()
-                        )
+        builder
+             .Add(S["Configuration"], configuration => configuration
+                 .Add(S["Settings"], settings => settings
+                    .Add(S["Audit Trail"], S["Audit Trail"].PrefixPosition(), auditTrail => auditTrail
+                        .AddClass("audittrail")
+                        .Id("audittrailSettings")
+                        .Action("Index", "Admin", _routeValues)
+                        .Permission(AuditTrailPermissions.ManageAuditTrailSettings)
+                        .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/AuditTrailBackgroundTask.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/AuditTrailBackgroundTask.cs
index d26bd79bea6..7add51b22d7 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/AuditTrailBackgroundTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/AuditTrailBackgroundTask.cs
@@ -9,55 +9,54 @@
 using OrchardCore.Modules;
 using OrchardCore.Settings;
 
-namespace OrchardCore.AuditTrail.Services
-{
-    [BackgroundTask(
-        Title = "Audit Trail Events Purger",
-        Schedule = "0 0 * * *",
-        Description = "Regularly purges old Audit Trail events.",
-        LockTimeout = 3_000, LockExpiration = 30_000)]
+namespace OrchardCore.AuditTrail.Services;
+
+[BackgroundTask(
+    Title = "Audit Trail Events Purger",
+    Schedule = "0 0 * * *",
+    Description = "Regularly purges old Audit Trail events.",
+    LockTimeout = 3_000, LockExpiration = 30_000)]
 
-    public sealed class AuditTrailBackgroundTask : IBackgroundTask
+public sealed class AuditTrailBackgroundTask : IBackgroundTask
+{
+    public async Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken)
     {
-        public async Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken)
+        var siteService = serviceProvider.GetRequiredService<ISiteService>();
+
+        var settings = await siteService.GetSettingsAsync<AuditTrailTrimmingSettings>();
+        if (settings.Disabled)
         {
-            var siteService = serviceProvider.GetRequiredService<ISiteService>();
+            return;
+        }
 
-            var settings = await siteService.GetSettingsAsync<AuditTrailTrimmingSettings>();
-            if (settings.Disabled)
-            {
-                return;
-            }
+        var logger = serviceProvider.GetRequiredService<ILogger<AuditTrailBackgroundTask>>();
+        logger.LogDebug("Audit Trail trimming: beginning sweep.");
 
-            var logger = serviceProvider.GetRequiredService<ILogger<AuditTrailBackgroundTask>>();
-            logger.LogDebug("Audit Trail trimming: beginning sweep.");
+        try
+        {
+            var clock = serviceProvider.GetRequiredService<IClock>();
+            var auditTrailManager = serviceProvider.GetRequiredService<IAuditTrailManager>();
 
-            try
-            {
-                var clock = serviceProvider.GetRequiredService<IClock>();
-                var auditTrailManager = serviceProvider.GetRequiredService<IAuditTrailManager>();
+            logger.LogDebug("Starting Audit Trail trimming.");
+            var deletedEvents = await auditTrailManager.TrimEventsAsync(TimeSpan.FromDays(settings.RetentionDays));
+            logger.LogDebug("Audit Trail trimming completed. {EventCount} events were deleted.", deletedEvents);
+            settings.LastRunUtc = clock.UtcNow;
 
-                logger.LogDebug("Starting Audit Trail trimming.");
-                var deletedEvents = await auditTrailManager.TrimEventsAsync(TimeSpan.FromDays(settings.RetentionDays));
-                logger.LogDebug("Audit Trail trimming completed. {EventCount} events were deleted.", deletedEvents);
+            var container = await siteService.LoadSiteSettingsAsync();
+            container.Alter<AuditTrailTrimmingSettings>(nameof(AuditTrailTrimmingSettings), settings =>
+            {
                 settings.LastRunUtc = clock.UtcNow;
+            });
 
-                var container = await siteService.LoadSiteSettingsAsync();
-                container.Alter<AuditTrailTrimmingSettings>(nameof(AuditTrailTrimmingSettings), settings =>
-                {
-                    settings.LastRunUtc = clock.UtcNow;
-                });
-
-                await siteService.UpdateSiteSettingsAsync(container);
-            }
-            catch (Exception ex) when (!ex.IsFatal())
-            {
-                logger.LogError(ex, "Audit Trail trimming: error during sweep.");
-            }
-            finally
-            {
-                logger.LogDebug("Audit Trail trimming: ending sweep.");
-            }
+            await siteService.UpdateSiteSettingsAsync(container);
+        }
+        catch (Exception ex) when (!ex.IsFatal())
+        {
+            logger.LogError(ex, "Audit Trail trimming: error during sweep.");
+        }
+        finally
+        {
+            logger.LogDebug("Audit Trail trimming: ending sweep.");
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/AuditTrailIdGenerator.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/AuditTrailIdGenerator.cs
index a56ad9cc518..c82b536b2b0 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/AuditTrailIdGenerator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/AuditTrailIdGenerator.cs
@@ -1,16 +1,15 @@
 using OrchardCore.Entities;
 
-namespace OrchardCore.AuditTrail.Services
-{
-    public class AuditTrailIdGenerator : IAuditTrailIdGenerator
-    {
-        private readonly IIdGenerator _generator;
+namespace OrchardCore.AuditTrail.Services;
 
-        public AuditTrailIdGenerator(IIdGenerator generator)
-        {
-            _generator = generator;
-        }
+public class AuditTrailIdGenerator : IAuditTrailIdGenerator
+{
+    private readonly IIdGenerator _generator;
 
-        public string GenerateUniqueId() => _generator.GenerateUniqueId();
+    public AuditTrailIdGenerator(IIdGenerator generator)
+    {
+        _generator = generator;
     }
+
+    public string GenerateUniqueId() => _generator.GenerateUniqueId();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/AuditTrailManager.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/AuditTrailManager.cs
index bc8e8b14369..c0b15fa5ffe 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/AuditTrailManager.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/AuditTrailManager.cs
@@ -18,173 +18,172 @@
 using OrchardCore.Settings;
 using YesSql;
 
-namespace OrchardCore.AuditTrail.Services
+namespace OrchardCore.AuditTrail.Services;
+
+public class AuditTrailManager : IAuditTrailManager
 {
-    public class AuditTrailManager : IAuditTrailManager
+    private readonly IClock _clock;
+    private readonly YesSql.ISession _session;
+    private readonly ISiteService _siteService;
+    private readonly AuditTrailOptions _auditTrailOptions;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly ILookupNormalizer _keyNormalizer;
+    private readonly IAuditTrailIdGenerator _auditTrailIdGenerator;
+    private readonly IEnumerable<IAuditTrailEventHandler> _auditTrailEventHandlers;
+    private readonly IClientIPAddressAccessor _clientIPAddressAccessor;
+    private readonly ShellSettings _shellSettings;
+    private readonly ILogger _logger;
+
+    public AuditTrailManager(
+        IClock clock,
+        YesSql.ISession session,
+        ISiteService siteService,
+        IOptions<AuditTrailOptions> auditTrailOptions,
+        IHttpContextAccessor httpContextAccessor,
+        ILookupNormalizer keyNormalizer,
+        IEnumerable<IAuditTrailEventHandler> auditTrailEventHandlers,
+        IClientIPAddressAccessor clientIPAddressAccessor,
+        IAuditTrailIdGenerator auditTrailIdGenerator,
+        ShellSettings shellSettings,
+        ILogger<AuditTrailManager> logger)
     {
-        private readonly IClock _clock;
-        private readonly YesSql.ISession _session;
-        private readonly ISiteService _siteService;
-        private readonly AuditTrailOptions _auditTrailOptions;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly ILookupNormalizer _keyNormalizer;
-        private readonly IAuditTrailIdGenerator _auditTrailIdGenerator;
-        private readonly IEnumerable<IAuditTrailEventHandler> _auditTrailEventHandlers;
-        private readonly IClientIPAddressAccessor _clientIPAddressAccessor;
-        private readonly ShellSettings _shellSettings;
-        private readonly ILogger _logger;
-
-        public AuditTrailManager(
-            IClock clock,
-            YesSql.ISession session,
-            ISiteService siteService,
-            IOptions<AuditTrailOptions> auditTrailOptions,
-            IHttpContextAccessor httpContextAccessor,
-            ILookupNormalizer keyNormalizer,
-            IEnumerable<IAuditTrailEventHandler> auditTrailEventHandlers,
-            IClientIPAddressAccessor clientIPAddressAccessor,
-            IAuditTrailIdGenerator auditTrailIdGenerator,
-            ShellSettings shellSettings,
-            ILogger<AuditTrailManager> logger)
-        {
-            _clock = clock;
-            _session = session;
-            _siteService = siteService;
-            _auditTrailOptions = auditTrailOptions.Value;
-            _httpContextAccessor = httpContextAccessor;
-            _keyNormalizer = keyNormalizer;
-            _auditTrailEventHandlers = auditTrailEventHandlers;
-            _clientIPAddressAccessor = clientIPAddressAccessor;
-            _auditTrailIdGenerator = auditTrailIdGenerator;
-            _shellSettings = shellSettings;
-            _logger = logger;
-        }
+        _clock = clock;
+        _session = session;
+        _siteService = siteService;
+        _auditTrailOptions = auditTrailOptions.Value;
+        _httpContextAccessor = httpContextAccessor;
+        _keyNormalizer = keyNormalizer;
+        _auditTrailEventHandlers = auditTrailEventHandlers;
+        _clientIPAddressAccessor = clientIPAddressAccessor;
+        _auditTrailIdGenerator = auditTrailIdGenerator;
+        _shellSettings = shellSettings;
+        _logger = logger;
+    }
 
-        public async Task RecordEventAsync<TEvent>(AuditTrailContext<TEvent> context) where TEvent : class, new()
+    public async Task RecordEventAsync<TEvent>(AuditTrailContext<TEvent> context) where TEvent : class, new()
+    {
+        if (_shellSettings.IsInitializing() && string.IsNullOrEmpty(context.UserName))
         {
-            if (_shellSettings.IsInitializing() && string.IsNullOrEmpty(context.UserName))
+            var feature = _httpContextAccessor.HttpContext.Features.Get<RecipeEnvironmentFeature>();
+            if (feature != null && feature.Properties.TryGetValue(SetupConstants.AdminUsername, out var adminUsername))
             {
-                var feature = _httpContextAccessor.HttpContext.Features.Get<RecipeEnvironmentFeature>();
-                if (feature != null && feature.Properties.TryGetValue(SetupConstants.AdminUsername, out var adminUsername))
-                {
-                    context.UserName = (string)adminUsername;
-                }
+                context.UserName = (string)adminUsername;
             }
+        }
 
-            var descriptor = DescribeEvent(context.Name, context.Category);
-            if (descriptor == null || !await IsEventEnabledAsync(descriptor))
-            {
-                return;
-            }
+        var descriptor = DescribeEvent(context.Name, context.Category);
+        if (descriptor == null || !await IsEventEnabledAsync(descriptor))
+        {
+            return;
+        }
 
-            var createContext = new AuditTrailCreateContext<TEvent>(
-                context.Name,
-                context.Category,
-                context.CorrelationId,
-                context.UserId,
-                context.UserName,
-                context.AuditTrailEventItem
-            );
+        var createContext = new AuditTrailCreateContext<TEvent>(
+            context.Name,
+            context.Category,
+            context.CorrelationId,
+            context.UserId,
+            context.UserName,
+            context.AuditTrailEventItem
+        );
 
-            await _auditTrailEventHandlers.InvokeAsync((handler, context) => handler.CreateAsync(context), createContext, _logger);
+        await _auditTrailEventHandlers.InvokeAsync((handler, context) => handler.CreateAsync(context), createContext, _logger);
 
-            var auditTrailEvent = new AuditTrailEvent
-            {
-                EventId = _auditTrailIdGenerator.GenerateUniqueId(),
-                Category = createContext.Category,
-                Name = createContext.Name,
-                CorrelationId = createContext.CorrelationId,
-                UserId = createContext.UserId,
-                UserName = createContext.UserName ?? "",
-                NormalizedUserName = string.IsNullOrEmpty(createContext.UserName) ? "" : _keyNormalizer.NormalizeName(createContext.UserName),
-                ClientIpAddress = string.IsNullOrEmpty(createContext.ClientIpAddress)
-                    ? await GetClientIpAddressAsync()
-                    : createContext.ClientIpAddress,
-                CreatedUtc = createContext.CreatedUtc ?? _clock.UtcNow
-            };
-
-            auditTrailEvent.Put(createContext.AuditTrailEventItem);
-
-            await _auditTrailEventHandlers.InvokeAsync((handler, context, auditTrailEvent) => handler.AlterAsync(context, auditTrailEvent), createContext, auditTrailEvent, _logger);
-
-            await _session.SaveAsync(auditTrailEvent, AuditTrailEvent.Collection);
-        }
-        public Task<AuditTrailEvent> GetEventAsync(string eventId) =>
-            _session.Query<AuditTrailEvent, AuditTrailEventIndex>(collection: AuditTrailEvent.Collection)
-                .Where(index => index.EventId == eventId)
-                .FirstOrDefaultAsync();
-
-        public async Task<int> TrimEventsAsync(TimeSpan retentionPeriod)
+        var auditTrailEvent = new AuditTrailEvent
         {
-            var dateThreshold = _clock.UtcNow.AddDays(1) - retentionPeriod;
+            EventId = _auditTrailIdGenerator.GenerateUniqueId(),
+            Category = createContext.Category,
+            Name = createContext.Name,
+            CorrelationId = createContext.CorrelationId,
+            UserId = createContext.UserId,
+            UserName = createContext.UserName ?? "",
+            NormalizedUserName = string.IsNullOrEmpty(createContext.UserName) ? "" : _keyNormalizer.NormalizeName(createContext.UserName),
+            ClientIpAddress = string.IsNullOrEmpty(createContext.ClientIpAddress)
+                ? await GetClientIpAddressAsync()
+                : createContext.ClientIpAddress,
+            CreatedUtc = createContext.CreatedUtc ?? _clock.UtcNow
+        };
+
+        auditTrailEvent.Put(createContext.AuditTrailEventItem);
+
+        await _auditTrailEventHandlers.InvokeAsync((handler, context, auditTrailEvent) => handler.AlterAsync(context, auditTrailEvent), createContext, auditTrailEvent, _logger);
+
+        await _session.SaveAsync(auditTrailEvent, AuditTrailEvent.Collection);
+    }
+    public Task<AuditTrailEvent> GetEventAsync(string eventId) =>
+        _session.Query<AuditTrailEvent, AuditTrailEventIndex>(collection: AuditTrailEvent.Collection)
+            .Where(index => index.EventId == eventId)
+            .FirstOrDefaultAsync();
 
-            var events = await _session.Query<AuditTrailEvent, AuditTrailEventIndex>(collection: AuditTrailEvent.Collection)
-                .Where(index => index.CreatedUtc <= dateThreshold)
-                .ListAsync();
+    public async Task<int> TrimEventsAsync(TimeSpan retentionPeriod)
+    {
+        var dateThreshold = _clock.UtcNow.AddDays(1) - retentionPeriod;
 
-            var deletedEvents = 0;
-            foreach (var auditTrailEvent in events)
-            {
-                _session.Delete(auditTrailEvent, collection: AuditTrailEvent.Collection);
-                deletedEvents++;
-            }
+        var events = await _session.Query<AuditTrailEvent, AuditTrailEventIndex>(collection: AuditTrailEvent.Collection)
+            .Where(index => index.CreatedUtc <= dateThreshold)
+            .ListAsync();
 
-            return deletedEvents;
+        var deletedEvents = 0;
+        foreach (var auditTrailEvent in events)
+        {
+            _session.Delete(auditTrailEvent, collection: AuditTrailEvent.Collection);
+            deletedEvents++;
         }
 
-        public AuditTrailEventDescriptor DescribeEvent(AuditTrailEvent auditTrailEvent) =>
-            DescribeEvent(auditTrailEvent.Name, auditTrailEvent.Category)
-            ?? AuditTrailEventDescriptor.Default(auditTrailEvent);
+        return deletedEvents;
+    }
 
-        public IEnumerable<AuditTrailCategoryDescriptor> DescribeCategories()
-            => _auditTrailOptions.CategoryDescriptors.Values;
+    public AuditTrailEventDescriptor DescribeEvent(AuditTrailEvent auditTrailEvent) =>
+        DescribeEvent(auditTrailEvent.Name, auditTrailEvent.Category)
+        ?? AuditTrailEventDescriptor.Default(auditTrailEvent);
 
-        public AuditTrailCategoryDescriptor DescribeCategory(string name)
-        {
-            if (_auditTrailOptions.CategoryDescriptors.TryGetValue(name, out var category))
-            {
-                return category;
-            }
+    public IEnumerable<AuditTrailCategoryDescriptor> DescribeCategories()
+        => _auditTrailOptions.CategoryDescriptors.Values;
 
-            return AuditTrailCategoryDescriptor.Default(name);
+    public AuditTrailCategoryDescriptor DescribeCategory(string name)
+    {
+        if (_auditTrailOptions.CategoryDescriptors.TryGetValue(name, out var category))
+        {
+            return category;
         }
 
-        private AuditTrailEventDescriptor DescribeEvent(string name, string categoryName)
-        {
-            var category = DescribeCategory(categoryName);
-            category.Events.TryGetValue(name, out var descriptor);
+        return AuditTrailCategoryDescriptor.Default(name);
+    }
 
-            return descriptor;
-        }
+    private AuditTrailEventDescriptor DescribeEvent(string name, string categoryName)
+    {
+        var category = DescribeCategory(categoryName);
+        category.Events.TryGetValue(name, out var descriptor);
 
-        private async Task<string> GetClientIpAddressAsync()
-        {
-            var settings = await GetAuditTrailSettingsAsync();
-            if (!settings.ClientIpAddressAllowed)
-            {
-                return null;
-            }
+        return descriptor;
+    }
 
-            return (await _clientIPAddressAccessor.GetIPAddressAsync())?.ToString();
+    private async Task<string> GetClientIpAddressAsync()
+    {
+        var settings = await GetAuditTrailSettingsAsync();
+        if (!settings.ClientIpAddressAllowed)
+        {
+            return null;
         }
 
-        private async Task<AuditTrailSettings> GetAuditTrailSettingsAsync() =>
-            (await _siteService.GetSiteSettingsAsync()).As<AuditTrailSettings>();
+        return (await _clientIPAddressAccessor.GetIPAddressAsync())?.ToString();
+    }
+
+    private async Task<AuditTrailSettings> GetAuditTrailSettingsAsync() =>
+        (await _siteService.GetSiteSettingsAsync()).As<AuditTrailSettings>();
 
-        private async Task<bool> IsEventEnabledAsync(AuditTrailEventDescriptor descriptor)
+    private async Task<bool> IsEventEnabledAsync(AuditTrailEventDescriptor descriptor)
+    {
+        if (descriptor.IsMandatory)
         {
-            if (descriptor.IsMandatory)
-            {
-                return true;
-            }
+            return true;
+        }
 
-            var settings = await GetAuditTrailSettingsAsync();
+        var settings = await GetAuditTrailSettingsAsync();
 
-            var eventSettings = settings.Categories
-                .FirstOrDefault(category => category.Name == descriptor.Category)?.Events
-                .FirstOrDefault(settings => settings.Name == descriptor.Name);
+        var eventSettings = settings.Categories
+            .FirstOrDefault(category => category.Name == descriptor.Category)?.Events
+            .FirstOrDefault(settings => settings.Name == descriptor.Name);
 
-            return eventSettings?.IsEnabled ?? descriptor.IsEnabledByDefault;
-        }
+        return eventSettings?.IsEnabled ?? descriptor.IsEnabledByDefault;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/CorrelationIdFilterNode.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/CorrelationIdFilterNode.cs
index a53f685efad..3dc10b4e7ca 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/CorrelationIdFilterNode.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/CorrelationIdFilterNode.cs
@@ -1,20 +1,19 @@
 using YesSql.Filters.Abstractions.Nodes;
 
-namespace OrchardCore.AuditTrail.Services
+namespace OrchardCore.AuditTrail.Services;
+
+/// <summary>
+/// Provides a correlation id node is used when a filter has not been selected.
+/// </summary>
+public class CorrelationIdFilterNode : TermOperationNode
 {
-    /// <summary>
-    /// Provides a correlation id node is used when a filter has not been selected.
-    /// </summary>
-    public class CorrelationIdFilterNode : TermOperationNode
+    public CorrelationIdFilterNode(string correlationId) : base("id", new UnaryNode(correlationId, OperateNodeQuotes.None))
     {
-        public CorrelationIdFilterNode(string correlationId) : base("id", new UnaryNode(correlationId, OperateNodeQuotes.None))
-        {
-        }
+    }
 
-        public override string ToNormalizedString()
-            => string.Empty;
+    public override string ToNormalizedString()
+        => string.Empty;
 
-        public override string ToString()
-            => string.Empty;
-    }
+    public override string ToString()
+        => string.Empty;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/DateTimeParser.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/DateTimeParser.cs
index 142c235194a..199530d5619 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/DateTimeParser.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/DateTimeParser.cs
@@ -6,263 +6,262 @@
 using Parlot.Fluent;
 using static Parlot.Fluent.Parsers;
 
-namespace OrchardCore.AuditTrail.Services
+namespace OrchardCore.AuditTrail.Services;
+
+public readonly struct BuildExpressionContext
 {
-    public readonly struct BuildExpressionContext
+    public BuildExpressionContext(DateTime utcNow, ParameterExpression parameter, MemberExpression member, Type type)
     {
-        public BuildExpressionContext(DateTime utcNow, ParameterExpression parameter, MemberExpression member, Type type)
+        UtcNow = utcNow;
+        Parameter = parameter;
+        Member = member;
+        Type = type;
+    }
+
+    public DateTime UtcNow { get; }
+    public ParameterExpression Parameter { get; }
+    public MemberExpression Member { get; }
+    public Type Type { get; }
+}
+
+public abstract class Node
+{
+    public abstract Expression BuildExpression(in BuildExpressionContext context);
+}
+
+public abstract class OperatorNode : Node
+{
+    public string Operator { get; set; }
+
+    public Expression BuildOperation(in BuildExpressionContext context, ConstantExpression constant)
+    {
+        if (string.IsNullOrEmpty(Operator))
         {
-            UtcNow = utcNow;
-            Parameter = parameter;
-            Member = member;
-            Type = type;
+            return constant;
         }
 
-        public DateTime UtcNow { get; }
-        public ParameterExpression Parameter { get; }
-        public MemberExpression Member { get; }
-        public Type Type { get; }
+        return Operator switch
+        {
+            ">" => Expression.GreaterThan(context.Member, constant),
+            ">=" => Expression.GreaterThanOrEqual(context.Member, constant),
+            "<" => Expression.LessThan(context.Member, constant),
+            "<=" => Expression.LessThanOrEqual(context.Member, constant),
+            _ => null
+        };
     }
+}
 
-    public abstract class Node
+public class DateNode : OperatorNode
+{
+    public DateNode(DateTimeOffset dateTime)
     {
-        public abstract Expression BuildExpression(in BuildExpressionContext context);
+        DateTime = dateTime;
     }
 
-    public abstract class OperatorNode : Node
-    {
-        public string Operator { get; set; }
+    public DateTimeOffset DateTime { get; }
 
-        public Expression BuildOperation(in BuildExpressionContext context, ConstantExpression constant)
-        {
-            if (string.IsNullOrEmpty(Operator))
-            {
-                return constant;
-            }
+    public override Expression BuildExpression(in BuildExpressionContext context)
+        => BuildOperation(context, Expression.Constant(DateTime.UtcDateTime, typeof(DateTime)));
 
-            return Operator switch
-            {
-                ">" => Expression.GreaterThan(context.Member, constant),
-                ">=" => Expression.GreaterThanOrEqual(context.Member, constant),
-                "<" => Expression.LessThan(context.Member, constant),
-                "<=" => Expression.LessThanOrEqual(context.Member, constant),
-                _ => null
-            };
-        }
-    }
+    public override string ToString()
+        => $"{(string.IsNullOrEmpty(Operator) ? string.Empty : Operator)}{DateTime:o}";
+}
 
-    public class DateNode : OperatorNode
+public class DateNode2 : OperatorNode
+{
+    public DateNode2(DateTime dateTime)
     {
-        public DateNode(DateTimeOffset dateTime)
-        {
-            DateTime = dateTime;
-        }
+        DateTime = dateTime;
+    }
 
-        public DateTimeOffset DateTime { get; }
+    public DateTime DateTime { get; }
 
-        public override Expression BuildExpression(in BuildExpressionContext context)
-            => BuildOperation(context, Expression.Constant(DateTime.UtcDateTime, typeof(DateTime)));
+    public override Expression BuildExpression(in BuildExpressionContext context)
+        => BuildOperation(context, Expression.Constant(DateTime, typeof(DateTime)));
 
-        public override string ToString()
-            => $"{(string.IsNullOrEmpty(Operator) ? string.Empty : Operator)}{DateTime:o}";
-    }
+    public override string ToString()
+        => $"{(string.IsNullOrEmpty(Operator) ? string.Empty : Operator)}{DateTime:o}";
+}
 
-    public class DateNode2 : OperatorNode
+public class NowNode : OperatorNode
+{
+    public NowNode()
     {
-        public DateNode2(DateTime dateTime)
-        {
-            DateTime = dateTime;
-        }
+    }
+    public NowNode(long arithmetic)
+    {
+        Arithmetic = arithmetic;
+    }
+
+    public long? Arithmetic { get; }
 
-        public DateTime DateTime { get; }
+    public override Expression BuildExpression(in BuildExpressionContext context)
+        => BuildOperation(context, Expression.Constant(context.UtcNow.AddDays(Arithmetic.GetValueOrDefault()), typeof(DateTime)));
 
-        public override Expression BuildExpression(in BuildExpressionContext context)
-            => BuildOperation(context, Expression.Constant(DateTime, typeof(DateTime)));
+    public override string ToString()
+        => $"{(string.IsNullOrEmpty(Operator) ? string.Empty : Operator)}@now{(Arithmetic.HasValue ? Arithmetic.Value.ToString() : string.Empty)}";
+}
 
-        public override string ToString()
-            => $"{(string.IsNullOrEmpty(Operator) ? string.Empty : Operator)}{DateTime:o}";
+public class TodayNode : NowNode
+{
+    public TodayNode()
+    {
     }
 
-    public class NowNode : OperatorNode
+    public TodayNode(long arithmetic) : base(arithmetic)
     {
-        public NowNode()
-        {
-        }
-        public NowNode(long arithmetic)
-        {
-            Arithmetic = arithmetic;
-        }
+    }
 
-        public long? Arithmetic { get; }
+    public override string ToString()
+        => $"{(string.IsNullOrEmpty(Operator) ? string.Empty : Operator)}@today{(Arithmetic.HasValue ? Arithmetic.Value.ToString() : string.Empty)}";
 
-        public override Expression BuildExpression(in BuildExpressionContext context)
-            => BuildOperation(context, Expression.Constant(context.UtcNow.AddDays(Arithmetic.GetValueOrDefault()), typeof(DateTime)));
+}
 
-        public override string ToString()
-            => $"{(string.IsNullOrEmpty(Operator) ? string.Empty : Operator)}@now{(Arithmetic.HasValue ? Arithmetic.Value.ToString() : string.Empty)}";
-    }
+public abstract class ExpressionNode : Node
+{ }
 
-    public class TodayNode : NowNode
+public class UnaryExpressionNode : ExpressionNode
+{
+    public UnaryExpressionNode(OperatorNode node)
     {
-        public TodayNode()
-        {
-        }
+        Node = node;
+    }
 
-        public TodayNode(long arithmetic) : base(arithmetic)
-        {
-        }
+    public override Expression BuildExpression(in BuildExpressionContext context)
+        => Expression.Lambda(context.Type, Node.BuildExpression(context), context.Parameter);
 
-        public override string ToString()
-            => $"{(string.IsNullOrEmpty(Operator) ? string.Empty : Operator)}@today{(Arithmetic.HasValue ? Arithmetic.Value.ToString() : string.Empty)}";
+    public OperatorNode Node { get; }
+    public override string ToString()
+        => Node.ToString();
+}
 
+public class BinaryExpressionNode : ExpressionNode
+{
+    public BinaryExpressionNode(OperatorNode left, OperatorNode right)
+    {
+        Left = left;
+        Right = right;
     }
 
-    public abstract class ExpressionNode : Node
-    { }
+    public OperatorNode Left { get; }
+    public OperatorNode Right { get; }
 
-    public class UnaryExpressionNode : ExpressionNode
+    public override Expression BuildExpression(in BuildExpressionContext context)
     {
-        public UnaryExpressionNode(OperatorNode node)
-        {
-            Node = node;
-        }
-
-        public override Expression BuildExpression(in BuildExpressionContext context)
-            => Expression.Lambda(context.Type, Node.BuildExpression(context), context.Parameter);
+        var left = Expression.GreaterThanOrEqual(context.Member, Left.BuildExpression(context));
+        var right = Expression.LessThanOrEqual(context.Member, Right.BuildExpression(context));
 
-        public OperatorNode Node { get; }
-        public override string ToString()
-            => Node.ToString();
+        return Expression.Lambda(context.Type, Expression.AndAlso(left, right), context.Parameter);
     }
 
-    public class BinaryExpressionNode : ExpressionNode
-    {
-        public BinaryExpressionNode(OperatorNode left, OperatorNode right)
-        {
-            Left = left;
-            Right = right;
-        }
-
-        public OperatorNode Left { get; }
-        public OperatorNode Right { get; }
-
-        public override Expression BuildExpression(in BuildExpressionContext context)
-        {
-            var left = Expression.GreaterThanOrEqual(context.Member, Left.BuildExpression(context));
-            var right = Expression.LessThanOrEqual(context.Member, Right.BuildExpression(context));
-
-            return Expression.Lambda(context.Type, Expression.AndAlso(left, right), context.Parameter);
-        }
+    public override string ToString() => $"{Left}..{Right}";
+}
 
-        public override string ToString() => $"{Left}..{Right}";
-    }
+public static class DateTimeParser
+{
+    public static readonly Parser<ExpressionNode> Parser;
 
-    public static class DateTimeParser
+    static DateTimeParser()
     {
-        public static readonly Parser<ExpressionNode> Parser;
-
-        static DateTimeParser()
-        {
-            var operators = OneOf(Literals.Text(">="), Literals.Text(">"), Literals.Text("<="), Literals.Text("<"));
+        var operators = OneOf(Literals.Text(">="), Literals.Text(">"), Literals.Text("<="), Literals.Text("<"));
 
-            var arithmetic = Terms.Integer(NumberOptions.AllowLeadingSign);
-            var range = Literals.Text("..");
+        var arithmetic = Terms.Integer(NumberOptions.AllowLeadingSign);
+        var range = Literals.Text("..");
 
-            var todayParser = Terms.Text("@today").And(ZeroOrOne(arithmetic))
-                 .Then<OperatorNode>(x =>
+        var todayParser = Terms.Text("@today").And(ZeroOrOne(arithmetic))
+             .Then<OperatorNode>(x =>
+             {
+                 if (x.Item2 != 0)
                  {
-                     if (x.Item2 != 0)
-                     {
-                         return new TodayNode(x.Item2);
-                     }
+                     return new TodayNode(x.Item2);
+                 }
 
-                     return new TodayNode();
-                 });
+                 return new TodayNode();
+             });
 
-            var nowParser = Terms.Text("@now").And(ZeroOrOne(arithmetic))
-                .Then<OperatorNode>(x =>
+        var nowParser = Terms.Text("@now").And(ZeroOrOne(arithmetic))
+            .Then<OperatorNode>(x =>
+            {
+                if (x.Item2 != 0)
                 {
-                    if (x.Item2 != 0)
-                    {
-                        return new NowNode(x.Item2);
-                    }
+                    return new NowNode(x.Item2);
+                }
 
-                    return new NowNode();
-                });
+                return new NowNode();
+            });
 
-            var dateParser = AnyCharBefore(range)
-                .Then<OperatorNode>((ctx, x) =>
-                {
-                    var context = (DateTimeParseContext)ctx;
-                    var dateValue = x.ToString();
+        var dateParser = AnyCharBefore(range)
+            .Then<OperatorNode>((ctx, x) =>
+            {
+                var context = (DateTimeParseContext)ctx;
+                var dateValue = x.ToString();
 
-                    // Try o, primarily for times, and fall back to local timezone.
-                    if (DateTimeOffset.TryParseExact(dateValue, "yyyy-MM-dd'T'HH:mm:ss.FFFK", CultureInfo.InvariantCulture, DateTimeStyles.None, out var dateTimeOffset))
-                    {
-                        return new DateNode2(dateTimeOffset.UtcDateTime);
-                    }
-                    else
+                // Try o, primarily for times, and fall back to local timezone.
+                if (DateTimeOffset.TryParseExact(dateValue, "yyyy-MM-dd'T'HH:mm:ss.FFFK", CultureInfo.InvariantCulture, DateTimeStyles.None, out var dateTimeOffset))
+                {
+                    return new DateNode2(dateTimeOffset.UtcDateTime);
+                }
+                else
+                {
+                    var success = true;
+                    if (!DateTime.TryParse(dateValue, context.CultureInfo, DateTimeStyles.None, out var dateTime))
                     {
-                        var success = true;
-                        if (!DateTime.TryParse(dateValue, context.CultureInfo, DateTimeStyles.None, out var dateTime))
+                        if (!DateTime.TryParse(dateValue, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTime))
                         {
-                            if (!DateTime.TryParse(dateValue, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTime))
-                            {
-                                success = false;
-                            }
+                            success = false;
                         }
+                    }
 
-                        // If no timezone is specified, assume local using the configured timezone.
-                        if (success)
-                        {
-                            var converted = context.Clock.ConvertToTimeZone(dateTime, context.UserTimeZone);
-                            return new DateNode2(converted.UtcDateTime.Date);
-                        }
+                    // If no timezone is specified, assume local using the configured timezone.
+                    if (success)
+                    {
+                        var converted = context.Clock.ConvertToTimeZone(dateTime, context.UserTimeZone);
+                        return new DateNode2(converted.UtcDateTime.Date);
                     }
+                }
 
-                    throw new ParseException("Could not parse date", context.Scanner.Cursor.Position);
-                });
+                throw new ParseException("Could not parse date", context.Scanner.Cursor.Position);
+            });
 
-            var currentParser = OneOf(nowParser, todayParser);
+        var currentParser = OneOf(nowParser, todayParser);
 
-            var valueParser = OneOf(currentParser, dateParser);
+        var valueParser = OneOf(currentParser, dateParser);
 
-            var rangeParser = valueParser
-                .And(ZeroOrOne(range.SkipAnd(OneOf(currentParser, dateParser))))
-                .Then<ExpressionNode>(x =>
+        var rangeParser = valueParser
+            .And(ZeroOrOne(range.SkipAnd(OneOf(currentParser, dateParser))))
+            .Then<ExpressionNode>(x =>
+            {
+                if (x.Item2 == null)
                 {
-                    if (x.Item2 == null)
-                    {
-                        return new UnaryExpressionNode(x.Item1);
-                    }
+                    return new UnaryExpressionNode(x.Item1);
+                }
 
-                    else
-                    {
-                        return new BinaryExpressionNode(x.Item1, x.Item2);
-                    }
-                });
+                else
+                {
+                    return new BinaryExpressionNode(x.Item1, x.Item2);
+                }
+            });
 
-            Parser = operators.And(valueParser)
-                    .Then<ExpressionNode>(x =>
-                    {
-                        x.Item2.Operator = x.Item1;
-                        return new UnaryExpressionNode(x.Item2);
-                    })
-                .Or(rangeParser).Compile();
-        }
+        Parser = operators.And(valueParser)
+                .Then<ExpressionNode>(x =>
+                {
+                    x.Item2.Operator = x.Item1;
+                    return new UnaryExpressionNode(x.Item2);
+                })
+            .Or(rangeParser).Compile();
     }
+}
 
-    public class DateTimeParseContext : ParseContext
+public class DateTimeParseContext : ParseContext
+{
+    public DateTimeParseContext(CultureInfo cultureInfo, IClock clock, ITimeZone userTimeZone, Scanner scanner, bool useNewLines = false) : base(scanner, useNewLines)
     {
-        public DateTimeParseContext(CultureInfo cultureInfo, IClock clock, ITimeZone userTimeZone, Scanner scanner, bool useNewLines = false) : base(scanner, useNewLines)
-        {
-            CultureInfo = cultureInfo;
-            Clock = clock;
-            UserTimeZone = userTimeZone;
-        }
-
-        public CultureInfo CultureInfo { get; set; }
-        public IClock Clock { get; set; }
-        public ITimeZone UserTimeZone { get; set; }
+        CultureInfo = cultureInfo;
+        Clock = clock;
+        UserTimeZone = userTimeZone;
     }
+
+    public CultureInfo CultureInfo { get; set; }
+    public IClock Clock { get; set; }
+    public ITimeZone UserTimeZone { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/DefaultAuditTrailAdminListFilterParser.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/DefaultAuditTrailAdminListFilterParser.cs
index 4e51f811bc6..261ecc25312 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/DefaultAuditTrailAdminListFilterParser.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/DefaultAuditTrailAdminListFilterParser.cs
@@ -1,18 +1,17 @@
 using OrchardCore.AuditTrail.Models;
 using YesSql.Filters.Query;
 
-namespace OrchardCore.AuditTrail.Services
-{
-    public class DefaultAuditTrailAdminListFilterParser : IAuditTrailAdminListFilterParser
-    {
-        private readonly IQueryParser<AuditTrailEvent> _parser;
+namespace OrchardCore.AuditTrail.Services;
 
-        public DefaultAuditTrailAdminListFilterParser(IQueryParser<AuditTrailEvent> parser)
-        {
-            _parser = parser;
-        }
+public class DefaultAuditTrailAdminListFilterParser : IAuditTrailAdminListFilterParser
+{
+    private readonly IQueryParser<AuditTrailEvent> _parser;
 
-        public QueryFilterResult<AuditTrailEvent> Parse(string text)
-            => _parser.Parse(text);
+    public DefaultAuditTrailAdminListFilterParser(IQueryParser<AuditTrailEvent> parser)
+    {
+        _parser = parser;
     }
+
+    public QueryFilterResult<AuditTrailEvent> Parse(string text)
+        => _parser.Parse(text);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/DefaultAuditTrailAdminListFilterProvider.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/DefaultAuditTrailAdminListFilterProvider.cs
index 768c13e9969..3f627f72732 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/DefaultAuditTrailAdminListFilterProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/DefaultAuditTrailAdminListFilterProvider.cs
@@ -15,200 +15,199 @@
 using YesSql.Filters.Query;
 using YesSql.Services;
 
-namespace OrchardCore.AuditTrail.Services
+namespace OrchardCore.AuditTrail.Services;
+
+public class DefaultAuditTrailAdminListFilterProvider : IAuditTrailAdminListFilterProvider
 {
-    public class DefaultAuditTrailAdminListFilterProvider : IAuditTrailAdminListFilterProvider
+    private readonly IOptions<AuditTrailAdminListOptions> _options;
+
+    public DefaultAuditTrailAdminListFilterProvider(IOptions<AuditTrailAdminListOptions> options)
     {
-        private readonly IOptions<AuditTrailAdminListOptions> _options;
+        _options = options;
+    }
 
-        public DefaultAuditTrailAdminListFilterProvider(IOptions<AuditTrailAdminListOptions> options)
-        {
-            _options = options;
-        }
+    public void Build(QueryEngineBuilder<AuditTrailEvent> builder)
+    {
+        builder
+            .WithNamedTerm("id", builder => builder
+                .OneCondition((val, query) =>
+                {
+                    if (!string.IsNullOrEmpty(val))
+                    {
+                        query.With<AuditTrailEventIndex>(x => x.CorrelationId == val);
+                    }
+
+                    return query;
+                })
+                .MapTo<AuditTrailIndexOptions>((val, model) =>
+                {
+                    model.CorrelationId = val;
+                })
+                .MapFrom<AuditTrailIndexOptions>((model) =>
+                {
+                    if (!string.IsNullOrEmpty(model.CorrelationId))
+                    {
+                        return (true, model.CorrelationId);
+                    }
+                    return (false, string.Empty);
+                })
+            )
+            .WithNamedTerm("category", builder => builder
+                .OneCondition((val, query) =>
+                {
+                    if (!string.IsNullOrEmpty(val))
+                    {
+                        query.With<AuditTrailEventIndex>(x => x.Category == val);
+                    }
+
+                    return query;
+                })
+                .MapTo<AuditTrailIndexOptions>((val, model) =>
+                {
+                    model.Category = val;
+                })
+                .MapFrom<AuditTrailIndexOptions>((model) =>
+                {
+                    if (!string.IsNullOrEmpty(model.Category))
+                    {
+                        return (true, model.Category);
+                    }
+                    return (false, string.Empty);
+                })
+            )
+            .WithNamedTerm("event", builder => builder
+                .OneCondition((val, query) =>
+                {
+                    if (!string.IsNullOrEmpty(val))
+                    {
+                        query.With<AuditTrailEventIndex>(x => x.Name == val);
+                    }
+
+                    return query;
+                })
+                .MapTo<AuditTrailIndexOptions>((val, model) =>
+                {
+                    model.Event = val;
+                })
+                .MapFrom<AuditTrailIndexOptions>((model) =>
+                {
+                    if (!string.IsNullOrEmpty(model.Event))
+                    {
+                        return (true, model.Event);
+                    }
+                    return (false, string.Empty);
+                })
+            )
+            .WithNamedTerm("date", builder => builder
+                .OneCondition(async (val, query, ctx) =>
+                {
+                    if (string.IsNullOrEmpty(val))
+                    {
+                        return query;
+                    }
+
+                    var context = (AuditTrailQueryContext)ctx;
+                    var clock = context.ServiceProvider.GetRequiredService<IClock>();
+                    var localClock = context.ServiceProvider.GetRequiredService<ILocalClock>();
+                    var userTimeZone = await localClock.GetLocalTimeZoneAsync();
+                    var parseContext = new DateTimeParseContext(CultureInfo.CurrentUICulture, clock, userTimeZone, new Scanner(val));
 
-        public void Build(QueryEngineBuilder<AuditTrailEvent> builder)
-        {
-            builder
-                .WithNamedTerm("id", builder => builder
-                    .OneCondition((val, query) =>
+                    if (DateTimeParser.Parser.TryParse(parseContext, out var expression, out var parseError))
+                    {
+                        var utcNow = clock.UtcNow;
+
+                        var param = Expression.Parameter(typeof(AuditTrailEventIndex));
+                        var field = Expression.Property(param, nameof(AuditTrailEventIndex.CreatedUtc));
+                        var expressionContext = new BuildExpressionContext(utcNow, param, field, typeof(Func<AuditTrailEventIndex, bool>));
+
+                        query.With<AuditTrailEventIndex>((Expression<Func<AuditTrailEventIndex, bool>>)expression.BuildExpression(expressionContext));
+                    }
+
+                    return query;
+                })
+                .MapTo<AuditTrailIndexOptions>((val, model) =>
+                {
+                    model.Date = val;
+                })
+                .MapFrom<AuditTrailIndexOptions>((model) =>
+                {
+                    if (!string.IsNullOrEmpty(model.Date))
+                    {
+                        return (true, model.Date);
+                    }
+                    return (false, string.Empty);
+                })
+            )
+            .WithNamedTerm("sort", builder => builder
+                .OneCondition((val, query, ctx) =>
+                {
+                    var context = (AuditTrailQueryContext)ctx;
+                    var options = context.ServiceProvider.GetRequiredService<IOptions<AuditTrailAdminListOptions>>().Value;
+
+                    if (options.SortOptions.TryGetValue(val, out var sortOption))
+                    {
+                        return sortOption.Query(val, query, ctx);
+                    }
+
+                    return options.DefaultSortOption.Query(val, query, ctx);
+                })
+                .MapTo<AuditTrailIndexOptions>((val, model) =>
+                {
+                    // TODO add a context property to the mapping func.
+                    if (!string.IsNullOrEmpty(val) && _options.Value.SortOptions.TryGetValue(val, out var sortOption))
+                    {
+                        model.Sort = sortOption.Value;
+                    }
+                })
+                .MapFrom<AuditTrailIndexOptions>((model) =>
+                {
+                    // TODO add a context property to the mapping func.
+                    if (model.Sort != _options.Value.DefaultSortOption.Value)
                     {
-                        if (!string.IsNullOrEmpty(val))
-                        {
-                            query.With<AuditTrailEventIndex>(x => x.CorrelationId == val);
-                        }
+                        return (true, model.Sort);
+                    }
+
+                    return (false, string.Empty);
+                })
+                .AlwaysRun()
+            )
+            .WithDefaultTerm("username", builder => builder
+                .ManyCondition(
+                    (val, query, ctx) =>
+                    {
+                        var context = (AuditTrailQueryContext)ctx;
+                        var lookupNormalizer = context.ServiceProvider.GetRequiredService<ILookupNormalizer>();
+                        var normalizedUserName = lookupNormalizer.NormalizeName(val);
+                        query.With<AuditTrailEventIndex>(x => x.NormalizedUserName.Contains(normalizedUserName));
 
-                        return query;
-                    })
-                    .MapTo<AuditTrailIndexOptions>((val, model) =>
-                    {
-                        model.CorrelationId = val;
-                    })
-                    .MapFrom<AuditTrailIndexOptions>((model) =>
-                    {
-                        if (!string.IsNullOrEmpty(model.CorrelationId))
-                        {
-                            return (true, model.CorrelationId);
-                        }
-                        return (false, string.Empty);
-                    })
-                )
-                .WithNamedTerm("category", builder => builder
-                    .OneCondition((val, query) =>
+                        return new ValueTask<IQuery<AuditTrailEvent>>(query);
+                    },
+                    (val, query, ctx) =>
                     {
-                        if (!string.IsNullOrEmpty(val))
-                        {
-                            query.With<AuditTrailEventIndex>(x => x.Category == val);
-                        }
+                        var context = (AuditTrailQueryContext)ctx;
+                        var lookupNormalizer = context.ServiceProvider.GetRequiredService<ILookupNormalizer>();
+                        var normalizedUserName = lookupNormalizer.NormalizeName(val);
+                        query.With<AuditTrailEventIndex>(x => x.NormalizedUserName.NotContains(normalizedUserName));
 
-                        return query;
-                    })
-                    .MapTo<AuditTrailIndexOptions>((val, model) =>
-                    {
-                        model.Category = val;
-                    })
-                    .MapFrom<AuditTrailIndexOptions>((model) =>
-                    {
-                        if (!string.IsNullOrEmpty(model.Category))
-                        {
-                            return (true, model.Category);
-                        }
-                        return (false, string.Empty);
-                    })
+                        return new ValueTask<IQuery<AuditTrailEvent>>(query);
+                    }
                 )
-                .WithNamedTerm("event", builder => builder
-                    .OneCondition((val, query) =>
+            )
+            .WithNamedTerm("userid", builder => builder
+                .ManyCondition(
+                    (val, query) =>
                     {
-                        if (!string.IsNullOrEmpty(val))
-                        {
-                            query.With<AuditTrailEventIndex>(x => x.Name == val);
-                        }
+                        query.With<AuditTrailEventIndex>(x => x.UserId.Contains(val));
 
                         return query;
-                    })
-                    .MapTo<AuditTrailIndexOptions>((val, model) =>
-                    {
-                        model.Event = val;
-                    })
-                    .MapFrom<AuditTrailIndexOptions>((model) =>
-                    {
-                        if (!string.IsNullOrEmpty(model.Event))
-                        {
-                            return (true, model.Event);
-                        }
-                        return (false, string.Empty);
-                    })
-                )
-                .WithNamedTerm("date", builder => builder
-                    .OneCondition(async (val, query, ctx) =>
+                    },
+                    (val, query) =>
                     {
-                        if (string.IsNullOrEmpty(val))
-                        {
-                            return query;
-                        }
-
-                        var context = (AuditTrailQueryContext)ctx;
-                        var clock = context.ServiceProvider.GetRequiredService<IClock>();
-                        var localClock = context.ServiceProvider.GetRequiredService<ILocalClock>();
-                        var userTimeZone = await localClock.GetLocalTimeZoneAsync();
-                        var parseContext = new DateTimeParseContext(CultureInfo.CurrentUICulture, clock, userTimeZone, new Scanner(val));
-
-                        if (DateTimeParser.Parser.TryParse(parseContext, out var expression, out var parseError))
-                        {
-                            var utcNow = clock.UtcNow;
-
-                            var param = Expression.Parameter(typeof(AuditTrailEventIndex));
-                            var field = Expression.Property(param, nameof(AuditTrailEventIndex.CreatedUtc));
-                            var expressionContext = new BuildExpressionContext(utcNow, param, field, typeof(Func<AuditTrailEventIndex, bool>));
-
-                            query.With<AuditTrailEventIndex>((Expression<Func<AuditTrailEventIndex, bool>>)expression.BuildExpression(expressionContext));
-                        }
+                        query.With<AuditTrailEventIndex>(x => x.UserId.NotContains(val));
 
                         return query;
-                    })
-                    .MapTo<AuditTrailIndexOptions>((val, model) =>
-                    {
-                        model.Date = val;
-                    })
-                    .MapFrom<AuditTrailIndexOptions>((model) =>
-                    {
-                        if (!string.IsNullOrEmpty(model.Date))
-                        {
-                            return (true, model.Date);
-                        }
-                        return (false, string.Empty);
-                    })
-                )
-                .WithNamedTerm("sort", builder => builder
-                    .OneCondition((val, query, ctx) =>
-                    {
-                        var context = (AuditTrailQueryContext)ctx;
-                        var options = context.ServiceProvider.GetRequiredService<IOptions<AuditTrailAdminListOptions>>().Value;
-
-                        if (options.SortOptions.TryGetValue(val, out var sortOption))
-                        {
-                            return sortOption.Query(val, query, ctx);
-                        }
-
-                        return options.DefaultSortOption.Query(val, query, ctx);
-                    })
-                    .MapTo<AuditTrailIndexOptions>((val, model) =>
-                    {
-                        // TODO add a context property to the mapping func.
-                        if (!string.IsNullOrEmpty(val) && _options.Value.SortOptions.TryGetValue(val, out var sortOption))
-                        {
-                            model.Sort = sortOption.Value;
-                        }
-                    })
-                    .MapFrom<AuditTrailIndexOptions>((model) =>
-                    {
-                        // TODO add a context property to the mapping func.
-                        if (model.Sort != _options.Value.DefaultSortOption.Value)
-                        {
-                            return (true, model.Sort);
-                        }
-
-                        return (false, string.Empty);
-                    })
-                    .AlwaysRun()
-                )
-                .WithDefaultTerm("username", builder => builder
-                    .ManyCondition(
-                        (val, query, ctx) =>
-                        {
-                            var context = (AuditTrailQueryContext)ctx;
-                            var lookupNormalizer = context.ServiceProvider.GetRequiredService<ILookupNormalizer>();
-                            var normalizedUserName = lookupNormalizer.NormalizeName(val);
-                            query.With<AuditTrailEventIndex>(x => x.NormalizedUserName.Contains(normalizedUserName));
-
-                            return new ValueTask<IQuery<AuditTrailEvent>>(query);
-                        },
-                        (val, query, ctx) =>
-                        {
-                            var context = (AuditTrailQueryContext)ctx;
-                            var lookupNormalizer = context.ServiceProvider.GetRequiredService<ILookupNormalizer>();
-                            var normalizedUserName = lookupNormalizer.NormalizeName(val);
-                            query.With<AuditTrailEventIndex>(x => x.NormalizedUserName.NotContains(normalizedUserName));
-
-                            return new ValueTask<IQuery<AuditTrailEvent>>(query);
-                        }
-                    )
+                    }
                 )
-                .WithNamedTerm("userid", builder => builder
-                    .ManyCondition(
-                        (val, query) =>
-                        {
-                            query.With<AuditTrailEventIndex>(x => x.UserId.Contains(val));
-
-                            return query;
-                        },
-                        (val, query) =>
-                        {
-                            query.With<AuditTrailEventIndex>(x => x.UserId.NotContains(val));
-
-                            return query;
-                        }
-                    )
-                );
-        }
+            );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/DefaultAuditTrailAdminListQueryService.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/DefaultAuditTrailAdminListQueryService.cs
index 63db00d7ef4..76bee39b42e 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/DefaultAuditTrailAdminListQueryService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/DefaultAuditTrailAdminListQueryService.cs
@@ -11,134 +11,133 @@
 using OrchardCore.Modules;
 using YesSql;
 
-namespace OrchardCore.AuditTrail.Services
+namespace OrchardCore.AuditTrail.Services;
+
+public class DefaultAuditTrailAdminListQueryService : IAuditTrailAdminListQueryService
 {
-    public class DefaultAuditTrailAdminListQueryService : IAuditTrailAdminListQueryService
+    private const string DateFormat = "yyyy-MM-dd";
+    private readonly IAuditTrailManager _auditTrailManager;
+    private readonly ILocalClock _localClock;
+    private readonly AuditTrailAdminListOptions _adminListOptions;
+    private readonly ISession _session;
+    private readonly IServiceProvider _serviceProvider;
+    protected readonly IStringLocalizer S;
+
+    public DefaultAuditTrailAdminListQueryService(
+        IAuditTrailManager auditTrailManager,
+        ILocalClock localClock,
+        IOptions<AuditTrailAdminListOptions> adminListOptions,
+        ISession session,
+        IServiceProvider serviceProvider,
+        IStringLocalizer<DefaultAuditTrailAdminListQueryService> stringLocalizer)
     {
-        private const string DateFormat = "yyyy-MM-dd";
-        private readonly IAuditTrailManager _auditTrailManager;
-        private readonly ILocalClock _localClock;
-        private readonly AuditTrailAdminListOptions _adminListOptions;
-        private readonly ISession _session;
-        private readonly IServiceProvider _serviceProvider;
-        protected readonly IStringLocalizer S;
-
-        public DefaultAuditTrailAdminListQueryService(
-            IAuditTrailManager auditTrailManager,
-            ILocalClock localClock,
-            IOptions<AuditTrailAdminListOptions> adminListOptions,
-            ISession session,
-            IServiceProvider serviceProvider,
-            IStringLocalizer<DefaultAuditTrailAdminListQueryService> stringLocalizer)
-        {
-            _auditTrailManager = auditTrailManager;
-            _localClock = localClock;
-            _adminListOptions = adminListOptions.Value;
-            _session = session;
-            _serviceProvider = serviceProvider;
-            S = stringLocalizer;
-        }
+        _auditTrailManager = auditTrailManager;
+        _localClock = localClock;
+        _adminListOptions = adminListOptions.Value;
+        _session = session;
+        _serviceProvider = serviceProvider;
+        S = stringLocalizer;
+    }
 
-        public async Task<AuditTrailEventQueryResult> QueryAsync(int page, int pageSize, AuditTrailIndexOptions options)
-        {
-            // Because admin filters can add a different index to the query this must be added as a Query<AuditTrailEvent>()
-            var query = _session.Query<AuditTrailEvent>(collection: AuditTrailEvent.Collection);
+    public async Task<AuditTrailEventQueryResult> QueryAsync(int page, int pageSize, AuditTrailIndexOptions options)
+    {
+        // Because admin filters can add a different index to the query this must be added as a Query<AuditTrailEvent>()
+        var query = _session.Query<AuditTrailEvent>(collection: AuditTrailEvent.Collection);
 
-            query = await options.FilterResult.ExecuteAsync(new AuditTrailQueryContext(_serviceProvider, query));
+        query = await options.FilterResult.ExecuteAsync(new AuditTrailQueryContext(_serviceProvider, query));
 
-            var totalCount = await query.CountAsync();
+        var totalCount = await query.CountAsync();
 
-            if (pageSize > 0)
+        if (pageSize > 0)
+        {
+            if (page > 1)
             {
-                if (page > 1)
-                {
-                    query = query.Skip((page - 1) * pageSize);
-                }
-
-                query = query.Take(pageSize);
+                query = query.Skip((page - 1) * pageSize);
             }
 
-            var events = await query.ListAsync();
+            query = query.Take(pageSize);
+        }
 
-            var result = new AuditTrailEventQueryResult
-            {
-                Events = events,
-                TotalCount = totalCount
-            };
+        var events = await query.ListAsync();
+
+        var result = new AuditTrailEventQueryResult
+        {
+            Events = events,
+            TotalCount = totalCount
+        };
 
-            options.AuditTrailSorts = _adminListOptions.SortOptions.Values.Where(x => x.SelectListItem != null).Select(opt => opt.SelectListItem(_serviceProvider, opt, options)).ToList();
+        options.AuditTrailSorts = _adminListOptions.SortOptions.Values.Where(x => x.SelectListItem != null).Select(opt => opt.SelectListItem(_serviceProvider, opt, options)).ToList();
 
-            var categories = _auditTrailManager.DescribeCategories();
+        var categories = _auditTrailManager.DescribeCategories();
 
-            options.Categories = categories
-                .Select(category => new SelectListItem(category.LocalizedName(_serviceProvider), category.Name, category.Name == options.Category))
-                .ToList();
+        options.Categories = categories
+            .Select(category => new SelectListItem(category.LocalizedName(_serviceProvider), category.Name, category.Name == options.Category))
+            .ToList();
 
-            options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
+        options.Categories.Insert(0, new SelectListItem(S["All categories"], string.Empty, string.IsNullOrEmpty(options.Category)));
 
-            if (options.CorrelationIdFromRoute)
+        if (options.CorrelationIdFromRoute)
+        {
+            var firstEvent = result.Events.FirstOrDefault();
+            if (firstEvent != null)
             {
-                var firstEvent = result.Events.FirstOrDefault();
-                if (firstEvent != null)
+                var currentCategory = categories.FirstOrDefault(x => x.Name == firstEvent.Category);
+                if (currentCategory != null)
                 {
-                    var currentCategory = categories.FirstOrDefault(x => x.Name == firstEvent.Category);
-                    if (currentCategory != null)
-                    {
-                        options.Events = currentCategory.Events.Values.Select(category =>
-                            new SelectListItem(category.LocalizedName(_serviceProvider), category.Name, category.Name == options.Category)).ToList();
-                    }
+                    options.Events = currentCategory.Events.Values.Select(category =>
+                        new SelectListItem(category.LocalizedName(_serviceProvider), category.Name, category.Name == options.Category)).ToList();
                 }
             }
+        }
 
-            var localNow = await _localClock.LocalNowAsync;
-            var startOfWeek = CultureInfo.CurrentUICulture.DateTimeFormat.FirstDayOfWeek;
+        var localNow = await _localClock.LocalNowAsync;
+        var startOfWeek = CultureInfo.CurrentUICulture.DateTimeFormat.FirstDayOfWeek;
 
-            options.AuditTrailDates =
-            [
-                new(S["Any date"], string.Empty, options.Date == string.Empty),
-            ];
+        options.AuditTrailDates =
+        [
+            new(S["Any date"], string.Empty, options.Date == string.Empty),
+        ];
 
-            var dateTimeValue = ">@now-1";
-            options.AuditTrailDates.Add(new SelectListItem(S["Last 24 hours"], dateTimeValue, options.Date == dateTimeValue));
+        var dateTimeValue = ">@now-1";
+        options.AuditTrailDates.Add(new SelectListItem(S["Last 24 hours"], dateTimeValue, options.Date == dateTimeValue));
 
-            dateTimeValue = "@now-2..@now-1";
-            options.AuditTrailDates.Add(new SelectListItem(S["Previous 48 hours"], dateTimeValue, options.Date == dateTimeValue));
+        dateTimeValue = "@now-2..@now-1";
+        options.AuditTrailDates.Add(new SelectListItem(S["Previous 48 hours"], dateTimeValue, options.Date == dateTimeValue));
 
-            dateTimeValue = $">{localNow.StartOfWeek(CultureInfo.CurrentUICulture.DateTimeFormat.FirstDayOfWeek).LocalDateTime.ToString(DateFormat)}";
-            options.AuditTrailDates.Add(new SelectListItem(S["This week"], dateTimeValue, options.Date == dateTimeValue));
+        dateTimeValue = $">{localNow.StartOfWeek(CultureInfo.CurrentUICulture.DateTimeFormat.FirstDayOfWeek).LocalDateTime.ToString(DateFormat)}";
+        options.AuditTrailDates.Add(new SelectListItem(S["This week"], dateTimeValue, options.Date == dateTimeValue));
 
-            var start = localNow.StartOfWeek(CultureInfo.CurrentUICulture.DateTimeFormat.FirstDayOfWeek).AddDays(-7).LocalDateTime;
-            var end = start.AddDays(7);
-            dateTimeValue = $"{start.ToString(DateFormat)}..{end.ToString(DateFormat)}";
-            options.AuditTrailDates.Add(new SelectListItem(S["Last week"], dateTimeValue, options.Date == dateTimeValue));
+        var start = localNow.StartOfWeek(CultureInfo.CurrentUICulture.DateTimeFormat.FirstDayOfWeek).AddDays(-7).LocalDateTime;
+        var end = start.AddDays(7);
+        dateTimeValue = $"{start.ToString(DateFormat)}..{end.ToString(DateFormat)}";
+        options.AuditTrailDates.Add(new SelectListItem(S["Last week"], dateTimeValue, options.Date == dateTimeValue));
 
-            start = new DateTime(localNow.LocalDateTime.Year, localNow.LocalDateTime.Month, 1);
-            dateTimeValue = $">{start.ToString(DateFormat)}";
-            options.AuditTrailDates.Add(new SelectListItem(S["This month"], dateTimeValue, options.Date == dateTimeValue));
+        start = new DateTime(localNow.LocalDateTime.Year, localNow.LocalDateTime.Month, 1);
+        dateTimeValue = $">{start.ToString(DateFormat)}";
+        options.AuditTrailDates.Add(new SelectListItem(S["This month"], dateTimeValue, options.Date == dateTimeValue));
 
-            start = new DateTime(localNow.LocalDateTime.Year, localNow.LocalDateTime.Month, 1).AddMonths(-1);
-            end = start.AddMonths(1);
-            dateTimeValue = $"{start.ToString(DateFormat)}..{end.ToString(DateFormat)}";
-            options.AuditTrailDates.Add(new SelectListItem(S["Last month"], dateTimeValue, options.Date == dateTimeValue));
-            options.AuditTrailDates.Add(new SelectListItem(S["Custom date range"], dateTimeValue, options.Date == dateTimeValue));
+        start = new DateTime(localNow.LocalDateTime.Year, localNow.LocalDateTime.Month, 1).AddMonths(-1);
+        end = start.AddMonths(1);
+        dateTimeValue = $"{start.ToString(DateFormat)}..{end.ToString(DateFormat)}";
+        options.AuditTrailDates.Add(new SelectListItem(S["Last month"], dateTimeValue, options.Date == dateTimeValue));
+        options.AuditTrailDates.Add(new SelectListItem(S["Custom date range"], dateTimeValue, options.Date == dateTimeValue));
 
-            dateTimeValue = $">{localNow.AddHours(-1):o}";
-            options.AuditTrailDates.Add(new SelectListItem(S["Last hour"], dateTimeValue, options.Date == dateTimeValue));
+        dateTimeValue = $">{localNow.AddHours(-1):o}";
+        options.AuditTrailDates.Add(new SelectListItem(S["Last hour"], dateTimeValue, options.Date == dateTimeValue));
 
-            dateTimeValue = $"{localNow.AddHours(-2):o}..{localNow.AddHours(-1):o}";
-            options.AuditTrailDates.Add(new SelectListItem(S["Previous hour"], dateTimeValue, options.Date == dateTimeValue));
-            options.AuditTrailDates.Add(new SelectListItem(S["Custom time range"], dateTimeValue, options.Date == dateTimeValue));
+        dateTimeValue = $"{localNow.AddHours(-2):o}..{localNow.AddHours(-1):o}";
+        options.AuditTrailDates.Add(new SelectListItem(S["Previous hour"], dateTimeValue, options.Date == dateTimeValue));
+        options.AuditTrailDates.Add(new SelectListItem(S["Custom time range"], dateTimeValue, options.Date == dateTimeValue));
 
-            return result;
-        }
+        return result;
     }
+}
 
-    public static class DateTimeExtensions
+public static class DateTimeExtensions
+{
+    public static DateTimeOffset StartOfWeek(this DateTimeOffset dt, DayOfWeek startOfWeek)
     {
-        public static DateTimeOffset StartOfWeek(this DateTimeOffset dt, DayOfWeek startOfWeek)
-        {
-            var diff = (7 + (dt.DayOfWeek - startOfWeek)) % 7;
-            return dt.AddDays(-1 * diff).Date;
-        }
+        var diff = (7 + (dt.DayOfWeek - startOfWeek)) % 7;
+        return dt.AddDays(-1 * diff).Date;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Settings/AuditTrailCategorySettings.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Settings/AuditTrailCategorySettings.cs
index 76f2e463b8b..e33cfe74566 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Settings/AuditTrailCategorySettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Settings/AuditTrailCategorySettings.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.AuditTrail.Settings
+namespace OrchardCore.AuditTrail.Settings;
+
+public class AuditTrailCategorySettings
 {
-    public class AuditTrailCategorySettings
-    {
-        public string Name { get; set; }
-        public AuditTrailEventSettings[] Events { get; set; } = [];
-    }
+    public string Name { get; set; }
+    public AuditTrailEventSettings[] Events { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Settings/AuditTrailEventSettings.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Settings/AuditTrailEventSettings.cs
index 627fe2074de..8a5af062311 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Settings/AuditTrailEventSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Settings/AuditTrailEventSettings.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.AuditTrail.Settings
+namespace OrchardCore.AuditTrail.Settings;
+
+public class AuditTrailEventSettings
 {
-    public class AuditTrailEventSettings
-    {
-        public string Name { get; set; }
-        public string Category { get; set; }
-        public bool IsEnabled { get; set; }
-    }
+    public string Name { get; set; }
+    public string Category { get; set; }
+    public bool IsEnabled { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Settings/AuditTrailSettings.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Settings/AuditTrailSettings.cs
index e465a11eeac..59c1388a467 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Settings/AuditTrailSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Settings/AuditTrailSettings.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.AuditTrail.Settings
+namespace OrchardCore.AuditTrail.Settings;
+
+public class AuditTrailSettings
 {
-    public class AuditTrailSettings
-    {
-        public AuditTrailCategorySettings[] Categories { get; set; } = [];
-        public bool ClientIpAddressAllowed { get; set; }
-    }
+    public AuditTrailCategorySettings[] Categories { get; set; } = [];
+    public bool ClientIpAddressAllowed { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Settings/AuditTrailTrimmingSettings.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Settings/AuditTrailTrimmingSettings.cs
index f0aeb420297..06448ea554d 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Settings/AuditTrailTrimmingSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Settings/AuditTrailTrimmingSettings.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace OrchardCore.AuditTrail.Settings
+namespace OrchardCore.AuditTrail.Settings;
+
+public class AuditTrailTrimmingSettings
 {
-    public class AuditTrailTrimmingSettings
-    {
-        public int RetentionDays { get; set; } = 10;
-        public DateTime? LastRunUtc { get; set; }
-        public bool Disabled { get; set; }
-    }
+    public int RetentionDays { get; set; } = 10;
+    public DateTime? LastRunUtc { get; set; }
+    public bool Disabled { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs
index c6084e37dad..684789e0ff1 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs
@@ -21,115 +21,114 @@
 using OrchardCore.Settings.Deployment;
 using YesSql.Filters.Query;
 
-namespace OrchardCore.AuditTrail
+namespace OrchardCore.AuditTrail;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            // Add ILookupNormalizer as Singleton because it is needed by Users
-            services.TryAddSingleton<ILookupNormalizer, UpperInvariantLookupNormalizer>();
+        // Add ILookupNormalizer as Singleton because it is needed by Users
+        services.TryAddSingleton<ILookupNormalizer, UpperInvariantLookupNormalizer>();
 
-            services.AddScoped<IAuditTrailManager, AuditTrailManager>();
+        services.AddScoped<IAuditTrailManager, AuditTrailManager>();
 
-            services
-                .AddScoped<IDisplayDriver<AuditTrailEvent>, AuditTrailEventDisplayDriver>();
+        services
+            .AddScoped<IDisplayDriver<AuditTrailEvent>, AuditTrailEventDisplayDriver>();
 
-            services.AddSingleton<IAuditTrailIdGenerator, AuditTrailIdGenerator>();
+        services.AddSingleton<IAuditTrailIdGenerator, AuditTrailIdGenerator>();
 
-            services.Configure<StoreCollectionOptions>(o => o.Collections.Add(AuditTrailEvent.Collection));
+        services.Configure<StoreCollectionOptions>(o => o.Collections.Add(AuditTrailEvent.Collection));
 
-            services.AddDataMigration<Migrations>();
-            services.AddIndexProvider<AuditTrailEventIndexProvider>();
-            services.AddSingleton<IBackgroundTask, AuditTrailBackgroundTask>();
+        services.AddDataMigration<Migrations>();
+        services.AddIndexProvider<AuditTrailEventIndexProvider>();
+        services.AddSingleton<IBackgroundTask, AuditTrailBackgroundTask>();
 
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<INavigationProvider, AuditTrailAdminMenu>();
-            services.AddScoped<INavigationProvider, AuditTrailSettingsAdminMenu>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<INavigationProvider, AuditTrailAdminMenu>();
+        services.AddScoped<INavigationProvider, AuditTrailSettingsAdminMenu>();
 
-            services.AddScoped<IDisplayDriver<ISite>, AuditTrailSettingsDisplayDriver>();
-            services.AddScoped<IDisplayDriver<ISite>, AuditTrailTrimmingSettingsDisplayDriver>();
+        services.AddScoped<IDisplayDriver<ISite>, AuditTrailSettingsDisplayDriver>();
+        services.AddScoped<IDisplayDriver<ISite>, AuditTrailTrimmingSettingsDisplayDriver>();
 
-            services.AddScoped<IDisplayDriver<AuditTrailIndexOptions>, AuditTrailOptionsDisplayDriver>();
+        services.AddScoped<IDisplayDriver<AuditTrailIndexOptions>, AuditTrailOptionsDisplayDriver>();
 
-            services.AddScoped<IAuditTrailAdminListQueryService, DefaultAuditTrailAdminListQueryService>();
+        services.AddScoped<IAuditTrailAdminListQueryService, DefaultAuditTrailAdminListQueryService>();
 
-            services.AddSingleton<IAuditTrailAdminListFilterParser>(sp =>
+        services.AddSingleton<IAuditTrailAdminListFilterParser>(sp =>
+        {
+            var filterProviders = sp.GetServices<IAuditTrailAdminListFilterProvider>();
+            var builder = new QueryEngineBuilder<AuditTrailEvent>();
+            foreach (var provider in filterProviders)
             {
-                var filterProviders = sp.GetServices<IAuditTrailAdminListFilterProvider>();
-                var builder = new QueryEngineBuilder<AuditTrailEvent>();
-                foreach (var provider in filterProviders)
-                {
-                    provider.Build(builder);
-                }
+                provider.Build(builder);
+            }
 
-                var parser = builder.Build();
+            var parser = builder.Build();
 
-                return new DefaultAuditTrailAdminListFilterParser(parser);
-            });
+            return new DefaultAuditTrailAdminListFilterParser(parser);
+        });
 
-            services.AddTransient<IAuditTrailAdminListFilterProvider, DefaultAuditTrailAdminListFilterProvider>();
+        services.AddTransient<IAuditTrailAdminListFilterProvider, DefaultAuditTrailAdminListFilterProvider>();
 
-            services.AddOptions<AuditTrailOptions>();
+        services.AddOptions<AuditTrailOptions>();
 
-            services.Configure<AuditTrailAdminListOptions>(options =>
-            {
-                options
-                    .ForSort("time-desc", b => b
-                        .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderByDescending(i => i.CreatedUtc))
-                        .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
-                        .AsDefault())
+        services.Configure<AuditTrailAdminListOptions>(options =>
+        {
+            options
+                .ForSort("time-desc", b => b
+                    .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderByDescending(i => i.CreatedUtc))
+                    .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Newest"], opt.Value, model.Sort == string.Empty))
+                    .AsDefault())
 
-                    .ForSort("time-asc", b => b
-                        .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderBy(i => i.CreatedUtc))
-                        .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Oldest"], opt.Value, model.Sort == opt.Value)))
+                .ForSort("time-asc", b => b
+                    .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderBy(i => i.CreatedUtc))
+                    .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Oldest"], opt.Value, model.Sort == opt.Value)))
 
-                    .ForSort("category-asc-time-desc", b => b
-                        .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderBy(i => i.Category).ThenByDescending(i => i.CreatedUtc))
-                        .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Category"], opt.Value, model.Sort == opt.Value)))
+                .ForSort("category-asc-time-desc", b => b
+                    .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderBy(i => i.Category).ThenByDescending(i => i.CreatedUtc))
+                    .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Category"], opt.Value, model.Sort == opt.Value)))
 
-                    .ForSort("category-asc-time-asc", b => b
-                        .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderBy(i => i.Category).ThenBy(i => i.CreatedUtc)))
+                .ForSort("category-asc-time-asc", b => b
+                    .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderBy(i => i.Category).ThenBy(i => i.CreatedUtc)))
 
-                    .ForSort("category-desc-time-desc", b => b
-                        .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderByDescending(i => i.Category).ThenByDescending(i => i.CreatedUtc)))
+                .ForSort("category-desc-time-desc", b => b
+                    .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderByDescending(i => i.Category).ThenByDescending(i => i.CreatedUtc)))
 
-                    .ForSort("category-desc-time-asc", b => b
-                        .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderByDescending(i => i.Category).ThenBy(i => i.CreatedUtc)))
+                .ForSort("category-desc-time-asc", b => b
+                    .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderByDescending(i => i.Category).ThenBy(i => i.CreatedUtc)))
 
-                    .ForSort("event-asc-time-desc", b => b
-                        .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderBy(i => i.Name).ThenByDescending(i => i.CreatedUtc))
-                        .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Event"], opt.Value, model.Sort == opt.Value)))
+                .ForSort("event-asc-time-desc", b => b
+                    .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderBy(i => i.Name).ThenByDescending(i => i.CreatedUtc))
+                    .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["Event"], opt.Value, model.Sort == opt.Value)))
 
-                    .ForSort("event-asc-time-asc", b => b
-                        .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderBy(i => i.Name).ThenBy(i => i.CreatedUtc)))
+                .ForSort("event-asc-time-asc", b => b
+                    .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderBy(i => i.Name).ThenBy(i => i.CreatedUtc)))
 
-                    .ForSort("event-desc-time-desc", b => b
-                        .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderByDescending(i => i.Name).ThenByDescending(i => i.CreatedUtc)))
+                .ForSort("event-desc-time-desc", b => b
+                    .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderByDescending(i => i.Name).ThenByDescending(i => i.CreatedUtc)))
 
-                    .ForSort("event-desc-time-asc", b => b
-                        .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderByDescending(i => i.Name).ThenBy(i => i.CreatedUtc)))
+                .ForSort("event-desc-time-asc", b => b
+                    .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderByDescending(i => i.Name).ThenBy(i => i.CreatedUtc)))
 
-                    .ForSort("user-asc-time-asc", b => b
-                        .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderBy(i => i.NormalizedUserName).ThenBy(i => i.CreatedUtc))
-                        .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["User"], opt.Value, model.Sort == opt.Value)))
+                .ForSort("user-asc-time-asc", b => b
+                    .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderBy(i => i.NormalizedUserName).ThenBy(i => i.CreatedUtc))
+                    .WithSelectListItem<Startup>((S, opt, model) => new SelectListItem(S["User"], opt.Value, model.Sort == opt.Value)))
 
-                    .ForSort("user-desc-time-desc", b => b
-                        .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderByDescending(i => i.NormalizedUserName).ThenByDescending(i => i.CreatedUtc)))
+                .ForSort("user-desc-time-desc", b => b
+                    .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderByDescending(i => i.NormalizedUserName).ThenByDescending(i => i.CreatedUtc)))
 
-                    .ForSort("user-desc-time-asc", b => b
-                        .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderByDescending(i => i.NormalizedUserName).ThenBy(i => i.CreatedUtc)));
-            });
-        }
+                .ForSort("user-desc-time-asc", b => b
+                    .WithQuery((val, query) => query.With<AuditTrailEventIndex>().OrderByDescending(i => i.NormalizedUserName).ThenBy(i => i.CreatedUtc)));
+        });
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class DeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class DeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSiteSettingsPropertyDeploymentStep<AuditTrailSettings, DeploymentStartup>(S => S["Audit Trail settings"], S => S["Exports the audit trail settings."]);
-            services.AddSiteSettingsPropertyDeploymentStep<AuditTrailTrimmingSettings, DeploymentStartup>(S => S["Audit Trail Trimming settings"], S => S["Exports the audit trail trimming settings."]);
-        }
+        services.AddSiteSettingsPropertyDeploymentStep<AuditTrailSettings, DeploymentStartup>(S => S["Audit Trail settings"], S => S["Exports the audit trail settings."]);
+        services.AddSiteSettingsPropertyDeploymentStep<AuditTrailTrimmingSettings, DeploymentStartup>(S => S["Audit Trail Trimming settings"], S => S["Exports the audit trail trimming settings."]);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailCategorySettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailCategorySettingsViewModel.cs
index 45e9bc6503b..c0b084ac40e 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailCategorySettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailCategorySettingsViewModel.cs
@@ -1,15 +1,14 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.AuditTrail.ViewModels
+namespace OrchardCore.AuditTrail.ViewModels;
+
+public class AuditTrailCategorySettingsViewModel
 {
-    public class AuditTrailCategorySettingsViewModel
-    {
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        public AuditTrailEventSettingsViewModel[] Events { get; set; }
+    public AuditTrailEventSettingsViewModel[] Events { get; set; }
 
-        [BindNever]
-        public LocalizedString LocalizedName { get; set; }
-    }
+    [BindNever]
+    public LocalizedString LocalizedName { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailEventSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailEventSettingsViewModel.cs
index 6aaad04ee96..f3b8cbbe64b 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailEventSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailEventSettingsViewModel.cs
@@ -1,19 +1,18 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.AuditTrail.ViewModels
+namespace OrchardCore.AuditTrail.ViewModels;
+
+public class AuditTrailEventSettingsViewModel
 {
-    public class AuditTrailEventSettingsViewModel
-    {
-        public string Name { get; set; }
-        public string Category { get; set; }
-        public bool IsEnabled { get; set; }
-        public bool IsMandatory { get; set; }
+    public string Name { get; set; }
+    public string Category { get; set; }
+    public bool IsEnabled { get; set; }
+    public bool IsMandatory { get; set; }
 
-        [BindNever]
-        public LocalizedString LocalizedName { get; set; }
+    [BindNever]
+    public LocalizedString LocalizedName { get; set; }
 
-        [BindNever]
-        public LocalizedString Description { get; set; }
-    }
+    [BindNever]
+    public LocalizedString Description { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailEventViewModel.cs
index 62ebf4c8cc0..3d6f2267246 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailEventViewModel.cs
@@ -1,11 +1,10 @@
 using OrchardCore.AuditTrail.Models;
 using OrchardCore.AuditTrail.Services.Models;
 
-namespace OrchardCore.AuditTrail.ViewModels
+namespace OrchardCore.AuditTrail.ViewModels;
+
+public class AuditTrailEventViewModel
 {
-    public class AuditTrailEventViewModel
-    {
-        public AuditTrailEvent AuditTrailEvent { get; set; }
-        public AuditTrailEventDescriptor Descriptor { get; set; }
-    }
+    public AuditTrailEvent AuditTrailEvent { get; set; }
+    public AuditTrailEventDescriptor Descriptor { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailItemViewModel.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailItemViewModel.cs
index 11232a63dfc..1125eab8482 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailItemViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailItemViewModel.cs
@@ -1,11 +1,10 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.DisplayManagement;
 
-namespace OrchardCore.AuditTrail.ViewModels
+namespace OrchardCore.AuditTrail.ViewModels;
+
+public class AuditTrailItemViewModel
 {
-    public class AuditTrailItemViewModel
-    {
-        [BindNever]
-        public IShape Shape { get; set; }
-    }
+    [BindNever]
+    public IShape Shape { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailListViewModel.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailListViewModel.cs
index d57063415aa..df8f92b4f23 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailListViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailListViewModel.cs
@@ -1,13 +1,12 @@
 using System.Collections.Generic;
 using OrchardCore.DisplayManagement;
 
-namespace OrchardCore.AuditTrail.ViewModels
+namespace OrchardCore.AuditTrail.ViewModels;
+
+public class AuditTrailListViewModel
 {
-    public class AuditTrailListViewModel
-    {
-        public IList<IShape> Events { get; set; }
-        public AuditTrailIndexOptions Options { get; set; } = new AuditTrailIndexOptions();
-        public IShape Pager { get; set; }
-        public dynamic Header { get; set; }
-    }
+    public IList<IShape> Events { get; set; }
+    public AuditTrailIndexOptions Options { get; set; } = new AuditTrailIndexOptions();
+    public IShape Pager { get; set; }
+    public dynamic Header { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailSettingsViewModel.cs
index 397b2aa8d72..b6663d162c6 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailSettingsViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.AuditTrail.ViewModels
+namespace OrchardCore.AuditTrail.ViewModels;
+
+public class AuditTrailSettingsViewModel
 {
-    public class AuditTrailSettingsViewModel
-    {
-        public AuditTrailCategorySettingsViewModel[] Categories { get; set; } = [];
-        public bool ClientIpAddressAllowed { get; set; }
-    }
+    public AuditTrailCategorySettingsViewModel[] Categories { get; set; } = [];
+    public bool ClientIpAddressAllowed { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailTrimmingSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailTrimmingSettingsViewModel.cs
index 9aab614111c..427fe4b3610 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailTrimmingSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/ViewModels/AuditTrailTrimmingSettingsViewModel.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace OrchardCore.AuditTrail.ViewModels
+namespace OrchardCore.AuditTrail.ViewModels;
+
+public class AuditTrailTrimmingSettingsViewModel
 {
-    public class AuditTrailTrimmingSettingsViewModel
-    {
-        public int RetentionDays { get; set; }
-        public DateTime? LastRunUtc { get; set; }
-        public bool Disabled { get; set; }
-    }
+    public int RetentionDays { get; set; }
+    public DateTime? LastRunUtc { get; set; }
+    public bool Disabled { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AutoSetup/AutoSetupMiddleware.cs b/src/OrchardCore.Modules/OrchardCore.AutoSetup/AutoSetupMiddleware.cs
index fc639cba1f6..1bf81a1368f 100644
--- a/src/OrchardCore.Modules/OrchardCore.AutoSetup/AutoSetupMiddleware.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AutoSetup/AutoSetupMiddleware.cs
@@ -14,260 +14,259 @@
 using OrchardCore.Locking.Distributed;
 using OrchardCore.Setup.Services;
 
-namespace OrchardCore.AutoSetup
+namespace OrchardCore.AutoSetup;
+
+/// <summary>
+/// The auto setup middleware.
+/// </summary>
+public class AutoSetupMiddleware
 {
     /// <summary>
-    /// The auto setup middleware.
+    /// The next middleware in the execution pipeline.
+    /// </summary>
+    private readonly RequestDelegate _next;
+
+    /// <summary>
+    /// The shell host.
+    /// </summary>
+    private readonly IShellHost _shellHost;
+
+    /// <summary>
+    /// The shell settings.
+    /// </summary>
+    private readonly ShellSettings _shellSettings;
+
+    /// <summary>
+    /// The shell settings manager.
     /// </summary>
-    public class AutoSetupMiddleware
+    private readonly IShellSettingsManager _shellSettingsManager;
+
+    /// <summary>
+    /// A distributed lock guaranties an atomic setup in multi instances environment.
+    /// </summary>
+    private readonly IDistributedLock _distributedLock;
+
+    /// <summary>
+    /// The auto setup options.
+    /// </summary>
+    private readonly AutoSetupOptions _options;
+
+    /// <summary>
+    /// The logger.
+    /// </summary>
+    private readonly ILogger _logger;
+
+    /// <summary>
+    /// The auto setup lock options.
+    /// </summary>
+    private readonly LockOptions _lockOptions;
+
+    /// <summary>
+    /// The tenant setup options.
+    /// </summary>
+    private readonly TenantSetupOptions _setupOptions;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AutoSetupMiddleware"/> class.
+    /// </summary>
+    /// <param name="next">The next middleware in the execution pipeline.</param>
+    /// <param name="shellHost">The shell host.</param>
+    /// <param name="shellSettings">The shell settings.</param>
+    /// <param name="shellSettingsManager">The shell settings manager.</param>
+    /// <param name="distributedLock">The distributed lock.</param>
+    /// <param name="options">The auto setup options.</param>
+    /// <param name="logger">The logger.</param>
+    public AutoSetupMiddleware(
+        RequestDelegate next,
+        IShellHost shellHost,
+        ShellSettings shellSettings,
+        IShellSettingsManager shellSettingsManager,
+        IDistributedLock distributedLock,
+        IOptions<AutoSetupOptions> options,
+        ILogger<AutoSetupMiddleware> logger)
     {
-        /// <summary>
-        /// The next middleware in the execution pipeline.
-        /// </summary>
-        private readonly RequestDelegate _next;
-
-        /// <summary>
-        /// The shell host.
-        /// </summary>
-        private readonly IShellHost _shellHost;
-
-        /// <summary>
-        /// The shell settings.
-        /// </summary>
-        private readonly ShellSettings _shellSettings;
-
-        /// <summary>
-        /// The shell settings manager.
-        /// </summary>
-        private readonly IShellSettingsManager _shellSettingsManager;
-
-        /// <summary>
-        /// A distributed lock guaranties an atomic setup in multi instances environment.
-        /// </summary>
-        private readonly IDistributedLock _distributedLock;
-
-        /// <summary>
-        /// The auto setup options.
-        /// </summary>
-        private readonly AutoSetupOptions _options;
-
-        /// <summary>
-        /// The logger.
-        /// </summary>
-        private readonly ILogger _logger;
-
-        /// <summary>
-        /// The auto setup lock options.
-        /// </summary>
-        private readonly LockOptions _lockOptions;
-
-        /// <summary>
-        /// The tenant setup options.
-        /// </summary>
-        private readonly TenantSetupOptions _setupOptions;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AutoSetupMiddleware"/> class.
-        /// </summary>
-        /// <param name="next">The next middleware in the execution pipeline.</param>
-        /// <param name="shellHost">The shell host.</param>
-        /// <param name="shellSettings">The shell settings.</param>
-        /// <param name="shellSettingsManager">The shell settings manager.</param>
-        /// <param name="distributedLock">The distributed lock.</param>
-        /// <param name="options">The auto setup options.</param>
-        /// <param name="logger">The logger.</param>
-        public AutoSetupMiddleware(
-            RequestDelegate next,
-            IShellHost shellHost,
-            ShellSettings shellSettings,
-            IShellSettingsManager shellSettingsManager,
-            IDistributedLock distributedLock,
-            IOptions<AutoSetupOptions> options,
-            ILogger<AutoSetupMiddleware> logger)
-        {
-            _next = next;
-            _shellHost = shellHost;
-            _shellSettings = shellSettings;
-            _shellSettingsManager = shellSettingsManager;
-            _distributedLock = distributedLock;
-            _options = options.Value;
-            _logger = logger;
-
-            _lockOptions = _options.LockOptions;
-            _setupOptions = _options.Tenants.FirstOrDefault(options => _shellSettings.Name == options.ShellName);
-        }
+        _next = next;
+        _shellHost = shellHost;
+        _shellSettings = shellSettings;
+        _shellSettingsManager = shellSettingsManager;
+        _distributedLock = distributedLock;
+        _options = options.Value;
+        _logger = logger;
+
+        _lockOptions = _options.LockOptions;
+        _setupOptions = _options.Tenants.FirstOrDefault(options => _shellSettings.Name == options.ShellName);
+    }
 
-        /// <summary>
-        /// The auto setup middleware invoke.
-        /// </summary>
-        /// <param name="httpContext">
-        /// The http context.
-        /// </param>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        public async Task InvokeAsync(HttpContext httpContext)
+    /// <summary>
+    /// The auto setup middleware invoke.
+    /// </summary>
+    /// <param name="httpContext">
+    /// The http context.
+    /// </param>
+    /// <returns>
+    /// The <see cref="Task"/>.
+    /// </returns>
+    public async Task InvokeAsync(HttpContext httpContext)
+    {
+        if (_setupOptions is not null && _shellSettings.IsUninitialized())
         {
-            if (_setupOptions is not null && _shellSettings.IsUninitialized())
+            // Try to acquire a lock before starting installation, it guaranties an atomic setup in multi instances environment.
+            (var locker, var locked) = await _distributedLock.TryAcquireAutoSetupLockAsync(_lockOptions);
+            if (!locked)
             {
-                // Try to acquire a lock before starting installation, it guaranties an atomic setup in multi instances environment.
-                (var locker, var locked) = await _distributedLock.TryAcquireAutoSetupLockAsync(_lockOptions);
-                if (!locked)
-                {
-                    throw new TimeoutException($"Fails to acquire an auto setup lock for the tenant: {_setupOptions.ShellName}");
-                }
+                throw new TimeoutException($"Fails to acquire an auto setup lock for the tenant: {_setupOptions.ShellName}");
+            }
 
-                await using var acquiredLock = locker;
+            await using var acquiredLock = locker;
 
-                if (_shellSettings.IsUninitialized())
+            if (_shellSettings.IsUninitialized())
+            {
+                var pathBase = httpContext.Request.PathBase;
+                if (!pathBase.HasValue)
                 {
-                    var pathBase = httpContext.Request.PathBase;
-                    if (!pathBase.HasValue)
-                    {
-                        pathBase = "/";
-                    }
+                    pathBase = "/";
+                }
 
-                    // Check if the tenant was installed by another instance.
-                    using var settings = (await _shellSettingsManager
-                        .LoadSettingsAsync(_shellSettings.Name))
-                        .AsDisposable();
+                // Check if the tenant was installed by another instance.
+                using var settings = (await _shellSettingsManager
+                    .LoadSettingsAsync(_shellSettings.Name))
+                    .AsDisposable();
 
-                    if (!settings.IsUninitialized())
-                    {
-                        await _shellHost.ReloadShellContextAsync(_shellSettings, eventSource: false);
-                        httpContext.Response.Redirect(pathBase);
+                if (!settings.IsUninitialized())
+                {
+                    await _shellHost.ReloadShellContextAsync(_shellSettings, eventSource: false);
+                    httpContext.Response.Redirect(pathBase);
 
-                        return;
-                    }
+                    return;
+                }
 
-                    var setupService = httpContext.RequestServices.GetRequiredService<ISetupService>();
-                    if (await SetupTenantAsync(setupService, _setupOptions, _shellSettings))
+                var setupService = httpContext.RequestServices.GetRequiredService<ISetupService>();
+                if (await SetupTenantAsync(setupService, _setupOptions, _shellSettings))
+                {
+                    if (_setupOptions.IsDefault)
                     {
-                        if (_setupOptions.IsDefault)
+                        // Create the rest of the shells for further on demand setup.
+                        foreach (var setupOptions in _options.Tenants)
                         {
-                            // Create the rest of the shells for further on demand setup.
-                            foreach (var setupOptions in _options.Tenants)
+                            if (_setupOptions != setupOptions)
                             {
-                                if (_setupOptions != setupOptions)
-                                {
-                                    await CreateTenantSettingsAsync(setupOptions);
-                                }
+                                await CreateTenantSettingsAsync(setupOptions);
                             }
                         }
+                    }
 
-                        httpContext.Response.Redirect(pathBase);
+                    httpContext.Response.Redirect(pathBase);
 
-                        return;
-                    }
+                    return;
                 }
             }
-
-            await _next.Invoke(httpContext);
         }
 
-        /// <summary>
-        /// Sets up a tenant.
-        /// </summary>
-        /// <param name="setupService">The setup service.</param>
-        /// <param name="setupOptions">The tenant setup options.</param>
-        /// <param name="shellSettings">The tenant shell settings.</param>
-        /// <returns>
-        /// Returns <c>true</c> if successfully setup.
-        /// </returns>
-        public async Task<bool> SetupTenantAsync(ISetupService setupService, TenantSetupOptions setupOptions, ShellSettings shellSettings)
-        {
-            var setupContext = await GetSetupContextAsync(setupOptions, setupService, shellSettings);
-
-            _logger.LogInformation("AutoSetup is initializing the site");
+        await _next.Invoke(httpContext);
+    }
 
-            await setupService.SetupAsync(setupContext);
+    /// <summary>
+    /// Sets up a tenant.
+    /// </summary>
+    /// <param name="setupService">The setup service.</param>
+    /// <param name="setupOptions">The tenant setup options.</param>
+    /// <param name="shellSettings">The tenant shell settings.</param>
+    /// <returns>
+    /// Returns <c>true</c> if successfully setup.
+    /// </returns>
+    public async Task<bool> SetupTenantAsync(ISetupService setupService, TenantSetupOptions setupOptions, ShellSettings shellSettings)
+    {
+        var setupContext = await GetSetupContextAsync(setupOptions, setupService, shellSettings);
 
-            if (setupContext.Errors.Count == 0)
-            {
-                _logger.LogInformation("AutoSetup successfully provisioned the site '{SiteName}'.", setupOptions.SiteName);
+        _logger.LogInformation("AutoSetup is initializing the site");
 
-                return true;
-            }
+        await setupService.SetupAsync(setupContext);
 
-            var stringBuilder = new StringBuilder();
-            foreach (var error in setupContext.Errors)
-            {
-                stringBuilder.AppendLine($"{error.Key} : '{error.Value}'");
-            }
-
-            _logger.LogError("AutoSetup failed installing the site '{SiteName}' with errors: {Errors}", setupOptions.SiteName, stringBuilder);
+        if (setupContext.Errors.Count == 0)
+        {
+            _logger.LogInformation("AutoSetup successfully provisioned the site '{SiteName}'.", setupOptions.SiteName);
 
-            return false;
+            return true;
         }
 
-        /// <summary>
-        /// Creates a tenant shell settings.
-        /// </summary>
-        /// <param name="setupOptions">The setup options.</param>
-        /// <returns>The <see cref="ShellSettings"/>.</returns>
-        public async Task<ShellSettings> CreateTenantSettingsAsync(TenantSetupOptions setupOptions)
+        var stringBuilder = new StringBuilder();
+        foreach (var error in setupContext.Errors)
         {
-            using var shellSettings = _shellSettingsManager
-                .CreateDefaultSettings()
-                .AsUninitialized()
-                .AsDisposable();
-
-            shellSettings.Name = setupOptions.ShellName;
-            shellSettings.RequestUrlHost = setupOptions.RequestUrlHost;
-            shellSettings.RequestUrlPrefix = setupOptions.RequestUrlPrefix;
-
-            shellSettings["ConnectionString"] = setupOptions.DatabaseConnectionString;
-            shellSettings["TablePrefix"] = setupOptions.DatabaseTablePrefix;
-            shellSettings["Schema"] = setupOptions.DatabaseSchema;
-            shellSettings["DatabaseProvider"] = setupOptions.DatabaseProvider;
-            shellSettings["Secret"] = Guid.NewGuid().ToString();
-            shellSettings["RecipeName"] = setupOptions.RecipeName;
-            shellSettings["FeatureProfile"] = setupOptions.FeatureProfile;
-
-            await _shellHost.UpdateShellSettingsAsync(shellSettings);
-
-            return shellSettings;
+            stringBuilder.AppendLine($"{error.Key} : '{error.Value}'");
         }
 
-        /// <summary>
-        /// Gets a setup context from the configuration.
-        /// </summary>
-        /// <param name="options">The tenant setup options.</param>
-        /// <param name="setupService">The setup service.</param>
-        /// <param name="shellSettings">The tenant shell settings.</param>
-        /// <returns> The <see cref="SetupContext"/> used to setup the site.</returns>
-        private static async Task<SetupContext> GetSetupContextAsync(TenantSetupOptions options, ISetupService setupService, ShellSettings shellSettings)
-        {
-            var recipes = await setupService.GetSetupRecipesAsync();
+        _logger.LogError("AutoSetup failed installing the site '{SiteName}' with errors: {Errors}", setupOptions.SiteName, stringBuilder);
 
-            var recipe = recipes.SingleOrDefault(r => r.Name == options.RecipeName);
+        return false;
+    }
 
-            var setupContext = new SetupContext
-            {
-                Recipe = recipe,
-                ShellSettings = shellSettings,
-                Errors = new Dictionary<string, string>()
-            };
+    /// <summary>
+    /// Creates a tenant shell settings.
+    /// </summary>
+    /// <param name="setupOptions">The setup options.</param>
+    /// <returns>The <see cref="ShellSettings"/>.</returns>
+    public async Task<ShellSettings> CreateTenantSettingsAsync(TenantSetupOptions setupOptions)
+    {
+        using var shellSettings = _shellSettingsManager
+            .CreateDefaultSettings()
+            .AsUninitialized()
+            .AsDisposable();
+
+        shellSettings.Name = setupOptions.ShellName;
+        shellSettings.RequestUrlHost = setupOptions.RequestUrlHost;
+        shellSettings.RequestUrlPrefix = setupOptions.RequestUrlPrefix;
+
+        shellSettings["ConnectionString"] = setupOptions.DatabaseConnectionString;
+        shellSettings["TablePrefix"] = setupOptions.DatabaseTablePrefix;
+        shellSettings["Schema"] = setupOptions.DatabaseSchema;
+        shellSettings["DatabaseProvider"] = setupOptions.DatabaseProvider;
+        shellSettings["Secret"] = Guid.NewGuid().ToString();
+        shellSettings["RecipeName"] = setupOptions.RecipeName;
+        shellSettings["FeatureProfile"] = setupOptions.FeatureProfile;
+
+        await _shellHost.UpdateShellSettingsAsync(shellSettings);
+
+        return shellSettings;
+    }
 
-            if (shellSettings.IsDefaultShell())
-            {
-                // The 'Default' shell is first created by the infrastructure,
-                // so the following 'Autosetup' options need to be passed.
-                shellSettings.RequestUrlHost = options.RequestUrlHost;
-                shellSettings.RequestUrlPrefix = options.RequestUrlPrefix;
-            }
+    /// <summary>
+    /// Gets a setup context from the configuration.
+    /// </summary>
+    /// <param name="options">The tenant setup options.</param>
+    /// <param name="setupService">The setup service.</param>
+    /// <param name="shellSettings">The tenant shell settings.</param>
+    /// <returns> The <see cref="SetupContext"/> used to setup the site.</returns>
+    private static async Task<SetupContext> GetSetupContextAsync(TenantSetupOptions options, ISetupService setupService, ShellSettings shellSettings)
+    {
+        var recipes = await setupService.GetSetupRecipesAsync();
+
+        var recipe = recipes.SingleOrDefault(r => r.Name == options.RecipeName);
 
-            setupContext.Properties[SetupConstants.AdminEmail] = options.AdminEmail;
-            setupContext.Properties[SetupConstants.AdminPassword] = options.AdminPassword;
-            setupContext.Properties[SetupConstants.AdminUsername] = options.AdminUsername;
-            setupContext.Properties[SetupConstants.DatabaseConnectionString] = options.DatabaseConnectionString;
-            setupContext.Properties[SetupConstants.DatabaseProvider] = options.DatabaseProvider;
-            setupContext.Properties[SetupConstants.DatabaseTablePrefix] = options.DatabaseTablePrefix;
-            setupContext.Properties[SetupConstants.DatabaseSchema] = options.DatabaseSchema;
-            setupContext.Properties[SetupConstants.SiteName] = options.SiteName;
-            setupContext.Properties[SetupConstants.SiteTimeZone] = options.SiteTimeZone;
-
-            return setupContext;
+        var setupContext = new SetupContext
+        {
+            Recipe = recipe,
+            ShellSettings = shellSettings,
+            Errors = new Dictionary<string, string>()
+        };
+
+        if (shellSettings.IsDefaultShell())
+        {
+            // The 'Default' shell is first created by the infrastructure,
+            // so the following 'Autosetup' options need to be passed.
+            shellSettings.RequestUrlHost = options.RequestUrlHost;
+            shellSettings.RequestUrlPrefix = options.RequestUrlPrefix;
         }
+
+        setupContext.Properties[SetupConstants.AdminEmail] = options.AdminEmail;
+        setupContext.Properties[SetupConstants.AdminPassword] = options.AdminPassword;
+        setupContext.Properties[SetupConstants.AdminUsername] = options.AdminUsername;
+        setupContext.Properties[SetupConstants.DatabaseConnectionString] = options.DatabaseConnectionString;
+        setupContext.Properties[SetupConstants.DatabaseProvider] = options.DatabaseProvider;
+        setupContext.Properties[SetupConstants.DatabaseTablePrefix] = options.DatabaseTablePrefix;
+        setupContext.Properties[SetupConstants.DatabaseSchema] = options.DatabaseSchema;
+        setupContext.Properties[SetupConstants.SiteName] = options.SiteName;
+        setupContext.Properties[SetupConstants.SiteTimeZone] = options.SiteTimeZone;
+
+        return setupContext;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AutoSetup/Extensions/DistributedLockExtensions.cs b/src/OrchardCore.Modules/OrchardCore.AutoSetup/Extensions/DistributedLockExtensions.cs
index e54f268ddc6..3bbd1459e1b 100644
--- a/src/OrchardCore.Modules/OrchardCore.AutoSetup/Extensions/DistributedLockExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AutoSetup/Extensions/DistributedLockExtensions.cs
@@ -4,53 +4,52 @@
 using OrchardCore.Locking;
 using OrchardCore.Locking.Distributed;
 
-namespace OrchardCore.AutoSetup.Extensions
+namespace OrchardCore.AutoSetup.Extensions;
+
+/// <summary>
+/// The distributed lock extensions for auto setup.
+/// </summary>
+public static class DistributedLockExtensions
 {
     /// <summary>
-    /// The distributed lock extensions for auto setup.
+    /// Tries to acquire an auto setup lock.
     /// </summary>
-    public static class DistributedLockExtensions
+    /// <param name="distributedLock">
+    /// The distributed lock.
+    /// </param>
+    /// <param name="lockOptions">
+    /// The auto setup lock options.
+    /// </param>
+    /// <returns>
+    /// The <see cref="ILocker"/> and <c>true</c> if successfully acquired.
+    /// </returns>
+    public static Task<(ILocker locker, bool locked)> TryAcquireAutoSetupLockAsync(this IDistributedLock distributedLock, LockOptions lockOptions)
     {
-        /// <summary>
-        /// Tries to acquire an auto setup lock.
-        /// </summary>
-        /// <param name="distributedLock">
-        /// The distributed lock.
-        /// </param>
-        /// <param name="lockOptions">
-        /// The auto setup lock options.
-        /// </param>
-        /// <returns>
-        /// The <see cref="ILocker"/> and <c>true</c> if successfully acquired.
-        /// </returns>
-        public static Task<(ILocker locker, bool locked)> TryAcquireAutoSetupLockAsync(this IDistributedLock distributedLock, LockOptions lockOptions)
+        TimeSpan timeout, expiration;
+        if (distributedLock is ILocalLock)
+        {
+            // If it is a local lock, don't use any timeout and expiration.
+            timeout = expiration = TimeSpan.MaxValue;
+        }
+        else
         {
-            TimeSpan timeout, expiration;
-            if (distributedLock is ILocalLock)
+            // If it is a distributed lock, use the configured timeout and expiration.
+            var lockTimeout = lockOptions?.LockTimeout ?? 0;
+            if (lockTimeout <= 0)
             {
-                // If it is a local lock, don't use any timeout and expiration.
-                timeout = expiration = TimeSpan.MaxValue;
+                lockTimeout = 60_000;
             }
-            else
-            {
-                // If it is a distributed lock, use the configured timeout and expiration.
-                var lockTimeout = lockOptions?.LockTimeout ?? 0;
-                if (lockTimeout <= 0)
-                {
-                    lockTimeout = 60_000;
-                }
 
-                var lockExpiration = lockOptions?.LockExpiration ?? 0;
-                if (lockExpiration <= 0)
-                {
-                    lockExpiration = 60_000;
-                }
-
-                timeout = TimeSpan.FromMilliseconds(lockTimeout);
-                expiration = TimeSpan.FromMilliseconds(lockExpiration);
+            var lockExpiration = lockOptions?.LockExpiration ?? 0;
+            if (lockExpiration <= 0)
+            {
+                lockExpiration = 60_000;
             }
 
-            return distributedLock.TryAcquireLockAsync("AUTOSETUP_LOCK", timeout, expiration);
+            timeout = TimeSpan.FromMilliseconds(lockTimeout);
+            expiration = TimeSpan.FromMilliseconds(lockExpiration);
         }
+
+        return distributedLock.TryAcquireLockAsync("AUTOSETUP_LOCK", timeout, expiration);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AutoSetup/Options/AutoSetupOptions.cs b/src/OrchardCore.Modules/OrchardCore.AutoSetup/Options/AutoSetupOptions.cs
index 4f648fed661..42c749c4088 100644
--- a/src/OrchardCore.Modules/OrchardCore.AutoSetup/Options/AutoSetupOptions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AutoSetup/Options/AutoSetupOptions.cs
@@ -3,65 +3,64 @@
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
-namespace OrchardCore.AutoSetup.Options
+namespace OrchardCore.AutoSetup.Options;
+
+/// <summary>
+/// The auto setup options.
+/// </summary>
+public class AutoSetupOptions : IValidatableObject
 {
     /// <summary>
-    /// The auto setup options.
+    /// Gets or sets the url which will trigger the auto setup.
+    /// Leave it empty if you want to trigger the auto setup on any request.
     /// </summary>
-    public class AutoSetupOptions : IValidatableObject
-    {
-        /// <summary>
-        /// Gets or sets the url which will trigger the auto setup.
-        /// Leave it empty if you want to trigger the auto setup on any request.
-        /// </summary>
-        public string AutoSetupPath { get; set; }
+    public string AutoSetupPath { get; set; }
 
-        /// <summary>
-        /// Auto setup lock options.
-        /// </summary>
-        public LockOptions LockOptions { get; set; }
+    /// <summary>
+    /// Auto setup lock options.
+    /// </summary>
+    public LockOptions LockOptions { get; set; }
 
-        /// <summary>
-        /// Gets or sets the tenants to install.
-        /// </summary>
-        public List<TenantSetupOptions> Tenants { get; set; } = [];
+    /// <summary>
+    /// Gets or sets the tenants to install.
+    /// </summary>
+    public List<TenantSetupOptions> Tenants { get; set; } = [];
 
-        /// <summary>
-        /// Whether the configuration section exists.
-        /// </summary>
-        public bool ConfigurationExists { get; set; }
+    /// <summary>
+    /// Whether the configuration section exists.
+    /// </summary>
+    public bool ConfigurationExists { get; set; }
 
-        /// <summary>
-        /// Auto setup options validation logic.
-        /// </summary>
-        /// <param name="validationContext">The validation context.</param>
-        /// <returns>The collection of errors.</returns>
-        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    /// <summary>
+    /// Auto setup options validation logic.
+    /// </summary>
+    /// <param name="validationContext">The validation context.</param>
+    /// <returns>The collection of errors.</returns>
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        if (!string.IsNullOrWhiteSpace(AutoSetupPath) && !AutoSetupPath.StartsWith('/'))
         {
-            if (!string.IsNullOrWhiteSpace(AutoSetupPath) && !AutoSetupPath.StartsWith('/'))
-            {
-                yield return new ValidationResult($"The field '{nameof(AutoSetupPath)}' should be empty or start with '/'.");
-            }
+            yield return new ValidationResult($"The field '{nameof(AutoSetupPath)}' should be empty or start with '/'.");
+        }
 
-            if (Tenants.Count == 0)
-            {
-                yield return new ValidationResult($"The field '{nameof(Tenants)}' should contain at least one tenant.");
-            }
+        if (Tenants.Count == 0)
+        {
+            yield return new ValidationResult($"The field '{nameof(Tenants)}' should contain at least one tenant.");
+        }
 
-            if (Tenants.Count(tenant => tenant.IsDefault) != 1)
-            {
-                yield return new ValidationResult("The single 'Default' tenant should be provided.");
-            }
+        if (Tenants.Count(tenant => tenant.IsDefault) != 1)
+        {
+            yield return new ValidationResult("The single 'Default' tenant should be provided.");
+        }
 
-            if (LockOptions != null && (LockOptions.LockExpiration <= 0 || LockOptions.LockTimeout <= 0))
-            {
-                yield return new ValidationResult("Lock option's 'LockExpiration' and 'LockTimeout' should be greater than zero.");
-            }
+        if (LockOptions != null && (LockOptions.LockExpiration <= 0 || LockOptions.LockTimeout <= 0))
+        {
+            yield return new ValidationResult("Lock option's 'LockExpiration' and 'LockTimeout' should be greater than zero.");
+        }
 
-            foreach (var validationResult in Tenants.SelectMany(tenant => tenant.Validate(validationContext)))
-            {
-                yield return validationResult;
-            }
+        foreach (var validationResult in Tenants.SelectMany(tenant => tenant.Validate(validationContext)))
+        {
+            yield return validationResult;
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AutoSetup/Options/LockOptions.cs b/src/OrchardCore.Modules/OrchardCore.AutoSetup/Options/LockOptions.cs
index dff815f8172..abb776bc02b 100644
--- a/src/OrchardCore.Modules/OrchardCore.AutoSetup/Options/LockOptions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AutoSetup/Options/LockOptions.cs
@@ -1,18 +1,17 @@
-namespace OrchardCore.AutoSetup.Options
+namespace OrchardCore.AutoSetup.Options;
+
+/// <summary>
+/// The auto setup lock options.
+/// </summary>
+public class LockOptions
 {
     /// <summary>
-    /// The auto setup lock options.
+    /// The timeout in milliseconds to acquire a distributed setup lock.
     /// </summary>
-    public class LockOptions
-    {
-        /// <summary>
-        /// The timeout in milliseconds to acquire a distributed setup lock.
-        /// </summary>
-        public int LockTimeout { get; set; }
+    public int LockTimeout { get; set; }
 
-        /// <summary>
-        /// The expiration in milliseconds of the distributed setup lock.
-        /// </summary>
-        public int LockExpiration { get; set; }
-    }
+    /// <summary>
+    /// The expiration in milliseconds of the distributed setup lock.
+    /// </summary>
+    public int LockExpiration { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AutoSetup/Options/TenantSetupOptions.cs b/src/OrchardCore.Modules/OrchardCore.AutoSetup/Options/TenantSetupOptions.cs
index 13433489b48..2fe9795fb9f 100644
--- a/src/OrchardCore.Modules/OrchardCore.AutoSetup/Options/TenantSetupOptions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AutoSetup/Options/TenantSetupOptions.cs
@@ -6,158 +6,157 @@
 using OrchardCore.Data;
 using OrchardCore.Environment.Shell;
 
-namespace OrchardCore.AutoSetup.Options
+namespace OrchardCore.AutoSetup.Options;
+
+/// <summary>
+/// The tenant setup options.
+/// </summary>
+public partial class TenantSetupOptions
 {
+    private readonly string _requiredErrorMessageFormat = "The {0} field is required.";
+
+    private bool? _isDefault;
+
+    /// <summary>
+    /// The Shell Name.
+    /// </summary>
+    public string ShellName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the user friendly Tenant/Site Name.
+    /// </summary>
+    public string SiteName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the admin username.
+    /// </summary>
+    public string AdminUsername { get; set; }
+
+    /// <summary>
+    /// Gets or sets the admin email.
+    /// </summary>
+    public string AdminEmail { get; set; }
+
+    /// <summary>
+    /// Gets or sets the admin password.
+    /// </summary>
+    public string AdminPassword { get; set; }
+
+    /// <summary>
+    /// Gets or sets the database provider.
+    /// </summary>
+    public string DatabaseProvider { get; set; }
+
+    /// <summary>
+    /// Gets or sets the database connection string.
+    /// </summary>
+    public string DatabaseConnectionString { get; set; }
+
+    /// <summary>
+    /// Gets or sets the database table prefix.
+    /// </summary>
+    public string DatabaseTablePrefix { get; set; }
+
+    /// <summary>
+    /// Gets or sets the database's schema.
+    /// </summary>
+    public string DatabaseSchema { get; set; }
+
+    /// <summary>
+    /// Gets or sets the recipe name.
+    /// </summary>
+    public string RecipeName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the site time zone.
+    /// </summary>
+    public string SiteTimeZone { get; set; }
+
+    /// <summary>
+    /// Gets or sets the tenants request url host.
+    /// </summary>
+    public string RequestUrlHost { get; set; }
+
     /// <summary>
-    /// The tenant setup options.
+    /// Gets or sets the tenant request url prefix.
     /// </summary>
-    public partial class TenantSetupOptions
+    public string RequestUrlPrefix { get; set; }
+
+    /// <summary>
+    /// Gets or sets the name of the feature profile applied to the tenant. May be <see langword="null"/> or empty
+    /// for no profile being selected.
+    /// </summary>
+    public string FeatureProfile { get; set; }
+
+    /// <summary>
+    /// Gets the Flag which indicates a Default/Root shell/tenant.
+    /// </summary>
+    public bool IsDefault => _isDefault ??= ShellName.IsDefaultShellName();
+
+    /// <summary>
+    /// Tenant validation.
+    /// </summary>
+    /// <param name="validationContext"> The validation context. </param>
+    /// <returns> The collection of errors. </returns>
+    public virtual IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
-        private readonly string _requiredErrorMessageFormat = "The {0} field is required.";
-
-        private bool? _isDefault;
-
-        /// <summary>
-        /// The Shell Name.
-        /// </summary>
-        public string ShellName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the user friendly Tenant/Site Name.
-        /// </summary>
-        public string SiteName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the admin username.
-        /// </summary>
-        public string AdminUsername { get; set; }
-
-        /// <summary>
-        /// Gets or sets the admin email.
-        /// </summary>
-        public string AdminEmail { get; set; }
-
-        /// <summary>
-        /// Gets or sets the admin password.
-        /// </summary>
-        public string AdminPassword { get; set; }
-
-        /// <summary>
-        /// Gets or sets the database provider.
-        /// </summary>
-        public string DatabaseProvider { get; set; }
-
-        /// <summary>
-        /// Gets or sets the database connection string.
-        /// </summary>
-        public string DatabaseConnectionString { get; set; }
-
-        /// <summary>
-        /// Gets or sets the database table prefix.
-        /// </summary>
-        public string DatabaseTablePrefix { get; set; }
-
-        /// <summary>
-        /// Gets or sets the database's schema.
-        /// </summary>
-        public string DatabaseSchema { get; set; }
-
-        /// <summary>
-        /// Gets or sets the recipe name.
-        /// </summary>
-        public string RecipeName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the site time zone.
-        /// </summary>
-        public string SiteTimeZone { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tenants request url host.
-        /// </summary>
-        public string RequestUrlHost { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tenant request url prefix.
-        /// </summary>
-        public string RequestUrlPrefix { get; set; }
-
-        /// <summary>
-        /// Gets or sets the name of the feature profile applied to the tenant. May be <see langword="null"/> or empty
-        /// for no profile being selected.
-        /// </summary>
-        public string FeatureProfile { get; set; }
-
-        /// <summary>
-        /// Gets the Flag which indicates a Default/Root shell/tenant.
-        /// </summary>
-        public bool IsDefault => _isDefault ??= ShellName.IsDefaultShellName();
-
-        /// <summary>
-        /// Tenant validation.
-        /// </summary>
-        /// <param name="validationContext"> The validation context. </param>
-        /// <returns> The collection of errors. </returns>
-        public virtual IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+        if (string.IsNullOrEmpty(ShellName) || !TenantNameRegex().IsMatch(ShellName))
+        {
+            yield return new ValidationResult("ShellName Can not be empty and must contain characters only and no spaces.");
+        }
+
+        if (!IsDefault && ShellName.IsDefaultShellNameIgnoreCase())
+        {
+            yield return new ValidationResult("The tenant name is in conflict with the 'Default' tenant name.");
+        }
+
+        if (!string.IsNullOrWhiteSpace(RequestUrlPrefix) && RequestUrlPrefix.Contains('/'))
         {
-            if (string.IsNullOrEmpty(ShellName) || !TenantNameRegex().IsMatch(ShellName))
-            {
-                yield return new ValidationResult("ShellName Can not be empty and must contain characters only and no spaces.");
-            }
-
-            if (!IsDefault && ShellName.IsDefaultShellNameIgnoreCase())
-            {
-                yield return new ValidationResult("The tenant name is in conflict with the 'Default' tenant name.");
-            }
-
-            if (!string.IsNullOrWhiteSpace(RequestUrlPrefix) && RequestUrlPrefix.Contains('/'))
-            {
-                yield return new ValidationResult("The RequestUrlPrefix can not contain more than one segment.");
-            }
-
-            if (string.IsNullOrWhiteSpace(SiteName))
-            {
-                yield return new ValidationResult(string.Format(_requiredErrorMessageFormat, nameof(SiteName)));
-            }
-
-            if (string.IsNullOrWhiteSpace(AdminUsername))
-            {
-                yield return new ValidationResult(string.Format(_requiredErrorMessageFormat, nameof(AdminUsername)));
-            }
-
-            if (string.IsNullOrWhiteSpace(AdminEmail))
-            {
-                yield return new ValidationResult(string.Format(_requiredErrorMessageFormat, nameof(AdminEmail)));
-            }
-
-            if (string.IsNullOrWhiteSpace(AdminPassword))
-            {
-                yield return new ValidationResult(string.Format(_requiredErrorMessageFormat, nameof(AdminPassword)));
-            }
-
-            var selectedProvider = validationContext.GetServices<DatabaseProvider>().FirstOrDefault(x => x.Value == DatabaseProvider);
-            if (selectedProvider == null)
-            {
-                yield return new ValidationResult(string.Format(_requiredErrorMessageFormat, nameof(DatabaseProvider)));
-            }
-
-            if (selectedProvider != null && selectedProvider.HasConnectionString && string.IsNullOrWhiteSpace(DatabaseConnectionString))
-            {
-                yield return new ValidationResult(string.Format(_requiredErrorMessageFormat, nameof(DatabaseConnectionString)));
-            }
-
-            if (string.IsNullOrWhiteSpace(RecipeName))
-            {
-                yield return new ValidationResult(string.Format(_requiredErrorMessageFormat, nameof(RecipeName)));
-            }
-
-            if (string.IsNullOrWhiteSpace(SiteTimeZone))
-            {
-                yield return new ValidationResult(string.Format(_requiredErrorMessageFormat, nameof(SiteTimeZone)));
-            }
+            yield return new ValidationResult("The RequestUrlPrefix can not contain more than one segment.");
         }
 
-        [GeneratedRegex(@"^\w+$")]
-        private static partial Regex TenantNameRegex();
+        if (string.IsNullOrWhiteSpace(SiteName))
+        {
+            yield return new ValidationResult(string.Format(_requiredErrorMessageFormat, nameof(SiteName)));
+        }
+
+        if (string.IsNullOrWhiteSpace(AdminUsername))
+        {
+            yield return new ValidationResult(string.Format(_requiredErrorMessageFormat, nameof(AdminUsername)));
+        }
+
+        if (string.IsNullOrWhiteSpace(AdminEmail))
+        {
+            yield return new ValidationResult(string.Format(_requiredErrorMessageFormat, nameof(AdminEmail)));
+        }
+
+        if (string.IsNullOrWhiteSpace(AdminPassword))
+        {
+            yield return new ValidationResult(string.Format(_requiredErrorMessageFormat, nameof(AdminPassword)));
+        }
+
+        var selectedProvider = validationContext.GetServices<DatabaseProvider>().FirstOrDefault(x => x.Value == DatabaseProvider);
+        if (selectedProvider == null)
+        {
+            yield return new ValidationResult(string.Format(_requiredErrorMessageFormat, nameof(DatabaseProvider)));
+        }
+
+        if (selectedProvider != null && selectedProvider.HasConnectionString && string.IsNullOrWhiteSpace(DatabaseConnectionString))
+        {
+            yield return new ValidationResult(string.Format(_requiredErrorMessageFormat, nameof(DatabaseConnectionString)));
+        }
+
+        if (string.IsNullOrWhiteSpace(RecipeName))
+        {
+            yield return new ValidationResult(string.Format(_requiredErrorMessageFormat, nameof(RecipeName)));
+        }
+
+        if (string.IsNullOrWhiteSpace(SiteTimeZone))
+        {
+            yield return new ValidationResult(string.Format(_requiredErrorMessageFormat, nameof(SiteTimeZone)));
+        }
     }
+
+    [GeneratedRegex(@"^\w+$")]
+    private static partial Regex TenantNameRegex();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AutoSetup/Startup.cs b/src/OrchardCore.Modules/OrchardCore.AutoSetup/Startup.cs
index 5ab8fd246ae..022c01aa76e 100644
--- a/src/OrchardCore.Modules/OrchardCore.AutoSetup/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AutoSetup/Startup.cs
@@ -14,107 +14,106 @@
 using OrchardCore.Modules;
 using OrchardCore.Routing;
 
-namespace OrchardCore.AutoSetup
+namespace OrchardCore.AutoSetup;
+
+/// <summary>
+/// The AutoSetup feature startup.
+/// </summary>
+public sealed class Startup : StartupBase
 {
     /// <summary>
-    /// The AutoSetup feature startup.
+    /// AutoSetup Configuration Section Name.
     /// </summary>
-    public sealed class Startup : StartupBase
-    {
-        /// <summary>
-        /// AutoSetup Configuration Section Name.
-        /// </summary>
-        private const string ConfigSectionName = "OrchardCore_AutoSetup";
+    private const string ConfigSectionName = "OrchardCore_AutoSetup";
 
-        /// <summary>
-        /// The Shell settings.
-        /// </summary>
-        private readonly ShellSettings _shellSettings;
+    /// <summary>
+    /// The Shell settings.
+    /// </summary>
+    private readonly ShellSettings _shellSettings;
 
-        /// <summary>
-        /// The Shell/Tenant configuration.
-        /// </summary>
-        private readonly IShellConfiguration _shellConfiguration;
+    /// <summary>
+    /// The Shell/Tenant configuration.
+    /// </summary>
+    private readonly IShellConfiguration _shellConfiguration;
 
-        /// <summary>
-        /// The logger.
-        /// </summary>
-        private readonly ILogger<Startup> _logger;
+    /// <summary>
+    /// The logger.
+    /// </summary>
+    private readonly ILogger<Startup> _logger;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Startup"/> class.
-        /// </summary>
-        /// <param name="shellSettings">The Shell settings.</param>
-        /// <param name="shellConfiguration">The shell configuration.</param>
-        /// <param name="logger">The logger.</param>
-        public Startup(ShellSettings shellSettings, IShellConfiguration shellConfiguration, ILogger<Startup> logger)
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Startup"/> class.
+    /// </summary>
+    /// <param name="shellSettings">The Shell settings.</param>
+    /// <param name="shellConfiguration">The shell configuration.</param>
+    /// <param name="logger">The logger.</param>
+    public Startup(ShellSettings shellSettings, IShellConfiguration shellConfiguration, ILogger<Startup> logger)
+    {
+        _shellSettings = shellSettings;
+        _shellConfiguration = shellConfiguration;
+        _logger = logger;
+    }
+
+    /// <summary>
+    /// The configure services.
+    /// </summary>
+    /// <param name="services">
+    /// The services.
+    /// </param>
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        var configuration = _shellConfiguration.GetSection(ConfigSectionName);
+        services.Configure<AutoSetupOptions>(configuration);
+
+        if (configuration.Exists())
         {
-            _shellSettings = shellSettings;
-            _shellConfiguration = shellConfiguration;
-            _logger = logger;
+            services.Configure<AutoSetupOptions>(o => o.ConfigurationExists = true);
         }
+    }
 
-        /// <summary>
-        /// The configure services.
-        /// </summary>
-        /// <param name="services">
-        /// The services.
-        /// </param>
-        public override void ConfigureServices(IServiceCollection services)
+    /// <summary>
+    /// Configure application pipeline.
+    /// </summary>
+    /// <param name="app">
+    /// The app.
+    /// </param>
+    /// <param name="routes">
+    /// The routes.
+    /// </param>
+    /// <param name="serviceProvider">
+    /// The "Shell Scope" service provider.
+    /// </param>
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        if (_shellSettings.IsUninitialized())
         {
-            var configuration = _shellConfiguration.GetSection(ConfigSectionName);
-            services.Configure<AutoSetupOptions>(configuration);
-
-            if (configuration.Exists())
+            var options = serviceProvider.GetRequiredService<IOptions<AutoSetupOptions>>().Value;
+            if (!options.ConfigurationExists)
             {
-                services.Configure<AutoSetupOptions>(o => o.ConfigurationExists = true);
+                return;
             }
-        }
 
-        /// <summary>
-        /// Configure application pipeline.
-        /// </summary>
-        /// <param name="app">
-        /// The app.
-        /// </param>
-        /// <param name="routes">
-        /// The routes.
-        /// </param>
-        /// <param name="serviceProvider">
-        /// The "Shell Scope" service provider.
-        /// </param>
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            if (_shellSettings.IsUninitialized())
+            var validationContext = new ValidationContext(options, serviceProvider, null);
+
+            var validationErrors = options.Validate(validationContext);
+            if (validationErrors.Any())
             {
-                var options = serviceProvider.GetRequiredService<IOptions<AutoSetupOptions>>().Value;
-                if (!options.ConfigurationExists)
+                var stringBuilder = new StringBuilder();
+                foreach (var error in validationErrors)
                 {
-                    return;
+                    stringBuilder.Append(error.ErrorMessage + ' ');
                 }
 
-                var validationContext = new ValidationContext(options, serviceProvider, null);
-
-                var validationErrors = options.Validate(validationContext);
-                if (validationErrors.Any())
-                {
-                    var stringBuilder = new StringBuilder();
-                    foreach (var error in validationErrors)
-                    {
-                        stringBuilder.Append(error.ErrorMessage + ' ');
-                    }
-
-                    _logger.LogError("AutoSetup did not start, configuration has following errors: {errors}", stringBuilder.ToString());
-                }
-                else if (string.IsNullOrWhiteSpace(options.AutoSetupPath))
-                {
-                    app.UseMiddleware<AutoSetupMiddleware>();
-                }
-                else
-                {
-                    app.MapWhen(ctx => ctx.Request.Path.StartsWithNormalizedSegments(options.AutoSetupPath),
-                        appBuilder => appBuilder.UseMiddleware<AutoSetupMiddleware>());
-                }
+                _logger.LogError("AutoSetup did not start, configuration has following errors: {errors}", stringBuilder.ToString());
+            }
+            else if (string.IsNullOrWhiteSpace(options.AutoSetupPath))
+            {
+                app.UseMiddleware<AutoSetupMiddleware>();
+            }
+            else
+            {
+                app.MapWhen(ctx => ctx.Request.Path.StartsWithNormalizedSegments(options.AutoSetupPath),
+                    appBuilder => appBuilder.UseMiddleware<AutoSetupMiddleware>());
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/Drivers/AutoroutePartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/Drivers/AutoroutePartDisplayDriver.cs
index a3bb9bfb137..1594a91b707 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/Drivers/AutoroutePartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/Drivers/AutoroutePartDisplayDriver.cs
@@ -18,122 +18,121 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.Autoroute.Drivers
+namespace OrchardCore.Autoroute.Drivers;
+
+public sealed class AutoroutePartDisplayDriver : ContentPartDisplayDriver<AutoroutePart>
 {
-    public sealed class AutoroutePartDisplayDriver : ContentPartDisplayDriver<AutoroutePart>
+    private readonly AutorouteOptions _options;
+    private readonly ISiteService _siteService;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly YesSql.ISession _session;
+
+    internal readonly IStringLocalizer S;
+
+    public AutoroutePartDisplayDriver(
+        IOptions<AutorouteOptions> options,
+        ISiteService siteService,
+        IAuthorizationService authorizationService,
+        IHttpContextAccessor httpContextAccessor,
+        YesSql.ISession session,
+        IStringLocalizer<AutoroutePartDisplayDriver> localizer
+    )
     {
-        private readonly AutorouteOptions _options;
-        private readonly ISiteService _siteService;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly YesSql.ISession _session;
-
-        internal readonly IStringLocalizer S;
-
-        public AutoroutePartDisplayDriver(
-            IOptions<AutorouteOptions> options,
-            ISiteService siteService,
-            IAuthorizationService authorizationService,
-            IHttpContextAccessor httpContextAccessor,
-            YesSql.ISession session,
-            IStringLocalizer<AutoroutePartDisplayDriver> localizer
-        )
-        {
-            _options = options.Value;
-            _siteService = siteService;
-            _authorizationService = authorizationService;
-            _httpContextAccessor = httpContextAccessor;
-            _session = session;
-            S = localizer;
-        }
+        _options = options.Value;
+        _siteService = siteService;
+        _authorizationService = authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+        _session = session;
+        S = localizer;
+    }
 
-        public override IDisplayResult Edit(AutoroutePart autoroutePart, BuildPartEditorContext context)
+    public override IDisplayResult Edit(AutoroutePart autoroutePart, BuildPartEditorContext context)
+    {
+        return Initialize<AutoroutePartViewModel>("AutoroutePart_Edit", async model =>
         {
-            return Initialize<AutoroutePartViewModel>("AutoroutePart_Edit", async model =>
-            {
-                model.Path = autoroutePart.Path;
-                model.AutoroutePart = autoroutePart;
-                model.ContentItem = autoroutePart.ContentItem;
-                model.SetHomepage = false;
+            model.Path = autoroutePart.Path;
+            model.AutoroutePart = autoroutePart;
+            model.ContentItem = autoroutePart.ContentItem;
+            model.SetHomepage = false;
 
-                var siteSettings = await _siteService.GetSiteSettingsAsync();
-                var homeRoute = siteSettings.HomeRoute;
+            var siteSettings = await _siteService.GetSiteSettingsAsync();
+            var homeRoute = siteSettings.HomeRoute;
 
-                if (homeRoute != null && homeRoute.TryGetValue(_options.ContainedContentItemIdKey, out var containedContentItemId))
-                {
-                    if (string.Equals(autoroutePart.ContentItem.ContentItemId, containedContentItemId.ToString(), StringComparison.OrdinalIgnoreCase))
-                    {
-                        model.IsHomepage = true;
-                    }
-                }
-                else if (string.Equals(autoroutePart.ContentItem.ContentItemId, homeRoute?[_options.ContentItemIdKey]?.ToString(), StringComparison.OrdinalIgnoreCase))
+            if (homeRoute != null && homeRoute.TryGetValue(_options.ContainedContentItemIdKey, out var containedContentItemId))
+            {
+                if (string.Equals(autoroutePart.ContentItem.ContentItemId, containedContentItemId.ToString(), StringComparison.OrdinalIgnoreCase))
                 {
                     model.IsHomepage = true;
                 }
+            }
+            else if (string.Equals(autoroutePart.ContentItem.ContentItemId, homeRoute?[_options.ContentItemIdKey]?.ToString(), StringComparison.OrdinalIgnoreCase))
+            {
+                model.IsHomepage = true;
+            }
 
-                model.Disabled = autoroutePart.Disabled;
-                model.Absolute = autoroutePart.Absolute;
-                model.RouteContainedItems = autoroutePart.RouteContainedItems;
+            model.Disabled = autoroutePart.Disabled;
+            model.Absolute = autoroutePart.Absolute;
+            model.RouteContainedItems = autoroutePart.RouteContainedItems;
 
-                model.Settings = context.TypePartDefinition.GetSettings<AutoroutePartSettings>();
-            });
-        }
+            model.Settings = context.TypePartDefinition.GetSettings<AutoroutePartSettings>();
+        });
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(AutoroutePart model, UpdatePartEditorContext context)
-        {
-            var viewModel = new AutoroutePartViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(AutoroutePart model, UpdatePartEditorContext context)
+    {
+        var viewModel = new AutoroutePartViewModel();
 
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix,
-                t => t.Path,
-                t => t.UpdatePath,
-                t => t.RouteContainedItems,
-                t => t.Absolute,
-                t => t.Disabled);
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix,
+            t => t.Path,
+            t => t.UpdatePath,
+            t => t.RouteContainedItems,
+            t => t.Absolute,
+            t => t.Disabled);
 
-            var settings = context.TypePartDefinition.GetSettings<AutoroutePartSettings>();
+        var settings = context.TypePartDefinition.GetSettings<AutoroutePartSettings>();
 
-            model.Disabled = viewModel.Disabled;
-            model.Absolute = viewModel.Absolute;
-            model.RouteContainedItems = viewModel.RouteContainedItems;
+        model.Disabled = viewModel.Disabled;
+        model.Absolute = viewModel.Absolute;
+        model.RouteContainedItems = viewModel.RouteContainedItems;
 
-            // When disabled these values are not updated.
-            if (!model.Disabled)
+        // When disabled these values are not updated.
+        if (!model.Disabled)
+        {
+            if (settings.AllowCustomPath)
             {
-                if (settings.AllowCustomPath)
-                {
-                    model.Path = viewModel.Path;
-                }
+                model.Path = viewModel.Path;
+            }
 
-                if (settings.AllowUpdatePath && viewModel.UpdatePath)
-                {
-                    // Make it empty to force a regeneration
-                    model.Path = string.Empty;
-                }
+            if (settings.AllowUpdatePath && viewModel.UpdatePath)
+            {
+                // Make it empty to force a regeneration
+                model.Path = string.Empty;
+            }
 
-                var httpContext = _httpContextAccessor.HttpContext;
+            var httpContext = _httpContextAccessor.HttpContext;
 
-                if (httpContext != null && await _authorizationService.AuthorizeAsync(httpContext.User, Permissions.SetHomepage))
-                {
-                    await context.Updater.TryUpdateModelAsync(model, Prefix, t => t.SetHomepage);
-                }
+            if (httpContext != null && await _authorizationService.AuthorizeAsync(httpContext.User, Permissions.SetHomepage))
+            {
+                await context.Updater.TryUpdateModelAsync(model, Prefix, t => t.SetHomepage);
+            }
 
-                context.Updater.ModelState.BindValidationResults(Prefix, model.ValidatePathFieldValue(S));
+            context.Updater.ModelState.BindValidationResults(Prefix, model.ValidatePathFieldValue(S));
 
-                // This can only validate the path if the Autoroute is not managing content item routes or the path is absolute.
-                if (!string.IsNullOrEmpty(model.Path) && (!settings.ManageContainedItemRoutes || (settings.ManageContainedItemRoutes && model.Absolute)))
+            // This can only validate the path if the Autoroute is not managing content item routes or the path is absolute.
+            if (!string.IsNullOrEmpty(model.Path) && (!settings.ManageContainedItemRoutes || (settings.ManageContainedItemRoutes && model.Absolute)))
+            {
+                var path = model.Path.Trim('/');
+                var paths = new string[] { path, "/" + path, path + "/", "/" + path + "/" };
+
+                var possibleConflicts = await _session.QueryIndex<AutoroutePartIndex>(o => (o.Published || o.Latest) && o.Path.IsIn(paths)).ListAsync();
+                if (possibleConflicts.Any(x => x.ContentItemId != model.ContentItem.ContentItemId && x.ContainedContentItemId != model.ContentItem.ContentItemId))
                 {
-                    var path = model.Path.Trim('/');
-                    var paths = new string[] { path, "/" + path, path + "/", "/" + path + "/" };
-
-                    var possibleConflicts = await _session.QueryIndex<AutoroutePartIndex>(o => (o.Published || o.Latest) && o.Path.IsIn(paths)).ListAsync();
-                    if (possibleConflicts.Any(x => x.ContentItemId != model.ContentItem.ContentItemId && x.ContainedContentItemId != model.ContentItem.ContentItemId))
-                    {
-                        context.Updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
-                    }
+                    context.Updater.ModelState.AddModelError(Prefix, nameof(model.Path), S["Your permalink is already in use."]);
                 }
             }
-
-            return Edit(model, context);
         }
+
+        return Edit(model, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/AutorouteInputObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/AutorouteInputObjectType.cs
index 7cece8ddf4f..bf996ee1e0b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/AutorouteInputObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/AutorouteInputObjectType.cs
@@ -3,16 +3,15 @@
 using OrchardCore.Apis.GraphQL.Queries;
 using OrchardCore.Autoroute.Models;
 
-namespace OrchardCore.Autoroute.GraphQL
+namespace OrchardCore.Autoroute.GraphQL;
+
+public class AutorouteInputObjectType : WhereInputObjectGraphType<AutoroutePart>
 {
-    public class AutorouteInputObjectType : WhereInputObjectGraphType<AutoroutePart>
+    public AutorouteInputObjectType(IStringLocalizer<AutorouteInputObjectType> S)
     {
-        public AutorouteInputObjectType(IStringLocalizer<AutorouteInputObjectType> S)
-        {
-            Name = "AutoroutePartInput";
-            Description = S["the custom URL part of the content item"];
+        Name = "AutoroutePartInput";
+        Description = S["the custom URL part of the content item"];
 
-            AddScalarFilterFields<StringGraphType>("path", S["the path of the content item to filter"]);
-        }
+        AddScalarFilterFields<StringGraphType>("path", S["the path of the content item to filter"]);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/AutoroutePartIndexAliasProvider.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/AutoroutePartIndexAliasProvider.cs
index 81b6407c6bf..dada9f1c5c7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/AutoroutePartIndexAliasProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/AutoroutePartIndexAliasProvider.cs
@@ -3,23 +3,22 @@
 using OrchardCore.Autoroute.Core.Indexes;
 using OrchardCore.ContentManagement.GraphQL.Queries;
 
-namespace OrchardCore.Autoroute.GraphQL
-{
-    public class AutoroutePartIndexAliasProvider : IIndexAliasProvider
-    {
-        private static readonly IndexAlias[] _aliases =
-        [
-            new IndexAlias
-            {
-                Alias = "autoroutePart",
-                Index = nameof(AutoroutePartIndex),
-                IndexType = typeof(AutoroutePartIndex)
-            }
-        ];
+namespace OrchardCore.Autoroute.GraphQL;
 
-        public ValueTask<IEnumerable<IndexAlias>> GetAliasesAsync()
+public class AutoroutePartIndexAliasProvider : IIndexAliasProvider
+{
+    private static readonly IndexAlias[] _aliases =
+    [
+        new IndexAlias
         {
-            return ValueTask.FromResult<IEnumerable<IndexAlias>>(_aliases);
+            Alias = "autoroutePart",
+            Index = nameof(AutoroutePartIndex),
+            IndexType = typeof(AutoroutePartIndex)
         }
+    ];
+
+    public ValueTask<IEnumerable<IndexAlias>> GetAliasesAsync()
+    {
+        return ValueTask.FromResult<IEnumerable<IndexAlias>>(_aliases);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/AutorouteQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/AutorouteQueryObjectType.cs
index 064d47ad787..36c681a277d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/AutorouteQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/AutorouteQueryObjectType.cs
@@ -2,16 +2,15 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Autoroute.Models;
 
-namespace OrchardCore.Autoroute.GraphQL
+namespace OrchardCore.Autoroute.GraphQL;
+
+public class AutorouteQueryObjectType : ObjectGraphType<AutoroutePart>
 {
-    public class AutorouteQueryObjectType : ObjectGraphType<AutoroutePart>
+    public AutorouteQueryObjectType(IStringLocalizer<AutorouteQueryObjectType> S)
     {
-        public AutorouteQueryObjectType(IStringLocalizer<AutorouteQueryObjectType> S)
-        {
-            Name = "AutoroutePart";
-            Description = S["Custom URLs (permalinks) for your content item."];
+        Name = "AutoroutePart";
+        Description = S["Custom URLs (permalinks) for your content item."];
 
-            Field(x => x.Path).Description(S["The permalinks for your content item."]);
-        }
+        Field(x => x.Path).Description(S["The permalinks for your content item."]);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/Startup.cs
index 5168f9c1210..dda9c0a6e70 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/Startup.cs
@@ -6,17 +6,16 @@
 using OrchardCore.ContentManagement.GraphQL.Queries;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Autoroute.GraphQL
+namespace OrchardCore.Autoroute.GraphQL;
+
+[RequireFeatures("OrchardCore.Apis.GraphQL")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Apis.GraphQL")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddInputObjectGraphType<AutoroutePart, AutorouteInputObjectType>();
-            services.AddObjectGraphType<AutoroutePart, AutorouteQueryObjectType>();
-            services.AddTransient<IIndexAliasProvider, AutoroutePartIndexAliasProvider>();
-            services.AddWhereInputIndexPropertyProvider<AutoroutePartIndex>();
-        }
+        services.AddInputObjectGraphType<AutoroutePart, AutorouteInputObjectType>();
+        services.AddObjectGraphType<AutoroutePart, AutorouteQueryObjectType>();
+        services.AddTransient<IIndexAliasProvider, AutoroutePartIndexAliasProvider>();
+        services.AddWhereInputIndexPropertyProvider<AutoroutePartIndex>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/Handlers/AutorouteContentHandler.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/Handlers/AutorouteContentHandler.cs
index 73285044ae0..e14404846b5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/Handlers/AutorouteContentHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/Handlers/AutorouteContentHandler.cs
@@ -4,35 +4,34 @@
 using OrchardCore.ContentManagement.Handlers;
 using OrchardCore.ContentManagement.Routing;
 
-namespace OrchardCore.Autoroute.Handlers
+namespace OrchardCore.Autoroute.Handlers;
+
+public class AutorouteContentHandler : ContentHandlerBase
 {
-    public class AutorouteContentHandler : ContentHandlerBase
+    private readonly IAutorouteEntries _autorouteEntries;
+
+    public AutorouteContentHandler(IAutorouteEntries autorouteEntries)
     {
-        private readonly IAutorouteEntries _autorouteEntries;
+        _autorouteEntries = autorouteEntries;
+    }
 
-        public AutorouteContentHandler(IAutorouteEntries autorouteEntries)
+    public override Task GetContentItemAspectAsync(ContentItemAspectContext context)
+    {
+        return context.ForAsync<ContentItemMetadata>(async metadata =>
         {
-            _autorouteEntries = autorouteEntries;
-        }
+            // When a content item is contained we provide different route values when generating urls.
+            (var found, var entry) = await _autorouteEntries.TryGetEntryByContentItemIdAsync(context.ContentItem.ContentItemId);
 
-        public override Task GetContentItemAspectAsync(ContentItemAspectContext context)
-        {
-            return context.ForAsync<ContentItemMetadata>(async metadata =>
+            if (found && !string.IsNullOrEmpty(entry.ContainedContentItemId))
             {
-                // When a content item is contained we provide different route values when generating urls.
-                (var found, var entry) = await _autorouteEntries.TryGetEntryByContentItemIdAsync(context.ContentItem.ContentItemId);
-
-                if (found && !string.IsNullOrEmpty(entry.ContainedContentItemId))
-                {
-                    metadata.DisplayRouteValues = new RouteValueDictionary {
-                        { "Area", "OrchardCore.Contents" },
-                        { "Controller", "Item" },
-                        { "Action", "Display" },
-                        { "ContentItemId", entry.ContentItemId},
-                        { "ContainedContentItemId", entry.ContainedContentItemId }
-                    };
-                }
-            });
-        }
+                metadata.DisplayRouteValues = new RouteValueDictionary {
+                    { "Area", "OrchardCore.Contents" },
+                    { "Controller", "Item" },
+                    { "Action", "Display" },
+                    { "ContentItemId", entry.ContentItemId},
+                    { "ContainedContentItemId", entry.ContainedContentItemId }
+                };
+            }
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/Handlers/AutoroutePartHandler.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/Handlers/AutoroutePartHandler.cs
index 554b5f8b654..7be8c220c10 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/Handlers/AutoroutePartHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/Handlers/AutoroutePartHandler.cs
@@ -25,277 +25,295 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.Autoroute.Handlers
+namespace OrchardCore.Autoroute.Handlers;
+
+public class AutoroutePartHandler : ContentPartHandler<AutoroutePart>
 {
-    public class AutoroutePartHandler : ContentPartHandler<AutoroutePart>
+    private readonly IAutorouteEntries _entries;
+    private readonly AutorouteOptions _options;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ISiteService _siteService;
+    private readonly ITagCache _tagCache;
+    private readonly ISession _session;
+    private readonly IServiceProvider _serviceProvider;
+
+    protected readonly IStringLocalizer S;
+
+    private IContentManager _contentManager;
+
+    public AutoroutePartHandler(
+        IAutorouteEntries entries,
+        IOptions<AutorouteOptions> options,
+        ILiquidTemplateManager liquidTemplateManager,
+        IContentDefinitionManager contentDefinitionManager,
+        ISiteService siteService,
+        ITagCache tagCache,
+        ISession session,
+        IServiceProvider serviceProvider,
+        IStringLocalizer<AutoroutePartHandler> stringLocalizer)
     {
-        private readonly IAutorouteEntries _entries;
-        private readonly AutorouteOptions _options;
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly ISiteService _siteService;
-        private readonly ITagCache _tagCache;
-        private readonly ISession _session;
-        private readonly IServiceProvider _serviceProvider;
-
-        protected readonly IStringLocalizer S;
-
-        private IContentManager _contentManager;
-
-        public AutoroutePartHandler(
-            IAutorouteEntries entries,
-            IOptions<AutorouteOptions> options,
-            ILiquidTemplateManager liquidTemplateManager,
-            IContentDefinitionManager contentDefinitionManager,
-            ISiteService siteService,
-            ITagCache tagCache,
-            ISession session,
-            IServiceProvider serviceProvider,
-            IStringLocalizer<AutoroutePartHandler> stringLocalizer)
-        {
-            _entries = entries;
-            _options = options.Value;
-            _liquidTemplateManager = liquidTemplateManager;
-            _contentDefinitionManager = contentDefinitionManager;
-            _siteService = siteService;
-            _tagCache = tagCache;
-            _session = session;
-            _serviceProvider = serviceProvider;
-            S = stringLocalizer;
-        }
+        _entries = entries;
+        _options = options.Value;
+        _liquidTemplateManager = liquidTemplateManager;
+        _contentDefinitionManager = contentDefinitionManager;
+        _siteService = siteService;
+        _tagCache = tagCache;
+        _session = session;
+        _serviceProvider = serviceProvider;
+        S = stringLocalizer;
+    }
 
-        public override async Task PublishedAsync(PublishContentContext context, AutoroutePart part)
+    public override async Task PublishedAsync(PublishContentContext context, AutoroutePart part)
+    {
+        if (!string.IsNullOrWhiteSpace(part.Path))
         {
-            if (!string.IsNullOrWhiteSpace(part.Path))
-            {
-                if (part.RouteContainedItems)
-                {
-                    _contentManager ??= _serviceProvider.GetRequiredService<IContentManager>();
-                    var containedAspect = await _contentManager.PopulateAspectAsync<ContainedContentItemsAspect>(context.PublishingItem);
-                    await CheckContainedHomeRouteAsync(part.ContentItem.ContentItemId, containedAspect, (JsonObject)context.PublishingItem.Content);
-                }
-
-                // Update entries from the index table after the session is committed.
-                await _entries.UpdateEntriesAsync();
-            }
-
-            if (!string.IsNullOrWhiteSpace(part.Path) && !part.Disabled && part.SetHomepage)
+            if (part.RouteContainedItems)
             {
-                await SetHomeRouteAsync(part, homeRoute =>
-                {
-                    homeRoute[_options.ContentItemIdKey] = context.ContentItem.ContentItemId;
-                    homeRoute.Remove(_options.JsonPathKey);
-                });
+                _contentManager ??= _serviceProvider.GetRequiredService<IContentManager>();
+                var containedAspect = await _contentManager.PopulateAspectAsync<ContainedContentItemsAspect>(context.PublishingItem);
+                await CheckContainedHomeRouteAsync(part.ContentItem.ContentItemId, containedAspect, (JsonObject)context.PublishingItem.Content);
             }
 
-            // Evict any dependent item from cache.
-            await RemoveTagAsync(part);
+            // Update entries from the index table after the session is committed.
+            await _entries.UpdateEntriesAsync();
         }
 
-        public override async Task UnpublishedAsync(PublishContentContext context, AutoroutePart part)
+        if (!string.IsNullOrWhiteSpace(part.Path) && !part.Disabled && part.SetHomepage)
         {
-            if (!string.IsNullOrWhiteSpace(part.Path))
+            await SetHomeRouteAsync(part, homeRoute =>
             {
-                // Update entries from the index table after the session is committed.
-                await _entries.UpdateEntriesAsync();
-
-                // Evict any dependent item from cache.
-                await RemoveTagAsync(part);
-            }
+                homeRoute[_options.ContentItemIdKey] = context.ContentItem.ContentItemId;
+                homeRoute.Remove(_options.JsonPathKey);
+            });
         }
 
-        public override async Task RemovedAsync(RemoveContentContext context, AutoroutePart part)
+        // Evict any dependent item from cache.
+        await RemoveTagAsync(part);
+    }
+
+    public override async Task UnpublishedAsync(PublishContentContext context, AutoroutePart part)
+    {
+        if (!string.IsNullOrWhiteSpace(part.Path))
         {
-            if (!string.IsNullOrWhiteSpace(part.Path) && context.NoActiveVersionLeft)
-            {
-                // Update entries from the index table after the session is committed.
-                await _entries.UpdateEntriesAsync();
+            // Update entries from the index table after the session is committed.
+            await _entries.UpdateEntriesAsync();
 
-                // Evict any dependent item from cache.
-                await RemoveTagAsync(part);
-            }
+            // Evict any dependent item from cache.
+            await RemoveTagAsync(part);
         }
+    }
 
-        public override async Task ValidatingAsync(ValidateContentContext context, AutoroutePart part)
+    public override async Task RemovedAsync(RemoveContentContext context, AutoroutePart part)
+    {
+        if (!string.IsNullOrWhiteSpace(part.Path) && context.NoActiveVersionLeft)
         {
-            // Only validate the path if it's not empty.
-            if (string.IsNullOrWhiteSpace(part.Path))
-            {
-                return;
-            }
-
-            foreach (var item in part.ValidatePathFieldValue(S))
-            {
-                context.Fail(item);
-            }
-
-            if (!await IsAbsolutePathUniqueAsync(part.Path, part.ContentItem.ContentItemId))
-            {
-                context.Fail(S["Your permalink is already in use."], nameof(part.Path));
-            }
+            // Update entries from the index table after the session is committed.
+            await _entries.UpdateEntriesAsync();
 
+            // Evict any dependent item from cache.
+            await RemoveTagAsync(part);
         }
+    }
 
-        public override async Task UpdatedAsync(UpdateContentContext context, AutoroutePart part)
+    public override async Task ValidatingAsync(ValidateContentContext context, AutoroutePart part)
+    {
+        // Only validate the path if it's not empty.
+        if (string.IsNullOrWhiteSpace(part.Path))
         {
-            await GenerateContainerPathFromPatternAsync(part);
-            await GenerateContainedPathsFromPatternAsync(context.UpdatingItem, part);
+            return;
         }
 
-        public async override Task CloningAsync(CloneContentContext context, AutoroutePart part)
+        foreach (var item in part.ValidatePathFieldValue(S))
         {
-            var clonedPart = context.CloneContentItem.As<AutoroutePart>();
-            clonedPart.Path = await GenerateUniqueAbsolutePathAsync(part.Path, context.CloneContentItem.ContentItemId);
-            clonedPart.SetHomepage = false;
-            clonedPart.Apply();
-
-            await GenerateContainedPathsFromPatternAsync(context.CloneContentItem, part);
+            context.Fail(item);
         }
 
-        public override Task GetContentItemAspectAsync(ContentItemAspectContext context, AutoroutePart part)
+        if (!await IsAbsolutePathUniqueAsync(part.Path, part.ContentItem.ContentItemId))
         {
-            return context.ForAsync<RouteHandlerAspect>(async aspect =>
-            {
-                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(part.ContentItem.ContentType);
-                var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, "AutoroutePart", StringComparison.Ordinal));
-                var settings = contentTypePartDefinition.GetSettings<AutoroutePartSettings>();
-                if (settings.ManageContainedItemRoutes)
-                {
-                    aspect.Path = part.Path;
-                    aspect.Absolute = part.Absolute;
-                    aspect.Disabled = part.Disabled;
-                }
-            });
+            context.Fail(S["Your permalink is already in use."], nameof(part.Path));
         }
 
-        private async Task SetHomeRouteAsync(AutoroutePart part, Action<RouteValueDictionary> action)
-        {
-            var site = await _siteService.LoadSiteSettingsAsync();
+    }
 
-            site.HomeRoute ??= [];
+    public override async Task UpdatedAsync(UpdateContentContext context, AutoroutePart part)
+    {
+        await GenerateContainerPathFromPatternAsync(part);
+        await GenerateContainedPathsFromPatternAsync(context.UpdatingItem, part);
+    }
+
+    public async override Task CloningAsync(CloneContentContext context, AutoroutePart part)
+    {
+        var clonedPart = context.CloneContentItem.As<AutoroutePart>();
+        clonedPart.Path = await GenerateUniqueAbsolutePathAsync(part.Path, context.CloneContentItem.ContentItemId);
+        clonedPart.SetHomepage = false;
+        clonedPart.Apply();
 
-            var homeRoute = site.HomeRoute;
+        await GenerateContainedPathsFromPatternAsync(context.CloneContentItem, part);
+    }
 
-            foreach (var entry in _options.GlobalRouteValues)
+    public override Task GetContentItemAspectAsync(ContentItemAspectContext context, AutoroutePart part)
+    {
+        return context.ForAsync<RouteHandlerAspect>(async aspect =>
+        {
+            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(part.ContentItem.ContentType);
+            var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, "AutoroutePart", StringComparison.Ordinal));
+            var settings = contentTypePartDefinition.GetSettings<AutoroutePartSettings>();
+            if (settings.ManageContainedItemRoutes)
             {
-                homeRoute[entry.Key] = entry.Value;
+                aspect.Path = part.Path;
+                aspect.Absolute = part.Absolute;
+                aspect.Disabled = part.Disabled;
             }
+        });
+    }
 
-            action.Invoke(homeRoute);
+    private async Task SetHomeRouteAsync(AutoroutePart part, Action<RouteValueDictionary> action)
+    {
+        var site = await _siteService.LoadSiteSettingsAsync();
 
-            // Once we took the flag into account we can dismiss it.
-            part.SetHomepage = false;
-            part.Apply();
+        site.HomeRoute ??= [];
 
-            await _siteService.UpdateSiteSettingsAsync(site);
-        }
+        var homeRoute = site.HomeRoute;
 
-        private Task RemoveTagAsync(AutoroutePart part)
+        foreach (var entry in _options.GlobalRouteValues)
         {
-            return _tagCache.RemoveTagAsync($"slug:{part.Path}");
+            homeRoute[entry.Key] = entry.Value;
         }
 
-        private async Task CheckContainedHomeRouteAsync(string containerContentItemId, ContainedContentItemsAspect containedAspect, JsonObject content)
+        action.Invoke(homeRoute);
+
+        // Once we took the flag into account we can dismiss it.
+        part.SetHomepage = false;
+        part.Apply();
+
+        await _siteService.UpdateSiteSettingsAsync(site);
+    }
+
+    private Task RemoveTagAsync(AutoroutePart part)
+    {
+        return _tagCache.RemoveTagAsync($"slug:{part.Path}");
+    }
+
+    private async Task CheckContainedHomeRouteAsync(string containerContentItemId, ContainedContentItemsAspect containedAspect, JsonObject content)
+    {
+        foreach (var accessor in containedAspect.Accessors)
         {
-            foreach (var accessor in containedAspect.Accessors)
+            var jItems = accessor.Invoke(content);
+
+            foreach (var jItem in jItems.Cast<JsonObject>())
             {
-                var jItems = accessor.Invoke(content);
+                var contentItem = jItem.ToObject<ContentItem>();
+                var handlerAspect = await _contentManager.PopulateAspectAsync<RouteHandlerAspect>(contentItem);
 
-                foreach (var jItem in jItems.Cast<JsonObject>())
+                if (!handlerAspect.Disabled)
                 {
-                    var contentItem = jItem.ToObject<ContentItem>();
-                    var handlerAspect = await _contentManager.PopulateAspectAsync<RouteHandlerAspect>(contentItem);
-
-                    if (!handlerAspect.Disabled)
+                    // Only an autoroute part, not a default handler aspect can set itself as the homepage.
+                    var autoroutePart = contentItem.As<AutoroutePart>();
+                    if (autoroutePart != null && autoroutePart.SetHomepage)
                     {
-                        // Only an autoroute part, not a default handler aspect can set itself as the homepage.
-                        var autoroutePart = contentItem.As<AutoroutePart>();
-                        if (autoroutePart != null && autoroutePart.SetHomepage)
+                        await SetHomeRouteAsync(autoroutePart, homeRoute =>
                         {
-                            await SetHomeRouteAsync(autoroutePart, homeRoute =>
-                            {
-                                homeRoute[_options.ContentItemIdKey] = containerContentItemId;
-                                homeRoute[_options.JsonPathKey] = jItem.GetNormalizedPath();
-                            });
+                            homeRoute[_options.ContentItemIdKey] = containerContentItemId;
+                            homeRoute[_options.JsonPathKey] = jItem.GetNormalizedPath();
+                        });
 
-                            break;
-                        }
+                        break;
                     }
                 }
             }
         }
+    }
 
-        private async Task GenerateContainedPathsFromPatternAsync(ContentItem contentItem, AutoroutePart part)
+    private async Task GenerateContainedPathsFromPatternAsync(ContentItem contentItem, AutoroutePart part)
+    {
+        // Validate contained content item routes if container has valid path.
+        if (string.IsNullOrWhiteSpace(part.Path) || !part.RouteContainedItems)
         {
-            // Validate contained content item routes if container has valid path.
-            if (string.IsNullOrWhiteSpace(part.Path) || !part.RouteContainedItems)
-            {
-                return;
-            }
+            return;
+        }
 
-            _contentManager ??= _serviceProvider.GetRequiredService<IContentManager>();
-            var containedAspect = await _contentManager.PopulateAspectAsync<ContainedContentItemsAspect>(contentItem);
+        _contentManager ??= _serviceProvider.GetRequiredService<IContentManager>();
+        var containedAspect = await _contentManager.PopulateAspectAsync<ContainedContentItemsAspect>(contentItem);
 
-            // Build the entries for this content item to evaluate for duplicates.
-            var entries = new List<AutorouteEntry>();
-            await PopulateContainedContentItemRoutesAsync(entries, part.ContentItem.ContentItemId, containedAspect, (JsonObject)contentItem.Content, part.Path);
+        // Build the entries for this content item to evaluate for duplicates.
+        var entries = new List<AutorouteEntry>();
+        await PopulateContainedContentItemRoutesAsync(entries, part.ContentItem.ContentItemId, containedAspect, (JsonObject)contentItem.Content, part.Path);
 
-            await ValidateContainedContentItemRoutesAsync(entries, part.ContentItem.ContentItemId, containedAspect, (JsonObject)contentItem.Content, part.Path);
-        }
+        await ValidateContainedContentItemRoutesAsync(entries, part.ContentItem.ContentItemId, containedAspect, (JsonObject)contentItem.Content, part.Path);
+    }
 
-        private async Task PopulateContainedContentItemRoutesAsync(List<AutorouteEntry> entries, string containerContentItemId, ContainedContentItemsAspect containedContentItemsAspect, JsonObject content, string basePath)
+    private async Task PopulateContainedContentItemRoutesAsync(List<AutorouteEntry> entries, string containerContentItemId, ContainedContentItemsAspect containedContentItemsAspect, JsonObject content, string basePath)
+    {
+        foreach (var accessor in containedContentItemsAspect.Accessors)
         {
-            foreach (var accessor in containedContentItemsAspect.Accessors)
+            var jItems = accessor.Invoke(content);
+
+            foreach (var jItem in jItems.Cast<JsonObject>())
             {
-                var jItems = accessor.Invoke(content);
+                var contentItem = jItem.ToObject<ContentItem>();
+                var handlerAspect = await _contentManager.PopulateAspectAsync<RouteHandlerAspect>(contentItem);
 
-                foreach (var jItem in jItems.Cast<JsonObject>())
+                if (!handlerAspect.Disabled)
                 {
-                    var contentItem = jItem.ToObject<ContentItem>();
-                    var handlerAspect = await _contentManager.PopulateAspectAsync<RouteHandlerAspect>(contentItem);
-
-                    if (!handlerAspect.Disabled)
+                    var path = handlerAspect.Path;
+                    if (!handlerAspect.Absolute)
                     {
-                        var path = handlerAspect.Path;
-                        if (!handlerAspect.Absolute)
-                        {
-                            path = (basePath.EndsWith('/') ? basePath : basePath + '/') + handlerAspect.Path.TrimStart('/');
-                        }
-
-                        entries.Add(new AutorouteEntry(containerContentItemId, path, contentItem.ContentItemId, jItem.GetNormalizedPath())
-                        {
-                            DocumentId = contentItem.Id
-                        });
+                        path = (basePath.EndsWith('/') ? basePath : basePath + '/') + handlerAspect.Path.TrimStart('/');
                     }
 
-                    var itemBasePath = (basePath.EndsWith('/') ? basePath : basePath + '/') + handlerAspect.Path.TrimStart('/');
-                    var childrenAspect = await _contentManager.PopulateAspectAsync<ContainedContentItemsAspect>(contentItem);
-                    await PopulateContainedContentItemRoutesAsync(entries, containerContentItemId, childrenAspect, jItem, itemBasePath);
+                    entries.Add(new AutorouteEntry(containerContentItemId, path, contentItem.ContentItemId, jItem.GetNormalizedPath())
+                    {
+                        DocumentId = contentItem.Id
+                    });
                 }
+
+                var itemBasePath = (basePath.EndsWith('/') ? basePath : basePath + '/') + handlerAspect.Path.TrimStart('/');
+                var childrenAspect = await _contentManager.PopulateAspectAsync<ContainedContentItemsAspect>(contentItem);
+                await PopulateContainedContentItemRoutesAsync(entries, containerContentItemId, childrenAspect, jItem, itemBasePath);
             }
         }
+    }
 
-        private async Task ValidateContainedContentItemRoutesAsync(List<AutorouteEntry> entries, string containerContentItemId, ContainedContentItemsAspect containedContentItemsAspect, JsonObject content, string basePath)
+    private async Task ValidateContainedContentItemRoutesAsync(List<AutorouteEntry> entries, string containerContentItemId, ContainedContentItemsAspect containedContentItemsAspect, JsonObject content, string basePath)
+    {
+        foreach (var accessor in containedContentItemsAspect.Accessors)
         {
-            foreach (var accessor in containedContentItemsAspect.Accessors)
+            var jItems = accessor.Invoke(content);
+
+            foreach (var jItem in jItems.Cast<JsonObject>())
             {
-                var jItems = accessor.Invoke(content);
+                var contentItem = jItem.ToObject<ContentItem>();
+                var containedAutoroutePart = contentItem.As<AutoroutePart>();
 
-                foreach (var jItem in jItems.Cast<JsonObject>())
+                // This is only relevant if the content items have an autoroute part as we adjust the part value as required to guarantee a unique route.
+                // Content items routed only through the handler aspect already guarantee uniqueness.
+                if (containedAutoroutePart != null && !containedAutoroutePart.Disabled)
                 {
-                    var contentItem = jItem.ToObject<ContentItem>();
-                    var containedAutoroutePart = contentItem.As<AutoroutePart>();
+                    var path = containedAutoroutePart.Path;
 
-                    // This is only relevant if the content items have an autoroute part as we adjust the part value as required to guarantee a unique route.
-                    // Content items routed only through the handler aspect already guarantee uniqueness.
-                    if (containedAutoroutePart != null && !containedAutoroutePart.Disabled)
+                    if (containedAutoroutePart.Absolute && !await IsAbsolutePathUniqueAsync(path, contentItem.ContentItemId))
                     {
-                        var path = containedAutoroutePart.Path;
+                        path = await GenerateUniqueAbsolutePathAsync(path, contentItem.ContentItemId);
+                        containedAutoroutePart.Path = path;
+                        containedAutoroutePart.Apply();
 
-                        if (containedAutoroutePart.Absolute && !await IsAbsolutePathUniqueAsync(path, contentItem.ContentItemId))
+                        // Merge because we have disconnected the content item from it's json owner.
+                        jItem.Merge((JsonObject)contentItem.Content, new JsonMergeSettings
+                        {
+                            MergeArrayHandling = MergeArrayHandling.Replace,
+                            MergeNullValueHandling = MergeNullValueHandling.Merge
+                        });
+                    }
+                    else
+                    {
+                        var currentItemBasePath = basePath.EndsWith('/') ? basePath : basePath + '/';
+                        path = currentItemBasePath + containedAutoroutePart.Path.TrimStart('/');
+                        if (!IsRelativePathUnique(entries, path, containedAutoroutePart))
                         {
-                            path = await GenerateUniqueAbsolutePathAsync(path, contentItem.ContentItemId);
-                            containedAutoroutePart.Path = path;
+                            path = GenerateRelativeUniquePath(entries, path, containedAutoroutePart);
+                            // Remove base path and update part path.
+                            containedAutoroutePart.Path = path[currentItemBasePath.Length..];
                             containedAutoroutePart.Apply();
 
                             // Merge because we have disconnected the content item from it's json owner.
@@ -305,172 +323,153 @@ private async Task ValidateContainedContentItemRoutesAsync(List<AutorouteEntry>
                                 MergeNullValueHandling = MergeNullValueHandling.Merge
                             });
                         }
-                        else
-                        {
-                            var currentItemBasePath = basePath.EndsWith('/') ? basePath : basePath + '/';
-                            path = currentItemBasePath + containedAutoroutePart.Path.TrimStart('/');
-                            if (!IsRelativePathUnique(entries, path, containedAutoroutePart))
-                            {
-                                path = GenerateRelativeUniquePath(entries, path, containedAutoroutePart);
-                                // Remove base path and update part path.
-                                containedAutoroutePart.Path = path[currentItemBasePath.Length..];
-                                containedAutoroutePart.Apply();
-
-                                // Merge because we have disconnected the content item from it's json owner.
-                                jItem.Merge((JsonObject)contentItem.Content, new JsonMergeSettings
-                                {
-                                    MergeArrayHandling = MergeArrayHandling.Replace,
-                                    MergeNullValueHandling = MergeNullValueHandling.Merge
-                                });
-                            }
-
-                            path = path[currentItemBasePath.Length..];
-                        }
 
-                        var containedItemBasePath = (basePath.EndsWith('/') ? basePath : basePath + '/') + path;
-                        var childItemAspect = await _contentManager.PopulateAspectAsync<ContainedContentItemsAspect>(contentItem);
-                        await ValidateContainedContentItemRoutesAsync(entries, containerContentItemId, childItemAspect, jItem, containedItemBasePath);
+                        path = path[currentItemBasePath.Length..];
                     }
+
+                    var containedItemBasePath = (basePath.EndsWith('/') ? basePath : basePath + '/') + path;
+                    var childItemAspect = await _contentManager.PopulateAspectAsync<ContainedContentItemsAspect>(contentItem);
+                    await ValidateContainedContentItemRoutesAsync(entries, containerContentItemId, childItemAspect, jItem, containedItemBasePath);
                 }
             }
         }
+    }
+
+    private static bool IsRelativePathUnique(List<AutorouteEntry> entries, string path, AutoroutePart context)
+    {
+        var result = !entries.Any(e => context.ContentItem.ContentItemId != e.ContainedContentItemId && string.Equals(e.Path.Trim('/'), path.Trim('/'), StringComparison.OrdinalIgnoreCase));
+        return result;
+    }
 
-        private static bool IsRelativePathUnique(List<AutorouteEntry> entries, string path, AutoroutePart context)
+    private static string GenerateRelativeUniquePath(List<AutorouteEntry> entries, string path, AutoroutePart context)
+    {
+        var version = 1;
+        var unversionedPath = path;
+
+        var versionSeparatorPosition = path.LastIndexOf('-');
+        if (versionSeparatorPosition > -1 && int.TryParse(path[versionSeparatorPosition..].TrimStart('-'), out version))
         {
-            var result = !entries.Any(e => context.ContentItem.ContentItemId != e.ContainedContentItemId && string.Equals(e.Path.Trim('/'), path.Trim('/'), StringComparison.OrdinalIgnoreCase));
-            return result;
+            unversionedPath = path[..versionSeparatorPosition];
         }
 
-        private static string GenerateRelativeUniquePath(List<AutorouteEntry> entries, string path, AutoroutePart context)
+        while (true)
         {
-            var version = 1;
-            var unversionedPath = path;
-
-            var versionSeparatorPosition = path.LastIndexOf('-');
-            if (versionSeparatorPosition > -1 && int.TryParse(path[versionSeparatorPosition..].TrimStart('-'), out version))
+            // Unversioned length + separator char + version length.
+            var quantityCharactersToTrim = unversionedPath.Length + 1 + version.ToString().Length - AutoroutePart.MaxPathLength;
+            if (quantityCharactersToTrim > 0)
             {
-                unversionedPath = path[..versionSeparatorPosition];
+                unversionedPath = unversionedPath[..^quantityCharactersToTrim];
             }
 
-            while (true)
+            var versionedPath = $"{unversionedPath}-{version++}";
+            if (IsRelativePathUnique(entries, versionedPath, context))
             {
-                // Unversioned length + separator char + version length.
-                var quantityCharactersToTrim = unversionedPath.Length + 1 + version.ToString().Length - AutoroutePart.MaxPathLength;
-                if (quantityCharactersToTrim > 0)
-                {
-                    unversionedPath = unversionedPath[..^quantityCharactersToTrim];
-                }
+                var entry = entries.FirstOrDefault(e => e.ContainedContentItemId == context.ContentItem.ContentItemId);
+                entry.Path = versionedPath;
 
-                var versionedPath = $"{unversionedPath}-{version++}";
-                if (IsRelativePathUnique(entries, versionedPath, context))
-                {
-                    var entry = entries.FirstOrDefault(e => e.ContainedContentItemId == context.ContentItem.ContentItemId);
-                    entry.Path = versionedPath;
-
-                    return versionedPath;
-                }
+                return versionedPath;
             }
         }
+    }
 
-        private async Task GenerateContainerPathFromPatternAsync(AutoroutePart part)
+    private async Task GenerateContainerPathFromPatternAsync(AutoroutePart part)
+    {
+        // Compute the Path only if it's empty.
+        if (!string.IsNullOrWhiteSpace(part.Path))
         {
-            // Compute the Path only if it's empty.
-            if (!string.IsNullOrWhiteSpace(part.Path))
-            {
-                return;
-            }
+            return;
+        }
 
-            var pattern = await GetPatternAsync(part);
+        var pattern = await GetPatternAsync(part);
 
-            if (!string.IsNullOrEmpty(pattern))
+        if (!string.IsNullOrEmpty(pattern))
+        {
+            var model = new AutoroutePartViewModel()
             {
-                var model = new AutoroutePartViewModel()
-                {
-                    Path = part.Path,
-                    AutoroutePart = part,
-                    ContentItem = part.ContentItem,
-                };
+                Path = part.Path,
+                AutoroutePart = part,
+                ContentItem = part.ContentItem,
+            };
 
-                _contentManager ??= _serviceProvider.GetRequiredService<IContentManager>();
-
-                var cultureAspect = await _contentManager.PopulateAspectAsync(part.ContentItem, new CultureAspect());
+            _contentManager ??= _serviceProvider.GetRequiredService<IContentManager>();
 
-                var cultureOptions = _serviceProvider.GetService<IOptions<CultureOptions>>().Value;
+            var cultureAspect = await _contentManager.PopulateAspectAsync(part.ContentItem, new CultureAspect());
 
-                using (CultureScope.Create(cultureAspect.Culture, ignoreSystemSettings: cultureOptions.IgnoreSystemSettings))
-                {
-                    part.Path = await _liquidTemplateManager.RenderStringAsync(pattern, NullEncoder.Default, model,
-                        new Dictionary<string, FluidValue>() { [nameof(ContentItem)] = new ObjectValue(model.ContentItem) });
-                }
+            var cultureOptions = _serviceProvider.GetService<IOptions<CultureOptions>>().Value;
 
-                part.Path = part.Path.Replace("\r", string.Empty).Replace("\n", string.Empty);
+            using (CultureScope.Create(cultureAspect.Culture, ignoreSystemSettings: cultureOptions.IgnoreSystemSettings))
+            {
+                part.Path = await _liquidTemplateManager.RenderStringAsync(pattern, NullEncoder.Default, model,
+                    new Dictionary<string, FluidValue>() { [nameof(ContentItem)] = new ObjectValue(model.ContentItem) });
+            }
 
-                if (part.Path?.Length > AutoroutePart.MaxPathLength)
-                {
-                    part.Path = part.Path[..AutoroutePart.MaxPathLength];
-                }
+            part.Path = part.Path.Replace("\r", string.Empty).Replace("\n", string.Empty);
 
-                if (!await IsAbsolutePathUniqueAsync(part.Path, part.ContentItem.ContentItemId))
-                {
-                    part.Path = await GenerateUniqueAbsolutePathAsync(part.Path, part.ContentItem.ContentItemId);
-                }
+            if (part.Path?.Length > AutoroutePart.MaxPathLength)
+            {
+                part.Path = part.Path[..AutoroutePart.MaxPathLength];
+            }
 
-                part.Apply();
+            if (!await IsAbsolutePathUniqueAsync(part.Path, part.ContentItem.ContentItemId))
+            {
+                part.Path = await GenerateUniqueAbsolutePathAsync(part.Path, part.ContentItem.ContentItemId);
             }
+
+            part.Apply();
         }
+    }
 
-        /// <summary>
-        /// Get the pattern from the AutoroutePartSettings property for its type.
-        /// </summary>
-        private async Task<string> GetPatternAsync(AutoroutePart part)
-        {
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(part.ContentItem.ContentType);
-            var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, nameof(AutoroutePart), StringComparison.Ordinal));
-            var pattern = contentTypePartDefinition.GetSettings<AutoroutePartSettings>().Pattern;
+    /// <summary>
+    /// Get the pattern from the AutoroutePartSettings property for its type.
+    /// </summary>
+    private async Task<string> GetPatternAsync(AutoroutePart part)
+    {
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(part.ContentItem.ContentType);
+        var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, nameof(AutoroutePart), StringComparison.Ordinal));
+        var pattern = contentTypePartDefinition.GetSettings<AutoroutePartSettings>().Pattern;
 
-            return pattern;
-        }
+        return pattern;
+    }
+
+    private async Task<string> GenerateUniqueAbsolutePathAsync(string path, string contentItemId)
+    {
+        var version = 1;
+        var unversionedPath = path;
 
-        private async Task<string> GenerateUniqueAbsolutePathAsync(string path, string contentItemId)
+        var versionSeparatorPosition = path.LastIndexOf('-');
+        if (versionSeparatorPosition > -1 && int.TryParse(path[versionSeparatorPosition..].TrimStart('-'), out version))
         {
-            var version = 1;
-            var unversionedPath = path;
+            unversionedPath = path[..versionSeparatorPosition];
+        }
 
-            var versionSeparatorPosition = path.LastIndexOf('-');
-            if (versionSeparatorPosition > -1 && int.TryParse(path[versionSeparatorPosition..].TrimStart('-'), out version))
+        while (true)
+        {
+            // Unversioned length + separator char + version length.
+            var quantityCharactersToTrim = unversionedPath.Length + 1 + version.ToString().Length - AutoroutePart.MaxPathLength;
+            if (quantityCharactersToTrim > 0)
             {
-                unversionedPath = path[..versionSeparatorPosition];
+                unversionedPath = unversionedPath[..^quantityCharactersToTrim];
             }
 
-            while (true)
+            var versionedPath = $"{unversionedPath}-{version++}";
+            if (await IsAbsolutePathUniqueAsync(versionedPath, contentItemId))
             {
-                // Unversioned length + separator char + version length.
-                var quantityCharactersToTrim = unversionedPath.Length + 1 + version.ToString().Length - AutoroutePart.MaxPathLength;
-                if (quantityCharactersToTrim > 0)
-                {
-                    unversionedPath = unversionedPath[..^quantityCharactersToTrim];
-                }
-
-                var versionedPath = $"{unversionedPath}-{version++}";
-                if (await IsAbsolutePathUniqueAsync(versionedPath, contentItemId))
-                {
-                    return versionedPath;
-                }
+                return versionedPath;
             }
         }
+    }
 
-        private async Task<bool> IsAbsolutePathUniqueAsync(string path, string contentItemId)
-        {
-            path = path.Trim('/');
-            var paths = new string[] { path, "/" + path, path + "/", "/" + path + "/" };
-
-            var possibleConflicts = await _session.QueryIndex<AutoroutePartIndex>(o => (o.Published || o.Latest) && o.Path.IsIn(paths)).ListAsync();
-            if (possibleConflicts.Any(x => x.ContentItemId != contentItemId && x.ContainedContentItemId != contentItemId))
-            {
-                return false;
-            }
+    private async Task<bool> IsAbsolutePathUniqueAsync(string path, string contentItemId)
+    {
+        path = path.Trim('/');
+        var paths = new string[] { path, "/" + path, path + "/", "/" + path + "/" };
 
-            return true;
+        var possibleConflicts = await _session.QueryIndex<AutoroutePartIndex>(o => (o.Published || o.Latest) && o.Path.IsIn(paths)).ListAsync();
+        if (possibleConflicts.Any(x => x.ContentItemId != contentItemId && x.ContainedContentItemId != contentItemId))
+        {
+            return false;
         }
+
+        return true;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/Handlers/DefaultRouteContentHandler.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/Handlers/DefaultRouteContentHandler.cs
index 34b31c07313..0ff86f11a7d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/Handlers/DefaultRouteContentHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/Handlers/DefaultRouteContentHandler.cs
@@ -3,36 +3,35 @@
 using OrchardCore.ContentManagement.Routing;
 using OrchardCore.Modules.Services;
 
-namespace OrchardCore.Autoroute.Handlers
+namespace OrchardCore.Autoroute.Handlers;
+
+public class DefaultRouteContentHandler : ContentHandlerBase
 {
-    public class DefaultRouteContentHandler : ContentHandlerBase
-    {
-        private readonly ISlugService _slugService;
+    private readonly ISlugService _slugService;
 
-        public DefaultRouteContentHandler(ISlugService slugService)
-        {
-            _slugService = slugService;
-        }
+    public DefaultRouteContentHandler(ISlugService slugService)
+    {
+        _slugService = slugService;
+    }
 
-        public override Task GetContentItemAspectAsync(ContentItemAspectContext context)
+    public override Task GetContentItemAspectAsync(ContentItemAspectContext context)
+    {
+        return context.ForAsync<RouteHandlerAspect>(aspect =>
         {
-            return context.ForAsync<RouteHandlerAspect>(aspect =>
+            // Only use default aspect if no other handler has set the aspect.
+            if (string.IsNullOrEmpty(aspect.Path))
             {
-                // Only use default aspect if no other handler has set the aspect.
-                if (string.IsNullOrEmpty(aspect.Path))
+                // By default contained route is content item id + display text, if present.
+                var path = context.ContentItem.ContentItemId;
+                if (!string.IsNullOrEmpty(context.ContentItem.DisplayText))
                 {
-                    // By default contained route is content item id + display text, if present.
-                    var path = context.ContentItem.ContentItemId;
-                    if (!string.IsNullOrEmpty(context.ContentItem.DisplayText))
-                    {
-                        path = path + "-" + context.ContentItem.DisplayText;
-                    }
-
-                    aspect.Path = _slugService.Slugify(path);
+                    path = path + "-" + context.ContentItem.DisplayText;
                 }
 
-                return Task.CompletedTask;
-            });
-        }
+                aspect.Path = _slugService.Slugify(path);
+            }
+
+            return Task.CompletedTask;
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/Indexing/AutoroutePartIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/Indexing/AutoroutePartIndexHandler.cs
index 60a089e0490..11d7e0d6fc7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/Indexing/AutoroutePartIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/Indexing/AutoroutePartIndexHandler.cs
@@ -2,22 +2,21 @@
 using OrchardCore.Autoroute.Models;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.Autoroute.Indexing
+namespace OrchardCore.Autoroute.Indexing;
+
+public class AutoroutePartIndexHandler : ContentPartIndexHandler<AutoroutePart>
 {
-    public class AutoroutePartIndexHandler : ContentPartIndexHandler<AutoroutePart>
+    public override Task BuildIndexAsync(AutoroutePart part, BuildPartIndexContext context)
     {
-        public override Task BuildIndexAsync(AutoroutePart part, BuildPartIndexContext context)
-        {
-            var options = context.Settings.ToOptions()
-                & ~DocumentIndexOptions.Sanitize
-                ;
-
-            foreach (var key in context.Keys)
-            {
-                context.DocumentIndex.Set(key, part.Path, options);
-            }
+        var options = context.Settings.ToOptions()
+            & ~DocumentIndexOptions.Sanitize
+            ;
 
-            return Task.CompletedTask;
+        foreach (var key in context.Keys)
+        {
+            context.DocumentIndex.Set(key, part.Path, options);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/Migrations.cs
index 21aaf5a18d1..928bc54ff53 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/Migrations.cs
@@ -6,77 +6,76 @@
 using OrchardCore.Data.Migration;
 using YesSql.Sql;
 
-namespace OrchardCore.Autoroute
+namespace OrchardCore.Autoroute;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        public Migrations(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public Migrations(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public async Task<int> CreateAsync()
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync("AutoroutePart", builder => builder
-                .Attachable()
-                .WithDescription("Provides a custom url for your content item."));
+    public async Task<int> CreateAsync()
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync("AutoroutePart", builder => builder
+            .Attachable()
+            .WithDescription("Provides a custom url for your content item."));
 
-            await SchemaBuilder.CreateMapIndexTableAsync<AutoroutePartIndex>(table => table
-                .Column<string>("ContentItemId", c => c.WithLength(26))
-                .Column<string>("ContainedContentItemId", c => c.WithLength(26))
-                .Column<string>("JsonPath", c => c.Unlimited())
-                .Column<string>("Path", col => col.WithLength(AutoroutePart.MaxPathLength))
-                .Column<bool>("Published")
-                .Column<bool>("Latest")
-            );
+        await SchemaBuilder.CreateMapIndexTableAsync<AutoroutePartIndex>(table => table
+            .Column<string>("ContentItemId", c => c.WithLength(26))
+            .Column<string>("ContainedContentItemId", c => c.WithLength(26))
+            .Column<string>("JsonPath", c => c.Unlimited())
+            .Column<string>("Path", col => col.WithLength(AutoroutePart.MaxPathLength))
+            .Column<bool>("Published")
+            .Column<bool>("Latest")
+        );
 
-            // Shortcut other migration steps on new content definition schemas.
-            return 5;
-        }
+        // Shortcut other migration steps on new content definition schemas.
+        return 5;
+    }
 
-        // Migrate PartSettings. This only needs to run on old content definition schemas.
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom1Async()
-        {
-            await _contentDefinitionManager.MigratePartSettingsAsync<AutoroutePart, AutoroutePartSettings>();
+    // Migrate PartSettings. This only needs to run on old content definition schemas.
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom1Async()
+    {
+        await _contentDefinitionManager.MigratePartSettingsAsync<AutoroutePart, AutoroutePartSettings>();
 
-            return 2;
-        }
+        return 2;
+    }
 
-        // This code can be removed in a later version.
+    // This code can be removed in a later version.
 #pragma warning disable CA1822 // Mark members as static
-        public int UpdateFrom2()
+    public int UpdateFrom2()
 #pragma warning restore CA1822 // Mark members as static
-        {
-            return 3;
-        }
+    {
+        return 3;
+    }
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom3Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<AutoroutePartIndex>(table => table
-                .AddColumn<string>("ContainedContentItemId", c => c.WithLength(26))
-            );
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom3Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<AutoroutePartIndex>(table => table
+            .AddColumn<string>("ContainedContentItemId", c => c.WithLength(26))
+        );
 
-            await SchemaBuilder.AlterIndexTableAsync<AutoroutePartIndex>(table => table
-                .AddColumn<string>("JsonPath", c => c.Unlimited())
-            );
+        await SchemaBuilder.AlterIndexTableAsync<AutoroutePartIndex>(table => table
+            .AddColumn<string>("JsonPath", c => c.Unlimited())
+        );
 
-            await SchemaBuilder.AlterIndexTableAsync<AutoroutePartIndex>(table => table
-                .AddColumn<bool>("Latest", c => c.WithDefault(false))
-            );
+        await SchemaBuilder.AlterIndexTableAsync<AutoroutePartIndex>(table => table
+            .AddColumn<bool>("Latest", c => c.WithDefault(false))
+        );
 
-            return 4;
-        }
+        return 4;
+    }
 
-        // This code can be removed in a later version.
+    // This code can be removed in a later version.
 #pragma warning disable CA1822 // Mark members as static
-        public int UpdateFrom4()
+    public int UpdateFrom4()
 #pragma warning restore CA1822 // Mark members as static
-        {
-            return 5;
-        }
+    {
+        return 5;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/Models/AutoroutePartExtensions.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/Models/AutoroutePartExtensions.cs
index ffb16a5a37d..9b46e0e67b8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/Models/AutoroutePartExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/Models/AutoroutePartExtensions.cs
@@ -4,48 +4,47 @@
 using System.Linq;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Autoroute.Models
+namespace OrchardCore.Autoroute.Models;
+
+public static class AutoroutePartExtensions
 {
-    public static class AutoroutePartExtensions
+    public static IEnumerable<ValidationResult> ValidatePathFieldValue(this AutoroutePart autoroute, IStringLocalizer S)
+    {
+        if (autoroute.Path == "/")
+        {
+            yield return new ValidationResult(S["Your permalink can't be set to the homepage, please use the homepage option instead."], new[] { nameof(autoroute.Path) });
+        }
+
+        if (HasInvalidCharacters(autoroute.Path))
+        {
+            var invalidCharactersForMessage = string.Join(", ", AutoroutePart.InvalidCharactersForPath.Select(c => $"\"{c}\""));
+            yield return new ValidationResult(S["Please do not use any of the following characters in your permalink: {0}. No spaces, or consecutive slashes, are allowed (please use dashes or underscores instead).", invalidCharactersForMessage], new[] { nameof(autoroute.Path) });
+        }
+
+        if (autoroute.Path?.Length > AutoroutePart.MaxPathLength)
+        {
+            yield return new ValidationResult(S["Your permalink is too long. The permalink can only be up to {0} characters.", AutoroutePart.MaxPathLength], new[] { nameof(autoroute.Path) });
+        }
+    }
+
+    private static bool HasInvalidCharacters(string path)
     {
-        public static IEnumerable<ValidationResult> ValidatePathFieldValue(this AutoroutePart autoroute, IStringLocalizer S)
+        // IndexOfAny performs culture-insensitive and case-sensitive search.
+        if (path?.IndexOfAny(AutoroutePart.InvalidCharactersForPath) > -1)
         {
-            if (autoroute.Path == "/")
-            {
-                yield return new ValidationResult(S["Your permalink can't be set to the homepage, please use the homepage option instead."], new[] { nameof(autoroute.Path) });
-            }
-
-            if (HasInvalidCharacters(autoroute.Path))
-            {
-                var invalidCharactersForMessage = string.Join(", ", AutoroutePart.InvalidCharactersForPath.Select(c => $"\"{c}\""));
-                yield return new ValidationResult(S["Please do not use any of the following characters in your permalink: {0}. No spaces, or consecutive slashes, are allowed (please use dashes or underscores instead).", invalidCharactersForMessage], new[] { nameof(autoroute.Path) });
-            }
-
-            if (autoroute.Path?.Length > AutoroutePart.MaxPathLength)
-            {
-                yield return new ValidationResult(S["Your permalink is too long. The permalink can only be up to {0} characters.", AutoroutePart.MaxPathLength], new[] { nameof(autoroute.Path) });
-            }
+            return true;
         }
 
-        private static bool HasInvalidCharacters(string path)
+        if (path?.IndexOf(' ', StringComparison.Ordinal) > -1)
         {
-            // IndexOfAny performs culture-insensitive and case-sensitive search.
-            if (path?.IndexOfAny(AutoroutePart.InvalidCharactersForPath) > -1)
-            {
-                return true;
-            }
-
-            if (path?.IndexOf(' ', StringComparison.Ordinal) > -1)
-            {
-                return true;
-            }
-
-            if (path?.IndexOf("//", StringComparison.Ordinal) > -1)
-            {
-                return true;
-            }
-
-            return false;
+            return true;
         }
+
+        if (path?.IndexOf("//", StringComparison.Ordinal) > -1)
+        {
+            return true;
+        }
+
+        return false;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/Models/AutoroutePartSettings.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/Models/AutoroutePartSettings.cs
index 0a988e0b686..a9eb56c61ab 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/Models/AutoroutePartSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/Models/AutoroutePartSettings.cs
@@ -1,48 +1,47 @@
 using System.ComponentModel;
 
-namespace OrchardCore.Autoroute.Models
+namespace OrchardCore.Autoroute.Models;
+
+public class AutoroutePartSettings
 {
-    public class AutoroutePartSettings
-    {
-        /// <summary>
-        /// Gets or sets whether a user can define a custom path.
-        /// </summary>
-        public bool AllowCustomPath { get; set; }
-
-        /// <summary>
-        /// The pattern used to build the Path.
-        /// </summary>
-        [DefaultValue("{{ ContentItem.DisplayText | slugify }}")]
-        public string Pattern { get; set; } = "{{ ContentItem.DisplayText | slugify }}";
-
-        /// <summary>
-        /// Whether to display an option to set the content item as the homepage.
-        /// </summary>
-        public bool ShowHomepageOption { get; set; }
-
-        /// <summary>
-        /// Whether a user can request a new path if some data has changed.
-        /// </summary>
-        public bool AllowUpdatePath { get; set; }
-
-        /// <summary>
-        /// Whether a user is allowed to disable autoute generation to content items of this type.
-        /// </summary>
-        public bool AllowDisabled { get; set; }
-
-        /// <summary>
-        /// Whether to allow routing of contained content items.
-        /// </summary>
-        public bool AllowRouteContainedItems { get; set; }
-
-        /// <summary>
-        /// Whether this part is managing contained item routes.
-        /// </summary>
-        public bool ManageContainedItemRoutes { get; set; }
-
-        /// <summary>
-        /// Whether to allow routing of contained content items to absolute paths.
-        /// </summary>
-        public bool AllowAbsolutePath { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets whether a user can define a custom path.
+    /// </summary>
+    public bool AllowCustomPath { get; set; }
+
+    /// <summary>
+    /// The pattern used to build the Path.
+    /// </summary>
+    [DefaultValue("{{ ContentItem.DisplayText | slugify }}")]
+    public string Pattern { get; set; } = "{{ ContentItem.DisplayText | slugify }}";
+
+    /// <summary>
+    /// Whether to display an option to set the content item as the homepage.
+    /// </summary>
+    public bool ShowHomepageOption { get; set; }
+
+    /// <summary>
+    /// Whether a user can request a new path if some data has changed.
+    /// </summary>
+    public bool AllowUpdatePath { get; set; }
+
+    /// <summary>
+    /// Whether a user is allowed to disable autoute generation to content items of this type.
+    /// </summary>
+    public bool AllowDisabled { get; set; }
+
+    /// <summary>
+    /// Whether to allow routing of contained content items.
+    /// </summary>
+    public bool AllowRouteContainedItems { get; set; }
+
+    /// <summary>
+    /// Whether this part is managing contained item routes.
+    /// </summary>
+    public bool ManageContainedItemRoutes { get; set; }
+
+    /// <summary>
+    /// Whether to allow routing of contained content items to absolute paths.
+    /// </summary>
+    public bool AllowAbsolutePath { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/RemotePublishing/AutorouteMetaWeblogDriver.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/RemotePublishing/AutorouteMetaWeblogDriver.cs
index e42acbae61b..b4ab8cf12ef 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/RemotePublishing/AutorouteMetaWeblogDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/RemotePublishing/AutorouteMetaWeblogDriver.cs
@@ -5,36 +5,35 @@
 using OrchardCore.XmlRpc;
 using OrchardCore.XmlRpc.Models;
 
-namespace OrchardCore.Autoroute.RemotePublishing
+namespace OrchardCore.Autoroute.RemotePublishing;
+
+public sealed class AutorouteMetaWeblogDriver : MetaWeblogDriver
 {
-    public sealed class AutorouteMetaWeblogDriver : MetaWeblogDriver
+    public override void SetCapabilities(Action<string, string> setCapability)
     {
-        public override void SetCapabilities(Action<string, string> setCapability)
-        {
-            setCapability("supportsSlug", "Yes");
-        }
+        setCapability("supportsSlug", "Yes");
+    }
 
-        public override void BuildPost(XRpcStruct rpcStruct, XmlRpcContext context, ContentItem contentItem)
+    public override void BuildPost(XRpcStruct rpcStruct, XmlRpcContext context, ContentItem contentItem)
+    {
+        var autoroutePart = contentItem.As<AutoroutePart>();
+        if (autoroutePart == null)
         {
-            var autoroutePart = contentItem.As<AutoroutePart>();
-            if (autoroutePart == null)
-            {
-                return;
-            }
-
-            rpcStruct.Set("wp_slug", autoroutePart.Path);
+            return;
         }
 
-        public override void EditPost(XRpcStruct rpcStruct, ContentItem contentItem)
+        rpcStruct.Set("wp_slug", autoroutePart.Path);
+    }
+
+    public override void EditPost(XRpcStruct rpcStruct, ContentItem contentItem)
+    {
+        if (contentItem.As<AutoroutePart>() != null)
         {
-            if (contentItem.As<AutoroutePart>() != null)
-            {
-                var slug = rpcStruct.Optional<string>("wp_slug");
+            var slug = rpcStruct.Optional<string>("wp_slug");
 
-                if (!string.IsNullOrWhiteSpace(slug))
-                {
-                    contentItem.Alter<AutoroutePart>(x => x.Path = slug);
-                }
+            if (!string.IsNullOrWhiteSpace(slug))
+            {
+                contentItem.Alter<AutoroutePart>(x => x.Path = slug);
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/RemotePublishing/RemotePublishingStartup.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/RemotePublishing/RemotePublishingStartup.cs
index 1287b724ac3..7adb27af96f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/RemotePublishing/RemotePublishingStartup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/RemotePublishing/RemotePublishingStartup.cs
@@ -2,14 +2,13 @@
 using OrchardCore.MetaWeblog;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Autoroute.RemotePublishing
+namespace OrchardCore.Autoroute.RemotePublishing;
+
+[RequireFeatures("OrchardCore.RemotePublishing")]
+public sealed class RemotePublishingStartup : StartupBase
 {
-    [RequireFeatures("OrchardCore.RemotePublishing")]
-    public sealed class RemotePublishingStartup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IMetaWeblogDriver, AutorouteMetaWeblogDriver>();
-        }
+        services.AddScoped<IMetaWeblogDriver, AutorouteMetaWeblogDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/Routing/AutorouteTransformer.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/Routing/AutorouteTransformer.cs
index 00366911063..810490a5858 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/Routing/AutorouteTransformer.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/Routing/AutorouteTransformer.cs
@@ -5,43 +5,42 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.ContentManagement.Routing;
 
-namespace OrchardCore.Autoroute.Routing
+namespace OrchardCore.Autoroute.Routing;
+
+public class AutorouteTransformer : DynamicRouteValueTransformer
 {
-    public class AutorouteTransformer : DynamicRouteValueTransformer
+    private readonly IAutorouteEntries _entries;
+    private readonly AutorouteOptions _options;
+
+    public AutorouteTransformer(IAutorouteEntries entries, IOptions<AutorouteOptions> options)
     {
-        private readonly IAutorouteEntries _entries;
-        private readonly AutorouteOptions _options;
+        _entries = entries;
+        _options = options.Value;
+    }
 
-        public AutorouteTransformer(IAutorouteEntries entries, IOptions<AutorouteOptions> options)
-        {
-            _entries = entries;
-            _options = options.Value;
-        }
+    public override async ValueTask<RouteValueDictionary> TransformAsync(HttpContext httpContext, RouteValueDictionary values)
+    {
+        (var found, var entry) = await _entries.TryGetEntryByPathAsync(httpContext.Request.Path.Value);
 
-        public override async ValueTask<RouteValueDictionary> TransformAsync(HttpContext httpContext, RouteValueDictionary values)
+        if (found)
         {
-            (var found, var entry) = await _entries.TryGetEntryByPathAsync(httpContext.Request.Path.Value);
-
-            if (found)
+            var routeValues = new RouteValueDictionary(_options.GlobalRouteValues)
             {
-                var routeValues = new RouteValueDictionary(_options.GlobalRouteValues)
-                {
-                    [_options.ContentItemIdKey] = entry.ContentItemId
-                };
-
-                if (!string.IsNullOrEmpty(entry.JsonPath))
-                {
-                    routeValues[_options.JsonPathKey] = entry.JsonPath;
-                }
+                [_options.ContentItemIdKey] = entry.ContentItemId
+            };
 
-                // Prevents the original values from being re-added to the dynamic ones.
-                values.Clear();
+            if (!string.IsNullOrEmpty(entry.JsonPath))
+            {
+                routeValues[_options.JsonPathKey] = entry.JsonPath;
+            }
 
-                return routeValues;
+            // Prevents the original values from being re-added to the dynamic ones.
+            values.Clear();
 
-            }
+            return routeValues;
 
-            return null;
         }
+
+        return null;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/Routing/AutorouteValuesAddressScheme.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/Routing/AutorouteValuesAddressScheme.cs
index 5a21d7d56c5..427c5a23d4e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/Routing/AutorouteValuesAddressScheme.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/Routing/AutorouteValuesAddressScheme.cs
@@ -7,94 +7,93 @@
 using OrchardCore.ContentManagement.Routing;
 using OrchardCore.Routing;
 
-namespace OrchardCore.Autoroute.Routing
+namespace OrchardCore.Autoroute.Routing;
+
+internal sealed class AutorouteValuesAddressScheme : IShellRouteValuesAddressScheme
 {
-    internal sealed class AutorouteValuesAddressScheme : IShellRouteValuesAddressScheme
+    private readonly IAutorouteEntries _entries;
+    private readonly AutorouteOptions _options;
+
+    public AutorouteValuesAddressScheme(IAutorouteEntries entries, IOptions<AutorouteOptions> options)
     {
-        private readonly IAutorouteEntries _entries;
-        private readonly AutorouteOptions _options;
+        _entries = entries;
+        _options = options.Value;
+    }
 
-        public AutorouteValuesAddressScheme(IAutorouteEntries entries, IOptions<AutorouteOptions> options)
+    public IEnumerable<Endpoint> FindEndpoints(RouteValuesAddress address)
+    {
+        if (address.AmbientValues == null || address.ExplicitValues == null)
         {
-            _entries = entries;
-            _options = options.Value;
+            return [];
         }
 
-        public IEnumerable<Endpoint> FindEndpoints(RouteValuesAddress address)
+        // Try to get the contained item first, then the container content item
+        var contentItemId = address.ExplicitValues[_options.ContainedContentItemIdKey]?.ToString();
+        if (string.IsNullOrEmpty(contentItemId))
         {
-            if (address.AmbientValues == null || address.ExplicitValues == null)
-            {
-                return [];
-            }
-
-            // Try to get the contained item first, then the container content item
-            var contentItemId = address.ExplicitValues[_options.ContainedContentItemIdKey]?.ToString();
-            if (string.IsNullOrEmpty(contentItemId))
-            {
-                contentItemId = address.ExplicitValues[_options.ContentItemIdKey]?.ToString();
-            }
+            contentItemId = address.ExplicitValues[_options.ContentItemIdKey]?.ToString();
+        }
 
-            if (string.IsNullOrEmpty(contentItemId))
-            {
-                return [];
-            }
+        if (string.IsNullOrEmpty(contentItemId))
+        {
+            return [];
+        }
 
-            (var found, var autorouteEntry) = _entries.TryGetEntryByContentItemIdAsync(contentItemId).GetAwaiter().GetResult();
+        (var found, var autorouteEntry) = _entries.TryGetEntryByContentItemIdAsync(contentItemId).GetAwaiter().GetResult();
 
-            if (!found)
-            {
-                return [];
-            }
+        if (!found)
+        {
+            return [];
+        }
 
-            if (Match(address.ExplicitValues))
-            {
-                // Once we have the contained content item id value we no longer want it in the route values.
-                address.ExplicitValues.Remove(_options.ContainedContentItemIdKey);
+        if (Match(address.ExplicitValues))
+        {
+            // Once we have the contained content item id value we no longer want it in the route values.
+            address.ExplicitValues.Remove(_options.ContainedContentItemIdKey);
 
-                var routeValues = new RouteValueDictionary(address.ExplicitValues);
+            var routeValues = new RouteValueDictionary(address.ExplicitValues);
 
-                if (address.ExplicitValues.Count > _options.GlobalRouteValues.Count + 1)
+            if (address.ExplicitValues.Count > _options.GlobalRouteValues.Count + 1)
+            {
+                foreach (var entry in address.ExplicitValues)
                 {
-                    foreach (var entry in address.ExplicitValues)
+                    if (string.Equals(entry.Key, _options.ContentItemIdKey, StringComparison.OrdinalIgnoreCase))
                     {
-                        if (string.Equals(entry.Key, _options.ContentItemIdKey, StringComparison.OrdinalIgnoreCase))
-                        {
-                            continue;
-                        }
-
-                        if (!_options.GlobalRouteValues.ContainsKey(entry.Key))
-                        {
-                            routeValues.Remove(entry.Key);
-                        }
+                        continue;
                     }
-                }
-
-                var endpoint = new RouteEndpoint
-                (
-                    c => null,
-                    RoutePatternFactory.Parse(autorouteEntry.Path, routeValues, null),
-                    0,
-                    null,
-                    null
-                );
 
-                return new[] { endpoint };
+                    if (!_options.GlobalRouteValues.ContainsKey(entry.Key))
+                    {
+                        routeValues.Remove(entry.Key);
+                    }
+                }
             }
 
-            return [];
+            var endpoint = new RouteEndpoint
+            (
+                c => null,
+                RoutePatternFactory.Parse(autorouteEntry.Path, routeValues, null),
+                0,
+                null,
+                null
+            );
+
+            return new[] { endpoint };
         }
 
-        private bool Match(RouteValueDictionary explicitValues)
+        return [];
+    }
+
+    private bool Match(RouteValueDictionary explicitValues)
+    {
+        foreach (var entry in _options.GlobalRouteValues)
         {
-            foreach (var entry in _options.GlobalRouteValues)
+            if (!string.Equals(explicitValues[entry.Key]?.ToString(), entry.Value?.ToString(), StringComparison.OrdinalIgnoreCase))
             {
-                if (!string.Equals(explicitValues[entry.Key]?.ToString(), entry.Value?.ToString(), StringComparison.OrdinalIgnoreCase))
-                {
-                    return false;
-                }
+                return false;
             }
-
-            return true;
         }
+
+        return true;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/Settings/AutoroutePartSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/Settings/AutoroutePartSettingsDisplayDriver.cs
index cbd27a10902..678f27a1951 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/Settings/AutoroutePartSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/Settings/AutoroutePartSettingsDisplayDriver.cs
@@ -8,74 +8,73 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Autoroute.Settings
+namespace OrchardCore.Autoroute.Settings;
+
+public sealed class AutoroutePartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<AutoroutePart>
 {
-    public sealed class AutoroutePartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<AutoroutePart>
-    {
-        private readonly ILiquidTemplateManager _templateManager;
+    private readonly ILiquidTemplateManager _templateManager;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AutoroutePartSettingsDisplayDriver(
-            ILiquidTemplateManager templateManager,
-            IStringLocalizer<AutoroutePartSettingsDisplayDriver> localizer)
-        {
-            _templateManager = templateManager;
-            S = localizer;
-        }
+    public AutoroutePartSettingsDisplayDriver(
+        ILiquidTemplateManager templateManager,
+        IStringLocalizer<AutoroutePartSettingsDisplayDriver> localizer)
+    {
+        _templateManager = templateManager;
+        S = localizer;
+    }
 
-        public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    {
+        return Initialize<AutoroutePartSettingsViewModel>("AutoroutePartSettings_Edit", model =>
         {
-            return Initialize<AutoroutePartSettingsViewModel>("AutoroutePartSettings_Edit", model =>
-            {
-                var settings = contentTypePartDefinition.GetSettings<AutoroutePartSettings>();
+            var settings = contentTypePartDefinition.GetSettings<AutoroutePartSettings>();
 
-                model.AllowCustomPath = settings.AllowCustomPath;
-                model.AllowUpdatePath = settings.AllowUpdatePath;
-                model.Pattern = settings.Pattern;
-                model.ShowHomepageOption = settings.ShowHomepageOption;
-                model.AllowDisabled = settings.AllowDisabled;
-                model.AllowRouteContainedItems = settings.AllowRouteContainedItems;
-                model.ManageContainedItemRoutes = settings.ManageContainedItemRoutes;
-                model.AllowAbsolutePath = settings.AllowAbsolutePath;
-                model.AutoroutePartSettings = settings;
-            }).Location("Content");
-        }
+            model.AllowCustomPath = settings.AllowCustomPath;
+            model.AllowUpdatePath = settings.AllowUpdatePath;
+            model.Pattern = settings.Pattern;
+            model.ShowHomepageOption = settings.ShowHomepageOption;
+            model.AllowDisabled = settings.AllowDisabled;
+            model.AllowRouteContainedItems = settings.AllowRouteContainedItems;
+            model.ManageContainedItemRoutes = settings.ManageContainedItemRoutes;
+            model.AllowAbsolutePath = settings.AllowAbsolutePath;
+            model.AutoroutePartSettings = settings;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
-        {
-            var model = new AutoroutePartSettingsViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    {
+        var model = new AutoroutePartSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix,
-                m => m.Pattern,
-                m => m.AllowCustomPath,
-                m => m.AllowUpdatePath,
-                m => m.ShowHomepageOption,
-                m => m.AllowDisabled,
-                m => m.AllowRouteContainedItems,
-                m => m.ManageContainedItemRoutes,
-                m => m.AllowAbsolutePath);
+        await context.Updater.TryUpdateModelAsync(model, Prefix,
+            m => m.Pattern,
+            m => m.AllowCustomPath,
+            m => m.AllowUpdatePath,
+            m => m.ShowHomepageOption,
+            m => m.AllowDisabled,
+            m => m.AllowRouteContainedItems,
+            m => m.ManageContainedItemRoutes,
+            m => m.AllowAbsolutePath);
 
-            if (!string.IsNullOrEmpty(model.Pattern) && !_templateManager.Validate(model.Pattern, out var errors))
-            {
-                context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-            }
-            else
+        if (!string.IsNullOrEmpty(model.Pattern) && !_templateManager.Validate(model.Pattern, out var errors))
+        {
+            context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+        }
+        else
+        {
+            context.Builder.WithSettings(new AutoroutePartSettings
             {
-                context.Builder.WithSettings(new AutoroutePartSettings
-                {
-                    Pattern = model.Pattern,
-                    AllowCustomPath = model.AllowCustomPath,
-                    AllowUpdatePath = model.AllowUpdatePath,
-                    ShowHomepageOption = model.ShowHomepageOption,
-                    AllowDisabled = model.AllowDisabled,
-                    AllowRouteContainedItems = model.AllowRouteContainedItems,
-                    ManageContainedItemRoutes = model.ManageContainedItemRoutes,
-                    AllowAbsolutePath = model.AllowAbsolutePath
-                });
-            }
-
-            return Edit(contentTypePartDefinition, context);
+                Pattern = model.Pattern,
+                AllowCustomPath = model.AllowCustomPath,
+                AllowUpdatePath = model.AllowUpdatePath,
+                ShowHomepageOption = model.ShowHomepageOption,
+                AllowDisabled = model.AllowDisabled,
+                AllowRouteContainedItems = model.AllowRouteContainedItems,
+                ManageContainedItemRoutes = model.ManageContainedItemRoutes,
+                AllowAbsolutePath = model.AllowAbsolutePath
+            });
         }
+
+        return Edit(contentTypePartDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/Sitemaps/AutorouteContentTypeProvider.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/Sitemaps/AutorouteContentTypeProvider.cs
index 2d256e7a71d..4bf2e4aa2de 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/Sitemaps/AutorouteContentTypeProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/Sitemaps/AutorouteContentTypeProvider.cs
@@ -9,43 +9,42 @@
 using OrchardCore.Sitemaps.Builders;
 using OrchardCore.Sitemaps.Services;
 
-namespace OrchardCore.Autoroute.Sitemaps
+namespace OrchardCore.Autoroute.Sitemaps;
+
+public class AutorouteContentTypeProvider : IRouteableContentTypeProvider
 {
-    public class AutorouteContentTypeProvider : IRouteableContentTypeProvider
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentManager _contentManager;
+
+    public AutorouteContentTypeProvider(
+        IContentDefinitionManager contentDefinitionManager,
+        IContentManager contentManager
+        )
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IContentManager _contentManager;
+        _contentDefinitionManager = contentDefinitionManager;
+        _contentManager = contentManager;
+    }
 
-        public AutorouteContentTypeProvider(
-            IContentDefinitionManager contentDefinitionManager,
-            IContentManager contentManager
-            )
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _contentManager = contentManager;
-        }
+    public async Task<string> GetRouteAsync(SitemapBuilderContext context, ContentItem contentItem)
+    {
+        var ctd = (await ListRoutableTypeDefinitionsAsync())?.FirstOrDefault(ctd => ctd.Name == contentItem.ContentType);
 
-        public async Task<string> GetRouteAsync(SitemapBuilderContext context, ContentItem contentItem)
+        if (ctd != null)
         {
-            var ctd = (await ListRoutableTypeDefinitionsAsync())?.FirstOrDefault(ctd => ctd.Name == contentItem.ContentType);
-
-            if (ctd != null)
-            {
-                var contentItemMetadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(contentItem);
-                var routes = contentItemMetadata.DisplayRouteValues;
+            var contentItemMetadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(contentItem);
+            var routes = contentItemMetadata.DisplayRouteValues;
 
-                // UrlHelper.Action includes BasePath automatically if present.
-                // If content item is assigned as home route, UrlHelper resolves as site root.
-                return context.HostPrefix + context.UrlHelper.Action(routes["Action"].ToString(), routes);
-            }
-
-            return null;
+            // UrlHelper.Action includes BasePath automatically if present.
+            // If content item is assigned as home route, UrlHelper resolves as site root.
+            return context.HostPrefix + context.UrlHelper.Action(routes["Action"].ToString(), routes);
         }
 
-        public async Task<IEnumerable<ContentTypeDefinition>> ListRoutableTypeDefinitionsAsync()
-        {
-            return (await _contentDefinitionManager.ListTypeDefinitionsAsync())
-                .Where(ctd => ctd.Parts.Any(p => p.Name == nameof(AutoroutePart)));
-        }
+        return null;
+    }
+
+    public async Task<IEnumerable<ContentTypeDefinition>> ListRoutableTypeDefinitionsAsync()
+    {
+        return (await _contentDefinitionManager.ListTypeDefinitionsAsync())
+            .Where(ctd => ctd.Parts.Any(p => p.Name == nameof(AutoroutePart)));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/Startup.cs
index e17a93efffb..4f28e7bd4fe 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/Startup.cs
@@ -29,89 +29,88 @@
 using OrchardCore.Security.Permissions;
 using OrchardCore.Sitemaps.Services;
 
-namespace OrchardCore.Autoroute
+namespace OrchardCore.Autoroute;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
-    {
-        public override int ConfigureOrder
-            => OrchardCoreConstants.ConfigureOrder.Autoroute;
+    public override int ConfigureOrder
+        => OrchardCoreConstants.ConfigureOrder.Autoroute;
 
-        public override void ConfigureServices(IServiceCollection services)
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
+            o.MemberAccessStrategy.Register<AutoroutePartViewModel>();
+
+            o.MemberAccessStrategy.Register<LiquidContentAccessor, LiquidPropertyAccessor>("Slug", (obj, context) =>
             {
-                o.MemberAccessStrategy.Register<AutoroutePartViewModel>();
+                var liquidTemplateContext = (LiquidTemplateContext)context;
 
-                o.MemberAccessStrategy.Register<LiquidContentAccessor, LiquidPropertyAccessor>("Slug", (obj, context) =>
+                return new LiquidPropertyAccessor(liquidTemplateContext, async (slug, context) =>
                 {
-                    var liquidTemplateContext = (LiquidTemplateContext)context;
+                    var autorouteEntries = context.Services.GetRequiredService<IAutorouteEntries>();
+                    var contentManager = context.Services.GetRequiredService<IContentManager>();
 
-                    return new LiquidPropertyAccessor(liquidTemplateContext, async (slug, context) =>
+                    if (!slug.StartsWith('/'))
                     {
-                        var autorouteEntries = context.Services.GetRequiredService<IAutorouteEntries>();
-                        var contentManager = context.Services.GetRequiredService<IContentManager>();
+                        slug = "/" + slug;
+                    }
 
-                        if (!slug.StartsWith('/'))
-                        {
-                            slug = "/" + slug;
-                        }
+                    (var found, var entry) = await autorouteEntries.TryGetEntryByPathAsync(slug);
 
-                        (var found, var entry) = await autorouteEntries.TryGetEntryByPathAsync(slug);
-
-                        if (found)
-                        {
-                            return FluidValue.Create(await contentManager.GetAsync(entry.ContentItemId, entry.JsonPath), context.Options);
-                        }
+                    if (found)
+                    {
+                        return FluidValue.Create(await contentManager.GetAsync(entry.ContentItemId, entry.JsonPath), context.Options);
+                    }
 
-                        return NilValue.Instance;
-                    });
+                    return NilValue.Instance;
                 });
             });
+        });
 
-            // Autoroute Part
-            services.AddContentPart<AutoroutePart>()
-                .UseDisplayDriver<AutoroutePartDisplayDriver>()
-                .AddHandler<AutoroutePartHandler>();
+        // Autoroute Part
+        services.AddContentPart<AutoroutePart>()
+            .UseDisplayDriver<AutoroutePartDisplayDriver>()
+            .AddHandler<AutoroutePartHandler>();
 
-            services.AddScoped<IContentHandler, DefaultRouteContentHandler>();
-            services.AddScoped<IContentHandler, AutorouteContentHandler>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, AutoroutePartSettingsDisplayDriver>();
-            services.AddScoped<IContentPartIndexHandler, AutoroutePartIndexHandler>();
+        services.AddScoped<IContentHandler, DefaultRouteContentHandler>();
+        services.AddScoped<IContentHandler, AutorouteContentHandler>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, AutoroutePartSettingsDisplayDriver>();
+        services.AddScoped<IContentPartIndexHandler, AutoroutePartIndexHandler>();
 
-            services.AddScoped<AutoroutePartIndexProvider>();
-            services.AddScoped<IScopedIndexProvider>(sp => sp.GetRequiredService<AutoroutePartIndexProvider>());
-            services.AddScoped<IContentHandler>(sp => sp.GetRequiredService<AutoroutePartIndexProvider>());
+        services.AddScoped<AutoroutePartIndexProvider>();
+        services.AddScoped<IScopedIndexProvider>(sp => sp.GetRequiredService<AutoroutePartIndexProvider>());
+        services.AddScoped<IContentHandler>(sp => sp.GetRequiredService<AutoroutePartIndexProvider>());
 
-            services.AddDataMigration<Migrations>();
-            services.AddSingleton<IAutorouteEntries, AutorouteEntries>();
-            services.AddScoped<IContentHandleProvider, AutorouteHandleProvider>();
+        services.AddDataMigration<Migrations>();
+        services.AddSingleton<IAutorouteEntries, AutorouteEntries>();
+        services.AddScoped<IContentHandleProvider, AutorouteHandleProvider>();
 
-            services.Configure<GraphQLContentOptions>(options =>
+        services.Configure<GraphQLContentOptions>(options =>
+        {
+            options.ConfigurePart<AutoroutePart>(partOptions =>
             {
-                options.ConfigurePart<AutoroutePart>(partOptions =>
-                {
-                    partOptions.Collapse = true;
-                });
+                partOptions.Collapse = true;
             });
+        });
 
-            services.AddSingleton<AutorouteTransformer>();
-            services.AddSingleton<IShellRouteValuesAddressScheme, AutorouteValuesAddressScheme>();
-        }
+        services.AddSingleton<AutorouteTransformer>();
+        services.AddSingleton<IShellRouteValuesAddressScheme, AutorouteValuesAddressScheme>();
+    }
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            // The 1st segment prevents the transformer to be executed for the home.
-            routes.MapDynamicControllerRoute<AutorouteTransformer>("/{any}/{**slug}");
-        }
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        // The 1st segment prevents the transformer to be executed for the home.
+        routes.MapDynamicControllerRoute<AutorouteTransformer>("/{any}/{**slug}");
     }
+}
 
-    [RequireFeatures("OrchardCore.Sitemaps")]
-    public class SitemapStartup : StartupBase
+[RequireFeatures("OrchardCore.Sitemaps")]
+public class SitemapStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IRouteableContentTypeProvider, AutorouteContentTypeProvider>();
-        }
+        services.AddScoped<IRouteableContentTypeProvider, AutorouteContentTypeProvider>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/ViewModels/AutoroutePartSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/ViewModels/AutoroutePartSettingsViewModel.cs
index 4860f6710c7..cecaaaa1edc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/ViewModels/AutoroutePartSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/ViewModels/AutoroutePartSettingsViewModel.cs
@@ -1,17 +1,16 @@
 using OrchardCore.Autoroute.Models;
 
-namespace OrchardCore.Autoroute.ViewModels
+namespace OrchardCore.Autoroute.ViewModels;
+
+public class AutoroutePartSettingsViewModel
 {
-    public class AutoroutePartSettingsViewModel
-    {
-        public bool AllowCustomPath { get; set; }
-        public string Pattern { get; set; }
-        public bool ShowHomepageOption { get; set; }
-        public bool AllowUpdatePath { get; set; }
-        public bool AllowDisabled { get; set; }
-        public bool AllowRouteContainedItems { get; set; }
-        public bool ManageContainedItemRoutes { get; set; }
-        public bool AllowAbsolutePath { get; set; }
-        public AutoroutePartSettings AutoroutePartSettings { get; set; }
-    }
+    public bool AllowCustomPath { get; set; }
+    public string Pattern { get; set; }
+    public bool ShowHomepageOption { get; set; }
+    public bool AllowUpdatePath { get; set; }
+    public bool AllowDisabled { get; set; }
+    public bool AllowRouteContainedItems { get; set; }
+    public bool ManageContainedItemRoutes { get; set; }
+    public bool AllowAbsolutePath { get; set; }
+    public AutoroutePartSettings AutoroutePartSettings { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/ViewModels/AutoroutePartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/ViewModels/AutoroutePartViewModel.cs
index 8dbda234584..43a224ad8cf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/ViewModels/AutoroutePartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/ViewModels/AutoroutePartViewModel.cs
@@ -2,25 +2,24 @@
 using OrchardCore.Autoroute.Models;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Autoroute.ViewModels
+namespace OrchardCore.Autoroute.ViewModels;
+
+public class AutoroutePartViewModel
 {
-    public class AutoroutePartViewModel
-    {
-        public string Path { get; set; }
-        public bool SetHomepage { get; set; }
-        public bool UpdatePath { get; set; }
-        public bool IsHomepage { get; set; }
-        public bool RouteContainedItems { get; set; }
-        public bool Absolute { get; set; }
-        public bool Disabled { get; set; }
+    public string Path { get; set; }
+    public bool SetHomepage { get; set; }
+    public bool UpdatePath { get; set; }
+    public bool IsHomepage { get; set; }
+    public bool RouteContainedItems { get; set; }
+    public bool Absolute { get; set; }
+    public bool Disabled { get; set; }
 
-        [BindNever]
-        public ContentItem ContentItem { get; set; }
+    [BindNever]
+    public ContentItem ContentItem { get; set; }
 
-        [BindNever]
-        public AutoroutePart AutoroutePart { get; set; }
+    [BindNever]
+    public AutoroutePart AutoroutePart { get; set; }
 
-        [BindNever]
-        public AutoroutePartSettings Settings { get; set; }
-    }
+    [BindNever]
+    public AutoroutePartSettings Settings { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs
index 2c850767809..d31af77973b 100644
--- a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs
@@ -2,33 +2,32 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.BackgroundTasks
+namespace OrchardCore.BackgroundTasks;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
-    {
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer) => S = localizer;
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer) => S = localizer;
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["Tasks"], S["Tasks"].PrefixPosition(), tasks => tasks
-                        .Add(S["Background Tasks"], S["Background Tasks"].PrefixPosition(), backgroundTasks => backgroundTasks
-                            .Action("Index", "BackgroundTask", "OrchardCore.BackgroundTasks")
-                            .Permission(Permissions.ManageBackgroundTasks)
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["Tasks"], S["Tasks"].PrefixPosition(), tasks => tasks
+                    .Add(S["Background Tasks"], S["Background Tasks"].PrefixPosition(), backgroundTasks => backgroundTasks
+                        .Action("Index", "BackgroundTask", "OrchardCore.BackgroundTasks")
+                        .Permission(Permissions.ManageBackgroundTasks)
+                        .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Controllers/BackgroundTaskController.cs b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Controllers/BackgroundTaskController.cs
index 68bf3b80fd2..9cf15c878d5 100644
--- a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Controllers/BackgroundTaskController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Controllers/BackgroundTaskController.cs
@@ -18,271 +18,270 @@
 using OrchardCore.Navigation;
 using OrchardCore.Routing;
 
-namespace OrchardCore.BackgroundTasks.Controllers
+namespace OrchardCore.BackgroundTasks.Controllers;
+
+[Admin("BackgroundTasks/{action}/{name?}", "BackgroundTasks{action}")]
+public class BackgroundTaskController : Controller
 {
-    [Admin("BackgroundTasks/{action}/{name?}", "BackgroundTasks{action}")]
-    public class BackgroundTaskController : Controller
+    private const string _optionsSearch = $"{nameof(BackgroundTaskIndexViewModel.Options)}.{nameof(AdminIndexOptions.Search)}";
+    private const string _optionsStatus = $"{nameof(BackgroundTaskIndexViewModel.Options)}.{nameof(AdminIndexOptions.Status)}";
+
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IEnumerable<IBackgroundTask> _backgroundTasks;
+    private readonly BackgroundTaskManager _backgroundTaskManager;
+    private readonly PagerOptions _pagerOptions;
+    private readonly INotifier _notifier;
+    private readonly IShapeFactory _shapeFactory;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public BackgroundTaskController(
+        IAuthorizationService authorizationService,
+        IEnumerable<IBackgroundTask> backgroundTasks,
+        BackgroundTaskManager backgroundTaskManager,
+        IOptions<PagerOptions> pagerOptions,
+        IShapeFactory shapeFactory,
+        IHtmlLocalizer<BackgroundTaskController> htmlLocalizer,
+        IStringLocalizer<BackgroundTaskController> stringLocalizer,
+        INotifier notifier)
+    {
+        _authorizationService = authorizationService;
+        _backgroundTasks = backgroundTasks;
+        _backgroundTaskManager = backgroundTaskManager;
+        _pagerOptions = pagerOptions.Value;
+        _notifier = notifier;
+        _shapeFactory = shapeFactory;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+    }
+
+    [Admin("BackgroundTasks", "BackgroundTasks")]
+    public async Task<IActionResult> Index(AdminIndexOptions options, PagerParameters pagerParameters)
     {
-        private const string _optionsSearch = $"{nameof(BackgroundTaskIndexViewModel.Options)}.{nameof(AdminIndexOptions.Search)}";
-        private const string _optionsStatus = $"{nameof(BackgroundTaskIndexViewModel.Options)}.{nameof(AdminIndexOptions.Status)}";
-
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IEnumerable<IBackgroundTask> _backgroundTasks;
-        private readonly BackgroundTaskManager _backgroundTaskManager;
-        private readonly PagerOptions _pagerOptions;
-        private readonly INotifier _notifier;
-        private readonly IShapeFactory _shapeFactory;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public BackgroundTaskController(
-            IAuthorizationService authorizationService,
-            IEnumerable<IBackgroundTask> backgroundTasks,
-            BackgroundTaskManager backgroundTaskManager,
-            IOptions<PagerOptions> pagerOptions,
-            IShapeFactory shapeFactory,
-            IHtmlLocalizer<BackgroundTaskController> htmlLocalizer,
-            IStringLocalizer<BackgroundTaskController> stringLocalizer,
-            INotifier notifier)
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageBackgroundTasks))
         {
-            _authorizationService = authorizationService;
-            _backgroundTasks = backgroundTasks;
-            _backgroundTaskManager = backgroundTaskManager;
-            _pagerOptions = pagerOptions.Value;
-            _notifier = notifier;
-            _shapeFactory = shapeFactory;
-            S = stringLocalizer;
-            H = htmlLocalizer;
+            return Forbid();
         }
 
-        [Admin("BackgroundTasks", "BackgroundTasks")]
-        public async Task<IActionResult> Index(AdminIndexOptions options, PagerParameters pagerParameters)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageBackgroundTasks))
-            {
-                return Forbid();
-            }
+        var document = await _backgroundTaskManager.GetDocumentAsync();
 
-            var document = await _backgroundTaskManager.GetDocumentAsync();
+        var items = _backgroundTasks.Select(task =>
+        {
+            var defaultSettings = task.GetDefaultSettings();
 
-            var items = _backgroundTasks.Select(task =>
+            if (document.Settings.TryGetValue(task.GetTaskName(), out var settings))
             {
-                var defaultSettings = task.GetDefaultSettings();
-
-                if (document.Settings.TryGetValue(task.GetTaskName(), out var settings))
-                {
-                    return new BackgroundTaskEntry()
-                    {
-                        Name = defaultSettings.Name,
-                        Title = defaultSettings.Title,
-                        Description = settings.Description,
-                        Enable = settings.Enable,
-                    };
-                }
-
                 return new BackgroundTaskEntry()
                 {
                     Name = defaultSettings.Name,
                     Title = defaultSettings.Title,
-                    Description = defaultSettings.Description,
-                    Enable = defaultSettings.Enable,
+                    Description = settings.Description,
+                    Enable = settings.Enable,
                 };
-            });
-
-            if (!string.IsNullOrWhiteSpace(options.Search))
-            {
-                items = items.Where(entry => entry.Title != null && entry.Title.Contains(options.Search, StringComparison.OrdinalIgnoreCase)
-                    || (entry.Description != null && entry.Description.Contains(options.Search, StringComparison.OrdinalIgnoreCase))
-                );
             }
 
-            if (string.Equals(options.Status, "enabled", StringComparison.OrdinalIgnoreCase))
+            return new BackgroundTaskEntry()
             {
-                items = items.Where(entry => entry.Enable);
-            }
-            else if (string.Equals(options.Status, "disabled", StringComparison.OrdinalIgnoreCase))
-            {
-                items = items.Where(entry => !entry.Enable);
-            }
-
-            options.Statuses =
-            [
-                new SelectListItem(S["Enabled"], "enabled"),
-                new SelectListItem(S["Disabled"], "disabled")
-            ];
+                Name = defaultSettings.Name,
+                Title = defaultSettings.Title,
+                Description = defaultSettings.Description,
+                Enable = defaultSettings.Enable,
+            };
+        });
 
-            var taskItems = items.ToList();
-            var routeData = new RouteData();
+        if (!string.IsNullOrWhiteSpace(options.Search))
+        {
+            items = items.Where(entry => entry.Title != null && entry.Title.Contains(options.Search, StringComparison.OrdinalIgnoreCase)
+                || (entry.Description != null && entry.Description.Contains(options.Search, StringComparison.OrdinalIgnoreCase))
+            );
+        }
 
-            if (!string.IsNullOrEmpty(options.Search))
-            {
-                routeData.Values.TryAdd(_optionsSearch, options.Search);
-            }
+        if (string.Equals(options.Status, "enabled", StringComparison.OrdinalIgnoreCase))
+        {
+            items = items.Where(entry => entry.Enable);
+        }
+        else if (string.Equals(options.Status, "disabled", StringComparison.OrdinalIgnoreCase))
+        {
+            items = items.Where(entry => !entry.Enable);
+        }
 
-            if (!string.IsNullOrEmpty(options.Status))
-            {
-                routeData.Values.TryAdd(_optionsStatus, options.Status);
-            }
+        options.Statuses =
+        [
+            new SelectListItem(S["Enabled"], "enabled"),
+            new SelectListItem(S["Disabled"], "disabled")
+        ];
 
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
-            var pagerShape = await _shapeFactory.PagerAsync(pager, taskItems.Count, routeData);
+        var taskItems = items.ToList();
+        var routeData = new RouteData();
 
-            var model = new BackgroundTaskIndexViewModel
-            {
-                Tasks = taskItems.OrderBy(entry => entry.Title).Skip(pager.GetStartIndex()).Take(pager.PageSize).ToList(),
-                Pager = pagerShape,
-                Options = options,
-            };
+        if (!string.IsNullOrEmpty(options.Search))
+        {
+            routeData.Values.TryAdd(_optionsSearch, options.Search);
+        }
 
-            return View(model);
+        if (!string.IsNullOrEmpty(options.Status))
+        {
+            routeData.Values.TryAdd(_optionsStatus, options.Status);
         }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.Filter")]
-        public ActionResult IndexFilterPOST(BackgroundTaskIndexViewModel model)
-            => RedirectToAction(nameof(Index), new RouteValueDictionary
-            {
-                { _optionsSearch, model.Options.Search },
-                { _optionsStatus, model.Options.Status },
-            });
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+        var pagerShape = await _shapeFactory.PagerAsync(pager, taskItems.Count, routeData);
 
-        public async Task<IActionResult> Edit(string name)
+        var model = new BackgroundTaskIndexViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageBackgroundTasks))
-            {
-                return Forbid();
-            }
+            Tasks = taskItems.OrderBy(entry => entry.Title).Skip(pager.GetStartIndex()).Take(pager.PageSize).ToList(),
+            Pager = pagerShape,
+            Options = options,
+        };
 
-            var task = _backgroundTasks.GetTaskByName(name);
-            if (task == null)
-            {
-                return NotFound();
-            }
+        return View(model);
+    }
 
-            var document = await _backgroundTaskManager.GetDocumentAsync();
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.Filter")]
+    public ActionResult IndexFilterPOST(BackgroundTaskIndexViewModel model)
+        => RedirectToAction(nameof(Index), new RouteValueDictionary
+        {
+            { _optionsSearch, model.Options.Search },
+            { _optionsStatus, model.Options.Status },
+        });
 
-            var defaultSettings = task.GetDefaultSettings();
-            if (!document.Settings.TryGetValue(name, out var settings))
-            {
-                settings = defaultSettings;
-            }
+    public async Task<IActionResult> Edit(string name)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageBackgroundTasks))
+        {
+            return Forbid();
+        }
 
-            var model = new BackgroundTaskViewModel
-            {
-                Name = defaultSettings.Name,
-                Title = defaultSettings.Title,
-                DefaultSchedule = defaultSettings.Schedule,
-                Schedule = settings.Schedule,
-                Description = settings.Description,
-                LockTimeout = settings.LockTimeout,
-                LockExpiration = settings.LockExpiration,
-                UsePipeline = settings.UsePipeline,
-            };
+        var task = _backgroundTasks.GetTaskByName(name);
+        if (task == null)
+        {
+            return NotFound();
+        }
+
+        var document = await _backgroundTaskManager.GetDocumentAsync();
 
-            return View(model);
+        var defaultSettings = task.GetDefaultSettings();
+        if (!document.Settings.TryGetValue(name, out var settings))
+        {
+            settings = defaultSettings;
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Edit(BackgroundTaskViewModel model)
+        var model = new BackgroundTaskViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageBackgroundTasks))
-            {
-                return Forbid();
-            }
+            Name = defaultSettings.Name,
+            Title = defaultSettings.Title,
+            DefaultSchedule = defaultSettings.Schedule,
+            Schedule = settings.Schedule,
+            Description = settings.Description,
+            LockTimeout = settings.LockTimeout,
+            LockExpiration = settings.LockExpiration,
+            UsePipeline = settings.UsePipeline,
+        };
+
+        return View(model);
+    }
 
-            var task = _backgroundTasks.GetTaskByName(model.Name);
-            if (task == null)
-            {
-                return NotFound();
-            }
+    [HttpPost]
+    public async Task<IActionResult> Edit(BackgroundTaskViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageBackgroundTasks))
+        {
+            return Forbid();
+        }
 
-            var defaultSettings = task.GetDefaultSettings();
+        var task = _backgroundTasks.GetTaskByName(model.Name);
+        if (task == null)
+        {
+            return NotFound();
+        }
 
-            if (ModelState.IsValid)
+        var defaultSettings = task.GetDefaultSettings();
+
+        if (ModelState.IsValid)
+        {
+            var document = await _backgroundTaskManager.LoadDocumentAsync();
+            if (!document.Settings.TryGetValue(model.Name, out var settings))
             {
-                var document = await _backgroundTaskManager.LoadDocumentAsync();
-                if (!document.Settings.TryGetValue(model.Name, out var settings))
-                {
-                    settings = defaultSettings;
-                }
+                settings = defaultSettings;
+            }
 
-                settings.Title = defaultSettings.Title;
-                settings.Schedule = model.Schedule?.Trim();
-                settings.Description = model.Description;
-                settings.LockTimeout = model.LockTimeout;
-                settings.LockExpiration = model.LockExpiration;
-                settings.UsePipeline = model.UsePipeline;
+            settings.Title = defaultSettings.Title;
+            settings.Schedule = model.Schedule?.Trim();
+            settings.Description = model.Description;
+            settings.LockTimeout = model.LockTimeout;
+            settings.LockExpiration = model.LockExpiration;
+            settings.UsePipeline = model.UsePipeline;
 
-                await _backgroundTaskManager.UpdateAsync(model.Name, settings);
+            await _backgroundTaskManager.UpdateAsync(model.Name, settings);
 
-                await _notifier.SuccessAsync(H["The task has been updated."]);
+            await _notifier.SuccessAsync(H["The task has been updated."]);
 
-                return RedirectToAction(nameof(Index));
-            }
+            return RedirectToAction(nameof(Index));
+        }
+
+        model.Title = defaultSettings.Title;
+        model.DefaultSchedule = defaultSettings.Schedule;
 
-            model.Title = defaultSettings.Title;
-            model.DefaultSchedule = defaultSettings.Schedule;
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost]
+    public async Task<IActionResult> Enable(string name)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageBackgroundTasks))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Enable(string name)
+        var task = _backgroundTasks.GetTaskByName(name);
+        if (task == null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageBackgroundTasks))
-            {
-                return Forbid();
-            }
+            return NotFound();
+        }
 
-            var task = _backgroundTasks.GetTaskByName(name);
-            if (task == null)
-            {
-                return NotFound();
-            }
+        var document = await _backgroundTaskManager.LoadDocumentAsync();
+        if (!document.Settings.TryGetValue(name, out var settings))
+        {
+            settings = task.GetDefaultSettings();
+        }
 
-            var document = await _backgroundTaskManager.LoadDocumentAsync();
-            if (!document.Settings.TryGetValue(name, out var settings))
-            {
-                settings = task.GetDefaultSettings();
-            }
+        settings.Enable = true;
 
-            settings.Enable = true;
+        await _backgroundTaskManager.UpdateAsync(name, settings);
 
-            await _backgroundTaskManager.UpdateAsync(name, settings);
+        await _notifier.SuccessAsync(H["The task has been enabled."]);
 
-            await _notifier.SuccessAsync(H["The task has been enabled."]);
+        return RedirectToAction(nameof(Index));
+    }
 
-            return RedirectToAction(nameof(Index));
+    [HttpPost]
+    public async Task<IActionResult> Disable(string name)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageBackgroundTasks))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Disable(string name)
+        var task = _backgroundTasks.GetTaskByName(name);
+        if (task == null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageBackgroundTasks))
-            {
-                return Forbid();
-            }
-
-            var task = _backgroundTasks.GetTaskByName(name);
-            if (task == null)
-            {
-                return NotFound();
-            }
+            return NotFound();
+        }
 
-            var document = await _backgroundTaskManager.LoadDocumentAsync();
-            if (!document.Settings.TryGetValue(name, out var settings))
-            {
-                settings = task.GetDefaultSettings();
-            }
+        var document = await _backgroundTaskManager.LoadDocumentAsync();
+        if (!document.Settings.TryGetValue(name, out var settings))
+        {
+            settings = task.GetDefaultSettings();
+        }
 
-            settings.Enable = false;
+        settings.Enable = false;
 
-            await _backgroundTaskManager.UpdateAsync(name, settings);
+        await _backgroundTaskManager.UpdateAsync(name, settings);
 
-            await _notifier.SuccessAsync(H["The task has been disabled."]);
+        await _notifier.SuccessAsync(H["The task has been disabled."]);
 
-            return RedirectToAction(nameof(Index));
-        }
+        return RedirectToAction(nameof(Index));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Services/AlwaysHasChangedToken.cs b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Services/AlwaysHasChangedToken.cs
index 72a683b5ade..f94da61df31 100644
--- a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Services/AlwaysHasChangedToken.cs
+++ b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Services/AlwaysHasChangedToken.cs
@@ -1,39 +1,38 @@
 using System;
 using Microsoft.Extensions.Primitives;
 
-namespace OrchardCore.BackgroundTasks.Services
+namespace OrchardCore.BackgroundTasks.Services;
+
+/// <summary>
+/// An empty change token that is always in the changed state but without raising any change callbacks.
+/// </summary>
+internal sealed class AlwaysHasChangedToken : IChangeToken
 {
-    /// <summary>
-    /// An empty change token that is always in the changed state but without raising any change callbacks.
-    /// </summary>
-    internal sealed class AlwaysHasChangedToken : IChangeToken
-    {
-        public static AlwaysHasChangedToken Singleton { get; } = new AlwaysHasChangedToken();
+    public static AlwaysHasChangedToken Singleton { get; } = new AlwaysHasChangedToken();
 
-        private AlwaysHasChangedToken()
-        {
-        }
+    private AlwaysHasChangedToken()
+    {
+    }
 
-        public bool HasChanged => true;
+    public bool HasChanged => true;
 
-        public bool ActiveChangeCallbacks => false;
+    public bool ActiveChangeCallbacks => false;
 
-        public IDisposable RegisterChangeCallback(Action<object> callback, object state)
-        {
-            return EmptyDisposable.Instance;
-        }
+    public IDisposable RegisterChangeCallback(Action<object> callback, object state)
+    {
+        return EmptyDisposable.Instance;
     }
+}
 
-    internal sealed class EmptyDisposable : IDisposable
-    {
-        public static EmptyDisposable Instance { get; } = new EmptyDisposable();
+internal sealed class EmptyDisposable : IDisposable
+{
+    public static EmptyDisposable Instance { get; } = new EmptyDisposable();
 
-        private EmptyDisposable()
-        {
-        }
+    private EmptyDisposable()
+    {
+    }
 
-        public void Dispose()
-        {
-        }
+    public void Dispose()
+    {
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Services/BackgroundTaskManager.cs b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Services/BackgroundTaskManager.cs
index ef882efbe39..1519cdfb23a 100644
--- a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Services/BackgroundTaskManager.cs
+++ b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Services/BackgroundTaskManager.cs
@@ -3,45 +3,44 @@
 using OrchardCore.Documents;
 using OrchardCore.Environment.Cache;
 
-namespace OrchardCore.BackgroundTasks.Services
+namespace OrchardCore.BackgroundTasks.Services;
+
+public class BackgroundTaskManager
 {
-    public class BackgroundTaskManager
+    private readonly IDocumentManager<BackgroundTaskDocument> _documentManager;
+    private readonly ISignal _signal;
+
+    public BackgroundTaskManager(IDocumentManager<BackgroundTaskDocument> documentManager, ISignal signal)
+    {
+        _documentManager = documentManager;
+        _signal = signal;
+    }
+
+    /// <summary>
+    /// Loads the background task document from the store for updating and that should not be cached.
+    /// </summary>
+    public Task<BackgroundTaskDocument> LoadDocumentAsync() => _documentManager.GetOrCreateMutableAsync();
+
+    /// <summary>
+    /// Gets the background task document from the cache for sharing and that should not be updated.
+    /// </summary>
+    public Task<BackgroundTaskDocument> GetDocumentAsync() => _documentManager.GetOrCreateImmutableAsync();
+
+    public async Task RemoveAsync(string name)
+    {
+        var document = await LoadDocumentAsync();
+        document.Settings.Remove(name);
+
+        await _documentManager.UpdateAsync(document);
+        _signal.DeferredSignalToken(nameof(BackgroundTaskSettings));
+    }
+
+    public async Task UpdateAsync(string name, BackgroundTaskSettings settings)
     {
-        private readonly IDocumentManager<BackgroundTaskDocument> _documentManager;
-        private readonly ISignal _signal;
-
-        public BackgroundTaskManager(IDocumentManager<BackgroundTaskDocument> documentManager, ISignal signal)
-        {
-            _documentManager = documentManager;
-            _signal = signal;
-        }
-
-        /// <summary>
-        /// Loads the background task document from the store for updating and that should not be cached.
-        /// </summary>
-        public Task<BackgroundTaskDocument> LoadDocumentAsync() => _documentManager.GetOrCreateMutableAsync();
-
-        /// <summary>
-        /// Gets the background task document from the cache for sharing and that should not be updated.
-        /// </summary>
-        public Task<BackgroundTaskDocument> GetDocumentAsync() => _documentManager.GetOrCreateImmutableAsync();
-
-        public async Task RemoveAsync(string name)
-        {
-            var document = await LoadDocumentAsync();
-            document.Settings.Remove(name);
-
-            await _documentManager.UpdateAsync(document);
-            _signal.DeferredSignalToken(nameof(BackgroundTaskSettings));
-        }
-
-        public async Task UpdateAsync(string name, BackgroundTaskSettings settings)
-        {
-            var document = await LoadDocumentAsync();
-            document.Settings[name] = settings;
-
-            await _documentManager.UpdateAsync(document);
-            _signal.DeferredSignalToken(nameof(BackgroundTaskSettings));
-        }
+        var document = await LoadDocumentAsync();
+        document.Settings[name] = settings;
+
+        await _documentManager.UpdateAsync(document);
+        _signal.DeferredSignalToken(nameof(BackgroundTaskSettings));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Services/BackgroundTaskSettingsProvider.cs b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Services/BackgroundTaskSettingsProvider.cs
index 453965a7224..91056a8e555 100644
--- a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Services/BackgroundTaskSettingsProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Services/BackgroundTaskSettingsProvider.cs
@@ -2,31 +2,30 @@
 using Microsoft.Extensions.Primitives;
 using OrchardCore.Environment.Cache;
 
-namespace OrchardCore.BackgroundTasks.Services
+namespace OrchardCore.BackgroundTasks.Services;
+
+public class BackgroundTaskSettingsProvider : IBackgroundTaskSettingsProvider
 {
-    public class BackgroundTaskSettingsProvider : IBackgroundTaskSettingsProvider
+    private readonly BackgroundTaskManager _backgroundTaskManager;
+    private readonly ISignal _signal;
+
+    public BackgroundTaskSettingsProvider(BackgroundTaskManager backgroundTaskManager, ISignal signal)
     {
-        private readonly BackgroundTaskManager _backgroundTaskManager;
-        private readonly ISignal _signal;
+        _backgroundTaskManager = backgroundTaskManager;
+        _signal = signal;
+    }
 
-        public BackgroundTaskSettingsProvider(BackgroundTaskManager backgroundTaskManager, ISignal signal)
-        {
-            _backgroundTaskManager = backgroundTaskManager;
-            _signal = signal;
-        }
+    public IChangeToken ChangeToken => _signal.GetToken(nameof(BackgroundTaskSettings));
 
-        public IChangeToken ChangeToken => _signal.GetToken(nameof(BackgroundTaskSettings));
+    public async Task<BackgroundTaskSettings> GetSettingsAsync(IBackgroundTask task)
+    {
+        var document = await _backgroundTaskManager.GetDocumentAsync();
 
-        public async Task<BackgroundTaskSettings> GetSettingsAsync(IBackgroundTask task)
+        if (document.Settings.TryGetValue(task.GetTaskName(), out var settings))
         {
-            var document = await _backgroundTaskManager.GetDocumentAsync();
-
-            if (document.Settings.TryGetValue(task.GetTaskName(), out var settings))
-            {
-                return settings;
-            }
-
-            return null;
+            return settings;
         }
+
+        return null;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Startup.cs b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Startup.cs
index 79f7a08dee7..65705a7a8ee 100644
--- a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Startup.cs
@@ -4,17 +4,16 @@
 using OrchardCore.Navigation;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.BackgroundTasks
+namespace OrchardCore.BackgroundTasks;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services
-                .AddScoped<BackgroundTaskManager>()
-                .AddScoped<IPermissionProvider, Permissions>()
-                .AddScoped<INavigationProvider, AdminMenu>()
-                .AddScoped<IBackgroundTaskSettingsProvider, BackgroundTaskSettingsProvider>();
-        }
+        services
+            .AddScoped<BackgroundTaskManager>()
+            .AddScoped<IPermissionProvider, Permissions>()
+            .AddScoped<INavigationProvider, AdminMenu>()
+            .AddScoped<IBackgroundTaskSettingsProvider, BackgroundTaskSettingsProvider>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/ViewModels/BackgroundTaskIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/ViewModels/BackgroundTaskIndexViewModel.cs
index f2e5d52b5ee..1a4cc893358 100644
--- a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/ViewModels/BackgroundTaskIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/ViewModels/BackgroundTaskIndexViewModel.cs
@@ -1,27 +1,26 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.BackgroundTasks.ViewModels
+namespace OrchardCore.BackgroundTasks.ViewModels;
+
+public class BackgroundTaskIndexViewModel
 {
-    public class BackgroundTaskIndexViewModel
-    {
-        public AdminIndexOptions Options { get; set; }
+    public AdminIndexOptions Options { get; set; }
 
-        [BindNever]
-        public IList<BackgroundTaskEntry> Tasks { get; set; }
+    [BindNever]
+    public IList<BackgroundTaskEntry> Tasks { get; set; }
 
-        [BindNever]
-        public dynamic Pager { get; set; }
-    }
+    [BindNever]
+    public dynamic Pager { get; set; }
+}
 
-    public class BackgroundTaskEntry
-    {
-        public string Name { get; set; }
+public class BackgroundTaskEntry
+{
+    public string Name { get; set; }
 
-        public string Title { get; set; }
+    public string Title { get; set; }
 
-        public bool Enable { get; set; }
+    public bool Enable { get; set; }
 
-        public string Description { get; set; }
-    }
+    public string Description { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/ViewModels/BackgroundTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/ViewModels/BackgroundTaskViewModel.cs
index 2250d3e5be9..bfb45d276af 100644
--- a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/ViewModels/BackgroundTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/ViewModels/BackgroundTaskViewModel.cs
@@ -1,28 +1,27 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.BackgroundTasks.ViewModels
+namespace OrchardCore.BackgroundTasks.ViewModels;
+
+public class BackgroundTaskViewModel
 {
-    public class BackgroundTaskViewModel
-    {
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        public string Title { get; set; }
+    public string Title { get; set; }
 
-        [BindNever]
-        public string DefaultSchedule { get; set; }
+    [BindNever]
+    public string DefaultSchedule { get; set; }
 
-        public string Schedule { get; set; }
+    public string Schedule { get; set; }
 
-        public string Description { get; set; }
+    public string Description { get; set; }
 
-        public bool Enable { get; set; } = true;
+    public bool Enable { get; set; } = true;
 
-        public int LockTimeout { get; set; }
+    public int LockTimeout { get; set; }
 
-        public int LockExpiration { get; set; }
+    public int LockExpiration { get; set; }
 
-        public bool UsePipeline { get; set; }
+    public bool UsePipeline { get; set; }
 
-        public bool IsAtomic => LockTimeout > 0 && LockExpiration > 0;
-    }
+    public bool IsAtomic => LockTimeout > 0 && LockExpiration > 0;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Controllers/ContentPickerAdminController.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Controllers/ContentPickerAdminController.cs
index 9f4fb5fe130..557f7618eab 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Controllers/ContentPickerAdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Controllers/ContentPickerAdminController.cs
@@ -13,97 +13,96 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Contents;
 
-namespace OrchardCore.ContentFields.Controllers
+namespace OrchardCore.ContentFields.Controllers;
+
+[Admin]
+public class ContentPickerAdminController : Controller
 {
-    [Admin]
-    public class ContentPickerAdminController : Controller
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentManager _contentManager;
+    private readonly IEnumerable<IContentPickerResultProvider> _resultProviders;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+
+    public ContentPickerAdminController(
+        IContentDefinitionManager contentDefinitionManager,
+        IContentManager contentManager,
+        IEnumerable<IContentPickerResultProvider> resultProviders,
+        IAuthorizationService authorizationService,
+        IHttpContextAccessor httpContextAccessor)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+        _contentManager = contentManager;
+        _resultProviders = resultProviders;
+        _authorizationService = authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+    }
+
+    [Admin("ContentFields/SearchContentItems", "ContentPicker")]
+    public async Task<IActionResult> SearchContentItems(string part, string field, string query)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IContentManager _contentManager;
-        private readonly IEnumerable<IContentPickerResultProvider> _resultProviders;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-
-        public ContentPickerAdminController(
-            IContentDefinitionManager contentDefinitionManager,
-            IContentManager contentManager,
-            IEnumerable<IContentPickerResultProvider> resultProviders,
-            IAuthorizationService authorizationService,
-            IHttpContextAccessor httpContextAccessor)
+        if (string.IsNullOrWhiteSpace(part) || string.IsNullOrWhiteSpace(field))
         {
-            _contentDefinitionManager = contentDefinitionManager;
-            _contentManager = contentManager;
-            _resultProviders = resultProviders;
-            _authorizationService = authorizationService;
-            _httpContextAccessor = httpContextAccessor;
+            return BadRequest("Part and field are required parameters");
         }
 
-        [Admin("ContentFields/SearchContentItems", "ContentPicker")]
-        public async Task<IActionResult> SearchContentItems(string part, string field, string query)
+        var partFieldDefinition = (await _contentDefinitionManager.GetPartDefinitionAsync(part))?.Fields
+            .FirstOrDefault(f => f.Name == field);
+
+        var fieldSettings = partFieldDefinition?.GetSettings<ContentPickerFieldSettings>();
+        if (fieldSettings == null)
         {
-            if (string.IsNullOrWhiteSpace(part) || string.IsNullOrWhiteSpace(field))
-            {
-                return BadRequest("Part and field are required parameters");
-            }
+            return BadRequest("Unable to find field definition");
+        }
 
-            var partFieldDefinition = (await _contentDefinitionManager.GetPartDefinitionAsync(part))?.Fields
-                .FirstOrDefault(f => f.Name == field);
+        var editor = partFieldDefinition.Editor() ?? "Default";
 
-            var fieldSettings = partFieldDefinition?.GetSettings<ContentPickerFieldSettings>();
-            if (fieldSettings == null)
-            {
-                return BadRequest("Unable to find field definition");
-            }
+        var resultProvider = _resultProviders.FirstOrDefault(p => p.Name == editor)
+            ?? _resultProviders.FirstOrDefault(p => p.Name == "Default");
 
-            var editor = partFieldDefinition.Editor() ?? "Default";
+        if (resultProvider == null)
+        {
+            return new ObjectResult(new List<ContentPickerResult>());
+        }
 
-            var resultProvider = _resultProviders.FirstOrDefault(p => p.Name == editor)
-                ?? _resultProviders.FirstOrDefault(p => p.Name == "Default");
+        var contentTypes = fieldSettings.DisplayedContentTypes;
 
-            if (resultProvider == null)
-            {
-                return new ObjectResult(new List<ContentPickerResult>());
-            }
+        if (fieldSettings.DisplayedStereotypes != null && fieldSettings.DisplayedStereotypes.Length > 0)
+        {
+            contentTypes = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
+                .Where(contentType =>
+                {
+                    var hasStereotype = contentType.TryGetStereotype(out var stereotype);
 
-            var contentTypes = fieldSettings.DisplayedContentTypes;
+                    return hasStereotype && fieldSettings.DisplayedStereotypes.Contains(stereotype);
+                }).Select(contentType => contentType.Name)
+                .ToArray();
+        }
 
-            if (fieldSettings.DisplayedStereotypes != null && fieldSettings.DisplayedStereotypes.Length > 0)
-            {
-                contentTypes = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
-                    .Where(contentType =>
-                    {
-                        var hasStereotype = contentType.TryGetStereotype(out var stereotype);
+        var results = await resultProvider.Search(new ContentPickerSearchContext
+        {
+            Query = query,
+            DisplayAllContentTypes = fieldSettings.DisplayAllContentTypes,
+            ContentTypes = contentTypes,
+            PartFieldDefinition = partFieldDefinition,
+        });
 
-                        return hasStereotype && fieldSettings.DisplayedStereotypes.Contains(stereotype);
-                    }).Select(contentType => contentType.Name)
-                    .ToArray();
-            }
+        var contentItems = await _contentManager
+            .GetAsync(results.Select(r => r.ContentItemId));
 
-            var results = await resultProvider.Search(new ContentPickerSearchContext
+        var selectedItems = new List<VueMultiselectItemViewModel>();
+        var user = _httpContextAccessor.HttpContext?.User;
+        foreach (var contentItem in contentItems)
+        {
+            selectedItems.Add(new VueMultiselectItemViewModel()
             {
-                Query = query,
-                DisplayAllContentTypes = fieldSettings.DisplayAllContentTypes,
-                ContentTypes = contentTypes,
-                PartFieldDefinition = partFieldDefinition,
+                Id = contentItem.ContentItemId,
+                DisplayText = contentItem.ToString(),
+                HasPublished = contentItem.IsPublished(),
+                IsViewable = await _authorizationService.AuthorizeAsync(user, CommonPermissions.EditContent, contentItem)
             });
-
-            var contentItems = await _contentManager
-                .GetAsync(results.Select(r => r.ContentItemId));
-
-            var selectedItems = new List<VueMultiselectItemViewModel>();
-            var user = _httpContextAccessor.HttpContext?.User;
-            foreach (var contentItem in contentItems)
-            {
-                selectedItems.Add(new VueMultiselectItemViewModel()
-                {
-                    Id = contentItem.ContentItemId,
-                    DisplayText = contentItem.ToString(),
-                    HasPublished = contentItem.IsPublished(),
-                    IsViewable = await _authorizationService.AuthorizeAsync(user, CommonPermissions.EditContent, contentItem)
-                });
-            }
-
-            return new ObjectResult(selectedItems);
         }
+
+        return new ObjectResult(selectedItems);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Controllers/LocalizationSetContentPickerAdminController.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Controllers/LocalizationSetContentPickerAdminController.cs
index 8e0f2101a2b..6650901c0af 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Controllers/LocalizationSetContentPickerAdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Controllers/LocalizationSetContentPickerAdminController.cs
@@ -16,82 +16,81 @@
 using YesSql.Services;
 using IHttpContextAccessor = Microsoft.AspNetCore.Http.IHttpContextAccessor;
 
-namespace OrchardCore.ContentFields.Controllers
+namespace OrchardCore.ContentFields.Controllers;
+
+[RequireFeatures("OrchardCore.ContentLocalization")]
+[Admin]
+public class LocalizationSetContentPickerAdminController : Controller
 {
-    [RequireFeatures("OrchardCore.ContentLocalization")]
-    [Admin]
-    public class LocalizationSetContentPickerAdminController : Controller
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentLocalizationManager _contentLocalizationManager;
+    private readonly IContentManager _contentManager;
+    private readonly ISession _session;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+
+    public LocalizationSetContentPickerAdminController(
+        IContentDefinitionManager contentDefinitionManager,
+        IContentLocalizationManager contentLocalizationManager,
+        IContentManager contentManager,
+        ISession session,
+        IAuthorizationService authorizationService,
+        IHttpContextAccessor httpContextAccessor)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IContentLocalizationManager _contentLocalizationManager;
-        private readonly IContentManager _contentManager;
-        private readonly ISession _session;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
+        _contentDefinitionManager = contentDefinitionManager;
+        _contentLocalizationManager = contentLocalizationManager;
+        _contentManager = contentManager;
+        _session = session;
+        _authorizationService = authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        public LocalizationSetContentPickerAdminController(
-            IContentDefinitionManager contentDefinitionManager,
-            IContentLocalizationManager contentLocalizationManager,
-            IContentManager contentManager,
-            ISession session,
-            IAuthorizationService authorizationService,
-            IHttpContextAccessor httpContextAccessor)
+    [HttpGet]
+    [Admin("ContentFields/SearchLocalizationSets", "SearchLocalizationSets")]
+    public async Task<IActionResult> SearchLocalizationSets(string part, string field, string query)
+    {
+        if (string.IsNullOrWhiteSpace(part) || string.IsNullOrWhiteSpace(field))
         {
-            _contentDefinitionManager = contentDefinitionManager;
-            _contentLocalizationManager = contentLocalizationManager;
-            _contentManager = contentManager;
-            _session = session;
-            _authorizationService = authorizationService;
-            _httpContextAccessor = httpContextAccessor;
+            return BadRequest("Part and field are required parameters");
         }
 
-        [HttpGet]
-        [Admin("ContentFields/SearchLocalizationSets", "SearchLocalizationSets")]
-        public async Task<IActionResult> SearchLocalizationSets(string part, string field, string query)
-        {
-            if (string.IsNullOrWhiteSpace(part) || string.IsNullOrWhiteSpace(field))
-            {
-                return BadRequest("Part and field are required parameters");
-            }
-
-            var partFieldDefinition = (await _contentDefinitionManager.GetPartDefinitionAsync(part))?.Fields
-                .FirstOrDefault(f => f.Name == field);
+        var partFieldDefinition = (await _contentDefinitionManager.GetPartDefinitionAsync(part))?.Fields
+            .FirstOrDefault(f => f.Name == field);
 
-            var fieldSettings = partFieldDefinition?.GetSettings<LocalizationSetContentPickerFieldSettings>();
-            if (fieldSettings == null)
-            {
-                return BadRequest("Unable to find field definition");
-            }
+        var fieldSettings = partFieldDefinition?.GetSettings<LocalizationSetContentPickerFieldSettings>();
+        if (fieldSettings == null)
+        {
+            return BadRequest("Unable to find field definition");
+        }
 
-            var dbQuery = _session.Query<ContentItem, ContentItemIndex>()
-              .With<ContentItemIndex>(x => x.ContentType.IsIn(fieldSettings.DisplayedContentTypes) && x.Latest);
+        var dbQuery = _session.Query<ContentItem, ContentItemIndex>()
+          .With<ContentItemIndex>(x => x.ContentType.IsIn(fieldSettings.DisplayedContentTypes) && x.Latest);
 
-            if (!string.IsNullOrEmpty(query))
-            {
-                dbQuery.With<ContentItemIndex>(x => x.DisplayText.Contains(query) || x.ContentType.Contains(query));
-            }
+        if (!string.IsNullOrEmpty(query))
+        {
+            dbQuery.With<ContentItemIndex>(x => x.DisplayText.Contains(query) || x.ContentType.Contains(query));
+        }
 
-            var contentItems = await dbQuery.Take(40).ListAsync();
+        var contentItems = await dbQuery.Take(40).ListAsync();
 
-            // if 2 search results have the same set, select one based on the current culture
-            var cleanedContentItems = await _contentLocalizationManager.DeduplicateContentItemsAsync(contentItems);
+        // if 2 search results have the same set, select one based on the current culture
+        var cleanedContentItems = await _contentLocalizationManager.DeduplicateContentItemsAsync(contentItems);
 
-            var results = new List<VueMultiselectItemViewModel>();
+        var results = new List<VueMultiselectItemViewModel>();
 
-            foreach (var contentItem in cleanedContentItems)
+        foreach (var contentItem in cleanedContentItems)
+        {
+            if (await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.ViewContent, contentItem))
             {
-                if (await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.ViewContent, contentItem))
+                results.Add(new VueMultiselectItemViewModel
                 {
-                    results.Add(new VueMultiselectItemViewModel
-                    {
-                        Id = contentItem.Key, // localization set
-                        DisplayText = contentItem.Value.ToString(),
-                        HasPublished = await _contentManager.HasPublishedVersionAsync(contentItem.Value)
-                    });
-                }
+                    Id = contentItem.Key, // localization set
+                    DisplayText = contentItem.Value.ToString(),
+                    HasPublished = await _contentManager.HasPublishedVersionAsync(contentItem.Value)
+                });
             }
-
-            return new ObjectResult(results);
         }
+
+        return new ObjectResult(results);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Controllers/UserPickerAdminController.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Controllers/UserPickerAdminController.cs
index 4107e4e3246..834339147a9 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Controllers/UserPickerAdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Controllers/UserPickerAdminController.cs
@@ -13,74 +13,73 @@
 using OrchardCore.Contents;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentFields.Controllers
+namespace OrchardCore.ContentFields.Controllers;
+
+[RequireFeatures(OrchardCore.Users.UserConstants.Features.Users)]
+[Admin]
+public class UserPickerAdminController : Controller
 {
-    [RequireFeatures(OrchardCore.Users.UserConstants.Features.Users)]
-    [Admin]
-    public class UserPickerAdminController : Controller
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentManager _contentManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IEnumerable<IUserPickerResultProvider> _resultProviders;
+
+    public UserPickerAdminController(
+        IContentDefinitionManager contentDefinitionManager,
+        IContentManager contentManager,
+        IAuthorizationService authorizationService,
+        IEnumerable<IUserPickerResultProvider> resultProviders
+        )
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IContentManager _contentManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IEnumerable<IUserPickerResultProvider> _resultProviders;
+        _contentDefinitionManager = contentDefinitionManager;
+        _contentManager = contentManager;
+        _authorizationService = authorizationService;
+        _resultProviders = resultProviders;
+    }
 
-        public UserPickerAdminController(
-            IContentDefinitionManager contentDefinitionManager,
-            IContentManager contentManager,
-            IAuthorizationService authorizationService,
-            IEnumerable<IUserPickerResultProvider> resultProviders
-            )
+    [Admin("ContentFields/SearchUsers", "SearchUsers")]
+    public async Task<IActionResult> SearchUsers(string part, string field, string contentType, string query)
+    {
+        if (string.IsNullOrWhiteSpace(part) || string.IsNullOrWhiteSpace(field) || string.IsNullOrWhiteSpace(contentType))
         {
-            _contentDefinitionManager = contentDefinitionManager;
-            _contentManager = contentManager;
-            _authorizationService = authorizationService;
-            _resultProviders = resultProviders;
+            return BadRequest("Part, field and contentType are required parameters");
         }
 
-        [Admin("ContentFields/SearchUsers", "SearchUsers")]
-        public async Task<IActionResult> SearchUsers(string part, string field, string contentType, string query)
-        {
-            if (string.IsNullOrWhiteSpace(part) || string.IsNullOrWhiteSpace(field) || string.IsNullOrWhiteSpace(contentType))
-            {
-                return BadRequest("Part, field and contentType are required parameters");
-            }
-
-            var contentItem = await _contentManager.NewAsync(contentType);
-            contentItem.Owner = User.FindFirstValue(ClaimTypes.NameIdentifier);
+        var contentItem = await _contentManager.NewAsync(contentType);
+        contentItem.Owner = User.FindFirstValue(ClaimTypes.NameIdentifier);
 
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditContent, contentItem))
-            {
-                return Forbid();
-            }
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditContent, contentItem))
+        {
+            return Forbid();
+        }
 
-            var partFieldDefinition = (await _contentDefinitionManager.GetPartDefinitionAsync(part))?.Fields
-                .FirstOrDefault(f => f.Name == field);
+        var partFieldDefinition = (await _contentDefinitionManager.GetPartDefinitionAsync(part))?.Fields
+            .FirstOrDefault(f => f.Name == field);
 
-            var fieldSettings = partFieldDefinition?.GetSettings<UserPickerFieldSettings>();
-            if (fieldSettings == null)
-            {
-                return BadRequest("Unable to find field definition");
-            }
+        var fieldSettings = partFieldDefinition?.GetSettings<UserPickerFieldSettings>();
+        if (fieldSettings == null)
+        {
+            return BadRequest("Unable to find field definition");
+        }
 
-            var editor = partFieldDefinition.Editor() ?? "Default";
+        var editor = partFieldDefinition.Editor() ?? "Default";
 
-            var resultProvider = _resultProviders.FirstOrDefault(p => p.Name == editor)
-                ?? _resultProviders.FirstOrDefault(p => p.Name == "Default");
+        var resultProvider = _resultProviders.FirstOrDefault(p => p.Name == editor)
+            ?? _resultProviders.FirstOrDefault(p => p.Name == "Default");
 
-            if (resultProvider == null)
-            {
-                return new ObjectResult(new List<UserPickerResult>());
-            }
+        if (resultProvider == null)
+        {
+            return new ObjectResult(new List<UserPickerResult>());
+        }
 
-            var results = await resultProvider.Search(new UserPickerSearchContext
-            {
-                Query = query,
-                DisplayAllUsers = fieldSettings.DisplayAllUsers,
-                Roles = fieldSettings.DisplayedRoles,
-                PartFieldDefinition = partFieldDefinition
-            });
+        var results = await resultProvider.Search(new UserPickerSearchContext
+        {
+            Query = query,
+            DisplayAllUsers = fieldSettings.DisplayAllUsers,
+            Roles = fieldSettings.DisplayedRoles,
+            PartFieldDefinition = partFieldDefinition
+        });
 
-            return new ObjectResult(results.Select(r => new VueMultiselectUserViewModel() { Id = r.UserId, DisplayText = r.DisplayText, IsEnabled = r.IsEnabled }));
-        }
+        return new ObjectResult(results.Select(r => new VueMultiselectUserViewModel() { Id = r.UserId, DisplayText = r.DisplayText, IsEnabled = r.IsEnabled }));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/BooleanFieldDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/BooleanFieldDisplayDriver.cs
index b7459fa82f0..686d7e923f7 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/BooleanFieldDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/BooleanFieldDisplayDriver.cs
@@ -7,40 +7,39 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentFields.Drivers
+namespace OrchardCore.ContentFields.Drivers;
+
+public sealed class BooleanFieldDisplayDriver : ContentFieldDisplayDriver<BooleanField>
 {
-    public sealed class BooleanFieldDisplayDriver : ContentFieldDisplayDriver<BooleanField>
+    public override IDisplayResult Display(BooleanField field, BuildFieldDisplayContext context)
     {
-        public override IDisplayResult Display(BooleanField field, BuildFieldDisplayContext context)
+        return Initialize<DisplayBooleanFieldViewModel>(GetDisplayShapeType(context), model =>
         {
-            return Initialize<DisplayBooleanFieldViewModel>(GetDisplayShapeType(context), model =>
-            {
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            })
-            .Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        })
+        .Location("Detail", "Content")
+        .Location("Summary", "Content");
+    }
 
-        public override IDisplayResult Edit(BooleanField field, BuildFieldEditorContext context)
+    public override IDisplayResult Edit(BooleanField field, BuildFieldEditorContext context)
+    {
+        return Initialize<EditBooleanFieldViewModel>(GetEditorShapeType(context), model =>
         {
-            return Initialize<EditBooleanFieldViewModel>(GetEditorShapeType(context), model =>
-            {
-                model.Value = (context.IsNew == false) ?
-                    field.Value : context.PartFieldDefinition.GetSettings<BooleanFieldSettings>().DefaultValue;
+            model.Value = (context.IsNew == false) ?
+                field.Value : context.PartFieldDefinition.GetSettings<BooleanFieldSettings>().DefaultValue;
 
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            });
-        }
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        });
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(BooleanField field, UpdateFieldEditorContext context)
-        {
-            await context.Updater.TryUpdateModelAsync(field, Prefix, f => f.Value);
+    public override async Task<IDisplayResult> UpdateAsync(BooleanField field, UpdateFieldEditorContext context)
+    {
+        await context.Updater.TryUpdateModelAsync(field, Prefix, f => f.Value);
 
-            return Edit(field, context);
-        }
+        return Edit(field, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/ContentPickerFieldDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/ContentPickerFieldDisplayDriver.cs
index f2ff68536fe..0697696e050 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/ContentPickerFieldDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/ContentPickerFieldDisplayDriver.cs
@@ -21,112 +21,111 @@
 using OrchardCore.Localization;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.ContentFields.Drivers
+namespace OrchardCore.ContentFields.Drivers;
+
+public sealed class ContentPickerFieldDisplayDriver : ContentFieldDisplayDriver<ContentPickerField>
 {
-    public sealed class ContentPickerFieldDisplayDriver : ContentFieldDisplayDriver<ContentPickerField>
+    private readonly IContentManager _contentManager;
+    private readonly ILiquidTemplateManager _templateManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+
+    internal readonly IStringLocalizer S;
+
+    public ContentPickerFieldDisplayDriver(
+        IContentManager contentManager,
+        IStringLocalizer<ContentPickerFieldDisplayDriver> localizer,
+        ILiquidTemplateManager templateManager,
+        IAuthorizationService authorizationService,
+        IHttpContextAccessor httpContextAccessor)
     {
-        private readonly IContentManager _contentManager;
-        private readonly ILiquidTemplateManager _templateManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-
-        internal readonly IStringLocalizer S;
-
-        public ContentPickerFieldDisplayDriver(
-            IContentManager contentManager,
-            IStringLocalizer<ContentPickerFieldDisplayDriver> localizer,
-            ILiquidTemplateManager templateManager,
-            IAuthorizationService authorizationService,
-            IHttpContextAccessor httpContextAccessor)
-        {
-            _contentManager = contentManager;
-            S = localizer;
-            _templateManager = templateManager;
-            _authorizationService = authorizationService;
-            _httpContextAccessor = httpContextAccessor;
-        }
+        _contentManager = contentManager;
+        S = localizer;
+        _templateManager = templateManager;
+        _authorizationService = authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        public override IDisplayResult Display(ContentPickerField field, BuildFieldDisplayContext fieldDisplayContext)
+    public override IDisplayResult Display(ContentPickerField field, BuildFieldDisplayContext fieldDisplayContext)
+    {
+        return Initialize<DisplayContentPickerFieldViewModel>(GetDisplayShapeType(fieldDisplayContext), model =>
         {
-            return Initialize<DisplayContentPickerFieldViewModel>(GetDisplayShapeType(fieldDisplayContext), model =>
-            {
-                model.Field = field;
-                model.Part = fieldDisplayContext.ContentPart;
-                model.PartFieldDefinition = fieldDisplayContext.PartFieldDefinition;
-            })
-            .Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
+            model.Field = field;
+            model.Part = fieldDisplayContext.ContentPart;
+            model.PartFieldDefinition = fieldDisplayContext.PartFieldDefinition;
+        })
+        .Location("Detail", "Content")
+        .Location("Summary", "Content");
+    }
 
-        public override IDisplayResult Edit(ContentPickerField field, BuildFieldEditorContext context)
+    public override IDisplayResult Edit(ContentPickerField field, BuildFieldEditorContext context)
+    {
+        return Initialize<EditContentPickerFieldViewModel>(GetEditorShapeType(context), async model =>
         {
-            return Initialize<EditContentPickerFieldViewModel>(GetEditorShapeType(context), async model =>
-            {
-                model.ContentItemIds = string.Join(",", field.ContentItemIds);
+            model.ContentItemIds = string.Join(",", field.ContentItemIds);
 
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
 
-                model.SelectedItems = [];
-                var settings = context.PartFieldDefinition.GetSettings<ContentPickerFieldSettings>();
+            model.SelectedItems = [];
+            var settings = context.PartFieldDefinition.GetSettings<ContentPickerFieldSettings>();
 
-                foreach (var contentItemId in field.ContentItemIds)
-                {
-                    var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
+            foreach (var contentItemId in field.ContentItemIds)
+            {
+                var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
 
-                    if (contentItem == null)
-                    {
-                        continue;
-                    }
+                if (contentItem == null)
+                {
+                    continue;
+                }
 
-                    var cultureAspect = await _contentManager.PopulateAspectAsync(contentItem, new CultureAspect());
+                var cultureAspect = await _contentManager.PopulateAspectAsync(contentItem, new CultureAspect());
 
-                    using (CultureScope.Create(cultureAspect.Culture))
+                using (CultureScope.Create(cultureAspect.Culture))
+                {
+                    model.SelectedItems.Add(new VueMultiselectItemViewModel
                     {
-                        model.SelectedItems.Add(new VueMultiselectItemViewModel
-                        {
-                            Id = contentItemId,
-                            DisplayText = await _templateManager.RenderStringAsync(settings.TitlePattern, NullEncoder.Default, contentItem,
-                                new Dictionary<string, FluidValue>() { [nameof(ContentItem)] = new ObjectValue(contentItem) }),
-                            HasPublished = await _contentManager.HasPublishedVersionAsync(contentItem),
-                            IsEditable = await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext!.User, CommonPermissions.EditContent, contentItem),
-                            IsViewable = await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext!.User, CommonPermissions.ViewContent, contentItem)
-                        });
-                    }
-
+                        Id = contentItemId,
+                        DisplayText = await _templateManager.RenderStringAsync(settings.TitlePattern, NullEncoder.Default, contentItem,
+                            new Dictionary<string, FluidValue>() { [nameof(ContentItem)] = new ObjectValue(contentItem) }),
+                        HasPublished = await _contentManager.HasPublishedVersionAsync(contentItem),
+                        IsEditable = await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext!.User, CommonPermissions.EditContent, contentItem),
+                        IsViewable = await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext!.User, CommonPermissions.ViewContent, contentItem)
+                    });
                 }
-            });
-        }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPickerField field, UpdateFieldEditorContext context)
-        {
-            var viewModel = new EditContentPickerFieldViewModel();
+            }
+        });
+    }
 
-            var modelUpdated = await context.Updater.TryUpdateModelAsync(viewModel, Prefix, f => f.ContentItemIds);
+    public override async Task<IDisplayResult> UpdateAsync(ContentPickerField field, UpdateFieldEditorContext context)
+    {
+        var viewModel = new EditContentPickerFieldViewModel();
 
-            if (!modelUpdated)
-            {
-                return Edit(field, context);
-            }
+        var modelUpdated = await context.Updater.TryUpdateModelAsync(viewModel, Prefix, f => f.ContentItemIds);
 
-            field.ContentItemIds = viewModel.ContentItemIds == null
-                ? []
-                : viewModel.ContentItemIds.Split(',', StringSplitOptions.RemoveEmptyEntries);
+        if (!modelUpdated)
+        {
+            return Edit(field, context);
+        }
 
-            var settings = context.PartFieldDefinition.GetSettings<ContentPickerFieldSettings>();
+        field.ContentItemIds = viewModel.ContentItemIds == null
+            ? []
+            : viewModel.ContentItemIds.Split(',', StringSplitOptions.RemoveEmptyEntries);
 
-            if (settings.Required && field.ContentItemIds.Length == 0)
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
-            }
+        var settings = context.PartFieldDefinition.GetSettings<ContentPickerFieldSettings>();
 
-            if (!settings.Multiple && field.ContentItemIds.Length > 1)
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field cannot contain multiple items.", context.PartFieldDefinition.DisplayName()]);
-            }
+        if (settings.Required && field.ContentItemIds.Length == 0)
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
+        }
 
-            return Edit(field, context);
+        if (!settings.Multiple && field.ContentItemIds.Length > 1)
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(field.ContentItemIds), S["The {0} field cannot contain multiple items.", context.PartFieldDefinition.DisplayName()]);
         }
+
+        return Edit(field, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/DateFieldDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/DateFieldDisplayDriver.cs
index 566ba0c2df6..a7f5f5639f5 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/DateFieldDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/DateFieldDisplayDriver.cs
@@ -10,51 +10,50 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.ContentFields.Drivers
+namespace OrchardCore.ContentFields.Drivers;
+
+public sealed class DateFieldDisplayDriver : ContentFieldDisplayDriver<DateField>
 {
-    public sealed class DateFieldDisplayDriver : ContentFieldDisplayDriver<DateField>
+    internal readonly IStringLocalizer S;
+
+    public DateFieldDisplayDriver(IStringLocalizer<DateFieldDisplayDriver> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public DateFieldDisplayDriver(IStringLocalizer<DateFieldDisplayDriver> localizer)
+    public override IDisplayResult Display(DateField field, BuildFieldDisplayContext context)
+    {
+        return Initialize<DisplayDateFieldViewModel>(GetDisplayShapeType(context), model =>
         {
-            S = localizer;
-        }
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        })
+        .Location("Detail", "Content")
+        .Location("Summary", "Content");
+    }
 
-        public override IDisplayResult Display(DateField field, BuildFieldDisplayContext context)
+    public override IDisplayResult Edit(DateField field, BuildFieldEditorContext context)
+    {
+        return Initialize<EditDateFieldViewModel>(GetEditorShapeType(context), model =>
         {
-            return Initialize<DisplayDateFieldViewModel>(GetDisplayShapeType(context), model =>
-            {
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            })
-            .Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
+            model.Value = field.Value;
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        });
+    }
 
-        public override IDisplayResult Edit(DateField field, BuildFieldEditorContext context)
-        {
-            return Initialize<EditDateFieldViewModel>(GetEditorShapeType(context), model =>
-            {
-                model.Value = field.Value;
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            });
-        }
+    public override async Task<IDisplayResult> UpdateAsync(DateField field, UpdateFieldEditorContext context)
+    {
+        await context.Updater.TryUpdateModelAsync(field, Prefix, f => f.Value);
+        var settings = context.PartFieldDefinition.GetSettings<DateFieldSettings>();
 
-        public override async Task<IDisplayResult> UpdateAsync(DateField field, UpdateFieldEditorContext context)
+        if (settings.Required && field.Value == null)
         {
-            await context.Updater.TryUpdateModelAsync(field, Prefix, f => f.Value);
-            var settings = context.PartFieldDefinition.GetSettings<DateFieldSettings>();
-
-            if (settings.Required && field.Value == null)
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(field.Value), S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
-            }
-
-            return Edit(field, context);
+            context.Updater.ModelState.AddModelError(Prefix, nameof(field.Value), S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
         }
+
+        return Edit(field, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/DateTimeFieldDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/DateTimeFieldDisplayDriver.cs
index d591dc2335f..38a618a37ee 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/DateTimeFieldDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/DateTimeFieldDisplayDriver.cs
@@ -12,70 +12,69 @@
 using OrchardCore.Mvc.ModelBinding;
 
 
-namespace OrchardCore.ContentFields.Drivers
+namespace OrchardCore.ContentFields.Drivers;
+
+public sealed class DateTimeFieldDisplayDriver : ContentFieldDisplayDriver<DateTimeField>
 {
-    public sealed class DateTimeFieldDisplayDriver : ContentFieldDisplayDriver<DateTimeField>
-    {
-        private readonly ILocalClock _localClock;
+    private readonly ILocalClock _localClock;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public DateTimeFieldDisplayDriver(
-            ILocalClock localClock,
-            IStringLocalizer<DateTimeFieldDisplayDriver> localizer)
-        {
-            _localClock = localClock;
-            S = localizer;
-        }
+    public DateTimeFieldDisplayDriver(
+        ILocalClock localClock,
+        IStringLocalizer<DateTimeFieldDisplayDriver> localizer)
+    {
+        _localClock = localClock;
+        S = localizer;
+    }
 
-        public override IDisplayResult Display(DateTimeField field, BuildFieldDisplayContext context)
+    public override IDisplayResult Display(DateTimeField field, BuildFieldDisplayContext context)
+    {
+        return Initialize<DisplayDateTimeFieldViewModel>(GetDisplayShapeType(context), async model =>
         {
-            return Initialize<DisplayDateTimeFieldViewModel>(GetDisplayShapeType(context), async model =>
-            {
-                model.LocalDateTime = field.Value == null ? null : (await _localClock.ConvertToLocalAsync(field.Value.Value)).DateTime;
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            })
-            .Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
+            model.LocalDateTime = field.Value == null ? null : (await _localClock.ConvertToLocalAsync(field.Value.Value)).DateTime;
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        })
+        .Location("Detail", "Content")
+        .Location("Summary", "Content");
+    }
 
-        public override IDisplayResult Edit(DateTimeField field, BuildFieldEditorContext context)
+    public override IDisplayResult Edit(DateTimeField field, BuildFieldEditorContext context)
+    {
+        return Initialize<EditDateTimeFieldViewModel>(GetEditorShapeType(context), async model =>
         {
-            return Initialize<EditDateTimeFieldViewModel>(GetEditorShapeType(context), async model =>
-            {
-                model.LocalDateTime = field.Value == null ? null : (await _localClock.ConvertToLocalAsync(field.Value.Value)).DateTime;
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            });
-        }
+            model.LocalDateTime = field.Value == null ? null : (await _localClock.ConvertToLocalAsync(field.Value.Value)).DateTime;
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        });
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(DateTimeField field, UpdateFieldEditorContext context)
-        {
-            var model = new EditDateTimeFieldViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(DateTimeField field, UpdateFieldEditorContext context)
+    {
+        var model = new EditDateTimeFieldViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix, f => f.LocalDateTime);
-            var settings = context.PartFieldDefinition.GetSettings<DateTimeFieldSettings>();
+        await context.Updater.TryUpdateModelAsync(model, Prefix, f => f.LocalDateTime);
+        var settings = context.PartFieldDefinition.GetSettings<DateTimeFieldSettings>();
 
-            if (settings.Required && model.LocalDateTime == null)
+        if (settings.Required && model.LocalDateTime == null)
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(model.LocalDateTime), S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
+        }
+        else
+        {
+            if (model.LocalDateTime == null)
             {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(model.LocalDateTime), S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
+                field.Value = null;
             }
             else
             {
-                if (model.LocalDateTime == null)
-                {
-                    field.Value = null;
-                }
-                else
-                {
-                    field.Value = await _localClock.ConvertToUtcAsync(model.LocalDateTime.Value);
-                }
+                field.Value = await _localClock.ConvertToUtcAsync(model.LocalDateTime.Value);
             }
-
-            return Edit(field, context);
         }
+
+        return Edit(field, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/HtmlFieldDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/HtmlFieldDisplayDriver.cs
index 0dbc44efaf9..09e3782c5ca 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/HtmlFieldDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/HtmlFieldDisplayDriver.cs
@@ -17,92 +17,91 @@
 using OrchardCore.Shortcodes.Services;
 using Shortcodes;
 
-namespace OrchardCore.ContentFields.Drivers
+namespace OrchardCore.ContentFields.Drivers;
+
+public sealed class HtmlFieldDisplayDriver : ContentFieldDisplayDriver<HtmlField>
 {
-    public sealed class HtmlFieldDisplayDriver : ContentFieldDisplayDriver<HtmlField>
-    {
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly HtmlEncoder _htmlEncoder;
-        private readonly IHtmlSanitizerService _htmlSanitizerService;
-        private readonly IShortcodeService _shortcodeService;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly HtmlEncoder _htmlEncoder;
+    private readonly IHtmlSanitizerService _htmlSanitizerService;
+    private readonly IShortcodeService _shortcodeService;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public HtmlFieldDisplayDriver(
-            ILiquidTemplateManager liquidTemplateManager,
-            HtmlEncoder htmlEncoder,
-            IHtmlSanitizerService htmlSanitizerService,
-            IShortcodeService shortcodeService,
-            IStringLocalizer<HtmlFieldDisplayDriver> localizer)
-        {
-            _liquidTemplateManager = liquidTemplateManager;
-            _htmlEncoder = htmlEncoder;
-            _htmlSanitizerService = htmlSanitizerService;
-            _shortcodeService = shortcodeService;
-            S = localizer;
-        }
+    public HtmlFieldDisplayDriver(
+        ILiquidTemplateManager liquidTemplateManager,
+        HtmlEncoder htmlEncoder,
+        IHtmlSanitizerService htmlSanitizerService,
+        IShortcodeService shortcodeService,
+        IStringLocalizer<HtmlFieldDisplayDriver> localizer)
+    {
+        _liquidTemplateManager = liquidTemplateManager;
+        _htmlEncoder = htmlEncoder;
+        _htmlSanitizerService = htmlSanitizerService;
+        _shortcodeService = shortcodeService;
+        S = localizer;
+    }
 
-        public override IDisplayResult Display(HtmlField field, BuildFieldDisplayContext context)
+    public override IDisplayResult Display(HtmlField field, BuildFieldDisplayContext context)
+    {
+        return Initialize<DisplayHtmlFieldViewModel>(GetDisplayShapeType(context), async model =>
         {
-            return Initialize<DisplayHtmlFieldViewModel>(GetDisplayShapeType(context), async model =>
+            model.Html = field.Html;
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+
+            var settings = context.PartFieldDefinition.GetSettings<HtmlFieldSettings>();
+            if (!settings.SanitizeHtml)
             {
-                model.Html = field.Html;
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
+                model.Html = await _liquidTemplateManager.RenderStringAsync(field.Html, _htmlEncoder, model,
+                    new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(field.ContentItem) });
+            }
 
-                var settings = context.PartFieldDefinition.GetSettings<HtmlFieldSettings>();
-                if (!settings.SanitizeHtml)
+            model.Html = await _shortcodeService.ProcessAsync(model.Html,
+                new Context
                 {
-                    model.Html = await _liquidTemplateManager.RenderStringAsync(field.Html, _htmlEncoder, model,
-                        new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(field.ContentItem) });
-                }
+                    ["ContentItem"] = field.ContentItem,
+                    ["PartFieldDefinition"] = context.PartFieldDefinition
+                });
 
-                model.Html = await _shortcodeService.ProcessAsync(model.Html,
-                    new Context
-                    {
-                        ["ContentItem"] = field.ContentItem,
-                        ["PartFieldDefinition"] = context.PartFieldDefinition
-                    });
-
-            })
-            .Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
-
-        public override IDisplayResult Edit(HtmlField field, BuildFieldEditorContext context)
-        {
-            return Initialize<EditHtmlFieldViewModel>(GetEditorShapeType(context), model =>
-            {
-                model.Html = field.Html;
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            });
-        }
+        })
+        .Location("Detail", "Content")
+        .Location("Summary", "Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(HtmlField field, UpdateFieldEditorContext context)
+    public override IDisplayResult Edit(HtmlField field, BuildFieldEditorContext context)
+    {
+        return Initialize<EditHtmlFieldViewModel>(GetEditorShapeType(context), model =>
         {
-            var viewModel = new EditHtmlFieldViewModel();
+            model.Html = field.Html;
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        });
+    }
 
-            var settings = context.PartFieldDefinition.GetSettings<HtmlFieldSettings>();
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix, f => f.Html);
+    public override async Task<IDisplayResult> UpdateAsync(HtmlField field, UpdateFieldEditorContext context)
+    {
+        var viewModel = new EditHtmlFieldViewModel();
 
-            if (!string.IsNullOrEmpty(viewModel.Html) && !_liquidTemplateManager.Validate(viewModel.Html, out var errors))
-            {
-                var fieldName = context.PartFieldDefinition.DisplayName();
-                context.Updater.ModelState.AddModelError(
-                    Prefix,
-                    nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}",
-                    fieldName,
-                    string.Join(' ', errors)]);
-            }
-            else
-            {
-                field.Html = settings.SanitizeHtml ? _htmlSanitizerService.Sanitize(viewModel.Html) : viewModel.Html;
-            }
+        var settings = context.PartFieldDefinition.GetSettings<HtmlFieldSettings>();
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix, f => f.Html);
 
-            return Edit(field, context);
+        if (!string.IsNullOrEmpty(viewModel.Html) && !_liquidTemplateManager.Validate(viewModel.Html, out var errors))
+        {
+            var fieldName = context.PartFieldDefinition.DisplayName();
+            context.Updater.ModelState.AddModelError(
+                Prefix,
+                nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}",
+                fieldName,
+                string.Join(' ', errors)]);
         }
+        else
+        {
+            field.Html = settings.SanitizeHtml ? _htmlSanitizerService.Sanitize(viewModel.Html) : viewModel.Html;
+        }
+
+        return Edit(field, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/LinkFieldDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/LinkFieldDisplayDriver.cs
index abd44de36c6..f4e8cbdfd79 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/LinkFieldDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/LinkFieldDisplayDriver.cs
@@ -15,118 +15,117 @@
 using OrchardCore.Infrastructure.Html;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.ContentFields.Drivers
+namespace OrchardCore.ContentFields.Drivers;
+
+public sealed class LinkFieldDisplayDriver : ContentFieldDisplayDriver<LinkField>
 {
-    public sealed class LinkFieldDisplayDriver : ContentFieldDisplayDriver<LinkField>
+    private readonly IUrlHelperFactory _urlHelperFactory;
+    private readonly IActionContextAccessor _actionContextAccessor;
+    private readonly IHtmlSanitizerService _htmlSanitizerService;
+    private readonly HtmlEncoder _htmlencoder;
+
+    internal readonly IStringLocalizer S;
+
+    public LinkFieldDisplayDriver(
+        IUrlHelperFactory urlHelperFactory,
+        IActionContextAccessor actionContextAccessor,
+        IStringLocalizer<LinkFieldDisplayDriver> localizer,
+        IHtmlSanitizerService htmlSanitizerService,
+        HtmlEncoder htmlencoder)
     {
-        private readonly IUrlHelperFactory _urlHelperFactory;
-        private readonly IActionContextAccessor _actionContextAccessor;
-        private readonly IHtmlSanitizerService _htmlSanitizerService;
-        private readonly HtmlEncoder _htmlencoder;
-
-        internal readonly IStringLocalizer S;
-
-        public LinkFieldDisplayDriver(
-            IUrlHelperFactory urlHelperFactory,
-            IActionContextAccessor actionContextAccessor,
-            IStringLocalizer<LinkFieldDisplayDriver> localizer,
-            IHtmlSanitizerService htmlSanitizerService,
-            HtmlEncoder htmlencoder)
-        {
-            _urlHelperFactory = urlHelperFactory;
-            _actionContextAccessor = actionContextAccessor;
-            S = localizer;
-            _htmlSanitizerService = htmlSanitizerService;
-            _htmlencoder = htmlencoder;
-        }
+        _urlHelperFactory = urlHelperFactory;
+        _actionContextAccessor = actionContextAccessor;
+        S = localizer;
+        _htmlSanitizerService = htmlSanitizerService;
+        _htmlencoder = htmlencoder;
+    }
 
-        public override IDisplayResult Display(LinkField field, BuildFieldDisplayContext context)
+    public override IDisplayResult Display(LinkField field, BuildFieldDisplayContext context)
+    {
+        return Initialize<DisplayLinkFieldViewModel>(GetDisplayShapeType(context), model =>
         {
-            return Initialize<DisplayLinkFieldViewModel>(GetDisplayShapeType(context), model =>
-            {
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            })
-            .Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        })
+        .Location("Detail", "Content")
+        .Location("Summary", "Content");
+    }
 
-        public override IDisplayResult Edit(LinkField field, BuildFieldEditorContext context)
+    public override IDisplayResult Edit(LinkField field, BuildFieldEditorContext context)
+    {
+        return Initialize<EditLinkFieldViewModel>(GetEditorShapeType(context), model =>
         {
-            return Initialize<EditLinkFieldViewModel>(GetEditorShapeType(context), model =>
-            {
-                var settings = context.PartFieldDefinition.GetSettings<LinkFieldSettings>();
-                model.Url = context.IsNew && field.Url == null ? settings.DefaultUrl : field.Url;
-                model.Text = context.IsNew && field.Text == null ? settings.DefaultText : field.Text;
-                model.Target = context.IsNew && field.Target == null ? settings.DefaultTarget : field.Target;
-
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            });
-        }
+            var settings = context.PartFieldDefinition.GetSettings<LinkFieldSettings>();
+            model.Url = context.IsNew && field.Url == null ? settings.DefaultUrl : field.Url;
+            model.Text = context.IsNew && field.Text == null ? settings.DefaultText : field.Text;
+            model.Target = context.IsNew && field.Target == null ? settings.DefaultTarget : field.Target;
+
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        });
+    }
+
+    public override async Task<IDisplayResult> UpdateAsync(LinkField field, UpdateFieldEditorContext context)
+    {
+        var modelUpdated = await context.Updater.TryUpdateModelAsync(field, Prefix, f => f.Url, f => f.Text, f => f.Target);
 
-        public override async Task<IDisplayResult> UpdateAsync(LinkField field, UpdateFieldEditorContext context)
+        if (modelUpdated)
         {
-            var modelUpdated = await context.Updater.TryUpdateModelAsync(field, Prefix, f => f.Url, f => f.Text, f => f.Target);
+            var settings = context.PartFieldDefinition.GetSettings<LinkFieldSettings>();
 
-            if (modelUpdated)
+            var urlToValidate = field.Url;
+            if (!string.IsNullOrEmpty(urlToValidate))
             {
-                var settings = context.PartFieldDefinition.GetSettings<LinkFieldSettings>();
-
-                var urlToValidate = field.Url;
-                if (!string.IsNullOrEmpty(urlToValidate))
+                var indexAnchor = urlToValidate.IndexOf('#');
+                if (indexAnchor > -1)
                 {
-                    var indexAnchor = urlToValidate.IndexOf('#');
-                    if (indexAnchor > -1)
-                    {
-                        urlToValidate = urlToValidate[..indexAnchor];
-                    }
-
-                    if (urlToValidate.StartsWith("~/", StringComparison.Ordinal))
-                    {
-                        var urlHelper = _urlHelperFactory.GetUrlHelper(_actionContextAccessor.ActionContext);
-                        urlToValidate = urlHelper.Content(urlToValidate);
-                    }
-
-                    urlToValidate = urlToValidate.ToUriComponents();
+                    urlToValidate = urlToValidate[..indexAnchor];
                 }
 
-                // Validate Url
-                if (settings.Required && string.IsNullOrWhiteSpace(field.Url))
+                if (urlToValidate.StartsWith("~/", StringComparison.Ordinal))
                 {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(field.Url), S["The url is required for {0}.", context.PartFieldDefinition.DisplayName()]);
+                    var urlHelper = _urlHelperFactory.GetUrlHelper(_actionContextAccessor.ActionContext);
+                    urlToValidate = urlHelper.Content(urlToValidate);
                 }
-                else if (!string.IsNullOrWhiteSpace(field.Url))
-                {
-                    if (!Uri.IsWellFormedUriString(urlToValidate, UriKind.RelativeOrAbsolute))
-                    {
-                        context.Updater.ModelState.AddModelError(Prefix, nameof(field.Url), S["{0} is an invalid url.", field.Url]);
-                    }
-                    else
-                    {
-                        var link = $"<a href=\"{_htmlencoder.Encode(urlToValidate)}\"></a>";
 
-                        if (!string.Equals(link, _htmlSanitizerService.Sanitize(link), StringComparison.OrdinalIgnoreCase))
-                        {
-                            context.Updater.ModelState.AddModelError(Prefix, nameof(field.Url), S["{0} is an invalid url.", field.Url]);
-                        }
-                    }
-                }
+                urlToValidate = urlToValidate.ToUriComponents();
+            }
 
-                // Validate Text
-                if (settings.LinkTextMode == LinkTextMode.Required && string.IsNullOrWhiteSpace(field.Text))
+            // Validate Url
+            if (settings.Required && string.IsNullOrWhiteSpace(field.Url))
+            {
+                context.Updater.ModelState.AddModelError(Prefix, nameof(field.Url), S["The url is required for {0}.", context.PartFieldDefinition.DisplayName()]);
+            }
+            else if (!string.IsNullOrWhiteSpace(field.Url))
+            {
+                if (!Uri.IsWellFormedUriString(urlToValidate, UriKind.RelativeOrAbsolute))
                 {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(field.Text), S["The link text is required for {0}.", context.PartFieldDefinition.DisplayName()]);
+                    context.Updater.ModelState.AddModelError(Prefix, nameof(field.Url), S["{0} is an invalid url.", field.Url]);
                 }
-                else if (settings.LinkTextMode == LinkTextMode.Static && string.IsNullOrWhiteSpace(settings.DefaultText))
+                else
                 {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(field.Text), S["The text default value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
+                    var link = $"<a href=\"{_htmlencoder.Encode(urlToValidate)}\"></a>";
+
+                    if (!string.Equals(link, _htmlSanitizerService.Sanitize(link), StringComparison.OrdinalIgnoreCase))
+                    {
+                        context.Updater.ModelState.AddModelError(Prefix, nameof(field.Url), S["{0} is an invalid url.", field.Url]);
+                    }
                 }
             }
 
-            return Edit(field, context);
+            // Validate Text
+            if (settings.LinkTextMode == LinkTextMode.Required && string.IsNullOrWhiteSpace(field.Text))
+            {
+                context.Updater.ModelState.AddModelError(Prefix, nameof(field.Text), S["The link text is required for {0}.", context.PartFieldDefinition.DisplayName()]);
+            }
+            else if (settings.LinkTextMode == LinkTextMode.Static && string.IsNullOrWhiteSpace(settings.DefaultText))
+            {
+                context.Updater.ModelState.AddModelError(Prefix, nameof(field.Text), S["The text default value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
+            }
         }
+
+        return Edit(field, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/LocalizationSetContentPickerFieldDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/LocalizationSetContentPickerFieldDisplayDriver.cs
index ed9cf0f359c..185b493796f 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/LocalizationSetContentPickerFieldDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/LocalizationSetContentPickerFieldDisplayDriver.cs
@@ -14,96 +14,95 @@
 using OrchardCore.Modules;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.ContentFields.Drivers
+namespace OrchardCore.ContentFields.Drivers;
+
+[RequireFeatures("OrchardCore.ContentLocalization")]
+public sealed class LocalizationSetContentPickerFieldDisplayDriver : ContentFieldDisplayDriver<LocalizationSetContentPickerField>
 {
-    [RequireFeatures("OrchardCore.ContentLocalization")]
-    public sealed class LocalizationSetContentPickerFieldDisplayDriver : ContentFieldDisplayDriver<LocalizationSetContentPickerField>
-    {
-        private readonly IContentManager _contentManager;
-        private readonly IContentLocalizationManager _contentLocalizationManager;
+    private readonly IContentManager _contentManager;
+    private readonly IContentLocalizationManager _contentLocalizationManager;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public LocalizationSetContentPickerFieldDisplayDriver(
-            IContentManager contentManager,
-            IStringLocalizer<LocalizationSetContentPickerFieldDisplayDriver> localizer,
-            IContentLocalizationManager contentLocalizationManager)
-        {
-            _contentManager = contentManager;
-            S = localizer;
-            _contentLocalizationManager = contentLocalizationManager;
-        }
+    public LocalizationSetContentPickerFieldDisplayDriver(
+        IContentManager contentManager,
+        IStringLocalizer<LocalizationSetContentPickerFieldDisplayDriver> localizer,
+        IContentLocalizationManager contentLocalizationManager)
+    {
+        _contentManager = contentManager;
+        S = localizer;
+        _contentLocalizationManager = contentLocalizationManager;
+    }
 
-        public override IDisplayResult Display(LocalizationSetContentPickerField field, BuildFieldDisplayContext context)
+    public override IDisplayResult Display(LocalizationSetContentPickerField field, BuildFieldDisplayContext context)
+    {
+        return Initialize<DisplayLocalizationSetContentPickerFieldViewModel>(GetDisplayShapeType(context), model =>
         {
-            return Initialize<DisplayLocalizationSetContentPickerFieldViewModel>(GetDisplayShapeType(context), model =>
-            {
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            })
-            .Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        })
+        .Location("Detail", "Content")
+        .Location("Summary", "Content");
+    }
 
-        public override IDisplayResult Edit(LocalizationSetContentPickerField field, BuildFieldEditorContext context)
+    public override IDisplayResult Edit(LocalizationSetContentPickerField field, BuildFieldEditorContext context)
+    {
+        return Initialize<EditLocalizationSetContentPickerFieldViewModel>(GetEditorShapeType(context), async model =>
         {
-            return Initialize<EditLocalizationSetContentPickerFieldViewModel>(GetEditorShapeType(context), async model =>
-            {
-                model.LocalizationSets = string.Join(",", field.LocalizationSets);
+            model.LocalizationSets = string.Join(",", field.LocalizationSets);
+
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
 
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
+            model.SelectedItems = [];
 
-                model.SelectedItems = [];
+            foreach (var kvp in await _contentLocalizationManager.GetFirstItemIdForSetsAsync(field.LocalizationSets))
+            {
+                var contentItem = await _contentManager.GetAsync(kvp.Value, VersionOptions.Latest);
 
-                foreach (var kvp in await _contentLocalizationManager.GetFirstItemIdForSetsAsync(field.LocalizationSets))
+                if (contentItem == null)
                 {
-                    var contentItem = await _contentManager.GetAsync(kvp.Value, VersionOptions.Latest);
-
-                    if (contentItem == null)
-                    {
-                        continue;
-                    }
-
-                    model.SelectedItems.Add(new VueMultiselectItemViewModel
-                    {
-                        Id = kvp.Key, // localization set
-                        DisplayText = contentItem.ToString(),
-                        HasPublished = await _contentManager.HasPublishedVersionAsync(contentItem)
-                    });
+                    continue;
                 }
-            });
-        }
 
-        public override async Task<IDisplayResult> UpdateAsync(LocalizationSetContentPickerField field, UpdateFieldEditorContext context)
-        {
-            var viewModel = new EditLocalizationSetContentPickerFieldViewModel();
+                model.SelectedItems.Add(new VueMultiselectItemViewModel
+                {
+                    Id = kvp.Key, // localization set
+                    DisplayText = contentItem.ToString(),
+                    HasPublished = await _contentManager.HasPublishedVersionAsync(contentItem)
+                });
+            }
+        });
+    }
 
-            var modelUpdated = await context.Updater.TryUpdateModelAsync(viewModel, Prefix, f => f.LocalizationSets);
+    public override async Task<IDisplayResult> UpdateAsync(LocalizationSetContentPickerField field, UpdateFieldEditorContext context)
+    {
+        var viewModel = new EditLocalizationSetContentPickerFieldViewModel();
 
-            if (!modelUpdated)
-            {
-                return Edit(field, context);
-            }
+        var modelUpdated = await context.Updater.TryUpdateModelAsync(viewModel, Prefix, f => f.LocalizationSets);
 
-            field.LocalizationSets = viewModel.LocalizationSets == null
-                ? [] : viewModel.LocalizationSets.Split(',', StringSplitOptions.RemoveEmptyEntries);
+        if (!modelUpdated)
+        {
+            return Edit(field, context);
+        }
 
-            var settings = context.PartFieldDefinition.GetSettings<LocalizationSetContentPickerFieldSettings>();
+        field.LocalizationSets = viewModel.LocalizationSets == null
+            ? [] : viewModel.LocalizationSets.Split(',', StringSplitOptions.RemoveEmptyEntries);
 
-            if (settings.Required && field.LocalizationSets.Length == 0)
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(field.LocalizationSets), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
-            }
+        var settings = context.PartFieldDefinition.GetSettings<LocalizationSetContentPickerFieldSettings>();
 
-            if (!settings.Multiple && field.LocalizationSets.Length > 1)
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(field.LocalizationSets), S["The {0} field cannot contain multiple items.", context.PartFieldDefinition.DisplayName()]);
-            }
+        if (settings.Required && field.LocalizationSets.Length == 0)
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(field.LocalizationSets), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
+        }
 
-            return Edit(field, context);
+        if (!settings.Multiple && field.LocalizationSets.Length > 1)
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(field.LocalizationSets), S["The {0} field cannot contain multiple items.", context.PartFieldDefinition.DisplayName()]);
         }
+
+        return Edit(field, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/MultiTextFieldDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/MultiTextFieldDisplayDriver.cs
index 0a488a890af..3ca02ac3e04 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/MultiTextFieldDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/MultiTextFieldDisplayDriver.cs
@@ -11,65 +11,64 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.ContentFields.Fields
+namespace OrchardCore.ContentFields.Fields;
+
+public sealed class MultiTextFieldDisplayDriver : ContentFieldDisplayDriver<MultiTextField>
 {
-    public sealed class MultiTextFieldDisplayDriver : ContentFieldDisplayDriver<MultiTextField>
+    internal readonly IStringLocalizer S;
+
+    public MultiTextFieldDisplayDriver(IStringLocalizer<MultiTextFieldDisplayDriver> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public MultiTextFieldDisplayDriver(IStringLocalizer<MultiTextFieldDisplayDriver> localizer)
+    public override IDisplayResult Display(MultiTextField field, BuildFieldDisplayContext context)
+    {
+        return Initialize<DisplayMultiTextFieldViewModel>(GetDisplayShapeType(context), model =>
         {
-            S = localizer;
-        }
+            var settings = context.PartFieldDefinition.GetSettings<MultiTextFieldSettings>();
 
-        public override IDisplayResult Display(MultiTextField field, BuildFieldDisplayContext context)
+            model.Values = settings.Options.Where(o => field.Values?.Contains(o.Value) == true).Select(o => o.Value).ToArray();
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        })
+        .Location("Detail", "Content")
+        .Location("Summary", "Content");
+    }
+
+    public override IDisplayResult Edit(MultiTextField field, BuildFieldEditorContext context)
+    {
+        return Initialize<EditMultiTextFieldViewModel>(GetEditorShapeType(context), model =>
         {
-            return Initialize<DisplayMultiTextFieldViewModel>(GetDisplayShapeType(context), model =>
+            if (context.IsNew)
             {
                 var settings = context.PartFieldDefinition.GetSettings<MultiTextFieldSettings>();
-
-                model.Values = settings.Options.Where(o => field.Values?.Contains(o.Value) == true).Select(o => o.Value).ToArray();
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            })
-            .Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
-
-        public override IDisplayResult Edit(MultiTextField field, BuildFieldEditorContext context)
-        {
-            return Initialize<EditMultiTextFieldViewModel>(GetEditorShapeType(context), model =>
+                model.Values = settings.Options.Where(o => o.Default).Select(o => o.Value).ToArray();
+            }
+            else
             {
-                if (context.IsNew)
-                {
-                    var settings = context.PartFieldDefinition.GetSettings<MultiTextFieldSettings>();
-                    model.Values = settings.Options.Where(o => o.Default).Select(o => o.Value).ToArray();
-                }
-                else
-                {
-                    model.Values = field.Values;
-                }
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            });
-        }
-
-        public override async Task<IDisplayResult> UpdateAsync(MultiTextField field, UpdateFieldEditorContext context)
-        {
-            var viewModel = new EditMultiTextFieldViewModel();
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
+                model.Values = field.Values;
+            }
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        });
+    }
 
-            field.Values = viewModel.Values;
+    public override async Task<IDisplayResult> UpdateAsync(MultiTextField field, UpdateFieldEditorContext context)
+    {
+        var viewModel = new EditMultiTextFieldViewModel();
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
 
-            var settings = context.PartFieldDefinition.GetSettings<MultiTextFieldSettings>();
-            if (settings.Required && viewModel.Values.Length == 0)
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(field.Values), S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
-            }
+        field.Values = viewModel.Values;
 
-            return Edit(field, context);
+        var settings = context.PartFieldDefinition.GetSettings<MultiTextFieldSettings>();
+        if (settings.Required && viewModel.Values.Length == 0)
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(field.Values), S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
         }
+
+        return Edit(field, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/NumericFieldDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/NumericFieldDisplayDriver.cs
index 5fe649fb873..7ddff407e23 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/NumericFieldDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/NumericFieldDisplayDriver.cs
@@ -11,106 +11,105 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.ContentFields.Drivers
+namespace OrchardCore.ContentFields.Drivers;
+
+public sealed class NumericFieldDisplayDriver : ContentFieldDisplayDriver<NumericField>
 {
-    public sealed class NumericFieldDisplayDriver : ContentFieldDisplayDriver<NumericField>
-    {
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public NumericFieldDisplayDriver(IStringLocalizer<NumericFieldDisplayDriver> localizer)
-        {
-            S = localizer;
-        }
+    public NumericFieldDisplayDriver(IStringLocalizer<NumericFieldDisplayDriver> localizer)
+    {
+        S = localizer;
+    }
 
-        public override IDisplayResult Display(NumericField field, BuildFieldDisplayContext context)
+    public override IDisplayResult Display(NumericField field, BuildFieldDisplayContext context)
+    {
+        return Initialize<DisplayNumericFieldViewModel>(GetDisplayShapeType(context), model =>
         {
-            return Initialize<DisplayNumericFieldViewModel>(GetDisplayShapeType(context), model =>
-            {
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            })
-            .Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        })
+        .Location("Detail", "Content")
+        .Location("Summary", "Content");
+    }
 
-        public override IDisplayResult Edit(NumericField field, BuildFieldEditorContext context)
+    public override IDisplayResult Edit(NumericField field, BuildFieldEditorContext context)
+    {
+        return Initialize<EditNumericFieldViewModel>(GetEditorShapeType(context), model =>
         {
-            return Initialize<EditNumericFieldViewModel>(GetEditorShapeType(context), model =>
-            {
-                var settings = context.PartFieldDefinition.GetSettings<NumericFieldSettings>();
+            var settings = context.PartFieldDefinition.GetSettings<NumericFieldSettings>();
 
-                // The default value of a field is intended for the editor when a new content item
-                // is created (not for APIs). Since we may want to render the editor of a content
-                // item that was created by code, we only set the default value in the <input>
-                // of the field if it doesn't already have a value.
+            // The default value of a field is intended for the editor when a new content item
+            // is created (not for APIs). Since we may want to render the editor of a content
+            // item that was created by code, we only set the default value in the <input>
+            // of the field if it doesn't already have a value.
 
-                if (field.Value.HasValue)
-                {
-                    model.Value = Convert.ToString(field.Value, CultureInfo.CurrentUICulture);
-                }
-                else if (context.IsNew)
-                {
-                    // The content item is new and the field is not initialized, we can 
-                    // use the default value from the settings in the editor.
-                    model.Value = settings.DefaultValue;
-                }
+            if (field.Value.HasValue)
+            {
+                model.Value = Convert.ToString(field.Value, CultureInfo.CurrentUICulture);
+            }
+            else if (context.IsNew)
+            {
+                // The content item is new and the field is not initialized, we can 
+                // use the default value from the settings in the editor.
+                model.Value = settings.DefaultValue;
+            }
 
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            });
-        }
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        });
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(NumericField field, UpdateFieldEditorContext context)
-        {
-            var viewModel = new EditNumericFieldViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(NumericField field, UpdateFieldEditorContext context)
+    {
+        var viewModel = new EditNumericFieldViewModel();
 
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix, f => f.Value);
-            var settings = context.PartFieldDefinition.GetSettings<NumericFieldSettings>();
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix, f => f.Value);
+        var settings = context.PartFieldDefinition.GetSettings<NumericFieldSettings>();
 
-            field.Value = null;
+        field.Value = null;
 
-            if (string.IsNullOrWhiteSpace(viewModel.Value))
+        if (string.IsNullOrWhiteSpace(viewModel.Value))
+        {
+            if (settings.Required)
             {
-                if (settings.Required)
-                {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(field.Value), S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
-                }
+                context.Updater.ModelState.AddModelError(Prefix, nameof(field.Value), S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
             }
-            else if (!decimal.TryParse(viewModel.Value, NumberStyles.Any, CultureInfo.CurrentUICulture, out var value))
+        }
+        else if (!decimal.TryParse(viewModel.Value, NumberStyles.Any, CultureInfo.CurrentUICulture, out var value))
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(field.Value), S["{0} is an invalid number.", context.PartFieldDefinition.DisplayName()]);
+        }
+        else
+        {
+            field.Value = value;
+
+            if (settings.Minimum.HasValue && value < settings.Minimum.Value)
             {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(field.Value), S["{0} is an invalid number.", context.PartFieldDefinition.DisplayName()]);
+                context.Updater.ModelState.AddModelError(Prefix, nameof(field.Value), S["The value must be greater than {0}.", settings.Minimum.Value]);
             }
-            else
-            {
-                field.Value = value;
 
-                if (settings.Minimum.HasValue && value < settings.Minimum.Value)
-                {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(field.Value), S["The value must be greater than {0}.", settings.Minimum.Value]);
-                }
+            if (settings.Maximum.HasValue && value > settings.Maximum.Value)
+            {
+                context.Updater.ModelState.AddModelError(Prefix, nameof(field.Value), S["The value must be less than {0}.", settings.Maximum.Value]);
+            }
 
-                if (settings.Maximum.HasValue && value > settings.Maximum.Value)
+            // Check the number of decimals.
+            if (Math.Round(value, settings.Scale) != value)
+            {
+                if (settings.Scale == 0)
                 {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(field.Value), S["The value must be less than {0}.", settings.Maximum.Value]);
+                    context.Updater.ModelState.AddModelError(Prefix, nameof(field.Value), S["The {0} field must be an integer.", context.PartFieldDefinition.DisplayName()]);
                 }
-
-                // Check the number of decimals.
-                if (Math.Round(value, settings.Scale) != value)
+                else
                 {
-                    if (settings.Scale == 0)
-                    {
-                        context.Updater.ModelState.AddModelError(Prefix, nameof(field.Value), S["The {0} field must be an integer.", context.PartFieldDefinition.DisplayName()]);
-                    }
-                    else
-                    {
-                        context.Updater.ModelState.AddModelError(Prefix, nameof(field.Value), S["Invalid number of digits for {0}, max allowed: {1}.", context.PartFieldDefinition.DisplayName(), settings.Scale]);
-                    }
+                    context.Updater.ModelState.AddModelError(Prefix, nameof(field.Value), S["Invalid number of digits for {0}, max allowed: {1}.", context.PartFieldDefinition.DisplayName(), settings.Scale]);
                 }
             }
-
-            return Edit(field, context);
         }
+
+        return Edit(field, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/TextFieldDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/TextFieldDisplayDriver.cs
index 7c34fd37afa..6bdfc67d3e2 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/TextFieldDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/TextFieldDisplayDriver.cs
@@ -11,52 +11,51 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.ContentFields.Drivers
-{
-    public sealed class TextFieldDisplayDriver : ContentFieldDisplayDriver<TextField>
-    {
-        internal readonly IStringLocalizer S;
+namespace OrchardCore.ContentFields.Drivers;
 
-        public TextFieldDisplayDriver(IStringLocalizer<TextFieldDisplayDriver> localizer)
-        {
-            S = localizer;
-        }
+public sealed class TextFieldDisplayDriver : ContentFieldDisplayDriver<TextField>
+{
+    internal readonly IStringLocalizer S;
 
-        public override IDisplayResult Display(TextField field, BuildFieldDisplayContext context)
-        {
-            return Initialize<DisplayTextFieldViewModel>(GetDisplayShapeType(context), model =>
-            {
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            })
-            .Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
+    public TextFieldDisplayDriver(IStringLocalizer<TextFieldDisplayDriver> localizer)
+    {
+        S = localizer;
+    }
 
-        public override IDisplayResult Edit(TextField field, BuildFieldEditorContext context)
+    public override IDisplayResult Display(TextField field, BuildFieldDisplayContext context)
+    {
+        return Initialize<DisplayTextFieldViewModel>(GetDisplayShapeType(context), model =>
         {
-            return Initialize<EditTextFieldViewModel>(GetEditorShapeType(context), model =>
-            {
-                var settings = context.PartFieldDefinition.GetSettings<TextFieldSettings>();
-                model.Text = context.IsNew && field.Text == null ? settings.DefaultValue : field.Text;
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            });
-        }
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        })
+        .Location("Detail", "Content")
+        .Location("Summary", "Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(TextField field, UpdateFieldEditorContext context)
+    public override IDisplayResult Edit(TextField field, BuildFieldEditorContext context)
+    {
+        return Initialize<EditTextFieldViewModel>(GetEditorShapeType(context), model =>
         {
-            await context.Updater.TryUpdateModelAsync(field, Prefix, f => f.Text);
             var settings = context.PartFieldDefinition.GetSettings<TextFieldSettings>();
+            model.Text = context.IsNew && field.Text == null ? settings.DefaultValue : field.Text;
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        });
+    }
 
-            if (settings.Required && string.IsNullOrWhiteSpace(field.Text))
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(field.Text), S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
-            }
+    public override async Task<IDisplayResult> UpdateAsync(TextField field, UpdateFieldEditorContext context)
+    {
+        await context.Updater.TryUpdateModelAsync(field, Prefix, f => f.Text);
+        var settings = context.PartFieldDefinition.GetSettings<TextFieldSettings>();
 
-            return Edit(field, context);
+        if (settings.Required && string.IsNullOrWhiteSpace(field.Text))
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(field.Text), S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
         }
+
+        return Edit(field, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/TimeFieldDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/TimeFieldDisplayDriver.cs
index 24392897836..cfa2e205838 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/TimeFieldDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/TimeFieldDisplayDriver.cs
@@ -9,51 +9,50 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.ContentFields.Drivers
+namespace OrchardCore.ContentFields.Drivers;
+
+public sealed class TimeFieldDisplayDriver : ContentFieldDisplayDriver<TimeField>
 {
-    public sealed class TimeFieldDisplayDriver : ContentFieldDisplayDriver<TimeField>
+    internal readonly IStringLocalizer S;
+
+    public TimeFieldDisplayDriver(IStringLocalizer<TimeFieldDisplayDriver> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public TimeFieldDisplayDriver(IStringLocalizer<TimeFieldDisplayDriver> localizer)
+    public override IDisplayResult Display(TimeField field, BuildFieldDisplayContext context)
+    {
+        return Initialize<DisplayTimeFieldViewModel>(GetDisplayShapeType(context), model =>
         {
-            S = localizer;
-        }
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        })
+        .Location("Detail", "Content")
+        .Location("Summary", "Content");
+    }
 
-        public override IDisplayResult Display(TimeField field, BuildFieldDisplayContext context)
+    public override IDisplayResult Edit(TimeField field, BuildFieldEditorContext context)
+    {
+        return Initialize<EditTimeFieldViewModel>(GetEditorShapeType(context), model =>
         {
-            return Initialize<DisplayTimeFieldViewModel>(GetDisplayShapeType(context), model =>
-            {
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            })
-            .Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
+            model.Value = field.Value;
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        });
+    }
 
-        public override IDisplayResult Edit(TimeField field, BuildFieldEditorContext context)
-        {
-            return Initialize<EditTimeFieldViewModel>(GetEditorShapeType(context), model =>
-            {
-                model.Value = field.Value;
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            });
-        }
+    public override async Task<IDisplayResult> UpdateAsync(TimeField field, UpdateFieldEditorContext context)
+    {
+        await context.Updater.TryUpdateModelAsync(field, Prefix, f => f.Value);
+        var settings = context.PartFieldDefinition.GetSettings<TimeFieldSettings>();
 
-        public override async Task<IDisplayResult> UpdateAsync(TimeField field, UpdateFieldEditorContext context)
+        if (settings.Required && field.Value == null)
         {
-            await context.Updater.TryUpdateModelAsync(field, Prefix, f => f.Value);
-            var settings = context.PartFieldDefinition.GetSettings<TimeFieldSettings>();
-
-            if (settings.Required && field.Value == null)
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(field.Value), S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
-            }
-
-            return Edit(field, context);
+            context.Updater.ModelState.AddModelError(Prefix, nameof(field.Value), S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
         }
+
+        return Edit(field, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/UserPickerFieldDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/UserPickerFieldDisplayDriver.cs
index 5a52d950c44..b646aab6490 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/UserPickerFieldDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/UserPickerFieldDisplayDriver.cs
@@ -16,87 +16,86 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.ContentFields.Drivers
+namespace OrchardCore.ContentFields.Drivers;
+
+public sealed class UserPickerFieldDisplayDriver : ContentFieldDisplayDriver<UserPickerField>
 {
-    public sealed class UserPickerFieldDisplayDriver : ContentFieldDisplayDriver<UserPickerField>
-    {
-        private readonly ISession _session;
+    private readonly ISession _session;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public UserPickerFieldDisplayDriver(
-            ISession session,
-            IStringLocalizer<UserPickerFieldDisplayDriver> stringLocalizer)
-        {
-            _session = session;
-            S = stringLocalizer;
-        }
+    public UserPickerFieldDisplayDriver(
+        ISession session,
+        IStringLocalizer<UserPickerFieldDisplayDriver> stringLocalizer)
+    {
+        _session = session;
+        S = stringLocalizer;
+    }
 
-        public override IDisplayResult Display(UserPickerField field, BuildFieldDisplayContext context)
+    public override IDisplayResult Display(UserPickerField field, BuildFieldDisplayContext context)
+    {
+        return Initialize<DisplayUserPickerFieldViewModel>(GetDisplayShapeType(context), model =>
         {
-            return Initialize<DisplayUserPickerFieldViewModel>(GetDisplayShapeType(context), model =>
-            {
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            })
-            .Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        })
+        .Location("Detail", "Content")
+        .Location("Summary", "Content");
+    }
 
-        public override IDisplayResult Edit(UserPickerField field, BuildFieldEditorContext context)
+    public override IDisplayResult Edit(UserPickerField field, BuildFieldEditorContext context)
+    {
+        return Initialize<EditUserPickerFieldViewModel>(GetEditorShapeType(context), async model =>
         {
-            return Initialize<EditUserPickerFieldViewModel>(GetEditorShapeType(context), async model =>
-            {
-                model.UserIds = string.Join(",", field.UserIds);
+            model.UserIds = string.Join(",", field.UserIds);
 
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-                model.TypePartDefinition = context.TypePartDefinition;
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+            model.TypePartDefinition = context.TypePartDefinition;
 
-                if (field.UserIds.Length > 0)
-                {
-                    var users = (await _session.Query<User, UserIndex>().Where(x => x.UserId.IsIn(field.UserIds)).ListAsync())
-                        .OrderBy(o => Array.FindIndex(field.UserIds, x => string.Equals(o.UserId, x, StringComparison.OrdinalIgnoreCase)));
+            if (field.UserIds.Length > 0)
+            {
+                var users = (await _session.Query<User, UserIndex>().Where(x => x.UserId.IsIn(field.UserIds)).ListAsync())
+                    .OrderBy(o => Array.FindIndex(field.UserIds, x => string.Equals(o.UserId, x, StringComparison.OrdinalIgnoreCase)));
 
-                    foreach (var user in users)
+                foreach (var user in users)
+                {
+                    model.SelectedUsers.Add(new VueMultiselectUserViewModel
                     {
-                        model.SelectedUsers.Add(new VueMultiselectUserViewModel
-                        {
-                            Id = user.UserId,
-                            DisplayText = user.UserName,
-                            IsEnabled = user.IsEnabled
-                        });
-                    }
+                        Id = user.UserId,
+                        DisplayText = user.UserName,
+                        IsEnabled = user.IsEnabled
+                    });
                 }
-            });
-        }
+            }
+        });
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(UserPickerField field, UpdateFieldEditorContext context)
-        {
-            var viewModel = new EditUserPickerFieldViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(UserPickerField field, UpdateFieldEditorContext context)
+    {
+        var viewModel = new EditUserPickerFieldViewModel();
 
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix, f => f.UserIds);
-            field.UserIds = viewModel.UserIds == null
-                ? [] : viewModel.UserIds.Split(',', StringSplitOptions.RemoveEmptyEntries);
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix, f => f.UserIds);
+        field.UserIds = viewModel.UserIds == null
+            ? [] : viewModel.UserIds.Split(',', StringSplitOptions.RemoveEmptyEntries);
 
-            var settings = context.PartFieldDefinition.GetSettings<UserPickerFieldSettings>();
+        var settings = context.PartFieldDefinition.GetSettings<UserPickerFieldSettings>();
 
-            if (settings.Required && field.UserIds.Length == 0)
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(field.UserIds), S["The value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
-            }
+        if (settings.Required && field.UserIds.Length == 0)
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(field.UserIds), S["The value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
+        }
 
-            if (!settings.Multiple && field.UserIds.Length > 1)
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(field.UserIds), S["The {0} field cannot contain multiple items.", context.PartFieldDefinition.DisplayName()]);
-            }
+        if (!settings.Multiple && field.UserIds.Length > 1)
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(field.UserIds), S["The {0} field cannot contain multiple items.", context.PartFieldDefinition.DisplayName()]);
+        }
 
-            var users = await _session.Query<User, UserIndex>().Where(x => x.UserId.IsIn(field.UserIds)).ListAsync();
-            field.SetUserNames(users.Select(t => t.UserName).ToArray());
+        var users = await _session.Query<User, UserIndex>().Where(x => x.UserId.IsIn(field.UserIds)).ListAsync();
+        field.SetUserNames(users.Select(t => t.UserName).ToArray());
 
-            return Edit(field, context);
-        }
+        return Edit(field, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/UserPickerFieldUserNamesDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/UserPickerFieldUserNamesDisplayDriver.cs
index 91bdbaf8abc..1917b05a09e 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/UserPickerFieldUserNamesDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/UserPickerFieldUserNamesDisplayDriver.cs
@@ -4,20 +4,19 @@
 using OrchardCore.ContentManagement.Display.Models;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentFields.Drivers
+namespace OrchardCore.ContentFields.Drivers;
+
+public sealed class UserPickerFieldUserNamesDisplayDriver : ContentFieldDisplayDriver<UserPickerField>
 {
-    public sealed class UserPickerFieldUserNamesDisplayDriver : ContentFieldDisplayDriver<UserPickerField>
+    public override IDisplayResult Display(UserPickerField field, BuildFieldDisplayContext context)
     {
-        public override IDisplayResult Display(UserPickerField field, BuildFieldDisplayContext context)
+        return Initialize<DisplayUserPickerFieldUserNamesViewModel>(GetDisplayShapeType(context), model =>
         {
-            return Initialize<DisplayUserPickerFieldUserNamesViewModel>(GetDisplayShapeType(context), model =>
-            {
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            })
-            .Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        })
+        .Location("Detail", "Content")
+        .Location("Summary", "Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/YoutubeFieldDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/YoutubeFieldDisplayDriver.cs
index a001454f965..b57bcd6d89e 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/YoutubeFieldDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/YoutubeFieldDisplayDriver.cs
@@ -12,88 +12,87 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.ContentFields.Drivers
+namespace OrchardCore.ContentFields.Drivers;
+
+public sealed class YoutubeFieldDisplayDriver : ContentFieldDisplayDriver<YoutubeField>
 {
-    public sealed class YoutubeFieldDisplayDriver : ContentFieldDisplayDriver<YoutubeField>
+    internal readonly IStringLocalizer S;
+
+    public YoutubeFieldDisplayDriver(IStringLocalizer<YoutubeFieldDisplayDriver> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public YoutubeFieldDisplayDriver(IStringLocalizer<YoutubeFieldDisplayDriver> localizer)
+    public override IDisplayResult Display(YoutubeField field, BuildFieldDisplayContext context)
+    {
+        return Initialize<YoutubeFieldDisplayViewModel>(GetDisplayShapeType(context), model =>
         {
-            S = localizer;
-        }
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        })
+        .Location("Detail", "Content")
+        .Location("Summary", "Content");
+    }
 
-        public override IDisplayResult Display(YoutubeField field, BuildFieldDisplayContext context)
-        {
-            return Initialize<YoutubeFieldDisplayViewModel>(GetDisplayShapeType(context), model =>
-            {
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            })
-            .Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
+    public override IDisplayResult Edit(YoutubeField field, BuildFieldEditorContext context)
+    {
+        return Initialize<EditYoutubeFieldViewModel>(GetEditorShapeType(context), model =>
+       {
+           model.RawAddress = field.RawAddress;
+           model.EmbeddedAddress = field.EmbeddedAddress;
+           model.Field = field;
+           model.Part = context.ContentPart;
+           model.PartFieldDefinition = context.PartFieldDefinition;
+       });
+    }
 
-        public override IDisplayResult Edit(YoutubeField field, BuildFieldEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(YoutubeField field, UpdateFieldEditorContext context)
+    {
+        var model = new EditYoutubeFieldViewModel();
+
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
+        var settings = context.PartFieldDefinition.GetSettings<YoutubeFieldSettings>();
+
+        if (settings.Required && string.IsNullOrWhiteSpace(model.RawAddress))
         {
-            return Initialize<EditYoutubeFieldViewModel>(GetEditorShapeType(context), model =>
-           {
-               model.RawAddress = field.RawAddress;
-               model.EmbeddedAddress = field.EmbeddedAddress;
-               model.Field = field;
-               model.Part = context.ContentPart;
-               model.PartFieldDefinition = context.PartFieldDefinition;
-           });
+            context.Updater.ModelState.AddModelError(Prefix, nameof(model.RawAddress), S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
         }
-
-        public override async Task<IDisplayResult> UpdateAsync(YoutubeField field, UpdateFieldEditorContext context)
+        else
         {
-            var model = new EditYoutubeFieldViewModel();
-
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
-            var settings = context.PartFieldDefinition.GetSettings<YoutubeFieldSettings>();
-
-            if (settings.Required && string.IsNullOrWhiteSpace(model.RawAddress))
+            if (model.RawAddress != null)
             {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(model.RawAddress), S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
-            }
-            else
-            {
-                if (model.RawAddress != null)
-                {
-                    var uri = new Uri(model.RawAddress);
+                var uri = new Uri(model.RawAddress);
 
-                    // If it is a url with QueryString.
-                    if (!string.IsNullOrWhiteSpace(uri.Query))
+                // If it is a url with QueryString.
+                if (!string.IsNullOrWhiteSpace(uri.Query))
+                {
+                    var query = QueryHelpers.ParseQuery(uri.Query);
+                    if (query.TryGetValue("v", out var values))
                     {
-                        var query = QueryHelpers.ParseQuery(uri.Query);
-                        if (query.TryGetValue("v", out var values))
-                        {
-                            model.EmbeddedAddress = $"{uri.GetLeftPart(UriPartial.Authority)}/embed/{values}";
-                        }
-                        else
-                        {
-                            context.Updater.ModelState.AddModelError(Prefix, nameof(model.RawAddress), S["The format of the url is invalid"]);
-                        }
+                        model.EmbeddedAddress = $"{uri.GetLeftPart(UriPartial.Authority)}/embed/{values}";
                     }
                     else
                     {
-                        var path = uri.AbsolutePath.Split('?')[0];
-                        model.EmbeddedAddress = $"{uri.GetLeftPart(UriPartial.Authority)}/embed/{path}";
+                        context.Updater.ModelState.AddModelError(Prefix, nameof(model.RawAddress), S["The format of the url is invalid"]);
                     }
-
-                    field.RawAddress = model.RawAddress;
-                    field.EmbeddedAddress = model.EmbeddedAddress;
                 }
                 else
                 {
-                    field.RawAddress = null;
-                    field.EmbeddedAddress = null;
+                    var path = uri.AbsolutePath.Split('?')[0];
+                    model.EmbeddedAddress = $"{uri.GetLeftPart(UriPartial.Authority)}/embed/{path}";
                 }
-            }
 
-            return Edit(field, context);
+                field.RawAddress = model.RawAddress;
+                field.EmbeddedAddress = model.EmbeddedAddress;
+            }
+            else
+            {
+                field.RawAddress = null;
+                field.EmbeddedAddress = null;
+            }
         }
+
+        return Edit(field, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/BooleanField.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/BooleanField.cs
index 4952fa7f69f..fd3c0364c54 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/BooleanField.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/BooleanField.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.ContentFields.Fields
+namespace OrchardCore.ContentFields.Fields;
+
+public class BooleanField : ContentField
 {
-    public class BooleanField : ContentField
-    {
-        public bool Value { get; set; }
-    }
+    public bool Value { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/ContentPickerField.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/ContentPickerField.cs
index e0bd478e109..98ba3c61404 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/ContentPickerField.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/ContentPickerField.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.ContentFields.Fields
+namespace OrchardCore.ContentFields.Fields;
+
+public class ContentPickerField : ContentField
 {
-    public class ContentPickerField : ContentField
-    {
-        public string[] ContentItemIds { get; set; } = [];
-    }
+    public string[] ContentItemIds { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/DateField.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/DateField.cs
index 828075ab0ed..9fe8204559c 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/DateField.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/DateField.cs
@@ -1,10 +1,9 @@
 using System;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.ContentFields.Fields
+namespace OrchardCore.ContentFields.Fields;
+
+public class DateField : ContentField
 {
-    public class DateField : ContentField
-    {
-        public DateTime? Value { get; set; }
-    }
+    public DateTime? Value { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/DateTimeField.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/DateTimeField.cs
index cb066cdbca4..bc8ae486966 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/DateTimeField.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/DateTimeField.cs
@@ -1,10 +1,9 @@
 using System;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.ContentFields.Fields
+namespace OrchardCore.ContentFields.Fields;
+
+public class DateTimeField : ContentField
 {
-    public class DateTimeField : ContentField
-    {
-        public DateTime? Value { get; set; }
-    }
+    public DateTime? Value { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/HtmlField.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/HtmlField.cs
index fd25e7388a5..9a71287a4ee 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/HtmlField.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/HtmlField.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.ContentFields.Fields
+namespace OrchardCore.ContentFields.Fields;
+
+public class HtmlField : ContentField
 {
-    public class HtmlField : ContentField
-    {
-        public string Html { get; set; }
-    }
+    public string Html { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/LinkField.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/LinkField.cs
index cc6f9781929..027ac33a02d 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/LinkField.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/LinkField.cs
@@ -1,13 +1,12 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.ContentFields.Fields
+namespace OrchardCore.ContentFields.Fields;
+
+public class LinkField : ContentField
 {
-    public class LinkField : ContentField
-    {
-        public string Url { get; set; }
+    public string Url { get; set; }
 
-        public string Text { get; set; }
+    public string Text { get; set; }
 
-        public string Target { get; set; }
-    }
+    public string Target { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/LocalizationSetContentPickerField.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/LocalizationSetContentPickerField.cs
index 4b0085ffadd..4990bf84365 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/LocalizationSetContentPickerField.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/LocalizationSetContentPickerField.cs
@@ -1,11 +1,10 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentFields.Fields
+namespace OrchardCore.ContentFields.Fields;
+
+[RequireFeatures("OrchardCore.ContentLocalization")]
+public class LocalizationSetContentPickerField : ContentField
 {
-    [RequireFeatures("OrchardCore.ContentLocalization")]
-    public class LocalizationSetContentPickerField : ContentField
-    {
-        public string[] LocalizationSets { get; set; } = [];
-    }
+    public string[] LocalizationSets { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/MultiTextField.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/MultiTextField.cs
index b48f8db2219..f49301261e6 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/MultiTextField.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/MultiTextField.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.ContentFields.Fields
+namespace OrchardCore.ContentFields.Fields;
+
+public class MultiTextField : ContentField
 {
-    public class MultiTextField : ContentField
-    {
-        public string[] Values { get; set; } = [];
-    }
+    public string[] Values { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/NumericField.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/NumericField.cs
index 0e9e889f1e6..f5a9b3c296e 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/NumericField.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/NumericField.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.ContentFields.Fields
+namespace OrchardCore.ContentFields.Fields;
+
+public class NumericField : ContentField
 {
-    public class NumericField : ContentField
-    {
-        public decimal? Value { get; set; }
-    }
+    public decimal? Value { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/TextField.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/TextField.cs
index f85e5091fdb..6c3d562a5cc 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/TextField.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/TextField.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.ContentFields.Fields
+namespace OrchardCore.ContentFields.Fields;
+
+public class TextField : ContentField
 {
-    public class TextField : ContentField
-    {
-        public string Text { get; set; }
-    }
+    public string Text { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/TimeField.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/TimeField.cs
index f00265a0dff..9ca12318857 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/TimeField.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/TimeField.cs
@@ -1,10 +1,9 @@
 using System;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.ContentFields.Fields
+namespace OrchardCore.ContentFields.Fields;
+
+public class TimeField : ContentField
 {
-    public class TimeField : ContentField
-    {
-        public TimeSpan? Value { get; set; }
-    }
+    public TimeSpan? Value { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/UserNamesExtensions.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/UserNamesExtensions.cs
index 946eb526e9b..76937c377ef 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/UserNamesExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/UserNamesExtensions.cs
@@ -1,31 +1,30 @@
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.ContentFields.Fields
+namespace OrchardCore.ContentFields.Fields;
+
+public static class UserNamesExtensions
 {
-    public static class UserNamesExtensions
+    /// <summary>
+    /// User names are a less well known property of a <see cref="UserPickerField"/>.
+    /// </summary>
+    /// <remarks>
+    /// This property is stored when the <see cref="UserPickerField"/> is saved, not when the <see cref="OrchardCore.Users.Models.User.UserName"/> value changes.
+    /// </remarks>
+    public static string[] GetUserNames(this UserPickerField userPickerField)
     {
-        /// <summary>
-        /// User names are a less well known property of a <see cref="UserPickerField"/>.
-        /// </summary>
-        /// <remarks>
-        /// This property is stored when the <see cref="UserPickerField"/> is saved, not when the <see cref="OrchardCore.Users.Models.User.UserName"/> value changes.
-        /// </remarks>
-        public static string[] GetUserNames(this UserPickerField userPickerField)
-        {
-            var userNames = (JsonArray)userPickerField.Content["UserNames"];
+        var userNames = (JsonArray)userPickerField.Content["UserNames"];
 
-            return userNames is not null ? userNames.ToObject<string[]>() : [];
-        }
+        return userNames is not null ? userNames.ToObject<string[]>() : [];
+    }
 
-        /// <summary>
-        /// User names are a less well known property of a <see cref="UserPickerField"/>.
-        /// </summary>
-        /// <remarks>
-        /// This property is stored when the <see cref="UserPickerField"/> is saved, not when the <see cref="OrchardCore.Users.Models.User.UserName"/> value changes.
-        /// </remarks>
-        public static void SetUserNames(this UserPickerField userPickerField, string[] userNames)
-        {
-            userPickerField.Content["UserNames"] = JArray.FromObject(userNames);
-        }
+    /// <summary>
+    /// User names are a less well known property of a <see cref="UserPickerField"/>.
+    /// </summary>
+    /// <remarks>
+    /// This property is stored when the <see cref="UserPickerField"/> is saved, not when the <see cref="OrchardCore.Users.Models.User.UserName"/> value changes.
+    /// </remarks>
+    public static void SetUserNames(this UserPickerField userPickerField, string[] userNames)
+    {
+        userPickerField.Content["UserNames"] = JArray.FromObject(userNames);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/UserPickerField.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/UserPickerField.cs
index c1e4004c257..0c1c1f5070c 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/UserPickerField.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/UserPickerField.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.ContentFields.Fields
+namespace OrchardCore.ContentFields.Fields;
+
+public class UserPickerField : ContentField
 {
-    public class UserPickerField : ContentField
-    {
-        public string[] UserIds { get; set; } = [];
-    }
+    public string[] UserIds { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/YoutubeField.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/YoutubeField.cs
index d6b25c25768..067d7c8f1e4 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/YoutubeField.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/YoutubeField.cs
@@ -1,10 +1,9 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.ContentFields.Fields
+namespace OrchardCore.ContentFields.Fields;
+
+public class YoutubeField : ContentField
 {
-    public class YoutubeField : ContentField
-    {
-        public string EmbeddedAddress { get; set; }
-        public string RawAddress { get; set; }
-    }
+    public string EmbeddedAddress { get; set; }
+    public string RawAddress { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Fields/ContentFieldsProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Fields/ContentFieldsProvider.cs
index a086ade21cb..fc4cdae8090 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Fields/ContentFieldsProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Fields/ContentFieldsProvider.cs
@@ -10,156 +10,155 @@
 using OrchardCore.ContentManagement.GraphQL.Queries.Types;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.GraphQL.Fields
+namespace OrchardCore.ContentFields.GraphQL.Fields;
+
+public class ContentFieldsProvider : IContentFieldProvider
 {
-    public class ContentFieldsProvider : IContentFieldProvider
+    private static readonly FrozenDictionary<string, FieldTypeDescriptor> _contentFieldTypeMappings = new Dictionary<string, FieldTypeDescriptor>()
     {
-        private static readonly FrozenDictionary<string, FieldTypeDescriptor> _contentFieldTypeMappings = new Dictionary<string, FieldTypeDescriptor>()
         {
+            nameof(BooleanField),
+            new FieldTypeDescriptor
             {
-                nameof(BooleanField),
-                new FieldTypeDescriptor
-                {
-                    Description = "Boolean field",
-                    FieldType = typeof(BooleanGraphType),
-                    UnderlyingType = typeof(BooleanField),
-                    FieldAccessor = field => ((BooleanField)field).Value,
-                    IndexType = typeof(BooleanFieldIndex),
-                    Index = nameof(BooleanFieldIndex.Boolean)
-                }
-            },
-            {
-                nameof(DateField),
-                new FieldTypeDescriptor
-                {
-                    Description = "Date field",
-                    FieldType = typeof(DateGraphType),
-                    UnderlyingType = typeof(DateField),
-                    FieldAccessor = field => ((DateField)field).Value,
-                    IndexType = typeof(DateFieldIndex),
-                    Index = nameof(DateFieldIndex.Date)
-                }
-            },
+                Description = "Boolean field",
+                FieldType = typeof(BooleanGraphType),
+                UnderlyingType = typeof(BooleanField),
+                FieldAccessor = field => ((BooleanField)field).Value,
+                IndexType = typeof(BooleanFieldIndex),
+                Index = nameof(BooleanFieldIndex.Boolean)
+            }
+        },
+        {
+            nameof(DateField),
+            new FieldTypeDescriptor
             {
-                nameof(DateTimeField),
-                new FieldTypeDescriptor
-                {
-                    Description = "Date & time field",
-                    FieldType = typeof(DateTimeGraphType),
-                    UnderlyingType = typeof(DateTimeField),
-                    FieldAccessor = field => ((DateTimeField)field).Value,
-                    IndexType = typeof(DateTimeFieldIndex),
-                    Index = nameof(DateTimeFieldIndex.DateTime)
-                }
-            },
+                Description = "Date field",
+                FieldType = typeof(DateGraphType),
+                UnderlyingType = typeof(DateField),
+                FieldAccessor = field => ((DateField)field).Value,
+                IndexType = typeof(DateFieldIndex),
+                Index = nameof(DateFieldIndex.Date)
+            }
+        },
+        {
+            nameof(DateTimeField),
+            new FieldTypeDescriptor
             {
-                nameof(NumericField),
-                new FieldTypeDescriptor
-                {
-                    Description = "Numeric field",
-                    FieldType = typeof(DecimalGraphType),
-                    UnderlyingType = typeof(NumericField),
-                    FieldAccessor = field => ((NumericField)field).Value,
-                    IndexType = typeof(NumericFieldIndex),
-                    Index = nameof(NumericFieldIndex.Numeric)
-                }
-            },
+                Description = "Date & time field",
+                FieldType = typeof(DateTimeGraphType),
+                UnderlyingType = typeof(DateTimeField),
+                FieldAccessor = field => ((DateTimeField)field).Value,
+                IndexType = typeof(DateTimeFieldIndex),
+                Index = nameof(DateTimeFieldIndex.DateTime)
+            }
+        },
+        {
+            nameof(NumericField),
+            new FieldTypeDescriptor
             {
-                nameof(TextField),
-                new FieldTypeDescriptor
-                {
-                    Description = "Text field",
-                    FieldType = typeof(StringGraphType),
-                    UnderlyingType = typeof(TextField),
-                    FieldAccessor = field => ((TextField)field).Text,
-                    IndexType = typeof(TextFieldIndex),
-                    Index = nameof(TextFieldIndex.Text)
-                }
-            },
+                Description = "Numeric field",
+                FieldType = typeof(DecimalGraphType),
+                UnderlyingType = typeof(NumericField),
+                FieldAccessor = field => ((NumericField)field).Value,
+                IndexType = typeof(NumericFieldIndex),
+                Index = nameof(NumericFieldIndex.Numeric)
+            }
+        },
+        {
+            nameof(TextField),
+            new FieldTypeDescriptor
             {
-                nameof(TimeField),
-                new FieldTypeDescriptor
-                {
-                    Description = "Time field",
-                    FieldType = typeof(TimeSpanGraphType),
-                    UnderlyingType = typeof(TimeField),
-                    FieldAccessor = field => ((TimeField)field).Value,
-                    IndexType = typeof(TimeFieldIndex),
-                    Index = nameof(TimeFieldIndex.Time)
-                }
-            },
+                Description = "Text field",
+                FieldType = typeof(StringGraphType),
+                UnderlyingType = typeof(TextField),
+                FieldAccessor = field => ((TextField)field).Text,
+                IndexType = typeof(TextFieldIndex),
+                Index = nameof(TextFieldIndex.Text)
+            }
+        },
+        {
+            nameof(TimeField),
+            new FieldTypeDescriptor
             {
-                nameof(MultiTextField),
-                new FieldTypeDescriptor
-                {
-                    Description = "Multi text field",
-                    FieldType = typeof(ListGraphType<StringGraphType>),
-                    UnderlyingType = typeof(MultiTextField),
-                    FieldAccessor = field => ((MultiTextField)field).Values,
-                }
+                Description = "Time field",
+                FieldType = typeof(TimeSpanGraphType),
+                UnderlyingType = typeof(TimeField),
+                FieldAccessor = field => ((TimeField)field).Value,
+                IndexType = typeof(TimeFieldIndex),
+                Index = nameof(TimeFieldIndex.Time)
             }
-        }.ToFrozenDictionary();
-
-        public FieldType GetField(ISchema schema, ContentPartFieldDefinition field, string namedPartTechnicalName, string customFieldName)
+        },
         {
-            if (!_contentFieldTypeMappings.TryGetValue(field.FieldDefinition.Name, out var fieldDescriptor))
+            nameof(MultiTextField),
+            new FieldTypeDescriptor
             {
-                return null;
+                Description = "Multi text field",
+                FieldType = typeof(ListGraphType<StringGraphType>),
+                UnderlyingType = typeof(MultiTextField),
+                FieldAccessor = field => ((MultiTextField)field).Values,
             }
+        }
+    }.ToFrozenDictionary();
+
+    public FieldType GetField(ISchema schema, ContentPartFieldDefinition field, string namedPartTechnicalName, string customFieldName)
+    {
+        if (!_contentFieldTypeMappings.TryGetValue(field.FieldDefinition.Name, out var fieldDescriptor))
+        {
+            return null;
+        }
 
-            return new FieldType
+        return new FieldType
+        {
+            Name = customFieldName ?? field.Name,
+            Description = fieldDescriptor.Description,
+            Type = fieldDescriptor.FieldType,
+            Resolver = new FuncFieldResolver<ContentElement, object>(context =>
             {
-                Name = customFieldName ?? field.Name,
-                Description = fieldDescriptor.Description,
-                Type = fieldDescriptor.FieldType,
-                Resolver = new FuncFieldResolver<ContentElement, object>(context =>
-                {
-                    // Check if part has been collapsed by trying to get the parent part.
-                    ContentElement contentPart = context.Source.Get<ContentPart>(field.PartDefinition.Name);
+                // Check if part has been collapsed by trying to get the parent part.
+                ContentElement contentPart = context.Source.Get<ContentPart>(field.PartDefinition.Name);
 
-                    // Part is not collapsed, access field directly.
-                    contentPart ??= context.Source;
+                // Part is not collapsed, access field directly.
+                contentPart ??= context.Source;
 
-                    var contentField = contentPart?.Get(fieldDescriptor.UnderlyingType, field.Name);
+                var contentField = contentPart?.Get(fieldDescriptor.UnderlyingType, field.Name);
 
-                    contentField ??= context.Source.Get(fieldDescriptor.UnderlyingType, field.Name);
+                contentField ??= context.Source.Get(fieldDescriptor.UnderlyingType, field.Name);
 
-                    return contentField == null ? null : fieldDescriptor.FieldAccessor(contentField);
-                }),
-            };
-        }
+                return contentField == null ? null : fieldDescriptor.FieldAccessor(contentField);
+            }),
+        };
+    }
 
-        public bool HasField(ISchema schema, ContentPartFieldDefinition field) => _contentFieldTypeMappings.ContainsKey(field.FieldDefinition.Name);
+    public bool HasField(ISchema schema, ContentPartFieldDefinition field) => _contentFieldTypeMappings.ContainsKey(field.FieldDefinition.Name);
 
-        public FieldTypeIndexDescriptor GetFieldIndex(ContentPartFieldDefinition field)
+    public FieldTypeIndexDescriptor GetFieldIndex(ContentPartFieldDefinition field)
+    {
+        if (!HasFieldIndex(field))
         {
-            if (!HasFieldIndex(field))
-            {
-                return null;
-            }
-
-            var fieldDescriptor = _contentFieldTypeMappings[field.FieldDefinition.Name];
-
-            return new FieldTypeIndexDescriptor
-            {
-                Index = fieldDescriptor.Index,
-                IndexType = fieldDescriptor.IndexType
-            };
+            return null;
         }
 
-        public bool HasFieldIndex(ContentPartFieldDefinition field) =>
-            _contentFieldTypeMappings.TryGetValue(field.FieldDefinition.Name, out var fieldTypeDescriptor) &&
-            fieldTypeDescriptor.IndexType != null &&
-            !string.IsNullOrWhiteSpace(fieldTypeDescriptor.Index);
+        var fieldDescriptor = _contentFieldTypeMappings[field.FieldDefinition.Name];
 
-        private sealed class FieldTypeDescriptor
+        return new FieldTypeIndexDescriptor
         {
-            public string Description { get; set; }
-            public Type FieldType { get; set; }
-            public Type UnderlyingType { get; set; }
-            public Func<ContentElement, object> FieldAccessor { get; set; }
-            public string Index { get; set; }
-            public Type IndexType { get; set; }
-        }
+            Index = fieldDescriptor.Index,
+            IndexType = fieldDescriptor.IndexType
+        };
+    }
+
+    public bool HasFieldIndex(ContentPartFieldDefinition field) =>
+        _contentFieldTypeMappings.TryGetValue(field.FieldDefinition.Name, out var fieldTypeDescriptor) &&
+        fieldTypeDescriptor.IndexType != null &&
+        !string.IsNullOrWhiteSpace(fieldTypeDescriptor.Index);
+
+    private sealed class FieldTypeDescriptor
+    {
+        public string Description { get; set; }
+        public Type FieldType { get; set; }
+        public Type UnderlyingType { get; set; }
+        public Func<ContentElement, object> FieldAccessor { get; set; }
+        public string Index { get; set; }
+        public Type IndexType { get; set; }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Fields/ObjectGraphTypeFieldProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Fields/ObjectGraphTypeFieldProvider.cs
index 79bac8e52df..9228cebf9c2 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Fields/ObjectGraphTypeFieldProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Fields/ObjectGraphTypeFieldProvider.cs
@@ -6,56 +6,55 @@
 using OrchardCore.ContentManagement.GraphQL.Queries.Types;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.GraphQL.Fields
+namespace OrchardCore.ContentFields.GraphQL.Fields;
+
+public class ObjectGraphTypeFieldProvider : IContentFieldProvider
 {
-    public class ObjectGraphTypeFieldProvider : IContentFieldProvider
+    public ObjectGraphTypeFieldProvider()
     {
-        public ObjectGraphTypeFieldProvider()
-        {
-        }
+    }
 
-        public FieldType GetField(ISchema schema, ContentPartFieldDefinition field, string namedPartTechnicalName, string customFieldName)
-        {
-            var queryGraphType = GetObjectGraphType(schema, field);
+    public FieldType GetField(ISchema schema, ContentPartFieldDefinition field, string namedPartTechnicalName, string customFieldName)
+    {
+        var queryGraphType = GetObjectGraphType(schema, field);
 
-            if (queryGraphType != null)
+        if (queryGraphType != null)
+        {
+            return new FieldType
             {
-                return new FieldType
+                Name = customFieldName ?? field.Name,
+                Description = field.FieldDefinition.Name,
+                ResolvedType = queryGraphType,
+                Resolver = new FuncFieldResolver<ContentElement, ContentElement>(context =>
                 {
-                    Name = customFieldName ?? field.Name,
-                    Description = field.FieldDefinition.Name,
-                    ResolvedType = queryGraphType,
-                    Resolver = new FuncFieldResolver<ContentElement, ContentElement>(context =>
-                    {
-                        var typeToResolve = context.FieldDefinition.ResolvedType.GetType().BaseType
-                            .GetGenericArguments().First();
-
-                        // Check if part has been collapsed by trying to get the parent part.
-                        ContentElement contentPart = context.Source.Get<ContentPart>(field.PartDefinition.Name);
-
-                        // Part is not collapsed, access field directly.
-                        contentPart ??= context.Source;
-
-                        var contentField = contentPart?.Get(typeToResolve, field.Name);
-                        return contentField;
-                    })
-                };
-            }
-
-            return null;
-        }
+                    var typeToResolve = context.FieldDefinition.ResolvedType.GetType().BaseType
+                        .GetGenericArguments().First();
 
-        public FieldTypeIndexDescriptor GetFieldIndex(ContentPartFieldDefinition field)
-        {
-            return null;
-        }
+                    // Check if part has been collapsed by trying to get the parent part.
+                    ContentElement contentPart = context.Source.Get<ContentPart>(field.PartDefinition.Name);
+
+                    // Part is not collapsed, access field directly.
+                    contentPart ??= context.Source;
 
-        public bool HasField(ISchema schema, ContentPartFieldDefinition field) => GetObjectGraphType(schema, field) != null;
+                    var contentField = contentPart?.Get(typeToResolve, field.Name);
+                    return contentField;
+                })
+            };
+        }
 
-        public bool HasFieldIndex(ContentPartFieldDefinition field) => false;
+        return null;
+    }
 
-        private static IObjectGraphType GetObjectGraphType(ISchema schema, ContentPartFieldDefinition field) =>
-            schema.AdditionalTypeInstances
-                .FirstOrDefault(x => x is IObjectGraphType && x.GetType().BaseType.GetGenericArguments().First().Name == field.FieldDefinition.Name) as IObjectGraphType;
+    public FieldTypeIndexDescriptor GetFieldIndex(ContentPartFieldDefinition field)
+    {
+        return null;
     }
+
+    public bool HasField(ISchema schema, ContentPartFieldDefinition field) => GetObjectGraphType(schema, field) != null;
+
+    public bool HasFieldIndex(ContentPartFieldDefinition field) => false;
+
+    private static IObjectGraphType GetObjectGraphType(ISchema schema, ContentPartFieldDefinition field) =>
+        schema.AdditionalTypeInstances
+            .FirstOrDefault(x => x is IObjectGraphType && x.GetType().BaseType.GetGenericArguments().First().Name == field.FieldDefinition.Name) as IObjectGraphType;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Startup.cs
index 7def97b2aa1..4cbb31e4766 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Startup.cs
@@ -7,29 +7,28 @@
 using OrchardCore.ContentManagement.GraphQL.Queries.Types;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentFields.GraphQL
+namespace OrchardCore.ContentFields.GraphQL;
+
+[RequireFeatures("OrchardCore.Apis.GraphQL")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Apis.GraphQL")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddTransient<IContentFieldProvider, ObjectGraphTypeFieldProvider>();
-            services.AddTransient<IContentFieldProvider, ContentFieldsProvider>();
+        services.AddTransient<IContentFieldProvider, ObjectGraphTypeFieldProvider>();
+        services.AddTransient<IContentFieldProvider, ContentFieldsProvider>();
 
-            services.AddObjectGraphType<LinkField, LinkFieldQueryObjectType>();
-            services.AddObjectGraphType<HtmlField, HtmlFieldQueryObjectType>();
-            services.AddObjectGraphType<ContentPickerField, ContentPickerFieldQueryObjectType>();
-            services.AddObjectGraphType<UserPickerField, UserPickerFieldQueryObjectType>();
-        }
+        services.AddObjectGraphType<LinkField, LinkFieldQueryObjectType>();
+        services.AddObjectGraphType<HtmlField, HtmlFieldQueryObjectType>();
+        services.AddObjectGraphType<ContentPickerField, ContentPickerFieldQueryObjectType>();
+        services.AddObjectGraphType<UserPickerField, UserPickerFieldQueryObjectType>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Apis.GraphQL", "OrchardCore.ContentFields.Indexing.SQL")]
-    public class IndexStartup : StartupBase
+[RequireFeatures("OrchardCore.Apis.GraphQL", "OrchardCore.ContentFields.Indexing.SQL")]
+public class IndexStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddContentFieldsInputGraphQL();
-        }
+        services.AddContentFieldsInputGraphQL();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Types/ContentPickerFieldQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Types/ContentPickerFieldQueryObjectType.cs
index dbbf3464b65..466945adba4 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Types/ContentPickerFieldQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Types/ContentPickerFieldQueryObjectType.cs
@@ -8,34 +8,33 @@
 using OrchardCore.ContentManagement.GraphQL;
 using OrchardCore.ContentManagement.GraphQL.Queries.Types;
 
-namespace OrchardCore.ContentFields.GraphQL
+namespace OrchardCore.ContentFields.GraphQL;
+
+public class ContentPickerFieldQueryObjectType : ObjectGraphType<ContentPickerField>
 {
-    public class ContentPickerFieldQueryObjectType : ObjectGraphType<ContentPickerField>
+    public ContentPickerFieldQueryObjectType()
     {
-        public ContentPickerFieldQueryObjectType()
-        {
-            Name = nameof(ContentPickerField);
+        Name = nameof(ContentPickerField);
 
-            Field<ListGraphType<StringGraphType>, IEnumerable<string>>("contentItemIds")
-                .Description("content item ids")
-                .PagingArguments()
-                .Resolve(x =>
-                {
-                    return x.Page(x.Source.ContentItemIds);
-                });
+        Field<ListGraphType<StringGraphType>, IEnumerable<string>>("contentItemIds")
+            .Description("content item ids")
+            .PagingArguments()
+            .Resolve(x =>
+            {
+                return x.Page(x.Source.ContentItemIds);
+            });
 
-            Field<ListGraphType<ContentItemInterface>, IEnumerable<ContentItem>>("contentItems")
-                .Description("the content items")
-                .PagingArguments()
-                .ResolveAsync(x =>
-                {
-                    var contentItemLoader = x.GetOrAddPublishedContentItemByIdDataLoader();
+        Field<ListGraphType<ContentItemInterface>, IEnumerable<ContentItem>>("contentItems")
+            .Description("the content items")
+            .PagingArguments()
+            .ResolveAsync(x =>
+            {
+                var contentItemLoader = x.GetOrAddPublishedContentItemByIdDataLoader();
 
-                    return (contentItemLoader.LoadAsync(x.Page(x.Source.ContentItemIds))).Then(itemResultSet =>
-                    {
-                        return itemResultSet.SelectMany(x => x);
-                    });
+                return (contentItemLoader.LoadAsync(x.Page(x.Source.ContentItemIds))).Then(itemResultSet =>
+                {
+                    return itemResultSet.SelectMany(x => x);
                 });
-        }
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Types/HtmlFieldQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Types/HtmlFieldQueryObjectType.cs
index b9c6bc98910..6d994a440fd 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Types/HtmlFieldQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Types/HtmlFieldQueryObjectType.cs
@@ -19,61 +19,60 @@
 using OrchardCore.Shortcodes.Services;
 using Shortcodes;
 
-namespace OrchardCore.ContentFields.GraphQL
+namespace OrchardCore.ContentFields.GraphQL;
+
+public class HtmlFieldQueryObjectType : ObjectGraphType<HtmlField>
 {
-    public class HtmlFieldQueryObjectType : ObjectGraphType<HtmlField>
+    public HtmlFieldQueryObjectType(IStringLocalizer<HtmlFieldQueryObjectType> S)
     {
-        public HtmlFieldQueryObjectType(IStringLocalizer<HtmlFieldQueryObjectType> S)
-        {
-            Name = nameof(HtmlField);
-            Description = S["Content stored as HTML."];
+        Name = nameof(HtmlField);
+        Description = S["Content stored as HTML."];
 
-            Field<StringGraphType>("html")
-                .Description(S["the HTML content"])
-                .ResolveLockedAsync(RenderHtml);
-        }
+        Field<StringGraphType>("html")
+            .Description(S["the HTML content"])
+            .ResolveLockedAsync(RenderHtml);
+    }
 
-        private static async ValueTask<object> RenderHtml(IResolveFieldContext<HtmlField> ctx)
-        {
-            var serviceProvider = ctx.RequestServices;
-            var shortcodeService = serviceProvider.GetRequiredService<IShortcodeService>();
-            var contentDefinitionManager = serviceProvider.GetRequiredService<IContentDefinitionManager>();
+    private static async ValueTask<object> RenderHtml(IResolveFieldContext<HtmlField> ctx)
+    {
+        var serviceProvider = ctx.RequestServices;
+        var shortcodeService = serviceProvider.GetRequiredService<IShortcodeService>();
+        var contentDefinitionManager = serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-            var jObject = (JsonObject)ctx.Source.Content;
-            // The JObject.Path is consistent here even when contained in a bag part.
-            var jsonPath = jObject.GetNormalizedPath();
-            var paths = jsonPath.Split('.');
-            var partName = paths[0];
-            var fieldName = paths[1];
-            var contentTypeDefinition = await contentDefinitionManager.GetTypeDefinitionAsync(ctx.Source.ContentItem.ContentType);
-            var contentPartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.Name, partName, StringComparison.Ordinal));
-            var contentPartFieldDefinition = contentPartDefinition.PartDefinition.Fields.FirstOrDefault(x => string.Equals(x.Name, fieldName, StringComparison.Ordinal));
-            var settings = contentPartFieldDefinition.GetSettings<HtmlFieldSettings>();
+        var jObject = (JsonObject)ctx.Source.Content;
+        // The JObject.Path is consistent here even when contained in a bag part.
+        var jsonPath = jObject.GetNormalizedPath();
+        var paths = jsonPath.Split('.');
+        var partName = paths[0];
+        var fieldName = paths[1];
+        var contentTypeDefinition = await contentDefinitionManager.GetTypeDefinitionAsync(ctx.Source.ContentItem.ContentType);
+        var contentPartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.Name, partName, StringComparison.Ordinal));
+        var contentPartFieldDefinition = contentPartDefinition.PartDefinition.Fields.FirstOrDefault(x => string.Equals(x.Name, fieldName, StringComparison.Ordinal));
+        var settings = contentPartFieldDefinition.GetSettings<HtmlFieldSettings>();
 
-            var html = ctx.Source.Html;
+        var html = ctx.Source.Html;
 
-            if (!settings.SanitizeHtml)
+        if (!settings.SanitizeHtml)
+        {
+            var model = new EditHtmlFieldViewModel()
             {
-                var model = new EditHtmlFieldViewModel()
-                {
-                    Html = ctx.Source.Html,
-                    Field = ctx.Source,
-                    Part = ctx.Source.ContentItem.Get<ContentPart>(partName),
-                    PartFieldDefinition = contentPartFieldDefinition
-                };
-                var liquidTemplateManager = serviceProvider.GetRequiredService<ILiquidTemplateManager>();
-                var htmlEncoder = serviceProvider.GetService<HtmlEncoder>();
-
-                html = await liquidTemplateManager.RenderStringAsync(html, htmlEncoder, model,
-                    new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(ctx.Source.ContentItem) });
-            }
+                Html = ctx.Source.Html,
+                Field = ctx.Source,
+                Part = ctx.Source.ContentItem.Get<ContentPart>(partName),
+                PartFieldDefinition = contentPartFieldDefinition
+            };
+            var liquidTemplateManager = serviceProvider.GetRequiredService<ILiquidTemplateManager>();
+            var htmlEncoder = serviceProvider.GetService<HtmlEncoder>();
 
-            return await shortcodeService.ProcessAsync(html,
-                new Context
-                {
-                    ["ContentItem"] = ctx.Source.ContentItem,
-                    ["PartFieldDefinition"] = contentPartFieldDefinition
-                });
+            html = await liquidTemplateManager.RenderStringAsync(html, htmlEncoder, model,
+                new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(ctx.Source.ContentItem) });
         }
+
+        return await shortcodeService.ProcessAsync(html,
+            new Context
+            {
+                ["ContentItem"] = ctx.Source.ContentItem,
+                ["PartFieldDefinition"] = contentPartFieldDefinition
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Types/LinkFieldQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Types/LinkFieldQueryObjectType.cs
index bcd85babb09..50c239be081 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Types/LinkFieldQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Types/LinkFieldQueryObjectType.cs
@@ -1,17 +1,16 @@
 using GraphQL.Types;
 using OrchardCore.ContentFields.Fields;
 
-namespace OrchardCore.ContentFields.GraphQL.Types
+namespace OrchardCore.ContentFields.GraphQL.Types;
+
+public class LinkFieldQueryObjectType : ObjectGraphType<LinkField>
 {
-    public class LinkFieldQueryObjectType : ObjectGraphType<LinkField>
+    public LinkFieldQueryObjectType()
     {
-        public LinkFieldQueryObjectType()
-        {
-            Name = nameof(LinkField);
+        Name = nameof(LinkField);
 
-            Field(x => x.Url, nullable: true).Description("the url of the link");
-            Field(x => x.Text, nullable: true).Description("the text of the link");
-            Field(x => x.Target, nullable: true).Description("the target of the link");
-        }
+        Field(x => x.Url, nullable: true).Description("the url of the link");
+        Field(x => x.Text, nullable: true).Description("the text of the link");
+        Field(x => x.Target, nullable: true).Description("the target of the link");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Types/UserPickerFieldQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Types/UserPickerFieldQueryObjectType.cs
index 8f64ae91467..6568aba1b80 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Types/UserPickerFieldQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Types/UserPickerFieldQueryObjectType.cs
@@ -14,51 +14,50 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.ContentFields.GraphQL
+namespace OrchardCore.ContentFields.GraphQL;
+
+public class UserPickerFieldQueryObjectType : ObjectGraphType<UserPickerField>
 {
-    public class UserPickerFieldQueryObjectType : ObjectGraphType<UserPickerField>
+    public UserPickerFieldQueryObjectType(IStringLocalizer<UserPickerFieldQueryObjectType> S)
     {
-        public UserPickerFieldQueryObjectType(IStringLocalizer<UserPickerFieldQueryObjectType> S)
-        {
-            Name = nameof(UserPickerField);
+        Name = nameof(UserPickerField);
 
-            Field<ListGraphType<StringGraphType>, IEnumerable<string>>("userIds")
-                .Description(S["user ids"])
-                .PagingArguments()
-                .Resolve(resolve =>
-                {
-                    return resolve.Page(resolve.Source.UserIds);
-                });
+        Field<ListGraphType<StringGraphType>, IEnumerable<string>>("userIds")
+            .Description(S["user ids"])
+            .PagingArguments()
+            .Resolve(resolve =>
+            {
+                return resolve.Page(resolve.Source.UserIds);
+            });
 
-            Field<ListGraphType<UserType>, IEnumerable<User>>("users")
-                .Description(S["the user items"])
-                .PagingArguments()
-                .ResolveAsync(resolve =>
+        Field<ListGraphType<UserType>, IEnumerable<User>>("users")
+            .Description(S["the user items"])
+            .PagingArguments()
+            .ResolveAsync(resolve =>
+            {
+                var userLoader = GetOrAddUserProfileByIdDataLoader(resolve);
+                return userLoader.LoadAsync(resolve.Page(resolve.Source.UserIds)).Then(itemResultSet =>
                 {
-                    var userLoader = GetOrAddUserProfileByIdDataLoader(resolve);
-                    return userLoader.LoadAsync(resolve.Page(resolve.Source.UserIds)).Then(itemResultSet =>
-                    {
-                        return itemResultSet.SelectMany(users => users);
-                    });
+                    return itemResultSet.SelectMany(users => users);
                 });
-        }
+            });
+    }
 
-        private static IDataLoader<string, IEnumerable<User>> GetOrAddUserProfileByIdDataLoader<T>(IResolveFieldContext<T> context)
-        {
-            var dataLoaderContextAccessor = context.RequestServices.GetRequiredService<IDataLoaderContextAccessor>();
+    private static IDataLoader<string, IEnumerable<User>> GetOrAddUserProfileByIdDataLoader<T>(IResolveFieldContext<T> context)
+    {
+        var dataLoaderContextAccessor = context.RequestServices.GetRequiredService<IDataLoaderContextAccessor>();
 
-            return dataLoaderContextAccessor.Context.GetOrAddCollectionBatchLoader("GetOrAddUserByIds", async (IEnumerable<string> userIds) =>
+        return dataLoaderContextAccessor.Context.GetOrAddCollectionBatchLoader("GetOrAddUserByIds", async (IEnumerable<string> userIds) =>
+        {
+            if (userIds == null || !userIds.Any())
             {
-                if (userIds == null || !userIds.Any())
-                {
-                    return default;
-                }
+                return default;
+            }
 
-                var session = context.RequestServices.GetService<ISession>();
-                var users = await session.Query<User, UserIndex>(user => user.UserId.IsIn(userIds)).ListAsync();
+            var session = context.RequestServices.GetService<ISession>();
+            var users = await session.Query<User, UserIndex>(user => user.UserId.IsIn(userIds)).ListAsync();
 
-                return users.ToLookup(user => user.UserId);
-            });
-        }
+            return users.ToLookup(user => user.UserId);
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/BooleanFieldIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/BooleanFieldIndexHandler.cs
index b44eeb0b0f8..1b5a3392012 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/BooleanFieldIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/BooleanFieldIndexHandler.cs
@@ -2,20 +2,19 @@
 using OrchardCore.ContentFields.Fields;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.ContentFields.Indexing
+namespace OrchardCore.ContentFields.Indexing;
+
+public class BooleanFieldIndexHandler : ContentFieldIndexHandler<BooleanField>
 {
-    public class BooleanFieldIndexHandler : ContentFieldIndexHandler<BooleanField>
+    public override Task BuildIndexAsync(BooleanField field, BuildFieldIndexContext context)
     {
-        public override Task BuildIndexAsync(BooleanField field, BuildFieldIndexContext context)
-        {
-            var options = context.Settings.ToOptions();
-
-            foreach (var key in context.Keys)
-            {
-                context.DocumentIndex.Set(key, field.Value, options);
-            }
+        var options = context.Settings.ToOptions();
 
-            return Task.CompletedTask;
+        foreach (var key in context.Keys)
+        {
+            context.DocumentIndex.Set(key, field.Value, options);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/ContentPickerFieldIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/ContentPickerFieldIndexHandler.cs
index 6b594d4a035..592e06f6409 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/ContentPickerFieldIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/ContentPickerFieldIndexHandler.cs
@@ -3,33 +3,32 @@
 using OrchardCore.Contents.Indexing;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.ContentFields.Indexing
+namespace OrchardCore.ContentFields.Indexing;
+
+public class ContentPickerFieldIndexHandler : ContentFieldIndexHandler<ContentPickerField>
 {
-    public class ContentPickerFieldIndexHandler : ContentFieldIndexHandler<ContentPickerField>
+    public override Task BuildIndexAsync(ContentPickerField field, BuildFieldIndexContext context)
     {
-        public override Task BuildIndexAsync(ContentPickerField field, BuildFieldIndexContext context)
-        {
-            var options = DocumentIndexOptions.Keyword | DocumentIndexOptions.Store;
+        var options = DocumentIndexOptions.Keyword | DocumentIndexOptions.Store;
 
-            if (field.ContentItemIds.Length > 0)
+        if (field.ContentItemIds.Length > 0)
+        {
+            foreach (var contentItemId in field.ContentItemIds)
             {
-                foreach (var contentItemId in field.ContentItemIds)
+                foreach (var key in context.Keys)
                 {
-                    foreach (var key in context.Keys)
-                    {
-                        context.DocumentIndex.Set(key, contentItemId, options);
-                    }
+                    context.DocumentIndex.Set(key, contentItemId, options);
                 }
             }
-            else
+        }
+        else
+        {
+            foreach (var key in context.Keys)
             {
-                foreach (var key in context.Keys)
-                {
-                    context.DocumentIndex.Set(key, IndexingConstants.NullValue, options);
-                }
+                context.DocumentIndex.Set(key, IndexingConstants.NullValue, options);
             }
-
-            return Task.CompletedTask;
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/DateFieldIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/DateFieldIndexHandler.cs
index 54569e657c3..1609197c74a 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/DateFieldIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/DateFieldIndexHandler.cs
@@ -2,20 +2,19 @@
 using OrchardCore.ContentFields.Fields;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.ContentFields.Indexing
+namespace OrchardCore.ContentFields.Indexing;
+
+public class DateFieldIndexHandler : ContentFieldIndexHandler<DateField>
 {
-    public class DateFieldIndexHandler : ContentFieldIndexHandler<DateField>
+    public override Task BuildIndexAsync(DateField field, BuildFieldIndexContext context)
     {
-        public override Task BuildIndexAsync(DateField field, BuildFieldIndexContext context)
-        {
-            var options = context.Settings.ToOptions();
-
-            foreach (var key in context.Keys)
-            {
-                context.DocumentIndex.Set(key, field.Value, options);
-            }
+        var options = context.Settings.ToOptions();
 
-            return Task.CompletedTask;
+        foreach (var key in context.Keys)
+        {
+            context.DocumentIndex.Set(key, field.Value, options);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/DateTimeFieldIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/DateTimeFieldIndexHandler.cs
index 07ee7dd971e..6ac15b84ac1 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/DateTimeFieldIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/DateTimeFieldIndexHandler.cs
@@ -2,20 +2,19 @@
 using OrchardCore.ContentFields.Fields;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.ContentFields.Indexing
+namespace OrchardCore.ContentFields.Indexing;
+
+public class DateTimeFieldIndexHandler : ContentFieldIndexHandler<DateTimeField>
 {
-    public class DateTimeFieldIndexHandler : ContentFieldIndexHandler<DateTimeField>
+    public override Task BuildIndexAsync(DateTimeField field, BuildFieldIndexContext context)
     {
-        public override Task BuildIndexAsync(DateTimeField field, BuildFieldIndexContext context)
-        {
-            var options = context.Settings.ToOptions();
-
-            foreach (var key in context.Keys)
-            {
-                context.DocumentIndex.Set(key, field.Value, options);
-            }
+        var options = context.Settings.ToOptions();
 
-            return Task.CompletedTask;
+        foreach (var key in context.Keys)
+        {
+            context.DocumentIndex.Set(key, field.Value, options);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/HtmlFieldIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/HtmlFieldIndexHandler.cs
index 35c72bba4fe..1254433b08f 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/HtmlFieldIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/HtmlFieldIndexHandler.cs
@@ -2,20 +2,19 @@
 using OrchardCore.ContentFields.Fields;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.ContentFields.Indexing
+namespace OrchardCore.ContentFields.Indexing;
+
+public class HtmlFieldIndexHandler : ContentFieldIndexHandler<HtmlField>
 {
-    public class HtmlFieldIndexHandler : ContentFieldIndexHandler<HtmlField>
+    public override Task BuildIndexAsync(HtmlField field, BuildFieldIndexContext context)
     {
-        public override Task BuildIndexAsync(HtmlField field, BuildFieldIndexContext context)
-        {
-            var options = context.Settings.ToOptions();
-
-            foreach (var key in context.Keys)
-            {
-                context.DocumentIndex.Set(key, field.Html, options);
-            }
+        var options = context.Settings.ToOptions();
 
-            return Task.CompletedTask;
+        foreach (var key in context.Keys)
+        {
+            context.DocumentIndex.Set(key, field.Html, options);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/LinkFieldIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/LinkFieldIndexHandler.cs
index 6be2dc7814d..06c720c548c 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/LinkFieldIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/LinkFieldIndexHandler.cs
@@ -2,22 +2,21 @@
 using OrchardCore.ContentFields.Fields;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.ContentFields.Indexing
+namespace OrchardCore.ContentFields.Indexing;
+
+public class LinkFieldIndexHandler : ContentFieldIndexHandler<LinkField>
 {
-    public class LinkFieldIndexHandler : ContentFieldIndexHandler<LinkField>
+    public override Task BuildIndexAsync(LinkField field, BuildFieldIndexContext context)
     {
-        public override Task BuildIndexAsync(LinkField field, BuildFieldIndexContext context)
-        {
-            var options = context.Settings.ToOptions();
-
-            foreach (var key in context.Keys)
-            {
-                context.DocumentIndex.Set(key, field.Url, options);
-                context.DocumentIndex.Set(key, field.Text, options);
-                context.DocumentIndex.Set(key, field.Target, options);
-            }
+        var options = context.Settings.ToOptions();
 
-            return Task.CompletedTask;
+        foreach (var key in context.Keys)
+        {
+            context.DocumentIndex.Set(key, field.Url, options);
+            context.DocumentIndex.Set(key, field.Text, options);
+            context.DocumentIndex.Set(key, field.Target, options);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/LocalizationSetContentPickerFieldIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/LocalizationSetContentPickerFieldIndexHandler.cs
index eea41bd5bf8..11a89245a7a 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/LocalizationSetContentPickerFieldIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/LocalizationSetContentPickerFieldIndexHandler.cs
@@ -4,34 +4,33 @@
 using OrchardCore.Indexing;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentFields.Indexing
+namespace OrchardCore.ContentFields.Indexing;
+
+[RequireFeatures("OrchardCore.ContentLocalization")]
+public class LocalizationSetContentPickerFieldIndexHandler : ContentFieldIndexHandler<LocalizationSetContentPickerField>
 {
-    [RequireFeatures("OrchardCore.ContentLocalization")]
-    public class LocalizationSetContentPickerFieldIndexHandler : ContentFieldIndexHandler<LocalizationSetContentPickerField>
+    public override Task BuildIndexAsync(LocalizationSetContentPickerField field, BuildFieldIndexContext context)
     {
-        public override Task BuildIndexAsync(LocalizationSetContentPickerField field, BuildFieldIndexContext context)
-        {
-            var options = DocumentIndexOptions.Keyword | DocumentIndexOptions.Store;
+        var options = DocumentIndexOptions.Keyword | DocumentIndexOptions.Store;
 
-            if (field.LocalizationSets.Length > 0)
+        if (field.LocalizationSets.Length > 0)
+        {
+            foreach (var localizationSet in field.LocalizationSets)
             {
-                foreach (var localizationSet in field.LocalizationSets)
+                foreach (var key in context.Keys)
                 {
-                    foreach (var key in context.Keys)
-                    {
-                        context.DocumentIndex.Set(key, localizationSet, options);
-                    }
+                    context.DocumentIndex.Set(key, localizationSet, options);
                 }
             }
-            else
+        }
+        else
+        {
+            foreach (var key in context.Keys)
             {
-                foreach (var key in context.Keys)
-                {
-                    context.DocumentIndex.Set(key, IndexingConstants.NullValue, options);
-                }
+                context.DocumentIndex.Set(key, IndexingConstants.NullValue, options);
             }
-
-            return Task.CompletedTask;
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/MultiTextFieldIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/MultiTextFieldIndexHandler.cs
index 00b420e1946..73f5b820d4f 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/MultiTextFieldIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/MultiTextFieldIndexHandler.cs
@@ -2,23 +2,22 @@
 using OrchardCore.ContentFields.Fields;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.ContentFields.Indexing
+namespace OrchardCore.ContentFields.Indexing;
+
+public class MultiTextFieldIndexHandler : ContentFieldIndexHandler<MultiTextField>
 {
-    public class MultiTextFieldIndexHandler : ContentFieldIndexHandler<MultiTextField>
+    public override Task BuildIndexAsync(MultiTextField field, BuildFieldIndexContext context)
     {
-        public override Task BuildIndexAsync(MultiTextField field, BuildFieldIndexContext context)
-        {
-            var options = context.Settings.ToOptions();
+        var options = context.Settings.ToOptions();
 
-            foreach (var key in context.Keys)
+        foreach (var key in context.Keys)
+        {
+            foreach (var value in field.Values)
             {
-                foreach (var value in field.Values)
-                {
-                    context.DocumentIndex.Set(key, value, options);
-                }
+                context.DocumentIndex.Set(key, value, options);
             }
-
-            return Task.CompletedTask;
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/NumericFieldIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/NumericFieldIndexHandler.cs
index 1f9e38ce499..f20f5656e1a 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/NumericFieldIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/NumericFieldIndexHandler.cs
@@ -3,30 +3,29 @@
 using OrchardCore.ContentFields.Settings;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.ContentFields.Indexing
+namespace OrchardCore.ContentFields.Indexing;
+
+public class NumericFieldIndexHandler : ContentFieldIndexHandler<NumericField>
 {
-    public class NumericFieldIndexHandler : ContentFieldIndexHandler<NumericField>
+    public override Task BuildIndexAsync(NumericField field, BuildFieldIndexContext context)
     {
-        public override Task BuildIndexAsync(NumericField field, BuildFieldIndexContext context)
-        {
-            var settings = context.ContentPartFieldDefinition.GetSettings<NumericFieldSettings>();
-            var options = context.Settings.ToOptions();
+        var settings = context.ContentPartFieldDefinition.GetSettings<NumericFieldSettings>();
+        var options = context.Settings.ToOptions();
 
-            var isInteger = settings.Scale == 0;
+        var isInteger = settings.Scale == 0;
 
-            foreach (var key in context.Keys)
+        foreach (var key in context.Keys)
+        {
+            if (isInteger)
             {
-                if (isInteger)
-                {
-                    context.DocumentIndex.Set(key, (int?)field.Value, options);
+                context.DocumentIndex.Set(key, (int?)field.Value, options);
 
-                    continue;
-                }
-
-                context.DocumentIndex.Set(key, field.Value, options);
+                continue;
             }
 
-            return Task.CompletedTask;
+            context.DocumentIndex.Set(key, field.Value, options);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/BooleanFieldIndexProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/BooleanFieldIndexProvider.cs
index 80f3fc9c184..fb0a472f18b 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/BooleanFieldIndexProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/BooleanFieldIndexProvider.cs
@@ -8,80 +8,79 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.ContentFields.Indexing.SQL
+namespace OrchardCore.ContentFields.Indexing.SQL;
+
+public class BooleanFieldIndex : ContentFieldIndex
 {
-    public class BooleanFieldIndex : ContentFieldIndex
+    public bool? Boolean { get; set; }
+}
+
+public class BooleanFieldIndexProvider : ContentFieldIndexProvider
+{
+    private readonly IServiceProvider _serviceProvider;
+    private readonly HashSet<string> _ignoredTypes = [];
+    private IContentDefinitionManager _contentDefinitionManager;
+
+    public BooleanFieldIndexProvider(IServiceProvider serviceProvider)
     {
-        public bool? Boolean { get; set; }
+        _serviceProvider = serviceProvider;
     }
 
-    public class BooleanFieldIndexProvider : ContentFieldIndexProvider
+    public override void Describe(DescribeContext<ContentItem> context)
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly HashSet<string> _ignoredTypes = [];
-        private IContentDefinitionManager _contentDefinitionManager;
-
-        public BooleanFieldIndexProvider(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
-
-        public override void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<BooleanFieldIndex>()
-                .Map(async contentItem =>
+        context.For<BooleanFieldIndex>()
+            .Map(async contentItem =>
+            {
+                // Remove index records of soft deleted items.
+                if (!contentItem.Published && !contentItem.Latest)
                 {
-                    // Remove index records of soft deleted items.
-                    if (!contentItem.Published && !contentItem.Latest)
-                    {
-                        return null;
-                    }
+                    return null;
+                }
 
-                    // Can we safely ignore this content item?
-                    if (_ignoredTypes.Contains(contentItem.ContentType))
-                    {
-                        return null;
-                    }
+                // Can we safely ignore this content item?
+                if (_ignoredTypes.Contains(contentItem.ContentType))
+                {
+                    return null;
+                }
 
-                    // Lazy initialization because of ISession cyclic dependency
-                    _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
+                // Lazy initialization because of ISession cyclic dependency
+                _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-                    // Search for BooleanField
-                    var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+                // Search for BooleanField
+                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-                    // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
-                    if (contentTypeDefinition == null)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
+                if (contentTypeDefinition == null)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    var fieldDefinitions = contentTypeDefinition
-                        .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(BooleanField)))
-                        .ToArray();
+                var fieldDefinitions = contentTypeDefinition
+                    .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(BooleanField)))
+                    .ToArray();
 
-                    // This type doesn't have any BooleanField, ignore it
-                    if (fieldDefinitions.Length == 0)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This type doesn't have any BooleanField, ignore it
+                if (fieldDefinitions.Length == 0)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    return fieldDefinitions
-                        .GetContentFields<BooleanField>(contentItem)
-                        .Select(pair =>
-                            new BooleanFieldIndex
-                            {
-                                Latest = contentItem.Latest,
-                                Published = contentItem.Published,
-                                ContentItemId = contentItem.ContentItemId,
-                                ContentItemVersionId = contentItem.ContentItemVersionId,
-                                ContentType = contentItem.ContentType,
-                                ContentPart = pair.Definition.ContentTypePartDefinition.Name,
-                                ContentField = pair.Definition.Name,
-                                Boolean = pair.Field.Value,
-                            });
-                });
-        }
+                return fieldDefinitions
+                    .GetContentFields<BooleanField>(contentItem)
+                    .Select(pair =>
+                        new BooleanFieldIndex
+                        {
+                            Latest = contentItem.Latest,
+                            Published = contentItem.Published,
+                            ContentItemId = contentItem.ContentItemId,
+                            ContentItemVersionId = contentItem.ContentItemVersionId,
+                            ContentType = contentItem.ContentType,
+                            ContentPart = pair.Definition.ContentTypePartDefinition.Name,
+                            ContentField = pair.Definition.Name,
+                            Boolean = pair.Field.Value,
+                        });
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/ContentFieldIndexProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/ContentFieldIndexProvider.cs
index 8c7f0a3bf60..c9efc7a654f 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/ContentFieldIndexProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/ContentFieldIndexProvider.cs
@@ -2,20 +2,19 @@
 using OrchardCore.Data;
 using YesSql.Indexes;
 
-namespace OrchardCore.ContentFields.Indexing.SQL
+namespace OrchardCore.ContentFields.Indexing.SQL;
+
+public abstract class ContentFieldIndex : MapIndex
 {
-    public abstract class ContentFieldIndex : MapIndex
-    {
-        public string ContentItemId { get; set; }
-        public string ContentItemVersionId { get; set; }
-        public string ContentType { get; set; }
-        public string ContentPart { get; set; }
-        public string ContentField { get; set; }
-        public bool Published { get; set; }
-        public bool Latest { get; set; }
-    }
+    public string ContentItemId { get; set; }
+    public string ContentItemVersionId { get; set; }
+    public string ContentType { get; set; }
+    public string ContentPart { get; set; }
+    public string ContentField { get; set; }
+    public bool Published { get; set; }
+    public bool Latest { get; set; }
+}
 
-    public abstract class ContentFieldIndexProvider : IndexProvider<ContentItem>, IScopedIndexProvider
-    {
-    }
+public abstract class ContentFieldIndexProvider : IndexProvider<ContentItem>, IScopedIndexProvider
+{
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/ContentPickerFieldIndexProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/ContentPickerFieldIndexProvider.cs
index e12ede1a931..ca9798bb712 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/ContentPickerFieldIndexProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/ContentPickerFieldIndexProvider.cs
@@ -8,83 +8,82 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.ContentFields.Indexing.SQL
+namespace OrchardCore.ContentFields.Indexing.SQL;
+
+public class ContentPickerFieldIndex : ContentFieldIndex
 {
-    public class ContentPickerFieldIndex : ContentFieldIndex
+    public string SelectedContentItemId { get; set; }
+}
+
+public class ContentPickerFieldIndexProvider : ContentFieldIndexProvider
+{
+    private readonly IServiceProvider _serviceProvider;
+    private readonly HashSet<string> _ignoredTypes = [];
+    private IContentDefinitionManager _contentDefinitionManager;
+
+    public ContentPickerFieldIndexProvider(IServiceProvider serviceProvider)
     {
-        public string SelectedContentItemId { get; set; }
+        _serviceProvider = serviceProvider;
     }
 
-    public class ContentPickerFieldIndexProvider : ContentFieldIndexProvider
+    public override void Describe(DescribeContext<ContentItem> context)
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly HashSet<string> _ignoredTypes = [];
-        private IContentDefinitionManager _contentDefinitionManager;
-
-        public ContentPickerFieldIndexProvider(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
-
-        public override void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<ContentPickerFieldIndex>()
-                .Map(async contentItem =>
+        context.For<ContentPickerFieldIndex>()
+            .Map(async contentItem =>
+            {
+                // Remove index records of soft deleted items.
+                if (!contentItem.Published && !contentItem.Latest)
                 {
-                    // Remove index records of soft deleted items.
-                    if (!contentItem.Published && !contentItem.Latest)
-                    {
-                        return null;
-                    }
+                    return null;
+                }
 
-                    // Can we safely ignore this content item?
-                    if (_ignoredTypes.Contains(contentItem.ContentType))
-                    {
-                        return null;
-                    }
+                // Can we safely ignore this content item?
+                if (_ignoredTypes.Contains(contentItem.ContentType))
+                {
+                    return null;
+                }
 
-                    // Lazy initialization because of ISession cyclic dependency
-                    _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
+                // Lazy initialization because of ISession cyclic dependency
+                _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-                    // Search for ContentPickerField
-                    var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+                // Search for ContentPickerField
+                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-                    // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
-                    if (contentTypeDefinition == null)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
+                if (contentTypeDefinition == null)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    var fieldDefinitions = contentTypeDefinition
-                        .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(ContentPickerField)))
-                        .ToArray();
+                var fieldDefinitions = contentTypeDefinition
+                    .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(ContentPickerField)))
+                    .ToArray();
 
-                    // This type doesn't have any ContentPickerField, ignore it
-                    if (fieldDefinitions.Length == 0)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This type doesn't have any ContentPickerField, ignore it
+                if (fieldDefinitions.Length == 0)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    // Get all field values
-                    return fieldDefinitions
-                        .GetContentFields<ContentPickerField>(contentItem)
-                        .SelectMany(pair =>
-                            pair.Field.ContentItemIds.Select(id => (pair.Definition, ContentItemId: id)))
-                        .Select(pair =>
-                            new ContentPickerFieldIndex
-                            {
-                                Latest = contentItem.Latest,
-                                Published = contentItem.Published,
-                                ContentItemId = contentItem.ContentItemId,
-                                ContentItemVersionId = contentItem.ContentItemVersionId,
-                                ContentType = contentItem.ContentType,
-                                ContentPart = pair.Definition.ContentTypePartDefinition.Name,
-                                ContentField = pair.Definition.Name,
-                                SelectedContentItemId = pair.ContentItemId,
-                            });
-                });
-        }
+                // Get all field values
+                return fieldDefinitions
+                    .GetContentFields<ContentPickerField>(contentItem)
+                    .SelectMany(pair =>
+                        pair.Field.ContentItemIds.Select(id => (pair.Definition, ContentItemId: id)))
+                    .Select(pair =>
+                        new ContentPickerFieldIndex
+                        {
+                            Latest = contentItem.Latest,
+                            Published = contentItem.Published,
+                            ContentItemId = contentItem.ContentItemId,
+                            ContentItemVersionId = contentItem.ContentItemVersionId,
+                            ContentType = contentItem.ContentType,
+                            ContentPart = pair.Definition.ContentTypePartDefinition.Name,
+                            ContentField = pair.Definition.Name,
+                            SelectedContentItemId = pair.ContentItemId,
+                        });
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/DateFieldIndexProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/DateFieldIndexProvider.cs
index bd6aac2a50f..1cdb6c24e04 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/DateFieldIndexProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/DateFieldIndexProvider.cs
@@ -8,79 +8,78 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.ContentFields.Indexing.SQL
+namespace OrchardCore.ContentFields.Indexing.SQL;
+
+public class DateFieldIndex : ContentFieldIndex
+{
+    public DateTime? Date { get; set; }
+}
+
+public class DateFieldIndexProvider : ContentFieldIndexProvider
 {
-    public class DateFieldIndex : ContentFieldIndex
+    private readonly IServiceProvider _serviceProvider;
+    private readonly HashSet<string> _ignoredTypes = [];
+    private IContentDefinitionManager _contentDefinitionManager;
+
+    public DateFieldIndexProvider(IServiceProvider serviceProvider)
     {
-        public DateTime? Date { get; set; }
+        _serviceProvider = serviceProvider;
     }
 
-    public class DateFieldIndexProvider : ContentFieldIndexProvider
+    public override void Describe(DescribeContext<ContentItem> context)
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly HashSet<string> _ignoredTypes = [];
-        private IContentDefinitionManager _contentDefinitionManager;
-
-        public DateFieldIndexProvider(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
+        context.For<DateFieldIndex>()
+            .Map(async contentItem =>
+            {
+                // Remove index records of soft deleted items.
+                if (!contentItem.Published && !contentItem.Latest)
+                {
+                    return null;
+                }
 
-        public override void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<DateFieldIndex>()
-                .Map(async contentItem =>
+                // Can we safely ignore this content item?
+                if (_ignoredTypes.Contains(contentItem.ContentType))
                 {
-                    // Remove index records of soft deleted items.
-                    if (!contentItem.Published && !contentItem.Latest)
-                    {
-                        return null;
-                    }
+                    return null;
+                }
 
-                    // Can we safely ignore this content item?
-                    if (_ignoredTypes.Contains(contentItem.ContentType))
-                    {
-                        return null;
-                    }
+                // Lazy initialization because of ISession cyclic dependency
+                _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-                    // Lazy initialization because of ISession cyclic dependency
-                    _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
+                // Search for DateField
+                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-                    // Search for DateField
-                    var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+                // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
+                if (contentTypeDefinition == null)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
-                    if (contentTypeDefinition == null)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                var fieldDefinitions = contentTypeDefinition
+                    .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(DateField)))
+                    .ToArray();
 
-                    var fieldDefinitions = contentTypeDefinition
-                        .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(DateField)))
-                        .ToArray();
+                // This type doesn't have any DateField, ignore it
+                if (fieldDefinitions.Length == 0)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    // This type doesn't have any DateField, ignore it
-                    if (fieldDefinitions.Length == 0)
+                return fieldDefinitions
+                    .GetContentFields<DateField>(contentItem)
+                    .Select(pair => new DateFieldIndex
                     {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
-
-                    return fieldDefinitions
-                        .GetContentFields<DateField>(contentItem)
-                        .Select(pair => new DateFieldIndex
-                        {
-                            Latest = contentItem.Latest,
-                            Published = contentItem.Published,
-                            ContentItemId = contentItem.ContentItemId,
-                            ContentItemVersionId = contentItem.ContentItemVersionId,
-                            ContentType = contentItem.ContentType,
-                            ContentPart = pair.Definition.ContentTypePartDefinition.Name,
-                            ContentField = pair.Definition.Name,
-                            Date = pair.Field.Value,
-                        });
-                });
-        }
+                        Latest = contentItem.Latest,
+                        Published = contentItem.Published,
+                        ContentItemId = contentItem.ContentItemId,
+                        ContentItemVersionId = contentItem.ContentItemVersionId,
+                        ContentType = contentItem.ContentType,
+                        ContentPart = pair.Definition.ContentTypePartDefinition.Name,
+                        ContentField = pair.Definition.Name,
+                        Date = pair.Field.Value,
+                    });
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/DateTimeFieldIndexProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/DateTimeFieldIndexProvider.cs
index 823430558d5..14ae0e5f9fe 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/DateTimeFieldIndexProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/DateTimeFieldIndexProvider.cs
@@ -8,80 +8,79 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.ContentFields.Indexing.SQL
+namespace OrchardCore.ContentFields.Indexing.SQL;
+
+public class DateTimeFieldIndex : ContentFieldIndex
 {
-    public class DateTimeFieldIndex : ContentFieldIndex
+    public DateTime? DateTime { get; set; }
+}
+
+public class DateTimeFieldIndexProvider : ContentFieldIndexProvider
+{
+    private readonly IServiceProvider _serviceProvider;
+    private readonly HashSet<string> _ignoredTypes = [];
+    private IContentDefinitionManager _contentDefinitionManager;
+
+    public DateTimeFieldIndexProvider(IServiceProvider serviceProvider)
     {
-        public DateTime? DateTime { get; set; }
+        _serviceProvider = serviceProvider;
     }
 
-    public class DateTimeFieldIndexProvider : ContentFieldIndexProvider
+    public override void Describe(DescribeContext<ContentItem> context)
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly HashSet<string> _ignoredTypes = [];
-        private IContentDefinitionManager _contentDefinitionManager;
-
-        public DateTimeFieldIndexProvider(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
-
-        public override void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<DateTimeFieldIndex>()
-                .Map(async contentItem =>
+        context.For<DateTimeFieldIndex>()
+            .Map(async contentItem =>
+            {
+                // Remove index records of soft deleted items.
+                if (!contentItem.Published && !contentItem.Latest)
                 {
-                    // Remove index records of soft deleted items.
-                    if (!contentItem.Published && !contentItem.Latest)
-                    {
-                        return null;
-                    }
+                    return null;
+                }
 
-                    // Can we safely ignore this content item?
-                    if (_ignoredTypes.Contains(contentItem.ContentType))
-                    {
-                        return null;
-                    }
+                // Can we safely ignore this content item?
+                if (_ignoredTypes.Contains(contentItem.ContentType))
+                {
+                    return null;
+                }
 
-                    // Lazy initialization because of ISession cyclic dependency
-                    _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
+                // Lazy initialization because of ISession cyclic dependency
+                _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-                    // Search for DateTimeField
-                    var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+                // Search for DateTimeField
+                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-                    // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
-                    if (contentTypeDefinition == null)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
+                if (contentTypeDefinition == null)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    var fieldDefinitions = contentTypeDefinition
-                        .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(DateTimeField)))
-                        .ToArray();
+                var fieldDefinitions = contentTypeDefinition
+                    .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(DateTimeField)))
+                    .ToArray();
 
-                    // This type doesn't have any DateTimeField, ignore it
-                    if (fieldDefinitions.Length == 0)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This type doesn't have any DateTimeField, ignore it
+                if (fieldDefinitions.Length == 0)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    return fieldDefinitions
-                        .GetContentFields<DateTimeField>(contentItem)
-                        .Select(pair =>
-                            new DateTimeFieldIndex
-                            {
-                                Latest = contentItem.Latest,
-                                Published = contentItem.Published,
-                                ContentItemId = contentItem.ContentItemId,
-                                ContentItemVersionId = contentItem.ContentItemVersionId,
-                                ContentType = contentItem.ContentType,
-                                ContentPart = pair.Definition.ContentTypePartDefinition.Name,
-                                ContentField = pair.Definition.Name,
-                                DateTime = pair.Field.Value,
-                            });
-                });
-        }
+                return fieldDefinitions
+                    .GetContentFields<DateTimeField>(contentItem)
+                    .Select(pair =>
+                        new DateTimeFieldIndex
+                        {
+                            Latest = contentItem.Latest,
+                            Published = contentItem.Published,
+                            ContentItemId = contentItem.ContentItemId,
+                            ContentItemVersionId = contentItem.ContentItemVersionId,
+                            ContentType = contentItem.ContentType,
+                            ContentPart = pair.Definition.ContentTypePartDefinition.Name,
+                            ContentField = pair.Definition.Name,
+                            DateTime = pair.Field.Value,
+                        });
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/HtmlFieldIndexProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/HtmlFieldIndexProvider.cs
index 090a62ff547..e2916551bdb 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/HtmlFieldIndexProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/HtmlFieldIndexProvider.cs
@@ -8,80 +8,79 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.ContentFields.Indexing.SQL
+namespace OrchardCore.ContentFields.Indexing.SQL;
+
+public class HtmlFieldIndex : ContentFieldIndex
 {
-    public class HtmlFieldIndex : ContentFieldIndex
+    public string Html { get; set; }
+}
+
+public class HtmlFieldIndexProvider : ContentFieldIndexProvider
+{
+    private readonly IServiceProvider _serviceProvider;
+    private readonly HashSet<string> _ignoredTypes = [];
+    private IContentDefinitionManager _contentDefinitionManager;
+
+    public HtmlFieldIndexProvider(IServiceProvider serviceProvider)
     {
-        public string Html { get; set; }
+        _serviceProvider = serviceProvider;
     }
 
-    public class HtmlFieldIndexProvider : ContentFieldIndexProvider
+    public override void Describe(DescribeContext<ContentItem> context)
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly HashSet<string> _ignoredTypes = [];
-        private IContentDefinitionManager _contentDefinitionManager;
-
-        public HtmlFieldIndexProvider(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
-
-        public override void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<HtmlFieldIndex>()
-                .Map(async contentItem =>
+        context.For<HtmlFieldIndex>()
+            .Map(async contentItem =>
+            {
+                // Remove index records of soft deleted items.
+                if (!contentItem.Published && !contentItem.Latest)
                 {
-                    // Remove index records of soft deleted items.
-                    if (!contentItem.Published && !contentItem.Latest)
-                    {
-                        return null;
-                    }
+                    return null;
+                }
 
-                    // Can we safely ignore this content item?
-                    if (_ignoredTypes.Contains(contentItem.ContentType))
-                    {
-                        return null;
-                    }
+                // Can we safely ignore this content item?
+                if (_ignoredTypes.Contains(contentItem.ContentType))
+                {
+                    return null;
+                }
 
-                    // Lazy initialization because of ISession cyclic dependency
-                    _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
+                // Lazy initialization because of ISession cyclic dependency
+                _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-                    // Search for Html fields
-                    var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+                // Search for Html fields
+                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-                    // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
-                    if (contentTypeDefinition == null)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
+                if (contentTypeDefinition == null)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    var fieldDefinitions = contentTypeDefinition
-                        .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(HtmlField)))
-                        .ToArray();
+                var fieldDefinitions = contentTypeDefinition
+                    .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(HtmlField)))
+                    .ToArray();
 
-                    // This type doesn't have any HtmlField, ignore it
-                    if (fieldDefinitions.Length == 0)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This type doesn't have any HtmlField, ignore it
+                if (fieldDefinitions.Length == 0)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    return fieldDefinitions
-                        .GetContentFields<HtmlField>(contentItem)
-                        .Select(pair =>
-                            new HtmlFieldIndex
-                            {
-                                Latest = contentItem.Latest,
-                                Published = contentItem.Published,
-                                ContentItemId = contentItem.ContentItemId,
-                                ContentItemVersionId = contentItem.ContentItemVersionId,
-                                ContentType = contentItem.ContentType,
-                                ContentPart = pair.Definition.ContentTypePartDefinition.Name,
-                                ContentField = pair.Definition.Name,
-                                Html = pair.Field.Html,
-                            });
-                });
-        }
+                return fieldDefinitions
+                    .GetContentFields<HtmlField>(contentItem)
+                    .Select(pair =>
+                        new HtmlFieldIndex
+                        {
+                            Latest = contentItem.Latest,
+                            Published = contentItem.Published,
+                            ContentItemId = contentItem.ContentItemId,
+                            ContentItemVersionId = contentItem.ContentItemVersionId,
+                            ContentType = contentItem.ContentType,
+                            ContentPart = pair.Definition.ContentTypePartDefinition.Name,
+                            ContentField = pair.Definition.Name,
+                            Html = pair.Field.Html,
+                        });
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/LinkFieldIndexProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/LinkFieldIndexProvider.cs
index eb1e7af2d59..f6d4f3a0d60 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/LinkFieldIndexProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/LinkFieldIndexProvider.cs
@@ -8,94 +8,93 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.ContentFields.Indexing.SQL
+namespace OrchardCore.ContentFields.Indexing.SQL;
+
+public class LinkFieldIndex : ContentFieldIndex
 {
-    public class LinkFieldIndex : ContentFieldIndex
-    {
-        // Maximum length that MySql can support in an index under utf8 collation is 768,
-        // minus 1 for the `DocumentId` integer (character size = integer size = 4 bytes).
-        // minus 1 (freeing 4 bytes) for the additional 'Published' and 'Latest' boolean.
-        public const int MaxUrlSize = 766;
-        public const int MaxTextSize = 766;
+    // Maximum length that MySql can support in an index under utf8 collation is 768,
+    // minus 1 for the `DocumentId` integer (character size = integer size = 4 bytes).
+    // minus 1 (freeing 4 bytes) for the additional 'Published' and 'Latest' boolean.
+    public const int MaxUrlSize = 766;
+    public const int MaxTextSize = 766;
 
-        public string Url { get; set; }
-        public string BigUrl { get; set; }
-        public string Text { get; set; }
-        public string BigText { get; set; }
-    }
+    public string Url { get; set; }
+    public string BigUrl { get; set; }
+    public string Text { get; set; }
+    public string BigText { get; set; }
+}
 
-    public class LinkFieldIndexProvider : ContentFieldIndexProvider
-    {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly HashSet<string> _ignoredTypes = [];
-        private IContentDefinitionManager _contentDefinitionManager;
+public class LinkFieldIndexProvider : ContentFieldIndexProvider
+{
+    private readonly IServiceProvider _serviceProvider;
+    private readonly HashSet<string> _ignoredTypes = [];
+    private IContentDefinitionManager _contentDefinitionManager;
 
-        public LinkFieldIndexProvider(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
+    public LinkFieldIndexProvider(IServiceProvider serviceProvider)
+    {
+        _serviceProvider = serviceProvider;
+    }
 
-        public override void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<LinkFieldIndex>()
-                .Map(async contentItem =>
+    public override void Describe(DescribeContext<ContentItem> context)
+    {
+        context.For<LinkFieldIndex>()
+            .Map(async contentItem =>
+            {
+                // Remove index records of soft deleted items.
+                if (!contentItem.Published && !contentItem.Latest)
                 {
-                    // Remove index records of soft deleted items.
-                    if (!contentItem.Published && !contentItem.Latest)
-                    {
-                        return null;
-                    }
+                    return null;
+                }
 
-                    // Can we safely ignore this content item?
-                    if (_ignoredTypes.Contains(contentItem.ContentType))
-                    {
-                        return null;
-                    }
+                // Can we safely ignore this content item?
+                if (_ignoredTypes.Contains(contentItem.ContentType))
+                {
+                    return null;
+                }
 
-                    // Lazy initialization because of ISession cyclic dependency
-                    _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
+                // Lazy initialization because of ISession cyclic dependency
+                _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-                    // Search for LinkField
-                    var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+                // Search for LinkField
+                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-                    // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
-                    if (contentTypeDefinition == null)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
+                // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
+                if (contentTypeDefinition == null)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
 
-                        return null;
-                    }
+                    return null;
+                }
 
-                    var fieldDefinitions = contentTypeDefinition
-                        .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(LinkField)))
-                        .ToArray();
+                var fieldDefinitions = contentTypeDefinition
+                    .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(LinkField)))
+                    .ToArray();
 
-                    // This type doesn't have any LinkField, ignore it.
-                    if (fieldDefinitions.Length == 0)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
+                // This type doesn't have any LinkField, ignore it.
+                if (fieldDefinitions.Length == 0)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
 
-                        return null;
-                    }
+                    return null;
+                }
 
-                    return fieldDefinitions
-                        .GetContentFields<LinkField>(contentItem)
-                        .Select(pair =>
-                            new LinkFieldIndex
-                            {
-                                Latest = contentItem.Latest,
-                                Published = contentItem.Published,
-                                ContentItemId = contentItem.ContentItemId,
-                                ContentItemVersionId = contentItem.ContentItemVersionId,
-                                ContentType = contentItem.ContentType,
-                                ContentPart = pair.Definition.ContentTypePartDefinition.Name,
-                                ContentField = pair.Definition.Name,
-                                Url = pair.Field.Url?[..Math.Min(pair.Field.Url.Length, LinkFieldIndex.MaxUrlSize)],
-                                BigUrl = pair.Field.Url,
-                                Text = pair.Field.Text?[..Math.Min(pair.Field.Text.Length, LinkFieldIndex.MaxTextSize)],
-                                BigText = pair.Field.Text,
-                            });
-                });
-        }
+                return fieldDefinitions
+                    .GetContentFields<LinkField>(contentItem)
+                    .Select(pair =>
+                        new LinkFieldIndex
+                        {
+                            Latest = contentItem.Latest,
+                            Published = contentItem.Published,
+                            ContentItemId = contentItem.ContentItemId,
+                            ContentItemVersionId = contentItem.ContentItemVersionId,
+                            ContentType = contentItem.ContentType,
+                            ContentPart = pair.Definition.ContentTypePartDefinition.Name,
+                            ContentField = pair.Definition.Name,
+                            Url = pair.Field.Url?[..Math.Min(pair.Field.Url.Length, LinkFieldIndex.MaxUrlSize)],
+                            BigUrl = pair.Field.Url,
+                            Text = pair.Field.Text?[..Math.Min(pair.Field.Text.Length, LinkFieldIndex.MaxTextSize)],
+                            BigText = pair.Field.Text,
+                        });
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/Migrations.cs
index b6edd3433e5..a6ca4ec046c 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/Migrations.cs
@@ -5,807 +5,806 @@
 using OrchardCore.Data.Migration;
 using YesSql.Sql;
 
-namespace OrchardCore.ContentFields.Indexing.SQL
-{
-    public sealed class Migrations : DataMigration
-    {
-        private readonly ILogger _logger;
-
-        public Migrations(ILogger<Migrations> logger)
-        {
-            _logger = logger;
-        }
-
-        public async Task<int> CreateAsync()
-        {
-            // NOTE: The Text Length has been decreased from 4000 characters to 768.
-            // For existing SQL databases update the TextFieldIndex tables Text column length manually.
-            // INFO: The Text Length is now of 766 chars, but this is only used on a new installation.
-            await SchemaBuilder.CreateMapIndexTableAsync<TextFieldIndex>(table => table
-                .Column<string>("ContentItemId", column => column.WithLength(26))
-                .Column<string>("ContentItemVersionId", column => column.WithLength(26))
-                .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
-                .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
-                .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
-                .Column<bool>("Published", column => column.Nullable())
-                .Column<bool>("Latest", column => column.Nullable())
-                .Column<string>("Text", column => column.Nullable().WithLength(TextFieldIndex.MaxTextSize))
-                .Column<string>("BigText", column => column.Nullable().Unlimited())
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<TextFieldIndex>(table => table
-                .CreateIndex("IDX_TextFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<TextFieldIndex>(table => table
-                .CreateIndex("IDX_TextFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + Text (764) + Published and Latest (1) = 767 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<TextFieldIndex>(table => table
-                .CreateIndex("IDX_TextFieldIndex_DocumentId_Text",
-                    "DocumentId",
-                    "Text(764)",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.CreateMapIndexTableAsync<BooleanFieldIndex>(table => table
-                .Column<string>("ContentItemId", column => column.WithLength(26))
-                .Column<string>("ContentItemVersionId", column => column.WithLength(26))
-                .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
-                .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
-                .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
-                .Column<bool>("Published", column => column.Nullable())
-                .Column<bool>("Latest", column => column.Nullable())
-                .Column<bool>("Boolean", column => column.Nullable())
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<BooleanFieldIndex>(table => table
-                .CreateIndex("IDX_BooleanFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Boolean, Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<BooleanFieldIndex>(table => table
-                .CreateIndex("IDX_BooleanFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Boolean",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.CreateMapIndexTableAsync<NumericFieldIndex>(table => table
-                .Column<string>("ContentItemId", column => column.WithLength(26))
-                .Column<string>("ContentItemVersionId", column => column.WithLength(26))
-                .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
-                .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
-                .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
-                .Column<bool>("Published", column => column.Nullable())
-                .Column<bool>("Latest", column => column.Nullable())
-                .Column<decimal>("Numeric", column => column.Nullable())
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<NumericFieldIndex>(table => table
-                .CreateIndex("IDX_NumericFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<NumericFieldIndex>(table => table
-                .CreateIndex("IDX_NumericFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<NumericFieldIndex>(table => table
-                .CreateIndex("IDX_NumericFieldIndex_DocumentId_Numeric",
-                    "DocumentId",
-                    "Numeric",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.CreateMapIndexTableAsync<DateTimeFieldIndex>(table => table
-                .Column<string>("ContentItemId", column => column.WithLength(26))
-                .Column<string>("ContentItemVersionId", column => column.WithLength(26))
-                .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
-                .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
-                .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
-                .Column<bool>("Published", column => column.Nullable())
-                .Column<bool>("Latest", column => column.Nullable())
-                .Column<DateTime>("DateTime", column => column.Nullable())
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<DateTimeFieldIndex>(table => table
-                .CreateIndex("IDX_DateTimeFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<DateTimeFieldIndex>(table => table
-                .CreateIndex("IDX_DateTimeFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<DateTimeFieldIndex>(table => table
-                .CreateIndex("IDX_DateTimeFieldIndex_DocumentId_DateTime",
-                    "DocumentId",
-                    "DateTime",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.CreateMapIndexTableAsync<DateFieldIndex>(table => table
-                .Column<string>("ContentItemId", column => column.WithLength(26))
-                .Column<string>("ContentItemVersionId", column => column.WithLength(26))
-                .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
-                .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
-                .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
-                .Column<bool>("Published", column => column.Nullable())
-                .Column<bool>("Latest", column => column.Nullable())
-                .Column<DateTime>("Date", column => column.Nullable())
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<DateFieldIndex>(table => table
-                .CreateIndex("IDX_DateFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<DateFieldIndex>(table => table
-                .CreateIndex("IDX_DateFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
+namespace OrchardCore.ContentFields.Indexing.SQL;
 
-            await SchemaBuilder.AlterIndexTableAsync<DateFieldIndex>(table => table
-                .CreateIndex("IDX_DateFieldIndex_DocumentId_Date",
-                    "DocumentId",
-                    "ContentType",
-                    "Date",
-                    "Published",
-                    "Latest")
-            );
+public sealed class Migrations : DataMigration
+{
+    private readonly ILogger _logger;
 
-            await SchemaBuilder.CreateMapIndexTableAsync<ContentPickerFieldIndex>(table => table
-                .Column<string>("ContentItemId", column => column.WithLength(26))
-                .Column<string>("ContentItemVersionId", column => column.WithLength(26))
-                .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
-                .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
-                .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
-                .Column<bool>("Published", column => column.Nullable())
-                .Column<bool>("Latest", column => column.Nullable())
-                .Column<string>("SelectedContentItemId", column => column.WithLength(26))
-            );
+    public Migrations(ILogger<Migrations> logger)
+    {
+        _logger = logger;
+    }
 
-            await SchemaBuilder.AlterIndexTableAsync<ContentPickerFieldIndex>(table => table
-                .CreateIndex("IDX_ContentPickerFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
+    public async Task<int> CreateAsync()
+    {
+        // NOTE: The Text Length has been decreased from 4000 characters to 768.
+        // For existing SQL databases update the TextFieldIndex tables Text column length manually.
+        // INFO: The Text Length is now of 766 chars, but this is only used on a new installation.
+        await SchemaBuilder.CreateMapIndexTableAsync<TextFieldIndex>(table => table
+            .Column<string>("ContentItemId", column => column.WithLength(26))
+            .Column<string>("ContentItemVersionId", column => column.WithLength(26))
+            .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
+            .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
+            .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
+            .Column<bool>("Published", column => column.Nullable())
+            .Column<bool>("Latest", column => column.Nullable())
+            .Column<string>("Text", column => column.Nullable().WithLength(TextFieldIndex.MaxTextSize))
+            .Column<string>("BigText", column => column.Nullable().Unlimited())
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<TextFieldIndex>(table => table
+            .CreateIndex("IDX_TextFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<TextFieldIndex>(table => table
+            .CreateIndex("IDX_TextFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + Text (764) + Published and Latest (1) = 767 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<TextFieldIndex>(table => table
+            .CreateIndex("IDX_TextFieldIndex_DocumentId_Text",
+                "DocumentId",
+                "Text(764)",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.CreateMapIndexTableAsync<BooleanFieldIndex>(table => table
+            .Column<string>("ContentItemId", column => column.WithLength(26))
+            .Column<string>("ContentItemVersionId", column => column.WithLength(26))
+            .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
+            .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
+            .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
+            .Column<bool>("Published", column => column.Nullable())
+            .Column<bool>("Latest", column => column.Nullable())
+            .Column<bool>("Boolean", column => column.Nullable())
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<BooleanFieldIndex>(table => table
+            .CreateIndex("IDX_BooleanFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Boolean, Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<BooleanFieldIndex>(table => table
+            .CreateIndex("IDX_BooleanFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Boolean",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.CreateMapIndexTableAsync<NumericFieldIndex>(table => table
+            .Column<string>("ContentItemId", column => column.WithLength(26))
+            .Column<string>("ContentItemVersionId", column => column.WithLength(26))
+            .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
+            .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
+            .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
+            .Column<bool>("Published", column => column.Nullable())
+            .Column<bool>("Latest", column => column.Nullable())
+            .Column<decimal>("Numeric", column => column.Nullable())
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<NumericFieldIndex>(table => table
+            .CreateIndex("IDX_NumericFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<NumericFieldIndex>(table => table
+            .CreateIndex("IDX_NumericFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<NumericFieldIndex>(table => table
+            .CreateIndex("IDX_NumericFieldIndex_DocumentId_Numeric",
+                "DocumentId",
+                "Numeric",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.CreateMapIndexTableAsync<DateTimeFieldIndex>(table => table
+            .Column<string>("ContentItemId", column => column.WithLength(26))
+            .Column<string>("ContentItemVersionId", column => column.WithLength(26))
+            .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
+            .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
+            .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
+            .Column<bool>("Published", column => column.Nullable())
+            .Column<bool>("Latest", column => column.Nullable())
+            .Column<DateTime>("DateTime", column => column.Nullable())
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<DateTimeFieldIndex>(table => table
+            .CreateIndex("IDX_DateTimeFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<DateTimeFieldIndex>(table => table
+            .CreateIndex("IDX_DateTimeFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<DateTimeFieldIndex>(table => table
+            .CreateIndex("IDX_DateTimeFieldIndex_DocumentId_DateTime",
+                "DocumentId",
+                "DateTime",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.CreateMapIndexTableAsync<DateFieldIndex>(table => table
+            .Column<string>("ContentItemId", column => column.WithLength(26))
+            .Column<string>("ContentItemVersionId", column => column.WithLength(26))
+            .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
+            .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
+            .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
+            .Column<bool>("Published", column => column.Nullable())
+            .Column<bool>("Latest", column => column.Nullable())
+            .Column<DateTime>("Date", column => column.Nullable())
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<DateFieldIndex>(table => table
+            .CreateIndex("IDX_DateFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<DateFieldIndex>(table => table
+            .CreateIndex("IDX_DateFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<DateFieldIndex>(table => table
+            .CreateIndex("IDX_DateFieldIndex_DocumentId_Date",
+                "DocumentId",
+                "ContentType",
+                "Date",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.CreateMapIndexTableAsync<ContentPickerFieldIndex>(table => table
+            .Column<string>("ContentItemId", column => column.WithLength(26))
+            .Column<string>("ContentItemVersionId", column => column.WithLength(26))
+            .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
+            .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
+            .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
+            .Column<bool>("Published", column => column.Nullable())
+            .Column<bool>("Latest", column => column.Nullable())
+            .Column<string>("SelectedContentItemId", column => column.WithLength(26))
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<ContentPickerFieldIndex>(table => table
+            .CreateIndex("IDX_ContentPickerFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<ContentPickerFieldIndex>(table => table
+            .CreateIndex("IDX_ContentPickerFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<ContentPickerFieldIndex>(table => table
+            .CreateIndex("IDX_ContentPickerField_DocumentId_SelectedItemId",
+                "DocumentId",
+                "SelectedContentItemId",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.CreateMapIndexTableAsync<TimeFieldIndex>(table => table
+            .Column<string>("ContentItemId", column => column.WithLength(26))
+            .Column<string>("ContentItemVersionId", column => column.WithLength(26))
+            .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
+            .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
+            .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
+            .Column<bool>("Published", column => column.Nullable())
+            .Column<bool>("Latest", column => column.Nullable())
+            .Column<TimeSpan>("Time", column => column.Nullable())
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<TimeFieldIndex>(table => table
+            .CreateIndex("IDX_TimeFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<TimeFieldIndex>(table => table
+            .CreateIndex("IDX_TimeFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<TimeFieldIndex>(table => table
+            .CreateIndex("IDX_TimeFieldIndex_DocumentId_Time",
+                "DocumentId",
+                "Time",
+                "Published",
+                "Latest")
+        );
+
+        // NOTE: The Url and Text Length has been decreased from 4000 characters to 768.
+        // For existing SQL databases update the LinkFieldIndex tables Url and Text column length manually.
+        // The BigText and BigUrl columns are new additions so will not be populated until the content item is republished.
+        // INFO: The Url and Text Length is now of 766 chars, but this is only used on a new installation.
+        await SchemaBuilder.CreateMapIndexTableAsync<LinkFieldIndex>(table => table
+            .Column<string>("ContentItemId", column => column.WithLength(26))
+            .Column<string>("ContentItemVersionId", column => column.WithLength(26))
+            .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
+            .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
+            .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
+            .Column<bool>("Published", column => column.Nullable())
+            .Column<bool>("Latest", column => column.Nullable())
+            .Column<string>("Url", column => column.Nullable().WithLength(LinkFieldIndex.MaxUrlSize))
+            .Column<string>("BigUrl", column => column.Nullable().Unlimited())
+            .Column<string>("Text", column => column.Nullable().WithLength(LinkFieldIndex.MaxTextSize))
+            .Column<string>("BigText", column => column.Nullable().Unlimited())
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
+            .CreateIndex("IDX_LinkFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
+            .CreateIndex("IDX_LinkFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + Url (764) + Published and Latest (1) = 767 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
+            .CreateIndex("IDX_LinkFieldIndex_DocumentId_Url",
+                "DocumentId",
+                "Url(764)",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + Text (764) + Published and Latest (1) = 767 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
+            .CreateIndex("IDX_LinkFieldIndex_DocumentId_Text",
+                "DocumentId",
+                "Text(764)",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.CreateMapIndexTableAsync<HtmlFieldIndex>(table => table
+            .Column<string>("ContentItemId", column => column.WithLength(26))
+            .Column<string>("ContentItemVersionId", column => column.WithLength(26))
+            .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
+            .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
+            .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
+            .Column<bool>("Published", column => column.Nullable())
+            .Column<bool>("Latest", column => column.Nullable())
+            .Column<string>("Html", column => column.Nullable().Unlimited())
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<HtmlFieldIndex>(table => table
+            .CreateIndex("IDX_HtmlFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<HtmlFieldIndex>(table => table
+            .CreateIndex("IDX_HtmlFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.CreateMapIndexTableAsync<MultiTextFieldIndex>(table => table
+            .Column<string>("ContentItemId", column => column.WithLength(26))
+            .Column<string>("ContentItemVersionId", column => column.WithLength(26))
+            .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
+            .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
+            .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
+            .Column<bool>("Published", column => column.Nullable())
+            .Column<bool>("Latest", column => column.Nullable())
+            .Column<string>("Value", column => column.Nullable().WithLength(MultiTextFieldIndex.MaxValueSize))
+            .Column<string>("BigValue", column => column.Nullable().Unlimited())
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<MultiTextFieldIndex>(table => table
+            .CreateIndex("IDX_MultiTextFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<MultiTextFieldIndex>(table => table
+            .CreateIndex("IDX_MultiTextFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + Value (764) + Published and Latest (1) = 767 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<MultiTextFieldIndex>(table => table
+            .CreateIndex("IDX_MultiTextFieldIndex_DocumentId_Value",
+                "DocumentId",
+                "Value(764)",
+                "Published",
+                "Latest")
+        );
+
+        // Shortcut other migration steps on new content definition schemas.
+        return 5;
+    }
 
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<ContentPickerFieldIndex>(table => table
-                .CreateIndex("IDX_ContentPickerFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom1Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
+            .AddColumn<string>("BigUrl", column => column.Nullable().Unlimited()));
 
-            await SchemaBuilder.AlterIndexTableAsync<ContentPickerFieldIndex>(table => table
-                .CreateIndex("IDX_ContentPickerField_DocumentId_SelectedItemId",
-                    "DocumentId",
-                    "SelectedContentItemId",
-                    "Published",
-                    "Latest")
-            );
+        await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
+            .AddColumn<string>("BigText", column => column.Nullable().Unlimited()));
 
-            await SchemaBuilder.CreateMapIndexTableAsync<TimeFieldIndex>(table => table
-                .Column<string>("ContentItemId", column => column.WithLength(26))
-                .Column<string>("ContentItemVersionId", column => column.WithLength(26))
-                .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
-                .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
-                .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
-                .Column<bool>("Published", column => column.Nullable())
-                .Column<bool>("Latest", column => column.Nullable())
-                .Column<TimeSpan>("Time", column => column.Nullable())
-            );
+        return 2;
+    }
 
-            await SchemaBuilder.AlterIndexTableAsync<TimeFieldIndex>(table => table
-                .CreateIndex("IDX_TimeFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom2Async()
+    {
+        await SchemaBuilder.CreateMapIndexTableAsync<MultiTextFieldIndex>(table => table
+            .Column<string>("ContentItemId", column => column.WithLength(26))
+            .Column<string>("ContentItemVersionId", column => column.WithLength(26))
+            .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
+            .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
+            .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
+            .Column<bool>("Published", column => column.Nullable())
+            .Column<bool>("Latest", column => column.Nullable())
+            .Column<string>("Value", column => column.Nullable().WithLength(MultiTextFieldIndex.MaxValueSize))
+            .Column<string>("BigValue", column => column.Nullable().Unlimited())
+        );
+
+        return 3;
+    }
 
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<TimeFieldIndex>(table => table
-                .CreateIndex("IDX_TimeFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom3Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<TextFieldIndex>(table => table
+            .CreateIndex("IDX_TextFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<TextFieldIndex>(table => table
+            .CreateIndex("IDX_TextFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + Text (764) + Published and Latest (1) = 767 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<TextFieldIndex>(table => table
+            .CreateIndex("IDX_TextFieldIndex_DocumentId_Text",
+                "DocumentId",
+                "Text(764)",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<BooleanFieldIndex>(table => table
+            .CreateIndex("IDX_BooleanFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Boolean, Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<BooleanFieldIndex>(table => table
+            .CreateIndex("IDX_BooleanFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Boolean",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<NumericFieldIndex>(table => table
+            .CreateIndex("IDX_NumericFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<NumericFieldIndex>(table => table
+            .CreateIndex("IDX_NumericFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<NumericFieldIndex>(table => table
+            .CreateIndex("IDX_NumericFieldIndex_DocumentId_Numeric",
+                "DocumentId",
+                "Numeric",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<DateTimeFieldIndex>(table => table
+            .CreateIndex("IDX_DateTimeFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<DateTimeFieldIndex>(table => table
+            .CreateIndex("IDX_DateTimeFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<DateTimeFieldIndex>(table => table
+            .CreateIndex("IDX_DateTimeFieldIndex_DocumentId_DateTime",
+                "DocumentId",
+                "DateTime",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<DateFieldIndex>(table => table
+            .CreateIndex("IDX_DateFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<DateFieldIndex>(table => table
+            .CreateIndex("IDX_DateFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<DateFieldIndex>(table => table
+            .CreateIndex("IDX_DateFieldIndex_DocumentId_Date",
+                "DocumentId",
+                "Date",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<ContentPickerFieldIndex>(table => table
+            .CreateIndex("IDX_ContentPickerFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<ContentPickerFieldIndex>(table => table
+            .CreateIndex("IDX_ContentPickerFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<ContentPickerFieldIndex>(table => table
+            .CreateIndex("IDX_ContentPickerField_DocumentId_SelectedItemId",
+                "DocumentId",
+                "SelectedContentItemId",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<TimeFieldIndex>(table => table
+            .CreateIndex("IDX_TimeFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<TimeFieldIndex>(table => table
+            .CreateIndex("IDX_TimeFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<TimeFieldIndex>(table => table
+            .CreateIndex("IDX_TimeFieldIndex_DocumentId_Time",
+                "DocumentId",
+                "Time",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
+            .CreateIndex("IDX_LinkFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
+            .CreateIndex("IDX_LinkFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + Url (764) + Published and Latest (1) = 767 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
+            .CreateIndex("IDX_LinkFieldIndex_DocumentId_Url",
+                "DocumentId",
+                "Url(764)",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + Text (764) + Published and Latest (1) = 767 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
+            .CreateIndex("IDX_LinkFieldIndex_DocumentId_Text",
+                "DocumentId",
+                "Text(764)",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<HtmlFieldIndex>(table => table
+            .CreateIndex("IDX_HtmlFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<HtmlFieldIndex>(table => table
+            .CreateIndex("IDX_HtmlFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<MultiTextFieldIndex>(table => table
+            .CreateIndex("IDX_MultiTextFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<MultiTextFieldIndex>(table => table
+            .CreateIndex("IDX_MultiTextFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + Value (764) + Published and Latest (1) = 767 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<MultiTextFieldIndex>(table => table
+            .CreateIndex("IDX_MultiTextFieldIndex_DocumentId_Value",
+                "DocumentId",
+                "Value(764)",
+                "Published",
+                "Latest")
+        );
+
+        return 4;
+    }
 
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom4Async()
+    {
+        // Attempts to drop an index that existed only in RC2.
+        try
+        {
             await SchemaBuilder.AlterIndexTableAsync<TimeFieldIndex>(table => table
-                .CreateIndex("IDX_TimeFieldIndex_DocumentId_Time",
-                    "DocumentId",
-                    "Time",
-                    "Published",
-                    "Latest")
-            );
-
-            // NOTE: The Url and Text Length has been decreased from 4000 characters to 768.
-            // For existing SQL databases update the LinkFieldIndex tables Url and Text column length manually.
-            // The BigText and BigUrl columns are new additions so will not be populated until the content item is republished.
-            // INFO: The Url and Text Length is now of 766 chars, but this is only used on a new installation.
-            await SchemaBuilder.CreateMapIndexTableAsync<LinkFieldIndex>(table => table
-                .Column<string>("ContentItemId", column => column.WithLength(26))
-                .Column<string>("ContentItemVersionId", column => column.WithLength(26))
-                .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
-                .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
-                .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
-                .Column<bool>("Published", column => column.Nullable())
-                .Column<bool>("Latest", column => column.Nullable())
-                .Column<string>("Url", column => column.Nullable().WithLength(LinkFieldIndex.MaxUrlSize))
-                .Column<string>("BigUrl", column => column.Nullable().Unlimited())
-                .Column<string>("Text", column => column.Nullable().WithLength(LinkFieldIndex.MaxTextSize))
-                .Column<string>("BigText", column => column.Nullable().Unlimited())
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
-                .CreateIndex("IDX_LinkFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
-
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
-                .CreateIndex("IDX_LinkFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + Url (764) + Published and Latest (1) = 767 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
-                .CreateIndex("IDX_LinkFieldIndex_DocumentId_Url",
-                    "DocumentId",
-                    "Url(764)",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + Text (764) + Published and Latest (1) = 767 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
-                .CreateIndex("IDX_LinkFieldIndex_DocumentId_Text",
-                    "DocumentId",
-                    "Text(764)",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.CreateMapIndexTableAsync<HtmlFieldIndex>(table => table
-                .Column<string>("ContentItemId", column => column.WithLength(26))
-                .Column<string>("ContentItemVersionId", column => column.WithLength(26))
-                .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
-                .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
-                .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
-                .Column<bool>("Published", column => column.Nullable())
-                .Column<bool>("Latest", column => column.Nullable())
-                .Column<string>("Html", column => column.Nullable().Unlimited())
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<HtmlFieldIndex>(table => table
-                .CreateIndex("IDX_HtmlFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<HtmlFieldIndex>(table => table
-                .CreateIndex("IDX_HtmlFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.CreateMapIndexTableAsync<MultiTextFieldIndex>(table => table
-                .Column<string>("ContentItemId", column => column.WithLength(26))
-                .Column<string>("ContentItemVersionId", column => column.WithLength(26))
-                .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
-                .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
-                .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
-                .Column<bool>("Published", column => column.Nullable())
-                .Column<bool>("Latest", column => column.Nullable())
-                .Column<string>("Value", column => column.Nullable().WithLength(MultiTextFieldIndex.MaxValueSize))
-                .Column<string>("BigValue", column => column.Nullable().Unlimited())
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<MultiTextFieldIndex>(table => table
-                .CreateIndex("IDX_MultiTextFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
+                .DropIndex("IDX_TimeFieldIndex_Time")
             );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<MultiTextFieldIndex>(table => table
-                .CreateIndex("IDX_MultiTextFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + Value (764) + Published and Latest (1) = 767 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<MultiTextFieldIndex>(table => table
-                .CreateIndex("IDX_MultiTextFieldIndex_DocumentId_Value",
-                    "DocumentId",
-                    "Value(764)",
-                    "Published",
-                    "Latest")
-            );
-
-            // Shortcut other migration steps on new content definition schemas.
-            return 5;
         }
-
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom1Async()
+        catch
         {
-            await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
-                .AddColumn<string>("BigUrl", column => column.Nullable().Unlimited()));
-
-            await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
-                .AddColumn<string>("BigText", column => column.Nullable().Unlimited()));
-
-            return 2;
+            _logger.LogWarning("Failed to drop an index that does not exist 'IDX_TimeFieldIndex_Time'");
         }
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom2Async()
-        {
-            await SchemaBuilder.CreateMapIndexTableAsync<MultiTextFieldIndex>(table => table
-                .Column<string>("ContentItemId", column => column.WithLength(26))
-                .Column<string>("ContentItemVersionId", column => column.WithLength(26))
-                .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
-                .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
-                .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
-                .Column<bool>("Published", column => column.Nullable())
-                .Column<bool>("Latest", column => column.Nullable())
-                .Column<string>("Value", column => column.Nullable().WithLength(MultiTextFieldIndex.MaxValueSize))
-                .Column<string>("BigValue", column => column.Nullable().Unlimited())
-            );
+        await SchemaBuilder.AlterIndexTableAsync<TimeFieldIndex>(table => table
+            .DropIndex("IDX_TimeFieldIndex_DocumentId_Time")
+        );
 
-            return 3;
-        }
-
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom3Async()
+        // SqLite does not support dropping columns.
+        try
         {
-            await SchemaBuilder.AlterIndexTableAsync<TextFieldIndex>(table => table
-                .CreateIndex("IDX_TextFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<TextFieldIndex>(table => table
-                .CreateIndex("IDX_TextFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + Text (764) + Published and Latest (1) = 767 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<TextFieldIndex>(table => table
-                .CreateIndex("IDX_TextFieldIndex_DocumentId_Text",
-                    "DocumentId",
-                    "Text(764)",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<BooleanFieldIndex>(table => table
-                .CreateIndex("IDX_BooleanFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Boolean, Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<BooleanFieldIndex>(table => table
-                .CreateIndex("IDX_BooleanFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Boolean",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<NumericFieldIndex>(table => table
-                .CreateIndex("IDX_NumericFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<NumericFieldIndex>(table => table
-                .CreateIndex("IDX_NumericFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<NumericFieldIndex>(table => table
-                .CreateIndex("IDX_NumericFieldIndex_DocumentId_Numeric",
-                    "DocumentId",
-                    "Numeric",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<DateTimeFieldIndex>(table => table
-                .CreateIndex("IDX_DateTimeFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<DateTimeFieldIndex>(table => table
-                .CreateIndex("IDX_DateTimeFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<DateTimeFieldIndex>(table => table
-                .CreateIndex("IDX_DateTimeFieldIndex_DocumentId_DateTime",
-                    "DocumentId",
-                    "DateTime",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<DateFieldIndex>(table => table
-                .CreateIndex("IDX_DateFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<DateFieldIndex>(table => table
-                .CreateIndex("IDX_DateFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<DateFieldIndex>(table => table
-                .CreateIndex("IDX_DateFieldIndex_DocumentId_Date",
-                    "DocumentId",
-                    "Date",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<ContentPickerFieldIndex>(table => table
-                .CreateIndex("IDX_ContentPickerFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<ContentPickerFieldIndex>(table => table
-                .CreateIndex("IDX_ContentPickerFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<ContentPickerFieldIndex>(table => table
-                .CreateIndex("IDX_ContentPickerField_DocumentId_SelectedItemId",
-                    "DocumentId",
-                    "SelectedContentItemId",
-                    "Published",
-                    "Latest")
-            );
-
             await SchemaBuilder.AlterIndexTableAsync<TimeFieldIndex>(table => table
-                .CreateIndex("IDX_TimeFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<TimeFieldIndex>(table => table
-                .CreateIndex("IDX_TimeFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
+                .DropColumn("Time"));
 
             await SchemaBuilder.AlterIndexTableAsync<TimeFieldIndex>(table => table
-                .CreateIndex("IDX_TimeFieldIndex_DocumentId_Time",
-                    "DocumentId",
-                    "Time",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
-                .CreateIndex("IDX_LinkFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
-                .CreateIndex("IDX_LinkFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + Url (764) + Published and Latest (1) = 767 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
-                .CreateIndex("IDX_LinkFieldIndex_DocumentId_Url",
-                    "DocumentId",
-                    "Url(764)",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + Text (764) + Published and Latest (1) = 767 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<LinkFieldIndex>(table => table
-                .CreateIndex("IDX_LinkFieldIndex_DocumentId_Text",
-                    "DocumentId",
-                    "Text(764)",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<HtmlFieldIndex>(table => table
-                .CreateIndex("IDX_HtmlFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<HtmlFieldIndex>(table => table
-                .CreateIndex("IDX_HtmlFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<MultiTextFieldIndex>(table => table
-                .CreateIndex("IDX_MultiTextFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<MultiTextFieldIndex>(table => table
-                .CreateIndex("IDX_MultiTextFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + Value (764) + Published and Latest (1) = 767 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<MultiTextFieldIndex>(table => table
-                .CreateIndex("IDX_MultiTextFieldIndex_DocumentId_Value",
-                    "DocumentId",
-                    "Value(764)",
-                    "Published",
-                    "Latest")
-            );
-
-            return 4;
+                .AddColumn<TimeSpan>("Time", column => column.Nullable()));
         }
-
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom4Async()
+        catch
         {
-            // Attempts to drop an index that existed only in RC2.
-            try
-            {
-                await SchemaBuilder.AlterIndexTableAsync<TimeFieldIndex>(table => table
-                    .DropIndex("IDX_TimeFieldIndex_Time")
-                );
-            }
-            catch
-            {
-                _logger.LogWarning("Failed to drop an index that does not exist 'IDX_TimeFieldIndex_Time'");
-            }
-
-            await SchemaBuilder.AlterIndexTableAsync<TimeFieldIndex>(table => table
-                .DropIndex("IDX_TimeFieldIndex_DocumentId_Time")
-            );
-
-            // SqLite does not support dropping columns.
-            try
-            {
-                await SchemaBuilder.AlterIndexTableAsync<TimeFieldIndex>(table => table
-                    .DropColumn("Time"));
+            _logger.LogWarning("Failed to alter 'Time' column. This is not an error when using SqLite");
+        }
 
-                await SchemaBuilder.AlterIndexTableAsync<TimeFieldIndex>(table => table
-                    .AddColumn<TimeSpan>("Time", column => column.Nullable()));
-            }
-            catch
-            {
-                _logger.LogWarning("Failed to alter 'Time' column. This is not an error when using SqLite");
-            }
+        await SchemaBuilder.AlterIndexTableAsync<TimeFieldIndex>(table => table
+            .CreateIndex("IDX_TimeFieldIndex_DocumentId_Time",
+                "DocumentId",
+                "Time",
+                "Published",
+                "Latest")
+        );
 
-            await SchemaBuilder.AlterIndexTableAsync<TimeFieldIndex>(table => table
-                .CreateIndex("IDX_TimeFieldIndex_DocumentId_Time",
-                    "DocumentId",
-                    "Time",
-                    "Published",
-                    "Latest")
-            );
-
-            return 5;
-        }
+        return 5;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/MultiTextFieldIndexProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/MultiTextFieldIndexProvider.cs
index 6e1d3710748..68a1711e8fa 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/MultiTextFieldIndexProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/MultiTextFieldIndexProvider.cs
@@ -8,89 +8,88 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.ContentFields.Indexing.SQL
+namespace OrchardCore.ContentFields.Indexing.SQL;
+
+public class MultiTextFieldIndex : ContentFieldIndex
 {
-    public class MultiTextFieldIndex : ContentFieldIndex
-    {
-        // Maximum length that MySql can support in an index under utf8 collation is 768,
-        // minus 1 for the `DocumentId` integer (character size = integer size = 4 bytes).
-        // minus 1 (freeing 4 bytes) for the additional 'Published' and 'Latest' booleans.
-        public const int MaxValueSize = 766;
+    // Maximum length that MySql can support in an index under utf8 collation is 768,
+    // minus 1 for the `DocumentId` integer (character size = integer size = 4 bytes).
+    // minus 1 (freeing 4 bytes) for the additional 'Published' and 'Latest' booleans.
+    public const int MaxValueSize = 766;
 
-        public string Value { get; set; }
-        public string BigValue { get; set; }
-    }
+    public string Value { get; set; }
+    public string BigValue { get; set; }
+}
 
-    public class MultiTextFieldIndexProvider : ContentFieldIndexProvider
-    {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly HashSet<string> _ignoredTypes = [];
-        private IContentDefinitionManager _contentDefinitionManager;
+public class MultiTextFieldIndexProvider : ContentFieldIndexProvider
+{
+    private readonly IServiceProvider _serviceProvider;
+    private readonly HashSet<string> _ignoredTypes = [];
+    private IContentDefinitionManager _contentDefinitionManager;
 
-        public MultiTextFieldIndexProvider(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
+    public MultiTextFieldIndexProvider(IServiceProvider serviceProvider)
+    {
+        _serviceProvider = serviceProvider;
+    }
 
-        public override void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<MultiTextFieldIndex>()
-                .Map(async contentItem =>
+    public override void Describe(DescribeContext<ContentItem> context)
+    {
+        context.For<MultiTextFieldIndex>()
+            .Map(async contentItem =>
+            {
+                // Remove index records of soft deleted items.
+                if (!contentItem.Published && !contentItem.Latest)
                 {
-                    // Remove index records of soft deleted items.
-                    if (!contentItem.Published && !contentItem.Latest)
-                    {
-                        return null;
-                    }
+                    return null;
+                }
 
-                    // Can we safely ignore this content item?
-                    if (_ignoredTypes.Contains(contentItem.ContentType))
-                    {
-                        return null;
-                    }
+                // Can we safely ignore this content item?
+                if (_ignoredTypes.Contains(contentItem.ContentType))
+                {
+                    return null;
+                }
 
-                    // Lazy initialization because of ISession cyclic dependency
-                    _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
+                // Lazy initialization because of ISession cyclic dependency
+                _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-                    // Search for TextField
-                    var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+                // Search for TextField
+                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-                    // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
-                    if (contentTypeDefinition == null)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
+                if (contentTypeDefinition == null)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    var fieldDefinitions = contentTypeDefinition
-                        .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(MultiTextField)))
-                        .ToArray();
+                var fieldDefinitions = contentTypeDefinition
+                    .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(MultiTextField)))
+                    .ToArray();
 
-                    // This type doesn't have any MultiTextField, ignore it
-                    if (fieldDefinitions.Length == 0)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This type doesn't have any MultiTextField, ignore it
+                if (fieldDefinitions.Length == 0)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    return fieldDefinitions
-                        .GetContentFields<MultiTextField>(contentItem)
-                        .SelectMany(pair =>
-                            pair.Field.Values.Select(value => (pair.Definition, Value: value)))
-                        .Select(pair =>
-                            new MultiTextFieldIndex
-                            {
-                                Latest = contentItem.Latest,
-                                Published = contentItem.Published,
-                                ContentItemId = contentItem.ContentItemId,
-                                ContentItemVersionId = contentItem.ContentItemVersionId,
-                                ContentType = contentItem.ContentType,
-                                ContentPart = pair.Definition.ContentTypePartDefinition.Name,
-                                ContentField = pair.Definition.Name,
-                                Value = pair.Value?[..Math.Min(pair.Value.Length, MultiTextFieldIndex.MaxValueSize)],
-                                BigValue = pair.Value,
-                            });
-                });
-        }
+                return fieldDefinitions
+                    .GetContentFields<MultiTextField>(contentItem)
+                    .SelectMany(pair =>
+                        pair.Field.Values.Select(value => (pair.Definition, Value: value)))
+                    .Select(pair =>
+                        new MultiTextFieldIndex
+                        {
+                            Latest = contentItem.Latest,
+                            Published = contentItem.Published,
+                            ContentItemId = contentItem.ContentItemId,
+                            ContentItemVersionId = contentItem.ContentItemVersionId,
+                            ContentType = contentItem.ContentType,
+                            ContentPart = pair.Definition.ContentTypePartDefinition.Name,
+                            ContentField = pair.Definition.Name,
+                            Value = pair.Value?[..Math.Min(pair.Value.Length, MultiTextFieldIndex.MaxValueSize)],
+                            BigValue = pair.Value,
+                        });
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/NumericFieldIndexProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/NumericFieldIndexProvider.cs
index e3636a97bcc..3b86830d963 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/NumericFieldIndexProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/NumericFieldIndexProvider.cs
@@ -8,80 +8,79 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.ContentFields.Indexing.SQL
+namespace OrchardCore.ContentFields.Indexing.SQL;
+
+public class NumericFieldIndex : ContentFieldIndex
 {
-    public class NumericFieldIndex : ContentFieldIndex
+    public decimal? Numeric { get; set; }
+}
+
+public class NumericFieldIndexProvider : ContentFieldIndexProvider
+{
+    private readonly IServiceProvider _serviceProvider;
+    private readonly HashSet<string> _ignoredTypes = [];
+    private IContentDefinitionManager _contentDefinitionManager;
+
+    public NumericFieldIndexProvider(IServiceProvider serviceProvider)
     {
-        public decimal? Numeric { get; set; }
+        _serviceProvider = serviceProvider;
     }
 
-    public class NumericFieldIndexProvider : ContentFieldIndexProvider
+    public override void Describe(DescribeContext<ContentItem> context)
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly HashSet<string> _ignoredTypes = [];
-        private IContentDefinitionManager _contentDefinitionManager;
-
-        public NumericFieldIndexProvider(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
-
-        public override void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<NumericFieldIndex>()
-                .Map(async contentItem =>
+        context.For<NumericFieldIndex>()
+            .Map(async contentItem =>
+            {
+                // Remove index records of soft deleted items.
+                if (!contentItem.Published && !contentItem.Latest)
                 {
-                    // Remove index records of soft deleted items.
-                    if (!contentItem.Published && !contentItem.Latest)
-                    {
-                        return null;
-                    }
+                    return null;
+                }
 
-                    // Can we safely ignore this content item?
-                    if (_ignoredTypes.Contains(contentItem.ContentType))
-                    {
-                        return null;
-                    }
+                // Can we safely ignore this content item?
+                if (_ignoredTypes.Contains(contentItem.ContentType))
+                {
+                    return null;
+                }
 
-                    // Lazy initialization because of ISession cyclic dependency
-                    _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
+                // Lazy initialization because of ISession cyclic dependency
+                _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-                    // Search for NumericField  
-                    var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+                // Search for NumericField  
+                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-                    // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
-                    if (contentTypeDefinition == null)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
+                if (contentTypeDefinition == null)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    var fieldDefinitions = contentTypeDefinition
-                        .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(NumericField)))
-                        .ToArray();
+                var fieldDefinitions = contentTypeDefinition
+                    .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(NumericField)))
+                    .ToArray();
 
-                    // This type doesn't have any NumericField, ignore it
-                    if (fieldDefinitions.Length == 0)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This type doesn't have any NumericField, ignore it
+                if (fieldDefinitions.Length == 0)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    return fieldDefinitions
-                        .GetContentFields<NumericField>(contentItem)
-                        .Select(pair =>
-                            new NumericFieldIndex
-                            {
-                                Latest = contentItem.Latest,
-                                Published = contentItem.Published,
-                                ContentItemId = contentItem.ContentItemId,
-                                ContentItemVersionId = contentItem.ContentItemVersionId,
-                                ContentType = contentItem.ContentType,
-                                ContentPart = pair.Definition.ContentTypePartDefinition.Name,
-                                ContentField = pair.Definition.Name,
-                                Numeric = pair.Field.Value,
-                            });
-                });
-        }
+                return fieldDefinitions
+                    .GetContentFields<NumericField>(contentItem)
+                    .Select(pair =>
+                        new NumericFieldIndex
+                        {
+                            Latest = contentItem.Latest,
+                            Published = contentItem.Published,
+                            ContentItemId = contentItem.ContentItemId,
+                            ContentItemVersionId = contentItem.ContentItemVersionId,
+                            ContentType = contentItem.ContentType,
+                            ContentPart = pair.Definition.ContentTypePartDefinition.Name,
+                            ContentField = pair.Definition.Name,
+                            Numeric = pair.Field.Value,
+                        });
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/TextFieldIndexProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/TextFieldIndexProvider.cs
index 3ab714e4ffd..04753a5f260 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/TextFieldIndexProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/TextFieldIndexProvider.cs
@@ -8,87 +8,86 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.ContentFields.Indexing.SQL
+namespace OrchardCore.ContentFields.Indexing.SQL;
+
+public class TextFieldIndex : ContentFieldIndex
 {
-    public class TextFieldIndex : ContentFieldIndex
-    {
-        // Maximum length that MySql can support in an index under utf8 collation is 768,
-        // minus 1 for the `DocumentId` integer (character size = integer size = 4 bytes).
-        // minus 1 (freeing 4 bytes) for the additional 'Published' and 'Latest' booleans.
-        public const int MaxTextSize = 766;
+    // Maximum length that MySql can support in an index under utf8 collation is 768,
+    // minus 1 for the `DocumentId` integer (character size = integer size = 4 bytes).
+    // minus 1 (freeing 4 bytes) for the additional 'Published' and 'Latest' booleans.
+    public const int MaxTextSize = 766;
 
-        public string Text { get; set; }
-        public string BigText { get; set; }
-    }
+    public string Text { get; set; }
+    public string BigText { get; set; }
+}
 
-    public class TextFieldIndexProvider : ContentFieldIndexProvider
-    {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly HashSet<string> _ignoredTypes = [];
-        private IContentDefinitionManager _contentDefinitionManager;
+public class TextFieldIndexProvider : ContentFieldIndexProvider
+{
+    private readonly IServiceProvider _serviceProvider;
+    private readonly HashSet<string> _ignoredTypes = [];
+    private IContentDefinitionManager _contentDefinitionManager;
 
-        public TextFieldIndexProvider(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
+    public TextFieldIndexProvider(IServiceProvider serviceProvider)
+    {
+        _serviceProvider = serviceProvider;
+    }
 
-        public override void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<TextFieldIndex>()
-                .Map(async contentItem =>
+    public override void Describe(DescribeContext<ContentItem> context)
+    {
+        context.For<TextFieldIndex>()
+            .Map(async contentItem =>
+            {
+                // Remove index records of soft deleted items.
+                if (!contentItem.Published && !contentItem.Latest)
                 {
-                    // Remove index records of soft deleted items.
-                    if (!contentItem.Published && !contentItem.Latest)
-                    {
-                        return null;
-                    }
+                    return null;
+                }
 
-                    // Can we safely ignore this content item?
-                    if (_ignoredTypes.Contains(contentItem.ContentType))
-                    {
-                        return null;
-                    }
+                // Can we safely ignore this content item?
+                if (_ignoredTypes.Contains(contentItem.ContentType))
+                {
+                    return null;
+                }
 
-                    // Lazy initialization because of ISession cyclic dependency
-                    _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
+                // Lazy initialization because of ISession cyclic dependency
+                _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-                    // Search for TextField
-                    var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+                // Search for TextField
+                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-                    // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
-                    if (contentTypeDefinition == null)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
+                if (contentTypeDefinition == null)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    var fieldDefinitions = contentTypeDefinition
-                        .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(TextField)))
-                        .ToArray();
+                var fieldDefinitions = contentTypeDefinition
+                    .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(TextField)))
+                    .ToArray();
 
-                    // This type doesn't have any TextField, ignore it
-                    if (fieldDefinitions.Length == 0)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This type doesn't have any TextField, ignore it
+                if (fieldDefinitions.Length == 0)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    return fieldDefinitions
-                        .GetContentFields<TextField>(contentItem)
-                        .Select(pair =>
-                            new TextFieldIndex
-                            {
-                                Latest = contentItem.Latest,
-                                Published = contentItem.Published,
-                                ContentItemId = contentItem.ContentItemId,
-                                ContentItemVersionId = contentItem.ContentItemVersionId,
-                                ContentType = contentItem.ContentType,
-                                ContentPart = pair.Definition.ContentTypePartDefinition.Name,
-                                ContentField = pair.Definition.Name,
-                                Text = pair.Field.Text?[..Math.Min(pair.Field.Text.Length, TextFieldIndex.MaxTextSize)],
-                                BigText = pair.Field.Text,
-                            });
-                });
-        }
+                return fieldDefinitions
+                    .GetContentFields<TextField>(contentItem)
+                    .Select(pair =>
+                        new TextFieldIndex
+                        {
+                            Latest = contentItem.Latest,
+                            Published = contentItem.Published,
+                            ContentItemId = contentItem.ContentItemId,
+                            ContentItemVersionId = contentItem.ContentItemVersionId,
+                            ContentType = contentItem.ContentType,
+                            ContentPart = pair.Definition.ContentTypePartDefinition.Name,
+                            ContentField = pair.Definition.Name,
+                            Text = pair.Field.Text?[..Math.Min(pair.Field.Text.Length, TextFieldIndex.MaxTextSize)],
+                            BigText = pair.Field.Text,
+                        });
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/TimeFieldIndexProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/TimeFieldIndexProvider.cs
index 535a856d7ee..004f5d8c43c 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/TimeFieldIndexProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/TimeFieldIndexProvider.cs
@@ -8,80 +8,79 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.ContentFields.Indexing.SQL
+namespace OrchardCore.ContentFields.Indexing.SQL;
+
+public class TimeFieldIndex : ContentFieldIndex
 {
-    public class TimeFieldIndex : ContentFieldIndex
+    public TimeSpan? Time { get; set; }
+}
+
+public class TimeFieldIndexProvider : ContentFieldIndexProvider
+{
+    private readonly IServiceProvider _serviceProvider;
+    private readonly HashSet<string> _ignoredTypes = [];
+    private IContentDefinitionManager _contentDefinitionManager;
+
+    public TimeFieldIndexProvider(IServiceProvider serviceProvider)
     {
-        public TimeSpan? Time { get; set; }
+        _serviceProvider = serviceProvider;
     }
 
-    public class TimeFieldIndexProvider : ContentFieldIndexProvider
+    public override void Describe(DescribeContext<ContentItem> context)
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly HashSet<string> _ignoredTypes = [];
-        private IContentDefinitionManager _contentDefinitionManager;
-
-        public TimeFieldIndexProvider(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
-
-        public override void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<TimeFieldIndex>()
-                .Map(async contentItem =>
+        context.For<TimeFieldIndex>()
+            .Map(async contentItem =>
+            {
+                // Remove index records of soft deleted items.
+                if (!contentItem.Published && !contentItem.Latest)
                 {
-                    // Remove index records of soft deleted items.
-                    if (!contentItem.Published && !contentItem.Latest)
-                    {
-                        return null;
-                    }
+                    return null;
+                }
 
-                    // Can we safely ignore this content item?
-                    if (_ignoredTypes.Contains(contentItem.ContentType))
-                    {
-                        return null;
-                    }
+                // Can we safely ignore this content item?
+                if (_ignoredTypes.Contains(contentItem.ContentType))
+                {
+                    return null;
+                }
 
-                    // Lazy initialization because of ISession cyclic dependency
-                    _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
+                // Lazy initialization because of ISession cyclic dependency
+                _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-                    // Search for TimeField
-                    var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+                // Search for TimeField
+                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-                    // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
-                    if (contentTypeDefinition == null)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
+                if (contentTypeDefinition == null)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    var fieldDefinitions = contentTypeDefinition
-                        .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(TimeField)))
-                        .ToArray();
+                var fieldDefinitions = contentTypeDefinition
+                    .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(TimeField)))
+                    .ToArray();
 
-                    // This type doesn't have any TimeField, ignore it
-                    if (fieldDefinitions.Length == 0)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This type doesn't have any TimeField, ignore it
+                if (fieldDefinitions.Length == 0)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    return fieldDefinitions
-                        .GetContentFields<TimeField>(contentItem)
-                        .Select(pair =>
-                            new TimeFieldIndex
-                            {
-                                Latest = contentItem.Latest,
-                                Published = contentItem.Published,
-                                ContentItemId = contentItem.ContentItemId,
-                                ContentItemVersionId = contentItem.ContentItemVersionId,
-                                ContentType = contentItem.ContentType,
-                                ContentPart = pair.Definition.ContentTypePartDefinition.Name,
-                                ContentField = pair.Definition.Name,
-                                Time = pair.Field.Value,
-                            });
-                });
-        }
+                return fieldDefinitions
+                    .GetContentFields<TimeField>(contentItem)
+                    .Select(pair =>
+                        new TimeFieldIndex
+                        {
+                            Latest = contentItem.Latest,
+                            Published = contentItem.Published,
+                            ContentItemId = contentItem.ContentItemId,
+                            ContentItemVersionId = contentItem.ContentItemVersionId,
+                            ContentType = contentItem.ContentType,
+                            ContentPart = pair.Definition.ContentTypePartDefinition.Name,
+                            ContentField = pair.Definition.Name,
+                            Time = pair.Field.Value,
+                        });
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/UserPickerFieldIndexProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/UserPickerFieldIndexProvider.cs
index fd1f95c4f24..df6dddacd85 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/UserPickerFieldIndexProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/UserPickerFieldIndexProvider.cs
@@ -8,82 +8,81 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.ContentFields.Indexing.SQL
+namespace OrchardCore.ContentFields.Indexing.SQL;
+
+public class UserPickerFieldIndex : ContentFieldIndex
 {
-    public class UserPickerFieldIndex : ContentFieldIndex
+    public string SelectedUserId { get; set; }
+}
+
+public class UserPickerFieldIndexProvider : ContentFieldIndexProvider
+{
+    private readonly IServiceProvider _serviceProvider;
+    private readonly HashSet<string> _ignoredTypes = [];
+    private IContentDefinitionManager _contentDefinitionManager;
+
+    public UserPickerFieldIndexProvider(IServiceProvider serviceProvider)
     {
-        public string SelectedUserId { get; set; }
+        _serviceProvider = serviceProvider;
     }
 
-    public class UserPickerFieldIndexProvider : ContentFieldIndexProvider
+    public override void Describe(DescribeContext<ContentItem> context)
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly HashSet<string> _ignoredTypes = [];
-        private IContentDefinitionManager _contentDefinitionManager;
-
-        public UserPickerFieldIndexProvider(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
-
-        public override void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<UserPickerFieldIndex>()
-                .Map(async contentItem =>
+        context.For<UserPickerFieldIndex>()
+            .Map(async contentItem =>
+            {
+                // Remove index records of soft deleted items.
+                if (!contentItem.Published && !contentItem.Latest)
                 {
-                    // Remove index records of soft deleted items.
-                    if (!contentItem.Published && !contentItem.Latest)
-                    {
-                        return null;
-                    }
+                    return null;
+                }
 
-                    // Can we safely ignore this content item?
-                    if (_ignoredTypes.Contains(contentItem.ContentType))
-                    {
-                        return null;
-                    }
+                // Can we safely ignore this content item?
+                if (_ignoredTypes.Contains(contentItem.ContentType))
+                {
+                    return null;
+                }
 
-                    // Lazy initialization because of ISession cyclic dependency
-                    _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
+                // Lazy initialization because of ISession cyclic dependency
+                _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-                    // Search for ContentPickerField
-                    var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+                // Search for ContentPickerField
+                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-                    // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
-                    if (contentTypeDefinition == null)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
+                if (contentTypeDefinition == null)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    var fieldDefinitions = contentTypeDefinition
-                        .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(UserPickerField)))
-                        .ToArray();
+                var fieldDefinitions = contentTypeDefinition
+                    .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(UserPickerField)))
+                    .ToArray();
 
-                    // This type doesn't have any UserPickerField, ignore it
-                    if (fieldDefinitions.Length == 0)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This type doesn't have any UserPickerField, ignore it
+                if (fieldDefinitions.Length == 0)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    return fieldDefinitions
-                        .GetContentFields<UserPickerField>(contentItem)
-                        .SelectMany(pair =>
-                            pair.Field.UserIds.Select(value => (pair.Definition, UserId: value)))
-                        .Select(pair =>
-                            new UserPickerFieldIndex
-                            {
-                                Latest = contentItem.Latest,
-                                Published = contentItem.Published,
-                                ContentItemId = contentItem.ContentItemId,
-                                ContentItemVersionId = contentItem.ContentItemVersionId,
-                                ContentType = contentItem.ContentType,
-                                ContentPart = pair.Definition.ContentTypePartDefinition.Name,
-                                ContentField = pair.Definition.Name,
-                                SelectedUserId = pair.UserId,
-                            });
-                });
-        }
+                return fieldDefinitions
+                    .GetContentFields<UserPickerField>(contentItem)
+                    .SelectMany(pair =>
+                        pair.Field.UserIds.Select(value => (pair.Definition, UserId: value)))
+                    .Select(pair =>
+                        new UserPickerFieldIndex
+                        {
+                            Latest = contentItem.Latest,
+                            Published = contentItem.Published,
+                            ContentItemId = contentItem.ContentItemId,
+                            ContentItemVersionId = contentItem.ContentItemVersionId,
+                            ContentType = contentItem.ContentType,
+                            ContentPart = pair.Definition.ContentTypePartDefinition.Name,
+                            ContentField = pair.Definition.Name,
+                            SelectedUserId = pair.UserId,
+                        });
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/UserPickerMigrations.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/UserPickerMigrations.cs
index 88b701d2650..c658119f22e 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/UserPickerMigrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/UserPickerMigrations.cs
@@ -3,89 +3,88 @@
 using OrchardCore.Data.Migration;
 using YesSql.Sql;
 
-namespace OrchardCore.ContentFields.Indexing.SQL
+namespace OrchardCore.ContentFields.Indexing.SQL;
+
+public sealed class UserPickerMigrations : DataMigration
 {
-    public sealed class UserPickerMigrations : DataMigration
+    public async Task<int> CreateAsync()
     {
-        public async Task<int> CreateAsync()
-        {
-            await SchemaBuilder.CreateMapIndexTableAsync<UserPickerFieldIndex>(table => table
-                .Column<string>("ContentItemId", column => column.WithLength(26))
-                .Column<string>("ContentItemVersionId", column => column.WithLength(26))
-                .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
-                .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
-                .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
-                .Column<bool>("Published", column => column.Nullable())
-                .Column<bool>("Latest", column => column.Nullable())
-                .Column<string>("SelectedUserId")
-            );
+        await SchemaBuilder.CreateMapIndexTableAsync<UserPickerFieldIndex>(table => table
+            .Column<string>("ContentItemId", column => column.WithLength(26))
+            .Column<string>("ContentItemVersionId", column => column.WithLength(26))
+            .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
+            .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
+            .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
+            .Column<bool>("Published", column => column.Nullable())
+            .Column<bool>("Latest", column => column.Nullable())
+            .Column<string>("SelectedUserId")
+        );
 
-            await SchemaBuilder.AlterIndexTableAsync<UserPickerFieldIndex>(table => table
-                .CreateIndex("IDX_UserPickerFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
+        await SchemaBuilder.AlterIndexTableAsync<UserPickerFieldIndex>(table => table
+            .CreateIndex("IDX_UserPickerFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
 
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<UserPickerFieldIndex>(table => table
-                .CreateIndex("IDX_UserPickerFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<UserPickerFieldIndex>(table => table
+            .CreateIndex("IDX_UserPickerFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
 
-            await SchemaBuilder.AlterIndexTableAsync<UserPickerFieldIndex>(table => table
-                .CreateIndex("IDX_UserPickerFieldIndex_DocumentId_SelectedUserId",
-                    "DocumentId",
-                    "SelectedUserId",
-                    "Published",
-                    "Latest")
-            );
+        await SchemaBuilder.AlterIndexTableAsync<UserPickerFieldIndex>(table => table
+            .CreateIndex("IDX_UserPickerFieldIndex_DocumentId_SelectedUserId",
+                "DocumentId",
+                "SelectedUserId",
+                "Published",
+                "Latest")
+        );
 
-            // Shortcut other migration steps on new content definition schemas.
-            return 2;
-        }
+        // Shortcut other migration steps on new content definition schemas.
+        return 2;
+    }
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom1Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<UserPickerFieldIndex>(table => table
-                .CreateIndex("IDX_UserPickerFieldIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom1Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<UserPickerFieldIndex>(table => table
+            .CreateIndex("IDX_UserPickerFieldIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
 
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<UserPickerFieldIndex>(table => table
-                .CreateIndex("IDX_UserPickerFieldIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<UserPickerFieldIndex>(table => table
+            .CreateIndex("IDX_UserPickerFieldIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
 
-            await SchemaBuilder.AlterIndexTableAsync<UserPickerFieldIndex>(table => table
-                .CreateIndex("IDX_UserPickerFieldIndex_DocumentId_SelectedUserId",
-                    "DocumentId",
-                    "SelectedUserId",
-                    "Published",
-                    "Latest")
-            );
+        await SchemaBuilder.AlterIndexTableAsync<UserPickerFieldIndex>(table => table
+            .CreateIndex("IDX_UserPickerFieldIndex_DocumentId_SelectedUserId",
+                "DocumentId",
+                "SelectedUserId",
+                "Published",
+                "Latest")
+        );
 
-            return 2;
-        }
+        return 2;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/TextFieldIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/TextFieldIndexHandler.cs
index 7d409856d88..712cde95fbc 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/TextFieldIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/TextFieldIndexHandler.cs
@@ -2,20 +2,19 @@
 using OrchardCore.ContentFields.Fields;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.ContentFields.Indexing
+namespace OrchardCore.ContentFields.Indexing;
+
+public class TextFieldIndexHandler : ContentFieldIndexHandler<TextField>
 {
-    public class TextFieldIndexHandler : ContentFieldIndexHandler<TextField>
+    public override Task BuildIndexAsync(TextField field, BuildFieldIndexContext context)
     {
-        public override Task BuildIndexAsync(TextField field, BuildFieldIndexContext context)
-        {
-            var options = context.Settings.ToOptions();
-
-            foreach (var key in context.Keys)
-            {
-                context.DocumentIndex.Set(key, field.Text, options);
-            }
+        var options = context.Settings.ToOptions();
 
-            return Task.CompletedTask;
+        foreach (var key in context.Keys)
+        {
+            context.DocumentIndex.Set(key, field.Text, options);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/TimeFieldIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/TimeFieldIndexHandler.cs
index df61e201a24..374712da9b3 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/TimeFieldIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/TimeFieldIndexHandler.cs
@@ -3,26 +3,25 @@
 using OrchardCore.ContentFields.Fields;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.ContentFields.Indexing
+namespace OrchardCore.ContentFields.Indexing;
+
+public class TimeFieldIndexHandler : ContentFieldIndexHandler<TimeField>
 {
-    public class TimeFieldIndexHandler : ContentFieldIndexHandler<TimeField>
+    public override Task BuildIndexAsync(TimeField field, BuildFieldIndexContext context)
     {
-        public override Task BuildIndexAsync(TimeField field, BuildFieldIndexContext context)
-        {
-            var options = context.Settings.ToOptions();
+        var options = context.Settings.ToOptions();
 
-            DateTime? indexedValue = null;
-            if (field.Value.HasValue)
-            {
-                indexedValue = new DateTime(field.Value.Value.Ticks);
-            }
-
-            foreach (var key in context.Keys)
-            {
-                context.DocumentIndex.Set(key, indexedValue, options);
-            }
+        DateTime? indexedValue = null;
+        if (field.Value.HasValue)
+        {
+            indexedValue = new DateTime(field.Value.Value.Ticks);
+        }
 
-            return Task.CompletedTask;
+        foreach (var key in context.Keys)
+        {
+            context.DocumentIndex.Set(key, indexedValue, options);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/UserPickerFieldIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/UserPickerFieldIndexHandler.cs
index 882bd7d2414..0cbc7dfebda 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/UserPickerFieldIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/UserPickerFieldIndexHandler.cs
@@ -3,42 +3,41 @@
 using OrchardCore.Contents.Indexing;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.ContentFields.Indexing
+namespace OrchardCore.ContentFields.Indexing;
+
+public class UserPickerFieldIndexHandler : ContentFieldIndexHandler<UserPickerField>
 {
-    public class UserPickerFieldIndexHandler : ContentFieldIndexHandler<UserPickerField>
+    public override Task BuildIndexAsync(UserPickerField field, BuildFieldIndexContext context)
     {
-        public override Task BuildIndexAsync(UserPickerField field, BuildFieldIndexContext context)
-        {
-            var options = DocumentIndexOptions.Keyword | DocumentIndexOptions.Store;
+        var options = DocumentIndexOptions.Keyword | DocumentIndexOptions.Store;
 
-            if (field.UserIds.Length > 0)
+        if (field.UserIds.Length > 0)
+        {
+            foreach (var userId in field.UserIds)
             {
-                foreach (var userId in field.UserIds)
-                {
-                    foreach (var key in context.Keys)
-                    {
-                        context.DocumentIndex.Set(key, userId, options);
-                    }
-                }
-
-                var userNames = field.GetUserNames();
-                foreach (var userName in userNames)
+                foreach (var key in context.Keys)
                 {
-                    foreach (var key in context.Keys)
-                    {
-                        context.DocumentIndex.Set(key, userName, options);
-                    }
+                    context.DocumentIndex.Set(key, userId, options);
                 }
             }
-            else
+
+            var userNames = field.GetUserNames();
+            foreach (var userName in userNames)
             {
                 foreach (var key in context.Keys)
                 {
-                    context.DocumentIndex.Set(key, IndexingConstants.NullValue, options);
+                    context.DocumentIndex.Set(key, userName, options);
                 }
             }
-
-            return Task.CompletedTask;
         }
+        else
+        {
+            foreach (var key in context.Keys)
+            {
+                context.DocumentIndex.Set(key, IndexingConstants.NullValue, options);
+            }
+        }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/YoutubeFieldIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/YoutubeFieldIndexHandler.cs
index 430ce70d291..29d87f91744 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/YoutubeFieldIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/YoutubeFieldIndexHandler.cs
@@ -2,20 +2,19 @@
 using OrchardCore.ContentFields.Fields;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.ContentFields.Indexing
+namespace OrchardCore.ContentFields.Indexing;
+
+public class YoutubeFieldIndexHandler : ContentFieldIndexHandler<YoutubeField>
 {
-    public class YoutubeFieldIndexHandler : ContentFieldIndexHandler<YoutubeField>
+    public override Task BuildIndexAsync(YoutubeField field, BuildFieldIndexContext context)
     {
-        public override Task BuildIndexAsync(YoutubeField field, BuildFieldIndexContext context)
-        {
-            var options = context.Settings.ToOptions();
-
-            foreach (var key in context.Keys)
-            {
-                context.DocumentIndex.Set(key, field.EmbeddedAddress, options);
-            }
+        var options = context.Settings.ToOptions();
 
-            return Task.CompletedTask;
+        foreach (var key in context.Keys)
+        {
+            context.DocumentIndex.Set(key, field.EmbeddedAddress, options);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Media/MediaShapes.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Media/MediaShapes.cs
index 64e362deb59..f7b674b6e26 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Media/MediaShapes.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Media/MediaShapes.cs
@@ -2,30 +2,29 @@
 using OrchardCore.DisplayManagement.Descriptors;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentFields.Media
+namespace OrchardCore.ContentFields.Media;
+
+[RequireFeatures("OrchardCore.Media")]
+public class MediaShapes : ShapeTableProvider
 {
-    [RequireFeatures("OrchardCore.Media")]
-    public class MediaShapes : ShapeTableProvider
+    public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
     {
-        public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
-        {
-            builder.Describe("HtmlField_Edit")
-                .OnDisplaying(displaying =>
-                {
-                    var editor = displaying.Shape;
+        builder.Describe("HtmlField_Edit")
+            .OnDisplaying(displaying =>
+            {
+                var editor = displaying.Shape;
 
-                    if (editor.Metadata.Type == "HtmlField_Edit__Wysiwyg")
-                    {
-                        editor.Metadata.Wrappers.Add("Media_Wrapper__HtmlField");
-                    }
+                if (editor.Metadata.Type == "HtmlField_Edit__Wysiwyg")
+                {
+                    editor.Metadata.Wrappers.Add("Media_Wrapper__HtmlField");
+                }
 
-                    if (editor.Metadata.Type == "HtmlField_Edit__Trumbowyg")
-                    {
-                        editor.Metadata.Wrappers.Add("Media_Wrapper__HtmlField");
-                    }
-                });
+                if (editor.Metadata.Type == "HtmlField_Edit__Trumbowyg")
+                {
+                    editor.Metadata.Wrappers.Add("Media_Wrapper__HtmlField");
+                }
+            });
 
-            return ValueTask.CompletedTask;
-        }
+        return ValueTask.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Media/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Media/Startup.cs
index 1daa4f35bbc..d1844ad0fcc 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Media/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Media/Startup.cs
@@ -2,14 +2,13 @@
 using OrchardCore.DisplayManagement.Descriptors;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentFields.Media
+namespace OrchardCore.ContentFields.Media;
+
+[RequireFeatures("OrchardCore.Media")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Media")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IShapeTableProvider, MediaShapes>();
-        }
+        services.AddScoped<IShapeTableProvider, MediaShapes>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Migrations.cs
index 63cdceb1a0c..bc9fa87c282 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Migrations.cs
@@ -7,102 +7,101 @@
 using OrchardCore.Environment.Shell;
 using OrchardCore.Environment.Shell.Descriptor.Models;
 
-namespace OrchardCore.ContentFields
+namespace OrchardCore.ContentFields;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ShellDescriptor _shellDescriptor;
+
+    public Migrations(
+        IContentDefinitionManager contentDefinitionManager,
+        ShellDescriptor shellDescriptor)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly ShellDescriptor _shellDescriptor;
+        _contentDefinitionManager = contentDefinitionManager;
+        _shellDescriptor = shellDescriptor;
+    }
 
-        public Migrations(
-            IContentDefinitionManager contentDefinitionManager,
-            ShellDescriptor shellDescriptor)
+    // New installations don't need to be upgraded, but because there is no initial migration record,
+    // 'UpgradeAsync()' is called in a new 'CreateAsync()' but only if the feature was already installed.
+    public async Task<int> CreateAsync()
+    {
+        if (_shellDescriptor.WasFeatureAlreadyInstalled("OrchardCore.ContentFields"))
         {
-            _contentDefinitionManager = contentDefinitionManager;
-            _shellDescriptor = shellDescriptor;
+            await UpgradeAsync();
         }
 
-        // New installations don't need to be upgraded, but because there is no initial migration record,
-        // 'UpgradeAsync()' is called in a new 'CreateAsync()' but only if the feature was already installed.
-        public async Task<int> CreateAsync()
-        {
-            if (_shellDescriptor.WasFeatureAlreadyInstalled("OrchardCore.ContentFields"))
-            {
-                await UpgradeAsync();
-            }
-
-            // Shortcut other migration steps on new content definition schemas.
-            return 2;
-        }
+        // Shortcut other migration steps on new content definition schemas.
+        return 2;
+    }
 
-        // Upgrade an existing installation.
-        private async Task UpgradeAsync()
-        {
-            // Boolean field
-            await _contentDefinitionManager.MigrateFieldSettingsAsync<BooleanField, BooleanFieldSettings>();
+    // Upgrade an existing installation.
+    private async Task UpgradeAsync()
+    {
+        // Boolean field
+        await _contentDefinitionManager.MigrateFieldSettingsAsync<BooleanField, BooleanFieldSettings>();
 
-            // Content picker field
-            await _contentDefinitionManager.MigrateFieldSettingsAsync<ContentPickerField, ContentPickerFieldSettings>();
+        // Content picker field
+        await _contentDefinitionManager.MigrateFieldSettingsAsync<ContentPickerField, ContentPickerFieldSettings>();
 
-            // Date field
-            await _contentDefinitionManager.MigrateFieldSettingsAsync<DateField, DateFieldSettings>();
+        // Date field
+        await _contentDefinitionManager.MigrateFieldSettingsAsync<DateField, DateFieldSettings>();
 
-            // Date time field
-            await _contentDefinitionManager.MigrateFieldSettingsAsync<DateTimeField, DateTimeFieldSettings>();
+        // Date time field
+        await _contentDefinitionManager.MigrateFieldSettingsAsync<DateTimeField, DateTimeFieldSettings>();
 
-            // Html field
-            await _contentDefinitionManager.MigrateFieldSettingsAsync<HtmlField, HtmlFieldSettings>();
+        // Html field
+        await _contentDefinitionManager.MigrateFieldSettingsAsync<HtmlField, HtmlFieldSettings>();
 
-            // Link field
-            await _contentDefinitionManager.MigrateFieldSettingsAsync<LinkField, LinkFieldSettings>();
+        // Link field
+        await _contentDefinitionManager.MigrateFieldSettingsAsync<LinkField, LinkFieldSettings>();
 
-            // Localization set content picker field
-            await _contentDefinitionManager.MigrateFieldSettingsAsync<LocalizationSetContentPickerField, LocalizationSetContentPickerFieldSettings>();
+        // Localization set content picker field
+        await _contentDefinitionManager.MigrateFieldSettingsAsync<LocalizationSetContentPickerField, LocalizationSetContentPickerFieldSettings>();
 
-            // MultiText field
-            await _contentDefinitionManager.MigrateFieldSettingsAsync<MultiTextField, MultiTextFieldSettings>();
+        // MultiText field
+        await _contentDefinitionManager.MigrateFieldSettingsAsync<MultiTextField, MultiTextFieldSettings>();
 
-            // Numeric field
-            await _contentDefinitionManager.MigrateFieldSettingsAsync<NumericField, NumericFieldSettings>();
+        // Numeric field
+        await _contentDefinitionManager.MigrateFieldSettingsAsync<NumericField, NumericFieldSettings>();
 
-            // Text field
-            await _contentDefinitionManager.MigrateFieldSettingsAsync<TextField, TextFieldHeaderDisplaySettings>();
-            await _contentDefinitionManager.MigrateFieldSettingsAsync<TextField, TextFieldPredefinedListEditorSettings>();
-            await _contentDefinitionManager.MigrateFieldSettingsAsync<TextField, TextFieldSettings>();
+        // Text field
+        await _contentDefinitionManager.MigrateFieldSettingsAsync<TextField, TextFieldHeaderDisplaySettings>();
+        await _contentDefinitionManager.MigrateFieldSettingsAsync<TextField, TextFieldPredefinedListEditorSettings>();
+        await _contentDefinitionManager.MigrateFieldSettingsAsync<TextField, TextFieldSettings>();
 
-            // Time field
-            await _contentDefinitionManager.MigrateFieldSettingsAsync<TimeField, TimeFieldSettings>();
+        // Time field
+        await _contentDefinitionManager.MigrateFieldSettingsAsync<TimeField, TimeFieldSettings>();
 
-            // YouTube field
-            await _contentDefinitionManager.MigrateFieldSettingsAsync<YoutubeField, YoutubeFieldSettings>();
+        // YouTube field
+        await _contentDefinitionManager.MigrateFieldSettingsAsync<YoutubeField, YoutubeFieldSettings>();
 
-            // Keep in sync the upgrade process.
-            await UpdateFrom1Async();
-        }
+        // Keep in sync the upgrade process.
+        await UpdateFrom1Async();
+    }
 
-        // This step is part of the upgrade process.
-        public async Task<int> UpdateFrom1Async()
+    // This step is part of the upgrade process.
+    public async Task<int> UpdateFrom1Async()
+    {
+        // For backwards compatibility with liquid filters we disable html sanitization on existing field definitions.
+        var partDefinitions = await _contentDefinitionManager.LoadPartDefinitionsAsync();
+        foreach (var partDefinition in partDefinitions)
         {
-            // For backwards compatibility with liquid filters we disable html sanitization on existing field definitions.
-            var partDefinitions = await _contentDefinitionManager.LoadPartDefinitionsAsync();
-            foreach (var partDefinition in partDefinitions)
+            if (partDefinition.Fields.Any(x => x.FieldDefinition.Name == "HtmlField"))
             {
-                if (partDefinition.Fields.Any(x => x.FieldDefinition.Name == "HtmlField"))
+                await _contentDefinitionManager.AlterPartDefinitionAsync(partDefinition.Name, partBuilder =>
                 {
-                    await _contentDefinitionManager.AlterPartDefinitionAsync(partDefinition.Name, partBuilder =>
+                    foreach (var fieldDefinition in partDefinition.Fields.Where(x => x.FieldDefinition.Name == "HtmlField"))
                     {
-                        foreach (var fieldDefinition in partDefinition.Fields.Where(x => x.FieldDefinition.Name == "HtmlField"))
+                        partBuilder.WithField(fieldDefinition.Name, fieldBuilder =>
                         {
-                            partBuilder.WithField(fieldDefinition.Name, fieldBuilder =>
-                            {
-                                fieldBuilder.MergeSettings<HtmlFieldSettings>(x => x.SanitizeHtml = false);
-                            });
-                        }
-                    });
-                }
+                            fieldBuilder.MergeSettings<HtmlFieldSettings>(x => x.SanitizeHtml = false);
+                        });
+                    }
+                });
             }
-
-            return 2;
         }
+
+        return 2;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Services/DefaultContentPickerResultProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Services/DefaultContentPickerResultProvider.cs
index 177a5b2b5a2..c21d2104148 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Services/DefaultContentPickerResultProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Services/DefaultContentPickerResultProvider.cs
@@ -14,65 +14,64 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.ContentFields.Services
+namespace OrchardCore.ContentFields.Services;
+
+public class DefaultContentPickerResultProvider : IContentPickerResultProvider
 {
-    public class DefaultContentPickerResultProvider : IContentPickerResultProvider
+    private readonly ILiquidTemplateManager _templateManager;
+    private readonly IContentManager _contentManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ISession _session;
+
+    public DefaultContentPickerResultProvider(IContentManager contentManager, IContentDefinitionManager contentDefinitionManager, ISession session, ILiquidTemplateManager templateManager)
     {
-        private readonly ILiquidTemplateManager _templateManager;
-        private readonly IContentManager _contentManager;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly ISession _session;
+        _templateManager = templateManager;
+        _contentManager = contentManager;
+        _contentDefinitionManager = contentDefinitionManager;
+        _session = session;
+    }
+
+    public string Name => "Default";
 
-        public DefaultContentPickerResultProvider(IContentManager contentManager, IContentDefinitionManager contentDefinitionManager, ISession session, ILiquidTemplateManager templateManager)
+    public async Task<IEnumerable<ContentPickerResult>> Search(ContentPickerSearchContext searchContext)
+    {
+        var contentTypes = searchContext.ContentTypes;
+        if (searchContext.DisplayAllContentTypes)
         {
-            _templateManager = templateManager;
-            _contentManager = contentManager;
-            _contentDefinitionManager = contentDefinitionManager;
-            _session = session;
+            contentTypes = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
+                .Where(x => !x.HasStereotype())
+                .Select(x => x.Name)
+                .AsEnumerable();
         }
 
-        public string Name => "Default";
+        var query = _session.Query<ContentItem, ContentItemIndex>()
+            .With<ContentItemIndex>(x => x.ContentType.IsIn(contentTypes) && x.Latest);
 
-        public async Task<IEnumerable<ContentPickerResult>> Search(ContentPickerSearchContext searchContext)
+        if (!string.IsNullOrEmpty(searchContext.Query))
         {
-            var contentTypes = searchContext.ContentTypes;
-            if (searchContext.DisplayAllContentTypes)
-            {
-                contentTypes = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
-                    .Where(x => !x.HasStereotype())
-                    .Select(x => x.Name)
-                    .AsEnumerable();
-            }
-
-            var query = _session.Query<ContentItem, ContentItemIndex>()
-                .With<ContentItemIndex>(x => x.ContentType.IsIn(contentTypes) && x.Latest);
-
-            if (!string.IsNullOrEmpty(searchContext.Query))
-            {
-                query.With<ContentItemIndex>(x => x.DisplayText.Contains(searchContext.Query) || x.ContentType.Contains(searchContext.Query));
-            }
+            query.With<ContentItemIndex>(x => x.DisplayText.Contains(searchContext.Query) || x.ContentType.Contains(searchContext.Query));
+        }
 
-            var contentItems = await query.Take(50).ListAsync();
+        var contentItems = await query.Take(50).ListAsync();
 
-            var results = new List<ContentPickerResult>();
-            var settings = searchContext.PartFieldDefinition.GetSettings<ContentPickerFieldSettings>();
+        var results = new List<ContentPickerResult>();
+        var settings = searchContext.PartFieldDefinition.GetSettings<ContentPickerFieldSettings>();
 
-            foreach (var contentItem in contentItems)
+        foreach (var contentItem in contentItems)
+        {
+            var cultureAspect = await _contentManager.PopulateAspectAsync(contentItem, new CultureAspect());
+            using (CultureScope.Create(cultureAspect.Culture))
             {
-                var cultureAspect = await _contentManager.PopulateAspectAsync(contentItem, new CultureAspect());
-                using (CultureScope.Create(cultureAspect.Culture))
+                results.Add(new ContentPickerResult
                 {
-                    results.Add(new ContentPickerResult
-                    {
-                        ContentItemId = contentItem.ContentItemId,
-                        DisplayText = await _templateManager.RenderStringAsync(settings.TitlePattern, NullEncoder.Default, contentItem,
-                            new Dictionary<string, FluidValue>() { [nameof(ContentItem)] = new ObjectValue(contentItem) }),
-                        HasPublished = await _contentManager.HasPublishedVersionAsync(contentItem)
-                    });
-                }
+                    ContentItemId = contentItem.ContentItemId,
+                    DisplayText = await _templateManager.RenderStringAsync(settings.TitlePattern, NullEncoder.Default, contentItem,
+                        new Dictionary<string, FluidValue>() { [nameof(ContentItem)] = new ObjectValue(contentItem) }),
+                    HasPublished = await _contentManager.HasPublishedVersionAsync(contentItem)
+                });
             }
-
-            return results.OrderBy(x => x.DisplayText);
         }
+
+        return results.OrderBy(x => x.DisplayText);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Services/DefaultUserPickerResultProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Services/DefaultUserPickerResultProvider.cs
index 52b8ec10b11..d087dff0b30 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Services/DefaultUserPickerResultProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Services/DefaultUserPickerResultProvider.cs
@@ -10,56 +10,55 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.ContentFields.Services
+namespace OrchardCore.ContentFields.Services;
+
+public class DefaultUserPickerResultProvider : IUserPickerResultProvider
 {
-    public class DefaultUserPickerResultProvider : IUserPickerResultProvider
+    private readonly RoleManager<IRole> _roleManager;
+    private readonly UserManager<IUser> _userManager;
+    private readonly ISession _session;
+
+    public DefaultUserPickerResultProvider(
+        RoleManager<IRole> roleManager,
+        UserManager<IUser> userManager,
+        ISession session)
     {
-        private readonly RoleManager<IRole> _roleManager;
-        private readonly UserManager<IUser> _userManager;
-        private readonly ISession _session;
+        _roleManager = roleManager;
+        _userManager = userManager;
+        _session = session;
+    }
 
-        public DefaultUserPickerResultProvider(
-            RoleManager<IRole> roleManager,
-            UserManager<IUser> userManager,
-            ISession session)
-        {
-            _roleManager = roleManager;
-            _userManager = userManager;
-            _session = session;
-        }
+    public string Name => "Default";
 
-        public string Name => "Default";
+    public async Task<IEnumerable<UserPickerResult>> Search(UserPickerSearchContext searchContext)
+    {
+        var query = _session.Query<User>();
 
-        public async Task<IEnumerable<UserPickerResult>> Search(UserPickerSearchContext searchContext)
+        if (!searchContext.DisplayAllUsers)
         {
-            var query = _session.Query<User>();
-
-            if (!searchContext.DisplayAllUsers)
-            {
-                var roles = searchContext.Roles.Select(x => _roleManager.NormalizeKey(x));
-                query.With<UserByRoleNameIndex>(x => x.RoleName.IsIn(roles));
-            }
+            var roles = searchContext.Roles.Select(x => _roleManager.NormalizeKey(x));
+            query.With<UserByRoleNameIndex>(x => x.RoleName.IsIn(roles));
+        }
 
-            if (!string.IsNullOrEmpty(searchContext.Query))
-            {
-                query.With<UserIndex>(x => x.NormalizedUserName.Contains(_userManager.NormalizeName(searchContext.Query)));
-            }
+        if (!string.IsNullOrEmpty(searchContext.Query))
+        {
+            query.With<UserIndex>(x => x.NormalizedUserName.Contains(_userManager.NormalizeName(searchContext.Query)));
+        }
 
-            var users = await query.Take(50).ListAsync();
+        var users = await query.Take(50).ListAsync();
 
-            var results = new List<UserPickerResult>();
+        var results = new List<UserPickerResult>();
 
-            foreach (var user in users)
+        foreach (var user in users)
+        {
+            results.Add(new UserPickerResult
             {
-                results.Add(new UserPickerResult
-                {
-                    UserId = user.UserId,
-                    DisplayText = user.UserName,
-                    IsEnabled = user.IsEnabled
-                });
-            }
-
-            return results.OrderBy(x => x.DisplayText);
+                UserId = user.UserId,
+                DisplayText = user.UserName,
+                IsEnabled = user.IsEnabled
+            });
         }
+
+        return results.OrderBy(x => x.DisplayText);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/BooleanFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/BooleanFieldSettings.cs
index e04b8af8041..b3c50bf4045 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/BooleanFieldSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/BooleanFieldSettings.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public class BooleanFieldSettings
 {
-    public class BooleanFieldSettings
-    {
-        public string Hint { get; set; }
-        public string Label { get; set; }
-        public bool DefaultValue { get; set; }
-    }
+    public string Hint { get; set; }
+    public string Label { get; set; }
+    public bool DefaultValue { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/BooleanFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/BooleanFieldSettingsDriver.cs
index 31e50dbf579..f2f60a91bf5 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/BooleanFieldSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/BooleanFieldSettingsDriver.cs
@@ -6,31 +6,30 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public sealed class BooleanFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<BooleanField>
 {
-    public sealed class BooleanFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<BooleanField>
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+        return Initialize<BooleanFieldSettings>("BooleanFieldSettings_Edit", model =>
         {
-            return Initialize<BooleanFieldSettings>("BooleanFieldSettings_Edit", model =>
-            {
-                var settings = partFieldDefinition.Settings.ToObject<BooleanFieldSettings>();
+            var settings = partFieldDefinition.Settings.ToObject<BooleanFieldSettings>();
 
-                model.Hint = settings.Hint;
-                model.Label = settings.Label;
-                model.DefaultValue = settings.DefaultValue;
-            }).Location("Content");
-        }
+            model.Hint = settings.Hint;
+            model.Label = settings.Label;
+            model.DefaultValue = settings.DefaultValue;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
-        {
-            var model = new BooleanFieldSettings();
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        var model = new BooleanFieldSettings();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            context.Builder.WithSettings(model);
+        context.Builder.WithSettings(model);
 
-            return Edit(partFieldDefinition, context);
-        }
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/ContentPickerFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/ContentPickerFieldSettings.cs
index f691b32863e..cce66912fac 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/ContentPickerFieldSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/ContentPickerFieldSettings.cs
@@ -1,25 +1,24 @@
 using System.ComponentModel;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public class ContentPickerFieldSettings
 {
-    public class ContentPickerFieldSettings
-    {
-        public string Hint { get; set; }
+    public string Hint { get; set; }
 
-        public bool Required { get; set; }
+    public bool Required { get; set; }
 
-        public bool Multiple { get; set; }
+    public bool Multiple { get; set; }
 
-        public bool DisplayAllContentTypes { get; set; }
+    public bool DisplayAllContentTypes { get; set; }
 
-        public string[] DisplayedContentTypes { get; set; } = [];
+    public string[] DisplayedContentTypes { get; set; } = [];
 
-        public string[] DisplayedStereotypes { get; set; } = [];
+    public string[] DisplayedStereotypes { get; set; } = [];
 
-        /// <summary>
-        /// The Liquid pattern used to build the title.
-        /// </summary>
-        [DefaultValue("{{ Model.ContentItem | display_text }}")]
-        public string TitlePattern { get; set; } = "{{ Model.ContentItem | display_text }}";
-    }
+    /// <summary>
+    /// The Liquid pattern used to build the title.
+    /// </summary>
+    [DefaultValue("{{ Model.ContentItem | display_text }}")]
+    public string TitlePattern { get; set; } = "{{ Model.ContentItem | display_text }}";
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/ContentPickerFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/ContentPickerFieldSettingsDriver.cs
index f498e6f94f5..509ba84a224 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/ContentPickerFieldSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/ContentPickerFieldSettingsDriver.cs
@@ -10,118 +10,117 @@
 using OrchardCore.Liquid;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public sealed class ContentPickerFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<ContentPickerField>
 {
-    public sealed class ContentPickerFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<ContentPickerField>
+    private readonly ILiquidTemplateManager _templateManager;
+
+    internal readonly IStringLocalizer S;
+
+    public ContentPickerFieldSettingsDriver(
+        ILiquidTemplateManager templateManager,
+        IStringLocalizer<ContentPickerFieldSettingsDriver> localizer)
+    {
+        _templateManager = templateManager;
+        S = localizer;
+    }
+
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+    {
+        return Initialize<ContentPickerFieldSettingsViewModel>("ContentPickerFieldSettings_Edit", model =>
+        {
+            var settings = partFieldDefinition.GetSettings<ContentPickerFieldSettings>();
+            model.Hint = settings.Hint;
+            model.Required = settings.Required;
+            model.Multiple = settings.Multiple;
+            model.Source = GetSource(settings);
+            model.DisplayedContentTypes = settings.DisplayedContentTypes;
+            model.TitlePattern = settings.TitlePattern;
+            model.Stereotypes = string.Join(',', settings.DisplayedStereotypes ?? []);
+        }).Location("Content");
+    }
+
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
     {
-        private readonly ILiquidTemplateManager _templateManager;
+        var model = new ContentPickerFieldSettingsViewModel();
 
-        internal readonly IStringLocalizer S;
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-        public ContentPickerFieldSettingsDriver(
-            ILiquidTemplateManager templateManager,
-            IStringLocalizer<ContentPickerFieldSettingsDriver> localizer)
+        var settings = new ContentPickerFieldSettings
         {
-            _templateManager = templateManager;
-            S = localizer;
-        }
+            Hint = model.Hint,
+            Required = model.Required,
+            Multiple = model.Multiple,
+            TitlePattern = model.TitlePattern,
+        };
 
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+        switch (model.Source)
         {
-            return Initialize<ContentPickerFieldSettingsViewModel>("ContentPickerFieldSettings_Edit", model =>
-            {
-                var settings = partFieldDefinition.GetSettings<ContentPickerFieldSettings>();
-                model.Hint = settings.Hint;
-                model.Required = settings.Required;
-                model.Multiple = settings.Multiple;
-                model.Source = GetSource(settings);
-                model.DisplayedContentTypes = settings.DisplayedContentTypes;
-                model.TitlePattern = settings.TitlePattern;
-                model.Stereotypes = string.Join(',', settings.DisplayedStereotypes ?? []);
-            }).Location("Content");
+            case ContentPickerSettingType.ContentTypes:
+                SetContentTypes(context.Updater, model.DisplayedContentTypes, settings);
+                break;
+            case ContentPickerSettingType.Stereotypes:
+                SetStereoTypes(context.Updater, model.Stereotypes, settings);
+                break;
+            default:
+                settings.DisplayAllContentTypes = true;
+                break;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+        if (IsValidTitlePattern(context, model))
         {
-            var model = new ContentPickerFieldSettingsViewModel();
-
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
-
-            var settings = new ContentPickerFieldSettings
-            {
-                Hint = model.Hint,
-                Required = model.Required,
-                Multiple = model.Multiple,
-                TitlePattern = model.TitlePattern,
-            };
-
-            switch (model.Source)
-            {
-                case ContentPickerSettingType.ContentTypes:
-                    SetContentTypes(context.Updater, model.DisplayedContentTypes, settings);
-                    break;
-                case ContentPickerSettingType.Stereotypes:
-                    SetStereoTypes(context.Updater, model.Stereotypes, settings);
-                    break;
-                default:
-                    settings.DisplayAllContentTypes = true;
-                    break;
-            }
-
-            if (IsValidTitlePattern(context, model))
-            {
-                context.Builder.WithSettings(settings);
-            }
-
-            return Edit(partFieldDefinition, context);
+            context.Builder.WithSettings(settings);
         }
 
-        private bool IsValidTitlePattern(UpdatePartFieldEditorContext context, ContentPickerFieldSettingsViewModel model)
-        {
-            if (!string.IsNullOrEmpty(model.TitlePattern) && !_templateManager.Validate(model.TitlePattern, out var titleErrors))
-            {
-                context.Updater.ModelState.AddModelError(nameof(model.TitlePattern), S["Title Pattern does not contain a valid Liquid expression. Details: {0}", string.Join(" ", titleErrors)]);
+        return Edit(partFieldDefinition, context);
+    }
 
-                return false;
-            }
+    private bool IsValidTitlePattern(UpdatePartFieldEditorContext context, ContentPickerFieldSettingsViewModel model)
+    {
+        if (!string.IsNullOrEmpty(model.TitlePattern) && !_templateManager.Validate(model.TitlePattern, out var titleErrors))
+        {
+            context.Updater.ModelState.AddModelError(nameof(model.TitlePattern), S["Title Pattern does not contain a valid Liquid expression. Details: {0}", string.Join(" ", titleErrors)]);
 
-            return true;
+            return false;
         }
 
-        private void SetStereoTypes(IUpdateModel updater, string stereotypes, ContentPickerFieldSettings settings)
-        {
-            if (string.IsNullOrEmpty(stereotypes))
-            {
-                updater.ModelState.AddModelError(Prefix, nameof(ContentPickerFieldSettingsViewModel.Stereotypes), S["Please provide a Stereotype."]);
+        return true;
+    }
 
-                return;
-            }
+    private void SetStereoTypes(IUpdateModel updater, string stereotypes, ContentPickerFieldSettings settings)
+    {
+        if (string.IsNullOrEmpty(stereotypes))
+        {
+            updater.ModelState.AddModelError(Prefix, nameof(ContentPickerFieldSettingsViewModel.Stereotypes), S["Please provide a Stereotype."]);
 
-            settings.DisplayedStereotypes = stereotypes.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
+            return;
         }
 
-        private void SetContentTypes(IUpdateModel updater, string[] displayedContentTypes, ContentPickerFieldSettings settings)
-        {
-            if (displayedContentTypes == null || displayedContentTypes.Length == 0)
-            {
-                updater.ModelState.AddModelError(Prefix, nameof(ContentPickerFieldSettingsViewModel.DisplayedContentTypes), S["At least one content type must be selected."]);
+        settings.DisplayedStereotypes = stereotypes.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
+    }
 
-                return;
-            }
+    private void SetContentTypes(IUpdateModel updater, string[] displayedContentTypes, ContentPickerFieldSettings settings)
+    {
+        if (displayedContentTypes == null || displayedContentTypes.Length == 0)
+        {
+            updater.ModelState.AddModelError(Prefix, nameof(ContentPickerFieldSettingsViewModel.DisplayedContentTypes), S["At least one content type must be selected."]);
 
-            settings.DisplayedContentTypes = displayedContentTypes;
+            return;
         }
 
-        private static ContentPickerSettingType GetSource(ContentPickerFieldSettings settings)
+        settings.DisplayedContentTypes = displayedContentTypes;
+    }
+
+    private static ContentPickerSettingType GetSource(ContentPickerFieldSettings settings)
+    {
+        if (settings.DisplayAllContentTypes)
         {
-            if (settings.DisplayAllContentTypes)
-            {
-                return ContentPickerSettingType.AllTypes;
-            }
-
-            return settings.DisplayedStereotypes != null && settings.DisplayedStereotypes.Length > 0
-                ? ContentPickerSettingType.Stereotypes
-                : ContentPickerSettingType.ContentTypes;
+            return ContentPickerSettingType.AllTypes;
         }
+
+        return settings.DisplayedStereotypes != null && settings.DisplayedStereotypes.Length > 0
+            ? ContentPickerSettingType.Stereotypes
+            : ContentPickerSettingType.ContentTypes;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateFieldSettings.cs
index e80656fa838..ed0697fab37 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateFieldSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateFieldSettings.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public class DateFieldSettings
 {
-    public class DateFieldSettings
-    {
-        public string Hint { get; set; }
-        public bool Required { get; set; }
-    }
+    public string Hint { get; set; }
+    public bool Required { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateFieldSettingsDriver.cs
index e84d2d11723..3032a54a3c1 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateFieldSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateFieldSettingsDriver.cs
@@ -6,30 +6,29 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public sealed class DateFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<DateField>
 {
-    public sealed class DateFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<DateField>
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+        return Initialize<DateFieldSettings>("DateFieldSettings_Edit", model =>
         {
-            return Initialize<DateFieldSettings>("DateFieldSettings_Edit", model =>
-            {
-                var settings = partFieldDefinition.Settings.ToObject<DateFieldSettings>();
+            var settings = partFieldDefinition.Settings.ToObject<DateFieldSettings>();
 
-                model.Hint = settings.Hint;
-                model.Required = settings.Required;
-            }).Location("Content");
-        }
+            model.Hint = settings.Hint;
+            model.Required = settings.Required;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
-        {
-            var model = new DateFieldSettings();
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        var model = new DateFieldSettings();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            context.Builder.WithSettings(model);
+        context.Builder.WithSettings(model);
 
-            return Edit(partFieldDefinition, context);
-        }
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateTimeFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateTimeFieldSettings.cs
index 9d55cf53645..f41a39a8c03 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateTimeFieldSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateTimeFieldSettings.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public class DateTimeFieldSettings
 {
-    public class DateTimeFieldSettings
-    {
-        public string Hint { get; set; }
-        public bool Required { get; set; }
-    }
+    public string Hint { get; set; }
+    public bool Required { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateTimeFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateTimeFieldSettingsDriver.cs
index 4870baef12f..aafc3d0e665 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateTimeFieldSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateTimeFieldSettingsDriver.cs
@@ -6,30 +6,29 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public sealed class DateTimeFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<DateTimeField>
 {
-    public sealed class DateTimeFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<DateTimeField>
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+        return Initialize<DateTimeFieldSettings>("DateTimeFieldSettings_Edit", model =>
         {
-            return Initialize<DateTimeFieldSettings>("DateTimeFieldSettings_Edit", model =>
-            {
-                var settings = partFieldDefinition.Settings.ToObject<DateTimeFieldSettings>();
+            var settings = partFieldDefinition.Settings.ToObject<DateTimeFieldSettings>();
 
-                model.Hint = settings.Hint;
-                model.Required = settings.Required;
-            }).Location("Content");
-        }
+            model.Hint = settings.Hint;
+            model.Required = settings.Required;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
-        {
-            var model = new DateTimeFieldSettings();
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        var model = new DateTimeFieldSettings();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            context.Builder.WithSettings(model);
+        context.Builder.WithSettings(model);
 
-            return Edit(partFieldDefinition, context);
-        }
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldMonacoEditorSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldMonacoEditorSettings.cs
index 1ad252aab0b..c6e753d8a9a 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldMonacoEditorSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldMonacoEditorSettings.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public class HtmlFieldMonacoEditorSettings
 {
-    public class HtmlFieldMonacoEditorSettings
-    {
-        public string Options { get; set; }
-    }
+    public string Options { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldMonacoEditorSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldMonacoEditorSettingsDriver.cs
index 576e5c602d3..177ca835061 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldMonacoEditorSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldMonacoEditorSettingsDriver.cs
@@ -11,60 +11,59 @@
 using OrchardCore.Mvc.ModelBinding;
 using OrchardCore.Mvc.Utilities;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public sealed class HtmlFieldMonacoEditorSettingsDriver : ContentPartFieldDefinitionDisplayDriver<HtmlField>
 {
-    public sealed class HtmlFieldMonacoEditorSettingsDriver : ContentPartFieldDefinitionDisplayDriver<HtmlField>
-    {
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public HtmlFieldMonacoEditorSettingsDriver(IStringLocalizer<HtmlFieldMonacoEditorSettingsDriver> stringLocalizer)
-        {
-            S = stringLocalizer;
-        }
+    public HtmlFieldMonacoEditorSettingsDriver(IStringLocalizer<HtmlFieldMonacoEditorSettingsDriver> stringLocalizer)
+    {
+        S = stringLocalizer;
+    }
 
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+    {
+        return Initialize<MonacoSettingsViewModel>("HtmlFieldMonacoEditorSettings_Edit", model =>
         {
-            return Initialize<MonacoSettingsViewModel>("HtmlFieldMonacoEditorSettings_Edit", model =>
+            var settings = partFieldDefinition.GetSettings<HtmlFieldMonacoEditorSettings>();
+            if (string.IsNullOrWhiteSpace(settings.Options))
             {
-                var settings = partFieldDefinition.GetSettings<HtmlFieldMonacoEditorSettings>();
-                if (string.IsNullOrWhiteSpace(settings.Options))
+                settings.Options = JConvert.SerializeObject(new
                 {
-                    settings.Options = JConvert.SerializeObject(new
-                    {
-                        automaticLayout = true,
-                        language = "html"
-                    }, JOptions.Indented);
-                }
+                    automaticLayout = true,
+                    language = "html"
+                }, JOptions.Indented);
+            }
 
-                model.Options = settings.Options;
-            }).Location("Editor");
-        }
+            model.Options = settings.Options;
+        }).Location("Editor");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        if (partFieldDefinition.Editor() == "Monaco")
         {
-            if (partFieldDefinition.Editor() == "Monaco")
-            {
-                var model = new MonacoSettingsViewModel();
+            var model = new MonacoSettingsViewModel();
 
-                await context.Updater.TryUpdateModelAsync(model, Prefix);
+            await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-                if (!model.Options.IsJson())
-                {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(model.Options), S["The options are written in an incorrect format."]);
-                }
-                else
+            if (!model.Options.IsJson())
+            {
+                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Options), S["The options are written in an incorrect format."]);
+            }
+            else
+            {
+                var jsonSettings = JObject.Parse(model.Options);
+                jsonSettings["language"] = "html";
+                var settings = new HtmlFieldMonacoEditorSettings
                 {
-                    var jsonSettings = JObject.Parse(model.Options);
-                    jsonSettings["language"] = "html";
-                    var settings = new HtmlFieldMonacoEditorSettings
-                    {
-                        Options = jsonSettings.ToString()
-                    };
-                    context.Builder.WithSettings(settings);
-                }
+                    Options = jsonSettings.ToString()
+                };
+                context.Builder.WithSettings(settings);
             }
-
-            return Edit(partFieldDefinition, context);
         }
+
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldSettings.cs
index 745d8f661ef..275a35a6e39 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldSettings.cs
@@ -1,12 +1,11 @@
 using System.ComponentModel;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public class HtmlFieldSettings
 {
-    public class HtmlFieldSettings
-    {
-        public string Hint { get; set; }
+    public string Hint { get; set; }
 
-        [DefaultValue(true)]
-        public bool SanitizeHtml { get; set; } = true;
-    }
+    [DefaultValue(true)]
+    public bool SanitizeHtml { get; set; } = true;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldSettingsDriver.cs
index 79f14be5b37..be249e8df2a 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldSettingsDriver.cs
@@ -6,34 +6,33 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public sealed class HtmlFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<HtmlField>
 {
-    public sealed class HtmlFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<HtmlField>
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+        return Initialize<HtmlSettingsViewModel>("HtmlFieldSettings_Edit", model =>
         {
-            return Initialize<HtmlSettingsViewModel>("HtmlFieldSettings_Edit", model =>
-            {
-                var settings = partFieldDefinition.GetSettings<HtmlFieldSettings>();
+            var settings = partFieldDefinition.GetSettings<HtmlFieldSettings>();
 
-                model.SanitizeHtml = settings.SanitizeHtml;
-                model.Hint = settings.Hint;
-            }).Location("Content:20");
-        }
+            model.SanitizeHtml = settings.SanitizeHtml;
+            model.Hint = settings.Hint;
+        }).Location("Content:20");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
-        {
-            var model = new HtmlSettingsViewModel();
-            var settings = new HtmlFieldSettings();
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        var model = new HtmlSettingsViewModel();
+        var settings = new HtmlFieldSettings();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            settings.SanitizeHtml = model.SanitizeHtml;
-            settings.Hint = model.Hint;
+        settings.SanitizeHtml = model.SanitizeHtml;
+        settings.Hint = model.Hint;
 
-            context.Builder.WithSettings(settings);
+        context.Builder.WithSettings(settings);
 
-            return Edit(partFieldDefinition, context);
-        }
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldTrumbowygEditorSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldTrumbowygEditorSettings.cs
index 7ab2def05eb..1de660c4fcf 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldTrumbowygEditorSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldTrumbowygEditorSettings.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public class HtmlFieldTrumbowygEditorSettings
 {
-    public class HtmlFieldTrumbowygEditorSettings
-    {
-        public string Options { get; set; }
-        public bool InsertMediaWithUrl { get; set; }
-    }
+    public string Options { get; set; }
+    public bool InsertMediaWithUrl { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldTrumbowygEditorSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldTrumbowygEditorSettingsDriver.cs
index 4386632cd62..f6f1076537f 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldTrumbowygEditorSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldTrumbowygEditorSettingsDriver.cs
@@ -10,64 +10,63 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public sealed class HtmlFieldTrumbowygEditorSettingsDriver : ContentPartFieldDefinitionDisplayDriver<HtmlField>
 {
-    public sealed class HtmlFieldTrumbowygEditorSettingsDriver : ContentPartFieldDefinitionDisplayDriver<HtmlField>
+    internal readonly IStringLocalizer S;
+
+    public HtmlFieldTrumbowygEditorSettingsDriver(IStringLocalizer<HtmlFieldTrumbowygEditorSettingsDriver> stringLocalizer)
     {
-        internal readonly IStringLocalizer S;
+        S = stringLocalizer;
+    }
 
-        public HtmlFieldTrumbowygEditorSettingsDriver(IStringLocalizer<HtmlFieldTrumbowygEditorSettingsDriver> stringLocalizer)
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+    {
+        return Initialize<TrumbowygSettingsViewModel>("HtmlFieldTrumbowygEditorSettings_Edit", model =>
         {
-            S = stringLocalizer;
-        }
+            var settings = partFieldDefinition.GetSettings<HtmlFieldTrumbowygEditorSettings>();
 
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+            model.Options = settings.Options;
+            model.InsertMediaWithUrl = settings.InsertMediaWithUrl;
+        }).Location("Editor");
+    }
+
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        if (partFieldDefinition.Editor() == "Trumbowyg")
         {
-            return Initialize<TrumbowygSettingsViewModel>("HtmlFieldTrumbowygEditorSettings_Edit", model =>
-            {
-                var settings = partFieldDefinition.GetSettings<HtmlFieldTrumbowygEditorSettings>();
+            var model = new TrumbowygSettingsViewModel();
 
-                model.Options = settings.Options;
-                model.InsertMediaWithUrl = settings.InsertMediaWithUrl;
-            }).Location("Editor");
-        }
+            await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
-        {
-            if (partFieldDefinition.Editor() == "Trumbowyg")
+            try
             {
-                var model = new TrumbowygSettingsViewModel();
+                var options = model.Options.Trim();
 
-                await context.Updater.TryUpdateModelAsync(model, Prefix);
-
-                try
+                if (!options.StartsWith('{') || !options.EndsWith('}'))
                 {
-                    var options = model.Options.Trim();
-
-                    if (!options.StartsWith('{') || !options.EndsWith('}'))
-                    {
-                        throw new Exception();
-                    }
-
-                    var parser = new Parser();
+                    throw new Exception();
+                }
 
-                    var optionsScript = parser.ParseScript("var config = " + options);
+                var parser = new Parser();
 
-                    var settings = new HtmlFieldTrumbowygEditorSettings
-                    {
-                        InsertMediaWithUrl = model.InsertMediaWithUrl,
-                        Options = options
-                    };
+                var optionsScript = parser.ParseScript("var config = " + options);
 
-                    context.Builder.WithSettings(settings);
-                }
-                catch
+                var settings = new HtmlFieldTrumbowygEditorSettings
                 {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(model.Options), S["The options are written in an incorrect format."]);
-                }
-            }
+                    InsertMediaWithUrl = model.InsertMediaWithUrl,
+                    Options = options
+                };
 
-            return Edit(partFieldDefinition, context);
+                context.Builder.WithSettings(settings);
+            }
+            catch
+            {
+                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Options), S["The options are written in an incorrect format."]);
+            }
         }
+
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LinkFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LinkFieldSettings.cs
index 4b0ad29b19a..6aa42fe93b6 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LinkFieldSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LinkFieldSettings.cs
@@ -1,35 +1,34 @@
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public class LinkFieldSettings
 {
-    public class LinkFieldSettings
-    {
-        public string Hint { get; set; }
-        public string HintLinkText { get; set; }
-        public bool Required { get; set; }
-        public LinkTextMode LinkTextMode { get; set; }
-        public string UrlPlaceholder { get; set; }
-        public string TextPlaceholder { get; set; }
-        public string DefaultUrl { get; set; }
-        public string DefaultText { get; set; }
-        public string DefaultTarget { get; set; }
+    public string Hint { get; set; }
+    public string HintLinkText { get; set; }
+    public bool Required { get; set; }
+    public LinkTextMode LinkTextMode { get; set; }
+    public string UrlPlaceholder { get; set; }
+    public string TextPlaceholder { get; set; }
+    public string DefaultUrl { get; set; }
+    public string DefaultText { get; set; }
+    public string DefaultTarget { get; set; }
 
-        public LinkFieldSettings()
-        {
-            LinkTextMode = LinkTextMode.Optional;
-        }
+    public LinkFieldSettings()
+    {
+        LinkTextMode = LinkTextMode.Optional;
     }
+}
 
-    public enum LinkTextMode
-    {
-        // Some text can be entered or not, if not the url is used
-        Optional,
+public enum LinkTextMode
+{
+    // Some text can be entered or not, if not the url is used
+    Optional,
 
-        // Some text must be entered
-        Required,
+    // Some text must be entered
+    Required,
 
-        // Use the default text value defined in the settings
-        Static,
+    // Use the default text value defined in the settings
+    Static,
 
-        // Use the url
-        Url
-    }
+    // Use the url
+    Url
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LinkFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LinkFieldSettingsDriver.cs
index 3c00c56d54e..e7ab6b8c18a 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LinkFieldSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LinkFieldSettingsDriver.cs
@@ -6,37 +6,36 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public sealed class LinkFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<LinkField>
 {
-    public sealed class LinkFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<LinkField>
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+        return Initialize<LinkFieldSettings>("LinkFieldSettings_Edit", model =>
         {
-            return Initialize<LinkFieldSettings>("LinkFieldSettings_Edit", model =>
-            {
-                var settings = partFieldDefinition.Settings.ToObject<LinkFieldSettings>();
+            var settings = partFieldDefinition.Settings.ToObject<LinkFieldSettings>();
 
-                model.Hint = settings.Hint;
-                model.HintLinkText = settings.HintLinkText;
-                model.Required = settings.Required;
-                model.LinkTextMode = settings.LinkTextMode;
-                model.UrlPlaceholder = settings.UrlPlaceholder;
-                model.TextPlaceholder = settings.TextPlaceholder;
-                model.DefaultUrl = settings.DefaultUrl;
-                model.DefaultText = settings.DefaultText;
-                model.DefaultTarget = settings.DefaultTarget;
-            }).Location("Content");
-        }
+            model.Hint = settings.Hint;
+            model.HintLinkText = settings.HintLinkText;
+            model.Required = settings.Required;
+            model.LinkTextMode = settings.LinkTextMode;
+            model.UrlPlaceholder = settings.UrlPlaceholder;
+            model.TextPlaceholder = settings.TextPlaceholder;
+            model.DefaultUrl = settings.DefaultUrl;
+            model.DefaultText = settings.DefaultText;
+            model.DefaultTarget = settings.DefaultTarget;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
-        {
-            var model = new LinkFieldSettings();
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        var model = new LinkFieldSettings();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            context.Builder.WithSettings(model);
+        context.Builder.WithSettings(model);
 
-            return Edit(partFieldDefinition, context);
-        }
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LocalizationSetContentPickerFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LocalizationSetContentPickerFieldSettings.cs
index 8d324ca82a4..c9b37f2dfaf 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LocalizationSetContentPickerFieldSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LocalizationSetContentPickerFieldSettings.cs
@@ -1,13 +1,12 @@
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+[RequireFeatures("OrchardCore.ContentLocalization")]
+public class LocalizationSetContentPickerFieldSettings
 {
-    [RequireFeatures("OrchardCore.ContentLocalization")]
-    public class LocalizationSetContentPickerFieldSettings
-    {
-        public string Hint { get; set; }
-        public bool Required { get; set; }
-        public bool Multiple { get; set; }
-        public string[] DisplayedContentTypes { get; set; } = [];
-    }
+    public string Hint { get; set; }
+    public bool Required { get; set; }
+    public bool Multiple { get; set; }
+    public string[] DisplayedContentTypes { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LocalizationSetContentPickerFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LocalizationSetContentPickerFieldSettingsDriver.cs
index fa5e01882ca..b2c306bb712 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LocalizationSetContentPickerFieldSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LocalizationSetContentPickerFieldSettingsDriver.cs
@@ -7,33 +7,32 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+[RequireFeatures("OrchardCore.ContentLocalization")]
+public sealed class LocalizationSetContentPickerFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<LocalizationSetContentPickerField>
 {
-    [RequireFeatures("OrchardCore.ContentLocalization")]
-    public sealed class LocalizationSetContentPickerFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<LocalizationSetContentPickerField>
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+        return Initialize<LocalizationSetContentPickerFieldSettings>("LocalizationSetContentPickerFieldSettings_Edit", model =>
         {
-            return Initialize<LocalizationSetContentPickerFieldSettings>("LocalizationSetContentPickerFieldSettings_Edit", model =>
-            {
-                var settings = partFieldDefinition.Settings.ToObject<LocalizationSetContentPickerFieldSettings>();
+            var settings = partFieldDefinition.Settings.ToObject<LocalizationSetContentPickerFieldSettings>();
 
-                model.Hint = settings.Hint;
-                model.Required = settings.Required;
-                model.Multiple = settings.Multiple;
-                model.DisplayedContentTypes = settings.DisplayedContentTypes;
-            }).Location("Content");
-        }
+            model.Hint = settings.Hint;
+            model.Required = settings.Required;
+            model.Multiple = settings.Multiple;
+            model.DisplayedContentTypes = settings.DisplayedContentTypes;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
-        {
-            var model = new LocalizationSetContentPickerFieldSettings();
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        var model = new LocalizationSetContentPickerFieldSettings();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            context.Builder.WithSettings(model);
+        context.Builder.WithSettings(model);
 
-            return Edit(partFieldDefinition, context);
-        }
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/MultiTextFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/MultiTextFieldSettings.cs
index 99b5188dc96..24358b97f2a 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/MultiTextFieldSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/MultiTextFieldSettings.cs
@@ -1,23 +1,22 @@
 using System.Text.Json.Serialization;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public class MultiTextFieldSettings
 {
-    public class MultiTextFieldSettings
-    {
-        public string Hint { get; set; }
-        public bool Required { get; set; }
-        public MultiTextFieldValueOption[] Options { get; set; } = [];
-    }
+    public string Hint { get; set; }
+    public bool Required { get; set; }
+    public MultiTextFieldValueOption[] Options { get; set; } = [];
+}
 
-    public class MultiTextFieldValueOption
-    {
-        [JsonPropertyName("name")]
-        public string Name { get; set; }
+public class MultiTextFieldValueOption
+{
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
 
-        [JsonPropertyName("value")]
-        public string Value { get; set; }
+    [JsonPropertyName("value")]
+    public string Value { get; set; }
 
-        [JsonPropertyName("default")]
-        public bool Default { get; set; }
-    }
+    [JsonPropertyName("default")]
+    public bool Default { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/MultiTextFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/MultiTextFieldSettingsDriver.cs
index 27c022351ce..0e6d2cfa295 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/MultiTextFieldSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/MultiTextFieldSettingsDriver.cs
@@ -8,51 +8,50 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public sealed class MultiTextFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<MultiTextField>
 {
-    public sealed class MultiTextFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<MultiTextField>
-    {
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public MultiTextFieldSettingsDriver(IStringLocalizer<MultiTextFieldSettingsDriver> localizer)
-        {
-            S = localizer;
-        }
+    public MultiTextFieldSettingsDriver(IStringLocalizer<MultiTextFieldSettingsDriver> localizer)
+    {
+        S = localizer;
+    }
 
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+    {
+        return Initialize<MultiTextFieldSettingsViewModel>("MultiTextFieldSettings_Edit", model =>
         {
-            return Initialize<MultiTextFieldSettingsViewModel>("MultiTextFieldSettings_Edit", model =>
-            {
-                var settings = partFieldDefinition.GetSettings<MultiTextFieldSettings>();
-
-                model.Required = settings.Required;
-                model.Hint = settings.Hint;
-                model.Options = JConvert.SerializeObject(settings.Options, JOptions.Indented);
-            }).Location("Content");
-        }
+            var settings = partFieldDefinition.GetSettings<MultiTextFieldSettings>();
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
-        {
-            var model = new MultiTextFieldSettingsViewModel();
-            var settings = new MultiTextFieldSettings();
+            model.Required = settings.Required;
+            model.Hint = settings.Hint;
+            model.Options = JConvert.SerializeObject(settings.Options, JOptions.Indented);
+        }).Location("Content");
+    }
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        var model = new MultiTextFieldSettingsViewModel();
+        var settings = new MultiTextFieldSettings();
 
-            settings.Required = model.Required;
-            settings.Hint = model.Hint;
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            try
-            {
-                settings.Options = JConvert.DeserializeObject<MultiTextFieldValueOption[]>(model.Options);
+        settings.Required = model.Required;
+        settings.Hint = model.Hint;
 
-                context.Builder.WithSettings(settings);
-            }
-            catch
-            {
-                context.Updater.ModelState.AddModelError(Prefix, S["The options are written in an incorrect format."]);
-            }
+        try
+        {
+            settings.Options = JConvert.DeserializeObject<MultiTextFieldValueOption[]>(model.Options);
 
-            return Edit(partFieldDefinition, context);
+            context.Builder.WithSettings(settings);
         }
+        catch
+        {
+            context.Updater.ModelState.AddModelError(Prefix, S["The options are written in an incorrect format."]);
+        }
+
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/NumericFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/NumericFieldSettings.cs
index adcf7fd7da8..ce8426d06d2 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/NumericFieldSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/NumericFieldSettings.cs
@@ -1,13 +1,12 @@
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public class NumericFieldSettings
 {
-    public class NumericFieldSettings
-    {
-        public string Hint { get; set; }
-        public bool Required { get; set; }
-        public int Scale { get; set; }
-        public decimal? Minimum { get; set; }
-        public decimal? Maximum { get; set; }
-        public string Placeholder { get; set; }
-        public string DefaultValue { get; set; }
-    }
+    public string Hint { get; set; }
+    public bool Required { get; set; }
+    public int Scale { get; set; }
+    public decimal? Minimum { get; set; }
+    public decimal? Maximum { get; set; }
+    public string Placeholder { get; set; }
+    public string DefaultValue { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/NumericFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/NumericFieldSettingsDriver.cs
index bbdafea4558..428d865a4dd 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/NumericFieldSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/NumericFieldSettingsDriver.cs
@@ -6,35 +6,34 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public sealed class NumericFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<NumericField>
 {
-    public sealed class NumericFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<NumericField>
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+        return Initialize<NumericFieldSettings>("NumericFieldSettings_Edit", model =>
         {
-            return Initialize<NumericFieldSettings>("NumericFieldSettings_Edit", model =>
-            {
-                var settings = partFieldDefinition.Settings.ToObject<NumericFieldSettings>();
+            var settings = partFieldDefinition.Settings.ToObject<NumericFieldSettings>();
 
-                model.Hint = settings.Hint;
-                model.Required = settings.Required;
-                model.Scale = settings.Scale;
-                model.Minimum = settings.Minimum;
-                model.Maximum = settings.Maximum;
-                model.Placeholder = settings.Placeholder;
-                model.DefaultValue = settings.DefaultValue;
-            }).Location("Content");
-        }
+            model.Hint = settings.Hint;
+            model.Required = settings.Required;
+            model.Scale = settings.Scale;
+            model.Minimum = settings.Minimum;
+            model.Maximum = settings.Maximum;
+            model.Placeholder = settings.Placeholder;
+            model.DefaultValue = settings.DefaultValue;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
-        {
-            var model = new NumericFieldSettings();
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        var model = new NumericFieldSettings();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            context.Builder.WithSettings(model);
+        context.Builder.WithSettings(model);
 
-            return Edit(partFieldDefinition, context);
-        }
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldHeaderDisplaySettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldHeaderDisplaySettings.cs
index 8c66e528ffa..2f00870f8f5 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldHeaderDisplaySettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldHeaderDisplaySettings.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public class TextFieldHeaderDisplaySettings
 {
-    public class TextFieldHeaderDisplaySettings
-    {
-        public string Level { get; set; }
-    }
+    public string Level { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldHeaderDisplaySettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldHeaderDisplaySettingsDriver.cs
index 78189d743f5..d14413147be 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldHeaderDisplaySettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldHeaderDisplaySettingsDriver.cs
@@ -6,35 +6,34 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public sealed class TextFieldHeaderDisplaySettingsDriver : ContentPartFieldDefinitionDisplayDriver<TextField>
 {
-    public sealed class TextFieldHeaderDisplaySettingsDriver : ContentPartFieldDefinitionDisplayDriver<TextField>
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+        return Initialize<HeaderSettingsViewModel>("TextFieldHeaderDisplaySettings_Edit", model =>
         {
-            return Initialize<HeaderSettingsViewModel>("TextFieldHeaderDisplaySettings_Edit", model =>
-            {
-                var settings = partFieldDefinition.GetSettings<TextFieldHeaderDisplaySettings>();
+            var settings = partFieldDefinition.GetSettings<TextFieldHeaderDisplaySettings>();
 
-                model.Level = settings.Level;
-            }).Location("DisplayMode");
-        }
+            model.Level = settings.Level;
+        }).Location("DisplayMode");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        if (partFieldDefinition.DisplayMode() == "Header")
         {
-            if (partFieldDefinition.DisplayMode() == "Header")
-            {
-                var model = new HeaderSettingsViewModel();
-                var settings = new TextFieldHeaderDisplaySettings();
-
-                await context.Updater.TryUpdateModelAsync(model, Prefix);
+            var model = new HeaderSettingsViewModel();
+            var settings = new TextFieldHeaderDisplaySettings();
 
-                settings.Level = model.Level;
+            await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-                context.Builder.WithSettings(settings);
-            }
+            settings.Level = model.Level;
 
-            return Edit(partFieldDefinition, context);
+            context.Builder.WithSettings(settings);
         }
+
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldMonacoEditorSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldMonacoEditorSettings.cs
index a38f0f4de20..ae742453f86 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldMonacoEditorSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldMonacoEditorSettings.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public class TextFieldMonacoEditorSettings
 {
-    public class TextFieldMonacoEditorSettings
-    {
-        public string Options { get; set; }
-    }
+    public string Options { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldMonacoEditorSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldMonacoEditorSettingsDriver.cs
index fa1a7546eeb..ec6c0818a63 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldMonacoEditorSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldMonacoEditorSettingsDriver.cs
@@ -10,54 +10,53 @@
 using OrchardCore.Mvc.ModelBinding;
 using OrchardCore.Mvc.Utilities;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public sealed class TextFieldMonacoEditorSettingsDriver : ContentPartFieldDefinitionDisplayDriver<TextField>
 {
-    public sealed class TextFieldMonacoEditorSettingsDriver : ContentPartFieldDefinitionDisplayDriver<TextField>
-    {
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public TextFieldMonacoEditorSettingsDriver(IStringLocalizer<TextFieldMonacoEditorSettingsDriver> localizer)
-        {
-            S = localizer;
-        }
+    public TextFieldMonacoEditorSettingsDriver(IStringLocalizer<TextFieldMonacoEditorSettingsDriver> localizer)
+    {
+        S = localizer;
+    }
 
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+    {
+        return Initialize<MonacoSettingsViewModel>("TextFieldMonacoEditorSettings_Edit", model =>
         {
-            return Initialize<MonacoSettingsViewModel>("TextFieldMonacoEditorSettings_Edit", model =>
+            var settings = partFieldDefinition.GetSettings<TextFieldMonacoEditorSettings>();
+            if (string.IsNullOrWhiteSpace(settings.Options))
             {
-                var settings = partFieldDefinition.GetSettings<TextFieldMonacoEditorSettings>();
-                if (string.IsNullOrWhiteSpace(settings.Options))
-                {
-                    settings.Options = JConvert.SerializeObject(new { automaticLayout = true, language = "html" }, JOptions.Indented);
-                }
+                settings.Options = JConvert.SerializeObject(new { automaticLayout = true, language = "html" }, JOptions.Indented);
+            }
 
-                model.Options = settings.Options;
-            }).Location("Editor");
-        }
+            model.Options = settings.Options;
+        }).Location("Editor");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        if (partFieldDefinition.Editor() == "Monaco")
         {
-            if (partFieldDefinition.Editor() == "Monaco")
-            {
-                var model = new MonacoSettingsViewModel();
+            var model = new MonacoSettingsViewModel();
 
-                await context.Updater.TryUpdateModelAsync(model, Prefix);
+            await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-                if (!model.Options.IsJson())
-                {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(model.Options), S["The options are written in an incorrect format."]);
-                }
-                else
+            if (!model.Options.IsJson())
+            {
+                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Options), S["The options are written in an incorrect format."]);
+            }
+            else
+            {
+                var settings = new TextFieldMonacoEditorSettings
                 {
-                    var settings = new TextFieldMonacoEditorSettings
-                    {
-                        Options = model.Options
-                    };
-                    context.Builder.WithSettings(settings);
-                }
+                    Options = model.Options
+                };
+                context.Builder.WithSettings(settings);
             }
-
-            return Edit(partFieldDefinition, context);
         }
+
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldPredefinedListEditorSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldPredefinedListEditorSettings.cs
index e67d9b42496..6489323fa80 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldPredefinedListEditorSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldPredefinedListEditorSettings.cs
@@ -1,40 +1,39 @@
 using System.Text.Json.Serialization;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public class TextFieldPredefinedListEditorSettings
+{
+    public ListValueOption[] Options { get; set; }
+    public EditorOption Editor { get; set; }
+    public string DefaultValue { get; set; }
+}
+
+public enum EditorOption
+{
+    Radio,
+    Dropdown
+}
+
+public class ListValueOption
 {
-    public class TextFieldPredefinedListEditorSettings
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
+
+    [JsonPropertyName("value")]
+    public string Value { get; set; }
+
+    public ListValueOption()
     {
-        public ListValueOption[] Options { get; set; }
-        public EditorOption Editor { get; set; }
-        public string DefaultValue { get; set; }
     }
 
-    public enum EditorOption
+    public ListValueOption(string name) : this(name, name)
     {
-        Radio,
-        Dropdown
     }
 
-    public class ListValueOption
+    public ListValueOption(string name, string value)
     {
-        [JsonPropertyName("name")]
-        public string Name { get; set; }
-
-        [JsonPropertyName("value")]
-        public string Value { get; set; }
-
-        public ListValueOption()
-        {
-        }
-
-        public ListValueOption(string name) : this(name, name)
-        {
-        }
-
-        public ListValueOption(string name, string value)
-        {
-            Name = name;
-            Value = value;
-        }
+        Name = name;
+        Value = value;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldPredefinedListEditorSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldPredefinedListEditorSettingsDriver.cs
index 7d76a254f6d..b306344d682 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldPredefinedListEditorSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldPredefinedListEditorSettingsDriver.cs
@@ -8,55 +8,54 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public sealed class TextFieldPredefinedListEditorSettingsDriver : ContentPartFieldDefinitionDisplayDriver<TextField>
 {
-    public sealed class TextFieldPredefinedListEditorSettingsDriver : ContentPartFieldDefinitionDisplayDriver<TextField>
+    internal readonly IStringLocalizer S;
+
+    public TextFieldPredefinedListEditorSettingsDriver(IStringLocalizer<TextFieldPredefinedListEditorSettingsDriver> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public TextFieldPredefinedListEditorSettingsDriver(IStringLocalizer<TextFieldPredefinedListEditorSettingsDriver> localizer)
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+    {
+        return Initialize<PredefinedListSettingsViewModel>("TextFieldPredefinedListEditorSettings_Edit", model =>
         {
-            S = localizer;
-        }
+            var settings = partFieldDefinition.GetSettings<TextFieldPredefinedListEditorSettings>();
+
+            model.DefaultValue = settings.DefaultValue;
+            model.Editor = settings.Editor;
+            model.Options = JConvert.SerializeObject(settings.Options ?? [], JOptions.Indented);
+        }).Location("Editor");
+    }
 
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        if (partFieldDefinition.Editor() == "PredefinedList")
         {
-            return Initialize<PredefinedListSettingsViewModel>("TextFieldPredefinedListEditorSettings_Edit", model =>
-            {
-                var settings = partFieldDefinition.GetSettings<TextFieldPredefinedListEditorSettings>();
+            var model = new PredefinedListSettingsViewModel();
+            var settings = new TextFieldPredefinedListEditorSettings();
 
-                model.DefaultValue = settings.DefaultValue;
-                model.Editor = settings.Editor;
-                model.Options = JConvert.SerializeObject(settings.Options ?? [], JOptions.Indented);
-            }).Location("Editor");
-        }
+            await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
-        {
-            if (partFieldDefinition.Editor() == "PredefinedList")
+            try
             {
-                var model = new PredefinedListSettingsViewModel();
-                var settings = new TextFieldPredefinedListEditorSettings();
-
-                await context.Updater.TryUpdateModelAsync(model, Prefix);
-
-                try
-                {
-                    settings.DefaultValue = model.DefaultValue;
-                    settings.Editor = model.Editor;
-                    settings.Options = string.IsNullOrWhiteSpace(model.Options)
-                        ? []
-                        : JConvert.DeserializeObject<ListValueOption[]>(model.Options);
-
-                    context.Builder.WithSettings(settings);
-                }
-                catch
-                {
-                    context.Updater.ModelState.AddModelError(Prefix, S["The options are written in an incorrect format."]);
-                }
-            }
+                settings.DefaultValue = model.DefaultValue;
+                settings.Editor = model.Editor;
+                settings.Options = string.IsNullOrWhiteSpace(model.Options)
+                    ? []
+                    : JConvert.DeserializeObject<ListValueOption[]>(model.Options);
 
-            return Edit(partFieldDefinition, context);
+                context.Builder.WithSettings(settings);
+            }
+            catch
+            {
+                context.Updater.ModelState.AddModelError(Prefix, S["The options are written in an incorrect format."]);
+            }
         }
+
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldSettings.cs
index 4710ef1760e..bb8880c019f 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldSettings.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public class TextFieldSettings
 {
-    public class TextFieldSettings
-    {
-        public string Hint { get; set; }
-        public bool Required { get; set; }
-        public string DefaultValue { get; set; }
-    }
+    public string Hint { get; set; }
+    public bool Required { get; set; }
+    public string DefaultValue { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldSettingsDriver.cs
index dce839956a8..22e1349c7a5 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldSettingsDriver.cs
@@ -6,31 +6,30 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public sealed class TextFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<TextField>
 {
-    public sealed class TextFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<TextField>
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+        return Initialize<TextFieldSettings>("TextFieldSettings_Edit", model =>
         {
-            return Initialize<TextFieldSettings>("TextFieldSettings_Edit", model =>
-            {
-                var settings = partFieldDefinition.Settings.ToObject<TextFieldSettings>();
+            var settings = partFieldDefinition.Settings.ToObject<TextFieldSettings>();
 
-                model.Hint = settings.Hint;
-                model.Required = settings.Required;
-                model.DefaultValue = settings.DefaultValue;
-            }).Location("Content");
-        }
+            model.Hint = settings.Hint;
+            model.Required = settings.Required;
+            model.DefaultValue = settings.DefaultValue;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
-        {
-            var model = new TextFieldSettings();
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        var model = new TextFieldSettings();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            context.Builder.WithSettings(model);
+        context.Builder.WithSettings(model);
 
-            return Edit(partFieldDefinition, context);
-        }
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TimeFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TimeFieldSettings.cs
index 208e8ffe9b3..6be1d9109e8 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TimeFieldSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TimeFieldSettings.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public class TimeFieldSettings
 {
-    public class TimeFieldSettings
-    {
-        public string Hint { get; set; }
-        public bool Required { get; set; }
-        public string Step { get; set; }
-    }
+    public string Hint { get; set; }
+    public bool Required { get; set; }
+    public string Step { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TimeFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TimeFieldSettingsDriver.cs
index eaf88e247e2..60373632566 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TimeFieldSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TimeFieldSettingsDriver.cs
@@ -6,31 +6,30 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public sealed class TimeFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<TimeField>
 {
-    public sealed class TimeFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<TimeField>
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+        return Initialize<TimeFieldSettings>("TimeFieldSettings_Edit", model =>
         {
-            return Initialize<TimeFieldSettings>("TimeFieldSettings_Edit", model =>
-            {
-                var settings = partFieldDefinition.Settings.ToObject<TimeFieldSettings>();
+            var settings = partFieldDefinition.Settings.ToObject<TimeFieldSettings>();
 
-                model.Hint = settings.Hint;
-                model.Required = settings.Required;
-                model.Step = settings.Step;
-            }).Location("Content");
-        }
+            model.Hint = settings.Hint;
+            model.Required = settings.Required;
+            model.Step = settings.Step;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
-        {
-            var model = new TimeFieldSettings();
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        var model = new TimeFieldSettings();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            context.Builder.WithSettings(model);
+        context.Builder.WithSettings(model);
 
-            return Edit(partFieldDefinition, context);
-        }
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/UserPickerFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/UserPickerFieldSettings.cs
index c59a3f72ecf..15d205ae57b 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/UserPickerFieldSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/UserPickerFieldSettings.cs
@@ -1,15 +1,14 @@
 using System.ComponentModel;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public class UserPickerFieldSettings
 {
-    public class UserPickerFieldSettings
-    {
-        public string Hint { get; set; }
-        public bool Required { get; set; }
-        public bool Multiple { get; set; }
+    public string Hint { get; set; }
+    public bool Required { get; set; }
+    public bool Multiple { get; set; }
 
-        [DefaultValue(true)]
-        public bool DisplayAllUsers { get; set; } = true;
-        public string[] DisplayedRoles { get; set; } = [];
-    }
+    [DefaultValue(true)]
+    public bool DisplayAllUsers { get; set; } = true;
+    public string[] DisplayedRoles { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/UserPickerFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/UserPickerFieldSettingsDriver.cs
index a7aad0133b7..c66b7f460f1 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/UserPickerFieldSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/UserPickerFieldSettingsDriver.cs
@@ -8,69 +8,68 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Security.Services;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public sealed class UserPickerFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<UserPickerField>
 {
-    public sealed class UserPickerFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<UserPickerField>
-    {
-        private readonly IRoleService _roleService;
+    private readonly IRoleService _roleService;
 
-        public UserPickerFieldSettingsDriver(IRoleService roleService)
-        {
-            _roleService = roleService;
-        }
+    public UserPickerFieldSettingsDriver(IRoleService roleService)
+    {
+        _roleService = roleService;
+    }
 
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+    {
+        return Initialize<UserPickerFieldSettingsViewModel>("UserPickerFieldSettings_Edit", async model =>
         {
-            return Initialize<UserPickerFieldSettingsViewModel>("UserPickerFieldSettings_Edit", async model =>
-            {
-                var settings = partFieldDefinition.GetSettings<UserPickerFieldSettings>();
-                model.Hint = settings.Hint;
-                model.Required = settings.Required;
-                model.Multiple = settings.Multiple;
-                var roles = (await _roleService.GetRoleNamesAsync())
-                    .Except(RoleHelper.SystemRoleNames, StringComparer.OrdinalIgnoreCase)
-                    .Select(roleName => new RoleEntry
-                    {
-                        Role = roleName,
-                        IsSelected = settings.DisplayedRoles.Contains(roleName, StringComparer.OrdinalIgnoreCase)
-                    })
-                    .ToArray();
+            var settings = partFieldDefinition.GetSettings<UserPickerFieldSettings>();
+            model.Hint = settings.Hint;
+            model.Required = settings.Required;
+            model.Multiple = settings.Multiple;
+            var roles = (await _roleService.GetRoleNamesAsync())
+                .Except(RoleHelper.SystemRoleNames, StringComparer.OrdinalIgnoreCase)
+                .Select(roleName => new RoleEntry
+                {
+                    Role = roleName,
+                    IsSelected = settings.DisplayedRoles.Contains(roleName, StringComparer.OrdinalIgnoreCase)
+                })
+                .ToArray();
 
-                model.Roles = roles;
-                model.DisplayAllUsers = settings.DisplayAllUsers || !roles.Where(x => x.IsSelected).Any();
-            }).Location("Content");
-        }
+            model.Roles = roles;
+            model.DisplayAllUsers = settings.DisplayAllUsers || !roles.Where(x => x.IsSelected).Any();
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
-        {
-            var model = new UserPickerFieldSettingsViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        var model = new UserPickerFieldSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            var settings = new UserPickerFieldSettings
-            {
-                Hint = model.Hint,
-                Required = model.Required,
-                Multiple = model.Multiple
-            };
+        var settings = new UserPickerFieldSettings
+        {
+            Hint = model.Hint,
+            Required = model.Required,
+            Multiple = model.Multiple
+        };
 
-            var selectedRoles = model.Roles.Where(x => x.IsSelected).Select(x => x.Role).ToArray();
+        var selectedRoles = model.Roles.Where(x => x.IsSelected).Select(x => x.Role).ToArray();
 
-            if (model.DisplayAllUsers || selectedRoles.Length == 0)
-            {
-                // No selected role should have the same effect as display all users
-                settings.DisplayedRoles = [];
-                settings.DisplayAllUsers = true;
-            }
-            else
-            {
-                settings.DisplayedRoles = selectedRoles;
-                settings.DisplayAllUsers = false;
-            }
+        if (model.DisplayAllUsers || selectedRoles.Length == 0)
+        {
+            // No selected role should have the same effect as display all users
+            settings.DisplayedRoles = [];
+            settings.DisplayAllUsers = true;
+        }
+        else
+        {
+            settings.DisplayedRoles = selectedRoles;
+            settings.DisplayAllUsers = false;
+        }
 
-            context.Builder.WithSettings(settings);
+        context.Builder.WithSettings(settings);
 
-            return Edit(partFieldDefinition, context);
-        }
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/UserPickerFieldSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/UserPickerFieldSettingsViewModel.cs
index dfbf56e9b8f..92b531d6bd5 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/UserPickerFieldSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/UserPickerFieldSettingsViewModel.cs
@@ -1,17 +1,16 @@
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public class UserPickerFieldSettingsViewModel
 {
-    public class UserPickerFieldSettingsViewModel
-    {
-        public string Hint { get; set; }
-        public bool Required { get; set; }
-        public bool Multiple { get; set; }
-        public bool DisplayAllUsers { get; set; }
-        public RoleEntry[] Roles { get; set; } = [];
-    }
+    public string Hint { get; set; }
+    public bool Required { get; set; }
+    public bool Multiple { get; set; }
+    public bool DisplayAllUsers { get; set; }
+    public RoleEntry[] Roles { get; set; } = [];
+}
 
-    public class RoleEntry
-    {
-        public string Role { get; set; }
-        public bool IsSelected { get; set; }
-    }
+public class RoleEntry
+{
+    public string Role { get; set; }
+    public bool IsSelected { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/YoutubeFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/YoutubeFieldSettings.cs
index dd0c8420545..32cfbc049a0 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/YoutubeFieldSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/YoutubeFieldSettings.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public class YoutubeFieldSettings
 {
-    public class YoutubeFieldSettings
-    {
-        public string Hint { get; set; }
-        public string Label { get; set; }
-        public int Width { get; set; }
-        public int Height { get; set; }
-        public bool Required { get; set; }
-    }
+    public string Hint { get; set; }
+    public string Label { get; set; }
+    public int Width { get; set; }
+    public int Height { get; set; }
+    public bool Required { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/YoutubeFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/YoutubeFieldSettingsDriver.cs
index e0875cdaab0..7e7eceaff39 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/YoutubeFieldSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/YoutubeFieldSettingsDriver.cs
@@ -6,29 +6,28 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentFields.Settings
+namespace OrchardCore.ContentFields.Settings;
+
+public sealed class YoutubeFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<YoutubeField>
 {
-    public sealed class YoutubeFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<YoutubeField>
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+        return Initialize<YoutubeFieldSettings>("YoutubeFieldSetting_Edit", model =>
         {
-            return Initialize<YoutubeFieldSettings>("YoutubeFieldSetting_Edit", model =>
-            {
-                var settings = partFieldDefinition.Settings.ToObject<YoutubeFieldSettings>();
+            var settings = partFieldDefinition.Settings.ToObject<YoutubeFieldSettings>();
 
-                model.Height = model.Height != default ? model.Height : 315;
-                model.Width = model.Width != default ? model.Width : 560;
-            }).Location("Content");
-        }
+            model.Height = model.Height != default ? model.Height : 315;
+            model.Width = model.Width != default ? model.Width : 560;
+        }).Location("Content");
+    }
 
-        public async override Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
-        {
-            var model = new YoutubeFieldSettings();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+    public async override Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        var model = new YoutubeFieldSettings();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            context.Builder.WithSettings(model);
+        context.Builder.WithSettings(model);
 
-            return Edit(partFieldDefinition, context);
-        }
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Startup.cs
index 1febce56fd9..4b5db23739a 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Startup.cs
@@ -20,197 +20,196 @@
 using OrchardCore.ResourceManagement;
 using OrchardCore.Users;
 
-namespace OrchardCore.ContentFields
+namespace OrchardCore.ContentFields;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
+
+        services.Configure<TemplateOptions>(o =>
         {
-            services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
-
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<BooleanField>();
-                o.MemberAccessStrategy.Register<DisplayBooleanFieldViewModel>();
-                o.MemberAccessStrategy.Register<HtmlField>();
-                o.MemberAccessStrategy.Register<DisplayHtmlFieldViewModel>();
-                o.MemberAccessStrategy.Register<LinkField>();
-                o.MemberAccessStrategy.Register<DisplayLinkFieldViewModel>();
-                o.MemberAccessStrategy.Register<NumericField>();
-                o.MemberAccessStrategy.Register<DisplayNumericFieldViewModel>();
-                o.MemberAccessStrategy.Register<TextField>();
-                o.MemberAccessStrategy.Register<DisplayTextFieldViewModel>();
-                o.MemberAccessStrategy.Register<DateTimeField>();
-                o.MemberAccessStrategy.Register<DisplayDateTimeFieldViewModel>();
-                o.MemberAccessStrategy.Register<DateField>();
-                o.MemberAccessStrategy.Register<DisplayDateFieldViewModel>();
-                o.MemberAccessStrategy.Register<TimeField>();
-                o.MemberAccessStrategy.Register<DisplayTimeFieldViewModel>();
-                o.MemberAccessStrategy.Register<MultiTextField>();
-                o.MemberAccessStrategy.Register<DisplayMultiTextFieldViewModel>();
-                o.MemberAccessStrategy.Register<UserPickerField>();
-                o.MemberAccessStrategy.Register<DisplayUserPickerFieldViewModel>();
-                o.MemberAccessStrategy.Register<ContentPickerField>();
-                o.MemberAccessStrategy.Register<DisplayContentPickerFieldViewModel>();
-            });
-
-            // Boolean Field
-            services.AddContentField<BooleanField>()
-                .UseDisplayDriver<BooleanFieldDisplayDriver>();
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, BooleanFieldSettingsDriver>();
-            services.AddScoped<IContentFieldIndexHandler, BooleanFieldIndexHandler>();
-
-            // Text Field
-            services.AddContentField<TextField>()
-                .UseDisplayDriver<TextFieldDisplayDriver>()
-                .AddHandler<TextFieldHandler>();
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, TextFieldSettingsDriver>();
-            services.AddScoped<IContentFieldIndexHandler, TextFieldIndexHandler>();
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, TextFieldPredefinedListEditorSettingsDriver>();
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, TextFieldMonacoEditorSettingsDriver>();
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, TextFieldHeaderDisplaySettingsDriver>();
-
-            // Html Field
-            services.AddContentField<HtmlField>()
-                .UseDisplayDriver<HtmlFieldDisplayDriver>();
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, HtmlFieldSettingsDriver>();
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, HtmlFieldTrumbowygEditorSettingsDriver>();
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, HtmlFieldMonacoEditorSettingsDriver>();
-            services.AddScoped<IContentFieldIndexHandler, HtmlFieldIndexHandler>();
-
-            // Link Field
-            services.AddContentField<LinkField>()
-                .UseDisplayDriver<LinkFieldDisplayDriver>()
-                .AddHandler<LinkFieldHandler>();
-
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, LinkFieldSettingsDriver>();
-            services.AddScoped<IContentFieldIndexHandler, LinkFieldIndexHandler>();
-
-            // MultiText Field
-            services.AddContentField<MultiTextField>()
-                .UseDisplayDriver<MultiTextFieldDisplayDriver>()
-                .AddHandler<MultiTextFieldHandler>();
-
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, MultiTextFieldSettingsDriver>();
-            services.AddScoped<IContentFieldIndexHandler, MultiTextFieldIndexHandler>();
-
-            // Numeric Field
-            services.AddContentField<NumericField>()
-                .UseDisplayDriver<NumericFieldDisplayDriver>()
-                .AddHandler<NumericFieldHandler>();
-
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, NumericFieldSettingsDriver>();
-            services.AddScoped<IContentFieldIndexHandler, NumericFieldIndexHandler>();
-
-            // DateTime Field
-            services.AddContentField<DateTimeField>()
-                .UseDisplayDriver<DateTimeFieldDisplayDriver>()
-                .AddHandler<DateTimeFieldHandler>();
-
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, DateTimeFieldSettingsDriver>();
-            services.AddScoped<IContentFieldIndexHandler, DateTimeFieldIndexHandler>();
-
-            // Date Field
-            services.AddContentField<DateField>()
-                .UseDisplayDriver<DateFieldDisplayDriver>()
-                .AddHandler<DateFieldHandler>();
-
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, DateFieldSettingsDriver>();
-            services.AddScoped<IContentFieldIndexHandler, DateFieldIndexHandler>();
-
-            // Time Field
-            services.AddContentField<TimeField>()
-                .UseDisplayDriver<TimeFieldDisplayDriver>()
-                .AddHandler<TimeFieldHandler>();
-
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, TimeFieldSettingsDriver>();
-            services.AddScoped<IContentFieldIndexHandler, TimeFieldIndexHandler>();
-
-            // Video field
-            services.AddContentField<YoutubeField>()
-                .UseDisplayDriver<YoutubeFieldDisplayDriver>()
-                .AddHandler<YoutubeFieldHandler>();
-
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, YoutubeFieldSettingsDriver>();
-            services.AddScoped<IContentFieldIndexHandler, YoutubeFieldIndexHandler>();
-
-            // Content picker field
-            services.AddContentField<ContentPickerField>()
-                .UseDisplayDriver<ContentPickerFieldDisplayDriver>()
-                .AddHandler<ContentPickerFieldHandler>();
-
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, ContentPickerFieldSettingsDriver>();
-            services.AddScoped<IContentFieldIndexHandler, ContentPickerFieldIndexHandler>();
-            services.AddScoped<IContentPickerResultProvider, DefaultContentPickerResultProvider>();
-
-            // Migration, can be removed in a future release.
-            services.AddDataMigration<Migrations>();
-        }
+            o.MemberAccessStrategy.Register<BooleanField>();
+            o.MemberAccessStrategy.Register<DisplayBooleanFieldViewModel>();
+            o.MemberAccessStrategy.Register<HtmlField>();
+            o.MemberAccessStrategy.Register<DisplayHtmlFieldViewModel>();
+            o.MemberAccessStrategy.Register<LinkField>();
+            o.MemberAccessStrategy.Register<DisplayLinkFieldViewModel>();
+            o.MemberAccessStrategy.Register<NumericField>();
+            o.MemberAccessStrategy.Register<DisplayNumericFieldViewModel>();
+            o.MemberAccessStrategy.Register<TextField>();
+            o.MemberAccessStrategy.Register<DisplayTextFieldViewModel>();
+            o.MemberAccessStrategy.Register<DateTimeField>();
+            o.MemberAccessStrategy.Register<DisplayDateTimeFieldViewModel>();
+            o.MemberAccessStrategy.Register<DateField>();
+            o.MemberAccessStrategy.Register<DisplayDateFieldViewModel>();
+            o.MemberAccessStrategy.Register<TimeField>();
+            o.MemberAccessStrategy.Register<DisplayTimeFieldViewModel>();
+            o.MemberAccessStrategy.Register<MultiTextField>();
+            o.MemberAccessStrategy.Register<DisplayMultiTextFieldViewModel>();
+            o.MemberAccessStrategy.Register<UserPickerField>();
+            o.MemberAccessStrategy.Register<DisplayUserPickerFieldViewModel>();
+            o.MemberAccessStrategy.Register<ContentPickerField>();
+            o.MemberAccessStrategy.Register<DisplayContentPickerFieldViewModel>();
+        });
+
+        // Boolean Field
+        services.AddContentField<BooleanField>()
+            .UseDisplayDriver<BooleanFieldDisplayDriver>();
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, BooleanFieldSettingsDriver>();
+        services.AddScoped<IContentFieldIndexHandler, BooleanFieldIndexHandler>();
+
+        // Text Field
+        services.AddContentField<TextField>()
+            .UseDisplayDriver<TextFieldDisplayDriver>()
+            .AddHandler<TextFieldHandler>();
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, TextFieldSettingsDriver>();
+        services.AddScoped<IContentFieldIndexHandler, TextFieldIndexHandler>();
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, TextFieldPredefinedListEditorSettingsDriver>();
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, TextFieldMonacoEditorSettingsDriver>();
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, TextFieldHeaderDisplaySettingsDriver>();
+
+        // Html Field
+        services.AddContentField<HtmlField>()
+            .UseDisplayDriver<HtmlFieldDisplayDriver>();
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, HtmlFieldSettingsDriver>();
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, HtmlFieldTrumbowygEditorSettingsDriver>();
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, HtmlFieldMonacoEditorSettingsDriver>();
+        services.AddScoped<IContentFieldIndexHandler, HtmlFieldIndexHandler>();
+
+        // Link Field
+        services.AddContentField<LinkField>()
+            .UseDisplayDriver<LinkFieldDisplayDriver>()
+            .AddHandler<LinkFieldHandler>();
+
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, LinkFieldSettingsDriver>();
+        services.AddScoped<IContentFieldIndexHandler, LinkFieldIndexHandler>();
+
+        // MultiText Field
+        services.AddContentField<MultiTextField>()
+            .UseDisplayDriver<MultiTextFieldDisplayDriver>()
+            .AddHandler<MultiTextFieldHandler>();
+
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, MultiTextFieldSettingsDriver>();
+        services.AddScoped<IContentFieldIndexHandler, MultiTextFieldIndexHandler>();
+
+        // Numeric Field
+        services.AddContentField<NumericField>()
+            .UseDisplayDriver<NumericFieldDisplayDriver>()
+            .AddHandler<NumericFieldHandler>();
+
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, NumericFieldSettingsDriver>();
+        services.AddScoped<IContentFieldIndexHandler, NumericFieldIndexHandler>();
+
+        // DateTime Field
+        services.AddContentField<DateTimeField>()
+            .UseDisplayDriver<DateTimeFieldDisplayDriver>()
+            .AddHandler<DateTimeFieldHandler>();
+
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, DateTimeFieldSettingsDriver>();
+        services.AddScoped<IContentFieldIndexHandler, DateTimeFieldIndexHandler>();
+
+        // Date Field
+        services.AddContentField<DateField>()
+            .UseDisplayDriver<DateFieldDisplayDriver>()
+            .AddHandler<DateFieldHandler>();
+
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, DateFieldSettingsDriver>();
+        services.AddScoped<IContentFieldIndexHandler, DateFieldIndexHandler>();
+
+        // Time Field
+        services.AddContentField<TimeField>()
+            .UseDisplayDriver<TimeFieldDisplayDriver>()
+            .AddHandler<TimeFieldHandler>();
+
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, TimeFieldSettingsDriver>();
+        services.AddScoped<IContentFieldIndexHandler, TimeFieldIndexHandler>();
+
+        // Video field
+        services.AddContentField<YoutubeField>()
+            .UseDisplayDriver<YoutubeFieldDisplayDriver>()
+            .AddHandler<YoutubeFieldHandler>();
+
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, YoutubeFieldSettingsDriver>();
+        services.AddScoped<IContentFieldIndexHandler, YoutubeFieldIndexHandler>();
+
+        // Content picker field
+        services.AddContentField<ContentPickerField>()
+            .UseDisplayDriver<ContentPickerFieldDisplayDriver>()
+            .AddHandler<ContentPickerFieldHandler>();
+
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, ContentPickerFieldSettingsDriver>();
+        services.AddScoped<IContentFieldIndexHandler, ContentPickerFieldIndexHandler>();
+        services.AddScoped<IContentPickerResultProvider, DefaultContentPickerResultProvider>();
+
+        // Migration, can be removed in a future release.
+        services.AddDataMigration<Migrations>();
     }
+}
 
-    [RequireFeatures("OrchardCore.ContentLocalization")]
-    public sealed class LocalizationSetContentPickerStartup : StartupBase
+[RequireFeatures("OrchardCore.ContentLocalization")]
+public sealed class LocalizationSetContentPickerStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddContentField<LocalizationSetContentPickerField>()
-                .UseDisplayDriver<LocalizationSetContentPickerFieldDisplayDriver>()
-                .AddHandler<LocalizationSetContentPickerFieldHandler>();
+        services.AddContentField<LocalizationSetContentPickerField>()
+            .UseDisplayDriver<LocalizationSetContentPickerFieldDisplayDriver>()
+            .AddHandler<LocalizationSetContentPickerFieldHandler>();
 
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, LocalizationSetContentPickerFieldSettingsDriver>();
-            services.AddScoped<IContentFieldIndexHandler, LocalizationSetContentPickerFieldIndexHandler>();
-        }
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, LocalizationSetContentPickerFieldSettingsDriver>();
+        services.AddScoped<IContentFieldIndexHandler, LocalizationSetContentPickerFieldIndexHandler>();
     }
+}
 
-    [Feature("OrchardCore.ContentFields.Indexing.SQL")]
-    public sealed class IndexingStartup : StartupBase
+[Feature("OrchardCore.ContentFields.Indexing.SQL")]
+public sealed class IndexingStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDataMigration<Indexing.SQL.Migrations>();
-            services.AddScopedIndexProvider<TextFieldIndexProvider>();
-            services.AddScopedIndexProvider<BooleanFieldIndexProvider>();
-            services.AddScopedIndexProvider<NumericFieldIndexProvider>();
-            services.AddScopedIndexProvider<DateTimeFieldIndexProvider>();
-            services.AddScopedIndexProvider<DateFieldIndexProvider>();
-            services.AddScopedIndexProvider<ContentPickerFieldIndexProvider>();
-            services.AddScopedIndexProvider<TimeFieldIndexProvider>();
-            services.AddScopedIndexProvider<LinkFieldIndexProvider>();
-            services.AddScopedIndexProvider<HtmlFieldIndexProvider>();
-            services.AddScopedIndexProvider<MultiTextFieldIndexProvider>();
-        }
+        services.AddDataMigration<Indexing.SQL.Migrations>();
+        services.AddScopedIndexProvider<TextFieldIndexProvider>();
+        services.AddScopedIndexProvider<BooleanFieldIndexProvider>();
+        services.AddScopedIndexProvider<NumericFieldIndexProvider>();
+        services.AddScopedIndexProvider<DateTimeFieldIndexProvider>();
+        services.AddScopedIndexProvider<DateFieldIndexProvider>();
+        services.AddScopedIndexProvider<ContentPickerFieldIndexProvider>();
+        services.AddScopedIndexProvider<TimeFieldIndexProvider>();
+        services.AddScopedIndexProvider<LinkFieldIndexProvider>();
+        services.AddScopedIndexProvider<HtmlFieldIndexProvider>();
+        services.AddScopedIndexProvider<MultiTextFieldIndexProvider>();
     }
+}
 
-    [RequireFeatures(UserConstants.Features.Users)]
-    public sealed class UserPickerStartup : StartupBase
+[RequireFeatures(UserConstants.Features.Users)]
+public sealed class UserPickerStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<UserPickerField>();
-                o.MemberAccessStrategy.Register<DisplayUserPickerFieldViewModel>();
-                o.MemberAccessStrategy.Register<DisplayUserPickerFieldUserNamesViewModel>();
-            });
-
-            services.AddContentField<UserPickerField>()
-                .UseDisplayDriver<UserPickerFieldDisplayDriver>(d => !string.Equals(d, "UserNames", StringComparison.OrdinalIgnoreCase))
-                .UseDisplayDriver<UserPickerFieldUserNamesDisplayDriver>(d => string.Equals(d, "UserNames", StringComparison.OrdinalIgnoreCase))
-                .AddHandler<UserPickerFieldHandler>();
-
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, UserPickerFieldSettingsDriver>();
-            services.AddScoped<IContentFieldIndexHandler, UserPickerFieldIndexHandler>();
-            services.AddScoped<IUserPickerResultProvider, DefaultUserPickerResultProvider>();
-        }
+            o.MemberAccessStrategy.Register<UserPickerField>();
+            o.MemberAccessStrategy.Register<DisplayUserPickerFieldViewModel>();
+            o.MemberAccessStrategy.Register<DisplayUserPickerFieldUserNamesViewModel>();
+        });
+
+        services.AddContentField<UserPickerField>()
+            .UseDisplayDriver<UserPickerFieldDisplayDriver>(d => !string.Equals(d, "UserNames", StringComparison.OrdinalIgnoreCase))
+            .UseDisplayDriver<UserPickerFieldUserNamesDisplayDriver>(d => string.Equals(d, "UserNames", StringComparison.OrdinalIgnoreCase))
+            .AddHandler<UserPickerFieldHandler>();
+
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, UserPickerFieldSettingsDriver>();
+        services.AddScoped<IContentFieldIndexHandler, UserPickerFieldIndexHandler>();
+        services.AddScoped<IUserPickerResultProvider, DefaultUserPickerResultProvider>();
     }
+}
 
-    [Feature("OrchardCore.ContentFields.Indexing.SQL.UserPicker")]
-    public sealed class UserPickerSqlIndexingStartup : StartupBase
+[Feature("OrchardCore.ContentFields.Indexing.SQL.UserPicker")]
+public sealed class UserPickerSqlIndexingStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDataMigration<UserPickerMigrations>();
-            services.AddScopedIndexProvider<UserPickerFieldIndexProvider>();
-        }
+        services.AddDataMigration<UserPickerMigrations>();
+        services.AddScopedIndexProvider<UserPickerFieldIndexProvider>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayBooleanFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayBooleanFieldViewModel.cs
index 068d7b14a9c..6b30159dcce 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayBooleanFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayBooleanFieldViewModel.cs
@@ -2,13 +2,12 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class DisplayBooleanFieldViewModel
 {
-    public class DisplayBooleanFieldViewModel
-    {
-        public bool Value => Field.Value;
-        public BooleanField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public bool Value => Field.Value;
+    public BooleanField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayContentPickerFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayContentPickerFieldViewModel.cs
index 5d5249a17cb..923300cf541 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayContentPickerFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayContentPickerFieldViewModel.cs
@@ -2,13 +2,12 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class DisplayContentPickerFieldViewModel
 {
-    public class DisplayContentPickerFieldViewModel
-    {
-        public string[] ContentItemIds => Field.ContentItemIds;
-        public ContentPickerField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public string[] ContentItemIds => Field.ContentItemIds;
+    public ContentPickerField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayDateFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayDateFieldViewModel.cs
index de09b9b4bb1..a9ad7b89dc3 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayDateFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayDateFieldViewModel.cs
@@ -3,13 +3,12 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class DisplayDateFieldViewModel
 {
-    public class DisplayDateFieldViewModel
-    {
-        public DateTime? Value => Field.Value;
-        public DateField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public DateTime? Value => Field.Value;
+    public DateField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayDateTimeFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayDateTimeFieldViewModel.cs
index b26757896a8..5f7629ce321 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayDateTimeFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayDateTimeFieldViewModel.cs
@@ -3,14 +3,13 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class DisplayDateTimeFieldViewModel
 {
-    public class DisplayDateTimeFieldViewModel
-    {
-        public DateTime? Value => Field.Value;
-        public DateTime? LocalDateTime { get; set; }
-        public DateTimeField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public DateTime? Value => Field.Value;
+    public DateTime? LocalDateTime { get; set; }
+    public DateTimeField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayHtmlFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayHtmlFieldViewModel.cs
index ebf18c67f5c..fc6d9202976 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayHtmlFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayHtmlFieldViewModel.cs
@@ -2,13 +2,12 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class DisplayHtmlFieldViewModel
 {
-    public class DisplayHtmlFieldViewModel
-    {
-        public string Html { get; set; }
-        public HtmlField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public string Html { get; set; }
+    public HtmlField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayLinkFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayLinkFieldViewModel.cs
index dce277ef9cb..ce0646619b0 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayLinkFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayLinkFieldViewModel.cs
@@ -2,15 +2,14 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class DisplayLinkFieldViewModel
 {
-    public class DisplayLinkFieldViewModel
-    {
-        public string Url => Field.Url;
-        public string Text => Field.Text;
-        public string Target => Field.Target;
-        public LinkField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public string Url => Field.Url;
+    public string Text => Field.Text;
+    public string Target => Field.Target;
+    public LinkField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayLocalizationSetContentPickerFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayLocalizationSetContentPickerFieldViewModel.cs
index 273d8acd01f..82f2685c255 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayLocalizationSetContentPickerFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayLocalizationSetContentPickerFieldViewModel.cs
@@ -2,13 +2,12 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class DisplayLocalizationSetContentPickerFieldViewModel
 {
-    public class DisplayLocalizationSetContentPickerFieldViewModel
-    {
-        public string[] LocalizationSets => Field.LocalizationSets;
-        public LocalizationSetContentPickerField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public string[] LocalizationSets => Field.LocalizationSets;
+    public LocalizationSetContentPickerField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayMultiTextFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayMultiTextFieldViewModel.cs
index 5b8b585a37a..22b1237133b 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayMultiTextFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayMultiTextFieldViewModel.cs
@@ -2,13 +2,12 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class DisplayMultiTextFieldViewModel
 {
-    public class DisplayMultiTextFieldViewModel
-    {
-        public string[] Values { get; set; }
-        public MultiTextField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public string[] Values { get; set; }
+    public MultiTextField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayNumericFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayNumericFieldViewModel.cs
index 4eb2e9c115f..26c157d0cca 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayNumericFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayNumericFieldViewModel.cs
@@ -2,13 +2,12 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class DisplayNumericFieldViewModel
 {
-    public class DisplayNumericFieldViewModel
-    {
-        public decimal? Value => Field.Value;
-        public NumericField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public decimal? Value => Field.Value;
+    public NumericField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayTextFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayTextFieldViewModel.cs
index 5716f6eab21..2c4ae5065ef 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayTextFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayTextFieldViewModel.cs
@@ -2,13 +2,12 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class DisplayTextFieldViewModel
 {
-    public class DisplayTextFieldViewModel
-    {
-        public string Text => Field.Text;
-        public TextField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public string Text => Field.Text;
+    public TextField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayTimeFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayTimeFieldViewModel.cs
index 32ef25d0a85..c0326f71d46 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayTimeFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayTimeFieldViewModel.cs
@@ -3,13 +3,12 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class DisplayTimeFieldViewModel
 {
-    public class DisplayTimeFieldViewModel
-    {
-        public TimeSpan? Value => Field.Value;
-        public TimeField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public TimeSpan? Value => Field.Value;
+    public TimeField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayUserPickerFieldUserNamesViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayUserPickerFieldUserNamesViewModel.cs
index 2d111eaac12..376c7ef14bd 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayUserPickerFieldUserNamesViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayUserPickerFieldUserNamesViewModel.cs
@@ -2,14 +2,13 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class DisplayUserPickerFieldUserNamesViewModel
 {
-    public class DisplayUserPickerFieldUserNamesViewModel
-    {
-        public string[] UserIds => Field.UserIds;
-        public string[] UserNames => Field.GetUserNames();
-        public UserPickerField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public string[] UserIds => Field.UserIds;
+    public string[] UserNames => Field.GetUserNames();
+    public UserPickerField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayUserPickerFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayUserPickerFieldViewModel.cs
index e54ebdcae5a..8860c7aa5c1 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayUserPickerFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayUserPickerFieldViewModel.cs
@@ -2,13 +2,12 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class DisplayUserPickerFieldViewModel
 {
-    public class DisplayUserPickerFieldViewModel
-    {
-        public string[] UserIds => Field.UserIds;
-        public UserPickerField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public string[] UserIds => Field.UserIds;
+    public UserPickerField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditBooleanFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditBooleanFieldViewModel.cs
index 63bf35fbcde..3540c50ee55 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditBooleanFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditBooleanFieldViewModel.cs
@@ -2,13 +2,12 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class EditBooleanFieldViewModel
 {
-    public class EditBooleanFieldViewModel
-    {
-        public bool Value { get; set; }
-        public BooleanField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public bool Value { get; set; }
+    public BooleanField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditContentPickerFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditContentPickerFieldViewModel.cs
index a6b6b921c3c..da3efdb5af8 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditContentPickerFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditContentPickerFieldViewModel.cs
@@ -4,16 +4,15 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class EditContentPickerFieldViewModel
 {
-    public class EditContentPickerFieldViewModel
-    {
-        public string ContentItemIds { get; set; }
-        public ContentPickerField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
+    public string ContentItemIds { get; set; }
+    public ContentPickerField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 
-        [BindNever]
-        public IList<VueMultiselectItemViewModel> SelectedItems { get; set; }
-    }
+    [BindNever]
+    public IList<VueMultiselectItemViewModel> SelectedItems { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditDateFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditDateFieldViewModel.cs
index 1cb843b1952..10330f199b7 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditDateFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditDateFieldViewModel.cs
@@ -3,13 +3,12 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class EditDateFieldViewModel
 {
-    public class EditDateFieldViewModel
-    {
-        public DateTime? Value { get; set; }
-        public DateField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public DateTime? Value { get; set; }
+    public DateField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditDateTimeFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditDateTimeFieldViewModel.cs
index 65c2c552c59..1f3748bdfad 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditDateTimeFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditDateTimeFieldViewModel.cs
@@ -3,13 +3,12 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class EditDateTimeFieldViewModel
 {
-    public class EditDateTimeFieldViewModel
-    {
-        public DateTime? LocalDateTime { get; set; }
-        public DateTimeField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public DateTime? LocalDateTime { get; set; }
+    public DateTimeField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditHtmlFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditHtmlFieldViewModel.cs
index a2b9096d9af..23e4dfa2b75 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditHtmlFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditHtmlFieldViewModel.cs
@@ -2,13 +2,12 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class EditHtmlFieldViewModel
 {
-    public class EditHtmlFieldViewModel
-    {
-        public string Html { get; set; }
-        public HtmlField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public string Html { get; set; }
+    public HtmlField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditLinkFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditLinkFieldViewModel.cs
index 63660304624..509a8d473db 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditLinkFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditLinkFieldViewModel.cs
@@ -2,15 +2,14 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class EditLinkFieldViewModel
 {
-    public class EditLinkFieldViewModel
-    {
-        public string Url { get; set; }
-        public string Text { get; set; }
-        public string Target { get; set; }
-        public LinkField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public string Url { get; set; }
+    public string Text { get; set; }
+    public string Target { get; set; }
+    public LinkField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditLocalizationSetContentPickerFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditLocalizationSetContentPickerFieldViewModel.cs
index 2de79ab686a..831f3218407 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditLocalizationSetContentPickerFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditLocalizationSetContentPickerFieldViewModel.cs
@@ -4,16 +4,15 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class EditLocalizationSetContentPickerFieldViewModel
 {
-    public class EditLocalizationSetContentPickerFieldViewModel
-    {
-        public string LocalizationSets { get; set; }
-        public LocalizationSetContentPickerField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
+    public string LocalizationSets { get; set; }
+    public LocalizationSetContentPickerField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 
-        [BindNever]
-        public IList<VueMultiselectItemViewModel> SelectedItems { get; set; }
-    }
+    [BindNever]
+    public IList<VueMultiselectItemViewModel> SelectedItems { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditMultiTextFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditMultiTextFieldViewModel.cs
index a802588280a..37a9c3bb951 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditMultiTextFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditMultiTextFieldViewModel.cs
@@ -3,19 +3,18 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class EditMultiTextFieldViewModel
 {
-    public class EditMultiTextFieldViewModel
-    {
-        public string[] Values { get; set; } = [];
+    public string[] Values { get; set; } = [];
 
-        [BindNever]
-        public MultiTextField Field { get; set; }
+    [BindNever]
+    public MultiTextField Field { get; set; }
 
-        [BindNever]
-        public ContentPart Part { get; set; }
+    [BindNever]
+    public ContentPart Part { get; set; }
 
-        [BindNever]
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    [BindNever]
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditNumericFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditNumericFieldViewModel.cs
index af3d3a85869..87c55cfbc67 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditNumericFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditNumericFieldViewModel.cs
@@ -2,13 +2,12 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class EditNumericFieldViewModel
 {
-    public class EditNumericFieldViewModel
-    {
-        public string Value { get; set; }
-        public NumericField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public string Value { get; set; }
+    public NumericField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditTextFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditTextFieldViewModel.cs
index 4c6a346d870..5e303cc165b 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditTextFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditTextFieldViewModel.cs
@@ -2,13 +2,12 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class EditTextFieldViewModel
 {
-    public class EditTextFieldViewModel
-    {
-        public string Text { get; set; }
-        public TextField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public string Text { get; set; }
+    public TextField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditTimeFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditTimeFieldViewModel.cs
index 8652ccc0752..3bc93f62aa0 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditTimeFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditTimeFieldViewModel.cs
@@ -3,13 +3,12 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class EditTimeFieldViewModel
 {
-    public class EditTimeFieldViewModel
-    {
-        public TimeSpan? Value { get; set; }
-        public TimeField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public TimeSpan? Value { get; set; }
+    public TimeField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditUserPickerFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditUserPickerFieldViewModel.cs
index 1a8cc9b1186..f38937f1059 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditUserPickerFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditUserPickerFieldViewModel.cs
@@ -4,32 +4,31 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class EditUserPickerFieldViewModel
 {
-    public class EditUserPickerFieldViewModel
-    {
-        public string UserIds { get; set; }
+    public string UserIds { get; set; }
 
-        [BindNever]
-        public UserPickerField Field { get; set; }
+    [BindNever]
+    public UserPickerField Field { get; set; }
 
-        [BindNever]
-        public ContentPart Part { get; set; }
+    [BindNever]
+    public ContentPart Part { get; set; }
 
-        [BindNever]
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
+    [BindNever]
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 
-        [BindNever]
-        public ContentTypePartDefinition TypePartDefinition { get; set; }
+    [BindNever]
+    public ContentTypePartDefinition TypePartDefinition { get; set; }
 
-        [BindNever]
-        public IList<VueMultiselectUserViewModel> SelectedUsers { get; set; } = [];
-    }
+    [BindNever]
+    public IList<VueMultiselectUserViewModel> SelectedUsers { get; set; } = [];
+}
 
-    public class VueMultiselectUserViewModel
-    {
-        public string Id { get; set; }
-        public string DisplayText { get; set; }
-        public bool IsEnabled { get; set; }
-    }
+public class VueMultiselectUserViewModel
+{
+    public string Id { get; set; }
+    public string DisplayText { get; set; }
+    public bool IsEnabled { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditYoutubeFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditYoutubeFieldViewModel.cs
index a9872228251..2deff7deb51 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditYoutubeFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/EditYoutubeFieldViewModel.cs
@@ -3,16 +3,15 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class EditYoutubeFieldViewModel
 {
-    public class EditYoutubeFieldViewModel
-    {
-        [DataType(DataType.Url, ErrorMessage = "The field only accepts Urls")]
-        public string RawAddress { get; set; }
+    [DataType(DataType.Url, ErrorMessage = "The field only accepts Urls")]
+    public string RawAddress { get; set; }
 
-        public string EmbeddedAddress { get; set; }
-        public YoutubeField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public string EmbeddedAddress { get; set; }
+    public YoutubeField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/HeaderSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/HeaderSettingsViewModel.cs
index 8010860098e..984de604ac3 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/HeaderSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/HeaderSettingsViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class HeaderSettingsViewModel
 {
-    public class HeaderSettingsViewModel
-    {
-        public string Level { get; set; }
-    }
+    public string Level { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/HtmlSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/HtmlSettingsViewModel.cs
index d57977a1121..40c6001cbe8 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/HtmlSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/HtmlSettingsViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class HtmlSettingsViewModel
 {
-    public class HtmlSettingsViewModel
-    {
-        public bool SanitizeHtml { get; set; }
-        public string Hint { get; set; }
-    }
+    public bool SanitizeHtml { get; set; }
+    public string Hint { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/MonacoSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/MonacoSettingsViewModel.cs
index 1e4276cb7c9..7a94a8a3658 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/MonacoSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/MonacoSettingsViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class MonacoSettingsViewModel
 {
-    public class MonacoSettingsViewModel
-    {
-        public string Options { get; set; }
-        public bool InsertMediaWithUrl { get; set; }
-    }
+    public string Options { get; set; }
+    public bool InsertMediaWithUrl { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/MultiTextFieldSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/MultiTextFieldSettingsViewModel.cs
index 7566cbb7d11..9e798426288 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/MultiTextFieldSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/MultiTextFieldSettingsViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class MultiTextFieldSettingsViewModel
 {
-    public class MultiTextFieldSettingsViewModel
-    {
-        public string Hint { get; set; }
-        public bool Required { get; set; }
-        public string Options { get; set; }
-    }
+    public string Hint { get; set; }
+    public bool Required { get; set; }
+    public string Options { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/PredefinedListSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/PredefinedListSettingsViewModel.cs
index 892505e336b..251d6534a1c 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/PredefinedListSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/PredefinedListSettingsViewModel.cs
@@ -1,11 +1,10 @@
 using OrchardCore.ContentFields.Settings;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class PredefinedListSettingsViewModel
 {
-    public class PredefinedListSettingsViewModel
-    {
-        public EditorOption Editor { get; set; }
-        public string Options { get; set; }
-        public string DefaultValue { get; set; }
-    }
+    public EditorOption Editor { get; set; }
+    public string Options { get; set; }
+    public string DefaultValue { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/TrumbowygSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/TrumbowygSettingsViewModel.cs
index dcc3e6e1412..9f9f781a059 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/TrumbowygSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/TrumbowygSettingsViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class TrumbowygSettingsViewModel
 {
-    public class TrumbowygSettingsViewModel
-    {
-        public string Options { get; set; }
-        public bool InsertMediaWithUrl { get; set; }
-    }
+    public string Options { get; set; }
+    public bool InsertMediaWithUrl { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/VueMultiselectItemViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/VueMultiselectItemViewModel.cs
index 0b87f027d56..6dbde7e4061 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/VueMultiselectItemViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/VueMultiselectItemViewModel.cs
@@ -1,12 +1,11 @@
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class VueMultiselectItemViewModel
 {
-    public class VueMultiselectItemViewModel
-    {
-        public string Id { get; set; }
-        public string DisplayText { get; set; }
-        public bool HasPublished { get; set; }
-        public bool IsViewable { get; set; }
-        public bool IsEditable { get; set; }
-        public bool IsClickable => IsEditable || IsViewable;
-    }
+    public string Id { get; set; }
+    public string DisplayText { get; set; }
+    public bool HasPublished { get; set; }
+    public bool IsViewable { get; set; }
+    public bool IsEditable { get; set; }
+    public bool IsClickable => IsEditable || IsViewable;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/YoutubeFieldDisplayViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/YoutubeFieldDisplayViewModel.cs
index a0fe2e591a0..5f7099c8dd5 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/YoutubeFieldDisplayViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/YoutubeFieldDisplayViewModel.cs
@@ -2,14 +2,13 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentFields.ViewModels
+namespace OrchardCore.ContentFields.ViewModels;
+
+public class YoutubeFieldDisplayViewModel
 {
-    public class YoutubeFieldDisplayViewModel
-    {
-        public string EmbeddedAddress => Field.EmbeddedAddress;
-        public string RawAddress => Field.RawAddress;
-        public YoutubeField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public string EmbeddedAddress => Field.EmbeddedAddress;
+    public string RawAddress => Field.RawAddress;
+    public YoutubeField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs
index a56166c3f83..a7c059a6569 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs
@@ -4,59 +4,58 @@
 using OrchardCore.ContentLocalization.Drivers;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.ContentLocalization
+namespace OrchardCore.ContentLocalization;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _providersRouteValues = new()
     {
-        private static readonly RouteValueDictionary _providersRouteValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", ContentRequestCultureProviderSettingsDriver.GroupId },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", ContentRequestCultureProviderSettingsDriver.GroupId },
+    };
 
-        private static readonly RouteValueDictionary _pickerRouteValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", ContentCulturePickerSettingsDriver.GroupId },
-        };
+    private static readonly RouteValueDictionary _pickerRouteValues = new()
+    {
+        { "area", "OrchardCore.Settings" },
+        { "groupId", ContentCulturePickerSettingsDriver.GroupId },
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["Settings"], settings => settings
-                        .Add(S["Localization"], localization => localization
-                            .Add(S["Content Request Culture Provider"], S["Content Request Culture Provider"].PrefixPosition(), provider => provider
-                                .AddClass("contentrequestcultureprovider")
-                                .Id("contentrequestcultureprovider")
-                                .Action("Index", "Admin", _providersRouteValues)
-                                .Permission(Permissions.ManageContentCulturePicker)
-                                .LocalNav()
-                            )
-                            .Add(S["Content Culture Picker"], S["Content Culture Picker"].PrefixPosition(), picker => picker
-                                .AddClass("contentculturepicker")
-                                .Id("contentculturepicker")
-                                .Action("Index", "Admin", _pickerRouteValues)
-                                .Permission(Permissions.ManageContentCulturePicker)
-                                .LocalNav()
-                            )
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["Settings"], settings => settings
+                    .Add(S["Localization"], localization => localization
+                        .Add(S["Content Request Culture Provider"], S["Content Request Culture Provider"].PrefixPosition(), provider => provider
+                            .AddClass("contentrequestcultureprovider")
+                            .Id("contentrequestcultureprovider")
+                            .Action("Index", "Admin", _providersRouteValues)
+                            .Permission(Permissions.ManageContentCulturePicker)
+                            .LocalNav()
+                        )
+                        .Add(S["Content Culture Picker"], S["Content Culture Picker"].PrefixPosition(), picker => picker
+                            .AddClass("contentculturepicker")
+                            .Id("contentculturepicker")
+                            .Action("Index", "Admin", _pickerRouteValues)
+                            .Permission(Permissions.ManageContentCulturePicker)
+                            .LocalNav()
                         )
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ContentRequestCultureProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ContentRequestCultureProvider.cs
index 6302191019f..b5e1882a0d9 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ContentRequestCultureProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ContentRequestCultureProvider.cs
@@ -7,33 +7,32 @@
 using OrchardCore.ContentLocalization.Services;
 using OrchardCore.Settings;
 
-namespace OrchardCore.ContentLocalization
+namespace OrchardCore.ContentLocalization;
+
+/// <summary>
+/// RequestCultureProvider that automatically sets the Culture of a request from the LocalizationPart.Culture property.
+/// </summary>
+public class ContentRequestCultureProvider : RequestCultureProvider
 {
-    /// <summary>
-    /// RequestCultureProvider that automatically sets the Culture of a request from the LocalizationPart.Culture property.
-    /// </summary>
-    public class ContentRequestCultureProvider : RequestCultureProvider
+    public override async Task<ProviderCultureResult> DetermineProviderCultureResult(HttpContext httpContext)
     {
-        public override async Task<ProviderCultureResult> DetermineProviderCultureResult(HttpContext httpContext)
-        {
-            ArgumentNullException.ThrowIfNull(httpContext);
+        ArgumentNullException.ThrowIfNull(httpContext);
 
-            var culturePickerService = httpContext.RequestServices.GetService<IContentCulturePickerService>();
-            var siteService = httpContext.RequestServices.GetService<ISiteService>();
-            var localization = await culturePickerService.GetLocalizationFromRouteAsync(httpContext.Request.Path);
+        var culturePickerService = httpContext.RequestServices.GetService<IContentCulturePickerService>();
+        var siteService = httpContext.RequestServices.GetService<ISiteService>();
+        var localization = await culturePickerService.GetLocalizationFromRouteAsync(httpContext.Request.Path);
 
-            if (localization != null)
+        if (localization != null)
+        {
+            var settings = await siteService.GetSettingsAsync<ContentRequestCultureProviderSettings>();
+            if (settings.SetCookie)
             {
-                var settings = await siteService.GetSettingsAsync<ContentRequestCultureProviderSettings>();
-                if (settings.SetCookie)
-                {
-                    culturePickerService.SetContentCulturePickerCookie(localization.Culture);
-                }
-
-                return new ProviderCultureResult(localization.Culture);
+                culturePickerService.SetContentCulturePickerCookie(localization.Culture);
             }
 
-            return default;
+            return new ProviderCultureResult(localization.Culture);
         }
+
+        return default;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Controllers/AdminController.cs
index 1b7c1d5346f..313703277f9 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Controllers/AdminController.cs
@@ -10,85 +10,84 @@
 using OrchardCore.Contents;
 using OrchardCore.DisplayManagement.Notify;
 
-namespace OrchardCore.ContentLocalization.Controllers
+namespace OrchardCore.ContentLocalization.Controllers;
+
+public class AdminController : Controller
 {
-    public class AdminController : Controller
+    private readonly IContentManager _contentManager;
+    private readonly IContentLocalizationManager _contentLocalizationManager;
+    private readonly INotifier _notifier;
+    private readonly IAuthorizationService _authorizationService;
+    protected readonly IHtmlLocalizer H;
+
+    public AdminController(
+        IContentManager contentManager,
+        INotifier notifier,
+        IContentLocalizationManager localizationManager,
+        IHtmlLocalizer<AdminController> localizer,
+        IAuthorizationService authorizationService)
+    {
+        _contentManager = contentManager;
+        _notifier = notifier;
+        _authorizationService = authorizationService;
+        _contentLocalizationManager = localizationManager;
+        H = localizer;
+    }
+
+    [HttpPost]
+    [Admin("ContentLocalization", "ContentLocalization.Localize")]
+    public async Task<IActionResult> Localize(string contentItemId, string targetCulture, string returnUrl = null)
     {
-        private readonly IContentManager _contentManager;
-        private readonly IContentLocalizationManager _contentLocalizationManager;
-        private readonly INotifier _notifier;
-        private readonly IAuthorizationService _authorizationService;
-        protected readonly IHtmlLocalizer H;
+        // Invariant culture name is empty so a null value is bound.
+        targetCulture ??= string.Empty;
 
-        public AdminController(
-            IContentManager contentManager,
-            INotifier notifier,
-            IContentLocalizationManager localizationManager,
-            IHtmlLocalizer<AdminController> localizer,
-            IAuthorizationService authorizationService)
+        var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
+
+        if (contentItem == null)
         {
-            _contentManager = contentManager;
-            _notifier = notifier;
-            _authorizationService = authorizationService;
-            _contentLocalizationManager = localizationManager;
-            H = localizer;
+            return NotFound();
         }
 
-        [HttpPost]
-        [Admin("ContentLocalization", "ContentLocalization.Localize")]
-        public async Task<IActionResult> Localize(string contentItemId, string targetCulture, string returnUrl = null)
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.LocalizeContent, contentItem))
         {
-            // Invariant culture name is empty so a null value is bound.
-            targetCulture ??= string.Empty;
-
-            var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
-
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
-
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.LocalizeContent, contentItem))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var checkContentItem = await _contentManager.NewAsync(contentItem.ContentType);
+        var checkContentItem = await _contentManager.NewAsync(contentItem.ContentType);
 
-            // Set the current user as the owner to check for ownership permissions on creation
-            checkContentItem.Owner = User.FindFirstValue(ClaimTypes.NameIdentifier);
+        // Set the current user as the owner to check for ownership permissions on creation
+        checkContentItem.Owner = User.FindFirstValue(ClaimTypes.NameIdentifier);
 
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditContent, checkContentItem))
-            {
-                return Forbid();
-            }
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditContent, checkContentItem))
+        {
+            return Forbid();
+        }
 
-            var part = contentItem.As<LocalizationPart>();
+        var part = contentItem.As<LocalizationPart>();
 
-            if (part == null)
-            {
-                return NotFound();
-            }
+        if (part == null)
+        {
+            return NotFound();
+        }
 
-            var alreadyLocalizedContent = await _contentLocalizationManager.GetContentItemAsync(part.LocalizationSet, targetCulture);
+        var alreadyLocalizedContent = await _contentLocalizationManager.GetContentItemAsync(part.LocalizationSet, targetCulture);
 
-            if (alreadyLocalizedContent != null)
-            {
-                await _notifier.WarningAsync(H["A localization already exists for '{0}'.", targetCulture]);
-                return RedirectToAction("Edit", "Admin", new { area = "OrchardCore.Contents", contentItemId, returnUrl });
-            }
+        if (alreadyLocalizedContent != null)
+        {
+            await _notifier.WarningAsync(H["A localization already exists for '{0}'.", targetCulture]);
+            return RedirectToAction("Edit", "Admin", new { area = "OrchardCore.Contents", contentItemId, returnUrl });
+        }
 
-            try
-            {
-                var newContent = await _contentLocalizationManager.LocalizeAsync(contentItem, targetCulture);
-                await _notifier.InformationAsync(H["Localized version of the content created successfully."]);
-                return RedirectToAction("Edit", "Admin", new { area = "OrchardCore.Contents", contentItemId = newContent.ContentItemId, returnUrl });
-            }
-            catch (InvalidOperationException)
-            {
-                await _notifier.WarningAsync(H["Could not create localized version of the content item."]);
-                return RedirectToAction("Edit", "Admin", new { area = "OrchardCore.Contents", contentItemId = contentItem.ContentItemId, returnUrl });
-            }
+        try
+        {
+            var newContent = await _contentLocalizationManager.LocalizeAsync(contentItem, targetCulture);
+            await _notifier.InformationAsync(H["Localized version of the content created successfully."]);
+            return RedirectToAction("Edit", "Admin", new { area = "OrchardCore.Contents", contentItemId = newContent.ContentItemId, returnUrl });
+        }
+        catch (InvalidOperationException)
+        {
+            await _notifier.WarningAsync(H["Could not create localized version of the content item."]);
+            return RedirectToAction("Edit", "Admin", new { area = "OrchardCore.Contents", contentItemId = contentItem.ContentItemId, returnUrl });
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Controllers/ContentCulturePickerController.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Controllers/ContentCulturePickerController.cs
index bf8177fa01e..42d1e2ec54c 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Controllers/ContentCulturePickerController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Controllers/ContentCulturePickerController.cs
@@ -11,76 +11,75 @@
 using OrchardCore.Modules;
 using OrchardCore.Settings;
 
-namespace OrchardCore.ContentLocalization.Controllers
+namespace OrchardCore.ContentLocalization.Controllers;
+
+[Feature("OrchardCore.ContentLocalization.ContentCulturePicker")]
+public class ContentCulturePickerController : Controller
 {
-    [Feature("OrchardCore.ContentLocalization.ContentCulturePicker")]
-    public class ContentCulturePickerController : Controller
+    private readonly ISiteService _siteService;
+    private readonly ILocalizationService _locationService;
+    private readonly IContentCulturePickerService _culturePickerService;
+
+    public ContentCulturePickerController(
+        ISiteService siteService,
+        ILocalizationService locationService,
+        IContentCulturePickerService culturePickerService)
+    {
+        _siteService = siteService;
+        _locationService = locationService;
+        _culturePickerService = culturePickerService;
+    }
+
+    [HttpGet]
+    public async Task<IActionResult> RedirectToLocalizedContent(string targetCulture, PathString contentItemUrl, string queryStringValue)
     {
-        private readonly ISiteService _siteService;
-        private readonly ILocalizationService _locationService;
-        private readonly IContentCulturePickerService _culturePickerService;
+        targetCulture ??= CultureInfo.InvariantCulture.Name;
 
-        public ContentCulturePickerController(
-            ISiteService siteService,
-            ILocalizationService locationService,
-            IContentCulturePickerService culturePickerService)
+        if (!contentItemUrl.HasValue)
         {
-            _siteService = siteService;
-            _locationService = locationService;
-            _culturePickerService = culturePickerService;
+            contentItemUrl = "/";
         }
 
-        [HttpGet]
-        public async Task<IActionResult> RedirectToLocalizedContent(string targetCulture, PathString contentItemUrl, string queryStringValue)
-        {
-            targetCulture ??= CultureInfo.InvariantCulture.Name;
+        var queryString = new QueryString(queryStringValue);
+        var url = HttpContext.Request.PathBase + contentItemUrl + queryString;
 
-            if (!contentItemUrl.HasValue)
+        var supportedCultures = await _locationService.GetSupportedCulturesAsync();
+
+        if (supportedCultures.Any(t => t == targetCulture))
+        {
+            var settings = await _siteService.GetSettingsAsync<ContentCulturePickerSettings>();
+            if (settings.SetCookie)
             {
-                contentItemUrl = "/";
+                _culturePickerService.SetContentCulturePickerCookie(targetCulture);
             }
 
-            var queryString = new QueryString(queryStringValue);
-            var url = HttpContext.Request.PathBase + contentItemUrl + queryString;
-
-            var supportedCultures = await _locationService.GetSupportedCulturesAsync();
-
-            if (supportedCultures.Any(t => t == targetCulture))
+            // Redirect the user to the Content with the same localizationSet as the ContentItem of the current url
+            var localizations = await _culturePickerService.GetLocalizationsFromRouteAsync(contentItemUrl);
+            if (!TryGetLocalizedContentUrl(localizations) && settings.RedirectToHomepage)
             {
-                var settings = await _siteService.GetSettingsAsync<ContentCulturePickerSettings>();
-                if (settings.SetCookie)
-                {
-                    _culturePickerService.SetContentCulturePickerCookie(targetCulture);
-                }
-
-                // Redirect the user to the Content with the same localizationSet as the ContentItem of the current url
-                var localizations = await _culturePickerService.GetLocalizationsFromRouteAsync(contentItemUrl);
-                if (!TryGetLocalizedContentUrl(localizations) && settings.RedirectToHomepage)
-                {
-                    // Try to get the Homepage for the current culture
-                    var homeLocalizations = await _culturePickerService.GetLocalizationsFromRouteAsync("/");
-                    TryGetLocalizedContentUrl(homeLocalizations);
-                }
+                // Try to get the Homepage for the current culture
+                var homeLocalizations = await _culturePickerService.GetLocalizationsFromRouteAsync("/");
+                TryGetLocalizedContentUrl(homeLocalizations);
             }
+        }
 
-            bool TryGetLocalizedContentUrl(IEnumerable<LocalizationEntry> localizationEntries)
+        bool TryGetLocalizedContentUrl(IEnumerable<LocalizationEntry> localizationEntries)
+        {
+            if (localizationEntries.Any())
             {
-                if (localizationEntries.Any())
-                {
-                    var localization = localizationEntries.SingleOrDefault(e => string.Equals(e.Culture, targetCulture, StringComparison.OrdinalIgnoreCase));
+                var localization = localizationEntries.SingleOrDefault(e => string.Equals(e.Culture, targetCulture, StringComparison.OrdinalIgnoreCase));
 
-                    if (localization != null)
-                    {
-                        url = Url.Action("Display", "Item", new { Area = "OrchardCore.Contents", contentItemId = localization.ContentItemId }) + queryString;
+                if (localization != null)
+                {
+                    url = Url.Action("Display", "Item", new { Area = "OrchardCore.Contents", contentItemId = localization.ContentItemId }) + queryString;
 
-                        return true;
-                    }
+                    return true;
                 }
-
-                return false;
             }
 
-            return this.LocalRedirect(url, true);
+            return false;
         }
+
+        return this.LocalRedirect(url, true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/CulturePickerOptions.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/CulturePickerOptions.cs
index 5dd607efbac..37019177119 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/CulturePickerOptions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/CulturePickerOptions.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.ContentLocalization
+namespace OrchardCore.ContentLocalization;
+
+public class CulturePickerOptions
 {
-    public class CulturePickerOptions
-    {
-        public int CookieLifeTime { get; set; } = 14;
-    }
+    public int CookieLifeTime { get; set; } = 14;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/DefaultContentLocalizationManager.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/DefaultContentLocalizationManager.cs
index 85c24505a43..2edfdb20a09 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/DefaultContentLocalizationManager.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/DefaultContentLocalizationManager.cs
@@ -14,175 +14,174 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.ContentLocalization
+namespace OrchardCore.ContentLocalization;
+
+public class DefaultContentLocalizationManager : IContentLocalizationManager
 {
-    public class DefaultContentLocalizationManager : IContentLocalizationManager
+    private readonly IContentManager _contentManager;
+    private readonly ISession _session;
+    private readonly Microsoft.AspNetCore.Http.IHttpContextAccessor _httpContextAccessor;
+    private readonly ILocalizationService _localizationService;
+    private readonly ILogger _logger;
+    private readonly Entities.IIdGenerator _iidGenerator;
+
+    public IEnumerable<IContentLocalizationHandler> Handlers { get; private set; }
+    public IEnumerable<IContentLocalizationHandler> ReversedHandlers { get; private set; }
+
+    public DefaultContentLocalizationManager(
+        IContentManager contentManager,
+        ISession session,
+        Microsoft.AspNetCore.Http.IHttpContextAccessor httpContentAccessor,
+        ILocalizationService localizationService,
+        ILogger<DefaultContentLocalizationManager> logger,
+        IEnumerable<IContentLocalizationHandler> handlers,
+        Entities.IIdGenerator iidGenerator)
     {
-        private readonly IContentManager _contentManager;
-        private readonly ISession _session;
-        private readonly Microsoft.AspNetCore.Http.IHttpContextAccessor _httpContextAccessor;
-        private readonly ILocalizationService _localizationService;
-        private readonly ILogger _logger;
-        private readonly Entities.IIdGenerator _iidGenerator;
-
-        public IEnumerable<IContentLocalizationHandler> Handlers { get; private set; }
-        public IEnumerable<IContentLocalizationHandler> ReversedHandlers { get; private set; }
-
-        public DefaultContentLocalizationManager(
-            IContentManager contentManager,
-            ISession session,
-            Microsoft.AspNetCore.Http.IHttpContextAccessor httpContentAccessor,
-            ILocalizationService localizationService,
-            ILogger<DefaultContentLocalizationManager> logger,
-            IEnumerable<IContentLocalizationHandler> handlers,
-            Entities.IIdGenerator iidGenerator)
-        {
-            _contentManager = contentManager;
-            _session = session;
-            _httpContextAccessor = httpContentAccessor;
-            _localizationService = localizationService;
-            Handlers = handlers;
-            _iidGenerator = iidGenerator;
-            ReversedHandlers = handlers.Reverse().ToArray();
-            _logger = logger;
-        }
+        _contentManager = contentManager;
+        _session = session;
+        _httpContextAccessor = httpContentAccessor;
+        _localizationService = localizationService;
+        Handlers = handlers;
+        _iidGenerator = iidGenerator;
+        ReversedHandlers = handlers.Reverse().ToArray();
+        _logger = logger;
+    }
 
-        public Task<ContentItem> GetContentItemAsync(string localizationSet, string culture)
-        {
-            var invariantCulture = culture.ToLowerInvariant();
-            return _session.Query<ContentItem, LocalizedContentItemIndex>(i =>
-                        (i.Published || i.Latest) &&
-                        i.LocalizationSet == localizationSet &&
-                        i.Culture == invariantCulture)
-                    .FirstOrDefaultAsync();
-        }
+    public Task<ContentItem> GetContentItemAsync(string localizationSet, string culture)
+    {
+        var invariantCulture = culture.ToLowerInvariant();
+        return _session.Query<ContentItem, LocalizedContentItemIndex>(i =>
+                    (i.Published || i.Latest) &&
+                    i.LocalizationSet == localizationSet &&
+                    i.Culture == invariantCulture)
+                .FirstOrDefaultAsync();
+    }
+
+    public Task<IEnumerable<ContentItem>> GetItemsForSetAsync(string localizationSet)
+    {
+        return _session.Query<ContentItem, LocalizedContentItemIndex>(i => (i.Published || i.Latest) && i.LocalizationSet == localizationSet).ListAsync();
+    }
 
-        public Task<IEnumerable<ContentItem>> GetItemsForSetAsync(string localizationSet)
+    public Task<IEnumerable<ContentItem>> GetItemsForSetsAsync(IEnumerable<string> localizationSets, string culture)
+    {
+        var invariantCulture = culture.ToLowerInvariant();
+        return _session.Query<ContentItem, LocalizedContentItemIndex>(i => (i.Published || i.Latest) && i.LocalizationSet.IsIn(localizationSets) && i.Culture == invariantCulture).ListAsync();
+    }
+
+    public async Task<ContentItem> LocalizeAsync(ContentItem content, string targetCulture)
+    {
+        var supportedCultures = await _localizationService.GetSupportedCulturesAsync();
+        if (!supportedCultures.Any(c => string.Equals(c, targetCulture, StringComparison.OrdinalIgnoreCase)))
         {
-            return _session.Query<ContentItem, LocalizedContentItemIndex>(i => (i.Published || i.Latest) && i.LocalizationSet == localizationSet).ListAsync();
+            throw new InvalidOperationException("Cannot localize an unsupported culture");
         }
 
-        public Task<IEnumerable<ContentItem>> GetItemsForSetsAsync(IEnumerable<string> localizationSets, string culture)
+        var localizationPart = content.As<LocalizationPart>();
+        if (string.IsNullOrEmpty(localizationPart.LocalizationSet))
         {
-            var invariantCulture = culture.ToLowerInvariant();
-            return _session.Query<ContentItem, LocalizedContentItemIndex>(i => (i.Published || i.Latest) && i.LocalizationSet.IsIn(localizationSets) && i.Culture == invariantCulture).ListAsync();
+            // If the source content item is not yet localized, define its defaults.
+            localizationPart.LocalizationSet = _iidGenerator.GenerateUniqueId();
+            localizationPart.Culture = await _localizationService.GetDefaultCultureAsync();
+            await _session.SaveAsync(content);
         }
-
-        public async Task<ContentItem> LocalizeAsync(ContentItem content, string targetCulture)
+        else
         {
-            var supportedCultures = await _localizationService.GetSupportedCulturesAsync();
-            if (!supportedCultures.Any(c => string.Equals(c, targetCulture, StringComparison.OrdinalIgnoreCase)))
-            {
-                throw new InvalidOperationException("Cannot localize an unsupported culture");
-            }
+            var existingContent = await GetContentItemAsync(localizationPart.LocalizationSet, targetCulture);
 
-            var localizationPart = content.As<LocalizationPart>();
-            if (string.IsNullOrEmpty(localizationPart.LocalizationSet))
+            if (existingContent != null)
             {
-                // If the source content item is not yet localized, define its defaults.
-                localizationPart.LocalizationSet = _iidGenerator.GenerateUniqueId();
-                localizationPart.Culture = await _localizationService.GetDefaultCultureAsync();
-                await _session.SaveAsync(content);
+                // Already localized.
+                return existingContent;
             }
-            else
-            {
-                var existingContent = await GetContentItemAsync(localizationPart.LocalizationSet, targetCulture);
+        }
 
-                if (existingContent != null)
-                {
-                    // Already localized.
-                    return existingContent;
-                }
-            }
+        // Cloning the content item.
+        var cloned = await _contentManager.CloneAsync(content);
+        var clonedPart = cloned.As<LocalizationPart>();
+        clonedPart.Culture = targetCulture;
+        clonedPart.LocalizationSet = localizationPart.LocalizationSet;
+        clonedPart.Apply();
+
+        var context = new LocalizationContentContext(cloned, content, localizationPart.LocalizationSet, targetCulture);
 
-            // Cloning the content item.
-            var cloned = await _contentManager.CloneAsync(content);
-            var clonedPart = cloned.As<LocalizationPart>();
-            clonedPart.Culture = targetCulture;
-            clonedPart.LocalizationSet = localizationPart.LocalizationSet;
-            clonedPart.Apply();
+        await Handlers.InvokeAsync((handler, context) => handler.LocalizingAsync(context), context, _logger);
+        await ReversedHandlers.InvokeAsync((handler, context) => handler.LocalizedAsync(context), context, _logger);
 
-            var context = new LocalizationContentContext(cloned, content, localizationPart.LocalizationSet, targetCulture);
+        return cloned;
+    }
 
-            await Handlers.InvokeAsync((handler, context) => handler.LocalizingAsync(context), context, _logger);
-            await ReversedHandlers.InvokeAsync((handler, context) => handler.LocalizedAsync(context), context, _logger);
+    public async Task<IDictionary<string, ContentItem>> DeduplicateContentItemsAsync(IEnumerable<ContentItem> contentItems)
+    {
+        var contentItemIds = contentItems.Select(c => c.ContentItemId);
+        var indexValues = await _session.QueryIndex<LocalizedContentItemIndex>(i => (i.Published || i.Latest) && i.ContentItemId.IsIn(contentItemIds)).ListAsync();
 
-            return cloned;
-        }
+        var currentCulture = _httpContextAccessor.HttpContext.Features.Get<IRequestCultureFeature>().RequestCulture.Culture.Name.ToLowerInvariant();
+        var defaultCulture = (await _localizationService.GetDefaultCultureAsync()).ToLowerInvariant();
+        var cleanedIndexValues = GetSingleContentItemIdPerSet(indexValues, currentCulture, defaultCulture);
 
-        public async Task<IDictionary<string, ContentItem>> DeduplicateContentItemsAsync(IEnumerable<ContentItem> contentItems)
+        var dictionary = new Dictionary<string, ContentItem>();
+        foreach (var val in cleanedIndexValues)
         {
-            var contentItemIds = contentItems.Select(c => c.ContentItemId);
-            var indexValues = await _session.QueryIndex<LocalizedContentItemIndex>(i => (i.Published || i.Latest) && i.ContentItemId.IsIn(contentItemIds)).ListAsync();
+            dictionary.Add(val.LocalizationSet, contentItems.SingleOrDefault(ci => ci.ContentItemId == val.ContentItemId));
+        }
 
-            var currentCulture = _httpContextAccessor.HttpContext.Features.Get<IRequestCultureFeature>().RequestCulture.Culture.Name.ToLowerInvariant();
-            var defaultCulture = (await _localizationService.GetDefaultCultureAsync()).ToLowerInvariant();
-            var cleanedIndexValues = GetSingleContentItemIdPerSet(indexValues, currentCulture, defaultCulture);
+        return dictionary;
+    }
 
-            var dictionary = new Dictionary<string, ContentItem>();
-            foreach (var val in cleanedIndexValues)
+    public async Task<IDictionary<string, string>> GetFirstItemIdForSetsAsync(IEnumerable<string> localizationSets)
+    {
+        var indexValues = await _session.QueryIndex<LocalizedContentItemIndex>(i => (i.Published || i.Latest) && i.LocalizationSet.IsIn(localizationSets)).ListAsync();
+
+        var currentCulture = _httpContextAccessor.HttpContext.Features.Get<IRequestCultureFeature>().RequestCulture.Culture.Name.ToLowerInvariant();
+        var defaultCulture = (await _localizationService.GetDefaultCultureAsync()).ToLowerInvariant();
+        var dictionary = new Dictionary<string, string>();
+        var cleanedIndexValues = GetSingleContentItemIdPerSet(indexValues, currentCulture, defaultCulture);
+
+        // This loop keeps the original ordering of localizationSets for the LocalizationSetContentPicker.
+        foreach (var set in localizationSets)
+        {
+            var idxValue = cleanedIndexValues.FirstOrDefault(x => x.LocalizationSet == set);
+            if (idxValue == null)
             {
-                dictionary.Add(val.LocalizationSet, contentItems.SingleOrDefault(ci => ci.ContentItemId == val.ContentItemId));
+                continue;
             }
 
-            return dictionary;
+            dictionary.Add(idxValue.LocalizationSet, idxValue.ContentItemId);
         }
 
-        public async Task<IDictionary<string, string>> GetFirstItemIdForSetsAsync(IEnumerable<string> localizationSets)
-        {
-            var indexValues = await _session.QueryIndex<LocalizedContentItemIndex>(i => (i.Published || i.Latest) && i.LocalizationSet.IsIn(localizationSets)).ListAsync();
-
-            var currentCulture = _httpContextAccessor.HttpContext.Features.Get<IRequestCultureFeature>().RequestCulture.Culture.Name.ToLowerInvariant();
-            var defaultCulture = (await _localizationService.GetDefaultCultureAsync()).ToLowerInvariant();
-            var dictionary = new Dictionary<string, string>();
-            var cleanedIndexValues = GetSingleContentItemIdPerSet(indexValues, currentCulture, defaultCulture);
+        return dictionary;
+    }
 
-            // This loop keeps the original ordering of localizationSets for the LocalizationSetContentPicker.
-            foreach (var set in localizationSets)
+    /// <summary>
+    /// ContentItemId chosen with the following rules:
+    /// ContentItemId of the current culture for the set
+    /// OR ContentItemId of the default culture for the set
+    /// OR First ContentItemId found in the set
+    /// OR null if nothing found.
+    /// </summary>
+    /// <returns>List of ContentItemId.</returns>
+    private static List<LocalizedContentItemIndex> GetSingleContentItemIdPerSet(IEnumerable<LocalizedContentItemIndex> indexValues, string currentCulture, string defaultCulture)
+    {
+        return indexValues.GroupBy(l => l.LocalizationSet).Select(set =>
+        {
+            var currentCultureContentItem = set.FirstOrDefault(f => f.Culture == currentCulture);
+            if (currentCultureContentItem is not null)
             {
-                var idxValue = cleanedIndexValues.FirstOrDefault(x => x.LocalizationSet == set);
-                if (idxValue == null)
-                {
-                    continue;
-                }
-
-                dictionary.Add(idxValue.LocalizationSet, idxValue.ContentItemId);
+                return currentCultureContentItem;
             }
 
-            return dictionary;
-        }
+            var defaultCultureContentItem = set.FirstOrDefault(f => f.Culture == defaultCulture);
+            if (defaultCultureContentItem is not null)
+            {
+                return defaultCultureContentItem;
+            }
 
-        /// <summary>
-        /// ContentItemId chosen with the following rules:
-        /// ContentItemId of the current culture for the set
-        /// OR ContentItemId of the default culture for the set
-        /// OR First ContentItemId found in the set
-        /// OR null if nothing found.
-        /// </summary>
-        /// <returns>List of ContentItemId.</returns>
-        private static List<LocalizedContentItemIndex> GetSingleContentItemIdPerSet(IEnumerable<LocalizedContentItemIndex> indexValues, string currentCulture, string defaultCulture)
-        {
-            return indexValues.GroupBy(l => l.LocalizationSet).Select(set =>
+            if (set.Any())
             {
-                var currentCultureContentItem = set.FirstOrDefault(f => f.Culture == currentCulture);
-                if (currentCultureContentItem is not null)
-                {
-                    return currentCultureContentItem;
-                }
-
-                var defaultCultureContentItem = set.FirstOrDefault(f => f.Culture == defaultCulture);
-                if (defaultCultureContentItem is not null)
-                {
-                    return defaultCultureContentItem;
-                }
-
-                if (set.Any())
-                {
-                    return set.FirstOrDefault();
-                }
-
-                return null;
-            }).OfType<LocalizedContentItemIndex>().ToList();
-        }
+                return set.FirstOrDefault();
+            }
+
+            return null;
+        }).OfType<LocalizedContentItemIndex>().ToList();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/ContentCulturePickerSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/ContentCulturePickerSettingsDriver.cs
index 98ee5aeeebe..21110adf925 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/ContentCulturePickerSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/ContentCulturePickerSettingsDriver.cs
@@ -7,55 +7,54 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Settings;
 
-namespace OrchardCore.ContentLocalization.Drivers
+namespace OrchardCore.ContentLocalization.Drivers;
+
+public sealed class ContentCulturePickerSettingsDriver : SiteDisplayDriver<ContentCulturePickerSettings>
 {
-    public sealed class ContentCulturePickerSettingsDriver : SiteDisplayDriver<ContentCulturePickerSettings>
-    {
-        public const string GroupId = "ContentCulturePicker";
+    public const string GroupId = "ContentCulturePicker";
 
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
 
-        public ContentCulturePickerSettingsDriver(
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-        }
+    public ContentCulturePickerSettingsDriver(
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService)
+    {
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
+
+    protected override string SettingsGroupId
+        => GroupId;
 
-        protected override string SettingsGroupId
-            => GroupId;
+    public override async Task<IDisplayResult> EditAsync(ISite site, ContentCulturePickerSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-        public override async Task<IDisplayResult> EditAsync(ISite site, ContentCulturePickerSettings settings, BuildEditorContext context)
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageContentCulturePicker))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageContentCulturePicker))
-            {
-                return null;
-            }
-
-            return Initialize<ContentCulturePickerSettings>("ContentCulturePickerSettings_Edit", model =>
-            {
-                model.SetCookie = settings.SetCookie;
-                model.RedirectToHomepage = settings.RedirectToHomepage;
-            }).Location("Content:5")
-            .OnGroup(SettingsGroupId);
+            return null;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, ContentCulturePickerSettings section, UpdateEditorContext context)
+        return Initialize<ContentCulturePickerSettings>("ContentCulturePickerSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageContentCulturePicker))
-            {
-                return null;
-            }
+            model.SetCookie = settings.SetCookie;
+            model.RedirectToHomepage = settings.RedirectToHomepage;
+        }).Location("Content:5")
+        .OnGroup(SettingsGroupId);
+    }
 
-            await context.Updater.TryUpdateModelAsync(section, Prefix);
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, ContentCulturePickerSettings section, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-            return await EditAsync(site, section, context);
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageContentCulturePicker))
+        {
+            return null;
         }
+
+        await context.Updater.TryUpdateModelAsync(section, Prefix);
+
+        return await EditAsync(site, section, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/ContentRequestCultureProviderSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/ContentRequestCultureProviderSettingsDriver.cs
index 7cdb2830c0a..b0579124b0e 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/ContentRequestCultureProviderSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/ContentRequestCultureProviderSettingsDriver.cs
@@ -7,54 +7,53 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Settings;
 
-namespace OrchardCore.ContentLocalization.Drivers
+namespace OrchardCore.ContentLocalization.Drivers;
+
+public sealed class ContentRequestCultureProviderSettingsDriver : SiteDisplayDriver<ContentRequestCultureProviderSettings>
 {
-    public sealed class ContentRequestCultureProviderSettingsDriver : SiteDisplayDriver<ContentRequestCultureProviderSettings>
-    {
-        public const string GroupId = "ContentRequestCultureProvider";
+    public const string GroupId = "ContentRequestCultureProvider";
 
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
 
-        public ContentRequestCultureProviderSettingsDriver(
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-        }
+    public ContentRequestCultureProviderSettingsDriver(
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService)
+    {
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
+
+    protected override string SettingsGroupId
+        => GroupId;
 
-        protected override string SettingsGroupId
-            => GroupId;
+    public override async Task<IDisplayResult> EditAsync(ISite site, ContentRequestCultureProviderSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-        public override async Task<IDisplayResult> EditAsync(ISite site, ContentRequestCultureProviderSettings settings, BuildEditorContext context)
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageContentCulturePicker))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageContentCulturePicker))
-            {
-                return null;
-            }
-
-            return Initialize<ContentRequestCultureProviderSettings>("ContentRequestCultureProviderSettings_Edit", model =>
-            {
-                model.SetCookie = settings.SetCookie;
-            }).Location("Content:5")
-            .OnGroup(SettingsGroupId);
+            return null;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, ContentRequestCultureProviderSettings settings, UpdateEditorContext context)
+        return Initialize<ContentRequestCultureProviderSettings>("ContentRequestCultureProviderSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageContentCulturePicker))
-            {
-                return null;
-            }
+            model.SetCookie = settings.SetCookie;
+        }).Location("Content:5")
+        .OnGroup(SettingsGroupId);
+    }
 
-            await context.Updater.TryUpdateModelAsync(settings, Prefix);
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, ContentRequestCultureProviderSettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-            return await EditAsync(site, settings, context);
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageContentCulturePicker))
+        {
+            return null;
         }
+
+        await context.Updater.TryUpdateModelAsync(settings, Prefix);
+
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/LocalizationContentsAdminListDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/LocalizationContentsAdminListDisplayDriver.cs
index 06d154adf8d..10bb4b556e6 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/LocalizationContentsAdminListDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/LocalizationContentsAdminListDisplayDriver.cs
@@ -9,69 +9,68 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Localization;
 
-namespace OrchardCore.ContentLocalization.Drivers
+namespace OrchardCore.ContentLocalization.Drivers;
+
+public sealed class LocalizationContentsAdminListDisplayDriver : DisplayDriver<ContentOptionsViewModel>
 {
-    public sealed class LocalizationContentsAdminListDisplayDriver : DisplayDriver<ContentOptionsViewModel>
-    {
-        private readonly ILocalizationService _localizationService;
+    private readonly ILocalizationService _localizationService;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public LocalizationContentsAdminListDisplayDriver(
-            ILocalizationService localizationService,
-            IStringLocalizer<LocalizationContentsAdminListDisplayDriver> stringLocalizer)
-        {
-            _localizationService = localizationService;
-            S = stringLocalizer;
-        }
+    public LocalizationContentsAdminListDisplayDriver(
+        ILocalizationService localizationService,
+        IStringLocalizer<LocalizationContentsAdminListDisplayDriver> stringLocalizer)
+    {
+        _localizationService = localizationService;
+        S = stringLocalizer;
+    }
 
-        protected override void BuildPrefix(ContentOptionsViewModel model, string htmlFieldPrefix)
-        {
-            Prefix = "Localization";
-        }
+    protected override void BuildPrefix(ContentOptionsViewModel model, string htmlFieldPrefix)
+    {
+        Prefix = "Localization";
+    }
 
-        public override IDisplayResult Display(ContentOptionsViewModel model, BuildDisplayContext context)
-            => View("ContentsAdminFilters_Thumbnail__Culture", model).Location("Thumbnail", "Content:20.1");
+    public override IDisplayResult Display(ContentOptionsViewModel model, BuildDisplayContext context)
+        => View("ContentsAdminFilters_Thumbnail__Culture", model).Location("Thumbnail", "Content:20.1");
 
-        public override IDisplayResult Edit(ContentOptionsViewModel model, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentOptionsViewModel model, BuildEditorContext context)
+    {
+        return Initialize<LocalizationContentsAdminFilterViewModel>("ContentsAdminList__LocalizationPartFilter", async m =>
         {
-            return Initialize<LocalizationContentsAdminFilterViewModel>("ContentsAdminList__LocalizationPartFilter", async m =>
+            model.FilterResult.MapTo(m);
+            var supportedCultures = await _localizationService.GetSupportedCulturesAsync();
+            var cultures = new List<SelectListItem>
             {
-                model.FilterResult.MapTo(m);
-                var supportedCultures = await _localizationService.GetSupportedCulturesAsync();
-                var cultures = new List<SelectListItem>
+                new()
                 {
-                    new()
-                    {
-                        Text = S["All cultures"],
-                        Value = string.Empty,
-                        Selected = string.IsNullOrEmpty(m.SelectedCulture)
-                    }
-                };
-                cultures.AddRange(supportedCultures.Select(culture => new SelectListItem()
-                {
-                    Text = culture,
-                    Value = culture,
-                    Selected = culture == m.SelectedCulture,
-                }));
+                    Text = S["All cultures"],
+                    Value = string.Empty,
+                    Selected = string.IsNullOrEmpty(m.SelectedCulture)
+                }
+            };
+            cultures.AddRange(supportedCultures.Select(culture => new SelectListItem()
+            {
+                Text = culture,
+                Value = culture,
+                Selected = culture == m.SelectedCulture,
+            }));
 
-                m.Cultures = cultures;
-            }).Location("Actions:20");
-        }
+            m.Cultures = cultures;
+        }).Location("Actions:20");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentOptionsViewModel model, UpdateEditorContext context)
-        {
-            var viewModel = new LocalizationContentsAdminFilterViewModel();
-            await context.Updater.TryUpdateModelAsync(viewModel, "Localization");
+    public override async Task<IDisplayResult> UpdateAsync(ContentOptionsViewModel model, UpdateEditorContext context)
+    {
+        var viewModel = new LocalizationContentsAdminFilterViewModel();
+        await context.Updater.TryUpdateModelAsync(viewModel, "Localization");
 
-            if (viewModel.ShowLocalizedContentTypes)
-            {
-                model.RouteValues.TryAdd("Localization.ShowLocalizedContentTypes", viewModel.ShowLocalizedContentTypes);
-            }
+        if (viewModel.ShowLocalizedContentTypes)
+        {
+            model.RouteValues.TryAdd("Localization.ShowLocalizedContentTypes", viewModel.ShowLocalizedContentTypes);
+        }
 
-            model.FilterResult.MapFrom(viewModel);
+        model.FilterResult.MapFrom(viewModel);
 
-            return Edit(model, context);
-        }
+        return Edit(model, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/LocalizationPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/LocalizationPartDisplayDriver.cs
index 95aa4188f24..0a8f8b872fe 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/LocalizationPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/LocalizationPartDisplayDriver.cs
@@ -11,93 +11,92 @@
 using OrchardCore.Entities;
 using OrchardCore.Localization;
 
-namespace OrchardCore.ContentLocalization.Drivers
+namespace OrchardCore.ContentLocalization.Drivers;
+
+public sealed class LocalizationPartDisplayDriver : ContentPartDisplayDriver<LocalizationPart>
 {
-    public sealed class LocalizationPartDisplayDriver : ContentPartDisplayDriver<LocalizationPart>
-    {
-        private readonly IContentLocalizationManager _contentLocalizationManager;
-        private readonly IIdGenerator _idGenerator;
-        private readonly ILocalizationService _localizationService;
+    private readonly IContentLocalizationManager _contentLocalizationManager;
+    private readonly IIdGenerator _idGenerator;
+    private readonly ILocalizationService _localizationService;
 
-        public LocalizationPartDisplayDriver(
-            IContentLocalizationManager contentLocalizationManager,
-            IIdGenerator idGenerator,
-            ILocalizationService localizationService
-        )
-        {
-            _contentLocalizationManager = contentLocalizationManager;
-            _idGenerator = idGenerator;
-            _localizationService = localizationService;
-        }
+    public LocalizationPartDisplayDriver(
+        IContentLocalizationManager contentLocalizationManager,
+        IIdGenerator idGenerator,
+        ILocalizationService localizationService
+    )
+    {
+        _contentLocalizationManager = contentLocalizationManager;
+        _idGenerator = idGenerator;
+        _localizationService = localizationService;
+    }
 
-        public override IDisplayResult Display(LocalizationPart part, BuildPartDisplayContext context)
-        {
-            return Combine(
-                Initialize<LocalizationPartViewModel>("LocalizationPart_SummaryAdmin", model => BuildViewModelAsync(model, part)).Location("SummaryAdmin", "Tags:11"),
-                Initialize<LocalizationPartViewModel>("LocalizationPart_SummaryAdminLinks", model => BuildViewModelAsync(model, part)).Location("SummaryAdmin", "Actions:5")
-            );
-        }
+    public override IDisplayResult Display(LocalizationPart part, BuildPartDisplayContext context)
+    {
+        return Combine(
+            Initialize<LocalizationPartViewModel>("LocalizationPart_SummaryAdmin", model => BuildViewModelAsync(model, part)).Location("SummaryAdmin", "Tags:11"),
+            Initialize<LocalizationPartViewModel>("LocalizationPart_SummaryAdminLinks", model => BuildViewModelAsync(model, part)).Location("SummaryAdmin", "Actions:5")
+        );
+    }
 
-        public override IDisplayResult Edit(LocalizationPart localizationPart, BuildPartEditorContext context)
-        {
-            return Initialize<LocalizationPartViewModel>(GetEditorShapeType(context), m => BuildViewModelAsync(m, localizationPart));
-        }
+    public override IDisplayResult Edit(LocalizationPart localizationPart, BuildPartEditorContext context)
+    {
+        return Initialize<LocalizationPartViewModel>(GetEditorShapeType(context), m => BuildViewModelAsync(m, localizationPart));
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(LocalizationPart model, UpdatePartEditorContext context)
-        {
-            var viewModel = new LocalizationPartViewModel();
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix, t => t.Culture);
+    public override async Task<IDisplayResult> UpdateAsync(LocalizationPart model, UpdatePartEditorContext context)
+    {
+        var viewModel = new LocalizationPartViewModel();
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix, t => t.Culture);
 
-            // Invariant culture name is empty so a null value is bound.
-            model.Culture = viewModel.Culture ?? string.Empty;
+        // Invariant culture name is empty so a null value is bound.
+        model.Culture = viewModel.Culture ?? string.Empty;
 
-            // Need to do this here to support displaying the message to save before localizing when the item has not been saved yet.
-            if (string.IsNullOrEmpty(model.LocalizationSet))
-            {
-                model.LocalizationSet = _idGenerator.GenerateUniqueId();
-            }
-            return Edit(model, context);
+        // Need to do this here to support displaying the message to save before localizing when the item has not been saved yet.
+        if (string.IsNullOrEmpty(model.LocalizationSet))
+        {
+            model.LocalizationSet = _idGenerator.GenerateUniqueId();
         }
+        return Edit(model, context);
+    }
 
-        public async ValueTask BuildViewModelAsync(LocalizationPartViewModel model, LocalizationPart localizationPart)
-        {
-            var alreadyTranslated = await _contentLocalizationManager.GetItemsForSetAsync(localizationPart.LocalizationSet);
+    public async ValueTask BuildViewModelAsync(LocalizationPartViewModel model, LocalizationPart localizationPart)
+    {
+        var alreadyTranslated = await _contentLocalizationManager.GetItemsForSetAsync(localizationPart.LocalizationSet);
 
-            model.Culture = localizationPart.Culture;
-            model.LocalizationSet = localizationPart.LocalizationSet;
-            model.LocalizationPart = localizationPart;
+        model.Culture = localizationPart.Culture;
+        model.LocalizationSet = localizationPart.LocalizationSet;
+        model.LocalizationPart = localizationPart;
 
-            // Invariant culture name is empty so we only do a null check.
-            model.Culture ??= await _localizationService.GetDefaultCultureAsync();
+        // Invariant culture name is empty so we only do a null check.
+        model.Culture ??= await _localizationService.GetDefaultCultureAsync();
 
-            var supportedCultures = await _localizationService.GetSupportedCulturesAsync();
-            var currentCultures = supportedCultures.Where(c => c != model.Culture).Select(culture =>
+        var supportedCultures = await _localizationService.GetSupportedCulturesAsync();
+        var currentCultures = supportedCultures.Where(c => c != model.Culture).Select(culture =>
+          {
+              return new LocalizationLinksViewModel()
               {
-                  return new LocalizationLinksViewModel()
-                  {
-                      IsDeleted = false,
-                      Culture = CultureInfo.GetCultureInfo(culture),
-                      ContentItemId = alreadyTranslated.FirstOrDefault(c => c.As<LocalizationPart>()?.Culture == culture)?.ContentItemId,
-                  };
-              }).ToList();
+                  IsDeleted = false,
+                  Culture = CultureInfo.GetCultureInfo(culture),
+                  ContentItemId = alreadyTranslated.FirstOrDefault(c => c.As<LocalizationPart>()?.Culture == culture)?.ContentItemId,
+              };
+          }).ToList();
 
-            // Content items that have been translated but the culture was removed from the settings page
-            var deletedCultureTranslations = alreadyTranslated.Where(c => c.As<LocalizationPart>()?.Culture != model.Culture).Select(ci =>
+        // Content items that have been translated but the culture was removed from the settings page
+        var deletedCultureTranslations = alreadyTranslated.Where(c => c.As<LocalizationPart>()?.Culture != model.Culture).Select(ci =>
+        {
+            var culture = ci.As<LocalizationPart>()?.Culture;
+            if (currentCultures.Any(c => c.ContentItemId == ci.ContentItemId) || culture == null)
             {
-                var culture = ci.As<LocalizationPart>()?.Culture;
-                if (currentCultures.Any(c => c.ContentItemId == ci.ContentItemId) || culture == null)
-                {
-                    return null;
-                }
-                return new LocalizationLinksViewModel()
-                {
-                    IsDeleted = true,
-                    Culture = CultureInfo.GetCultureInfo(culture),
-                    ContentItemId = ci?.ContentItemId
-                };
-            }).OfType<LocalizationLinksViewModel>().ToList();
+                return null;
+            }
+            return new LocalizationLinksViewModel()
+            {
+                IsDeleted = true,
+                Culture = CultureInfo.GetCultureInfo(culture),
+                ContentItemId = ci?.ContentItemId
+            };
+        }).OfType<LocalizationLinksViewModel>().ToList();
 
-            model.ContentItemCultures = currentCultures.Concat(deletedCultureTranslations).ToList();
-        }
+        model.ContentItemCultures = currentCultures.Concat(deletedCultureTranslations).ToList();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/LocalizationInputObjectType.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/LocalizationInputObjectType.cs
index d17d020fb91..11597400908 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/LocalizationInputObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/LocalizationInputObjectType.cs
@@ -3,17 +3,16 @@
 using OrchardCore.Apis.GraphQL.Queries;
 using OrchardCore.ContentLocalization.Models;
 
-namespace OrchardCore.ContentLocalization.GraphQL
+namespace OrchardCore.ContentLocalization.GraphQL;
+
+public class LocalizationInputObjectType : WhereInputObjectGraphType<LocalizationPart>
 {
-    public class LocalizationInputObjectType : WhereInputObjectGraphType<LocalizationPart>
+    public LocalizationInputObjectType(IStringLocalizer<LocalizationInputObjectType> S)
     {
-        public LocalizationInputObjectType(IStringLocalizer<LocalizationInputObjectType> S)
-        {
-            Name = "LocalizationInputObjectType";
-            Description = S["the localization part of the content item"];
+        Name = "LocalizationInputObjectType";
+        Description = S["the localization part of the content item"];
 
-            AddScalarFilterFields<StringGraphType>("culture", S["the culture of the content item to filter"]);
-            Field(x => x.LocalizationSet, nullable: true).Description(S["the localization set of the content item to filter"]);
-        }
+        AddScalarFilterFields<StringGraphType>("culture", S["the culture of the content item to filter"]);
+        Field(x => x.LocalizationSet, nullable: true).Description(S["the localization set of the content item to filter"]);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/LocalizationPartIndexAliasProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/LocalizationPartIndexAliasProvider.cs
index 6e904e89fa4..98beedc1267 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/LocalizationPartIndexAliasProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/LocalizationPartIndexAliasProvider.cs
@@ -3,23 +3,22 @@
 using OrchardCore.ContentLocalization.Records;
 using OrchardCore.ContentManagement.GraphQL.Queries;
 
-namespace OrchardCore.ContentLocalization.GraphQL
-{
-    public class LocalizationPartIndexAliasProvider : IIndexAliasProvider
-    {
-        private static readonly IndexAlias[] _aliases =
-        [
-            new IndexAlias
-            {
-                Alias = "localizationPart",
-                Index = nameof(LocalizedContentItemIndex),
-                IndexType = typeof(LocalizedContentItemIndex)
-            }
-        ];
+namespace OrchardCore.ContentLocalization.GraphQL;
 
-        public ValueTask<IEnumerable<IndexAlias>> GetAliasesAsync()
+public class LocalizationPartIndexAliasProvider : IIndexAliasProvider
+{
+    private static readonly IndexAlias[] _aliases =
+    [
+        new IndexAlias
         {
-            return ValueTask.FromResult<IEnumerable<IndexAlias>>(_aliases);
+            Alias = "localizationPart",
+            Index = nameof(LocalizedContentItemIndex),
+            IndexType = typeof(LocalizedContentItemIndex)
         }
+    ];
+
+    public ValueTask<IEnumerable<IndexAlias>> GetAliasesAsync()
+    {
+        return ValueTask.FromResult<IEnumerable<IndexAlias>>(_aliases);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/LocalizationQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/LocalizationQueryObjectType.cs
index d152b49227e..ba457799c86 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/LocalizationQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/LocalizationQueryObjectType.cs
@@ -9,37 +9,36 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.GraphQL.Queries.Types;
 
-namespace OrchardCore.ContentLocalization.GraphQL
+namespace OrchardCore.ContentLocalization.GraphQL;
+
+public class LocalizationQueryObjectType : ObjectGraphType<LocalizationPart>
 {
-    public class LocalizationQueryObjectType : ObjectGraphType<LocalizationPart>
+    public LocalizationQueryObjectType(IStringLocalizer<LocalizationQueryObjectType> S)
     {
-        public LocalizationQueryObjectType(IStringLocalizer<LocalizationQueryObjectType> S)
-        {
-            Name = "LocalizationPart";
-            Description = S["Localization cultures for your content item."];
+        Name = "LocalizationPart";
+        Description = S["Localization cultures for your content item."];
 
-            Field(x => x.Culture).Description(S["The culture for your content item."]);
-            Field(x => x.LocalizationSet).Description(S["The localization set for your content item."]);
+        Field(x => x.Culture).Description(S["The culture for your content item."]);
+        Field(x => x.LocalizationSet).Description(S["The localization set for your content item."]);
 
-            Field<ListGraphType<ContentItemInterface>, IEnumerable<ContentItem>>("Localizations")
-                .Description(S["The localizations of the content item."])
-                .Argument<StringGraphType>("culture", "the culture of the content item")
-                .ResolveLockedAsync(GetContentItemsByLocalizationSetAsync);
-        }
-
-        private static async ValueTask<IEnumerable<ContentItem>> GetContentItemsByLocalizationSetAsync(IResolveFieldContext<LocalizationPart> context)
-        {
-            var culture = context.GetArgument<string>("culture");
-            var contentLocalizationManager = context.RequestServices.GetService<IContentLocalizationManager>();
+        Field<ListGraphType<ContentItemInterface>, IEnumerable<ContentItem>>("Localizations")
+            .Description(S["The localizations of the content item."])
+            .Argument<StringGraphType>("culture", "the culture of the content item")
+            .ResolveLockedAsync(GetContentItemsByLocalizationSetAsync);
+    }
 
-            if (culture != null)
-            {
-                var contentItem = await contentLocalizationManager.GetContentItemAsync(context.Source.LocalizationSet, culture);
+    private static async ValueTask<IEnumerable<ContentItem>> GetContentItemsByLocalizationSetAsync(IResolveFieldContext<LocalizationPart> context)
+    {
+        var culture = context.GetArgument<string>("culture");
+        var contentLocalizationManager = context.RequestServices.GetService<IContentLocalizationManager>();
 
-                return contentItem != null ? new[] { contentItem } : [];
-            }
+        if (culture != null)
+        {
+            var contentItem = await contentLocalizationManager.GetContentItemAsync(context.Source.LocalizationSet, culture);
 
-            return await contentLocalizationManager.GetItemsForSetAsync(context.Source.LocalizationSet);
+            return contentItem != null ? new[] { contentItem } : [];
         }
+
+        return await contentLocalizationManager.GetItemsForSetAsync(context.Source.LocalizationSet);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/Startup.cs
index 18371795815..35dd01bf283 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/Startup.cs
@@ -6,17 +6,16 @@
 using OrchardCore.ContentManagement.GraphQL.Queries;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentLocalization.GraphQL
+namespace OrchardCore.ContentLocalization.GraphQL;
+
+[RequireFeatures("OrchardCore.Apis.GraphQL")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Apis.GraphQL")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddInputObjectGraphType<LocalizationPart, LocalizationInputObjectType>();
-            services.AddObjectGraphType<LocalizationPart, LocalizationQueryObjectType>();
-            services.AddTransient<IIndexAliasProvider, LocalizationPartIndexAliasProvider>();
-            services.AddWhereInputIndexPropertyProvider<LocalizedContentItemIndex>();
-        }
+        services.AddInputObjectGraphType<LocalizationPart, LocalizationInputObjectType>();
+        services.AddObjectGraphType<LocalizationPart, LocalizationQueryObjectType>();
+        services.AddTransient<IIndexAliasProvider, LocalizationPartIndexAliasProvider>();
+        services.AddWhereInputIndexPropertyProvider<LocalizedContentItemIndex>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Handlers/ContentLocalizationPartHandlerCoordinator.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Handlers/ContentLocalizationPartHandlerCoordinator.cs
index fc9b0025af7..c78de54b22c 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Handlers/ContentLocalizationPartHandlerCoordinator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Handlers/ContentLocalizationPartHandlerCoordinator.cs
@@ -5,68 +5,67 @@
 using OrchardCore.ContentManagement.Metadata;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentLocalization.Handlers
+namespace OrchardCore.ContentLocalization.Handlers;
+
+internal sealed class ContentLocalizationPartHandlerCoordinator : ContentLocalizationHandlerBase
 {
-    internal sealed class ContentLocalizationPartHandlerCoordinator : ContentLocalizationHandlerBase
-    {
-        private readonly ITypeActivatorFactory<ContentPart> _contentPartFactory;
-        private readonly IEnumerable<IContentLocalizationPartHandler> _partHandlers;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly ILogger _logger;
+    private readonly ITypeActivatorFactory<ContentPart> _contentPartFactory;
+    private readonly IEnumerable<IContentLocalizationPartHandler> _partHandlers;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ILogger _logger;
+
+    public ContentLocalizationPartHandlerCoordinator(
 
-        public ContentLocalizationPartHandlerCoordinator(
+        ITypeActivatorFactory<ContentPart> contentPartFactory,
+        IEnumerable<IContentLocalizationPartHandler> partHandlers,
+        IContentDefinitionManager contentDefinitionManager,
+        ILogger<ContentLocalizationPartHandlerCoordinator> logger
+    )
+    {
+        _contentPartFactory = contentPartFactory;
+        _partHandlers = partHandlers;
+        _contentDefinitionManager = contentDefinitionManager;
+        _logger = logger;
+    }
 
-            ITypeActivatorFactory<ContentPart> contentPartFactory,
-            IEnumerable<IContentLocalizationPartHandler> partHandlers,
-            IContentDefinitionManager contentDefinitionManager,
-            ILogger<ContentLocalizationPartHandlerCoordinator> logger
-        )
+    public override async Task LocalizingAsync(LocalizationContentContext context)
+    {
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
+        if (contentTypeDefinition == null)
         {
-            _contentPartFactory = contentPartFactory;
-            _partHandlers = partHandlers;
-            _contentDefinitionManager = contentDefinitionManager;
-            _logger = logger;
+            return;
         }
 
-        public override async Task LocalizingAsync(LocalizationContentContext context)
+        foreach (var typePartDefinition in contentTypeDefinition.Parts)
         {
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
-            if (contentTypeDefinition == null)
-            {
-                return;
-            }
+            var partName = typePartDefinition.PartDefinition.Name;
+            var activator = _contentPartFactory.GetTypeActivator(partName);
+            var part = context.ContentItem.Get(activator.Type, typePartDefinition.Name) as ContentPart;
 
-            foreach (var typePartDefinition in contentTypeDefinition.Parts)
+            if (part != null)
             {
-                var partName = typePartDefinition.PartDefinition.Name;
-                var activator = _contentPartFactory.GetTypeActivator(partName);
-                var part = context.ContentItem.Get(activator.Type, typePartDefinition.Name) as ContentPart;
-
-                if (part != null)
-                {
-                    await _partHandlers.InvokeAsync((handler, context, part) => handler.LocalizingAsync(context, part), context, part, _logger);
-                }
+                await _partHandlers.InvokeAsync((handler, context, part) => handler.LocalizingAsync(context, part), context, part, _logger);
             }
         }
+    }
 
-        public override async Task LocalizedAsync(LocalizationContentContext context)
+    public override async Task LocalizedAsync(LocalizationContentContext context)
+    {
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
+        if (contentTypeDefinition == null)
         {
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
-            if (contentTypeDefinition == null)
-            {
-                return;
-            }
+            return;
+        }
 
-            foreach (var typePartDefinition in contentTypeDefinition.Parts)
-            {
-                var partName = typePartDefinition.PartDefinition.Name;
-                var activator = _contentPartFactory.GetTypeActivator(partName);
-                var part = context.ContentItem.Get(activator.Type, typePartDefinition.Name) as ContentPart;
+        foreach (var typePartDefinition in contentTypeDefinition.Parts)
+        {
+            var partName = typePartDefinition.PartDefinition.Name;
+            var activator = _contentPartFactory.GetTypeActivator(partName);
+            var part = context.ContentItem.Get(activator.Type, typePartDefinition.Name) as ContentPart;
 
-                if (part != null)
-                {
-                    await _partHandlers.InvokeAsync((handler, context, part) => handler.LocalizedAsync(context, part), context, part, _logger);
-                }
+            if (part != null)
+            {
+                await _partHandlers.InvokeAsync((handler, context, part) => handler.LocalizedAsync(context, part), context, part, _logger);
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Handlers/LocalizationPartHandler.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Handlers/LocalizationPartHandler.cs
index 3179c8b6014..1a6c632091d 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Handlers/LocalizationPartHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Handlers/LocalizationPartHandler.cs
@@ -7,94 +7,93 @@
 using OrchardCore.Entities;
 using OrchardCore.Localization;
 
-namespace OrchardCore.ContentLocalization.Handlers
+namespace OrchardCore.ContentLocalization.Handlers;
+
+public class LocalizationPartHandler : ContentPartHandler<LocalizationPart>
 {
-    public class LocalizationPartHandler : ContentPartHandler<LocalizationPart>
+    private readonly ILocalizationEntries _entries;
+    private readonly IIdGenerator _idGenerator;
+    private readonly ILocalizationService _localizationService;
+
+    public LocalizationPartHandler(
+        ILocalizationEntries entries,
+        IIdGenerator idGenerator,
+        ILocalizationService localizationService)
     {
-        private readonly ILocalizationEntries _entries;
-        private readonly IIdGenerator _idGenerator;
-        private readonly ILocalizationService _localizationService;
+        _entries = entries;
+        _idGenerator = idGenerator;
+        _localizationService = localizationService;
+    }
 
-        public LocalizationPartHandler(
-            ILocalizationEntries entries,
-            IIdGenerator idGenerator,
-            ILocalizationService localizationService)
+    public override async Task CreatingAsync(CreateContentContext context, LocalizationPart part)
+    {
+        if (string.IsNullOrEmpty(part.LocalizationSet))
         {
-            _entries = entries;
-            _idGenerator = idGenerator;
-            _localizationService = localizationService;
+            context.ContentItem.Alter<LocalizationPart>(p =>
+                p.LocalizationSet = _idGenerator.GenerateUniqueId()
+            );
         }
 
-        public override async Task CreatingAsync(CreateContentContext context, LocalizationPart part)
+        if (string.IsNullOrEmpty(part.Culture))
         {
-            if (string.IsNullOrEmpty(part.LocalizationSet))
-            {
-                context.ContentItem.Alter<LocalizationPart>(p => 
-                    p.LocalizationSet = _idGenerator.GenerateUniqueId()
-                );
-            }
-
-            if (string.IsNullOrEmpty(part.Culture))
-            {
-                await context.ContentItem.AlterAsync<LocalizationPart>(async p => 
-                    p.Culture = await _localizationService.GetDefaultCultureAsync()
-                );
-            }
-        }
-        
-        public override Task GetContentItemAspectAsync(ContentItemAspectContext context, LocalizationPart part)
-        {
-            return context.ForAsync<CultureAspect>(cultureAspect =>
-            {
-                if (part.Culture != null)
-                {
-                    cultureAspect.Culture = CultureInfo.GetCultureInfo(part.Culture);
-                    cultureAspect.HasCulture = true;
-                }
-
-                return Task.CompletedTask;
-            });
+            await context.ContentItem.AlterAsync<LocalizationPart>(async p =>
+                p.Culture = await _localizationService.GetDefaultCultureAsync()
+            );
         }
+    }
 
-        public override Task PublishedAsync(PublishContentContext context, LocalizationPart part)
+    public override Task GetContentItemAspectAsync(ContentItemAspectContext context, LocalizationPart part)
+    {
+        return context.ForAsync<CultureAspect>(cultureAspect =>
         {
-            if (!string.IsNullOrWhiteSpace(part.LocalizationSet) && part.Culture != null)
+            if (part.Culture != null)
             {
-                // Update entries from the index table after the session is committed.
-                return _entries.UpdateEntriesAsync();
+                cultureAspect.Culture = CultureInfo.GetCultureInfo(part.Culture);
+                cultureAspect.HasCulture = true;
             }
 
             return Task.CompletedTask;
-        }
+        });
+    }
 
-        public override Task UnpublishedAsync(PublishContentContext context, LocalizationPart part)
+    public override Task PublishedAsync(PublishContentContext context, LocalizationPart part)
+    {
+        if (!string.IsNullOrWhiteSpace(part.LocalizationSet) && part.Culture != null)
         {
-            if (!string.IsNullOrWhiteSpace(part.LocalizationSet) && part.Culture != null)
-            {
-                // Update entries from the index table after the session is committed.
-                return _entries.UpdateEntriesAsync();
-            }
-
-            return Task.CompletedTask;
+            // Update entries from the index table after the session is committed.
+            return _entries.UpdateEntriesAsync();
         }
 
-        public override Task RemovedAsync(RemoveContentContext context, LocalizationPart part)
-        {
-            if (!string.IsNullOrWhiteSpace(part.LocalizationSet) && part.Culture != null && context.NoActiveVersionLeft)
-            {
-                // Update entries from the index table after the session is committed.
-                return _entries.UpdateEntriesAsync();
-            }
+        return Task.CompletedTask;
+    }
 
-            return Task.CompletedTask;
+    public override Task UnpublishedAsync(PublishContentContext context, LocalizationPart part)
+    {
+        if (!string.IsNullOrWhiteSpace(part.LocalizationSet) && part.Culture != null)
+        {
+            // Update entries from the index table after the session is committed.
+            return _entries.UpdateEntriesAsync();
         }
 
-        public override Task CloningAsync(CloneContentContext context, LocalizationPart part)
+        return Task.CompletedTask;
+    }
+
+    public override Task RemovedAsync(RemoveContentContext context, LocalizationPart part)
+    {
+        if (!string.IsNullOrWhiteSpace(part.LocalizationSet) && part.Culture != null && context.NoActiveVersionLeft)
         {
-            var clonedPart = context.CloneContentItem.As<LocalizationPart>();
-            clonedPart.LocalizationSet = string.Empty;
-            clonedPart.Apply();
-            return Task.CompletedTask;
+            // Update entries from the index table after the session is committed.
+            return _entries.UpdateEntriesAsync();
         }
+
+        return Task.CompletedTask;
+    }
+
+    public override Task CloningAsync(CloneContentContext context, LocalizationPart part)
+    {
+        var clonedPart = context.CloneContentItem.As<LocalizationPart>();
+        clonedPart.LocalizationSet = string.Empty;
+        clonedPart.Apply();
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Indexing/LocalizationPartIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Indexing/LocalizationPartIndexHandler.cs
index d5a572d55f4..f2696e72530 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Indexing/LocalizationPartIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Indexing/LocalizationPartIndexHandler.cs
@@ -2,21 +2,20 @@
 using OrchardCore.ContentLocalization.Models;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.ContentLocalization.Indexing
+namespace OrchardCore.ContentLocalization.Indexing;
+
+public class LocalizationPartIndexHandler : ContentPartIndexHandler<LocalizationPart>
 {
-    public class LocalizationPartIndexHandler : ContentPartIndexHandler<LocalizationPart>
+    public override Task BuildIndexAsync(LocalizationPart part, BuildPartIndexContext context)
     {
-        public override Task BuildIndexAsync(LocalizationPart part, BuildPartIndexContext context)
-        {
-            var options = DocumentIndexOptions.Keyword | DocumentIndexOptions.Store;
-
-            foreach (var key in context.Keys)
-            {
-                context.DocumentIndex.Set(key + ".LocalizationSet", part.LocalizationSet, options);
-                context.DocumentIndex.Set(key + ".Culture", part.Culture?.ToLowerInvariant(), options);
-            }
+        var options = DocumentIndexOptions.Keyword | DocumentIndexOptions.Store;
 
-            return Task.CompletedTask;
+        foreach (var key in context.Keys)
+        {
+            context.DocumentIndex.Set(key + ".LocalizationSet", part.LocalizationSet, options);
+            context.DocumentIndex.Set(key + ".Culture", part.Culture?.ToLowerInvariant(), options);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Liquid/ContentLocalizationFilter.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Liquid/ContentLocalizationFilter.cs
index 70c6f318c6c..945ce71fe25 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Liquid/ContentLocalizationFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Liquid/ContentLocalizationFilter.cs
@@ -4,40 +4,39 @@
 using Fluid.Values;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.ContentLocalization.Liquid
+namespace OrchardCore.ContentLocalization.Liquid;
+
+public class ContentLocalizationFilter : ILiquidFilter
 {
-    public class ContentLocalizationFilter : ILiquidFilter
+    private readonly IContentLocalizationManager _contentLocalizationManager;
+
+    public ContentLocalizationFilter(IContentLocalizationManager contentLocalizationManager)
+    {
+        _contentLocalizationManager = contentLocalizationManager;
+    }
+
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
     {
-        private readonly IContentLocalizationManager _contentLocalizationManager;
+        var locale = arguments.At(0).ToStringValue();
 
-        public ContentLocalizationFilter(IContentLocalizationManager contentLocalizationManager)
+        if (arguments.At(0).IsNil())
         {
-            _contentLocalizationManager = contentLocalizationManager;
+            locale = ctx.CultureInfo.Name;
         }
 
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+        if (input.Type == FluidValues.Array)
         {
-            var locale = arguments.At(0).ToStringValue();
+            // List of content item ids
 
-            if (arguments.At(0).IsNil())
-            {
-                locale = ctx.CultureInfo.Name;
-            }
+            var localizationSets = input.Enumerate(ctx).Select(x => x.ToStringValue()).ToArray();
 
-            if (input.Type == FluidValues.Array)
-            {
-                // List of content item ids
-
-                var localizationSets = input.Enumerate(ctx).Select(x => x.ToStringValue()).ToArray();
-
-                return FluidValue.Create(await _contentLocalizationManager.GetItemsForSetsAsync(localizationSets, locale), ctx.Options);
-            }
-            else
-            {
-                var localizationSet = input.ToStringValue();
+            return FluidValue.Create(await _contentLocalizationManager.GetItemsForSetsAsync(localizationSets, locale), ctx.Options);
+        }
+        else
+        {
+            var localizationSet = input.ToStringValue();
 
-                return FluidValue.Create(await _contentLocalizationManager.GetContentItemAsync(localizationSet, locale), ctx.Options);
-            }
+            return FluidValue.Create(await _contentLocalizationManager.GetContentItemAsync(localizationSet, locale), ctx.Options);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Liquid/SwitchCultureUrlFilter.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Liquid/SwitchCultureUrlFilter.cs
index 945a3244aaa..583ea5d6bf6 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Liquid/SwitchCultureUrlFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Liquid/SwitchCultureUrlFilter.cs
@@ -7,37 +7,36 @@
 using Microsoft.AspNetCore.Mvc.Routing;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.ContentLocalization.Liquid
+namespace OrchardCore.ContentLocalization.Liquid;
+
+public class SwitchCultureUrlFilter : ILiquidFilter
 {
-    public class SwitchCultureUrlFilter : ILiquidFilter
-    {
-        private readonly IUrlHelperFactory _urlHelperFactory;
-        private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IUrlHelperFactory _urlHelperFactory;
+    private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public SwitchCultureUrlFilter(IUrlHelperFactory urlHelperFactory, IHttpContextAccessor httpContextAccessor)
-        {
-            _urlHelperFactory = urlHelperFactory;
-            _httpContextAccessor = httpContextAccessor;
-        }
+    public SwitchCultureUrlFilter(IUrlHelperFactory urlHelperFactory, IHttpContextAccessor httpContextAccessor)
+    {
+        _urlHelperFactory = urlHelperFactory;
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
-        {
-            var urlHelper = _urlHelperFactory.GetUrlHelper(context.ViewContext);
+    public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
+    {
+        var urlHelper = _urlHelperFactory.GetUrlHelper(context.ViewContext);
 
-            var request = _httpContextAccessor.HttpContext?.Request
-                ?? throw new ArgumentException("HttpRequest missing while invoking 'switch_culture_url'");
+        var request = _httpContextAccessor.HttpContext?.Request
+            ?? throw new ArgumentException("HttpRequest missing while invoking 'switch_culture_url'");
 
-            var targetCulture = input.ToStringValue();
+        var targetCulture = input.ToStringValue();
 
-            var url = urlHelper.RouteUrl("RedirectToLocalizedContent",
-                new
-                {
-                    area = "OrchardCore.ContentLocalization",
-                    targetCulture,
-                    contentItemUrl = request.Path.Value,
-                    queryStringValue = request.QueryString.Value,
-                });
-            return new ValueTask<FluidValue>(FluidValue.Create(url, context.Options));
-        }
+        var url = urlHelper.RouteUrl("RedirectToLocalizedContent",
+            new
+            {
+                area = "OrchardCore.ContentLocalization",
+                targetCulture,
+                contentItemUrl = request.Path.Value,
+                queryStringValue = request.QueryString.Value,
+            });
+        return new ValueTask<FluidValue>(FluidValue.Create(url, context.Options));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Migrations.cs
index cf7f363d7e9..4154353993b 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Migrations.cs
@@ -9,93 +9,92 @@
 using YesSql;
 using YesSql.Sql;
 
-namespace OrchardCore.ContentLocalization.Records
+namespace OrchardCore.ContentLocalization.Records;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        public Migrations(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public Migrations(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public async Task<int> CreateAsync()
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync(nameof(LocalizationPart), builder => builder
-                .Attachable()
-                .WithDescription("Provides a way to create localized version of content."));
+    public async Task<int> CreateAsync()
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync(nameof(LocalizationPart), builder => builder
+            .Attachable()
+            .WithDescription("Provides a way to create localized version of content."));
 
-            await SchemaBuilder.CreateMapIndexTableAsync<LocalizedContentItemIndex>(table => table
-                .Column<string>("LocalizationSet", col => col.WithLength(26))
-                .Column<string>("Culture", col => col.WithLength(16))
-                .Column<string>("ContentItemId", c => c.WithLength(26))
-                .Column<bool>("Published")
-                .Column<bool>("Latest")
-            );
+        await SchemaBuilder.CreateMapIndexTableAsync<LocalizedContentItemIndex>(table => table
+            .Column<string>("LocalizationSet", col => col.WithLength(26))
+            .Column<string>("Culture", col => col.WithLength(16))
+            .Column<string>("ContentItemId", c => c.WithLength(26))
+            .Column<bool>("Published")
+            .Column<bool>("Latest")
+        );
 
-            await SchemaBuilder.AlterIndexTableAsync<LocalizedContentItemIndex>(table => table
-                .CreateIndex("IDX_LocalizationPartIndex_DocumentId",
-                "DocumentId",
-                "LocalizationSet",
-                "Culture",
-                "ContentItemId",
-                "Published",
-                "Latest")
-            );
+        await SchemaBuilder.AlterIndexTableAsync<LocalizedContentItemIndex>(table => table
+            .CreateIndex("IDX_LocalizationPartIndex_DocumentId",
+            "DocumentId",
+            "LocalizationSet",
+            "Culture",
+            "ContentItemId",
+            "Published",
+            "Latest")
+        );
 
-            // Shortcut other migration steps on new content definition schemas.
-            return 4;
-        }
+        // Shortcut other migration steps on new content definition schemas.
+        return 4;
+    }
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom1Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<LocalizedContentItemIndex>(table => table
-                .AddColumn<bool>(nameof(LocalizedContentItemIndex.Published)));
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom1Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<LocalizedContentItemIndex>(table => table
+            .AddColumn<bool>(nameof(LocalizedContentItemIndex.Published)));
 
-            return 2;
-        }
+        return 2;
+    }
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom2Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<LocalizedContentItemIndex>(table => table
-                .AddColumn<bool>(nameof(LocalizedContentItemIndex.Latest))
-            );
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom2Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<LocalizedContentItemIndex>(table => table
+            .AddColumn<bool>(nameof(LocalizedContentItemIndex.Latest))
+        );
 
-            await SchemaBuilder.AlterIndexTableAsync<LocalizedContentItemIndex>(table => table
-                .CreateIndex("IDX_LocalizationPartIndex_DocumentId",
-                "DocumentId",
-                "LocalizationSet",
-                "Culture",
-                "ContentItemId",
-                "Published",
-                "Latest")
-            );
+        await SchemaBuilder.AlterIndexTableAsync<LocalizedContentItemIndex>(table => table
+            .CreateIndex("IDX_LocalizationPartIndex_DocumentId",
+            "DocumentId",
+            "LocalizationSet",
+            "Culture",
+            "ContentItemId",
+            "Published",
+            "Latest")
+        );
 
-            return 3;
-        }
+        return 3;
+    }
 
-        // Migrate null LocalizedContentItemIndex Latest column.
+    // Migrate null LocalizedContentItemIndex Latest column.
 #pragma warning disable CA1822 // Mark members as static
-        public int UpdateFrom3()
+    public int UpdateFrom3()
 #pragma warning restore CA1822 // Mark members as static
+    {
+        // Defer this until after the subsequent migrations have succeeded as the schema has changed.
+        ShellScope.AddDeferredTask(async scope =>
         {
-            // Defer this until after the subsequent migrations have succeeded as the schema has changed.
-            ShellScope.AddDeferredTask(async scope =>
-            {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
-                var localizedContentItems = await session.Query<ContentItem, LocalizedContentItemIndex>().ListAsync();
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
+            var localizedContentItems = await session.Query<ContentItem, LocalizedContentItemIndex>().ListAsync();
 
-                foreach (var localizedContentItem in localizedContentItems)
-                {
-                    localizedContentItem.Latest = localizedContentItem.ContentItem.Latest;
-                    await session.SaveAsync(localizedContentItem);
-                }
-            });
+            foreach (var localizedContentItem in localizedContentItems)
+            {
+                localizedContentItem.Latest = localizedContentItem.ContentItem.Latest;
+                await session.SaveAsync(localizedContentItem);
+            }
+        });
 
-            return 4;
-        }
+        return 4;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Models/ContentCulturePickerSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Models/ContentCulturePickerSettings.cs
index fc858228fb4..92f6223d4f7 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Models/ContentCulturePickerSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Models/ContentCulturePickerSettings.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.ContentLocalization.Models
+namespace OrchardCore.ContentLocalization.Models;
+
+public class ContentCulturePickerSettings
 {
-    public class ContentCulturePickerSettings
-    {
-        public bool RedirectToHomepage { get; set; }
-        public bool SetCookie { get; set; } = true;
-    }
+    public bool RedirectToHomepage { get; set; }
+    public bool SetCookie { get; set; } = true;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Models/ContentRequestCultureProviderSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Models/ContentRequestCultureProviderSettings.cs
index a135b81baf7..809bc62607a 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Models/ContentRequestCultureProviderSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Models/ContentRequestCultureProviderSettings.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.ContentLocalization.Models
+namespace OrchardCore.ContentLocalization.Models;
+
+public class ContentRequestCultureProviderSettings
 {
-    public class ContentRequestCultureProviderSettings
-    {
-        public bool SetCookie { get; set; }
-    }
+    public bool SetCookie { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Security/LocalizeContentAuthorizationHandler.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Security/LocalizeContentAuthorizationHandler.cs
index a76736462c7..99980d5015e 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Security/LocalizeContentAuthorizationHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Security/LocalizeContentAuthorizationHandler.cs
@@ -7,80 +7,79 @@
 using OrchardCore.Security;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.ContentLocalization.Security
+namespace OrchardCore.ContentLocalization.Security;
+
+public class LocalizeContentAuthorizationHandler : AuthorizationHandler<PermissionRequirement>
 {
-    public class LocalizeContentAuthorizationHandler : AuthorizationHandler<PermissionRequirement>
+    private readonly IServiceProvider _serviceProvider;
+    private IAuthorizationService _authorizationService;
+
+    public LocalizeContentAuthorizationHandler(IServiceProvider serviceProvider)
     {
-        private readonly IServiceProvider _serviceProvider;
-        private IAuthorizationService _authorizationService;
+        _serviceProvider = serviceProvider;
+    }
 
-        public LocalizeContentAuthorizationHandler(IServiceProvider serviceProvider)
+    protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement)
+    {
+        if (context.HasSucceeded)
         {
-            _serviceProvider = serviceProvider;
+            // This handler is not revoking any pre-existing grants.
+            return;
         }
 
-        protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement)
+        if (context.Resource == null)
         {
-            if (context.HasSucceeded)
-            {
-                // This handler is not revoking any pre-existing grants.
-                return;
-            }
-
-            if (context.Resource == null)
-            {
-                return;
-            }
-
-            var contentItem = context.Resource as ContentItem;
-
-            Permission permission = null;
-
-            if (contentItem != null)
-            {
-                if (OwnerVariationExists(requirement.Permission) && HasOwnership(context.User, contentItem))
-                {
-                    permission = GetOwnerVariation(requirement.Permission);
-                }
-            }
+            return;
+        }
 
-            if (permission == null)
-            {
-                return;
-            }
+        var contentItem = context.Resource as ContentItem;
 
-            // Lazy load to prevent circular dependencies
-            _authorizationService ??= _serviceProvider.GetService<IAuthorizationService>();
+        Permission permission = null;
 
-            if (await _authorizationService.AuthorizeAsync(context.User, permission))
+        if (contentItem != null)
+        {
+            if (OwnerVariationExists(requirement.Permission) && HasOwnership(context.User, contentItem))
             {
-                context.Succeed(requirement);
+                permission = GetOwnerVariation(requirement.Permission);
             }
         }
 
-        private static Permission GetOwnerVariation(Permission permission)
+        if (permission == null)
         {
-            if (permission.Name == Permissions.LocalizeContent.Name)
-            {
-                return Permissions.LocalizeOwnContent;
-            }
-
-            return null;
+            return;
         }
 
-        private static bool HasOwnership(ClaimsPrincipal user, ContentItem content)
+        // Lazy load to prevent circular dependencies
+        _authorizationService ??= _serviceProvider.GetService<IAuthorizationService>();
+
+        if (await _authorizationService.AuthorizeAsync(context.User, permission))
         {
-            if (user == null || content == null)
-            {
-                return false;
-            }
+            context.Succeed(requirement);
+        }
+    }
 
-            return user.FindFirstValue(ClaimTypes.NameIdentifier) == content.Owner;
+    private static Permission GetOwnerVariation(Permission permission)
+    {
+        if (permission.Name == Permissions.LocalizeContent.Name)
+        {
+            return Permissions.LocalizeOwnContent;
         }
 
-        private static bool OwnerVariationExists(Permission permission)
+        return null;
+    }
+
+    private static bool HasOwnership(ClaimsPrincipal user, ContentItem content)
+    {
+        if (user == null || content == null)
         {
-            return GetOwnerVariation(permission) != null;
+            return false;
         }
+
+        return user.FindFirstValue(ClaimTypes.NameIdentifier) == content.Owner;
+    }
+
+    private static bool OwnerVariationExists(Permission permission)
+    {
+        return GetOwnerVariation(permission) != null;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ServiceCollectionExtensions.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ServiceCollectionExtensions.cs
index 763badabe2e..7bae62697ad 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ServiceCollectionExtensions.cs
@@ -10,26 +10,25 @@
 using OrchardCore.Data;
 using OrchardCore.Data.Migration;
 
-namespace OrchardCore.ContentLocalization
+namespace OrchardCore.ContentLocalization;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    public static IServiceCollection AddContentLocalization(this IServiceCollection services)
     {
-        public static IServiceCollection AddContentLocalization(this IServiceCollection services)
-        {
-            services.AddContentPart<LocalizationPart>()
-                .UseDisplayDriver<LocalizationPartDisplayDriver>()
-                .AddHandler<LocalizationPartHandler>();
+        services.AddContentPart<LocalizationPart>()
+            .UseDisplayDriver<LocalizationPartDisplayDriver>()
+            .AddHandler<LocalizationPartHandler>();
 
-            services.TryAddScoped<IContentLocalizationManager, DefaultContentLocalizationManager>();
+        services.TryAddScoped<IContentLocalizationManager, DefaultContentLocalizationManager>();
 
-            services.AddScoped<LocalizedContentItemIndexProvider>();
-            services.AddScoped<IScopedIndexProvider>(sp => sp.GetRequiredService<LocalizedContentItemIndexProvider>());
-            services.AddScoped<IContentHandler>(sp => sp.GetRequiredService<LocalizedContentItemIndexProvider>());
+        services.AddScoped<LocalizedContentItemIndexProvider>();
+        services.AddScoped<IScopedIndexProvider>(sp => sp.GetRequiredService<LocalizedContentItemIndexProvider>());
+        services.AddScoped<IContentHandler>(sp => sp.GetRequiredService<LocalizedContentItemIndexProvider>());
 
-            services.AddDataMigration<Migrations>();
-            services.AddScoped<IContentLocalizationHandler, ContentLocalizationPartHandlerCoordinator>();
+        services.AddDataMigration<Migrations>();
+        services.AddScoped<IContentLocalizationHandler, ContentLocalizationPartHandlerCoordinator>();
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/ContentCulturePickerService.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/ContentCulturePickerService.cs
index 6ef78e2e22e..d7d2497af71 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/ContentCulturePickerService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/ContentCulturePickerService.cs
@@ -8,109 +8,108 @@
 using OrchardCore.ContentManagement.Routing;
 using OrchardCore.Settings;
 
-namespace OrchardCore.ContentLocalization.Services
+namespace OrchardCore.ContentLocalization.Services;
+
+public class ContentCulturePickerService : IContentCulturePickerService
 {
-    public class ContentCulturePickerService : IContentCulturePickerService
+    private readonly IAutorouteEntries _autorouteEntries;
+    private readonly ILocalizationEntries _localizationEntries;
+    private readonly ISiteService _siteService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly CulturePickerOptions _culturePickerOptions;
+
+    public ContentCulturePickerService(
+        IAutorouteEntries autorouteEntries,
+        ILocalizationEntries localizationEntries,
+        ISiteService siteService,
+        IHttpContextAccessor httpContextAccessor,
+        IOptions<CulturePickerOptions> culturePickerOptions)
     {
-        private readonly IAutorouteEntries _autorouteEntries;
-        private readonly ILocalizationEntries _localizationEntries;
-        private readonly ISiteService _siteService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly CulturePickerOptions _culturePickerOptions;
-
-        public ContentCulturePickerService(
-            IAutorouteEntries autorouteEntries,
-            ILocalizationEntries localizationEntries,
-            ISiteService siteService,
-            IHttpContextAccessor httpContextAccessor,
-            IOptions<CulturePickerOptions> culturePickerOptions)
-        {
-            _autorouteEntries = autorouteEntries;
-            _localizationEntries = localizationEntries;
-            _siteService = siteService;
-            _httpContextAccessor = httpContextAccessor;
-            _culturePickerOptions = culturePickerOptions.Value;
-        }
+        _autorouteEntries = autorouteEntries;
+        _localizationEntries = localizationEntries;
+        _siteService = siteService;
+        _httpContextAccessor = httpContextAccessor;
+        _culturePickerOptions = culturePickerOptions.Value;
+    }
 
-        public async Task<string> GetContentItemIdFromRouteAsync(PathString url)
+    public async Task<string> GetContentItemIdFromRouteAsync(PathString url)
+    {
+        if (!url.HasValue)
         {
-            if (!url.HasValue)
-            {
-                url = "/";
-            }
+            url = "/";
+        }
 
-            string contentItemId = null;
+        string contentItemId = null;
 
-            if (url == "/")
-            {
-                // get contentItemId from homeroute
-                var siteSettings = await _siteService.GetSiteSettingsAsync();
-                contentItemId = siteSettings.HomeRoute["contentItemId"]?.ToString();
-            }
-            else
-            {
-                // Try to get from autorouteEntries.
-                // This should not consider contained items, so will redirect to the parent item.
-                (var found, var entry) = await _autorouteEntries.TryGetEntryByPathAsync(url.Value);
-
-                if (found)
-                {
-                    contentItemId = entry.ContentItemId;
-                }
-            }
+        if (url == "/")
+        {
+            // get contentItemId from homeroute
+            var siteSettings = await _siteService.GetSiteSettingsAsync();
+            contentItemId = siteSettings.HomeRoute["contentItemId"]?.ToString();
+        }
+        else
+        {
+            // Try to get from autorouteEntries.
+            // This should not consider contained items, so will redirect to the parent item.
+            (var found, var entry) = await _autorouteEntries.TryGetEntryByPathAsync(url.Value);
 
-            if (string.IsNullOrEmpty(contentItemId))
+            if (found)
             {
-                return null;
+                contentItemId = entry.ContentItemId;
             }
+        }
 
-            return contentItemId;
+        if (string.IsNullOrEmpty(contentItemId))
+        {
+            return null;
         }
 
-        public async Task<LocalizationEntry> GetLocalizationFromRouteAsync(PathString url)
+        return contentItemId;
+    }
+
+    public async Task<LocalizationEntry> GetLocalizationFromRouteAsync(PathString url)
+    {
+        var contentItemId = await GetContentItemIdFromRouteAsync(url);
+
+        if (!string.IsNullOrEmpty(contentItemId))
         {
-            var contentItemId = await GetContentItemIdFromRouteAsync(url);
+            (var found, var localization) = await _localizationEntries.TryGetLocalizationAsync(contentItemId);
 
-            if (!string.IsNullOrEmpty(contentItemId))
+            if (found)
             {
-                (var found, var localization) = await _localizationEntries.TryGetLocalizationAsync(contentItemId);
-
-                if (found)
-                {
-                    return localization;
-                }
+                return localization;
             }
-
-            return null;
         }
 
-        public async Task<IEnumerable<LocalizationEntry>> GetLocalizationsFromRouteAsync(PathString url)
+        return null;
+    }
+
+    public async Task<IEnumerable<LocalizationEntry>> GetLocalizationsFromRouteAsync(PathString url)
+    {
+        var contentItemId = await GetContentItemIdFromRouteAsync(url);
+
+        if (!string.IsNullOrEmpty(contentItemId))
         {
-            var contentItemId = await GetContentItemIdFromRouteAsync(url);
+            (var found, var localization) = await _localizationEntries.TryGetLocalizationAsync(contentItemId);
 
-            if (!string.IsNullOrEmpty(contentItemId))
+            if (found)
             {
-                (var found, var localization) = await _localizationEntries.TryGetLocalizationAsync(contentItemId);
-
-                if (found)
-                {
-                    return await _localizationEntries.GetLocalizationsAsync(localization.LocalizationSet);
-                }
+                return await _localizationEntries.GetLocalizationsAsync(localization.LocalizationSet);
             }
-
-            return [];
         }
 
-        public void SetContentCulturePickerCookie(string targetCulture)
-        {
-            var response = _httpContextAccessor.HttpContext.Response;
-            // Set the cookie to handle redirecting to a custom controller
-            response.Cookies.Delete(CookieRequestCultureProvider.DefaultCookieName);
-            response.Cookies.Append(
-                CookieRequestCultureProvider.DefaultCookieName,
-                CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(targetCulture)),
-                new CookieOptions { Expires = DateTime.UtcNow.AddDays(_culturePickerOptions.CookieLifeTime) }
-            );
-        }
+        return [];
+    }
+
+    public void SetContentCulturePickerCookie(string targetCulture)
+    {
+        var response = _httpContextAccessor.HttpContext.Response;
+        // Set the cookie to handle redirecting to a custom controller
+        response.Cookies.Delete(CookieRequestCultureProvider.DefaultCookieName);
+        response.Cookies.Append(
+            CookieRequestCultureProvider.DefaultCookieName,
+            CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(targetCulture)),
+            new CookieOptions { Expires = DateTime.UtcNow.AddDays(_culturePickerOptions.CookieLifeTime) }
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/IContentCulturePickerService.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/IContentCulturePickerService.cs
index 193ed9ef8b1..1e5ea8ddd5c 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/IContentCulturePickerService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/IContentCulturePickerService.cs
@@ -3,28 +3,27 @@
 using Microsoft.AspNetCore.Http;
 using OrchardCore.ContentLocalization.Models;
 
-namespace OrchardCore.ContentLocalization.Services
+namespace OrchardCore.ContentLocalization.Services;
+
+public interface IContentCulturePickerService
 {
-    public interface IContentCulturePickerService
-    {
-        /// <summary>
-        /// Get the ContentItemId that matches the url.
-        /// </summary>
-        /// <returns>ContentItemId or null if not found.</returns>
-        Task<string> GetContentItemIdFromRouteAsync(PathString url);
-        /// <summary>
-        /// Get the Localization of the ContentItem from an url.
-        /// </summary>
-        /// <returns>Culture or null if not found.</returns>
-        Task<LocalizationEntry> GetLocalizationFromRouteAsync(PathString url);
-        /// <summary>
-        /// Get the Localizations of the LocalizationSet from a URL.
-        /// </summary>
-        /// <returns>List of Localization for the url or null if not found.</returns>
-        Task<IEnumerable<LocalizationEntry>> GetLocalizationsFromRouteAsync(PathString url);
-        /// <summary>
-        /// Sets the culture cookie to the target culture.
-        /// </summary>
-        void SetContentCulturePickerCookie(string targetCulture);
-    }
+    /// <summary>
+    /// Get the ContentItemId that matches the url.
+    /// </summary>
+    /// <returns>ContentItemId or null if not found.</returns>
+    Task<string> GetContentItemIdFromRouteAsync(PathString url);
+    /// <summary>
+    /// Get the Localization of the ContentItem from an url.
+    /// </summary>
+    /// <returns>Culture or null if not found.</returns>
+    Task<LocalizationEntry> GetLocalizationFromRouteAsync(PathString url);
+    /// <summary>
+    /// Get the Localizations of the LocalizationSet from a URL.
+    /// </summary>
+    /// <returns>List of Localization for the url or null if not found.</returns>
+    Task<IEnumerable<LocalizationEntry>> GetLocalizationsFromRouteAsync(PathString url);
+    /// <summary>
+    /// Sets the culture cookie to the target culture.
+    /// </summary>
+    void SetContentCulturePickerCookie(string targetCulture);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/ILocalizationEntries.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/ILocalizationEntries.cs
index 49648ee78c7..87136dc5174 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/ILocalizationEntries.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/ILocalizationEntries.cs
@@ -2,12 +2,11 @@
 using System.Threading.Tasks;
 using OrchardCore.ContentLocalization.Models;
 
-namespace OrchardCore.ContentLocalization.Services
+namespace OrchardCore.ContentLocalization.Services;
+
+public interface ILocalizationEntries
 {
-    public interface ILocalizationEntries
-    {
-        Task<(bool, LocalizationEntry)> TryGetLocalizationAsync(string contentItemId);
-        Task<IEnumerable<LocalizationEntry>> GetLocalizationsAsync(string localizationSet);
-        Task UpdateEntriesAsync();
-    }
+    Task<(bool, LocalizationEntry)> TryGetLocalizationAsync(string contentItemId);
+    Task<IEnumerable<LocalizationEntry>> GetLocalizationsAsync(string localizationSet);
+    Task UpdateEntriesAsync();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/LocalizationEntries.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/LocalizationEntries.cs
index 450ca837b34..df674b1ab64 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/LocalizationEntries.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/LocalizationEntries.cs
@@ -10,194 +10,154 @@
 using OrchardCore.Environment.Shell.Scope;
 using YesSql;
 
-namespace OrchardCore.ContentLocalization.Services
+namespace OrchardCore.ContentLocalization.Services;
+
+public class LocalizationEntries : ILocalizationEntries
 {
-    public class LocalizationEntries : ILocalizationEntries
-    {
-        private readonly IVolatileDocumentManager<LocalizationStateDocument> _localizationStateManager;
+    private readonly IVolatileDocumentManager<LocalizationStateDocument> _localizationStateManager;
+
+    private ImmutableDictionary<string, LocalizationEntry> _localizations = ImmutableDictionary<string, LocalizationEntry>.Empty;
 
-        private ImmutableDictionary<string, LocalizationEntry> _localizations = ImmutableDictionary<string, LocalizationEntry>.Empty;
+    private ImmutableDictionary<string, ImmutableList<LocalizationEntry>> _localizationSets =
+        ImmutableDictionary<string, ImmutableList<LocalizationEntry>>.Empty;
 
-        private ImmutableDictionary<string, ImmutableList<LocalizationEntry>> _localizationSets =
-            ImmutableDictionary<string, ImmutableList<LocalizationEntry>>.Empty;
+    private readonly SemaphoreSlim _semaphore = new(1);
 
-        private readonly SemaphoreSlim _semaphore = new(1);
+    private long _lastIndexId;
+    private string _stateIdentifier;
+    private bool _initialized;
 
-        private long _lastIndexId;
-        private string _stateIdentifier;
-        private bool _initialized;
+    public LocalizationEntries(IVolatileDocumentManager<LocalizationStateDocument> localizationStateManager)
+    {
+        _localizationStateManager = localizationStateManager;
+    }
 
-        public LocalizationEntries(IVolatileDocumentManager<LocalizationStateDocument> localizationStateManager)
+    public async Task<(bool, LocalizationEntry)> TryGetLocalizationAsync(string contentItemId)
+    {
+        await EnsureInitializedAsync();
+
+        if (_localizations.TryGetValue(contentItemId, out var localization))
         {
-            _localizationStateManager = localizationStateManager;
+            return (true, localization);
         }
 
-        public async Task<(bool, LocalizationEntry)> TryGetLocalizationAsync(string contentItemId)
-        {
-            await EnsureInitializedAsync();
+        return (false, localization);
+    }
 
-            if (_localizations.TryGetValue(contentItemId, out var localization))
-            {
-                return (true, localization);
-            }
+    public async Task<IEnumerable<LocalizationEntry>> GetLocalizationsAsync(string localizationSet)
+    {
+        await EnsureInitializedAsync();
 
-            return (false, localization);
+        if (_localizationSets.TryGetValue(localizationSet, out var localizations))
+        {
+            return localizations;
         }
 
-        public async Task<IEnumerable<LocalizationEntry>> GetLocalizationsAsync(string localizationSet)
-        {
-            await EnsureInitializedAsync();
+        return [];
+    }
 
-            if (_localizationSets.TryGetValue(localizationSet, out var localizations))
-            {
-                return localizations;
-            }
+    public async Task UpdateEntriesAsync()
+    {
+        await EnsureInitializedAsync();
 
-            return [];
-        }
+        // Update the cache with a new state and then refresh entries as it would be done on a next request.
+        await _localizationStateManager.UpdateAsync(new LocalizationStateDocument(), afterUpdateAsync: RefreshEntriesAsync);
+    }
 
-        public async Task UpdateEntriesAsync()
+    private async Task EnsureInitializedAsync()
+    {
+        if (!_initialized)
         {
-            await EnsureInitializedAsync();
-
-            // Update the cache with a new state and then refresh entries as it would be done on a next request.
-            await _localizationStateManager.UpdateAsync(new LocalizationStateDocument(), afterUpdateAsync: RefreshEntriesAsync);
+            await InitializeEntriesAsync();
         }
-
-        private async Task EnsureInitializedAsync()
+        else
         {
-            if (!_initialized)
+            var state = await _localizationStateManager.GetOrCreateImmutableAsync();
+            if (_stateIdentifier != state.Identifier)
             {
-                await InitializeEntriesAsync();
-            }
-            else
-            {
-                var state = await _localizationStateManager.GetOrCreateImmutableAsync();
-                if (_stateIdentifier != state.Identifier)
-                {
-                    await RefreshEntriesAsync(state);
-                }
+                await RefreshEntriesAsync(state);
             }
         }
+    }
 
-        protected void AddEntries(IEnumerable<LocalizationEntry> entries)
+    protected void AddEntries(IEnumerable<LocalizationEntry> entries)
+    {
+        foreach (var entry in entries)
         {
-            foreach (var entry in entries)
+            if (_localizations.ContainsKey(entry.ContentItemId))
             {
-                if (_localizations.ContainsKey(entry.ContentItemId))
-                {
-                    continue;
-                }
-
-                _localizations = _localizations.SetItem(entry.ContentItemId, entry);
+                continue;
+            }
 
-                if (_localizationSets.TryGetValue(entry.LocalizationSet, out var localizations))
-                {
-                    localizations = localizations.Add(entry);
-                }
-                else
-                {
-                    localizations = [entry];
-                }
+            _localizations = _localizations.SetItem(entry.ContentItemId, entry);
 
-                _localizationSets = _localizationSets.SetItem(entry.LocalizationSet, localizations);
+            if (_localizationSets.TryGetValue(entry.LocalizationSet, out var localizations))
+            {
+                localizations = localizations.Add(entry);
             }
-        }
-
-        protected void RemoveEntries(IEnumerable<LocalizationEntry> entries)
-        {
-            foreach (var entry in entries)
+            else
             {
-                if (!_localizations.ContainsKey(entry.ContentItemId))
-                {
-                    continue;
-                }
-
-                _localizations = _localizations.Remove(entry.ContentItemId);
-
-                if (_localizationSets.TryGetValue(entry.LocalizationSet, out var localizations))
-                {
-                    localizations = localizations.RemoveAll(l => l.Culture == entry.Culture);
-                    _localizationSets = _localizationSets.SetItem(entry.LocalizationSet, localizations);
-                }
+                localizations = [entry];
             }
+
+            _localizationSets = _localizationSets.SetItem(entry.LocalizationSet, localizations);
         }
+    }
 
-        private async Task RefreshEntriesAsync(LocalizationStateDocument state)
+    protected void RemoveEntries(IEnumerable<LocalizationEntry> entries)
+    {
+        foreach (var entry in entries)
         {
-            if (_stateIdentifier == state.Identifier)
+            if (!_localizations.ContainsKey(entry.ContentItemId))
             {
-                return;
+                continue;
             }
 
-            await _semaphore.WaitAsync();
-            try
-            {
-                if (_stateIdentifier != state.Identifier)
-                {
-                    var indexes = await Session
-                        .QueryIndex<LocalizedContentItemIndex>(i => i.Id > _lastIndexId)
-                        .OrderBy(i => i.Id)
-                        .ListAsync();
-
-                    // A draft is indexed to check for conflicts, and to remove an entry, but only if an item is unpublished,
-                    // so only if the entry 'DocumentId' matches, this because when a draft is saved more than once, the index
-                    // is not updated for the published version that may be already scanned, so the entry may not be re-added.
-
-                    var entriesToRemove = indexes
-                        .Where(i => !i.Published || i.Culture == null)
-                        .SelectMany(i => _localizations.Values.Where(e =>
-                            // The item was removed.
-                            ((!i.Published && !i.Latest) ||
-                            // The part was removed.
-                            (i.Culture == null && i.Published) ||
-                            // The item was unpublished.
-                            (!i.Published && e.DocumentId == i.DocumentId)) &&
-                            (e.ContentItemId == i.ContentItemId)));
-
-                    var entriesToAdd = indexes.
-                        Where(i => i.Published && i.Culture != null)
-                        .Select(i => new LocalizationEntry
-                        {
-                            DocumentId = i.DocumentId,
-                            ContentItemId = i.ContentItemId,
-                            LocalizationSet = i.LocalizationSet,
-                            Culture = i.Culture.ToLowerInvariant()
-                        });
-
-                    RemoveEntries(entriesToRemove);
-                    AddEntries(entriesToAdd);
-
-                    _lastIndexId = indexes.LastOrDefault()?.Id ?? 0;
-                    _stateIdentifier = state.Identifier;
-                }
-            }
-            finally
+            _localizations = _localizations.Remove(entry.ContentItemId);
+
+            if (_localizationSets.TryGetValue(entry.LocalizationSet, out var localizations))
             {
-                _semaphore.Release();
+                localizations = localizations.RemoveAll(l => l.Culture == entry.Culture);
+                _localizationSets = _localizationSets.SetItem(entry.LocalizationSet, localizations);
             }
         }
+    }
 
-        protected virtual async Task InitializeEntriesAsync()
+    private async Task RefreshEntriesAsync(LocalizationStateDocument state)
+    {
+        if (_stateIdentifier == state.Identifier)
         {
-            if (_initialized)
-            {
-                return;
-            }
+            return;
+        }
 
-            await _semaphore.WaitAsync();
-            try
+        await _semaphore.WaitAsync();
+        try
+        {
+            if (_stateIdentifier != state.Identifier)
             {
-                if (!_initialized)
-                {
-                    var state = await _localizationStateManager.GetOrCreateImmutableAsync();
-
-                    var indexes = await Session
-                        .QueryIndex<LocalizedContentItemIndex>(i => i.Published && i.Culture != null)
-                        .OrderBy(i => i.Id)
-                        .ListAsync();
-
-                    var entries = indexes.Select(i => new LocalizationEntry
+                var indexes = await Session
+                    .QueryIndex<LocalizedContentItemIndex>(i => i.Id > _lastIndexId)
+                    .OrderBy(i => i.Id)
+                    .ListAsync();
+
+                // A draft is indexed to check for conflicts, and to remove an entry, but only if an item is unpublished,
+                // so only if the entry 'DocumentId' matches, this because when a draft is saved more than once, the index
+                // is not updated for the published version that may be already scanned, so the entry may not be re-added.
+
+                var entriesToRemove = indexes
+                    .Where(i => !i.Published || i.Culture == null)
+                    .SelectMany(i => _localizations.Values.Where(e =>
+                        // The item was removed.
+                        ((!i.Published && !i.Latest) ||
+                        // The part was removed.
+                        (i.Culture == null && i.Published) ||
+                        // The item was unpublished.
+                        (!i.Published && e.DocumentId == i.DocumentId)) &&
+                        (e.ContentItemId == i.ContentItemId)));
+
+                var entriesToAdd = indexes.
+                    Where(i => i.Published && i.Culture != null)
+                    .Select(i => new LocalizationEntry
                     {
                         DocumentId = i.DocumentId,
                         ContentItemId = i.ContentItemId,
@@ -205,20 +165,59 @@ protected virtual async Task InitializeEntriesAsync()
                         Culture = i.Culture.ToLowerInvariant()
                     });
 
-                    AddEntries(entries);
+                RemoveEntries(entriesToRemove);
+                AddEntries(entriesToAdd);
 
-                    _lastIndexId = indexes.LastOrDefault()?.Id ?? 0;
-                    _stateIdentifier = state.Identifier;
-
-                    _initialized = true;
-                }
+                _lastIndexId = indexes.LastOrDefault()?.Id ?? 0;
+                _stateIdentifier = state.Identifier;
             }
-            finally
+        }
+        finally
+        {
+            _semaphore.Release();
+        }
+    }
+
+    protected virtual async Task InitializeEntriesAsync()
+    {
+        if (_initialized)
+        {
+            return;
+        }
+
+        await _semaphore.WaitAsync();
+        try
+        {
+            if (!_initialized)
             {
-                _semaphore.Release();
+                var state = await _localizationStateManager.GetOrCreateImmutableAsync();
+
+                var indexes = await Session
+                    .QueryIndex<LocalizedContentItemIndex>(i => i.Published && i.Culture != null)
+                    .OrderBy(i => i.Id)
+                    .ListAsync();
+
+                var entries = indexes.Select(i => new LocalizationEntry
+                {
+                    DocumentId = i.DocumentId,
+                    ContentItemId = i.ContentItemId,
+                    LocalizationSet = i.LocalizationSet,
+                    Culture = i.Culture.ToLowerInvariant()
+                });
+
+                AddEntries(entries);
+
+                _lastIndexId = indexes.LastOrDefault()?.Id ?? 0;
+                _stateIdentifier = state.Identifier;
+
+                _initialized = true;
             }
         }
-
-        private static ISession Session => ShellScope.Services.GetRequiredService<ISession>();
+        finally
+        {
+            _semaphore.Release();
+        }
     }
+
+    private static ISession Session => ShellScope.Services.GetRequiredService<ISession>();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/LocalizationPartContentsAdminListFilter.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/LocalizationPartContentsAdminListFilter.cs
index 69cc22a8d3b..91a048e6439 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/LocalizationPartContentsAdminListFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/LocalizationPartContentsAdminListFilter.cs
@@ -11,35 +11,34 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.ContentLocalization.Services
+namespace OrchardCore.ContentLocalization.Services;
+
+public class LocalizationPartContentsAdminListFilter : IContentsAdminListFilter
 {
-    public class LocalizationPartContentsAdminListFilter : IContentsAdminListFilter
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+
+    public LocalizationPartContentsAdminListFilter(IContentDefinitionManager contentDefinitionManager)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public LocalizationPartContentsAdminListFilter(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public async Task FilterAsync(ContentOptionsViewModel model, IQuery<ContentItem> query, IUpdateModel updater)
+    {
+        var viewModel = new LocalizationContentsAdminFilterViewModel();
+        await updater.TryUpdateModelAsync(viewModel, "Localization");
 
-        public async Task FilterAsync(ContentOptionsViewModel model, IQuery<ContentItem> query, IUpdateModel updater)
+        // Show localization content items
+        // This is intended to be used by adding ?Localization.ShowLocalizedContentTypes to an AdminMenu url.
+        if (viewModel.ShowLocalizedContentTypes)
         {
-            var viewModel = new LocalizationContentsAdminFilterViewModel();
-            await updater.TryUpdateModelAsync(viewModel, "Localization");
-
-            // Show localization content items
-            // This is intended to be used by adding ?Localization.ShowLocalizedContentTypes to an AdminMenu url.
-            if (viewModel.ShowLocalizedContentTypes)
-            {
-                var localizedTypes = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
-                    .Where(x =>
-                        x.Parts.Any(p =>
-                            p.PartDefinition.Name == nameof(LocalizationPart)))
-                    .Select(x => x.Name);
+            var localizedTypes = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
+                .Where(x =>
+                    x.Parts.Any(p =>
+                        p.PartDefinition.Name == nameof(LocalizationPart)))
+                .Select(x => x.Name);
 
-                query.With<ContentItemIndex>(x => x.ContentType.IsIn(localizedTypes));
+            query.With<ContentItemIndex>(x => x.ContentType.IsIn(localizedTypes));
 
-            }
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/LocalizationPartContentsAdminListFilterProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/LocalizationPartContentsAdminListFilterProvider.cs
index efe2737a967..dab20e98358 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/LocalizationPartContentsAdminListFilterProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/LocalizationPartContentsAdminListFilterProvider.cs
@@ -4,33 +4,32 @@
 using OrchardCore.Contents.Services;
 using YesSql.Filters.Query;
 
-namespace OrchardCore.ContentLocalization.Services
+namespace OrchardCore.ContentLocalization.Services;
+
+public class LocalizationPartContentsAdminListFilterProvider : IContentsAdminListFilterProvider
 {
-    public class LocalizationPartContentsAdminListFilterProvider : IContentsAdminListFilterProvider
+    public void Build(QueryEngineBuilder<ContentItem> builder)
     {
-        public void Build(QueryEngineBuilder<ContentItem> builder)
-        {
-            builder
-                .WithNamedTerm("culture", builder => builder
-                    .OneCondition<ContentItem>((val, query) =>
+        builder
+            .WithNamedTerm("culture", builder => builder
+                .OneCondition<ContentItem>((val, query) =>
+                {
+                    if (!string.IsNullOrEmpty(val))
                     {
-                        if (!string.IsNullOrEmpty(val))
-                        {
-                            query.With<LocalizedContentItemIndex>(i => (i.Published || i.Latest) && i.Culture == val);
-                        }
+                        query.With<LocalizedContentItemIndex>(i => (i.Published || i.Latest) && i.Culture == val);
+                    }
 
-                        return query;
-                    })
-                    .MapTo<LocalizationContentsAdminFilterViewModel>((val, model) => model.SelectedCulture = val)
-                    .MapFrom<LocalizationContentsAdminFilterViewModel>((model) =>
+                    return query;
+                })
+                .MapTo<LocalizationContentsAdminFilterViewModel>((val, model) => model.SelectedCulture = val)
+                .MapFrom<LocalizationContentsAdminFilterViewModel>((model) =>
+                {
+                    if (!string.IsNullOrEmpty(model.SelectedCulture))
                     {
-                        if (!string.IsNullOrEmpty(model.SelectedCulture))
-                        {
-                            return (true, model.SelectedCulture);
-                        }
-                        return (false, string.Empty);
-                    })
-                );
-        }
+                        return (true, model.SelectedCulture);
+                    }
+                    return (false, string.Empty);
+                })
+            );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/LocalizationStateDocument.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/LocalizationStateDocument.cs
index 37f14d5a46d..4aac0dc2b6b 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/LocalizationStateDocument.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Services/LocalizationStateDocument.cs
@@ -1,8 +1,7 @@
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.ContentLocalization.Services
+namespace OrchardCore.ContentLocalization.Services;
+
+public class LocalizationStateDocument : Document
 {
-    public class LocalizationStateDocument : Document
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Sitemaps/LocalizedContentItemsQueryProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Sitemaps/LocalizedContentItemsQueryProvider.cs
index 3d8488c96a0..a77e0717bb8 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Sitemaps/LocalizedContentItemsQueryProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Sitemaps/LocalizedContentItemsQueryProvider.cs
@@ -12,114 +12,113 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.ContentLocalization.Sitemaps
+namespace OrchardCore.ContentLocalization.Sitemaps;
+
+public class LocalizedContentItemsQueryProvider : IContentItemsQueryProvider
 {
-    public class LocalizedContentItemsQueryProvider : IContentItemsQueryProvider
+    private readonly ISession _session;
+    private readonly IRouteableContentTypeCoordinator _routeableContentTypeCoordinator;
+    private readonly ILocalizationService _localizationService;
+
+    public LocalizedContentItemsQueryProvider(
+        ISession session,
+        IRouteableContentTypeCoordinator routeableContentTypeCoordinator,
+        ILocalizationService localizationService
+        )
+    {
+        _session = session;
+        _routeableContentTypeCoordinator = routeableContentTypeCoordinator;
+        _localizationService = localizationService;
+    }
+
+    public async Task GetContentItemsAsync(ContentTypesSitemapSource source, ContentItemsQueryContext queryContext)
     {
-        private readonly ISession _session;
-        private readonly IRouteableContentTypeCoordinator _routeableContentTypeCoordinator;
-        private readonly ILocalizationService _localizationService;
-
-        public LocalizedContentItemsQueryProvider(
-            ISession session,
-            IRouteableContentTypeCoordinator routeableContentTypeCoordinator,
-            ILocalizationService localizationService
-            )
+        var routeableContentTypeDefinitions = await _routeableContentTypeCoordinator.ListRoutableTypeDefinitionsAsync();
+
+        if (source.IndexAll)
         {
-            _session = session;
-            _routeableContentTypeCoordinator = routeableContentTypeCoordinator;
-            _localizationService = localizationService;
-        }
+            // Assumption here is that at least one content type will be localized.
+            var ctdNames = routeableContentTypeDefinitions.Select(ctd => ctd.Name);
+
+            var queryResults = await _session.Query<ContentItem>()
+                .With<ContentItemIndex>(x => x.Published && x.ContentType.IsIn(ctdNames))
+                .OrderBy(x => x.CreatedUtc)
+                .ListAsync();
 
-        public async Task GetContentItemsAsync(ContentTypesSitemapSource source, ContentItemsQueryContext queryContext)
+            queryContext.ContentItems = queryResults;
+
+            // Provide all content items with localization as reference content items.
+            queryContext.ReferenceContentItems = queryResults
+                .Where(ci => ci.Has<LocalizationPart>());
+        }
+        else if (source.LimitItems)
         {
-            var routeableContentTypeDefinitions = await _routeableContentTypeCoordinator.ListRoutableTypeDefinitionsAsync();
+            // Test that content type is still valid to include in sitemap.
+            var contentType = routeableContentTypeDefinitions
+                .FirstOrDefault(ctd => string.Equals(source.LimitedContentType.ContentTypeName, ctd.Name, StringComparison.Ordinal));
 
-            if (source.IndexAll)
+            if (contentType == null)
             {
-                // Assumption here is that at least one content type will be localized.
-                var ctdNames = routeableContentTypeDefinitions.Select(ctd => ctd.Name);
+                return;
+            }
 
+            if (contentType.Parts.Any(ctd => string.Equals(ctd.Name, nameof(LocalizationPart), StringComparison.Ordinal)))
+            {
+                // Get all content items here for reference. Then reduce by default culture.
+                // We know that the content item should be localized.
+                // If it doesn't have a localization part, the content item should have been saved.
                 var queryResults = await _session.Query<ContentItem>()
-                    .With<ContentItemIndex>(x => x.Published && x.ContentType.IsIn(ctdNames))
-                    .OrderBy(x => x.CreatedUtc)
-                    .ListAsync();
+                     .With<ContentItemIndex>(ci => ci.ContentType == source.LimitedContentType.ContentTypeName && ci.Published)
+                     .OrderBy(ci => ci.CreatedUtc)
+                     .With<LocalizedContentItemIndex>()
+                     .ListAsync();
 
-                queryContext.ContentItems = queryResults;
+                // When limiting items Content item is valid if it is for the default culture.
+                var defaultCulture = await _localizationService.GetDefaultCultureAsync();
+
+                // Reduce by default culture.
+                var items = queryResults
+                    .Where(ci => string.Equals(ci.As<LocalizationPart>().Culture, defaultCulture, StringComparison.Ordinal))
+                    .Skip(source.LimitedContentType.Skip)
+                    .Take(source.LimitedContentType.Take);
+
+                queryContext.ContentItems = items;
 
                 // Provide all content items with localization as reference content items.
                 queryContext.ReferenceContentItems = queryResults
                     .Where(ci => ci.Has<LocalizationPart>());
             }
-            else if (source.LimitItems)
-            {
-                // Test that content type is still valid to include in sitemap.
-                var contentType = routeableContentTypeDefinitions
-                    .FirstOrDefault(ctd => string.Equals(source.LimitedContentType.ContentTypeName, ctd.Name, StringComparison.Ordinal));
-
-                if (contentType == null)
-                {
-                    return;
-                }
-
-                if (contentType.Parts.Any(ctd => string.Equals(ctd.Name, nameof(LocalizationPart), StringComparison.Ordinal)))
-                {
-                    // Get all content items here for reference. Then reduce by default culture.
-                    // We know that the content item should be localized.
-                    // If it doesn't have a localization part, the content item should have been saved.
-                    var queryResults = await _session.Query<ContentItem>()
-                         .With<ContentItemIndex>(ci => ci.ContentType == source.LimitedContentType.ContentTypeName && ci.Published)
-                         .OrderBy(ci => ci.CreatedUtc)
-                         .With<LocalizedContentItemIndex>()
-                         .ListAsync();
-
-                    // When limiting items Content item is valid if it is for the default culture.
-                    var defaultCulture = await _localizationService.GetDefaultCultureAsync();
-
-                    // Reduce by default culture.
-                    var items = queryResults
-                        .Where(ci => string.Equals(ci.As<LocalizationPart>().Culture, defaultCulture, StringComparison.Ordinal))
-                        .Skip(source.LimitedContentType.Skip)
-                        .Take(source.LimitedContentType.Take);
-
-                    queryContext.ContentItems = items;
-
-                    // Provide all content items with localization as reference content items.
-                    queryContext.ReferenceContentItems = queryResults
-                        .Where(ci => ci.Has<LocalizationPart>());
-                }
-                else
-                {
-                    // Content type is not localized. Produce standard results.
-                    var queryResults = await _session.Query<ContentItem>()
-                        .With<ContentItemIndex>(x => x.ContentType == source.LimitedContentType.ContentTypeName && x.Published)
-                        .OrderBy(x => x.CreatedUtc)
-                        .Skip(source.LimitedContentType.Skip)
-                        .Take(source.LimitedContentType.Take)
-                        .ListAsync();
-
-                    queryContext.ContentItems = queryResults;
-                }
-            }
             else
             {
-                // Test that content types are still valid to include in sitemap.
-                var typesToIndex = routeableContentTypeDefinitions
-                    .Where(ctd => source.ContentTypes.Any(s => string.Equals(ctd.Name, s.ContentTypeName, StringComparison.Ordinal)))
-                    .Select(x => x.Name);
-
-                // No advantage here in reducing with localized index.
+                // Content type is not localized. Produce standard results.
                 var queryResults = await _session.Query<ContentItem>()
-                    .With<ContentItemIndex>(x => x.ContentType.IsIn(typesToIndex) && x.Published)
+                    .With<ContentItemIndex>(x => x.ContentType == source.LimitedContentType.ContentTypeName && x.Published)
                     .OrderBy(x => x.CreatedUtc)
+                    .Skip(source.LimitedContentType.Skip)
+                    .Take(source.LimitedContentType.Take)
                     .ListAsync();
 
                 queryContext.ContentItems = queryResults;
-
-                // Provide all content items with localization as reference content items.
-                queryContext.ReferenceContentItems = queryResults
-                    .Where(ci => ci.Has<LocalizationPart>());
             }
         }
+        else
+        {
+            // Test that content types are still valid to include in sitemap.
+            var typesToIndex = routeableContentTypeDefinitions
+                .Where(ctd => source.ContentTypes.Any(s => string.Equals(ctd.Name, s.ContentTypeName, StringComparison.Ordinal)))
+                .Select(x => x.Name);
+
+            // No advantage here in reducing with localized index.
+            var queryResults = await _session.Query<ContentItem>()
+                .With<ContentItemIndex>(x => x.ContentType.IsIn(typesToIndex) && x.Published)
+                .OrderBy(x => x.CreatedUtc)
+                .ListAsync();
+
+            queryContext.ContentItems = queryResults;
+
+            // Provide all content items with localization as reference content items.
+            queryContext.ReferenceContentItems = queryResults
+                .Where(ci => ci.Has<LocalizationPart>());
+        }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Sitemaps/SitemapUrlHrefLangExtendedMetadataProvider.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Sitemaps/SitemapUrlHrefLangExtendedMetadataProvider.cs
index 6f04a469a5a..84c0fe49f96 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Sitemaps/SitemapUrlHrefLangExtendedMetadataProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Sitemaps/SitemapUrlHrefLangExtendedMetadataProvider.cs
@@ -7,62 +7,61 @@
 using OrchardCore.Sitemaps.Builders;
 using OrchardCore.Sitemaps.Services;
 
-namespace OrchardCore.ContentLocalization.Sitemaps
+namespace OrchardCore.ContentLocalization.Sitemaps;
+
+public class SitemapUrlHrefLangExtendedMetadataProvider : ISitemapContentItemExtendedMetadataProvider
 {
-    public class SitemapUrlHrefLangExtendedMetadataProvider : ISitemapContentItemExtendedMetadataProvider
+    private static readonly XNamespace _extendedNamespace = "http://www.w3.org/1999/xhtml";
+    private static readonly XAttribute _extendedAttribute = new(XNamespace.Xmlns + "xhtml", _extendedNamespace);
+
+    private readonly IContentManager _contentManager;
+    private readonly IRouteableContentTypeCoordinator _routeableContentTypeCoordinator;
+
+    public SitemapUrlHrefLangExtendedMetadataProvider(
+        IContentManager contentManager,
+        IRouteableContentTypeCoordinator routeableContentTypeCoordinator
+        )
     {
-        private static readonly XNamespace _extendedNamespace = "http://www.w3.org/1999/xhtml";
-        private static readonly XAttribute _extendedAttribute = new(XNamespace.Xmlns + "xhtml", _extendedNamespace);
+        _contentManager = contentManager;
+        _routeableContentTypeCoordinator = routeableContentTypeCoordinator;
+    }
 
-        private readonly IContentManager _contentManager;
-        private readonly IRouteableContentTypeCoordinator _routeableContentTypeCoordinator;
+    public XAttribute GetExtendedAttribute => _extendedAttribute;
 
-        public SitemapUrlHrefLangExtendedMetadataProvider(
-            IContentManager contentManager,
-            IRouteableContentTypeCoordinator routeableContentTypeCoordinator
-            )
+    public async Task<bool> ApplyExtendedMetadataAsync(
+        SitemapBuilderContext context,
+        ContentItemsQueryContext queryContext,
+        ContentItem contentItem,
+        XElement url)
+    {
+        var part = contentItem.As<LocalizationPart>();
+        if (part == null)
         {
-            _contentManager = contentManager;
-            _routeableContentTypeCoordinator = routeableContentTypeCoordinator;
+            return true;
         }
 
-        public XAttribute GetExtendedAttribute => _extendedAttribute;
+        var localizedContentParts = queryContext.ReferenceContentItems
+            .Select(ci => ci.As<LocalizationPart>())
+            .Where(cp => cp.LocalizationSet == part.LocalizationSet);
 
-        public async Task<bool> ApplyExtendedMetadataAsync(
-            SitemapBuilderContext context,
-            ContentItemsQueryContext queryContext,
-            ContentItem contentItem,
-            XElement url)
+        foreach (var localizedPart in localizedContentParts)
         {
-            var part = contentItem.As<LocalizationPart>();
-            if (part == null)
+            var sitemapMetadataAspect = await _contentManager.PopulateAspectAsync<SitemapMetadataAspect>(localizedPart.ContentItem);
+            if (sitemapMetadataAspect.Exclude)
             {
-                return true;
+                continue;
             }
 
-            var localizedContentParts = queryContext.ReferenceContentItems
-                .Select(ci => ci.As<LocalizationPart>())
-                .Where(cp => cp.LocalizationSet == part.LocalizationSet);
+            var hrefValue = await _routeableContentTypeCoordinator.GetRouteAsync(context, localizedPart.ContentItem);
 
-            foreach (var localizedPart in localizedContentParts)
-            {
-                var sitemapMetadataAspect = await _contentManager.PopulateAspectAsync<SitemapMetadataAspect>(localizedPart.ContentItem);
-                if (sitemapMetadataAspect.Exclude)
-                {
-                    continue;
-                }
+            var linkNode = new XElement(_extendedNamespace + "link",
+                new XAttribute("rel", "alternate"),
+                new XAttribute("hreflang", localizedPart.Culture),
+                new XAttribute("href", hrefValue));
 
-                var hrefValue = await _routeableContentTypeCoordinator.GetRouteAsync(context, localizedPart.ContentItem);
-
-                var linkNode = new XElement(_extendedNamespace + "link",
-                    new XAttribute("rel", "alternate"),
-                    new XAttribute("hreflang", localizedPart.Culture),
-                    new XAttribute("href", hrefValue));
-
-                url.Add(linkNode);
-            }
-
-            return true;
+            url.Add(linkNode);
         }
+
+        return true;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Startup.cs
index 9e6172e1566..00ac9de8f7a 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Startup.cs
@@ -25,70 +25,69 @@
 using OrchardCore.Settings;
 using OrchardCore.Sitemaps.Builders;
 
-namespace OrchardCore.ContentLocalization
+namespace OrchardCore.ContentLocalization;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<LocalizationPartViewModel>();
-            })
-            .AddLiquidFilter<ContentLocalizationFilter>("localization_set");
+            o.MemberAccessStrategy.Register<LocalizationPartViewModel>();
+        })
+        .AddLiquidFilter<ContentLocalizationFilter>("localization_set");
 
-            services.AddScoped<IContentPartIndexHandler, LocalizationPartIndexHandler>();
-            services.AddSingleton<ILocalizationEntries, LocalizationEntries>();
-            services.AddContentLocalization();
+        services.AddScoped<IContentPartIndexHandler, LocalizationPartIndexHandler>();
+        services.AddSingleton<ILocalizationEntries, LocalizationEntries>();
+        services.AddContentLocalization();
 
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<IAuthorizationHandler, LocalizeContentAuthorizationHandler>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<IAuthorizationHandler, LocalizeContentAuthorizationHandler>();
 
-            services.AddScoped<IContentsAdminListFilter, LocalizationPartContentsAdminListFilter>();
-            services.AddTransient<IContentsAdminListFilterProvider, LocalizationPartContentsAdminListFilterProvider>();
-            services.AddScoped<IDisplayDriver<ContentOptionsViewModel>, LocalizationContentsAdminListDisplayDriver>();
-        }
+        services.AddScoped<IContentsAdminListFilter, LocalizationPartContentsAdminListFilter>();
+        services.AddTransient<IContentsAdminListFilterProvider, LocalizationPartContentsAdminListFilterProvider>();
+        services.AddScoped<IDisplayDriver<ContentOptionsViewModel>, LocalizationContentsAdminListDisplayDriver>();
     }
+}
 
-    [Feature("OrchardCore.ContentLocalization.ContentCulturePicker")]
-    public sealed class ContentPickerStartup : StartupBase
+[Feature("OrchardCore.ContentLocalization.ContentCulturePicker")]
+public sealed class ContentPickerStartup : StartupBase
+{
+    private readonly IShellConfiguration _shellConfiguration;
+    public ContentPickerStartup(IShellConfiguration shellConfiguration)
     {
-        private readonly IShellConfiguration _shellConfiguration;
-        public ContentPickerStartup(IShellConfiguration shellConfiguration)
-        {
-            _shellConfiguration = shellConfiguration;
-        }
+        _shellConfiguration = shellConfiguration;
+    }
 
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IDisplayDriver<Navbar>, ContentCulturePickerNavbarDisplayDriver>();
-            services.AddLiquidFilter<SwitchCultureUrlFilter>("switch_culture_url");
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IContentCulturePickerService, ContentCulturePickerService>();
-            services.AddScoped<IDisplayDriver<ISite>, ContentCulturePickerSettingsDriver>();
-            services.AddScoped<IDisplayDriver<ISite>, ContentRequestCultureProviderSettingsDriver>();
-            services.Configure<RequestLocalizationOptions>(options => options.AddInitialRequestCultureProvider(new ContentRequestCultureProvider()));
-            services.Configure<CulturePickerOptions>(_shellConfiguration.GetSection("OrchardCore_ContentLocalization_CulturePickerOptions"));
-        }
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddScoped<IDisplayDriver<Navbar>, ContentCulturePickerNavbarDisplayDriver>();
+        services.AddLiquidFilter<SwitchCultureUrlFilter>("switch_culture_url");
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IContentCulturePickerService, ContentCulturePickerService>();
+        services.AddScoped<IDisplayDriver<ISite>, ContentCulturePickerSettingsDriver>();
+        services.AddScoped<IDisplayDriver<ISite>, ContentRequestCultureProviderSettingsDriver>();
+        services.Configure<RequestLocalizationOptions>(options => options.AddInitialRequestCultureProvider(new ContentRequestCultureProvider()));
+        services.Configure<CulturePickerOptions>(_shellConfiguration.GetSection("OrchardCore_ContentLocalization_CulturePickerOptions"));
+    }
 
-        public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            routes.MapAreaControllerRoute(
-               name: "RedirectToLocalizedContent",
-               areaName: "OrchardCore.ContentLocalization",
-               pattern: "RedirectToLocalizedContent",
-               defaults: new { controller = "ContentCulturePicker", action = "RedirectToLocalizedContent" }
-           );
-        }
+    public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        routes.MapAreaControllerRoute(
+           name: "RedirectToLocalizedContent",
+           areaName: "OrchardCore.ContentLocalization",
+           pattern: "RedirectToLocalizedContent",
+           defaults: new { controller = "ContentCulturePicker", action = "RedirectToLocalizedContent" }
+       );
     }
+}
 
-    [Feature("OrchardCore.ContentLocalization.Sitemaps")]
-    public sealed class SitemapsStartup : StartupBase
+[Feature("OrchardCore.ContentLocalization.Sitemaps")]
+public sealed class SitemapsStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<ISitemapContentItemExtendedMetadataProvider, SitemapUrlHrefLangExtendedMetadataProvider>();
-            services.Replace(ServiceDescriptor.Scoped<IContentItemsQueryProvider, LocalizedContentItemsQueryProvider>());
-        }
+        services.AddScoped<ISitemapContentItemExtendedMetadataProvider, SitemapUrlHrefLangExtendedMetadataProvider>();
+        services.Replace(ServiceDescriptor.Scoped<IContentItemsQueryProvider, LocalizedContentItemsQueryProvider>());
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ViewModels/LocalizationContentsAdminFilterViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ViewModels/LocalizationContentsAdminFilterViewModel.cs
index 6f5cc5684ec..6c528e6de6a 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ViewModels/LocalizationContentsAdminFilterViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ViewModels/LocalizationContentsAdminFilterViewModel.cs
@@ -2,14 +2,13 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.ContentLocalization.ViewModels
+namespace OrchardCore.ContentLocalization.ViewModels;
+
+public class LocalizationContentsAdminFilterViewModel
 {
-    public class LocalizationContentsAdminFilterViewModel
-    {
-        public bool ShowLocalizedContentTypes { get; set; }
-        public string SelectedCulture { get; set; }
+    public bool ShowLocalizedContentTypes { get; set; }
+    public string SelectedCulture { get; set; }
 
-        [BindNever]
-        public List<SelectListItem> Cultures { get; set; }
-    }
+    [BindNever]
+    public List<SelectListItem> Cultures { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ViewModels/LocalizationPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ViewModels/LocalizationPartViewModel.cs
index f13d2eb5642..cc7ccaf4dd7 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ViewModels/LocalizationPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/ViewModels/LocalizationPartViewModel.cs
@@ -4,27 +4,26 @@
 using OrchardCore.ContentLocalization.Models;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentLocalization.ViewModels
+namespace OrchardCore.ContentLocalization.ViewModels;
+
+public class LocalizationPartViewModel : ShapeViewModel
 {
-    public class LocalizationPartViewModel : ShapeViewModel
-    {
-        public string LocalizationSet { get; set; }
-        public string Culture { get; set; }
+    public string LocalizationSet { get; set; }
+    public string Culture { get; set; }
 
-        [BindNever]
-        public CultureInfo CultureInfo => CultureInfo.GetCultureInfo(Culture);
+    [BindNever]
+    public CultureInfo CultureInfo => CultureInfo.GetCultureInfo(Culture);
 
-        [BindNever]
-        public LocalizationPart LocalizationPart { get; set; }
+    [BindNever]
+    public LocalizationPart LocalizationPart { get; set; }
 
-        [BindNever]
-        public IEnumerable<LocalizationLinksViewModel> ContentItemCultures { get; set; }
-    }
+    [BindNever]
+    public IEnumerable<LocalizationLinksViewModel> ContentItemCultures { get; set; }
+}
 
-    public class LocalizationLinksViewModel
-    {
-        public bool IsDeleted { get; set; }
-        public string ContentItemId { get; set; }
-        public CultureInfo Culture { get; set; }
-    }
+public class LocalizationLinksViewModel
+{
+    public bool IsDeleted { get; set; }
+    public string ContentItemId { get; set; }
+    public CultureInfo Culture { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Controllers/PreviewController.cs b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Controllers/PreviewController.cs
index db53aebb116..f9bed8ed91c 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Controllers/PreviewController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Controllers/PreviewController.cs
@@ -12,214 +12,213 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentPreview.Controllers
+namespace OrchardCore.ContentPreview.Controllers;
+
+public class PreviewController : Controller
 {
-    public class PreviewController : Controller
+    private readonly IContentManager _contentManager;
+    private readonly IContentManagerSession _contentManagerSession;
+    private readonly IContentItemDisplayManager _contentItemDisplayManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IClock _clock;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+
+    public PreviewController(
+        IContentManager contentManager,
+        IContentItemDisplayManager contentItemDisplayManager,
+        IContentManagerSession contentManagerSession,
+        IAuthorizationService authorizationService,
+        IClock clock,
+        IUpdateModelAccessor updateModelAccessor)
     {
-        private readonly IContentManager _contentManager;
-        private readonly IContentManagerSession _contentManagerSession;
-        private readonly IContentItemDisplayManager _contentItemDisplayManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IClock _clock;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-
-        public PreviewController(
-            IContentManager contentManager,
-            IContentItemDisplayManager contentItemDisplayManager,
-            IContentManagerSession contentManagerSession,
-            IAuthorizationService authorizationService,
-            IClock clock,
-            IUpdateModelAccessor updateModelAccessor)
-        {
-            _authorizationService = authorizationService;
-            _clock = clock;
-            _contentItemDisplayManager = contentItemDisplayManager;
-            _contentManager = contentManager;
-            _contentManagerSession = contentManagerSession;
-            _updateModelAccessor = updateModelAccessor;
-        }
+        _authorizationService = authorizationService;
+        _clock = clock;
+        _contentItemDisplayManager = contentItemDisplayManager;
+        _contentManager = contentManager;
+        _contentManagerSession = contentManagerSession;
+        _updateModelAccessor = updateModelAccessor;
+    }
 
-        public IActionResult Index()
-        {
-            return View();
-        }
+    public IActionResult Index()
+    {
+        return View();
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> Render()
+    [HttpPost]
+    public async Task<IActionResult> Render()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.PreviewContent))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.PreviewContent))
-            {
-                return this.ChallengeOrForbid();
-            }
+            return this.ChallengeOrForbid();
+        }
 
-            // Mark request as a `Preview` request so that drivers / handlers or underlying services can be aware of an active preview mode.
-            HttpContext.Features.Set(new ContentPreviewFeature());
+        // Mark request as a `Preview` request so that drivers / handlers or underlying services can be aware of an active preview mode.
+        HttpContext.Features.Set(new ContentPreviewFeature());
 
-            var contentItemType = Request.Form["ContentItemType"];
-            var contentItem = await _contentManager.NewAsync(contentItemType);
+        var contentItemType = Request.Form["ContentItemType"];
+        var contentItem = await _contentManager.NewAsync(contentItemType);
 
-            // Assign the ids from the currently edited item so that validation thinks
-            // it's working on the same item. For instance if drivers are checking name unicity
-            // they need to think this is the same existing item (AutoroutePart).
+        // Assign the ids from the currently edited item so that validation thinks
+        // it's working on the same item. For instance if drivers are checking name unicity
+        // they need to think this is the same existing item (AutoroutePart).
 
-            var contentItemId = Request.Form["PreviewContentItemId"];
-            var contentItemVersionId = Request.Form["PreviewContentItemVersionId"];
+        var contentItemId = Request.Form["PreviewContentItemId"];
+        var contentItemVersionId = Request.Form["PreviewContentItemVersionId"];
 
-            // Unique contentItem.Id that only Preview is using such that another
-            // stored document can't have the same one in the IContentManagerSession index.
+        // Unique contentItem.Id that only Preview is using such that another
+        // stored document can't have the same one in the IContentManagerSession index.
 
-            contentItem.Id = -1;
-            contentItem.ContentItemId = contentItemId;
-            contentItem.ContentItemVersionId = contentItemVersionId;
-            contentItem.CreatedUtc = _clock.UtcNow;
-            contentItem.ModifiedUtc = _clock.UtcNow;
-            contentItem.PublishedUtc = _clock.UtcNow;
-            contentItem.Published = true;
+        contentItem.Id = -1;
+        contentItem.ContentItemId = contentItemId;
+        contentItem.ContentItemVersionId = contentItemVersionId;
+        contentItem.CreatedUtc = _clock.UtcNow;
+        contentItem.ModifiedUtc = _clock.UtcNow;
+        contentItem.PublishedUtc = _clock.UtcNow;
+        contentItem.Published = true;
 
-            // TODO: we should probably get this value from the main editor as it might impact validators.
-            _ = await _contentItemDisplayManager.UpdateEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, true);
+        // TODO: we should probably get this value from the main editor as it might impact validators.
+        _ = await _contentItemDisplayManager.UpdateEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, true);
 
-            if (!ModelState.IsValid)
+        if (!ModelState.IsValid)
+        {
+            var errors = new List<string>();
+            foreach (var modelState in ValidationHelpers.GetModelStateList(ViewData, false))
             {
-                var errors = new List<string>();
-                foreach (var modelState in ValidationHelpers.GetModelStateList(ViewData, false))
+                for (var i = 0; i < modelState.Errors.Count; i++)
                 {
-                    for (var i = 0; i < modelState.Errors.Count; i++)
-                    {
-                        var modelError = modelState.Errors[i];
-                        var errorText = ValidationHelpers.GetModelErrorMessageOrDefault(modelError);
-                        errors.Add(errorText);
-                    }
+                    var modelError = modelState.Errors[i];
+                    var errorText = ValidationHelpers.GetModelErrorMessageOrDefault(modelError);
+                    errors.Add(errorText);
                 }
-
-                return this.InternalServerError(new { errors });
             }
 
-            var previewAspect = await _contentManager.PopulateAspectAsync(contentItem, new PreviewAspect());
-
-            if (!string.IsNullOrEmpty(previewAspect.PreviewUrl))
-            {
-                // The PreviewPart is configured, we need to set the fake content item.
-                _contentManagerSession.Store(contentItem);
+            return this.InternalServerError(new { errors });
+        }
 
-                if (!previewAspect.PreviewUrl.StartsWith('/'))
-                {
-                    previewAspect.PreviewUrl = "/" + previewAspect.PreviewUrl;
-                }
+        var previewAspect = await _contentManager.PopulateAspectAsync(contentItem, new PreviewAspect());
 
-                Request.HttpContext.Items["PreviewPath"] = previewAspect.PreviewUrl;
+        if (!string.IsNullOrEmpty(previewAspect.PreviewUrl))
+        {
+            // The PreviewPart is configured, we need to set the fake content item.
+            _contentManagerSession.Store(contentItem);
 
-                return Ok();
+            if (!previewAspect.PreviewUrl.StartsWith('/'))
+            {
+                previewAspect.PreviewUrl = "/" + previewAspect.PreviewUrl;
             }
 
-            var model = await _contentItemDisplayManager.BuildDisplayAsync(contentItem, _updateModelAccessor.ModelUpdater, "Detail");
+            Request.HttpContext.Items["PreviewPath"] = previewAspect.PreviewUrl;
 
-            return View(model);
+            return Ok();
         }
+
+        var model = await _contentItemDisplayManager.BuildDisplayAsync(contentItem, _updateModelAccessor.ModelUpdater, "Detail");
+
+        return View(model);
     }
+}
 
-    internal static class ValidationHelpers
+internal static class ValidationHelpers
+{
+    public static string GetModelErrorMessageOrDefault(ModelError modelError)
     {
-        public static string GetModelErrorMessageOrDefault(ModelError modelError)
+        Debug.Assert(modelError != null);
+
+        if (!string.IsNullOrEmpty(modelError.ErrorMessage))
         {
-            Debug.Assert(modelError != null);
+            return modelError.ErrorMessage;
+        }
 
-            if (!string.IsNullOrEmpty(modelError.ErrorMessage))
-            {
-                return modelError.ErrorMessage;
-            }
+        // Default in the ValidationSummary case is no error message.
+        return string.Empty;
+    }
+
+    public static string GetModelErrorMessageOrDefault(
+        ModelError modelError,
+        ModelStateEntry containingEntry,
+        ModelExplorer modelExplorer)
+    {
+        Debug.Assert(modelError != null);
+        Debug.Assert(containingEntry != null);
+        Debug.Assert(modelExplorer != null);
 
-            // Default in the ValidationSummary case is no error message.
-            return string.Empty;
+        if (!string.IsNullOrEmpty(modelError.ErrorMessage))
+        {
+            return modelError.ErrorMessage;
         }
 
-        public static string GetModelErrorMessageOrDefault(
-            ModelError modelError,
-            ModelStateEntry containingEntry,
-            ModelExplorer modelExplorer)
+        // Default in the ValidationMessage case is a fallback error message.
+        var attemptedValue = containingEntry.AttemptedValue ?? "null";
+        return modelExplorer.Metadata.ModelBindingMessageProvider.ValueIsInvalidAccessor(attemptedValue);
+    }
+
+    // Returns non-null list of model states, which caller will render in order provided.
+    public static IList<ModelStateEntry> GetModelStateList(
+        ViewDataDictionary viewData,
+        bool excludePropertyErrors)
+    {
+        if (excludePropertyErrors)
         {
-            Debug.Assert(modelError != null);
-            Debug.Assert(containingEntry != null);
-            Debug.Assert(modelExplorer != null);
+            viewData.ModelState.TryGetValue(viewData.TemplateInfo.HtmlFieldPrefix, out var ms);
 
-            if (!string.IsNullOrEmpty(modelError.ErrorMessage))
+            if (ms != null)
             {
-                return modelError.ErrorMessage;
+                return new[] { ms };
             }
-
-            // Default in the ValidationMessage case is a fallback error message.
-            var attemptedValue = containingEntry.AttemptedValue ?? "null";
-            return modelExplorer.Metadata.ModelBindingMessageProvider.ValueIsInvalidAccessor(attemptedValue);
         }
-
-        // Returns non-null list of model states, which caller will render in order provided.
-        public static IList<ModelStateEntry> GetModelStateList(
-            ViewDataDictionary viewData,
-            bool excludePropertyErrors)
+        else if (viewData.ModelState.Count > 0)
         {
-            if (excludePropertyErrors)
-            {
-                viewData.ModelState.TryGetValue(viewData.TemplateInfo.HtmlFieldPrefix, out var ms);
+            var metadata = viewData.ModelMetadata;
+            var modelStateDictionary = viewData.ModelState;
+            var entries = new List<ModelStateEntry>();
+            Visit(modelStateDictionary.Root, metadata, entries);
 
-                if (ms != null)
-                {
-                    return new[] { ms };
-                }
-            }
-            else if (viewData.ModelState.Count > 0)
+            if (entries.Count < modelStateDictionary.Count)
             {
-                var metadata = viewData.ModelMetadata;
-                var modelStateDictionary = viewData.ModelState;
-                var entries = new List<ModelStateEntry>();
-                Visit(modelStateDictionary.Root, metadata, entries);
-
-                if (entries.Count < modelStateDictionary.Count)
+                // Account for entries in the ModelStateDictionary that do not have corresponding ModelMetadata values.
+                foreach (var entry in modelStateDictionary)
                 {
-                    // Account for entries in the ModelStateDictionary that do not have corresponding ModelMetadata values.
-                    foreach (var entry in modelStateDictionary)
+                    if (!entries.Contains(entry.Value))
                     {
-                        if (!entries.Contains(entry.Value))
-                        {
-                            entries.Add(entry.Value);
-                        }
+                        entries.Add(entry.Value);
                     }
                 }
-
-                return entries;
             }
 
-            return Array.Empty<ModelStateEntry>();
+            return entries;
         }
 
-        private static void Visit(
-            ModelStateEntry modelStateEntry,
-            ModelMetadata metadata,
-            List<ModelStateEntry> orderedModelStateEntries)
+        return Array.Empty<ModelStateEntry>();
+    }
+
+    private static void Visit(
+        ModelStateEntry modelStateEntry,
+        ModelMetadata metadata,
+        List<ModelStateEntry> orderedModelStateEntries)
+    {
+        if (metadata.ElementMetadata != null && modelStateEntry.Children != null)
         {
-            if (metadata.ElementMetadata != null && modelStateEntry.Children != null)
+            foreach (var indexEntry in modelStateEntry.Children)
             {
-                foreach (var indexEntry in modelStateEntry.Children)
-                {
-                    Visit(indexEntry, metadata.ElementMetadata, orderedModelStateEntries);
-                }
+                Visit(indexEntry, metadata.ElementMetadata, orderedModelStateEntries);
             }
-            else
+        }
+        else
+        {
+            for (var i = 0; i < metadata.Properties.Count; i++)
             {
-                for (var i = 0; i < metadata.Properties.Count; i++)
+                var propertyMetadata = metadata.Properties[i];
+                var propertyModelStateEntry = modelStateEntry.GetModelStateForProperty(propertyMetadata.PropertyName);
+                if (propertyModelStateEntry != null)
                 {
-                    var propertyMetadata = metadata.Properties[i];
-                    var propertyModelStateEntry = modelStateEntry.GetModelStateForProperty(propertyMetadata.PropertyName);
-                    if (propertyModelStateEntry != null)
-                    {
-                        Visit(propertyModelStateEntry, propertyMetadata, orderedModelStateEntries);
-                    }
+                    Visit(propertyModelStateEntry, propertyMetadata, orderedModelStateEntries);
                 }
             }
+        }
 
-            if (!modelStateEntry.IsContainerNode)
-            {
-                orderedModelStateEntries.Add(modelStateEntry);
-            }
+        if (!modelStateEntry.IsContainerNode)
+        {
+            orderedModelStateEntries.Add(modelStateEntry);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Drivers/ContentPreviewDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Drivers/ContentPreviewDriver.cs
index 9979562da5f..a657700b8a8 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Drivers/ContentPreviewDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Drivers/ContentPreviewDriver.cs
@@ -4,14 +4,13 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentPreview.Drivers
+namespace OrchardCore.ContentPreview.Drivers;
+
+public sealed class ContentPreviewDriver : ContentDisplayDriver
 {
-    public sealed class ContentPreviewDriver : ContentDisplayDriver
+    public override IDisplayResult Edit(ContentItem contentItem, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentItem contentItem, BuildEditorContext context)
-        {
-            return Shape("ContentPreview_Button", new ContentItemViewModel(contentItem))
-                .Location("Actions:after");
-        }
+        return Shape("ContentPreview_Button", new ContentItemViewModel(contentItem))
+            .Location("Actions:after");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Handlers/PreviewPartHandler.cs b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Handlers/PreviewPartHandler.cs
index 2a38eecd141..bd9120eb5e1 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Handlers/PreviewPartHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Handlers/PreviewPartHandler.cs
@@ -11,55 +11,54 @@
 using OrchardCore.ContentPreview.ViewModels;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.ContentPreview.Handlers
+namespace OrchardCore.ContentPreview.Handlers;
+
+public class PreviewPartHandler : ContentPartHandler<PreviewPart>
 {
-    public class PreviewPartHandler : ContentPartHandler<PreviewPart>
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+
+    public PreviewPartHandler(
+        ILiquidTemplateManager liquidTemplateManager,
+        IContentDefinitionManager contentDefinitionManager)
     {
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+        _liquidTemplateManager = liquidTemplateManager;
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public PreviewPartHandler(
-            ILiquidTemplateManager liquidTemplateManager,
-            IContentDefinitionManager contentDefinitionManager)
-        {
-            _liquidTemplateManager = liquidTemplateManager;
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    /// <summary>
+    /// Get the pattern from the AutoroutePartSettings property for its type.
+    /// </summary>
+    private async Task<string> GetPatternAsync(PreviewPart part)
+    {
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(part.ContentItem.ContentType);
+        var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, "PreviewPart", StringComparison.Ordinal));
+        var pattern = contentTypePartDefinition.GetSettings<PreviewPartSettings>().Pattern;
 
-        /// <summary>
-        /// Get the pattern from the AutoroutePartSettings property for its type.
-        /// </summary>
-        private async Task<string> GetPatternAsync(PreviewPart part)
-        {
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(part.ContentItem.ContentType);
-            var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, "PreviewPart", StringComparison.Ordinal));
-            var pattern = contentTypePartDefinition.GetSettings<PreviewPartSettings>().Pattern;
+        return pattern;
+    }
 
-            return pattern;
-        }
+    public override async Task GetContentItemAspectAsync(ContentItemAspectContext context, PreviewPart part)
+    {
+        var pattern = await GetPatternAsync(part);
 
-        public override async Task GetContentItemAspectAsync(ContentItemAspectContext context, PreviewPart part)
+        if (!string.IsNullOrEmpty(pattern))
         {
-            var pattern = await GetPatternAsync(part);
-
-            if (!string.IsNullOrEmpty(pattern))
+            await context.ForAsync<PreviewAspect>(async previewAspect =>
             {
-                await context.ForAsync<PreviewAspect>(async previewAspect =>
+                var model = new PreviewPartViewModel()
                 {
-                    var model = new PreviewPartViewModel()
-                    {
-                        PreviewPart = part,
-                        ContentItem = part.ContentItem,
-                    };
-
-                    previewAspect.PreviewUrl = await _liquidTemplateManager.RenderStringAsync(pattern, NullEncoder.Default, model,
-                        new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(model.ContentItem) });
+                    PreviewPart = part,
+                    ContentItem = part.ContentItem,
+                };
 
-                    previewAspect.PreviewUrl = previewAspect.PreviewUrl.Replace("\r", string.Empty).Replace("\n", string.Empty);
-                });
-            }
+                previewAspect.PreviewUrl = await _liquidTemplateManager.RenderStringAsync(pattern, NullEncoder.Default, model,
+                    new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(model.ContentItem) });
 
-            return;
+                previewAspect.PreviewUrl = previewAspect.PreviewUrl.Replace("\r", string.Empty).Replace("\n", string.Empty);
+            });
         }
+
+        return;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Migrations.cs
index bbee305659d..c8cc7066a91 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Migrations.cs
@@ -3,24 +3,23 @@
 using OrchardCore.ContentManagement.Metadata.Settings;
 using OrchardCore.Data.Migration;
 
-namespace OrchardCore.ContentPreview
+namespace OrchardCore.ContentPreview;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        public Migrations(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public Migrations(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public async Task<int> CreateAsync()
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync("PreviewPart", builder => builder
-                .Attachable()
-                .WithDescription("Provides a way to define the url that is used to render your content item for preview. You only need to use this for the content preview feature when running the frontend decoupled from the admin."));
+    public async Task<int> CreateAsync()
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync("PreviewPart", builder => builder
+            .Attachable()
+            .WithDescription("Provides a way to define the url that is used to render your content item for preview. You only need to use this for the content preview feature when running the frontend decoupled from the admin."));
 
-            return 1;
-        }
+        return 1;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Models/PreviewPart.cs b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Models/PreviewPart.cs
index 12bebdbf993..44edb665638 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Models/PreviewPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Models/PreviewPart.cs
@@ -1,12 +1,11 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.ContentPreview.Models
+namespace OrchardCore.ContentPreview.Models;
+
+/// <summary>
+/// When attached to a content type, provides a way to define the
+/// url that is used to render the content item.
+/// </summary>
+public class PreviewPart : ContentPart
 {
-    /// <summary>
-    /// When attached to a content type, provides a way to define the
-    /// url that is used to render the content item.
-    /// </summary>
-    public class PreviewPart : ContentPart
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Models/PreviewPartSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Models/PreviewPartSettings.cs
index c9c0b49943f..3b7152caab9 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Models/PreviewPartSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Models/PreviewPartSettings.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.ContentPreview.Models
+namespace OrchardCore.ContentPreview.Models;
+
+public class PreviewPartSettings
 {
-    public class PreviewPartSettings
-    {
-        /// <summary>
-        /// The pattern used to build the Path.
-        /// </summary>
-        public string Pattern { get; set; }
-    }
+    /// <summary>
+    /// The pattern used to build the Path.
+    /// </summary>
+    public string Pattern { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentPreview/PreviewStartupFilter.cs b/src/OrchardCore.Modules/OrchardCore.ContentPreview/PreviewStartupFilter.cs
index 7bf5d0d989d..964d862376e 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentPreview/PreviewStartupFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentPreview/PreviewStartupFilter.cs
@@ -3,50 +3,49 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.ContentPreview
+namespace OrchardCore.ContentPreview;
+
+public sealed class PreviewStartupFilter : IStartupFilter
 {
-    public sealed class PreviewStartupFilter : IStartupFilter
+    public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
     {
-        public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
+        return app =>
         {
-            return app =>
+            app.Use(async (context, next) =>
             {
-                app.Use(async (context, next) =>
+                await next();
+
+                if (!context.Items.TryGetValue("PreviewPath", out var previewPathObject) || previewPathObject == null)
                 {
-                    await next();
+                    return;
+                }
 
-                    if (!context.Items.TryGetValue("PreviewPath", out var previewPathObject) || previewPathObject == null)
-                    {
-                        return;
-                    }
+                var previewPath = previewPathObject.ToString();
 
-                    var previewPath = previewPathObject.ToString();
+                if (!string.IsNullOrWhiteSpace(previewPath) && previewPath.StartsWith('/'))
+                {
+                    var originalPath = context.Request.Path;
+                    var originalQueryString = context.Request.QueryString;
 
-                    if (!string.IsNullOrWhiteSpace(previewPath) && previewPath.StartsWith('/'))
+                    context.Request.Path = previewPath;
+                    context.Items.Remove("PreviewPath");
+
+                    context.SetEndpoint(endpoint: null);
+                    context.Request.RouteValues.Clear();
+
+                    try
+                    {
+                        await next();
+                    }
+                    finally
                     {
-                        var originalPath = context.Request.Path;
-                        var originalQueryString = context.Request.QueryString;
-
-                        context.Request.Path = previewPath;
-                        context.Items.Remove("PreviewPath");
-
-                        context.SetEndpoint(endpoint: null);
-                        context.Request.RouteValues.Clear();
-
-                        try
-                        {
-                            await next();
-                        }
-                        finally
-                        {
-                            context.Request.QueryString = originalQueryString;
-                            context.Request.Path = originalPath;
-                        }
+                        context.Request.QueryString = originalQueryString;
+                        context.Request.Path = originalPath;
                     }
-                });
+                }
+            });
 
-                next(app);
-            };
-        }
+            next(app);
+        };
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentPreview/ResourceManagementOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.ContentPreview/ResourceManagementOptionsConfiguration.cs
index 6cf778424b4..09ca7824d57 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentPreview/ResourceManagementOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentPreview/ResourceManagementOptionsConfiguration.cs
@@ -1,26 +1,25 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.ContentPreview
+namespace OrchardCore.ContentPreview;
+
+public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
 {
-    public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
-    {
-        private static readonly ResourceManifest _manifest;
+    private static readonly ResourceManifest _manifest;
 
-        static ResourceManagementOptionsConfiguration()
-        {
-            _manifest = new ResourceManifest();
+    static ResourceManagementOptionsConfiguration()
+    {
+        _manifest = new ResourceManifest();
 
-            _manifest
-                .DefineScript("contentpreview-edit")
-                .SetUrl("~/OrchardCore.ContentPreview/Scripts/contentpreview.edit.min.js", "~/OrchardCore.ContentPreview/Scripts/contentpreview.edit.js")
-                .SetDependencies("jQuery")
-                .SetVersion("1.0.0");
-        }
+        _manifest
+            .DefineScript("contentpreview-edit")
+            .SetUrl("~/OrchardCore.ContentPreview/Scripts/contentpreview.edit.min.js", "~/OrchardCore.ContentPreview/Scripts/contentpreview.edit.js")
+            .SetDependencies("jQuery")
+            .SetVersion("1.0.0");
+    }
 
-        public void Configure(ResourceManagementOptions options)
-        {
-            options.ResourceManifests.Add(_manifest);
-        }
+    public void Configure(ResourceManagementOptions options)
+    {
+        options.ResourceManifests.Add(_manifest);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Settings/PreviewPartSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Settings/PreviewPartSettingsDisplayDriver.cs
index 694ec12a3d2..3ad668af5b0 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Settings/PreviewPartSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Settings/PreviewPartSettingsDisplayDriver.cs
@@ -8,53 +8,52 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.ContentPreview.Settings
+namespace OrchardCore.ContentPreview.Settings;
+
+public sealed class PreviewPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<PreviewPart>
 {
-    public sealed class PreviewPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<PreviewPart>
-    {
-        private readonly ILiquidTemplateManager _templateManager;
+    private readonly ILiquidTemplateManager _templateManager;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public PreviewPartSettingsDisplayDriver(
-            ILiquidTemplateManager templateManager,
-            IStringLocalizer<PreviewPartSettingsDisplayDriver> localizer)
-        {
-            _templateManager = templateManager;
-            S = localizer;
-        }
+    public PreviewPartSettingsDisplayDriver(
+        ILiquidTemplateManager templateManager,
+        IStringLocalizer<PreviewPartSettingsDisplayDriver> localizer)
+    {
+        _templateManager = templateManager;
+        S = localizer;
+    }
 
-        public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    {
+        return Initialize<PreviewPartSettingsViewModel>("PreviewPartSettings_Edit", model =>
         {
-            return Initialize<PreviewPartSettingsViewModel>("PreviewPartSettings_Edit", model =>
-            {
-                var settings = contentTypePartDefinition.GetSettings<PreviewPartSettings>();
+            var settings = contentTypePartDefinition.GetSettings<PreviewPartSettings>();
 
-                model.Pattern = settings.Pattern;
-                model.PreviewPartSettings = settings;
-            }).Location("Content");
-        }
+            model.Pattern = settings.Pattern;
+            model.PreviewPartSettings = settings;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
-        {
-            var model = new PreviewPartSettingsViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    {
+        var model = new PreviewPartSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix,
-                m => m.Pattern);
+        await context.Updater.TryUpdateModelAsync(model, Prefix,
+            m => m.Pattern);
 
-            if (!string.IsNullOrEmpty(model.Pattern) && !_templateManager.Validate(model.Pattern, out var errors))
-            {
-                context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-            }
-            else
+        if (!string.IsNullOrEmpty(model.Pattern) && !_templateManager.Validate(model.Pattern, out var errors))
+        {
+            context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+        }
+        else
+        {
+            context.Builder.WithSettings(new PreviewPartSettings
             {
-                context.Builder.WithSettings(new PreviewPartSettings
-                {
-                    Pattern = model.Pattern
-                });
-            }
-
-            return Edit(contentTypePartDefinition, context);
+                Pattern = model.Pattern
+            });
         }
+
+        return Edit(contentTypePartDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Startup.cs
index bfc91840a7a..7f4052e5c2b 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Startup.cs
@@ -12,23 +12,22 @@
 using OrchardCore.Data.Migration;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.ContentPreview
+namespace OrchardCore.ContentPreview;
+
+public sealed class Startup : Modules.StartupBase
 {
-    public sealed class Startup : Modules.StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
+        services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
 
-            services.AddScoped<IContentDisplayDriver, ContentPreviewDriver>();
+        services.AddScoped<IContentDisplayDriver, ContentPreviewDriver>();
 
-            // Preview Part
-            services.AddContentPart<PreviewPart>()
-                .AddHandler<PreviewPartHandler>();
+        // Preview Part
+        services.AddContentPart<PreviewPart>()
+            .AddHandler<PreviewPartHandler>();
 
-            services.AddDataMigration<Migrations>();
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, PreviewPartSettingsDisplayDriver>();
-            services.TryAddEnumerable(ServiceDescriptor.Singleton<IStartupFilter, PreviewStartupFilter>());
-        }
+        services.AddDataMigration<Migrations>();
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, PreviewPartSettingsDisplayDriver>();
+        services.TryAddEnumerable(ServiceDescriptor.Singleton<IStartupFilter, PreviewStartupFilter>());
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentPreview/ViewModels/PreviewPartSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentPreview/ViewModels/PreviewPartSettingsViewModel.cs
index 834f3d12dd7..7369733172e 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentPreview/ViewModels/PreviewPartSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentPreview/ViewModels/PreviewPartSettingsViewModel.cs
@@ -1,10 +1,9 @@
 using OrchardCore.ContentPreview.Models;
 
-namespace OrchardCore.ContentPreview.ViewModels
+namespace OrchardCore.ContentPreview.ViewModels;
+
+public class PreviewPartSettingsViewModel
 {
-    public class PreviewPartSettingsViewModel
-    {
-        public string Pattern { get; set; }
-        public PreviewPartSettings PreviewPartSettings { get; set; }
-    }
+    public string Pattern { get; set; }
+    public PreviewPartSettings PreviewPartSettings { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentPreview/ViewModels/PreviewPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentPreview/ViewModels/PreviewPartViewModel.cs
index 1e97709ac8b..ff4ef6e5775 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentPreview/ViewModels/PreviewPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentPreview/ViewModels/PreviewPartViewModel.cs
@@ -2,16 +2,15 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentPreview.Models;
 
-namespace OrchardCore.ContentPreview.ViewModels
+namespace OrchardCore.ContentPreview.ViewModels;
+
+public class PreviewPartViewModel
 {
-    public class PreviewPartViewModel
-    {
-        public string Pattern { get; set; }
+    public string Pattern { get; set; }
 
-        [BindNever]
-        public ContentItem ContentItem { get; set; }
+    [BindNever]
+    public ContentItem ContentItem { get; set; }
 
-        [BindNever]
-        public PreviewPart PreviewPart { get; set; }
-    }
+    [BindNever]
+    public PreviewPart PreviewPart { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs
index bbdba4ac80f..76fd2db6ee3 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs
@@ -4,43 +4,42 @@
 using OrchardCore.Mvc.Core.Utilities;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.ContentTypes
+namespace OrchardCore.ContentTypes;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
-    {
-        private static readonly string _adminControllerName = typeof(AdminController).ControllerName();
+    private static readonly string _adminControllerName = typeof(AdminController).ControllerName();
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
-        {
-            S = localizer;
-        }
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            builder
-                .Add(S["Content"], content => content
-                    .Add(S["Content Definition"], S["Content Definition"].PrefixPosition("9"), contentDefinition => contentDefinition
-                        .Add(S["Content Types"], S["Content Types"].PrefixPosition("1"), contentTypes => contentTypes
-                            .Action(nameof(AdminController.List), _adminControllerName, "OrchardCore.ContentTypes")
-                            .Permission(Permissions.ViewContentTypes)
-                            .LocalNav()
-                        )
-                        .Add(S["Content Parts"], S["Content Parts"].PrefixPosition("2"), contentParts => contentParts
-                            .Action(nameof(AdminController.ListParts), _adminControllerName, "OrchardCore.ContentTypes")
-                            .Permission(Permissions.ViewContentTypes)
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Content"], content => content
+                .Add(S["Content Definition"], S["Content Definition"].PrefixPosition("9"), contentDefinition => contentDefinition
+                    .Add(S["Content Types"], S["Content Types"].PrefixPosition("1"), contentTypes => contentTypes
+                        .Action(nameof(AdminController.List), _adminControllerName, "OrchardCore.ContentTypes")
+                        .Permission(Permissions.ViewContentTypes)
+                        .LocalNav()
                     )
-                );
+                    .Add(S["Content Parts"], S["Content Parts"].PrefixPosition("2"), contentParts => contentParts
+                        .Action(nameof(AdminController.ListParts), _adminControllerName, "OrchardCore.ContentTypes")
+                        .Permission(Permissions.ViewContentTypes)
+                        .LocalNav()
+                    )
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Controllers/AdminController.cs
index a76bc76d15d..d86d4ac5691 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Controllers/AdminController.cs
@@ -19,977 +19,976 @@
 using OrchardCore.DisplayManagement.Notify;
 using OrchardCore.Routing;
 
-namespace OrchardCore.ContentTypes.Controllers
+namespace OrchardCore.ContentTypes.Controllers;
+
+public class AdminController : Controller
 {
-    public class AdminController : Controller
+    private readonly IContentDefinitionService _contentDefinitionService;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IDocumentStore _documentStore;
+    private readonly IContentDefinitionDisplayManager _contentDefinitionDisplayManager;
+    protected readonly IHtmlLocalizer H;
+    protected readonly IStringLocalizer S;
+    private readonly INotifier _notifier;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+
+    public AdminController(
+        IContentDefinitionDisplayManager contentDefinitionDisplayManager,
+        IContentDefinitionService contentDefinitionService,
+        IContentDefinitionManager contentDefinitionManager,
+        IAuthorizationService authorizationService,
+        IDocumentStore documentStore,
+        IHtmlLocalizer<AdminController> htmlLocalizer,
+        IStringLocalizer<AdminController> stringLocalizer,
+        INotifier notifier,
+        IUpdateModelAccessor updateModelAccessor)
     {
-        private readonly IContentDefinitionService _contentDefinitionService;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IDocumentStore _documentStore;
-        private readonly IContentDefinitionDisplayManager _contentDefinitionDisplayManager;
-        protected readonly IHtmlLocalizer H;
-        protected readonly IStringLocalizer S;
-        private readonly INotifier _notifier;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-
-        public AdminController(
-            IContentDefinitionDisplayManager contentDefinitionDisplayManager,
-            IContentDefinitionService contentDefinitionService,
-            IContentDefinitionManager contentDefinitionManager,
-            IAuthorizationService authorizationService,
-            IDocumentStore documentStore,
-            IHtmlLocalizer<AdminController> htmlLocalizer,
-            IStringLocalizer<AdminController> stringLocalizer,
-            INotifier notifier,
-            IUpdateModelAccessor updateModelAccessor)
-        {
-            _notifier = notifier;
-            _contentDefinitionDisplayManager = contentDefinitionDisplayManager;
-            _documentStore = documentStore;
-            _authorizationService = authorizationService;
-            _contentDefinitionService = contentDefinitionService;
-            _contentDefinitionManager = contentDefinitionManager;
-            _updateModelAccessor = updateModelAccessor;
-
-            H = htmlLocalizer;
-            S = stringLocalizer;
-        }
-
-        public Task<ActionResult> Index()
-        {
-            return List();
-        }
-
-        #region Types
-
-        [Admin("ContentTypes/List", "ListContentTypes")]
-        public async Task<ActionResult> List()
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ViewContentTypes))
-            {
-                return Forbid();
-            }
+        _notifier = notifier;
+        _contentDefinitionDisplayManager = contentDefinitionDisplayManager;
+        _documentStore = documentStore;
+        _authorizationService = authorizationService;
+        _contentDefinitionService = contentDefinitionService;
+        _contentDefinitionManager = contentDefinitionManager;
+        _updateModelAccessor = updateModelAccessor;
+
+        H = htmlLocalizer;
+        S = stringLocalizer;
+    }
 
-            return View("List", new ListContentTypesViewModel
-            {
-                Types = await _contentDefinitionService.GetTypesAsync()
-            });
+    public Task<ActionResult> Index()
+    {
+        return List();
+    }
+
+    #region Types
+
+    [Admin("ContentTypes/List", "ListContentTypes")]
+    public async Task<ActionResult> List()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ViewContentTypes))
+        {
+            return Forbid();
         }
 
-        [Admin("ContentTypes/Create", "CreateType")]
-        public async Task<ActionResult> Create(string suggestion)
+        return View("List", new ListContentTypesViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
+            Types = await _contentDefinitionService.GetTypesAsync()
+        });
+    }
 
-            return View(new CreateTypeViewModel { DisplayName = suggestion, Name = suggestion.ToSafeName() });
+    [Admin("ContentTypes/Create", "CreateType")]
+    public async Task<ActionResult> Create(string suggestion)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName("Create")]
-        public async Task<ActionResult> CreatePOST(CreateTypeViewModel viewModel)
+        return View(new CreateTypeViewModel { DisplayName = suggestion, Name = suggestion.ToSafeName() });
+    }
+
+    [HttpPost, ActionName("Create")]
+    public async Task<ActionResult> CreatePOST(CreateTypeViewModel viewModel)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            viewModel.DisplayName = viewModel.DisplayName?.Trim() ?? string.Empty;
-            viewModel.Name ??= string.Empty;
+        viewModel.DisplayName = viewModel.DisplayName?.Trim() ?? string.Empty;
+        viewModel.Name ??= string.Empty;
 
-            if (string.IsNullOrWhiteSpace(viewModel.DisplayName))
-            {
-                ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
-            }
-            var types = await _contentDefinitionService.LoadTypesAsync();
+        if (string.IsNullOrWhiteSpace(viewModel.DisplayName))
+        {
+            ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
+        }
+        var types = await _contentDefinitionService.LoadTypesAsync();
 
-            if (types.Any(t => string.Equals(t.DisplayName.Trim(), viewModel.DisplayName.Trim(), StringComparison.OrdinalIgnoreCase)))
-            {
-                ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
-            }
+        if (types.Any(t => string.Equals(t.DisplayName.Trim(), viewModel.DisplayName.Trim(), StringComparison.OrdinalIgnoreCase)))
+        {
+            ModelState.AddModelError("DisplayName", S["A type with the same Display Name already exists."]);
+        }
 
-            if (string.IsNullOrWhiteSpace(viewModel.Name))
-            {
-                ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-            }
+        if (string.IsNullOrWhiteSpace(viewModel.Name))
+        {
+            ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
+        }
 
-            if (!string.IsNullOrWhiteSpace(viewModel.Name) && !char.IsLetter(viewModel.Name[0]))
-            {
-                ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-            }
+        if (!string.IsNullOrWhiteSpace(viewModel.Name) && !char.IsLetter(viewModel.Name[0]))
+        {
+            ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
+        }
 
-            if (!string.Equals(viewModel.Name, viewModel.Name.ToSafeName(), StringComparison.OrdinalIgnoreCase))
-            {
-                ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-            }
+        if (!string.Equals(viewModel.Name, viewModel.Name.ToSafeName(), StringComparison.OrdinalIgnoreCase))
+        {
+            ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
+        }
 
-            if (viewModel.Name.IsReservedContentName())
-            {
-                ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-            }
+        if (viewModel.Name.IsReservedContentName())
+        {
+            ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
+        }
 
-            if (types.Any(t => string.Equals(t.Name.Trim(), viewModel.Name.Trim(), StringComparison.OrdinalIgnoreCase)))
-            {
-                ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
-            }
+        if (types.Any(t => string.Equals(t.Name.Trim(), viewModel.Name.Trim(), StringComparison.OrdinalIgnoreCase)))
+        {
+            ModelState.AddModelError("Name", S["A type with the same Technical Name already exists."]);
+        }
 
-            if (!ModelState.IsValid)
-            {
-                await _documentStore.CancelAsync();
-                return View(viewModel);
-            }
+        if (!ModelState.IsValid)
+        {
+            await _documentStore.CancelAsync();
+            return View(viewModel);
+        }
 
-            var contentTypeDefinition = await _contentDefinitionService.AddTypeAsync(viewModel.Name, viewModel.DisplayName);
+        var contentTypeDefinition = await _contentDefinitionService.AddTypeAsync(viewModel.Name, viewModel.DisplayName);
 
-            var typeViewModel = new EditTypeViewModel(contentTypeDefinition);
+        var typeViewModel = new EditTypeViewModel(contentTypeDefinition);
 
-            await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
+        await _notifier.SuccessAsync(H["The \"{0}\" content type has been created.", typeViewModel.DisplayName]);
 
-            return RedirectToAction("AddPartsTo", new { id = typeViewModel.Name });
+        return RedirectToAction("AddPartsTo", new { id = typeViewModel.Name });
+    }
+
+    [Admin("ContentTypes/Edit/{id}", "EditType")]
+    public async Task<ActionResult> Edit(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
         }
 
-        [Admin("ContentTypes/Edit/{id}", "EditType")]
-        public async Task<ActionResult> Edit(string id)
+        var typeViewModel = await _contentDefinitionService.GetTypeAsync(id);
+
+        if (typeViewModel == null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
+            return NotFound();
+        }
 
-            var typeViewModel = await _contentDefinitionService.GetTypeAsync(id);
+        typeViewModel.Editor = await _contentDefinitionDisplayManager.BuildTypeEditorAsync(typeViewModel.TypeDefinition, _updateModelAccessor.ModelUpdater);
 
-            if (typeViewModel == null)
-            {
-                return NotFound();
-            }
+        return View(typeViewModel);
+    }
+
+    [HttpPost, ActionName("Edit")]
+    [FormValueRequired("submit.Save")]
+    public async Task<ActionResult> EditPOST(string id, EditTypeViewModel viewModel)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
+        }
 
-            typeViewModel.Editor = await _contentDefinitionDisplayManager.BuildTypeEditorAsync(typeViewModel.TypeDefinition, _updateModelAccessor.ModelUpdater);
+        var contentTypeDefinition = await _contentDefinitionManager.LoadTypeDefinitionAsync(id);
 
-            return View(typeViewModel);
+        if (contentTypeDefinition == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost, ActionName("Edit")]
-        [FormValueRequired("submit.Save")]
-        public async Task<ActionResult> EditPOST(string id, EditTypeViewModel viewModel)
+        viewModel.Settings = contentTypeDefinition.Settings;
+        viewModel.TypeDefinition = contentTypeDefinition;
+        viewModel.DisplayName = contentTypeDefinition.DisplayName;
+        viewModel.Editor = await _contentDefinitionDisplayManager.UpdateTypeEditorAsync(contentTypeDefinition, _updateModelAccessor.ModelUpdater);
+
+        if (!ModelState.IsValid)
+        {
+            await _documentStore.CancelAsync();
+
+            return View(viewModel);
+        }
+        else
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+            var ownedPartDefinition = await _contentDefinitionManager.LoadPartDefinitionAsync(contentTypeDefinition.Name);
+            if (ownedPartDefinition != null && viewModel.OrderedFieldNames != null)
             {
-                return Forbid();
+                await _contentDefinitionService.AlterPartFieldsOrderAsync(ownedPartDefinition, viewModel.OrderedFieldNames);
             }
+            await _contentDefinitionService.AlterTypePartsOrderAsync(contentTypeDefinition, viewModel.OrderedPartNames);
+            await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
+        }
 
-            var contentTypeDefinition = await _contentDefinitionManager.LoadTypeDefinitionAsync(id);
+        return RedirectToAction(nameof(Edit), new { id });
+    }
 
-            if (contentTypeDefinition == null)
-            {
-                return NotFound();
-            }
+    [HttpPost, ActionName("Edit")]
+    [FormValueRequired("submit.Delete")]
+    public async Task<ActionResult> Delete(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
+        }
 
-            viewModel.Settings = contentTypeDefinition.Settings;
-            viewModel.TypeDefinition = contentTypeDefinition;
-            viewModel.DisplayName = contentTypeDefinition.DisplayName;
-            viewModel.Editor = await _contentDefinitionDisplayManager.UpdateTypeEditorAsync(contentTypeDefinition, _updateModelAccessor.ModelUpdater);
+        var typeViewModel = await _contentDefinitionService.LoadTypeAsync(id);
 
-            if (!ModelState.IsValid)
-            {
-                await _documentStore.CancelAsync();
+        if (typeViewModel == null)
+        {
+            return NotFound();
+        }
 
-                return View(viewModel);
-            }
-            else
-            {
-                var ownedPartDefinition = await _contentDefinitionManager.LoadPartDefinitionAsync(contentTypeDefinition.Name);
-                if (ownedPartDefinition != null && viewModel.OrderedFieldNames != null)
-                {
-                    await _contentDefinitionService.AlterPartFieldsOrderAsync(ownedPartDefinition, viewModel.OrderedFieldNames);
-                }
-                await _contentDefinitionService.AlterTypePartsOrderAsync(contentTypeDefinition, viewModel.OrderedPartNames);
-                await _notifier.SuccessAsync(H["\"{0}\" settings have been saved.", contentTypeDefinition.Name]);
-            }
+        await _contentDefinitionService.RemoveTypeAsync(id, true);
 
-            return RedirectToAction(nameof(Edit), new { id });
+        await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
+
+        return RedirectToAction(nameof(List));
+    }
+
+    [Admin("ContentTypes/AddPartsTo/{id}", "AddPartsTo")]
+    public async Task<ActionResult> AddPartsTo(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName("Edit")]
-        [FormValueRequired("submit.Delete")]
-        public async Task<ActionResult> Delete(string id)
+        var typeViewModel = await _contentDefinitionService.GetTypeAsync(id);
+
+        if (typeViewModel == null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
+            return NotFound();
+        }
 
-            var typeViewModel = await _contentDefinitionService.LoadTypeAsync(id);
+        var typePartNames = new HashSet<string>(typeViewModel.TypeDefinition.Parts.Select(p => p.IsNamedPart() ? p.Name : p.PartDefinition.Name));
 
-            if (typeViewModel == null)
-            {
-                return NotFound();
-            }
+        var viewModel = new AddPartsViewModel
+        {
+            Type = typeViewModel,
+            PartSelections = (await _contentDefinitionService.GetPartsAsync(metadataPartsOnly: false))
+                .Where(cpd => !typePartNames.Contains(cpd.Name, StringComparer.OrdinalIgnoreCase) && cpd.PartDefinition != null && cpd.PartDefinition.GetSettings<ContentPartSettings>().Attachable)
+                .Select(cpd => new PartSelectionViewModel { PartName = cpd.Name, PartDisplayName = cpd.DisplayName, PartDescription = cpd.Description })
+                .ToList()
+        };
+
+        return View(viewModel);
+    }
 
-            await _contentDefinitionService.RemoveTypeAsync(id, true);
+    [Admin("ContentTypes/AddReusablePartTo/{id}", "AddReusablePartTo")]
+    public async Task<ActionResult> AddReusablePartTo(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
+        }
 
-            await _notifier.SuccessAsync(H["\"{0}\" has been removed.", typeViewModel.DisplayName]);
+        var typeViewModel = await _contentDefinitionService.GetTypeAsync(id);
 
-            return RedirectToAction(nameof(List));
+        if (typeViewModel == null)
+        {
+            return NotFound();
         }
 
-        [Admin("ContentTypes/AddPartsTo/{id}", "AddPartsTo")]
-        public async Task<ActionResult> AddPartsTo(string id)
+        var reusableParts = (await _contentDefinitionService.GetPartsAsync(metadataPartsOnly: false))
+                .Where(cpd => cpd.PartDefinition != null &&
+                    cpd.PartDefinition.GetSettings<ContentPartSettings>().Attachable &&
+                    cpd.PartDefinition.GetSettings<ContentPartSettings>().Reusable);
+
+        var viewModel = new AddReusablePartViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
+            Type = typeViewModel,
+            PartSelections = reusableParts
+                .Select(cpd => new PartSelectionViewModel { PartName = cpd.Name, PartDisplayName = cpd.DisplayName, PartDescription = cpd.Description })
+                .ToList(),
+            SelectedPartName = reusableParts.FirstOrDefault()?.Name
+        };
+
+        return View(viewModel);
+    }
 
-            var typeViewModel = await _contentDefinitionService.GetTypeAsync(id);
+    [HttpPost, ActionName("AddPartsTo")]
+    public async Task<ActionResult> AddPartsToPOST(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
+        }
 
-            if (typeViewModel == null)
-            {
-                return NotFound();
-            }
+        var typeViewModel = await _contentDefinitionService.LoadTypeAsync(id);
 
-            var typePartNames = new HashSet<string>(typeViewModel.TypeDefinition.Parts.Select(p => p.IsNamedPart() ? p.Name : p.PartDefinition.Name));
+        if (typeViewModel == null)
+        {
+            return NotFound();
+        }
 
-            var viewModel = new AddPartsViewModel
-            {
-                Type = typeViewModel,
-                PartSelections = (await _contentDefinitionService.GetPartsAsync(metadataPartsOnly: false))
-                    .Where(cpd => !typePartNames.Contains(cpd.Name, StringComparer.OrdinalIgnoreCase) && cpd.PartDefinition != null && cpd.PartDefinition.GetSettings<ContentPartSettings>().Attachable)
-                    .Select(cpd => new PartSelectionViewModel { PartName = cpd.Name, PartDisplayName = cpd.DisplayName, PartDescription = cpd.Description })
-                    .ToList()
-            };
+        var viewModel = new AddPartsViewModel();
+        if (!await TryUpdateModelAsync(viewModel))
+        {
+            return await AddPartsTo(id);
+        }
 
-            return View(viewModel);
+        var partsToAdd = viewModel.PartSelections.Where(ps => ps.IsSelected).Select(ps => ps.PartName);
+        foreach (var partToAdd in partsToAdd)
+        {
+            await _contentDefinitionService.AddPartToTypeAsync(partToAdd, typeViewModel.Name);
+            await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
         }
 
-        [Admin("ContentTypes/AddReusablePartTo/{id}", "AddReusablePartTo")]
-        public async Task<ActionResult> AddReusablePartTo(string id)
+        if (!ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
+            await _documentStore.CancelAsync();
+            return await AddPartsTo(id);
+        }
 
-            var typeViewModel = await _contentDefinitionService.GetTypeAsync(id);
+        return RedirectToAction(nameof(Edit), new { id });
+    }
 
-            if (typeViewModel == null)
-            {
-                return NotFound();
-            }
+    [HttpPost, ActionName("AddReusablePartTo")]
+    public async Task<ActionResult> AddReusablePartToPOST(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
+        }
 
-            var reusableParts = (await _contentDefinitionService.GetPartsAsync(metadataPartsOnly: false))
-                    .Where(cpd => cpd.PartDefinition != null &&
-                        cpd.PartDefinition.GetSettings<ContentPartSettings>().Attachable &&
-                        cpd.PartDefinition.GetSettings<ContentPartSettings>().Reusable);
+        var typeViewModel = await _contentDefinitionService.LoadTypeAsync(id);
 
-            var viewModel = new AddReusablePartViewModel
-            {
-                Type = typeViewModel,
-                PartSelections = reusableParts
-                    .Select(cpd => new PartSelectionViewModel { PartName = cpd.Name, PartDisplayName = cpd.DisplayName, PartDescription = cpd.Description })
-                    .ToList(),
-                SelectedPartName = reusableParts.FirstOrDefault()?.Name
-            };
+        if (typeViewModel == null)
+        {
+            return NotFound();
+        }
 
-            return View(viewModel);
+        var viewModel = new AddReusablePartViewModel();
+        if (!await TryUpdateModelAsync(viewModel))
+        {
+            return await AddReusablePartTo(id);
         }
 
-        [HttpPost, ActionName("AddPartsTo")]
-        public async Task<ActionResult> AddPartsToPOST(string id)
+        viewModel.DisplayName = viewModel.DisplayName?.Trim() ?? string.Empty;
+        viewModel.Name ??= string.Empty;
+
+        if (string.IsNullOrWhiteSpace(viewModel.DisplayName))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
+            ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
+        }
 
-            var typeViewModel = await _contentDefinitionService.LoadTypeAsync(id);
+        if (typeViewModel.TypeDefinition.Parts.Any(f => string.Equals(f.DisplayName().Trim(), viewModel.DisplayName.Trim(), StringComparison.OrdinalIgnoreCase)))
+        {
+            ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
+        }
 
-            if (typeViewModel == null)
-            {
-                return NotFound();
-            }
+        if (!string.IsNullOrWhiteSpace(viewModel.Name) && !char.IsLetter(viewModel.Name[0]))
+        {
+            ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
+        }
 
-            var viewModel = new AddPartsViewModel();
-            if (!await TryUpdateModelAsync(viewModel))
-            {
-                return await AddPartsTo(id);
-            }
+        if (!string.Equals(viewModel.Name, viewModel.Name.ToSafeName(), StringComparison.OrdinalIgnoreCase))
+        {
+            ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
+        }
 
-            var partsToAdd = viewModel.PartSelections.Where(ps => ps.IsSelected).Select(ps => ps.PartName);
-            foreach (var partToAdd in partsToAdd)
-            {
-                await _contentDefinitionService.AddPartToTypeAsync(partToAdd, typeViewModel.Name);
-                await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
-            }
+        if (viewModel.Name.IsReservedContentName())
+        {
+            ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
+        }
 
-            if (!ModelState.IsValid)
-            {
-                await _documentStore.CancelAsync();
-                return await AddPartsTo(id);
-            }
+        if (string.IsNullOrWhiteSpace(viewModel.Name))
+        {
+            ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
+        }
 
-            return RedirectToAction(nameof(Edit), new { id });
+        if (typeViewModel.TypeDefinition.Parts.Any(f => string.Equals(f.Name.Trim(), viewModel.Name.Trim(), StringComparison.OrdinalIgnoreCase)))
+        {
+            ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
         }
 
-        [HttpPost, ActionName("AddReusablePartTo")]
-        public async Task<ActionResult> AddReusablePartToPOST(string id)
+        if (!ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
+            await _documentStore.CancelAsync();
+            return await AddReusablePartTo(id);
+        }
 
-            var typeViewModel = await _contentDefinitionService.LoadTypeAsync(id);
+        var partToAdd = viewModel.SelectedPartName;
 
-            if (typeViewModel == null)
-            {
-                return NotFound();
-            }
+        await _contentDefinitionService.AddReusablePartToTypeAsync(viewModel.Name, viewModel.DisplayName, viewModel.Description, partToAdd, typeViewModel.Name);
 
-            var viewModel = new AddReusablePartViewModel();
-            if (!await TryUpdateModelAsync(viewModel))
-            {
-                return await AddReusablePartTo(id);
-            }
+        await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
 
-            viewModel.DisplayName = viewModel.DisplayName?.Trim() ?? string.Empty;
-            viewModel.Name ??= string.Empty;
+        return RedirectToAction(nameof(Edit), new { id });
+    }
 
-            if (string.IsNullOrWhiteSpace(viewModel.DisplayName))
-            {
-                ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
-            }
+    [HttpPost, ActionName("RemovePart")]
+    [Admin("ContentTypes/{id}/ContentParts/{name}/Remove", "RemovePart")]
+    public async Task<ActionResult> RemovePart(string id, string name)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
+        }
 
-            if (typeViewModel.TypeDefinition.Parts.Any(f => string.Equals(f.DisplayName().Trim(), viewModel.DisplayName.Trim(), StringComparison.OrdinalIgnoreCase)))
-            {
-                ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-            }
+        var typeViewModel = await _contentDefinitionService.LoadTypeAsync(id);
 
-            if (!string.IsNullOrWhiteSpace(viewModel.Name) && !char.IsLetter(viewModel.Name[0]))
-            {
-                ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-            }
+        if (typeViewModel == null || !typeViewModel.TypeDefinition.Parts.Any(p => string.Equals(p.Name, name, StringComparison.OrdinalIgnoreCase)))
+        {
+            return NotFound();
+        }
 
-            if (!string.Equals(viewModel.Name, viewModel.Name.ToSafeName(), StringComparison.OrdinalIgnoreCase))
-            {
-                ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-            }
+        await _contentDefinitionService.RemovePartFromTypeAsync(name, id);
 
-            if (viewModel.Name.IsReservedContentName())
-            {
-                ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-            }
+        await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
 
-            if (string.IsNullOrWhiteSpace(viewModel.Name))
-            {
-                ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-            }
+        return RedirectToAction(nameof(Edit), new { id });
+    }
 
-            if (typeViewModel.TypeDefinition.Parts.Any(f => string.Equals(f.Name.Trim(), viewModel.Name.Trim(), StringComparison.OrdinalIgnoreCase)))
-            {
-                ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-            }
+    #endregion Types
 
-            if (!ModelState.IsValid)
-            {
-                await _documentStore.CancelAsync();
-                return await AddReusablePartTo(id);
-            }
+    #region Parts
 
-            var partToAdd = viewModel.SelectedPartName;
+    [Admin("ContentTypes/ListParts", "ListContentParts")]
+    public async Task<ActionResult> ListParts()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ViewContentTypes))
+        {
+            return Forbid();
+        }
 
-            await _contentDefinitionService.AddReusablePartToTypeAsync(viewModel.Name, viewModel.DisplayName, viewModel.Description, partToAdd, typeViewModel.Name);
+        return View(new ListContentPartsViewModel
+        {
+            // only user-defined parts (not code as they are not configurable)
+            Parts = await _contentDefinitionService.GetPartsAsync(true/*metadataPartsOnly*/)
+        });
+    }
 
-            await _notifier.SuccessAsync(H["The \"{0}\" part has been added.", partToAdd]);
+    [Admin("ContentParts/Create", "CreatePart")]
+    public async Task<ActionResult> CreatePart(string suggestion)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
+        }
 
-            return RedirectToAction(nameof(Edit), new { id });
+        return View(new CreatePartViewModel { Name = suggestion.ToSafeName() });
+    }
+
+    [HttpPost, ActionName("CreatePart")]
+    public async Task<ActionResult> CreatePartPOST(CreatePartViewModel viewModel)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName("RemovePart")]
-        [Admin("ContentTypes/{id}/ContentParts/{name}/Remove", "RemovePart")]
-        public async Task<ActionResult> RemovePart(string id, string name)
+        viewModel.Name ??= string.Empty;
+
+        if (string.IsNullOrWhiteSpace(viewModel.Name))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
+            ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
+        }
 
-            var typeViewModel = await _contentDefinitionService.LoadTypeAsync(id);
+        if ((await _contentDefinitionService.LoadPartsAsync(false)).Any(p => string.Equals(p.Name.Trim(), viewModel.Name.Trim(), StringComparison.OrdinalIgnoreCase)))
+        {
+            ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
+        }
 
-            if (typeViewModel == null || !typeViewModel.TypeDefinition.Parts.Any(p => string.Equals(p.Name, name, StringComparison.OrdinalIgnoreCase)))
-            {
-                return NotFound();
-            }
+        if (!string.IsNullOrWhiteSpace(viewModel.Name) && !char.IsLetter(viewModel.Name[0]))
+        {
+            ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
+        }
 
-            await _contentDefinitionService.RemovePartFromTypeAsync(name, id);
+        if (!string.Equals(viewModel.Name, viewModel.Name.ToSafeName(), StringComparison.OrdinalIgnoreCase))
+        {
+            ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
+        }
 
-            await _notifier.SuccessAsync(H["The \"{0}\" part has been removed.", name]);
+        if (viewModel.Name.IsReservedContentName())
+        {
+            ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
+        }
 
-            return RedirectToAction(nameof(Edit), new { id });
+        if (!ModelState.IsValid)
+        {
+            return View(viewModel);
+        }
+
+        var partViewModel = await _contentDefinitionService.AddPartAsync(viewModel);
+
+        if (partViewModel == null)
+        {
+            await _notifier.InformationAsync(H["The content part could not be created."]);
+            return View(viewModel);
         }
 
-        #endregion Types
+        await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
 
-        #region Parts
+        return RedirectToAction(nameof(EditPart), new { id = partViewModel.Name });
+    }
 
-        [Admin("ContentTypes/ListParts", "ListContentParts")]
-        public async Task<ActionResult> ListParts()
+    [Admin("ContentParts/Edit/{id}", "EditPart")]
+    public async Task<ActionResult> EditPart(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ViewContentTypes))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            return View(new ListContentPartsViewModel
-            {
-                // only user-defined parts (not code as they are not configurable)
-                Parts = await _contentDefinitionService.GetPartsAsync(true/*metadataPartsOnly*/)
-            });
+        var contentPartDefinition = await _contentDefinitionManager.GetPartDefinitionAsync(id);
+
+        if (contentPartDefinition == null)
+        {
+            return NotFound();
         }
 
-        [Admin("ContentParts/Create", "CreatePart")]
-        public async Task<ActionResult> CreatePart(string suggestion)
+        var viewModel = new EditPartViewModel(contentPartDefinition)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
+            Editor = await _contentDefinitionDisplayManager.BuildPartEditorAsync(contentPartDefinition, _updateModelAccessor.ModelUpdater),
+        };
+
+        return View(viewModel);
+    }
 
-            return View(new CreatePartViewModel { Name = suggestion.ToSafeName() });
+    [HttpPost, ActionName("EditPart")]
+    [FormValueRequired("submit.Save")]
+    public async Task<ActionResult> EditPartPOST(string id, string[] orderedFieldNames)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName("CreatePart")]
-        public async Task<ActionResult> CreatePartPOST(CreatePartViewModel viewModel)
+        var contentPartDefinition = await _contentDefinitionManager.LoadPartDefinitionAsync(id);
+
+        if (contentPartDefinition == null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
+            return NotFound();
+        }
 
-            viewModel.Name ??= string.Empty;
+        var viewModel = new EditPartViewModel(contentPartDefinition)
+        {
+            Editor = await _contentDefinitionDisplayManager.UpdatePartEditorAsync(contentPartDefinition, _updateModelAccessor.ModelUpdater),
+        };
 
-            if (string.IsNullOrWhiteSpace(viewModel.Name))
-            {
-                ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-            }
+        if (!ModelState.IsValid)
+        {
+            await _documentStore.CancelAsync();
+            return View(viewModel);
+        }
+        else
+        {
+            await _contentDefinitionService.AlterPartFieldsOrderAsync(contentPartDefinition, orderedFieldNames);
+            await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
+        }
 
-            if ((await _contentDefinitionService.LoadPartsAsync(false)).Any(p => string.Equals(p.Name.Trim(), viewModel.Name.Trim(), StringComparison.OrdinalIgnoreCase)))
-            {
-                ModelState.AddModelError("Name", S["A part with the same Technical Name already exists."]);
-            }
+        return RedirectToAction(nameof(EditPart), new { id });
+    }
 
-            if (!string.IsNullOrWhiteSpace(viewModel.Name) && !char.IsLetter(viewModel.Name[0]))
-            {
-                ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-            }
+    [HttpPost, ActionName("EditPart")]
+    [FormValueRequired("submit.Delete")]
+    public async Task<ActionResult> DeletePart(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
+        }
 
-            if (!string.Equals(viewModel.Name, viewModel.Name.ToSafeName(), StringComparison.OrdinalIgnoreCase))
-            {
-                ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-            }
+        var partViewModel = await _contentDefinitionService.LoadPartAsync(id);
 
-            if (viewModel.Name.IsReservedContentName())
-            {
-                ModelState.AddModelError("Name", S["The Technical Name is reserved for internal use."]);
-            }
+        if (partViewModel == null)
+        {
+            return NotFound();
+        }
 
-            if (!ModelState.IsValid)
-            {
-                return View(viewModel);
-            }
+        await _contentDefinitionService.RemovePartAsync(id);
+
+        await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
+
+        return RedirectToAction(nameof(ListParts));
+    }
+
+    [Admin("ContentTypes/AddFieldsTo/{id}", "AddFieldsTo")]
+    public async Task<ActionResult> AddFieldTo(string id, string returnUrl = null)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
+        }
 
-            var partViewModel = await _contentDefinitionService.AddPartAsync(viewModel);
+        var fields = (await _contentDefinitionService.GetFieldsAsync()).ToList();
 
-            if (partViewModel == null)
-            {
-                await _notifier.InformationAsync(H["The content part could not be created."]);
-                return View(viewModel);
-            }
+        if (fields.Count == 0)
+        {
+            await _notifier.WarningAsync(H["There are no fields."]);
+
+            return RedirectToAction(nameof(List));
+        }
 
-            await _notifier.SuccessAsync(H["The \"{0}\" content part has been created.", partViewModel.Name]);
+        var partViewModel = await _contentDefinitionService.LoadPartAsync(id);
 
-            return RedirectToAction(nameof(EditPart), new { id = partViewModel.Name });
+        if (partViewModel == null)
+        {
+            return NotFound();
         }
 
-        [Admin("ContentParts/Edit/{id}", "EditPart")]
-        public async Task<ActionResult> EditPart(string id)
+        var viewModel = new AddFieldViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
+            Part = partViewModel.PartDefinition,
+            Fields = fields.Select(field => field.Name).OrderBy(name => name).ToList()
+        };
 
-            var contentPartDefinition = await _contentDefinitionManager.GetPartDefinitionAsync(id);
+        ViewData["ReturnUrl"] = returnUrl;
+        return View(viewModel);
+    }
 
-            if (contentPartDefinition == null)
-            {
-                return NotFound();
-            }
+    [HttpPost, ActionName("AddFieldTo")]
+    public async Task<ActionResult> AddFieldToPOST(AddFieldViewModel viewModel, string id, string returnUrl = null)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
+        }
 
-            var viewModel = new EditPartViewModel(contentPartDefinition)
-            {
-                Editor = await _contentDefinitionDisplayManager.BuildPartEditorAsync(contentPartDefinition, _updateModelAccessor.ModelUpdater),
-            };
+        var partViewModel = await _contentDefinitionService.LoadPartAsync(id);
 
-            return View(viewModel);
+        if (partViewModel == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost, ActionName("EditPart")]
-        [FormValueRequired("submit.Save")]
-        public async Task<ActionResult> EditPartPOST(string id, string[] orderedFieldNames)
+        var fields = (await _contentDefinitionService.GetFieldsAsync()).ToList();
+
+        if (!fields.Any(field => string.Equals(field.Name, viewModel.FieldTypeName, StringComparison.OrdinalIgnoreCase)))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
+            return NotFound();
+        }
 
-            var contentPartDefinition = await _contentDefinitionManager.LoadPartDefinitionAsync(id);
+        var partDefinition = partViewModel.PartDefinition;
 
-            if (contentPartDefinition == null)
-            {
-                return NotFound();
-            }
+        viewModel.DisplayName = viewModel.DisplayName?.Trim() ?? string.Empty;
+        viewModel.Name ??= string.Empty;
 
-            var viewModel = new EditPartViewModel(contentPartDefinition)
-            {
-                Editor = await _contentDefinitionDisplayManager.UpdatePartEditorAsync(contentPartDefinition, _updateModelAccessor.ModelUpdater),
-            };
+        if (string.IsNullOrWhiteSpace(viewModel.DisplayName))
+        {
+            ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
+        }
 
-            if (!ModelState.IsValid)
-            {
-                await _documentStore.CancelAsync();
-                return View(viewModel);
-            }
-            else
-            {
-                await _contentDefinitionService.AlterPartFieldsOrderAsync(contentPartDefinition, orderedFieldNames);
-                await _notifier.SuccessAsync(H["The settings of \"{0}\" have been saved.", contentPartDefinition.Name]);
-            }
+        if (partDefinition.Fields.Any(f => string.Equals(f.DisplayName().Trim(), viewModel.DisplayName.Trim(), StringComparison.OrdinalIgnoreCase)))
+        {
+            ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
+        }
 
-            return RedirectToAction(nameof(EditPart), new { id });
+        if (string.IsNullOrWhiteSpace(viewModel.Name))
+        {
+            ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
         }
 
-        [HttpPost, ActionName("EditPart")]
-        [FormValueRequired("submit.Delete")]
-        public async Task<ActionResult> DeletePart(string id)
+        if (partDefinition.Fields.Any(f => string.Equals(f.Name.Trim(), viewModel.Name.Trim(), StringComparison.OrdinalIgnoreCase)))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
+            ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
+        }
 
-            var partViewModel = await _contentDefinitionService.LoadPartAsync(id);
+        if (!string.IsNullOrWhiteSpace(viewModel.Name) && !char.IsLetter(viewModel.Name[0]))
+        {
+            ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
+        }
 
-            if (partViewModel == null)
-            {
-                return NotFound();
-            }
+        if (!string.Equals(viewModel.Name, viewModel.Name.ToSafeName(), StringComparison.OrdinalIgnoreCase))
+        {
+            ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
+        }
 
-            await _contentDefinitionService.RemovePartAsync(id);
+        if (!ModelState.IsValid)
+        {
+            viewModel.Part = partDefinition;
+            viewModel.Fields = (await _contentDefinitionService.GetFieldsAsync()).Select(x => x.Name).OrderBy(x => x).ToList();
 
-            await _notifier.InformationAsync(H["\"{0}\" has been removed.", partViewModel.DisplayName]);
+            await _documentStore.CancelAsync();
 
-            return RedirectToAction(nameof(ListParts));
+            ViewData["ReturnUrl"] = returnUrl;
+            return View(viewModel);
         }
 
-        [Admin("ContentTypes/AddFieldsTo/{id}", "AddFieldsTo")]
-        public async Task<ActionResult> AddFieldTo(string id, string returnUrl = null)
+        await _contentDefinitionService.AddFieldToPartAsync(viewModel.Name, viewModel.DisplayName, viewModel.FieldTypeName, partDefinition.Name);
+
+        await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
+
+        if (!string.IsNullOrEmpty(returnUrl) && Url.IsLocalUrl(returnUrl))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
+            return this.Redirect(returnUrl, true);
+        }
+        else
+        {
+            return RedirectToAction(nameof(EditField), new { id, viewModel.Name });
+        }
+    }
 
-            var fields = (await _contentDefinitionService.GetFieldsAsync()).ToList();
+    [Admin("ContentParts/{id}/Fields/{name}/Edit", "EditField")]
+    public async Task<ActionResult> EditField(string id, string name, string returnUrl = null)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
+        }
 
-            if (fields.Count == 0)
-            {
-                await _notifier.WarningAsync(H["There are no fields."]);
+        var partViewModel = await _contentDefinitionService.GetPartAsync(id);
 
-                return RedirectToAction(nameof(List));
-            }
+        if (partViewModel == null)
+        {
+            return NotFound();
+        }
 
-            var partViewModel = await _contentDefinitionService.LoadPartAsync(id);
+        var partFieldDefinition = partViewModel.PartDefinition.Fields.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.OrdinalIgnoreCase));
 
-            if (partViewModel == null)
-            {
-                return NotFound();
-            }
+        if (partFieldDefinition?.FieldDefinition?.Name == null
+            || !(await _contentDefinitionService.GetFieldsAsync()).Any(field => string.Equals(field.Name, partFieldDefinition.FieldDefinition.Name, StringComparison.OrdinalIgnoreCase)))
+        {
+            return NotFound();
+        }
 
-            var viewModel = new AddFieldViewModel
-            {
-                Part = partViewModel.PartDefinition,
-                Fields = fields.Select(field => field.Name).OrderBy(name => name).ToList()
-            };
+        var viewModel = new EditFieldViewModel
+        {
+            Name = partFieldDefinition.Name,
+            Editor = partFieldDefinition.Editor(),
+            DisplayMode = partFieldDefinition.DisplayMode(),
+            DisplayName = partFieldDefinition.DisplayName(),
+            PartFieldDefinition = partFieldDefinition,
+            Shape = await _contentDefinitionDisplayManager.BuildPartFieldEditorAsync(partFieldDefinition, _updateModelAccessor.ModelUpdater)
+        };
+
+        ViewData["ReturnUrl"] = returnUrl;
+        return View(viewModel);
+    }
 
-            ViewData["ReturnUrl"] = returnUrl;
-            return View(viewModel);
+    [HttpPost, ActionName("EditField")]
+    [FormValueRequired("submit.Save")]
+    public async Task<ActionResult> EditFieldPOST(string id, EditFieldViewModel viewModel, string returnUrl = null)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName("AddFieldTo")]
-        public async Task<ActionResult> AddFieldToPOST(AddFieldViewModel viewModel, string id, string returnUrl = null)
+        if (viewModel == null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
+            return NotFound();
+        }
 
-            var partViewModel = await _contentDefinitionService.LoadPartAsync(id);
+        var partViewModel = await _contentDefinitionService.LoadPartAsync(id);
 
-            if (partViewModel == null)
-            {
-                return NotFound();
-            }
+        if (partViewModel == null)
+        {
+            return NotFound();
+        }
 
-            var fields = (await _contentDefinitionService.GetFieldsAsync()).ToList();
+        var field = (await _contentDefinitionManager.LoadPartDefinitionAsync(id)).Fields.FirstOrDefault(x => string.Equals(x.Name, viewModel.Name, StringComparison.OrdinalIgnoreCase));
 
-            if (!fields.Any(field => string.Equals(field.Name, viewModel.FieldTypeName, StringComparison.OrdinalIgnoreCase)))
-            {
-                return NotFound();
-            }
+        if (field == null)
+        {
+            return NotFound();
+        }
 
-            var partDefinition = partViewModel.PartDefinition;
+        viewModel.PartFieldDefinition = field;
 
+        if (field.DisplayName() != viewModel.DisplayName)
+        {
+            // prevent null reference exception in validation
             viewModel.DisplayName = viewModel.DisplayName?.Trim() ?? string.Empty;
-            viewModel.Name ??= string.Empty;
 
             if (string.IsNullOrWhiteSpace(viewModel.DisplayName))
             {
                 ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
             }
 
-            if (partDefinition.Fields.Any(f => string.Equals(f.DisplayName().Trim(), viewModel.DisplayName.Trim(), StringComparison.OrdinalIgnoreCase)))
+            if ((await _contentDefinitionService.LoadPartAsync(partViewModel.Name)).PartDefinition.Fields.Any(t => t.Name != viewModel.Name && string.Equals(t.DisplayName().Trim(), viewModel.DisplayName.Trim(), StringComparison.OrdinalIgnoreCase)))
             {
                 ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
             }
 
-            if (string.IsNullOrWhiteSpace(viewModel.Name))
-            {
-                ModelState.AddModelError("Name", S["The Technical Name can't be empty."]);
-            }
-
-            if (partDefinition.Fields.Any(f => string.Equals(f.Name.Trim(), viewModel.Name.Trim(), StringComparison.OrdinalIgnoreCase)))
-            {
-                ModelState.AddModelError("Name", S["A field with the same Technical Name already exists."]);
-            }
-
-            if (!string.IsNullOrWhiteSpace(viewModel.Name) && !char.IsLetter(viewModel.Name[0]))
-            {
-                ModelState.AddModelError("Name", S["The Technical Name must start with a letter."]);
-            }
-
-            if (!string.Equals(viewModel.Name, viewModel.Name.ToSafeName(), StringComparison.OrdinalIgnoreCase))
-            {
-                ModelState.AddModelError("Name", S["The Technical Name contains invalid characters."]);
-            }
-
             if (!ModelState.IsValid)
             {
-                viewModel.Part = partDefinition;
-                viewModel.Fields = (await _contentDefinitionService.GetFieldsAsync()).Select(x => x.Name).OrderBy(x => x).ToList();
-
+                // Calls update to build editor shape with the display name validation failures, and other validation errors.
+                viewModel.Shape = await _contentDefinitionDisplayManager.UpdatePartFieldEditorAsync(field, _updateModelAccessor.ModelUpdater);
                 await _documentStore.CancelAsync();
 
                 ViewData["ReturnUrl"] = returnUrl;
                 return View(viewModel);
             }
 
-            await _contentDefinitionService.AddFieldToPartAsync(viewModel.Name, viewModel.DisplayName, viewModel.FieldTypeName, partDefinition.Name);
-
-            await _notifier.SuccessAsync(H["The field \"{0}\" has been added.", viewModel.DisplayName]);
-
-            if (!string.IsNullOrEmpty(returnUrl) && Url.IsLocalUrl(returnUrl))
-            {
-                return this.Redirect(returnUrl, true);
-            }
-            else
-            {
-                return RedirectToAction(nameof(EditField), new { id, viewModel.Name });
-            }
+            await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
         }
 
-        [Admin("ContentParts/{id}/Fields/{name}/Edit", "EditField")]
-        public async Task<ActionResult> EditField(string id, string name, string returnUrl = null)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
-
-            var partViewModel = await _contentDefinitionService.GetPartAsync(id);
-
-            if (partViewModel == null)
-            {
-                return NotFound();
-            }
+        await _contentDefinitionService.AlterFieldAsync(partViewModel, viewModel);
 
-            var partFieldDefinition = partViewModel.PartDefinition.Fields.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.OrdinalIgnoreCase));
+        // Refresh the local field variable in case it has been altered
+        field = (await _contentDefinitionManager.LoadPartDefinitionAsync(id)).Fields.FirstOrDefault(x => string.Equals(x.Name, viewModel.Name, StringComparison.OrdinalIgnoreCase));
 
-            if (partFieldDefinition?.FieldDefinition?.Name == null
-                || !(await _contentDefinitionService.GetFieldsAsync()).Any(field => string.Equals(field.Name, partFieldDefinition.FieldDefinition.Name, StringComparison.OrdinalIgnoreCase)))
-            {
-                return NotFound();
-            }
+        viewModel.Shape = await _contentDefinitionDisplayManager.UpdatePartFieldEditorAsync(field, _updateModelAccessor.ModelUpdater);
 
-            var viewModel = new EditFieldViewModel
-            {
-                Name = partFieldDefinition.Name,
-                Editor = partFieldDefinition.Editor(),
-                DisplayMode = partFieldDefinition.DisplayMode(),
-                DisplayName = partFieldDefinition.DisplayName(),
-                PartFieldDefinition = partFieldDefinition,
-                Shape = await _contentDefinitionDisplayManager.BuildPartFieldEditorAsync(partFieldDefinition, _updateModelAccessor.ModelUpdater)
-            };
+        if (!ModelState.IsValid)
+        {
+            await _documentStore.CancelAsync();
 
             ViewData["ReturnUrl"] = returnUrl;
             return View(viewModel);
         }
-
-        [HttpPost, ActionName("EditField")]
-        [FormValueRequired("submit.Save")]
-        public async Task<ActionResult> EditFieldPOST(string id, EditFieldViewModel viewModel, string returnUrl = null)
+        else
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
+            await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
+        }
 
-            if (viewModel == null)
+        if (!string.IsNullOrEmpty(returnUrl) && Url.IsLocalUrl(returnUrl))
+        {
+            return this.Redirect(returnUrl, true);
+        }
+        else
+        {
+            // Redirect to the type editor if a type exists with this name
+            var typeViewModel = await _contentDefinitionService.LoadTypeAsync(id);
+            if (typeViewModel != null)
             {
-                return NotFound();
+                return RedirectToAction(nameof(Edit), new { id });
             }
 
-            var partViewModel = await _contentDefinitionService.LoadPartAsync(id);
-
-            if (partViewModel == null)
-            {
-                return NotFound();
-            }
+            return RedirectToAction(nameof(EditPart), new { id });
+        }
+    }
 
-            var field = (await _contentDefinitionManager.LoadPartDefinitionAsync(id)).Fields.FirstOrDefault(x => string.Equals(x.Name, viewModel.Name, StringComparison.OrdinalIgnoreCase));
+    [HttpPost, ActionName("RemoveFieldFrom")]
+    public async Task<ActionResult> RemoveFieldFromPOST(string id, string name)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
+        }
 
-            if (field == null)
-            {
-                return NotFound();
-            }
+        var partViewModel = await _contentDefinitionService.LoadPartAsync(id);
 
-            viewModel.PartFieldDefinition = field;
+        if (partViewModel == null)
+        {
+            return NotFound();
+        }
 
-            if (field.DisplayName() != viewModel.DisplayName)
-            {
-                // prevent null reference exception in validation
-                viewModel.DisplayName = viewModel.DisplayName?.Trim() ?? string.Empty;
+        var field = partViewModel.PartDefinition.Fields.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.OrdinalIgnoreCase));
 
-                if (string.IsNullOrWhiteSpace(viewModel.DisplayName))
-                {
-                    ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
-                }
+        if (field == null)
+        {
+            return NotFound();
+        }
 
-                if ((await _contentDefinitionService.LoadPartAsync(partViewModel.Name)).PartDefinition.Fields.Any(t => t.Name != viewModel.Name && string.Equals(t.DisplayName().Trim(), viewModel.DisplayName.Trim(), StringComparison.OrdinalIgnoreCase)))
-                {
-                    ModelState.AddModelError("DisplayName", S["A field with the same Display Name already exists."]);
-                }
+        await _contentDefinitionService.RemoveFieldFromPartAsync(name, partViewModel.Name);
 
-                if (!ModelState.IsValid)
-                {
-                    // Calls update to build editor shape with the display name validation failures, and other validation errors.
-                    viewModel.Shape = await _contentDefinitionDisplayManager.UpdatePartFieldEditorAsync(field, _updateModelAccessor.ModelUpdater);
-                    await _documentStore.CancelAsync();
+        await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
 
-                    ViewData["ReturnUrl"] = returnUrl;
-                    return View(viewModel);
-                }
+        if (await _contentDefinitionService.LoadTypeAsync(id) != null)
+        {
+            return RedirectToAction(nameof(Edit), new { id });
+        }
 
-                await _notifier.InformationAsync(H["Display name changed to {0}.", viewModel.DisplayName]);
-            }
+        return RedirectToAction(nameof(EditPart), new { id });
+    }
 
-            await _contentDefinitionService.AlterFieldAsync(partViewModel, viewModel);
+    #endregion Parts
 
-            // Refresh the local field variable in case it has been altered
-            field = (await _contentDefinitionManager.LoadPartDefinitionAsync(id)).Fields.FirstOrDefault(x => string.Equals(x.Name, viewModel.Name, StringComparison.OrdinalIgnoreCase));
+    #region Type Parts
 
-            viewModel.Shape = await _contentDefinitionDisplayManager.UpdatePartFieldEditorAsync(field, _updateModelAccessor.ModelUpdater);
+    [Admin("ContentTypes/{id}/ContentParts/{name}/Edit", "EditTypePart")]
+    public async Task<ActionResult> EditTypePart(string id, string name)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
+        }
 
-            if (!ModelState.IsValid)
-            {
-                await _documentStore.CancelAsync();
+        var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(id);
 
-                ViewData["ReturnUrl"] = returnUrl;
-                return View(viewModel);
-            }
-            else
-            {
-                await _notifier.SuccessAsync(H["The \"{0}\" field settings have been saved.", field.DisplayName()]);
-            }
+        if (typeDefinition == null)
+        {
+            return NotFound();
+        }
 
-            if (!string.IsNullOrEmpty(returnUrl) && Url.IsLocalUrl(returnUrl))
-            {
-                return this.Redirect(returnUrl, true);
-            }
-            else
-            {
-                // Redirect to the type editor if a type exists with this name
-                var typeViewModel = await _contentDefinitionService.LoadTypeAsync(id);
-                if (typeViewModel != null)
-                {
-                    return RedirectToAction(nameof(Edit), new { id });
-                }
+        var typePartDefinition = typeDefinition.Parts.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.OrdinalIgnoreCase));
 
-                return RedirectToAction(nameof(EditPart), new { id });
-            }
+        if (typePartDefinition == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost, ActionName("RemoveFieldFrom")]
-        public async Task<ActionResult> RemoveFieldFromPOST(string id, string name)
+        var typePartViewModel = new EditTypePartViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
-
-            var partViewModel = await _contentDefinitionService.LoadPartAsync(id);
-
-            if (partViewModel == null)
-            {
-                return NotFound();
-            }
-
-            var field = partViewModel.PartDefinition.Fields.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.OrdinalIgnoreCase));
-
-            if (field == null)
-            {
-                return NotFound();
-            }
-
-            await _contentDefinitionService.RemoveFieldFromPartAsync(name, partViewModel.Name);
-
-            await _notifier.SuccessAsync(H["The \"{0}\" field has been removed.", field.DisplayName()]);
-
-            if (await _contentDefinitionService.LoadTypeAsync(id) != null)
-            {
-                return RedirectToAction(nameof(Edit), new { id });
-            }
+            Name = typePartDefinition.Name,
+            Editor = typePartDefinition.Editor(),
+            DisplayMode = typePartDefinition.DisplayMode(),
+            DisplayName = typePartDefinition.DisplayName(),
+            Description = typePartDefinition.Description(),
+            TypePartDefinition = typePartDefinition,
+            Shape = await _contentDefinitionDisplayManager.BuildTypePartEditorAsync(typePartDefinition, _updateModelAccessor.ModelUpdater)
+        };
+
+        return View(typePartViewModel);
+    }
 
-            return RedirectToAction(nameof(EditPart), new { id });
+    [HttpPost, ActionName("EditTypePart")]
+    [FormValueRequired("submit.Save")]
+    public async Task<ActionResult> EditTypePartPOST(string id, EditTypePartViewModel viewModel)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
+        {
+            return Forbid();
         }
 
-        #endregion Parts
-
-        #region Type Parts
-
-        [Admin("ContentTypes/{id}/ContentParts/{name}/Edit", "EditTypePart")]
-        public async Task<ActionResult> EditTypePart(string id, string name)
+        if (viewModel == null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
-
-            var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(id);
-
-            if (typeDefinition == null)
-            {
-                return NotFound();
-            }
-
-            var typePartDefinition = typeDefinition.Parts.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.OrdinalIgnoreCase));
-
-            if (typePartDefinition == null)
-            {
-                return NotFound();
-            }
+            return NotFound();
+        }
 
-            var typePartViewModel = new EditTypePartViewModel
-            {
-                Name = typePartDefinition.Name,
-                Editor = typePartDefinition.Editor(),
-                DisplayMode = typePartDefinition.DisplayMode(),
-                DisplayName = typePartDefinition.DisplayName(),
-                Description = typePartDefinition.Description(),
-                TypePartDefinition = typePartDefinition,
-                Shape = await _contentDefinitionDisplayManager.BuildTypePartEditorAsync(typePartDefinition, _updateModelAccessor.ModelUpdater)
-            };
+        var typeDefinition = await _contentDefinitionManager.LoadTypeDefinitionAsync(id);
 
-            return View(typePartViewModel);
+        if (typeDefinition == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost, ActionName("EditTypePart")]
-        [FormValueRequired("submit.Save")]
-        public async Task<ActionResult> EditTypePartPOST(string id, EditTypePartViewModel viewModel)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContentTypes))
-            {
-                return Forbid();
-            }
+        var part = typeDefinition.Parts.FirstOrDefault(x => string.Equals(x.Name, viewModel.Name, StringComparison.OrdinalIgnoreCase));
 
-            if (viewModel == null)
-            {
-                return NotFound();
-            }
+        if (part == null)
+        {
+            return NotFound();
+        }
 
-            var typeDefinition = await _contentDefinitionManager.LoadTypeDefinitionAsync(id);
+        viewModel.TypePartDefinition = part;
 
-            if (typeDefinition == null)
+        if (part.PartDefinition.IsReusable())
+        {
+            if (part.DisplayName() != viewModel.DisplayName)
             {
-                return NotFound();
-            }
-
-            var part = typeDefinition.Parts.FirstOrDefault(x => string.Equals(x.Name, viewModel.Name, StringComparison.OrdinalIgnoreCase));
+                // Prevent null reference exception in validation
+                viewModel.DisplayName = viewModel.DisplayName?.Trim() ?? string.Empty;
 
-            if (part == null)
-            {
-                return NotFound();
-            }
+                if (string.IsNullOrWhiteSpace(viewModel.DisplayName))
+                {
+                    ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
+                }
 
-            viewModel.TypePartDefinition = part;
+                if (typeDefinition.Parts.Any(t => t.Name != viewModel.Name && string.Equals(t.DisplayName()?.Trim(), viewModel.DisplayName.Trim(), StringComparison.OrdinalIgnoreCase)))
+                {
+                    ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
+                }
 
-            if (part.PartDefinition.IsReusable())
-            {
-                if (part.DisplayName() != viewModel.DisplayName)
+                if (!ModelState.IsValid)
                 {
-                    // Prevent null reference exception in validation
-                    viewModel.DisplayName = viewModel.DisplayName?.Trim() ?? string.Empty;
-
-                    if (string.IsNullOrWhiteSpace(viewModel.DisplayName))
-                    {
-                        ModelState.AddModelError("DisplayName", S["The Display Name can't be empty."]);
-                    }
-
-                    if (typeDefinition.Parts.Any(t => t.Name != viewModel.Name && string.Equals(t.DisplayName()?.Trim(), viewModel.DisplayName.Trim(), StringComparison.OrdinalIgnoreCase)))
-                    {
-                        ModelState.AddModelError("DisplayName", S["A part with the same Display Name already exists."]);
-                    }
-
-                    if (!ModelState.IsValid)
-                    {
-                        viewModel.Shape = await _contentDefinitionDisplayManager.UpdateTypePartEditorAsync(part, _updateModelAccessor.ModelUpdater);
-                        await _documentStore.CancelAsync();
-                        return View(viewModel);
-                    }
+                    viewModel.Shape = await _contentDefinitionDisplayManager.UpdateTypePartEditorAsync(part, _updateModelAccessor.ModelUpdater);
+                    await _documentStore.CancelAsync();
+                    return View(viewModel);
                 }
             }
+        }
 
-            await _contentDefinitionService.AlterTypePartAsync(viewModel);
-
-            // Refresh the local part variable in case it has been altered
-            part = (await _contentDefinitionManager.LoadTypeDefinitionAsync(id)).Parts.FirstOrDefault(x => string.Equals(x.Name, viewModel.Name, StringComparison.OrdinalIgnoreCase));
+        await _contentDefinitionService.AlterTypePartAsync(viewModel);
 
-            viewModel.Shape = await _contentDefinitionDisplayManager.UpdateTypePartEditorAsync(part, _updateModelAccessor.ModelUpdater);
+        // Refresh the local part variable in case it has been altered
+        part = (await _contentDefinitionManager.LoadTypeDefinitionAsync(id)).Parts.FirstOrDefault(x => string.Equals(x.Name, viewModel.Name, StringComparison.OrdinalIgnoreCase));
 
-            if (!ModelState.IsValid)
-            {
-                await _documentStore.CancelAsync();
-                return View(viewModel);
-            }
-            else
-            {
-                await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
-            }
+        viewModel.Shape = await _contentDefinitionDisplayManager.UpdateTypePartEditorAsync(part, _updateModelAccessor.ModelUpdater);
 
-            return RedirectToAction(nameof(Edit), new { id });
+        if (!ModelState.IsValid)
+        {
+            await _documentStore.CancelAsync();
+            return View(viewModel);
+        }
+        else
+        {
+            await _notifier.SuccessAsync(H["The \"{0}\" part settings have been saved.", part.DisplayName()]);
         }
 
-        #endregion Type Parts
+        return RedirectToAction(nameof(Edit), new { id });
     }
+
+    #endregion Type Parts
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ContentDefinitionDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ContentDefinitionDeploymentSource.cs
index 2f88284061e..2f455501e7b 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ContentDefinitionDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ContentDefinitionDeploymentSource.cs
@@ -4,42 +4,41 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Deployment;
 
-namespace OrchardCore.ContentTypes.Deployment
+namespace OrchardCore.ContentTypes.Deployment;
+
+public class ContentDefinitionDeploymentSource : IDeploymentSource
 {
-    public class ContentDefinitionDeploymentSource : IDeploymentSource
+    private readonly IContentDefinitionStore _contentDefinitionStore;
+
+    public ContentDefinitionDeploymentSource(IContentDefinitionStore contentDefinitionStore)
     {
-        private readonly IContentDefinitionStore _contentDefinitionStore;
+        _contentDefinitionStore = contentDefinitionStore;
+    }
 
-        public ContentDefinitionDeploymentSource(IContentDefinitionStore contentDefinitionStore)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        if (step is not ContentDefinitionDeploymentStep contentDefinitionStep)
         {
-            _contentDefinitionStore = contentDefinitionStore;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        var contentTypeDefinitionRecord = await _contentDefinitionStore.LoadContentDefinitionAsync();
+
+        var contentTypes = contentDefinitionStep.IncludeAll
+            ? contentTypeDefinitionRecord.ContentTypeDefinitionRecords
+            : contentTypeDefinitionRecord.ContentTypeDefinitionRecords
+                .Where(x => contentDefinitionStep.ContentTypes.Contains(x.Name));
+
+        var contentParts = contentDefinitionStep.IncludeAll
+            ? contentTypeDefinitionRecord.ContentPartDefinitionRecords
+            : contentTypeDefinitionRecord.ContentPartDefinitionRecords
+                    .Where(x => contentDefinitionStep.ContentParts.Contains(x.Name));
+
+        result.Steps.Add(new JsonObject
         {
-            if (step is not ContentDefinitionDeploymentStep contentDefinitionStep)
-            {
-                return;
-            }
-
-            var contentTypeDefinitionRecord = await _contentDefinitionStore.LoadContentDefinitionAsync();
-
-            var contentTypes = contentDefinitionStep.IncludeAll
-                ? contentTypeDefinitionRecord.ContentTypeDefinitionRecords
-                : contentTypeDefinitionRecord.ContentTypeDefinitionRecords
-                    .Where(x => contentDefinitionStep.ContentTypes.Contains(x.Name));
-
-            var contentParts = contentDefinitionStep.IncludeAll
-                ? contentTypeDefinitionRecord.ContentPartDefinitionRecords
-                : contentTypeDefinitionRecord.ContentPartDefinitionRecords
-                        .Where(x => contentDefinitionStep.ContentParts.Contains(x.Name));
-
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "ContentDefinition",
-                ["ContentTypes"] = JArray.FromObject(contentTypes),
-                ["ContentParts"] = JArray.FromObject(contentParts),
-            });
-        }
+            ["name"] = "ContentDefinition",
+            ["ContentTypes"] = JArray.FromObject(contentTypes),
+            ["ContentParts"] = JArray.FromObject(contentParts),
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ContentDefinitionDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ContentDefinitionDeploymentStep.cs
index 4ab892f8924..c365001a8d3 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ContentDefinitionDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ContentDefinitionDeploymentStep.cs
@@ -1,21 +1,20 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.ContentTypes.Deployment
+namespace OrchardCore.ContentTypes.Deployment;
+
+/// <summary>
+/// Adds selected content definitions to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class ContentDefinitionDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds selected content definitions to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class ContentDefinitionDeploymentStep : DeploymentStep
+    public ContentDefinitionDeploymentStep()
     {
-        public ContentDefinitionDeploymentStep()
-        {
-            Name = "ContentDefinition";
-        }
+        Name = "ContentDefinition";
+    }
 
-        public bool IncludeAll { get; set; }
+    public bool IncludeAll { get; set; }
 
-        public string[] ContentTypes { get; set; }
+    public string[] ContentTypes { get; set; }
 
-        public string[] ContentParts { get; set; }
-    }
+    public string[] ContentParts { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ContentDefinitionDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ContentDefinitionDeploymentStepDriver.cs
index c6a465bf21f..1f7f6b7fc01 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ContentDefinitionDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ContentDefinitionDeploymentStepDriver.cs
@@ -5,54 +5,53 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentTypes.Deployment
+namespace OrchardCore.ContentTypes.Deployment;
+
+public sealed class ContentDefinitionDeploymentStepDriver : DisplayDriver<DeploymentStep, ContentDefinitionDeploymentStep>
 {
-    public sealed class ContentDefinitionDeploymentStepDriver : DisplayDriver<DeploymentStep, ContentDefinitionDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(ContentDefinitionDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(ContentDefinitionDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("ContentDefinitionDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("ContentDefinitionDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("ContentDefinitionDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("ContentDefinitionDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(ContentDefinitionDeploymentStep step, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentDefinitionDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<ContentDefinitionStepViewModel>("ContentDefinitionDeploymentStep_Fields_Edit", model =>
         {
-            return Initialize<ContentDefinitionStepViewModel>("ContentDefinitionDeploymentStep_Fields_Edit", model =>
-            {
-                model.ContentParts = step.ContentParts;
-                model.ContentTypes = step.ContentTypes;
-                model.IncludeAll = step.IncludeAll;
-            }).Location("Content");
-        }
+            model.ContentParts = step.ContentParts;
+            model.ContentTypes = step.ContentTypes;
+            model.IncludeAll = step.IncludeAll;
+        }).Location("Content");
+    }
+
+    public override async Task<IDisplayResult> UpdateAsync(ContentDefinitionDeploymentStep step, UpdateEditorContext context)
+    {
+        // Initializes the value to empty otherwise the model is not updated if no type is selected.
+        step.ContentTypes = [];
+        step.ContentParts = [];
+
+        await context.Updater.TryUpdateModelAsync(
+            step,
+            Prefix,
+            x => x.ContentTypes,
+            x => x.ContentParts,
+            x => x.IncludeAll);
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentDefinitionDeploymentStep step, UpdateEditorContext context)
+        // don't have the selected option if include all
+        if (step.IncludeAll)
         {
-            // Initializes the value to empty otherwise the model is not updated if no type is selected.
             step.ContentTypes = [];
             step.ContentParts = [];
-
-            await context.Updater.TryUpdateModelAsync(
-                step,
-                Prefix,
-                x => x.ContentTypes,
-                x => x.ContentParts,
-                x => x.IncludeAll);
-
-            // don't have the selected option if include all
-            if (step.IncludeAll)
-            {
-                step.ContentTypes = [];
-                step.ContentParts = [];
-            }
-            else
-            {
-                step.ContentParts = step.ContentParts.Distinct().ToArray();
-            }
-
-            return Edit(step, context);
         }
+        else
+        {
+            step.ContentParts = step.ContentParts.Distinct().ToArray();
+        }
+
+        return Edit(step, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/DeleteContentDefinitionDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/DeleteContentDefinitionDeploymentSource.cs
index b54de8c1e0c..07974426034 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/DeleteContentDefinitionDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/DeleteContentDefinitionDeploymentSource.cs
@@ -2,25 +2,24 @@
 using System.Threading.Tasks;
 using OrchardCore.Deployment;
 
-namespace OrchardCore.ContentTypes.Deployment
+namespace OrchardCore.ContentTypes.Deployment;
+
+public class DeleteContentDefinitionDeploymentSource : IDeploymentSource
 {
-    public class DeleteContentDefinitionDeploymentSource : IDeploymentSource
+    public Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
     {
-        public Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        if (step is not DeleteContentDefinitionDeploymentStep deleteContentDefinitionStep)
         {
-            if (step is not DeleteContentDefinitionDeploymentStep deleteContentDefinitionStep)
-            {
-                return Task.CompletedTask;
-            }
-
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "DeleteContentDefinition",
-                ["ContentTypes"] = JArray.FromObject(deleteContentDefinitionStep.ContentTypes),
-                ["ContentParts"] = JArray.FromObject(deleteContentDefinitionStep.ContentParts),
-            });
-
             return Task.CompletedTask;
         }
+
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "DeleteContentDefinition",
+            ["ContentTypes"] = JArray.FromObject(deleteContentDefinitionStep.ContentTypes),
+            ["ContentParts"] = JArray.FromObject(deleteContentDefinitionStep.ContentParts),
+        });
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/DeleteContentDefinitionDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/DeleteContentDefinitionDeploymentStep.cs
index 5523f0bf867..949d36c057b 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/DeleteContentDefinitionDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/DeleteContentDefinitionDeploymentStep.cs
@@ -1,19 +1,18 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.ContentTypes.Deployment
+namespace OrchardCore.ContentTypes.Deployment;
+
+/// <summary>
+/// Deletes selected content definitions to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class DeleteContentDefinitionDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Deletes selected content definitions to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class DeleteContentDefinitionDeploymentStep : DeploymentStep
+    public DeleteContentDefinitionDeploymentStep()
     {
-        public DeleteContentDefinitionDeploymentStep()
-        {
-            Name = "DeleteContentDefinition";
-        }
+        Name = "DeleteContentDefinition";
+    }
 
-        public string[] ContentTypes { get; set; } = [];
+    public string[] ContentTypes { get; set; } = [];
 
-        public string[] ContentParts { get; set; } = [];
-    }
+    public string[] ContentParts { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/DeleteContentDefinitionDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/DeleteContentDefinitionDeploymentStepDriver.cs
index 95d61fd7f86..e00d39160f6 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/DeleteContentDefinitionDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/DeleteContentDefinitionDeploymentStepDriver.cs
@@ -5,40 +5,39 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentTypes.Deployment
+namespace OrchardCore.ContentTypes.Deployment;
+
+public sealed class DeleteContentDefinitionDeploymentStepDriver : DisplayDriver<DeploymentStep, DeleteContentDefinitionDeploymentStep>
 {
-    public sealed class DeleteContentDefinitionDeploymentStepDriver : DisplayDriver<DeploymentStep, DeleteContentDefinitionDeploymentStep>
+    private static readonly char[] _separator = [' ', ','];
+
+    public override Task<IDisplayResult> DisplayAsync(DeleteContentDefinitionDeploymentStep step, BuildDisplayContext context)
     {
-        private static readonly char[] _separator = [' ', ','];
+        return
+            CombineAsync(
+                View("DeleteContentDefinitionDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("DeleteContentDefinitionDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(DeleteContentDefinitionDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("DeleteContentDefinitionDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("DeleteContentDefinitionDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
-
-        public override IDisplayResult Edit(DeleteContentDefinitionDeploymentStep step, BuildEditorContext context)
-        {
-            return Initialize<DeleteContentDefinitionStepViewModel>("DeleteContentDefinitionDeploymentStep_Fields_Edit", model =>
-            {
-                model.ContentParts = string.Join(", ", step.ContentParts);
-                model.ContentTypes = string.Join(", ", step.ContentTypes);
-            }).Location("Content");
-        }
-
-        public override async Task<IDisplayResult> UpdateAsync(DeleteContentDefinitionDeploymentStep step, UpdateEditorContext context)
+    public override IDisplayResult Edit(DeleteContentDefinitionDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<DeleteContentDefinitionStepViewModel>("DeleteContentDefinitionDeploymentStep_Fields_Edit", model =>
         {
-            var model = new DeleteContentDefinitionStepViewModel();
+            model.ContentParts = string.Join(", ", step.ContentParts);
+            model.ContentTypes = string.Join(", ", step.ContentTypes);
+        }).Location("Content");
+    }
+
+    public override async Task<IDisplayResult> UpdateAsync(DeleteContentDefinitionDeploymentStep step, UpdateEditorContext context)
+    {
+        var model = new DeleteContentDefinitionStepViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            step.ContentTypes = model.ContentTypes.Split(_separator, StringSplitOptions.RemoveEmptyEntries);
-            step.ContentParts = model.ContentParts.Split(_separator, StringSplitOptions.RemoveEmptyEntries);
+        step.ContentTypes = model.ContentTypes.Split(_separator, StringSplitOptions.RemoveEmptyEntries);
+        step.ContentParts = model.ContentParts.Split(_separator, StringSplitOptions.RemoveEmptyEntries);
 
-            return Edit(step, context);
-        }
+        return Edit(step, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ReplaceContentDefinitionDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ReplaceContentDefinitionDeploymentSource.cs
index 0b35e8c324d..3c3d9239f82 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ReplaceContentDefinitionDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ReplaceContentDefinitionDeploymentSource.cs
@@ -4,42 +4,41 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Deployment;
 
-namespace OrchardCore.ContentTypes.Deployment
+namespace OrchardCore.ContentTypes.Deployment;
+
+public class ReplaceContentDefinitionDeploymentSource : IDeploymentSource
 {
-    public class ReplaceContentDefinitionDeploymentSource : IDeploymentSource
+    private readonly IContentDefinitionStore _contentDefinitionStore;
+
+    public ReplaceContentDefinitionDeploymentSource(IContentDefinitionStore contentDefinitionStore)
     {
-        private readonly IContentDefinitionStore _contentDefinitionStore;
+        _contentDefinitionStore = contentDefinitionStore;
+    }
 
-        public ReplaceContentDefinitionDeploymentSource(IContentDefinitionStore contentDefinitionStore)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        if (step is not ReplaceContentDefinitionDeploymentStep replaceContentDefinitionStep)
         {
-            _contentDefinitionStore = contentDefinitionStore;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        var contentTypeDefinitionRecord = await _contentDefinitionStore.LoadContentDefinitionAsync();
+
+        var contentTypes = replaceContentDefinitionStep.IncludeAll
+            ? contentTypeDefinitionRecord.ContentTypeDefinitionRecords
+            : contentTypeDefinitionRecord.ContentTypeDefinitionRecords
+                .Where(x => replaceContentDefinitionStep.ContentTypes.Contains(x.Name));
+
+        var contentParts = replaceContentDefinitionStep.IncludeAll
+            ? contentTypeDefinitionRecord.ContentPartDefinitionRecords
+            : contentTypeDefinitionRecord.ContentPartDefinitionRecords
+                    .Where(x => replaceContentDefinitionStep.ContentParts.Contains(x.Name));
+
+        result.Steps.Add(new JsonObject
         {
-            if (step is not ReplaceContentDefinitionDeploymentStep replaceContentDefinitionStep)
-            {
-                return;
-            }
-
-            var contentTypeDefinitionRecord = await _contentDefinitionStore.LoadContentDefinitionAsync();
-
-            var contentTypes = replaceContentDefinitionStep.IncludeAll
-                ? contentTypeDefinitionRecord.ContentTypeDefinitionRecords
-                : contentTypeDefinitionRecord.ContentTypeDefinitionRecords
-                    .Where(x => replaceContentDefinitionStep.ContentTypes.Contains(x.Name));
-
-            var contentParts = replaceContentDefinitionStep.IncludeAll
-                ? contentTypeDefinitionRecord.ContentPartDefinitionRecords
-                : contentTypeDefinitionRecord.ContentPartDefinitionRecords
-                        .Where(x => replaceContentDefinitionStep.ContentParts.Contains(x.Name));
-
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "ReplaceContentDefinition",
-                ["ContentTypes"] = JArray.FromObject(contentTypes),
-                ["ContentParts"] = JArray.FromObject(contentParts),
-            });
-        }
+            ["name"] = "ReplaceContentDefinition",
+            ["ContentTypes"] = JArray.FromObject(contentTypes),
+            ["ContentParts"] = JArray.FromObject(contentParts),
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ReplaceContentDefinitionDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ReplaceContentDefinitionDeploymentStep.cs
index 90fed2dbe8b..4ac94c008f8 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ReplaceContentDefinitionDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ReplaceContentDefinitionDeploymentStep.cs
@@ -1,18 +1,17 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.ContentTypes.Deployment
+namespace OrchardCore.ContentTypes.Deployment;
+
+public class ReplaceContentDefinitionDeploymentStep : DeploymentStep
 {
-    public class ReplaceContentDefinitionDeploymentStep : DeploymentStep
+    public ReplaceContentDefinitionDeploymentStep()
     {
-        public ReplaceContentDefinitionDeploymentStep()
-        {
-            Name = "ReplaceContentDefinition";
-        }
+        Name = "ReplaceContentDefinition";
+    }
 
-        public bool IncludeAll { get; set; }
+    public bool IncludeAll { get; set; }
 
-        public string[] ContentTypes { get; set; }
+    public string[] ContentTypes { get; set; }
 
-        public string[] ContentParts { get; set; }
-    }
+    public string[] ContentParts { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ReplaceContentDefinitionDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ReplaceContentDefinitionDeploymentStepDriver.cs
index 471ee2be29e..acecd03ee16 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ReplaceContentDefinitionDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Deployment/ReplaceContentDefinitionDeploymentStepDriver.cs
@@ -5,54 +5,53 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentTypes.Deployment
+namespace OrchardCore.ContentTypes.Deployment;
+
+public sealed class ReplaceContentDefinitionDeploymentStepDriver : DisplayDriver<DeploymentStep, ReplaceContentDefinitionDeploymentStep>
 {
-    public sealed class ReplaceContentDefinitionDeploymentStepDriver : DisplayDriver<DeploymentStep, ReplaceContentDefinitionDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(ReplaceContentDefinitionDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(ReplaceContentDefinitionDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("ReplaceContentDefinitionDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("ReplaceContentDefinitionDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("ReplaceContentDefinitionDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("ReplaceContentDefinitionDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(ReplaceContentDefinitionDeploymentStep step, BuildEditorContext context)
+    public override IDisplayResult Edit(ReplaceContentDefinitionDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<ReplaceContentDefinitionStepViewModel>("ReplaceContentDefinitionDeploymentStep_Fields_Edit", model =>
         {
-            return Initialize<ReplaceContentDefinitionStepViewModel>("ReplaceContentDefinitionDeploymentStep_Fields_Edit", model =>
-            {
-                model.ContentParts = step.ContentParts;
-                model.ContentTypes = step.ContentTypes;
-                model.IncludeAll = step.IncludeAll;
-            }).Location("Content");
-        }
+            model.ContentParts = step.ContentParts;
+            model.ContentTypes = step.ContentTypes;
+            model.IncludeAll = step.IncludeAll;
+        }).Location("Content");
+    }
+
+    public override async Task<IDisplayResult> UpdateAsync(ReplaceContentDefinitionDeploymentStep step, UpdateEditorContext context)
+    {
+        // Initializes the value to empty otherwise the model is not updated if no type is selected.
+        step.ContentTypes = [];
+        step.ContentParts = [];
+
+        await context.Updater.TryUpdateModelAsync(
+            step,
+            Prefix,
+            x => x.ContentTypes,
+            x => x.ContentParts,
+            x => x.IncludeAll);
 
-        public override async Task<IDisplayResult> UpdateAsync(ReplaceContentDefinitionDeploymentStep step, UpdateEditorContext context)
+        // don't have the selected option if include all
+        if (step.IncludeAll)
         {
-            // Initializes the value to empty otherwise the model is not updated if no type is selected.
             step.ContentTypes = [];
             step.ContentParts = [];
-
-            await context.Updater.TryUpdateModelAsync(
-                step,
-                Prefix,
-                x => x.ContentTypes,
-                x => x.ContentParts,
-                x => x.IncludeAll);
-
-            // don't have the selected option if include all
-            if (step.IncludeAll)
-            {
-                step.ContentTypes = [];
-                step.ContentParts = [];
-            }
-            else
-            {
-                step.ContentParts = step.ContentParts.Distinct().ToArray();
-            }
-
-            return Edit(step, context);
         }
+        else
+        {
+            step.ContentParts = step.ContentParts.Distinct().ToArray();
+        }
+
+        return Edit(step, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/ContentDefinitionDisplayCoordinator.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/ContentDefinitionDisplayCoordinator.cs
index e0489fd525b..f88069f33f7 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/ContentDefinitionDisplayCoordinator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/ContentDefinitionDisplayCoordinator.cs
@@ -5,108 +5,107 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+public class ContentDefinitionDisplayCoordinator : IContentDefinitionDisplayHandler
 {
-    public class ContentDefinitionDisplayCoordinator : IContentDefinitionDisplayHandler
-    {
-        private readonly IEnumerable<IContentTypeDefinitionDisplayDriver> _typeDisplayDrivers;
-        private readonly IEnumerable<IContentTypePartDefinitionDisplayDriver> _typePartDisplayDrivers;
-        private readonly IEnumerable<IContentPartDefinitionDisplayDriver> _partDisplayDrivers;
-        private readonly IEnumerable<IContentPartFieldDefinitionDisplayDriver> _partFieldDisplayDrivers;
-        private readonly ILogger _logger;
+    private readonly IEnumerable<IContentTypeDefinitionDisplayDriver> _typeDisplayDrivers;
+    private readonly IEnumerable<IContentTypePartDefinitionDisplayDriver> _typePartDisplayDrivers;
+    private readonly IEnumerable<IContentPartDefinitionDisplayDriver> _partDisplayDrivers;
+    private readonly IEnumerable<IContentPartFieldDefinitionDisplayDriver> _partFieldDisplayDrivers;
+    private readonly ILogger _logger;
 
-        public ContentDefinitionDisplayCoordinator(
-            IEnumerable<IContentTypeDefinitionDisplayDriver> typeDisplayDrivers,
-            IEnumerable<IContentTypePartDefinitionDisplayDriver> typePartDisplayDrivers,
-            IEnumerable<IContentPartDefinitionDisplayDriver> partDisplayDrivers,
-            IEnumerable<IContentPartFieldDefinitionDisplayDriver> partFieldDisplayDrivers,
-            ILogger<IContentDefinitionDisplayHandler> logger)
-        {
-            _partFieldDisplayDrivers = partFieldDisplayDrivers;
-            _partDisplayDrivers = partDisplayDrivers;
-            _typePartDisplayDrivers = typePartDisplayDrivers;
-            _typeDisplayDrivers = typeDisplayDrivers;
-            _logger = logger;
-        }
+    public ContentDefinitionDisplayCoordinator(
+        IEnumerable<IContentTypeDefinitionDisplayDriver> typeDisplayDrivers,
+        IEnumerable<IContentTypePartDefinitionDisplayDriver> typePartDisplayDrivers,
+        IEnumerable<IContentPartDefinitionDisplayDriver> partDisplayDrivers,
+        IEnumerable<IContentPartFieldDefinitionDisplayDriver> partFieldDisplayDrivers,
+        ILogger<IContentDefinitionDisplayHandler> logger)
+    {
+        _partFieldDisplayDrivers = partFieldDisplayDrivers;
+        _partDisplayDrivers = partDisplayDrivers;
+        _typePartDisplayDrivers = typePartDisplayDrivers;
+        _typeDisplayDrivers = typeDisplayDrivers;
+        _logger = logger;
+    }
 
-        public Task BuildTypeEditorAsync(ContentTypeDefinition model, BuildEditorContext context)
+    public Task BuildTypeEditorAsync(ContentTypeDefinition model, BuildEditorContext context)
+    {
+        return _typeDisplayDrivers.InvokeAsync(async (contentDisplay, model, context) =>
         {
-            return _typeDisplayDrivers.InvokeAsync(async (contentDisplay, model, context) =>
-            {
-                var result = await contentDisplay.BuildEditorAsync(model, context);
-                if (result != null)
-                    await result.ApplyAsync(context);
-            }, model, context, _logger);
-        }
+            var result = await contentDisplay.BuildEditorAsync(model, context);
+            if (result != null)
+                await result.ApplyAsync(context);
+        }, model, context, _logger);
+    }
 
-        public Task UpdateTypeEditorAsync(ContentTypeDefinition model, UpdateTypeEditorContext context)
+    public Task UpdateTypeEditorAsync(ContentTypeDefinition model, UpdateTypeEditorContext context)
+    {
+        return _typeDisplayDrivers.InvokeAsync(async (contentDisplay, model, context) =>
         {
-            return _typeDisplayDrivers.InvokeAsync(async (contentDisplay, model, context) =>
-            {
-                var result = await contentDisplay.UpdateEditorAsync(model, context);
-                if (result != null)
-                    await result.ApplyAsync(context);
-            }, model, context, _logger);
-        }
+            var result = await contentDisplay.UpdateEditorAsync(model, context);
+            if (result != null)
+                await result.ApplyAsync(context);
+        }, model, context, _logger);
+    }
 
-        public Task BuildTypePartEditorAsync(ContentTypePartDefinition model, BuildEditorContext context)
+    public Task BuildTypePartEditorAsync(ContentTypePartDefinition model, BuildEditorContext context)
+    {
+        return _typePartDisplayDrivers.InvokeAsync(async (contentDisplay, model, context) =>
         {
-            return _typePartDisplayDrivers.InvokeAsync(async (contentDisplay, model, context) =>
-            {
-                var result = await contentDisplay.BuildEditorAsync(model, context);
-                if (result != null)
-                    await result.ApplyAsync(context);
-            }, model, context, _logger);
-        }
+            var result = await contentDisplay.BuildEditorAsync(model, context);
+            if (result != null)
+                await result.ApplyAsync(context);
+        }, model, context, _logger);
+    }
 
-        public Task UpdateTypePartEditorAsync(ContentTypePartDefinition model, UpdateTypePartEditorContext context)
+    public Task UpdateTypePartEditorAsync(ContentTypePartDefinition model, UpdateTypePartEditorContext context)
+    {
+        return _typePartDisplayDrivers.InvokeAsync(async (contentDisplay, model, context) =>
         {
-            return _typePartDisplayDrivers.InvokeAsync(async (contentDisplay, model, context) =>
-            {
-                var result = await contentDisplay.UpdateEditorAsync(model, context);
-                if (result != null)
-                    await result.ApplyAsync(context);
-            }, model, context, _logger);
-        }
+            var result = await contentDisplay.UpdateEditorAsync(model, context);
+            if (result != null)
+                await result.ApplyAsync(context);
+        }, model, context, _logger);
+    }
 
-        public Task BuildPartEditorAsync(ContentPartDefinition model, BuildEditorContext context)
+    public Task BuildPartEditorAsync(ContentPartDefinition model, BuildEditorContext context)
+    {
+        return _partDisplayDrivers.InvokeAsync(async (contentDisplay, model, context) =>
         {
-            return _partDisplayDrivers.InvokeAsync(async (contentDisplay, model, context) =>
-            {
-                var result = await contentDisplay.BuildEditorAsync(model, context);
-                if (result != null)
-                    await result.ApplyAsync(context);
-            }, model, context, _logger);
-        }
+            var result = await contentDisplay.BuildEditorAsync(model, context);
+            if (result != null)
+                await result.ApplyAsync(context);
+        }, model, context, _logger);
+    }
 
-        public Task UpdatePartEditorAsync(ContentPartDefinition model, UpdatePartEditorContext context)
+    public Task UpdatePartEditorAsync(ContentPartDefinition model, UpdatePartEditorContext context)
+    {
+        return _partDisplayDrivers.InvokeAsync(async (contentDisplay, model, context) =>
         {
-            return _partDisplayDrivers.InvokeAsync(async (contentDisplay, model, context) =>
-            {
-                var result = await contentDisplay.UpdateEditorAsync(model, context);
-                if (result != null)
-                    await result.ApplyAsync(context);
-            }, model, context, _logger);
-        }
+            var result = await contentDisplay.UpdateEditorAsync(model, context);
+            if (result != null)
+                await result.ApplyAsync(context);
+        }, model, context, _logger);
+    }
 
-        public async Task BuildPartFieldEditorAsync(ContentPartFieldDefinition model, BuildEditorContext context)
+    public async Task BuildPartFieldEditorAsync(ContentPartFieldDefinition model, BuildEditorContext context)
+    {
+        await _partFieldDisplayDrivers.InvokeAsync(async (contentDisplay, model, context) =>
         {
-            await _partFieldDisplayDrivers.InvokeAsync(async (contentDisplay, model, context) =>
-            {
-                var result = await contentDisplay.BuildEditorAsync(model, context);
-                if (result != null)
-                    await result.ApplyAsync(context);
-            }, model, context, _logger);
-        }
+            var result = await contentDisplay.BuildEditorAsync(model, context);
+            if (result != null)
+                await result.ApplyAsync(context);
+        }, model, context, _logger);
+    }
 
-        public async Task UpdatePartFieldEditorAsync(ContentPartFieldDefinition model, UpdatePartFieldEditorContext context)
+    public async Task UpdatePartFieldEditorAsync(ContentPartFieldDefinition model, UpdatePartFieldEditorContext context)
+    {
+        await _partFieldDisplayDrivers.InvokeAsync(async (contentDisplay, model, context) =>
         {
-            await _partFieldDisplayDrivers.InvokeAsync(async (contentDisplay, model, context) =>
-            {
-                var result = await contentDisplay.UpdateEditorAsync(model, context);
-                if (result != null)
-                    await result.ApplyAsync(context);
-            }, model, context, _logger);
-        }
+            var result = await contentDisplay.UpdateEditorAsync(model, context);
+            if (result != null)
+                await result.ApplyAsync(context);
+        }, model, context, _logger);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/ContentPartSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/ContentPartSettingsDisplayDriver.cs
index 4a5cc9d7f0c..2da8d5b4a8c 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/ContentPartSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/ContentPartSettingsDisplayDriver.cs
@@ -5,36 +5,35 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+public sealed class ContentPartSettingsDisplayDriver : ContentPartDefinitionDisplayDriver
 {
-    public sealed class ContentPartSettingsDisplayDriver : ContentPartDefinitionDisplayDriver
+    public override IDisplayResult Edit(ContentPartDefinition contentPartDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentPartDefinition contentPartDefinition, BuildEditorContext context)
+        return Initialize<ContentPartSettingsViewModel>("ContentPartSettings_Edit", model =>
         {
-            return Initialize<ContentPartSettingsViewModel>("ContentPartSettings_Edit", model =>
-            {
-                var settings = contentPartDefinition.GetSettings<ContentPartSettings>();
+            var settings = contentPartDefinition.GetSettings<ContentPartSettings>();
 
-                model.Attachable = settings.Attachable;
-                model.Reusable = settings.Reusable;
-                model.Description = settings.Description;
-                model.DisplayName = settings.DisplayName;
-                model.ContentPartDefinition = contentPartDefinition;
-            }).Location("Content");
-        }
+            model.Attachable = settings.Attachable;
+            model.Reusable = settings.Reusable;
+            model.Description = settings.Description;
+            model.DisplayName = settings.DisplayName;
+            model.ContentPartDefinition = contentPartDefinition;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartDefinition contentPartDefinition, UpdatePartEditorContext context)
-        {
-            var model = new ContentPartSettingsViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartDefinition contentPartDefinition, UpdatePartEditorContext context)
+    {
+        var model = new ContentPartSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            context.Builder.Attachable(model.Attachable);
-            context.Builder.Reusable(model.Reusable);
-            context.Builder.WithDescription(model.Description);
-            context.Builder.WithDisplayName(model.DisplayName);
+        context.Builder.Attachable(model.Attachable);
+        context.Builder.Reusable(model.Reusable);
+        context.Builder.WithDescription(model.Description);
+        context.Builder.WithDisplayName(model.DisplayName);
 
-            return Edit(contentPartDefinition, context);
-        }
+        return Edit(contentPartDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/ContentTypePartSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/ContentTypePartSettingsDisplayDriver.cs
index c4072f6f557..a56f28fb086 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/ContentTypePartSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/ContentTypePartSettingsDisplayDriver.cs
@@ -2,13 +2,12 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+public sealed class ContentTypePartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver
 {
-    public sealed class ContentTypePartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver
+    public override IDisplayResult Edit(ContentTypePartDefinition model, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentTypePartDefinition model, BuildEditorContext context)
-        {
-            return Shape("ContentTypePartSettings_Edit", new ShapeViewModel<ContentTypePartDefinition>(model)).Location("Content");
-        }
+        return Shape("ContentTypePartSettings_Edit", new ShapeViewModel<ContentTypePartDefinition>(model)).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/ContentTypeSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/ContentTypeSettingsDisplayDriver.cs
index bf04e26193c..825583ba801 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/ContentTypeSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/ContentTypeSettingsDisplayDriver.cs
@@ -9,120 +9,119 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+public sealed class ContentTypeSettingsDisplayDriver : ContentTypeDefinitionDisplayDriver
 {
-    public sealed class ContentTypeSettingsDisplayDriver : ContentTypeDefinitionDisplayDriver
-    {
-        private static readonly ContentTypeDefinitionDriverOptions _defaultOptions = new();
-        private readonly IStereotypeService _stereotypeService;
-        private readonly ContentTypeDefinitionOptions _options;
+    private static readonly ContentTypeDefinitionDriverOptions _defaultOptions = new();
+    private readonly IStereotypeService _stereotypeService;
+    private readonly ContentTypeDefinitionOptions _options;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public ContentTypeSettingsDisplayDriver(
-            IStringLocalizer<ContentTypeSettingsDisplayDriver> stringLocalizer,
-            IOptions<ContentTypeDefinitionOptions> options,
-            IStereotypeService stereotypeService)
-        {
-            S = stringLocalizer;
-            _options = options.Value;
-            _stereotypeService = stereotypeService;
-        }
+    public ContentTypeSettingsDisplayDriver(
+        IStringLocalizer<ContentTypeSettingsDisplayDriver> stringLocalizer,
+        IOptions<ContentTypeDefinitionOptions> options,
+        IStereotypeService stereotypeService)
+    {
+        S = stringLocalizer;
+        _options = options.Value;
+        _stereotypeService = stereotypeService;
+    }
 
-        public override IDisplayResult Edit(ContentTypeDefinition contentTypeDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentTypeDefinition contentTypeDefinition, BuildEditorContext context)
+    {
+        return Initialize<ContentTypeSettingsViewModel>("ContentTypeSettings_Edit", async model =>
         {
-            return Initialize<ContentTypeSettingsViewModel>("ContentTypeSettings_Edit", async model =>
-            {
-                var settings = contentTypeDefinition.GetSettings<ContentTypeSettings>();
-                model.Creatable = settings.Creatable;
-                model.Listable = settings.Listable;
-                model.Draftable = settings.Draftable;
-                model.Versionable = settings.Versionable;
-                model.Securable = settings.Securable;
-                model.Stereotype = settings.Stereotype;
-                model.Description = settings.Description;
-                model.Options = await GetOptionsAsync(contentTypeDefinition, settings.Stereotype);
-            }).Location("Content:5");
-        }
+            var settings = contentTypeDefinition.GetSettings<ContentTypeSettings>();
+            model.Creatable = settings.Creatable;
+            model.Listable = settings.Listable;
+            model.Draftable = settings.Draftable;
+            model.Versionable = settings.Versionable;
+            model.Securable = settings.Securable;
+            model.Stereotype = settings.Stereotype;
+            model.Description = settings.Description;
+            model.Options = await GetOptionsAsync(contentTypeDefinition, settings.Stereotype);
+        }).Location("Content:5");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypeDefinition contentTypeDefinition, UpdateTypeEditorContext context)
-        {
-            var model = new ContentTypeSettingsViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypeDefinition contentTypeDefinition, UpdateTypeEditorContext context)
+    {
+        var model = new ContentTypeSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            var stereotype = model.Stereotype?.Trim();
-            context.Builder.WithDescription(model.Description);
-            context.Builder.Stereotype(stereotype);
+        var stereotype = model.Stereotype?.Trim();
+        context.Builder.WithDescription(model.Description);
+        context.Builder.Stereotype(stereotype);
 
-            if (!IsAlphaNumericOrEmpty(stereotype))
-            {
-                context.Updater.ModelState.AddModelError(nameof(ContentTypeSettingsViewModel.Stereotype), S["The stereotype should be alphanumeric."]);
-            }
+        if (!IsAlphaNumericOrEmpty(stereotype))
+        {
+            context.Updater.ModelState.AddModelError(nameof(ContentTypeSettingsViewModel.Stereotype), S["The stereotype should be alphanumeric."]);
+        }
 
-            var options = await GetOptionsAsync(contentTypeDefinition, stereotype);
+        var options = await GetOptionsAsync(contentTypeDefinition, stereotype);
 
-            Apply(context, model, options);
+        Apply(context, model, options);
 
-            return Edit(contentTypeDefinition, context);
-        }
+        return Edit(contentTypeDefinition, context);
+    }
 
-        private static void Apply(UpdateTypeEditorContext context, ContentTypeSettingsViewModel model, ContentTypeDefinitionDriverOptions options)
+    private static void Apply(UpdateTypeEditorContext context, ContentTypeSettingsViewModel model, ContentTypeDefinitionDriverOptions options)
+    {
+        if (options.ShowVersionable)
         {
-            if (options.ShowVersionable)
-            {
-                context.Builder.Versionable(model.Versionable);
-            }
-
-            if (options.ShowCreatable)
-            {
-                context.Builder.Creatable(model.Creatable);
-            }
-
-            if (options.ShowSecurable)
-            {
-                context.Builder.Securable(model.Securable);
-            }
-
-            if (options.ShowListable)
-            {
-                context.Builder.Listable(model.Listable);
-            }
+            context.Builder.Versionable(model.Versionable);
         }
 
-        private async Task<ContentTypeDefinitionDriverOptions> GetOptionsAsync(ContentTypeDefinition contentTypeDefinition, string stereotype)
+        if (options.ShowCreatable)
         {
-            var options = _defaultOptions;
+            context.Builder.Creatable(model.Creatable);
+        }
 
-            if (contentTypeDefinition.Name != null
-                && _options.ContentTypes.TryGetValue(contentTypeDefinition.Name, out var typeOptions))
-            {
-                options = typeOptions;
-            }
+        if (options.ShowSecurable)
+        {
+            context.Builder.Securable(model.Securable);
+        }
 
-            if (stereotype != null
-                && _options.Stereotypes.TryGetValue(stereotype, out var stereotypesOptions))
-            {
-                options = stereotypesOptions;
-            }
+        if (options.ShowListable)
+        {
+            context.Builder.Listable(model.Listable);
+        }
+    }
 
-            options.Stereotypes = await _stereotypeService.GetStereotypesAsync();
+    private async Task<ContentTypeDefinitionDriverOptions> GetOptionsAsync(ContentTypeDefinition contentTypeDefinition, string stereotype)
+    {
+        var options = _defaultOptions;
 
-            return options;
+        if (contentTypeDefinition.Name != null
+            && _options.ContentTypes.TryGetValue(contentTypeDefinition.Name, out var typeOptions))
+        {
+            options = typeOptions;
         }
 
-        private static bool IsAlphaNumericOrEmpty(string value)
+        if (stereotype != null
+            && _options.Stereotypes.TryGetValue(stereotype, out var stereotypesOptions))
         {
-            if (string.IsNullOrEmpty(value))
-            {
-                return true;
-            }
+            options = stereotypesOptions;
+        }
+
+        options.Stereotypes = await _stereotypeService.GetStereotypesAsync();
 
-            var startWithLetter = char.IsLetter(value[0]);
+        return options;
+    }
 
-            return value.Length == 1
-                ? startWithLetter
-                : startWithLetter && value.Skip(1).All(c => char.IsLetterOrDigit(c));
+    private static bool IsAlphaNumericOrEmpty(string value)
+    {
+        if (string.IsNullOrEmpty(value))
+        {
+            return true;
         }
+
+        var startWithLetter = char.IsLetter(value[0]);
+
+        return value.Length == 1
+            ? startWithLetter
+            : startWithLetter && value.Skip(1).All(c => char.IsLetterOrDigit(c));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/DefaultContentDefinitionDisplayManager.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/DefaultContentDefinitionDisplayManager.cs
index bc7045bc6bd..fa6a1a086b6 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/DefaultContentDefinitionDisplayManager.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/DefaultContentDefinitionDisplayManager.cs
@@ -11,122 +11,177 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+public class DefaultContentDefinitionDisplayManager : BaseDisplayManager, IContentDefinitionDisplayManager
 {
-    public class DefaultContentDefinitionDisplayManager : BaseDisplayManager, IContentDefinitionDisplayManager
+    private readonly IEnumerable<IContentDefinitionDisplayHandler> _handlers;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly ILayoutAccessor _layoutAccessor;
+    private readonly ILogger _logger;
+
+    public DefaultContentDefinitionDisplayManager(
+        IEnumerable<IContentDefinitionDisplayHandler> handlers,
+        IContentDefinitionManager contentDefinitionManager,
+        IShapeFactory shapeFactory,
+        IEnumerable<IShapePlacementProvider> placementProviders,
+        ILogger<DefaultContentDefinitionDisplayManager> logger,
+        ILayoutAccessor layoutAccessor
+        ) : base(shapeFactory, placementProviders)
     {
-        private readonly IEnumerable<IContentDefinitionDisplayHandler> _handlers;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly ILayoutAccessor _layoutAccessor;
-        private readonly ILogger _logger;
-
-        public DefaultContentDefinitionDisplayManager(
-            IEnumerable<IContentDefinitionDisplayHandler> handlers,
-            IContentDefinitionManager contentDefinitionManager,
-            IShapeFactory shapeFactory,
-            IEnumerable<IShapePlacementProvider> placementProviders,
-            ILogger<DefaultContentDefinitionDisplayManager> logger,
-            ILayoutAccessor layoutAccessor
-            ) : base(shapeFactory, placementProviders)
-        {
-            _handlers = handlers;
-            _contentDefinitionManager = contentDefinitionManager;
-            _shapeFactory = shapeFactory;
-            _layoutAccessor = layoutAccessor;
-            _logger = logger;
-        }
-
-        public async Task<dynamic> BuildTypeEditorAsync(ContentTypeDefinition contentTypeDefinition, IUpdateModel updater, string groupId)
-        {
-            ArgumentNullException.ThrowIfNull(contentTypeDefinition);
+        _handlers = handlers;
+        _contentDefinitionManager = contentDefinitionManager;
+        _shapeFactory = shapeFactory;
+        _layoutAccessor = layoutAccessor;
+        _logger = logger;
+    }
+
+    public async Task<dynamic> BuildTypeEditorAsync(ContentTypeDefinition contentTypeDefinition, IUpdateModel updater, string groupId)
+    {
+        ArgumentNullException.ThrowIfNull(contentTypeDefinition);
+
+        var contentTypeDefinitionShape = await CreateContentShapeAsync("ContentTypeDefinition_Edit");
+        contentTypeDefinitionShape.Properties["ContentTypeDefinition"] = contentTypeDefinition;
+
+        var typeContext = new BuildEditorContext(
+            contentTypeDefinitionShape,
+            groupId,
+            false,
+            "",
+            _shapeFactory,
+            await _layoutAccessor.GetLayoutAsync(),
+            updater
+        );
+
+        await BindPlacementAsync(typeContext);
+
+        await _handlers.InvokeAsync((handler, contentTypeDefinition, typeContext) => handler.BuildTypeEditorAsync(contentTypeDefinition, typeContext), contentTypeDefinition, typeContext, _logger);
 
-            var contentTypeDefinitionShape = await CreateContentShapeAsync("ContentTypeDefinition_Edit");
-            contentTypeDefinitionShape.Properties["ContentTypeDefinition"] = contentTypeDefinition;
+        return contentTypeDefinitionShape;
+    }
+
+    public async Task<dynamic> UpdateTypeEditorAsync(ContentTypeDefinition contentTypeDefinition, IUpdateModel updater, string groupId)
+    {
+        ArgumentNullException.ThrowIfNull(contentTypeDefinition);
+
+        var contentTypeDefinitionShape = await CreateContentShapeAsync("ContentTypeDefinition_Edit");
+        contentTypeDefinitionShape.Properties["ContentTypeDefinition"] = contentTypeDefinition;
+
+        var layout = await _layoutAccessor.GetLayoutAsync();
 
-            var typeContext = new BuildEditorContext(
+        await _contentDefinitionManager.AlterTypeDefinitionAsync(contentTypeDefinition.Name, async typeBuilder =>
+        {
+            var typeContext = new UpdateTypeEditorContext(
+                typeBuilder,
                 contentTypeDefinitionShape,
                 groupId,
                 false,
-                "",
                 _shapeFactory,
-                await _layoutAccessor.GetLayoutAsync(),
+                layout,
                 updater
             );
 
             await BindPlacementAsync(typeContext);
 
-            await _handlers.InvokeAsync((handler, contentTypeDefinition, typeContext) => handler.BuildTypeEditorAsync(contentTypeDefinition, typeContext), contentTypeDefinition, typeContext, _logger);
+            await _handlers.InvokeAsync((handler, contentTypeDefinition, typeContext) => handler.UpdateTypeEditorAsync(contentTypeDefinition, typeContext), contentTypeDefinition, typeContext, _logger);
+        });
 
-            return contentTypeDefinitionShape;
-        }
+        return contentTypeDefinitionShape;
+    }
 
-        public async Task<dynamic> UpdateTypeEditorAsync(ContentTypeDefinition contentTypeDefinition, IUpdateModel updater, string groupId)
-        {
-            ArgumentNullException.ThrowIfNull(contentTypeDefinition);
+    public async Task<dynamic> BuildPartEditorAsync(ContentPartDefinition contentPartDefinition, IUpdateModel updater, string groupId)
+    {
+        ArgumentNullException.ThrowIfNull(contentPartDefinition);
 
-            var contentTypeDefinitionShape = await CreateContentShapeAsync("ContentTypeDefinition_Edit");
-            contentTypeDefinitionShape.Properties["ContentTypeDefinition"] = contentTypeDefinition;
+        var contentPartDefinitionShape = await CreateContentShapeAsync("ContentPartDefinition_Edit");
 
-            var layout = await _layoutAccessor.GetLayoutAsync();
+        var partContext = new BuildEditorContext(
+            contentPartDefinitionShape,
+            groupId,
+            false,
+            "",
+            _shapeFactory,
+            await _layoutAccessor.GetLayoutAsync(),
+            updater
+        );
 
-            await _contentDefinitionManager.AlterTypeDefinitionAsync(contentTypeDefinition.Name, async typeBuilder =>
-            {
-                var typeContext = new UpdateTypeEditorContext(
-                    typeBuilder,
-                    contentTypeDefinitionShape,
-                    groupId,
-                    false,
-                    _shapeFactory,
-                    layout,
-                    updater
-                );
+        await BindPlacementAsync(partContext);
 
-                await BindPlacementAsync(typeContext);
+        await _handlers.InvokeAsync((handler, contentPartDefinition, partContext) => handler.BuildPartEditorAsync(contentPartDefinition, partContext), contentPartDefinition, partContext, _logger);
 
-                await _handlers.InvokeAsync((handler, contentTypeDefinition, typeContext) => handler.UpdateTypeEditorAsync(contentTypeDefinition, typeContext), contentTypeDefinition, typeContext, _logger);
-            });
+        return contentPartDefinitionShape;
+    }
 
-            return contentTypeDefinitionShape;
-        }
+    public async Task<dynamic> UpdatePartEditorAsync(ContentPartDefinition contentPartDefinition, IUpdateModel updater, string groupId)
+    {
+        ArgumentNullException.ThrowIfNull(contentPartDefinition);
 
-        public async Task<dynamic> BuildPartEditorAsync(ContentPartDefinition contentPartDefinition, IUpdateModel updater, string groupId)
-        {
-            ArgumentNullException.ThrowIfNull(contentPartDefinition);
+        var contentPartDefinitionShape = await CreateContentShapeAsync("ContentPartDefinition_Edit");
 
-            var contentPartDefinitionShape = await CreateContentShapeAsync("ContentPartDefinition_Edit");
+        UpdatePartEditorContext partContext = null;
+        var layout = await _layoutAccessor.GetLayoutAsync();
 
-            var partContext = new BuildEditorContext(
+        await _contentDefinitionManager.AlterPartDefinitionAsync(contentPartDefinition.Name, async partBuilder =>
+        {
+            partContext = new UpdatePartEditorContext(
+                partBuilder,
                 contentPartDefinitionShape,
                 groupId,
                 false,
-                "",
                 _shapeFactory,
-                await _layoutAccessor.GetLayoutAsync(),
+                layout,
                 updater
             );
 
             await BindPlacementAsync(partContext);
 
-            await _handlers.InvokeAsync((handler, contentPartDefinition, partContext) => handler.BuildPartEditorAsync(contentPartDefinition, partContext), contentPartDefinition, partContext, _logger);
+            await _handlers.InvokeAsync((handler, contentPartDefinition, partContext) => handler.UpdatePartEditorAsync(contentPartDefinition, partContext), contentPartDefinition, partContext, _logger);
+        });
 
-            return contentPartDefinitionShape;
-        }
+        return contentPartDefinitionShape;
+    }
 
-        public async Task<dynamic> UpdatePartEditorAsync(ContentPartDefinition contentPartDefinition, IUpdateModel updater, string groupId)
-        {
-            ArgumentNullException.ThrowIfNull(contentPartDefinition);
+    public async Task<dynamic> BuildTypePartEditorAsync(ContentTypePartDefinition contentTypePartDefinition, IUpdateModel updater, string groupId = "")
+    {
+        ArgumentNullException.ThrowIfNull(contentTypePartDefinition);
+
+        var typePartDefinitionShape = await CreateContentShapeAsync("ContentTypePartDefinition_Edit");
+        typePartDefinitionShape.Properties["ContentPart"] = contentTypePartDefinition;
+
+        var partContext = new BuildEditorContext(
+            typePartDefinitionShape,
+            groupId,
+            false,
+            "",
+            _shapeFactory,
+            await _layoutAccessor.GetLayoutAsync(),
+            updater
+        );
+
+        await BindPlacementAsync(partContext);
+
+        await _handlers.InvokeAsync((handler, contentTypePartDefinition, partContext) => handler.BuildTypePartEditorAsync(contentTypePartDefinition, partContext), contentTypePartDefinition, partContext, _logger);
+
+        return typePartDefinitionShape;
+    }
 
-            var contentPartDefinitionShape = await CreateContentShapeAsync("ContentPartDefinition_Edit");
+    public async Task<dynamic> UpdateTypePartEditorAsync(ContentTypePartDefinition contentTypePartDefinition, IUpdateModel updater, string groupId = "")
+    {
+        ArgumentNullException.ThrowIfNull(contentTypePartDefinition);
 
-            UpdatePartEditorContext partContext = null;
-            var layout = await _layoutAccessor.GetLayoutAsync();
+        var typePartDefinitionShape = await CreateContentShapeAsync("ContentTypePartDefinition_Edit");
+        var layout = await _layoutAccessor.GetLayoutAsync();
 
-            await _contentDefinitionManager.AlterPartDefinitionAsync(contentPartDefinition.Name, async partBuilder =>
+        await _contentDefinitionManager.AlterTypeDefinitionAsync(contentTypePartDefinition.ContentTypeDefinition.Name, typeBuilder =>
+        {
+            return typeBuilder.WithPartAsync(contentTypePartDefinition.Name, async typePartBuilder =>
             {
-                partContext = new UpdatePartEditorContext(
-                    partBuilder,
-                    contentPartDefinitionShape,
+                typePartDefinitionShape.Properties["ContentPart"] = contentTypePartDefinition;
+
+                var partContext = new UpdateTypePartEditorContext(
+                    typePartBuilder,
+                    typePartDefinitionShape,
                     groupId,
                     false,
                     _shapeFactory,
@@ -136,124 +191,68 @@ await _contentDefinitionManager.AlterPartDefinitionAsync(contentPartDefinition.N
 
                 await BindPlacementAsync(partContext);
 
-                await _handlers.InvokeAsync((handler, contentPartDefinition, partContext) => handler.UpdatePartEditorAsync(contentPartDefinition, partContext), contentPartDefinition, partContext, _logger);
+                await _handlers.InvokeAsync((handler, contentTypePartDefinition, partContext) => handler.UpdateTypePartEditorAsync(contentTypePartDefinition, partContext), contentTypePartDefinition, partContext, _logger);
             });
+        });
 
-            return contentPartDefinitionShape;
-        }
-
-        public async Task<dynamic> BuildTypePartEditorAsync(ContentTypePartDefinition contentTypePartDefinition, IUpdateModel updater, string groupId = "")
-        {
-            ArgumentNullException.ThrowIfNull(contentTypePartDefinition);
-
-            var typePartDefinitionShape = await CreateContentShapeAsync("ContentTypePartDefinition_Edit");
-            typePartDefinitionShape.Properties["ContentPart"] = contentTypePartDefinition;
-
-            var partContext = new BuildEditorContext(
-                typePartDefinitionShape,
-                groupId,
-                false,
-                "",
-                _shapeFactory,
-                await _layoutAccessor.GetLayoutAsync(),
-                updater
-            );
-
-            await BindPlacementAsync(partContext);
-
-            await _handlers.InvokeAsync((handler, contentTypePartDefinition, partContext) => handler.BuildTypePartEditorAsync(contentTypePartDefinition, partContext), contentTypePartDefinition, partContext, _logger);
-
-            return typePartDefinitionShape;
-        }
-
-        public async Task<dynamic> UpdateTypePartEditorAsync(ContentTypePartDefinition contentTypePartDefinition, IUpdateModel updater, string groupId = "")
-        {
-            ArgumentNullException.ThrowIfNull(contentTypePartDefinition);
+        return typePartDefinitionShape;
+    }
 
-            var typePartDefinitionShape = await CreateContentShapeAsync("ContentTypePartDefinition_Edit");
-            var layout = await _layoutAccessor.GetLayoutAsync();
+    public async Task<dynamic> BuildPartFieldEditorAsync(ContentPartFieldDefinition contentPartFieldDefinition, IUpdateModel updater, string groupId = "")
+    {
+        ArgumentNullException.ThrowIfNull(contentPartFieldDefinition);
 
-            await _contentDefinitionManager.AlterTypeDefinitionAsync(contentTypePartDefinition.ContentTypeDefinition.Name, typeBuilder =>
-            {
-                return typeBuilder.WithPartAsync(contentTypePartDefinition.Name, async typePartBuilder =>
-                {
-                    typePartDefinitionShape.Properties["ContentPart"] = contentTypePartDefinition;
-
-                    var partContext = new UpdateTypePartEditorContext(
-                        typePartBuilder,
-                        typePartDefinitionShape,
-                        groupId,
-                        false,
-                        _shapeFactory,
-                        layout,
-                        updater
-                    );
-
-                    await BindPlacementAsync(partContext);
-
-                    await _handlers.InvokeAsync((handler, contentTypePartDefinition, partContext) => handler.UpdateTypePartEditorAsync(contentTypePartDefinition, partContext), contentTypePartDefinition, partContext, _logger);
-                });
-            });
+        var partFieldDefinitionShape = await CreateContentShapeAsync("ContentPartFieldDefinition_Edit");
+        partFieldDefinitionShape.Properties["ContentField"] = contentPartFieldDefinition;
 
-            return typePartDefinitionShape;
-        }
+        var fieldContext = new BuildEditorContext(
+            partFieldDefinitionShape,
+            groupId,
+            false,
+            "",
+            _shapeFactory,
+            await _layoutAccessor.GetLayoutAsync(),
+            updater
+        );
 
-        public async Task<dynamic> BuildPartFieldEditorAsync(ContentPartFieldDefinition contentPartFieldDefinition, IUpdateModel updater, string groupId = "")
-        {
-            ArgumentNullException.ThrowIfNull(contentPartFieldDefinition);
+        await BindPlacementAsync(fieldContext);
 
-            var partFieldDefinitionShape = await CreateContentShapeAsync("ContentPartFieldDefinition_Edit");
-            partFieldDefinitionShape.Properties["ContentField"] = contentPartFieldDefinition;
+        await _handlers.InvokeAsync((handler, contentPartFieldDefinition, fieldContext) => handler.BuildPartFieldEditorAsync(contentPartFieldDefinition, fieldContext), contentPartFieldDefinition, fieldContext, _logger);
 
-            var fieldContext = new BuildEditorContext(
-                partFieldDefinitionShape,
-                groupId,
-                false,
-                "",
-                _shapeFactory,
-                await _layoutAccessor.GetLayoutAsync(),
-                updater
-            );
+        return partFieldDefinitionShape;
+    }
 
-            await BindPlacementAsync(fieldContext);
+    public async Task<dynamic> UpdatePartFieldEditorAsync(ContentPartFieldDefinition contentPartFieldDefinition, IUpdateModel updater, string groupId = "")
+    {
+        ArgumentNullException.ThrowIfNull(contentPartFieldDefinition);
 
-            await _handlers.InvokeAsync((handler, contentPartFieldDefinition, fieldContext) => handler.BuildPartFieldEditorAsync(contentPartFieldDefinition, fieldContext), contentPartFieldDefinition, fieldContext, _logger);
+        var contentPartDefinition = contentPartFieldDefinition.PartDefinition;
+        var partFieldDefinitionShape = await CreateContentShapeAsync("ContentPartFieldDefinition_Edit");
 
-            return partFieldDefinitionShape;
-        }
+        var layout = await _layoutAccessor.GetLayoutAsync();
 
-        public async Task<dynamic> UpdatePartFieldEditorAsync(ContentPartFieldDefinition contentPartFieldDefinition, IUpdateModel updater, string groupId = "")
+        await _contentDefinitionManager.AlterPartDefinitionAsync(contentPartDefinition.Name, partBuilder =>
         {
-            ArgumentNullException.ThrowIfNull(contentPartFieldDefinition);
+            return partBuilder.WithFieldAsync(contentPartFieldDefinition.Name, async partFieldBuilder =>
+            {
+                partFieldDefinitionShape.Properties["ContentField"] = contentPartFieldDefinition;
 
-            var contentPartDefinition = contentPartFieldDefinition.PartDefinition;
-            var partFieldDefinitionShape = await CreateContentShapeAsync("ContentPartFieldDefinition_Edit");
+                var fieldContext = new UpdatePartFieldEditorContext(
+                    partFieldBuilder,
+                    partFieldDefinitionShape,
+                    groupId,
+                    false,
+                    _shapeFactory,
+                    layout,
+                    updater
+                );
 
-            var layout = await _layoutAccessor.GetLayoutAsync();
+                await BindPlacementAsync(fieldContext);
 
-            await _contentDefinitionManager.AlterPartDefinitionAsync(contentPartDefinition.Name, partBuilder =>
-            {
-                return partBuilder.WithFieldAsync(contentPartFieldDefinition.Name, async partFieldBuilder =>
-                {
-                    partFieldDefinitionShape.Properties["ContentField"] = contentPartFieldDefinition;
-
-                    var fieldContext = new UpdatePartFieldEditorContext(
-                        partFieldBuilder,
-                        partFieldDefinitionShape,
-                        groupId,
-                        false,
-                        _shapeFactory,
-                        layout,
-                        updater
-                    );
-
-                    await BindPlacementAsync(fieldContext);
-
-                    await _handlers.InvokeAsync((handler, contentPartFieldDefinition, fieldContext) => handler.UpdatePartFieldEditorAsync(contentPartFieldDefinition, fieldContext), contentPartFieldDefinition, fieldContext, _logger);
-                });
+                await _handlers.InvokeAsync((handler, contentPartFieldDefinition, fieldContext) => handler.UpdatePartFieldEditorAsync(contentPartFieldDefinition, fieldContext), contentPartFieldDefinition, fieldContext, _logger);
             });
+        });
 
-            return partFieldDefinitionShape;
-        }
+        return partFieldDefinitionShape;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/DefaultContentTypeDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/DefaultContentTypeDisplayDriver.cs
index a543ffe2d48..0f8920f4cc9 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/DefaultContentTypeDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Editors/DefaultContentTypeDisplayDriver.cs
@@ -5,40 +5,39 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentTypes.Editors
-{
-    public sealed class DefaultContentTypeDisplayDriver : ContentTypeDefinitionDisplayDriver
-    {
-        internal readonly IStringLocalizer S;
+namespace OrchardCore.ContentTypes.Editors;
 
-        public DefaultContentTypeDisplayDriver(IStringLocalizer<DefaultContentTypeDisplayDriver> localizer)
-        {
-            S = localizer;
-        }
+public sealed class DefaultContentTypeDisplayDriver : ContentTypeDefinitionDisplayDriver
+{
+    internal readonly IStringLocalizer S;
 
-        public override IDisplayResult Edit(ContentTypeDefinition contentTypeDefinition, BuildEditorContext context)
-        {
-            return Initialize<ContentTypeViewModel>("ContentType_Edit", model =>
-            {
-                model.DisplayName = contentTypeDefinition.DisplayName;
-                model.Name = contentTypeDefinition.Name;
-            }).Location("Content");
-        }
+    public DefaultContentTypeDisplayDriver(IStringLocalizer<DefaultContentTypeDisplayDriver> localizer)
+    {
+        S = localizer;
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypeDefinition contentTypeDefinition, UpdateTypeEditorContext context)
+    public override IDisplayResult Edit(ContentTypeDefinition contentTypeDefinition, BuildEditorContext context)
+    {
+        return Initialize<ContentTypeViewModel>("ContentType_Edit", model =>
         {
-            var model = new ContentTypeViewModel();
+            model.DisplayName = contentTypeDefinition.DisplayName;
+            model.Name = contentTypeDefinition.Name;
+        }).Location("Content");
+    }
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypeDefinition contentTypeDefinition, UpdateTypeEditorContext context)
+    {
+        var model = new ContentTypeViewModel();
 
-            context.Builder.DisplayedAs(model.DisplayName);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            if (string.IsNullOrWhiteSpace(model.DisplayName))
-            {
-                context.Updater.ModelState.AddModelError("DisplayName", S["The Content Type name can't be empty."]);
-            }
+        context.Builder.DisplayedAs(model.DisplayName);
 
-            return Edit(contentTypeDefinition, context);
+        if (string.IsNullOrWhiteSpace(model.DisplayName))
+        {
+            context.Updater.ModelState.AddModelError("DisplayName", S["The Content Type name can't be empty."]);
         }
+
+        return Edit(contentTypeDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/GraphQL/Drivers/GraphQLContentTypePartSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/GraphQL/Drivers/GraphQLContentTypePartSettingsDriver.cs
index 461527e0d65..e3f45a24e2b 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/GraphQL/Drivers/GraphQLContentTypePartSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/GraphQL/Drivers/GraphQLContentTypePartSettingsDriver.cs
@@ -8,52 +8,51 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentTypes.GraphQL.Drivers
+namespace OrchardCore.ContentTypes.GraphQL.Drivers;
+
+public sealed class GraphQLContentTypePartSettingsDriver : ContentTypePartDefinitionDisplayDriver
 {
-    public sealed class GraphQLContentTypePartSettingsDriver : ContentTypePartDefinitionDisplayDriver
+    private readonly GraphQLContentOptions _contentOptions;
+
+    public GraphQLContentTypePartSettingsDriver(IOptions<GraphQLContentOptions> optionsAccessor)
     {
-        private readonly GraphQLContentOptions _contentOptions;
+        _contentOptions = optionsAccessor.Value;
+    }
 
-        public GraphQLContentTypePartSettingsDriver(IOptions<GraphQLContentOptions> optionsAccessor)
+    public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    {
+        if (contentTypePartDefinition.ContentTypeDefinition.Name == contentTypePartDefinition.PartDefinition.Name)
         {
-            _contentOptions = optionsAccessor.Value;
+            return null;
         }
 
-        public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+        return Initialize<GraphQLContentTypePartSettingsViewModel>("GraphQLContentTypePartSettings_Edit", async model =>
         {
-            if (contentTypePartDefinition.ContentTypeDefinition.Name == contentTypePartDefinition.PartDefinition.Name)
-            {
-                return null;
-            }
+            model.Definition = contentTypePartDefinition;
+            model.Options = _contentOptions;
+            model.Settings = contentTypePartDefinition.GetSettings<GraphQLContentTypePartSettings>();
 
-            return Initialize<GraphQLContentTypePartSettingsViewModel>("GraphQLContentTypePartSettings_Edit", async model =>
+            if (!context.Updater.ModelState.IsValid)
             {
-                model.Definition = contentTypePartDefinition;
-                model.Options = _contentOptions;
-                model.Settings = contentTypePartDefinition.GetSettings<GraphQLContentTypePartSettings>();
-
-                if (!context.Updater.ModelState.IsValid)
-                {
-                    await context.Updater.TryUpdateModelAsync(model, Prefix,
-                        m => m.Settings);
-                }
-            }).Location("Content");
-        }
+                await context.Updater.TryUpdateModelAsync(model, Prefix,
+                    m => m.Settings);
+            }
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    {
+        if (contentTypePartDefinition.ContentTypeDefinition.Name == contentTypePartDefinition.PartDefinition.Name)
         {
-            if (contentTypePartDefinition.ContentTypeDefinition.Name == contentTypePartDefinition.PartDefinition.Name)
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var model = new GraphQLContentTypePartSettingsViewModel();
+        var model = new GraphQLContentTypePartSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix, m => m.Settings);
+        await context.Updater.TryUpdateModelAsync(model, Prefix, m => m.Settings);
 
-            context.Builder.WithSettings(model.Settings);
+        context.Builder.WithSettings(model.Settings);
 
-            return Edit(contentTypePartDefinition, context);
-        }
+        return Edit(contentTypePartDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/GraphQL/Startup.cs
index a42ed632403..ca0ac000574 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/GraphQL/Startup.cs
@@ -3,15 +3,14 @@
 using OrchardCore.ContentTypes.GraphQL.Drivers;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentTypes.GraphQL
+namespace OrchardCore.ContentTypes.GraphQL;
+
+[RequireFeatures("OrchardCore.Apis.GraphQL")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Apis.GraphQL")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IContentTypeDefinitionDisplayDriver, GraphQLContentTypeSettingsDisplayDriver>();
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, GraphQLContentTypePartSettingsDriver>();
-        }
+        services.AddScoped<IContentTypeDefinitionDisplayDriver, GraphQLContentTypeSettingsDisplayDriver>();
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, GraphQLContentTypePartSettingsDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/GraphQL/ViewModels/GraphQLContentTypePartSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/GraphQL/ViewModels/GraphQLContentTypePartSettingsViewModel.cs
index 172af75e3a8..a7d8096281a 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/GraphQL/ViewModels/GraphQLContentTypePartSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/GraphQL/ViewModels/GraphQLContentTypePartSettingsViewModel.cs
@@ -2,12 +2,11 @@
 using OrchardCore.ContentManagement.GraphQL.Settings;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentTypes.GraphQL.ViewModels
+namespace OrchardCore.ContentTypes.GraphQL.ViewModels;
+
+public class GraphQLContentTypePartSettingsViewModel
 {
-    public class GraphQLContentTypePartSettingsViewModel
-    {
-        public GraphQLContentOptions Options { get; set; }
-        public GraphQLContentTypePartSettings Settings { get; set; }
-        public ContentTypePartDefinition Definition { get; set; }
-    }
+    public GraphQLContentOptions Options { get; set; }
+    public GraphQLContentTypePartSettings Settings { get; set; }
+    public ContentTypePartDefinition Definition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/GraphQL/ViewModels/GraphQLContentTypeSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/GraphQL/ViewModels/GraphQLContentTypeSettingsViewModel.cs
index 9dcad2ad663..0a8b73490b0 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/GraphQL/ViewModels/GraphQLContentTypeSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/GraphQL/ViewModels/GraphQLContentTypeSettingsViewModel.cs
@@ -3,16 +3,15 @@
 using OrchardCore.ContentManagement.GraphQL.Settings;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentTypes.GraphQL.ViewModels
+namespace OrchardCore.ContentTypes.GraphQL.ViewModels;
+
+public class GraphQLContentTypeSettingsViewModel
 {
-    public class GraphQLContentTypeSettingsViewModel
-    {
-        public GraphQLContentTypeSettings Settings { get; set; }
+    public GraphQLContentTypeSettings Settings { get; set; }
 
-        [BindNever]
-        public GraphQLContentOptions Options { get; set; }
+    [BindNever]
+    public GraphQLContentOptions Options { get; set; }
 
-        [BindNever]
-        public ContentTypeDefinition Definition { get; set; }
-    }
+    [BindNever]
+    public ContentTypeDefinition Definition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/RecipeSteps/ContentDefinitionStep.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/RecipeSteps/ContentDefinitionStep.cs
index 81e64f830b8..10fb5ae7bb0 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/RecipeSteps/ContentDefinitionStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/RecipeSteps/ContentDefinitionStep.cs
@@ -8,104 +8,103 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.ContentTypes.RecipeSteps
+namespace OrchardCore.ContentTypes.RecipeSteps;
+
+/// <summary>
+/// This recipe step creates content definitions.
+/// </summary>
+public sealed class ContentDefinitionStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step creates content definitions.
-    /// </summary>
-    public sealed class ContentDefinitionStep : IRecipeStepHandler
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+
+    internal readonly IStringLocalizer S;
+
+    public ContentDefinitionStep(
+        IContentDefinitionManager contentDefinitionManager,
+        IStringLocalizer<ContentDefinitionStep> stringLocalizer)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+        S = stringLocalizer;
+    }
+
+    public async Task ExecuteAsync(RecipeExecutionContext context)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+        if (!string.Equals(context.Name, "ContentDefinition", StringComparison.OrdinalIgnoreCase))
+        {
+            return;
+        }
 
-        internal readonly IStringLocalizer S;
+        var step = context.Step.ToObject<ContentDefinitionStepModel>();
 
-        public ContentDefinitionStep(
-            IContentDefinitionManager contentDefinitionManager,
-            IStringLocalizer<ContentDefinitionStep> stringLocalizer)
+        foreach (var contentType in step.ContentTypes)
         {
-            _contentDefinitionManager = contentDefinitionManager;
-            S = stringLocalizer;
+            var newType = await _contentDefinitionManager.LoadTypeDefinitionAsync(contentType.Name)
+                ?? new ContentTypeDefinition(contentType.Name, contentType.DisplayName);
+
+            await UpdateContentTypeAsync(newType, contentType, context);
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        foreach (var contentPart in step.ContentParts)
         {
-            if (!string.Equals(context.Name, "ContentDefinition", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
+            var newPart = await _contentDefinitionManager.LoadPartDefinitionAsync(contentPart.Name)
+                ?? new ContentPartDefinition(contentPart.Name);
 
-            var step = context.Step.ToObject<ContentDefinitionStepModel>();
+            await UpdateContentPartAsync(newPart, contentPart, context);
+        }
+    }
 
-            foreach (var contentType in step.ContentTypes)
+    private Task UpdateContentTypeAsync(ContentTypeDefinition type, ContentTypeDefinitionRecord record, RecipeExecutionContext context)
+    {
+        return _contentDefinitionManager.AlterTypeDefinitionAsync(type.Name, builder =>
+        {
+            if (!string.IsNullOrEmpty(record.DisplayName))
             {
-                var newType = await _contentDefinitionManager.LoadTypeDefinitionAsync(contentType.Name)
-                    ?? new ContentTypeDefinition(contentType.Name, contentType.DisplayName);
-
-                await UpdateContentTypeAsync(newType, contentType, context);
+                builder.DisplayedAs(record.DisplayName);
+                builder.MergeSettings(record.Settings);
             }
 
-            foreach (var contentPart in step.ContentParts)
+            foreach (var part in record.ContentTypePartDefinitionRecords)
             {
-                var newPart = await _contentDefinitionManager.LoadPartDefinitionAsync(contentPart.Name)
-                    ?? new ContentPartDefinition(contentPart.Name);
+                if (string.IsNullOrEmpty(part.PartName))
+                {
+                    context.Errors.Add(S["Unable to add content-part to the '{0}' content-type. The part name cannot be null or empty.", type.Name]);
+
+                    continue;
+                }
 
-                await UpdateContentPartAsync(newPart, contentPart, context);
+                builder.WithPart(part.Name, part.PartName, partBuilder => partBuilder.MergeSettings(part.Settings));
             }
-        }
+        });
+    }
 
-        private Task UpdateContentTypeAsync(ContentTypeDefinition type, ContentTypeDefinitionRecord record, RecipeExecutionContext context)
+    private Task UpdateContentPartAsync(ContentPartDefinition part, ContentPartDefinitionRecord record, RecipeExecutionContext context)
+    {
+        return _contentDefinitionManager.AlterPartDefinitionAsync(part.Name, builder =>
         {
-            return _contentDefinitionManager.AlterTypeDefinitionAsync(type.Name, builder =>
-            {
-                if (!string.IsNullOrEmpty(record.DisplayName))
-                {
-                    builder.DisplayedAs(record.DisplayName);
-                    builder.MergeSettings(record.Settings);
-                }
+            builder.MergeSettings(record.Settings);
 
-                foreach (var part in record.ContentTypePartDefinitionRecords)
+            foreach (var field in record.ContentPartFieldDefinitionRecords)
+            {
+                if (string.IsNullOrEmpty(field.Name))
                 {
-                    if (string.IsNullOrEmpty(part.PartName))
-                    {
-                        context.Errors.Add(S["Unable to add content-part to the '{0}' content-type. The part name cannot be null or empty.", type.Name]);
-
-                        continue;
-                    }
+                    context.Errors.Add(S["Unable to add content-field to the '{0}' content-part. The part name cannot be null or empty.", part.Name]);
 
-                    builder.WithPart(part.Name, part.PartName, partBuilder => partBuilder.MergeSettings(part.Settings));
+                    continue;
                 }
-            });
-        }
-
-        private Task UpdateContentPartAsync(ContentPartDefinition part, ContentPartDefinitionRecord record, RecipeExecutionContext context)
-        {
-            return _contentDefinitionManager.AlterPartDefinitionAsync(part.Name, builder =>
-            {
-                builder.MergeSettings(record.Settings);
 
-                foreach (var field in record.ContentPartFieldDefinitionRecords)
+                builder.WithField(field.Name, fieldBuilder =>
                 {
-                    if (string.IsNullOrEmpty(field.Name))
-                    {
-                        context.Errors.Add(S["Unable to add content-field to the '{0}' content-part. The part name cannot be null or empty.", part.Name]);
-
-                        continue;
-                    }
-
-                    builder.WithField(field.Name, fieldBuilder =>
-                    {
-                        fieldBuilder.OfType(field.FieldName);
-                        fieldBuilder.MergeSettings(field.Settings);
-                    });
-                }
-            });
-        }
+                    fieldBuilder.OfType(field.FieldName);
+                    fieldBuilder.MergeSettings(field.Settings);
+                });
+            }
+        });
+    }
 
-        private sealed class ContentDefinitionStepModel
-        {
-            public ContentTypeDefinitionRecord[] ContentTypes { get; set; } = [];
+    private sealed class ContentDefinitionStepModel
+    {
+        public ContentTypeDefinitionRecord[] ContentTypes { get; set; } = [];
 
-            public ContentPartDefinitionRecord[] ContentParts { get; set; } = [];
-        }
+        public ContentPartDefinitionRecord[] ContentParts { get; set; } = [];
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/RecipeSteps/DeleteContentDefinitionStep.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/RecipeSteps/DeleteContentDefinitionStep.cs
index 5c892321d5c..ba76f975ae1 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/RecipeSteps/DeleteContentDefinitionStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/RecipeSteps/DeleteContentDefinitionStep.cs
@@ -5,46 +5,45 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.ContentTypes.RecipeSteps
+namespace OrchardCore.ContentTypes.RecipeSteps;
+
+/// <summary>
+/// This recipe step deletes content definition records.
+/// </summary>
+public sealed class DeleteContentDefinitionStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step deletes content definition records.
-    /// </summary>
-    public sealed class DeleteContentDefinitionStep : IRecipeStepHandler
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+
+    public DeleteContentDefinitionStep(IContentDefinitionManager contentDefinitionManager)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public DeleteContentDefinitionStep(IContentDefinitionManager contentDefinitionManager)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "DeleteContentDefinition", StringComparison.OrdinalIgnoreCase))
         {
-            _contentDefinitionManager = contentDefinitionManager;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        var step = context.Step.ToObject<DeleteContentDefinitionStepModel>();
+
+        foreach (var contentType in step.ContentTypes)
         {
-            if (!string.Equals(context.Name, "DeleteContentDefinition", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            var step = context.Step.ToObject<DeleteContentDefinitionStepModel>();
-
-            foreach (var contentType in step.ContentTypes)
-            {
-                // The content definition manager tests existence before trying to delete.
-                await _contentDefinitionManager.DeleteTypeDefinitionAsync(contentType);
-            }
-
-            foreach (var contentPart in step.ContentParts)
-            {
-                // The content definition manager tests existence before trying to delete.
-                await _contentDefinitionManager.DeletePartDefinitionAsync(contentPart);
-            }
+            // The content definition manager tests existence before trying to delete.
+            await _contentDefinitionManager.DeleteTypeDefinitionAsync(contentType);
         }
 
-        private sealed class DeleteContentDefinitionStepModel
+        foreach (var contentPart in step.ContentParts)
         {
-            public string[] ContentTypes { get; set; } = [];
-            public string[] ContentParts { get; set; } = [];
+            // The content definition manager tests existence before trying to delete.
+            await _contentDefinitionManager.DeletePartDefinitionAsync(contentPart);
         }
     }
+
+    private sealed class DeleteContentDefinitionStepModel
+    {
+        public string[] ContentTypes { get; set; } = [];
+        public string[] ContentParts { get; set; } = [];
+    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/RecipeSteps/ReplaceContentDefinitionStep.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/RecipeSteps/ReplaceContentDefinitionStep.cs
index c4fad2a735d..151f23ef10c 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/RecipeSteps/ReplaceContentDefinitionStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/RecipeSteps/ReplaceContentDefinitionStep.cs
@@ -6,85 +6,84 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.ContentTypes.RecipeSteps
+namespace OrchardCore.ContentTypes.RecipeSteps;
+
+/// <summary>
+/// This recipe step replaces content definition records.
+/// </summary>
+public sealed class ReplaceContentDefinitionStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step replaces content definition records.
-    /// </summary>
-    public sealed class ReplaceContentDefinitionStep : IRecipeStepHandler
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+
+    public ReplaceContentDefinitionStep(IContentDefinitionManager contentDefinitionManager)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public ReplaceContentDefinitionStep(IContentDefinitionManager contentDefinitionManager)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "ReplaceContentDefinition", StringComparison.OrdinalIgnoreCase))
         {
-            _contentDefinitionManager = contentDefinitionManager;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        var step = context.Step.ToObject<ReplaceContentDefinitionStepModel>();
+
+        // Delete existing parts first, as deleting them later will clear any imported content types using them.
+        foreach (var contentPart in step.ContentParts)
         {
-            if (!string.Equals(context.Name, "ReplaceContentDefinition", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
+            await _contentDefinitionManager.DeletePartDefinitionAsync(contentPart.Name);
+        }
 
-            var step = context.Step.ToObject<ReplaceContentDefinitionStepModel>();
+        foreach (var contentType in step.ContentTypes)
+        {
+            await _contentDefinitionManager.DeleteTypeDefinitionAsync(contentType.Name);
+            await AlterContentTypeAsync(contentType);
+        }
 
-            // Delete existing parts first, as deleting them later will clear any imported content types using them.
-            foreach (var contentPart in step.ContentParts)
-            {
-                await _contentDefinitionManager.DeletePartDefinitionAsync(contentPart.Name);
-            }
+        foreach (var contentPart in step.ContentParts)
+        {
+            await AlterContentPartAsync(contentPart);
+        }
+    }
 
-            foreach (var contentType in step.ContentTypes)
+    private async Task AlterContentTypeAsync(ContentTypeDefinitionRecord record)
+    {
+        await _contentDefinitionManager.AlterTypeDefinitionAsync(record.Name, builder =>
+        {
+            if (!string.IsNullOrEmpty(record.DisplayName))
             {
-                await _contentDefinitionManager.DeleteTypeDefinitionAsync(contentType.Name);
-                await AlterContentTypeAsync(contentType);
+                builder.DisplayedAs(record.DisplayName);
+                builder.MergeSettings(record.Settings);
             }
 
-            foreach (var contentPart in step.ContentParts)
+            foreach (var part in record.ContentTypePartDefinitionRecords)
             {
-                await AlterContentPartAsync(contentPart);
+                builder.WithPart(part.Name, part.PartName, partBuilder => partBuilder.MergeSettings(part.Settings));
             }
-        }
+        });
+    }
 
-        private async Task AlterContentTypeAsync(ContentTypeDefinitionRecord record)
+    private async Task AlterContentPartAsync(ContentPartDefinitionRecord record)
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync(record.Name, builder =>
         {
-            await _contentDefinitionManager.AlterTypeDefinitionAsync(record.Name, builder =>
-            {
-                if (!string.IsNullOrEmpty(record.DisplayName))
-                {
-                    builder.DisplayedAs(record.DisplayName);
-                    builder.MergeSettings(record.Settings);
-                }
+            builder.MergeSettings(record.Settings);
 
-                foreach (var part in record.ContentTypePartDefinitionRecords)
-                {
-                    builder.WithPart(part.Name, part.PartName, partBuilder => partBuilder.MergeSettings(part.Settings));
-                }
-            });
-        }
-
-        private async Task AlterContentPartAsync(ContentPartDefinitionRecord record)
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync(record.Name, builder =>
+            foreach (var field in record.ContentPartFieldDefinitionRecords)
             {
-                builder.MergeSettings(record.Settings);
-
-                foreach (var field in record.ContentPartFieldDefinitionRecords)
+                builder.WithField(field.Name, fieldBuilder =>
                 {
-                    builder.WithField(field.Name, fieldBuilder =>
-                    {
-                        fieldBuilder.OfType(field.FieldName);
-                        fieldBuilder.MergeSettings(field.Settings);
-                    });
-                }
-            });
-        }
+                    fieldBuilder.OfType(field.FieldName);
+                    fieldBuilder.MergeSettings(field.Settings);
+                });
+            }
+        });
+    }
 
-        private sealed class ReplaceContentDefinitionStepModel
-        {
-            public ContentTypeDefinitionRecord[] ContentTypes { get; set; } = [];
-            public ContentPartDefinitionRecord[] ContentParts { get; set; } = [];
-        }
+    private sealed class ReplaceContentDefinitionStepModel
+    {
+        public ContentTypeDefinitionRecord[] ContentTypes { get; set; } = [];
+        public ContentPartDefinitionRecord[] ContentParts { get; set; } = [];
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Recipes/LuceneRecipeEventHandler.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Recipes/LuceneRecipeEventHandler.cs
index 3b19ecc1668..dc82f59f332 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Recipes/LuceneRecipeEventHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Recipes/LuceneRecipeEventHandler.cs
@@ -4,47 +4,32 @@
 using OrchardCore.Recipes.Events;
 using OrchardCore.Recipes.Models;
 
-namespace OrchardCore.ContentTypes
+namespace OrchardCore.ContentTypes;
+
+/// <summary>
+/// This handler provides backward compatibility with ContentIndexSettings that have been migrated to LuceneContentIndexSettings.
+/// </summary>
+public class LuceneRecipeEventHandler : IRecipeEventHandler
 {
-    /// <summary>
-    /// This handler provides backward compatibility with ContentIndexSettings that have been migrated to LuceneContentIndexSettings.
-    /// </summary>
-    public class LuceneRecipeEventHandler : IRecipeEventHandler
-    {
-        public RecipeExecutionContext Context { get; private set; }
+    public RecipeExecutionContext Context { get; private set; }
 
-        public Task RecipeStepExecutedAsync(RecipeExecutionContext context) => Task.CompletedTask;
+    public Task RecipeStepExecutedAsync(RecipeExecutionContext context) => Task.CompletedTask;
 
-        public Task ExecutionFailedAsync(string executionId, RecipeDescriptor descriptor) => Task.CompletedTask;
+    public Task ExecutionFailedAsync(string executionId, RecipeDescriptor descriptor) => Task.CompletedTask;
 
-        public Task RecipeExecutedAsync(string executionId, RecipeDescriptor descriptor) => Task.CompletedTask;
+    public Task RecipeExecutedAsync(string executionId, RecipeDescriptor descriptor) => Task.CompletedTask;
 
-        public Task RecipeExecutingAsync(string executionId, RecipeDescriptor descriptor) => Task.CompletedTask;
+    public Task RecipeExecutingAsync(string executionId, RecipeDescriptor descriptor) => Task.CompletedTask;
 
-        public Task RecipeStepExecutingAsync(RecipeExecutionContext context)
+    public Task RecipeStepExecutingAsync(RecipeExecutionContext context)
+    {
+        if (context.Name == "ReplaceContentDefinition" || context.Name == "ContentDefinition")
         {
-            if (context.Name == "ReplaceContentDefinition" || context.Name == "ContentDefinition")
-            {
-                var step = context.Step.ToObject<ContentDefinitionStepModel>();
+            var step = context.Step.ToObject<ContentDefinitionStepModel>();
 
-                foreach (var contentType in step.ContentTypes)
-                {
-                    foreach (var partDefinition in contentType.ContentTypePartDefinitionRecords)
-                    {
-                        if (partDefinition.Settings != null)
-                        {
-                            if (partDefinition.Settings.TryGetPropertyValue("ContentIndexSettings", out var existingPartSettings) &&
-                                !partDefinition.Settings.ContainsKey("LuceneContentIndexSettings"))
-                            {
-                                partDefinition.Settings.Add("LuceneContentIndexSettings", existingPartSettings);
-                            }
-
-                            partDefinition.Settings.Remove("ContentIndexSettings");
-                        }
-                    }
-                }
-
-                foreach (var partDefinition in step.ContentParts)
+            foreach (var contentType in step.ContentTypes)
+            {
+                foreach (var partDefinition in contentType.ContentTypePartDefinitionRecords)
                 {
                     if (partDefinition.Settings != null)
                     {
@@ -55,34 +40,48 @@ public Task RecipeStepExecutingAsync(RecipeExecutionContext context)
                         }
 
                         partDefinition.Settings.Remove("ContentIndexSettings");
+                    }
+                }
+            }
+
+            foreach (var partDefinition in step.ContentParts)
+            {
+                if (partDefinition.Settings != null)
+                {
+                    if (partDefinition.Settings.TryGetPropertyValue("ContentIndexSettings", out var existingPartSettings) &&
+                        !partDefinition.Settings.ContainsKey("LuceneContentIndexSettings"))
+                    {
+                        partDefinition.Settings.Add("LuceneContentIndexSettings", existingPartSettings);
+                    }
 
-                        foreach (var fieldDefinition in partDefinition.ContentPartFieldDefinitionRecords)
+                    partDefinition.Settings.Remove("ContentIndexSettings");
+
+                    foreach (var fieldDefinition in partDefinition.ContentPartFieldDefinitionRecords)
+                    {
+                        if (fieldDefinition.Settings != null)
                         {
-                            if (fieldDefinition.Settings != null)
+                            if (fieldDefinition.Settings.TryGetPropertyValue("ContentIndexSettings", out var existingFieldSettings) &&
+                                !fieldDefinition.Settings.ContainsKey("LuceneContentIndexSettings"))
                             {
-                                if (fieldDefinition.Settings.TryGetPropertyValue("ContentIndexSettings", out var existingFieldSettings) &&
-                                    !fieldDefinition.Settings.ContainsKey("LuceneContentIndexSettings"))
-                                {
-                                    fieldDefinition.Settings.Add("LuceneContentIndexSettings", existingFieldSettings);
-                                }
-
-                                fieldDefinition.Settings.Remove("ContentIndexSettings");
+                                fieldDefinition.Settings.Add("LuceneContentIndexSettings", existingFieldSettings);
                             }
+
+                            fieldDefinition.Settings.Remove("ContentIndexSettings");
                         }
                     }
                 }
-
-                context.Step = JObject.FromObject(step);
             }
 
-            return Task.CompletedTask;
+            context.Step = JObject.FromObject(step);
         }
 
-        private sealed class ContentDefinitionStepModel
-        {
-            public string Name { get; set; }
-            public ContentTypeDefinitionRecord[] ContentTypes { get; set; } = [];
-            public ContentPartDefinitionRecord[] ContentParts { get; set; } = [];
-        }
+        return Task.CompletedTask;
+    }
+
+    private sealed class ContentDefinitionStepModel
+    {
+        public string Name { get; set; }
+        public ContentTypeDefinitionRecord[] ContentTypes { get; set; } = [];
+        public ContentPartDefinitionRecord[] ContentParts { get; set; } = [];
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Services/ContentDefinitionService.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Services/ContentDefinitionService.cs
index d3c2baa9752..7a7de9d86ca 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Services/ContentDefinitionService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Services/ContentDefinitionService.cs
@@ -14,512 +14,511 @@
 using OrchardCore.Modules;
 using OrchardCore.Mvc.Utilities;
 
-namespace OrchardCore.ContentTypes.Services
+namespace OrchardCore.ContentTypes.Services;
+
+public class ContentDefinitionService : IContentDefinitionService
 {
-    public class ContentDefinitionService : IContentDefinitionService
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IEnumerable<IContentDefinitionEventHandler> _contentDefinitionEventHandlers;
+    private readonly IEnumerable<Type> _contentPartTypes;
+    private readonly IEnumerable<Type> _contentFieldTypes;
+    protected readonly IStringLocalizer S;
+    private readonly ILogger _logger;
+
+    public ContentDefinitionService(
+            IContentDefinitionManager contentDefinitionManager,
+            IEnumerable<IContentDefinitionEventHandler> contentDefinitionEventHandlers,
+            IEnumerable<ContentPart> contentParts,
+            IEnumerable<ContentField> contentFields,
+            IOptions<ContentOptions> contentOptions,
+            ILogger<IContentDefinitionService> logger,
+            IStringLocalizer<ContentDefinitionService> localizer)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IEnumerable<IContentDefinitionEventHandler> _contentDefinitionEventHandlers;
-        private readonly IEnumerable<Type> _contentPartTypes;
-        private readonly IEnumerable<Type> _contentFieldTypes;
-        protected readonly IStringLocalizer S;
-        private readonly ILogger _logger;
-
-        public ContentDefinitionService(
-                IContentDefinitionManager contentDefinitionManager,
-                IEnumerable<IContentDefinitionEventHandler> contentDefinitionEventHandlers,
-                IEnumerable<ContentPart> contentParts,
-                IEnumerable<ContentField> contentFields,
-                IOptions<ContentOptions> contentOptions,
-                ILogger<IContentDefinitionService> logger,
-                IStringLocalizer<ContentDefinitionService> localizer)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _contentDefinitionEventHandlers = contentDefinitionEventHandlers;
-
-            foreach (var element in contentParts.Select(x => x.GetType()))
-            {
-                logger.LogWarning("The content part '{ContentPart}' should not be registered in DI. Use AddContentPart<T> instead.", element);
-            }
+        _contentDefinitionManager = contentDefinitionManager;
+        _contentDefinitionEventHandlers = contentDefinitionEventHandlers;
 
-            foreach (var element in contentFields.Select(x => x.GetType()))
-            {
-                logger.LogWarning("The content field '{ContentField}' should not be registered in DI. Use AddContentField<T> instead.", element);
-            }
+        foreach (var element in contentParts.Select(x => x.GetType()))
+        {
+            logger.LogWarning("The content part '{ContentPart}' should not be registered in DI. Use AddContentPart<T> instead.", element);
+        }
 
-            // TODO: This code can be removed in a future release and rationalized to only use ContentPartOptions.
-            _contentPartTypes = contentParts.Select(cp => cp.GetType())
-                .Union(contentOptions.Value.ContentPartOptions.Select(cpo => cpo.Type));
+        foreach (var element in contentFields.Select(x => x.GetType()))
+        {
+            logger.LogWarning("The content field '{ContentField}' should not be registered in DI. Use AddContentField<T> instead.", element);
+        }
 
-            // TODO: This code can be removed in a future release and rationalized to only use ContentFieldOptions.
-            _contentFieldTypes = contentFields.Select(cf => cf.GetType())
-                .Union(contentOptions.Value.ContentFieldOptions.Select(cfo => cfo.Type));
+        // TODO: This code can be removed in a future release and rationalized to only use ContentPartOptions.
+        _contentPartTypes = contentParts.Select(cp => cp.GetType())
+            .Union(contentOptions.Value.ContentPartOptions.Select(cpo => cpo.Type));
 
-            _logger = logger;
-            S = localizer;
-        }
+        // TODO: This code can be removed in a future release and rationalized to only use ContentFieldOptions.
+        _contentFieldTypes = contentFields.Select(cf => cf.GetType())
+            .Union(contentOptions.Value.ContentFieldOptions.Select(cfo => cfo.Type));
 
-        public async Task<IEnumerable<EditTypeViewModel>> LoadTypesAsync()
-            => (await _contentDefinitionManager.LoadTypeDefinitionsAsync())
-                .Select(ctd => new EditTypeViewModel(ctd))
-                .OrderBy(m => m.DisplayName);
+        _logger = logger;
+        S = localizer;
+    }
 
-        public async Task<IEnumerable<EditTypeViewModel>> GetTypesAsync()
-            => (await _contentDefinitionManager.ListTypeDefinitionsAsync())
-                .Select(ctd => new EditTypeViewModel(ctd))
-                .OrderBy(m => m.DisplayName);
+    public async Task<IEnumerable<EditTypeViewModel>> LoadTypesAsync()
+        => (await _contentDefinitionManager.LoadTypeDefinitionsAsync())
+            .Select(ctd => new EditTypeViewModel(ctd))
+            .OrderBy(m => m.DisplayName);
 
-        public async Task<EditTypeViewModel> LoadTypeAsync(string name)
-        {
-            var contentTypeDefinition = await _contentDefinitionManager.LoadTypeDefinitionAsync(name);
+    public async Task<IEnumerable<EditTypeViewModel>> GetTypesAsync()
+        => (await _contentDefinitionManager.ListTypeDefinitionsAsync())
+            .Select(ctd => new EditTypeViewModel(ctd))
+            .OrderBy(m => m.DisplayName);
 
-            if (contentTypeDefinition == null)
-            {
-                return null;
-            }
+    public async Task<EditTypeViewModel> LoadTypeAsync(string name)
+    {
+        var contentTypeDefinition = await _contentDefinitionManager.LoadTypeDefinitionAsync(name);
 
-            return new EditTypeViewModel(contentTypeDefinition);
+        if (contentTypeDefinition == null)
+        {
+            return null;
         }
 
-        public async Task<EditTypeViewModel> GetTypeAsync(string name)
-        {
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(name);
+        return new EditTypeViewModel(contentTypeDefinition);
+    }
 
-            if (contentTypeDefinition == null)
-            {
-                return null;
-            }
+    public async Task<EditTypeViewModel> GetTypeAsync(string name)
+    {
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(name);
 
-            return new EditTypeViewModel(contentTypeDefinition);
+        if (contentTypeDefinition == null)
+        {
+            return null;
         }
 
-        public async Task<ContentTypeDefinition> AddTypeAsync(string name, string displayName)
+        return new EditTypeViewModel(contentTypeDefinition);
+    }
+
+    public async Task<ContentTypeDefinition> AddTypeAsync(string name, string displayName)
+    {
+        if (string.IsNullOrWhiteSpace(displayName))
         {
-            if (string.IsNullOrWhiteSpace(displayName))
-            {
-                throw new ArgumentException($"The '{nameof(displayName)}' can't be null or empty.", nameof(displayName));
-            }
+            throw new ArgumentException($"The '{nameof(displayName)}' can't be null or empty.", nameof(displayName));
+        }
 
-            if (string.IsNullOrWhiteSpace(name))
+        if (string.IsNullOrWhiteSpace(name))
+        {
+            name = await GenerateContentTypeNameFromDisplayNameAsync(displayName);
+        }
+        else
+        {
+            if (!name[0].IsLetter())
             {
-                name = await GenerateContentTypeNameFromDisplayNameAsync(displayName);
+                throw new ArgumentException("Content type name must start with a letter", nameof(name));
             }
-            else
+            if (!string.Equals(name, name.ToSafeName(), StringComparison.OrdinalIgnoreCase))
             {
-                if (!name[0].IsLetter())
-                {
-                    throw new ArgumentException("Content type name must start with a letter", nameof(name));
-                }
-                if (!string.Equals(name, name.ToSafeName(), StringComparison.OrdinalIgnoreCase))
-                {
-                    throw new ArgumentException("Content type name contains invalid characters", nameof(name));
-                }
+                throw new ArgumentException("Content type name contains invalid characters", nameof(name));
             }
+        }
 
-            while (await _contentDefinitionManager.LoadTypeDefinitionAsync(name) is not null)
-            {
-                name = VersionName(name);
-            }
+        while (await _contentDefinitionManager.LoadTypeDefinitionAsync(name) is not null)
+        {
+            name = VersionName(name);
+        }
 
-            var contentTypeDefinition = new ContentTypeDefinition(name, displayName);
+        var contentTypeDefinition = new ContentTypeDefinition(name, displayName);
 
-            await _contentDefinitionManager.StoreTypeDefinitionAsync(contentTypeDefinition);
+        await _contentDefinitionManager.StoreTypeDefinitionAsync(contentTypeDefinition);
 
-            // Ensure it has its own part.
-            await _contentDefinitionManager.AlterTypeDefinitionAsync(name, builder => builder.WithPart(name));
-            await _contentDefinitionManager.AlterTypeDefinitionAsync(name, cfg => cfg.Creatable().Draftable().Versionable().Listable().Securable());
+        // Ensure it has its own part.
+        await _contentDefinitionManager.AlterTypeDefinitionAsync(name, builder => builder.WithPart(name));
+        await _contentDefinitionManager.AlterTypeDefinitionAsync(name, cfg => cfg.Creatable().Draftable().Versionable().Listable().Securable());
 
-            _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentTypeCreated(context), new ContentTypeCreatedContext { ContentTypeDefinition = contentTypeDefinition }, _logger);
+        _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentTypeCreated(context), new ContentTypeCreatedContext { ContentTypeDefinition = contentTypeDefinition }, _logger);
 
-            return contentTypeDefinition;
-        }
+        return contentTypeDefinition;
+    }
 
-        public async Task RemoveTypeAsync(string name, bool deleteContent)
+    public async Task RemoveTypeAsync(string name, bool deleteContent)
+    {
+        // First remove all attached parts.
+        var typeDefinition = await _contentDefinitionManager.LoadTypeDefinitionAsync(name);
+        var partDefinitions = typeDefinition.Parts.ToList();
+        foreach (var partDefinition in partDefinitions)
         {
-            // First remove all attached parts.
-            var typeDefinition = await _contentDefinitionManager.LoadTypeDefinitionAsync(name);
-            var partDefinitions = typeDefinition.Parts.ToList();
-            foreach (var partDefinition in partDefinitions)
-            {
-                await RemovePartFromTypeAsync(partDefinition.PartDefinition.Name, name);
+            await RemovePartFromTypeAsync(partDefinition.PartDefinition.Name, name);
 
-                // Delete the part if it's its own part.
-                if (partDefinition.PartDefinition.Name == name)
-                {
-                    await RemovePartAsync(name);
-                }
+            // Delete the part if it's its own part.
+            if (partDefinition.PartDefinition.Name == name)
+            {
+                await RemovePartAsync(name);
             }
+        }
 
-            await _contentDefinitionManager.DeleteTypeDefinitionAsync(name);
+        await _contentDefinitionManager.DeleteTypeDefinitionAsync(name);
 
-            _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentTypeRemoved(context), new ContentTypeRemovedContext { ContentTypeDefinition = typeDefinition }, _logger);
-        }
+        _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentTypeRemoved(context), new ContentTypeRemovedContext { ContentTypeDefinition = typeDefinition }, _logger);
+    }
 
-        public async Task AddPartToTypeAsync(string partName, string typeName)
-        {
-            await _contentDefinitionManager.AlterTypeDefinitionAsync(typeName, typeBuilder => typeBuilder.WithPart(partName));
-            _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentPartAttached(context), new ContentPartAttachedContext { ContentTypeName = typeName, ContentPartName = partName }, _logger);
-        }
+    public async Task AddPartToTypeAsync(string partName, string typeName)
+    {
+        await _contentDefinitionManager.AlterTypeDefinitionAsync(typeName, typeBuilder => typeBuilder.WithPart(partName));
+        _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentPartAttached(context), new ContentPartAttachedContext { ContentTypeName = typeName, ContentPartName = partName }, _logger);
+    }
 
-        public async Task AddReusablePartToTypeAsync(string name, string displayName, string description, string partName, string typeName)
-        {
-            await _contentDefinitionManager.AlterTypeDefinitionAsync(typeName, typeBuilder => typeBuilder
-                .WithPart(name, partName, partBuilder =>
-                {
-                    partBuilder.WithDisplayName(displayName);
-                    partBuilder.WithDescription(description);
-                })
-            );
+    public async Task AddReusablePartToTypeAsync(string name, string displayName, string description, string partName, string typeName)
+    {
+        await _contentDefinitionManager.AlterTypeDefinitionAsync(typeName, typeBuilder => typeBuilder
+            .WithPart(name, partName, partBuilder =>
+            {
+                partBuilder.WithDisplayName(displayName);
+                partBuilder.WithDescription(description);
+            })
+        );
 
-            _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentPartAttached(context), new ContentPartAttachedContext { ContentTypeName = typeName, ContentPartName = partName }, _logger);
-        }
+        _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentPartAttached(context), new ContentPartAttachedContext { ContentTypeName = typeName, ContentPartName = partName }, _logger);
+    }
 
-        public async Task RemovePartFromTypeAsync(string partName, string typeName)
-        {
-            await _contentDefinitionManager.AlterTypeDefinitionAsync(typeName, typeBuilder => typeBuilder.RemovePart(partName));
-            _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentPartDetached(context), new ContentPartDetachedContext { ContentTypeName = typeName, ContentPartName = partName }, _logger);
-        }
+    public async Task RemovePartFromTypeAsync(string partName, string typeName)
+    {
+        await _contentDefinitionManager.AlterTypeDefinitionAsync(typeName, typeBuilder => typeBuilder.RemovePart(partName));
+        _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentPartDetached(context), new ContentPartDetachedContext { ContentTypeName = typeName, ContentPartName = partName }, _logger);
+    }
 
-        public async Task<IEnumerable<EditPartViewModel>> LoadPartsAsync(bool metadataPartsOnly)
-        {
-            var typeNames = new HashSet<string>((await LoadTypesAsync()).Select(ctd => ctd.Name));
-
-            // User-defined parts.
-            // Except for those parts with the same name as a type (implicit type's part or a mistake).
-            var userContentParts = (await _contentDefinitionManager.LoadPartDefinitionsAsync())
-                .Where(cpd => !typeNames.Contains(cpd.Name))
-                .Select(cpd => new EditPartViewModel(cpd))
-                .ToDictionary(k => k.Name);
-
-            // Code-defined parts.
-            var codeDefinedParts = metadataPartsOnly
-                ? []
-                : _contentPartTypes
-                        .Where(cpd => !userContentParts.ContainsKey(cpd.Name))
-                        .Select(cpi => new EditPartViewModel { Name = cpi.Name, DisplayName = cpi.Name })
-                    .ToList();
-
-            // Order by display name.
-            return codeDefinedParts
-                .Union(userContentParts.Values)
-                .OrderBy(m => m.DisplayName);
-        }
+    public async Task<IEnumerable<EditPartViewModel>> LoadPartsAsync(bool metadataPartsOnly)
+    {
+        var typeNames = new HashSet<string>((await LoadTypesAsync()).Select(ctd => ctd.Name));
+
+        // User-defined parts.
+        // Except for those parts with the same name as a type (implicit type's part or a mistake).
+        var userContentParts = (await _contentDefinitionManager.LoadPartDefinitionsAsync())
+            .Where(cpd => !typeNames.Contains(cpd.Name))
+            .Select(cpd => new EditPartViewModel(cpd))
+            .ToDictionary(k => k.Name);
+
+        // Code-defined parts.
+        var codeDefinedParts = metadataPartsOnly
+            ? []
+            : _contentPartTypes
+                    .Where(cpd => !userContentParts.ContainsKey(cpd.Name))
+                    .Select(cpi => new EditPartViewModel { Name = cpi.Name, DisplayName = cpi.Name })
+                .ToList();
+
+        // Order by display name.
+        return codeDefinedParts
+            .Union(userContentParts.Values)
+            .OrderBy(m => m.DisplayName);
+    }
 
-        public async Task<IEnumerable<EditPartViewModel>> GetPartsAsync(bool metadataPartsOnly)
-        {
-            var typeNames = new HashSet<string>((await GetTypesAsync()).Select(ctd => ctd.Name));
-
-            // User-defined parts.
-            // Except for those parts with the same name as a type (implicit type's part or a mistake).
-            var userContentParts = (await _contentDefinitionManager.ListPartDefinitionsAsync())
-                .Where(cpd => !typeNames.Contains(cpd.Name))
-                .Select(cpd => new EditPartViewModel(cpd))
-                .ToDictionary(k => k.Name);
-
-            // Code-defined parts.
-            var codeDefinedParts = metadataPartsOnly
-                ? []
-                : _contentPartTypes
-                        .Where(cpd => !userContentParts.ContainsKey(cpd.Name))
-                        .Select(cpi => new EditPartViewModel { Name = cpi.Name, DisplayName = cpi.Name })
-                    .ToList();
-
-            // Order by display name.
-            return codeDefinedParts
-                .Union(userContentParts.Values)
-                .OrderBy(m => m.DisplayName);
-        }
+    public async Task<IEnumerable<EditPartViewModel>> GetPartsAsync(bool metadataPartsOnly)
+    {
+        var typeNames = new HashSet<string>((await GetTypesAsync()).Select(ctd => ctd.Name));
+
+        // User-defined parts.
+        // Except for those parts with the same name as a type (implicit type's part or a mistake).
+        var userContentParts = (await _contentDefinitionManager.ListPartDefinitionsAsync())
+            .Where(cpd => !typeNames.Contains(cpd.Name))
+            .Select(cpd => new EditPartViewModel(cpd))
+            .ToDictionary(k => k.Name);
+
+        // Code-defined parts.
+        var codeDefinedParts = metadataPartsOnly
+            ? []
+            : _contentPartTypes
+                    .Where(cpd => !userContentParts.ContainsKey(cpd.Name))
+                    .Select(cpi => new EditPartViewModel { Name = cpi.Name, DisplayName = cpi.Name })
+                .ToList();
+
+        // Order by display name.
+        return codeDefinedParts
+            .Union(userContentParts.Values)
+            .OrderBy(m => m.DisplayName);
+    }
 
-        public async Task<EditPartViewModel> LoadPartAsync(string name)
+    public async Task<EditPartViewModel> LoadPartAsync(string name)
+    {
+        var contentPartDefinition = await _contentDefinitionManager.LoadPartDefinitionAsync(name);
+
+        if (contentPartDefinition == null)
         {
-            var contentPartDefinition = await _contentDefinitionManager.LoadPartDefinitionAsync(name);
+            var contentTypeDefinition = await _contentDefinitionManager.LoadTypeDefinitionAsync(name);
 
-            if (contentPartDefinition == null)
+            if (contentTypeDefinition == null)
             {
-                var contentTypeDefinition = await _contentDefinitionManager.LoadTypeDefinitionAsync(name);
+                return null;
+            }
 
-                if (contentTypeDefinition == null)
-                {
-                    return null;
-                }
+            contentPartDefinition = new ContentPartDefinition(name);
+        }
 
-                contentPartDefinition = new ContentPartDefinition(name);
-            }
+        var viewModel = new EditPartViewModel(contentPartDefinition);
 
-            var viewModel = new EditPartViewModel(contentPartDefinition);
+        return viewModel;
+    }
 
-            return viewModel;
-        }
+    public async Task<EditPartViewModel> GetPartAsync(string name)
+    {
+        var contentPartDefinition = await _contentDefinitionManager.GetPartDefinitionAsync(name);
 
-        public async Task<EditPartViewModel> GetPartAsync(string name)
+        if (contentPartDefinition == null)
         {
-            var contentPartDefinition = await _contentDefinitionManager.GetPartDefinitionAsync(name);
+            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(name);
 
-            if (contentPartDefinition == null)
+            if (contentTypeDefinition == null)
             {
-                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(name);
-
-                if (contentTypeDefinition == null)
-                {
-                    return null;
-                }
-
-                contentPartDefinition = new ContentPartDefinition(name);
+                return null;
             }
 
-            var viewModel = new EditPartViewModel(contentPartDefinition);
-
-            return viewModel;
+            contentPartDefinition = new ContentPartDefinition(name);
         }
 
-        public async Task<EditPartViewModel> AddPartAsync(CreatePartViewModel partViewModel)
-        {
-            var name = partViewModel.Name;
+        var viewModel = new EditPartViewModel(contentPartDefinition);
 
-            if (await _contentDefinitionManager.LoadPartDefinitionAsync(name) is not null)
-            {
-                throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
-            }
-
-            if (!string.IsNullOrEmpty(name))
-            {
-                await _contentDefinitionManager.AlterPartDefinitionAsync(name, builder => builder.Attachable());
-                var partDefinition = await _contentDefinitionManager.LoadPartDefinitionAsync(name);
-                _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentPartCreated(context), new ContentPartCreatedContext { ContentPartDefinition = partDefinition }, _logger);
+        return viewModel;
+    }
 
-                return new EditPartViewModel(partDefinition);
-            }
+    public async Task<EditPartViewModel> AddPartAsync(CreatePartViewModel partViewModel)
+    {
+        var name = partViewModel.Name;
 
-            return null;
+        if (await _contentDefinitionManager.LoadPartDefinitionAsync(name) is not null)
+        {
+            throw new Exception(S["Cannot add part named '{0}'. It already exists.", name]);
         }
 
-        public async Task RemovePartAsync(string name)
+        if (!string.IsNullOrEmpty(name))
         {
+            await _contentDefinitionManager.AlterPartDefinitionAsync(name, builder => builder.Attachable());
             var partDefinition = await _contentDefinitionManager.LoadPartDefinitionAsync(name);
+            _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentPartCreated(context), new ContentPartCreatedContext { ContentPartDefinition = partDefinition }, _logger);
 
-            if (partDefinition == null)
-            {
-                // Couldn't find this named part, ignore it.
-                return;
-            }
-
-            foreach (var fieldDefinition in partDefinition.Fields)
-            {
-                await RemoveFieldFromPartAsync(fieldDefinition.Name, name);
-            }
-
-            await _contentDefinitionManager.DeletePartDefinitionAsync(name);
-            _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentPartRemoved(context), new ContentPartRemovedContext { ContentPartDefinition = partDefinition }, _logger);
+            return new EditPartViewModel(partDefinition);
         }
 
-        public Task<IEnumerable<Type>> GetFieldsAsync()
-            => Task.FromResult(_contentFieldTypes);
+        return null;
+    }
 
-        public Task AddFieldToPartAsync(string fieldName, string fieldTypeName, string partName)
-            => AddFieldToPartAsync(fieldName, fieldName, fieldTypeName, partName);
+    public async Task RemovePartAsync(string name)
+    {
+        var partDefinition = await _contentDefinitionManager.LoadPartDefinitionAsync(name);
 
-        public async Task AddFieldToPartAsync(string fieldName, string displayName, string fieldTypeName, string partName)
+        if (partDefinition == null)
         {
-            if (string.IsNullOrEmpty(fieldName))
-            {
-                throw new ArgumentException($"The '{nameof(fieldName)}' can't be null or empty.", nameof(fieldName));
-            }
+            // Couldn't find this named part, ignore it.
+            return;
+        }
 
-            var partDefinition = await _contentDefinitionManager.LoadPartDefinitionAsync(partName);
-            var typeDefinition = await _contentDefinitionManager.LoadTypeDefinitionAsync(partName);
+        foreach (var fieldDefinition in partDefinition.Fields)
+        {
+            await RemoveFieldFromPartAsync(fieldDefinition.Name, name);
+        }
 
-            // If the type exists ensure it has its own part.
-            if (typeDefinition != null)
-            {
-                await _contentDefinitionManager.AlterTypeDefinitionAsync(partName, builder => builder.WithPart(partName));
-            }
+        await _contentDefinitionManager.DeletePartDefinitionAsync(name);
+        _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentPartRemoved(context), new ContentPartRemovedContext { ContentPartDefinition = partDefinition }, _logger);
+    }
 
-            fieldName = fieldName.ToSafeName();
+    public Task<IEnumerable<Type>> GetFieldsAsync()
+        => Task.FromResult(_contentFieldTypes);
 
-            await _contentDefinitionManager.AlterPartDefinitionAsync(partName,
-                partBuilder => partBuilder.WithField(fieldName, fieldBuilder => fieldBuilder.OfType(fieldTypeName).WithDisplayName(displayName)));
+    public Task AddFieldToPartAsync(string fieldName, string fieldTypeName, string partName)
+        => AddFieldToPartAsync(fieldName, fieldName, fieldTypeName, partName);
 
-            _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentFieldAttached(context), new ContentFieldAttachedContext
-            {
-                ContentPartName = partName,
-                ContentFieldTypeName = fieldTypeName,
-                ContentFieldName = fieldName,
-                ContentFieldDisplayName = displayName
-            }, _logger);
+    public async Task AddFieldToPartAsync(string fieldName, string displayName, string fieldTypeName, string partName)
+    {
+        if (string.IsNullOrEmpty(fieldName))
+        {
+            throw new ArgumentException($"The '{nameof(fieldName)}' can't be null or empty.", nameof(fieldName));
         }
 
-        public async Task RemoveFieldFromPartAsync(string fieldName, string partName)
+        var partDefinition = await _contentDefinitionManager.LoadPartDefinitionAsync(partName);
+        var typeDefinition = await _contentDefinitionManager.LoadTypeDefinitionAsync(partName);
+
+        // If the type exists ensure it has its own part.
+        if (typeDefinition != null)
         {
-            await _contentDefinitionManager.AlterPartDefinitionAsync(partName, typeBuilder => typeBuilder.RemoveField(fieldName));
-            _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentFieldDetached(context), new ContentFieldDetachedContext
-            {
-                ContentPartName = partName,
-                ContentFieldName = fieldName
-            }, _logger);
+            await _contentDefinitionManager.AlterTypeDefinitionAsync(partName, builder => builder.WithPart(partName));
         }
 
-        public async Task AlterFieldAsync(EditPartViewModel partViewModel, EditFieldViewModel fieldViewModel)
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync(partViewModel.Name, partBuilder =>
-            {
-                partBuilder.WithField(fieldViewModel.Name, fieldBuilder =>
-                {
-                    fieldBuilder.WithDisplayName(fieldViewModel.DisplayName);
-                    fieldBuilder.WithEditor(fieldViewModel.Editor);
-                    fieldBuilder.WithDisplayMode(fieldViewModel.DisplayMode);
-                });
-            });
+        fieldName = fieldName.ToSafeName();
 
-            _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentPartFieldUpdated(context), new ContentPartFieldUpdatedContext
-            {
-                ContentPartName = partViewModel.Name,
-                ContentFieldName = fieldViewModel.Name
-            }, _logger);
-        }
+        await _contentDefinitionManager.AlterPartDefinitionAsync(partName,
+            partBuilder => partBuilder.WithField(fieldName, fieldBuilder => fieldBuilder.OfType(fieldTypeName).WithDisplayName(displayName)));
 
-        public async Task AlterTypePartAsync(EditTypePartViewModel typePartViewModel)
+        _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentFieldAttached(context), new ContentFieldAttachedContext
         {
-            var typeDefinition = typePartViewModel.TypePartDefinition.ContentTypeDefinition;
-
-            await _contentDefinitionManager.AlterTypeDefinitionAsync(typeDefinition.Name, type =>
-            {
-                type.WithPart(typePartViewModel.Name, typePartViewModel.TypePartDefinition.PartDefinition, part =>
-                {
-                    part.WithDisplayName(typePartViewModel.DisplayName);
-                    part.WithDescription(typePartViewModel.Description);
-                    part.WithEditor(typePartViewModel.Editor);
-                    part.WithDisplayMode(typePartViewModel.DisplayMode);
-                });
-            });
+            ContentPartName = partName,
+            ContentFieldTypeName = fieldTypeName,
+            ContentFieldName = fieldName,
+            ContentFieldDisplayName = displayName
+        }, _logger);
+    }
 
-            _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentTypePartUpdated(context), new ContentTypePartUpdatedContext
-            {
-                ContentTypeName = typeDefinition.Name,
-                ContentPartName = typePartViewModel.Name
-            }, _logger);
-        }
+    public async Task RemoveFieldFromPartAsync(string fieldName, string partName)
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync(partName, typeBuilder => typeBuilder.RemoveField(fieldName));
+        _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentFieldDetached(context), new ContentFieldDetachedContext
+        {
+            ContentPartName = partName,
+            ContentFieldName = fieldName
+        }, _logger);
+    }
 
-        public async Task AlterTypePartsOrderAsync(ContentTypeDefinition typeDefinition, string[] partNames)
+    public async Task AlterFieldAsync(EditPartViewModel partViewModel, EditFieldViewModel fieldViewModel)
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync(partViewModel.Name, partBuilder =>
         {
-            await _contentDefinitionManager.AlterTypeDefinitionAsync(typeDefinition.Name, type =>
+            partBuilder.WithField(fieldViewModel.Name, fieldBuilder =>
             {
-                if (partNames is null)
-                {
-                    return;
-                }
+                fieldBuilder.WithDisplayName(fieldViewModel.DisplayName);
+                fieldBuilder.WithEditor(fieldViewModel.Editor);
+                fieldBuilder.WithDisplayMode(fieldViewModel.DisplayMode);
+            });
+        });
 
-                for (var i = 0; i < partNames.Length; i++)
-                {
-                    var partDefinition = typeDefinition.Parts?.FirstOrDefault(x => x.Name == partNames[i]);
+        _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentPartFieldUpdated(context), new ContentPartFieldUpdatedContext
+        {
+            ContentPartName = partViewModel.Name,
+            ContentFieldName = fieldViewModel.Name
+        }, _logger);
+    }
 
-                    if (partDefinition == null)
-                    {
-                        continue;
-                    }
+    public async Task AlterTypePartAsync(EditTypePartViewModel typePartViewModel)
+    {
+        var typeDefinition = typePartViewModel.TypePartDefinition.ContentTypeDefinition;
 
-                    type.WithPart(partNames[i], partDefinition.PartDefinition, part =>
-                    {
-                        part.MergeSettings<ContentTypePartSettings>(x => x.Position = i.ToString());
-                    });
-                }
+        await _contentDefinitionManager.AlterTypeDefinitionAsync(typeDefinition.Name, type =>
+        {
+            type.WithPart(typePartViewModel.Name, typePartViewModel.TypePartDefinition.PartDefinition, part =>
+            {
+                part.WithDisplayName(typePartViewModel.DisplayName);
+                part.WithDescription(typePartViewModel.Description);
+                part.WithEditor(typePartViewModel.Editor);
+                part.WithDisplayMode(typePartViewModel.DisplayMode);
             });
+        });
 
-            _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentTypeUpdated(context), new ContentTypeUpdatedContext
-            {
-                ContentTypeDefinition = typeDefinition
-            }, _logger);
-        }
+        _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentTypePartUpdated(context), new ContentTypePartUpdatedContext
+        {
+            ContentTypeName = typeDefinition.Name,
+            ContentPartName = typePartViewModel.Name
+        }, _logger);
+    }
 
-        public async Task AlterPartFieldsOrderAsync(ContentPartDefinition partDefinition, string[] fieldNames)
+    public async Task AlterTypePartsOrderAsync(ContentTypeDefinition typeDefinition, string[] partNames)
+    {
+        await _contentDefinitionManager.AlterTypeDefinitionAsync(typeDefinition.Name, type =>
         {
-            await _contentDefinitionManager.AlterPartDefinitionAsync(partDefinition.Name, type =>
+            if (partNames is null)
+            {
+                return;
+            }
+
+            for (var i = 0; i < partNames.Length; i++)
             {
-                if (fieldNames is null)
+                var partDefinition = typeDefinition.Parts?.FirstOrDefault(x => x.Name == partNames[i]);
+
+                if (partDefinition == null)
                 {
-                    return;
+                    continue;
                 }
 
-                for (var i = 0; i < fieldNames.Length; i++)
+                type.WithPart(partNames[i], partDefinition.PartDefinition, part =>
                 {
-                    var fieldDefinition = partDefinition.Fields.FirstOrDefault(x => x.Name == fieldNames[i]);
-                    type.WithField(fieldNames[i], field =>
-                    {
-                        field.MergeSettings<ContentPartFieldSettings>(x => x.Position = i.ToString());
-                    });
-                }
-            });
+                    part.MergeSettings<ContentTypePartSettings>(x => x.Position = i.ToString());
+                });
+            }
+        });
 
-            _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentPartUpdated(context), new ContentPartUpdatedContext
-            {
-                ContentPartDefinition = partDefinition
-            }, _logger);
-        }
+        _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentTypeUpdated(context), new ContentTypeUpdatedContext
+        {
+            ContentTypeDefinition = typeDefinition
+        }, _logger);
+    }
 
-        public async Task<string> GenerateContentTypeNameFromDisplayNameAsync(string displayName)
+    public async Task AlterPartFieldsOrderAsync(ContentPartDefinition partDefinition, string[] fieldNames)
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync(partDefinition.Name, type =>
         {
-            displayName = displayName.ToSafeName();
+            if (fieldNames is null)
+            {
+                return;
+            }
 
-            while (await _contentDefinitionManager.LoadTypeDefinitionAsync(displayName) != null)
+            for (var i = 0; i < fieldNames.Length; i++)
             {
-                displayName = VersionName(displayName);
+                var fieldDefinition = partDefinition.Fields.FirstOrDefault(x => x.Name == fieldNames[i]);
+                type.WithField(fieldNames[i], field =>
+                {
+                    field.MergeSettings<ContentPartFieldSettings>(x => x.Position = i.ToString());
+                });
             }
+        });
 
-            return displayName;
-        }
+        _contentDefinitionEventHandlers.Invoke((handler, context) => handler.ContentPartUpdated(context), new ContentPartUpdatedContext
+        {
+            ContentPartDefinition = partDefinition
+        }, _logger);
+    }
 
-        public async Task<string> GenerateFieldNameFromDisplayNameAsync(string partName, string displayName)
+    public async Task<string> GenerateContentTypeNameFromDisplayNameAsync(string displayName)
+    {
+        displayName = displayName.ToSafeName();
+
+        while (await _contentDefinitionManager.LoadTypeDefinitionAsync(displayName) != null)
         {
-            IEnumerable<ContentPartFieldDefinition> fieldDefinitions;
+            displayName = VersionName(displayName);
+        }
 
-            var part = await _contentDefinitionManager.LoadPartDefinitionAsync(partName);
-            displayName = displayName.ToSafeName();
+        return displayName;
+    }
 
-            if (part == null)
-            {
-                var type = await _contentDefinitionManager.LoadTypeDefinitionAsync(partName)
-                    ?? throw new ArgumentException("The part doesn't exist: " + partName);
+    public async Task<string> GenerateFieldNameFromDisplayNameAsync(string partName, string displayName)
+    {
+        IEnumerable<ContentPartFieldDefinition> fieldDefinitions;
 
-                var typePart = type.Parts?.FirstOrDefault(x => x.PartDefinition.Name == partName);
+        var part = await _contentDefinitionManager.LoadPartDefinitionAsync(partName);
+        displayName = displayName.ToSafeName();
 
-                // If passed in might be that of a type w/ no implicit field.
-                if (typePart == null)
-                {
-                    return displayName;
-                }
+        if (part == null)
+        {
+            var type = await _contentDefinitionManager.LoadTypeDefinitionAsync(partName)
+                ?? throw new ArgumentException("The part doesn't exist: " + partName);
 
-                fieldDefinitions = typePart.PartDefinition.Fields.ToList();
-            }
-            else
-            {
-                fieldDefinitions = part.Fields.ToList();
-            }
+            var typePart = type.Parts?.FirstOrDefault(x => x.PartDefinition.Name == partName);
 
-            while (fieldDefinitions.Any(x => string.Equals(displayName.Trim(), x.Name.Trim(), StringComparison.OrdinalIgnoreCase)))
+            // If passed in might be that of a type w/ no implicit field.
+            if (typePart == null)
             {
-                displayName = VersionName(displayName);
+                return displayName;
             }
 
-            return displayName;
+            fieldDefinitions = typePart.PartDefinition.Fields.ToList();
+        }
+        else
+        {
+            fieldDefinitions = part.Fields.ToList();
         }
 
-        private static string VersionName(string name)
+        while (fieldDefinitions.Any(x => string.Equals(displayName.Trim(), x.Name.Trim(), StringComparison.OrdinalIgnoreCase)))
         {
-            int version;
-            var nameParts = name.Split('-', StringSplitOptions.RemoveEmptyEntries);
+            displayName = VersionName(displayName);
+        }
 
-            if (nameParts.Length > 1 && int.TryParse(nameParts.Last(), out version))
-            {
-                version = version > 0 ? ++version : 2;
+        return displayName;
+    }
 
-                // This could unintentionally chomp something that looks like a version.
-                name = string.Join('-', nameParts.Take(nameParts.Length - 1));
-            }
-            else
-            {
-                version = 2;
-            }
+    private static string VersionName(string name)
+    {
+        int version;
+        var nameParts = name.Split('-', StringSplitOptions.RemoveEmptyEntries);
+
+        if (nameParts.Length > 1 && int.TryParse(nameParts.Last(), out version))
+        {
+            version = version > 0 ? ++version : 2;
 
-            return string.Format("{0}-{1}", name, version);
+            // This could unintentionally chomp something that looks like a version.
+            name = string.Join('-', nameParts.Take(nameParts.Length - 1));
         }
+        else
+        {
+            version = 2;
+        }
+
+        return string.Format("{0}-{1}", name, version);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Services/StereotypeService.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Services/StereotypeService.cs
index 11d69b203b5..68fd82abffe 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Services/StereotypeService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Services/StereotypeService.cs
@@ -7,47 +7,46 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentTypes.Services
+namespace OrchardCore.ContentTypes.Services;
+
+public class StereotypeService : IStereotypeService
 {
-    public class StereotypeService : IStereotypeService
+    private readonly IEnumerable<IStereotypesProvider> _providers;
+    private readonly IContentDefinitionService _contentDefinitionService;
+    private readonly ILogger<StereotypeService> _logger;
+
+    public StereotypeService(
+        IEnumerable<IStereotypesProvider> providers,
+        IContentDefinitionService contentDefinitionService,
+        ILogger<StereotypeService> logger)
     {
-        private readonly IEnumerable<IStereotypesProvider> _providers;
-        private readonly IContentDefinitionService _contentDefinitionService;
-        private readonly ILogger<StereotypeService> _logger;
-
-        public StereotypeService(
-            IEnumerable<IStereotypesProvider> providers,
-            IContentDefinitionService contentDefinitionService,
-            ILogger<StereotypeService> logger)
-        {
-            _providers = providers;
-            _contentDefinitionService = contentDefinitionService;
-            _logger = logger;
-        }
+        _providers = providers;
+        _contentDefinitionService = contentDefinitionService;
+        _logger = logger;
+    }
 
-        public async Task<IEnumerable<StereotypeDescription>> GetStereotypesAsync()
-        {
-            var providerStereotypes = (await _providers.InvokeAsync(provider => provider.GetStereotypesAsync(), _logger)).ToList();
+    public async Task<IEnumerable<StereotypeDescription>> GetStereotypesAsync()
+    {
+        var providerStereotypes = (await _providers.InvokeAsync(provider => provider.GetStereotypesAsync(), _logger)).ToList();
 
-            var stereotypes = providerStereotypes.Select(providerStereotype => providerStereotype.Stereotype)
-                .ToHashSet(StringComparer.OrdinalIgnoreCase);
+        var stereotypes = providerStereotypes.Select(providerStereotype => providerStereotype.Stereotype)
+            .ToHashSet(StringComparer.OrdinalIgnoreCase);
 
-            foreach (var contentType in await _contentDefinitionService.GetTypesAsync())
+        foreach (var contentType in await _contentDefinitionService.GetTypesAsync())
+        {
+            if (!contentType.TypeDefinition.TryGetStereotype(out var stereotype) ||
+                stereotypes.Contains(stereotype))
             {
-                if (!contentType.TypeDefinition.TryGetStereotype(out var stereotype) ||
-                    stereotypes.Contains(stereotype))
-                {
-                    continue;
-                }
-
-                providerStereotypes.Add(new StereotypeDescription
-                {
-                    Stereotype = stereotype,
-                    DisplayName = stereotype
-                });
+                continue;
             }
 
-            return providerStereotypes.OrderBy(x => x.DisplayName);
+            providerStereotypes.Add(new StereotypeDescription
+            {
+                Stereotype = stereotype,
+                DisplayName = stereotype
+            });
         }
+
+        return providerStereotypes.OrderBy(x => x.DisplayName);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Startup.cs
index d3121ff3018..f56d7e70bbb 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Startup.cs
@@ -13,42 +13,41 @@
 using OrchardCore.ResourceManagement;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.ContentTypes
+namespace OrchardCore.ContentTypes;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IContentDefinitionService, ContentDefinitionService>();
-            services.AddScoped<IStereotypeService, StereotypeService>();
-            services.AddScoped<IContentDefinitionDisplayHandler, ContentDefinitionDisplayCoordinator>();
-            services.AddScoped<IContentDefinitionDisplayManager, DefaultContentDefinitionDisplayManager>();
-            services.AddScoped<IContentPartDefinitionDisplayDriver, ContentPartSettingsDisplayDriver>();
-            services.AddScoped<IContentTypeDefinitionDisplayDriver, ContentTypeSettingsDisplayDriver>();
-            services.AddScoped<IContentTypeDefinitionDisplayDriver, DefaultContentTypeDisplayDriver>();
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, ContentTypePartSettingsDisplayDriver>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IContentDefinitionService, ContentDefinitionService>();
+        services.AddScoped<IStereotypeService, StereotypeService>();
+        services.AddScoped<IContentDefinitionDisplayHandler, ContentDefinitionDisplayCoordinator>();
+        services.AddScoped<IContentDefinitionDisplayManager, DefaultContentDefinitionDisplayManager>();
+        services.AddScoped<IContentPartDefinitionDisplayDriver, ContentPartSettingsDisplayDriver>();
+        services.AddScoped<IContentTypeDefinitionDisplayDriver, ContentTypeSettingsDisplayDriver>();
+        services.AddScoped<IContentTypeDefinitionDisplayDriver, DefaultContentTypeDisplayDriver>();
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, ContentTypePartSettingsDisplayDriver>();
 
-            // TODO: Put in its own feature to be able to execute this recipe without having to enable
-            // Content Types management UI
-            services.AddRecipeExecutionStep<ContentDefinitionStep>();
-            services.AddRecipeExecutionStep<ReplaceContentDefinitionStep>();
-            services.AddRecipeExecutionStep<DeleteContentDefinitionStep>();
+        // TODO: Put in its own feature to be able to execute this recipe without having to enable
+        // Content Types management UI
+        services.AddRecipeExecutionStep<ContentDefinitionStep>();
+        services.AddRecipeExecutionStep<ReplaceContentDefinitionStep>();
+        services.AddRecipeExecutionStep<DeleteContentDefinitionStep>();
 
-            services.AddTransient<IRecipeEventHandler, LuceneRecipeEventHandler>();
-            services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
-        }
+        services.AddTransient<IRecipeEventHandler, LuceneRecipeEventHandler>();
+        services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class DeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class DeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<ContentDefinitionDeploymentSource, ContentDefinitionDeploymentStep, ContentDefinitionDeploymentStepDriver>();
-            services.AddDeployment<ReplaceContentDefinitionDeploymentSource, ReplaceContentDefinitionDeploymentStep, ReplaceContentDefinitionDeploymentStepDriver>();
-            services.AddDeployment<DeleteContentDefinitionDeploymentSource, DeleteContentDefinitionDeploymentStep, DeleteContentDefinitionDeploymentStepDriver>();
-        }
+        services.AddDeployment<ContentDefinitionDeploymentSource, ContentDefinitionDeploymentStep, ContentDefinitionDeploymentStepDriver>();
+        services.AddDeployment<ReplaceContentDefinitionDeploymentSource, ReplaceContentDefinitionDeploymentStep, ReplaceContentDefinitionDeploymentStepDriver>();
+        services.AddDeployment<DeleteContentDefinitionDeploymentSource, DeleteContentDefinitionDeploymentStep, DeleteContentDefinitionDeploymentStepDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/AddFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/AddFieldViewModel.cs
index f000464b507..72f230fdc9c 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/AddFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/AddFieldViewModel.cs
@@ -3,41 +3,40 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentTypes.ViewModels
+namespace OrchardCore.ContentTypes.ViewModels;
+
+public class AddFieldViewModel
 {
-    public class AddFieldViewModel
+    public AddFieldViewModel()
     {
-        public AddFieldViewModel()
-        {
-            Fields = [];
-        }
+        Fields = [];
+    }
 
-        /// <summary>
-        /// The technical name of the field.
-        /// </summary>
-        public string Name { get; set; }
+    /// <summary>
+    /// The technical name of the field.
+    /// </summary>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// The display name of the field.
-        /// </summary>
-        public string DisplayName { get; set; }
+    /// <summary>
+    /// The display name of the field.
+    /// </summary>
+    public string DisplayName { get; set; }
 
-        /// <summary>
-        /// The selected field type.
-        /// </summary>
-        [Required]
-        public string FieldTypeName { get; set; }
+    /// <summary>
+    /// The selected field type.
+    /// </summary>
+    [Required]
+    public string FieldTypeName { get; set; }
 
-        /// <summary>
-        /// The part to add the field to.
-        /// </summary>
-        [BindNever]
-        public ContentPartDefinition Part { get; set; }
+    /// <summary>
+    /// The part to add the field to.
+    /// </summary>
+    [BindNever]
+    public ContentPartDefinition Part { get; set; }
 
-        /// <summary>
-        /// List of the available Field types.
-        /// </summary>
-        [BindNever]
-        public List<string> Fields { get; set; }
-    }
+    /// <summary>
+    /// List of the available Field types.
+    /// </summary>
+    [BindNever]
+    public List<string> Fields { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/AddPartsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/AddPartsViewModel.cs
index 7186c20d1f1..b2b98f99d53 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/AddPartsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/AddPartsViewModel.cs
@@ -1,38 +1,37 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.ContentTypes.ViewModels
+namespace OrchardCore.ContentTypes.ViewModels;
+
+public class AddPartsViewModel
 {
-    public class AddPartsViewModel
+    public AddPartsViewModel()
     {
-        public AddPartsViewModel()
-        {
-            PartSelections = [];
-        }
-
-        public EditTypeViewModel Type { get; set; }
-        public List<PartSelectionViewModel> PartSelections { get; set; }
+        PartSelections = [];
     }
 
-    public class AddReusablePartViewModel
-    {
-        public AddReusablePartViewModel()
-        {
-            PartSelections = [];
-        }
-
-        public EditTypeViewModel Type { get; set; }
-        public string Name { get; set; }
-        public string DisplayName { get; set; }
-        public string Description { get; set; }
-        public List<PartSelectionViewModel> PartSelections { get; set; }
-        public string SelectedPartName { get; set; }
-    }
+    public EditTypeViewModel Type { get; set; }
+    public List<PartSelectionViewModel> PartSelections { get; set; }
+}
 
-    public class PartSelectionViewModel
+public class AddReusablePartViewModel
+{
+    public AddReusablePartViewModel()
     {
-        public string PartName { get; set; }
-        public string PartDisplayName { get; set; }
-        public string PartDescription { get; set; }
-        public bool IsSelected { get; set; }
+        PartSelections = [];
     }
+
+    public EditTypeViewModel Type { get; set; }
+    public string Name { get; set; }
+    public string DisplayName { get; set; }
+    public string Description { get; set; }
+    public List<PartSelectionViewModel> PartSelections { get; set; }
+    public string SelectedPartName { get; set; }
+}
+
+public class PartSelectionViewModel
+{
+    public string PartName { get; set; }
+    public string PartDisplayName { get; set; }
+    public string PartDescription { get; set; }
+    public bool IsSelected { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ContentDefinitionStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ContentDefinitionStepViewModel.cs
index bf5604b4b15..d8d5868a272 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ContentDefinitionStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ContentDefinitionStepViewModel.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.ContentTypes.ViewModels
+namespace OrchardCore.ContentTypes.ViewModels;
+
+public class ContentDefinitionStepViewModel
 {
-    public class ContentDefinitionStepViewModel
-    {
-        public string[] ContentTypes { get; set; }
+    public string[] ContentTypes { get; set; }
 
-        public string[] ContentParts { get; set; }
+    public string[] ContentParts { get; set; }
 
-        public bool IncludeAll { get; internal set; }
-    }
+    public bool IncludeAll { get; internal set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ContentPartSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ContentPartSettingsViewModel.cs
index 619447e54f9..11d03e796d8 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ContentPartSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ContentPartSettingsViewModel.cs
@@ -1,16 +1,15 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentTypes.ViewModels
+namespace OrchardCore.ContentTypes.ViewModels;
+
+public class ContentPartSettingsViewModel
 {
-    public class ContentPartSettingsViewModel
-    {
-        public bool Attachable { get; set; }
-        public bool Reusable { get; set; }
-        public string Description { get; set; }
-        public string DisplayName { get; set; }
+    public bool Attachable { get; set; }
+    public bool Reusable { get; set; }
+    public string Description { get; set; }
+    public string DisplayName { get; set; }
 
-        [BindNever]
-        public ContentPartDefinition ContentPartDefinition { get; set; }
-    }
+    [BindNever]
+    public ContentPartDefinition ContentPartDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ContentTypeSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ContentTypeSettingsViewModel.cs
index 3081711a4d7..a7a34445c1b 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ContentTypeSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ContentTypeSettingsViewModel.cs
@@ -1,25 +1,24 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentTypes.ViewModels
+namespace OrchardCore.ContentTypes.ViewModels;
+
+public class ContentTypeSettingsViewModel
 {
-    public class ContentTypeSettingsViewModel
-    {
-        public bool Creatable { get; set; }
+    public bool Creatable { get; set; }
 
-        public bool Listable { get; set; }
+    public bool Listable { get; set; }
 
-        public bool Draftable { get; set; }
+    public bool Draftable { get; set; }
 
-        public bool Versionable { get; set; }
+    public bool Versionable { get; set; }
 
-        public bool Securable { get; set; }
+    public bool Securable { get; set; }
 
-        public string Stereotype { get; set; }
+    public string Stereotype { get; set; }
 
-        public string Description { get; set; }
+    public string Description { get; set; }
 
-        [BindNever]
-        public ContentTypeDefinitionDriverOptions Options { get; set; }
-    }
+    [BindNever]
+    public ContentTypeDefinitionDriverOptions Options { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ContentTypeViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ContentTypeViewModel.cs
index 7fa573c526f..939f4cd4840 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ContentTypeViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ContentTypeViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.ContentTypes.ViewModels
+namespace OrchardCore.ContentTypes.ViewModels;
+
+public class ContentTypeViewModel
 {
-    public class ContentTypeViewModel
-    {
-        public string DisplayName { get; set; }
-        public string Name { get; set; }
-    }
+    public string DisplayName { get; set; }
+    public string Name { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/CreatePartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/CreatePartViewModel.cs
index 08c73178b92..c8cd3e0e070 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/CreatePartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/CreatePartViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.ContentTypes.ViewModels
+namespace OrchardCore.ContentTypes.ViewModels;
+
+public class CreatePartViewModel
 {
-    public class CreatePartViewModel
-    {
-        public string Name { get; set; }
-    }
+    public string Name { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/CreateTypeViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/CreateTypeViewModel.cs
index 344abef1f79..4c3b656a9a6 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/CreateTypeViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/CreateTypeViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.ContentTypes.ViewModels
+namespace OrchardCore.ContentTypes.ViewModels;
+
+public class CreateTypeViewModel
 {
-    public class CreateTypeViewModel
-    {
-        public string DisplayName { get; set; }
-        public string Name { get; set; }
-    }
+    public string DisplayName { get; set; }
+    public string Name { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/DeleteContentDefinitionStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/DeleteContentDefinitionStepViewModel.cs
index 262b9a17451..fe0566bb630 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/DeleteContentDefinitionStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/DeleteContentDefinitionStepViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.ContentTypes.ViewModels
+namespace OrchardCore.ContentTypes.ViewModels;
+
+public class DeleteContentDefinitionStepViewModel
 {
-    public class DeleteContentDefinitionStepViewModel
-    {
-        public string ContentTypes { get; set; }
+    public string ContentTypes { get; set; }
 
-        public string ContentParts { get; set; }
-    }
+    public string ContentParts { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/EditFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/EditFieldViewModel.cs
index a422c081241..b3fe4640ae5 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/EditFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/EditFieldViewModel.cs
@@ -2,35 +2,34 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentTypes.ViewModels
+namespace OrchardCore.ContentTypes.ViewModels;
+
+public class EditFieldViewModel
 {
-    public class EditFieldViewModel
-    {
-        /// <summary>
-        /// The technical name of the field.
-        /// </summary>
-        public string Name { get; set; }
+    /// <summary>
+    /// The technical name of the field.
+    /// </summary>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// The display name of the field.
-        /// </summary>
-        [Required]
-        public string DisplayName { get; set; }
+    /// <summary>
+    /// The display name of the field.
+    /// </summary>
+    [Required]
+    public string DisplayName { get; set; }
 
-        [BindNever]
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
+    [BindNever]
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 
-        [BindNever]
-        public dynamic Shape { get; set; }
+    [BindNever]
+    public dynamic Shape { get; set; }
 
-        /// <summary>
-        /// The editor name of the field.
-        /// </summary>
-        public string Editor { get; set; }
+    /// <summary>
+    /// The editor name of the field.
+    /// </summary>
+    public string Editor { get; set; }
 
-        /// <summary>
-        /// The display mode of the field.
-        /// </summary>
-        public string DisplayMode { get; set; }
-    }
+    /// <summary>
+    /// The display mode of the field.
+    /// </summary>
+    public string DisplayMode { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/EditPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/EditPartViewModel.cs
index 69bce871c76..d5e55fac293 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/EditPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/EditPartViewModel.cs
@@ -4,42 +4,41 @@
 using OrchardCore.ContentManagement.Metadata.Settings;
 using OrchardCore.Mvc.Utilities;
 
-namespace OrchardCore.ContentTypes.ViewModels
+namespace OrchardCore.ContentTypes.ViewModels;
+
+public class EditPartViewModel
 {
-    public class EditPartViewModel
+    public EditPartViewModel()
+    {
+    }
+
+    public EditPartViewModel(ContentPartDefinition contentPartDefinition)
+    {
+        Name = contentPartDefinition.Name;
+        PartDefinition = contentPartDefinition;
+        _displayName = contentPartDefinition.DisplayName();
+    }
+
+    public string Name { get; set; }
+
+    private string _displayName;
+
+    [Required]
+    public string DisplayName
     {
-        public EditPartViewModel()
-        {
-        }
-
-        public EditPartViewModel(ContentPartDefinition contentPartDefinition)
-        {
-            Name = contentPartDefinition.Name;
-            PartDefinition = contentPartDefinition;
-            _displayName = contentPartDefinition.DisplayName();
-        }
-
-        public string Name { get; set; }
-
-        private string _displayName;
-
-        [Required]
-        public string DisplayName
-        {
-            get { return !string.IsNullOrWhiteSpace(_displayName) ? _displayName : Name.TrimEnd("Part").CamelFriendly(); }
-            set { _displayName = value; }
-        }
-
-        public string Description
-        {
-            get { return PartDefinition.GetSettings<ContentPartSettings>().Description; }
-            set { PartDefinition.GetSettings<ContentPartSettings>().Description = value; }
-        }
-
-        [BindNever]
-        public ContentPartDefinition PartDefinition { get; private set; }
-
-        [BindNever]
-        public dynamic Editor { get; set; }
+        get { return !string.IsNullOrWhiteSpace(_displayName) ? _displayName : Name.TrimEnd("Part").CamelFriendly(); }
+        set { _displayName = value; }
     }
+
+    public string Description
+    {
+        get { return PartDefinition.GetSettings<ContentPartSettings>().Description; }
+        set { PartDefinition.GetSettings<ContentPartSettings>().Description = value; }
+    }
+
+    [BindNever]
+    public ContentPartDefinition PartDefinition { get; private set; }
+
+    [BindNever]
+    public dynamic Editor { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/EditTypePartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/EditTypePartViewModel.cs
index ae731fce941..4164bb88c62 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/EditTypePartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/EditTypePartViewModel.cs
@@ -1,36 +1,35 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentTypes.ViewModels
+namespace OrchardCore.ContentTypes.ViewModels;
+
+public class EditTypePartViewModel
 {
-    public class EditTypePartViewModel
-    {
-        /// <summary>
-        /// The technical name of the part.
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// The display name of the part.
-        /// </summary>
-        public string DisplayName { get; set; }
-
-        public string Description { get; set; }
-
-        [BindNever]
-        public ContentTypePartDefinition TypePartDefinition { get; set; }
-
-        [BindNever]
-        public dynamic Shape { get; set; }
-
-        /// <summary>
-        /// The editor name of the part.
-        /// </summary>
-        public string Editor { get; set; }
-
-        /// <summary>
-        /// The display mode of the part.
-        /// </summary>
-        public string DisplayMode { get; set; }
-    }
+    /// <summary>
+    /// The technical name of the part.
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// The display name of the part.
+    /// </summary>
+    public string DisplayName { get; set; }
+
+    public string Description { get; set; }
+
+    [BindNever]
+    public ContentTypePartDefinition TypePartDefinition { get; set; }
+
+    [BindNever]
+    public dynamic Shape { get; set; }
+
+    /// <summary>
+    /// The editor name of the part.
+    /// </summary>
+    public string Editor { get; set; }
+
+    /// <summary>
+    /// The display mode of the part.
+    /// </summary>
+    public string DisplayMode { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/EditTypeViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/EditTypeViewModel.cs
index 8097a9367b8..91979f07bc1 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/EditTypeViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/EditTypeViewModel.cs
@@ -2,35 +2,34 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentTypes.ViewModels
+namespace OrchardCore.ContentTypes.ViewModels;
+
+public class EditTypeViewModel
 {
-    public class EditTypeViewModel
+    public EditTypeViewModel()
     {
-        public EditTypeViewModel()
-        {
-            Settings = [];
-        }
+        Settings = [];
+    }
 
-        public EditTypeViewModel(ContentTypeDefinition contentTypeDefinition)
-        {
-            Name = contentTypeDefinition.Name;
-            DisplayName = contentTypeDefinition.DisplayName;
-            Settings = contentTypeDefinition.Settings;
-            TypeDefinition = contentTypeDefinition;
-        }
+    public EditTypeViewModel(ContentTypeDefinition contentTypeDefinition)
+    {
+        Name = contentTypeDefinition.Name;
+        DisplayName = contentTypeDefinition.DisplayName;
+        Settings = contentTypeDefinition.Settings;
+        TypeDefinition = contentTypeDefinition;
+    }
 
-        public string Name { get; set; }
-        public string DisplayName { get; set; }
-        public string[] OrderedFieldNames { get; set; }
-        public string[] OrderedPartNames { get; set; }
+    public string Name { get; set; }
+    public string DisplayName { get; set; }
+    public string[] OrderedFieldNames { get; set; }
+    public string[] OrderedPartNames { get; set; }
 
-        [BindNever]
-        public JsonObject Settings { get; set; }
+    [BindNever]
+    public JsonObject Settings { get; set; }
 
-        [BindNever]
-        public ContentTypeDefinition TypeDefinition { get; set; }
+    [BindNever]
+    public ContentTypeDefinition TypeDefinition { get; set; }
 
-        [BindNever]
-        public dynamic Editor { get; set; }
-    }
+    [BindNever]
+    public dynamic Editor { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ListContentPartsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ListContentPartsViewModel.cs
index e2935066038..60267fd83a5 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ListContentPartsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ListContentPartsViewModel.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.ContentTypes.ViewModels
+namespace OrchardCore.ContentTypes.ViewModels;
+
+public class ListContentPartsViewModel
 {
-    public class ListContentPartsViewModel
-    {
-        [BindNever]
-        public IEnumerable<EditPartViewModel> Parts { get; set; }
-    }
+    [BindNever]
+    public IEnumerable<EditPartViewModel> Parts { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ListContentTypesViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ListContentTypesViewModel.cs
index e8529a942c5..29a5e396453 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ListContentTypesViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ListContentTypesViewModel.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.ContentTypes.ViewModels
+namespace OrchardCore.ContentTypes.ViewModels;
+
+public class ListContentTypesViewModel
 {
-    public class ListContentTypesViewModel
-    {
-        [BindNever]
-        public IEnumerable<EditTypeViewModel> Types { get; set; }
-    }
+    [BindNever]
+    public IEnumerable<EditTypeViewModel> Types { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ReplaceContentDefinitionStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ReplaceContentDefinitionStepViewModel.cs
index 200a2fa156e..350960440e5 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ReplaceContentDefinitionStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/ViewModels/ReplaceContentDefinitionStepViewModel.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.ContentTypes.ViewModels
+namespace OrchardCore.ContentTypes.ViewModels;
+
+public class ReplaceContentDefinitionStepViewModel : ContentDefinitionStepViewModel
 {
-    public class ReplaceContentDefinitionStepViewModel : ContentDefinitionStepViewModel
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs
index 22a7fe9401e..c22015857c9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs
@@ -14,104 +14,103 @@
 using OrchardCore.Navigation;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Contents
+namespace OrchardCore.Contents;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Contents" },
-            { "contentTypeId", string.Empty },
-        };
+        { "area", "OrchardCore.Contents" },
+        { "contentTypeId", string.Empty },
+    };
 
-        private static readonly RouteValueDictionary _adminListRouteValues = new()
-        {
-            { "area", "OrchardCore.Contents" },
-            { "controller", "Admin" },
-            { "Action", "List" },
-        };
+    private static readonly RouteValueDictionary _adminListRouteValues = new()
+    {
+        { "area", "OrchardCore.Contents" },
+        { "controller", "Admin" },
+        { "Action", "List" },
+    };
 
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IContentManager _contentManager;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly LinkGenerator _linkGenerator;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly ISiteService _siteService;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentManager _contentManager;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly LinkGenerator _linkGenerator;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly ISiteService _siteService;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenu(
-            IContentDefinitionManager contentDefinitionManager,
-            IContentManager contentManager,
-            IHttpContextAccessor httpContextAccessor,
-            LinkGenerator linkGenerator,
-            IAuthorizationService authorizationService,
-            ISiteService siteService,
-            IStringLocalizer<AdminMenu> localizer)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _contentManager = contentManager;
-            _httpContextAccessor = httpContextAccessor;
-            _linkGenerator = linkGenerator;
-            _authorizationService = authorizationService;
-            _siteService = siteService;
-            S = localizer;
-        }
+    public AdminMenu(
+        IContentDefinitionManager contentDefinitionManager,
+        IContentManager contentManager,
+        IHttpContextAccessor httpContextAccessor,
+        LinkGenerator linkGenerator,
+        IAuthorizationService authorizationService,
+        ISiteService siteService,
+        IStringLocalizer<AdminMenu> localizer)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+        _contentManager = contentManager;
+        _httpContextAccessor = httpContextAccessor;
+        _linkGenerator = linkGenerator;
+        _authorizationService = authorizationService;
+        _siteService = siteService;
+        S = localizer;
+    }
 
-        public async Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public async Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return;
-            }
+            return;
+        }
 
-            var context = _httpContextAccessor.HttpContext;
+        var context = _httpContextAccessor.HttpContext;
 
-            var contentTypeDefinitions = await _contentDefinitionManager.ListTypeDefinitionsAsync();
-            var listableContentTypes = contentTypeDefinitions.Where(ctd => ctd.IsListable());
-            await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
+        var contentTypeDefinitions = await _contentDefinitionManager.ListTypeDefinitionsAsync();
+        var listableContentTypes = contentTypeDefinitions.Where(ctd => ctd.IsListable());
+        await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content =>
+        {
+            content.AddClass("content").Id("content");
+            await content.AddAsync(S["Content Items"], S["Content Items"].PrefixPosition(), async contentItems =>
             {
-                content.AddClass("content").Id("content");
-                await content.AddAsync(S["Content Items"], S["Content Items"].PrefixPosition(), async contentItems =>
+                if (!await _authorizationService.AuthorizeContentTypeDefinitionsAsync(context.User, CommonPermissions.ListContent, listableContentTypes, _contentManager))
                 {
-                    if (!await _authorizationService.AuthorizeContentTypeDefinitionsAsync(context.User, CommonPermissions.ListContent, listableContentTypes, _contentManager))
-                    {
-                        contentItems.Permission(CommonPermissions.ListContent);
-                    }
+                    contentItems.Permission(CommonPermissions.ListContent);
+                }
 
-                    contentItems.Action(nameof(AdminController.List), typeof(AdminController).ControllerName(), _routeValues);
-                    contentItems.LocalNav();
-                });
+                contentItems.Action(nameof(AdminController.List), typeof(AdminController).ControllerName(), _routeValues);
+                contentItems.LocalNav();
             });
+        });
 
-            var adminSettings = await _siteService.GetSettingsAsync<AdminSettings>();
+        var adminSettings = await _siteService.GetSettingsAsync<AdminSettings>();
 
-            if (adminSettings.DisplayNewMenu)
-            {
-                var creatableContentTypes = contentTypeDefinitions.Where(ctd => ctd.IsCreatable()).OrderBy(ctd => ctd.DisplayName);
+        if (adminSettings.DisplayNewMenu)
+        {
+            var creatableContentTypes = contentTypeDefinitions.Where(ctd => ctd.IsCreatable()).OrderBy(ctd => ctd.DisplayName);
 
-                if (creatableContentTypes.Any())
+            if (creatableContentTypes.Any())
+            {
+                await builder.AddAsync(S["New"], "-1", async newMenu =>
                 {
-                    await builder.AddAsync(S["New"], "-1", async newMenu =>
+                    newMenu.LinkToFirstChild(false).AddClass("new").Id("new");
+                    foreach (var contentTypeDefinition in creatableContentTypes)
                     {
-                        newMenu.LinkToFirstChild(false).AddClass("new").Id("new");
-                        foreach (var contentTypeDefinition in creatableContentTypes)
-                        {
-                            var ci = await _contentManager.NewAsync(contentTypeDefinition.Name);
-                            var cim = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(ci);
-                            var createRouteValues = cim.CreateRouteValues;
-                            createRouteValues.Add("returnUrl", _linkGenerator.GetPathByRouteValues(context, string.Empty, _adminListRouteValues));
+                        var ci = await _contentManager.NewAsync(contentTypeDefinition.Name);
+                        var cim = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(ci);
+                        var createRouteValues = cim.CreateRouteValues;
+                        createRouteValues.Add("returnUrl", _linkGenerator.GetPathByRouteValues(context, string.Empty, _adminListRouteValues));
 
-                            if (createRouteValues.Count > 0)
-                            {
-                                newMenu.Add(new LocalizedString(contentTypeDefinition.DisplayName, contentTypeDefinition.DisplayName), "5", item => item
-                                    .Action(cim.CreateRouteValues["Action"] as string, cim.CreateRouteValues["Controller"] as string, cim.CreateRouteValues)
-                                    .Permission(ContentTypePermissionsHelper.CreateDynamicPermission(ContentTypePermissionsHelper.PermissionTemplates[CommonPermissions.EditOwnContent.Name], contentTypeDefinition))
-                                    );
-                            }
+                        if (createRouteValues.Count > 0)
+                        {
+                            newMenu.Add(new LocalizedString(contentTypeDefinition.DisplayName, contentTypeDefinition.DisplayName), "5", item => item
+                                .Action(cim.CreateRouteValues["Action"] as string, cim.CreateRouteValues["Controller"] as string, cim.CreateRouteValues)
+                                .Permission(ContentTypePermissionsHelper.CreateDynamicPermission(ContentTypePermissionsHelper.PermissionTemplates[CommonPermissions.EditOwnContent.Name], contentTypeDefinition))
+                                );
                         }
-                    });
-                }
+                    }
+                });
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AdminNodes/ContentTypesAdminNode.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AdminNodes/ContentTypesAdminNode.cs
index 75532047ac5..52f0a0d8f98 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AdminNodes/ContentTypesAdminNode.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AdminNodes/ContentTypesAdminNode.cs
@@ -1,17 +1,16 @@
 using OrchardCore.AdminMenu.Models;
 
-namespace OrchardCore.Contents.AdminNodes
+namespace OrchardCore.Contents.AdminNodes;
+
+public class ContentTypesAdminNode : AdminNode
 {
-    public class ContentTypesAdminNode : AdminNode
-    {
-        public bool ShowAll { get; set; }
-        public string IconClass { get; set; }
-        public ContentTypeEntry[] ContentTypes { get; set; } = [];
-    }
+    public bool ShowAll { get; set; }
+    public string IconClass { get; set; }
+    public ContentTypeEntry[] ContentTypes { get; set; } = [];
+}
 
-    public class ContentTypeEntry
-    {
-        public string ContentTypeId { get; set; }
-        public string IconClass { get; set; }
-    }
+public class ContentTypeEntry
+{
+    public string ContentTypeId { get; set; }
+    public string IconClass { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AdminNodes/ContentTypesAdminNodeDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AdminNodes/ContentTypesAdminNodeDriver.cs
index 98d3e322074..deb6973d75e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AdminNodes/ContentTypesAdminNodeDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AdminNodes/ContentTypesAdminNodeDriver.cs
@@ -10,91 +10,90 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Contents.AdminNodes
+namespace OrchardCore.Contents.AdminNodes;
+
+public sealed class ContentTypesAdminNodeDriver : DisplayDriver<MenuItem, ContentTypesAdminNode>
 {
-    public sealed class ContentTypesAdminNodeDriver : DisplayDriver<MenuItem, ContentTypesAdminNode>
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+
+    public ContentTypesAdminNodeDriver(
+        IContentDefinitionManager contentDefinitionManager,
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService
+        )
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
-
-        public ContentTypesAdminNodeDriver(
-            IContentDefinitionManager contentDefinitionManager,
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService
-            )
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-        }
+        _contentDefinitionManager = contentDefinitionManager;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(ContentTypesAdminNode treeNode, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                View("ContentTypesAdminNode_Fields_TreeSummary", treeNode).Location("TreeSummary", "Content"),
-                View("ContentTypesAdminNode_Fields_TreeThumbnail", treeNode).Location("TreeThumbnail", "Content")
-            );
-        }
+    public override Task<IDisplayResult> DisplayAsync(ContentTypesAdminNode treeNode, BuildDisplayContext context)
+    {
+        return CombineAsync(
+            View("ContentTypesAdminNode_Fields_TreeSummary", treeNode).Location("TreeSummary", "Content"),
+            View("ContentTypesAdminNode_Fields_TreeThumbnail", treeNode).Location("TreeThumbnail", "Content")
+        );
+    }
 
-        public override IDisplayResult Edit(ContentTypesAdminNode treeNode, BuildEditorContext context)
-        {
-            return Initialize<ContentTypesAdminNodeViewModel>("ContentTypesAdminNode_Fields_TreeEdit", async model =>
+    public override IDisplayResult Edit(ContentTypesAdminNode treeNode, BuildEditorContext context)
+    {
+        return Initialize<ContentTypesAdminNodeViewModel>("ContentTypesAdminNode_Fields_TreeEdit", async model =>
+            {
+                var listable = await GetListableContentTypeDefinitionsAsync();
+
+                model.ShowAll = treeNode.ShowAll;
+                model.IconClass = treeNode.IconClass;
+                model.ContentTypes = listable.Select(x => new ContentTypeEntryViewModel
                 {
-                    var listable = await GetListableContentTypeDefinitionsAsync();
-
-                    model.ShowAll = treeNode.ShowAll;
-                    model.IconClass = treeNode.IconClass;
-                    model.ContentTypes = listable.Select(x => new ContentTypeEntryViewModel
-                    {
-                        ContentTypeId = x.Name,
-                        IsChecked = treeNode.ContentTypes.Any(selected => string.Equals(selected.ContentTypeId, x.Name, StringComparison.OrdinalIgnoreCase)),
-                        IconClass = treeNode.ContentTypes.FirstOrDefault(selected => selected.ContentTypeId == x.Name)?.IconClass ?? string.Empty
-                    }).ToArray();
-                }).Location("Content");
-        }
+                    ContentTypeId = x.Name,
+                    IsChecked = treeNode.ContentTypes.Any(selected => string.Equals(selected.ContentTypeId, x.Name, StringComparison.OrdinalIgnoreCase)),
+                    IconClass = treeNode.ContentTypes.FirstOrDefault(selected => selected.ContentTypeId == x.Name)?.IconClass ?? string.Empty
+                }).ToArray();
+            }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypesAdminNode treeNode, UpdateEditorContext context)
-        {
-            // Initializes the value to empty otherwise the model is not updated if no type is selected.
-            treeNode.ContentTypes = [];
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypesAdminNode treeNode, UpdateEditorContext context)
+    {
+        // Initializes the value to empty otherwise the model is not updated if no type is selected.
+        treeNode.ContentTypes = [];
 
-            var model = new ContentTypesAdminNodeViewModel();
+        var model = new ContentTypesAdminNodeViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix, x => x.ShowAll, x => x.IconClass, x => x.ContentTypes);
+        await context.Updater.TryUpdateModelAsync(model, Prefix, x => x.ShowAll, x => x.IconClass, x => x.ContentTypes);
 
-            treeNode.ShowAll = model.ShowAll;
-            treeNode.IconClass = model.IconClass;
-            treeNode.ContentTypes = model.ContentTypes
-                .Where(x => x.IsChecked == true)
-                .Select(x =>
-                new ContentTypeEntry
-                {
-                    ContentTypeId = x.ContentTypeId,
-                    IconClass = x.IconClass
-                })
-                .ToArray();
+        treeNode.ShowAll = model.ShowAll;
+        treeNode.IconClass = model.IconClass;
+        treeNode.ContentTypes = model.ContentTypes
+            .Where(x => x.IsChecked == true)
+            .Select(x =>
+            new ContentTypeEntry
+            {
+                ContentTypeId = x.ContentTypeId,
+                IconClass = x.IconClass
+            })
+            .ToArray();
 
-            return Edit(treeNode, context);
-        }
+        return Edit(treeNode, context);
+    }
 
-        private async Task<IEnumerable<ContentTypeDefinition>> GetListableContentTypeDefinitionsAsync()
-        {
-            var contentTypeDefinitions = await _contentDefinitionManager.ListTypeDefinitionsAsync();
+    private async Task<IEnumerable<ContentTypeDefinition>> GetListableContentTypeDefinitionsAsync()
+    {
+        var contentTypeDefinitions = await _contentDefinitionManager.ListTypeDefinitionsAsync();
 
-            var listableContentTypeDefinitions = new List<ContentTypeDefinition>();
+        var listableContentTypeDefinitions = new List<ContentTypeDefinition>();
 
-            foreach (var contentTypeDefinition in contentTypeDefinitions)
+        foreach (var contentTypeDefinition in contentTypeDefinitions)
+        {
+            if (!await _authorizationService.AuthorizeContentTypeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.ListContent, contentTypeDefinition))
             {
-                if (!await _authorizationService.AuthorizeContentTypeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.ListContent, contentTypeDefinition))
-                {
-                    continue;
-                }
-
-                listableContentTypeDefinitions.Add(contentTypeDefinition);
+                continue;
             }
 
-            return listableContentTypeDefinitions.OrderBy(t => t.DisplayName);
+            listableContentTypeDefinitions.Add(contentTypeDefinition);
         }
+
+        return listableContentTypeDefinitions.OrderBy(t => t.DisplayName);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AdminNodes/ContentTypesAdminNodeNavigationBuilder.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AdminNodes/ContentTypesAdminNodeNavigationBuilder.cs
index 04055f04e13..3d5f8d6e0e4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AdminNodes/ContentTypesAdminNodeNavigationBuilder.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AdminNodes/ContentTypesAdminNodeNavigationBuilder.cs
@@ -13,125 +13,124 @@
 using OrchardCore.Contents.Security;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Contents.AdminNodes
+namespace OrchardCore.Contents.AdminNodes;
+
+public class ContentTypesAdminNodeNavigationBuilder : IAdminNodeNavigationBuilder
 {
-    public class ContentTypesAdminNodeNavigationBuilder : IAdminNodeNavigationBuilder
+    private readonly LinkGenerator _linkGenerator;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ILogger _logger;
+
+    public ContentTypesAdminNodeNavigationBuilder(
+        IContentDefinitionManager contentDefinitionManager,
+        LinkGenerator linkGenerator,
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService,
+        ILogger<ContentTypesAdminNodeNavigationBuilder> logger)
     {
-        private readonly LinkGenerator _linkGenerator;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly ILogger _logger;
-
-        public ContentTypesAdminNodeNavigationBuilder(
-            IContentDefinitionManager contentDefinitionManager,
-            LinkGenerator linkGenerator,
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService,
-            ILogger<ContentTypesAdminNodeNavigationBuilder> logger)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _linkGenerator = linkGenerator;
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-            _logger = logger;
-        }
+        _contentDefinitionManager = contentDefinitionManager;
+        _linkGenerator = linkGenerator;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+        _logger = logger;
+    }
+
+    public string Name => nameof(ContentTypesAdminNode);
 
-        public string Name => nameof(ContentTypesAdminNode);
+    public async Task BuildNavigationAsync(MenuItem menuItem, NavigationBuilder builder, IEnumerable<IAdminNodeNavigationBuilder> treeNodeBuilders)
+    {
+        var node = menuItem as ContentTypesAdminNode;
 
-        public async Task BuildNavigationAsync(MenuItem menuItem, NavigationBuilder builder, IEnumerable<IAdminNodeNavigationBuilder> treeNodeBuilders)
+        if (node == null || !node.Enabled)
         {
-            var node = menuItem as ContentTypesAdminNode;
+            return;
+        }
 
-            if (node == null || !node.Enabled)
+        // Add ContentTypes specific children
+        var typesToShow = await GetListableContentTypeDefinitionsAsync(node);
+        foreach (var ctd in typesToShow)
+        {
+            builder.Add(new LocalizedString(ctd.DisplayName, ctd.DisplayName), cTypeMenu =>
             {
-                return;
-            }
+                cTypeMenu.Url(_linkGenerator.GetPathByRouteValues(_httpContextAccessor.HttpContext, string.Empty, new
+                {
+                    area = "OrchardCore.Contents",
+                    controller = "Admin",
+                    action = "List",
+                    contentTypeId = ctd.Name
+                }));
+
+                cTypeMenu.Priority(node.Priority);
+                cTypeMenu.Position(node.Position);
+                cTypeMenu.Permission(
+                    ContentTypePermissionsHelper.CreateDynamicPermission(ContentTypePermissionsHelper.PermissionTemplates[CommonPermissions.ViewContent.Name], ctd));
+
+                GetIconClasses(ctd, node).ToList().ForEach(c => cTypeMenu.AddClass(c));
+            });
+        }
 
-            // Add ContentTypes specific children
-            var typesToShow = await GetListableContentTypeDefinitionsAsync(node);
-            foreach (var ctd in typesToShow)
+        // Add external children
+        foreach (var childNode in node.Items)
+        {
+            try
             {
-                builder.Add(new LocalizedString(ctd.DisplayName, ctd.DisplayName), cTypeMenu =>
-                {
-                    cTypeMenu.Url(_linkGenerator.GetPathByRouteValues(_httpContextAccessor.HttpContext, string.Empty, new
-                    {
-                        area = "OrchardCore.Contents",
-                        controller = "Admin",
-                        action = "List",
-                        contentTypeId = ctd.Name
-                    }));
-
-                    cTypeMenu.Priority(node.Priority);
-                    cTypeMenu.Position(node.Position);
-                    cTypeMenu.Permission(
-                        ContentTypePermissionsHelper.CreateDynamicPermission(ContentTypePermissionsHelper.PermissionTemplates[CommonPermissions.ViewContent.Name], ctd));
-
-                    GetIconClasses(ctd, node).ToList().ForEach(c => cTypeMenu.AddClass(c));
-                });
+                var treeBuilder = treeNodeBuilders.FirstOrDefault(x => x.Name == childNode.GetType().Name);
+                await treeBuilder.BuildNavigationAsync(childNode, builder, treeNodeBuilders);
             }
-
-            // Add external children
-            foreach (var childNode in node.Items)
+            catch (Exception e)
             {
-                try
-                {
-                    var treeBuilder = treeNodeBuilders.FirstOrDefault(x => x.Name == childNode.GetType().Name);
-                    await treeBuilder.BuildNavigationAsync(childNode, builder, treeNodeBuilders);
-                }
-                catch (Exception e)
-                {
-                    _logger.LogError(e, "An exception occurred while building the '{MenuItem}' child Menu Item.", childNode.GetType().Name);
-                }
+                _logger.LogError(e, "An exception occurred while building the '{MenuItem}' child Menu Item.", childNode.GetType().Name);
             }
         }
+    }
 
-        private async Task<IEnumerable<ContentTypeDefinition>> GetListableContentTypeDefinitionsAsync(ContentTypesAdminNode node)
-        {
-            var contentTypeDefinitions = await _contentDefinitionManager.ListTypeDefinitionsAsync();
+    private async Task<IEnumerable<ContentTypeDefinition>> GetListableContentTypeDefinitionsAsync(ContentTypesAdminNode node)
+    {
+        var contentTypeDefinitions = await _contentDefinitionManager.ListTypeDefinitionsAsync();
 
-            var listableContentTypeDefinitions = new List<ContentTypeDefinition>();
+        var listableContentTypeDefinitions = new List<ContentTypeDefinition>();
 
-            foreach (var contentTypeDefinition in contentTypeDefinitions)
+        foreach (var contentTypeDefinition in contentTypeDefinitions)
+        {
+            if (!node.ShowAll && !node.ContentTypes.Any(entry => string.Equals(contentTypeDefinition.Name, entry.ContentTypeId, StringComparison.OrdinalIgnoreCase)))
             {
-                if (!node.ShowAll && !node.ContentTypes.Any(entry => string.Equals(contentTypeDefinition.Name, entry.ContentTypeId, StringComparison.OrdinalIgnoreCase)))
-                {
-                    continue;
-                }
-
-                if (!await _authorizationService.AuthorizeContentTypeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.ListContent, contentTypeDefinition))
-                {
-                    continue;
-                }
-
-                listableContentTypeDefinitions.Add(contentTypeDefinition);
+                continue;
             }
 
-            return listableContentTypeDefinitions.OrderBy(t => t.DisplayName);
-        }
-
-        private static List<string> GetIconClasses(ContentTypeDefinition contentType, ContentTypesAdminNode node)
-        {
-            if (node.ShowAll)
+            if (!await _authorizationService.AuthorizeContentTypeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.ListContent, contentTypeDefinition))
             {
-                return AddPrefixToClasses(node.IconClass);
+                continue;
             }
-            else
-            {
-                var typeEntry = node.ContentTypes
-                    .FirstOrDefault(x => string.Equals(x.ContentTypeId, contentType.Name, StringComparison.OrdinalIgnoreCase));
 
-                return AddPrefixToClasses(typeEntry.IconClass);
-            }
+            listableContentTypeDefinitions.Add(contentTypeDefinition);
         }
 
-        private static List<string> AddPrefixToClasses(string unprefixed)
+        return listableContentTypeDefinitions.OrderBy(t => t.DisplayName);
+    }
+
+    private static List<string> GetIconClasses(ContentTypeDefinition contentType, ContentTypesAdminNode node)
+    {
+        if (node.ShowAll)
         {
-            return unprefixed?.Split(' ')
-                .ToList()
-                .Select(c => NavigationConstants.CssClassPrefix + c)
-                .ToList()
-                ?? [];
+            return AddPrefixToClasses(node.IconClass);
         }
+        else
+        {
+            var typeEntry = node.ContentTypes
+                .FirstOrDefault(x => string.Equals(x.ContentTypeId, contentType.Name, StringComparison.OrdinalIgnoreCase));
+
+            return AddPrefixToClasses(typeEntry.IconClass);
+        }
+    }
+
+    private static List<string> AddPrefixToClasses(string unprefixed)
+    {
+        return unprefixed?.Split(' ')
+            .ToList()
+            .Select(c => NavigationConstants.CssClassPrefix + c)
+            .ToList()
+            ?? [];
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AdminNodes/ContentTypesAdminNodeViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AdminNodes/ContentTypesAdminNodeViewModel.cs
index 84b832bc14b..6b0c1d1b770 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AdminNodes/ContentTypesAdminNodeViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AdminNodes/ContentTypesAdminNodeViewModel.cs
@@ -1,16 +1,15 @@
-namespace OrchardCore.Contents.AdminNodes
+namespace OrchardCore.Contents.AdminNodes;
+
+public class ContentTypesAdminNodeViewModel
 {
-    public class ContentTypesAdminNodeViewModel
-    {
-        public bool ShowAll { get; set; }
-        public string IconClass { get; set; }
-        public ContentTypeEntryViewModel[] ContentTypes { get; set; } = [];
-    }
+    public bool ShowAll { get; set; }
+    public string IconClass { get; set; }
+    public ContentTypeEntryViewModel[] ContentTypes { get; set; } = [];
+}
 
-    public class ContentTypeEntryViewModel
-    {
-        public bool IsChecked { get; set; }
-        public string ContentTypeId { get; set; }
-        public string IconClass { get; set; }
-    }
+public class ContentTypeEntryViewModel
+{
+    public bool IsChecked { get; set; }
+    public string ContentTypeId { get; set; }
+    public string IconClass { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Controllers/AuditTrailContentController.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Controllers/AuditTrailContentController.cs
index 50694720921..37d44aecde6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Controllers/AuditTrailContentController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Controllers/AuditTrailContentController.cs
@@ -15,119 +15,118 @@
 using OrchardCore.Modules;
 using YesSql;
 
-namespace OrchardCore.Contents.AuditTrail.Controllers
+namespace OrchardCore.Contents.AuditTrail.Controllers;
+
+[RequireFeatures("OrchardCore.AuditTrail")]
+[Admin("AuditTrail/Content/{action}/{auditTrailEventId}", "{action}AuditTrailContent")]
+public class AuditTrailContentController : Controller
 {
-    [RequireFeatures("OrchardCore.AuditTrail")]
-    [Admin("AuditTrail/Content/{action}/{auditTrailEventId}", "{action}AuditTrailContent")]
-    public class AuditTrailContentController : Controller
+    private readonly ISession _session;
+    private readonly IContentManager _contentManager;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IContentItemDisplayManager _contentItemDisplayManager;
+    private readonly INotifier _notifier;
+    protected readonly IHtmlLocalizer H;
+    private readonly ILogger _logger;
+
+    public AuditTrailContentController(
+        ISession session,
+        IContentManager contentManager,
+        IUpdateModelAccessor updateModelAccessor,
+        IAuthorizationService authorizationService,
+        IContentItemDisplayManager contentItemDisplayManager,
+        INotifier notifier,
+        IHtmlLocalizer<AuditTrailContentController> htmlLocalizer,
+        ILogger<AuditTrailContentController> logger)
     {
-        private readonly ISession _session;
-        private readonly IContentManager _contentManager;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IContentItemDisplayManager _contentItemDisplayManager;
-        private readonly INotifier _notifier;
-        protected readonly IHtmlLocalizer H;
-        private readonly ILogger _logger;
-
-        public AuditTrailContentController(
-            ISession session,
-            IContentManager contentManager,
-            IUpdateModelAccessor updateModelAccessor,
-            IAuthorizationService authorizationService,
-            IContentItemDisplayManager contentItemDisplayManager,
-            INotifier notifier,
-            IHtmlLocalizer<AuditTrailContentController> htmlLocalizer,
-            ILogger<AuditTrailContentController> logger)
-        {
-            _session = session;
-            _contentManager = contentManager;
-            _updateModelAccessor = updateModelAccessor;
-            _authorizationService = authorizationService;
-            _contentItemDisplayManager = contentItemDisplayManager;
-            _notifier = notifier;
-            H = htmlLocalizer;
-            _logger = logger;
-        }
+        _session = session;
+        _contentManager = contentManager;
+        _updateModelAccessor = updateModelAccessor;
+        _authorizationService = authorizationService;
+        _contentItemDisplayManager = contentItemDisplayManager;
+        _notifier = notifier;
+        H = htmlLocalizer;
+        _logger = logger;
+    }
 
-        public async Task<ActionResult> Display(string auditTrailEventId)
+    public async Task<ActionResult> Display(string auditTrailEventId)
+    {
+        var auditTrailContentEvent = (await _session.Query<AuditTrailEvent, AuditTrailEventIndex>(collection: AuditTrailEvent.Collection)
+            .Where(index => index.EventId == auditTrailEventId)
+            .FirstOrDefaultAsync())
+            ?.As<AuditTrailContentEvent>();
+
+        if (auditTrailContentEvent == null || auditTrailContentEvent.ContentItem == null)
         {
-            var auditTrailContentEvent = (await _session.Query<AuditTrailEvent, AuditTrailEventIndex>(collection: AuditTrailEvent.Collection)
-                .Where(index => index.EventId == auditTrailEventId)
-                .FirstOrDefaultAsync())
-                ?.As<AuditTrailContentEvent>();
+            return NotFound();
+        }
 
-            if (auditTrailContentEvent == null || auditTrailContentEvent.ContentItem == null)
-            {
-                return NotFound();
-            }
+        var contentItem = auditTrailContentEvent.ContentItem;
 
-            var contentItem = auditTrailContentEvent.ContentItem;
+        contentItem.Id = 0;
+        contentItem.ContentItemVersionId = "";
+        contentItem.Published = false;
+        contentItem.Latest = false;
 
-            contentItem.Id = 0;
-            contentItem.ContentItemVersionId = "";
-            contentItem.Published = false;
-            contentItem.Latest = false;
+        contentItem = await _contentManager.LoadAsync(contentItem);
 
-            contentItem = await _contentManager.LoadAsync(contentItem);
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditContent, contentItem))
+        {
+            return Forbid();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditContent, contentItem))
-            {
-                return Forbid();
-            }
+        var auditTrailPart = contentItem.As<AuditTrailPart>();
+        if (auditTrailPart != null)
+        {
+            auditTrailPart.ShowComment = true;
+        }
 
-            var auditTrailPart = contentItem.As<AuditTrailPart>();
-            if (auditTrailPart != null)
-            {
-                auditTrailPart.ShowComment = true;
-            }
+        var model = await _contentItemDisplayManager.BuildEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, false);
 
-            var model = await _contentItemDisplayManager.BuildEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, false);
+        model.Properties["VersionNumber"] = auditTrailContentEvent.VersionNumber;
 
-            model.Properties["VersionNumber"] = auditTrailContentEvent.VersionNumber;
+        return View(model);
+    }
 
-            return View(model);
-        }
+    [HttpPost]
+    public async Task<ActionResult> Restore(string auditTrailEventId)
+    {
+        var contentItem = (await _session.Query<AuditTrailEvent, AuditTrailEventIndex>(collection: AuditTrailEvent.Collection)
+            .Where(index => index.EventId == auditTrailEventId)
+            .FirstOrDefaultAsync())
+            ?.As<AuditTrailContentEvent>()
+            ?.ContentItem;
 
-        [HttpPost]
-        public async Task<ActionResult> Restore(string auditTrailEventId)
+        if (contentItem == null)
         {
-            var contentItem = (await _session.Query<AuditTrailEvent, AuditTrailEventIndex>(collection: AuditTrailEvent.Collection)
-                .Where(index => index.EventId == auditTrailEventId)
-                .FirstOrDefaultAsync())
-                ?.As<AuditTrailContentEvent>()
-                ?.ContentItem;
+            return NotFound();
+        }
 
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
+        contentItem = await _contentManager.LoadAsync(contentItem);
 
-            contentItem = await _contentManager.LoadAsync(contentItem);
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.PublishContent, contentItem))
+        {
+            return Forbid();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.PublishContent, contentItem))
-            {
-                return Forbid();
-            }
+        var result = await _contentManager.RestoreAsync(contentItem);
 
-            var result = await _contentManager.RestoreAsync(contentItem);
+        if (!result.Succeeded)
+        {
+            await _notifier.WarningAsync(H["'{0}' was not restored, the version is not valid.", contentItem.DisplayText]);
 
-            if (!result.Succeeded)
+            foreach (var error in result.Errors)
             {
-                await _notifier.WarningAsync(H["'{0}' was not restored, the version is not valid.", contentItem.DisplayText]);
-
-                foreach (var error in result.Errors)
-                {
-                    // Pass ErrorMessage as an argument to ensure it is encoded
-                    await _notifier.WarningAsync(new LocalizedHtmlString(nameof(AuditTrailContentController.Restore), "{0}", false, error.ErrorMessage));
-                }
-
-                return RedirectToAction("Index", "Admin", new { area = "OrchardCore.AuditTrail" });
+                // Pass ErrorMessage as an argument to ensure it is encoded
+                await _notifier.WarningAsync(new LocalizedHtmlString(nameof(AuditTrailContentController.Restore), "{0}", false, error.ErrorMessage));
             }
 
-            await _notifier.SuccessAsync(H["'{0}' has been restored.", contentItem.DisplayText]);
-
             return RedirectToAction("Index", "Admin", new { area = "OrchardCore.AuditTrail" });
         }
+
+        await _notifier.SuccessAsync(H["'{0}' has been restored.", contentItem.DisplayText]);
+
+        return RedirectToAction("Index", "Admin", new { area = "OrchardCore.AuditTrail" });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailContentEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailContentEventDisplayDriver.cs
index bc9fff7470d..ae71fe60a9f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailContentEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailContentEventDisplayDriver.cs
@@ -14,111 +14,110 @@
 using OrchardCore.Entities;
 using YesSql;
 
-namespace OrchardCore.Contents.AuditTrail.Drivers
+namespace OrchardCore.Contents.AuditTrail.Drivers;
+
+public sealed class AuditTrailContentEventDisplayDriver : AuditTrailEventSectionDisplayDriver<AuditTrailContentEvent>
 {
-    public sealed class AuditTrailContentEventDisplayDriver : AuditTrailEventSectionDisplayDriver<AuditTrailContentEvent>
+    private readonly Dictionary<string, string> _latestVersionId = [];
+    private readonly IAuditTrailManager _auditTrailManager;
+    private readonly ISession _session;
+
+    public AuditTrailContentEventDisplayDriver(
+        IAuditTrailManager auditTrailManager,
+        ISession session)
     {
-        private readonly Dictionary<string, string> _latestVersionId = [];
-        private readonly IAuditTrailManager _auditTrailManager;
-        private readonly ISession _session;
+        _auditTrailManager = auditTrailManager;
+        _session = session;
+    }
 
-        public AuditTrailContentEventDisplayDriver(
-            IAuditTrailManager auditTrailManager,
-            ISession session)
-        {
-            _auditTrailManager = auditTrailManager;
-            _session = session;
-        }
+    public override async Task<IDisplayResult> DisplayAsync(AuditTrailEvent auditTrailEvent, AuditTrailContentEvent contentEvent, BuildDisplayContext context)
+    {
+        var contentItemId = contentEvent.ContentItem.ContentItemId;
 
-        public override async Task<IDisplayResult> DisplayAsync(AuditTrailEvent auditTrailEvent, AuditTrailContentEvent contentEvent, BuildDisplayContext context)
+        if (!_latestVersionId.TryGetValue(contentItemId, out var latestVersionId))
         {
-            var contentItemId = contentEvent.ContentItem.ContentItemId;
+            latestVersionId = (await _session.QueryIndex<ContentItemIndex>(index => index.ContentItemId == contentItemId && index.Latest)
+                .FirstOrDefaultAsync())
+                ?.ContentItemVersionId;
 
-            if (!_latestVersionId.TryGetValue(contentItemId, out var latestVersionId))
-            {
-                latestVersionId = (await _session.QueryIndex<ContentItemIndex>(index => index.ContentItemId == contentItemId && index.Latest)
-                    .FirstOrDefaultAsync())
-                    ?.ContentItemVersionId;
+            _latestVersionId[contentItemId] = latestVersionId;
+        }
 
-                _latestVersionId[contentItemId] = latestVersionId;
-            }
+        var descriptor = _auditTrailManager.DescribeEvent(auditTrailEvent);
 
-            var descriptor = _auditTrailManager.DescribeEvent(auditTrailEvent);
+        return Combine(
+            Initialize<AuditTrailContentEventViewModel>("AuditTrailContentEventData_SummaryAdmin", m => BuildSummaryViewModel(m, auditTrailEvent, contentEvent, descriptor, latestVersionId))
+                .Location("SummaryAdmin", "EventData:10"),
+            Initialize<AuditTrailContentEventViewModel>("AuditTrailContentEventContent_SummaryAdmin", m => BuildSummaryViewModel(m, auditTrailEvent, contentEvent, descriptor, latestVersionId))
+                .Location("SummaryAdmin", "Content:10"),
+            Initialize<AuditTrailContentEventViewModel>("AuditTrailContentEventActions_SummaryAdmin", m => BuildSummaryViewModel(m, auditTrailEvent, contentEvent, descriptor, latestVersionId))
+                .Location("SummaryAdmin", "Actions:5"),
+            Initialize<AuditTrailContentEventDetailViewModel>("AuditTrailContentEventDetail_DetailAdmin", async m =>
+            {
+                BuildSummaryViewModel(m, auditTrailEvent, contentEvent, descriptor, latestVersionId);
+                var previousContentItem = (await _session.Query<AuditTrailEvent, AuditTrailEventIndex>(collection: AuditTrailEvent.Collection)
+                    .Where(index =>
+                        index.Category == "Content" &&
+                        index.CreatedUtc <= auditTrailEvent.CreatedUtc &&
+                        index.EventId != auditTrailEvent.EventId &&
+                        index.CorrelationId == contentEvent.ContentItem.ContentItemId)
+                    .OrderByDescending(index => index.Id)
+                    .FirstOrDefaultAsync())?
+                    .As<AuditTrailContentEvent>()
+                    .ContentItem;
 
-            return Combine(
-                Initialize<AuditTrailContentEventViewModel>("AuditTrailContentEventData_SummaryAdmin", m => BuildSummaryViewModel(m, auditTrailEvent, contentEvent, descriptor, latestVersionId))
-                    .Location("SummaryAdmin", "EventData:10"),
-                Initialize<AuditTrailContentEventViewModel>("AuditTrailContentEventContent_SummaryAdmin", m => BuildSummaryViewModel(m, auditTrailEvent, contentEvent, descriptor, latestVersionId))
-                    .Location("SummaryAdmin", "Content:10"),
-                Initialize<AuditTrailContentEventViewModel>("AuditTrailContentEventActions_SummaryAdmin", m => BuildSummaryViewModel(m, auditTrailEvent, contentEvent, descriptor, latestVersionId))
-                    .Location("SummaryAdmin", "Actions:5"),
-                Initialize<AuditTrailContentEventDetailViewModel>("AuditTrailContentEventDetail_DetailAdmin", async m =>
+                if (previousContentItem != null)
                 {
-                    BuildSummaryViewModel(m, auditTrailEvent, contentEvent, descriptor, latestVersionId);
-                    var previousContentItem = (await _session.Query<AuditTrailEvent, AuditTrailEventIndex>(collection: AuditTrailEvent.Collection)
-                        .Where(index =>
-                            index.Category == "Content" &&
-                            index.CreatedUtc <= auditTrailEvent.CreatedUtc &&
-                            index.EventId != auditTrailEvent.EventId &&
-                            index.CorrelationId == contentEvent.ContentItem.ContentItemId)
-                        .OrderByDescending(index => index.Id)
-                        .FirstOrDefaultAsync())?
-                        .As<AuditTrailContentEvent>()
-                        .ContentItem;
+                    var current = JObject.FromObject(contentEvent.ContentItem);
+                    var previous = JObject.FromObject(previousContentItem);
+                    previous.Remove(nameof(AuditTrailPart));
+                    current.Remove(nameof(AuditTrailPart));
 
-                    if (previousContentItem != null)
-                    {
-                        var current = JObject.FromObject(contentEvent.ContentItem);
-                        var previous = JObject.FromObject(previousContentItem);
-                        previous.Remove(nameof(AuditTrailPart));
-                        current.Remove(nameof(AuditTrailPart));
+                    m.PreviousContentItem = previousContentItem;
 
-                        m.PreviousContentItem = previousContentItem;
+                    m.Previous = previous.ToString();
+                    m.Current = current.ToString();
+                }
+            }).Location("DetailAdmin", "Content:5"),
+            Initialize<AuditTrailContentEventDetailViewModel>("AuditTrailContentEventDiff_DetailAdmin", async m =>
+            {
+                BuildSummaryViewModel(m, auditTrailEvent, contentEvent, descriptor, latestVersionId);
+                var previousContentItem = (await _session.Query<AuditTrailEvent, AuditTrailEventIndex>(collection: AuditTrailEvent.Collection)
+                    .Where(index =>
+                        index.Category == "Content" &&
+                        index.CreatedUtc <= auditTrailEvent.CreatedUtc &&
+                        index.EventId != auditTrailEvent.EventId &&
+                        index.CorrelationId == contentEvent.ContentItem.ContentItemId)
+                    .OrderByDescending(index => index.Id)
+                    .FirstOrDefaultAsync())?
+                    .As<AuditTrailContentEvent>()
+                    .ContentItem;
 
-                        m.Previous = previous.ToString();
-                        m.Current = current.ToString();
-                    }
-                }).Location("DetailAdmin", "Content:5"),
-                Initialize<AuditTrailContentEventDetailViewModel>("AuditTrailContentEventDiff_DetailAdmin", async m =>
+                if (previousContentItem != null)
                 {
-                    BuildSummaryViewModel(m, auditTrailEvent, contentEvent, descriptor, latestVersionId);
-                    var previousContentItem = (await _session.Query<AuditTrailEvent, AuditTrailEventIndex>(collection: AuditTrailEvent.Collection)
-                        .Where(index =>
-                            index.Category == "Content" &&
-                            index.CreatedUtc <= auditTrailEvent.CreatedUtc &&
-                            index.EventId != auditTrailEvent.EventId &&
-                            index.CorrelationId == contentEvent.ContentItem.ContentItemId)
-                        .OrderByDescending(index => index.Id)
-                        .FirstOrDefaultAsync())?
-                        .As<AuditTrailContentEvent>()
-                        .ContentItem;
+                    var current = JObject.FromObject(contentEvent.ContentItem);
+                    var previous = JObject.FromObject(previousContentItem);
+                    previous.Remove(nameof(AuditTrailPart));
+                    current.Remove(nameof(AuditTrailPart));
 
-                    if (previousContentItem != null)
-                    {
-                        var current = JObject.FromObject(contentEvent.ContentItem);
-                        var previous = JObject.FromObject(previousContentItem);
-                        previous.Remove(nameof(AuditTrailPart));
-                        current.Remove(nameof(AuditTrailPart));
+                    m.PreviousContentItem = previousContentItem;
 
-                        m.PreviousContentItem = previousContentItem;
-
-                        m.Previous = previous.ToString();
-                        m.Current = current.ToString();
-                    }
-                }).Location("DetailAdmin", "Content:5#Diff")
-            );
-        }
+                    m.Previous = previous.ToString();
+                    m.Current = current.ToString();
+                }
+            }).Location("DetailAdmin", "Content:5#Diff")
+        );
+    }
 
-        private static void BuildSummaryViewModel(AuditTrailContentEventViewModel m, AuditTrailEvent model, AuditTrailContentEvent contentEvent, AuditTrailEventDescriptor descriptor, string latestVersionId)
-        {
-            m.AuditTrailEvent = model;
-            m.Descriptor = descriptor;
-            m.Name = contentEvent.Name;
-            m.ContentItem = contentEvent.ContentItem;
-            m.VersionNumber = contentEvent.VersionNumber;
-            m.Comment = contentEvent.Comment;
-            m.LatestVersionId = latestVersionId;
-            m.ContentEvent = contentEvent;
-        }
+    private static void BuildSummaryViewModel(AuditTrailContentEventViewModel m, AuditTrailEvent model, AuditTrailContentEvent contentEvent, AuditTrailEventDescriptor descriptor, string latestVersionId)
+    {
+        m.AuditTrailEvent = model;
+        m.Descriptor = descriptor;
+        m.Name = contentEvent.Name;
+        m.ContentItem = contentEvent.ContentItem;
+        m.VersionNumber = contentEvent.VersionNumber;
+        m.Comment = contentEvent.Comment;
+        m.LatestVersionId = latestVersionId;
+        m.ContentEvent = contentEvent;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailContentsDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailContentsDriver.cs
index a7f056de39e..cd01fdc4f2d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailContentsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailContentsDriver.cs
@@ -8,28 +8,27 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Contents.AuditTrail.Drivers
+namespace OrchardCore.Contents.AuditTrail.Drivers;
+
+public sealed class AuditTrailContentsDriver : ContentDisplayDriver
 {
-    public sealed class AuditTrailContentsDriver : ContentDisplayDriver
-    {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
 
-        public AuditTrailContentsDriver(
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-        }
+    public AuditTrailContentsDriver(
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService)
+    {
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(ContentItem contentItem, BuildDisplayContext context)
-        {
-            return Task.FromResult<IDisplayResult>(
-                Initialize<ContentItemViewModel>("AuditTrailContentsAction_SummaryAdmin", m => m.ContentItem = contentItem)
-                .Location("SummaryAdmin", "ActionsMenu:10")
-                .RenderWhen(() => _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User, AuditTrailPermissions.ViewAuditTrail))
-            );
-        }
+    public override Task<IDisplayResult> DisplayAsync(ContentItem contentItem, BuildDisplayContext context)
+    {
+        return Task.FromResult<IDisplayResult>(
+            Initialize<ContentItemViewModel>("AuditTrailContentsAction_SummaryAdmin", m => m.ContentItem = contentItem)
+            .Location("SummaryAdmin", "ActionsMenu:10")
+            .RenderWhen(() => _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User, AuditTrailPermissions.ViewAuditTrail))
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailPartDisplayDriver.cs
index e2230fc5c6a..00ec664ec65 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailPartDisplayDriver.cs
@@ -7,32 +7,31 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Contents.AuditTrail.Drivers
+namespace OrchardCore.Contents.AuditTrail.Drivers;
+
+public sealed class AuditTrailPartDisplayDriver : ContentPartDisplayDriver<AuditTrailPart>
 {
-    public sealed class AuditTrailPartDisplayDriver : ContentPartDisplayDriver<AuditTrailPart>
+    public override IDisplayResult Edit(AuditTrailPart part, BuildPartEditorContext context)
     {
-        public override IDisplayResult Edit(AuditTrailPart part, BuildPartEditorContext context)
+        var settings = context.TypePartDefinition.GetSettings<AuditTrailPartSettings>();
+        if (settings.ShowCommentInput)
         {
-            var settings = context.TypePartDefinition.GetSettings<AuditTrailPartSettings>();
-            if (settings.ShowCommentInput)
+            return Initialize<AuditTrailPartViewModel>(GetEditorShapeType(context), model =>
             {
-                return Initialize<AuditTrailPartViewModel>(GetEditorShapeType(context), model =>
+                if (part.ShowComment)
                 {
-                    if (part.ShowComment)
-                    {
-                        model.Comment = part.Comment;
-                    }
-                });
-            }
-
-            return null;
+                    model.Comment = part.Comment;
+                }
+            });
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(AuditTrailPart part, UpdatePartEditorContext context)
-        {
-            await context.Updater.TryUpdateModelAsync(part, Prefix);
+        return null;
+    }
 
-            return Edit(part, context);
-        }
+    public override async Task<IDisplayResult> UpdateAsync(AuditTrailPart part, UpdatePartEditorContext context)
+    {
+        await context.Updater.TryUpdateModelAsync(part, Prefix);
+
+        return Edit(part, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailPartSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailPartSettingsDisplayDriver.cs
index 8c53c3d0afd..a7c415193b4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailPartSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailPartSettingsDisplayDriver.cs
@@ -8,41 +8,40 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Contents.AuditTrail.Drivers
+namespace OrchardCore.Contents.AuditTrail.Drivers;
+
+public sealed class AuditTrailPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver
 {
-    public sealed class AuditTrailPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver
+    public override IDisplayResult Edit(ContentTypePartDefinition model, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentTypePartDefinition model, BuildEditorContext context)
+        if (!string.Equals(nameof(AuditTrailPart), model.PartDefinition.Name, StringComparison.Ordinal))
         {
-            if (!string.Equals(nameof(AuditTrailPart), model.PartDefinition.Name, StringComparison.Ordinal))
-            {
-                return null;
-            }
-
-            return Initialize<AuditTrailPartSettingsViewModel>("AuditTrailPartSettings_Edit", viewModel =>
-            {
-                var settings = model.GetSettings<AuditTrailPartSettings>();
-                viewModel.ShowCommentInput = settings.ShowCommentInput;
-            }).Location("Content");
+            return null;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition model, UpdateTypePartEditorContext context)
+        return Initialize<AuditTrailPartSettingsViewModel>("AuditTrailPartSettings_Edit", viewModel =>
+        {
+            var settings = model.GetSettings<AuditTrailPartSettings>();
+            viewModel.ShowCommentInput = settings.ShowCommentInput;
+        }).Location("Content");
+    }
+
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition model, UpdateTypePartEditorContext context)
+    {
+        if (!string.Equals(nameof(AuditTrailPart), model.PartDefinition.Name, StringComparison.Ordinal))
         {
-            if (!string.Equals(nameof(AuditTrailPart), model.PartDefinition.Name, StringComparison.Ordinal))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var viewModel = new AuditTrailPartSettingsViewModel();
+        var viewModel = new AuditTrailPartSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix, m => m.ShowCommentInput);
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix, m => m.ShowCommentInput);
 
-            context.Builder.WithSettings(new AuditTrailPartSettings
-            {
-                ShowCommentInput = viewModel.ShowCommentInput
-            });
+        context.Builder.WithSettings(new AuditTrailPartSettings
+        {
+            ShowCommentInput = viewModel.ShowCommentInput
+        });
 
-            return Edit(model, context);
-        }
+        return Edit(model, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/ContentAuditTrailSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/ContentAuditTrailSettingsDisplayDriver.cs
index 58c6f94499e..ef031af8fa9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/ContentAuditTrailSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/ContentAuditTrailSettingsDisplayDriver.cs
@@ -10,52 +10,51 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Contents.AuditTrail.Drivers
+namespace OrchardCore.Contents.AuditTrail.Drivers;
+
+public sealed class ContentAuditTrailSettingsDisplayDriver : SiteDisplayDriver<ContentAuditTrailSettings>
 {
-    public sealed class ContentAuditTrailSettingsDisplayDriver : SiteDisplayDriver<ContentAuditTrailSettings>
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+
+    public ContentAuditTrailSettingsDisplayDriver(
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
 
-        public ContentAuditTrailSettingsDisplayDriver(
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService)
+    protected override string SettingsGroupId
+        => AuditTrailSettingsGroup.Id;
+
+    public override async Task<IDisplayResult> EditAsync(ISite site, ContentAuditTrailSettings section, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, AuditTrailPermissions.ManageAuditTrailSettings))
         {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
+            return null;
         }
 
-        protected override string SettingsGroupId
-            => AuditTrailSettingsGroup.Id;
-
-        public override async Task<IDisplayResult> EditAsync(ISite site, ContentAuditTrailSettings section, BuildEditorContext context)
+        return Initialize<ContentAuditTrailSettingsViewModel>("ContentAuditTrailSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, AuditTrailPermissions.ManageAuditTrailSettings))
-            {
-                return null;
-            }
-
-            return Initialize<ContentAuditTrailSettingsViewModel>("ContentAuditTrailSettings_Edit", model =>
-            {
-                model.AllowedContentTypes = section.AllowedContentTypes;
-            }).Location("Content:10#Content;5")
-            .OnGroup(SettingsGroupId);
-        }
+            model.AllowedContentTypes = section.AllowedContentTypes;
+        }).Location("Content:10#Content;5")
+        .OnGroup(SettingsGroupId);
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, ContentAuditTrailSettings section, UpdateEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, ContentAuditTrailSettings section, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, AuditTrailPermissions.ManageAuditTrailSettings))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, AuditTrailPermissions.ManageAuditTrailSettings))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var model = new ContentAuditTrailSettings();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
-            section.AllowedContentTypes = model.AllowedContentTypes;
+        var model = new ContentAuditTrailSettings();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
+        section.AllowedContentTypes = model.AllowedContentTypes;
 
-            return await EditAsync(site, section, context);
-        }
+        return await EditAsync(site, section, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Extensions/ContentOrchardHelperExtensions.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Extensions/ContentOrchardHelperExtensions.cs
index 2784effca04..ea9025ec767 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Extensions/ContentOrchardHelperExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Extensions/ContentOrchardHelperExtensions.cs
@@ -7,38 +7,37 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.DisplayManagement;
 
-namespace OrchardCore.Contents.AuditTrail.Extensions
+namespace OrchardCore.Contents.AuditTrail.Extensions;
+
+public static class ContentOrchardHelperExtensions
 {
-    public static class ContentOrchardHelperExtensions
+    public static async Task<IHtmlContent> EditForLinkAsync(this IOrchardHelper orchardHelper, string linkText, ContentItem contentItem)
     {
-        public static async Task<IHtmlContent> EditForLinkAsync(this IOrchardHelper orchardHelper, string linkText, ContentItem contentItem)
-        {
-            var viewContextAccessor = orchardHelper.HttpContext.RequestServices.GetRequiredService<ViewContextAccessor>();
-            var viewContext = viewContextAccessor.ViewContext;
-            var helper = MakeHtmlHelper(viewContext, viewContext.ViewData);
-            var contentManager = orchardHelper.HttpContext.RequestServices.GetRequiredService<IContentManager>();
-            var metadata = await contentManager.PopulateAspectAsync<ContentItemMetadata>(contentItem);
-
-            if (string.IsNullOrEmpty(linkText))
-            {
-                linkText = contentItem.ContentType;
-            }
+        var viewContextAccessor = orchardHelper.HttpContext.RequestServices.GetRequiredService<ViewContextAccessor>();
+        var viewContext = viewContextAccessor.ViewContext;
+        var helper = MakeHtmlHelper(viewContext, viewContext.ViewData);
+        var contentManager = orchardHelper.HttpContext.RequestServices.GetRequiredService<IContentManager>();
+        var metadata = await contentManager.PopulateAspectAsync<ContentItemMetadata>(contentItem);
 
-            return helper.ActionLink(linkText, metadata.EditorRouteValues["action"].ToString(), metadata.EditorRouteValues);
+        if (string.IsNullOrEmpty(linkText))
+        {
+            linkText = contentItem.ContentType;
         }
 
-        private static IHtmlHelper MakeHtmlHelper(ViewContext viewContext, ViewDataDictionary viewData)
-        {
-            var newHelper = viewContext.HttpContext.RequestServices.GetRequiredService<IHtmlHelper>();
+        return helper.ActionLink(linkText, metadata.EditorRouteValues["action"].ToString(), metadata.EditorRouteValues);
+    }
 
-            var contextable = newHelper as IViewContextAware;
-            if (contextable != null)
-            {
-                var newViewContext = new ViewContext(viewContext, viewContext.View, viewData, viewContext.Writer);
-                contextable.Contextualize(newViewContext);
-            }
+    private static IHtmlHelper MakeHtmlHelper(ViewContext viewContext, ViewDataDictionary viewData)
+    {
+        var newHelper = viewContext.HttpContext.RequestServices.GetRequiredService<IHtmlHelper>();
 
-            return newHelper;
+        var contextable = newHelper as IViewContextAware;
+        if (contextable != null)
+        {
+            var newViewContext = new ViewContext(viewContext, viewContext.View, viewData, viewContext.Writer);
+            contextable.Contextualize(newViewContext);
         }
+
+        return newHelper;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Handlers/AuditTrailContentHandler.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Handlers/AuditTrailContentHandler.cs
index 9ec5cfa7ff2..b785c51bbc5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Handlers/AuditTrailContentHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Handlers/AuditTrailContentHandler.cs
@@ -14,89 +14,88 @@
 using OrchardCore.Settings;
 using YesSql;
 
-namespace OrchardCore.Contents.AuditTrail.Handlers
+namespace OrchardCore.Contents.AuditTrail.Handlers;
+
+public class AuditTrailContentHandler : ContentHandlerBase
 {
-    public class AuditTrailContentHandler : ContentHandlerBase
+    private readonly YesSql.ISession _session;
+    private readonly ISiteService _siteService;
+    private readonly IAuditTrailManager _auditTrailManager;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+
+    private readonly HashSet<string> _restoring = [];
+
+    public AuditTrailContentHandler(
+        YesSql.ISession session,
+        ISiteService siteService,
+        IAuditTrailManager auditTrailManager,
+        IHttpContextAccessor httpContextAccessor)
     {
-        private readonly YesSql.ISession _session;
-        private readonly ISiteService _siteService;
-        private readonly IAuditTrailManager _auditTrailManager;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-
-        private readonly HashSet<string> _restoring = [];
-
-        public AuditTrailContentHandler(
-            YesSql.ISession session,
-            ISiteService siteService,
-            IAuditTrailManager auditTrailManager,
-            IHttpContextAccessor httpContextAccessor)
-        {
-            _session = session;
-            _siteService = siteService;
-            _auditTrailManager = auditTrailManager;
-            _httpContextAccessor = httpContextAccessor;
-        }
+        _session = session;
+        _siteService = siteService;
+        _auditTrailManager = auditTrailManager;
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        public override Task DraftSavedAsync(SaveDraftContentContext context)
-            => RecordAuditTrailEventAsync(ContentAuditTrailEventConfiguration.Saved, context.ContentItem);
+    public override Task DraftSavedAsync(SaveDraftContentContext context)
+        => RecordAuditTrailEventAsync(ContentAuditTrailEventConfiguration.Saved, context.ContentItem);
 
-        public override Task CreatedAsync(CreateContentContext context)
-            => RecordAuditTrailEventAsync(ContentAuditTrailEventConfiguration.Created, context.ContentItem);
+    public override Task CreatedAsync(CreateContentContext context)
+        => RecordAuditTrailEventAsync(ContentAuditTrailEventConfiguration.Created, context.ContentItem);
 
-        public override Task PublishedAsync(PublishContentContext context)
-            => RecordAuditTrailEventAsync(ContentAuditTrailEventConfiguration.Published, context.ContentItem);
+    public override Task PublishedAsync(PublishContentContext context)
+        => RecordAuditTrailEventAsync(ContentAuditTrailEventConfiguration.Published, context.ContentItem);
 
-        public override Task UnpublishedAsync(PublishContentContext context)
-            => RecordAuditTrailEventAsync(ContentAuditTrailEventConfiguration.Unpublished, context.ContentItem);
+    public override Task UnpublishedAsync(PublishContentContext context)
+        => RecordAuditTrailEventAsync(ContentAuditTrailEventConfiguration.Unpublished, context.ContentItem);
 
-        public override Task RemovedAsync(RemoveContentContext context)
-            => RecordAuditTrailEventAsync(ContentAuditTrailEventConfiguration.Removed, context.ContentItem);
+    public override Task RemovedAsync(RemoveContentContext context)
+        => RecordAuditTrailEventAsync(ContentAuditTrailEventConfiguration.Removed, context.ContentItem);
 
-        public override Task ClonedAsync(CloneContentContext context)
-            => RecordAuditTrailEventAsync(ContentAuditTrailEventConfiguration.Cloned, context.ContentItem);
+    public override Task ClonedAsync(CloneContentContext context)
+        => RecordAuditTrailEventAsync(ContentAuditTrailEventConfiguration.Cloned, context.ContentItem);
 
-        public override Task RestoringAsync(RestoreContentContext context)
-        {
-            _restoring.Add(context.ContentItem.ContentItemId);
+    public override Task RestoringAsync(RestoreContentContext context)
+    {
+        _restoring.Add(context.ContentItem.ContentItemId);
 
-            return Task.CompletedTask;
+        return Task.CompletedTask;
+    }
+
+    public override Task RestoredAsync(RestoreContentContext context)
+        => RecordAuditTrailEventAsync(ContentAuditTrailEventConfiguration.Restored, context.ContentItem);
+
+    private async Task RecordAuditTrailEventAsync(string name, ContentItem content)
+    {
+        if (name != ContentAuditTrailEventConfiguration.Restored && _restoring.Contains(content.ContentItem.ContentItemId))
+        {
+            return;
         }
 
-        public override Task RestoredAsync(RestoreContentContext context)
-            => RecordAuditTrailEventAsync(ContentAuditTrailEventConfiguration.Restored, context.ContentItem);
+        var settings = await _siteService.GetSettingsAsync<ContentAuditTrailSettings>();
 
-        private async Task RecordAuditTrailEventAsync(string name, ContentItem content)
+        if (!settings.AllowedContentTypes.Contains(content.ContentItem.ContentType))
         {
-            if (name != ContentAuditTrailEventConfiguration.Restored && _restoring.Contains(content.ContentItem.ContentItemId))
-            {
-                return;
-            }
-
-            var settings = await _siteService.GetSettingsAsync<ContentAuditTrailSettings>();
-
-            if (!settings.AllowedContentTypes.Contains(content.ContentItem.ContentType))
-            {
-                return;
-            }
-
-            var versionNumber = await _session
-                .QueryIndex<ContentItemIndex>(index => index.ContentItemId == content.ContentItem.ContentItemId)
-                .CountAsync();
-
-            await _auditTrailManager.RecordEventAsync(
-                new AuditTrailContext<AuditTrailContentEvent>
-                (
-                    name,
-                    ContentAuditTrailEventConfiguration.Content,
-                    content.ContentItem.ContentItemId,
-                    _httpContextAccessor.HttpContext.User?.FindFirstValue(ClaimTypes.NameIdentifier),
-                    _httpContextAccessor.HttpContext.User?.Identity?.Name,
-                    new AuditTrailContentEvent
-                    {
-                        ContentItem = content.ContentItem,
-                        VersionNumber = versionNumber
-                    }
-                ));
+            return;
         }
+
+        var versionNumber = await _session
+            .QueryIndex<ContentItemIndex>(index => index.ContentItemId == content.ContentItem.ContentItemId)
+            .CountAsync();
+
+        await _auditTrailManager.RecordEventAsync(
+            new AuditTrailContext<AuditTrailContentEvent>
+            (
+                name,
+                ContentAuditTrailEventConfiguration.Content,
+                content.ContentItem.ContentItemId,
+                _httpContextAccessor.HttpContext.User?.FindFirstValue(ClaimTypes.NameIdentifier),
+                _httpContextAccessor.HttpContext.User?.Identity?.Name,
+                new AuditTrailContentEvent
+                {
+                    ContentItem = content.ContentItem,
+                    VersionNumber = versionNumber
+                }
+            ));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Migrations.cs
index ec251ceb009..30446da764a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Migrations.cs
@@ -4,25 +4,24 @@
 using OrchardCore.Data.Migration;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Contents.AuditTrail
+namespace OrchardCore.Contents.AuditTrail;
+
+[RequireFeatures("OrchardCore.AuditTrail")]
+public sealed class Migrations : DataMigration
 {
-    [RequireFeatures("OrchardCore.AuditTrail")]
-    public sealed class Migrations : DataMigration
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        public Migrations(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public Migrations(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public async Task<int> CreateAsync()
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync("AuditTrailPart", part => part
-                .Attachable()
-                .WithDescription("Allows editors to enter a comment to be saved into the Audit Trail event when saving a content item."));
+    public async Task<int> CreateAsync()
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync("AuditTrailPart", part => part
+            .Attachable()
+            .WithDescription("Allows editors to enter a comment to be saved into the Audit Trail event when saving a content item."));
 
-            return 1;
-        }
+        return 1;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Models/AuditTrailContentEvent.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Models/AuditTrailContentEvent.cs
index ecb09e953c3..f1f9cfd62d3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Models/AuditTrailContentEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Models/AuditTrailContentEvent.cs
@@ -1,12 +1,11 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Contents.AuditTrail.Models
+namespace OrchardCore.Contents.AuditTrail.Models;
+
+public class AuditTrailContentEvent
 {
-    public class AuditTrailContentEvent
-    {
-        public string Name { get; set; } = "Content";
-        public ContentItem ContentItem { get; set; }
-        public int VersionNumber { get; set; }
-        public string Comment { get; set; }
-    }
+    public string Name { get; set; } = "Content";
+    public ContentItem ContentItem { get; set; }
+    public int VersionNumber { get; set; }
+    public string Comment { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Models/AuditTrailPart.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Models/AuditTrailPart.cs
index 84017ffec0d..b3afa2f33db 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Models/AuditTrailPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Models/AuditTrailPart.cs
@@ -1,10 +1,9 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Contents.AuditTrail.Models
+namespace OrchardCore.Contents.AuditTrail.Models;
+
+public class AuditTrailPart : ContentPart
 {
-    public class AuditTrailPart : ContentPart
-    {
-        public string Comment { get; set; }
-        public bool ShowComment { get; set; }
-    }
+    public string Comment { get; set; }
+    public bool ShowComment { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Services/ContentAuditTrailEventConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Services/ContentAuditTrailEventConfiguration.cs
index 9328b5f0b25..1a8070dc72c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Services/ContentAuditTrailEventConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Services/ContentAuditTrailEventConfiguration.cs
@@ -1,29 +1,28 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.AuditTrail.Services.Models;
 
-namespace OrchardCore.Contents.AuditTrail.Services
+namespace OrchardCore.Contents.AuditTrail.Services;
+
+public sealed class ContentAuditTrailEventConfiguration : IConfigureOptions<AuditTrailOptions>
 {
-    public sealed class ContentAuditTrailEventConfiguration : IConfigureOptions<AuditTrailOptions>
-    {
-        public const string Content = nameof(Content);
-        public const string Created = nameof(Created);
-        public const string Saved = nameof(Saved);
-        public const string Published = nameof(Published);
-        public const string Unpublished = nameof(Unpublished);
-        public const string Removed = nameof(Removed);
-        public const string Cloned = nameof(Cloned);
-        public const string Restored = nameof(Restored);
+    public const string Content = nameof(Content);
+    public const string Created = nameof(Created);
+    public const string Saved = nameof(Saved);
+    public const string Published = nameof(Published);
+    public const string Unpublished = nameof(Unpublished);
+    public const string Removed = nameof(Removed);
+    public const string Cloned = nameof(Cloned);
+    public const string Restored = nameof(Restored);
 
-        public void Configure(AuditTrailOptions options)
-        {
-            options.For<ContentAuditTrailEventConfiguration>(Content, S => S["Content"])
-                .WithEvent(Created, S => S["Created"], S => S["A content item was created."], true)
-                .WithEvent(Saved, S => S["Saved"], S => S["A content item was saved."], true)
-                .WithEvent(Published, S => S["Published"], S => S["A content item was published."], true)
-                .WithEvent(Unpublished, S => S["Unpublished"], S => S["A content item was unpublished."], true)
-                .WithEvent(Removed, S => S["Removed"], S => S["A content item was deleted."], true)
-                .WithEvent(Cloned, S => S["Cloned"], S => S["A content item was cloned."], true)
-                .WithEvent(Restored, S => S["Restored"], S => S["A content item was restored to a previous version."], true);
-        }
+    public void Configure(AuditTrailOptions options)
+    {
+        options.For<ContentAuditTrailEventConfiguration>(Content, S => S["Content"])
+            .WithEvent(Created, S => S["Created"], S => S["A content item was created."], true)
+            .WithEvent(Saved, S => S["Saved"], S => S["A content item was saved."], true)
+            .WithEvent(Published, S => S["Published"], S => S["A content item was published."], true)
+            .WithEvent(Unpublished, S => S["Unpublished"], S => S["A content item was unpublished."], true)
+            .WithEvent(Removed, S => S["Removed"], S => S["A content item was deleted."], true)
+            .WithEvent(Cloned, S => S["Cloned"], S => S["A content item was cloned."], true)
+            .WithEvent(Restored, S => S["Restored"], S => S["A content item was restored to a previous version."], true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Services/ContentAuditTrailEventHandler.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Services/ContentAuditTrailEventHandler.cs
index 57a2a8f978e..3a7926f8d0a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Services/ContentAuditTrailEventHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Services/ContentAuditTrailEventHandler.cs
@@ -5,29 +5,28 @@
 using OrchardCore.Contents.AuditTrail.Models;
 using OrchardCore.Entities;
 
-namespace OrchardCore.Contents.AuditTrail.Services
+namespace OrchardCore.Contents.AuditTrail.Services;
+
+public class ContentAuditTrailEventHandler : AuditTrailEventHandlerBase
 {
-    public class ContentAuditTrailEventHandler : AuditTrailEventHandlerBase
+    public override Task CreateAsync(AuditTrailCreateContext context)
     {
-        public override Task CreateAsync(AuditTrailCreateContext context)
+        if (context.Category != "Content")
         {
-            if (context.Category != "Content")
-            {
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            if (context is AuditTrailCreateContext<AuditTrailContentEvent> contentEvent)
+        if (context is AuditTrailCreateContext<AuditTrailContentEvent> contentEvent)
+        {
+            var auditTrailPart = contentEvent.AuditTrailEventItem.ContentItem.As<AuditTrailPart>();
+            if (auditTrailPart == null)
             {
-                var auditTrailPart = contentEvent.AuditTrailEventItem.ContentItem.As<AuditTrailPart>();
-                if (auditTrailPart == null)
-                {
-                    return Task.CompletedTask;
-                }
-
-                contentEvent.AuditTrailEventItem.Comment = auditTrailPart.Comment;
+                return Task.CompletedTask;
             }
 
-            return Task.CompletedTask;
+            contentEvent.AuditTrailEventItem.Comment = auditTrailPart.Comment;
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Settings/AuditTrailPartSettings.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Settings/AuditTrailPartSettings.cs
index 2ed4e3ba450..ec125200c68 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Settings/AuditTrailPartSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Settings/AuditTrailPartSettings.cs
@@ -1,10 +1,9 @@
 using System.ComponentModel;
 
-namespace OrchardCore.Contents.AuditTrail.Settings
+namespace OrchardCore.Contents.AuditTrail.Settings;
+
+public class AuditTrailPartSettings
 {
-    public class AuditTrailPartSettings
-    {
-        [DefaultValue(true)]
-        public bool ShowCommentInput { get; set; } = true;
-    }
+    [DefaultValue(true)]
+    public bool ShowCommentInput { get; set; } = true;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Settings/ContentAuditTrailSettings.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Settings/ContentAuditTrailSettings.cs
index a7073724c9e..6ea3e7e195f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Settings/ContentAuditTrailSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Settings/ContentAuditTrailSettings.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Contents.AuditTrail.Settings
+namespace OrchardCore.Contents.AuditTrail.Settings;
+
+public class ContentAuditTrailSettings
 {
-    public class ContentAuditTrailSettings
-    {
-        public string[] AllowedContentTypes { get; set; } = [];
-    }
+    public string[] AllowedContentTypes { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Startup.cs
index d0af5218847..8e9e4d50b5c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Startup.cs
@@ -16,27 +16,26 @@
 using OrchardCore.Modules;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Contents.AuditTrail
+namespace OrchardCore.Contents.AuditTrail;
+
+[RequireFeatures("OrchardCore.AuditTrail")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.AuditTrail")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDataMigration<Migrations>();
-            services.AddContentPart<AuditTrailPart>()
-                .UseDisplayDriver<AuditTrailPartDisplayDriver>();
+        services.AddDataMigration<Migrations>();
+        services.AddContentPart<AuditTrailPart>()
+            .UseDisplayDriver<AuditTrailPartDisplayDriver>();
 
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, AuditTrailPartSettingsDisplayDriver>();
-            services.AddScoped<IContentDisplayDriver, AuditTrailContentsDriver>();
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, AuditTrailPartSettingsDisplayDriver>();
+        services.AddScoped<IContentDisplayDriver, AuditTrailContentsDriver>();
 
-            services.AddTransient<IConfigureOptions<AuditTrailOptions>, ContentAuditTrailEventConfiguration>();
-            services.AddScoped<IAuditTrailEventHandler, ContentAuditTrailEventHandler>();
-            services.AddScoped<IDisplayDriver<ISite>, ContentAuditTrailSettingsDisplayDriver>();
+        services.AddTransient<IConfigureOptions<AuditTrailOptions>, ContentAuditTrailEventConfiguration>();
+        services.AddScoped<IAuditTrailEventHandler, ContentAuditTrailEventHandler>();
+        services.AddScoped<IDisplayDriver<ISite>, ContentAuditTrailSettingsDisplayDriver>();
 
-            services.AddScoped<IDisplayDriver<AuditTrailEvent>, AuditTrailContentEventDisplayDriver>();
+        services.AddScoped<IDisplayDriver<AuditTrailEvent>, AuditTrailContentEventDisplayDriver>();
 
-            services.AddScoped<IContentHandler, AuditTrailContentHandler>();
-        }
+        services.AddScoped<IContentHandler, AuditTrailContentHandler>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/AuditTrailContentEventDetailViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/AuditTrailContentEventDetailViewModel.cs
index e70f262f228..1a54a646383 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/AuditTrailContentEventDetailViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/AuditTrailContentEventDetailViewModel.cs
@@ -1,11 +1,10 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Contents.AuditTrail.ViewModels
+namespace OrchardCore.Contents.AuditTrail.ViewModels;
+
+public class AuditTrailContentEventDetailViewModel : AuditTrailContentEventViewModel
 {
-    public class AuditTrailContentEventDetailViewModel : AuditTrailContentEventViewModel
-    {
-        public string Previous { get; set; }
-        public string Current { get; set; }
-        public ContentItem PreviousContentItem { get; set; }
-    }
+    public string Previous { get; set; }
+    public string Current { get; set; }
+    public ContentItem PreviousContentItem { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/AuditTrailContentEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/AuditTrailContentEventViewModel.cs
index a1314f71bbe..04c7a4e3358 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/AuditTrailContentEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/AuditTrailContentEventViewModel.cs
@@ -4,23 +4,22 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Contents.AuditTrail.Models;
 
-namespace OrchardCore.Contents.AuditTrail.ViewModels
+namespace OrchardCore.Contents.AuditTrail.ViewModels;
+
+public class AuditTrailContentEventViewModel
 {
-    public class AuditTrailContentEventViewModel
-    {
-        public string Name { get; set; }
-        public ContentItem ContentItem { get; set; }
-        public int VersionNumber { get; set; }
-        public string LatestVersionId { get; set; }
-        public string Comment { get; set; }
+    public string Name { get; set; }
+    public ContentItem ContentItem { get; set; }
+    public int VersionNumber { get; set; }
+    public string LatestVersionId { get; set; }
+    public string Comment { get; set; }
 
-        [BindNever]
-        public AuditTrailEventDescriptor Descriptor { get; set; }
+    [BindNever]
+    public AuditTrailEventDescriptor Descriptor { get; set; }
 
-        [BindNever]
-        public AuditTrailContentEvent ContentEvent { get; set; }
+    [BindNever]
+    public AuditTrailContentEvent ContentEvent { get; set; }
 
-        [BindNever]
-        public AuditTrailEvent AuditTrailEvent { get; set; }
-    }
+    [BindNever]
+    public AuditTrailEvent AuditTrailEvent { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/AuditTrailPartSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/AuditTrailPartSettingsViewModel.cs
index 896c6e311d1..37c24e169c8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/AuditTrailPartSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/AuditTrailPartSettingsViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Contents.AuditTrail.ViewModels
+namespace OrchardCore.Contents.AuditTrail.ViewModels;
+
+public class AuditTrailPartSettingsViewModel
 {
-    public class AuditTrailPartSettingsViewModel
-    {
-        public bool ShowCommentInput { get; set; }
-    }
+    public bool ShowCommentInput { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/AuditTrailPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/AuditTrailPartViewModel.cs
index f16f389893e..1dcd2380c48 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/AuditTrailPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/AuditTrailPartViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Contents.AuditTrail.ViewModels
+namespace OrchardCore.Contents.AuditTrail.ViewModels;
+
+public class AuditTrailPartViewModel
 {
-    public class AuditTrailPartViewModel
-    {
-        public string Comment { get; set; }
-    }
+    public string Comment { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/ContentAuditTrailSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/ContentAuditTrailSettingsViewModel.cs
index 87b90d5ab4d..ba1e3dadc39 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/ContentAuditTrailSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/ViewModels/ContentAuditTrailSettingsViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Contents.AuditTrail.ViewModels
+namespace OrchardCore.Contents.AuditTrail.ViewModels;
+
+public class ContentAuditTrailSettingsViewModel
 {
-    public class ContentAuditTrailSettingsViewModel
-    {
-        public string[] AllowedContentTypes { get; set; } = [];
-    }
+    public string[] AllowedContentTypes { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Controllers/AdminController.cs
index dacc7472b18..28e997d21b9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Controllers/AdminController.cs
@@ -28,778 +28,777 @@
 using YesSql.Filters.Query;
 using YesSql.Services;
 
-namespace OrchardCore.Contents.Controllers
+namespace OrchardCore.Contents.Controllers;
+
+public class AdminController : Controller, IUpdateModel
 {
-    public class AdminController : Controller, IUpdateModel
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IContentManager _contentManager;
+    private readonly IContentItemDisplayManager _contentItemDisplayManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IDisplayManager<ContentOptionsViewModel> _contentOptionsDisplayManager;
+    private readonly ISession _session;
+    private readonly INotifier _notifier;
+
+    protected readonly IHtmlLocalizer H;
+    protected readonly IStringLocalizer S;
+
+    public AdminController(
+        IAuthorizationService authorizationService,
+        IContentManager contentManager,
+        IContentItemDisplayManager contentItemDisplayManager,
+        IContentDefinitionManager contentDefinitionManager,
+        IDisplayManager<ContentOptionsViewModel> contentOptionsDisplayManager,
+        ISession session,
+        INotifier notifier,
+        IHtmlLocalizer<AdminController> htmlLocalizer,
+        IStringLocalizer<AdminController> stringLocalizer)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IContentManager _contentManager;
-        private readonly IContentItemDisplayManager _contentItemDisplayManager;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IDisplayManager<ContentOptionsViewModel> _contentOptionsDisplayManager;
-        private readonly ISession _session;
-        private readonly INotifier _notifier;
-
-        protected readonly IHtmlLocalizer H;
-        protected readonly IStringLocalizer S;
-
-        public AdminController(
-            IAuthorizationService authorizationService,
-            IContentManager contentManager,
-            IContentItemDisplayManager contentItemDisplayManager,
-            IContentDefinitionManager contentDefinitionManager,
-            IDisplayManager<ContentOptionsViewModel> contentOptionsDisplayManager,
-            ISession session,
-            INotifier notifier,
-            IHtmlLocalizer<AdminController> htmlLocalizer,
-            IStringLocalizer<AdminController> stringLocalizer)
-        {
-            _authorizationService = authorizationService;
-            _contentManager = contentManager;
-            _contentItemDisplayManager = contentItemDisplayManager;
-            _contentDefinitionManager = contentDefinitionManager;
-            _contentOptionsDisplayManager = contentOptionsDisplayManager;
-            _session = session;
-            _notifier = notifier;
-
-            H = htmlLocalizer;
-            S = stringLocalizer;
-        }
-
-        [Admin("Contents/ContentItems/{contentTypeId?}", "ListContentItems")]
-        public async Task<IActionResult> List(
-            [FromServices] IOptions<PagerOptions> pagerOptions,
-            [FromServices] IShapeFactory shapeFactory,
-            [FromServices] IContentsAdminListQueryService contentsAdminListQueryService,
-            [ModelBinder(BinderType = typeof(ContentItemFilterEngineModelBinder), Name = "q")] QueryFilterResult<ContentItem> queryFilterResult,
-            ContentOptionsViewModel options,
-            PagerParameters pagerParameters,
-            string contentTypeId = "",
-            string stereotype = "")
-        {
-            var contentTypeDefinitions = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
-                .OrderBy(ctd => ctd.DisplayName)
-                .ToArray();
-
-            if (!await _authorizationService.AuthorizeContentTypeDefinitionsAsync(User, CommonPermissions.ListContent, contentTypeDefinitions, _contentManager))
-            {
-                return Forbid();
-            }
+        _authorizationService = authorizationService;
+        _contentManager = contentManager;
+        _contentItemDisplayManager = contentItemDisplayManager;
+        _contentDefinitionManager = contentDefinitionManager;
+        _contentOptionsDisplayManager = contentOptionsDisplayManager;
+        _session = session;
+        _notifier = notifier;
+
+        H = htmlLocalizer;
+        S = stringLocalizer;
+    }
 
-            // The parameter contentTypeId is used by the AdminMenus. Pass it to the options.
-            if (!string.IsNullOrEmpty(contentTypeId))
-            {
-                options.SelectedContentType = contentTypeId;
-            }
+    [Admin("Contents/ContentItems/{contentTypeId?}", "ListContentItems")]
+    public async Task<IActionResult> List(
+        [FromServices] IOptions<PagerOptions> pagerOptions,
+        [FromServices] IShapeFactory shapeFactory,
+        [FromServices] IContentsAdminListQueryService contentsAdminListQueryService,
+        [ModelBinder(BinderType = typeof(ContentItemFilterEngineModelBinder), Name = "q")] QueryFilterResult<ContentItem> queryFilterResult,
+        ContentOptionsViewModel options,
+        PagerParameters pagerParameters,
+        string contentTypeId = "",
+        string stereotype = "")
+    {
+        var contentTypeDefinitions = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
+            .OrderBy(ctd => ctd.DisplayName)
+            .ToArray();
 
-            // The filter is bound separately and mapped to the options.
-            // The options must still be bound so that options that are not filters are still bound.
-            options.FilterResult = queryFilterResult;
+        if (!await _authorizationService.AuthorizeContentTypeDefinitionsAsync(User, CommonPermissions.ListContent, contentTypeDefinitions, _contentManager))
+        {
+            return Forbid();
+        }
 
-            var hasSelectedContentType = !string.IsNullOrEmpty(options.SelectedContentType);
+        // The parameter contentTypeId is used by the AdminMenus. Pass it to the options.
+        if (!string.IsNullOrEmpty(contentTypeId))
+        {
+            options.SelectedContentType = contentTypeId;
+        }
 
-            if (hasSelectedContentType)
-            {
-                // When the selected content type is provided via the route or options a placeholder node is used to apply a filter.
-                options.FilterResult.TryAddOrReplace(new ContentTypeFilterNode(options.SelectedContentType));
+        // The filter is bound separately and mapped to the options.
+        // The options must still be bound so that options that are not filters are still bound.
+        options.FilterResult = queryFilterResult;
 
-                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(options.SelectedContentType);
-                if (contentTypeDefinition == null)
-                {
-                    return NotFound();
-                }
+        var hasSelectedContentType = !string.IsNullOrEmpty(options.SelectedContentType);
 
-                options.CreatableTypes = await GetCreatableTypeOptionsAsync(options.CanCreateSelectedContentType, contentTypeDefinition);
-            }
+        if (hasSelectedContentType)
+        {
+            // When the selected content type is provided via the route or options a placeholder node is used to apply a filter.
+            options.FilterResult.TryAddOrReplace(new ContentTypeFilterNode(options.SelectedContentType));
 
-            if (!hasSelectedContentType && !string.IsNullOrEmpty(stereotype))
+            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(options.SelectedContentType);
+            if (contentTypeDefinition == null)
             {
-                // When a stereotype is provided via the query parameter or options a placeholder node is used to apply a filter.
-                options.FilterResult.TryAddOrReplace(new StereotypeFilterNode(stereotype));
-
-                var availableContentTypeDefinitions = contentTypeDefinitions
-                    .Where(definition => definition.StereotypeEquals(stereotype, StringComparison.OrdinalIgnoreCase))
-                    .ToArray();
-
-                if (availableContentTypeDefinitions.Length > 0)
-                {
-                    options.ContentTypeOptions = await GetListableContentTypeOptionsAsync(availableContentTypeDefinitions, options.SelectedContentType, false);
-                    options.CreatableTypes = await GetCreatableTypeOptionsAsync(options.CanCreateSelectedContentType, availableContentTypeDefinitions);
-                }
+                return NotFound();
             }
 
-            if (options.CreatableTypes == null)
-            {
-                // At this point, the creatable types were not yet populated. Populate them using all creatable types.
-                var creatableContentTypeDefinitions = contentTypeDefinitions
-                    .Where(ctd => ctd.IsCreatable())
-                    .ToArray();
+            options.CreatableTypes = await GetCreatableTypeOptionsAsync(options.CanCreateSelectedContentType, contentTypeDefinition);
+        }
 
-                options.CreatableTypes = await GetCreatableTypeOptionsAsync(false, creatableContentTypeDefinitions);
-            }
+        if (!hasSelectedContentType && !string.IsNullOrEmpty(stereotype))
+        {
+            // When a stereotype is provided via the query parameter or options a placeholder node is used to apply a filter.
+            options.FilterResult.TryAddOrReplace(new StereotypeFilterNode(stereotype));
 
-            // We populate the remaining SelectLists.
-            options.ContentStatuses =
-            [
-                new SelectListItem(S["Latest"], nameof(ContentsStatus.Latest)),
-                new SelectListItem(S["Published"], nameof(ContentsStatus.Published)),
-                new SelectListItem(S["Unpublished"], nameof(ContentsStatus.Draft)),
-                new SelectListItem(S["All versions"], nameof(ContentsStatus.AllVersions)),
-            ];
+            var availableContentTypeDefinitions = contentTypeDefinitions
+                .Where(definition => definition.StereotypeEquals(stereotype, StringComparison.OrdinalIgnoreCase))
+                .ToArray();
 
-            if (await IsAuthorizedAsync(CommonPermissions.ListContent))
+            if (availableContentTypeDefinitions.Length > 0)
             {
-                options.ContentStatuses.Insert(1, new SelectListItem(S["Owned by me"], nameof(ContentsStatus.Owner)));
+                options.ContentTypeOptions = await GetListableContentTypeOptionsAsync(availableContentTypeDefinitions, options.SelectedContentType, false);
+                options.CreatableTypes = await GetCreatableTypeOptionsAsync(options.CanCreateSelectedContentType, availableContentTypeDefinitions);
             }
+        }
 
-            options.ContentSorts =
-            [
-                new SelectListItem(S["Recently created"], nameof(ContentsOrder.Created)),
-                new SelectListItem(S["Recently modified"], nameof(ContentsOrder.Modified)),
-                new SelectListItem(S["Recently published"], nameof(ContentsOrder.Published)),
-                new SelectListItem(S["Title"], nameof(ContentsOrder.Title)),
-            ];
-
-            options.ContentsBulkAction =
-            [
-                new SelectListItem(S["Publish Now"], nameof(ContentsBulkAction.PublishNow)),
-                new SelectListItem(S["Unpublish"], nameof(ContentsBulkAction.Unpublish)),
-                new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
-            ];
-
-            if (options.ContentTypeOptions == null
-                && (string.IsNullOrEmpty(options.SelectedContentType) || string.IsNullOrEmpty(contentTypeId)))
-            {
-                options.ContentTypeOptions = await GetListableContentTypeOptionsAsync(contentTypeDefinitions, options.SelectedContentType, true);
-            }
+        if (options.CreatableTypes == null)
+        {
+            // At this point, the creatable types were not yet populated. Populate them using all creatable types.
+            var creatableContentTypeDefinitions = contentTypeDefinitions
+                .Where(ctd => ctd.IsCreatable())
+                .ToArray();
 
-            // If ContentTypeOptions is not initialized by query string or by the code above, initialize it.
-            options.ContentTypeOptions ??= [];
+            options.CreatableTypes = await GetCreatableTypeOptionsAsync(false, creatableContentTypeDefinitions);
+        }
 
-            // With the populated options, filter the query allowing the filters to alter the options.
-            var query = await contentsAdminListQueryService.QueryAsync(options, this);
+        // We populate the remaining SelectLists.
+        options.ContentStatuses =
+        [
+            new SelectListItem(S["Latest"], nameof(ContentsStatus.Latest)),
+            new SelectListItem(S["Published"], nameof(ContentsStatus.Published)),
+            new SelectListItem(S["Unpublished"], nameof(ContentsStatus.Draft)),
+            new SelectListItem(S["All versions"], nameof(ContentsStatus.AllVersions)),
+        ];
 
-            // The search text is provided back to the UI.
-            options.SearchText = options.FilterResult.ToString();
-            options.OriginalSearchText = options.SearchText;
+        if (await IsAuthorizedAsync(CommonPermissions.ListContent))
+        {
+            options.ContentStatuses.Insert(1, new SelectListItem(S["Owned by me"], nameof(ContentsStatus.Owner)));
+        }
 
-            // Populate route values to maintain previous route data when generating page links.
-            options.RouteValues.TryAdd("q", options.FilterResult.ToString());
+        options.ContentSorts =
+        [
+            new SelectListItem(S["Recently created"], nameof(ContentsOrder.Created)),
+            new SelectListItem(S["Recently modified"], nameof(ContentsOrder.Modified)),
+            new SelectListItem(S["Recently published"], nameof(ContentsOrder.Published)),
+            new SelectListItem(S["Title"], nameof(ContentsOrder.Title)),
+        ];
+
+        options.ContentsBulkAction =
+        [
+            new SelectListItem(S["Publish Now"], nameof(ContentsBulkAction.PublishNow)),
+            new SelectListItem(S["Unpublish"], nameof(ContentsBulkAction.Unpublish)),
+            new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+        ];
+
+        if (options.ContentTypeOptions == null
+            && (string.IsNullOrEmpty(options.SelectedContentType) || string.IsNullOrEmpty(contentTypeId)))
+        {
+            options.ContentTypeOptions = await GetListableContentTypeOptionsAsync(contentTypeDefinitions, options.SelectedContentType, true);
+        }
 
-            var pager = new Pager(pagerParameters, pagerOptions.Value.GetPageSize());
+        // If ContentTypeOptions is not initialized by query string or by the code above, initialize it.
+        options.ContentTypeOptions ??= [];
 
-            var itemsPerPage = pagerOptions.Value.MaxPagedCount > 0
-                ? pagerOptions.Value.MaxPagedCount
-                : await query.CountAsync();
+        // With the populated options, filter the query allowing the filters to alter the options.
+        var query = await contentsAdminListQueryService.QueryAsync(options, this);
 
-            var pagerShape = await shapeFactory.PagerAsync(pager, itemsPerPage, options.RouteValues);
+        // The search text is provided back to the UI.
+        options.SearchText = options.FilterResult.ToString();
+        options.OriginalSearchText = options.SearchText;
 
-            // Load items so that loading handlers are invoked.
-            var pageOfContentItems = await query.Skip(pager.GetStartIndex())
-                .Take(pager.PageSize)
-                .ListAsync(_contentManager);
+        // Populate route values to maintain previous route data when generating page links.
+        options.RouteValues.TryAdd("q", options.FilterResult.ToString());
 
-            // We prepare the content items SummaryAdmin shape.
-            var contentItemSummaries = new List<dynamic>();
-            foreach (var contentItem in pageOfContentItems)
-            {
-                contentItemSummaries.Add(await _contentItemDisplayManager.BuildDisplayAsync(contentItem, this, "SummaryAdmin"));
-            }
+        var pager = new Pager(pagerParameters, pagerOptions.Value.GetPageSize());
 
-            // Populate options pager summary values.
-            var startIndex = (pager.Page - 1) * pager.PageSize + 1;
-            options.StartIndex = startIndex;
-            options.EndIndex = startIndex + contentItemSummaries.Count - 1;
-            options.ContentItemsCount = contentItemSummaries.Count;
-            options.TotalItemCount = itemsPerPage;
+        var itemsPerPage = pagerOptions.Value.MaxPagedCount > 0
+            ? pagerOptions.Value.MaxPagedCount
+            : await query.CountAsync();
 
-            var header = await _contentOptionsDisplayManager.BuildEditorAsync(options, this, false, string.Empty, string.Empty);
+        var pagerShape = await shapeFactory.PagerAsync(pager, itemsPerPage, options.RouteValues);
 
-            var shapeViewModel = await shapeFactory.CreateAsync<ListContentsViewModel>("ContentsAdminList", viewModel =>
-            {
-                viewModel.ContentItems = contentItemSummaries;
-                viewModel.Pager = pagerShape;
-                viewModel.Options = options;
-                viewModel.Header = header;
-            });
+        // Load items so that loading handlers are invoked.
+        var pageOfContentItems = await query.Skip(pager.GetStartIndex())
+            .Take(pager.PageSize)
+            .ListAsync(_contentManager);
 
-            return View(shapeViewModel);
+        // We prepare the content items SummaryAdmin shape.
+        var contentItemSummaries = new List<dynamic>();
+        foreach (var contentItem in pageOfContentItems)
+        {
+            contentItemSummaries.Add(await _contentItemDisplayManager.BuildDisplayAsync(contentItem, this, "SummaryAdmin"));
         }
 
-        [HttpPost]
-        [ActionName(nameof(List))]
-        [FormValueRequired("submit.Filter")]
-        public async Task<ActionResult> ListFilterPOST(ContentOptionsViewModel options)
+        // Populate options pager summary values.
+        var startIndex = (pager.Page - 1) * pager.PageSize + 1;
+        options.StartIndex = startIndex;
+        options.EndIndex = startIndex + contentItemSummaries.Count - 1;
+        options.ContentItemsCount = contentItemSummaries.Count;
+        options.TotalItemCount = itemsPerPage;
+
+        var header = await _contentOptionsDisplayManager.BuildEditorAsync(options, this, false, string.Empty, string.Empty);
+
+        var shapeViewModel = await shapeFactory.CreateAsync<ListContentsViewModel>("ContentsAdminList", viewModel =>
+        {
+            viewModel.ContentItems = contentItemSummaries;
+            viewModel.Pager = pagerShape;
+            viewModel.Options = options;
+            viewModel.Header = header;
+        });
+
+        return View(shapeViewModel);
+    }
+
+    [HttpPost]
+    [ActionName(nameof(List))]
+    [FormValueRequired("submit.Filter")]
+    public async Task<ActionResult> ListFilterPOST(ContentOptionsViewModel options)
+    {
+        // When the user has typed something into the search input no further evaluation of the form post is required.
+        if (!string.Equals(options.SearchText, options.OriginalSearchText, StringComparison.OrdinalIgnoreCase))
         {
-            // When the user has typed something into the search input no further evaluation of the form post is required.
-            if (!string.Equals(options.SearchText, options.OriginalSearchText, StringComparison.OrdinalIgnoreCase))
+            return RedirectToAction(nameof(List), new RouteValueDictionary
             {
-                return RedirectToAction(nameof(List), new RouteValueDictionary
-                {
-                    { "q", options.SearchText },
-                });
-            }
+                { "q", options.SearchText },
+            });
+        }
 
-            // Evaluate the values provided in the form post and map them to the filter result and route values.
-            await _contentOptionsDisplayManager.UpdateEditorAsync(options, this, false, string.Empty, string.Empty);
+        // Evaluate the values provided in the form post and map them to the filter result and route values.
+        await _contentOptionsDisplayManager.UpdateEditorAsync(options, this, false, string.Empty, string.Empty);
 
-            // The route value must always be added after the editors have updated the models.
-            options.RouteValues.TryAdd("q", options.FilterResult.ToString());
+        // The route value must always be added after the editors have updated the models.
+        options.RouteValues.TryAdd("q", options.FilterResult.ToString());
 
-            return RedirectToAction(nameof(List), options.RouteValues);
-        }
+        return RedirectToAction(nameof(List), options.RouteValues);
+    }
 
-        [HttpPost]
-        [ActionName(nameof(List))]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<ActionResult> ListPOST(ContentOptionsViewModel options, long[] itemIds)
+    [HttpPost]
+    [ActionName(nameof(List))]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<ActionResult> ListPOST(ContentOptionsViewModel options, long[] itemIds)
+    {
+        if (itemIds.Length > 0)
         {
-            if (itemIds.Length > 0)
+            // Load items so that loading handlers are invoked.
+            var checkedContentItems = await _session.Query<ContentItem, ContentItemIndex>()
+                .Where(x => x.DocumentId.IsIn(itemIds) && x.Latest)
+                .ListAsync(_contentManager);
+
+            switch (options.BulkAction)
             {
-                // Load items so that loading handlers are invoked.
-                var checkedContentItems = await _session.Query<ContentItem, ContentItemIndex>()
-                    .Where(x => x.DocumentId.IsIn(itemIds) && x.Latest)
-                    .ListAsync(_contentManager);
-
-                switch (options.BulkAction)
-                {
-                    case ContentsBulkAction.None:
-                        break;
-                    case ContentsBulkAction.PublishNow:
-                        foreach (var item in checkedContentItems)
+                case ContentsBulkAction.None:
+                    break;
+                case ContentsBulkAction.PublishNow:
+                    foreach (var item in checkedContentItems)
+                    {
+                        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.PublishContent, item))
                         {
-                            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.PublishContent, item))
-                            {
-                                await _notifier.WarningAsync(H["Couldn't publish selected content."]);
-                                await _session.CancelAsync();
-                                return Forbid();
-                            }
-
-                            await _contentManager.PublishAsync(item);
+                            await _notifier.WarningAsync(H["Couldn't publish selected content."]);
+                            await _session.CancelAsync();
+                            return Forbid();
                         }
-                        await _notifier.SuccessAsync(H["Content published successfully."]);
-                        break;
-                    case ContentsBulkAction.Unpublish:
-                        foreach (var item in checkedContentItems)
+
+                        await _contentManager.PublishAsync(item);
+                    }
+                    await _notifier.SuccessAsync(H["Content published successfully."]);
+                    break;
+                case ContentsBulkAction.Unpublish:
+                    foreach (var item in checkedContentItems)
+                    {
+                        if (!await IsAuthorizedAsync(CommonPermissions.PublishContent, item))
                         {
-                            if (!await IsAuthorizedAsync(CommonPermissions.PublishContent, item))
-                            {
-                                await _notifier.WarningAsync(H["Couldn't unpublish selected content."]);
-                                await _session.CancelAsync();
-                                return Forbid();
-                            }
-
-                            await _contentManager.UnpublishAsync(item);
+                            await _notifier.WarningAsync(H["Couldn't unpublish selected content."]);
+                            await _session.CancelAsync();
+                            return Forbid();
                         }
-                        await _notifier.SuccessAsync(H["Content unpublished successfully."]);
-                        break;
-                    case ContentsBulkAction.Remove:
-                        foreach (var item in checkedContentItems)
+
+                        await _contentManager.UnpublishAsync(item);
+                    }
+                    await _notifier.SuccessAsync(H["Content unpublished successfully."]);
+                    break;
+                case ContentsBulkAction.Remove:
+                    foreach (var item in checkedContentItems)
+                    {
+                        if (!await IsAuthorizedAsync(CommonPermissions.DeleteContent, item))
                         {
-                            if (!await IsAuthorizedAsync(CommonPermissions.DeleteContent, item))
-                            {
-                                await _notifier.WarningAsync(H["Couldn't remove selected content."]);
-                                await _session.CancelAsync();
-                                return Forbid();
-                            }
-
-                            await _contentManager.RemoveAsync(item);
+                            await _notifier.WarningAsync(H["Couldn't remove selected content."]);
+                            await _session.CancelAsync();
+                            return Forbid();
                         }
-                        await _notifier.SuccessAsync(H["Content removed successfully."]);
-                        break;
-                    default:
-                        return BadRequest();
-                }
-            }
-
-            return RedirectToAction(nameof(List));
-        }
-
-        [Admin("Contents/ContentTypes/{id}/Create", "CreateContentItem")]
-        public async Task<IActionResult> Create(string id)
-        {
-            if (string.IsNullOrWhiteSpace(id))
-            {
-                return NotFound();
-            }
-
-            var contentItem = await CreateContentItemOwnedByCurrentUserAsync(id);
 
-            if (!await IsAuthorizedAsync(CommonPermissions.EditContent, contentItem))
-            {
-                return Forbid();
+                        await _contentManager.RemoveAsync(item);
+                    }
+                    await _notifier.SuccessAsync(H["Content removed successfully."]);
+                    break;
+                default:
+                    return BadRequest();
             }
+        }
 
-            var model = await _contentItemDisplayManager.BuildEditorAsync(contentItem, this, true);
+        return RedirectToAction(nameof(List));
+    }
 
-            return View(model);
+    [Admin("Contents/ContentTypes/{id}/Create", "CreateContentItem")]
+    public async Task<IActionResult> Create(string id)
+    {
+        if (string.IsNullOrWhiteSpace(id))
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        [ActionName(nameof(Create))]
-        [FormValueRequired("submit.Save")]
-        public Task<IActionResult> CreatePOST(
-            string id,
-            [Bind(Prefix = "submit.Save")] string submitSave,
-            string returnUrl)
+        var contentItem = await CreateContentItemOwnedByCurrentUserAsync(id);
+
+        if (!await IsAuthorizedAsync(CommonPermissions.EditContent, contentItem))
         {
-            var stayOnSamePage = submitSave == "submit.SaveAndContinue";
-            return CreatePOST(id, returnUrl, stayOnSamePage, async contentItem =>
-            {
-                await _contentManager.SaveDraftAsync(contentItem);
+            return Forbid();
+        }
 
-                var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+        var model = await _contentItemDisplayManager.BuildEditorAsync(contentItem, this, true);
 
-                await _notifier.SuccessAsync(string.IsNullOrWhiteSpace(typeDefinition?.DisplayName)
-                    ? H["Your content draft has been saved."]
-                    : H["Your {0} draft has been saved.", typeDefinition.DisplayName]);
-            });
-        }
+        return View(model);
+    }
 
-        [HttpPost]
-        [ActionName(nameof(Create))]
-        [FormValueRequired("submit.Publish")]
-        public async Task<IActionResult> CreateAndPublishPOST(
-            string id,
-            [Bind(Prefix = "submit.Publish")] string submitPublish,
-            string returnUrl)
+    [HttpPost]
+    [ActionName(nameof(Create))]
+    [FormValueRequired("submit.Save")]
+    public Task<IActionResult> CreatePOST(
+        string id,
+        [Bind(Prefix = "submit.Save")] string submitSave,
+        string returnUrl)
+    {
+        var stayOnSamePage = submitSave == "submit.SaveAndContinue";
+        return CreatePOST(id, returnUrl, stayOnSamePage, async contentItem =>
         {
-            if (string.IsNullOrEmpty(id))
-            {
-                return NotFound();
-            }
+            await _contentManager.SaveDraftAsync(contentItem);
 
-            var stayOnSamePage = submitPublish == "submit.PublishAndContinue";
-            // Pass a dummy content item to the authorization check to check for "own" variations permissions.
-            if (!await _authorizationService.AuthorizeContentTypeAsync(User, CommonPermissions.PublishContent, id, CurrentUserId()))
-            {
-                return Forbid();
-            }
+            var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-            return await CreatePOST(id, returnUrl, stayOnSamePage, async contentItem =>
-            {
-                await _contentManager.PublishAsync(contentItem);
+            await _notifier.SuccessAsync(string.IsNullOrWhiteSpace(typeDefinition?.DisplayName)
+                ? H["Your content draft has been saved."]
+                : H["Your {0} draft has been saved.", typeDefinition.DisplayName]);
+        });
+    }
 
-                var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+    [HttpPost]
+    [ActionName(nameof(Create))]
+    [FormValueRequired("submit.Publish")]
+    public async Task<IActionResult> CreateAndPublishPOST(
+        string id,
+        [Bind(Prefix = "submit.Publish")] string submitPublish,
+        string returnUrl)
+    {
+        if (string.IsNullOrEmpty(id))
+        {
+            return NotFound();
+        }
 
-                await _notifier.SuccessAsync(string.IsNullOrWhiteSpace(typeDefinition.DisplayName)
-                    ? H["Your content has been published."]
-                    : H["Your {0} has been published.", typeDefinition.DisplayName]);
-            });
+        var stayOnSamePage = submitPublish == "submit.PublishAndContinue";
+        // Pass a dummy content item to the authorization check to check for "own" variations permissions.
+        if (!await _authorizationService.AuthorizeContentTypeAsync(User, CommonPermissions.PublishContent, id, CurrentUserId()))
+        {
+            return Forbid();
         }
 
-        [Admin("Contents/ContentItems/{contentItemId}/Display", "AdminContentItem")]
-        public async Task<IActionResult> Display(string contentItemId)
+        return await CreatePOST(id, returnUrl, stayOnSamePage, async contentItem =>
         {
-            var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
+            await _contentManager.PublishAsync(contentItem);
 
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
+            var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-            if (!await IsAuthorizedAsync(CommonPermissions.ViewContent, contentItem))
-            {
-                return Forbid();
-            }
+            await _notifier.SuccessAsync(string.IsNullOrWhiteSpace(typeDefinition.DisplayName)
+                ? H["Your content has been published."]
+                : H["Your {0} has been published.", typeDefinition.DisplayName]);
+        });
+    }
 
-            var model = await _contentItemDisplayManager.BuildDisplayAsync(contentItem, this, "DetailAdmin");
+    [Admin("Contents/ContentItems/{contentItemId}/Display", "AdminContentItem")]
+    public async Task<IActionResult> Display(string contentItemId)
+    {
+        var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
 
-            return View(model);
+        if (contentItem == null)
+        {
+            return NotFound();
         }
 
-        [Admin("Contents/ContentItems/{contentItemId}/Edit", "EditContentItem")]
-        public async Task<IActionResult> Edit(string contentItemId, string returnUrl = null)
+        if (!await IsAuthorizedAsync(CommonPermissions.ViewContent, contentItem))
         {
-            var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
+            return Forbid();
+        }
 
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
+        var model = await _contentItemDisplayManager.BuildDisplayAsync(contentItem, this, "DetailAdmin");
 
-            if (!await IsAuthorizedAsync(CommonPermissions.EditContent, contentItem))
-            {
-                return Forbid();
-            }
+        return View(model);
+    }
 
-            var model = await _contentItemDisplayManager.BuildEditorAsync(contentItem, this, false);
+    [Admin("Contents/ContentItems/{contentItemId}/Edit", "EditContentItem")]
+    public async Task<IActionResult> Edit(string contentItemId, string returnUrl = null)
+    {
+        var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
 
-            return View(model);
+        if (contentItem == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        [ActionName(nameof(Edit))]
-        [FormValueRequired("submit.Save")]
-        public Task<IActionResult> EditPOST(
-            string contentItemId,
-            [Bind(Prefix = "submit.Save")] string submitSave,
-            string returnUrl)
+        if (!await IsAuthorizedAsync(CommonPermissions.EditContent, contentItem))
         {
-            var stayOnSamePage = submitSave == "submit.SaveAndContinue";
-            return EditPOST(contentItemId, returnUrl, stayOnSamePage, async contentItem =>
-            {
-                await _contentManager.SaveDraftAsync(contentItem);
+            return Forbid();
+        }
 
-                var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+        var model = await _contentItemDisplayManager.BuildEditorAsync(contentItem, this, false);
 
-                await _notifier.SuccessAsync(string.IsNullOrWhiteSpace(typeDefinition?.DisplayName)
-                    ? H["Your content draft has been saved."]
-                    : H["Your {0} draft has been saved.", typeDefinition.DisplayName]);
-            });
-        }
+        return View(model);
+    }
 
-        [HttpPost]
-        [ActionName(nameof(Edit))]
-        [FormValueRequired("submit.Publish")]
-        public async Task<IActionResult> EditAndPublishPOST(
-            string contentItemId,
-            [Bind(Prefix = "submit.Publish")] string submitPublish,
-            string returnUrl)
+    [HttpPost]
+    [ActionName(nameof(Edit))]
+    [FormValueRequired("submit.Save")]
+    public Task<IActionResult> EditPOST(
+        string contentItemId,
+        [Bind(Prefix = "submit.Save")] string submitSave,
+        string returnUrl)
+    {
+        var stayOnSamePage = submitSave == "submit.SaveAndContinue";
+        return EditPOST(contentItemId, returnUrl, stayOnSamePage, async contentItem =>
         {
-            var stayOnSamePage = submitPublish == "submit.PublishAndContinue";
+            await _contentManager.SaveDraftAsync(contentItem);
 
-            var content = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
+            var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-            if (content == null)
-            {
-                return NotFound();
-            }
+            await _notifier.SuccessAsync(string.IsNullOrWhiteSpace(typeDefinition?.DisplayName)
+                ? H["Your content draft has been saved."]
+                : H["Your {0} draft has been saved.", typeDefinition.DisplayName]);
+        });
+    }
 
-            if (!await IsAuthorizedAsync(CommonPermissions.PublishContent, content))
-            {
-                return Forbid();
-            }
+    [HttpPost]
+    [ActionName(nameof(Edit))]
+    [FormValueRequired("submit.Publish")]
+    public async Task<IActionResult> EditAndPublishPOST(
+        string contentItemId,
+        [Bind(Prefix = "submit.Publish")] string submitPublish,
+        string returnUrl)
+    {
+        var stayOnSamePage = submitPublish == "submit.PublishAndContinue";
 
-            return await EditPOST(contentItemId, returnUrl, stayOnSamePage, async contentItem =>
-            {
-                await _contentManager.PublishAsync(contentItem);
+        var content = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
 
-                var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+        if (content == null)
+        {
+            return NotFound();
+        }
 
-                await _notifier.SuccessAsync(string.IsNullOrWhiteSpace(typeDefinition?.DisplayName)
-                    ? H["Your content has been published."]
-                    : H["Your {0} has been published.", typeDefinition.DisplayName]);
-            });
+        if (!await IsAuthorizedAsync(CommonPermissions.PublishContent, content))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        [Admin("Contents/ContentItems/{contentItemId}/Clone", "AdminCloneContentItem")]
-        public async Task<IActionResult> Clone(string contentItemId, string returnUrl)
+        return await EditPOST(contentItemId, returnUrl, stayOnSamePage, async contentItem =>
         {
-            var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
+            await _contentManager.PublishAsync(contentItem);
 
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
+            var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-            if (!await IsAuthorizedAsync(CommonPermissions.CloneContent, contentItem))
-            {
-                return Forbid();
-            }
+            await _notifier.SuccessAsync(string.IsNullOrWhiteSpace(typeDefinition?.DisplayName)
+                ? H["Your content has been published."]
+                : H["Your {0} has been published.", typeDefinition.DisplayName]);
+        });
+    }
 
-            try
-            {
-                await _contentManager.CloneAsync(contentItem);
-            }
-            catch (InvalidOperationException)
-            {
-                await _notifier.WarningAsync(H["Could not clone the content item."]);
-                return Url.IsLocalUrl(returnUrl)
-                    ? this.LocalRedirect(returnUrl, true)
-                    : RedirectToAction(nameof(List));
-            }
+    [HttpPost]
+    [Admin("Contents/ContentItems/{contentItemId}/Clone", "AdminCloneContentItem")]
+    public async Task<IActionResult> Clone(string contentItemId, string returnUrl)
+    {
+        var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
 
-            await _notifier.InformationAsync(H["Successfully cloned. The clone was saved as a draft."]);
+        if (contentItem == null)
+        {
+            return NotFound();
+        }
+
+        if (!await IsAuthorizedAsync(CommonPermissions.CloneContent, contentItem))
+        {
+            return Forbid();
+        }
 
+        try
+        {
+            await _contentManager.CloneAsync(contentItem);
+        }
+        catch (InvalidOperationException)
+        {
+            await _notifier.WarningAsync(H["Could not clone the content item."]);
             return Url.IsLocalUrl(returnUrl)
                 ? this.LocalRedirect(returnUrl, true)
                 : RedirectToAction(nameof(List));
         }
 
-        [HttpPost]
-        [Admin("Contents/ContentItems/{contentItemId}/DiscardDraft", "AdminDiscardDraftContentItem")]
-        public async Task<IActionResult> DiscardDraft(string contentItemId, string returnUrl)
-        {
-            var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
+        await _notifier.InformationAsync(H["Successfully cloned. The clone was saved as a draft."]);
 
-            if (contentItem == null || contentItem.Published)
-            {
-                return NotFound();
-            }
+        return Url.IsLocalUrl(returnUrl)
+            ? this.LocalRedirect(returnUrl, true)
+            : RedirectToAction(nameof(List));
+    }
 
-            if (!await IsAuthorizedAsync(CommonPermissions.DeleteContent, contentItem))
-            {
-                return Forbid();
-            }
+    [HttpPost]
+    [Admin("Contents/ContentItems/{contentItemId}/DiscardDraft", "AdminDiscardDraftContentItem")]
+    public async Task<IActionResult> DiscardDraft(string contentItemId, string returnUrl)
+    {
+        var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
 
-            if (contentItem != null)
-            {
-                await _contentManager.DiscardDraftAsync(contentItem);
+        if (contentItem == null || contentItem.Published)
+        {
+            return NotFound();
+        }
 
-                var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+        if (!await IsAuthorizedAsync(CommonPermissions.DeleteContent, contentItem))
+        {
+            return Forbid();
+        }
 
-                await _notifier.SuccessAsync(string.IsNullOrWhiteSpace(typeDefinition?.DisplayName)
-                    ? H["The draft has been removed."]
-                    : H["The {0} draft has been removed.", typeDefinition.DisplayName]);
-            }
+        if (contentItem != null)
+        {
+            await _contentManager.DiscardDraftAsync(contentItem);
 
-            return Url.IsLocalUrl(returnUrl)
-                ? this.LocalRedirect(returnUrl, true)
-                : RedirectToAction(nameof(List));
+            var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+
+            await _notifier.SuccessAsync(string.IsNullOrWhiteSpace(typeDefinition?.DisplayName)
+                ? H["The draft has been removed."]
+                : H["The {0} draft has been removed.", typeDefinition.DisplayName]);
         }
 
-        [HttpPost]
-        [Admin("Contents/ContentItems/{contentItemId}/Delete", "AdminDeleteContentItem")]
-        public async Task<IActionResult> Remove(string contentItemId, string returnUrl)
+        return Url.IsLocalUrl(returnUrl)
+            ? this.LocalRedirect(returnUrl, true)
+            : RedirectToAction(nameof(List));
+    }
+
+    [HttpPost]
+    [Admin("Contents/ContentItems/{contentItemId}/Delete", "AdminDeleteContentItem")]
+    public async Task<IActionResult> Remove(string contentItemId, string returnUrl)
+    {
+        var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
+
+        if (!await IsAuthorizedAsync(CommonPermissions.DeleteContent, contentItem))
         {
-            var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
+            return Forbid();
+        }
 
-            if (!await IsAuthorizedAsync(CommonPermissions.DeleteContent, contentItem))
-            {
-                return Forbid();
-            }
+        if (contentItem != null)
+        {
+            await _contentManager.RemoveAsync(contentItem);
 
-            if (contentItem != null)
-            {
-                await _contentManager.RemoveAsync(contentItem);
+            var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-                var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+            await _notifier.SuccessAsync(string.IsNullOrWhiteSpace(typeDefinition?.DisplayName)
+                ? H["That content has been removed."]
+                : H["That {0} has been removed.", typeDefinition.DisplayName]);
+        }
 
-                await _notifier.SuccessAsync(string.IsNullOrWhiteSpace(typeDefinition?.DisplayName)
-                    ? H["That content has been removed."]
-                    : H["That {0} has been removed.", typeDefinition.DisplayName]);
-            }
+        return Url.IsLocalUrl(returnUrl)
+            ? this.LocalRedirect(returnUrl, true)
+            : RedirectToAction(nameof(List));
+    }
 
-            return Url.IsLocalUrl(returnUrl)
-                ? this.LocalRedirect(returnUrl, true)
-                : RedirectToAction(nameof(List));
+    [HttpPost]
+    [Admin("Contents/ContentItems/{contentItemId}/Publish", "AdminPublishContentItem")]
+    public async Task<IActionResult> Publish(string contentItemId, string returnUrl)
+    {
+        var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
+        if (contentItem == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        [Admin("Contents/ContentItems/{contentItemId}/Publish", "AdminPublishContentItem")]
-        public async Task<IActionResult> Publish(string contentItemId, string returnUrl)
+        if (!await IsAuthorizedAsync(CommonPermissions.PublishContent, contentItem))
         {
-            var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
+            return Forbid();
+        }
 
-            if (!await IsAuthorizedAsync(CommonPermissions.PublishContent, contentItem))
-            {
-                return Forbid();
-            }
+        await _contentManager.PublishAsync(contentItem);
 
-            await _contentManager.PublishAsync(contentItem);
+        var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-            var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+        if (string.IsNullOrEmpty(typeDefinition?.DisplayName))
+        {
+            await _notifier.SuccessAsync(H["That content has been published."]);
+        }
+        else
+        {
+            await _notifier.SuccessAsync(H["That {0} has been published.", typeDefinition.DisplayName]);
+        }
 
-            if (string.IsNullOrEmpty(typeDefinition?.DisplayName))
-            {
-                await _notifier.SuccessAsync(H["That content has been published."]);
-            }
-            else
-            {
-                await _notifier.SuccessAsync(H["That {0} has been published.", typeDefinition.DisplayName]);
-            }
+        return Url.IsLocalUrl(returnUrl)
+            ? this.LocalRedirect(returnUrl, true)
+            : RedirectToAction(nameof(List));
+    }
 
-            return Url.IsLocalUrl(returnUrl)
-                ? this.LocalRedirect(returnUrl, true)
-                : RedirectToAction(nameof(List));
+    [HttpPost]
+    [Admin("Contents/ContentItems/{contentItemId}/Unpublish", "AdminUnpublishContentItem")]
+    public async Task<IActionResult> Unpublish(string contentItemId, string returnUrl)
+    {
+        var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
+        if (contentItem == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        [Admin("Contents/ContentItems/{contentItemId}/Unpublish", "AdminUnpublishContentItem")]
-        public async Task<IActionResult> Unpublish(string contentItemId, string returnUrl)
+        if (!await IsAuthorizedAsync(CommonPermissions.PublishContent, contentItem))
         {
-            var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
+            return Forbid();
+        }
 
-            if (!await IsAuthorizedAsync(CommonPermissions.PublishContent, contentItem))
-            {
-                return Forbid();
-            }
+        await _contentManager.UnpublishAsync(contentItem);
 
-            await _contentManager.UnpublishAsync(contentItem);
+        var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-            var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+        if (string.IsNullOrEmpty(typeDefinition?.DisplayName))
+        {
+            await _notifier.SuccessAsync(H["The content has been unpublished."]);
+        }
+        else
+        {
+            await _notifier.SuccessAsync(H["The {0} has been unpublished.", typeDefinition.DisplayName]);
+        }
 
-            if (string.IsNullOrEmpty(typeDefinition?.DisplayName))
-            {
-                await _notifier.SuccessAsync(H["The content has been unpublished."]);
-            }
-            else
-            {
-                await _notifier.SuccessAsync(H["The {0} has been unpublished.", typeDefinition.DisplayName]);
-            }
+        return Url.IsLocalUrl(returnUrl)
+            ? this.LocalRedirect(returnUrl, true)
+            : RedirectToAction(nameof(List));
+    }
 
-            return Url.IsLocalUrl(returnUrl)
-                ? this.LocalRedirect(returnUrl, true)
-                : RedirectToAction(nameof(List));
-        }
+    private async Task<IActionResult> CreatePOST(
+        string id,
+        string returnUrl,
+        bool stayOnSamePage,
+        Func<ContentItem, Task> conditionallyPublish)
+    {
+        var contentItem = await CreateContentItemOwnedByCurrentUserAsync(id);
 
-        private async Task<IActionResult> CreatePOST(
-            string id,
-            string returnUrl,
-            bool stayOnSamePage,
-            Func<ContentItem, Task> conditionallyPublish)
+        if (!await IsAuthorizedAsync(CommonPermissions.EditContent, contentItem))
         {
-            var contentItem = await CreateContentItemOwnedByCurrentUserAsync(id);
+            return Forbid();
+        }
 
-            if (!await IsAuthorizedAsync(CommonPermissions.EditContent, contentItem))
-            {
-                return Forbid();
-            }
+        var model = await _contentItemDisplayManager.UpdateEditorAsync(contentItem, this, true);
 
-            var model = await _contentItemDisplayManager.UpdateEditorAsync(contentItem, this, true);
+        if (ModelState.IsValid)
+        {
+            await _contentManager.CreateAsync(contentItem, VersionOptions.Draft);
+        }
 
-            if (ModelState.IsValid)
-            {
-                await _contentManager.CreateAsync(contentItem, VersionOptions.Draft);
-            }
+        if (!ModelState.IsValid)
+        {
+            await _session.CancelAsync();
+            return View(model);
+        }
 
-            if (!ModelState.IsValid)
-            {
-                await _session.CancelAsync();
-                return View(model);
-            }
+        await conditionallyPublish(contentItem);
 
-            await conditionallyPublish(contentItem);
+        if (!string.IsNullOrEmpty(returnUrl) && !stayOnSamePage)
+        {
+            return this.LocalRedirect(returnUrl, true);
+        }
 
-            if (!string.IsNullOrEmpty(returnUrl) && !stayOnSamePage)
-            {
-                return this.LocalRedirect(returnUrl, true);
-            }
+        var adminRouteValues = (await _contentManager.PopulateAspectAsync<ContentItemMetadata>(contentItem)).AdminRouteValues;
+
+        if (!string.IsNullOrEmpty(returnUrl))
+        {
+            adminRouteValues.Add("returnUrl", returnUrl);
+        }
 
-            var adminRouteValues = (await _contentManager.PopulateAspectAsync<ContentItemMetadata>(contentItem)).AdminRouteValues;
+        return RedirectToRoute(adminRouteValues);
+    }
 
-            if (!string.IsNullOrEmpty(returnUrl))
-            {
-                adminRouteValues.Add("returnUrl", returnUrl);
-            }
+    private async Task<IActionResult> EditPOST(
+        string contentItemId,
+        string returnUrl,
+        bool stayOnSamePage,
+        Func<ContentItem, Task> conditionallyPublish)
+    {
+        var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.DraftRequired);
 
-            return RedirectToRoute(adminRouteValues);
+        if (contentItem == null)
+        {
+            return NotFound();
         }
 
-        private async Task<IActionResult> EditPOST(
-            string contentItemId,
-            string returnUrl,
-            bool stayOnSamePage,
-            Func<ContentItem, Task> conditionallyPublish)
+        if (!await IsAuthorizedAsync(CommonPermissions.EditContent, contentItem))
         {
-            var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.DraftRequired);
+            return Forbid();
+        }
 
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
+        var model = await _contentItemDisplayManager.UpdateEditorAsync(contentItem, this, false);
 
-            if (!await IsAuthorizedAsync(CommonPermissions.EditContent, contentItem))
-            {
-                return Forbid();
-            }
+        if (!ModelState.IsValid)
+        {
+            await _session.CancelAsync();
+            return View(nameof(Edit), model);
+        }
 
-            var model = await _contentItemDisplayManager.UpdateEditorAsync(contentItem, this, false);
+        await conditionallyPublish(contentItem);
 
-            if (!ModelState.IsValid)
+        if (returnUrl == null)
+        {
+            return RedirectToAction(nameof(Edit), new RouteValueDictionary
             {
-                await _session.CancelAsync();
-                return View(nameof(Edit), model);
-            }
-
-            await conditionallyPublish(contentItem);
+                { "ContentItemId", contentItem.ContentItemId },
+            });
+        }
 
-            if (returnUrl == null)
+        if (stayOnSamePage)
+        {
+            return RedirectToAction(nameof(Edit), new RouteValueDictionary
             {
-                return RedirectToAction(nameof(Edit), new RouteValueDictionary
-                {
-                    { "ContentItemId", contentItem.ContentItemId },
-                });
-            }
+                { "ContentItemId", contentItem.ContentItemId },
+                { "returnUrl", returnUrl },
+            });
+        }
 
-            if (stayOnSamePage)
-            {
-                return RedirectToAction(nameof(Edit), new RouteValueDictionary
-                {
-                    { "ContentItemId", contentItem.ContentItemId },
-                    { "returnUrl", returnUrl },
-                });
-            }
+        return this.LocalRedirect(returnUrl, true);
+    }
 
-            return this.LocalRedirect(returnUrl, true);
-        }
+    private async Task<List<SelectListItem>> GetCreatableTypeOptionsAsync(
+        bool canCreateSelectedContentType,
+        params ContentTypeDefinition[] contentTypeDefinitions)
+    {
+        var options = new List<SelectListItem>();
 
-        private async Task<List<SelectListItem>> GetCreatableTypeOptionsAsync(
-            bool canCreateSelectedContentType,
-            params ContentTypeDefinition[] contentTypeDefinitions)
+        foreach (var contentTypeDefinition in contentTypeDefinitions)
         {
-            var options = new List<SelectListItem>();
+            // Allows non creatable types to be created by another admin page.
+            var creatable = contentTypeDefinition.IsCreatable() || canCreateSelectedContentType;
 
-            foreach (var contentTypeDefinition in contentTypeDefinitions)
+            if (creatable && await _authorizationService.AuthorizeContentTypeAsync(User, CommonPermissions.EditContent, contentTypeDefinition, CurrentUserId()))
             {
-                // Allows non creatable types to be created by another admin page.
-                var creatable = contentTypeDefinition.IsCreatable() || canCreateSelectedContentType;
-
-                if (creatable && await _authorizationService.AuthorizeContentTypeAsync(User, CommonPermissions.EditContent, contentTypeDefinition, CurrentUserId()))
-                {
-                    // Populate the creatable types.
-                    options.Add(new SelectListItem(contentTypeDefinition.DisplayName, contentTypeDefinition.Name));
-                }
+                // Populate the creatable types.
+                options.Add(new SelectListItem(contentTypeDefinition.DisplayName, contentTypeDefinition.Name));
             }
-
-            return options;
         }
 
-        private async Task<List<SelectListItem>> GetListableContentTypeOptionsAsync(
-            IEnumerable<ContentTypeDefinition> definitions,
-            string selectedContentType,
-            bool showSelectAll = true)
-        {
-            var currentUserId = CurrentUserId();
+        return options;
+    }
 
-            var items = new List<SelectListItem>();
+    private async Task<List<SelectListItem>> GetListableContentTypeOptionsAsync(
+        IEnumerable<ContentTypeDefinition> definitions,
+        string selectedContentType,
+        bool showSelectAll = true)
+    {
+        var currentUserId = CurrentUserId();
 
-            if (showSelectAll)
-            {
-                items.Add(new SelectListItem(S["All content types"], string.Empty));
-            };
+        var items = new List<SelectListItem>();
 
-            foreach (var definition in definitions)
-            {
-                if (!definition.IsListable()
-                    || !await _authorizationService.AuthorizeContentTypeAsync(User, CommonPermissions.ListContent, definition.Name, currentUserId))
-                {
-                    continue;
-                }
+        if (showSelectAll)
+        {
+            items.Add(new SelectListItem(S["All content types"], string.Empty));
+        };
 
-                items.Add(new SelectListItem(definition.DisplayName, definition.Name, string.Equals(definition.Name, selectedContentType, StringComparison.Ordinal)));
+        foreach (var definition in definitions)
+        {
+            if (!definition.IsListable()
+                || !await _authorizationService.AuthorizeContentTypeAsync(User, CommonPermissions.ListContent, definition.Name, currentUserId))
+            {
+                continue;
             }
 
-            return items;
+            items.Add(new SelectListItem(definition.DisplayName, definition.Name, string.Equals(definition.Name, selectedContentType, StringComparison.Ordinal)));
         }
 
-        private async Task<ContentItem> CreateContentItemOwnedByCurrentUserAsync(string contentType)
-        {
-            var contentItem = await _contentManager.NewAsync(contentType);
-            contentItem.Owner = CurrentUserId();
+        return items;
+    }
 
-            return contentItem;
-        }
+    private async Task<ContentItem> CreateContentItemOwnedByCurrentUserAsync(string contentType)
+    {
+        var contentItem = await _contentManager.NewAsync(contentType);
+        contentItem.Owner = CurrentUserId();
+
+        return contentItem;
+    }
 
-        private string _currentUserId;
+    private string _currentUserId;
 
-        private string CurrentUserId()
-            => _currentUserId ??= User.FindFirstValue(ClaimTypes.NameIdentifier);
+    private string CurrentUserId()
+        => _currentUserId ??= User.FindFirstValue(ClaimTypes.NameIdentifier);
 
-        private async Task<bool> IsAuthorizedAsync(Permission permission)
-            => await _authorizationService.AuthorizeAsync(User, permission);
+    private async Task<bool> IsAuthorizedAsync(Permission permission)
+        => await _authorizationService.AuthorizeAsync(User, permission);
 
-        private async Task<bool> IsAuthorizedAsync(Permission permission, object resource)
-            => await _authorizationService.AuthorizeAsync(User, permission, resource);
-    }
+    private async Task<bool> IsAuthorizedAsync(Permission permission, object resource)
+        => await _authorizationService.AuthorizeAsync(User, permission, resource);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Controllers/ItemController.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Controllers/ItemController.cs
index 66f5aaeb5c5..0465be29eab 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Controllers/ItemController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Controllers/ItemController.cs
@@ -5,67 +5,66 @@
 using OrchardCore.ContentManagement.Display;
 using OrchardCore.DisplayManagement.ModelBinding;
 
-namespace OrchardCore.Contents.Controllers
+namespace OrchardCore.Contents.Controllers;
+
+public class ItemController : Controller, IUpdateModel
 {
-    public class ItemController : Controller, IUpdateModel
+    private readonly IContentManager _contentManager;
+    private readonly IContentItemDisplayManager _contentItemDisplayManager;
+    private readonly IAuthorizationService _authorizationService;
+
+    public ItemController(
+        IContentManager contentManager,
+        IContentItemDisplayManager contentItemDisplayManager,
+        IAuthorizationService authorizationService)
+    {
+        _contentManager = contentManager;
+        _contentItemDisplayManager = contentItemDisplayManager;
+        _authorizationService = authorizationService;
+    }
+
+    public async Task<IActionResult> Display(string contentItemId, string jsonPath)
     {
-        private readonly IContentManager _contentManager;
-        private readonly IContentItemDisplayManager _contentItemDisplayManager;
-        private readonly IAuthorizationService _authorizationService;
+        var contentItem = await _contentManager.GetAsync(contentItemId, jsonPath);
 
-        public ItemController(
-            IContentManager contentManager,
-            IContentItemDisplayManager contentItemDisplayManager,
-            IAuthorizationService authorizationService)
+        if (contentItem == null)
         {
-            _contentManager = contentManager;
-            _contentItemDisplayManager = contentItemDisplayManager;
-            _authorizationService = authorizationService;
+            return NotFound();
         }
 
-        public async Task<IActionResult> Display(string contentItemId, string jsonPath)
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ViewContent, contentItem))
         {
-            var contentItem = await _contentManager.GetAsync(contentItemId, jsonPath);
-
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
-
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ViewContent, contentItem))
-            {
-                return this.ChallengeOrForbid();
-            }
+            return this.ChallengeOrForbid();
+        }
 
-            var model = await _contentItemDisplayManager.BuildDisplayAsync(contentItem, this);
+        var model = await _contentItemDisplayManager.BuildDisplayAsync(contentItem, this);
 
-            return View(model);
-        }
+        return View(model);
+    }
 
-        public async Task<IActionResult> Preview(string contentItemId)
+    public async Task<IActionResult> Preview(string contentItemId)
+    {
+        if (contentItemId == null)
         {
-            if (contentItemId == null)
-            {
-                return NotFound();
-            }
+            return NotFound();
+        }
 
-            var versionOptions = VersionOptions.Latest;
+        var versionOptions = VersionOptions.Latest;
 
-            var contentItem = await _contentManager.GetAsync(contentItemId, versionOptions);
+        var contentItem = await _contentManager.GetAsync(contentItemId, versionOptions);
 
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
+        if (contentItem == null)
+        {
+            return NotFound();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.PreviewContent, contentItem))
-            {
-                return this.ChallengeOrForbid();
-            }
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.PreviewContent, contentItem))
+        {
+            return this.ChallengeOrForbid();
+        }
 
-            var model = await _contentItemDisplayManager.BuildDisplayAsync(contentItem, this);
+        var model = await _contentItemDisplayManager.BuildDisplayAsync(contentItem, this);
 
-            return View(model);
-        }
+        return View(model);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanContentDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanContentDriver.cs
index 0dd98c0b9cf..e6f03b2643d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanContentDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanContentDriver.cs
@@ -6,27 +6,26 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Contents.Deployment.AddToDeploymentPlan
+namespace OrchardCore.Contents.Deployment.AddToDeploymentPlan;
+
+public sealed class AddToDeploymentPlanContentDriver : ContentDisplayDriver
 {
-    public sealed class AddToDeploymentPlanContentDriver : ContentDisplayDriver
-    {
-        private readonly IDeploymentPlanService _deploymentPlanService;
+    private readonly IDeploymentPlanService _deploymentPlanService;
 
-        public AddToDeploymentPlanContentDriver(IDeploymentPlanService deploymentPlanService)
-        {
-            _deploymentPlanService = deploymentPlanService;
-        }
+    public AddToDeploymentPlanContentDriver(IDeploymentPlanService deploymentPlanService)
+    {
+        _deploymentPlanService = deploymentPlanService;
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(ContentItem model, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                    Dynamic("AddToDeploymentPlan_Modal__ActionDeploymentPlan")
-                        .Location("SummaryAdmin", "ActionsMenu:30")
-                        .RenderWhen(async () => await _deploymentPlanService.DoesUserHavePermissionsAsync()),
-                    Shape("AddToDeploymentPlan_SummaryAdmin__Button__Actions", new ContentItemViewModel(model))
-                        .Location("SummaryAdmin", "ActionsMenu:30")
-                        .RenderWhen(async () => await _deploymentPlanService.DoesUserHavePermissionsAsync())
-                );
-        }
+    public override Task<IDisplayResult> DisplayAsync(ContentItem model, BuildDisplayContext context)
+    {
+        return CombineAsync(
+                Dynamic("AddToDeploymentPlan_Modal__ActionDeploymentPlan")
+                    .Location("SummaryAdmin", "ActionsMenu:30")
+                    .RenderWhen(async () => await _deploymentPlanService.DoesUserHavePermissionsAsync()),
+                Shape("AddToDeploymentPlan_SummaryAdmin__Button__Actions", new ContentItemViewModel(model))
+                    .Location("SummaryAdmin", "ActionsMenu:30")
+                    .RenderWhen(async () => await _deploymentPlanService.DoesUserHavePermissionsAsync())
+            );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanContentsAdminListDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanContentsAdminListDisplayDriver.cs
index e0de100fab8..adab1037e88 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanContentsAdminListDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanContentsAdminListDisplayDriver.cs
@@ -4,28 +4,27 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Contents.Deployment.AddToDeploymentPlan
+namespace OrchardCore.Contents.Deployment.AddToDeploymentPlan;
+
+public sealed class AddToDeploymentPlanContentsAdminListDisplayDriver : DisplayDriver<ContentOptionsViewModel>
 {
-    public sealed class AddToDeploymentPlanContentsAdminListDisplayDriver : DisplayDriver<ContentOptionsViewModel>
+    private readonly IDeploymentPlanService _deploymentPlanService;
+
+    public AddToDeploymentPlanContentsAdminListDisplayDriver(IDeploymentPlanService deploymentPlanService)
     {
-        private readonly IDeploymentPlanService _deploymentPlanService;
+        _deploymentPlanService = deploymentPlanService;
+    }
 
-        public AddToDeploymentPlanContentsAdminListDisplayDriver(IDeploymentPlanService deploymentPlanService)
+    public override async Task<IDisplayResult> DisplayAsync(ContentOptionsViewModel model, BuildDisplayContext context)
+    {
+        if (await _deploymentPlanService.DoesUserHavePermissionsAsync())
         {
-            _deploymentPlanService = deploymentPlanService;
+            return Combine(
+                Dynamic("AddToDeploymentPlan__Button__ContentsBulkActions").Location("BulkActions", "Content:20"),
+                Dynamic("AddToDeploymentPlan_Modal__ContentsBulkActionsDeploymentPlan").Location("BulkActions", "Content:20")
+            );
         }
 
-        public override async Task<IDisplayResult> DisplayAsync(ContentOptionsViewModel model, BuildDisplayContext context)
-        {
-            if (await _deploymentPlanService.DoesUserHavePermissionsAsync())
-            {
-                return Combine(
-                    Dynamic("AddToDeploymentPlan__Button__ContentsBulkActions").Location("BulkActions", "Content:20"),
-                    Dynamic("AddToDeploymentPlan_Modal__ContentsBulkActionsDeploymentPlan").Location("BulkActions", "Content:20")
-                );
-            }
-
-            return null;
-        }
+        return null;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanController.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanController.cs
index a156987b30e..bce8538412c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanController.cs
@@ -13,132 +13,131 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.Contents.Deployment.AddToDeploymentPlan
+namespace OrchardCore.Contents.Deployment.AddToDeploymentPlan;
+
+[Feature("OrchardCore.Contents.Deployment.AddToDeploymentPlan")]
+[Admin("AddToDeploymentPlan/{action}/{deploymentPlanId}", AdminAttribute.NameFromControllerAndAction)]
+public class AddToDeploymentPlanController : Controller
 {
-    [Feature("OrchardCore.Contents.Deployment.AddToDeploymentPlan")]
-    [Admin("AddToDeploymentPlan/{action}/{deploymentPlanId}", AdminAttribute.NameFromControllerAndAction)]
-    public class AddToDeploymentPlanController : Controller
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IContentManager _contentManager;
+    private readonly ISession _session;
+    private readonly IEnumerable<IDeploymentStepFactory> _factories;
+    private readonly INotifier _notifier;
+    protected readonly IHtmlLocalizer H;
+
+    public AddToDeploymentPlanController(
+        IAuthorizationService authorizationService,
+        IContentManager contentManager,
+        ISession session,
+        IEnumerable<IDeploymentStepFactory> factories,
+        INotifier notifier,
+        IHtmlLocalizer<AddToDeploymentPlanController> htmlLocalizer
+        )
+    {
+        _authorizationService = authorizationService;
+        _contentManager = contentManager;
+        _session = session;
+        _factories = factories;
+        _notifier = notifier;
+        H = htmlLocalizer;
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> AddContentItem(long deploymentPlanId, string returnUrl, string contentItemId)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IContentManager _contentManager;
-        private readonly ISession _session;
-        private readonly IEnumerable<IDeploymentStepFactory> _factories;
-        private readonly INotifier _notifier;
-        protected readonly IHtmlLocalizer H;
-
-        public AddToDeploymentPlanController(
-            IAuthorizationService authorizationService,
-            IContentManager contentManager,
-            ISession session,
-            IEnumerable<IDeploymentStepFactory> factories,
-            INotifier notifier,
-            IHtmlLocalizer<AddToDeploymentPlanController> htmlLocalizer
-            )
+        if (!(await _authorizationService.AuthorizeAsync(User, OrchardCore.Deployment.CommonPermissions.ManageDeploymentPlan) &&
+            await _authorizationService.AuthorizeAsync(User, OrchardCore.Deployment.CommonPermissions.Export)
+            ))
         {
-            _authorizationService = authorizationService;
-            _contentManager = contentManager;
-            _session = session;
-            _factories = factories;
-            _notifier = notifier;
-            H = htmlLocalizer;
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> AddContentItem(long deploymentPlanId, string returnUrl, string contentItemId)
-        {
-            if (!(await _authorizationService.AuthorizeAsync(User, OrchardCore.Deployment.CommonPermissions.ManageDeploymentPlan) &&
-                await _authorizationService.AuthorizeAsync(User, OrchardCore.Deployment.CommonPermissions.Export)
-                ))
-            {
-                return Forbid();
-            }
+        var deploymentPlan = await _session.GetAsync<DeploymentPlan>(deploymentPlanId);
 
-            var deploymentPlan = await _session.GetAsync<DeploymentPlan>(deploymentPlanId);
+        if (deploymentPlan == null)
+        {
+            return NotFound();
+        }
 
-            if (deploymentPlan == null)
-            {
-                return NotFound();
-            }
+        var contentItem = await _contentManager.GetAsync(contentItemId);
 
-            var contentItem = await _contentManager.GetAsync(contentItemId);
+        if (contentItem == null)
+        {
+            return NotFound();
+        }
 
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
+        // Export permission is required as the overriding permission.
+        // Requesting EditContent would allow custom permissions to deny access to this content item.
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditContent, contentItem))
+        {
+            return Forbid();
+        }
 
-            // Export permission is required as the overriding permission.
-            // Requesting EditContent would allow custom permissions to deny access to this content item.
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditContent, contentItem))
-            {
-                return Forbid();
-            }
+        var stepFactory = _factories.FirstOrDefault(x => x.Name == nameof(ContentItemDeploymentStep));
 
-            var stepFactory = _factories.FirstOrDefault(x => x.Name == nameof(ContentItemDeploymentStep));
+        if (stepFactory == null)
+        {
+            return BadRequest();
+        }
 
-            if (stepFactory == null)
-            {
-                return BadRequest();
-            }
+        var step = (ContentItemDeploymentStep)stepFactory.Create();
 
-            var step = (ContentItemDeploymentStep)stepFactory.Create();
+        step.ContentItemId = contentItem.ContentItemId;
 
-            step.ContentItemId = contentItem.ContentItemId;
+        deploymentPlan.DeploymentSteps.Add(step);
 
-            deploymentPlan.DeploymentSteps.Add(step);
+        await _notifier.SuccessAsync(H["Content added successfully to the deployment plan."]);
 
-            await _notifier.SuccessAsync(H["Content added successfully to the deployment plan."]);
+        await _session.SaveAsync(deploymentPlan);
 
-            await _session.SaveAsync(deploymentPlan);
+        return this.LocalRedirect(returnUrl, true);
+    }
 
+    [HttpPost]
+    public async Task<IActionResult> AddContentItems(long deploymentPlanId, string returnUrl, IEnumerable<long> itemIds)
+    {
+        if (itemIds?.Count() == 0)
+        {
             return this.LocalRedirect(returnUrl, true);
         }
 
-        [HttpPost]
-        public async Task<IActionResult> AddContentItems(long deploymentPlanId, string returnUrl, IEnumerable<long> itemIds)
+        if (!(await _authorizationService.AuthorizeAsync(User, OrchardCore.Deployment.CommonPermissions.ManageDeploymentPlan) &&
+            await _authorizationService.AuthorizeAsync(User, OrchardCore.Deployment.CommonPermissions.Export)
+            ))
         {
-            if (itemIds?.Count() == 0)
-            {
-                return this.LocalRedirect(returnUrl, true);
-            }
-
-            if (!(await _authorizationService.AuthorizeAsync(User, OrchardCore.Deployment.CommonPermissions.ManageDeploymentPlan) &&
-                await _authorizationService.AuthorizeAsync(User, OrchardCore.Deployment.CommonPermissions.Export)
-                ))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var deploymentPlan = await _session.GetAsync<DeploymentPlan>(deploymentPlanId);
+        var deploymentPlan = await _session.GetAsync<DeploymentPlan>(deploymentPlanId);
 
-            if (deploymentPlan == null)
-            {
-                return NotFound();
-            }
+        if (deploymentPlan == null)
+        {
+            return NotFound();
+        }
 
-            var contentItems = await _session.Query<ContentItem, ContentItemIndex>().Where(x => x.DocumentId.IsIn(itemIds) && x.Published).ListAsync();
+        var contentItems = await _session.Query<ContentItem, ContentItemIndex>().Where(x => x.DocumentId.IsIn(itemIds) && x.Published).ListAsync();
 
-            foreach (var item in contentItems)
+        foreach (var item in contentItems)
+        {
+            // Export permission is required as the overriding permission.
+            // Requesting EditContent would allow custom permissions to deny access to this content item.
+            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditContent, item))
             {
-                // Export permission is required as the overriding permission.
-                // Requesting EditContent would allow custom permissions to deny access to this content item.
-                if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditContent, item))
-                {
-                    await _notifier.WarningAsync(H["Couldn't add selected content to deployment plan."]);
-
-                    return Forbid();
-                }
-                var step = (ContentItemDeploymentStep)_factories.FirstOrDefault(x => x.Name == nameof(ContentItemDeploymentStep)).Create();
-                step.ContentItemId = item.ContentItemId;
-
-                deploymentPlan.DeploymentSteps.Add(step);
+                await _notifier.WarningAsync(H["Couldn't add selected content to deployment plan."]);
+
+                return Forbid();
             }
+            var step = (ContentItemDeploymentStep)_factories.FirstOrDefault(x => x.Name == nameof(ContentItemDeploymentStep)).Create();
+            step.ContentItemId = item.ContentItemId;
+
+            deploymentPlan.DeploymentSteps.Add(step);
+        }
 
-            await _notifier.SuccessAsync(H["Content added successfully to the deployment plan."]);
+        await _notifier.SuccessAsync(H["Content added successfully to the deployment plan."]);
 
-            await _session.SaveAsync(deploymentPlan);
+        await _session.SaveAsync(deploymentPlan);
 
-            return this.LocalRedirect(returnUrl, true);
-        }
+        return this.LocalRedirect(returnUrl, true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanStartup.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanStartup.cs
index e9d9f977098..74a5891450e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanStartup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanStartup.cs
@@ -5,16 +5,15 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Contents.Deployment.AddToDeploymentPlan
+namespace OrchardCore.Contents.Deployment.AddToDeploymentPlan;
+
+[Feature("OrchardCore.Contents.Deployment.AddToDeploymentPlan")]
+public sealed class AddToDeploymentPlanStartup : StartupBase
 {
-    [Feature("OrchardCore.Contents.Deployment.AddToDeploymentPlan")]
-    public sealed class AddToDeploymentPlanStartup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<ContentItemDeploymentSource, ContentItemDeploymentStep, ContentItemDeploymentStepDriver>();
-            services.AddScoped<IContentDisplayDriver, AddToDeploymentPlanContentDriver>();
-            services.AddScoped<IDisplayDriver<ContentOptionsViewModel>, AddToDeploymentPlanContentsAdminListDisplayDriver>();
-        }
+        services.AddDeployment<ContentItemDeploymentSource, ContentItemDeploymentStep, ContentItemDeploymentStepDriver>();
+        services.AddScoped<IContentDisplayDriver, AddToDeploymentPlanContentDriver>();
+        services.AddScoped<IDisplayDriver<ContentOptionsViewModel>, AddToDeploymentPlanContentsAdminListDisplayDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/ContentItemDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/ContentItemDeploymentSource.cs
index ab433038e8a..7c173961ce3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/ContentItemDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/ContentItemDeploymentSource.cs
@@ -4,50 +4,49 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Contents.Deployment.AddToDeploymentPlan
+namespace OrchardCore.Contents.Deployment.AddToDeploymentPlan;
+
+public class ContentItemDeploymentSource : IDeploymentSource
 {
-    public class ContentItemDeploymentSource : IDeploymentSource
+    private readonly IContentManager _contentManager;
+
+    public ContentItemDeploymentSource(IContentManager contentManager)
     {
-        private readonly IContentManager _contentManager;
+        _contentManager = contentManager;
+    }
 
-        public ContentItemDeploymentSource(IContentManager contentManager)
-        {
-            _contentManager = contentManager;
-        }
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        var contentItemDeploymentStep = step as ContentItemDeploymentStep;
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        if (contentItemDeploymentStep == null || contentItemDeploymentStep.ContentItemId == null)
         {
-            var contentItemDeploymentStep = step as ContentItemDeploymentStep;
-
-            if (contentItemDeploymentStep == null || contentItemDeploymentStep.ContentItemId == null)
-            {
-                return;
-            }
+            return;
+        }
 
-            var contentItem = await _contentManager.GetAsync(contentItemDeploymentStep.ContentItemId);
+        var contentItem = await _contentManager.GetAsync(contentItemDeploymentStep.ContentItemId);
 
-            if (contentItem == null)
-            {
-                return;
-            }
+        if (contentItem == null)
+        {
+            return;
+        }
 
-            var jContentItem = JObject.FromObject(contentItem);
-            jContentItem.Remove(nameof(ContentItem.Id));
+        var jContentItem = JObject.FromObject(contentItem);
+        jContentItem.Remove(nameof(ContentItem.Id));
 
-            var contentStep = result.Steps.FirstOrDefault(s => s["name"]?.ToString() == "Content");
-            if (contentStep != null)
-            {
-                var data = contentStep["data"] as JsonArray;
-                data.Add(jContentItem);
-            }
-            else
+        var contentStep = result.Steps.FirstOrDefault(s => s["name"]?.ToString() == "Content");
+        if (contentStep != null)
+        {
+            var data = contentStep["data"] as JsonArray;
+            data.Add(jContentItem);
+        }
+        else
+        {
+            result.Steps.Add(new JsonObject
             {
-                result.Steps.Add(new JsonObject
-                {
-                    ["name"] = "Content",
-                    ["data"] = new JsonArray(jContentItem),
-                });
-            }
+                ["name"] = "Content",
+                ["data"] = new JsonArray(jContentItem),
+            });
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/ContentItemDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/ContentItemDeploymentStep.cs
index cfe713be810..1767359558e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/ContentItemDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/ContentItemDeploymentStep.cs
@@ -1,17 +1,16 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Contents.Deployment.AddToDeploymentPlan
+namespace OrchardCore.Contents.Deployment.AddToDeploymentPlan;
+
+/// <summary>
+/// Adds a content item to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class ContentItemDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds a content item to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class ContentItemDeploymentStep : DeploymentStep
+    public ContentItemDeploymentStep()
     {
-        public ContentItemDeploymentStep()
-        {
-            Name = nameof(ContentItemDeploymentStep);
-        }
-
-        public string ContentItemId { get; set; }
+        Name = nameof(ContentItemDeploymentStep);
     }
+
+    public string ContentItemId { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/ContentItemDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/ContentItemDeploymentStepDriver.cs
index 123596dd65b..33ad88b56a6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/ContentItemDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/ContentItemDeploymentStepDriver.cs
@@ -6,55 +6,54 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Contents.Deployment.AddToDeploymentPlan
+namespace OrchardCore.Contents.Deployment.AddToDeploymentPlan;
+
+public sealed class ContentItemDeploymentStepDriver : DisplayDriver<DeploymentStep, ContentItemDeploymentStep>
 {
-    public sealed class ContentItemDeploymentStepDriver : DisplayDriver<DeploymentStep, ContentItemDeploymentStep>
+    private readonly IContentManager _contentManager;
+
+    internal readonly IStringLocalizer S;
+
+    public ContentItemDeploymentStepDriver(IContentManager contentManager,
+        IStringLocalizer<ContentItemDeploymentStepDriver> stringLocalizer)
     {
-        private readonly IContentManager _contentManager;
+        _contentManager = contentManager;
+        S = stringLocalizer;
+    }
 
-        internal readonly IStringLocalizer S;
+    public override Task<IDisplayResult> DisplayAsync(ContentItemDeploymentStep step, BuildDisplayContext context)
+    {
+        return
+            CombineAsync(
+                View("ContentItemDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("ContentItemDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public ContentItemDeploymentStepDriver(IContentManager contentManager,
-            IStringLocalizer<ContentItemDeploymentStepDriver> stringLocalizer)
+    public override IDisplayResult Edit(ContentItemDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<ContentItemDeploymentStepViewModel>("ContentItemDeploymentStep_Fields_Edit", model =>
         {
-            _contentManager = contentManager;
-            S = stringLocalizer;
-        }
+            model.ContentItemId = step.ContentItemId;
+        }).Location("Content");
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(ContentItemDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("ContentItemDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("ContentItemDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+    public override async Task<IDisplayResult> UpdateAsync(ContentItemDeploymentStep step, UpdateEditorContext context)
+    {
+        var model = new ContentItemDeploymentStepViewModel();
 
-        public override IDisplayResult Edit(ContentItemDeploymentStep step, BuildEditorContext context)
+        await context.Updater.TryUpdateModelAsync(model, Prefix, x => x.ContentItemId);
+        var contentItem = await _contentManager.GetAsync(model.ContentItemId);
+
+        if (contentItem == null)
         {
-            return Initialize<ContentItemDeploymentStepViewModel>("ContentItemDeploymentStep_Fields_Edit", model =>
-            {
-                model.ContentItemId = step.ContentItemId;
-            }).Location("Content");
+            context.Updater.ModelState.AddModelError(Prefix, nameof(step.ContentItemId), S["Your content item does not exist."]);
         }
-
-        public override async Task<IDisplayResult> UpdateAsync(ContentItemDeploymentStep step, UpdateEditorContext context)
+        else
         {
-            var model = new ContentItemDeploymentStepViewModel();
-
-            await context.Updater.TryUpdateModelAsync(model, Prefix, x => x.ContentItemId);
-            var contentItem = await _contentManager.GetAsync(model.ContentItemId);
-
-            if (contentItem == null)
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(step.ContentItemId), S["Your content item does not exist."]);
-            }
-            else
-            {
-                step.ContentItemId = model.ContentItemId;
-            }
-
-            return Edit(step, context);
+            step.ContentItemId = model.ContentItemId;
         }
+
+        return Edit(step, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/ContentItemDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/ContentItemDeploymentStepViewModel.cs
index 21d040d96c5..616cec0a295 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/ContentItemDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/ContentItemDeploymentStepViewModel.cs
@@ -1,10 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Contents.Deployment.AddToDeploymentPlan
+namespace OrchardCore.Contents.Deployment.AddToDeploymentPlan;
+
+public class ContentItemDeploymentStepViewModel
 {
-    public class ContentItemDeploymentStepViewModel
-    {
-        [Required]
-        public string ContentItemId { get; set; }
-    }
+    [Required]
+    public string ContentItemId { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AllContentDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AllContentDeploymentSource.cs
index 25c2c8002c1..8e2faf2bf86 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AllContentDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AllContentDeploymentSource.cs
@@ -5,55 +5,54 @@
 using OrchardCore.Deployment;
 using YesSql;
 
-namespace OrchardCore.Contents.Deployment
+namespace OrchardCore.Contents.Deployment;
+
+public class AllContentDeploymentSource : IDeploymentSource
 {
-    public class AllContentDeploymentSource : IDeploymentSource
+    private readonly ISession _session;
+
+    public AllContentDeploymentSource(ISession session)
+    {
+        _session = session;
+    }
+
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
     {
-        private readonly ISession _session;
+        var allContentStep = step as AllContentDeploymentStep;
 
-        public AllContentDeploymentSource(ISession session)
+        if (allContentStep == null)
         {
-            _session = session;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        var data = new JsonArray();
+        result.Steps.Add(new JsonObject
         {
-            var allContentStep = step as AllContentDeploymentStep;
+            ["name"] = "Content",
+            ["data"] = data,
+        });
 
-            if (allContentStep == null)
-            {
-                return;
-            }
+        foreach (var contentItem in await _session.Query<ContentItem, ContentItemIndex>(x => x.Published).ListAsync())
+        {
+            var objectData = JObject.FromObject(contentItem);
 
-            var data = new JsonArray();
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "Content",
-                ["data"] = data,
-            });
+            // Don't serialize the Id as it could be interpreted as an updated object when added back to YesSql
+            objectData.Remove(nameof(ContentItem.Id));
 
-            foreach (var contentItem in await _session.Query<ContentItem, ContentItemIndex>(x => x.Published).ListAsync())
+            if (allContentStep.ExportAsSetupRecipe)
             {
-                var objectData = JObject.FromObject(contentItem);
-
-                // Don't serialize the Id as it could be interpreted as an updated object when added back to YesSql
-                objectData.Remove(nameof(ContentItem.Id));
-
-                if (allContentStep.ExportAsSetupRecipe)
-                {
-                    objectData[nameof(ContentItem.Owner)] = "[js: parameters('AdminUserId')]";
-                    objectData[nameof(ContentItem.Author)] = "[js: parameters('AdminUsername')]";
-                    objectData[nameof(ContentItem.ContentItemId)] = "[js: uuid()]";
-                    objectData.Remove(nameof(ContentItem.ContentItemVersionId));
-                    objectData.Remove(nameof(ContentItem.CreatedUtc));
-                    objectData.Remove(nameof(ContentItem.ModifiedUtc));
-                    objectData.Remove(nameof(ContentItem.PublishedUtc));
-                }
-
-                data.Add(objectData);
+                objectData[nameof(ContentItem.Owner)] = "[js: parameters('AdminUserId')]";
+                objectData[nameof(ContentItem.Author)] = "[js: parameters('AdminUsername')]";
+                objectData[nameof(ContentItem.ContentItemId)] = "[js: uuid()]";
+                objectData.Remove(nameof(ContentItem.ContentItemVersionId));
+                objectData.Remove(nameof(ContentItem.CreatedUtc));
+                objectData.Remove(nameof(ContentItem.ModifiedUtc));
+                objectData.Remove(nameof(ContentItem.PublishedUtc));
             }
 
-            return;
+            data.Add(objectData);
         }
+
+        return;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AllContentDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AllContentDeploymentStep.cs
index 5b6c85611db..eb66caa6577 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AllContentDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AllContentDeploymentStep.cs
@@ -1,17 +1,16 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Contents.Deployment
+namespace OrchardCore.Contents.Deployment;
+
+/// <summary>
+/// Adds all content items to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class AllContentDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds all content items to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class AllContentDeploymentStep : DeploymentStep
+    public AllContentDeploymentStep()
     {
-        public AllContentDeploymentStep()
-        {
-            Name = "AllContent";
-        }
-
-        public bool ExportAsSetupRecipe { get; set; }
+        Name = "AllContent";
     }
+
+    public bool ExportAsSetupRecipe { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AllContentDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AllContentDeploymentStepDriver.cs
index b7da3da0e4b..88490c3c447 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AllContentDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AllContentDeploymentStepDriver.cs
@@ -4,32 +4,31 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Contents.Deployment
+namespace OrchardCore.Contents.Deployment;
+
+public sealed class AllContentDeploymentStepDriver : DisplayDriver<DeploymentStep, AllContentDeploymentStep>
 {
-    public sealed class AllContentDeploymentStepDriver : DisplayDriver<DeploymentStep, AllContentDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(AllContentDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(AllContentDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("AllContentDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("AllContentDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("AllContentDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("AllContentDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(AllContentDeploymentStep step, BuildEditorContext context)
+    public override IDisplayResult Edit(AllContentDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<AllContentDeploymentStepViewModel>("AllContentDeploymentStep_Fields_Edit", model =>
         {
-            return Initialize<AllContentDeploymentStepViewModel>("AllContentDeploymentStep_Fields_Edit", model =>
-            {
-                model.ExportAsSetupRecipe = step.ExportAsSetupRecipe;
-            }).Location("Content");
-        }
+            model.ExportAsSetupRecipe = step.ExportAsSetupRecipe;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(AllContentDeploymentStep step, UpdateEditorContext context)
-        {
-            await context.Updater.TryUpdateModelAsync(step, Prefix, x => x.ExportAsSetupRecipe);
+    public override async Task<IDisplayResult> UpdateAsync(AllContentDeploymentStep step, UpdateEditorContext context)
+    {
+        await context.Updater.TryUpdateModelAsync(step, Prefix, x => x.ExportAsSetupRecipe);
 
-            return Edit(step, context);
-        }
+        return Edit(step, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ContentDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ContentDeploymentSource.cs
index 02cd18cdad5..1e486d79e45 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ContentDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ContentDeploymentSource.cs
@@ -6,61 +6,60 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.Contents.Deployment
+namespace OrchardCore.Contents.Deployment;
+
+public class ContentDeploymentSource : IDeploymentSource
 {
-    public class ContentDeploymentSource : IDeploymentSource
+    private readonly ISession _session;
+
+    public ContentDeploymentSource(ISession session)
+    {
+        _session = session;
+    }
+
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
     {
-        private readonly ISession _session;
+        // TODO: Batch and create separate content files in the result.
+
+        var contentStep = step as ContentDeploymentStep;
 
-        public ContentDeploymentSource(ISession session)
+        if (contentStep == null)
         {
-            _session = session;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        var data = new JsonArray();
+
+        foreach (var contentItem in await _session.Query<ContentItem, ContentItemIndex>(x => x.Published && x.ContentType.IsIn(contentStep.ContentTypes)).ListAsync())
         {
-            // TODO: Batch and create separate content files in the result.
+            var objectData = JObject.FromObject(contentItem);
 
-            var contentStep = step as ContentDeploymentStep;
+            // Don't serialize the Id as it could be interpreted as an updated object when added back to YesSql.
+            objectData.Remove(nameof(ContentItem.Id));
 
-            if (contentStep == null)
+            if (contentStep.ExportAsSetupRecipe)
             {
-                return;
+                objectData[nameof(ContentItem.Owner)] = "[js: parameters('AdminUserId')]";
+                objectData[nameof(ContentItem.Author)] = "[js: parameters('AdminUsername')]";
+                objectData[nameof(ContentItem.ContentItemId)] = "[js: uuid()]";
+                objectData.Remove(nameof(ContentItem.ContentItemVersionId));
+                objectData.Remove(nameof(ContentItem.CreatedUtc));
+                objectData.Remove(nameof(ContentItem.ModifiedUtc));
+                objectData.Remove(nameof(ContentItem.PublishedUtc));
             }
 
-            var data = new JsonArray();
-
-            foreach (var contentItem in await _session.Query<ContentItem, ContentItemIndex>(x => x.Published && x.ContentType.IsIn(contentStep.ContentTypes)).ListAsync())
-            {
-                var objectData = JObject.FromObject(contentItem);
-
-                // Don't serialize the Id as it could be interpreted as an updated object when added back to YesSql.
-                objectData.Remove(nameof(ContentItem.Id));
-
-                if (contentStep.ExportAsSetupRecipe)
-                {
-                    objectData[nameof(ContentItem.Owner)] = "[js: parameters('AdminUserId')]";
-                    objectData[nameof(ContentItem.Author)] = "[js: parameters('AdminUsername')]";
-                    objectData[nameof(ContentItem.ContentItemId)] = "[js: uuid()]";
-                    objectData.Remove(nameof(ContentItem.ContentItemVersionId));
-                    objectData.Remove(nameof(ContentItem.CreatedUtc));
-                    objectData.Remove(nameof(ContentItem.ModifiedUtc));
-                    objectData.Remove(nameof(ContentItem.PublishedUtc));
-                }
-
-                data.Add(objectData);
-            }
+            data.Add(objectData);
+        }
 
-            if (data.HasValues())
+        if (data.HasValues())
+        {
+            var jobj = new JsonObject
             {
-                var jobj = new JsonObject
-                {
-                    ["name"] = "content",
-                    ["data"] = data,
-                };
+                ["name"] = "content",
+                ["data"] = data,
+            };
 
-                result.Steps.Add(jobj);
-            }
+            result.Steps.Add(jobj);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ContentDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ContentDeploymentStep.cs
index 3947aba560c..2ee8502f96e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ContentDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ContentDeploymentStep.cs
@@ -1,18 +1,17 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Contents.Deployment
+namespace OrchardCore.Contents.Deployment;
+
+/// <summary>
+/// Adds all content items of a specific type to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class ContentDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds all content items of a specific type to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class ContentDeploymentStep : DeploymentStep
+    public ContentDeploymentStep()
     {
-        public ContentDeploymentStep()
-        {
-            Name = "ContentDeploymentStep";
-        }
-
-        public string[] ContentTypes { get; set; }
-        public bool ExportAsSetupRecipe { get; set; }
+        Name = "ContentDeploymentStep";
     }
+
+    public string[] ContentTypes { get; set; }
+    public bool ExportAsSetupRecipe { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ContentDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ContentDeploymentStepDriver.cs
index 17ac9fefde6..2cf525c2e13 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ContentDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ContentDeploymentStepDriver.cs
@@ -4,36 +4,35 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Contents.Deployment
+namespace OrchardCore.Contents.Deployment;
+
+public sealed class ContentDeploymentStepDriver : DisplayDriver<DeploymentStep, ContentDeploymentStep>
 {
-    public sealed class ContentDeploymentStepDriver : DisplayDriver<DeploymentStep, ContentDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(ContentDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(ContentDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("ContentDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("ContentDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("ContentDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("ContentDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(ContentDeploymentStep step, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<ContentDeploymentStepViewModel>("ContentDeploymentStep_Fields_Edit", model =>
         {
-            return Initialize<ContentDeploymentStepViewModel>("ContentDeploymentStep_Fields_Edit", model =>
-            {
-                model.ContentTypes = step.ContentTypes;
-                model.ExportAsSetupRecipe = step.ExportAsSetupRecipe;
-            }).Location("Content");
-        }
+            model.ContentTypes = step.ContentTypes;
+            model.ExportAsSetupRecipe = step.ExportAsSetupRecipe;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentDeploymentStep step, UpdateEditorContext context)
-        {
-            // Initializes the value to empty otherwise the model is not updated if no type is selected.
-            step.ContentTypes = [];
+    public override async Task<IDisplayResult> UpdateAsync(ContentDeploymentStep step, UpdateEditorContext context)
+    {
+        // Initializes the value to empty otherwise the model is not updated if no type is selected.
+        step.ContentTypes = [];
 
-            await context.Updater.TryUpdateModelAsync(step, Prefix, x => x.ContentTypes, x => x.ExportAsSetupRecipe);
+        await context.Updater.TryUpdateModelAsync(step, Prefix, x => x.ContentTypes, x => x.ExportAsSetupRecipe);
 
-            return Edit(step, context);
-        }
+        return Edit(step, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/Download/DisplayJsonContentItemViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/Download/DisplayJsonContentItemViewModel.cs
index 68475a65152..85114c54240 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/Download/DisplayJsonContentItemViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/Download/DisplayJsonContentItemViewModel.cs
@@ -1,10 +1,9 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Contents.Deployment.Download
+namespace OrchardCore.Contents.Deployment.Download;
+
+public class DisplayJsonContentItemViewModel
 {
-    public class DisplayJsonContentItemViewModel
-    {
-        public ContentItem ContentItem { get; set; }
-        public string ContentItemJson { get; set; }
-    }
+    public ContentItem ContentItem { get; set; }
+    public string ContentItemJson { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/Download/DownloadContentDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/Download/DownloadContentDriver.cs
index d799bf59d1d..ee2b94e777f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/Download/DownloadContentDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/Download/DownloadContentDriver.cs
@@ -6,28 +6,27 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Contents.Deployment.Download
+namespace OrchardCore.Contents.Deployment.Download;
+
+public sealed class DownloadContentDriver : ContentDisplayDriver
 {
-    public sealed class DownloadContentDriver : ContentDisplayDriver
-    {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
 
-        public DownloadContentDriver(
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-        }
+    public DownloadContentDriver(
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService)
+    {
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
 
-        public override IDisplayResult Display(ContentItem contentItem, BuildDisplayContext context)
-        {
-            var user = _httpContextAccessor.HttpContext.User;
+    public override IDisplayResult Display(ContentItem contentItem, BuildDisplayContext context)
+    {
+        var user = _httpContextAccessor.HttpContext.User;
 
-            return Shape("Download_SummaryAdmin__Button__Actions", new ContentItemViewModel(contentItem))
-                .Location("SummaryAdmin", "ActionsMenu:20")
-                .RenderWhen(() => _authorizationService.AuthorizeAsync(user, OrchardCore.Deployment.CommonPermissions.Export, contentItem));
-        }
+        return Shape("Download_SummaryAdmin__Button__Actions", new ContentItemViewModel(contentItem))
+            .Location("SummaryAdmin", "ActionsMenu:20")
+            .RenderWhen(() => _authorizationService.AuthorizeAsync(user, OrchardCore.Deployment.CommonPermissions.Export, contentItem));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/Download/DownloadController.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/Download/DownloadController.cs
index 2f1a4cf918a..67232dcda1c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/Download/DownloadController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/Download/DownloadController.cs
@@ -7,79 +7,78 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Contents.Deployment.Download
+namespace OrchardCore.Contents.Deployment.Download;
+
+[Admin("Download/{action}/{contentItemId}", AdminAttribute.NameFromControllerAndAction)]
+[Feature("OrchardCore.Contents.Deployment.Download")]
+public class DownloadController : Controller
 {
-    [Admin("Download/{action}/{contentItemId}", AdminAttribute.NameFromControllerAndAction)]
-    [Feature("OrchardCore.Contents.Deployment.Download")]
-    public class DownloadController : Controller
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IContentManager _contentManager;
+
+    public DownloadController(
+        IAuthorizationService authorizationService,
+        IContentManager contentManager)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IContentManager _contentManager;
+        _authorizationService = authorizationService;
+        _contentManager = contentManager;
+    }
 
-        public DownloadController(
-            IAuthorizationService authorizationService,
-            IContentManager contentManager)
+    [HttpGet]
+    public async Task<IActionResult> Display(string contentItemId, bool latest = false)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, OrchardCore.Deployment.CommonPermissions.Export))
         {
-            _authorizationService = authorizationService;
-            _contentManager = contentManager;
+            return Forbid();
         }
 
-        [HttpGet]
-        public async Task<IActionResult> Display(string contentItemId, bool latest = false)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, OrchardCore.Deployment.CommonPermissions.Export))
-            {
-                return Forbid();
-            }
-
-            var contentItem = await _contentManager.GetAsync(contentItemId, latest == false ? VersionOptions.Published : VersionOptions.Latest);
-
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
-
-            // Export permission is required as the overriding permission.
-            // Requesting EditContent would allow custom permissions to deny access to this content item.
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditContent, contentItem))
-            {
-                return Forbid();
-            }
+        var contentItem = await _contentManager.GetAsync(contentItemId, latest == false ? VersionOptions.Published : VersionOptions.Latest);
 
-            var model = new DisplayJsonContentItemViewModel
-            {
-                ContentItem = contentItem,
-                ContentItemJson = JObject.FromObject(contentItem).ToString()
-            };
+        if (contentItem == null)
+        {
+            return NotFound();
+        }
 
-            return View(model);
+        // Export permission is required as the overriding permission.
+        // Requesting EditContent would allow custom permissions to deny access to this content item.
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditContent, contentItem))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Download(string contentItemId, bool latest = false)
+        var model = new DisplayJsonContentItemViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, OrchardCore.Deployment.CommonPermissions.Export))
-            {
-                return Forbid();
-            }
+            ContentItem = contentItem,
+            ContentItemJson = JObject.FromObject(contentItem).ToString()
+        };
 
-            var contentItem = await _contentManager.GetAsync(contentItemId, latest == false ? VersionOptions.Published : VersionOptions.Latest);
+        return View(model);
+    }
 
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
+    [HttpPost]
+    public async Task<IActionResult> Download(string contentItemId, bool latest = false)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, OrchardCore.Deployment.CommonPermissions.Export))
+        {
+            return Forbid();
+        }
 
-            // Export permission is required as the overriding permission.
-            // Requesting EditContent would allow custom permissions to deny access to this content item.
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditContent, contentItem))
-            {
-                return Forbid();
-            }
+        var contentItem = await _contentManager.GetAsync(contentItemId, latest == false ? VersionOptions.Published : VersionOptions.Latest);
 
-            var jItem = JObject.FromObject(contentItem);
+        if (contentItem == null)
+        {
+            return NotFound();
+        }
 
-            return File(Encoding.UTF8.GetBytes(jItem.ToString()), "application/json", $"{contentItem.ContentItemId}.json");
+        // Export permission is required as the overriding permission.
+        // Requesting EditContent would allow custom permissions to deny access to this content item.
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditContent, contentItem))
+        {
+            return Forbid();
         }
+
+        var jItem = JObject.FromObject(contentItem);
+
+        return File(Encoding.UTF8.GetBytes(jItem.ToString()), "application/json", $"{contentItem.ContentItemId}.json");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/Download/DownloadStartup.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/Download/DownloadStartup.cs
index dfb4aa3278a..1bb2e5768eb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/Download/DownloadStartup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/Download/DownloadStartup.cs
@@ -2,14 +2,13 @@
 using OrchardCore.ContentManagement.Display.ContentDisplay;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Contents.Deployment.Download
+namespace OrchardCore.Contents.Deployment.Download;
+
+[Feature("OrchardCore.Contents.Deployment.Download")]
+public sealed class DownloadStartup : StartupBase
 {
-    [Feature("OrchardCore.Contents.Deployment.Download")]
-    public sealed class DownloadStartup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IContentDisplayDriver, DownloadContentDriver>();
-        }
+        services.AddScoped<IContentDisplayDriver, DownloadContentDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs
index 14c6bc75687..c74fee58abb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs
@@ -3,44 +3,43 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget
+namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget;
+
+public sealed class ExportContentToDeploymentTargetAdminMenu : INavigationProvider
 {
-    public sealed class ExportContentToDeploymentTargetAdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", ExportContentToDeploymentTargetSettingsDisplayDriver.GroupId },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", ExportContentToDeploymentTargetSettingsDisplayDriver.GroupId },
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public ExportContentToDeploymentTargetAdminMenu(IStringLocalizer<AdminMenu> localizer)
-        {
-            S = localizer;
-        }
+    public ExportContentToDeploymentTargetAdminMenu(IStringLocalizer<AdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["Import/Export"], S["Import/Export"].PrefixPosition(), import => import
-                        .Add(S["Settings"], settings => settings
-                            .Add(S["Export Target Settings"], S["Export Target Settings"].PrefixPosition(), targetSettings => targetSettings
-                                .Action("Index", "Admin", _routeValues)
-                                .Permission(OrchardCore.Deployment.CommonPermissions.ManageDeploymentPlan)
-                                .LocalNav()
-                            )
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["Import/Export"], S["Import/Export"].PrefixPosition(), import => import
+                    .Add(S["Settings"], settings => settings
+                        .Add(S["Export Target Settings"], S["Export Target Settings"].PrefixPosition(), targetSettings => targetSettings
+                            .Action("Index", "Admin", _routeValues)
+                            .Permission(OrchardCore.Deployment.CommonPermissions.ManageDeploymentPlan)
+                            .LocalNav()
                         )
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetContentDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetContentDriver.cs
index b7f1c02d632..3243b992e49 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetContentDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetContentDriver.cs
@@ -7,57 +7,56 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget
+namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget;
+
+public sealed class ExportContentToDeploymentTargetContentDriver : ContentDisplayDriver
 {
-    public sealed class ExportContentToDeploymentTargetContentDriver : ContentDisplayDriver
+    private readonly IDeploymentPlanService _deploymentPlanService;
+    private readonly ISiteService _siteService;
+
+    public ExportContentToDeploymentTargetContentDriver(
+        IDeploymentPlanService deploymentPlanService,
+        ISiteService siteService)
+    {
+        _deploymentPlanService = deploymentPlanService;
+        _siteService = siteService;
+    }
+
+    public override Task<IDisplayResult> DisplayAsync(ContentItem model, BuildDisplayContext context)
     {
-        private readonly IDeploymentPlanService _deploymentPlanService;
-        private readonly ISiteService _siteService;
-
-        public ExportContentToDeploymentTargetContentDriver(
-            IDeploymentPlanService deploymentPlanService,
-            ISiteService siteService)
-        {
-            _deploymentPlanService = deploymentPlanService;
-            _siteService = siteService;
-        }
-
-        public override Task<IDisplayResult> DisplayAsync(ContentItem model, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                Dynamic("ExportContentToDeploymentTarget_Modal__ActionDeploymentTarget")
-                    .Location("SummaryAdmin", "ActionsMenu:30")
-                    .RenderWhen(async () =>
+        return CombineAsync(
+            Dynamic("ExportContentToDeploymentTarget_Modal__ActionDeploymentTarget")
+                .Location("SummaryAdmin", "ActionsMenu:30")
+                .RenderWhen(async () =>
+                {
+                    if (await _deploymentPlanService.DoesUserHaveExportPermissionAsync())
                     {
-                        if (await _deploymentPlanService.DoesUserHaveExportPermissionAsync())
-                        {
-                            var exportContentToDeploymentTargetSettings = await _siteService.GetSettingsAsync<ExportContentToDeploymentTargetSettings>();
+                        var exportContentToDeploymentTargetSettings = await _siteService.GetSettingsAsync<ExportContentToDeploymentTargetSettings>();
 
-                            if (exportContentToDeploymentTargetSettings.ExportContentToDeploymentTargetPlanId != 0)
-                            {
-                                return true;
-                            }
+                        if (exportContentToDeploymentTargetSettings.ExportContentToDeploymentTargetPlanId != 0)
+                        {
+                            return true;
                         }
+                    }
 
-                        return false;
-                    }),
-                Shape("ExportContentToDeploymentTarget_SummaryAdmin__Button__Actions", new ContentItemViewModel(model))
-                    .Location("SummaryAdmin", "ActionsMenu:40")
-                    .RenderWhen(async () =>
+                    return false;
+                }),
+            Shape("ExportContentToDeploymentTarget_SummaryAdmin__Button__Actions", new ContentItemViewModel(model))
+                .Location("SummaryAdmin", "ActionsMenu:40")
+                .RenderWhen(async () =>
+                {
+                    if (await _deploymentPlanService.DoesUserHaveExportPermissionAsync())
                     {
-                        if (await _deploymentPlanService.DoesUserHaveExportPermissionAsync())
-                        {
-                            var exportContentToDeploymentTargetSettings = await _siteService.GetSettingsAsync<ExportContentToDeploymentTargetSettings>();
+                        var exportContentToDeploymentTargetSettings = await _siteService.GetSettingsAsync<ExportContentToDeploymentTargetSettings>();
 
-                            if (exportContentToDeploymentTargetSettings.ExportContentToDeploymentTargetPlanId != 0)
-                            {
-                                return true;
-                            }
+                        if (exportContentToDeploymentTargetSettings.ExportContentToDeploymentTargetPlanId != 0)
+                        {
+                            return true;
                         }
+                    }
 
-                        return false;
-                    })
-                );
-        }
+                    return false;
+                })
+            );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetContentsAdminListDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetContentsAdminListDisplayDriver.cs
index dc5e26c1d9e..074862e9a97 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetContentsAdminListDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetContentsAdminListDisplayDriver.cs
@@ -5,37 +5,36 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget
+namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget;
+
+public sealed class ExportContentToDeploymentTargetContentsAdminListDisplayDriver : DisplayDriver<ContentOptionsViewModel>
 {
-    public sealed class ExportContentToDeploymentTargetContentsAdminListDisplayDriver : DisplayDriver<ContentOptionsViewModel>
+    private readonly IDeploymentPlanService _deploymentPlanService;
+    private readonly ISiteService _siteService;
+
+    public ExportContentToDeploymentTargetContentsAdminListDisplayDriver(
+        IDeploymentPlanService deploymentPlanService,
+        ISiteService siteService)
     {
-        private readonly IDeploymentPlanService _deploymentPlanService;
-        private readonly ISiteService _siteService;
+        _deploymentPlanService = deploymentPlanService;
+        _siteService = siteService;
+    }
 
-        public ExportContentToDeploymentTargetContentsAdminListDisplayDriver(
-            IDeploymentPlanService deploymentPlanService,
-            ISiteService siteService)
+    public override async Task<IDisplayResult> DisplayAsync(ContentOptionsViewModel model, BuildDisplayContext context)
+    {
+        if (await _deploymentPlanService.DoesUserHaveExportPermissionAsync())
         {
-            _deploymentPlanService = deploymentPlanService;
-            _siteService = siteService;
-        }
+            var exportContentToDeploymentTargetSettings = await _siteService.GetSettingsAsync<ExportContentToDeploymentTargetSettings>();
 
-        public override async Task<IDisplayResult> DisplayAsync(ContentOptionsViewModel model, BuildDisplayContext context)
-        {
-            if (await _deploymentPlanService.DoesUserHaveExportPermissionAsync())
+            if (exportContentToDeploymentTargetSettings.ExportContentToDeploymentTargetPlanId != 0)
             {
-                var exportContentToDeploymentTargetSettings = await _siteService.GetSettingsAsync<ExportContentToDeploymentTargetSettings>();
-
-                if (exportContentToDeploymentTargetSettings.ExportContentToDeploymentTargetPlanId != 0)
-                {
-                    return Combine(
-                        Dynamic("ExportContentToDeploymentTarget__Button__ContentsBulkActions").Location("BulkActions", "Content:30"),
-                        Dynamic("ExportContentToDeploymentTarget_Modal__ContentsBulkActionsDeploymentTarget").Location("BulkActions", "Content:30")
-                    );
-                }
+                return Combine(
+                    Dynamic("ExportContentToDeploymentTarget__Button__ContentsBulkActions").Location("BulkActions", "Content:30"),
+                    Dynamic("ExportContentToDeploymentTarget_Modal__ContentsBulkActionsDeploymentTarget").Location("BulkActions", "Content:30")
+                );
             }
-
-            return null;
         }
+
+        return null;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetDeploymentSource.cs
index ddc4f0d4748..a629adc253e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetDeploymentSource.cs
@@ -10,72 +10,71 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget
+namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget;
+
+public class ExportContentToDeploymentTargetDeploymentSource : IDeploymentSource
 {
-    public class ExportContentToDeploymentTargetDeploymentSource : IDeploymentSource
+    private readonly IContentManager _contentManager;
+    private readonly ISession _session;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+
+    public ExportContentToDeploymentTargetDeploymentSource(
+        IContentManager contentManager,
+        ISession session,
+        IUpdateModelAccessor updateModelAccessor)
+    {
+        _contentManager = contentManager;
+        _session = session;
+        _updateModelAccessor = updateModelAccessor;
+    }
+
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
     {
-        private readonly IContentManager _contentManager;
-        private readonly ISession _session;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
+        var exportContentToDeploymentTargetContentDeploymentStep = step as ExportContentToDeploymentTargetDeploymentStep;
 
-        public ExportContentToDeploymentTargetDeploymentSource(
-            IContentManager contentManager,
-            ISession session,
-            IUpdateModelAccessor updateModelAccessor)
+        if (exportContentToDeploymentTargetContentDeploymentStep == null)
         {
-            _contentManager = contentManager;
-            _session = session;
-            _updateModelAccessor = updateModelAccessor;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        var data = new JsonArray();
+        result.Steps.Add(new JsonObject
         {
-            var exportContentToDeploymentTargetContentDeploymentStep = step as ExportContentToDeploymentTargetDeploymentStep;
-
-            if (exportContentToDeploymentTargetContentDeploymentStep == null)
-            {
-                return;
-            }
-
-            var data = new JsonArray();
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "Content",
-                ["data"] = data,
-            });
+            ["name"] = "Content",
+            ["data"] = data,
+        });
 
-            var model = new ExportContentToDeploymentTargetModel();
-            await _updateModelAccessor.ModelUpdater.TryUpdateModelAsync(model, "ExportContentToDeploymentTarget", m => m.ItemIds, m => m.Latest, m => m.ContentItemId);
+        var model = new ExportContentToDeploymentTargetModel();
+        await _updateModelAccessor.ModelUpdater.TryUpdateModelAsync(model, "ExportContentToDeploymentTarget", m => m.ItemIds, m => m.Latest, m => m.ContentItemId);
 
-            if (!string.IsNullOrEmpty(model.ContentItemId))
+        if (!string.IsNullOrEmpty(model.ContentItemId))
+        {
+            var contentItem = await _contentManager.GetAsync(model.ContentItemId, model.Latest ? VersionOptions.Latest : VersionOptions.Published);
+            if (contentItem != null)
             {
-                var contentItem = await _contentManager.GetAsync(model.ContentItemId, model.Latest ? VersionOptions.Latest : VersionOptions.Published);
-                if (contentItem != null)
-                {
-                    var objectData = JObject.FromObject(contentItem);
-                    objectData.Remove(nameof(ContentItem.Id));
-                    data.Add(objectData);
-                }
+                var objectData = JObject.FromObject(contentItem);
+                objectData.Remove(nameof(ContentItem.Id));
+                data.Add(objectData);
             }
+        }
 
-            if (model.ItemIds?.Count() > 0)
-            {
-                var checkedContentItems = await _session.Query<ContentItem, ContentItemIndex>().Where(x => x.DocumentId.IsIn(model.ItemIds) && x.Published).ListAsync();
+        if (model.ItemIds?.Count() > 0)
+        {
+            var checkedContentItems = await _session.Query<ContentItem, ContentItemIndex>().Where(x => x.DocumentId.IsIn(model.ItemIds) && x.Published).ListAsync();
 
-                foreach (var contentItem in checkedContentItems)
-                {
-                    var objectData = JObject.FromObject(contentItem);
-                    objectData.Remove(nameof(ContentItem.Id));
-                    data.Add(objectData);
-                }
+            foreach (var contentItem in checkedContentItems)
+            {
+                var objectData = JObject.FromObject(contentItem);
+                objectData.Remove(nameof(ContentItem.Id));
+                data.Add(objectData);
             }
         }
+    }
 
-        public class ExportContentToDeploymentTargetModel
-        {
-            public IEnumerable<long> ItemIds { get; set; }
-            public string ContentItemId { get; set; }
-            public bool Latest { get; set; }
-        }
+    public class ExportContentToDeploymentTargetModel
+    {
+        public IEnumerable<long> ItemIds { get; set; }
+        public string ContentItemId { get; set; }
+        public bool Latest { get; set; }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetDeploymentStep.cs
index 80d4d1cc7f6..dac81ca28e5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetDeploymentStep.cs
@@ -1,15 +1,14 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget
+namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget;
+
+/// <summary>
+/// Adds content selected with export content to deployment plan target feature to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class ExportContentToDeploymentTargetDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds content selected with export content to deployment plan target feature to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class ExportContentToDeploymentTargetDeploymentStep : DeploymentStep
+    public ExportContentToDeploymentTargetDeploymentStep()
     {
-        public ExportContentToDeploymentTargetDeploymentStep()
-        {
-            Name = nameof(ExportContentToDeploymentTargetDeploymentStep);
-        }
+        Name = nameof(ExportContentToDeploymentTargetDeploymentStep);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetDeploymentStepDriver.cs
index 2391664e9cd..f4419370edb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetDeploymentStepDriver.cs
@@ -3,22 +3,21 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget
+namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget;
+
+public sealed class ExportContentToDeploymentTargetDeploymentStepDriver : DisplayDriver<DeploymentStep, ExportContentToDeploymentTargetDeploymentStep>
 {
-    public sealed class ExportContentToDeploymentTargetDeploymentStepDriver : DisplayDriver<DeploymentStep, ExportContentToDeploymentTargetDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(ExportContentToDeploymentTargetDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(ExportContentToDeploymentTargetDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("ExportContentToDeploymentTargetDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("ExportContentToDeploymentTargetDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("ExportContentToDeploymentTargetDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("ExportContentToDeploymentTargetDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(ExportContentToDeploymentTargetDeploymentStep step, BuildEditorContext context)
-        {
-            return View("ExportContentToDeploymentTargetDeploymentStep_Fields_Edit", step).Location("Content");
-        }
+    public override IDisplayResult Edit(ExportContentToDeploymentTargetDeploymentStep step, BuildEditorContext context)
+    {
+        return View("ExportContentToDeploymentTargetDeploymentStep_Fields_Edit", step).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetMigrations.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetMigrations.cs
index cb5facc89ce..00affbf2f85 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetMigrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetMigrations.cs
@@ -7,41 +7,40 @@
 using OrchardCore.Recipes.Services;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget
+namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget;
+
+public sealed class ExportContentToDeploymentTargetMigrations : DataMigration
 {
-    public sealed class ExportContentToDeploymentTargetMigrations : DataMigration
-    {
-        private readonly IRecipeMigrator _recipeMigrator;
-        private readonly IDeploymentPlanService _deploymentPlanService;
-        private readonly ISiteService _siteService;
-
-        public ExportContentToDeploymentTargetMigrations(
-            IRecipeMigrator recipeMigrator,
-            IDeploymentPlanService deploymentPlanService,
-            ISiteService siteService
-            )
-        {
-            _recipeMigrator = recipeMigrator;
-            _deploymentPlanService = deploymentPlanService;
-            _siteService = siteService;
-        }
+    private readonly IRecipeMigrator _recipeMigrator;
+    private readonly IDeploymentPlanService _deploymentPlanService;
+    private readonly ISiteService _siteService;
 
-        public async Task<int> CreateAsync()
-        {
-            await _recipeMigrator.ExecuteAsync($"exportcontenttodeploymenttarget{RecipesConstants.RecipeExtension}", this);
+    public ExportContentToDeploymentTargetMigrations(
+        IRecipeMigrator recipeMigrator,
+        IDeploymentPlanService deploymentPlanService,
+        ISiteService siteService
+        )
+    {
+        _recipeMigrator = recipeMigrator;
+        _deploymentPlanService = deploymentPlanService;
+        _siteService = siteService;
+    }
 
-            var deploymentPlans = await _deploymentPlanService.GetAllDeploymentPlansAsync();
-            var exportContentToDeploymentTargetPlan = deploymentPlans.FirstOrDefault(x => x.DeploymentSteps.Any(x => x.Name == nameof(ExportContentToDeploymentTargetDeploymentStep)));
+    public async Task<int> CreateAsync()
+    {
+        await _recipeMigrator.ExecuteAsync($"exportcontenttodeploymenttarget{RecipesConstants.RecipeExtension}", this);
 
-            if (exportContentToDeploymentTargetPlan != null)
-            {
-                var siteSettings = await _siteService.LoadSiteSettingsAsync();
-                siteSettings.Alter<ExportContentToDeploymentTargetSettings>(aspect => aspect.ExportContentToDeploymentTargetPlanId = exportContentToDeploymentTargetPlan.Id);
+        var deploymentPlans = await _deploymentPlanService.GetAllDeploymentPlansAsync();
+        var exportContentToDeploymentTargetPlan = deploymentPlans.FirstOrDefault(x => x.DeploymentSteps.Any(x => x.Name == nameof(ExportContentToDeploymentTargetDeploymentStep)));
 
-                await _siteService.UpdateSiteSettingsAsync(siteSettings);
-            }
+        if (exportContentToDeploymentTargetPlan != null)
+        {
+            var siteSettings = await _siteService.LoadSiteSettingsAsync();
+            siteSettings.Alter<ExportContentToDeploymentTargetSettings>(aspect => aspect.ExportContentToDeploymentTargetPlanId = exportContentToDeploymentTargetPlan.Id);
 
-            return 1;
+            await _siteService.UpdateSiteSettingsAsync(siteSettings);
         }
+
+        return 1;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetSettings.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetSettings.cs
index 7da5706622e..43a861bdfb3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetSettings.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget
+namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget;
+
+public class ExportContentToDeploymentTargetSettings
 {
-    public class ExportContentToDeploymentTargetSettings
-    {
-        /// <summary>
-        /// The id of the export content to deployment target deployment plan.
-        /// </summary>
-        public long ExportContentToDeploymentTargetPlanId { get; set; }
-    }
+    /// <summary>
+    /// The id of the export content to deployment target deployment plan.
+    /// </summary>
+    public long ExportContentToDeploymentTargetPlanId { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetSettingsDisplayDriver.cs
index 04d51599ea8..fc92b731db7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetSettingsDisplayDriver.cs
@@ -6,50 +6,49 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget
+namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget;
+
+public sealed class ExportContentToDeploymentTargetSettingsDisplayDriver : SiteDisplayDriver<ExportContentToDeploymentTargetSettings>
 {
-    public sealed class ExportContentToDeploymentTargetSettingsDisplayDriver : SiteDisplayDriver<ExportContentToDeploymentTargetSettings>
-    {
-        public const string GroupId = "ExportContentToDeploymentTarget";
+    public const string GroupId = "ExportContentToDeploymentTarget";
 
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
 
-        public ExportContentToDeploymentTargetSettingsDisplayDriver(
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-        }
+    public ExportContentToDeploymentTargetSettingsDisplayDriver(
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService)
+    {
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
 
-        protected override string SettingsGroupId
-            => GroupId;
+    protected override string SettingsGroupId
+        => GroupId;
 
-        public override async Task<IDisplayResult> EditAsync(ISite site, ExportContentToDeploymentTargetSettings settings, BuildEditorContext context)
+    public override async Task<IDisplayResult> EditAsync(ISite site, ExportContentToDeploymentTargetSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, OrchardCore.Deployment.CommonPermissions.ManageDeploymentPlan))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, OrchardCore.Deployment.CommonPermissions.ManageDeploymentPlan))
-            {
-                return null;
-            }
-
-            return Initialize<ExportContentToDeploymentTargetSettingsViewModel>("ExportContentToDeploymentTargetSettings_Edit", model =>
-            {
-                model.ExportContentToDeploymentTargetPlanId = settings.ExportContentToDeploymentTargetPlanId;
-            }).Location("Content:2")
-            .OnGroup(SettingsGroupId);
+            return null;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, ExportContentToDeploymentTargetSettings settings, UpdateEditorContext context)
+        return Initialize<ExportContentToDeploymentTargetSettingsViewModel>("ExportContentToDeploymentTargetSettings_Edit", model =>
         {
-            var model = new ExportContentToDeploymentTargetSettingsViewModel();
+            model.ExportContentToDeploymentTargetPlanId = settings.ExportContentToDeploymentTargetPlanId;
+        }).Location("Content:2")
+        .OnGroup(SettingsGroupId);
+    }
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix, m => m.ExportContentToDeploymentTargetPlanId);
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, ExportContentToDeploymentTargetSettings settings, UpdateEditorContext context)
+    {
+        var model = new ExportContentToDeploymentTargetSettingsViewModel();
 
-            settings.ExportContentToDeploymentTargetPlanId = model.ExportContentToDeploymentTargetPlanId;
+        await context.Updater.TryUpdateModelAsync(model, Prefix, m => m.ExportContentToDeploymentTargetPlanId);
 
-            return await EditAsync(site, settings, context);
-        }
+        settings.ExportContentToDeploymentTargetPlanId = model.ExportContentToDeploymentTargetPlanId;
+
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetSettingsViewModel.cs
index b8691911d22..d9c21404d36 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetSettingsViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget
+namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget;
+
+public class ExportContentToDeploymentTargetSettingsViewModel
 {
-    public class ExportContentToDeploymentTargetSettingsViewModel
-    {
-        public long ExportContentToDeploymentTargetPlanId { get; set; }
-    }
+    public long ExportContentToDeploymentTargetPlanId { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetStartup.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetStartup.cs
index 1de88587120..581c9a6bdb5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetStartup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetStartup.cs
@@ -9,24 +9,23 @@
 using OrchardCore.Settings;
 using OrchardCore.Settings.Deployment;
 
-namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget
+namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget;
+
+[Feature("OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget")]
+public sealed class ExportContentToDeploymentTargetStartup : StartupBase
 {
-    [Feature("OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget")]
-    public sealed class ExportContentToDeploymentTargetStartup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<INavigationProvider, ExportContentToDeploymentTargetAdminMenu>();
+        services.AddScoped<INavigationProvider, ExportContentToDeploymentTargetAdminMenu>();
 
-            services.AddScoped<IDisplayDriver<ISite>, ExportContentToDeploymentTargetSettingsDisplayDriver>();
+        services.AddScoped<IDisplayDriver<ISite>, ExportContentToDeploymentTargetSettingsDisplayDriver>();
 
-            services.AddDeployment<ExportContentToDeploymentTargetDeploymentSource, ExportContentToDeploymentTargetDeploymentStep, ExportContentToDeploymentTargetDeploymentStepDriver>();
+        services.AddDeployment<ExportContentToDeploymentTargetDeploymentSource, ExportContentToDeploymentTargetDeploymentStep, ExportContentToDeploymentTargetDeploymentStepDriver>();
 
-            services.AddDataMigration<ExportContentToDeploymentTargetMigrations>();
-            services.AddScoped<IContentDisplayDriver, ExportContentToDeploymentTargetContentDriver>();
-            services.AddScoped<IDisplayDriver<ContentOptionsViewModel>, ExportContentToDeploymentTargetContentsAdminListDisplayDriver>();
+        services.AddDataMigration<ExportContentToDeploymentTargetMigrations>();
+        services.AddScoped<IContentDisplayDriver, ExportContentToDeploymentTargetContentDriver>();
+        services.AddScoped<IDisplayDriver<ContentOptionsViewModel>, ExportContentToDeploymentTargetContentsAdminListDisplayDriver>();
 
-            services.AddSiteSettingsPropertyDeploymentStep<ExportContentToDeploymentTargetSettings, ExportContentToDeploymentTargetStartup>(S => S["Export Content To Deployment Target settings"], S => S["Exports the Export Content To Deployment Target settings."]);
-        }
+        services.AddSiteSettingsPropertyDeploymentStep<ExportContentToDeploymentTargetSettings, ExportContentToDeploymentTargetStartup>(S => S["Export Content To Deployment Target settings"], S => S["Exports the Export Content To Deployment Target settings."]);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Drivers/ContentOptionsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Drivers/ContentOptionsDisplayDriver.cs
index 434f83f3c97..7f501fc5e46 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Drivers/ContentOptionsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Drivers/ContentOptionsDisplayDriver.cs
@@ -3,68 +3,67 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Contents.Drivers
+namespace OrchardCore.Contents.Drivers;
+
+public sealed class ContentOptionsDisplayDriver : DisplayDriver<ContentOptionsViewModel>
 {
-    public sealed class ContentOptionsDisplayDriver : DisplayDriver<ContentOptionsViewModel>
+    // Maintain the Options prefix for compatibility with binding.
+    protected override void BuildPrefix(ContentOptionsViewModel model, string htmlFieldPrefix)
     {
-        // Maintain the Options prefix for compatibility with binding.
-        protected override void BuildPrefix(ContentOptionsViewModel model, string htmlFieldPrefix)
-        {
-            Prefix = "Options";
-        }
+        Prefix = "Options";
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(ContentOptionsViewModel model, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                Initialize<ContentOptionsViewModel>("ContentsAdminListBulkActions", m => BuildContentOptionsViewModel(m, model))
-                .Location("BulkActions", "Content:10"),
-                View("ContentsAdminFilters_Thumbnail__DisplayText", model).Location("Thumbnail", "Content:10"),
-                View("ContentsAdminFilters_Thumbnail__ContentType", model).Location("Thumbnail", "Content:20"),
-                View("ContentsAdminFilters_Thumbnail__Stereotype", model).Location("Thumbnail", "Content:30"),
-                View("ContentsAdminFilters_Thumbnail__Status", model).Location("Thumbnail", "Content:40"),
-                View("ContentsAdminFilters_Thumbnail__Sort", model).Location("Thumbnail", "Content:50")
-            );
-        }
+    public override Task<IDisplayResult> DisplayAsync(ContentOptionsViewModel model, BuildDisplayContext context)
+    {
+        return CombineAsync(
+            Initialize<ContentOptionsViewModel>("ContentsAdminListBulkActions", m => BuildContentOptionsViewModel(m, model))
+            .Location("BulkActions", "Content:10"),
+            View("ContentsAdminFilters_Thumbnail__DisplayText", model).Location("Thumbnail", "Content:10"),
+            View("ContentsAdminFilters_Thumbnail__ContentType", model).Location("Thumbnail", "Content:20"),
+            View("ContentsAdminFilters_Thumbnail__Stereotype", model).Location("Thumbnail", "Content:30"),
+            View("ContentsAdminFilters_Thumbnail__Status", model).Location("Thumbnail", "Content:40"),
+            View("ContentsAdminFilters_Thumbnail__Sort", model).Location("Thumbnail", "Content:50")
+        );
+    }
 
-        public override Task<IDisplayResult> EditAsync(ContentOptionsViewModel model, BuildEditorContext context)
-        {
-            // Map the filter result to a model so the ui can reflect current selections.
-            model.FilterResult.MapTo(model);
+    public override Task<IDisplayResult> EditAsync(ContentOptionsViewModel model, BuildEditorContext context)
+    {
+        // Map the filter result to a model so the ui can reflect current selections.
+        model.FilterResult.MapTo(model);
 
-            return CombineAsync(
-                Initialize<ContentOptionsViewModel>("ContentsAdminListSearch", m => BuildContentOptionsViewModel(m, model)).Location("Search:10"),
-                Initialize<ContentOptionsViewModel>("ContentsAdminListCreate", m => BuildContentOptionsViewModel(m, model)).Location("Create:10"),
-                Initialize<ContentOptionsViewModel>("ContentsAdminListSummary", m => BuildContentOptionsViewModel(m, model)).Location("Summary:10"),
-                Initialize<ContentOptionsViewModel>("ContentsAdminListFilters", m => BuildContentOptionsViewModel(m, model)).Location("Actions:10.1"),
-                Initialize<ContentOptionsViewModel>("ContentsAdminList_Fields_BulkActions", m => BuildContentOptionsViewModel(m, model)).Location("Actions:10.1")
-            );
-        }
+        return CombineAsync(
+            Initialize<ContentOptionsViewModel>("ContentsAdminListSearch", m => BuildContentOptionsViewModel(m, model)).Location("Search:10"),
+            Initialize<ContentOptionsViewModel>("ContentsAdminListCreate", m => BuildContentOptionsViewModel(m, model)).Location("Create:10"),
+            Initialize<ContentOptionsViewModel>("ContentsAdminListSummary", m => BuildContentOptionsViewModel(m, model)).Location("Summary:10"),
+            Initialize<ContentOptionsViewModel>("ContentsAdminListFilters", m => BuildContentOptionsViewModel(m, model)).Location("Actions:10.1"),
+            Initialize<ContentOptionsViewModel>("ContentsAdminList_Fields_BulkActions", m => BuildContentOptionsViewModel(m, model)).Location("Actions:10.1")
+        );
+    }
 
-        public override Task<IDisplayResult> UpdateAsync(ContentOptionsViewModel model, UpdateEditorContext context)
-        {
-            // Map the incoming values from a form post to the filter result.
-            model.FilterResult.MapFrom(model);
+    public override Task<IDisplayResult> UpdateAsync(ContentOptionsViewModel model, UpdateEditorContext context)
+    {
+        // Map the incoming values from a form post to the filter result.
+        model.FilterResult.MapFrom(model);
 
-            return EditAsync(model, context);
-        }
+        return EditAsync(model, context);
+    }
 
-        private static void BuildContentOptionsViewModel(ContentOptionsViewModel m, ContentOptionsViewModel model)
-        {
-            m.ContentTypeOptions = model.ContentTypeOptions;
-            m.ContentStatuses = model.ContentStatuses;
-            m.ContentSorts = model.ContentSorts;
-            m.ContentsBulkAction = model.ContentsBulkAction;
-            m.CreatableTypes = model.CreatableTypes;
-            m.StartIndex = model.StartIndex;
-            m.EndIndex = model.EndIndex;
-            m.ContentItemsCount = model.ContentItemsCount;
-            m.TotalItemCount = model.TotalItemCount;
-            m.SearchText = model.SearchText;
-            m.OriginalSearchText = model.OriginalSearchText;
-            m.ContentsStatus = model.ContentsStatus;
-            m.OrderBy = model.OrderBy;
-            m.SelectedContentType = model.SelectedContentType;
-            m.FilterResult = model.FilterResult;
-        }
+    private static void BuildContentOptionsViewModel(ContentOptionsViewModel m, ContentOptionsViewModel model)
+    {
+        m.ContentTypeOptions = model.ContentTypeOptions;
+        m.ContentStatuses = model.ContentStatuses;
+        m.ContentSorts = model.ContentSorts;
+        m.ContentsBulkAction = model.ContentsBulkAction;
+        m.CreatableTypes = model.CreatableTypes;
+        m.StartIndex = model.StartIndex;
+        m.EndIndex = model.EndIndex;
+        m.ContentItemsCount = model.ContentItemsCount;
+        m.TotalItemCount = model.TotalItemCount;
+        m.SearchText = model.SearchText;
+        m.OriginalSearchText = model.OriginalSearchText;
+        m.ContentsStatus = model.ContentsStatus;
+        m.OrderBy = model.OrderBy;
+        m.SelectedContentType = model.SelectedContentType;
+        m.FilterResult = model.FilterResult;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Drivers/ContentsDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Drivers/ContentsDriver.cs
index 640949c2c14..a362ff74f82 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Drivers/ContentsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Drivers/ContentsDriver.cs
@@ -11,105 +11,104 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Contents.Drivers
+namespace OrchardCore.Contents.Drivers;
+
+public sealed class ContentsDriver : ContentDisplayDriver
 {
-    public sealed class ContentsDriver : ContentDisplayDriver
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+
+    public ContentsDriver(
+        IContentDefinitionManager contentDefinitionManager,
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
-
-        public ContentsDriver(
-            IContentDefinitionManager contentDefinitionManager,
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-        }
+        _contentDefinitionManager = contentDefinitionManager;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
 
-        public override async Task<IDisplayResult> DisplayAsync(ContentItem contentItem, BuildDisplayContext context)
+    public override async Task<IDisplayResult> DisplayAsync(ContentItem contentItem, BuildDisplayContext context)
+    {
+        // We add custom alternates. This could be done generically to all shapes coming from ContentDisplayDriver but right now it's
+        // only necessary on this shape. Otherwise c.f. ContentPartDisplayDriver.
+
+        var results = new List<IDisplayResult>()
         {
-            // We add custom alternates. This could be done generically to all shapes coming from ContentDisplayDriver but right now it's
-            // only necessary on this shape. Otherwise c.f. ContentPartDisplayDriver.
+            Shape("ContentsTags_SummaryAdmin", new ContentItemViewModel(contentItem)).Location("SummaryAdmin", "Tags:10"),
+            Shape("ContentsMeta_SummaryAdmin", new ContentItemViewModel(contentItem)).Location("SummaryAdmin", "Meta:20"),
+        };
 
-            var results = new List<IDisplayResult>()
-            {
-                Shape("ContentsTags_SummaryAdmin", new ContentItemViewModel(contentItem)).Location("SummaryAdmin", "Tags:10"),
-                Shape("ContentsMeta_SummaryAdmin", new ContentItemViewModel(contentItem)).Location("SummaryAdmin", "Meta:20"),
-            };
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+        if (contentTypeDefinition != null)
+        {
+            var contentsMetadataShape = Shape("ContentsMetadata", new ContentItemViewModel(contentItem))
+                .Location("Detail", "Content:before");
 
-            if (contentTypeDefinition != null)
+            contentsMetadataShape.Displaying(ctx =>
             {
-                var contentsMetadataShape = Shape("ContentsMetadata", new ContentItemViewModel(contentItem))
-                    .Location("Detail", "Content:before");
+                var hasStereotype = contentTypeDefinition.TryGetStereotype(out var stereotype);
 
-                contentsMetadataShape.Displaying(ctx =>
+                if (hasStereotype && !string.Equals("Content", stereotype, StringComparison.OrdinalIgnoreCase))
                 {
-                    var hasStereotype = contentTypeDefinition.TryGetStereotype(out var stereotype);
+                    ctx.Shape.Metadata.Alternates.Add($"{stereotype}__ContentsMetadata");
+                }
 
-                    if (hasStereotype && !string.Equals("Content", stereotype, StringComparison.OrdinalIgnoreCase))
-                    {
-                        ctx.Shape.Metadata.Alternates.Add($"{stereotype}__ContentsMetadata");
-                    }
+                var displayType = ctx.Shape.Metadata.DisplayType;
 
-                    var displayType = ctx.Shape.Metadata.DisplayType;
+                if (!string.IsNullOrEmpty(displayType) && displayType != "Detail")
+                {
+                    ctx.Shape.Metadata.Alternates.Add($"ContentsMetadata_{ctx.Shape.Metadata.DisplayType}");
 
-                    if (!string.IsNullOrEmpty(displayType) && displayType != "Detail")
+                    if (hasStereotype && !string.Equals("Content", stereotype, StringComparison.OrdinalIgnoreCase))
                     {
-                        ctx.Shape.Metadata.Alternates.Add($"ContentsMetadata_{ctx.Shape.Metadata.DisplayType}");
-
-                        if (hasStereotype && !string.Equals("Content", stereotype, StringComparison.OrdinalIgnoreCase))
-                        {
-                            ctx.Shape.Metadata.Alternates.Add($"{stereotype}_{displayType}__ContentsMetadata");
-                        }
+                        ctx.Shape.Metadata.Alternates.Add($"{stereotype}_{displayType}__ContentsMetadata");
                     }
-                });
+                }
+            });
 
-                var user = _httpContextAccessor.HttpContext.User;
+            var user = _httpContextAccessor.HttpContext.User;
 
-                results.Add(contentsMetadataShape);
-                results.Add(Shape("ContentsButtonEdit_SummaryAdmin", new ContentItemViewModel(contentItem)).Location("SummaryAdmin", "Actions:10"));
-                results.Add(Shape("ContentsButtonActions_SummaryAdmin", new ContentItemViewModel(contentItem)).Location("SummaryAdmin", "ActionsMenu:10")
-                    .RenderWhen(async () =>
-                    {
-                        var hasPublishPermission = await _authorizationService.AuthorizeAsync(user, CommonPermissions.PublishContent, contentItem);
-                        var hasDeletePermission = await _authorizationService.AuthorizeAsync(user, CommonPermissions.DeleteContent, contentItem);
-                        var hasPreviewPermission = await _authorizationService.AuthorizeAsync(user, CommonPermissions.PreviewContent, contentItem);
-                        var hasClonePermission = await _authorizationService.AuthorizeAsync(user, CommonPermissions.CloneContent, contentItem);
+            results.Add(contentsMetadataShape);
+            results.Add(Shape("ContentsButtonEdit_SummaryAdmin", new ContentItemViewModel(contentItem)).Location("SummaryAdmin", "Actions:10"));
+            results.Add(Shape("ContentsButtonActions_SummaryAdmin", new ContentItemViewModel(contentItem)).Location("SummaryAdmin", "ActionsMenu:10")
+                .RenderWhen(async () =>
+                {
+                    var hasPublishPermission = await _authorizationService.AuthorizeAsync(user, CommonPermissions.PublishContent, contentItem);
+                    var hasDeletePermission = await _authorizationService.AuthorizeAsync(user, CommonPermissions.DeleteContent, contentItem);
+                    var hasPreviewPermission = await _authorizationService.AuthorizeAsync(user, CommonPermissions.PreviewContent, contentItem);
+                    var hasClonePermission = await _authorizationService.AuthorizeAsync(user, CommonPermissions.CloneContent, contentItem);
+
+                    return hasPublishPermission || hasDeletePermission || hasPreviewPermission || hasClonePermission;
+                })
+            );
+        }
 
-                        return hasPublishPermission || hasDeletePermission || hasPreviewPermission || hasClonePermission;
-                    })
-                );
-            }
+        return Combine(results);
+    }
 
-            return Combine(results);
-        }
+    public override async Task<IDisplayResult> EditAsync(ContentItem contentItem, BuildEditorContext context)
+    {
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-        public override async Task<IDisplayResult> EditAsync(ContentItem contentItem, BuildEditorContext context)
+        if (contentTypeDefinition == null)
         {
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
-
-            if (contentTypeDefinition == null)
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var user = _httpContextAccessor.HttpContext.User;
+        var user = _httpContextAccessor.HttpContext.User;
 
-            return Combine(
-                Dynamic("Content_PublishButton").Location("Actions:10")
-                    .RenderWhen(() => _authorizationService.AuthorizeAsync(user, CommonPermissions.PublishContent, contentItem)),
-                Dynamic("Content_SaveDraftButton").Location("Actions:20")
-                    .RenderWhen(async () =>
-                    {
-                        return contentTypeDefinition.IsDraftable()
-                        && await _authorizationService.AuthorizeAsync(user, CommonPermissions.EditContent, contentItem);
-                    })
-                );
-        }
+        return Combine(
+            Dynamic("Content_PublishButton").Location("Actions:10")
+                .RenderWhen(() => _authorizationService.AuthorizeAsync(user, CommonPermissions.PublishContent, contentItem)),
+            Dynamic("Content_SaveDraftButton").Location("Actions:20")
+                .RenderWhen(async () =>
+                {
+                    return contentTypeDefinition.IsDraftable()
+                    && await _authorizationService.AuthorizeAsync(user, CommonPermissions.EditContent, contentItem);
+                })
+            );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Drivers/DateEditorDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Drivers/DateEditorDriver.cs
index 971ecb3595a..5735ea8ea49 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Drivers/DateEditorDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Drivers/DateEditorDriver.cs
@@ -7,54 +7,53 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Contents.Drivers
+namespace OrchardCore.Contents.Drivers;
+
+public sealed class DateEditorDriver : ContentPartDisplayDriver<CommonPart>
 {
-    public sealed class DateEditorDriver : ContentPartDisplayDriver<CommonPart>
+    private readonly ILocalClock _localClock;
+
+    public DateEditorDriver(ILocalClock localClock)
     {
-        private readonly ILocalClock _localClock;
+        _localClock = localClock;
+    }
 
-        public DateEditorDriver(ILocalClock localClock)
-        {
-            _localClock = localClock;
-        }
+    public override IDisplayResult Edit(CommonPart part, BuildPartEditorContext context)
+    {
+        var settings = context.TypePartDefinition.GetSettings<CommonPartSettings>();
 
-        public override IDisplayResult Edit(CommonPart part, BuildPartEditorContext context)
+        if (settings.DisplayDateEditor)
         {
-            var settings = context.TypePartDefinition.GetSettings<CommonPartSettings>();
-
-            if (settings.DisplayDateEditor)
+            return Initialize<DateEditorViewModel>("CommonPart_Edit__Date", async model =>
             {
-                return Initialize<DateEditorViewModel>("CommonPart_Edit__Date", async model =>
-                {
-                    model.LocalDateTime = part.ContentItem.CreatedUtc.HasValue
-                    ? (await _localClock.ConvertToLocalAsync(part.ContentItem.CreatedUtc.Value)).DateTime
-                    : null;
-                });
-            }
-
-            return null;
+                model.LocalDateTime = part.ContentItem.CreatedUtc.HasValue
+                ? (await _localClock.ConvertToLocalAsync(part.ContentItem.CreatedUtc.Value)).DateTime
+                : null;
+            });
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(CommonPart part, UpdatePartEditorContext context)
+        return null;
+    }
+
+    public override async Task<IDisplayResult> UpdateAsync(CommonPart part, UpdatePartEditorContext context)
+    {
+        var settings = context.TypePartDefinition.GetSettings<CommonPartSettings>();
+
+        if (settings.DisplayDateEditor)
         {
-            var settings = context.TypePartDefinition.GetSettings<CommonPartSettings>();
+            var model = new DateEditorViewModel();
+            await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            if (settings.DisplayDateEditor)
+            if (model.LocalDateTime == null)
             {
-                var model = new DateEditorViewModel();
-                await context.Updater.TryUpdateModelAsync(model, Prefix);
-
-                if (model.LocalDateTime == null)
-                {
-                    part.ContentItem.CreatedUtc = null;
-                }
-                else
-                {
-                    part.ContentItem.CreatedUtc = await _localClock.ConvertToUtcAsync(model.LocalDateTime.Value);
-                }
+                part.ContentItem.CreatedUtc = null;
+            }
+            else
+            {
+                part.ContentItem.CreatedUtc = await _localClock.ConvertToUtcAsync(model.LocalDateTime.Value);
             }
-
-            return Edit(part, context);
         }
+
+        return Edit(part, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Drivers/OwnerEditorDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Drivers/OwnerEditorDriver.cs
index e86418c8d7a..40eef5f54d4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Drivers/OwnerEditorDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Drivers/OwnerEditorDriver.cs
@@ -11,92 +11,91 @@
 using OrchardCore.Mvc.ModelBinding;
 using OrchardCore.Users;
 
-namespace OrchardCore.Contents.Drivers
+namespace OrchardCore.Contents.Drivers;
+
+public sealed class OwnerEditorDriver : ContentPartDisplayDriver<CommonPart>
 {
-    public sealed class OwnerEditorDriver : ContentPartDisplayDriver<CommonPart>
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly UserManager<IUser> _userManager;
+
+    internal readonly IStringLocalizer S;
+
+    public OwnerEditorDriver(IAuthorizationService authorizationService,
+        IHttpContextAccessor httpContextAccessor,
+        UserManager<IUser> userManager,
+        IStringLocalizer<OwnerEditorDriver> stringLocalizer)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly UserManager<IUser> _userManager;
+        _authorizationService = authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+        _userManager = userManager;
+        S = stringLocalizer;
+    }
 
-        internal readonly IStringLocalizer S;
+    public override async Task<IDisplayResult> EditAsync(CommonPart part, BuildPartEditorContext context)
+    {
+        var currentUser = _httpContextAccessor.HttpContext?.User;
 
-        public OwnerEditorDriver(IAuthorizationService authorizationService,
-            IHttpContextAccessor httpContextAccessor,
-            UserManager<IUser> userManager,
-            IStringLocalizer<OwnerEditorDriver> stringLocalizer)
+        if (!await _authorizationService.AuthorizeAsync(currentUser, CommonPermissions.EditContentOwner, part.ContentItem))
         {
-            _authorizationService = authorizationService;
-            _httpContextAccessor = httpContextAccessor;
-            _userManager = userManager;
-            S = stringLocalizer;
+            return null;
         }
 
-        public override async Task<IDisplayResult> EditAsync(CommonPart part, BuildPartEditorContext context)
-        {
-            var currentUser = _httpContextAccessor.HttpContext?.User;
+        var settings = context.TypePartDefinition.GetSettings<CommonPartSettings>();
 
-            if (!await _authorizationService.AuthorizeAsync(currentUser, CommonPermissions.EditContentOwner, part.ContentItem))
+        if (settings.DisplayOwnerEditor)
+        {
+            return Initialize<OwnerEditorViewModel>("CommonPart_Edit__Owner", async model =>
             {
-                return null;
-            }
+                if (!string.IsNullOrEmpty(part.ContentItem.Owner))
+                {
+                    // TODO Move this editor to a user picker.
+                    var user = await _userManager.FindByIdAsync(part.ContentItem.Owner);
 
-            var settings = context.TypePartDefinition.GetSettings<CommonPartSettings>();
+                    model.OwnerName = user?.UserName;
+                }
+            });
+        }
 
-            if (settings.DisplayOwnerEditor)
-            {
-                return Initialize<OwnerEditorViewModel>("CommonPart_Edit__Owner", async model =>
-                {
-                    if (!string.IsNullOrEmpty(part.ContentItem.Owner))
-                    {
-                        // TODO Move this editor to a user picker.
-                        var user = await _userManager.FindByIdAsync(part.ContentItem.Owner);
-
-                        model.OwnerName = user?.UserName;
-                    }
-                });
-            }
+        return null;
+    }
 
+    public override async Task<IDisplayResult> UpdateAsync(CommonPart part, UpdatePartEditorContext context)
+    {
+        var currentUser = _httpContextAccessor.HttpContext?.User;
+
+        if (!await _authorizationService.AuthorizeAsync(currentUser, CommonPermissions.EditContentOwner, part.ContentItem))
+        {
             return null;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(CommonPart part, UpdatePartEditorContext context)
+        var settings = context.TypePartDefinition.GetSettings<CommonPartSettings>();
+
+        if (settings.DisplayOwnerEditor)
         {
-            var currentUser = _httpContextAccessor.HttpContext?.User;
+            var model = new OwnerEditorViewModel();
 
-            if (!await _authorizationService.AuthorizeAsync(currentUser, CommonPermissions.EditContentOwner, part.ContentItem))
+            await context.Updater.TryUpdateModelAsync(model, Prefix);
+
+            if (string.IsNullOrWhiteSpace(model.OwnerName))
             {
-                return null;
+                context.Updater.ModelState.AddModelError(Prefix, nameof(model.OwnerName), S["A value is required for Owner."]);
             }
-
-            var settings = context.TypePartDefinition.GetSettings<CommonPartSettings>();
-
-            if (settings.DisplayOwnerEditor)
+            else
             {
-                var model = new OwnerEditorViewModel();
+                var newOwner = await _userManager.FindByNameAsync(model.OwnerName);
 
-                await context.Updater.TryUpdateModelAsync(model, Prefix);
-
-                if (string.IsNullOrWhiteSpace(model.OwnerName))
+                if (newOwner == null)
                 {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(model.OwnerName), S["A value is required for Owner."]);
+                    context.Updater.ModelState.AddModelError(Prefix, nameof(model.OwnerName), S["Invalid username provided for Owner."]);
                 }
                 else
                 {
-                    var newOwner = await _userManager.FindByNameAsync(model.OwnerName);
-
-                    if (newOwner == null)
-                    {
-                        context.Updater.ModelState.AddModelError(Prefix, nameof(model.OwnerName), S["Invalid username provided for Owner."]);
-                    }
-                    else
-                    {
-                        part.ContentItem.Owner = await _userManager.GetUserIdAsync(newOwner);
-                    }
+                    part.ContentItem.Owner = await _userManager.GetUserIdAsync(newOwner);
                 }
             }
-
-            return await EditAsync(part, context);
         }
+
+        return await EditAsync(part, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Feeds/CommonFeedItemBuilder.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Feeds/CommonFeedItemBuilder.cs
index 7c5be437324..8f0f30f305e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Feeds/CommonFeedItemBuilder.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Feeds/CommonFeedItemBuilder.cs
@@ -7,78 +7,77 @@
 using OrchardCore.Feeds;
 using OrchardCore.Feeds.Models;
 
-namespace OrchardCore.Contents.Feeds.Builders
+namespace OrchardCore.Contents.Feeds.Builders;
+
+public class CommonFeedItemBuilder : IFeedItemBuilder
 {
-    public class CommonFeedItemBuilder : IFeedItemBuilder
+    private readonly IContentManager _contentManager;
+
+    public CommonFeedItemBuilder(IContentManager contentManager)
     {
-        private readonly IContentManager _contentManager;
+        _contentManager = contentManager;
+    }
 
-        public CommonFeedItemBuilder(IContentManager contentManager)
+    public async Task PopulateAsync(FeedContext context)
+    {
+        foreach (var feedItem in context.Response.Items.OfType<FeedItem<ContentItem>>())
         {
-            _contentManager = contentManager;
-        }
+            var contentItem = feedItem.Item;
+            var contentItemMetadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(contentItem);
+            var bodyAspect = await _contentManager.PopulateAspectAsync<BodyAspect>(contentItem);
+            var routes = contentItemMetadata.DisplayRouteValues;
 
-        public async Task PopulateAsync(FeedContext context)
-        {
-            foreach (var feedItem in context.Response.Items.OfType<FeedItem<ContentItem>>())
-            {
-                var contentItem = feedItem.Item;
-                var contentItemMetadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(contentItem);
-                var bodyAspect = await _contentManager.PopulateAspectAsync<BodyAspect>(contentItem);
-                var routes = contentItemMetadata.DisplayRouteValues;
+            // author is intentionally left empty as it could result in unwanted spam
 
-                // author is intentionally left empty as it could result in unwanted spam
+            // add to known formats
+            if (context.Format == "rss")
+            {
+                var link = new XElement("link");
+                var guid = new XElement("guid", new XAttribute("isPermaLink", "true"));
 
-                // add to known formats
-                if (context.Format == "rss")
+                context.Response.Contextualize(contextualize =>
                 {
-                    var link = new XElement("link");
-                    var guid = new XElement("guid", new XAttribute("isPermaLink", "true"));
+                    var request = contextualize.Url.ActionContext.HttpContext.Request;
+                    var url = contextualize.Url.Action(routes["action"].ToString(), routes["controller"].ToString(), routes, request.Scheme);
 
-                    context.Response.Contextualize(contextualize =>
-                    {
-                        var request = contextualize.Url.ActionContext.HttpContext.Request;
-                        var url = contextualize.Url.Action(routes["action"].ToString(), routes["controller"].ToString(), routes, request.Scheme);
+                    link.Add(url);
+                    guid.Add(url);
+                });
 
-                        link.Add(url);
-                        guid.Add(url);
-                    });
+                feedItem.Element.SetElementValue("title", contentItem.DisplayText);
+                feedItem.Element.Add(link);
 
-                    feedItem.Element.SetElementValue("title", contentItem.DisplayText);
-                    feedItem.Element.Add(link);
+                feedItem.Element.Add(new XElement("description", new XCData(bodyAspect.Body?.ToString() ?? string.Empty)));
 
-                    feedItem.Element.Add(new XElement("description", new XCData(bodyAspect.Body?.ToString() ?? string.Empty)));
-
-                    if (contentItem.PublishedUtc != null)
-                    {
-                        // RFC833
-                        // The "R" or "r" standard format specifier represents a custom date and time format string that is defined by
-                        // the DateTimeFormatInfo.RFC1123Pattern property. The pattern reflects a defined standard, and the property
-                        // is read-only. Therefore, it is always the same, regardless of the culture used or the format provider supplied.
-                        // The custom format string is "ddd, dd MMM yyyy HH':'mm':'ss 'GMT'". When this standard format specifier is used,
-                        // the formatting or parsing operation always uses the invariant culture.
-                        feedItem.Element.SetElementValue("pubDate", contentItem.PublishedUtc.Value.ToString("r"));
-                    }
-
-                    feedItem.Element.Add(guid);
+                if (contentItem.PublishedUtc != null)
+                {
+                    // RFC833
+                    // The "R" or "r" standard format specifier represents a custom date and time format string that is defined by
+                    // the DateTimeFormatInfo.RFC1123Pattern property. The pattern reflects a defined standard, and the property
+                    // is read-only. Therefore, it is always the same, regardless of the culture used or the format provider supplied.
+                    // The custom format string is "ddd, dd MMM yyyy HH':'mm':'ss 'GMT'". When this standard format specifier is used,
+                    // the formatting or parsing operation always uses the invariant culture.
+                    feedItem.Element.SetElementValue("pubDate", contentItem.PublishedUtc.Value.ToString("r"));
                 }
-                else
+
+                feedItem.Element.Add(guid);
+            }
+            else
+            {
+                context.Response.Contextualize(contextualize =>
                 {
-                    context.Response.Contextualize(contextualize =>
-                    {
-                        var request = contextualize.Url.ActionContext.HttpContext.Request;
-                        var url = contextualize.Url.Action(routes["action"].ToString(), routes["controller"].ToString(), routes, request.Scheme);
+                    var request = contextualize.Url.ActionContext.HttpContext.Request;
+                    var url = contextualize.Url.Action(routes["action"].ToString(), routes["controller"].ToString(), routes, request.Scheme);
 
-                        context.Builder.AddProperty(context, feedItem, "link", url);
-                    });
+                    context.Builder.AddProperty(context, feedItem, "link", url);
+                });
 
-                    context.Builder.AddProperty(context, feedItem, "title", contentItem.DisplayText);
-                    context.Builder.AddProperty(context, feedItem, new XElement("description", new XCData(bodyAspect.Body?.ToString() ?? string.Empty)));
+                context.Builder.AddProperty(context, feedItem, "title", contentItem.DisplayText);
+                context.Builder.AddProperty(context, feedItem, new XElement("description", new XCData(bodyAspect.Body?.ToString() ?? string.Empty)));
 
-                    if (contentItem.PublishedUtc != null)
-                    {
-                        context.Builder.AddProperty(context, feedItem, "published-date", contentItem.PublishedUtc.Value.ToString("r"));
-                    }
+                if (contentItem.PublishedUtc != null)
+                {
+                    context.Builder.AddProperty(context, feedItem, "published-date", contentItem.PublishedUtc.Value.ToString("r"));
                 }
             }
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Contents/GraphQL/Startup.cs
index 38d398b6355..f34c7b904b0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/GraphQL/Startup.cs
@@ -2,14 +2,13 @@
 using OrchardCore.ContentManagement.GraphQL;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Contents.GraphQL
+namespace OrchardCore.Contents.GraphQL;
+
+[RequireFeatures("OrchardCore.Apis.GraphQL")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Apis.GraphQL")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddContentGraphQL();
-        }
+        services.AddContentGraphQL();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Handlers/ContentsHandler.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Handlers/ContentsHandler.cs
index c51d591859c..a21bde7f827 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Handlers/ContentsHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Handlers/ContentsHandler.cs
@@ -4,83 +4,82 @@
 using OrchardCore.ContentManagement.Handlers;
 using OrchardCore.Environment.Cache;
 
-namespace OrchardCore.Contents.Handlers
+namespace OrchardCore.Contents.Handlers;
+
+public class ContentsHandler : ContentHandlerBase
 {
-    public class ContentsHandler : ContentHandlerBase
+    private readonly ITagCache _tagCache;
+
+    public ContentsHandler(ITagCache tagCache)
     {
-        private readonly ITagCache _tagCache;
+        _tagCache = tagCache;
+    }
 
-        public ContentsHandler(ITagCache tagCache)
-        {
-            _tagCache = tagCache;
-        }
+    public override Task PublishedAsync(PublishContentContext context)
+    {
+        return _tagCache.RemoveTagAsync($"contentitemid:{context.ContentItem.ContentItemId}");
+    }
 
-        public override Task PublishedAsync(PublishContentContext context)
+    public override Task RemovedAsync(RemoveContentContext context)
+    {
+        if (context.NoActiveVersionLeft)
         {
             return _tagCache.RemoveTagAsync($"contentitemid:{context.ContentItem.ContentItemId}");
         }
 
-        public override Task RemovedAsync(RemoveContentContext context)
-        {
-            if (context.NoActiveVersionLeft)
-            {
-                return _tagCache.RemoveTagAsync($"contentitemid:{context.ContentItem.ContentItemId}");
-            }
-
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
+    }
 
-        public override Task UnpublishedAsync(PublishContentContext context)
-        {
-            return _tagCache.RemoveTagAsync($"contentitemid:{context.ContentItem.ContentItemId}");
-        }
+    public override Task UnpublishedAsync(PublishContentContext context)
+    {
+        return _tagCache.RemoveTagAsync($"contentitemid:{context.ContentItem.ContentItemId}");
+    }
 
-        public override Task GetContentItemAspectAsync(ContentItemAspectContext context)
+    public override Task GetContentItemAspectAsync(ContentItemAspectContext context)
+    {
+        return context.ForAsync<ContentItemMetadata>(metadata =>
         {
-            return context.ForAsync<ContentItemMetadata>(metadata =>
+            metadata.CreateRouteValues ??= new RouteValueDictionary
             {
-                metadata.CreateRouteValues ??= new RouteValueDictionary
-                {
-                    { "Area", "OrchardCore.Contents" },
-                    { "Controller", "Admin" },
-                    { "Action", "Create" },
-                    { "Id", context.ContentItem.ContentType },
-                };
+                { "Area", "OrchardCore.Contents" },
+                { "Controller", "Admin" },
+                { "Action", "Create" },
+                { "Id", context.ContentItem.ContentType },
+            };
 
-                metadata.EditorRouteValues ??= new RouteValueDictionary
-                {
-                    { "Area", "OrchardCore.Contents" },
-                    { "Controller", "Admin" },
-                    { "Action", "Edit" },
-                    { "ContentItemId", context.ContentItem.ContentItemId },
-                };
+            metadata.EditorRouteValues ??= new RouteValueDictionary
+            {
+                { "Area", "OrchardCore.Contents" },
+                { "Controller", "Admin" },
+                { "Action", "Edit" },
+                { "ContentItemId", context.ContentItem.ContentItemId },
+            };
 
-                metadata.AdminRouteValues ??= new RouteValueDictionary
-                {
-                    { "Area", "OrchardCore.Contents" },
-                    { "Controller", "Admin" },
-                    { "Action", "Edit" },
-                    { "ContentItemId", context.ContentItem.ContentItemId },
-                };
+            metadata.AdminRouteValues ??= new RouteValueDictionary
+            {
+                { "Area", "OrchardCore.Contents" },
+                { "Controller", "Admin" },
+                { "Action", "Edit" },
+                { "ContentItemId", context.ContentItem.ContentItemId },
+            };
 
-                metadata.DisplayRouteValues ??= new RouteValueDictionary
-                {
-                    { "Area", "OrchardCore.Contents" },
-                    { "Controller", "Item" },
-                    { "Action", "Display" },
-                    { "ContentItemId", context.ContentItem.ContentItemId },
-                };
+            metadata.DisplayRouteValues ??= new RouteValueDictionary
+            {
+                { "Area", "OrchardCore.Contents" },
+                { "Controller", "Item" },
+                { "Action", "Display" },
+                { "ContentItemId", context.ContentItem.ContentItemId },
+            };
 
-                metadata.RemoveRouteValues ??= new RouteValueDictionary
-                {
-                    { "Area", "OrchardCore.Contents" },
-                    { "Controller", "Admin" },
-                    { "Action", "Remove" },
-                    { "ContentItemId", context.ContentItem.ContentItemId },
-                };
+            metadata.RemoveRouteValues ??= new RouteValueDictionary
+            {
+                { "Area", "OrchardCore.Contents" },
+                { "Controller", "Admin" },
+                { "Action", "Remove" },
+                { "ContentItemId", context.ContentItem.ContentItemId },
+            };
 
-                return Task.CompletedTask;
-            });
-        }
+            return Task.CompletedTask;
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Handlers/FullTextAspectContentHandler.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Handlers/FullTextAspectContentHandler.cs
index c8e2a15e899..5de168c37d5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Handlers/FullTextAspectContentHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Handlers/FullTextAspectContentHandler.cs
@@ -13,70 +13,69 @@
 using OrchardCore.Contents.Models;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Contents.Handlers
+namespace OrchardCore.Contents.Handlers;
+
+/// <summary>
+/// Provides the content for FullTextAspect based on FullTextAspectSettings.
+/// </summary>
+public class FullTextAspectContentHandler : ContentHandlerBase
 {
-    /// <summary>
-    /// Provides the content for FullTextAspect based on FullTextAspectSettings.
-    /// </summary>
-    public class FullTextAspectContentHandler : ContentHandlerBase
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly IServiceProvider _serviceProvider;
+
+    public FullTextAspectContentHandler(
+        IContentDefinitionManager contentDefinitionManager,
+        ILiquidTemplateManager liquidTemplateManager,
+        IServiceProvider serviceProvider
+        )
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+        _liquidTemplateManager = liquidTemplateManager;
+        _serviceProvider = serviceProvider;
+    }
+
+    public override async Task GetContentItemAspectAsync(ContentItemAspectContext context)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly IServiceProvider _serviceProvider;
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
 
-        public FullTextAspectContentHandler(
-            IContentDefinitionManager contentDefinitionManager,
-            ILiquidTemplateManager liquidTemplateManager,
-            IServiceProvider serviceProvider
-            )
+        if (contentTypeDefinition == null)
         {
-            _contentDefinitionManager = contentDefinitionManager;
-            _liquidTemplateManager = liquidTemplateManager;
-            _serviceProvider = serviceProvider;
+            return;
         }
 
-        public override async Task GetContentItemAspectAsync(ContentItemAspectContext context)
+        await context.ForAsync<FullTextAspect>(async fullTextAspect =>
         {
             var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
+            var settings = contentTypeDefinition.GetSettings<FullTextAspectSettings>();
 
-            if (contentTypeDefinition == null)
+            if (settings.IncludeDisplayText)
             {
-                return;
+                fullTextAspect.Segments.Add(context.ContentItem.DisplayText);
             }
 
-            await context.ForAsync<FullTextAspect>(async fullTextAspect =>
+            if (settings.IncludeBodyAspect)
             {
-                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
-                var settings = contentTypeDefinition.GetSettings<FullTextAspectSettings>();
+                // Lazy resolution to prevent cyclic dependency of content handlers
+                var contentManager = _serviceProvider.GetRequiredService<IContentManager>();
+                var bodyAspect = await contentManager.PopulateAspectAsync<BodyAspect>(context.ContentItem);
 
-                if (settings.IncludeDisplayText)
+                if (bodyAspect != null && bodyAspect.Body != null)
                 {
-                    fullTextAspect.Segments.Add(context.ContentItem.DisplayText);
-                }
-
-                if (settings.IncludeBodyAspect)
-                {
-                    // Lazy resolution to prevent cyclic dependency of content handlers
-                    var contentManager = _serviceProvider.GetRequiredService<IContentManager>();
-                    var bodyAspect = await contentManager.PopulateAspectAsync<BodyAspect>(context.ContentItem);
-
-                    if (bodyAspect != null && bodyAspect.Body != null)
-                    {
-                        using var sw = new ZStringWriter();
-                        // Don't encode the body
-                        bodyAspect.Body.WriteTo(sw, NullHtmlEncoder.Default);
-                        fullTextAspect.Segments.Add(sw.ToString());
-                    }
+                    using var sw = new ZStringWriter();
+                    // Don't encode the body
+                    bodyAspect.Body.WriteTo(sw, NullHtmlEncoder.Default);
+                    fullTextAspect.Segments.Add(sw.ToString());
                 }
+            }
 
-                if (settings.IncludeFullTextTemplate && !string.IsNullOrEmpty(settings.FullTextTemplate))
-                {
-                    var result = await _liquidTemplateManager.RenderStringAsync(settings.FullTextTemplate, NullEncoder.Default, context.ContentItem,
-                        new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(context.ContentItem) });
+            if (settings.IncludeFullTextTemplate && !string.IsNullOrEmpty(settings.FullTextTemplate))
+            {
+                var result = await _liquidTemplateManager.RenderStringAsync(settings.FullTextTemplate, NullEncoder.Default, context.ContentItem,
+                    new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(context.ContentItem) });
 
-                    fullTextAspect.Segments.Add(result);
-                }
-            });
-        }
+                fullTextAspect.Segments.Add(result);
+            }
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Indexing/AspectsContentIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Indexing/AspectsContentIndexHandler.cs
index 375ca1a40a1..7f162e64da1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Indexing/AspectsContentIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Indexing/AspectsContentIndexHandler.cs
@@ -4,45 +4,44 @@
 using OrchardCore.Indexing;
 using OrchardCore.Mvc.Utilities;
 
-namespace OrchardCore.Contents.Indexing
+namespace OrchardCore.Contents.Indexing;
+
+public class AspectsContentIndexHandler : IContentItemIndexHandler
 {
-    public class AspectsContentIndexHandler : IContentItemIndexHandler
+    private readonly IContentManager _contentManager;
+
+    public AspectsContentIndexHandler(IContentManager contentManager)
     {
-        private readonly IContentManager _contentManager;
+        _contentManager = contentManager;
+    }
 
-        public AspectsContentIndexHandler(IContentManager contentManager)
-        {
-            _contentManager = contentManager;
-        }
+    public async Task BuildIndexAsync(BuildIndexContext context)
+    {
+        var body = await _contentManager.PopulateAspectAsync(context.ContentItem, new BodyAspect());
 
-        public async Task BuildIndexAsync(BuildIndexContext context)
+        if (body != null && body.Body != null)
         {
-            var body = await _contentManager.PopulateAspectAsync(context.ContentItem, new BodyAspect());
-
-            if (body != null && body.Body != null)
-            {
-                context.DocumentIndex.Set(
-                    IndexingConstants.BodyAspectBodyKey,
-                    body.Body,
-                    DocumentIndexOptions.Sanitize);
-            }
-
             context.DocumentIndex.Set(
-                IndexingConstants.DisplayTextAnalyzedKey,
-                context.ContentItem.DisplayText,
+                IndexingConstants.BodyAspectBodyKey,
+                body.Body,
                 DocumentIndexOptions.Sanitize);
+        }
 
-            // We need to store because of ContentPickerResultProvider(s)
-            context.DocumentIndex.Set(
-                IndexingConstants.DisplayTextKey + IndexingConstants.KeywordKey,
-                context.ContentItem.DisplayText,
-                DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
+        context.DocumentIndex.Set(
+            IndexingConstants.DisplayTextAnalyzedKey,
+            context.ContentItem.DisplayText,
+            DocumentIndexOptions.Sanitize);
 
-            // We need to store because of ContentPickerResultProvider(s)
-            context.DocumentIndex.Set(
-                IndexingConstants.DisplayTextNormalizedKey,
-                context.ContentItem.DisplayText?.ReplaceDiacritics().ToLower(),
-                DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
-        }
+        // We need to store because of ContentPickerResultProvider(s)
+        context.DocumentIndex.Set(
+            IndexingConstants.DisplayTextKey + IndexingConstants.KeywordKey,
+            context.ContentItem.DisplayText,
+            DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
+
+        // We need to store because of ContentPickerResultProvider(s)
+        context.DocumentIndex.Set(
+            IndexingConstants.DisplayTextNormalizedKey,
+            context.ContentItem.DisplayText?.ReplaceDiacritics().ToLower(),
+            DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Indexing/ContentItemIndexCoordinator.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Indexing/ContentItemIndexCoordinator.cs
index 8ee8123ed7a..07292a5b289 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Indexing/ContentItemIndexCoordinator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Indexing/ContentItemIndexCoordinator.cs
@@ -6,81 +6,80 @@
 using OrchardCore.Indexing;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Contents.Indexing
+namespace OrchardCore.Contents.Indexing;
+
+/// <summary>
+/// Enumerates all parts and fields of content item to extract indexed properties.
+/// </summary>
+public class ContentItemIndexCoordinator : IContentItemIndexHandler
 {
-    /// <summary>
-    /// Enumerates all parts and fields of content item to extract indexed properties.
-    /// </summary>
-    public class ContentItemIndexCoordinator : IContentItemIndexHandler
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ITypeActivatorFactory<ContentPart> _contentPartFactory;
+    private readonly IEnumerable<IContentPartIndexHandler> _partIndexHandlers;
+    private readonly IEnumerable<IContentFieldIndexHandler> _fieldIndexHandlers;
+    private readonly ILogger _logger;
+
+    public ContentItemIndexCoordinator(
+        IContentDefinitionManager contentDefinitionManager,
+        ITypeActivatorFactory<ContentPart> contentPartFactory,
+        IEnumerable<IContentPartIndexHandler> partIndexHandlers,
+        IEnumerable<IContentFieldIndexHandler> fieldIndexHandlers,
+        ILogger<ContentItemIndexCoordinator> logger)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+        _contentPartFactory = contentPartFactory;
+        _partIndexHandlers = partIndexHandlers;
+        _fieldIndexHandlers = fieldIndexHandlers;
+        _logger = logger;
+    }
+
+    public async Task BuildIndexAsync(BuildIndexContext context)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly ITypeActivatorFactory<ContentPart> _contentPartFactory;
-        private readonly IEnumerable<IContentPartIndexHandler> _partIndexHandlers;
-        private readonly IEnumerable<IContentFieldIndexHandler> _fieldIndexHandlers;
-        private readonly ILogger _logger;
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
 
-        public ContentItemIndexCoordinator(
-            IContentDefinitionManager contentDefinitionManager,
-            ITypeActivatorFactory<ContentPart> contentPartFactory,
-            IEnumerable<IContentPartIndexHandler> partIndexHandlers,
-            IEnumerable<IContentFieldIndexHandler> fieldIndexHandlers,
-            ILogger<ContentItemIndexCoordinator> logger)
+        if (contentTypeDefinition == null)
         {
-            _contentDefinitionManager = contentDefinitionManager;
-            _contentPartFactory = contentPartFactory;
-            _partIndexHandlers = partIndexHandlers;
-            _fieldIndexHandlers = fieldIndexHandlers;
-            _logger = logger;
+            return;
         }
 
-        public async Task BuildIndexAsync(BuildIndexContext context)
+        foreach (var contentTypePartDefinition in contentTypeDefinition.Parts)
         {
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
+            var partName = contentTypePartDefinition.Name;
+            var partTypeName = contentTypePartDefinition.PartDefinition.Name;
+            var partActivator = _contentPartFactory.GetTypeActivator(partTypeName);
+            var part = (ContentPart)context.ContentItem.Get(partActivator.Type, partName);
+
+            var contentTypePartDefinitionMethod = contentTypePartDefinition.GetType().GetMethod("GetSettings");
+            var contentTypePartDefinitionGeneric = contentTypePartDefinitionMethod.MakeGenericMethod(context.Settings.GetType());
+            var typePartIndexSettings = (IContentIndexSettings)contentTypePartDefinitionGeneric.Invoke(contentTypePartDefinition, null);
 
-            if (contentTypeDefinition == null)
+            // Skip this part if it's not included in the index and it's not the default type part
+            if (contentTypeDefinition.Name != partTypeName && !typePartIndexSettings.Included)
             {
-                return;
+                continue;
             }
 
-            foreach (var contentTypePartDefinition in contentTypeDefinition.Parts)
-            {
-                var partName = contentTypePartDefinition.Name;
-                var partTypeName = contentTypePartDefinition.PartDefinition.Name;
-                var partActivator = _contentPartFactory.GetTypeActivator(partTypeName);
-                var part = (ContentPart)context.ContentItem.Get(partActivator.Type, partName);
+            await _partIndexHandlers.InvokeAsync((handler, part, contentTypePartDefinition, context, typePartIndexSettings) =>
+                handler.BuildIndexAsync(part, contentTypePartDefinition, context, typePartIndexSettings),
+                    part, contentTypePartDefinition, context, typePartIndexSettings, _logger);
 
-                var contentTypePartDefinitionMethod = contentTypePartDefinition.GetType().GetMethod("GetSettings");
-                var contentTypePartDefinitionGeneric = contentTypePartDefinitionMethod.MakeGenericMethod(context.Settings.GetType());
-                var typePartIndexSettings = (IContentIndexSettings)contentTypePartDefinitionGeneric.Invoke(contentTypePartDefinition, null);
+            foreach (var contentPartFieldDefinition in contentTypePartDefinition.PartDefinition.Fields)
+            {
+                var contentPartFieldDefinitionMethod = contentPartFieldDefinition.GetType().GetMethod("GetSettings");
+                var contentPartFieldDefinitionGeneric = contentPartFieldDefinitionMethod.MakeGenericMethod(context.Settings.GetType());
+                var partFieldIndexSettings = (IContentIndexSettings)contentPartFieldDefinitionGeneric.Invoke(contentPartFieldDefinition, null);
 
-                // Skip this part if it's not included in the index and it's not the default type part
-                if (contentTypeDefinition.Name != partTypeName && !typePartIndexSettings.Included)
+                if (!partFieldIndexSettings.Included)
                 {
                     continue;
                 }
 
-                await _partIndexHandlers.InvokeAsync((handler, part, contentTypePartDefinition, context, typePartIndexSettings) =>
-                    handler.BuildIndexAsync(part, contentTypePartDefinition, context, typePartIndexSettings),
-                        part, contentTypePartDefinition, context, typePartIndexSettings, _logger);
-
-                foreach (var contentPartFieldDefinition in contentTypePartDefinition.PartDefinition.Fields)
-                {
-                    var contentPartFieldDefinitionMethod = contentPartFieldDefinition.GetType().GetMethod("GetSettings");
-                    var contentPartFieldDefinitionGeneric = contentPartFieldDefinitionMethod.MakeGenericMethod(context.Settings.GetType());
-                    var partFieldIndexSettings = (IContentIndexSettings)contentPartFieldDefinitionGeneric.Invoke(contentPartFieldDefinition, null);
-
-                    if (!partFieldIndexSettings.Included)
-                    {
-                        continue;
-                    }
-
-                    await _fieldIndexHandlers.InvokeAsync((handler, part, contentTypePartDefinition, contentPartFieldDefinition, context, partFieldIndexSettings) =>
-                        handler.BuildIndexAsync(part, contentTypePartDefinition, contentPartFieldDefinition, context, partFieldIndexSettings),
-                            part, contentTypePartDefinition, contentPartFieldDefinition, context, partFieldIndexSettings, _logger);
-                }
+                await _fieldIndexHandlers.InvokeAsync((handler, part, contentTypePartDefinition, contentPartFieldDefinition, context, partFieldIndexSettings) =>
+                    handler.BuildIndexAsync(part, contentTypePartDefinition, contentPartFieldDefinition, context, partFieldIndexSettings),
+                        part, contentTypePartDefinition, contentPartFieldDefinition, context, partFieldIndexSettings, _logger);
             }
-
-            return;
         }
+
+        return;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Indexing/DefaultContentIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Indexing/DefaultContentIndexHandler.cs
index 4c987038256..16026c6820b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Indexing/DefaultContentIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Indexing/DefaultContentIndexHandler.cs
@@ -1,54 +1,53 @@
 using System.Threading.Tasks;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.Contents.Indexing
+namespace OrchardCore.Contents.Indexing;
+
+public class DefaultContentIndexHandler : IContentItemIndexHandler
 {
-    public class DefaultContentIndexHandler : IContentItemIndexHandler
+    public Task BuildIndexAsync(BuildIndexContext context)
     {
-        public Task BuildIndexAsync(BuildIndexContext context)
-        {
-            context.DocumentIndex.Set(
-                IndexingConstants.ContentTypeKey,
-                context.ContentItem.ContentType,
-                DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
-
-            context.DocumentIndex.Set(
-                IndexingConstants.CreatedUtcKey,
-                context.ContentItem.CreatedUtc,
-                DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
-
-            context.DocumentIndex.Set(
-                IndexingConstants.LatestKey,
-                context.ContentItem.Latest,
-                DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
-
-            context.DocumentIndex.Set(
-                IndexingConstants.OwnerKey,
-                context.ContentItem.Owner,
-                DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
-
-            context.DocumentIndex.Set(
-                IndexingConstants.AuthorKey,
-                context.ContentItem.Author,
-                DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
-
-            context.DocumentIndex.Set(
-                IndexingConstants.ModifiedUtcKey,
-                context.ContentItem.ModifiedUtc,
-                DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
-
-            // We need to store because of ContentPickerResultProvider(s)
-            context.DocumentIndex.Set(
-                IndexingConstants.PublishedKey,
-                context.ContentItem.Published,
-                DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
-
-            context.DocumentIndex.Set(
-                IndexingConstants.PublishedUtcKey,
-                context.ContentItem.PublishedUtc,
-                DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
-
-            return Task.CompletedTask;
-        }
+        context.DocumentIndex.Set(
+            IndexingConstants.ContentTypeKey,
+            context.ContentItem.ContentType,
+            DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
+
+        context.DocumentIndex.Set(
+            IndexingConstants.CreatedUtcKey,
+            context.ContentItem.CreatedUtc,
+            DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
+
+        context.DocumentIndex.Set(
+            IndexingConstants.LatestKey,
+            context.ContentItem.Latest,
+            DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
+
+        context.DocumentIndex.Set(
+            IndexingConstants.OwnerKey,
+            context.ContentItem.Owner,
+            DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
+
+        context.DocumentIndex.Set(
+            IndexingConstants.AuthorKey,
+            context.ContentItem.Author,
+            DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
+
+        context.DocumentIndex.Set(
+            IndexingConstants.ModifiedUtcKey,
+            context.ContentItem.ModifiedUtc,
+            DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
+
+        // We need to store because of ContentPickerResultProvider(s)
+        context.DocumentIndex.Set(
+            IndexingConstants.PublishedKey,
+            context.ContentItem.Published,
+            DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
+
+        context.DocumentIndex.Set(
+            IndexingConstants.PublishedUtcKey,
+            context.ContentItem.PublishedUtc,
+            DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Indexing/FullTextContentIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Indexing/FullTextContentIndexHandler.cs
index 6030782a988..27047df3b64 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Indexing/FullTextContentIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Indexing/FullTextContentIndexHandler.cs
@@ -4,32 +4,31 @@
 using OrchardCore.ContentManagement.Models;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.Contents.Indexing
-{
-    public class FullTextContentIndexHandler(IContentManager contentManager) : IContentItemIndexHandler
-    {
-        private readonly IContentManager _contentManager = contentManager;
+namespace OrchardCore.Contents.Indexing;
 
-        public async Task BuildIndexAsync(BuildIndexContext context)
-        {
-            var result = await _contentManager.PopulateAspectAsync<FullTextAspect>(context.ContentItem);
+public class FullTextContentIndexHandler(IContentManager contentManager) : IContentItemIndexHandler
+{
+    private readonly IContentManager _contentManager = contentManager;
 
-            using var stringBuilder = ZString.CreateStringBuilder();
+    public async Task BuildIndexAsync(BuildIndexContext context)
+    {
+        var result = await _contentManager.PopulateAspectAsync<FullTextAspect>(context.ContentItem);
 
-            foreach (var segment in result.Segments)
-            {
-                stringBuilder.Append(segment);
-                stringBuilder.Append(" ");
-            }
+        using var stringBuilder = ZString.CreateStringBuilder();
 
-            var value = stringBuilder.ToString();
+        foreach (var segment in result.Segments)
+        {
+            stringBuilder.Append(segment);
+            stringBuilder.Append(" ");
+        }
 
-            if (string.IsNullOrEmpty(value))
-            {
-                return;
-            }
+        var value = stringBuilder.ToString();
 
-            context.DocumentIndex.Set(IndexingConstants.FullTextKey, value, DocumentIndexOptions.Sanitize);
+        if (string.IsNullOrEmpty(value))
+        {
+            return;
         }
+
+        context.DocumentIndex.Set(IndexingConstants.FullTextKey, value, DocumentIndexOptions.Sanitize);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/BuildDisplayFilter.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/BuildDisplayFilter.cs
index 8112c3aa4b4..29c1f8d13ea 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/BuildDisplayFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/BuildDisplayFilter.cs
@@ -9,70 +9,69 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Contents.Liquid
+namespace OrchardCore.Contents.Liquid;
+
+public class BuildDisplayFilter : ILiquidFilter
 {
-    public class BuildDisplayFilter : ILiquidFilter
-    {
-        private const int DefaultMaxContentItemRecursions = 20;
+    private const int DefaultMaxContentItemRecursions = 20;
 
-        private readonly IContentItemRecursionHelper<BuildDisplayFilter> _buildDisplayRecursionHelper;
-        private readonly IContentItemDisplayManager _contentItemDisplayManager;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly IContentItemRecursionHelper<BuildDisplayFilter> _buildDisplayRecursionHelper;
+    private readonly IContentItemDisplayManager _contentItemDisplayManager;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
 
-        public BuildDisplayFilter(
-            IContentItemRecursionHelper<BuildDisplayFilter> buildDisplayRecursionHelper,
-            IContentItemDisplayManager contentItemDisplayManager,
-            IUpdateModelAccessor updateModelAccessor)
-        {
-            _buildDisplayRecursionHelper = buildDisplayRecursionHelper;
-            _contentItemDisplayManager = contentItemDisplayManager;
-            _updateModelAccessor = updateModelAccessor;
-        }
+    public BuildDisplayFilter(
+        IContentItemRecursionHelper<BuildDisplayFilter> buildDisplayRecursionHelper,
+        IContentItemDisplayManager contentItemDisplayManager,
+        IUpdateModelAccessor updateModelAccessor)
+    {
+        _buildDisplayRecursionHelper = buildDisplayRecursionHelper;
+        _contentItemDisplayManager = contentItemDisplayManager;
+        _updateModelAccessor = updateModelAccessor;
+    }
 
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        static async ValueTask<FluidValue> Awaited(Task<IShape> task, TemplateOptions options)
         {
-            static async ValueTask<FluidValue> Awaited(Task<IShape> task, TemplateOptions options)
-            {
-                return FluidValue.Create(await task, options);
-            }
-
-            var obj = input.ToObjectValue();
+            return FluidValue.Create(await task, options);
+        }
 
-            if (obj is not ContentItem contentItem)
-            {
-                contentItem = null;
+        var obj = input.ToObjectValue();
 
-                if (obj is JsonObject jObject)
-                {
-                    contentItem = jObject.ToObject<ContentItem>();
-                }
-            }
+        if (obj is not ContentItem contentItem)
+        {
+            contentItem = null;
 
-            // If input is a 'JObject' but which not represents a 'ContentItem',
-            // a 'ContentItem' is still created but with some null properties.
-            if (contentItem?.ContentItemId == null)
+            if (obj is JsonObject jObject)
             {
-                return new ValueTask<FluidValue>(NilValue.Instance);
+                contentItem = jObject.ToObject<ContentItem>();
             }
+        }
 
-            // When {{ Model.ContentItem | shape_build_display | shape_render }} is called prevent unlimited recursions.
-            // max_recursions is an optional argument to override the default limit of 20.
-            var maxRecursions = arguments["max_recursions"];
-            var recursionLimit = maxRecursions.Type == FluidValues.Number ? Convert.ToInt32(maxRecursions.ToNumberValue()) : DefaultMaxContentItemRecursions;
-            if (_buildDisplayRecursionHelper.IsRecursive(contentItem, recursionLimit))
-            {
-                return new ValueTask<FluidValue>(NilValue.Instance);
-            }
+        // If input is a 'JObject' but which not represents a 'ContentItem',
+        // a 'ContentItem' is still created but with some null properties.
+        if (contentItem?.ContentItemId == null)
+        {
+            return new ValueTask<FluidValue>(NilValue.Instance);
+        }
 
-            var displayType = arguments["type"].Or(arguments.At(0)).ToStringValue();
+        // When {{ Model.ContentItem | shape_build_display | shape_render }} is called prevent unlimited recursions.
+        // max_recursions is an optional argument to override the default limit of 20.
+        var maxRecursions = arguments["max_recursions"];
+        var recursionLimit = maxRecursions.Type == FluidValues.Number ? Convert.ToInt32(maxRecursions.ToNumberValue()) : DefaultMaxContentItemRecursions;
+        if (_buildDisplayRecursionHelper.IsRecursive(contentItem, recursionLimit))
+        {
+            return new ValueTask<FluidValue>(NilValue.Instance);
+        }
 
-            var task = _contentItemDisplayManager.BuildDisplayAsync(contentItem, _updateModelAccessor.ModelUpdater, displayType);
-            if (task.IsCompletedSuccessfully)
-            {
-                return new ValueTask<FluidValue>(FluidValue.Create(task.Result, ctx.Options));
-            }
+        var displayType = arguments["type"].Or(arguments.At(0)).ToStringValue();
 
-            return Awaited(task, ctx.Options);
+        var task = _contentItemDisplayManager.BuildDisplayAsync(contentItem, _updateModelAccessor.ModelUpdater, displayType);
+        if (task.IsCompletedSuccessfully)
+        {
+            return new ValueTask<FluidValue>(FluidValue.Create(task.Result, ctx.Options));
         }
+
+        return Awaited(task, ctx.Options);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/ContentAnchorTag.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/ContentAnchorTag.cs
index d15dc5bfbd8..cd6079abdff 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/ContentAnchorTag.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/ContentAnchorTag.cs
@@ -14,228 +14,227 @@
 using OrchardCore.DisplayManagement.Liquid.Tags;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Contents.Liquid
+namespace OrchardCore.Contents.Liquid;
+
+public class ContentAnchorTag : IAnchorTag
 {
-    public class ContentAnchorTag : IAnchorTag
-    {
-        public int Order => -10;
+    public int Order => -10;
 
-        public bool Match(IReadOnlyList<FilterArgument> argumentsList)
+    public bool Match(IReadOnlyList<FilterArgument> argumentsList)
+    {
+        foreach (var argument in argumentsList)
         {
-            foreach (var argument in argumentsList)
+            switch (argument.Name)
             {
-                switch (argument.Name)
-                {
-                    case "admin_for":
-                    case "display_for":
-                    case "edit_for":
-                    case "remove_for":
-                    case "create_for": return true;
-                }
+                case "admin_for":
+                case "display_for":
+                case "edit_for":
+                case "remove_for":
+                case "create_for": return true;
             }
-
-            return false;
         }
 
-        public async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, LiquidTemplateContext context)
-        {
-            var services = context.Services;
-            var viewContext = context.ViewContext;
-            var urlHelperFactory = services.GetRequiredService<IUrlHelperFactory>();
-            var contentManager = services.GetRequiredService<IContentManager>();
+        return false;
+    }
+
+    public async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, LiquidTemplateContext context)
+    {
+        var services = context.Services;
+        var viewContext = context.ViewContext;
+        var urlHelperFactory = services.GetRequiredService<IUrlHelperFactory>();
+        var contentManager = services.GetRequiredService<IContentManager>();
 
-            ContentItem adminFor = null;
-            ContentItem displayFor = null;
-            ContentItem editFor = null;
-            ContentItem removeFor = null;
-            ContentItem createFor = null;
+        ContentItem adminFor = null;
+        ContentItem displayFor = null;
+        ContentItem editFor = null;
+        ContentItem removeFor = null;
+        ContentItem createFor = null;
 
-            Dictionary<string, string> routeValues = null;
-            Dictionary<string, string> customAttributes = [];
+        Dictionary<string, string> routeValues = null;
+        Dictionary<string, string> customAttributes = [];
 
-            foreach (var argument in argumentsList)
+        foreach (var argument in argumentsList)
+        {
+            switch (argument.Name)
             {
-                switch (argument.Name)
-                {
-                    case "admin_for": adminFor = (await argument.Expression.EvaluateAsync(context)).ToObjectValue() as ContentItem; break;
-                    case "display_for": displayFor = (await argument.Expression.EvaluateAsync(context)).ToObjectValue() as ContentItem; break;
-                    case "edit_for": editFor = (await argument.Expression.EvaluateAsync(context)).ToObjectValue() as ContentItem; break;
-                    case "remove_for": removeFor = (await argument.Expression.EvaluateAsync(context)).ToObjectValue() as ContentItem; break;
-                    case "create_for": createFor = (await argument.Expression.EvaluateAsync(context)).ToObjectValue() as ContentItem; break;
+                case "admin_for": adminFor = (await argument.Expression.EvaluateAsync(context)).ToObjectValue() as ContentItem; break;
+                case "display_for": displayFor = (await argument.Expression.EvaluateAsync(context)).ToObjectValue() as ContentItem; break;
+                case "edit_for": editFor = (await argument.Expression.EvaluateAsync(context)).ToObjectValue() as ContentItem; break;
+                case "remove_for": removeFor = (await argument.Expression.EvaluateAsync(context)).ToObjectValue() as ContentItem; break;
+                case "create_for": createFor = (await argument.Expression.EvaluateAsync(context)).ToObjectValue() as ContentItem; break;
 
-                    default:
+                default:
 
-                        if (argument.Name.StartsWith("route_", StringComparison.OrdinalIgnoreCase))
-                        {
-                            routeValues ??= [];
-                            routeValues[argument.Name[6..]] = (await argument.Expression.EvaluateAsync(context)).ToStringValue();
-                        }
-                        else
-                        {
-                            customAttributes[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToStringValue();
-                        }
+                    if (argument.Name.StartsWith("route_", StringComparison.OrdinalIgnoreCase))
+                    {
+                        routeValues ??= [];
+                        routeValues[argument.Name[6..]] = (await argument.Expression.EvaluateAsync(context)).ToStringValue();
+                    }
+                    else
+                    {
+                        customAttributes[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToStringValue();
+                    }
 
-                        break;
-                }
+                    break;
             }
+        }
 
-            ContentItem contentItem = null;
+        ContentItem contentItem = null;
 
-            var urlHelper = urlHelperFactory.GetUrlHelper(viewContext);
+        var urlHelper = urlHelperFactory.GetUrlHelper(viewContext);
 
-            if (displayFor != null)
-            {
-                contentItem = displayFor;
-                var previewAspect = await contentManager.PopulateAspectAsync<PreviewAspect>(contentItem);
+        if (displayFor != null)
+        {
+            contentItem = displayFor;
+            var previewAspect = await contentManager.PopulateAspectAsync<PreviewAspect>(contentItem);
 
-                if (!string.IsNullOrEmpty(previewAspect.PreviewUrl))
+            if (!string.IsNullOrEmpty(previewAspect.PreviewUrl))
+            {
+                var previewUrl = previewAspect.PreviewUrl;
+                if (!previewUrl.StartsWith("~/", StringComparison.OrdinalIgnoreCase))
                 {
-                    var previewUrl = previewAspect.PreviewUrl;
-                    if (!previewUrl.StartsWith("~/", StringComparison.OrdinalIgnoreCase))
+                    if (previewUrl.StartsWith('/'))
                     {
-                        if (previewUrl.StartsWith('/'))
-                        {
-                            previewUrl = '~' + previewUrl;
-                        }
-                        else
-                        {
-                            previewUrl = "~/" + previewUrl;
-                        }
+                        previewUrl = '~' + previewUrl;
                     }
-
-                    customAttributes["href"] = urlHelper.Content(previewUrl);
-                }
-                else
-                {
-                    var metadata = await contentManager.PopulateAspectAsync<ContentItemMetadata>(displayFor);
-
-                    if (metadata.DisplayRouteValues != null)
+                    else
                     {
-                        if (routeValues != null)
-                        {
-                            foreach (var attribute in routeValues)
-                            {
-                                metadata.DisplayRouteValues.Add(attribute.Key, attribute.Value);
-                            }
-                        }
-
-                        customAttributes["href"] = urlHelper.Action(metadata.DisplayRouteValues["action"].ToString(), metadata.DisplayRouteValues);
+                        previewUrl = "~/" + previewUrl;
                     }
                 }
+
+                customAttributes["href"] = urlHelper.Content(previewUrl);
             }
-            else if (editFor != null)
+            else
             {
-                var metadata = await PopulateAspectForContentItemMetadataAsync(editFor);
+                var metadata = await contentManager.PopulateAspectAsync<ContentItemMetadata>(displayFor);
 
-                if (metadata.EditorRouteValues != null)
+                if (metadata.DisplayRouteValues != null)
                 {
                     if (routeValues != null)
                     {
                         foreach (var attribute in routeValues)
                         {
-                            metadata.EditorRouteValues.Add(attribute.Key, attribute.Value);
+                            metadata.DisplayRouteValues.Add(attribute.Key, attribute.Value);
                         }
                     }
 
-                    customAttributes["href"] = urlHelper.Action(metadata.EditorRouteValues["action"].ToString(), metadata.EditorRouteValues);
+                    customAttributes["href"] = urlHelper.Action(metadata.DisplayRouteValues["action"].ToString(), metadata.DisplayRouteValues);
                 }
             }
-            else if (adminFor != null)
-            {
-                var metadata = await PopulateAspectForContentItemMetadataAsync(adminFor);
+        }
+        else if (editFor != null)
+        {
+            var metadata = await PopulateAspectForContentItemMetadataAsync(editFor);
 
-                if (metadata.AdminRouteValues != null)
+            if (metadata.EditorRouteValues != null)
+            {
+                if (routeValues != null)
                 {
-                    if (routeValues != null)
+                    foreach (var attribute in routeValues)
                     {
-                        foreach (var attribute in routeValues)
-                        {
-                            metadata.AdminRouteValues.Add(attribute.Key, attribute.Value);
-                        }
+                        metadata.EditorRouteValues.Add(attribute.Key, attribute.Value);
                     }
-
-                    customAttributes["href"] = urlHelper.Action(metadata.AdminRouteValues["action"].ToString(), metadata.AdminRouteValues);
                 }
+
+                customAttributes["href"] = urlHelper.Action(metadata.EditorRouteValues["action"].ToString(), metadata.EditorRouteValues);
             }
-            else if (removeFor != null)
-            {
-                var metadata = await PopulateAspectForContentItemMetadataAsync(removeFor);
+        }
+        else if (adminFor != null)
+        {
+            var metadata = await PopulateAspectForContentItemMetadataAsync(adminFor);
 
-                if (metadata.RemoveRouteValues != null)
+            if (metadata.AdminRouteValues != null)
+            {
+                if (routeValues != null)
                 {
-                    if (routeValues != null)
+                    foreach (var attribute in routeValues)
                     {
-                        foreach (var attribute in routeValues)
-                        {
-                            metadata.RemoveRouteValues.Add(attribute.Key, attribute.Value);
-                        }
+                        metadata.AdminRouteValues.Add(attribute.Key, attribute.Value);
                     }
-
-                    customAttributes["href"] = urlHelper.Action(metadata.RemoveRouteValues["action"].ToString(), metadata.RemoveRouteValues);
                 }
+
+                customAttributes["href"] = urlHelper.Action(metadata.AdminRouteValues["action"].ToString(), metadata.AdminRouteValues);
             }
-            else if (createFor != null)
-            {
-                var metadata = await PopulateAspectForContentItemMetadataAsync(createFor);
+        }
+        else if (removeFor != null)
+        {
+            var metadata = await PopulateAspectForContentItemMetadataAsync(removeFor);
 
-                if (metadata.CreateRouteValues != null)
+            if (metadata.RemoveRouteValues != null)
+            {
+                if (routeValues != null)
                 {
-                    if (routeValues != null)
+                    foreach (var attribute in routeValues)
                     {
-                        foreach (var attribute in routeValues)
-                        {
-                            metadata.CreateRouteValues.Add(attribute.Key, attribute.Value);
-                        }
+                        metadata.RemoveRouteValues.Add(attribute.Key, attribute.Value);
                     }
-
-                    customAttributes["href"] = urlHelper.Action(metadata.CreateRouteValues["action"].ToString(), metadata.CreateRouteValues);
                 }
+
+                customAttributes["href"] = urlHelper.Action(metadata.RemoveRouteValues["action"].ToString(), metadata.RemoveRouteValues);
             }
+        }
+        else if (createFor != null)
+        {
+            var metadata = await PopulateAspectForContentItemMetadataAsync(createFor);
 
-            if (customAttributes.Count == 0)
+            if (metadata.CreateRouteValues != null)
             {
-                return Completion.Normal;
+                if (routeValues != null)
+                {
+                    foreach (var attribute in routeValues)
+                    {
+                        metadata.CreateRouteValues.Add(attribute.Key, attribute.Value);
+                    }
+                }
+
+                customAttributes["href"] = urlHelper.Action(metadata.CreateRouteValues["action"].ToString(), metadata.CreateRouteValues);
             }
+        }
 
-            var tagBuilder = new TagBuilder("a");
+        if (customAttributes.Count == 0)
+        {
+            return Completion.Normal;
+        }
 
-            foreach (var attribute in customAttributes)
-            {
-                tagBuilder.Attributes[attribute.Key] = attribute.Value;
-            }
+        var tagBuilder = new TagBuilder("a");
 
-            tagBuilder.RenderStartTag().WriteTo(writer, (HtmlEncoder)encoder);
+        foreach (var attribute in customAttributes)
+        {
+            tagBuilder.Attributes[attribute.Key] = attribute.Value;
+        }
 
-            if (statements != null && statements.Count > 0)
-            {
-                var completion = await statements.RenderStatementsAsync(writer, encoder, context);
+        tagBuilder.RenderStartTag().WriteTo(writer, (HtmlEncoder)encoder);
 
-                if (completion != Completion.Normal)
-                {
-                    return completion;
-                }
-            }
-            else if (!string.IsNullOrEmpty(contentItem.DisplayText))
-            {
-                writer.Write(encoder.Encode(contentItem.DisplayText));
-            }
-            else
+        if (statements != null && statements.Count > 0)
+        {
+            var completion = await statements.RenderStatementsAsync(writer, encoder, context);
+
+            if (completion != Completion.Normal)
             {
-                var contentDefinitionManager = services.GetRequiredService<IContentDefinitionManager>();
-                var typeDefinition = await contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
-                writer.Write(encoder.Encode(typeDefinition.ToString()));
+                return completion;
             }
+        }
+        else if (!string.IsNullOrEmpty(contentItem.DisplayText))
+        {
+            writer.Write(encoder.Encode(contentItem.DisplayText));
+        }
+        else
+        {
+            var contentDefinitionManager = services.GetRequiredService<IContentDefinitionManager>();
+            var typeDefinition = await contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+            writer.Write(encoder.Encode(typeDefinition.ToString()));
+        }
 
-            tagBuilder.RenderEndTag().WriteTo(writer, (HtmlEncoder)encoder);
+        tagBuilder.RenderEndTag().WriteTo(writer, (HtmlEncoder)encoder);
 
-            return Completion.Normal;
+        return Completion.Normal;
 
-            async Task<ContentItemMetadata> PopulateAspectForContentItemMetadataAsync(ContentItem item)
-            {
-                contentItem = item;
+        async Task<ContentItemMetadata> PopulateAspectForContentItemMetadataAsync(ContentItem item)
+        {
+            contentItem = item;
 
-                return await contentManager.PopulateAspectAsync<ContentItemMetadata>(item);
-            }
+            return await contentManager.PopulateAspectAsync<ContentItemMetadata>(item);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/ContentItemFilter.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/ContentItemFilter.cs
index b9deac61e8e..820b934ed3c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/ContentItemFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/ContentItemFilter.cs
@@ -5,30 +5,29 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Contents.Liquid
+namespace OrchardCore.Contents.Liquid;
+
+public class ContentItemFilter : ILiquidFilter
 {
-    public class ContentItemFilter : ILiquidFilter
-    {
-        private readonly IContentManager _contentManager;
+    private readonly IContentManager _contentManager;
 
-        public ContentItemFilter(IContentManager contentManager)
-        {
-            _contentManager = contentManager;
-        }
+    public ContentItemFilter(IContentManager contentManager)
+    {
+        _contentManager = contentManager;
+    }
 
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        if (input.Type == FluidValues.Array)
         {
-            if (input.Type == FluidValues.Array)
-            {
-                // List of content item ids to return.
-                var contentItemIds = input.Enumerate(ctx).Select(x => x.ToStringValue());
+            // List of content item ids to return.
+            var contentItemIds = input.Enumerate(ctx).Select(x => x.ToStringValue());
 
-                return FluidValue.Create(await _contentManager.GetAsync(contentItemIds), ctx.Options);
-            }
+            return FluidValue.Create(await _contentManager.GetAsync(contentItemIds), ctx.Options);
+        }
 
-            var contentItemId = input.ToStringValue();
+        var contentItemId = input.ToStringValue();
 
-            return FluidValue.Create(await _contentManager.GetAsync(contentItemId), ctx.Options);
-        }
+        return FluidValue.Create(await _contentManager.GetAsync(contentItemId), ctx.Options);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/ContentItemRecursionHelper.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/ContentItemRecursionHelper.cs
index c955912bfc5..307c6dc6832 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/ContentItemRecursionHelper.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/ContentItemRecursionHelper.cs
@@ -1,42 +1,41 @@
 using System.Collections.Generic;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Contents.Liquid
+namespace OrchardCore.Contents.Liquid;
+
+public interface IContentItemRecursionHelper<T>
 {
-    public interface IContentItemRecursionHelper<T>
-    {
-        /// <summary>
-        /// Returns <see langword="True"/> when the <see cref="ContentItem"/> has already been evaluated during this request by the particular filter./>.
-        /// </summary>
-        bool IsRecursive(ContentItem contentItem, int maxRecursions = 1);
-    }
+    /// <summary>
+    /// Returns <see langword="True"/> when the <see cref="ContentItem"/> has already been evaluated during this request by the particular filter./>.
+    /// </summary>
+    bool IsRecursive(ContentItem contentItem, int maxRecursions = 1);
+}
+
+/// <inheritdocs />
+public class ContentItemRecursionHelper<T> : IContentItemRecursionHelper<T>
+{
+    private readonly Dictionary<ContentItem, int> _recursions = [];
 
     /// <inheritdocs />
-    public class ContentItemRecursionHelper<T> : IContentItemRecursionHelper<T>
+    public bool IsRecursive(ContentItem contentItem, int maxRecursions = 1)
     {
-        private readonly Dictionary<ContentItem, int> _recursions = [];
-
-        /// <inheritdocs />
-        public bool IsRecursive(ContentItem contentItem, int maxRecursions = 1)
+        if (_recursions.TryGetValue(contentItem, out var counter))
         {
-            if (_recursions.TryGetValue(contentItem, out var counter))
+            if (maxRecursions < 1)
             {
-                if (maxRecursions < 1)
-                {
-                    maxRecursions = 1;
-                }
-
-                if (counter > maxRecursions)
-                {
-                    return true;
-                }
+                maxRecursions = 1;
+            }
 
-                _recursions[contentItem] = counter + 1;
-                return false;
+            if (counter > maxRecursions)
+            {
+                return true;
             }
 
-            _recursions[contentItem] = 1;
+            _recursions[contentItem] = counter + 1;
             return false;
         }
+
+        _recursions[contentItem] = 1;
+        return false;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/ContentItemTag.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/ContentItemTag.cs
index 5d6c92bbd92..9fee5274105 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/ContentItemTag.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/ContentItemTag.cs
@@ -7,20 +7,19 @@
 using Fluid.Values;
 using OrchardCore.DisplayManagement.Liquid.Tags;
 
-namespace OrchardCore.Contents.Liquid
+namespace OrchardCore.Contents.Liquid;
+
+public class ContentItemTag
 {
-    public class ContentItemTag
-    {
-        private static readonly FilterArgument _typeArgument = new("type", new LiteralExpression(StringValue.Create("contentitem")));
+    private static readonly FilterArgument _typeArgument = new("type", new LiteralExpression(StringValue.Create("contentitem")));
 
-        public static ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, TextWriter writer, TextEncoder encoder, TemplateContext context)
+    public static ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, TextWriter writer, TextEncoder encoder, TemplateContext context)
+    {
+        var list = new List<FilterArgument>(argumentsList)
         {
-            var list = new List<FilterArgument>(argumentsList)
-            {
-                _typeArgument
-            };
+            _typeArgument
+        };
 
-            return ShapeTag.WriteToAsync(list, writer, encoder, context);
-        }
+        return ShapeTag.WriteToAsync(list, writer, encoder, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/DisplayTextFilter.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/DisplayTextFilter.cs
index bcae2c11433..ccd79606b8c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/DisplayTextFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/DisplayTextFilter.cs
@@ -3,20 +3,19 @@
 using Fluid.Values;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Contents.Liquid
+namespace OrchardCore.Contents.Liquid;
+
+public static class DisplayTextFilter
 {
-    public static class DisplayTextFilter
+    public static ValueTask<FluidValue> DisplayText(FluidValue input, FilterArguments _1, TemplateContext _2)
     {
-        public static ValueTask<FluidValue> DisplayText(FluidValue input, FilterArguments _1, TemplateContext _2)
-        {
-            var contentItem = input.ToObjectValue() as ContentItem;
-
-            if (contentItem == null)
-            {
-                return new ValueTask<FluidValue>(NilValue.Instance);
-            }
+        var contentItem = input.ToObjectValue() as ContentItem;
 
-            return new ValueTask<FluidValue>(new StringValue(contentItem.DisplayText ?? ""));
+        if (contentItem == null)
+        {
+            return new ValueTask<FluidValue>(NilValue.Instance);
         }
+
+        return new ValueTask<FluidValue>(new StringValue(contentItem.DisplayText ?? ""));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/DisplayUrlFilter.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/DisplayUrlFilter.cs
index 12cc5a14ab5..40ebb68122b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/DisplayUrlFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/DisplayUrlFilter.cs
@@ -9,49 +9,48 @@
 using OrchardCore.ContentManagement.Routing;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Contents.Liquid
+namespace OrchardCore.Contents.Liquid;
+
+public class DisplayUrlFilter : ILiquidFilter
 {
-    public class DisplayUrlFilter : ILiquidFilter
+    private readonly AutorouteOptions _autorouteOptions;
+    private readonly IContentManager _contentManager;
+    private readonly IUrlHelperFactory _urlHelperFactory;
+
+    public DisplayUrlFilter(IOptions<AutorouteOptions> autorouteOptions, IContentManager contentManager, IUrlHelperFactory urlHelperFactory)
     {
-        private readonly AutorouteOptions _autorouteOptions;
-        private readonly IContentManager _contentManager;
-        private readonly IUrlHelperFactory _urlHelperFactory;
+        _autorouteOptions = autorouteOptions.Value;
+        _contentManager = contentManager;
+        _urlHelperFactory = urlHelperFactory;
+    }
 
-        public DisplayUrlFilter(IOptions<AutorouteOptions> autorouteOptions, IContentManager contentManager, IUrlHelperFactory urlHelperFactory)
-        {
-            _autorouteOptions = autorouteOptions.Value;
-            _contentManager = contentManager;
-            _urlHelperFactory = urlHelperFactory;
-        }
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
+    {
+        var contentItem = input.ToObjectValue() as ContentItem;
+        RouteValueDictionary routeValues;
 
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
+        if (contentItem == null)
         {
-            var contentItem = input.ToObjectValue() as ContentItem;
-            RouteValueDictionary routeValues;
-
-            if (contentItem == null)
+            if (string.IsNullOrEmpty(input.ToStringValue()))
             {
-                if (string.IsNullOrEmpty(input.ToStringValue()))
-                {
-                    return StringValue.Empty;
-                }
-
-                routeValues = new RouteValueDictionary(_autorouteOptions.GlobalRouteValues)
-                {
-                    [_autorouteOptions.ContentItemIdKey] = input.ToStringValue(),
-                };
+                return StringValue.Empty;
             }
-            else
+
+            routeValues = new RouteValueDictionary(_autorouteOptions.GlobalRouteValues)
             {
-                var contentItemMetadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(contentItem);
-                routeValues = contentItemMetadata.DisplayRouteValues;
-            }
+                [_autorouteOptions.ContentItemIdKey] = input.ToStringValue(),
+            };
+        }
+        else
+        {
+            var contentItemMetadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(contentItem);
+            routeValues = contentItemMetadata.DisplayRouteValues;
+        }
 
-            var urlHelper = _urlHelperFactory.GetUrlHelper(context.ViewContext);
+        var urlHelper = _urlHelperFactory.GetUrlHelper(context.ViewContext);
 
-            var linkUrl = urlHelper.RouteUrl(routeValues);
+        var linkUrl = urlHelper.RouteUrl(routeValues);
 
-            return new StringValue(linkUrl);
-        }
+        return new StringValue(linkUrl);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/FullTextFilter.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/FullTextFilter.cs
index 7af91c09a06..5df638cb449 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/FullTextFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/FullTextFilter.cs
@@ -8,90 +8,89 @@
 using OrchardCore.ContentManagement.Models;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Contents.Liquid
+namespace OrchardCore.Contents.Liquid;
+
+public class FullTextFilter : ILiquidFilter
 {
-    public class FullTextFilter : ILiquidFilter
-    {
-        private readonly IContentManager _contentManager;
-        private readonly IContentItemRecursionHelper<FullTextFilter> _fullTextRecursionHelper;
+    private readonly IContentManager _contentManager;
+    private readonly IContentItemRecursionHelper<FullTextFilter> _fullTextRecursionHelper;
 
-        public FullTextFilter(
-            IContentManager contentManager,
-            IContentItemRecursionHelper<FullTextFilter> fullTextRecursionHelper)
-        {
-            _contentManager = contentManager;
-            _fullTextRecursionHelper = fullTextRecursionHelper;
-        }
+    public FullTextFilter(
+        IContentManager contentManager,
+        IContentItemRecursionHelper<FullTextFilter> fullTextRecursionHelper)
+    {
+        _contentManager = contentManager;
+        _fullTextRecursionHelper = fullTextRecursionHelper;
+    }
 
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        if (input.Type == FluidValues.Array)
         {
-            if (input.Type == FluidValues.Array)
+            var contentItems = new List<ContentItem>();
+            foreach (var objValue in input.Enumerate(ctx))
             {
-                var contentItems = new List<ContentItem>();
-                foreach (var objValue in input.Enumerate(ctx))
+                var contentItem = GetContentItem(objValue);
+                if (contentItem != null)
                 {
-                    var contentItem = GetContentItem(objValue);
-                    if (contentItem != null)
+                    if (!_fullTextRecursionHelper.IsRecursive(contentItem))
                     {
-                        if (!_fullTextRecursionHelper.IsRecursive(contentItem))
-                        {
-                            contentItems.Add(contentItem);
-                        }
+                        contentItems.Add(contentItem);
                     }
                 }
+            }
 
-                if (contentItems.Count == 0)
-                {
-                    return NilValue.Instance;
-                }
-
-                var aspects = new List<FullTextAspect>();
+            if (contentItems.Count == 0)
+            {
+                return NilValue.Instance;
+            }
 
-                foreach (var contentItem in contentItems)
-                {
-                    aspects.Add(await _contentManager.PopulateAspectAsync<FullTextAspect>(contentItem));
-                }
+            var aspects = new List<FullTextAspect>();
 
-                // When returning segments separate them so multiple segments are indexed individually.
-                return new ArrayValue(aspects.SelectMany(x => x.Segments).Where(x => !string.IsNullOrEmpty(x)).Select(x => new StringValue(x + ' ')).ToArray());
-            }
-            else
+            foreach (var contentItem in contentItems)
             {
-                var contentItem = GetContentItem(input);
-
-                if (contentItem == null || _fullTextRecursionHelper.IsRecursive(contentItem))
-                {
-                    return NilValue.Instance;
-                }
+                aspects.Add(await _contentManager.PopulateAspectAsync<FullTextAspect>(contentItem));
+            }
 
-                var fullTextAspect = await _contentManager.PopulateAspectAsync<FullTextAspect>(contentItem);
+            // When returning segments separate them so multiple segments are indexed individually.
+            return new ArrayValue(aspects.SelectMany(x => x.Segments).Where(x => !string.IsNullOrEmpty(x)).Select(x => new StringValue(x + ' ')).ToArray());
+        }
+        else
+        {
+            var contentItem = GetContentItem(input);
 
-                // Remove empty strings as display text is often unused in contained content items.
-                return new ArrayValue(fullTextAspect.Segments.Where(x => !string.IsNullOrEmpty(x)).Select(x => new StringValue(x)).ToArray());
+            if (contentItem == null || _fullTextRecursionHelper.IsRecursive(contentItem))
+            {
+                return NilValue.Instance;
             }
+
+            var fullTextAspect = await _contentManager.PopulateAspectAsync<FullTextAspect>(contentItem);
+
+            // Remove empty strings as display text is often unused in contained content items.
+            return new ArrayValue(fullTextAspect.Segments.Where(x => !string.IsNullOrEmpty(x)).Select(x => new StringValue(x)).ToArray());
         }
+    }
+
+    private static ContentItem GetContentItem(FluidValue input)
+    {
+        var obj = input.ToObjectValue();
 
-        private static ContentItem GetContentItem(FluidValue input)
+        if (obj is not ContentItem contentItem)
         {
-            var obj = input.ToObjectValue();
+            contentItem = null;
 
-            if (obj is not ContentItem contentItem)
+            if (obj is JsonObject jObject)
             {
-                contentItem = null;
-
-                if (obj is JsonObject jObject)
+                contentItem = jObject.ToObject<ContentItem>();
+                // If input is a 'JObject' but which not represents a 'ContentItem',
+                // a 'ContentItem' is still created but with some null properties.
+                if (contentItem?.ContentItemId == null)
                 {
-                    contentItem = jObject.ToObject<ContentItem>();
-                    // If input is a 'JObject' but which not represents a 'ContentItem',
-                    // a 'ContentItem' is still created but with some null properties.
-                    if (contentItem?.ContentItemId == null)
-                    {
-                        return null;
-                    }
+                    return null;
                 }
             }
-
-            return contentItem;
         }
+
+        return contentItem;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Migrations.cs
index 7610eaf1c07..483b613c961 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Migrations.cs
@@ -3,24 +3,23 @@
 using OrchardCore.ContentManagement.Metadata.Settings;
 using OrchardCore.Data.Migration;
 
-namespace OrchardCore.Contents
+namespace OrchardCore.Contents;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        public Migrations(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public Migrations(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public async Task<int> CreateAsync()
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync("CommonPart", builder => builder
-                .Attachable()
-                .WithDescription("Provides an editor for the common properties of a content item."));
+    public async Task<int> CreateAsync()
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync("CommonPart", builder => builder
+            .Attachable()
+            .WithDescription("Provides an editor for the common properties of a content item."));
 
-            return 1;
-        }
+        return 1;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Models/CommonPart.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Models/CommonPart.cs
index 511a6669d2b..e5c5e116d7f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Models/CommonPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Models/CommonPart.cs
@@ -1,12 +1,11 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Contents.Models
+namespace OrchardCore.Contents.Models;
+
+/// <summary>
+/// When attached to a content type, provides a way to edit the common
+/// properties of a content item like CreatedUtc and Owner.
+/// </summary>
+public class CommonPart : ContentPart
 {
-    /// <summary>
-    /// When attached to a content type, provides a way to edit the common
-    /// properties of a content item like CreatedUtc and Owner.
-    /// </summary>
-    public class CommonPart : ContentPart
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Models/CommonPartSettings.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Models/CommonPartSettings.cs
index d1abd8015f6..fc2da7b8f8f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Models/CommonPartSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Models/CommonPartSettings.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Contents.Models
+namespace OrchardCore.Contents.Models;
+
+public class CommonPartSettings
 {
-    public class CommonPartSettings
-    {
-        public bool DisplayDateEditor { get; set; }
+    public bool DisplayDateEditor { get; set; }
 
-        public bool DisplayOwnerEditor { get; set; }
-    }
+    public bool DisplayOwnerEditor { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Models/FullTextAspectSettings.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Models/FullTextAspectSettings.cs
index eb7b49cd1e7..3142bb4322f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Models/FullTextAspectSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Models/FullTextAspectSettings.cs
@@ -1,29 +1,28 @@
 using System.ComponentModel;
 
-namespace OrchardCore.Contents.Models
+namespace OrchardCore.Contents.Models;
+
+public class FullTextAspectSettings
 {
-    public class FullTextAspectSettings
-    {
-        /// <summary>
-        /// Whether the content type should use a custom template to add content to the full-text aspect.
-        /// </summary>
-        public bool IncludeFullTextTemplate { get; set; }
+    /// <summary>
+    /// Whether the content type should use a custom template to add content to the full-text aspect.
+    /// </summary>
+    public bool IncludeFullTextTemplate { get; set; }
 
-        /// <summary>
-        /// The template used for the full-text aspect.
-        /// </summary>
-        public string FullTextTemplate { get; set; }
+    /// <summary>
+    /// The template used for the full-text aspect.
+    /// </summary>
+    public string FullTextTemplate { get; set; }
 
-        /// <summary>
-        /// Whether the body aspect should be added to the full-text aspect.
-        /// </summary>
-        [DefaultValue(true)]
-        public bool IncludeBodyAspect { get; set; } = true;
+    /// <summary>
+    /// Whether the body aspect should be added to the full-text aspect.
+    /// </summary>
+    [DefaultValue(true)]
+    public bool IncludeBodyAspect { get; set; } = true;
 
-        /// <summary>
-        /// Whether the display text should be added to the full-text aspect.
-        /// </summary>
-        [DefaultValue(true)]
-        public bool IncludeDisplayText { get; set; } = true;
-    }
+    /// <summary>
+    /// Whether the display text should be added to the full-text aspect.
+    /// </summary>
+    [DefaultValue(true)]
+    public bool IncludeDisplayText { get; set; } = true;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Recipes/ContentStep.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Recipes/ContentStep.cs
index 220196b15a9..4e1da72db6f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Recipes/ContentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Recipes/ContentStep.cs
@@ -7,44 +7,43 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Contents.Recipes
+namespace OrchardCore.Contents.Recipes;
+
+/// <summary>
+/// This recipe step creates a set of content items.
+/// </summary>
+public sealed class ContentStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step creates a set of content items.
-    /// </summary>
-    public sealed class ContentStep : IRecipeStepHandler
+    public Task ExecuteAsync(RecipeExecutionContext context)
     {
-        public Task ExecuteAsync(RecipeExecutionContext context)
+        if (!string.Equals(context.Name, "Content", StringComparison.OrdinalIgnoreCase))
         {
-            if (!string.Equals(context.Name, "Content", StringComparison.OrdinalIgnoreCase))
-            {
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            var model = context.Step.ToObject<ContentStepModel>();
-            var contentItems = model.Data.ToObject<ContentItem[]>();
+        var model = context.Step.ToObject<ContentStepModel>();
+        var contentItems = model.Data.ToObject<ContentItem[]>();
 
-            // If the shell is activated there is no migration in progress.
-            if (ShellScope.Context.IsActivated)
-            {
-                var contentManager = ShellScope.Services.GetRequiredService<IContentManager>();
-                return contentManager.ImportAsync(contentItems);
-            }
+        // If the shell is activated there is no migration in progress.
+        if (ShellScope.Context.IsActivated)
+        {
+            var contentManager = ShellScope.Services.GetRequiredService<IContentManager>();
+            return contentManager.ImportAsync(contentItems);
+        }
 
-            // Otherwise, the import of content items is deferred after all migrations are completed,
-            // this prevents e.g. a content handler to trigger a workflow before workflows migrations.
-            ShellScope.AddDeferredTask(scope =>
-            {
-                var contentManager = scope.ServiceProvider.GetRequiredService<IContentManager>();
-                return contentManager.ImportAsync(contentItems);
-            });
+        // Otherwise, the import of content items is deferred after all migrations are completed,
+        // this prevents e.g. a content handler to trigger a workflow before workflows migrations.
+        ShellScope.AddDeferredTask(scope =>
+        {
+            var contentManager = scope.ServiceProvider.GetRequiredService<IContentManager>();
+            return contentManager.ImportAsync(contentItems);
+        });
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
+}
 
-    public sealed class ContentStepModel
-    {
-        public JsonArray Data { get; set; }
-    }
+public sealed class ContentStepModel
+{
+    public JsonArray Data { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Scripting/ContentMethodsProvider.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Scripting/ContentMethodsProvider.cs
index 90043ffb71b..3b742a5e96e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Scripting/ContentMethodsProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Scripting/ContentMethodsProvider.cs
@@ -7,79 +7,78 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Scripting;
 
-namespace OrchardCore.Contents.Scripting
+namespace OrchardCore.Contents.Scripting;
+
+public class ContentMethodsProvider : IGlobalMethodProvider
 {
-    public class ContentMethodsProvider : IGlobalMethodProvider
-    {
-        private readonly GlobalMethod _newContentItemMethod;
-        private readonly GlobalMethod _createContentItemMethod;
-        private readonly GlobalMethod _updateContentItemMethod;
-        private readonly GlobalMethod _deleteContentItemMethod;
+    private readonly GlobalMethod _newContentItemMethod;
+    private readonly GlobalMethod _createContentItemMethod;
+    private readonly GlobalMethod _updateContentItemMethod;
+    private readonly GlobalMethod _deleteContentItemMethod;
 
-        public ContentMethodsProvider()
+    public ContentMethodsProvider()
+    {
+        _newContentItemMethod = new GlobalMethod
         {
-            _newContentItemMethod = new GlobalMethod
+            Name = "newContentItem",
+            Method = serviceProvider => (Func<string, IContent>)((contentType) =>
             {
-                Name = "newContentItem",
-                Method = serviceProvider => (Func<string, IContent>)((contentType) =>
-                {
-                    var contentManager = serviceProvider.GetRequiredService<IContentManager>();
-                    var contentItem = contentManager.NewAsync(contentType).GetAwaiter().GetResult();
+                var contentManager = serviceProvider.GetRequiredService<IContentManager>();
+                var contentItem = contentManager.NewAsync(contentType).GetAwaiter().GetResult();
 
-                    return contentItem;
-                }),
-            };
+                return contentItem;
+            }),
+        };
 
-            _createContentItemMethod = new GlobalMethod
+        _createContentItemMethod = new GlobalMethod
+        {
+            Name = "createContentItem",
+            Method = serviceProvider => (Func<string, bool?, object, IContent>)((contentType, publish, properties) =>
             {
-                Name = "createContentItem",
-                Method = serviceProvider => (Func<string, bool?, object, IContent>)((contentType, publish, properties) =>
+                var contentManager = serviceProvider.GetRequiredService<IContentManager>();
+                var contentItem = contentManager.NewAsync(contentType).GetAwaiter().GetResult();
+                contentItem.Merge(properties);
+                var result = contentManager.UpdateValidateAndCreateAsync(contentItem, publish == true ? VersionOptions.Published : VersionOptions.Draft).GetAwaiter().GetResult();
+                if (result.Succeeded)
                 {
-                    var contentManager = serviceProvider.GetRequiredService<IContentManager>();
-                    var contentItem = contentManager.NewAsync(contentType).GetAwaiter().GetResult();
-                    contentItem.Merge(properties);
-                    var result = contentManager.UpdateValidateAndCreateAsync(contentItem, publish == true ? VersionOptions.Published : VersionOptions.Draft).GetAwaiter().GetResult();
-                    if (result.Succeeded)
-                    {
-                        return contentItem;
-                    }
-                    else
-                    {
-                        throw new ValidationException(string.Join(", ", result.Errors));
-                    }
-                }),
-            };
-
-            _updateContentItemMethod = new GlobalMethod
-            {
-                Name = "updateContentItem",
-                Method = serviceProvider => (Action<ContentItem, object>)((contentItem, properties) =>
+                    return contentItem;
+                }
+                else
                 {
-                    var contentManager = serviceProvider.GetRequiredService<IContentManager>();
-                    contentItem.Merge(properties, new JsonMergeSettings { MergeArrayHandling = MergeArrayHandling.Replace });
-                    contentManager.UpdateAsync(contentItem).GetAwaiter().GetResult();
-                    var result = contentManager.ValidateAsync(contentItem).GetAwaiter().GetResult();
-                    if (!result.Succeeded)
-                    {
-                        throw new ValidationException(string.Join(", ", result.Errors));
-                    }
-                }),
-            };
+                    throw new ValidationException(string.Join(", ", result.Errors));
+                }
+            }),
+        };
 
-            _deleteContentItemMethod = new GlobalMethod
+        _updateContentItemMethod = new GlobalMethod
+        {
+            Name = "updateContentItem",
+            Method = serviceProvider => (Action<ContentItem, object>)((contentItem, properties) =>
             {
-                Name = "deleteContentItem",
-                Method = serviceProvider => (Action<ContentItem, object>)((contentItem, properties) =>
+                var contentManager = serviceProvider.GetRequiredService<IContentManager>();
+                contentItem.Merge(properties, new JsonMergeSettings { MergeArrayHandling = MergeArrayHandling.Replace });
+                contentManager.UpdateAsync(contentItem).GetAwaiter().GetResult();
+                var result = contentManager.ValidateAsync(contentItem).GetAwaiter().GetResult();
+                if (!result.Succeeded)
                 {
-                    var contentManager = serviceProvider.GetRequiredService<IContentManager>();
-                    contentManager.RemoveAsync(contentItem).GetAwaiter().GetResult();
-                }),
-            };
-        }
+                    throw new ValidationException(string.Join(", ", result.Errors));
+                }
+            }),
+        };
 
-        public IEnumerable<GlobalMethod> GetMethods()
+        _deleteContentItemMethod = new GlobalMethod
         {
-            return new[] { _newContentItemMethod, _createContentItemMethod, _updateContentItemMethod, _deleteContentItemMethod };
-        }
+            Name = "deleteContentItem",
+            Method = serviceProvider => (Action<ContentItem, object>)((contentItem, properties) =>
+            {
+                var contentManager = serviceProvider.GetRequiredService<IContentManager>();
+                contentManager.RemoveAsync(contentItem).GetAwaiter().GetResult();
+            }),
+        };
+    }
+
+    public IEnumerable<GlobalMethod> GetMethods()
+    {
+        return new[] { _newContentItemMethod, _createContentItemMethod, _updateContentItemMethod, _deleteContentItemMethod };
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Scripting/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Scripting/Startup.cs
index f8b41469a31..15eff714cee 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Scripting/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Scripting/Startup.cs
@@ -2,15 +2,14 @@
 using OrchardCore.Modules;
 using OrchardCore.Scripting;
 
-namespace OrchardCore.Contents.Scripting
+namespace OrchardCore.Contents.Scripting;
+
+[RequireFeatures("OrchardCore.Scripting")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Scripting")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSingleton<IGlobalMethodProvider, ContentMethodsProvider>();
-            services.AddSingleton<IGlobalMethodProvider, UrlMethodsProvider>();
-        }
+        services.AddSingleton<IGlobalMethodProvider, ContentMethodsProvider>();
+        services.AddSingleton<IGlobalMethodProvider, UrlMethodsProvider>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Scripting/UrlMethodsProvider.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Scripting/UrlMethodsProvider.cs
index aeff13830c7..b3ea53e2c68 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Scripting/UrlMethodsProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Scripting/UrlMethodsProvider.cs
@@ -3,43 +3,42 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Scripting;
 
-namespace OrchardCore.Contents.Scripting
+namespace OrchardCore.Contents.Scripting;
+
+public class UrlMethodsProvider : IGlobalMethodProvider
 {
-    public class UrlMethodsProvider : IGlobalMethodProvider
-    {
-        private readonly GlobalMethod _getUrlPrefix;
+    private readonly GlobalMethod _getUrlPrefix;
 
-        public UrlMethodsProvider()
+    public UrlMethodsProvider()
+    {
+        _getUrlPrefix = new GlobalMethod
         {
-            _getUrlPrefix = new GlobalMethod
+            Name = "getUrlPrefix",
+            Method = serviceProvider => (string path, bool? escaped) =>
             {
-                Name = "getUrlPrefix",
-                Method = serviceProvider => (string path, bool? escaped) =>
+                var httpContextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
+
+                var pathBase = httpContextAccessor.HttpContext?.Request.PathBase ?? PathString.Empty;
+                if (!pathBase.HasValue)
+                {
+                    pathBase = "/";
+                }
+
+                path = path?.Trim(' ', '/') ?? string.Empty;
+                if (path.Length > 0)
+                {
+                    pathBase = pathBase.Add($"/{path}");
+                }
+
+                if (escaped.HasValue && escaped.Value)
                 {
-                    var httpContextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
-
-                    var pathBase = httpContextAccessor.HttpContext?.Request.PathBase ?? PathString.Empty;
-                    if (!pathBase.HasValue)
-                    {
-                        pathBase = "/";
-                    }
-
-                    path = path?.Trim(' ', '/') ?? string.Empty;
-                    if (path.Length > 0)
-                    {
-                        pathBase = pathBase.Add($"/{path}");
-                    }
-
-                    if (escaped.HasValue && escaped.Value)
-                    {
-                        return pathBase.ToString();
-                    }
-
-                    return pathBase.Value;
-                },
-            };
-        }
-
-        public IEnumerable<GlobalMethod> GetMethods() => new[] { _getUrlPrefix };
+                    return pathBase.ToString();
+                }
+
+                return pathBase.Value;
+            },
+        };
     }
+
+    public IEnumerable<GlobalMethod> GetMethods() => new[] { _getUrlPrefix };
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Security/ContentTypeAuthorizationHandler.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Security/ContentTypeAuthorizationHandler.cs
index 0a597199109..b103c2200ea 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Security/ContentTypeAuthorizationHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Security/ContentTypeAuthorizationHandler.cs
@@ -7,99 +7,98 @@
 using OrchardCore.Security;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Contents.Security
+namespace OrchardCore.Contents.Security;
+
+public class ContentTypeAuthorizationHandler : AuthorizationHandler<PermissionRequirement>
 {
-    public class ContentTypeAuthorizationHandler : AuthorizationHandler<PermissionRequirement>
+    private readonly IServiceProvider _serviceProvider;
+    private IAuthorizationService _authorizationService;
+
+    public ContentTypeAuthorizationHandler(IServiceProvider serviceProvider)
     {
-        private readonly IServiceProvider _serviceProvider;
-        private IAuthorizationService _authorizationService;
+        _serviceProvider = serviceProvider;
+    }
 
-        public ContentTypeAuthorizationHandler(IServiceProvider serviceProvider)
+    protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement)
+    {
+        if (context.HasSucceeded)
         {
-            _serviceProvider = serviceProvider;
+            // This handler is not revoking any pre-existing grants.
+            return;
         }
 
-        protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement)
+        // If we are not evaluating a ContentItem then return.
+        if (context.Resource == null)
         {
-            if (context.HasSucceeded)
-            {
-                // This handler is not revoking any pre-existing grants.
-                return;
-            }
-
-            // If we are not evaluating a ContentItem then return.
-            if (context.Resource == null)
-            {
-                return;
-            }
-
-            var contentItem = context.Resource as ContentItem;
+            return;
+        }
 
-            Permission permission = null;
+        var contentItem = context.Resource as ContentItem;
 
-            if (contentItem != null)
-            {
-                var ownerVariation = GetOwnerVariation(requirement.Permission);
-
-                if (OwnerVariationExists(requirement.Permission) && HasOwnership(context.User, contentItem))
-                {
-                    permission = ownerVariation;
-                }
-            }
+        Permission permission = null;
 
-            var contentTypePermission = ContentTypePermissionsHelper.ConvertToDynamicPermission(permission ?? requirement.Permission);
+        if (contentItem != null)
+        {
+            var ownerVariation = GetOwnerVariation(requirement.Permission);
 
-            if (contentTypePermission != null)
+            if (OwnerVariationExists(requirement.Permission) && HasOwnership(context.User, contentItem))
             {
-                // The resource can be a content type name
-                var contentType = contentItem != null
-                    ? contentItem.ContentType
-                    : context.Resource.ToString()
-                    ;
-
-                if (!string.IsNullOrEmpty(contentType))
-                {
-                    permission = ContentTypePermissionsHelper.CreateDynamicPermission(contentTypePermission, contentType);
-                }
+                permission = ownerVariation;
             }
+        }
 
-            if (permission == null)
-            {
-                return;
-            }
+        var contentTypePermission = ContentTypePermissionsHelper.ConvertToDynamicPermission(permission ?? requirement.Permission);
 
-            // Lazy load to prevent circular dependencies
-            _authorizationService ??= _serviceProvider.GetService<IAuthorizationService>();
+        if (contentTypePermission != null)
+        {
+            // The resource can be a content type name
+            var contentType = contentItem != null
+                ? contentItem.ContentType
+                : context.Resource.ToString()
+                ;
 
-            if (await _authorizationService.AuthorizeAsync(context.User, permission))
+            if (!string.IsNullOrEmpty(contentType))
             {
-                context.Succeed(requirement);
+                permission = ContentTypePermissionsHelper.CreateDynamicPermission(contentTypePermission, contentType);
             }
         }
 
-        private static Permission GetOwnerVariation(Permission permission)
+        if (permission == null)
         {
-            if (CommonPermissions.OwnerPermissionsByName.TryGetValue(permission.Name, out var ownerVariation))
-            {
-                return ownerVariation;
-            }
-
-            return null;
+            return;
         }
 
-        private static bool HasOwnership(ClaimsPrincipal user, ContentItem content)
+        // Lazy load to prevent circular dependencies
+        _authorizationService ??= _serviceProvider.GetService<IAuthorizationService>();
+
+        if (await _authorizationService.AuthorizeAsync(context.User, permission))
         {
-            if (user == null || content == null)
-            {
-                return false;
-            }
+            context.Succeed(requirement);
+        }
+    }
 
-            return user.FindFirstValue(ClaimTypes.NameIdentifier) == content.Owner;
+    private static Permission GetOwnerVariation(Permission permission)
+    {
+        if (CommonPermissions.OwnerPermissionsByName.TryGetValue(permission.Name, out var ownerVariation))
+        {
+            return ownerVariation;
         }
 
-        private static bool OwnerVariationExists(Permission permission)
+        return null;
+    }
+
+    private static bool HasOwnership(ClaimsPrincipal user, ContentItem content)
+    {
+        if (user == null || content == null)
         {
-            return GetOwnerVariation(permission) != null;
+            return false;
         }
+
+        return user.FindFirstValue(ClaimTypes.NameIdentifier) == content.Owner;
+    }
+
+    private static bool OwnerVariationExists(Permission permission)
+    {
+        return GetOwnerVariation(permission) != null;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentItemIdHandleProvider.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentItemIdHandleProvider.cs
index 9aae77e36cd..55cad1090d5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentItemIdHandleProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentItemIdHandleProvider.cs
@@ -2,22 +2,21 @@
 using System.Threading.Tasks;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Contents.Services
+namespace OrchardCore.Contents.Services;
+
+public class ContentItemIdHandleProvider : IContentHandleProvider
 {
-    public class ContentItemIdHandleProvider : IContentHandleProvider
-    {
-        public int Order => 0;
+    public int Order => 0;
 
-        public Task<string> GetContentItemIdAsync(string handle)
+    public Task<string> GetContentItemIdAsync(string handle)
+    {
+        if (handle.StartsWith("contentitemid:", StringComparison.OrdinalIgnoreCase))
         {
-            if (handle.StartsWith("contentitemid:", StringComparison.OrdinalIgnoreCase))
-            {
-                var contentItemId = handle[14..];
+            var contentItemId = handle[14..];
 
-                return Task.FromResult(contentItemId);
-            }
-
-            return Task.FromResult<string>(null);
+            return Task.FromResult(contentItemId);
         }
+
+        return Task.FromResult<string>(null);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentTypeFilterNode.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentTypeFilterNode.cs
index b649aaa00c6..6ae7190619c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentTypeFilterNode.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentTypeFilterNode.cs
@@ -1,20 +1,19 @@
 using YesSql.Filters.Abstractions.Nodes;
 
-namespace OrchardCore.Contents.Services
+namespace OrchardCore.Contents.Services;
+
+/// <summary>
+/// Provides a content type node is used when a filter has not been selected.
+/// </summary>
+public class ContentTypeFilterNode : TermOperationNode
 {
-    /// <summary>
-    /// Provides a content type node is used when a filter has not been selected.
-    /// </summary>
-    public class ContentTypeFilterNode : TermOperationNode
+    public ContentTypeFilterNode(string selectedContentType) : base("type", new UnaryNode(selectedContentType, OperateNodeQuotes.None))
     {
-        public ContentTypeFilterNode(string selectedContentType) : base("type", new UnaryNode(selectedContentType, OperateNodeQuotes.None))
-        {
-        }
+    }
 
-        public override string ToNormalizedString()
-            => string.Empty;
+    public override string ToNormalizedString()
+        => string.Empty;
 
-        public override string ToString()
-            => string.Empty;
-    }
+    public override string ToString()
+        => string.Empty;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Services/DefaultContentsAdminListFilterParser.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Services/DefaultContentsAdminListFilterParser.cs
index daab0845412..304cebe1524 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Services/DefaultContentsAdminListFilterParser.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Services/DefaultContentsAdminListFilterParser.cs
@@ -1,18 +1,17 @@
 using OrchardCore.ContentManagement;
 using YesSql.Filters.Query;
 
-namespace OrchardCore.Contents.Services
-{
-    public class DefaultContentsAdminListFilterParser : IContentsAdminListFilterParser
-    {
-        private readonly IQueryParser<ContentItem> _parser;
+namespace OrchardCore.Contents.Services;
 
-        public DefaultContentsAdminListFilterParser(IQueryParser<ContentItem> parser)
-        {
-            _parser = parser;
-        }
+public class DefaultContentsAdminListFilterParser : IContentsAdminListFilterParser
+{
+    private readonly IQueryParser<ContentItem> _parser;
 
-        public QueryFilterResult<ContentItem> Parse(string text)
-            => _parser.Parse(text);
+    public DefaultContentsAdminListFilterParser(IQueryParser<ContentItem> parser)
+    {
+        _parser = parser;
     }
+
+    public QueryFilterResult<ContentItem> Parse(string text)
+        => _parser.Parse(text);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Services/DefaultContentsAdminListFilterProvider.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Services/DefaultContentsAdminListFilterProvider.cs
index 3ff5c6a02cc..fcd89645c28 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Services/DefaultContentsAdminListFilterProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Services/DefaultContentsAdminListFilterProvider.cs
@@ -15,246 +15,245 @@
 using YesSql.Filters.Query;
 using YesSql.Services;
 
-namespace OrchardCore.Contents.Services
+namespace OrchardCore.Contents.Services;
+
+public class DefaultContentsAdminListFilterProvider : IContentsAdminListFilterProvider
 {
-    public class DefaultContentsAdminListFilterProvider : IContentsAdminListFilterProvider
+    public void Build(QueryEngineBuilder<ContentItem> builder)
     {
-        public void Build(QueryEngineBuilder<ContentItem> builder)
-        {
-            builder
-                .WithNamedTerm("status", builder => builder
-                    .OneCondition((val, query, ctx) =>
+        builder
+            .WithNamedTerm("status", builder => builder
+                .OneCondition((val, query, ctx) =>
+                {
+                    var context = (ContentQueryContext)ctx;
+                    if (Enum.TryParse<ContentsStatus>(val, true, out var contentsStatus))
                     {
-                        var context = (ContentQueryContext)ctx;
-                        if (Enum.TryParse<ContentsStatus>(val, true, out var contentsStatus))
-                        {
-                            switch (contentsStatus)
-                            {
-                                case ContentsStatus.Draft:
-                                    query.With<ContentItemIndex>(x => x.Latest && !x.Published);
-                                    break;
-                                case ContentsStatus.Published:
-                                    query.With<ContentItemIndex>(x => x.Published);
-                                    break;
-                                case ContentsStatus.Owner:
-                                    var httpContextAccessor = context.ServiceProvider.GetRequiredService<IHttpContextAccessor>();
-                                    var userNameIdentifier = httpContextAccessor.HttpContext.User?.FindFirstValue(ClaimTypes.NameIdentifier);
-                                    query.With<ContentItemIndex>(x => x.Owner == userNameIdentifier && x.Latest);
-                                    break;
-                                case ContentsStatus.AllVersions:
-                                    query.With<ContentItemIndex>(x => x.Latest);
-                                    break;
-                                default:
-                                    query.With<ContentItemIndex>(x => x.Latest);
-                                    break;
-                            }
-                        }
-                        else
+                        switch (contentsStatus)
                         {
-                            // Draft is the default value.
-                            query.With<ContentItemIndex>(x => x.Latest);
+                            case ContentsStatus.Draft:
+                                query.With<ContentItemIndex>(x => x.Latest && !x.Published);
+                                break;
+                            case ContentsStatus.Published:
+                                query.With<ContentItemIndex>(x => x.Published);
+                                break;
+                            case ContentsStatus.Owner:
+                                var httpContextAccessor = context.ServiceProvider.GetRequiredService<IHttpContextAccessor>();
+                                var userNameIdentifier = httpContextAccessor.HttpContext.User?.FindFirstValue(ClaimTypes.NameIdentifier);
+                                query.With<ContentItemIndex>(x => x.Owner == userNameIdentifier && x.Latest);
+                                break;
+                            case ContentsStatus.AllVersions:
+                                query.With<ContentItemIndex>(x => x.Latest);
+                                break;
+                            default:
+                                query.With<ContentItemIndex>(x => x.Latest);
+                                break;
                         }
+                    }
+                    else
+                    {
+                        // Draft is the default value.
+                        query.With<ContentItemIndex>(x => x.Latest);
+                    }
 
-                        return new ValueTask<IQuery<ContentItem>>(query);
-                    })
-                    .MapTo<ContentOptionsViewModel>((val, model) =>
+                    return new ValueTask<IQuery<ContentItem>>(query);
+                })
+                .MapTo<ContentOptionsViewModel>((val, model) =>
+                {
+                    if (Enum.TryParse<ContentsStatus>(val, true, out var contentsStatus))
                     {
-                        if (Enum.TryParse<ContentsStatus>(val, true, out var contentsStatus))
-                        {
-                            model.ContentsStatus = contentsStatus;
-                        }
-                    })
-                    .MapFrom<ContentOptionsViewModel>((model) =>
+                        model.ContentsStatus = contentsStatus;
+                    }
+                })
+                .MapFrom<ContentOptionsViewModel>((model) =>
+                {
+                    if (model.ContentsStatus != ContentsStatus.Latest)
                     {
-                        if (model.ContentsStatus != ContentsStatus.Latest)
-                        {
-                            return (true, model.ContentsStatus.ToString());
-                        }
+                        return (true, model.ContentsStatus.ToString());
+                    }
 
-                        return (false, string.Empty);
-                    })
-                    .AlwaysRun()
-                )
-                .WithNamedTerm("sort", builder => builder
-                    .OneCondition((val, query) =>
+                    return (false, string.Empty);
+                })
+                .AlwaysRun()
+            )
+            .WithNamedTerm("sort", builder => builder
+                .OneCondition((val, query) =>
+                {
+                    if (Enum.TryParse<ContentsOrder>(val, true, out var contentsOrder))
                     {
-                        if (Enum.TryParse<ContentsOrder>(val, true, out var contentsOrder))
+                        switch (contentsOrder)
                         {
-                            switch (contentsOrder)
-                            {
-                                case ContentsOrder.Modified:
-                                    query.With<ContentItemIndex>().OrderByDescending(cr => cr.ModifiedUtc).ThenBy(cr => cr.Id);
-                                    break;
-                                case ContentsOrder.Published:
-                                    query.With<ContentItemIndex>().OrderByDescending(cr => cr.PublishedUtc).ThenBy(cr => cr.Id);
-                                    break;
-                                case ContentsOrder.Created:
-                                    query.With<ContentItemIndex>().OrderByDescending(cr => cr.CreatedUtc).ThenBy(cr => cr.Id);
-                                    break;
-                                case ContentsOrder.Title:
-                                    query.With<ContentItemIndex>().OrderBy(cr => cr.DisplayText).ThenBy(cr => cr.Id);
-                                    break;
-                            };
-                        }
-                        else
-                        {
-                            // Modified is a default value and applied when there is no filter.
-                            query.With<ContentItemIndex>().OrderByDescending(cr => cr.ModifiedUtc).ThenBy(cr => cr.Id);
-                        }
+                            case ContentsOrder.Modified:
+                                query.With<ContentItemIndex>().OrderByDescending(cr => cr.ModifiedUtc).ThenBy(cr => cr.Id);
+                                break;
+                            case ContentsOrder.Published:
+                                query.With<ContentItemIndex>().OrderByDescending(cr => cr.PublishedUtc).ThenBy(cr => cr.Id);
+                                break;
+                            case ContentsOrder.Created:
+                                query.With<ContentItemIndex>().OrderByDescending(cr => cr.CreatedUtc).ThenBy(cr => cr.Id);
+                                break;
+                            case ContentsOrder.Title:
+                                query.With<ContentItemIndex>().OrderBy(cr => cr.DisplayText).ThenBy(cr => cr.Id);
+                                break;
+                        };
+                    }
+                    else
+                    {
+                        // Modified is a default value and applied when there is no filter.
+                        query.With<ContentItemIndex>().OrderByDescending(cr => cr.ModifiedUtc).ThenBy(cr => cr.Id);
+                    }
 
-                        return query;
-                    })
-                    .MapTo<ContentOptionsViewModel>((val, model) =>
+                    return query;
+                })
+                .MapTo<ContentOptionsViewModel>((val, model) =>
+                {
+                    if (Enum.TryParse<ContentsOrder>(val, true, out var contentsOrder))
                     {
-                        if (Enum.TryParse<ContentsOrder>(val, true, out var contentsOrder))
-                        {
-                            model.OrderBy = contentsOrder;
-                        }
-                    })
-                    .MapFrom<ContentOptionsViewModel>((model) =>
+                        model.OrderBy = contentsOrder;
+                    }
+                })
+                .MapFrom<ContentOptionsViewModel>((model) =>
+                {
+                    if (model.OrderBy != ContentsOrder.Modified)
                     {
-                        if (model.OrderBy != ContentsOrder.Modified)
-                        {
-                            return (true, model.OrderBy.ToString());
-                        }
+                        return (true, model.OrderBy.ToString());
+                    }
 
-                        return (false, string.Empty);
-                    })
-                    .AlwaysRun()
-                )
-                .WithNamedTerm("type", builder => builder
-                    .OneCondition(async (contentType, query, ctx) =>
-                    {
-                        var context = (ContentQueryContext)ctx;
-                        var httpContextAccessor = context.ServiceProvider.GetRequiredService<IHttpContextAccessor>();
-                        var authorizationService = context.ServiceProvider.GetRequiredService<IAuthorizationService>();
-                        var contentDefinitionManager = context.ServiceProvider.GetRequiredService<IContentDefinitionManager>();
-                        var user = httpContextAccessor.HttpContext.User;
-                        var userNameIdentifier = user?.FindFirstValue(ClaimTypes.NameIdentifier);
+                    return (false, string.Empty);
+                })
+                .AlwaysRun()
+            )
+            .WithNamedTerm("type", builder => builder
+                .OneCondition(async (contentType, query, ctx) =>
+                {
+                    var context = (ContentQueryContext)ctx;
+                    var httpContextAccessor = context.ServiceProvider.GetRequiredService<IHttpContextAccessor>();
+                    var authorizationService = context.ServiceProvider.GetRequiredService<IAuthorizationService>();
+                    var contentDefinitionManager = context.ServiceProvider.GetRequiredService<IContentDefinitionManager>();
+                    var user = httpContextAccessor.HttpContext.User;
+                    var userNameIdentifier = user?.FindFirstValue(ClaimTypes.NameIdentifier);
 
-                        // Filter for a specific type.
-                        if (!string.IsNullOrEmpty(contentType))
+                    // Filter for a specific type.
+                    if (!string.IsNullOrEmpty(contentType))
+                    {
+                        var contentTypeDefinition = await contentDefinitionManager.GetTypeDefinitionAsync(contentType);
+                        if (contentTypeDefinition != null)
                         {
-                            var contentTypeDefinition = await contentDefinitionManager.GetTypeDefinitionAsync(contentType);
-                            if (contentTypeDefinition != null)
-                            {
-                                // We display a specific type even if it's not listable so that admin pages
-                                // can reuse the Content list page for specific types.
-
-                                // It is important to pass null to the owner parameter. This will check if the user can view content that belongs to others.
-                                if (await authorizationService.AuthorizeContentTypeAsync(user, CommonPermissions.ViewContent, contentTypeDefinition.Name, owner: null))
-                                {
-                                    return query.With<ContentItemIndex>(x => x.ContentType == contentType);
-                                }
+                            // We display a specific type even if it's not listable so that admin pages
+                            // can reuse the Content list page for specific types.
 
-                                return query.With<ContentItemIndex>(x => x.ContentType == contentType && x.Owner == userNameIdentifier);
+                            // It is important to pass null to the owner parameter. This will check if the user can view content that belongs to others.
+                            if (await authorizationService.AuthorizeContentTypeAsync(user, CommonPermissions.ViewContent, contentTypeDefinition.Name, owner: null))
+                            {
+                                return query.With<ContentItemIndex>(x => x.ContentType == contentType);
                             }
 
-                            // At this point, the given contentType is invalid. Ignore it.
+                            return query.With<ContentItemIndex>(x => x.ContentType == contentType && x.Owner == userNameIdentifier);
                         }
 
-                        var listAnyContentTypes = new List<string>();
-                        var listOwnContentTypes = new List<string>();
+                        // At this point, the given contentType is invalid. Ignore it.
+                    }
 
-                        foreach (var ctd in await contentDefinitionManager.ListTypeDefinitionsAsync())
+                    var listAnyContentTypes = new List<string>();
+                    var listOwnContentTypes = new List<string>();
+
+                    foreach (var ctd in await contentDefinitionManager.ListTypeDefinitionsAsync())
+                    {
+                        if (!ctd.IsListable())
                         {
-                            if (!ctd.IsListable())
-                            {
-                                continue;
-                            }
+                            continue;
+                        }
 
-                            // It is important to pass null to the owner parameter. This will check if the user can view content that belongs to others.
-                            if (await authorizationService.AuthorizeContentTypeAsync(user, CommonPermissions.ViewContent, ctd.Name, owner: null))
-                            {
-                                listAnyContentTypes.Add(ctd.Name);
+                        // It is important to pass null to the owner parameter. This will check if the user can view content that belongs to others.
+                        if (await authorizationService.AuthorizeContentTypeAsync(user, CommonPermissions.ViewContent, ctd.Name, owner: null))
+                        {
+                            listAnyContentTypes.Add(ctd.Name);
 
-                                continue;
-                            }
+                            continue;
+                        }
 
-                            // It is important to pass the current user ID to the owner parameter. This will check if the user can view their own content.
-                            if (await authorizationService.AuthorizeContentTypeAsync(user, CommonPermissions.ViewContent, ctd.Name, userNameIdentifier))
-                            {
-                                listOwnContentTypes.Add(ctd.Name);
+                        // It is important to pass the current user ID to the owner parameter. This will check if the user can view their own content.
+                        if (await authorizationService.AuthorizeContentTypeAsync(user, CommonPermissions.ViewContent, ctd.Name, userNameIdentifier))
+                        {
+                            listOwnContentTypes.Add(ctd.Name);
 
-                                continue;
-                            }
+                            continue;
                         }
+                    }
 
-                        return query.With<ContentItemIndex>().Where(x => x.ContentType.IsIn(listAnyContentTypes) || (x.ContentType.IsIn(listOwnContentTypes) && x.Owner == userNameIdentifier));
-                    })
-                    .MapTo<ContentOptionsViewModel>((val, model) =>
+                    return query.With<ContentItemIndex>().Where(x => x.ContentType.IsIn(listAnyContentTypes) || (x.ContentType.IsIn(listOwnContentTypes) && x.Owner == userNameIdentifier));
+                })
+                .MapTo<ContentOptionsViewModel>((val, model) =>
+                {
+                    if (!string.IsNullOrEmpty(val))
                     {
-                        if (!string.IsNullOrEmpty(val))
-                        {
-                            model.SelectedContentType = val;
-                        }
-                    })
-                    .MapFrom<ContentOptionsViewModel>((model) =>
+                        model.SelectedContentType = val;
+                    }
+                })
+                .MapFrom<ContentOptionsViewModel>((model) =>
+                {
+                    if (!string.IsNullOrEmpty(model.SelectedContentType))
                     {
-                        if (!string.IsNullOrEmpty(model.SelectedContentType))
-                        {
-                            return (true, model.SelectedContentType);
-                        }
+                        return (true, model.SelectedContentType);
+                    }
 
-                        return (false, string.Empty);
-                    })
-                    .AlwaysRun()
-                )
-                .WithNamedTerm("stereotype", builder => builder
-                    .OneCondition(async (stereotype, query, ctx) =>
+                    return (false, string.Empty);
+                })
+                .AlwaysRun()
+            )
+            .WithNamedTerm("stereotype", builder => builder
+                .OneCondition(async (stereotype, query, ctx) =>
+                {
+                    var context = (ContentQueryContext)ctx;
+                    var httpContextAccessor = context.ServiceProvider.GetRequiredService<IHttpContextAccessor>();
+                    var authorizationService = context.ServiceProvider.GetRequiredService<IAuthorizationService>();
+                    var contentDefinitionManager = context.ServiceProvider.GetRequiredService<IContentDefinitionManager>();
+
+                    // Filter for a specific stereotype.
+                    if (!string.IsNullOrEmpty(stereotype))
                     {
-                        var context = (ContentQueryContext)ctx;
-                        var httpContextAccessor = context.ServiceProvider.GetRequiredService<IHttpContextAccessor>();
-                        var authorizationService = context.ServiceProvider.GetRequiredService<IAuthorizationService>();
-                        var contentDefinitionManager = context.ServiceProvider.GetRequiredService<IContentDefinitionManager>();
+                        var contentTypeDefinitionNames = (await contentDefinitionManager.ListTypeDefinitionsAsync())
+                            .Where(definition => definition.StereotypeEquals(stereotype, StringComparison.OrdinalIgnoreCase))
+                            .Select(definition => definition.Name)
+                            .ToList();
 
-                        // Filter for a specific stereotype.
-                        if (!string.IsNullOrEmpty(stereotype))
+                        // We display a specific type even if it's not listable so that admin pages
+                        // can reuse the content list page for specific types.
+
+                        if (contentTypeDefinitionNames.Count > 0)
                         {
-                            var contentTypeDefinitionNames = (await contentDefinitionManager.ListTypeDefinitionsAsync())
-                                .Where(definition => definition.StereotypeEquals(stereotype, StringComparison.OrdinalIgnoreCase))
-                                .Select(definition => definition.Name)
-                                .ToList();
+                            var user = httpContextAccessor.HttpContext.User;
+                            var userNameIdentifier = user?.FindFirstValue(ClaimTypes.NameIdentifier);
 
-                            // We display a specific type even if it's not listable so that admin pages
-                            // can reuse the content list page for specific types.
+                            var viewAll = new List<string>();
+                            var viewOwn = new List<string>();
 
-                            if (contentTypeDefinitionNames.Count > 0)
+                            foreach (var contentTypeDefinitionName in contentTypeDefinitionNames)
                             {
-                                var user = httpContextAccessor.HttpContext.User;
-                                var userNameIdentifier = user?.FindFirstValue(ClaimTypes.NameIdentifier);
-
-                                var viewAll = new List<string>();
-                                var viewOwn = new List<string>();
-
-                                foreach (var contentTypeDefinitionName in contentTypeDefinitionNames)
+                                // It is important to pass null to the owner parameter. This will check if the user can view content that belongs to others.
+                                if (await authorizationService.AuthorizeContentTypeAsync(user, CommonPermissions.ViewContent, contentTypeDefinitionName, owner: null))
                                 {
-                                    // It is important to pass null to the owner parameter. This will check if the user can view content that belongs to others.
-                                    if (await authorizationService.AuthorizeContentTypeAsync(user, CommonPermissions.ViewContent, contentTypeDefinitionName, owner: null))
-                                    {
-                                        viewAll.Add(contentTypeDefinitionName);
-
-                                        continue;
-                                    }
+                                    viewAll.Add(contentTypeDefinitionName);
 
-                                    viewOwn.Add(contentTypeDefinitionName);
+                                    continue;
                                 }
 
-                                return query.With<ContentItemIndex>(x => x.ContentType.IsIn(viewAll) || (x.ContentType.IsIn(viewOwn) && x.Owner == userNameIdentifier));
+                                viewOwn.Add(contentTypeDefinitionName);
                             }
 
-                            // At this point, the given stereotype is invalid. Ignore it.
+                            return query.With<ContentItemIndex>(x => x.ContentType.IsIn(viewAll) || (x.ContentType.IsIn(viewOwn) && x.Owner == userNameIdentifier));
                         }
 
-                        return query;
-                    })
+                        // At this point, the given stereotype is invalid. Ignore it.
+                    }
+
+                    return query;
+                })
+            )
+            .WithDefaultTerm(ContentsAdminListFilterOptions.DefaultTermName, builder => builder
+                .ManyCondition(
+                    (val, query) => query.With<ContentItemIndex>(x => x.DisplayText.Contains(val)),
+                    (val, query) => query.With<ContentItemIndex>(x => x.DisplayText.NotContains(val))
                 )
-                .WithDefaultTerm(ContentsAdminListFilterOptions.DefaultTermName, builder => builder
-                    .ManyCondition(
-                        (val, query) => query.With<ContentItemIndex>(x => x.DisplayText.Contains(val)),
-                        (val, query) => query.With<ContentItemIndex>(x => x.DisplayText.NotContains(val))
-                    )
-                );
-        }
+            );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Settings/CommonPartSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Settings/CommonPartSettingsDisplayDriver.cs
index 267b9a69766..5956c5db615 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Settings/CommonPartSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Settings/CommonPartSettingsDisplayDriver.cs
@@ -6,33 +6,32 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Lists.Settings
+namespace OrchardCore.Lists.Settings;
+
+public sealed class CommonPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<CommonPart>
 {
-    public sealed class CommonPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<CommonPart>
+    public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+        return Initialize<CommonPartSettingsViewModel>("CommonPartSettings_Edit", model =>
         {
-            return Initialize<CommonPartSettingsViewModel>("CommonPartSettings_Edit", model =>
-            {
-                var settings = contentTypePartDefinition.GetSettings<CommonPartSettings>();
-                model.DisplayDateEditor = settings.DisplayDateEditor;
-                model.DisplayOwnerEditor = settings.DisplayOwnerEditor;
-            }).Location("Content");
-        }
+            var settings = contentTypePartDefinition.GetSettings<CommonPartSettings>();
+            model.DisplayDateEditor = settings.DisplayDateEditor;
+            model.DisplayOwnerEditor = settings.DisplayOwnerEditor;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
-        {
-            var model = new CommonPartSettingsViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    {
+        var model = new CommonPartSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            context.Builder.WithSettings(new CommonPartSettings
-            {
-                DisplayDateEditor = model.DisplayDateEditor,
-                DisplayOwnerEditor = model.DisplayOwnerEditor,
-            });
+        context.Builder.WithSettings(new CommonPartSettings
+        {
+            DisplayDateEditor = model.DisplayDateEditor,
+            DisplayOwnerEditor = model.DisplayOwnerEditor,
+        });
 
-            return Edit(contentTypePartDefinition, context);
-        }
+        return Edit(contentTypePartDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Settings/FullTextAspectSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Settings/FullTextAspectSettingsDisplayDriver.cs
index bfd15e0d317..edd89eb4228 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Settings/FullTextAspectSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Settings/FullTextAspectSettingsDisplayDriver.cs
@@ -8,64 +8,63 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Contents.Settings
+namespace OrchardCore.Contents.Settings;
+
+public sealed class FullTextAspectSettingsDisplayDriver : ContentTypeDefinitionDisplayDriver
 {
-    public sealed class FullTextAspectSettingsDisplayDriver : ContentTypeDefinitionDisplayDriver
-    {
-        private readonly ILiquidTemplateManager _templateManager;
+    private readonly ILiquidTemplateManager _templateManager;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public FullTextAspectSettingsDisplayDriver(
-            ILiquidTemplateManager templateManager,
-            IStringLocalizer<FullTextAspectSettingsDisplayDriver> localizer)
-        {
-            _templateManager = templateManager;
-            S = localizer;
-        }
+    public FullTextAspectSettingsDisplayDriver(
+        ILiquidTemplateManager templateManager,
+        IStringLocalizer<FullTextAspectSettingsDisplayDriver> localizer)
+    {
+        _templateManager = templateManager;
+        S = localizer;
+    }
 
-        public override IDisplayResult Edit(ContentTypeDefinition contentTypeDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentTypeDefinition contentTypeDefinition, BuildEditorContext context)
+    {
+        return Initialize<FullTextAspectSettingsViewModel>("FullTextAspectSettings_Edit", model =>
         {
-            return Initialize<FullTextAspectSettingsViewModel>("FullTextAspectSettings_Edit", model =>
-            {
-                var settings = contentTypeDefinition.GetSettings<FullTextAspectSettings>();
+            var settings = contentTypeDefinition.GetSettings<FullTextAspectSettings>();
 
-                model.IncludeFullTextTemplate = settings.IncludeFullTextTemplate;
-                model.FullTextTemplate = settings.FullTextTemplate;
-                model.IncludeDisplayText = settings.IncludeDisplayText;
-                model.IncludeBodyAspect = settings.IncludeBodyAspect;
-            }).Location("Content:6");
-        }
+            model.IncludeFullTextTemplate = settings.IncludeFullTextTemplate;
+            model.FullTextTemplate = settings.FullTextTemplate;
+            model.IncludeDisplayText = settings.IncludeDisplayText;
+            model.IncludeBodyAspect = settings.IncludeBodyAspect;
+        }).Location("Content:6");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypeDefinition contentTypeDefinition, UpdateTypeEditorContext context)
-        {
-            var model = new FullTextAspectSettingsViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypeDefinition contentTypeDefinition, UpdateTypeEditorContext context)
+    {
+        var model = new FullTextAspectSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix,
-                m => m.IncludeFullTextTemplate,
-                m => m.FullTextTemplate,
-                m => m.IncludeDisplayText,
-                m => m.IncludeBodyAspect);
+        await context.Updater.TryUpdateModelAsync(model, Prefix,
+            m => m.IncludeFullTextTemplate,
+            m => m.FullTextTemplate,
+            m => m.IncludeDisplayText,
+            m => m.IncludeBodyAspect);
 
-            if (!string.IsNullOrEmpty(model.FullTextTemplate) && !_templateManager.Validate(model.FullTextTemplate, out var errors))
-            {
-                context.Updater.ModelState.AddModelError(
-                    nameof(model.FullTextTemplate),
-                    S["Full-text doesn't contain a valid Liquid expression. Details: {0}",
-                    string.Join(' ', errors)]);
-            }
-            else
+        if (!string.IsNullOrEmpty(model.FullTextTemplate) && !_templateManager.Validate(model.FullTextTemplate, out var errors))
+        {
+            context.Updater.ModelState.AddModelError(
+                nameof(model.FullTextTemplate),
+                S["Full-text doesn't contain a valid Liquid expression. Details: {0}",
+                string.Join(' ', errors)]);
+        }
+        else
+        {
+            context.Builder.WithSettings(new FullTextAspectSettings
             {
-                context.Builder.WithSettings(new FullTextAspectSettings
-                {
-                    IncludeFullTextTemplate = model.IncludeFullTextTemplate,
-                    FullTextTemplate = model.FullTextTemplate,
-                    IncludeDisplayText = model.IncludeDisplayText,
-                    IncludeBodyAspect = model.IncludeBodyAspect
-                });
-            }
-
-            return Edit(contentTypeDefinition, context);
+                IncludeFullTextTemplate = model.IncludeFullTextTemplate,
+                FullTextTemplate = model.FullTextTemplate,
+                IncludeDisplayText = model.IncludeDisplayText,
+                IncludeBodyAspect = model.IncludeBodyAspect
+            });
         }
+
+        return Edit(contentTypeDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Shapes.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Shapes.cs
index de392d1385b..b342045fb67 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Shapes.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Shapes.cs
@@ -7,94 +7,93 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Utilities;
 
-namespace OrchardCore.Contents
+namespace OrchardCore.Contents;
+
+public class Shapes : ShapeTableProvider
 {
-    public class Shapes : ShapeTableProvider
+    public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
     {
-        public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
-        {
-            builder.Describe("Content")
-                .OnDisplaying(displaying =>
+        builder.Describe("Content")
+            .OnDisplaying(displaying =>
+            {
+                var shape = displaying.Shape;
+                var contentItem = shape.GetProperty<ContentItem>("ContentItem");
+
+                if (contentItem != null)
                 {
-                    var shape = displaying.Shape;
-                    var contentItem = shape.GetProperty<ContentItem>("ContentItem");
+                    // Alternates in order of specificity.
+                    // Display type > content type > specific content > display type for a content type > display type for specific content
+                    // BasicShapeTemplateHarvester.Adjust will then adjust the template name
 
-                    if (contentItem != null)
-                    {
-                        // Alternates in order of specificity.
-                        // Display type > content type > specific content > display type for a content type > display type for specific content
-                        // BasicShapeTemplateHarvester.Adjust will then adjust the template name
+                    // Content__[DisplayType] e.g. Content-Summary
+                    displaying.Shape.Metadata.Alternates.Add("Content_" + displaying.Shape.Metadata.DisplayType.EncodeAlternateElement());
 
-                        // Content__[DisplayType] e.g. Content-Summary
-                        displaying.Shape.Metadata.Alternates.Add("Content_" + displaying.Shape.Metadata.DisplayType.EncodeAlternateElement());
+                    var encodedContentType = contentItem.ContentType.EncodeAlternateElement();
 
-                        var encodedContentType = contentItem.ContentType.EncodeAlternateElement();
+                    // Content__[ContentType] e.g. Content-BlogPost,
+                    displaying.Shape.Metadata.Alternates.Add("Content__" + encodedContentType);
 
-                        // Content__[ContentType] e.g. Content-BlogPost,
-                        displaying.Shape.Metadata.Alternates.Add("Content__" + encodedContentType);
+                    // Content__[Id] e.g. Content-42,
+                    displaying.Shape.Metadata.Alternates.Add("Content__" + contentItem.Id);
 
-                        // Content__[Id] e.g. Content-42,
-                        displaying.Shape.Metadata.Alternates.Add("Content__" + contentItem.Id);
+                    // Content_[DisplayType]__[ContentType] e.g. Content-BlogPost.Summary
+                    displaying.Shape.Metadata.Alternates.Add("Content_" + displaying.Shape.Metadata.DisplayType + "__" + encodedContentType);
 
-                        // Content_[DisplayType]__[ContentType] e.g. Content-BlogPost.Summary
-                        displaying.Shape.Metadata.Alternates.Add("Content_" + displaying.Shape.Metadata.DisplayType + "__" + encodedContentType);
+                    // Content_[DisplayType]__[Id] e.g. Content-42.Summary
+                    displaying.Shape.Metadata.Alternates.Add("Content_" + displaying.Shape.Metadata.DisplayType + "__" + contentItem.Id);
+                }
+            });
 
-                        // Content_[DisplayType]__[Id] e.g. Content-42.Summary
-                        displaying.Shape.Metadata.Alternates.Add("Content_" + displaying.Shape.Metadata.DisplayType + "__" + contentItem.Id);
-                    }
-                });
+        // This shapes provides a way to lazily load a content item render it in any display type.
+        builder.Describe("ContentItem")
+            .OnProcessing(async context =>
+            {
+                var content = context.Shape;
+                var handle = content.GetProperty<string>("Handle");
+                var displayType = content.GetProperty<string>("DisplayType");
+                var alternate = content.GetProperty<string>("Alternate");
 
-            // This shapes provides a way to lazily load a content item render it in any display type.
-            builder.Describe("ContentItem")
-                .OnProcessing(async context =>
+                if (string.IsNullOrEmpty(handle))
                 {
-                    var content = context.Shape;
-                    var handle = content.GetProperty<string>("Handle");
-                    var displayType = content.GetProperty<string>("DisplayType");
-                    var alternate = content.GetProperty<string>("Alternate");
-
+                    // This code is provided for backwards compatibility and can be removed in a future version.
+                    handle = content.GetProperty<string>("Alias");
                     if (string.IsNullOrEmpty(handle))
                     {
-                        // This code is provided for backwards compatibility and can be removed in a future version.
-                        handle = content.GetProperty<string>("Alias");
-                        if (string.IsNullOrEmpty(handle))
-                        {
-                            return;
-                        }
+                        return;
                     }
+                }
 
-                    var contentManager = context.ServiceProvider.GetRequiredService<IContentManager>();
-                    var handleManager = context.ServiceProvider.GetRequiredService<IContentHandleManager>();
-                    var displayManager = context.ServiceProvider.GetRequiredService<IContentItemDisplayManager>();
-                    var updateModelAccessor = context.ServiceProvider.GetRequiredService<IUpdateModelAccessor>();
+                var contentManager = context.ServiceProvider.GetRequiredService<IContentManager>();
+                var handleManager = context.ServiceProvider.GetRequiredService<IContentHandleManager>();
+                var displayManager = context.ServiceProvider.GetRequiredService<IContentItemDisplayManager>();
+                var updateModelAccessor = context.ServiceProvider.GetRequiredService<IUpdateModelAccessor>();
 
-                    var contentItemId = await handleManager.GetContentItemIdAsync(handle);
+                var contentItemId = await handleManager.GetContentItemIdAsync(handle);
 
-                    if (string.IsNullOrEmpty(contentItemId))
-                    {
-                        return;
-                    }
+                if (string.IsNullOrEmpty(contentItemId))
+                {
+                    return;
+                }
 
-                    var contentItem = await contentManager.GetAsync(contentItemId);
+                var contentItem = await contentManager.GetAsync(contentItemId);
 
-                    if (contentItem == null)
-                    {
-                        return;
-                    }
+                if (contentItem == null)
+                {
+                    return;
+                }
 
-                    content.Properties["ContentItem"] = contentItem;
+                content.Properties["ContentItem"] = contentItem;
 
-                    var displayShape = await displayManager.BuildDisplayAsync(contentItem, updateModelAccessor.ModelUpdater, displayType);
+                var displayShape = await displayManager.BuildDisplayAsync(contentItem, updateModelAccessor.ModelUpdater, displayType);
 
-                    if (!string.IsNullOrEmpty(alternate))
-                    {
-                        displayShape.Metadata.Alternates.Add(alternate);
-                    }
+                if (!string.IsNullOrEmpty(alternate))
+                {
+                    displayShape.Metadata.Alternates.Add(alternate);
+                }
 
-                    await context.Shape.AddAsync(displayShape, string.Empty);
-                });
+                await context.Shape.AddAsync(displayShape, string.Empty);
+            });
 
-            return ValueTask.CompletedTask;
-        }
+        return ValueTask.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceBuilder.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceBuilder.cs
index 3f2fef1690e..15c34394a84 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceBuilder.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceBuilder.cs
@@ -10,161 +10,160 @@
 using OrchardCore.Sitemaps.Models;
 using OrchardCore.Sitemaps.Services;
 
-namespace OrchardCore.Contents.Sitemaps
+namespace OrchardCore.Contents.Sitemaps;
+
+public class ContentTypesSitemapSourceBuilder : SitemapSourceBuilderBase<ContentTypesSitemapSource>
 {
-    public class ContentTypesSitemapSourceBuilder : SitemapSourceBuilderBase<ContentTypesSitemapSource>
+    private static readonly XNamespace _namespace = "http://www.sitemaps.org/schemas/sitemap/0.9";
+
+    private readonly IRouteableContentTypeCoordinator _routeableContentTypeCoordinator;
+    private readonly IContentManager _contentManager;
+    private readonly IContentItemsQueryProvider _contentItemsQueryProvider;
+    private readonly IEnumerable<ISitemapContentItemExtendedMetadataProvider> _sitemapContentItemExtendedMetadataProviders;
+
+    public ContentTypesSitemapSourceBuilder(
+        IRouteableContentTypeCoordinator routeableContentTypeCoordinator,
+        IContentManager contentManager,
+        IContentItemsQueryProvider contentItemsQueryProvider,
+        IEnumerable<ISitemapContentItemExtendedMetadataProvider> sitemapContentItemExtendedMetadataProviders
+        )
+    {
+        _routeableContentTypeCoordinator = routeableContentTypeCoordinator;
+        _contentManager = contentManager;
+        _contentItemsQueryProvider = contentItemsQueryProvider;
+        _sitemapContentItemExtendedMetadataProviders = sitemapContentItemExtendedMetadataProviders;
+    }
+
+    public override async Task BuildSourceAsync(ContentTypesSitemapSource source, SitemapBuilderContext context)
     {
-        private static readonly XNamespace _namespace = "http://www.sitemaps.org/schemas/sitemap/0.9";
-
-        private readonly IRouteableContentTypeCoordinator _routeableContentTypeCoordinator;
-        private readonly IContentManager _contentManager;
-        private readonly IContentItemsQueryProvider _contentItemsQueryProvider;
-        private readonly IEnumerable<ISitemapContentItemExtendedMetadataProvider> _sitemapContentItemExtendedMetadataProviders;
-
-        public ContentTypesSitemapSourceBuilder(
-            IRouteableContentTypeCoordinator routeableContentTypeCoordinator,
-            IContentManager contentManager,
-            IContentItemsQueryProvider contentItemsQueryProvider,
-            IEnumerable<ISitemapContentItemExtendedMetadataProvider> sitemapContentItemExtendedMetadataProviders
-            )
+        var queryContext = new ContentItemsQueryContext();
+        await _contentItemsQueryProvider.GetContentItemsAsync(source, queryContext);
+
+        foreach (var sciemp in _sitemapContentItemExtendedMetadataProviders)
         {
-            _routeableContentTypeCoordinator = routeableContentTypeCoordinator;
-            _contentManager = contentManager;
-            _contentItemsQueryProvider = contentItemsQueryProvider;
-            _sitemapContentItemExtendedMetadataProviders = sitemapContentItemExtendedMetadataProviders;
+            context.Response.ResponseElement.Add(sciemp.GetExtendedAttribute);
         }
 
-        public override async Task BuildSourceAsync(ContentTypesSitemapSource source, SitemapBuilderContext context)
+        foreach (var contentItem in queryContext.ContentItems)
         {
-            var queryContext = new ContentItemsQueryContext();
-            await _contentItemsQueryProvider.GetContentItemsAsync(source, queryContext);
+            var url = new XElement(_namespace + "url");
 
-            foreach (var sciemp in _sitemapContentItemExtendedMetadataProviders)
+            if (await BuildUrlsetMetadataAsync(source, context, queryContext, contentItem, url))
             {
-                context.Response.ResponseElement.Add(sciemp.GetExtendedAttribute);
-            }
-
-            foreach (var contentItem in queryContext.ContentItems)
-            {
-                var url = new XElement(_namespace + "url");
-
-                if (await BuildUrlsetMetadataAsync(source, context, queryContext, contentItem, url))
-                {
-                    context.Response.ResponseElement.Add(url);
-                }
+                context.Response.ResponseElement.Add(url);
             }
         }
+    }
 
-        private async Task<bool> BuildUrlsetMetadataAsync(ContentTypesSitemapSource source, SitemapBuilderContext context, ContentItemsQueryContext queryContext, ContentItem contentItem, XElement url)
+    private async Task<bool> BuildUrlsetMetadataAsync(ContentTypesSitemapSource source, SitemapBuilderContext context, ContentItemsQueryContext queryContext, ContentItem contentItem, XElement url)
+    {
+        if (await BuildUrlAsync(context, contentItem, url))
         {
-            if (await BuildUrlAsync(context, contentItem, url))
+            if (await BuildExtendedMetadataAsync(context, queryContext, contentItem, url))
             {
-                if (await BuildExtendedMetadataAsync(context, queryContext, contentItem, url))
-                {
-                    PopulateLastMod(contentItem, url);
-                    await PopulateChangeFrequencyPriority(source, contentItem, url);
-                    return true;
-                }
-
-                return false;
-            };
+                PopulateLastMod(contentItem, url);
+                await PopulateChangeFrequencyPriority(source, contentItem, url);
+                return true;
+            }
 
             return false;
-        }
+        };
 
-        private async Task<bool> BuildExtendedMetadataAsync(SitemapBuilderContext context, ContentItemsQueryContext queryContext, ContentItem contentItem, XElement url)
+        return false;
+    }
+
+    private async Task<bool> BuildExtendedMetadataAsync(SitemapBuilderContext context, ContentItemsQueryContext queryContext, ContentItem contentItem, XElement url)
+    {
+        var succeeded = true;
+        foreach (var sc in _sitemapContentItemExtendedMetadataProviders)
         {
-            var succeeded = true;
-            foreach (var sc in _sitemapContentItemExtendedMetadataProviders)
+            if (!await sc.ApplyExtendedMetadataAsync(context, queryContext, contentItem, url))
             {
-                if (!await sc.ApplyExtendedMetadataAsync(context, queryContext, contentItem, url))
-                {
-                    succeeded = false;
-                }
+                succeeded = false;
             }
-            return succeeded;
         }
+        return succeeded;
+    }
+
+    private async Task<bool> BuildUrlAsync(SitemapBuilderContext context, ContentItem contentItem, XElement url)
+    {
+        var sitemapMetadataAspect = await _contentManager.PopulateAspectAsync<SitemapMetadataAspect>(contentItem);
+        if (sitemapMetadataAspect.Exclude)
+        {
+            return false;
+        }
+
+        var locValue = await _routeableContentTypeCoordinator.GetRouteAsync(context, contentItem);
+
+        var loc = new XElement(_namespace + "loc");
+        loc.Add(locValue);
+        url.Add(loc);
+        return true;
+    }
+
+    private async Task PopulateChangeFrequencyPriority(ContentTypesSitemapSource source, ContentItem contentItem, XElement url)
+    {
+        var sitemapMetadataAspect = await _contentManager.PopulateAspectAsync<SitemapMetadataAspect>(contentItem);
 
-        private async Task<bool> BuildUrlAsync(SitemapBuilderContext context, ContentItem contentItem, XElement url)
+        var changeFrequencyValue = sitemapMetadataAspect.ChangeFrequency;
+        if (string.IsNullOrEmpty(changeFrequencyValue))
         {
-            var sitemapMetadataAspect = await _contentManager.PopulateAspectAsync<SitemapMetadataAspect>(contentItem);
-            if (sitemapMetadataAspect.Exclude)
+            if (source.IndexAll)
             {
-                return false;
+                changeFrequencyValue = source.ChangeFrequency.ToString();
             }
+            else if (source.LimitItems)
+            {
+                changeFrequencyValue = source.LimitedContentType.ChangeFrequency.ToString();
+            }
+            else
+            {
+                var sitemapEntry = source.ContentTypes
+                    .FirstOrDefault(ct => string.Equals(ct.ContentTypeName, contentItem.ContentType, StringComparison.Ordinal));
 
-            var locValue = await _routeableContentTypeCoordinator.GetRouteAsync(context, contentItem);
-
-            var loc = new XElement(_namespace + "loc");
-            loc.Add(locValue);
-            url.Add(loc);
-            return true;
+                changeFrequencyValue = sitemapEntry.ChangeFrequency.ToString();
+            }
         }
 
-        private async Task PopulateChangeFrequencyPriority(ContentTypesSitemapSource source, ContentItem contentItem, XElement url)
+        var priorityIntValue = sitemapMetadataAspect.Priority;
+        if (!priorityIntValue.HasValue)
         {
-            var sitemapMetadataAspect = await _contentManager.PopulateAspectAsync<SitemapMetadataAspect>(contentItem);
-
-            var changeFrequencyValue = sitemapMetadataAspect.ChangeFrequency;
-            if (string.IsNullOrEmpty(changeFrequencyValue))
+            if (source.IndexAll)
             {
-                if (source.IndexAll)
-                {
-                    changeFrequencyValue = source.ChangeFrequency.ToString();
-                }
-                else if (source.LimitItems)
-                {
-                    changeFrequencyValue = source.LimitedContentType.ChangeFrequency.ToString();
-                }
-                else
-                {
-                    var sitemapEntry = source.ContentTypes
-                        .FirstOrDefault(ct => string.Equals(ct.ContentTypeName, contentItem.ContentType, StringComparison.Ordinal));
-
-                    changeFrequencyValue = sitemapEntry.ChangeFrequency.ToString();
-                }
+                priorityIntValue = source.Priority;
             }
-
-            var priorityIntValue = sitemapMetadataAspect.Priority;
-            if (!priorityIntValue.HasValue)
+            else if (source.LimitItems)
             {
-                if (source.IndexAll)
-                {
-                    priorityIntValue = source.Priority;
-                }
-                else if (source.LimitItems)
-                {
-                    priorityIntValue = source.LimitedContentType.Priority;
-                }
-                else
-                {
-                    var sitemapEntry = source.ContentTypes
-                        .FirstOrDefault(ct => string.Equals(ct.ContentTypeName, contentItem.ContentType, StringComparison.Ordinal));
-
-                    priorityIntValue = sitemapEntry.Priority;
-                }
+                priorityIntValue = source.LimitedContentType.Priority;
             }
+            else
+            {
+                var sitemapEntry = source.ContentTypes
+                    .FirstOrDefault(ct => string.Equals(ct.ContentTypeName, contentItem.ContentType, StringComparison.Ordinal));
 
-            var priorityValue = (priorityIntValue * 0.1f).Value.ToString(CultureInfo.InvariantCulture);
+                priorityIntValue = sitemapEntry.Priority;
+            }
+        }
 
-            var changeFreq = new XElement(_namespace + "changefreq");
-            changeFreq.Add(changeFrequencyValue.ToLower());
-            url.Add(changeFreq);
+        var priorityValue = (priorityIntValue * 0.1f).Value.ToString(CultureInfo.InvariantCulture);
 
-            var priority = new XElement(_namespace + "priority");
-            priority.Add(priorityValue);
-            url.Add(priority);
-        }
+        var changeFreq = new XElement(_namespace + "changefreq");
+        changeFreq.Add(changeFrequencyValue.ToLower());
+        url.Add(changeFreq);
 
-        private static void PopulateLastMod(ContentItem contentItem, XElement url)
+        var priority = new XElement(_namespace + "priority");
+        priority.Add(priorityValue);
+        url.Add(priority);
+    }
+
+    private static void PopulateLastMod(ContentItem contentItem, XElement url)
+    {
+        // Last modified is not required. Do not include if content item has no modified date.
+        if (contentItem.ModifiedUtc.HasValue)
         {
-            // Last modified is not required. Do not include if content item has no modified date.
-            if (contentItem.ModifiedUtc.HasValue)
-            {
-                var lastMod = new XElement(_namespace + "lastmod");
-                lastMod.Add(contentItem.ModifiedUtc.GetValueOrDefault().ToString("yyyy-MM-ddTHH:mm:sszzz", CultureInfo.InvariantCulture));
-                url.Add(lastMod);
-            }
+            var lastMod = new XElement(_namespace + "lastmod");
+            lastMod.Add(contentItem.ModifiedUtc.GetValueOrDefault().ToString("yyyy-MM-ddTHH:mm:sszzz", CultureInfo.InvariantCulture));
+            url.Add(lastMod);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceDriver.cs
index 291d9d3138d..118cc21f29d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceDriver.cs
@@ -6,119 +6,118 @@
 using OrchardCore.Sitemaps.Models;
 using OrchardCore.Sitemaps.Services;
 
-namespace OrchardCore.Contents.Sitemaps
-{
-    public sealed class ContentTypesSitemapSourceDriver : DisplayDriver<SitemapSource, ContentTypesSitemapSource>
-    {
-        private readonly IRouteableContentTypeCoordinator _routeableContentTypeCoordinator;
-
-        public ContentTypesSitemapSourceDriver(IRouteableContentTypeCoordinator routeableContentTypeCoordinator)
-        {
-            _routeableContentTypeCoordinator = routeableContentTypeCoordinator;
-        }
-
-        public override Task<IDisplayResult> DisplayAsync(ContentTypesSitemapSource sitemapSource, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                View("ContentTypesSitemapSource_SummaryAdmin", sitemapSource).Location("SummaryAdmin", "Content"),
-                View("ContentTypesSitemapSource_Thumbnail", sitemapSource).Location("Thumbnail", "Content")
-            );
-        }
+namespace OrchardCore.Contents.Sitemaps;
 
-        public override async Task<IDisplayResult> EditAsync(ContentTypesSitemapSource sitemapSource, BuildEditorContext context)
-        {
-            var contentTypeDefinitions = await _routeableContentTypeCoordinator.ListRoutableTypeDefinitionsAsync();
+public sealed class ContentTypesSitemapSourceDriver : DisplayDriver<SitemapSource, ContentTypesSitemapSource>
+{
+    private readonly IRouteableContentTypeCoordinator _routeableContentTypeCoordinator;
 
-            var entries = contentTypeDefinitions
-                .Select(ctd => new ContentTypeSitemapEntryViewModel
-                {
-                    ContentTypeName = ctd.Name,
-                    ContentTypeDisplayName = ctd.DisplayName,
-                    IsChecked = sitemapSource.ContentTypes.Any(s => string.Equals(s.ContentTypeName, ctd.Name, StringComparison.Ordinal)),
-                    ChangeFrequency = sitemapSource.ContentTypes.FirstOrDefault(s => string.Equals(s.ContentTypeName, ctd.Name, StringComparison.Ordinal))?.ChangeFrequency ?? ChangeFrequency.Daily,
-                    Priority = sitemapSource.ContentTypes.FirstOrDefault(s => string.Equals(s.ContentTypeName, ctd.Name, StringComparison.Ordinal))?.Priority ?? 5,
-                })
-                .OrderBy(ctd => ctd.ContentTypeDisplayName)
-                .ToArray();
+    public ContentTypesSitemapSourceDriver(IRouteableContentTypeCoordinator routeableContentTypeCoordinator)
+    {
+        _routeableContentTypeCoordinator = routeableContentTypeCoordinator;
+    }
 
-            var limitedEntries = contentTypeDefinitions
-                .Select(ctd => new ContentTypeLimitedSitemapEntryViewModel
-                {
-                    ContentTypeName = ctd.Name,
-                    ContentTypeDisplayName = ctd.DisplayName
-                })
-                .OrderBy(ctd => ctd.ContentTypeDisplayName)
-                .ToArray();
+    public override Task<IDisplayResult> DisplayAsync(ContentTypesSitemapSource sitemapSource, BuildDisplayContext context)
+    {
+        return CombineAsync(
+            View("ContentTypesSitemapSource_SummaryAdmin", sitemapSource).Location("SummaryAdmin", "Content"),
+            View("ContentTypesSitemapSource_Thumbnail", sitemapSource).Location("Thumbnail", "Content")
+        );
+    }
 
-            var limitedCtd = contentTypeDefinitions
-                .FirstOrDefault(ctd => string.Equals(sitemapSource.LimitedContentType.ContentTypeName, ctd.Name, StringComparison.Ordinal));
+    public override async Task<IDisplayResult> EditAsync(ContentTypesSitemapSource sitemapSource, BuildEditorContext context)
+    {
+        var contentTypeDefinitions = await _routeableContentTypeCoordinator.ListRoutableTypeDefinitionsAsync();
 
-            if (limitedCtd != null)
+        var entries = contentTypeDefinitions
+            .Select(ctd => new ContentTypeSitemapEntryViewModel
             {
-                var limitedEntry = limitedEntries.FirstOrDefault(le => string.Equals(le.ContentTypeName, limitedCtd.Name, StringComparison.Ordinal));
-                limitedEntry.Priority = sitemapSource.LimitedContentType.Priority;
-                limitedEntry.ChangeFrequency = sitemapSource.LimitedContentType.ChangeFrequency;
-                limitedEntry.Skip = sitemapSource.LimitedContentType.Skip;
-                limitedEntry.Take = sitemapSource.LimitedContentType.Take;
-            }
+                ContentTypeName = ctd.Name,
+                ContentTypeDisplayName = ctd.DisplayName,
+                IsChecked = sitemapSource.ContentTypes.Any(s => string.Equals(s.ContentTypeName, ctd.Name, StringComparison.Ordinal)),
+                ChangeFrequency = sitemapSource.ContentTypes.FirstOrDefault(s => string.Equals(s.ContentTypeName, ctd.Name, StringComparison.Ordinal))?.ChangeFrequency ?? ChangeFrequency.Daily,
+                Priority = sitemapSource.ContentTypes.FirstOrDefault(s => string.Equals(s.ContentTypeName, ctd.Name, StringComparison.Ordinal))?.Priority ?? 5,
+            })
+            .OrderBy(ctd => ctd.ContentTypeDisplayName)
+            .ToArray();
 
-            return Initialize<ContentTypesSitemapSourceViewModel>("ContentTypesSitemapSource_Edit", model =>
+        var limitedEntries = contentTypeDefinitions
+            .Select(ctd => new ContentTypeLimitedSitemapEntryViewModel
             {
-                model.IndexAll = sitemapSource.IndexAll;
-                model.LimitItems = sitemapSource.LimitItems;
-                model.Priority = sitemapSource.Priority;
-                model.ChangeFrequency = sitemapSource.ChangeFrequency;
-                model.ContentTypes = entries;
-                model.LimitedContentTypes = limitedEntries;
-                model.LimitedContentType = limitedCtd != null ? limitedCtd.Name : contentTypeDefinitions.FirstOrDefault().Name;
-                model.SitemapSource = sitemapSource;
-            }).Location("Content");
+                ContentTypeName = ctd.Name,
+                ContentTypeDisplayName = ctd.DisplayName
+            })
+            .OrderBy(ctd => ctd.ContentTypeDisplayName)
+            .ToArray();
+
+        var limitedCtd = contentTypeDefinitions
+            .FirstOrDefault(ctd => string.Equals(sitemapSource.LimitedContentType.ContentTypeName, ctd.Name, StringComparison.Ordinal));
+
+        if (limitedCtd != null)
+        {
+            var limitedEntry = limitedEntries.FirstOrDefault(le => string.Equals(le.ContentTypeName, limitedCtd.Name, StringComparison.Ordinal));
+            limitedEntry.Priority = sitemapSource.LimitedContentType.Priority;
+            limitedEntry.ChangeFrequency = sitemapSource.LimitedContentType.ChangeFrequency;
+            limitedEntry.Skip = sitemapSource.LimitedContentType.Skip;
+            limitedEntry.Take = sitemapSource.LimitedContentType.Take;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypesSitemapSource sitemap, UpdateEditorContext context)
+        return Initialize<ContentTypesSitemapSourceViewModel>("ContentTypesSitemapSource_Edit", model =>
         {
-            var model = new ContentTypesSitemapSourceViewModel();
+            model.IndexAll = sitemapSource.IndexAll;
+            model.LimitItems = sitemapSource.LimitItems;
+            model.Priority = sitemapSource.Priority;
+            model.ChangeFrequency = sitemapSource.ChangeFrequency;
+            model.ContentTypes = entries;
+            model.LimitedContentTypes = limitedEntries;
+            model.LimitedContentType = limitedCtd != null ? limitedCtd.Name : contentTypeDefinitions.FirstOrDefault().Name;
+            model.SitemapSource = sitemapSource;
+        }).Location("Content");
+    }
 
-            await context.Updater.TryUpdateModelAsync(model,
-                    Prefix,
-                    m => m.IndexAll,
-                    m => m.LimitItems,
-                    m => m.Priority,
-                    m => m.ChangeFrequency,
-                    m => m.ContentTypes,
-                    m => m.LimitedContentTypes,
-                    m => m.LimitedContentType
-                );
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypesSitemapSource sitemap, UpdateEditorContext context)
+    {
+        var model = new ContentTypesSitemapSourceViewModel();
 
-            sitemap.IndexAll = model.IndexAll;
-            sitemap.LimitItems = model.LimitItems;
-            sitemap.Priority = model.Priority;
-            sitemap.ChangeFrequency = model.ChangeFrequency;
-            sitemap.ContentTypes = model.ContentTypes
-                .Where(x => x.IsChecked == true)
-                .Select(x => new ContentTypeSitemapEntry
-                {
-                    ContentTypeName = x.ContentTypeName,
-                    ChangeFrequency = x.ChangeFrequency,
-                    Priority = x.Priority,
-                })
-                .ToArray();
+        await context.Updater.TryUpdateModelAsync(model,
+                Prefix,
+                m => m.IndexAll,
+                m => m.LimitItems,
+                m => m.Priority,
+                m => m.ChangeFrequency,
+                m => m.ContentTypes,
+                m => m.LimitedContentTypes,
+                m => m.LimitedContentType
+            );
 
-            var limitedEntry = model.LimitedContentTypes.FirstOrDefault(lct => string.Equals(lct.ContentTypeName, model.LimitedContentType, StringComparison.Ordinal));
-            if (limitedEntry != null)
-            {
-                sitemap.LimitedContentType.ContentTypeName = limitedEntry.ContentTypeName;
-                sitemap.LimitedContentType.ChangeFrequency = limitedEntry.ChangeFrequency;
-                sitemap.LimitedContentType.Priority = limitedEntry.Priority;
-                sitemap.LimitedContentType.Skip = limitedEntry.Skip;
-                sitemap.LimitedContentType.Take = limitedEntry.Take;
-            }
-            else
+        sitemap.IndexAll = model.IndexAll;
+        sitemap.LimitItems = model.LimitItems;
+        sitemap.Priority = model.Priority;
+        sitemap.ChangeFrequency = model.ChangeFrequency;
+        sitemap.ContentTypes = model.ContentTypes
+            .Where(x => x.IsChecked == true)
+            .Select(x => new ContentTypeSitemapEntry
             {
-                sitemap.LimitedContentType = new LimitedContentTypeSitemapEntry();
-            }
+                ContentTypeName = x.ContentTypeName,
+                ChangeFrequency = x.ChangeFrequency,
+                Priority = x.Priority,
+            })
+            .ToArray();
 
-            return await EditAsync(sitemap, context);
+        var limitedEntry = model.LimitedContentTypes.FirstOrDefault(lct => string.Equals(lct.ContentTypeName, model.LimitedContentType, StringComparison.Ordinal));
+        if (limitedEntry != null)
+        {
+            sitemap.LimitedContentType.ContentTypeName = limitedEntry.ContentTypeName;
+            sitemap.LimitedContentType.ChangeFrequency = limitedEntry.ChangeFrequency;
+            sitemap.LimitedContentType.Priority = limitedEntry.Priority;
+            sitemap.LimitedContentType.Skip = limitedEntry.Skip;
+            sitemap.LimitedContentType.Take = limitedEntry.Take;
         }
+        else
+        {
+            sitemap.LimitedContentType = new LimitedContentTypeSitemapEntry();
+        }
+
+        return await EditAsync(sitemap, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceModifiedDateProvider.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceModifiedDateProvider.cs
index 3e174d4689e..386a43b2283 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceModifiedDateProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceModifiedDateProvider.cs
@@ -9,60 +9,59 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.Contents.Sitemaps
+namespace OrchardCore.Contents.Sitemaps;
+
+public class ContentTypesSitemapSourceModifiedDateProvider : SitemapSourceModifiedDateProviderBase<ContentTypesSitemapSource>
 {
-    public class ContentTypesSitemapSourceModifiedDateProvider : SitemapSourceModifiedDateProviderBase<ContentTypesSitemapSource>
+    private readonly IRouteableContentTypeCoordinator _routeableContentTypeCoordinator;
+    private readonly ISession _session;
+
+    public ContentTypesSitemapSourceModifiedDateProvider(
+        IRouteableContentTypeCoordinator routeableContentTypeCoordinator,
+        ISession session
+        )
     {
-        private readonly IRouteableContentTypeCoordinator _routeableContentTypeCoordinator;
-        private readonly ISession _session;
+        _routeableContentTypeCoordinator = routeableContentTypeCoordinator;
+        _session = session;
+    }
 
-        public ContentTypesSitemapSourceModifiedDateProvider(
-            IRouteableContentTypeCoordinator routeableContentTypeCoordinator,
-            ISession session
-            )
-        {
-            _routeableContentTypeCoordinator = routeableContentTypeCoordinator;
-            _session = session;
-        }
+    public override async Task<DateTime?> GetLastModifiedDateAsync(ContentTypesSitemapSource source)
+    {
+        ContentItem lastModifiedContentItem;
 
-        public override async Task<DateTime?> GetLastModifiedDateAsync(ContentTypesSitemapSource source)
+        if (source.IndexAll)
         {
-            ContentItem lastModifiedContentItem;
-
-            if (source.IndexAll)
-            {
-                var typesToIndex = (await _routeableContentTypeCoordinator.ListRoutableTypeDefinitionsAsync())
-                    .Select(ctd => ctd.Name);
+            var typesToIndex = (await _routeableContentTypeCoordinator.ListRoutableTypeDefinitionsAsync())
+                .Select(ctd => ctd.Name);
 
-                var query = _session.Query<ContentItem>()
-                    .With<ContentItemIndex>(x => x.Published && x.ContentType.IsIn(typesToIndex))
-                    .OrderByDescending(x => x.ModifiedUtc);
+            var query = _session.Query<ContentItem>()
+                .With<ContentItemIndex>(x => x.Published && x.ContentType.IsIn(typesToIndex))
+                .OrderByDescending(x => x.ModifiedUtc);
 
-                lastModifiedContentItem = await query.FirstOrDefaultAsync();
-            }
-            else if (source.LimitItems)
-            {
-                var query = _session.Query<ContentItem>()
-                    .With<ContentItemIndex>(x => x.Published && x.ContentType == source.LimitedContentType.ContentTypeName)
-                    .OrderByDescending(x => x.ModifiedUtc);
-
-                lastModifiedContentItem = await query.FirstOrDefaultAsync();
-            }
-            else
-            {
-                var typesToIndex = (await _routeableContentTypeCoordinator.ListRoutableTypeDefinitionsAsync())
-                    .Where(ctd => source.ContentTypes.Any(s => string.Equals(ctd.Name, s.ContentTypeName, StringComparison.Ordinal)))
-                    .Select(ctd => ctd.Name);
+            lastModifiedContentItem = await query.FirstOrDefaultAsync();
+        }
+        else if (source.LimitItems)
+        {
+            var query = _session.Query<ContentItem>()
+                .With<ContentItemIndex>(x => x.Published && x.ContentType == source.LimitedContentType.ContentTypeName)
+                .OrderByDescending(x => x.ModifiedUtc);
 
-                // This is an estimate, so doesn't take into account Take/Skip values.
-                var query = _session.Query<ContentItem>()
-                    .With<ContentItemIndex>(x => x.Published && x.ContentType.IsIn(typesToIndex))
-                    .OrderByDescending(x => x.ModifiedUtc);
+            lastModifiedContentItem = await query.FirstOrDefaultAsync();
+        }
+        else
+        {
+            var typesToIndex = (await _routeableContentTypeCoordinator.ListRoutableTypeDefinitionsAsync())
+                .Where(ctd => source.ContentTypes.Any(s => string.Equals(ctd.Name, s.ContentTypeName, StringComparison.Ordinal)))
+                .Select(ctd => ctd.Name);
 
-                lastModifiedContentItem = await query.FirstOrDefaultAsync();
-            }
+            // This is an estimate, so doesn't take into account Take/Skip values.
+            var query = _session.Query<ContentItem>()
+                .With<ContentItemIndex>(x => x.Published && x.ContentType.IsIn(typesToIndex))
+                .OrderByDescending(x => x.ModifiedUtc);
 
-            return lastModifiedContentItem.ModifiedUtc;
+            lastModifiedContentItem = await query.FirstOrDefaultAsync();
         }
+
+        return lastModifiedContentItem.ModifiedUtc;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceUpdateHandler.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceUpdateHandler.cs
index 488f2399df4..a7ce02c0912 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceUpdateHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceUpdateHandler.cs
@@ -6,66 +6,65 @@
 using OrchardCore.Sitemaps.Models;
 using OrchardCore.Sitemaps.Services;
 
-namespace OrchardCore.Contents.Sitemaps
+namespace OrchardCore.Contents.Sitemaps;
+
+public class ContentTypesSitemapSourceUpdateHandler : ISitemapSourceUpdateHandler
 {
-    public class ContentTypesSitemapSourceUpdateHandler : ISitemapSourceUpdateHandler
+    private readonly ISitemapManager _sitemapManager;
+
+    public ContentTypesSitemapSourceUpdateHandler(ISitemapManager sitemapManager)
     {
-        private readonly ISitemapManager _sitemapManager;
+        _sitemapManager = sitemapManager;
+    }
 
-        public ContentTypesSitemapSourceUpdateHandler(ISitemapManager sitemapManager)
-        {
-            _sitemapManager = sitemapManager;
-        }
+    public async Task UpdateSitemapAsync(SitemapUpdateContext context)
+    {
+        var contentItem = context.UpdateObject as ContentItem;
 
-        public async Task UpdateSitemapAsync(SitemapUpdateContext context)
+        if (contentItem == null)
         {
-            var contentItem = context.UpdateObject as ContentItem;
-
-            if (contentItem == null)
-            {
-                return;
-            }
+            return;
+        }
 
-            var sitemaps = (await _sitemapManager.LoadSitemapsAsync())
-                .Where(s => s.GetType() == typeof(Sitemap));
+        var sitemaps = (await _sitemapManager.LoadSitemapsAsync())
+            .Where(s => s.GetType() == typeof(Sitemap));
 
-            if (!sitemaps.Any())
-            {
-                return;
-            }
+        if (!sitemaps.Any())
+        {
+            return;
+        }
 
-            var contentTypeName = contentItem.ContentType;
+        var contentTypeName = contentItem.ContentType;
 
-            foreach (var sitemap in sitemaps)
+        foreach (var sitemap in sitemaps)
+        {
+            // Do not break out of this loop, as it must check each sitemap.
+            foreach (var source in sitemap.SitemapSources
+                .Select(s => s as ContentTypesSitemapSource))
             {
-                // Do not break out of this loop, as it must check each sitemap.
-                foreach (var source in sitemap.SitemapSources
-                    .Select(s => s as ContentTypesSitemapSource))
+                if (source == null)
                 {
-                    if (source == null)
-                    {
-                        continue;
-                    }
+                    continue;
+                }
 
-                    if (source.IndexAll)
-                    {
-                        sitemap.Identifier = IdGenerator.GenerateId();
-                        break;
-                    }
-                    else if (source.LimitItems && string.Equals(source.LimitedContentType.ContentTypeName, contentTypeName, StringComparison.Ordinal))
-                    {
-                        sitemap.Identifier = IdGenerator.GenerateId();
-                        break;
-                    }
-                    else if (source.ContentTypes.Any(ct => string.Equals(ct.ContentTypeName, contentTypeName, StringComparison.Ordinal)))
-                    {
-                        sitemap.Identifier = IdGenerator.GenerateId();
-                        break;
-                    }
+                if (source.IndexAll)
+                {
+                    sitemap.Identifier = IdGenerator.GenerateId();
+                    break;
+                }
+                else if (source.LimitItems && string.Equals(source.LimitedContentType.ContentTypeName, contentTypeName, StringComparison.Ordinal))
+                {
+                    sitemap.Identifier = IdGenerator.GenerateId();
+                    break;
+                }
+                else if (source.ContentTypes.Any(ct => string.Equals(ct.ContentTypeName, contentTypeName, StringComparison.Ordinal)))
+                {
+                    sitemap.Identifier = IdGenerator.GenerateId();
+                    break;
                 }
             }
-
-            await _sitemapManager.UpdateSitemapAsync();
         }
+
+        await _sitemapManager.UpdateSitemapAsync();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceViewModel.cs
index 395ebbff736..abda8c6327c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapSourceViewModel.cs
@@ -1,44 +1,43 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Contents.Sitemaps
+namespace OrchardCore.Contents.Sitemaps;
+
+public class ContentTypesSitemapSourceViewModel
 {
-    public class ContentTypesSitemapSourceViewModel
-    {
-        public bool IndexAll { get; set; }
+    public bool IndexAll { get; set; }
 
-        public bool LimitItems { get; set; }
+    public bool LimitItems { get; set; }
 
-        public ChangeFrequency ChangeFrequency { get; set; }
+    public ChangeFrequency ChangeFrequency { get; set; }
 
-        public int Priority { get; set; } = 5;
+    public int Priority { get; set; } = 5;
 
-        public ContentTypeSitemapEntryViewModel[] ContentTypes { get; set; } = [];
+    public ContentTypeSitemapEntryViewModel[] ContentTypes { get; set; } = [];
 
-        public ContentTypeLimitedSitemapEntryViewModel[] LimitedContentTypes { get; set; } = [];
+    public ContentTypeLimitedSitemapEntryViewModel[] LimitedContentTypes { get; set; } = [];
 
-        public string LimitedContentType { get; set; }
+    public string LimitedContentType { get; set; }
 
-        [BindNever]
-        public SitemapSource SitemapSource { get; set; }
-    }
+    [BindNever]
+    public SitemapSource SitemapSource { get; set; }
+}
 
-    public class ContentTypeSitemapEntryViewModel
-    {
-        public bool IsChecked { get; set; }
-        public string ContentTypeDisplayName { get; set; }
-        public string ContentTypeName { get; set; }
-        public ChangeFrequency ChangeFrequency { get; set; }
-        public int Priority { get; set; }
-    }
+public class ContentTypeSitemapEntryViewModel
+{
+    public bool IsChecked { get; set; }
+    public string ContentTypeDisplayName { get; set; }
+    public string ContentTypeName { get; set; }
+    public ChangeFrequency ChangeFrequency { get; set; }
+    public int Priority { get; set; }
+}
 
-    public class ContentTypeLimitedSitemapEntryViewModel
-    {
-        public string ContentTypeDisplayName { get; set; }
-        public string ContentTypeName { get; set; }
-        public ChangeFrequency ChangeFrequency { get; set; } = ChangeFrequency.Daily;
-        public int Priority { get; set; } = 5;
-        public int Skip { get; set; }
-        public int Take { get; set; } = 50_000;
-    }
+public class ContentTypeLimitedSitemapEntryViewModel
+{
+    public string ContentTypeDisplayName { get; set; }
+    public string ContentTypeName { get; set; }
+    public ChangeFrequency ChangeFrequency { get; set; } = ChangeFrequency.Daily;
+    public int Priority { get; set; } = 5;
+    public int Skip { get; set; }
+    public int Take { get; set; } = 50_000;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapUpdateHandler.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapUpdateHandler.cs
index 5c6a4b20118..a864cc2aef7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapUpdateHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/ContentTypesSitemapUpdateHandler.cs
@@ -2,29 +2,28 @@
 using OrchardCore.ContentManagement.Handlers;
 using OrchardCore.Sitemaps.Handlers;
 
-namespace OrchardCore.Contents.Sitemaps
+namespace OrchardCore.Contents.Sitemaps;
+
+public class ContentTypesSitemapUpdateHandler : ContentHandlerBase
 {
-    public class ContentTypesSitemapUpdateHandler : ContentHandlerBase
-    {
-        private readonly ISitemapUpdateHandler _sitemapUpdateHandler;
+    private readonly ISitemapUpdateHandler _sitemapUpdateHandler;
 
-        public ContentTypesSitemapUpdateHandler(ISitemapUpdateHandler sitemapUpdateHandler)
-        {
-            _sitemapUpdateHandler = sitemapUpdateHandler;
-        }
+    public ContentTypesSitemapUpdateHandler(ISitemapUpdateHandler sitemapUpdateHandler)
+    {
+        _sitemapUpdateHandler = sitemapUpdateHandler;
+    }
 
-        public override Task PublishedAsync(PublishContentContext context) => UpdateSitemapAsync(context);
+    public override Task PublishedAsync(PublishContentContext context) => UpdateSitemapAsync(context);
 
-        public override Task UnpublishedAsync(PublishContentContext context) => UpdateSitemapAsync(context);
+    public override Task UnpublishedAsync(PublishContentContext context) => UpdateSitemapAsync(context);
 
-        private Task UpdateSitemapAsync(ContentContextBase context)
+    private Task UpdateSitemapAsync(ContentContextBase context)
+    {
+        var updateContext = new SitemapUpdateContext
         {
-            var updateContext = new SitemapUpdateContext
-            {
-                UpdateObject = context.ContentItem,
-            };
+            UpdateObject = context.ContentItem,
+        };
 
-            return _sitemapUpdateHandler.UpdateSitemapAsync(updateContext);
-        }
+        return _sitemapUpdateHandler.UpdateSitemapAsync(updateContext);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/DefaultContentItemsQueryProvider.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/DefaultContentItemsQueryProvider.cs
index 26b2d7ce850..799318d487e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/DefaultContentItemsQueryProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Sitemaps/DefaultContentItemsQueryProvider.cs
@@ -9,69 +9,68 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.Contents.Sitemaps
+namespace OrchardCore.Contents.Sitemaps;
+
+public class DefaultContentItemsQueryProvider : IContentItemsQueryProvider
 {
-    public class DefaultContentItemsQueryProvider : IContentItemsQueryProvider
+    private readonly ISession _session;
+    private readonly IRouteableContentTypeCoordinator _routeableContentTypeCoordinator;
+
+    public DefaultContentItemsQueryProvider(
+        ISession session,
+        IRouteableContentTypeCoordinator routeableContentTypeCoordinator
+        )
+    {
+        _session = session;
+        _routeableContentTypeCoordinator = routeableContentTypeCoordinator;
+    }
+
+    public async Task GetContentItemsAsync(ContentTypesSitemapSource source, ContentItemsQueryContext context)
     {
-        private readonly ISession _session;
-        private readonly IRouteableContentTypeCoordinator _routeableContentTypeCoordinator;
+        var routeableContentTypeDefinitions = await _routeableContentTypeCoordinator.ListRoutableTypeDefinitionsAsync();
 
-        public DefaultContentItemsQueryProvider(
-            ISession session,
-            IRouteableContentTypeCoordinator routeableContentTypeCoordinator
-            )
+        if (source.IndexAll)
         {
-            _session = session;
-            _routeableContentTypeCoordinator = routeableContentTypeCoordinator;
-        }
+            var rctdNames = routeableContentTypeDefinitions.Select(rctd => rctd.Name);
 
-        public async Task GetContentItemsAsync(ContentTypesSitemapSource source, ContentItemsQueryContext context)
+            var queryResults = await _session.Query<ContentItem>()
+                .With<ContentItemIndex>(x => x.Published && x.ContentType.IsIn(rctdNames))
+                .OrderBy(x => x.CreatedUtc)
+                .ListAsync();
+
+            context.ContentItems = queryResults;
+        }
+        else if (source.LimitItems)
         {
-            var routeableContentTypeDefinitions = await _routeableContentTypeCoordinator.ListRoutableTypeDefinitionsAsync();
+            // Test that content type is still valid to include in sitemap.
+            var typeIsValid = routeableContentTypeDefinitions
+                .Any(ctd => string.Equals(source.LimitedContentType.ContentTypeName, ctd.Name, StringComparison.Ordinal));
 
-            if (source.IndexAll)
+            if (typeIsValid)
             {
-                var rctdNames = routeableContentTypeDefinitions.Select(rctd => rctd.Name);
-
                 var queryResults = await _session.Query<ContentItem>()
-                    .With<ContentItemIndex>(x => x.Published && x.ContentType.IsIn(rctdNames))
+                    .With<ContentItemIndex>(x => x.ContentType == source.LimitedContentType.ContentTypeName && x.Published)
                     .OrderBy(x => x.CreatedUtc)
+                    .Skip(source.LimitedContentType.Skip)
+                    .Take(source.LimitedContentType.Take)
                     .ListAsync();
 
                 context.ContentItems = queryResults;
             }
-            else if (source.LimitItems)
-            {
-                // Test that content type is still valid to include in sitemap.
-                var typeIsValid = routeableContentTypeDefinitions
-                    .Any(ctd => string.Equals(source.LimitedContentType.ContentTypeName, ctd.Name, StringComparison.Ordinal));
-
-                if (typeIsValid)
-                {
-                    var queryResults = await _session.Query<ContentItem>()
-                        .With<ContentItemIndex>(x => x.ContentType == source.LimitedContentType.ContentTypeName && x.Published)
-                        .OrderBy(x => x.CreatedUtc)
-                        .Skip(source.LimitedContentType.Skip)
-                        .Take(source.LimitedContentType.Take)
-                        .ListAsync();
-
-                    context.ContentItems = queryResults;
-                }
-            }
-            else
-            {
-                // Test that content types are still valid to include in sitemap.
-                var typesToIndex = routeableContentTypeDefinitions
-                    .Where(ctd => source.ContentTypes.Any(s => string.Equals(ctd.Name, s.ContentTypeName, StringComparison.Ordinal)))
-                    .Select(x => x.Name);
+        }
+        else
+        {
+            // Test that content types are still valid to include in sitemap.
+            var typesToIndex = routeableContentTypeDefinitions
+                .Where(ctd => source.ContentTypes.Any(s => string.Equals(ctd.Name, s.ContentTypeName, StringComparison.Ordinal)))
+                .Select(x => x.Name);
 
-                var queryResults = await _session.Query<ContentItem>()
-                    .With<ContentItemIndex>(x => x.ContentType.IsIn(typesToIndex) && x.Published)
-                    .OrderBy(x => x.CreatedUtc)
-                    .ListAsync();
+            var queryResults = await _session.Query<ContentItem>()
+                .With<ContentItemIndex>(x => x.ContentType.IsIn(typesToIndex) && x.Published)
+                .OrderBy(x => x.CreatedUtc)
+                .ListAsync();
 
-                context.ContentItems = queryResults;
-            }
+            context.ContentItems = queryResults;
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs
index 2870c72a596..10b95d342e3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs
@@ -55,244 +55,243 @@
 using OrchardCore.Sitemaps.Services;
 using YesSql.Filters.Query;
 
-namespace OrchardCore.Contents
+namespace OrchardCore.Contents;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.AddSingleton<IAnchorTag, ContentAnchorTag>();
+
+        services.Configure<LiquidViewOptions>(o =>
         {
-            services.AddSingleton<IAnchorTag, ContentAnchorTag>();
+            o.LiquidViewParserConfiguration.Add(parser => parser.RegisterParserTag("contentitem", parser.ArgumentsListParser, ContentItemTag.WriteToAsync));
+        });
 
-            services.Configure<LiquidViewOptions>(o =>
+        services.Configure<TemplateOptions>(o =>
+        {
+            o.MemberAccessStrategy.Register<ContentItem>();
+            o.MemberAccessStrategy.Register<ContentElement>();
+            o.MemberAccessStrategy.Register<ShapeViewModel<ContentItem>>();
+            o.MemberAccessStrategy.Register<ContentTypePartDefinition>();
+            o.MemberAccessStrategy.Register<ContentPartFieldDefinition>();
+            o.MemberAccessStrategy.Register<ContentFieldDefinition>();
+            o.MemberAccessStrategy.Register<ContentPartDefinition>();
+
+            o.Filters.AddFilter("display_text", DisplayTextFilter.DisplayText);
+
+            o.Scope.SetValue("Content", new ObjectValue(new LiquidContentAccessor()));
+            o.MemberAccessStrategy.Register<LiquidContentAccessor, LiquidPropertyAccessor>("ContentItemId", (obj, context) =>
             {
-                o.LiquidViewParserConfiguration.Add(parser => parser.RegisterParserTag("contentitem", parser.ArgumentsListParser, ContentItemTag.WriteToAsync));
-            });
+                var liquidTemplateContext = (LiquidTemplateContext)context;
 
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<ContentItem>();
-                o.MemberAccessStrategy.Register<ContentElement>();
-                o.MemberAccessStrategy.Register<ShapeViewModel<ContentItem>>();
-                o.MemberAccessStrategy.Register<ContentTypePartDefinition>();
-                o.MemberAccessStrategy.Register<ContentPartFieldDefinition>();
-                o.MemberAccessStrategy.Register<ContentFieldDefinition>();
-                o.MemberAccessStrategy.Register<ContentPartDefinition>();
-
-                o.Filters.AddFilter("display_text", DisplayTextFilter.DisplayText);
-
-                o.Scope.SetValue("Content", new ObjectValue(new LiquidContentAccessor()));
-                o.MemberAccessStrategy.Register<LiquidContentAccessor, LiquidPropertyAccessor>("ContentItemId", (obj, context) =>
+                return new LiquidPropertyAccessor(liquidTemplateContext, async (contentItemId, context) =>
                 {
-                    var liquidTemplateContext = (LiquidTemplateContext)context;
-
-                    return new LiquidPropertyAccessor(liquidTemplateContext, async (contentItemId, context) =>
-                    {
-                        var contentManager = context.Services.GetRequiredService<IContentManager>();
+                    var contentManager = context.Services.GetRequiredService<IContentManager>();
 
-                        return FluidValue.Create(await contentManager.GetAsync(contentItemId), context.Options);
-                    });
+                    return FluidValue.Create(await contentManager.GetAsync(contentItemId), context.Options);
                 });
+            });
 
-                o.MemberAccessStrategy.Register<LiquidContentAccessor, LiquidPropertyAccessor>("ContentItemVersionId", (obj, context) =>
-                {
-                    var liquidTemplateContext = (LiquidTemplateContext)context;
-
-                    return new LiquidPropertyAccessor(liquidTemplateContext, async (contentItemVersionId, context) =>
-                    {
-                        var contentManager = context.Services.GetRequiredService<IContentManager>();
-
-                        return FluidValue.Create(await contentManager.GetVersionAsync(contentItemVersionId), context.Options);
-                    });
-                });
+            o.MemberAccessStrategy.Register<LiquidContentAccessor, LiquidPropertyAccessor>("ContentItemVersionId", (obj, context) =>
+            {
+                var liquidTemplateContext = (LiquidTemplateContext)context;
 
-                o.MemberAccessStrategy.Register<LiquidContentAccessor, LiquidPropertyAccessor>("Latest", (obj, context) =>
+                return new LiquidPropertyAccessor(liquidTemplateContext, async (contentItemVersionId, context) =>
                 {
-                    var liquidTemplateContext = (LiquidTemplateContext)context;
+                    var contentManager = context.Services.GetRequiredService<IContentManager>();
 
-                    return new LiquidPropertyAccessor(liquidTemplateContext, (name, context) =>
-                    {
-                        return GetContentByHandleAsync(context, name, true);
-                    });
+                    return FluidValue.Create(await contentManager.GetVersionAsync(contentItemVersionId), context.Options);
                 });
+            });
 
-                o.MemberAccessStrategy.Register<LiquidContentAccessor, FluidValue>((obj, name, context) => GetContentByHandleAsync((LiquidTemplateContext)context, name));
+            o.MemberAccessStrategy.Register<LiquidContentAccessor, LiquidPropertyAccessor>("Latest", (obj, context) =>
+            {
+                var liquidTemplateContext = (LiquidTemplateContext)context;
 
-                static async Task<FluidValue> GetContentByHandleAsync(LiquidTemplateContext context, string handle, bool latest = false)
+                return new LiquidPropertyAccessor(liquidTemplateContext, (name, context) =>
                 {
-                    var contentHandleManager = context.Services.GetRequiredService<IContentHandleManager>();
+                    return GetContentByHandleAsync(context, name, true);
+                });
+            });
 
-                    var contentItemId = await contentHandleManager.GetContentItemIdAsync(handle);
+            o.MemberAccessStrategy.Register<LiquidContentAccessor, FluidValue>((obj, name, context) => GetContentByHandleAsync((LiquidTemplateContext)context, name));
 
-                    if (contentItemId == null)
-                    {
-                        return NilValue.Instance;
-                    }
+            static async Task<FluidValue> GetContentByHandleAsync(LiquidTemplateContext context, string handle, bool latest = false)
+            {
+                var contentHandleManager = context.Services.GetRequiredService<IContentHandleManager>();
 
-                    var contentManager = context.Services.GetRequiredService<IContentManager>();
+                var contentItemId = await contentHandleManager.GetContentItemIdAsync(handle);
 
-                    var contentItem = await contentManager.GetAsync(contentItemId, latest ? VersionOptions.Latest : VersionOptions.Published);
-                    return FluidValue.Create(contentItem, context.Options);
+                if (contentItemId == null)
+                {
+                    return NilValue.Instance;
                 }
-            })
-            .AddLiquidFilter<DisplayUrlFilter>("display_url")
-            .AddLiquidFilter<BuildDisplayFilter>("shape_build_display")
-            .AddLiquidFilter<ContentItemFilter>("content_item_id")
-            .AddLiquidFilter<FullTextFilter>("full_text");
-
-            services.AddContentManagement();
-            services.AddContentManagementDisplay();
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<IPermissionProvider, ContentTypePermissions>();
-            services.AddScoped<IAuthorizationHandler, ContentTypeAuthorizationHandler>();
-            services.AddScoped<IShapeTableProvider, Shapes>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IContentDisplayDriver, ContentsDriver>();
-            services.AddScoped<IContentHandler, ContentsHandler>();
-            services.AddRecipeExecutionStep<ContentStep>();
-
-            services.AddScoped<IContentItemIndexHandler, FullTextContentIndexHandler>();
-            services.AddScoped<IContentItemIndexHandler, AspectsContentIndexHandler>();
-            services.AddScoped<IContentItemIndexHandler, DefaultContentIndexHandler>();
-            services.AddScoped<IContentHandleProvider, ContentItemIdHandleProvider>();
-            services.AddScoped<IContentItemIndexHandler, ContentItemIndexCoordinator>();
-
-            services.AddDataMigration<Migrations>();
-
-            // Common Part
-            services.AddContentPart<CommonPart>()
-                .UseDisplayDriver<DateEditorDriver>()
-                .UseDisplayDriver<OwnerEditorDriver>();
-
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, CommonPartSettingsDisplayDriver>();
-
-            // FullTextAspect
-            services.AddScoped<IContentTypeDefinitionDisplayDriver, FullTextAspectSettingsDisplayDriver>();
-            services.AddScoped<IContentHandler, FullTextAspectContentHandler>();
-
-            services.AddTagHelpers<ContentLinkTagHelper>();
-            services.AddTagHelpers<ContentItemTagHelper>();
-            services.Configure<AutorouteOptions>(options =>
+
+                var contentManager = context.Services.GetRequiredService<IContentManager>();
+
+                var contentItem = await contentManager.GetAsync(contentItemId, latest ? VersionOptions.Latest : VersionOptions.Published);
+                return FluidValue.Create(contentItem, context.Options);
+            }
+        })
+        .AddLiquidFilter<DisplayUrlFilter>("display_url")
+        .AddLiquidFilter<BuildDisplayFilter>("shape_build_display")
+        .AddLiquidFilter<ContentItemFilter>("content_item_id")
+        .AddLiquidFilter<FullTextFilter>("full_text");
+
+        services.AddContentManagement();
+        services.AddContentManagementDisplay();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<IPermissionProvider, ContentTypePermissions>();
+        services.AddScoped<IAuthorizationHandler, ContentTypeAuthorizationHandler>();
+        services.AddScoped<IShapeTableProvider, Shapes>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IContentDisplayDriver, ContentsDriver>();
+        services.AddScoped<IContentHandler, ContentsHandler>();
+        services.AddRecipeExecutionStep<ContentStep>();
+
+        services.AddScoped<IContentItemIndexHandler, FullTextContentIndexHandler>();
+        services.AddScoped<IContentItemIndexHandler, AspectsContentIndexHandler>();
+        services.AddScoped<IContentItemIndexHandler, DefaultContentIndexHandler>();
+        services.AddScoped<IContentHandleProvider, ContentItemIdHandleProvider>();
+        services.AddScoped<IContentItemIndexHandler, ContentItemIndexCoordinator>();
+
+        services.AddDataMigration<Migrations>();
+
+        // Common Part
+        services.AddContentPart<CommonPart>()
+            .UseDisplayDriver<DateEditorDriver>()
+            .UseDisplayDriver<OwnerEditorDriver>();
+
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, CommonPartSettingsDisplayDriver>();
+
+        // FullTextAspect
+        services.AddScoped<IContentTypeDefinitionDisplayDriver, FullTextAspectSettingsDisplayDriver>();
+        services.AddScoped<IContentHandler, FullTextAspectContentHandler>();
+
+        services.AddTagHelpers<ContentLinkTagHelper>();
+        services.AddTagHelpers<ContentItemTagHelper>();
+        services.Configure<AutorouteOptions>(options =>
+        {
+            if (options.GlobalRouteValues.Count == 0)
             {
-                if (options.GlobalRouteValues.Count == 0)
+                options.GlobalRouteValues = new RouteValueDictionary
                 {
-                    options.GlobalRouteValues = new RouteValueDictionary
-                    {
-                        {"Area", "OrchardCore.Contents"},
-                        {"Controller", "Item"},
-                        {"Action", "Display"}
-                    };
-
-                    options.ContentItemIdKey = "contentItemId";
-                    options.ContainedContentItemIdKey = "containedContentItemId";
-                    options.JsonPathKey = "jsonPath";
-                }
-            });
+                    {"Area", "OrchardCore.Contents"},
+                    {"Controller", "Item"},
+                    {"Action", "Display"}
+                };
+
+                options.ContentItemIdKey = "contentItemId";
+                options.ContainedContentItemIdKey = "containedContentItemId";
+                options.JsonPathKey = "jsonPath";
+            }
+        });
 
-            services.AddScoped<IContentsAdminListQueryService, DefaultContentsAdminListQueryService>();
+        services.AddScoped<IContentsAdminListQueryService, DefaultContentsAdminListQueryService>();
 
-            services.AddScoped<IDisplayDriver<ContentOptionsViewModel>, ContentOptionsDisplayDriver>();
+        services.AddScoped<IDisplayDriver<ContentOptionsViewModel>, ContentOptionsDisplayDriver>();
 
-            services.AddScoped(typeof(IContentItemRecursionHelper<>), typeof(ContentItemRecursionHelper<>));
+        services.AddScoped(typeof(IContentItemRecursionHelper<>), typeof(ContentItemRecursionHelper<>));
 
-            services.AddSingleton<IContentsAdminListFilterParser>(sp =>
+        services.AddSingleton<IContentsAdminListFilterParser>(sp =>
+        {
+            var filterProviders = sp.GetServices<IContentsAdminListFilterProvider>();
+            var builder = new QueryEngineBuilder<ContentItem>();
+            foreach (var provider in filterProviders)
             {
-                var filterProviders = sp.GetServices<IContentsAdminListFilterProvider>();
-                var builder = new QueryEngineBuilder<ContentItem>();
-                foreach (var provider in filterProviders)
-                {
-                    provider.Build(builder);
-                }
+                provider.Build(builder);
+            }
 
-                var parser = builder.Build();
+            var parser = builder.Build();
 
-                return new DefaultContentsAdminListFilterParser(parser);
-            });
+            return new DefaultContentsAdminListFilterParser(parser);
+        });
 
-            services.AddTransient<IContentsAdminListFilterProvider, DefaultContentsAdminListFilterProvider>();
-        }
+        services.AddTransient<IContentsAdminListFilterProvider, DefaultContentsAdminListFilterProvider>();
+    }
 
-        public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            routes.AddGetContentEndpoint()
-                .AddCreateContentEndpoint()
-                .AddDeleteContentEndpoint();
-
-            var itemControllerName = typeof(ItemController).ControllerName();
-
-            routes.MapAreaControllerRoute(
-                name: "DisplayContentItem",
-                areaName: "OrchardCore.Contents",
-                pattern: "Contents/ContentItems/{contentItemId}",
-                defaults: new { controller = itemControllerName, action = nameof(ItemController.Display) }
-            );
-
-            routes.MapAreaControllerRoute(
-                name: "PreviewContentItem",
-                areaName: "OrchardCore.Contents",
-                pattern: "Contents/ContentItems/{contentItemId}/Preview",
-                defaults: new { controller = itemControllerName, action = nameof(ItemController.Preview) }
-            );
-
-            routes.MapAreaControllerRoute(
-                name: "PreviewContentItemVersion",
-                areaName: "OrchardCore.Contents",
-                pattern: "Contents/ContentItems/{contentItemId}/Version/{version}/Preview",
-                defaults: new { controller = itemControllerName, action = nameof(ItemController.Preview) }
-            );
-        }
+    public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        routes.AddGetContentEndpoint()
+            .AddCreateContentEndpoint()
+            .AddDeleteContentEndpoint();
+
+        var itemControllerName = typeof(ItemController).ControllerName();
+
+        routes.MapAreaControllerRoute(
+            name: "DisplayContentItem",
+            areaName: "OrchardCore.Contents",
+            pattern: "Contents/ContentItems/{contentItemId}",
+            defaults: new { controller = itemControllerName, action = nameof(ItemController.Display) }
+        );
+
+        routes.MapAreaControllerRoute(
+            name: "PreviewContentItem",
+            areaName: "OrchardCore.Contents",
+            pattern: "Contents/ContentItems/{contentItemId}/Preview",
+            defaults: new { controller = itemControllerName, action = nameof(ItemController.Preview) }
+        );
+
+        routes.MapAreaControllerRoute(
+            name: "PreviewContentItemVersion",
+            areaName: "OrchardCore.Contents",
+            pattern: "Contents/ContentItems/{contentItemId}/Version/{version}/Preview",
+            defaults: new { controller = itemControllerName, action = nameof(ItemController.Preview) }
+        );
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class DeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class DeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<AllContentDeploymentSource, AllContentDeploymentStep, AllContentDeploymentStepDriver>();
-            services.AddDeployment<ContentDeploymentSource, ContentDeploymentStep, ContentDeploymentStepDriver>();
-            services.AddSiteSettingsPropertyDeploymentStep<ContentAuditTrailSettings, DeploymentStartup>(S => S["Content Audit Trail settings"], S => S["Exports the content audit trail settings."]);
-        }
+        services.AddDeployment<AllContentDeploymentSource, AllContentDeploymentStep, AllContentDeploymentStepDriver>();
+        services.AddDeployment<ContentDeploymentSource, ContentDeploymentStep, ContentDeploymentStepDriver>();
+        services.AddSiteSettingsPropertyDeploymentStep<ContentAuditTrailSettings, DeploymentStartup>(S => S["Content Audit Trail settings"], S => S["Exports the content audit trail settings."]);
     }
+}
 
-    [RequireFeatures("OrchardCore.AdminMenu")]
-    public sealed class AdminMenuStartup : StartupBase
+[RequireFeatures("OrchardCore.AdminMenu")]
+public sealed class AdminMenuStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddAdminNode<ContentTypesAdminNode, ContentTypesAdminNodeNavigationBuilder, ContentTypesAdminNodeDriver>();
-        }
+        services.AddAdminNode<ContentTypesAdminNode, ContentTypesAdminNodeNavigationBuilder, ContentTypesAdminNodeDriver>();
     }
+}
 
-    [Feature("OrchardCore.Contents.FileContentDefinition")]
-    public sealed class FileContentDefinitionStartup : StartupBase
+[Feature("OrchardCore.Contents.FileContentDefinition")]
+public sealed class FileContentDefinitionStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddFileContentDefinitionStore();
-        }
+        services.AddFileContentDefinitionStore();
     }
+}
 
-    [RequireFeatures("OrchardCore.Sitemaps")]
-    public sealed class SitemapsStartup : StartupBase
+[RequireFeatures("OrchardCore.Sitemaps")]
+public sealed class SitemapsStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<ISitemapSourceBuilder, ContentTypesSitemapSourceBuilder>();
-            services.AddScoped<ISitemapSourceUpdateHandler, ContentTypesSitemapSourceUpdateHandler>();
-            services.AddScoped<ISitemapSourceModifiedDateProvider, ContentTypesSitemapSourceModifiedDateProvider>();
-            services.AddScoped<IDisplayDriver<SitemapSource>, ContentTypesSitemapSourceDriver>();
-            services.AddScoped<ISitemapSourceFactory, SitemapSourceFactory<ContentTypesSitemapSource>>();
-            services.AddScoped<IContentItemsQueryProvider, DefaultContentItemsQueryProvider>();
-            services.AddScoped<IContentHandler, ContentTypesSitemapUpdateHandler>();
-        }
+        services.AddScoped<ISitemapSourceBuilder, ContentTypesSitemapSourceBuilder>();
+        services.AddScoped<ISitemapSourceUpdateHandler, ContentTypesSitemapSourceUpdateHandler>();
+        services.AddScoped<ISitemapSourceModifiedDateProvider, ContentTypesSitemapSourceModifiedDateProvider>();
+        services.AddScoped<IDisplayDriver<SitemapSource>, ContentTypesSitemapSourceDriver>();
+        services.AddScoped<ISitemapSourceFactory, SitemapSourceFactory<ContentTypesSitemapSource>>();
+        services.AddScoped<IContentItemsQueryProvider, DefaultContentItemsQueryProvider>();
+        services.AddScoped<IContentHandler, ContentTypesSitemapUpdateHandler>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Feeds")]
-    public sealed class FeedsStartup : StartupBase
+[RequireFeatures("OrchardCore.Feeds")]
+public sealed class FeedsStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            // Feeds
-            services.AddScoped<IFeedItemBuilder, CommonFeedItemBuilder>();
-        }
+        // Feeds
+        services.AddScoped<IFeedItemBuilder, CommonFeedItemBuilder>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/ViewComponents/DisplayContentItemViewComponent.cs b/src/OrchardCore.Modules/OrchardCore.Contents/ViewComponents/DisplayContentItemViewComponent.cs
index d2559ecd39a..2e4c4a50a63 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/ViewComponents/DisplayContentItemViewComponent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/ViewComponents/DisplayContentItemViewComponent.cs
@@ -5,41 +5,40 @@
 using OrchardCore.ContentManagement.Display;
 using OrchardCore.DisplayManagement.ModelBinding;
 
-namespace OrchardCore.Contents.ViewComponents
+namespace OrchardCore.Contents.ViewComponents;
+
+public class DisplayContentItemViewComponent : ViewComponent
 {
-    public class DisplayContentItemViewComponent : ViewComponent
+    private readonly IContentManager _contentManager;
+    private readonly IContentItemDisplayManager _contentItemDisplayManager;
+    private readonly IUpdateModelAccessor _modelUpdaterAccessor;
+
+    public DisplayContentItemViewComponent(
+        IContentManager contentManager,
+        IContentItemDisplayManager contentItemDisplayManager,
+        IUpdateModelAccessor modelUpdaterAccessor)
+    {
+        _contentItemDisplayManager = contentItemDisplayManager;
+        _contentManager = contentManager;
+        _modelUpdaterAccessor = modelUpdaterAccessor;
+    }
+
+    public async Task<IViewComponentResult> InvokeAsync(string contentItemId = null, string displayType = null)
     {
-        private readonly IContentManager _contentManager;
-        private readonly IContentItemDisplayManager _contentItemDisplayManager;
-        private readonly IUpdateModelAccessor _modelUpdaterAccessor;
-
-        public DisplayContentItemViewComponent(
-            IContentManager contentManager,
-            IContentItemDisplayManager contentItemDisplayManager,
-            IUpdateModelAccessor modelUpdaterAccessor)
+        ContentItem contentItem = null;
+
+        if (contentItemId != null)
         {
-            _contentItemDisplayManager = contentItemDisplayManager;
-            _contentManager = contentManager;
-            _modelUpdaterAccessor = modelUpdaterAccessor;
+            contentItem = await _contentManager.GetAsync(contentItemId);
         }
 
-        public async Task<IViewComponentResult> InvokeAsync(string contentItemId = null, string displayType = null)
+        if (contentItem == null)
         {
-            ContentItem contentItem = null;
-
-            if (contentItemId != null)
-            {
-                contentItem = await _contentManager.GetAsync(contentItemId);
-            }
-
-            if (contentItem == null)
-            {
-                throw new ArgumentException("Content item not found");
-            }
+            throw new ArgumentException("Content item not found");
+        }
 
-            var model = await _contentItemDisplayManager.BuildDisplayAsync(contentItem, _modelUpdaterAccessor.ModelUpdater, displayType);
+        var model = await _contentItemDisplayManager.BuildDisplayAsync(contentItem, _modelUpdaterAccessor.ModelUpdater, displayType);
 
-            return View(model);
-        }
+        return View(model);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/ViewComponents/SelectContentTypesViewComponent.cs b/src/OrchardCore.Modules/OrchardCore.Contents/ViewComponents/SelectContentTypesViewComponent.cs
index 026715d0f4d..2235801bb29 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/ViewComponents/SelectContentTypesViewComponent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/ViewComponents/SelectContentTypesViewComponent.cs
@@ -7,37 +7,36 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Contents.ViewModels;
 
-namespace OrchardCore.Contents.ViewComponents
+namespace OrchardCore.Contents.ViewComponents;
+
+public class SelectContentTypesViewComponent : ViewComponent
 {
-    public class SelectContentTypesViewComponent : ViewComponent
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+
+    public SelectContentTypesViewComponent(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
+
+    public async Task<IViewComponentResult> InvokeAsync(IEnumerable<string> selectedContentTypes, string htmlName, string stereotype)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+        selectedContentTypes ??= Array.Empty<string>();
 
-        public SelectContentTypesViewComponent(IContentDefinitionManager contentDefinitionManager)
+        var contentTypes = await ContentTypeSelection.BuildAsync(_contentDefinitionManager, selectedContentTypes);
+
+        if (!string.IsNullOrEmpty(stereotype))
         {
-            _contentDefinitionManager = contentDefinitionManager;
+            contentTypes = contentTypes
+                .Where(x => x.ContentTypeDefinition.GetStereotype() == stereotype)
+                .ToArray();
         }
 
-        public async Task<IViewComponentResult> InvokeAsync(IEnumerable<string> selectedContentTypes, string htmlName, string stereotype)
+        var model = new SelectContentTypesViewModel
         {
-            selectedContentTypes ??= Array.Empty<string>();
-
-            var contentTypes = await ContentTypeSelection.BuildAsync(_contentDefinitionManager, selectedContentTypes);
-
-            if (!string.IsNullOrEmpty(stereotype))
-            {
-                contentTypes = contentTypes
-                    .Where(x => x.ContentTypeDefinition.GetStereotype() == stereotype)
-                    .ToArray();
-            }
+            HtmlName = htmlName,
+            ContentTypeSelections = contentTypes
+        };
 
-            var model = new SelectContentTypesViewModel
-            {
-                HtmlName = htmlName,
-                ContentTypeSelections = contentTypes
-            };
-
-            return View(model);
-        }
+        return View(model);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/AllContentDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/AllContentDeploymentStepViewModel.cs
index 7cd08061a6a..0c988edac96 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/AllContentDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/AllContentDeploymentStepViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Contents.ViewModels
+namespace OrchardCore.Contents.ViewModels;
+
+public class AllContentDeploymentStepViewModel
 {
-    public class AllContentDeploymentStepViewModel
-    {
-        public bool ExportAsSetupRecipe { get; set; }
-    }
+    public bool ExportAsSetupRecipe { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/CommonPartSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/CommonPartSettingsViewModel.cs
index 0e1b04a16e5..f8e4c8a9220 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/CommonPartSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/CommonPartSettingsViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Contents.ViewModels
+namespace OrchardCore.Contents.ViewModels;
+
+public class CommonPartSettingsViewModel
 {
-    public class CommonPartSettingsViewModel
-    {
-        public bool DisplayDateEditor { get; set; }
-        public bool DisplayOwnerEditor { get; set; }
-    }
+    public bool DisplayDateEditor { get; set; }
+    public bool DisplayOwnerEditor { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/ContentDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/ContentDeploymentStepViewModel.cs
index e75f4436be5..9ac59aa85b7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/ContentDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/ContentDeploymentStepViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Contents.ViewModels
+namespace OrchardCore.Contents.ViewModels;
+
+public class ContentDeploymentStepViewModel
 {
-    public class ContentDeploymentStepViewModel
-    {
-        public string[] ContentTypes { get; set; }
-        public bool ExportAsSetupRecipe { get; set; }
-    }
+    public string[] ContentTypes { get; set; }
+    public bool ExportAsSetupRecipe { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/DateEditorViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/DateEditorViewModel.cs
index d6080a8fdf5..718272445db 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/DateEditorViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/DateEditorViewModel.cs
@@ -1,9 +1,8 @@
 using System;
 
-namespace OrchardCore.Contents.ViewModels
+namespace OrchardCore.Contents.ViewModels;
+
+public class DateEditorViewModel
 {
-    public class DateEditorViewModel
-    {
-        public DateTime? LocalDateTime { get; set; }
-    }
+    public DateTime? LocalDateTime { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/FullTextAspectSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/FullTextAspectSettingsViewModel.cs
index f5e32290d3a..97199112be6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/FullTextAspectSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/FullTextAspectSettingsViewModel.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.Contents.ViewModels
+namespace OrchardCore.Contents.ViewModels;
+
+public class FullTextAspectSettingsViewModel
 {
-    public class FullTextAspectSettingsViewModel
-    {
-        public bool IncludeFullTextTemplate { get; set; }
-        public string FullTextTemplate { get; set; }
-        public bool IncludeBodyAspect { get; set; }
-        public bool IncludeDisplayText { get; set; }
-    }
+    public bool IncludeFullTextTemplate { get; set; }
+    public string FullTextTemplate { get; set; }
+    public bool IncludeBodyAspect { get; set; }
+    public bool IncludeDisplayText { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/IndexingEditorViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/IndexingEditorViewModel.cs
index 5e4cc05b5d7..05bb138d746 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/IndexingEditorViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/IndexingEditorViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Contents.ViewModels
+namespace OrchardCore.Contents.ViewModels;
+
+public class IndexingEditorViewModel
 {
-    public class IndexingEditorViewModel
-    {
-        public bool IsIndexed { get; set; }
-    }
+    public bool IsIndexed { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/ListContentTypesViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/ListContentTypesViewModel.cs
index 1431bd8b1b9..91e8adc764b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/ListContentTypesViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/ListContentTypesViewModel.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.Contents.ViewModels
+namespace OrchardCore.Contents.ViewModels;
+
+public class ListContentTypesViewModel
 {
-    public class ListContentTypesViewModel
-    {
-        public IEnumerable<ContentTypeDefinition> Types { get; set; }
-    }
+    public IEnumerable<ContentTypeDefinition> Types { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/ListContentsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/ListContentsViewModel.cs
index a99e00a8cea..9dea3968edc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/ListContentsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/ListContentsViewModel.cs
@@ -1,19 +1,18 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Contents.ViewModels
+namespace OrchardCore.Contents.ViewModels;
+
+public class ListContentsViewModel
 {
-    public class ListContentsViewModel
-    {
-        public ContentOptionsViewModel Options { get; set; }
+    public ContentOptionsViewModel Options { get; set; }
 
-        [BindNever]
-        public dynamic Header { get; set; }
+    [BindNever]
+    public dynamic Header { get; set; }
 
-        [BindNever]
-        public List<dynamic> ContentItems { get; set; }
+    [BindNever]
+    public List<dynamic> ContentItems { get; set; }
 
-        [BindNever]
-        public dynamic Pager { get; set; }
-    }
+    [BindNever]
+    public dynamic Pager { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/OwnerEditorViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/OwnerEditorViewModel.cs
index c1b43915d33..9ec691f9e03 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/OwnerEditorViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/OwnerEditorViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Contents.ViewModels
+namespace OrchardCore.Contents.ViewModels;
+
+public class OwnerEditorViewModel
 {
-    public class OwnerEditorViewModel
-    {
-        public string OwnerName { get; set; }
-    }
+    public string OwnerName { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/SelectContentTypesViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/SelectContentTypesViewModel.cs
index a05e7f86349..bcb144511c3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/SelectContentTypesViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/ViewModels/SelectContentTypesViewModel.cs
@@ -5,32 +5,31 @@
 using OrchardCore.ContentManagement.Metadata;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.Contents.ViewModels
+namespace OrchardCore.Contents.ViewModels;
+
+public class SelectContentTypesViewModel
 {
-    public class SelectContentTypesViewModel
-    {
-        public string HtmlName { get; set; }
-        public ContentTypeSelection[] ContentTypeSelections { get; set; }
-    }
+    public string HtmlName { get; set; }
+    public ContentTypeSelection[] ContentTypeSelections { get; set; }
+}
 
-    public class ContentTypeSelection
-    {
-        public bool IsSelected { get; set; }
-        public ContentTypeDefinition ContentTypeDefinition { get; set; }
+public class ContentTypeSelection
+{
+    public bool IsSelected { get; set; }
+    public ContentTypeDefinition ContentTypeDefinition { get; set; }
 
-        public static async Task<ContentTypeSelection[]> BuildAsync(IContentDefinitionManager contentDefinitionManager, IEnumerable<string> selectedContentTypes)
-        {
-            var contentTypes = (await contentDefinitionManager.ListTypeDefinitionsAsync())
-                .Select(x =>
-                    new ContentTypeSelection
-                    {
-                        IsSelected = selectedContentTypes.Contains(x.Name),
-                        ContentTypeDefinition = x
-                    })
-                .OrderBy(type => type.ContentTypeDefinition.DisplayName)
-                .ToArray();
+    public static async Task<ContentTypeSelection[]> BuildAsync(IContentDefinitionManager contentDefinitionManager, IEnumerable<string> selectedContentTypes)
+    {
+        var contentTypes = (await contentDefinitionManager.ListTypeDefinitionsAsync())
+            .Select(x =>
+                new ContentTypeSelection
+                {
+                    IsSelected = selectedContentTypes.Contains(x.Name),
+                    ContentTypeDefinition = x
+                })
+            .OrderBy(type => type.ContentTypeDefinition.DisplayName)
+            .ToArray();
 
-            return contentTypes;
-        }
+        return contentTypes;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentActivity.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentActivity.cs
index ecf1874f896..d18375f006c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentActivity.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentActivity.cs
@@ -12,190 +12,189 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Contents.Workflows.Activities
+namespace OrchardCore.Contents.Workflows.Activities;
+
+public abstract class ContentActivity : Activity
 {
-    public abstract class ContentActivity : Activity
-    {
 
-        protected readonly IStringLocalizer S;
+    protected readonly IStringLocalizer S;
 
-        protected ContentActivity(
-            IContentManager contentManager,
-            IWorkflowScriptEvaluator scriptEvaluator,
-            IStringLocalizer localizer)
-        {
-            ContentManager = contentManager;
-            ScriptEvaluator = scriptEvaluator;
-            S = localizer;
-        }
+    protected ContentActivity(
+        IContentManager contentManager,
+        IWorkflowScriptEvaluator scriptEvaluator,
+        IStringLocalizer localizer)
+    {
+        ContentManager = contentManager;
+        ScriptEvaluator = scriptEvaluator;
+        S = localizer;
+    }
 
-        protected IContentManager ContentManager { get; }
+    protected IContentManager ContentManager { get; }
 
-        protected IWorkflowScriptEvaluator ScriptEvaluator { get; }
+    protected IWorkflowScriptEvaluator ScriptEvaluator { get; }
 
-        /// <summary>
-        /// A <see cref="ContentEventContext"/> updated when executed inline from a <see cref="ContentEvent"/>.
-        /// </summary>
-        protected ContentEventContext InlineEvent { get; private set; } = new ContentEventContext();
+    /// <summary>
+    /// A <see cref="ContentEventContext"/> updated when executed inline from a <see cref="ContentEvent"/>.
+    /// </summary>
+    protected ContentEventContext InlineEvent { get; private set; } = new ContentEventContext();
 
-        public override LocalizedString Category => S["Content"];
+    public override LocalizedString Category => S["Content"];
 
-        /// <summary>
-        /// An expression that evaluates to an <see cref="IContent"/> item.
-        /// </summary>
-        public WorkflowExpression<IContent> Content
-        {
-            get => GetProperty(() => new WorkflowExpression<IContent>());
-            set => SetProperty(value);
-        }
+    /// <summary>
+    /// An expression that evaluates to an <see cref="IContent"/> item.
+    /// </summary>
+    public WorkflowExpression<IContent> Content
+    {
+        get => GetProperty(() => new WorkflowExpression<IContent>());
+        set => SetProperty(value);
+    }
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"]);
-        }
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"]);
+    }
+
+    public override Task OnInputReceivedAsync(WorkflowExecutionContext workflowContext, IDictionary<string, object> input)
+    {
+        var contentEvent = input?.GetValue<ContentEventContext>(ContentEventConstants.ContentEventInputKey);
 
-        public override Task OnInputReceivedAsync(WorkflowExecutionContext workflowContext, IDictionary<string, object> input)
+        if (contentEvent != null)
         {
-            var contentEvent = input?.GetValue<ContentEventContext>(ContentEventConstants.ContentEventInputKey);
+            InlineEvent = contentEvent;
 
-            if (contentEvent != null)
-            {
-                InlineEvent = contentEvent;
+            InlineEvent.IsStart = workflowContext.Status == WorkflowStatus.Starting;
+        }
 
-                InlineEvent.IsStart = workflowContext.Status == WorkflowStatus.Starting;
-            }
+        return Task.CompletedTask;
+    }
 
-            return Task.CompletedTask;
-        }
+    public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes("Done");
+    }
 
-        public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes("Done");
-        }
+    public override async Task OnWorkflowRestartingAsync(WorkflowExecutionContext workflowContext, CancellationToken cancellationToken = default)
+    {
+        ContentItem contentItem = null;
 
-        public override async Task OnWorkflowRestartingAsync(WorkflowExecutionContext workflowContext, CancellationToken cancellationToken = default)
+        if (workflowContext.Input.TryGetValue(ContentEventConstants.ContentEventInputKey, out var contentEvent))
         {
-            ContentItem contentItem = null;
-
-            if (workflowContext.Input.TryGetValue(ContentEventConstants.ContentEventInputKey, out var contentEvent))
+            if (contentEvent is not JsonObject jsonObject)
             {
-                if (contentEvent is not JsonObject jsonObject)
+                jsonObject = [];
+                if (contentEvent is Dictionary<string, object> items)
                 {
-                    jsonObject = [];
-                    if (contentEvent is Dictionary<string, object> items)
+                    foreach (var item in items)
                     {
-                        foreach (var item in items)
-                        {
-                            jsonObject[item.Key] = JsonSerializer.SerializeToNode(item.Value);
-                        }
+                        jsonObject[item.Key] = JsonSerializer.SerializeToNode(item.Value);
                     }
                 }
+            }
 
-                var contentEventContext = jsonObject.ToObject<ContentEventContext>();
+            var contentEventContext = jsonObject.ToObject<ContentEventContext>();
 
-                if (contentEventContext?.ContentItemVersionId != null)
-                {
-                    contentItem = await ContentManager.GetVersionAsync(contentEventContext.ContentItemVersionId);
-                }
-                if (contentItem == null && contentEventContext?.ContentItemId != null)
-                {
-                    contentItem = await ContentManager.GetAsync(contentEventContext.ContentItemId);
-                }
+            if (contentEventContext?.ContentItemVersionId != null)
+            {
+                contentItem = await ContentManager.GetVersionAsync(contentEventContext.ContentItemVersionId);
+            }
+            if (contentItem == null && contentEventContext?.ContentItemId != null)
+            {
+                contentItem = await ContentManager.GetAsync(contentEventContext.ContentItemId);
             }
+        }
 
-            if (contentItem == null && workflowContext.Input.TryGetValue(ContentEventConstants.ContentItemInputKey, out var contentItemEvent))
+        if (contentItem == null && workflowContext.Input.TryGetValue(ContentEventConstants.ContentItemInputKey, out var contentItemEvent))
+        {
+            if (contentItemEvent is not JsonObject jsonObject)
             {
-                if (contentItemEvent is not JsonObject jsonObject)
+                jsonObject = [];
+                if (contentEvent is Dictionary<string, object> items)
                 {
-                    jsonObject = [];
-                    if (contentEvent is Dictionary<string, object> items)
+                    foreach (var item in items)
                     {
-                        foreach (var item in items)
-                        {
-                            jsonObject[item.Key] = JsonSerializer.SerializeToNode(item.Value);
-                        }
+                        jsonObject[item.Key] = JsonSerializer.SerializeToNode(item.Value);
                     }
                 }
-
-                var existingContentItem = jsonObject.ToObject<ContentItem>();
-
-                if (existingContentItem?.ContentItemId != null)
-                {
-                    contentItem = await ContentManager.GetAsync(existingContentItem.ContentItemId);
-                }
             }
 
-            if (contentItem != null)
+            var existingContentItem = jsonObject.ToObject<ContentItem>();
+
+            if (existingContentItem?.ContentItemId != null)
             {
-                workflowContext.Input[ContentEventConstants.ContentItemInputKey] = contentItem;
+                contentItem = await ContentManager.GetAsync(existingContentItem.ContentItemId);
             }
         }
 
-        protected virtual async Task<IContent> GetContentAsync(WorkflowExecutionContext workflowContext)
+        if (contentItem != null)
         {
-            IContent content;
+            workflowContext.Input[ContentEventConstants.ContentItemInputKey] = contentItem;
+        }
+    }
 
-            // Try to evaluate a content item from the Content expression, if provided.
-            if (!string.IsNullOrWhiteSpace(Content.Expression))
-            {
-                var expression = new WorkflowExpression<object> { Expression = Content.Expression };
-                var result = await ScriptEvaluator.EvaluateAsync(expression, workflowContext);
+    protected virtual async Task<IContent> GetContentAsync(WorkflowExecutionContext workflowContext)
+    {
+        IContent content;
 
-                if (result is ContentItem contentItem)
-                {
-                    content = contentItem;
-                }
-                else if (result is string contentItemId)
-                {
-                    content = new ContentItemIdExpressionResult(contentItemId);
-                }
-                else
-                {
-                    // Try to map the result to a content item.
-                    var json = JConvert.SerializeObject(result);
-                    content = JConvert.DeserializeObject<ContentItem>(json);
-                }
+        // Try to evaluate a content item from the Content expression, if provided.
+        if (!string.IsNullOrWhiteSpace(Content.Expression))
+        {
+            var expression = new WorkflowExpression<object> { Expression = Content.Expression };
+            var result = await ScriptEvaluator.EvaluateAsync(expression, workflowContext);
+
+            if (result is ContentItem contentItem)
+            {
+                content = contentItem;
             }
-            else
+            else if (result is string contentItemId)
             {
-                // If no expression was provided, see if the content item was provided as an input or as a property.
-                content = workflowContext.Input.GetValue<IContent>(ContentEventConstants.ContentItemInputKey)
-                    ?? workflowContext.Properties.GetValue<IContent>(ContentEventConstants.ContentItemInputKey);
+                content = new ContentItemIdExpressionResult(contentItemId);
             }
-
-            if (content?.ContentItem?.ContentItemId != null)
+            else
             {
-                return content;
+                // Try to map the result to a content item.
+                var json = JConvert.SerializeObject(result);
+                content = JConvert.DeserializeObject<ContentItem>(json);
             }
-
-            return null;
         }
-
-        protected virtual async Task<string> GetContentItemIdAsync(WorkflowExecutionContext workflowContext)
+        else
         {
-            // Try to evaluate a content item id from the Content expression, if provided.
-            if (!string.IsNullOrWhiteSpace(Content.Expression))
-            {
-                var expression = new WorkflowExpression<object> { Expression = Content.Expression };
-                var contentItemIdResult = await ScriptEvaluator.EvaluateAsync(expression, workflowContext);
-
-                if (contentItemIdResult is string contentItemId)
-                {
-                    return contentItemId;
-                }
-            }
+            // If no expression was provided, see if the content item was provided as an input or as a property.
+            content = workflowContext.Input.GetValue<IContent>(ContentEventConstants.ContentItemInputKey)
+                ?? workflowContext.Properties.GetValue<IContent>(ContentEventConstants.ContentItemInputKey);
+        }
 
-            return null;
+        if (content?.ContentItem?.ContentItemId != null)
+        {
+            return content;
         }
 
-        protected class ContentItemIdExpressionResult : IContent
+        return null;
+    }
+
+    protected virtual async Task<string> GetContentItemIdAsync(WorkflowExecutionContext workflowContext)
+    {
+        // Try to evaluate a content item id from the Content expression, if provided.
+        if (!string.IsNullOrWhiteSpace(Content.Expression))
         {
-            public ContentItemIdExpressionResult(string contentItemId)
+            var expression = new WorkflowExpression<object> { Expression = Content.Expression };
+            var contentItemIdResult = await ScriptEvaluator.EvaluateAsync(expression, workflowContext);
+
+            if (contentItemIdResult is string contentItemId)
             {
-                ContentItem = new ContentItem() { ContentItemId = contentItemId };
+                return contentItemId;
             }
+        }
 
-            public ContentItem ContentItem { get; }
+        return null;
+    }
+
+    protected class ContentItemIdExpressionResult : IContent
+    {
+        public ContentItemIdExpressionResult(string contentItemId)
+        {
+            ContentItem = new ContentItem() { ContentItemId = contentItemId };
         }
+
+        public ContentItem ContentItem { get; }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentCreatedEvent.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentCreatedEvent.cs
index 2df0fd8d65e..2d851168ac0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentCreatedEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentCreatedEvent.cs
@@ -2,20 +2,19 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Contents.Workflows.Activities
+namespace OrchardCore.Contents.Workflows.Activities;
+
+public class ContentCreatedEvent : ContentEvent
 {
-    public class ContentCreatedEvent : ContentEvent
+    public ContentCreatedEvent(
+        IContentManager contentManager,
+        IWorkflowScriptEvaluator scriptEvaluator,
+        IStringLocalizer<ContentCreatedEvent> localizer)
+        : base(contentManager, scriptEvaluator, localizer)
     {
-        public ContentCreatedEvent(
-            IContentManager contentManager,
-            IWorkflowScriptEvaluator scriptEvaluator,
-            IStringLocalizer<ContentCreatedEvent> localizer)
-            : base(contentManager, scriptEvaluator, localizer)
-        {
-        }
+    }
 
-        public override string Name => nameof(ContentCreatedEvent);
+    public override string Name => nameof(ContentCreatedEvent);
 
-        public override LocalizedString DisplayText => S["Content Created Event"];
-    }
+    public override LocalizedString DisplayText => S["Content Created Event"];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentDeletedEvent.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentDeletedEvent.cs
index 4b4ea669d4e..dbe7da9e002 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentDeletedEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentDeletedEvent.cs
@@ -2,20 +2,19 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Contents.Workflows.Activities
+namespace OrchardCore.Contents.Workflows.Activities;
+
+public class ContentDeletedEvent : ContentEvent
 {
-    public class ContentDeletedEvent : ContentEvent
+    public ContentDeletedEvent(
+        IContentManager contentManager,
+        IWorkflowScriptEvaluator scriptEvaluator,
+        IStringLocalizer<ContentDeletedEvent> localizer)
+        : base(contentManager, scriptEvaluator, localizer)
     {
-        public ContentDeletedEvent(
-            IContentManager contentManager,
-            IWorkflowScriptEvaluator scriptEvaluator,
-            IStringLocalizer<ContentDeletedEvent> localizer)
-            : base(contentManager, scriptEvaluator, localizer)
-        {
-        }
+    }
 
-        public override string Name => nameof(ContentDeletedEvent);
+    public override string Name => nameof(ContentDeletedEvent);
 
-        public override LocalizedString DisplayText => S["Content Deleted Event"];
-    }
+    public override LocalizedString DisplayText => S["Content Deleted Event"];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentDraftSavedEvent.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentDraftSavedEvent.cs
index 96d69de978b..c41948aade8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentDraftSavedEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentDraftSavedEvent.cs
@@ -2,20 +2,19 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Contents.Workflows.Activities
+namespace OrchardCore.Contents.Workflows.Activities;
+
+public class ContentDraftSavedEvent : ContentEvent
 {
-    public class ContentDraftSavedEvent : ContentEvent
+    public ContentDraftSavedEvent(
+        IContentManager contentManager,
+        IWorkflowScriptEvaluator scriptEvaluator,
+        IStringLocalizer<ContentDraftSavedEvent> localizer)
+        : base(contentManager, scriptEvaluator, localizer)
     {
-        public ContentDraftSavedEvent(
-            IContentManager contentManager,
-            IWorkflowScriptEvaluator scriptEvaluator,
-            IStringLocalizer<ContentDraftSavedEvent> localizer)
-            : base(contentManager, scriptEvaluator, localizer)
-        {
-        }
+    }
 
-        public override string Name => nameof(ContentDraftSavedEvent);
+    public override string Name => nameof(ContentDraftSavedEvent);
 
-        public override LocalizedString DisplayText => S["Content Save Draft Event"];
-    }
+    public override LocalizedString DisplayText => S["Content Save Draft Event"];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentEvent.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentEvent.cs
index 7e0efd08885..0feb7c81ab3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentEvent.cs
@@ -7,47 +7,46 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Contents.Workflows.Activities
+namespace OrchardCore.Contents.Workflows.Activities;
+
+public abstract class ContentEvent : ContentActivity, IEvent
 {
-    public abstract class ContentEvent : ContentActivity, IEvent
+    protected ContentEvent(
+        IContentManager contentManager,
+        IWorkflowScriptEvaluator scriptEvaluator,
+        IStringLocalizer localizer)
+        : base(contentManager, scriptEvaluator, localizer)
     {
-        protected ContentEvent(
-            IContentManager contentManager,
-            IWorkflowScriptEvaluator scriptEvaluator,
-            IStringLocalizer localizer)
-            : base(contentManager, scriptEvaluator, localizer)
-        {
-        }
+    }
 
-        public IList<string> ContentTypeFilter
-        {
-            get => GetProperty<IList<string>>(defaultValue: () => []);
-            set => SetProperty(value);
-        }
+    public IList<string> ContentTypeFilter
+    {
+        get => GetProperty<IList<string>>(defaultValue: () => []);
+        set => SetProperty(value);
+    }
 
-        public override async Task<bool> CanExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var content = await GetContentAsync(workflowContext);
+    public override async Task<bool> CanExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var content = await GetContentAsync(workflowContext);
 
-            if (content == null)
-            {
-                return false;
-            }
+        if (content == null)
+        {
+            return false;
+        }
 
-            var contentTypes = ContentTypeFilter.Where(x => !string.IsNullOrWhiteSpace(x)).ToList();
+        var contentTypes = ContentTypeFilter.Where(x => !string.IsNullOrWhiteSpace(x)).ToList();
 
-            // "" means 'any'.
-            return contentTypes.Count == 0 || contentTypes.Any(contentType => content.ContentItem.ContentType == contentType);
-        }
+        // "" means 'any'.
+        return contentTypes.Count == 0 || contentTypes.Any(contentType => content.ContentItem.ContentType == contentType);
+    }
 
-        public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Halt();
-        }
+    public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Halt();
+    }
 
-        public override ActivityExecutionResult Resume(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes("Done");
-        }
+    public override ActivityExecutionResult Resume(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes("Done");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentPublishedEvent.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentPublishedEvent.cs
index 470f663f340..16287076d4e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentPublishedEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentPublishedEvent.cs
@@ -2,20 +2,19 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Contents.Workflows.Activities
+namespace OrchardCore.Contents.Workflows.Activities;
+
+public class ContentPublishedEvent : ContentEvent
 {
-    public class ContentPublishedEvent : ContentEvent
+    public ContentPublishedEvent(
+        IContentManager contentManager,
+        IWorkflowScriptEvaluator scriptEvaluator,
+        IStringLocalizer<ContentPublishedEvent> localizer)
+        : base(contentManager, scriptEvaluator, localizer)
     {
-        public ContentPublishedEvent(
-            IContentManager contentManager,
-            IWorkflowScriptEvaluator scriptEvaluator,
-            IStringLocalizer<ContentPublishedEvent> localizer)
-            : base(contentManager, scriptEvaluator, localizer)
-        {
-        }
+    }
 
-        public override string Name => nameof(ContentPublishedEvent);
+    public override string Name => nameof(ContentPublishedEvent);
 
-        public override LocalizedString DisplayText => S["Content Published Event"];
-    }
+    public override LocalizedString DisplayText => S["Content Published Event"];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentTask.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentTask.cs
index cebe217c0a3..63f6ad9f800 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentTask.cs
@@ -3,16 +3,15 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Contents.Workflows.Activities
+namespace OrchardCore.Contents.Workflows.Activities;
+
+public abstract class ContentTask : ContentActivity, ITask
 {
-    public abstract class ContentTask : ContentActivity, ITask
+    protected ContentTask(
+        IContentManager contentManager,
+        IWorkflowScriptEvaluator scriptEvaluator,
+        IStringLocalizer localizer)
+        : base(contentManager, scriptEvaluator, localizer)
     {
-        protected ContentTask(
-            IContentManager contentManager,
-            IWorkflowScriptEvaluator scriptEvaluator,
-            IStringLocalizer localizer)
-            : base(contentManager, scriptEvaluator, localizer)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentUnpublishedEvent.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentUnpublishedEvent.cs
index 49da36b13b6..610512a8c84 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentUnpublishedEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentUnpublishedEvent.cs
@@ -2,20 +2,19 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Contents.Workflows.Activities
+namespace OrchardCore.Contents.Workflows.Activities;
+
+public class ContentUnpublishedEvent : ContentEvent
 {
-    public class ContentUnpublishedEvent : ContentEvent
+    public ContentUnpublishedEvent(
+        IContentManager contentManager,
+        IWorkflowScriptEvaluator scriptEvaluator,
+        IStringLocalizer<ContentUnpublishedEvent> localizer)
+        : base(contentManager, scriptEvaluator, localizer)
     {
-        public ContentUnpublishedEvent(
-            IContentManager contentManager,
-            IWorkflowScriptEvaluator scriptEvaluator,
-            IStringLocalizer<ContentUnpublishedEvent> localizer)
-            : base(contentManager, scriptEvaluator, localizer)
-        {
-        }
+    }
 
-        public override string Name => nameof(ContentUnpublishedEvent);
+    public override string Name => nameof(ContentUnpublishedEvent);
 
-        public override LocalizedString DisplayText => S["Content Unpublished Event"];
-    }
+    public override LocalizedString DisplayText => S["Content Unpublished Event"];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentUpdatedEvent.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentUpdatedEvent.cs
index 57cfa6446bc..fa778288d1a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentUpdatedEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentUpdatedEvent.cs
@@ -2,20 +2,19 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Contents.Workflows.Activities
+namespace OrchardCore.Contents.Workflows.Activities;
+
+public class ContentUpdatedEvent : ContentEvent
 {
-    public class ContentUpdatedEvent : ContentEvent
+    public ContentUpdatedEvent(
+        IContentManager contentManager,
+        IWorkflowScriptEvaluator scriptEvaluator,
+        IStringLocalizer<ContentUpdatedEvent> localizer)
+        : base(contentManager, scriptEvaluator, localizer)
     {
-        public ContentUpdatedEvent(
-            IContentManager contentManager,
-            IWorkflowScriptEvaluator scriptEvaluator,
-            IStringLocalizer<ContentUpdatedEvent> localizer)
-            : base(contentManager, scriptEvaluator, localizer)
-        {
-        }
+    }
 
-        public override string Name => nameof(ContentUpdatedEvent);
+    public override string Name => nameof(ContentUpdatedEvent);
 
-        public override LocalizedString DisplayText => S["Content Updated Event"];
-    }
+    public override LocalizedString DisplayText => S["Content Updated Event"];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentVersionedEvent.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentVersionedEvent.cs
index c7364c7319f..c2b692e2c8e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentVersionedEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentVersionedEvent.cs
@@ -2,19 +2,18 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Contents.Workflows.Activities
+namespace OrchardCore.Contents.Workflows.Activities;
+
+public class ContentVersionedEvent : ContentEvent
 {
-    public class ContentVersionedEvent : ContentEvent
+    public ContentVersionedEvent(IContentManager contentManager,
+        IWorkflowScriptEvaluator scriptEvaluator,
+        IStringLocalizer<ContentVersionedEvent> localizer)
+        : base(contentManager, scriptEvaluator, localizer)
     {
-        public ContentVersionedEvent(IContentManager contentManager,
-            IWorkflowScriptEvaluator scriptEvaluator,
-            IStringLocalizer<ContentVersionedEvent> localizer)
-            : base(contentManager, scriptEvaluator, localizer)
-        {
-        }
+    }
 
-        public override string Name => nameof(ContentVersionedEvent);
+    public override string Name => nameof(ContentVersionedEvent);
 
-        public override LocalizedString DisplayText => S["Content Versioned Event"];
-    }
+    public override LocalizedString DisplayText => S["Content Versioned Event"];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/CreateContentTask.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/CreateContentTask.cs
index 3f37c035222..d98cc89b8c2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/CreateContentTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/CreateContentTask.cs
@@ -12,119 +12,118 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Contents.Workflows.Activities
+namespace OrchardCore.Contents.Workflows.Activities;
+
+public class CreateContentTask : ContentTask
 {
-    public class CreateContentTask : ContentTask
+    private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
+    private readonly JavaScriptEncoder _javaScriptEncoder;
+
+    public CreateContentTask(
+        IContentManager contentManager,
+        IWorkflowExpressionEvaluator expressionEvaluator,
+        IWorkflowScriptEvaluator scriptEvaluator,
+        IStringLocalizer<CreateContentTask> localizer,
+        JavaScriptEncoder javaScriptEncoder)
+        : base(contentManager, scriptEvaluator, localizer)
     {
-        private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
-        private readonly JavaScriptEncoder _javaScriptEncoder;
-
-        public CreateContentTask(
-            IContentManager contentManager,
-            IWorkflowExpressionEvaluator expressionEvaluator,
-            IWorkflowScriptEvaluator scriptEvaluator,
-            IStringLocalizer<CreateContentTask> localizer,
-            JavaScriptEncoder javaScriptEncoder)
-            : base(contentManager, scriptEvaluator, localizer)
-        {
-            _expressionEvaluator = expressionEvaluator;
-            _javaScriptEncoder = javaScriptEncoder;
-        }
+        _expressionEvaluator = expressionEvaluator;
+        _javaScriptEncoder = javaScriptEncoder;
+    }
 
-        public override string Name => nameof(CreateContentTask);
+    public override string Name => nameof(CreateContentTask);
 
-        public override LocalizedString Category => S["Content"];
+    public override LocalizedString Category => S["Content"];
 
-        public override LocalizedString DisplayText => S["Create Content Task"];
+    public override LocalizedString DisplayText => S["Create Content Task"];
 
-        public string ContentType
-        {
-            get => GetProperty<string>();
-            set => SetProperty(value);
-        }
+    public string ContentType
+    {
+        get => GetProperty<string>();
+        set => SetProperty(value);
+    }
 
-        public bool Publish
-        {
-            get => GetProperty<bool>();
-            set => SetProperty(value);
-        }
+    public bool Publish
+    {
+        get => GetProperty<bool>();
+        set => SetProperty(value);
+    }
 
-        public WorkflowExpression<string> ContentProperties
-        {
-            get => GetProperty(() => new WorkflowExpression<string>(JConvert.SerializeObject(new { DisplayText = S["Enter a title"].Value }, JOptions.Indented)));
-            set => SetProperty(value);
-        }
+    public WorkflowExpression<string> ContentProperties
+    {
+        get => GetProperty(() => new WorkflowExpression<string>(JConvert.SerializeObject(new { DisplayText = S["Enter a title"].Value }, JOptions.Indented)));
+        set => SetProperty(value);
+    }
 
-        public override bool CanExecute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    public override bool CanExecute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return !string.IsNullOrEmpty(ContentType);
+    }
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"], S["Failed"]);
+    }
+
+    public async override Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        if (InlineEvent.IsStart && InlineEvent.ContentType == ContentType)
         {
-            return !string.IsNullOrEmpty(ContentType);
+            if (InlineEvent.Name == nameof(ContentUpdatedEvent))
+            {
+                throw new InvalidOperationException($"The '{nameof(CreateContentTask)}' can't update the content item as it is executed inline from a starting '{nameof(ContentUpdatedEvent)}' of the same content type, which would result in an infinitive loop.");
+            }
+
+            if (InlineEvent.Name == nameof(ContentCreatedEvent))
+            {
+                throw new InvalidOperationException($"The '{nameof(CreateContentTask)}' can't create the content item as it is executed inline from a starting '{nameof(ContentCreatedEvent)}' of the same content type, which would result in an infinitive loop.");
+            }
+
+            if (Publish && InlineEvent.Name == nameof(ContentPublishedEvent))
+            {
+                throw new InvalidOperationException($"The '{nameof(CreateContentTask)}' can't publish the content item as it is executed inline from a starting '{nameof(ContentPublishedEvent)}' of the same content type, which would result in an infinitive loop.");
+            }
+
+            if (!Publish && InlineEvent.Name == nameof(ContentDraftSavedEvent))
+            {
+                throw new InvalidOperationException($"The '{nameof(CreateContentTask)}' can't create the content item as it is executed inline from a starting '{nameof(ContentDraftSavedEvent)}' of the same content type, which would result in an infinitive loop.");
+            }
         }
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        var contentItem = await ContentManager.NewAsync(ContentType);
+
+        if (!string.IsNullOrWhiteSpace(ContentProperties.Expression))
         {
-            return Outcomes(S["Done"], S["Failed"]);
+            var contentProperties = await _expressionEvaluator.EvaluateAsync(ContentProperties, workflowContext, _javaScriptEncoder);
+            contentItem.Merge(JObject.Parse(contentProperties));
         }
 
-        public async override Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        var result = await ContentManager.UpdateValidateAndCreateAsync(contentItem, VersionOptions.Draft);
+
+        if (result.Succeeded)
         {
-            if (InlineEvent.IsStart && InlineEvent.ContentType == ContentType)
+            if (Publish)
             {
-                if (InlineEvent.Name == nameof(ContentUpdatedEvent))
-                {
-                    throw new InvalidOperationException($"The '{nameof(CreateContentTask)}' can't update the content item as it is executed inline from a starting '{nameof(ContentUpdatedEvent)}' of the same content type, which would result in an infinitive loop.");
-                }
-
-                if (InlineEvent.Name == nameof(ContentCreatedEvent))
-                {
-                    throw new InvalidOperationException($"The '{nameof(CreateContentTask)}' can't create the content item as it is executed inline from a starting '{nameof(ContentCreatedEvent)}' of the same content type, which would result in an infinitive loop.");
-                }
-
-                if (Publish && InlineEvent.Name == nameof(ContentPublishedEvent))
-                {
-                    throw new InvalidOperationException($"The '{nameof(CreateContentTask)}' can't publish the content item as it is executed inline from a starting '{nameof(ContentPublishedEvent)}' of the same content type, which would result in an infinitive loop.");
-                }
-
-                if (!Publish && InlineEvent.Name == nameof(ContentDraftSavedEvent))
-                {
-                    throw new InvalidOperationException($"The '{nameof(CreateContentTask)}' can't create the content item as it is executed inline from a starting '{nameof(ContentDraftSavedEvent)}' of the same content type, which would result in an infinitive loop.");
-                }
+                await ContentManager.PublishAsync(contentItem);
             }
-
-            var contentItem = await ContentManager.NewAsync(ContentType);
-
-            if (!string.IsNullOrWhiteSpace(ContentProperties.Expression))
+            else
             {
-                var contentProperties = await _expressionEvaluator.EvaluateAsync(ContentProperties, workflowContext, _javaScriptEncoder);
-                contentItem.Merge(JObject.Parse(contentProperties));
+                await ContentManager.SaveDraftAsync(contentItem);
             }
 
-            var result = await ContentManager.UpdateValidateAndCreateAsync(contentItem, VersionOptions.Draft);
-
-            if (result.Succeeded)
+            if (string.IsNullOrEmpty(workflowContext.CorrelationId))
             {
-                if (Publish)
-                {
-                    await ContentManager.PublishAsync(contentItem);
-                }
-                else
-                {
-                    await ContentManager.SaveDraftAsync(contentItem);
-                }
-
-                if (string.IsNullOrEmpty(workflowContext.CorrelationId))
-                {
-                    workflowContext.CorrelationId = contentItem.ContentItemId;
-                }
-                
-                workflowContext.Properties[ContentEventConstants.ContentItemInputKey] = contentItem;
-                workflowContext.LastResult = contentItem;
-
-                return Outcomes("Done");
+                workflowContext.CorrelationId = contentItem.ContentItemId;
             }
 
-            workflowContext.LastResult = result;
+            workflowContext.Properties[ContentEventConstants.ContentItemInputKey] = contentItem;
+            workflowContext.LastResult = contentItem;
 
-            return Outcomes("Failed");
+            return Outcomes("Done");
         }
+
+        workflowContext.LastResult = result;
+
+        return Outcomes("Failed");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/DeleteContentTask.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/DeleteContentTask.cs
index 5381862eae4..71405de6fa2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/DeleteContentTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/DeleteContentTask.cs
@@ -8,58 +8,57 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Contents.Workflows.Activities
+namespace OrchardCore.Contents.Workflows.Activities;
+
+public class DeleteContentTask : ContentTask
 {
-    public class DeleteContentTask : ContentTask
+    public DeleteContentTask(IContentManager contentManager,
+        IWorkflowScriptEvaluator scriptEvaluator,
+        IStringLocalizer<DeleteContentTask> localizer)
+        : base(contentManager, scriptEvaluator, localizer)
     {
-        public DeleteContentTask(IContentManager contentManager,
-            IWorkflowScriptEvaluator scriptEvaluator,
-            IStringLocalizer<DeleteContentTask> localizer)
-            : base(contentManager, scriptEvaluator, localizer)
-        {
-        }
+    }
 
-        public override string Name => nameof(DeleteContentTask);
+    public override string Name => nameof(DeleteContentTask);
 
-        public override LocalizedString DisplayText => S["Delete Content Task"];
+    public override LocalizedString DisplayText => S["Delete Content Task"];
 
-        public override LocalizedString Category => S["Content"];
+    public override LocalizedString Category => S["Content"];
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Deleted"], S["Noop"]);
+    }
+
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var content = (await GetContentAsync(workflowContext))
+            ?? throw new InvalidOperationException($"The '{nameof(DeleteContentTask)}' failed to retrieve the content item.");
+
+        if (string.Equals(InlineEvent.ContentItemId, content.ContentItem.ContentItemId, StringComparison.OrdinalIgnoreCase))
         {
-            return Outcomes(S["Deleted"], S["Noop"]);
+            return Outcomes("Noop");
         }
 
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var content = (await GetContentAsync(workflowContext))
-                ?? throw new InvalidOperationException($"The '{nameof(DeleteContentTask)}' failed to retrieve the content item.");
+        var contentItem = await ContentManager.GetAsync(content.ContentItem.ContentItemId, VersionOptions.Latest);
 
-            if (string.Equals(InlineEvent.ContentItemId, content.ContentItem.ContentItemId, StringComparison.OrdinalIgnoreCase))
+        if (contentItem == null)
+        {
+            if (content is ContentItemIdExpressionResult)
             {
-                return Outcomes("Noop");
+                throw new InvalidOperationException($"The '{nameof(DeleteContentTask)}' failed to retrieve the content item.");
             }
 
-            var contentItem = await ContentManager.GetAsync(content.ContentItem.ContentItemId, VersionOptions.Latest);
-
-            if (contentItem == null)
-            {
-                if (content is ContentItemIdExpressionResult)
-                {
-                    throw new InvalidOperationException($"The '{nameof(DeleteContentTask)}' failed to retrieve the content item.");
-                }
-
-                contentItem = content.ContentItem;
-            }
+            contentItem = content.ContentItem;
+        }
 
-            if (InlineEvent.IsStart && InlineEvent.ContentType == contentItem.ContentType && InlineEvent.Name == nameof(ContentDeletedEvent))
-            {
-                throw new InvalidOperationException($"The '{nameof(DeleteContentTask)}' can't delete the content item as it is executed inline from a starting '{nameof(ContentDeletedEvent)}' of the same content type, which would result in an infinitive loop.");
-            }
+        if (InlineEvent.IsStart && InlineEvent.ContentType == contentItem.ContentType && InlineEvent.Name == nameof(ContentDeletedEvent))
+        {
+            throw new InvalidOperationException($"The '{nameof(DeleteContentTask)}' can't delete the content item as it is executed inline from a starting '{nameof(ContentDeletedEvent)}' of the same content type, which would result in an infinitive loop.");
+        }
 
-            await ContentManager.RemoveAsync(contentItem);
+        await ContentManager.RemoveAsync(contentItem);
 
-            return Outcomes("Deleted");
-        }
+        return Outcomes("Deleted");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/PublishContentTask.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/PublishContentTask.cs
index 2875b2fd763..6e7db199a46 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/PublishContentTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/PublishContentTask.cs
@@ -8,59 +8,58 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Contents.Workflows.Activities
+namespace OrchardCore.Contents.Workflows.Activities;
+
+public class PublishContentTask : ContentTask
 {
-    public class PublishContentTask : ContentTask
+    public PublishContentTask(
+        IContentManager contentManager,
+        IWorkflowScriptEvaluator scriptEvaluator,
+        IStringLocalizer<PublishContentTask> localizer)
+        : base(contentManager, scriptEvaluator, localizer)
     {
-        public PublishContentTask(
-            IContentManager contentManager,
-            IWorkflowScriptEvaluator scriptEvaluator,
-            IStringLocalizer<PublishContentTask> localizer)
-            : base(contentManager, scriptEvaluator, localizer)
-        {
-        }
+    }
 
-        public override string Name => nameof(PublishContentTask);
+    public override string Name => nameof(PublishContentTask);
 
-        public override LocalizedString DisplayText => S["Publish Content Task"];
+    public override LocalizedString DisplayText => S["Publish Content Task"];
 
-        public override LocalizedString Category => S["Content"];
+    public override LocalizedString Category => S["Content"];
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Published"], S["Noop"]);
+    }
+
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var content = (await GetContentAsync(workflowContext))
+            ?? throw new InvalidOperationException($"The '{nameof(PublishContentTask)}' failed to retrieve the content item.");
+
+        if (string.Equals(InlineEvent.ContentItemId, content.ContentItem.ContentItemId, StringComparison.OrdinalIgnoreCase))
         {
-            return Outcomes(S["Published"], S["Noop"]);
+            return Outcomes("Noop");
         }
 
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var content = (await GetContentAsync(workflowContext))
-                ?? throw new InvalidOperationException($"The '{nameof(PublishContentTask)}' failed to retrieve the content item.");
+        var contentItem = await ContentManager.GetAsync(content.ContentItem.ContentItemId, VersionOptions.DraftRequired);
 
-            if (string.Equals(InlineEvent.ContentItemId, content.ContentItem.ContentItemId, StringComparison.OrdinalIgnoreCase))
+        if (contentItem == null)
+        {
+            if (content is ContentItemIdExpressionResult)
             {
-                return Outcomes("Noop");
+                throw new InvalidOperationException($"The '{nameof(PublishContentTask)}' failed to retrieve the content item.");
             }
 
-            var contentItem = await ContentManager.GetAsync(content.ContentItem.ContentItemId, VersionOptions.DraftRequired);
-
-            if (contentItem == null)
-            {
-                if (content is ContentItemIdExpressionResult)
-                {
-                    throw new InvalidOperationException($"The '{nameof(PublishContentTask)}' failed to retrieve the content item.");
-                }
-
-                contentItem = content.ContentItem;
-            }
+            contentItem = content.ContentItem;
+        }
 
-            if (InlineEvent.IsStart && InlineEvent.ContentType == contentItem.ContentType && InlineEvent.Name == nameof(ContentPublishedEvent))
-            {
-                throw new InvalidOperationException($"The '{nameof(PublishContentTask)}' can't publish the content item as it is executed inline from a starting '{nameof(ContentPublishedEvent)}' of the same content type, which would result in an infinitive loop.");
-            }
+        if (InlineEvent.IsStart && InlineEvent.ContentType == contentItem.ContentType && InlineEvent.Name == nameof(ContentPublishedEvent))
+        {
+            throw new InvalidOperationException($"The '{nameof(PublishContentTask)}' can't publish the content item as it is executed inline from a starting '{nameof(ContentPublishedEvent)}' of the same content type, which would result in an infinitive loop.");
+        }
 
-            await ContentManager.PublishAsync(contentItem);
+        await ContentManager.PublishAsync(contentItem);
 
-            return Outcomes("Published");
-        }
+        return Outcomes("Published");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/RetrieveContentTask.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/RetrieveContentTask.cs
index 1f0e09893e1..de7506c6789 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/RetrieveContentTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/RetrieveContentTask.cs
@@ -9,46 +9,45 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Contents.Workflows.Activities
+namespace OrchardCore.Contents.Workflows.Activities;
+
+public class RetrieveContentTask : ContentTask
 {
-    public class RetrieveContentTask : ContentTask
+    public RetrieveContentTask(
+        IContentManager contentManager,
+        IWorkflowScriptEvaluator scriptEvaluator,
+        IStringLocalizer<RetrieveContentTask> localizer)
+        : base(contentManager, scriptEvaluator, localizer)
     {
-        public RetrieveContentTask(
-            IContentManager contentManager,
-            IWorkflowScriptEvaluator scriptEvaluator,
-            IStringLocalizer<RetrieveContentTask> localizer)
-            : base(contentManager, scriptEvaluator, localizer)
-        {
-        }
-
-        public override string Name => nameof(RetrieveContentTask);
+    }
 
-        public override LocalizedString DisplayText => S["Retrieve Content Task"];
+    public override string Name => nameof(RetrieveContentTask);
 
-        public override LocalizedString Category => S["Content"];
+    public override LocalizedString DisplayText => S["Retrieve Content Task"];
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Retrieved"]);
-        }
+    public override LocalizedString Category => S["Content"];
 
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var contentItemId = (await GetContentItemIdAsync(workflowContext))
-                ?? throw new InvalidOperationException($"The '{nameof(RetrieveContentTask)}' failed to evaluate the 'ContentItemId'.");
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Retrieved"]);
+    }
 
-            var contentItem = (await ContentManager.GetAsync(contentItemId, VersionOptions.Latest))
-                ?? throw new InvalidOperationException($"The '{nameof(RetrieveContentTask)}' failed to retrieve the content item.");
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var contentItemId = (await GetContentItemIdAsync(workflowContext))
+            ?? throw new InvalidOperationException($"The '{nameof(RetrieveContentTask)}' failed to evaluate the 'ContentItemId'.");
 
-            if (string.IsNullOrEmpty(workflowContext.CorrelationId))
-            {
-                workflowContext.CorrelationId = contentItem.ContentItemId;
-            }
-            
-            workflowContext.Properties[ContentEventConstants.ContentItemInputKey] = contentItem;
-            workflowContext.LastResult = contentItem;
+        var contentItem = (await ContentManager.GetAsync(contentItemId, VersionOptions.Latest))
+            ?? throw new InvalidOperationException($"The '{nameof(RetrieveContentTask)}' failed to retrieve the content item.");
 
-            return Outcomes("Retrieved");
+        if (string.IsNullOrEmpty(workflowContext.CorrelationId))
+        {
+            workflowContext.CorrelationId = contentItem.ContentItemId;
         }
+
+        workflowContext.Properties[ContentEventConstants.ContentItemInputKey] = contentItem;
+        workflowContext.LastResult = contentItem;
+
+        return Outcomes("Retrieved");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/UnpublishContentTask.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/UnpublishContentTask.cs
index a74c535cb18..4c22e657d23 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/UnpublishContentTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/UnpublishContentTask.cs
@@ -8,59 +8,58 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Contents.Workflows.Activities
+namespace OrchardCore.Contents.Workflows.Activities;
+
+public class UnpublishContentTask : ContentTask
 {
-    public class UnpublishContentTask : ContentTask
+    public UnpublishContentTask(
+        IContentManager contentManager,
+        IWorkflowScriptEvaluator scriptEvaluator,
+        IStringLocalizer<UnpublishContentTask> localizer)
+        : base(contentManager, scriptEvaluator, localizer)
     {
-        public UnpublishContentTask(
-            IContentManager contentManager,
-            IWorkflowScriptEvaluator scriptEvaluator,
-            IStringLocalizer<UnpublishContentTask> localizer)
-            : base(contentManager, scriptEvaluator, localizer)
-        {
-        }
+    }
 
-        public override string Name => nameof(UnpublishContentTask);
+    public override string Name => nameof(UnpublishContentTask);
 
-        public override LocalizedString DisplayText => S["Unpublish Content Task"];
+    public override LocalizedString DisplayText => S["Unpublish Content Task"];
 
-        public override LocalizedString Category => S["Content"];
+    public override LocalizedString Category => S["Content"];
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Unpublished"], S["Noop"]);
+    }
+
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var content = (await GetContentAsync(workflowContext))
+            ?? throw new InvalidOperationException($"The '{nameof(UnpublishContentTask)}' failed to retrieve the content item.");
+
+        if (string.Equals(InlineEvent.ContentItemId, content.ContentItem.ContentItemId, StringComparison.OrdinalIgnoreCase))
         {
-            return Outcomes(S["Unpublished"], S["Noop"]);
+            return Outcomes("Noop");
         }
 
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var content = (await GetContentAsync(workflowContext))
-                ?? throw new InvalidOperationException($"The '{nameof(UnpublishContentTask)}' failed to retrieve the content item.");
+        var contentItem = await ContentManager.GetAsync(content.ContentItem.ContentItemId, VersionOptions.Latest);
 
-            if (string.Equals(InlineEvent.ContentItemId, content.ContentItem.ContentItemId, StringComparison.OrdinalIgnoreCase))
+        if (contentItem == null)
+        {
+            if (content is ContentItemIdExpressionResult)
             {
-                return Outcomes("Noop");
+                throw new InvalidOperationException($"The '{nameof(UnpublishContentTask)}' failed to retrieve the content item.");
             }
 
-            var contentItem = await ContentManager.GetAsync(content.ContentItem.ContentItemId, VersionOptions.Latest);
-
-            if (contentItem == null)
-            {
-                if (content is ContentItemIdExpressionResult)
-                {
-                    throw new InvalidOperationException($"The '{nameof(UnpublishContentTask)}' failed to retrieve the content item.");
-                }
-
-                contentItem = content.ContentItem;
-            }
+            contentItem = content.ContentItem;
+        }
 
-            if (InlineEvent.IsStart && InlineEvent.ContentType == contentItem.ContentType && InlineEvent.Name == nameof(ContentUnpublishedEvent))
-            {
-                throw new InvalidOperationException($"The '{nameof(UnpublishContentTask)}' can't unpublish the content item as it is executed inline from a starting '{nameof(ContentUnpublishedEvent)}' of the same content type, which would result in an infinitive loop.");
-            }
+        if (InlineEvent.IsStart && InlineEvent.ContentType == contentItem.ContentType && InlineEvent.Name == nameof(ContentUnpublishedEvent))
+        {
+            throw new InvalidOperationException($"The '{nameof(UnpublishContentTask)}' can't unpublish the content item as it is executed inline from a starting '{nameof(ContentUnpublishedEvent)}' of the same content type, which would result in an infinitive loop.");
+        }
 
-            await ContentManager.UnpublishAsync(contentItem);
+        await ContentManager.UnpublishAsync(contentItem);
 
-            return Outcomes("Unpublished");
-        }
+        return Outcomes("Unpublished");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/UpdateContentTask.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/UpdateContentTask.cs
index 8190b52a9d8..13292c1fdaf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/UpdateContentTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/UpdateContentTask.cs
@@ -15,163 +15,162 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Contents.Workflows.Activities
+namespace OrchardCore.Contents.Workflows.Activities;
+
+public class UpdateContentTask : ContentTask
 {
-    public class UpdateContentTask : ContentTask
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
+    private readonly JavaScriptEncoder _javaScriptEncoder;
+
+    public UpdateContentTask(
+        IContentManager contentManager,
+        IUpdateModelAccessor updateModelAccessor,
+        IWorkflowExpressionEvaluator expressionEvaluator,
+        IWorkflowScriptEvaluator scriptEvaluator,
+        IStringLocalizer<UpdateContentTask> localizer,
+        JavaScriptEncoder javaScriptEncoder)
+        : base(contentManager, scriptEvaluator, localizer)
     {
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
-        private readonly JavaScriptEncoder _javaScriptEncoder;
-
-        public UpdateContentTask(
-            IContentManager contentManager,
-            IUpdateModelAccessor updateModelAccessor,
-            IWorkflowExpressionEvaluator expressionEvaluator,
-            IWorkflowScriptEvaluator scriptEvaluator,
-            IStringLocalizer<UpdateContentTask> localizer,
-            JavaScriptEncoder javaScriptEncoder)
-            : base(contentManager, scriptEvaluator, localizer)
-        {
-            _updateModelAccessor = updateModelAccessor;
-            _expressionEvaluator = expressionEvaluator;
-            _javaScriptEncoder = javaScriptEncoder;
-        }
+        _updateModelAccessor = updateModelAccessor;
+        _expressionEvaluator = expressionEvaluator;
+        _javaScriptEncoder = javaScriptEncoder;
+    }
 
-        public override string Name => nameof(UpdateContentTask);
+    public override string Name => nameof(UpdateContentTask);
 
-        public override LocalizedString Category => S["Content"];
+    public override LocalizedString Category => S["Content"];
 
-        public override LocalizedString DisplayText => S["Update Content Task"];
+    public override LocalizedString DisplayText => S["Update Content Task"];
 
-        public bool Publish
-        {
-            get => GetProperty<bool>();
-            set => SetProperty(value);
-        }
+    public bool Publish
+    {
+        get => GetProperty<bool>();
+        set => SetProperty(value);
+    }
 
-        public WorkflowExpression<string> ContentItemIdExpression
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
+    public WorkflowExpression<string> ContentItemIdExpression
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        public WorkflowExpression<string> ContentProperties
-        {
-            get => GetProperty(() =>
-                // new WorkflowExpression<string>(JsonConvert.SerializeObject(new { DisplayText = S["Enter a title"].Value }, Formatting.Indented)));
-                new WorkflowExpression<string>(JConvert.SerializeObject(new { DisplayText = S["Enter a title"].Value })));
+    public WorkflowExpression<string> ContentProperties
+    {
+        get => GetProperty(() =>
+            // new WorkflowExpression<string>(JsonConvert.SerializeObject(new { DisplayText = S["Enter a title"].Value }, Formatting.Indented)));
+            new WorkflowExpression<string>(JConvert.SerializeObject(new { DisplayText = S["Enter a title"].Value })));
 
 
-            set => SetProperty(value);
-        }
+        set => SetProperty(value);
+    }
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"], S["Failed"]);
-        }
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"], S["Failed"]);
+    }
 
-        public async override Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var contentItemId = (await GetContentItemIdAsync(workflowContext))
-                ?? throw new InvalidOperationException($"The {nameof(UpdateContentTask)} failed to evaluate the 'ContentItemId'.");
+    public async override Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var contentItemId = (await GetContentItemIdAsync(workflowContext))
+            ?? throw new InvalidOperationException($"The {nameof(UpdateContentTask)} failed to evaluate the 'ContentItemId'.");
 
-            var inlineEventOfSameContentItemId = string.Equals(InlineEvent.ContentItemId, contentItemId, StringComparison.OrdinalIgnoreCase);
+        var inlineEventOfSameContentItemId = string.Equals(InlineEvent.ContentItemId, contentItemId, StringComparison.OrdinalIgnoreCase);
 
-            if (inlineEventOfSameContentItemId)
+        if (inlineEventOfSameContentItemId)
+        {
+            if (InlineEvent.Name == nameof(ContentPublishedEvent))
             {
-                if (InlineEvent.Name == nameof(ContentPublishedEvent))
-                {
-                    throw new InvalidOperationException($"The '{nameof(UpdateContentTask)}' can't update the content item as it is executed inline from a '{nameof(ContentPublishedEvent)}' of the same content item, please use an event that is triggered earlier.");
-                }
-
-                if (InlineEvent.Name == nameof(ContentDraftSavedEvent))
-                {
-                    throw new InvalidOperationException($"The '{nameof(UpdateContentTask)}' can't update the content item as it is executed inline from a '{nameof(ContentDraftSavedEvent)}' of the same content item, please use an event that is triggered earlier.");
-                }
+                throw new InvalidOperationException($"The '{nameof(UpdateContentTask)}' can't update the content item as it is executed inline from a '{nameof(ContentPublishedEvent)}' of the same content item, please use an event that is triggered earlier.");
             }
 
-            ContentItem contentItem = null;
-
-            if (!inlineEventOfSameContentItemId)
+            if (InlineEvent.Name == nameof(ContentDraftSavedEvent))
             {
-                contentItem = await ContentManager.GetAsync(contentItemId, VersionOptions.DraftRequired);
-            }
-            else
-            {
-                contentItem = workflowContext.Input.GetValue<IContent>(ContentEventConstants.ContentItemInputKey)?.ContentItem;
+                throw new InvalidOperationException($"The '{nameof(UpdateContentTask)}' can't update the content item as it is executed inline from a '{nameof(ContentDraftSavedEvent)}' of the same content item, please use an event that is triggered earlier.");
             }
+        }
 
-            if (contentItem == null)
-            {
-                throw new InvalidOperationException($"The '{nameof(UpdateContentTask)}' failed to retrieve the content item.");
-            }
+        ContentItem contentItem = null;
 
-            if (!inlineEventOfSameContentItemId && InlineEvent.IsStart && InlineEvent.ContentType == contentItem.ContentType)
-            {
-                if (InlineEvent.Name == nameof(ContentUpdatedEvent))
-                {
-                    throw new InvalidOperationException($"The '{nameof(UpdateContentTask)}' can't update the content item as it is executed inline from a starting '{nameof(ContentUpdatedEvent)}' of the same content type, which would result in an infinitive loop.");
-                }
+        if (!inlineEventOfSameContentItemId)
+        {
+            contentItem = await ContentManager.GetAsync(contentItemId, VersionOptions.DraftRequired);
+        }
+        else
+        {
+            contentItem = workflowContext.Input.GetValue<IContent>(ContentEventConstants.ContentItemInputKey)?.ContentItem;
+        }
 
-                if (Publish && InlineEvent.Name == nameof(ContentPublishedEvent))
-                {
-                    throw new InvalidOperationException($"The '{nameof(UpdateContentTask)}' can't publish the content item as it is executed inline from a starting '{nameof(ContentPublishedEvent)}' of the same content type, which would result in an infinitive loop.");
-                }
+        if (contentItem == null)
+        {
+            throw new InvalidOperationException($"The '{nameof(UpdateContentTask)}' failed to retrieve the content item.");
+        }
 
-                if (!Publish && InlineEvent.Name == nameof(ContentDraftSavedEvent))
-                {
-                    throw new InvalidOperationException($"The '{nameof(UpdateContentTask)}' can't update the content item as it is executed inline from a starting '{nameof(ContentDraftSavedEvent)}' of the same content type, which would result in an infinitive loop.");
-                }
+        if (!inlineEventOfSameContentItemId && InlineEvent.IsStart && InlineEvent.ContentType == contentItem.ContentType)
+        {
+            if (InlineEvent.Name == nameof(ContentUpdatedEvent))
+            {
+                throw new InvalidOperationException($"The '{nameof(UpdateContentTask)}' can't update the content item as it is executed inline from a starting '{nameof(ContentUpdatedEvent)}' of the same content type, which would result in an infinitive loop.");
             }
 
-            if (!string.IsNullOrWhiteSpace(ContentProperties.Expression))
+            if (Publish && InlineEvent.Name == nameof(ContentPublishedEvent))
             {
-                var contentProperties = await _expressionEvaluator.EvaluateAsync(ContentProperties, workflowContext, _javaScriptEncoder);
-                contentItem.Merge(JsonNode.Parse(contentProperties), new JsonMergeSettings { MergeArrayHandling = MergeArrayHandling.Replace });
+                throw new InvalidOperationException($"The '{nameof(UpdateContentTask)}' can't publish the content item as it is executed inline from a starting '{nameof(ContentPublishedEvent)}' of the same content type, which would result in an infinitive loop.");
             }
 
-            if (!inlineEventOfSameContentItemId)
+            if (!Publish && InlineEvent.Name == nameof(ContentDraftSavedEvent))
             {
-                await ContentManager.UpdateAsync(contentItem);
+                throw new InvalidOperationException($"The '{nameof(UpdateContentTask)}' can't update the content item as it is executed inline from a starting '{nameof(ContentDraftSavedEvent)}' of the same content type, which would result in an infinitive loop.");
             }
+        }
 
-            var result = await ContentManager.ValidateAsync(contentItem);
+        if (!string.IsNullOrWhiteSpace(ContentProperties.Expression))
+        {
+            var contentProperties = await _expressionEvaluator.EvaluateAsync(ContentProperties, workflowContext, _javaScriptEncoder);
+            contentItem.Merge(JsonNode.Parse(contentProperties), new JsonMergeSettings { MergeArrayHandling = MergeArrayHandling.Replace });
+        }
 
-            if (result.Succeeded)
+        if (!inlineEventOfSameContentItemId)
+        {
+            await ContentManager.UpdateAsync(contentItem);
+        }
+
+        var result = await ContentManager.ValidateAsync(contentItem);
+
+        if (result.Succeeded)
+        {
+            if (!inlineEventOfSameContentItemId)
             {
-                if (!inlineEventOfSameContentItemId)
+                if (Publish)
                 {
-                    if (Publish)
-                    {
-                        await ContentManager.PublishAsync(contentItem);
-                    }
-                    else
-                    {
-                        await ContentManager.SaveDraftAsync(contentItem);
-                    }
+                    await ContentManager.PublishAsync(contentItem);
                 }
-
-                if (string.IsNullOrEmpty(workflowContext.CorrelationId))
+                else
                 {
-                    workflowContext.CorrelationId = contentItem.ContentItemId;
+                    await ContentManager.SaveDraftAsync(contentItem);
                 }
-
-                workflowContext.Properties[ContentEventConstants.ContentItemInputKey] = contentItem;
-                workflowContext.LastResult = contentItem;
-
-                return Outcomes("Done");
             }
 
-            if (inlineEventOfSameContentItemId)
+            if (string.IsNullOrEmpty(workflowContext.CorrelationId))
             {
-                _updateModelAccessor.ModelUpdater.ModelState.AddModelError(nameof(UpdateContentTask),
-                    $"The '{workflowContext.WorkflowType.Name}:{nameof(UpdateContentTask)}' failed to update the content item: "
-                    + string.Join(", ", result.Errors));
+                workflowContext.CorrelationId = contentItem.ContentItemId;
             }
 
-            workflowContext.LastResult = result;
+            workflowContext.Properties[ContentEventConstants.ContentItemInputKey] = contentItem;
+            workflowContext.LastResult = contentItem;
+
+            return Outcomes("Done");
+        }
 
-            return Outcomes("Failed");
+        if (inlineEventOfSameContentItemId)
+        {
+            _updateModelAccessor.ModelUpdater.ModelState.AddModelError(nameof(UpdateContentTask),
+                $"The '{workflowContext.WorkflowType.Name}:{nameof(UpdateContentTask)}' failed to update the content item: "
+                + string.Join(", ", result.Errors));
         }
+
+        workflowContext.LastResult = result;
+
+        return Outcomes("Failed");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentCreatedEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentCreatedEventDisplayDriver.cs
index 933f658ed90..1b9108d8555 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentCreatedEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentCreatedEventDisplayDriver.cs
@@ -2,13 +2,12 @@
 using OrchardCore.Contents.Workflows.Activities;
 using OrchardCore.Contents.Workflows.ViewModels;
 
-namespace OrchardCore.Contents.Workflows.Drivers
+namespace OrchardCore.Contents.Workflows.Drivers;
+
+public sealed class ContentCreatedEventDisplayDriver : ContentEventDisplayDriver<ContentCreatedEvent, ContentCreatedEventViewModel>
 {
-    public sealed class ContentCreatedEventDisplayDriver : ContentEventDisplayDriver<ContentCreatedEvent, ContentCreatedEventViewModel>
+    public ContentCreatedEventDisplayDriver(IContentDefinitionManager contentDefinitionManager)
+        : base(contentDefinitionManager)
     {
-        public ContentCreatedEventDisplayDriver(IContentDefinitionManager contentDefinitionManager)
-            : base(contentDefinitionManager)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentDeletedEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentDeletedEventDisplayDriver.cs
index 933b9e96e8d..a64f73759bf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentDeletedEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentDeletedEventDisplayDriver.cs
@@ -2,13 +2,12 @@
 using OrchardCore.Contents.Workflows.Activities;
 using OrchardCore.Contents.Workflows.ViewModels;
 
-namespace OrchardCore.Contents.Workflows.Drivers
+namespace OrchardCore.Contents.Workflows.Drivers;
+
+public sealed class ContentDeletedEventDisplayDriver : ContentEventDisplayDriver<ContentDeletedEvent, ContentDeletedEventViewModel>
 {
-    public sealed class ContentDeletedEventDisplayDriver : ContentEventDisplayDriver<ContentDeletedEvent, ContentDeletedEventViewModel>
+    public ContentDeletedEventDisplayDriver(IContentDefinitionManager contentDefinitionManager)
+        : base(contentDefinitionManager)
     {
-        public ContentDeletedEventDisplayDriver(IContentDefinitionManager contentDefinitionManager)
-            : base(contentDefinitionManager)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentDraftSavedEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentDraftSavedEventDisplayDriver.cs
index 5075484ddb5..ea5a9995ee7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentDraftSavedEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentDraftSavedEventDisplayDriver.cs
@@ -2,13 +2,12 @@
 using OrchardCore.Contents.Workflows.Activities;
 using OrchardCore.Contents.Workflows.ViewModels;
 
-namespace OrchardCore.Contents.Workflows.Drivers
+namespace OrchardCore.Contents.Workflows.Drivers;
+
+public sealed class ContentDraftSavedEventDisplayDriver : ContentEventDisplayDriver<ContentDraftSavedEvent, ContentDraftSavedEventViewModel>
 {
-    public sealed class ContentDraftSavedEventDisplayDriver : ContentEventDisplayDriver<ContentDraftSavedEvent, ContentDraftSavedEventViewModel>
+    public ContentDraftSavedEventDisplayDriver(IContentDefinitionManager contentDefinitionManager)
+        : base(contentDefinitionManager)
     {
-        public ContentDraftSavedEventDisplayDriver(IContentDefinitionManager contentDefinitionManager)
-            : base(contentDefinitionManager)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentEventDisplayDriver.cs
index 4a66d78a9be..7e1eac82432 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentEventDisplayDriver.cs
@@ -8,57 +8,56 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Workflows.Display;
 
-namespace OrchardCore.Contents.Workflows.Drivers
+namespace OrchardCore.Contents.Workflows.Drivers;
+
+public abstract class ContentEventDisplayDriver<TActivity, TViewModel> : ActivityDisplayDriver<TActivity, TViewModel> where TActivity : ContentEvent where TViewModel : ContentEventViewModel<TActivity>, new()
 {
-    public abstract class ContentEventDisplayDriver<TActivity, TViewModel> : ActivityDisplayDriver<TActivity, TViewModel> where TActivity : ContentEvent where TViewModel : ContentEventViewModel<TActivity>, new()
+    protected ContentEventDisplayDriver(IContentDefinitionManager contentDefinitionManager)
     {
-        protected ContentEventDisplayDriver(IContentDefinitionManager contentDefinitionManager)
-        {
-            ContentDefinitionManager = contentDefinitionManager;
-        }
+        ContentDefinitionManager = contentDefinitionManager;
+    }
 
-        protected IContentDefinitionManager ContentDefinitionManager { get; }
+    protected IContentDefinitionManager ContentDefinitionManager { get; }
 
-        protected override void EditActivity(TActivity source, TViewModel target)
-        {
-            target.SelectedContentTypeNames = source.ContentTypeFilter;
-        }
+    protected override void EditActivity(TActivity source, TViewModel target)
+    {
+        target.SelectedContentTypeNames = source.ContentTypeFilter;
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(TActivity model, UpdateEditorContext context)
-        {
-            var viewModel = new TViewModel();
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix, x => x.SelectedContentTypeNames);
+    public override async Task<IDisplayResult> UpdateAsync(TActivity model, UpdateEditorContext context)
+    {
+        var viewModel = new TViewModel();
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix, x => x.SelectedContentTypeNames);
 
-            model.ContentTypeFilter = (await FilterContentTypesQueryAsync(viewModel.SelectedContentTypeNames)).ToArray();
+        model.ContentTypeFilter = (await FilterContentTypesQueryAsync(viewModel.SelectedContentTypeNames)).ToArray();
 
-            return await EditAsync(model, context);
-        }
+        return await EditAsync(model, context);
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(TActivity activity, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                Shape($"{typeof(TActivity).Name}_Fields_Thumbnail", new ContentEventViewModel<TActivity>(activity)).Location("Thumbnail", "Content"),
-                Factory($"{typeof(TActivity).Name}_Fields_Design", async ctx =>
+    public override Task<IDisplayResult> DisplayAsync(TActivity activity, BuildDisplayContext context)
+    {
+        return CombineAsync(
+            Shape($"{typeof(TActivity).Name}_Fields_Thumbnail", new ContentEventViewModel<TActivity>(activity)).Location("Thumbnail", "Content"),
+            Factory($"{typeof(TActivity).Name}_Fields_Design", async ctx =>
+            {
+                var contentTypeDefinitions = (await ContentDefinitionManager.ListTypeDefinitionsAsync()).ToDictionary(x => x.Name);
+                var selectedContentTypeDefinitions = activity.ContentTypeFilter.Select(x => contentTypeDefinitions[x]).ToList();
+
+                var shape = new ContentEventViewModel<TActivity>
                 {
-                    var contentTypeDefinitions = (await ContentDefinitionManager.ListTypeDefinitionsAsync()).ToDictionary(x => x.Name);
-                    var selectedContentTypeDefinitions = activity.ContentTypeFilter.Select(x => contentTypeDefinitions[x]).ToList();
-
-                    var shape = new ContentEventViewModel<TActivity>
-                    {
-                        ContentTypeFilter = selectedContentTypeDefinitions,
-                        Activity = activity,
-                    };
+                    ContentTypeFilter = selectedContentTypeDefinitions,
+                    Activity = activity,
+                };
 
-                    return shape;
-                }).Location("Design", "Content")
-            );
-        }
+                return shape;
+            }).Location("Design", "Content")
+        );
+    }
 
-        protected async Task<IEnumerable<string>> FilterContentTypesQueryAsync(IEnumerable<string> contentTypeNames)
-        {
-            var contentTypeDefinitions = (await ContentDefinitionManager.ListTypeDefinitionsAsync()).ToDictionary(x => x.Name);
+    protected async Task<IEnumerable<string>> FilterContentTypesQueryAsync(IEnumerable<string> contentTypeNames)
+    {
+        var contentTypeDefinitions = (await ContentDefinitionManager.ListTypeDefinitionsAsync()).ToDictionary(x => x.Name);
 
-            return contentTypeNames.Where(x => !string.IsNullOrWhiteSpace(x) && contentTypeDefinitions.ContainsKey(x));
-        }
+        return contentTypeNames.Where(x => !string.IsNullOrWhiteSpace(x) && contentTypeDefinitions.ContainsKey(x));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentPublishedEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentPublishedEventDisplayDriver.cs
index badc5d8ecdc..58d31d59044 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentPublishedEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentPublishedEventDisplayDriver.cs
@@ -2,13 +2,12 @@
 using OrchardCore.Contents.Workflows.Activities;
 using OrchardCore.Contents.Workflows.ViewModels;
 
-namespace OrchardCore.Contents.Workflows.Drivers
+namespace OrchardCore.Contents.Workflows.Drivers;
+
+public sealed class ContentPublishedEventDisplayDriver : ContentEventDisplayDriver<ContentPublishedEvent, ContentPublishedEventViewModel>
 {
-    public sealed class ContentPublishedEventDisplayDriver : ContentEventDisplayDriver<ContentPublishedEvent, ContentPublishedEventViewModel>
+    public ContentPublishedEventDisplayDriver(IContentDefinitionManager contentDefinitionManager)
+        : base(contentDefinitionManager)
     {
-        public ContentPublishedEventDisplayDriver(IContentDefinitionManager contentDefinitionManager)
-            : base(contentDefinitionManager)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentTaskDisplayDriver.cs
index 77f47867e41..69ecc25b340 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentTaskDisplayDriver.cs
@@ -5,16 +5,15 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Workflows.Display;
 
-namespace OrchardCore.Contents.Workflows.Drivers
+namespace OrchardCore.Contents.Workflows.Drivers;
+
+public abstract class ContentTaskDisplayDriver<TActivity, TViewModel> : ActivityDisplayDriver<TActivity, TViewModel> where TActivity : ContentTask where TViewModel : ContentTaskViewModel<TActivity>, new()
 {
-    public abstract class ContentTaskDisplayDriver<TActivity, TViewModel> : ActivityDisplayDriver<TActivity, TViewModel> where TActivity : ContentTask where TViewModel : ContentTaskViewModel<TActivity>, new()
+    public override Task<IDisplayResult> DisplayAsync(TActivity activity, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(TActivity activity, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                Shape($"{typeof(TActivity).Name}_Fields_Thumbnail", new ContentTaskViewModel<TActivity>(activity)).Location("Thumbnail", "Content"),
-                Shape($"{typeof(TActivity).Name}_Fields_Design", new ContentTaskViewModel<TActivity>(activity)).Location("Design", "Content")
-            );
-        }
+        return CombineAsync(
+            Shape($"{typeof(TActivity).Name}_Fields_Thumbnail", new ContentTaskViewModel<TActivity>(activity)).Location("Thumbnail", "Content"),
+            Shape($"{typeof(TActivity).Name}_Fields_Design", new ContentTaskViewModel<TActivity>(activity)).Location("Design", "Content")
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentUnpublishedEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentUnpublishedEventDisplayDriver.cs
index 88e6d69b71b..1861010774b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentUnpublishedEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentUnpublishedEventDisplayDriver.cs
@@ -2,13 +2,12 @@
 using OrchardCore.Contents.Workflows.Activities;
 using OrchardCore.Contents.Workflows.ViewModels;
 
-namespace OrchardCore.Contents.Workflows.Drivers
+namespace OrchardCore.Contents.Workflows.Drivers;
+
+public sealed class ContentUnpublishedEventDisplayDriver : ContentEventDisplayDriver<ContentUnpublishedEvent, ContentUnpublishedEventViewModel>
 {
-    public sealed class ContentUnpublishedEventDisplayDriver : ContentEventDisplayDriver<ContentUnpublishedEvent, ContentUnpublishedEventViewModel>
+    public ContentUnpublishedEventDisplayDriver(IContentDefinitionManager contentDefinitionManager)
+        : base(contentDefinitionManager)
     {
-        public ContentUnpublishedEventDisplayDriver(IContentDefinitionManager contentDefinitionManager)
-            : base(contentDefinitionManager)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentUpdatedEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentUpdatedEventDisplayDriver.cs
index c37dddf3af6..14903691137 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentUpdatedEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentUpdatedEventDisplayDriver.cs
@@ -2,13 +2,12 @@
 using OrchardCore.Contents.Workflows.Activities;
 using OrchardCore.Contents.Workflows.ViewModels;
 
-namespace OrchardCore.Contents.Workflows.Drivers
+namespace OrchardCore.Contents.Workflows.Drivers;
+
+public sealed class ContentUpdatedEventDisplayDriver : ContentEventDisplayDriver<ContentUpdatedEvent, ContentUpdatedEventViewModel>
 {
-    public sealed class ContentUpdatedEventDisplayDriver : ContentEventDisplayDriver<ContentUpdatedEvent, ContentUpdatedEventViewModel>
+    public ContentUpdatedEventDisplayDriver(IContentDefinitionManager contentDefinitionManager)
+        : base(contentDefinitionManager)
     {
-        public ContentUpdatedEventDisplayDriver(IContentDefinitionManager contentDefinitionManager)
-            : base(contentDefinitionManager)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentVersionedEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentVersionedEventDisplayDriver.cs
index 7eadd4f8b70..f87a3c5f4df 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentVersionedEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentVersionedEventDisplayDriver.cs
@@ -2,13 +2,12 @@
 using OrchardCore.Contents.Workflows.Activities;
 using OrchardCore.Contents.Workflows.ViewModels;
 
-namespace OrchardCore.Contents.Workflows.Drivers
+namespace OrchardCore.Contents.Workflows.Drivers;
+
+public sealed class ContentVersionedEventDisplayDriver : ContentEventDisplayDriver<ContentVersionedEvent, ContentVersionedEventViewModel>
 {
-    public sealed class ContentVersionedEventDisplayDriver : ContentEventDisplayDriver<ContentVersionedEvent, ContentVersionedEventViewModel>
+    public ContentVersionedEventDisplayDriver(IContentDefinitionManager contentDefinitionManager)
+        : base(contentDefinitionManager)
     {
-        public ContentVersionedEventDisplayDriver(IContentDefinitionManager contentDefinitionManager)
-            : base(contentDefinitionManager)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/CreateContentTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/CreateContentTaskDisplayDriver.cs
index f34275d86d4..2c96bce4cd8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/CreateContentTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/CreateContentTaskDisplayDriver.cs
@@ -6,33 +6,32 @@
 using OrchardCore.Contents.Workflows.ViewModels;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Contents.Workflows.Drivers
+namespace OrchardCore.Contents.Workflows.Drivers;
+
+public sealed class CreateContentTaskDisplayDriver : ContentTaskDisplayDriver<CreateContentTask, CreateContentTaskViewModel>
 {
-    public sealed class CreateContentTaskDisplayDriver : ContentTaskDisplayDriver<CreateContentTask, CreateContentTaskViewModel>
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        public CreateContentTaskDisplayDriver(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public CreateContentTaskDisplayDriver(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        protected override async ValueTask EditActivityAsync(CreateContentTask activity, CreateContentTaskViewModel model)
-        {
-            model.AvailableContentTypes = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
-                .Select(x => new SelectListItem { Text = x.DisplayName, Value = x.Name })
-                .ToList();
+    protected override async ValueTask EditActivityAsync(CreateContentTask activity, CreateContentTaskViewModel model)
+    {
+        model.AvailableContentTypes = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
+            .Select(x => new SelectListItem { Text = x.DisplayName, Value = x.Name })
+            .ToList();
 
-            model.ContentType = activity.ContentType;
-            model.Publish = activity.Publish;
-            model.ContentProperties = activity.ContentProperties.Expression;
-        }
+        model.ContentType = activity.ContentType;
+        model.Publish = activity.Publish;
+        model.ContentProperties = activity.ContentProperties.Expression;
+    }
 
-        protected override void UpdateActivity(CreateContentTaskViewModel model, CreateContentTask activity)
-        {
-            activity.ContentType = model.ContentType;
-            activity.Publish = model.Publish;
-            activity.ContentProperties = new WorkflowExpression<string>(model.ContentProperties);
-        }
+    protected override void UpdateActivity(CreateContentTaskViewModel model, CreateContentTask activity)
+    {
+        activity.ContentType = model.ContentType;
+        activity.Publish = model.Publish;
+        activity.ContentProperties = new WorkflowExpression<string>(model.ContentProperties);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/DeleteContentTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/DeleteContentTaskDisplayDriver.cs
index 0e8d678413f..77258c12570 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/DeleteContentTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/DeleteContentTaskDisplayDriver.cs
@@ -3,18 +3,17 @@
 using OrchardCore.Contents.Workflows.ViewModels;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Contents.Workflows.Drivers
+namespace OrchardCore.Contents.Workflows.Drivers;
+
+public sealed class DeleteContentTaskDisplayDriver : ContentTaskDisplayDriver<DeleteContentTask, DeleteContentTaskViewModel>
 {
-    public sealed class DeleteContentTaskDisplayDriver : ContentTaskDisplayDriver<DeleteContentTask, DeleteContentTaskViewModel>
+    protected override void EditActivity(DeleteContentTask activity, DeleteContentTaskViewModel model)
     {
-        protected override void EditActivity(DeleteContentTask activity, DeleteContentTaskViewModel model)
-        {
-            model.Expression = activity.Content.Expression;
-        }
+        model.Expression = activity.Content.Expression;
+    }
 
-        protected override void UpdateActivity(DeleteContentTaskViewModel model, DeleteContentTask activity)
-        {
-            activity.Content = new WorkflowExpression<IContent>(model.Expression);
-        }
+    protected override void UpdateActivity(DeleteContentTaskViewModel model, DeleteContentTask activity)
+    {
+        activity.Content = new WorkflowExpression<IContent>(model.Expression);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/PublishContentTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/PublishContentTaskDisplayDriver.cs
index 8b07fab5c28..3bc4d9b7174 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/PublishContentTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/PublishContentTaskDisplayDriver.cs
@@ -3,18 +3,17 @@
 using OrchardCore.Contents.Workflows.ViewModels;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Contents.Workflows.Drivers
+namespace OrchardCore.Contents.Workflows.Drivers;
+
+public sealed class PublishContentTaskDisplayDriver : ContentTaskDisplayDriver<PublishContentTask, PublishContentTaskViewModel>
 {
-    public sealed class PublishContentTaskDisplayDriver : ContentTaskDisplayDriver<PublishContentTask, PublishContentTaskViewModel>
+    protected override void EditActivity(PublishContentTask activity, PublishContentTaskViewModel model)
     {
-        protected override void EditActivity(PublishContentTask activity, PublishContentTaskViewModel model)
-        {
-            model.Expression = activity.Content.Expression;
-        }
+        model.Expression = activity.Content.Expression;
+    }
 
-        protected override void UpdateActivity(PublishContentTaskViewModel model, PublishContentTask activity)
-        {
-            activity.Content = new WorkflowExpression<IContent>(model.Expression);
-        }
+    protected override void UpdateActivity(PublishContentTaskViewModel model, PublishContentTask activity)
+    {
+        activity.Content = new WorkflowExpression<IContent>(model.Expression);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/RetrieveContentTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/RetrieveContentTaskDisplayDriver.cs
index 778debd55fe..b19fe01c5df 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/RetrieveContentTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/RetrieveContentTaskDisplayDriver.cs
@@ -3,18 +3,17 @@
 using OrchardCore.Contents.Workflows.ViewModels;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Contents.Workflows.Drivers
+namespace OrchardCore.Contents.Workflows.Drivers;
+
+public sealed class RetrieveContentTaskDisplayDriver : ContentTaskDisplayDriver<RetrieveContentTask, RetrieveContentTaskViewModel>
 {
-    public sealed class RetrieveContentTaskDisplayDriver : ContentTaskDisplayDriver<RetrieveContentTask, RetrieveContentTaskViewModel>
+    protected override void EditActivity(RetrieveContentTask activity, RetrieveContentTaskViewModel model)
     {
-        protected override void EditActivity(RetrieveContentTask activity, RetrieveContentTaskViewModel model)
-        {
-            model.ContentItemId = activity.Content.Expression;
-        }
+        model.ContentItemId = activity.Content.Expression;
+    }
 
-        protected override void UpdateActivity(RetrieveContentTaskViewModel model, RetrieveContentTask activity)
-        {
-            activity.Content = new WorkflowExpression<IContent>(model.ContentItemId);
-        }
+    protected override void UpdateActivity(RetrieveContentTaskViewModel model, RetrieveContentTask activity)
+    {
+        activity.Content = new WorkflowExpression<IContent>(model.ContentItemId);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/UnpublishContentTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/UnpublishContentTaskDisplayDriver.cs
index 76ff135f1ce..a1de0090bff 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/UnpublishContentTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/UnpublishContentTaskDisplayDriver.cs
@@ -3,18 +3,17 @@
 using OrchardCore.Contents.Workflows.ViewModels;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Contents.Workflows.Drivers
+namespace OrchardCore.Contents.Workflows.Drivers;
+
+public sealed class UnpublishContentTaskDisplayDriver : ContentTaskDisplayDriver<UnpublishContentTask, UnpublishContentTaskViewModel>
 {
-    public sealed class UnpublishContentTaskDisplayDriver : ContentTaskDisplayDriver<UnpublishContentTask, UnpublishContentTaskViewModel>
+    protected override void EditActivity(UnpublishContentTask activity, UnpublishContentTaskViewModel model)
     {
-        protected override void EditActivity(UnpublishContentTask activity, UnpublishContentTaskViewModel model)
-        {
-            model.Expression = activity.Content.Expression;
-        }
+        model.Expression = activity.Content.Expression;
+    }
 
-        protected override void UpdateActivity(UnpublishContentTaskViewModel model, UnpublishContentTask activity)
-        {
-            activity.Content = new WorkflowExpression<IContent>(model.Expression);
-        }
+    protected override void UpdateActivity(UnpublishContentTaskViewModel model, UnpublishContentTask activity)
+    {
+        activity.Content = new WorkflowExpression<IContent>(model.Expression);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/UpdateContentTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/UpdateContentTaskDisplayDriver.cs
index 538faeac9e6..8996ce4b7d2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/UpdateContentTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/UpdateContentTaskDisplayDriver.cs
@@ -7,33 +7,32 @@
 using OrchardCore.Contents.Workflows.ViewModels;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Contents.Workflows.Drivers
+namespace OrchardCore.Contents.Workflows.Drivers;
+
+public sealed class UpdateContentTaskDisplayDriver : ContentTaskDisplayDriver<UpdateContentTask, UpdateContentTaskViewModel>
 {
-    public sealed class UpdateContentTaskDisplayDriver : ContentTaskDisplayDriver<UpdateContentTask, UpdateContentTaskViewModel>
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        public UpdateContentTaskDisplayDriver(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public UpdateContentTaskDisplayDriver(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        protected override async ValueTask EditActivityAsync(UpdateContentTask activity, UpdateContentTaskViewModel model)
-        {
-            model.AvailableContentTypes = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
-                .Select(x => new SelectListItem { Text = x.DisplayName, Value = x.Name })
-                .ToList();
+    protected override async ValueTask EditActivityAsync(UpdateContentTask activity, UpdateContentTaskViewModel model)
+    {
+        model.AvailableContentTypes = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
+            .Select(x => new SelectListItem { Text = x.DisplayName, Value = x.Name })
+            .ToList();
 
-            model.ContentItemIdExpression = activity.Content.Expression;
-            model.ContentProperties = activity.ContentProperties.Expression;
-            model.Publish = activity.Publish;
-        }
+        model.ContentItemIdExpression = activity.Content.Expression;
+        model.ContentProperties = activity.ContentProperties.Expression;
+        model.Publish = activity.Publish;
+    }
 
-        protected override void UpdateActivity(UpdateContentTaskViewModel model, UpdateContentTask activity)
-        {
-            activity.Content = new WorkflowExpression<IContent>(model.ContentItemIdExpression);
-            activity.ContentProperties = new WorkflowExpression<string>(model.ContentProperties);
-            activity.Publish = model.Publish;
-        }
+    protected override void UpdateActivity(UpdateContentTaskViewModel model, UpdateContentTask activity)
+    {
+        activity.Content = new WorkflowExpression<IContent>(model.ContentItemIdExpression);
+        activity.ContentProperties = new WorkflowExpression<string>(model.ContentProperties);
+        activity.Publish = model.Publish;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Handlers/ContentItemSerializer.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Handlers/ContentItemSerializer.cs
index 19088dd534b..de90eb10f10 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Handlers/ContentItemSerializer.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Handlers/ContentItemSerializer.cs
@@ -3,43 +3,42 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public class ContentItemSerializer : IWorkflowValueSerializer
 {
-    public class ContentItemSerializer : IWorkflowValueSerializer
+    private readonly IContentManager _contentManager;
+
+    public ContentItemSerializer(IContentManager contentManager)
     {
-        private readonly IContentManager _contentManager;
+        _contentManager = contentManager;
+    }
 
-        public ContentItemSerializer(IContentManager contentManager)
+    public async Task DeserializeValueAsync(SerializeWorkflowValueContext context)
+    {
+        if (context.Input is JsonObject jObject)
         {
-            _contentManager = contentManager;
-        }
+            var type = jObject.Value<string>("Type");
 
-        public async Task DeserializeValueAsync(SerializeWorkflowValueContext context)
-        {
-            if (context.Input is JsonObject jObject)
+            if (type == "Content")
             {
-                var type = jObject.Value<string>("Type");
-
-                if (type == "Content")
-                {
-                    var contentId = jObject.Value<string>("ContentId");
-                    context.Output = contentId != null ? await _contentManager.GetAsync(contentId, VersionOptions.Latest) : default(IContent);
-                }
+                var contentId = jObject.Value<string>("ContentId");
+                context.Output = contentId != null ? await _contentManager.GetAsync(contentId, VersionOptions.Latest) : default(IContent);
             }
         }
+    }
 
-        public Task SerializeValueAsync(SerializeWorkflowValueContext context)
+    public Task SerializeValueAsync(SerializeWorkflowValueContext context)
+    {
+        if (context.Input is IContent content)
         {
-            if (context.Input is IContent content)
+            context.Output = JObject.FromObject(new
             {
-                context.Output = JObject.FromObject(new
-                {
-                    Type = "Content",
-                    ContentId = content.ContentItem.ContentItemId
-                });
-            }
-
-            return Task.CompletedTask;
+                Type = "Content",
+                ContentId = content.ContentItem.ContentItemId
+            });
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Handlers/ContentsHandler.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Handlers/ContentsHandler.cs
index 51f1cff6830..c42bc653ecd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Handlers/ContentsHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Handlers/ContentsHandler.cs
@@ -7,69 +7,68 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Contents.Workflows.Handlers
+namespace OrchardCore.Contents.Workflows.Handlers;
+
+public class ContentsHandler : ContentHandlerBase
 {
-    public class ContentsHandler : ContentHandlerBase
+    private readonly IWorkflowManager _workflowManager;
+
+    public ContentsHandler(IWorkflowManager workflowManager)
     {
-        private readonly IWorkflowManager _workflowManager;
+        _workflowManager = workflowManager;
+    }
 
-        public ContentsHandler(IWorkflowManager workflowManager)
-        {
-            _workflowManager = workflowManager;
-        }
+    public override Task CreatedAsync(CreateContentContext context)
+    {
+        return TriggerWorkflowEventAsync(nameof(ContentCreatedEvent), context.ContentItem);
+    }
 
-        public override Task CreatedAsync(CreateContentContext context)
-        {
-            return TriggerWorkflowEventAsync(nameof(ContentCreatedEvent), context.ContentItem);
-        }
+    public override Task UpdatedAsync(UpdateContentContext context)
+    {
+        return TriggerWorkflowEventAsync(nameof(ContentUpdatedEvent), context.ContentItem);
+    }
 
-        public override Task UpdatedAsync(UpdateContentContext context)
-        {
-            return TriggerWorkflowEventAsync(nameof(ContentUpdatedEvent), context.ContentItem);
-        }
+    public override Task DraftSavedAsync(SaveDraftContentContext context)
+    {
+        return TriggerWorkflowEventAsync(nameof(ContentDraftSavedEvent), context.ContentItem);
+    }
 
-        public override Task DraftSavedAsync(SaveDraftContentContext context)
-        {
-            return TriggerWorkflowEventAsync(nameof(ContentDraftSavedEvent), context.ContentItem);
-        }
+    public override Task PublishedAsync(PublishContentContext context)
+    {
+        return TriggerWorkflowEventAsync(nameof(ContentPublishedEvent), context.ContentItem);
+    }
 
-        public override Task PublishedAsync(PublishContentContext context)
-        {
-            return TriggerWorkflowEventAsync(nameof(ContentPublishedEvent), context.ContentItem);
-        }
+    public override Task UnpublishedAsync(PublishContentContext context)
+    {
+        return TriggerWorkflowEventAsync(nameof(ContentUnpublishedEvent), context.ContentItem);
+    }
 
-        public override Task UnpublishedAsync(PublishContentContext context)
-        {
-            return TriggerWorkflowEventAsync(nameof(ContentUnpublishedEvent), context.ContentItem);
-        }
+    public override Task RemovedAsync(RemoveContentContext context)
+    {
+        return TriggerWorkflowEventAsync(nameof(ContentDeletedEvent), context.ContentItem);
+    }
 
-        public override Task RemovedAsync(RemoveContentContext context)
-        {
-            return TriggerWorkflowEventAsync(nameof(ContentDeletedEvent), context.ContentItem);
-        }
+    public override Task VersionedAsync(VersionContentContext context)
+    {
+        return TriggerWorkflowEventAsync(nameof(ContentVersionedEvent), context.ContentItem);
+    }
 
-        public override Task VersionedAsync(VersionContentContext context)
+    private Task<IEnumerable<WorkflowExecutionContext>> TriggerWorkflowEventAsync(string name, ContentItem contentItem)
+    {
+        var contentEvent = new ContentEventContext()
         {
-            return TriggerWorkflowEventAsync(nameof(ContentVersionedEvent), context.ContentItem);
-        }
+            Name = name,
+            ContentType = contentItem.ContentType,
+            ContentItemId = contentItem.ContentItemId,
+            ContentItemVersionId = contentItem.ContentItemVersionId,
+        };
 
-        private Task<IEnumerable<WorkflowExecutionContext>> TriggerWorkflowEventAsync(string name, ContentItem contentItem)
+        var input = new Dictionary<string, object>
         {
-            var contentEvent = new ContentEventContext()
-            {
-                Name = name,
-                ContentType = contentItem.ContentType,
-                ContentItemId = contentItem.ContentItemId,
-                ContentItemVersionId = contentItem.ContentItemVersionId,
-            };
-
-            var input = new Dictionary<string, object>
-            {
-                { ContentEventConstants.ContentItemInputKey, contentItem },
-                { ContentEventConstants.ContentEventInputKey, contentEvent },
-            };
+            { ContentEventConstants.ContentItemInputKey, contentItem },
+            { ContentEventConstants.ContentEventInputKey, contentEvent },
+        };
 
-            return _workflowManager.TriggerEventAsync(name, input, correlationId: contentItem.ContentItemId);
-        }
+        return _workflowManager.TriggerEventAsync(name, input, correlationId: contentItem.ContentItemId);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Startup.cs
index 9a0ae65022a..4bd3a50d67f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Startup.cs
@@ -7,29 +7,28 @@
 using OrchardCore.Workflows.Helpers;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Contents.Workflows
+namespace OrchardCore.Contents.Workflows;
+
+[RequireFeatures("OrchardCore.Workflows")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Workflows")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddActivity<ContentCreatedEvent, ContentCreatedEventDisplayDriver>();
-            services.AddActivity<ContentDeletedEvent, ContentDeletedEventDisplayDriver>();
-            services.AddActivity<ContentPublishedEvent, ContentPublishedEventDisplayDriver>();
-            services.AddActivity<ContentUnpublishedEvent, ContentUnpublishedEventDisplayDriver>();
-            services.AddActivity<ContentUpdatedEvent, ContentUpdatedEventDisplayDriver>();
-            services.AddActivity<ContentDraftSavedEvent, ContentDraftSavedEventDisplayDriver>();
-            services.AddActivity<ContentVersionedEvent, ContentVersionedEventDisplayDriver>();
-            services.AddActivity<DeleteContentTask, DeleteContentTaskDisplayDriver>();
-            services.AddActivity<PublishContentTask, PublishContentTaskDisplayDriver>();
-            services.AddActivity<UnpublishContentTask, UnpublishContentTaskDisplayDriver>();
-            services.AddActivity<CreateContentTask, CreateContentTaskDisplayDriver>();
-            services.AddActivity<RetrieveContentTask, RetrieveContentTaskDisplayDriver>();
-            services.AddActivity<UpdateContentTask, UpdateContentTaskDisplayDriver>();
+        services.AddActivity<ContentCreatedEvent, ContentCreatedEventDisplayDriver>();
+        services.AddActivity<ContentDeletedEvent, ContentDeletedEventDisplayDriver>();
+        services.AddActivity<ContentPublishedEvent, ContentPublishedEventDisplayDriver>();
+        services.AddActivity<ContentUnpublishedEvent, ContentUnpublishedEventDisplayDriver>();
+        services.AddActivity<ContentUpdatedEvent, ContentUpdatedEventDisplayDriver>();
+        services.AddActivity<ContentDraftSavedEvent, ContentDraftSavedEventDisplayDriver>();
+        services.AddActivity<ContentVersionedEvent, ContentVersionedEventDisplayDriver>();
+        services.AddActivity<DeleteContentTask, DeleteContentTaskDisplayDriver>();
+        services.AddActivity<PublishContentTask, PublishContentTaskDisplayDriver>();
+        services.AddActivity<UnpublishContentTask, UnpublishContentTaskDisplayDriver>();
+        services.AddActivity<CreateContentTask, CreateContentTaskDisplayDriver>();
+        services.AddActivity<RetrieveContentTask, RetrieveContentTaskDisplayDriver>();
+        services.AddActivity<UpdateContentTask, UpdateContentTaskDisplayDriver>();
 
-            services.AddScoped<IContentHandler, ContentsHandler>();
-            services.AddScoped<IWorkflowValueSerializer, ContentItemSerializer>();
-        }
+        services.AddScoped<IContentHandler, ContentsHandler>();
+        services.AddScoped<IWorkflowValueSerializer, ContentItemSerializer>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentCreatedEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentCreatedEventViewModel.cs
index a956ba1d36a..ea308ff2f3d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentCreatedEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentCreatedEventViewModel.cs
@@ -1,8 +1,7 @@
 using OrchardCore.Contents.Workflows.Activities;
 
-namespace OrchardCore.Contents.Workflows.ViewModels
+namespace OrchardCore.Contents.Workflows.ViewModels;
+
+public class ContentCreatedEventViewModel : ContentEventViewModel<ContentCreatedEvent>
 {
-    public class ContentCreatedEventViewModel : ContentEventViewModel<ContentCreatedEvent>
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentDeletedEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentDeletedEventViewModel.cs
index bbb5f02173d..c498dd68c61 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentDeletedEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentDeletedEventViewModel.cs
@@ -1,8 +1,7 @@
 using OrchardCore.Contents.Workflows.Activities;
 
-namespace OrchardCore.Contents.Workflows.ViewModels
+namespace OrchardCore.Contents.Workflows.ViewModels;
+
+public class ContentDeletedEventViewModel : ContentEventViewModel<ContentDeletedEvent>
 {
-    public class ContentDeletedEventViewModel : ContentEventViewModel<ContentDeletedEvent>
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentDraftSavedEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentDraftSavedEventViewModel.cs
index 5dee5e7870e..fc11b585e3f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentDraftSavedEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentDraftSavedEventViewModel.cs
@@ -1,8 +1,7 @@
 using OrchardCore.Contents.Workflows.Activities;
 
-namespace OrchardCore.Contents.Workflows.ViewModels
+namespace OrchardCore.Contents.Workflows.ViewModels;
+
+public class ContentDraftSavedEventViewModel : ContentEventViewModel<ContentDraftSavedEvent>
 {
-    public class ContentDraftSavedEventViewModel : ContentEventViewModel<ContentDraftSavedEvent>
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentEventViewModel.cs
index e37774ca6cf..f5832fa29d1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentEventViewModel.cs
@@ -3,20 +3,19 @@
 using OrchardCore.Contents.Workflows.Activities;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Contents.Workflows.ViewModels
+namespace OrchardCore.Contents.Workflows.ViewModels;
+
+public class ContentEventViewModel<T> : ActivityViewModel<T> where T : ContentEvent
 {
-    public class ContentEventViewModel<T> : ActivityViewModel<T> where T : ContentEvent
+    public ContentEventViewModel()
     {
-        public ContentEventViewModel()
-        {
-        }
-
-        public ContentEventViewModel(T activity)
-        {
-            Activity = activity;
-        }
+    }
 
-        public IList<ContentTypeDefinition> ContentTypeFilter { get; set; }
-        public IList<string> SelectedContentTypeNames { get; set; } = [];
+    public ContentEventViewModel(T activity)
+    {
+        Activity = activity;
     }
+
+    public IList<ContentTypeDefinition> ContentTypeFilter { get; set; }
+    public IList<string> SelectedContentTypeNames { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentPublishedEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentPublishedEventViewModel.cs
index b3c557c06f6..f3ee0484977 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentPublishedEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentPublishedEventViewModel.cs
@@ -1,8 +1,7 @@
 using OrchardCore.Contents.Workflows.Activities;
 
-namespace OrchardCore.Contents.Workflows.ViewModels
+namespace OrchardCore.Contents.Workflows.ViewModels;
+
+public class ContentPublishedEventViewModel : ContentEventViewModel<ContentPublishedEvent>
 {
-    public class ContentPublishedEventViewModel : ContentEventViewModel<ContentPublishedEvent>
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentTaskViewModel.cs
index 747fb4fd6ff..7883a0d4105 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentTaskViewModel.cs
@@ -1,17 +1,16 @@
 using OrchardCore.Contents.Workflows.Activities;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Contents.Workflows.ViewModels
+namespace OrchardCore.Contents.Workflows.ViewModels;
+
+public class ContentTaskViewModel<T> : ActivityViewModel<T> where T : ContentTask
 {
-    public class ContentTaskViewModel<T> : ActivityViewModel<T> where T : ContentTask
+    public ContentTaskViewModel()
     {
-        public ContentTaskViewModel()
-        {
-        }
+    }
 
-        public ContentTaskViewModel(T activity)
-        {
-            Activity = activity;
-        }
+    public ContentTaskViewModel(T activity)
+    {
+        Activity = activity;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentUnpublishedEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentUnpublishedEventViewModel.cs
index cb308a2e45d..f776dec36da 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentUnpublishedEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentUnpublishedEventViewModel.cs
@@ -1,8 +1,7 @@
 using OrchardCore.Contents.Workflows.Activities;
 
-namespace OrchardCore.Contents.Workflows.ViewModels
+namespace OrchardCore.Contents.Workflows.ViewModels;
+
+public class ContentUnpublishedEventViewModel : ContentEventViewModel<ContentUnpublishedEvent>
 {
-    public class ContentUnpublishedEventViewModel : ContentEventViewModel<ContentUnpublishedEvent>
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentUpdatedEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentUpdatedEventViewModel.cs
index 7ddd6c7d325..fb93ff70cdc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentUpdatedEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentUpdatedEventViewModel.cs
@@ -1,8 +1,7 @@
 using OrchardCore.Contents.Workflows.Activities;
 
-namespace OrchardCore.Contents.Workflows.ViewModels
+namespace OrchardCore.Contents.Workflows.ViewModels;
+
+public class ContentUpdatedEventViewModel : ContentEventViewModel<ContentUpdatedEvent>
 {
-    public class ContentUpdatedEventViewModel : ContentEventViewModel<ContentUpdatedEvent>
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentVersionedEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentVersionedEventViewModel.cs
index 252568de282..3d3b580aa0b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentVersionedEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentVersionedEventViewModel.cs
@@ -1,8 +1,7 @@
 using OrchardCore.Contents.Workflows.Activities;
 
-namespace OrchardCore.Contents.Workflows.ViewModels
+namespace OrchardCore.Contents.Workflows.ViewModels;
+
+public class ContentVersionedEventViewModel : ContentEventViewModel<ContentVersionedEvent>
 {
-    public class ContentVersionedEventViewModel : ContentEventViewModel<ContentVersionedEvent>
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/CreateContentTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/CreateContentTaskViewModel.cs
index ae63befb516..982b6ca6623 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/CreateContentTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/CreateContentTaskViewModel.cs
@@ -3,15 +3,14 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using OrchardCore.Contents.Workflows.Activities;
 
-namespace OrchardCore.Contents.Workflows.ViewModels
+namespace OrchardCore.Contents.Workflows.ViewModels;
+
+public class CreateContentTaskViewModel : ContentTaskViewModel<CreateContentTask>
 {
-    public class CreateContentTaskViewModel : ContentTaskViewModel<CreateContentTask>
-    {
-        [BindNever]
-        public IList<SelectListItem> AvailableContentTypes { get; set; }
+    [BindNever]
+    public IList<SelectListItem> AvailableContentTypes { get; set; }
 
-        public string ContentType { get; set; }
-        public bool Publish { get; set; }
-        public string ContentProperties { get; set; }
-    }
+    public string ContentType { get; set; }
+    public bool Publish { get; set; }
+    public string ContentProperties { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/DeleteContentTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/DeleteContentTaskViewModel.cs
index d153ed72511..82bb574b516 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/DeleteContentTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/DeleteContentTaskViewModel.cs
@@ -1,12 +1,11 @@
 using OrchardCore.Contents.Workflows.Activities;
 
-namespace OrchardCore.Contents.Workflows.ViewModels
+namespace OrchardCore.Contents.Workflows.ViewModels;
+
+public class DeleteContentTaskViewModel : ContentTaskViewModel<DeleteContentTask>
 {
-    public class DeleteContentTaskViewModel : ContentTaskViewModel<DeleteContentTask>
-    {
-        /// <summary>
-        /// The expression resulting into a content item or content item ID to delete.
-        /// </summary>
-        public string Expression { get; set; }
-    }
+    /// <summary>
+    /// The expression resulting into a content item or content item ID to delete.
+    /// </summary>
+    public string Expression { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/PublishContentTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/PublishContentTaskViewModel.cs
index bb4464a8d80..7ed4eb80450 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/PublishContentTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/PublishContentTaskViewModel.cs
@@ -1,12 +1,11 @@
 using OrchardCore.Contents.Workflows.Activities;
 
-namespace OrchardCore.Contents.Workflows.ViewModels
+namespace OrchardCore.Contents.Workflows.ViewModels;
+
+public class PublishContentTaskViewModel : ContentTaskViewModel<PublishContentTask>
 {
-    public class PublishContentTaskViewModel : ContentTaskViewModel<PublishContentTask>
-    {
-        /// <summary>
-        /// The expression resulting into a content item or content item ID to publish.
-        /// </summary>
-        public string Expression { get; set; }
-    }
+    /// <summary>
+    /// The expression resulting into a content item or content item ID to publish.
+    /// </summary>
+    public string Expression { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/RetrieveContentTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/RetrieveContentTaskViewModel.cs
index 2475fe517d7..59f83b89e5f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/RetrieveContentTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/RetrieveContentTaskViewModel.cs
@@ -1,12 +1,11 @@
 using OrchardCore.Contents.Workflows.Activities;
 
-namespace OrchardCore.Contents.Workflows.ViewModels
+namespace OrchardCore.Contents.Workflows.ViewModels;
+
+public class RetrieveContentTaskViewModel : ContentTaskViewModel<RetrieveContentTask>
 {
-    public class RetrieveContentTaskViewModel : ContentTaskViewModel<RetrieveContentTask>
-    {
-        /// <summary>
-        /// The expression resulting into a content item ID to retrieve.
-        /// </summary>
-        public string ContentItemId { get; set; }
-    }
+    /// <summary>
+    /// The expression resulting into a content item ID to retrieve.
+    /// </summary>
+    public string ContentItemId { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/UnpublishContentTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/UnpublishContentTaskViewModel.cs
index 582392b4d3d..3ae63ab5a39 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/UnpublishContentTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/UnpublishContentTaskViewModel.cs
@@ -1,12 +1,11 @@
 using OrchardCore.Contents.Workflows.Activities;
 
-namespace OrchardCore.Contents.Workflows.ViewModels
+namespace OrchardCore.Contents.Workflows.ViewModels;
+
+public class UnpublishContentTaskViewModel : ContentTaskViewModel<UnpublishContentTask>
 {
-    public class UnpublishContentTaskViewModel : ContentTaskViewModel<UnpublishContentTask>
-    {
-        /// <summary>
-        /// The expression resulting into a content item or content item ID to unpublish.
-        /// </summary>
-        public string Expression { get; set; }
-    }
+    /// <summary>
+    /// The expression resulting into a content item or content item ID to unpublish.
+    /// </summary>
+    public string Expression { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/UpdateContentTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/UpdateContentTaskViewModel.cs
index d15af4a6c86..8e87d4d9e07 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/UpdateContentTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/UpdateContentTaskViewModel.cs
@@ -3,16 +3,15 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using OrchardCore.Contents.Workflows.Activities;
 
-namespace OrchardCore.Contents.Workflows.ViewModels
+namespace OrchardCore.Contents.Workflows.ViewModels;
+
+public class UpdateContentTaskViewModel : ContentTaskViewModel<UpdateContentTask>
 {
-    public class UpdateContentTaskViewModel : ContentTaskViewModel<UpdateContentTask>
-    {
-        [BindNever]
-        public IList<SelectListItem> AvailableContentTypes { get; set; }
+    [BindNever]
+    public IList<SelectListItem> AvailableContentTypes { get; set; }
 
-        public string ContentType { get; set; }
-        public string ContentItemIdExpression { get; set; }
-        public string ContentProperties { get; set; }
-        public bool Publish { get; set; }
-    }
+    public string ContentType { get; set; }
+    public string ContentItemIdExpression { get; set; }
+    public string ContentProperties { get; set; }
+    public bool Publish { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs
index 1dd569ae64b..0b94d93cb00 100644
--- a/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs
@@ -2,38 +2,37 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Cors
+namespace OrchardCore.Cors;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    internal readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["Settings"], settings => settings
-                        .Add(S["CORS"], S["CORS"].PrefixPosition(), entry => entry
-                            .AddClass("cors")
-                            .Id("cors")
-                            .Action("Index", "Admin", "OrchardCore.Cors")
-                            .Permission(Permissions.ManageCorsSettings)
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["Settings"], settings => settings
+                    .Add(S["CORS"], S["CORS"].PrefixPosition(), entry => entry
+                        .AddClass("cors")
+                        .Id("cors")
+                        .Action("Index", "Admin", "OrchardCore.Cors")
+                        .Permission(Permissions.ManageCorsSettings)
+                        .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Cors/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Cors/Controllers/AdminController.cs
index e64c41eea4a..cdf676e2c9c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Cors/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Cors/Controllers/AdminController.cs
@@ -12,134 +12,133 @@
 using OrchardCore.DisplayManagement.Notify;
 using OrchardCore.Environment.Shell;
 
-namespace OrchardCore.Cors.Controllers
+namespace OrchardCore.Cors.Controllers;
+
+[Admin]
+public class AdminController : Controller
 {
-    [Admin]
-    public class AdminController : Controller
+    private readonly IShellHost _shellHost;
+    private readonly ShellSettings _shellSettings;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly CorsService _corsService;
+    private readonly INotifier _notifier;
+    protected readonly IHtmlLocalizer H;
+
+    public AdminController(
+        IShellHost shellHost,
+        ShellSettings shellSettings,
+        IAuthorizationService authorizationService,
+        CorsService corsService,
+        INotifier notifier,
+        IHtmlLocalizer<AdminController> htmlLocalizer
+        )
     {
-        private readonly IShellHost _shellHost;
-        private readonly ShellSettings _shellSettings;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly CorsService _corsService;
-        private readonly INotifier _notifier;
-        protected readonly IHtmlLocalizer H;
-
-        public AdminController(
-            IShellHost shellHost,
-            ShellSettings shellSettings,
-            IAuthorizationService authorizationService,
-            CorsService corsService,
-            INotifier notifier,
-            IHtmlLocalizer<AdminController> htmlLocalizer
-            )
-        {
-            _shellHost = shellHost;
-            _shellSettings = shellSettings;
-            _authorizationService = authorizationService;
-            _corsService = corsService;
-            _notifier = notifier;
-            H = htmlLocalizer;
-        }
+        _shellHost = shellHost;
+        _shellSettings = shellSettings;
+        _authorizationService = authorizationService;
+        _corsService = corsService;
+        _notifier = notifier;
+        H = htmlLocalizer;
+    }
 
-        [HttpGet]
-        [Admin("Cors", "CorsIndex")]
-        public async Task<ActionResult> Index()
+    [HttpGet]
+    [Admin("Cors", "CorsIndex")]
+    public async Task<ActionResult> Index()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageCorsSettings))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageCorsSettings))
-            {
-                return Unauthorized();
-            }
+            return Unauthorized();
+        }
 
-            var settings = await _corsService.GetSettingsAsync();
+        var settings = await _corsService.GetSettingsAsync();
 
-            var list = new List<CorsPolicyViewModel>();
+        var list = new List<CorsPolicyViewModel>();
 
-            if (settings?.Policies != null)
+        if (settings?.Policies != null)
+        {
+            foreach (var policySetting in settings.Policies)
             {
-                foreach (var policySetting in settings.Policies)
+                var policyViewModel = new CorsPolicyViewModel()
                 {
-                    var policyViewModel = new CorsPolicyViewModel()
-                    {
-                        Name = policySetting.Name,
-                        AllowAnyHeader = policySetting.AllowAnyHeader,
-                        AllowedHeaders = policySetting.AllowedHeaders,
-                        AllowAnyMethod = policySetting.AllowAnyMethod,
-                        AllowedMethods = policySetting.AllowedMethods,
-                        AllowAnyOrigin = policySetting.AllowAnyOrigin,
-                        AllowedOrigins = policySetting.AllowedOrigins,
-                        AllowCredentials = policySetting.AllowCredentials,
-                        IsDefaultPolicy = policySetting.IsDefaultPolicy,
-                        ExposedHeaders = policySetting.ExposedHeaders,
-                    };
-
-                    list.Add(policyViewModel);
-                }
+                    Name = policySetting.Name,
+                    AllowAnyHeader = policySetting.AllowAnyHeader,
+                    AllowedHeaders = policySetting.AllowedHeaders,
+                    AllowAnyMethod = policySetting.AllowAnyMethod,
+                    AllowedMethods = policySetting.AllowedMethods,
+                    AllowAnyOrigin = policySetting.AllowAnyOrigin,
+                    AllowedOrigins = policySetting.AllowedOrigins,
+                    AllowCredentials = policySetting.AllowCredentials,
+                    IsDefaultPolicy = policySetting.IsDefaultPolicy,
+                    ExposedHeaders = policySetting.ExposedHeaders,
+                };
+
+                list.Add(policyViewModel);
             }
+        }
 
-            var viewModel = new CorsSettingsViewModel
-            {
-                Policies = list.ToArray()
-            };
+        var viewModel = new CorsSettingsViewModel
+        {
+            Policies = list.ToArray()
+        };
 
-            return View(viewModel);
-        }
+        return View(viewModel);
+    }
 
-        [HttpPost]
-        [ActionName(nameof(Index))]
-        public async Task<ActionResult> IndexPOST()
+    [HttpPost]
+    [ActionName(nameof(Index))]
+    public async Task<ActionResult> IndexPOST()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageCorsSettings))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageCorsSettings))
-            {
-                return Unauthorized();
-            }
+            return Unauthorized();
+        }
 
-            var model = new CorsSettingsViewModel();
-            var configJson = Request.Form["CorsSettings"].First();
-            model.Policies = JConvert.DeserializeObject<CorsPolicyViewModel[]>(configJson);
+        var model = new CorsSettingsViewModel();
+        var configJson = Request.Form["CorsSettings"].First();
+        model.Policies = JConvert.DeserializeObject<CorsPolicyViewModel[]>(configJson);
 
-            var corsPolicies = new List<CorsPolicySetting>();
+        var corsPolicies = new List<CorsPolicySetting>();
 
-            // If "allow origin" and "allow credentials" are both true, issue a warning about CORS functionality. Inform the user.
-            var policyWarnings = new List<string>();
+        // If "allow origin" and "allow credentials" are both true, issue a warning about CORS functionality. Inform the user.
+        var policyWarnings = new List<string>();
 
-            foreach (var settingViewModel in model.Policies)
+        foreach (var settingViewModel in model.Policies)
+        {
+            corsPolicies.Add(new CorsPolicySetting
             {
-                corsPolicies.Add(new CorsPolicySetting
-                {
-                    Name = settingViewModel.Name,
-                    AllowAnyHeader = settingViewModel.AllowAnyHeader,
-                    AllowAnyMethod = settingViewModel.AllowAnyMethod,
-                    AllowAnyOrigin = settingViewModel.AllowAnyOrigin,
-                    AllowCredentials = settingViewModel.AllowCredentials,
-                    AllowedHeaders = settingViewModel.AllowedHeaders,
-                    AllowedMethods = settingViewModel.AllowedMethods,
-                    AllowedOrigins = settingViewModel.AllowedOrigins,
-                    IsDefaultPolicy = settingViewModel.IsDefaultPolicy,
-                    ExposedHeaders = settingViewModel.ExposedHeaders,
-                });
-                
-                if (settingViewModel.AllowAnyOrigin && settingViewModel.AllowCredentials)
-                {
-                    policyWarnings.Add(settingViewModel.Name);
-                }
-            }
-            var corsSettings = new CorsSettings()
+                Name = settingViewModel.Name,
+                AllowAnyHeader = settingViewModel.AllowAnyHeader,
+                AllowAnyMethod = settingViewModel.AllowAnyMethod,
+                AllowAnyOrigin = settingViewModel.AllowAnyOrigin,
+                AllowCredentials = settingViewModel.AllowCredentials,
+                AllowedHeaders = settingViewModel.AllowedHeaders,
+                AllowedMethods = settingViewModel.AllowedMethods,
+                AllowedOrigins = settingViewModel.AllowedOrigins,
+                IsDefaultPolicy = settingViewModel.IsDefaultPolicy,
+                ExposedHeaders = settingViewModel.ExposedHeaders,
+            });
+
+            if (settingViewModel.AllowAnyOrigin && settingViewModel.AllowCredentials)
             {
-                Policies = corsPolicies
-            };
-
-            await _corsService.UpdateSettingsAsync(corsSettings);
+                policyWarnings.Add(settingViewModel.Name);
+            }
+        }
+        var corsSettings = new CorsSettings()
+        {
+            Policies = corsPolicies
+        };
 
-            await _shellHost.ReleaseShellContextAsync(_shellSettings);
+        await _corsService.UpdateSettingsAsync(corsSettings);
 
-            await _notifier.SuccessAsync(H["The CORS settings have updated successfully."]);
+        await _shellHost.ReleaseShellContextAsync(_shellSettings);
 
-            if (policyWarnings.Count > 0)
-            {
-                await _notifier.WarningAsync(H["Specifying {0} and {1} is an insecure configuration and can result in cross-site request forgery. The CORS service returns an invalid CORS response when an app is configured with both methods.<br /><strong>Affected policies: {2} </strong><br />Refer to docs:<a href='https://learn.microsoft.com/en-us/aspnet/core/security/cors' target='_blank'>https://learn.microsoft.com/en-us/aspnet/core/security/cors</a>",  "AllowAnyOrigin", "AllowCredentias", string.Join(", ", policyWarnings) ]);
-            }
+        await _notifier.SuccessAsync(H["The CORS settings have updated successfully."]);
 
-            return View(model);
+        if (policyWarnings.Count > 0)
+        {
+            await _notifier.WarningAsync(H["Specifying {0} and {1} is an insecure configuration and can result in cross-site request forgery. The CORS service returns an invalid CORS response when an app is configured with both methods.<br /><strong>Affected policies: {2} </strong><br />Refer to docs:<a href='https://learn.microsoft.com/en-us/aspnet/core/security/cors' target='_blank'>https://learn.microsoft.com/en-us/aspnet/core/security/cors</a>", "AllowAnyOrigin", "AllowCredentias", string.Join(", ", policyWarnings)]);
         }
+
+        return View(model);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Cors/Services/CorsOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Cors/Services/CorsOptionsConfiguration.cs
index 47700a3dd81..a04ae7cbb70 100644
--- a/src/OrchardCore.Modules/OrchardCore.Cors/Services/CorsOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Cors/Services/CorsOptionsConfiguration.cs
@@ -3,86 +3,85 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Cors.Services
+namespace OrchardCore.Cors.Services;
+
+public sealed class CorsOptionsConfiguration : IConfigureOptions<CorsOptions>
 {
-    public sealed class CorsOptionsConfiguration : IConfigureOptions<CorsOptions>
+    private readonly CorsService _corsService;
+    private readonly ILogger _logger;
+
+    public CorsOptionsConfiguration(CorsService corsService, ILogger<CorsOptionsConfiguration> logger)
     {
-        private readonly CorsService _corsService;
-        private readonly ILogger _logger;
+        _corsService = corsService;
+        _logger = logger;
+    }
 
-        public CorsOptionsConfiguration(CorsService corsService, ILogger<CorsOptionsConfiguration> logger)
+    public void Configure(CorsOptions options)
+    {
+        var corsSettings = _corsService.GetSettingsAsync().GetAwaiter().GetResult();
+        if (corsSettings?.Policies == null || !corsSettings.Policies.Any())
         {
-            _corsService = corsService;
-            _logger = logger;
+            return;
         }
 
-        public void Configure(CorsOptions options)
+        foreach (var corsPolicy in corsSettings.Policies)
         {
-            var corsSettings = _corsService.GetSettingsAsync().GetAwaiter().GetResult();
-            if (corsSettings?.Policies == null || !corsSettings.Policies.Any())
+            if (corsPolicy.AllowCredentials && corsPolicy.AllowAnyOrigin)
             {
-                return;
+                _logger.LogWarning("Using AllowCredentials and AllowAnyOrigin at the same time is considered a security risk, the {PolicyName} policy will not be loaded.", corsPolicy.Name);
+                continue;
             }
 
-            foreach (var corsPolicy in corsSettings.Policies)
+            options.AddPolicy(corsPolicy.Name, configurePolicy =>
             {
-                if (corsPolicy.AllowCredentials && corsPolicy.AllowAnyOrigin)
+                if (corsPolicy.AllowAnyHeader)
                 {
-                    _logger.LogWarning("Using AllowCredentials and AllowAnyOrigin at the same time is considered a security risk, the {PolicyName} policy will not be loaded.", corsPolicy.Name);
-                    continue;
+                    configurePolicy.AllowAnyHeader();
                 }
-
-                options.AddPolicy(corsPolicy.Name, configurePolicy =>
+                else
                 {
-                    if (corsPolicy.AllowAnyHeader)
-                    {
-                        configurePolicy.AllowAnyHeader();
-                    }
-                    else
-                    {
-                        configurePolicy.WithHeaders(corsPolicy.AllowedHeaders);
-                    }
-
-                    if (corsPolicy.AllowAnyMethod)
-                    {
-                        configurePolicy.AllowAnyMethod();
-                    }
-                    else
-                    {
-                        configurePolicy.WithMethods(corsPolicy.AllowedMethods);
-                    }
+                    configurePolicy.WithHeaders(corsPolicy.AllowedHeaders);
+                }
 
-                    if (corsPolicy.AllowAnyOrigin)
-                    {
-                        configurePolicy.AllowAnyOrigin();
-                    }
-                    else
-                    {
-                        configurePolicy.WithOrigins(corsPolicy.AllowedOrigins);
-                    }
+                if (corsPolicy.AllowAnyMethod)
+                {
+                    configurePolicy.AllowAnyMethod();
+                }
+                else
+                {
+                    configurePolicy.WithMethods(corsPolicy.AllowedMethods);
+                }
 
-                    if (corsPolicy.AllowCredentials)
-                    {
-                        configurePolicy.AllowCredentials();
-                    }
-                    else
-                    {
-                        configurePolicy.DisallowCredentials();
-                    }
+                if (corsPolicy.AllowAnyOrigin)
+                {
+                    configurePolicy.AllowAnyOrigin();
+                }
+                else
+                {
+                    configurePolicy.WithOrigins(corsPolicy.AllowedOrigins);
+                }
 
-                    if (corsPolicy.ExposedHeaders?.Length > 0)
-                    {
-                        configurePolicy.WithExposedHeaders(corsPolicy.ExposedHeaders);
-                    }
-                });
+                if (corsPolicy.AllowCredentials)
+                {
+                    configurePolicy.AllowCredentials();
+                }
+                else
+                {
+                    configurePolicy.DisallowCredentials();
+                }
 
-                if (corsPolicy.IsDefaultPolicy)
+                if (corsPolicy.ExposedHeaders?.Length > 0)
                 {
-                    options.DefaultPolicyName = corsPolicy.Name;
+                    configurePolicy.WithExposedHeaders(corsPolicy.ExposedHeaders);
                 }
-            }
+            });
 
-            options.DefaultPolicyName ??= corsSettings.Policies.FirstOrDefault()?.Name;
+            if (corsPolicy.IsDefaultPolicy)
+            {
+                options.DefaultPolicyName = corsPolicy.Name;
+            }
         }
+
+        options.DefaultPolicyName ??= corsSettings.Policies.FirstOrDefault()?.Name;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Cors/Services/CorsService.cs b/src/OrchardCore.Modules/OrchardCore.Cors/Services/CorsService.cs
index ac3f97f58fc..2c76730215c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Cors/Services/CorsService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Cors/Services/CorsService.cs
@@ -3,27 +3,26 @@
 using OrchardCore.Cors.Settings;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Cors.Services
+namespace OrchardCore.Cors.Services;
+
+public class CorsService
 {
-    public class CorsService
-    {
-        private readonly ISiteService _siteService;
+    private readonly ISiteService _siteService;
 
-        public CorsService(ISiteService siteService)
-        {
-            _siteService = siteService;
-        }
+    public CorsService(ISiteService siteService)
+    {
+        _siteService = siteService;
+    }
 
-        public async Task<CorsSettings> GetSettingsAsync()
-        {
-            return await _siteService.GetSettingsAsync<CorsSettings>();
-        }
+    public async Task<CorsSettings> GetSettingsAsync()
+    {
+        return await _siteService.GetSettingsAsync<CorsSettings>();
+    }
 
-        internal async Task UpdateSettingsAsync(CorsSettings corsSettings)
-        {
-            var siteSettings = await _siteService.LoadSiteSettingsAsync();
-            siteSettings.Properties[nameof(CorsSettings)] = JObject.FromObject(corsSettings);
-            await _siteService.UpdateSiteSettingsAsync(siteSettings);
-        }
+    internal async Task UpdateSettingsAsync(CorsSettings corsSettings)
+    {
+        var siteSettings = await _siteService.LoadSiteSettingsAsync();
+        siteSettings.Properties[nameof(CorsSettings)] = JObject.FromObject(corsSettings);
+        await _siteService.UpdateSiteSettingsAsync(siteSettings);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Cors/Settings/CorsPolicySetting.cs b/src/OrchardCore.Modules/OrchardCore.Cors/Settings/CorsPolicySetting.cs
index 270e2405d4e..4f09a6e496b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Cors/Settings/CorsPolicySetting.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Cors/Settings/CorsPolicySetting.cs
@@ -1,25 +1,24 @@
-namespace OrchardCore.Cors.Settings
+namespace OrchardCore.Cors.Settings;
+
+public class CorsPolicySetting
 {
-    public class CorsPolicySetting
-    {
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        public bool AllowAnyOrigin { get; set; }
+    public bool AllowAnyOrigin { get; set; }
 
-        public string[] AllowedOrigins { get; set; }
+    public string[] AllowedOrigins { get; set; }
 
-        public bool AllowAnyHeader { get; set; }
+    public bool AllowAnyHeader { get; set; }
 
-        public string[] AllowedHeaders { get; set; }
+    public string[] AllowedHeaders { get; set; }
 
-        public bool AllowAnyMethod { get; set; }
+    public bool AllowAnyMethod { get; set; }
 
-        public string[] AllowedMethods { get; set; }
+    public string[] AllowedMethods { get; set; }
 
-        public bool AllowCredentials { get; set; }
+    public bool AllowCredentials { get; set; }
 
-        public bool IsDefaultPolicy { get; set; }
+    public bool IsDefaultPolicy { get; set; }
 
-        public string[] ExposedHeaders { get; set; }
-    }
+    public string[] ExposedHeaders { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Cors/Settings/CorsSettings.cs b/src/OrchardCore.Modules/OrchardCore.Cors/Settings/CorsSettings.cs
index fbdd6b970f8..6be043988fa 100644
--- a/src/OrchardCore.Modules/OrchardCore.Cors/Settings/CorsSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Cors/Settings/CorsSettings.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Cors.Settings
+namespace OrchardCore.Cors.Settings;
+
+public class CorsSettings
 {
-    public class CorsSettings
-    {
-        public IEnumerable<CorsPolicySetting> Policies { get; set; }
-    }
+    public IEnumerable<CorsPolicySetting> Policies { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Cors/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Cors/Startup.cs
index 043636cc2da..2b3d2b0a756 100644
--- a/src/OrchardCore.Modules/OrchardCore.Cors/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Cors/Startup.cs
@@ -11,26 +11,25 @@
 using OrchardCore.Security.Permissions;
 using CorsService = OrchardCore.Cors.Services.CorsService;
 
-namespace OrchardCore.Cors
+namespace OrchardCore.Cors;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
-    {
-        public override int Order
-            => OrchardCoreConstants.ConfigureOrder.Cors;
+    public override int Order
+        => OrchardCoreConstants.ConfigureOrder.Cors;
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            app.UseCors();
-        }
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        app.UseCors();
+    }
 
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddSingleton<CorsService>();
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddSingleton<CorsService>();
 
-            services.TryAddEnumerable(ServiceDescriptor
-                .Transient<IConfigureOptions<CorsOptions>, CorsOptionsConfiguration>());
-        }
+        services.TryAddEnumerable(ServiceDescriptor
+            .Transient<IConfigureOptions<CorsOptions>, CorsOptionsConfiguration>());
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Cors/ViewModels/CorsPolicyViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Cors/ViewModels/CorsPolicyViewModel.cs
index e9022f6ae4f..6b802f2aee7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Cors/ViewModels/CorsPolicyViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Cors/ViewModels/CorsPolicyViewModel.cs
@@ -1,25 +1,24 @@
-namespace OrchardCore.Cors.ViewModels
+namespace OrchardCore.Cors.ViewModels;
+
+public class CorsPolicyViewModel
 {
-    public class CorsPolicyViewModel
-    {
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        public bool AllowAnyOrigin { get; set; }
+    public bool AllowAnyOrigin { get; set; }
 
-        public string[] AllowedOrigins { get; set; }
+    public string[] AllowedOrigins { get; set; }
 
-        public bool AllowAnyHeader { get; set; }
+    public bool AllowAnyHeader { get; set; }
 
-        public string[] AllowedHeaders { get; set; }
+    public string[] AllowedHeaders { get; set; }
 
-        public bool AllowAnyMethod { get; set; }
+    public bool AllowAnyMethod { get; set; }
 
-        public string[] AllowedMethods { get; set; }
+    public string[] AllowedMethods { get; set; }
 
-        public bool AllowCredentials { get; set; }
+    public bool AllowCredentials { get; set; }
 
-        public bool IsDefaultPolicy { get; set; }
+    public bool IsDefaultPolicy { get; set; }
 
-        public string[] ExposedHeaders { get; set; }
-    }
+    public string[] ExposedHeaders { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Cors/ViewModels/CorsSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Cors/ViewModels/CorsSettingsViewModel.cs
index 6aedb5f8e3c..645668b4b72 100644
--- a/src/OrchardCore.Modules/OrchardCore.Cors/ViewModels/CorsSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Cors/ViewModels/CorsSettingsViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Cors.ViewModels
+namespace OrchardCore.Cors.ViewModels;
+
+public class CorsSettingsViewModel
 {
-    public class CorsSettingsViewModel
-    {
-        public CorsPolicyViewModel[] Policies { get; set; }
+    public CorsPolicyViewModel[] Policies { get; set; }
 
-        public string DefaultPolicyName { get; set; }
-    }
+    public string DefaultPolicyName { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs
index 6a9e9d0f69d..4c55056bc7c 100644
--- a/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs
@@ -6,60 +6,59 @@
 using OrchardCore.Mvc.Utilities;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.CustomSettings
+namespace OrchardCore.CustomSettings;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
-    {
-        private static readonly ConcurrentDictionary<string, RouteValueDictionary> _routeValues = [];
+    private static readonly ConcurrentDictionary<string, RouteValueDictionary> _routeValues = [];
+
+    private readonly CustomSettingsService _customSettingsService;
 
-        private readonly CustomSettingsService _customSettingsService;
+    internal readonly IStringLocalizer S;
 
-        internal readonly IStringLocalizer S;
+    public AdminMenu(
+        IStringLocalizer<AdminMenu> localizer,
+        CustomSettingsService customSettingsService)
+    {
+        S = localizer;
+        _customSettingsService = customSettingsService;
+    }
 
-        public AdminMenu(
-            IStringLocalizer<AdminMenu> localizer,
-            CustomSettingsService customSettingsService)
+    public async Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
-            _customSettingsService = customSettingsService;
+            return;
         }
 
-        public async Task BuildNavigationAsync(string name, NavigationBuilder builder)
+        foreach (var type in await _customSettingsService.GetAllSettingsTypesAsync())
         {
-            if (!NavigationHelper.IsAdminMenu(name))
+            if (!_routeValues.TryGetValue(type.Name, out var routeValues))
             {
-                return;
-            }
-
-            foreach (var type in await _customSettingsService.GetAllSettingsTypesAsync())
-            {
-                if (!_routeValues.TryGetValue(type.Name, out var routeValues))
+                routeValues = new RouteValueDictionary()
                 {
-                    routeValues = new RouteValueDictionary()
-                    {
-                         { "area", "OrchardCore.Settings" },
-                         { "groupId", type.Name },
-                    };
+                     { "area", "OrchardCore.Settings" },
+                     { "groupId", type.Name },
+                };
 
-                    _routeValues[type.Name] = routeValues;
-                }
+                _routeValues[type.Name] = routeValues;
+            }
 
-                var htmlName = type.Name.HtmlClassify();
+            var htmlName = type.Name.HtmlClassify();
 
-                builder
-                    .Add(S["Configuration"], configuration => configuration
-                        .Add(S["Settings"], settings => settings
-                            .Add(new LocalizedString(type.DisplayName, type.DisplayName), type.DisplayName.PrefixPosition(), layers => layers
-                                .Action("Index", "Admin", routeValues)
-                                .AddClass(htmlName)
-                                .Id(htmlName)
-                                .Permission(Permissions.CreatePermissionForType(type))
-                                .Resource(type.Name)
-                                .LocalNav()
-                            )
+            builder
+                .Add(S["Configuration"], configuration => configuration
+                    .Add(S["Settings"], settings => settings
+                        .Add(new LocalizedString(type.DisplayName, type.DisplayName), type.DisplayName.PrefixPosition(), layers => layers
+                            .Action("Index", "Admin", routeValues)
+                            .AddClass(htmlName)
+                            .Id(htmlName)
+                            .Permission(Permissions.CreatePermissionForType(type))
+                            .Resource(type.Name)
+                            .LocalNav()
                         )
-                    );
-            }
+                    )
+                );
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.CustomSettings/Deployment/CustomSettingsDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.CustomSettings/Deployment/CustomSettingsDeploymentSource.cs
index 73382cf61d8..2c29159cafc 100644
--- a/src/OrchardCore.Modules/OrchardCore.CustomSettings/Deployment/CustomSettingsDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.CustomSettings/Deployment/CustomSettingsDeploymentSource.cs
@@ -5,50 +5,49 @@
 using OrchardCore.CustomSettings.Services;
 using OrchardCore.Deployment;
 
-namespace OrchardCore.CustomSettings.Deployment
+namespace OrchardCore.CustomSettings.Deployment;
+
+public class CustomSettingsDeploymentSource : IDeploymentSource
 {
-    public class CustomSettingsDeploymentSource : IDeploymentSource
+    private readonly CustomSettingsService _customSettingsService;
+
+    public CustomSettingsDeploymentSource(CustomSettingsService customSettingsService)
     {
-        private readonly CustomSettingsService _customSettingsService;
+        _customSettingsService = customSettingsService;
+    }
 
-        public CustomSettingsDeploymentSource(CustomSettingsService customSettingsService)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        var customSettingsStep = step as CustomSettingsDeploymentStep;
+        if (customSettingsStep == null)
         {
-            _customSettingsService = customSettingsService;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        var settingsList = new List<KeyValuePair<string, JsonNode>>
         {
-            var customSettingsStep = step as CustomSettingsDeploymentStep;
-            if (customSettingsStep == null)
-            {
-                return;
-            }
-
-            var settingsList = new List<KeyValuePair<string, JsonNode>>
-            {
-                new("name", "custom-settings"),
-            };
+            new("name", "custom-settings"),
+        };
 
-            var settingsTypes = customSettingsStep.IncludeAll
-                ? (await _customSettingsService.GetAllSettingsTypesAsync()).ToArray()
-                : (await _customSettingsService.GetSettingsTypesAsync(customSettingsStep.SettingsTypeNames)).ToArray();
+        var settingsTypes = customSettingsStep.IncludeAll
+            ? (await _customSettingsService.GetAllSettingsTypesAsync()).ToArray()
+            : (await _customSettingsService.GetSettingsTypesAsync(customSettingsStep.SettingsTypeNames)).ToArray();
 
-            foreach (var settingsType in settingsTypes)
-            {
-                if (!await _customSettingsService.CanUserCreateSettingsAsync(settingsType))
-                {
-                    return;
-                }
-            }
-
-            foreach (var settingsType in settingsTypes)
+        foreach (var settingsType in settingsTypes)
+        {
+            if (!await _customSettingsService.CanUserCreateSettingsAsync(settingsType))
             {
-                var settings = await _customSettingsService.GetSettingsAsync(settingsType);
-                settingsList.Add(new(settings.ContentType, JObject.FromObject(settings)));
+                return;
             }
+        }
 
-            // Adding custom settings
-            result.Steps.Add(new JsonObject(settingsList.ToArray()));
+        foreach (var settingsType in settingsTypes)
+        {
+            var settings = await _customSettingsService.GetSettingsAsync(settingsType);
+            settingsList.Add(new(settings.ContentType, JObject.FromObject(settings)));
         }
+
+        // Adding custom settings
+        result.Steps.Add(new JsonObject(settingsList.ToArray()));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.CustomSettings/Deployment/CustomSettingsDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.CustomSettings/Deployment/CustomSettingsDeploymentStep.cs
index 46f3cc97542..1d425b64d86 100644
--- a/src/OrchardCore.Modules/OrchardCore.CustomSettings/Deployment/CustomSettingsDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.CustomSettings/Deployment/CustomSettingsDeploymentStep.cs
@@ -1,16 +1,15 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.CustomSettings.Deployment
+namespace OrchardCore.CustomSettings.Deployment;
+
+public class CustomSettingsDeploymentStep : DeploymentStep
 {
-    public class CustomSettingsDeploymentStep : DeploymentStep
+    public CustomSettingsDeploymentStep()
     {
-        public CustomSettingsDeploymentStep()
-        {
-            Name = "CustomSettings";
-        }
+        Name = "CustomSettings";
+    }
 
-        public bool IncludeAll { get; set; } = true;
+    public bool IncludeAll { get; set; } = true;
 
-        public string[] SettingsTypeNames { get; set; }
-    }
+    public string[] SettingsTypeNames { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.CustomSettings/Deployment/CustomSettingsDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.CustomSettings/Deployment/CustomSettingsDeploymentStepDriver.cs
index 4fb417001fc..b950c78864d 100644
--- a/src/OrchardCore.Modules/OrchardCore.CustomSettings/Deployment/CustomSettingsDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.CustomSettings/Deployment/CustomSettingsDeploymentStepDriver.cs
@@ -6,52 +6,51 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.CustomSettings.Deployment
+namespace OrchardCore.CustomSettings.Deployment;
+
+public sealed class CustomSettingsDeploymentStepDriver : DisplayDriver<DeploymentStep, CustomSettingsDeploymentStep>
 {
-    public sealed class CustomSettingsDeploymentStepDriver : DisplayDriver<DeploymentStep, CustomSettingsDeploymentStep>
+    private readonly CustomSettingsService _customSettingsService;
+
+    public CustomSettingsDeploymentStepDriver(CustomSettingsService customSettingsService)
     {
-        private readonly CustomSettingsService _customSettingsService;
+        _customSettingsService = customSettingsService;
+    }
 
-        public CustomSettingsDeploymentStepDriver(CustomSettingsService customSettingsService)
-        {
-            _customSettingsService = customSettingsService;
-        }
+    public override Task<IDisplayResult> DisplayAsync(CustomSettingsDeploymentStep step, BuildDisplayContext context)
+    {
+        return
+            CombineAsync(
+                View("CustomSettingsDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("CustomSettingsDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(CustomSettingsDeploymentStep step, BuildDisplayContext context)
+    public override IDisplayResult Edit(CustomSettingsDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<CustomSettingsDeploymentStepViewModel>("CustomSettingsDeploymentStep_Fields_Edit", async model =>
         {
-            return
-                CombineAsync(
-                    View("CustomSettingsDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("CustomSettingsDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+            model.IncludeAll = step.IncludeAll;
+            model.SettingsTypeNames = step.SettingsTypeNames;
+            model.AllSettingsTypeNames = (await _customSettingsService.GetAllSettingsTypeNamesAsync()).ToArray();
+        }).Location("Content");
+    }
 
-        public override IDisplayResult Edit(CustomSettingsDeploymentStep step, BuildEditorContext context)
-        {
-            return Initialize<CustomSettingsDeploymentStepViewModel>("CustomSettingsDeploymentStep_Fields_Edit", async model =>
-            {
-                model.IncludeAll = step.IncludeAll;
-                model.SettingsTypeNames = step.SettingsTypeNames;
-                model.AllSettingsTypeNames = (await _customSettingsService.GetAllSettingsTypeNamesAsync()).ToArray();
-            }).Location("Content");
-        }
+    public override async Task<IDisplayResult> UpdateAsync(CustomSettingsDeploymentStep step, UpdateEditorContext context)
+    {
+        step.SettingsTypeNames = [];
+
+        await context.Updater.TryUpdateModelAsync(step,
+                                          Prefix,
+                                          x => x.SettingsTypeNames,
+                                          x => x.IncludeAll);
 
-        public override async Task<IDisplayResult> UpdateAsync(CustomSettingsDeploymentStep step, UpdateEditorContext context)
+        // Don't have the selected option if include all.
+        if (step.IncludeAll)
         {
             step.SettingsTypeNames = [];
-
-            await context.Updater.TryUpdateModelAsync(step,
-                                              Prefix,
-                                              x => x.SettingsTypeNames,
-                                              x => x.IncludeAll);
-
-            // Don't have the selected option if include all.
-            if (step.IncludeAll)
-            {
-                step.SettingsTypeNames = [];
-            }
-
-            return Edit(step, context);
         }
+
+        return Edit(step, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.CustomSettings/Drivers/CustomSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.CustomSettings/Drivers/CustomSettingsDisplayDriver.cs
index d2c08f9e778..fe460555fba 100644
--- a/src/OrchardCore.Modules/OrchardCore.CustomSettings/Drivers/CustomSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.CustomSettings/Drivers/CustomSettingsDisplayDriver.cs
@@ -7,70 +7,69 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Settings;
 
-namespace OrchardCore.CustomSettings.Drivers
+namespace OrchardCore.CustomSettings.Drivers;
+
+/// <summary>
+/// This driver generates an editor for site settings. The GroupId represents the type of
+/// the settings to use.
+/// </summary>
+public sealed class CustomSettingsDisplayDriver : DisplayDriver<ISite>
 {
-    /// <summary>
-    /// This driver generates an editor for site settings. The GroupId represents the type of
-    /// the settings to use.
-    /// </summary>
-    public sealed class CustomSettingsDisplayDriver : DisplayDriver<ISite>
+    private readonly CustomSettingsService _customSettingsService;
+    private readonly IContentItemDisplayManager _contentItemDisplayManager;
+
+    public CustomSettingsDisplayDriver(
+        CustomSettingsService customSettingsService,
+        IContentItemDisplayManager contentItemDisplayManager)
     {
-        private readonly CustomSettingsService _customSettingsService;
-        private readonly IContentItemDisplayManager _contentItemDisplayManager;
+        _customSettingsService = customSettingsService;
+        _contentItemDisplayManager = contentItemDisplayManager;
+    }
 
-        public CustomSettingsDisplayDriver(
-            CustomSettingsService customSettingsService,
-            IContentItemDisplayManager contentItemDisplayManager)
+    public override async Task<IDisplayResult> EditAsync(ISite site, BuildEditorContext context)
+    {
+        var contentTypeDefinition = _customSettingsService.GetSettingsType(context.GroupId);
+        if (contentTypeDefinition == null)
         {
-            _customSettingsService = customSettingsService;
-            _contentItemDisplayManager = contentItemDisplayManager;
+            return null;
         }
 
-        public override async Task<IDisplayResult> EditAsync(ISite site, BuildEditorContext context)
+        if (!await _customSettingsService.CanUserCreateSettingsAsync(contentTypeDefinition))
         {
-            var contentTypeDefinition = _customSettingsService.GetSettingsType(context.GroupId);
-            if (contentTypeDefinition == null)
-            {
-                return null;
-            }
+            return null;
+        }
 
-            if (!await _customSettingsService.CanUserCreateSettingsAsync(contentTypeDefinition))
-            {
-                return null;
-            }
+        var isNew = false;
+        var contentItem = await _customSettingsService.GetSettingsAsync(site, contentTypeDefinition, () => isNew = true);
 
-            var isNew = false;
-            var contentItem = await _customSettingsService.GetSettingsAsync(site, contentTypeDefinition, () => isNew = true);
+        var shape = Initialize<CustomSettingsEditViewModel>(CustomSettingsConstants.Stereotype, async ctx =>
+        {
+            ctx.Editor = await _contentItemDisplayManager.BuildEditorAsync(contentItem, context.Updater, isNew);
+        }).Location("Content:3").OnGroup(contentTypeDefinition.Name);
 
-            var shape = Initialize<CustomSettingsEditViewModel>(CustomSettingsConstants.Stereotype, async ctx =>
-            {
-                ctx.Editor = await _contentItemDisplayManager.BuildEditorAsync(contentItem, context.Updater, isNew);
-            }).Location("Content:3").OnGroup(contentTypeDefinition.Name);
+        return shape;
+    }
 
-            return shape;
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, UpdateEditorContext context)
+    {
+        var contentTypeDefinition = _customSettingsService.GetSettingsType(context.GroupId);
+        if (contentTypeDefinition == null)
+        {
+            return null;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, UpdateEditorContext context)
+        if (!await _customSettingsService.CanUserCreateSettingsAsync(contentTypeDefinition))
         {
-            var contentTypeDefinition = _customSettingsService.GetSettingsType(context.GroupId);
-            if (contentTypeDefinition == null)
-            {
-                return null;
-            }
-
-            if (!await _customSettingsService.CanUserCreateSettingsAsync(contentTypeDefinition))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var isNew = false;
-            var contentItem = await _customSettingsService.GetSettingsAsync(site, contentTypeDefinition, () => isNew = true);
+        var isNew = false;
+        var contentItem = await _customSettingsService.GetSettingsAsync(site, contentTypeDefinition, () => isNew = true);
 
-            await _contentItemDisplayManager.UpdateEditorAsync(contentItem, context.Updater, isNew);
+        await _contentItemDisplayManager.UpdateEditorAsync(contentItem, context.Updater, isNew);
 
-            site.Properties[contentTypeDefinition.Name] = JObject.FromObject(contentItem);
+        site.Properties[contentTypeDefinition.Name] = JObject.FromObject(contentItem);
 
-            return await EditAsync(site, context);
-        }
+        return await EditAsync(site, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.CustomSettings/Recipes/CustomSettingsStep.cs b/src/OrchardCore.Modules/OrchardCore.CustomSettings/Recipes/CustomSettingsStep.cs
index e00e7ad6699..10806af6d1b 100644
--- a/src/OrchardCore.Modules/OrchardCore.CustomSettings/Recipes/CustomSettingsStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.CustomSettings/Recipes/CustomSettingsStep.cs
@@ -4,41 +4,40 @@
 using OrchardCore.Recipes.Services;
 using OrchardCore.Settings;
 
-namespace OrchardCore.CustomSettings.Recipes
+namespace OrchardCore.CustomSettings.Recipes;
+
+/// <summary>
+/// This recipe step updates the site settings.
+/// </summary>
+public sealed class CustomSettingsStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step updates the site settings.
-    /// </summary>
-    public sealed class CustomSettingsStep : IRecipeStepHandler
+    private readonly ISiteService _siteService;
+
+    public CustomSettingsStep(ISiteService siteService)
     {
-        private readonly ISiteService _siteService;
+        _siteService = siteService;
+    }
 
-        public CustomSettingsStep(ISiteService siteService)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "custom-settings", StringComparison.OrdinalIgnoreCase))
         {
-            _siteService = siteService;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, "custom-settings", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            var siteSettings = await _siteService.LoadSiteSettingsAsync();
+        var siteSettings = await _siteService.LoadSiteSettingsAsync();
 
-            var model = context.Step;
-            foreach (var customSettings in model)
+        var model = context.Step;
+        foreach (var customSettings in model)
+        {
+            if (customSettings.Key == "name")
             {
-                if (customSettings.Key == "name")
-                {
-                    continue;
-                }
-
-                siteSettings.Properties[customSettings.Key] = customSettings.Value.DeepClone();
+                continue;
             }
 
-            await _siteService.UpdateSiteSettingsAsync(siteSettings);
+            siteSettings.Properties[customSettings.Key] = customSettings.Value.DeepClone();
         }
+
+        await _siteService.UpdateSiteSettingsAsync(siteSettings);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.CustomSettings/Services/CustomSettingsAuthorizationHandler.cs b/src/OrchardCore.Modules/OrchardCore.CustomSettings/Services/CustomSettingsAuthorizationHandler.cs
index c9a7dd0888d..baf9d148c11 100644
--- a/src/OrchardCore.Modules/OrchardCore.CustomSettings/Services/CustomSettingsAuthorizationHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.CustomSettings/Services/CustomSettingsAuthorizationHandler.cs
@@ -5,42 +5,41 @@
 using OrchardCore.Security;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.CustomSettings.Services
+namespace OrchardCore.CustomSettings.Services;
+
+public class CustomSettingsAuthorizationHandler : AuthorizationHandler<PermissionRequirement>
 {
-    public class CustomSettingsAuthorizationHandler : AuthorizationHandler<PermissionRequirement>
+    private readonly IServiceProvider _serviceProvider;
+
+    public CustomSettingsAuthorizationHandler(IServiceProvider serviceProvider)
     {
-        private readonly IServiceProvider _serviceProvider;
+        _serviceProvider = serviceProvider;
+    }
 
-        public CustomSettingsAuthorizationHandler(IServiceProvider serviceProvider)
+    protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement)
+    {
+        if (context.HasSucceeded)
         {
-            _serviceProvider = serviceProvider;
+            // This handler is not revoking any pre-existing grants.
+            return;
         }
 
-        protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement)
+        if (requirement.Permission.Name != "ManageResourceSettings")
+        {
+            return;
+        }
+
+        if (context.Resource == null || context.Resource.ToString() == "")
+        {
+            return;
+        }
+
+        // Lazy load to prevent circular dependencies
+        var authorizationService = _serviceProvider.GetService<IAuthorizationService>();
+
+        if (await authorizationService.AuthorizeAsync(context.User, new Permission(Permissions.CreatePermissionName(context.Resource.ToString()))))
         {
-            if (context.HasSucceeded)
-            {
-                // This handler is not revoking any pre-existing grants.
-                return;
-            }
-
-            if (requirement.Permission.Name != "ManageResourceSettings")
-            {
-                return;
-            }
-
-            if (context.Resource == null || context.Resource.ToString() == "")
-            {
-                return;
-            }
-
-            // Lazy load to prevent circular dependencies
-            var authorizationService = _serviceProvider.GetService<IAuthorizationService>();
-
-            if (await authorizationService.AuthorizeAsync(context.User, new Permission(Permissions.CreatePermissionName(context.Resource.ToString()))))
-            {
-                context.Succeed(requirement);
-            }
+            context.Succeed(requirement);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.CustomSettings/Services/CustomSettingsService.cs b/src/OrchardCore.Modules/OrchardCore.CustomSettings/Services/CustomSettingsService.cs
index 04253bb2826..4e666d31c71 100644
--- a/src/OrchardCore.Modules/OrchardCore.CustomSettings/Services/CustomSettingsService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.CustomSettings/Services/CustomSettingsService.cs
@@ -10,120 +10,119 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Settings;
 
-namespace OrchardCore.CustomSettings.Services
+namespace OrchardCore.CustomSettings.Services;
+
+public class CustomSettingsService
 {
-    public class CustomSettingsService
+    private readonly ISiteService _siteService;
+    private readonly IContentManager _contentManager;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly Lazy<Task<IDictionary<string, ContentTypeDefinition>>> _settingsTypes;
+
+    public CustomSettingsService(
+        ISiteService siteService,
+        IContentManager contentManager,
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService,
+        IContentDefinitionManager contentDefinitionManager)
     {
-        private readonly ISiteService _siteService;
-        private readonly IContentManager _contentManager;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly Lazy<Task<IDictionary<string, ContentTypeDefinition>>> _settingsTypes;
-
-        public CustomSettingsService(
-            ISiteService siteService,
-            IContentManager contentManager,
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService,
-            IContentDefinitionManager contentDefinitionManager)
-        {
-            _siteService = siteService;
-            _contentManager = contentManager;
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-            _contentDefinitionManager = contentDefinitionManager;
-            _settingsTypes = new Lazy<Task<IDictionary<string, ContentTypeDefinition>>>(GetContentTypeAsync);
-        }
+        _siteService = siteService;
+        _contentManager = contentManager;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+        _contentDefinitionManager = contentDefinitionManager;
+        _settingsTypes = new Lazy<Task<IDictionary<string, ContentTypeDefinition>>>(GetContentTypeAsync);
+    }
 
-        public async Task<IEnumerable<string>> GetAllSettingsTypeNamesAsync()
-            => (await _settingsTypes.Value).Keys;
+    public async Task<IEnumerable<string>> GetAllSettingsTypeNamesAsync()
+        => (await _settingsTypes.Value).Keys;
 
-        public async Task<IEnumerable<ContentTypeDefinition>> GetAllSettingsTypesAsync()
-            => (await _settingsTypes.Value).Values;
+    public async Task<IEnumerable<ContentTypeDefinition>> GetAllSettingsTypesAsync()
+        => (await _settingsTypes.Value).Values;
 
-        public async Task<IEnumerable<ContentTypeDefinition>> GetSettingsTypesAsync(params string[] settingsTypeNames)
-        {
-            var types = await _settingsTypes.Value;
-            var definitions = new List<ContentTypeDefinition>();
+    public async Task<IEnumerable<ContentTypeDefinition>> GetSettingsTypesAsync(params string[] settingsTypeNames)
+    {
+        var types = await _settingsTypes.Value;
+        var definitions = new List<ContentTypeDefinition>();
 
-            foreach (var settingsTypeName in settingsTypeNames)
+        foreach (var settingsTypeName in settingsTypeNames)
+        {
+            ContentTypeDefinition settingsType;
+            if (types.TryGetValue(settingsTypeName, out settingsType))
             {
-                ContentTypeDefinition settingsType;
-                if (types.TryGetValue(settingsTypeName, out settingsType))
-                {
-                    definitions.Add(settingsType);
-                }
+                definitions.Add(settingsType);
             }
-
-            return definitions;
         }
 
-        public ContentTypeDefinition GetSettingsType(string settingsTypeName)
-            => GetSettingsTypeAsync(settingsTypeName).Result;
+        return definitions;
+    }
 
-        public async Task<ContentTypeDefinition> GetSettingsTypeAsync(string settingsTypeName)
-        {
-            (await _settingsTypes.Value).TryGetValue(settingsTypeName, out var settingsType);
+    public ContentTypeDefinition GetSettingsType(string settingsTypeName)
+        => GetSettingsTypeAsync(settingsTypeName).Result;
 
-            return settingsType;
-        }
+    public async Task<ContentTypeDefinition> GetSettingsTypeAsync(string settingsTypeName)
+    {
+        (await _settingsTypes.Value).TryGetValue(settingsTypeName, out var settingsType);
 
-        public Task<bool> CanUserCreateSettingsAsync(ContentTypeDefinition settingsType)
-        {
-            var user = _httpContextAccessor.HttpContext?.User;
+        return settingsType;
+    }
 
-            return _authorizationService.AuthorizeAsync(user, Permissions.CreatePermissionForType(settingsType));
-        }
+    public Task<bool> CanUserCreateSettingsAsync(ContentTypeDefinition settingsType)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-        public Task<ContentItem> GetSettingsAsync(string settingsTypeName, Action isNew = null)
-        {
-            var settingsType = GetSettingsType(settingsTypeName);
-            if (settingsType == null)
-            {
-                return Task.FromResult<ContentItem>(null);
-            }
+        return _authorizationService.AuthorizeAsync(user, Permissions.CreatePermissionForType(settingsType));
+    }
 
-            return GetSettingsAsync(settingsType, isNew);
+    public Task<ContentItem> GetSettingsAsync(string settingsTypeName, Action isNew = null)
+    {
+        var settingsType = GetSettingsType(settingsTypeName);
+        if (settingsType == null)
+        {
+            return Task.FromResult<ContentItem>(null);
         }
 
-        public async Task<ContentItem> GetSettingsAsync(ContentTypeDefinition settingsType, Action isNew = null)
-        {
-            var site = await _siteService.GetSiteSettingsAsync();
+        return GetSettingsAsync(settingsType, isNew);
+    }
 
-            return await GetSettingsAsync(site, settingsType, isNew);
-        }
+    public async Task<ContentItem> GetSettingsAsync(ContentTypeDefinition settingsType, Action isNew = null)
+    {
+        var site = await _siteService.GetSiteSettingsAsync();
 
-        public async Task<ContentItem> GetSettingsAsync(ISite site, ContentTypeDefinition settingsType, Action isNew = null)
-        {
-            JsonNode property;
-            ContentItem contentItem;
+        return await GetSettingsAsync(site, settingsType, isNew);
+    }
 
-            if (site.Properties.TryGetPropertyValue(settingsType.Name, out property))
-            {
-                var existing = property.ToObject<ContentItem>();
+    public async Task<ContentItem> GetSettingsAsync(ISite site, ContentTypeDefinition settingsType, Action isNew = null)
+    {
+        JsonNode property;
+        ContentItem contentItem;
 
-                // Create a new item to take into account the current type definition.
-                contentItem = await _contentManager.NewAsync(existing.ContentType);
-                contentItem.Merge(existing);
-            }
-            else
-            {
-                contentItem = await _contentManager.NewAsync(settingsType.Name);
-                isNew?.Invoke();
-            }
+        if (site.Properties.TryGetPropertyValue(settingsType.Name, out property))
+        {
+            var existing = property.ToObject<ContentItem>();
 
-            return contentItem;
+            // Create a new item to take into account the current type definition.
+            contentItem = await _contentManager.NewAsync(existing.ContentType);
+            contentItem.Merge(existing);
         }
-
-        private async Task<IDictionary<string, ContentTypeDefinition>> GetContentTypeAsync()
+        else
         {
-            var contentTypes = await _contentDefinitionManager.ListTypeDefinitionsAsync();
+            contentItem = await _contentManager.NewAsync(settingsType.Name);
+            isNew?.Invoke();
+        }
 
-            var result = contentTypes.Where(x => x.StereotypeEquals(CustomSettingsConstants.Stereotype))
-            .ToDictionary(x => x.Name);
+        return contentItem;
+    }
 
-            return result;
-        }
+    private async Task<IDictionary<string, ContentTypeDefinition>> GetContentTypeAsync()
+    {
+        var contentTypes = await _contentDefinitionManager.ListTypeDefinitionsAsync();
+
+        var result = contentTypes.Where(x => x.StereotypeEquals(CustomSettingsConstants.Stereotype))
+        .ToDictionary(x => x.Name);
+
+        return result;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.CustomSettings/Startup.cs b/src/OrchardCore.Modules/OrchardCore.CustomSettings/Startup.cs
index 842fee1e316..93a212611e9 100644
--- a/src/OrchardCore.Modules/OrchardCore.CustomSettings/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.CustomSettings/Startup.cs
@@ -14,41 +14,40 @@
 using OrchardCore.Security.Permissions;
 using OrchardCore.Settings;
 
-namespace OrchardCore.CustomSettings
+namespace OrchardCore.CustomSettings;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IDisplayDriver<ISite>, CustomSettingsDisplayDriver>();
-            services.AddScoped<CustomSettingsService>();
-            services.AddScoped<IStereotypesProvider, CustomSettingsStereotypesProvider>();
-            // Permissions
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<IAuthorizationHandler, CustomSettingsAuthorizationHandler>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IDisplayDriver<ISite>, CustomSettingsDisplayDriver>();
+        services.AddScoped<CustomSettingsService>();
+        services.AddScoped<IStereotypesProvider, CustomSettingsStereotypesProvider>();
+        // Permissions
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<IAuthorizationHandler, CustomSettingsAuthorizationHandler>();
 
-            services.AddRecipeExecutionStep<CustomSettingsStep>();
+        services.AddRecipeExecutionStep<CustomSettingsStep>();
 
-            services.Configure<ContentTypeDefinitionOptions>(options =>
+        services.Configure<ContentTypeDefinitionOptions>(options =>
+        {
+            options.Stereotypes.TryAdd("CustomSettings", new ContentTypeDefinitionDriverOptions
             {
-                options.Stereotypes.TryAdd("CustomSettings", new ContentTypeDefinitionDriverOptions
-                {
-                    ShowCreatable = false,
-                    ShowListable = false,
-                    ShowDraftable = false,
-                    ShowVersionable = false,
-                });
+                ShowCreatable = false,
+                ShowListable = false,
+                ShowDraftable = false,
+                ShowVersionable = false,
             });
-        }
+        });
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class DeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class DeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<CustomSettingsDeploymentSource, CustomSettingsDeploymentStep, CustomSettingsDeploymentStepDriver>();
-        }
+        services.AddDeployment<CustomSettingsDeploymentSource, CustomSettingsDeploymentStep, CustomSettingsDeploymentStepDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.CustomSettings/ViewModels/CustomSettingsDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.CustomSettings/ViewModels/CustomSettingsDeploymentStepViewModel.cs
index e177b86f0c1..4863f97912c 100644
--- a/src/OrchardCore.Modules/OrchardCore.CustomSettings/ViewModels/CustomSettingsDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.CustomSettings/ViewModels/CustomSettingsDeploymentStepViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.CustomSettings.ViewModels
+namespace OrchardCore.CustomSettings.ViewModels;
+
+public class CustomSettingsDeploymentStepViewModel
 {
-    public class CustomSettingsDeploymentStepViewModel
-    {
-        public bool IncludeAll { get; set; }
-        public string[] SettingsTypeNames { get; set; }
-        public string[] AllSettingsTypeNames { get; set; }
-    }
+    public bool IncludeAll { get; set; }
+    public string[] SettingsTypeNames { get; set; }
+    public string[] AllSettingsTypeNames { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.CustomSettings/ViewModels/CustomSettingsEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.CustomSettings/ViewModels/CustomSettingsEditViewModel.cs
index ba24da44c4c..a4db4913d16 100644
--- a/src/OrchardCore.Modules/OrchardCore.CustomSettings/ViewModels/CustomSettingsEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.CustomSettings/ViewModels/CustomSettingsEditViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.CustomSettings.ViewModels
+namespace OrchardCore.CustomSettings.ViewModels;
+
+public class CustomSettingsEditViewModel
 {
-    public class CustomSettingsEditViewModel
-    {
-        public dynamic Editor { get; set; }
-    }
+    public dynamic Editor { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Demo/AdminMenu.cs
index 6b6c6773cb5..bdaab0eb52e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/AdminMenu.cs
@@ -2,56 +2,55 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Demo
+namespace OrchardCore.Demo;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    internal readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Demo"], "10", demo => demo
-                    .AddClass("demo").Id("demo")
-                    .Add(S["This Menu Item 1"], "0", item => item
-                        .Add(S["This is Menu Item 1.1"], subItem => subItem
-                            .Action("Index", "Admin", "OrchardCore.Demo"))
-                        .Add(S["This is Menu Item 1.2"], subItem => subItem
-                            .Action("Index", "Admin", "OrchardCore.Demo"))
-                        .Add(S["This is Menu Item 1.2"], subItem => subItem
-                            .Action("Index", "Admin", "OrchardCore.Demo"))
-                    )
-                    .Add(S["This Menu Item 2"], "0", item => item
-                        .Add(S["This is Menu Item 2.1"], subItem => subItem
-                            .Action("Index", "Admin", "OrchardCore.Demo"))
-                        .Add(S["This is Menu Item 2.2"], subItem => subItem
-                            .Action("Index", "Admin", "OrchardCore.Demo"))
-                        .Add(S["This is Menu Item 3.2"], subItem => subItem
-                            .Action("Index", "Admin", "OrchardCore.Demo"))
-                    )
-                    .Add(S["This Menu Item 3"], "0", item => item
-                        .Add(S["This is Menu Item 3.1"], subItem => subItem
-                            .Action("Index", "Admin", "OrchardCore.Demo"))
-                        .Add(S["This is Menu Item 3.2"], subItem => subItem
-                            .Action("Index", "Admin", "OrchardCore.Demo"))
+        builder
+            .Add(S["Demo"], "10", demo => demo
+                .AddClass("demo").Id("demo")
+                .Add(S["This Menu Item 1"], "0", item => item
+                    .Add(S["This is Menu Item 1.1"], subItem => subItem
+                        .Action("Index", "Admin", "OrchardCore.Demo"))
+                    .Add(S["This is Menu Item 1.2"], subItem => subItem
+                        .Action("Index", "Admin", "OrchardCore.Demo"))
+                    .Add(S["This is Menu Item 1.2"], subItem => subItem
+                        .Action("Index", "Admin", "OrchardCore.Demo"))
+                )
+                .Add(S["This Menu Item 2"], "0", item => item
+                    .Add(S["This is Menu Item 2.1"], subItem => subItem
+                        .Action("Index", "Admin", "OrchardCore.Demo"))
+                    .Add(S["This is Menu Item 2.2"], subItem => subItem
+                        .Action("Index", "Admin", "OrchardCore.Demo"))
+                    .Add(S["This is Menu Item 3.2"], subItem => subItem
+                        .Action("Index", "Admin", "OrchardCore.Demo"))
+                )
+                .Add(S["This Menu Item 3"], "0", item => item
+                    .Add(S["This is Menu Item 3.1"], subItem => subItem
+                        .Action("Index", "Admin", "OrchardCore.Demo"))
+                    .Add(S["This is Menu Item 3.2"], subItem => subItem
+                        .Action("Index", "Admin", "OrchardCore.Demo"))
 
-                    )
-                    .Add(S["Todo (Liquid - Frontend)"], "0", item => item
-                        .Action("Index", "Todo", "OrchardCore.Demo")
-                    )
-                );
+                )
+                .Add(S["Todo (Liquid - Frontend)"], "0", item => item
+                    .Action("Index", "Todo", "OrchardCore.Demo")
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Commands/DemoCommands.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Commands/DemoCommands.cs
index d21a3f03584..76c0f127ad4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Commands/DemoCommands.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Commands/DemoCommands.cs
@@ -2,26 +2,25 @@
 using Microsoft.Extensions.Logging;
 using OrchardCore.Environment.Commands;
 
-namespace OrchardCore.Demo.Commands
+namespace OrchardCore.Demo.Commands;
+
+public class DemoCommands : DefaultCommandHandler
 {
-    public class DemoCommands : DefaultCommandHandler
-    {
-        private readonly ILogger _logger;
+    private readonly ILogger _logger;
 
-        public DemoCommands(ILogger<DemoCommands> logger,
-            IStringLocalizer<DemoCommands> localizer) : base(localizer)
-        {
-            _logger = logger;
-        }
+    public DemoCommands(ILogger<DemoCommands> logger,
+        IStringLocalizer<DemoCommands> localizer) : base(localizer)
+    {
+        _logger = logger;
+    }
 
-        [CommandName("demo helloworld")]
-        [CommandHelp("demo helloworld says hi!")]
-        public void HelloWorld()
+    [CommandName("demo helloworld")]
+    [CommandHelp("demo helloworld says hi!")]
+    public void HelloWorld()
+    {
+        if (_logger.IsEnabled(LogLevel.Information))
         {
-            if (_logger.IsEnabled(LogLevel.Information))
-            {
-                _logger.LogInformation("Hi there from Hello World!");
-            }
+            _logger.LogInformation("Hi there from Hello World!");
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Components/FakeViewComponent.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Components/FakeViewComponent.cs
index d6184ee3e7f..ae250361a3b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Components/FakeViewComponent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Components/FakeViewComponent.cs
@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace OrchardCore.Demo.Components
+namespace OrchardCore.Demo.Components;
+
+public class FakeViewComponent : ViewComponent
 {
-    public class FakeViewComponent : ViewComponent
+    public IViewComponentResult Invoke(string value)
     {
-        public IViewComponentResult Invoke(string value)
-        {
-            return View("Default", value);
-        }
+        return View("Default", value);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/ContentElementDisplays/TestContentElementDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Demo/ContentElementDisplays/TestContentElementDisplayDriver.cs
index 97300728c47..d0d276b36ed 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/ContentElementDisplays/TestContentElementDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/ContentElementDisplays/TestContentElementDisplayDriver.cs
@@ -7,81 +7,80 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Demo.ContentElementDisplays
+namespace OrchardCore.Demo.ContentElementDisplays;
+
+public sealed class TestContentElementDisplayDriver : ContentDisplayDriver
 {
-    public sealed class TestContentElementDisplayDriver : ContentDisplayDriver
+    private static int _creating;
+    private static int _processing;
+
+    public override IDisplayResult Display(ContentItem contentItem, BuildDisplayContext context)
     {
-        private static int _creating;
-        private static int _processing;
+        var testContentPart = contentItem.As<TestContentPartA>();
 
-        public override IDisplayResult Display(ContentItem contentItem, BuildDisplayContext context)
+        if (testContentPart == null)
         {
-            var testContentPart = contentItem.As<TestContentPartA>();
+            return null;
+        }
 
-            if (testContentPart == null)
-            {
-                return null;
-            }
+        return Combine(
+            // A new shape is created and the properties of the object are bound to it when rendered
+            Copy("TestContentPartA", testContentPart).Location("Detail", "Content"),
+            // New shape, no initialization, custom location
+            Dynamic("LowerDoll").Location("Detail", "Footer"),
+            // New shape
+            Factory("TestContentPartA",
+                async ctx => (await ctx.New.TestContentPartA()).Creating(_creating++),
+                shape =>
+                {
+                    shape.Properties["Processing"] = _processing++;
 
-            return Combine(
-                // A new shape is created and the properties of the object are bound to it when rendered
-                Copy("TestContentPartA", testContentPart).Location("Detail", "Content"),
-                // New shape, no initialization, custom location
-                Dynamic("LowerDoll").Location("Detail", "Footer"),
-                // New shape
-                Factory("TestContentPartA",
-                    async ctx => (await ctx.New.TestContentPartA()).Creating(_creating++),
-                    shape =>
-                    {
-                        shape.Properties["Processing"] = _processing++;
+                    return Task.CompletedTask;
+                })
+                .Location("Detail", "Content")
+                .Cache("lowerdoll2", cache => cache.WithExpiryAfter(TimeSpan.FromSeconds(5))),
+            // A strongly typed shape model is used and initialized when rendered
+            Initialize<TestContentPartAShape>(shape => { shape.Line = "Strongly typed shape"; })
+                .Location("Detail", "Content:2"),
+            // Cached shape
+            Dynamic("LowerDoll")
+                .Location("Detail", "/Footer")
+                .Cache("lowerdoll", cache => cache.WithExpiryAfter(TimeSpan.FromSeconds(5)))
+            );
+    }
 
-                        return Task.CompletedTask;
-                    })
-                    .Location("Detail", "Content")
-                    .Cache("lowerdoll2", cache => cache.WithExpiryAfter(TimeSpan.FromSeconds(5))),
-                // A strongly typed shape model is used and initialized when rendered
-                Initialize<TestContentPartAShape>(shape => { shape.Line = "Strongly typed shape"; })
-                    .Location("Detail", "Content:2"),
-                // Cached shape
-                Dynamic("LowerDoll")
-                    .Location("Detail", "/Footer")
-                    .Cache("lowerdoll", cache => cache.WithExpiryAfter(TimeSpan.FromSeconds(5)))
-                );
-        }
+    public override IDisplayResult Edit(ContentItem contentItem, BuildEditorContext context)
+    {
+        var testContentPart = contentItem.As<TestContentPartA>();
 
-        public override IDisplayResult Edit(ContentItem contentItem, BuildEditorContext context)
+        if (testContentPart == null)
         {
-            var testContentPart = contentItem.As<TestContentPartA>();
-
-            if (testContentPart == null)
-            {
-                return null;
-            }
-
-            return Copy("TestContentPartA_Edit", testContentPart).Location("Content");
+            return null;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentItem contentItem, UpdateEditorContext context)
-        {
-            var testContentPart = contentItem.As<TestContentPartA>();
+        return Copy("TestContentPartA_Edit", testContentPart).Location("Content");
+    }
 
-            if (testContentPart == null)
-            {
-                return null;
-            }
+    public override async Task<IDisplayResult> UpdateAsync(ContentItem contentItem, UpdateEditorContext context)
+    {
+        var testContentPart = contentItem.As<TestContentPartA>();
 
-            await context.Updater.TryUpdateModelAsync(testContentPart, "");
+        if (testContentPart == null)
+        {
+            return null;
+        }
 
-            if (testContentPart.Line.EndsWith(' '))
-            {
-                context.Updater.ModelState.AddModelError(nameof(testContentPart.Line), "Value cannot end with a space");
-            }
-            else
-            {
-                contentItem.Apply(testContentPart);
-            }
+        await context.Updater.TryUpdateModelAsync(testContentPart, "");
 
-            return Copy("TestContentPartA_Edit", testContentPart).Location("Content");
+        if (testContentPart.Line.EndsWith(' '))
+        {
+            context.Updater.ModelState.AddModelError(nameof(testContentPart.Line), "Value cannot end with a space");
+        }
+        else
+        {
+            contentItem.Apply(testContentPart);
         }
+
+        return Copy("TestContentPartA_Edit", testContentPart).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/AdminController.cs
index 29ae2eb7222..298b42587df 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/AdminController.cs
@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace OrchardCore.Demo.Controllers
+namespace OrchardCore.Demo.Controllers;
+
+public class AdminController : Controller
 {
-    public class AdminController : Controller
+    public IActionResult Index()
     {
-        public IActionResult Index()
-        {
-            return View();
-        }
+        return View();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/ContentApiController.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/ContentApiController.cs
index 098db090c55..02c07f60fca 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/ContentApiController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/ContentApiController.cs
@@ -4,68 +4,67 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Contents;
 
-namespace OrchardCore.Demo.Controllers
+namespace OrchardCore.Demo.Controllers;
+
+[Route("api/demo")]
+[Authorize(AuthenticationSchemes = "Api"), IgnoreAntiforgeryToken, AllowAnonymous]
+[ApiController]
+public class ContentApiController : ControllerBase
 {
-    [Route("api/demo")]
-    [Authorize(AuthenticationSchemes = "Api"), IgnoreAntiforgeryToken, AllowAnonymous]
-    [ApiController]
-    public class ContentApiController : ControllerBase
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IContentManager _contentManager;
+
+    public ContentApiController(IAuthorizationService authorizationService, IContentManager contentManager)
+    {
+        _authorizationService = authorizationService;
+        _contentManager = contentManager;
+    }
+
+    public async Task<IActionResult> GetById(string id)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IContentManager _contentManager;
+        var contentItem = await _contentManager.GetAsync(id);
 
-        public ContentApiController(IAuthorizationService authorizationService, IContentManager contentManager)
+        if (contentItem == null)
         {
-            _authorizationService = authorizationService;
-            _contentManager = contentManager;
+            return NotFound();
         }
 
-        public async Task<IActionResult> GetById(string id)
+        return new ObjectResult(contentItem);
+    }
+
+    public async Task<IActionResult> GetAuthorizedById(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.DemoAPIAccess))
         {
-            var contentItem = await _contentManager.GetAsync(id);
+            return this.ChallengeOrForbid("Api");
+        }
 
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
+        var contentItem = await _contentManager.GetAsync(id);
 
-            return new ObjectResult(contentItem);
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ViewContent, contentItem))
+        {
+            return this.ChallengeOrForbid("Api");
         }
 
-        public async Task<IActionResult> GetAuthorizedById(string id)
+        if (contentItem == null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.DemoAPIAccess))
-            {
-                return this.ChallengeOrForbid("Api");
-            }
-
-            var contentItem = await _contentManager.GetAsync(id);
-
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ViewContent, contentItem))
-            {
-                return this.ChallengeOrForbid("Api");
-            }
-
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
-
-            return new ObjectResult(contentItem);
+            return NotFound();
         }
 
-        [HttpPost]
-        [Authorize]
-        public async Task<IActionResult> AddContent(ContentItem contentItem)
+        return new ObjectResult(contentItem);
+    }
+
+    [HttpPost]
+    [Authorize]
+    public async Task<IActionResult> AddContent(ContentItem contentItem)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.DemoAPIAccess))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.DemoAPIAccess))
-            {
-                return this.ChallengeOrForbid("Api");
-            }
+            return this.ChallengeOrForbid("Api");
+        }
 
-            await _contentManager.CreateAsync(contentItem);
+        await _contentManager.CreateAsync(contentItem);
 
-            return new ObjectResult(contentItem);
-        }
+        return new ObjectResult(contentItem);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/ContentController.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/ContentController.cs
index d51165bdfb8..4f4a4ad2c6a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/ContentController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/ContentController.cs
@@ -9,95 +9,94 @@
 using YesSql;
 using IHttpContextAccessor = Microsoft.AspNetCore.Http.IHttpContextAccessor;
 
-namespace OrchardCore.Demo.Controllers
+namespace OrchardCore.Demo.Controllers;
+
+public class ContentController : Controller
 {
-    public class ContentController : Controller
+    private readonly IContentItemDisplayManager _contentDisplay;
+    private readonly IContentManager _contentManager;
+    private readonly ISession _session;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+
+    public ContentController(
+        IContentManager contentManager,
+        IContentItemDisplayManager contentDisplay,
+        ISession session,
+        IUpdateModelAccessor updateModelAccessor,
+        IAuthorizationService authorizationService,
+        IHttpContextAccessor httpContextAccessor)
     {
-        private readonly IContentItemDisplayManager _contentDisplay;
-        private readonly IContentManager _contentManager;
-        private readonly ISession _session;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-
-        public ContentController(
-            IContentManager contentManager,
-            IContentItemDisplayManager contentDisplay,
-            ISession session,
-            IUpdateModelAccessor updateModelAccessor,
-            IAuthorizationService authorizationService,
-            IHttpContextAccessor httpContextAccessor)
+        _contentManager = contentManager;
+        _contentDisplay = contentDisplay;
+        _session = session;
+        _updateModelAccessor = updateModelAccessor;
+        _authorizationService = authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+    }
+
+    public async Task<ActionResult> Display(string contentItemId)
+    {
+        var contentItem = await _contentManager.GetAsync(contentItemId);
+
+        if (contentItem == null)
         {
-            _contentManager = contentManager;
-            _contentDisplay = contentDisplay;
-            _session = session;
-            _updateModelAccessor = updateModelAccessor;
-            _authorizationService = authorizationService;
-            _httpContextAccessor = httpContextAccessor;
+            return NotFound();
         }
 
-        public async Task<ActionResult> Display(string contentItemId)
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.ViewContent, contentItem))
         {
-            var contentItem = await _contentManager.GetAsync(contentItemId);
+            return Forbid();
+        }
 
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
+        var shape = await _contentDisplay.BuildDisplayAsync(contentItem, _updateModelAccessor.ModelUpdater);
+        return View(shape);
+    }
 
-            if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.ViewContent, contentItem))
-            {
-                return Forbid();
-            }
+    [Admin("Demo/Content/Edit", "Demo.Content.Edit")]
+    public async Task<ActionResult> Edit(string contentItemId)
+    {
+        var contentItem = await _contentManager.GetAsync(contentItemId);
 
-            var shape = await _contentDisplay.BuildDisplayAsync(contentItem, _updateModelAccessor.ModelUpdater);
-            return View(shape);
+        if (contentItem == null)
+        {
+            return NotFound();
         }
 
-        [Admin("Demo/Content/Edit", "Demo.Content.Edit")]
-        public async Task<ActionResult> Edit(string contentItemId)
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.EditContent, contentItem))
         {
-            var contentItem = await _contentManager.GetAsync(contentItemId);
+            return Forbid();
+        }
 
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
+        var shape = await _contentDisplay.BuildEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, false);
+        return View(shape);
+    }
 
-            if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.EditContent, contentItem))
-            {
-                return Forbid();
-            }
+    [Admin, HttpPost, ActionName("Edit")]
+    public async Task<ActionResult> EditPost(string contentItemId)
+    {
+        var contentItem = await _contentManager.GetAsync(contentItemId);
 
-            var shape = await _contentDisplay.BuildEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, false);
-            return View(shape);
+        if (contentItem == null)
+        {
+            return NotFound();
         }
 
-        [Admin, HttpPost, ActionName("Edit")]
-        public async Task<ActionResult> EditPost(string contentItemId)
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.EditContent, contentItem))
         {
-            var contentItem = await _contentManager.GetAsync(contentItemId);
-
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
-
-            if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.EditContent, contentItem))
-            {
-                return Forbid();
-            }
-
-            var shape = await _contentDisplay.UpdateEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, false);
+            return Forbid();
+        }
 
-            if (!ModelState.IsValid)
-            {
-                await _session.CancelAsync();
-                return View(nameof(Edit), shape);
-            }
+        var shape = await _contentDisplay.UpdateEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, false);
 
-            await _session.SaveAsync(contentItem);
-            return RedirectToAction(nameof(Edit), contentItemId);
+        if (!ModelState.IsValid)
+        {
+            await _session.CancelAsync();
+            return View(nameof(Edit), shape);
         }
+
+        await _session.SaveAsync(contentItem);
+        return RedirectToAction(nameof(Edit), contentItemId);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/DemoController.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/DemoController.cs
index ed9290f6745..6ffe1b85a11 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/DemoController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/DemoController.cs
@@ -1,24 +1,23 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace OrchardCore.Demo.Controllers
+namespace OrchardCore.Demo.Controllers;
+
+public class DemoController : Controller
 {
-    public class DemoController : Controller
+    [Route("Demo")]
+    [Route("Demo/Index")]
+    public IActionResult Index()
+    {
+        return Content("Index content");
+    }
+    [Route("Demo/About")]
+    public IActionResult About()
+    {
+        return Content("About content");
+    }
+    [Route("Demo/Contact")]
+    public IActionResult Contact()
     {
-        [Route("Demo")]
-        [Route("Demo/Index")]
-        public IActionResult Index()
-        {
-            return Content("Index content");
-        }
-        [Route("Demo/About")]
-        public IActionResult About()
-        {
-            return Content("About content");
-        }
-        [Route("Demo/Contact")]
-        public IActionResult Contact()
-        {
-            return Content("Contact content");
-        }
+        return Content("Contact content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/HomeController.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/HomeController.cs
index 69ce76ff4b4..2ca96f47b54 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/HomeController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/HomeController.cs
@@ -12,143 +12,142 @@
 using OrchardCore.Environment.Shell.Scope;
 using YesSql;
 
-namespace OrchardCore.Demo.Controllers
+namespace OrchardCore.Demo.Controllers;
+
+public class HomeController : Controller
 {
-    public class HomeController : Controller
+    private readonly ITestDependency _testDependency;
+    private readonly IContentManager _contentManager;
+    private readonly ISession _session;
+    private readonly ILogger _logger;
+    private readonly ITagCache _tagCache;
+    private readonly IContentItemDisplayManager _contentDisplay;
+
+    public HomeController(
+        ITestDependency testDependency,
+        IContentManager contentManager,
+        IShapeFactory shapeFactory,
+        ISession session,
+        ILogger<HomeController> logger,
+        ITagCache tagCache,
+        IContentItemDisplayManager contentDisplay)
     {
-        private readonly ITestDependency _testDependency;
-        private readonly IContentManager _contentManager;
-        private readonly ISession _session;
-        private readonly ILogger _logger;
-        private readonly ITagCache _tagCache;
-        private readonly IContentItemDisplayManager _contentDisplay;
-
-        public HomeController(
-            ITestDependency testDependency,
-            IContentManager contentManager,
-            IShapeFactory shapeFactory,
-            ISession session,
-            ILogger<HomeController> logger,
-            ITagCache tagCache,
-            IContentItemDisplayManager contentDisplay)
-        {
-            _session = session;
-            _testDependency = testDependency;
-            _contentManager = contentManager;
-            Shape = shapeFactory;
-            _logger = logger;
-            _tagCache = tagCache;
-            _contentDisplay = contentDisplay;
-        }
+        _session = session;
+        _testDependency = testDependency;
+        _contentManager = contentManager;
+        Shape = shapeFactory;
+        _logger = logger;
+        _tagCache = tagCache;
+        _contentDisplay = contentDisplay;
+    }
 
-        private dynamic Shape { get; set; }
+    private dynamic Shape { get; set; }
 
-        public ActionResult Index()
-        {
-            return View();
-        }
+    public ActionResult Index()
+    {
+        return View();
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> Index(string text)
-        {
-            var contentItem = await _contentManager.NewAsync("Foo");
+    [HttpPost]
+    public async Task<IActionResult> Index(string text)
+    {
+        var contentItem = await _contentManager.NewAsync("Foo");
 
-            // Dynamic syntax
-            contentItem.Content.TestContentPartA.Line = text + "blah";
+        // Dynamic syntax
+        contentItem.Content.TestContentPartA.Line = text + "blah";
 
-            // Explicit syntax
-            var testPart = contentItem.As<TestContentPartA>();
-            testPart.Line = text;
-            contentItem.Apply(testPart);
+        // Explicit syntax
+        var testPart = contentItem.As<TestContentPartA>();
+        testPart.Line = text;
+        contentItem.Apply(testPart);
 
-            // "Alter" syntax
-            contentItem.Alter<TestContentPartA>(x => x.Line = text);
+        // "Alter" syntax
+        contentItem.Alter<TestContentPartA>(x => x.Line = text);
 
-            await _contentManager.CreateAsync(contentItem);
+        await _contentManager.CreateAsync(contentItem);
 
-            _logger.LogInformation("This is some log");
+        _logger.LogInformation("This is some log");
 
-            return RedirectToAction("Display", "Home", new { area = "OrchardCore.Demo", contentItemId = contentItem.ContentItemId });
-        }
+        return RedirectToAction("Display", "Home", new { area = "OrchardCore.Demo", contentItemId = contentItem.ContentItemId });
+    }
 
-        public ActionResult Tag()
-        {
-            return View();
-        }
+    public ActionResult Tag()
+    {
+        return View();
+    }
 
-        [HttpPost]
-        public async Task<ActionResult> Tag(string tag)
-        {
-            await _tagCache.RemoveTagAsync(tag);
-            return RedirectToAction(nameof(Tag), "Home", new { area = "OrchardCore.Demo" });
-        }
+    [HttpPost]
+    public async Task<ActionResult> Tag(string tag)
+    {
+        await _tagCache.RemoveTagAsync(tag);
+        return RedirectToAction(nameof(Tag), "Home", new { area = "OrchardCore.Demo" });
+    }
 
-        public async Task<ActionResult> Display(string contentItemId)
+    public async Task<ActionResult> Display(string contentItemId)
+    {
+        var contentItem = await _contentManager.GetAsync(contentItemId);
+
+        if (contentItem == null)
         {
-            var contentItem = await _contentManager.GetAsync(contentItemId);
+            return NotFound();
+        }
 
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
+        return View("Display", contentItem);
+    }
 
-            return View("Display", contentItem);
-        }
+    public async Task<ActionResult> DisplayShape(string contentItemId)
+    {
+        var contentItem = await _contentManager.GetAsync(contentItemId);
 
-        public async Task<ActionResult> DisplayShape(string contentItemId)
+        if (contentItem == null)
         {
-            var contentItem = await _contentManager.GetAsync(contentItemId);
-
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
+            return NotFound();
+        }
 
-            var shape = await Shape.Foo(Line: contentItem.As<TestContentPartA>().Line);
+        var shape = await Shape.Foo(Line: contentItem.As<TestContentPartA>().Line);
 
-            return View(shape);
-        }
+        return View(shape);
+    }
 
-        public IActionResult AddProperty() => View();
+    public IActionResult AddProperty() => View();
 
-        public ActionResult Raw()
-        {
-            return View();
-        }
+    public ActionResult Raw()
+    {
+        return View();
+    }
 
-        public ActionResult Cache()
-        {
-            return View();
-        }
+    public ActionResult Cache()
+    {
+        return View();
+    }
 
 #pragma warning disable CA1822 // Mark members as static
-        public string GCCollect()
-        {
-            GC.Collect();
-            return "OK";
-        }
+    public string GCCollect()
+    {
+        GC.Collect();
+        return "OK";
+    }
 
-        public ActionResult IndexError()
-        {
-            throw new Exception("ERROR!!!!");
-        }
+    public ActionResult IndexError()
+    {
+        throw new Exception("ERROR!!!!");
+    }
 
-        public string CreateTask()
+    public string CreateTask()
+    {
+        ShellScope.AddDeferredTask(scope =>
         {
-            ShellScope.AddDeferredTask(scope =>
-            {
-                var logger = scope.ServiceProvider.GetService<ILogger<HomeController>>();
-                logger.LogError("Task deferred successfully");
-                return Task.CompletedTask;
-            });
-
-            return "Check for logs";
-        }
+            var logger = scope.ServiceProvider.GetService<ILogger<HomeController>>();
+            logger.LogError("Task deferred successfully");
+            return Task.CompletedTask;
+        });
+
+        return "Check for logs";
+    }
 #pragma warning restore CA1822 // Mark members as static
 
-        public IActionResult ShapePerformance()
-        {
-            return View();
-        }
+    public IActionResult ShapePerformance()
+    {
+        return View();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/TodoController.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/TodoController.cs
index 33f7c16652f..1c0f9ce6637 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/TodoController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Controllers/TodoController.cs
@@ -5,108 +5,107 @@
 using OrchardCore.Demo.ViewModels;
 using YesSql;
 
-namespace OrchardCore.Demo.Controllers
+namespace OrchardCore.Demo.Controllers;
+
+public class TodoController : Controller
 {
-    public class TodoController : Controller
+    private readonly ISession _session;
+    private readonly Entities.IIdGenerator _idGenerator;
+
+    public TodoController(ISession session, Entities.IIdGenerator idGenerator)
     {
-        private readonly ISession _session;
-        private readonly Entities.IIdGenerator _idGenerator;
+        _session = session;
+        _idGenerator = idGenerator;
+    }
 
-        public TodoController(ISession session, Entities.IIdGenerator idGenerator)
-        {
-            _session = session;
-            _idGenerator = idGenerator;
-        }
+    public async Task<IActionResult> Index()
+    {
+        var list = (await _session.Query<TodoModel>().ListAsync())
+            .Select(m => new TodoViewModel()
+            {
+                TodoId = m.TodoId,
+                Text = m.Text,
+                DueDate = m.DueDate,
+                IsCompleted = m.IsCompleted,
+            })
+            .ToList();
+
+        return View(list);
+    }
 
-        public async Task<IActionResult> Index()
+    public IActionResult Create()
+    {
+        var viewModel = new TodoViewModel
         {
-            var list = (await _session.Query<TodoModel>().ListAsync())
-                .Select(m => new TodoViewModel()
-                {
-                    TodoId = m.TodoId,
-                    Text = m.Text,
-                    DueDate = m.DueDate,
-                    IsCompleted = m.IsCompleted,
-                })
-                .ToList();
-
-            return View(list);
-        }
+            TodoId = _idGenerator.GenerateUniqueId(),
+            DisplayMode = "Edit",
+        };
 
-        public IActionResult Create()
-        {
-            var viewModel = new TodoViewModel
-            {
-                TodoId = _idGenerator.GenerateUniqueId(),
-                DisplayMode = "Edit",
-            };
+        return View(nameof(Edit), viewModel);
+    }
 
-            return View(nameof(Edit), viewModel);
-        }
+    public async Task<IActionResult> Edit(string todoId)
+    {
+        var model = (await _session.Query<TodoModel>().ListAsync())
+            .FirstOrDefault(m => m.TodoId == todoId);
 
-        public async Task<IActionResult> Edit(string todoId)
+        if (model == null)
         {
-            var model = (await _session.Query<TodoModel>().ListAsync())
-                .FirstOrDefault(m => m.TodoId == todoId);
-
-            if (model == null)
-            {
-                return NotFound();
-            }
-
-            var viewModel = new TodoViewModel()
-            {
-                TodoId = model.TodoId,
-                Text = model.Text,
-                DueDate = model.DueDate,
-                IsCompleted = model.IsCompleted,
-                DisplayMode = "Edit",
-            };
-
-            return View(viewModel);
+            return NotFound();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Update(TodoViewModel viewModel, string returnUrl = "")
+        var viewModel = new TodoViewModel()
         {
-            if (ModelState.IsValid)
-            {
-                var model = (await _session.Query<TodoModel>().ListAsync())
-                    .FirstOrDefault(m => m.TodoId == viewModel.TodoId);
+            TodoId = model.TodoId,
+            Text = model.Text,
+            DueDate = model.DueDate,
+            IsCompleted = model.IsCompleted,
+            DisplayMode = "Edit",
+        };
+
+        return View(viewModel);
+    }
 
-                model ??= new TodoModel() { TodoId = viewModel.TodoId };
+    [HttpPost]
+    public async Task<IActionResult> Update(TodoViewModel viewModel, string returnUrl = "")
+    {
+        if (ModelState.IsValid)
+        {
+            var model = (await _session.Query<TodoModel>().ListAsync())
+                .FirstOrDefault(m => m.TodoId == viewModel.TodoId);
 
-                model.Text = viewModel.Text;
-                model.DueDate = viewModel.DueDate;
-                model.IsCompleted = viewModel.IsCompleted;
+            model ??= new TodoModel() { TodoId = viewModel.TodoId };
 
-                await _session.SaveAsync(model);
+            model.Text = viewModel.Text;
+            model.DueDate = viewModel.DueDate;
+            model.IsCompleted = viewModel.IsCompleted;
 
-                if (Url.IsLocalUrl(returnUrl))
-                {
-                    return this.Redirect(returnUrl, true);
-                }
+            await _session.SaveAsync(model);
 
-                return RedirectToAction(nameof(Index), "Todo");
+            if (Url.IsLocalUrl(returnUrl))
+            {
+                return this.Redirect(returnUrl, true);
             }
 
-            viewModel.DisplayMode = "Edit";
-            return View(nameof(Edit), viewModel);
+            return RedirectToAction(nameof(Index), "Todo");
         }
 
-        public async Task<IActionResult> Delete(string todoId)
-        {
-            var model = (await _session.Query<TodoModel>().ListAsync())
-                .FirstOrDefault(m => m.TodoId == todoId);
-
-            if (model == null)
-            {
-                return NotFound();
-            }
+        viewModel.DisplayMode = "Edit";
+        return View(nameof(Edit), viewModel);
+    }
 
-            _session.Delete(model);
+    public async Task<IActionResult> Delete(string todoId)
+    {
+        var model = (await _session.Query<TodoModel>().ListAsync())
+            .FirstOrDefault(m => m.TodoId == todoId);
 
-            return RedirectToAction(nameof(Index), "Todo");
+        if (model == null)
+        {
+            return NotFound();
         }
+
+        _session.Delete(model);
+
+        return RedirectToAction(nameof(Index), "Todo");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Drivers/UserProfileDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Drivers/UserProfileDisplayDriver.cs
index 6691f8f80cc..eb0bac32944 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Drivers/UserProfileDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Drivers/UserProfileDisplayDriver.cs
@@ -9,48 +9,47 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Users.Models;
 
-namespace OrchardCore.Demo.Drivers
+namespace OrchardCore.Demo.Drivers;
+
+public sealed class UserProfileDisplayDriver : SectionDisplayDriver<User, UserProfile>
 {
-    public sealed class UserProfileDisplayDriver : SectionDisplayDriver<User, UserProfile>
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+
+    public UserProfileDisplayDriver(IHttpContextAccessor httpContextAccessor, IAuthorizationService authorizationService)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
 
-        public UserProfileDisplayDriver(IHttpContextAccessor httpContextAccessor, IAuthorizationService authorizationService)
+    public override IDisplayResult Edit(User user, UserProfile profile, BuildEditorContext context)
+    {
+        return Initialize<EditUserProfileViewModel>("UserProfile_Edit", model =>
         {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-        }
+            model.Age = profile.Age;
+            model.FirstName = profile.FirstName;
+            model.LastName = profile.LastName;
+        })
+        .Location("Content:2")
+        .RenderWhen(() => _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageOwnUserProfile));
+    }
 
-        public override IDisplayResult Edit(User user, UserProfile profile, BuildEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(User user, UserProfile profile, UpdateEditorContext context)
+    {
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageOwnUserProfile))
         {
-            return Initialize<EditUserProfileViewModel>("UserProfile_Edit", model =>
-            {
-                model.Age = profile.Age;
-                model.FirstName = profile.FirstName;
-                model.LastName = profile.LastName;
-            })
-            .Location("Content:2")
-            .RenderWhen(() => _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageOwnUserProfile));
+            return Edit(user, profile, context);
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(User user, UserProfile profile, UpdateEditorContext context)
-        {
-            if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageOwnUserProfile))
-            {
-                return Edit(user, profile, context);
-            }
-
-            var model = new EditUserProfileViewModel();
+        var model = new EditUserProfileViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            profile.Age = model.Age;
-            profile.FirstName = model.FirstName;
-            profile.LastName = model.LastName;
-            profile.UpdatedAt = DateTime.UtcNow;
+        profile.Age = model.Age;
+        profile.FirstName = model.FirstName;
+        profile.LastName = model.LastName;
+        profile.UpdatedAt = DateTime.UtcNow;
 
-            return Edit(user, profile, context);
-        }
+        return Edit(user, profile, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Demo/GraphQL/Startup.cs
index c4d596b58f9..208ed08e34e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/GraphQL/Startup.cs
@@ -4,81 +4,44 @@
 using OrchardCore.Demo.Models;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Demo.GraphQL
+namespace OrchardCore.Demo.GraphQL;
+
+[RequireFeatures("OrchardCore.Apis.GraphQL")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Apis.GraphQL")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<GraphQLContentOptions>(options =>
         {
-            services.Configure<GraphQLContentOptions>(options =>
-            {
-                // Top Level Content Type options
-                options.ContentTypeOptions = options.ContentTypeOptions.Union(new[] {
-                        new GraphQLContentTypeOption("Blog")
-                        {
-                            Collapse = false,
-                            Hidden = false,
-                            PartOptions = new GraphQLContentPartOption[] {
-                                // Content Part options attached to Content Type
-                                new("TestContentPartA")
-                                {
-                                    Collapse = false,
-                                    Hidden = false
-                                },
-                                new GraphQLContentPartOption<TestContentPartA>
-                                {
-                                    Collapse = false,
-                                    Hidden = false
-                                }
+            // Top Level Content Type options
+            options.ContentTypeOptions = options.ContentTypeOptions.Union(new[] {
+                    new GraphQLContentTypeOption("Blog")
+                    {
+                        Collapse = false,
+                        Hidden = false,
+                        PartOptions = new GraphQLContentPartOption[] {
+                            // Content Part options attached to Content Type
+                            new("TestContentPartA")
+                            {
+                                Collapse = false,
+                                Hidden = false
+                            },
+                            new GraphQLContentPartOption<TestContentPartA>
+                            {
+                                Collapse = false,
+                                Hidden = false
                             }
                         }
                     }
-                );
-
-                options.ConfigureContentType("Blog", (typeConfig) =>
-                {
-                    typeConfig.Collapse = false;
-                    typeConfig.Hidden = false;
-
-                    typeConfig
-                        .ConfigurePart("TestContentPartA", (partConfig) =>
-                        {
-                            partConfig.Collapse = false;
-                            partConfig.Hidden = false;
-                        })
-                        .ConfigurePart<TestContentPartA>((partConfig) =>
-                        {
-                            partConfig.Collapse = false;
-                            partConfig.Hidden = false;
-                        });
-                });
+                }
+            );
 
-                // Ignore Fields on GraphQL Objects
-                options.HiddenFields = options.HiddenFields.Union(new[] {
-                    new GraphQLField<TestQueryObjectType>("lineIgnored"),
-                    new GraphQLField<TestQueryObjectType>("lineOtherIgnored")
-                });
-
-                options
-                    .IgnoreField<TestQueryObjectType>("lineIgnored")
-                    .IgnoreField<TestQueryObjectType>("lineOtherIgnored");
-
-                // Top level Part Options
-                options.PartOptions = options.PartOptions.Union(new[] {
-                    new GraphQLContentPartOption("TestContentPartA")
-                    {
-                        Collapse = false,
-                        Hidden = false
-                    },
-                    new GraphQLContentPartOption<TestContentPartA>
-                    {
-                        Collapse = false,
-                        Hidden = false
-                    }
-                });
+            options.ConfigureContentType("Blog", (typeConfig) =>
+            {
+                typeConfig.Collapse = false;
+                typeConfig.Hidden = false;
 
-                options
+                typeConfig
                     .ConfigurePart("TestContentPartA", (partConfig) =>
                     {
                         partConfig.Collapse = false;
@@ -90,6 +53,42 @@ public override void ConfigureServices(IServiceCollection services)
                         partConfig.Hidden = false;
                     });
             });
-        }
+
+            // Ignore Fields on GraphQL Objects
+            options.HiddenFields = options.HiddenFields.Union(new[] {
+                new GraphQLField<TestQueryObjectType>("lineIgnored"),
+                new GraphQLField<TestQueryObjectType>("lineOtherIgnored")
+            });
+
+            options
+                .IgnoreField<TestQueryObjectType>("lineIgnored")
+                .IgnoreField<TestQueryObjectType>("lineOtherIgnored");
+
+            // Top level Part Options
+            options.PartOptions = options.PartOptions.Union(new[] {
+                new GraphQLContentPartOption("TestContentPartA")
+                {
+                    Collapse = false,
+                    Hidden = false
+                },
+                new GraphQLContentPartOption<TestContentPartA>
+                {
+                    Collapse = false,
+                    Hidden = false
+                }
+            });
+
+            options
+                .ConfigurePart("TestContentPartA", (partConfig) =>
+                {
+                    partConfig.Collapse = false;
+                    partConfig.Hidden = false;
+                })
+                .ConfigurePart<TestContentPartA>((partConfig) =>
+                {
+                    partConfig.Collapse = false;
+                    partConfig.Hidden = false;
+                });
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/GraphQL/TestQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Demo/GraphQL/TestQueryObjectType.cs
index 982345de955..1e87829b396 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/GraphQL/TestQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/GraphQL/TestQueryObjectType.cs
@@ -1,17 +1,16 @@
 using GraphQL.Types;
 using OrchardCore.Demo.Models;
 
-namespace OrchardCore.Demo.GraphQL
+namespace OrchardCore.Demo.GraphQL;
+
+public class TestQueryObjectType : ObjectGraphType<TestContentPartA>
 {
-    public class TestQueryObjectType : ObjectGraphType<TestContentPartA>
+    public TestQueryObjectType()
     {
-        public TestQueryObjectType()
-        {
-            Name = "TestContentPartA";
+        Name = "TestContentPartA";
 
-            Field("line", x => x.Line, true);
-            Field("lineIgnored", x => x.Line, true);
-            Field("lineOtherIgnored", x => x.Line, true);
-        }
+        Field("line", x => x.Line, true);
+        Field("lineIgnored", x => x.Line, true);
+        Field("lineOtherIgnored", x => x.Line, true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Middlewares/BlockingMiddleware.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Middlewares/BlockingMiddleware.cs
index 790f762bef6..1e20ea8c47a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Middlewares/BlockingMiddleware.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Middlewares/BlockingMiddleware.cs
@@ -1,27 +1,26 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Demo
+namespace OrchardCore.Demo;
+
+public class BlockingMiddleware
 {
-    public class BlockingMiddleware
+    private readonly RequestDelegate _next;
+
+    public BlockingMiddleware(RequestDelegate next)
     {
-        private readonly RequestDelegate _next;
+        _next = next;
+    }
 
-        public BlockingMiddleware(RequestDelegate next)
+    public async Task Invoke(HttpContext httpContext)
+    {
+        if (httpContext.Request.Path.Value == "/middleware")
         {
-            _next = next;
+            await httpContext.Response.WriteAsync("middleware");
         }
-
-        public async Task Invoke(HttpContext httpContext)
+        else
         {
-            if (httpContext.Request.Path.Value == "/middleware")
-            {
-                await httpContext.Response.WriteAsync("middleware");
-            }
-            else
-            {
-                await _next.Invoke(httpContext);
-            }
+            await _next.Invoke(httpContext);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Middlewares/NonBlockingMiddleware.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Middlewares/NonBlockingMiddleware.cs
index 7905e41e368..f3836b2458a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Middlewares/NonBlockingMiddleware.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Middlewares/NonBlockingMiddleware.cs
@@ -1,22 +1,21 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Demo
+namespace OrchardCore.Demo;
+
+public class NonBlockingMiddleware
 {
-    public class NonBlockingMiddleware
-    {
-        private readonly RequestDelegate _next;
+    private readonly RequestDelegate _next;
 
-        public NonBlockingMiddleware(RequestDelegate next)
-        {
-            _next = next;
-        }
+    public NonBlockingMiddleware(RequestDelegate next)
+    {
+        _next = next;
+    }
 
-        public async Task Invoke(HttpContext httpContext)
-        {
-            // If the tenant pipeline is re-executed on error, the header is already set.
-            httpContext.Response.Headers["Orchard"] = "2.0";
-            await _next.Invoke(httpContext);
-        }
+    public async Task Invoke(HttpContext httpContext)
+    {
+        // If the tenant pipeline is re-executed on error, the header is already set.
+        httpContext.Response.Headers["Orchard"] = "2.0";
+        await _next.Invoke(httpContext);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Migrations.cs
index 701d1ed57e7..966e2b6f49e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Migrations.cs
@@ -2,25 +2,24 @@
 using OrchardCore.ContentManagement.Metadata;
 using OrchardCore.Data.Migration;
 
-namespace OrchardCore.Demo
+namespace OrchardCore.Demo;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        public Migrations(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public Migrations(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public async Task<int> CreateAsync()
-        {
-            await _contentDefinitionManager.AlterTypeDefinitionAsync("Foo", builder => builder
-                .WithPart("TestContentPartA")
-                .WithPart("TestContentPartB")
-            );
+    public async Task<int> CreateAsync()
+    {
+        await _contentDefinitionManager.AlterTypeDefinitionAsync("Foo", builder => builder
+            .WithPart("TestContentPartA")
+            .WithPart("TestContentPartB")
+        );
 
-            return 1;
-        }
+        return 1;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Models/CustomViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Models/CustomViewModel.cs
index bc94a6d7501..979a78768d5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Models/CustomViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Models/CustomViewModel.cs
@@ -1,9 +1,8 @@
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Demo.Models
+namespace OrchardCore.Demo.Models;
+
+public class CustomViewModel : ShapeViewModel
 {
-    public class CustomViewModel : ShapeViewModel
-    {
-        public string Value { get; set; }
-    }
+    public string Value { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Models/FakeShape.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Models/FakeShape.cs
index fff8a3b4d82..40eef18a6eb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Models/FakeShape.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Models/FakeShape.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Demo.Models
+namespace OrchardCore.Demo.Models;
+
+public class FakeShape
 {
-    public class FakeShape
-    {
-        public string Value { get; set; }
-    }
+    public string Value { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Models/HomeViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Models/HomeViewModel.cs
index 81252e8d55e..f82863fe2fb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Models/HomeViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Models/HomeViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Demo.Models
+namespace OrchardCore.Demo.Models;
+
+public class HomeViewModel
 {
-    public class HomeViewModel
-    {
-        public string Text { get; set; }
-        public dynamic Foo { get; set; }
-    }
+    public string Text { get; set; }
+    public dynamic Foo { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Models/TestContentField.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Models/TestContentField.cs
index 3889e5202fa..5dd4f51e94b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Models/TestContentField.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Models/TestContentField.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Demo.Models
+namespace OrchardCore.Demo.Models;
+
+public class TestContentField : ContentField
 {
-    public class TestContentField : ContentField
-    {
-        public string Text;
-    }
+    public string Text;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Models/TestContentPartA.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Models/TestContentPartA.cs
index 15140ab555a..71abfede047 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Models/TestContentPartA.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Models/TestContentPartA.cs
@@ -1,11 +1,10 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.DisplayManagement.Shapes;
 
-namespace OrchardCore.Demo.Models
+namespace OrchardCore.Demo.Models;
+
+public class TestContentPartA : ContentPart
 {
-    public class TestContentPartA : ContentPart
-    {
-        public ShapeMetadata Metadata { get; set; }
-        public string Line { get; set; }
-    }
+    public ShapeMetadata Metadata { get; set; }
+    public string Line { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Models/TestContentPartAShape.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Models/TestContentPartAShape.cs
index 43af4e38eeb..6207ac3cc54 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Models/TestContentPartAShape.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Models/TestContentPartAShape.cs
@@ -1,9 +1,8 @@
 using OrchardCore.DisplayManagement.Shapes;
 
-namespace OrchardCore.Demo.Models
+namespace OrchardCore.Demo.Models;
+
+public class TestContentPartAShape : Shape
 {
-    public class TestContentPartAShape : Shape
-    {
-        public string Line { get; set; }
-    }
+    public string Line { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Models/TodoModel.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Models/TodoModel.cs
index cd2385aca54..bce9d5474f3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Models/TodoModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Models/TodoModel.cs
@@ -1,12 +1,11 @@
 using System;
 
-namespace OrchardCore.Demo.Models
+namespace OrchardCore.Demo.Models;
+
+public class TodoModel
 {
-    public class TodoModel
-    {
-        public string TodoId { get; set; }
-        public string Text { get; set; }
-        public DateTime DueDate { get; set; }
-        public bool IsCompleted { get; set; }
-    }
+    public string TodoId { get; set; }
+    public string Text { get; set; }
+    public DateTime DueDate { get; set; }
+    public bool IsCompleted { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Models/UserProfile.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Models/UserProfile.cs
index b10af471a77..49071b5c286 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Models/UserProfile.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Models/UserProfile.cs
@@ -1,12 +1,11 @@
 using System;
 
-namespace OrchardCore.Demo.Models
+namespace OrchardCore.Demo.Models;
+
+public class UserProfile
 {
-    public class UserProfile
-    {
-        public int Age { get; set; }
-        public string FirstName { get; set; }
-        public string LastName { get; set; }
-        public DateTime UpdatedAt { get; set; }
-    }
+    public int Age { get; set; }
+    public string FirstName { get; set; }
+    public string LastName { get; set; }
+    public DateTime UpdatedAt { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Pages/Foo/Admin/Edit.cshtml.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Pages/Foo/Admin/Edit.cshtml.cs
index 0df7687364c..0d7998168c2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Pages/Foo/Admin/Edit.cshtml.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Pages/Foo/Admin/Edit.cshtml.cs
@@ -8,87 +8,86 @@
 using OrchardCore.Modules;
 using YesSql;
 
-namespace OrchardCore.Demo.Pages
+namespace OrchardCore.Demo.Pages;
+
+[Feature("OrchardCore.Demo.Foo")]
+public class EditModel : PageModel
 {
-    [Feature("OrchardCore.Demo.Foo")]
-    public class EditModel : PageModel
+    private readonly IContentManager _contentManager;
+    private readonly IContentItemDisplayManager _contentDisplay;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly ISession _session;
+
+    public EditModel(
+        IContentManager contentManager,
+        IContentItemDisplayManager contentDisplay,
+        IUpdateModelAccessor updateModelAccessor,
+        ISession session)
     {
-        private readonly IContentManager _contentManager;
-        private readonly IContentItemDisplayManager _contentDisplay;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly ISession _session;
-
-        public EditModel(
-            IContentManager contentManager,
-            IContentItemDisplayManager contentDisplay,
-            IUpdateModelAccessor updateModelAccessor,
-            ISession session)
-        {
-            _contentManager = contentManager;
-            _contentDisplay = contentDisplay;
-            _updateModelAccessor = updateModelAccessor;
-            _session = session;
-        }
+        _contentManager = contentManager;
+        _contentDisplay = contentDisplay;
+        _updateModelAccessor = updateModelAccessor;
+        _session = session;
+    }
 
-        [BindProperty(SupportsGet = true)]
-        public string Id { get; set; }
+    [BindProperty(SupportsGet = true)]
+    public string Id { get; set; }
 
-        [Required]
-        [BindProperty]
-        public string Text { get; set; }
+    [Required]
+    [BindProperty]
+    public string Text { get; set; }
 
-        public string Title { get; set; }
-        public string Submit { get; set; }
+    public string Title { get; set; }
+    public string Submit { get; set; }
 
-        public async Task<ActionResult> OnGetAsync()
-        {
-            var contentItem = await _contentManager.GetAsync(Id);
+    public async Task<ActionResult> OnGetAsync()
+    {
+        var contentItem = await _contentManager.GetAsync(Id);
 
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
+        if (contentItem == null)
+        {
+            return NotFound();
+        }
 
-            Title = contentItem.DisplayText ?? "Foo Title";
-            Text = contentItem.Content.TestContentPartA.Line;
+        Title = contentItem.DisplayText ?? "Foo Title";
+        Text = contentItem.Content.TestContentPartA.Line;
 
-            return Page();
-        }
+        return Page();
+    }
 
-        public async Task<IActionResult> OnPostDelete()
+    public async Task<IActionResult> OnPostDelete()
+    {
+        var contentItem = await _contentManager.GetAsync(Id);
+        if (contentItem == null)
         {
-            var contentItem = await _contentManager.GetAsync(Id);
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
-            await _contentManager.RemoveAsync(contentItem);
-
-            return RedirectToPage("/Foo/List");
+            return NotFound();
         }
+        await _contentManager.RemoveAsync(contentItem);
 
-        public async Task<IActionResult> OnPostUpdate()
-        {
-            var contentItem = await _contentManager.GetAsync(Id);
-
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
+        return RedirectToPage("/Foo/List");
+    }
 
-            var updater = _updateModelAccessor.ModelUpdater;
-            _ = await _contentDisplay.UpdateEditorAsync(contentItem, updater, false);
+    public async Task<IActionResult> OnPostUpdate()
+    {
+        var contentItem = await _contentManager.GetAsync(Id);
 
-            if (!ModelState.IsValid)
-            {
-                await _session.CancelAsync();
-                return Page();
-            }
+        if (contentItem == null)
+        {
+            return NotFound();
+        }
 
-            contentItem.Content.TestContentPartA.Line = Text;
-            await _session.SaveAsync(contentItem);
+        var updater = _updateModelAccessor.ModelUpdater;
+        _ = await _contentDisplay.UpdateEditorAsync(contentItem, updater, false);
 
-            return RedirectToPage("/Foo/List");
+        if (!ModelState.IsValid)
+        {
+            await _session.CancelAsync();
+            return Page();
         }
+
+        contentItem.Content.TestContentPartA.Line = Text;
+        await _session.SaveAsync(contentItem);
+
+        return RedirectToPage("/Foo/List");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Pages/Foo/List.cshtml.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Pages/Foo/List.cshtml.cs
index f0ea70635d6..a57c5cd9d7a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Pages/Foo/List.cshtml.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Pages/Foo/List.cshtml.cs
@@ -10,60 +10,59 @@
 using OrchardCore.Modules;
 using YesSql;
 
-namespace OrchardCore.Demo.Pages
+namespace OrchardCore.Demo.Pages;
+
+[Feature("OrchardCore.Demo.Foo")]
+public class ListModel : PageModel
 {
-    [Feature("OrchardCore.Demo.Foo")]
-    public class ListModel : PageModel
-    {
-        private readonly IContentManager _contentManager;
-        private readonly IContentItemDisplayManager _contentDisplay;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly ISession _session;
+    private readonly IContentManager _contentManager;
+    private readonly IContentItemDisplayManager _contentDisplay;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly ISession _session;
 
-        public string Title { get; private set; }
-        public List<dynamic> Items { get; private set; }
+    public string Title { get; private set; }
+    public List<dynamic> Items { get; private set; }
 
-        [BindProperty]
-        public string Text { get; set; }
+    [BindProperty]
+    public string Text { get; set; }
 
-        public ListModel(
-            IContentManager contentManager,
-            IContentItemDisplayManager contentDisplay,
-            IUpdateModelAccessor updateModelAccessor,
-            ISession session)
-        {
-            _contentManager = contentManager;
-            _contentDisplay = contentDisplay;
-            _updateModelAccessor = updateModelAccessor;
-            _session = session;
-        }
+    public ListModel(
+        IContentManager contentManager,
+        IContentItemDisplayManager contentDisplay,
+        IUpdateModelAccessor updateModelAccessor,
+        ISession session)
+    {
+        _contentManager = contentManager;
+        _contentDisplay = contentDisplay;
+        _updateModelAccessor = updateModelAccessor;
+        _session = session;
+    }
 
-        public async Task OnGetAsync(string _)
-        {
-            var query = _session.Query<ContentItem, ContentItemIndex>()
-                .With<ContentItemIndex>(x => x.ContentType == "Foo" && x.Published);
+    public async Task OnGetAsync(string _)
+    {
+        var query = _session.Query<ContentItem, ContentItemIndex>()
+            .With<ContentItemIndex>(x => x.ContentType == "Foo" && x.Published);
 
-            var contentItems = await query.ListAsync();
-            var updater = _updateModelAccessor.ModelUpdater;
+        var contentItems = await query.ListAsync();
+        var updater = _updateModelAccessor.ModelUpdater;
 
-            Items = [];
-            Title = "Foo List";
+        Items = [];
+        Title = "Foo List";
 
-            foreach (var contentItem in contentItems)
-            {
-                Items.Add(await _contentDisplay.BuildDisplayAsync(contentItem, updater));
-            }
+        foreach (var contentItem in contentItems)
+        {
+            Items.Add(await _contentDisplay.BuildDisplayAsync(contentItem, updater));
         }
+    }
 
-        public async Task<IActionResult> OnPostAsync()
-        {
-            var contentItem = await _contentManager.NewAsync("Foo");
+    public async Task<IActionResult> OnPostAsync()
+    {
+        var contentItem = await _contentManager.NewAsync("Foo");
 
-            // Dynamic syntax
-            contentItem.Content.TestContentPartA.Line = Text;
-            await _contentManager.CreateAsync(contentItem);
+        // Dynamic syntax
+        contentItem.Content.TestContentPartA.Line = Text;
+        await _contentManager.CreateAsync(contentItem);
 
-            return RedirectToPage();
-        }
+        return RedirectToPage();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Services/TestBackgroundTask.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Services/TestBackgroundTask.cs
index 0f96872c468..8322c266703 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Services/TestBackgroundTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Services/TestBackgroundTask.cs
@@ -3,19 +3,18 @@
 using System.Threading.Tasks;
 using OrchardCore.BackgroundTasks;
 
-namespace OrchardCore.Demo.Services
+namespace OrchardCore.Demo.Services;
+
+public sealed class TestBackgroundTask : IBackgroundTask
 {
-    public sealed class TestBackgroundTask : IBackgroundTask
-    {
 #pragma warning disable IDE0052 // Remove unread private members
-        private int _count;
+    private int _count;
 #pragma warning restore IDE0052 // Remove unread private members
 
-        public Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken)
-        {
-            _count++;
+    public Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken)
+    {
+        _count++;
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Services/TestDependency.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Services/TestDependency.cs
index 0bb8408a71f..8267b56371f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Services/TestDependency.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Services/TestDependency.cs
@@ -1,23 +1,22 @@
 using OrchardCore.Environment.Shell;
 
-namespace OrchardCore.Demo.Services
+namespace OrchardCore.Demo.Services;
+
+public interface ITestDependency
 {
-    public interface ITestDependency
+    string SayHi(string line);
+}
+
+public class ClassFoo : ITestDependency
+{
+    private readonly ShellSettings _shellSettings;
+    public ClassFoo(ShellSettings shellSettings)
     {
-        string SayHi(string line);
+        _shellSettings = shellSettings;
     }
 
-    public class ClassFoo : ITestDependency
+    public string SayHi(string line)
     {
-        private readonly ShellSettings _shellSettings;
-        public ClassFoo(ShellSettings shellSettings)
-        {
-            _shellSettings = shellSettings;
-        }
-
-        public string SayHi(string line)
-        {
-            return string.Format("Hi from tenant {0} - {1}", _shellSettings.Name, line);
-        }
+        return string.Format("Hi from tenant {0} - {1}", _shellSettings.Name, line);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Services/UserProfileClaimsProvider.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Services/UserProfileClaimsProvider.cs
index 738bf9a3dc3..294ac69ed25 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Services/UserProfileClaimsProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Services/UserProfileClaimsProvider.cs
@@ -9,52 +9,51 @@
 using OrchardCore.Users.Models;
 using OrchardCore.Users.Services;
 
-namespace OrchardCore.Demo.Services
+namespace OrchardCore.Demo.Services;
+
+internal sealed class UserProfileClaimsProvider : IUserClaimsProvider
 {
-    internal sealed class UserProfileClaimsProvider : IUserClaimsProvider
+    public Task GenerateAsync(IUser user, ClaimsIdentity claims)
     {
-        public Task GenerateAsync(IUser user, ClaimsIdentity claims)
-        {
-            ArgumentNullException.ThrowIfNull(user);
-
-            ArgumentNullException.ThrowIfNull(claims);
-
-            var u = user as User;
-            var profile = u.As<UserProfile>();
+        ArgumentNullException.ThrowIfNull(user);
 
-            claims.AddClaim(new Claim("preferred_username", user.UserName));
+        ArgumentNullException.ThrowIfNull(claims);
 
-            var name = "";
-            if (!string.IsNullOrEmpty(profile.FirstName))
-            {
-                claims.AddClaim(new Claim("given_name", profile.FirstName));
-                name += profile.FirstName;
-            }
+        var u = user as User;
+        var profile = u.As<UserProfile>();
 
-            if (!string.IsNullOrEmpty(profile.LastName))
-            {
-                claims.AddClaim(new Claim("family_name", profile.LastName));
-                name += $" {profile.LastName}";
-            }
+        claims.AddClaim(new Claim("preferred_username", user.UserName));
 
-            if (!string.IsNullOrEmpty(name))
-            {
-                claims.AddClaim(new Claim("name", name));
-            }
+        var name = "";
+        if (!string.IsNullOrEmpty(profile.FirstName))
+        {
+            claims.AddClaim(new Claim("given_name", profile.FirstName));
+            name += profile.FirstName;
+        }
 
-            if (profile.UpdatedAt != default)
-            {
-                claims.AddClaim(new Claim("updated_at", ConvertToUnixTimestamp(profile.UpdatedAt).ToString(CultureInfo.InvariantCulture)));
-            }
+        if (!string.IsNullOrEmpty(profile.LastName))
+        {
+            claims.AddClaim(new Claim("family_name", profile.LastName));
+            name += $" {profile.LastName}";
+        }
 
-            return Task.FromResult(claims);
+        if (!string.IsNullOrEmpty(name))
+        {
+            claims.AddClaim(new Claim("name", name));
         }
 
-        public static double ConvertToUnixTimestamp(DateTime date)
+        if (profile.UpdatedAt != default)
         {
-            var origin = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
-            var diff = date.ToUniversalTime() - origin;
-            return Math.Floor(diff.TotalSeconds);
+            claims.AddClaim(new Claim("updated_at", ConvertToUnixTimestamp(profile.UpdatedAt).ToString(CultureInfo.InvariantCulture)));
         }
+
+        return Task.FromResult(claims);
+    }
+
+    public static double ConvertToUnixTimestamp(DateTime date)
+    {
+        var origin = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
+        var diff = date.ToUniversalTime() - origin;
+        return Math.Floor(diff.TotalSeconds);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Shapes/BazTagHelper.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Shapes/BazTagHelper.cs
index 7ee332ea1be..52716f8603e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Shapes/BazTagHelper.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Shapes/BazTagHelper.cs
@@ -1,17 +1,16 @@
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.Demo.TagHelpers.Intellisense
+namespace OrchardCore.Demo.TagHelpers.Intellisense;
+
+public class BazTagHelper : TagHelper
 {
-    public class BazTagHelper : TagHelper
-    {
-        /// <summary>
-        /// The text to render.
-        /// </summary>
-        public string Text { get; set; }
+    /// <summary>
+    /// The text to render.
+    /// </summary>
+    public string Text { get; set; }
 
-        /// <summary>
-        /// the number of times to repeat the text.
-        /// </summary>
-        public int Count { get; set; }
-    }
+    /// <summary>
+    /// the number of times to repeat the text.
+    /// </summary>
+    public int Count { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Shapes/DemoShapeProvider.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Shapes/DemoShapeProvider.cs
index 9604d50603a..f47c939e02c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Shapes/DemoShapeProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Shapes/DemoShapeProvider.cs
@@ -2,32 +2,31 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Html;
 
-namespace OrchardCore.DisplayManagement.Descriptors
+namespace OrchardCore.DisplayManagement.Descriptors;
+
+public class DemoShapeProvider : ShapeTableProvider, IShapeAttributeProvider
 {
-    public class DemoShapeProvider : ShapeTableProvider, IShapeAttributeProvider
+    public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
     {
-        public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
-        {
-            builder.Describe("Foo")
-                .OnDisplaying(displaying =>
-                    displaying.ChildContent = new HtmlString("<h1>Hi</h1>")
-                );
+        builder.Describe("Foo")
+            .OnDisplaying(displaying =>
+                displaying.ChildContent = new HtmlString("<h1>Hi</h1>")
+            );
 
-            return ValueTask.CompletedTask;
-        }
+        return ValueTask.CompletedTask;
+    }
 
-        [Shape]
+    [Shape]
 #pragma warning disable CA1822 // Mark members as static
-        public IHtmlContent Baz(string text, int count)
+    public IHtmlContent Baz(string text, int count)
 #pragma warning restore CA1822 // Mark members as static
+    {
+        var sb = new StringBuilder();
+        for (var i = 0; i < count; i++)
         {
-            var sb = new StringBuilder();
-            for (var i = 0; i < count; i++)
-            {
-                sb.Append(text);
-            }
-
-            return new HtmlString(sb.ToString());
+            sb.Append(text);
         }
+
+        return new HtmlString(sb.ToString());
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Startup.cs
index 3c3d46efedf..8892c08f4e4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Startup.cs
@@ -28,101 +28,100 @@
 using OrchardCore.Users.Models;
 using OrchardCore.Users.Services;
 
-namespace OrchardCore.Demo
+namespace OrchardCore.Demo;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    private readonly AdminOptions _adminOptions;
+
+    public Startup(IOptions<AdminOptions> adminOptions)
     {
-        private readonly AdminOptions _adminOptions;
+        _adminOptions = adminOptions.Value;
+    }
 
-        public Startup(IOptions<AdminOptions> adminOptions)
-        {
-            _adminOptions = adminOptions.Value;
-        }
+    public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        routes.MapAreaControllerRoute(
+            name: "Demo.Home.Index",
+            areaName: "OrchardCore.Demo",
+            pattern: "Home/Index",
+            defaults: new { controller = "Home", action = "Index" }
+        );
+
+        routes.MapAreaControllerRoute(
+            name: "Demo.Home.Display",
+            areaName: "OrchardCore.Demo",
+            pattern: "Home/Display/{contentItemId}",
+            defaults: new { controller = "Home", action = "Display" }
+        );
+
+        routes.MapAreaControllerRoute(
+            name: "Demo.Home.Error",
+            areaName: "OrchardCore.Demo",
+            pattern: "Home/IndexError",
+            defaults: new { controller = "Home", action = "IndexError" }
+        );
+
+        var demoAdminControllerName = typeof(AdminController).ControllerName();
+
+        // While you can define admin routes like this, we suggest adding the [Admin("path after the admin prefix")]
+        // attribute to the action's method instead. That way the route is visible right next to the action which
+        // makes the code easier to understand. You can find an example in this module at ContentController.Edit.
+        routes.MapAreaControllerRoute(
+            name: "Demo.Admin",
+            areaName: "OrchardCore.Demo",
+            pattern: _adminOptions.AdminUrlPrefix + "/Demo/Admin",
+            defaults: new { controller = demoAdminControllerName, action = nameof(AdminController.Index) }
+        );
+
+        var demoContentControllerName = typeof(ContentController).ControllerName();
+
+        builder.UseMiddleware<NonBlockingMiddleware>();
+        builder.UseMiddleware<BlockingMiddleware>();
+    }
 
-        public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddScoped<ITestDependency, ClassFoo>();
+        services.AddScoped<ICommandHandler, DemoCommands>();
+        services.AddSingleton<IBackgroundTask, TestBackgroundTask>();
+        services.AddScoped<IShapeTableProvider, DemoShapeProvider>();
+        services.AddShapeAttributes<DemoShapeProvider>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IContentDisplayDriver, TestContentElementDisplayDriver>();
+        services.AddDataMigration<Migrations>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddContentPart<TestContentPartA>();
+        services.AddScoped<IUserClaimsProvider, UserProfileClaimsProvider>();
+
+        services.AddScoped<IDisplayDriver<User>, UserProfileDisplayDriver>();
+
+        services.Configure<RazorPagesOptions>(options =>
         {
-            routes.MapAreaControllerRoute(
-                name: "Demo.Home.Index",
-                areaName: "OrchardCore.Demo",
-                pattern: "Home/Index",
-                defaults: new { controller = "Home", action = "Index" }
-            );
-
-            routes.MapAreaControllerRoute(
-                name: "Demo.Home.Display",
-                areaName: "OrchardCore.Demo",
-                pattern: "Home/Display/{contentItemId}",
-                defaults: new { controller = "Home", action = "Display" }
-            );
-
-            routes.MapAreaControllerRoute(
-                name: "Demo.Home.Error",
-                areaName: "OrchardCore.Demo",
-                pattern: "Home/IndexError",
-                defaults: new { controller = "Home", action = "IndexError" }
-            );
-
-            var demoAdminControllerName = typeof(AdminController).ControllerName();
-
-            // While you can define admin routes like this, we suggest adding the [Admin("path after the admin prefix")]
-            // attribute to the action's method instead. That way the route is visible right next to the action which
-            // makes the code easier to understand. You can find an example in this module at ContentController.Edit.
-            routes.MapAreaControllerRoute(
-                name: "Demo.Admin",
-                areaName: "OrchardCore.Demo",
-                pattern: _adminOptions.AdminUrlPrefix + "/Demo/Admin",
-                defaults: new { controller = demoAdminControllerName, action = nameof(AdminController.Index) }
-            );
-
-            var demoContentControllerName = typeof(ContentController).ControllerName();
-
-            builder.UseMiddleware<NonBlockingMiddleware>();
-            builder.UseMiddleware<BlockingMiddleware>();
-        }
-
-        public override void ConfigureServices(IServiceCollection services)
+            // Add a custom page folder route (only applied to non admin pages)
+            options.Conventions.AddAreaFolderRoute("OrchardCore.Demo", "/", "Demo");
+
+            // Add a custom admin page folder route (only applied to admin pages) using the current admin prefix
+            options.Conventions.AddAdminAreaFolderRoute("OrchardCore.Demo", "/Admin", _adminOptions.AdminUrlPrefix + "/Demo");
+
+            // Add a custom admin page folder route without using the current admin prefix
+            options.Conventions.AddAdminAreaFolderRoute("OrchardCore.Demo", "/Foo/Admin", "Manage/Foo");
+
+            // Add a custom admin page route using the current admin prefix
+            options.Conventions.AddAreaPageRoute("OrchardCore.Demo", "/OutsideAdmin", _adminOptions.AdminUrlPrefix + "/Outside");
+
+            // Add a custom page route
+            options.Conventions.AddAreaPageRoute("OrchardCore.Demo", "/Hello", "Hello");
+
+            // This declaration would define an home page
+            // options.Conventions.AddAreaPageRoute("OrchardCore.Demo", "/Hello", "");
+        });
+
+        services.AddTagHelpers(typeof(BazTagHelper).Assembly);
+
+        services.Configure<TemplateOptions>(o =>
         {
-            services.AddScoped<ITestDependency, ClassFoo>();
-            services.AddScoped<ICommandHandler, DemoCommands>();
-            services.AddSingleton<IBackgroundTask, TestBackgroundTask>();
-            services.AddScoped<IShapeTableProvider, DemoShapeProvider>();
-            services.AddShapeAttributes<DemoShapeProvider>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IContentDisplayDriver, TestContentElementDisplayDriver>();
-            services.AddDataMigration<Migrations>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddContentPart<TestContentPartA>();
-            services.AddScoped<IUserClaimsProvider, UserProfileClaimsProvider>();
-
-            services.AddScoped<IDisplayDriver<User>, UserProfileDisplayDriver>();
-
-            services.Configure<RazorPagesOptions>(options =>
-            {
-                // Add a custom page folder route (only applied to non admin pages)
-                options.Conventions.AddAreaFolderRoute("OrchardCore.Demo", "/", "Demo");
-
-                // Add a custom admin page folder route (only applied to admin pages) using the current admin prefix
-                options.Conventions.AddAdminAreaFolderRoute("OrchardCore.Demo", "/Admin", _adminOptions.AdminUrlPrefix + "/Demo");
-
-                // Add a custom admin page folder route without using the current admin prefix
-                options.Conventions.AddAdminAreaFolderRoute("OrchardCore.Demo", "/Foo/Admin", "Manage/Foo");
-
-                // Add a custom admin page route using the current admin prefix
-                options.Conventions.AddAreaPageRoute("OrchardCore.Demo", "/OutsideAdmin", _adminOptions.AdminUrlPrefix + "/Outside");
-
-                // Add a custom page route
-                options.Conventions.AddAreaPageRoute("OrchardCore.Demo", "/Hello", "Hello");
-
-                // This declaration would define an home page
-                // options.Conventions.AddAreaPageRoute("OrchardCore.Demo", "/Hello", "");
-            });
-
-            services.AddTagHelpers(typeof(BazTagHelper).Assembly);
-
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<OrchardCore.Demo.ViewModels.TodoViewModel>();
-            });
-        }
+            o.MemberAccessStrategy.Register<OrchardCore.Demo.ViewModels.TodoViewModel>();
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/TagHelpers/BazTagHelper.cs b/src/OrchardCore.Modules/OrchardCore.Demo/TagHelpers/BazTagHelper.cs
index 2b83139e5fd..4b1805b1920 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/TagHelpers/BazTagHelper.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/TagHelpers/BazTagHelper.cs
@@ -2,15 +2,14 @@
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.TagHelpers;
 
-namespace OrchardCore.Demo.TagHelpers
+namespace OrchardCore.Demo.TagHelpers;
+
+[HtmlTargetElement("baz")]
+public class BazTagHelper : BaseShapeTagHelper
 {
-    [HtmlTargetElement("baz")]
-    public class BazTagHelper : BaseShapeTagHelper
+    public BazTagHelper(IShapeFactory shapeFactory, IDisplayHelper displayHelper)
+        : base(shapeFactory, displayHelper)
     {
-        public BazTagHelper(IShapeFactory shapeFactory, IDisplayHelper displayHelper)
-            : base(shapeFactory, displayHelper)
-        {
-            Type = "Baz";
-        }
+        Type = "Baz";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/ViewModels/EditUserProfileViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Demo/ViewModels/EditUserProfileViewModel.cs
index da6f15127ba..1eea762b18d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/ViewModels/EditUserProfileViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/ViewModels/EditUserProfileViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Demo.ViewModels
+namespace OrchardCore.Demo.ViewModels;
+
+public class EditUserProfileViewModel
 {
-    public class EditUserProfileViewModel
-    {
-        public int Age { get; set; }
-        public string FirstName { get; set; }
-        public string LastName { get; set; }
-    }
+    public int Age { get; set; }
+    public string FirstName { get; set; }
+    public string LastName { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/ViewModels/TodoViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Demo/ViewModels/TodoViewModel.cs
index 32d71c7eb93..b2b64f1b608 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/ViewModels/TodoViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/ViewModels/TodoViewModel.cs
@@ -2,47 +2,46 @@
 using System.ComponentModel.DataAnnotations;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Demo.ViewModels
+namespace OrchardCore.Demo.ViewModels;
+
+public class TodoViewModel : ShapeViewModel
 {
-    public class TodoViewModel : ShapeViewModel
+    public TodoViewModel()
+        : base("Todo")
     {
-        public TodoViewModel()
-            : base("Todo")
-        {
-        }
+    }
 
-        public string TodoId { get; set; }
+    public string TodoId { get; set; }
 
-        [Required]
-        public string Text { get; set; }
+    [Required]
+    public string Text { get; set; }
 
-        [Required]
-        public DateTime DueDate { get; set; }
+    [Required]
+    public DateTime DueDate { get; set; }
 
-        public bool IsCompleted { get; set; }
+    public bool IsCompleted { get; set; }
 
-        public string DisplayMode
+    public string DisplayMode
+    {
+        get
         {
-            get
-            {
-                return Metadata.DisplayType;
-            }
-            set
+            return Metadata.DisplayType;
+        }
+        set
+        {
+            var alternate = $"Todo_{value}";
+            if (Metadata.Alternates.Contains(alternate))
             {
-                var alternate = $"Todo_{value}";
-                if (Metadata.Alternates.Contains(alternate))
+                if (Metadata.Alternates.Last == alternate)
                 {
-                    if (Metadata.Alternates.Last == alternate)
-                    {
-                        return;
-                    }
-
-                    Metadata.Alternates.Remove(alternate);
+                    return;
                 }
 
-                Metadata.Alternates.Add(alternate);
-                Metadata.DisplayType = value;
+                Metadata.Alternates.Remove(alternate);
             }
+
+            Metadata.Alternates.Add(alternate);
+            Metadata.DisplayType = value;
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs
index cb638810145..57990648c60 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs
@@ -2,41 +2,40 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Deployment.Remote
+namespace OrchardCore.Deployment.Remote;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    internal readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["Import/Export"], import => import
-                        .Add(S["Remote Instances"], S["Remote Instances"].PrefixPosition(), remote => remote
-                            .Action("Index", "RemoteInstance", "OrchardCore.Deployment.Remote")
-                            .Permission(Permissions.ManageRemoteInstances)
-                            .LocalNav()
-                        )
-                        .Add(S["Remote Clients"], S["Remote Clients"].PrefixPosition(), remote => remote
-                            .Action("Index", "RemoteClient", "OrchardCore.Deployment.Remote")
-                            .Permission(Permissions.ManageRemoteClients)
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["Import/Export"], import => import
+                    .Add(S["Remote Instances"], S["Remote Instances"].PrefixPosition(), remote => remote
+                        .Action("Index", "RemoteInstance", "OrchardCore.Deployment.Remote")
+                        .Permission(Permissions.ManageRemoteInstances)
+                        .LocalNav()
+                    )
+                    .Add(S["Remote Clients"], S["Remote Clients"].PrefixPosition(), remote => remote
+                        .Action("Index", "RemoteClient", "OrchardCore.Deployment.Remote")
+                        .Permission(Permissions.ManageRemoteClients)
+                        .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Controllers/ExportRemoteInstanceController.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Controllers/ExportRemoteInstanceController.cs
index 750c2912e1c..bd646c27787 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Controllers/ExportRemoteInstanceController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Controllers/ExportRemoteInstanceController.cs
@@ -15,116 +15,115 @@
 using OrchardCore.Recipes.Models;
 using YesSql;
 
-namespace OrchardCore.Deployment.Remote.Controllers
+namespace OrchardCore.Deployment.Remote.Controllers;
+
+[Admin("Deployment/ExportRemoteInstance/{action}/{id?}", "DeploymentExportRemoteInstance{action}")]
+public class ExportRemoteInstanceController : Controller
 {
-    [Admin("Deployment/ExportRemoteInstance/{action}/{id?}", "DeploymentExportRemoteInstance{action}")]
-    public class ExportRemoteInstanceController : Controller
+    private readonly IDeploymentManager _deploymentManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly ISession _session;
+    private readonly RemoteInstanceService _service;
+    private readonly INotifier _notifier;
+    private readonly IHttpClientFactory _httpClientFactory;
+    protected readonly IHtmlLocalizer H;
+
+    public ExportRemoteInstanceController(
+        IAuthorizationService authorizationService,
+        ISession session,
+        RemoteInstanceService service,
+        IDeploymentManager deploymentManager,
+        INotifier notifier,
+        IHttpClientFactory httpClientFactory,
+        IHtmlLocalizer<ExportRemoteInstanceController> localizer)
+    {
+        _authorizationService = authorizationService;
+        _deploymentManager = deploymentManager;
+        _session = session;
+        _service = service;
+        _notifier = notifier;
+        _httpClientFactory = httpClientFactory;
+        H = localizer;
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Execute(long id, string remoteInstanceId, string returnUrl)
     {
-        private readonly IDeploymentManager _deploymentManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly ISession _session;
-        private readonly RemoteInstanceService _service;
-        private readonly INotifier _notifier;
-        private readonly IHttpClientFactory _httpClientFactory;
-        protected readonly IHtmlLocalizer H;
-
-        public ExportRemoteInstanceController(
-            IAuthorizationService authorizationService,
-            ISession session,
-            RemoteInstanceService service,
-            IDeploymentManager deploymentManager,
-            INotifier notifier,
-            IHttpClientFactory httpClientFactory,
-            IHtmlLocalizer<ExportRemoteInstanceController> localizer)
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.Export))
         {
-            _authorizationService = authorizationService;
-            _deploymentManager = deploymentManager;
-            _session = session;
-            _service = service;
-            _notifier = notifier;
-            _httpClientFactory = httpClientFactory;
-            H = localizer;
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Execute(long id, string remoteInstanceId, string returnUrl)
+        var deploymentPlan = await _session.GetAsync<DeploymentPlan>(id);
+
+        if (deploymentPlan == null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.Export))
-            {
-                return Forbid();
-            }
+            return NotFound();
+        }
 
-            var deploymentPlan = await _session.GetAsync<DeploymentPlan>(id);
+        var remoteInstance = await _service.GetRemoteInstanceAsync(remoteInstanceId);
 
-            if (deploymentPlan == null)
-            {
-                return NotFound();
-            }
+        if (remoteInstance == null)
+        {
+            return NotFound();
+        }
 
-            var remoteInstance = await _service.GetRemoteInstanceAsync(remoteInstanceId);
+        string archiveFileName;
+        var filename = deploymentPlan.Name.ToSafeName() + ".zip";
 
-            if (remoteInstance == null)
-            {
-                return NotFound();
-            }
+        using (var fileBuilder = new TemporaryFileBuilder())
+        {
+            archiveFileName = PathExtensions.Combine(Path.GetTempPath(), filename);
 
-            string archiveFileName;
-            var filename = deploymentPlan.Name.ToSafeName() + ".zip";
+            var deploymentPlanResult = new DeploymentPlanResult(fileBuilder, new RecipeDescriptor());
+            await _deploymentManager.ExecuteDeploymentPlanAsync(deploymentPlan, deploymentPlanResult);
 
-            using (var fileBuilder = new TemporaryFileBuilder())
+            if (System.IO.File.Exists(archiveFileName))
             {
-                archiveFileName = PathExtensions.Combine(Path.GetTempPath(), filename);
+                System.IO.File.Delete(archiveFileName);
+            }
 
-                var deploymentPlanResult = new DeploymentPlanResult(fileBuilder, new RecipeDescriptor());
-                await _deploymentManager.ExecuteDeploymentPlanAsync(deploymentPlan, deploymentPlanResult);
+            ZipFile.CreateFromDirectory(fileBuilder.Folder, archiveFileName);
+        }
 
-                if (System.IO.File.Exists(archiveFileName))
-                {
-                    System.IO.File.Delete(archiveFileName);
-                }
+        HttpResponseMessage response;
 
-                ZipFile.CreateFromDirectory(fileBuilder.Folder, archiveFileName);
-            }
+        try
+        {
+            using (var requestContent = new MultipartFormDataContent())
+            {
+                requestContent.Add(new StreamContent(
+                    new FileStream(archiveFileName,
+                    FileMode.Open, FileAccess.Read, FileShare.ReadWrite, 1, FileOptions.Asynchronous | FileOptions.SequentialScan)
+                ),
+                    nameof(ImportViewModel.Content), Path.GetFileName(archiveFileName));
+                requestContent.Add(new StringContent(remoteInstance.ClientName), nameof(ImportViewModel.ClientName));
+                requestContent.Add(new StringContent(remoteInstance.ApiKey), nameof(ImportViewModel.ApiKey));
 
-            HttpResponseMessage response;
+                var httpClient = _httpClientFactory.CreateClient();
 
-            try
-            {
-                using (var requestContent = new MultipartFormDataContent())
-                {
-                    requestContent.Add(new StreamContent(
-                        new FileStream(archiveFileName,
-                        FileMode.Open, FileAccess.Read, FileShare.ReadWrite, 1, FileOptions.Asynchronous | FileOptions.SequentialScan)
-                    ),
-                        nameof(ImportViewModel.Content), Path.GetFileName(archiveFileName));
-                    requestContent.Add(new StringContent(remoteInstance.ClientName), nameof(ImportViewModel.ClientName));
-                    requestContent.Add(new StringContent(remoteInstance.ApiKey), nameof(ImportViewModel.ApiKey));
-
-                    var httpClient = _httpClientFactory.CreateClient();
-
-                    response = await httpClient.PostAsync(remoteInstance.Url, requestContent);
-                }
-
-                if (response.StatusCode == System.Net.HttpStatusCode.OK)
-                {
-                    await _notifier.SuccessAsync(H["Deployment executed successfully."]);
-                }
-                else
-                {
-                    await _notifier.ErrorAsync(H["An error occurred while sending the deployment to the remote instance: \"{0} ({1})\"", response.ReasonPhrase, (int)response.StatusCode]);
-                }
+                response = await httpClient.PostAsync(remoteInstance.Url, requestContent);
             }
-            finally
+
+            if (response.StatusCode == System.Net.HttpStatusCode.OK)
             {
-                System.IO.File.Delete(archiveFileName);
+                await _notifier.SuccessAsync(H["Deployment executed successfully."]);
             }
-
-            if (!string.IsNullOrEmpty(returnUrl))
+            else
             {
-                return this.LocalRedirect(returnUrl, true);
+                await _notifier.ErrorAsync(H["An error occurred while sending the deployment to the remote instance: \"{0} ({1})\"", response.ReasonPhrase, (int)response.StatusCode]);
             }
+        }
+        finally
+        {
+            System.IO.File.Delete(archiveFileName);
+        }
 
-            return RedirectToAction("Display", "DeploymentPlan", new { area = "OrchardCore.Deployment", id });
+        if (!string.IsNullOrEmpty(returnUrl))
+        {
+            return this.LocalRedirect(returnUrl, true);
         }
+
+        return RedirectToAction("Display", "DeploymentPlan", new { area = "OrchardCore.Deployment", id });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Controllers/ImportRemoteInstanceController.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Controllers/ImportRemoteInstanceController.cs
index b0cacb21222..0a09436f9eb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Controllers/ImportRemoteInstanceController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Controllers/ImportRemoteInstanceController.cs
@@ -17,104 +17,103 @@
 using OrchardCore.DisplayManagement.Notify;
 using OrchardCore.Recipes.Models;
 
-namespace OrchardCore.Deployment.Remote.Controllers
+namespace OrchardCore.Deployment.Remote.Controllers;
+
+public class ImportRemoteInstanceController : Controller
 {
-    public class ImportRemoteInstanceController : Controller
+    private readonly RemoteClientService _remoteClientService;
+    private readonly IDeploymentManager _deploymentManager;
+    private readonly INotifier _notifier;
+    private readonly ILogger _logger;
+    private readonly IDataProtector _dataProtector;
+
+    protected readonly IHtmlLocalizer H;
+    protected readonly IStringLocalizer S;
+
+    public ImportRemoteInstanceController(
+        IDataProtectionProvider dataProtectionProvider,
+        RemoteClientService remoteClientService,
+        IDeploymentManager deploymentManager,
+        INotifier notifier,
+        IHtmlLocalizer<ImportRemoteInstanceController> htmlLocalizer,
+        IStringLocalizer<ImportRemoteInstanceController> stringLocalizer,
+        ILogger<ImportRemoteInstanceController> logger)
+    {
+        _deploymentManager = deploymentManager;
+        _notifier = notifier;
+        _logger = logger;
+        _remoteClientService = remoteClientService;
+        H = htmlLocalizer;
+        S = stringLocalizer;
+        _dataProtector = dataProtectionProvider.CreateProtector("OrchardCore.Deployment").ToTimeLimitedDataProtector();
+    }
+
+    /// <remarks>
+    /// We ignore the AFT as the service is called from external applications (they can't have valid ones) and
+    /// we use a private API key to secure its calls.
+    /// </remarks>
+    [HttpPost]
+    [IgnoreAntiforgeryToken]
+    public async Task<IActionResult> Import(ImportViewModel model)
     {
-        private readonly RemoteClientService _remoteClientService;
-        private readonly IDeploymentManager _deploymentManager;
-        private readonly INotifier _notifier;
-        private readonly ILogger _logger;
-        private readonly IDataProtector _dataProtector;
-
-        protected readonly IHtmlLocalizer H;
-        protected readonly IStringLocalizer S;
-
-        public ImportRemoteInstanceController(
-            IDataProtectionProvider dataProtectionProvider,
-            RemoteClientService remoteClientService,
-            IDeploymentManager deploymentManager,
-            INotifier notifier,
-            IHtmlLocalizer<ImportRemoteInstanceController> htmlLocalizer,
-            IStringLocalizer<ImportRemoteInstanceController> stringLocalizer,
-            ILogger<ImportRemoteInstanceController> logger)
+        var remoteClientList = await _remoteClientService.GetRemoteClientListAsync();
+
+        var remoteClient = remoteClientList.RemoteClients.FirstOrDefault(x => x.ClientName == model.ClientName);
+
+        if (remoteClient == null)
         {
-            _deploymentManager = deploymentManager;
-            _notifier = notifier;
-            _logger = logger;
-            _remoteClientService = remoteClientService;
-            H = htmlLocalizer;
-            S = stringLocalizer;
-            _dataProtector = dataProtectionProvider.CreateProtector("OrchardCore.Deployment").ToTimeLimitedDataProtector();
+            return StatusCode((int)HttpStatusCode.BadRequest, "The remote client was not provided");
         }
 
-        /// <remarks>
-        /// We ignore the AFT as the service is called from external applications (they can't have valid ones) and
-        /// we use a private API key to secure its calls.
-        /// </remarks>
-        [HttpPost]
-        [IgnoreAntiforgeryToken]
-        public async Task<IActionResult> Import(ImportViewModel model)
-        {
-            var remoteClientList = await _remoteClientService.GetRemoteClientListAsync();
+        var apiKey = Encoding.UTF8.GetString(_dataProtector.Unprotect(remoteClient.ProtectedApiKey));
 
-            var remoteClient = remoteClientList.RemoteClients.FirstOrDefault(x => x.ClientName == model.ClientName);
+        if (model.ApiKey != apiKey || model.ClientName != remoteClient.ClientName)
+        {
+            return StatusCode((int)HttpStatusCode.BadRequest, "The Api Key was not recognized");
+        }
 
-            if (remoteClient == null)
-            {
-                return StatusCode((int)HttpStatusCode.BadRequest, "The remote client was not provided");
-            }
+        // Create a temporary filename to save the archive
+        var tempArchiveName = Path.GetTempFileName() + ".zip";
 
-            var apiKey = Encoding.UTF8.GetString(_dataProtector.Unprotect(remoteClient.ProtectedApiKey));
+        // Create a temporary folder to extract the archive to
+        var tempArchiveFolder = PathExtensions.Combine(Path.GetTempPath(), Path.GetRandomFileName());
 
-            if (model.ApiKey != apiKey || model.ClientName != remoteClient.ClientName)
+        try
+        {
+            using (var fs = System.IO.File.Create(tempArchiveName))
             {
-                return StatusCode((int)HttpStatusCode.BadRequest, "The Api Key was not recognized");
+                await model.Content.CopyToAsync(fs);
             }
 
-            // Create a temporary filename to save the archive
-            var tempArchiveName = Path.GetTempFileName() + ".zip";
-
-            // Create a temporary folder to extract the archive to
-            var tempArchiveFolder = PathExtensions.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+            ZipFile.ExtractToDirectory(tempArchiveName, tempArchiveFolder);
 
-            try
-            {
-                using (var fs = System.IO.File.Create(tempArchiveName))
-                {
-                    await model.Content.CopyToAsync(fs);
-                }
+            await _deploymentManager.ImportDeploymentPackageAsync(new PhysicalFileProvider(tempArchiveFolder));
+        }
+        catch (RecipeExecutionException e)
+        {
+            _logger.LogError(e, "Unable to import a recipe from deployment plan.");
 
-                ZipFile.ExtractToDirectory(tempArchiveName, tempArchiveFolder);
+            await _notifier.ErrorAsync(H["The deployment plan failed with the following errors: {0}", string.Join(' ', e.StepResult.Errors)]);
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "Unexpected error occurred while executing a deployment plan.");
 
-                await _deploymentManager.ImportDeploymentPackageAsync(new PhysicalFileProvider(tempArchiveFolder));
-            }
-            catch (RecipeExecutionException e)
+            await _notifier.ErrorAsync(H["Unexpected error occurred while executing a deployment plan."]);
+        }
+        finally
+        {
+            if (System.IO.File.Exists(tempArchiveName))
             {
-                _logger.LogError(e, "Unable to import a recipe from deployment plan.");
-
-                await _notifier.ErrorAsync(H["The deployment plan failed with the following errors: {0}", string.Join(' ', e.StepResult.Errors)]);
+                System.IO.File.Delete(tempArchiveName);
             }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "Unexpected error occurred while executing a deployment plan.");
 
-                await _notifier.ErrorAsync(H["Unexpected error occurred while executing a deployment plan."]);
-            }
-            finally
+            if (Directory.Exists(tempArchiveFolder))
             {
-                if (System.IO.File.Exists(tempArchiveName))
-                {
-                    System.IO.File.Delete(tempArchiveName);
-                }
-
-                if (Directory.Exists(tempArchiveFolder))
-                {
-                    Directory.Delete(tempArchiveFolder, true);
-                }
+                Directory.Delete(tempArchiveFolder, true);
             }
-
-            return Ok();
         }
+
+        return Ok();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Controllers/RemoteClientController.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Controllers/RemoteClientController.cs
index 98893f63274..dc153e20c30 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Controllers/RemoteClientController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Controllers/RemoteClientController.cs
@@ -19,258 +19,257 @@
 using OrchardCore.Navigation;
 using OrchardCore.Routing;
 
-namespace OrchardCore.Deployment.Remote.Controllers
+namespace OrchardCore.Deployment.Remote.Controllers;
+
+[Admin("Deployment/RemoteClient/{action}/{id?}", "DeploymentRemoteClient{action}")]
+public class RemoteClientController : Controller
 {
-    [Admin("Deployment/RemoteClient/{action}/{id?}", "DeploymentRemoteClient{action}")]
-    public class RemoteClientController : Controller
+    private const string _optionsSearch = "Options.Search";
+
+    private readonly IDataProtector _dataProtector;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly PagerOptions _pagerOptions;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly RemoteClientService _remoteClientService;
+    private readonly INotifier _notifier;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public RemoteClientController(
+        IDataProtectionProvider dataProtectionProvider,
+        RemoteClientService remoteClientService,
+        IAuthorizationService authorizationService,
+        IOptions<PagerOptions> pagerOptions,
+        IShapeFactory shapeFactory,
+        IStringLocalizer<RemoteClientController> stringLocalizer,
+        IHtmlLocalizer<RemoteClientController> htmlLocalizer,
+        INotifier notifier
+        )
+    {
+        _authorizationService = authorizationService;
+        _pagerOptions = pagerOptions.Value;
+        _shapeFactory = shapeFactory;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+        _notifier = notifier;
+        _remoteClientService = remoteClientService;
+        _dataProtector = dataProtectionProvider.CreateProtector("OrchardCore.Deployment").ToTimeLimitedDataProtector();
+    }
+
+    public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
     {
-        private const string _optionsSearch = "Options.Search";
-
-        private readonly IDataProtector _dataProtector;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly PagerOptions _pagerOptions;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly RemoteClientService _remoteClientService;
-        private readonly INotifier _notifier;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public RemoteClientController(
-            IDataProtectionProvider dataProtectionProvider,
-            RemoteClientService remoteClientService,
-            IAuthorizationService authorizationService,
-            IOptions<PagerOptions> pagerOptions,
-            IShapeFactory shapeFactory,
-            IStringLocalizer<RemoteClientController> stringLocalizer,
-            IHtmlLocalizer<RemoteClientController> htmlLocalizer,
-            INotifier notifier
-            )
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteClients))
         {
-            _authorizationService = authorizationService;
-            _pagerOptions = pagerOptions.Value;
-            _shapeFactory = shapeFactory;
-            S = stringLocalizer;
-            H = htmlLocalizer;
-            _notifier = notifier;
-            _remoteClientService = remoteClientService;
-            _dataProtector = dataProtectionProvider.CreateProtector("OrchardCore.Deployment").ToTimeLimitedDataProtector();
+            return Forbid();
         }
 
-        public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteClients))
-            {
-                return Forbid();
-            }
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
 
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+        var remoteClients = (await _remoteClientService.GetRemoteClientListAsync()).RemoteClients;
 
-            var remoteClients = (await _remoteClientService.GetRemoteClientListAsync()).RemoteClients;
+        if (!string.IsNullOrWhiteSpace(options.Search))
+        {
+            remoteClients = remoteClients.Where(x => x.ClientName.Contains(options.Search, StringComparison.OrdinalIgnoreCase)).ToList();
+        }
 
-            if (!string.IsNullOrWhiteSpace(options.Search))
-            {
-                remoteClients = remoteClients.Where(x => x.ClientName.Contains(options.Search, StringComparison.OrdinalIgnoreCase)).ToList();
-            }
+        var count = remoteClients.Count;
 
-            var count = remoteClients.Count;
+        var startIndex = pager.GetStartIndex();
+        var pageSize = pager.PageSize;
 
-            var startIndex = pager.GetStartIndex();
-            var pageSize = pager.PageSize;
+        // Maintain previous route data when generating page links.
+        var routeData = new RouteData();
 
-            // Maintain previous route data when generating page links.
-            var routeData = new RouteData();
+        if (!string.IsNullOrEmpty(options.Search))
+        {
+            routeData.Values.TryAdd(_optionsSearch, options.Search);
+        }
 
-            if (!string.IsNullOrEmpty(options.Search))
-            {
-                routeData.Values.TryAdd(_optionsSearch, options.Search);
-            }
+        var pagerShape = await _shapeFactory.PagerAsync(pager, count, routeData);
 
-            var pagerShape = await _shapeFactory.PagerAsync(pager, count, routeData);
+        var model = new RemoteClientIndexViewModel
+        {
+            RemoteClients = remoteClients,
+            Pager = pagerShape,
+            Options = options
+        };
 
-            var model = new RemoteClientIndexViewModel
-            {
-                RemoteClients = remoteClients,
-                Pager = pagerShape,
-                Options = options
-            };
+        model.Options.ContentsBulkAction =
+        [
+            new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+        ];
+
+        return View(model);
+    }
 
-            model.Options.ContentsBulkAction =
-            [
-                new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
-            ];
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.Filter")]
+    public ActionResult IndexFilterPOST(RemoteClientIndexViewModel model)
+        => RedirectToAction(nameof(Index), new RouteValueDictionary
+        {
+            { _optionsSearch, model.Options.Search }
+        });
 
-            return View(model);
+    public async Task<IActionResult> Create()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteClients))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.Filter")]
-        public ActionResult IndexFilterPOST(RemoteClientIndexViewModel model)
-            => RedirectToAction(nameof(Index), new RouteValueDictionary
-            {
-                { _optionsSearch, model.Options.Search }
-            });
+        var model = new EditRemoteClientViewModel();
 
-        public async Task<IActionResult> Create()
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteClients))
-            {
-                return Forbid();
-            }
+        return View(model);
+    }
 
-            var model = new EditRemoteClientViewModel();
+    [HttpPost]
+    public async Task<IActionResult> Create(EditRemoteClientViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteClients))
+        {
+            return Forbid();
+        }
 
-            return View(model);
+        if (ModelState.IsValid)
+        {
+            ValidateViewModel(model);
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Create(EditRemoteClientViewModel model)
+        if (ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteClients))
-            {
-                return Forbid();
-            }
+            await _remoteClientService.CreateRemoteClientAsync(model.ClientName, model.ApiKey);
 
-            if (ModelState.IsValid)
-            {
-                ValidateViewModel(model);
-            }
+            await _notifier.SuccessAsync(H["Remote client created successfully."]);
+            return RedirectToAction(nameof(Index));
+        }
 
-            if (ModelState.IsValid)
-            {
-                await _remoteClientService.CreateRemoteClientAsync(model.ClientName, model.ApiKey);
+        // If we got this far, something failed, redisplay form
+        return View(model);
+    }
 
-                await _notifier.SuccessAsync(H["Remote client created successfully."]);
-                return RedirectToAction(nameof(Index));
-            }
+    public async Task<IActionResult> Edit(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteClients))
+        {
+            return Forbid();
+        }
+
+        var remoteClient = await _remoteClientService.GetRemoteClientAsync(id);
 
-            // If we got this far, something failed, redisplay form
-            return View(model);
+        if (remoteClient == null)
+        {
+            return NotFound();
         }
 
-        public async Task<IActionResult> Edit(string id)
+        var model = new EditRemoteClientViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteClients))
-            {
-                return Forbid();
-            }
+            Id = remoteClient.Id,
+            ClientName = remoteClient.ClientName,
+            ApiKey = Encoding.UTF8.GetString(_dataProtector.Unprotect(remoteClient.ProtectedApiKey)),
+        };
 
-            var remoteClient = await _remoteClientService.GetRemoteClientAsync(id);
+        return View(model);
+    }
 
-            if (remoteClient == null)
-            {
-                return NotFound();
-            }
+    [HttpPost]
+    public async Task<IActionResult> Edit(EditRemoteClientViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteClients))
+        {
+            return Forbid();
+        }
 
-            var model = new EditRemoteClientViewModel
-            {
-                Id = remoteClient.Id,
-                ClientName = remoteClient.ClientName,
-                ApiKey = Encoding.UTF8.GetString(_dataProtector.Unprotect(remoteClient.ProtectedApiKey)),
-            };
+        var remoteClient = await _remoteClientService.GetRemoteClientAsync(model.Id);
 
-            return View(model);
+        if (remoteClient == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Edit(EditRemoteClientViewModel model)
+        if (ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteClients))
-            {
-                return Forbid();
-            }
-
-            var remoteClient = await _remoteClientService.GetRemoteClientAsync(model.Id);
-
-            if (remoteClient == null)
-            {
-                return NotFound();
-            }
+            ValidateViewModel(model);
+        }
 
-            if (ModelState.IsValid)
-            {
-                ValidateViewModel(model);
-            }
+        if (ModelState.IsValid)
+        {
+            await _remoteClientService.TryUpdateRemoteClient(model.Id, model.ClientName, model.ApiKey);
 
-            if (ModelState.IsValid)
-            {
-                await _remoteClientService.TryUpdateRemoteClient(model.Id, model.ClientName, model.ApiKey);
+            await _notifier.SuccessAsync(H["Remote client updated successfully."]);
 
-                await _notifier.SuccessAsync(H["Remote client updated successfully."]);
+            return RedirectToAction(nameof(Index));
+        }
 
-                return RedirectToAction(nameof(Index));
-            }
+        // If we got this far, something failed, redisplay form
+        return View(model);
+    }
 
-            // If we got this far, something failed, redisplay form
-            return View(model);
+    [HttpPost]
+    public async Task<IActionResult> Delete(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteClients))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(string id)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteClients))
-            {
-                return Forbid();
-            }
+        var remoteClient = await _remoteClientService.GetRemoteClientAsync(id);
 
-            var remoteClient = await _remoteClientService.GetRemoteClientAsync(id);
+        if (remoteClient == null)
+        {
+            return NotFound();
+        }
 
-            if (remoteClient == null)
-            {
-                return NotFound();
-            }
+        await _remoteClientService.DeleteRemoteClientAsync(id);
 
-            await _remoteClientService.DeleteRemoteClientAsync(id);
+        await _notifier.SuccessAsync(H["Remote client deleted successfully."]);
 
-            await _notifier.SuccessAsync(H["Remote client deleted successfully."]);
+        return RedirectToAction(nameof(Index));
+    }
 
-            return RedirectToAction(nameof(Index));
+    [HttpPost, ActionName("Index")]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<ActionResult> IndexPost(ViewModels.ContentOptions options, IEnumerable<string> itemIds)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteInstances))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName("Index")]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<ActionResult> IndexPost(ViewModels.ContentOptions options, IEnumerable<string> itemIds)
+        if (itemIds?.Count() > 0)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteInstances))
-            {
-                return Forbid();
-            }
+            var remoteClients = (await _remoteClientService.GetRemoteClientListAsync()).RemoteClients;
+            var checkedContentItems = remoteClients.Where(x => itemIds.Contains(x.Id)).ToList();
 
-            if (itemIds?.Count() > 0)
+            switch (options.BulkAction)
             {
-                var remoteClients = (await _remoteClientService.GetRemoteClientListAsync()).RemoteClients;
-                var checkedContentItems = remoteClients.Where(x => itemIds.Contains(x.Id)).ToList();
-
-                switch (options.BulkAction)
-                {
-                    case ContentsBulkAction.None:
-                        break;
-                    case ContentsBulkAction.Remove:
-                        foreach (var item in checkedContentItems)
-                        {
-                            await _remoteClientService.DeleteRemoteClientAsync(item.Id);
-                        }
-                        await _notifier.SuccessAsync(H["Remote clients successfully removed."]);
-                        break;
-                    default:
-                        return BadRequest();
-                }
+                case ContentsBulkAction.None:
+                    break;
+                case ContentsBulkAction.Remove:
+                    foreach (var item in checkedContentItems)
+                    {
+                        await _remoteClientService.DeleteRemoteClientAsync(item.Id);
+                    }
+                    await _notifier.SuccessAsync(H["Remote clients successfully removed."]);
+                    break;
+                default:
+                    return BadRequest();
             }
-
-            return RedirectToAction("Index");
         }
 
-        private void ValidateViewModel(EditRemoteClientViewModel model)
+        return RedirectToAction("Index");
+    }
+
+    private void ValidateViewModel(EditRemoteClientViewModel model)
+    {
+        if (string.IsNullOrWhiteSpace(model.ClientName))
         {
-            if (string.IsNullOrWhiteSpace(model.ClientName))
-            {
-                ModelState.AddModelError(nameof(EditRemoteClientViewModel.ClientName), S["The client name is mandatory."]);
-            }
+            ModelState.AddModelError(nameof(EditRemoteClientViewModel.ClientName), S["The client name is mandatory."]);
+        }
 
-            if (string.IsNullOrWhiteSpace(model.ApiKey))
-            {
-                ModelState.AddModelError(nameof(EditRemoteClientViewModel.ApiKey), S["The api key is mandatory."]);
-            }
+        if (string.IsNullOrWhiteSpace(model.ApiKey))
+        {
+            ModelState.AddModelError(nameof(EditRemoteClientViewModel.ApiKey), S["The api key is mandatory."]);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Controllers/RemoteInstanceController.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Controllers/RemoteInstanceController.cs
index 4009ae9dfdf..c2e39e1dcb4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Controllers/RemoteInstanceController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Controllers/RemoteInstanceController.cs
@@ -17,271 +17,270 @@
 using OrchardCore.Navigation;
 using OrchardCore.Routing;
 
-namespace OrchardCore.Deployment.Remote.Controllers
+namespace OrchardCore.Deployment.Remote.Controllers;
+
+[Admin("Deployment/RemoteInstance/{action}/{id?}", "DeploymentRemoteInstancesCreate{action}")]
+public class RemoteInstanceController : Controller
 {
-    [Admin("Deployment/RemoteInstance/{action}/{id?}", "DeploymentRemoteInstancesCreate{action}")]
-    public class RemoteInstanceController : Controller
+    private const string _optionsSearch = "Options.Search";
+
+    private readonly IAuthorizationService _authorizationService;
+    private readonly PagerOptions _pagerOptions;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly INotifier _notifier;
+    private readonly RemoteInstanceService _service;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public RemoteInstanceController(
+        RemoteInstanceService service,
+        IAuthorizationService authorizationService,
+        IOptions<PagerOptions> pagerOptions,
+        IShapeFactory shapeFactory,
+        IStringLocalizer<RemoteInstanceController> stringLocalizer,
+        IHtmlLocalizer<RemoteInstanceController> htmlLocalizer,
+        INotifier notifier
+        )
+    {
+        _authorizationService = authorizationService;
+        _pagerOptions = pagerOptions.Value;
+        _shapeFactory = shapeFactory;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+        _notifier = notifier;
+        _service = service;
+    }
+
+    public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
     {
-        private const string _optionsSearch = "Options.Search";
-
-        private readonly IAuthorizationService _authorizationService;
-        private readonly PagerOptions _pagerOptions;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly INotifier _notifier;
-        private readonly RemoteInstanceService _service;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public RemoteInstanceController(
-            RemoteInstanceService service,
-            IAuthorizationService authorizationService,
-            IOptions<PagerOptions> pagerOptions,
-            IShapeFactory shapeFactory,
-            IStringLocalizer<RemoteInstanceController> stringLocalizer,
-            IHtmlLocalizer<RemoteInstanceController> htmlLocalizer,
-            INotifier notifier
-            )
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteInstances))
         {
-            _authorizationService = authorizationService;
-            _pagerOptions = pagerOptions.Value;
-            _shapeFactory = shapeFactory;
-            S = stringLocalizer;
-            H = htmlLocalizer;
-            _notifier = notifier;
-            _service = service;
+            return Forbid();
         }
 
-        public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteInstances))
-            {
-                return Forbid();
-            }
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
 
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+        var remoteInstances = (await _service.GetRemoteInstanceListAsync()).RemoteInstances;
 
-            var remoteInstances = (await _service.GetRemoteInstanceListAsync()).RemoteInstances;
+        if (!string.IsNullOrWhiteSpace(options.Search))
+        {
+            remoteInstances = remoteInstances.Where(x => x.Name.Contains(options.Search, StringComparison.OrdinalIgnoreCase)).ToList();
+        }
 
-            if (!string.IsNullOrWhiteSpace(options.Search))
-            {
-                remoteInstances = remoteInstances.Where(x => x.Name.Contains(options.Search, StringComparison.OrdinalIgnoreCase)).ToList();
-            }
+        var startIndex = pager.GetStartIndex();
+        var pageSize = pager.PageSize;
 
-            var startIndex = pager.GetStartIndex();
-            var pageSize = pager.PageSize;
+        // Maintain previous route data when generating page links.
+        var routeData = new RouteData();
 
-            // Maintain previous route data when generating page links.
-            var routeData = new RouteData();
+        if (!string.IsNullOrEmpty(options.Search))
+        {
+            routeData.Values.TryAdd(_optionsSearch, options.Search);
+        }
 
-            if (!string.IsNullOrEmpty(options.Search))
-            {
-                routeData.Values.TryAdd(_optionsSearch, options.Search);
-            }
+        var pagerShape = await _shapeFactory.PagerAsync(pager, remoteInstances.Count, routeData);
 
-            var pagerShape = await _shapeFactory.PagerAsync(pager, remoteInstances.Count, routeData);
+        var model = new RemoteInstanceIndexViewModel
+        {
+            RemoteInstances = remoteInstances,
+            Pager = pagerShape,
+            Options = options
+        };
 
-            var model = new RemoteInstanceIndexViewModel
-            {
-                RemoteInstances = remoteInstances,
-                Pager = pagerShape,
-                Options = options
-            };
+        model.Options.ContentsBulkAction =
+        [
+            new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+        ];
 
-            model.Options.ContentsBulkAction =
-            [
-                new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
-            ];
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.Filter")]
+    public ActionResult IndexFilterPOST(RemoteInstanceIndexViewModel model)
+        => RedirectToAction(nameof(Index), new RouteValueDictionary
+        {
+            { _optionsSearch, model.Options.Search }
+        });
+
+    public async Task<IActionResult> Create()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteInstances))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.Filter")]
-        public ActionResult IndexFilterPOST(RemoteInstanceIndexViewModel model)
-            => RedirectToAction(nameof(Index), new RouteValueDictionary
-            {
-                { _optionsSearch, model.Options.Search }
-            });
+        var model = new EditRemoteInstanceViewModel();
 
-        public async Task<IActionResult> Create()
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteInstances))
-            {
-                return Forbid();
-            }
+        return View(model);
+    }
 
-            var model = new EditRemoteInstanceViewModel();
+    [HttpPost]
+    public async Task<IActionResult> Create(EditRemoteInstanceViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteInstances))
+        {
+            return Forbid();
+        }
 
-            return View(model);
+        if (ModelState.IsValid)
+        {
+            ValidateViewModel(model);
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Create(EditRemoteInstanceViewModel model)
+        if (ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteInstances))
-            {
-                return Forbid();
-            }
+            await _service.CreateRemoteInstanceAsync(model.Name, model.Url, model.ClientName, model.ApiKey);
 
-            if (ModelState.IsValid)
-            {
-                ValidateViewModel(model);
-            }
+            await _notifier.SuccessAsync(H["Remote instance created successfully."]);
+            return RedirectToAction(nameof(Index));
+        }
 
-            if (ModelState.IsValid)
-            {
-                await _service.CreateRemoteInstanceAsync(model.Name, model.Url, model.ClientName, model.ApiKey);
+        // If we got this far, something failed, redisplay form
+        return View(model);
+    }
 
-                await _notifier.SuccessAsync(H["Remote instance created successfully."]);
-                return RedirectToAction(nameof(Index));
-            }
+    public async Task<IActionResult> Edit(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteInstances))
+        {
+            return Forbid();
+        }
+
+        var remoteInstance = await _service.GetRemoteInstanceAsync(id);
 
-            // If we got this far, something failed, redisplay form
-            return View(model);
+        if (remoteInstance == null)
+        {
+            return NotFound();
         }
 
-        public async Task<IActionResult> Edit(string id)
+        var model = new EditRemoteInstanceViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteInstances))
-            {
-                return Forbid();
-            }
+            Id = remoteInstance.Id,
+            Name = remoteInstance.Name,
+            ClientName = remoteInstance.ClientName,
+            ApiKey = remoteInstance.ApiKey,
+            Url = remoteInstance.Url
+        };
+
+        return View(model);
+    }
 
-            var remoteInstance = await _service.GetRemoteInstanceAsync(id);
+    [HttpPost]
+    public async Task<IActionResult> Edit(EditRemoteInstanceViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteInstances))
+        {
+            return Forbid();
+        }
 
-            if (remoteInstance == null)
-            {
-                return NotFound();
-            }
+        var remoteInstance = await _service.LoadRemoteInstanceAsync(model.Id);
 
-            var model = new EditRemoteInstanceViewModel
-            {
-                Id = remoteInstance.Id,
-                Name = remoteInstance.Name,
-                ClientName = remoteInstance.ClientName,
-                ApiKey = remoteInstance.ApiKey,
-                Url = remoteInstance.Url
-            };
-
-            return View(model);
+        if (remoteInstance == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Edit(EditRemoteInstanceViewModel model)
+        if (ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteInstances))
-            {
-                return Forbid();
-            }
-
-            var remoteInstance = await _service.LoadRemoteInstanceAsync(model.Id);
-
-            if (remoteInstance == null)
-            {
-                return NotFound();
-            }
+            ValidateViewModel(model);
+        }
 
-            if (ModelState.IsValid)
-            {
-                ValidateViewModel(model);
-            }
+        if (ModelState.IsValid)
+        {
+            await _service.UpdateRemoteInstance(model.Id, model.Name, model.Url, model.ClientName, model.ApiKey);
 
-            if (ModelState.IsValid)
-            {
-                await _service.UpdateRemoteInstance(model.Id, model.Name, model.Url, model.ClientName, model.ApiKey);
+            await _notifier.SuccessAsync(H["Remote instance updated successfully."]);
 
-                await _notifier.SuccessAsync(H["Remote instance updated successfully."]);
+            return RedirectToAction(nameof(Index));
+        }
 
-                return RedirectToAction(nameof(Index));
-            }
+        // If we got this far, something failed, redisplay form
+        return View(model);
+    }
 
-            // If we got this far, something failed, redisplay form
-            return View(model);
+    [HttpPost]
+    public async Task<IActionResult> Delete(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteInstances))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(string id)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteInstances))
-            {
-                return Forbid();
-            }
+        var remoteInstance = await _service.LoadRemoteInstanceAsync(id);
 
-            var remoteInstance = await _service.LoadRemoteInstanceAsync(id);
+        if (remoteInstance == null)
+        {
+            return NotFound();
+        }
 
-            if (remoteInstance == null)
-            {
-                return NotFound();
-            }
+        await _service.DeleteRemoteInstanceAsync(id);
 
-            await _service.DeleteRemoteInstanceAsync(id);
+        await _notifier.SuccessAsync(H["Remote instance deleted successfully."]);
 
-            await _notifier.SuccessAsync(H["Remote instance deleted successfully."]);
+        return RedirectToAction(nameof(Index));
+    }
 
-            return RedirectToAction(nameof(Index));
+    [HttpPost, ActionName("Index")]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<ActionResult> IndexPost(ViewModels.ContentOptions options, IEnumerable<string> itemIds)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteInstances))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName("Index")]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<ActionResult> IndexPost(ViewModels.ContentOptions options, IEnumerable<string> itemIds)
+        if (itemIds?.Count() > 0)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageRemoteInstances))
-            {
-                return Forbid();
-            }
+            var remoteInstances = (await _service.LoadRemoteInstanceListAsync()).RemoteInstances;
+            var checkedContentItems = remoteInstances.Where(x => itemIds.Contains(x.Id)).ToList();
 
-            if (itemIds?.Count() > 0)
+            switch (options.BulkAction)
             {
-                var remoteInstances = (await _service.LoadRemoteInstanceListAsync()).RemoteInstances;
-                var checkedContentItems = remoteInstances.Where(x => itemIds.Contains(x.Id)).ToList();
-
-                switch (options.BulkAction)
-                {
-                    case ContentsBulkAction.None:
-                        break;
-                    case ContentsBulkAction.Remove:
-                        foreach (var item in checkedContentItems)
-                        {
-                            await _service.DeleteRemoteInstanceAsync(item.Id);
-                        }
-                        await _notifier.SuccessAsync(H["Remote instances successfully removed."]);
-                        break;
-                    default:
-                        return BadRequest();
-                }
+                case ContentsBulkAction.None:
+                    break;
+                case ContentsBulkAction.Remove:
+                    foreach (var item in checkedContentItems)
+                    {
+                        await _service.DeleteRemoteInstanceAsync(item.Id);
+                    }
+                    await _notifier.SuccessAsync(H["Remote instances successfully removed."]);
+                    break;
+                default:
+                    return BadRequest();
             }
-
-            return RedirectToAction(nameof(Index));
         }
 
-        private void ValidateViewModel(EditRemoteInstanceViewModel model)
+        return RedirectToAction(nameof(Index));
+    }
+
+    private void ValidateViewModel(EditRemoteInstanceViewModel model)
+    {
+        if (string.IsNullOrWhiteSpace(model.Name))
         {
-            if (string.IsNullOrWhiteSpace(model.Name))
-            {
-                ModelState.AddModelError(nameof(EditRemoteInstanceViewModel.Name), S["The name is mandatory."]);
-            }
+            ModelState.AddModelError(nameof(EditRemoteInstanceViewModel.Name), S["The name is mandatory."]);
+        }
 
-            if (string.IsNullOrWhiteSpace(model.ClientName))
-            {
-                ModelState.AddModelError(nameof(EditRemoteInstanceViewModel.ClientName), S["The client name is mandatory."]);
-            }
+        if (string.IsNullOrWhiteSpace(model.ClientName))
+        {
+            ModelState.AddModelError(nameof(EditRemoteInstanceViewModel.ClientName), S["The client name is mandatory."]);
+        }
 
-            if (string.IsNullOrWhiteSpace(model.ApiKey))
-            {
-                ModelState.AddModelError(nameof(EditRemoteInstanceViewModel.ApiKey), S["The api key is mandatory."]);
-            }
+        if (string.IsNullOrWhiteSpace(model.ApiKey))
+        {
+            ModelState.AddModelError(nameof(EditRemoteInstanceViewModel.ApiKey), S["The api key is mandatory."]);
+        }
 
-            if (string.IsNullOrWhiteSpace(model.Url))
-            {
-                ModelState.AddModelError(nameof(EditRemoteInstanceViewModel.Url), S["The url is mandatory."]);
-            }
-            else
+        if (string.IsNullOrWhiteSpace(model.Url))
+        {
+            ModelState.AddModelError(nameof(EditRemoteInstanceViewModel.Url), S["The url is mandatory."]);
+        }
+        else
+        {
+            if (!Uri.TryCreate(model.Url, UriKind.Absolute, out _))
             {
-                if (!Uri.TryCreate(model.Url, UriKind.Absolute, out _))
-                {
-                    ModelState.AddModelError(nameof(EditRemoteInstanceViewModel.Url), S["The url is invalid."]);
-                }
+                ModelState.AddModelError(nameof(EditRemoteInstanceViewModel.Url), S["The url is invalid."]);
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Models/RemoteClient.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Models/RemoteClient.cs
index 802c052119d..363c213b1e5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Models/RemoteClient.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Models/RemoteClient.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Deployment.Remote.Models
+namespace OrchardCore.Deployment.Remote.Models;
+
+public class RemoteClient
 {
-    public class RemoteClient
-    {
-        public string Id { get; set; }
-        public string ClientName { get; set; }
-        public byte[] ProtectedApiKey { get; set; }
-    }
+    public string Id { get; set; }
+    public string ClientName { get; set; }
+    public byte[] ProtectedApiKey { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Models/RemoteClientList.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Models/RemoteClientList.cs
index 90a9fdc62a7..5d6ecffadec 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Models/RemoteClientList.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Models/RemoteClientList.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Deployment.Remote.Models
+namespace OrchardCore.Deployment.Remote.Models;
+
+public class RemoteClientList
 {
-    public class RemoteClientList
-    {
-        public List<RemoteClient> RemoteClients { get; set; } = [];
-    }
+    public List<RemoteClient> RemoteClients { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Models/RemoteInstance.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Models/RemoteInstance.cs
index d6f450510fc..ee6915c7c97 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Models/RemoteInstance.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Models/RemoteInstance.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.Deployment.Remote.Models
+namespace OrchardCore.Deployment.Remote.Models;
+
+public class RemoteInstance
 {
-    public class RemoteInstance
-    {
-        public string Id { get; set; }
-        public string Name { get; set; }
-        public string ClientName { get; set; }
-        public string Url { get; set; }
-        public string ApiKey { get; set; }
-    }
+    public string Id { get; set; }
+    public string Name { get; set; }
+    public string ClientName { get; set; }
+    public string Url { get; set; }
+    public string ApiKey { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Models/RemoteInstanceList.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Models/RemoteInstanceList.cs
index aa723484215..a1b1731f8bb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Models/RemoteInstanceList.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Models/RemoteInstanceList.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.Deployment.Remote.Models
+namespace OrchardCore.Deployment.Remote.Models;
+
+public class RemoteInstanceList : Document
 {
-    public class RemoteInstanceList : Document
-    {
-        public List<RemoteInstance> RemoteInstances { get; set; } = [];
-    }
+    public List<RemoteInstance> RemoteInstances { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteClientService.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteClientService.cs
index a3ecfc562f0..8695782d5f0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteClientService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteClientService.cs
@@ -6,92 +6,91 @@
 using OrchardCore.Deployment.Remote.Models;
 using YesSql;
 
-namespace OrchardCore.Deployment.Remote.Services
+namespace OrchardCore.Deployment.Remote.Services;
+
+public class RemoteClientService
 {
-    public class RemoteClientService
-    {
-        private readonly IDataProtector _dataProtector;
-        private readonly ISession _session;
+    private readonly IDataProtector _dataProtector;
+    private readonly ISession _session;
 
-        private RemoteClientList _remoteClientList;
+    private RemoteClientList _remoteClientList;
+
+    public RemoteClientService(
+        ISession session,
+        IDataProtectionProvider dataProtectionProvider
+        )
+    {
+        _dataProtector = dataProtectionProvider.CreateProtector("OrchardCore.Deployment").ToTimeLimitedDataProtector();
+        _session = session;
+    }
 
-        public RemoteClientService(
-            ISession session,
-            IDataProtectionProvider dataProtectionProvider
-            )
+    public async Task<RemoteClientList> GetRemoteClientListAsync()
+    {
+        if (_remoteClientList != null)
         {
-            _dataProtector = dataProtectionProvider.CreateProtector("OrchardCore.Deployment").ToTimeLimitedDataProtector();
-            _session = session;
+            return _remoteClientList;
         }
 
-        public async Task<RemoteClientList> GetRemoteClientListAsync()
+        _remoteClientList = await _session.Query<RemoteClientList>().FirstOrDefaultAsync();
+
+        if (_remoteClientList == null)
         {
-            if (_remoteClientList != null)
-            {
-                return _remoteClientList;
-            }
+            _remoteClientList = new RemoteClientList();
+            await _session.SaveAsync(_remoteClientList);
+        }
 
-            _remoteClientList = await _session.Query<RemoteClientList>().FirstOrDefaultAsync();
+        return _remoteClientList;
+    }
 
-            if (_remoteClientList == null)
-            {
-                _remoteClientList = new RemoteClientList();
-                await _session.SaveAsync(_remoteClientList);
-            }
+    public async Task<RemoteClient> GetRemoteClientAsync(string id)
+    {
+        var remoteClientList = await GetRemoteClientListAsync();
+        return remoteClientList.RemoteClients.FirstOrDefault(x => string.Equals(x.Id, id, StringComparison.OrdinalIgnoreCase));
+    }
 
-            return _remoteClientList;
-        }
+    public async Task DeleteRemoteClientAsync(string id)
+    {
+        var remoteClientList = await GetRemoteClientListAsync();
+        var remoteClient = await GetRemoteClientAsync(id);
 
-        public async Task<RemoteClient> GetRemoteClientAsync(string id)
+        if (remoteClient != null)
         {
-            var remoteClientList = await GetRemoteClientListAsync();
-            return remoteClientList.RemoteClients.FirstOrDefault(x => string.Equals(x.Id, id, StringComparison.OrdinalIgnoreCase));
+            remoteClientList.RemoteClients.Remove(remoteClient);
+            await _session.SaveAsync(remoteClientList);
         }
+    }
 
-        public async Task DeleteRemoteClientAsync(string id)
-        {
-            var remoteClientList = await GetRemoteClientListAsync();
-            var remoteClient = await GetRemoteClientAsync(id);
-
-            if (remoteClient != null)
-            {
-                remoteClientList.RemoteClients.Remove(remoteClient);
-                await _session.SaveAsync(remoteClientList);
-            }
-        }
+    public async Task<RemoteClient> CreateRemoteClientAsync(string clientName, string apiKey)
+    {
+        var remoteClientList = await GetRemoteClientListAsync();
 
-        public async Task<RemoteClient> CreateRemoteClientAsync(string clientName, string apiKey)
+        var remoteClient = new RemoteClient
         {
-            var remoteClientList = await GetRemoteClientListAsync();
+            Id = Guid.NewGuid().ToString("n"),
+            ClientName = clientName,
+            ProtectedApiKey = _dataProtector.Protect(Encoding.UTF8.GetBytes(apiKey)),
+        };
 
-            var remoteClient = new RemoteClient
-            {
-                Id = Guid.NewGuid().ToString("n"),
-                ClientName = clientName,
-                ProtectedApiKey = _dataProtector.Protect(Encoding.UTF8.GetBytes(apiKey)),
-            };
+        remoteClientList.RemoteClients.Add(remoteClient);
+        await _session.SaveAsync(remoteClientList);
 
-            remoteClientList.RemoteClients.Add(remoteClient);
-            await _session.SaveAsync(remoteClientList);
+        return remoteClient;
+    }
 
-            return remoteClient;
-        }
+    public async Task<bool> TryUpdateRemoteClient(string id, string clientName, string apiKey)
+    {
+        var remoteClient = await GetRemoteClientAsync(id);
 
-        public async Task<bool> TryUpdateRemoteClient(string id, string clientName, string apiKey)
+        if (remoteClient == null)
         {
-            var remoteClient = await GetRemoteClientAsync(id);
-
-            if (remoteClient == null)
-            {
-                return false;
-            }
+            return false;
+        }
 
-            remoteClient.ClientName = clientName;
-            remoteClient.ProtectedApiKey = _dataProtector.Protect(Encoding.UTF8.GetBytes(apiKey));
+        remoteClient.ClientName = clientName;
+        remoteClient.ProtectedApiKey = _dataProtector.Protect(Encoding.UTF8.GetBytes(apiKey));
 
-            await _session.SaveAsync(_remoteClientList);
+        await _session.SaveAsync(_remoteClientList);
 
-            return true;
-        }
+        return true;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteInstanceDeploymentTargetProvider.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteInstanceDeploymentTargetProvider.cs
index 24d5d0bd9b9..002f9d57c90 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteInstanceDeploymentTargetProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteInstanceDeploymentTargetProvider.cs
@@ -5,38 +5,37 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Deployment.Remote.Services;
 
-namespace OrchardCore.Deployment
+namespace OrchardCore.Deployment;
+
+public class RemoteInstanceDeploymentTargetProvider : IDeploymentTargetProvider
 {
-    public class RemoteInstanceDeploymentTargetProvider : IDeploymentTargetProvider
-    {
-        private readonly RemoteInstanceService _service;
-        protected readonly IStringLocalizer S;
+    private readonly RemoteInstanceService _service;
+    protected readonly IStringLocalizer S;
 
-        public RemoteInstanceDeploymentTargetProvider(
-            IStringLocalizer<RemoteInstanceDeploymentTargetProvider> stringLocalizer,
-            RemoteInstanceService service)
-        {
-            _service = service;
-            S = stringLocalizer;
-        }
+    public RemoteInstanceDeploymentTargetProvider(
+        IStringLocalizer<RemoteInstanceDeploymentTargetProvider> stringLocalizer,
+        RemoteInstanceService service)
+    {
+        _service = service;
+        S = stringLocalizer;
+    }
 
-        public async Task<IEnumerable<DeploymentTarget>> GetDeploymentTargetsAsync()
-        {
-            var remoteInstanceList = await _service.GetRemoteInstanceListAsync();
+    public async Task<IEnumerable<DeploymentTarget>> GetDeploymentTargetsAsync()
+    {
+        var remoteInstanceList = await _service.GetRemoteInstanceListAsync();
 
-            return remoteInstanceList.RemoteInstances.Select(x =>
-                    new DeploymentTarget(
-                        name: new LocalizedString(x.Name, x.Name, false),
-                        description: S["Sends the deployment plan to a remote instance."],
-                        route: new RouteValueDictionary(new
-                        {
-                            area = "OrchardCore.Deployment.Remote",
-                            controller = "ExportRemoteInstance",
-                            action = "Execute",
-                            remoteInstanceId = x.Id
-                        })
-                    )
-                ).ToArray();
-        }
+        return remoteInstanceList.RemoteInstances.Select(x =>
+                new DeploymentTarget(
+                    name: new LocalizedString(x.Name, x.Name, false),
+                    description: S["Sends the deployment plan to a remote instance."],
+                    route: new RouteValueDictionary(new
+                    {
+                        area = "OrchardCore.Deployment.Remote",
+                        controller = "ExportRemoteInstance",
+                        action = "Execute",
+                        remoteInstanceId = x.Id
+                    })
+                )
+            ).ToArray();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteInstanceService.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteInstanceService.cs
index d81c968dd18..e36d4388c4f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteInstanceService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteInstanceService.cs
@@ -4,78 +4,77 @@
 using OrchardCore.Deployment.Remote.Models;
 using OrchardCore.Documents;
 
-namespace OrchardCore.Deployment.Remote.Services
+namespace OrchardCore.Deployment.Remote.Services;
+
+public class RemoteInstanceService
 {
-    public class RemoteInstanceService
-    {
-        private readonly IDocumentManager<RemoteInstanceList> _documentManager;
+    private readonly IDocumentManager<RemoteInstanceList> _documentManager;
 
-        public RemoteInstanceService(IDocumentManager<RemoteInstanceList> documentManager) => _documentManager = documentManager;
+    public RemoteInstanceService(IDocumentManager<RemoteInstanceList> documentManager) => _documentManager = documentManager;
 
-        /// <summary>
-        /// Loads the remote instances document from the store for updating and that should not be cached.
-        /// </summary>
-        public Task<RemoteInstanceList> LoadRemoteInstanceListAsync() => _documentManager.GetOrCreateMutableAsync();
+    /// <summary>
+    /// Loads the remote instances document from the store for updating and that should not be cached.
+    /// </summary>
+    public Task<RemoteInstanceList> LoadRemoteInstanceListAsync() => _documentManager.GetOrCreateMutableAsync();
 
-        /// <summary>
-        /// Gets the remote instances document from the cache for sharing and that should not be updated.
-        /// </summary>
-        public Task<RemoteInstanceList> GetRemoteInstanceListAsync() => _documentManager.GetOrCreateImmutableAsync();
+    /// <summary>
+    /// Gets the remote instances document from the cache for sharing and that should not be updated.
+    /// </summary>
+    public Task<RemoteInstanceList> GetRemoteInstanceListAsync() => _documentManager.GetOrCreateImmutableAsync();
 
-        public async Task<RemoteInstance> LoadRemoteInstanceAsync(string id)
-        {
-            var remoteInstanceList = await LoadRemoteInstanceListAsync();
-            return FindRemoteInstance(remoteInstanceList, id);
-        }
+    public async Task<RemoteInstance> LoadRemoteInstanceAsync(string id)
+    {
+        var remoteInstanceList = await LoadRemoteInstanceListAsync();
+        return FindRemoteInstance(remoteInstanceList, id);
+    }
 
-        public async Task<RemoteInstance> GetRemoteInstanceAsync(string id)
-        {
-            var remoteInstanceList = await GetRemoteInstanceListAsync();
-            return FindRemoteInstance(remoteInstanceList, id);
-        }
+    public async Task<RemoteInstance> GetRemoteInstanceAsync(string id)
+    {
+        var remoteInstanceList = await GetRemoteInstanceListAsync();
+        return FindRemoteInstance(remoteInstanceList, id);
+    }
 
-        public async Task DeleteRemoteInstanceAsync(string id)
-        {
-            var remoteInstanceList = await LoadRemoteInstanceListAsync();
-            var remoteInstance = FindRemoteInstance(remoteInstanceList, id);
-
-            if (remoteInstance != null)
-            {
-                remoteInstanceList.RemoteInstances.Remove(remoteInstance);
-                await _documentManager.UpdateAsync(remoteInstanceList);
-            }
-        }
+    public async Task DeleteRemoteInstanceAsync(string id)
+    {
+        var remoteInstanceList = await LoadRemoteInstanceListAsync();
+        var remoteInstance = FindRemoteInstance(remoteInstanceList, id);
 
-        public async Task CreateRemoteInstanceAsync(string name, string url, string clientName, string apiKey)
+        if (remoteInstance != null)
         {
-            var remoteInstanceList = await LoadRemoteInstanceListAsync();
-
-            remoteInstanceList.RemoteInstances.Add(new RemoteInstance
-            {
-                Id = Guid.NewGuid().ToString("n"),
-                Name = name,
-                Url = url,
-                ClientName = clientName,
-                ApiKey = apiKey,
-            });
-
+            remoteInstanceList.RemoteInstances.Remove(remoteInstance);
             await _documentManager.UpdateAsync(remoteInstanceList);
         }
+    }
+
+    public async Task CreateRemoteInstanceAsync(string name, string url, string clientName, string apiKey)
+    {
+        var remoteInstanceList = await LoadRemoteInstanceListAsync();
 
-        public async Task UpdateRemoteInstance(string id, string name, string url, string clientName, string apiKey)
+        remoteInstanceList.RemoteInstances.Add(new RemoteInstance
         {
-            var remoteInstanceList = await LoadRemoteInstanceListAsync();
-            var remoteInstance = FindRemoteInstance(remoteInstanceList, id);
+            Id = Guid.NewGuid().ToString("n"),
+            Name = name,
+            Url = url,
+            ClientName = clientName,
+            ApiKey = apiKey,
+        });
 
-            remoteInstance.Name = name;
-            remoteInstance.Url = url;
-            remoteInstance.ClientName = clientName;
-            remoteInstance.ApiKey = apiKey;
+        await _documentManager.UpdateAsync(remoteInstanceList);
+    }
 
-            await _documentManager.UpdateAsync(remoteInstanceList);
-        }
+    public async Task UpdateRemoteInstance(string id, string name, string url, string clientName, string apiKey)
+    {
+        var remoteInstanceList = await LoadRemoteInstanceListAsync();
+        var remoteInstance = FindRemoteInstance(remoteInstanceList, id);
+
+        remoteInstance.Name = name;
+        remoteInstance.Url = url;
+        remoteInstance.ClientName = clientName;
+        remoteInstance.ApiKey = apiKey;
 
-        private static RemoteInstance FindRemoteInstance(RemoteInstanceList remoteInstanceList, string id) =>
-            remoteInstanceList.RemoteInstances.FirstOrDefault(x => string.Equals(x.Id, id, StringComparison.OrdinalIgnoreCase));
+        await _documentManager.UpdateAsync(remoteInstanceList);
     }
+
+    private static RemoteInstance FindRemoteInstance(RemoteInstanceList remoteInstanceList, string id) =>
+        remoteInstanceList.RemoteInstances.FirstOrDefault(x => string.Equals(x.Id, id, StringComparison.OrdinalIgnoreCase));
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Startup.cs
index 04eca6a7c98..2627bd02ee9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Startup.cs
@@ -5,19 +5,18 @@
 using OrchardCore.Navigation;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Deployment
+namespace OrchardCore.Deployment;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddHttpClient();
+        services.AddHttpClient();
 
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<RemoteInstanceService>();
-            services.AddScoped<RemoteClientService>();
-            services.AddScoped<IDeploymentTargetProvider, RemoteInstanceDeploymentTargetProvider>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-        }
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<RemoteInstanceService>();
+        services.AddScoped<RemoteClientService>();
+        services.AddScoped<IDeploymentTargetProvider, RemoteInstanceDeploymentTargetProvider>();
+        services.AddScoped<IPermissionProvider, Permissions>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/EditRemoteClientViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/EditRemoteClientViewModel.cs
index a7d705f0aec..6722a296a43 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/EditRemoteClientViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/EditRemoteClientViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Deployment.Remote.ViewModels
+namespace OrchardCore.Deployment.Remote.ViewModels;
+
+public class EditRemoteClientViewModel
 {
-    public class EditRemoteClientViewModel
-    {
-        public string Id { get; set; }
-        public string ClientName { get; set; }
-        public string ApiKey { get; set; }
-    }
+    public string Id { get; set; }
+    public string ClientName { get; set; }
+    public string ApiKey { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/EditRemoteInstanceViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/EditRemoteInstanceViewModel.cs
index 603320b2dee..3dc59f7402f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/EditRemoteInstanceViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/EditRemoteInstanceViewModel.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.Deployment.Remote.ViewModels
+namespace OrchardCore.Deployment.Remote.ViewModels;
+
+public class EditRemoteInstanceViewModel
 {
-    public class EditRemoteInstanceViewModel
-    {
-        public string Id { get; set; }
-        public string Name { get; set; }
-        public string ClientName { get; set; }
-        public string ApiKey { get; set; }
-        public string Url { get; set; }
-    }
+    public string Id { get; set; }
+    public string Name { get; set; }
+    public string ClientName { get; set; }
+    public string ApiKey { get; set; }
+    public string Url { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/ImportViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/ImportViewModel.cs
index e9313fd3bed..dd78d1d0a3d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/ImportViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/ImportViewModel.cs
@@ -1,11 +1,10 @@
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Deployment.Remote.ViewModels
+namespace OrchardCore.Deployment.Remote.ViewModels;
+
+public class ImportViewModel
 {
-    public class ImportViewModel
-    {
-        public string ClientName { get; set; }
-        public string ApiKey { get; set; }
-        public IFormFile Content { get; set; }
-    }
+    public string ClientName { get; set; }
+    public string ApiKey { get; set; }
+    public IFormFile Content { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/RemoteClientIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/RemoteClientIndexViewModel.cs
index b7b57a8c0b6..909cbb9aee1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/RemoteClientIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/RemoteClientIndexViewModel.cs
@@ -3,35 +3,34 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using OrchardCore.Deployment.Remote.Models;
 
-namespace OrchardCore.Deployment.Remote.ViewModels
+namespace OrchardCore.Deployment.Remote.ViewModels;
+
+public class RemoteClientIndexViewModel
 {
-    public class RemoteClientIndexViewModel
-    {
-        public List<RemoteClient> RemoteClients { get; set; }
+    public List<RemoteClient> RemoteClients { get; set; }
 
-        public ContentOptions Options { get; set; } = new ContentOptions();
+    public ContentOptions Options { get; set; } = new ContentOptions();
 
-        [BindNever]
-        public dynamic Pager { get; set; }
-    }
+    [BindNever]
+    public dynamic Pager { get; set; }
+}
 
-    public class ContentOptions
-    {
-        public ContentsBulkAction BulkAction { get; set; }
+public class ContentOptions
+{
+    public ContentsBulkAction BulkAction { get; set; }
 
-        public string Search { get; set; }
+    public string Search { get; set; }
 
-        #region Lists to populate
+    #region Lists to populate
 
-        [BindNever]
-        public List<SelectListItem> ContentsBulkAction { get; set; }
+    [BindNever]
+    public List<SelectListItem> ContentsBulkAction { get; set; }
 
-        #endregion Lists to populate
-    }
+    #endregion Lists to populate
+}
 
-    public enum ContentsBulkAction
-    {
-        None,
-        Remove
-    }
+public enum ContentsBulkAction
+{
+    None,
+    Remove
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/RemoteInstanceIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/RemoteInstanceIndexViewModel.cs
index 03edb549759..41bf88998f0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/RemoteInstanceIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/ViewModels/RemoteInstanceIndexViewModel.cs
@@ -2,15 +2,14 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Deployment.Remote.Models;
 
-namespace OrchardCore.Deployment.Remote.ViewModels
+namespace OrchardCore.Deployment.Remote.ViewModels;
+
+public class RemoteInstanceIndexViewModel
 {
-    public class RemoteInstanceIndexViewModel
-    {
-        public List<RemoteInstance> RemoteInstances { get; set; }
+    public List<RemoteInstance> RemoteInstances { get; set; }
 
-        public ContentOptions Options { get; set; } = new ContentOptions();
+    public ContentOptions Options { get; set; } = new ContentOptions();
 
-        [BindNever]
-        public dynamic Pager { get; set; }
-    }
+    [BindNever]
+    public dynamic Pager { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs
index 9a28238c78a..3a4ab4fe76e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs
@@ -2,46 +2,45 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Deployment
+namespace OrchardCore.Deployment;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    internal readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["Import/Export"], S["Import/Export"].PrefixPosition(), import => import
-                        .Add(S["Deployment Plans"], S["Deployment Plans"].PrefixPosition(), deployment => deployment
-                            .Action("Index", "DeploymentPlan", "OrchardCore.Deployment")
-                            .Permission(CommonPermissions.Export)
-                            .LocalNav()
-                        )
-                        .Add(S["Package Import"], S["Package Import"].PrefixPosition(), deployment => deployment
-                            .Action("Index", "Import", "OrchardCore.Deployment")
-                            .Permission(CommonPermissions.Import)
-                            .LocalNav()
-                        )
-                        .Add(S["JSON Import"], S["JSON Import"].PrefixPosition(), deployment => deployment
-                            .Action("Json", "Import", "OrchardCore.Deployment")
-                            .Permission(CommonPermissions.Import)
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["Import/Export"], S["Import/Export"].PrefixPosition(), import => import
+                    .Add(S["Deployment Plans"], S["Deployment Plans"].PrefixPosition(), deployment => deployment
+                        .Action("Index", "DeploymentPlan", "OrchardCore.Deployment")
+                        .Permission(CommonPermissions.Export)
+                        .LocalNav()
+                    )
+                    .Add(S["Package Import"], S["Package Import"].PrefixPosition(), deployment => deployment
+                        .Action("Index", "Import", "OrchardCore.Deployment")
+                        .Permission(CommonPermissions.Import)
+                        .LocalNav()
+                    )
+                    .Add(S["JSON Import"], S["JSON Import"].PrefixPosition(), deployment => deployment
+                        .Action("Json", "Import", "OrchardCore.Deployment")
+                        .Permission(CommonPermissions.Import)
+                        .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/DeploymentPlanController.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/DeploymentPlanController.cs
index 3556a0f7edc..2010d01cc0a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/DeploymentPlanController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/DeploymentPlanController.cs
@@ -20,319 +20,318 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.Deployment.Controllers
+namespace OrchardCore.Deployment.Controllers;
+
+[Admin("DeploymentPlan/{action}/{id?}", "DeploymentPlan{action}")]
+public class DeploymentPlanController : Controller
 {
-    [Admin("DeploymentPlan/{action}/{id?}", "DeploymentPlan{action}")]
-    public class DeploymentPlanController : Controller
+    private const string _optionsSearch = "Options.Search";
+
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IDisplayManager<DeploymentStep> _displayManager;
+    private readonly IEnumerable<IDeploymentStepFactory> _factories;
+    private readonly ISession _session;
+    private readonly PagerOptions _pagerOptions;
+    private readonly INotifier _notifier;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly IShapeFactory _shapeFactory;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public DeploymentPlanController(
+        IAuthorizationService authorizationService,
+        IDisplayManager<DeploymentStep> displayManager,
+        IEnumerable<IDeploymentStepFactory> factories,
+        ISession session,
+        IOptions<PagerOptions> pagerOptions,
+        IShapeFactory shapeFactory,
+        IStringLocalizer<DeploymentPlanController> stringLocalizer,
+        IHtmlLocalizer<DeploymentPlanController> htmlLocalizer,
+        INotifier notifier,
+        IUpdateModelAccessor updateModelAccessor)
+    {
+        _displayManager = displayManager;
+        _factories = factories;
+        _authorizationService = authorizationService;
+        _session = session;
+        _pagerOptions = pagerOptions.Value;
+        _notifier = notifier;
+        _updateModelAccessor = updateModelAccessor;
+        _shapeFactory = shapeFactory;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+    }
+
+    public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
     {
-        private const string _optionsSearch = "Options.Search";
-
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IDisplayManager<DeploymentStep> _displayManager;
-        private readonly IEnumerable<IDeploymentStepFactory> _factories;
-        private readonly ISession _session;
-        private readonly PagerOptions _pagerOptions;
-        private readonly INotifier _notifier;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly IShapeFactory _shapeFactory;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public DeploymentPlanController(
-            IAuthorizationService authorizationService,
-            IDisplayManager<DeploymentStep> displayManager,
-            IEnumerable<IDeploymentStepFactory> factories,
-            ISession session,
-            IOptions<PagerOptions> pagerOptions,
-            IShapeFactory shapeFactory,
-            IStringLocalizer<DeploymentPlanController> stringLocalizer,
-            IHtmlLocalizer<DeploymentPlanController> htmlLocalizer,
-            INotifier notifier,
-            IUpdateModelAccessor updateModelAccessor)
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
         {
-            _displayManager = displayManager;
-            _factories = factories;
-            _authorizationService = authorizationService;
-            _session = session;
-            _pagerOptions = pagerOptions.Value;
-            _notifier = notifier;
-            _updateModelAccessor = updateModelAccessor;
-            _shapeFactory = shapeFactory;
-            S = stringLocalizer;
-            H = htmlLocalizer;
+            return Forbid();
         }
 
-        public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.Export))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.Export))
-            {
-                return Forbid();
-            }
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
 
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+        var deploymentPlans = _session.Query<DeploymentPlan, DeploymentPlanIndex>();
 
-            var deploymentPlans = _session.Query<DeploymentPlan, DeploymentPlanIndex>();
+        if (!string.IsNullOrWhiteSpace(options.Search))
+        {
+            deploymentPlans = deploymentPlans.Where(x => x.Name.Contains(options.Search));
+        }
 
-            if (!string.IsNullOrWhiteSpace(options.Search))
-            {
-                deploymentPlans = deploymentPlans.Where(x => x.Name.Contains(options.Search));
-            }
+        var count = await deploymentPlans.CountAsync();
 
-            var count = await deploymentPlans.CountAsync();
+        var results = await deploymentPlans
+            .OrderBy(p => p.Name)
+            .Skip(pager.GetStartIndex())
+            .Take(pager.PageSize)
+            .ListAsync();
 
-            var results = await deploymentPlans
-                .OrderBy(p => p.Name)
-                .Skip(pager.GetStartIndex())
-                .Take(pager.PageSize)
-                .ListAsync();
+        // Maintain previous route data when generating page links.
+        var routeData = new RouteData();
 
-            // Maintain previous route data when generating page links.
-            var routeData = new RouteData();
+        if (!string.IsNullOrEmpty(options.Search))
+        {
+            routeData.Values.TryAdd(_optionsSearch, options.Search);
+        }
 
-            if (!string.IsNullOrEmpty(options.Search))
-            {
-                routeData.Values.TryAdd(_optionsSearch, options.Search);
-            }
+        var pagerShape = await _shapeFactory.PagerAsync(pager, count, routeData);
 
-            var pagerShape = await _shapeFactory.PagerAsync(pager, count, routeData);
+        var model = new DeploymentPlanIndexViewModel
+        {
+            DeploymentPlans = results.Select(x => new DeploymentPlanEntry { DeploymentPlan = x }).ToList(),
+            Options = options,
+            Pager = pagerShape
+        };
 
-            var model = new DeploymentPlanIndexViewModel
-            {
-                DeploymentPlans = results.Select(x => new DeploymentPlanEntry { DeploymentPlan = x }).ToList(),
-                Options = options,
-                Pager = pagerShape
-            };
+        model.Options.DeploymentPlansBulkAction =
+        [
+            new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Delete)),
+        ];
 
-            model.Options.DeploymentPlansBulkAction =
-            [
-                new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Delete)),
-            ];
+        return View(model);
+    }
 
-            return View(model);
-        }
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.Filter")]
+    public ActionResult IndexFilterPOST(DeploymentPlanIndexViewModel model)
+        => RedirectToAction(nameof(Index), new RouteValueDictionary
+        {
+            { _optionsSearch, model.Options.Search }
+        });
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.Filter")]
-        public ActionResult IndexFilterPOST(DeploymentPlanIndexViewModel model)
-            => RedirectToAction(nameof(Index), new RouteValueDictionary
-            {
-                { _optionsSearch, model.Options.Search }
-            });
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<ActionResult> IndexBulkActionPOST(ContentOptions options, IEnumerable<long> itemIds)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
+        {
+            return Forbid();
+        }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<ActionResult> IndexBulkActionPOST(ContentOptions options, IEnumerable<long> itemIds)
+        if (itemIds?.Count() > 0)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
+            var checkedItems = await _session.Query<DeploymentPlan, DeploymentPlanIndex>().Where(x => x.DocumentId.IsIn(itemIds)).ListAsync();
+            switch (options.BulkAction)
             {
-                return Forbid();
+                case ContentsBulkAction.None:
+                    break;
+                case ContentsBulkAction.Delete:
+                    foreach (var item in checkedItems)
+                    {
+                        _session.Delete(item);
+                    }
+                    await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(options.BulkAction.ToString(), "Invalid bulk action.");
             }
+        }
 
-            if (itemIds?.Count() > 0)
-            {
-                var checkedItems = await _session.Query<DeploymentPlan, DeploymentPlanIndex>().Where(x => x.DocumentId.IsIn(itemIds)).ListAsync();
-                switch (options.BulkAction)
-                {
-                    case ContentsBulkAction.None:
-                        break;
-                    case ContentsBulkAction.Delete:
-                        foreach (var item in checkedItems)
-                        {
-                            _session.Delete(item);
-                        }
-                        await _notifier.SuccessAsync(H["Deployment plans successfully deleted."]);
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException(options.BulkAction.ToString(), "Invalid bulk action.");
-                }
-            }
+        return RedirectToAction(nameof(Index));
+    }
 
-            return RedirectToAction(nameof(Index));
+    public async Task<IActionResult> Display(long id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
+        {
+            return Forbid();
         }
 
-        public async Task<IActionResult> Display(long id)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
-            {
-                return Forbid();
-            }
+        var deploymentPlan = await _session.GetAsync<DeploymentPlan>(id);
 
-            var deploymentPlan = await _session.GetAsync<DeploymentPlan>(id);
+        if (deploymentPlan == null)
+        {
+            return NotFound();
+        }
 
-            if (deploymentPlan == null)
-            {
-                return NotFound();
-            }
+        var items = new List<dynamic>();
+        foreach (var step in deploymentPlan.DeploymentSteps)
+        {
+            var item = await _displayManager.BuildDisplayAsync(step, _updateModelAccessor.ModelUpdater, "Summary");
+            item.Properties["DeploymentStep"] = step;
+            items.Add(item);
+        }
 
-            var items = new List<dynamic>();
-            foreach (var step in deploymentPlan.DeploymentSteps)
-            {
-                var item = await _displayManager.BuildDisplayAsync(step, _updateModelAccessor.ModelUpdater, "Summary");
-                item.Properties["DeploymentStep"] = step;
-                items.Add(item);
-            }
+        var thumbnails = new Dictionary<string, dynamic>();
+        foreach (var factory in _factories)
+        {
+            var step = factory.Create();
+            var thumbnail = await _displayManager.BuildDisplayAsync(step, _updateModelAccessor.ModelUpdater, "Thumbnail");
+            thumbnail.Properties["DeploymentStep"] = step;
+            thumbnails.Add(factory.Name, thumbnail);
+        }
 
-            var thumbnails = new Dictionary<string, dynamic>();
-            foreach (var factory in _factories)
-            {
-                var step = factory.Create();
-                var thumbnail = await _displayManager.BuildDisplayAsync(step, _updateModelAccessor.ModelUpdater, "Thumbnail");
-                thumbnail.Properties["DeploymentStep"] = step;
-                thumbnails.Add(factory.Name, thumbnail);
-            }
+        var model = new DisplayDeploymentPlanViewModel
+        {
+            DeploymentPlan = deploymentPlan,
+            Items = items,
+            Thumbnails = thumbnails,
+        };
 
-            var model = new DisplayDeploymentPlanViewModel
-            {
-                DeploymentPlan = deploymentPlan,
-                Items = items,
-                Thumbnails = thumbnails,
-            };
+        return View(model);
+    }
 
-            return View(model);
+    public async Task<IActionResult> Create()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
+        {
+            return Forbid();
         }
 
-        public async Task<IActionResult> Create()
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
-            {
-                return Forbid();
-            }
+        var model = new CreateDeploymentPlanViewModel();
 
-            var model = new CreateDeploymentPlanViewModel();
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost]
+    public async Task<IActionResult> Create(CreateDeploymentPlanViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Create(CreateDeploymentPlanViewModel model)
+        if (ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
+            if (string.IsNullOrWhiteSpace(model.Name))
             {
-                return Forbid();
+                ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
             }
 
-            if (ModelState.IsValid)
+            var count = await _session.QueryIndex<DeploymentPlanIndex>(x => x.Name == model.Name).CountAsync();
+            if (count > 0)
             {
-                if (string.IsNullOrWhiteSpace(model.Name))
-                {
-                    ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-                }
-
-                var count = await _session.QueryIndex<DeploymentPlanIndex>(x => x.Name == model.Name).CountAsync();
-                if (count > 0)
-                {
-                    ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-                }
+                ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
             }
+        }
 
-            if (ModelState.IsValid)
-            {
-                var deploymentPlan = new DeploymentPlan { Name = model.Name };
-
-                await _session.SaveAsync(deploymentPlan);
+        if (ModelState.IsValid)
+        {
+            var deploymentPlan = new DeploymentPlan { Name = model.Name };
 
-                return RedirectToAction(nameof(Index));
-            }
+            await _session.SaveAsync(deploymentPlan);
 
-            // If we got this far, something failed, redisplay form
-            return View(model);
+            return RedirectToAction(nameof(Index));
         }
 
-        public async Task<IActionResult> Edit(long id)
+        // If we got this far, something failed, redisplay form
+        return View(model);
+    }
+
+    public async Task<IActionResult> Edit(long id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var deploymentPlan = await _session.GetAsync<DeploymentPlan>(id);
+        var deploymentPlan = await _session.GetAsync<DeploymentPlan>(id);
 
-            if (deploymentPlan == null)
-            {
-                return NotFound();
-            }
+        if (deploymentPlan == null)
+        {
+            return NotFound();
+        }
 
-            var model = new EditDeploymentPlanViewModel
-            {
-                Id = deploymentPlan.Id,
-                Name = deploymentPlan.Name
-            };
+        var model = new EditDeploymentPlanViewModel
+        {
+            Id = deploymentPlan.Id,
+            Name = deploymentPlan.Name
+        };
 
-            return View(model);
-        }
+        return View(model);
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> Edit(EditDeploymentPlanViewModel model)
+    [HttpPost]
+    public async Task<IActionResult> Edit(EditDeploymentPlanViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
+
+        var deploymentPlan = await _session.GetAsync<DeploymentPlan>(model.Id);
 
-            var deploymentPlan = await _session.GetAsync<DeploymentPlan>(model.Id);
+        if (deploymentPlan == null)
+        {
+            return NotFound();
+        }
 
-            if (deploymentPlan == null)
+        if (ModelState.IsValid)
+        {
+            if (string.IsNullOrWhiteSpace(model.Name))
             {
-                return NotFound();
+                ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
             }
-
-            if (ModelState.IsValid)
+            if (!string.Equals(model.Name, deploymentPlan.Name, StringComparison.OrdinalIgnoreCase))
             {
-                if (string.IsNullOrWhiteSpace(model.Name))
-                {
-                    ModelState.AddModelError(nameof(EditDeploymentPlanViewModel.Name), S["The name is mandatory."]);
-                }
-                if (!string.Equals(model.Name, deploymentPlan.Name, StringComparison.OrdinalIgnoreCase))
+                var count = await _session.QueryIndex<DeploymentPlanIndex>(x => x.Name == model.Name && x.DocumentId != model.Id).CountAsync();
+                if (count > 0)
                 {
-                    var count = await _session.QueryIndex<DeploymentPlanIndex>(x => x.Name == model.Name && x.DocumentId != model.Id).CountAsync();
-                    if (count > 0)
-                    {
-                        ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
-                    }
+                    ModelState.AddModelError(nameof(CreateDeploymentPlanViewModel.Name), S["A deployment plan with the same name already exists."]);
                 }
             }
+        }
 
-            if (ModelState.IsValid)
-            {
-                deploymentPlan.Name = model.Name;
-
-                await _session.SaveAsync(deploymentPlan);
+        if (ModelState.IsValid)
+        {
+            deploymentPlan.Name = model.Name;
 
-                await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
+            await _session.SaveAsync(deploymentPlan);
 
-                return RedirectToAction(nameof(Index));
-            }
+            await _notifier.SuccessAsync(H["Deployment plan updated successfully."]);
 
-            // If we got this far, something failed, redisplay form
-            return View(model);
+            return RedirectToAction(nameof(Index));
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(long id)
+        // If we got this far, something failed, redisplay form
+        return View(model);
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Delete(long id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var deploymentPlan = await _session.GetAsync<DeploymentPlan>(id);
+        var deploymentPlan = await _session.GetAsync<DeploymentPlan>(id);
 
-            if (deploymentPlan == null)
-            {
-                return NotFound();
-            }
+        if (deploymentPlan == null)
+        {
+            return NotFound();
+        }
 
-            _session.Delete(deploymentPlan);
+        _session.Delete(deploymentPlan);
 
-            await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
+        await _notifier.SuccessAsync(H["Deployment plan deleted successfully."]);
 
-            return RedirectToAction(nameof(Index));
-        }
+        return RedirectToAction(nameof(Index));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/ExportFileController.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/ExportFileController.cs
index b2cfaa3f843..f7bf9a81a1c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/ExportFileController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/ExportFileController.cs
@@ -13,70 +13,69 @@
 using OrchardCore.Recipes.Models;
 using YesSql;
 
-namespace OrchardCore.Deployment.Controllers
+namespace OrchardCore.Deployment.Controllers;
+
+[Admin("DeploymentPlan/ExportFile/{action}/{id?}", "DeploymentPlanExportFile{action}")]
+public class ExportFileController : Controller
 {
-    [Admin("DeploymentPlan/ExportFile/{action}/{id?}", "DeploymentPlanExportFile{action}")]
-    public class ExportFileController : Controller
+    private readonly IDeploymentManager _deploymentManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly ISession _session;
+
+    public ExportFileController(
+        IAuthorizationService authorizationService,
+        ISession session,
+        IDeploymentManager deploymentManager)
     {
-        private readonly IDeploymentManager _deploymentManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly ISession _session;
+        _authorizationService = authorizationService;
+        _deploymentManager = deploymentManager;
+        _session = session;
+    }
 
-        public ExportFileController(
-            IAuthorizationService authorizationService,
-            ISession session,
-            IDeploymentManager deploymentManager)
+    [HttpPost]
+    [DeleteFileResultFilter]
+    public async Task<IActionResult> Execute(long id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.Export))
         {
-            _authorizationService = authorizationService;
-            _deploymentManager = deploymentManager;
-            _session = session;
+            return Forbid();
         }
 
-        [HttpPost]
-        [DeleteFileResultFilter]
-        public async Task<IActionResult> Execute(long id)
+        var deploymentPlan = await _session.GetAsync<DeploymentPlan>(id);
+
+        if (deploymentPlan == null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.Export))
-            {
-                return Forbid();
-            }
+            return NotFound();
+        }
 
-            var deploymentPlan = await _session.GetAsync<DeploymentPlan>(id);
+        string archiveFileName;
+        var filename = deploymentPlan.Name.ToSafeName() + ".zip";
 
-            if (deploymentPlan == null)
-            {
-                return NotFound();
-            }
+        using (var fileBuilder = new TemporaryFileBuilder())
+        {
+            archiveFileName = fileBuilder.Folder + ".zip";
 
-            string archiveFileName;
-            var filename = deploymentPlan.Name.ToSafeName() + ".zip";
+            var recipeDescriptor = new RecipeDescriptor();
+            var recipeFileDeploymentStep = deploymentPlan.DeploymentSteps.FirstOrDefault(ds => ds.Name == nameof(RecipeFileDeploymentStep)) as RecipeFileDeploymentStep;
 
-            using (var fileBuilder = new TemporaryFileBuilder())
+            if (recipeFileDeploymentStep != null)
             {
-                archiveFileName = fileBuilder.Folder + ".zip";
-
-                var recipeDescriptor = new RecipeDescriptor();
-                var recipeFileDeploymentStep = deploymentPlan.DeploymentSteps.FirstOrDefault(ds => ds.Name == nameof(RecipeFileDeploymentStep)) as RecipeFileDeploymentStep;
-
-                if (recipeFileDeploymentStep != null)
-                {
-                    recipeDescriptor.Name = recipeFileDeploymentStep.RecipeName;
-                    recipeDescriptor.DisplayName = recipeFileDeploymentStep.DisplayName;
-                    recipeDescriptor.Description = recipeFileDeploymentStep.Description;
-                    recipeDescriptor.Author = recipeFileDeploymentStep.Author;
-                    recipeDescriptor.WebSite = recipeFileDeploymentStep.WebSite;
-                    recipeDescriptor.Version = recipeFileDeploymentStep.Version;
-                    recipeDescriptor.IsSetupRecipe = recipeFileDeploymentStep.IsSetupRecipe;
-                    recipeDescriptor.Categories = (recipeFileDeploymentStep.Categories ?? "").Split(',', StringSplitOptions.RemoveEmptyEntries);
-                    recipeDescriptor.Tags = (recipeFileDeploymentStep.Tags ?? "").Split(',', StringSplitOptions.RemoveEmptyEntries);
-                }
-
-                var deploymentPlanResult = new DeploymentPlanResult(fileBuilder, recipeDescriptor);
-                await _deploymentManager.ExecuteDeploymentPlanAsync(deploymentPlan, deploymentPlanResult);
-                ZipFile.CreateFromDirectory(fileBuilder.Folder, archiveFileName);
+                recipeDescriptor.Name = recipeFileDeploymentStep.RecipeName;
+                recipeDescriptor.DisplayName = recipeFileDeploymentStep.DisplayName;
+                recipeDescriptor.Description = recipeFileDeploymentStep.Description;
+                recipeDescriptor.Author = recipeFileDeploymentStep.Author;
+                recipeDescriptor.WebSite = recipeFileDeploymentStep.WebSite;
+                recipeDescriptor.Version = recipeFileDeploymentStep.Version;
+                recipeDescriptor.IsSetupRecipe = recipeFileDeploymentStep.IsSetupRecipe;
+                recipeDescriptor.Categories = (recipeFileDeploymentStep.Categories ?? "").Split(',', StringSplitOptions.RemoveEmptyEntries);
+                recipeDescriptor.Tags = (recipeFileDeploymentStep.Tags ?? "").Split(',', StringSplitOptions.RemoveEmptyEntries);
             }
 
-            return new PhysicalFileResult(archiveFileName, "application/zip") { FileDownloadName = filename };
+            var deploymentPlanResult = new DeploymentPlanResult(fileBuilder, recipeDescriptor);
+            await _deploymentManager.ExecuteDeploymentPlanAsync(deploymentPlan, deploymentPlanResult);
+            ZipFile.CreateFromDirectory(fileBuilder.Folder, archiveFileName);
         }
+
+        return new PhysicalFileResult(archiveFileName, "application/zip") { FileDownloadName = filename };
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/ImportController.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/ImportController.cs
index 8d794abc666..1194bb36f79 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/ImportController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/ImportController.cs
@@ -17,177 +17,176 @@
 using OrchardCore.Mvc.Utilities;
 using OrchardCore.Recipes.Models;
 
-namespace OrchardCore.Deployment.Controllers
+namespace OrchardCore.Deployment.Controllers;
+
+[Admin("DeploymentPlan/Import/{action}", "DeploymentPlanImport{action}")]
+public class ImportController : Controller
 {
-    [Admin("DeploymentPlan/Import/{action}", "DeploymentPlanImport{action}")]
-    public class ImportController : Controller
+    private readonly IDeploymentManager _deploymentManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly INotifier _notifier;
+    private readonly ILogger _logger;
+
+    protected readonly IHtmlLocalizer H;
+    protected readonly IStringLocalizer S;
+
+    public ImportController(
+        IDeploymentManager deploymentManager,
+        IAuthorizationService authorizationService,
+        INotifier notifier,
+        ILogger<ImportController> logger,
+        IHtmlLocalizer<ImportController> htmlLocalizer,
+        IStringLocalizer<ImportController> stringLocalizer
+    )
+    {
+        _deploymentManager = deploymentManager;
+        _authorizationService = authorizationService;
+        _notifier = notifier;
+        _logger = logger;
+        H = htmlLocalizer;
+        S = stringLocalizer;
+    }
+
+    public async Task<IActionResult> Index()
     {
-        private readonly IDeploymentManager _deploymentManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly INotifier _notifier;
-        private readonly ILogger _logger;
-
-        protected readonly IHtmlLocalizer H;
-        protected readonly IStringLocalizer S;
-
-        public ImportController(
-            IDeploymentManager deploymentManager,
-            IAuthorizationService authorizationService,
-            INotifier notifier,
-            ILogger<ImportController> logger,
-            IHtmlLocalizer<ImportController> htmlLocalizer,
-            IStringLocalizer<ImportController> stringLocalizer
-        )
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.Import))
         {
-            _deploymentManager = deploymentManager;
-            _authorizationService = authorizationService;
-            _notifier = notifier;
-            _logger = logger;
-            H = htmlLocalizer;
-            S = stringLocalizer;
+            return Forbid();
         }
 
-        public async Task<IActionResult> Index()
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.Import))
-            {
-                return Forbid();
-            }
+        return View();
+    }
 
-            return View();
+    [HttpPost]
+    public async Task<IActionResult> Import(IFormFile importedPackage)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.Import))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Import(IFormFile importedPackage)
+        if (importedPackage != null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.Import))
-            {
-                return Forbid();
-            }
+            var tempArchiveName = Path.GetTempFileName() + Path.GetExtension(importedPackage.FileName);
+            var tempArchiveFolder = PathExtensions.Combine(Path.GetTempPath(), Path.GetRandomFileName());
 
-            if (importedPackage != null)
+            try
             {
-                var tempArchiveName = Path.GetTempFileName() + Path.GetExtension(importedPackage.FileName);
-                var tempArchiveFolder = PathExtensions.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-
-                try
+                using (var stream = new FileStream(tempArchiveName, FileMode.Create))
                 {
-                    using (var stream = new FileStream(tempArchiveName, FileMode.Create))
-                    {
-                        await importedPackage.CopyToAsync(stream);
-                    }
-
-                    if (importedPackage.FileName.EndsWith(".zip"))
-                    {
-                        ZipFile.ExtractToDirectory(tempArchiveName, tempArchiveFolder);
-                    }
-                    else if (importedPackage.FileName.EndsWith(".json"))
-                    {
-                        Directory.CreateDirectory(tempArchiveFolder);
-                        System.IO.File.Move(tempArchiveName, Path.Combine(tempArchiveFolder, "Recipe.json"));
-                    }
-                    else
-                    {
-                        await _notifier.ErrorAsync(H["Only zip or json files are supported."]);
-
-                        return RedirectToAction(nameof(Index));
-                    }
-
-                    await _deploymentManager.ImportDeploymentPackageAsync(new PhysicalFileProvider(tempArchiveFolder));
-
-                    await _notifier.SuccessAsync(H["Deployment package imported."]);
+                    await importedPackage.CopyToAsync(stream);
                 }
-                catch (RecipeExecutionException e)
-                {
-                    _logger.LogError(e, "Unable to import a deployment package.");
 
-                    await _notifier.ErrorAsync(H["The import failed with the following errors: {0}", string.Join(' ', e.StepResult.Errors)]);
+                if (importedPackage.FileName.EndsWith(".zip"))
+                {
+                    ZipFile.ExtractToDirectory(tempArchiveName, tempArchiveFolder);
                 }
-                catch (Exception e)
+                else if (importedPackage.FileName.EndsWith(".json"))
                 {
-                    _logger.LogError(e, "Unable to import a deployment package.");
-
-                    await _notifier.ErrorAsync(H["Unexpected error occurred while importing the deployment package."]);
+                    Directory.CreateDirectory(tempArchiveFolder);
+                    System.IO.File.Move(tempArchiveName, Path.Combine(tempArchiveFolder, "Recipe.json"));
                 }
-                finally
+                else
                 {
-                    if (System.IO.File.Exists(tempArchiveName))
-                    {
-                        System.IO.File.Delete(tempArchiveName);
-                    }
-
-                    if (Directory.Exists(tempArchiveFolder))
-                    {
-                        Directory.Delete(tempArchiveFolder, true);
-                    }
+                    await _notifier.ErrorAsync(H["Only zip or json files are supported."]);
+
+                    return RedirectToAction(nameof(Index));
                 }
+
+                await _deploymentManager.ImportDeploymentPackageAsync(new PhysicalFileProvider(tempArchiveFolder));
+
+                await _notifier.SuccessAsync(H["Deployment package imported."]);
             }
-            else
+            catch (RecipeExecutionException e)
             {
-                await _notifier.ErrorAsync(H["Please add a file to import."]);
+                _logger.LogError(e, "Unable to import a deployment package.");
+
+                await _notifier.ErrorAsync(H["The import failed with the following errors: {0}", string.Join(' ', e.StepResult.Errors)]);
+            }
+            catch (Exception e)
+            {
+                _logger.LogError(e, "Unable to import a deployment package.");
+
+                await _notifier.ErrorAsync(H["Unexpected error occurred while importing the deployment package."]);
             }
+            finally
+            {
+                if (System.IO.File.Exists(tempArchiveName))
+                {
+                    System.IO.File.Delete(tempArchiveName);
+                }
 
-            return RedirectToAction(nameof(Index));
+                if (Directory.Exists(tempArchiveFolder))
+                {
+                    Directory.Delete(tempArchiveFolder, true);
+                }
+            }
+        }
+        else
+        {
+            await _notifier.ErrorAsync(H["Please add a file to import."]);
         }
 
-        public async Task<IActionResult> Json()
+        return RedirectToAction(nameof(Index));
+    }
+
+    public async Task<IActionResult> Json()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.Import))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.Import))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
+
+        return View();
+    }
 
-            return View();
+    [HttpPost]
+    public async Task<IActionResult> Json(ImportJsonViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.Import))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Json(ImportJsonViewModel model)
+        if (!model.Json.IsJson(JOptions.Document))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.Import))
-            {
-                return Forbid();
-            }
+            ModelState.AddModelError(nameof(model.Json), S["The recipe is written in an incorrect JSON format."]);
+        }
 
-            if (!model.Json.IsJson(JOptions.Document))
-            {
-                ModelState.AddModelError(nameof(model.Json), S["The recipe is written in an incorrect JSON format."]);
-            }
+        if (ModelState.IsValid)
+        {
+            var tempArchiveFolder = PathExtensions.Combine(Path.GetTempPath(), Path.GetRandomFileName());
 
-            if (ModelState.IsValid)
+            try
             {
-                var tempArchiveFolder = PathExtensions.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+                Directory.CreateDirectory(tempArchiveFolder);
+                System.IO.File.WriteAllText(Path.Combine(tempArchiveFolder, "Recipe.json"), model.Json);
 
-                try
-                {
-                    Directory.CreateDirectory(tempArchiveFolder);
-                    System.IO.File.WriteAllText(Path.Combine(tempArchiveFolder, "Recipe.json"), model.Json);
+                await _deploymentManager.ImportDeploymentPackageAsync(new PhysicalFileProvider(tempArchiveFolder));
 
-                    await _deploymentManager.ImportDeploymentPackageAsync(new PhysicalFileProvider(tempArchiveFolder));
-
-                    await _notifier.SuccessAsync(H["Recipe imported successfully!"]);
-                }
-                catch (RecipeExecutionException e)
-                {
-                    _logger.LogError(e, "Unable to import a recipe from JSON input.");
+                await _notifier.SuccessAsync(H["Recipe imported successfully!"]);
+            }
+            catch (RecipeExecutionException e)
+            {
+                _logger.LogError(e, "Unable to import a recipe from JSON input.");
 
-                    ModelState.AddModelError(nameof(model.Json), string.Join(' ', e.StepResult.Errors));
-                }
-                catch (Exception e)
-                {
-                    _logger.LogError(e, "Unable to import a recipe from JSON input.");
+                ModelState.AddModelError(nameof(model.Json), string.Join(' ', e.StepResult.Errors));
+            }
+            catch (Exception e)
+            {
+                _logger.LogError(e, "Unable to import a recipe from JSON input.");
 
-                    ModelState.AddModelError(string.Empty, S["Unexpected error occurred while importing the recipe."]);
-                }
-                finally
+                ModelState.AddModelError(string.Empty, S["Unexpected error occurred while importing the recipe."]);
+            }
+            finally
+            {
+                if (Directory.Exists(tempArchiveFolder))
                 {
-                    if (Directory.Exists(tempArchiveFolder))
-                    {
-                        Directory.Delete(tempArchiveFolder, true);
-                    }
+                    Directory.Delete(tempArchiveFolder, true);
                 }
             }
-
-            return View(model);
         }
+
+        return View(model);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/StepController.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/StepController.cs
index db7bc2f1326..40d35fc97fe 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/StepController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/StepController.cs
@@ -12,252 +12,251 @@
 using OrchardCore.DisplayManagement.Notify;
 using YesSql;
 
-namespace OrchardCore.Deployment.Controllers
+namespace OrchardCore.Deployment.Controllers;
+
+[Admin]
+public class StepController : Controller
 {
-    [Admin]
-    public class StepController : Controller
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IDisplayManager<DeploymentStep> _displayManager;
+    private readonly IEnumerable<IDeploymentStepFactory> _factories;
+    private readonly ISession _session;
+    private readonly INotifier _notifier;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+
+    protected readonly IHtmlLocalizer H;
+
+    public StepController(
+        IAuthorizationService authorizationService,
+        IDisplayManager<DeploymentStep> displayManager,
+        IEnumerable<IDeploymentStepFactory> factories,
+        ISession session,
+        IHtmlLocalizer<StepController> htmlLocalizer,
+        INotifier notifier,
+        IUpdateModelAccessor updateModelAccessor)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IDisplayManager<DeploymentStep> _displayManager;
-        private readonly IEnumerable<IDeploymentStepFactory> _factories;
-        private readonly ISession _session;
-        private readonly INotifier _notifier;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-
-        protected readonly IHtmlLocalizer H;
-
-        public StepController(
-            IAuthorizationService authorizationService,
-            IDisplayManager<DeploymentStep> displayManager,
-            IEnumerable<IDeploymentStepFactory> factories,
-            ISession session,
-            IHtmlLocalizer<StepController> htmlLocalizer,
-            INotifier notifier,
-            IUpdateModelAccessor updateModelAccessor)
-        {
-            _displayManager = displayManager;
-            _factories = factories;
-            _authorizationService = authorizationService;
-            _session = session;
-            _notifier = notifier;
-            _updateModelAccessor = updateModelAccessor;
-            H = htmlLocalizer;
-        }
+        _displayManager = displayManager;
+        _factories = factories;
+        _authorizationService = authorizationService;
+        _session = session;
+        _notifier = notifier;
+        _updateModelAccessor = updateModelAccessor;
+        H = htmlLocalizer;
+    }
 
-        [Admin("DeploymentPlan/{id}/Step/Create", "DeploymentPlanCreateStep")]
-        public async Task<IActionResult> Create(long id, string type)
+    [Admin("DeploymentPlan/{id}/Step/Create", "DeploymentPlanCreateStep")]
+    public async Task<IActionResult> Create(long id, string type)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var deploymentPlan = await _session.GetAsync<DeploymentPlan>(id);
+        var deploymentPlan = await _session.GetAsync<DeploymentPlan>(id);
 
-            if (deploymentPlan == null)
-            {
-                return NotFound();
-            }
+        if (deploymentPlan == null)
+        {
+            return NotFound();
+        }
 
-            var step = _factories.FirstOrDefault(x => x.Name == type)?.Create();
+        var step = _factories.FirstOrDefault(x => x.Name == type)?.Create();
 
-            if (step == null)
-            {
-                return NotFound();
-            }
+        if (step == null)
+        {
+            return NotFound();
+        }
 
-            step.Id = Guid.NewGuid().ToString("n");
+        step.Id = Guid.NewGuid().ToString("n");
 
-            var model = new EditDeploymentPlanStepViewModel
-            {
-                DeploymentPlanId = id,
-                DeploymentStep = step,
-                DeploymentStepId = step.Id,
-                DeploymentStepType = type,
-                Editor = await _displayManager.BuildEditorAsync(step, updater: _updateModelAccessor.ModelUpdater, isNew: true, string.Empty, string.Empty)
-            };
+        var model = new EditDeploymentPlanStepViewModel
+        {
+            DeploymentPlanId = id,
+            DeploymentStep = step,
+            DeploymentStepId = step.Id,
+            DeploymentStepType = type,
+            Editor = await _displayManager.BuildEditorAsync(step, updater: _updateModelAccessor.ModelUpdater, isNew: true, string.Empty, string.Empty)
+        };
 
-            model.Editor.DeploymentStep = step;
+        model.Editor.DeploymentStep = step;
 
-            return View(model);
-        }
+        return View(model);
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> Create(EditDeploymentPlanStepViewModel model)
+    [HttpPost]
+    public async Task<IActionResult> Create(EditDeploymentPlanStepViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var deploymentPlan = await _session.GetAsync<DeploymentPlan>(model.DeploymentPlanId);
+        var deploymentPlan = await _session.GetAsync<DeploymentPlan>(model.DeploymentPlanId);
 
-            if (deploymentPlan == null)
-            {
-                return NotFound();
-            }
+        if (deploymentPlan == null)
+        {
+            return NotFound();
+        }
 
-            var step = _factories.FirstOrDefault(x => x.Name == model.DeploymentStepType)?.Create();
+        var step = _factories.FirstOrDefault(x => x.Name == model.DeploymentStepType)?.Create();
 
-            if (step == null)
-            {
-                return NotFound();
-            }
+        if (step == null)
+        {
+            return NotFound();
+        }
 
-            var editor = await _displayManager.UpdateEditorAsync(step, updater: _updateModelAccessor.ModelUpdater, isNew: true, string.Empty, string.Empty);
-            editor.Properties["DeploymentStep"] = step;
+        var editor = await _displayManager.UpdateEditorAsync(step, updater: _updateModelAccessor.ModelUpdater, isNew: true, string.Empty, string.Empty);
+        editor.Properties["DeploymentStep"] = step;
 
-            if (ModelState.IsValid)
-            {
-                step.Id = model.DeploymentStepId;
-                deploymentPlan.DeploymentSteps.Add(step);
-                await _session.SaveAsync(deploymentPlan);
+        if (ModelState.IsValid)
+        {
+            step.Id = model.DeploymentStepId;
+            deploymentPlan.DeploymentSteps.Add(step);
+            await _session.SaveAsync(deploymentPlan);
 
-                await _notifier.SuccessAsync(H["Deployment plan step added successfully."]);
-                return RedirectToAction("Display", "DeploymentPlan", new { id = model.DeploymentPlanId });
-            }
+            await _notifier.SuccessAsync(H["Deployment plan step added successfully."]);
+            return RedirectToAction("Display", "DeploymentPlan", new { id = model.DeploymentPlanId });
+        }
 
-            model.Editor = editor;
+        model.Editor = editor;
 
-            // If we got this far, something failed, redisplay form
-            return View(model);
-        }
+        // If we got this far, something failed, redisplay form
+        return View(model);
+    }
 
-        [Admin("DeploymentPlan/{id}/Step/{stepId}/Edit", "DeploymentPlanEditStep")]
-        public async Task<IActionResult> Edit(long id, string stepId)
+    [Admin("DeploymentPlan/{id}/Step/{stepId}/Edit", "DeploymentPlanEditStep")]
+    public async Task<IActionResult> Edit(long id, string stepId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var deploymentPlan = await _session.GetAsync<DeploymentPlan>(id);
+        var deploymentPlan = await _session.GetAsync<DeploymentPlan>(id);
 
-            if (deploymentPlan == null)
-            {
-                return NotFound();
-            }
+        if (deploymentPlan == null)
+        {
+            return NotFound();
+        }
 
-            var step = deploymentPlan.DeploymentSteps.FirstOrDefault(x => string.Equals(x.Id, stepId, StringComparison.OrdinalIgnoreCase));
+        var step = deploymentPlan.DeploymentSteps.FirstOrDefault(x => string.Equals(x.Id, stepId, StringComparison.OrdinalIgnoreCase));
 
-            if (step == null)
-            {
-                return NotFound();
-            }
+        if (step == null)
+        {
+            return NotFound();
+        }
 
-            var model = new EditDeploymentPlanStepViewModel
-            {
-                DeploymentPlanId = id,
-                DeploymentStep = step,
-                DeploymentStepId = step.Id,
-                DeploymentStepType = step.GetType().Name,
-                Editor = await _displayManager.BuildEditorAsync(step, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "")
-            };
+        var model = new EditDeploymentPlanStepViewModel
+        {
+            DeploymentPlanId = id,
+            DeploymentStep = step,
+            DeploymentStepId = step.Id,
+            DeploymentStepType = step.GetType().Name,
+            Editor = await _displayManager.BuildEditorAsync(step, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "")
+        };
 
-            model.Editor.DeploymentStep = step;
+        model.Editor.DeploymentStep = step;
 
-            return View(model);
-        }
+        return View(model);
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> Edit(EditDeploymentPlanStepViewModel model)
+    [HttpPost]
+    public async Task<IActionResult> Edit(EditDeploymentPlanStepViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var deploymentPlan = await _session.GetAsync<DeploymentPlan>(model.DeploymentPlanId);
+        var deploymentPlan = await _session.GetAsync<DeploymentPlan>(model.DeploymentPlanId);
 
-            if (deploymentPlan == null)
-            {
-                return NotFound();
-            }
+        if (deploymentPlan == null)
+        {
+            return NotFound();
+        }
 
-            var step = deploymentPlan.DeploymentSteps.FirstOrDefault(x => string.Equals(x.Id, model.DeploymentStepId, StringComparison.OrdinalIgnoreCase));
+        var step = deploymentPlan.DeploymentSteps.FirstOrDefault(x => string.Equals(x.Id, model.DeploymentStepId, StringComparison.OrdinalIgnoreCase));
 
-            if (step == null)
-            {
-                return NotFound();
-            }
+        if (step == null)
+        {
+            return NotFound();
+        }
 
-            var editor = await _displayManager.UpdateEditorAsync(step, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "");
+        var editor = await _displayManager.UpdateEditorAsync(step, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "");
 
-            if (ModelState.IsValid)
-            {
-                await _session.SaveAsync(deploymentPlan);
+        if (ModelState.IsValid)
+        {
+            await _session.SaveAsync(deploymentPlan);
 
-                await _notifier.SuccessAsync(H["Deployment plan step updated successfully."]);
-                return RedirectToAction("Display", "DeploymentPlan", new { id = model.DeploymentPlanId });
-            }
+            await _notifier.SuccessAsync(H["Deployment plan step updated successfully."]);
+            return RedirectToAction("Display", "DeploymentPlan", new { id = model.DeploymentPlanId });
+        }
 
-            await _notifier.ErrorAsync(H["The deployment plan step has validation errors."]);
-            model.Editor = editor;
+        await _notifier.ErrorAsync(H["The deployment plan step has validation errors."]);
+        model.Editor = editor;
 
-            // If we got this far, something failed, redisplay form
-            return View(model);
-        }
+        // If we got this far, something failed, redisplay form
+        return View(model);
+    }
 
-        [HttpPost]
-        [Admin("DeploymentPlan/{id}/Step/{stepId}/Delete", "DeploymentPlanDeleteStep")]
-        public async Task<IActionResult> Delete(long id, string stepId)
+    [HttpPost]
+    [Admin("DeploymentPlan/{id}/Step/{stepId}/Delete", "DeploymentPlanDeleteStep")]
+    public async Task<IActionResult> Delete(long id, string stepId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var deploymentPlan = await _session.GetAsync<DeploymentPlan>(id);
+        var deploymentPlan = await _session.GetAsync<DeploymentPlan>(id);
 
-            if (deploymentPlan == null)
-            {
-                return NotFound();
-            }
+        if (deploymentPlan == null)
+        {
+            return NotFound();
+        }
 
-            var step = deploymentPlan.DeploymentSteps.FirstOrDefault(x => string.Equals(x.Id, stepId, StringComparison.OrdinalIgnoreCase));
+        var step = deploymentPlan.DeploymentSteps.FirstOrDefault(x => string.Equals(x.Id, stepId, StringComparison.OrdinalIgnoreCase));
 
-            if (step == null)
-            {
-                return NotFound();
-            }
+        if (step == null)
+        {
+            return NotFound();
+        }
 
-            deploymentPlan.DeploymentSteps.Remove(step);
-            await _session.SaveAsync(deploymentPlan);
+        deploymentPlan.DeploymentSteps.Remove(step);
+        await _session.SaveAsync(deploymentPlan);
 
-            await _notifier.SuccessAsync(H["Deployment step deleted successfully."]);
+        await _notifier.SuccessAsync(H["Deployment step deleted successfully."]);
 
-            return RedirectToAction("Display", "DeploymentPlan", new { id });
-        }
+        return RedirectToAction("Display", "DeploymentPlan", new { id });
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> UpdateOrder(long id, int oldIndex, int newIndex)
+    [HttpPost]
+    public async Task<IActionResult> UpdateOrder(long id, int oldIndex, int newIndex)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageDeploymentPlan))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var deploymentPlan = await _session.GetAsync<DeploymentPlan>(id);
+        var deploymentPlan = await _session.GetAsync<DeploymentPlan>(id);
 
-            if (deploymentPlan == null)
-            {
-                return NotFound();
-            }
+        if (deploymentPlan == null)
+        {
+            return NotFound();
+        }
 
-            var step = deploymentPlan.DeploymentSteps.ElementAtOrDefault(oldIndex);
+        var step = deploymentPlan.DeploymentSteps.ElementAtOrDefault(oldIndex);
 
-            if (step == null)
-            {
-                return NotFound();
-            }
+        if (step == null)
+        {
+            return NotFound();
+        }
 
-            deploymentPlan.DeploymentSteps.RemoveAt(oldIndex);
+        deploymentPlan.DeploymentSteps.RemoveAt(oldIndex);
 
-            deploymentPlan.DeploymentSteps.Insert(newIndex, step);
+        deploymentPlan.DeploymentSteps.Insert(newIndex, step);
 
-            await _session.SaveAsync(deploymentPlan);
+        await _session.SaveAsync(deploymentPlan);
 
-            return Ok();
-        }
+        return Ok();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Deployment/DeploymentPlanDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Deployment/DeploymentPlanDeploymentSource.cs
index 4ec1d3b4d29..ec754d84dfc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Deployment/DeploymentPlanDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Deployment/DeploymentPlanDeploymentSource.cs
@@ -6,74 +6,73 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Json;
 
-namespace OrchardCore.Deployment.Deployment
+namespace OrchardCore.Deployment.Deployment;
+
+public class DeploymentPlanDeploymentSource : IDeploymentSource
 {
-    public class DeploymentPlanDeploymentSource : IDeploymentSource
+    private readonly IDeploymentPlanService _deploymentPlanService;
+    private readonly IEnumerable<IDeploymentStepFactory> _deploymentStepFactories;
+    private readonly JsonSerializerOptions _jsonSerializerOptions;
+
+    public DeploymentPlanDeploymentSource(
+        IDeploymentPlanService deploymentPlanService,
+        IEnumerable<IDeploymentStepFactory> deploymentStepFactories,
+        IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions)
     {
-        private readonly IDeploymentPlanService _deploymentPlanService;
-        private readonly IEnumerable<IDeploymentStepFactory> _deploymentStepFactories;
-        private readonly JsonSerializerOptions _jsonSerializerOptions;
+        _deploymentPlanService = deploymentPlanService;
+        _deploymentStepFactories = deploymentStepFactories;
+        _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
+    }
 
-        public DeploymentPlanDeploymentSource(
-            IDeploymentPlanService deploymentPlanService,
-            IEnumerable<IDeploymentStepFactory> deploymentStepFactories,
-            IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep deploymentStep, DeploymentPlanResult result)
+    {
+        if (deploymentStep is not DeploymentPlanDeploymentStep deploymentPlanStep)
         {
-            _deploymentPlanService = deploymentPlanService;
-            _deploymentStepFactories = deploymentStepFactories;
-            _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep deploymentStep, DeploymentPlanResult result)
+        if (!await _deploymentPlanService.DoesUserHavePermissionsAsync())
         {
-            if (deploymentStep is not DeploymentPlanDeploymentStep deploymentPlanStep)
-            {
-                return;
-            }
-
-            if (!await _deploymentPlanService.DoesUserHavePermissionsAsync())
-            {
-                return;
-            }
-
-            var deploymentStepFactories = _deploymentStepFactories.ToDictionary(f => f.Name);
+            return;
+        }
 
-            var deploymentPlans = deploymentPlanStep.IncludeAll
-                ? (await _deploymentPlanService.GetAllDeploymentPlansAsync()).ToArray()
-                : (await _deploymentPlanService.GetDeploymentPlansAsync(deploymentPlanStep.DeploymentPlanNames)).ToArray();
+        var deploymentStepFactories = _deploymentStepFactories.ToDictionary(f => f.Name);
 
-            var plans = (from plan in deploymentPlans
-                         select new
-                         {
-                             plan.Name,
-                             Steps = (from step in plan.DeploymentSteps
-                                      select new
-                                      {
-                                          Type = GetStepType(deploymentStepFactories, step),
-                                          Step = step
-                                      }).ToArray(),
-                         }).ToArray();
+        var deploymentPlans = deploymentPlanStep.IncludeAll
+            ? (await _deploymentPlanService.GetAllDeploymentPlansAsync()).ToArray()
+            : (await _deploymentPlanService.GetDeploymentPlansAsync(deploymentPlanStep.DeploymentPlanNames)).ToArray();
 
-            // Adding deployment plans.
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "deployment",
-                ["Plans"] = JArray.FromObject(plans, _jsonSerializerOptions),
-            });
-        }
+        var plans = (from plan in deploymentPlans
+                     select new
+                     {
+                         plan.Name,
+                         Steps = (from step in plan.DeploymentSteps
+                                  select new
+                                  {
+                                      Type = GetStepType(deploymentStepFactories, step),
+                                      Step = step
+                                  }).ToArray(),
+                     }).ToArray();
 
-        /// <summary>
-        /// A Site Settings Step is generic and the name is mapped to the <see cref="IDeploymentStepFactory.Name"/> so its 'Type' should be determined though a lookup.
-        /// A normal steps name is not mapped to the <see cref="IDeploymentStepFactory.Name"/> and should use its type.
-        /// </summary>
-        private static string GetStepType(Dictionary<string, IDeploymentStepFactory> deploymentStepFactories, DeploymentStep step)
+        // Adding deployment plans.
+        result.Steps.Add(new JsonObject
         {
-            if (deploymentStepFactories.TryGetValue(step.Name, out var deploymentStepFactory))
-            {
-                return deploymentStepFactory.Name;
-            }
+            ["name"] = "deployment",
+            ["Plans"] = JArray.FromObject(plans, _jsonSerializerOptions),
+        });
+    }
 
-            return step.GetType().Name;
+    /// <summary>
+    /// A Site Settings Step is generic and the name is mapped to the <see cref="IDeploymentStepFactory.Name"/> so its 'Type' should be determined though a lookup.
+    /// A normal steps name is not mapped to the <see cref="IDeploymentStepFactory.Name"/> and should use its type.
+    /// </summary>
+    private static string GetStepType(Dictionary<string, IDeploymentStepFactory> deploymentStepFactories, DeploymentStep step)
+    {
+        if (deploymentStepFactories.TryGetValue(step.Name, out var deploymentStepFactory))
+        {
+            return deploymentStepFactory.Name;
         }
+
+        return step.GetType().Name;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Deployment/DeploymentPlanDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Deployment/DeploymentPlanDeploymentStep.cs
index f5bd9b270b4..c7e17e4dc9a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Deployment/DeploymentPlanDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Deployment/DeploymentPlanDeploymentStep.cs
@@ -1,17 +1,16 @@
-namespace OrchardCore.Deployment.Deployment
+namespace OrchardCore.Deployment.Deployment;
+
+/// <summary>
+/// Adds deployment plans to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class DeploymentPlanDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds deployment plans to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class DeploymentPlanDeploymentStep : DeploymentStep
+    public DeploymentPlanDeploymentStep()
     {
-        public DeploymentPlanDeploymentStep()
-        {
-            Name = "DeploymentPlan";
-        }
+        Name = "DeploymentPlan";
+    }
 
-        public bool IncludeAll { get; set; } = true;
+    public bool IncludeAll { get; set; } = true;
 
-        public string[] DeploymentPlanNames { get; set; }
-    }
+    public string[] DeploymentPlanNames { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Deployment/DeploymentPlanDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Deployment/DeploymentPlanDeploymentStepDriver.cs
index 9b74167f420..2dd0feed769 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Deployment/DeploymentPlanDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Deployment/DeploymentPlanDeploymentStepDriver.cs
@@ -4,52 +4,51 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Deployment.Deployment
+namespace OrchardCore.Deployment.Deployment;
+
+public sealed class DeploymentPlanDeploymentStepDriver : DisplayDriver<DeploymentStep, DeploymentPlanDeploymentStep>
 {
-    public sealed class DeploymentPlanDeploymentStepDriver : DisplayDriver<DeploymentStep, DeploymentPlanDeploymentStep>
+    private readonly IDeploymentPlanService _deploymentPlanService;
+
+    public DeploymentPlanDeploymentStepDriver(IDeploymentPlanService deploymentPlanService)
     {
-        private readonly IDeploymentPlanService _deploymentPlanService;
+        _deploymentPlanService = deploymentPlanService;
+    }
 
-        public DeploymentPlanDeploymentStepDriver(IDeploymentPlanService deploymentPlanService)
-        {
-            _deploymentPlanService = deploymentPlanService;
-        }
+    public override Task<IDisplayResult> DisplayAsync(DeploymentPlanDeploymentStep step, BuildDisplayContext context)
+    {
+        return
+            CombineAsync(
+                View("DeploymentPlanDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("DeploymentPlanDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(DeploymentPlanDeploymentStep step, BuildDisplayContext context)
+    public override IDisplayResult Edit(DeploymentPlanDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<DeploymentPlanDeploymentStepViewModel>("DeploymentPlanDeploymentStep_Fields_Edit", async model =>
         {
-            return
-                CombineAsync(
-                    View("DeploymentPlanDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("DeploymentPlanDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+            model.IncludeAll = step.IncludeAll;
+            model.DeploymentPlanNames = step.DeploymentPlanNames;
+            model.AllDeploymentPlanNames = (await _deploymentPlanService.GetAllDeploymentPlanNamesAsync()).ToArray();
+        }).Location("Content");
+    }
 
-        public override IDisplayResult Edit(DeploymentPlanDeploymentStep step, BuildEditorContext context)
-        {
-            return Initialize<DeploymentPlanDeploymentStepViewModel>("DeploymentPlanDeploymentStep_Fields_Edit", async model =>
-            {
-                model.IncludeAll = step.IncludeAll;
-                model.DeploymentPlanNames = step.DeploymentPlanNames;
-                model.AllDeploymentPlanNames = (await _deploymentPlanService.GetAllDeploymentPlanNamesAsync()).ToArray();
-            }).Location("Content");
-        }
+    public override async Task<IDisplayResult> UpdateAsync(DeploymentPlanDeploymentStep step, UpdateEditorContext context)
+    {
+        step.DeploymentPlanNames = [];
+
+        await context.Updater.TryUpdateModelAsync(step,
+                                          Prefix,
+                                          x => x.DeploymentPlanNames,
+                                          x => x.IncludeAll);
 
-        public override async Task<IDisplayResult> UpdateAsync(DeploymentPlanDeploymentStep step, UpdateEditorContext context)
+        // Don't have the selected option if include all.
+        if (step.IncludeAll)
         {
             step.DeploymentPlanNames = [];
-
-            await context.Updater.TryUpdateModelAsync(step,
-                                              Prefix,
-                                              x => x.DeploymentPlanNames,
-                                              x => x.IncludeAll);
-
-            // Don't have the selected option if include all.
-            if (step.IncludeAll)
-            {
-                step.DeploymentPlanNames = [];
-            }
-
-            return Edit(step, context);
         }
+
+        return Edit(step, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/DeploymentPlanService.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/DeploymentPlanService.cs
index 625a155fb3f..f3e40e06072 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/DeploymentPlanService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/DeploymentPlanService.cs
@@ -8,110 +8,109 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.Deployment
+namespace OrchardCore.Deployment;
+
+public class DeploymentPlanService : IDeploymentPlanService
 {
-    public class DeploymentPlanService : IDeploymentPlanService
+    private readonly YesSql.ISession _session;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+    private Dictionary<string, DeploymentPlan> _deploymentPlans;
+
+    public DeploymentPlanService(
+        YesSql.ISession session,
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService)
     {
-        private readonly YesSql.ISession _session;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
-        private Dictionary<string, DeploymentPlan> _deploymentPlans;
-
-        public DeploymentPlanService(
-            YesSql.ISession session,
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService)
-        {
-            _session = session;
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-        }
+        _session = session;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
 
-        private async Task<Dictionary<string, DeploymentPlan>> GetDeploymentPlans()
+    private async Task<Dictionary<string, DeploymentPlan>> GetDeploymentPlans()
+    {
+        if (_deploymentPlans == null)
         {
-            if (_deploymentPlans == null)
-            {
-                var deploymentPlanQuery = _session.Query<DeploymentPlan, DeploymentPlanIndex>();
-                var deploymentPlans = await deploymentPlanQuery.ListAsync();
-                _deploymentPlans = deploymentPlans.ToDictionary(x => x.Name);
-            }
-
-            return _deploymentPlans;
+            var deploymentPlanQuery = _session.Query<DeploymentPlan, DeploymentPlanIndex>();
+            var deploymentPlans = await deploymentPlanQuery.ListAsync();
+            _deploymentPlans = deploymentPlans.ToDictionary(x => x.Name);
         }
 
-        public async Task<bool> DoesUserHavePermissionsAsync()
-        {
-            var user = _httpContextAccessor.HttpContext.User;
+        return _deploymentPlans;
+    }
 
-            var result = await _authorizationService.AuthorizeAsync(user, CommonPermissions.ManageDeploymentPlan) &&
-                         await _authorizationService.AuthorizeAsync(user, CommonPermissions.Export);
+    public async Task<bool> DoesUserHavePermissionsAsync()
+    {
+        var user = _httpContextAccessor.HttpContext.User;
 
-            return result;
-        }
+        var result = await _authorizationService.AuthorizeAsync(user, CommonPermissions.ManageDeploymentPlan) &&
+                     await _authorizationService.AuthorizeAsync(user, CommonPermissions.Export);
 
-        public async Task<bool> DoesUserHaveExportPermissionAsync()
-        {
-            var user = _httpContextAccessor.HttpContext.User;
+        return result;
+    }
 
-            var result = await _authorizationService.AuthorizeAsync(user, CommonPermissions.Export);
+    public async Task<bool> DoesUserHaveExportPermissionAsync()
+    {
+        var user = _httpContextAccessor.HttpContext.User;
 
-            return result;
-        }
+        var result = await _authorizationService.AuthorizeAsync(user, CommonPermissions.Export);
 
-        public async Task<IEnumerable<string>> GetAllDeploymentPlanNamesAsync()
-        {
-            var deploymentPlans = await GetDeploymentPlans();
+        return result;
+    }
 
-            return deploymentPlans.Keys;
-        }
+    public async Task<IEnumerable<string>> GetAllDeploymentPlanNamesAsync()
+    {
+        var deploymentPlans = await GetDeploymentPlans();
 
-        public async Task<IEnumerable<DeploymentPlan>> GetAllDeploymentPlansAsync()
-        {
-            var deploymentPlans = await GetDeploymentPlans();
+        return deploymentPlans.Keys;
+    }
 
-            return deploymentPlans.Values;
-        }
+    public async Task<IEnumerable<DeploymentPlan>> GetAllDeploymentPlansAsync()
+    {
+        var deploymentPlans = await GetDeploymentPlans();
 
-        public async Task<IEnumerable<DeploymentPlan>> GetDeploymentPlansAsync(params string[] deploymentPlanNames)
-        {
-            var deploymentPlans = await GetDeploymentPlans();
+        return deploymentPlans.Values;
+    }
 
-            return GetDeploymentPlans(deploymentPlans, deploymentPlanNames);
-        }
+    public async Task<IEnumerable<DeploymentPlan>> GetDeploymentPlansAsync(params string[] deploymentPlanNames)
+    {
+        var deploymentPlans = await GetDeploymentPlans();
 
-        private static IEnumerable<DeploymentPlan> GetDeploymentPlans(Dictionary<string, DeploymentPlan> deploymentPlans, params string[] deploymentPlanNames)
+        return GetDeploymentPlans(deploymentPlans, deploymentPlanNames);
+    }
+
+    private static IEnumerable<DeploymentPlan> GetDeploymentPlans(Dictionary<string, DeploymentPlan> deploymentPlans, params string[] deploymentPlanNames)
+    {
+        foreach (var deploymentPlanName in deploymentPlanNames)
         {
-            foreach (var deploymentPlanName in deploymentPlanNames)
+            if (deploymentPlans.TryGetValue(deploymentPlanName, out var deploymentPlan))
             {
-                if (deploymentPlans.TryGetValue(deploymentPlanName, out var deploymentPlan))
-                {
-                    yield return deploymentPlan;
-                }
+                yield return deploymentPlan;
             }
         }
+    }
 
-        public async Task CreateOrUpdateDeploymentPlansAsync(IEnumerable<DeploymentPlan> deploymentPlans)
-        {
-            var names = deploymentPlans.Select(x => x.Name);
+    public async Task CreateOrUpdateDeploymentPlansAsync(IEnumerable<DeploymentPlan> deploymentPlans)
+    {
+        var names = deploymentPlans.Select(x => x.Name);
 
-            var existingDeploymentPlans = (await _session.Query<DeploymentPlan, DeploymentPlanIndex>(x => x.Name.IsIn(names))
-                .ListAsync())
-                .ToDictionary(x => x.Name, StringComparer.OrdinalIgnoreCase);
+        var existingDeploymentPlans = (await _session.Query<DeploymentPlan, DeploymentPlanIndex>(x => x.Name.IsIn(names))
+            .ListAsync())
+            .ToDictionary(x => x.Name, StringComparer.OrdinalIgnoreCase);
 
-            foreach (var deploymentPlan in deploymentPlans)
+        foreach (var deploymentPlan in deploymentPlans)
+        {
+            if (existingDeploymentPlans.TryGetValue(deploymentPlan.Name, out var existingDeploymentPlan))
+            {
+                existingDeploymentPlan.Name = deploymentPlan.Name;
+                existingDeploymentPlan.DeploymentSteps.Clear();
+                existingDeploymentPlan.DeploymentSteps.AddRange(deploymentPlan.DeploymentSteps);
+
+                await _session.SaveAsync(existingDeploymentPlan);
+            }
+            else
             {
-                if (existingDeploymentPlans.TryGetValue(deploymentPlan.Name, out var existingDeploymentPlan))
-                {
-                    existingDeploymentPlan.Name = deploymentPlan.Name;
-                    existingDeploymentPlan.DeploymentSteps.Clear();
-                    existingDeploymentPlan.DeploymentSteps.AddRange(deploymentPlan.DeploymentSteps);
-
-                    await _session.SaveAsync(existingDeploymentPlan);
-                }
-                else
-                {
-                    await _session.SaveAsync(deploymentPlan);
-                }
+                await _session.SaveAsync(deploymentPlan);
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Indexes/DeploymentPlanIndex.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Indexes/DeploymentPlanIndex.cs
index a9b1834981e..de11b7d6b27 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Indexes/DeploymentPlanIndex.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Indexes/DeploymentPlanIndex.cs
@@ -1,26 +1,25 @@
 using YesSql.Indexes;
 
-namespace OrchardCore.Deployment.Indexes
+namespace OrchardCore.Deployment.Indexes;
+
+public class DeploymentPlanIndex : MapIndex
 {
-    public class DeploymentPlanIndex : MapIndex
-    {
-        public long DocumentId { get; set; }
+    public long DocumentId { get; set; }
 
-        public string Name { get; set; }
-    }
+    public string Name { get; set; }
+}
 
-    public class DeploymentPlanIndexProvider : IndexProvider<DeploymentPlan>
+public class DeploymentPlanIndexProvider : IndexProvider<DeploymentPlan>
+{
+    public override void Describe(DescribeContext<DeploymentPlan> context)
     {
-        public override void Describe(DescribeContext<DeploymentPlan> context)
-        {
-            context.For<DeploymentPlanIndex>()
-                .Map(deploymentPlan =>
+        context.For<DeploymentPlanIndex>()
+            .Map(deploymentPlan =>
+            {
+                return new DeploymentPlanIndex
                 {
-                    return new DeploymentPlanIndex
-                    {
-                        Name = deploymentPlan.Name
-                    };
-                });
-        }
+                    Name = deploymentPlan.Name
+                };
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Migrations.cs
index 2d0221b6ceb..c0162a87c7c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Migrations.cs
@@ -3,17 +3,16 @@
 using OrchardCore.Deployment.Indexes;
 using YesSql.Sql;
 
-namespace OrchardCore.Deployment
+namespace OrchardCore.Deployment;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
+    public async Task<int> CreateAsync()
     {
-        public async Task<int> CreateAsync()
-        {
-            await SchemaBuilder.CreateMapIndexTableAsync<DeploymentPlanIndex>(table => table
-                .Column<string>("Name")
-            );
+        await SchemaBuilder.CreateMapIndexTableAsync<DeploymentPlanIndex>(table => table
+            .Column<string>("Name")
+        );
 
-            return 1;
-        }
+        return 1;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Recipes/DeploymentPlansRecipeStep.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Recipes/DeploymentPlansRecipeStep.cs
index 1b2551ad69d..e17a064b637 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Recipes/DeploymentPlansRecipeStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Recipes/DeploymentPlansRecipeStep.cs
@@ -11,98 +11,97 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Deployment.Recipes
+namespace OrchardCore.Deployment.Recipes;
+
+/// <summary>
+/// This recipe step creates a deployment plan.
+/// </summary>
+public sealed class DeploymentPlansRecipeStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step creates a deployment plan.
-    /// </summary>
-    public sealed class DeploymentPlansRecipeStep : IRecipeStepHandler
-    {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly JsonSerializerOptions _jsonSerializerOptions;
-        private readonly IDeploymentPlanService _deploymentPlanService;
+    private readonly IServiceProvider _serviceProvider;
+    private readonly JsonSerializerOptions _jsonSerializerOptions;
+    private readonly IDeploymentPlanService _deploymentPlanService;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
+
+    public DeploymentPlansRecipeStep(
+        IServiceProvider serviceProvider,
+        IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions,
+        IDeploymentPlanService deploymentPlanService,
+        IStringLocalizer<DeploymentPlansRecipeStep> stringLocalizer)
+    {
+        _serviceProvider = serviceProvider;
+        _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
+        _deploymentPlanService = deploymentPlanService;
+        S = stringLocalizer;
+    }
 
-        public DeploymentPlansRecipeStep(
-            IServiceProvider serviceProvider,
-            IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions,
-            IDeploymentPlanService deploymentPlanService,
-            IStringLocalizer<DeploymentPlansRecipeStep> stringLocalizer)
+    public Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "deployment", StringComparison.OrdinalIgnoreCase))
         {
-            _serviceProvider = serviceProvider;
-            _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
-            _deploymentPlanService = deploymentPlanService;
-            S = stringLocalizer;
+            return Task.CompletedTask;
         }
 
-        public Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, "deployment", StringComparison.OrdinalIgnoreCase))
-            {
-                return Task.CompletedTask;
-            }
+        var deploymentStepFactories = _serviceProvider.GetServices<IDeploymentStepFactory>().ToDictionary(f => f.Name);
 
-            var deploymentStepFactories = _serviceProvider.GetServices<IDeploymentStepFactory>().ToDictionary(f => f.Name);
+        var model = context.Step.ToObject<DeploymentPlansModel>();
 
-            var model = context.Step.ToObject<DeploymentPlansModel>();
+        var unknownTypes = new List<string>();
+        var deploymentPlans = new List<DeploymentPlan>();
 
-            var unknownTypes = new List<string>();
-            var deploymentPlans = new List<DeploymentPlan>();
+        foreach (var plan in model.Plans)
+        {
+            var deploymentPlan = new DeploymentPlan
+            {
+                Name = plan.Name
+            };
 
-            foreach (var plan in model.Plans)
+            foreach (var step in plan.Steps)
             {
-                var deploymentPlan = new DeploymentPlan
+                if (deploymentStepFactories.TryGetValue(step.Type, out var deploymentStepFactory))
                 {
-                    Name = plan.Name
-                };
+                    var deploymentStep = (DeploymentStep)step.Step.ToObject(deploymentStepFactory.Create().GetType(), _jsonSerializerOptions);
 
-                foreach (var step in plan.Steps)
+                    deploymentPlan.DeploymentSteps.Add(deploymentStep);
+                }
+                else
                 {
-                    if (deploymentStepFactories.TryGetValue(step.Type, out var deploymentStepFactory))
-                    {
-                        var deploymentStep = (DeploymentStep)step.Step.ToObject(deploymentStepFactory.Create().GetType(), _jsonSerializerOptions);
-
-                        deploymentPlan.DeploymentSteps.Add(deploymentStep);
-                    }
-                    else
-                    {
-                        unknownTypes.Add(step.Type);
-                    }
+                    unknownTypes.Add(step.Type);
                 }
-
-                deploymentPlans.Add(deploymentPlan);
-            }
-
-            if (unknownTypes.Count != 0)
-            {
-                context.Errors.Add(
-                    S["No changes have been made. The following types of deployment plans cannot be added: {0}. Please ensure that the related features are enabled to add these types of deployment plans.",
-                    string.Join(", ", unknownTypes)]);
-
-                return Task.CompletedTask;
             }
 
-            return _deploymentPlanService.CreateOrUpdateDeploymentPlansAsync(deploymentPlans);
+            deploymentPlans.Add(deploymentPlan);
         }
 
-        private sealed class DeploymentPlansModel
+        if (unknownTypes.Count != 0)
         {
-            public DeploymentPlanModel[] Plans { get; set; }
+            context.Errors.Add(
+                S["No changes have been made. The following types of deployment plans cannot be added: {0}. Please ensure that the related features are enabled to add these types of deployment plans.",
+                string.Join(", ", unknownTypes)]);
+
+            return Task.CompletedTask;
         }
 
-        private sealed class DeploymentPlanModel
-        {
-            public string Name { get; set; }
+        return _deploymentPlanService.CreateOrUpdateDeploymentPlansAsync(deploymentPlans);
+    }
 
-            public DeploymentStepModel[] Steps { get; set; }
-        }
+    private sealed class DeploymentPlansModel
+    {
+        public DeploymentPlanModel[] Plans { get; set; }
+    }
 
-        private sealed class DeploymentStepModel
-        {
-            public string Type { get; set; }
+    private sealed class DeploymentPlanModel
+    {
+        public string Name { get; set; }
 
-            public JsonObject Step { get; set; }
-        }
+        public DeploymentStepModel[] Steps { get; set; }
+    }
+
+    private sealed class DeploymentStepModel
+    {
+        public string Type { get; set; }
+
+        public JsonObject Step { get; set; }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Services/FileDownloadDeploymentTargetProvider.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Services/FileDownloadDeploymentTargetProvider.cs
index 575053e9dfa..841c121dea1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Services/FileDownloadDeploymentTargetProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Services/FileDownloadDeploymentTargetProvider.cs
@@ -3,33 +3,32 @@
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Deployment
+namespace OrchardCore.Deployment;
+
+public class FileDownloadDeploymentTargetProvider : IDeploymentTargetProvider
 {
-    public class FileDownloadDeploymentTargetProvider : IDeploymentTargetProvider
-    {
-        protected readonly IStringLocalizer S;
+    protected readonly IStringLocalizer S;
 
-        public FileDownloadDeploymentTargetProvider(IStringLocalizer<FileDownloadDeploymentTargetProvider> stringLocalizer)
-        {
-            S = stringLocalizer;
-        }
+    public FileDownloadDeploymentTargetProvider(IStringLocalizer<FileDownloadDeploymentTargetProvider> stringLocalizer)
+    {
+        S = stringLocalizer;
+    }
 
-        public Task<IEnumerable<DeploymentTarget>> GetDeploymentTargetsAsync()
-        {
-            return Task.FromResult<IEnumerable<DeploymentTarget>>(
-                new[] {
-                    new DeploymentTarget(
-                        name: S["File Download"],
-                        description: S["Download a deployment plan locally."],
-                        route: new RouteValueDictionary(new
-                        {
-                            area = "OrchardCore.Deployment",
-                            controller = "ExportFile",
-                            action = "Execute"
-                        })
-                    )
-                }
-            );
-        }
+    public Task<IEnumerable<DeploymentTarget>> GetDeploymentTargetsAsync()
+    {
+        return Task.FromResult<IEnumerable<DeploymentTarget>>(
+            new[] {
+                new DeploymentTarget(
+                    name: S["File Download"],
+                    description: S["Download a deployment plan locally."],
+                    route: new RouteValueDictionary(new
+                    {
+                        area = "OrchardCore.Deployment",
+                        controller = "ExportFile",
+                        action = "Execute"
+                    })
+                )
+            }
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Startup.cs
index b774ddf54e2..41ea146766e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Startup.cs
@@ -11,35 +11,34 @@
 using OrchardCore.Recipes;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Deployment
+namespace OrchardCore.Deployment;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeploymentServices();
+        services.AddDeploymentServices();
 
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IPermissionProvider, Permissions>();
 
-            services.AddSingleton<IDeploymentTargetProvider, FileDownloadDeploymentTargetProvider>();
+        services.AddSingleton<IDeploymentTargetProvider, FileDownloadDeploymentTargetProvider>();
 
-            // Custom File deployment step
-            services.AddDeployment<CustomFileDeploymentSource, CustomFileDeploymentStep, CustomFileDeploymentStepDriver>();
+        // Custom File deployment step
+        services.AddDeployment<CustomFileDeploymentSource, CustomFileDeploymentStep, CustomFileDeploymentStepDriver>();
 
-            // Recipe File deployment step
-            services.AddDeploymentWithoutSource<RecipeFileDeploymentStep, RecipeFileDeploymentStepDriver>();
+        // Recipe File deployment step
+        services.AddDeploymentWithoutSource<RecipeFileDeploymentStep, RecipeFileDeploymentStepDriver>();
 
-            services.AddIndexProvider<DeploymentPlanIndexProvider>();
-            services.AddDataMigration<Migrations>();
+        services.AddIndexProvider<DeploymentPlanIndexProvider>();
+        services.AddDataMigration<Migrations>();
 
-            services.AddScoped<IDeploymentPlanService, DeploymentPlanService>();
+        services.AddScoped<IDeploymentPlanService, DeploymentPlanService>();
 
-            services.AddRecipeExecutionStep<DeploymentPlansRecipeStep>();
+        services.AddRecipeExecutionStep<DeploymentPlansRecipeStep>();
 
-            services.AddDeployment<DeploymentPlanDeploymentSource, DeploymentPlanDeploymentStep, DeploymentPlanDeploymentStepDriver>();
+        services.AddDeployment<DeploymentPlanDeploymentSource, DeploymentPlanDeploymentStep, DeploymentPlanDeploymentStepDriver>();
 
-            services.AddDeployment<JsonRecipeDeploymentSource, JsonRecipeDeploymentStep, JsonRecipeDeploymentStepDriver>();
-        }
+        services.AddDeployment<JsonRecipeDeploymentSource, JsonRecipeDeploymentStep, JsonRecipeDeploymentStepDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/CustomFileDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/CustomFileDeploymentSource.cs
index c5586213017..92c97b2fba8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/CustomFileDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/CustomFileDeploymentSource.cs
@@ -1,18 +1,17 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Deployment.Steps
+namespace OrchardCore.Deployment.Steps;
+
+public class CustomFileDeploymentSource : IDeploymentSource
 {
-    public class CustomFileDeploymentSource : IDeploymentSource
+    public Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
     {
-        public Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        if (step is not CustomFileDeploymentStep customFile)
         {
-            if (step is not CustomFileDeploymentStep customFile)
-            {
-                return Task.CompletedTask;
-            }
-
-            return result.FileBuilder.SetFileAsync(customFile.FileName, Encoding.UTF8.GetBytes(customFile.FileContent));
+            return Task.CompletedTask;
         }
+
+        return result.FileBuilder.SetFileAsync(customFile.FileName, Encoding.UTF8.GetBytes(customFile.FileContent));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/CustomFileDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/CustomFileDeploymentStep.cs
index 1e46838f67c..f283191ef5d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/CustomFileDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/CustomFileDeploymentStep.cs
@@ -1,20 +1,19 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Deployment.Steps
+namespace OrchardCore.Deployment.Steps;
+
+/// <summary>
+/// Adds a custom file to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class CustomFileDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds a custom file to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class CustomFileDeploymentStep : DeploymentStep
+    public CustomFileDeploymentStep()
     {
-        public CustomFileDeploymentStep()
-        {
-            Name = nameof(CustomFileDeploymentStep);
-        }
+        Name = nameof(CustomFileDeploymentStep);
+    }
 
-        [Required]
-        public string FileName { get; set; }
+    [Required]
+    public string FileName { get; set; }
 
-        public string FileContent { get; set; }
-    }
+    public string FileContent { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/CustomFileDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/CustomFileDeploymentStepDriver.cs
index a9c4dee72df..cb8b97f7bb4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/CustomFileDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/CustomFileDeploymentStepDriver.cs
@@ -3,33 +3,32 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Deployment.Steps
+namespace OrchardCore.Deployment.Steps;
+
+public sealed class CustomFileDeploymentStepDriver : DisplayDriver<DeploymentStep, CustomFileDeploymentStep>
 {
-    public sealed class CustomFileDeploymentStepDriver : DisplayDriver<DeploymentStep, CustomFileDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(CustomFileDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(CustomFileDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("CustomFileDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("CustomFileDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("CustomFileDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("CustomFileDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(CustomFileDeploymentStep step, BuildEditorContext context)
+    public override IDisplayResult Edit(CustomFileDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<CustomFileDeploymentStepViewModel>("CustomFileDeploymentStep_Fields_Edit", model =>
         {
-            return Initialize<CustomFileDeploymentStepViewModel>("CustomFileDeploymentStep_Fields_Edit", model =>
-            {
-                model.FileContent = step.FileContent;
-                model.FileName = step.FileName;
-            }).Location("Content");
-        }
+            model.FileContent = step.FileContent;
+            model.FileName = step.FileName;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(CustomFileDeploymentStep step, UpdateEditorContext context)
-        {
-            await context.Updater.TryUpdateModelAsync(step, Prefix, x => x.FileName, x => x.FileContent);
+    public override async Task<IDisplayResult> UpdateAsync(CustomFileDeploymentStep step, UpdateEditorContext context)
+    {
+        await context.Updater.TryUpdateModelAsync(step, Prefix, x => x.FileName, x => x.FileContent);
 
-            return Edit(step, context);
-        }
+        return Edit(step, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/JsonRecipeDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/JsonRecipeDeploymentSource.cs
index 246f94b28bc..66c01479197 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/JsonRecipeDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/JsonRecipeDeploymentSource.cs
@@ -1,20 +1,19 @@
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Deployment.Steps
+namespace OrchardCore.Deployment.Steps;
+
+public class JsonRecipeDeploymentSource : IDeploymentSource
 {
-    public class JsonRecipeDeploymentSource : IDeploymentSource
+    public Task ProcessDeploymentStepAsync(DeploymentStep deploymentStep, DeploymentPlanResult result)
     {
-        public Task ProcessDeploymentStepAsync(DeploymentStep deploymentStep, DeploymentPlanResult result)
+        if (deploymentStep is not JsonRecipeDeploymentStep jsonRecipeStep)
         {
-            if (deploymentStep is not JsonRecipeDeploymentStep jsonRecipeStep)
-            {
-                return Task.CompletedTask;
-            }
-
-            result.Steps.Add(JObject.Parse(jsonRecipeStep.Json));
-
             return Task.CompletedTask;
         }
+
+        result.Steps.Add(JObject.Parse(jsonRecipeStep.Json));
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/JsonRecipeDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/JsonRecipeDeploymentStep.cs
index bd3cb001358..d8c42b8c98b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/JsonRecipeDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/JsonRecipeDeploymentStep.cs
@@ -1,15 +1,14 @@
-namespace OrchardCore.Deployment.Steps
+namespace OrchardCore.Deployment.Steps;
+
+/// <summary>
+/// Adds a JSON recipe to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class JsonRecipeDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds a JSON recipe to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class JsonRecipeDeploymentStep : DeploymentStep
+    public JsonRecipeDeploymentStep()
     {
-        public JsonRecipeDeploymentStep()
-        {
-            Name = "JsonRecipe";
-        }
-
-        public string Json { get; set; }
+        Name = "JsonRecipe";
     }
+
+    public string Json { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/JsonRecipeDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/JsonRecipeDeploymentStepDriver.cs
index 6e2b98d4ec4..42fc2c854ed 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/JsonRecipeDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/JsonRecipeDeploymentStepDriver.cs
@@ -7,14 +7,14 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Deployment.Steps
+namespace OrchardCore.Deployment.Steps;
+
+public sealed class JsonRecipeDeploymentStepDriver : DisplayDriver<DeploymentStep, JsonRecipeDeploymentStep>
 {
-    public sealed class JsonRecipeDeploymentStepDriver : DisplayDriver<DeploymentStep, JsonRecipeDeploymentStep>
-    {
-        /// <summary>
-        /// A limited schema for recipe steps. Does not include any step data.
-        /// </summary>
-        public const string Schema = @"
+    /// <summary>
+    /// A limited schema for recipe steps. Does not include any step data.
+    /// </summary>
+    public const string Schema = @"
 {
   ""$schema"": ""http://json-schema.org/draft-04/schema#"",
   ""type"": ""object"",
@@ -30,56 +30,55 @@ public sealed class JsonRecipeDeploymentStepDriver : DisplayDriver<DeploymentSte
 }
 ";
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public JsonRecipeDeploymentStepDriver(IStringLocalizer<JsonRecipeDeploymentStepDriver> stringLocalizer)
-        {
-            S = stringLocalizer;
-        }
-
-        public override Task<IDisplayResult> DisplayAsync(JsonRecipeDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("JsonRecipeDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("JsonRecipeDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+    public JsonRecipeDeploymentStepDriver(IStringLocalizer<JsonRecipeDeploymentStepDriver> stringLocalizer)
+    {
+        S = stringLocalizer;
+    }
 
-        public override IDisplayResult Edit(JsonRecipeDeploymentStep step, BuildEditorContext context)
-        {
-            return Initialize<JsonRecipeDeploymentStepViewModel>("JsonRecipeDeploymentStep_Fields_Edit", model =>
-            {
-                model.Json = step.Json;
-                model.Schema = Schema;
-            }).Location("Content");
-        }
+    public override Task<IDisplayResult> DisplayAsync(JsonRecipeDeploymentStep step, BuildDisplayContext context)
+    {
+        return
+            CombineAsync(
+                View("JsonRecipeDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("JsonRecipeDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(JsonRecipeDeploymentStep step, UpdateEditorContext context)
+    public override IDisplayResult Edit(JsonRecipeDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<JsonRecipeDeploymentStepViewModel>("JsonRecipeDeploymentStep_Fields_Edit", model =>
         {
-            var model = new JsonRecipeDeploymentStepViewModel();
-
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+            model.Json = step.Json;
+            model.Schema = Schema;
+        }).Location("Content");
+    }
 
-            try
-            {
-                var jObject = JObject.Parse(model.Json);
-                if (!jObject.ContainsKey("name"))
-                {
+    public override async Task<IDisplayResult> UpdateAsync(JsonRecipeDeploymentStep step, UpdateEditorContext context)
+    {
+        var model = new JsonRecipeDeploymentStepViewModel();
 
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(JsonRecipeDeploymentStepViewModel.Json), S["The recipe must have a name property"]);
-                }
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            }
-            catch (Exception)
+        try
+        {
+            var jObject = JObject.Parse(model.Json);
+            if (!jObject.ContainsKey("name"))
             {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(JsonRecipeDeploymentStepViewModel.Json), S["Invalid JSON supplied"]);
 
+                context.Updater.ModelState.AddModelError(Prefix, nameof(JsonRecipeDeploymentStepViewModel.Json), S["The recipe must have a name property"]);
             }
 
-            step.Json = model.Json;
+        }
+        catch (Exception)
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(JsonRecipeDeploymentStepViewModel.Json), S["Invalid JSON supplied"]);
 
-            return Edit(step, context);
         }
+
+        step.Json = model.Json;
+
+        return Edit(step, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/RecipeFileDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/RecipeFileDeploymentStep.cs
index e63f2bf2514..136ab6e1757 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/RecipeFileDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/RecipeFileDeploymentStep.cs
@@ -1,31 +1,30 @@
-namespace OrchardCore.Deployment.Steps
+namespace OrchardCore.Deployment.Steps;
+
+/// <summary>
+/// Adds a Recipe file to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class RecipeFileDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds a Recipe file to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class RecipeFileDeploymentStep : DeploymentStep
+    public RecipeFileDeploymentStep()
     {
-        public RecipeFileDeploymentStep()
-        {
-            Name = nameof(RecipeFileDeploymentStep);
-        }
+        Name = nameof(RecipeFileDeploymentStep);
+    }
 
-        public string RecipeName { get; set; }
+    public string RecipeName { get; set; }
 
-        public string DisplayName { get; set; }
+    public string DisplayName { get; set; }
 
-        public string Description { get; set; }
+    public string Description { get; set; }
 
-        public string Author { get; set; }
+    public string Author { get; set; }
 
-        public string WebSite { get; set; }
+    public string WebSite { get; set; }
 
-        public string Version { get; set; }
+    public string Version { get; set; }
 
-        public bool IsSetupRecipe { get; set; }
+    public bool IsSetupRecipe { get; set; }
 
-        public string Categories { get; set; }
+    public string Categories { get; set; }
 
-        public string Tags { get; set; }
-    }
+    public string Tags { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/RecipeFileDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/RecipeFileDeploymentStepDriver.cs
index 5d526cd0808..12a1e0ddb70 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/RecipeFileDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Steps/RecipeFileDeploymentStepDriver.cs
@@ -3,49 +3,48 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Deployment.Steps
+namespace OrchardCore.Deployment.Steps;
+
+public sealed class RecipeFileDeploymentStepDriver : DisplayDriver<DeploymentStep, RecipeFileDeploymentStep>
 {
-    public sealed class RecipeFileDeploymentStepDriver : DisplayDriver<DeploymentStep, RecipeFileDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(RecipeFileDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(RecipeFileDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("RecipeFileDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("RecipeFileDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("RecipeFileDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("RecipeFileDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(RecipeFileDeploymentStep step, BuildEditorContext context)
+    public override IDisplayResult Edit(RecipeFileDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<RecipeFileDeploymentStepViewModel>("RecipeFileDeploymentStep_Fields_Edit", model =>
         {
-            return Initialize<RecipeFileDeploymentStepViewModel>("RecipeFileDeploymentStep_Fields_Edit", model =>
-            {
-                model.RecipeName = step.RecipeName;
-                model.DisplayName = step.DisplayName;
-                model.Description = step.Description;
-                model.Author = step.Author;
-                model.WebSite = step.WebSite;
-                model.Version = step.Version;
-                model.IsSetupRecipe = step.IsSetupRecipe;
-                model.Categories = step.Categories;
-                model.Tags = step.Tags;
-            }).Location("Content");
-        }
+            model.RecipeName = step.RecipeName;
+            model.DisplayName = step.DisplayName;
+            model.Description = step.Description;
+            model.Author = step.Author;
+            model.WebSite = step.WebSite;
+            model.Version = step.Version;
+            model.IsSetupRecipe = step.IsSetupRecipe;
+            model.Categories = step.Categories;
+            model.Tags = step.Tags;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(RecipeFileDeploymentStep step, UpdateEditorContext context)
-        {
-            await context.Updater.TryUpdateModelAsync(step,
-                Prefix, x => x.RecipeName,
-                x => x.DisplayName,
-                x => x.Description,
-                x => x.Author,
-                x => x.WebSite,
-                x => x.Version,
-                x => x.IsSetupRecipe,
-                x => x.Categories,
-                x => x.Tags);
+    public override async Task<IDisplayResult> UpdateAsync(RecipeFileDeploymentStep step, UpdateEditorContext context)
+    {
+        await context.Updater.TryUpdateModelAsync(step,
+            Prefix, x => x.RecipeName,
+            x => x.DisplayName,
+            x => x.Description,
+            x => x.Author,
+            x => x.WebSite,
+            x => x.Version,
+            x => x.IsSetupRecipe,
+            x => x.Categories,
+            x => x.Tags);
 
-            return Edit(step, context);
-        }
+        return Edit(step, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/CreateDeploymentPlanViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/CreateDeploymentPlanViewModel.cs
index af6a66d2f2d..ed4cb274bd3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/CreateDeploymentPlanViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/CreateDeploymentPlanViewModel.cs
@@ -1,10 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Deployment.ViewModels
+namespace OrchardCore.Deployment.ViewModels;
+
+public class CreateDeploymentPlanViewModel
 {
-    public class CreateDeploymentPlanViewModel
-    {
-        [Required]
-        public string Name { get; set; }
-    }
+    [Required]
+    public string Name { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/CustomFileDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/CustomFileDeploymentStepViewModel.cs
index 5e9de0b629a..f7e45eebdab 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/CustomFileDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/CustomFileDeploymentStepViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Deployment.ViewModels
+namespace OrchardCore.Deployment.ViewModels;
+
+public class CustomFileDeploymentStepViewModel
 {
-    public class CustomFileDeploymentStepViewModel
-    {
-        public string FileName { get; set; }
-        public string FileContent { get; set; }
-    }
+    public string FileName { get; set; }
+    public string FileContent { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/DeploymentPlanDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/DeploymentPlanDeploymentStepViewModel.cs
index a30aa7e42f7..d5138879193 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/DeploymentPlanDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/DeploymentPlanDeploymentStepViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Deployment.ViewModels
+namespace OrchardCore.Deployment.ViewModels;
+
+public class DeploymentPlanDeploymentStepViewModel
 {
-    public class DeploymentPlanDeploymentStepViewModel
-    {
-        public bool IncludeAll { get; set; } = true;
-        public string[] DeploymentPlanNames { get; set; }
-        public string[] AllDeploymentPlanNames { get; set; }
-    }
+    public bool IncludeAll { get; set; } = true;
+    public string[] DeploymentPlanNames { get; set; }
+    public string[] AllDeploymentPlanNames { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/DeploymentPlanIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/DeploymentPlanIndexViewModel.cs
index aa9f0428fea..587f7cc8ef1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/DeploymentPlanIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/DeploymentPlanIndexViewModel.cs
@@ -2,33 +2,32 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.Deployment.ViewModels
+namespace OrchardCore.Deployment.ViewModels;
+
+public class DeploymentPlanIndexViewModel
 {
-    public class DeploymentPlanIndexViewModel
-    {
-        public IList<DeploymentPlanEntry> DeploymentPlans { get; set; }
-        public ContentOptions Options { get; set; } = new ContentOptions();
-        public dynamic Pager { get; set; }
-    }
+    public IList<DeploymentPlanEntry> DeploymentPlans { get; set; }
+    public ContentOptions Options { get; set; } = new ContentOptions();
+    public dynamic Pager { get; set; }
+}
 
-    public class DeploymentPlanEntry
-    {
-        public DeploymentPlan DeploymentPlan { get; set; }
-        public bool IsChecked { get; set; }
-    }
+public class DeploymentPlanEntry
+{
+    public DeploymentPlan DeploymentPlan { get; set; }
+    public bool IsChecked { get; set; }
+}
 
-    public class ContentOptions
-    {
-        public string Search { get; set; }
-        public ContentsBulkAction BulkAction { get; set; }
+public class ContentOptions
+{
+    public string Search { get; set; }
+    public ContentsBulkAction BulkAction { get; set; }
 
-        [BindNever]
-        public List<SelectListItem> DeploymentPlansBulkAction { get; set; }
-    }
+    [BindNever]
+    public List<SelectListItem> DeploymentPlansBulkAction { get; set; }
+}
 
-    public enum ContentsBulkAction
-    {
-        None,
-        Delete
-    }
+public enum ContentsBulkAction
+{
+    None,
+    Delete
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/DisplayDeploymentPlanViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/DisplayDeploymentPlanViewModel.cs
index 059d797003e..97ec6e87d71 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/DisplayDeploymentPlanViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/DisplayDeploymentPlanViewModel.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Deployment.ViewModels
+namespace OrchardCore.Deployment.ViewModels;
+
+public class DisplayDeploymentPlanViewModel
 {
-    public class DisplayDeploymentPlanViewModel
-    {
-        public DeploymentPlan DeploymentPlan { get; set; }
-        public IEnumerable<dynamic> Items { get; set; }
-        public IDictionary<string, dynamic> Thumbnails { get; set; }
-    }
+    public DeploymentPlan DeploymentPlan { get; set; }
+    public IEnumerable<dynamic> Items { get; set; }
+    public IDictionary<string, dynamic> Thumbnails { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/EditDeploymentPlanStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/EditDeploymentPlanStepViewModel.cs
index e33703600ca..31820fd7f85 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/EditDeploymentPlanStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/EditDeploymentPlanStepViewModel.cs
@@ -1,15 +1,14 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Deployment.ViewModels
+namespace OrchardCore.Deployment.ViewModels;
+
+public class EditDeploymentPlanStepViewModel
 {
-    public class EditDeploymentPlanStepViewModel
-    {
-        public long DeploymentPlanId { get; set; }
-        public string DeploymentStepId { get; set; }
-        public string DeploymentStepType { get; set; }
-        public dynamic Editor { get; set; }
+    public long DeploymentPlanId { get; set; }
+    public string DeploymentStepId { get; set; }
+    public string DeploymentStepType { get; set; }
+    public dynamic Editor { get; set; }
 
-        [BindNever]
-        public DeploymentStep DeploymentStep { get; set; }
-    }
+    [BindNever]
+    public DeploymentStep DeploymentStep { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/EditDeploymentPlanViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/EditDeploymentPlanViewModel.cs
index a8c9e5a76b1..a6c56abdf99 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/EditDeploymentPlanViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/EditDeploymentPlanViewModel.cs
@@ -1,12 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Deployment.ViewModels
+namespace OrchardCore.Deployment.ViewModels;
+
+public class EditDeploymentPlanViewModel
 {
-    public class EditDeploymentPlanViewModel
-    {
-        public long Id { get; set; }
+    public long Id { get; set; }
 
-        [Required]
-        public string Name { get; set; }
-    }
+    [Required]
+    public string Name { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/ImportJsonViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/ImportJsonViewModel.cs
index 1de493af169..d7ebbc5b6ef 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/ImportJsonViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/ImportJsonViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Deployment.ViewModels
+namespace OrchardCore.Deployment.ViewModels;
+
+public class ImportJsonViewModel
 {
-    public class ImportJsonViewModel
-    {
-        public string Json { get; set; }
-    }
+    public string Json { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/JsonRecipeDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/JsonRecipeDeploymentStepViewModel.cs
index b7b9509ca8d..e934fb36ab6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/JsonRecipeDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/JsonRecipeDeploymentStepViewModel.cs
@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Deployment.ViewModels
+namespace OrchardCore.Deployment.ViewModels;
+
+public class JsonRecipeDeploymentStepViewModel
 {
-    public class JsonRecipeDeploymentStepViewModel
-    {
-        public string Json { get; set; }
+    public string Json { get; set; }
 
-        [BindNever]
-        public string Schema { get; set; }
-    }
+    [BindNever]
+    public string Schema { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/RecipeFileDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/RecipeFileDeploymentStepViewModel.cs
index 94abc0a7798..33b27f23ebf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/RecipeFileDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/ViewModels/RecipeFileDeploymentStepViewModel.cs
@@ -1,15 +1,14 @@
-namespace OrchardCore.Deployment.ViewModels
+namespace OrchardCore.Deployment.ViewModels;
+
+public class RecipeFileDeploymentStepViewModel
 {
-    public class RecipeFileDeploymentStepViewModel
-    {
-        public string RecipeName { get; set; }
-        public string DisplayName { get; set; }
-        public string Description { get; set; }
-        public string Author { get; set; }
-        public string WebSite { get; set; }
-        public string Version { get; set; }
-        public bool IsSetupRecipe { get; set; }
-        public string Categories { get; set; }
-        public string Tags { get; set; }
-    }
+    public string RecipeName { get; set; }
+    public string DisplayName { get; set; }
+    public string Description { get; set; }
+    public string Author { get; set; }
+    public string WebSite { get; set; }
+    public string Version { get; set; }
+    public bool IsSetupRecipe { get; set; }
+    public string Categories { get; set; }
+    public string Tags { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Diagnostics/DiagnosticsStartupFilter.cs b/src/OrchardCore.Modules/OrchardCore.Diagnostics/DiagnosticsStartupFilter.cs
index ba35a1d1d27..dffeca50fdf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Diagnostics/DiagnosticsStartupFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Diagnostics/DiagnosticsStartupFilter.cs
@@ -5,49 +5,48 @@
 using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.Hosting;
 
-namespace OrchardCore.Diagnostics
+namespace OrchardCore.Diagnostics;
+
+public sealed class DiagnosticsStartupFilter : IStartupFilter
 {
-    public sealed class DiagnosticsStartupFilter : IStartupFilter
-    {
-        private readonly FileExtensionContentTypeProvider _contentTypeProvider = new();
+    private readonly FileExtensionContentTypeProvider _contentTypeProvider = new();
 
-        private readonly IHostEnvironment _hostEnvironment;
+    private readonly IHostEnvironment _hostEnvironment;
 
-        public DiagnosticsStartupFilter(IHostEnvironment hostEnvironment)
-        {
-            _hostEnvironment = hostEnvironment;
-        }
+    public DiagnosticsStartupFilter(IHostEnvironment hostEnvironment)
+    {
+        _hostEnvironment = hostEnvironment;
+    }
 
-        public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
+    public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
+    {
+        return app =>
         {
-            return app =>
+            if (!_hostEnvironment.IsDevelopment())
             {
-                if (!_hostEnvironment.IsDevelopment())
-                {
-                    app.UseExceptionHandler("/Error");
-                }
+                app.UseExceptionHandler("/Error");
+            }
 
-                app.UseStatusCodePagesWithReExecute("/Error/{0}");
+            app.UseStatusCodePagesWithReExecute("/Error/{0}");
 
-                app.Use(async (context, next) =>
-                {
-                    await next();
+            app.Use(async (context, next) =>
+            {
+                await next();
 
-                    if (context.Response.StatusCode < 200 || context.Response.StatusCode >= 400)
+                if (context.Response.StatusCode < 200 || context.Response.StatusCode >= 400)
+                {
+                    if (_contentTypeProvider.TryGetContentType(context.Request.Path.Value, out var contentType))
                     {
-                        if (_contentTypeProvider.TryGetContentType(context.Request.Path.Value, out var contentType))
+                        var statusCodePagesFeature = context.Features.Get<IStatusCodePagesFeature>();
+                        if (statusCodePagesFeature != null)
                         {
-                            var statusCodePagesFeature = context.Features.Get<IStatusCodePagesFeature>();
-                            if (statusCodePagesFeature != null)
-                            {
-                                statusCodePagesFeature.Enabled = false;
-                            }
+                            statusCodePagesFeature.Enabled = false;
                         }
                     }
-                });
+                }
+            });
 
-                next(app);
-            };
-        }
+            next(app);
+        };
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Diagnostics/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Diagnostics/Startup.cs
index 80b2c3d53cb..7c396e9570b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Diagnostics/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Diagnostics/Startup.cs
@@ -5,23 +5,22 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace OrchardCore.Diagnostics
+namespace OrchardCore.Diagnostics;
+
+public sealed class Startup : Modules.StartupBase
 {
-    public sealed class Startup : Modules.StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.TryAddEnumerable(ServiceDescriptor.Singleton<IStartupFilter, DiagnosticsStartupFilter>());
-        }
+        services.TryAddEnumerable(ServiceDescriptor.Singleton<IStartupFilter, DiagnosticsStartupFilter>());
+    }
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            routes.MapAreaControllerRoute(
-                name: "Diagnostics.Error",
-                areaName: "OrchardCore.Diagnostics",
-                pattern: "Error/{status?}",
-                defaults: new { controller = "Diagnostics", action = "Error" }
-            );
-        }
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        routes.MapAreaControllerRoute(
+            name: "Diagnostics.Error",
+            areaName: "OrchardCore.Diagnostics",
+            pattern: "Error/{status?}",
+            defaults: new { controller = "Diagnostics", action = "Error" }
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.DynamicCache/CacheContextEntryExtensions.cs b/src/OrchardCore.Modules/OrchardCore.DynamicCache/CacheContextEntryExtensions.cs
index 6b8fad72b62..5ca186fd991 100644
--- a/src/OrchardCore.Modules/OrchardCore.DynamicCache/CacheContextEntryExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.DynamicCache/CacheContextEntryExtensions.cs
@@ -3,20 +3,19 @@
 using System.Text;
 using OrchardCore.Environment.Cache;
 
-namespace OrchardCore.DynamicCache
+namespace OrchardCore.DynamicCache;
+
+public static class CacheContextEntryExtensions
 {
-    public static class CacheContextEntryExtensions
+    public static string GetContextHash(this IEnumerable<CacheContextEntry> entries)
     {
-        public static string GetContextHash(this IEnumerable<CacheContextEntry> entries)
+        var sb = new StringBuilder();
+        foreach (var entry in entries.OrderBy(x => x.Key).ThenBy(x => x.Value))
         {
-            var sb = new StringBuilder();
-            foreach (var entry in entries.OrderBy(x => x.Key).ThenBy(x => x.Value))
-            {
-                var part = entry.Key + entry.Value;
-                sb.Append(part);
-            }
-
-            return sb.ToString();
+            var part = entry.Key + entry.Value;
+            sb.Append(part);
         }
+
+        return sb.ToString();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.DynamicCache/CacheOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.DynamicCache/CacheOptionsConfiguration.cs
index c9877e15ced..20a70e696a8 100644
--- a/src/OrchardCore.Modules/OrchardCore.DynamicCache/CacheOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.DynamicCache/CacheOptionsConfiguration.cs
@@ -3,42 +3,41 @@
 using OrchardCore.Environment.Cache;
 using OrchardCore.Settings;
 
-namespace OrchardCore.DynamicCache
+namespace OrchardCore.DynamicCache;
+
+public sealed class CacheOptionsConfiguration : IConfigureOptions<CacheOptions>
 {
-    public sealed class CacheOptionsConfiguration : IConfigureOptions<CacheOptions>
+    private readonly ISiteService _siteService;
+    private readonly IHostEnvironment _env;
+
+    public CacheOptionsConfiguration(ISiteService siteService, IHostEnvironment env)
     {
-        private readonly ISiteService _siteService;
-        private readonly IHostEnvironment _env;
+        _siteService = siteService;
+        _env = env;
+    }
 
-        public CacheOptionsConfiguration(ISiteService siteService, IHostEnvironment env)
-        {
-            _siteService = siteService;
-            _env = env;
-        }
+    public void Configure(CacheOptions options)
+    {
+        var settings = _siteService.GetSiteSettingsAsync().GetAwaiter().GetResult();
 
-        public void Configure(CacheOptions options)
+        switch (settings.CacheMode)
         {
-            var settings = _siteService.GetSiteSettingsAsync().GetAwaiter().GetResult();
-
-            switch (settings.CacheMode)
-            {
-                case CacheMode.Enabled:
-                    options.Enabled = true;
-                    break;
-
-                case CacheMode.DebugEnabled:
-                    options.Enabled = true;
-                    options.DebugMode = true;
-                    break;
-
-                case CacheMode.Disabled:
-                    options.Enabled = false;
-                    break;
-
-                case CacheMode.FromConfiguration:
-                    options.Enabled = _env.IsProduction();
-                    break;
-            }
+            case CacheMode.Enabled:
+                options.Enabled = true;
+                break;
+
+            case CacheMode.DebugEnabled:
+                options.Enabled = true;
+                options.DebugMode = true;
+                break;
+
+            case CacheMode.Disabled:
+                options.Enabled = false;
+                break;
+
+            case CacheMode.FromConfiguration:
+                options.Enabled = _env.IsProduction();
+                break;
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.DynamicCache/CachedShapeWrapperShapes.cs b/src/OrchardCore.Modules/OrchardCore.DynamicCache/CachedShapeWrapperShapes.cs
index 7e39fbbf843..b00f445341d 100644
--- a/src/OrchardCore.Modules/OrchardCore.DynamicCache/CachedShapeWrapperShapes.cs
+++ b/src/OrchardCore.Modules/OrchardCore.DynamicCache/CachedShapeWrapperShapes.cs
@@ -4,36 +4,35 @@
 using OrchardCore.DisplayManagement.Descriptors;
 using OrchardCore.DisplayManagement.Shapes;
 
-namespace OrchardCore.DynamicCache
+namespace OrchardCore.DynamicCache;
+
+public class CachedShapeWrapperShapes : IShapeAttributeProvider
 {
-    public class CachedShapeWrapperShapes : IShapeAttributeProvider
-    {
-        [Shape]
+    [Shape]
 #pragma warning disable CA1822 // Mark members as static
-        public IHtmlContent CachedShapeWrapper(IShape Shape)
+    public IHtmlContent CachedShapeWrapper(IShape Shape)
 #pragma warning restore CA1822 // Mark members as static
-        {
-            // No need to optimize this code as it will be used for debugging purpose
+    {
+        // No need to optimize this code as it will be used for debugging purpose
 
-            var contentBuilder = new HtmlContentBuilder();
-            var metadata = Shape.Metadata;
-            var cache = metadata.Cache();
+        var contentBuilder = new HtmlContentBuilder();
+        var metadata = Shape.Metadata;
+        var cache = metadata.Cache();
 
-            contentBuilder.AppendLine();
-            contentBuilder.AppendHtmlLine($"<!-- CACHED SHAPE: {cache.CacheId} ({Guid.NewGuid()})");
-            contentBuilder.AppendHtmlLine($"          VARY BY: {string.Join(", ", cache.Contexts)}");
-            contentBuilder.AppendHtmlLine($"     DEPENDENCIES: {string.Join(", ", cache.Tags)}");
-            contentBuilder.AppendHtmlLine($"       EXPIRES ON: {cache.ExpiresOn}");
-            contentBuilder.AppendHtmlLine($"    EXPIRES AFTER: {cache.ExpiresAfter}");
-            contentBuilder.AppendHtmlLine($"  EXPIRES SLIDING: {cache.ExpiresSliding}");
-            contentBuilder.AppendHtmlLine("-->");
+        contentBuilder.AppendLine();
+        contentBuilder.AppendHtmlLine($"<!-- CACHED SHAPE: {cache.CacheId} ({Guid.NewGuid()})");
+        contentBuilder.AppendHtmlLine($"          VARY BY: {string.Join(", ", cache.Contexts)}");
+        contentBuilder.AppendHtmlLine($"     DEPENDENCIES: {string.Join(", ", cache.Tags)}");
+        contentBuilder.AppendHtmlLine($"       EXPIRES ON: {cache.ExpiresOn}");
+        contentBuilder.AppendHtmlLine($"    EXPIRES AFTER: {cache.ExpiresAfter}");
+        contentBuilder.AppendHtmlLine($"  EXPIRES SLIDING: {cache.ExpiresSliding}");
+        contentBuilder.AppendHtmlLine("-->");
 
-            contentBuilder.AppendHtml(metadata.ChildContent);
+        contentBuilder.AppendHtml(metadata.ChildContent);
 
-            contentBuilder.AppendLine();
-            contentBuilder.AppendHtmlLine($"<!-- END CACHED SHAPE: {cache.CacheId} -->");
+        contentBuilder.AppendLine();
+        contentBuilder.AppendHtmlLine($"<!-- END CACHED SHAPE: {cache.CacheId} -->");
 
-            return contentBuilder;
-        }
+        return contentBuilder;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.DynamicCache/EventHandlers/DynamicCacheShapeDisplayEvents.cs b/src/OrchardCore.Modules/OrchardCore.DynamicCache/EventHandlers/DynamicCacheShapeDisplayEvents.cs
index 231640fa7ec..82ce6efd772 100644
--- a/src/OrchardCore.Modules/OrchardCore.DynamicCache/EventHandlers/DynamicCacheShapeDisplayEvents.cs
+++ b/src/OrchardCore.Modules/OrchardCore.DynamicCache/EventHandlers/DynamicCacheShapeDisplayEvents.cs
@@ -7,119 +7,118 @@
 using OrchardCore.DisplayManagement.Implementation;
 using OrchardCore.Environment.Cache;
 
-namespace OrchardCore.DynamicCache.EventHandlers
+namespace OrchardCore.DynamicCache.EventHandlers;
+
+/// <summary>
+/// Caches shapes in the default <see cref="IDynamicCacheService"/> implementation.
+/// It uses the shape's metadata cache context to define the cache parameters.
+/// </summary>
+public class DynamicCacheShapeDisplayEvents : IShapeDisplayEvents
 {
-    /// <summary>
-    /// Caches shapes in the default <see cref="IDynamicCacheService"/> implementation.
-    /// It uses the shape's metadata cache context to define the cache parameters.
-    /// </summary>
-    public class DynamicCacheShapeDisplayEvents : IShapeDisplayEvents
+    private readonly Dictionary<string, CacheContext> _cached = [];
+    private readonly Dictionary<string, CacheContext> _openScopes = [];
+
+    private readonly IDynamicCacheService _dynamicCacheService;
+    private readonly ICacheScopeManager _cacheScopeManager;
+    private readonly HtmlEncoder _htmlEncoder;
+    private readonly CacheOptions _cacheOptions;
+
+    public DynamicCacheShapeDisplayEvents(
+        IDynamicCacheService dynamicCacheService,
+        ICacheScopeManager cacheScopeManager,
+        HtmlEncoder htmlEncoder,
+        IOptions<CacheOptions> options)
     {
-        private readonly Dictionary<string, CacheContext> _cached = [];
-        private readonly Dictionary<string, CacheContext> _openScopes = [];
-
-        private readonly IDynamicCacheService _dynamicCacheService;
-        private readonly ICacheScopeManager _cacheScopeManager;
-        private readonly HtmlEncoder _htmlEncoder;
-        private readonly CacheOptions _cacheOptions;
-
-        public DynamicCacheShapeDisplayEvents(
-            IDynamicCacheService dynamicCacheService,
-            ICacheScopeManager cacheScopeManager,
-            HtmlEncoder htmlEncoder,
-            IOptions<CacheOptions> options)
+        _dynamicCacheService = dynamicCacheService;
+        _cacheScopeManager = cacheScopeManager;
+        _htmlEncoder = htmlEncoder;
+        _cacheOptions = options.Value;
+    }
+
+    public async Task DisplayingAsync(ShapeDisplayContext context)
+    {
+        if (!_cacheOptions.Enabled)
         {
-            _dynamicCacheService = dynamicCacheService;
-            _cacheScopeManager = cacheScopeManager;
-            _htmlEncoder = htmlEncoder;
-            _cacheOptions = options.Value;
+            return;
         }
 
-        public async Task DisplayingAsync(ShapeDisplayContext context)
+        // The shape has cache settings and no content yet.
+        if (context.Shape.Metadata.IsCached && context.ChildContent == null)
         {
-            if (!_cacheOptions.Enabled)
+            var cacheContext = context.Shape.Metadata.Cache();
+            _cacheScopeManager.EnterScope(cacheContext);
+            _openScopes[cacheContext.CacheId] = cacheContext;
+
+            var cachedContent = await _dynamicCacheService.GetCachedValueAsync(cacheContext);
+
+            if (cachedContent != null)
             {
-                return;
+                // The contents of this shape was found in the cache.
+                // Add the cacheContext to _cached so that we don't try to cache the content again in the DisplayedAsync method.
+                _cached[cacheContext.CacheId] = cacheContext;
+                context.ChildContent = new HtmlString(cachedContent);
             }
-
-            // The shape has cache settings and no content yet.
-            if (context.Shape.Metadata.IsCached && context.ChildContent == null)
+            else if (_cacheOptions.DebugMode)
             {
-                var cacheContext = context.Shape.Metadata.Cache();
-                _cacheScopeManager.EnterScope(cacheContext);
-                _openScopes[cacheContext.CacheId] = cacheContext;
-
-                var cachedContent = await _dynamicCacheService.GetCachedValueAsync(cacheContext);
-
-                if (cachedContent != null)
-                {
-                    // The contents of this shape was found in the cache.
-                    // Add the cacheContext to _cached so that we don't try to cache the content again in the DisplayedAsync method.
-                    _cached[cacheContext.CacheId] = cacheContext;
-                    context.ChildContent = new HtmlString(cachedContent);
-                }
-                else if (_cacheOptions.DebugMode)
-                {
-                    context.Shape.Metadata.Wrappers.Add("CachedShapeWrapper");
-                }
+                context.Shape.Metadata.Wrappers.Add("CachedShapeWrapper");
             }
         }
+    }
 
-        public async Task DisplayedAsync(ShapeDisplayContext context)
+    public async Task DisplayedAsync(ShapeDisplayContext context)
+    {
+        if (!_cacheOptions.Enabled)
         {
-            if (!_cacheOptions.Enabled)
-            {
-                return;
-            }
+            return;
+        }
 
-            var cacheContext = context.Shape.Metadata.Cache();
+        var cacheContext = context.Shape.Metadata.Cache();
 
-            // If the shape is not configured to be cached, continue as usual.
-            if (cacheContext == null)
-            {
-                context.ChildContent ??= HtmlString.Empty;
+        // If the shape is not configured to be cached, continue as usual.
+        if (cacheContext == null)
+        {
+            context.ChildContent ??= HtmlString.Empty;
 
-                return;
-            }
+            return;
+        }
 
-            // If we have got this far, then this shape is configured to be cached.
-            // We need to determine whether or not the ChildContent of this shape was retrieved from the cache by the DisplayingAsync method above, as opposed to generated by the View Engine.
-            // ChildContent will be generated by the View Engine if it was not available in the cache when we rendered the shape.
-            // In this instance, we need insert the ChildContent into the cache so that subsequent attempt to render this shape can take advantage of the cached content.
+        // If we have got this far, then this shape is configured to be cached.
+        // We need to determine whether or not the ChildContent of this shape was retrieved from the cache by the DisplayingAsync method above, as opposed to generated by the View Engine.
+        // ChildContent will be generated by the View Engine if it was not available in the cache when we rendered the shape.
+        // In this instance, we need insert the ChildContent into the cache so that subsequent attempt to render this shape can take advantage of the cached content.
 
-            // If the ChildContent was retrieved form the cache, then the Cache Context will be present in the _cached collection (see the DisplayingAsync method in this class).
-            // So, if the cache context is not present in the _cached collection, we need to insert the ChildContent value into the cache:
-            if (!_cached.ContainsKey(cacheContext.CacheId) && context.ChildContent != null)
-            {
-                // The content is pre-encoded in the cache so we don't have to do it every time it's rendered.
-                using var sw = new ZStringWriter();
+        // If the ChildContent was retrieved form the cache, then the Cache Context will be present in the _cached collection (see the DisplayingAsync method in this class).
+        // So, if the cache context is not present in the _cached collection, we need to insert the ChildContent value into the cache:
+        if (!_cached.ContainsKey(cacheContext.CacheId) && context.ChildContent != null)
+        {
+            // The content is pre-encoded in the cache so we don't have to do it every time it's rendered.
+            using var sw = new ZStringWriter();
 
-                // 'ChildContent' may be a 'ViewBufferTextWriterContent' on which we can't
-                // call 'WriteTo()' twice, so here we update it with a new 'HtmlString()'.
-                context.ChildContent.WriteTo(sw, _htmlEncoder);
-                var contentHtmlString = new HtmlString(sw.ToString());
-                context.ChildContent = contentHtmlString;
+            // 'ChildContent' may be a 'ViewBufferTextWriterContent' on which we can't
+            // call 'WriteTo()' twice, so here we update it with a new 'HtmlString()'.
+            context.ChildContent.WriteTo(sw, _htmlEncoder);
+            var contentHtmlString = new HtmlString(sw.ToString());
+            context.ChildContent = contentHtmlString;
 
-                await _dynamicCacheService.SetCachedValueAsync(cacheContext, contentHtmlString.Value);
-            }
+            await _dynamicCacheService.SetCachedValueAsync(cacheContext, contentHtmlString.Value);
         }
+    }
 
-        public Task DisplayingFinalizedAsync(ShapeDisplayContext context)
+    public Task DisplayingFinalizedAsync(ShapeDisplayContext context)
+    {
+        if (!_cacheOptions.Enabled)
         {
-            if (!_cacheOptions.Enabled)
-            {
-                return Task.CompletedTask;
-            }
-
-            var cacheContext = context.Shape.Metadata.Cache();
+            return Task.CompletedTask;
+        }
 
-            if (cacheContext != null && _openScopes.ContainsKey(cacheContext.CacheId))
-            {
-                _cacheScopeManager.ExitScope();
-                _openScopes.Remove(cacheContext.CacheId);
-            }
+        var cacheContext = context.Shape.Metadata.Cache();
 
-            return Task.CompletedTask;
+        if (cacheContext != null && _openScopes.ContainsKey(cacheContext.CacheId))
+        {
+            _cacheScopeManager.ExitScope();
+            _openScopes.Remove(cacheContext.CacheId);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.DynamicCache/Models/CacheContextModel.cs b/src/OrchardCore.Modules/OrchardCore.DynamicCache/Models/CacheContextModel.cs
index a41d4c18940..6ec1c077997 100644
--- a/src/OrchardCore.Modules/OrchardCore.DynamicCache/Models/CacheContextModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.DynamicCache/Models/CacheContextModel.cs
@@ -3,55 +3,54 @@
 using System.Linq;
 using OrchardCore.Environment.Cache;
 
-namespace OrchardCore.DynamicCache.Models
+namespace OrchardCore.DynamicCache.Models;
+
+/// <summary>
+/// A serialiazable and deserializable model to represent a <see cref="CacheContext"/>.
+/// </summary>
+public class CacheContextModel
 {
-    /// <summary>
-    /// A serialiazable and deserializable model to represent a <see cref="CacheContext"/>.
-    /// </summary>
-    public class CacheContextModel
+    public string CacheId { get; set; }
+    public ICollection<string> Contexts { get; set; }
+    public IEnumerable<string> Tags { get; set; }
+    public DateTimeOffset? ExpiresOn { get; set; }
+    public TimeSpan? ExpiresAfter { get; set; }
+    public TimeSpan? ExpiresSliding { get; set; }
+
+    internal static CacheContextModel FromCacheContext(CacheContext cacheContext)
     {
-        public string CacheId { get; set; }
-        public ICollection<string> Contexts { get; set; }
-        public IEnumerable<string> Tags { get; set; }
-        public DateTimeOffset? ExpiresOn { get; set; }
-        public TimeSpan? ExpiresAfter { get; set; }
-        public TimeSpan? ExpiresSliding { get; set; }
-
-        internal static CacheContextModel FromCacheContext(CacheContext cacheContext)
+        return new CacheContextModel
         {
-            return new CacheContextModel
-            {
-                CacheId = cacheContext.CacheId,
-                Contexts = cacheContext.Contexts,
-                Tags = cacheContext.Tags,
-                ExpiresOn = cacheContext.ExpiresOn,
-                ExpiresAfter = cacheContext.ExpiresAfter,
-                ExpiresSliding = cacheContext.ExpiresSliding
-            };
+            CacheId = cacheContext.CacheId,
+            Contexts = cacheContext.Contexts,
+            Tags = cacheContext.Tags,
+            ExpiresOn = cacheContext.ExpiresOn,
+            ExpiresAfter = cacheContext.ExpiresAfter,
+            ExpiresSliding = cacheContext.ExpiresSliding
+        };
+    }
+
+    internal CacheContext ToCacheContext()
+    {
+        var cacheContext = new CacheContext(CacheId)
+            .AddContext(Contexts.ToArray())
+            .AddTag(Tags.ToArray());
+
+        if (ExpiresOn.HasValue)
+        {
+            cacheContext.WithExpiryOn(ExpiresOn.Value);
         }
 
-        internal CacheContext ToCacheContext()
+        if (ExpiresAfter.HasValue)
         {
-            var cacheContext = new CacheContext(CacheId)
-                .AddContext(Contexts.ToArray())
-                .AddTag(Tags.ToArray());
-
-            if (ExpiresOn.HasValue)
-            {
-                cacheContext.WithExpiryOn(ExpiresOn.Value);
-            }
-
-            if (ExpiresAfter.HasValue)
-            {
-                cacheContext.WithExpiryAfter(ExpiresAfter.Value);
-            }
-
-            if (ExpiresSliding.HasValue)
-            {
-                cacheContext.WithExpirySliding(ExpiresSliding.Value);
-            }
-
-            return cacheContext;
+            cacheContext.WithExpiryAfter(ExpiresAfter.Value);
         }
+
+        if (ExpiresSliding.HasValue)
+        {
+            cacheContext.WithExpirySliding(ExpiresSliding.Value);
+        }
+
+        return cacheContext;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.DynamicCache/Services/DefaultDynamicCache.cs b/src/OrchardCore.Modules/OrchardCore.DynamicCache/Services/DefaultDynamicCache.cs
index 6c4292bf2aa..5856db07910 100644
--- a/src/OrchardCore.Modules/OrchardCore.DynamicCache/Services/DefaultDynamicCache.cs
+++ b/src/OrchardCore.Modules/OrchardCore.DynamicCache/Services/DefaultDynamicCache.cs
@@ -1,30 +1,29 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Caching.Distributed;
 
-namespace OrchardCore.DynamicCache.Services
+namespace OrchardCore.DynamicCache.Services;
+
+public class DefaultDynamicCache : IDynamicCache
 {
-    public class DefaultDynamicCache : IDynamicCache
-    {
-        private readonly IDistributedCache _distributedCache;
+    private readonly IDistributedCache _distributedCache;
 
-        public DefaultDynamicCache(IDistributedCache distributedCache)
-        {
-            _distributedCache = distributedCache;
-        }
+    public DefaultDynamicCache(IDistributedCache distributedCache)
+    {
+        _distributedCache = distributedCache;
+    }
 
-        public Task<byte[]> GetAsync(string key)
-        {
-            return _distributedCache.GetAsync(key);
-        }
+    public Task<byte[]> GetAsync(string key)
+    {
+        return _distributedCache.GetAsync(key);
+    }
 
-        public Task RemoveAsync(string key)
-        {
-            return _distributedCache.RemoveAsync(key);
-        }
+    public Task RemoveAsync(string key)
+    {
+        return _distributedCache.RemoveAsync(key);
+    }
 
-        public Task SetAsync(string key, byte[] value, DistributedCacheEntryOptions options)
-        {
-            return _distributedCache.SetAsync(key, value, options);
-        }
+    public Task SetAsync(string key, byte[] value, DistributedCacheEntryOptions options)
+    {
+        return _distributedCache.SetAsync(key, value, options);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.DynamicCache/Services/DefaultDynamicCacheService.cs b/src/OrchardCore.Modules/OrchardCore.DynamicCache/Services/DefaultDynamicCacheService.cs
index f9bfd7c6ed5..abffe5ca908 100644
--- a/src/OrchardCore.Modules/OrchardCore.DynamicCache/Services/DefaultDynamicCacheService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.DynamicCache/Services/DefaultDynamicCacheService.cs
@@ -13,198 +13,197 @@
 using OrchardCore.DynamicCache.Models;
 using OrchardCore.Environment.Cache;
 
-namespace OrchardCore.DynamicCache.Services
+namespace OrchardCore.DynamicCache.Services;
+
+public class DefaultDynamicCacheService : IDynamicCacheService
 {
-    public class DefaultDynamicCacheService : IDynamicCacheService
+    public const string FailoverKey = "OrchardCore_DynamicCache_FailoverKey";
+    public static readonly TimeSpan DefaultFailoverRetryLatency = TimeSpan.FromSeconds(30);
+
+    private readonly ICacheContextManager _cacheContextManager;
+    private readonly IDynamicCache _dynamicCache;
+    private readonly IMemoryCache _memoryCache;
+    private readonly IServiceProvider _serviceProvider;
+    private readonly DynamicCacheOptions _dynamicCacheOptions;
+    private readonly CacheOptions _cacheOptions;
+    private readonly ILogger _logger;
+
+    private readonly Dictionary<string, string> _localCache = [];
+    private ITagCache _tagcache;
+
+    public DefaultDynamicCacheService(
+        ICacheContextManager cacheContextManager,
+        IDynamicCache dynamicCache,
+        IMemoryCache memoryCache,
+        IServiceProvider serviceProvider,
+        IOptions<DynamicCacheOptions> dynamicCacheOptions,
+        IOptions<CacheOptions> options,
+        ILogger<DefaultDynamicCacheService> logger)
     {
-        public const string FailoverKey = "OrchardCore_DynamicCache_FailoverKey";
-        public static readonly TimeSpan DefaultFailoverRetryLatency = TimeSpan.FromSeconds(30);
-
-        private readonly ICacheContextManager _cacheContextManager;
-        private readonly IDynamicCache _dynamicCache;
-        private readonly IMemoryCache _memoryCache;
-        private readonly IServiceProvider _serviceProvider;
-        private readonly DynamicCacheOptions _dynamicCacheOptions;
-        private readonly CacheOptions _cacheOptions;
-        private readonly ILogger _logger;
-
-        private readonly Dictionary<string, string> _localCache = [];
-        private ITagCache _tagcache;
-
-        public DefaultDynamicCacheService(
-            ICacheContextManager cacheContextManager,
-            IDynamicCache dynamicCache,
-            IMemoryCache memoryCache,
-            IServiceProvider serviceProvider,
-            IOptions<DynamicCacheOptions> dynamicCacheOptions,
-            IOptions<CacheOptions> options,
-            ILogger<DefaultDynamicCacheService> logger)
+        _cacheContextManager = cacheContextManager;
+        _dynamicCache = dynamicCache;
+        _memoryCache = memoryCache;
+        _serviceProvider = serviceProvider;
+        _dynamicCacheOptions = dynamicCacheOptions.Value;
+        _dynamicCacheOptions.FailoverRetryLatency ??= DefaultFailoverRetryLatency;
+        _cacheOptions = options.Value;
+        _logger = logger;
+    }
+
+    public async Task<string> GetCachedValueAsync(CacheContext context)
+    {
+        if (!_cacheOptions.Enabled)
         {
-            _cacheContextManager = cacheContextManager;
-            _dynamicCache = dynamicCache;
-            _memoryCache = memoryCache;
-            _serviceProvider = serviceProvider;
-            _dynamicCacheOptions = dynamicCacheOptions.Value;
-            _dynamicCacheOptions.FailoverRetryLatency ??= DefaultFailoverRetryLatency;
-            _cacheOptions = options.Value;
-            _logger = logger;
+            return null;
         }
 
-        public async Task<string> GetCachedValueAsync(CacheContext context)
-        {
-            if (!_cacheOptions.Enabled)
-            {
-                return null;
-            }
+        var cacheKey = await GetCacheKey(context);
 
-            var cacheKey = await GetCacheKey(context);
+        context = await GetCachedContextAsync(cacheKey);
+        if (context == null)
+        {
+            // We don't know the context, so we must treat this as a cache miss
+            return null;
+        }
 
-            context = await GetCachedContextAsync(cacheKey);
-            if (context == null)
-            {
-                // We don't know the context, so we must treat this as a cache miss
-                return null;
-            }
+        var content = await GetCachedStringAsync(cacheKey);
 
-            var content = await GetCachedStringAsync(cacheKey);
+        return content;
+    }
 
-            return content;
+    public async Task SetCachedValueAsync(CacheContext context, string value)
+    {
+        if (!_cacheOptions.Enabled)
+        {
+            return;
         }
 
-        public async Task SetCachedValueAsync(CacheContext context, string value)
-        {
-            if (!_cacheOptions.Enabled)
-            {
-                return;
-            }
+        var cacheKey = await GetCacheKey(context);
 
-            var cacheKey = await GetCacheKey(context);
+        _localCache[cacheKey] = value;
+        var esi = JConvert.SerializeObject(CacheContextModel.FromCacheContext(context));
 
-            _localCache[cacheKey] = value;
-            var esi = JConvert.SerializeObject(CacheContextModel.FromCacheContext(context));
+        await Task.WhenAll(
+            SetCachedValueAsync(cacheKey, value, context),
+            SetCachedValueAsync(GetCacheContextCacheKey(cacheKey), esi, context)
+        );
+    }
 
-            await Task.WhenAll(
-                SetCachedValueAsync(cacheKey, value, context),
-                SetCachedValueAsync(GetCacheContextCacheKey(cacheKey), esi, context)
-            );
-        }
+    public Task TagRemovedAsync(string tag, IEnumerable<string> keys)
+    {
+        return Task.WhenAll(keys.Select(key => _dynamicCache.RemoveAsync(key)));
+    }
 
-        public Task TagRemovedAsync(string tag, IEnumerable<string> keys)
+    private async Task SetCachedValueAsync(string cacheKey, string value, CacheContext context)
+    {
+        var failover = _memoryCache.Get<bool>(FailoverKey);
+        if (failover)
         {
-            return Task.WhenAll(keys.Select(key => _dynamicCache.RemoveAsync(key)));
+            return;
         }
 
-        private async Task SetCachedValueAsync(string cacheKey, string value, CacheContext context)
+        var bytes = Encoding.UTF8.GetBytes(value);
+
+        var options = new DistributedCacheEntryOptions
         {
-            var failover = _memoryCache.Get<bool>(FailoverKey);
-            if (failover)
-            {
-                return;
-            }
+            AbsoluteExpiration = context.ExpiresOn,
+            SlidingExpiration = context.ExpiresSliding,
+            AbsoluteExpirationRelativeToNow = context.ExpiresAfter
+        };
 
-            var bytes = Encoding.UTF8.GetBytes(value);
+        // Default duration is sliding expiration (permanent as long as it's used)
+        if (!options.AbsoluteExpiration.HasValue && !options.SlidingExpiration.HasValue && !options.AbsoluteExpirationRelativeToNow.HasValue)
+        {
+            options.SlidingExpiration = new TimeSpan(0, 1, 0);
+        }
 
-            var options = new DistributedCacheEntryOptions
-            {
-                AbsoluteExpiration = context.ExpiresOn,
-                SlidingExpiration = context.ExpiresSliding,
-                AbsoluteExpirationRelativeToNow = context.ExpiresAfter
-            };
+        try
+        {
+            await _dynamicCache.SetAsync(cacheKey, bytes, options);
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "Failed to write the '{CacheKey}' to the dynamic cache", cacheKey);
 
-            // Default duration is sliding expiration (permanent as long as it's used)
-            if (!options.AbsoluteExpiration.HasValue && !options.SlidingExpiration.HasValue && !options.AbsoluteExpirationRelativeToNow.HasValue)
+            _memoryCache.Set(FailoverKey, true, new MemoryCacheEntryOptions()
             {
-                options.SlidingExpiration = new TimeSpan(0, 1, 0);
-            }
+                AbsoluteExpirationRelativeToNow = _dynamicCacheOptions.FailoverRetryLatency
+            });
 
-            try
-            {
-                await _dynamicCache.SetAsync(cacheKey, bytes, options);
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "Failed to write the '{CacheKey}' to the dynamic cache", cacheKey);
+            return;
+        }
 
-                _memoryCache.Set(FailoverKey, true, new MemoryCacheEntryOptions()
-                {
-                    AbsoluteExpirationRelativeToNow = _dynamicCacheOptions.FailoverRetryLatency
-                });
+        // Lazy load to prevent cyclic dependency
+        _tagcache ??= _serviceProvider.GetRequiredService<ITagCache>();
+        await _tagcache.TagAsync(cacheKey, context.Tags.ToArray());
+    }
 
-                return;
-            }
+    private async Task<string> GetCacheKey(CacheContext context)
+    {
+        var cacheEntries = context.Contexts.Count > 0
+            ? await _cacheContextManager.GetDiscriminatorsAsync(context.Contexts)
+            : [];
 
-            // Lazy load to prevent cyclic dependency
-            _tagcache ??= _serviceProvider.GetRequiredService<ITagCache>();
-            await _tagcache.TagAsync(cacheKey, context.Tags.ToArray());
+        if (!cacheEntries.Any())
+        {
+            return context.CacheId;
         }
 
-        private async Task<string> GetCacheKey(CacheContext context)
-        {
-            var cacheEntries = context.Contexts.Count > 0
-                ? await _cacheContextManager.GetDiscriminatorsAsync(context.Contexts)
-                : [];
+        var key = context.CacheId + "/" + cacheEntries.GetContextHash();
+        return key;
+    }
 
-            if (!cacheEntries.Any())
-            {
-                return context.CacheId;
-            }
+    private static string GetCacheContextCacheKey(string cacheKey)
+    {
+        return "cachecontext-" + cacheKey;
+    }
 
-            var key = context.CacheId + "/" + cacheEntries.GetContextHash();
-            return key;
+    private async Task<string> GetCachedStringAsync(string cacheKey)
+    {
+        if (_localCache.TryGetValue(cacheKey, out var content))
+        {
+            return content;
         }
 
-        private static string GetCacheContextCacheKey(string cacheKey)
+        var failover = _memoryCache.Get<bool>(FailoverKey);
+        if (failover)
         {
-            return "cachecontext-" + cacheKey;
+            return null;
         }
 
-        private async Task<string> GetCachedStringAsync(string cacheKey)
+        try
         {
-            if (_localCache.TryGetValue(cacheKey, out var content))
-            {
-                return content;
-            }
-
-            var failover = _memoryCache.Get<bool>(FailoverKey);
-            if (failover)
+            var bytes = await _dynamicCache.GetAsync(cacheKey);
+            if (bytes == null)
             {
                 return null;
             }
 
-            try
-            {
-                var bytes = await _dynamicCache.GetAsync(cacheKey);
-                if (bytes == null)
-                {
-                    return null;
-                }
+            return Encoding.UTF8.GetString(bytes);
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "Failed to read the '{CacheKey}' from the dynamic cache", cacheKey);
 
-                return Encoding.UTF8.GetString(bytes);
-            }
-            catch (Exception e)
+            _memoryCache.Set(FailoverKey, true, new MemoryCacheEntryOptions()
             {
-                _logger.LogError(e, "Failed to read the '{CacheKey}' from the dynamic cache", cacheKey);
-
-                _memoryCache.Set(FailoverKey, true, new MemoryCacheEntryOptions()
-                {
-                    AbsoluteExpirationRelativeToNow = _dynamicCacheOptions.FailoverRetryLatency
-                });
-            }
-
-            return null;
+                AbsoluteExpirationRelativeToNow = _dynamicCacheOptions.FailoverRetryLatency
+            });
         }
 
-        private async Task<CacheContext> GetCachedContextAsync(string cacheKey)
-        {
-            var cachedValue = await GetCachedStringAsync(GetCacheContextCacheKey(cacheKey));
+        return null;
+    }
 
-            if (cachedValue == null)
-            {
-                return null;
-            }
+    private async Task<CacheContext> GetCachedContextAsync(string cacheKey)
+    {
+        var cachedValue = await GetCachedStringAsync(GetCacheContextCacheKey(cacheKey));
 
-            var esiModel = JConvert.DeserializeObject<CacheContextModel>(cachedValue);
-            return esiModel.ToCacheContext();
+        if (cachedValue == null)
+        {
+            return null;
         }
+
+        var esiModel = JConvert.DeserializeObject<CacheContextModel>(cachedValue);
+        return esiModel.ToCacheContext();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.DynamicCache/Startup.cs b/src/OrchardCore.Modules/OrchardCore.DynamicCache/Startup.cs
index 99e4cf007c1..5d939477f5a 100644
--- a/src/OrchardCore.Modules/OrchardCore.DynamicCache/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.DynamicCache/Startup.cs
@@ -9,35 +9,34 @@
 using OrchardCore.Environment.Shell.Configuration;
 using OrchardCore.Modules;
 
-namespace OrchardCore.DynamicCache
+namespace OrchardCore.DynamicCache;
+
+/// <summary>
+/// These services are registered on the tenant service collection.
+/// </summary>
+public sealed class Startup : StartupBase
 {
-    /// <summary>
-    /// These services are registered on the tenant service collection.
-    /// </summary>
-    public sealed class Startup : StartupBase
-    {
-        private readonly IShellConfiguration _shellConfiguration;
+    private readonly IShellConfiguration _shellConfiguration;
 
-        public Startup(IShellConfiguration shellConfiguration)
-        {
-            _shellConfiguration = shellConfiguration;
-        }
+    public Startup(IShellConfiguration shellConfiguration)
+    {
+        _shellConfiguration = shellConfiguration;
+    }
 
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IDynamicCacheService, DefaultDynamicCacheService>();
-            services.AddScoped<ITagRemovedEventHandler>(sp => sp.GetRequiredService<IDynamicCacheService>());
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddScoped<IDynamicCacheService, DefaultDynamicCacheService>();
+        services.AddScoped<ITagRemovedEventHandler>(sp => sp.GetRequiredService<IDynamicCacheService>());
 
-            services.AddScoped<IShapeDisplayEvents, DynamicCacheShapeDisplayEvents>();
-            services.AddShapeAttributes<CachedShapeWrapperShapes>();
+        services.AddScoped<IShapeDisplayEvents, DynamicCacheShapeDisplayEvents>();
+        services.AddShapeAttributes<CachedShapeWrapperShapes>();
 
-            services.AddSingleton<IDynamicCache, DefaultDynamicCache>();
-            services.AddSingleton<DynamicCacheTagHelperService>();
-            services.AddTagHelpers<DynamicCacheTagHelper>();
-            services.AddTagHelpers<CacheDependencyTagHelper>();
+        services.AddSingleton<IDynamicCache, DefaultDynamicCache>();
+        services.AddSingleton<DynamicCacheTagHelperService>();
+        services.AddTagHelpers<DynamicCacheTagHelper>();
+        services.AddTagHelpers<CacheDependencyTagHelper>();
 
-            services.AddTransient<IConfigureOptions<CacheOptions>, CacheOptionsConfiguration>();
-            services.Configure<DynamicCacheOptions>(_shellConfiguration.GetSection("OrchardCore_DynamicCache"));
-        }
+        services.AddTransient<IConfigureOptions<CacheOptions>, CacheOptionsConfiguration>();
+        services.Configure<DynamicCacheOptions>(_shellConfiguration.GetSection("OrchardCore_DynamicCache"));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.DynamicCache/TagHelpers/CacheDependencyTagHelper.cs b/src/OrchardCore.Modules/OrchardCore.DynamicCache/TagHelpers/CacheDependencyTagHelper.cs
index b055b279399..765c51a971c 100644
--- a/src/OrchardCore.Modules/OrchardCore.DynamicCache/TagHelpers/CacheDependencyTagHelper.cs
+++ b/src/OrchardCore.Modules/OrchardCore.DynamicCache/TagHelpers/CacheDependencyTagHelper.cs
@@ -2,43 +2,42 @@
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using OrchardCore.Environment.Cache;
 
-namespace OrchardCore.DynamicCache.TagHelpers
-{
-    [HtmlTargetElement("cache-dependency", Attributes = DependencyAttributeName)]
-    public class CacheDependencyTagHelper : TagHelper
-    {
-        private const string DependencyAttributeName = "dependency";
+namespace OrchardCore.DynamicCache.TagHelpers;
 
-        /// <summary>
-        /// Gets or sets a <see cref="string" /> with the dependency to invalidate the cache with.
-        /// </summary>
-        [HtmlAttributeName(DependencyAttributeName)]
-        public string Dependency { get; set; }
+[HtmlTargetElement("cache-dependency", Attributes = DependencyAttributeName)]
+public class CacheDependencyTagHelper : TagHelper
+{
+    private const string DependencyAttributeName = "dependency";
 
-        private readonly ICacheScopeManager _cacheScopeManager;
+    /// <summary>
+    /// Gets or sets a <see cref="string" /> with the dependency to invalidate the cache with.
+    /// </summary>
+    [HtmlAttributeName(DependencyAttributeName)]
+    public string Dependency { get; set; }
 
-        public CacheDependencyTagHelper(
-            ICacheScopeManager cacheScopeManager)
+    private readonly ICacheScopeManager _cacheScopeManager;
 
-        {
-            _cacheScopeManager = cacheScopeManager;
-        }
+    public CacheDependencyTagHelper(
+        ICacheScopeManager cacheScopeManager)
 
+    {
+        _cacheScopeManager = cacheScopeManager;
+    }
 
-        /// <inheritdoc />
-        public override void Process(TagHelperContext context, TagHelperOutput output)
-        {
-            ArgumentNullException.ThrowIfNull(context);
 
-            ArgumentNullException.ThrowIfNull(output);
+    /// <inheritdoc />
+    public override void Process(TagHelperContext context, TagHelperOutput output)
+    {
+        ArgumentNullException.ThrowIfNull(context);
 
-            if (!string.IsNullOrEmpty(Dependency))
-            {
-                _cacheScopeManager.AddDependencies(Dependency);
-            }
+        ArgumentNullException.ThrowIfNull(output);
 
-            // Clear the contents of the "cache-dependency" element since we don't want to render it.
-            output.SuppressOutput();
+        if (!string.IsNullOrEmpty(Dependency))
+        {
+            _cacheScopeManager.AddDependencies(Dependency);
         }
+
+        // Clear the contents of the "cache-dependency" element since we don't want to render it.
+        output.SuppressOutput();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.DynamicCache/TagHelpers/DynamicCacheTagHelper.cs b/src/OrchardCore.Modules/OrchardCore.DynamicCache/TagHelpers/DynamicCacheTagHelper.cs
index b0e1289e333..e5193bbcc88 100644
--- a/src/OrchardCore.Modules/OrchardCore.DynamicCache/TagHelpers/DynamicCacheTagHelper.cs
+++ b/src/OrchardCore.Modules/OrchardCore.DynamicCache/TagHelpers/DynamicCacheTagHelper.cs
@@ -8,262 +8,261 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Environment.Cache;
 
-namespace OrchardCore.DynamicCache.TagHelpers
+namespace OrchardCore.DynamicCache.TagHelpers;
+
+[HtmlTargetElement("dynamic-cache", Attributes = CacheIdAttributeName)]
+public class DynamicCacheTagHelper : TagHelper
 {
-    [HtmlTargetElement("dynamic-cache", Attributes = CacheIdAttributeName)]
-    public class DynamicCacheTagHelper : TagHelper
+    private const string CacheIdAttributeName = "cache-id";
+    private const string VaryByAttributeName = "vary-by";
+    private const string DependenciesAttributeNAme = "dependencies";
+    private const string ExpiresOnAttributeName = "expires-on";
+    private const string ExpiresAfterAttributeName = "expires-after";
+    private const string ExpiresSlidingAttributeName = "expires-sliding";
+    private const string EnabledAttributeName = "enabled";
+
+    private static readonly char[] _splitChars = [',', ' '];
+
+    /// <summary>
+    /// The default duration, from the time the cache entry was added, when it should be evicted.
+    /// This default duration will only be used if no other expiration criteria is specified.
+    /// The default expiration time is a sliding expiration of 30 seconds.
+    /// </summary>
+    public static readonly TimeSpan DefaultExpiration = TimeSpan.FromSeconds(30);
+
+    /// <summary>
+    /// Gets the <see cref="System.Text.Encodings.Web.HtmlEncoder"/> which encodes the content to be cached.
+    /// </summary>
+    protected HtmlEncoder HtmlEncoder { get; }
+
+    /// <summary>
+    /// Gets or sets a <see cref="string" /> identifying this cache entry.
+    /// </summary>
+    [HtmlAttributeName(CacheIdAttributeName)]
+    public string CacheId { get; set; }
+
+    /// <summary>
+    /// Gets or sets a <see cref="string" /> to vary the cached result by.
+    /// </summary>
+    [HtmlAttributeName(VaryByAttributeName)]
+    public string VaryBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets a <see cref="string" /> with the dependencies to invalidate the cache with.
+    /// </summary>
+    [HtmlAttributeName(DependenciesAttributeNAme)]
+    public string Dependencies { get; set; }
+
+    /// <summary>
+    /// Gets or sets the exact <see cref="DateTimeOffset"/> the cache entry should be evicted.
+    /// </summary>
+    [HtmlAttributeName(ExpiresOnAttributeName)]
+    public DateTimeOffset? ExpiresOn { get; set; }
+
+    /// <summary>
+    /// Gets or sets the duration, from the time the cache entry was added, when it should be evicted.
+    /// </summary>
+    [HtmlAttributeName(ExpiresAfterAttributeName)]
+    public TimeSpan? ExpiresAfter { get; set; }
+
+    /// <summary>
+    /// Gets or sets the duration from last access that the cache entry should be evicted.
+    /// </summary>
+    [HtmlAttributeName(ExpiresSlidingAttributeName)]
+    public TimeSpan? ExpiresSliding { get; set; }
+
+    /// <summary>
+    /// Gets or sets the value which determines if the tag helper is enabled or not.
+    /// </summary>
+    [HtmlAttributeName(EnabledAttributeName)]
+    public bool Enabled { get; set; } = true;
+
+    /// <summary>
+    /// Prefix used by <see cref="DynamicCacheTagHelper"/> instances when creating entries in <see cref="IDynamicCacheService"/>.
+    /// </summary>
+    public static readonly string CacheKeyPrefix = nameof(DynamicCacheTagHelper);
+
+    private readonly IDynamicCacheService _dynamicCacheService;
+    private readonly ICacheScopeManager _cacheScopeManager;
+    private readonly DynamicCacheTagHelperService _dynamicCacheTagHelperService;
+    private readonly CacheOptions _cacheOptions;
+
+    public DynamicCacheTagHelper(
+        IDynamicCacheService dynamicCacheService,
+        ICacheScopeManager cacheScopeManager,
+        HtmlEncoder htmlEncoder,
+        DynamicCacheTagHelperService dynamicCacheTagHelperService,
+        IOptions<CacheOptions> cacheOptions)
     {
-        private const string CacheIdAttributeName = "cache-id";
-        private const string VaryByAttributeName = "vary-by";
-        private const string DependenciesAttributeNAme = "dependencies";
-        private const string ExpiresOnAttributeName = "expires-on";
-        private const string ExpiresAfterAttributeName = "expires-after";
-        private const string ExpiresSlidingAttributeName = "expires-sliding";
-        private const string EnabledAttributeName = "enabled";
-
-        private static readonly char[] _splitChars = [',', ' '];
-
-        /// <summary>
-        /// The default duration, from the time the cache entry was added, when it should be evicted.
-        /// This default duration will only be used if no other expiration criteria is specified.
-        /// The default expiration time is a sliding expiration of 30 seconds.
-        /// </summary>
-        public static readonly TimeSpan DefaultExpiration = TimeSpan.FromSeconds(30);
-
-        /// <summary>
-        /// Gets the <see cref="System.Text.Encodings.Web.HtmlEncoder"/> which encodes the content to be cached.
-        /// </summary>
-        protected HtmlEncoder HtmlEncoder { get; }
-
-        /// <summary>
-        /// Gets or sets a <see cref="string" /> identifying this cache entry.
-        /// </summary>
-        [HtmlAttributeName(CacheIdAttributeName)]
-        public string CacheId { get; set; }
-
-        /// <summary>
-        /// Gets or sets a <see cref="string" /> to vary the cached result by.
-        /// </summary>
-        [HtmlAttributeName(VaryByAttributeName)]
-        public string VaryBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets a <see cref="string" /> with the dependencies to invalidate the cache with.
-        /// </summary>
-        [HtmlAttributeName(DependenciesAttributeNAme)]
-        public string Dependencies { get; set; }
-
-        /// <summary>
-        /// Gets or sets the exact <see cref="DateTimeOffset"/> the cache entry should be evicted.
-        /// </summary>
-        [HtmlAttributeName(ExpiresOnAttributeName)]
-        public DateTimeOffset? ExpiresOn { get; set; }
-
-        /// <summary>
-        /// Gets or sets the duration, from the time the cache entry was added, when it should be evicted.
-        /// </summary>
-        [HtmlAttributeName(ExpiresAfterAttributeName)]
-        public TimeSpan? ExpiresAfter { get; set; }
-
-        /// <summary>
-        /// Gets or sets the duration from last access that the cache entry should be evicted.
-        /// </summary>
-        [HtmlAttributeName(ExpiresSlidingAttributeName)]
-        public TimeSpan? ExpiresSliding { get; set; }
-
-        /// <summary>
-        /// Gets or sets the value which determines if the tag helper is enabled or not.
-        /// </summary>
-        [HtmlAttributeName(EnabledAttributeName)]
-        public bool Enabled { get; set; } = true;
-
-        /// <summary>
-        /// Prefix used by <see cref="DynamicCacheTagHelper"/> instances when creating entries in <see cref="IDynamicCacheService"/>.
-        /// </summary>
-        public static readonly string CacheKeyPrefix = nameof(DynamicCacheTagHelper);
-
-        private readonly IDynamicCacheService _dynamicCacheService;
-        private readonly ICacheScopeManager _cacheScopeManager;
-        private readonly DynamicCacheTagHelperService _dynamicCacheTagHelperService;
-        private readonly CacheOptions _cacheOptions;
-
-        public DynamicCacheTagHelper(
-            IDynamicCacheService dynamicCacheService,
-            ICacheScopeManager cacheScopeManager,
-            HtmlEncoder htmlEncoder,
-            DynamicCacheTagHelperService dynamicCacheTagHelperService,
-            IOptions<CacheOptions> cacheOptions)
-        {
-            _dynamicCacheService = dynamicCacheService;
-            _cacheScopeManager = cacheScopeManager;
-            HtmlEncoder = htmlEncoder;
-            _dynamicCacheTagHelperService = dynamicCacheTagHelperService;
-            _cacheOptions = cacheOptions.Value;
-        }
+        _dynamicCacheService = dynamicCacheService;
+        _cacheScopeManager = cacheScopeManager;
+        HtmlEncoder = htmlEncoder;
+        _dynamicCacheTagHelperService = dynamicCacheTagHelperService;
+        _cacheOptions = cacheOptions.Value;
+    }
 
-        /// <inheritdoc />
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
-        {
-            ArgumentNullException.ThrowIfNull(context);
+    /// <inheritdoc />
+    public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+    {
+        ArgumentNullException.ThrowIfNull(context);
 
-            ArgumentNullException.ThrowIfNull(output);
+        ArgumentNullException.ThrowIfNull(output);
 
-            IHtmlContent content;
+        IHtmlContent content;
 
-            if (Enabled)
-            {
-                var cacheContext = new CacheContext(CacheId);
+        if (Enabled)
+        {
+            var cacheContext = new CacheContext(CacheId);
 
-                if (!string.IsNullOrEmpty(VaryBy))
-                {
-                    cacheContext.AddContext(VaryBy.Split(_splitChars, StringSplitOptions.RemoveEmptyEntries));
-                }
+            if (!string.IsNullOrEmpty(VaryBy))
+            {
+                cacheContext.AddContext(VaryBy.Split(_splitChars, StringSplitOptions.RemoveEmptyEntries));
+            }
 
-                if (!string.IsNullOrEmpty(Dependencies))
-                {
-                    cacheContext.AddTag(Dependencies.Split(_splitChars, StringSplitOptions.RemoveEmptyEntries));
-                }
+            if (!string.IsNullOrEmpty(Dependencies))
+            {
+                cacheContext.AddTag(Dependencies.Split(_splitChars, StringSplitOptions.RemoveEmptyEntries));
+            }
 
-                var hasEvictionCriteria = false;
+            var hasEvictionCriteria = false;
 
-                if (ExpiresOn.HasValue)
-                {
-                    hasEvictionCriteria = true;
-                    cacheContext.WithExpiryOn(ExpiresOn.Value);
-                }
+            if (ExpiresOn.HasValue)
+            {
+                hasEvictionCriteria = true;
+                cacheContext.WithExpiryOn(ExpiresOn.Value);
+            }
 
-                if (ExpiresAfter.HasValue)
-                {
-                    hasEvictionCriteria = true;
-                    cacheContext.WithExpiryAfter(ExpiresAfter.Value);
-                }
+            if (ExpiresAfter.HasValue)
+            {
+                hasEvictionCriteria = true;
+                cacheContext.WithExpiryAfter(ExpiresAfter.Value);
+            }
 
-                if (ExpiresSliding.HasValue)
-                {
-                    hasEvictionCriteria = true;
-                    cacheContext.WithExpirySliding(ExpiresSliding.Value);
-                }
+            if (ExpiresSliding.HasValue)
+            {
+                hasEvictionCriteria = true;
+                cacheContext.WithExpirySliding(ExpiresSliding.Value);
+            }
 
-                if (!hasEvictionCriteria)
-                {
-                    cacheContext.WithExpirySliding(DefaultExpiration);
-                }
+            if (!hasEvictionCriteria)
+            {
+                cacheContext.WithExpirySliding(DefaultExpiration);
+            }
 
-                _cacheScopeManager.EnterScope(cacheContext);
+            _cacheScopeManager.EnterScope(cacheContext);
 
-                try
-                {
-                    content = await ProcessContentAsync(output, cacheContext);
-                }
-                finally
-                {
-                    _cacheScopeManager.ExitScope();
-                }
+            try
+            {
+                content = await ProcessContentAsync(output, cacheContext);
             }
-            else
+            finally
             {
-                content = await output.GetChildContentAsync();
+                _cacheScopeManager.ExitScope();
             }
+        }
+        else
+        {
+            content = await output.GetChildContentAsync();
+        }
 
-            // Clear the contents of the "cache" element since we don't want to render it.
-            output.SuppressOutput();
+        // Clear the contents of the "cache" element since we don't want to render it.
+        output.SuppressOutput();
 
-            output.Content.SetHtmlContent(content);
-        }
+        output.Content.SetHtmlContent(content);
+    }
+
+    public async Task<IHtmlContent> ProcessContentAsync(TagHelperOutput output, CacheContext cacheContext)
+    {
+        IHtmlContent content = null;
 
-        public async Task<IHtmlContent> ProcessContentAsync(TagHelperOutput output, CacheContext cacheContext)
+        while (content == null)
         {
-            IHtmlContent content = null;
+            Task<IHtmlContent> result;
 
-            while (content == null)
+            // Is there any request already processing the value?
+            if (!_dynamicCacheTagHelperService.Workers.TryGetValue(CacheId, out result))
             {
-                Task<IHtmlContent> result;
+                // There is a small race condition here between TryGetValue and TryAdd that might cause the
+                // content to be computed more than once. We don't care about this race as the probability of
+                // happening is very small and the impact is not critical.
+                var tcs = new TaskCompletionSource<IHtmlContent>();
 
-                // Is there any request already processing the value?
-                if (!_dynamicCacheTagHelperService.Workers.TryGetValue(CacheId, out result))
-                {
-                    // There is a small race condition here between TryGetValue and TryAdd that might cause the
-                    // content to be computed more than once. We don't care about this race as the probability of
-                    // happening is very small and the impact is not critical.
-                    var tcs = new TaskCompletionSource<IHtmlContent>();
+                _dynamicCacheTagHelperService.Workers.TryAdd(CacheId, tcs.Task);
 
-                    _dynamicCacheTagHelperService.Workers.TryAdd(CacheId, tcs.Task);
+                try
+                {
+                    var value = await _dynamicCacheService.GetCachedValueAsync(cacheContext);
 
-                    try
+                    if (value == null)
                     {
-                        var value = await _dynamicCacheService.GetCachedValueAsync(cacheContext);
+                        // The value is not cached, we need to render the tag helper output
+                        var processedContent = await output.GetChildContentAsync();
 
-                        if (value == null)
+                        using var writer = new ZStringWriter();
+                        // Write the start of a cache debug block.
+                        if (_cacheOptions.DebugMode)
                         {
-                            // The value is not cached, we need to render the tag helper output
-                            var processedContent = await output.GetChildContentAsync();
-
-                            using var writer = new ZStringWriter();
-                            // Write the start of a cache debug block.
-                            if (_cacheOptions.DebugMode)
-                            {
-                                // No need to optimize this code as it will be used for debugging purpose.
-                                writer.WriteLine();
-                                writer.WriteLine($"<!-- CACHE BLOCK: {cacheContext.CacheId} ({Guid.NewGuid()})");
-                                writer.WriteLine($"         VARY BY: {string.Join(", ", cacheContext.Contexts)}");
-                                writer.WriteLine($"    DEPENDENCIES: {string.Join(", ", cacheContext.Tags)}");
-                                writer.WriteLine($"      EXPIRES ON: {cacheContext.ExpiresOn}");
-                                writer.WriteLine($"   EXPIRES AFTER: {cacheContext.ExpiresAfter}");
-                                writer.WriteLine($" EXPIRES SLIDING: {cacheContext.ExpiresSliding}");
-                                writer.WriteLine("-->");
-                            }
-
-                            // Always write the content regardless of debug mode.
-                            processedContent.WriteTo(writer, HtmlEncoder);
-
-                            // Write the end of a cache debug block.
-                            if (_cacheOptions.DebugMode)
-                            {
-                                writer.WriteLine();
-                                writer.WriteLine($"<!-- END CACHE BLOCK: {cacheContext.CacheId} -->");
-                            }
-
-                            await writer.FlushAsync();
-
-                            var html = writer.ToString();
-
-                            var formattingContext = new DistributedCacheTagHelperFormattingContext
-                            {
-                                Html = new HtmlString(html)
-                            };
-
-                            await _dynamicCacheService.SetCachedValueAsync(cacheContext, html);
-
-                            content = formattingContext.Html;
+                            // No need to optimize this code as it will be used for debugging purpose.
+                            writer.WriteLine();
+                            writer.WriteLine($"<!-- CACHE BLOCK: {cacheContext.CacheId} ({Guid.NewGuid()})");
+                            writer.WriteLine($"         VARY BY: {string.Join(", ", cacheContext.Contexts)}");
+                            writer.WriteLine($"    DEPENDENCIES: {string.Join(", ", cacheContext.Tags)}");
+                            writer.WriteLine($"      EXPIRES ON: {cacheContext.ExpiresOn}");
+                            writer.WriteLine($"   EXPIRES AFTER: {cacheContext.ExpiresAfter}");
+                            writer.WriteLine($" EXPIRES SLIDING: {cacheContext.ExpiresSliding}");
+                            writer.WriteLine("-->");
                         }
-                        else
+
+                        // Always write the content regardless of debug mode.
+                        processedContent.WriteTo(writer, HtmlEncoder);
+
+                        // Write the end of a cache debug block.
+                        if (_cacheOptions.DebugMode)
                         {
-                            content = new HtmlString(value);
+                            writer.WriteLine();
+                            writer.WriteLine($"<!-- END CACHE BLOCK: {cacheContext.CacheId} -->");
                         }
+
+                        await writer.FlushAsync();
+
+                        var html = writer.ToString();
+
+                        var formattingContext = new DistributedCacheTagHelperFormattingContext
+                        {
+                            Html = new HtmlString(html)
+                        };
+
+                        await _dynamicCacheService.SetCachedValueAsync(cacheContext, html);
+
+                        content = formattingContext.Html;
                     }
-                    catch
-                    {
-                        content = null;
-                        throw;
-                    }
-                    finally
+                    else
                     {
-                        // Remove the worker task before setting the result.
-                        // If the result is null, other threads would potentially
-                        // acquire it otherwise.
-                        _dynamicCacheTagHelperService.Workers.TryRemove(CacheId, out _);
-
-                        // Notify all other awaiters to render the content
-                        tcs.TrySetResult(content);
+                        content = new HtmlString(value);
                     }
                 }
-                else
+                catch
                 {
-                    content = await result;
+                    content = null;
+                    throw;
                 }
-            }
+                finally
+                {
+                    // Remove the worker task before setting the result.
+                    // If the result is null, other threads would potentially
+                    // acquire it otherwise.
+                    _dynamicCacheTagHelperService.Workers.TryRemove(CacheId, out _);
 
-            return content;
+                    // Notify all other awaiters to render the content
+                    tcs.TrySetResult(content);
+                }
+            }
+            else
+            {
+                content = await result;
+            }
         }
+
+        return content;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.DynamicCache/TagHelpers/DynamicCacheTagHelperService.cs b/src/OrchardCore.Modules/OrchardCore.DynamicCache/TagHelpers/DynamicCacheTagHelperService.cs
index 6ee1e34a770..7a7d54088a7 100644
--- a/src/OrchardCore.Modules/OrchardCore.DynamicCache/TagHelpers/DynamicCacheTagHelperService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.DynamicCache/TagHelpers/DynamicCacheTagHelperService.cs
@@ -2,10 +2,9 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Html;
 
-namespace OrchardCore.DynamicCache.TagHelpers
+namespace OrchardCore.DynamicCache.TagHelpers;
+
+public class DynamicCacheTagHelperService
 {
-    public class DynamicCacheTagHelperService
-    {
-        public ConcurrentDictionary<string, Task<IHtmlContent>> Workers = new();
-    }
+    public ConcurrentDictionary<string, Task<IHtmlContent>> Workers = new();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Email.Azure/Models/DefaultAzureEmailOptions.cs b/src/OrchardCore.Modules/OrchardCore.Email.Azure/Models/DefaultAzureEmailOptions.cs
index 4af8b72853d..cb9755a63b0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Email.Azure/Models/DefaultAzureEmailOptions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Email.Azure/Models/DefaultAzureEmailOptions.cs
@@ -1,4 +1,4 @@
-namespace OrchardCore.Email.Azure.Models;
+namespace OrchardCore.Email.Azure.Models;
 
 public class DefaultAzureEmailOptions : AzureEmailOptions
 {
diff --git a/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs
index d5d586aee02..884b7ad8ef6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs
@@ -6,51 +6,50 @@
 using OrchardCore.Mvc.Core.Utilities;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Email
+namespace OrchardCore.Email;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", EmailSettings.GroupId },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", EmailSettings.GroupId },
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
-        {
-            S = localizer;
-        }
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["Settings"], settings => settings
-                       .Add(S["Email"], S["Email"].PrefixPosition(), entry => entry
-                          .AddClass("email")
-                          .Id("email")
-                          .Action("Index", "Admin", _routeValues)
-                          .Permission(Permissions.ManageEmailSettings)
-                          .LocalNav()
-                        )
-                       .Add(S["Email Test"], S["Email Test"].PrefixPosition(), entry => entry
-                          .AddClass("emailtest")
-                          .Id("emailtest")
-                          .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Email")
-                          .Permission(Permissions.ManageEmailSettings)
-                          .LocalNav()
-                        )
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["Settings"], settings => settings
+                   .Add(S["Email"], S["Email"].PrefixPosition(), entry => entry
+                      .AddClass("email")
+                      .Id("email")
+                      .Action("Index", "Admin", _routeValues)
+                      .Permission(Permissions.ManageEmailSettings)
+                      .LocalNav()
                     )
-                );
+                   .Add(S["Email Test"], S["Email Test"].PrefixPosition(), entry => entry
+                      .AddClass("emailtest")
+                      .Id("emailtest")
+                      .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Email")
+                      .Permission(Permissions.ManageEmailSettings)
+                      .LocalNav()
+                    )
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Email/Extensions/OrchardCoreBuilderExtensions.cs b/src/OrchardCore.Modules/OrchardCore.Email/Extensions/OrchardCoreBuilderExtensions.cs
index de377fc803e..0d57aaedfe6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Email/Extensions/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Email/Extensions/OrchardCoreBuilderExtensions.cs
@@ -3,26 +3,25 @@
 using OrchardCore.Email;
 using OrchardCore.Environment.Shell.Configuration;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class OrchardCoreBuilderExtensions
 {
-    public static class OrchardCoreBuilderExtensions
+    [Obsolete("This extension is now obsolete and will be removed in the next release. You can safely stop using it, but please keep providing valid settings in the configuration provider for continued functionality.")]
+    public static OrchardCoreBuilder ConfigureEmailSettings(this OrchardCoreBuilder builder)
     {
-        [Obsolete("This extension is now obsolete and will be removed in the next release. You can safely stop using it, but please keep providing valid settings in the configuration provider for continued functionality.")]
-        public static OrchardCoreBuilder ConfigureEmailSettings(this OrchardCoreBuilder builder)
+        builder.ConfigureServices((tenantServices, serviceProvider) =>
         {
-            builder.ConfigureServices((tenantServices, serviceProvider) =>
-            {
-                var configurationSection = serviceProvider.GetRequiredService<IShellConfiguration>().GetSection("OrchardCore_Email");
+            var configurationSection = serviceProvider.GetRequiredService<IShellConfiguration>().GetSection("OrchardCore_Email");
 
-                tenantServices.Configure<DefaultSmtpOptions>(options =>
-                {
-                    configurationSection.Bind(options);
+            tenantServices.Configure<DefaultSmtpOptions>(options =>
+            {
+                configurationSection.Bind(options);
 
-                    options.IsEnabled = options.ConfigurationExists();
-                });
+                options.IsEnabled = options.ConfigurationExists();
             });
+        });
 
-            return builder;
-        }
+        return builder;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Email/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Email/Startup.cs
index da1cd6b47ac..38c059baafb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Email/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Email/Startup.cs
@@ -9,18 +9,17 @@
 using OrchardCore.Security.Permissions;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Email
+namespace OrchardCore.Email;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddEmailServices()
-                .AddScoped<IDisplayDriver<ISite>, EmailSettingsDisplayDriver>()
-                .AddScoped<IPermissionProvider, Permissions>()
-                .AddScoped<INavigationProvider, AdminMenu>();
+        services.AddEmailServices()
+            .AddScoped<IDisplayDriver<ISite>, EmailSettingsDisplayDriver>()
+            .AddScoped<IPermissionProvider, Permissions>()
+            .AddScoped<INavigationProvider, AdminMenu>();
 
-            services.AddDataMigration<EmailMigrations>();
-        }
+        services.AddDataMigration<EmailMigrations>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Email/ViewModels/EmailSettingsBaseViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Email/ViewModels/EmailSettingsBaseViewModel.cs
index a6d688d989d..cdb0f02dc77 100644
--- a/src/OrchardCore.Modules/OrchardCore.Email/ViewModels/EmailSettingsBaseViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Email/ViewModels/EmailSettingsBaseViewModel.cs
@@ -1,4 +1,4 @@
-namespace OrchardCore.Email.ViewModels;
+namespace OrchardCore.Email.ViewModels;
 
 public class EmailSettingsBaseViewModel
 {
diff --git a/src/OrchardCore.Modules/OrchardCore.Email/Workflows/Activities/EmailTask.cs b/src/OrchardCore.Modules/OrchardCore.Email/Workflows/Activities/EmailTask.cs
index 0bcdd816b06..25819777245 100644
--- a/src/OrchardCore.Modules/OrchardCore.Email/Workflows/Activities/EmailTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Email/Workflows/Activities/EmailTask.cs
@@ -7,131 +7,130 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Email.Workflows.Activities
+namespace OrchardCore.Email.Workflows.Activities;
+
+public class EmailTask : TaskActivity<EmailTask>
 {
-    public class EmailTask : TaskActivity<EmailTask>
+    private readonly IEmailService _emailService;
+    private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
+    protected readonly IStringLocalizer S;
+    private readonly HtmlEncoder _htmlEncoder;
+
+    public EmailTask(
+        IEmailService emailService,
+        IWorkflowExpressionEvaluator expressionEvaluator,
+        IStringLocalizer<EmailTask> localizer,
+        HtmlEncoder htmlEncoder
+    )
     {
-        private readonly IEmailService _emailService;
-        private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
-        protected readonly IStringLocalizer S;
-        private readonly HtmlEncoder _htmlEncoder;
-
-        public EmailTask(
-            IEmailService emailService,
-            IWorkflowExpressionEvaluator expressionEvaluator,
-            IStringLocalizer<EmailTask> localizer,
-            HtmlEncoder htmlEncoder
-        )
-        {
-            _emailService = emailService;
-            _expressionEvaluator = expressionEvaluator;
-            S = localizer;
-            _htmlEncoder = htmlEncoder;
-        }
+        _emailService = emailService;
+        _expressionEvaluator = expressionEvaluator;
+        S = localizer;
+        _htmlEncoder = htmlEncoder;
+    }
 
-        public override LocalizedString DisplayText => S["Email Task"];
+    public override LocalizedString DisplayText => S["Email Task"];
 
-        public override LocalizedString Category => S["Messaging"];
+    public override LocalizedString Category => S["Messaging"];
 
-        public WorkflowExpression<string> Author
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
+    public WorkflowExpression<string> Author
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        public WorkflowExpression<string> Sender
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
+    public WorkflowExpression<string> Sender
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        public WorkflowExpression<string> ReplyTo
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
+    public WorkflowExpression<string> ReplyTo
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        // TODO: Add support for the following format: Jack Bauer<jack@ctu.com>, ...
-        public WorkflowExpression<string> Recipients
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
+    // TODO: Add support for the following format: Jack Bauer<jack@ctu.com>, ...
+    public WorkflowExpression<string> Recipients
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        public WorkflowExpression<string> Cc
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
+    public WorkflowExpression<string> Cc
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        public WorkflowExpression<string> Bcc
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
+    public WorkflowExpression<string> Bcc
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        public WorkflowExpression<string> Subject
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
+    public WorkflowExpression<string> Subject
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        public WorkflowExpression<string> Body
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
+    public WorkflowExpression<string> Body
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        public bool IsHtmlBody
-        {
-            get => GetProperty(() => true);
-            set => SetProperty(value);
-        }
+    public bool IsHtmlBody
+    {
+        get => GetProperty(() => true);
+        set => SetProperty(value);
+    }
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"], S["Failed"]);
+    }
+
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var author = await _expressionEvaluator.EvaluateAsync(Author, workflowContext, null);
+        var sender = await _expressionEvaluator.EvaluateAsync(Sender, workflowContext, null);
+        var replyTo = await _expressionEvaluator.EvaluateAsync(ReplyTo, workflowContext, null);
+        var recipients = await _expressionEvaluator.EvaluateAsync(Recipients, workflowContext, null);
+        var cc = await _expressionEvaluator.EvaluateAsync(Cc, workflowContext, null);
+        var bcc = await _expressionEvaluator.EvaluateAsync(Bcc, workflowContext, null);
+        var subject = await _expressionEvaluator.EvaluateAsync(Subject, workflowContext, null);
+        var body = await _expressionEvaluator.EvaluateAsync(Body, workflowContext, IsHtmlBody ? _htmlEncoder : null);
+
+        var message = new MailMessage
+        {
+            // Author and Sender are both not required fields.
+            From = author?.Trim() ?? sender?.Trim(),
+            To = recipients?.Trim(),
+            Cc = cc?.Trim(),
+            Bcc = bcc?.Trim(),
+            // Email reply-to header https://tools.ietf.org/html/rfc4021#section-2.1.4
+            ReplyTo = replyTo?.Trim(),
+            Subject = subject?.Trim(),
+            Body = body?.Trim(),
+            IsHtmlBody = IsHtmlBody
+        };
+
+        if (!string.IsNullOrWhiteSpace(sender))
         {
-            return Outcomes(S["Done"], S["Failed"]);
+            message.Sender = sender.Trim();
         }
 
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        var result = await _emailService.SendAsync(message);
+        workflowContext.LastResult = result;
+
+        if (!result.Succeeded)
         {
-            var author = await _expressionEvaluator.EvaluateAsync(Author, workflowContext, null);
-            var sender = await _expressionEvaluator.EvaluateAsync(Sender, workflowContext, null);
-            var replyTo = await _expressionEvaluator.EvaluateAsync(ReplyTo, workflowContext, null);
-            var recipients = await _expressionEvaluator.EvaluateAsync(Recipients, workflowContext, null);
-            var cc = await _expressionEvaluator.EvaluateAsync(Cc, workflowContext, null);
-            var bcc = await _expressionEvaluator.EvaluateAsync(Bcc, workflowContext, null);
-            var subject = await _expressionEvaluator.EvaluateAsync(Subject, workflowContext, null);
-            var body = await _expressionEvaluator.EvaluateAsync(Body, workflowContext, IsHtmlBody ? _htmlEncoder : null);
-
-            var message = new MailMessage
-            {
-                // Author and Sender are both not required fields.
-                From = author?.Trim() ?? sender?.Trim(),
-                To = recipients?.Trim(),
-                Cc = cc?.Trim(),
-                Bcc = bcc?.Trim(),
-                // Email reply-to header https://tools.ietf.org/html/rfc4021#section-2.1.4
-                ReplyTo = replyTo?.Trim(),
-                Subject = subject?.Trim(),
-                Body = body?.Trim(),
-                IsHtmlBody = IsHtmlBody
-            };
-
-            if (!string.IsNullOrWhiteSpace(sender))
-            {
-                message.Sender = sender.Trim();
-            }
-
-            var result = await _emailService.SendAsync(message);
-            workflowContext.LastResult = result;
-
-            if (!result.Succeeded)
-            {
-                return Outcomes("Failed");
-            }
-
-            return Outcomes("Done");
+            return Outcomes("Failed");
         }
+
+        return Outcomes("Done");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Email/Workflows/Drivers/EmailTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Email/Workflows/Drivers/EmailTaskDisplayDriver.cs
index 1fcd992fcb5..a726c3bcc8d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Email/Workflows/Drivers/EmailTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Email/Workflows/Drivers/EmailTaskDisplayDriver.cs
@@ -3,34 +3,33 @@
 using OrchardCore.Workflows.Display;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Email.Workflows.Drivers
+namespace OrchardCore.Email.Workflows.Drivers;
+
+public sealed class EmailTaskDisplayDriver : ActivityDisplayDriver<EmailTask, EmailTaskViewModel>
 {
-    public sealed class EmailTaskDisplayDriver : ActivityDisplayDriver<EmailTask, EmailTaskViewModel>
+    protected override void EditActivity(EmailTask activity, EmailTaskViewModel model)
     {
-        protected override void EditActivity(EmailTask activity, EmailTaskViewModel model)
-        {
-            model.SenderExpression = activity.Sender.Expression;
-            model.AuthorExpression = activity.Author.Expression;
-            model.RecipientsExpression = activity.Recipients.Expression;
-            model.ReplyToExpression = activity.ReplyTo.Expression;
-            model.SubjectExpression = activity.Subject.Expression;
-            model.Body = activity.Body.Expression;
-            model.IsHtmlBody = activity.IsHtmlBody;
-            model.BccExpression = activity.Bcc.Expression;
-            model.CcExpression = activity.Cc.Expression;
-        }
+        model.SenderExpression = activity.Sender.Expression;
+        model.AuthorExpression = activity.Author.Expression;
+        model.RecipientsExpression = activity.Recipients.Expression;
+        model.ReplyToExpression = activity.ReplyTo.Expression;
+        model.SubjectExpression = activity.Subject.Expression;
+        model.Body = activity.Body.Expression;
+        model.IsHtmlBody = activity.IsHtmlBody;
+        model.BccExpression = activity.Bcc.Expression;
+        model.CcExpression = activity.Cc.Expression;
+    }
 
-        protected override void UpdateActivity(EmailTaskViewModel model, EmailTask activity)
-        {
-            activity.Sender = new WorkflowExpression<string>(model.SenderExpression);
-            activity.Author = new WorkflowExpression<string>(model.AuthorExpression);
-            activity.Recipients = new WorkflowExpression<string>(model.RecipientsExpression);
-            activity.ReplyTo = new WorkflowExpression<string>(model.ReplyToExpression);
-            activity.Subject = new WorkflowExpression<string>(model.SubjectExpression);
-            activity.Body = new WorkflowExpression<string>(model.Body);
-            activity.IsHtmlBody = model.IsHtmlBody;
-            activity.Bcc = new WorkflowExpression<string>(model.BccExpression);
-            activity.Cc = new WorkflowExpression<string>(model.CcExpression);
-        }
+    protected override void UpdateActivity(EmailTaskViewModel model, EmailTask activity)
+    {
+        activity.Sender = new WorkflowExpression<string>(model.SenderExpression);
+        activity.Author = new WorkflowExpression<string>(model.AuthorExpression);
+        activity.Recipients = new WorkflowExpression<string>(model.RecipientsExpression);
+        activity.ReplyTo = new WorkflowExpression<string>(model.ReplyToExpression);
+        activity.Subject = new WorkflowExpression<string>(model.SubjectExpression);
+        activity.Body = new WorkflowExpression<string>(model.Body);
+        activity.IsHtmlBody = model.IsHtmlBody;
+        activity.Bcc = new WorkflowExpression<string>(model.BccExpression);
+        activity.Cc = new WorkflowExpression<string>(model.CcExpression);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Email/Workflows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Email/Workflows/Startup.cs
index 286102aa921..600298fc90f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Email/Workflows/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Email/Workflows/Startup.cs
@@ -4,14 +4,13 @@
 using OrchardCore.Modules;
 using OrchardCore.Workflows.Helpers;
 
-namespace OrchardCore.Email.Workflows
+namespace OrchardCore.Email.Workflows;
+
+[RequireFeatures("OrchardCore.Workflows")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Workflows")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddActivity<EmailTask, EmailTaskDisplayDriver>();
-        }
+        services.AddActivity<EmailTask, EmailTaskDisplayDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Email/Workflows/ViewModels/EmailTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Email/Workflows/ViewModels/EmailTaskViewModel.cs
index 1b4adf4bb4e..f6dab9bb6f4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Email/Workflows/ViewModels/EmailTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Email/Workflows/ViewModels/EmailTaskViewModel.cs
@@ -1,23 +1,22 @@
-namespace OrchardCore.Email.Workflows.ViewModels
+namespace OrchardCore.Email.Workflows.ViewModels;
+
+public class EmailTaskViewModel
 {
-    public class EmailTaskViewModel
-    {
-        public string AuthorExpression { get; set; }
+    public string AuthorExpression { get; set; }
 
-        public string SenderExpression { get; set; }
+    public string SenderExpression { get; set; }
 
-        public string ReplyToExpression { get; set; }
+    public string ReplyToExpression { get; set; }
 
-        public string CcExpression { get; set; }
+    public string CcExpression { get; set; }
 
-        public string BccExpression { get; set; }
+    public string BccExpression { get; set; }
 
-        public string RecipientsExpression { get; set; }
+    public string RecipientsExpression { get; set; }
 
-        public string SubjectExpression { get; set; }
+    public string SubjectExpression { get; set; }
 
-        public string Body { get; set; }
+    public string Body { get; set; }
 
-        public bool IsHtmlBody { get; set; }
-    }
+    public bool IsHtmlBody { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Deployment/FacebookLoginDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Deployment/FacebookLoginDeploymentSource.cs
index 31ee2c126f2..8b470e441d0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Deployment/FacebookLoginDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Deployment/FacebookLoginDeploymentSource.cs
@@ -3,35 +3,34 @@
 using OrchardCore.Deployment;
 using OrchardCore.Facebook.Services;
 
-namespace OrchardCore.Facebook.Deployment
+namespace OrchardCore.Facebook.Deployment;
+
+public class FacebookLoginDeploymentSource : IDeploymentSource
 {
-    public class FacebookLoginDeploymentSource : IDeploymentSource
+    private readonly IFacebookService _facebookService;
+
+    public FacebookLoginDeploymentSource(IFacebookService facebookService)
     {
-        private readonly IFacebookService _facebookService;
+        _facebookService = facebookService;
+    }
 
-        public FacebookLoginDeploymentSource(IFacebookService facebookService)
-        {
-            _facebookService = facebookService;
-        }
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        var facebookLoginStep = step as FacebookLoginDeploymentStep;
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        if (facebookLoginStep == null)
         {
-            var facebookLoginStep = step as FacebookLoginDeploymentStep;
-
-            if (facebookLoginStep == null)
-            {
-                return;
-            }
+            return;
+        }
 
-            var settings = await _facebookService.GetSettingsAsync();
+        var settings = await _facebookService.GetSettingsAsync();
 
-            // The 'name' property should match the related recipe step name.
-            var jObject = new JsonObject { ["name"] = "FacebookCoreSettings" };
+        // The 'name' property should match the related recipe step name.
+        var jObject = new JsonObject { ["name"] = "FacebookCoreSettings" };
 
-            // Merge settings as the recipe step doesn't use a child property.
-            jObject.Merge(JObject.FromObject(settings));
+        // Merge settings as the recipe step doesn't use a child property.
+        jObject.Merge(JObject.FromObject(settings));
 
-            result.Steps.Add(jObject);
-        }
+        result.Steps.Add(jObject);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Deployment/FacebookLoginDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Deployment/FacebookLoginDeploymentStep.cs
index 8e5a29783d3..3ff6e42d76c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Deployment/FacebookLoginDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Deployment/FacebookLoginDeploymentStep.cs
@@ -1,15 +1,14 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Facebook.Deployment
+namespace OrchardCore.Facebook.Deployment;
+
+/// <summary>
+/// Adds Facebook Login settings to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class FacebookLoginDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds Facebook Login settings to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class FacebookLoginDeploymentStep : DeploymentStep
+    public FacebookLoginDeploymentStep()
     {
-        public FacebookLoginDeploymentStep()
-        {
-            Name = "Facebook Login";
-        }
+        Name = "Facebook Login";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Deployment/FacebookLoginDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Deployment/FacebookLoginDeploymentStepDriver.cs
index 491973c907e..7569a70e257 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Deployment/FacebookLoginDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Deployment/FacebookLoginDeploymentStepDriver.cs
@@ -3,22 +3,21 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Facebook.Deployment
+namespace OrchardCore.Facebook.Deployment;
+
+public sealed class FacebookLoginDeploymentStepDriver : DisplayDriver<DeploymentStep, FacebookLoginDeploymentStep>
 {
-    public sealed class FacebookLoginDeploymentStepDriver : DisplayDriver<DeploymentStep, FacebookLoginDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(FacebookLoginDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(FacebookLoginDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("FacebookLoginDeploymentStep_Summary", step).Location("Summary", "Content"),
-                    View("FacebookLoginDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("FacebookLoginDeploymentStep_Summary", step).Location("Summary", "Content"),
+                View("FacebookLoginDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(FacebookLoginDeploymentStep step, BuildEditorContext context)
-        {
-            return View("FacebookLoginDeploymentStep_Edit", step).Location("Content");
-        }
+    public override IDisplayResult Edit(FacebookLoginDeploymentStep step, BuildEditorContext context)
+    {
+        return View("FacebookLoginDeploymentStep_Edit", step).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Drivers/FacebookSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Drivers/FacebookSettingsDisplayDriver.cs
index b0d36f818b1..0b5f0ef6331 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Drivers/FacebookSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Drivers/FacebookSettingsDisplayDriver.cs
@@ -12,99 +12,98 @@
 using OrchardCore.Facebook.ViewModels;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Facebook.Drivers
+namespace OrchardCore.Facebook.Drivers;
+
+public sealed class FacebookSettingsDisplayDriver : SiteDisplayDriver<FacebookSettings>
 {
-    public sealed class FacebookSettingsDisplayDriver : SiteDisplayDriver<FacebookSettings>
+    private readonly IShellReleaseManager _shellReleaseManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IDataProtectionProvider _dataProtectionProvider;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly ILogger _logger;
+
+    public FacebookSettingsDisplayDriver(
+        IShellReleaseManager shellReleaseManager,
+        IAuthorizationService authorizationService,
+        IDataProtectionProvider dataProtectionProvider,
+        IHttpContextAccessor httpContextAccessor,
+        ILogger<FacebookSettingsDisplayDriver> logger
+        )
     {
-        private readonly IShellReleaseManager _shellReleaseManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IDataProtectionProvider _dataProtectionProvider;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly ILogger _logger;
+        _shellReleaseManager = shellReleaseManager;
+        _authorizationService = authorizationService;
+        _dataProtectionProvider = dataProtectionProvider;
+        _httpContextAccessor = httpContextAccessor;
+        _logger = logger;
+    }
+
+    protected override string SettingsGroupId
+        => FacebookConstants.Features.Core;
 
-        public FacebookSettingsDisplayDriver(
-            IShellReleaseManager shellReleaseManager,
-            IAuthorizationService authorizationService,
-            IDataProtectionProvider dataProtectionProvider,
-            IHttpContextAccessor httpContextAccessor,
-            ILogger<FacebookSettingsDisplayDriver> logger
-            )
+    public override async Task<IDisplayResult> EditAsync(ISite site, FacebookSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageFacebookApp))
         {
-            _shellReleaseManager = shellReleaseManager;
-            _authorizationService = authorizationService;
-            _dataProtectionProvider = dataProtectionProvider;
-            _httpContextAccessor = httpContextAccessor;
-            _logger = logger;
+            return null;
         }
 
-        protected override string SettingsGroupId
-            => FacebookConstants.Features.Core;
-
-        public override async Task<IDisplayResult> EditAsync(ISite site, FacebookSettings settings, BuildEditorContext context)
+        return Initialize<FacebookSettingsViewModel>("FacebookSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageFacebookApp))
-            {
-                return null;
-            }
+            var protector = _dataProtectionProvider.CreateProtector(FacebookConstants.Features.Core);
 
-            return Initialize<FacebookSettingsViewModel>("FacebookSettings_Edit", model =>
+            model.AppId = settings.AppId;
+            model.FBInit = settings.FBInit;
+            model.FBInitParams = settings.FBInitParams;
+            model.Version = settings.Version;
+            model.SdkJs = settings.SdkJs;
+            if (!string.IsNullOrWhiteSpace(settings.AppSecret))
             {
-                var protector = _dataProtectionProvider.CreateProtector(FacebookConstants.Features.Core);
-
-                model.AppId = settings.AppId;
-                model.FBInit = settings.FBInit;
-                model.FBInitParams = settings.FBInitParams;
-                model.Version = settings.Version;
-                model.SdkJs = settings.SdkJs;
-                if (!string.IsNullOrWhiteSpace(settings.AppSecret))
+                try
                 {
-                    try
-                    {
-                        model.AppSecret = protector.Unprotect(settings.AppSecret);
-                    }
-                    catch (CryptographicException)
-                    {
-                        _logger.LogError("The app secret could not be decrypted. It may have been encrypted using a different key.");
-                        model.AppSecret = string.Empty;
-                        model.HasDecryptionError = true;
-                    }
+                    model.AppSecret = protector.Unprotect(settings.AppSecret);
+                }
+                catch (CryptographicException)
+                {
+                    _logger.LogError("The app secret could not be decrypted. It may have been encrypted using a different key.");
+                    model.AppSecret = string.Empty;
+                    model.HasDecryptionError = true;
                 }
-            }).Location("Content:0")
-            .OnGroup(SettingsGroupId);
-        }
-
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, FacebookSettings settings, UpdateEditorContext context)
-        {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageFacebookApp))
-            {
-                return null;
             }
+        }).Location("Content:0")
+        .OnGroup(SettingsGroupId);
+    }
 
-            var model = new FacebookSettingsViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, FacebookSettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-            settings.AppId = model.AppId;
-            settings.FBInit = model.FBInit;
-            settings.SdkJs = model.SdkJs;
-            settings.Version = model.Version;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageFacebookApp))
+        {
+            return null;
+        }
 
-            if (!string.IsNullOrWhiteSpace(model.FBInitParams))
-            {
-                settings.FBInitParams = model.FBInitParams;
-            }
+        var model = new FacebookSettingsViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            if (context.Updater.ModelState.IsValid)
-            {
-                var protector = _dataProtectionProvider.CreateProtector(FacebookConstants.Features.Core);
-                settings.AppSecret = protector.Protect(model.AppSecret);
-            }
+        settings.AppId = model.AppId;
+        settings.FBInit = model.FBInit;
+        settings.SdkJs = model.SdkJs;
+        settings.Version = model.Version;
 
-            _shellReleaseManager.RequestRelease();
+        if (!string.IsNullOrWhiteSpace(model.FBInitParams))
+        {
+            settings.FBInitParams = model.FBInitParams;
+        }
 
-            return await EditAsync(site, settings, context);
+        if (context.Updater.ModelState.IsValid)
+        {
+            var protector = _dataProtectionProvider.CreateProtector(FacebookConstants.Features.Core);
+            settings.AppSecret = protector.Protect(model.AppSecret);
         }
+
+        _shellReleaseManager.RequestRelease();
+
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Extensions/OrchardCoreBuilderExtensions.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Extensions/OrchardCoreBuilderExtensions.cs
index dab0ce5413a..4c11e287e4c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Extensions/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Extensions/OrchardCoreBuilderExtensions.cs
@@ -2,20 +2,19 @@
 using OrchardCore.Environment.Shell.Configuration;
 using OrchardCore.Facebook.Settings;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class OrchardCoreBuilderExtensions
 {
-    public static class OrchardCoreBuilderExtensions
+    public static OrchardCoreBuilder ConfigureFacebookSettings(this OrchardCoreBuilder builder)
     {
-        public static OrchardCoreBuilder ConfigureFacebookSettings(this OrchardCoreBuilder builder)
+        builder.ConfigureServices((tenantServices, serviceProvider) =>
         {
-            builder.ConfigureServices((tenantServices, serviceProvider) =>
-            {
-                var configurationSection = serviceProvider.GetRequiredService<IShellConfiguration>().GetSection("OrchardCore_Facebook");
+            var configurationSection = serviceProvider.GetRequiredService<IShellConfiguration>().GetSection("OrchardCore_Facebook");
 
-                tenantServices.PostConfigure<FacebookSettings>(settings => configurationSection.Bind(settings));
-            });
+            tenantServices.PostConfigure<FacebookSettings>(settings => configurationSection.Bind(settings));
+        });
 
-            return builder;
-        }
+        return builder;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Filters/FBInitFilter.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Filters/FBInitFilter.cs
index 1bd37200406..a1ca8818b92 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Filters/FBInitFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Filters/FBInitFilter.cs
@@ -5,38 +5,37 @@
 using OrchardCore.ResourceManagement;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Facebook.Filters
+namespace OrchardCore.Facebook.Filters;
+
+public sealed class FBInitFilter : IAsyncResultFilter
 {
-    public sealed class FBInitFilter : IAsyncResultFilter
-    {
-        private readonly IResourceManager _resourceManager;
-        private readonly ISiteService _siteService;
+    private readonly IResourceManager _resourceManager;
+    private readonly ISiteService _siteService;
 
-        public FBInitFilter(
-            IResourceManager resourceManager,
-            ISiteService siteService)
-        {
-            _resourceManager = resourceManager;
-            _siteService = siteService;
-        }
+    public FBInitFilter(
+        IResourceManager resourceManager,
+        ISiteService siteService)
+    {
+        _resourceManager = resourceManager;
+        _siteService = siteService;
+    }
 
-        public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
+    public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
+    {
+        // Should only run on the front-end for a full view
+        if (context.IsViewOrPageResult() && !AdminAttribute.IsApplied(context.HttpContext))
         {
-            // Should only run on the front-end for a full view
-            if (context.IsViewOrPageResult() && !AdminAttribute.IsApplied(context.HttpContext))
+            var site = (await _siteService.GetSiteSettingsAsync());
+            var settings = site.As<FacebookSettings>();
+            if (!string.IsNullOrWhiteSpace(settings?.AppId))
             {
-                var site = (await _siteService.GetSiteSettingsAsync());
-                var settings = site.As<FacebookSettings>();
-                if (!string.IsNullOrWhiteSpace(settings?.AppId))
+                if (settings.FBInit)
                 {
-                    if (settings.FBInit)
-                    {
-                        var setting = _resourceManager.RegisterResource("script", "fb");
-                        setting.AtLocation(ResourceLocation.Foot);
-                    }
+                    var setting = _resourceManager.RegisterResource("script", "fb");
+                    setting.AtLocation(ResourceLocation.Foot);
                 }
             }
-            await next.Invoke();
         }
+        await next.Invoke();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Configuration/FacebookLoginConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Configuration/FacebookLoginConfiguration.cs
index b70d3048814..ee284e7f208 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Configuration/FacebookLoginConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Configuration/FacebookLoginConfiguration.cs
@@ -12,108 +12,107 @@
 using OrchardCore.Facebook.Login.Settings;
 using OrchardCore.Facebook.Settings;
 
-namespace OrchardCore.Facebook.Login.Configuration
+namespace OrchardCore.Facebook.Login.Configuration;
+
+public class FacebookLoginConfiguration :
+    IConfigureOptions<AuthenticationOptions>,
+    IConfigureNamedOptions<FacebookOptions>
 {
-    public class FacebookLoginConfiguration :
-        IConfigureOptions<AuthenticationOptions>,
-        IConfigureNamedOptions<FacebookOptions>
+    private readonly FacebookSettings _facebookSettings;
+    private readonly IFacebookLoginService _loginService;
+    private readonly IDataProtectionProvider _dataProtectionProvider;
+    private readonly ILogger _logger;
+
+    public FacebookLoginConfiguration(
+        IOptions<FacebookSettings> facebookSettings,
+        IFacebookLoginService loginService,
+        IDataProtectionProvider dataProtectionProvider,
+        ILogger<FacebookLoginConfiguration> logger)
+    {
+        _facebookSettings = facebookSettings.Value;
+        _loginService = loginService;
+        _dataProtectionProvider = dataProtectionProvider;
+        _logger = logger;
+    }
+
+    public void Configure(AuthenticationOptions options)
+    {
+        if (_facebookSettings == null)
+        {
+            return;
+        }
+
+        if (string.IsNullOrWhiteSpace(_facebookSettings.AppId) || string.IsNullOrWhiteSpace(_facebookSettings.AppSecret))
+        {
+            _logger.LogWarning("The Facebook login provider is enabled but not configured.");
+
+            return;
+        }
+
+        var loginSettings = GetFacebookLoginSettingsAsync().GetAwaiter().GetResult();
+        if (loginSettings == null)
+        {
+            return;
+        }
+
+        // Register the OpenID Connect client handler in the authentication handlers collection.
+        options.AddScheme(FacebookDefaults.AuthenticationScheme, builder =>
+        {
+            builder.DisplayName = "Facebook";
+            builder.HandlerType = typeof(FacebookHandler);
+        });
+    }
+
+    public void Configure(string name, FacebookOptions options)
     {
-        private readonly FacebookSettings _facebookSettings;
-        private readonly IFacebookLoginService _loginService;
-        private readonly IDataProtectionProvider _dataProtectionProvider;
-        private readonly ILogger _logger;
-
-        public FacebookLoginConfiguration(
-            IOptions<FacebookSettings> facebookSettings,
-            IFacebookLoginService loginService,
-            IDataProtectionProvider dataProtectionProvider,
-            ILogger<FacebookLoginConfiguration> logger)
+        // Ignore OpenID Connect client handler instances that don't correspond to the instance managed by the OpenID module.
+        if (!string.Equals(name, FacebookDefaults.AuthenticationScheme, StringComparison.Ordinal))
         {
-            _facebookSettings = facebookSettings.Value;
-            _loginService = loginService;
-            _dataProtectionProvider = dataProtectionProvider;
-            _logger = logger;
+            return;
         }
 
-        public void Configure(AuthenticationOptions options)
+        if (_facebookSettings == null)
         {
-            if (_facebookSettings == null)
-            {
-                return;
-            }
-
-            if (string.IsNullOrWhiteSpace(_facebookSettings.AppId) || string.IsNullOrWhiteSpace(_facebookSettings.AppSecret))
-            {
-                _logger.LogWarning("The Facebook login provider is enabled but not configured.");
-
-                return;
-            }
-
-            var loginSettings = GetFacebookLoginSettingsAsync().GetAwaiter().GetResult();
-            if (loginSettings == null)
-            {
-                return;
-            }
-
-            // Register the OpenID Connect client handler in the authentication handlers collection.
-            options.AddScheme(FacebookDefaults.AuthenticationScheme, builder =>
-            {
-                builder.DisplayName = "Facebook";
-                builder.HandlerType = typeof(FacebookHandler);
-            });
+            return;
         }
 
-        public void Configure(string name, FacebookOptions options)
+        var loginSettings = GetFacebookLoginSettingsAsync().GetAwaiter().GetResult();
+        if (loginSettings == null)
         {
-            // Ignore OpenID Connect client handler instances that don't correspond to the instance managed by the OpenID module.
-            if (!string.Equals(name, FacebookDefaults.AuthenticationScheme, StringComparison.Ordinal))
-            {
-                return;
-            }
-
-            if (_facebookSettings == null)
-            {
-                return;
-            }
-
-            var loginSettings = GetFacebookLoginSettingsAsync().GetAwaiter().GetResult();
-            if (loginSettings == null)
-            {
-                return;
-            }
-
-            options.AppId = _facebookSettings.AppId;
-
-            try
-            {
-                options.AppSecret = _dataProtectionProvider.CreateProtector(FacebookConstants.Features.Core).Unprotect(_facebookSettings.AppSecret);
-            }
-            catch
-            {
-                _logger.LogError("The Facebook secret key could not be decrypted. It may have been encrypted using a different key.");
-            }
-
-            if (loginSettings.CallbackPath.HasValue)
-            {
-                options.CallbackPath = loginSettings.CallbackPath;
-            }
-
-            options.SaveTokens = loginSettings.SaveTokens;
+            return;
         }
 
-        public void Configure(FacebookOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
+        options.AppId = _facebookSettings.AppId;
 
-        private async Task<FacebookLoginSettings> GetFacebookLoginSettingsAsync()
+        try
+        {
+            options.AppSecret = _dataProtectionProvider.CreateProtector(FacebookConstants.Features.Core).Unprotect(_facebookSettings.AppSecret);
+        }
+        catch
         {
-            var settings = await _loginService.GetSettingsAsync();
-            if ((await _loginService.ValidateSettingsAsync(settings)).Any(result => result != ValidationResult.Success))
-            {
-                _logger.LogWarning("The Facebook Login module is not correctly configured.");
+            _logger.LogError("The Facebook secret key could not be decrypted. It may have been encrypted using a different key.");
+        }
 
-                return null;
-            }
+        if (loginSettings.CallbackPath.HasValue)
+        {
+            options.CallbackPath = loginSettings.CallbackPath;
+        }
 
-            return settings;
+        options.SaveTokens = loginSettings.SaveTokens;
+    }
+
+    public void Configure(FacebookOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
+
+    private async Task<FacebookLoginSettings> GetFacebookLoginSettingsAsync()
+    {
+        var settings = await _loginService.GetSettingsAsync();
+        if ((await _loginService.ValidateSettingsAsync(settings)).Any(result => result != ValidationResult.Success))
+        {
+            _logger.LogWarning("The Facebook Login module is not correctly configured.");
+
+            return null;
         }
+
+        return settings;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Drivers/FacebookLoginSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Drivers/FacebookLoginSettingsDisplayDriver.cs
index 840eed947fb..79414cb76b0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Drivers/FacebookLoginSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Drivers/FacebookLoginSettingsDisplayDriver.cs
@@ -9,60 +9,59 @@
 using OrchardCore.Facebook.Login.ViewModels;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Facebook.Login.Drivers
+namespace OrchardCore.Facebook.Login.Drivers;
+
+public sealed class FacebookLoginSettingsDisplayDriver : SiteDisplayDriver<FacebookLoginSettings>
 {
-    public sealed class FacebookLoginSettingsDisplayDriver : SiteDisplayDriver<FacebookLoginSettings>
+    private readonly IShellReleaseManager _shellReleaseManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+
+    public FacebookLoginSettingsDisplayDriver(
+        IShellReleaseManager shellReleaseManager,
+        IAuthorizationService authorizationService,
+        IHttpContextAccessor httpContextAccessor)
     {
-        private readonly IShellReleaseManager _shellReleaseManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
+        _shellReleaseManager = shellReleaseManager;
+        _authorizationService = authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+    }
+    protected override string SettingsGroupId
+        => FacebookConstants.Features.Login;
 
-        public FacebookLoginSettingsDisplayDriver(
-            IShellReleaseManager shellReleaseManager,
-            IAuthorizationService authorizationService,
-            IHttpContextAccessor httpContextAccessor)
+    public override async Task<IDisplayResult> EditAsync(ISite site, FacebookLoginSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageFacebookApp))
         {
-            _shellReleaseManager = shellReleaseManager;
-            _authorizationService = authorizationService;
-            _httpContextAccessor = httpContextAccessor;
+            return null;
         }
-        protected override string SettingsGroupId
-            => FacebookConstants.Features.Login;
 
-        public override async Task<IDisplayResult> EditAsync(ISite site, FacebookLoginSettings settings, BuildEditorContext context)
+        return Initialize<FacebookLoginSettingsViewModel>("FacebookLoginSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageFacebookApp))
-            {
-                return null;
-            }
-
-            return Initialize<FacebookLoginSettingsViewModel>("FacebookLoginSettings_Edit", model =>
-            {
-                model.CallbackPath = settings.CallbackPath.Value;
-                model.SaveTokens = settings.SaveTokens;
-            }).Location("Content:5")
-            .OnGroup(SettingsGroupId);
-        }
+            model.CallbackPath = settings.CallbackPath.Value;
+            model.SaveTokens = settings.SaveTokens;
+        }).Location("Content:5")
+        .OnGroup(SettingsGroupId);
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, FacebookLoginSettings settings, UpdateEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, FacebookLoginSettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageFacebookApp))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageFacebookApp))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var model = new FacebookLoginSettingsViewModel();
+        var model = new FacebookLoginSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            settings.CallbackPath = model.CallbackPath;
-            settings.SaveTokens = model.SaveTokens;
+        settings.CallbackPath = model.CallbackPath;
+        settings.SaveTokens = model.SaveTokens;
 
-            _shellReleaseManager.RequestRelease();
+        _shellReleaseManager.RequestRelease();
 
-            return await EditAsync(site, settings, context);
-        }
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Recipes/FacebookLoginSettingsStep.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Recipes/FacebookLoginSettingsStep.cs
index 7bdbdd6a5a3..733fb04b2c5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Recipes/FacebookLoginSettingsStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Recipes/FacebookLoginSettingsStep.cs
@@ -6,38 +6,37 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Facebook.Login.Recipes
+namespace OrchardCore.Facebook.Login.Recipes;
+
+/// <summary>
+/// This recipe step sets general Facebook Login settings.
+/// </summary>
+public sealed class FacebookLoginSettingsStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step sets general Facebook Login settings.
-    /// </summary>
-    public sealed class FacebookLoginSettingsStep : IRecipeStepHandler
+    private readonly IFacebookLoginService _loginService;
+
+    public FacebookLoginSettingsStep(IFacebookLoginService loginService)
     {
-        private readonly IFacebookLoginService _loginService;
+        _loginService = loginService;
+    }
 
-        public FacebookLoginSettingsStep(IFacebookLoginService loginService)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, nameof(FacebookLoginSettings), StringComparison.OrdinalIgnoreCase))
         {
-            _loginService = loginService;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, nameof(FacebookLoginSettings), StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            var model = context.Step.ToObject<FacebookLoginSettingsStepModel>();
-            var settings = await _loginService.LoadSettingsAsync();
+        var model = context.Step.ToObject<FacebookLoginSettingsStepModel>();
+        var settings = await _loginService.LoadSettingsAsync();
 
-            settings.CallbackPath = model.CallbackPath;
+        settings.CallbackPath = model.CallbackPath;
 
-            await _loginService.UpdateSettingsAsync(settings);
-        }
+        await _loginService.UpdateSettingsAsync(settings);
     }
+}
 
-    public sealed class FacebookLoginSettingsStepModel
-    {
-        public string CallbackPath { get; set; }
-    }
+public sealed class FacebookLoginSettingsStepModel
+{
+    public string CallbackPath { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Services/FacebookLoginService.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Services/FacebookLoginService.cs
index 19ae818b849..6f11da2ab35 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Services/FacebookLoginService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Services/FacebookLoginService.cs
@@ -8,41 +8,40 @@
 using OrchardCore.Facebook.Login.Settings;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Facebook.Login.Services
+namespace OrchardCore.Facebook.Login.Services;
+
+public class FacebookLoginService : IFacebookLoginService
 {
-    public class FacebookLoginService : IFacebookLoginService
+    private readonly ISiteService _siteService;
+
+    public FacebookLoginService(ISiteService siteService)
+    {
+        _siteService = siteService;
+    }
+
+    public Task<FacebookLoginSettings> GetSettingsAsync()
+        => _siteService.GetSettingsAsync<FacebookLoginSettings>();
+
+    public async Task<FacebookLoginSettings> LoadSettingsAsync()
+    {
+        var container = await _siteService.LoadSiteSettingsAsync();
+        return container.As<FacebookLoginSettings>();
+    }
+
+    public async Task UpdateSettingsAsync(FacebookLoginSettings settings)
     {
-        private readonly ISiteService _siteService;
-
-        public FacebookLoginService(ISiteService siteService)
-        {
-            _siteService = siteService;
-        }
-
-        public Task<FacebookLoginSettings> GetSettingsAsync()
-            => _siteService.GetSettingsAsync<FacebookLoginSettings>();
-
-        public async Task<FacebookLoginSettings> LoadSettingsAsync()
-        {
-            var container = await _siteService.LoadSiteSettingsAsync();
-            return container.As<FacebookLoginSettings>();
-        }
-
-        public async Task UpdateSettingsAsync(FacebookLoginSettings settings)
-        {
-            ArgumentNullException.ThrowIfNull(settings);
-
-            var container = await _siteService.LoadSiteSettingsAsync();
-            container.Properties[nameof(FacebookLoginSettings)] = JObject.FromObject(settings, JOptions.Default);
-            await _siteService.UpdateSiteSettingsAsync(container);
-        }
-
-        public Task<IEnumerable<ValidationResult>> ValidateSettingsAsync(FacebookLoginSettings settings)
-        {
-            ArgumentNullException.ThrowIfNull(settings);
-
-            var results = ImmutableArray.CreateBuilder<ValidationResult>();
-            return Task.FromResult<IEnumerable<ValidationResult>>(results);
-        }
+        ArgumentNullException.ThrowIfNull(settings);
+
+        var container = await _siteService.LoadSiteSettingsAsync();
+        container.Properties[nameof(FacebookLoginSettings)] = JObject.FromObject(settings, JOptions.Default);
+        await _siteService.UpdateSiteSettingsAsync(container);
+    }
+
+    public Task<IEnumerable<ValidationResult>> ValidateSettingsAsync(FacebookLoginSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
+
+        var results = ImmutableArray.CreateBuilder<ValidationResult>();
+        return Task.FromResult<IEnumerable<ValidationResult>>(results);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Services/IFacebookLoginService.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Services/IFacebookLoginService.cs
index 90cc2667336..822cdfb014a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Services/IFacebookLoginService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Services/IFacebookLoginService.cs
@@ -3,13 +3,12 @@
 using System.Threading.Tasks;
 using OrchardCore.Facebook.Login.Settings;
 
-namespace OrchardCore.Facebook.Login.Services
+namespace OrchardCore.Facebook.Login.Services;
+
+public interface IFacebookLoginService
 {
-    public interface IFacebookLoginService
-    {
-        Task<FacebookLoginSettings> GetSettingsAsync();
-        Task<FacebookLoginSettings> LoadSettingsAsync();
-        Task UpdateSettingsAsync(FacebookLoginSettings settings);
-        Task<IEnumerable<ValidationResult>> ValidateSettingsAsync(FacebookLoginSettings settings);
-    }
+    Task<FacebookLoginSettings> GetSettingsAsync();
+    Task<FacebookLoginSettings> LoadSettingsAsync();
+    Task UpdateSettingsAsync(FacebookLoginSettings settings);
+    Task<IEnumerable<ValidationResult>> ValidateSettingsAsync(FacebookLoginSettings settings);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Settings/FacebookLoginSettings.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Settings/FacebookLoginSettings.cs
index fa63c059d24..564f2d54369 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Settings/FacebookLoginSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Login/Settings/FacebookLoginSettings.cs
@@ -1,11 +1,10 @@
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Facebook.Login.Settings
+namespace OrchardCore.Facebook.Login.Settings;
+
+public class FacebookLoginSettings
 {
-    public class FacebookLoginSettings
-    {
-        public PathString CallbackPath { get; set; }
+    public PathString CallbackPath { get; set; }
 
-        public bool SaveTokens { get; set; }
-    }
+    public bool SaveTokens { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Login/ViewModels/FacebookLoginSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Login/ViewModels/FacebookLoginSettingsViewModel.cs
index ddee339501d..16a9645bc8e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Login/ViewModels/FacebookLoginSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Login/ViewModels/FacebookLoginSettingsViewModel.cs
@@ -1,12 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Facebook.Login.ViewModels
+namespace OrchardCore.Facebook.Login.ViewModels;
+
+public class FacebookLoginSettingsViewModel
 {
-    public class FacebookLoginSettingsViewModel
-    {
-        [RegularExpression(@"\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]", ErrorMessage = "Invalid path")]
-        public string CallbackPath { get; set; }
+    [RegularExpression(@"\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]", ErrorMessage = "Invalid path")]
+    public string CallbackPath { get; set; }
 
-        public bool SaveTokens { get; set; }
-    }
+    public bool SaveTokens { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Recipes/FacebookSettingsStep.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Recipes/FacebookSettingsStep.cs
index 53d5bf3eb8a..cd971562b31 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Recipes/FacebookSettingsStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Recipes/FacebookSettingsStep.cs
@@ -5,48 +5,47 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Facebook.Recipes
+namespace OrchardCore.Facebook.Recipes;
+
+/// <summary>
+/// This recipe step sets general Facebook Login settings.
+/// </summary>
+public sealed class FacebookSettingsStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step sets general Facebook Login settings.
-    /// </summary>
-    public sealed class FacebookSettingsStep : IRecipeStepHandler
+    private readonly IFacebookService _facebookService;
+
+    public FacebookSettingsStep(IFacebookService facebookService)
     {
-        private readonly IFacebookService _facebookService;
+        _facebookService = facebookService;
+    }
 
-        public FacebookSettingsStep(IFacebookService facebookService)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "FacebookCoreSettings", StringComparison.OrdinalIgnoreCase))
         {
-            _facebookService = facebookService;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, "FacebookCoreSettings", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            var model = context.Step.ToObject<FacebookCoreSettingsStepModel>();
-            var settings = await _facebookService.GetSettingsAsync();
-
-            settings.AppId = model.AppId;
-            settings.AppSecret = model.AppSecret;
-            settings.SdkJs = model.SdkJs ?? "sdk.js";
-            settings.FBInit = model.FBInit;
-            settings.FBInitParams = model.FBInitParams;
-            settings.Version = model.Version ?? "3.2";
-
-            await _facebookService.UpdateSettingsAsync(settings);
-        }
-    }
+        var model = context.Step.ToObject<FacebookCoreSettingsStepModel>();
+        var settings = await _facebookService.GetSettingsAsync();
 
-    public sealed class FacebookCoreSettingsStepModel
-    {
-        public string AppId { get; set; }
-        public string AppSecret { get; set; }
-        public string SdkJs { get; set; }
-        public bool FBInit { get; set; }
-        public string FBInitParams { get; set; }
-        public string Version { get; set; }
+        settings.AppId = model.AppId;
+        settings.AppSecret = model.AppSecret;
+        settings.SdkJs = model.SdkJs ?? "sdk.js";
+        settings.FBInit = model.FBInit;
+        settings.FBInitParams = model.FBInitParams;
+        settings.Version = model.Version ?? "3.2";
+
+        await _facebookService.UpdateSettingsAsync(settings);
     }
 }
+
+public sealed class FacebookCoreSettingsStepModel
+{
+    public string AppId { get; set; }
+    public string AppSecret { get; set; }
+    public string SdkJs { get; set; }
+    public bool FBInit { get; set; }
+    public string FBInitParams { get; set; }
+    public string Version { get; set; }
+}
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/ResourceManagementOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/ResourceManagementOptionsConfiguration.cs
index 38746d3cf71..beecba19c8d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/ResourceManagementOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/ResourceManagementOptionsConfiguration.cs
@@ -1,26 +1,25 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Facebook
-{
-    public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
-    {
-        private static readonly ResourceManifest _manifest;
+namespace OrchardCore.Facebook;
 
-        static ResourceManagementOptionsConfiguration()
-        {
-            _manifest = new ResourceManifest();
+public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
+{
+    private static readonly ResourceManifest _manifest;
 
-            _manifest
-                .DefineScript("fb")
-                .SetDependencies("fbsdk")
-                .SetUrl("~/OrchardCore.Facebook/sdk/fb.js");
+    static ResourceManagementOptionsConfiguration()
+    {
+        _manifest = new ResourceManifest();
 
-            _manifest
-                .DefineScript("fbsdk")
-                .SetUrl("~/OrchardCore.Facebook/sdk/fbsdk.js");
-        }
+        _manifest
+            .DefineScript("fb")
+            .SetDependencies("fbsdk")
+            .SetUrl("~/OrchardCore.Facebook/sdk/fb.js");
 
-        public void Configure(ResourceManagementOptions options) => options.ResourceManifests.Add(_manifest);
+        _manifest
+            .DefineScript("fbsdk")
+            .SetUrl("~/OrchardCore.Facebook/sdk/fbsdk.js");
     }
+
+    public void Configure(ResourceManagementOptions options) => options.ResourceManifests.Add(_manifest);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/ScriptsMiddleware.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/ScriptsMiddleware.cs
index 32ee4c731b0..6fefeb8c52a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/ScriptsMiddleware.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/ScriptsMiddleware.cs
@@ -7,61 +7,60 @@
 using OrchardCore.Facebook.Settings;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Facebook
+namespace OrchardCore.Facebook;
+
+public class ScriptsMiddleware
 {
-    public class ScriptsMiddleware
+    private readonly RequestDelegate _next;
+    private readonly ISiteService _siteService;
+
+    public ScriptsMiddleware(RequestDelegate next, ISiteService siteService)
     {
-        private readonly RequestDelegate _next;
-        private readonly ISiteService _siteService;
+        _next = next;
+        _siteService = siteService;
+    }
 
-        public ScriptsMiddleware(RequestDelegate next, ISiteService siteService)
-        {
-            _next = next;
-            _siteService = siteService;
-        }
+    public async Task Invoke(HttpContext httpContext)
+    {
+        ArgumentNullException.ThrowIfNull(httpContext);
 
-        public async Task Invoke(HttpContext httpContext)
+        if (httpContext.Request.Path.StartsWithSegments("/OrchardCore.Facebook/sdk", StringComparison.OrdinalIgnoreCase))
         {
-            ArgumentNullException.ThrowIfNull(httpContext);
+            var script = default(string);
+            var settings = await _siteService.GetSettingsAsync<FacebookSettings>();
 
-            if (httpContext.Request.Path.StartsWithSegments("/OrchardCore.Facebook/sdk", StringComparison.OrdinalIgnoreCase))
+            if (Path.GetFileName(httpContext.Request.Path.Value) == "fbsdk.js")
             {
-                var script = default(string);
-                var settings = await _siteService.GetSettingsAsync<FacebookSettings>();
-
-                if (Path.GetFileName(httpContext.Request.Path.Value) == "fbsdk.js")
-                {
-                    var locale = CultureInfo.CurrentUICulture.Name.Replace('-', '_');
-                    script = $@"(function(d){{
+                var locale = CultureInfo.CurrentUICulture.Name.Replace('-', '_');
+                script = $@"(function(d){{
                         var js, id = 'facebook-jssdk'; if (d.getElementById(id)) {{ return; }}
                         js = d.createElement('script'); js.id = id; js.async = true;
                         js.src = ""https://connect.facebook.net/{locale}/{settings.SdkJs}"";
                         d.getElementsByTagName('head')[0].appendChild(js);
                     }} (document));";
-                }
-                else if (Path.GetFileName(httpContext.Request.Path.Value) == "fb.js")
+            }
+            else if (Path.GetFileName(httpContext.Request.Path.Value) == "fb.js")
+            {
+                if (!string.IsNullOrWhiteSpace(settings?.AppId))
                 {
-                    if (!string.IsNullOrWhiteSpace(settings?.AppId))
-                    {
-                        var options = $"{{ appId:'{settings.AppId}',version:'{settings.Version}'";
-                        options = string.IsNullOrWhiteSpace(settings.FBInitParams)
-                            ? string.Concat(options, "}")
-                            : string.Concat(options, ",", settings.FBInitParams, "}");
+                    var options = $"{{ appId:'{settings.AppId}',version:'{settings.Version}'";
+                    options = string.IsNullOrWhiteSpace(settings.FBInitParams)
+                        ? string.Concat(options, "}")
+                        : string.Concat(options, ",", settings.FBInitParams, "}");
 
-                        script = $"window.fbAsyncInit = function(){{ FB.init({options});}};";
-                    }
+                    script = $"window.fbAsyncInit = function(){{ FB.init({options});}};";
                 }
+            }
 
-                if (script != null)
-                {
-                    var bytes = Encoding.UTF8.GetBytes(script);
-                    await httpContext.Response.Body.WriteAsync(Encoding.UTF8.GetBytes(script).AsMemory(0, bytes.Length), httpContext.RequestAborted);
+            if (script != null)
+            {
+                var bytes = Encoding.UTF8.GetBytes(script);
+                await httpContext.Response.Body.WriteAsync(Encoding.UTF8.GetBytes(script).AsMemory(0, bytes.Length), httpContext.RequestAborted);
 
-                    return;
-                }
+                return;
             }
-
-            await _next.Invoke(httpContext);
         }
+
+        await _next.Invoke(httpContext);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Services/FacebookService.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Services/FacebookService.cs
index 2cf5856c730..7d48ffe51e9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Services/FacebookService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Services/FacebookService.cs
@@ -7,57 +7,56 @@
 using OrchardCore.Facebook.Settings;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Facebook.Services
+namespace OrchardCore.Facebook.Services;
+
+public class FacebookService : IFacebookService
 {
-    public class FacebookService : IFacebookService
-    {
-        private readonly ISiteService _siteService;
+    private readonly ISiteService _siteService;
 
-        protected readonly IStringLocalizer S;
+    protected readonly IStringLocalizer S;
 
-        public FacebookService(
-            ISiteService siteService,
-            IStringLocalizer<FacebookService> stringLocalizer)
-        {
-            _siteService = siteService;
-            S = stringLocalizer;
-        }
+    public FacebookService(
+        ISiteService siteService,
+        IStringLocalizer<FacebookService> stringLocalizer)
+    {
+        _siteService = siteService;
+        S = stringLocalizer;
+    }
 
-        public Task<FacebookSettings> GetSettingsAsync()
-            => _siteService.GetSettingsAsync<FacebookSettings>();
+    public Task<FacebookSettings> GetSettingsAsync()
+        => _siteService.GetSettingsAsync<FacebookSettings>();
 
-        public async Task UpdateSettingsAsync(FacebookSettings settings)
-        {
-            ArgumentNullException.ThrowIfNull(settings);
+    public async Task UpdateSettingsAsync(FacebookSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-            var container = await _siteService.LoadSiteSettingsAsync();
-            container.Properties[nameof(FacebookSettings)] = JObject.FromObject(settings);
-            await _siteService.UpdateSiteSettingsAsync(container);
-        }
+        var container = await _siteService.LoadSiteSettingsAsync();
+        container.Properties[nameof(FacebookSettings)] = JObject.FromObject(settings);
+        await _siteService.UpdateSiteSettingsAsync(container);
+    }
 
-        public IEnumerable<ValidationResult> ValidateSettings(FacebookSettings settings)
-        {
-            ArgumentNullException.ThrowIfNull(settings);
+    public IEnumerable<ValidationResult> ValidateSettings(FacebookSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-            var results = new List<ValidationResult>();
+        var results = new List<ValidationResult>();
 
-            if (string.IsNullOrEmpty(settings.AppId))
+        if (string.IsNullOrEmpty(settings.AppId))
+        {
+            results.Add(new ValidationResult(S["The AppId is required."], new[]
             {
-                results.Add(new ValidationResult(S["The AppId is required."], new[]
-                {
-                    nameof(settings.AppId),
-                }));
-            }
+                nameof(settings.AppId),
+            }));
+        }
 
-            if (string.IsNullOrEmpty(settings.AppSecret))
+        if (string.IsNullOrEmpty(settings.AppSecret))
+        {
+            results.Add(new ValidationResult(S["The App Secret is required."], new[]
             {
-                results.Add(new ValidationResult(S["The App Secret is required."], new[]
-                {
-                    nameof(settings.AppSecret),
-                }));
-            }
-
-            return results;
+                nameof(settings.AppSecret),
+            }));
         }
+
+        return results;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Services/IFacebookService.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Services/IFacebookService.cs
index d650c2cd87a..446fe847247 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Services/IFacebookService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Services/IFacebookService.cs
@@ -3,14 +3,13 @@
 using System.Threading.Tasks;
 using OrchardCore.Facebook.Settings;
 
-namespace OrchardCore.Facebook.Services
+namespace OrchardCore.Facebook.Services;
+
+public interface IFacebookService
 {
-    public interface IFacebookService
-    {
-        Task<FacebookSettings> GetSettingsAsync();
+    Task<FacebookSettings> GetSettingsAsync();
 
-        Task UpdateSettingsAsync(FacebookSettings settings);
+    Task UpdateSettingsAsync(FacebookSettings settings);
 
-        IEnumerable<ValidationResult> ValidateSettings(FacebookSettings settings);
-    }
+    IEnumerable<ValidationResult> ValidateSettings(FacebookSettings settings);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Settings/FacebookSettings.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Settings/FacebookSettings.cs
index 6a83da487c3..af104d06ff2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Settings/FacebookSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Settings/FacebookSettings.cs
@@ -1,16 +1,15 @@
-namespace OrchardCore.Facebook.Settings
+namespace OrchardCore.Facebook.Settings;
+
+public class FacebookSettings
 {
-    public class FacebookSettings
-    {
-        public string AppId { get; set; }
-        public string AppSecret { get; set; }
-        public bool FBInit { get; set; }
+    public string AppId { get; set; }
+    public string AppSecret { get; set; }
+    public bool FBInit { get; set; }
 
-        public string FBInitParams { get; set; } = @"status:true,
+    public string FBInitParams { get; set; } = @"status:true,
 xfbml:true,
 autoLogAppEvents:true";
 
-        public string SdkJs { get; set; } = "sdk.js";
-        public string Version { get; set; } = "v3.2";
-    }
+    public string SdkJs { get; set; } = "sdk.js";
+    public string Version { get; set; } = "v3.2";
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Startup.cs
index 3da3e4beca7..81154a25815 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Startup.cs
@@ -17,31 +17,30 @@
 using OrchardCore.Security.Permissions;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Facebook
+namespace OrchardCore.Facebook;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
     {
-        public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            builder.UseMiddleware<ScriptsMiddleware>();
-        }
+        builder.UseMiddleware<ScriptsMiddleware>();
+    }
 
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
 
-            services.AddSingleton<IFacebookService, FacebookService>();
-            services.AddScoped<IDisplayDriver<ISite>, FacebookSettingsDisplayDriver>();
-            services.AddRecipeExecutionStep<FacebookSettingsStep>();
+        services.AddSingleton<IFacebookService, FacebookService>();
+        services.AddScoped<IDisplayDriver<ISite>, FacebookSettingsDisplayDriver>();
+        services.AddRecipeExecutionStep<FacebookSettingsStep>();
 
-            services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
-            services.AddTransient<IConfigureOptions<FacebookSettings>, FacebookSettingsConfiguration>();
+        services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
+        services.AddTransient<IConfigureOptions<FacebookSettings>, FacebookSettingsConfiguration>();
 
-            services.Configure<MvcOptions>((options) =>
-            {
-                options.Filters.Add<FBInitFilter>();
-            });
-        }
+        services.Configure<MvcOptions>((options) =>
+        {
+            options.Filters.Add<FBInitFilter>();
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/StartupLogin.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/StartupLogin.cs
index 898fd8204e0..b86b4f5fd1a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/StartupLogin.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/StartupLogin.cs
@@ -15,40 +15,39 @@
 using OrchardCore.Recipes;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Facebook
+namespace OrchardCore.Facebook;
+
+[Feature(FacebookConstants.Features.Login)]
+public sealed class StartupLogin : StartupBase
 {
-    [Feature(FacebookConstants.Features.Login)]
-    public sealed class StartupLogin : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<INavigationProvider, AdminMenuLogin>();
+        services.AddScoped<INavigationProvider, AdminMenuLogin>();
 
-            services.AddSingleton<IFacebookLoginService, FacebookLoginService>();
-            services.AddScoped<IDisplayDriver<ISite>, FacebookLoginSettingsDisplayDriver>();
-            services.AddRecipeExecutionStep<FacebookLoginSettingsStep>();
+        services.AddSingleton<IFacebookLoginService, FacebookLoginService>();
+        services.AddScoped<IDisplayDriver<ISite>, FacebookLoginSettingsDisplayDriver>();
+        services.AddRecipeExecutionStep<FacebookLoginSettingsStep>();
 
-            // Register the options initializers required by the Facebook handler.
-            services.TryAddEnumerable(new[]
-            {
-                // Orchard-specific initializers:
-                ServiceDescriptor.Transient<IConfigureOptions<AuthenticationOptions>, FacebookLoginConfiguration>(),
-                ServiceDescriptor.Transient<IConfigureOptions<FacebookOptions>, FacebookLoginConfiguration>(),
+        // Register the options initializers required by the Facebook handler.
+        services.TryAddEnumerable(new[]
+        {
+            // Orchard-specific initializers:
+            ServiceDescriptor.Transient<IConfigureOptions<AuthenticationOptions>, FacebookLoginConfiguration>(),
+            ServiceDescriptor.Transient<IConfigureOptions<FacebookOptions>, FacebookLoginConfiguration>(),
 
-                // Deployment
+            // Deployment
 
-                // Built-in initializers:
-                ServiceDescriptor.Transient<IPostConfigureOptions<FacebookOptions>, OAuthPostConfigureOptions<FacebookOptions, FacebookHandler>>()
-            });
-        }
+            // Built-in initializers:
+            ServiceDescriptor.Transient<IPostConfigureOptions<FacebookOptions>, OAuthPostConfigureOptions<FacebookOptions, FacebookHandler>>()
+        });
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment")]
-    public class DeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment")]
+public class DeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<FacebookLoginDeploymentSource, FacebookLoginDeploymentStep, FacebookLoginDeploymentStepDriver>();
-        }
+        services.AddDeployment<FacebookLoginDeploymentSource, FacebookLoginDeploymentStep, FacebookLoginDeploymentStepDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/StartupWidgets.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/StartupWidgets.cs
index 7b80ed8eebb..edbcffa7096 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/StartupWidgets.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/StartupWidgets.cs
@@ -12,21 +12,20 @@
 using OrchardCore.Facebook.Widgets.Settings;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Facebook
+namespace OrchardCore.Facebook;
+
+[Feature(FacebookConstants.Features.Widgets)]
+public sealed class StartupWidgets : StartupBase
 {
-    [Feature(FacebookConstants.Features.Widgets)]
-    public sealed class StartupWidgets : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDataMigration<WidgetMigrations>();
-            services.AddScoped<IShapeTableProvider, LiquidShapes>();
+        services.AddDataMigration<WidgetMigrations>();
+        services.AddScoped<IShapeTableProvider, LiquidShapes>();
 
-            services.AddContentPart<FacebookPluginPart>()
-                .UseDisplayDriver<FacebookPluginPartDisplayDriver>()
-                .AddHandler<FacebookPluginPartHandler>();
+        services.AddContentPart<FacebookPluginPart>()
+            .UseDisplayDriver<FacebookPluginPartDisplayDriver>()
+            .AddHandler<FacebookPluginPartHandler>();
 
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, FacebookPluginPartSettingsDisplayDriver>();
-        }
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, FacebookPluginPartSettingsDisplayDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/ViewModels/ErrorViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/ViewModels/ErrorViewModel.cs
index c111f9a74f7..98bcd7c33eb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/ViewModels/ErrorViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/ViewModels/ErrorViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Facebook.ViewModels
+namespace OrchardCore.Facebook.ViewModels;
+
+public class ErrorViewModel
 {
-    public class ErrorViewModel
-    {
-        public string Error { get; set; }
+    public string Error { get; set; }
 
-        public string ErrorDescription { get; set; }
-    }
+    public string ErrorDescription { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/ViewModels/FacebookSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/ViewModels/FacebookSettingsViewModel.cs
index 82d054e3394..5e1159ac329 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/ViewModels/FacebookSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/ViewModels/FacebookSettingsViewModel.cs
@@ -1,24 +1,23 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Facebook.ViewModels
+namespace OrchardCore.Facebook.ViewModels;
+
+public class FacebookSettingsViewModel
 {
-    public class FacebookSettingsViewModel
-    {
-        [Required]
-        public string AppId { get; set; }
+    [Required]
+    public string AppId { get; set; }
 
-        [Required]
-        public string AppSecret { get; set; }
+    [Required]
+    public string AppSecret { get; set; }
 
-        [Required]
-        public string SdkJs { get; set; }
+    [Required]
+    public string SdkJs { get; set; }
 
-        public bool FBInit { get; set; }
-        public string FBInitParams { get; set; }
+    public bool FBInit { get; set; }
+    public string FBInitParams { get; set; }
 
-        [RegularExpression(@"(v)\d+\.\d+")]
-        public string Version { get; set; }
+    [RegularExpression(@"(v)\d+\.\d+")]
+    public string Version { get; set; }
 
-        public bool HasDecryptionError { get; set; }
-    }
+    public bool HasDecryptionError { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Drivers/FacebookPluginPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Drivers/FacebookPluginPartDisplayDriver.cs
index c0f34f78082..1ab621defee 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Drivers/FacebookPluginPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Drivers/FacebookPluginPartDisplayDriver.cs
@@ -11,81 +11,80 @@
 using OrchardCore.Facebook.Widgets.ViewModels;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Facebook.Widgets.Drivers
-{
-    public sealed class FacebookPluginPartDisplayDriver : ContentPartDisplayDriver<FacebookPluginPart>
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
+namespace OrchardCore.Facebook.Widgets.Drivers;
 
-        internal readonly IStringLocalizer S;
+public sealed class FacebookPluginPartDisplayDriver : ContentPartDisplayDriver<FacebookPluginPart>
+{
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
 
-        public FacebookPluginPartDisplayDriver(
-            IContentDefinitionManager contentDefinitionManager,
-            ILiquidTemplateManager liquidTemplateManager,
-            IStringLocalizer<FacebookPluginPartDisplayDriver> localizer)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _liquidTemplateManager = liquidTemplateManager;
-            S = localizer;
-        }
+    internal readonly IStringLocalizer S;
 
-        public override IDisplayResult Display(FacebookPluginPart part, BuildPartDisplayContext context)
-        {
-            return Combine(
-                Initialize<FacebookPluginPartViewModel>("FacebookPluginPart", async m => await BuildViewModelAsync(m, part))
-                    .Location("Detail", "Content"),
-                Initialize<FacebookPluginPartViewModel>("FacebookPluginPart_Summary", async m => await BuildViewModelAsync(m, part))
-                    .Location("Summary", "Content")
-            );
-        }
+    public FacebookPluginPartDisplayDriver(
+        IContentDefinitionManager contentDefinitionManager,
+        ILiquidTemplateManager liquidTemplateManager,
+        IStringLocalizer<FacebookPluginPartDisplayDriver> localizer)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+        _liquidTemplateManager = liquidTemplateManager;
+        S = localizer;
+    }
 
-        private async Task BuildViewModelAsync(FacebookPluginPartViewModel model, FacebookPluginPart part)
-        {
-            ArgumentNullException.ThrowIfNull(model);
-            ArgumentNullException.ThrowIfNull(part);
+    public override IDisplayResult Display(FacebookPluginPart part, BuildPartDisplayContext context)
+    {
+        return Combine(
+            Initialize<FacebookPluginPartViewModel>("FacebookPluginPart", async m => await BuildViewModelAsync(m, part))
+                .Location("Detail", "Content"),
+            Initialize<FacebookPluginPartViewModel>("FacebookPluginPart_Summary", async m => await BuildViewModelAsync(m, part))
+                .Location("Summary", "Content")
+        );
+    }
 
-            model.FacebookPluginPart = part;
-            model.Settings = await GetFacebookPluginPartSettingsAsync(part);
-            model.Liquid = part.Liquid;
-            model.ContentItem = part.ContentItem;
-        }
+    private async Task BuildViewModelAsync(FacebookPluginPartViewModel model, FacebookPluginPart part)
+    {
+        ArgumentNullException.ThrowIfNull(model);
+        ArgumentNullException.ThrowIfNull(part);
 
-        public override IDisplayResult Edit(FacebookPluginPart part, BuildPartEditorContext context)
-        {
-            return Initialize<FacebookPluginPartViewModel>("FacebookPluginPart_Edit", async model =>
-            {
-                model.Settings = await GetFacebookPluginPartSettingsAsync(part);
-                model.FacebookPluginPart = part;
-                model.Liquid = string.IsNullOrWhiteSpace(part.Liquid) ? model.Settings.Liquid : part.Liquid;
-            });
-        }
+        model.FacebookPluginPart = part;
+        model.Settings = await GetFacebookPluginPartSettingsAsync(part);
+        model.Liquid = part.Liquid;
+        model.ContentItem = part.ContentItem;
+    }
 
-        private async Task<FacebookPluginPartSettings> GetFacebookPluginPartSettingsAsync(FacebookPluginPart part)
+    public override IDisplayResult Edit(FacebookPluginPart part, BuildPartEditorContext context)
+    {
+        return Initialize<FacebookPluginPartViewModel>("FacebookPluginPart_Edit", async model =>
         {
-            ArgumentNullException.ThrowIfNull(part);
+            model.Settings = await GetFacebookPluginPartSettingsAsync(part);
+            model.FacebookPluginPart = part;
+            model.Liquid = string.IsNullOrWhiteSpace(part.Liquid) ? model.Settings.Liquid : part.Liquid;
+        });
+    }
 
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(part.ContentItem.ContentType);
-            var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, nameof(FacebookPluginPart), StringComparison.Ordinal));
-            return contentTypePartDefinition.GetSettings<FacebookPluginPartSettings>();
-        }
+    private async Task<FacebookPluginPartSettings> GetFacebookPluginPartSettingsAsync(FacebookPluginPart part)
+    {
+        ArgumentNullException.ThrowIfNull(part);
 
-        public override async Task<IDisplayResult> UpdateAsync(FacebookPluginPart model, UpdatePartEditorContext context)
-        {
-            var viewModel = new FacebookPluginPartViewModel();
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(part.ContentItem.ContentType);
+        var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, nameof(FacebookPluginPart), StringComparison.Ordinal));
+        return contentTypePartDefinition.GetSettings<FacebookPluginPartSettings>();
+    }
 
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix, t => t.Liquid);
+    public override async Task<IDisplayResult> UpdateAsync(FacebookPluginPart model, UpdatePartEditorContext context)
+    {
+        var viewModel = new FacebookPluginPartViewModel();
 
-            if (!string.IsNullOrEmpty(viewModel.Liquid) && !_liquidTemplateManager.Validate(viewModel.Liquid, out var errors))
-            {
-                context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-            }
-            else
-            {
-                model.Liquid = viewModel.Liquid;
-            }
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix, t => t.Liquid);
 
-            return Edit(model, context);
+        if (!string.IsNullOrEmpty(viewModel.Liquid) && !_liquidTemplateManager.Validate(viewModel.Liquid, out var errors))
+        {
+            context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The FaceBook Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+        }
+        else
+        {
+            model.Liquid = viewModel.Liquid;
         }
+
+        return Edit(model, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Handlers/FacebookPluginPartHandler.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Handlers/FacebookPluginPartHandler.cs
index 56f7c120aa6..a225d8950b8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Handlers/FacebookPluginPartHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Handlers/FacebookPluginPartHandler.cs
@@ -9,42 +9,41 @@
 using OrchardCore.Facebook.Widgets.ViewModels;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Facebook.Widgets.Handlers
+namespace OrchardCore.Facebook.Widgets.Handlers;
+
+public class FacebookPluginPartHandler : ContentPartHandler<FacebookPluginPart>
 {
-    public class FacebookPluginPartHandler : ContentPartHandler<FacebookPluginPart>
-    {
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly HtmlEncoder _htmlEncoder;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly HtmlEncoder _htmlEncoder;
 
-        public FacebookPluginPartHandler(ILiquidTemplateManager liquidTemplateManager, HtmlEncoder htmlEncoder)
-        {
-            _liquidTemplateManager = liquidTemplateManager;
-            _htmlEncoder = htmlEncoder;
-        }
+    public FacebookPluginPartHandler(ILiquidTemplateManager liquidTemplateManager, HtmlEncoder htmlEncoder)
+    {
+        _liquidTemplateManager = liquidTemplateManager;
+        _htmlEncoder = htmlEncoder;
+    }
 
-        public override Task GetContentItemAspectAsync(ContentItemAspectContext context, FacebookPluginPart part)
+    public override Task GetContentItemAspectAsync(ContentItemAspectContext context, FacebookPluginPart part)
+    {
+        return context.ForAsync<BodyAspect>(async bodyAspect =>
         {
-            return context.ForAsync<BodyAspect>(async bodyAspect =>
+            try
             {
-                try
+                var model = new FacebookPluginPartViewModel()
                 {
-                    var model = new FacebookPluginPartViewModel()
-                    {
-                        Liquid = part.Liquid,
-                        FacebookPluginPart = part,
-                        ContentItem = part.ContentItem
-                    };
+                    Liquid = part.Liquid,
+                    FacebookPluginPart = part,
+                    ContentItem = part.ContentItem
+                };
 
-                    var result = await _liquidTemplateManager.RenderHtmlContentAsync(part.Liquid, _htmlEncoder, model,
-                        new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(model.ContentItem) });
+                var result = await _liquidTemplateManager.RenderHtmlContentAsync(part.Liquid, _htmlEncoder, model,
+                    new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(model.ContentItem) });
 
-                    bodyAspect.Body = result;
-                }
-                catch
-                {
-                    bodyAspect.Body = HtmlString.Empty;
-                }
-            });
-        }
+                bodyAspect.Body = result;
+            }
+            catch
+            {
+                bodyAspect.Body = HtmlString.Empty;
+            }
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Models/FacebookPluginPart.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Models/FacebookPluginPart.cs
index 0043ee28733..0d5fe629d0c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Models/FacebookPluginPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Models/FacebookPluginPart.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Facebook.Widgets.Models
+namespace OrchardCore.Facebook.Widgets.Models;
+
+public class FacebookPluginPart : ContentPart
 {
-    public class FacebookPluginPart : ContentPart
-    {
-        public string Liquid { get; set; }
-    }
+    public string Liquid { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Settings/FacebookPluginPartSettings.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Settings/FacebookPluginPartSettings.cs
index 39c42815b71..88ddf951b41 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Settings/FacebookPluginPartSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Settings/FacebookPluginPartSettings.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Facebook.Widgets.Settings
+namespace OrchardCore.Facebook.Widgets.Settings;
+
+public class FacebookPluginPartSettings
 {
-    public class FacebookPluginPartSettings
-    {
-        public string Liquid { get; set; }
-    }
+    public string Liquid { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Settings/FacebookPluginPartSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Settings/FacebookPluginPartSettingsDisplayDriver.cs
index 291f16a9396..362138d7d19 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Settings/FacebookPluginPartSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Settings/FacebookPluginPartSettingsDisplayDriver.cs
@@ -7,46 +7,45 @@
 using OrchardCore.Facebook.Widgets.Models;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Facebook.Widgets.Settings
-{
-    public sealed class FacebookPluginPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<FacebookPluginPart>
-    {
-        private readonly ILiquidTemplateManager _templateManager;
+namespace OrchardCore.Facebook.Widgets.Settings;
 
-        internal readonly IStringLocalizer S;
+public sealed class FacebookPluginPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<FacebookPluginPart>
+{
+    private readonly ILiquidTemplateManager _templateManager;
 
-        public FacebookPluginPartSettingsDisplayDriver(ILiquidTemplateManager templateManager, IStringLocalizer<FacebookPluginPartSettingsDisplayDriver> localizer)
-        {
-            _templateManager = templateManager;
-            S = localizer;
-        }
+    internal readonly IStringLocalizer S;
 
-        public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
-        {
-            return Initialize<FacebookPluginPartSettingsViewModel>("FacebookPluginPartSettings_Edit", model =>
-            {
-                model.FacebookPluginPartSettings = contentTypePartDefinition.GetSettings<FacebookPluginPartSettings>();
-                model.Liquid = model.FacebookPluginPartSettings.Liquid;
-            }).Location("Content");
-        }
+    public FacebookPluginPartSettingsDisplayDriver(ILiquidTemplateManager templateManager, IStringLocalizer<FacebookPluginPartSettingsDisplayDriver> localizer)
+    {
+        _templateManager = templateManager;
+        S = localizer;
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    {
+        return Initialize<FacebookPluginPartSettingsViewModel>("FacebookPluginPartSettings_Edit", model =>
         {
-            var model = new FacebookPluginPartSettingsViewModel();
+            model.FacebookPluginPartSettings = contentTypePartDefinition.GetSettings<FacebookPluginPartSettings>();
+            model.Liquid = model.FacebookPluginPartSettings.Liquid;
+        }).Location("Content");
+    }
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix,
-                m => m.Liquid);
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    {
+        var model = new FacebookPluginPartSettingsViewModel();
 
-            if (!string.IsNullOrEmpty(model.Liquid) && !_templateManager.Validate(model.Liquid, out var errors))
-            {
-                context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-            }
-            else
-            {
-                context.Builder.WithSettings(new FacebookPluginPartSettings { Liquid = model.Liquid });
-            }
+        await context.Updater.TryUpdateModelAsync(model, Prefix,
+            m => m.Liquid);
 
-            return Edit(contentTypePartDefinition, context);
+        if (!string.IsNullOrEmpty(model.Liquid) && !_templateManager.Validate(model.Liquid, out var errors))
+        {
+            context.Updater.ModelState.AddModelError(nameof(model.Liquid), S["The Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+        }
+        else
+        {
+            context.Builder.WithSettings(new FacebookPluginPartSettings { Liquid = model.Liquid });
         }
+
+        return Edit(contentTypePartDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Settings/FacebookPluginPartSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Settings/FacebookPluginPartSettingsViewModel.cs
index e891f63a60b..99dab044296 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Settings/FacebookPluginPartSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Settings/FacebookPluginPartSettingsViewModel.cs
@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Facebook.Widgets.Settings
+namespace OrchardCore.Facebook.Widgets.Settings;
+
+public class FacebookPluginPartSettingsViewModel
 {
-    public class FacebookPluginPartSettingsViewModel
-    {
-        public string Liquid { get; set; }
+    public string Liquid { get; set; }
 
-        [BindNever]
-        public FacebookPluginPartSettings FacebookPluginPartSettings { get; set; }
-    }
+    [BindNever]
+    public FacebookPluginPartSettings FacebookPluginPartSettings { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/ViewModels/FacebookPluginPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/ViewModels/FacebookPluginPartViewModel.cs
index 05bd75bec38..caff2f178eb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/ViewModels/FacebookPluginPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/ViewModels/FacebookPluginPartViewModel.cs
@@ -3,20 +3,19 @@
 using OrchardCore.Facebook.Widgets.Models;
 using OrchardCore.Facebook.Widgets.Settings;
 
-namespace OrchardCore.Facebook.Widgets.ViewModels
+namespace OrchardCore.Facebook.Widgets.ViewModels;
+
+public class FacebookPluginPartViewModel
 {
-    public class FacebookPluginPartViewModel
-    {
-        public string Liquid { get; set; }
-        public string Html { get; set; }
+    public string Liquid { get; set; }
+    public string Html { get; set; }
 
-        [BindNever]
-        public FacebookPluginPartSettings Settings { get; set; }
+    [BindNever]
+    public FacebookPluginPartSettings Settings { get; set; }
 
-        [BindNever]
-        public FacebookPluginPart FacebookPluginPart { get; set; }
+    [BindNever]
+    public FacebookPluginPart FacebookPluginPart { get; set; }
 
-        [BindNever]
-        public ContentItem ContentItem { get; set; }
-    }
+    [BindNever]
+    public ContentItem ContentItem { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/WidgetMigrations.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/WidgetMigrations.cs
index 4a28408cd42..aefa79aa60d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/WidgetMigrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/WidgetMigrations.cs
@@ -6,30 +6,29 @@
 using OrchardCore.Recipes;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Facebook.Widgets
+namespace OrchardCore.Facebook.Widgets;
+
+public sealed class WidgetMigrations : DataMigration
 {
-    public sealed class WidgetMigrations : DataMigration
-    {
-        private readonly IRecipeMigrator _recipeMigrator;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IRecipeMigrator _recipeMigrator;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        public WidgetMigrations(
-            IRecipeMigrator recipeMigrator,
-            IContentDefinitionManager contentDefinitionManager)
-        {
-            _recipeMigrator = recipeMigrator;
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public WidgetMigrations(
+        IRecipeMigrator recipeMigrator,
+        IContentDefinitionManager contentDefinitionManager)
+    {
+        _recipeMigrator = recipeMigrator;
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public async Task<int> CreateAsync()
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync(nameof(FacebookPluginPart), builder => builder
-                .Attachable()
-                .WithDescription("Provides a Facebook plugin part to create Facebook social plugin widgets."));
+    public async Task<int> CreateAsync()
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync(nameof(FacebookPluginPart), builder => builder
+            .Attachable()
+            .WithDescription("Provides a Facebook plugin part to create Facebook social plugin widgets."));
 
-            await _recipeMigrator.ExecuteAsync($"Widgets/migration{RecipesConstants.RecipeExtension}", this);
+        await _recipeMigrator.ExecuteAsync($"Widgets/migration{RecipesConstants.RecipeExtension}", this);
 
-            return 1;
-        }
+        return 1;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Features/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Features/AdminMenu.cs
index ab3199d5c63..bf78a8b5d5c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Features/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Features/AdminMenu.cs
@@ -3,41 +3,40 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Features
+namespace OrchardCore.Features;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", FeaturesConstants.FeatureId },
-            // Since features admin accepts tenant, always pass empty string to create valid link for current tenant.
-            { "tenant", string.Empty },
-        };
+        { "area", FeaturesConstants.FeatureId },
+        // Since features admin accepts tenant, always pass empty string to create valid link for current tenant.
+        { "tenant", string.Empty },
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
-        {
-            S = localizer;
-        }
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["Features"], S["Features"].PrefixPosition(), deployment => deployment
-                        .Action("Features", "Admin", _routeValues)
-                        .Permission(Permissions.ManageFeatures)
-                        .LocalNav()
-                    )
-                );
-
             return Task.CompletedTask;
         }
+
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["Features"], S["Features"].PrefixPosition(), deployment => deployment
+                    .Action("Features", "Admin", _routeValues)
+                    .Permission(Permissions.ManageFeatures)
+                    .LocalNav()
+                )
+            );
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Features/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Features/Controllers/AdminController.cs
index ff3b0053fa6..01912488e80 100644
--- a/src/OrchardCore.Modules/OrchardCore.Features/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Features/Controllers/AdminController.cs
@@ -16,230 +16,229 @@
 using OrchardCore.Features.ViewModels;
 using OrchardCore.Routing;
 
-namespace OrchardCore.Features.Controllers
+namespace OrchardCore.Features.Controllers;
+
+public class AdminController : Controller
 {
-    public class AdminController : Controller
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IShellHost _shellHost;
+    private readonly ShellSettings _shellSettings;
+    private readonly IExtensionManager _extensionManager;
+    private readonly IShellFeaturesManager _shellFeaturesManager;
+    private readonly AdminOptions _adminOptions;
+    private readonly INotifier _notifier;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public AdminController(
+        IAuthorizationService authorizationService,
+        IShellHost shellHost,
+        ShellSettings shellSettings,
+        IExtensionManager extensionManager,
+        IShellFeaturesManager shellFeaturesManager,
+        IOptions<AdminOptions> adminOptions,
+        INotifier notifier,
+        IStringLocalizer<AdminController> stringLocalizer,
+        IHtmlLocalizer<AdminController> htmlLocalizer)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IShellHost _shellHost;
-        private readonly ShellSettings _shellSettings;
-        private readonly IExtensionManager _extensionManager;
-        private readonly IShellFeaturesManager _shellFeaturesManager;
-        private readonly AdminOptions _adminOptions;
-        private readonly INotifier _notifier;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public AdminController(
-            IAuthorizationService authorizationService,
-            IShellHost shellHost,
-            ShellSettings shellSettings,
-            IExtensionManager extensionManager,
-            IShellFeaturesManager shellFeaturesManager,
-            IOptions<AdminOptions> adminOptions,
-            INotifier notifier,
-            IStringLocalizer<AdminController> stringLocalizer,
-            IHtmlLocalizer<AdminController> htmlLocalizer)
-        {
-            _authorizationService = authorizationService;
-            _shellHost = shellHost;
-            _shellSettings = shellSettings;
-            _extensionManager = extensionManager;
-            _shellFeaturesManager = shellFeaturesManager;
-            _adminOptions = adminOptions.Value;
-            _notifier = notifier;
-            S = stringLocalizer;
-            H = htmlLocalizer;
+        _authorizationService = authorizationService;
+        _shellHost = shellHost;
+        _shellSettings = shellSettings;
+        _extensionManager = extensionManager;
+        _shellFeaturesManager = shellFeaturesManager;
+        _adminOptions = adminOptions.Value;
+        _notifier = notifier;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+    }
+
+    [Admin("Features/{tenant?}", "Features")]
+    public async Task<ActionResult> Features(string tenant)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageFeatures))
+        {
+            return Forbid();
         }
 
-        [Admin("Features/{tenant?}", "Features")]
-        public async Task<ActionResult> Features(string tenant)
+        var viewModel = new FeaturesViewModel();
+
+        await ExecuteAsync(tenant, async (featureService, settings, isProxy) =>
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageFeatures))
+            // If the user provide an invalid tenant value, we'll set it to null so it's not available on the next request.
+            if (isProxy)
             {
-                return Forbid();
+                viewModel.IsProxy = true;
+                tenant = settings.Name;
+                viewModel.Name = settings.Name;
             }
 
-            var viewModel = new FeaturesViewModel();
+            viewModel.Features = await featureService.GetModuleFeaturesAsync();
+        });
 
-            await ExecuteAsync(tenant, async (featureService, settings, isProxy) =>
-            {
-                // If the user provide an invalid tenant value, we'll set it to null so it's not available on the next request.
-                if (isProxy)
-                {
-                    viewModel.IsProxy = true;
-                    tenant = settings.Name;
-                    viewModel.Name = settings.Name;
-                }
-
-                viewModel.Features = await featureService.GetModuleFeaturesAsync();
-            });
+        return View(viewModel);
+    }
 
-            return View(viewModel);
+    [HttpPost]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<ActionResult> Features(BulkActionViewModel model, bool? force, string tenant)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageFeatures))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<ActionResult> Features(BulkActionViewModel model, bool? force, string tenant)
+        if (model.FeatureIds == null || model.FeatureIds.Length == 0)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageFeatures))
-            {
-                return Forbid();
-            }
+            ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
+        }
 
-            if (model.FeatureIds == null || model.FeatureIds.Length == 0)
+        if (ModelState.IsValid)
+        {
+            await ExecuteAsync(tenant, async (featureService, settings, isProxy) =>
             {
-                ModelState.AddModelError(nameof(BulkActionViewModel.FeatureIds), S["Please select one or more features."]);
-            }
+                var availableFeatures = await featureService.GetAvailableFeatures(model.FeatureIds);
 
-            if (ModelState.IsValid)
-            {
-                await ExecuteAsync(tenant, async (featureService, settings, isProxy) =>
-                {
-                    var availableFeatures = await featureService.GetAvailableFeatures(model.FeatureIds);
+                await featureService.EnableOrDisableFeaturesAsync(availableFeatures, model.BulkAction, force, async (features, isEnabled) => await NotifyAsync(features, isEnabled));
+            });
+        }
 
-                    await featureService.EnableOrDisableFeaturesAsync(availableFeatures, model.BulkAction, force, async (features, isEnabled) => await NotifyAsync(features, isEnabled));
-                });
-            }
+        return RedirectToAction(nameof(Features));
+    }
 
-            return RedirectToAction(nameof(Features));
+    [HttpPost]
+    [Admin("Features/{id}/Disable/{tenant?}", "FeaturesDisable")]
+    public async Task<IActionResult> Disable(string id, string tenant)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageFeatures))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        [Admin("Features/{id}/Disable/{tenant?}", "FeaturesDisable")]
-        public async Task<IActionResult> Disable(string id, string tenant)
+        var found = false;
+
+        await ExecuteAsync(tenant, async (featureService, settings, isProxy) =>
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageFeatures))
+            var feature = await featureService.GetAvailableFeature(id);
+
+            if (feature == null)
             {
-                return Forbid();
+                return;
             }
 
-            var found = false;
+            found = true;
 
-            await ExecuteAsync(tenant, async (featureService, settings, isProxy) =>
+            if (!isProxy && id == FeaturesConstants.FeatureId)
             {
-                var feature = await featureService.GetAvailableFeature(id);
-
-                if (feature == null)
-                {
-                    return;
-                }
+                await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
 
-                found = true;
-
-                if (!isProxy && id == FeaturesConstants.FeatureId)
-                {
-                    await _notifier.ErrorAsync(H["This feature is always enabled and cannot be disabled."]);
+                return;
+            }
 
-                    return;
-                }
+            await featureService.EnableOrDisableFeaturesAsync(new[] { feature }, FeaturesBulkAction.Disable, true, async (features, isEnabled) => await NotifyAsync(features, isEnabled));
+        });
 
-                await featureService.EnableOrDisableFeaturesAsync(new[] { feature }, FeaturesBulkAction.Disable, true, async (features, isEnabled) => await NotifyAsync(features, isEnabled));
-            });
+        if (!found)
+        {
+            return NotFound();
+        }
 
-            if (!found)
-            {
-                return NotFound();
-            }
+        return Redirect(GetNextUrl(tenant, id));
+    }
 
-            return Redirect(GetNextUrl(tenant, id));
+    [HttpPost]
+    [Admin("Features/{id}/Enable/{tenant?}", "FeaturesEnable")]
+    public async Task<IActionResult> Enable(string id, string tenant)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageFeatures))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        [Admin("Features/{id}/Enable/{tenant?}", "FeaturesEnable")]
-        public async Task<IActionResult> Enable(string id, string tenant)
+        var found = false;
+
+        await ExecuteAsync(tenant, async (featureService, settings, isProxy) =>
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageFeatures))
+            var feature = await featureService.GetAvailableFeature(id);
+
+            if (feature == null)
             {
-                return Forbid();
+                return;
             }
 
-            var found = false;
+            found = true;
 
-            await ExecuteAsync(tenant, async (featureService, settings, isProxy) =>
-            {
-                var feature = await featureService.GetAvailableFeature(id);
+            await featureService.EnableOrDisableFeaturesAsync(new[] { feature }, FeaturesBulkAction.Enable, true, async (features, isEnabled) => await NotifyAsync(features, isEnabled));
+        });
 
-                if (feature == null)
-                {
-                    return;
-                }
+        if (!found)
+        {
+            return NotFound();
+        }
 
-                found = true;
+        return Redirect(GetNextUrl(tenant, id));
+    }
 
-                await featureService.EnableOrDisableFeaturesAsync(new[] { feature }, FeaturesBulkAction.Enable, true, async (features, isEnabled) => await NotifyAsync(features, isEnabled));
-            });
+    private async Task ExecuteAsync(string tenant, Func<FeatureService, ShellSettings, bool, Task> action)
+    {
+        if (_shellSettings.IsDefaultShell() &&
+            !string.IsNullOrWhiteSpace(tenant) &&
+            _shellHost.TryGetSettings(tenant, out var settings) &&
+            !settings.IsDefaultShell() &&
+            settings.IsRunning())
+        {
+            // At this point, we know that this request is being executed from the Default tenant.
+            // Also, we were able to find a matching and running tenant that isn't the Default one.
+            // Therefore, it is safe to create a scope for the given tenant.
+            var shellScope = await _shellHost.GetScopeAsync(settings);
 
-            if (!found)
+            await shellScope.UsingAsync(async scope =>
             {
-                return NotFound();
-            }
+                var shellFeatureManager = scope.ServiceProvider.GetRequiredService<IShellFeaturesManager>();
+                var extensionManager = scope.ServiceProvider.GetRequiredService<IExtensionManager>();
 
-            return Redirect(GetNextUrl(tenant, id));
-        }
+                // At this point we apply the action on the given tenant.
+                await action(new FeatureService(shellFeatureManager, extensionManager), scope.ShellContext.Settings, true);
+            });
 
-        private async Task ExecuteAsync(string tenant, Func<FeatureService, ShellSettings, bool, Task> action)
-        {
-            if (_shellSettings.IsDefaultShell() &&
-                !string.IsNullOrWhiteSpace(tenant) &&
-                _shellHost.TryGetSettings(tenant, out var settings) &&
-                !settings.IsDefaultShell() &&
-                settings.IsRunning())
-            {
-                // At this point, we know that this request is being executed from the Default tenant.
-                // Also, we were able to find a matching and running tenant that isn't the Default one.
-                // Therefore, it is safe to create a scope for the given tenant.
-                var shellScope = await _shellHost.GetScopeAsync(settings);
+            return;
+        }
 
-                await shellScope.UsingAsync(async scope =>
-                {
-                    var shellFeatureManager = scope.ServiceProvider.GetRequiredService<IShellFeaturesManager>();
-                    var extensionManager = scope.ServiceProvider.GetRequiredService<IExtensionManager>();
+        // At this point we apply the action on the current tenant.
+        await action(new FeatureService(_shellFeaturesManager, _extensionManager), _shellSettings, false);
+    }
 
-                    // At this point we apply the action on the given tenant.
-                    await action(new FeatureService(shellFeatureManager, extensionManager), scope.ShellContext.Settings, true);
-                });
+    private string GetNextUrl(string tenant, string featureId)
+    {
+        // Generating routes can fail while the tenant is recycled as routes can use services.
+        // It could be fixed by waiting for the next request or the end of the current one
+        // to actually release the tenant. Right now we render the url before recycling the tenant.
 
-                return;
-            }
+        ShellSettings settings = null;
 
-            // At this point we apply the action on the current tenant.
-            await action(new FeatureService(_shellFeaturesManager, _extensionManager), _shellSettings, false);
+        if (!string.IsNullOrWhiteSpace(tenant))
+        {
+            _shellHost.TryGetSettings(tenant, out settings);
         }
 
-        private string GetNextUrl(string tenant, string featureId)
+        if (settings != null && settings.Name != _shellSettings.Name)
         {
-            // Generating routes can fail while the tenant is recycled as routes can use services.
-            // It could be fixed by waiting for the next request or the end of the current one
-            // to actually release the tenant. Right now we render the url before recycling the tenant.
-
-            ShellSettings settings = null;
-
-            if (!string.IsNullOrWhiteSpace(tenant))
-            {
-                _shellHost.TryGetSettings(tenant, out settings);
-            }
-
-            if (settings != null && settings.Name != _shellSettings.Name)
-            {
-                return Url.Action(nameof(Features), new { tenant });
-            }
-
-            if (!settings.IsDefaultShell() && featureId == FeaturesConstants.FeatureId)
-            {
-                return Url.Content("~/" + _adminOptions.AdminUrlPrefix);
-            }
+            return Url.Action(nameof(Features), new { tenant });
+        }
 
-            return Url.Action(nameof(Features));
+        if (!settings.IsDefaultShell() && featureId == FeaturesConstants.FeatureId)
+        {
+            return Url.Content("~/" + _adminOptions.AdminUrlPrefix);
         }
 
-        private async ValueTask NotifyAsync(IEnumerable<IFeatureInfo> features, bool enabled = true)
+        return Url.Action(nameof(Features));
+    }
+
+    private async ValueTask NotifyAsync(IEnumerable<IFeatureInfo> features, bool enabled = true)
+    {
+        foreach (var feature in features)
         {
-            foreach (var feature in features)
-            {
-                await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
-            }
+            await _notifier.SuccessAsync(H["{0} was {1}.", feature.Name ?? feature.Id, enabled ? "enabled" : "disabled"]);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Features/Deployment/AllFeaturesDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Features/Deployment/AllFeaturesDeploymentSource.cs
index 04c038b74ca..77b88ad14da 100644
--- a/src/OrchardCore.Modules/OrchardCore.Features/Deployment/AllFeaturesDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Features/Deployment/AllFeaturesDeploymentSource.cs
@@ -4,37 +4,36 @@
 using OrchardCore.Deployment;
 using OrchardCore.Features.Services;
 
-namespace OrchardCore.Features.Deployment
+namespace OrchardCore.Features.Deployment;
+
+public class AllFeaturesDeploymentSource : IDeploymentSource
 {
-    public class AllFeaturesDeploymentSource : IDeploymentSource
+    private readonly IModuleService _moduleService;
+
+    public AllFeaturesDeploymentSource(IModuleService moduleService)
     {
-        private readonly IModuleService _moduleService;
+        _moduleService = moduleService;
+    }
 
-        public AllFeaturesDeploymentSource(IModuleService moduleService)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        if (step is not AllFeaturesDeploymentStep allFeaturesStep)
         {
-            _moduleService = moduleService;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        var features = await _moduleService.GetAvailableFeaturesAsync();
+        var featureStep = new JsonObject
         {
-            if (step is not AllFeaturesDeploymentStep allFeaturesStep)
-            {
-                return;
-            }
+            ["name"] = "Feature",
+            ["enable"] = JNode.FromObject(features.Where(f => f.IsEnabled).Select(f => f.Descriptor.Id).ToArray()),
+        };
 
-            var features = await _moduleService.GetAvailableFeaturesAsync();
-            var featureStep = new JsonObject
-            {
-                ["name"] = "Feature",
-                ["enable"] = JNode.FromObject(features.Where(f => f.IsEnabled).Select(f => f.Descriptor.Id).ToArray()),
-            };
-
-            if (!allFeaturesStep.IgnoreDisabledFeatures)
-            {
-                featureStep.Add("disable", JNode.FromObject(features.Where(f => !f.IsEnabled).Select(f => f.Descriptor.Id).ToArray()));
-            }
-
-            result.Steps.Add(featureStep);
+        if (!allFeaturesStep.IgnoreDisabledFeatures)
+        {
+            featureStep.Add("disable", JNode.FromObject(features.Where(f => !f.IsEnabled).Select(f => f.Descriptor.Id).ToArray()));
         }
+
+        result.Steps.Add(featureStep);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Features/Deployment/AllFeaturesDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Features/Deployment/AllFeaturesDeploymentStep.cs
index f241626f3a6..5057b56c4bf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Features/Deployment/AllFeaturesDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Features/Deployment/AllFeaturesDeploymentStep.cs
@@ -1,17 +1,16 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Features.Deployment
+namespace OrchardCore.Features.Deployment;
+
+/// <summary>
+/// Adds enabled and disabled features to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class AllFeaturesDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds enabled and disabled features to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class AllFeaturesDeploymentStep : DeploymentStep
+    public AllFeaturesDeploymentStep()
     {
-        public AllFeaturesDeploymentStep()
-        {
-            Name = "AllFeatures";
-        }
-
-        public bool IgnoreDisabledFeatures { get; set; }
+        Name = "AllFeatures";
     }
+
+    public bool IgnoreDisabledFeatures { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Features/Deployment/AllFeaturesDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Features/Deployment/AllFeaturesDeploymentStepDriver.cs
index ea3af1ac92d..7774666cab2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Features/Deployment/AllFeaturesDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Features/Deployment/AllFeaturesDeploymentStepDriver.cs
@@ -4,32 +4,31 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Features.ViewModels;
 
-namespace OrchardCore.Features.Deployment
+namespace OrchardCore.Features.Deployment;
+
+public sealed class AllFeaturesDeploymentStepDriver : DisplayDriver<DeploymentStep, AllFeaturesDeploymentStep>
 {
-    public sealed class AllFeaturesDeploymentStepDriver : DisplayDriver<DeploymentStep, AllFeaturesDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(AllFeaturesDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(AllFeaturesDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("AllFeaturesDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("AllFeaturesDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("AllFeaturesDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("AllFeaturesDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(AllFeaturesDeploymentStep step, BuildEditorContext context)
+    public override IDisplayResult Edit(AllFeaturesDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<AllFeaturesDeploymentStepViewModel>("AllFeaturesDeploymentStep_Fields_Edit", model =>
         {
-            return Initialize<AllFeaturesDeploymentStepViewModel>("AllFeaturesDeploymentStep_Fields_Edit", model =>
-            {
-                model.IgnoreDisabledFeatures = step.IgnoreDisabledFeatures;
-            }).Location("Content");
-        }
+            model.IgnoreDisabledFeatures = step.IgnoreDisabledFeatures;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(AllFeaturesDeploymentStep step, UpdateEditorContext context)
-        {
-            await context.Updater.TryUpdateModelAsync(step, Prefix, x => x.IgnoreDisabledFeatures);
+    public override async Task<IDisplayResult> UpdateAsync(AllFeaturesDeploymentStep step, UpdateEditorContext context)
+    {
+        await context.Updater.TryUpdateModelAsync(step, Prefix, x => x.IgnoreDisabledFeatures);
 
-            return Edit(step, context);
-        }
+        return Edit(step, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Features/Models/ModuleEntry.cs b/src/OrchardCore.Modules/OrchardCore.Features/Models/ModuleEntry.cs
index 4b0452bd170..979d086a305 100644
--- a/src/OrchardCore.Modules/OrchardCore.Features/Models/ModuleEntry.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Features/Models/ModuleEntry.cs
@@ -1,44 +1,43 @@
 using System.Collections.Generic;
 using OrchardCore.Environment.Extensions;
 
-namespace OrchardCore.Features.Models
+namespace OrchardCore.Features.Models;
+
+/// <summary>
+/// Represents a module.
+/// </summary>
+public class ModuleEntry
 {
     /// <summary>
-    /// Represents a module.
+    /// Default constructor.
     /// </summary>
-    public class ModuleEntry
+    public ModuleEntry()
     {
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        public ModuleEntry()
-        {
-            Notifications = [];
-        }
+        Notifications = [];
+    }
 
-        /// <summary>
-        /// The module's extension descriptor.
-        /// </summary>
-        public IExtensionInfo Descriptor { get; set; }
+    /// <summary>
+    /// The module's extension descriptor.
+    /// </summary>
+    public IExtensionInfo Descriptor { get; set; }
 
-        /// <summary>
-        /// Boolean value indicating if the module needs a version update.
-        /// </summary>
-        public bool NeedsVersionUpdate { get; set; }
+    /// <summary>
+    /// Boolean value indicating if the module needs a version update.
+    /// </summary>
+    public bool NeedsVersionUpdate { get; set; }
 
-        /// <summary>
-        /// Boolean value indicating if the feature was recently installed.
-        /// </summary>
-        public bool IsRecentlyInstalled { get; set; }
+    /// <summary>
+    /// Boolean value indicating if the feature was recently installed.
+    /// </summary>
+    public bool IsRecentlyInstalled { get; set; }
 
-        /// <summary>
-        /// List of module notifications.
-        /// </summary>
-        public List<string> Notifications { get; set; }
+    /// <summary>
+    /// List of module notifications.
+    /// </summary>
+    public List<string> Notifications { get; set; }
 
-        /// <summary>
-        /// Indicates whether the module can be uninstalled by the user.
-        /// </summary>
-        public bool CanUninstall { get; set; }
-    }
+    /// <summary>
+    /// Indicates whether the module can be uninstalled by the user.
+    /// </summary>
+    public bool CanUninstall { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Features/Recipes/Executors/FeatureStep.cs b/src/OrchardCore.Modules/OrchardCore.Features/Recipes/Executors/FeatureStep.cs
index 71531374ba5..75688816e08 100644
--- a/src/OrchardCore.Modules/OrchardCore.Features/Recipes/Executors/FeatureStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Features/Recipes/Executors/FeatureStep.cs
@@ -6,45 +6,44 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Features.Recipes.Executors
+namespace OrchardCore.Features.Recipes.Executors;
+
+/// <summary>
+/// This recipe step enables or disables a set of features.
+/// </summary>
+public sealed class FeatureStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step enables or disables a set of features.
-    /// </summary>
-    public sealed class FeatureStep : IRecipeStepHandler
+    private readonly IShellFeaturesManager _shellFeaturesManager;
+
+    public FeatureStep(IShellFeaturesManager shellFeaturesManager)
     {
-        private readonly IShellFeaturesManager _shellFeaturesManager;
+        _shellFeaturesManager = shellFeaturesManager;
+    }
 
-        public FeatureStep(IShellFeaturesManager shellFeaturesManager)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "Feature", StringComparison.OrdinalIgnoreCase))
         {
-            _shellFeaturesManager = shellFeaturesManager;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, "Feature", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            var step = context.Step.ToObject<FeatureStepModel>();
+        var step = context.Step.ToObject<FeatureStepModel>();
 
-            var features = await _shellFeaturesManager.GetAvailableFeaturesAsync();
+        var features = await _shellFeaturesManager.GetAvailableFeaturesAsync();
 
-            var featuresToDisable = features.Where(x => step.Disable?.Contains(x.Id) == true).ToArray();
-            var featuresToEnable = features.Where(x => step.Enable?.Contains(x.Id) == true).ToArray();
+        var featuresToDisable = features.Where(x => step.Disable?.Contains(x.Id) == true).ToArray();
+        var featuresToEnable = features.Where(x => step.Enable?.Contains(x.Id) == true).ToArray();
 
-            if (featuresToDisable.Length > 0 || featuresToEnable.Length > 0)
-            {
-                await _shellFeaturesManager.UpdateFeaturesAsync(featuresToDisable, featuresToEnable, true);
-            }
-        }
-
-        private sealed class FeatureStepModel
+        if (featuresToDisable.Length > 0 || featuresToEnable.Length > 0)
         {
-            public string Name { get; set; }
-            public string[] Disable { get; set; }
-            public string[] Enable { get; set; }
+            await _shellFeaturesManager.UpdateFeaturesAsync(featuresToDisable, featuresToEnable, true);
         }
     }
+
+    private sealed class FeatureStepModel
+    {
+        public string Name { get; set; }
+        public string[] Disable { get; set; }
+        public string[] Enable { get; set; }
+    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Features/Services/IModuleService.cs b/src/OrchardCore.Modules/OrchardCore.Features/Services/IModuleService.cs
index b83c1adf73e..a93f11fc1eb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Features/Services/IModuleService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Features/Services/IModuleService.cs
@@ -2,40 +2,39 @@
 using System.Threading.Tasks;
 using OrchardCore.Features.Models;
 
-namespace OrchardCore.Features.Services
+namespace OrchardCore.Features.Services;
+
+public interface IModuleService
 {
-    public interface IModuleService
-    {
-        /// <summary>
-        /// Retrieves an enumeration of the available features together with its state (enabled / disabled).
-        /// </summary>
-        /// <returns>An enumeration of the available features together with its state (enabled / disabled).</returns>
-        Task<IEnumerable<ModuleFeature>> GetAvailableFeaturesAsync();
+    /// <summary>
+    /// Retrieves an enumeration of the available features together with its state (enabled / disabled).
+    /// </summary>
+    /// <returns>An enumeration of the available features together with its state (enabled / disabled).</returns>
+    Task<IEnumerable<ModuleFeature>> GetAvailableFeaturesAsync();
 
-        /// <summary>
-        /// Enables a list of features.
-        /// </summary>
-        /// <param name="featureIds">The IDs for the features to be enabled.</param>
-        Task EnableFeaturesAsync(IEnumerable<string> featureIds);
+    /// <summary>
+    /// Enables a list of features.
+    /// </summary>
+    /// <param name="featureIds">The IDs for the features to be enabled.</param>
+    Task EnableFeaturesAsync(IEnumerable<string> featureIds);
 
-        /// <summary>
-        /// Enables a list of features.
-        /// </summary>
-        /// <param name="featureIds">The IDs for the features to be enabled.</param>
-        /// <param name="force">Boolean parameter indicating if the feature should enable it's dependencies if required or fail otherwise.</param>
-        Task EnableFeaturesAsync(IEnumerable<string> featureIds, bool force);
+    /// <summary>
+    /// Enables a list of features.
+    /// </summary>
+    /// <param name="featureIds">The IDs for the features to be enabled.</param>
+    /// <param name="force">Boolean parameter indicating if the feature should enable it's dependencies if required or fail otherwise.</param>
+    Task EnableFeaturesAsync(IEnumerable<string> featureIds, bool force);
 
-        /// <summary>
-        /// Disables a list of features.
-        /// </summary>
-        /// <param name="featureIds">The IDs for the features to be disabled.</param>
-        Task DisableFeaturesAsync(IEnumerable<string> featureIds);
+    /// <summary>
+    /// Disables a list of features.
+    /// </summary>
+    /// <param name="featureIds">The IDs for the features to be disabled.</param>
+    Task DisableFeaturesAsync(IEnumerable<string> featureIds);
 
-        /// <summary>
-        /// Disables a list of features.
-        /// </summary>
-        /// <param name="featureIds">The IDs for the features to be disabled.</param>
-        /// <param name="force">Boolean parameter indicating if the feature should disable the features which depend on it if required or fail otherwise.</param>
-        Task DisableFeaturesAsync(IEnumerable<string> featureIds, bool force);
-    }
+    /// <summary>
+    /// Disables a list of features.
+    /// </summary>
+    /// <param name="featureIds">The IDs for the features to be disabled.</param>
+    /// <param name="force">Boolean parameter indicating if the feature should disable the features which depend on it if required or fail otherwise.</param>
+    Task DisableFeaturesAsync(IEnumerable<string> featureIds, bool force);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Features/Services/ModuleService.cs b/src/OrchardCore.Modules/OrchardCore.Features/Services/ModuleService.cs
index 051791852df..2d02c1c973f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Features/Services/ModuleService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Features/Services/ModuleService.cs
@@ -8,156 +8,155 @@
 using OrchardCore.Environment.Shell;
 using OrchardCore.Features.Models;
 
-namespace OrchardCore.Features.Services
+namespace OrchardCore.Features.Services;
+
+public class ModuleService : IModuleService
 {
-    public class ModuleService : IModuleService
+    private readonly IExtensionManager _extensionManager;
+    private readonly IShellFeaturesManager _shellFeaturesManager;
+    private readonly INotifier _notifier;
+    protected readonly IHtmlLocalizer H;
+
+    public ModuleService(
+            IExtensionManager extensionManager,
+            IShellFeaturesManager shellFeaturesManager,
+            IHtmlLocalizer<ModuleService> htmlLocalizer,
+            INotifier notifier)
     {
-        private readonly IExtensionManager _extensionManager;
-        private readonly IShellFeaturesManager _shellFeaturesManager;
-        private readonly INotifier _notifier;
-        protected readonly IHtmlLocalizer H;
-
-        public ModuleService(
-                IExtensionManager extensionManager,
-                IShellFeaturesManager shellFeaturesManager,
-                IHtmlLocalizer<ModuleService> htmlLocalizer,
-                INotifier notifier)
-        {
-            _notifier = notifier;
-            _extensionManager = extensionManager;
-            _shellFeaturesManager = shellFeaturesManager;
-            H = htmlLocalizer;
-        }
+        _notifier = notifier;
+        _extensionManager = extensionManager;
+        _shellFeaturesManager = shellFeaturesManager;
+        H = htmlLocalizer;
+    }
 
-        /// <summary>
-        /// Retrieves an enumeration of the available features together with its state (enabled / disabled).
-        /// </summary>
-        /// <returns>An enumeration of the available features together with its state (enabled / disabled).</returns>
-        public async Task<IEnumerable<ModuleFeature>> GetAvailableFeaturesAsync()
-        {
-            var enabledFeatures =
-                await _shellFeaturesManager.GetEnabledFeaturesAsync();
+    /// <summary>
+    /// Retrieves an enumeration of the available features together with its state (enabled / disabled).
+    /// </summary>
+    /// <returns>An enumeration of the available features together with its state (enabled / disabled).</returns>
+    public async Task<IEnumerable<ModuleFeature>> GetAvailableFeaturesAsync()
+    {
+        var enabledFeatures =
+            await _shellFeaturesManager.GetEnabledFeaturesAsync();
 
-            var availableFeatures = _extensionManager.GetFeatures();
+        var availableFeatures = _extensionManager.GetFeatures();
 
-            return availableFeatures
-                .Select(f => AssembleModuleFromDescriptor(f, enabledFeatures
-                    .Any(sf => sf.Id == f.Id)));
-        }
+        return availableFeatures
+            .Select(f => AssembleModuleFromDescriptor(f, enabledFeatures
+                .Any(sf => sf.Id == f.Id)));
+    }
 
-        /// <summary>
-        /// Enables a list of features.
-        /// </summary>
-        /// <param name="featureIds">The IDs for the features to be enabled.</param>
-        public Task EnableFeaturesAsync(IEnumerable<string> featureIds)
-        {
-            return EnableFeaturesAsync(featureIds, false);
-        }
+    /// <summary>
+    /// Enables a list of features.
+    /// </summary>
+    /// <param name="featureIds">The IDs for the features to be enabled.</param>
+    public Task EnableFeaturesAsync(IEnumerable<string> featureIds)
+    {
+        return EnableFeaturesAsync(featureIds, false);
+    }
 
-        /// <summary>
-        /// Enables a list of features.
-        /// </summary>
-        /// <param name="featureIds">The IDs for the features to be enabled.</param>
-        /// <param name="force">Boolean parameter indicating if the feature should enable it's dependencies if required or fail otherwise.</param>
-        public async Task EnableFeaturesAsync(IEnumerable<string> featureIds, bool force)
-        {
-            var featuresToEnable = _extensionManager
-                .GetFeatures()
-                .Where(x => featureIds.Contains(x.Id));
-
-            var enabledFeatures = await _shellFeaturesManager.EnableFeaturesAsync(featuresToEnable, force);
-            foreach (var enabledFeature in enabledFeatures)
-            {
-                await _notifier.SuccessAsync(H["{0} was enabled.", enabledFeature.Name]);
-            }
-        }
+    /// <summary>
+    /// Enables a list of features.
+    /// </summary>
+    /// <param name="featureIds">The IDs for the features to be enabled.</param>
+    /// <param name="force">Boolean parameter indicating if the feature should enable it's dependencies if required or fail otherwise.</param>
+    public async Task EnableFeaturesAsync(IEnumerable<string> featureIds, bool force)
+    {
+        var featuresToEnable = _extensionManager
+            .GetFeatures()
+            .Where(x => featureIds.Contains(x.Id));
 
-        /// <summary>
-        /// Disables a list of features.
-        /// </summary>
-        /// <param name="featureIds">The IDs for the features to be disabled.</param>
-        public Task DisableFeaturesAsync(IEnumerable<string> featureIds)
+        var enabledFeatures = await _shellFeaturesManager.EnableFeaturesAsync(featuresToEnable, force);
+        foreach (var enabledFeature in enabledFeatures)
         {
-            return DisableFeaturesAsync(featureIds, false);
+            await _notifier.SuccessAsync(H["{0} was enabled.", enabledFeature.Name]);
         }
+    }
 
-        /// <summary>
-        /// Disables a list of features.
-        /// </summary>
-        /// <param name="featureIds">The IDs for the features to be disabled.</param>
-        /// <param name="force">Boolean parameter indicating if the feature should disable the features which depend on it if required or fail otherwise.</param>
-        public async Task DisableFeaturesAsync(IEnumerable<string> featureIds, bool force)
-        {
-            var featuresToDisable = _extensionManager
-                .GetFeatures()
-                .Where(x => featureIds.Contains(x.Id));
-
-            var features = await _shellFeaturesManager.DisableFeaturesAsync(featuresToDisable, force);
-            foreach (var feature in features)
-            {
-                await _notifier.SuccessAsync(H["{0} was disabled.", feature.Name]);
-            }
-        }
+    /// <summary>
+    /// Disables a list of features.
+    /// </summary>
+    /// <param name="featureIds">The IDs for the features to be disabled.</param>
+    public Task DisableFeaturesAsync(IEnumerable<string> featureIds)
+    {
+        return DisableFeaturesAsync(featureIds, false);
+    }
 
-        ///// <summary>
-        ///// Determines if a module was recently installed by using the project's last written time.
-        ///// </summary>
-        ///// <param name="extensionDescriptor">The extension descriptor.</param>
-        // public bool IsRecentlyInstalled(ExtensionDescriptor extensionDescriptor) {
-        //    DateTime lastWrittenUtc = _cacheManager.Get(extensionDescriptor, descriptor => {
-        //        string projectFile = GetManifestPath(extensionDescriptor);
-        //        if (!string.IsNullOrEmpty(projectFile)) {
-        //            // If project file was modified less than 24 hours ago, the module was recently deployed
-        //            return _virtualPathProvider.GetFileLastWriteTimeUtc(projectFile);
-        //        }
-
-        // return DateTime.UtcNow;
-        //    });
-
-        // return DateTime.UtcNow.Subtract(lastWrittenUtc) < new TimeSpan(1, 0, 0, 0);
-        // }
-
-        ///// <summary>
-        ///// Retrieves the full path of the manifest file for a module's extension descriptor.
-        ///// </summary>
-        ///// <param name="extensionDescriptor">The module's extension descriptor.</param>
-        ///// <returns>The full path to the module's manifest file.</returns>
-        // private string GetManifestPath(ExtensionDescriptor extensionDescriptor) {
-        //    string projectPath = _virtualPathProvider.Combine(extensionDescriptor.Location, extensionDescriptor.Id, "module.txt");
-
-        // if (!_virtualPathProvider.FileExists(projectPath)) {
-        //        return null;
-        //    }
-
-        // return projectPath;
-        // }
-
-        private static ModuleFeature AssembleModuleFromDescriptor(IFeatureInfo featureInfo, bool isEnabled)
+    /// <summary>
+    /// Disables a list of features.
+    /// </summary>
+    /// <param name="featureIds">The IDs for the features to be disabled.</param>
+    /// <param name="force">Boolean parameter indicating if the feature should disable the features which depend on it if required or fail otherwise.</param>
+    public async Task DisableFeaturesAsync(IEnumerable<string> featureIds, bool force)
+    {
+        var featuresToDisable = _extensionManager
+            .GetFeatures()
+            .Where(x => featureIds.Contains(x.Id));
+
+        var features = await _shellFeaturesManager.DisableFeaturesAsync(featuresToDisable, force);
+        foreach (var feature in features)
         {
-            return new ModuleFeature
-            {
-                Descriptor = featureInfo,
-                IsEnabled = isEnabled
-            };
+            await _notifier.SuccessAsync(H["{0} was disabled.", feature.Name]);
         }
+    }
 
-        // private void GenerateWarning(string messageFormat, string featureName, IEnumerable<string> featuresInQuestion) {
-        //    if (featuresInQuestion.Count() < 1)
-        //        return;
-
-        // Services.Notifier.Warning(T(
-        //        messageFormat,
-        //        featureName,
-        //        featuresInQuestion.Count() > 1
-        //            ? string.Join("",
-        //                          featuresInQuestion.Select(
-        //                              (fn, i) =>
-        //                              T(i == featuresInQuestion.Count() - 1
-        //                                    ? "{0}"
-        //                                    : (i == featuresInQuestion.Count() - 2
-        //                                           ? "{0} and "
-        //                                           : "{0}, "), fn).ToString()).ToArray())
-        //            : featuresInQuestion.First()));
-        // }
+    ///// <summary>
+    ///// Determines if a module was recently installed by using the project's last written time.
+    ///// </summary>
+    ///// <param name="extensionDescriptor">The extension descriptor.</param>
+    // public bool IsRecentlyInstalled(ExtensionDescriptor extensionDescriptor) {
+    //    DateTime lastWrittenUtc = _cacheManager.Get(extensionDescriptor, descriptor => {
+    //        string projectFile = GetManifestPath(extensionDescriptor);
+    //        if (!string.IsNullOrEmpty(projectFile)) {
+    //            // If project file was modified less than 24 hours ago, the module was recently deployed
+    //            return _virtualPathProvider.GetFileLastWriteTimeUtc(projectFile);
+    //        }
+
+    // return DateTime.UtcNow;
+    //    });
+
+    // return DateTime.UtcNow.Subtract(lastWrittenUtc) < new TimeSpan(1, 0, 0, 0);
+    // }
+
+    ///// <summary>
+    ///// Retrieves the full path of the manifest file for a module's extension descriptor.
+    ///// </summary>
+    ///// <param name="extensionDescriptor">The module's extension descriptor.</param>
+    ///// <returns>The full path to the module's manifest file.</returns>
+    // private string GetManifestPath(ExtensionDescriptor extensionDescriptor) {
+    //    string projectPath = _virtualPathProvider.Combine(extensionDescriptor.Location, extensionDescriptor.Id, "module.txt");
+
+    // if (!_virtualPathProvider.FileExists(projectPath)) {
+    //        return null;
+    //    }
+
+    // return projectPath;
+    // }
+
+    private static ModuleFeature AssembleModuleFromDescriptor(IFeatureInfo featureInfo, bool isEnabled)
+    {
+        return new ModuleFeature
+        {
+            Descriptor = featureInfo,
+            IsEnabled = isEnabled
+        };
     }
+
+    // private void GenerateWarning(string messageFormat, string featureName, IEnumerable<string> featuresInQuestion) {
+    //    if (featuresInQuestion.Count() < 1)
+    //        return;
+
+    // Services.Notifier.Warning(T(
+    //        messageFormat,
+    //        featureName,
+    //        featuresInQuestion.Count() > 1
+    //            ? string.Join("",
+    //                          featuresInQuestion.Select(
+    //                              (fn, i) =>
+    //                              T(i == featuresInQuestion.Count() - 1
+    //                                    ? "{0}"
+    //                                    : (i == featuresInQuestion.Count() - 2
+    //                                           ? "{0} and "
+    //                                           : "{0}, "), fn).ToString()).ToArray())
+    //            : featuresInQuestion.First()));
+    // }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Features/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Features/Startup.cs
index e5304842a40..13a04229a77 100644
--- a/src/OrchardCore.Modules/OrchardCore.Features/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Features/Startup.cs
@@ -8,21 +8,20 @@
 using OrchardCore.Recipes;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Features
+namespace OrchardCore.Features;
+
+/// <summary>
+/// These services are registered on the tenant service collection.
+/// </summary>
+public sealed class Startup : StartupBase
 {
-    /// <summary>
-    /// These services are registered on the tenant service collection.
-    /// </summary>
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddRecipeExecutionStep<FeatureStep>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<IModuleService, ModuleService>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddRecipeExecutionStep<FeatureStep>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<IModuleService, ModuleService>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
 
-            services.AddDeployment<AllFeaturesDeploymentSource, AllFeaturesDeploymentStep, AllFeaturesDeploymentStepDriver>();
-        }
+        services.AddDeployment<AllFeaturesDeploymentSource, AllFeaturesDeploymentStep, AllFeaturesDeploymentStepDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Features/ViewModels/AllFeaturesDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Features/ViewModels/AllFeaturesDeploymentStepViewModel.cs
index f29f2a07a82..aeb2a6f480c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Features/ViewModels/AllFeaturesDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Features/ViewModels/AllFeaturesDeploymentStepViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Features.ViewModels
+namespace OrchardCore.Features.ViewModels;
+
+public class AllFeaturesDeploymentStepViewModel
 {
-    public class AllFeaturesDeploymentStepViewModel
-    {
-        public bool IgnoreDisabledFeatures { get; set; }
-    }
+    public bool IgnoreDisabledFeatures { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Features/ViewModels/FeaturesViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Features/ViewModels/FeaturesViewModel.cs
index 28bc19041a1..38fe07a202c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Features/ViewModels/FeaturesViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Features/ViewModels/FeaturesViewModel.cs
@@ -1,17 +1,16 @@
 using System.Collections.Generic;
 using OrchardCore.Features.Models;
 
-namespace OrchardCore.Features.ViewModels
+namespace OrchardCore.Features.ViewModels;
+
+public class FeaturesViewModel
 {
-    public class FeaturesViewModel
-    {
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        /// <summary>
-        /// True when the current tenant is the Default one, and is executing on behalf of other tenant. Otherwise false.
-        /// </summary>
-        public bool IsProxy { get; set; }
+    /// <summary>
+    /// True when the current tenant is the Default one, and is executing on behalf of other tenant. Otherwise false.
+    /// </summary>
+    public bool IsProxy { get; set; }
 
-        public IEnumerable<ModuleFeature> Features { get; set; }
-    }
+    public IEnumerable<ModuleFeature> Features { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Features/ViewModels/ModulesIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Features/ViewModels/ModulesIndexViewModel.cs
index 7e85dfe8672..b23cc300fdc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Features/ViewModels/ModulesIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Features/ViewModels/ModulesIndexViewModel.cs
@@ -1,19 +1,18 @@
 using System.Collections.Generic;
 using OrchardCore.Features.Models;
 
-namespace OrchardCore.Features.ViewModels
+namespace OrchardCore.Features.ViewModels;
+
+public class ModulesIndexViewModel
 {
-    public class ModulesIndexViewModel
-    {
-        public bool InstallModules { get; set; }
-        public IEnumerable<ModuleEntry> Modules { get; set; }
+    public bool InstallModules { get; set; }
+    public IEnumerable<ModuleEntry> Modules { get; set; }
 
-        public ModulesIndexOptions Options { get; set; }
-        public dynamic Pager { get; set; }
-    }
+    public ModulesIndexOptions Options { get; set; }
+    public dynamic Pager { get; set; }
+}
 
-    public class ModulesIndexOptions
-    {
-        public string SearchText { get; set; }
-    }
+public class ModulesIndexOptions
+{
+    public string SearchText { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Feeds/Controllers/FeedController.cs b/src/OrchardCore.Modules/OrchardCore.Feeds/Controllers/FeedController.cs
index 8607f8d1103..324b0f6719b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Feeds/Controllers/FeedController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Feeds/Controllers/FeedController.cs
@@ -6,82 +6,81 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.Feeds.Models;
 
-namespace OrchardCore.Feeds.Controllers
+namespace OrchardCore.Feeds.Controllers;
+
+public class FeedController : Controller
 {
-    public class FeedController : Controller
+    private readonly IEnumerable<IFeedBuilderProvider> _feedFormatProviders;
+    private readonly IEnumerable<IFeedQueryProvider> _feedQueryProviders;
+    private readonly IFeedItemBuilder _feedItemBuilder;
+    private readonly IServiceProvider _serviceProvider;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+
+    public FeedController(
+        IEnumerable<IFeedQueryProvider> feedQueryProviders,
+        IEnumerable<IFeedBuilderProvider> feedFormatProviders,
+        IFeedItemBuilder feedItemBuilder,
+        IServiceProvider serviceProvider,
+        IUpdateModelAccessor updateModelAccessor)
     {
-        private readonly IEnumerable<IFeedBuilderProvider> _feedFormatProviders;
-        private readonly IEnumerable<IFeedQueryProvider> _feedQueryProviders;
-        private readonly IFeedItemBuilder _feedItemBuilder;
-        private readonly IServiceProvider _serviceProvider;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
+        _feedQueryProviders = feedQueryProviders;
+        _feedFormatProviders = feedFormatProviders;
+        _feedItemBuilder = feedItemBuilder;
+        _serviceProvider = serviceProvider;
+        _updateModelAccessor = updateModelAccessor;
+    }
 
-        public FeedController(
-            IEnumerable<IFeedQueryProvider> feedQueryProviders,
-            IEnumerable<IFeedBuilderProvider> feedFormatProviders,
-            IFeedItemBuilder feedItemBuilder,
-            IServiceProvider serviceProvider,
-            IUpdateModelAccessor updateModelAccessor)
-        {
-            _feedQueryProviders = feedQueryProviders;
-            _feedFormatProviders = feedFormatProviders;
-            _feedItemBuilder = feedItemBuilder;
-            _serviceProvider = serviceProvider;
-            _updateModelAccessor = updateModelAccessor;
-        }
+    public async Task<ActionResult> Index(string format)
+    {
+        var context = new FeedContext(_updateModelAccessor.ModelUpdater, format);
 
-        public async Task<ActionResult> Index(string format)
+        var bestFormatterMatch = _feedFormatProviders
+            .Select(provider => provider.Match(context))
+            .Where(match => match != null && match.FeedBuilder != null)
+            .MaxBy(match => match.Priority);
+
+        if (bestFormatterMatch == null || bestFormatterMatch.FeedBuilder == null)
         {
-            var context = new FeedContext(_updateModelAccessor.ModelUpdater, format);
+            return NotFound();
+        }
 
-            var bestFormatterMatch = _feedFormatProviders
-                .Select(provider => provider.Match(context))
-                .Where(match => match != null && match.FeedBuilder != null)
-                .MaxBy(match => match.Priority);
+        context.Builder = bestFormatterMatch.FeedBuilder;
 
-            if (bestFormatterMatch == null || bestFormatterMatch.FeedBuilder == null)
-            {
-                return NotFound();
-            }
+        var queryMatches = new List<FeedQueryMatch>();
 
-            context.Builder = bestFormatterMatch.FeedBuilder;
+        foreach (var provider in _feedQueryProviders)
+        {
+            queryMatches.Add(await provider.MatchAsync(context));
+        }
 
-            var queryMatches = new List<FeedQueryMatch>();
+        var bestQueryMatch = queryMatches
+            .Where(match => match != null && match.FeedQuery != null)
+            .MaxBy(match => match.Priority);
 
-            foreach (var provider in _feedQueryProviders)
-            {
-                queryMatches.Add(await provider.MatchAsync(context));
-            }
+        if (bestQueryMatch == null || bestQueryMatch.FeedQuery == null)
+        {
+            return NotFound();
+        }
 
-            var bestQueryMatch = queryMatches
-                .Where(match => match != null && match.FeedQuery != null)
-                .MaxBy(match => match.Priority);
+        var document = await context.Builder.ProcessAsync(context, async () =>
+        {
+            await bestQueryMatch.FeedQuery.ExecuteAsync(context);
 
-            if (bestQueryMatch == null || bestQueryMatch.FeedQuery == null)
-            {
-                return NotFound();
-            }
+            await _feedItemBuilder.PopulateAsync(context);
 
-            var document = await context.Builder.ProcessAsync(context, async () =>
+            foreach (var contextualizer in context.Response.Contextualizers)
             {
-                await bestQueryMatch.FeedQuery.ExecuteAsync(context);
-
-                await _feedItemBuilder.PopulateAsync(context);
-
-                foreach (var contextualizer in context.Response.Contextualizers)
+                if (ControllerContext != null)
                 {
-                    if (ControllerContext != null)
+                    contextualizer(new ContextualizeContext
                     {
-                        contextualizer(new ContextualizeContext
-                        {
-                            ServiceProvider = _serviceProvider,
-                            Url = Url
-                        });
-                    }
+                        ServiceProvider = _serviceProvider,
+                        Url = Url
+                    });
                 }
-            });
+            }
+        });
 
-            return Content(document.ToString(), "text/xml");
-        }
+        return Content(document.ToString(), "text/xml");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Feeds/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Feeds/Startup.cs
index 47470d9b709..942efae5362 100644
--- a/src/OrchardCore.Modules/OrchardCore.Feeds/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Feeds/Startup.cs
@@ -2,13 +2,12 @@
 using OrchardCore.Feeds;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Scripting
+namespace OrchardCore.Scripting;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddFeeds();
-        }
+        services.AddFeeds();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Controllers/AdminController.cs
index 0c639eebe1e..22bb7cae39d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Controllers/AdminController.cs
@@ -13,124 +13,123 @@
 using OrchardCore.Flows.Models;
 using OrchardCore.Flows.ViewModels;
 
-namespace OrchardCore.Flows.Controllers
+namespace OrchardCore.Flows.Controllers;
+
+[Admin("Flows/{action}", "Flows.{action}")]
+public class AdminController : Controller
 {
-    [Admin("Flows/{action}", "Flows.{action}")]
-    public class AdminController : Controller
+    private readonly IContentManager _contentManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentItemDisplayManager _contentItemDisplayManager;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+
+    public AdminController(
+        IContentManager contentManager,
+        IContentDefinitionManager contentDefinitionManager,
+        IContentItemDisplayManager contentItemDisplayManager,
+        IShapeFactory shapeFactory,
+        IUpdateModelAccessor updateModelAccessor)
     {
-        private readonly IContentManager _contentManager;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IContentItemDisplayManager _contentItemDisplayManager;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-
-        public AdminController(
-            IContentManager contentManager,
-            IContentDefinitionManager contentDefinitionManager,
-            IContentItemDisplayManager contentItemDisplayManager,
-            IShapeFactory shapeFactory,
-            IUpdateModelAccessor updateModelAccessor)
-        {
-            _contentManager = contentManager;
-            _contentDefinitionManager = contentDefinitionManager;
-            _contentItemDisplayManager = contentItemDisplayManager;
-            _shapeFactory = shapeFactory;
-            _updateModelAccessor = updateModelAccessor;
-        }
+        _contentManager = contentManager;
+        _contentDefinitionManager = contentDefinitionManager;
+        _contentItemDisplayManager = contentItemDisplayManager;
+        _shapeFactory = shapeFactory;
+        _updateModelAccessor = updateModelAccessor;
+    }
 
-        public async Task<IActionResult> BuildEditor(string id, string prefix, string prefixesName, string contentTypesName, string contentItemsName, string targetId, bool flowMetadata, string parentContentType, string partName)
+    public async Task<IActionResult> BuildEditor(string id, string prefix, string prefixesName, string contentTypesName, string contentItemsName, string targetId, bool flowMetadata, string parentContentType, string partName)
+    {
+        if (string.IsNullOrWhiteSpace(id))
         {
-            if (string.IsNullOrWhiteSpace(id))
-            {
-                return NotFound();
-            }
-
-            var contentItem = await _contentManager.NewAsync(id);
+            return NotFound();
+        }
 
-            // Does this editor need the flow metadata editor?
-            string cardCollectionType = null;
-            var colSize = 12;
-            IEnumerable<ContentTypeDefinition> containedContentTypes = null;
+        var contentItem = await _contentManager.NewAsync(id);
 
-            if (flowMetadata)
-            {
-                var metadata = new FlowMetadata();
-                contentItem.Weld(metadata);
-                colSize = (int)Math.Round(metadata.Size / 100.0 * 12);
-                containedContentTypes = await GetContainedContentTypesAsync(parentContentType, partName);
+        // Does this editor need the flow metadata editor?
+        string cardCollectionType = null;
+        var colSize = 12;
+        IEnumerable<ContentTypeDefinition> containedContentTypes = null;
 
-                cardCollectionType = nameof(FlowPart);
-            }
-            else
-            {
-                cardCollectionType = nameof(BagPart);
-            }
+        if (flowMetadata)
+        {
+            var metadata = new FlowMetadata();
+            contentItem.Weld(metadata);
+            colSize = (int)Math.Round(metadata.Size / 100.0 * 12);
+            containedContentTypes = await GetContainedContentTypesAsync(parentContentType, partName);
 
-            // Create a Card Shape
-            var contentCard = await _shapeFactory.New.ContentCard(
-                // Updater is the controller for AJAX Requests
-                Updater: _updateModelAccessor.ModelUpdater,
-                // Shape Specific
-                CollectionShapeType: cardCollectionType,
-                ContentItem: contentItem,
-                BuildEditor: true,
-                ParentContentType: parentContentType,
-                CollectionPartName: partName,
-                ContainedContentTypes: containedContentTypes,
-                // Card Specific Properties
-                TargetId: targetId,
-                Inline: true,
-                CanMove: true,
-                CanDelete: true,
-                // Input hidden
-                // Prefixes
-                PrefixValue: prefix,
-                PrefixesId: prefixesName.Replace('.', '_'),
-                PrefixesName: prefixesName,
-                // ContentTypes
-                ContentTypesId: contentTypesName.Replace('.', '_'),
-                ContentTypesName: contentTypesName,
-                // ContentItems
-                ContentItemsId: contentItemsName.Replace('.', '_'),
-                ContentItemsName: contentItemsName
-            );
-            // Only Add ColumnSize Property if Part has FlowMetadata
-            if (flowMetadata)
-            {
-                contentCard.ColumnSize = colSize;
-            }
+            cardCollectionType = nameof(FlowPart);
+        }
+        else
+        {
+            cardCollectionType = nameof(BagPart);
+        }
 
-            var model = new BuildEditorViewModel
-            {
-                EditorShape = contentCard
-            };
-            return View("Display", model);
+        // Create a Card Shape
+        var contentCard = await _shapeFactory.New.ContentCard(
+            // Updater is the controller for AJAX Requests
+            Updater: _updateModelAccessor.ModelUpdater,
+            // Shape Specific
+            CollectionShapeType: cardCollectionType,
+            ContentItem: contentItem,
+            BuildEditor: true,
+            ParentContentType: parentContentType,
+            CollectionPartName: partName,
+            ContainedContentTypes: containedContentTypes,
+            // Card Specific Properties
+            TargetId: targetId,
+            Inline: true,
+            CanMove: true,
+            CanDelete: true,
+            // Input hidden
+            // Prefixes
+            PrefixValue: prefix,
+            PrefixesId: prefixesName.Replace('.', '_'),
+            PrefixesName: prefixesName,
+            // ContentTypes
+            ContentTypesId: contentTypesName.Replace('.', '_'),
+            ContentTypesName: contentTypesName,
+            // ContentItems
+            ContentItemsId: contentItemsName.Replace('.', '_'),
+            ContentItemsName: contentItemsName
+        );
+        // Only Add ColumnSize Property if Part has FlowMetadata
+        if (flowMetadata)
+        {
+            contentCard.ColumnSize = colSize;
         }
 
-        private async Task<IEnumerable<ContentTypeDefinition>> GetContainedContentTypesAsync(string contentType, string partName)
+        var model = new BuildEditorViewModel
         {
-            var settings = (await _contentDefinitionManager.GetTypeDefinitionAsync(contentType))?.Parts.SingleOrDefault(x => x.Name == partName)?.GetSettings<FlowPartSettings>();
+            EditorShape = contentCard
+        };
+        return View("Display", model);
+    }
 
-            if (settings?.ContainedContentTypes == null || settings.ContainedContentTypes.Length == 0)
-            {
-                return (await _contentDefinitionManager.ListTypeDefinitionsAsync()).Where(t => t.StereotypeEquals("Widget"));
-            }
+    private async Task<IEnumerable<ContentTypeDefinition>> GetContainedContentTypesAsync(string contentType, string partName)
+    {
+        var settings = (await _contentDefinitionManager.GetTypeDefinitionAsync(contentType))?.Parts.SingleOrDefault(x => x.Name == partName)?.GetSettings<FlowPartSettings>();
 
-            var definitions = new List<ContentTypeDefinition>();
+        if (settings?.ContainedContentTypes == null || settings.ContainedContentTypes.Length == 0)
+        {
+            return (await _contentDefinitionManager.ListTypeDefinitionsAsync()).Where(t => t.StereotypeEquals("Widget"));
+        }
 
-            foreach (var ct in settings.ContainedContentTypes)
-            {
-                var definition = await _contentDefinitionManager.GetTypeDefinitionAsync(ct);
+        var definitions = new List<ContentTypeDefinition>();
 
-                if (definition == null || !definition.StereotypeEquals("Widget"))
-                {
-                    continue;
-                }
+        foreach (var ct in settings.ContainedContentTypes)
+        {
+            var definition = await _contentDefinitionManager.GetTypeDefinitionAsync(ct);
 
-                definitions.Add(definition);
+            if (definition == null || !definition.StereotypeEquals("Widget"))
+            {
+                continue;
             }
 
-            return definitions;
+            definitions.Add(definition);
         }
+
+        return definitions;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Drivers/BagPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Drivers/BagPartDisplayDriver.cs
index a87c618601e..4e5ebf4a0ef 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Drivers/BagPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Drivers/BagPartDisplayDriver.cs
@@ -21,258 +21,257 @@
 using OrchardCore.Flows.ViewModels;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Flows.Drivers
+namespace OrchardCore.Flows.Drivers;
+
+public sealed class BagPartDisplayDriver : ContentPartDisplayDriver<BagPart>
 {
-    public sealed class BagPartDisplayDriver : ContentPartDisplayDriver<BagPart>
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentManager _contentManager;
+    private readonly IServiceProvider _serviceProvider;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly ILogger _logger;
+    private readonly INotifier _notifier;
+    private readonly IAuthorizationService _authorizationService;
+
+    internal readonly IHtmlLocalizer H;
+
+    public BagPartDisplayDriver(
+        IContentManager contentManager,
+        IContentDefinitionManager contentDefinitionManager,
+        IServiceProvider serviceProvider,
+        IHttpContextAccessor httpContextAccessor,
+        ILogger<BagPartDisplayDriver> logger,
+        INotifier notifier,
+        IHtmlLocalizer<BagPartDisplayDriver> htmlLocalizer,
+        IAuthorizationService authorizationService
+        )
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IContentManager _contentManager;
-        private readonly IServiceProvider _serviceProvider;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly ILogger _logger;
-        private readonly INotifier _notifier;
-        private readonly IAuthorizationService _authorizationService;
-
-        internal readonly IHtmlLocalizer H;
-
-        public BagPartDisplayDriver(
-            IContentManager contentManager,
-            IContentDefinitionManager contentDefinitionManager,
-            IServiceProvider serviceProvider,
-            IHttpContextAccessor httpContextAccessor,
-            ILogger<BagPartDisplayDriver> logger,
-            INotifier notifier,
-            IHtmlLocalizer<BagPartDisplayDriver> htmlLocalizer,
-            IAuthorizationService authorizationService
-            )
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _contentManager = contentManager;
-            _serviceProvider = serviceProvider;
-            _httpContextAccessor = httpContextAccessor;
-            _logger = logger;
-            _notifier = notifier;
-            H = htmlLocalizer;
-            _authorizationService = authorizationService;
-        }
-
-        public override IDisplayResult Display(BagPart bagPart, BuildPartDisplayContext context)
-        {
-            var hasItems = bagPart.ContentItems.Count > 0;
+        _contentDefinitionManager = contentDefinitionManager;
+        _contentManager = contentManager;
+        _serviceProvider = serviceProvider;
+        _httpContextAccessor = httpContextAccessor;
+        _logger = logger;
+        _notifier = notifier;
+        H = htmlLocalizer;
+        _authorizationService = authorizationService;
+    }
 
-            return Initialize<BagPartViewModel>(hasItems ? "BagPart" : "BagPart_Empty", m =>
-            {
-                m.BagPart = bagPart;
-                m.BuildPartDisplayContext = context;
-                m.Settings = context.TypePartDefinition.GetSettings<BagPartSettings>();
-            })
-            .Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
+    public override IDisplayResult Display(BagPart bagPart, BuildPartDisplayContext context)
+    {
+        var hasItems = bagPart.ContentItems.Count > 0;
 
-        public override IDisplayResult Edit(BagPart bagPart, BuildPartEditorContext context)
+        return Initialize<BagPartViewModel>(hasItems ? "BagPart" : "BagPart_Empty", m =>
         {
-            return Initialize<BagPartEditViewModel>(GetEditorShapeType(context), async m =>
-            {
-                var contentDefinitionManager = _serviceProvider.GetRequiredService<IContentDefinitionManager>();
-
-                m.BagPart = bagPart;
-                m.Updater = context.Updater;
-                m.ContainedContentTypeDefinitions = await GetContainedContentTypesAsync(context.TypePartDefinition);
-                m.AccessibleWidgets = await GetAccessibleWidgetsAsync(bagPart.ContentItems, contentDefinitionManager);
-                m.TypePartDefinition = context.TypePartDefinition;
-            });
-        }
+            m.BagPart = bagPart;
+            m.BuildPartDisplayContext = context;
+            m.Settings = context.TypePartDefinition.GetSettings<BagPartSettings>();
+        })
+        .Location("Detail", "Content")
+        .Location("Summary", "Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(BagPart part, UpdatePartEditorContext context)
+    public override IDisplayResult Edit(BagPart bagPart, BuildPartEditorContext context)
+    {
+        return Initialize<BagPartEditViewModel>(GetEditorShapeType(context), async m =>
         {
-            var contentItemDisplayManager = _serviceProvider.GetRequiredService<IContentItemDisplayManager>();
             var contentDefinitionManager = _serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-            var model = new BagPartEditViewModel { BagPart = part };
-
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+            m.BagPart = bagPart;
+            m.Updater = context.Updater;
+            m.ContainedContentTypeDefinitions = await GetContainedContentTypesAsync(context.TypePartDefinition);
+            m.AccessibleWidgets = await GetAccessibleWidgetsAsync(bagPart.ContentItems, contentDefinitionManager);
+            m.TypePartDefinition = context.TypePartDefinition;
+        });
+    }
 
-            var contentItems = new List<ContentItem>();
+    public override async Task<IDisplayResult> UpdateAsync(BagPart part, UpdatePartEditorContext context)
+    {
+        var contentItemDisplayManager = _serviceProvider.GetRequiredService<IContentItemDisplayManager>();
+        var contentDefinitionManager = _serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-            // Handle the content found in the request
-            for (var i = 0; i < model.Prefixes.Length; i++)
-            {
-                var contentItem = await _contentManager.NewAsync(model.ContentTypes[i]);
+        var model = new BagPartEditViewModel { BagPart = part };
 
-                // assign the owner of the item to ensure we can validate access to it later.
-                contentItem.Owner = GetCurrentOwner();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-                // Try to match the requested id with an existing id
-                var existingContentItem = part.ContentItems.FirstOrDefault(x => string.Equals(x.ContentItemId, model.ContentItems[i], StringComparison.OrdinalIgnoreCase));
+        var contentItems = new List<ContentItem>();
 
-                if (existingContentItem == null && !await AuthorizeAsync(contentDefinitionManager, CommonPermissions.EditContent, contentItem))
-                {
-                    // at this point the user is somehow trying to add content with no privileges. ignore the request
-                    continue;
-                }
+        // Handle the content found in the request
+        for (var i = 0; i < model.Prefixes.Length; i++)
+        {
+            var contentItem = await _contentManager.NewAsync(model.ContentTypes[i]);
 
-                // When the content item already exists merge its elements to preserve nested content item ids.
-                // All of the data for these merged items is then replaced by the model values on update, while a nested content item id is maintained.
-                // This prevents nested items which rely on the content item id, i.e. the media attached field, losing their reference point.
-                if (existingContentItem != null)
-                {
-                    if (!await AuthorizeAsync(contentDefinitionManager, CommonPermissions.EditContent, existingContentItem))
-                    {
-                        // at this point the user is somehow modifying existing content with no privileges.
-                        // honor the existing data and ignore the data in the request
-                        contentItems.Add(existingContentItem);
-
-                        continue;
-                    }
-
-                    // at this point the user have privileges to edit, merge the data from the request
-                    contentItem.ContentItemId = model.ContentItems[i];
-                    contentItem.Merge(existingContentItem);
-                }
+            // assign the owner of the item to ensure we can validate access to it later.
+            contentItem.Owner = GetCurrentOwner();
 
-                var widgetModel = await contentItemDisplayManager.UpdateEditorAsync(contentItem, context.Updater, context.IsNew, htmlFieldPrefix: model.Prefixes[i]);
+            // Try to match the requested id with an existing id
+            var existingContentItem = part.ContentItems.FirstOrDefault(x => string.Equals(x.ContentItemId, model.ContentItems[i], StringComparison.OrdinalIgnoreCase));
 
-                contentItems.Add(contentItem);
+            if (existingContentItem == null && !await AuthorizeAsync(contentDefinitionManager, CommonPermissions.EditContent, contentItem))
+            {
+                // at this point the user is somehow trying to add content with no privileges. ignore the request
+                continue;
             }
 
-            // at the end, lets add existing readonly contents.
-            foreach (var existingContentItem in part.ContentItems)
+            // When the content item already exists merge its elements to preserve nested content item ids.
+            // All of the data for these merged items is then replaced by the model values on update, while a nested content item id is maintained.
+            // This prevents nested items which rely on the content item id, i.e. the media attached field, losing their reference point.
+            if (existingContentItem != null)
             {
-                if (contentItems.Any(x => x.ContentItemId == existingContentItem.ContentItemId))
+                if (!await AuthorizeAsync(contentDefinitionManager, CommonPermissions.EditContent, existingContentItem))
                 {
-                    // item was already added using the edit
+                    // at this point the user is somehow modifying existing content with no privileges.
+                    // honor the existing data and ignore the data in the request
+                    contentItems.Add(existingContentItem);
 
                     continue;
                 }
 
-                if (await AuthorizeAsync(contentDefinitionManager, CommonPermissions.DeleteContent, existingContentItem))
-                {
-                    // at this point the user has permission to delete a securable item or the type isn't securable
-                    // if the existing content id isn't in the requested ids, don't add the content item... meaning the user deleted it
-                    if (!model.ContentItems.Contains(existingContentItem.ContentItemId))
-                    {
-                        continue;
-                    }
-                }
-
-                // since the content item isn't editable, lets add it so it's not removed from the collection
-                contentItems.Add(existingContentItem);
+                // at this point the user have privileges to edit, merge the data from the request
+                contentItem.ContentItemId = model.ContentItems[i];
+                contentItem.Merge(existingContentItem);
             }
 
-            // TODO, some how here contentItems should be sorted by a defined order
-            part.ContentItems = contentItems;
+            var widgetModel = await contentItemDisplayManager.UpdateEditorAsync(contentItem, context.Updater, context.IsNew, htmlFieldPrefix: model.Prefixes[i]);
 
-            return Edit(part, context);
+            contentItems.Add(contentItem);
         }
 
-        private async Task<IEnumerable<BagPartWidgetViewModel>> GetAccessibleWidgetsAsync(IEnumerable<ContentItem> contentItems, IContentDefinitionManager contentDefinitionManager)
+        // at the end, lets add existing readonly contents.
+        foreach (var existingContentItem in part.ContentItems)
         {
-            var widgets = new List<BagPartWidgetViewModel>();
-
-            foreach (var contentItem in contentItems)
+            if (contentItems.Any(x => x.ContentItemId == existingContentItem.ContentItemId))
             {
-                var widget = new BagPartWidgetViewModel
-                {
-                    ContentItem = contentItem,
-                    Viewable = true,
-                    Editable = true,
-                    Deletable = true,
-                };
+                // item was already added using the edit
 
-                var contentTypeDefinition = await contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+                continue;
+            }
 
-                if (contentTypeDefinition == null)
+            if (await AuthorizeAsync(contentDefinitionManager, CommonPermissions.DeleteContent, existingContentItem))
+            {
+                // at this point the user has permission to delete a securable item or the type isn't securable
+                // if the existing content id isn't in the requested ids, don't add the content item... meaning the user deleted it
+                if (!model.ContentItems.Contains(existingContentItem.ContentItemId))
                 {
-                    _logger.LogWarning("The Widget content item with id {ContentItemId} has no matching {ContentType} content type definition.", contentItem.ContentItemId, contentItem.ContentType);
-
-                    await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
-
                     continue;
                 }
+            }
 
-                if (contentTypeDefinition.IsSecurable())
-                {
-                    widget.Viewable = await AuthorizeAsync(CommonPermissions.ViewContent, contentItem);
-                    widget.Editable = await AuthorizeAsync(CommonPermissions.EditContent, contentItem);
-                    widget.Deletable = await AuthorizeAsync(CommonPermissions.DeleteContent, contentItem);
-                }
+            // since the content item isn't editable, lets add it so it's not removed from the collection
+            contentItems.Add(existingContentItem);
+        }
 
-                widget.ContentTypeDefinition = contentTypeDefinition;
+        // TODO, some how here contentItems should be sorted by a defined order
+        part.ContentItems = contentItems;
 
-                if (widget.Editable || widget.Viewable)
-                {
-                    widgets.Add(widget);
-                }
-            }
+        return Edit(part, context);
+    }
 
-            return widgets;
-        }
+    private async Task<IEnumerable<BagPartWidgetViewModel>> GetAccessibleWidgetsAsync(IEnumerable<ContentItem> contentItems, IContentDefinitionManager contentDefinitionManager)
+    {
+        var widgets = new List<BagPartWidgetViewModel>();
 
-        private async Task<bool> AuthorizeAsync(IContentDefinitionManager contentDefinitionManager, Permission permission, ContentItem contentItem)
+        foreach (var contentItem in contentItems)
         {
-            var contentType = await contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
-
-            if (contentType?.IsSecurable() ?? false)
+            var widget = new BagPartWidgetViewModel
             {
-                return true;
-            }
+                ContentItem = contentItem,
+                Viewable = true,
+                Editable = true,
+                Deletable = true,
+            };
 
-            return await AuthorizeAsync(permission, contentItem);
-        }
+            var contentTypeDefinition = await contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-        private Task<bool> AuthorizeAsync(Permission permission, ContentItem contentItem)
-            => _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, permission, contentItem);
+            if (contentTypeDefinition == null)
+            {
+                _logger.LogWarning("The Widget content item with id {ContentItemId} has no matching {ContentType} content type definition.", contentItem.ContentItemId, contentItem.ContentType);
 
-        private async Task<IEnumerable<ContentTypeDefinition>> GetContainedContentTypesAsync(ContentTypePartDefinition typePartDefinition)
-        {
-            var settings = typePartDefinition.GetSettings<BagPartSettings>();
-            var contentTypes = Enumerable.Empty<ContentTypeDefinition>();
+                await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", contentItem.ContentItemId, contentItem.ContentType]);
 
-            if (settings.ContainedStereotypes != null && settings.ContainedStereotypes.Length > 0)
+                continue;
+            }
+
+            if (contentTypeDefinition.IsSecurable())
             {
-                contentTypes = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
-                    .Where(contentType => contentType.HasStereotype() && settings.ContainedStereotypes.Contains(contentType.GetStereotype(), StringComparer.OrdinalIgnoreCase));
+                widget.Viewable = await AuthorizeAsync(CommonPermissions.ViewContent, contentItem);
+                widget.Editable = await AuthorizeAsync(CommonPermissions.EditContent, contentItem);
+                widget.Deletable = await AuthorizeAsync(CommonPermissions.DeleteContent, contentItem);
             }
-            else if (settings.ContainedContentTypes != null && settings.ContainedContentTypes.Length > 0)
+
+            widget.ContentTypeDefinition = contentTypeDefinition;
+
+            if (widget.Editable || widget.Viewable)
             {
-                var definitions = new List<ContentTypeDefinition>();
+                widgets.Add(widget);
+            }
+        }
 
-                foreach (var contentType in settings.ContainedContentTypes)
-                {
-                    var definition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentType);
+        return widgets;
+    }
 
-                    if (definition == null)
-                    {
-                        continue;
-                    }
+    private async Task<bool> AuthorizeAsync(IContentDefinitionManager contentDefinitionManager, Permission permission, ContentItem contentItem)
+    {
+        var contentType = await contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-                    definitions.Add(definition);
-                }
+        if (contentType?.IsSecurable() ?? false)
+        {
+            return true;
+        }
 
-                contentTypes = definitions;
-            }
+        return await AuthorizeAsync(permission, contentItem);
+    }
+
+    private Task<bool> AuthorizeAsync(Permission permission, ContentItem contentItem)
+        => _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, permission, contentItem);
 
-            var user = _httpContextAccessor.HttpContext.User;
+    private async Task<IEnumerable<ContentTypeDefinition>> GetContainedContentTypesAsync(ContentTypePartDefinition typePartDefinition)
+    {
+        var settings = typePartDefinition.GetSettings<BagPartSettings>();
+        var contentTypes = Enumerable.Empty<ContentTypeDefinition>();
 
-            var accessibleContentTypes = new List<ContentTypeDefinition>();
+        if (settings.ContainedStereotypes != null && settings.ContainedStereotypes.Length > 0)
+        {
+            contentTypes = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
+                .Where(contentType => contentType.HasStereotype() && settings.ContainedStereotypes.Contains(contentType.GetStereotype(), StringComparer.OrdinalIgnoreCase));
+        }
+        else if (settings.ContainedContentTypes != null && settings.ContainedContentTypes.Length > 0)
+        {
+            var definitions = new List<ContentTypeDefinition>();
 
-            foreach (var contentType in contentTypes)
+            foreach (var contentType in settings.ContainedContentTypes)
             {
-                if (contentType.IsSecurable() && !await _authorizationService.AuthorizeContentTypeAsync(user, CommonPermissions.EditContent, contentType, GetCurrentOwner()))
+                var definition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentType);
+
+                if (definition == null)
                 {
                     continue;
                 }
 
-                accessibleContentTypes.Add(contentType);
+                definitions.Add(definition);
             }
 
-            return accessibleContentTypes;
+            contentTypes = definitions;
         }
 
-        private string GetCurrentOwner()
+        var user = _httpContextAccessor.HttpContext.User;
+
+        var accessibleContentTypes = new List<ContentTypeDefinition>();
+
+        foreach (var contentType in contentTypes)
         {
-            return _httpContextAccessor.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+            if (contentType.IsSecurable() && !await _authorizationService.AuthorizeContentTypeAsync(user, CommonPermissions.EditContent, contentType, GetCurrentOwner()))
+            {
+                continue;
+            }
+
+            accessibleContentTypes.Add(contentType);
         }
+
+        return accessibleContentTypes;
+    }
+
+    private string GetCurrentOwner()
+    {
+        return _httpContextAccessor.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Drivers/FlowMetadataDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Drivers/FlowMetadataDisplayDriver.cs
index 5aa9fcda764..a4b763ad8ca 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Drivers/FlowMetadataDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Drivers/FlowMetadataDisplayDriver.cs
@@ -5,38 +5,37 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Flows.Models;
 
-namespace OrchardCore.Flows.Drivers
+namespace OrchardCore.Flows.Drivers;
+
+public sealed class FlowMetadataDisplayDriver : ContentDisplayDriver
 {
-    public sealed class FlowMetadataDisplayDriver : ContentDisplayDriver
+    public override IDisplayResult Edit(ContentItem model, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentItem model, BuildEditorContext context)
+        var flowMetadata = model.As<FlowMetadata>();
+
+        if (flowMetadata == null)
         {
-            var flowMetadata = model.As<FlowMetadata>();
-
-            if (flowMetadata == null)
-            {
-                return null;
-            }
-
-            return Initialize<FlowMetadata>("FlowMetadata_Edit", m =>
-            {
-                m.Alignment = flowMetadata.Alignment;
-                m.Size = flowMetadata.Size;
-            }).Location("Footer");
+            return null;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentItem contentItem, UpdateEditorContext context)
+        return Initialize<FlowMetadata>("FlowMetadata_Edit", m =>
         {
-            var flowMetadata = contentItem.As<FlowMetadata>();
-
-            if (flowMetadata == null)
-            {
-                return null;
-            }
+            m.Alignment = flowMetadata.Alignment;
+            m.Size = flowMetadata.Size;
+        }).Location("Footer");
+    }
 
-            await contentItem.AlterAsync<FlowMetadata>(model => context.Updater.TryUpdateModelAsync(model, Prefix));
+    public override async Task<IDisplayResult> UpdateAsync(ContentItem contentItem, UpdateEditorContext context)
+    {
+        var flowMetadata = contentItem.As<FlowMetadata>();
 
-            return Edit(contentItem, context);
+        if (flowMetadata == null)
+        {
+            return null;
         }
+
+        await contentItem.AlterAsync<FlowMetadata>(model => context.Updater.TryUpdateModelAsync(model, Prefix));
+
+        return Edit(contentItem, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Drivers/FlowPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Drivers/FlowPartDisplayDriver.cs
index 86c80194e65..145cc131002 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Drivers/FlowPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Drivers/FlowPartDisplayDriver.cs
@@ -16,131 +16,130 @@
 using OrchardCore.Flows.Models;
 using OrchardCore.Flows.ViewModels;
 
-namespace OrchardCore.Flows.Drivers
+namespace OrchardCore.Flows.Drivers;
+
+public sealed class FlowPartDisplayDriver : ContentPartDisplayDriver<FlowPart>
 {
-    public sealed class FlowPartDisplayDriver : ContentPartDisplayDriver<FlowPart>
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentManager _contentManager;
+    private readonly IServiceProvider _serviceProvider;
+    private readonly INotifier _notifier;
+    private readonly ILogger _logger;
+
+    internal readonly IHtmlLocalizer H;
+
+    public FlowPartDisplayDriver(
+        IContentDefinitionManager contentDefinitionManager,
+        IContentManager contentManager,
+        IServiceProvider serviceProvider,
+        IHtmlLocalizer<FlowPartDisplayDriver> htmlLocalizer,
+        INotifier notifier,
+        ILogger<FlowPartDisplayDriver> logger
+        )
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IContentManager _contentManager;
-        private readonly IServiceProvider _serviceProvider;
-        private readonly INotifier _notifier;
-        private readonly ILogger _logger;
-
-        internal readonly IHtmlLocalizer H;
-
-        public FlowPartDisplayDriver(
-            IContentDefinitionManager contentDefinitionManager,
-            IContentManager contentManager,
-            IServiceProvider serviceProvider,
-            IHtmlLocalizer<FlowPartDisplayDriver> htmlLocalizer,
-            INotifier notifier,
-            ILogger<FlowPartDisplayDriver> logger
-            )
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _contentManager = contentManager;
-            _serviceProvider = serviceProvider;
-            H = htmlLocalizer;
-            _notifier = notifier;
-            _logger = logger;
-        }
+        _contentDefinitionManager = contentDefinitionManager;
+        _contentManager = contentManager;
+        _serviceProvider = serviceProvider;
+        H = htmlLocalizer;
+        _notifier = notifier;
+        _logger = logger;
+    }
 
-        public override IDisplayResult Display(FlowPart flowPart, BuildPartDisplayContext context)
-        {
-            var hasItems = flowPart.Widgets.Count > 0;
+    public override IDisplayResult Display(FlowPart flowPart, BuildPartDisplayContext context)
+    {
+        var hasItems = flowPart.Widgets.Count > 0;
 
-            return Initialize<FlowPartViewModel>(hasItems ? "FlowPart" : "FlowPart_Empty", m =>
-            {
-                m.FlowPart = flowPart;
-                m.BuildPartDisplayContext = context;
-            })
-            .Location("Detail", "Content");
-        }
+        return Initialize<FlowPartViewModel>(hasItems ? "FlowPart" : "FlowPart_Empty", m =>
+        {
+            m.FlowPart = flowPart;
+            m.BuildPartDisplayContext = context;
+        })
+        .Location("Detail", "Content");
+    }
 
-        public override IDisplayResult Edit(FlowPart flowPart, BuildPartEditorContext context)
+    public override IDisplayResult Edit(FlowPart flowPart, BuildPartEditorContext context)
+    {
+        return Initialize<FlowPartEditViewModel>(GetEditorShapeType(context), async model =>
         {
-            return Initialize<FlowPartEditViewModel>(GetEditorShapeType(context), async model =>
-            {
-                var containedContentTypes = await GetContainedContentTypesAsync(context.TypePartDefinition);
-                var notify = false;
+            var containedContentTypes = await GetContainedContentTypesAsync(context.TypePartDefinition);
+            var notify = false;
 
-                var existingWidgets = new List<ContentItem>();
+            var existingWidgets = new List<ContentItem>();
 
-                foreach (var widget in flowPart.Widgets)
+            foreach (var widget in flowPart.Widgets)
+            {
+                if (!containedContentTypes.Any(c => c.Name == widget.ContentType))
                 {
-                    if (!containedContentTypes.Any(c => c.Name == widget.ContentType))
-                    {
-                        _logger.LogWarning("The Widget content item with id {ContentItemId} has no matching {ContentType} content type definition.", widget.ContentItem.ContentItemId, widget.ContentItem.ContentType);
-                        await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", widget.ContentItem.ContentItemId, widget.ContentItem.ContentType]);
-                        notify = true;
-                    }
-                    else
-                    {
-                        existingWidgets.Add(widget);
-                    }
+                    _logger.LogWarning("The Widget content item with id {ContentItemId} has no matching {ContentType} content type definition.", widget.ContentItem.ContentItemId, widget.ContentItem.ContentType);
+                    await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", widget.ContentItem.ContentItemId, widget.ContentItem.ContentType]);
+                    notify = true;
                 }
-
-                flowPart.Widgets = existingWidgets;
-
-                if (notify)
+                else
                 {
-                    await _notifier.WarningAsync(H["Publishing this content item may erase created content. Fix any content type issues beforehand."]);
+                    existingWidgets.Add(widget);
                 }
+            }
 
-                model.FlowPart = flowPart;
-                model.Updater = context.Updater;
-                model.ContainedContentTypeDefinitions = containedContentTypes;
-            });
-        }
-
-        public override async Task<IDisplayResult> UpdateAsync(FlowPart part, UpdatePartEditorContext context)
-        {
-            var contentItemDisplayManager = _serviceProvider.GetRequiredService<IContentItemDisplayManager>();
+            flowPart.Widgets = existingWidgets;
 
-            var model = new FlowPartEditViewModel { FlowPart = part };
+            if (notify)
+            {
+                await _notifier.WarningAsync(H["Publishing this content item may erase created content. Fix any content type issues beforehand."]);
+            }
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+            model.FlowPart = flowPart;
+            model.Updater = context.Updater;
+            model.ContainedContentTypeDefinitions = containedContentTypes;
+        });
+    }
 
-            var contentItems = new List<ContentItem>();
+    public override async Task<IDisplayResult> UpdateAsync(FlowPart part, UpdatePartEditorContext context)
+    {
+        var contentItemDisplayManager = _serviceProvider.GetRequiredService<IContentItemDisplayManager>();
 
-            for (var i = 0; i < model.Prefixes.Length; i++)
-            {
-                var contentItem = await _contentManager.NewAsync(model.ContentTypes[i]);
-                var existingContentItem = part.Widgets.FirstOrDefault(x => string.Equals(x.ContentItemId, model.ContentItems[i], StringComparison.OrdinalIgnoreCase));
+        var model = new FlowPartEditViewModel { FlowPart = part };
 
-                // When the content item already exists merge its elements to reverse nested content item ids.
-                // All of the data for these merged items is then replaced by the model values on update, while a nested content item id is maintained.
-                // This prevents nested items which rely on the content item id, i.e. the media attached field, losing their reference point.
-                if (existingContentItem != null)
-                {
-                    contentItem.ContentItemId = model.ContentItems[i];
-                    contentItem.Merge(existingContentItem);
-                }
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-                contentItem.Weld(new FlowMetadata());
+        var contentItems = new List<ContentItem>();
 
-                var widgetModel = await contentItemDisplayManager.UpdateEditorAsync(contentItem, context.Updater, context.IsNew, htmlFieldPrefix: model.Prefixes[i]);
+        for (var i = 0; i < model.Prefixes.Length; i++)
+        {
+            var contentItem = await _contentManager.NewAsync(model.ContentTypes[i]);
+            var existingContentItem = part.Widgets.FirstOrDefault(x => string.Equals(x.ContentItemId, model.ContentItems[i], StringComparison.OrdinalIgnoreCase));
 
-                contentItems.Add(contentItem);
+            // When the content item already exists merge its elements to reverse nested content item ids.
+            // All of the data for these merged items is then replaced by the model values on update, while a nested content item id is maintained.
+            // This prevents nested items which rely on the content item id, i.e. the media attached field, losing their reference point.
+            if (existingContentItem != null)
+            {
+                contentItem.ContentItemId = model.ContentItems[i];
+                contentItem.Merge(existingContentItem);
             }
 
-            part.Widgets = contentItems;
+            contentItem.Weld(new FlowMetadata());
 
-            return Edit(part, context);
+            var widgetModel = await contentItemDisplayManager.UpdateEditorAsync(contentItem, context.Updater, context.IsNew, htmlFieldPrefix: model.Prefixes[i]);
+
+            contentItems.Add(contentItem);
         }
 
-        private async Task<IEnumerable<ContentTypeDefinition>> GetContainedContentTypesAsync(ContentTypePartDefinition typePartDefinition)
-        {
-            var settings = typePartDefinition.GetSettings<FlowPartSettings>();
+        part.Widgets = contentItems;
 
-            if (settings?.ContainedContentTypes == null || settings.ContainedContentTypes.Length == 0)
-            {
-                return (await _contentDefinitionManager.ListTypeDefinitionsAsync())
-                    .Where(t => t.StereotypeEquals("Widget"));
-            }
+        return Edit(part, context);
+    }
 
+    private async Task<IEnumerable<ContentTypeDefinition>> GetContainedContentTypesAsync(ContentTypePartDefinition typePartDefinition)
+    {
+        var settings = typePartDefinition.GetSettings<FlowPartSettings>();
+
+        if (settings?.ContainedContentTypes == null || settings.ContainedContentTypes.Length == 0)
+        {
             return (await _contentDefinitionManager.ListTypeDefinitionsAsync())
-                .Where(t => settings.ContainedContentTypes.Contains(t.Name) && t.StereotypeEquals("Widget"));
+                .Where(t => t.StereotypeEquals("Widget"));
         }
+
+        return (await _contentDefinitionManager.ListTypeDefinitionsAsync())
+            .Where(t => settings.ContainedContentTypes.Contains(t.Name) && t.StereotypeEquals("Widget"));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/BagPartQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/BagPartQueryObjectType.cs
index bd7d7bd17af..c559c1f6596 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/BagPartQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/BagPartQueryObjectType.cs
@@ -6,19 +6,18 @@
 using OrchardCore.ContentManagement.GraphQL.Queries.Types;
 using OrchardCore.Flows.Models;
 
-namespace OrchardCore.Flows.GraphQL
+namespace OrchardCore.Flows.GraphQL;
+
+public class BagPartQueryObjectType : ObjectGraphType<BagPart>
 {
-    public class BagPartQueryObjectType : ObjectGraphType<BagPart>
+    public BagPartQueryObjectType(IStringLocalizer<BagPartQueryObjectType> S)
     {
-        public BagPartQueryObjectType(IStringLocalizer<BagPartQueryObjectType> S)
-        {
-            Name = "BagPart";
-            Description = S["A BagPart allows to add content items directly within another content item"];
+        Name = "BagPart";
+        Description = S["A BagPart allows to add content items directly within another content item"];
 
-            Field<ListGraphType<ContentItemInterface>, IEnumerable<ContentItem>>("contentItems")
-                .Description("the content items")
-                .PagingArguments()
-                .Resolve(x => x.Page(x.Source.ContentItems));
-        }
+        Field<ListGraphType<ContentItemInterface>, IEnumerable<ContentItem>>("contentItems")
+            .Description("the content items")
+            .PagingArguments()
+            .Resolve(x => x.Page(x.Source.ContentItems));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/FlowAlignmentEnum.cs b/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/FlowAlignmentEnum.cs
index e0b3397bbd2..52b78698012 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/FlowAlignmentEnum.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/FlowAlignmentEnum.cs
@@ -1,18 +1,17 @@
 using GraphQL.Types;
 
-namespace OrchardCore.Flows.GraphQL
+namespace OrchardCore.Flows.GraphQL;
+
+public class FlowAlignmentEnum : EnumerationGraphType
 {
-    public class FlowAlignmentEnum : EnumerationGraphType
+    public FlowAlignmentEnum()
     {
-        public FlowAlignmentEnum()
-        {
-            Name = "FlowAlignment";
+        Name = "FlowAlignment";
 
-            Description = "The widget alignment.";
-            Add("Left", 0, "Left alignment.");
-            Add("Center", 1, "Center alignment.");
-            Add("Right", 2, "Right alignment.");
-            Add("Justify", 3, "Justify alignment.");
-        }
+        Description = "The widget alignment.";
+        Add("Left", 0, "Left alignment.");
+        Add("Center", 1, "Center alignment.");
+        Add("Right", 2, "Right alignment.");
+        Add("Justify", 3, "Justify alignment.");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/FlowMetadataContentTypeBuilder.cs b/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/FlowMetadataContentTypeBuilder.cs
index 697104e9050..25119a26ccc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/FlowMetadataContentTypeBuilder.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/FlowMetadataContentTypeBuilder.cs
@@ -4,19 +4,18 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Flows.Models;
 
-namespace OrchardCore.Flows.GraphQL
+namespace OrchardCore.Flows.GraphQL;
+
+public class FlowMetadataContentTypeBuilder : IContentTypeBuilder
 {
-    public class FlowMetadataContentTypeBuilder : IContentTypeBuilder
+    public void Build(ISchema schema, FieldType contentQuery, ContentTypeDefinition contentTypeDefinition, ContentItemType contentItemType)
     {
-        public void Build(ISchema schema, FieldType contentQuery, ContentTypeDefinition contentTypeDefinition, ContentItemType contentItemType)
+        if (contentTypeDefinition.GetStereotype() != "Widget")
         {
-            if (contentTypeDefinition.GetStereotype() != "Widget")
-            {
-                return;
-            }
-
-            contentItemType.Field<FlowMetadataQueryObjectType>("metadata")
-                .Resolve(context => context.Source.As<FlowMetadata>());
+            return;
         }
+
+        contentItemType.Field<FlowMetadataQueryObjectType>("metadata")
+            .Resolve(context => context.Source.As<FlowMetadata>());
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/FlowMetadataQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/FlowMetadataQueryObjectType.cs
index 91db64109ec..6f7a422621e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/FlowMetadataQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/FlowMetadataQueryObjectType.cs
@@ -1,16 +1,15 @@
 using GraphQL.Types;
 using OrchardCore.Flows.Models;
 
-namespace OrchardCore.Flows.GraphQL
+namespace OrchardCore.Flows.GraphQL;
+
+public class FlowMetadataQueryObjectType : ObjectGraphType<FlowMetadata>
 {
-    public class FlowMetadataQueryObjectType : ObjectGraphType<FlowMetadata>
+    public FlowMetadataQueryObjectType()
     {
-        public FlowMetadataQueryObjectType()
-        {
-            Name = "FlowMetadata";
+        Name = "FlowMetadata";
 
-            Field(x => x.Size, nullable: true);
-            Field<FlowAlignmentEnum>("alignment");
-        }
+        Field(x => x.Size, nullable: true);
+        Field<FlowAlignmentEnum>("alignment");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/FlowPartQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/FlowPartQueryObjectType.cs
index 7f3019906be..04ef713cd5d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/FlowPartQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/FlowPartQueryObjectType.cs
@@ -3,18 +3,17 @@
 using OrchardCore.ContentManagement.GraphQL.Queries.Types;
 using OrchardCore.Flows.Models;
 
-namespace OrchardCore.Flows.GraphQL
+namespace OrchardCore.Flows.GraphQL;
+
+public class FlowPartQueryObjectType : ObjectGraphType<FlowPart>
 {
-    public class FlowPartQueryObjectType : ObjectGraphType<FlowPart>
+    public FlowPartQueryObjectType(IStringLocalizer<FlowPartQueryObjectType> S)
     {
-        public FlowPartQueryObjectType(IStringLocalizer<FlowPartQueryObjectType> S)
-        {
-            Name = "FlowPart";
-            Description = S["A FlowPart allows to add content items directly within another content item"];
+        Name = "FlowPart";
+        Description = S["A FlowPart allows to add content items directly within another content item"];
 
-            Field<ListGraphType<ContentItemInterface>>("widgets")
-               .Description("The widgets.")
-               .Resolve(context => context.Source.Widgets);
-        }
+        Field<ListGraphType<ContentItemInterface>>("widgets")
+           .Description("The widgets.")
+           .Resolve(context => context.Source.Widgets);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/Startup.cs
index 80d88ed5e6c..2a206710b73 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/Startup.cs
@@ -4,18 +4,17 @@
 using OrchardCore.Flows.Models;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Flows.GraphQL
+namespace OrchardCore.Flows.GraphQL;
+
+[RequireFeatures("OrchardCore.Apis.GraphQL")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Apis.GraphQL")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddObjectGraphType<BagPart, BagPartQueryObjectType>();
-            services.AddObjectGraphType<FlowPart, FlowPartQueryObjectType>();
-            services.AddObjectGraphType<FlowMetadata, FlowMetadataQueryObjectType>();
+        services.AddObjectGraphType<BagPart, BagPartQueryObjectType>();
+        services.AddObjectGraphType<FlowPart, FlowPartQueryObjectType>();
+        services.AddObjectGraphType<FlowMetadata, FlowMetadataQueryObjectType>();
 
-            services.AddScoped<IContentTypeBuilder, FlowMetadataContentTypeBuilder>();
-        }
+        services.AddScoped<IContentTypeBuilder, FlowMetadataContentTypeBuilder>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Handlers/BagPartHandler.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Handlers/BagPartHandler.cs
index f26e5f44f01..525580dfbc0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Handlers/BagPartHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Handlers/BagPartHandler.cs
@@ -4,23 +4,22 @@
 using OrchardCore.ContentManagement.Routing;
 using OrchardCore.Flows.Models;
 
-namespace OrchardCore.Flows.Handlers
+namespace OrchardCore.Flows.Handlers;
+
+public class BagPartHandler : ContentPartHandler<BagPart>
 {
-    public class BagPartHandler : ContentPartHandler<BagPart>
+    public override Task GetContentItemAspectAsync(ContentItemAspectContext context, BagPart part)
     {
-        public override Task GetContentItemAspectAsync(ContentItemAspectContext context, BagPart part)
+        return context.ForAsync<ContainedContentItemsAspect>(aspect =>
         {
-            return context.ForAsync<ContainedContentItemsAspect>(aspect =>
+            aspect.Accessors.Add((jsonObject) =>
             {
-                aspect.Accessors.Add((jsonObject) =>
-                {
-                    // Content.Path contains the accessor for named bag parts and typed bag parts.
-                    var jContent = (JsonObject)part.Content;
-                    return jsonObject[jContent.GetNormalizedPath()]["ContentItems"] as JsonArray;
-                });
-
-                return Task.CompletedTask;
+                // Content.Path contains the accessor for named bag parts and typed bag parts.
+                var jContent = (JsonObject)part.Content;
+                return jsonObject[jContent.GetNormalizedPath()]["ContentItems"] as JsonArray;
             });
-        }
+
+            return Task.CompletedTask;
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Indexing/BagPartIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Indexing/BagPartIndexHandler.cs
index 928643d7994..1f7fa898cdb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Indexing/BagPartIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Indexing/BagPartIndexHandler.cs
@@ -5,48 +5,47 @@
 using OrchardCore.Flows.Models;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.Flows.Indexing
+namespace OrchardCore.Flows.Indexing;
+
+public class BagPartIndexHandler : ContentPartIndexHandler<BagPart>
 {
-    public class BagPartIndexHandler : ContentPartIndexHandler<BagPart>
+    private readonly IServiceProvider _serviceProvider;
+
+    public BagPartIndexHandler(IServiceProvider serviceProvider)
     {
-        private readonly IServiceProvider _serviceProvider;
+        _serviceProvider = serviceProvider;
+    }
 
-        public BagPartIndexHandler(IServiceProvider serviceProvider)
+    public override async Task BuildIndexAsync(BagPart bagPart, BuildPartIndexContext context)
+    {
+        var options = context.Settings.ToOptions();
+        if (options == DocumentIndexOptions.None)
         {
-            _serviceProvider = serviceProvider;
+            return;
         }
 
-        public override async Task BuildIndexAsync(BagPart bagPart, BuildPartIndexContext context)
+        if (bagPart.ContentItems.Count != 0)
         {
-            var options = context.Settings.ToOptions();
-            if (options == DocumentIndexOptions.None)
-            {
-                return;
-            }
+            // Lazy resolution to prevent cyclic dependency.
+            var contentItemIndexHandlers = _serviceProvider.GetServices<IContentItemIndexHandler>();
 
-            if (bagPart.ContentItems.Count != 0)
+            foreach (var contentItemIndexHandler in contentItemIndexHandlers)
             {
-                // Lazy resolution to prevent cyclic dependency.
-                var contentItemIndexHandlers = _serviceProvider.GetServices<IContentItemIndexHandler>();
-
-                foreach (var contentItemIndexHandler in contentItemIndexHandlers)
+                foreach (var contentItem in bagPart.ContentItems)
                 {
-                    foreach (var contentItem in bagPart.ContentItems)
+                    var keys = new List<string>
                     {
-                        var keys = new List<string>
-                        {
-                            contentItem.ContentType,
-                        };
+                        contentItem.ContentType,
+                    };
 
-                        foreach (var key in context.Keys)
-                        {
-                            keys.Add($"{key}.{contentItem.ContentType}");
-                        }
+                    foreach (var key in context.Keys)
+                    {
+                        keys.Add($"{key}.{contentItem.ContentType}");
+                    }
 
-                        var buildIndexContext = new BuildIndexContext(context.DocumentIndex, contentItem, keys, context.Settings);
+                    var buildIndexContext = new BuildIndexContext(context.DocumentIndex, contentItem, keys, context.Settings);
 
-                        await contentItemIndexHandler.BuildIndexAsync(buildIndexContext);
-                    }
+                    await contentItemIndexHandler.BuildIndexAsync(buildIndexContext);
                 }
             }
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Indexing/FlowPartIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Indexing/FlowPartIndexHandler.cs
index 11597f9d0f3..c11a1ffa859 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Indexing/FlowPartIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Indexing/FlowPartIndexHandler.cs
@@ -5,48 +5,47 @@
 using OrchardCore.Flows.Models;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.Flows.Indexing
+namespace OrchardCore.Flows.Indexing;
+
+public class FlowPartIndexHandler : ContentPartIndexHandler<FlowPart>
 {
-    public class FlowPartIndexHandler : ContentPartIndexHandler<FlowPart>
+    private readonly IServiceProvider _serviceProvider;
+
+    public FlowPartIndexHandler(IServiceProvider serviceProvider)
     {
-        private readonly IServiceProvider _serviceProvider;
+        _serviceProvider = serviceProvider;
+    }
 
-        public FlowPartIndexHandler(IServiceProvider serviceProvider)
+    public override async Task BuildIndexAsync(FlowPart FlowPart, BuildPartIndexContext context)
+    {
+        var options = context.Settings.ToOptions();
+        if (options == DocumentIndexOptions.None)
         {
-            _serviceProvider = serviceProvider;
+            return;
         }
 
-        public override async Task BuildIndexAsync(FlowPart FlowPart, BuildPartIndexContext context)
+        if (FlowPart.Widgets.Count != 0)
         {
-            var options = context.Settings.ToOptions();
-            if (options == DocumentIndexOptions.None)
-            {
-                return;
-            }
+            // Lazy resolution to prevent cyclic dependency.
+            var contentItemIndexHandlers = _serviceProvider.GetServices<IContentItemIndexHandler>();
 
-            if (FlowPart.Widgets.Count != 0)
+            foreach (var contentItemIndexHandler in contentItemIndexHandlers)
             {
-                // Lazy resolution to prevent cyclic dependency.
-                var contentItemIndexHandlers = _serviceProvider.GetServices<IContentItemIndexHandler>();
-
-                foreach (var contentItemIndexHandler in contentItemIndexHandlers)
+                foreach (var contentItem in FlowPart.Widgets)
                 {
-                    foreach (var contentItem in FlowPart.Widgets)
+                    var keys = new List<string>
                     {
-                        var keys = new List<string>
-                        {
-                            contentItem.ContentType,
-                        };
+                        contentItem.ContentType,
+                    };
 
-                        foreach (var key in context.Keys)
-                        {
-                            keys.Add($"{key}.{contentItem.ContentType}");
-                        }
+                    foreach (var key in context.Keys)
+                    {
+                        keys.Add($"{key}.{contentItem.ContentType}");
+                    }
 
-                        var buildIndexContext = new BuildIndexContext(context.DocumentIndex, contentItem, keys, context.Settings);
+                    var buildIndexContext = new BuildIndexContext(context.DocumentIndex, contentItem, keys, context.Settings);
 
-                        await contentItemIndexHandler.BuildIndexAsync(buildIndexContext);
-                    }
+                    await contentItemIndexHandler.BuildIndexAsync(buildIndexContext);
                 }
             }
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Migrations.cs
index 37e6f0250b0..c4a8c830ab6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Migrations.cs
@@ -4,50 +4,49 @@
 using OrchardCore.Data.Migration;
 using OrchardCore.Flows.Models;
 
-namespace OrchardCore.Flows
+namespace OrchardCore.Flows;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+
+    public Migrations(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
+
+    public async Task<int> CreateAsync()
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-
-        public Migrations(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
-
-        public async Task<int> CreateAsync()
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync("FlowPart", builder => builder
-                .Attachable()
-                .WithDescription("Provides a customizable body for your content item where you can build a content structure with widgets."));
-
-            await _contentDefinitionManager.AlterPartDefinitionAsync("BagPart", builder => builder
-                .Attachable()
-                .Reusable()
-                .WithDescription("Provides a collection behavior for your content item where you can place other content items."));
-
-            // Shortcut other migration steps on new content definition schemas.
-            return 3;
-        }
-
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom1Async()
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync("BagPart", builder => builder
-                .Attachable()
-                .Reusable()
-                .WithDescription("Provides a collection behavior for your content item where you can place other content items."));
-
-            return 2;
-        }
-
-        // Migrate PartSettings. This only needs to run on old content definition schemas.
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom2Async()
-        {
-            await _contentDefinitionManager.MigratePartSettingsAsync<BagPart, BagPartSettings>();
-
-            return 3;
-        }
+        await _contentDefinitionManager.AlterPartDefinitionAsync("FlowPart", builder => builder
+            .Attachable()
+            .WithDescription("Provides a customizable body for your content item where you can build a content structure with widgets."));
+
+        await _contentDefinitionManager.AlterPartDefinitionAsync("BagPart", builder => builder
+            .Attachable()
+            .Reusable()
+            .WithDescription("Provides a collection behavior for your content item where you can place other content items."));
+
+        // Shortcut other migration steps on new content definition schemas.
+        return 3;
+    }
+
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom1Async()
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync("BagPart", builder => builder
+            .Attachable()
+            .Reusable()
+            .WithDescription("Provides a collection behavior for your content item where you can place other content items."));
+
+        return 2;
+    }
+
+    // Migrate PartSettings. This only needs to run on old content definition schemas.
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom2Async()
+    {
+        await _contentDefinitionManager.MigratePartSettingsAsync<BagPart, BagPartSettings>();
+
+        return 3;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Models/BagPart.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Models/BagPart.cs
index 7b5ed798795..b1c07518afa 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Models/BagPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Models/BagPart.cs
@@ -2,11 +2,10 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Flows.Models
+namespace OrchardCore.Flows.Models;
+
+public class BagPart : ContentPart
 {
-    public class BagPart : ContentPart
-    {
-        [BindNever]
-        public List<ContentItem> ContentItems { get; set; } = [];
-    }
+    [BindNever]
+    public List<ContentItem> ContentItems { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Models/BagPartSettings.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Models/BagPartSettings.cs
index 03944116cb6..9cfa19df96d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Models/BagPartSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Models/BagPartSettings.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.Flows.Models
+namespace OrchardCore.Flows.Models;
+
+public class BagPartSettings
 {
-    public class BagPartSettings
-    {
-        public string[] ContainedContentTypes { get; set; } = [];
+    public string[] ContainedContentTypes { get; set; } = [];
 
-        public string[] ContainedStereotypes { get; set; } = [];
+    public string[] ContainedStereotypes { get; set; } = [];
 
-        public string DisplayType { get; set; }
-    }
+    public string DisplayType { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Models/FlowMetadata.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Models/FlowMetadata.cs
index b3e1c1fbd98..f5408160a3a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Models/FlowMetadata.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Models/FlowMetadata.cs
@@ -1,18 +1,17 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Flows.Models
+namespace OrchardCore.Flows.Models;
+
+public enum FlowAlignment
 {
-    public enum FlowAlignment
-    {
-        Left,
-        Center,
-        Right,
-        Justify
-    }
+    Left,
+    Center,
+    Right,
+    Justify
+}
 
-    public class FlowMetadata : ContentPart
-    {
-        public FlowAlignment Alignment { get; set; } = FlowAlignment.Justify;
-        public int Size { get; set; } = 100;
-    }
+public class FlowMetadata : ContentPart
+{
+    public FlowAlignment Alignment { get; set; } = FlowAlignment.Justify;
+    public int Size { get; set; } = 100;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Models/FlowPart.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Models/FlowPart.cs
index 8a745e952db..6e1c43e6647 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Models/FlowPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Models/FlowPart.cs
@@ -2,11 +2,10 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Flows.Models
+namespace OrchardCore.Flows.Models;
+
+public class FlowPart : ContentPart
 {
-    public class FlowPart : ContentPart
-    {
-        [BindNever]
-        public List<ContentItem> Widgets { get; set; } = [];
-    }
+    [BindNever]
+    public List<ContentItem> Widgets { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Models/FlowPartSettings.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Models/FlowPartSettings.cs
index b6170a25dc4..88f38a0b8f5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Models/FlowPartSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Models/FlowPartSettings.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Flows.Models
+namespace OrchardCore.Flows.Models;
+
+public class FlowPartSettings
 {
-    public class FlowPartSettings
-    {
-        public string[] ContainedContentTypes { get; set; } = [];
-    }
+    public string[] ContainedContentTypes { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Settings/BagPartSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Settings/BagPartSettingsDisplayDriver.cs
index 8943269207d..52e59a689cc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Settings/BagPartSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Settings/BagPartSettingsDisplayDriver.cs
@@ -10,99 +10,98 @@
 using OrchardCore.Flows.ViewModels;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Flows.Settings
-{
-    public sealed class BagPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<BagPart>
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+namespace OrchardCore.Flows.Settings;
 
-        internal readonly IStringLocalizer S;
+public sealed class BagPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<BagPart>
+{
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        public BagPartSettingsDisplayDriver(
-            IContentDefinitionManager contentDefinitionManager,
-            IStringLocalizer<BagPartSettingsDisplayDriver> localizer)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            S = localizer;
-        }
+    internal readonly IStringLocalizer S;
 
-        public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
-        {
-            return Initialize<BagPartSettingsViewModel>("BagPartSettings_Edit", async model =>
-            {
-                var settings = contentTypePartDefinition.GetSettings<BagPartSettings>();
-
-                model.BagPartSettings = settings;
-                model.ContainedContentTypes = model.BagPartSettings.ContainedContentTypes;
-                model.DisplayType = model.BagPartSettings.DisplayType;
-                model.ContentTypes = [];
-                model.Source = settings.ContainedStereotypes != null && settings.ContainedStereotypes.Length > 0 ? BagPartSettingType.Stereotypes : BagPartSettingType.ContentTypes;
-                model.Stereotypes = string.Join(',', settings.ContainedStereotypes ?? []);
-                foreach (var contentTypeDefinition in await _contentDefinitionManager.ListTypeDefinitionsAsync())
-                {
-                    model.ContentTypes.Add(contentTypeDefinition.Name, contentTypeDefinition.DisplayName);
-                }
-            }).Location("Content");
-        }
+    public BagPartSettingsDisplayDriver(
+        IContentDefinitionManager contentDefinitionManager,
+        IStringLocalizer<BagPartSettingsDisplayDriver> localizer)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+        S = localizer;
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    {
+        return Initialize<BagPartSettingsViewModel>("BagPartSettings_Edit", async model =>
         {
-            var model = new BagPartSettingsViewModel();
-
-            await context.Updater.TryUpdateModelAsync(model, Prefix,
-                m => m.ContainedContentTypes,
-                m => m.DisplayType,
-                m => m.Source,
-                m => m.Stereotypes);
+            var settings = contentTypePartDefinition.GetSettings<BagPartSettings>();
 
-            switch (model.Source)
+            model.BagPartSettings = settings;
+            model.ContainedContentTypes = model.BagPartSettings.ContainedContentTypes;
+            model.DisplayType = model.BagPartSettings.DisplayType;
+            model.ContentTypes = [];
+            model.Source = settings.ContainedStereotypes != null && settings.ContainedStereotypes.Length > 0 ? BagPartSettingType.Stereotypes : BagPartSettingType.ContentTypes;
+            model.Stereotypes = string.Join(',', settings.ContainedStereotypes ?? []);
+            foreach (var contentTypeDefinition in await _contentDefinitionManager.ListTypeDefinitionsAsync())
             {
-                case BagPartSettingType.ContentTypes:
-                    SetContentTypes(context, model);
-                    break;
-                case BagPartSettingType.Stereotypes:
-                    SetStereoTypes(context, model);
-                    break;
-                default:
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(model.Source), S["Content type source must be set with a valid value."]);
-                    break;
+                model.ContentTypes.Add(contentTypeDefinition.Name, contentTypeDefinition.DisplayName);
             }
+        }).Location("Content");
+    }
 
-            return Edit(contentTypePartDefinition, context);
-        }
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    {
+        var model = new BagPartSettingsViewModel();
+
+        await context.Updater.TryUpdateModelAsync(model, Prefix,
+            m => m.ContainedContentTypes,
+            m => m.DisplayType,
+            m => m.Source,
+            m => m.Stereotypes);
 
-        private void SetStereoTypes(UpdateTypePartEditorContext context, BagPartSettingsViewModel model)
+        switch (model.Source)
         {
-            if (string.IsNullOrEmpty(model.Stereotypes))
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Stereotypes), S["Please provide a Stereotype."]);
+            case BagPartSettingType.ContentTypes:
+                SetContentTypes(context, model);
+                break;
+            case BagPartSettingType.Stereotypes:
+                SetStereoTypes(context, model);
+                break;
+            default:
+                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Source), S["Content type source must be set with a valid value."]);
+                break;
+        }
 
-                return;
-            }
+        return Edit(contentTypePartDefinition, context);
+    }
 
-            context.Builder.WithSettings(new BagPartSettings
-            {
-                ContainedContentTypes = [],
-                ContainedStereotypes = model.Stereotypes.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries),
-                DisplayType = model.DisplayType
-            });
+    private void SetStereoTypes(UpdateTypePartEditorContext context, BagPartSettingsViewModel model)
+    {
+        if (string.IsNullOrEmpty(model.Stereotypes))
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(model.Stereotypes), S["Please provide a Stereotype."]);
+
+            return;
         }
 
-        private void SetContentTypes(UpdateTypePartEditorContext context, BagPartSettingsViewModel model)
+        context.Builder.WithSettings(new BagPartSettings
         {
-            if (model.ContainedContentTypes == null || model.ContainedContentTypes.Length == 0)
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(model.ContainedContentTypes), S["At least one content type must be selected."]);
+            ContainedContentTypes = [],
+            ContainedStereotypes = model.Stereotypes.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries),
+            DisplayType = model.DisplayType
+        });
+    }
 
-                return;
-            }
+    private void SetContentTypes(UpdateTypePartEditorContext context, BagPartSettingsViewModel model)
+    {
+        if (model.ContainedContentTypes == null || model.ContainedContentTypes.Length == 0)
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(model.ContainedContentTypes), S["At least one content type must be selected."]);
 
-            context.Builder.WithSettings(new BagPartSettings
-            {
-                ContainedContentTypes = model.ContainedContentTypes,
-                ContainedStereotypes = [],
-                DisplayType = model.DisplayType
-            });
+            return;
         }
+
+        context.Builder.WithSettings(new BagPartSettings
+        {
+            ContainedContentTypes = model.ContainedContentTypes,
+            ContainedStereotypes = [],
+            DisplayType = model.DisplayType
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Settings/FlowPartSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Settings/FlowPartSettingsDisplayDriver.cs
index 2570e113123..96328023e0f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Settings/FlowPartSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Settings/FlowPartSettingsDisplayDriver.cs
@@ -8,45 +8,44 @@
 using OrchardCore.Flows.Models;
 using OrchardCore.Flows.ViewModels;
 
-namespace OrchardCore.Flows.Settings
+namespace OrchardCore.Flows.Settings;
+
+public sealed class FlowPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<FlowPart>
 {
-    public sealed class FlowPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<FlowPart>
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+
+    public FlowPartSettingsDisplayDriver(IContentDefinitionManager contentDefinitionManager)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public FlowPartSettingsDisplayDriver(IContentDefinitionManager contentDefinitionManager)
+    public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    {
+        return Initialize<FlowPartSettingsViewModel>("FlowPartSettings_Edit", async model =>
         {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+            model.FlowPartSettings = contentTypePartDefinition.GetSettings<FlowPartSettings>();
+            model.ContainedContentTypes = model.FlowPartSettings.ContainedContentTypes;
+            model.ContentTypes = [];
 
-        public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
-        {
-            return Initialize<FlowPartSettingsViewModel>("FlowPartSettings_Edit", async model =>
+            foreach (var contentTypeDefinition in (await _contentDefinitionManager.ListTypeDefinitionsAsync()).Where(t => t.GetStereotype() == "Widget"))
             {
-                model.FlowPartSettings = contentTypePartDefinition.GetSettings<FlowPartSettings>();
-                model.ContainedContentTypes = model.FlowPartSettings.ContainedContentTypes;
-                model.ContentTypes = [];
-
-                foreach (var contentTypeDefinition in (await _contentDefinitionManager.ListTypeDefinitionsAsync()).Where(t => t.GetStereotype() == "Widget"))
-                {
-                    model.ContentTypes.Add(contentTypeDefinition.Name, contentTypeDefinition.DisplayName);
-                }
-            }).Location("Content");
-        }
-
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
-        {
-            var model = new FlowPartSettingsViewModel();
+                model.ContentTypes.Add(contentTypeDefinition.Name, contentTypeDefinition.DisplayName);
+            }
+        }).Location("Content");
+    }
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix,
-                m => m.ContainedContentTypes);
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    {
+        var model = new FlowPartSettingsViewModel();
 
-            context.Builder.WithSettings(new FlowPartSettings
-            {
-                ContainedContentTypes = model.ContainedContentTypes
-            });
+        await context.Updater.TryUpdateModelAsync(model, Prefix,
+            m => m.ContainedContentTypes);
+
+        context.Builder.WithSettings(new FlowPartSettings
+        {
+            ContainedContentTypes = model.ContainedContentTypes
+        });
 
-            return Edit(contentTypePartDefinition, context);
-        }
+        return Edit(contentTypePartDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Startup.cs
index 2b6797f6ca5..4b2b727b07f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Startup.cs
@@ -15,40 +15,39 @@
 using OrchardCore.Modules;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Flows
+namespace OrchardCore.Flows;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<BagPartViewModel>();
-                o.MemberAccessStrategy.Register<FlowPartViewModel>();
-                o.MemberAccessStrategy.Register<FlowMetadata>();
-                o.MemberAccessStrategy.Register<FlowPart>();
-            });
-
-            // Flow Part
-            services.AddContentPart<FlowPart>()
-                .UseDisplayDriver<FlowPartDisplayDriver>();
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, FlowPartSettingsDisplayDriver>();
-            services.AddScoped<IContentPartIndexHandler, FlowPartIndexHandler>();
-
-            services.AddScoped<IContentDisplayDriver, FlowMetadataDisplayDriver>();
-
-            // Bag Part
-            services.AddContentPart<BagPart>()
-                .UseDisplayDriver<BagPartDisplayDriver>()
-                .AddHandler<BagPartHandler>();
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, BagPartSettingsDisplayDriver>();
-            services.AddScoped<IContentPartIndexHandler, BagPartIndexHandler>();
-
-            services.AddContentPart<FlowMetadata>();
-
-            services.AddDataMigration<Migrations>();
-
-            services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
-        }
+            o.MemberAccessStrategy.Register<BagPartViewModel>();
+            o.MemberAccessStrategy.Register<FlowPartViewModel>();
+            o.MemberAccessStrategy.Register<FlowMetadata>();
+            o.MemberAccessStrategy.Register<FlowPart>();
+        });
+
+        // Flow Part
+        services.AddContentPart<FlowPart>()
+            .UseDisplayDriver<FlowPartDisplayDriver>();
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, FlowPartSettingsDisplayDriver>();
+        services.AddScoped<IContentPartIndexHandler, FlowPartIndexHandler>();
+
+        services.AddScoped<IContentDisplayDriver, FlowMetadataDisplayDriver>();
+
+        // Bag Part
+        services.AddContentPart<BagPart>()
+            .UseDisplayDriver<BagPartDisplayDriver>()
+            .AddHandler<BagPartHandler>();
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, BagPartSettingsDisplayDriver>();
+        services.AddScoped<IContentPartIndexHandler, BagPartIndexHandler>();
+
+        services.AddContentPart<FlowMetadata>();
+
+        services.AddDataMigration<Migrations>();
+
+        services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BagPartEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BagPartEditViewModel.cs
index f58f0713cbe..9e37b7110ba 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BagPartEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BagPartEditViewModel.cs
@@ -5,28 +5,27 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.Flows.Models;
 
-namespace OrchardCore.Flows.ViewModels
+namespace OrchardCore.Flows.ViewModels;
+
+public class BagPartEditViewModel
 {
-    public class BagPartEditViewModel
-    {
-        public string[] Prefixes { get; set; } = [];
-        public string[] ContentTypes { get; set; } = [];
-        public string[] ContentItems { get; set; } = [];
+    public string[] Prefixes { get; set; } = [];
+    public string[] ContentTypes { get; set; } = [];
+    public string[] ContentItems { get; set; } = [];
 
-        [BindNever]
-        public BagPart BagPart { get; set; }
+    [BindNever]
+    public BagPart BagPart { get; set; }
 
-        [IgnoreDataMember]
-        [BindNever]
-        public IUpdateModel Updater { get; set; }
+    [IgnoreDataMember]
+    [BindNever]
+    public IUpdateModel Updater { get; set; }
 
-        [BindNever]
-        public IEnumerable<ContentTypeDefinition> ContainedContentTypeDefinitions { get; set; }
+    [BindNever]
+    public IEnumerable<ContentTypeDefinition> ContainedContentTypeDefinitions { get; set; }
 
-        [BindNever]
-        public IEnumerable<BagPartWidgetViewModel> AccessibleWidgets { get; set; }
+    [BindNever]
+    public IEnumerable<BagPartWidgetViewModel> AccessibleWidgets { get; set; }
 
-        [BindNever]
-        public ContentTypePartDefinition TypePartDefinition { get; set; }
-    }
+    [BindNever]
+    public ContentTypePartDefinition TypePartDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BagPartSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BagPartSettingsViewModel.cs
index 6fcff35569c..9701a5ed655 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BagPartSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BagPartSettingsViewModel.cs
@@ -1,15 +1,14 @@
 using System.Collections.Specialized;
 using OrchardCore.Flows.Models;
 
-namespace OrchardCore.Flows.ViewModels
+namespace OrchardCore.Flows.ViewModels;
+
+public class BagPartSettingsViewModel
 {
-    public class BagPartSettingsViewModel
-    {
-        public BagPartSettings BagPartSettings { get; set; }
-        public NameValueCollection ContentTypes { get; set; }
-        public string DisplayType { get; set; }
-        public string[] ContainedContentTypes { get; set; } = [];
-        public BagPartSettingType Source { get; set; }
-        public string Stereotypes { get; set; }
-    }
+    public BagPartSettings BagPartSettings { get; set; }
+    public NameValueCollection ContentTypes { get; set; }
+    public string DisplayType { get; set; }
+    public string[] ContainedContentTypes { get; set; } = [];
+    public BagPartSettingType Source { get; set; }
+    public string Stereotypes { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BagPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BagPartViewModel.cs
index f17ea23beab..c3d89e60d94 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BagPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BagPartViewModel.cs
@@ -5,18 +5,17 @@
 using OrchardCore.ContentManagement.Display.Models;
 using OrchardCore.Flows.Models;
 
-namespace OrchardCore.Flows.ViewModels
+namespace OrchardCore.Flows.ViewModels;
+
+public class BagPartViewModel
 {
-    public class BagPartViewModel
-    {
-        public BagPart BagPart { get; set; }
-        public IEnumerable<ContentItem> ContentItems => BagPart.ContentItems;
+    public BagPart BagPart { get; set; }
+    public IEnumerable<ContentItem> ContentItems => BagPart.ContentItems;
 
-        [IgnoreDataMember]
-        [BindNever]
-        public BuildPartDisplayContext BuildPartDisplayContext { get; set; }
+    [IgnoreDataMember]
+    [BindNever]
+    public BuildPartDisplayContext BuildPartDisplayContext { get; set; }
 
-        public BagPartSettings Settings { get; set; }
-        public string DisplayType => Settings?.DisplayType;
-    }
+    public BagPartSettings Settings { get; set; }
+    public string DisplayType => Settings?.DisplayType;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BagPartWidgetViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BagPartWidgetViewModel.cs
index c0c425c096d..839b5ae37da 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BagPartWidgetViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BagPartWidgetViewModel.cs
@@ -1,18 +1,17 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.Flows.ViewModels
+namespace OrchardCore.Flows.ViewModels;
+
+public class BagPartWidgetViewModel
 {
-    public class BagPartWidgetViewModel
-    {
-        public ContentItem ContentItem { get; set; }
+    public ContentItem ContentItem { get; set; }
 
-        public ContentTypeDefinition ContentTypeDefinition { get; set; }
+    public ContentTypeDefinition ContentTypeDefinition { get; set; }
 
-        public bool Editable { get; set; }
+    public bool Editable { get; set; }
 
-        public bool Viewable { get; set; }
+    public bool Viewable { get; set; }
 
-        public bool Deletable { get; set; }
-    }
+    public bool Deletable { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BuildEditorViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BuildEditorViewModel.cs
index abf602e83d1..8167d7b56a4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BuildEditorViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/BuildEditorViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Flows.ViewModels
+namespace OrchardCore.Flows.ViewModels;
+
+public class BuildEditorViewModel
 {
-    public class BuildEditorViewModel
-    {
-        public dynamic EditorShape { get; set; }
-    }
+    public dynamic EditorShape { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/FlowPartEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/FlowPartEditViewModel.cs
index 89f4d95507d..cdf220dbc6e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/FlowPartEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/FlowPartEditViewModel.cs
@@ -5,27 +5,26 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.Flows.Models;
 
-namespace OrchardCore.Flows.ViewModels
+namespace OrchardCore.Flows.ViewModels;
+
+public class FlowPartEditViewModel
 {
-    public class FlowPartEditViewModel
-    {
-        // Each element in a FlowPart is projected to the Prefixes and ContentTypes arrays
-        // If for instance a FlowPart has three content items, there will be three elements in both
-        // Prefixes and ContentTypes. Each value in Prefixes is a Guid that represents the unique
-        // HtmlFieldPrefix value of its editor.
+    // Each element in a FlowPart is projected to the Prefixes and ContentTypes arrays
+    // If for instance a FlowPart has three content items, there will be three elements in both
+    // Prefixes and ContentTypes. Each value in Prefixes is a Guid that represents the unique
+    // HtmlFieldPrefix value of its editor.
 
-        public string[] Prefixes { get; set; } = [];
-        public string[] ContentTypes { get; set; } = [];
-        public string[] ContentItems { get; set; } = [];
+    public string[] Prefixes { get; set; } = [];
+    public string[] ContentTypes { get; set; } = [];
+    public string[] ContentItems { get; set; } = [];
 
-        [BindNever]
-        public FlowPart FlowPart { get; set; }
+    [BindNever]
+    public FlowPart FlowPart { get; set; }
 
-        [IgnoreDataMember]
-        [BindNever]
-        public IUpdateModel Updater { get; set; }
+    [IgnoreDataMember]
+    [BindNever]
+    public IUpdateModel Updater { get; set; }
 
-        [BindNever]
-        public IEnumerable<ContentTypeDefinition> ContainedContentTypeDefinitions { get; set; }
-    }
+    [BindNever]
+    public IEnumerable<ContentTypeDefinition> ContainedContentTypeDefinitions { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/FlowPartSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/FlowPartSettingsViewModel.cs
index a3c7beadd06..e0497870dcf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/FlowPartSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/FlowPartSettingsViewModel.cs
@@ -1,12 +1,11 @@
 using System.Collections.Specialized;
 using OrchardCore.Flows.Models;
 
-namespace OrchardCore.Flows.ViewModels
+namespace OrchardCore.Flows.ViewModels;
+
+public class FlowPartSettingsViewModel
 {
-    public class FlowPartSettingsViewModel
-    {
-        public FlowPartSettings FlowPartSettings { get; set; }
-        public NameValueCollection ContentTypes { get; set; }
-        public string[] ContainedContentTypes { get; set; } = [];
-    }
+    public FlowPartSettings FlowPartSettings { get; set; }
+    public NameValueCollection ContentTypes { get; set; }
+    public string[] ContainedContentTypes { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/FlowPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/FlowPartViewModel.cs
index 449e39fe669..ea13b2a1f6b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/FlowPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/ViewModels/FlowPartViewModel.cs
@@ -3,14 +3,13 @@
 using OrchardCore.ContentManagement.Display.Models;
 using OrchardCore.Flows.Models;
 
-namespace OrchardCore.Flows.ViewModels
+namespace OrchardCore.Flows.ViewModels;
+
+public class FlowPartViewModel
 {
-    public class FlowPartViewModel
-    {
-        public FlowPart FlowPart { get; set; }
+    public FlowPart FlowPart { get; set; }
 
-        [IgnoreDataMember]
-        [BindNever]
-        public BuildPartDisplayContext BuildPartDisplayContext { get; set; }
-    }
+    [IgnoreDataMember]
+    [BindNever]
+    public BuildPartDisplayContext BuildPartDisplayContext { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/ButtonPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/ButtonPartDisplayDriver.cs
index 1028f8a21fb..4c056e281fe 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/ButtonPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/ButtonPartDisplayDriver.cs
@@ -6,35 +6,34 @@
 using OrchardCore.Forms.Models;
 using OrchardCore.Forms.ViewModels;
 
-namespace OrchardCore.Forms.Drivers
+namespace OrchardCore.Forms.Drivers;
+
+public sealed class ButtonPartDisplayDriver : ContentPartDisplayDriver<ButtonPart>
 {
-    public sealed class ButtonPartDisplayDriver : ContentPartDisplayDriver<ButtonPart>
+    public override IDisplayResult Display(ButtonPart part, BuildPartDisplayContext context)
     {
-        public override IDisplayResult Display(ButtonPart part, BuildPartDisplayContext context)
-        {
-            return View("ButtonPart", part)
-                .Location("Detail", "Content");
-        }
+        return View("ButtonPart", part)
+            .Location("Detail", "Content");
+    }
 
-        public override IDisplayResult Edit(ButtonPart part, BuildPartEditorContext context)
+    public override IDisplayResult Edit(ButtonPart part, BuildPartEditorContext context)
+    {
+        return Initialize<ButtonPartEditViewModel>("ButtonPart_Fields_Edit", m =>
         {
-            return Initialize<ButtonPartEditViewModel>("ButtonPart_Fields_Edit", m =>
-            {
-                m.Text = part.Text;
-                m.Type = part.Type;
-            });
-        }
+            m.Text = part.Text;
+            m.Type = part.Type;
+        });
+    }
 
-        public async override Task<IDisplayResult> UpdateAsync(ButtonPart part, UpdatePartEditorContext context)
-        {
-            var viewModel = new ButtonPartEditViewModel();
+    public async override Task<IDisplayResult> UpdateAsync(ButtonPart part, UpdatePartEditorContext context)
+    {
+        var viewModel = new ButtonPartEditViewModel();
 
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
 
-            part.Text = viewModel.Text?.Trim();
-            part.Type = viewModel.Type?.Trim();
+        part.Text = viewModel.Text?.Trim();
+        part.Type = viewModel.Type?.Trim();
 
-            return Edit(part, context);
-        }
+        return Edit(part, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/FormContentDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/FormContentDisplayDriver.cs
index b4644016298..19666b398c1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/FormContentDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/FormContentDisplayDriver.cs
@@ -5,23 +5,22 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Forms.Models;
 
-namespace OrchardCore.Forms.Drivers
+namespace OrchardCore.Forms.Drivers;
+
+public sealed class FormContentDisplayDriver : ContentDisplayDriver
 {
-    public sealed class FormContentDisplayDriver : ContentDisplayDriver
+    public override Task<IDisplayResult> DisplayAsync(ContentItem model, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(ContentItem model, BuildDisplayContext context)
+        var formItemShape = context.Shape;
+        // If the content item contains FormPart add Form Wrapper only in Display type Detail
+        var formPart = model.As<FormPart>();
+        if (formPart != null && context.DisplayType == "Detail")
         {
-            var formItemShape = context.Shape;
-            // If the content item contains FormPart add Form Wrapper only in Display type Detail
-            var formPart = model.As<FormPart>();
-            if (formPart != null && context.DisplayType == "Detail")
-            {
-                // Add wrapper for content type if template is not available it will fall back to Form_Wrapper
-                formItemShape.Metadata.Wrappers.Add($"Form_Wrapper__{model.ContentType}");
-            }
-
-            // We don't need to return a shape result
-            return Task.FromResult<IDisplayResult>(null);
+            // Add wrapper for content type if template is not available it will fall back to Form_Wrapper
+            formItemShape.Metadata.Wrappers.Add($"Form_Wrapper__{model.ContentType}");
         }
+
+        // We don't need to return a shape result
+        return Task.FromResult<IDisplayResult>(null);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/FormElementPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/FormElementPartDisplayDriver.cs
index 4c0dacd30ab..25bbaeac495 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/FormElementPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/FormElementPartDisplayDriver.cs
@@ -6,27 +6,26 @@
 using OrchardCore.Forms.Models;
 using OrchardCore.Forms.ViewModels;
 
-namespace OrchardCore.Forms.Drivers
+namespace OrchardCore.Forms.Drivers;
+
+public sealed class FormElementPartDisplayDriver : ContentPartDisplayDriver<FormElementPart>
 {
-    public sealed class FormElementPartDisplayDriver : ContentPartDisplayDriver<FormElementPart>
+    public override IDisplayResult Edit(FormElementPart part, BuildPartEditorContext context)
     {
-        public override IDisplayResult Edit(FormElementPart part, BuildPartEditorContext context)
+        return Initialize<FormElementPartEditViewModel>("FormElementPart_Fields_Edit", m =>
         {
-            return Initialize<FormElementPartEditViewModel>("FormElementPart_Fields_Edit", m =>
-            {
-                m.Id = part.Id;
-            });
-        }
+            m.Id = part.Id;
+        });
+    }
 
-        public async override Task<IDisplayResult> UpdateAsync(FormElementPart part, UpdatePartEditorContext context)
-        {
-            var viewModel = new FormElementPartEditViewModel();
+    public async override Task<IDisplayResult> UpdateAsync(FormElementPart part, UpdatePartEditorContext context)
+    {
+        var viewModel = new FormElementPartEditViewModel();
 
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
 
-            part.Id = viewModel.Id?.Trim();
+        part.Id = viewModel.Id?.Trim();
 
-            return Edit(part, context);
-        }
+        return Edit(part, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/FormInputElementPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/FormInputElementPartDisplayDriver.cs
index 79ab960a471..e13f3ef31af 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/FormInputElementPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/FormInputElementPartDisplayDriver.cs
@@ -7,40 +7,39 @@
 using OrchardCore.Forms.ViewModels;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Forms.Drivers
+namespace OrchardCore.Forms.Drivers;
+
+public sealed class FormInputElementPartDisplayDriver : ContentPartDisplayDriver<FormInputElementPart>
 {
-    public sealed class FormInputElementPartDisplayDriver : ContentPartDisplayDriver<FormInputElementPart>
-    {
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public FormInputElementPartDisplayDriver(IStringLocalizer<FormInputElementPartDisplayDriver> stringLocalizer)
-        {
-            S = stringLocalizer;
-        }
+    public FormInputElementPartDisplayDriver(IStringLocalizer<FormInputElementPartDisplayDriver> stringLocalizer)
+    {
+        S = stringLocalizer;
+    }
 
-        public override IDisplayResult Edit(FormInputElementPart part, BuildPartEditorContext context)
+    public override IDisplayResult Edit(FormInputElementPart part, BuildPartEditorContext context)
+    {
+        return Initialize<FormInputElementPartEditViewModel>("FormInputElementPart_Fields_Edit", m =>
         {
-            return Initialize<FormInputElementPartEditViewModel>("FormInputElementPart_Fields_Edit", m =>
-            {
-                m.Name = part.Name;
-            });
-        }
+            m.Name = part.Name;
+        });
+    }
 
-        public async override Task<IDisplayResult> UpdateAsync(FormInputElementPart part, UpdatePartEditorContext context)
-        {
-            var viewModel = new FormInputElementPartEditViewModel();
+    public async override Task<IDisplayResult> UpdateAsync(FormInputElementPart part, UpdatePartEditorContext context)
+    {
+        var viewModel = new FormInputElementPartEditViewModel();
 
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
 
-            if (string.IsNullOrWhiteSpace(viewModel.Name))
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
-            }
+        if (string.IsNullOrWhiteSpace(viewModel.Name))
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Name), S["A value is required for Name."]);
+        }
 
-            part.Name = viewModel.Name?.Trim();
-            part.ContentItem.DisplayText = part.Name;
+        part.Name = viewModel.Name?.Trim();
+        part.ContentItem.DisplayText = part.Name;
 
-            return Edit(part, context);
-        }
+        return Edit(part, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/FormPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/FormPartDisplayDriver.cs
index 949981509b3..904ee3649d3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/FormPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/FormPartDisplayDriver.cs
@@ -5,37 +5,36 @@
 using OrchardCore.Forms.Models;
 using OrchardCore.Forms.ViewModels;
 
-namespace OrchardCore.Forms.Drivers
+namespace OrchardCore.Forms.Drivers;
+
+public sealed class FormPartDisplayDriver : ContentPartDisplayDriver<FormPart>
 {
-    public sealed class FormPartDisplayDriver : ContentPartDisplayDriver<FormPart>
+    public override IDisplayResult Edit(FormPart part, BuildPartEditorContext context)
     {
-        public override IDisplayResult Edit(FormPart part, BuildPartEditorContext context)
+        return Initialize<FormPartEditViewModel>("FormPart_Fields_Edit", m =>
         {
-            return Initialize<FormPartEditViewModel>("FormPart_Fields_Edit", m =>
-            {
-                m.Action = part.Action;
-                m.Method = part.Method;
-                m.WorkflowTypeId = part.WorkflowTypeId;
-                m.EncType = part.EncType;
-                m.EnableAntiForgeryToken = part.EnableAntiForgeryToken;
-                m.SaveFormLocation = part.SaveFormLocation;
-            });
-        }
+            m.Action = part.Action;
+            m.Method = part.Method;
+            m.WorkflowTypeId = part.WorkflowTypeId;
+            m.EncType = part.EncType;
+            m.EnableAntiForgeryToken = part.EnableAntiForgeryToken;
+            m.SaveFormLocation = part.SaveFormLocation;
+        });
+    }
 
-        public async override Task<IDisplayResult> UpdateAsync(FormPart part, UpdatePartEditorContext context)
-        {
-            var viewModel = new FormPartEditViewModel();
+    public async override Task<IDisplayResult> UpdateAsync(FormPart part, UpdatePartEditorContext context)
+    {
+        var viewModel = new FormPartEditViewModel();
 
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
 
-            part.Action = viewModel.Action?.Trim();
-            part.Method = viewModel.Method;
-            part.WorkflowTypeId = viewModel.WorkflowTypeId;
-            part.EncType = viewModel.EncType;
-            part.EnableAntiForgeryToken = viewModel.EnableAntiForgeryToken;
-            part.SaveFormLocation = viewModel.SaveFormLocation;
+        part.Action = viewModel.Action?.Trim();
+        part.Method = viewModel.Method;
+        part.WorkflowTypeId = viewModel.WorkflowTypeId;
+        part.EncType = viewModel.EncType;
+        part.EnableAntiForgeryToken = viewModel.EnableAntiForgeryToken;
+        part.SaveFormLocation = viewModel.SaveFormLocation;
 
-            return Edit(part, context);
-        }
+        return Edit(part, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/InputPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/InputPartDisplayDriver.cs
index 02d91c0a446..3b533e254d0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/InputPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/InputPartDisplayDriver.cs
@@ -6,36 +6,35 @@
 using OrchardCore.Forms.Models;
 using OrchardCore.Forms.ViewModels;
 
-namespace OrchardCore.Forms.Drivers
+namespace OrchardCore.Forms.Drivers;
+
+public sealed class InputPartDisplayDriver : ContentPartDisplayDriver<InputPart>
 {
-    public sealed class InputPartDisplayDriver : ContentPartDisplayDriver<InputPart>
+    public override IDisplayResult Display(InputPart part, BuildPartDisplayContext context)
     {
-        public override IDisplayResult Display(InputPart part, BuildPartDisplayContext context)
-        {
-            return View("InputPart", part).Location("Detail", "Content");
-        }
+        return View("InputPart", part).Location("Detail", "Content");
+    }
 
-        public override IDisplayResult Edit(InputPart part, BuildPartEditorContext context)
+    public override IDisplayResult Edit(InputPart part, BuildPartEditorContext context)
+    {
+        return Initialize<InputPartEditViewModel>("InputPart_Fields_Edit", m =>
         {
-            return Initialize<InputPartEditViewModel>("InputPart_Fields_Edit", m =>
-            {
-                m.Placeholder = part.Placeholder;
-                m.DefaultValue = part.DefaultValue;
-                m.Type = part.Type;
-            });
-        }
+            m.Placeholder = part.Placeholder;
+            m.DefaultValue = part.DefaultValue;
+            m.Type = part.Type;
+        });
+    }
 
-        public async override Task<IDisplayResult> UpdateAsync(InputPart part, UpdatePartEditorContext context)
-        {
-            var viewModel = new InputPartEditViewModel();
+    public async override Task<IDisplayResult> UpdateAsync(InputPart part, UpdatePartEditorContext context)
+    {
+        var viewModel = new InputPartEditViewModel();
 
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
 
-            part.Placeholder = viewModel.Placeholder?.Trim();
-            part.DefaultValue = viewModel.DefaultValue?.Trim();
-            part.Type = viewModel.Type?.Trim();
+        part.Placeholder = viewModel.Placeholder?.Trim();
+        part.DefaultValue = viewModel.DefaultValue?.Trim();
+        part.Type = viewModel.Type?.Trim();
 
-            return Edit(part, context);
-        }
+        return Edit(part, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/LabelPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/LabelPartDisplayDriver.cs
index 142c1b94d6a..562938c04d9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/LabelPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/LabelPartDisplayDriver.cs
@@ -6,32 +6,31 @@
 using OrchardCore.Forms.Models;
 using OrchardCore.Forms.ViewModels;
 
-namespace OrchardCore.Forms.Drivers
+namespace OrchardCore.Forms.Drivers;
+
+public sealed class LabelPartDisplayDriver : ContentPartDisplayDriver<LabelPart>
 {
-    public sealed class LabelPartDisplayDriver : ContentPartDisplayDriver<LabelPart>
+    public override IDisplayResult Display(LabelPart part, BuildPartDisplayContext context)
     {
-        public override IDisplayResult Display(LabelPart part, BuildPartDisplayContext context)
-        {
-            return View("LabelPart", part).Location("Detail", "Content");
-        }
+        return View("LabelPart", part).Location("Detail", "Content");
+    }
 
-        public override IDisplayResult Edit(LabelPart part, BuildPartEditorContext context)
+    public override IDisplayResult Edit(LabelPart part, BuildPartEditorContext context)
+    {
+        return Initialize<LabelPartEditViewModel>("LabelPart_Fields_Edit", m =>
         {
-            return Initialize<LabelPartEditViewModel>("LabelPart_Fields_Edit", m =>
-            {
-                m.For = part.For;
-            });
-        }
+            m.For = part.For;
+        });
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(LabelPart part, UpdatePartEditorContext context)
-        {
-            var viewModel = new LabelPartEditViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(LabelPart part, UpdatePartEditorContext context)
+    {
+        var viewModel = new LabelPartEditViewModel();
 
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
 
-            part.For = viewModel.For?.Trim();
+        part.For = viewModel.For?.Trim();
 
-            return Edit(part, context);
-        }
+        return Edit(part, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/SelectPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/SelectPartDisplayDriver.cs
index 2c2092a4b84..41ec37caa51 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/SelectPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/SelectPartDisplayDriver.cs
@@ -8,51 +8,50 @@
 using OrchardCore.Forms.Models;
 using OrchardCore.Forms.ViewModels;
 
-namespace OrchardCore.Forms.Drivers
+namespace OrchardCore.Forms.Drivers;
+
+public sealed class SelectPartDisplayDriver : ContentPartDisplayDriver<SelectPart>
 {
-    public sealed class SelectPartDisplayDriver : ContentPartDisplayDriver<SelectPart>
+    internal readonly IStringLocalizer S;
+
+    public SelectPartDisplayDriver(IStringLocalizer<SelectPartDisplayDriver> stringLocalizer)
     {
-        internal readonly IStringLocalizer S;
+        S = stringLocalizer;
+    }
 
-        public SelectPartDisplayDriver(IStringLocalizer<SelectPartDisplayDriver> stringLocalizer)
-        {
-            S = stringLocalizer;
-        }
+    public override IDisplayResult Display(SelectPart part, BuildPartDisplayContext context)
+    {
+        return View("SelectPart", part).Location("Detail", "Content");
+    }
 
-        public override IDisplayResult Display(SelectPart part, BuildPartDisplayContext context)
+    public override IDisplayResult Edit(SelectPart part, BuildPartEditorContext context)
+    {
+        return Initialize<SelectPartEditViewModel>("SelectPart_Fields_Edit", m =>
         {
-            return View("SelectPart", part).Location("Detail", "Content");
-        }
+            m.Options = JConvert.SerializeObject(part.Options ?? [], JOptions.CamelCaseIndented);
+            m.DefaultValue = part.DefaultValue;
+            m.Editor = part.Editor;
+        });
+    }
 
-        public override IDisplayResult Edit(SelectPart part, BuildPartEditorContext context)
+    public async override Task<IDisplayResult> UpdateAsync(SelectPart part, UpdatePartEditorContext context)
+    {
+        var viewModel = new SelectPartEditViewModel();
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
+        part.DefaultValue = viewModel.DefaultValue;
+
+        try
         {
-            return Initialize<SelectPartEditViewModel>("SelectPart_Fields_Edit", m =>
-            {
-                m.Options = JConvert.SerializeObject(part.Options ?? [], JOptions.CamelCaseIndented);
-                m.DefaultValue = part.DefaultValue;
-                m.Editor = part.Editor;
-            });
+            part.Editor = viewModel.Editor;
+            part.Options = string.IsNullOrWhiteSpace(viewModel.Options)
+                ? []
+                : JConvert.DeserializeObject<SelectOption[]>(viewModel.Options);
         }
-
-        public async override Task<IDisplayResult> UpdateAsync(SelectPart part, UpdatePartEditorContext context)
+        catch
         {
-            var viewModel = new SelectPartEditViewModel();
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
-            part.DefaultValue = viewModel.DefaultValue;
-
-            try
-            {
-                part.Editor = viewModel.Editor;
-                part.Options = string.IsNullOrWhiteSpace(viewModel.Options)
-                    ? []
-                    : JConvert.DeserializeObject<SelectOption[]>(viewModel.Options);
-            }
-            catch
-            {
-                context.Updater.ModelState.AddModelError(Prefix + '.' + nameof(SelectPartEditViewModel.Options), S["The options are written in an incorrect format."]);
-            }
-
-            return Edit(part, context);
+            context.Updater.ModelState.AddModelError(Prefix + '.' + nameof(SelectPartEditViewModel.Options), S["The options are written in an incorrect format."]);
         }
+
+        return Edit(part, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/TextAreaPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/TextAreaPartDisplayDriver.cs
index 8d15e60df88..995b1e01ef5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/TextAreaPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/TextAreaPartDisplayDriver.cs
@@ -5,34 +5,33 @@
 using OrchardCore.Forms.Models;
 using OrchardCore.Forms.ViewModels;
 
-namespace OrchardCore.Forms.Drivers
+namespace OrchardCore.Forms.Drivers;
+
+public sealed class TextAreaPartDisplayDriver : ContentPartDisplayDriver<TextAreaPart>
 {
-    public sealed class TextAreaPartDisplayDriver : ContentPartDisplayDriver<TextAreaPart>
+    public override IDisplayResult Display(TextAreaPart part, BuildPartDisplayContext context)
     {
-        public override IDisplayResult Display(TextAreaPart part, BuildPartDisplayContext context)
-        {
-            return View("TextAreaPart", part).Location("Detail", "Content");
-        }
+        return View("TextAreaPart", part).Location("Detail", "Content");
+    }
 
-        public override IDisplayResult Edit(TextAreaPart part, BuildPartEditorContext context)
+    public override IDisplayResult Edit(TextAreaPart part, BuildPartEditorContext context)
+    {
+        return Initialize<TextAreaPartEditViewModel>("TextAreaPart_Fields_Edit", m =>
         {
-            return Initialize<TextAreaPartEditViewModel>("TextAreaPart_Fields_Edit", m =>
-            {
-                m.Placeholder = part.Placeholder;
-                m.DefaultValue = part.DefaultValue;
-            });
-        }
+            m.Placeholder = part.Placeholder;
+            m.DefaultValue = part.DefaultValue;
+        });
+    }
 
-        public async override Task<IDisplayResult> UpdateAsync(TextAreaPart part, UpdatePartEditorContext context)
-        {
-            var viewModel = new InputPartEditViewModel();
+    public async override Task<IDisplayResult> UpdateAsync(TextAreaPart part, UpdatePartEditorContext context)
+    {
+        var viewModel = new InputPartEditViewModel();
 
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
 
-            part.Placeholder = viewModel.Placeholder?.Trim();
-            part.DefaultValue = viewModel.DefaultValue?.Trim();
+        part.Placeholder = viewModel.Placeholder?.Trim();
+        part.DefaultValue = viewModel.DefaultValue?.Trim();
 
-            return Edit(part, context);
-        }
+        return Edit(part, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/ValidationPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/ValidationPartDisplayDriver.cs
index 7730b38bfee..b1c05efc32a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/ValidationPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/ValidationPartDisplayDriver.cs
@@ -5,32 +5,31 @@
 using OrchardCore.Forms.Models;
 using OrchardCore.Forms.ViewModels;
 
-namespace OrchardCore.Forms.Drivers
+namespace OrchardCore.Forms.Drivers;
+
+public sealed class ValidationPartDisplayDriver : ContentPartDisplayDriver<ValidationPart>
 {
-    public sealed class ValidationPartDisplayDriver : ContentPartDisplayDriver<ValidationPart>
+    public override IDisplayResult Display(ValidationPart part, BuildPartDisplayContext context)
     {
-        public override IDisplayResult Display(ValidationPart part, BuildPartDisplayContext context)
-        {
-            return View("ValidationPart", part).Location("Detail", "Content");
-        }
+        return View("ValidationPart", part).Location("Detail", "Content");
+    }
 
-        public override IDisplayResult Edit(ValidationPart part, BuildPartEditorContext context)
+    public override IDisplayResult Edit(ValidationPart part, BuildPartEditorContext context)
+    {
+        return Initialize<ValidationPartEditViewModel>("ValidationPart_Fields_Edit", m =>
         {
-            return Initialize<ValidationPartEditViewModel>("ValidationPart_Fields_Edit", m =>
-            {
-                m.For = part.For;
-            });
-        }
+            m.For = part.For;
+        });
+    }
 
-        public async override Task<IDisplayResult> UpdateAsync(ValidationPart part, UpdatePartEditorContext context)
-        {
-            var viewModel = new ValidationPartEditViewModel();
+    public async override Task<IDisplayResult> UpdateAsync(ValidationPart part, UpdatePartEditorContext context)
+    {
+        var viewModel = new ValidationPartEditViewModel();
 
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
 
-            part.For = viewModel.For?.Trim();
+        part.For = viewModel.For?.Trim();
 
-            return Edit(part, context);
-        }
+        return Edit(part, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/ValidationSummaryPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/ValidationSummaryPartDisplayDriver.cs
index dbb75ababf6..538b228d6f2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/ValidationSummaryPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Drivers/ValidationSummaryPartDisplayDriver.cs
@@ -5,33 +5,32 @@
 using OrchardCore.Forms.Models;
 using OrchardCore.Forms.ViewModels;
 
-namespace OrchardCore.Forms.Drivers
+namespace OrchardCore.Forms.Drivers;
+
+public sealed class ValidationSummaryPartDisplayDriver : ContentPartDisplayDriver<ValidationSummaryPart>
 {
-    public sealed class ValidationSummaryPartDisplayDriver : ContentPartDisplayDriver<ValidationSummaryPart>
+    public override IDisplayResult Display(ValidationSummaryPart part, BuildPartDisplayContext context)
     {
-        public override IDisplayResult Display(ValidationSummaryPart part, BuildPartDisplayContext context)
-        {
-            return View("ValidationSummaryPart", part)
-                .Location("Detail", "Content");
-        }
+        return View("ValidationSummaryPart", part)
+            .Location("Detail", "Content");
+    }
 
-        public override IDisplayResult Edit(ValidationSummaryPart part, BuildPartEditorContext context)
+    public override IDisplayResult Edit(ValidationSummaryPart part, BuildPartEditorContext context)
+    {
+        return Initialize<ValidationSummaryViewModel>("ValidationSummaryPart_Fields_Edit", model =>
         {
-            return Initialize<ValidationSummaryViewModel>("ValidationSummaryPart_Fields_Edit", model =>
-            {
-                model.ModelOnly = part.ModelOnly;
-            });
-        }
+            model.ModelOnly = part.ModelOnly;
+        });
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ValidationSummaryPart part, UpdatePartEditorContext context)
-        {
-            var model = new ValidationSummaryViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(ValidationSummaryPart part, UpdatePartEditorContext context)
+    {
+        var model = new ValidationSummaryViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            part.ModelOnly = model.ModelOnly;
+        part.ModelOnly = model.ModelOnly;
 
-            return Edit(part, context);
-        }
+        return Edit(part, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Filters/ExportModelStateAttribute.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Filters/ExportModelStateAttribute.cs
index 57983d8fafb..b9e200b8a93 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Filters/ExportModelStateAttribute.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Filters/ExportModelStateAttribute.cs
@@ -3,37 +3,36 @@
 using Microsoft.AspNetCore.Mvc.Filters;
 using OrchardCore.Forms.Helpers;
 
-namespace OrchardCore.Forms.Filters
+namespace OrchardCore.Forms.Filters;
+
+public sealed class ExportModelStateAttribute : ModelStateTransferAttribute
 {
-    public sealed class ExportModelStateAttribute : ModelStateTransferAttribute
+    public override void OnActionExecuted(ActionExecutedContext context)
     {
-        public override void OnActionExecuted(ActionExecutedContext context)
+        // Only export if ModelState is not valid.
+        if (context.ModelState != null && !context.ModelState.IsValid && IsRedirect(context))
         {
-            // Only export if ModelState is not valid.
-            if (context.ModelState != null && !context.ModelState.IsValid && IsRedirect(context))
+            var controller = context.Controller as Controller;
+            if (controller != null)
             {
-                var controller = context.Controller as Controller;
-                if (controller != null)
-                {
-                    controller.TempData[Key] = ModelStateHelpers.SerializeModelState(context.ModelState);
-                }
+                controller.TempData[Key] = ModelStateHelpers.SerializeModelState(context.ModelState);
             }
-
-            base.OnActionExecuted(context);
         }
 
-        private static bool IsRedirect(ActionExecutedContext context)
-        {
-            var result = context.Result;
-            var statusCode = context.HttpContext.Response.StatusCode;
+        base.OnActionExecuted(context);
+    }
 
-            return
-                result is RedirectResult ||
-                result is RedirectToRouteResult ||
-                result is RedirectToActionResult ||
-                result is LocalRedirectResult ||
-                statusCode == (int)HttpStatusCode.Redirect ||
-                statusCode == (int)HttpStatusCode.TemporaryRedirect;
-        }
+    private static bool IsRedirect(ActionExecutedContext context)
+    {
+        var result = context.Result;
+        var statusCode = context.HttpContext.Response.StatusCode;
+
+        return
+            result is RedirectResult ||
+            result is RedirectToRouteResult ||
+            result is RedirectToActionResult ||
+            result is LocalRedirectResult ||
+            statusCode == (int)HttpStatusCode.Redirect ||
+            statusCode == (int)HttpStatusCode.TemporaryRedirect;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Filters/ImportModelStateAttribute.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Filters/ImportModelStateAttribute.cs
index 4cd64e4171d..64b55178b58 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Filters/ImportModelStateAttribute.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Filters/ImportModelStateAttribute.cs
@@ -3,31 +3,30 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using OrchardCore.Forms.Helpers;
 
-namespace OrchardCore.Forms.Filters
+namespace OrchardCore.Forms.Filters;
+
+public sealed class ImportModelStateAttribute : ModelStateTransferAttribute
 {
-    public sealed class ImportModelStateAttribute : ModelStateTransferAttribute
+    public override void OnActionExecuted(ActionExecutedContext context)
     {
-        public override void OnActionExecuted(ActionExecutedContext context)
-        {
-            var controller = context.Controller as Controller;
-            var serializedModelState = controller?.TempData[Key] as string;
+        var controller = context.Controller as Controller;
+        var serializedModelState = controller?.TempData[Key] as string;
 
-            if (serializedModelState != null)
+        if (serializedModelState != null)
+        {
+            // Only Import if we are viewing.
+            if (context.Result is ViewResult || context.Result is PageResult)
             {
-                // Only Import if we are viewing.
-                if (context.Result is ViewResult || context.Result is PageResult)
-                {
-                    var modelState = ModelStateHelpers.DeserializeModelState(serializedModelState);
-                    context.ModelState.Merge(modelState);
-                }
-                else
-                {
-                    // Otherwise remove it.
-                    controller.TempData.Remove(Key);
-                }
+                var modelState = ModelStateHelpers.DeserializeModelState(serializedModelState);
+                context.ModelState.Merge(modelState);
+            }
+            else
+            {
+                // Otherwise remove it.
+                controller.TempData.Remove(Key);
             }
-
-            base.OnActionExecuted(context);
         }
+
+        base.OnActionExecuted(context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Filters/ImportModelStatePageFilter.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Filters/ImportModelStatePageFilter.cs
index a540db79cdb..f99a41a398b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Filters/ImportModelStatePageFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Filters/ImportModelStatePageFilter.cs
@@ -2,39 +2,38 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using OrchardCore.Forms.Helpers;
 
-namespace OrchardCore.Forms.Filters
+namespace OrchardCore.Forms.Filters;
+
+// For Razor Pages IActionFilter\ActionFilterAttribute don't apply, IPageFilter have to be used instead.
+public sealed class ImportModelStatePageFilter : IPageFilter
 {
-    // For Razor Pages IActionFilter\ActionFilterAttribute don't apply, IPageFilter have to be used instead.
-    public sealed class ImportModelStatePageFilter : IPageFilter
+    public void OnPageHandlerExecuted(PageHandlerExecutedContext context)
     {
-        public void OnPageHandlerExecuted(PageHandlerExecutedContext context)
-        {
-            var pageModel = context.HandlerInstance as PageModel;
+        var pageModel = context.HandlerInstance as PageModel;
 
-            var serializedModelState = pageModel?.TempData[ModelStateTransferAttribute.Key] as string;
+        var serializedModelState = pageModel?.TempData[ModelStateTransferAttribute.Key] as string;
 
-            if (serializedModelState != null)
+        if (serializedModelState != null)
+        {
+            // Only Import if we are viewing.
+            if (context.Result is PageResult)
             {
-                // Only Import if we are viewing.
-                if (context.Result is PageResult)
-                {
-                    var modelState = ModelStateHelpers.DeserializeModelState(serializedModelState);
-                    context.ModelState.Merge(modelState);
-                }
-                else
-                {
-                    // Otherwise remove it.
-                    pageModel.TempData.Remove(ModelStateTransferAttribute.Key);
-                }
+                var modelState = ModelStateHelpers.DeserializeModelState(serializedModelState);
+                context.ModelState.Merge(modelState);
+            }
+            else
+            {
+                // Otherwise remove it.
+                pageModel.TempData.Remove(ModelStateTransferAttribute.Key);
             }
         }
+    }
 
-        public void OnPageHandlerExecuting(PageHandlerExecutingContext context)
-        {
-        }
+    public void OnPageHandlerExecuting(PageHandlerExecutingContext context)
+    {
+    }
 
-        public void OnPageHandlerSelected(PageHandlerSelectedContext context)
-        {
-        }
+    public void OnPageHandlerSelected(PageHandlerSelectedContext context)
+    {
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Filters/ModelStateTransferAttribute.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Filters/ModelStateTransferAttribute.cs
index a2ed65e475e..3f16c5d0636 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Filters/ModelStateTransferAttribute.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Filters/ModelStateTransferAttribute.cs
@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.Mvc.Filters;
 
-namespace OrchardCore.Forms.Filters
+namespace OrchardCore.Forms.Filters;
+
+public abstract class ModelStateTransferAttribute : ActionFilterAttribute
 {
-    public abstract class ModelStateTransferAttribute : ActionFilterAttribute
-    {
-        internal const string Key = nameof(ModelStateTransferAttribute);
-    }
+    internal const string Key = nameof(ModelStateTransferAttribute);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/ButtonPartQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/ButtonPartQueryObjectType.cs
index f48d8674fbc..bf3edeead84 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/ButtonPartQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/ButtonPartQueryObjectType.cs
@@ -1,16 +1,15 @@
 using GraphQL.Types;
 using OrchardCore.Forms.Models;
 
-namespace OrchardCore.Forms.GraphQL
+namespace OrchardCore.Forms.GraphQL;
+
+public class ButtonPartQueryObjectType : ObjectGraphType<ButtonPart>
 {
-    public class ButtonPartQueryObjectType : ObjectGraphType<ButtonPart>
+    public ButtonPartQueryObjectType()
     {
-        public ButtonPartQueryObjectType()
-        {
-            Name = "ButtonPart";
+        Name = "ButtonPart";
 
-            Field(x => x.Text, nullable: true);
-            Field(x => x.Type, nullable: true);
-        }
+        Field(x => x.Text, nullable: true);
+        Field(x => x.Type, nullable: true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/FormElementPartQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/FormElementPartQueryObjectType.cs
index d84f8e5080b..9afd5896365 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/FormElementPartQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/FormElementPartQueryObjectType.cs
@@ -1,15 +1,14 @@
 using GraphQL.Types;
 using OrchardCore.Forms.Models;
 
-namespace OrchardCore.Forms.GraphQL
+namespace OrchardCore.Forms.GraphQL;
+
+public class FormElementPartQueryObjectType : ObjectGraphType<FormElementPart>
 {
-    public class FormElementPartQueryObjectType : ObjectGraphType<FormElementPart>
+    public FormElementPartQueryObjectType()
     {
-        public FormElementPartQueryObjectType()
-        {
-            Name = "FormElementPart";
+        Name = "FormElementPart";
 
-            Field(x => x.Id, nullable: true);
-        }
+        Field(x => x.Id, nullable: true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/FormInputElementPartQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/FormInputElementPartQueryObjectType.cs
index 17fefe699f3..e4caf86d6aa 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/FormInputElementPartQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/FormInputElementPartQueryObjectType.cs
@@ -1,15 +1,14 @@
 using GraphQL.Types;
 using OrchardCore.Forms.Models;
 
-namespace OrchardCore.Forms.GraphQL
+namespace OrchardCore.Forms.GraphQL;
+
+public class FormInputElementPartQueryObjectType : ObjectGraphType<FormInputElementPart>
 {
-    public class FormInputElementPartQueryObjectType : ObjectGraphType<FormInputElementPart>
+    public FormInputElementPartQueryObjectType()
     {
-        public FormInputElementPartQueryObjectType()
-        {
-            Name = "FormInputElementPart";
+        Name = "FormInputElementPart";
 
-            Field(x => x.Name, nullable: true);
-        }
+        Field(x => x.Name, nullable: true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/FormPartQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/FormPartQueryObjectType.cs
index 5953bcc612a..b6cb8da7115 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/FormPartQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/FormPartQueryObjectType.cs
@@ -1,17 +1,16 @@
 using GraphQL.Types;
 using OrchardCore.Forms.Models;
 
-namespace OrchardCore.Forms.GraphQL
+namespace OrchardCore.Forms.GraphQL;
+
+public class FormPartQueryObjectType : ObjectGraphType<FormPart>
 {
-    public class FormPartQueryObjectType : ObjectGraphType<FormPart>
+    public FormPartQueryObjectType()
     {
-        public FormPartQueryObjectType()
-        {
-            Name = "FormPart";
+        Name = "FormPart";
 
-            Field(x => x.WorkflowTypeId, nullable: true);
-            Field(x => x.Action, nullable: true);
-            Field(x => x.Method, nullable: true);
-        }
+        Field(x => x.WorkflowTypeId, nullable: true);
+        Field(x => x.Action, nullable: true);
+        Field(x => x.Method, nullable: true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/InputPartQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/InputPartQueryObjectType.cs
index 0c5e98c624b..553f439ac7a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/InputPartQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/InputPartQueryObjectType.cs
@@ -1,17 +1,16 @@
 using GraphQL.Types;
 using OrchardCore.Forms.Models;
 
-namespace OrchardCore.Forms.GraphQL
+namespace OrchardCore.Forms.GraphQL;
+
+public class InputPartQueryObjectType : ObjectGraphType<InputPart>
 {
-    public class InputPartQueryObjectType : ObjectGraphType<InputPart>
+    public InputPartQueryObjectType()
     {
-        public InputPartQueryObjectType()
-        {
-            Name = "InputPart";
+        Name = "InputPart";
 
-            Field(x => x.Type, nullable: true);
-            Field(x => x.Placeholder, nullable: true);
-            Field(x => x.DefaultValue, nullable: true);
-        }
+        Field(x => x.Type, nullable: true);
+        Field(x => x.Placeholder, nullable: true);
+        Field(x => x.DefaultValue, nullable: true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/LabelPartQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/LabelPartQueryObjectType.cs
index a034917d3d9..edea8c0e74c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/LabelPartQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/LabelPartQueryObjectType.cs
@@ -1,16 +1,15 @@
 using GraphQL.Types;
 using OrchardCore.Forms.Models;
 
-namespace OrchardCore.Forms.GraphQL
+namespace OrchardCore.Forms.GraphQL;
+
+public class LabelPartQueryObjectType : ObjectGraphType<LabelPart>
 {
-    public class LabelPartQueryObjectType : ObjectGraphType<LabelPart>
+    public LabelPartQueryObjectType()
     {
-        public LabelPartQueryObjectType()
-        {
-            Name = "LabelPart";
+        Name = "LabelPart";
 
-            Field(x => x.For, nullable: true);
-            Field("value", context => context.ContentItem.DisplayText);
-        }
+        Field(x => x.For, nullable: true);
+        Field("value", context => context.ContentItem.DisplayText);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/Startup.cs
index 27ce72adc3c..0d89f436dfe 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/Startup.cs
@@ -3,24 +3,23 @@
 using OrchardCore.Forms.Models;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Forms.GraphQL
+namespace OrchardCore.Forms.GraphQL;
+
+[RequireFeatures("OrchardCore.Apis.GraphQL")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Apis.GraphQL")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddObjectGraphType<FormPart, FormPartQueryObjectType>();
-            services.AddObjectGraphType<FormElementPart, FormElementPartQueryObjectType>();
-            services.AddObjectGraphType<FormInputElementPart, FormInputElementPartQueryObjectType>();
-            services.AddObjectGraphType<LabelPart, LabelPartQueryObjectType>();
-            services.AddObjectGraphType<ButtonPart, ButtonPartQueryObjectType>();
-            services.AddObjectGraphType<InputPart, InputPartQueryObjectType>();
-            services.AddObjectGraphType<TextAreaPart, TextAreaPartQueryObjectType>();
-            services.AddObjectGraphType<ValidationPart, ValidationPartQueryObjectType>();
+        services.AddObjectGraphType<FormPart, FormPartQueryObjectType>();
+        services.AddObjectGraphType<FormElementPart, FormElementPartQueryObjectType>();
+        services.AddObjectGraphType<FormInputElementPart, FormInputElementPartQueryObjectType>();
+        services.AddObjectGraphType<LabelPart, LabelPartQueryObjectType>();
+        services.AddObjectGraphType<ButtonPart, ButtonPartQueryObjectType>();
+        services.AddObjectGraphType<InputPart, InputPartQueryObjectType>();
+        services.AddObjectGraphType<TextAreaPart, TextAreaPartQueryObjectType>();
+        services.AddObjectGraphType<ValidationPart, ValidationPartQueryObjectType>();
 
-            // Broken
-            // services.AddGraphQLQueryType<ValidationSummaryPart, ValidationSummaryPartQueryObjectType>();
-        }
+        // Broken
+        // services.AddGraphQLQueryType<ValidationSummaryPart, ValidationSummaryPartQueryObjectType>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/TextAreaPartQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/TextAreaPartQueryObjectType.cs
index 65a7b996cea..88ca58e61bf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/TextAreaPartQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/TextAreaPartQueryObjectType.cs
@@ -1,16 +1,15 @@
 using GraphQL.Types;
 using OrchardCore.Forms.Models;
 
-namespace OrchardCore.Forms.GraphQL
+namespace OrchardCore.Forms.GraphQL;
+
+public class TextAreaPartQueryObjectType : ObjectGraphType<TextAreaPart>
 {
-    public class TextAreaPartQueryObjectType : ObjectGraphType<TextAreaPart>
+    public TextAreaPartQueryObjectType()
     {
-        public TextAreaPartQueryObjectType()
-        {
-            Name = "TextAreaPart";
+        Name = "TextAreaPart";
 
-            Field(x => x.DefaultValue, nullable: true);
-            Field(x => x.Placeholder, nullable: true);
-        }
+        Field(x => x.DefaultValue, nullable: true);
+        Field(x => x.Placeholder, nullable: true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/ValidationPartQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/ValidationPartQueryObjectType.cs
index 4172228e94a..aa489a37056 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/ValidationPartQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/ValidationPartQueryObjectType.cs
@@ -1,15 +1,14 @@
 using GraphQL.Types;
 using OrchardCore.Forms.Models;
 
-namespace OrchardCore.Forms.GraphQL
+namespace OrchardCore.Forms.GraphQL;
+
+public class ValidationPartQueryObjectType : ObjectGraphType<ValidationPart>
 {
-    public class ValidationPartQueryObjectType : ObjectGraphType<ValidationPart>
+    public ValidationPartQueryObjectType()
     {
-        public ValidationPartQueryObjectType()
-        {
-            Name = "ValidationPart";
+        Name = "ValidationPart";
 
-            Field(x => x.For, nullable: true);
-        }
+        Field(x => x.For, nullable: true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/ValidationSummaryPartQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/ValidationSummaryPartQueryObjectType.cs
index 589fae3a92f..8da51ce951a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/ValidationSummaryPartQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/ValidationSummaryPartQueryObjectType.cs
@@ -1,13 +1,12 @@
 using GraphQL.Types;
 using OrchardCore.Forms.Models;
 
-namespace OrchardCore.Forms.GraphQL
+namespace OrchardCore.Forms.GraphQL;
+
+public class ValidationSummaryPartQueryObjectType : ObjectGraphType<ValidationSummaryPart>
 {
-    public class ValidationSummaryPartQueryObjectType : ObjectGraphType<ValidationSummaryPart>
+    public ValidationSummaryPartQueryObjectType()
     {
-        public ValidationSummaryPartQueryObjectType()
-        {
-            Name = "ValidationSummaryPart";
-        }
+        Name = "ValidationSummaryPart";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Helpers/ModelStateHelpers.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Helpers/ModelStateHelpers.cs
index 37e22297109..16f3cfb8343 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Helpers/ModelStateHelpers.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Helpers/ModelStateHelpers.cs
@@ -4,46 +4,45 @@
 using System.Text.Json.Nodes;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Forms.Helpers
+namespace OrchardCore.Forms.Helpers;
+
+public static class ModelStateHelpers
 {
-    public static class ModelStateHelpers
+    public static string SerializeModelState(ModelStateDictionary modelState)
     {
-        public static string SerializeModelState(ModelStateDictionary modelState)
+        var errorList = modelState.Select(x => new ModelStateTransferValue
         {
-            var errorList = modelState.Select(x => new ModelStateTransferValue
-            {
-                Key = x.Key,
-                AttemptedValue = x.Value.AttemptedValue,
-                RawValue = x.Value.RawValue,
-                ErrorMessages = x.Value.Errors.Select(err => err.ErrorMessage).ToList(),
-            });
+            Key = x.Key,
+            AttemptedValue = x.Value.AttemptedValue,
+            RawValue = x.Value.RawValue,
+            ErrorMessages = x.Value.Errors.Select(err => err.ErrorMessage).ToList(),
+        });
 
-            return JConvert.SerializeObject(errorList);
-        }
+        return JConvert.SerializeObject(errorList);
+    }
 
-        public static ModelStateDictionary DeserializeModelState(string serialisedErrorList)
-        {
-            var errorList = JConvert.DeserializeObject<List<ModelStateTransferValue>>(serialisedErrorList);
-            var modelState = new ModelStateDictionary();
+    public static ModelStateDictionary DeserializeModelState(string serialisedErrorList)
+    {
+        var errorList = JConvert.DeserializeObject<List<ModelStateTransferValue>>(serialisedErrorList);
+        var modelState = new ModelStateDictionary();
 
-            foreach (var item in errorList)
+        foreach (var item in errorList)
+        {
+            item.RawValue = item.RawValue is JsonArray jarray ? jarray.ToObject<object[]>() : item.RawValue;
+            modelState.SetModelValue(item.Key, item.RawValue, item.AttemptedValue);
+            foreach (var error in item.ErrorMessages)
             {
-                item.RawValue = item.RawValue is JsonArray jarray ? jarray.ToObject<object[]>() : item.RawValue;
-                modelState.SetModelValue(item.Key, item.RawValue, item.AttemptedValue);
-                foreach (var error in item.ErrorMessages)
-                {
-                    modelState.AddModelError(item.Key, error);
-                }
+                modelState.AddModelError(item.Key, error);
             }
-            return modelState;
         }
+        return modelState;
+    }
 
-        private sealed class ModelStateTransferValue
-        {
-            public string Key { get; set; }
-            public string AttemptedValue { get; set; }
-            public object RawValue { get; set; }
-            public ICollection<string> ErrorMessages { get; set; } = [];
-        }
+    private sealed class ModelStateTransferValue
+    {
+        public string Key { get; set; }
+        public string AttemptedValue { get; set; }
+        public object RawValue { get; set; }
+        public ICollection<string> ErrorMessages { get; set; } = [];
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Migrations.cs
index 565ebf3ce0f..0a819a2b2e0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Migrations.cs
@@ -4,269 +4,268 @@
 using OrchardCore.ContentManagement.Metadata.Settings;
 using OrchardCore.Data.Migration;
 
-namespace OrchardCore.Forms
+namespace OrchardCore.Forms;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+
+    public Migrations(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
+
+    public async Task<int> CreateAsync()
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-
-        public Migrations(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
-
-        public async Task<int> CreateAsync()
-        {
-            // Form
-            await _contentDefinitionManager.AlterPartDefinitionAsync("FormPart", part => part
-                .Attachable()
-                .WithDescription("Turns your content item into a form."));
-
-            await _contentDefinitionManager.AlterTypeDefinitionAsync("Form", type => type
-                .WithPart("TitlePart", part => part
-                    .WithSettings(new TitlePartSettings { RenderTitle = false })
-                    .WithPosition("0")
-                )
-                .WithPart("FormElementPart", part =>
-                   part.WithPosition("1")
-                )
-                .WithPart("FormPart")
-                .WithPart("FlowPart")
-                .Stereotype("Widget"));
-
-            // FormElement
-            await _contentDefinitionManager.AlterPartDefinitionAsync("FormElementPart", part => part
-                .WithDescription("Provides attributes common to all form elements."));
-
-            await _contentDefinitionManager.AlterPartDefinitionAsync("FormElementLabelPart", part => part
-                .Attachable()
-                .WithDescription("Provides a way to capture element's label.")
-            );
-
-            await _contentDefinitionManager.AlterPartDefinitionAsync("FormElementValidationPart", part => part
-                .Attachable()
-                .WithDescription("Provides validation options to form elements.")
-            );
-
-            // FormInputElement
-            await _contentDefinitionManager.AlterPartDefinitionAsync("FormInputElementPart", part => part
-                .WithDescription("Provides attributes common to all input form elements."));
-
-            // Label
-            await _contentDefinitionManager.AlterPartDefinitionAsync("LabelPart", part => part
-                .WithDescription("Provides label properties."));
-
-            await _contentDefinitionManager.AlterTypeDefinitionAsync("Label", type => type
-                .WithPart("TitlePart", part => part
-                    .WithSettings(new TitlePartSettings { RenderTitle = false })
-                )
-                .WithPart("FormElementPart")
-                .WithPart("LabelPart")
-                .Stereotype("Widget"));
-
-            // Input
-            await _contentDefinitionManager.AlterPartDefinitionAsync("InputPart", part => part
-                .WithDescription("Provides input field properties."));
-
-            await _contentDefinitionManager.AlterTypeDefinitionAsync("Input", type => type
-                .WithPart("FormInputElementPart", part => part
-                    .WithPosition("1")
-                )
-                .WithPart("FormElementPart", part => part
-                    .WithPosition("2")
-                )
-                .WithPart("FormElementLabelPart", part => part
-                    .WithPosition("3")
-                )
-                .WithPart("InputPart", part => part
-                    .WithPosition("4")
-                )
-                .WithPart("FormElementValidationPart", part => part
-                    .WithPosition("5")
-                )
-                .Stereotype("Widget"));
-
-            // TextArea
-            await _contentDefinitionManager.AlterPartDefinitionAsync("TextAreaPart", part => part
-                .WithDescription("Provides text area properties."));
-
-            await _contentDefinitionManager.AlterTypeDefinitionAsync("TextArea", type => type
-                .WithPart("FormInputElementPart", part => part
-                    .WithPosition("1")
-                )
-                .WithPart("FormElementPart", part => part
-                    .WithPosition("2")
-                )
-                .WithPart("FormElementLabelPart", part => part
-                    .WithPosition("3")
-                )
-                .WithPart("TextAreaPart", part => part
-                    .WithPosition("4")
-                )
-                .WithPart("FormElementValidationPart", part => part
-                    .WithPosition("5")
-                )
-                .Stereotype("Widget"));
-
-            // Select
-            await _contentDefinitionManager.AlterPartDefinitionAsync("SelectPart", part => part
-                .WithDescription("Provides select field properties."));
-
-            await _contentDefinitionManager.AlterTypeDefinitionAsync("Select", type => type
-                .WithPart("FormInputElementPart", part => part
-                    .WithPosition("1")
-                )
-                .WithPart("FormElementPart", part => part
-                    .WithPosition("2")
-                )
-                .WithPart("FormElementLabelPart", part => part
-                    .WithPosition("3")
-                )
-                .WithPart("SelectPart", part => part
-                    .WithPosition("4")
-                )
-                .WithPart("FormElementValidationPart", part => part
-                    .WithPosition("5")
-                )
-                .Stereotype("Widget"));
-
-            // Button
-            await _contentDefinitionManager.AlterPartDefinitionAsync("ButtonPart", part => part
-                .WithDescription("Provides button properties."));
-
-            await _contentDefinitionManager.AlterTypeDefinitionAsync("Button", type => type
-                .WithPart("FormInputElementPart")
-                .WithPart("FormElementPart")
-                .WithPart("ButtonPart")
-                .Stereotype("Widget"));
-
-            // Validation Summary
-            await _contentDefinitionManager.AlterPartDefinitionAsync("ValidationSummaryPart", part => part
-                .WithDescription("Displays a validation summary."));
-
-            await _contentDefinitionManager.AlterTypeDefinitionAsync("ValidationSummary", type => type
-                .WithPart("ValidationSummaryPart")
-                .Stereotype("Widget"));
-
-            // Validation
-            await _contentDefinitionManager.AlterPartDefinitionAsync("ValidationPart", part => part
-                .WithDescription("Displays a field validation error."));
-
-            await _contentDefinitionManager.AlterTypeDefinitionAsync("Validation", type => type
-                .WithPart("ValidationPart")
-                .Stereotype("Widget"));
-
-            // Shortcut other migration steps on new content definition schemas.
-            return 4;
-        }
-
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom1Async()
-        {
-            await _contentDefinitionManager.AlterTypeDefinitionAsync("Form", type => type
-                .WithPart("TitlePart", part => part.MergeSettings<TitlePartSettings>(setting => setting.RenderTitle = false))
-            );
-
-            await _contentDefinitionManager.AlterTypeDefinitionAsync("Label", type => type
-                .WithPart("TitlePart", part => part.MergeSettings<TitlePartSettings>(setting => setting.RenderTitle = false))
-            );
-
-            return 2;
-        }
-
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom2Async()
-        {
-            await _contentDefinitionManager.AlterTypeDefinitionAsync("Form", type => type
-                .WithPart("TitlePart", part => part
-                    .WithPosition("0")
-                )
-                .WithPart("FormElementPart", part =>
-                   part.WithPosition("1")
-                )
-            );
-
-            return 3;
-        }
-
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom3Async()
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync("FormElementLabelPart", part => part
-                .Attachable()
-                .WithDescription("Provides a way to capture element's label.")
-            );
-
-            await _contentDefinitionManager.AlterPartDefinitionAsync("FormElementValidationPart", part => part
-                .Attachable()
-                .WithDescription("Provides validation options to form elements.")
-            );
-
-            await _contentDefinitionManager.AlterTypeDefinitionAsync("Select", type => type
-                .WithPart("FormInputElementPart", part => part
-                    .WithPosition("1")
-                )
-                .WithPart("FormElementPart", part => part
-                    .WithPosition("2")
-                )
-                .WithPart("FormElementLabelPart", part => part
-                    .WithPosition("3")
-                )
-                .WithPart("SelectPart", part => part
-                    .WithPosition("4")
-                )
-                .WithPart("FormElementValidationPart", part => part
-                    .WithPosition("5")
-                )
-            );
-
-            await _contentDefinitionManager.AlterTypeDefinitionAsync("Input", type => type
-                .WithPart("FormInputElementPart", part => part
-                    .WithPosition("1")
-                )
-                .WithPart("FormElementPart", part => part
-                    .WithPosition("2")
-                )
-                .WithPart("FormElementLabelPart", part => part
-                    .WithPosition("3")
-                )
-                .WithPart("InputPart", part => part
-                    .WithPosition("4")
-                )
-                .WithPart("FormElementValidationPart", part => part
-                    .WithPosition("5")
-                )
-            );
-
-            await _contentDefinitionManager.AlterTypeDefinitionAsync("TextArea", type => type
-                .WithPart("FormInputElementPart", part => part
-                    .WithPosition("1")
-                )
-                .WithPart("FormElementPart", part => part
-                    .WithPosition("2")
-                )
-                .WithPart("FormElementLabelPart", part => part
-                    .WithPosition("3")
-                )
-                .WithPart("TextAreaPart", part => part
-                    .WithPosition("4")
-                )
-                .WithPart("FormElementValidationPart", part => part
-                    .WithPosition("5")
-                )
-            );
-
-            return 4;
-        }
-
-        internal sealed class TitlePartSettings
-        {
-            public int Options { get; set; }
-
-            public string Pattern { get; set; }
-
-            [DefaultValue(true)]
-            public bool RenderTitle { get; set; }
-        }
+        // Form
+        await _contentDefinitionManager.AlterPartDefinitionAsync("FormPart", part => part
+            .Attachable()
+            .WithDescription("Turns your content item into a form."));
+
+        await _contentDefinitionManager.AlterTypeDefinitionAsync("Form", type => type
+            .WithPart("TitlePart", part => part
+                .WithSettings(new TitlePartSettings { RenderTitle = false })
+                .WithPosition("0")
+            )
+            .WithPart("FormElementPart", part =>
+               part.WithPosition("1")
+            )
+            .WithPart("FormPart")
+            .WithPart("FlowPart")
+            .Stereotype("Widget"));
+
+        // FormElement
+        await _contentDefinitionManager.AlterPartDefinitionAsync("FormElementPart", part => part
+            .WithDescription("Provides attributes common to all form elements."));
+
+        await _contentDefinitionManager.AlterPartDefinitionAsync("FormElementLabelPart", part => part
+            .Attachable()
+            .WithDescription("Provides a way to capture element's label.")
+        );
+
+        await _contentDefinitionManager.AlterPartDefinitionAsync("FormElementValidationPart", part => part
+            .Attachable()
+            .WithDescription("Provides validation options to form elements.")
+        );
+
+        // FormInputElement
+        await _contentDefinitionManager.AlterPartDefinitionAsync("FormInputElementPart", part => part
+            .WithDescription("Provides attributes common to all input form elements."));
+
+        // Label
+        await _contentDefinitionManager.AlterPartDefinitionAsync("LabelPart", part => part
+            .WithDescription("Provides label properties."));
+
+        await _contentDefinitionManager.AlterTypeDefinitionAsync("Label", type => type
+            .WithPart("TitlePart", part => part
+                .WithSettings(new TitlePartSettings { RenderTitle = false })
+            )
+            .WithPart("FormElementPart")
+            .WithPart("LabelPart")
+            .Stereotype("Widget"));
+
+        // Input
+        await _contentDefinitionManager.AlterPartDefinitionAsync("InputPart", part => part
+            .WithDescription("Provides input field properties."));
+
+        await _contentDefinitionManager.AlterTypeDefinitionAsync("Input", type => type
+            .WithPart("FormInputElementPart", part => part
+                .WithPosition("1")
+            )
+            .WithPart("FormElementPart", part => part
+                .WithPosition("2")
+            )
+            .WithPart("FormElementLabelPart", part => part
+                .WithPosition("3")
+            )
+            .WithPart("InputPart", part => part
+                .WithPosition("4")
+            )
+            .WithPart("FormElementValidationPart", part => part
+                .WithPosition("5")
+            )
+            .Stereotype("Widget"));
+
+        // TextArea
+        await _contentDefinitionManager.AlterPartDefinitionAsync("TextAreaPart", part => part
+            .WithDescription("Provides text area properties."));
+
+        await _contentDefinitionManager.AlterTypeDefinitionAsync("TextArea", type => type
+            .WithPart("FormInputElementPart", part => part
+                .WithPosition("1")
+            )
+            .WithPart("FormElementPart", part => part
+                .WithPosition("2")
+            )
+            .WithPart("FormElementLabelPart", part => part
+                .WithPosition("3")
+            )
+            .WithPart("TextAreaPart", part => part
+                .WithPosition("4")
+            )
+            .WithPart("FormElementValidationPart", part => part
+                .WithPosition("5")
+            )
+            .Stereotype("Widget"));
+
+        // Select
+        await _contentDefinitionManager.AlterPartDefinitionAsync("SelectPart", part => part
+            .WithDescription("Provides select field properties."));
+
+        await _contentDefinitionManager.AlterTypeDefinitionAsync("Select", type => type
+            .WithPart("FormInputElementPart", part => part
+                .WithPosition("1")
+            )
+            .WithPart("FormElementPart", part => part
+                .WithPosition("2")
+            )
+            .WithPart("FormElementLabelPart", part => part
+                .WithPosition("3")
+            )
+            .WithPart("SelectPart", part => part
+                .WithPosition("4")
+            )
+            .WithPart("FormElementValidationPart", part => part
+                .WithPosition("5")
+            )
+            .Stereotype("Widget"));
+
+        // Button
+        await _contentDefinitionManager.AlterPartDefinitionAsync("ButtonPart", part => part
+            .WithDescription("Provides button properties."));
+
+        await _contentDefinitionManager.AlterTypeDefinitionAsync("Button", type => type
+            .WithPart("FormInputElementPart")
+            .WithPart("FormElementPart")
+            .WithPart("ButtonPart")
+            .Stereotype("Widget"));
+
+        // Validation Summary
+        await _contentDefinitionManager.AlterPartDefinitionAsync("ValidationSummaryPart", part => part
+            .WithDescription("Displays a validation summary."));
+
+        await _contentDefinitionManager.AlterTypeDefinitionAsync("ValidationSummary", type => type
+            .WithPart("ValidationSummaryPart")
+            .Stereotype("Widget"));
+
+        // Validation
+        await _contentDefinitionManager.AlterPartDefinitionAsync("ValidationPart", part => part
+            .WithDescription("Displays a field validation error."));
+
+        await _contentDefinitionManager.AlterTypeDefinitionAsync("Validation", type => type
+            .WithPart("ValidationPart")
+            .Stereotype("Widget"));
+
+        // Shortcut other migration steps on new content definition schemas.
+        return 4;
+    }
+
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom1Async()
+    {
+        await _contentDefinitionManager.AlterTypeDefinitionAsync("Form", type => type
+            .WithPart("TitlePart", part => part.MergeSettings<TitlePartSettings>(setting => setting.RenderTitle = false))
+        );
+
+        await _contentDefinitionManager.AlterTypeDefinitionAsync("Label", type => type
+            .WithPart("TitlePart", part => part.MergeSettings<TitlePartSettings>(setting => setting.RenderTitle = false))
+        );
+
+        return 2;
+    }
+
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom2Async()
+    {
+        await _contentDefinitionManager.AlterTypeDefinitionAsync("Form", type => type
+            .WithPart("TitlePart", part => part
+                .WithPosition("0")
+            )
+            .WithPart("FormElementPart", part =>
+               part.WithPosition("1")
+            )
+        );
+
+        return 3;
+    }
+
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom3Async()
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync("FormElementLabelPart", part => part
+            .Attachable()
+            .WithDescription("Provides a way to capture element's label.")
+        );
+
+        await _contentDefinitionManager.AlterPartDefinitionAsync("FormElementValidationPart", part => part
+            .Attachable()
+            .WithDescription("Provides validation options to form elements.")
+        );
+
+        await _contentDefinitionManager.AlterTypeDefinitionAsync("Select", type => type
+            .WithPart("FormInputElementPart", part => part
+                .WithPosition("1")
+            )
+            .WithPart("FormElementPart", part => part
+                .WithPosition("2")
+            )
+            .WithPart("FormElementLabelPart", part => part
+                .WithPosition("3")
+            )
+            .WithPart("SelectPart", part => part
+                .WithPosition("4")
+            )
+            .WithPart("FormElementValidationPart", part => part
+                .WithPosition("5")
+            )
+        );
+
+        await _contentDefinitionManager.AlterTypeDefinitionAsync("Input", type => type
+            .WithPart("FormInputElementPart", part => part
+                .WithPosition("1")
+            )
+            .WithPart("FormElementPart", part => part
+                .WithPosition("2")
+            )
+            .WithPart("FormElementLabelPart", part => part
+                .WithPosition("3")
+            )
+            .WithPart("InputPart", part => part
+                .WithPosition("4")
+            )
+            .WithPart("FormElementValidationPart", part => part
+                .WithPosition("5")
+            )
+        );
+
+        await _contentDefinitionManager.AlterTypeDefinitionAsync("TextArea", type => type
+            .WithPart("FormInputElementPart", part => part
+                .WithPosition("1")
+            )
+            .WithPart("FormElementPart", part => part
+                .WithPosition("2")
+            )
+            .WithPart("FormElementLabelPart", part => part
+                .WithPosition("3")
+            )
+            .WithPart("TextAreaPart", part => part
+                .WithPosition("4")
+            )
+            .WithPart("FormElementValidationPart", part => part
+                .WithPosition("5")
+            )
+        );
+
+        return 4;
+    }
+
+    internal sealed class TitlePartSettings
+    {
+        public int Options { get; set; }
+
+        public string Pattern { get; set; }
+
+        [DefaultValue(true)]
+        public bool RenderTitle { get; set; }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Models/ButtonPart.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Models/ButtonPart.cs
index 7655c7f2133..e542826e1eb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Models/ButtonPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Models/ButtonPart.cs
@@ -1,10 +1,9 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Forms.Models
+namespace OrchardCore.Forms.Models;
+
+public class ButtonPart : ContentPart
 {
-    public class ButtonPart : ContentPart
-    {
-        public string Text { get; set; }
-        public string Type { get; set; }
-    }
+    public string Text { get; set; }
+    public string Type { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Models/FormElementPart.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Models/FormElementPart.cs
index 6b4a675eb58..e0adaf194ef 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Models/FormElementPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Models/FormElementPart.cs
@@ -1,12 +1,11 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Forms.Models
+namespace OrchardCore.Forms.Models;
+
+/// <summary>
+/// Turns a content item into a form element.
+/// </summary>
+public class FormElementPart : ContentPart
 {
-    /// <summary>
-    /// Turns a content item into a form element.
-    /// </summary>
-    public class FormElementPart : ContentPart
-    {
-        public string Id { get; set; }
-    }
+    public string Id { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Models/FormInputElementPart.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Models/FormInputElementPart.cs
index a1467a61e9a..e9bbdb788d6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Models/FormInputElementPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Models/FormInputElementPart.cs
@@ -1,12 +1,11 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Forms.Models
+namespace OrchardCore.Forms.Models;
+
+/// <summary>
+/// Turns a content item into a form element that supports input.
+/// </summary>
+public class FormInputElementPart : ContentPart
 {
-    /// <summary>
-    /// Turns a content item into a form element that supports input.
-    /// </summary>
-    public class FormInputElementPart : ContentPart
-    {
-        public string Name { get; set; }
-    }
+    public string Name { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Models/FormPart.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Models/FormPart.cs
index 4f00e7d3288..ce11cec1abb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Models/FormPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Models/FormPart.cs
@@ -1,22 +1,21 @@
 using System.ComponentModel;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Forms.Models
+namespace OrchardCore.Forms.Models;
+
+public class FormPart : ContentPart
 {
-    public class FormPart : ContentPart
-    {
-        public string Action { get; set; }
+    public string Action { get; set; }
 
-        public string Method { get; set; }
+    public string Method { get; set; }
 
-        public string WorkflowTypeId { get; set; }
+    public string WorkflowTypeId { get; set; }
 
-        public string EncType { get; set; }
+    public string EncType { get; set; }
 
-        [DefaultValue(true)]
-        public bool EnableAntiForgeryToken { get; set; } = true;
+    [DefaultValue(true)]
+    public bool EnableAntiForgeryToken { get; set; } = true;
 
-        [DefaultValue(true)]
-        public bool SaveFormLocation { get; set; } = true;
-    }
+    [DefaultValue(true)]
+    public bool SaveFormLocation { get; set; } = true;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Models/InputPart.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Models/InputPart.cs
index a87cd9ef436..8635f65b739 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Models/InputPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Models/InputPart.cs
@@ -1,11 +1,10 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Forms.Models
+namespace OrchardCore.Forms.Models;
+
+public class InputPart : ContentPart
 {
-    public class InputPart : ContentPart
-    {
-        public string Type { get; set; }
-        public string DefaultValue { get; set; }
-        public string Placeholder { get; set; }
-    }
+    public string Type { get; set; }
+    public string DefaultValue { get; set; }
+    public string Placeholder { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Models/LabelPart.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Models/LabelPart.cs
index b56ddd7fb4d..8df9404f688 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Models/LabelPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Models/LabelPart.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Forms.Models
+namespace OrchardCore.Forms.Models;
+
+public class LabelPart : ContentPart
 {
-    public class LabelPart : ContentPart
-    {
-        public string For { get; set; }
-    }
+    public string For { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Models/SelectPart.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Models/SelectPart.cs
index fc181045a7c..b4bbfc1857e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Models/SelectPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Models/SelectPart.cs
@@ -1,25 +1,24 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Forms.Models
+namespace OrchardCore.Forms.Models;
+
+public class SelectPart : ContentPart
 {
-    public class SelectPart : ContentPart
-    {
-        public SelectOption[] Options { get; set; }
-        public string DefaultValue { get; set; }
-        public SelectEditorOption Editor { get; set; }
-    }
+    public SelectOption[] Options { get; set; }
+    public string DefaultValue { get; set; }
+    public SelectEditorOption Editor { get; set; }
+}
 
-    public class SelectOption
-    {
-        public string Text { get; set; }
+public class SelectOption
+{
+    public string Text { get; set; }
 
-        public string Value { get; set; }
-    }
+    public string Value { get; set; }
+}
 
-    public enum SelectEditorOption
-    {
-        Dropdown,
-        Checkbox,
-        Radio
-    }
+public enum SelectEditorOption
+{
+    Dropdown,
+    Checkbox,
+    Radio
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Models/TextAreaPart.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Models/TextAreaPart.cs
index 536c8654e0f..c6cc763c029 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Models/TextAreaPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Models/TextAreaPart.cs
@@ -1,10 +1,9 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Forms.Models
+namespace OrchardCore.Forms.Models;
+
+public class TextAreaPart : ContentPart
 {
-    public class TextAreaPart : ContentPart
-    {
-        public string DefaultValue { get; set; }
-        public string Placeholder { get; set; }
-    }
+    public string DefaultValue { get; set; }
+    public string Placeholder { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Models/ValidationPart.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Models/ValidationPart.cs
index 24b9f6be5c4..f28fd0e2328 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Models/ValidationPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Models/ValidationPart.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Forms.Models
+namespace OrchardCore.Forms.Models;
+
+public class ValidationPart : ContentPart
 {
-    public class ValidationPart : ContentPart
-    {
-        public string For { get; set; }
-    }
+    public string For { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Models/ValidationSummaryPart.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Models/ValidationSummaryPart.cs
index ef751fc2129..80a7f4cf25b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Models/ValidationSummaryPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Models/ValidationSummaryPart.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Forms.Models
+namespace OrchardCore.Forms.Models;
+
+public class ValidationSummaryPart : ContentPart
 {
-    public class ValidationSummaryPart : ContentPart
-    {
-        public bool ModelOnly { get; set; }
-    }
+    public bool ModelOnly { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Startup.cs
index 99a867ab423..4d8d419f79c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Startup.cs
@@ -13,80 +13,79 @@
 using OrchardCore.Modules;
 using OrchardCore.Workflows.Helpers;
 
-namespace OrchardCore.Forms
+namespace OrchardCore.Forms;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<FormPart>();
-                o.MemberAccessStrategy.Register<FormElementPart>();
-                o.MemberAccessStrategy.Register<FormInputElementPart>();
-                o.MemberAccessStrategy.Register<LabelPart>();
-                o.MemberAccessStrategy.Register<InputPart>();
-                o.MemberAccessStrategy.Register<SelectPart>();
-                o.MemberAccessStrategy.Register<TextAreaPart>();
-                o.MemberAccessStrategy.Register<ButtonPart>();
-            });
-
-            services.Configure<MvcOptions>(options =>
-            {
-                options.Filters.Add<ExportModelStateAttribute>();
-                options.Filters.Add<ImportModelStateAttribute>();
-                options.Filters.Add<ImportModelStatePageFilter>();
-            });
+            o.MemberAccessStrategy.Register<FormPart>();
+            o.MemberAccessStrategy.Register<FormElementPart>();
+            o.MemberAccessStrategy.Register<FormInputElementPart>();
+            o.MemberAccessStrategy.Register<LabelPart>();
+            o.MemberAccessStrategy.Register<InputPart>();
+            o.MemberAccessStrategy.Register<SelectPart>();
+            o.MemberAccessStrategy.Register<TextAreaPart>();
+            o.MemberAccessStrategy.Register<ButtonPart>();
+        });
+
+        services.Configure<MvcOptions>(options =>
+        {
+            options.Filters.Add<ExportModelStateAttribute>();
+            options.Filters.Add<ImportModelStateAttribute>();
+            options.Filters.Add<ImportModelStatePageFilter>();
+        });
 
-            services.AddScoped<IContentDisplayDriver, FormContentDisplayDriver>();
+        services.AddScoped<IContentDisplayDriver, FormContentDisplayDriver>();
 
-            services.AddContentPart<FormPart>()
-                    .UseDisplayDriver<FormPartDisplayDriver>();
+        services.AddContentPart<FormPart>()
+                .UseDisplayDriver<FormPartDisplayDriver>();
 
-            services.AddContentPart<FormElementPart>()
-                    .UseDisplayDriver<FormElementPartDisplayDriver>();
+        services.AddContentPart<FormElementPart>()
+                .UseDisplayDriver<FormElementPartDisplayDriver>();
 
-            services.AddContentPart<FormInputElementPart>()
-                    .UseDisplayDriver<FormInputElementPartDisplayDriver>();
+        services.AddContentPart<FormInputElementPart>()
+                .UseDisplayDriver<FormInputElementPartDisplayDriver>();
 
-            services.AddContentPart<LabelPart>()
-                    .UseDisplayDriver<LabelPartDisplayDriver>();
+        services.AddContentPart<LabelPart>()
+                .UseDisplayDriver<LabelPartDisplayDriver>();
 
-            services.AddContentPart<ButtonPart>()
-                    .UseDisplayDriver<ButtonPartDisplayDriver>();
+        services.AddContentPart<ButtonPart>()
+                .UseDisplayDriver<ButtonPartDisplayDriver>();
 
-            services.AddContentPart<InputPart>()
-                    .UseDisplayDriver<InputPartDisplayDriver>();
+        services.AddContentPart<InputPart>()
+                .UseDisplayDriver<InputPartDisplayDriver>();
 
-            services.AddContentPart<SelectPart>()
-                .UseDisplayDriver<SelectPartDisplayDriver>();
+        services.AddContentPart<SelectPart>()
+            .UseDisplayDriver<SelectPartDisplayDriver>();
 
-            services.AddContentPart<TextAreaPart>()
-                    .UseDisplayDriver<TextAreaPartDisplayDriver>();
+        services.AddContentPart<TextAreaPart>()
+                .UseDisplayDriver<TextAreaPartDisplayDriver>();
 
-            services.AddContentPart<ValidationSummaryPart>()
-                    .UseDisplayDriver<ValidationSummaryPartDisplayDriver>();
+        services.AddContentPart<ValidationSummaryPart>()
+                .UseDisplayDriver<ValidationSummaryPartDisplayDriver>();
 
-            services.AddContentPart<ValidationPart>()
-                    .UseDisplayDriver<ValidationPartDisplayDriver>();
+        services.AddContentPart<ValidationPart>()
+                .UseDisplayDriver<ValidationPartDisplayDriver>();
 
-            services.AddContentPart<FormElementLabelPart>()
-                    .UseDisplayDriver<FormElementLabelPartDisplayDriver>();
+        services.AddContentPart<FormElementLabelPart>()
+                .UseDisplayDriver<FormElementLabelPartDisplayDriver>();
 
-            services.AddContentPart<FormElementValidationPart>()
-                    .UseDisplayDriver<FormElementValidationPartDisplayDriver>();
+        services.AddContentPart<FormElementValidationPart>()
+                .UseDisplayDriver<FormElementValidationPartDisplayDriver>();
 
-            services.AddDataMigration<Migrations>();
-            services.AddScoped<IShapeTableProvider, FormShapeTableProvider>();
-        }
+        services.AddDataMigration<Migrations>();
+        services.AddScoped<IShapeTableProvider, FormShapeTableProvider>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Workflows")]
-    public sealed class WorkflowStartup : StartupBase
+[RequireFeatures("OrchardCore.Workflows")]
+public sealed class WorkflowStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddActivity<HttpRedirectToFormLocationTask, HttpRedirectToFormLocationTaskDisplayDriver>();
-        }
+        services.AddActivity<HttpRedirectToFormLocationTask, HttpRedirectToFormLocationTaskDisplayDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/ButtonPartEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/ButtonPartEditViewModel.cs
index 53dde268ab6..74b8a2c6b1f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/ButtonPartEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/ButtonPartEditViewModel.cs
@@ -1,12 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Forms.ViewModels
+namespace OrchardCore.Forms.ViewModels;
+
+public class ButtonPartEditViewModel
 {
-    public class ButtonPartEditViewModel
-    {
-        [Required]
-        public string Text { get; set; }
+    [Required]
+    public string Text { get; set; }
 
-        public string Type { get; set; }
-    }
+    public string Type { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/FormElementPartEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/FormElementPartEditViewModel.cs
index 4cab3e8eef3..9fb42340d95 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/FormElementPartEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/FormElementPartEditViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Forms.ViewModels
+namespace OrchardCore.Forms.ViewModels;
+
+public class FormElementPartEditViewModel
 {
-    public class FormElementPartEditViewModel
-    {
-        public string Id { get; set; }
-    }
+    public string Id { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/FormInputElementPartEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/FormInputElementPartEditViewModel.cs
index 583daba8dd8..0b0a04bccec 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/FormInputElementPartEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/FormInputElementPartEditViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Forms.ViewModels
+namespace OrchardCore.Forms.ViewModels;
+
+public class FormInputElementPartEditViewModel
 {
-    public class FormInputElementPartEditViewModel
-    {
-        public string Name { get; set; }
-    }
+    public string Name { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/FormPartEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/FormPartEditViewModel.cs
index 89d1ee5f371..37b800c6994 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/FormPartEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/FormPartEditViewModel.cs
@@ -1,17 +1,16 @@
-namespace OrchardCore.Forms.ViewModels
+namespace OrchardCore.Forms.ViewModels;
+
+public class FormPartEditViewModel
 {
-    public class FormPartEditViewModel
-    {
-        public string Action { get; set; }
+    public string Action { get; set; }
 
-        public string Method { get; set; }
+    public string Method { get; set; }
 
-        public string WorkflowTypeId { get; set; }
+    public string WorkflowTypeId { get; set; }
 
-        public string EncType { get; set; }
+    public string EncType { get; set; }
 
-        public bool EnableAntiForgeryToken { get; set; } = true;
+    public bool EnableAntiForgeryToken { get; set; } = true;
 
-        public bool SaveFormLocation { get; set; } = true;
-    }
+    public bool SaveFormLocation { get; set; } = true;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/InputPartEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/InputPartEditViewModel.cs
index 0170e214ae4..ce4707bd6a6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/InputPartEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/InputPartEditViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Forms.ViewModels
+namespace OrchardCore.Forms.ViewModels;
+
+public class InputPartEditViewModel
 {
-    public class InputPartEditViewModel
-    {
-        public string Type { get; set; }
-        public string DefaultValue { get; set; }
-        public string Placeholder { get; set; }
-    }
+    public string Type { get; set; }
+    public string DefaultValue { get; set; }
+    public string Placeholder { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/LabelPartEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/LabelPartEditViewModel.cs
index e15e270bc73..09f33a446ca 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/LabelPartEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/LabelPartEditViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Forms.ViewModels
+namespace OrchardCore.Forms.ViewModels;
+
+public class LabelPartEditViewModel
 {
-    public class LabelPartEditViewModel
-    {
-        public string For { get; set; }
-    }
+    public string For { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/SelectPartEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/SelectPartEditViewModel.cs
index 82fc04172ce..6deeaaf4d56 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/SelectPartEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/SelectPartEditViewModel.cs
@@ -1,11 +1,10 @@
 using OrchardCore.Forms.Models;
 
-namespace OrchardCore.Forms.ViewModels
+namespace OrchardCore.Forms.ViewModels;
+
+public class SelectPartEditViewModel
 {
-    public class SelectPartEditViewModel
-    {
-        public string Options { get; set; }
-        public string DefaultValue { get; set; }
-        public SelectEditorOption Editor { get; set; }
-    }
+    public string Options { get; set; }
+    public string DefaultValue { get; set; }
+    public SelectEditorOption Editor { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/TextAreaPartEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/TextAreaPartEditViewModel.cs
index 2406fee9846..ad1af99c73b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/TextAreaPartEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/TextAreaPartEditViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Forms.ViewModels
+namespace OrchardCore.Forms.ViewModels;
+
+public class TextAreaPartEditViewModel
 {
-    public class TextAreaPartEditViewModel
-    {
-        public string DefaultValue { get; set; }
-        public string Placeholder { get; set; }
-    }
+    public string DefaultValue { get; set; }
+    public string Placeholder { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/ValidationPartEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/ValidationPartEditViewModel.cs
index 9af5344e2c6..029c2b28e52 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/ValidationPartEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/ViewModels/ValidationPartEditViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Forms.ViewModels
+namespace OrchardCore.Forms.ViewModels;
+
+public class ValidationPartEditViewModel
 {
-    public class ValidationPartEditViewModel
-    {
-        public string For { get; set; }
-        public string ErrorMessage { get; set; }
-    }
+    public string For { get; set; }
+    public string ErrorMessage { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/AddModelValidationErrorTask.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/AddModelValidationErrorTask.cs
index cb2d3f7a821..edd1c209d7b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/AddModelValidationErrorTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/AddModelValidationErrorTask.cs
@@ -6,50 +6,49 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Forms.Workflows.Activities
+namespace OrchardCore.Forms.Workflows.Activities;
+
+public class AddModelValidationErrorTask : TaskActivity<AddModelValidationErrorTask>
 {
-    public class AddModelValidationErrorTask : TaskActivity<AddModelValidationErrorTask>
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    protected readonly IStringLocalizer S;
+
+    public AddModelValidationErrorTask(
+        IUpdateModelAccessor updateModelAccessor,
+        IStringLocalizer<AddModelValidationErrorTask> localizer
+    )
     {
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        protected readonly IStringLocalizer S;
-
-        public AddModelValidationErrorTask(
-            IUpdateModelAccessor updateModelAccessor,
-            IStringLocalizer<AddModelValidationErrorTask> localizer
-        )
-        {
-            _updateModelAccessor = updateModelAccessor;
-            S = localizer;
-        }
-
-        public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
-
-        public override LocalizedString Category => S["Validation"];
-
-        public string Key
-        {
-            get => GetProperty<string>();
-            set => SetProperty(value);
-        }
-
-        public string ErrorMessage
-        {
-            get => GetProperty<string>();
-            set => SetProperty(value);
-        }
-
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"]);
-        }
-
-        public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var updater = _updateModelAccessor.ModelUpdater
-                ?? throw new InvalidOperationException("Cannot add model validation errors when there's no Updater present.");
-
-            updater.ModelState.AddModelError(Key, ErrorMessage);
-            return Outcomes("Done");
-        }
+        _updateModelAccessor = updateModelAccessor;
+        S = localizer;
+    }
+
+    public override LocalizedString DisplayText => S["Add Model Validation Error Task"];
+
+    public override LocalizedString Category => S["Validation"];
+
+    public string Key
+    {
+        get => GetProperty<string>();
+        set => SetProperty(value);
+    }
+
+    public string ErrorMessage
+    {
+        get => GetProperty<string>();
+        set => SetProperty(value);
+    }
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"]);
+    }
+
+    public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var updater = _updateModelAccessor.ModelUpdater
+            ?? throw new InvalidOperationException("Cannot add model validation errors when there's no Updater present.");
+
+        updater.ModelState.AddModelError(Key, ErrorMessage);
+        return Outcomes("Done");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/BindModelStateTask.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/BindModelStateTask.cs
index e5b2a749c99..7d07ae506b2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/BindModelStateTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/BindModelStateTask.cs
@@ -7,47 +7,46 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Forms.Workflows.Activities
+namespace OrchardCore.Forms.Workflows.Activities;
+
+public class BindModelStateTask : TaskActivity<BindModelStateTask>
 {
-    public class BindModelStateTask : TaskActivity<BindModelStateTask>
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    protected readonly IStringLocalizer S;
+
+    public BindModelStateTask(
+        IHttpContextAccessor httpContextAccessor,
+        IUpdateModelAccessor updateModelAccessor,
+        IStringLocalizer<BindModelStateTask> localizer
+    )
     {
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        protected readonly IStringLocalizer S;
-
-        public BindModelStateTask(
-            IHttpContextAccessor httpContextAccessor,
-            IUpdateModelAccessor updateModelAccessor,
-            IStringLocalizer<BindModelStateTask> localizer
-        )
-        {
-            _updateModelAccessor = updateModelAccessor;
-            _httpContextAccessor = httpContextAccessor;
-            S = localizer;
-        }
-
-        public override LocalizedString DisplayText => S["Bind Model State Task"];
+        _updateModelAccessor = updateModelAccessor;
+        _httpContextAccessor = httpContextAccessor;
+        S = localizer;
+    }
 
-        public override LocalizedString Category => S["Validation"];
+    public override LocalizedString DisplayText => S["Bind Model State Task"];
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"]);
-        }
+    public override LocalizedString Category => S["Validation"];
 
-        public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var updater = _updateModelAccessor.ModelUpdater
-                ?? throw new InvalidOperationException("Cannot add model validation errors when there's no Updater present.");
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"]);
+    }
 
-            var httpContext = _httpContextAccessor.HttpContext;
+    public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var updater = _updateModelAccessor.ModelUpdater
+            ?? throw new InvalidOperationException("Cannot add model validation errors when there's no Updater present.");
 
-            foreach (var item in httpContext.Request.Form)
-            {
-                updater.ModelState.SetModelValue(item.Key, item.Value, item.Value);
-            }
+        var httpContext = _httpContextAccessor.HttpContext;
 
-            return Outcomes("Done");
+        foreach (var item in httpContext.Request.Form)
+        {
+            updater.ModelState.SetModelValue(item.Key, item.Value, item.Value);
         }
+
+        return Outcomes("Done");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateAntiforgeryTokenTask.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateAntiforgeryTokenTask.cs
index 37b14f587cd..4fa2cd73023 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateAntiforgeryTokenTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateAntiforgeryTokenTask.cs
@@ -7,46 +7,45 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Forms.Workflows.Activities
+namespace OrchardCore.Forms.Workflows.Activities;
+
+public class ValidateAntiforgeryTokenTask : TaskActivity<ValidateAntiforgeryTokenTask>
 {
-    public class ValidateAntiforgeryTokenTask : TaskActivity<ValidateAntiforgeryTokenTask>
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAntiforgery _antiforgery;
+    protected readonly IStringLocalizer S;
+
+    public ValidateAntiforgeryTokenTask(
+        IHttpContextAccessor httpContextAccessor,
+        IAntiforgery antiforgery,
+        IStringLocalizer<ValidateAntiforgeryTokenTask> localizer
+    )
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAntiforgery _antiforgery;
-        protected readonly IStringLocalizer S;
-
-        public ValidateAntiforgeryTokenTask(
-            IHttpContextAccessor httpContextAccessor,
-            IAntiforgery antiforgery,
-            IStringLocalizer<ValidateAntiforgeryTokenTask> localizer
-        )
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _antiforgery = antiforgery;
-            S = localizer;
-        }
+        _httpContextAccessor = httpContextAccessor;
+        _antiforgery = antiforgery;
+        S = localizer;
+    }
 
-        public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
+    public override LocalizedString DisplayText => S["Validate Antiforgery Token Task"];
 
-        public override LocalizedString Category => S["Validation"];
+    public override LocalizedString Category => S["Validation"];
 
-        public override bool HasEditor => false;
+    public override bool HasEditor => false;
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
+    }
+
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        if (await _antiforgery.IsRequestValidAsync(_httpContextAccessor.HttpContext))
         {
-            return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
+            return Outcomes("Done", "Valid");
         }
-
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        else
         {
-            if (await _antiforgery.IsRequestValidAsync(_httpContextAccessor.HttpContext))
-            {
-                return Outcomes("Done", "Valid");
-            }
-            else
-            {
-                return Outcomes("Done", "Invalid");
-            }
+            return Outcomes("Done", "Invalid");
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateFormFieldTask.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateFormFieldTask.cs
index 1defcd12ae0..114d450a415 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateFormFieldTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateFormFieldTask.cs
@@ -6,62 +6,61 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Forms.Workflows.Activities
+namespace OrchardCore.Forms.Workflows.Activities;
+
+// TODO: Add the ability to configure various types of validators.
+public class ValidateFormFieldTask : TaskActivity<ValidateFormFieldTask>
 {
-    // TODO: Add the ability to configure various types of validators.
-    public class ValidateFormFieldTask : TaskActivity<ValidateFormFieldTask>
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    protected readonly IStringLocalizer S;
+
+    public ValidateFormFieldTask(
+        IHttpContextAccessor httpContextAccessor,
+        IUpdateModelAccessor updateModelAccessor,
+        IStringLocalizer<ValidateFormFieldTask> localizer
+    )
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        protected readonly IStringLocalizer S;
+        _httpContextAccessor = httpContextAccessor;
+        _updateModelAccessor = updateModelAccessor;
+        S = localizer;
+    }
 
-        public ValidateFormFieldTask(
-            IHttpContextAccessor httpContextAccessor,
-            IUpdateModelAccessor updateModelAccessor,
-            IStringLocalizer<ValidateFormFieldTask> localizer
-        )
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _updateModelAccessor = updateModelAccessor;
-            S = localizer;
-        }
+    public override LocalizedString DisplayText => S["Validate Form Field Task"];
 
-        public override LocalizedString DisplayText => S["Validate Form Field Task"];
+    public override LocalizedString Category => S["Validation"];
 
-        public override LocalizedString Category => S["Validation"];
+    public string FieldName
+    {
+        get => GetProperty<string>();
+        set => SetProperty(value);
+    }
 
-        public string FieldName
-        {
-            get => GetProperty<string>();
-            set => SetProperty(value);
-        }
+    public string ErrorMessage
+    {
+        get => GetProperty<string>();
+        set => SetProperty(value);
+    }
 
-        public string ErrorMessage
-        {
-            get => GetProperty<string>();
-            set => SetProperty(value);
-        }
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
+    }
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-        }
+    public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var form = _httpContextAccessor.HttpContext.Request.Form;
+        var fieldValue = form[FieldName];
+        var isValid = !string.IsNullOrWhiteSpace(fieldValue);
+        var outcome = isValid ? "Valid" : "Invalid";
 
-        public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        if (!isValid)
         {
-            var form = _httpContextAccessor.HttpContext.Request.Form;
-            var fieldValue = form[FieldName];
-            var isValid = !string.IsNullOrWhiteSpace(fieldValue);
-            var outcome = isValid ? "Valid" : "Invalid";
-
-            if (!isValid)
-            {
-                var updater = _updateModelAccessor.ModelUpdater;
+            var updater = _updateModelAccessor.ModelUpdater;
 
-                updater?.ModelState.TryAddModelError(FieldName, ErrorMessage);
-            }
-
-            return Outcomes("Done", outcome);
+            updater?.ModelState.TryAddModelError(FieldName, ErrorMessage);
         }
+
+        return Outcomes("Done", outcome);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateFormTask.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateFormTask.cs
index 3477af87bfe..a8a22ff040d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateFormTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Activities/ValidateFormTask.cs
@@ -6,41 +6,40 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Forms.Workflows.Activities
+namespace OrchardCore.Forms.Workflows.Activities;
+
+public class ValidateFormTask : TaskActivity<ValidateFormTask>
 {
-    public class ValidateFormTask : TaskActivity<ValidateFormTask>
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    protected readonly IStringLocalizer S;
+
+    public ValidateFormTask(
+        IUpdateModelAccessor updateModelAccessor,
+        IStringLocalizer<ValidateFormTask> localizer
+    )
+    {
+        _updateModelAccessor = updateModelAccessor;
+        S = localizer;
+    }
+
+    public override LocalizedString DisplayText => S["Validate Form Task"];
+
+    public override LocalizedString Category => S["Validation"];
+
+    public override bool HasEditor => false;
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Valid"], S["Invalid"]);
+    }
+
+    public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
     {
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        protected readonly IStringLocalizer S;
-
-        public ValidateFormTask(
-            IUpdateModelAccessor updateModelAccessor,
-            IStringLocalizer<ValidateFormTask> localizer
-        )
-        {
-            _updateModelAccessor = updateModelAccessor;
-            S = localizer;
-        }
-
-        public override LocalizedString DisplayText => S["Validate Form Task"];
-
-        public override LocalizedString Category => S["Validation"];
-
-        public override bool HasEditor => false;
-
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Valid"], S["Invalid"]);
-        }
-
-        public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var updater = _updateModelAccessor.ModelUpdater
-                ?? throw new InvalidOperationException("Cannot add model validation errors when there's no Updater present.");
-
-            var isValid = updater.ModelState.ErrorCount == 0;
-            var outcome = isValid ? "Valid" : "Invalid";
-            return Outcomes(outcome);
-        }
+        var updater = _updateModelAccessor.ModelUpdater
+            ?? throw new InvalidOperationException("Cannot add model validation errors when there's no Updater present.");
+
+        var isValid = updater.ModelState.ErrorCount == 0;
+        var outcome = isValid ? "Valid" : "Invalid";
+        return Outcomes(outcome);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/AddModelValidationErrorTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/AddModelValidationErrorTaskDisplayDriver.cs
index 66c763b3d65..dcb0c61be3c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/AddModelValidationErrorTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/AddModelValidationErrorTaskDisplayDriver.cs
@@ -2,20 +2,19 @@
 using OrchardCore.Forms.Workflows.ViewModels;
 using OrchardCore.Workflows.Display;
 
-namespace OrchardCore.Forms.Workflows.Drivers
+namespace OrchardCore.Forms.Workflows.Drivers;
+
+public sealed class AddModelValidationErrorTaskDisplayDriver : ActivityDisplayDriver<AddModelValidationErrorTask, AddModelValidationErrorTaskViewModel>
 {
-    public sealed class AddModelValidationErrorTaskDisplayDriver : ActivityDisplayDriver<AddModelValidationErrorTask, AddModelValidationErrorTaskViewModel>
+    protected override void EditActivity(AddModelValidationErrorTask activity, AddModelValidationErrorTaskViewModel model)
     {
-        protected override void EditActivity(AddModelValidationErrorTask activity, AddModelValidationErrorTaskViewModel model)
-        {
-            model.Key = activity.Key;
-            model.ErrorMessage = activity.ErrorMessage;
-        }
+        model.Key = activity.Key;
+        model.ErrorMessage = activity.ErrorMessage;
+    }
 
-        protected override void UpdateActivity(AddModelValidationErrorTaskViewModel model, AddModelValidationErrorTask activity)
-        {
-            activity.Key = model.Key?.Trim();
-            activity.ErrorMessage = model.ErrorMessage?.Trim();
-        }
+    protected override void UpdateActivity(AddModelValidationErrorTaskViewModel model, AddModelValidationErrorTask activity)
+    {
+        activity.Key = model.Key?.Trim();
+        activity.ErrorMessage = model.ErrorMessage?.Trim();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/BindModelStateTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/BindModelStateTaskDisplayDriver.cs
index d59d589bca1..463056717fa 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/BindModelStateTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/BindModelStateTaskDisplayDriver.cs
@@ -1,9 +1,8 @@
 using OrchardCore.Forms.Workflows.Activities;
 using OrchardCore.Workflows.Display;
 
-namespace OrchardCore.Forms.Workflows.Drivers
+namespace OrchardCore.Forms.Workflows.Drivers;
+
+public sealed class BindModelStateTaskDisplayDriver : ActivityDisplayDriver<BindModelStateTask>
 {
-    public sealed class BindModelStateTaskDisplayDriver : ActivityDisplayDriver<BindModelStateTask>
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/ValidateAntiforgeryTokenTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/ValidateAntiforgeryTokenTaskDisplayDriver.cs
index f962cf5d8fe..e4a579d4c5f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/ValidateAntiforgeryTokenTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/ValidateAntiforgeryTokenTaskDisplayDriver.cs
@@ -1,9 +1,8 @@
 using OrchardCore.Forms.Workflows.Activities;
 using OrchardCore.Workflows.Display;
 
-namespace OrchardCore.Forms.Workflows.Drivers
+namespace OrchardCore.Forms.Workflows.Drivers;
+
+public sealed class ValidateAntiforgeryTokenTaskDisplayDriver : ActivityDisplayDriver<ValidateAntiforgeryTokenTask>
 {
-    public sealed class ValidateAntiforgeryTokenTaskDisplayDriver : ActivityDisplayDriver<ValidateAntiforgeryTokenTask>
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/ValidateFormFieldTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/ValidateFormFieldTaskDisplayDriver.cs
index 64c35446d1c..9a350678853 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/ValidateFormFieldTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/ValidateFormFieldTaskDisplayDriver.cs
@@ -2,20 +2,19 @@
 using OrchardCore.Forms.Workflows.ViewModels;
 using OrchardCore.Workflows.Display;
 
-namespace OrchardCore.Forms.Workflows.Drivers
+namespace OrchardCore.Forms.Workflows.Drivers;
+
+public sealed class ValidateFormFieldTaskDisplayDriver : ActivityDisplayDriver<ValidateFormFieldTask, ValidateFormFieldTaskViewModel>
 {
-    public sealed class ValidateFormFieldTaskDisplayDriver : ActivityDisplayDriver<ValidateFormFieldTask, ValidateFormFieldTaskViewModel>
+    protected override void EditActivity(ValidateFormFieldTask activity, ValidateFormFieldTaskViewModel model)
     {
-        protected override void EditActivity(ValidateFormFieldTask activity, ValidateFormFieldTaskViewModel model)
-        {
-            model.FieldName = activity.FieldName;
-            model.ErrorMessage = activity.ErrorMessage;
-        }
+        model.FieldName = activity.FieldName;
+        model.ErrorMessage = activity.ErrorMessage;
+    }
 
-        protected override void UpdateActivity(ValidateFormFieldTaskViewModel model, ValidateFormFieldTask activity)
-        {
-            activity.FieldName = model.FieldName?.Trim();
-            activity.ErrorMessage = model.ErrorMessage?.Trim();
-        }
+    protected override void UpdateActivity(ValidateFormFieldTaskViewModel model, ValidateFormFieldTask activity)
+    {
+        activity.FieldName = model.FieldName?.Trim();
+        activity.ErrorMessage = model.ErrorMessage?.Trim();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/ValidateFormTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/ValidateFormTaskDisplayDriver.cs
index 9bc14f85127..a145d329bfe 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/ValidateFormTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Drivers/ValidateFormTaskDisplayDriver.cs
@@ -1,9 +1,8 @@
 using OrchardCore.Forms.Workflows.Activities;
 using OrchardCore.Workflows.Display;
 
-namespace OrchardCore.Forms.Workflows.Drivers
+namespace OrchardCore.Forms.Workflows.Drivers;
+
+public sealed class ValidateFormTaskDisplayDriver : ActivityDisplayDriver<ValidateFormTask>
 {
-    public sealed class ValidateFormTaskDisplayDriver : ActivityDisplayDriver<ValidateFormTask>
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Startup.cs
index af664a8dc17..65858e0b38e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/Startup.cs
@@ -4,18 +4,17 @@
 using OrchardCore.Modules;
 using OrchardCore.Workflows.Helpers;
 
-namespace OrchardCore.Forms.Workflows
+namespace OrchardCore.Forms.Workflows;
+
+[RequireFeatures("OrchardCore.Workflows")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Workflows")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddActivity<ValidateAntiforgeryTokenTask, ValidateAntiforgeryTokenTaskDisplayDriver>();
-            services.AddActivity<AddModelValidationErrorTask, AddModelValidationErrorTaskDisplayDriver>();
-            services.AddActivity<ValidateFormTask, ValidateFormTaskDisplayDriver>();
-            services.AddActivity<ValidateFormFieldTask, ValidateFormFieldTaskDisplayDriver>();
-            services.AddActivity<BindModelStateTask, BindModelStateTaskDisplayDriver>();
-        }
+        services.AddActivity<ValidateAntiforgeryTokenTask, ValidateAntiforgeryTokenTaskDisplayDriver>();
+        services.AddActivity<AddModelValidationErrorTask, AddModelValidationErrorTaskDisplayDriver>();
+        services.AddActivity<ValidateFormTask, ValidateFormTaskDisplayDriver>();
+        services.AddActivity<ValidateFormFieldTask, ValidateFormFieldTaskDisplayDriver>();
+        services.AddActivity<BindModelStateTask, BindModelStateTaskDisplayDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/ViewModels/AddModelValidationErrorTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/ViewModels/AddModelValidationErrorTaskViewModel.cs
index eb981d7cdd1..d832e1c2f8b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/ViewModels/AddModelValidationErrorTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/ViewModels/AddModelValidationErrorTaskViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Forms.Workflows.ViewModels
+namespace OrchardCore.Forms.Workflows.ViewModels;
+
+public class AddModelValidationErrorTaskViewModel
 {
-    public class AddModelValidationErrorTaskViewModel
-    {
-        public string Key { get; set; }
-        public string ErrorMessage { get; set; }
-    }
+    public string Key { get; set; }
+    public string ErrorMessage { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/ViewModels/ValidateFormFieldTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/ViewModels/ValidateFormFieldTaskViewModel.cs
index b9b323dc6d2..bab85dc0ec8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/ViewModels/ValidateFormFieldTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Workflows/ViewModels/ValidateFormFieldTaskViewModel.cs
@@ -1,13 +1,12 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Forms.Workflows.ViewModels
+namespace OrchardCore.Forms.Workflows.ViewModels;
+
+public class ValidateFormFieldTaskViewModel
 {
-    public class ValidateFormFieldTaskViewModel
-    {
-        [Required]
-        public string FieldName { get; set; }
+    [Required]
+    public string FieldName { get; set; }
 
-        [Required]
-        public string ErrorMessage { get; set; }
-    }
+    [Required]
+    public string ErrorMessage { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs
index 79d971b455e..7d5e8d715a2 100644
--- a/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs
+++ b/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs
@@ -3,44 +3,43 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.GitHub
+namespace OrchardCore.GitHub;
+
+public sealed class AdminMenuGitHubLogin : INavigationProvider
 {
-    public sealed class AdminMenuGitHubLogin : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", GitHubConstants.Features.GitHubAuthentication },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", GitHubConstants.Features.GitHubAuthentication },
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenuGitHubLogin(IStringLocalizer<AdminMenuGitHubLogin> localizer)
-        {
-            S = localizer;
-        }
+    public AdminMenuGitHubLogin(IStringLocalizer<AdminMenuGitHubLogin> localizer)
+    {
+        S = localizer;
+    }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            builder
-                .Add(S["Security"], security => security
-                    .Add(S["Authentication"], authentication => authentication
-                        .Add(S["GitHub"], S["GitHub"].PrefixPosition(), settings => settings
-                            .AddClass("github")
-                            .Id("github")
-                            .Action("Index", "Admin", _routeValues)
-                            .Permission(Permissions.ManageGitHubAuthentication)
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Security"], security => security
+                .Add(S["Authentication"], authentication => authentication
+                    .Add(S["GitHub"], S["GitHub"].PrefixPosition(), settings => settings
+                        .AddClass("github")
+                        .Id("github")
+                        .Action("Index", "Admin", _routeValues)
+                        .Permission(Permissions.ManageGitHubAuthentication)
+                        .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/Configuration/GithubHandler.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/Configuration/GithubHandler.cs
index 35f1fdc0115..af319d9a39f 100644
--- a/src/OrchardCore.Modules/OrchardCore.GitHub/Configuration/GithubHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.GitHub/Configuration/GithubHandler.cs
@@ -12,98 +12,97 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.GitHub.Configuration
+namespace OrchardCore.GitHub.Configuration;
+
+public class GitHubHandler : OAuthHandler<GitHubOptions>
 {
-    public class GitHubHandler : OAuthHandler<GitHubOptions>
+    public GitHubHandler(IOptionsMonitor<GitHubOptions> options, ILoggerFactory logger, UrlEncoder encoder)
+        : base(options, logger, encoder)
+    {
+    }
+
+    protected override async Task<AuthenticationTicket> CreateTicketAsync(ClaimsIdentity identity, AuthenticationProperties properties, OAuthTokenResponse tokens)
     {
-        public GitHubHandler(IOptionsMonitor<GitHubOptions> options, ILoggerFactory logger, UrlEncoder encoder)
-            : base(options, logger, encoder)
+        var request = new HttpRequestMessage(HttpMethod.Get, Options.UserInformationEndpoint);
+        request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", tokens.AccessToken);
+
+        var response = await Backchannel.SendAsync(request, Context.RequestAborted);
+        if (!response.IsSuccessStatusCode)
         {
+            throw new HttpRequestException($"An error occurred when retrieving GitHub user information ({response.StatusCode}). Please check if the authentication information is correct in the corresponding GitHub Application.");
         }
 
-        protected override async Task<AuthenticationTicket> CreateTicketAsync(ClaimsIdentity identity, AuthenticationProperties properties, OAuthTokenResponse tokens)
-        {
-            var request = new HttpRequestMessage(HttpMethod.Get, Options.UserInformationEndpoint);
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", tokens.AccessToken);
+        var payload = (await JsonDocument.ParseAsync(await response.Content.ReadAsStreamAsync())).RootElement;
 
-            var response = await Backchannel.SendAsync(request, Context.RequestAborted);
-            if (!response.IsSuccessStatusCode)
-            {
-                throw new HttpRequestException($"An error occurred when retrieving GitHub user information ({response.StatusCode}). Please check if the authentication information is correct in the corresponding GitHub Application.");
-            }
-
-            var payload = (await JsonDocument.ParseAsync(await response.Content.ReadAsStreamAsync())).RootElement;
+        var context = new OAuthCreatingTicketContext(new ClaimsPrincipal(identity), properties, Context, Scheme, Options, Backchannel, tokens, payload);
+        context.RunClaimActions();
 
-            var context = new OAuthCreatingTicketContext(new ClaimsPrincipal(identity), properties, Context, Scheme, Options, Backchannel, tokens, payload);
-            context.RunClaimActions();
+        await Events.CreatingTicket(context);
+        return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
+    }
 
-            await Events.CreatingTicket(context);
-            return new AuthenticationTicket(context.Principal, context.Properties, Scheme.Name);
-        }
+    /// <summary>
+    /// This code was copied from the aspnetcore repository . We should keep it in sync with it.
+    /// https://github.com/dotnet/aspnetcore/blob/fcd4ed7c46083cc408417763867637f232928f9b/src/Security/Authentication/OAuth/src/OAuthHandler.cs#L193
+    /// This can be removed or modified when the https://github.com/dotnet/aspnetcore/issues/33351 is resolved.
+    /// </summary>
+    protected override async Task<OAuthTokenResponse> ExchangeCodeAsync(OAuthCodeExchangeContext context)
+    {
+        var tokenRequestParameters = new Dictionary<string, string>()
+        {
+            { "client_id", Options.ClientId },
+            { "redirect_uri", context.RedirectUri },
+            { "client_secret", Options.ClientSecret },
+            { "code", context.Code },
+            { "grant_type", "authorization_code" },
+        };
 
-        /// <summary>
-        /// This code was copied from the aspnetcore repository . We should keep it in sync with it.
-        /// https://github.com/dotnet/aspnetcore/blob/fcd4ed7c46083cc408417763867637f232928f9b/src/Security/Authentication/OAuth/src/OAuthHandler.cs#L193
-        /// This can be removed or modified when the https://github.com/dotnet/aspnetcore/issues/33351 is resolved.
-        /// </summary>
-        protected override async Task<OAuthTokenResponse> ExchangeCodeAsync(OAuthCodeExchangeContext context)
+        // PKCE https://tools.ietf.org/html/rfc7636#section-4.5, see BuildChallengeUrl
+        if (context.Properties.Items.TryGetValue(OAuthConstants.CodeVerifierKey, out var codeVerifier))
         {
-            var tokenRequestParameters = new Dictionary<string, string>()
-            {
-                { "client_id", Options.ClientId },
-                { "redirect_uri", context.RedirectUri },
-                { "client_secret", Options.ClientSecret },
-                { "code", context.Code },
-                { "grant_type", "authorization_code" },
-            };
+            tokenRequestParameters.Add(OAuthConstants.CodeVerifierKey, codeVerifier!);
+            context.Properties.Items.Remove(OAuthConstants.CodeVerifierKey);
+        }
 
-            // PKCE https://tools.ietf.org/html/rfc7636#section-4.5, see BuildChallengeUrl
-            if (context.Properties.Items.TryGetValue(OAuthConstants.CodeVerifierKey, out var codeVerifier))
-            {
-                tokenRequestParameters.Add(OAuthConstants.CodeVerifierKey, codeVerifier!);
-                context.Properties.Items.Remove(OAuthConstants.CodeVerifierKey);
-            }
+        var requestContent = new FormUrlEncodedContent(tokenRequestParameters!);
 
-            var requestContent = new FormUrlEncodedContent(tokenRequestParameters!);
+        var requestMessage = new HttpRequestMessage(HttpMethod.Post, Options.TokenEndpoint);
+        requestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+        requestMessage.Content = requestContent;
+        requestMessage.Version = Backchannel.DefaultRequestVersion;
+        var response = await Backchannel.SendAsync(requestMessage, Context.RequestAborted);
+        if (response.IsSuccessStatusCode)
+        {
+            var payload = JsonDocument.Parse(await response.Content.ReadAsStringAsync());
 
-            var requestMessage = new HttpRequestMessage(HttpMethod.Post, Options.TokenEndpoint);
-            requestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-            requestMessage.Content = requestContent;
-            requestMessage.Version = Backchannel.DefaultRequestVersion;
-            var response = await Backchannel.SendAsync(requestMessage, Context.RequestAborted);
-            if (response.IsSuccessStatusCode)
+            // This was added to support better error messages from the GitHub OAuth provider
+            if (payload.RootElement.TryGetProperty("error", out var error))
             {
-                var payload = JsonDocument.Parse(await response.Content.ReadAsStringAsync());
+                var output = new StringBuilder();
+                output.Append(error);
 
-                // This was added to support better error messages from the GitHub OAuth provider
-                if (payload.RootElement.TryGetProperty("error", out var error))
+                if (payload.RootElement.TryGetProperty("error_description", out var description))
                 {
-                    var output = new StringBuilder();
-                    output.Append(error);
-
-                    if (payload.RootElement.TryGetProperty("error_description", out var description))
-                    {
-                        output.Append(' ');
-                        output.Append(description);
-                    }
-                    return OAuthTokenResponse.Failed(new Exception(output.ToString()));
+                    output.Append(' ');
+                    output.Append(description);
                 }
-
-                return OAuthTokenResponse.Success(payload);
-            }
-            else
-            {
-                var error = "OAuth token endpoint failure: " + await Display(response);
-                return OAuthTokenResponse.Failed(new Exception(error));
+                return OAuthTokenResponse.Failed(new Exception(output.ToString()));
             }
+
+            return OAuthTokenResponse.Success(payload);
         }
-        private static async Task<string> Display(HttpResponseMessage response)
+        else
         {
-            var output = new StringBuilder();
-            output.Append("Status: " + response.StatusCode + ";");
-            output.Append("Headers: " + response.Headers.ToString() + ";");
-            output.Append("Body: " + await response.Content.ReadAsStringAsync() + ";");
-            return output.ToString();
+            var error = "OAuth token endpoint failure: " + await Display(response);
+            return OAuthTokenResponse.Failed(new Exception(error));
         }
     }
+    private static async Task<string> Display(HttpResponseMessage response)
+    {
+        var output = new StringBuilder();
+        output.Append("Status: " + response.StatusCode + ";");
+        output.Append("Headers: " + response.Headers.ToString() + ";");
+        output.Append("Body: " + await response.Content.ReadAsStringAsync() + ";");
+        return output.ToString();
+    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/Configuration/GithubOptions.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/Configuration/GithubOptions.cs
index 0aa1c8b0825..d734b4f4b35 100644
--- a/src/OrchardCore.Modules/OrchardCore.GitHub/Configuration/GithubOptions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.GitHub/Configuration/GithubOptions.cs
@@ -3,27 +3,26 @@
 using Microsoft.AspNetCore.Authentication.OAuth;
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.GitHub.Configuration
+namespace OrchardCore.GitHub.Configuration;
+
+/// <summary>
+/// Configuration options for <see cref="GitHubHandler"/>.
+/// </summary>
+public class GitHubOptions : OAuthOptions
 {
     /// <summary>
-    /// Configuration options for <see cref="GitHubHandler"/>.
+    /// Initializes a new <see cref="GitHubOptions"/>.
     /// </summary>
-    public class GitHubOptions : OAuthOptions
+    public GitHubOptions()
     {
-        /// <summary>
-        /// Initializes a new <see cref="GitHubOptions"/>.
-        /// </summary>
-        public GitHubOptions()
-        {
-            CallbackPath = new PathString("/signin-github");
-            AuthorizationEndpoint = GitHubDefaults.AuthorizationEndpoint;
-            TokenEndpoint = GitHubDefaults.TokenEndpoint;
-            UserInformationEndpoint = GitHubDefaults.UserInformationEndpoint;
+        CallbackPath = new PathString("/signin-github");
+        AuthorizationEndpoint = GitHubDefaults.AuthorizationEndpoint;
+        TokenEndpoint = GitHubDefaults.TokenEndpoint;
+        UserInformationEndpoint = GitHubDefaults.UserInformationEndpoint;
 
-            ClaimActions.MapJsonKey(ClaimTypes.NameIdentifier, "id");
-            ClaimActions.MapJsonKey("name", "login");
-            ClaimActions.MapJsonKey(ClaimTypes.Email, "email", ClaimValueTypes.Email);
-            ClaimActions.MapJsonKey("url", "url");
-        }
+        ClaimActions.MapJsonKey(ClaimTypes.NameIdentifier, "id");
+        ClaimActions.MapJsonKey("name", "login");
+        ClaimActions.MapJsonKey(ClaimTypes.Email, "email", ClaimValueTypes.Email);
+        ClaimActions.MapJsonKey("url", "url");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/Configuration/GithubOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/Configuration/GithubOptionsConfiguration.cs
index 46b38f58352..4392c6cd3de 100644
--- a/src/OrchardCore.Modules/OrchardCore.GitHub/Configuration/GithubOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.GitHub/Configuration/GithubOptionsConfiguration.cs
@@ -6,81 +6,80 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.GitHub.Settings;
 
-namespace OrchardCore.GitHub.Configuration
+namespace OrchardCore.GitHub.Configuration;
+
+public class GitHubOptionsConfiguration :
+    IConfigureOptions<AuthenticationOptions>,
+    IConfigureNamedOptions<GitHubOptions>
 {
-    public class GitHubOptionsConfiguration :
-        IConfigureOptions<AuthenticationOptions>,
-        IConfigureNamedOptions<GitHubOptions>
+    private readonly GitHubAuthenticationSettings _gitHubAuthenticationSettings;
+    private readonly IDataProtectionProvider _dataProtectionProvider;
+    private readonly ILogger _logger;
+
+    public GitHubOptionsConfiguration(
+        IOptions<GitHubAuthenticationSettings> gitHubAuthenticationSettings,
+        IDataProtectionProvider dataProtectionProvider,
+        ILogger<GitHubOptionsConfiguration> logger)
     {
-        private readonly GitHubAuthenticationSettings _gitHubAuthenticationSettings;
-        private readonly IDataProtectionProvider _dataProtectionProvider;
-        private readonly ILogger _logger;
+        _gitHubAuthenticationSettings = gitHubAuthenticationSettings.Value;
+        _dataProtectionProvider = dataProtectionProvider;
+        _logger = logger;
+    }
 
-        public GitHubOptionsConfiguration(
-            IOptions<GitHubAuthenticationSettings> gitHubAuthenticationSettings,
-            IDataProtectionProvider dataProtectionProvider,
-            ILogger<GitHubOptionsConfiguration> logger)
+    public void Configure(AuthenticationOptions options)
+    {
+        if (_gitHubAuthenticationSettings == null)
         {
-            _gitHubAuthenticationSettings = gitHubAuthenticationSettings.Value;
-            _dataProtectionProvider = dataProtectionProvider;
-            _logger = logger;
+            return;
         }
 
-        public void Configure(AuthenticationOptions options)
+        if (string.IsNullOrWhiteSpace(_gitHubAuthenticationSettings.ClientID) ||
+            string.IsNullOrWhiteSpace(_gitHubAuthenticationSettings.ClientSecret))
         {
-            if (_gitHubAuthenticationSettings == null)
-            {
-                return;
-            }
-
-            if (string.IsNullOrWhiteSpace(_gitHubAuthenticationSettings.ClientID) ||
-                string.IsNullOrWhiteSpace(_gitHubAuthenticationSettings.ClientSecret))
-            {
-                _logger.LogWarning("The Github login provider is enabled but not configured.");
+            _logger.LogWarning("The Github login provider is enabled but not configured.");
 
-                return;
-            }
-
-            // Register the OpenID Connect client handler in the authentication handlers collection.
-            options.AddScheme(GitHubDefaults.AuthenticationScheme, builder =>
-            {
-                builder.DisplayName = "GitHub";
-                builder.HandlerType = typeof(GitHubHandler);
-            });
+            return;
         }
 
-        public void Configure(string name, GitHubOptions options)
+        // Register the OpenID Connect client handler in the authentication handlers collection.
+        options.AddScheme(GitHubDefaults.AuthenticationScheme, builder =>
         {
-            // Ignore OpenID Connect client handler instances that don't correspond to the instance managed by the OpenID module.
-            if (!string.Equals(name, GitHubDefaults.AuthenticationScheme, StringComparison.Ordinal))
-            {
-                return;
-            }
+            builder.DisplayName = "GitHub";
+            builder.HandlerType = typeof(GitHubHandler);
+        });
+    }
 
-            if (_gitHubAuthenticationSettings == null)
-            {
-                return;
-            }
+    public void Configure(string name, GitHubOptions options)
+    {
+        // Ignore OpenID Connect client handler instances that don't correspond to the instance managed by the OpenID module.
+        if (!string.Equals(name, GitHubDefaults.AuthenticationScheme, StringComparison.Ordinal))
+        {
+            return;
+        }
 
-            options.ClientId = _gitHubAuthenticationSettings.ClientID;
+        if (_gitHubAuthenticationSettings == null)
+        {
+            return;
+        }
 
-            try
-            {
-                options.ClientSecret = _dataProtectionProvider.CreateProtector(GitHubConstants.Features.GitHubAuthentication).Unprotect(_gitHubAuthenticationSettings.ClientSecret);
-            }
-            catch
-            {
-                _logger.LogError("The GitHub Consumer Secret could not be decrypted. It may have been encrypted using a different key.");
-            }
+        options.ClientId = _gitHubAuthenticationSettings.ClientID;
 
-            if (_gitHubAuthenticationSettings.CallbackPath.HasValue)
-            {
-                options.CallbackPath = _gitHubAuthenticationSettings.CallbackPath;
-            }
+        try
+        {
+            options.ClientSecret = _dataProtectionProvider.CreateProtector(GitHubConstants.Features.GitHubAuthentication).Unprotect(_gitHubAuthenticationSettings.ClientSecret);
+        }
+        catch
+        {
+            _logger.LogError("The GitHub Consumer Secret could not be decrypted. It may have been encrypted using a different key.");
+        }
 
-            options.SaveTokens = _gitHubAuthenticationSettings.SaveTokens;
+        if (_gitHubAuthenticationSettings.CallbackPath.HasValue)
+        {
+            options.CallbackPath = _gitHubAuthenticationSettings.CallbackPath;
         }
 
-        public void Configure(GitHubOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
+        options.SaveTokens = _gitHubAuthenticationSettings.SaveTokens;
     }
+
+    public void Configure(GitHubOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/Drivers/GithubAuthenticationSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/Drivers/GithubAuthenticationSettingsDisplayDriver.cs
index 4ae40d0b0d0..abda34fd93d 100644
--- a/src/OrchardCore.Modules/OrchardCore.GitHub/Drivers/GithubAuthenticationSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.GitHub/Drivers/GithubAuthenticationSettingsDisplayDriver.cs
@@ -12,95 +12,94 @@
 using OrchardCore.GitHub.ViewModels;
 using OrchardCore.Settings;
 
-namespace OrchardCore.GitHub.Drivers
+namespace OrchardCore.GitHub.Drivers;
+
+public sealed class GitHubAuthenticationSettingsDisplayDriver : SiteDisplayDriver<GitHubAuthenticationSettings>
 {
-    public sealed class GitHubAuthenticationSettingsDisplayDriver : SiteDisplayDriver<GitHubAuthenticationSettings>
+    private readonly IShellReleaseManager _shellReleaseManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IDataProtectionProvider _dataProtectionProvider;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly ILogger _logger;
+
+    public GitHubAuthenticationSettingsDisplayDriver(
+        IShellReleaseManager shellReleaseManager,
+        IAuthorizationService authorizationService,
+        IDataProtectionProvider dataProtectionProvider,
+        IHttpContextAccessor httpContextAccessor,
+        ILogger<GitHubAuthenticationSettingsDisplayDriver> logger)
     {
-        private readonly IShellReleaseManager _shellReleaseManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IDataProtectionProvider _dataProtectionProvider;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly ILogger _logger;
+        _shellReleaseManager = shellReleaseManager;
+        _authorizationService = authorizationService;
+        _dataProtectionProvider = dataProtectionProvider;
+        _httpContextAccessor = httpContextAccessor;
+        _logger = logger;
+    }
+
+    protected override string SettingsGroupId
+        => GitHubConstants.Features.GitHubAuthentication;
 
-        public GitHubAuthenticationSettingsDisplayDriver(
-            IShellReleaseManager shellReleaseManager,
-            IAuthorizationService authorizationService,
-            IDataProtectionProvider dataProtectionProvider,
-            IHttpContextAccessor httpContextAccessor,
-            ILogger<GitHubAuthenticationSettingsDisplayDriver> logger)
+    public override async Task<IDisplayResult> EditAsync(ISite site, GitHubAuthenticationSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGitHubAuthentication))
         {
-            _shellReleaseManager = shellReleaseManager;
-            _authorizationService = authorizationService;
-            _dataProtectionProvider = dataProtectionProvider;
-            _httpContextAccessor = httpContextAccessor;
-            _logger = logger;
+            return null;
         }
 
-        protected override string SettingsGroupId
-            => GitHubConstants.Features.GitHubAuthentication;
-
-        public override async Task<IDisplayResult> EditAsync(ISite site, GitHubAuthenticationSettings settings, BuildEditorContext context)
+        return Initialize<GitHubAuthenticationSettingsViewModel>("GitHubAuthenticationSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGitHubAuthentication))
+            model.ClientID = settings.ClientID;
+            if (!string.IsNullOrWhiteSpace(settings.ClientSecret))
             {
-                return null;
-            }
-
-            return Initialize<GitHubAuthenticationSettingsViewModel>("GitHubAuthenticationSettings_Edit", model =>
-            {
-                model.ClientID = settings.ClientID;
-                if (!string.IsNullOrWhiteSpace(settings.ClientSecret))
+                try
                 {
-                    try
-                    {
-                        var protector = _dataProtectionProvider.CreateProtector(GitHubConstants.Features.GitHubAuthentication);
-                        model.ClientSecret = protector.Unprotect(settings.ClientSecret);
-                    }
-                    catch (CryptographicException)
-                    {
-                        _logger.LogError("The client secret could not be decrypted. It may have been encrypted using a different key.");
-                        model.ClientSecret = string.Empty;
-                        model.HasDecryptionError = true;
-                    }
+                    var protector = _dataProtectionProvider.CreateProtector(GitHubConstants.Features.GitHubAuthentication);
+                    model.ClientSecret = protector.Unprotect(settings.ClientSecret);
                 }
-                else
+                catch (CryptographicException)
                 {
+                    _logger.LogError("The client secret could not be decrypted. It may have been encrypted using a different key.");
                     model.ClientSecret = string.Empty;
+                    model.HasDecryptionError = true;
                 }
-                if (settings.CallbackPath.HasValue)
-                {
-                    model.CallbackUrl = settings.CallbackPath.Value;
-                }
-                model.SaveTokens = settings.SaveTokens;
-            }).Location("Content:5")
-            .OnGroup(SettingsGroupId);
-        }
-
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, GitHubAuthenticationSettings settings, UpdateEditorContext context)
-        {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGitHubAuthentication))
+            }
+            else
+            {
+                model.ClientSecret = string.Empty;
+            }
+            if (settings.CallbackPath.HasValue)
             {
-                return null;
+                model.CallbackUrl = settings.CallbackPath.Value;
             }
+            model.SaveTokens = settings.SaveTokens;
+        }).Location("Content:5")
+        .OnGroup(SettingsGroupId);
+    }
 
-            var model = new GitHubAuthenticationSettingsViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, GitHubAuthenticationSettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGitHubAuthentication))
+        {
+            return null;
+        }
 
-            if (context.Updater.ModelState.IsValid)
-            {
-                var protector = _dataProtectionProvider.CreateProtector(GitHubConstants.Features.GitHubAuthentication);
+        var model = new GitHubAuthenticationSettingsViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-                settings.ClientID = model.ClientID;
-                settings.ClientSecret = protector.Protect(model.ClientSecret);
-                settings.CallbackPath = model.CallbackUrl;
-                settings.SaveTokens = model.SaveTokens;
+        if (context.Updater.ModelState.IsValid)
+        {
+            var protector = _dataProtectionProvider.CreateProtector(GitHubConstants.Features.GitHubAuthentication);
 
-                _shellReleaseManager.RequestRelease();
-            }
+            settings.ClientID = model.ClientID;
+            settings.ClientSecret = protector.Protect(model.ClientSecret);
+            settings.CallbackPath = model.CallbackUrl;
+            settings.SaveTokens = model.SaveTokens;
 
-            return await EditAsync(site, settings, context);
+            _shellReleaseManager.RequestRelease();
         }
+
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/Extensions/OrchardCoreBuilderExtensions.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/Extensions/OrchardCoreBuilderExtensions.cs
index a83f7bcbb71..365b8d8aa0d 100644
--- a/src/OrchardCore.Modules/OrchardCore.GitHub/Extensions/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.GitHub/Extensions/OrchardCoreBuilderExtensions.cs
@@ -2,20 +2,19 @@
 using OrchardCore.Environment.Shell.Configuration;
 using OrchardCore.GitHub.Settings;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class OrchardCoreBuilderExtensions
 {
-    public static class OrchardCoreBuilderExtensions
+    public static OrchardCoreBuilder ConfigureGitHubSettings(this OrchardCoreBuilder builder)
     {
-        public static OrchardCoreBuilder ConfigureGitHubSettings(this OrchardCoreBuilder builder)
+        builder.ConfigureServices((tenantServices, serviceProvider) =>
         {
-            builder.ConfigureServices((tenantServices, serviceProvider) =>
-            {
-                var configurationSection = serviceProvider.GetRequiredService<IShellConfiguration>().GetSection("OrchardCore_GitHub");
+            var configurationSection = serviceProvider.GetRequiredService<IShellConfiguration>().GetSection("OrchardCore_GitHub");
 
-                tenantServices.PostConfigure<GitHubAuthenticationSettings>(settings => configurationSection.Bind(settings));
-            });
+            tenantServices.PostConfigure<GitHubAuthenticationSettings>(settings => configurationSection.Bind(settings));
+        });
 
-            return builder;
-        }
+        return builder;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/GithubConstants.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/GithubConstants.cs
index ad9edeade0a..3664f3f4e99 100644
--- a/src/OrchardCore.Modules/OrchardCore.GitHub/GithubConstants.cs
+++ b/src/OrchardCore.Modules/OrchardCore.GitHub/GithubConstants.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.GitHub
+namespace OrchardCore.GitHub;
+
+public static class GitHubConstants
 {
-    public static class GitHubConstants
+    public static class Features
     {
-        public static class Features
-        {
-            public const string GitHubAuthentication = "OrchardCore.GitHub.Authentication";
-        }
+        public const string GitHubAuthentication = "OrchardCore.GitHub.Authentication";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/Recipes/GithubAuthenticationSettingsStep.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/Recipes/GithubAuthenticationSettingsStep.cs
index b04d385ee91..94b9e6327b9 100644
--- a/src/OrchardCore.Modules/OrchardCore.GitHub/Recipes/GithubAuthenticationSettingsStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.GitHub/Recipes/GithubAuthenticationSettingsStep.cs
@@ -6,42 +6,41 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.GitHub.Recipes
+namespace OrchardCore.GitHub.Recipes;
+
+/// <summary>
+/// This recipe step sets GitHub Account settings.
+/// </summary>
+public sealed class GitHubAuthenticationSettingsStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step sets GitHub Account settings.
-    /// </summary>
-    public sealed class GitHubAuthenticationSettingsStep : IRecipeStepHandler
+    private readonly IGitHubAuthenticationService _githubAuthenticationService;
+
+    public GitHubAuthenticationSettingsStep(IGitHubAuthenticationService githubLoginService)
     {
-        private readonly IGitHubAuthenticationService _githubAuthenticationService;
+        _githubAuthenticationService = githubLoginService;
+    }
 
-        public GitHubAuthenticationSettingsStep(IGitHubAuthenticationService githubLoginService)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, nameof(GitHubAuthenticationSettings), StringComparison.OrdinalIgnoreCase))
         {
-            _githubAuthenticationService = githubLoginService;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, nameof(GitHubAuthenticationSettings), StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            var model = context.Step.ToObject<GitHubLoginSettingsStepModel>();
-            var settings = await _githubAuthenticationService.LoadSettingsAsync();
+        var model = context.Step.ToObject<GitHubLoginSettingsStepModel>();
+        var settings = await _githubAuthenticationService.LoadSettingsAsync();
 
-            settings.ClientID = model.ConsumerKey;
-            settings.ClientSecret = model.ConsumerSecret;
-            settings.CallbackPath = model.CallbackPath;
+        settings.ClientID = model.ConsumerKey;
+        settings.ClientSecret = model.ConsumerSecret;
+        settings.CallbackPath = model.CallbackPath;
 
-            await _githubAuthenticationService.UpdateSettingsAsync(settings);
-        }
+        await _githubAuthenticationService.UpdateSettingsAsync(settings);
     }
+}
 
-    public sealed class GitHubLoginSettingsStepModel
-    {
-        public string ConsumerKey { get; set; }
-        public string ConsumerSecret { get; set; }
-        public string CallbackPath { get; set; }
-    }
+public sealed class GitHubLoginSettingsStepModel
+{
+    public string ConsumerKey { get; set; }
+    public string ConsumerSecret { get; set; }
+    public string CallbackPath { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/Services/GithubAuthenticationService.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/Services/GithubAuthenticationService.cs
index 9af141f2d42..ca812aa863c 100644
--- a/src/OrchardCore.Modules/OrchardCore.GitHub/Services/GithubAuthenticationService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.GitHub/Services/GithubAuthenticationService.cs
@@ -7,58 +7,57 @@
 using OrchardCore.GitHub.Settings;
 using OrchardCore.Settings;
 
-namespace OrchardCore.GitHub.Services
+namespace OrchardCore.GitHub.Services;
+
+public class GitHubAuthenticationService : IGitHubAuthenticationService
 {
-    public class GitHubAuthenticationService : IGitHubAuthenticationService
+    private readonly ISiteService _siteService;
+    protected readonly IStringLocalizer S;
+
+    public GitHubAuthenticationService(
+        ISiteService siteService,
+        IStringLocalizer<GitHubAuthenticationService> stringLocalizer)
     {
-        private readonly ISiteService _siteService;
-        protected readonly IStringLocalizer S;
+        _siteService = siteService;
+        S = stringLocalizer;
+    }
 
-        public GitHubAuthenticationService(
-            ISiteService siteService,
-            IStringLocalizer<GitHubAuthenticationService> stringLocalizer)
-        {
-            _siteService = siteService;
-            S = stringLocalizer;
-        }
+    public Task<GitHubAuthenticationSettings> GetSettingsAsync()
+        => _siteService.GetSettingsAsync<GitHubAuthenticationSettings>();
 
-        public Task<GitHubAuthenticationSettings> GetSettingsAsync()
-            => _siteService.GetSettingsAsync<GitHubAuthenticationSettings>();
+    public async Task<GitHubAuthenticationSettings> LoadSettingsAsync()
+    {
+        var container = await _siteService.LoadSiteSettingsAsync();
+        return container.As<GitHubAuthenticationSettings>();
+    }
 
-        public async Task<GitHubAuthenticationSettings> LoadSettingsAsync()
-        {
-            var container = await _siteService.LoadSiteSettingsAsync();
-            return container.As<GitHubAuthenticationSettings>();
-        }
+    public async Task UpdateSettingsAsync(GitHubAuthenticationSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-        public async Task UpdateSettingsAsync(GitHubAuthenticationSettings settings)
+        var container = await _siteService.LoadSiteSettingsAsync();
+        container.Alter<GitHubAuthenticationSettings>(aspect =>
         {
-            ArgumentNullException.ThrowIfNull(settings);
+            aspect.ClientID = settings.ClientID;
+            aspect.ClientSecret = settings.ClientSecret;
+            aspect.CallbackPath = settings.CallbackPath;
+        });
 
-            var container = await _siteService.LoadSiteSettingsAsync();
-            container.Alter<GitHubAuthenticationSettings>(aspect =>
-            {
-                aspect.ClientID = settings.ClientID;
-                aspect.ClientSecret = settings.ClientSecret;
-                aspect.CallbackPath = settings.CallbackPath;
-            });
+        await _siteService.UpdateSiteSettingsAsync(container);
+    }
 
-            await _siteService.UpdateSiteSettingsAsync(container);
-        }
+    public IEnumerable<ValidationResult> ValidateSettings(GitHubAuthenticationSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-        public IEnumerable<ValidationResult> ValidateSettings(GitHubAuthenticationSettings settings)
+        if (string.IsNullOrWhiteSpace(settings.ClientID))
         {
-            ArgumentNullException.ThrowIfNull(settings);
-
-            if (string.IsNullOrWhiteSpace(settings.ClientID))
-            {
-                yield return new ValidationResult(S["ClientID is required"], new string[] { nameof(settings.ClientID) });
-            }
+            yield return new ValidationResult(S["ClientID is required"], new string[] { nameof(settings.ClientID) });
+        }
 
-            if (string.IsNullOrWhiteSpace(settings.ClientSecret))
-            {
-                yield return new ValidationResult(S["ClientSecret is required"], new string[] { nameof(settings.ClientSecret) });
-            }
+        if (string.IsNullOrWhiteSpace(settings.ClientSecret))
+        {
+            yield return new ValidationResult(S["ClientSecret is required"], new string[] { nameof(settings.ClientSecret) });
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/Services/IGithubAuthenticationService.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/Services/IGithubAuthenticationService.cs
index d106897cd14..34571fb275a 100644
--- a/src/OrchardCore.Modules/OrchardCore.GitHub/Services/IGithubAuthenticationService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.GitHub/Services/IGithubAuthenticationService.cs
@@ -3,13 +3,12 @@
 using System.Threading.Tasks;
 using OrchardCore.GitHub.Settings;
 
-namespace OrchardCore.GitHub.Services
+namespace OrchardCore.GitHub.Services;
+
+public interface IGitHubAuthenticationService
 {
-    public interface IGitHubAuthenticationService
-    {
-        Task<GitHubAuthenticationSettings> GetSettingsAsync();
-        Task<GitHubAuthenticationSettings> LoadSettingsAsync();
-        Task UpdateSettingsAsync(GitHubAuthenticationSettings settings);
-        IEnumerable<ValidationResult> ValidateSettings(GitHubAuthenticationSettings settings);
-    }
+    Task<GitHubAuthenticationSettings> GetSettingsAsync();
+    Task<GitHubAuthenticationSettings> LoadSettingsAsync();
+    Task UpdateSettingsAsync(GitHubAuthenticationSettings settings);
+    IEnumerable<ValidationResult> ValidateSettings(GitHubAuthenticationSettings settings);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/Settings/GithubAuthenticationSettings.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/Settings/GithubAuthenticationSettings.cs
index 373f8e9e641..c3fb558e570 100644
--- a/src/OrchardCore.Modules/OrchardCore.GitHub/Settings/GithubAuthenticationSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.GitHub/Settings/GithubAuthenticationSettings.cs
@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.GitHub.Settings
+namespace OrchardCore.GitHub.Settings;
+
+public class GitHubAuthenticationSettings
 {
-    public class GitHubAuthenticationSettings
-    {
-        public string ClientID { get; set; }
-        public string ClientSecret { get; set; }
-        public PathString CallbackPath { get; set; }
-        public bool SaveTokens { get; set; }
-    }
+    public string ClientID { get; set; }
+    public string ClientSecret { get; set; }
+    public PathString CallbackPath { get; set; }
+    public bool SaveTokens { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/Startup.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/Startup.cs
index fe8eb630f47..8b4e68cc01e 100644
--- a/src/OrchardCore.Modules/OrchardCore.GitHub/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.GitHub/Startup.cs
@@ -14,37 +14,36 @@
 using OrchardCore.Security.Permissions;
 using OrchardCore.Settings;
 
-namespace OrchardCore.GitHub
+namespace OrchardCore.GitHub;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IPermissionProvider, Permissions>();
-        }
+        services.AddScoped<IPermissionProvider, Permissions>();
     }
+}
 
-    [Feature(GitHubConstants.Features.GitHubAuthentication)]
-    public sealed class GitHubLoginStartup : StartupBase
+[Feature(GitHubConstants.Features.GitHubAuthentication)]
+public sealed class GitHubLoginStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSingleton<IGitHubAuthenticationService, GitHubAuthenticationService>();
-            services.AddScoped<IDisplayDriver<ISite>, GitHubAuthenticationSettingsDisplayDriver>();
-            services.AddScoped<INavigationProvider, AdminMenuGitHubLogin>();
-            services.AddRecipeExecutionStep<GitHubAuthenticationSettingsStep>();
+        services.AddSingleton<IGitHubAuthenticationService, GitHubAuthenticationService>();
+        services.AddScoped<IDisplayDriver<ISite>, GitHubAuthenticationSettingsDisplayDriver>();
+        services.AddScoped<INavigationProvider, AdminMenuGitHubLogin>();
+        services.AddRecipeExecutionStep<GitHubAuthenticationSettingsStep>();
 
-            services.AddTransient<IConfigureOptions<GitHubAuthenticationSettings>, GitHubAuthenticationSettingsConfiguration>();
+        services.AddTransient<IConfigureOptions<GitHubAuthenticationSettings>, GitHubAuthenticationSettingsConfiguration>();
 
-            // Register the options initializers required by the GitHub Handler.
-            services.TryAddEnumerable(new[]
-            {
-                // Orchard-specific initializers:
-                ServiceDescriptor.Transient<IConfigureOptions<AuthenticationOptions>, GitHubOptionsConfiguration>(),
-                ServiceDescriptor.Transient<IConfigureOptions<GitHubOptions>, GitHubOptionsConfiguration>(),
-                // Built-in initializers:
-                ServiceDescriptor.Transient<IPostConfigureOptions<GitHubOptions>, OAuthPostConfigureOptions<GitHubOptions, GitHubHandler>>()
-            });
-        }
+        // Register the options initializers required by the GitHub Handler.
+        services.TryAddEnumerable(new[]
+        {
+            // Orchard-specific initializers:
+            ServiceDescriptor.Transient<IConfigureOptions<AuthenticationOptions>, GitHubOptionsConfiguration>(),
+            ServiceDescriptor.Transient<IConfigureOptions<GitHubOptions>, GitHubOptionsConfiguration>(),
+            // Built-in initializers:
+            ServiceDescriptor.Transient<IPostConfigureOptions<GitHubOptions>, OAuthPostConfigureOptions<GitHubOptions, GitHubHandler>>()
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/ViewModels/GithubAuthenticationSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/ViewModels/GithubAuthenticationSettingsViewModel.cs
index 9cbed6ea17d..7d2237c694d 100644
--- a/src/OrchardCore.Modules/OrchardCore.GitHub/ViewModels/GithubAuthenticationSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.GitHub/ViewModels/GithubAuthenticationSettingsViewModel.cs
@@ -1,20 +1,19 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.GitHub.ViewModels
+namespace OrchardCore.GitHub.ViewModels;
+
+public class GitHubAuthenticationSettingsViewModel
 {
-    public class GitHubAuthenticationSettingsViewModel
-    {
-        [Required(AllowEmptyStrings = false, ErrorMessage = "API key is required")]
-        public string ClientID { get; set; }
+    [Required(AllowEmptyStrings = false, ErrorMessage = "API key is required")]
+    public string ClientID { get; set; }
 
-        [Required(AllowEmptyStrings = false, ErrorMessage = "API secret key is required")]
-        public string ClientSecret { get; set; }
+    [Required(AllowEmptyStrings = false, ErrorMessage = "API secret key is required")]
+    public string ClientSecret { get; set; }
 
-        [RegularExpression(@"\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]", ErrorMessage = "Invalid path")]
-        public string CallbackUrl { get; set; }
+    [RegularExpression(@"\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]", ErrorMessage = "Invalid path")]
+    public string CallbackUrl { get; set; }
 
-        public bool SaveTokens { get; set; }
+    public bool SaveTokens { get; set; }
 
-        public bool HasDecryptionError { get; set; }
-    }
+    public bool HasDecryptionError { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/Analytics/Drivers/GoogleAnalyticsSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Google/Analytics/Drivers/GoogleAnalyticsSettingsDisplayDriver.cs
index 142edbe26fa..3e6dec196be 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/Analytics/Drivers/GoogleAnalyticsSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/Analytics/Drivers/GoogleAnalyticsSettingsDisplayDriver.cs
@@ -8,56 +8,55 @@
 using OrchardCore.Google.Analytics.ViewModels;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Google.Analytics.Drivers
+namespace OrchardCore.Google.Analytics.Drivers;
+
+public sealed class GoogleAnalyticsSettingsDisplayDriver : SiteDisplayDriver<GoogleAnalyticsSettings>
 {
-    public sealed class GoogleAnalyticsSettingsDisplayDriver : SiteDisplayDriver<GoogleAnalyticsSettings>
-    {
-        protected override string SettingsGroupId
-            => GoogleConstants.Features.GoogleAnalytics;
+    protected override string SettingsGroupId
+        => GoogleConstants.Features.GoogleAnalytics;
 
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public GoogleAnalyticsSettingsDisplayDriver(
-            IAuthorizationService authorizationService,
-            IHttpContextAccessor httpContextAccessor)
-        {
-            _authorizationService = authorizationService;
-            _httpContextAccessor = httpContextAccessor;
-        }
+    public GoogleAnalyticsSettingsDisplayDriver(
+        IAuthorizationService authorizationService,
+        IHttpContextAccessor httpContextAccessor)
+    {
+        _authorizationService = authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        public override async Task<IDisplayResult> EditAsync(ISite site, GoogleAnalyticsSettings settings, BuildEditorContext context)
+    public override async Task<IDisplayResult> EditAsync(ISite site, GoogleAnalyticsSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGoogleAnalytics))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGoogleAnalytics))
-            {
-                return null;
-            }
-
-            return Initialize<GoogleAnalyticsSettingsViewModel>("GoogleAnalyticsSettings_Edit", model =>
-            {
-                model.TrackingID = settings.TrackingID;
-            }).Location("Content:5")
-            .OnGroup(SettingsGroupId);
+            return null;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, GoogleAnalyticsSettings settings, UpdateEditorContext context)
+        return Initialize<GoogleAnalyticsSettingsViewModel>("GoogleAnalyticsSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGoogleAnalytics))
-            {
-                return null;
-            }
+            model.TrackingID = settings.TrackingID;
+        }).Location("Content:5")
+        .OnGroup(SettingsGroupId);
+    }
 
-            var model = new GoogleAnalyticsSettingsViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, GoogleAnalyticsSettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGoogleAnalytics))
+        {
+            return null;
+        }
 
-            if (context.Updater.ModelState.IsValid)
-            {
-                settings.TrackingID = model.TrackingID;
-            }
+        var model = new GoogleAnalyticsSettingsViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            return await EditAsync(site, settings, context);
+        if (context.Updater.ModelState.IsValid)
+        {
+            settings.TrackingID = model.TrackingID;
         }
+
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/Analytics/GoogleAnalyticsFilter.cs b/src/OrchardCore.Modules/OrchardCore.Google/Analytics/GoogleAnalyticsFilter.cs
index 6ef94065446..e49cfac7663 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/Analytics/GoogleAnalyticsFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/Analytics/GoogleAnalyticsFilter.cs
@@ -7,47 +7,46 @@
 using OrchardCore.ResourceManagement;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Google.Analytics
+namespace OrchardCore.Google.Analytics;
+
+public sealed class GoogleAnalyticsFilter : IAsyncResultFilter
 {
-    public sealed class GoogleAnalyticsFilter : IAsyncResultFilter
-    {
-        private readonly IResourceManager _resourceManager;
-        private readonly ISiteService _siteService;
+    private readonly IResourceManager _resourceManager;
+    private readonly ISiteService _siteService;
 
-        private HtmlString _scriptsCache;
+    private HtmlString _scriptsCache;
 
-        public GoogleAnalyticsFilter(
-            IResourceManager resourceManager,
-            ISiteService siteService)
-        {
-            _resourceManager = resourceManager;
-            _siteService = siteService;
-        }
+    public GoogleAnalyticsFilter(
+        IResourceManager resourceManager,
+        ISiteService siteService)
+    {
+        _resourceManager = resourceManager;
+        _siteService = siteService;
+    }
 
-        public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
+    public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
+    {
+        // Should only run on the front-end for a full view
+        if (context.IsViewOrPageResult() && !AdminAttribute.IsApplied(context.HttpContext))
         {
-            // Should only run on the front-end for a full view
-            if (context.IsViewOrPageResult() && !AdminAttribute.IsApplied(context.HttpContext))
-            {
-                var canTrack = context.HttpContext.Features.Get<ITrackingConsentFeature>()?.CanTrack ?? true;
+            var canTrack = context.HttpContext.Features.Get<ITrackingConsentFeature>()?.CanTrack ?? true;
 
-                if (_scriptsCache == null && canTrack)
-                {
-                    var settings = await _siteService.GetSettingsAsync<GoogleAnalyticsSettings>();
-
-                    if (!string.IsNullOrWhiteSpace(settings?.TrackingID))
-                    {
-                        _scriptsCache = new HtmlString($"<!-- Global site tag (gtag.js) - Google Analytics -->\n<script async src=\"https://www.googletagmanager.com/gtag/js?id={settings.TrackingID}\"></script>\n<script>window.dataLayer = window.dataLayer || [];function gtag() {{ dataLayer.push(arguments); }}gtag('js', new Date());gtag('config', '{settings.TrackingID}')</script>\n<!-- End Global site tag (gtag.js) - Google Analytics -->");
-                    }
-                }
+            if (_scriptsCache == null && canTrack)
+            {
+                var settings = await _siteService.GetSettingsAsync<GoogleAnalyticsSettings>();
 
-                if (_scriptsCache != null)
+                if (!string.IsNullOrWhiteSpace(settings?.TrackingID))
                 {
-                    _resourceManager.RegisterHeadScript(_scriptsCache);
+                    _scriptsCache = new HtmlString($"<!-- Global site tag (gtag.js) - Google Analytics -->\n<script async src=\"https://www.googletagmanager.com/gtag/js?id={settings.TrackingID}\"></script>\n<script>window.dataLayer = window.dataLayer || [];function gtag() {{ dataLayer.push(arguments); }}gtag('js', new Date());gtag('config', '{settings.TrackingID}')</script>\n<!-- End Global site tag (gtag.js) - Google Analytics -->");
                 }
             }
 
-            await next.Invoke();
+            if (_scriptsCache != null)
+            {
+                _resourceManager.RegisterHeadScript(_scriptsCache);
+            }
         }
+
+        await next.Invoke();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/Analytics/Services/GoogleAnalyticsService.cs b/src/OrchardCore.Modules/OrchardCore.Google/Analytics/Services/GoogleAnalyticsService.cs
index 70cacb3205d..365adfe5421 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/Analytics/Services/GoogleAnalyticsService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/Analytics/Services/GoogleAnalyticsService.cs
@@ -2,19 +2,18 @@
 using OrchardCore.Google.Analytics.Settings;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Google.Analytics.Services
-{
-    public class GoogleAnalyticsService : IGoogleAnalyticsService
-    {
-        private readonly ISiteService _siteService;
+namespace OrchardCore.Google.Analytics.Services;
 
-        public GoogleAnalyticsService(
-            ISiteService siteService)
-        {
-            _siteService = siteService;
-        }
+public class GoogleAnalyticsService : IGoogleAnalyticsService
+{
+    private readonly ISiteService _siteService;
 
-        public Task<GoogleAnalyticsSettings> GetSettingsAsync()
-            => _siteService.GetSettingsAsync<GoogleAnalyticsSettings>();
+    public GoogleAnalyticsService(
+        ISiteService siteService)
+    {
+        _siteService = siteService;
     }
+
+    public Task<GoogleAnalyticsSettings> GetSettingsAsync()
+        => _siteService.GetSettingsAsync<GoogleAnalyticsSettings>();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/Analytics/Services/IGoogleAnalyticsService.cs b/src/OrchardCore.Modules/OrchardCore.Google/Analytics/Services/IGoogleAnalyticsService.cs
index 8209c68af2b..e75d9daa21f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/Analytics/Services/IGoogleAnalyticsService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/Analytics/Services/IGoogleAnalyticsService.cs
@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
 using OrchardCore.Google.Analytics.Settings;
 
-namespace OrchardCore.Google.Analytics.Services
+namespace OrchardCore.Google.Analytics.Services;
+
+public interface IGoogleAnalyticsService
 {
-    public interface IGoogleAnalyticsService
-    {
-        Task<GoogleAnalyticsSettings> GetSettingsAsync();
-    }
+    Task<GoogleAnalyticsSettings> GetSettingsAsync();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/Analytics/Settings/GoogleAnalyticsSettings.cs b/src/OrchardCore.Modules/OrchardCore.Google/Analytics/Settings/GoogleAnalyticsSettings.cs
index 62bffbaefc4..20fa9da4d0f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/Analytics/Settings/GoogleAnalyticsSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/Analytics/Settings/GoogleAnalyticsSettings.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Google.Analytics.Settings
+namespace OrchardCore.Google.Analytics.Settings;
+
+public class GoogleAnalyticsSettings
 {
-    public class GoogleAnalyticsSettings
-    {
-        public string TrackingID { get; set; }
-    }
+    public string TrackingID { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/Analytics/ViewModels/GoogleAnalyticsSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Google/Analytics/ViewModels/GoogleAnalyticsSettingsViewModel.cs
index 3535f4a3f5f..98b9aac840f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/Analytics/ViewModels/GoogleAnalyticsSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/Analytics/ViewModels/GoogleAnalyticsSettingsViewModel.cs
@@ -1,10 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Google.Analytics.ViewModels
+namespace OrchardCore.Google.Analytics.ViewModels;
+
+public class GoogleAnalyticsSettingsViewModel
 {
-    public class GoogleAnalyticsSettingsViewModel
-    {
-        [Required(AllowEmptyStrings = false)]
-        public string TrackingID { get; set; }
-    }
+    [Required(AllowEmptyStrings = false)]
+    public string TrackingID { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/Authentication/Configuration/GoogleOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Google/Authentication/Configuration/GoogleOptionsConfiguration.cs
index 47d81ecd7f7..6245be749f8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/Authentication/Configuration/GoogleOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/Authentication/Configuration/GoogleOptionsConfiguration.cs
@@ -7,78 +7,77 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Google.Authentication.Settings;
 
-namespace OrchardCore.Google.Authentication.Configuration
+namespace OrchardCore.Google.Authentication.Configuration;
+
+public class GoogleOptionsConfiguration :
+    IConfigureOptions<AuthenticationOptions>,
+    IConfigureNamedOptions<GoogleOptions>
 {
-    public class GoogleOptionsConfiguration :
-        IConfigureOptions<AuthenticationOptions>,
-        IConfigureNamedOptions<GoogleOptions>
+    private readonly GoogleAuthenticationSettings _googleAuthenticationSettings;
+    private readonly IDataProtectionProvider _dataProtectionProvider;
+    private readonly ILogger _logger;
+
+    public GoogleOptionsConfiguration(
+        IOptions<GoogleAuthenticationSettings> googleAuthenticationSettings,
+        IDataProtectionProvider dataProtectionProvider,
+        ILogger<GoogleOptionsConfiguration> logger)
     {
-        private readonly GoogleAuthenticationSettings _googleAuthenticationSettings;
-        private readonly IDataProtectionProvider _dataProtectionProvider;
-        private readonly ILogger _logger;
+        _googleAuthenticationSettings = googleAuthenticationSettings.Value;
+        _dataProtectionProvider = dataProtectionProvider;
+        _logger = logger;
+    }
 
-        public GoogleOptionsConfiguration(
-            IOptions<GoogleAuthenticationSettings> googleAuthenticationSettings,
-            IDataProtectionProvider dataProtectionProvider,
-            ILogger<GoogleOptionsConfiguration> logger)
+    public void Configure(AuthenticationOptions options)
+    {
+        if (_googleAuthenticationSettings == null)
         {
-            _googleAuthenticationSettings = googleAuthenticationSettings.Value;
-            _dataProtectionProvider = dataProtectionProvider;
-            _logger = logger;
+            return;
         }
 
-        public void Configure(AuthenticationOptions options)
+        if (string.IsNullOrWhiteSpace(_googleAuthenticationSettings.ClientID) ||
+            string.IsNullOrWhiteSpace(_googleAuthenticationSettings.ClientSecret))
         {
-            if (_googleAuthenticationSettings == null)
-            {
-                return;
-            }
-
-            if (string.IsNullOrWhiteSpace(_googleAuthenticationSettings.ClientID) ||
-                string.IsNullOrWhiteSpace(_googleAuthenticationSettings.ClientSecret))
-            {
-                _logger.LogWarning("The Google login provider is enabled but not configured.");
+            _logger.LogWarning("The Google login provider is enabled but not configured.");
 
-                return;
-            }
-
-            options.AddScheme(GoogleDefaults.AuthenticationScheme, builder =>
-            {
-                builder.DisplayName = "Google";
-                builder.HandlerType = typeof(GoogleHandler);
-            });
+            return;
         }
 
-        public void Configure(string name, GoogleOptions options)
+        options.AddScheme(GoogleDefaults.AuthenticationScheme, builder =>
         {
-            if (!string.Equals(name, GoogleDefaults.AuthenticationScheme, StringComparison.Ordinal))
-            {
-                return;
-            }
+            builder.DisplayName = "Google";
+            builder.HandlerType = typeof(GoogleHandler);
+        });
+    }
 
-            if (_googleAuthenticationSettings == null)
-            {
-                return;
-            }
+    public void Configure(string name, GoogleOptions options)
+    {
+        if (!string.Equals(name, GoogleDefaults.AuthenticationScheme, StringComparison.Ordinal))
+        {
+            return;
+        }
 
-            options.ClientId = _googleAuthenticationSettings.ClientID;
-            try
-            {
-                options.ClientSecret = _dataProtectionProvider.CreateProtector(GoogleConstants.Features.GoogleAuthentication).Unprotect(_googleAuthenticationSettings.ClientSecret);
-            }
-            catch
-            {
-                _logger.LogError("The Consumer Secret could not be decrypted. It may have been encrypted using a different key.");
-            }
+        if (_googleAuthenticationSettings == null)
+        {
+            return;
+        }
 
-            if (_googleAuthenticationSettings.CallbackPath.HasValue)
-            {
-                options.CallbackPath = _googleAuthenticationSettings.CallbackPath;
-            }
+        options.ClientId = _googleAuthenticationSettings.ClientID;
+        try
+        {
+            options.ClientSecret = _dataProtectionProvider.CreateProtector(GoogleConstants.Features.GoogleAuthentication).Unprotect(_googleAuthenticationSettings.ClientSecret);
+        }
+        catch
+        {
+            _logger.LogError("The Consumer Secret could not be decrypted. It may have been encrypted using a different key.");
+        }
 
-            options.SaveTokens = _googleAuthenticationSettings.SaveTokens;
+        if (_googleAuthenticationSettings.CallbackPath.HasValue)
+        {
+            options.CallbackPath = _googleAuthenticationSettings.CallbackPath;
         }
 
-        public void Configure(GoogleOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
+        options.SaveTokens = _googleAuthenticationSettings.SaveTokens;
     }
+
+    public void Configure(GoogleOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/Authentication/Drivers/GoogleAuthenticationSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Google/Authentication/Drivers/GoogleAuthenticationSettingsDisplayDriver.cs
index 10b39cd9469..1f3622f579a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/Authentication/Drivers/GoogleAuthenticationSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/Authentication/Drivers/GoogleAuthenticationSettingsDisplayDriver.cs
@@ -12,96 +12,95 @@
 using OrchardCore.Google.Authentication.ViewModels;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Google.Authentication.Drivers
+namespace OrchardCore.Google.Authentication.Drivers;
+
+public sealed class GoogleAuthenticationSettingsDisplayDriver : SiteDisplayDriver<GoogleAuthenticationSettings>
 {
-    public sealed class GoogleAuthenticationSettingsDisplayDriver : SiteDisplayDriver<GoogleAuthenticationSettings>
+    private readonly IShellReleaseManager _shellReleaseManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IDataProtectionProvider _dataProtectionProvider;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly ILogger _logger;
+
+    public GoogleAuthenticationSettingsDisplayDriver(
+        IShellReleaseManager shellReleaseManager,
+        IAuthorizationService authorizationService,
+        IDataProtectionProvider dataProtectionProvider,
+        IHttpContextAccessor httpContextAccessor,
+        ILogger<GoogleAuthenticationSettingsDisplayDriver> logger)
     {
-        private readonly IShellReleaseManager _shellReleaseManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IDataProtectionProvider _dataProtectionProvider;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly ILogger _logger;
+        _shellReleaseManager = shellReleaseManager;
+        _authorizationService = authorizationService;
+        _dataProtectionProvider = dataProtectionProvider;
+        _httpContextAccessor = httpContextAccessor;
+        _logger = logger;
+    }
+
+    protected override string SettingsGroupId
+        => GoogleConstants.Features.GoogleAuthentication;
 
-        public GoogleAuthenticationSettingsDisplayDriver(
-            IShellReleaseManager shellReleaseManager,
-            IAuthorizationService authorizationService,
-            IDataProtectionProvider dataProtectionProvider,
-            IHttpContextAccessor httpContextAccessor,
-            ILogger<GoogleAuthenticationSettingsDisplayDriver> logger)
+    public override async Task<IDisplayResult> EditAsync(ISite site, GoogleAuthenticationSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGoogleAuthentication))
         {
-            _shellReleaseManager = shellReleaseManager;
-            _authorizationService = authorizationService;
-            _dataProtectionProvider = dataProtectionProvider;
-            _httpContextAccessor = httpContextAccessor;
-            _logger = logger;
+            return null;
         }
 
-        protected override string SettingsGroupId
-            => GoogleConstants.Features.GoogleAuthentication;
-
-        public override async Task<IDisplayResult> EditAsync(ISite site, GoogleAuthenticationSettings settings, BuildEditorContext context)
+        return Initialize<GoogleAuthenticationSettingsViewModel>("GoogleAuthenticationSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGoogleAuthentication))
-            {
-                return null;
-            }
-
-            return Initialize<GoogleAuthenticationSettingsViewModel>("GoogleAuthenticationSettings_Edit", model =>
+            model.ClientID = settings.ClientID;
+            if (!string.IsNullOrWhiteSpace(settings.ClientSecret))
             {
-                model.ClientID = settings.ClientID;
-                if (!string.IsNullOrWhiteSpace(settings.ClientSecret))
+                try
                 {
-                    try
-                    {
-                        var protector = _dataProtectionProvider.CreateProtector(GoogleConstants.Features.GoogleAuthentication);
-                        model.ClientSecret = protector.Unprotect(settings.ClientSecret);
-                    }
-                    catch (CryptographicException)
-                    {
-                        _logger.LogError("The client secret could not be decrypted. It may have been encrypted using a different key.");
-                        model.ClientSecret = string.Empty;
-                        model.HasDecryptionError = true;
-                    }
+                    var protector = _dataProtectionProvider.CreateProtector(GoogleConstants.Features.GoogleAuthentication);
+                    model.ClientSecret = protector.Unprotect(settings.ClientSecret);
                 }
-                else
+                catch (CryptographicException)
                 {
+                    _logger.LogError("The client secret could not be decrypted. It may have been encrypted using a different key.");
                     model.ClientSecret = string.Empty;
+                    model.HasDecryptionError = true;
                 }
-                if (settings.CallbackPath.HasValue)
-                {
-                    model.CallbackPath = settings.CallbackPath.Value;
-                }
-                model.SaveTokens = settings.SaveTokens;
-            }).Location("Content:5")
-            .OnGroup(SettingsGroupId);
-        }
-
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, GoogleAuthenticationSettings settings, UpdateEditorContext context)
-        {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGoogleAuthentication))
+            }
+            else
             {
-                return null;
+                model.ClientSecret = string.Empty;
             }
+            if (settings.CallbackPath.HasValue)
+            {
+                model.CallbackPath = settings.CallbackPath.Value;
+            }
+            model.SaveTokens = settings.SaveTokens;
+        }).Location("Content:5")
+        .OnGroup(SettingsGroupId);
+    }
 
-            var model = new GoogleAuthenticationSettingsViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
-
-            settings.ClientID = model.ClientID;
-            settings.CallbackPath = model.CallbackPath;
-            settings.SaveTokens = model.SaveTokens;
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, GoogleAuthenticationSettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGoogleAuthentication))
+        {
+            return null;
+        }
 
-            if (context.Updater.ModelState.IsValid)
-            {
-                var protector = _dataProtectionProvider.CreateProtector(GoogleConstants.Features.GoogleAuthentication);
+        var model = new GoogleAuthenticationSettingsViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-                settings.ClientSecret = protector.Protect(model.ClientSecret);
-            }
+        settings.ClientID = model.ClientID;
+        settings.CallbackPath = model.CallbackPath;
+        settings.SaveTokens = model.SaveTokens;
 
-            _shellReleaseManager.RequestRelease();
+        if (context.Updater.ModelState.IsValid)
+        {
+            var protector = _dataProtectionProvider.CreateProtector(GoogleConstants.Features.GoogleAuthentication);
 
-            return await EditAsync(site, settings, context);
+            settings.ClientSecret = protector.Protect(model.ClientSecret);
         }
+
+        _shellReleaseManager.RequestRelease();
+
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/Authentication/Services/GoogleAuthenticationService.cs b/src/OrchardCore.Modules/OrchardCore.Google/Authentication/Services/GoogleAuthenticationService.cs
index d22f4cf8098..8930dabc507 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/Authentication/Services/GoogleAuthenticationService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/Authentication/Services/GoogleAuthenticationService.cs
@@ -7,71 +7,70 @@
 using OrchardCore.Google.Authentication.Settings;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Google.Authentication.Services
+namespace OrchardCore.Google.Authentication.Services;
+
+public class GoogleAuthenticationService : IGoogleAuthenticationService
 {
-    public class GoogleAuthenticationService : IGoogleAuthenticationService
+    private readonly ISiteService _siteService;
+    protected readonly IStringLocalizer S;
+
+    public GoogleAuthenticationService(
+        ISiteService siteService,
+        IStringLocalizer<GoogleAuthenticationService> stringLocalizer)
     {
-        private readonly ISiteService _siteService;
-        protected readonly IStringLocalizer S;
+        _siteService = siteService;
+        S = stringLocalizer;
+    }
 
-        public GoogleAuthenticationService(
-            ISiteService siteService,
-            IStringLocalizer<GoogleAuthenticationService> stringLocalizer)
-        {
-            _siteService = siteService;
-            S = stringLocalizer;
-        }
+    public async Task<GoogleAuthenticationSettings> GetSettingsAsync()
+    {
+        var container = await _siteService.GetSiteSettingsAsync();
+        return container.As<GoogleAuthenticationSettings>();
+    }
 
-        public async Task<GoogleAuthenticationSettings> GetSettingsAsync()
-        {
-            var container = await _siteService.GetSiteSettingsAsync();
-            return container.As<GoogleAuthenticationSettings>();
-        }
+    public async Task<GoogleAuthenticationSettings> LoadSettingsAsync()
+    {
+        var container = await _siteService.LoadSiteSettingsAsync();
+        return container.As<GoogleAuthenticationSettings>();
+    }
 
-        public async Task<GoogleAuthenticationSettings> LoadSettingsAsync()
-        {
-            var container = await _siteService.LoadSiteSettingsAsync();
-            return container.As<GoogleAuthenticationSettings>();
-        }
+    public async Task UpdateSettingsAsync(GoogleAuthenticationSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-        public async Task UpdateSettingsAsync(GoogleAuthenticationSettings settings)
+        var container = await _siteService.LoadSiteSettingsAsync();
+        container.Alter<GoogleAuthenticationSettings>(aspect =>
         {
-            ArgumentNullException.ThrowIfNull(settings);
-
-            var container = await _siteService.LoadSiteSettingsAsync();
-            container.Alter<GoogleAuthenticationSettings>(aspect =>
-            {
-                aspect.ClientID = settings.ClientID;
-                aspect.ClientSecret = settings.ClientSecret;
-                aspect.CallbackPath = settings.CallbackPath;
-            });
+            aspect.ClientID = settings.ClientID;
+            aspect.ClientSecret = settings.ClientSecret;
+            aspect.CallbackPath = settings.CallbackPath;
+        });
 
-            await _siteService.UpdateSiteSettingsAsync(container);
-        }
+        await _siteService.UpdateSiteSettingsAsync(container);
+    }
 
-        public IEnumerable<ValidationResult> ValidateSettings(GoogleAuthenticationSettings settings)
-        {
-            ArgumentNullException.ThrowIfNull(settings);
+    public IEnumerable<ValidationResult> ValidateSettings(GoogleAuthenticationSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-            var results = new List<ValidationResult>();
+        var results = new List<ValidationResult>();
 
-            if (string.IsNullOrEmpty(settings.ClientID))
+        if (string.IsNullOrEmpty(settings.ClientID))
+        {
+            results.Add(new ValidationResult(S["The Client ID is required."], new[]
             {
-                results.Add(new ValidationResult(S["The Client ID is required."], new[]
-                {
-                    nameof(settings.ClientID)
-                }));
-            }
+                nameof(settings.ClientID)
+            }));
+        }
 
-            if (string.IsNullOrEmpty(settings.ClientSecret))
+        if (string.IsNullOrEmpty(settings.ClientSecret))
+        {
+            results.Add(new ValidationResult(S["The Client Secret is required."], new[]
             {
-                results.Add(new ValidationResult(S["The Client Secret is required."], new[]
-                {
-                    nameof(settings.ClientSecret)
-                }));
-            }
-
-            return results;
+                nameof(settings.ClientSecret)
+            }));
         }
+
+        return results;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/Authentication/Settings/GoogleAuthenticationSettings.cs b/src/OrchardCore.Modules/OrchardCore.Google/Authentication/Settings/GoogleAuthenticationSettings.cs
index d761f2f6826..a0b85fe406a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/Authentication/Settings/GoogleAuthenticationSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/Authentication/Settings/GoogleAuthenticationSettings.cs
@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Google.Authentication.Settings
+namespace OrchardCore.Google.Authentication.Settings;
+
+public class GoogleAuthenticationSettings
 {
-    public class GoogleAuthenticationSettings
-    {
-        public string ClientID { get; set; }
-        public string ClientSecret { get; set; }
-        public PathString CallbackPath { get; set; }
-        public bool SaveTokens { get; set; }
-    }
+    public string ClientID { get; set; }
+    public string ClientSecret { get; set; }
+    public PathString CallbackPath { get; set; }
+    public bool SaveTokens { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/Authentication/ViewModels/GoogleAuthenticationSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Google/Authentication/ViewModels/GoogleAuthenticationSettingsViewModel.cs
index 7a37b987d21..48a2b7810b7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/Authentication/ViewModels/GoogleAuthenticationSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/Authentication/ViewModels/GoogleAuthenticationSettingsViewModel.cs
@@ -1,20 +1,19 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Google.Authentication.ViewModels
+namespace OrchardCore.Google.Authentication.ViewModels;
+
+public class GoogleAuthenticationSettingsViewModel
 {
-    public class GoogleAuthenticationSettingsViewModel
-    {
-        [Required(AllowEmptyStrings = false, ErrorMessage = "ClientID key is required")]
-        public string ClientID { get; set; }
+    [Required(AllowEmptyStrings = false, ErrorMessage = "ClientID key is required")]
+    public string ClientID { get; set; }
 
-        [Required(AllowEmptyStrings = false, ErrorMessage = "ClientSecret is required")]
-        public string ClientSecret { get; set; }
+    [Required(AllowEmptyStrings = false, ErrorMessage = "ClientSecret is required")]
+    public string ClientSecret { get; set; }
 
-        [RegularExpression(@"\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]", ErrorMessage = "Invalid path")]
-        public string CallbackPath { get; set; }
+    [RegularExpression(@"\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]", ErrorMessage = "Invalid path")]
+    public string CallbackPath { get; set; }
 
-        public bool SaveTokens { get; set; }
+    public bool SaveTokens { get; set; }
 
-        public bool HasDecryptionError { get; set; }
-    }
+    public bool HasDecryptionError { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/Extensions/OrchardCoreBuilderExtensions.cs b/src/OrchardCore.Modules/OrchardCore.Google/Extensions/OrchardCoreBuilderExtensions.cs
index 9d36371cb00..ff26fc7550b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/Extensions/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/Extensions/OrchardCoreBuilderExtensions.cs
@@ -2,20 +2,19 @@
 using OrchardCore.Environment.Shell.Configuration;
 using OrchardCore.Google.Authentication.Settings;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class OrchardCoreBuilderExtensions
 {
-    public static class OrchardCoreBuilderExtensions
+    public static OrchardCoreBuilder ConfigureGoogleSettings(this OrchardCoreBuilder builder)
     {
-        public static OrchardCoreBuilder ConfigureGoogleSettings(this OrchardCoreBuilder builder)
+        builder.ConfigureServices((tenantServices, serviceProvider) =>
         {
-            builder.ConfigureServices((tenantServices, serviceProvider) =>
-            {
-                var configurationSection = serviceProvider.GetRequiredService<IShellConfiguration>().GetSection("OrchardCore_Google");
+            var configurationSection = serviceProvider.GetRequiredService<IShellConfiguration>().GetSection("OrchardCore_Google");
 
-                tenantServices.PostConfigure<GoogleAuthenticationSettings>(settings => configurationSection.Bind(settings));
-            });
+            tenantServices.PostConfigure<GoogleAuthenticationSettings>(settings => configurationSection.Bind(settings));
+        });
 
-            return builder;
-        }
+        return builder;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs
index 4c17667517b..3dfde661c0c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs
@@ -3,121 +3,120 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Google
+namespace OrchardCore.Google;
+
+public sealed class GoogleAuthenticationAdminMenu : INavigationProvider
 {
-    public sealed class GoogleAuthenticationAdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", GoogleConstants.Features.GoogleAuthentication },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", GoogleConstants.Features.GoogleAuthentication },
+    };
+
+    internal readonly IStringLocalizer S;
 
-        internal readonly IStringLocalizer S;
+    public GoogleAuthenticationAdminMenu(IStringLocalizer<GoogleAuthenticationAdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public GoogleAuthenticationAdminMenu(IStringLocalizer<GoogleAuthenticationAdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Security"], security => security
-                    .Add(S["Authentication"], authentication => authentication
-                    .Add(S["Google"], S["Google"].PrefixPosition(), google => google
-                        .AddClass("google")
-                        .Id("google")
-                        .Action("Index", "Admin", _routeValues)
-                        .Permission(Permissions.ManageGoogleAuthentication)
-                        .LocalNav()
-                    )
+        builder
+            .Add(S["Security"], security => security
+                .Add(S["Authentication"], authentication => authentication
+                .Add(S["Google"], S["Google"].PrefixPosition(), google => google
+                    .AddClass("google")
+                    .Id("google")
+                    .Action("Index", "Admin", _routeValues)
+                    .Permission(Permissions.ManageGoogleAuthentication)
+                    .LocalNav()
                 )
-            );
+            )
+        );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
+}
 
-    public sealed class GoogleAnalyticsAdminMenu : INavigationProvider
+public sealed class GoogleAnalyticsAdminMenu : INavigationProvider
+{
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", GoogleConstants.Features.GoogleAnalytics },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", GoogleConstants.Features.GoogleAnalytics },
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public GoogleAnalyticsAdminMenu(IStringLocalizer<GoogleAnalyticsAdminMenu> localizer)
+    public GoogleAnalyticsAdminMenu(IStringLocalizer<GoogleAnalyticsAdminMenu> localizer)
+    {
+        S = localizer;
+    }
+
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["Settings"], settings => settings
-                        .Add(S["Google Analytics"], S["Google Analytics"].PrefixPosition(), google => google
-                            .AddClass("googleAnalytics").Id("googleAnalytics")
-                            .Action("Index", "Admin", _routeValues)
-                            .Permission(Permissions.ManageGoogleAnalytics)
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["Settings"], settings => settings
+                    .Add(S["Google Analytics"], S["Google Analytics"].PrefixPosition(), google => google
+                        .AddClass("googleAnalytics").Id("googleAnalytics")
+                        .Action("Index", "Admin", _routeValues)
+                        .Permission(Permissions.ManageGoogleAnalytics)
+                        .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
+}
 
-    public sealed class GoogleTagManagerAdminMenu : INavigationProvider
+public sealed class GoogleTagManagerAdminMenu : INavigationProvider
+{
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", GoogleConstants.Features.GoogleTagManager },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", GoogleConstants.Features.GoogleTagManager },
+    };
+
+    internal readonly IStringLocalizer S;
 
-        internal readonly IStringLocalizer S;
+    public GoogleTagManagerAdminMenu(IStringLocalizer<GoogleTagManagerAdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public GoogleTagManagerAdminMenu(IStringLocalizer<GoogleTagManagerAdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["Settings"], settings => settings
-                        .Add(S["Google Tag Manager"], S["Google Tag Manager"].PrefixPosition(), google => google
-                            .AddClass("googleTagManager")
-                            .Id("googleTagManager")
-                            .Action("Index", "Admin", _routeValues)
-                            .Permission(Permissions.ManageGoogleTagManager)
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["Settings"], settings => settings
+                    .Add(S["Google Tag Manager"], S["Google Tag Manager"].PrefixPosition(), google => google
+                        .AddClass("googleTagManager")
+                        .Id("googleTagManager")
+                        .Action("Index", "Admin", _routeValues)
+                        .Permission(Permissions.ManageGoogleTagManager)
+                        .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationStartup.cs b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationStartup.cs
index 3810747b0b1..6a077e7da54 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationStartup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationStartup.cs
@@ -23,92 +23,91 @@
 using OrchardCore.Settings;
 using OrchardCore.Settings.Deployment;
 
-namespace OrchardCore.Google
+namespace OrchardCore.Google;
+
+[Feature(GoogleConstants.Features.GoogleAuthentication)]
+public sealed class GoogleAuthenticationStartup : StartupBase
 {
-    [Feature(GoogleConstants.Features.GoogleAuthentication)]
-    public sealed class GoogleAuthenticationStartup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.AddScoped<IPermissionProvider, GoogleAuthenticationPermissionProvider>();
+        services.AddSingleton<GoogleAuthenticationService, GoogleAuthenticationService>();
+        services.AddScoped<IDisplayDriver<ISite>, GoogleAuthenticationSettingsDisplayDriver>();
+        services.AddScoped<INavigationProvider, GoogleAuthenticationAdminMenu>();
+        // Register the options initializers required by the Google Handler.
+        services.TryAddEnumerable(new[]
         {
-            services.AddScoped<IPermissionProvider, GoogleAuthenticationPermissionProvider>();
-            services.AddSingleton<GoogleAuthenticationService, GoogleAuthenticationService>();
-            services.AddScoped<IDisplayDriver<ISite>, GoogleAuthenticationSettingsDisplayDriver>();
-            services.AddScoped<INavigationProvider, GoogleAuthenticationAdminMenu>();
-            // Register the options initializers required by the Google Handler.
-            services.TryAddEnumerable(new[]
-            {
-                // Orchard-specific initializers:
-                ServiceDescriptor.Transient<IConfigureOptions<AuthenticationOptions>, GoogleOptionsConfiguration>(),
-                ServiceDescriptor.Transient<IConfigureOptions<GoogleOptions>, GoogleOptionsConfiguration>(),
-                // Built-in initializers:
-                ServiceDescriptor.Transient<IPostConfigureOptions<GoogleOptions>, OAuthPostConfigureOptions<GoogleOptions, GoogleHandler>>()
-            });
+            // Orchard-specific initializers:
+            ServiceDescriptor.Transient<IConfigureOptions<AuthenticationOptions>, GoogleOptionsConfiguration>(),
+            ServiceDescriptor.Transient<IConfigureOptions<GoogleOptions>, GoogleOptionsConfiguration>(),
+            // Built-in initializers:
+            ServiceDescriptor.Transient<IPostConfigureOptions<GoogleOptions>, OAuthPostConfigureOptions<GoogleOptions, GoogleHandler>>()
+        });
 
-            services.AddTransient<IConfigureOptions<GoogleAuthenticationSettings>, GoogleAuthenticationSettingsConfiguration>();
-        }
+        services.AddTransient<IConfigureOptions<GoogleAuthenticationSettings>, GoogleAuthenticationSettingsConfiguration>();
     }
+}
 
-    [Feature(GoogleConstants.Features.GoogleAnalytics)]
-    public sealed class GoogleAnalyticsStartup : StartupBase
+[Feature(GoogleConstants.Features.GoogleAnalytics)]
+public sealed class GoogleAnalyticsStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IPermissionProvider, GoogleAnalyticsPermissionsProvider>();
-            services.AddSingleton<IGoogleAnalyticsService, GoogleAnalyticsService>();
+        services.AddScoped<IPermissionProvider, GoogleAnalyticsPermissionsProvider>();
+        services.AddSingleton<IGoogleAnalyticsService, GoogleAnalyticsService>();
 
-            services.AddScoped<IDisplayDriver<ISite>, GoogleAnalyticsSettingsDisplayDriver>();
-            services.AddScoped<INavigationProvider, GoogleAnalyticsAdminMenu>();
-            services.Configure<MvcOptions>((options) =>
-            {
-                options.Filters.Add<GoogleAnalyticsFilter>();
-            });
-        }
+        services.AddScoped<IDisplayDriver<ISite>, GoogleAnalyticsSettingsDisplayDriver>();
+        services.AddScoped<INavigationProvider, GoogleAnalyticsAdminMenu>();
+        services.Configure<MvcOptions>((options) =>
+        {
+            options.Filters.Add<GoogleAnalyticsFilter>();
+        });
     }
+}
 
-    [Feature(GoogleConstants.Features.GoogleTagManager)]
-    public sealed class GoogleTagManagerStartup : StartupBase
+[Feature(GoogleConstants.Features.GoogleTagManager)]
+public sealed class GoogleTagManagerStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IPermissionProvider, GoogleTagManagerPermissionProvider>();
-            services.AddSingleton<IGoogleTagManagerService, GoogleTagManagerService>();
+        services.AddScoped<IPermissionProvider, GoogleTagManagerPermissionProvider>();
+        services.AddSingleton<IGoogleTagManagerService, GoogleTagManagerService>();
 
-            services.AddScoped<IDisplayDriver<ISite>, GoogleTagManagerSettingsDisplayDriver>();
-            services.AddScoped<INavigationProvider, GoogleTagManagerAdminMenu>();
-            services.Configure<MvcOptions>((options) =>
-            {
-                options.Filters.Add<GoogleTagManagerFilter>();
-            });
-        }
+        services.AddScoped<IDisplayDriver<ISite>, GoogleTagManagerSettingsDisplayDriver>();
+        services.AddScoped<INavigationProvider, GoogleTagManagerAdminMenu>();
+        services.Configure<MvcOptions>((options) =>
+        {
+            options.Filters.Add<GoogleTagManagerFilter>();
+        });
     }
+}
 
-    [Feature(GoogleConstants.Features.GoogleAuthentication)]
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class GoogleAuthenticationDeploymentStartup : StartupBase
+[Feature(GoogleConstants.Features.GoogleAuthentication)]
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class GoogleAuthenticationDeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSiteSettingsPropertyDeploymentStep<GoogleAuthenticationSettings, GoogleAuthenticationDeploymentStartup>(S => S["Google Authentication Settings"], S => S["Exports the Google Authentication settings."]);
-        }
+        services.AddSiteSettingsPropertyDeploymentStep<GoogleAuthenticationSettings, GoogleAuthenticationDeploymentStartup>(S => S["Google Authentication Settings"], S => S["Exports the Google Authentication settings."]);
     }
+}
 
-    [Feature(GoogleConstants.Features.GoogleAnalytics)]
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class GoogleAnalyticsDeploymentStartup : StartupBase
+[Feature(GoogleConstants.Features.GoogleAnalytics)]
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class GoogleAnalyticsDeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSiteSettingsPropertyDeploymentStep<GoogleAnalyticsSettings, GoogleAnalyticsDeploymentStartup>(S => S["Google Analytics Settings"], S => S["Exports the Google Analytics settings."]);
-        }
+        services.AddSiteSettingsPropertyDeploymentStep<GoogleAnalyticsSettings, GoogleAnalyticsDeploymentStartup>(S => S["Google Analytics Settings"], S => S["Exports the Google Analytics settings."]);
     }
+}
 
-    [Feature(GoogleConstants.Features.GoogleTagManager)]
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class GoogleTagManagerDeploymentStartup : StartupBase
+[Feature(GoogleConstants.Features.GoogleTagManager)]
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class GoogleTagManagerDeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSiteSettingsPropertyDeploymentStep<GoogleTagManagerSettings, GoogleTagManagerDeploymentStartup>(S => S["Google Tag Manager Settings"], S => S["Exports the Google Tag Manager settings."]);
-        }
+        services.AddSiteSettingsPropertyDeploymentStep<GoogleTagManagerSettings, GoogleTagManagerDeploymentStartup>(S => S["Google Tag Manager Settings"], S => S["Exports the Google Tag Manager settings."]);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/GoogleConstants.cs b/src/OrchardCore.Modules/OrchardCore.Google/GoogleConstants.cs
index 550ff3af711..ae3a95ab351 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/GoogleConstants.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/GoogleConstants.cs
@@ -1,12 +1,11 @@
-namespace OrchardCore.Google
+namespace OrchardCore.Google;
+
+public static class GoogleConstants
 {
-    public static class GoogleConstants
+    public static class Features
     {
-        public static class Features
-        {
-            public const string GoogleAuthentication = "OrchardCore.Google.GoogleAuthentication";
-            public const string GoogleAnalytics = "OrchardCore.Google.Analytics";
-            public const string GoogleTagManager = "OrchardCore.Google.TagManager";
-        }
+        public const string GoogleAuthentication = "OrchardCore.Google.GoogleAuthentication";
+        public const string GoogleAnalytics = "OrchardCore.Google.Analytics";
+        public const string GoogleTagManager = "OrchardCore.Google.TagManager";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/TagManager/Drivers/GoogleTagManagerSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Google/TagManager/Drivers/GoogleTagManagerSettingsDisplayDriver.cs
index 8469bba36e8..4fb87fed592 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/TagManager/Drivers/GoogleTagManagerSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/TagManager/Drivers/GoogleTagManagerSettingsDisplayDriver.cs
@@ -8,56 +8,55 @@
 using OrchardCore.Google.TagManager.ViewModels;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Google.TagManager.Drivers
+namespace OrchardCore.Google.TagManager.Drivers;
+
+public sealed class GoogleTagManagerSettingsDisplayDriver : SiteDisplayDriver<GoogleTagManagerSettings>
 {
-    public sealed class GoogleTagManagerSettingsDisplayDriver : SiteDisplayDriver<GoogleTagManagerSettings>
-    {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public GoogleTagManagerSettingsDisplayDriver(
-            IAuthorizationService authorizationService,
-            IHttpContextAccessor httpContextAccessor)
-        {
-            _authorizationService = authorizationService;
-            _httpContextAccessor = httpContextAccessor;
-        }
+    public GoogleTagManagerSettingsDisplayDriver(
+        IAuthorizationService authorizationService,
+        IHttpContextAccessor httpContextAccessor)
+    {
+        _authorizationService = authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        protected override string SettingsGroupId
-            => GoogleConstants.Features.GoogleTagManager;
+    protected override string SettingsGroupId
+        => GoogleConstants.Features.GoogleTagManager;
 
-        public override async Task<IDisplayResult> EditAsync(ISite site, GoogleTagManagerSettings settings, BuildEditorContext context)
+    public override async Task<IDisplayResult> EditAsync(ISite site, GoogleTagManagerSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGoogleTagManager))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGoogleTagManager))
-            {
-                return null;
-            }
-
-            return Initialize<GoogleTagManagerSettingsViewModel>("GoogleTagManagerSettings_Edit", model =>
-            {
-                model.ContainerID = settings.ContainerID;
-            }).Location("Content:5")
-            .OnGroup(SettingsGroupId);
+            return null;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, GoogleTagManagerSettings settings, UpdateEditorContext context)
+        return Initialize<GoogleTagManagerSettingsViewModel>("GoogleTagManagerSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGoogleTagManager))
-            {
-                return null;
-            }
+            model.ContainerID = settings.ContainerID;
+        }).Location("Content:5")
+        .OnGroup(SettingsGroupId);
+    }
 
-            var model = new GoogleTagManagerSettingsViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, GoogleTagManagerSettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGoogleTagManager))
+        {
+            return null;
+        }
 
-            if (context.Updater.ModelState.IsValid)
-            {
-                settings.ContainerID = model.ContainerID;
-            }
+        var model = new GoogleTagManagerSettingsViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            return await EditAsync(site, settings, context);
+        if (context.Updater.ModelState.IsValid)
+        {
+            settings.ContainerID = model.ContainerID;
         }
+
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/TagManager/GoogleTagManagerFilter.cs b/src/OrchardCore.Modules/OrchardCore.Google/TagManager/GoogleTagManagerFilter.cs
index f1ff992d1f2..f7268829caa 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/TagManager/GoogleTagManagerFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/TagManager/GoogleTagManagerFilter.cs
@@ -7,47 +7,46 @@
 using OrchardCore.ResourceManagement;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Google.TagManager
+namespace OrchardCore.Google.TagManager;
+
+public sealed class GoogleTagManagerFilter : IAsyncResultFilter
 {
-    public sealed class GoogleTagManagerFilter : IAsyncResultFilter
-    {
-        private readonly IResourceManager _resourceManager;
-        private readonly ISiteService _siteService;
+    private readonly IResourceManager _resourceManager;
+    private readonly ISiteService _siteService;
 
-        private HtmlString _scriptsCache;
+    private HtmlString _scriptsCache;
 
-        public GoogleTagManagerFilter(
-            IResourceManager resourceManager,
-            ISiteService siteService)
-        {
-            _resourceManager = resourceManager;
-            _siteService = siteService;
-        }
+    public GoogleTagManagerFilter(
+        IResourceManager resourceManager,
+        ISiteService siteService)
+    {
+        _resourceManager = resourceManager;
+        _siteService = siteService;
+    }
 
-        public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
+    public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
+    {
+        // Should only run on the front-end for a full view
+        if (context.IsViewOrPageResult() && !AdminAttribute.IsApplied(context.HttpContext))
         {
-            // Should only run on the front-end for a full view
-            if (context.IsViewOrPageResult() && !AdminAttribute.IsApplied(context.HttpContext))
-            {
-                var canTrack = context.HttpContext.Features.Get<ITrackingConsentFeature>()?.CanTrack ?? true;
+            var canTrack = context.HttpContext.Features.Get<ITrackingConsentFeature>()?.CanTrack ?? true;
 
-                if (_scriptsCache == null && canTrack)
-                {
-                    var settings = await _siteService.GetSettingsAsync<GoogleTagManagerSettings>();
-
-                    if (!string.IsNullOrWhiteSpace(settings?.ContainerID))
-                    {
-                        _scriptsCache = new HtmlString("<!-- Google Tag Manager -->\n<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':\n  new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],\n  j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=\n  'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);\n  })(window,document,'script','dataLayer','" + settings.ContainerID + "');</script>\n<!-- End Google Tag Manager -->");
-                    }
-                }
+            if (_scriptsCache == null && canTrack)
+            {
+                var settings = await _siteService.GetSettingsAsync<GoogleTagManagerSettings>();
 
-                if (_scriptsCache != null)
+                if (!string.IsNullOrWhiteSpace(settings?.ContainerID))
                 {
-                    _resourceManager.RegisterHeadScript(_scriptsCache);
+                    _scriptsCache = new HtmlString("<!-- Google Tag Manager -->\n<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':\n  new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],\n  j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=\n  'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);\n  })(window,document,'script','dataLayer','" + settings.ContainerID + "');</script>\n<!-- End Google Tag Manager -->");
                 }
             }
 
-            await next.Invoke();
+            if (_scriptsCache != null)
+            {
+                _resourceManager.RegisterHeadScript(_scriptsCache);
+            }
         }
+
+        await next.Invoke();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/TagManager/Services/GoogleTagManagerService.cs b/src/OrchardCore.Modules/OrchardCore.Google/TagManager/Services/GoogleTagManagerService.cs
index 9462a1700e4..738f90b4308 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/TagManager/Services/GoogleTagManagerService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/TagManager/Services/GoogleTagManagerService.cs
@@ -2,18 +2,17 @@
 using OrchardCore.Google.TagManager.Settings;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Google.TagManager.Services
-{
-    public class GoogleTagManagerService : IGoogleTagManagerService
-    {
-        private readonly ISiteService _siteService;
+namespace OrchardCore.Google.TagManager.Services;
 
-        public GoogleTagManagerService(ISiteService siteService)
-        {
-            _siteService = siteService;
-        }
+public class GoogleTagManagerService : IGoogleTagManagerService
+{
+    private readonly ISiteService _siteService;
 
-        public Task<GoogleTagManagerSettings> GetSettingsAsync()
-            => _siteService.GetSettingsAsync<GoogleTagManagerSettings>();
+    public GoogleTagManagerService(ISiteService siteService)
+    {
+        _siteService = siteService;
     }
+
+    public Task<GoogleTagManagerSettings> GetSettingsAsync()
+        => _siteService.GetSettingsAsync<GoogleTagManagerSettings>();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/TagManager/Services/IGoogleTagManagerService.cs b/src/OrchardCore.Modules/OrchardCore.Google/TagManager/Services/IGoogleTagManagerService.cs
index 68ee7f6b991..62a0efcaec1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/TagManager/Services/IGoogleTagManagerService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/TagManager/Services/IGoogleTagManagerService.cs
@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
 using OrchardCore.Google.TagManager.Settings;
 
-namespace OrchardCore.Google.TagManager.Services
+namespace OrchardCore.Google.TagManager.Services;
+
+public interface IGoogleTagManagerService
 {
-    public interface IGoogleTagManagerService
-    {
-        Task<GoogleTagManagerSettings> GetSettingsAsync();
-    }
+    Task<GoogleTagManagerSettings> GetSettingsAsync();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/TagManager/Settings/GoogleTagManagerSettings.cs b/src/OrchardCore.Modules/OrchardCore.Google/TagManager/Settings/GoogleTagManagerSettings.cs
index 52473a804fe..767a191357a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/TagManager/Settings/GoogleTagManagerSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/TagManager/Settings/GoogleTagManagerSettings.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Google.TagManager.Settings
+namespace OrchardCore.Google.TagManager.Settings;
+
+public class GoogleTagManagerSettings
 {
-    public class GoogleTagManagerSettings
-    {
-        public string ContainerID { get; set; }
-    }
+    public string ContainerID { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Google/TagManager/ViewModels/GoogleTagManagerSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Google/TagManager/ViewModels/GoogleTagManagerSettingsViewModel.cs
index 5b957fde665..7844a01ddf1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Google/TagManager/ViewModels/GoogleTagManagerSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Google/TagManager/ViewModels/GoogleTagManagerSettingsViewModel.cs
@@ -1,10 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Google.TagManager.ViewModels
+namespace OrchardCore.Google.TagManager.ViewModels;
+
+public class GoogleTagManagerSettingsViewModel
 {
-    public class GoogleTagManagerSettingsViewModel
-    {
-        [Required(AllowEmptyStrings = false)]
-        public string ContainerID { get; set; }
-    }
+    [Required(AllowEmptyStrings = false)]
+    public string ContainerID { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.HealthChecks/Startup.cs b/src/OrchardCore.Modules/OrchardCore.HealthChecks/Startup.cs
index 882c6659aca..b2cfc0e3e78 100644
--- a/src/OrchardCore.Modules/OrchardCore.HealthChecks/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.HealthChecks/Startup.cs
@@ -10,49 +10,48 @@
 using OrchardCore.HealthChecks.Services;
 using OrchardCore.Modules;
 
-namespace OrchardCore.HealthChecks
+namespace OrchardCore.HealthChecks;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    private readonly IShellConfiguration _shellConfiguration;
+
+    public Startup(IShellConfiguration shellConfiguration)
     {
-        private readonly IShellConfiguration _shellConfiguration;
+        _shellConfiguration = shellConfiguration;
+    }
 
-        public Startup(IShellConfiguration shellConfiguration)
-        {
-            _shellConfiguration = shellConfiguration;
-        }
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddScoped<IHealthChecksResponseWriter, DefaultHealthChecksResponseWriter>();
+        services.AddHealthChecks();
 
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IHealthChecksResponseWriter, DefaultHealthChecksResponseWriter>();
-            services.AddHealthChecks();
+        services.Configure<HealthChecksOptions>(_shellConfiguration.GetSection("OrchardCore_HealthChecks"));
+    }
 
-            services.Configure<HealthChecksOptions>(_shellConfiguration.GetSection("OrchardCore_HealthChecks"));
-        }
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        var healthChecksOptions = serviceProvider.GetService<IOptions<HealthChecksOptions>>().Value;
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+        if (healthChecksOptions.ShowDetails)
         {
-            var healthChecksOptions = serviceProvider.GetService<IOptions<HealthChecksOptions>>().Value;
+            var healthChecksResponseWriter = serviceProvider.GetService<IHealthChecksResponseWriter>();
 
-            if (healthChecksOptions.ShowDetails)
+            app.UseHealthChecks(healthChecksOptions.Url, new HealthCheckOptions
             {
-                var healthChecksResponseWriter = serviceProvider.GetService<IHealthChecksResponseWriter>();
-
-                app.UseHealthChecks(healthChecksOptions.Url, new HealthCheckOptions
+                AllowCachingResponses = false,
+                ResultStatusCodes =
                 {
-                    AllowCachingResponses = false,
-                    ResultStatusCodes =
-                    {
-                        [HealthStatus.Healthy] = StatusCodes.Status200OK,
-                        [HealthStatus.Degraded] = StatusCodes.Status200OK,
-                        [HealthStatus.Unhealthy] = StatusCodes.Status200OK
-                    },
-                    ResponseWriter = healthChecksResponseWriter.WriteResponseAsync
-                });
-            }
-            else
-            {
-                app.UseHealthChecks(healthChecksOptions.Url);
-            }
+                    [HealthStatus.Healthy] = StatusCodes.Status200OK,
+                    [HealthStatus.Degraded] = StatusCodes.Status200OK,
+                    [HealthStatus.Unhealthy] = StatusCodes.Status200OK
+                },
+                ResponseWriter = healthChecksResponseWriter.WriteResponseAsync
+            });
+        }
+        else
+        {
+            app.UseHealthChecks(healthChecksOptions.Url);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.HomeRoute/Routing/HomeRouteTransformer.cs b/src/OrchardCore.Modules/OrchardCore.HomeRoute/Routing/HomeRouteTransformer.cs
index fd633684a77..0fa592dccbe 100644
--- a/src/OrchardCore.Modules/OrchardCore.HomeRoute/Routing/HomeRouteTransformer.cs
+++ b/src/OrchardCore.Modules/OrchardCore.HomeRoute/Routing/HomeRouteTransformer.cs
@@ -4,29 +4,28 @@
 using Microsoft.AspNetCore.Routing;
 using OrchardCore.Settings;
 
-namespace OrchardCore.HomeRoute.Routing
+namespace OrchardCore.HomeRoute.Routing;
+
+public class HomeRouteTransformer : DynamicRouteValueTransformer
 {
-    public class HomeRouteTransformer : DynamicRouteValueTransformer
+    private readonly ISiteService _siteService;
+
+    public HomeRouteTransformer(ISiteService siteService)
     {
-        private readonly ISiteService _siteService;
+        _siteService = siteService;
+    }
 
-        public HomeRouteTransformer(ISiteService siteService)
+    public override async ValueTask<RouteValueDictionary> TransformAsync(HttpContext httpContext, RouteValueDictionary values)
+    {
+        var homeRoute = (await _siteService.GetSiteSettingsAsync()).HomeRoute;
+
+        if (homeRoute.Count > 0)
         {
-            _siteService = siteService;
+            return new RouteValueDictionary(homeRoute);
         }
-
-        public override async ValueTask<RouteValueDictionary> TransformAsync(HttpContext httpContext, RouteValueDictionary values)
+        else
         {
-            var homeRoute = (await _siteService.GetSiteSettingsAsync()).HomeRoute;
-
-            if (homeRoute.Count > 0)
-            {
-                return new RouteValueDictionary(homeRoute);
-            }
-            else
-            {
-                return null;
-            }
+            return null;
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.HomeRoute/Routing/HomeRouteValuesAddressScheme.cs b/src/OrchardCore.Modules/OrchardCore.HomeRoute/Routing/HomeRouteValuesAddressScheme.cs
index 9926881c3b0..4d939f2c1b4 100644
--- a/src/OrchardCore.Modules/OrchardCore.HomeRoute/Routing/HomeRouteValuesAddressScheme.cs
+++ b/src/OrchardCore.Modules/OrchardCore.HomeRoute/Routing/HomeRouteValuesAddressScheme.cs
@@ -6,72 +6,71 @@
 using OrchardCore.Routing;
 using OrchardCore.Settings;
 
-namespace OrchardCore.HomeRoute.Routing
+namespace OrchardCore.HomeRoute.Routing;
+
+internal sealed class HomeRouteValuesAddressScheme : IShellRouteValuesAddressScheme
 {
-    internal sealed class HomeRouteValuesAddressScheme : IShellRouteValuesAddressScheme
+    private readonly ISiteService _siteService;
+
+    public HomeRouteValuesAddressScheme(ISiteService siteService)
     {
-        private readonly ISiteService _siteService;
+        _siteService = siteService;
+    }
 
-        public HomeRouteValuesAddressScheme(ISiteService siteService)
+    public IEnumerable<Endpoint> FindEndpoints(RouteValuesAddress address)
+    {
+        if (address.AmbientValues == null || address.ExplicitValues == null)
         {
-            _siteService = siteService;
+            return [];
         }
 
-        public IEnumerable<Endpoint> FindEndpoints(RouteValuesAddress address)
-        {
-            if (address.AmbientValues == null || address.ExplicitValues == null)
-            {
-                return [];
-            }
+        var homeRoute = _siteService.GetSiteSettingsAsync().GetAwaiter().GetResult().HomeRoute;
 
-            var homeRoute = _siteService.GetSiteSettingsAsync().GetAwaiter().GetResult().HomeRoute;
+        if (Match(homeRoute, address.ExplicitValues))
+        {
+            var routeValues = new RouteValueDictionary(address.ExplicitValues);
 
-            if (Match(homeRoute, address.ExplicitValues))
+            if (address.ExplicitValues.Count > homeRoute.Count)
             {
-                var routeValues = new RouteValueDictionary(address.ExplicitValues);
-
-                if (address.ExplicitValues.Count > homeRoute.Count)
+                foreach (var entry in address.ExplicitValues)
                 {
-                    foreach (var entry in address.ExplicitValues)
+                    if (!homeRoute.ContainsKey(entry.Key))
                     {
-                        if (!homeRoute.ContainsKey(entry.Key))
-                        {
-                            routeValues.Remove(entry.Key);
-                        }
+                        routeValues.Remove(entry.Key);
                     }
                 }
+            }
 
-                var endpoint = new RouteEndpoint
-                (
-                    c => null,
-                    RoutePatternFactory.Parse(string.Empty, routeValues, null),
-                    0,
-                    null,
-                    null
-                );
+            var endpoint = new RouteEndpoint
+            (
+                c => null,
+                RoutePatternFactory.Parse(string.Empty, routeValues, null),
+                0,
+                null,
+                null
+            );
 
-                return new[] { endpoint };
-            }
+            return new[] { endpoint };
+        }
 
-            return [];
+        return [];
+    }
+
+    private static bool Match(RouteValueDictionary routeValues, RouteValueDictionary explicitValues)
+    {
+        if (routeValues.Count == 0)
+        {
+            return false;
         }
 
-        private static bool Match(RouteValueDictionary routeValues, RouteValueDictionary explicitValues)
+        foreach (var entry in routeValues)
         {
-            if (routeValues.Count == 0)
+            if (!string.Equals(explicitValues[entry.Key]?.ToString(), entry.Value?.ToString(), StringComparison.OrdinalIgnoreCase))
             {
                 return false;
             }
-
-            foreach (var entry in routeValues)
-            {
-                if (!string.Equals(explicitValues[entry.Key]?.ToString(), entry.Value?.ToString(), StringComparison.OrdinalIgnoreCase))
-                {
-                    return false;
-                }
-            }
-
-            return true;
         }
+
+        return true;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.HomeRoute/Startup.cs b/src/OrchardCore.Modules/OrchardCore.HomeRoute/Startup.cs
index db07c8de113..d3a75bf6e36 100644
--- a/src/OrchardCore.Modules/OrchardCore.HomeRoute/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.HomeRoute/Startup.cs
@@ -6,22 +6,21 @@
 using OrchardCore.Modules;
 using OrchardCore.Routing;
 
-namespace OrchardCore.HomeRoute
+namespace OrchardCore.HomeRoute;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
-    {
-        public override int Order
-            => OrchardCoreConstants.ConfigureOrder.HomeRoute;
+    public override int Order
+        => OrchardCoreConstants.ConfigureOrder.HomeRoute;
 
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSingleton<HomeRouteTransformer>();
-            services.AddSingleton<IShellRouteValuesAddressScheme, HomeRouteValuesAddressScheme>();
-        }
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddSingleton<HomeRouteTransformer>();
+        services.AddSingleton<IShellRouteValuesAddressScheme, HomeRouteValuesAddressScheme>();
+    }
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            routes.MapDynamicControllerRoute<HomeRouteTransformer>("/");
-        }
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        routes.MapDynamicControllerRoute<HomeRouteTransformer>("/");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Drivers/HtmlBodyPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Html/Drivers/HtmlBodyPartDisplayDriver.cs
index 434b3a61442..0c5556a4e8e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Drivers/HtmlBodyPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Drivers/HtmlBodyPartDisplayDriver.cs
@@ -17,88 +17,87 @@
 using OrchardCore.Shortcodes.Services;
 using Shortcodes;
 
-namespace OrchardCore.Html.Drivers
+namespace OrchardCore.Html.Drivers;
+
+public sealed class HtmlBodyPartDisplayDriver : ContentPartDisplayDriver<HtmlBodyPart>
 {
-    public sealed class HtmlBodyPartDisplayDriver : ContentPartDisplayDriver<HtmlBodyPart>
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly IHtmlSanitizerService _htmlSanitizerService;
+    private readonly HtmlEncoder _htmlEncoder;
+    private readonly IShortcodeService _shortcodeService;
+
+    internal readonly IStringLocalizer S;
+
+    public HtmlBodyPartDisplayDriver(ILiquidTemplateManager liquidTemplateManager,
+        IHtmlSanitizerService htmlSanitizerService,
+        HtmlEncoder htmlEncoder,
+        IShortcodeService shortcodeService,
+        IStringLocalizer<HtmlBodyPartDisplayDriver> localizer)
     {
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly IHtmlSanitizerService _htmlSanitizerService;
-        private readonly HtmlEncoder _htmlEncoder;
-        private readonly IShortcodeService _shortcodeService;
+        _liquidTemplateManager = liquidTemplateManager;
+        _htmlSanitizerService = htmlSanitizerService;
+        _htmlEncoder = htmlEncoder;
+        _shortcodeService = shortcodeService;
+        S = localizer;
+    }
 
-        internal readonly IStringLocalizer S;
+    public override IDisplayResult Display(HtmlBodyPart HtmlBodyPart, BuildPartDisplayContext context)
+    {
+        return Initialize<HtmlBodyPartViewModel>(GetDisplayShapeType(context), m => BuildViewModelAsync(m, HtmlBodyPart, context))
+            .Location("Detail", "Content")
+            .Location("Summary", "Content");
+    }
 
-        public HtmlBodyPartDisplayDriver(ILiquidTemplateManager liquidTemplateManager,
-            IHtmlSanitizerService htmlSanitizerService,
-            HtmlEncoder htmlEncoder,
-            IShortcodeService shortcodeService,
-            IStringLocalizer<HtmlBodyPartDisplayDriver> localizer)
+    public override IDisplayResult Edit(HtmlBodyPart HtmlBodyPart, BuildPartEditorContext context)
+    {
+        return Initialize<HtmlBodyPartViewModel>(GetEditorShapeType(context), model =>
         {
-            _liquidTemplateManager = liquidTemplateManager;
-            _htmlSanitizerService = htmlSanitizerService;
-            _htmlEncoder = htmlEncoder;
-            _shortcodeService = shortcodeService;
-            S = localizer;
-        }
+            model.Html = HtmlBodyPart.Html;
+            model.ContentItem = HtmlBodyPart.ContentItem;
+            model.HtmlBodyPart = HtmlBodyPart;
+            model.TypePartDefinition = context.TypePartDefinition;
+        });
+    }
 
-        public override IDisplayResult Display(HtmlBodyPart HtmlBodyPart, BuildPartDisplayContext context)
-        {
-            return Initialize<HtmlBodyPartViewModel>(GetDisplayShapeType(context), m => BuildViewModelAsync(m, HtmlBodyPart, context))
-                .Location("Detail", "Content")
-                .Location("Summary", "Content");
-        }
+    public override async Task<IDisplayResult> UpdateAsync(HtmlBodyPart model, UpdatePartEditorContext context)
+    {
+        var viewModel = new HtmlBodyPartViewModel();
 
-        public override IDisplayResult Edit(HtmlBodyPart HtmlBodyPart, BuildPartEditorContext context)
+        var settings = context.TypePartDefinition.GetSettings<HtmlBodyPartSettings>();
+
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix, t => t.Html);
+
+        if (!string.IsNullOrEmpty(viewModel.Html) && !_liquidTemplateManager.Validate(viewModel.Html, out var errors))
         {
-            return Initialize<HtmlBodyPartViewModel>(GetEditorShapeType(context), model =>
-            {
-                model.Html = HtmlBodyPart.Html;
-                model.ContentItem = HtmlBodyPart.ContentItem;
-                model.HtmlBodyPart = HtmlBodyPart;
-                model.TypePartDefinition = context.TypePartDefinition;
-            });
+            var partName = context.TypePartDefinition.DisplayName();
+            context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
         }
-
-        public override async Task<IDisplayResult> UpdateAsync(HtmlBodyPart model, UpdatePartEditorContext context)
+        else
         {
-            var viewModel = new HtmlBodyPartViewModel();
-
-            var settings = context.TypePartDefinition.GetSettings<HtmlBodyPartSettings>();
-
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix, t => t.Html);
+            model.Html = settings.SanitizeHtml ? _htmlSanitizerService.Sanitize(viewModel.Html) : viewModel.Html;
+        }
 
-            if (!string.IsNullOrEmpty(viewModel.Html) && !_liquidTemplateManager.Validate(viewModel.Html, out var errors))
-            {
-                var partName = context.TypePartDefinition.DisplayName();
-                context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Html), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
-            }
-            else
-            {
-                model.Html = settings.SanitizeHtml ? _htmlSanitizerService.Sanitize(viewModel.Html) : viewModel.Html;
-            }
+        return Edit(model, context);
+    }
 
-            return Edit(model, context);
-        }
+    private async ValueTask BuildViewModelAsync(HtmlBodyPartViewModel model, HtmlBodyPart htmlBodyPart, BuildPartDisplayContext context)
+    {
+        model.Html = htmlBodyPart.Html;
+        model.HtmlBodyPart = htmlBodyPart;
+        model.ContentItem = htmlBodyPart.ContentItem;
+        var settings = context.TypePartDefinition.GetSettings<HtmlBodyPartSettings>();
 
-        private async ValueTask BuildViewModelAsync(HtmlBodyPartViewModel model, HtmlBodyPart htmlBodyPart, BuildPartDisplayContext context)
+        if (!settings.SanitizeHtml)
         {
-            model.Html = htmlBodyPart.Html;
-            model.HtmlBodyPart = htmlBodyPart;
-            model.ContentItem = htmlBodyPart.ContentItem;
-            var settings = context.TypePartDefinition.GetSettings<HtmlBodyPartSettings>();
+            model.Html = await _liquidTemplateManager.RenderStringAsync(htmlBodyPart.Html, _htmlEncoder, model,
+                new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(model.ContentItem) });
+        }
 
-            if (!settings.SanitizeHtml)
+        model.Html = await _shortcodeService.ProcessAsync(model.Html,
+            new Context
             {
-                model.Html = await _liquidTemplateManager.RenderStringAsync(htmlBodyPart.Html, _htmlEncoder, model,
-                    new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(model.ContentItem) });
-            }
-
-            model.Html = await _shortcodeService.ProcessAsync(model.Html,
-                new Context
-                {
-                    ["ContentItem"] = htmlBodyPart.ContentItem,
-                    ["TypePartDefinition"] = context.TypePartDefinition
-                });
-        }
+                ["ContentItem"] = htmlBodyPart.ContentItem,
+                ["TypePartDefinition"] = context.TypePartDefinition
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/GraphQL/HtmlBodyQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Html/GraphQL/HtmlBodyQueryObjectType.cs
index d5fe4dbf428..e9c15f47033 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/GraphQL/HtmlBodyQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/GraphQL/HtmlBodyQueryObjectType.cs
@@ -17,51 +17,50 @@
 using OrchardCore.Shortcodes.Services;
 using Shortcodes;
 
-namespace OrchardCore.Html.GraphQL
+namespace OrchardCore.Html.GraphQL;
+
+public class HtmlBodyQueryObjectType : ObjectGraphType<HtmlBodyPart>
 {
-    public class HtmlBodyQueryObjectType : ObjectGraphType<HtmlBodyPart>
+    public HtmlBodyQueryObjectType(IStringLocalizer<HtmlBodyQueryObjectType> S)
     {
-        public HtmlBodyQueryObjectType(IStringLocalizer<HtmlBodyQueryObjectType> S)
-        {
-            Name = "HtmlBodyPart";
-            Description = S["Content stored as HTML."];
+        Name = "HtmlBodyPart";
+        Description = S["Content stored as HTML."];
 
-            Field<StringGraphType>("html")
-                .Description(S["the HTML content"])
-                .ResolveLockedAsync(RenderHtml);
-        }
+        Field<StringGraphType>("html")
+            .Description(S["the HTML content"])
+            .ResolveLockedAsync(RenderHtml);
+    }
 
-        private static async ValueTask<object> RenderHtml(IResolveFieldContext<HtmlBodyPart> ctx)
-        {
-            var shortcodeService = ctx.RequestServices.GetRequiredService<IShortcodeService>();
-            var contentDefinitionManager = ctx.RequestServices.GetRequiredService<IContentDefinitionManager>();
+    private static async ValueTask<object> RenderHtml(IResolveFieldContext<HtmlBodyPart> ctx)
+    {
+        var shortcodeService = ctx.RequestServices.GetRequiredService<IShortcodeService>();
+        var contentDefinitionManager = ctx.RequestServices.GetRequiredService<IContentDefinitionManager>();
 
-            var contentTypeDefinition = await contentDefinitionManager.GetTypeDefinitionAsync(ctx.Source.ContentItem.ContentType);
-            var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, "HtmlBodyPart", StringComparison.Ordinal));
-            var settings = contentTypePartDefinition.GetSettings<HtmlBodyPartSettings>();
+        var contentTypeDefinition = await contentDefinitionManager.GetTypeDefinitionAsync(ctx.Source.ContentItem.ContentType);
+        var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, "HtmlBodyPart", StringComparison.Ordinal));
+        var settings = contentTypePartDefinition.GetSettings<HtmlBodyPartSettings>();
 
-            var html = ctx.Source.Html;
+        var html = ctx.Source.Html;
 
-            if (!settings.SanitizeHtml)
+        if (!settings.SanitizeHtml)
+        {
+            var model = new HtmlBodyPartViewModel()
             {
-                var model = new HtmlBodyPartViewModel()
-                {
-                    Html = ctx.Source.Html,
-                    HtmlBodyPart = ctx.Source,
-                    ContentItem = ctx.Source.ContentItem
-                };
-                var liquidTemplateManager = ctx.RequestServices.GetRequiredService<ILiquidTemplateManager>();
-                var htmlEncoder = ctx.RequestServices.GetService<HtmlEncoder>();
-
-                html = await liquidTemplateManager.RenderStringAsync(html, htmlEncoder, model, new Dictionary<string, FluidValue> { ["ContentItem"] = new ObjectValue(model.ContentItem) });
-            }
+                Html = ctx.Source.Html,
+                HtmlBodyPart = ctx.Source,
+                ContentItem = ctx.Source.ContentItem
+            };
+            var liquidTemplateManager = ctx.RequestServices.GetRequiredService<ILiquidTemplateManager>();
+            var htmlEncoder = ctx.RequestServices.GetService<HtmlEncoder>();
 
-            return await shortcodeService.ProcessAsync(html,
-                new Context
-                {
-                    ["ContentItem"] = ctx.Source.ContentItem,
-                    ["TypePartDefinition"] = contentTypePartDefinition
-                });
+            html = await liquidTemplateManager.RenderStringAsync(html, htmlEncoder, model, new Dictionary<string, FluidValue> { ["ContentItem"] = new ObjectValue(model.ContentItem) });
         }
+
+        return await shortcodeService.ProcessAsync(html,
+            new Context
+            {
+                ["ContentItem"] = ctx.Source.ContentItem,
+                ["TypePartDefinition"] = contentTypePartDefinition
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Html/GraphQL/Startup.cs
index 90975bd1226..c68de475b43 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/GraphQL/Startup.cs
@@ -3,14 +3,13 @@
 using OrchardCore.Html.Models;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Html.GraphQL
+namespace OrchardCore.Html.GraphQL;
+
+[RequireFeatures("OrchardCore.Apis.GraphQL")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Apis.GraphQL")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddObjectGraphType<HtmlBodyPart, HtmlBodyQueryObjectType>();
-        }
+        services.AddObjectGraphType<HtmlBodyPart, HtmlBodyQueryObjectType>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Handlers/HtmlBodyPartHandler.cs b/src/OrchardCore.Modules/OrchardCore.Html/Handlers/HtmlBodyPartHandler.cs
index 9783099a6cb..8c4a0beee35 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Handlers/HtmlBodyPartHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Handlers/HtmlBodyPartHandler.cs
@@ -15,65 +15,64 @@
 using OrchardCore.Shortcodes.Services;
 using Shortcodes;
 
-namespace OrchardCore.Html.Handlers
+namespace OrchardCore.Html.Handlers;
+
+public class HtmlBodyPartHandler : ContentPartHandler<HtmlBodyPart>
 {
-    public class HtmlBodyPartHandler : ContentPartHandler<HtmlBodyPart>
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IShortcodeService _shortcodeService;
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly HtmlEncoder _htmlEncoder;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IShortcodeService _shortcodeService;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly HtmlEncoder _htmlEncoder;
 
-        public HtmlBodyPartHandler(IContentDefinitionManager contentDefinitionManager,
-            IShortcodeService shortcodeService,
-            ILiquidTemplateManager liquidTemplateManager,
-            HtmlEncoder htmlEncoder)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _shortcodeService = shortcodeService;
-            _liquidTemplateManager = liquidTemplateManager;
-            _htmlEncoder = htmlEncoder;
-        }
+    public HtmlBodyPartHandler(IContentDefinitionManager contentDefinitionManager,
+        IShortcodeService shortcodeService,
+        ILiquidTemplateManager liquidTemplateManager,
+        HtmlEncoder htmlEncoder)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+        _shortcodeService = shortcodeService;
+        _liquidTemplateManager = liquidTemplateManager;
+        _htmlEncoder = htmlEncoder;
+    }
 
-        public override Task GetContentItemAspectAsync(ContentItemAspectContext context, HtmlBodyPart part)
+    public override Task GetContentItemAspectAsync(ContentItemAspectContext context, HtmlBodyPart part)
+    {
+        return context.ForAsync<BodyAspect>(async bodyAspect =>
         {
-            return context.ForAsync<BodyAspect>(async bodyAspect =>
+            try
             {
-                try
-                {
-                    var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(part.ContentItem.ContentType);
-                    var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, "HtmlBodyPart", StringComparison.Ordinal));
-                    var settings = contentTypePartDefinition.GetSettings<HtmlBodyPartSettings>();
+                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(part.ContentItem.ContentType);
+                var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, "HtmlBodyPart", StringComparison.Ordinal));
+                var settings = contentTypePartDefinition.GetSettings<HtmlBodyPartSettings>();
 
-                    var html = part.Html;
+                var html = part.Html;
 
-                    if (!settings.SanitizeHtml)
+                if (!settings.SanitizeHtml)
+                {
+                    var model = new HtmlBodyPartViewModel()
                     {
-                        var model = new HtmlBodyPartViewModel()
-                        {
-                            Html = part.Html,
-                            HtmlBodyPart = part,
-                            ContentItem = part.ContentItem,
-                        };
+                        Html = part.Html,
+                        HtmlBodyPart = part,
+                        ContentItem = part.ContentItem,
+                    };
 
-                        html = await _liquidTemplateManager.RenderStringAsync(html, _htmlEncoder, model,
-                            new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(model.ContentItem) });
-                    }
+                    html = await _liquidTemplateManager.RenderStringAsync(html, _htmlEncoder, model,
+                        new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(model.ContentItem) });
+                }
 
-                    html = await _shortcodeService.ProcessAsync(html,
-                        new Context
-                        {
-                            ["ContentItem"] = part.ContentItem,
-                            ["TypePartDefinition"] = contentTypePartDefinition
-                        });
+                html = await _shortcodeService.ProcessAsync(html,
+                    new Context
+                    {
+                        ["ContentItem"] = part.ContentItem,
+                        ["TypePartDefinition"] = contentTypePartDefinition
+                    });
 
-                    bodyAspect.Body = new HtmlString(html);
-                }
-                catch
-                {
-                    bodyAspect.Body = HtmlString.Empty;
-                }
-            });
-        }
+                bodyAspect.Body = new HtmlString(html);
+            }
+            catch
+            {
+                bodyAspect.Body = HtmlString.Empty;
+            }
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Indexing/HtmlBodyPartIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.Html/Indexing/HtmlBodyPartIndexHandler.cs
index 85dfdb996bf..98164cee31d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Indexing/HtmlBodyPartIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Indexing/HtmlBodyPartIndexHandler.cs
@@ -2,20 +2,19 @@
 using OrchardCore.Html.Models;
 using OrchardCore.Indexing;
 
-namespace OrchardCore.Html.Indexing
+namespace OrchardCore.Html.Indexing;
+
+public class HtmlBodyPartIndexHandler : ContentPartIndexHandler<HtmlBodyPart>
 {
-    public class HtmlBodyPartIndexHandler : ContentPartIndexHandler<HtmlBodyPart>
+    public override Task BuildIndexAsync(HtmlBodyPart part, BuildPartIndexContext context)
     {
-        public override Task BuildIndexAsync(HtmlBodyPart part, BuildPartIndexContext context)
-        {
-            var options = context.Settings.ToOptions() | DocumentIndexOptions.Sanitize;
-
-            foreach (var key in context.Keys)
-            {
-                context.DocumentIndex.Set(key, part.Html, options);
-            }
+        var options = context.Settings.ToOptions() | DocumentIndexOptions.Sanitize;
 
-            return Task.CompletedTask;
+        foreach (var key in context.Keys)
+        {
+            context.DocumentIndex.Set(key, part.Html, options);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Media/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Html/Media/Startup.cs
index 159abf93c68..13a487ed114 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Media/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Media/Startup.cs
@@ -2,14 +2,13 @@
 using OrchardCore.DisplayManagement.Descriptors;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Html.Media
+namespace OrchardCore.Html.Media;
+
+[RequireFeatures("OrchardCore.Media")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Media")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IShapeTableProvider, MediaShapes>();
-        }
+        services.AddScoped<IShapeTableProvider, MediaShapes>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Html/Migrations.cs
index a6d1f9255e0..9ec1207ed32 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Migrations.cs
@@ -11,141 +11,140 @@
 using OrchardCore.Html.Settings;
 using YesSql;
 
-namespace OrchardCore.Html
+namespace OrchardCore.Html;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
+    private readonly ISession _session;
+    private readonly ILogger _logger;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+
+    public Migrations(
+        IContentDefinitionManager contentDefinitionManager,
+        ISession session,
+        ILogger<Migrations> logger)
     {
-        private readonly ISession _session;
-        private readonly ILogger _logger;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-
-        public Migrations(
-            IContentDefinitionManager contentDefinitionManager,
-            ISession session,
-            ILogger<Migrations> logger)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _session = session;
-            _logger = logger;
-        }
+        _contentDefinitionManager = contentDefinitionManager;
+        _session = session;
+        _logger = logger;
+    }
 
-        public async Task<int> CreateAsync()
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync("HtmlBodyPart", builder => builder
-                .Attachable()
-                .WithDescription("Provides an HTML Body for your content item."));
+    public async Task<int> CreateAsync()
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync("HtmlBodyPart", builder => builder
+            .Attachable()
+            .WithDescription("Provides an HTML Body for your content item."));
 
-            // Shortcut other migration steps on new content definition schemas.
-            return 5;
-        }
+        // Shortcut other migration steps on new content definition schemas.
+        return 5;
+    }
 
-        // This code can be removed in a later version.
+    // This code can be removed in a later version.
 #pragma warning disable CA1822 // Mark members as static
-        public int UpdateFrom1()
-        {
-            return 2;
-        }
+    public int UpdateFrom1()
+    {
+        return 2;
+    }
 
-        // This code can be removed in a later version.
-        public int UpdateFrom2()
+    // This code can be removed in a later version.
+    public int UpdateFrom2()
 #pragma warning restore CA1822 // Mark members as static
-        {
-            return 3;
-        }
+    {
+        return 3;
+    }
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom3Async()
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom3Async()
+    {
+        // Update content type definitions
+        foreach (var contentType in await _contentDefinitionManager.LoadTypeDefinitionsAsync())
         {
-            // Update content type definitions
-            foreach (var contentType in await _contentDefinitionManager.LoadTypeDefinitionsAsync())
+            if (contentType.Parts.Any(x => x.PartDefinition.Name == "BodyPart"))
             {
-                if (contentType.Parts.Any(x => x.PartDefinition.Name == "BodyPart"))
-                {
-                    await _contentDefinitionManager.AlterTypeDefinitionAsync(contentType.Name, x => x.RemovePart("BodyPart").WithPart("HtmlBodyPart"));
-                }
+                await _contentDefinitionManager.AlterTypeDefinitionAsync(contentType.Name, x => x.RemovePart("BodyPart").WithPart("HtmlBodyPart"));
             }
+        }
 
-            await _contentDefinitionManager.DeletePartDefinitionAsync("BodyPart");
+        await _contentDefinitionManager.DeletePartDefinitionAsync("BodyPart");
 
-            // We are patching all content item versions by moving the Title to DisplayText
-            // This step doesn't need to be executed for a brand new site
+        // We are patching all content item versions by moving the Title to DisplayText
+        // This step doesn't need to be executed for a brand new site
 
-            var lastDocumentId = 0L;
+        var lastDocumentId = 0L;
 
-            for (; ; )
+        for (; ; )
+        {
+            var contentItemVersions = await _session.Query<ContentItem, ContentItemIndex>(x => x.DocumentId > lastDocumentId).Take(10).ListAsync();
+
+            if (!contentItemVersions.Any())
             {
-                var contentItemVersions = await _session.Query<ContentItem, ContentItemIndex>(x => x.DocumentId > lastDocumentId).Take(10).ListAsync();
+                // No more content item version to process
+                break;
+            }
 
-                if (!contentItemVersions.Any())
+            foreach (var contentItemVersion in contentItemVersions)
+            {
+                if (UpdateBody((JsonObject)contentItemVersion.Content))
                 {
-                    // No more content item version to process
-                    break;
+                    await _session.SaveAsync(contentItemVersion);
+                    _logger.LogInformation("A content item version's BodyPart was upgraded: {ContentItemVersionId}", contentItemVersion.ContentItemVersionId);
                 }
 
-                foreach (var contentItemVersion in contentItemVersions)
-                {
-                    if (UpdateBody((JsonObject)contentItemVersion.Content))
-                    {
-                        await _session.SaveAsync(contentItemVersion);
-                        _logger.LogInformation("A content item version's BodyPart was upgraded: {ContentItemVersionId}", contentItemVersion.ContentItemVersionId);
-                    }
+                lastDocumentId = contentItemVersion.Id;
+            }
 
-                    lastDocumentId = contentItemVersion.Id;
-                }
+            await _session.SaveChangesAsync();
+        }
 
-                await _session.SaveChangesAsync();
-            }
+        static bool UpdateBody(JsonNode content)
+        {
+            var changed = false;
 
-            static bool UpdateBody(JsonNode content)
+            if (content.GetValueKind() == JsonValueKind.Object)
             {
-                var changed = false;
+                var body = content["BodyPart"]?["Body"]?.Value<string>();
 
-                if (content.GetValueKind() == JsonValueKind.Object)
+                if (!string.IsNullOrWhiteSpace(body))
                 {
-                    var body = content["BodyPart"]?["Body"]?.Value<string>();
-
-                    if (!string.IsNullOrWhiteSpace(body))
-                    {
-                        content["HtmlBodyPart"] = new JsonObject() { ["Html"] = body };
-                        changed = true;
-                    }
-
-                    foreach (var node in content.AsObject())
-                    {
-                        changed = UpdateBody(node.Value) || changed;
-                    }
+                    content["HtmlBodyPart"] = new JsonObject() { ["Html"] = body };
+                    changed = true;
                 }
 
-                if (content.GetValueKind() == JsonValueKind.Array)
+                foreach (var node in content.AsObject())
                 {
-                    foreach (var node in content.AsArray())
-                    {
-                        changed = UpdateBody(node) || changed;
-                    }
+                    changed = UpdateBody(node.Value) || changed;
                 }
+            }
 
-                return changed;
+            if (content.GetValueKind() == JsonValueKind.Array)
+            {
+                foreach (var node in content.AsArray())
+                {
+                    changed = UpdateBody(node) || changed;
+                }
             }
 
-            return 4;
+            return changed;
         }
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom4Async()
+        return 4;
+    }
+
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom4Async()
+    {
+        // For backwards compatibility with liquid filters we disable html sanitization on existing field definitions.
+        foreach (var contentType in await _contentDefinitionManager.LoadTypeDefinitionsAsync())
         {
-            // For backwards compatibility with liquid filters we disable html sanitization on existing field definitions.
-            foreach (var contentType in await _contentDefinitionManager.LoadTypeDefinitionsAsync())
+            if (contentType.Parts.Any(x => x.PartDefinition.Name == "HtmlBodyPart"))
             {
-                if (contentType.Parts.Any(x => x.PartDefinition.Name == "HtmlBodyPart"))
+                await _contentDefinitionManager.AlterTypeDefinitionAsync(contentType.Name, x => x.WithPart("HtmlBodyPart", part =>
                 {
-                    await _contentDefinitionManager.AlterTypeDefinitionAsync(contentType.Name, x => x.WithPart("HtmlBodyPart", part =>
-                    {
-                        part.MergeSettings<HtmlBodyPartSettings>(x => x.SanitizeHtml = false);
-                    }));
-                }
+                    part.MergeSettings<HtmlBodyPartSettings>(x => x.SanitizeHtml = false);
+                }));
             }
-
-            return 5;
         }
+
+        return 5;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Models/HtmlBodyPart.cs b/src/OrchardCore.Modules/OrchardCore.Html/Models/HtmlBodyPart.cs
index 7adab182707..33e9b0c3bc3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Models/HtmlBodyPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Models/HtmlBodyPart.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Html.Models
+namespace OrchardCore.Html.Models;
+
+public class HtmlBodyPart : ContentPart
 {
-    public class HtmlBodyPart : ContentPart
-    {
-        public string Html { get; set; }
-    }
+    public string Html { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/RemotePublishing/HtmlBodyMetaWeblogDriver.cs b/src/OrchardCore.Modules/OrchardCore.Html/RemotePublishing/HtmlBodyMetaWeblogDriver.cs
index eef7f223ad9..32ce82557e3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/RemotePublishing/HtmlBodyMetaWeblogDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/RemotePublishing/HtmlBodyMetaWeblogDriver.cs
@@ -4,27 +4,26 @@
 using OrchardCore.XmlRpc;
 using OrchardCore.XmlRpc.Models;
 
-namespace OrchardCore.Html.RemotePublishing
+namespace OrchardCore.Html.RemotePublishing;
+
+public sealed class HtmlBodyMetaWeblogDriver : MetaWeblogDriver
 {
-    public sealed class HtmlBodyMetaWeblogDriver : MetaWeblogDriver
+    public override void BuildPost(XRpcStruct rpcStruct, XmlRpcContext context, ContentItem contentItem)
     {
-        public override void BuildPost(XRpcStruct rpcStruct, XmlRpcContext context, ContentItem contentItem)
+        var bodyPart = contentItem.As<HtmlBodyPart>();
+        if (bodyPart == null)
         {
-            var bodyPart = contentItem.As<HtmlBodyPart>();
-            if (bodyPart == null)
-            {
-                return;
-            }
-
-            rpcStruct.Set("description", bodyPart.Html);
+            return;
         }
 
-        public override void EditPost(XRpcStruct rpcStruct, ContentItem contentItem)
+        rpcStruct.Set("description", bodyPart.Html);
+    }
+
+    public override void EditPost(XRpcStruct rpcStruct, ContentItem contentItem)
+    {
+        if (contentItem.As<HtmlBodyPart>() != null)
         {
-            if (contentItem.As<HtmlBodyPart>() != null)
-            {
-                contentItem.Alter<HtmlBodyPart>(x => x.Html = rpcStruct.Optional<string>("description"));
-            }
+            contentItem.Alter<HtmlBodyPart>(x => x.Html = rpcStruct.Optional<string>("description"));
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/RemotePublishing/RemotePublishingStartup.cs b/src/OrchardCore.Modules/OrchardCore.Html/RemotePublishing/RemotePublishingStartup.cs
index aee88b66118..9c2900a878b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/RemotePublishing/RemotePublishingStartup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/RemotePublishing/RemotePublishingStartup.cs
@@ -2,14 +2,13 @@
 using OrchardCore.MetaWeblog;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Html.RemotePublishing
+namespace OrchardCore.Html.RemotePublishing;
+
+[RequireFeatures("OrchardCore.RemotePublishing")]
+public sealed class RemotePublishingStartup : StartupBase
 {
-    [RequireFeatures("OrchardCore.RemotePublishing")]
-    public sealed class RemotePublishingStartup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IMetaWeblogDriver, HtmlBodyMetaWeblogDriver>();
-        }
+        services.AddScoped<IMetaWeblogDriver, HtmlBodyMetaWeblogDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartMonacoEditorSettings.cs b/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartMonacoEditorSettings.cs
index 229a5f74688..5be82a479bc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartMonacoEditorSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartMonacoEditorSettings.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Html.Settings
+namespace OrchardCore.Html.Settings;
+
+public class HtmlBodyPartMonacoEditorSettings
 {
-    public class HtmlBodyPartMonacoEditorSettings
-    {
-        public string Options { get; set; }
-        public bool InsertMediaWithUrl { get; set; }
-        public bool AllowCustomScripts { get; set; }
-    }
+    public string Options { get; set; }
+    public bool InsertMediaWithUrl { get; set; }
+    public bool AllowCustomScripts { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartMonacoEditorSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartMonacoEditorSettingsDriver.cs
index 5ef86a0df24..93e656c73a6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartMonacoEditorSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartMonacoEditorSettingsDriver.cs
@@ -11,55 +11,54 @@
 using OrchardCore.Mvc.ModelBinding;
 using OrchardCore.Mvc.Utilities;
 
-namespace OrchardCore.Html.Settings
+namespace OrchardCore.Html.Settings;
+
+public sealed class HtmlBodyPartMonacoEditorSettingsDriver : ContentTypePartDefinitionDisplayDriver<HtmlBodyPart>
 {
-    public sealed class HtmlBodyPartMonacoEditorSettingsDriver : ContentTypePartDefinitionDisplayDriver<HtmlBodyPart>
-    {
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public HtmlBodyPartMonacoEditorSettingsDriver(IStringLocalizer<HtmlBodyPartMonacoEditorSettingsDriver> stringLocalizer)
-        {
-            S = stringLocalizer;
-        }
+    public HtmlBodyPartMonacoEditorSettingsDriver(IStringLocalizer<HtmlBodyPartMonacoEditorSettingsDriver> stringLocalizer)
+    {
+        S = stringLocalizer;
+    }
 
-        public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    {
+        return Initialize<MonacoSettingsViewModel>("HtmlBodyPartMonacoSettings_Edit", model =>
         {
-            return Initialize<MonacoSettingsViewModel>("HtmlBodyPartMonacoSettings_Edit", model =>
+            var settings = contentTypePartDefinition.GetSettings<HtmlBodyPartMonacoEditorSettings>();
+            if (string.IsNullOrWhiteSpace(settings.Options))
             {
-                var settings = contentTypePartDefinition.GetSettings<HtmlBodyPartMonacoEditorSettings>();
-                if (string.IsNullOrWhiteSpace(settings.Options))
-                {
-                    settings.Options = JConvert.SerializeObject(new { automaticLayout = true, language = "html" }, JOptions.Indented);
-                }
-                model.Options = settings.Options;
-            }).Location("Editor");
-        }
+                settings.Options = JConvert.SerializeObject(new { automaticLayout = true, language = "html" }, JOptions.Indented);
+            }
+            model.Options = settings.Options;
+        }).Location("Editor");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    {
+        if (contentTypePartDefinition.Editor() == "Monaco")
         {
-            if (contentTypePartDefinition.Editor() == "Monaco")
-            {
-                var model = new MonacoSettingsViewModel();
+            var model = new MonacoSettingsViewModel();
 
-                await context.Updater.TryUpdateModelAsync(model, Prefix);
+            await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-                if (!model.Options.IsJson())
-                {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(model.Options), S["The options are written in an incorrect format."]);
-                }
-                else
+            if (!model.Options.IsJson())
+            {
+                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Options), S["The options are written in an incorrect format."]);
+            }
+            else
+            {
+                var jsonSettings = JObject.Parse(model.Options);
+                jsonSettings["language"] = "html";
+                var settings = new HtmlBodyPartMonacoEditorSettings
                 {
-                    var jsonSettings = JObject.Parse(model.Options);
-                    jsonSettings["language"] = "html";
-                    var settings = new HtmlBodyPartMonacoEditorSettings
-                    {
-                        Options = jsonSettings.ToString()
-                    };
-                    context.Builder.WithSettings(settings);
-                }
+                    Options = jsonSettings.ToString()
+                };
+                context.Builder.WithSettings(settings);
             }
-
-            return Edit(contentTypePartDefinition, context);
         }
+
+        return Edit(contentTypePartDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartSettings.cs b/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartSettings.cs
index 3b0b3036971..145a0c9e430 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartSettings.cs
@@ -1,14 +1,13 @@
 using System.ComponentModel;
 
-namespace OrchardCore.Html.Settings
+namespace OrchardCore.Html.Settings;
+
+public class HtmlBodyPartSettings
 {
-    public class HtmlBodyPartSettings
-    {
-        /// <summary>
-        /// Whether to sanitize the html input.
-        /// When true liquid templating is disabled.
-        /// </summary>
-        [DefaultValue(true)]
-        public bool SanitizeHtml { get; set; } = true;
-    }
+    /// <summary>
+    /// Whether to sanitize the html input.
+    /// When true liquid templating is disabled.
+    /// </summary>
+    [DefaultValue(true)]
+    public bool SanitizeHtml { get; set; } = true;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartSettingsDisplayDriver.cs
index c842c0610b0..f47193b4d87 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartSettingsDisplayDriver.cs
@@ -6,32 +6,31 @@
 using OrchardCore.Html.Models;
 using OrchardCore.Html.ViewModels;
 
-namespace OrchardCore.Html.Settings
+namespace OrchardCore.Html.Settings;
+
+public sealed class HtmlBodyPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<HtmlBodyPart>
 {
-    public sealed class HtmlBodyPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<HtmlBodyPart>
+    public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+        return Initialize<HtmlBodyPartSettingsViewModel>("HtmlBodyPartSettings_Edit", model =>
         {
-            return Initialize<HtmlBodyPartSettingsViewModel>("HtmlBodyPartSettings_Edit", model =>
-            {
-                var settings = contentTypePartDefinition.GetSettings<HtmlBodyPartSettings>();
+            var settings = contentTypePartDefinition.GetSettings<HtmlBodyPartSettings>();
 
-                model.SanitizeHtml = settings.SanitizeHtml;
-            }).Location("Content:20");
-        }
+            model.SanitizeHtml = settings.SanitizeHtml;
+        }).Location("Content:20");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
-        {
-            var model = new HtmlBodyPartSettingsViewModel();
-            var settings = new HtmlBodyPartSettings();
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    {
+        var model = new HtmlBodyPartSettingsViewModel();
+        var settings = new HtmlBodyPartSettings();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            settings.SanitizeHtml = model.SanitizeHtml;
+        settings.SanitizeHtml = model.SanitizeHtml;
 
-            context.Builder.WithSettings(settings);
+        context.Builder.WithSettings(settings);
 
-            return Edit(contentTypePartDefinition, context);
-        }
+        return Edit(contentTypePartDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartTrumbowygEditorSettings.cs b/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartTrumbowygEditorSettings.cs
index 81d4d40a2aa..9e610193822 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartTrumbowygEditorSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartTrumbowygEditorSettings.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Html.Settings
+namespace OrchardCore.Html.Settings;
+
+public class HtmlBodyPartTrumbowygEditorSettings
 {
-    public class HtmlBodyPartTrumbowygEditorSettings
-    {
-        public string Options { get; set; }
-        public bool InsertMediaWithUrl { get; set; }
-        public bool AllowCustomScripts { get; set; }
-    }
+    public string Options { get; set; }
+    public bool InsertMediaWithUrl { get; set; }
+    public bool AllowCustomScripts { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartTrumbowygEditorSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartTrumbowygEditorSettingsDriver.cs
index b785efa9cc2..2dbd1165d3f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartTrumbowygEditorSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Settings/HtmlBodyPartTrumbowygEditorSettingsDriver.cs
@@ -10,64 +10,63 @@
 using OrchardCore.Html.ViewModels;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Html.Settings
+namespace OrchardCore.Html.Settings;
+
+public sealed class HtmlBodyPartTrumbowygEditorSettingsDriver : ContentTypePartDefinitionDisplayDriver<HtmlBodyPart>
 {
-    public sealed class HtmlBodyPartTrumbowygEditorSettingsDriver : ContentTypePartDefinitionDisplayDriver<HtmlBodyPart>
+    internal readonly IStringLocalizer S;
+
+    public HtmlBodyPartTrumbowygEditorSettingsDriver(IStringLocalizer<HtmlBodyPartTrumbowygEditorSettingsDriver> stringLocalizer)
     {
-        internal readonly IStringLocalizer S;
+        S = stringLocalizer;
+    }
 
-        public HtmlBodyPartTrumbowygEditorSettingsDriver(IStringLocalizer<HtmlBodyPartTrumbowygEditorSettingsDriver> stringLocalizer)
+    public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    {
+        return Initialize<TrumbowygSettingsViewModel>("HtmlBodyPartTrumbowygSettings_Edit", model =>
         {
-            S = stringLocalizer;
-        }
+            var settings = contentTypePartDefinition.GetSettings<HtmlBodyPartTrumbowygEditorSettings>();
 
-        public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+            model.Options = settings.Options;
+            model.InsertMediaWithUrl = settings.InsertMediaWithUrl;
+        }).Location("Editor");
+    }
+
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    {
+        if (contentTypePartDefinition.Editor() == "Trumbowyg")
         {
-            return Initialize<TrumbowygSettingsViewModel>("HtmlBodyPartTrumbowygSettings_Edit", model =>
-            {
-                var settings = contentTypePartDefinition.GetSettings<HtmlBodyPartTrumbowygEditorSettings>();
+            var model = new TrumbowygSettingsViewModel();
 
-                model.Options = settings.Options;
-                model.InsertMediaWithUrl = settings.InsertMediaWithUrl;
-            }).Location("Editor");
-        }
+            await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
-        {
-            if (contentTypePartDefinition.Editor() == "Trumbowyg")
+            try
             {
-                var model = new TrumbowygSettingsViewModel();
+                var options = model.Options.Trim();
 
-                await context.Updater.TryUpdateModelAsync(model, Prefix);
-
-                try
+                if (!options.StartsWith('{') || !options.EndsWith('}'))
                 {
-                    var options = model.Options.Trim();
-
-                    if (!options.StartsWith('{') || !options.EndsWith('}'))
-                    {
-                        throw new Exception();
-                    }
-
-                    var parser = new Parser();
+                    throw new Exception();
+                }
 
-                    var optionsScript = parser.ParseScript("var config = " + options);
+                var parser = new Parser();
 
-                    var settings = new HtmlBodyPartTrumbowygEditorSettings
-                    {
-                        InsertMediaWithUrl = model.InsertMediaWithUrl,
-                        Options = options
-                    };
+                var optionsScript = parser.ParseScript("var config = " + options);
 
-                    context.Builder.WithSettings(settings);
-                }
-                catch
+                var settings = new HtmlBodyPartTrumbowygEditorSettings
                 {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(model.Options), S["The options are written in an incorrect format."]);
-                }
-            }
+                    InsertMediaWithUrl = model.InsertMediaWithUrl,
+                    Options = options
+                };
 
-            return Edit(contentTypePartDefinition, context);
+                context.Builder.WithSettings(settings);
+            }
+            catch
+            {
+                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Options), S["The options are written in an incorrect format."]);
+            }
         }
+
+        return Edit(contentTypePartDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Html/Startup.cs
index 85cccb9d76e..68aca87d76d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Startup.cs
@@ -13,24 +13,23 @@
 using OrchardCore.Indexing;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Html
+namespace OrchardCore.Html;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.Configure<TemplateOptions>(o => o.MemberAccessStrategy.Register<HtmlBodyPartViewModel>());
+        services.Configure<TemplateOptions>(o => o.MemberAccessStrategy.Register<HtmlBodyPartViewModel>());
 
-            // Body Part
-            services.AddContentPart<HtmlBodyPart>()
-                .UseDisplayDriver<HtmlBodyPartDisplayDriver>()
-                .AddHandler<HtmlBodyPartHandler>();
+        // Body Part
+        services.AddContentPart<HtmlBodyPart>()
+            .UseDisplayDriver<HtmlBodyPartDisplayDriver>()
+            .AddHandler<HtmlBodyPartHandler>();
 
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, HtmlBodyPartSettingsDisplayDriver>();
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, HtmlBodyPartTrumbowygEditorSettingsDriver>();
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, HtmlBodyPartMonacoEditorSettingsDriver>();
-            services.AddDataMigration<Migrations>();
-            services.AddScoped<IContentPartIndexHandler, HtmlBodyPartIndexHandler>();
-        }
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, HtmlBodyPartSettingsDisplayDriver>();
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, HtmlBodyPartTrumbowygEditorSettingsDriver>();
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, HtmlBodyPartMonacoEditorSettingsDriver>();
+        services.AddDataMigration<Migrations>();
+        services.AddScoped<IContentPartIndexHandler, HtmlBodyPartIndexHandler>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/ViewModels/HtmlBodyPartSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Html/ViewModels/HtmlBodyPartSettingsViewModel.cs
index b7f3c9a45a5..10b2d1282bb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/ViewModels/HtmlBodyPartSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/ViewModels/HtmlBodyPartSettingsViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Html.ViewModels
+namespace OrchardCore.Html.ViewModels;
+
+public class HtmlBodyPartSettingsViewModel
 {
-    public class HtmlBodyPartSettingsViewModel
-    {
-        public bool SanitizeHtml { get; set; }
-    }
+    public bool SanitizeHtml { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/ViewModels/HtmlBodyPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Html/ViewModels/HtmlBodyPartViewModel.cs
index 64004b5cc11..127af1b3750 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/ViewModels/HtmlBodyPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/ViewModels/HtmlBodyPartViewModel.cs
@@ -3,19 +3,18 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Html.Models;
 
-namespace OrchardCore.Html.ViewModels
+namespace OrchardCore.Html.ViewModels;
+
+public class HtmlBodyPartViewModel
 {
-    public class HtmlBodyPartViewModel
-    {
-        public string Html { get; set; }
+    public string Html { get; set; }
 
-        [BindNever]
-        public ContentItem ContentItem { get; set; }
+    [BindNever]
+    public ContentItem ContentItem { get; set; }
 
-        [BindNever]
-        public HtmlBodyPart HtmlBodyPart { get; set; }
+    [BindNever]
+    public HtmlBodyPart HtmlBodyPart { get; set; }
 
-        [BindNever]
-        public ContentTypePartDefinition TypePartDefinition { get; set; }
-    }
+    [BindNever]
+    public ContentTypePartDefinition TypePartDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/ViewModels/MonacoSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Html/ViewModels/MonacoSettingsViewModel.cs
index dcd99e0bb27..98dc856ce1d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/ViewModels/MonacoSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/ViewModels/MonacoSettingsViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Html.ViewModels
+namespace OrchardCore.Html.ViewModels;
+
+public class MonacoSettingsViewModel
 {
-    public class MonacoSettingsViewModel
-    {
-        public string Options { get; set; }
-    }
+    public string Options { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/ViewModels/TrumbowygSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Html/ViewModels/TrumbowygSettingsViewModel.cs
index e870b65fac1..0277e328ec1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/ViewModels/TrumbowygSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Html/ViewModels/TrumbowygSettingsViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Html.ViewModels
+namespace OrchardCore.Html.ViewModels;
+
+public class TrumbowygSettingsViewModel
 {
-    public class TrumbowygSettingsViewModel
-    {
-        public string Options { get; set; }
-        public bool InsertMediaWithUrl { get; set; }
-    }
+    public string Options { get; set; }
+    public bool InsertMediaWithUrl { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Https/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Https/AdminMenu.cs
index 2419a177872..e9ac16d2de3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Https/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Https/AdminMenu.cs
@@ -4,42 +4,41 @@
 using OrchardCore.Https.Drivers;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Https
+namespace OrchardCore.Https;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", HttpsSettingsDisplayDriver.GroupId },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", HttpsSettingsDisplayDriver.GroupId },
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
-        {
-            S = localizer;
-        }
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            builder
-                .Add(S["Security"], security => security
-                    .Add(S["Settings"], settings => settings
-                        .Add(S["HTTPS"], S["HTTPS"].PrefixPosition(), https => https
-                            .Action("Index", "Admin", _routeValues)
-                            .Permission(Permissions.ManageHttps)
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Security"], security => security
+                .Add(S["Settings"], settings => settings
+                    .Add(S["HTTPS"], S["HTTPS"].PrefixPosition(), https => https
+                        .Action("Index", "Admin", _routeValues)
+                        .Permission(Permissions.ManageHttps)
+                        .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Https/Drivers/HttpsSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Https/Drivers/HttpsSettingsDisplayDriver.cs
index 0cbefdfb4e1..784e1bc3707 100644
--- a/src/OrchardCore.Modules/OrchardCore.Https/Drivers/HttpsSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Https/Drivers/HttpsSettingsDisplayDriver.cs
@@ -11,86 +11,85 @@
 using OrchardCore.Https.ViewModels;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Https.Drivers
+namespace OrchardCore.Https.Drivers;
+
+public sealed class HttpsSettingsDisplayDriver : SiteDisplayDriver<HttpsSettings>
 {
-    public sealed class HttpsSettingsDisplayDriver : SiteDisplayDriver<HttpsSettings>
-    {
-        public const string GroupId = "Https";
+    public const string GroupId = "Https";
+
+    private readonly IShellReleaseManager _shellReleaseManager;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly INotifier _notifier;
 
-        private readonly IShellReleaseManager _shellReleaseManager;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly INotifier _notifier;
+    internal readonly IHtmlLocalizer H;
 
-        internal readonly IHtmlLocalizer H;
+    public HttpsSettingsDisplayDriver(
+        IShellReleaseManager shellReleaseManager,
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService,
+        INotifier notifier,
+        IHtmlLocalizer<HttpsSettingsDisplayDriver> htmlLocalizer)
+    {
+        _shellReleaseManager = shellReleaseManager;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+        _notifier = notifier;
+        H = htmlLocalizer;
+    }
+    protected override string SettingsGroupId
+        => GroupId;
 
-        public HttpsSettingsDisplayDriver(
-            IShellReleaseManager shellReleaseManager,
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService,
-            INotifier notifier,
-            IHtmlLocalizer<HttpsSettingsDisplayDriver> htmlLocalizer)
+    public override async Task<IDisplayResult> EditAsync(ISite site, HttpsSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageHttps))
         {
-            _shellReleaseManager = shellReleaseManager;
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-            _notifier = notifier;
-            H = htmlLocalizer;
+            return null;
         }
-        protected override string SettingsGroupId
-            => GroupId;
 
-        public override async Task<IDisplayResult> EditAsync(ISite site, HttpsSettings settings, BuildEditorContext context)
+        context.AddTenantReloadWarningWrapper();
+
+        return Initialize<HttpsSettingsViewModel>("HttpsSettings_Edit", async model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageHttps))
+            var isHttpsRequest = _httpContextAccessor.HttpContext.Request.IsHttps;
+
+            if (!isHttpsRequest)
             {
-                return null;
+                await _notifier.WarningAsync(H["For safety, Enabling require HTTPS over HTTP has been prevented."]);
             }
 
-            context.AddTenantReloadWarningWrapper();
-
-            return Initialize<HttpsSettingsViewModel>("HttpsSettings_Edit", async model =>
-            {
-                var isHttpsRequest = _httpContextAccessor.HttpContext.Request.IsHttps;
-
-                if (!isHttpsRequest)
-                {
-                    await _notifier.WarningAsync(H["For safety, Enabling require HTTPS over HTTP has been prevented."]);
-                }
-
-                model.EnableStrictTransportSecurity = settings.EnableStrictTransportSecurity;
-                model.IsHttpsRequest = isHttpsRequest;
-                model.RequireHttps = settings.RequireHttps;
-                model.RequireHttpsPermanent = settings.RequireHttpsPermanent;
-                model.SslPort = settings.SslPort ??
-                                (isHttpsRequest && !settings.RequireHttps
-                                    ? _httpContextAccessor.HttpContext.Request.Host.Port
-                                    : null);
-            }).Location("Content:2")
-            .OnGroup(GroupId);
-        }
+            model.EnableStrictTransportSecurity = settings.EnableStrictTransportSecurity;
+            model.IsHttpsRequest = isHttpsRequest;
+            model.RequireHttps = settings.RequireHttps;
+            model.RequireHttpsPermanent = settings.RequireHttpsPermanent;
+            model.SslPort = settings.SslPort ??
+                            (isHttpsRequest && !settings.RequireHttps
+                                ? _httpContextAccessor.HttpContext.Request.Host.Port
+                                : null);
+        }).Location("Content:2")
+        .OnGroup(GroupId);
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, HttpsSettings settings, UpdateEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, HttpsSettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageHttps))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageHttps))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var model = new HttpsSettingsViewModel();
+        var model = new HttpsSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            settings.EnableStrictTransportSecurity = model.EnableStrictTransportSecurity;
-            settings.RequireHttps = model.RequireHttps;
-            settings.RequireHttpsPermanent = model.RequireHttpsPermanent;
-            settings.SslPort = model.SslPort;
+        settings.EnableStrictTransportSecurity = model.EnableStrictTransportSecurity;
+        settings.RequireHttps = model.RequireHttps;
+        settings.RequireHttpsPermanent = model.RequireHttpsPermanent;
+        settings.SslPort = model.SslPort;
 
-            _shellReleaseManager.RequestRelease();
+        _shellReleaseManager.RequestRelease();
 
-            return await EditAsync(site, settings, context);
-        }
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Https/Services/HttpsService.cs b/src/OrchardCore.Modules/OrchardCore.Https/Services/HttpsService.cs
index cc12eec7fa2..370edc5eabb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Https/Services/HttpsService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Https/Services/HttpsService.cs
@@ -2,18 +2,17 @@
 using OrchardCore.Https.Settings;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Https.Services
-{
-    public class HttpsService : IHttpsService
-    {
-        private readonly ISiteService _siteService;
+namespace OrchardCore.Https.Services;
 
-        public HttpsService(ISiteService siteService)
-        {
-            _siteService = siteService;
-        }
+public class HttpsService : IHttpsService
+{
+    private readonly ISiteService _siteService;
 
-        public Task<HttpsSettings> GetSettingsAsync()
-            => _siteService.GetSettingsAsync<HttpsSettings>();
+    public HttpsService(ISiteService siteService)
+    {
+        _siteService = siteService;
     }
+
+    public Task<HttpsSettings> GetSettingsAsync()
+        => _siteService.GetSettingsAsync<HttpsSettings>();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Https/Services/IHttpsService.cs b/src/OrchardCore.Modules/OrchardCore.Https/Services/IHttpsService.cs
index eecc62f311d..8b675597812 100644
--- a/src/OrchardCore.Modules/OrchardCore.Https/Services/IHttpsService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Https/Services/IHttpsService.cs
@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
 using OrchardCore.Https.Settings;
 
-namespace OrchardCore.Https.Services
+namespace OrchardCore.Https.Services;
+
+public interface IHttpsService
 {
-    public interface IHttpsService
-    {
-        Task<HttpsSettings> GetSettingsAsync();
-    }
+    Task<HttpsSettings> GetSettingsAsync();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Https/Settings/HttpsSettings.cs b/src/OrchardCore.Modules/OrchardCore.Https/Settings/HttpsSettings.cs
index 6563938c725..5440291fe4b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Https/Settings/HttpsSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Https/Settings/HttpsSettings.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.Https.Settings
+namespace OrchardCore.Https.Settings;
+
+public class HttpsSettings
 {
-    public class HttpsSettings
-    {
-        public bool EnableStrictTransportSecurity { get; set; }
-        public bool RequireHttps { get; set; }
-        public bool RequireHttpsPermanent { get; set; }
-        public int? SslPort { get; set; }
-    }
+    public bool EnableStrictTransportSecurity { get; set; }
+    public bool RequireHttps { get; set; }
+    public bool RequireHttpsPermanent { get; set; }
+    public int? SslPort { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Https/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Https/Startup.cs
index 45e926e42d7..ddd66a87173 100644
--- a/src/OrchardCore.Modules/OrchardCore.Https/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Https/Startup.cs
@@ -15,60 +15,59 @@
 using OrchardCore.Settings;
 using OrchardCore.Settings.Deployment;
 
-namespace OrchardCore.Https
+namespace OrchardCore.Https;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override async ValueTask ConfigureAsync(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
     {
-        public override async ValueTask ConfigureAsync(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+        var httpsService = serviceProvider.GetRequiredService<IHttpsService>();
+        var settings = await httpsService.GetSettingsAsync();
+        if (settings.RequireHttps)
         {
-            var httpsService = serviceProvider.GetRequiredService<IHttpsService>();
-            var settings = await httpsService.GetSettingsAsync();
-            if (settings.RequireHttps)
-            {
-                app.UseHttpsRedirection();
-            }
-
-            if (settings.EnableStrictTransportSecurity)
-            {
-                app.UseHsts();
-            }
+            app.UseHttpsRedirection();
         }
 
-        public override void ConfigureServices(IServiceCollection services)
+        if (settings.EnableStrictTransportSecurity)
         {
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IDisplayDriver<ISite>, HttpsSettingsDisplayDriver>();
-            services.AddSingleton<IHttpsService, HttpsService>();
-
-            services.AddScoped<IPermissionProvider, Permissions>();
+            app.UseHsts();
+        }
+    }
 
-            services.AddOptions<HttpsRedirectionOptions>()
-                .Configure<IHttpsService>((options, service) =>
-                {
-                    var settings = service.GetSettingsAsync().GetAwaiter().GetResult();
-                    if (settings.RequireHttpsPermanent)
-                    {
-                        options.RedirectStatusCode = StatusCodes.Status308PermanentRedirect;
-                    }
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IDisplayDriver<ISite>, HttpsSettingsDisplayDriver>();
+        services.AddSingleton<IHttpsService, HttpsService>();
 
-                    options.HttpsPort = settings.SslPort;
-                });
+        services.AddScoped<IPermissionProvider, Permissions>();
 
-            services.AddHsts(options =>
+        services.AddOptions<HttpsRedirectionOptions>()
+            .Configure<IHttpsService>((options, service) =>
             {
-                options.Preload = false;
-                options.IncludeSubDomains = true;
-                options.MaxAge = TimeSpan.FromDays(365);
+                var settings = service.GetSettingsAsync().GetAwaiter().GetResult();
+                if (settings.RequireHttpsPermanent)
+                {
+                    options.RedirectStatusCode = StatusCodes.Status308PermanentRedirect;
+                }
+
+                options.HttpsPort = settings.SslPort;
             });
-        }
+
+        services.AddHsts(options =>
+        {
+            options.Preload = false;
+            options.IncludeSubDomains = true;
+            options.MaxAge = TimeSpan.FromDays(365);
+        });
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class DeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class DeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSiteSettingsPropertyDeploymentStep<HttpsSettings, DeploymentStartup>(S => S["Https settings"], S => S["Exports the Https settings."]);
-        }
+        services.AddSiteSettingsPropertyDeploymentStep<HttpsSettings, DeploymentStartup>(S => S["Https settings"], S => S["Exports the Https settings."]);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Https/ViewModels/HttpsSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Https/ViewModels/HttpsSettingsViewModel.cs
index 09d86304a42..56969293838 100644
--- a/src/OrchardCore.Modules/OrchardCore.Https/ViewModels/HttpsSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Https/ViewModels/HttpsSettingsViewModel.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.Https.ViewModels
+namespace OrchardCore.Https.ViewModels;
+
+public class HttpsSettingsViewModel
 {
-    public class HttpsSettingsViewModel
-    {
-        public bool IsHttpsRequest { get; set; }
-        public bool EnableStrictTransportSecurity { get; set; }
-        public bool RequireHttps { get; set; }
-        public bool RequireHttpsPermanent { get; set; }
-        public int? SslPort { get; set; }
-    }
+    public bool IsHttpsRequest { get; set; }
+    public bool EnableStrictTransportSecurity { get; set; }
+    public bool RequireHttps { get; set; }
+    public bool RequireHttpsPermanent { get; set; }
+    public int? SslPort { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Indexing/CreateIndexingTaskContentHandler.cs b/src/OrchardCore.Modules/OrchardCore.Indexing/CreateIndexingTaskContentHandler.cs
index 30fc2388995..5321f392b2b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Indexing/CreateIndexingTaskContentHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Indexing/CreateIndexingTaskContentHandler.cs
@@ -1,40 +1,39 @@
 using System.Threading.Tasks;
 using OrchardCore.ContentManagement.Handlers;
 
-namespace OrchardCore.Indexing
+namespace OrchardCore.Indexing;
+
+public class CreateIndexingTaskContentHandler : ContentHandlerBase
 {
-    public class CreateIndexingTaskContentHandler : ContentHandlerBase
+    private readonly IIndexingTaskManager _indexingTaskManager;
+
+    public CreateIndexingTaskContentHandler(IIndexingTaskManager indexingTaskManager)
     {
-        private readonly IIndexingTaskManager _indexingTaskManager;
+        _indexingTaskManager = indexingTaskManager;
+    }
 
-        public CreateIndexingTaskContentHandler(IIndexingTaskManager indexingTaskManager)
-        {
-            _indexingTaskManager = indexingTaskManager;
-        }
+    public override Task UpdatedAsync(UpdateContentContext context)
+    {
+        return _indexingTaskManager.CreateTaskAsync(context.ContentItem, IndexingTaskTypes.Update);
+    }
 
-        public override Task UpdatedAsync(UpdateContentContext context)
-        {
-            return _indexingTaskManager.CreateTaskAsync(context.ContentItem, IndexingTaskTypes.Update);
-        }
+    public override Task CreatedAsync(CreateContentContext context)
+    {
+        return _indexingTaskManager.CreateTaskAsync(context.ContentItem, IndexingTaskTypes.Update);
+    }
 
-        public override Task CreatedAsync(CreateContentContext context)
-        {
-            return _indexingTaskManager.CreateTaskAsync(context.ContentItem, IndexingTaskTypes.Update);
-        }
+    public override Task PublishedAsync(PublishContentContext context)
+    {
+        return _indexingTaskManager.CreateTaskAsync(context.ContentItem, IndexingTaskTypes.Update);
+    }
 
-        public override Task PublishedAsync(PublishContentContext context)
+    public override Task RemovedAsync(RemoveContentContext context)
+    {
+        if (context.NoActiveVersionLeft)
         {
-            return _indexingTaskManager.CreateTaskAsync(context.ContentItem, IndexingTaskTypes.Update);
+            return _indexingTaskManager.CreateTaskAsync(context.ContentItem, IndexingTaskTypes.Delete);
         }
 
-        public override Task RemovedAsync(RemoveContentContext context)
-        {
-            if (context.NoActiveVersionLeft)
-            {
-                return _indexingTaskManager.CreateTaskAsync(context.ContentItem, IndexingTaskTypes.Delete);
-            }
-
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Indexing/IndexingTaskManager.cs b/src/OrchardCore.Modules/OrchardCore.Indexing/IndexingTaskManager.cs
index 1acb5cba94e..1be70c31716 100644
--- a/src/OrchardCore.Modules/OrchardCore.Indexing/IndexingTaskManager.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Indexing/IndexingTaskManager.cs
@@ -14,178 +14,177 @@
 using OrchardCore.Modules;
 using YesSql;
 
-namespace OrchardCore.Indexing.Services
+namespace OrchardCore.Indexing.Services;
+
+/// <summary>
+/// This is a scoped service that enlists tasks to be stored in the database.
+/// It enlists a final task using the current <see cref="ShellScope"/> such
+/// that multiple calls to <see cref="CreateTaskAsync"/> can be done without incurring
+/// a SQL query on every single one.
+/// </summary>
+public class IndexingTaskManager : IIndexingTaskManager
 {
-    /// <summary>
-    /// This is a scoped service that enlists tasks to be stored in the database.
-    /// It enlists a final task using the current <see cref="ShellScope"/> such
-    /// that multiple calls to <see cref="CreateTaskAsync"/> can be done without incurring
-    /// a SQL query on every single one.
-    /// </summary>
-    public class IndexingTaskManager : IIndexingTaskManager
+    private readonly IClock _clock;
+    private readonly IStore _store;
+    private readonly IDbConnectionAccessor _dbConnectionAccessor;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly ILogger _logger;
+
+    private readonly List<IndexingTask> _tasksQueue = [];
+
+    public IndexingTaskManager(
+        IClock clock,
+        IStore store,
+        IDbConnectionAccessor dbConnectionAccessor,
+        IHttpContextAccessor httpContextAccessor,
+        ILogger<IndexingTaskManager> logger)
     {
-        private readonly IClock _clock;
-        private readonly IStore _store;
-        private readonly IDbConnectionAccessor _dbConnectionAccessor;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly ILogger _logger;
-
-        private readonly List<IndexingTask> _tasksQueue = [];
-
-        public IndexingTaskManager(
-            IClock clock,
-            IStore store,
-            IDbConnectionAccessor dbConnectionAccessor,
-            IHttpContextAccessor httpContextAccessor,
-            ILogger<IndexingTaskManager> logger)
+        _clock = clock;
+        _store = store;
+        _dbConnectionAccessor = dbConnectionAccessor;
+        _httpContextAccessor = httpContextAccessor;
+        _logger = logger;
+    }
+
+    public Task CreateTaskAsync(ContentItem contentItem, IndexingTaskTypes type)
+    {
+        ArgumentNullException.ThrowIfNull(contentItem);
+
+        // Do not index a preview content item.
+        if (_httpContextAccessor.HttpContext?.Features.Get<ContentPreviewFeature>()?.Previewing == true)
         {
-            _clock = clock;
-            _store = store;
-            _dbConnectionAccessor = dbConnectionAccessor;
-            _httpContextAccessor = httpContextAccessor;
-            _logger = logger;
+            return Task.CompletedTask;
         }
 
-        public Task CreateTaskAsync(ContentItem contentItem, IndexingTaskTypes type)
+        if (contentItem.Id == 0)
         {
-            ArgumentNullException.ThrowIfNull(contentItem);
-
-            // Do not index a preview content item.
-            if (_httpContextAccessor.HttpContext?.Features.Get<ContentPreviewFeature>()?.Previewing == true)
-            {
-                return Task.CompletedTask;
-            }
+            // Ignore that case, when Update is called on a content item which has not be "created" yet.
+            return Task.CompletedTask;
+        }
 
-            if (contentItem.Id == 0)
-            {
-                // Ignore that case, when Update is called on a content item which has not be "created" yet.
-                return Task.CompletedTask;
-            }
+        var indexingTask = new IndexingTask
+        {
+            CreatedUtc = _clock.UtcNow,
+            ContentItemId = contentItem.ContentItemId,
+            Type = type
+        };
 
-            var indexingTask = new IndexingTask
-            {
-                CreatedUtc = _clock.UtcNow,
-                ContentItemId = contentItem.ContentItemId,
-                Type = type
-            };
+        if (_tasksQueue.Count == 0)
+        {
+            var tasksQueue = _tasksQueue;
 
-            if (_tasksQueue.Count == 0)
-            {
-                var tasksQueue = _tasksQueue;
+            // Using a local var prevents the lambda from holding a ref on this scoped service.
+            ShellScope.AddDeferredTask(scope => FlushAsync(scope, tasksQueue));
+        }
 
-                // Using a local var prevents the lambda from holding a ref on this scoped service.
-                ShellScope.AddDeferredTask(scope => FlushAsync(scope, tasksQueue));
-            }
+        _tasksQueue.Add(indexingTask);
 
-            _tasksQueue.Add(indexingTask);
+        return Task.CompletedTask;
+    }
 
-            return Task.CompletedTask;
-        }
+    private async Task FlushAsync(ShellScope scope, IEnumerable<IndexingTask> tasks)
+    {
+        var localQueue = new List<IndexingTask>(tasks);
 
-        private async Task FlushAsync(ShellScope scope, IEnumerable<IndexingTask> tasks)
-        {
-            var localQueue = new List<IndexingTask>(tasks);
+        var serviceProvider = scope.ServiceProvider;
 
-            var serviceProvider = scope.ServiceProvider;
+        var session = serviceProvider.GetService<YesSql.ISession>();
+        var dbConnectionAccessor = serviceProvider.GetService<IDbConnectionAccessor>();
+        var shellSettings = serviceProvider.GetService<ShellSettings>();
+        var logger = serviceProvider.GetService<ILogger<IndexingTaskManager>>();
 
-            var session = serviceProvider.GetService<YesSql.ISession>();
-            var dbConnectionAccessor = serviceProvider.GetService<IDbConnectionAccessor>();
-            var shellSettings = serviceProvider.GetService<ShellSettings>();
-            var logger = serviceProvider.GetService<ILogger<IndexingTaskManager>>();
+        var contentItemIds = new HashSet<string>();
 
-            var contentItemIds = new HashSet<string>();
+        // Remove duplicate tasks, only keep the last one.
+        for (var i = localQueue.Count; i > 0; i--)
+        {
+            var task = localQueue[i - 1];
 
-            // Remove duplicate tasks, only keep the last one.
-            for (var i = localQueue.Count; i > 0; i--)
+            if (contentItemIds.Contains(task.ContentItemId))
             {
-                var task = localQueue[i - 1];
-
-                if (contentItemIds.Contains(task.ContentItemId))
-                {
-                    localQueue.RemoveAt(i - 1);
-                }
-                else
-                {
-                    contentItemIds.Add(task.ContentItemId);
-                }
+                localQueue.RemoveAt(i - 1);
             }
-
-            // At this point, content items ids should be unique in localQueue.
-            var ids = localQueue.Select(x => x.ContentItemId).ToArray();
-            var table = $"{session.Store.Configuration.TablePrefix}{nameof(IndexingTask)}";
-
-            if (logger.IsEnabled(LogLevel.Debug))
+            else
             {
-                logger.LogDebug("Updating indexing tasks: {ContentItemIds}", string.Join(", ", tasks.Select(x => x.ContentItemId)));
+                contentItemIds.Add(task.ContentItemId);
             }
+        }
 
-            await using var connection = dbConnectionAccessor.CreateConnection();
-            await connection.OpenAsync();
-
-            using var transaction = await connection.BeginTransactionAsync(session.Store.Configuration.IsolationLevel);
-            var dialect = session.Store.Configuration.SqlDialect;
+        // At this point, content items ids should be unique in localQueue.
+        var ids = localQueue.Select(x => x.ContentItemId).ToArray();
+        var table = $"{session.Store.Configuration.TablePrefix}{nameof(IndexingTask)}";
 
-            try
-            {
-                // Page delete statements to prevent the limits from IN sql statements.
-                var pageSize = 100;
+        if (logger.IsEnabled(LogLevel.Debug))
+        {
+            logger.LogDebug("Updating indexing tasks: {ContentItemIds}", string.Join(", ", tasks.Select(x => x.ContentItemId)));
+        }
 
-                var deleteCmd = $"delete from {dialect.QuoteForTableName(table, _store.Configuration.Schema)} where {dialect.QuoteForColumnName("ContentItemId")} {dialect.InOperator("@Ids")};";
+        await using var connection = dbConnectionAccessor.CreateConnection();
+        await connection.OpenAsync();
 
-                do
-                {
-                    var pageOfIds = ids.Take(pageSize).ToArray();
+        using var transaction = await connection.BeginTransactionAsync(session.Store.Configuration.IsolationLevel);
+        var dialect = session.Store.Configuration.SqlDialect;
 
-                    if (pageOfIds.Length > 0)
-                    {
-                        await transaction.Connection.ExecuteAsync(deleteCmd, new { Ids = pageOfIds }, transaction);
-                        ids = ids.Skip(pageSize).ToArray();
-                    }
-                } while (ids.Length > 0);
+        try
+        {
+            // Page delete statements to prevent the limits from IN sql statements.
+            var pageSize = 100;
 
-                var insertCmd = $"insert into {dialect.QuoteForTableName(table, _store.Configuration.Schema)} ({dialect.QuoteForColumnName("CreatedUtc")}, {dialect.QuoteForColumnName("ContentItemId")}, {dialect.QuoteForColumnName("Type")}) values (@CreatedUtc, @ContentItemId, @Type);";
-                await transaction.Connection.ExecuteAsync(insertCmd, localQueue, transaction);
+            var deleteCmd = $"delete from {dialect.QuoteForTableName(table, _store.Configuration.Schema)} where {dialect.QuoteForColumnName("ContentItemId")} {dialect.InOperator("@Ids")};";
 
-                await transaction.CommitAsync();
-            }
-            catch (Exception e)
+            do
             {
-                await transaction.RollbackAsync();
-                logger.LogError(e, "An error occurred while updating indexing tasks");
+                var pageOfIds = ids.Take(pageSize).ToArray();
 
-                throw;
-            }
-        }
+                if (pageOfIds.Length > 0)
+                {
+                    await transaction.Connection.ExecuteAsync(deleteCmd, new { Ids = pageOfIds }, transaction);
+                    ids = ids.Skip(pageSize).ToArray();
+                }
+            } while (ids.Length > 0);
 
-        public async Task<IEnumerable<IndexingTask>> GetIndexingTasksAsync(long afterTaskId, int count)
+            var insertCmd = $"insert into {dialect.QuoteForTableName(table, _store.Configuration.Schema)} ({dialect.QuoteForColumnName("CreatedUtc")}, {dialect.QuoteForColumnName("ContentItemId")}, {dialect.QuoteForColumnName("Type")}) values (@CreatedUtc, @ContentItemId, @Type);";
+            await transaction.Connection.ExecuteAsync(insertCmd, localQueue, transaction);
+
+            await transaction.CommitAsync();
+        }
+        catch (Exception e)
         {
-            await using var connection = _dbConnectionAccessor.CreateConnection();
-            await connection.OpenAsync();
+            await transaction.RollbackAsync();
+            logger.LogError(e, "An error occurred while updating indexing tasks");
 
-            try
-            {
-                var dialect = _store.Configuration.SqlDialect;
-                var sqlBuilder = dialect.CreateBuilder(_store.Configuration.TablePrefix);
+            throw;
+        }
+    }
 
-                sqlBuilder.Select();
-                sqlBuilder.Table(nameof(IndexingTask), alias: null, _store.Configuration.Schema);
-                sqlBuilder.Selector("*");
+    public async Task<IEnumerable<IndexingTask>> GetIndexingTasksAsync(long afterTaskId, int count)
+    {
+        await using var connection = _dbConnectionAccessor.CreateConnection();
+        await connection.OpenAsync();
 
-                if (count > 0)
-                {
-                    sqlBuilder.Take(count.ToString());
-                }
+        try
+        {
+            var dialect = _store.Configuration.SqlDialect;
+            var sqlBuilder = dialect.CreateBuilder(_store.Configuration.TablePrefix);
 
-                sqlBuilder.WhereAnd($"{dialect.QuoteForColumnName("Id")} > @Id");
-                sqlBuilder.OrderBy($"{dialect.QuoteForColumnName("Id")}");
+            sqlBuilder.Select();
+            sqlBuilder.Table(nameof(IndexingTask), alias: null, _store.Configuration.Schema);
+            sqlBuilder.Selector("*");
 
-                return await connection.QueryAsync<IndexingTask>(sqlBuilder.ToSqlString(), new { Id = afterTaskId });
-            }
-            catch (Exception e)
+            if (count > 0)
             {
-                _logger.LogError(e, "An error occurred while reading indexing tasks");
-                throw;
+                sqlBuilder.Take(count.ToString());
             }
+
+            sqlBuilder.WhereAnd($"{dialect.QuoteForColumnName("Id")} > @Id");
+            sqlBuilder.OrderBy($"{dialect.QuoteForColumnName("Id")}");
+
+            return await connection.QueryAsync<IndexingTask>(sqlBuilder.ToSqlString(), new { Id = afterTaskId });
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "An error occurred while reading indexing tasks");
+            throw;
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Indexing/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Indexing/Migrations.cs
index 35aa91ae942..9aebd428970 100644
--- a/src/OrchardCore.Modules/OrchardCore.Indexing/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Indexing/Migrations.cs
@@ -2,24 +2,23 @@
 using System.Threading.Tasks;
 using OrchardCore.Data.Migration;
 
-namespace OrchardCore.Indexing
+namespace OrchardCore.Indexing;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
+    public async Task<int> CreateAsync()
     {
-        public async Task<int> CreateAsync()
-        {
-            await SchemaBuilder.CreateTableAsync(nameof(IndexingTask), table => table
-                .Column<int>("Id", col => col.PrimaryKey().Identity())
-                .Column<string>("ContentItemId", c => c.WithLength(26))
-                .Column<DateTime>("CreatedUtc", col => col.NotNull())
-                .Column<int>("Type")
-            );
+        await SchemaBuilder.CreateTableAsync(nameof(IndexingTask), table => table
+            .Column<int>("Id", col => col.PrimaryKey().Identity())
+            .Column<string>("ContentItemId", c => c.WithLength(26))
+            .Column<DateTime>("CreatedUtc", col => col.NotNull())
+            .Column<int>("Type")
+        );
 
-            await SchemaBuilder.AlterTableAsync(nameof(IndexingTask), table => table
-                .CreateIndex("IDX_IndexingTask_ContentItemId", "ContentItemId")
-            );
+        await SchemaBuilder.AlterTableAsync(nameof(IndexingTask), table => table
+            .CreateIndex("IDX_IndexingTask_ContentItemId", "ContentItemId")
+        );
 
-            return 1;
-        }
+        return 1;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Indexing/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Indexing/Startup.cs
index e244b55efef..555f883ec4d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Indexing/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Indexing/Startup.cs
@@ -4,18 +4,17 @@
 using OrchardCore.Indexing.Services;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Indexing
+namespace OrchardCore.Indexing;
+
+/// <summary>
+/// These services are registered on the tenant service collection.
+/// </summary>
+public sealed class Startup : StartupBase
 {
-    /// <summary>
-    /// These services are registered on the tenant service collection.
-    /// </summary>
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IIndexingTaskManager, IndexingTaskManager>();
-            services.AddScoped<IContentHandler, CreateIndexingTaskContentHandler>();
-            services.AddDataMigration<Migrations>();
-        }
+        services.AddScoped<IIndexingTaskManager, IndexingTaskManager>();
+        services.AddScoped<IContentHandler, CreateIndexingTaskContentHandler>();
+        services.AddDataMigration<Migrations>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Layers/AdminMenu.cs
index 5ac1f743e95..0b3668be0ea 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/AdminMenu.cs
@@ -4,47 +4,46 @@
 using OrchardCore.Layers.Drivers;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Layers
+namespace OrchardCore.Layers;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", LayerSiteSettingsDisplayDriver.GroupId },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", LayerSiteSettingsDisplayDriver.GroupId },
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
-        {
-            S = localizer;
-        }
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            builder
-                .Add(S["Design"], design => design
-                    .Add(S["Settings"], settings => settings
-                        .Add(S["Zones"], S["Zones"].PrefixPosition(), zones => zones
-                            .Action("Index", "Admin", _routeValues)
-                            .Permission(Permissions.ManageLayers)
-                            .LocalNav()
-                        )
-                    )
-                    .Add(S["Widgets"], S["Widgets"].PrefixPosition(), widgets => widgets
+        builder
+            .Add(S["Design"], design => design
+                .Add(S["Settings"], settings => settings
+                    .Add(S["Zones"], S["Zones"].PrefixPosition(), zones => zones
+                        .Action("Index", "Admin", _routeValues)
                         .Permission(Permissions.ManageLayers)
-                        .Action("Index", "Admin", "OrchardCore.Layers")
                         .LocalNav()
                     )
-                );
+                )
+                .Add(S["Widgets"], S["Widgets"].PrefixPosition(), widgets => widgets
+                    .Permission(Permissions.ManageLayers)
+                    .Action("Index", "Admin", "OrchardCore.Layers")
+                    .LocalNav()
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Controllers/AdminController.cs
index 98df4a0f18e..d1b2d49d48d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Controllers/AdminController.cs
@@ -25,343 +25,342 @@
 using OrchardCore.Settings;
 using YesSql;
 
-namespace OrchardCore.Layers.Controllers
+namespace OrchardCore.Layers.Controllers;
+
+[Admin("Layers/{action}/{id?}", "Layers.{action}")]
+public class AdminController : Controller
 {
-    [Admin("Layers/{action}/{id?}", "Layers.{action}")]
-    public class AdminController : Controller
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentManager _contentManager;
+    private readonly IContentItemDisplayManager _contentItemDisplayManager;
+    private readonly ISiteService _siteService;
+    private readonly ILayerService _layerService;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly ISession _session;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly IVolatileDocumentManager<LayerState> _layerStateManager;
+    private readonly IDisplayManager<Condition> _conditionDisplayManager;
+    private readonly IDisplayManager<Rule> _ruleDisplayManager;
+    private readonly IConditionIdGenerator _conditionIdGenerator;
+    private readonly IEnumerable<IConditionFactory> _conditionFactories;
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+    private readonly INotifier _notifier;
+    private readonly ILogger _logger;
+
+    public AdminController(
+        IContentDefinitionManager contentDefinitionManager,
+        IContentManager contentManager,
+        IContentItemDisplayManager contentItemDisplayManager,
+        ISiteService siteService,
+        ILayerService layerService,
+        IAuthorizationService authorizationService,
+        ISession session,
+        IUpdateModelAccessor updateModelAccessor,
+        IVolatileDocumentManager<LayerState> layerStateManager,
+        IDisplayManager<Condition> conditionDisplayManager,
+        IDisplayManager<Rule> ruleDisplayManager,
+        IConditionIdGenerator conditionIdGenerator,
+        IEnumerable<IConditionFactory> conditionFactories,
+        IStringLocalizer<AdminController> stringLocalizer,
+        IHtmlLocalizer<AdminController> htmlLocalizer,
+        INotifier notifier,
+        ILogger<AdminController> logger)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IContentManager _contentManager;
-        private readonly IContentItemDisplayManager _contentItemDisplayManager;
-        private readonly ISiteService _siteService;
-        private readonly ILayerService _layerService;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly ISession _session;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly IVolatileDocumentManager<LayerState> _layerStateManager;
-        private readonly IDisplayManager<Condition> _conditionDisplayManager;
-        private readonly IDisplayManager<Rule> _ruleDisplayManager;
-        private readonly IConditionIdGenerator _conditionIdGenerator;
-        private readonly IEnumerable<IConditionFactory> _conditionFactories;
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-        private readonly INotifier _notifier;
-        private readonly ILogger _logger;
-
-        public AdminController(
-            IContentDefinitionManager contentDefinitionManager,
-            IContentManager contentManager,
-            IContentItemDisplayManager contentItemDisplayManager,
-            ISiteService siteService,
-            ILayerService layerService,
-            IAuthorizationService authorizationService,
-            ISession session,
-            IUpdateModelAccessor updateModelAccessor,
-            IVolatileDocumentManager<LayerState> layerStateManager,
-            IDisplayManager<Condition> conditionDisplayManager,
-            IDisplayManager<Rule> ruleDisplayManager,
-            IConditionIdGenerator conditionIdGenerator,
-            IEnumerable<IConditionFactory> conditionFactories,
-            IStringLocalizer<AdminController> stringLocalizer,
-            IHtmlLocalizer<AdminController> htmlLocalizer,
-            INotifier notifier,
-            ILogger<AdminController> logger)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _contentManager = contentManager;
-            _contentItemDisplayManager = contentItemDisplayManager;
-            _siteService = siteService;
-            _layerService = layerService;
-            _authorizationService = authorizationService;
-            _session = session;
-            _updateModelAccessor = updateModelAccessor;
-            _layerStateManager = layerStateManager;
-            _conditionDisplayManager = conditionDisplayManager;
-            _ruleDisplayManager = ruleDisplayManager;
-            _conditionIdGenerator = conditionIdGenerator;
-            _conditionFactories = conditionFactories;
-            _notifier = notifier;
-            S = stringLocalizer;
-            H = htmlLocalizer;
-            _logger = logger;
-        }
+        _contentDefinitionManager = contentDefinitionManager;
+        _contentManager = contentManager;
+        _contentItemDisplayManager = contentItemDisplayManager;
+        _siteService = siteService;
+        _layerService = layerService;
+        _authorizationService = authorizationService;
+        _session = session;
+        _updateModelAccessor = updateModelAccessor;
+        _layerStateManager = layerStateManager;
+        _conditionDisplayManager = conditionDisplayManager;
+        _ruleDisplayManager = ruleDisplayManager;
+        _conditionIdGenerator = conditionIdGenerator;
+        _conditionFactories = conditionFactories;
+        _notifier = notifier;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+        _logger = logger;
+    }
 
-        [Admin("Layers", "Layers.Index")]
-        public async Task<IActionResult> Index()
+    [Admin("Layers", "Layers.Index")]
+    public async Task<IActionResult> Index()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
-            {
-                return Forbid();
-            }
-
-            var layers = await _layerService.GetLayersAsync();
-            var widgets = await _layerService.GetLayerWidgetsMetadataAsync(c => c.Latest == true);
-
-            var model = new LayersIndexViewModel { Layers = layers.Layers.ToList() };
-
-            var contentDefinitions = await _contentDefinitionManager.ListTypeDefinitionsAsync();
+            return Forbid();
+        }
 
-            model.Zones = (await _siteService.GetSettingsAsync<LayerSettings>()).Zones ?? [];
-            model.Widgets = [];
+        var layers = await _layerService.GetLayersAsync();
+        var widgets = await _layerService.GetLayerWidgetsMetadataAsync(c => c.Latest == true);
 
-            foreach (var widget in widgets.OrderBy(x => x.Position))
-            {
-                var zone = widget.Zone;
-                List<dynamic> list;
-                if (!model.Widgets.TryGetValue(zone, out list))
-                {
-                    model.Widgets.Add(zone, list = []);
-                }
+        var model = new LayersIndexViewModel { Layers = layers.Layers.ToList() };
 
-                if (contentDefinitions.Any(c => c.Name == widget.ContentItem.ContentType))
-                {
-                    list.Add(await _contentItemDisplayManager.BuildDisplayAsync(widget.ContentItem, _updateModelAccessor.ModelUpdater, "SummaryAdmin"));
-                }
-                else
-                {
-                    _logger.LogWarning("The Widget content item with id {ContentItemId} has no matching {ContentType} content type definition.", widget.ContentItem.ContentItemId, widget.ContentItem.ContentType);
-                    await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", widget.ContentItem.ContentItemId, widget.ContentItem.ContentType]);
-                }
-            }
+        var contentDefinitions = await _contentDefinitionManager.ListTypeDefinitionsAsync();
 
-            return View(model);
-        }
+        model.Zones = (await _siteService.GetSettingsAsync<LayerSettings>()).Zones ?? [];
+        model.Widgets = [];
 
-        [HttpPost]
-        public async Task<IActionResult> Index(LayersIndexViewModel model)
+        foreach (var widget in widgets.OrderBy(x => x.Position))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
+            var zone = widget.Zone;
+            List<dynamic> list;
+            if (!model.Widgets.TryGetValue(zone, out list))
             {
-                return Forbid();
+                model.Widgets.Add(zone, list = []);
             }
 
-            return RedirectToAction(nameof(Index));
-        }
-
-        public async Task<IActionResult> Create()
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
+            if (contentDefinitions.Any(c => c.Name == widget.ContentItem.ContentType))
             {
-                return Forbid();
+                list.Add(await _contentItemDisplayManager.BuildDisplayAsync(widget.ContentItem, _updateModelAccessor.ModelUpdater, "SummaryAdmin"));
             }
-
-            return View();
-        }
-
-        [HttpPost, ActionName("Create")]
-        public async Task<IActionResult> CreatePost(LayerEditViewModel model)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
+            else
             {
-                return Forbid();
+                _logger.LogWarning("The Widget content item with id {ContentItemId} has no matching {ContentType} content type definition.", widget.ContentItem.ContentItemId, widget.ContentItem.ContentType);
+                await _notifier.WarningAsync(H["The Widget content item with id {0} has no matching {1} content type definition.", widget.ContentItem.ContentItemId, widget.ContentItem.ContentType]);
             }
+        }
 
-            var layers = await _layerService.LoadLayersAsync();
-
-            ValidateViewModel(model, layers, isNew: true);
-
-            if (ModelState.IsValid)
-            {
-                var layer = new Layer
-                {
-                    Name = model.Name,
-                    Description = model.Description,
-                    LayerRule = new Rule(),
-                };
-
-                _conditionIdGenerator.GenerateUniqueId(layer.LayerRule);
-
-                layers.Layers.Add(layer);
+        return View(model);
+    }
 
-                await _layerService.UpdateAsync(layers);
+    [HttpPost]
+    public async Task<IActionResult> Index(LayersIndexViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
+        {
+            return Forbid();
+        }
 
-                return RedirectToAction(nameof(Index));
-            }
+        return RedirectToAction(nameof(Index));
+    }
 
-            return View(model);
+    public async Task<IActionResult> Create()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
+        {
+            return Forbid();
         }
 
-        public async Task<IActionResult> Edit(string name)
+        return View();
+    }
+
+    [HttpPost, ActionName("Create")]
+    public async Task<IActionResult> CreatePost(LayerEditViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var layers = await _layerService.GetLayersAsync();
+        var layers = await _layerService.LoadLayersAsync();
 
-            var layer = layers.Layers.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.Ordinal));
+        ValidateViewModel(model, layers, isNew: true);
 
-            if (layer == null)
+        if (ModelState.IsValid)
+        {
+            var layer = new Layer
             {
-                return NotFound();
-            }
+                Name = model.Name,
+                Description = model.Description,
+                LayerRule = new Rule(),
+            };
 
-            var rule = await _ruleDisplayManager.BuildDisplayAsync(layer.LayerRule, _updateModelAccessor.ModelUpdater, "Summary");
-            rule.Properties["ConditionId"] = layer.LayerRule.ConditionId;
+            _conditionIdGenerator.GenerateUniqueId(layer.LayerRule);
 
-            var thumbnails = new Dictionary<string, dynamic>();
-            foreach (var factory in _conditionFactories)
-            {
-                var condition = factory.Create();
-                var thumbnail = await _conditionDisplayManager.BuildDisplayAsync(condition, _updateModelAccessor.ModelUpdater, "Thumbnail");
-                thumbnail.Properties["Condition"] = condition;
-                thumbnail.Properties["TargetUrl"] = Url.ActionLink("Create", "LayerRule", new { name, type = factory.Name });
-                thumbnails.Add(factory.Name, thumbnail);
-            }
+            layers.Layers.Add(layer);
 
-            var model = new LayerEditViewModel
-            {
-                Name = layer.Name,
-                Description = layer.Description,
-                LayerRule = rule,
-                Thumbnails = thumbnails,
-            };
+            await _layerService.UpdateAsync(layers);
 
-            return View(model);
+            return RedirectToAction(nameof(Index));
         }
 
-        [HttpPost, ActionName("Edit")]
-        public async Task<IActionResult> EditPost(LayerEditViewModel model)
+        return View(model);
+    }
+
+    public async Task<IActionResult> Edit(string name)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var layers = await _layerService.LoadLayersAsync();
+        var layers = await _layerService.GetLayersAsync();
 
-            ValidateViewModel(model, layers, isNew: false);
+        var layer = layers.Layers.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.Ordinal));
 
-            if (ModelState.IsValid)
-            {
-                var layer = layers.Layers.FirstOrDefault(x => string.Equals(x.Name, model.Name, StringComparison.Ordinal));
+        if (layer == null)
+        {
+            return NotFound();
+        }
 
-                if (layer == null)
-                {
-                    return NotFound();
-                }
+        var rule = await _ruleDisplayManager.BuildDisplayAsync(layer.LayerRule, _updateModelAccessor.ModelUpdater, "Summary");
+        rule.Properties["ConditionId"] = layer.LayerRule.ConditionId;
 
-                layer.Name = model.Name;
-                layer.Description = model.Description;
+        var thumbnails = new Dictionary<string, dynamic>();
+        foreach (var factory in _conditionFactories)
+        {
+            var condition = factory.Create();
+            var thumbnail = await _conditionDisplayManager.BuildDisplayAsync(condition, _updateModelAccessor.ModelUpdater, "Thumbnail");
+            thumbnail.Properties["Condition"] = condition;
+            thumbnail.Properties["TargetUrl"] = Url.ActionLink("Create", "LayerRule", new { name, type = factory.Name });
+            thumbnails.Add(factory.Name, thumbnail);
+        }
 
-                await _layerService.UpdateAsync(layers);
+        var model = new LayerEditViewModel
+        {
+            Name = layer.Name,
+            Description = layer.Description,
+            LayerRule = rule,
+            Thumbnails = thumbnails,
+        };
 
-                return RedirectToAction(nameof(Index));
-            }
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost, ActionName("Edit")]
+    public async Task<IActionResult> EditPost(LayerEditViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(string name)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
-            {
-                return Forbid();
-            }
+        var layers = await _layerService.LoadLayersAsync();
 
-            var layers = await _layerService.LoadLayersAsync();
+        ValidateViewModel(model, layers, isNew: false);
 
-            var layer = layers.Layers.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.Ordinal));
+        if (ModelState.IsValid)
+        {
+            var layer = layers.Layers.FirstOrDefault(x => string.Equals(x.Name, model.Name, StringComparison.Ordinal));
 
             if (layer == null)
             {
                 return NotFound();
             }
 
-            var widgets = await _layerService.GetLayerWidgetsMetadataAsync(c => c.Latest == true);
+            layer.Name = model.Name;
+            layer.Description = model.Description;
 
-            if (!widgets.Any(x => string.Equals(x.Layer, name, StringComparison.OrdinalIgnoreCase)))
-            {
-                layers.Layers.Remove(layer);
-                await _layerService.UpdateAsync(layers);
-                await _notifier.SuccessAsync(H["Layer deleted successfully."]);
-            }
-            else
-            {
-                await _notifier.ErrorAsync(H["The layer couldn't be deleted: you must remove any associated widgets first."]);
-            }
+            await _layerService.UpdateAsync(layers);
 
             return RedirectToAction(nameof(Index));
         }
 
-        [HttpPost]
-        public async Task<IActionResult> UpdatePosition(string contentItemId, double position, string zone)
+        return View(model);
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Delete(string name)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
-            {
-                return Unauthorized();
-            }
+            return Forbid();
+        }
 
-            // Load the latest version first if any
-            var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
+        var layers = await _layerService.LoadLayersAsync();
 
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
+        var layer = layers.Layers.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.Ordinal));
 
-            var layerMetadata = contentItem.As<LayerMetadata>();
+        if (layer == null)
+        {
+            return NotFound();
+        }
 
-            if (layerMetadata == null)
-            {
-                return Forbid();
-            }
+        var widgets = await _layerService.GetLayerWidgetsMetadataAsync(c => c.Latest == true);
 
-            layerMetadata.Position = position;
-            layerMetadata.Zone = zone;
+        if (!widgets.Any(x => string.Equals(x.Layer, name, StringComparison.OrdinalIgnoreCase)))
+        {
+            layers.Layers.Remove(layer);
+            await _layerService.UpdateAsync(layers);
+            await _notifier.SuccessAsync(H["Layer deleted successfully."]);
+        }
+        else
+        {
+            await _notifier.ErrorAsync(H["The layer couldn't be deleted: you must remove any associated widgets first."]);
+        }
 
-            contentItem.Apply(layerMetadata);
+        return RedirectToAction(nameof(Index));
+    }
 
-            await _session.SaveAsync(contentItem);
+    [HttpPost]
+    public async Task<IActionResult> UpdatePosition(string contentItemId, double position, string zone)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
+        {
+            return Unauthorized();
+        }
 
-            // In case the moved contentItem is the draft for a published contentItem we update it's position too.
-            // We do that because we want the position of published and draft version to be the same.
-            if (contentItem.IsPublished() == false)
-            {
-                var publishedContentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Published);
-                if (publishedContentItem != null)
-                {
-                    layerMetadata = contentItem.As<LayerMetadata>();
+        // Load the latest version first if any
+        var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
 
-                    if (layerMetadata == null)
-                    {
-                        return Forbid();
-                    }
+        if (contentItem == null)
+        {
+            return NotFound();
+        }
 
-                    layerMetadata.Position = position;
-                    layerMetadata.Zone = zone;
+        var layerMetadata = contentItem.As<LayerMetadata>();
 
-                    publishedContentItem.Apply(layerMetadata);
+        if (layerMetadata == null)
+        {
+            return Forbid();
+        }
 
-                    await _session.SaveAsync(publishedContentItem);
-                }
-            }
+        layerMetadata.Position = position;
+        layerMetadata.Zone = zone;
 
-            // The state will be updated once the ambient session is committed.
-            await _layerStateManager.UpdateAsync(new LayerState());
+        contentItem.Apply(layerMetadata);
 
-            if (Request.Headers != null && Request.Headers.XRequestedWith == "XMLHttpRequest")
-            {
-                return Ok();
-            }
-            else
+        await _session.SaveAsync(contentItem);
+
+        // In case the moved contentItem is the draft for a published contentItem we update it's position too.
+        // We do that because we want the position of published and draft version to be the same.
+        if (contentItem.IsPublished() == false)
+        {
+            var publishedContentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Published);
+            if (publishedContentItem != null)
             {
-                return RedirectToAction(nameof(Index));
+                layerMetadata = contentItem.As<LayerMetadata>();
+
+                if (layerMetadata == null)
+                {
+                    return Forbid();
+                }
+
+                layerMetadata.Position = position;
+                layerMetadata.Zone = zone;
+
+                publishedContentItem.Apply(layerMetadata);
+
+                await _session.SaveAsync(publishedContentItem);
             }
         }
 
-        private void ValidateViewModel(LayerEditViewModel model, LayersDocument layers, bool isNew)
+        // The state will be updated once the ambient session is committed.
+        await _layerStateManager.UpdateAsync(new LayerState());
+
+        if (Request.Headers != null && Request.Headers.XRequestedWith == "XMLHttpRequest")
         {
-            if (string.IsNullOrWhiteSpace(model.Name))
-            {
-                ModelState.AddModelError(nameof(LayerEditViewModel.Name), S["The layer name is required."]);
-            }
-            else if (isNew && layers.Layers.Any(x => string.Equals(x.Name, model.Name, StringComparison.OrdinalIgnoreCase)))
-            {
-                ModelState.AddModelError(nameof(LayerEditViewModel.Name), S["The layer name already exists."]);
-            }
+            return Ok();
+        }
+        else
+        {
+            return RedirectToAction(nameof(Index));
+        }
+    }
+
+    private void ValidateViewModel(LayerEditViewModel model, LayersDocument layers, bool isNew)
+    {
+        if (string.IsNullOrWhiteSpace(model.Name))
+        {
+            ModelState.AddModelError(nameof(LayerEditViewModel.Name), S["The layer name is required."]);
+        }
+        else if (isNew && layers.Layers.Any(x => string.Equals(x.Name, model.Name, StringComparison.OrdinalIgnoreCase)))
+        {
+            ModelState.AddModelError(nameof(LayerEditViewModel.Name), S["The layer name already exists."]);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Controllers/LayerRuleController.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Controllers/LayerRuleController.cs
index e502f305125..dbd3ba81a96 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Controllers/LayerRuleController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Controllers/LayerRuleController.cs
@@ -14,346 +14,345 @@
 using OrchardCore.Rules;
 using OrchardCore.Rules.Services;
 
-namespace OrchardCore.Layers.Controllers
+namespace OrchardCore.Layers.Controllers;
+
+[Admin("Layers/Rules/{action}", "Layers.Rules.{action}")]
+public class LayerRuleController : Controller
 {
-    [Admin("Layers/Rules/{action}", "Layers.Rules.{action}")]
-    public class LayerRuleController : Controller
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IDisplayManager<Condition> _displayManager;
+    private readonly IEnumerable<IConditionFactory> _factories;
+    private readonly ILayerService _layerService;
+    private readonly IConditionIdGenerator _conditionIdGenerator;
+    private readonly INotifier _notifier;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+
+    protected readonly IHtmlLocalizer H;
+
+    public LayerRuleController(
+        IAuthorizationService authorizationService,
+        IDisplayManager<Condition> displayManager,
+        IEnumerable<IConditionFactory> factories,
+        ILayerService layerService,
+        IConditionIdGenerator conditionIdGenerator,
+        IHtmlLocalizer<LayerRuleController> htmlLocalizer,
+        INotifier notifier,
+        IUpdateModelAccessor updateModelAccessor)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IDisplayManager<Condition> _displayManager;
-        private readonly IEnumerable<IConditionFactory> _factories;
-        private readonly ILayerService _layerService;
-        private readonly IConditionIdGenerator _conditionIdGenerator;
-        private readonly INotifier _notifier;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-
-        protected readonly IHtmlLocalizer H;
-
-        public LayerRuleController(
-            IAuthorizationService authorizationService,
-            IDisplayManager<Condition> displayManager,
-            IEnumerable<IConditionFactory> factories,
-            ILayerService layerService,
-            IConditionIdGenerator conditionIdGenerator,
-            IHtmlLocalizer<LayerRuleController> htmlLocalizer,
-            INotifier notifier,
-            IUpdateModelAccessor updateModelAccessor)
-        {
-            _displayManager = displayManager;
-            _factories = factories;
-            _authorizationService = authorizationService;
-            _layerService = layerService;
-            _conditionIdGenerator = conditionIdGenerator;
-            _notifier = notifier;
-            _updateModelAccessor = updateModelAccessor;
-            H = htmlLocalizer;
-        }
+        _displayManager = displayManager;
+        _factories = factories;
+        _authorizationService = authorizationService;
+        _layerService = layerService;
+        _conditionIdGenerator = conditionIdGenerator;
+        _notifier = notifier;
+        _updateModelAccessor = updateModelAccessor;
+        H = htmlLocalizer;
+    }
 
-        public async Task<IActionResult> Create(string name, string type, string conditionGroupId)
+    public async Task<IActionResult> Create(string name, string type, string conditionGroupId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
-            {
-                return Forbid();
-            }
-
-            var layers = await _layerService.GetLayersAsync();
-            var layer = layers.Layers.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.Ordinal));
-
-            if (layer == null)
-            {
-                return NotFound();
-            }
+            return Forbid();
+        }
 
-            var conditionGroup = FindConditionGroup(layer.LayerRule, conditionGroupId);
+        var layers = await _layerService.GetLayersAsync();
+        var layer = layers.Layers.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.Ordinal));
 
-            if (conditionGroup == null)
-            {
-                return NotFound();
-            }
+        if (layer == null)
+        {
+            return NotFound();
+        }
 
-            var condition = _factories.FirstOrDefault(x => x.Name == type)?.Create();
+        var conditionGroup = FindConditionGroup(layer.LayerRule, conditionGroupId);
 
-            if (condition == null)
-            {
-                return NotFound();
-            }
+        if (conditionGroup == null)
+        {
+            return NotFound();
+        }
 
-            var model = new LayerRuleCreateViewModel
-            {
-                Name = name,
-                ConditionGroupId = conditionGroup.ConditionId,
-                ConditionType = type,
-                Editor = await _displayManager.BuildEditorAsync(condition, updater: _updateModelAccessor.ModelUpdater, isNew: true, string.Empty, string.Empty)
-            };
+        var condition = _factories.FirstOrDefault(x => x.Name == type)?.Create();
 
-            return View(model);
+        if (condition == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Create(LayerRuleCreateViewModel model)
+        var model = new LayerRuleCreateViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
-            {
-                return Forbid();
-            }
+            Name = name,
+            ConditionGroupId = conditionGroup.ConditionId,
+            ConditionType = type,
+            Editor = await _displayManager.BuildEditorAsync(condition, updater: _updateModelAccessor.ModelUpdater, isNew: true, string.Empty, string.Empty)
+        };
 
-            var layers = await _layerService.LoadLayersAsync();
-            var layer = layers.Layers.FirstOrDefault(x => string.Equals(x.Name, model.Name, StringComparison.Ordinal));
+        return View(model);
+    }
 
-            if (layer == null)
-            {
-                return NotFound();
-            }
+    [HttpPost]
+    public async Task<IActionResult> Create(LayerRuleCreateViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
+        {
+            return Forbid();
+        }
 
-            var conditionGroup = FindConditionGroup(layer.LayerRule, model.ConditionGroupId);
+        var layers = await _layerService.LoadLayersAsync();
+        var layer = layers.Layers.FirstOrDefault(x => string.Equals(x.Name, model.Name, StringComparison.Ordinal));
 
-            if (conditionGroup == null)
-            {
-                return NotFound();
-            }
+        if (layer == null)
+        {
+            return NotFound();
+        }
 
-            var condition = _factories.FirstOrDefault(x => x.Name == model.ConditionType)?.Create();
+        var conditionGroup = FindConditionGroup(layer.LayerRule, model.ConditionGroupId);
 
-            if (condition == null)
-            {
-                return NotFound();
-            }
+        if (conditionGroup == null)
+        {
+            return NotFound();
+        }
 
-            var editor = await _displayManager.UpdateEditorAsync(condition, updater: _updateModelAccessor.ModelUpdater, isNew: true, "", "");
+        var condition = _factories.FirstOrDefault(x => x.Name == model.ConditionType)?.Create();
 
-            if (ModelState.IsValid)
-            {
-                _conditionIdGenerator.GenerateUniqueId(condition);
-                conditionGroup.Conditions.Add(condition);
-                await _layerService.UpdateAsync(layers);
-                await _notifier.SuccessAsync(H["Condition added successfully."]);
-                return RedirectToAction(nameof(Edit), "Admin", new { name = model.Name });
-            }
+        if (condition == null)
+        {
+            return NotFound();
+        }
 
-            model.Editor = editor;
+        var editor = await _displayManager.UpdateEditorAsync(condition, updater: _updateModelAccessor.ModelUpdater, isNew: true, "", "");
 
-            // If we got this far, something failed, redisplay form.
-            return View(model);
+        if (ModelState.IsValid)
+        {
+            _conditionIdGenerator.GenerateUniqueId(condition);
+            conditionGroup.Conditions.Add(condition);
+            await _layerService.UpdateAsync(layers);
+            await _notifier.SuccessAsync(H["Condition added successfully."]);
+            return RedirectToAction(nameof(Edit), "Admin", new { name = model.Name });
         }
 
-        public async Task<IActionResult> Edit(string name, string conditionId)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
-            {
-                return Forbid();
-            }
+        model.Editor = editor;
 
-            var layers = await _layerService.GetLayersAsync();
-            var layer = layers.Layers.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.Ordinal));
+        // If we got this far, something failed, redisplay form.
+        return View(model);
+    }
 
-            if (layer == null)
-            {
-                return NotFound();
-            }
+    public async Task<IActionResult> Edit(string name, string conditionId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
+        {
+            return Forbid();
+        }
 
-            var condition = FindCondition(layer.LayerRule, conditionId);
+        var layers = await _layerService.GetLayersAsync();
+        var layer = layers.Layers.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.Ordinal));
 
-            if (condition == null)
-            {
-                return NotFound();
-            }
+        if (layer == null)
+        {
+            return NotFound();
+        }
 
-            var model = new LayerRuleEditViewModel
-            {
-                Name = name,
-                Editor = await _displayManager.BuildEditorAsync(condition, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "")
-            };
+        var condition = FindCondition(layer.LayerRule, conditionId);
 
-            return View(model);
+        if (condition == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Edit(LayerRuleEditViewModel model)
+        var model = new LayerRuleEditViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
-            {
-                return Forbid();
-            }
+            Name = name,
+            Editor = await _displayManager.BuildEditorAsync(condition, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "")
+        };
 
-            var layers = await _layerService.LoadLayersAsync();
-            var layer = layers.Layers.FirstOrDefault(x => string.Equals(x.Name, model.Name, StringComparison.Ordinal));
+        return View(model);
+    }
 
-            if (layer == null)
-            {
-                return NotFound();
-            }
+    [HttpPost]
+    public async Task<IActionResult> Edit(LayerRuleEditViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
+        {
+            return Forbid();
+        }
 
-            var condition = FindCondition(layer.LayerRule, model.ConditionId);
+        var layers = await _layerService.LoadLayersAsync();
+        var layer = layers.Layers.FirstOrDefault(x => string.Equals(x.Name, model.Name, StringComparison.Ordinal));
 
-            if (condition == null)
-            {
-                return NotFound();
-            }
+        if (layer == null)
+        {
+            return NotFound();
+        }
 
-            var editor = await _displayManager.UpdateEditorAsync(condition, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "");
+        var condition = FindCondition(layer.LayerRule, model.ConditionId);
 
-            if (ModelState.IsValid)
-            {
-                await _layerService.UpdateAsync(layers);
-                await _notifier.SuccessAsync(H["Condition updated successfully."]);
-                return RedirectToAction(nameof(Edit), "Admin", new { name = model.Name });
-            }
+        if (condition == null)
+        {
+            return NotFound();
+        }
 
-            await _notifier.ErrorAsync(H["The condition has validation errors."]);
-            model.Editor = editor;
+        var editor = await _displayManager.UpdateEditorAsync(condition, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "");
 
-            // If we got this far, something failed, redisplay form.
-            return View(model);
+        if (ModelState.IsValid)
+        {
+            await _layerService.UpdateAsync(layers);
+            await _notifier.SuccessAsync(H["Condition updated successfully."]);
+            return RedirectToAction(nameof(Edit), "Admin", new { name = model.Name });
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(string name, string conditionId)
+        await _notifier.ErrorAsync(H["The condition has validation errors."]);
+        model.Editor = editor;
+
+        // If we got this far, something failed, redisplay form.
+        return View(model);
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Delete(string name, string conditionId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var layers = await _layerService.LoadLayersAsync();
-            var layer = layers.Layers.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.Ordinal));
+        var layers = await _layerService.LoadLayersAsync();
+        var layer = layers.Layers.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.Ordinal));
 
-            if (layer == null)
-            {
-                return NotFound();
-            }
+        if (layer == null)
+        {
+            return NotFound();
+        }
 
-            var condition = FindCondition(layer.LayerRule, conditionId);
-            var conditionParent = FindConditionParent(layer.LayerRule, conditionId);
+        var condition = FindCondition(layer.LayerRule, conditionId);
+        var conditionParent = FindConditionParent(layer.LayerRule, conditionId);
 
-            if (condition == null || conditionParent == null)
-            {
-                return NotFound();
-            }
+        if (condition == null || conditionParent == null)
+        {
+            return NotFound();
+        }
 
-            conditionParent.Conditions.Remove(condition);
-            await _layerService.UpdateAsync(layers);
+        conditionParent.Conditions.Remove(condition);
+        await _layerService.UpdateAsync(layers);
+
+        await _notifier.SuccessAsync(H["Condition deleted successfully."]);
 
-            await _notifier.SuccessAsync(H["Condition deleted successfully."]);
+        return RedirectToAction(nameof(Edit), "Admin", new { name });
+    }
 
-            return RedirectToAction(nameof(Edit), "Admin", new { name });
+    [Admin("Layers/Rules/Order", "Layers.Rules.Order")]
+    public async Task<IActionResult> UpdateOrder(string name, string conditionId, string toConditionId, int toPosition)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
+        {
+            return Forbid();
         }
 
-        [Admin("Layers/Rules/Order", "Layers.Rules.Order")]
-        public async Task<IActionResult> UpdateOrder(string name, string conditionId, string toConditionId, int toPosition)
+        var layers = await _layerService.LoadLayersAsync();
+        var layer = layers.Layers.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.Ordinal));
+
+        if (layer == null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLayers))
-            {
-                return Forbid();
-            }
+            return NotFound();
+        }
 
-            var layers = await _layerService.LoadLayersAsync();
-            var layer = layers.Layers.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.Ordinal));
+        var condition = FindCondition(layer.LayerRule, conditionId);
+        var conditionParent = FindConditionParent(layer.LayerRule, conditionId);
+        var toCondition = FindCondition(layer.LayerRule, toConditionId);
 
-            if (layer == null)
-            {
-                return NotFound();
-            }
+        if (condition == null || conditionParent == null || toCondition == null || toCondition is not ConditionGroup toGroupCondition)
+        {
+            return NotFound();
+        }
 
-            var condition = FindCondition(layer.LayerRule, conditionId);
-            var conditionParent = FindConditionParent(layer.LayerRule, conditionId);
-            var toCondition = FindCondition(layer.LayerRule, toConditionId);
+        conditionParent.Conditions.Remove(condition);
+        toGroupCondition.Conditions.Insert(toPosition, condition);
 
-            if (condition == null || conditionParent == null || toCondition == null || toCondition is not ConditionGroup toGroupCondition)
-            {
-                return NotFound();
-            }
+        await _layerService.UpdateAsync(layers);
 
-            conditionParent.Conditions.Remove(condition);
-            toGroupCondition.Conditions.Insert(toPosition, condition);
+        return Ok();
+    }
 
-            await _layerService.UpdateAsync(layers);
+    private static Condition FindCondition(Condition condition, string conditionId)
+    {
+        if (string.Equals(condition.ConditionId, conditionId, StringComparison.OrdinalIgnoreCase))
+        {
+            return condition;
+        }
 
-            return Ok();
+        if (condition is not ConditionGroup conditionGroup)
+        {
+            return null;
         }
 
-        private static Condition FindCondition(Condition condition, string conditionId)
+        if (conditionGroup.Conditions.Count == 0)
         {
-            if (string.Equals(condition.ConditionId, conditionId, StringComparison.OrdinalIgnoreCase))
-            {
-                return condition;
-            }
+            return null;
+        }
 
-            if (condition is not ConditionGroup conditionGroup)
-            {
-                return null;
-            }
+        Condition result;
+
+        foreach (var nestedCondition in conditionGroup.Conditions)
+        {
+            // Search in inner conditions.
+            result = FindCondition(nestedCondition, conditionId);
 
-            if (conditionGroup.Conditions.Count == 0)
+            if (result != null)
             {
-                return null;
+                return result;
             }
+        }
 
-            Condition result;
-
-            foreach (var nestedCondition in conditionGroup.Conditions)
-            {
-                // Search in inner conditions.
-                result = FindCondition(nestedCondition, conditionId);
+        return null;
+    }
 
-                if (result != null)
-                {
-                    return result;
-                }
-            }
+    private static ConditionGroup FindConditionGroup(ConditionGroup condition, string groupConditionId)
+    {
+        if (string.Equals(condition.ConditionId, groupConditionId, StringComparison.OrdinalIgnoreCase))
+        {
+            return condition;
+        }
 
+        if (condition.Conditions.Count == 0)
+        {
             return null;
         }
 
-        private static ConditionGroup FindConditionGroup(ConditionGroup condition, string groupConditionId)
+        ConditionGroup result;
+
+        foreach (var nestedCondition in condition.Conditions.OfType<ConditionGroup>())
         {
-            if (string.Equals(condition.ConditionId, groupConditionId, StringComparison.OrdinalIgnoreCase))
-            {
-                return condition;
-            }
+            // Search in inner conditions.
+            result = FindConditionGroup(nestedCondition, groupConditionId);
 
-            if (condition.Conditions.Count == 0)
+            if (result != null)
             {
-                return null;
+                return result;
             }
+        }
+
+        return null;
+    }
 
-            ConditionGroup result;
+    private static ConditionGroup FindConditionParent(ConditionGroup condition, string conditionId)
+    {
+        ConditionGroup result;
 
-            foreach (var nestedCondition in condition.Conditions.OfType<ConditionGroup>())
+        foreach (var nestedCondition in condition.Conditions)
+        {
+            if (string.Equals(nestedCondition.ConditionId, conditionId, StringComparison.OrdinalIgnoreCase))
             {
-                // Search in inner conditions.
-                result = FindConditionGroup(nestedCondition, groupConditionId);
+                return condition;
+            }
 
+            if (nestedCondition is ConditionGroup nestedConditionGroup)
+            {
+                result = FindConditionParent(nestedConditionGroup, conditionId);
                 if (result != null)
                 {
                     return result;
                 }
             }
-
-            return null;
         }
 
-        private static ConditionGroup FindConditionParent(ConditionGroup condition, string conditionId)
-        {
-            ConditionGroup result;
-
-            foreach (var nestedCondition in condition.Conditions)
-            {
-                if (string.Equals(nestedCondition.ConditionId, conditionId, StringComparison.OrdinalIgnoreCase))
-                {
-                    return condition;
-                }
-
-                if (nestedCondition is ConditionGroup nestedConditionGroup)
-                {
-                    result = FindConditionParent(nestedConditionGroup, conditionId);
-                    if (result != null)
-                    {
-                        return result;
-                    }
-                }
-            }
-
-            return null;
-        }
+        return null;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Deployment/AllLayersDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Deployment/AllLayersDeploymentSource.cs
index 74f4bbaea4d..64b256b5ccd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Deployment/AllLayersDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Deployment/AllLayersDeploymentSource.cs
@@ -8,47 +8,46 @@
 using OrchardCore.Layers.Services;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Layers.Deployment
+namespace OrchardCore.Layers.Deployment;
+
+public class AllLayersDeploymentSource : IDeploymentSource
 {
-    public class AllLayersDeploymentSource : IDeploymentSource
+    private readonly ILayerService _layerService;
+    private readonly ISiteService _siteService;
+    private readonly JsonSerializerOptions _jsonSerializerOptions;
+
+    public AllLayersDeploymentSource(
+        ILayerService layerService,
+        ISiteService siteService,
+        IOptions<DocumentJsonSerializerOptions> serializationOptions)
+    {
+        _layerService = layerService;
+        _siteService = siteService;
+        _jsonSerializerOptions = serializationOptions.Value.SerializerOptions;
+    }
+
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
     {
-        private readonly ILayerService _layerService;
-        private readonly ISiteService _siteService;
-        private readonly JsonSerializerOptions _jsonSerializerOptions;
-
-        public AllLayersDeploymentSource(
-            ILayerService layerService,
-            ISiteService siteService,
-            IOptions<DocumentJsonSerializerOptions> serializationOptions)
+        if (step is not AllLayersDeploymentStep)
         {
-            _layerService = layerService;
-            _siteService = siteService;
-            _jsonSerializerOptions = serializationOptions.Value.SerializerOptions;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        var layers = await _layerService.GetLayersAsync();
+
+        result.Steps.Add(new JsonObject
         {
-            if (step is not AllLayersDeploymentStep)
-            {
-                return;
-            }
-
-            var layers = await _layerService.GetLayersAsync();
-
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "Layers",
-                ["Layers"] = JArray.FromObject(layers.Layers, _jsonSerializerOptions),
-            });
-
-            var layerSettings = await _siteService.GetSettingsAsync<LayerSettings>();
-
-            // Adding Layer settings
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "Settings",
-                ["LayerSettings"] = JObject.FromObject(layerSettings),
-            });
-        }
+            ["name"] = "Layers",
+            ["Layers"] = JArray.FromObject(layers.Layers, _jsonSerializerOptions),
+        });
+
+        var layerSettings = await _siteService.GetSettingsAsync<LayerSettings>();
+
+        // Adding Layer settings
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "Settings",
+            ["LayerSettings"] = JObject.FromObject(layerSettings),
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Deployment/AllLayersDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Deployment/AllLayersDeploymentStep.cs
index 24245a7cc4f..9027ec0790f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Deployment/AllLayersDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Deployment/AllLayersDeploymentStep.cs
@@ -1,15 +1,14 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Layers.Deployment
+namespace OrchardCore.Layers.Deployment;
+
+/// <summary>
+/// Adds layers to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class AllLayersDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds layers to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class AllLayersDeploymentStep : DeploymentStep
+    public AllLayersDeploymentStep()
     {
-        public AllLayersDeploymentStep()
-        {
-            Name = "AllLayers";
-        }
+        Name = "AllLayers";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Deployment/AllLayersDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Deployment/AllLayersDeploymentStepDriver.cs
index 9df14469239..ea5c985efca 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Deployment/AllLayersDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Deployment/AllLayersDeploymentStepDriver.cs
@@ -3,22 +3,21 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Layers.Deployment
+namespace OrchardCore.Layers.Deployment;
+
+public sealed class AllLayersDeploymentStepDriver : DisplayDriver<DeploymentStep, AllLayersDeploymentStep>
 {
-    public sealed class AllLayersDeploymentStepDriver : DisplayDriver<DeploymentStep, AllLayersDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(AllLayersDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(AllLayersDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("AllLayersDeploymentStep_Summary", step).Location("Summary", "Content"),
-                    View("AllLayersDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("AllLayersDeploymentStep_Summary", step).Location("Summary", "Content"),
+                View("AllLayersDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(AllLayersDeploymentStep step, BuildEditorContext context)
-        {
-            return View("AllLayersDeploymentStep_Edit", step).Location("Content");
-        }
+    public override IDisplayResult Edit(AllLayersDeploymentStep step, BuildEditorContext context)
+    {
+        return View("AllLayersDeploymentStep_Edit", step).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Drivers/LayerMetadataWelder.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Drivers/LayerMetadataWelder.cs
index eebbf7a4963..0f8786e1031 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Drivers/LayerMetadataWelder.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Drivers/LayerMetadataWelder.cs
@@ -9,86 +9,85 @@
 using OrchardCore.Layers.ViewModels;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Layers.Drivers
+namespace OrchardCore.Layers.Drivers;
+
+public class LayerMetadataWelder : ContentDisplayDriver
 {
-    public class LayerMetadataWelder : ContentDisplayDriver
+    private readonly ILayerService _layerService;
+    protected readonly IStringLocalizer S;
+
+    public LayerMetadataWelder(ILayerService layerService, IStringLocalizer<LayerMetadataWelder> stringLocalizer)
     {
-        private readonly ILayerService _layerService;
-        protected readonly IStringLocalizer S;
+        _layerService = layerService;
+        S = stringLocalizer;
+    }
 
-        public LayerMetadataWelder(ILayerService layerService, IStringLocalizer<LayerMetadataWelder> stringLocalizer)
+    protected override void BuildPrefix(ContentItem model, string htmlFieldPrefix)
+    {
+        base.BuildPrefix(model, htmlFieldPrefix);
+        if (string.IsNullOrWhiteSpace(htmlFieldPrefix))
         {
-            _layerService = layerService;
-            S = stringLocalizer;
+            Prefix = "LayerMetadata";
         }
+    }
 
-        protected override void BuildPrefix(ContentItem model, string htmlFieldPrefix)
-        {
-            base.BuildPrefix(model, htmlFieldPrefix);
-            if (string.IsNullOrWhiteSpace(htmlFieldPrefix))
-            {
-                Prefix = "LayerMetadata";
-            }
-        }
+    public override async Task<IDisplayResult> EditAsync(ContentItem model, BuildEditorContext context)
+    {
+        var layerMetadata = model.As<LayerMetadata>();
 
-        public override async Task<IDisplayResult> EditAsync(ContentItem model, BuildEditorContext context)
+        if (layerMetadata == null)
         {
-            var layerMetadata = model.As<LayerMetadata>();
+            layerMetadata = new LayerMetadata();
+            await context.Updater.TryUpdateModelAsync(layerMetadata, Prefix, m => m.Zone, m => m.Position);
 
-            if (layerMetadata == null)
+            // Are we loading an editor that requires layer metadata?
+            if (!string.IsNullOrEmpty(layerMetadata.Zone))
             {
-                layerMetadata = new LayerMetadata();
-                await context.Updater.TryUpdateModelAsync(layerMetadata, Prefix, m => m.Zone, m => m.Position);
-
-                // Are we loading an editor that requires layer metadata?
-                if (!string.IsNullOrEmpty(layerMetadata.Zone))
-                {
-                    model.Weld(layerMetadata);
-                }
-                else
-                {
-                    return null;
-                }
+                model.Weld(layerMetadata);
             }
-
-            return Initialize<LayerMetadataEditViewModel>("LayerMetadata_Edit", async shape =>
+            else
             {
-                shape.Title = model.DisplayText;
-                shape.LayerMetadata = layerMetadata;
-                shape.Layers = (await _layerService.GetLayersAsync()).Layers;
-            })
-            .Location("Content:before");
+                return null;
+            }
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentItem model, UpdateEditorContext context)
+        return Initialize<LayerMetadataEditViewModel>("LayerMetadata_Edit", async shape =>
         {
-            var viewModel = new LayerMetadataEditViewModel();
-
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
+            shape.Title = model.DisplayText;
+            shape.LayerMetadata = layerMetadata;
+            shape.Layers = (await _layerService.GetLayersAsync()).Layers;
+        })
+        .Location("Content:before");
+    }
 
-            if (viewModel.LayerMetadata == null)
-            {
-                return null;
-            }
+    public override async Task<IDisplayResult> UpdateAsync(ContentItem model, UpdateEditorContext context)
+    {
+        var viewModel = new LayerMetadataEditViewModel();
 
-            if (string.IsNullOrEmpty(viewModel.LayerMetadata.Zone))
-            {
-                context.Updater.ModelState.AddModelError(Prefix, "LayerMetadata.Zone", S["Zone is missing"]);
-            }
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
 
-            if (string.IsNullOrEmpty(viewModel.LayerMetadata.Layer))
-            {
-                context.Updater.ModelState.AddModelError(Prefix, "LayerMetadata.Layer", S["Layer is missing"]);
-            }
+        if (viewModel.LayerMetadata == null)
+        {
+            return null;
+        }
 
-            if (context.Updater.ModelState.IsValid)
-            {
-                model.Apply(viewModel.LayerMetadata);
-            }
+        if (string.IsNullOrEmpty(viewModel.LayerMetadata.Zone))
+        {
+            context.Updater.ModelState.AddModelError(Prefix, "LayerMetadata.Zone", S["Zone is missing"]);
+        }
 
-            model.DisplayText = viewModel.Title;
+        if (string.IsNullOrEmpty(viewModel.LayerMetadata.Layer))
+        {
+            context.Updater.ModelState.AddModelError(Prefix, "LayerMetadata.Layer", S["Layer is missing"]);
+        }
 
-            return await EditAsync(model, context);
+        if (context.Updater.ModelState.IsValid)
+        {
+            model.Apply(viewModel.LayerMetadata);
         }
+
+        model.DisplayText = viewModel.Title;
+
+        return await EditAsync(model, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Drivers/LayerSiteSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Drivers/LayerSiteSettingsDisplayDriver.cs
index fac6ce8976f..0385766f8cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Drivers/LayerSiteSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Drivers/LayerSiteSettingsDisplayDriver.cs
@@ -9,60 +9,59 @@
 using OrchardCore.Layers.ViewModels;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Layers.Drivers
+namespace OrchardCore.Layers.Drivers;
+
+public sealed class LayerSiteSettingsDisplayDriver : SiteDisplayDriver<LayerSettings>
 {
-    public sealed class LayerSiteSettingsDisplayDriver : SiteDisplayDriver<LayerSettings>
+    public const string GroupId = "zones";
+
+    private static readonly char[] _separator = [' ', ','];
+
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+
+    public LayerSiteSettingsDisplayDriver(
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService)
     {
-        public const string GroupId = "zones";
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
 
-        private static readonly char[] _separator = [' ', ','];
+    protected override string SettingsGroupId
+        => GroupId;
 
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+    public override async Task<IDisplayResult> EditAsync(ISite site, LayerSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-        public LayerSiteSettingsDisplayDriver(
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService)
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageLayers))
         {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
+            return null;
         }
 
-        protected override string SettingsGroupId
-            => GroupId;
-
-        public override async Task<IDisplayResult> EditAsync(ISite site, LayerSettings settings, BuildEditorContext context)
+        return Initialize<LayerSettingsViewModel>("LayerSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageLayers))
-            {
-                return null;
-            }
+            model.Zones = string.Join(", ", settings.Zones);
+        }).Location("Content:3")
+        .OnGroup(SettingsGroupId);
+    }
 
-            return Initialize<LayerSettingsViewModel>("LayerSettings_Edit", model =>
-            {
-                model.Zones = string.Join(", ", settings.Zones);
-            }).Location("Content:3")
-            .OnGroup(SettingsGroupId);
-        }
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, LayerSettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, LayerSettings settings, UpdateEditorContext context)
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageLayers))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageLayers))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var model = new LayerSettingsViewModel();
+        var model = new LayerSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            settings.Zones = (model.Zones ?? string.Empty).Split(_separator, StringSplitOptions.RemoveEmptyEntries);
+        settings.Zones = (model.Zones ?? string.Empty).Split(_separator, StringSplitOptions.RemoveEmptyEntries);
 
-            return await EditAsync(site, settings, context);
-        }
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/GraphQL/LayerQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Layers/GraphQL/LayerQueryObjectType.cs
index a2d65e389a1..44ab2fde912 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/GraphQL/LayerQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/GraphQL/LayerQueryObjectType.cs
@@ -14,50 +14,49 @@
 using OrchardCore.Layers.Services;
 using OrchardCore.Rules;
 
-namespace OrchardCore.Layers.GraphQL
+namespace OrchardCore.Layers.GraphQL;
+
+public class LayerQueryObjectType : ObjectGraphType<Layer>
 {
-    public class LayerQueryObjectType : ObjectGraphType<Layer>
+    public LayerQueryObjectType()
     {
-        public LayerQueryObjectType()
-        {
-            Name = "Layer";
-
-            Field(layer => layer.Name).Description("The name of the layer.");
-            Field<ListGraphType<StringGraphType>, IEnumerable<Condition>>("layerrule")
-                .Description("The rule that activates the layer.")
-                .Resolve(ctx => ctx.Source.LayerRule.Conditions);
-            Field(layer => layer.Description).Description("The description of the layer.");
-            Field<ListGraphType<LayerWidgetQueryObjectType>, IEnumerable<ContentItem>>("widgets")
-                .Description("The widgets for this layer.")
-                .Argument<PublicationStatusGraphType>("status", "publication status of the widgets")
-                .ResolveLockedAsync(GetWidgetsForLayerAsync);
-
-            async ValueTask<IEnumerable<ContentItem>> GetWidgetsForLayerAsync(IResolveFieldContext<Layer> context)
-            {
-                var layerService = context.RequestServices.GetService<ILayerService>();
+        Name = "Layer";
 
-                var filter = GetVersionFilter(context.GetArgument<PublicationStatusEnum>("status"));
-                var widgets = await layerService.GetLayerWidgetsAsync(filter);
+        Field(layer => layer.Name).Description("The name of the layer.");
+        Field<ListGraphType<StringGraphType>, IEnumerable<Condition>>("layerrule")
+            .Description("The rule that activates the layer.")
+            .Resolve(ctx => ctx.Source.LayerRule.Conditions);
+        Field(layer => layer.Description).Description("The description of the layer.");
+        Field<ListGraphType<LayerWidgetQueryObjectType>, IEnumerable<ContentItem>>("widgets")
+            .Description("The widgets for this layer.")
+            .Argument<PublicationStatusGraphType>("status", "publication status of the widgets")
+            .ResolveLockedAsync(GetWidgetsForLayerAsync);
 
-                var layerWidgets = widgets?.Where(item =>
-                {
-                    var metadata = item.As<LayerMetadata>();
-                    if (metadata == null) return false;
-                    return metadata.Layer == context.Source.Name;
-                });
+        async ValueTask<IEnumerable<ContentItem>> GetWidgetsForLayerAsync(IResolveFieldContext<Layer> context)
+        {
+            var layerService = context.RequestServices.GetService<ILayerService>();
 
-                return layerWidgets;
-            }
-        }
+            var filter = GetVersionFilter(context.GetArgument<PublicationStatusEnum>("status"));
+            var widgets = await layerService.GetLayerWidgetsAsync(filter);
 
-        private static Expression<Func<ContentItemIndex, bool>> GetVersionFilter(PublicationStatusEnum status) =>
-            status switch
+            var layerWidgets = widgets?.Where(item =>
             {
-                PublicationStatusEnum.Published => x => x.Published,
-                PublicationStatusEnum.Draft => x => x.Latest && !x.Published,
-                PublicationStatusEnum.Latest => x => x.Latest,
-                PublicationStatusEnum.All => x => true,
-                _ => x => x.Published,
-            };
+                var metadata = item.As<LayerMetadata>();
+                if (metadata == null) return false;
+                return metadata.Layer == context.Source.Name;
+            });
+
+            return layerWidgets;
+        }
     }
+
+    private static Expression<Func<ContentItemIndex, bool>> GetVersionFilter(PublicationStatusEnum status) =>
+        status switch
+        {
+            PublicationStatusEnum.Published => x => x.Published,
+            PublicationStatusEnum.Draft => x => x.Latest && !x.Published,
+            PublicationStatusEnum.Latest => x => x.Latest,
+            PublicationStatusEnum.All => x => true,
+            _ => x => x.Published,
+        };
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/GraphQL/LayerWidgetQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Layers/GraphQL/LayerWidgetQueryObjectType.cs
index ac252281451..93fe4be7ff4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/GraphQL/LayerWidgetQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/GraphQL/LayerWidgetQueryObjectType.cs
@@ -3,29 +3,28 @@
 using OrchardCore.ContentManagement.GraphQL.Queries.Types;
 using OrchardCore.Layers.Models;
 
-namespace OrchardCore.Layers.GraphQL
+namespace OrchardCore.Layers.GraphQL;
+
+public class LayerWidgetQueryObjectType : ObjectGraphType<ContentItem>
 {
-    public class LayerWidgetQueryObjectType : ObjectGraphType<ContentItem>
+    public LayerWidgetQueryObjectType()
     {
-        public LayerWidgetQueryObjectType()
-        {
-            Name = "LayerWidget";
+        Name = "LayerWidget";
 
-            Field<StringGraphType>("zone")
-                .Description("The name of the widget's zone.")
-                .Resolve(context => context.Source.As<LayerMetadata>()?.Zone);
+        Field<StringGraphType>("zone")
+            .Description("The name of the widget's zone.")
+            .Resolve(context => context.Source.As<LayerMetadata>()?.Zone);
 
-            Field<DecimalGraphType>("position")
-                .Description("The position of the widget in the zone.")
-                .Resolve(context => context.Source.As<LayerMetadata>()?.Position);
+        Field<DecimalGraphType>("position")
+            .Description("The position of the widget in the zone.")
+            .Resolve(context => context.Source.As<LayerMetadata>()?.Position);
 
-            Field<BooleanGraphType>("renderTitle")
-                .Description("Whether to render the widget's title.")
-                .Resolve(context => context.Source.As<LayerMetadata>()?.RenderTitle);
+        Field<BooleanGraphType>("renderTitle")
+            .Description("Whether to render the widget's title.")
+            .Resolve(context => context.Source.As<LayerMetadata>()?.RenderTitle);
 
-            Field<ContentItemInterface>("widget")
-                .Description("A widget on this layer.")
-                .Resolve(context => context.Source);
-        }
+        Field<ContentItemInterface>("widget")
+            .Description("A widget on this layer.")
+            .Resolve(context => context.Source);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/GraphQL/SiteLayersQuery.cs b/src/OrchardCore.Modules/OrchardCore.Layers/GraphQL/SiteLayersQuery.cs
index 593b645cd27..d60f7e3315c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/GraphQL/SiteLayersQuery.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/GraphQL/SiteLayersQuery.cs
@@ -11,48 +11,47 @@
 using OrchardCore.Layers.Models;
 using OrchardCore.Layers.Services;
 
-namespace OrchardCore.Layers.GraphQL
+namespace OrchardCore.Layers.GraphQL;
+
+public class SiteLayersQuery : ISchemaBuilder
 {
-    public class SiteLayersQuery : ISchemaBuilder
+    protected readonly IStringLocalizer S;
+    private readonly GraphQLContentOptions _graphQLContentOptions;
+
+    public SiteLayersQuery(
+        IStringLocalizer<SiteLayersQuery> localizer,
+        IOptions<GraphQLContentOptions> graphQLContentOptions)
     {
-        protected readonly IStringLocalizer S;
-        private readonly GraphQLContentOptions _graphQLContentOptions;
+        S = localizer;
+        _graphQLContentOptions = graphQLContentOptions.Value;
+    }
+
+    public Task<string> GetIdentifierAsync() => Task.FromResult(string.Empty);
 
-        public SiteLayersQuery(
-            IStringLocalizer<SiteLayersQuery> localizer,
-            IOptions<GraphQLContentOptions> graphQLContentOptions)
+    public Task BuildAsync(ISchema schema)
+    {
+        if (_graphQLContentOptions.IsHiddenByDefault("SiteLayers"))
         {
-            S = localizer;
-            _graphQLContentOptions = graphQLContentOptions.Value;
+            return Task.CompletedTask;
         }
 
-        public Task<string> GetIdentifierAsync() => Task.FromResult(string.Empty);
-
-        public Task BuildAsync(ISchema schema)
+        var field = new FieldType
         {
-            if (_graphQLContentOptions.IsHiddenByDefault("SiteLayers"))
-            {
-                return Task.CompletedTask;
-            }
+            Name = "SiteLayers",
+            Description = S["Site layers define the rules and zone placement for widgets."],
+            Type = typeof(ListGraphType<LayerQueryObjectType>),
+            Resolver = new LockedAsyncFieldResolver<IEnumerable<Layer>>(ResolveAsync)
+        };
 
-            var field = new FieldType
-            {
-                Name = "SiteLayers",
-                Description = S["Site layers define the rules and zone placement for widgets."],
-                Type = typeof(ListGraphType<LayerQueryObjectType>),
-                Resolver = new LockedAsyncFieldResolver<IEnumerable<Layer>>(ResolveAsync)
-            };
+        schema.Query.AddField(field);
 
-            schema.Query.AddField(field);
-
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
+    }
 
-        private async ValueTask<IEnumerable<Layer>> ResolveAsync(IResolveFieldContext resolveContext)
-        {
-            var layerService = resolveContext.RequestServices.GetService<ILayerService>();
-            var allLayers = await layerService.GetLayersAsync();
-            return allLayers.Layers;
-        }
+    private async ValueTask<IEnumerable<Layer>> ResolveAsync(IResolveFieldContext resolveContext)
+    {
+        var layerService = resolveContext.RequestServices.GetService<ILayerService>();
+        var allLayers = await layerService.GetLayersAsync();
+        return allLayers.Layers;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Layers/GraphQL/Startup.cs
index e0d85ad68b4..07705e07854 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/GraphQL/Startup.cs
@@ -2,16 +2,15 @@
 using OrchardCore.Apis.GraphQL;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Layers.GraphQL
+namespace OrchardCore.Layers.GraphQL;
+
+[RequireFeatures("OrchardCore.Apis.GraphQL")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Apis.GraphQL")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSingleton<ISchemaBuilder, SiteLayersQuery>();
-            services.AddTransient<LayerQueryObjectType>();
-            services.AddTransient<LayerWidgetQueryObjectType>();
-        }
+        services.AddSingleton<ISchemaBuilder, SiteLayersQuery>();
+        services.AddTransient<LayerQueryObjectType>();
+        services.AddTransient<LayerWidgetQueryObjectType>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Handlers/LayerMetadataHandler.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Handlers/LayerMetadataHandler.cs
index 1eaec4dfa1f..a90973c331a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Handlers/LayerMetadataHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Handlers/LayerMetadataHandler.cs
@@ -5,38 +5,37 @@
 using OrchardCore.Documents;
 using OrchardCore.Layers.Models;
 
-namespace OrchardCore.Layers.Handlers
+namespace OrchardCore.Layers.Handlers;
+
+public class LayerMetadataHandler : ContentHandlerBase
 {
-    public class LayerMetadataHandler : ContentHandlerBase
+    private readonly IVolatileDocumentManager<LayerState> _layerStateManager;
+
+    public LayerMetadataHandler(IVolatileDocumentManager<LayerState> layerStateManager)
     {
-        private readonly IVolatileDocumentManager<LayerState> _layerStateManager;
+        _layerStateManager = layerStateManager;
+    }
 
-        public LayerMetadataHandler(IVolatileDocumentManager<LayerState> layerStateManager)
-        {
-            _layerStateManager = layerStateManager;
-        }
+    public override Task PublishedAsync(PublishContentContext context) => UpdateAsync(context.ContentItem);
 
-        public override Task PublishedAsync(PublishContentContext context) => UpdateAsync(context.ContentItem);
+    public override Task RemovedAsync(RemoveContentContext context) => UpdateAsync(context.ContentItem);
 
-        public override Task RemovedAsync(RemoveContentContext context) => UpdateAsync(context.ContentItem);
+    public override Task UnpublishedAsync(PublishContentContext context) => UpdateAsync(context.ContentItem);
 
-        public override Task UnpublishedAsync(PublishContentContext context) => UpdateAsync(context.ContentItem);
+    private Task UpdateAsync(ContentItem contentItem)
+    {
+        var layerMetadata = contentItem.As<LayerMetadata>();
 
-        private Task UpdateAsync(ContentItem contentItem)
+        if (layerMetadata == null)
         {
-            var layerMetadata = contentItem.As<LayerMetadata>();
-
-            if (layerMetadata == null)
-            {
-                return Task.CompletedTask;
-            }
-
-            // Checked by the 'LayerFilter'.
-            return _layerStateManager.UpdateAsync(new LayerState());
+            return Task.CompletedTask;
         }
-    }
 
-    public class LayerState : Document
-    {
+        // Checked by the 'LayerFilter'.
+        return _layerStateManager.UpdateAsync(new LayerState());
     }
 }
+
+public class LayerState : Document
+{
+}
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Indexes/LayerMetadataIndex.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Indexes/LayerMetadataIndex.cs
index d43b04a3226..a829a0fc435 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Indexes/LayerMetadataIndex.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Indexes/LayerMetadataIndex.cs
@@ -2,32 +2,31 @@
 using OrchardCore.Layers.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.Layers.Indexes
+namespace OrchardCore.Layers.Indexes;
+
+public class LayerMetadataIndex : MapIndex
 {
-    public class LayerMetadataIndex : MapIndex
-    {
-        public string Zone { get; set; }
-    }
+    public string Zone { get; set; }
+}
 
-    public class LayerMetadataIndexProvider : IndexProvider<ContentItem>
+public class LayerMetadataIndexProvider : IndexProvider<ContentItem>
+{
+    public override void Describe(DescribeContext<ContentItem> context)
     {
-        public override void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<LayerMetadataIndex>()
-                .When(contentItem => contentItem.Has<LayerMetadata>())
-                .Map(contentItem =>
+        context.For<LayerMetadataIndex>()
+            .When(contentItem => contentItem.Has<LayerMetadata>())
+            .Map(contentItem =>
+            {
+                var layerMetadata = contentItem.As<LayerMetadata>();
+                if (layerMetadata == null)
                 {
-                    var layerMetadata = contentItem.As<LayerMetadata>();
-                    if (layerMetadata == null)
-                    {
-                        return null;
-                    }
+                    return null;
+                }
 
-                    return new LayerMetadataIndex
-                    {
-                        Zone = layerMetadata.Zone,
-                    };
-                });
-        }
+                return new LayerMetadataIndex
+                {
+                    Zone = layerMetadata.Zone,
+                };
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Migrations.cs
index 14da631119e..47f48475e70 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Migrations.cs
@@ -5,49 +5,48 @@
 using OrchardCore.Rules.Services;
 using YesSql.Sql;
 
-namespace OrchardCore.Layers
+namespace OrchardCore.Layers;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
+    private readonly ILayerService _layerService;
+    private readonly IConditionIdGenerator _conditionIdGenerator;
+
+    public Migrations(
+        ILayerService layerService,
+        IConditionIdGenerator conditionIdGenerator)
+    {
+        _layerService = layerService;
+        _conditionIdGenerator = conditionIdGenerator;
+    }
+
+    public async Task<int> CreateAsync()
     {
-        private readonly ILayerService _layerService;
-        private readonly IConditionIdGenerator _conditionIdGenerator;
-
-        public Migrations(
-            ILayerService layerService,
-            IConditionIdGenerator conditionIdGenerator)
-        {
-            _layerService = layerService;
-            _conditionIdGenerator = conditionIdGenerator;
-        }
-
-        public async Task<int> CreateAsync()
-        {
-            await SchemaBuilder.CreateMapIndexTableAsync<LayerMetadataIndex>(table => table
-               .Column<string>("Zone", c => c.WithLength(64))
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<LayerMetadataIndex>(table => table
-                .CreateIndex("IDX_LayerMetadataIndex_DocumentId",
-                "DocumentId",
-                "Zone")
-            );
-
-            // Shortcut other migration steps on new content definition schemas.
-            return 3;
-        }
-
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom1Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<LayerMetadataIndex>(table => table
-                .CreateIndex("IDX_LayerMetadataIndex_DocumentId",
-                "DocumentId",
-                "Zone")
-            );
-
-            // Migration was cleaned up in version 2.0.
-            // Jump to step 3 during create.
-            return 3;
-        }
+        await SchemaBuilder.CreateMapIndexTableAsync<LayerMetadataIndex>(table => table
+           .Column<string>("Zone", c => c.WithLength(64))
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<LayerMetadataIndex>(table => table
+            .CreateIndex("IDX_LayerMetadataIndex_DocumentId",
+            "DocumentId",
+            "Zone")
+        );
+
+        // Shortcut other migration steps on new content definition schemas.
+        return 3;
+    }
+
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom1Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<LayerMetadataIndex>(table => table
+            .CreateIndex("IDX_LayerMetadataIndex_DocumentId",
+            "DocumentId",
+            "Zone")
+        );
+
+        // Migration was cleaned up in version 2.0.
+        // Jump to step 3 during create.
+        return 3;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Models/Layer.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Models/Layer.cs
index a0f9949f4d3..39bb1833250 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Models/Layer.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Models/Layer.cs
@@ -1,13 +1,12 @@
 using OrchardCore.Rules;
 
-namespace OrchardCore.Layers.Models
+namespace OrchardCore.Layers.Models;
+
+public class Layer
 {
-    public class Layer
-    {
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        public string Description { get; set; }
+    public string Description { get; set; }
 
-        public Rule LayerRule { get; set; }
-    }
+    public Rule LayerRule { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Models/LayerMetadata.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Models/LayerMetadata.cs
index 4aa0af4b459..a61d831c0fd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Models/LayerMetadata.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Models/LayerMetadata.cs
@@ -1,12 +1,11 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Layers.Models
+namespace OrchardCore.Layers.Models;
+
+public class LayerMetadata : ContentPart
 {
-    public class LayerMetadata : ContentPart
-    {
-        public bool RenderTitle { get; set; }
-        public double Position { get; set; }
-        public string Zone { get; set; }
-        public string Layer { get; set; }
-    }
+    public bool RenderTitle { get; set; }
+    public double Position { get; set; }
+    public string Zone { get; set; }
+    public string Layer { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Models/LayerSettings.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Models/LayerSettings.cs
index 42fd02c2dba..0cb0700dee6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Models/LayerSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Models/LayerSettings.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Layers.Models
+namespace OrchardCore.Layers.Models;
+
+public class LayerSettings
 {
-    public class LayerSettings
-    {
-        public string[] Zones { get; set; } = [];
-    }
+    public string[] Zones { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Models/LayersDocument.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Models/LayersDocument.cs
index 90cc42006fd..4b384f9dfab 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Models/LayersDocument.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Models/LayersDocument.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.Layers.Models
+namespace OrchardCore.Layers.Models;
+
+public class LayersDocument : Document
 {
-    public class LayersDocument : Document
-    {
-        public List<Layer> Layers { get; set; } = [];
-    }
+    public List<Layer> Layers { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Recipes/LayerStep.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Recipes/LayerStep.cs
index bd84fa077fb..a25dd30c4ca 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Recipes/LayerStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Recipes/LayerStep.cs
@@ -14,139 +14,138 @@
 using OrchardCore.Rules;
 using OrchardCore.Rules.Services;
 
-namespace OrchardCore.Layers.Recipes
+namespace OrchardCore.Layers.Recipes;
+
+/// <summary>
+/// This recipe step creates or updates a layer.
+/// </summary>
+public sealed class LayerStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step creates or updates a layer.
-    /// </summary>
-    public sealed class LayerStep : IRecipeStepHandler
+    private readonly ILayerService _layerService;
+    private readonly IConditionIdGenerator _conditionIdGenerator;
+    private readonly IEnumerable<IConditionFactory> _factories;
+    private readonly JsonSerializerOptions _serializationOptions;
+
+    internal readonly IStringLocalizer S;
+
+    public LayerStep(
+        ILayerService layerService,
+        IConditionIdGenerator conditionIdGenerator,
+        IEnumerable<IConditionFactory> factories,
+        IOptions<DocumentJsonSerializerOptions> serializationOptions,
+        IStringLocalizer<LayerStep> stringLocalizer)
+    {
+        _layerService = layerService;
+        _conditionIdGenerator = conditionIdGenerator;
+        _factories = factories;
+        _serializationOptions = serializationOptions.Value.SerializerOptions;
+        S = stringLocalizer;
+    }
+
+    public async Task ExecuteAsync(RecipeExecutionContext context)
     {
-        private readonly ILayerService _layerService;
-        private readonly IConditionIdGenerator _conditionIdGenerator;
-        private readonly IEnumerable<IConditionFactory> _factories;
-        private readonly JsonSerializerOptions _serializationOptions;
-
-        internal readonly IStringLocalizer S;
-
-        public LayerStep(
-            ILayerService layerService,
-            IConditionIdGenerator conditionIdGenerator,
-            IEnumerable<IConditionFactory> factories,
-            IOptions<DocumentJsonSerializerOptions> serializationOptions,
-            IStringLocalizer<LayerStep> stringLocalizer)
+        if (!string.Equals(context.Name, "Layers", StringComparison.OrdinalIgnoreCase))
         {
-            _layerService = layerService;
-            _conditionIdGenerator = conditionIdGenerator;
-            _factories = factories;
-            _serializationOptions = serializationOptions.Value.SerializerOptions;
-            S = stringLocalizer;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, "Layers", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
+        // The recipe step contains polymorphic types which need to be resolved
+        var model = context.Step.ToObject<LayersStepModel>(_serializationOptions);
 
-            // The recipe step contains polymorphic types which need to be resolved
-            var model = context.Step.ToObject<LayersStepModel>(_serializationOptions);
+        var allLayers = await _layerService.LoadLayersAsync();
 
-            var allLayers = await _layerService.LoadLayersAsync();
+        var unknownTypes = new List<string>();
+        var factories = _factories.ToDictionary(x => x.Name);
 
-            var unknownTypes = new List<string>();
-            var factories = _factories.ToDictionary(x => x.Name);
+        foreach (var layerStep in model.Layers)
+        {
+            var layer = allLayers.Layers.FirstOrDefault(x => string.Equals(x.Name, layerStep.Name, StringComparison.OrdinalIgnoreCase));
 
-            foreach (var layerStep in model.Layers)
+            if (layer == null)
             {
-                var layer = allLayers.Layers.FirstOrDefault(x => string.Equals(x.Name, layerStep.Name, StringComparison.OrdinalIgnoreCase));
+                layer = new Layer();
+                allLayers.Layers.Add(layer);
+            }
 
-                if (layer == null)
-                {
-                    layer = new Layer();
-                    allLayers.Layers.Add(layer);
-                }
+            // Backwards compatibility check.
+            if (layer.LayerRule == null)
+            {
+                layer.LayerRule = new Rule();
+                _conditionIdGenerator.GenerateUniqueId(layer.LayerRule);
+            }
 
-                // Backwards compatibility check.
-                if (layer.LayerRule == null)
-                {
-                    layer.LayerRule = new Rule();
-                    _conditionIdGenerator.GenerateUniqueId(layer.LayerRule);
-                }
+            // Replace any property that is set in the recipe step.
+            if (!string.IsNullOrEmpty(layerStep.Name))
+            {
+                layer.Name = layerStep.Name;
+            }
+            else
+            {
+                context.Errors.Add(S["The layer '{0}' is required.", layer.Name]);
 
-                // Replace any property that is set in the recipe step.
-                if (!string.IsNullOrEmpty(layerStep.Name))
-                {
-                    layer.Name = layerStep.Name;
-                }
-                else
-                {
-                    context.Errors.Add(S["The layer '{0}' is required.", layer.Name]);
+                continue;
+            }
 
-                    continue;
+            if (layerStep.LayerRule != null)
+            {
+                if (!string.IsNullOrEmpty(layerStep.LayerRule.ConditionId))
+                {
+                    layer.LayerRule.ConditionId = layerStep.LayerRule.ConditionId;
                 }
 
-                if (layerStep.LayerRule != null)
+                // The conditions list is cleared, because we cannot logically merge conditions.
+                layer.LayerRule.Conditions.Clear();
+                foreach (var jCondition in layerStep.LayerRule.Conditions)
                 {
-                    if (!string.IsNullOrEmpty(layerStep.LayerRule.ConditionId))
+                    var name = jCondition["Name"].ToString();
+                    if (factories.TryGetValue(name, out var factory))
                     {
-                        layer.LayerRule.ConditionId = layerStep.LayerRule.ConditionId;
-                    }
+                        var factoryCondition = (Condition)jCondition.ToObject(factory.Create().GetType(), _serializationOptions);
 
-                    // The conditions list is cleared, because we cannot logically merge conditions.
-                    layer.LayerRule.Conditions.Clear();
-                    foreach (var jCondition in layerStep.LayerRule.Conditions)
+                        layer.LayerRule.Conditions.Add(factoryCondition);
+                    }
+                    else
                     {
-                        var name = jCondition["Name"].ToString();
-                        if (factories.TryGetValue(name, out var factory))
-                        {
-                            var factoryCondition = (Condition)jCondition.ToObject(factory.Create().GetType(), _serializationOptions);
-
-                            layer.LayerRule.Conditions.Add(factoryCondition);
-                        }
-                        else
-                        {
-                            unknownTypes.Add(name);
-                        }
+                        unknownTypes.Add(name);
                     }
                 }
-
-                if (!string.IsNullOrEmpty(layerStep.Description))
-                {
-                    layer.Description = layerStep.Description;
-                }
             }
 
-            if (unknownTypes.Count != 0)
+            if (!string.IsNullOrEmpty(layerStep.Description))
             {
-                context.Errors.Add(S["No changes have been made. The following types of conditions cannot be added: {0}. Please ensure that the related features are enabled to add these types of conditions.", string.Join(", ", unknownTypes)]);
-
-                return;
+                layer.Description = layerStep.Description;
             }
+        }
+
+        if (unknownTypes.Count != 0)
+        {
+            context.Errors.Add(S["No changes have been made. The following types of conditions cannot be added: {0}. Please ensure that the related features are enabled to add these types of conditions.", string.Join(", ", unknownTypes)]);
 
-            await _layerService.UpdateAsync(allLayers);
+            return;
         }
-    }
 
-    public class LayersStepModel
-    {
-        public LayerStepModel[] Layers { get; set; }
+        await _layerService.UpdateAsync(allLayers);
     }
+}
 
-    public class LayerStepModel
-    {
-        public string Name { get; set; }
+public class LayersStepModel
+{
+    public LayerStepModel[] Layers { get; set; }
+}
 
-        public string Rule { get; set; }
-        public string Description { get; set; }
+public class LayerStepModel
+{
+    public string Name { get; set; }
 
-        public RuleStepModel LayerRule { get; set; }
-    }
+    public string Rule { get; set; }
+    public string Description { get; set; }
 
-    public class RuleStepModel
-    {
-        public string Name { get; set; }
-        public string ConditionId { get; set; }
-        public JsonArray Conditions { get; set; }
-    }
+    public RuleStepModel LayerRule { get; set; }
+}
+
+public class RuleStepModel
+{
+    public string Name { get; set; }
+    public string ConditionId { get; set; }
+    public JsonArray Conditions { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Services/DefaultLayersMethodProvider.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Services/DefaultLayersMethodProvider.cs
index 5d441541580..9d7c455b07e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Services/DefaultLayersMethodProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Services/DefaultLayersMethodProvider.cs
@@ -8,110 +8,109 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Scripting;
 
-namespace OrchardCore.Layers.Services
+namespace OrchardCore.Layers.Services;
+
+public class DefaultLayersMethodProvider : IGlobalMethodProvider
 {
-    public class DefaultLayersMethodProvider : IGlobalMethodProvider
-    {
-        private readonly GlobalMethod _isHomepage;
-        private readonly GlobalMethod _isAnonymous;
-        private readonly GlobalMethod _isAuthenticated;
-        private readonly GlobalMethod _isInRole;
-        private readonly GlobalMethod _url;
-        private readonly GlobalMethod _culture;
+    private readonly GlobalMethod _isHomepage;
+    private readonly GlobalMethod _isAnonymous;
+    private readonly GlobalMethod _isAuthenticated;
+    private readonly GlobalMethod _isInRole;
+    private readonly GlobalMethod _url;
+    private readonly GlobalMethod _culture;
 
-        private readonly GlobalMethod[] _allMethods;
+    private readonly GlobalMethod[] _allMethods;
 
-        public DefaultLayersMethodProvider()
+    public DefaultLayersMethodProvider()
+    {
+        _isHomepage = new GlobalMethod
         {
-            _isHomepage = new GlobalMethod
+            Name = "isHomepage",
+            Method = serviceProvider => (Func<bool>)(() =>
             {
-                Name = "isHomepage",
-                Method = serviceProvider => (Func<bool>)(() =>
-                {
-                    var httpContext = serviceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
-                    var requestPath = httpContext.Request.Path.Value;
-                    return requestPath == "/" || string.IsNullOrEmpty(requestPath);
-                }),
-            };
+                var httpContext = serviceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
+                var requestPath = httpContext.Request.Path.Value;
+                return requestPath == "/" || string.IsNullOrEmpty(requestPath);
+            }),
+        };
 
-            _isAnonymous = new GlobalMethod
+        _isAnonymous = new GlobalMethod
+        {
+            Name = "isAnonymous",
+            Method = serviceProvider => (Func<bool>)(() =>
             {
-                Name = "isAnonymous",
-                Method = serviceProvider => (Func<bool>)(() =>
-                {
-                    var httpContext = serviceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
-                    return httpContext.User?.Identity.IsAuthenticated != true;
-                }),
-            };
+                var httpContext = serviceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
+                return httpContext.User?.Identity.IsAuthenticated != true;
+            }),
+        };
 
-            _isAuthenticated = new GlobalMethod
+        _isAuthenticated = new GlobalMethod
+        {
+            Name = "isAuthenticated",
+            Method = serviceProvider => (Func<bool>)(() =>
             {
-                Name = "isAuthenticated",
-                Method = serviceProvider => (Func<bool>)(() =>
-                {
-                    var httpContext = serviceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
-                    return httpContext.User?.Identity.IsAuthenticated == true;
-                }),
-            };
+                var httpContext = serviceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
+                return httpContext.User?.Identity.IsAuthenticated == true;
+            }),
+        };
 
-            _isInRole = new GlobalMethod
+        _isInRole = new GlobalMethod
+        {
+            Name = "isInRole",
+            Method = serviceProvider => (Func<string, bool>)(role =>
             {
-                Name = "isInRole",
-                Method = serviceProvider => (Func<string, bool>)(role =>
-                {
-                    var httpContext = serviceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
-                    var optionsAccessor = serviceProvider.GetRequiredService<IOptions<IdentityOptions>>();
-                    var roleClaimType = optionsAccessor.Value.ClaimsIdentity.RoleClaimType;
+                var httpContext = serviceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
+                var optionsAccessor = serviceProvider.GetRequiredService<IOptions<IdentityOptions>>();
+                var roleClaimType = optionsAccessor.Value.ClaimsIdentity.RoleClaimType;
 
-                    // IsInRole() & HasClaim() are case sensitive.
-                    return httpContext.User?.Claims.Any(claim => claim.Type == roleClaimType && claim.Value.Equals(role, StringComparison.OrdinalIgnoreCase)) == true;
-                }),
-            };
+                // IsInRole() & HasClaim() are case sensitive.
+                return httpContext.User?.Claims.Any(claim => claim.Type == roleClaimType && claim.Value.Equals(role, StringComparison.OrdinalIgnoreCase)) == true;
+            }),
+        };
 
-            _url = new GlobalMethod
-            {
-                Name = "url",
-                Method = serviceProvider => (Func<string, bool>)(url =>
-                {
-                    if (url.StartsWith("~/", StringComparison.Ordinal))
-                    {
-                        url = url[1..];
-                    }
-
-                    var httpContext = serviceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
-                    var requestPath = httpContext.Request.Path.Value;
-
-                    // Tenant home page could have an empty string as a request path, where
-                    // the default tenant does not.
-                    if (string.IsNullOrEmpty(requestPath))
-                    {
-                        requestPath = "/";
-                    }
-
-                    return url.EndsWith('*')
-                        ? requestPath.StartsWith(url.TrimEnd('*'), StringComparison.OrdinalIgnoreCase)
-                        : string.Equals(requestPath, url, StringComparison.OrdinalIgnoreCase);
-                }),
-            };
-
-            _culture = new GlobalMethod
+        _url = new GlobalMethod
+        {
+            Name = "url",
+            Method = serviceProvider => (Func<string, bool>)(url =>
             {
-                Name = "culture",
-                Method = serviceProvider => (Func<string, bool>)(culture =>
+                if (url.StartsWith("~/", StringComparison.Ordinal))
                 {
-                    var currentCulture = CultureInfo.CurrentCulture;
+                    url = url[1..];
+                }
 
-                    return string.Equals(culture, currentCulture.Name, StringComparison.OrdinalIgnoreCase) ||
-                        string.Equals(culture, currentCulture.Parent.Name, StringComparison.OrdinalIgnoreCase);
-                }),
-            };
+                var httpContext = serviceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
+                var requestPath = httpContext.Request.Path.Value;
 
-            _allMethods = [_isAnonymous, _isAuthenticated, _isInRole, _isHomepage, _url, _culture];
-        }
+                // Tenant home page could have an empty string as a request path, where
+                // the default tenant does not.
+                if (string.IsNullOrEmpty(requestPath))
+                {
+                    requestPath = "/";
+                }
 
-        public IEnumerable<GlobalMethod> GetMethods()
+                return url.EndsWith('*')
+                    ? requestPath.StartsWith(url.TrimEnd('*'), StringComparison.OrdinalIgnoreCase)
+                    : string.Equals(requestPath, url, StringComparison.OrdinalIgnoreCase);
+            }),
+        };
+
+        _culture = new GlobalMethod
         {
-            return _allMethods;
-        }
+            Name = "culture",
+            Method = serviceProvider => (Func<string, bool>)(culture =>
+            {
+                var currentCulture = CultureInfo.CurrentCulture;
+
+                return string.Equals(culture, currentCulture.Name, StringComparison.OrdinalIgnoreCase) ||
+                    string.Equals(culture, currentCulture.Parent.Name, StringComparison.OrdinalIgnoreCase);
+            }),
+        };
+
+        _allMethods = [_isAnonymous, _isAuthenticated, _isInRole, _isHomepage, _url, _culture];
+    }
+
+    public IEnumerable<GlobalMethod> GetMethods()
+    {
+        return _allMethods;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Services/ILayerService.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Services/ILayerService.cs
index 9b9d13ba692..10b67407a34 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Services/ILayerService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Services/ILayerService.cs
@@ -6,26 +6,25 @@
 using OrchardCore.ContentManagement.Records;
 using OrchardCore.Layers.Models;
 
-namespace OrchardCore.Layers.Services
+namespace OrchardCore.Layers.Services;
+
+public interface ILayerService
 {
-    public interface ILayerService
-    {
-        /// <summary>
-        /// Loads the layers document from the store for updating and that should not be cached.
-        /// </summary>
-        Task<LayersDocument> LoadLayersAsync();
+    /// <summary>
+    /// Loads the layers document from the store for updating and that should not be cached.
+    /// </summary>
+    Task<LayersDocument> LoadLayersAsync();
 
-        /// <summary>
-        /// Gets the layers document from the cache for sharing and that should not be updated.
-        /// </summary>
-        Task<LayersDocument> GetLayersAsync();
+    /// <summary>
+    /// Gets the layers document from the cache for sharing and that should not be updated.
+    /// </summary>
+    Task<LayersDocument> GetLayersAsync();
 
-        Task<IEnumerable<ContentItem>> GetLayerWidgetsAsync(Expression<Func<ContentItemIndex, bool>> predicate);
-        Task<IEnumerable<LayerMetadata>> GetLayerWidgetsMetadataAsync(Expression<Func<ContentItemIndex, bool>> predicate);
+    Task<IEnumerable<ContentItem>> GetLayerWidgetsAsync(Expression<Func<ContentItemIndex, bool>> predicate);
+    Task<IEnumerable<LayerMetadata>> GetLayerWidgetsMetadataAsync(Expression<Func<ContentItemIndex, bool>> predicate);
 
-        /// <summary>
-        /// Updates the store with the provided layers document and then updates the cache.
-        /// </summary>
-        Task UpdateAsync(LayersDocument layers);
-    }
+    /// <summary>
+    /// Updates the store with the provided layers document and then updates the cache.
+    /// </summary>
+    Task UpdateAsync(LayersDocument layers);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Services/LayerFilter.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Services/LayerFilter.cs
index 4a510deec1b..1f31ea11be0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Services/LayerFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Services/LayerFilter.cs
@@ -17,135 +17,134 @@
 using OrchardCore.Mvc.Utilities;
 using OrchardCore.Rules.Services;
 
-namespace OrchardCore.Layers.Services
+namespace OrchardCore.Layers.Services;
+
+public sealed class LayerFilter : IAsyncResultFilter
 {
-    public sealed class LayerFilter : IAsyncResultFilter
+    private const string WidgetsKey = "OrchardCore.Layers.LayerFilter:AllWidgets";
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ILayoutAccessor _layoutAccessor;
+    private readonly IContentItemDisplayManager _contentItemDisplayManager;
+    private readonly IUpdateModelAccessor _modelUpdaterAccessor;
+    private readonly IRuleService _ruleService;
+    private readonly IMemoryCache _memoryCache;
+    private readonly IThemeManager _themeManager;
+    private readonly IAdminThemeService _adminThemeService;
+    private readonly ILayerService _layerService;
+    private readonly IVolatileDocumentManager<LayerState> _layerStateManager;
+
+    public LayerFilter(
+        IContentDefinitionManager contentDefinitionManager,
+        ILayerService layerService,
+        ILayoutAccessor layoutAccessor,
+        IContentItemDisplayManager contentItemDisplayManager,
+        IUpdateModelAccessor modelUpdaterAccessor,
+        IRuleService ruleService,
+        IMemoryCache memoryCache,
+        IThemeManager themeManager,
+        IAdminThemeService adminThemeService,
+        IVolatileDocumentManager<LayerState> layerStateManager)
     {
-        private const string WidgetsKey = "OrchardCore.Layers.LayerFilter:AllWidgets";
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly ILayoutAccessor _layoutAccessor;
-        private readonly IContentItemDisplayManager _contentItemDisplayManager;
-        private readonly IUpdateModelAccessor _modelUpdaterAccessor;
-        private readonly IRuleService _ruleService;
-        private readonly IMemoryCache _memoryCache;
-        private readonly IThemeManager _themeManager;
-        private readonly IAdminThemeService _adminThemeService;
-        private readonly ILayerService _layerService;
-        private readonly IVolatileDocumentManager<LayerState> _layerStateManager;
-
-        public LayerFilter(
-            IContentDefinitionManager contentDefinitionManager,
-            ILayerService layerService,
-            ILayoutAccessor layoutAccessor,
-            IContentItemDisplayManager contentItemDisplayManager,
-            IUpdateModelAccessor modelUpdaterAccessor,
-            IRuleService ruleService,
-            IMemoryCache memoryCache,
-            IThemeManager themeManager,
-            IAdminThemeService adminThemeService,
-            IVolatileDocumentManager<LayerState> layerStateManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _layerService = layerService;
-            _layoutAccessor = layoutAccessor;
-            _contentItemDisplayManager = contentItemDisplayManager;
-            _modelUpdaterAccessor = modelUpdaterAccessor;
-            _ruleService = ruleService;
-            _memoryCache = memoryCache;
-            _themeManager = themeManager;
-            _adminThemeService = adminThemeService;
-            _layerStateManager = layerStateManager;
-        }
+        _contentDefinitionManager = contentDefinitionManager;
+        _layerService = layerService;
+        _layoutAccessor = layoutAccessor;
+        _contentItemDisplayManager = contentItemDisplayManager;
+        _modelUpdaterAccessor = modelUpdaterAccessor;
+        _ruleService = ruleService;
+        _memoryCache = memoryCache;
+        _themeManager = themeManager;
+        _adminThemeService = adminThemeService;
+        _layerStateManager = layerStateManager;
+    }
 
-        public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
+    public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
+    {
+        // Should only run on the front-end for a full view
+        if (context.IsViewOrPageResult() && !AdminAttribute.IsApplied(context.HttpContext))
         {
-            // Should only run on the front-end for a full view
-            if (context.IsViewOrPageResult() && !AdminAttribute.IsApplied(context.HttpContext))
+            // Even if the Admin attribute is not applied we might be using the admin theme, for instance in Login views.
+            // In this case don't render Layers.
+            var selectedTheme = (await _themeManager.GetThemeAsync())?.Id;
+            var adminTheme = await _adminThemeService.GetAdminThemeNameAsync();
+            if (selectedTheme == adminTheme)
             {
-                // Even if the Admin attribute is not applied we might be using the admin theme, for instance in Login views.
-                // In this case don't render Layers.
-                var selectedTheme = (await _themeManager.GetThemeAsync())?.Id;
-                var adminTheme = await _adminThemeService.GetAdminThemeNameAsync();
-                if (selectedTheme == adminTheme)
-                {
-                    await next.Invoke();
-                    return;
-                }
+                await next.Invoke();
+                return;
+            }
 
-                var layerState = await _layerStateManager.GetOrCreateImmutableAsync();
+            var layerState = await _layerStateManager.GetOrCreateImmutableAsync();
 
-                if (!_memoryCache.TryGetValue<CacheEntry>(WidgetsKey, out var cacheEntry) || cacheEntry.Identifier != layerState.Identifier)
+            if (!_memoryCache.TryGetValue<CacheEntry>(WidgetsKey, out var cacheEntry) || cacheEntry.Identifier != layerState.Identifier)
+            {
+                cacheEntry = new CacheEntry()
                 {
-                    cacheEntry = new CacheEntry()
-                    {
-                        Identifier = layerState.Identifier,
-                        Widgets = await _layerService.GetLayerWidgetsMetadataAsync(x => x.Published)
-                    };
+                    Identifier = layerState.Identifier,
+                    Widgets = await _layerService.GetLayerWidgetsMetadataAsync(x => x.Published)
+                };
 
-                    _memoryCache.Set(WidgetsKey, cacheEntry);
-                }
+                _memoryCache.Set(WidgetsKey, cacheEntry);
+            }
 
-                var widgets = cacheEntry.Widgets;
+            var widgets = cacheEntry.Widgets;
 
-                var layers = (await _layerService.GetLayersAsync()).Layers.ToDictionary(x => x.Name);
+            var layers = (await _layerService.GetLayersAsync()).Layers.ToDictionary(x => x.Name);
 
-                var layout = await _layoutAccessor.GetLayoutAsync();
-                var updater = _modelUpdaterAccessor.ModelUpdater;
+            var layout = await _layoutAccessor.GetLayoutAsync();
+            var updater = _modelUpdaterAccessor.ModelUpdater;
 
-                var layersCache = new Dictionary<string, bool>();
-                var contentDefinitions = await _contentDefinitionManager.ListTypeDefinitionsAsync();
+            var layersCache = new Dictionary<string, bool>();
+            var contentDefinitions = await _contentDefinitionManager.ListTypeDefinitionsAsync();
 
-                foreach (var widget in widgets)
-                {
-                    var layer = widget.Layer != null && layers.TryGetValue(widget.Layer, out var widgetLayer) ? widgetLayer : null;
+            foreach (var widget in widgets)
+            {
+                var layer = widget.Layer != null && layers.TryGetValue(widget.Layer, out var widgetLayer) ? widgetLayer : null;
 
-                    if (layer == null)
-                    {
-                        continue;
-                    }
+                if (layer == null)
+                {
+                    continue;
+                }
 
-                    bool display;
-                    if (!layersCache.TryGetValue(layer.Name, out display))
-                    {
-                        display = await _ruleService.EvaluateAsync(layer.LayerRule);
+                bool display;
+                if (!layersCache.TryGetValue(layer.Name, out display))
+                {
+                    display = await _ruleService.EvaluateAsync(layer.LayerRule);
 
-                        layersCache[layer.Name] = display;
-                    }
+                    layersCache[layer.Name] = display;
+                }
 
-                    if (!display)
-                    {
-                        continue;
-                    }
+                if (!display)
+                {
+                    continue;
+                }
 
-                    if (contentDefinitions.Any(c => c.Name == widget.ContentItem.ContentType))
-                    {
-                        var widgetContent = await _contentItemDisplayManager.BuildDisplayAsync(widget.ContentItem, updater);
+                if (contentDefinitions.Any(c => c.Name == widget.ContentItem.ContentType))
+                {
+                    var widgetContent = await _contentItemDisplayManager.BuildDisplayAsync(widget.ContentItem, updater);
 
-                        widgetContent.Classes.Add("widget");
-                        widgetContent.Classes.Add("widget-" + widget.ContentItem.ContentType.HtmlClassify());
+                    widgetContent.Classes.Add("widget");
+                    widgetContent.Classes.Add("widget-" + widget.ContentItem.ContentType.HtmlClassify());
 
-                        var wrapper = new WidgetWrapper
-                        {
-                            Widget = widget.ContentItem,
-                            Content = widgetContent
-                        };
+                    var wrapper = new WidgetWrapper
+                    {
+                        Widget = widget.ContentItem,
+                        Content = widgetContent
+                    };
 
-                        wrapper.Metadata.Alternates.Add("Widget_Wrapper__" + widget.ContentItem.ContentType);
-                        wrapper.Metadata.Alternates.Add("Widget_Wrapper__Zone__" + widget.Zone);
+                    wrapper.Metadata.Alternates.Add("Widget_Wrapper__" + widget.ContentItem.ContentType);
+                    wrapper.Metadata.Alternates.Add("Widget_Wrapper__Zone__" + widget.Zone);
 
-                        var contentZone = layout.Zones[widget.Zone];
+                    var contentZone = layout.Zones[widget.Zone];
 
-                        await contentZone.AddAsync(wrapper, "");
-                    }
+                    await contentZone.AddAsync(wrapper, "");
                 }
             }
-
-            await next.Invoke();
         }
 
-        internal sealed class CacheEntry : Document
-        {
-            public IEnumerable<LayerMetadata> Widgets { get; set; }
-        }
+        await next.Invoke();
+    }
+
+    internal sealed class CacheEntry : Document
+    {
+        public IEnumerable<LayerMetadata> Widgets { get; set; }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Services/LayerService.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Services/LayerService.cs
index ee4b29c714e..7bb67d60188 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Services/LayerService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Services/LayerService.cs
@@ -10,58 +10,57 @@
 using OrchardCore.Layers.Models;
 using YesSql;
 
-namespace OrchardCore.Layers.Services
+namespace OrchardCore.Layers.Services;
+
+public class LayerService : ILayerService
 {
-    public class LayerService : ILayerService
-    {
-        private readonly ISession _session;
-        private readonly IDocumentManager<LayersDocument> _documentManager;
+    private readonly ISession _session;
+    private readonly IDocumentManager<LayersDocument> _documentManager;
 
-        public LayerService(ISession session, IDocumentManager<LayersDocument> documentManager)
-        {
-            _session = session;
-            _documentManager = documentManager;
-        }
+    public LayerService(ISession session, IDocumentManager<LayersDocument> documentManager)
+    {
+        _session = session;
+        _documentManager = documentManager;
+    }
 
-        /// <summary>
-        /// Loads the layers document from the store for updating and that should not be cached.
-        /// </summary>
-        public Task<LayersDocument> LoadLayersAsync() => _documentManager.GetOrCreateMutableAsync();
+    /// <summary>
+    /// Loads the layers document from the store for updating and that should not be cached.
+    /// </summary>
+    public Task<LayersDocument> LoadLayersAsync() => _documentManager.GetOrCreateMutableAsync();
 
-        /// <summary>
-        /// Gets the layers document from the cache for sharing and that should not be updated.
-        /// </summary>
-        public Task<LayersDocument> GetLayersAsync() => _documentManager.GetOrCreateImmutableAsync();
+    /// <summary>
+    /// Gets the layers document from the cache for sharing and that should not be updated.
+    /// </summary>
+    public Task<LayersDocument> GetLayersAsync() => _documentManager.GetOrCreateImmutableAsync();
 
-        public Task<IEnumerable<ContentItem>> GetLayerWidgetsAsync(
-            Expression<Func<ContentItemIndex, bool>> predicate)
-        {
-            return _session
-                .Query<ContentItem, LayerMetadataIndex>()
-                .With(predicate)
-                .ListAsync();
-        }
+    public Task<IEnumerable<ContentItem>> GetLayerWidgetsAsync(
+        Expression<Func<ContentItemIndex, bool>> predicate)
+    {
+        return _session
+            .Query<ContentItem, LayerMetadataIndex>()
+            .With(predicate)
+            .ListAsync();
+    }
 
-        public async Task<IEnumerable<LayerMetadata>> GetLayerWidgetsMetadataAsync(
-            Expression<Func<ContentItemIndex, bool>> predicate)
-        {
-            var allWidgets = await GetLayerWidgetsAsync(predicate);
+    public async Task<IEnumerable<LayerMetadata>> GetLayerWidgetsMetadataAsync(
+        Expression<Func<ContentItemIndex, bool>> predicate)
+    {
+        var allWidgets = await GetLayerWidgetsAsync(predicate);
 
-            return allWidgets
-                .Select(x => x.As<LayerMetadata>())
-                .Where(x => x != null)
-                .OrderBy(x => x.Position)
-                .ToList();
-        }
+        return allWidgets
+            .Select(x => x.As<LayerMetadata>())
+            .Where(x => x != null)
+            .OrderBy(x => x.Position)
+            .ToList();
+    }
 
-        /// <summary>
-        /// Updates the store with the provided layers document and then updates the cache.
-        /// </summary>
-        public async Task UpdateAsync(LayersDocument layers)
-        {
-            var existing = await LoadLayersAsync();
-            existing.Layers = layers.Layers;
-            await _documentManager.UpdateAsync(layers);
-        }
+    /// <summary>
+    /// Updates the store with the provided layers document and then updates the cache.
+    /// </summary>
+    public async Task UpdateAsync(LayersDocument layers)
+    {
+        var existing = await LoadLayersAsync();
+        existing.Layers = layers.Layers;
+        await _documentManager.UpdateAsync(layers);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Startup.cs
index 72b289fdcfd..018ddce7002 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Startup.cs
@@ -23,34 +23,33 @@
 using OrchardCore.Security.Permissions;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Layers
+namespace OrchardCore.Layers;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<WidgetWrapper>();
-            });
+            o.MemberAccessStrategy.Register<WidgetWrapper>();
+        });
 
-            services.Configure<MvcOptions>((options) =>
-            {
-                options.Filters.Add<LayerFilter>();
-            });
+        services.Configure<MvcOptions>((options) =>
+        {
+            options.Filters.Add<LayerFilter>();
+        });
 
-            services.AddScoped<IDisplayDriver<ISite>, LayerSiteSettingsDisplayDriver>();
-            services.AddContentPart<LayerMetadata>();
-            services.AddScoped<IContentDisplayDriver, LayerMetadataWelder>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<ILayerService, LayerService>();
-            services.AddScoped<IContentHandler, LayerMetadataHandler>();
-            services.AddIndexProvider<LayerMetadataIndexProvider>();
-            services.AddDataMigration<Migrations>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddRecipeExecutionStep<LayerStep>();
-            services.AddDeployment<AllLayersDeploymentSource, AllLayersDeploymentStep, AllLayersDeploymentStepDriver>();
-            services.AddSingleton<IGlobalMethodProvider, DefaultLayersMethodProvider>();
-        }
+        services.AddScoped<IDisplayDriver<ISite>, LayerSiteSettingsDisplayDriver>();
+        services.AddContentPart<LayerMetadata>();
+        services.AddScoped<IContentDisplayDriver, LayerMetadataWelder>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<ILayerService, LayerService>();
+        services.AddScoped<IContentHandler, LayerMetadataHandler>();
+        services.AddIndexProvider<LayerMetadataIndexProvider>();
+        services.AddDataMigration<Migrations>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddRecipeExecutionStep<LayerStep>();
+        services.AddDeployment<AllLayersDeploymentSource, AllLayersDeploymentStep, AllLayersDeploymentStepDriver>();
+        services.AddSingleton<IGlobalMethodProvider, DefaultLayersMethodProvider>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerEditViewModel.cs
index 9f3eeea6795..64962e81e13 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerEditViewModel.cs
@@ -1,12 +1,11 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Layers.ViewModels
+namespace OrchardCore.Layers.ViewModels;
+
+public class LayerEditViewModel
 {
-    public class LayerEditViewModel
-    {
-        public string Name { get; set; }
-        public string Description { get; set; }
-        public dynamic LayerRule { get; set; }
-        public Dictionary<string, dynamic> Thumbnails { get; set; }
-    }
+    public string Name { get; set; }
+    public string Description { get; set; }
+    public dynamic LayerRule { get; set; }
+    public Dictionary<string, dynamic> Thumbnails { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerMetadataEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerMetadataEditViewModel.cs
index 3bf08860c04..53f8c1c3fac 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerMetadataEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerMetadataEditViewModel.cs
@@ -1,12 +1,11 @@
 using System.Collections.Generic;
 using OrchardCore.Layers.Models;
 
-namespace OrchardCore.Layers.ViewModels
+namespace OrchardCore.Layers.ViewModels;
+
+public class LayerMetadataEditViewModel
 {
-    public class LayerMetadataEditViewModel
-    {
-        public string Title { get; set; }
-        public LayerMetadata LayerMetadata { get; set; }
-        public List<Layer> Layers { get; set; }
-    }
+    public string Title { get; set; }
+    public LayerMetadata LayerMetadata { get; set; }
+    public List<Layer> Layers { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerRuleCreateViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerRuleCreateViewModel.cs
index fb42ff7649a..4801e0b7805 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerRuleCreateViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerRuleCreateViewModel.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.Layers.ViewModels
+namespace OrchardCore.Layers.ViewModels;
+
+public class LayerRuleCreateViewModel
 {
-    public class LayerRuleCreateViewModel
-    {
-        public string Name { get; set; }
-        public string ConditionGroupId { get; set; }
-        public string ConditionType { get; set; }
-        public dynamic Editor { get; set; }
-    }
+    public string Name { get; set; }
+    public string ConditionGroupId { get; set; }
+    public string ConditionType { get; set; }
+    public dynamic Editor { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerRuleEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerRuleEditViewModel.cs
index d97e7a8def8..51f2bb47412 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerRuleEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerRuleEditViewModel.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.Layers.ViewModels
+namespace OrchardCore.Layers.ViewModels;
+
+public class LayerRuleEditViewModel
 {
-    public class LayerRuleEditViewModel
-    {
-        public string Name { get; set; }
-        public string ConditionGroupId { get; set; }
-        public string ConditionId { get; set; }
-        public string ConditionType { get; set; }
-        public dynamic Editor { get; set; }
-    }
+    public string Name { get; set; }
+    public string ConditionGroupId { get; set; }
+    public string ConditionId { get; set; }
+    public string ConditionType { get; set; }
+    public dynamic Editor { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerSettingsViewModel.cs
index 369ced6d37c..bd732a690ab 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayerSettingsViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Layers.ViewModels
+namespace OrchardCore.Layers.ViewModels;
+
+public class LayerSettingsViewModel
 {
-    public class LayerSettingsViewModel
-    {
-        public string Zones { get; set; }
-    }
+    public string Zones { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayersIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayersIndexViewModel.cs
index d651a4b48ef..c81d45c0322 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayersIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/LayersIndexViewModel.cs
@@ -2,17 +2,16 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Layers.Models;
 
-namespace OrchardCore.Layers.ViewModels
+namespace OrchardCore.Layers.ViewModels;
+
+public class LayersIndexViewModel
 {
-    public class LayersIndexViewModel
-    {
-        [BindNever]
-        public string[] Zones { get; set; }
+    [BindNever]
+    public string[] Zones { get; set; }
 
-        [BindNever]
-        public Dictionary<string, List<dynamic>> Widgets { get; set; } = [];
+    [BindNever]
+    public Dictionary<string, List<dynamic>> Widgets { get; set; } = [];
 
-        [BindNever]
-        public List<Layer> Layers { get; set; }
-    }
+    [BindNever]
+    public List<Layer> Layers { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/WidgetWrapper.cs b/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/WidgetWrapper.cs
index a1111edfe90..5530defaf20 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/WidgetWrapper.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/ViewModels/WidgetWrapper.cs
@@ -2,15 +2,14 @@
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Layers.ViewModels
+namespace OrchardCore.Layers.ViewModels;
+
+public class WidgetWrapper : ShapeViewModel
 {
-    public class WidgetWrapper : ShapeViewModel
+    public WidgetWrapper() : base("Widget_Wrapper")
     {
-        public WidgetWrapper() : base("Widget_Wrapper")
-        {
-        }
-
-        public ContentItem Widget { get; set; }
-        public IShape Content { get; set; }
     }
+
+    public ContentItem Widget { get; set; }
+    public IShape Content { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Drivers/LiquidPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Drivers/LiquidPartDisplayDriver.cs
index 9c26f574e98..1e9b852ed8f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/Drivers/LiquidPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/Drivers/LiquidPartDisplayDriver.cs
@@ -7,60 +7,59 @@
 using OrchardCore.Liquid.ViewModels;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Liquid.Drivers
-{
-    public sealed class LiquidPartDisplayDriver : ContentPartDisplayDriver<LiquidPart>
-    {
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
+namespace OrchardCore.Liquid.Drivers;
 
-        internal readonly IStringLocalizer S;
+public sealed class LiquidPartDisplayDriver : ContentPartDisplayDriver<LiquidPart>
+{
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
 
-        public LiquidPartDisplayDriver(
-            ILiquidTemplateManager liquidTemplateManager,
-            IStringLocalizer<LiquidPartDisplayDriver> localizer)
-        {
-            _liquidTemplateManager = liquidTemplateManager;
-            S = localizer;
-        }
+    internal readonly IStringLocalizer S;
 
-        public override Task<IDisplayResult> DisplayAsync(LiquidPart liquidPart, BuildPartDisplayContext context)
-        {
-            return CombineAsync(
-                Initialize<LiquidPartViewModel>("LiquidPart", m => BuildViewModel(m, liquidPart))
-                    .Location("Detail", "Content"),
-                Initialize<LiquidPartViewModel>("LiquidPart_Summary", m => BuildViewModel(m, liquidPart))
-                    .Location("Summary", "Content")
-            );
-        }
+    public LiquidPartDisplayDriver(
+        ILiquidTemplateManager liquidTemplateManager,
+        IStringLocalizer<LiquidPartDisplayDriver> localizer)
+    {
+        _liquidTemplateManager = liquidTemplateManager;
+        S = localizer;
+    }
 
-        public override IDisplayResult Edit(LiquidPart liquidPart, BuildPartEditorContext context)
-        {
-            return Initialize<LiquidPartViewModel>("LiquidPart_Edit", m => BuildViewModel(m, liquidPart));
-        }
+    public override Task<IDisplayResult> DisplayAsync(LiquidPart liquidPart, BuildPartDisplayContext context)
+    {
+        return CombineAsync(
+            Initialize<LiquidPartViewModel>("LiquidPart", m => BuildViewModel(m, liquidPart))
+                .Location("Detail", "Content"),
+            Initialize<LiquidPartViewModel>("LiquidPart_Summary", m => BuildViewModel(m, liquidPart))
+                .Location("Summary", "Content")
+        );
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(LiquidPart model, UpdatePartEditorContext context)
-        {
-            var viewModel = new LiquidPartViewModel();
+    public override IDisplayResult Edit(LiquidPart liquidPart, BuildPartEditorContext context)
+    {
+        return Initialize<LiquidPartViewModel>("LiquidPart_Edit", m => BuildViewModel(m, liquidPart));
+    }
 
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix, t => t.Liquid);
+    public override async Task<IDisplayResult> UpdateAsync(LiquidPart model, UpdatePartEditorContext context)
+    {
+        var viewModel = new LiquidPartViewModel();
 
-            if (!string.IsNullOrEmpty(viewModel.Liquid) && !_liquidTemplateManager.Validate(viewModel.Liquid, out var errors))
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-            }
-            else
-            {
-                model.Liquid = viewModel.Liquid;
-            }
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix, t => t.Liquid);
 
-            return Edit(model, context);
+        if (!string.IsNullOrEmpty(viewModel.Liquid) && !_liquidTemplateManager.Validate(viewModel.Liquid, out var errors))
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Liquid), S["The Liquid Body doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
         }
-
-        private static void BuildViewModel(LiquidPartViewModel model, LiquidPart liquidPart)
+        else
         {
-            model.Liquid = liquidPart.Liquid;
-            model.LiquidPart = liquidPart;
-            model.ContentItem = liquidPart.ContentItem;
+            model.Liquid = viewModel.Liquid;
         }
+
+        return Edit(model, context);
+    }
+
+    private static void BuildViewModel(LiquidPartViewModel model, LiquidPart liquidPart)
+    {
+        model.Liquid = liquidPart.Liquid;
+        model.LiquidPart = liquidPart;
+        model.ContentItem = liquidPart.ContentItem;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/AbsoluteUrlFilter.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/AbsoluteUrlFilter.cs
index 44d525cdaec..a8cb7f96542 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/AbsoluteUrlFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/AbsoluteUrlFilter.cs
@@ -4,29 +4,28 @@
 using Microsoft.AspNetCore.Mvc.Routing;
 using OrchardCore.Mvc.Core.Utilities;
 
-namespace OrchardCore.Liquid.Filters
+namespace OrchardCore.Liquid.Filters;
+
+public class AbsoluteUrlFilter : ILiquidFilter
 {
-    public class AbsoluteUrlFilter : ILiquidFilter
+    private readonly IUrlHelperFactory _urlHelperFactory;
+
+    public AbsoluteUrlFilter(IUrlHelperFactory urlHelperFactory)
+    {
+        _urlHelperFactory = urlHelperFactory;
+    }
+    public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
     {
-        private readonly IUrlHelperFactory _urlHelperFactory;
+        var relativePath = input.ToStringValue();
 
-        public AbsoluteUrlFilter(IUrlHelperFactory urlHelperFactory)
+        if (string.IsNullOrWhiteSpace(relativePath))
         {
-            _urlHelperFactory = urlHelperFactory;
+            return new ValueTask<FluidValue>(input);
         }
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
-        {
-            var relativePath = input.ToStringValue();
-
-            if (string.IsNullOrWhiteSpace(relativePath))
-            {
-                return new ValueTask<FluidValue>(input);
-            }
 
-            var urlHelper = _urlHelperFactory.GetUrlHelper(context.ViewContext);
+        var urlHelper = _urlHelperFactory.GetUrlHelper(context.ViewContext);
 
-            var result = new StringValue(urlHelper.ToAbsoluteUrl(relativePath));
-            return new ValueTask<FluidValue>(result);
-        }
+        var result = new StringValue(urlHelper.ToAbsoluteUrl(relativePath));
+        return new ValueTask<FluidValue>(result);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/ContentUrlFilter.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/ContentUrlFilter.cs
index f73f4a4f11a..d37cbc6d61a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/ContentUrlFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/ContentUrlFilter.cs
@@ -3,22 +3,21 @@
 using Fluid.Values;
 using Microsoft.AspNetCore.Mvc.Routing;
 
-namespace OrchardCore.Liquid.Filters
+namespace OrchardCore.Liquid.Filters;
+
+public class ContentUrlFilter : ILiquidFilter
 {
-    public class ContentUrlFilter : ILiquidFilter
-    {
-        private readonly IUrlHelperFactory _urlHelperFactory;
+    private readonly IUrlHelperFactory _urlHelperFactory;
 
-        public ContentUrlFilter(IUrlHelperFactory urlHelperFactory)
-        {
-            _urlHelperFactory = urlHelperFactory;
-        }
+    public ContentUrlFilter(IUrlHelperFactory urlHelperFactory)
+    {
+        _urlHelperFactory = urlHelperFactory;
+    }
 
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
-        {
-            var urlHelper = _urlHelperFactory.GetUrlHelper(context.ViewContext);
+    public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
+    {
+        var urlHelper = _urlHelperFactory.GetUrlHelper(context.ViewContext);
 
-            return new ValueTask<FluidValue>(new StringValue((urlHelper).Content(input.ToStringValue())));
-        }
+        return new ValueTask<FluidValue>(new StringValue((urlHelper).Content(input.ToStringValue())));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/JsonFilter.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/JsonFilter.cs
index acff2ddc9d5..d4c607fc329 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/JsonFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/JsonFilter.cs
@@ -5,49 +5,48 @@
 using Fluid;
 using Fluid.Values;
 
-namespace OrchardCore.Liquid.Filters
+namespace OrchardCore.Liquid.Filters;
+
+public static class JsonFilter
 {
-    public static class JsonFilter
+    public static ValueTask<FluidValue> Json(FluidValue input, FilterArguments arguments, TemplateContext context)
     {
-        public static ValueTask<FluidValue> Json(FluidValue input, FilterArguments arguments, TemplateContext context)
+        var formatting = JOptions.Default;
+        if (arguments.At(0).ToBooleanValue())
         {
-            var formatting = JOptions.Default;
-            if (arguments.At(0).ToBooleanValue())
-            {
-                formatting = JOptions.Indented;
-            }
-
-            switch (input.Type)
-            {
-                case FluidValues.Array:
-                    return new ValueTask<FluidValue>(new StringValue(JConvert.SerializeObject(input.Enumerate(context).Select(o => o.ToObjectValue()), formatting)));
+            formatting = JOptions.Indented;
+        }
 
-                case FluidValues.Boolean:
-                    return new ValueTask<FluidValue>(new StringValue(JConvert.SerializeObject(input.ToBooleanValue(), formatting)));
+        switch (input.Type)
+        {
+            case FluidValues.Array:
+                return new ValueTask<FluidValue>(new StringValue(JConvert.SerializeObject(input.Enumerate(context).Select(o => o.ToObjectValue()), formatting)));
 
-                case FluidValues.Nil:
-                    return new ValueTask<FluidValue>(StringValue.Create("null"));
+            case FluidValues.Boolean:
+                return new ValueTask<FluidValue>(new StringValue(JConvert.SerializeObject(input.ToBooleanValue(), formatting)));
 
-                case FluidValues.Number:
-                    return new ValueTask<FluidValue>(new StringValue(JConvert.SerializeObject(input.ToNumberValue(), formatting)));
+            case FluidValues.Nil:
+                return new ValueTask<FluidValue>(StringValue.Create("null"));
 
-                case FluidValues.DateTime:
-                case FluidValues.Dictionary:
-                case FluidValues.Object:
-                    return new ValueTask<FluidValue>(new StringValue(JConvert.SerializeObject(input.ToObjectValue(), formatting)));
+            case FluidValues.Number:
+                return new ValueTask<FluidValue>(new StringValue(JConvert.SerializeObject(input.ToNumberValue(), formatting)));
 
-                case FluidValues.String:
-                    var stringValue = input.ToStringValue();
+            case FluidValues.DateTime:
+            case FluidValues.Dictionary:
+            case FluidValues.Object:
+                return new ValueTask<FluidValue>(new StringValue(JConvert.SerializeObject(input.ToObjectValue(), formatting)));
 
-                    if (string.IsNullOrWhiteSpace(stringValue))
-                    {
-                        return new ValueTask<FluidValue>(input);
-                    }
+            case FluidValues.String:
+                var stringValue = input.ToStringValue();
 
-                    return new ValueTask<FluidValue>(new StringValue(JConvert.SerializeObject(stringValue, formatting)));
-            }
+                if (string.IsNullOrWhiteSpace(stringValue))
+                {
+                    return new ValueTask<FluidValue>(input);
+                }
 
-            throw new NotSupportedException("Unrecognized FluidValue");
+                return new ValueTask<FluidValue>(new StringValue(JConvert.SerializeObject(stringValue, formatting)));
         }
+
+        throw new NotSupportedException("Unrecognized FluidValue");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/JsonParseFilter.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/JsonParseFilter.cs
index 39d24d0409c..5205d6b5ae1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/JsonParseFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/JsonParseFilter.cs
@@ -4,19 +4,18 @@
 using Fluid;
 using Fluid.Values;
 
-namespace OrchardCore.Liquid.Filters
+namespace OrchardCore.Liquid.Filters;
+
+public static class JsonParseFilter
 {
-    public static class JsonParseFilter
+    public static ValueTask<FluidValue> JsonParse(FluidValue input, FilterArguments _, TemplateContext context)
     {
-        public static ValueTask<FluidValue> JsonParse(FluidValue input, FilterArguments _, TemplateContext context)
+        var parsedValue = JNode.Parse(input.ToStringValue());
+        if (parsedValue.GetValueKind() == JsonValueKind.Array)
         {
-            var parsedValue = JNode.Parse(input.ToStringValue());
-            if (parsedValue.GetValueKind() == JsonValueKind.Array)
-            {
-                return new ValueTask<FluidValue>(FluidValue.Create(parsedValue, context.Options));
-            }
-
-            return new ValueTask<FluidValue>(new ObjectValue(parsedValue));
+            return new ValueTask<FluidValue>(FluidValue.Create(parsedValue, context.Options));
         }
+
+        return new ValueTask<FluidValue>(new ObjectValue(parsedValue));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/LiquidFilter.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/LiquidFilter.cs
index 4eac1e7b12b..62c2b30931e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/LiquidFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/LiquidFilter.cs
@@ -3,23 +3,22 @@
 using Fluid;
 using Fluid.Values;
 
-namespace OrchardCore.Liquid.Filters
+namespace OrchardCore.Liquid.Filters;
+
+public class LiquidFilter : ILiquidFilter
 {
-    public class LiquidFilter : ILiquidFilter
-    {
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly HtmlEncoder _htmlEncoder;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly HtmlEncoder _htmlEncoder;
 
-        public LiquidFilter(ILiquidTemplateManager liquidTemplateManager, HtmlEncoder htmlEncoder)
-        {
-            _liquidTemplateManager = liquidTemplateManager;
-            _htmlEncoder = htmlEncoder;
-        }
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
-        {
-            var content = await _liquidTemplateManager.RenderStringAsync(input.ToStringValue(), _htmlEncoder, arguments.At(0));
+    public LiquidFilter(ILiquidTemplateManager liquidTemplateManager, HtmlEncoder htmlEncoder)
+    {
+        _liquidTemplateManager = liquidTemplateManager;
+        _htmlEncoder = htmlEncoder;
+    }
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        var content = await _liquidTemplateManager.RenderStringAsync(input.ToStringValue(), _htmlEncoder, arguments.At(0));
 
-            return new StringValue(content, false);
-        }
+        return new StringValue(content, false);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/LocalTimeZoneFilter.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/LocalTimeZoneFilter.cs
index 57ed849a2f5..bdd4de7efa2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/LocalTimeZoneFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/LocalTimeZoneFilter.cs
@@ -5,53 +5,52 @@
 using Fluid.Values;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Liquid.Filters
+namespace OrchardCore.Liquid.Filters;
+
+public class LocalTimeZoneFilter : ILiquidFilter
 {
-    public class LocalTimeZoneFilter : ILiquidFilter
+    private readonly ILocalClock _localClock;
+
+    public LocalTimeZoneFilter(ILocalClock localClock)
     {
-        private readonly ILocalClock _localClock;
+        _localClock = localClock;
+    }
 
-        public LocalTimeZoneFilter(ILocalClock localClock)
-        {
-            _localClock = localClock;
-        }
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        DateTimeOffset value;
 
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+        if (input.Type == FluidValues.String)
         {
-            DateTimeOffset value;
+            var stringValue = input.ToStringValue();
 
-            if (input.Type == FluidValues.String)
+            if (stringValue == "now" || stringValue == "today")
             {
-                var stringValue = input.ToStringValue();
-
-                if (stringValue == "now" || stringValue == "today")
-                {
-                    value = await _localClock.LocalNowAsync;
-                }
-                else
-                {
-                    if (!DateTimeOffset.TryParse(stringValue, ctx.Options.CultureInfo, DateTimeStyles.AssumeUniversal, out value))
-                    {
-                        return NilValue.Instance;
-                    }
-                }
+                value = await _localClock.LocalNowAsync;
             }
             else
             {
-                switch (input.ToObjectValue())
+                if (!DateTimeOffset.TryParse(stringValue, ctx.Options.CultureInfo, DateTimeStyles.AssumeUniversal, out value))
                 {
-                    case DateTime dateTime:
-                        value = dateTime;
-                        break;
-                    case DateTimeOffset dateTimeOffset:
-                        value = dateTimeOffset;
-                        break;
-                    default:
-                        return NilValue.Instance;
+                    return NilValue.Instance;
                 }
             }
-
-            return new ObjectValue(await _localClock.ConvertToLocalAsync(value));
         }
+        else
+        {
+            switch (input.ToObjectValue())
+            {
+                case DateTime dateTime:
+                    value = dateTime;
+                    break;
+                case DateTimeOffset dateTimeOffset:
+                    value = dateTimeOffset;
+                    break;
+                default:
+                    return NilValue.Instance;
+            }
+        }
+
+        return new ObjectValue(await _localClock.ConvertToLocalAsync(value));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/ShortCodeFilter.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/ShortCodeFilter.cs
index f8d365e6a4c..43b6494bb36 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/ShortCodeFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/ShortCodeFilter.cs
@@ -5,33 +5,32 @@
 using OrchardCore.Shortcodes.Services;
 using Shortcodes;
 
-namespace OrchardCore.Liquid.Filters
+namespace OrchardCore.Liquid.Filters;
+
+public class ShortcodeFilter : ILiquidFilter
 {
-    public class ShortcodeFilter : ILiquidFilter
+    private readonly IShortcodeService _shortcodeService;
+
+    public ShortcodeFilter(IShortcodeService shortcodeService)
+    {
+        _shortcodeService = shortcodeService;
+    }
+
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
     {
-        private readonly IShortcodeService _shortcodeService;
+        var shortcodeContext = new Context();
 
-        public ShortcodeFilter(IShortcodeService shortcodeService)
+        // Retrieve the 'ContentItem' from the ambient liquid scope.
+        var model = context.GetValue("Model").ToObjectValue();
+        if (model is Shape shape && shape.Properties.TryGetValue("ContentItem", out var contentItem))
         {
-            _shortcodeService = shortcodeService;
+            shortcodeContext["ContentItem"] = contentItem;
         }
-
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
+        else
         {
-            var shortcodeContext = new Context();
-
-            // Retrieve the 'ContentItem' from the ambient liquid scope.
-            var model = context.GetValue("Model").ToObjectValue();
-            if (model is Shape shape && shape.Properties.TryGetValue("ContentItem", out var contentItem))
-            {
-                shortcodeContext["ContentItem"] = contentItem;
-            }
-            else
-            {
-                shortcodeContext["ContentItem"] = null;
-            }
-
-            return new StringValue(await _shortcodeService.ProcessAsync(input.ToStringValue(), shortcodeContext));
+            shortcodeContext["ContentItem"] = null;
         }
+
+        return new StringValue(await _shortcodeService.ProcessAsync(input.ToStringValue(), shortcodeContext));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/SlugifyFilter.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/SlugifyFilter.cs
index 006fd72a293..a8f9c5ab801 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/SlugifyFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/SlugifyFilter.cs
@@ -3,21 +3,20 @@
 using Fluid.Values;
 using OrchardCore.Modules.Services;
 
-namespace OrchardCore.Liquid.Filters
+namespace OrchardCore.Liquid.Filters;
+
+public class SlugifyFilter : ILiquidFilter
 {
-    public class SlugifyFilter : ILiquidFilter
-    {
-        private readonly ISlugService _slugService;
+    private readonly ISlugService _slugService;
 
-        public SlugifyFilter(ISlugService slugService)
-        {
-            _slugService = slugService;
-        }
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
-        {
-            var text = input.ToStringValue();
+    public SlugifyFilter(ISlugService slugService)
+    {
+        _slugService = slugService;
+    }
+    public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        var text = input.ToStringValue();
 
-            return new StringValue(_slugService.Slugify(text));
-        }
+        return new StringValue(_slugService.Slugify(text));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/UtcTimeZoneFilter.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/UtcTimeZoneFilter.cs
index 4cbe18d59c7..ea8a5cddfcd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/UtcTimeZoneFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/UtcTimeZoneFilter.cs
@@ -5,53 +5,52 @@
 using Fluid.Values;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Liquid.Filters
+namespace OrchardCore.Liquid.Filters;
+
+public class UtcTimeZoneFilter : ILiquidFilter
 {
-    public class UtcTimeZoneFilter : ILiquidFilter
+    private readonly ILocalClock _localClock;
+
+    public UtcTimeZoneFilter(ILocalClock localClock)
     {
-        private readonly ILocalClock _localClock;
+        _localClock = localClock;
+    }
 
-        public UtcTimeZoneFilter(ILocalClock localClock)
-        {
-            _localClock = localClock;
-        }
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        DateTimeOffset value;
 
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+        if (input.Type == FluidValues.String)
         {
-            DateTimeOffset value;
+            var stringValue = input.ToStringValue();
 
-            if (input.Type == FluidValues.String)
+            if (stringValue == "now" || stringValue == "today")
             {
-                var stringValue = input.ToStringValue();
-
-                if (stringValue == "now" || stringValue == "today")
-                {
-                    value = await _localClock.LocalNowAsync;
-                }
-                else
-                {
-                    if (!DateTimeOffset.TryParse(stringValue, ctx.Options.CultureInfo, DateTimeStyles.AssumeUniversal, out value))
-                    {
-                        return NilValue.Instance;
-                    }
-                }
+                value = await _localClock.LocalNowAsync;
             }
             else
             {
-                switch (input.ToObjectValue())
+                if (!DateTimeOffset.TryParse(stringValue, ctx.Options.CultureInfo, DateTimeStyles.AssumeUniversal, out value))
                 {
-                    case DateTime dateTime:
-                        value = dateTime;
-                        break;
-                    case DateTimeOffset dateTimeOffset:
-                        value = dateTimeOffset;
-                        break;
-                    default:
-                        return NilValue.Instance;
+                    return NilValue.Instance;
                 }
             }
-
-            return new ObjectValue(await _localClock.ConvertToUtcAsync(value.DateTime));
         }
+        else
+        {
+            switch (input.ToObjectValue())
+            {
+                case DateTime dateTime:
+                    value = dateTime;
+                    break;
+                case DateTimeOffset dateTimeOffset:
+                    value = dateTimeOffset;
+                    break;
+                default:
+                    return NilValue.Instance;
+            }
+        }
+
+        return new ObjectValue(await _localClock.ConvertToUtcAsync(value.DateTime));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Handlers/LiquidPartHandler.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Handlers/LiquidPartHandler.cs
index f75a97cfa85..e160c94373d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/Handlers/LiquidPartHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/Handlers/LiquidPartHandler.cs
@@ -8,41 +8,40 @@
 using OrchardCore.Liquid.Models;
 using OrchardCore.Liquid.ViewModels;
 
-namespace OrchardCore.Liquid.Handlers
+namespace OrchardCore.Liquid.Handlers;
+
+public class LiquidPartHandler : ContentPartHandler<LiquidPart>
 {
-    public class LiquidPartHandler : ContentPartHandler<LiquidPart>
-    {
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly HtmlEncoder _htmlEncoder;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly HtmlEncoder _htmlEncoder;
 
-        public LiquidPartHandler(ILiquidTemplateManager liquidTemplateManager, HtmlEncoder htmlEncoder)
-        {
-            _liquidTemplateManager = liquidTemplateManager;
-            _htmlEncoder = htmlEncoder;
-        }
+    public LiquidPartHandler(ILiquidTemplateManager liquidTemplateManager, HtmlEncoder htmlEncoder)
+    {
+        _liquidTemplateManager = liquidTemplateManager;
+        _htmlEncoder = htmlEncoder;
+    }
 
-        public override Task GetContentItemAspectAsync(ContentItemAspectContext context, LiquidPart part)
+    public override Task GetContentItemAspectAsync(ContentItemAspectContext context, LiquidPart part)
+    {
+        return context.ForAsync<BodyAspect>(async bodyAspect =>
         {
-            return context.ForAsync<BodyAspect>(async bodyAspect =>
+            try
             {
-                try
+                var model = new LiquidPartViewModel()
                 {
-                    var model = new LiquidPartViewModel()
-                    {
-                        LiquidPart = part,
-                        ContentItem = part.ContentItem,
-                    };
+                    LiquidPart = part,
+                    ContentItem = part.ContentItem,
+                };
 
-                    var result = await _liquidTemplateManager.RenderHtmlContentAsync(part.Liquid, _htmlEncoder, model,
-                        new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(model.ContentItem) });
+                var result = await _liquidTemplateManager.RenderHtmlContentAsync(part.Liquid, _htmlEncoder, model,
+                    new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(model.ContentItem) });
 
-                    bodyAspect.Body = result;
-                }
-                catch
-                {
-                    bodyAspect.Body = HtmlString.Empty;
-                }
-            });
-        }
+                bodyAspect.Body = result;
+            }
+            catch
+            {
+                bodyAspect.Body = HtmlString.Empty;
+            }
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Indexing/LiquidPartIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Indexing/LiquidPartIndexHandler.cs
index 9a3fbb394a6..609dc9c6247 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/Indexing/LiquidPartIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/Indexing/LiquidPartIndexHandler.cs
@@ -2,20 +2,19 @@
 using OrchardCore.Indexing;
 using OrchardCore.Liquid.Models;
 
-namespace OrchardCore.Liquid.Indexing
+namespace OrchardCore.Liquid.Indexing;
+
+public class LiquidPartIndexHandler : ContentPartIndexHandler<LiquidPart>
 {
-    public class LiquidPartIndexHandler : ContentPartIndexHandler<LiquidPart>
+    public override Task BuildIndexAsync(LiquidPart part, BuildPartIndexContext context)
     {
-        public override Task BuildIndexAsync(LiquidPart part, BuildPartIndexContext context)
-        {
-            var options = context.Settings.ToOptions() | DocumentIndexOptions.Sanitize;
-
-            foreach (var key in context.Keys)
-            {
-                context.DocumentIndex.Set(key, part.Liquid, options);
-            }
+        var options = context.Settings.ToOptions() | DocumentIndexOptions.Sanitize;
 
-            return Task.CompletedTask;
+        foreach (var key in context.Keys)
+        {
+            context.DocumentIndex.Set(key, part.Liquid, options);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Migrations.cs
index 575b9526546..2888a978099 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/Migrations.cs
@@ -3,24 +3,23 @@
 using OrchardCore.ContentManagement.Metadata.Settings;
 using OrchardCore.Data.Migration;
 
-namespace OrchardCore.Liquid
+namespace OrchardCore.Liquid;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        public Migrations(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public Migrations(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public async Task<int> CreateAsync()
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync("LiquidPart", builder => builder
-                .Attachable()
-                .WithDescription("Provides a Liquid formatted body for your content item."));
+    public async Task<int> CreateAsync()
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync("LiquidPart", builder => builder
+            .Attachable()
+            .WithDescription("Provides a Liquid formatted body for your content item."));
 
-            return 1;
-        }
+        return 1;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Models/LiquidPart.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Models/LiquidPart.cs
index 1a1075d507a..b8dbbcfada5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/Models/LiquidPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/Models/LiquidPart.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Liquid.Models
+namespace OrchardCore.Liquid.Models;
+
+public class LiquidPart : ContentPart
 {
-    public class LiquidPart : ContentPart
-    {
-        public string Liquid { get; set; }
-    }
+    public string Liquid { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/ResourceManagementOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/ResourceManagementOptionsConfiguration.cs
index d19426e1f49..f09e6fffad6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/ResourceManagementOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/ResourceManagementOptionsConfiguration.cs
@@ -1,31 +1,30 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Liquid
+namespace OrchardCore.Liquid;
+
+public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
 {
-    public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
-    {
-        private static readonly ResourceManifest _manifest;
+    private static readonly ResourceManifest _manifest;
 
-        static ResourceManagementOptionsConfiguration()
-        {
-            _manifest = new ResourceManifest();
+    static ResourceManagementOptionsConfiguration()
+    {
+        _manifest = new ResourceManifest();
 
-            _manifest
-                .DefineScript("monaco-liquid-intellisense")
-                .SetUrl("~/OrchardCore.Liquid/monaco/liquid-intellisense.js")
-                .SetDependencies("monaco")
-                .SetVersion("1.0.0");
+        _manifest
+            .DefineScript("monaco-liquid-intellisense")
+            .SetUrl("~/OrchardCore.Liquid/monaco/liquid-intellisense.js")
+            .SetDependencies("monaco")
+            .SetVersion("1.0.0");
 
-            _manifest
-                .DefineScript("liquid-intellisense")
-                .SetDependencies("monaco-liquid-intellisense")
-                .SetUrl("~/OrchardCore.Liquid/Scripts/liquid-intellisense.js");
-        }
+        _manifest
+            .DefineScript("liquid-intellisense")
+            .SetDependencies("monaco-liquid-intellisense")
+            .SetUrl("~/OrchardCore.Liquid/Scripts/liquid-intellisense.js");
+    }
 
-        public void Configure(ResourceManagementOptions options)
-        {
-            options.ResourceManifests.Add(_manifest);
-        }
+    public void Configure(ResourceManagementOptions options)
+    {
+        options.ResourceManifests.Add(_manifest);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/ScriptsMiddleware.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/ScriptsMiddleware.cs
index a633f64c85b..fa1d29c6ced 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/ScriptsMiddleware.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/ScriptsMiddleware.cs
@@ -13,61 +13,60 @@
 using OrchardCore.DisplayManagement.Liquid;
 using OrchardCore.Environment.Shell.Configuration;
 
-namespace OrchardCore.Liquid
+namespace OrchardCore.Liquid;
+
+public class ScriptsMiddleware
 {
-    public class ScriptsMiddleware
-    {
-        private readonly RequestDelegate _next;
+    private readonly RequestDelegate _next;
 
-        byte[] _bytes;
-        string _etag;
+    byte[] _bytes;
+    string _etag;
 
-        public ScriptsMiddleware(RequestDelegate next)
-        {
-            _next = next;
-        }
+    public ScriptsMiddleware(RequestDelegate next)
+    {
+        _next = next;
+    }
 
-        public async Task Invoke(HttpContext httpContext)
+    public async Task Invoke(HttpContext httpContext)
+    {
+        if (httpContext.Request.Path.StartsWithSegments("/OrchardCore.Liquid/Scripts", StringComparison.OrdinalIgnoreCase))
         {
-            if (httpContext.Request.Path.StartsWithSegments("/OrchardCore.Liquid/Scripts", StringComparison.OrdinalIgnoreCase))
+            if (Path.GetFileName(httpContext.Request.Path.Value) == "liquid-intellisense.js")
             {
-                if (Path.GetFileName(httpContext.Request.Path.Value) == "liquid-intellisense.js")
+                if (httpContext.Request.Headers.TryGetValue(HeaderNames.IfNoneMatch, out var v))
                 {
-                    if (httpContext.Request.Headers.TryGetValue(HeaderNames.IfNoneMatch, out var v))
+                    if (v.Contains(_etag))
                     {
-                        if (v.Contains(_etag))
-                        {
-                            httpContext.Response.StatusCode = StatusCodes.Status304NotModified;
-                            return;
-                        }
+                        httpContext.Response.StatusCode = StatusCodes.Status304NotModified;
+                        return;
                     }
+                }
 
-                    var cacheControl = $"public, max-age={TimeSpan.FromDays(30).TotalSeconds}, s-max-age={TimeSpan.FromDays(365.25).TotalSeconds}";
-                    if (_bytes == null)
-                    {
-                        var templateOptions = httpContext.RequestServices.GetRequiredService<IOptions<TemplateOptions>>();
-                        var liquidViewParser = httpContext.RequestServices.GetRequiredService<LiquidViewParser>();
-                        var shellConfiguration = httpContext.RequestServices.GetRequiredService<IShellConfiguration>();
-                        cacheControl = shellConfiguration.GetValue("StaticFileOptions:CacheControl", cacheControl);
+                var cacheControl = $"public, max-age={TimeSpan.FromDays(30).TotalSeconds}, s-max-age={TimeSpan.FromDays(365.25).TotalSeconds}";
+                if (_bytes == null)
+                {
+                    var templateOptions = httpContext.RequestServices.GetRequiredService<IOptions<TemplateOptions>>();
+                    var liquidViewParser = httpContext.RequestServices.GetRequiredService<LiquidViewParser>();
+                    var shellConfiguration = httpContext.RequestServices.GetRequiredService<IShellConfiguration>();
+                    cacheControl = shellConfiguration.GetValue("StaticFileOptions:CacheControl", cacheControl);
 
-                        var filters = string.Join(',', templateOptions.Value.Filters.Select(x => $"'{x.Key}'"));
-                        var tags = string.Join(',', liquidViewParser.RegisteredTags.Select(x => $"'{x.Key}'"));
+                    var filters = string.Join(',', templateOptions.Value.Filters.Select(x => $"'{x.Key}'"));
+                    var tags = string.Join(',', liquidViewParser.RegisteredTags.Select(x => $"'{x.Key}'"));
 
-                        var script = $@"[{filters}].forEach(value=>{{if(!liquidFilters.includes(value)){{ liquidFilters.push(value);}}}});
+                    var script = $@"[{filters}].forEach(value=>{{if(!liquidFilters.includes(value)){{ liquidFilters.push(value);}}}});
                                 [{tags}].forEach(value=>{{if(!liquidTags.includes(value)){{ liquidTags.push(value);}}}});";
 
-                        _etag = Guid.NewGuid().ToString("n");
-                        _bytes = Encoding.UTF8.GetBytes(script);
-                    }
-
-                    httpContext.Response.Headers[HeaderNames.CacheControl] = cacheControl;
-                    httpContext.Response.Headers[HeaderNames.ContentType] = "application/javascript";
-                    httpContext.Response.Headers[HeaderNames.ETag] = _etag;
-                    await httpContext.Response.Body.WriteAsync(_bytes, httpContext?.RequestAborted ?? CancellationToken.None);
-                    return;
+                    _etag = Guid.NewGuid().ToString("n");
+                    _bytes = Encoding.UTF8.GetBytes(script);
                 }
+
+                httpContext.Response.Headers[HeaderNames.CacheControl] = cacheControl;
+                httpContext.Response.Headers[HeaderNames.ContentType] = "application/javascript";
+                httpContext.Response.Headers[HeaderNames.ETag] = _etag;
+                await httpContext.Response.Body.WriteAsync(_bytes, httpContext?.RequestAborted ?? CancellationToken.None);
+                return;
             }
-            await _next.Invoke(httpContext);
         }
+        await _next.Invoke(httpContext);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Services/LiquidTemplateManager.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Services/LiquidTemplateManager.cs
index eacc1ba7ddf..b122a15cc85 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/Services/LiquidTemplateManager.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/Services/LiquidTemplateManager.cs
@@ -11,131 +11,130 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.DisplayManagement.Liquid;
 
-namespace OrchardCore.Liquid.Services
+namespace OrchardCore.Liquid.Services;
+
+public class LiquidTemplateManager : ILiquidTemplateManager
 {
-    public class LiquidTemplateManager : ILiquidTemplateManager
+    private readonly IMemoryCache _memoryCache;
+    private readonly LiquidViewParser _liquidViewParser;
+    private readonly TemplateOptions _templateOptions;
+    private readonly IServiceProvider _serviceProvider;
+
+    public LiquidTemplateManager(
+        IMemoryCache memoryCache,
+        LiquidViewParser liquidViewParser,
+        IOptions<TemplateOptions> templateOptions,
+        IServiceProvider serviceProvider
+        )
     {
-        private readonly IMemoryCache _memoryCache;
-        private readonly LiquidViewParser _liquidViewParser;
-        private readonly TemplateOptions _templateOptions;
-        private readonly IServiceProvider _serviceProvider;
-
-        public LiquidTemplateManager(
-            IMemoryCache memoryCache,
-            LiquidViewParser liquidViewParser,
-            IOptions<TemplateOptions> templateOptions,
-            IServiceProvider serviceProvider
-            )
+        _memoryCache = memoryCache;
+        _liquidViewParser = liquidViewParser;
+        _templateOptions = templateOptions.Value;
+        _serviceProvider = serviceProvider;
+    }
+
+    public Task<string> RenderStringAsync(string source, TextEncoder encoder, object model = null, IEnumerable<KeyValuePair<string, FluidValue>> properties = null)
+    {
+        if (string.IsNullOrWhiteSpace(source))
         {
-            _memoryCache = memoryCache;
-            _liquidViewParser = liquidViewParser;
-            _templateOptions = templateOptions.Value;
-            _serviceProvider = serviceProvider;
+            return Task.FromResult((string)null);
         }
 
-        public Task<string> RenderStringAsync(string source, TextEncoder encoder, object model = null, IEnumerable<KeyValuePair<string, FluidValue>> properties = null)
+        var result = GetCachedTemplate(source);
+        var context = new LiquidTemplateContext(_serviceProvider, _templateOptions);
+
+        if (properties != null)
         {
-            if (string.IsNullOrWhiteSpace(source))
+            foreach (var property in properties)
             {
-                return Task.FromResult((string)null);
+                context.SetValue(property.Key, property.Value);
             }
+        }
 
-            var result = GetCachedTemplate(source);
-            var context = new LiquidTemplateContext(_serviceProvider, _templateOptions);
-
-            if (properties != null)
-            {
-                foreach (var property in properties)
-                {
-                    context.SetValue(property.Key, property.Value);
-                }
-            }
+        return result.RenderAsync(encoder, context, model);
+    }
 
-            return result.RenderAsync(encoder, context, model);
+    public async Task<IHtmlContent> RenderHtmlContentAsync(string source, TextEncoder encoder, object model = null, IEnumerable<KeyValuePair<string, FluidValue>> properties = null)
+    {
+        if (string.IsNullOrWhiteSpace(source))
+        {
+            return HtmlString.Empty;
         }
 
-        public async Task<IHtmlContent> RenderHtmlContentAsync(string source, TextEncoder encoder, object model = null, IEnumerable<KeyValuePair<string, FluidValue>> properties = null)
+        var result = GetCachedTemplate(source);
+        var context = new LiquidTemplateContext(_serviceProvider, _templateOptions);
+
+        if (properties != null)
         {
-            if (string.IsNullOrWhiteSpace(source))
+            foreach (var property in properties)
             {
-                return HtmlString.Empty;
+                context.SetValue(property.Key, property.Value);
             }
+        }
 
-            var result = GetCachedTemplate(source);
-            var context = new LiquidTemplateContext(_serviceProvider, _templateOptions);
+        var htmlContentWriter = new ViewBufferTextWriterContent();
 
-            if (properties != null)
-            {
-                foreach (var property in properties)
-                {
-                    context.SetValue(property.Key, property.Value);
-                }
-            }
-
-            var htmlContentWriter = new ViewBufferTextWriterContent();
+        await result.RenderAsync(htmlContentWriter, encoder, context, model);
 
-            await result.RenderAsync(htmlContentWriter, encoder, context, model);
+        return htmlContentWriter;
+    }
 
-            return htmlContentWriter;
+    public Task RenderAsync(string source, TextWriter writer, TextEncoder encoder, object model = null, IEnumerable<KeyValuePair<string, FluidValue>> properties = null)
+    {
+        if (string.IsNullOrWhiteSpace(source))
+        {
+            return Task.CompletedTask;
         }
 
-        public Task RenderAsync(string source, TextWriter writer, TextEncoder encoder, object model = null, IEnumerable<KeyValuePair<string, FluidValue>> properties = null)
+        var result = GetCachedTemplate(source);
+        var context = new LiquidTemplateContext(_serviceProvider, _templateOptions);
+
+        if (properties != null)
         {
-            if (string.IsNullOrWhiteSpace(source))
+            foreach (var property in properties)
             {
-                return Task.CompletedTask;
+                context.SetValue(property.Key, property.Value);
             }
+        }
 
-            var result = GetCachedTemplate(source);
-            var context = new LiquidTemplateContext(_serviceProvider, _templateOptions);
+        return result.RenderAsync(writer, encoder, context, model);
+    }
 
-            if (properties != null)
+    public LiquidViewTemplate GetCachedTemplate(string source)
+    {
+        var errors = Enumerable.Empty<string>();
+
+        var result = _memoryCache.GetOrCreate(source, (ICacheEntry e) =>
+        {
+            if (!_liquidViewParser.TryParse(source, out var parsed, out var error))
             {
-                foreach (var property in properties)
-                {
-                    context.SetValue(property.Key, property.Value);
-                }
+                // If the source string cannot be parsed, create a template that contains the parser errors
+                _liquidViewParser.TryParse(string.Join(System.Environment.NewLine, errors), out parsed, out error);
             }
 
-            return result.RenderAsync(writer, encoder, context, model);
-        }
-
-        public LiquidViewTemplate GetCachedTemplate(string source)
-        {
-            var errors = Enumerable.Empty<string>();
+            // Define a default sliding expiration to prevent the
+            // cache from being filled and still apply some micro-caching
+            // in case the template is used commonly
+            e.SetSlidingExpiration(TimeSpan.FromSeconds(30));
+            return new LiquidViewTemplate(parsed);
+        });
 
-            var result = _memoryCache.GetOrCreate(source, (ICacheEntry e) =>
-            {
-                if (!_liquidViewParser.TryParse(source, out var parsed, out var error))
-                {
-                    // If the source string cannot be parsed, create a template that contains the parser errors
-                    _liquidViewParser.TryParse(string.Join(System.Environment.NewLine, errors), out parsed, out error);
-                }
-
-                // Define a default sliding expiration to prevent the
-                // cache from being filled and still apply some micro-caching
-                // in case the template is used commonly
-                e.SetSlidingExpiration(TimeSpan.FromSeconds(30));
-                return new LiquidViewTemplate(parsed);
-            });
-
-            return result;
-        }
+        return result;
+    }
 
-        public bool Validate(string template, out IEnumerable<string> errors)
+    public bool Validate(string template, out IEnumerable<string> errors)
+    {
+        if (string.IsNullOrEmpty(template))
         {
-            if (string.IsNullOrEmpty(template))
-            {
-                errors = [];
+            errors = [];
 
-                return true;
-            }
+            return true;
+        }
 
-            var success = _liquidViewParser.TryParse(template, out _, out var error);
+        var success = _liquidViewParser.TryParse(template, out _, out var error);
 
-            errors = [error];
+        errors = [error];
 
-            return success;
-        }
+        return success;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Startup.cs
index 7f9e77ea78f..bbcb78b841e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/Startup.cs
@@ -23,85 +23,84 @@
 using OrchardCore.Modules;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Liquid
+namespace OrchardCore.Liquid;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
     {
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            app.UseMiddleware<ScriptsMiddleware>();
-        }
+        app.UseMiddleware<ScriptsMiddleware>();
+    }
 
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<ILiquidTemplateManager, LiquidTemplateManager>();
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddScoped<ILiquidTemplateManager, LiquidTemplateManager>();
 
-            services.Configure<TemplateOptions>(options =>
-            {
-                options.Filters.AddFilter("t", LiquidViewFilters.Localize);
-                options.Filters.AddFilter("html_class", LiquidViewFilters.HtmlClass);
-                options.Filters.AddFilter("shape_properties", LiquidViewFilters.ShapeProperties);
+        services.Configure<TemplateOptions>(options =>
+        {
+            options.Filters.AddFilter("t", LiquidViewFilters.Localize);
+            options.Filters.AddFilter("html_class", LiquidViewFilters.HtmlClass);
+            options.Filters.AddFilter("shape_properties", LiquidViewFilters.ShapeProperties);
 
-                options.MemberAccessStrategy.Register<LiquidPartViewModel>();
+            options.MemberAccessStrategy.Register<LiquidPartViewModel>();
 
-                // Used to provide a factory to return a value based on a property name that is unknown at registration time.
-                options.MemberAccessStrategy.Register<LiquidPropertyAccessor, FluidValue>((obj, name) => obj.GetValueAsync(name));
+            // Used to provide a factory to return a value based on a property name that is unknown at registration time.
+            options.MemberAccessStrategy.Register<LiquidPropertyAccessor, FluidValue>((obj, name) => obj.GetValueAsync(name));
 
-                // When a property of a 'JsonObject' value is accessed, try to look into its properties.
-                options.MemberAccessStrategy.Register<JsonObject, object>((source, name) => source[name]);
+            // When a property of a 'JsonObject' value is accessed, try to look into its properties.
+            options.MemberAccessStrategy.Register<JsonObject, object>((source, name) => source[name]);
 
-                // Convert JToken to FluidValue
-                options.ValueConverters.Add(x =>
+            // Convert JToken to FluidValue
+            options.ValueConverters.Add(x =>
+            {
+                return x switch
                 {
-                    return x switch
-                    {
-                        JsonObject o => new ObjectValue(o),
-                        JsonDynamicObject o => new ObjectValue((JsonObject)o),
-                        JsonValue o => o.GetObjectValue(),
-                        DateTime d => new ObjectValue(d),
-                        _ => null
-                    };
-                });
+                    JsonObject o => new ObjectValue(o),
+                    JsonDynamicObject o => new ObjectValue((JsonObject)o),
+                    JsonValue o => o.GetObjectValue(),
+                    DateTime d => new ObjectValue(d),
+                    _ => null
+                };
+            });
 
-                options.Filters.AddFilter("json", JsonFilter.Json);
-                options.Filters.AddFilter("jsonparse", JsonParseFilter.JsonParse);
-            })
-            .AddLiquidFilter<LocalTimeZoneFilter>("local")
-            .AddLiquidFilter<UtcTimeZoneFilter>("utc")
-            .AddLiquidFilter<SlugifyFilter>("slugify")
-            .AddLiquidFilter<LiquidFilter>("liquid")
-            .AddLiquidFilter<ContentUrlFilter>("href")
-            .AddLiquidFilter<AbsoluteUrlFilter>("absolute_url")
-            .AddLiquidFilter<NewShapeFilter>("shape_new")
-            .AddLiquidFilter<ShapeRenderFilter>("shape_render")
-            .AddLiquidFilter<ShapeStringifyFilter>("shape_stringify");
+            options.Filters.AddFilter("json", JsonFilter.Json);
+            options.Filters.AddFilter("jsonparse", JsonParseFilter.JsonParse);
+        })
+        .AddLiquidFilter<LocalTimeZoneFilter>("local")
+        .AddLiquidFilter<UtcTimeZoneFilter>("utc")
+        .AddLiquidFilter<SlugifyFilter>("slugify")
+        .AddLiquidFilter<LiquidFilter>("liquid")
+        .AddLiquidFilter<ContentUrlFilter>("href")
+        .AddLiquidFilter<AbsoluteUrlFilter>("absolute_url")
+        .AddLiquidFilter<NewShapeFilter>("shape_new")
+        .AddLiquidFilter<ShapeRenderFilter>("shape_render")
+        .AddLiquidFilter<ShapeStringifyFilter>("shape_stringify");
 
-            services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
-        }
+        services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Contents")]
-    public sealed class LiquidPartStartup : StartupBase
+[RequireFeatures("OrchardCore.Contents")]
+public sealed class LiquidPartStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            // Liquid Part
-            services.AddScoped<IShapeTableProvider, LiquidShapes>();
-            services.AddContentPart<LiquidPart>()
-                .UseDisplayDriver<LiquidPartDisplayDriver>()
-                .AddHandler<LiquidPartHandler>();
+        // Liquid Part
+        services.AddScoped<IShapeTableProvider, LiquidShapes>();
+        services.AddContentPart<LiquidPart>()
+            .UseDisplayDriver<LiquidPartDisplayDriver>()
+            .AddHandler<LiquidPartHandler>();
 
-            services.AddDataMigration<Migrations>();
-            services.AddScoped<IContentPartIndexHandler, LiquidPartIndexHandler>();
-        }
+        services.AddDataMigration<Migrations>();
+        services.AddScoped<IContentPartIndexHandler, LiquidPartIndexHandler>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Shortcodes")]
-    public sealed class ShortcodesStartup : StartupBase
+[RequireFeatures("OrchardCore.Shortcodes")]
+public sealed class ShortcodesStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddLiquidFilter<ShortcodeFilter>("shortcode");
-        }
+        services.AddLiquidFilter<ShortcodeFilter>("shortcode");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/ViewModels/LiquidPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/ViewModels/LiquidPartViewModel.cs
index f7f46643ba5..02f25ef208a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/ViewModels/LiquidPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/ViewModels/LiquidPartViewModel.cs
@@ -2,17 +2,16 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Liquid.Models;
 
-namespace OrchardCore.Liquid.ViewModels
+namespace OrchardCore.Liquid.ViewModels;
+
+public class LiquidPartViewModel
 {
-    public class LiquidPartViewModel
-    {
-        public string Liquid { get; set; }
-        public string Html { get; set; }
+    public string Liquid { get; set; }
+    public string Html { get; set; }
 
-        [BindNever]
-        public ContentItem ContentItem { get; set; }
+    [BindNever]
+    public ContentItem ContentItem { get; set; }
 
-        [BindNever]
-        public LiquidPart LiquidPart { get; set; }
-    }
+    [BindNever]
+    public LiquidPart LiquidPart { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNode.cs b/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNode.cs
index c8a815fdf79..b6e93312613 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNode.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNode.cs
@@ -1,12 +1,11 @@
 using OrchardCore.AdminMenu.Models;
 
-namespace OrchardCore.Lists.AdminNodes
+namespace OrchardCore.Lists.AdminNodes;
+
+public class ListsAdminNode : AdminNode
 {
-    public class ListsAdminNode : AdminNode
-    {
-        public string ContentType { get; set; }
-        public bool AddContentTypeAsParent { get; set; } = true;
-        public string IconForParentLink { get; set; }
-        public string IconForContentItems { get; set; }
-    }
+    public string ContentType { get; set; }
+    public bool AddContentTypeAsParent { get; set; } = true;
+    public string IconForParentLink { get; set; }
+    public string IconForContentItems { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNodeDriver.cs b/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNodeDriver.cs
index 5fb89288d2e..ee6b3a18ea8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNodeDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNodeDriver.cs
@@ -9,61 +9,60 @@
 using OrchardCore.Lists.Models;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Lists.AdminNodes
+namespace OrchardCore.Lists.AdminNodes;
+
+public sealed class ListsAdminNodeDriver : DisplayDriver<MenuItem, ListsAdminNode>
 {
-    public sealed class ListsAdminNodeDriver : DisplayDriver<MenuItem, ListsAdminNode>
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        public ListsAdminNodeDriver(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public ListsAdminNodeDriver(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(ListsAdminNode treeNode, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                View("ListsAdminNode_Fields_TreeSummary", treeNode).Location("TreeSummary", "Content"),
-                View("ListsAdminNode_Fields_TreeThumbnail", treeNode).Location("TreeThumbnail", "Content")
-            );
-        }
+    public override Task<IDisplayResult> DisplayAsync(ListsAdminNode treeNode, BuildDisplayContext context)
+    {
+        return CombineAsync(
+            View("ListsAdminNode_Fields_TreeSummary", treeNode).Location("TreeSummary", "Content"),
+            View("ListsAdminNode_Fields_TreeThumbnail", treeNode).Location("TreeThumbnail", "Content")
+        );
+    }
 
-        public override IDisplayResult Edit(ListsAdminNode treeNode, BuildEditorContext context)
+    public override IDisplayResult Edit(ListsAdminNode treeNode, BuildEditorContext context)
+    {
+        return Initialize<ListsAdminNodeViewModel>("ListsAdminNode_Fields_TreeEdit", async model =>
         {
-            return Initialize<ListsAdminNodeViewModel>("ListsAdminNode_Fields_TreeEdit", async model =>
-            {
-                model.ContentType = treeNode.ContentType;
-                model.ContentTypes = await GetContentTypesSelectListAsync();
-                model.IconForContentItems = treeNode.IconForContentItems;
-                model.AddContentTypeAsParent = treeNode.AddContentTypeAsParent;
-                model.IconForParentLink = treeNode.IconForParentLink;
-            }).Location("Content");
-        }
+            model.ContentType = treeNode.ContentType;
+            model.ContentTypes = await GetContentTypesSelectListAsync();
+            model.IconForContentItems = treeNode.IconForContentItems;
+            model.AddContentTypeAsParent = treeNode.AddContentTypeAsParent;
+            model.IconForParentLink = treeNode.IconForParentLink;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ListsAdminNode treeNode, UpdateEditorContext context)
-        {
-            var model = new ListsAdminNodeViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(ListsAdminNode treeNode, UpdateEditorContext context)
+    {
+        var model = new ListsAdminNodeViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix,
-                m => m.ContentType, x => x.IconForContentItems,
-                m => m.AddContentTypeAsParent,
-                m => m.IconForParentLink);
+        await context.Updater.TryUpdateModelAsync(model, Prefix,
+            m => m.ContentType, x => x.IconForContentItems,
+            m => m.AddContentTypeAsParent,
+            m => m.IconForParentLink);
 
-            treeNode.ContentType = model.ContentType;
-            treeNode.IconForContentItems = model.IconForContentItems;
-            treeNode.AddContentTypeAsParent = model.AddContentTypeAsParent;
-            treeNode.IconForParentLink = model.IconForParentLink;
+        treeNode.ContentType = model.ContentType;
+        treeNode.IconForContentItems = model.IconForContentItems;
+        treeNode.AddContentTypeAsParent = model.AddContentTypeAsParent;
+        treeNode.IconForParentLink = model.IconForParentLink;
 
-            return Edit(treeNode, context);
-        }
+        return Edit(treeNode, context);
+    }
 
-        private async Task<List<SelectListItem>> GetContentTypesSelectListAsync()
-        {
-            return (await _contentDefinitionManager.ListTypeDefinitionsAsync())
-                .Where(ctd => ctd.Parts.Any(p => p.PartDefinition.Name.Equals(nameof(ListPart), StringComparison.OrdinalIgnoreCase)))
-                .OrderBy(ctd => ctd.DisplayName)
-                .Select(ctd => new SelectListItem { Value = ctd.Name, Text = ctd.DisplayName })
-                .ToList();
-        }
+    private async Task<List<SelectListItem>> GetContentTypesSelectListAsync()
+    {
+        return (await _contentDefinitionManager.ListTypeDefinitionsAsync())
+            .Where(ctd => ctd.Parts.Any(p => p.PartDefinition.Name.Equals(nameof(ListPart), StringComparison.OrdinalIgnoreCase)))
+            .OrderBy(ctd => ctd.DisplayName)
+            .Select(ctd => new SelectListItem { Value = ctd.Name, Text = ctd.DisplayName })
+            .ToList();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNodeNavigationBuilder.cs b/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNodeNavigationBuilder.cs
index 0a111d6684a..3262118a3c9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNodeNavigationBuilder.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNodeNavigationBuilder.cs
@@ -14,121 +14,120 @@
 using OrchardCore.Navigation;
 using YesSql;
 
-namespace OrchardCore.Lists.AdminNodes
+namespace OrchardCore.Lists.AdminNodes;
+
+public class ListsAdminNodeNavigationBuilder : IAdminNodeNavigationBuilder
 {
-    public class ListsAdminNodeNavigationBuilder : IAdminNodeNavigationBuilder
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentManager _contentManager;
+    private readonly ISession _session;
+    private readonly ILogger _logger;
+    private ListsAdminNode _node;
+    private ContentTypeDefinition _contentType;
+
+    // Security check.
+    private const int MaxItemsInNode = 100;
+
+    public ListsAdminNodeNavigationBuilder(
+        IContentDefinitionManager contentDefinitionManager,
+        IContentManager contentManager,
+        ISession session,
+        ILogger<ListsAdminNodeNavigationBuilder> logger)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IContentManager _contentManager;
-        private readonly ISession _session;
-        private readonly ILogger _logger;
-        private ListsAdminNode _node;
-        private ContentTypeDefinition _contentType;
-
-        // Security check.
-        private const int MaxItemsInNode = 100;
-
-        public ListsAdminNodeNavigationBuilder(
-            IContentDefinitionManager contentDefinitionManager,
-            IContentManager contentManager,
-            ISession session,
-            ILogger<ListsAdminNodeNavigationBuilder> logger)
+        _contentDefinitionManager = contentDefinitionManager;
+        _contentManager = contentManager;
+        _session = session;
+        _logger = logger;
+    }
+
+    public string Name => nameof(ListsAdminNode);
+
+    public async Task BuildNavigationAsync(MenuItem menuItem, NavigationBuilder builder, IEnumerable<IAdminNodeNavigationBuilder> treeNodeBuilders)
+    {
+        _node = menuItem as ListsAdminNode;
+
+        if (_node == null || !_node.Enabled || string.IsNullOrEmpty(_node.ContentType))
         {
-            _contentDefinitionManager = contentDefinitionManager;
-            _contentManager = contentManager;
-            _session = session;
-            _logger = logger;
+            return;
         }
 
-        public string Name => nameof(ListsAdminNode);
+        _contentType = await _contentDefinitionManager.GetTypeDefinitionAsync(_node.ContentType);
 
-        public async Task BuildNavigationAsync(MenuItem menuItem, NavigationBuilder builder, IEnumerable<IAdminNodeNavigationBuilder> treeNodeBuilders)
+        if (_node.AddContentTypeAsParent)
         {
-            _node = menuItem as ListsAdminNode;
-
-            if (_node == null || !_node.Enabled || string.IsNullOrEmpty(_node.ContentType))
+            if (_contentType == null)
             {
-                return;
+                _logger.LogError("Can't find The content type '{ContentType}' for list admin node.", _node.ContentType);
             }
 
-            _contentType = await _contentDefinitionManager.GetTypeDefinitionAsync(_node.ContentType);
-
-            if (_node.AddContentTypeAsParent)
+            await builder.AddAsync(new LocalizedString(_contentType.DisplayName, _contentType.DisplayName), async listTypeMenu =>
             {
-                if (_contentType == null)
-                {
-                    _logger.LogError("Can't find The content type '{ContentType}' for list admin node.", _node.ContentType);
-                }
+                AddPrefixToClasses(_node.IconForParentLink).ForEach(c => listTypeMenu.AddClass(c));
+                listTypeMenu.Permission(ContentTypePermissionsHelper.CreateDynamicPermission(
+                    ContentTypePermissionsHelper.PermissionTemplates[CommonPermissions.EditContent.Name], _contentType));
+                await AddContentItemsAsync(listTypeMenu);
+            });
+        }
+        else
+        {
+            await AddContentItemsAsync(builder);
+        }
 
-                await builder.AddAsync(new LocalizedString(_contentType.DisplayName, _contentType.DisplayName), async listTypeMenu =>
-                {
-                    AddPrefixToClasses(_node.IconForParentLink).ForEach(c => listTypeMenu.AddClass(c));
-                    listTypeMenu.Permission(ContentTypePermissionsHelper.CreateDynamicPermission(
-                        ContentTypePermissionsHelper.PermissionTemplates[CommonPermissions.EditContent.Name], _contentType));
-                    await AddContentItemsAsync(listTypeMenu);
-                });
-            }
-            else
+        // Add external children.
+        foreach (var childNode in _node.Items)
+        {
+            try
             {
-                await AddContentItemsAsync(builder);
+                var treeBuilder = treeNodeBuilders.FirstOrDefault(x => x.Name == childNode.GetType().Name);
+                await treeBuilder.BuildNavigationAsync(childNode, builder, treeNodeBuilders);
             }
-
-            // Add external children.
-            foreach (var childNode in _node.Items)
+            catch (Exception e)
             {
-                try
-                {
-                    var treeBuilder = treeNodeBuilders.FirstOrDefault(x => x.Name == childNode.GetType().Name);
-                    await treeBuilder.BuildNavigationAsync(childNode, builder, treeNodeBuilders);
-                }
-                catch (Exception e)
-                {
-                    _logger.LogError(e, "An exception occurred while building the '{MenuItem}' child Menu Item.", childNode.GetType().Name);
-                }
+                _logger.LogError(e, "An exception occurred while building the '{MenuItem}' child Menu Item.", childNode.GetType().Name);
             }
         }
+    }
 
-        private async Task AddContentItemsAsync(NavigationBuilder listTypeMenu)
+    private async Task AddContentItemsAsync(NavigationBuilder listTypeMenu)
+    {
+        foreach (var ci in await GetContentItemsAsync())
         {
-            foreach (var ci in await GetContentItemsAsync())
-            {
-                var cim = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(ci);
+            var cim = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(ci);
 
-                if (cim.AdminRouteValues.Count > 0 && ci.DisplayText != null)
+            if (cim.AdminRouteValues.Count > 0 && ci.DisplayText != null)
+            {
+                listTypeMenu.Add(new LocalizedString(ci.DisplayText, ci.DisplayText), m =>
                 {
-                    listTypeMenu.Add(new LocalizedString(ci.DisplayText, ci.DisplayText), m =>
-                    {
-                        m.Action(cim.AdminRouteValues["Action"] as string, cim.AdminRouteValues["Controller"] as string, cim.AdminRouteValues);
-                        m.Resource(ci);
-                        m.Priority(_node.Priority);
-                        m.Position(_node.Position);
-                        m.LocalNav();
-                        AddPrefixToClasses(_node.IconForContentItems).ToList().ForEach(c => m.AddClass(c));
-
-                        m.Permission(ContentTypePermissionsHelper.CreateDynamicPermission(
-                        ContentTypePermissionsHelper.PermissionTemplates[CommonPermissions.EditContent.Name], _contentType));
-                    });
-                }
+                    m.Action(cim.AdminRouteValues["Action"] as string, cim.AdminRouteValues["Controller"] as string, cim.AdminRouteValues);
+                    m.Resource(ci);
+                    m.Priority(_node.Priority);
+                    m.Position(_node.Position);
+                    m.LocalNav();
+                    AddPrefixToClasses(_node.IconForContentItems).ToList().ForEach(c => m.AddClass(c));
+
+                    m.Permission(ContentTypePermissionsHelper.CreateDynamicPermission(
+                    ContentTypePermissionsHelper.PermissionTemplates[CommonPermissions.EditContent.Name], _contentType));
+                });
             }
         }
+    }
 
-        private async Task<List<ContentItem>> GetContentItemsAsync()
-        {
-            return (await _session.Query<ContentItem, ContentItemIndex>()
-                .With<ContentItemIndex>(x => x.Latest && x.ContentType == _node.ContentType)
-                .Take(MaxItemsInNode)
-                .ListAsync())
-                .OrderBy(x => x.DisplayText)
-                .ToList();
-        }
+    private async Task<List<ContentItem>> GetContentItemsAsync()
+    {
+        return (await _session.Query<ContentItem, ContentItemIndex>()
+            .With<ContentItemIndex>(x => x.Latest && x.ContentType == _node.ContentType)
+            .Take(MaxItemsInNode)
+            .ListAsync())
+            .OrderBy(x => x.DisplayText)
+            .ToList();
+    }
 
-        private static List<string> AddPrefixToClasses(string unprefixed)
-        {
-            return unprefixed?.Split(' ')
-                .ToList()
-                .Select(c => "icon-class-" + c)
-                .ToList()
-                ?? [];
-        }
+    private static List<string> AddPrefixToClasses(string unprefixed)
+    {
+        return unprefixed?.Split(' ')
+            .ToList()
+            .Select(c => "icon-class-" + c)
+            .ToList()
+            ?? [];
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNodeViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNodeViewModel.cs
index bf3fafda8f7..e444a89b358 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNodeViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNodeViewModel.cs
@@ -1,14 +1,13 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.Lists.AdminNodes
+namespace OrchardCore.Lists.AdminNodes;
+
+public class ListsAdminNodeViewModel
 {
-    public class ListsAdminNodeViewModel
-    {
-        public string ContentType { get; set; }
-        public bool AddContentTypeAsParent { get; set; }
-        public string IconForParentLink { get; set; }
-        public string IconForContentItems { get; set; }
-        public List<SelectListItem> ContentTypes { get; set; }
-    }
+    public string ContentType { get; set; }
+    public bool AddContentTypeAsParent { get; set; }
+    public string IconForParentLink { get; set; }
+    public string IconForContentItems { get; set; }
+    public List<SelectListItem> ContentTypes { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Controllers/OrderController.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Controllers/OrderController.cs
index 8564d23fd04..e93bd56a8d6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Controllers/OrderController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Controllers/OrderController.cs
@@ -9,81 +9,80 @@
 using OrchardCore.Lists.Services;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Lists.Controllers
+namespace OrchardCore.Lists.Controllers;
+
+[Admin]
+public class OrderController : Controller
 {
-    [Admin]
-    public class OrderController : Controller
+    private readonly IContainerService _containerService;
+    private readonly IAuthorizationService _authorizationService;
+
+    public OrderController(IContainerService containerService, IAuthorizationService authorizationService)
     {
-        private readonly IContainerService _containerService;
-        private readonly IAuthorizationService _authorizationService;
+        _containerService = containerService;
+        _authorizationService = authorizationService;
+    }
 
-        public OrderController(IContainerService containerService, IAuthorizationService authorizationService)
+    [HttpPost]
+    [Admin("Lists/Order/{containerId?}", "ListOrder")]
+    public async Task<IActionResult> UpdateContentItemOrders(string containerId, int oldIndex, int newIndex, PagerSlimParameters pagerSlimParameters, int pageSize)
+    {
+        var pager = new PagerSlim(pagerSlimParameters, pageSize);
+        // Reverse pager as it represents the next page(s), rather than current page
+        if (pager.Before != null && pager.After != null)
         {
-            _containerService = containerService;
-            _authorizationService = authorizationService;
+            var beforeValue = int.Parse(pager.Before);
+            beforeValue -= 1;
+            var afterValue = int.Parse(pager.After);
+            afterValue += 1;
+            pager.Before = afterValue.ToString();
+            pager.After = beforeValue.ToString();
         }
-
-        [HttpPost]
-        [Admin("Lists/Order/{containerId?}", "ListOrder")]
-        public async Task<IActionResult> UpdateContentItemOrders(string containerId, int oldIndex, int newIndex, PagerSlimParameters pagerSlimParameters, int pageSize)
+        else if (pager.Before != null)
         {
-            var pager = new PagerSlim(pagerSlimParameters, pageSize);
-            // Reverse pager as it represents the next page(s), rather than current page
-            if (pager.Before != null && pager.After != null)
-            {
-                var beforeValue = int.Parse(pager.Before);
-                beforeValue -= 1;
-                var afterValue = int.Parse(pager.After);
-                afterValue += 1;
-                pager.Before = afterValue.ToString();
-                pager.After = beforeValue.ToString();
-            }
-            else if (pager.Before != null)
-            {
-                var beforeValue = int.Parse(pager.Before);
-                beforeValue -= 1;
-                pager.Before = null;
-                pager.After = beforeValue.ToString();
-            }
-            else if (pager.After != null)
-            {
-                var afterValue = int.Parse(pager.After);
-                afterValue += 1;
-                pager.After = null;
-                pager.Before = afterValue.ToString();
-            }
+            var beforeValue = int.Parse(pager.Before);
+            beforeValue -= 1;
+            pager.Before = null;
+            pager.After = beforeValue.ToString();
+        }
+        else if (pager.After != null)
+        {
+            var afterValue = int.Parse(pager.After);
+            afterValue += 1;
+            pager.After = null;
+            pager.Before = afterValue.ToString();
+        }
 
-            // Include draft items.
-            var pageOfContentItems = (await _containerService.QueryContainedItemsAsync(
-                containerId,
-                true,
-                pager,
-                new ContainedItemOptions { Status = ContentsStatus.Latest }))
-                .ToList();
+        // Include draft items.
+        var pageOfContentItems = (await _containerService.QueryContainedItemsAsync(
+            containerId,
+            true,
+            pager,
+            new ContainedItemOptions { Status = ContentsStatus.Latest }))
+            .ToList();
 
-            if (pageOfContentItems == null || pageOfContentItems.Count == 0)
-            {
-                return NotFound();
-            }
+        if (pageOfContentItems == null || pageOfContentItems.Count == 0)
+        {
+            return NotFound();
+        }
 
-            foreach (var pagedContentItem in pageOfContentItems)
+        foreach (var pagedContentItem in pageOfContentItems)
+        {
+            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.PublishContent, pagedContentItem))
             {
-                if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.PublishContent, pagedContentItem))
-                {
-                    return Forbid();
-                }
+                return Forbid();
             }
+        }
 
-            var currentOrderOfFirstItem = pageOfContentItems.FirstOrDefault().As<ContainedPart>().Order;
+        var currentOrderOfFirstItem = pageOfContentItems.FirstOrDefault().As<ContainedPart>().Order;
 
-            var contentItem = pageOfContentItems[oldIndex];
+        var contentItem = pageOfContentItems[oldIndex];
 
-            pageOfContentItems.Remove(contentItem);
-            pageOfContentItems.Insert(newIndex, contentItem);
+        pageOfContentItems.Remove(contentItem);
+        pageOfContentItems.Insert(newIndex, contentItem);
 
-            await _containerService.UpdateContentItemOrdersAsync(pageOfContentItems, currentOrderOfFirstItem);
+        await _containerService.UpdateContentItemOrdersAsync(pageOfContentItems, currentOrderOfFirstItem);
 
-            return Ok();
-        }
+        return Ok();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Controllers/RemotePublishingController.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Controllers/RemotePublishingController.cs
index 80e6ebdae9a..90c3515599e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Controllers/RemotePublishingController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Controllers/RemotePublishingController.cs
@@ -6,65 +6,64 @@
 using OrchardCore.Lists.Models;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Lists.Controllers
+namespace OrchardCore.Lists.Controllers;
+
+[RequireFeatures("OrchardCore.RemotePublishing")]
+public class RemotePublishingController : Controller
 {
-    [RequireFeatures("OrchardCore.RemotePublishing")]
-    public class RemotePublishingController : Controller
+    private readonly IContentManager _contentManager;
+    private readonly ILogger _logger;
+
+    public RemotePublishingController(
+        IContentManager contentManager,
+        ILogger<RemotePublishingController> logger)
     {
-        private readonly IContentManager _contentManager;
-        private readonly ILogger _logger;
+        _contentManager = contentManager;
+        _logger = logger;
+    }
 
-        public RemotePublishingController(
-            IContentManager contentManager,
-            ILogger<RemotePublishingController> logger)
+    public async Task<IActionResult> Rsd(string contentItemId)
+    {
+        if (_logger.IsEnabled(LogLevel.Debug))
         {
-            _contentManager = contentManager;
-            _logger = logger;
+            _logger.LogDebug("RSD requested");
         }
 
-        public async Task<IActionResult> Rsd(string contentItemId)
-        {
-            if (_logger.IsEnabled(LogLevel.Debug))
-            {
-                _logger.LogDebug("RSD requested");
-            }
-
-            var contentItem = await _contentManager.GetAsync(contentItemId);
+        var contentItem = await _contentManager.GetAsync(contentItemId);
 
-            if (contentItem == null)
-            {
-                return NotFound();
-            }
+        if (contentItem == null)
+        {
+            return NotFound();
+        }
 
-            var listPart = contentItem.As<ListPart>();
+        var listPart = contentItem.As<ListPart>();
 
-            if (listPart == null)
-            {
-                return NotFound();
-            }
+        if (listPart == null)
+        {
+            return NotFound();
+        }
 
-            const string manifestUri = "http://archipelago.phrasewise.com/rsd";
+        const string manifestUri = "http://archipelago.phrasewise.com/rsd";
 
-            var url = Url.Action("Index", "Home", new { area = "OrchardCore.XmlRpc" }, Request.Scheme);
+        var url = Url.Action("Index", "Home", new { area = "OrchardCore.XmlRpc" }, Request.Scheme);
 
-            var options = new XElement(
-                XName.Get("service", manifestUri),
-                new XElement(XName.Get("engineName", manifestUri), "Orchard CMS"),
-                new XElement(XName.Get("engineLink", manifestUri), "https://orchardcore.net"),
-                new XElement(XName.Get("homePageLink", manifestUri), "https://orchardcore.net"),
-                new XElement(XName.Get("apis", manifestUri),
-                    new XElement(XName.Get("api", manifestUri),
-                        new XAttribute("name", "MetaWeblog"),
-                        new XAttribute("preferred", true),
-                        new XAttribute("apiLink", url),
-                        new XAttribute("blogID", contentItem.ContentItemId))));
+        var options = new XElement(
+            XName.Get("service", manifestUri),
+            new XElement(XName.Get("engineName", manifestUri), "Orchard CMS"),
+            new XElement(XName.Get("engineLink", manifestUri), "https://orchardcore.net"),
+            new XElement(XName.Get("homePageLink", manifestUri), "https://orchardcore.net"),
+            new XElement(XName.Get("apis", manifestUri),
+                new XElement(XName.Get("api", manifestUri),
+                    new XAttribute("name", "MetaWeblog"),
+                    new XAttribute("preferred", true),
+                    new XAttribute("apiLink", url),
+                    new XAttribute("blogID", contentItem.ContentItemId))));
 
-            var doc = new XDocument(new XElement(
-                                        XName.Get("rsd", manifestUri),
-                                        new XAttribute("version", "1.0"),
-                                        options));
+        var doc = new XDocument(new XElement(
+                                    XName.Get("rsd", manifestUri),
+                                    new XAttribute("version", "1.0"),
+                                    options));
 
-            return Content(doc.ToString(), "text/xml");
-        }
+        return Content(doc.ToString(), "text/xml");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Drivers/ContainedPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Drivers/ContainedPartDisplayDriver.cs
index a2142388641..245da4828e1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Drivers/ContainedPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Drivers/ContainedPartDisplayDriver.cs
@@ -11,177 +11,176 @@
 using OrchardCore.Lists.Services;
 using OrchardCore.Lists.ViewModels;
 
-namespace OrchardCore.Lists.Drivers
+namespace OrchardCore.Lists.Drivers;
+
+public sealed class ContainedPartDisplayDriver : ContentDisplayDriver
 {
-    public sealed class ContainedPartDisplayDriver : ContentDisplayDriver
+    private readonly IContentManager _contentManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContainerService _containerService;
+
+    public ContainedPartDisplayDriver(
+        IContentManager contentManager,
+        IContentDefinitionManager contentDefinitionManager,
+        IContainerService containerService
+        )
     {
-        private readonly IContentManager _contentManager;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IContainerService _containerService;
-
-        public ContainedPartDisplayDriver(
-            IContentManager contentManager,
-            IContentDefinitionManager contentDefinitionManager,
-            IContainerService containerService
-            )
-        {
-            _contentManager = contentManager;
-            _contentDefinitionManager = contentDefinitionManager;
-            _containerService = containerService;
-        }
+        _contentManager = contentManager;
+        _contentDefinitionManager = contentDefinitionManager;
+        _containerService = containerService;
+    }
 
-        public override async Task<IDisplayResult> EditAsync(ContentItem model, BuildEditorContext context)
+    public override async Task<IDisplayResult> EditAsync(ContentItem model, BuildEditorContext context)
+    {
+        // This method can get called when a new content item is created, at that point
+        // the query string contains a ListPart.ContainerId value, or when an
+        // existing content item has ContainedPart value. In both cases the hidden field
+        // needs to be rendered in the edit form to maintain the relationship with the parent.
+        var containedPart = model.As<ContainedPart>();
+
+        if (containedPart != null)
         {
-            // This method can get called when a new content item is created, at that point
-            // the query string contains a ListPart.ContainerId value, or when an
-            // existing content item has ContainedPart value. In both cases the hidden field
-            // needs to be rendered in the edit form to maintain the relationship with the parent.
-            var containedPart = model.As<ContainedPart>();
+            return await BuildViewModelAsync(containedPart.ListContentItemId, containedPart.ListContentType, model.ContentType);
+        }
 
-            if (containedPart != null)
-            {
-                return await BuildViewModelAsync(containedPart.ListContentItemId, containedPart.ListContentType, model.ContentType);
-            }
+        var viewModel = new EditContainedPartViewModel();
+        await context.Updater.TryUpdateModelAsync(viewModel, nameof(ListPart));
 
-            var viewModel = new EditContainedPartViewModel();
-            await context.Updater.TryUpdateModelAsync(viewModel, nameof(ListPart));
+        if (viewModel.ContainerId != null && viewModel.ContentType == model.ContentType)
+        {
+            // We are creating a content item that needs to be added to a container.
+            // Render the container id as part of the form. The content type, and the enable ordering setting.
+            // The content type must be included to prevent any contained items,
+            // such as widgets, from also having a ContainedPart shape built for them.
 
-            if (viewModel.ContainerId != null && viewModel.ContentType == model.ContentType)
+            // Attach ContainedPart to the content item during edit to provide handlers container info.
+            await model.AlterAsync<ContainedPart>(async part =>
             {
-                // We are creating a content item that needs to be added to a container.
-                // Render the container id as part of the form. The content type, and the enable ordering setting.
-                // The content type must be included to prevent any contained items,
-                // such as widgets, from also having a ContainedPart shape built for them.
-
-                // Attach ContainedPart to the content item during edit to provide handlers container info.
-                await model.AlterAsync<ContainedPart>(async part =>
+                part.ListContentItemId = viewModel.ContainerId;
+                part.ListContentType = viewModel.ContainerContentType;
+                if (viewModel.EnableOrdering)
                 {
-                    part.ListContentItemId = viewModel.ContainerId;
-                    part.ListContentType = viewModel.ContainerContentType;
-                    if (viewModel.EnableOrdering)
-                    {
-                        part.Order = await _containerService.GetNextOrderNumberAsync(viewModel.ContainerId);
-                    }
-                });
-
-                return await BuildViewModelAsync(viewModel.ContainerId, viewModel.ContainerContentType, model.ContentType, viewModel.EnableOrdering);
-            }
+                    part.Order = await _containerService.GetNextOrderNumberAsync(viewModel.ContainerId);
+                }
+            });
 
-            return null;
+            return await BuildViewModelAsync(viewModel.ContainerId, viewModel.ContainerContentType, model.ContentType, viewModel.EnableOrdering);
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentItem model, UpdateEditorContext context)
-        {
-            var viewModel = new EditContainedPartViewModel();
-            await context.Updater.TryUpdateModelAsync(viewModel, nameof(ListPart));
+        return null;
+    }
 
-            // The content type must match the value provided in the query string
-            // in order for the ContainedPart to be included on the Content Item.
-            if (viewModel.ContainerId != null && viewModel.ContentType == model.ContentType)
-            {
-                await model.AlterAsync<ContainedPart>(async part =>
-                {
-                    part.ListContentItemId = viewModel.ContainerId;
-                    part.ListContentType = viewModel.ContainerContentType;
+    public override async Task<IDisplayResult> UpdateAsync(ContentItem model, UpdateEditorContext context)
+    {
+        var viewModel = new EditContainedPartViewModel();
+        await context.Updater.TryUpdateModelAsync(viewModel, nameof(ListPart));
 
-                    // If creating get next order number so item is added to the end of the list.
-                    if (viewModel.EnableOrdering)
-                    {
-                        part.Order = await _containerService.GetNextOrderNumberAsync(viewModel.ContainerId);
-                    }
-                });
-            }
+        // The content type must match the value provided in the query string
+        // in order for the ContainedPart to be included on the Content Item.
+        if (viewModel.ContainerId != null && viewModel.ContentType == model.ContentType)
+        {
+            await model.AlterAsync<ContainedPart>(async part =>
+            {
+                part.ListContentItemId = viewModel.ContainerId;
+                part.ListContentType = viewModel.ContainerContentType;
 
-            return await EditAsync(model, context);
+                // If creating get next order number so item is added to the end of the list.
+                if (viewModel.EnableOrdering)
+                {
+                    part.Order = await _containerService.GetNextOrderNumberAsync(viewModel.ContainerId);
+                }
+            });
         }
 
-        private async Task<IDisplayResult> BuildViewModelAsync(string containerId, string containerContentType, string contentType, bool enableOrdering = false)
+        return await EditAsync(model, context);
+    }
+
+    private async Task<IDisplayResult> BuildViewModelAsync(string containerId, string containerContentType, string contentType, bool enableOrdering = false)
+    {
+        var results = new List<IDisplayResult>()
         {
-            var results = new List<IDisplayResult>()
+            Initialize<EditContainedPartViewModel>("ListPart_ContainerId", m =>
             {
-                Initialize<EditContainedPartViewModel>("ListPart_ContainerId", m =>
-                {
-                    m.ContainerId = containerId;
-                    m.ContainerContentType = containerContentType;
-                    m.EnableOrdering = enableOrdering;
-                    m.ContentType = contentType;
-                })
-                .Location("Content"),
-            };
-
-            if (!string.IsNullOrEmpty(containerContentType))
+                m.ContainerId = containerId;
+                m.ContainerContentType = containerContentType;
+                m.EnableOrdering = enableOrdering;
+                m.ContentType = contentType;
+            })
+            .Location("Content"),
+        };
+
+        if (!string.IsNullOrEmpty(containerContentType))
+        {
+            var definition = await _contentDefinitionManager.GetTypeDefinitionAsync(containerContentType);
+
+            if (definition != null)
             {
-                var definition = await _contentDefinitionManager.GetTypeDefinitionAsync(containerContentType);
+                var listPart = definition.Parts.FirstOrDefault(x => x.PartDefinition.Name == nameof(ListPart));
+                var settings = listPart?.GetSettings<ListPartSettings>();
 
-                if (definition != null)
+                if (settings != null)
                 {
-                    var listPart = definition.Parts.FirstOrDefault(x => x.PartDefinition.Name == nameof(ListPart));
-                    var settings = listPart?.GetSettings<ListPartSettings>();
+                    var container = await GetContainerAsync(containerId);
 
-                    if (settings != null)
+                    if (container != null)
                     {
-                        var container = await GetContainerAsync(containerId);
+                        // Add list part navigation.
+                        results.Add(Initialize<ListPartNavigationAdminViewModel>("ListPartNavigationAdmin", async model =>
+                        {
+                            model.ContainedContentTypeDefinitions = (await GetContainedContentTypesAsync(settings)).ToArray();
+                            model.Container = container;
+                            model.EnableOrdering = settings.EnableOrdering;
+                            model.ContainerContentTypeDefinition = definition;
+                        }).Location("Content:1.5"));
 
-                        if (container != null)
+                        if (settings.ShowHeader)
                         {
-                            // Add list part navigation.
-                            results.Add(Initialize<ListPartNavigationAdminViewModel>("ListPartNavigationAdmin", async model =>
-                            {
-                                model.ContainedContentTypeDefinitions = (await GetContainedContentTypesAsync(settings)).ToArray();
-                                model.Container = container;
-                                model.EnableOrdering = settings.EnableOrdering;
-                                model.ContainerContentTypeDefinition = definition;
-                            }).Location("Content:1.5"));
-
-                            if (settings.ShowHeader)
-                            {
-                                results.Add(GetListPartHeader(container, settings));
-                            }
+                            results.Add(GetListPartHeader(container, settings));
                         }
                     }
                 }
             }
-
-            return Combine(results);
         }
 
-        private ShapeResult GetListPartHeader(ContentItem containerContentItem, ListPartSettings listPartSettings)
-            => Initialize<ListPartHeaderAdminViewModel>("ListPartHeaderAdmin", async model =>
-            {
-                model.ContainerContentItem = containerContentItem;
-
-                if (listPartSettings != null)
-                {
-                    model.ContainedContentTypeDefinitions = (await GetContainedContentTypesAsync(listPartSettings)).ToArray();
-                    model.EnableOrdering = listPartSettings.EnableOrdering;
-                }
-            }).Location("Content:1");
-
-        // Initially, attempt to locate a published container.
-        // If none is found, try acquiring the most recent unpublished version.
-        private async Task<ContentItem> GetContainerAsync(string containerId)
-            => await _contentManager.GetAsync(containerId) ?? await _contentManager.GetAsync(containerId, VersionOptions.Latest);
+        return Combine(results);
+    }
 
-        private async Task<IEnumerable<ContentTypeDefinition>> GetContainedContentTypesAsync(ListPartSettings settings)
+    private ShapeResult GetListPartHeader(ContentItem containerContentItem, ListPartSettings listPartSettings)
+        => Initialize<ListPartHeaderAdminViewModel>("ListPartHeaderAdmin", async model =>
         {
-            if (settings.ContainedContentTypes == null)
+            model.ContainerContentItem = containerContentItem;
+
+            if (listPartSettings != null)
             {
-                return [];
+                model.ContainedContentTypeDefinitions = (await GetContainedContentTypesAsync(listPartSettings)).ToArray();
+                model.EnableOrdering = listPartSettings.EnableOrdering;
             }
+        }).Location("Content:1");
 
-            var definitions = new List<ContentTypeDefinition>();
+    // Initially, attempt to locate a published container.
+    // If none is found, try acquiring the most recent unpublished version.
+    private async Task<ContentItem> GetContainerAsync(string containerId)
+        => await _contentManager.GetAsync(containerId) ?? await _contentManager.GetAsync(containerId, VersionOptions.Latest);
 
-            foreach (var contentTypeDefinition in settings.ContainedContentTypes)
-            {
-                var definition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentTypeDefinition);
+    private async Task<IEnumerable<ContentTypeDefinition>> GetContainedContentTypesAsync(ListPartSettings settings)
+    {
+        if (settings.ContainedContentTypes == null)
+        {
+            return [];
+        }
 
-                if (definition is not null)
-                {
-                    definitions.Add(definition);
-                }
-            }
+        var definitions = new List<ContentTypeDefinition>();
+
+        foreach (var contentTypeDefinition in settings.ContainedContentTypes)
+        {
+            var definition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentTypeDefinition);
 
-            return definitions;
+            if (definition is not null)
+            {
+                definitions.Add(definition);
+            }
         }
+
+        return definitions;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Drivers/ListPartContentsAdminListDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Drivers/ListPartContentsAdminListDisplayDriver.cs
index ff5460a7909..29ac1341ba8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Drivers/ListPartContentsAdminListDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Drivers/ListPartContentsAdminListDisplayDriver.cs
@@ -5,36 +5,35 @@
 using OrchardCore.Lists.Models;
 using OrchardCore.Lists.ViewModels;
 
-namespace OrchardCore.Lists.Drivers
+namespace OrchardCore.Lists.Drivers;
+
+public sealed class ListPartContentsAdminListDisplayDriver : DisplayDriver<ContentOptionsViewModel>
 {
-    public sealed class ListPartContentsAdminListDisplayDriver : DisplayDriver<ContentOptionsViewModel>
+    protected override void BuildPrefix(ContentOptionsViewModel model, string htmlFieldPrefix)
     {
-        protected override void BuildPrefix(ContentOptionsViewModel model, string htmlFieldPrefix)
-        {
-            Prefix = "ListPart";
-        }
+        Prefix = "ListPart";
+    }
+
+    public override IDisplayResult Edit(ContentOptionsViewModel model, BuildEditorContext context)
+    {
+        return Dynamic("ContentsAdminList__ListPartFilter").Location("Actions:20");
+    }
 
-        public override IDisplayResult Edit(ContentOptionsViewModel model, BuildEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ContentOptionsViewModel model, UpdateEditorContext context)
+    {
+        var viewModel = new ListPartContentsAdminFilterViewModel();
+        await context.Updater.TryUpdateModelAsync(viewModel, nameof(ListPart));
+
+        if (viewModel.ShowListContentTypes)
         {
-            return Dynamic("ContentsAdminList__ListPartFilter").Location("Actions:20");
+            model.RouteValues.TryAdd("ListPart.ShowListContentTypes", viewModel.ShowListContentTypes);
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentOptionsViewModel model, UpdateEditorContext context)
+        if (!string.IsNullOrEmpty(viewModel.ListContentItemId))
         {
-            var viewModel = new ListPartContentsAdminFilterViewModel();
-            await context.Updater.TryUpdateModelAsync(viewModel, nameof(ListPart));
-
-            if (viewModel.ShowListContentTypes)
-            {
-                model.RouteValues.TryAdd("ListPart.ShowListContentTypes", viewModel.ShowListContentTypes);
-            }
-
-            if (!string.IsNullOrEmpty(viewModel.ListContentItemId))
-            {
-                model.RouteValues.TryAdd("ListPart.ListContentItemId", viewModel.ListContentItemId);
-            }
-
-            return Edit(model, context);
+            model.RouteValues.TryAdd("ListPart.ListContentItemId", viewModel.ListContentItemId);
         }
+
+        return Edit(model, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Drivers/ListPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Drivers/ListPartDisplayDriver.cs
index 8f295140ec5..be5970901fc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Drivers/ListPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Drivers/ListPartDisplayDriver.cs
@@ -14,182 +14,181 @@
 using OrchardCore.Lists.ViewModels;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Lists.Drivers
+namespace OrchardCore.Lists.Drivers;
+
+public sealed class ListPartDisplayDriver : ContentPartDisplayDriver<ListPart>
 {
-    public sealed class ListPartDisplayDriver : ContentPartDisplayDriver<ListPart>
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContainerService _containerService;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+
+    public ListPartDisplayDriver(
+        IContentDefinitionManager contentDefinitionManager,
+        IContainerService containerService,
+        IUpdateModelAccessor updateModelAccessor
+        )
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IContainerService _containerService;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-
-        public ListPartDisplayDriver(
-            IContentDefinitionManager contentDefinitionManager,
-            IContainerService containerService,
-            IUpdateModelAccessor updateModelAccessor
-            )
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _containerService = containerService;
-            _updateModelAccessor = updateModelAccessor;
-        }
-
-        public override IDisplayResult Edit(ListPart part, BuildPartEditorContext context)
-        {
-            var settings = context.TypePartDefinition.GetSettings<ListPartSettings>();
-
-            return
-                Combine(
-                    InitializeEditListPartNavigationAdmin(part, context, settings),
-                    InitializeEditListPartHeaderAdmin(part, context, settings)
-               );
-        }
+        _contentDefinitionManager = contentDefinitionManager;
+        _containerService = containerService;
+        _updateModelAccessor = updateModelAccessor;
+    }
 
-        public override IDisplayResult Display(ListPart listPart, BuildPartDisplayContext context)
-        {
-            var settings = context.TypePartDefinition.GetSettings<ListPartSettings>();
+    public override IDisplayResult Edit(ListPart part, BuildPartEditorContext context)
+    {
+        var settings = context.TypePartDefinition.GetSettings<ListPartSettings>();
 
-            return
-                Combine(
-                    InitializeDisplayListPartDisplayShape(listPart, context),
-                    InitializeDisplayListPartDetailAdminShape(listPart, context),
-                    InitializeDisplayListPartNavigationAdminShape(listPart, context, settings),
-                    InitializeDisplayListPartHeaderAdminShape(listPart, settings),
-                    InitializeDisplayListPartSummaryAdmin(listPart)
-                );
-        }
+        return
+            Combine(
+                InitializeEditListPartNavigationAdmin(part, context, settings),
+                InitializeEditListPartHeaderAdmin(part, context, settings)
+           );
+    }
 
-        private ShapeResult InitializeEditListPartHeaderAdmin(ListPart part, BuildPartEditorContext context, ListPartSettings settings)
-        {
-            return Initialize<ListPartHeaderAdminViewModel>("ListPartHeaderAdmin", async model =>
-            {
-                model.ContainerContentItem = part.ContentItem;
-                model.ContainedContentTypeDefinitions = (await GetContainedContentTypesAsync(settings)).ToArray();
-                model.EnableOrdering = settings.EnableOrdering;
-            }).Location("Content:1")
-            .RenderWhen(() => Task.FromResult(!context.IsNew && settings.ShowHeader));
-        }
+    public override IDisplayResult Display(ListPart listPart, BuildPartDisplayContext context)
+    {
+        var settings = context.TypePartDefinition.GetSettings<ListPartSettings>();
+
+        return
+            Combine(
+                InitializeDisplayListPartDisplayShape(listPart, context),
+                InitializeDisplayListPartDetailAdminShape(listPart, context),
+                InitializeDisplayListPartNavigationAdminShape(listPart, context, settings),
+                InitializeDisplayListPartHeaderAdminShape(listPart, settings),
+                InitializeDisplayListPartSummaryAdmin(listPart)
+            );
+    }
 
-        private ShapeResult InitializeEditListPartNavigationAdmin(ListPart part, BuildPartEditorContext context, ListPartSettings settings)
+    private ShapeResult InitializeEditListPartHeaderAdmin(ListPart part, BuildPartEditorContext context, ListPartSettings settings)
+    {
+        return Initialize<ListPartHeaderAdminViewModel>("ListPartHeaderAdmin", async model =>
         {
-            return Initialize<ListPartNavigationAdminViewModel>("ListPartNavigationAdmin", async model =>
-            {
-                model.Container = part.ContentItem;
-                model.ContainedContentTypeDefinitions = (await GetContainedContentTypesAsync(settings)).ToArray();
-                model.EnableOrdering = settings.EnableOrdering;
-                model.ContainerContentTypeDefinition = context.TypePartDefinition.ContentTypeDefinition;
-            })
-                .Location("Content:1.5")
-                .RenderWhen(() => Task.FromResult(!context.IsNew));
-        }
+            model.ContainerContentItem = part.ContentItem;
+            model.ContainedContentTypeDefinitions = (await GetContainedContentTypesAsync(settings)).ToArray();
+            model.EnableOrdering = settings.EnableOrdering;
+        }).Location("Content:1")
+        .RenderWhen(() => Task.FromResult(!context.IsNew && settings.ShowHeader));
+    }
 
-        private ShapeResult InitializeDisplayListPartSummaryAdmin(ListPart listPart)
+    private ShapeResult InitializeEditListPartNavigationAdmin(ListPart part, BuildPartEditorContext context, ListPartSettings settings)
+    {
+        return Initialize<ListPartNavigationAdminViewModel>("ListPartNavigationAdmin", async model =>
         {
-            return Initialize<ContentItemViewModel>("ListPartSummaryAdmin", model => model.ContentItem = listPart.ContentItem)
-                .Location("SummaryAdmin", "Actions:4");
-        }
+            model.Container = part.ContentItem;
+            model.ContainedContentTypeDefinitions = (await GetContainedContentTypesAsync(settings)).ToArray();
+            model.EnableOrdering = settings.EnableOrdering;
+            model.ContainerContentTypeDefinition = context.TypePartDefinition.ContentTypeDefinition;
+        })
+            .Location("Content:1.5")
+            .RenderWhen(() => Task.FromResult(!context.IsNew));
+    }
 
-        private ShapeResult InitializeDisplayListPartHeaderAdminShape(ListPart listPart, ListPartSettings settings)
-        {
-            return Initialize<ListPartHeaderAdminViewModel>("ListPartHeaderAdmin", async model =>
-            {
-                model.ContainerContentItem = listPart.ContentItem;
-                model.ContainedContentTypeDefinitions = (await GetContainedContentTypesAsync(settings)).ToArray();
-                model.EnableOrdering = settings.EnableOrdering;
-            }).Location("DetailAdmin", "Content:1")
-            .RenderWhen(() => Task.FromResult(settings.ShowHeader));
-        }
+    private ShapeResult InitializeDisplayListPartSummaryAdmin(ListPart listPart)
+    {
+        return Initialize<ContentItemViewModel>("ListPartSummaryAdmin", model => model.ContentItem = listPart.ContentItem)
+            .Location("SummaryAdmin", "Actions:4");
+    }
 
-        private ShapeResult InitializeDisplayListPartNavigationAdminShape(ListPart listPart, BuildPartDisplayContext context, ListPartSettings settings)
+    private ShapeResult InitializeDisplayListPartHeaderAdminShape(ListPart listPart, ListPartSettings settings)
+    {
+        return Initialize<ListPartHeaderAdminViewModel>("ListPartHeaderAdmin", async model =>
         {
-            return Initialize<ListPartNavigationAdminViewModel>("ListPartNavigationAdmin", async model =>
-            {
-                model.ContainedContentTypeDefinitions = (await GetContainedContentTypesAsync(settings)).ToArray();
-                model.Container = listPart.ContentItem;
-                model.EnableOrdering = settings.EnableOrdering;
-                model.ContainerContentTypeDefinition = context.TypePartDefinition.ContentTypeDefinition;
-            }).Location("DetailAdmin", "Content:1.5");
-        }
+            model.ContainerContentItem = listPart.ContentItem;
+            model.ContainedContentTypeDefinitions = (await GetContainedContentTypesAsync(settings)).ToArray();
+            model.EnableOrdering = settings.EnableOrdering;
+        }).Location("DetailAdmin", "Content:1")
+        .RenderWhen(() => Task.FromResult(settings.ShowHeader));
+    }
 
-        private ShapeResult InitializeDisplayListPartDetailAdminShape(ListPart listPart, BuildPartDisplayContext context)
+    private ShapeResult InitializeDisplayListPartNavigationAdminShape(ListPart listPart, BuildPartDisplayContext context, ListPartSettings settings)
+    {
+        return Initialize<ListPartNavigationAdminViewModel>("ListPartNavigationAdmin", async model =>
         {
-            return Initialize("ListPartDetailAdmin", (Func<ListPartViewModel, ValueTask>)(async model =>
-            {
-                var pager = await GetPagerSlimAsync(context);
-                var settings = context.TypePartDefinition.GetSettings<ListPartSettings>();
-                var listPartFilterViewModel = new ListPartFilterViewModel();
-                var containedItemOptions = new ContainedItemOptions();
-
-                await _updateModelAccessor.ModelUpdater.TryUpdateModelAsync(listPartFilterViewModel, Prefix);
-                model.ListPart = listPart;
-                containedItemOptions.DisplayText = listPartFilterViewModel.DisplayText;
-                containedItemOptions.Status = listPartFilterViewModel.Status;
-                model.ListPartFilterViewModel = listPartFilterViewModel;
-
-                model.ContentItems = (await _containerService.QueryContainedItemsAsync(
-                    listPart.ContentItem.ContentItemId,
-                    settings.EnableOrdering,
-                    pager,
-                    containedItemOptions)).ToArray();
-
-                model.ContainedContentTypeDefinitions = await GetContainedContentTypesAsync(settings);
-                model.Context = context;
-                model.EnableOrdering = settings.EnableOrdering;
-                model.Pager = await context.New.PagerSlim(pager);
-            }))
-                .Location("DetailAdmin", "Content:10");
-        }
+            model.ContainedContentTypeDefinitions = (await GetContainedContentTypesAsync(settings)).ToArray();
+            model.Container = listPart.ContentItem;
+            model.EnableOrdering = settings.EnableOrdering;
+            model.ContainerContentTypeDefinition = context.TypePartDefinition.ContentTypeDefinition;
+        }).Location("DetailAdmin", "Content:1.5");
+    }
 
-        private ShapeResult InitializeDisplayListPartDisplayShape(ListPart listPart, BuildPartDisplayContext context)
+    private ShapeResult InitializeDisplayListPartDetailAdminShape(ListPart listPart, BuildPartDisplayContext context)
+    {
+        return Initialize("ListPartDetailAdmin", (Func<ListPartViewModel, ValueTask>)(async model =>
         {
-            return Initialize<ListPartViewModel>(GetDisplayShapeType(context), async model =>
-            {
-                var pager = await GetPagerSlimAsync(context);
-                var settings = context.TypePartDefinition.GetSettings<ListPartSettings>();
-                var containedItemOptions = new ContainedItemOptions();
-                model.ContentItems = (await _containerService.QueryContainedItemsAsync(
-                    listPart.ContentItem.ContentItemId,
-                    settings.EnableOrdering,
-                    pager,
-                    containedItemOptions)).ToArray();
-
-                model.ContainedContentTypeDefinitions = await GetContainedContentTypesAsync(settings);
-                model.Context = context;
-                model.Pager = await context.New.PagerSlim(pager);
-                model.ListPart = listPart;
-            })
-                .Location("Detail", "Content:10");
-        }
+            var pager = await GetPagerSlimAsync(context);
+            var settings = context.TypePartDefinition.GetSettings<ListPartSettings>();
+            var listPartFilterViewModel = new ListPartFilterViewModel();
+            var containedItemOptions = new ContainedItemOptions();
+
+            await _updateModelAccessor.ModelUpdater.TryUpdateModelAsync(listPartFilterViewModel, Prefix);
+            model.ListPart = listPart;
+            containedItemOptions.DisplayText = listPartFilterViewModel.DisplayText;
+            containedItemOptions.Status = listPartFilterViewModel.Status;
+            model.ListPartFilterViewModel = listPartFilterViewModel;
+
+            model.ContentItems = (await _containerService.QueryContainedItemsAsync(
+                listPart.ContentItem.ContentItemId,
+                settings.EnableOrdering,
+                pager,
+                containedItemOptions)).ToArray();
+
+            model.ContainedContentTypeDefinitions = await GetContainedContentTypesAsync(settings);
+            model.Context = context;
+            model.EnableOrdering = settings.EnableOrdering;
+            model.Pager = await context.New.PagerSlim(pager);
+        }))
+            .Location("DetailAdmin", "Content:10");
+    }
 
-        private static async Task<PagerSlim> GetPagerSlimAsync(BuildPartDisplayContext context)
+    private ShapeResult InitializeDisplayListPartDisplayShape(ListPart listPart, BuildPartDisplayContext context)
+    {
+        return Initialize<ListPartViewModel>(GetDisplayShapeType(context), async model =>
         {
+            var pager = await GetPagerSlimAsync(context);
             var settings = context.TypePartDefinition.GetSettings<ListPartSettings>();
-            var pagerParameters = new PagerSlimParameters();
-            await context.Updater.TryUpdateModelAsync(pagerParameters);
+            var containedItemOptions = new ContainedItemOptions();
+            model.ContentItems = (await _containerService.QueryContainedItemsAsync(
+                listPart.ContentItem.ContentItemId,
+                settings.EnableOrdering,
+                pager,
+                containedItemOptions)).ToArray();
+
+            model.ContainedContentTypeDefinitions = await GetContainedContentTypesAsync(settings);
+            model.Context = context;
+            model.Pager = await context.New.PagerSlim(pager);
+            model.ListPart = listPart;
+        })
+            .Location("Detail", "Content:10");
+    }
 
-            var pager = new PagerSlim(pagerParameters, settings.PageSize);
+    private static async Task<PagerSlim> GetPagerSlimAsync(BuildPartDisplayContext context)
+    {
+        var settings = context.TypePartDefinition.GetSettings<ListPartSettings>();
+        var pagerParameters = new PagerSlimParameters();
+        await context.Updater.TryUpdateModelAsync(pagerParameters);
 
-            return pager;
-        }
+        var pager = new PagerSlim(pagerParameters, settings.PageSize);
 
-        private async Task<IEnumerable<ContentTypeDefinition>> GetContainedContentTypesAsync(ListPartSettings settings)
-        {
-            var contentTypes = settings.ContainedContentTypes ?? [];
+        return pager;
+    }
 
-            var definitions = new List<ContentTypeDefinition>();
+    private async Task<IEnumerable<ContentTypeDefinition>> GetContainedContentTypesAsync(ListPartSettings settings)
+    {
+        var contentTypes = settings.ContainedContentTypes ?? [];
 
-            foreach (var contentType in contentTypes)
-            {
-                var definition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentType);
+        var definitions = new List<ContentTypeDefinition>();
 
-                if (definition == null)
-                {
-                    continue;
-                }
+        foreach (var contentType in contentTypes)
+        {
+            var definition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentType);
 
-                definitions.Add(definition);
+            if (definition == null)
+            {
+                continue;
             }
 
-            return definitions;
+            definitions.Add(definition);
         }
+
+        return definitions;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListFeedEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListFeedEditViewModel.cs
index 9276894a64c..0ae4aecd6e7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListFeedEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListFeedEditViewModel.cs
@@ -1,15 +1,14 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Lists.Feeds
+namespace OrchardCore.Lists.Feeds;
+
+public class ListFeedEditViewModel
 {
-    public class ListFeedEditViewModel
-    {
-        public bool DisableRssFeed { get; set; }
+    public bool DisableRssFeed { get; set; }
 
-        public string FeedProxyUrl { get; set; }
+    public string FeedProxyUrl { get; set; }
 
-        public int FeedItemsCount { get; set; } = ListFeedQuery.DefaultItemsCount;
+    public int FeedItemsCount { get; set; } = ListFeedQuery.DefaultItemsCount;
 
-        public ContentItem ContentItem { get; set; }
-    }
+    public ContentItem ContentItem { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListFeedQuery.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListFeedQuery.cs
index 992c05abb13..85f17ed3b8a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListFeedQuery.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListFeedQuery.cs
@@ -11,108 +11,107 @@
 using OrchardCore.Lists.Indexes;
 using YesSql;
 
-namespace OrchardCore.Lists.Feeds
+namespace OrchardCore.Lists.Feeds;
+
+public class ListFeedQuery : IFeedQueryProvider, IFeedQuery
 {
-    public class ListFeedQuery : IFeedQueryProvider, IFeedQuery
+    public const int DefaultItemsCount = 20;
+
+    private readonly IContentManager _contentManager;
+    private readonly ISession _session;
+
+    public ListFeedQuery(IContentManager contentManager, ISession session)
     {
-        public const int DefaultItemsCount = 20;
+        _contentManager = contentManager;
+        _session = session;
+    }
 
-        private readonly IContentManager _contentManager;
-        private readonly ISession _session;
+    public async Task<FeedQueryMatch> MatchAsync(FeedContext context)
+    {
+        var model = new ListFeedQueryViewModel();
 
-        public ListFeedQuery(IContentManager contentManager, ISession session)
+        if (!await context.Updater.TryUpdateModelAsync(model) || model.ContentItemId == null)
         {
-            _contentManager = contentManager;
-            _session = session;
+            return null;
         }
 
-        public async Task<FeedQueryMatch> MatchAsync(FeedContext context)
-        {
-            var model = new ListFeedQueryViewModel();
+        var contentItem = await _contentManager.GetAsync(model.ContentItemId);
+        var feedMetadata = await _contentManager.PopulateAspectAsync<FeedMetadata>(contentItem);
 
-            if (!await context.Updater.TryUpdateModelAsync(model) || model.ContentItemId == null)
-            {
-                return null;
-            }
+        if (feedMetadata.DisableRssFeed)
+        {
+            return null;
+        }
 
-            var contentItem = await _contentManager.GetAsync(model.ContentItemId);
-            var feedMetadata = await _contentManager.PopulateAspectAsync<FeedMetadata>(contentItem);
+        return new FeedQueryMatch { FeedQuery = this, Priority = -5 };
+    }
 
-            if (feedMetadata.DisableRssFeed)
-            {
-                return null;
-            }
+    public async Task ExecuteAsync(FeedContext context)
+    {
+        var model = new ListFeedQueryViewModel();
 
-            return new FeedQueryMatch { FeedQuery = this, Priority = -5 };
+        if (!await context.Updater.TryUpdateModelAsync(model) || model.ContentItemId == null)
+        {
+            return;
         }
 
-        public async Task ExecuteAsync(FeedContext context)
-        {
-            var model = new ListFeedQueryViewModel();
+        var contentItem = await _contentManager.GetAsync(model.ContentItemId);
 
-            if (!await context.Updater.TryUpdateModelAsync(model) || model.ContentItemId == null)
-            {
-                return;
-            }
+        if (contentItem == null)
+        {
+            return;
+        }
 
-            var contentItem = await _contentManager.GetAsync(model.ContentItemId);
+        var contentItemMetadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(contentItem);
+        var bodyAspect = await _contentManager.PopulateAspectAsync<BodyAspect>(contentItem);
+        var routes = contentItemMetadata.DisplayRouteValues;
 
-            if (contentItem == null)
-            {
-                return;
-            }
+        if (context.Format == "rss")
+        {
+            var link = new XElement("link");
+            context.Response.Element.SetElementValue("title", contentItem.DisplayText);
+            context.Response.Element.Add(link);
 
-            var contentItemMetadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(contentItem);
-            var bodyAspect = await _contentManager.PopulateAspectAsync<BodyAspect>(contentItem);
-            var routes = contentItemMetadata.DisplayRouteValues;
+            context.Response.Element.Add(new XElement("description", new XCData(bodyAspect.Body?.ToString() ?? string.Empty)));
 
-            if (context.Format == "rss")
+            context.Response.Contextualize(contextualize =>
             {
-                var link = new XElement("link");
-                context.Response.Element.SetElementValue("title", contentItem.DisplayText);
-                context.Response.Element.Add(link);
-
-                context.Response.Element.Add(new XElement("description", new XCData(bodyAspect.Body?.ToString() ?? string.Empty)));
+                var request = contextualize.Url.ActionContext.HttpContext.Request;
+                var url = contextualize.Url.Action(routes["action"].ToString(), routes["controller"].ToString(), routes, request.Scheme);
 
-                context.Response.Contextualize(contextualize =>
-                {
-                    var request = contextualize.Url.ActionContext.HttpContext.Request;
-                    var url = contextualize.Url.Action(routes["action"].ToString(), routes["controller"].ToString(), routes, request.Scheme);
+                link.Add(url);
+            });
+        }
+        else
+        {
+            context.Builder.AddProperty(context, null, "title", contentItem.DisplayText);
+            context.Builder.AddProperty(context, null, new XElement("description", new XCData(bodyAspect.Body?.ToString() ?? string.Empty)));
 
-                    link.Add(url);
-                });
-            }
-            else
+            context.Response.Contextualize(contextualize =>
             {
-                context.Builder.AddProperty(context, null, "title", contentItem.DisplayText);
-                context.Builder.AddProperty(context, null, new XElement("description", new XCData(bodyAspect.Body?.ToString() ?? string.Empty)));
-
-                context.Response.Contextualize(contextualize =>
-                {
-                    var request = contextualize.Url.ActionContext.HttpContext.Request;
-                    var url = contextualize.Url.Action(routes["action"].ToString(), routes["controller"].ToString(), routes, request.Scheme);
+                var request = contextualize.Url.ActionContext.HttpContext.Request;
+                var url = contextualize.Url.Action(routes["action"].ToString(), routes["controller"].ToString(), routes, request.Scheme);
 
-                    context.Builder.AddProperty(context, null, "link", url);
-                });
-            }
+                context.Builder.AddProperty(context, null, "link", url);
+            });
+        }
 
-            int itemsCount = contentItem.Content.ListPart?.FeedItemsCount ?? DefaultItemsCount;
+        int itemsCount = contentItem.Content.ListPart?.FeedItemsCount ?? DefaultItemsCount;
 
-            IEnumerable<ContentItem> items;
+        IEnumerable<ContentItem> items;
 
-            items = itemsCount == 0
-                ? Enumerable.Empty<ContentItem>()
-                : await _session.Query<ContentItem>()
-                    .With<ContainedPartIndex>(x => x.ListContentItemId == contentItem.ContentItemId)
-                    .With<ContentItemIndex>(x => x.Published)
-                    .OrderByDescending(x => x.CreatedUtc)
-                    .Take(itemsCount)
-                    .ListAsync();
+        items = itemsCount == 0
+            ? Enumerable.Empty<ContentItem>()
+            : await _session.Query<ContentItem>()
+                .With<ContainedPartIndex>(x => x.ListContentItemId == contentItem.ContentItemId)
+                .With<ContentItemIndex>(x => x.Published)
+                .OrderByDescending(x => x.CreatedUtc)
+                .Take(itemsCount)
+                .ListAsync();
 
-            foreach (var item in items)
-            {
-                context.Builder.AddItem(context, item);
-            }
+        foreach (var item in items)
+        {
+            context.Builder.AddItem(context, item);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListFeedQueryViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListFeedQueryViewModel.cs
index b296ea41c44..1c8b4d2894f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListFeedQueryViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListFeedQueryViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Lists.Feeds
+namespace OrchardCore.Lists.Feeds;
+
+public class ListFeedQueryViewModel
 {
-    public class ListFeedQueryViewModel
-    {
-        public string ContentItemId { get; set; }
-    }
+    public string ContentItemId { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListPartFeedDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListPartFeedDisplayDriver.cs
index 94bc71f510b..0e2b5a03d40 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListPartFeedDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListPartFeedDisplayDriver.cs
@@ -5,44 +5,43 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Lists.Models;
 
-namespace OrchardCore.Lists.Feeds
+namespace OrchardCore.Lists.Feeds;
+
+public sealed class ListPartFeedDisplayDriver : ContentPartDisplayDriver<ListPart>
 {
-    public sealed class ListPartFeedDisplayDriver : ContentPartDisplayDriver<ListPart>
+    public override IDisplayResult Display(ListPart listPart, BuildPartDisplayContext context)
     {
-        public override IDisplayResult Display(ListPart listPart, BuildPartDisplayContext context)
+        return Dynamic("ListPartFeed", shape =>
         {
-            return Dynamic("ListPartFeed", shape =>
-            {
-                shape.ContentItem = listPart.ContentItem;
-            })
-            .Location("Detail", "Content");
-        }
+            shape.ContentItem = listPart.ContentItem;
+        })
+        .Location("Detail", "Content");
+    }
 
-        public override IDisplayResult Edit(ListPart part, BuildPartEditorContext context)
+    public override IDisplayResult Edit(ListPart part, BuildPartEditorContext context)
+    {
+        return Initialize<ListFeedEditViewModel>("ListPartFeed_Edit", m =>
         {
-            return Initialize<ListFeedEditViewModel>("ListPartFeed_Edit", m =>
-            {
-                m.DisableRssFeed = part.ContentItem.Content.ListPart.DisableRssFeed ?? false;
-                m.FeedProxyUrl = part.ContentItem.Content.ListPart.FeedProxyUrl;
-                m.FeedItemsCount = part.ContentItem.Content.ListPart.FeedItemsCount ?? 20;
-                m.ContentItem = part.ContentItem;
-            });
-        }
+            m.DisableRssFeed = part.ContentItem.Content.ListPart.DisableRssFeed ?? false;
+            m.FeedProxyUrl = part.ContentItem.Content.ListPart.FeedProxyUrl;
+            m.FeedItemsCount = part.ContentItem.Content.ListPart.FeedItemsCount ?? 20;
+            m.ContentItem = part.ContentItem;
+        });
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ListPart part, UpdatePartEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ListPart part, UpdatePartEditorContext context)
+    {
+        var model = new ListFeedEditViewModel
         {
-            var model = new ListFeedEditViewModel
-            {
-                ContentItem = part.ContentItem,
-            };
+            ContentItem = part.ContentItem,
+        };
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix, t => t.DisableRssFeed, t => t.FeedProxyUrl, t => t.FeedItemsCount);
+        await context.Updater.TryUpdateModelAsync(model, Prefix, t => t.DisableRssFeed, t => t.FeedProxyUrl, t => t.FeedItemsCount);
 
-            part.ContentItem.Content.ListPart.DisableRssFeed = model.DisableRssFeed;
-            part.ContentItem.Content.ListPart.FeedProxyUrl = model.FeedProxyUrl;
-            part.ContentItem.Content.ListPart.FeedItemsCount = model.FeedItemsCount;
+        part.ContentItem.Content.ListPart.DisableRssFeed = model.DisableRssFeed;
+        part.ContentItem.Content.ListPart.FeedProxyUrl = model.FeedProxyUrl;
+        part.ContentItem.Content.ListPart.FeedItemsCount = model.FeedItemsCount;
 
-            return Edit(part, context);
-        }
+        return Edit(part, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListPartFeedHandler.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListPartFeedHandler.cs
index 6a007e2206d..5aee46a02c0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListPartFeedHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Feeds/ListPartFeedHandler.cs
@@ -3,20 +3,19 @@
 using OrchardCore.Feeds.Models;
 using OrchardCore.Lists.Models;
 
-namespace OrchardCore.Lists.Drivers
+namespace OrchardCore.Lists.Drivers;
+
+public class ListPartFeedHandler : ContentPartHandler<ListPart>
 {
-    public class ListPartFeedHandler : ContentPartHandler<ListPart>
+    public override Task GetContentItemAspectAsync(ContentItemAspectContext context, ListPart part)
     {
-        public override Task GetContentItemAspectAsync(ContentItemAspectContext context, ListPart part)
+        return context.ForAsync<FeedMetadata>(feedMetadata =>
         {
-            return context.ForAsync<FeedMetadata>(feedMetadata =>
-            {
-                // Enable the feed if the value is not defined. This is handy to migrate the old feeds
-                feedMetadata.DisableRssFeed = part.Content.DisableRssFeed ?? false;
-                feedMetadata.FeedProxyUrl = part.Content.FeedProxyUrl;
+            // Enable the feed if the value is not defined. This is handy to migrate the old feeds
+            feedMetadata.DisableRssFeed = part.Content.DisableRssFeed ?? false;
+            feedMetadata.FeedProxyUrl = part.Content.FeedProxyUrl;
 
-                return Task.CompletedTask;
-            });
-        }
+            return Task.CompletedTask;
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/ContainedInputObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/ContainedInputObjectType.cs
index a4646c1da10..4f242ab09c7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/ContainedInputObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/ContainedInputObjectType.cs
@@ -3,16 +3,15 @@
 using OrchardCore.Apis.GraphQL.Queries;
 using OrchardCore.Lists.Models;
 
-namespace OrchardCore.Lists.GraphQL
+namespace OrchardCore.Lists.GraphQL;
+
+public class ContainedInputObjectType : WhereInputObjectGraphType<ContainedPart>
 {
-    public class ContainedInputObjectType : WhereInputObjectGraphType<ContainedPart>
+    public ContainedInputObjectType(IStringLocalizer<ContainedPart> S)
     {
-        public ContainedInputObjectType(IStringLocalizer<ContainedPart> S)
-        {
-            Name = "ContainedPartInput";
-            Description = S["the list part of the content item"];
+        Name = "ContainedPartInput";
+        Description = S["the list part of the content item"];
 
-            AddScalarFilterFields<IdGraphType>("listContentItemId", S["the content item id of the parent list of the content item to filter"]);
-        }
+        AddScalarFilterFields<IdGraphType>("listContentItemId", S["the content item id of the parent list of the content item to filter"]);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/ContainedPartIndexAliasProvider.cs b/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/ContainedPartIndexAliasProvider.cs
index 0640a59e123..9f3b4a12e10 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/ContainedPartIndexAliasProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/ContainedPartIndexAliasProvider.cs
@@ -3,23 +3,22 @@
 using OrchardCore.ContentManagement.GraphQL.Queries;
 using OrchardCore.Lists.Indexes;
 
-namespace OrchardCore.Lists.GraphQL
-{
-    public class ContainedPartIndexAliasProvider : IIndexAliasProvider
-    {
-        private static readonly IndexAlias[] _aliases =
-        [
-            new IndexAlias
-            {
-                Alias = "containedPart",
-                Index = nameof(ContainedPartIndex),
-                IndexType = typeof(ContainedPartIndex)
-            }
-        ];
+namespace OrchardCore.Lists.GraphQL;
 
-        public ValueTask<IEnumerable<IndexAlias>> GetAliasesAsync()
+public class ContainedPartIndexAliasProvider : IIndexAliasProvider
+{
+    private static readonly IndexAlias[] _aliases =
+    [
+        new IndexAlias
         {
-            return ValueTask.FromResult<IEnumerable<IndexAlias>>(_aliases);
+            Alias = "containedPart",
+            Index = nameof(ContainedPartIndex),
+            IndexType = typeof(ContainedPartIndex)
         }
+    ];
+
+    public ValueTask<IEnumerable<IndexAlias>> GetAliasesAsync()
+    {
+        return ValueTask.FromResult<IEnumerable<IndexAlias>>(_aliases);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/ContainedQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/ContainedQueryObjectType.cs
index 9e647376950..bc97c784c6c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/ContainedQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/ContainedQueryObjectType.cs
@@ -2,17 +2,16 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Lists.Models;
 
-namespace OrchardCore.Lists.GraphQL
+namespace OrchardCore.Lists.GraphQL;
+
+public class ContainedQueryObjectType : ObjectGraphType<ContainedPart>
 {
-    public class ContainedQueryObjectType : ObjectGraphType<ContainedPart>
+    public ContainedQueryObjectType(IStringLocalizer<ContainedQueryObjectType> S)
     {
-        public ContainedQueryObjectType(IStringLocalizer<ContainedQueryObjectType> S)
-        {
-            Name = "ContainedPart";
-            Description = S["Represents a link to the parent content item, and the order that content item is represented."];
+        Name = "ContainedPart";
+        Description = S["Represents a link to the parent content item, and the order that content item is represented."];
 
-            Field(x => x.ListContentItemId);
-            Field(x => x.Order);
-        }
+        Field(x => x.ListContentItemId);
+        Field(x => x.Order);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/ListQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/ListQueryObjectType.cs
index 0862a60aa53..3b4854ebae5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/ListQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/ListQueryObjectType.cs
@@ -15,49 +15,48 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.Lists.GraphQL
+namespace OrchardCore.Lists.GraphQL;
+
+public class ListQueryObjectType : ObjectGraphType<ListPart>
 {
-    public class ListQueryObjectType : ObjectGraphType<ListPart>
+    public ListQueryObjectType(IStringLocalizer<ListQueryObjectType> S)
     {
-        public ListQueryObjectType(IStringLocalizer<ListQueryObjectType> S)
-        {
-            Name = "ListPart";
-            Description = S["Represents a collection of content items."];
-
-            Field<ListGraphType<ContentItemInterface>, IEnumerable<ContentItem>>("contentItems")
-                .Description("the content items")
-                .Argument<IntGraphType>("first", "the first n elements (10 by default)", config => config.DefaultValue = 10)
-                .Argument<IntGraphType>("skip", "the number of elements to skip", config => config.DefaultValue = 0)
-                // Important to use ResolveLockedAsync to prevent concurrency error on database query, when using nested content items with List part
-                .ResolveLockedAsync(async g =>
-                {
-                    var serviceProvider = g.RequestServices;
-                    var session = serviceProvider.GetService<ISession>();
-                    var accessor = serviceProvider.GetRequiredService<IDataLoaderContextAccessor>();
-
-                    var dataLoader = accessor.Context.GetOrAddCollectionBatchLoader<string, ContentItem>("ContainedPublishedContentItems",
-                       x => LoadPublishedContentItemsForListAsync(x, session, g.GetArgument<int>("skip"), g.GetArgument<int>("first")));
-
-                    return await dataLoader.LoadAsync(g.Source.ContentItem.ContentItemId).GetResultAsync();
-                });
-        }
+        Name = "ListPart";
+        Description = S["Represents a collection of content items."];
 
-        private static async Task<ILookup<string, ContentItem>> LoadPublishedContentItemsForListAsync(IEnumerable<string> contentItemIds, ISession session, int skip, int count)
-        {
-            if (contentItemIds is null || !contentItemIds.Any())
+        Field<ListGraphType<ContentItemInterface>, IEnumerable<ContentItem>>("contentItems")
+            .Description("the content items")
+            .Argument<IntGraphType>("first", "the first n elements (10 by default)", config => config.DefaultValue = 10)
+            .Argument<IntGraphType>("skip", "the number of elements to skip", config => config.DefaultValue = 0)
+            // Important to use ResolveLockedAsync to prevent concurrency error on database query, when using nested content items with List part
+            .ResolveLockedAsync(async g =>
             {
-                return new Dictionary<string, ContentItem>().ToLookup(k => k.Key, v => v.Value);
-            }
-
-            var query = await session.Query<ContentItem>()
-                                     .With<ContentItemIndex>(ci => ci.Published)
-                                     .With<ContainedPartIndex>(cp => cp.ListContentItemId.IsIn(contentItemIds))
-                                     .OrderBy(o => o.Order)
-                                     .Skip(skip)
-                                     .Take(count)
-                                     .ListAsync();
-
-            return query.ToLookup(k => k.As<ContainedPart>().ListContentItemId);
+                var serviceProvider = g.RequestServices;
+                var session = serviceProvider.GetService<ISession>();
+                var accessor = serviceProvider.GetRequiredService<IDataLoaderContextAccessor>();
+
+                var dataLoader = accessor.Context.GetOrAddCollectionBatchLoader<string, ContentItem>("ContainedPublishedContentItems",
+                   x => LoadPublishedContentItemsForListAsync(x, session, g.GetArgument<int>("skip"), g.GetArgument<int>("first")));
+
+                return await dataLoader.LoadAsync(g.Source.ContentItem.ContentItemId).GetResultAsync();
+            });
+    }
+
+    private static async Task<ILookup<string, ContentItem>> LoadPublishedContentItemsForListAsync(IEnumerable<string> contentItemIds, ISession session, int skip, int count)
+    {
+        if (contentItemIds is null || !contentItemIds.Any())
+        {
+            return new Dictionary<string, ContentItem>().ToLookup(k => k.Key, v => v.Value);
         }
+
+        var query = await session.Query<ContentItem>()
+                                 .With<ContentItemIndex>(ci => ci.Published)
+                                 .With<ContainedPartIndex>(cp => cp.ListContentItemId.IsIn(contentItemIds))
+                                 .OrderBy(o => o.Order)
+                                 .Skip(skip)
+                                 .Take(count)
+                                 .ListAsync();
+
+        return query.ToLookup(k => k.As<ContainedPart>().ListContentItemId);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/Startup.cs
index c8ab6761053..2571117f7a6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/Startup.cs
@@ -6,18 +6,17 @@
 using OrchardCore.Lists.Models;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Lists.GraphQL
+namespace OrchardCore.Lists.GraphQL;
+
+[RequireFeatures("OrchardCore.Apis.GraphQL")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Apis.GraphQL")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddInputObjectGraphType<ContainedPart, ContainedInputObjectType>();
-            services.AddObjectGraphType<ContainedPart, ContainedQueryObjectType>();
-            services.AddObjectGraphType<ListPart, ListQueryObjectType>();
-            services.AddTransient<IIndexAliasProvider, ContainedPartIndexAliasProvider>();
-            services.AddWhereInputIndexPropertyProvider<ContainedPartIndex>();
-        }
+        services.AddInputObjectGraphType<ContainedPart, ContainedInputObjectType>();
+        services.AddObjectGraphType<ContainedPart, ContainedQueryObjectType>();
+        services.AddObjectGraphType<ListPart, ListQueryObjectType>();
+        services.AddTransient<IIndexAliasProvider, ContainedPartIndexAliasProvider>();
+        services.AddWhereInputIndexPropertyProvider<ContainedPartIndex>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Handlers/ContainedPartHandler.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Handlers/ContainedPartHandler.cs
index f91fc6dfe89..017748fecdd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Handlers/ContainedPartHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Handlers/ContainedPartHandler.cs
@@ -8,38 +8,37 @@
 using OrchardCore.Lists.Models;
 using OrchardCore.Lists.Services;
 
-namespace OrchardCore.Lists.Handlers
+namespace OrchardCore.Lists.Handlers;
+
+public class ContainedPartHandler : ContentHandlerBase
 {
-    public class ContainedPartHandler : ContentHandlerBase
+    private readonly IServiceProvider _serviceProvider;
+
+    public ContainedPartHandler(IServiceProvider serviceProvider)
     {
-        private readonly IServiceProvider _serviceProvider;
+        _serviceProvider = serviceProvider;
+    }
 
-        public ContainedPartHandler(IServiceProvider serviceProvider)
+    public override async Task CloningAsync(CloneContentContext context)
+    {
+        var containedPart = context.CloneContentItem.As<ContainedPart>();
+        if (containedPart != null)
         {
-            _serviceProvider = serviceProvider;
-        }
+            // Resolve from DI to avoid circular references.
+            var contentManager = _serviceProvider.GetRequiredService<IContentManager>();
 
-        public override async Task CloningAsync(CloneContentContext context)
-        {
-            var containedPart = context.CloneContentItem.As<ContainedPart>();
-            if (containedPart != null)
+            var listContentItem = await contentManager.GetAsync(containedPart.ListContentItemId);
+            if (listContentItem != null)
             {
-                // Resolve from DI to avoid circular references.
-                var contentManager = _serviceProvider.GetRequiredService<IContentManager>();
-
-                var listContentItem = await contentManager.GetAsync(containedPart.ListContentItemId);
-                if (listContentItem != null)
+                var contentDefinitionManager = _serviceProvider.GetRequiredService<IContentDefinitionManager>();
+                var contentTypeDefinition = await contentDefinitionManager.GetTypeDefinitionAsync(listContentItem.ContentType);
+                var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, "ListPart", StringComparison.Ordinal));
+                var settings = contentTypePartDefinition.GetSettings<ListPartSettings>();
+                if (settings.EnableOrdering)
                 {
-                    var contentDefinitionManager = _serviceProvider.GetRequiredService<IContentDefinitionManager>();
-                    var contentTypeDefinition = await contentDefinitionManager.GetTypeDefinitionAsync(listContentItem.ContentType);
-                    var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, "ListPart", StringComparison.Ordinal));
-                    var settings = contentTypePartDefinition.GetSettings<ListPartSettings>();
-                    if (settings.EnableOrdering)
-                    {
-                        var containerService = _serviceProvider.GetRequiredService<IContainerService>();
-                        var nextOrder = await containerService.GetNextOrderNumberAsync(containedPart.ListContentItemId);
-                        context.CloneContentItem.Alter<ContainedPart>(x => x.Order = nextOrder);
-                    }
+                    var containerService = _serviceProvider.GetRequiredService<IContainerService>();
+                    var nextOrder = await containerService.GetNextOrderNumberAsync(containedPart.ListContentItemId);
+                    context.CloneContentItem.Alter<ContainedPart>(x => x.Order = nextOrder);
                 }
             }
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Handlers/ContainedPartLocalizationHandler.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Handlers/ContainedPartLocalizationHandler.cs
index 3db3939450d..e0624157854 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Handlers/ContainedPartLocalizationHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Handlers/ContainedPartLocalizationHandler.cs
@@ -7,63 +7,62 @@
 using OrchardCore.Lists.Models;
 using YesSql;
 
-namespace OrchardCore.Lists.Drivers
+namespace OrchardCore.Lists.Drivers;
+
+public class ContainedPartLocalizationHandler : ContentLocalizationPartHandlerBase<LocalizationPart>
 {
-    public class ContainedPartLocalizationHandler : ContentLocalizationPartHandlerBase<LocalizationPart>
+    private readonly ISession _session;
+
+    public ContainedPartLocalizationHandler(ISession session)
     {
-        private readonly ISession _session;
+        _session = session;
+    }
 
-        public ContainedPartLocalizationHandler(ISession session)
+    /// <summary>
+    /// Assign the Localized version of the List when localizing the Contained Item.
+    /// </summary>
+    public override async Task LocalizingAsync(LocalizationContentContext context, LocalizationPart part)
+    {
+        var containedPart = context.ContentItem.As<ContainedPart>();
+        // todo: remove this check and change the handler to target ContainedPart when issue 3890 is fixed
+        if (containedPart != null)
         {
-            _session = session;
-        }
+            var list = await _session.QueryIndex<LocalizedContentItemIndex>(i => (i.Published || i.Latest) && i.ContentItemId == containedPart.ListContentItemId).FirstOrDefaultAsync();
+            var localizedList = await _session.QueryIndex<LocalizedContentItemIndex>(i => (i.Published || i.Latest) && i.LocalizationSet == list.LocalizationSet && i.Culture == context.Culture).FirstOrDefaultAsync();
 
-        /// <summary>
-        /// Assign the Localized version of the List when localizing the Contained Item.
-        /// </summary>
-        public override async Task LocalizingAsync(LocalizationContentContext context, LocalizationPart part)
-        {
-            var containedPart = context.ContentItem.As<ContainedPart>();
-            // todo: remove this check and change the handler to target ContainedPart when issue 3890 is fixed
-            if (containedPart != null)
+            if (localizedList != null)
             {
-                var list = await _session.QueryIndex<LocalizedContentItemIndex>(i => (i.Published || i.Latest) && i.ContentItemId == containedPart.ListContentItemId).FirstOrDefaultAsync();
-                var localizedList = await _session.QueryIndex<LocalizedContentItemIndex>(i => (i.Published || i.Latest) && i.LocalizationSet == list.LocalizationSet && i.Culture == context.Culture).FirstOrDefaultAsync();
-
-                if (localizedList != null)
-                {
-                    containedPart.ListContentItemId = localizedList.ContentItemId;
-                    containedPart.Apply();
-                }
+                containedPart.ListContentItemId = localizedList.ContentItemId;
+                containedPart.Apply();
             }
         }
     }
+}
 
-    public class LocalizationContainedPartHandler : ContentPartHandler<LocalizationPart>
+public class LocalizationContainedPartHandler : ContentPartHandler<LocalizationPart>
+{
+    private readonly ISession _session;
+    public LocalizationContainedPartHandler(ISession session)
     {
-        private readonly ISession _session;
-        public LocalizationContainedPartHandler(ISession session)
-        {
-            _session = session;
-        }
+        _session = session;
+    }
 
-        /// <summary>
-        /// Need to override CreatingAsync to set the right parent on Creation.
-        /// This will attach the item to the right list when the item is created from a list of another culture.
-        /// </summary>
-        public override async Task CreatingAsync(CreateContentContext context, LocalizationPart instance)
+    /// <summary>
+    /// Need to override CreatingAsync to set the right parent on Creation.
+    /// This will attach the item to the right list when the item is created from a list of another culture.
+    /// </summary>
+    public override async Task CreatingAsync(CreateContentContext context, LocalizationPart instance)
+    {
+        var containedPart = context.ContentItem.As<ContainedPart>();
+        if (containedPart != null)
         {
-            var containedPart = context.ContentItem.As<ContainedPart>();
-            if (containedPart != null)
-            {
-                var list = await _session.QueryIndex<LocalizedContentItemIndex>(i => (i.Published || i.Latest) && i.ContentItemId == containedPart.ListContentItemId).FirstOrDefaultAsync();
-                var localizedList = await _session.QueryIndex<LocalizedContentItemIndex>(i => (i.Published || i.Latest) && i.LocalizationSet == list.LocalizationSet && i.Culture == instance.Culture).FirstOrDefaultAsync();
+            var list = await _session.QueryIndex<LocalizedContentItemIndex>(i => (i.Published || i.Latest) && i.ContentItemId == containedPart.ListContentItemId).FirstOrDefaultAsync();
+            var localizedList = await _session.QueryIndex<LocalizedContentItemIndex>(i => (i.Published || i.Latest) && i.LocalizationSet == list.LocalizationSet && i.Culture == instance.Culture).FirstOrDefaultAsync();
 
-                if (localizedList != null)
-                {
-                    containedPart.ListContentItemId = localizedList.ContentItemId;
-                    containedPart.Apply();
-                }
+            if (localizedList != null)
+            {
+                containedPart.ListContentItemId = localizedList.ContentItemId;
+                containedPart.Apply();
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Handlers/ListPartHandler.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Handlers/ListPartHandler.cs
index 9b56cf435e3..846ef3115e4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Handlers/ListPartHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Handlers/ListPartHandler.cs
@@ -4,24 +4,23 @@
 using OrchardCore.ContentManagement.Handlers;
 using OrchardCore.Lists.Models;
 
-namespace OrchardCore.Lists.Drivers
+namespace OrchardCore.Lists.Drivers;
+
+public class ListPartHandler : ContentPartHandler<ListPart>
 {
-    public class ListPartHandler : ContentPartHandler<ListPart>
+    public override Task GetContentItemAspectAsync(ContentItemAspectContext context, ListPart part)
     {
-        public override Task GetContentItemAspectAsync(ContentItemAspectContext context, ListPart part)
+        return context.ForAsync<ContentItemMetadata>(contentItemMetadata =>
         {
-            return context.ForAsync<ContentItemMetadata>(contentItemMetadata =>
+            contentItemMetadata.AdminRouteValues = new RouteValueDictionary
             {
-                contentItemMetadata.AdminRouteValues = new RouteValueDictionary
-                {
-                    {"Area", "OrchardCore.Contents"},
-                    {"Controller", "Admin"},
-                    {"Action", "Display"},
-                    {"ContentItemId", context.ContentItem.ContentItemId}
-                };
+                {"Area", "OrchardCore.Contents"},
+                {"Controller", "Admin"},
+                {"Action", "Display"},
+                {"ContentItemId", context.ContentItem.ContentItemId}
+            };
 
-                return Task.CompletedTask;
-            });
-        }
+            return Task.CompletedTask;
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Handlers/ListPartLocalizationHandler.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Handlers/ListPartLocalizationHandler.cs
index ae01e19204f..4539482d572 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Handlers/ListPartLocalizationHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Handlers/ListPartLocalizationHandler.cs
@@ -7,41 +7,40 @@
 using OrchardCore.Lists.Models;
 using YesSql;
 
-namespace OrchardCore.Lists.Drivers
+namespace OrchardCore.Lists.Drivers;
+
+public class ListPartLocalizationHandler : ContentLocalizationPartHandlerBase<ListPart>
 {
-    public class ListPartLocalizationHandler : ContentLocalizationPartHandlerBase<ListPart>
+    private readonly ISession _session;
+
+    public ListPartLocalizationHandler(ISession session)
+    {
+        _session = session;
+    }
+
+    /// <summary>
+    /// Select Contained ContentItems that are already in the target culture
+    /// but attached to the original list and reassign their ListContenItemId.
+    /// </summary>
+    public override async Task LocalizedAsync(LocalizationContentContext context, ListPart part)
     {
-        private readonly ISession _session;
+        var containedList = await _session.Query<ContentItem, ContainedPartIndex>(
+            x => x.ListContentItemId == context.Original.ContentItemId).ListAsync();
 
-        public ListPartLocalizationHandler(ISession session)
+        if (!containedList.Any())
         {
-            _session = session;
+            return;
         }
 
-        /// <summary>
-        /// Select Contained ContentItems that are already in the target culture
-        /// but attached to the original list and reassign their ListContenItemId.
-        /// </summary>
-        public override async Task LocalizedAsync(LocalizationContentContext context, ListPart part)
+        foreach (var item in containedList)
         {
-            var containedList = await _session.Query<ContentItem, ContainedPartIndex>(
-                x => x.ListContentItemId == context.Original.ContentItemId).ListAsync();
-
-            if (!containedList.Any())
-            {
-                return;
-            }
-
-            foreach (var item in containedList)
+            var localizationPart = item.As<LocalizationPart>();
+            if (localizationPart.Culture == context.Culture)
             {
-                var localizationPart = item.As<LocalizationPart>();
-                if (localizationPart.Culture == context.Culture)
-                {
-                    var cp = item.As<ContainedPart>();
-                    cp.ListContentItemId = context.ContentItem.ContentItemId;
-                    cp.Apply();
-                    await _session.SaveAsync(item);
-                }
+                var cp = item.As<ContainedPart>();
+                cp.ListContentItemId = context.ContentItem.ContentItemId;
+                cp.Apply();
+                await _session.SaveAsync(item);
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Helpers/ListQueryHelpers.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Helpers/ListQueryHelpers.cs
index 3e536212370..f5698e5c9b2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Helpers/ListQueryHelpers.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Helpers/ListQueryHelpers.cs
@@ -7,24 +7,23 @@
 using OrchardCore.Lists.Indexes;
 using YesSql;
 
-namespace OrchardCore.Lists.Helpers
+namespace OrchardCore.Lists.Helpers;
+
+internal static class ListQueryHelpers
 {
-    internal static class ListQueryHelpers
+    internal static Task<int> QueryListItemsCountAsync(ISession session, string listContentItemId, Expression<Func<ContentItemIndex, bool>> itemPredicate = null)
     {
-        internal static Task<int> QueryListItemsCountAsync(ISession session, string listContentItemId, Expression<Func<ContentItemIndex, bool>> itemPredicate = null)
-        {
-            return session.Query<ContentItem>()
-                    .With<ContainedPartIndex>(x => x.ListContentItemId == listContentItemId)
-                    .With<ContentItemIndex>(itemPredicate ?? (x => x.Published))
-                    .CountAsync();
-        }
+        return session.Query<ContentItem>()
+                .With<ContainedPartIndex>(x => x.ListContentItemId == listContentItemId)
+                .With<ContentItemIndex>(itemPredicate ?? (x => x.Published))
+                .CountAsync();
+    }
 
-        internal static Task<IEnumerable<ContentItem>> QueryListItemsAsync(ISession session, string listContentItemId, Expression<Func<ContentItemIndex, bool>> itemPredicate = null)
-        {
-            return session.Query<ContentItem>()
-                    .With<ContainedPartIndex>(x => x.ListContentItemId == listContentItemId)
-                    .With<ContentItemIndex>(itemPredicate ?? (x => x.Published))
-                    .ListAsync();
-        }
+    internal static Task<IEnumerable<ContentItem>> QueryListItemsAsync(ISession session, string listContentItemId, Expression<Func<ContentItemIndex, bool>> itemPredicate = null)
+    {
+        return session.Query<ContentItem>()
+                .With<ContainedPartIndex>(x => x.ListContentItemId == listContentItemId)
+                .With<ContentItemIndex>(itemPredicate ?? (x => x.Published))
+                .ListAsync();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Indexes/ContainedPartContentIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Indexes/ContainedPartContentIndexHandler.cs
index 50d0e3b01ba..9d2bf2ef504 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Indexes/ContainedPartContentIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Indexes/ContainedPartContentIndexHandler.cs
@@ -4,30 +4,29 @@
 using OrchardCore.Indexing;
 using OrchardCore.Lists.Models;
 
-namespace OrchardCore.Lists.Indexes
+namespace OrchardCore.Lists.Indexes;
+
+public class ContainedPartContentIndexHandler : IContentItemIndexHandler
 {
-    public class ContainedPartContentIndexHandler : IContentItemIndexHandler
+    public Task BuildIndexAsync(BuildIndexContext context)
     {
-        public Task BuildIndexAsync(BuildIndexContext context)
-        {
-            var parent = context.ContentItem.As<ContainedPart>();
+        var parent = context.ContentItem.As<ContainedPart>();
 
-            if (parent == null)
-            {
-                return Task.CompletedTask;
-            }
+        if (parent == null)
+        {
+            return Task.CompletedTask;
+        }
 
-            context.DocumentIndex.Set(
-                IndexingConstants.ContainedPartKey + IndexingConstants.IdsKey,
-                parent.ListContentItemId,
-                DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
+        context.DocumentIndex.Set(
+            IndexingConstants.ContainedPartKey + IndexingConstants.IdsKey,
+            parent.ListContentItemId,
+            DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
 
-            context.DocumentIndex.Set(
-                IndexingConstants.ContainedPartKey + IndexingConstants.OrderKey,
-                parent.Order,
-                DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
+        context.DocumentIndex.Set(
+            IndexingConstants.ContainedPartKey + IndexingConstants.OrderKey,
+            parent.Order,
+            DocumentIndexOptions.Keyword | DocumentIndexOptions.Store);
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Indexes/ContainedPartIndex.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Indexes/ContainedPartIndex.cs
index a48a95b8237..2d77b5f3103 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Indexes/ContainedPartIndex.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Indexes/ContainedPartIndex.cs
@@ -2,55 +2,54 @@
 using OrchardCore.Lists.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.Lists.Indexes
+namespace OrchardCore.Lists.Indexes;
+
+public class ContainedPartIndex : MapIndex
 {
-    public class ContainedPartIndex : MapIndex
-    {
-        public string ListContentItemId { get; set; }
+    public string ListContentItemId { get; set; }
 
-        public int Order { get; set; }
+    public int Order { get; set; }
 
-        public string ContentItemId { get; set; }
+    public string ContentItemId { get; set; }
 
-        public string ListContentType { get; set; }
+    public string ListContentType { get; set; }
 
-        public bool Published { get; set; }
+    public bool Published { get; set; }
 
-        public bool Latest { get; set; }
+    public bool Latest { get; set; }
 
-        public string DisplayText { get; set; }
-    }
+    public string DisplayText { get; set; }
+}
 
-    public class ContainedPartIndexProvider : IndexProvider<ContentItem>
+public class ContainedPartIndexProvider : IndexProvider<ContentItem>
+{
+    public override void Describe(DescribeContext<ContentItem> context)
     {
-        public override void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<ContainedPartIndex>()
-                .Map(contentItem =>
+        context.For<ContainedPartIndex>()
+            .Map(contentItem =>
+            {
+                if (!contentItem.Latest && !contentItem.Published)
+                {
+                    return null;
+                }
+
+                var containedPart = contentItem.As<ContainedPart>();
+
+                if (containedPart == null)
+                {
+                    return null;
+                }
+
+                return new ContainedPartIndex
                 {
-                    if (!contentItem.Latest && !contentItem.Published)
-                    {
-                        return null;
-                    }
-
-                    var containedPart = contentItem.As<ContainedPart>();
-
-                    if (containedPart == null)
-                    {
-                        return null;
-                    }
-
-                    return new ContainedPartIndex
-                    {
-                        ContentItemId = contentItem.ContentItemId,
-                        ListContentType = containedPart.ListContentType,
-                        ListContentItemId = containedPart.ListContentItemId,
-                        Order = containedPart.Order,
-                        Published = contentItem.Published,
-                        Latest = contentItem.Latest,
-                        DisplayText = contentItem.DisplayText,
-                    };
-                });
-        }
+                    ContentItemId = contentItem.ContentItemId,
+                    ListContentType = containedPart.ListContentType,
+                    ListContentItemId = containedPart.ListContentItemId,
+                    Order = containedPart.Order,
+                    Published = contentItem.Published,
+                    Latest = contentItem.Latest,
+                    DisplayText = contentItem.DisplayText,
+                };
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Liquid/ContainerFilter.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Liquid/ContainerFilter.cs
index b980e7cecfc..a67b209bd27 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Liquid/ContainerFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Liquid/ContainerFilter.cs
@@ -6,34 +6,33 @@
 using OrchardCore.Liquid;
 using OrchardCore.Lists.Models;
 
-namespace OrchardCore.Lists.Liquid
+namespace OrchardCore.Lists.Liquid;
+
+public class ContainerFilter : ILiquidFilter
 {
-    public class ContainerFilter : ILiquidFilter
+    private readonly IContentManager _contentManager;
+
+    public ContainerFilter(IContentManager contentManager)
     {
-        private readonly IContentManager _contentManager;
+        _contentManager = contentManager;
+    }
 
-        public ContainerFilter(IContentManager contentManager)
-        {
-            _contentManager = contentManager;
-        }
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        var contentItem = input.ToObjectValue() as ContentItem ?? throw new ArgumentException("A Content Item was expected");
 
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
-        {
-            var contentItem = input.ToObjectValue() as ContentItem ?? throw new ArgumentException("A Content Item was expected");
+        var containerId = contentItem.As<ContainedPart>()?.ListContentItemId;
 
-            var containerId = contentItem.As<ContainedPart>()?.ListContentItemId;
+        if (containerId != null)
+        {
+            var container = await _contentManager.GetAsync(containerId);
 
-            if (containerId != null)
+            if (container != null)
             {
-                var container = await _contentManager.GetAsync(containerId);
-
-                if (container != null)
-                {
-                    return new ObjectValue(container);
-                }
+                return new ObjectValue(container);
             }
-
-            return new ObjectValue(contentItem);
         }
+
+        return new ObjectValue(contentItem);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Liquid/ListCountFilter.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Liquid/ListCountFilter.cs
index 0d8f7549447..db54c12d5e6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Liquid/ListCountFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Liquid/ListCountFilter.cs
@@ -6,33 +6,32 @@
 using OrchardCore.Lists.Helpers;
 using YesSql;
 
-namespace OrchardCore.Lists.Liquid
+namespace OrchardCore.Lists.Liquid;
+
+public class ListCountFilter : ILiquidFilter
 {
-    public class ListCountFilter : ILiquidFilter
+    private readonly ISession _session;
+
+    public ListCountFilter(ISession session)
+    {
+        _session = session;
+    }
+
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
     {
-        private readonly ISession _session;
+        string listContentItemId;
 
-        public ListCountFilter(ISession session)
+        if (input.Type == FluidValues.Object && input.ToObjectValue() is ContentItem contentItem)
         {
-            _session = session;
+            listContentItemId = contentItem.ContentItemId;
         }
-
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+        else
         {
-            string listContentItemId;
-
-            if (input.Type == FluidValues.Object && input.ToObjectValue() is ContentItem contentItem)
-            {
-                listContentItemId = contentItem.ContentItemId;
-            }
-            else
-            {
-                listContentItemId = input.ToStringValue();
-            }
+            listContentItemId = input.ToStringValue();
+        }
 
-            var listCount = await ListQueryHelpers.QueryListItemsCountAsync(_session, listContentItemId);
+        var listCount = await ListQueryHelpers.QueryListItemsCountAsync(_session, listContentItemId);
 
-            return NumberValue.Create(listCount);
-        }
+        return NumberValue.Create(listCount);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Liquid/ListItemsFilter.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Liquid/ListItemsFilter.cs
index b70c27d66d4..ad2794480d5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Liquid/ListItemsFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Liquid/ListItemsFilter.cs
@@ -6,33 +6,32 @@
 using OrchardCore.Lists.Helpers;
 using YesSql;
 
-namespace OrchardCore.Lists.Liquid
+namespace OrchardCore.Lists.Liquid;
+
+public class ListItemsFilter : ILiquidFilter
 {
-    public class ListItemsFilter : ILiquidFilter
+    private readonly ISession _session;
+
+    public ListItemsFilter(ISession session)
+    {
+        _session = session;
+    }
+
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
     {
-        private readonly ISession _session;
+        string listContentItemId;
 
-        public ListItemsFilter(ISession session)
+        if (input.Type == FluidValues.Object && input.ToObjectValue() is ContentItem contentItem)
         {
-            _session = session;
+            listContentItemId = contentItem.ContentItemId;
         }
-
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+        else
         {
-            string listContentItemId;
-
-            if (input.Type == FluidValues.Object && input.ToObjectValue() is ContentItem contentItem)
-            {
-                listContentItemId = contentItem.ContentItemId;
-            }
-            else
-            {
-                listContentItemId = input.ToStringValue();
-            }
+            listContentItemId = input.ToStringValue();
+        }
 
-            var listItems = await ListQueryHelpers.QueryListItemsAsync(_session, listContentItemId);
+        var listItems = await ListQueryHelpers.QueryListItemsAsync(_session, listContentItemId);
 
-            return FluidValue.Create(listItems, ctx.Options);
-        }
+        return FluidValue.Create(listItems, ctx.Options);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Migrations.cs
index 79e6328c003..0af7d87da49 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Migrations.cs
@@ -6,113 +6,112 @@
 using OrchardCore.Lists.Models;
 using YesSql.Sql;
 
-namespace OrchardCore.Lists
+namespace OrchardCore.Lists;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+
+    public Migrations(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
+
+    public async Task<int> CreateAsync()
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync("ListPart", builder => builder
+            .Attachable()
+            .WithDescription("Add a list behavior."));
+
+        await SchemaBuilder.CreateMapIndexTableAsync<ContainedPartIndex>(table => table
+            .Column<string>("ContentItemId", column => column.WithLength(26))
+            .Column<string>("ListContentItemId", column => column.WithLength(26))
+            .Column<string>("DisplayText")
+            .Column<int>("Order")
+            .Column<string>("ListContentType")
+            .Column<bool>("Published")
+            .Column<bool>("Latest")
+
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<ContainedPartIndex>(table => table
+            .CreateIndex("IDX_ContainedPartIndex_DocumentId",
+                "Id",
+                "DocumentId",
+                "ContentItemId",
+                "ListContentItemId",
+                "DisplayText",
+                "Order",
+                "ListContentType",
+                "Published",
+                "Latest")
+        );
+
+        // Shortcut other migration steps on new content definition schemas.
+        return 4;
+    }
+
+    // Migrate PartSettings. This only needs to run on old content definition schemas.
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom1Async()
+    {
+        await _contentDefinitionManager.MigratePartSettingsAsync<ListPart, ListPartSettings>();
+
+        return 2;
+    }
+
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom2Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<ContainedPartIndex>(table => table
+            .CreateIndex("IDX_ContainedPartIndex_DocumentId",
+            "DocumentId",
+            "ListContentItemId",
+            "Order")
+        );
+
+        return 3;
+    }
+
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom3Async()
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-
-        public Migrations(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
-
-        public async Task<int> CreateAsync()
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync("ListPart", builder => builder
-                .Attachable()
-                .WithDescription("Add a list behavior."));
-
-            await SchemaBuilder.CreateMapIndexTableAsync<ContainedPartIndex>(table => table
-                .Column<string>("ContentItemId", column => column.WithLength(26))
-                .Column<string>("ListContentItemId", column => column.WithLength(26))
-                .Column<string>("DisplayText")
-                .Column<int>("Order")
-                .Column<string>("ListContentType")
-                .Column<bool>("Published")
-                .Column<bool>("Latest")
-
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<ContainedPartIndex>(table => table
-                .CreateIndex("IDX_ContainedPartIndex_DocumentId",
-                    "Id",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ListContentItemId",
-                    "DisplayText",
-                    "Order",
-                    "ListContentType",
-                    "Published",
-                    "Latest")
-            );
-
-            // Shortcut other migration steps on new content definition schemas.
-            return 4;
-        }
-
-        // Migrate PartSettings. This only needs to run on old content definition schemas.
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom1Async()
-        {
-            await _contentDefinitionManager.MigratePartSettingsAsync<ListPart, ListPartSettings>();
-
-            return 2;
-        }
-
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom2Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<ContainedPartIndex>(table => table
-                .CreateIndex("IDX_ContainedPartIndex_DocumentId",
+        await SchemaBuilder.AlterIndexTableAsync<ContainedPartIndex>(table => table
+            .AddColumn<string>("ContentItemId", column => column.WithLength(26))
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<ContainedPartIndex>(table => table
+            .AddColumn<string>("ListContentType")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<ContainedPartIndex>(table => table
+            .AddColumn<string>("DisplayText")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<ContainedPartIndex>(table => table
+            .AddColumn<bool>("Published")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<ContainedPartIndex>(table => table
+            .AddColumn<bool>("Latest")
+        );
+        await SchemaBuilder.AlterIndexTableAsync<ContainedPartIndex>(table => table
+            .DropIndex("IDX_ContainedPartIndex_DocumentId")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<ContainedPartIndex>(table => table
+            .CreateIndex("IDX_ContainedPartIndex_DocumentId",
+                "Id",
                 "DocumentId",
+                "ContentItemId",
                 "ListContentItemId",
-                "Order")
-            );
-
-            return 3;
-        }
-
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom3Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<ContainedPartIndex>(table => table
-                .AddColumn<string>("ContentItemId", column => column.WithLength(26))
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<ContainedPartIndex>(table => table
-                .AddColumn<string>("ListContentType")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<ContainedPartIndex>(table => table
-                .AddColumn<string>("DisplayText")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<ContainedPartIndex>(table => table
-                .AddColumn<bool>("Published")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<ContainedPartIndex>(table => table
-                .AddColumn<bool>("Latest")
-            );
-            await SchemaBuilder.AlterIndexTableAsync<ContainedPartIndex>(table => table
-                .DropIndex("IDX_ContainedPartIndex_DocumentId")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<ContainedPartIndex>(table => table
-                .CreateIndex("IDX_ContainedPartIndex_DocumentId",
-                    "Id",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ListContentItemId",
-                    "DisplayText",
-                    "Order",
-                    "ListContentType",
-                    "Published",
-                    "Latest")
-            );
-
-            return 4;
-        }
+                "DisplayText",
+                "Order",
+                "ListContentType",
+                "Published",
+                "Latest")
+        );
+
+        return 4;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Models/ContainedItemOptions.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Models/ContainedItemOptions.cs
index 653df99e694..52b00827ed2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Models/ContainedItemOptions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Models/ContainedItemOptions.cs
@@ -1,16 +1,15 @@
-namespace OrchardCore.Lists.Models
+namespace OrchardCore.Lists.Models;
+
+public enum ContentsStatus
 {
-    public enum ContentsStatus
-    {
-        Published,
-        Latest,
-        Draft,
-        Owner
-    }
+    Published,
+    Latest,
+    Draft,
+    Owner
+}
 
-    public class ContainedItemOptions
-    {
-        public string DisplayText { get; set; }
-        public ContentsStatus Status { get; set; } = ContentsStatus.Published;
-    }
+public class ContainedItemOptions
+{
+    public string DisplayText { get; set; }
+    public ContentsStatus Status { get; set; } = ContentsStatus.Published;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Models/ContainedPart.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Models/ContainedPart.cs
index 5a62fa2ab9e..f833d90ca30 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Models/ContainedPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Models/ContainedPart.cs
@@ -1,25 +1,24 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Lists.Models
+namespace OrchardCore.Lists.Models;
+
+/// <summary>
+/// Attached to a content item instance when it's part of a list.
+/// </summary>
+public class ContainedPart : ContentPart
 {
     /// <summary>
-    /// Attached to a content item instance when it's part of a list.
+    /// The content item id of the list owning this content item.
     /// </summary>
-    public class ContainedPart : ContentPart
-    {
-        /// <summary>
-        /// The content item id of the list owning this content item.
-        /// </summary>
-        public string ListContentItemId { get; set; }
+    public string ListContentItemId { get; set; }
 
-        /// <summary>
-        /// The content type of the list owning this content item.
-        /// </summary>
-        public string ListContentType { get; set; }
+    /// <summary>
+    /// The content type of the list owning this content item.
+    /// </summary>
+    public string ListContentType { get; set; }
 
-        /// <summary>
-        /// The order of this content item in the list.
-        /// </summary>
-        public int Order { get; set; }
-    }
+    /// <summary>
+    /// The order of this content item in the list.
+    /// </summary>
+    public int Order { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Models/ListPart.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Models/ListPart.cs
index 7dbb2de7cd7..ed23924f8b5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Models/ListPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Models/ListPart.cs
@@ -1,8 +1,7 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Lists.Models
+namespace OrchardCore.Lists.Models;
+
+public class ListPart : ContentPart
 {
-    public class ListPart : ContentPart
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Models/ListPartSettings.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Models/ListPartSettings.cs
index d9089e2382c..8db3018521b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Models/ListPartSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Models/ListPartSettings.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.Lists.Models
+namespace OrchardCore.Lists.Models;
+
+public class ListPartSettings
 {
-    public class ListPartSettings
-    {
-        public int PageSize { get; set; } = 10;
-        public string[] ContainedContentTypes { get; set; }
-        public bool EnableOrdering { get; set; }
-        public bool ShowHeader { get; set; }
-    }
+    public int PageSize { get; set; } = 10;
+    public string[] ContainedContentTypes { get; set; }
+    public bool EnableOrdering { get; set; }
+    public bool ShowHeader { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/RemotePublishing/ListMetaWeblogDriver.cs b/src/OrchardCore.Modules/OrchardCore.Lists/RemotePublishing/ListMetaWeblogDriver.cs
index 6c508969031..c70ac26f8e4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/RemotePublishing/ListMetaWeblogDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/RemotePublishing/ListMetaWeblogDriver.cs
@@ -4,17 +4,16 @@
 using OrchardCore.Lists.Models;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Lists.RemotePublishing
+namespace OrchardCore.Lists.RemotePublishing;
+
+[RequireFeatures("OrchardCore.RemotePublishing")]
+public sealed class ListMetaWeblogDriver : ContentPartDisplayDriver<ListPart>
 {
-    [RequireFeatures("OrchardCore.RemotePublishing")]
-    public sealed class ListMetaWeblogDriver : ContentPartDisplayDriver<ListPart>
+    public override IDisplayResult Display(ListPart listPart, BuildPartDisplayContext context)
     {
-        public override IDisplayResult Display(ListPart listPart, BuildPartDisplayContext context)
+        return Dynamic("ListPart_RemotePublishing", shape =>
         {
-            return Dynamic("ListPart_RemotePublishing", shape =>
-            {
-                shape.ContentItem = listPart.ContentItem;
-            }).Location("Content");
-        }
+            shape.ContentItem = listPart.ContentItem;
+        }).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/RemotePublishing/MetaWeblogHandler.cs b/src/OrchardCore.Modules/OrchardCore.Lists/RemotePublishing/MetaWeblogHandler.cs
index e49ea1f7480..f176d9255fa 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/RemotePublishing/MetaWeblogHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/RemotePublishing/MetaWeblogHandler.cs
@@ -25,486 +25,485 @@
 using OrchardCore.XmlRpc.Models;
 using YesSql;
 
-namespace OrchardCore.Lists.RemotePublishing
+namespace OrchardCore.Lists.RemotePublishing;
+
+[RequireFeatures("OrchardCore.RemotePublishing")]
+public class MetaWeblogHandler : IXmlRpcHandler
 {
-    [RequireFeatures("OrchardCore.RemotePublishing")]
-    public class MetaWeblogHandler : IXmlRpcHandler
+    private readonly IContentManager _contentManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IMediaFileStore _mediaFileStore;
+    private readonly IMembershipService _membershipService;
+    private readonly IEnumerable<IMetaWeblogDriver> _metaWeblogDrivers;
+    private readonly ISession _session;
+    protected readonly IStringLocalizer S;
+
+    public MetaWeblogHandler(
+        IContentManager contentManager,
+        IAuthorizationService authorizationService,
+        IMembershipService membershipService,
+        ISession session,
+        IContentDefinitionManager contentDefinitionManager,
+        IMediaFileStore mediaFileStore,
+        IEnumerable<IMetaWeblogDriver> metaWeblogDrivers,
+        IStringLocalizer<MetaWeblogHandler> localizer)
     {
-        private readonly IContentManager _contentManager;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IMediaFileStore _mediaFileStore;
-        private readonly IMembershipService _membershipService;
-        private readonly IEnumerable<IMetaWeblogDriver> _metaWeblogDrivers;
-        private readonly ISession _session;
-        protected readonly IStringLocalizer S;
-
-        public MetaWeblogHandler(
-            IContentManager contentManager,
-            IAuthorizationService authorizationService,
-            IMembershipService membershipService,
-            ISession session,
-            IContentDefinitionManager contentDefinitionManager,
-            IMediaFileStore mediaFileStore,
-            IEnumerable<IMetaWeblogDriver> metaWeblogDrivers,
-            IStringLocalizer<MetaWeblogHandler> localizer)
-        {
-            _contentManager = contentManager;
-            _contentDefinitionManager = contentDefinitionManager;
-            _authorizationService = authorizationService;
-            _metaWeblogDrivers = metaWeblogDrivers;
-            _session = session;
-            _mediaFileStore = mediaFileStore;
-            _membershipService = membershipService;
-            S = localizer;
-        }
-
-        public void SetCapabilities(XElement options)
-        {
-            const string manifestUri = "http://schemas.microsoft.com/wlw/manifest/weblog";
-
-            foreach (var driver in _metaWeblogDrivers)
-            {
-                driver.SetCapabilities((name, value) => { options.SetElementValue(XName.Get(name, manifestUri), value); });
-            }
+        _contentManager = contentManager;
+        _contentDefinitionManager = contentDefinitionManager;
+        _authorizationService = authorizationService;
+        _metaWeblogDrivers = metaWeblogDrivers;
+        _session = session;
+        _mediaFileStore = mediaFileStore;
+        _membershipService = membershipService;
+        S = localizer;
+    }
+
+    public void SetCapabilities(XElement options)
+    {
+        const string manifestUri = "http://schemas.microsoft.com/wlw/manifest/weblog";
+
+        foreach (var driver in _metaWeblogDrivers)
+        {
+            driver.SetCapabilities((name, value) => { options.SetElementValue(XName.Get(name, manifestUri), value); });
         }
+    }
 
-        public async Task ProcessAsync(XmlRpcContext context)
+    public async Task ProcessAsync(XmlRpcContext context)
+    {
+        if (context.RpcMethodCall.MethodName == "blogger.getUsersBlogs")
         {
-            if (context.RpcMethodCall.MethodName == "blogger.getUsersBlogs")
-            {
-                var result = await MetaWeblogGetUserBlogsAsync(context,
-                    Convert.ToString(context.RpcMethodCall.Params[1].Value),
-                    Convert.ToString(context.RpcMethodCall.Params[2].Value));
+            var result = await MetaWeblogGetUserBlogsAsync(context,
+                Convert.ToString(context.RpcMethodCall.Params[1].Value),
+                Convert.ToString(context.RpcMethodCall.Params[2].Value));
 
-                context.RpcMethodResponse = new XRpcMethodResponse().Add(result);
-            }
+            context.RpcMethodResponse = new XRpcMethodResponse().Add(result);
+        }
 
-            if (context.RpcMethodCall.MethodName == "metaWeblog.getRecentPosts")
-            {
-                var result = await MetaWeblogGetRecentPosts(
-                    context,
-                    Convert.ToString(context.RpcMethodCall.Params[0].Value),
-                    Convert.ToString(context.RpcMethodCall.Params[1].Value),
-                    Convert.ToString(context.RpcMethodCall.Params[2].Value),
-                    Convert.ToInt32(context.RpcMethodCall.Params[3].Value),
-                    context.Drivers);
-
-                context.RpcMethodResponse = new XRpcMethodResponse().Add(result);
-            }
+        if (context.RpcMethodCall.MethodName == "metaWeblog.getRecentPosts")
+        {
+            var result = await MetaWeblogGetRecentPosts(
+                context,
+                Convert.ToString(context.RpcMethodCall.Params[0].Value),
+                Convert.ToString(context.RpcMethodCall.Params[1].Value),
+                Convert.ToString(context.RpcMethodCall.Params[2].Value),
+                Convert.ToInt32(context.RpcMethodCall.Params[3].Value),
+                context.Drivers);
+
+            context.RpcMethodResponse = new XRpcMethodResponse().Add(result);
+        }
 
-            if (context.RpcMethodCall.MethodName == "metaWeblog.newPost")
-            {
-                var result = await MetaWeblogNewPostAsync(
-                    Convert.ToString(context.RpcMethodCall.Params[0].Value),
-                    Convert.ToString(context.RpcMethodCall.Params[1].Value),
-                    Convert.ToString(context.RpcMethodCall.Params[2].Value),
-                    (XRpcStruct)context.RpcMethodCall.Params[3].Value,
-                    Convert.ToBoolean(context.RpcMethodCall.Params[4].Value),
-                    context.Drivers);
-
-                context.RpcMethodResponse = new XRpcMethodResponse().Add(result);
-            }
+        if (context.RpcMethodCall.MethodName == "metaWeblog.newPost")
+        {
+            var result = await MetaWeblogNewPostAsync(
+                Convert.ToString(context.RpcMethodCall.Params[0].Value),
+                Convert.ToString(context.RpcMethodCall.Params[1].Value),
+                Convert.ToString(context.RpcMethodCall.Params[2].Value),
+                (XRpcStruct)context.RpcMethodCall.Params[3].Value,
+                Convert.ToBoolean(context.RpcMethodCall.Params[4].Value),
+                context.Drivers);
+
+            context.RpcMethodResponse = new XRpcMethodResponse().Add(result);
+        }
 
-            if (context.RpcMethodCall.MethodName == "metaWeblog.getPost")
-            {
-                var result = await MetaWeblogGetPostAsync(
-                    context,
-                    Convert.ToString(context.RpcMethodCall.Params[0].Value),
-                    Convert.ToString(context.RpcMethodCall.Params[1].Value),
-                    Convert.ToString(context.RpcMethodCall.Params[2].Value),
-                    context.Drivers);
-                context.RpcMethodResponse = new XRpcMethodResponse().Add(result);
-            }
+        if (context.RpcMethodCall.MethodName == "metaWeblog.getPost")
+        {
+            var result = await MetaWeblogGetPostAsync(
+                context,
+                Convert.ToString(context.RpcMethodCall.Params[0].Value),
+                Convert.ToString(context.RpcMethodCall.Params[1].Value),
+                Convert.ToString(context.RpcMethodCall.Params[2].Value),
+                context.Drivers);
+            context.RpcMethodResponse = new XRpcMethodResponse().Add(result);
+        }
 
-            if (context.RpcMethodCall.MethodName == "metaWeblog.editPost")
-            {
-                var result = await MetaWeblogEditPostAsync(
-                    Convert.ToString(context.RpcMethodCall.Params[0].Value),
-                    Convert.ToString(context.RpcMethodCall.Params[1].Value),
-                    Convert.ToString(context.RpcMethodCall.Params[2].Value),
-                    (XRpcStruct)context.RpcMethodCall.Params[3].Value,
-                    Convert.ToBoolean(context.RpcMethodCall.Params[4].Value),
-                    context.Drivers);
-                context.RpcMethodResponse = new XRpcMethodResponse().Add(result);
-            }
+        if (context.RpcMethodCall.MethodName == "metaWeblog.editPost")
+        {
+            var result = await MetaWeblogEditPostAsync(
+                Convert.ToString(context.RpcMethodCall.Params[0].Value),
+                Convert.ToString(context.RpcMethodCall.Params[1].Value),
+                Convert.ToString(context.RpcMethodCall.Params[2].Value),
+                (XRpcStruct)context.RpcMethodCall.Params[3].Value,
+                Convert.ToBoolean(context.RpcMethodCall.Params[4].Value),
+                context.Drivers);
+            context.RpcMethodResponse = new XRpcMethodResponse().Add(result);
+        }
 
-            if (context.RpcMethodCall.MethodName == "blogger.deletePost")
-            {
-                var result = await MetaWeblogDeletePostAsync(
-                    Convert.ToString(context.RpcMethodCall.Params[1].Value),
-                    Convert.ToString(context.RpcMethodCall.Params[2].Value),
-                    Convert.ToString(context.RpcMethodCall.Params[3].Value),
-                    context.Drivers);
-                context.RpcMethodResponse = new XRpcMethodResponse().Add(result);
-            }
+        if (context.RpcMethodCall.MethodName == "blogger.deletePost")
+        {
+            var result = await MetaWeblogDeletePostAsync(
+                Convert.ToString(context.RpcMethodCall.Params[1].Value),
+                Convert.ToString(context.RpcMethodCall.Params[2].Value),
+                Convert.ToString(context.RpcMethodCall.Params[3].Value),
+                context.Drivers);
+            context.RpcMethodResponse = new XRpcMethodResponse().Add(result);
+        }
 
-            if (context.RpcMethodCall.MethodName == "metaWeblog.newMediaObject")
-            {
-                var result = await MetaWeblogNewMediaObjectAsync(
-                    Convert.ToString(context.RpcMethodCall.Params[1].Value),
-                    Convert.ToString(context.RpcMethodCall.Params[2].Value),
-                    (XRpcStruct)context.RpcMethodCall.Params[3].Value);
-                context.RpcMethodResponse = new XRpcMethodResponse().Add(result);
-            }
+        if (context.RpcMethodCall.MethodName == "metaWeblog.newMediaObject")
+        {
+            var result = await MetaWeblogNewMediaObjectAsync(
+                Convert.ToString(context.RpcMethodCall.Params[1].Value),
+                Convert.ToString(context.RpcMethodCall.Params[2].Value),
+                (XRpcStruct)context.RpcMethodCall.Params[3].Value);
+            context.RpcMethodResponse = new XRpcMethodResponse().Add(result);
         }
+    }
+
+    private async Task<XRpcStruct> MetaWeblogNewMediaObjectAsync(string userName, string password, XRpcStruct file)
+    {
+        _ = await ValidateUserAsync(userName, password);
+
+        var name = file.Optional<string>("name");
+        var bits = file.Optional<byte[]>("bits");
 
-        private async Task<XRpcStruct> MetaWeblogNewMediaObjectAsync(string userName, string password, XRpcStruct file)
+        var directoryName = Path.GetDirectoryName(name);
+        var filePath = _mediaFileStore.Combine(directoryName, Path.GetFileName(name));
+        Stream stream = null;
+        try
         {
-            _ = await ValidateUserAsync(userName, password);
+            stream = new MemoryStream(bits);
+            filePath = await _mediaFileStore.CreateFileFromStreamAsync(filePath, stream);
+        }
+        finally
+        {
+            stream?.Dispose();
+        }
 
-            var name = file.Optional<string>("name");
-            var bits = file.Optional<byte[]>("bits");
+        var publicUrl = _mediaFileStore.MapPathToPublicUrl(filePath);
 
-            var directoryName = Path.GetDirectoryName(name);
-            var filePath = _mediaFileStore.Combine(directoryName, Path.GetFileName(name));
-            Stream stream = null;
-            try
-            {
-                stream = new MemoryStream(bits);
-                filePath = await _mediaFileStore.CreateFileFromStreamAsync(filePath, stream);
-            }
-            finally
-            {
-                stream?.Dispose();
-            }
+        // Some clients require all optional attributes to be declared Wordpress responds in this way as well.
+        return new XRpcStruct()
+            .Set("file", publicUrl)
+            .Set("url", publicUrl)
+            .Set("type", file.Optional<string>("type"));
+    }
 
-            var publicUrl = _mediaFileStore.MapPathToPublicUrl(filePath);
+    private async Task<XRpcArray> MetaWeblogGetUserBlogsAsync(XmlRpcContext context, string userName, string password)
+    {
+        var user = await ValidateUserAsync(userName, password);
 
-            // Some clients require all optional attributes to be declared Wordpress responds in this way as well.
-            return new XRpcStruct()
-                .Set("file", publicUrl)
-                .Set("url", publicUrl)
-                .Set("type", file.Optional<string>("type"));
-        }
+        var array = new XRpcArray();
 
-        private async Task<XRpcArray> MetaWeblogGetUserBlogsAsync(XmlRpcContext context, string userName, string password)
+        // Look for all types using ListPart.
+        foreach (var type in await _contentDefinitionManager.ListTypeDefinitionsAsync())
         {
-            var user = await ValidateUserAsync(userName, password);
-
-            var array = new XRpcArray();
+            if (!type.Parts.Any(x => x.Name == nameof(ListPart)))
+            {
+                continue;
+            }
 
-            // Look for all types using ListPart.
-            foreach (var type in await _contentDefinitionManager.ListTypeDefinitionsAsync())
+            foreach (var list in await _session.Query<ContentItem, ContentItemIndex>(x => x.ContentType == type.Name).ListAsync())
             {
-                if (!type.Parts.Any(x => x.Name == nameof(ListPart)))
+                // User needs to at least have permission to edit its own blog posts to access the service.
+                if (await _authorizationService.AuthorizeAsync(user, CommonPermissions.EditContent, list))
                 {
-                    continue;
-                }
+                    var metadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(list);
+                    var displayRouteValues = metadata.DisplayRouteValues;
 
-                foreach (var list in await _session.Query<ContentItem, ContentItemIndex>(x => x.ContentType == type.Name).ListAsync())
-                {
-                    // User needs to at least have permission to edit its own blog posts to access the service.
-                    if (await _authorizationService.AuthorizeAsync(user, CommonPermissions.EditContent, list))
-                    {
-                        var metadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(list);
-                        var displayRouteValues = metadata.DisplayRouteValues;
-
-                        array.Add(new XRpcStruct()
-                                      .Set("url", context.Url.Action(displayRouteValues["action"].ToString(), displayRouteValues["controller"].ToString(), displayRouteValues, context.HttpContext.Request.Scheme))
-                                      .Set("blogid", list.ContentItemId)
-                                      .Set("blogName", list.DisplayText));
-                    }
+                    array.Add(new XRpcStruct()
+                                  .Set("url", context.Url.Action(displayRouteValues["action"].ToString(), displayRouteValues["controller"].ToString(), displayRouteValues, context.HttpContext.Request.Scheme))
+                                  .Set("blogid", list.ContentItemId)
+                                  .Set("blogName", list.DisplayText));
                 }
             }
-
-            return array;
         }
 
-        private async Task<XRpcArray> MetaWeblogGetRecentPosts(
-            XmlRpcContext context,
-            string contentItemId,
-            string userName,
-            string password,
-            int numberOfPosts,
-            IEnumerable<IXmlRpcDriver> drivers)
-        {
-            var user = await ValidateUserAsync(userName, password);
+        return array;
+    }
 
-            // User needs to at least have permission to edit its own blog posts to access the service.
-            await CheckAccessAsync(CommonPermissions.EditContent, user, null);
+    private async Task<XRpcArray> MetaWeblogGetRecentPosts(
+        XmlRpcContext context,
+        string contentItemId,
+        string userName,
+        string password,
+        int numberOfPosts,
+        IEnumerable<IXmlRpcDriver> drivers)
+    {
+        var user = await ValidateUserAsync(userName, password);
 
-            var list = (await _contentManager.GetAsync(contentItemId))
-                ?? throw new InvalidOperationException("Could not find content item " + contentItemId);
+        // User needs to at least have permission to edit its own blog posts to access the service.
+        await CheckAccessAsync(CommonPermissions.EditContent, user, null);
 
-            var array = new XRpcArray();
+        var list = (await _contentManager.GetAsync(contentItemId))
+            ?? throw new InvalidOperationException("Could not find content item " + contentItemId);
 
-            var contentItems = await _session.Query<ContentItem>()
-                .With<ContainedPartIndex>(x => x.ListContentItemId == contentItemId)
-                .With<ContentItemIndex>(x => x.Latest)
-                .OrderByDescending(x => x.CreatedUtc)
-                .Take(numberOfPosts)
-                .ListAsync();
+        var array = new XRpcArray();
 
-            foreach (var contentItem in contentItems)
-            {
-                var postStruct = await CreateBlogStructAsync(context, contentItem);
+        var contentItems = await _session.Query<ContentItem>()
+            .With<ContainedPartIndex>(x => x.ListContentItemId == contentItemId)
+            .With<ContentItemIndex>(x => x.Latest)
+            .OrderByDescending(x => x.CreatedUtc)
+            .Take(numberOfPosts)
+            .ListAsync();
 
-                foreach (var driver in drivers)
-                {
-                    driver.Process(postStruct);
-                }
+        foreach (var contentItem in contentItems)
+        {
+            var postStruct = await CreateBlogStructAsync(context, contentItem);
 
-                array.Add(postStruct);
+            foreach (var driver in drivers)
+            {
+                driver.Process(postStruct);
             }
 
-            return array;
+            array.Add(postStruct);
         }
 
-        private async Task<string> MetaWeblogNewPostAsync(
-            string contentItemId,
-            string userName,
-            string password,
-            XRpcStruct content,
-            bool publish,
-            IEnumerable<IXmlRpcDriver> drivers)
-        {
-            var user = await ValidateUserAsync(userName, password);
-
-            // User needs permission to edit or publish its own blog posts.
-            await CheckAccessAsync(publish ? CommonPermissions.PublishContent : CommonPermissions.EditContent, user, null);
+        return array;
+    }
 
-            var list = (await _contentManager.GetAsync(contentItemId))
-                ?? throw new InvalidOperationException("Could not find content item " + contentItemId);
+    private async Task<string> MetaWeblogNewPostAsync(
+        string contentItemId,
+        string userName,
+        string password,
+        XRpcStruct content,
+        bool publish,
+        IEnumerable<IXmlRpcDriver> drivers)
+    {
+        var user = await ValidateUserAsync(userName, password);
 
-            var postType = (await GetContainedContentTypesAsync(list)).FirstOrDefault();
-            var contentItem = await _contentManager.NewAsync(postType.Name);
+        // User needs permission to edit or publish its own blog posts.
+        await CheckAccessAsync(publish ? CommonPermissions.PublishContent : CommonPermissions.EditContent, user, null);
 
-            contentItem.Owner = user.FindFirstValue(ClaimTypes.NameIdentifier);
-            contentItem.Alter<ContainedPart>(x => x.ListContentItemId = list.ContentItemId);
+        var list = (await _contentManager.GetAsync(contentItemId))
+            ?? throw new InvalidOperationException("Could not find content item " + contentItemId);
 
-            foreach (var driver in _metaWeblogDrivers)
-            {
-                driver.EditPost(content, contentItem);
-            }
+        var postType = (await GetContainedContentTypesAsync(list)).FirstOrDefault();
+        var contentItem = await _contentManager.NewAsync(postType.Name);
 
-            await _contentManager.CreateAsync(contentItem, VersionOptions.Draft);
+        contentItem.Owner = user.FindFirstValue(ClaimTypes.NameIdentifier);
+        contentItem.Alter<ContainedPart>(x => x.ListContentItemId = list.ContentItemId);
 
-            // Try to get the UTC time zone by default.
-            var publishedUtc = content.Optional<DateTime?>("date_created_gmt");
-            if (publishedUtc == null)
-            {
-                // Take the local one
-                publishedUtc = content.Optional<DateTime?>("dateCreated");
-            }
-            else
-            {
-                // Ensure it's read as a UTC time.
-                publishedUtc = new DateTime(publishedUtc.Value.Ticks, DateTimeKind.Utc);
-            }
+        foreach (var driver in _metaWeblogDrivers)
+        {
+            driver.EditPost(content, contentItem);
+        }
 
-            if (publish && (publishedUtc == null || publishedUtc <= DateTime.UtcNow))
-            {
-                await _contentManager.PublishAsync(contentItem);
-            }
-            else
-            {
-                await _contentManager.SaveDraftAsync(contentItem);
-            }
+        await _contentManager.CreateAsync(contentItem, VersionOptions.Draft);
 
-            if (publishedUtc != null)
-            {
-                contentItem.CreatedUtc = publishedUtc;
-            }
+        // Try to get the UTC time zone by default.
+        var publishedUtc = content.Optional<DateTime?>("date_created_gmt");
+        if (publishedUtc == null)
+        {
+            // Take the local one
+            publishedUtc = content.Optional<DateTime?>("dateCreated");
+        }
+        else
+        {
+            // Ensure it's read as a UTC time.
+            publishedUtc = new DateTime(publishedUtc.Value.Ticks, DateTimeKind.Utc);
+        }
 
-            foreach (var driver in drivers)
-            {
-                driver.Process(contentItem.ContentItemId);
-            }
+        if (publish && (publishedUtc == null || publishedUtc <= DateTime.UtcNow))
+        {
+            await _contentManager.PublishAsync(contentItem);
+        }
+        else
+        {
+            await _contentManager.SaveDraftAsync(contentItem);
+        }
 
-            return contentItem.ContentItemId;
+        if (publishedUtc != null)
+        {
+            contentItem.CreatedUtc = publishedUtc;
         }
 
-        private async Task<XRpcStruct> MetaWeblogGetPostAsync(
-            XmlRpcContext context,
-            string contentItemId,
-            string userName,
-            string password,
-            IEnumerable<IXmlRpcDriver> drivers)
+        foreach (var driver in drivers)
         {
-            var user = await ValidateUserAsync(userName, password);
+            driver.Process(contentItem.ContentItemId);
+        }
 
-            var contentItem = (await _contentManager.GetAsync(contentItemId, VersionOptions.Latest))
-                ?? throw new InvalidOperationException("Could not find content item " + contentItemId);
+        return contentItem.ContentItemId;
+    }
 
-            await CheckAccessAsync(CommonPermissions.EditContent, user, contentItem);
+    private async Task<XRpcStruct> MetaWeblogGetPostAsync(
+        XmlRpcContext context,
+        string contentItemId,
+        string userName,
+        string password,
+        IEnumerable<IXmlRpcDriver> drivers)
+    {
+        var user = await ValidateUserAsync(userName, password);
 
-            var postStruct = await CreateBlogStructAsync(context, contentItem);
+        var contentItem = (await _contentManager.GetAsync(contentItemId, VersionOptions.Latest))
+            ?? throw new InvalidOperationException("Could not find content item " + contentItemId);
 
-            foreach (var driver in _metaWeblogDrivers)
-            {
-                driver.BuildPost(postStruct, context, contentItem);
-            }
+        await CheckAccessAsync(CommonPermissions.EditContent, user, contentItem);
 
-            foreach (var driver in drivers)
-            {
-                driver.Process(postStruct);
-            }
+        var postStruct = await CreateBlogStructAsync(context, contentItem);
 
-            return postStruct;
+        foreach (var driver in _metaWeblogDrivers)
+        {
+            driver.BuildPost(postStruct, context, contentItem);
         }
 
-        private async Task<bool> MetaWeblogEditPostAsync(
-            string contentItemId,
-            string userName,
-            string password,
-            XRpcStruct content,
-            bool publish,
-            IEnumerable<IXmlRpcDriver> drivers)
+        foreach (var driver in drivers)
         {
-            var user = await ValidateUserAsync(userName, password);
+            driver.Process(postStruct);
+        }
 
-            var contentItem = (await _contentManager.GetAsync(contentItemId, VersionOptions.DraftRequired))
-                ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
+        return postStruct;
+    }
 
-            await CheckAccessAsync(publish ? CommonPermissions.PublishContent : CommonPermissions.EditContent, user, contentItem);
+    private async Task<bool> MetaWeblogEditPostAsync(
+        string contentItemId,
+        string userName,
+        string password,
+        XRpcStruct content,
+        bool publish,
+        IEnumerable<IXmlRpcDriver> drivers)
+    {
+        var user = await ValidateUserAsync(userName, password);
 
-            foreach (var driver in _metaWeblogDrivers)
-            {
-                driver.EditPost(content, contentItem);
-            }
+        var contentItem = (await _contentManager.GetAsync(contentItemId, VersionOptions.DraftRequired))
+            ?? throw new Exception(S["The specified Blog Post doesn't exist anymore. Please create a new Blog Post."]);
 
-            // Try to get the UTC time zone by default.
-            var publishedUtc = content.Optional<DateTime?>("date_created_gmt");
-            if (publishedUtc == null)
-            {
-                // take the local one
-                publishedUtc = content.Optional<DateTime?>("dateCreated");
-            }
-            else
-            {
-                // Ensure it's read as a UTC time.
-                publishedUtc = new DateTime(publishedUtc.Value.Ticks, DateTimeKind.Utc);
-            }
+        await CheckAccessAsync(publish ? CommonPermissions.PublishContent : CommonPermissions.EditContent, user, contentItem);
 
-            if (publish && (publishedUtc == null || publishedUtc <= DateTime.UtcNow))
-            {
-                await _contentManager.PublishAsync(contentItem);
-            }
-            else
-            {
-                await _contentManager.SaveDraftAsync(contentItem);
-            }
+        foreach (var driver in _metaWeblogDrivers)
+        {
+            driver.EditPost(content, contentItem);
+        }
 
-            if (publishedUtc != null)
-            {
-                contentItem.CreatedUtc = publishedUtc;
-            }
+        // Try to get the UTC time zone by default.
+        var publishedUtc = content.Optional<DateTime?>("date_created_gmt");
+        if (publishedUtc == null)
+        {
+            // take the local one
+            publishedUtc = content.Optional<DateTime?>("dateCreated");
+        }
+        else
+        {
+            // Ensure it's read as a UTC time.
+            publishedUtc = new DateTime(publishedUtc.Value.Ticks, DateTimeKind.Utc);
+        }
 
-            foreach (var driver in drivers)
-            {
-                driver.Process(contentItem.Id);
-            }
+        if (publish && (publishedUtc == null || publishedUtc <= DateTime.UtcNow))
+        {
+            await _contentManager.PublishAsync(contentItem);
+        }
+        else
+        {
+            await _contentManager.SaveDraftAsync(contentItem);
+        }
 
-            return true;
+        if (publishedUtc != null)
+        {
+            contentItem.CreatedUtc = publishedUtc;
         }
 
-        private async Task<bool> MetaWeblogDeletePostAsync(
-            string contentItemId,
-            string userName,
-            string password,
-            IEnumerable<IXmlRpcDriver> drivers)
+        foreach (var driver in drivers)
         {
-            var user = await ValidateUserAsync(userName, password);
+            driver.Process(contentItem.Id);
+        }
 
-            var contentItem = (await _contentManager.GetAsync(contentItemId, VersionOptions.Latest))
-                ?? throw new InvalidOperationException("Could not find content item " + contentItemId);
+        return true;
+    }
 
-            if (!await _authorizationService.AuthorizeAsync(user, CommonPermissions.DeleteContent, contentItem))
-            {
-                throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-            }
+    private async Task<bool> MetaWeblogDeletePostAsync(
+        string contentItemId,
+        string userName,
+        string password,
+        IEnumerable<IXmlRpcDriver> drivers)
+    {
+        var user = await ValidateUserAsync(userName, password);
 
-            foreach (var driver in drivers)
-            {
-                driver.Process(contentItem.ContentItemId);
-            }
+        var contentItem = (await _contentManager.GetAsync(contentItemId, VersionOptions.Latest))
+            ?? throw new InvalidOperationException("Could not find content item " + contentItemId);
 
-            await _contentManager.RemoveAsync(contentItem);
-            return true;
+        if (!await _authorizationService.AuthorizeAsync(user, CommonPermissions.DeleteContent, contentItem))
+        {
+            throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
         }
 
-        private async Task<ClaimsPrincipal> ValidateUserAsync(string userName, string password)
+        foreach (var driver in drivers)
         {
-            if (!await _membershipService.CheckPasswordAsync(userName, password))
-            {
-                throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
-            }
-
-            var storeUser = await _membershipService.GetUserAsync(userName);
+            driver.Process(contentItem.ContentItemId);
+        }
 
-            if (storeUser == null)
-            {
-                return null;
-            }
+        await _contentManager.RemoveAsync(contentItem);
+        return true;
+    }
 
-            return await _membershipService.CreateClaimsPrincipal(storeUser);
+    private async Task<ClaimsPrincipal> ValidateUserAsync(string userName, string password)
+    {
+        if (!await _membershipService.CheckPasswordAsync(userName, password))
+        {
+            throw new InvalidOperationException(S["The username or e-mail or password provided is incorrect."].Value);
         }
 
-        private async Task<XRpcStruct> CreateBlogStructAsync(XmlRpcContext context, ContentItem contentItem)
+        var storeUser = await _membershipService.GetUserAsync(userName);
+
+        if (storeUser == null)
         {
-            var metadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(contentItem);
+            return null;
+        }
 
-            var url = context.Url.Action(
-                metadata.DisplayRouteValues["action"].ToString(),
-                metadata.DisplayRouteValues["controller"].ToString(),
-                metadata.DisplayRouteValues,
-                context.HttpContext.Request.Scheme);
+        return await _membershipService.CreateClaimsPrincipal(storeUser);
+    }
 
-            if (contentItem.HasDraft())
-            {
-                url = context.Url.Action("Preview", "Item", new { area = "OrchardCore.Contents", contentItemId = contentItem.ContentItemId });
-            }
+    private async Task<XRpcStruct> CreateBlogStructAsync(XmlRpcContext context, ContentItem contentItem)
+    {
+        var metadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(contentItem);
 
-            var blogStruct = new XRpcStruct()
-                .Set("postid", contentItem.ContentItemId)
-                .Set("link", url)
-                .Set("permaLink", url);
+        var url = context.Url.Action(
+            metadata.DisplayRouteValues["action"].ToString(),
+            metadata.DisplayRouteValues["controller"].ToString(),
+            metadata.DisplayRouteValues,
+            context.HttpContext.Request.Scheme);
 
-            if (contentItem.PublishedUtc != null)
-            {
-                blogStruct.Set("dateCreated", contentItem.PublishedUtc);
-                blogStruct.Set("date_created_gmt", contentItem.PublishedUtc);
-            }
+        if (contentItem.HasDraft())
+        {
+            url = context.Url.Action("Preview", "Item", new { area = "OrchardCore.Contents", contentItemId = contentItem.ContentItemId });
+        }
 
-            foreach (var driver in _metaWeblogDrivers)
-            {
-                driver.BuildPost(blogStruct, context, contentItem);
-            }
+        var blogStruct = new XRpcStruct()
+            .Set("postid", contentItem.ContentItemId)
+            .Set("link", url)
+            .Set("permaLink", url);
 
-            return blogStruct;
+        if (contentItem.PublishedUtc != null)
+        {
+            blogStruct.Set("dateCreated", contentItem.PublishedUtc);
+            blogStruct.Set("date_created_gmt", contentItem.PublishedUtc);
         }
 
-        private async Task CheckAccessAsync(Permission permission, ClaimsPrincipal user, ContentItem contentItem)
+        foreach (var driver in _metaWeblogDrivers)
         {
-            if (!await _authorizationService.AuthorizeAsync(user, permission, contentItem))
-            {
-                throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
-            }
+            driver.BuildPost(blogStruct, context, contentItem);
         }
 
-        private async Task<IEnumerable<ContentTypeDefinition>> GetContainedContentTypesAsync(ContentItem contentItem)
+        return blogStruct;
+    }
+
+    private async Task CheckAccessAsync(Permission permission, ClaimsPrincipal user, ContentItem contentItem)
+    {
+        if (!await _authorizationService.AuthorizeAsync(user, permission, contentItem))
         {
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
-            var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, "ListPart", StringComparison.Ordinal));
-            var settings = contentTypePartDefinition.GetSettings<ListPartSettings>();
-            var contentTypes = settings.ContainedContentTypes ?? [];
+            throw new InvalidOperationException(S["Not authorized to delete this content"].Value);
+        }
+    }
 
-            var definitions = new List<ContentTypeDefinition>();
+    private async Task<IEnumerable<ContentTypeDefinition>> GetContainedContentTypesAsync(ContentItem contentItem)
+    {
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+        var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, "ListPart", StringComparison.Ordinal));
+        var settings = contentTypePartDefinition.GetSettings<ListPartSettings>();
+        var contentTypes = settings.ContainedContentTypes ?? [];
 
-            foreach (var contentType in contentTypes)
-            {
-                var definition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentType);
+        var definitions = new List<ContentTypeDefinition>();
 
-                if (definition == null)
-                {
-                    continue;
-                }
+        foreach (var contentType in contentTypes)
+        {
+            var definition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentType);
 
-                definitions.Add(definition);
+            if (definition == null)
+            {
+                continue;
             }
 
-            return definitions;
+            definitions.Add(definition);
         }
+
+        return definitions;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/RemotePublishing/RemotePublishingStartup.cs b/src/OrchardCore.Modules/OrchardCore.Lists/RemotePublishing/RemotePublishingStartup.cs
index 943e57d3071..7782a1fb384 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/RemotePublishing/RemotePublishingStartup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/RemotePublishing/RemotePublishingStartup.cs
@@ -8,26 +8,25 @@
 using OrchardCore.Modules;
 using OrchardCore.XmlRpc;
 
-namespace OrchardCore.Lists.RemotePublishing
+namespace OrchardCore.Lists.RemotePublishing;
+
+[RequireFeatures("OrchardCore.RemotePublishing")]
+public sealed class RemotePublishingStartup : StartupBase
 {
-    [RequireFeatures("OrchardCore.RemotePublishing")]
-    public sealed class RemotePublishingStartup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IXmlRpcHandler, MetaWeblogHandler>();
-            services.AddContentPart<ListPart>()
-                .UseDisplayDriver<ListMetaWeblogDriver>();
-        }
+        services.AddScoped<IXmlRpcHandler, MetaWeblogHandler>();
+        services.AddContentPart<ListPart>()
+            .UseDisplayDriver<ListMetaWeblogDriver>();
+    }
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            routes.MapAreaControllerRoute(
-                name: "RSD",
-                areaName: "OrchardCore.Lists",
-                pattern: "xmlrpc/metaweblog/{contentItemId}/rsd",
-                defaults: new { controller = "RemotePublishing", action = "Rsd" }
-            );
-        }
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        routes.MapAreaControllerRoute(
+            name: "RSD",
+            areaName: "OrchardCore.Lists",
+            pattern: "xmlrpc/metaweblog/{contentItemId}/rsd",
+            defaults: new { controller = "RemotePublishing", action = "Rsd" }
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Services/ContainerService.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Services/ContainerService.cs
index 676ce9d25f3..c2ce3f2e058 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Services/ContainerService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Services/ContainerService.cs
@@ -13,385 +13,384 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.Lists.Services
+namespace OrchardCore.Lists.Services;
+
+public class ContainerService : IContainerService
 {
-    public class ContainerService : IContainerService
+    private readonly YesSql.ISession _session;
+    private readonly IContentManager _contentManager;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+
+    public ContainerService(
+        YesSql.ISession session,
+        IContentManager contentManager,
+        IHttpContextAccessor httpContextAccessor)
+    {
+        _session = session;
+        _contentManager = contentManager;
+        _httpContextAccessor = httpContextAccessor;
+    }
+
+    public async Task<int> GetNextOrderNumberAsync(string contentItemId)
     {
-        private readonly YesSql.ISession _session;
-        private readonly IContentManager _contentManager;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-
-        public ContainerService(
-            YesSql.ISession session,
-            IContentManager contentManager,
-            IHttpContextAccessor httpContextAccessor)
+        var index = await _session.QueryIndex<ContainedPartIndex>(x => x.ListContentItemId == contentItemId)
+            .OrderByDescending(x => x.Order)
+            .FirstOrDefaultAsync();
+
+        if (index != null)
         {
-            _session = session;
-            _contentManager = contentManager;
-            _httpContextAccessor = httpContextAccessor;
+            return index.Order + 1;
         }
-
-        public async Task<int> GetNextOrderNumberAsync(string contentItemId)
+        else
         {
-            var index = await _session.QueryIndex<ContainedPartIndex>(x => x.ListContentItemId == contentItemId)
-                .OrderByDescending(x => x.Order)
-                .FirstOrDefaultAsync();
-
-            if (index != null)
-            {
-                return index.Order + 1;
-            }
-            else
-            {
-                return 0;
-            }
+            return 0;
         }
+    }
 
-        public async Task UpdateContentItemOrdersAsync(IEnumerable<ContentItem> contentItems, int orderOfFirstItem)
+    public async Task UpdateContentItemOrdersAsync(IEnumerable<ContentItem> contentItems, int orderOfFirstItem)
+    {
+        var i = 0;
+        foreach (var contentItem in contentItems)
         {
-            var i = 0;
-            foreach (var contentItem in contentItems)
+            var containedPart = contentItem.As<ContainedPart>();
+            if (containedPart != null && containedPart.Order != orderOfFirstItem + i)
             {
-                var containedPart = contentItem.As<ContainedPart>();
-                if (containedPart != null && containedPart.Order != orderOfFirstItem + i)
-                {
-                    containedPart.Order = orderOfFirstItem + i;
-                    containedPart.Apply();
+                containedPart.Order = orderOfFirstItem + i;
+                containedPart.Apply();
 
-                    // Keep the published and draft orders the same to avoid confusion in the admin list.
-                    if (!contentItem.IsPublished())
+                // Keep the published and draft orders the same to avoid confusion in the admin list.
+                if (!contentItem.IsPublished())
+                {
+                    var publishedItem = await _contentManager.GetAsync(contentItem.ContentItemId, VersionOptions.Published);
+                    if (publishedItem != null)
                     {
-                        var publishedItem = await _contentManager.GetAsync(contentItem.ContentItemId, VersionOptions.Published);
-                        if (publishedItem != null)
-                        {
-                            publishedItem.Alter<ContainedPart>(x => x.Order = orderOfFirstItem + i);
-                            await _contentManager.UpdateAsync(publishedItem);
-                        }
+                        publishedItem.Alter<ContainedPart>(x => x.Order = orderOfFirstItem + i);
+                        await _contentManager.UpdateAsync(publishedItem);
                     }
-
-                    await _contentManager.UpdateAsync(contentItem);
                 }
 
-                i++;
+                await _contentManager.UpdateAsync(contentItem);
             }
+
+            i++;
         }
+    }
 
-        public async Task SetInitialOrder(string contentType)
-        {
-            // Set initial order for published and drafts if they have never been published.
-            var contanerContentItemsQuery = _session.QueryIndex<ContentItemIndex>(x => x.ContentType == contentType && (x.Published || x.Latest));
-            var containerContentItems = await contanerContentItemsQuery.ListAsync();
+    public async Task SetInitialOrder(string contentType)
+    {
+        // Set initial order for published and drafts if they have never been published.
+        var contanerContentItemsQuery = _session.QueryIndex<ContentItemIndex>(x => x.ContentType == contentType && (x.Published || x.Latest));
+        var containerContentItems = await contanerContentItemsQuery.ListAsync();
 
-            if (!containerContentItems.Any())
-            {
-                return;
-            }
+        if (!containerContentItems.Any())
+        {
+            return;
+        }
 
-            // Reduce duplicates to only set order for the published container item and the draft item if it has not been published.
-            var containerContentItemIds = containerContentItems.Select(x => x.ContentItemId).Distinct();
+        // Reduce duplicates to only set order for the published container item and the draft item if it has not been published.
+        var containerContentItemIds = containerContentItems.Select(x => x.ContentItemId).Distinct();
 
-            var containedItemsQuery = _session.Query<ContentItem>()
-                .With<ContainedPartIndex>(x => x.ListContentItemId.IsIn(containerContentItemIds))
-                .With<ContentItemIndex>(ci => ci.Latest || ci.Published)
-                .OrderByDescending(x => x.CreatedUtc);
+        var containedItemsQuery = _session.Query<ContentItem>()
+            .With<ContainedPartIndex>(x => x.ListContentItemId.IsIn(containerContentItemIds))
+            .With<ContentItemIndex>(ci => ci.Latest || ci.Published)
+            .OrderByDescending(x => x.CreatedUtc);
 
-            // Load items so that loading handlers are invoked.
-            var contentItemGroups = (await containedItemsQuery.ListAsync(_contentManager)).ToLookup(l => l.As<ContainedPart>()?.ListContentItemId);
+        // Load items so that loading handlers are invoked.
+        var contentItemGroups = (await containedItemsQuery.ListAsync(_contentManager)).ToLookup(l => l.As<ContainedPart>()?.ListContentItemId);
 
-            foreach (var contentItemGroup in contentItemGroups)
+        foreach (var contentItemGroup in contentItemGroups)
+        {
+            var i = 0;
+            foreach (var contentItem in contentItemGroup)
             {
-                var i = 0;
-                foreach (var contentItem in contentItemGroup)
+                var containedPart = contentItem.As<ContainedPart>();
+                if (containedPart != null)
                 {
-                    var containedPart = contentItem.As<ContainedPart>();
-                    if (containedPart != null)
+                    if (contentItem.Published && contentItem.Latest)
+                    {
+                        containedPart.Order = i;
+                        containedPart.Apply();
+                    }
+                    else if (contentItem.Latest && !contentItem.Published)
                     {
-                        if (contentItem.Published && contentItem.Latest)
+                        // Update the latest order.
+                        containedPart.Order = i;
+                        containedPart.Apply();
+
+                        // If a published version exists, find it, and set it to the same order as the draft.
+                        var publishedItem = contentItemGroup.FirstOrDefault(p => p.Published == true && p.ContentItemId == contentItem.ContentItemId);
+                        var publishedContainedPart = publishedItem?.As<ContainedPart>();
+                        if (publishedContainedPart != null)
                         {
-                            containedPart.Order = i;
-                            containedPart.Apply();
+                            publishedContainedPart.Order = i;
+                            publishedContainedPart.Apply();
                         }
-                        else if (contentItem.Latest && !contentItem.Published)
+                    }
+                    else if (contentItem.Published && !contentItem.Latest)
+                    {
+                        // If a latest version exists, it will handle updating the order.
+                        var latestItem = contentItemGroup.FirstOrDefault(l => l.Latest == true && l.ContentItemId == contentItem.ContentItemId);
+                        if (latestItem == null)
                         {
-                            // Update the latest order.
+                            // Apply order to the published item.
                             containedPart.Order = i;
                             containedPart.Apply();
-
-                            // If a published version exists, find it, and set it to the same order as the draft.
-                            var publishedItem = contentItemGroup.FirstOrDefault(p => p.Published == true && p.ContentItemId == contentItem.ContentItemId);
-                            var publishedContainedPart = publishedItem?.As<ContainedPart>();
-                            if (publishedContainedPart != null)
-                            {
-                                publishedContainedPart.Order = i;
-                                publishedContainedPart.Apply();
-                            }
                         }
-                        else if (contentItem.Published && !contentItem.Latest)
+                        else
                         {
-                            // If a latest version exists, it will handle updating the order.
-                            var latestItem = contentItemGroup.FirstOrDefault(l => l.Latest == true && l.ContentItemId == contentItem.ContentItemId);
-                            if (latestItem == null)
-                            {
-                                // Apply order to the published item.
-                                containedPart.Order = i;
-                                containedPart.Apply();
-                            }
-                            else
-                            {
-                                // Order of this item will be updated when latest is iterated.
-                                continue;
-                            }
+                            // Order of this item will be updated when latest is iterated.
+                            continue;
                         }
-
-                        await _session.SaveAsync(contentItem);
                     }
 
-                    i++;
+                    await _session.SaveAsync(contentItem);
                 }
+
+                i++;
             }
         }
+    }
 
-        public async Task<IEnumerable<ContentItem>> QueryContainedItemsAsync(
-            string contentItemId,
-            bool enableOrdering,
-            PagerSlim pager,
-            ContainedItemOptions containedItemOptions)
-        {
-            ArgumentNullException.ThrowIfNull(containedItemOptions);
+    public async Task<IEnumerable<ContentItem>> QueryContainedItemsAsync(
+        string contentItemId,
+        bool enableOrdering,
+        PagerSlim pager,
+        ContainedItemOptions containedItemOptions)
+    {
+        ArgumentNullException.ThrowIfNull(containedItemOptions);
 
-            IQuery<ContentItem> query = null;
-            if (pager.Before != null)
+        IQuery<ContentItem> query = null;
+        if (pager.Before != null)
+        {
+            if (enableOrdering)
             {
-                if (enableOrdering)
-                {
-                    var beforeValue = int.Parse(pager.Before);
-                    query = _session.Query<ContentItem>()
-                        .With(CreateOrderedContainedPartIndexFilter(beforeValue, null, contentItemId))
-                        .OrderByDescending(x => x.Order);
-                }
-                else
-                {
-                    var beforeValue = new DateTime(long.Parse(pager.Before));
-                    query = _session.Query<ContentItem>()
-                        .With<ContainedPartIndex>(x => x.ListContentItemId == contentItemId);
+                var beforeValue = int.Parse(pager.Before);
+                query = _session.Query<ContentItem>()
+                    .With(CreateOrderedContainedPartIndexFilter(beforeValue, null, contentItemId))
+                    .OrderByDescending(x => x.Order);
+            }
+            else
+            {
+                var beforeValue = new DateTime(long.Parse(pager.Before));
+                query = _session.Query<ContentItem>()
+                    .With<ContainedPartIndex>(x => x.ListContentItemId == contentItemId);
 
-                    ApplyPagingContentIndexFilter(beforeValue, null, true, query);
-                }
+                ApplyPagingContentIndexFilter(beforeValue, null, true, query);
+            }
 
-                ApplyContainedItemOptionsFilter(containedItemOptions, query);
+            ApplyContainedItemOptionsFilter(containedItemOptions, query);
 
-                // Take() needs to be the last expression in the query otherwise the ORDER BY clause will be
-                // syntactically incorrect.
-                query.Take(pager.PageSize + 1);
+            // Take() needs to be the last expression in the query otherwise the ORDER BY clause will be
+            // syntactically incorrect.
+            query.Take(pager.PageSize + 1);
 
-                // Load items so that loading handlers are invoked.
-                var containedItems = await query.ListAsync(_contentManager);
+            // Load items so that loading handlers are invoked.
+            var containedItems = await query.ListAsync(_contentManager);
 
-                if (!containedItems.Any())
-                {
-                    return containedItems;
-                }
+            if (!containedItems.Any())
+            {
+                return containedItems;
+            }
 
-                containedItems = containedItems.Reverse();
+            containedItems = containedItems.Reverse();
 
-                // There is always an After as we clicked on Before
-                pager.Before = null;
+            // There is always an After as we clicked on Before
+            pager.Before = null;
+            if (enableOrdering)
+            {
+                pager.After = containedItems.Last().As<ContainedPart>().Order.ToString();
+            }
+            else
+            {
+                pager.After = containedItems.Last().CreatedUtc.Value.Ticks.ToString();
+            }
+            if (containedItems.Count() == pager.PageSize + 1)
+            {
+                containedItems = containedItems.Skip(1);
                 if (enableOrdering)
                 {
-                    pager.After = containedItems.Last().As<ContainedPart>().Order.ToString();
+                    pager.Before = containedItems.First().As<ContainedPart>().Order.ToString();
                 }
                 else
                 {
-                    pager.After = containedItems.Last().CreatedUtc.Value.Ticks.ToString();
-                }
-                if (containedItems.Count() == pager.PageSize + 1)
-                {
-                    containedItems = containedItems.Skip(1);
-                    if (enableOrdering)
-                    {
-                        pager.Before = containedItems.First().As<ContainedPart>().Order.ToString();
-                    }
-                    else
-                    {
-                        pager.Before = containedItems.First().CreatedUtc.Value.Ticks.ToString();
-                    }
+                    pager.Before = containedItems.First().CreatedUtc.Value.Ticks.ToString();
                 }
+            }
 
-                return containedItems;
+            return containedItems;
+        }
+        else if (pager.After != null)
+        {
+            if (enableOrdering)
+            {
+                var afterValue = int.Parse(pager.After);
+                query = _session.Query<ContentItem>()
+                    .With(CreateOrderedContainedPartIndexFilter(null, afterValue, contentItemId))
+                    .OrderBy(x => x.Order);
             }
-            else if (pager.After != null)
+            else
             {
-                if (enableOrdering)
-                {
-                    var afterValue = int.Parse(pager.After);
-                    query = _session.Query<ContentItem>()
-                        .With(CreateOrderedContainedPartIndexFilter(null, afterValue, contentItemId))
-                        .OrderBy(x => x.Order);
-                }
-                else
-                {
-                    var afterValue = new DateTime(long.Parse(pager.After));
-                    query = _session.Query<ContentItem>()
-                        .With(CreateOrderedContainedPartIndexFilter(null, null, contentItemId));
+                var afterValue = new DateTime(long.Parse(pager.After));
+                query = _session.Query<ContentItem>()
+                    .With(CreateOrderedContainedPartIndexFilter(null, null, contentItemId));
 
-                    ApplyPagingContentIndexFilter(null, afterValue, false, query);
-                }
+                ApplyPagingContentIndexFilter(null, afterValue, false, query);
+            }
 
-                ApplyContainedItemOptionsFilter(containedItemOptions, query);
+            ApplyContainedItemOptionsFilter(containedItemOptions, query);
 
-                query.Take(pager.PageSize + 1);
+            query.Take(pager.PageSize + 1);
 
-                // Load items so that loading handlers are invoked.
-                var containedItems = await query.ListAsync(_contentManager);
+            // Load items so that loading handlers are invoked.
+            var containedItems = await query.ListAsync(_contentManager);
 
-                if (!containedItems.Any())
-                {
-                    return containedItems;
-                }
+            if (!containedItems.Any())
+            {
+                return containedItems;
+            }
+
+            // There is always a Before page as we clicked on After
+            if (enableOrdering)
+            {
+                pager.Before = containedItems.First().As<ContainedPart>().Order.ToString();
+            }
+            else
+            {
+                pager.Before = containedItems.First().CreatedUtc.Value.Ticks.ToString();
+            }
+            pager.After = null;
 
-                // There is always a Before page as we clicked on After
+            if (containedItems.Count() == pager.PageSize + 1)
+            {
+                containedItems = containedItems.Take(pager.PageSize);
                 if (enableOrdering)
                 {
-                    pager.Before = containedItems.First().As<ContainedPart>().Order.ToString();
+                    pager.After = containedItems.Last().As<ContainedPart>().Order.ToString();
                 }
                 else
                 {
-                    pager.Before = containedItems.First().CreatedUtc.Value.Ticks.ToString();
-                }
-                pager.After = null;
-
-                if (containedItems.Count() == pager.PageSize + 1)
-                {
-                    containedItems = containedItems.Take(pager.PageSize);
-                    if (enableOrdering)
-                    {
-                        pager.After = containedItems.Last().As<ContainedPart>().Order.ToString();
-                    }
-                    else
-                    {
-                        pager.After = containedItems.Last().CreatedUtc.Value.Ticks.ToString();
-                    }
+                    pager.After = containedItems.Last().CreatedUtc.Value.Ticks.ToString();
                 }
+            }
 
-                return containedItems;
+            return containedItems;
+        }
+        else
+        {
+            if (enableOrdering)
+            {
+                query = _session.Query<ContentItem>()
+                    .With(CreateOrderedContainedPartIndexFilter(null, null, contentItemId))
+                    .OrderBy(x => x.Order);
             }
             else
             {
-                if (enableOrdering)
-                {
-                    query = _session.Query<ContentItem>()
-                        .With(CreateOrderedContainedPartIndexFilter(null, null, contentItemId))
-                        .OrderBy(x => x.Order);
-                }
-                else
-                {
-                    query = _session.Query<ContentItem>()
-                        .With<ContainedPartIndex>(x => x.ListContentItemId == contentItemId);
+                query = _session.Query<ContentItem>()
+                    .With<ContainedPartIndex>(x => x.ListContentItemId == contentItemId);
 
-                    ApplyPagingContentIndexFilter(null, null, false, query);
-                }
+                ApplyPagingContentIndexFilter(null, null, false, query);
+            }
 
-                ApplyContainedItemOptionsFilter(containedItemOptions, query);
+            ApplyContainedItemOptionsFilter(containedItemOptions, query);
 
-                query.Take(pager.PageSize + 1);
+            query.Take(pager.PageSize + 1);
 
-                // Load items so that loading handlers are invoked.
-                var containedItems = await query.ListAsync(_contentManager);
+            // Load items so that loading handlers are invoked.
+            var containedItems = await query.ListAsync(_contentManager);
 
-                if (!containedItems.Any())
-                {
-                    return containedItems;
-                }
+            if (!containedItems.Any())
+            {
+                return containedItems;
+            }
 
-                pager.Before = null;
-                pager.After = null;
+            pager.Before = null;
+            pager.After = null;
 
-                if (containedItems.Count() == pager.PageSize + 1)
+            if (containedItems.Count() == pager.PageSize + 1)
+            {
+                containedItems = containedItems.Take(pager.PageSize);
+                if (enableOrdering)
                 {
-                    containedItems = containedItems.Take(pager.PageSize);
-                    if (enableOrdering)
-                    {
-                        pager.After = containedItems.Last().As<ContainedPart>().Order.ToString();
-                    }
-                    else
-                    {
-                        pager.After = containedItems.Last().CreatedUtc.Value.Ticks.ToString();
-                    }
+                    pager.After = containedItems.Last().As<ContainedPart>().Order.ToString();
+                }
+                else
+                {
+                    pager.After = containedItems.Last().CreatedUtc.Value.Ticks.ToString();
                 }
-
-                return containedItems;
             }
+
+            return containedItems;
         }
+    }
 
-        private static void ApplyPagingContentIndexFilter(DateTime? before, DateTime? after, bool orderByAsc, IQuery<ContentItem> query)
-        {
-            var indexQuery = query.With<ContentItemIndex>();
+    private static void ApplyPagingContentIndexFilter(DateTime? before, DateTime? after, bool orderByAsc, IQuery<ContentItem> query)
+    {
+        var indexQuery = query.With<ContentItemIndex>();
 
-            if (before != null)
-            {
-                indexQuery.Where(i => i.CreatedUtc > before);
-            }
+        if (before != null)
+        {
+            indexQuery.Where(i => i.CreatedUtc > before);
+        }
 
-            if (after != null)
-            {
-                indexQuery.Where(i => i.CreatedUtc < after);
-            }
+        if (after != null)
+        {
+            indexQuery.Where(i => i.CreatedUtc < after);
+        }
 
-            if (orderByAsc)
-            {
-                indexQuery.OrderBy(i => i.CreatedUtc);
-            }
-            else
-            {
-                indexQuery.OrderByDescending(i => i.CreatedUtc);
-            }
+        if (orderByAsc)
+        {
+            indexQuery.OrderBy(i => i.CreatedUtc);
         }
+        else
+        {
+            indexQuery.OrderByDescending(i => i.CreatedUtc);
+        }
+    }
 
-        private void ApplyContainedItemOptionsFilter(ContainedItemOptions containedItemOptions, IQuery<ContentItem> query)
+    private void ApplyContainedItemOptionsFilter(ContainedItemOptions containedItemOptions, IQuery<ContentItem> query)
+    {
+        if (!string.IsNullOrEmpty(containedItemOptions.DisplayText))
         {
-            if (!string.IsNullOrEmpty(containedItemOptions.DisplayText))
-            {
-                query.With<ContentItemIndex>(i => i.DisplayText.Contains(containedItemOptions.DisplayText));
-            }
+            query.With<ContentItemIndex>(i => i.DisplayText.Contains(containedItemOptions.DisplayText));
+        }
 
-            switch (containedItemOptions.Status)
-            {
-                case ContentsStatus.Published:
-                    query.With<ContentItemIndex>(i => i.Published);
-                    break;
-                case ContentsStatus.Latest:
-                    query.With<ContentItemIndex>(i => i.Latest);
-                    break;
-                case ContentsStatus.Draft:
-                    query.With<ContentItemIndex>(i => !i.Published && i.Latest);
-                    break;
-                case ContentsStatus.Owner:
-                    var currentUserName = _httpContextAccessor.HttpContext?.User?.FindFirstValue(ClaimTypes.NameIdentifier);
-
-                    if (currentUserName != null)
-                    {
-                        query.With<ContentItemIndex>(i => (i.Published || i.Latest) && i.Owner == currentUserName);
-                    }
+        switch (containedItemOptions.Status)
+        {
+            case ContentsStatus.Published:
+                query.With<ContentItemIndex>(i => i.Published);
+                break;
+            case ContentsStatus.Latest:
+                query.With<ContentItemIndex>(i => i.Latest);
+                break;
+            case ContentsStatus.Draft:
+                query.With<ContentItemIndex>(i => !i.Published && i.Latest);
+                break;
+            case ContentsStatus.Owner:
+                var currentUserName = _httpContextAccessor.HttpContext?.User?.FindFirstValue(ClaimTypes.NameIdentifier);
+
+                if (currentUserName != null)
+                {
+                    query.With<ContentItemIndex>(i => (i.Published || i.Latest) && i.Owner == currentUserName);
+                }
 
-                    break;
-                default:
-                    throw new NotSupportedException("Unknown status filter.");
-            }
+                break;
+            default:
+                throw new NotSupportedException("Unknown status filter.");
         }
+    }
 
-        private static Expression<Func<ContainedPartIndex, bool>> CreateOrderedContainedPartIndexFilter(int? before, int? after, string contentItemId)
+    private static Expression<Func<ContainedPartIndex, bool>> CreateOrderedContainedPartIndexFilter(int? before, int? after, string contentItemId)
+    {
+        if (before != null)
         {
-            if (before != null)
-            {
-                return x => x.Order < before && x.ListContentItemId == contentItemId;
-            }
-
-            if (after != null)
-            {
-                return x => x.Order > after && x.ListContentItemId == contentItemId;
-            }
+            return x => x.Order < before && x.ListContentItemId == contentItemId;
+        }
 
-            return x => x.ListContentItemId == contentItemId;
+        if (after != null)
+        {
+            return x => x.Order > after && x.ListContentItemId == contentItemId;
         }
+
+        return x => x.ListContentItemId == contentItemId;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Services/IContainerService.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Services/IContainerService.cs
index 03f061b8707..1d0b08528a8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Services/IContainerService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Services/IContainerService.cs
@@ -4,29 +4,28 @@
 using OrchardCore.Lists.Models;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Lists.Services
+namespace OrchardCore.Lists.Services;
+
+public interface IContainerService
 {
-    public interface IContainerService
-    {
-        /// <summary>
-        /// Query contained items by page either order by the created utc or order value.
-        /// </summary>
-        Task<IEnumerable<ContentItem>> QueryContainedItemsAsync(string contentItemId, bool enableOrdering, PagerSlim pager, ContainedItemOptions containedItemOptions);
+    /// <summary>
+    /// Query contained items by page either order by the created utc or order value.
+    /// </summary>
+    Task<IEnumerable<ContentItem>> QueryContainedItemsAsync(string contentItemId, bool enableOrdering, PagerSlim pager, ContainedItemOptions containedItemOptions);
 
-        /// <summary>
-        /// Update the orders of the content items.
-        /// </summary>
-        Task UpdateContentItemOrdersAsync(IEnumerable<ContentItem> contentItems, int orderOfFirstItem);
+    /// <summary>
+    /// Update the orders of the content items.
+    /// </summary>
+    Task UpdateContentItemOrdersAsync(IEnumerable<ContentItem> contentItems, int orderOfFirstItem);
 
-        /// <summary>
-        /// Get the next order number.
-        /// New or cloned content items are added to the bottom of the list.
-        /// </summary>
-        Task<int> GetNextOrderNumberAsync(string contentItemId);
+    /// <summary>
+    /// Get the next order number.
+    /// New or cloned content items are added to the bottom of the list.
+    /// </summary>
+    Task<int> GetNextOrderNumberAsync(string contentItemId);
 
-        /// <summary>
-        /// Update order of the content items when ordering is enabled.
-        /// </summary>
-        Task SetInitialOrder(string containerContentType);
-    }
+    /// <summary>
+    /// Update order of the content items when ordering is enabled.
+    /// </summary>
+    Task SetInitialOrder(string containerContentType);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Services/ListPartContentsAdminListFilter.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Services/ListPartContentsAdminListFilter.cs
index 91e4c3f05d8..0ff19a70e05 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Services/ListPartContentsAdminListFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Services/ListPartContentsAdminListFilter.cs
@@ -12,39 +12,38 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.Lists.Services
+namespace OrchardCore.Lists.Services;
+
+public class ListPartContentsAdminListFilter : IContentsAdminListFilter
 {
-    public class ListPartContentsAdminListFilter : IContentsAdminListFilter
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+
+    public ListPartContentsAdminListFilter(IContentDefinitionManager contentDefinitionManager)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public ListPartContentsAdminListFilter(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public async Task FilterAsync(ContentOptionsViewModel model, IQuery<ContentItem> query, IUpdateModel updater)
+    {
+        var viewModel = new ListPartContentsAdminFilterViewModel();
+        await updater.TryUpdateModelAsync(viewModel, nameof(ListPart));
 
-        public async Task FilterAsync(ContentOptionsViewModel model, IQuery<ContentItem> query, IUpdateModel updater)
+        // Show list content items
+        if (viewModel.ShowListContentTypes)
         {
-            var viewModel = new ListPartContentsAdminFilterViewModel();
-            await updater.TryUpdateModelAsync(viewModel, nameof(ListPart));
-
-            // Show list content items
-            if (viewModel.ShowListContentTypes)
-            {
-                var listableTypes = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
-                    .Where(x =>
-                        x.Parts.Any(p =>
-                            p.PartDefinition.Name == nameof(ListPart)))
-                    .Select(x => x.Name);
+            var listableTypes = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
+                .Where(x =>
+                    x.Parts.Any(p =>
+                        p.PartDefinition.Name == nameof(ListPart)))
+                .Select(x => x.Name);
 
-                query.With<ContentItemIndex>(x => x.ContentType.IsIn(listableTypes));
-            }
+            query.With<ContentItemIndex>(x => x.ContentType.IsIn(listableTypes));
+        }
 
-            // Show contained elements for the specified list
-            else if (viewModel.ListContentItemId != null)
-            {
-                query.With<ContainedPartIndex>(x => x.ListContentItemId == viewModel.ListContentItemId);
-            }
+        // Show contained elements for the specified list
+        else if (viewModel.ListContentItemId != null)
+        {
+            query.With<ContainedPartIndex>(x => x.ListContentItemId == viewModel.ListContentItemId);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Settings/ListPartSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Settings/ListPartSettingsDisplayDriver.cs
index a70f2862326..3864d482bf0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Settings/ListPartSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Settings/ListPartSettingsDisplayDriver.cs
@@ -9,73 +9,72 @@
 using OrchardCore.Lists.Services;
 using OrchardCore.Lists.ViewModels;
 
-namespace OrchardCore.Lists.Settings
+namespace OrchardCore.Lists.Settings;
+
+public sealed class ListPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<ListPart>
 {
-    public sealed class ListPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<ListPart>
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IContainerService _containerService;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContainerService _containerService;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public ListPartSettingsDisplayDriver(
-            IContentDefinitionManager contentDefinitionManager,
-            IContainerService containerService,
-            IStringLocalizer<ListPartSettingsDisplayDriver> localizer)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _containerService = containerService;
-            S = localizer;
-        }
+    public ListPartSettingsDisplayDriver(
+        IContentDefinitionManager contentDefinitionManager,
+        IContainerService containerService,
+        IStringLocalizer<ListPartSettingsDisplayDriver> localizer)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+        _containerService = containerService;
+        S = localizer;
+    }
 
-        public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    {
+        return Initialize<ListPartSettingsViewModel>("ListPartSettings_Edit", async model =>
         {
-            return Initialize<ListPartSettingsViewModel>("ListPartSettings_Edit", async model =>
-            {
-                model.ListPartSettings = contentTypePartDefinition.GetSettings<ListPartSettings>();
-                model.PageSize = model.ListPartSettings.PageSize;
-                model.EnableOrdering = model.ListPartSettings.EnableOrdering;
-                model.ContainedContentTypes = model.ListPartSettings.ContainedContentTypes;
-                model.ShowHeader = model.ListPartSettings.ShowHeader;
-                model.ContentTypes = [];
+            model.ListPartSettings = contentTypePartDefinition.GetSettings<ListPartSettings>();
+            model.PageSize = model.ListPartSettings.PageSize;
+            model.EnableOrdering = model.ListPartSettings.EnableOrdering;
+            model.ContainedContentTypes = model.ListPartSettings.ContainedContentTypes;
+            model.ShowHeader = model.ListPartSettings.ShowHeader;
+            model.ContentTypes = [];
 
-                foreach (var contentTypeDefinition in await _contentDefinitionManager.ListTypeDefinitionsAsync())
-                {
-                    model.ContentTypes.Add(contentTypeDefinition.Name, contentTypeDefinition.DisplayName);
-                }
-            }).Location("Content");
-        }
+            foreach (var contentTypeDefinition in await _contentDefinitionManager.ListTypeDefinitionsAsync())
+            {
+                model.ContentTypes.Add(contentTypeDefinition.Name, contentTypeDefinition.DisplayName);
+            }
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
-        {
-            var settings = contentTypePartDefinition.GetSettings<ListPartSettings>();
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    {
+        var settings = contentTypePartDefinition.GetSettings<ListPartSettings>();
 
-            var model = new ListPartSettingsViewModel();
+        var model = new ListPartSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix, m => m.ContainedContentTypes, m => m.PageSize, m => m.EnableOrdering, m => m.ShowHeader);
+        await context.Updater.TryUpdateModelAsync(model, Prefix, m => m.ContainedContentTypes, m => m.PageSize, m => m.EnableOrdering, m => m.ShowHeader);
 
-            if (model.ContainedContentTypes == null || model.ContainedContentTypes.Length == 0)
-            {
-                context.Updater.ModelState.AddModelError(nameof(model.ContainedContentTypes), S["At least one content type must be selected."]);
-            }
-            else
+        if (model.ContainedContentTypes == null || model.ContainedContentTypes.Length == 0)
+        {
+            context.Updater.ModelState.AddModelError(nameof(model.ContainedContentTypes), S["At least one content type must be selected."]);
+        }
+        else
+        {
+            context.Builder.WithSettings(new ListPartSettings
             {
-                context.Builder.WithSettings(new ListPartSettings
-                {
-                    PageSize = model.PageSize,
-                    EnableOrdering = model.EnableOrdering,
-                    ContainedContentTypes = model.ContainedContentTypes,
-                    ShowHeader = model.ShowHeader,
-                });
+                PageSize = model.PageSize,
+                EnableOrdering = model.EnableOrdering,
+                ContainedContentTypes = model.ContainedContentTypes,
+                ShowHeader = model.ShowHeader,
+            });
 
-                // Update order of existing content if enable ordering has been turned on.
-                if (settings.EnableOrdering != model.EnableOrdering && model.EnableOrdering == true)
-                {
-                    await _containerService.SetInitialOrder(contentTypePartDefinition.ContentTypeDefinition.Name);
-                }
+            // Update order of existing content if enable ordering has been turned on.
+            if (settings.EnableOrdering != model.EnableOrdering && model.EnableOrdering == true)
+            {
+                await _containerService.SetInitialOrder(contentTypePartDefinition.ContentTypeDefinition.Name);
             }
-
-            return Edit(contentTypePartDefinition, context);
         }
+
+        return Edit(contentTypePartDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Startup.cs
index 5803715c24f..518da3a2259 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/Startup.cs
@@ -30,80 +30,79 @@
 using OrchardCore.Lists.ViewModels;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Lists
+namespace OrchardCore.Lists;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<ListPartViewModel>();
-            })
-            .AddLiquidFilter<ListCountFilter>("list_count")
-            .AddLiquidFilter<ListItemsFilter>("list_items")
-            .AddLiquidFilter<ContainerFilter>("container");
+            o.MemberAccessStrategy.Register<ListPartViewModel>();
+        })
+        .AddLiquidFilter<ListCountFilter>("list_count")
+        .AddLiquidFilter<ListItemsFilter>("list_items")
+        .AddLiquidFilter<ContainerFilter>("container");
 
-            services.AddIndexProvider<ContainedPartIndexProvider>();
-            services.AddScoped<IContentDisplayDriver, ContainedPartDisplayDriver>();
-            services.AddScoped<IContentHandler, ContainedPartHandler>();
-            services.AddContentPart<ContainedPart>();
-            services.AddScoped<IContentsAdminListFilter, ListPartContentsAdminListFilter>();
-            services.AddScoped<IDisplayDriver<ContentOptionsViewModel>, ListPartContentsAdminListDisplayDriver>();
+        services.AddIndexProvider<ContainedPartIndexProvider>();
+        services.AddScoped<IContentDisplayDriver, ContainedPartDisplayDriver>();
+        services.AddScoped<IContentHandler, ContainedPartHandler>();
+        services.AddContentPart<ContainedPart>();
+        services.AddScoped<IContentsAdminListFilter, ListPartContentsAdminListFilter>();
+        services.AddScoped<IDisplayDriver<ContentOptionsViewModel>, ListPartContentsAdminListDisplayDriver>();
 
-            // List Part
-            services.AddContentPart<ListPart>()
-                .UseDisplayDriver<ListPartDisplayDriver>()
-                .AddHandler<ListPartHandler>();
+        // List Part
+        services.AddContentPart<ListPart>()
+            .UseDisplayDriver<ListPartDisplayDriver>()
+            .AddHandler<ListPartHandler>();
 
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, ListPartSettingsDisplayDriver>();
-            services.AddDataMigration<Migrations>();
-            services.AddScoped<IContentItemIndexHandler, ContainedPartContentIndexHandler>();
-            services.AddScoped<IContainerService, ContainerService>();
-        }
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, ListPartSettingsDisplayDriver>();
+        services.AddDataMigration<Migrations>();
+        services.AddScoped<IContentItemIndexHandler, ContainedPartContentIndexHandler>();
+        services.AddScoped<IContainerService, ContainerService>();
     }
+}
 
-    [RequireFeatures("OrchardCore.AdminMenu")]
-    public sealed class AdminMenuStartup : StartupBase
+[RequireFeatures("OrchardCore.AdminMenu")]
+public sealed class AdminMenuStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddAdminNode<ListsAdminNode, ListsAdminNodeNavigationBuilder, ListsAdminNodeDriver>();
-        }
+        services.AddAdminNode<ListsAdminNode, ListsAdminNodeNavigationBuilder, ListsAdminNodeDriver>();
     }
+}
 
-    [RequireFeatures("OrchardCore.ContentLocalization")]
-    public sealed class ContentLocalizationStartup : StartupBase
+[RequireFeatures("OrchardCore.ContentLocalization")]
+public sealed class ContentLocalizationStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IContentLocalizationPartHandler, ContainedPartLocalizationHandler>();
-            services.AddScoped<IContentLocalizationPartHandler, ListPartLocalizationHandler>();
-            services.AddContentPart<LocalizationPart>()
-                .AddHandler<LocalizationContainedPartHandler>();
-        }
+        services.AddScoped<IContentLocalizationPartHandler, ContainedPartLocalizationHandler>();
+        services.AddScoped<IContentLocalizationPartHandler, ListPartLocalizationHandler>();
+        services.AddContentPart<LocalizationPart>()
+            .AddHandler<LocalizationContainedPartHandler>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Feeds")]
-    public sealed class FeedsStartup : StartupBase
+[RequireFeatures("OrchardCore.Feeds")]
+public sealed class FeedsStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            // Feeds
-            services.AddScoped<IFeedQueryProvider, ListFeedQuery>();
+        // Feeds
+        services.AddScoped<IFeedQueryProvider, ListFeedQuery>();
 
-            services.AddContentPart<ListPart>()
-                .UseDisplayDriver<ListPartFeedDisplayDriver>()
-                .AddHandler<ListPartFeedHandler>();
-        }
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            routes.MapAreaControllerRoute(
-                name: "ListFeed",
-                areaName: "OrchardCore.Feeds",
-                pattern: "Contents/Lists/{contentItemId}/rss",
-                defaults: new { controller = "Feed", action = "Index", format = "rss" }
-            );
-        }
+        services.AddContentPart<ListPart>()
+            .UseDisplayDriver<ListPartFeedDisplayDriver>()
+            .AddHandler<ListPartFeedHandler>();
+    }
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        routes.MapAreaControllerRoute(
+            name: "ListFeed",
+            areaName: "OrchardCore.Feeds",
+            pattern: "Contents/Lists/{contentItemId}/rss",
+            defaults: new { controller = "Feed", action = "Index", format = "rss" }
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/EditContainedPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/EditContainedPartViewModel.cs
index 2c850fca05b..755fad2db46 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/EditContainedPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/EditContainedPartViewModel.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.Lists.ViewModels
+namespace OrchardCore.Lists.ViewModels;
+
+public class EditContainedPartViewModel
 {
-    public class EditContainedPartViewModel
-    {
-        public string ContainerId { get; set; }
-        public string ContainerContentType { get; set; }
-        public string ContentType { get; set; }
-        public bool EnableOrdering { get; set; }
-    }
+    public string ContainerId { get; set; }
+    public string ContainerContentType { get; set; }
+    public string ContentType { get; set; }
+    public bool EnableOrdering { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/ListPartContentsAdminFilterViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/ListPartContentsAdminFilterViewModel.cs
index 4b53f9e3898..af4a9e09e5b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/ListPartContentsAdminFilterViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/ListPartContentsAdminFilterViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Lists.ViewModels
+namespace OrchardCore.Lists.ViewModels;
+
+public class ListPartContentsAdminFilterViewModel
 {
-    public class ListPartContentsAdminFilterViewModel
-    {
-        public bool ShowListContentTypes { get; set; }
-        public string ListContentItemId { get; set; }
-    }
+    public bool ShowListContentTypes { get; set; }
+    public string ListContentItemId { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/ListPartFilterViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/ListPartFilterViewModel.cs
index 364a821394c..122ffec63b0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/ListPartFilterViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/ListPartFilterViewModel.cs
@@ -1,10 +1,9 @@
 using OrchardCore.Lists.Models;
 
-namespace OrchardCore.Lists.ViewModels
+namespace OrchardCore.Lists.ViewModels;
+
+public class ListPartFilterViewModel
 {
-    public class ListPartFilterViewModel
-    {
-        public string DisplayText { get; set; }
-        public ContentsStatus Status { get; set; } = ContentsStatus.Latest;
-    }
+    public string DisplayText { get; set; }
+    public ContentsStatus Status { get; set; } = ContentsStatus.Latest;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/ListPartSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/ListPartSettingsViewModel.cs
index da07ba8482d..8fb3f38d859 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/ListPartSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/ListPartSettingsViewModel.cs
@@ -1,15 +1,14 @@
 using System.Collections.Specialized;
 using OrchardCore.Lists.Models;
 
-namespace OrchardCore.Lists.ViewModels
+namespace OrchardCore.Lists.ViewModels;
+
+public class ListPartSettingsViewModel
 {
-    public class ListPartSettingsViewModel
-    {
-        public ListPartSettings ListPartSettings { get; set; }
-        public NameValueCollection ContentTypes { get; set; }
-        public string[] ContainedContentTypes { get; set; }
-        public int PageSize { get; set; }
-        public bool EnableOrdering { get; set; }
-        public bool ShowHeader { get; set; }
-    }
+    public ListPartSettings ListPartSettings { get; set; }
+    public NameValueCollection ContentTypes { get; set; }
+    public string[] ContainedContentTypes { get; set; }
+    public int PageSize { get; set; }
+    public bool EnableOrdering { get; set; }
+    public bool ShowHeader { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/ListPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/ListPartViewModel.cs
index 02075a30e24..e4a478ce302 100644
--- a/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/ListPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Lists/ViewModels/ListPartViewModel.cs
@@ -4,16 +4,15 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Lists.Models;
 
-namespace OrchardCore.Lists.ViewModels
+namespace OrchardCore.Lists.ViewModels;
+
+public class ListPartViewModel
 {
-    public class ListPartViewModel
-    {
-        public ListPartFilterViewModel ListPartFilterViewModel { get; set; }
-        public ListPart ListPart { get; set; }
-        public IEnumerable<ContentItem> ContentItems { get; set; }
-        public IEnumerable<ContentTypeDefinition> ContainedContentTypeDefinitions { get; set; }
-        public BuildPartDisplayContext Context { get; set; }
-        public dynamic Pager { get; set; }
-        public bool EnableOrdering { get; set; }
-    }
+    public ListPartFilterViewModel ListPartFilterViewModel { get; set; }
+    public ListPart ListPart { get; set; }
+    public IEnumerable<ContentItem> ContentItems { get; set; }
+    public IEnumerable<ContentTypeDefinition> ContainedContentTypeDefinitions { get; set; }
+    public BuildPartDisplayContext Context { get; set; }
+    public dynamic Pager { get; set; }
+    public bool EnableOrdering { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs
index 42b664ac3b0..da14456cb13 100644
--- a/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs
@@ -4,56 +4,55 @@
 using OrchardCore.Localization.Drivers;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents a localization menu in the admin site.
+/// </summary>
+public sealed class AdminMenu : INavigationProvider
 {
+    private static readonly RouteValueDictionary _routeValues = new()
+    {
+        { "area", "OrchardCore.Settings" },
+        { "groupId", LocalizationSettingsDisplayDriver.GroupId },
+    };
+
+    internal readonly IStringLocalizer S;
+
     /// <summary>
-    /// Represents a localization menu in the admin site.
+    /// Creates a new instance of the <see cref="AdminMenu"/>.
     /// </summary>
-    public sealed class AdminMenu : INavigationProvider
+    /// <param name="localizer">The <see cref="IStringLocalizer"/>.</param>
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", LocalizationSettingsDisplayDriver.GroupId },
-        };
-
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        /// <summary>
-        /// Creates a new instance of the <see cref="AdminMenu"/>.
-        /// </summary>
-        /// <param name="localizer">The <see cref="IStringLocalizer"/>.</param>
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    /// <inheritdocs />
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        /// <inheritdocs />
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["Settings"], settings => settings
-                        .Add(S["Localization"], localization => localization
-                            .AddClass("localization")
-                            .Id("localization")
-                            .Add(S["Cultures"], S["Cultures"].PrefixPosition(), cultures => cultures
-                                .AddClass("cultures")
-                                .Id("cultures")
-                                .Action("Index", "Admin", _routeValues)
-                                .Permission(Permissions.ManageCultures)
-                                .LocalNav()
-                            )
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["Settings"], settings => settings
+                    .Add(S["Localization"], localization => localization
+                        .AddClass("localization")
+                        .Id("localization")
+                        .Add(S["Cultures"], S["Cultures"].PrefixPosition(), cultures => cultures
+                            .AddClass("cultures")
+                            .Id("cultures")
+                            .Action("Index", "Admin", _routeValues)
+                            .Permission(Permissions.ManageCultures)
+                            .LocalNav()
                         )
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/Drivers/LocalizationSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Localization/Drivers/LocalizationSettingsDisplayDriver.cs
index 4ea3c8ee443..b9feeab7b28 100644
--- a/src/OrchardCore.Modules/OrchardCore.Localization/Drivers/LocalizationSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Localization/Drivers/LocalizationSettingsDisplayDriver.cs
@@ -16,121 +16,120 @@
 using OrchardCore.Localization.ViewModels;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Localization.Drivers
+namespace OrchardCore.Localization.Drivers;
+
+/// <summary>
+/// Represents a <see cref="SectionDisplayDriver{TModel,TSection}"/> for the localization settings section in the admin site.
+/// </summary>
+public sealed class LocalizationSettingsDisplayDriver : SiteDisplayDriver<LocalizationSettings>
 {
-    /// <summary>
-    /// Represents a <see cref="SectionDisplayDriver{TModel,TSection}"/> for the localization settings section in the admin site.
-    /// </summary>
-    public sealed class LocalizationSettingsDisplayDriver : SiteDisplayDriver<LocalizationSettings>
+    public const string GroupId = "localization";
+
+    private readonly IShellReleaseManager _shellReleaseManager;
+    private readonly INotifier _notifier;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly CultureOptions _cultureOptions;
+
+    internal readonly IHtmlLocalizer H;
+    internal readonly IStringLocalizer S;
+
+    protected override string SettingsGroupId
+        => GroupId;
+
+    public LocalizationSettingsDisplayDriver(
+        IShellReleaseManager shellReleaseManager,
+        INotifier notifier,
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService,
+        IOptions<CultureOptions> cultureOptions,
+        IHtmlLocalizer<LocalizationSettingsDisplayDriver> htmlLocalizer,
+        IStringLocalizer<LocalizationSettingsDisplayDriver> stringLocalizer
+    )
+    {
+        _shellReleaseManager = shellReleaseManager;
+        _notifier = notifier;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+        _cultureOptions = cultureOptions.Value;
+        H = htmlLocalizer;
+        S = stringLocalizer;
+    }
+
+    /// <inheritdocs />
+    public override async Task<IDisplayResult> EditAsync(ISite site, LocalizationSettings settings, BuildEditorContext context)
     {
-        public const string GroupId = "localization";
-
-        private readonly IShellReleaseManager _shellReleaseManager;
-        private readonly INotifier _notifier;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly CultureOptions _cultureOptions;
-
-        internal readonly IHtmlLocalizer H;
-        internal readonly IStringLocalizer S;
-
-        protected override string SettingsGroupId
-            => GroupId;
-
-        public LocalizationSettingsDisplayDriver(
-            IShellReleaseManager shellReleaseManager,
-            INotifier notifier,
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService,
-            IOptions<CultureOptions> cultureOptions,
-            IHtmlLocalizer<LocalizationSettingsDisplayDriver> htmlLocalizer,
-            IStringLocalizer<LocalizationSettingsDisplayDriver> stringLocalizer
-        )
+        var user = _httpContextAccessor.HttpContext?.User;
+
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageCultures))
         {
-            _shellReleaseManager = shellReleaseManager;
-            _notifier = notifier;
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-            _cultureOptions = cultureOptions.Value;
-            H = htmlLocalizer;
-            S = stringLocalizer;
+            return null;
         }
 
-        /// <inheritdocs />
-        public override async Task<IDisplayResult> EditAsync(ISite site, LocalizationSettings settings, BuildEditorContext context)
+        context.AddTenantReloadWarningWrapper();
+
+        return Initialize<LocalizationSettingsViewModel>("LocalizationSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
+            model.Cultures = ILocalizationService.GetAllCulturesAndAliases()
+                .Select(cultureInfo =>
+                {
+                    return new CultureEntry
+                    {
+                        Supported = settings.SupportedCultures.Contains(cultureInfo.Name, StringComparer.OrdinalIgnoreCase),
+                        CultureInfo = cultureInfo,
+                        IsDefault = string.Equals(settings.DefaultCulture, cultureInfo.Name, StringComparison.OrdinalIgnoreCase)
+                    };
+                }).ToArray();
 
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageCultures))
+            if (!model.Cultures.Any(x => x.IsDefault))
             {
-                return null;
+                model.Cultures[0].IsDefault = true;
             }
+        }).Location("Content:2")
+        .OnGroup(SettingsGroupId);
+    }
 
-            context.AddTenantReloadWarningWrapper();
+    /// <inheritdocs />
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, LocalizationSettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-            return Initialize<LocalizationSettingsViewModel>("LocalizationSettings_Edit", model =>
-            {
-                model.Cultures = ILocalizationService.GetAllCulturesAndAliases()
-                    .Select(cultureInfo =>
-                    {
-                        return new CultureEntry
-                        {
-                            Supported = settings.SupportedCultures.Contains(cultureInfo.Name, StringComparer.OrdinalIgnoreCase),
-                            CultureInfo = cultureInfo,
-                            IsDefault = string.Equals(settings.DefaultCulture, cultureInfo.Name, StringComparison.OrdinalIgnoreCase)
-                        };
-                    }).ToArray();
-
-                if (!model.Cultures.Any(x => x.IsDefault))
-                {
-                    model.Cultures[0].IsDefault = true;
-                }
-            }).Location("Content:2")
-            .OnGroup(SettingsGroupId);
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageCultures))
+        {
+            return null;
         }
 
-        /// <inheritdocs />
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, LocalizationSettings settings, UpdateEditorContext context)
-        {
-            var user = _httpContextAccessor.HttpContext?.User;
+        var model = new LocalizationSettingsViewModel();
 
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageCultures))
-            {
-                return null;
-            }
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            var model = new LocalizationSettingsViewModel();
+        var supportedCulture = JConvert.DeserializeObject<string[]>(model.SupportedCultures);
+        if (supportedCulture.Length == 0)
+        {
+            context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
+        }
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        if (context.Updater.ModelState.IsValid)
+        {
+            // Invariant culture name is empty so a null value is bound.
+            settings.DefaultCulture = model.DefaultCulture ?? string.Empty;
+            settings.SupportedCultures = supportedCulture;
 
-            var supportedCulture = JConvert.DeserializeObject<string[]>(model.SupportedCultures);
-            if (supportedCulture.Length == 0)
+            if (!settings.SupportedCultures.Contains(settings.DefaultCulture))
             {
-                context.Updater.ModelState.AddModelError("SupportedCultures", S["A culture is required"]);
+                settings.DefaultCulture = settings.SupportedCultures[0];
             }
 
-            if (context.Updater.ModelState.IsValid)
-            {
-                // Invariant culture name is empty so a null value is bound.
-                settings.DefaultCulture = model.DefaultCulture ?? string.Empty;
-                settings.SupportedCultures = supportedCulture;
-
-                if (!settings.SupportedCultures.Contains(settings.DefaultCulture))
-                {
-                    settings.DefaultCulture = settings.SupportedCultures[0];
-                }
-
-                // We always release the tenant for the default culture and also supported cultures to take effect.
-                _shellReleaseManager.RequestRelease();
+            // We always release the tenant for the default culture and also supported cultures to take effect.
+            _shellReleaseManager.RequestRelease();
 
-                // We create a transient scope with the newly selected culture to create a notification that will use it instead of the previous culture.
-                using (CultureScope.Create(settings.DefaultCulture, ignoreSystemSettings: _cultureOptions.IgnoreSystemSettings))
-                {
-                    await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
-                }
+            // We create a transient scope with the newly selected culture to create a notification that will use it instead of the previous culture.
+            using (CultureScope.Create(settings.DefaultCulture, ignoreSystemSettings: _cultureOptions.IgnoreSystemSettings))
+            {
+                await _notifier.WarningAsync(H["The site has been restarted for the settings to take effect."]);
             }
-
-            return await EditAsync(site, settings, context);
         }
+
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/GraphQL/CultureQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Localization/GraphQL/CultureQueryObjectType.cs
index 30d9a0d2a83..b436eb8b2b8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Localization/GraphQL/CultureQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Localization/GraphQL/CultureQueryObjectType.cs
@@ -1,21 +1,20 @@
 using GraphQL.Types;
 
-namespace OrchardCore.Localization.GraphQL
+namespace OrchardCore.Localization.GraphQL;
+
+/// <summary>
+/// Represents a culture object for Graph QL.
+/// </summary>
+public class CultureQueryObjectType : ObjectGraphType<SiteCulture>
 {
     /// <summary>
-    /// Represents a culture object for Graph QL.
+    /// Creates a new instance of <see cref="CultureQueryObjectType"/>.
     /// </summary>
-    public class CultureQueryObjectType : ObjectGraphType<SiteCulture>
+    public CultureQueryObjectType()
     {
-        /// <summary>
-        /// Creates a new instance of <see cref="CultureQueryObjectType"/>.
-        /// </summary>
-        public CultureQueryObjectType()
-        {
-            Name = "SiteCulture";
+        Name = "SiteCulture";
 
-            Field<StringGraphType>("culture").Description("The culture code.").Resolve(context => context.Source.Culture);
-            Field<BooleanGraphType>("default").Description("Whether this is the default culture.").Resolve(context => context.Source.IsDefault);
-        }
+        Field<StringGraphType>("culture").Description("The culture code.").Resolve(context => context.Source.Culture);
+        Field<BooleanGraphType>("default").Description("Whether this is the default culture.").Resolve(context => context.Source.IsDefault);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/GraphQL/SiteCulture.cs b/src/OrchardCore.Modules/OrchardCore.Localization/GraphQL/SiteCulture.cs
index 1c776292532..8e0d5e0ee8f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Localization/GraphQL/SiteCulture.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Localization/GraphQL/SiteCulture.cs
@@ -1,18 +1,17 @@
-namespace OrchardCore.Localization.GraphQL
+namespace OrchardCore.Localization.GraphQL;
+
+/// <summary>
+/// Represents a culture for the site.
+/// </summary>
+public class SiteCulture
 {
     /// <summary>
-    /// Represents a culture for the site.
+    /// Gets or sets a culture.
     /// </summary>
-    public class SiteCulture
-    {
-        /// <summary>
-        /// Gets or sets a culture.
-        /// </summary>
-        public string Culture { get; set; }
+    public string Culture { get; set; }
 
-        /// <summary>
-        /// Gets or sets whether the <see cref="Culture"/> is used as default one.
-        /// </summary>
-        public bool IsDefault { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets whether the <see cref="Culture"/> is used as default one.
+    /// </summary>
+    public bool IsDefault { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/GraphQL/SiteCulturesQuery.cs b/src/OrchardCore.Modules/OrchardCore.Localization/GraphQL/SiteCulturesQuery.cs
index a6c76859b2c..0af512b0a9e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Localization/GraphQL/SiteCulturesQuery.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Localization/GraphQL/SiteCulturesQuery.cs
@@ -11,69 +11,68 @@
 using OrchardCore.Apis.GraphQL.Resolvers;
 using OrchardCore.ContentManagement.GraphQL.Options;
 
-namespace OrchardCore.Localization.GraphQL
+namespace OrchardCore.Localization.GraphQL;
+
+/// <summary>
+/// Represents a site cultures for Graph QL.
+/// </summary>
+public class SiteCulturesQuery : ISchemaBuilder
 {
+    protected readonly IStringLocalizer S;
+    private readonly GraphQLContentOptions _graphQLContentOptions;
+
     /// <summary>
-    /// Represents a site cultures for Graph QL.
+    /// Creates a new instance of the <see cref="SiteCulturesQuery"/>.
     /// </summary>
-    public class SiteCulturesQuery : ISchemaBuilder
+    /// <param name="localizer">The <see cref="IStringLocalizer"/>.</param>
+    /// <param name="graphQLContentOptions">The <see cref="GraphQLContentOptions"/>.</param>
+    /// 
+    public SiteCulturesQuery(
+        IStringLocalizer<SiteCulturesQuery> localizer,
+        IOptions<GraphQLContentOptions> graphQLContentOptions)
     {
-        protected readonly IStringLocalizer S;
-        private readonly GraphQLContentOptions _graphQLContentOptions;
+        S = localizer;
+        _graphQLContentOptions = graphQLContentOptions.Value;
+    }
+
+    public Task<string> GetIdentifierAsync() => Task.FromResult(string.Empty);
 
-        /// <summary>
-        /// Creates a new instance of the <see cref="SiteCulturesQuery"/>.
-        /// </summary>
-        /// <param name="localizer">The <see cref="IStringLocalizer"/>.</param>
-        /// <param name="graphQLContentOptions">The <see cref="GraphQLContentOptions"/>.</param>
-        /// 
-        public SiteCulturesQuery(
-            IStringLocalizer<SiteCulturesQuery> localizer,
-            IOptions<GraphQLContentOptions> graphQLContentOptions)
+    /// <inheritdocs/>
+    public Task BuildAsync(ISchema schema)
+    {
+        if (_graphQLContentOptions.IsHiddenByDefault("SiteCultures"))
         {
-            S = localizer;
-            _graphQLContentOptions = graphQLContentOptions.Value;
+            return Task.CompletedTask;
         }
 
-        public Task<string> GetIdentifierAsync() => Task.FromResult(string.Empty);
-
-        /// <inheritdocs/>
-        public Task BuildAsync(ISchema schema)
+        var field = new FieldType
         {
-            if (_graphQLContentOptions.IsHiddenByDefault("SiteCultures"))
-            {
-                return Task.CompletedTask;
-            }
+            Name = "SiteCultures",
+            Description = S["The active cultures configured for the site."],
+            Type = typeof(ListGraphType<CultureQueryObjectType>),
+            Resolver = new LockedAsyncFieldResolver<IEnumerable<SiteCulture>>(ResolveAsync)
+        };
 
-            var field = new FieldType
-            {
-                Name = "SiteCultures",
-                Description = S["The active cultures configured for the site."],
-                Type = typeof(ListGraphType<CultureQueryObjectType>),
-                Resolver = new LockedAsyncFieldResolver<IEnumerable<SiteCulture>>(ResolveAsync)
-            };
+        schema.Query.AddField(field);
 
-            schema.Query.AddField(field);
-
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
+    }
 
-        private async ValueTask<IEnumerable<SiteCulture>> ResolveAsync(IResolveFieldContext resolveContext)
-        {
-            var localizationService = resolveContext.RequestServices.GetService<ILocalizationService>();
+    private async ValueTask<IEnumerable<SiteCulture>> ResolveAsync(IResolveFieldContext resolveContext)
+    {
+        var localizationService = resolveContext.RequestServices.GetService<ILocalizationService>();
 
-            var defaultCulture = await localizationService.GetDefaultCultureAsync();
-            var supportedCultures = await localizationService.GetSupportedCulturesAsync();
+        var defaultCulture = await localizationService.GetDefaultCultureAsync();
+        var supportedCultures = await localizationService.GetSupportedCulturesAsync();
 
-            var cultures = supportedCultures.Select(culture =>
-               new SiteCulture
-               {
-                   Culture = culture,
-                   IsDefault = string.Equals(defaultCulture, culture, StringComparison.OrdinalIgnoreCase),
-               }
-           );
+        var cultures = supportedCultures.Select(culture =>
+           new SiteCulture
+           {
+               Culture = culture,
+               IsDefault = string.Equals(defaultCulture, culture, StringComparison.OrdinalIgnoreCase),
+           }
+       );
 
-            return cultures;
-        }
+        return cultures;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Localization/GraphQL/Startup.cs
index c1bb967574e..e5fb1e8486a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Localization/GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Localization/GraphQL/Startup.cs
@@ -2,19 +2,18 @@
 using OrchardCore.Apis.GraphQL;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Localization.GraphQL
+namespace OrchardCore.Localization.GraphQL;
+
+/// <summary>
+/// Represents the localization module entry point for Graph QL.
+/// </summary>
+[RequireFeatures("OrchardCore.Apis.GraphQL")]
+public sealed class Startup : StartupBase
 {
-    /// <summary>
-    /// Represents the localization module entry point for Graph QL.
-    /// </summary>
-    [RequireFeatures("OrchardCore.Apis.GraphQL")]
-    public sealed class Startup : StartupBase
+    /// <inheritdocs />
+    public override void ConfigureServices(IServiceCollection services)
     {
-        /// <inheritdocs />
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSingleton<ISchemaBuilder, SiteCulturesQuery>();
-            services.AddTransient<CultureQueryObjectType>();
-        }
+        services.AddSingleton<ISchemaBuilder, SiteCulturesQuery>();
+        services.AddTransient<CultureQueryObjectType>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/Models/CultureEntry.cs b/src/OrchardCore.Modules/OrchardCore.Localization/Models/CultureEntry.cs
index c2b28cd7213..5c0226bfaf9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Localization/Models/CultureEntry.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Localization/Models/CultureEntry.cs
@@ -1,25 +1,24 @@
 using System.Globalization;
 
-namespace OrchardCore.Localization.Models
+namespace OrchardCore.Localization.Models;
+
+/// <summary>
+/// Represents a culture entry.
+/// </summary>
+public class CultureEntry
 {
     /// <summary>
-    /// Represents a culture entry.
+    /// Gets or sets the <see cref="CultureInfo"/> instance for the current culture entry.
     /// </summary>
-    public class CultureEntry
-    {
-        /// <summary>
-        /// Gets or sets the <see cref="CultureInfo"/> instance for the current culture entry.
-        /// </summary>
-        public CultureInfo CultureInfo { get; set; }
+    public CultureInfo CultureInfo { get; set; }
 
-        /// <summary>
-        /// Gets or sets whether the culture is the default one.
-        /// </summary>
-        public bool IsDefault { get; set; }
+    /// <summary>
+    /// Gets or sets whether the culture is the default one.
+    /// </summary>
+    public bool IsDefault { get; set; }
 
-        /// <summary>
-        /// Gets or sets whether the culture is supported.
-        /// </summary>
-        public bool Supported { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets whether the culture is supported.
+    /// </summary>
+    public bool Supported { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/Models/LocalizationSettings.cs b/src/OrchardCore.Modules/OrchardCore.Localization/Models/LocalizationSettings.cs
index 8687da289a8..c3e9526d716 100644
--- a/src/OrchardCore.Modules/OrchardCore.Localization/Models/LocalizationSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Localization/Models/LocalizationSettings.cs
@@ -1,31 +1,30 @@
 using System.Globalization;
 
-namespace OrchardCore.Localization.Models
+namespace OrchardCore.Localization.Models;
+
+/// <summary>
+/// Represents an object to store the localization settings.
+/// </summary>
+public class LocalizationSettings
 {
+    private static readonly string[] _defaultSupportedCultures = [CultureInfo.InstalledUICulture.Name];
+
     /// <summary>
-    /// Represents an object to store the localization settings.
+    /// Creates a new instance of the <see cref="LocalizationSettings"/>.
     /// </summary>
-    public class LocalizationSettings
+    public LocalizationSettings()
     {
-        private static readonly string[] _defaultSupportedCultures = [CultureInfo.InstalledUICulture.Name];
-
-        /// <summary>
-        /// Creates a new instance of the <see cref="LocalizationSettings"/>.
-        /// </summary>
-        public LocalizationSettings()
-        {
-            DefaultCulture = CultureInfo.InstalledUICulture.Name;
-            SupportedCultures = _defaultSupportedCultures;
-        }
+        DefaultCulture = CultureInfo.InstalledUICulture.Name;
+        SupportedCultures = _defaultSupportedCultures;
+    }
 
-        /// <summary>
-        /// Gets or sets the default culture of the site.
-        /// </summary>
-        public string DefaultCulture { get; set; }
+    /// <summary>
+    /// Gets or sets the default culture of the site.
+    /// </summary>
+    public string DefaultCulture { get; set; }
 
-        /// <summary>
-        /// Gets or sets all the supported cultures of the site. It also contains the default culture.
-        /// </summary>
-        public string[] SupportedCultures { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets all the supported cultures of the site. It also contains the default culture.
+    /// </summary>
+    public string[] SupportedCultures { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/ModularPoFileLocationProvider.cs b/src/OrchardCore.Modules/OrchardCore.Localization/ModularPoFileLocationProvider.cs
index f5b07929a0f..4ba639c56bb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Localization/ModularPoFileLocationProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Localization/ModularPoFileLocationProvider.cs
@@ -8,80 +8,79 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Environment.Shell;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents a localization provider to provide the locations of the modules PO files.
+/// </summary>
+public class ModularPoFileLocationProvider : ILocalizationFileLocationProvider
 {
+    private const string PoFileExtension = ".po";
+    private const string CultureDelimiter = "-";
+
+    private readonly IExtensionManager _extensionsManager;
+    private readonly IFileProvider _fileProvider;
+    private readonly string _resourcesContainer;
+    private readonly string _applicationDataContainer;
+    private readonly string _shellDataContainer;
+
     /// <summary>
-    /// Represents a localization provider to provide the locations of the modules PO files.
+    /// Creates a new intance of the <see cref="ModularPoFileLocationProvider"/>.
     /// </summary>
-    public class ModularPoFileLocationProvider : ILocalizationFileLocationProvider
+    /// <param name="extensionsManager">The <see cref="IExtensionManager"/>.</param>
+    /// <param name="hostingEnvironment">The <see cref="IHostEnvironment"/>.</param>
+    /// <param name="shellOptions">The <see cref="ShellOptions"/>.</param>
+    /// <param name="localizationOptions">The <see cref="LocalizationOptions"/>.</param>
+    /// <param name="shellSettings">The <see cref="ShellSettings"/>.</param>
+    public ModularPoFileLocationProvider(
+        IExtensionManager extensionsManager,
+        IHostEnvironment hostingEnvironment,
+        IOptions<ShellOptions> shellOptions,
+        IOptions<LocalizationOptions> localizationOptions,
+        ShellSettings shellSettings)
     {
-        private const string PoFileExtension = ".po";
-        private const string CultureDelimiter = "-";
-
-        private readonly IExtensionManager _extensionsManager;
-        private readonly IFileProvider _fileProvider;
-        private readonly string _resourcesContainer;
-        private readonly string _applicationDataContainer;
-        private readonly string _shellDataContainer;
+        _extensionsManager = extensionsManager;
 
-        /// <summary>
-        /// Creates a new intance of the <see cref="ModularPoFileLocationProvider"/>.
-        /// </summary>
-        /// <param name="extensionsManager">The <see cref="IExtensionManager"/>.</param>
-        /// <param name="hostingEnvironment">The <see cref="IHostEnvironment"/>.</param>
-        /// <param name="shellOptions">The <see cref="ShellOptions"/>.</param>
-        /// <param name="localizationOptions">The <see cref="LocalizationOptions"/>.</param>
-        /// <param name="shellSettings">The <see cref="ShellSettings"/>.</param>
-        public ModularPoFileLocationProvider(
-            IExtensionManager extensionsManager,
-            IHostEnvironment hostingEnvironment,
-            IOptions<ShellOptions> shellOptions,
-            IOptions<LocalizationOptions> localizationOptions,
-            ShellSettings shellSettings)
-        {
-            _extensionsManager = extensionsManager;
+        _fileProvider = hostingEnvironment.ContentRootFileProvider;
+        _resourcesContainer = localizationOptions.Value.ResourcesPath;
+        _applicationDataContainer = shellOptions.Value.ShellsApplicationDataPath;
+        _shellDataContainer = PathExtensions.Combine(_applicationDataContainer, shellOptions.Value.ShellsContainerName, shellSettings.Name);
+    }
 
-            _fileProvider = hostingEnvironment.ContentRootFileProvider;
-            _resourcesContainer = localizationOptions.Value.ResourcesPath;
-            _applicationDataContainer = shellOptions.Value.ShellsApplicationDataPath;
-            _shellDataContainer = PathExtensions.Combine(_applicationDataContainer, shellOptions.Value.ShellsContainerName, shellSettings.Name);
-        }
+    /// <inheritdocs />
+    public IEnumerable<IFileInfo> GetLocations(string cultureName)
+    {
+        var poFileName = cultureName + PoFileExtension;
+        var extensions = _extensionsManager.GetExtensions();
 
-        /// <inheritdocs />
-        public IEnumerable<IFileInfo> GetLocations(string cultureName)
+        // Load .po files in each extension folder first, based on the extensions order
+        foreach (var extension in extensions)
         {
-            var poFileName = cultureName + PoFileExtension;
-            var extensions = _extensionsManager.GetExtensions();
-
-            // Load .po files in each extension folder first, based on the extensions order
-            foreach (var extension in extensions)
-            {
-                // From [Extension]/Localization
-                yield return _fileProvider.GetFileInfo(PathExtensions.Combine(extension.SubPath, _resourcesContainer, poFileName));
-            }
+            // From [Extension]/Localization
+            yield return _fileProvider.GetFileInfo(PathExtensions.Combine(extension.SubPath, _resourcesContainer, poFileName));
+        }
 
-            // Load global .po files from /Localization
-            yield return _fileProvider.GetFileInfo(PathExtensions.Combine(_resourcesContainer, poFileName));
+        // Load global .po files from /Localization
+        yield return _fileProvider.GetFileInfo(PathExtensions.Combine(_resourcesContainer, poFileName));
 
-            // Load tenant-specific .po file from /App_Data/Sites/[Tenant]/Localization
-            yield return new PhysicalFileInfo(new FileInfo(PathExtensions.Combine(_shellDataContainer, _resourcesContainer, poFileName)));
+        // Load tenant-specific .po file from /App_Data/Sites/[Tenant]/Localization
+        yield return new PhysicalFileInfo(new FileInfo(PathExtensions.Combine(_shellDataContainer, _resourcesContainer, poFileName)));
 
-            // Load each modules .po file for extending localization when using Orchard Core as a NuGet package
-            foreach (var extension in extensions)
-            {
-                // \src\OrchardCore.Cms.Web\Localization\OrchardCore.Cms.Web\fr-CA.po
-                yield return _fileProvider.GetFileInfo(PathExtensions.Combine(_resourcesContainer, extension.Id, poFileName));
+        // Load each modules .po file for extending localization when using Orchard Core as a NuGet package
+        foreach (var extension in extensions)
+        {
+            // \src\OrchardCore.Cms.Web\Localization\OrchardCore.Cms.Web\fr-CA.po
+            yield return _fileProvider.GetFileInfo(PathExtensions.Combine(_resourcesContainer, extension.Id, poFileName));
 
-                // \src\OrchardCore.Cms.Web\Localization\OrchardCore.Cms.Web-fr-CA.po
-                yield return _fileProvider.GetFileInfo(PathExtensions.Combine(_resourcesContainer, extension.Id + CultureDelimiter + poFileName));
-            }
+            // \src\OrchardCore.Cms.Web\Localization\OrchardCore.Cms.Web-fr-CA.po
+            yield return _fileProvider.GetFileInfo(PathExtensions.Combine(_resourcesContainer, extension.Id + CultureDelimiter + poFileName));
+        }
 
-            // Load all .po files from a culture specific folder
-            // e.g, \src\OrchardCore.Cms.Web\Localization\fr-CA\*.po
-            foreach (var file in _fileProvider.GetDirectoryContents(PathExtensions.Combine(_resourcesContainer, cultureName)))
-            {
-                yield return file;
-            }
+        // Load all .po files from a culture specific folder
+        // e.g, \src\OrchardCore.Cms.Web\Localization\fr-CA\*.po
+        foreach (var file in _fileProvider.GetDirectoryContents(PathExtensions.Combine(_resourcesContainer, cultureName)))
+        {
+            yield return file;
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/Services/LocalizationService.cs b/src/OrchardCore.Modules/OrchardCore.Localization/Services/LocalizationService.cs
index 0de425edef6..234aa5e9f37 100644
--- a/src/OrchardCore.Modules/OrchardCore.Localization/Services/LocalizationService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Localization/Services/LocalizationService.cs
@@ -3,51 +3,50 @@
 using OrchardCore.Localization.Models;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Localization.Services
+namespace OrchardCore.Localization.Services;
+
+/// <summary>
+/// Represents a localization service.
+/// </summary>
+public class LocalizationService : ILocalizationService
 {
+    private static readonly string _defaultCulture = CultureInfo.InstalledUICulture.Name;
+    private static readonly string[] _supportedCultures = [CultureInfo.InstalledUICulture.Name];
+
+    private readonly ISiteService _siteService;
+
+    private LocalizationSettings _localizationSettings;
+
     /// <summary>
-    /// Represents a localization service.
+    /// Creates a new instance of <see cref="LocalizationService"/>.
     /// </summary>
-    public class LocalizationService : ILocalizationService
+    /// <param name="siteService">The <see cref="ISiteService"/>.</param>
+    public LocalizationService(ISiteService siteService)
+    {
+        _siteService = siteService;
+    }
+
+    /// <inheritdocs />
+    public async Task<string> GetDefaultCultureAsync()
+    {
+        await InitializeLocalizationSettingsAsync();
+
+        return _localizationSettings.DefaultCulture ?? _defaultCulture;
+    }
+
+    /// <inheritdocs />
+    public async Task<string[]> GetSupportedCulturesAsync()
+    {
+        await InitializeLocalizationSettingsAsync();
+
+        return _localizationSettings.SupportedCultures == null || _localizationSettings.SupportedCultures.Length == 0
+            ? _supportedCultures
+            : _localizationSettings.SupportedCultures
+            ;
+    }
+
+    private async Task InitializeLocalizationSettingsAsync()
     {
-        private static readonly string _defaultCulture = CultureInfo.InstalledUICulture.Name;
-        private static readonly string[] _supportedCultures = [CultureInfo.InstalledUICulture.Name];
-
-        private readonly ISiteService _siteService;
-
-        private LocalizationSettings _localizationSettings;
-
-        /// <summary>
-        /// Creates a new instance of <see cref="LocalizationService"/>.
-        /// </summary>
-        /// <param name="siteService">The <see cref="ISiteService"/>.</param>
-        public LocalizationService(ISiteService siteService)
-        {
-            _siteService = siteService;
-        }
-
-        /// <inheritdocs />
-        public async Task<string> GetDefaultCultureAsync()
-        {
-            await InitializeLocalizationSettingsAsync();
-
-            return _localizationSettings.DefaultCulture ?? _defaultCulture;
-        }
-
-        /// <inheritdocs />
-        public async Task<string[]> GetSupportedCulturesAsync()
-        {
-            await InitializeLocalizationSettingsAsync();
-
-            return _localizationSettings.SupportedCultures == null || _localizationSettings.SupportedCultures.Length == 0
-                ? _supportedCultures
-                : _localizationSettings.SupportedCultures
-                ;
-        }
-
-        private async Task InitializeLocalizationSettingsAsync()
-        {
-            _localizationSettings ??= await _siteService.GetSettingsAsync<LocalizationSettings>();
-        }
+        _localizationSettings ??= await _siteService.GetSettingsAsync<LocalizationSettings>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Localization/Startup.cs
index 22c16472e0e..d8be05ecb8a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Localization/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Localization/Startup.cs
@@ -18,86 +18,85 @@
 using OrchardCore.Settings;
 using OrchardCore.Settings.Deployment;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents a localization module entry point.
+/// </summary>
+public sealed class Startup : StartupBase
 {
-    /// <summary>
-    /// Represents a localization module entry point.
-    /// </summary>
-    public sealed class Startup : StartupBase
+    public override int ConfigureOrder => -100;
+
+    /// <inheritdocs />
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override int ConfigureOrder => -100;
+        services.AddScoped<IDisplayDriver<ISite>, LocalizationSettingsDisplayDriver>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<ILocalizationService, LocalizationService>();
 
-        /// <inheritdocs />
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IDisplayDriver<ISite>, LocalizationSettingsDisplayDriver>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<ILocalizationService, LocalizationService>();
+        services.AddPortableObjectLocalization(options => options.ResourcesPath = "Localization").
+            AddDataAnnotationsPortableObjectLocalization();
 
-            services.AddPortableObjectLocalization(options => options.ResourcesPath = "Localization").
-                AddDataAnnotationsPortableObjectLocalization();
+        services.Replace(ServiceDescriptor.Singleton<ILocalizationFileLocationProvider, ModularPoFileLocationProvider>());
+    }
 
-            services.Replace(ServiceDescriptor.Singleton<ILocalizationFileLocationProvider, ModularPoFileLocationProvider>());
-        }
+    /// <inheritdocs />
+    public override async ValueTask ConfigureAsync(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        var localizationService = serviceProvider.GetService<ILocalizationService>();
 
-        /// <inheritdocs />
-        public override async ValueTask ConfigureAsync(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            var localizationService = serviceProvider.GetService<ILocalizationService>();
+        var defaultCulture = await localizationService.GetDefaultCultureAsync();
+        var supportedCultures = await localizationService.GetSupportedCulturesAsync();
 
-            var defaultCulture = await localizationService.GetDefaultCultureAsync();
-            var supportedCultures = await localizationService.GetSupportedCulturesAsync();
+        var cultureOptions = serviceProvider.GetService<IOptions<CultureOptions>>().Value;
+        var localizationOptions = serviceProvider.GetService<IOptions<RequestLocalizationOptions>>().Value;
 
-            var cultureOptions = serviceProvider.GetService<IOptions<CultureOptions>>().Value;
-            var localizationOptions = serviceProvider.GetService<IOptions<RequestLocalizationOptions>>().Value;
+        localizationOptions.CultureInfoUseUserOverride = !cultureOptions.IgnoreSystemSettings;
+        localizationOptions
+            .SetDefaultCulture(defaultCulture)
+            .AddSupportedCultures(supportedCultures)
+            .AddSupportedUICultures(supportedCultures);
 
-            localizationOptions.CultureInfoUseUserOverride = !cultureOptions.IgnoreSystemSettings;
-            localizationOptions
-                .SetDefaultCulture(defaultCulture)
-                .AddSupportedCultures(supportedCultures)
-                .AddSupportedUICultures(supportedCultures);
+        app.UseRequestLocalization(localizationOptions);
+    }
+}
 
-            app.UseRequestLocalization(localizationOptions);
-        }
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class LocalizationDeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class LocalizationDeploymentStartup : StartupBase
+[Feature("OrchardCore.Localization.ContentLanguageHeader")]
+public sealed class ContentLanguageHeaderStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSiteSettingsPropertyDeploymentStep<LocalizationSettings, LocalizationDeploymentStartup>(S => S["Culture settings"], S => S["Exports the culture settings."]);
-        }
+        services.Configure<RequestLocalizationOptions>(options => options.ApplyCurrentCultureToResponseHeaders = true);
     }
+}
 
-    [Feature("OrchardCore.Localization.ContentLanguageHeader")]
-    public sealed class ContentLanguageHeaderStartup : StartupBase
+[Feature("OrchardCore.Localization.AdminCulturePicker")]
+public sealed class CulturePickerStartup : StartupBase
+{
+    private readonly ShellSettings _shellSettings;
+    private readonly AdminOptions _adminOptions;
+
+    public CulturePickerStartup(IOptions<AdminOptions> adminOptions, ShellSettings shellSettings)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.Configure<RequestLocalizationOptions>(options => options.ApplyCurrentCultureToResponseHeaders = true);
-        }
+        _shellSettings = shellSettings;
+        _adminOptions = adminOptions.Value;
     }
 
-    [Feature("OrchardCore.Localization.AdminCulturePicker")]
-    public sealed class CulturePickerStartup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        private readonly ShellSettings _shellSettings;
-        private readonly AdminOptions _adminOptions;
-
-        public CulturePickerStartup(IOptions<AdminOptions> adminOptions, ShellSettings shellSettings)
-        {
-            _shellSettings = shellSettings;
-            _adminOptions = adminOptions.Value;
-        }
-
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IDisplayDriver<Navbar>, AdminCulturePickerNavbarDisplayDriver>();
-
-            services.Configure<RequestLocalizationOptions>(options =>
-                options.AddInitialRequestCultureProvider(new AdminCookieCultureProvider(_shellSettings, _adminOptions)));
-        }
+        services.AddScoped<IDisplayDriver<Navbar>, AdminCulturePickerNavbarDisplayDriver>();
+
+        services.Configure<RequestLocalizationOptions>(options =>
+            options.AddInitialRequestCultureProvider(new AdminCookieCultureProvider(_shellSettings, _adminOptions)));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/ViewModels/LocalizationSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Localization/ViewModels/LocalizationSettingsViewModel.cs
index a746eb05b54..28acc99fed2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Localization/ViewModels/LocalizationSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Localization/ViewModels/LocalizationSettingsViewModel.cs
@@ -1,28 +1,27 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Localization.Models;
 
-namespace OrchardCore.Localization.ViewModels
+namespace OrchardCore.Localization.ViewModels;
+
+/// <summary>
+/// Represents a view model for the localization settings.
+/// </summary>
+public class LocalizationSettingsViewModel
 {
     /// <summary>
-    /// Represents a view model for the localization settings.
+    ///
     /// </summary>
-    public class LocalizationSettingsViewModel
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [BindNever]
-        public CultureEntry[] Cultures { get; set; } = [];
+    [BindNever]
+    public CultureEntry[] Cultures { get; set; } = [];
 
-        /// <summary>
-        /// Gets or sets all the supported cultures of the site. It also contains the default culture.
-        /// </summary>
-        /// <remarks>This property is a json array that is set in the editor.</remarks>
-        public string SupportedCultures { get; set; }
+    /// <summary>
+    /// Gets or sets all the supported cultures of the site. It also contains the default culture.
+    /// </summary>
+    /// <remarks>This property is a json array that is set in the editor.</remarks>
+    public string SupportedCultures { get; set; }
 
-        /// <summary>
-        /// Gets or sets the default culture of the site.
-        /// </summary>
-        public string DefaultCulture { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the default culture of the site.
+    /// </summary>
+    public string DefaultCulture { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Drivers/MarkdownBodyPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Drivers/MarkdownBodyPartDisplayDriver.cs
index 2f95b24d24d..457e651edef 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Drivers/MarkdownBodyPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Drivers/MarkdownBodyPartDisplayDriver.cs
@@ -18,100 +18,99 @@
 using OrchardCore.Shortcodes.Services;
 using Shortcodes;
 
-namespace OrchardCore.Markdown.Drivers
+namespace OrchardCore.Markdown.Drivers;
+
+public sealed class MarkdownBodyPartDisplayDriver : ContentPartDisplayDriver<MarkdownBodyPart>
 {
-    public sealed class MarkdownBodyPartDisplayDriver : ContentPartDisplayDriver<MarkdownBodyPart>
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly HtmlEncoder _htmlEncoder;
+    private readonly IHtmlSanitizerService _htmlSanitizerService;
+    private readonly IShortcodeService _shortcodeService;
+    private readonly IMarkdownService _markdownService;
+
+    internal readonly IStringLocalizer S;
+
+    public MarkdownBodyPartDisplayDriver(ILiquidTemplateManager liquidTemplateManager,
+        HtmlEncoder htmlEncoder,
+        IHtmlSanitizerService htmlSanitizerService,
+        IShortcodeService shortcodeService,
+        IMarkdownService markdownService,
+        IStringLocalizer<MarkdownBodyPartDisplayDriver> localizer)
+    {
+        _liquidTemplateManager = liquidTemplateManager;
+        _htmlEncoder = htmlEncoder;
+        _htmlSanitizerService = htmlSanitizerService;
+        _shortcodeService = shortcodeService;
+        _markdownService = markdownService;
+        S = localizer;
+    }
+
+    public override IDisplayResult Display(MarkdownBodyPart markdownBodyPart, BuildPartDisplayContext context)
+    {
+        return Initialize<MarkdownBodyPartViewModel>(GetDisplayShapeType(context), m => BuildViewModel(m, markdownBodyPart, context))
+            .Location("Detail", "Content")
+            .Location("Summary", "Content");
+    }
+
+    public override IDisplayResult Edit(MarkdownBodyPart markdownBodyPart, BuildPartEditorContext context)
     {
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly HtmlEncoder _htmlEncoder;
-        private readonly IHtmlSanitizerService _htmlSanitizerService;
-        private readonly IShortcodeService _shortcodeService;
-        private readonly IMarkdownService _markdownService;
-
-        internal readonly IStringLocalizer S;
-
-        public MarkdownBodyPartDisplayDriver(ILiquidTemplateManager liquidTemplateManager,
-            HtmlEncoder htmlEncoder,
-            IHtmlSanitizerService htmlSanitizerService,
-            IShortcodeService shortcodeService,
-            IMarkdownService markdownService,
-            IStringLocalizer<MarkdownBodyPartDisplayDriver> localizer)
+        return Initialize<MarkdownBodyPartViewModel>(GetEditorShapeType(context), model =>
         {
-            _liquidTemplateManager = liquidTemplateManager;
-            _htmlEncoder = htmlEncoder;
-            _htmlSanitizerService = htmlSanitizerService;
-            _shortcodeService = shortcodeService;
-            _markdownService = markdownService;
-            S = localizer;
-        }
+            model.Markdown = markdownBodyPart.Markdown;
+            model.ContentItem = markdownBodyPart.ContentItem;
+            model.MarkdownBodyPart = markdownBodyPart;
+            model.TypePartDefinition = context.TypePartDefinition;
+        });
+    }
 
-        public override IDisplayResult Display(MarkdownBodyPart markdownBodyPart, BuildPartDisplayContext context)
+    public override async Task<IDisplayResult> UpdateAsync(MarkdownBodyPart model, UpdatePartEditorContext context)
+    {
+        var viewModel = new MarkdownBodyPartViewModel();
+
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix, vm => vm.Markdown);
+
+        if (!string.IsNullOrEmpty(viewModel.Markdown) && !_liquidTemplateManager.Validate(viewModel.Markdown, out var errors))
         {
-            return Initialize<MarkdownBodyPartViewModel>(GetDisplayShapeType(context), m => BuildViewModel(m, markdownBodyPart, context))
-                .Location("Detail", "Content")
-                .Location("Summary", "Content");
+            var partName = context.TypePartDefinition.DisplayName();
+            context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
         }
-
-        public override IDisplayResult Edit(MarkdownBodyPart markdownBodyPart, BuildPartEditorContext context)
+        else
         {
-            return Initialize<MarkdownBodyPartViewModel>(GetEditorShapeType(context), model =>
-            {
-                model.Markdown = markdownBodyPart.Markdown;
-                model.ContentItem = markdownBodyPart.ContentItem;
-                model.MarkdownBodyPart = markdownBodyPart;
-                model.TypePartDefinition = context.TypePartDefinition;
-            });
+            model.Markdown = viewModel.Markdown;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(MarkdownBodyPart model, UpdatePartEditorContext context)
-        {
-            var viewModel = new MarkdownBodyPartViewModel();
+        return Edit(model, context);
+    }
 
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix, vm => vm.Markdown);
+    private async ValueTask BuildViewModel(MarkdownBodyPartViewModel model, MarkdownBodyPart markdownBodyPart, BuildPartDisplayContext context)
+    {
+        model.Markdown = markdownBodyPart.Markdown;
+        model.MarkdownBodyPart = markdownBodyPart;
+        model.ContentItem = markdownBodyPart.ContentItem;
 
-            if (!string.IsNullOrEmpty(viewModel.Markdown) && !_liquidTemplateManager.Validate(viewModel.Markdown, out var errors))
-            {
-                var partName = context.TypePartDefinition.DisplayName();
-                context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} doesn't contain a valid Liquid expression. Details: {1}", partName, string.Join(" ", errors)]);
-            }
-            else
-            {
-                model.Markdown = viewModel.Markdown;
-            }
+        // The default Markdown option is to entity escape html
+        // so filters must be run after the markdown has been processed.
+        model.Html = _markdownService.ToHtml(model.Markdown ?? "");
 
-            return Edit(model, context);
-        }
+        var settings = context.TypePartDefinition.GetSettings<MarkdownBodyPartSettings>();
 
-        private async ValueTask BuildViewModel(MarkdownBodyPartViewModel model, MarkdownBodyPart markdownBodyPart, BuildPartDisplayContext context)
+        // The liquid rendering is for backwards compatibility and can be removed in a future version.
+        if (!settings.SanitizeHtml)
         {
-            model.Markdown = markdownBodyPart.Markdown;
-            model.MarkdownBodyPart = markdownBodyPart;
-            model.ContentItem = markdownBodyPart.ContentItem;
-
-            // The default Markdown option is to entity escape html
-            // so filters must be run after the markdown has been processed.
-            model.Html = _markdownService.ToHtml(model.Markdown ?? "");
-
-            var settings = context.TypePartDefinition.GetSettings<MarkdownBodyPartSettings>();
+            model.Html = await _liquidTemplateManager.RenderStringAsync(model.Html, _htmlEncoder, model,
+                new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(model.ContentItem) });
+        }
 
-            // The liquid rendering is for backwards compatibility and can be removed in a future version.
-            if (!settings.SanitizeHtml)
+        model.Html = await _shortcodeService.ProcessAsync(model.Html,
+            new Context
             {
-                model.Html = await _liquidTemplateManager.RenderStringAsync(model.Html, _htmlEncoder, model,
-                    new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(model.ContentItem) });
-            }
-
-            model.Html = await _shortcodeService.ProcessAsync(model.Html,
-                new Context
-                {
-                    ["ContentItem"] = markdownBodyPart.ContentItem,
-                    ["TypePartDefinition"] = context.TypePartDefinition
-                });
-
-            if (settings.SanitizeHtml)
-            {
-                model.Html = _htmlSanitizerService.Sanitize(model.Html ?? "");
-            }
+                ["ContentItem"] = markdownBodyPart.ContentItem,
+                ["TypePartDefinition"] = context.TypePartDefinition
+            });
+
+        if (settings.SanitizeHtml)
+        {
+            model.Html = _htmlSanitizerService.Sanitize(model.Html ?? "");
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Drivers/MarkdownFieldDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Drivers/MarkdownFieldDisplayDriver.cs
index 991c587e73f..8c429666560 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Drivers/MarkdownFieldDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Drivers/MarkdownFieldDisplayDriver.cs
@@ -18,99 +18,98 @@
 using OrchardCore.Shortcodes.Services;
 using Shortcodes;
 
-namespace OrchardCore.Markdown.Drivers
+namespace OrchardCore.Markdown.Drivers;
+
+public sealed class MarkdownFieldDisplayDriver : ContentFieldDisplayDriver<MarkdownField>
 {
-    public sealed class MarkdownFieldDisplayDriver : ContentFieldDisplayDriver<MarkdownField>
-    {
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly HtmlEncoder _htmlEncoder;
-        private readonly IHtmlSanitizerService _htmlSanitizerService;
-        private readonly IShortcodeService _shortcodeService;
-        private readonly IMarkdownService _markdownService;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly HtmlEncoder _htmlEncoder;
+    private readonly IHtmlSanitizerService _htmlSanitizerService;
+    private readonly IShortcodeService _shortcodeService;
+    private readonly IMarkdownService _markdownService;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public MarkdownFieldDisplayDriver(ILiquidTemplateManager liquidTemplateManager,
-            HtmlEncoder htmlEncoder,
-            IHtmlSanitizerService htmlSanitizerService,
-            IShortcodeService shortcodeService,
-            IMarkdownService markdownService,
-            IStringLocalizer<MarkdownFieldDisplayDriver> localizer)
-        {
-            _liquidTemplateManager = liquidTemplateManager;
-            _htmlEncoder = htmlEncoder;
-            _htmlSanitizerService = htmlSanitizerService;
-            _shortcodeService = shortcodeService;
-            _markdownService = markdownService;
-            S = localizer;
-        }
+    public MarkdownFieldDisplayDriver(ILiquidTemplateManager liquidTemplateManager,
+        HtmlEncoder htmlEncoder,
+        IHtmlSanitizerService htmlSanitizerService,
+        IShortcodeService shortcodeService,
+        IMarkdownService markdownService,
+        IStringLocalizer<MarkdownFieldDisplayDriver> localizer)
+    {
+        _liquidTemplateManager = liquidTemplateManager;
+        _htmlEncoder = htmlEncoder;
+        _htmlSanitizerService = htmlSanitizerService;
+        _shortcodeService = shortcodeService;
+        _markdownService = markdownService;
+        S = localizer;
+    }
 
-        public override IDisplayResult Display(MarkdownField field, BuildFieldDisplayContext context)
+    public override IDisplayResult Display(MarkdownField field, BuildFieldDisplayContext context)
+    {
+        return Initialize<MarkdownFieldViewModel>(GetDisplayShapeType(context), async model =>
         {
-            return Initialize<MarkdownFieldViewModel>(GetDisplayShapeType(context), async model =>
-            {
-
-                var settings = context.PartFieldDefinition.GetSettings<MarkdownFieldSettings>();
-                model.Markdown = field.Markdown;
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
 
-                // The default Markdown option is to entity escape html
-                // so filters must be run after the markdown has been processed.
-                model.Html = _markdownService.ToHtml(model.Markdown ?? string.Empty);
+            var settings = context.PartFieldDefinition.GetSettings<MarkdownFieldSettings>();
+            model.Markdown = field.Markdown;
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
 
-                // The liquid rendering is for backwards compatibility and can be removed in a future version.
-                if (!settings.SanitizeHtml)
-                {
-                    model.Markdown = await _liquidTemplateManager.RenderStringAsync(model.Html, _htmlEncoder, model,
-                        new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(field.ContentItem) });
-                }
+            // The default Markdown option is to entity escape html
+            // so filters must be run after the markdown has been processed.
+            model.Html = _markdownService.ToHtml(model.Markdown ?? string.Empty);
 
-                model.Html = await _shortcodeService.ProcessAsync(model.Html,
-                    new Context
-                    {
-                        ["ContentItem"] = field.ContentItem,
-                        ["PartFieldDefinition"] = context.PartFieldDefinition
-                    });
+            // The liquid rendering is for backwards compatibility and can be removed in a future version.
+            if (!settings.SanitizeHtml)
+            {
+                model.Markdown = await _liquidTemplateManager.RenderStringAsync(model.Html, _htmlEncoder, model,
+                    new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(field.ContentItem) });
+            }
 
-                if (settings.SanitizeHtml)
+            model.Html = await _shortcodeService.ProcessAsync(model.Html,
+                new Context
                 {
-                    model.Html = _htmlSanitizerService.Sanitize(model.Html ?? string.Empty);
-                }
-            })
-            .Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
+                    ["ContentItem"] = field.ContentItem,
+                    ["PartFieldDefinition"] = context.PartFieldDefinition
+                });
 
-        public override IDisplayResult Edit(MarkdownField field, BuildFieldEditorContext context)
-        {
-            return Initialize<EditMarkdownFieldViewModel>(GetEditorShapeType(context), model =>
+            if (settings.SanitizeHtml)
             {
-                model.Markdown = field.Markdown;
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            });
-        }
+                model.Html = _htmlSanitizerService.Sanitize(model.Html ?? string.Empty);
+            }
+        })
+        .Location("Detail", "Content")
+        .Location("Summary", "Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(MarkdownField field, UpdateFieldEditorContext context)
+    public override IDisplayResult Edit(MarkdownField field, BuildFieldEditorContext context)
+    {
+        return Initialize<EditMarkdownFieldViewModel>(GetEditorShapeType(context), model =>
         {
-            var viewModel = new EditMarkdownFieldViewModel();
+            model.Markdown = field.Markdown;
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        });
+    }
 
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix, vm => vm.Markdown);
+    public override async Task<IDisplayResult> UpdateAsync(MarkdownField field, UpdateFieldEditorContext context)
+    {
+        var viewModel = new EditMarkdownFieldViewModel();
 
-            if (!string.IsNullOrEmpty(viewModel.Markdown) && !_liquidTemplateManager.Validate(viewModel.Markdown, out var errors))
-            {
-                var fieldName = context.PartFieldDefinition.DisplayName();
-                context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
-            }
-            else
-            {
-                field.Markdown = viewModel.Markdown;
-            }
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix, vm => vm.Markdown);
 
-            return Edit(field, context);
+        if (!string.IsNullOrEmpty(viewModel.Markdown) && !_liquidTemplateManager.Validate(viewModel.Markdown, out var errors))
+        {
+            var fieldName = context.PartFieldDefinition.DisplayName();
+            context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Markdown), S["{0} field doesn't contain a valid Liquid expression. Details: {1}", fieldName, string.Join(" ", errors)]);
         }
+        else
+        {
+            field.Markdown = viewModel.Markdown;
+        }
+
+        return Edit(field, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Fields/MarkdownField.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Fields/MarkdownField.cs
index 84b4e8be93d..92813693ccc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Fields/MarkdownField.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Fields/MarkdownField.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Markdown.Fields
+namespace OrchardCore.Markdown.Fields;
+
+public class MarkdownField : ContentField
 {
-    public class MarkdownField : ContentField
-    {
-        public string Markdown { get; set; }
-    }
+    public string Markdown { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Filters/Markdownify.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Filters/Markdownify.cs
index 65b1cca1fe7..2b097ef430e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Filters/Markdownify.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Filters/Markdownify.cs
@@ -4,20 +4,19 @@
 using OrchardCore.Liquid;
 using OrchardCore.Markdown.Services;
 
-namespace OrchardCore.Markdown.Filters
+namespace OrchardCore.Markdown.Filters;
+
+public class Markdownify : ILiquidFilter
 {
-    public class Markdownify : ILiquidFilter
-    {
-        private readonly IMarkdownService _markdownService;
+    private readonly IMarkdownService _markdownService;
 
-        public Markdownify(IMarkdownService markdownService)
-        {
-            _markdownService = markdownService;
-        }
+    public Markdownify(IMarkdownService markdownService)
+    {
+        _markdownService = markdownService;
+    }
 
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
-        {
-            return new ValueTask<FluidValue>(new StringValue(_markdownService.ToHtml(input.ToStringValue())));
-        }
+    public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        return new ValueTask<FluidValue>(new StringValue(_markdownService.ToHtml(input.ToStringValue())));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/GraphQL/MarkdownBodyQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/GraphQL/MarkdownBodyQueryObjectType.cs
index 7d1c0547ac7..b8ddaea0b81 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/GraphQL/MarkdownBodyQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/GraphQL/MarkdownBodyQueryObjectType.cs
@@ -19,73 +19,72 @@
 using OrchardCore.Shortcodes.Services;
 using Shortcodes;
 
-namespace OrchardCore.Markdown.GraphQL
+namespace OrchardCore.Markdown.GraphQL;
+
+public class MarkdownBodyQueryObjectType : ObjectGraphType<MarkdownBodyPart>
 {
-    public class MarkdownBodyQueryObjectType : ObjectGraphType<MarkdownBodyPart>
+    public MarkdownBodyQueryObjectType(IStringLocalizer<MarkdownBodyQueryObjectType> S)
     {
-        public MarkdownBodyQueryObjectType(IStringLocalizer<MarkdownBodyQueryObjectType> S)
-        {
-            Name = nameof(MarkdownBodyPart);
-            Description = S["Content stored as Markdown. You can also query the HTML interpreted version of Markdown."];
+        Name = nameof(MarkdownBodyPart);
+        Description = S["Content stored as Markdown. You can also query the HTML interpreted version of Markdown."];
 
-            Field("markdown", x => x.Markdown, nullable: true)
-                .Description(S["the markdown value"]);
-            Field<StringGraphType>("html")
-                .Description(S["the HTML representation of the markdown content"])
-                .ResolveLockedAsync(ToHtml);
-        }
+        Field("markdown", x => x.Markdown, nullable: true)
+            .Description(S["the markdown value"]);
+        Field<StringGraphType>("html")
+            .Description(S["the HTML representation of the markdown content"])
+            .ResolveLockedAsync(ToHtml);
+    }
 
-        private static async ValueTask<object> ToHtml(IResolveFieldContext<MarkdownBodyPart> ctx)
+    private static async ValueTask<object> ToHtml(IResolveFieldContext<MarkdownBodyPart> ctx)
+    {
+        if (string.IsNullOrEmpty(ctx.Source.Markdown))
         {
-            if (string.IsNullOrEmpty(ctx.Source.Markdown))
-            {
-                return ctx.Source.Markdown;
-            }
+            return ctx.Source.Markdown;
+        }
 
-            var serviceProvider = ctx.RequestServices;
-            var markdownService = serviceProvider.GetRequiredService<IMarkdownService>();
-            var shortcodeService = serviceProvider.GetRequiredService<IShortcodeService>();
-            var contentDefinitionManager = serviceProvider.GetRequiredService<IContentDefinitionManager>();
+        var serviceProvider = ctx.RequestServices;
+        var markdownService = serviceProvider.GetRequiredService<IMarkdownService>();
+        var shortcodeService = serviceProvider.GetRequiredService<IShortcodeService>();
+        var contentDefinitionManager = serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-            var contentTypeDefinition = await contentDefinitionManager.GetTypeDefinitionAsync(ctx.Source.ContentItem.ContentType);
-            var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, "MarkdownBodyPart", StringComparison.Ordinal));
-            var settings = contentTypePartDefinition.GetSettings<MarkdownBodyPartSettings>();
+        var contentTypeDefinition = await contentDefinitionManager.GetTypeDefinitionAsync(ctx.Source.ContentItem.ContentType);
+        var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, "MarkdownBodyPart", StringComparison.Ordinal));
+        var settings = contentTypePartDefinition.GetSettings<MarkdownBodyPartSettings>();
 
-            // The default Markdown option is to entity escape html
-            // so filters must be run after the markdown has been processed.
-            var html = markdownService.ToHtml(ctx.Source.Markdown);
+        // The default Markdown option is to entity escape html
+        // so filters must be run after the markdown has been processed.
+        var html = markdownService.ToHtml(ctx.Source.Markdown);
 
-            // The liquid rendering is for backwards compatibility and can be removed in a future version.
-            if (!settings.SanitizeHtml)
+        // The liquid rendering is for backwards compatibility and can be removed in a future version.
+        if (!settings.SanitizeHtml)
+        {
+            var liquidTemplateManager = serviceProvider.GetService<ILiquidTemplateManager>();
+            var htmlEncoder = serviceProvider.GetService<HtmlEncoder>();
+            var model = new MarkdownBodyPartViewModel()
             {
-                var liquidTemplateManager = serviceProvider.GetService<ILiquidTemplateManager>();
-                var htmlEncoder = serviceProvider.GetService<HtmlEncoder>();
-                var model = new MarkdownBodyPartViewModel()
-                {
-                    Markdown = ctx.Source.Markdown,
-                    Html = html,
-                    MarkdownBodyPart = ctx.Source,
-                    ContentItem = ctx.Source.ContentItem
-                };
-
-                html = await liquidTemplateManager.RenderStringAsync(html, htmlEncoder, model,
-                    new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(model.ContentItem) });
-            }
+                Markdown = ctx.Source.Markdown,
+                Html = html,
+                MarkdownBodyPart = ctx.Source,
+                ContentItem = ctx.Source.ContentItem
+            };
 
-            html = await shortcodeService.ProcessAsync(html,
-                new Context
-                {
-                    ["ContentItem"] = ctx.Source.ContentItem,
-                    ["PartFieldDefinition"] = contentTypePartDefinition
-                });
+            html = await liquidTemplateManager.RenderStringAsync(html, htmlEncoder, model,
+                new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(model.ContentItem) });
+        }
 
-            if (settings.SanitizeHtml)
+        html = await shortcodeService.ProcessAsync(html,
+            new Context
             {
-                var htmlSanitizerService = serviceProvider.GetRequiredService<IHtmlSanitizerService>();
-                html = htmlSanitizerService.Sanitize(html);
-            }
+                ["ContentItem"] = ctx.Source.ContentItem,
+                ["PartFieldDefinition"] = contentTypePartDefinition
+            });
 
-            return html;
+        if (settings.SanitizeHtml)
+        {
+            var htmlSanitizerService = serviceProvider.GetRequiredService<IHtmlSanitizerService>();
+            html = htmlSanitizerService.Sanitize(html);
         }
+
+        return html;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/GraphQL/MarkdownFieldQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/GraphQL/MarkdownFieldQueryObjectType.cs
index 3248878322d..bd971b2afdd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/GraphQL/MarkdownFieldQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/GraphQL/MarkdownFieldQueryObjectType.cs
@@ -21,84 +21,83 @@
 using OrchardCore.Shortcodes.Services;
 using Shortcodes;
 
-namespace OrchardCore.Markdown.GraphQL
+namespace OrchardCore.Markdown.GraphQL;
+
+public class MarkdownFieldQueryObjectType : ObjectGraphType<MarkdownField>
 {
-    public class MarkdownFieldQueryObjectType : ObjectGraphType<MarkdownField>
+    public MarkdownFieldQueryObjectType(IStringLocalizer<MarkdownFieldQueryObjectType> S)
     {
-        public MarkdownFieldQueryObjectType(IStringLocalizer<MarkdownFieldQueryObjectType> S)
-        {
-            Name = nameof(MarkdownField);
-            Description = S["Content stored as Markdown. You can also query the HTML interpreted version of Markdown."];
+        Name = nameof(MarkdownField);
+        Description = S["Content stored as Markdown. You can also query the HTML interpreted version of Markdown."];
 
-            Field("markdown", x => x.Markdown, nullable: true)
-                .Description(S["the markdown value"]);
-            Field<StringGraphType>("html")
-                .Description(S["the HTML representation of the markdown content"])
-                .ResolveLockedAsync(ToHtml);
-        }
+        Field("markdown", x => x.Markdown, nullable: true)
+            .Description(S["the markdown value"]);
+        Field<StringGraphType>("html")
+            .Description(S["the HTML representation of the markdown content"])
+            .ResolveLockedAsync(ToHtml);
+    }
 
-        private static async ValueTask<object> ToHtml(IResolveFieldContext<MarkdownField> ctx)
+    private static async ValueTask<object> ToHtml(IResolveFieldContext<MarkdownField> ctx)
+    {
+        if (string.IsNullOrEmpty(ctx.Source.Markdown))
         {
-            if (string.IsNullOrEmpty(ctx.Source.Markdown))
-            {
-                return ctx.Source.Markdown;
-            }
-
-            var serviceProvider = ctx.RequestServices;
-            var markdownService = serviceProvider.GetRequiredService<IMarkdownService>();
-            var shortcodeService = serviceProvider.GetRequiredService<IShortcodeService>();
+            return ctx.Source.Markdown;
+        }
 
-            var contentDefinitionManager = serviceProvider.GetRequiredService<IContentDefinitionManager>();
+        var serviceProvider = ctx.RequestServices;
+        var markdownService = serviceProvider.GetRequiredService<IMarkdownService>();
+        var shortcodeService = serviceProvider.GetRequiredService<IShortcodeService>();
 
-            var jObject = (JsonObject)ctx.Source.Content;
-            // The JObject.Path is consistent here even when contained in a bag part.
-            var jsonPath = jObject.GetNormalizedPath();
-            var paths = jsonPath.Split('.');
-            var partName = paths[0];
-            var fieldName = paths[1];
-            var contentTypeDefinition = await contentDefinitionManager.GetTypeDefinitionAsync(ctx.Source.ContentItem.ContentType);
-            var contentPartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.Name, partName, StringComparison.Ordinal));
-            var contentPartFieldDefinition = contentPartDefinition.PartDefinition.Fields.FirstOrDefault(x => string.Equals(x.Name, fieldName, StringComparison.Ordinal));
+        var contentDefinitionManager = serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-            var settings = contentPartFieldDefinition.GetSettings<MarkdownFieldSettings>();
+        var jObject = (JsonObject)ctx.Source.Content;
+        // The JObject.Path is consistent here even when contained in a bag part.
+        var jsonPath = jObject.GetNormalizedPath();
+        var paths = jsonPath.Split('.');
+        var partName = paths[0];
+        var fieldName = paths[1];
+        var contentTypeDefinition = await contentDefinitionManager.GetTypeDefinitionAsync(ctx.Source.ContentItem.ContentType);
+        var contentPartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.Name, partName, StringComparison.Ordinal));
+        var contentPartFieldDefinition = contentPartDefinition.PartDefinition.Fields.FirstOrDefault(x => string.Equals(x.Name, fieldName, StringComparison.Ordinal));
 
-            // The default Markdown option is to entity escape html
-            // so filters must be run after the markdown has been processed.
-            var html = markdownService.ToHtml(ctx.Source.Markdown);
+        var settings = contentPartFieldDefinition.GetSettings<MarkdownFieldSettings>();
 
-            // The liquid rendering is for backwards compatibility and can be removed in a future version.
-            if (!settings.SanitizeHtml)
-            {
-                var liquidTemplateManager = serviceProvider.GetService<ILiquidTemplateManager>();
-                var htmlEncoder = serviceProvider.GetService<HtmlEncoder>();
+        // The default Markdown option is to entity escape html
+        // so filters must be run after the markdown has been processed.
+        var html = markdownService.ToHtml(ctx.Source.Markdown);
 
-                var model = new MarkdownFieldViewModel()
-                {
-                    Markdown = ctx.Source.Markdown,
-                    Html = html,
-                    Field = ctx.Source,
-                    Part = ctx.Source.ContentItem.Get<ContentPart>(partName),
-                    PartFieldDefinition = contentPartFieldDefinition
-                };
+        // The liquid rendering is for backwards compatibility and can be removed in a future version.
+        if (!settings.SanitizeHtml)
+        {
+            var liquidTemplateManager = serviceProvider.GetService<ILiquidTemplateManager>();
+            var htmlEncoder = serviceProvider.GetService<HtmlEncoder>();
 
-                html = await liquidTemplateManager.RenderStringAsync(html, htmlEncoder, model,
-                    new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(ctx.Source.ContentItem) });
-            }
+            var model = new MarkdownFieldViewModel()
+            {
+                Markdown = ctx.Source.Markdown,
+                Html = html,
+                Field = ctx.Source,
+                Part = ctx.Source.ContentItem.Get<ContentPart>(partName),
+                PartFieldDefinition = contentPartFieldDefinition
+            };
 
-            html = await shortcodeService.ProcessAsync(html,
-                new Context
-                {
-                    ["ContentItem"] = ctx.Source.ContentItem,
-                    ["PartFieldDefinition"] = contentPartFieldDefinition
-                });
+            html = await liquidTemplateManager.RenderStringAsync(html, htmlEncoder, model,
+                new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(ctx.Source.ContentItem) });
+        }
 
-            if (settings.SanitizeHtml)
+        html = await shortcodeService.ProcessAsync(html,
+            new Context
             {
-                var htmlSanitizerService = serviceProvider.GetRequiredService<IHtmlSanitizerService>();
-                html = htmlSanitizerService.Sanitize(html);
-            }
+                ["ContentItem"] = ctx.Source.ContentItem,
+                ["PartFieldDefinition"] = contentPartFieldDefinition
+            });
 
-            return html;
+        if (settings.SanitizeHtml)
+        {
+            var htmlSanitizerService = serviceProvider.GetRequiredService<IHtmlSanitizerService>();
+            html = htmlSanitizerService.Sanitize(html);
         }
+
+        return html;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/GraphQL/Startup.cs
index 531aaed4cb9..aaba84546b6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/GraphQL/Startup.cs
@@ -4,15 +4,14 @@
 using OrchardCore.Markdown.Models;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Markdown.GraphQL
+namespace OrchardCore.Markdown.GraphQL;
+
+[RequireFeatures("OrchardCore.Apis.GraphQL")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Apis.GraphQL")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddObjectGraphType<MarkdownBodyPart, MarkdownBodyQueryObjectType>();
-            services.AddObjectGraphType<MarkdownField, MarkdownFieldQueryObjectType>();
-        }
+        services.AddObjectGraphType<MarkdownBodyPart, MarkdownBodyQueryObjectType>();
+        services.AddObjectGraphType<MarkdownField, MarkdownFieldQueryObjectType>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Handlers/MarkdownBodyPartHandler.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Handlers/MarkdownBodyPartHandler.cs
index fb896d144bc..9c40ba776cd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Handlers/MarkdownBodyPartHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Handlers/MarkdownBodyPartHandler.cs
@@ -17,80 +17,79 @@
 using OrchardCore.Shortcodes.Services;
 using Shortcodes;
 
-namespace OrchardCore.Markdown.Handlers
+namespace OrchardCore.Markdown.Handlers;
+
+public class MarkdownBodyPartHandler : ContentPartHandler<MarkdownBodyPart>
 {
-    public class MarkdownBodyPartHandler : ContentPartHandler<MarkdownBodyPart>
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IShortcodeService _shortcodeService;
-        private readonly IMarkdownService _markdownService;
-        private readonly IHtmlSanitizerService _htmlSanitizerService;
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly HtmlEncoder _htmlEncoder;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IShortcodeService _shortcodeService;
+    private readonly IMarkdownService _markdownService;
+    private readonly IHtmlSanitizerService _htmlSanitizerService;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly HtmlEncoder _htmlEncoder;
 
-        public MarkdownBodyPartHandler(IContentDefinitionManager contentDefinitionManager,
-            IShortcodeService shortcodeService,
-            IMarkdownService markdownService,
-            IHtmlSanitizerService htmlSanitizerService,
-            ILiquidTemplateManager liquidTemplateManager,
-            HtmlEncoder htmlEncoder)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _shortcodeService = shortcodeService;
-            _markdownService = markdownService;
-            _htmlSanitizerService = htmlSanitizerService;
-            _liquidTemplateManager = liquidTemplateManager;
-            _htmlEncoder = htmlEncoder;
-        }
+    public MarkdownBodyPartHandler(IContentDefinitionManager contentDefinitionManager,
+        IShortcodeService shortcodeService,
+        IMarkdownService markdownService,
+        IHtmlSanitizerService htmlSanitizerService,
+        ILiquidTemplateManager liquidTemplateManager,
+        HtmlEncoder htmlEncoder)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+        _shortcodeService = shortcodeService;
+        _markdownService = markdownService;
+        _htmlSanitizerService = htmlSanitizerService;
+        _liquidTemplateManager = liquidTemplateManager;
+        _htmlEncoder = htmlEncoder;
+    }
 
-        public override Task GetContentItemAspectAsync(ContentItemAspectContext context, MarkdownBodyPart part)
+    public override Task GetContentItemAspectAsync(ContentItemAspectContext context, MarkdownBodyPart part)
+    {
+        return context.ForAsync<BodyAspect>(async bodyAspect =>
         {
-            return context.ForAsync<BodyAspect>(async bodyAspect =>
+            try
             {
-                try
-                {
-                    var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(part.ContentItem.ContentType);
-                    var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, "MarkdownBodyPart", StringComparison.Ordinal));
-                    var settings = contentTypePartDefinition.GetSettings<MarkdownBodyPartSettings>();
+                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(part.ContentItem.ContentType);
+                var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, "MarkdownBodyPart", StringComparison.Ordinal));
+                var settings = contentTypePartDefinition.GetSettings<MarkdownBodyPartSettings>();
 
-                    // The default Markdown option is to entity escape html
-                    // so filters must be run after the markdown has been processed.
-                    var html = _markdownService.ToHtml(part.Markdown);
+                // The default Markdown option is to entity escape html
+                // so filters must be run after the markdown has been processed.
+                var html = _markdownService.ToHtml(part.Markdown);
 
-                    // The liquid rendering is for backwards compatibility and can be removed in a future version.
-                    if (!settings.SanitizeHtml)
+                // The liquid rendering is for backwards compatibility and can be removed in a future version.
+                if (!settings.SanitizeHtml)
+                {
+                    var model = new MarkdownBodyPartViewModel()
                     {
-                        var model = new MarkdownBodyPartViewModel()
-                        {
-                            Markdown = part.Markdown,
-                            Html = html,
-                            MarkdownBodyPart = part,
-                            ContentItem = part.ContentItem,
-                        };
-
-                        html = await _liquidTemplateManager.RenderStringAsync(html, _htmlEncoder, model,
-                            new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(model.ContentItem) });
-                    }
+                        Markdown = part.Markdown,
+                        Html = html,
+                        MarkdownBodyPart = part,
+                        ContentItem = part.ContentItem,
+                    };
 
-                    html = await _shortcodeService.ProcessAsync(html,
-                        new Context
-                        {
-                            ["ContentItem"] = part.ContentItem,
-                            ["TypePartDefinition"] = contentTypePartDefinition
-                        });
+                    html = await _liquidTemplateManager.RenderStringAsync(html, _htmlEncoder, model,
+                        new Dictionary<string, FluidValue>() { ["ContentItem"] = new ObjectValue(model.ContentItem) });
+                }
 
-                    if (settings.SanitizeHtml)
+                html = await _shortcodeService.ProcessAsync(html,
+                    new Context
                     {
-                        html = _htmlSanitizerService.Sanitize(html);
-                    }
+                        ["ContentItem"] = part.ContentItem,
+                        ["TypePartDefinition"] = contentTypePartDefinition
+                    });
 
-                    bodyAspect.Body = new HtmlString(html);
-                }
-                catch
+                if (settings.SanitizeHtml)
                 {
-                    bodyAspect.Body = HtmlString.Empty;
+                    html = _htmlSanitizerService.Sanitize(html);
                 }
-            });
-        }
+
+                bodyAspect.Body = new HtmlString(html);
+            }
+            catch
+            {
+                bodyAspect.Body = HtmlString.Empty;
+            }
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Indexing/MarkdownBodyPartIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Indexing/MarkdownBodyPartIndexHandler.cs
index 99a2cc3069c..9fb946e2116 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Indexing/MarkdownBodyPartIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Indexing/MarkdownBodyPartIndexHandler.cs
@@ -2,20 +2,19 @@
 using OrchardCore.Indexing;
 using OrchardCore.Markdown.Models;
 
-namespace OrchardCore.Markdown.Indexing
+namespace OrchardCore.Markdown.Indexing;
+
+public class MarkdownBodyPartIndexHandler : ContentPartIndexHandler<MarkdownBodyPart>
 {
-    public class MarkdownBodyPartIndexHandler : ContentPartIndexHandler<MarkdownBodyPart>
+    public override Task BuildIndexAsync(MarkdownBodyPart part, BuildPartIndexContext context)
     {
-        public override Task BuildIndexAsync(MarkdownBodyPart part, BuildPartIndexContext context)
-        {
-            var options = context.Settings.ToOptions() | DocumentIndexOptions.Sanitize;
-
-            foreach (var key in context.Keys)
-            {
-                context.DocumentIndex.Set(key, part.Markdown, options);
-            }
+        var options = context.Settings.ToOptions() | DocumentIndexOptions.Sanitize;
 
-            return Task.CompletedTask;
+        foreach (var key in context.Keys)
+        {
+            context.DocumentIndex.Set(key, part.Markdown, options);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Indexing/MarkdownFieldIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Indexing/MarkdownFieldIndexHandler.cs
index 29aec3bfc69..4a9feed6b87 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Indexing/MarkdownFieldIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Indexing/MarkdownFieldIndexHandler.cs
@@ -2,20 +2,19 @@
 using OrchardCore.Indexing;
 using OrchardCore.Markdown.Fields;
 
-namespace OrchardCore.Markdown.Indexing
+namespace OrchardCore.Markdown.Indexing;
+
+public class MarkdownFieldIndexHandler : ContentFieldIndexHandler<MarkdownField>
 {
-    public class MarkdownFieldIndexHandler : ContentFieldIndexHandler<MarkdownField>
+    public override Task BuildIndexAsync(MarkdownField field, BuildFieldIndexContext context)
     {
-        public override Task BuildIndexAsync(MarkdownField field, BuildFieldIndexContext context)
-        {
-            var options = context.Settings.ToOptions();
-
-            foreach (var key in context.Keys)
-            {
-                context.DocumentIndex.Set(key, field.Markdown, options);
-            }
+        var options = context.Settings.ToOptions();
 
-            return Task.CompletedTask;
+        foreach (var key in context.Keys)
+        {
+            context.DocumentIndex.Set(key, field.Markdown, options);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Media/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Media/Startup.cs
index 08c78b62965..0206842a947 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Media/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Media/Startup.cs
@@ -2,14 +2,13 @@
 using OrchardCore.DisplayManagement.Descriptors;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Markdown.Media
+namespace OrchardCore.Markdown.Media;
+
+[RequireFeatures("OrchardCore.Media")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Media")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IShapeTableProvider, MediaShapes>();
-        }
+        services.AddScoped<IShapeTableProvider, MediaShapes>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Migrations.cs
index 354803d4c59..e81eff208e5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Migrations.cs
@@ -6,77 +6,76 @@
 using OrchardCore.Markdown.Fields;
 using OrchardCore.Markdown.Settings;
 
-namespace OrchardCore.Markdown
+namespace OrchardCore.Markdown;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        public Migrations(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public Migrations(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public async Task<int> CreateAsync()
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync("MarkdownBodyPart", builder => builder
-                .Attachable()
-                .WithDescription("Provides a Markdown formatted body for your content item."));
+    public async Task<int> CreateAsync()
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync("MarkdownBodyPart", builder => builder
+            .Attachable()
+            .WithDescription("Provides a Markdown formatted body for your content item."));
 
-            // Shortcut other migration steps on new content definition schemas.
-            return 4;
-        }
+        // Shortcut other migration steps on new content definition schemas.
+        return 4;
+    }
 
-        // Migrate FieldSettings. This only needs to run on old content definition schemas.
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom1Async()
-        {
-            await _contentDefinitionManager.MigrateFieldSettingsAsync<MarkdownField, MarkdownFieldSettings>();
+    // Migrate FieldSettings. This only needs to run on old content definition schemas.
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom1Async()
+    {
+        await _contentDefinitionManager.MigrateFieldSettingsAsync<MarkdownField, MarkdownFieldSettings>();
 
-            return 2;
-        }
+        return 2;
+    }
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom2Async()
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom2Async()
+    {
+        // For backwards compatibility with liquid filters we disable html sanitization on existing field definitions.
+        foreach (var contentType in await _contentDefinitionManager.LoadTypeDefinitionsAsync())
         {
-            // For backwards compatibility with liquid filters we disable html sanitization on existing field definitions.
-            foreach (var contentType in await _contentDefinitionManager.LoadTypeDefinitionsAsync())
+            if (contentType.Parts.Any(x => x.PartDefinition.Name == "MarkdownBodyPart"))
             {
-                if (contentType.Parts.Any(x => x.PartDefinition.Name == "MarkdownBodyPart"))
+                await _contentDefinitionManager.AlterTypeDefinitionAsync(contentType.Name, x => x.WithPart("MarkdownBodyPart", part =>
                 {
-                    await _contentDefinitionManager.AlterTypeDefinitionAsync(contentType.Name, x => x.WithPart("MarkdownBodyPart", part =>
-                    {
-                        part.MergeSettings<MarkdownBodyPartSettings>(x => x.SanitizeHtml = false);
-                    }));
-                }
+                    part.MergeSettings<MarkdownBodyPartSettings>(x => x.SanitizeHtml = false);
+                }));
             }
-
-            return 3;
         }
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom3Async()
+        return 3;
+    }
+
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom3Async()
+    {
+        // For backwards compatibility with liquid filters we disable html sanitization on existing field definitions.
+        var partDefinitions = await _contentDefinitionManager.LoadPartDefinitionsAsync();
+        foreach (var partDefinition in partDefinitions)
         {
-            // For backwards compatibility with liquid filters we disable html sanitization on existing field definitions.
-            var partDefinitions = await _contentDefinitionManager.LoadPartDefinitionsAsync();
-            foreach (var partDefinition in partDefinitions)
+            if (partDefinition.Fields.Any(x => x.FieldDefinition.Name == "MarkdownField"))
             {
-                if (partDefinition.Fields.Any(x => x.FieldDefinition.Name == "MarkdownField"))
+                await _contentDefinitionManager.AlterPartDefinitionAsync(partDefinition.Name, partBuilder =>
                 {
-                    await _contentDefinitionManager.AlterPartDefinitionAsync(partDefinition.Name, partBuilder =>
+                    foreach (var fieldDefinition in partDefinition.Fields.Where(x => x.FieldDefinition.Name == "MarkdownField"))
                     {
-                        foreach (var fieldDefinition in partDefinition.Fields.Where(x => x.FieldDefinition.Name == "MarkdownField"))
+                        partBuilder.WithField(fieldDefinition.Name, fieldBuilder =>
                         {
-                            partBuilder.WithField(fieldDefinition.Name, fieldBuilder =>
-                            {
-                                fieldBuilder.MergeSettings<MarkdownFieldSettings>(s => s.SanitizeHtml = false);
-                            });
-                        }
-                    });
-                }
+                            fieldBuilder.MergeSettings<MarkdownFieldSettings>(s => s.SanitizeHtml = false);
+                        });
+                    }
+                });
             }
-
-            return 4;
         }
+
+        return 4;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Models/MarkdownBodyPart.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Models/MarkdownBodyPart.cs
index c5511fca9b0..a51eb47145f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Models/MarkdownBodyPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Models/MarkdownBodyPart.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Markdown.Models
+namespace OrchardCore.Markdown.Models;
+
+public class MarkdownBodyPart : ContentPart
 {
-    public class MarkdownBodyPart : ContentPart
-    {
-        public string Markdown { get; set; }
-    }
+    public string Markdown { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/RemotePublishing/MarkdownBodyMetaWeblogDriver.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/RemotePublishing/MarkdownBodyMetaWeblogDriver.cs
index e4464812245..77811af0297 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/RemotePublishing/MarkdownBodyMetaWeblogDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/RemotePublishing/MarkdownBodyMetaWeblogDriver.cs
@@ -4,27 +4,26 @@
 using OrchardCore.XmlRpc;
 using OrchardCore.XmlRpc.Models;
 
-namespace OrchardCore.Markdown.RemotePublishing
+namespace OrchardCore.Markdown.RemotePublishing;
+
+public sealed class MarkdownBodyMetaWeblogDriver : MetaWeblogDriver
 {
-    public sealed class MarkdownBodyMetaWeblogDriver : MetaWeblogDriver
+    public override void BuildPost(XRpcStruct rpcStruct, XmlRpcContext context, ContentItem contentItem)
     {
-        public override void BuildPost(XRpcStruct rpcStruct, XmlRpcContext context, ContentItem contentItem)
+        var bodyPart = contentItem.As<MarkdownBodyPart>();
+        if (bodyPart == null)
         {
-            var bodyPart = contentItem.As<MarkdownBodyPart>();
-            if (bodyPart == null)
-            {
-                return;
-            }
-
-            rpcStruct.Set("description", bodyPart.Markdown);
+            return;
         }
 
-        public override void EditPost(XRpcStruct rpcStruct, ContentItem contentItem)
+        rpcStruct.Set("description", bodyPart.Markdown);
+    }
+
+    public override void EditPost(XRpcStruct rpcStruct, ContentItem contentItem)
+    {
+        if (contentItem.As<MarkdownBodyPart>() != null)
         {
-            if (contentItem.As<MarkdownBodyPart>() != null)
-            {
-                contentItem.Alter<MarkdownBodyPart>(x => x.Markdown = rpcStruct.Optional<string>("description"));
-            }
+            contentItem.Alter<MarkdownBodyPart>(x => x.Markdown = rpcStruct.Optional<string>("description"));
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/RemotePublishing/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/RemotePublishing/Startup.cs
index 5d76f2ca19e..693db8a588f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/RemotePublishing/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/RemotePublishing/Startup.cs
@@ -2,14 +2,13 @@
 using OrchardCore.MetaWeblog;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Markdown.RemotePublishing
+namespace OrchardCore.Markdown.RemotePublishing;
+
+[RequireFeatures("OrchardCore.RemotePublishing")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.RemotePublishing")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IMetaWeblogDriver, MarkdownBodyMetaWeblogDriver>();
-        }
+        services.AddScoped<IMetaWeblogDriver, MarkdownBodyMetaWeblogDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Services/DefaultMarkdownService.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Services/DefaultMarkdownService.cs
index c4de392f37d..7769b734cfb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Services/DefaultMarkdownService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Services/DefaultMarkdownService.cs
@@ -1,25 +1,24 @@
 using Markdig;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Markdown.Services
+namespace OrchardCore.Markdown.Services;
+
+public class DefaultMarkdownService : IMarkdownService
 {
-    public class DefaultMarkdownService : IMarkdownService
-    {
-        private readonly MarkdownPipeline _markdownPipeline;
+    private readonly MarkdownPipeline _markdownPipeline;
 
-        public DefaultMarkdownService(IOptions<MarkdownPipelineOptions> options)
+    public DefaultMarkdownService(IOptions<MarkdownPipelineOptions> options)
+    {
+        var builder = new MarkdownPipelineBuilder();
+        foreach (var action in options.Value.Configure)
         {
-            var builder = new MarkdownPipelineBuilder();
-            foreach (var action in options.Value.Configure)
-            {
-                action?.Invoke(builder);
-            }
-            _markdownPipeline = builder.Build();
+            action?.Invoke(builder);
         }
+        _markdownPipeline = builder.Build();
+    }
 
-        public string ToHtml(string markdown)
-        {
-            return Markdig.Markdown.ToHtml(markdown, _markdownPipeline);
-        }
+    public string ToHtml(string markdown)
+    {
+        return Markdig.Markdown.ToHtml(markdown, _markdownPipeline);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Services/MarkdownPipelineOptions.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Services/MarkdownPipelineOptions.cs
index 4d2112e8803..4146784388e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Services/MarkdownPipelineOptions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Services/MarkdownPipelineOptions.cs
@@ -2,10 +2,9 @@
 using System.Collections.Generic;
 using Markdig;
 
-namespace OrchardCore.Markdown.Services
+namespace OrchardCore.Markdown.Services;
+
+public class MarkdownPipelineOptions
 {
-    public class MarkdownPipelineOptions
-    {
-        public List<Action<MarkdownPipelineBuilder>> Configure { get; } = [];
-    }
+    public List<Action<MarkdownPipelineBuilder>> Configure { get; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Services/MarkdownPipelineOptionsExtensions.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Services/MarkdownPipelineOptionsExtensions.cs
index 9accbfcbca5..633e7a690b5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Services/MarkdownPipelineOptionsExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Services/MarkdownPipelineOptionsExtensions.cs
@@ -2,19 +2,18 @@
 using Markdig;
 using OrchardCore.Markdown.Services;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class MarkdownPipelineOptionsExtensions
 {
-    public static class MarkdownPipelineOptionsExtensions
+    /// <summary>
+    /// Adds a configuration action to the markdown pipeline builder.
+    /// </summary>
+    public static void ConfigureMarkdownPipeline(this IServiceCollection services, Action<MarkdownPipelineBuilder> action)
     {
-        /// <summary>
-        /// Adds a configuration action to the markdown pipeline builder.
-        /// </summary>
-        public static void ConfigureMarkdownPipeline(this IServiceCollection services, Action<MarkdownPipelineBuilder> action)
+        services.Configure<MarkdownPipelineOptions>(o =>
         {
-            services.Configure<MarkdownPipelineOptions>(o =>
-            {
-                o.Configure.Add(action);
-            });
-        }
+            o.Configure.Add(action);
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Settings/MarkdownBodyPartSettings.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Settings/MarkdownBodyPartSettings.cs
index 0526807029e..12d6d37c697 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Settings/MarkdownBodyPartSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Settings/MarkdownBodyPartSettings.cs
@@ -1,10 +1,9 @@
 using System.ComponentModel;
 
-namespace OrchardCore.Markdown.Settings
+namespace OrchardCore.Markdown.Settings;
+
+public class MarkdownBodyPartSettings
 {
-    public class MarkdownBodyPartSettings
-    {
-        [DefaultValue(true)]
-        public bool SanitizeHtml { get; set; } = true;
-    }
+    [DefaultValue(true)]
+    public bool SanitizeHtml { get; set; } = true;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Settings/MarkdownBodyPartSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Settings/MarkdownBodyPartSettingsDisplayDriver.cs
index e7b9249ee28..18058a14b82 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Settings/MarkdownBodyPartSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Settings/MarkdownBodyPartSettingsDisplayDriver.cs
@@ -6,32 +6,31 @@
 using OrchardCore.Markdown.Models;
 using OrchardCore.Markdown.ViewModels;
 
-namespace OrchardCore.Markdown.Settings
+namespace OrchardCore.Markdown.Settings;
+
+public sealed class MarkdownBodyPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<MarkdownBodyPart>
 {
-    public sealed class MarkdownBodyPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<MarkdownBodyPart>
+    public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+        return Initialize<MarkdownBodyPartSettingsViewModel>("MarkdownBodyPartSettings_Edit", model =>
         {
-            return Initialize<MarkdownBodyPartSettingsViewModel>("MarkdownBodyPartSettings_Edit", model =>
-            {
-                var settings = contentTypePartDefinition.GetSettings<MarkdownBodyPartSettings>();
+            var settings = contentTypePartDefinition.GetSettings<MarkdownBodyPartSettings>();
 
-                model.SanitizeHtml = settings.SanitizeHtml;
-            }).Location("Content:20");
-        }
+            model.SanitizeHtml = settings.SanitizeHtml;
+        }).Location("Content:20");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
-        {
-            var model = new MarkdownBodyPartSettingsViewModel();
-            var settings = new MarkdownBodyPartSettings();
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    {
+        var model = new MarkdownBodyPartSettingsViewModel();
+        var settings = new MarkdownBodyPartSettings();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            settings.SanitizeHtml = model.SanitizeHtml;
+        settings.SanitizeHtml = model.SanitizeHtml;
 
-            context.Builder.WithSettings(settings);
+        context.Builder.WithSettings(settings);
 
-            return Edit(contentTypePartDefinition, context);
-        }
+        return Edit(contentTypePartDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Settings/MarkdownFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Settings/MarkdownFieldSettings.cs
index edb8d0cd684..866f12e0fc5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Settings/MarkdownFieldSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Settings/MarkdownFieldSettings.cs
@@ -1,11 +1,10 @@
 using System.ComponentModel;
 
-namespace OrchardCore.Markdown.Settings
+namespace OrchardCore.Markdown.Settings;
+
+public class MarkdownFieldSettings
 {
-    public class MarkdownFieldSettings
-    {
-        [DefaultValue(true)]
-        public bool SanitizeHtml { get; set; } = true;
-        public string Hint { get; set; }
-    }
+    [DefaultValue(true)]
+    public bool SanitizeHtml { get; set; } = true;
+    public string Hint { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Settings/MarkdownFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Settings/MarkdownFieldSettingsDriver.cs
index 495d1e812f7..9d2d7661e85 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Settings/MarkdownFieldSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Settings/MarkdownFieldSettingsDriver.cs
@@ -6,34 +6,33 @@
 using OrchardCore.Markdown.Fields;
 using OrchardCore.Markdown.ViewModels;
 
-namespace OrchardCore.Markdown.Settings
+namespace OrchardCore.Markdown.Settings;
+
+public sealed class MarkdownFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<MarkdownField>
 {
-    public sealed class MarkdownFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<MarkdownField>
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+        return Initialize<MarkdownFieldSettingsViewModel>("MarkdownFieldSettings_Edit", model =>
         {
-            return Initialize<MarkdownFieldSettingsViewModel>("MarkdownFieldSettings_Edit", model =>
-            {
-                var settings = partFieldDefinition.GetSettings<MarkdownFieldSettings>();
+            var settings = partFieldDefinition.GetSettings<MarkdownFieldSettings>();
 
-                model.SanitizeHtml = settings.SanitizeHtml;
-                model.Hint = settings.Hint;
-            }).Location("Content:20");
-        }
+            model.SanitizeHtml = settings.SanitizeHtml;
+            model.Hint = settings.Hint;
+        }).Location("Content:20");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
-        {
-            var model = new MarkdownFieldSettingsViewModel();
-            var settings = new MarkdownFieldSettings();
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        var model = new MarkdownFieldSettingsViewModel();
+        var settings = new MarkdownFieldSettings();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            settings.SanitizeHtml = model.SanitizeHtml;
-            settings.Hint = model.Hint;
+        settings.SanitizeHtml = model.SanitizeHtml;
+        settings.Hint = model.Hint;
 
-            context.Builder.WithSettings(settings);
+        context.Builder.WithSettings(settings);
 
-            return Edit(partFieldDefinition, context);
-        }
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Startup.cs
index 3ae4f4b0585..3ceb52d825d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Startup.cs
@@ -20,52 +20,51 @@
 using OrchardCore.Markdown.ViewModels;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Markdown
+namespace OrchardCore.Markdown;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
-    {
-        private const string DefaultMarkdownExtensions = "nohtml+advanced";
+    private const string DefaultMarkdownExtensions = "nohtml+advanced";
 
-        private readonly IShellConfiguration _shellConfiguration;
+    private readonly IShellConfiguration _shellConfiguration;
 
-        public Startup(IShellConfiguration shellConfiguration)
-        {
-            _shellConfiguration = shellConfiguration;
-        }
+    public Startup(IShellConfiguration shellConfiguration)
+    {
+        _shellConfiguration = shellConfiguration;
+    }
 
-        public override void ConfigureServices(IServiceCollection services)
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<MarkdownBodyPartViewModel>();
-                o.MemberAccessStrategy.Register<MarkdownFieldViewModel>();
-            })
-            .AddLiquidFilter<Markdownify>("markdownify");
+            o.MemberAccessStrategy.Register<MarkdownBodyPartViewModel>();
+            o.MemberAccessStrategy.Register<MarkdownFieldViewModel>();
+        })
+        .AddLiquidFilter<Markdownify>("markdownify");
 
-            // Markdown Part
-            services.AddContentPart<MarkdownBodyPart>()
-                .UseDisplayDriver<MarkdownBodyPartDisplayDriver>()
-                .AddHandler<MarkdownBodyPartHandler>();
+        // Markdown Part
+        services.AddContentPart<MarkdownBodyPart>()
+            .UseDisplayDriver<MarkdownBodyPartDisplayDriver>()
+            .AddHandler<MarkdownBodyPartHandler>();
 
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, MarkdownBodyPartSettingsDisplayDriver>();
-            services.AddDataMigration<Migrations>();
-            services.AddScoped<IContentPartIndexHandler, MarkdownBodyPartIndexHandler>();
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, MarkdownBodyPartSettingsDisplayDriver>();
+        services.AddDataMigration<Migrations>();
+        services.AddScoped<IContentPartIndexHandler, MarkdownBodyPartIndexHandler>();
 
-            // Markdown Field
-            services.AddContentField<MarkdownField>()
-                .UseDisplayDriver<MarkdownFieldDisplayDriver>();
+        // Markdown Field
+        services.AddContentField<MarkdownField>()
+            .UseDisplayDriver<MarkdownFieldDisplayDriver>();
 
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, MarkdownFieldSettingsDriver>();
-            services.AddScoped<IContentFieldIndexHandler, MarkdownFieldIndexHandler>();
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, MarkdownFieldSettingsDriver>();
+        services.AddScoped<IContentFieldIndexHandler, MarkdownFieldIndexHandler>();
 
-            services.AddOptions<MarkdownPipelineOptions>();
-            services.ConfigureMarkdownPipeline((pipeline) =>
-            {
-                var extensions = _shellConfiguration.GetValue("OrchardCore_Markdown:Extensions", DefaultMarkdownExtensions);
-                pipeline.Configure(extensions);
-            });
+        services.AddOptions<MarkdownPipelineOptions>();
+        services.ConfigureMarkdownPipeline((pipeline) =>
+        {
+            var extensions = _shellConfiguration.GetValue("OrchardCore_Markdown:Extensions", DefaultMarkdownExtensions);
+            pipeline.Configure(extensions);
+        });
 
-            services.AddScoped<IMarkdownService, DefaultMarkdownService>();
-        }
+        services.AddScoped<IMarkdownService, DefaultMarkdownService>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/EditMarkdownFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/EditMarkdownFieldViewModel.cs
index c8d8221133b..089f8e49ca8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/EditMarkdownFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/EditMarkdownFieldViewModel.cs
@@ -2,13 +2,12 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Markdown.Fields;
 
-namespace OrchardCore.Markdown.ViewModels
+namespace OrchardCore.Markdown.ViewModels;
+
+public class EditMarkdownFieldViewModel
 {
-    public class EditMarkdownFieldViewModel
-    {
-        public string Markdown { get; set; }
-        public MarkdownField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public string Markdown { get; set; }
+    public MarkdownField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/MarkdownBodyPartSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/MarkdownBodyPartSettingsViewModel.cs
index fc866f81d1a..9fa3bdb6ddc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/MarkdownBodyPartSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/MarkdownBodyPartSettingsViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Markdown.ViewModels
+namespace OrchardCore.Markdown.ViewModels;
+
+public class MarkdownBodyPartSettingsViewModel
 {
-    public class MarkdownBodyPartSettingsViewModel
-    {
-        public bool SanitizeHtml { get; set; }
-    }
+    public bool SanitizeHtml { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/MarkdownBodyPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/MarkdownBodyPartViewModel.cs
index b50b5d2e320..0cc0e4cd9ba 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/MarkdownBodyPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/MarkdownBodyPartViewModel.cs
@@ -3,20 +3,19 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Markdown.Models;
 
-namespace OrchardCore.Markdown.ViewModels
+namespace OrchardCore.Markdown.ViewModels;
+
+public class MarkdownBodyPartViewModel
 {
-    public class MarkdownBodyPartViewModel
-    {
-        public string Markdown { get; set; }
-        public string Html { get; set; }
+    public string Markdown { get; set; }
+    public string Html { get; set; }
 
-        [BindNever]
-        public ContentItem ContentItem { get; set; }
+    [BindNever]
+    public ContentItem ContentItem { get; set; }
 
-        [BindNever]
-        public MarkdownBodyPart MarkdownBodyPart { get; set; }
+    [BindNever]
+    public MarkdownBodyPart MarkdownBodyPart { get; set; }
 
-        [BindNever]
-        public ContentTypePartDefinition TypePartDefinition { get; set; }
-    }
+    [BindNever]
+    public ContentTypePartDefinition TypePartDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/MarkdownFieldSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/MarkdownFieldSettingsViewModel.cs
index bc19431087d..3019810777a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/MarkdownFieldSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/MarkdownFieldSettingsViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Markdown.ViewModels
+namespace OrchardCore.Markdown.ViewModels;
+
+public class MarkdownFieldSettingsViewModel
 {
-    public class MarkdownFieldSettingsViewModel
-    {
-        public bool SanitizeHtml { get; set; }
-        public string Hint { get; set; }
-    }
+    public bool SanitizeHtml { get; set; }
+    public string Hint { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/MarkdownFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/MarkdownFieldViewModel.cs
index 09f1f82aaec..6e6534a7f42 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/MarkdownFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/ViewModels/MarkdownFieldViewModel.cs
@@ -2,14 +2,13 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Markdown.Fields;
 
-namespace OrchardCore.Markdown.ViewModels
+namespace OrchardCore.Markdown.ViewModels;
+
+public class MarkdownFieldViewModel
 {
-    public class MarkdownFieldViewModel
-    {
-        public string Markdown { get; set; }
-        public string Html { get; set; }
-        public MarkdownField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public string Markdown { get; set; }
+    public string Html { get; set; }
+    public MarkdownField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs
index c09cb5537cc..47810e8f486 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs
@@ -2,35 +2,34 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Media.AmazonS3
+namespace OrchardCore.Media.AmazonS3;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    internal readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder.Add(S["Configuration"], configuration => configuration
-                .Add(S["Media"], S["Media"].PrefixPosition(), media => media
-                    .Add(S["Amazon S3 Options"], S["Amazon S3 Options"].PrefixPosition(), options => options
-                        .Action("Options", "Admin", "OrchardCore.Media.AmazonS3")
-                        .Permission(Permissions.ViewAmazonS3MediaOptions)
-                        .LocalNav()
-                    )
+        builder.Add(S["Configuration"], configuration => configuration
+            .Add(S["Media"], S["Media"].PrefixPosition(), media => media
+                .Add(S["Amazon S3 Options"], S["Amazon S3 Options"].PrefixPosition(), options => options
+                    .Action("Options", "Admin", "OrchardCore.Media.AmazonS3")
+                    .Permission(Permissions.ViewAmazonS3MediaOptions)
+                    .LocalNav()
                 )
-            );
+            )
+        );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/Controllers/AdminController.cs
index 3db2145da07..67bf472f9d8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/Controllers/AdminController.cs
@@ -8,47 +8,46 @@
 using OrchardCore.FileStorage.AmazonS3;
 using OrchardCore.Media.AmazonS3.ViewModels;
 
-namespace OrchardCore.Media.AmazonS3
+namespace OrchardCore.Media.AmazonS3;
+
+public class AdminController : Controller
 {
-    public class AdminController : Controller
+    private readonly IAuthorizationService _authorizationService;
+    private readonly AwsStorageOptions _options;
+    private readonly INotifier _notifier;
+    protected readonly IHtmlLocalizer H;
+
+    public AdminController(
+        IAuthorizationService authorizationService,
+        IOptions<AwsStorageOptions> options,
+        INotifier notifier,
+        IHtmlLocalizer<AdminController> htmlLocalizer)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly AwsStorageOptions _options;
-        private readonly INotifier _notifier;
-        protected readonly IHtmlLocalizer H;
+        _authorizationService = authorizationService;
+        _notifier = notifier;
+        H = htmlLocalizer;
+        _options = options.Value;
+    }
 
-        public AdminController(
-            IAuthorizationService authorizationService,
-            IOptions<AwsStorageOptions> options,
-            INotifier notifier,
-            IHtmlLocalizer<AdminController> htmlLocalizer)
+    public async Task<IActionResult> Options()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ViewAmazonS3MediaOptions))
         {
-            _authorizationService = authorizationService;
-            _notifier = notifier;
-            H = htmlLocalizer;
-            _options = options.Value;
+            return Forbid();
         }
 
-        public async Task<IActionResult> Options()
+        if (_options.Validate().Any())
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ViewAmazonS3MediaOptions))
-            {
-                return Forbid();
-            }
-            
-            if (_options.Validate().Any())
-            {
-                await _notifier.ErrorAsync(H["The Amazon S3 Media feature is enabled, but it was not configured with appsettings.json."]);
-            }
+            await _notifier.ErrorAsync(H["The Amazon S3 Media feature is enabled, but it was not configured with appsettings.json."]);
+        }
 
-            var model = new OptionsViewModel
-            {
-                BucketName = _options.BucketName,
-                BasePath = _options.BasePath,
-                CreateBucket = _options.CreateBucket
-            };
+        var model = new OptionsViewModel
+        {
+            BucketName = _options.BucketName,
+            BasePath = _options.BasePath,
+            CreateBucket = _options.CreateBucket
+        };
 
-            return View(model);
-        }
+        return View(model);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/ViewModels/OptionsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/ViewModels/OptionsViewModel.cs
index 002bcefbdbc..ccb0bcb571c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/ViewModels/OptionsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/ViewModels/OptionsViewModel.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.Media.AmazonS3.ViewModels
+namespace OrchardCore.Media.AmazonS3.ViewModels;
+
+public class OptionsViewModel
 {
-    public class OptionsViewModel
-    {
-        public string BucketName { get; set; }
+    public string BucketName { get; set; }
 
-        public string BasePath { get; set; }
+    public string BasePath { get; set; }
 
-        public bool CreateBucket { get; set; }
-    }
+    public bool CreateBucket { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs
index 2adb0d8efa8..9207949566f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs
@@ -2,35 +2,34 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Media.Azure
+namespace OrchardCore.Media.Azure;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    internal readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder.Add(S["Configuration"], configuration => configuration
-                .Add(S["Media"], S["Media"].PrefixPosition(), media => media
-                    .Add(S["Azure Blob Options"], S["Azure Blob Options"].PrefixPosition(), options => options
-                        .Action("Options", "Admin", "OrchardCore.Media.Azure")
-                        .Permission(Permissions.ViewAzureMediaOptions)
-                        .LocalNav()
-                    )
+        builder.Add(S["Configuration"], configuration => configuration
+            .Add(S["Media"], S["Media"].PrefixPosition(), media => media
+                .Add(S["Azure Blob Options"], S["Azure Blob Options"].PrefixPosition(), options => options
+                    .Action("Options", "Admin", "OrchardCore.Media.Azure")
+                    .Permission(Permissions.ViewAzureMediaOptions)
+                    .LocalNav()
                 )
-            );
+            )
+        );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media.Azure/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Media.Azure/Controllers/AdminController.cs
index 4a641df0d2c..d1d6d55c9c5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media.Azure/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media.Azure/Controllers/AdminController.cs
@@ -6,39 +6,38 @@
 using OrchardCore.Media.Azure.ViewModels;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Media.Azure
+namespace OrchardCore.Media.Azure;
+
+[Feature("OrchardCore.Media.Azure.Storage")]
+[Admin("MediaAzureBlob/{action}", "AzureBlob.{action}")]
+public class AdminController : Controller
 {
-    [Feature("OrchardCore.Media.Azure.Storage")]
-    [Admin("MediaAzureBlob/{action}", "AzureBlob.{action}")]
-    public class AdminController : Controller
+    private readonly IAuthorizationService _authorizationService;
+    private readonly MediaBlobStorageOptions _options;
+
+    public AdminController(
+        IAuthorizationService authorizationService,
+        IOptions<MediaBlobStorageOptions> options)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly MediaBlobStorageOptions _options;
+        _authorizationService = authorizationService;
+        _options = options.Value;
+    }
 
-        public AdminController(
-            IAuthorizationService authorizationService,
-            IOptions<MediaBlobStorageOptions> options)
+    public async Task<IActionResult> Options()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ViewAzureMediaOptions))
         {
-            _authorizationService = authorizationService;
-            _options = options.Value;
+            return Forbid();
         }
 
-        public async Task<IActionResult> Options()
+        var model = new OptionsViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ViewAzureMediaOptions))
-            {
-                return Forbid();
-            }
-
-            var model = new OptionsViewModel
-            {
-                CreateContainer = _options.CreateContainer,
-                ContainerName = _options.ContainerName,
-                ConnectionString = _options.ConnectionString,
-                BasePath = _options.BasePath
-            };
+            CreateContainer = _options.CreateContainer,
+            ContainerName = _options.ContainerName,
+            ConnectionString = _options.ConnectionString,
+            BasePath = _options.BasePath
+        };
 
-            return View(model);
-        }
+        return View(model);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media.Azure/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Media.Azure/Startup.cs
index e256ed82f0f..158ee60a2d3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media.Azure/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media.Azure/Startup.cs
@@ -22,186 +22,185 @@
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.Caching.Azure;
 
-namespace OrchardCore.Media.Azure
+namespace OrchardCore.Media.Azure;
+
+[Feature("OrchardCore.Media.Azure.Storage")]
+public sealed class Startup : Modules.StartupBase
 {
-    [Feature("OrchardCore.Media.Azure.Storage")]
-    public sealed class Startup : Modules.StartupBase
-    {
-        private readonly ILogger _logger;
-        private readonly IShellConfiguration _configuration;
+    private readonly ILogger _logger;
+    private readonly IShellConfiguration _configuration;
 
-        public Startup(ILogger<Startup> logger, IShellConfiguration configuration)
-        {
-            _logger = logger;
-            _configuration = configuration;
-        }
+    public Startup(ILogger<Startup> logger, IShellConfiguration configuration)
+    {
+        _logger = logger;
+        _configuration = configuration;
+    }
 
-        public override int Order
-            => OrchardCoreConstants.ConfigureOrder.AzureMediaStorage;
+    public override int Order
+        => OrchardCoreConstants.ConfigureOrder.AzureMediaStorage;
 
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddTransient<IConfigureOptions<MediaBlobStorageOptions>, MediaBlobStorageOptionsConfiguration>();
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddTransient<IConfigureOptions<MediaBlobStorageOptions>, MediaBlobStorageOptionsConfiguration>();
 
-            // Only replace default implementation if options are valid.
-            var section = _configuration.GetSection("OrchardCore_Media_Azure");
-            var connectionString = section.GetValue<string>(nameof(MediaBlobStorageOptions.ConnectionString));
-            var containerName = section.GetValue<string>(nameof(MediaBlobStorageOptions.ContainerName));
+        // Only replace default implementation if options are valid.
+        var section = _configuration.GetSection("OrchardCore_Media_Azure");
+        var connectionString = section.GetValue<string>(nameof(MediaBlobStorageOptions.ConnectionString));
+        var containerName = section.GetValue<string>(nameof(MediaBlobStorageOptions.ContainerName));
 
-            if (CheckOptions(connectionString, containerName, _logger))
+        if (CheckOptions(connectionString, containerName, _logger))
+        {
+            // Register a media cache file provider.
+            services.AddSingleton<IMediaFileStoreCacheFileProvider>(serviceProvider =>
             {
-                // Register a media cache file provider.
-                services.AddSingleton<IMediaFileStoreCacheFileProvider>(serviceProvider =>
-                {
-                    var hostingEnvironment = serviceProvider.GetRequiredService<IWebHostEnvironment>();
+                var hostingEnvironment = serviceProvider.GetRequiredService<IWebHostEnvironment>();
 
-                    if (string.IsNullOrWhiteSpace(hostingEnvironment.WebRootPath))
-                    {
-                        throw new MediaConfigurationException("The wwwroot folder for serving cache media files is missing.");
-                    }
+                if (string.IsNullOrWhiteSpace(hostingEnvironment.WebRootPath))
+                {
+                    throw new MediaConfigurationException("The wwwroot folder for serving cache media files is missing.");
+                }
 
-                    var mediaOptions = serviceProvider.GetRequiredService<IOptions<MediaOptions>>().Value;
-                    var shellOptions = serviceProvider.GetRequiredService<IOptions<ShellOptions>>();
-                    var shellSettings = serviceProvider.GetRequiredService<ShellSettings>();
-                    var logger = serviceProvider.GetRequiredService<ILogger<DefaultMediaFileStoreCacheFileProvider>>();
+                var mediaOptions = serviceProvider.GetRequiredService<IOptions<MediaOptions>>().Value;
+                var shellOptions = serviceProvider.GetRequiredService<IOptions<ShellOptions>>();
+                var shellSettings = serviceProvider.GetRequiredService<ShellSettings>();
+                var logger = serviceProvider.GetRequiredService<ILogger<DefaultMediaFileStoreCacheFileProvider>>();
 
-                    var mediaCachePath = GetMediaCachePath(
-                        hostingEnvironment, shellSettings, DefaultMediaFileStoreCacheFileProvider.AssetsCachePath);
+                var mediaCachePath = GetMediaCachePath(
+                    hostingEnvironment, shellSettings, DefaultMediaFileStoreCacheFileProvider.AssetsCachePath);
 
-                    if (!Directory.Exists(mediaCachePath))
-                    {
-                        Directory.CreateDirectory(mediaCachePath);
-                    }
+                if (!Directory.Exists(mediaCachePath))
+                {
+                    Directory.CreateDirectory(mediaCachePath);
+                }
 
-                    return new DefaultMediaFileStoreCacheFileProvider(logger, mediaOptions.AssetsRequestPath, mediaCachePath);
-                });
+                return new DefaultMediaFileStoreCacheFileProvider(logger, mediaOptions.AssetsRequestPath, mediaCachePath);
+            });
 
-                // Replace the default media file provider with the media cache file provider.
-                services.Replace(ServiceDescriptor.Singleton<IMediaFileProvider>(serviceProvider =>
-                    serviceProvider.GetRequiredService<IMediaFileStoreCacheFileProvider>()));
+            // Replace the default media file provider with the media cache file provider.
+            services.Replace(ServiceDescriptor.Singleton<IMediaFileProvider>(serviceProvider =>
+                serviceProvider.GetRequiredService<IMediaFileStoreCacheFileProvider>()));
 
-                // Register the media cache file provider as a file store cache provider.
-                services.AddSingleton<IMediaFileStoreCache>(serviceProvider =>
-                    serviceProvider.GetRequiredService<IMediaFileStoreCacheFileProvider>());
+            // Register the media cache file provider as a file store cache provider.
+            services.AddSingleton<IMediaFileStoreCache>(serviceProvider =>
+                serviceProvider.GetRequiredService<IMediaFileStoreCacheFileProvider>());
 
-                // Replace the default media file store with a blob file store.
-                services.Replace(ServiceDescriptor.Singleton<IMediaFileStore>(serviceProvider =>
+            // Replace the default media file store with a blob file store.
+            services.Replace(ServiceDescriptor.Singleton<IMediaFileStore>(serviceProvider =>
+            {
+                var blobStorageOptions = serviceProvider.GetRequiredService<IOptions<MediaBlobStorageOptions>>().Value;
+                var shellOptions = serviceProvider.GetRequiredService<IOptions<ShellOptions>>();
+                var shellSettings = serviceProvider.GetRequiredService<ShellSettings>();
+                var mediaOptions = serviceProvider.GetRequiredService<IOptions<MediaOptions>>().Value;
+                var clock = serviceProvider.GetRequiredService<IClock>();
+                var contentTypeProvider = serviceProvider.GetRequiredService<IContentTypeProvider>();
+                var mediaEventHandlers = serviceProvider.GetServices<IMediaEventHandler>();
+                var mediaCreatingEventHandlers = serviceProvider.GetServices<IMediaCreatingEventHandler>();
+                var logger = serviceProvider.GetRequiredService<ILogger<DefaultMediaFileStore>>();
+
+                var fileStore = new BlobFileStore(blobStorageOptions, clock, contentTypeProvider);
+                var mediaUrlBase = "/" + fileStore.Combine(shellSettings.RequestUrlPrefix, mediaOptions.AssetsRequestPath);
+
+                var originalPathBase = serviceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext
+                    ?.Features.Get<ShellContextFeature>()
+                    ?.OriginalPathBase ?? PathString.Empty;
+
+                if (originalPathBase.HasValue)
                 {
-                    var blobStorageOptions = serviceProvider.GetRequiredService<IOptions<MediaBlobStorageOptions>>().Value;
-                    var shellOptions = serviceProvider.GetRequiredService<IOptions<ShellOptions>>();
-                    var shellSettings = serviceProvider.GetRequiredService<ShellSettings>();
-                    var mediaOptions = serviceProvider.GetRequiredService<IOptions<MediaOptions>>().Value;
-                    var clock = serviceProvider.GetRequiredService<IClock>();
-                    var contentTypeProvider = serviceProvider.GetRequiredService<IContentTypeProvider>();
-                    var mediaEventHandlers = serviceProvider.GetServices<IMediaEventHandler>();
-                    var mediaCreatingEventHandlers = serviceProvider.GetServices<IMediaCreatingEventHandler>();
-                    var logger = serviceProvider.GetRequiredService<ILogger<DefaultMediaFileStore>>();
-
-                    var fileStore = new BlobFileStore(blobStorageOptions, clock, contentTypeProvider);
-                    var mediaUrlBase = "/" + fileStore.Combine(shellSettings.RequestUrlPrefix, mediaOptions.AssetsRequestPath);
-
-                    var originalPathBase = serviceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext
-                        ?.Features.Get<ShellContextFeature>()
-                        ?.OriginalPathBase ?? PathString.Empty;
-
-                    if (originalPathBase.HasValue)
-                    {
-                        mediaUrlBase = fileStore.Combine(originalPathBase.Value, mediaUrlBase);
-                    }
-
-                    return new DefaultMediaFileStore(fileStore, mediaUrlBase, mediaOptions.CdnBaseUrl, mediaEventHandlers, mediaCreatingEventHandlers, logger);
-                }));
-
-                services.AddSingleton<IMediaEventHandler, DefaultMediaFileStoreCacheEventHandler>();
-
-                services.AddScoped<IModularTenantEvents, MediaBlobContainerTenantEvents>();
-            }
-        }
+                    mediaUrlBase = fileStore.Combine(originalPathBase.Value, mediaUrlBase);
+                }
 
-        private static string GetMediaCachePath(IWebHostEnvironment hostingEnvironment, ShellSettings shellSettings, string assetsPath)
-            => PathExtensions.Combine(hostingEnvironment.WebRootPath, shellSettings.Name, assetsPath);
+                return new DefaultMediaFileStore(fileStore, mediaUrlBase, mediaOptions.CdnBaseUrl, mediaEventHandlers, mediaCreatingEventHandlers, logger);
+            }));
 
-        private static bool CheckOptions(string connectionString, string containerName, ILogger logger)
-        {
-            var optionsAreValid = true;
-
-            if (string.IsNullOrWhiteSpace(connectionString))
-            {
-                logger.LogError("Azure Media Storage is enabled but not active because the 'ConnectionString' is missing or empty in application configuration.");
-                optionsAreValid = false;
-            }
+            services.AddSingleton<IMediaEventHandler, DefaultMediaFileStoreCacheEventHandler>();
 
-            if (string.IsNullOrWhiteSpace(containerName))
-            {
-                logger.LogError("Azure Media Storage is enabled but not active because the 'ContainerName' is missing or empty in application configuration.");
-                optionsAreValid = false;
-            }
-
-            return optionsAreValid;
+            services.AddScoped<IModularTenantEvents, MediaBlobContainerTenantEvents>();
         }
     }
 
-    [Feature("OrchardCore.Media.Azure.ImageSharpImageCache")]
-    public sealed class ImageSharpAzureBlobCacheStartup : Modules.StartupBase
+    private static string GetMediaCachePath(IWebHostEnvironment hostingEnvironment, ShellSettings shellSettings, string assetsPath)
+        => PathExtensions.Combine(hostingEnvironment.WebRootPath, shellSettings.Name, assetsPath);
+
+    private static bool CheckOptions(string connectionString, string containerName, ILogger logger)
     {
-        private readonly IShellConfiguration _configuration;
-        private readonly ILogger _logger;
+        var optionsAreValid = true;
 
-        public ImageSharpAzureBlobCacheStartup(
-            IShellConfiguration configuration,
-            ILogger<ImageSharpAzureBlobCacheStartup> logger)
+        if (string.IsNullOrWhiteSpace(connectionString))
         {
-            _configuration = configuration;
-            _logger = logger;
+            logger.LogError("Azure Media Storage is enabled but not active because the 'ConnectionString' is missing or empty in application configuration.");
+            optionsAreValid = false;
         }
 
-        public override int Order
-            => OrchardCoreConstants.ConfigureOrder.AzureImageSharpCache;
-
-        public override void ConfigureServices(IServiceCollection services)
+        if (string.IsNullOrWhiteSpace(containerName))
         {
-            services.AddTransient<IConfigureOptions<ImageSharpBlobImageCacheOptions>, ImageSharpBlobImageCacheOptionsConfiguration>();
-            services.AddTransient<IConfigureOptions<AzureBlobStorageCacheOptions>, AzureBlobStorageCacheOptionsConfiguration>();
+            logger.LogError("Azure Media Storage is enabled but not active because the 'ContainerName' is missing or empty in application configuration.");
+            optionsAreValid = false;
+        }
 
-            // Only replace default implementation if options are valid.
-            var section = _configuration.GetSection("OrchardCore_Media_Azure_ImageSharp_Cache");
-            var connectionString = section.GetValue<string>(nameof(MediaBlobStorageOptions.ConnectionString));
-            var containerName = section.GetValue<string>(nameof(MediaBlobStorageOptions.ContainerName));
+        return optionsAreValid;
+    }
+}
 
-            if (!CheckOptions(connectionString, containerName))
-            {
-                return;
-            }
+[Feature("OrchardCore.Media.Azure.ImageSharpImageCache")]
+public sealed class ImageSharpAzureBlobCacheStartup : Modules.StartupBase
+{
+    private readonly IShellConfiguration _configuration;
+    private readonly ILogger _logger;
 
-            // Following https://docs.sixlabors.com/articles/imagesharp.web/imagecaches.html we'd use
-            // SetCache<AzureBlobStorageCache>() but that's only available on IImageSharpBuilder after AddImageSharp(),
-            // what happens in OrchardCore.Media. Thus, an explicit Replace() is necessary.
-            services.Replace(ServiceDescriptor.Singleton<IImageCache, AzureBlobStorageCache>());
+    public ImageSharpAzureBlobCacheStartup(
+        IShellConfiguration configuration,
+        ILogger<ImageSharpAzureBlobCacheStartup> logger)
+    {
+        _configuration = configuration;
+        _logger = logger;
+    }
 
-            services.AddScoped<IModularTenantEvents, ImageSharpBlobImageCacheTenantEvents>();
-        }
+    public override int Order
+        => OrchardCoreConstants.ConfigureOrder.AzureImageSharpCache;
+
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddTransient<IConfigureOptions<ImageSharpBlobImageCacheOptions>, ImageSharpBlobImageCacheOptionsConfiguration>();
+        services.AddTransient<IConfigureOptions<AzureBlobStorageCacheOptions>, AzureBlobStorageCacheOptionsConfiguration>();
 
-        private bool CheckOptions(string connectionString, string containerName)
+        // Only replace default implementation if options are valid.
+        var section = _configuration.GetSection("OrchardCore_Media_Azure_ImageSharp_Cache");
+        var connectionString = section.GetValue<string>(nameof(MediaBlobStorageOptions.ConnectionString));
+        var containerName = section.GetValue<string>(nameof(MediaBlobStorageOptions.ContainerName));
+
+        if (!CheckOptions(connectionString, containerName))
         {
-            var optionsAreValid = true;
+            return;
+        }
 
-            if (string.IsNullOrWhiteSpace(connectionString))
-            {
-                _logger.LogError(
-                    "Azure Media ImageSharp Image Cache is enabled but not active because the 'ConnectionString' is missing or empty in application configuration.");
-                optionsAreValid = false;
-            }
+        // Following https://docs.sixlabors.com/articles/imagesharp.web/imagecaches.html we'd use
+        // SetCache<AzureBlobStorageCache>() but that's only available on IImageSharpBuilder after AddImageSharp(),
+        // what happens in OrchardCore.Media. Thus, an explicit Replace() is necessary.
+        services.Replace(ServiceDescriptor.Singleton<IImageCache, AzureBlobStorageCache>());
 
-            if (string.IsNullOrWhiteSpace(containerName))
-            {
-                _logger.LogError(
-                    "Azure Media ImageSharp Image Cache is enabled but not active because the 'ContainerName' is missing or empty in application configuration.");
-                optionsAreValid = false;
-            }
+        services.AddScoped<IModularTenantEvents, ImageSharpBlobImageCacheTenantEvents>();
+    }
+
+    private bool CheckOptions(string connectionString, string containerName)
+    {
+        var optionsAreValid = true;
 
-            return optionsAreValid;
+        if (string.IsNullOrWhiteSpace(connectionString))
+        {
+            _logger.LogError(
+                "Azure Media ImageSharp Image Cache is enabled but not active because the 'ConnectionString' is missing or empty in application configuration.");
+            optionsAreValid = false;
         }
+
+        if (string.IsNullOrWhiteSpace(containerName))
+        {
+            _logger.LogError(
+                "Azure Media ImageSharp Image Cache is enabled but not active because the 'ContainerName' is missing or empty in application configuration.");
+            optionsAreValid = false;
+        }
+
+        return optionsAreValid;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media.Azure/ViewModels/OptionsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Media.Azure/ViewModels/OptionsViewModel.cs
index 58aa004c624..d634bb293ac 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media.Azure/ViewModels/OptionsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media.Azure/ViewModels/OptionsViewModel.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.Media.Azure.ViewModels
+namespace OrchardCore.Media.Azure.ViewModels;
+
+public class OptionsViewModel
 {
-    public class OptionsViewModel
-    {
-        public string ConnectionString { get; set; }
-        public string ContainerName { get; set; }
-        public string BasePath { get; set; }
-        public bool CreateContainer { get; set; }
-    }
+    public string ConnectionString { get; set; }
+    public string ContainerName { get; set; }
+    public string BasePath { get; set; }
+    public bool CreateContainer { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media.Indexing.Pdf/Services/PdfMediaFileTextProvider.cs b/src/OrchardCore.Modules/OrchardCore.Media.Indexing.Pdf/Services/PdfMediaFileTextProvider.cs
index 67449f9bbbd..7654b759aaa 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media.Indexing.Pdf/Services/PdfMediaFileTextProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media.Indexing.Pdf/Services/PdfMediaFileTextProvider.cs
@@ -3,45 +3,44 @@
 using Cysharp.Text;
 using UglyToad.PdfPig;
 
-namespace OrchardCore.Media.Indexing
+namespace OrchardCore.Media.Indexing;
+
+public class PdfMediaFileTextProvider : IMediaFileTextProvider
 {
-    public class PdfMediaFileTextProvider : IMediaFileTextProvider
+    public async Task<string> GetTextAsync(string path, Stream fileStream)
     {
-        public async Task<string> GetTextAsync(string path, Stream fileStream)
+        // PdfPig requires the stream to be seekable, see:
+        // https://github.com/UglyToad/PdfPig/blob/master/src/UglyToad.PdfPig.Core/StreamInputBytes.cs#L45.
+        // Thus if it isn't, which is the case with e.g. Azure Blob Storage, we need to copy it to a new, seekable
+        // Stream.
+        MemoryStream seekableStream = null;
+        try
         {
-            // PdfPig requires the stream to be seekable, see:
-            // https://github.com/UglyToad/PdfPig/blob/master/src/UglyToad.PdfPig.Core/StreamInputBytes.cs#L45.
-            // Thus if it isn't, which is the case with e.g. Azure Blob Storage, we need to copy it to a new, seekable
-            // Stream.
-            MemoryStream seekableStream = null;
-            try
+            if (!fileStream.CanSeek)
             {
-                if (!fileStream.CanSeek)
-                {
-                    // Since fileStream.Length might not be supported either, we can't preconfigure the capacity of the
-                    // MemoryStream.
-                    seekableStream = new MemoryStream();
-                    // While this involves loading the file into memory, we don't really have a choice.
-                    await fileStream.CopyToAsync(seekableStream);
-                    seekableStream.Position = 0;
-                }
-
-                using var document = PdfDocument.Open(seekableStream ?? fileStream);
-                using var stringBuilder = ZString.CreateStringBuilder();
+                // Since fileStream.Length might not be supported either, we can't preconfigure the capacity of the
+                // MemoryStream.
+                seekableStream = new MemoryStream();
+                // While this involves loading the file into memory, we don't really have a choice.
+                await fileStream.CopyToAsync(seekableStream);
+                seekableStream.Position = 0;
+            }
 
-                foreach (var page in document.GetPages())
-                {
-                    stringBuilder.Append(page.Text);
-                }
+            using var document = PdfDocument.Open(seekableStream ?? fileStream);
+            using var stringBuilder = ZString.CreateStringBuilder();
 
-                return stringBuilder.ToString();
+            foreach (var page in document.GetPages())
+            {
+                stringBuilder.Append(page.Text);
             }
-            finally
+
+            return stringBuilder.ToString();
+        }
+        finally
+        {
+            if (seekableStream != null)
             {
-                if (seekableStream != null)
-                {
-                    await seekableStream.DisposeAsync();
-                }
+                await seekableStream.DisposeAsync();
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs
index a2b3525ad38..7af2d2eead1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs
@@ -2,79 +2,78 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Media
+namespace OrchardCore.Media;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    internal readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Content"], content => content
-                    .AddClass("media")
-                    .Id("media")
-                    .Add(S["Media Library"], S["Media Library"].PrefixPosition(), media => media
-                        .Permission(Permissions.ManageMedia)
-                        .Action("Index", "Admin", "OrchardCore.Media")
-                        .LocalNav()
-                    )
-                );
-
-            builder.Add(S["Configuration"], configuration => configuration
-                .Add(S["Media"], S["Media"].PrefixPosition(), media => media
-                    .Add(S["Media Options"], S["Media Options"].PrefixPosition(), options => options
-                        .Action("Options", "Admin", "OrchardCore.Media")
-                        .Permission(Permissions.ViewMediaOptions)
-                        .LocalNav()
-                    )
-                    .Add(S["Media Profiles"], S["Media Profiles"].PrefixPosition(), mediaProfiles => mediaProfiles
-                        .Action("Index", "MediaProfiles", "OrchardCore.Media")
-                        .Permission(Permissions.ManageMediaProfiles)
-                        .LocalNav()
-                    )
+        builder
+            .Add(S["Content"], content => content
+                .AddClass("media")
+                .Id("media")
+                .Add(S["Media Library"], S["Media Library"].PrefixPosition(), media => media
+                    .Permission(Permissions.ManageMedia)
+                    .Action("Index", "Admin", "OrchardCore.Media")
+                    .LocalNav()
                 )
             );
 
-            return Task.CompletedTask;
-        }
+        builder.Add(S["Configuration"], configuration => configuration
+            .Add(S["Media"], S["Media"].PrefixPosition(), media => media
+                .Add(S["Media Options"], S["Media Options"].PrefixPosition(), options => options
+                    .Action("Options", "Admin", "OrchardCore.Media")
+                    .Permission(Permissions.ViewMediaOptions)
+                    .LocalNav()
+                )
+                .Add(S["Media Profiles"], S["Media Profiles"].PrefixPosition(), mediaProfiles => mediaProfiles
+                    .Action("Index", "MediaProfiles", "OrchardCore.Media")
+                    .Permission(Permissions.ManageMediaProfiles)
+                    .LocalNav()
+                )
+            )
+        );
+
+        return Task.CompletedTask;
     }
+}
+
+public sealed class MediaCacheAdminMenu : INavigationProvider
+{
+    internal readonly IStringLocalizer S;
 
-    public sealed class MediaCacheAdminMenu : INavigationProvider
+    public MediaCacheAdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public MediaCacheAdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder.Add(S["Configuration"], configuration => configuration
-                .Add(S["Media"], S["Media"].PrefixPosition(), media => media
-                    .Add(S["Media Cache"], S["Media Cache"].PrefixPosition(), cache => cache
-                        .Action("Index", "MediaCache", "OrchardCore.Media")
-                        .Permission(MediaCachePermissions.ManageAssetCache)
-                        .LocalNav())
-            ));
+        builder.Add(S["Configuration"], configuration => configuration
+            .Add(S["Media"], S["Media"].PrefixPosition(), media => media
+                .Add(S["Media Cache"], S["Media Cache"].PrefixPosition(), cache => cache
+                    .Action("Index", "MediaCache", "OrchardCore.Media")
+                    .Permission(MediaCachePermissions.ManageAssetCache)
+                    .LocalNav())
+        ));
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Media/Controllers/AdminController.cs
index 7286ca87b59..4a9eece8c9b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Controllers/AdminController.cs
@@ -17,567 +17,566 @@
 using OrchardCore.Media.Services;
 using OrchardCore.Media.ViewModels;
 
-namespace OrchardCore.Media.Controllers
+namespace OrchardCore.Media.Controllers;
+
+[Admin("Media/{action}", "Media.{action}")]
+public class AdminController : Controller
 {
-    [Admin("Media/{action}", "Media.{action}")]
-    public class AdminController : Controller
+    private static readonly char[] _invalidFolderNameCharacters = ['\\', '/'];
+    private static readonly char[] _extensionSeperator = [' ', ','];
+
+    private readonly IMediaFileStore _mediaFileStore;
+    private readonly IMediaNameNormalizerService _mediaNameNormalizerService;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IContentTypeProvider _contentTypeProvider;
+    private readonly ILogger _logger;
+    protected readonly IStringLocalizer S;
+    private readonly MediaOptions _mediaOptions;
+    private readonly IUserAssetFolderNameProvider _userAssetFolderNameProvider;
+    private readonly IChunkFileUploadService _chunkFileUploadService;
+    private readonly IFileVersionProvider _fileVersionProvider;
+    private readonly IServiceProvider _serviceProvider;
+    private readonly AttachedMediaFieldFileService _attachedMediaFieldFileService;
+
+    public AdminController(
+        IMediaFileStore mediaFileStore,
+        IMediaNameNormalizerService mediaNameNormalizerService,
+        IAuthorizationService authorizationService,
+        IContentTypeProvider contentTypeProvider,
+        IOptions<MediaOptions> options,
+        ILogger<AdminController> logger,
+        IStringLocalizer<AdminController> stringLocalizer,
+        IUserAssetFolderNameProvider userAssetFolderNameProvider,
+        IChunkFileUploadService chunkFileUploadService,
+        IFileVersionProvider fileVersionProvider,
+        IServiceProvider serviceProvider,
+        AttachedMediaFieldFileService attachedMediaFieldFileService)
     {
-        private static readonly char[] _invalidFolderNameCharacters = ['\\', '/'];
-        private static readonly char[] _extensionSeperator = [' ', ','];
-
-        private readonly IMediaFileStore _mediaFileStore;
-        private readonly IMediaNameNormalizerService _mediaNameNormalizerService;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IContentTypeProvider _contentTypeProvider;
-        private readonly ILogger _logger;
-        protected readonly IStringLocalizer S;
-        private readonly MediaOptions _mediaOptions;
-        private readonly IUserAssetFolderNameProvider _userAssetFolderNameProvider;
-        private readonly IChunkFileUploadService _chunkFileUploadService;
-        private readonly IFileVersionProvider _fileVersionProvider;
-        private readonly IServiceProvider _serviceProvider;
-        private readonly AttachedMediaFieldFileService _attachedMediaFieldFileService;
-
-        public AdminController(
-            IMediaFileStore mediaFileStore,
-            IMediaNameNormalizerService mediaNameNormalizerService,
-            IAuthorizationService authorizationService,
-            IContentTypeProvider contentTypeProvider,
-            IOptions<MediaOptions> options,
-            ILogger<AdminController> logger,
-            IStringLocalizer<AdminController> stringLocalizer,
-            IUserAssetFolderNameProvider userAssetFolderNameProvider,
-            IChunkFileUploadService chunkFileUploadService,
-            IFileVersionProvider fileVersionProvider,
-            IServiceProvider serviceProvider,
-            AttachedMediaFieldFileService attachedMediaFieldFileService)
-        {
-            _mediaFileStore = mediaFileStore;
-            _mediaNameNormalizerService = mediaNameNormalizerService;
-            _authorizationService = authorizationService;
-            _contentTypeProvider = contentTypeProvider;
-            _mediaOptions = options.Value;
-            _logger = logger;
-            S = stringLocalizer;
-            _userAssetFolderNameProvider = userAssetFolderNameProvider;
-            _chunkFileUploadService = chunkFileUploadService;
-            _fileVersionProvider = fileVersionProvider;
-            _serviceProvider = serviceProvider;
-            _attachedMediaFieldFileService = attachedMediaFieldFileService;
-        }
-
-        [Admin("Media", "Media.Index")]
-        public async Task<IActionResult> Index()
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia))
-            {
-                return Forbid();
-            }
+        _mediaFileStore = mediaFileStore;
+        _mediaNameNormalizerService = mediaNameNormalizerService;
+        _authorizationService = authorizationService;
+        _contentTypeProvider = contentTypeProvider;
+        _mediaOptions = options.Value;
+        _logger = logger;
+        S = stringLocalizer;
+        _userAssetFolderNameProvider = userAssetFolderNameProvider;
+        _chunkFileUploadService = chunkFileUploadService;
+        _fileVersionProvider = fileVersionProvider;
+        _serviceProvider = serviceProvider;
+        _attachedMediaFieldFileService = attachedMediaFieldFileService;
+    }
 
-            return View();
+    [Admin("Media", "Media.Index")]
+    public async Task<IActionResult> Index()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia))
+        {
+            return Forbid();
         }
 
-        public async Task<ActionResult<IEnumerable<MediaFolderViewModel>>> GetFolders(string path)
+        return View();
+    }
+
+    public async Task<ActionResult<IEnumerable<MediaFolderViewModel>>> GetFolders(string path)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            if (string.IsNullOrEmpty(path))
-            {
-                path = string.Empty;
-            }
+        if (string.IsNullOrEmpty(path))
+        {
+            path = string.Empty;
+        }
 
-            if (await _mediaFileStore.GetDirectoryInfoAsync(path) == null)
-            {
-                return NotFound();
-            }
+        if (await _mediaFileStore.GetDirectoryInfoAsync(path) == null)
+        {
+            return NotFound();
+        }
 
-            // create default folders if not exist
-            if (await _authorizationService.AuthorizeAsync(User, Permissions.ManageOwnMedia)
-                && await _mediaFileStore.GetDirectoryInfoAsync(_mediaFileStore.Combine(_mediaOptions.AssetsUsersFolder, _userAssetFolderNameProvider.GetUserAssetFolderName(User))) == null)
-            {
-                await _mediaFileStore.TryCreateDirectoryAsync(_mediaFileStore.Combine(_mediaOptions.AssetsUsersFolder, _userAssetFolderNameProvider.GetUserAssetFolderName(User)));
-            }
+        // create default folders if not exist
+        if (await _authorizationService.AuthorizeAsync(User, Permissions.ManageOwnMedia)
+            && await _mediaFileStore.GetDirectoryInfoAsync(_mediaFileStore.Combine(_mediaOptions.AssetsUsersFolder, _userAssetFolderNameProvider.GetUserAssetFolderName(User))) == null)
+        {
+            await _mediaFileStore.TryCreateDirectoryAsync(_mediaFileStore.Combine(_mediaOptions.AssetsUsersFolder, _userAssetFolderNameProvider.GetUserAssetFolderName(User)));
+        }
 
-            var allowed = _mediaFileStore.GetDirectoryContentAsync(path)
-                .WhereAwait(async e => e.IsDirectory && await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)e.Path));
+        var allowed = _mediaFileStore.GetDirectoryContentAsync(path)
+            .WhereAwait(async e => e.IsDirectory && await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)e.Path));
 
-            return Ok(await allowed.Select(folder =>
-            {
-                var isSpecial = IsSpecialFolder(folder.Path);
-                return new MediaFolderViewModel()
-                {
-                    Name = folder.Name,
-                    Path = folder.Path,
-                    DirectoryPath = folder.DirectoryPath,
-                    IsDirectory = true,
-                    LastModifiedUtc = folder.LastModifiedUtc,
-                    Length = folder.Length,
-                    CanCreateFolder = !isSpecial,
-                    CanDeleteFolder = !isSpecial
-                };
-            }).ToListAsync());
+        return Ok(await allowed.Select(folder =>
+        {
+            var isSpecial = IsSpecialFolder(folder.Path);
+            return new MediaFolderViewModel()
+            {
+                Name = folder.Name,
+                Path = folder.Path,
+                DirectoryPath = folder.DirectoryPath,
+                IsDirectory = true,
+                LastModifiedUtc = folder.LastModifiedUtc,
+                Length = folder.Length,
+                CanCreateFolder = !isSpecial,
+                CanDeleteFolder = !isSpecial
+            };
+        }).ToListAsync());
+    }
+
+    public async Task<ActionResult<IEnumerable<object>>> GetMediaItems(string path, string extensions)
+    {
+        if (string.IsNullOrEmpty(path))
+        {
+            path = string.Empty;
         }
 
-        public async Task<ActionResult<IEnumerable<object>>> GetMediaItems(string path, string extensions)
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia)
+            || !await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)path))
         {
-            if (string.IsNullOrEmpty(path))
-            {
-                path = string.Empty;
-            }
+            return Forbid();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia)
-                || !await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)path))
-            {
-                return Forbid();
-            }
+        if (await _mediaFileStore.GetDirectoryInfoAsync(path) == null)
+        {
+            return NotFound();
+        }
 
-            if (await _mediaFileStore.GetDirectoryInfoAsync(path) == null)
-            {
-                return NotFound();
-            }
+        var allowedExtensions = GetRequestedExtensions(extensions, false);
 
-            var allowedExtensions = GetRequestedExtensions(extensions, false);
+        var allowed = _mediaFileStore.GetDirectoryContentAsync(path)
+            .WhereAwait(async e =>
+                !e.IsDirectory
+                && (allowedExtensions.Count == 0 || allowedExtensions.Contains(Path.GetExtension(e.Path)))
+                && await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)e.Path))
+            .Select(e => CreateFileResult(e));
 
-            var allowed = _mediaFileStore.GetDirectoryContentAsync(path)
-                .WhereAwait(async e =>
-                    !e.IsDirectory
-                    && (allowedExtensions.Count == 0 || allowedExtensions.Contains(Path.GetExtension(e.Path)))
-                    && await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)e.Path))
-                .Select(e => CreateFileResult(e));
+        return Ok(await allowed.ToListAsync());
+    }
 
-            return Ok(await allowed.ToListAsync());
+    public async Task<ActionResult<object>> GetMediaItem(string path)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia)
+            || (HttpContext.IsSecureMediaEnabled() && !await _authorizationService.AuthorizeAsync(User, SecureMediaPermissions.ViewMedia, (object)(path ?? string.Empty))))
+        {
+            return Forbid();
         }
 
-        public async Task<ActionResult<object>> GetMediaItem(string path)
+        if (string.IsNullOrEmpty(path))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia)
-                || (HttpContext.IsSecureMediaEnabled() && !await _authorizationService.AuthorizeAsync(User, SecureMediaPermissions.ViewMedia, (object)(path ?? string.Empty))))
-            {
-                return Forbid();
-            }
-
-            if (string.IsNullOrEmpty(path))
-            {
-                return NotFound();
-            }
-
-            var fileEntry = await _mediaFileStore.GetFileInfoAsync(path);
+            return NotFound();
+        }
 
-            if (fileEntry == null)
-            {
-                return NotFound();
-            }
+        var fileEntry = await _mediaFileStore.GetFileInfoAsync(path);
 
-            return CreateFileResult(fileEntry);
+        if (fileEntry == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        [MediaSizeLimit]
-        public async Task<IActionResult> Upload(string path, string extensions)
+        return CreateFileResult(fileEntry);
+    }
+
+    [HttpPost]
+    [MediaSizeLimit]
+    public async Task<IActionResult> Upload(string path, string extensions)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia)
+            || (HttpContext.IsSecureMediaEnabled() && !await _authorizationService.AuthorizeAsync(User, SecureMediaPermissions.ViewMedia, (object)(path ?? string.Empty))))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia)
-                || (HttpContext.IsSecureMediaEnabled() && !await _authorizationService.AuthorizeAsync(User, SecureMediaPermissions.ViewMedia, (object)(path ?? string.Empty))))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var allowedExtensions = GetRequestedExtensions(extensions, true);
+        var allowedExtensions = GetRequestedExtensions(extensions, true);
 
-            return await _chunkFileUploadService.ProcessRequestAsync(
-                Request,
+        return await _chunkFileUploadService.ProcessRequestAsync(
+            Request,
 
-                // We need this empty object because the frontend expects a JSON object in the response.
-                (_, _, _) => Task.FromResult<IActionResult>(Ok(new { })),
-                async (files) =>
+            // We need this empty object because the frontend expects a JSON object in the response.
+            (_, _, _) => Task.FromResult<IActionResult>(Ok(new { })),
+            async (files) =>
+            {
+                if (string.IsNullOrEmpty(path))
                 {
-                    if (string.IsNullOrEmpty(path))
-                    {
-                        path = string.Empty;
-                    }
+                    path = string.Empty;
+                }
 
-                    var result = new List<object>();
+                var result = new List<object>();
 
-                    // Loop through each file in the request.
-                    foreach (var file in files)
+                // Loop through each file in the request.
+                foreach (var file in files)
+                {
+                    var extension = Path.GetExtension(file.FileName);
+
+                    if (!allowedExtensions.Contains(extension))
                     {
-                        var extension = Path.GetExtension(file.FileName);
+                        result.Add(new
+                        {
+                            name = file.FileName,
+                            size = file.Length,
+                            folder = path,
+                            error = S["This file extension is not allowed: {0}", extension].ToString()
+                        });
 
-                        if (!allowedExtensions.Contains(extension))
+                        if (_logger.IsEnabled(LogLevel.Information))
                         {
-                            result.Add(new
-                            {
-                                name = file.FileName,
-                                size = file.Length,
-                                folder = path,
-                                error = S["This file extension is not allowed: {0}", extension].ToString()
-                            });
-
-                            if (_logger.IsEnabled(LogLevel.Information))
-                            {
-                                _logger.LogInformation("File extension not allowed: '{File}'", file.FileName);
-                            }
-
-                            continue;
+                            _logger.LogInformation("File extension not allowed: '{File}'", file.FileName);
                         }
 
-                        var fileName = _mediaNameNormalizerService.NormalizeFileName(file.FileName);
+                        continue;
+                    }
+
+                    var fileName = _mediaNameNormalizerService.NormalizeFileName(file.FileName);
+
+                    Stream stream = null;
+                    try
+                    {
+                        var mediaFilePath = _mediaFileStore.Combine(path, fileName);
+                        stream = file.OpenReadStream();
+                        mediaFilePath = await _mediaFileStore.CreateFileFromStreamAsync(mediaFilePath, stream);
+
+                        var mediaFile = await _mediaFileStore.GetFileInfoAsync(mediaFilePath);
 
-                        Stream stream = null;
+                        // The .NET AWS SDK, and only that from the built-in ones (but others maybe too), disposes
+                        // the stream. There's no better way to check for that than handling the exception. An
+                        // alternative would be to re-read the file for every other storage provider as well but
+                        // that would be wasteful.
                         try
                         {
-                            var mediaFilePath = _mediaFileStore.Combine(path, fileName);
-                            stream = file.OpenReadStream();
-                            mediaFilePath = await _mediaFileStore.CreateFileFromStreamAsync(mediaFilePath, stream);
-
-                            var mediaFile = await _mediaFileStore.GetFileInfoAsync(mediaFilePath);
-
-                            // The .NET AWS SDK, and only that from the built-in ones (but others maybe too), disposes
-                            // the stream. There's no better way to check for that than handling the exception. An
-                            // alternative would be to re-read the file for every other storage provider as well but
-                            // that would be wasteful.
-                            try
-                            {
-                                stream.Position = 0;
-                            }
-                            catch (ObjectDisposedException)
-                            {
-                                stream = null;
-                            }
-
-                            await PreCacheRemoteMedia(mediaFile, stream);
-
-                            result.Add(CreateFileResult(mediaFile));
+                            stream.Position = 0;
                         }
-                        catch (Exception ex)
+                        catch (ObjectDisposedException)
                         {
-                            _logger.LogError(ex, "An error occurred while uploading a media");
-
-                            result.Add(new
-                            {
-                                name = fileName,
-                                size = file.Length,
-                                folder = path,
-                                error = ex.Message
-                            });
+                            stream = null;
                         }
-                        finally
+
+                        await PreCacheRemoteMedia(mediaFile, stream);
+
+                        result.Add(CreateFileResult(mediaFile));
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogError(ex, "An error occurred while uploading a media");
+
+                        result.Add(new
                         {
-                            stream?.Dispose();
-                        }
+                            name = fileName,
+                            size = file.Length,
+                            folder = path,
+                            error = ex.Message
+                        });
+                    }
+                    finally
+                    {
+                        stream?.Dispose();
                     }
+                }
+
+                return Ok(new { files = result.ToArray() });
+            });
+    }
 
-                    return Ok(new { files = result.ToArray() });
-                });
+    [HttpPost]
+    public async Task<IActionResult> DeleteFolder(string path)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia)
+            || !await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)path))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> DeleteFolder(string path)
+        if (string.IsNullOrEmpty(path))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia)
-                || !await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)path))
-            {
-                return Forbid();
-            }
+            return StatusCode(StatusCodes.Status403Forbidden, S["Cannot delete root media folder"]);
+        }
 
-            if (string.IsNullOrEmpty(path))
-            {
-                return StatusCode(StatusCodes.Status403Forbidden, S["Cannot delete root media folder"]);
-            }
+        var mediaFolder = await _mediaFileStore.GetDirectoryInfoAsync(path);
+        if (mediaFolder != null && !mediaFolder.IsDirectory)
+        {
+            return StatusCode(StatusCodes.Status403Forbidden, S["Cannot delete path because it is not a directory"]);
+        }
 
-            var mediaFolder = await _mediaFileStore.GetDirectoryInfoAsync(path);
-            if (mediaFolder != null && !mediaFolder.IsDirectory)
-            {
-                return StatusCode(StatusCodes.Status403Forbidden, S["Cannot delete path because it is not a directory"]);
-            }
+        if (await _mediaFileStore.TryDeleteDirectoryAsync(path) == false)
+        {
+            return NotFound();
+        }
 
-            if (await _mediaFileStore.TryDeleteDirectoryAsync(path) == false)
-            {
-                return NotFound();
-            }
+        return Ok();
+    }
 
-            return Ok();
+    [HttpPost]
+    public async Task<IActionResult> DeleteMedia(string path)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia)
+            || !await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)path))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> DeleteMedia(string path)
+        if (string.IsNullOrEmpty(path))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia)
-                || !await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)path))
-            {
-                return Forbid();
-            }
+            return NotFound();
+        }
 
-            if (string.IsNullOrEmpty(path))
-            {
-                return NotFound();
-            }
+        if (!await _mediaFileStore.TryDeleteFileAsync(path))
+        {
+            return NotFound();
+        }
 
-            if (!await _mediaFileStore.TryDeleteFileAsync(path))
-            {
-                return NotFound();
-            }
+        return Ok();
+    }
 
-            return Ok();
+    [HttpPost]
+    public async Task<IActionResult> MoveMedia(string oldPath, string newPath)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia)
+            || !await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)oldPath)
+            || !await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)newPath))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> MoveMedia(string oldPath, string newPath)
+        if (string.IsNullOrEmpty(oldPath) || string.IsNullOrEmpty(newPath))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia)
-                || !await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)oldPath)
-                || !await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)newPath))
-            {
-                return Forbid();
-            }
+            return NotFound();
+        }
 
-            if (string.IsNullOrEmpty(oldPath) || string.IsNullOrEmpty(newPath))
-            {
-                return NotFound();
-            }
+        if (await _mediaFileStore.GetFileInfoAsync(oldPath) == null)
+        {
+            return NotFound();
+        }
 
-            if (await _mediaFileStore.GetFileInfoAsync(oldPath) == null)
-            {
-                return NotFound();
-            }
+        var newExtension = Path.GetExtension(newPath);
 
-            var newExtension = Path.GetExtension(newPath);
+        if (!_mediaOptions.AllowedFileExtensions.Contains(newExtension, StringComparer.OrdinalIgnoreCase))
+        {
+            return BadRequest(S["This file extension is not allowed: {0}", newExtension]);
+        }
 
-            if (!_mediaOptions.AllowedFileExtensions.Contains(newExtension, StringComparer.OrdinalIgnoreCase))
-            {
-                return BadRequest(S["This file extension is not allowed: {0}", newExtension]);
-            }
+        if (await _mediaFileStore.GetFileInfoAsync(newPath) != null)
+        {
+            return BadRequest(S["Cannot move media because a file already exists with the same name"]);
+        }
 
-            if (await _mediaFileStore.GetFileInfoAsync(newPath) != null)
-            {
-                return BadRequest(S["Cannot move media because a file already exists with the same name"]);
-            }
+        await _mediaFileStore.MoveFileAsync(oldPath, newPath);
 
-            await _mediaFileStore.MoveFileAsync(oldPath, newPath);
+        var newFileInfo = await _mediaFileStore.GetFileInfoAsync(newPath);
+        await PreCacheRemoteMedia(newFileInfo);
 
-            var newFileInfo = await _mediaFileStore.GetFileInfoAsync(newPath);
-            await PreCacheRemoteMedia(newFileInfo);
+        return Ok(new { newUrl = GetCacheBustingMediaPublicUrl(newPath) });
+    }
 
-            return Ok(new { newUrl = GetCacheBustingMediaPublicUrl(newPath) });
+    [HttpPost]
+    public async Task<IActionResult> DeleteMediaList(string[] paths)
+    {
+        if (paths == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> DeleteMediaList(string[] paths)
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia))
         {
-            if (paths == null)
-            {
-                return NotFound();
-            }
-
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia))
-            {
-                return Forbid();
-            }
-
-            foreach (var path in paths)
-            {
-                if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAttachedMediaFieldsFolder, (object)path))
-                {
-                    return Forbid();
-                }
-            }
-
-            foreach (var path in paths)
-            {
-                if (!await _mediaFileStore.TryDeleteFileAsync(path))
-                {
-                    return NotFound();
-                }
-            }
-
-            return Ok();
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> MoveMediaList(string[] mediaNames, string sourceFolder, string targetFolder)
+        foreach (var path in paths)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia)
-                || !await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)sourceFolder)
-                || !await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)targetFolder))
+            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageAttachedMediaFieldsFolder, (object)path))
             {
                 return Forbid();
             }
+        }
 
-            if ((mediaNames == null) || (mediaNames.Length < 1)
-                || string.IsNullOrEmpty(sourceFolder)
-                || string.IsNullOrEmpty(targetFolder))
+        foreach (var path in paths)
+        {
+            if (!await _mediaFileStore.TryDeleteFileAsync(path))
             {
                 return NotFound();
             }
+        }
 
-            sourceFolder = sourceFolder == "root" ? string.Empty : sourceFolder;
-            targetFolder = targetFolder == "root" ? string.Empty : targetFolder;
+        return Ok();
+    }
 
-            var filesOnError = new List<string>();
+    [HttpPost]
+    public async Task<IActionResult> MoveMediaList(string[] mediaNames, string sourceFolder, string targetFolder)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMedia)
+            || !await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)sourceFolder)
+            || !await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)targetFolder))
+        {
+            return Forbid();
+        }
 
-            foreach (var name in mediaNames)
-            {
-                var sourcePath = _mediaFileStore.Combine(sourceFolder, name);
-                var targetPath = _mediaFileStore.Combine(targetFolder, name);
-                try
-                {
-                    await _mediaFileStore.MoveFileAsync(sourcePath, targetPath);
-                }
-                catch (FileStoreException)
-                {
-                    filesOnError.Add(sourcePath);
-                }
-            }
+        if ((mediaNames == null) || (mediaNames.Length < 1)
+            || string.IsNullOrEmpty(sourceFolder)
+            || string.IsNullOrEmpty(targetFolder))
+        {
+            return NotFound();
+        }
 
-            if (filesOnError.Count > 0)
-            {
-                return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
-            }
+        sourceFolder = sourceFolder == "root" ? string.Empty : sourceFolder;
+        targetFolder = targetFolder == "root" ? string.Empty : targetFolder;
 
-            return Ok();
-        }
+        var filesOnError = new List<string>();
 
-        [HttpPost]
-        public async Task<ActionResult<IFileStoreEntry>> CreateFolder(
-            string path, string name,
-            [FromServices] IAuthorizationService authorizationService)
+        foreach (var name in mediaNames)
         {
-            if (string.IsNullOrEmpty(path))
+            var sourcePath = _mediaFileStore.Combine(sourceFolder, name);
+            var targetPath = _mediaFileStore.Combine(targetFolder, name);
+            try
             {
-                path = string.Empty;
+                await _mediaFileStore.MoveFileAsync(sourcePath, targetPath);
             }
-
-            name = _mediaNameNormalizerService.NormalizeFolderName(name);
-
-            if (_invalidFolderNameCharacters.Any(invalidChar => name.Contains(invalidChar)))
+            catch (FileStoreException)
             {
-                return BadRequest(S["Cannot create folder because the folder name contains invalid characters"]);
+                filesOnError.Add(sourcePath);
             }
+        }
 
-            var newPath = _mediaFileStore.Combine(path, name);
+        if (filesOnError.Count > 0)
+        {
+            return BadRequest(S["Error when moving files. Maybe they already exist on the target folder? Files on error: {0}", string.Join(",", filesOnError)].ToString());
+        }
 
-            if (!await authorizationService.AuthorizeAsync(User, Permissions.ManageMedia)
-                || !await authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)newPath))
-            {
-                return Forbid();
-            }
+        return Ok();
+    }
 
-            var mediaFolder = await _mediaFileStore.GetDirectoryInfoAsync(newPath);
-            if (mediaFolder != null)
-            {
-                return BadRequest(S["Cannot create folder because a folder already exists with the same name"]);
-            }
+    [HttpPost]
+    public async Task<ActionResult<IFileStoreEntry>> CreateFolder(
+        string path, string name,
+        [FromServices] IAuthorizationService authorizationService)
+    {
+        if (string.IsNullOrEmpty(path))
+        {
+            path = string.Empty;
+        }
 
-            var existingFile = await _mediaFileStore.GetFileInfoAsync(newPath);
-            if (existingFile != null)
-            {
-                return BadRequest(S["Cannot create folder because a file already exists with the same name"]);
-            }
+        name = _mediaNameNormalizerService.NormalizeFolderName(name);
 
-            await _mediaFileStore.TryCreateDirectoryAsync(newPath);
+        if (_invalidFolderNameCharacters.Any(invalidChar => name.Contains(invalidChar)))
+        {
+            return BadRequest(S["Cannot create folder because the folder name contains invalid characters"]);
+        }
 
-            mediaFolder = await _mediaFileStore.GetDirectoryInfoAsync(newPath);
+        var newPath = _mediaFileStore.Combine(path, name);
 
-            return new ObjectResult(mediaFolder);
+        if (!await authorizationService.AuthorizeAsync(User, Permissions.ManageMedia)
+            || !await authorizationService.AuthorizeAsync(User, Permissions.ManageMediaFolder, (object)newPath))
+        {
+            return Forbid();
         }
 
-        public object CreateFileResult(IFileStoreEntry mediaFile)
+        var mediaFolder = await _mediaFileStore.GetDirectoryInfoAsync(newPath);
+        if (mediaFolder != null)
         {
-            _contentTypeProvider.TryGetContentType(mediaFile.Name, out var contentType);
-
-            return new
-            {
-                name = mediaFile.Name,
-                size = mediaFile.Length,
-                lastModify = mediaFile.LastModifiedUtc.Subtract(new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalMilliseconds,
-                folder = mediaFile.DirectoryPath,
-                url = GetCacheBustingMediaPublicUrl(mediaFile.Path),
-                mediaPath = mediaFile.Path,
-                mime = contentType ?? "application/octet-stream",
-                mediaText = string.Empty,
-                anchor = new { x = 0.5f, y = 0.5f },
-                attachedFileName = string.Empty
-            };
+            return BadRequest(S["Cannot create folder because a folder already exists with the same name"]);
         }
 
-        public async Task<IActionResult> MediaApplication(MediaApplicationViewModel model)
+        var existingFile = await _mediaFileStore.GetFileInfoAsync(newPath);
+        if (existingFile != null)
         {
-            // Check if the user has access to new folders. If not, we hide the "create folder" button from the root folder.
-            model.AllowNewRootFolders = !HttpContext.IsSecureMediaEnabled() || await _authorizationService.AuthorizeAsync(User, SecureMediaPermissions.ViewMedia, (object)"_non-existent-path-87FD1922-8F88-4A33-9766-DA03E6E6F7BA");
-
-            return View(model);
+            return BadRequest(S["Cannot create folder because a file already exists with the same name"]);
         }
 
-        public async Task<IActionResult> Options()
+        await _mediaFileStore.TryCreateDirectoryAsync(newPath);
+
+        mediaFolder = await _mediaFileStore.GetDirectoryInfoAsync(newPath);
+
+        return new ObjectResult(mediaFolder);
+    }
+
+    public object CreateFileResult(IFileStoreEntry mediaFile)
+    {
+        _contentTypeProvider.TryGetContentType(mediaFile.Name, out var contentType);
+
+        return new
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ViewMediaOptions))
-            {
-                return Forbid();
-            }
+            name = mediaFile.Name,
+            size = mediaFile.Length,
+            lastModify = mediaFile.LastModifiedUtc.Subtract(new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalMilliseconds,
+            folder = mediaFile.DirectoryPath,
+            url = GetCacheBustingMediaPublicUrl(mediaFile.Path),
+            mediaPath = mediaFile.Path,
+            mime = contentType ?? "application/octet-stream",
+            mediaText = string.Empty,
+            anchor = new { x = 0.5f, y = 0.5f },
+            attachedFileName = string.Empty
+        };
+    }
 
-            return View(_mediaOptions);
-        }
+    public async Task<IActionResult> MediaApplication(MediaApplicationViewModel model)
+    {
+        // Check if the user has access to new folders. If not, we hide the "create folder" button from the root folder.
+        model.AllowNewRootFolders = !HttpContext.IsSecureMediaEnabled() || await _authorizationService.AuthorizeAsync(User, SecureMediaPermissions.ViewMedia, (object)"_non-existent-path-87FD1922-8F88-4A33-9766-DA03E6E6F7BA");
+
+        return View(model);
+    }
 
-        private HashSet<string> GetRequestedExtensions(string exts, bool fallback)
+    public async Task<IActionResult> Options()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ViewMediaOptions))
         {
-            if (!string.IsNullOrWhiteSpace(exts))
-            {
-                var extensions = exts.Split(_extensionSeperator, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+            return Forbid();
+        }
 
-                var requestedExtensions = _mediaOptions.AllowedFileExtensions
-                    .Intersect(extensions)
-                    .ToHashSet(StringComparer.OrdinalIgnoreCase);
+        return View(_mediaOptions);
+    }
 
-                if (requestedExtensions.Count > 0)
-                {
-                    return requestedExtensions;
-                }
-            }
+    private HashSet<string> GetRequestedExtensions(string exts, bool fallback)
+    {
+        if (!string.IsNullOrWhiteSpace(exts))
+        {
+            var extensions = exts.Split(_extensionSeperator, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+
+            var requestedExtensions = _mediaOptions.AllowedFileExtensions
+                .Intersect(extensions)
+                .ToHashSet(StringComparer.OrdinalIgnoreCase);
 
-            if (fallback)
+            if (requestedExtensions.Count > 0)
             {
-                return _mediaOptions.AllowedFileExtensions
-                    .ToHashSet(StringComparer.OrdinalIgnoreCase);
+                return requestedExtensions;
             }
+        }
 
-            return [];
+        if (fallback)
+        {
+            return _mediaOptions.AllowedFileExtensions
+                .ToHashSet(StringComparer.OrdinalIgnoreCase);
         }
 
-        private string GetCacheBustingMediaPublicUrl(string path) =>
-            _fileVersionProvider.AddFileVersionToPath(HttpContext.Request.PathBase, _mediaFileStore.MapPathToPublicUrl(path));
+        return [];
+    }
 
-        // If a remote storage is used, then we need to preemptively cache the newly uploaded or renamed file. Without
-        // this, the Media Library page will try to load the thumbnail without a cache busting parameter, since
-        // ShellFileVersionProvider won't find it in the local cache.
-        // This is not required for files moved across folders, because the folder will be reopened anyway.
-        private async Task PreCacheRemoteMedia(IFileStoreEntry mediaFile, Stream stream = null)
-        {
-            var mediaFileStoreCache = _serviceProvider.GetService<IMediaFileStoreCache>();
-            if (mediaFileStoreCache == null)
-            {
-                return;
-            }
+    private string GetCacheBustingMediaPublicUrl(string path) =>
+        _fileVersionProvider.AddFileVersionToPath(HttpContext.Request.PathBase, _mediaFileStore.MapPathToPublicUrl(path));
 
-            Stream localStream = null;
+    // If a remote storage is used, then we need to preemptively cache the newly uploaded or renamed file. Without
+    // this, the Media Library page will try to load the thumbnail without a cache busting parameter, since
+    // ShellFileVersionProvider won't find it in the local cache.
+    // This is not required for files moved across folders, because the folder will be reopened anyway.
+    private async Task PreCacheRemoteMedia(IFileStoreEntry mediaFile, Stream stream = null)
+    {
+        var mediaFileStoreCache = _serviceProvider.GetService<IMediaFileStoreCache>();
+        if (mediaFileStoreCache == null)
+        {
+            return;
+        }
 
-            if (stream == null)
-            {
-                stream = localStream = await _mediaFileStore.GetFileStreamAsync(mediaFile);
-            }
+        Stream localStream = null;
 
-            try
-            {
-                await mediaFileStoreCache.SetCacheAsync(stream, mediaFile, HttpContext.RequestAborted);
-            }
-            finally
-            {
-                localStream?.Dispose();
-            }
+        if (stream == null)
+        {
+            stream = localStream = await _mediaFileStore.GetFileStreamAsync(mediaFile);
         }
 
-        private bool IsSpecialFolder(string path)
-           => string.Equals(path, _mediaOptions.AssetsUsersFolder, StringComparison.OrdinalIgnoreCase) || string.Equals(path, _attachedMediaFieldFileService.MediaFieldsFolder, StringComparison.OrdinalIgnoreCase);
+        try
+        {
+            await mediaFileStoreCache.SetCacheAsync(stream, mediaFile, HttpContext.RequestAborted);
+        }
+        finally
+        {
+            localStream?.Dispose();
+        }
     }
+
+    private bool IsSpecialFolder(string path)
+       => string.Equals(path, _mediaOptions.AssetsUsersFolder, StringComparison.OrdinalIgnoreCase) || string.Equals(path, _attachedMediaFieldFileService.MediaFieldsFolder, StringComparison.OrdinalIgnoreCase);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Controllers/MediaCacheController.cs b/src/OrchardCore.Modules/OrchardCore.Media/Controllers/MediaCacheController.cs
index 2f7399159d5..eba9f0e28e9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Controllers/MediaCacheController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Controllers/MediaCacheController.cs
@@ -9,71 +9,70 @@
 using OrchardCore.Media.ViewModels;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Media.Controllers
+namespace OrchardCore.Media.Controllers;
+
+[Feature("OrchardCore.Media.Cache")]
+[Admin("MediaCache/{action}", "MediaCache.{action}")]
+public class MediaCacheController : Controller
 {
-    [Feature("OrchardCore.Media.Cache")]
-    [Admin("MediaCache/{action}", "MediaCache.{action}")]
-    public class MediaCacheController : Controller
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IMediaFileStoreCache _mediaFileStoreCache;
+    private readonly INotifier _notifier;
+    protected readonly IHtmlLocalizer H;
+
+    public MediaCacheController(
+        IAuthorizationService authorizationService,
+        IServiceProvider serviceProvider,
+        INotifier notifier,
+        IHtmlLocalizer<MediaCacheController> htmlLocalizer
+        )
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IMediaFileStoreCache _mediaFileStoreCache;
-        private readonly INotifier _notifier;
-        protected readonly IHtmlLocalizer H;
+        _authorizationService = authorizationService;
+        // Resolve from service provider as the service will not be registered if configuration is invalid.
+        _mediaFileStoreCache = serviceProvider.GetService<IMediaFileStoreCache>();
+        _notifier = notifier;
+        H = htmlLocalizer;
+    }
 
-        public MediaCacheController(
-            IAuthorizationService authorizationService,
-            IServiceProvider serviceProvider,
-            INotifier notifier,
-            IHtmlLocalizer<MediaCacheController> htmlLocalizer
-            )
+    [Admin("MediaCache", "MediaCache.Index")]
+    public async Task<IActionResult> Index()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, MediaCachePermissions.ManageAssetCache))
         {
-            _authorizationService = authorizationService;
-            // Resolve from service provider as the service will not be registered if configuration is invalid.
-            _mediaFileStoreCache = serviceProvider.GetService<IMediaFileStoreCache>();
-            _notifier = notifier;
-            H = htmlLocalizer;
+            return Forbid();
         }
-
-        [Admin("MediaCache", "MediaCache.Index")]
-        public async Task<IActionResult> Index()
+        var model = new MediaCacheViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, MediaCachePermissions.ManageAssetCache))
-            {
-                return Forbid();
-            }
-            var model = new MediaCacheViewModel
-            {
-                IsConfigured = _mediaFileStoreCache != null
-            };
+            IsConfigured = _mediaFileStoreCache != null
+        };
 
-            return View(model);
-        }
+        return View(model);
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> Purge()
+    [HttpPost]
+    public async Task<IActionResult> Purge()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, MediaCachePermissions.ManageAssetCache))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, MediaCachePermissions.ManageAssetCache))
-            {
-                return Forbid();
-            }
-
-            if (_mediaFileStoreCache == null)
-            {
-                await _notifier.ErrorAsync(H["The asset cache feature is enabled, but a remote media store feature is not enabled, or not configured with appsettings.json."]);
-                RedirectToAction(nameof(Index));
-            }
+            return Forbid();
+        }
 
-            var hasErrors = await _mediaFileStoreCache.PurgeAsync();
-            if (hasErrors)
-            {
-                await _notifier.ErrorAsync(H["Asset cache purged, with errors."]);
-            }
-            else
-            {
-                await _notifier.InformationAsync(H["Asset cache purged."]);
-            }
+        if (_mediaFileStoreCache == null)
+        {
+            await _notifier.ErrorAsync(H["The asset cache feature is enabled, but a remote media store feature is not enabled, or not configured with appsettings.json."]);
+            RedirectToAction(nameof(Index));
+        }
 
-            return RedirectToAction(nameof(Index));
+        var hasErrors = await _mediaFileStoreCache.PurgeAsync();
+        if (hasErrors)
+        {
+            await _notifier.ErrorAsync(H["Asset cache purged, with errors."]);
+        }
+        else
+        {
+            await _notifier.InformationAsync(H["Asset cache purged."]);
         }
+
+        return RedirectToAction(nameof(Index));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Controllers/MediaProfilesController.cs b/src/OrchardCore.Modules/OrchardCore.Media/Controllers/MediaProfilesController.cs
index 172502aad50..2efb83ae180 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Controllers/MediaProfilesController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Controllers/MediaProfilesController.cs
@@ -19,351 +19,350 @@
 using OrchardCore.Navigation;
 using OrchardCore.Routing;
 
-namespace OrchardCore.Media.Controllers
+namespace OrchardCore.Media.Controllers;
+
+[Admin("MediaProfiles/{action}", "MediaProfiles.{action}")]
+public class MediaProfilesController : Controller
 {
-    [Admin("MediaProfiles/{action}", "MediaProfiles.{action}")]
-    public class MediaProfilesController : Controller
+    private const string _optionsSearch = "Options.Search";
+
+    private readonly IAuthorizationService _authorizationService;
+    private readonly MediaProfilesManager _mediaProfilesManager;
+    private readonly MediaOptions _mediaOptions;
+    private readonly PagerOptions _pagerOptions;
+    private readonly INotifier _notifier;
+    private readonly IShapeFactory _shapeFactory;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public MediaProfilesController(
+        IAuthorizationService authorizationService,
+        MediaProfilesManager mediaProfilesManager,
+        IOptions<MediaOptions> mediaOptions,
+        IOptions<PagerOptions> pagerOptions,
+        INotifier notifier,
+        IShapeFactory shapeFactory,
+        IStringLocalizer<MediaProfilesController> stringLocalizer,
+        IHtmlLocalizer<MediaProfilesController> htmlLocalizer
+        )
     {
-        private const string _optionsSearch = "Options.Search";
-
-        private readonly IAuthorizationService _authorizationService;
-        private readonly MediaProfilesManager _mediaProfilesManager;
-        private readonly MediaOptions _mediaOptions;
-        private readonly PagerOptions _pagerOptions;
-        private readonly INotifier _notifier;
-        private readonly IShapeFactory _shapeFactory;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public MediaProfilesController(
-            IAuthorizationService authorizationService,
-            MediaProfilesManager mediaProfilesManager,
-            IOptions<MediaOptions> mediaOptions,
-            IOptions<PagerOptions> pagerOptions,
-            INotifier notifier,
-            IShapeFactory shapeFactory,
-            IStringLocalizer<MediaProfilesController> stringLocalizer,
-            IHtmlLocalizer<MediaProfilesController> htmlLocalizer
-            )
-        {
-            _authorizationService = authorizationService;
-            _mediaProfilesManager = mediaProfilesManager;
-            _mediaOptions = mediaOptions.Value;
-            _pagerOptions = pagerOptions.Value;
-            _notifier = notifier;
-            _shapeFactory = shapeFactory;
-            S = stringLocalizer;
-            H = htmlLocalizer;
-        }
+        _authorizationService = authorizationService;
+        _mediaProfilesManager = mediaProfilesManager;
+        _mediaOptions = mediaOptions.Value;
+        _pagerOptions = pagerOptions.Value;
+        _notifier = notifier;
+        _shapeFactory = shapeFactory;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+    }
 
-        [Admin("MediaProfiles", "MediaProfiles.Index")]
-        public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
+    [Admin("MediaProfiles", "MediaProfiles.Index")]
+    public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaProfiles))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaProfiles))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
 
-            var mediaProfilesDocument = await _mediaProfilesManager.GetMediaProfilesDocumentAsync();
-            var mediaProfiles = mediaProfilesDocument.MediaProfiles.ToList();
+        var mediaProfilesDocument = await _mediaProfilesManager.GetMediaProfilesDocumentAsync();
+        var mediaProfiles = mediaProfilesDocument.MediaProfiles.ToList();
 
-            if (!string.IsNullOrWhiteSpace(options.Search))
-            {
-                mediaProfiles = mediaProfiles.Where(x => x.Key.Contains(options.Search, StringComparison.OrdinalIgnoreCase)).ToList();
-            }
+        if (!string.IsNullOrWhiteSpace(options.Search))
+        {
+            mediaProfiles = mediaProfiles.Where(x => x.Key.Contains(options.Search, StringComparison.OrdinalIgnoreCase)).ToList();
+        }
 
-            var count = mediaProfiles.Count;
+        var count = mediaProfiles.Count;
 
-            mediaProfiles = mediaProfiles.OrderBy(x => x.Key)
-                .Skip(pager.GetStartIndex())
-                .Take(pager.PageSize)
-                .ToList();
+        mediaProfiles = mediaProfiles.OrderBy(x => x.Key)
+            .Skip(pager.GetStartIndex())
+            .Take(pager.PageSize)
+            .ToList();
 
-            // Maintain previous route data when generating page links.
-            var routeData = new RouteData();
+        // Maintain previous route data when generating page links.
+        var routeData = new RouteData();
 
-            if (!string.IsNullOrEmpty(options.Search))
-            {
-                routeData.Values.TryAdd(_optionsSearch, options.Search);
-            }
+        if (!string.IsNullOrEmpty(options.Search))
+        {
+            routeData.Values.TryAdd(_optionsSearch, options.Search);
+        }
 
-            var pagerShape = await _shapeFactory.PagerAsync(pager, count, routeData);
+        var pagerShape = await _shapeFactory.PagerAsync(pager, count, routeData);
 
-            var model = new MediaProfileIndexViewModel
-            {
-                MediaProfiles = mediaProfiles.Select(x => new MediaProfileEntry { Name = x.Key, MediaProfile = x.Value }).ToList(),
-                Pager = pagerShape
-            };
+        var model = new MediaProfileIndexViewModel
+        {
+            MediaProfiles = mediaProfiles.Select(x => new MediaProfileEntry { Name = x.Key, MediaProfile = x.Value }).ToList(),
+            Pager = pagerShape
+        };
 
-            model.Options.ContentsBulkAction =
-            [
-                new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
-            ];
+        model.Options.ContentsBulkAction =
+        [
+            new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+        ];
 
-            return View(model);
-        }
+        return View(model);
+    }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.Filter")]
-        public ActionResult IndexFilterPOST(MediaProfileIndexViewModel model)
-            => RedirectToAction(nameof(Index), new RouteValueDictionary
-            {
-                { _optionsSearch, model.Options.Search }
-            });
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.Filter")]
+    public ActionResult IndexFilterPOST(MediaProfileIndexViewModel model)
+        => RedirectToAction(nameof(Index), new RouteValueDictionary
+        {
+            { _optionsSearch, model.Options.Search }
+        });
 
-        public async Task<IActionResult> Create()
+    public async Task<IActionResult> Create()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaProfiles))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaProfiles))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var model = new MediaProfileViewModel();
+        var model = new MediaProfileViewModel();
 
-            BuildViewModel(model);
+        BuildViewModel(model);
 
-            return View(model);
-        }
+        return View(model);
+    }
 
-        [HttpPost, ActionName(nameof(Create))]
-        public async Task<IActionResult> CreatePost(MediaProfileViewModel model, string submit)
+    [HttpPost, ActionName(nameof(Create))]
+    public async Task<IActionResult> CreatePost(MediaProfileViewModel model, string submit)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaProfiles))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaProfiles))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            if (ModelState.IsValid)
+        if (ModelState.IsValid)
+        {
+            if (string.IsNullOrWhiteSpace(model.Name))
             {
-                if (string.IsNullOrWhiteSpace(model.Name))
-                {
-                    ModelState.AddModelError(nameof(MediaProfileViewModel.Name), S["The name is mandatory."]);
-                }
-                else
-                {
-                    var mediaProfilesDocument = await _mediaProfilesManager.GetMediaProfilesDocumentAsync();
-
-                    if (mediaProfilesDocument.MediaProfiles.ContainsKey(model.Name))
-                    {
-                        ModelState.AddModelError(nameof(MediaProfileViewModel.Name), S["A profile with the same name already exists."]);
-                    }
-                }
+                ModelState.AddModelError(nameof(MediaProfileViewModel.Name), S["The name is mandatory."]);
             }
-
-            if (ModelState.IsValid)
+            else
             {
-                var isCustomWidth = model.SelectedWidth != 0 && Array.BinarySearch(_mediaOptions.SupportedSizes, model.SelectedWidth) < 0;
-                var isCustomHeight = model.SelectedHeight != 0 && Array.BinarySearch(_mediaOptions.SupportedSizes, model.SelectedHeight) < 0;
+                var mediaProfilesDocument = await _mediaProfilesManager.GetMediaProfilesDocumentAsync();
 
-                var mediaProfile = new MediaProfile
-                {
-                    Hint = model.Hint,
-                    Width = isCustomWidth ? model.CustomWidth : model.SelectedWidth,
-                    Height = isCustomHeight ? model.CustomHeight : model.SelectedHeight,
-                    Mode = model.SelectedMode,
-                    Format = model.SelectedFormat,
-                    Quality = model.Quality,
-                    BackgroundColor = model.BackgroundColor
-                };
-
-                await _mediaProfilesManager.UpdateMediaProfileAsync(model.Name, mediaProfile);
-
-                if (submit == "SaveAndContinue")
-                {
-                    return RedirectToAction(nameof(Edit), new { name = model.Name });
-                }
-                else
+                if (mediaProfilesDocument.MediaProfiles.ContainsKey(model.Name))
                 {
-                    return RedirectToAction(nameof(Index));
+                    ModelState.AddModelError(nameof(MediaProfileViewModel.Name), S["A profile with the same name already exists."]);
                 }
             }
-
-            // If we got this far, something failed, redisplay form
-            BuildViewModel(model);
-
-            return View(model);
         }
 
-        public async Task<IActionResult> Edit(string name)
+        if (ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaProfiles))
-            {
-                return Forbid();
-            }
-
-            var mediaProfilesDocument = await _mediaProfilesManager.GetMediaProfilesDocumentAsync();
-
-            if (!mediaProfilesDocument.MediaProfiles.TryGetValue(name, out var mediaProfile))
-            {
-                return RedirectToAction(nameof(Create), new { name });
-            }
-
-            // Is a custom width if the width is not 0 and it is not in the array of supported sizes.
-            var isCustomWidth = mediaProfile.Width != 0 && Array.BinarySearch(_mediaOptions.SupportedSizes, mediaProfile.Width) < 0;
-            var isCustomHeight = mediaProfile.Height != 0 && Array.BinarySearch(_mediaOptions.SupportedSizes, mediaProfile.Height) < 0;
+            var isCustomWidth = model.SelectedWidth != 0 && Array.BinarySearch(_mediaOptions.SupportedSizes, model.SelectedWidth) < 0;
+            var isCustomHeight = model.SelectedHeight != 0 && Array.BinarySearch(_mediaOptions.SupportedSizes, model.SelectedHeight) < 0;
 
-            var model = new MediaProfileViewModel
+            var mediaProfile = new MediaProfile
             {
-                Name = name,
-                Hint = mediaProfile.Hint,
-                SelectedWidth = isCustomWidth ? -1 : mediaProfile.Width,
-                CustomWidth = isCustomWidth ? mediaProfile.Width : 0,
-                SelectedHeight = isCustomHeight ? -1 : mediaProfile.Height,
-                CustomHeight = isCustomHeight ? mediaProfile.Height : 0,
-                SelectedMode = mediaProfile.Mode,
-                SelectedFormat = mediaProfile.Format,
-                Quality = mediaProfile.Quality,
-                BackgroundColor = mediaProfile.BackgroundColor
+                Hint = model.Hint,
+                Width = isCustomWidth ? model.CustomWidth : model.SelectedWidth,
+                Height = isCustomHeight ? model.CustomHeight : model.SelectedHeight,
+                Mode = model.SelectedMode,
+                Format = model.SelectedFormat,
+                Quality = model.Quality,
+                BackgroundColor = model.BackgroundColor
             };
 
-            BuildViewModel(model);
-
-            return View(model);
-        }
+            await _mediaProfilesManager.UpdateMediaProfileAsync(model.Name, mediaProfile);
 
-        [HttpPost]
-        public async Task<IActionResult> Edit(string sourceName, MediaProfileViewModel model, string submit)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaProfiles))
+            if (submit == "SaveAndContinue")
             {
-                return Forbid();
+                return RedirectToAction(nameof(Edit), new { name = model.Name });
             }
-
-            var mediaProfilesDocument = await _mediaProfilesManager.LoadMediaProfilesDocumentAsync();
-
-            if (!mediaProfilesDocument.MediaProfiles.ContainsKey(sourceName))
+            else
             {
-                return NotFound();
+                return RedirectToAction(nameof(Index));
             }
+        }
 
-            if (ModelState.IsValid)
-            {
-                if (string.IsNullOrWhiteSpace(model.Name))
-                {
-                    ModelState.AddModelError(nameof(MediaProfileViewModel.Name), S["The name is mandatory."]);
-                }
-            }
+        // If we got this far, something failed, redisplay form
+        BuildViewModel(model);
 
-            if (ModelState.IsValid)
-            {
-                var isCustomWidth = Array.BinarySearch(_mediaOptions.SupportedSizes, model.SelectedWidth) < 0;
-                var isCustomHeight = Array.BinarySearch(_mediaOptions.SupportedSizes, model.SelectedHeight) < 0;
+        return View(model);
+    }
 
-                var mediaProfile = new MediaProfile
-                {
-                    Hint = model.Hint,
-                    Width = isCustomWidth ? model.CustomWidth : model.SelectedWidth,
-                    Height = isCustomHeight ? model.CustomHeight : model.SelectedHeight,
-                    Mode = model.SelectedMode,
-                    Format = model.SelectedFormat,
-                    Quality = model.Quality,
-                    BackgroundColor = model.BackgroundColor
-                };
+    public async Task<IActionResult> Edit(string name)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaProfiles))
+        {
+            return Forbid();
+        }
 
-                await _mediaProfilesManager.RemoveMediaProfileAsync(sourceName);
+        var mediaProfilesDocument = await _mediaProfilesManager.GetMediaProfilesDocumentAsync();
 
-                await _mediaProfilesManager.UpdateMediaProfileAsync(model.Name, mediaProfile);
+        if (!mediaProfilesDocument.MediaProfiles.TryGetValue(name, out var mediaProfile))
+        {
+            return RedirectToAction(nameof(Create), new { name });
+        }
 
-                if (submit != "SaveAndContinue")
-                {
-                    return RedirectToAction(nameof(Index));
-                }
-            }
+        // Is a custom width if the width is not 0 and it is not in the array of supported sizes.
+        var isCustomWidth = mediaProfile.Width != 0 && Array.BinarySearch(_mediaOptions.SupportedSizes, mediaProfile.Width) < 0;
+        var isCustomHeight = mediaProfile.Height != 0 && Array.BinarySearch(_mediaOptions.SupportedSizes, mediaProfile.Height) < 0;
+
+        var model = new MediaProfileViewModel
+        {
+            Name = name,
+            Hint = mediaProfile.Hint,
+            SelectedWidth = isCustomWidth ? -1 : mediaProfile.Width,
+            CustomWidth = isCustomWidth ? mediaProfile.Width : 0,
+            SelectedHeight = isCustomHeight ? -1 : mediaProfile.Height,
+            CustomHeight = isCustomHeight ? mediaProfile.Height : 0,
+            SelectedMode = mediaProfile.Mode,
+            SelectedFormat = mediaProfile.Format,
+            Quality = mediaProfile.Quality,
+            BackgroundColor = mediaProfile.BackgroundColor
+        };
+
+        BuildViewModel(model);
+
+        return View(model);
+    }
 
-            // If we got this far, something failed, redisplay form
-            BuildViewModel(model);
+    [HttpPost]
+    public async Task<IActionResult> Edit(string sourceName, MediaProfileViewModel model, string submit)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaProfiles))
+        {
+            return Forbid();
+        }
 
-            // If the name was changed or removed, prevent a 404 or a failure on the next post.
-            model.Name = sourceName;
+        var mediaProfilesDocument = await _mediaProfilesManager.LoadMediaProfilesDocumentAsync();
 
-            return View(model);
+        if (!mediaProfilesDocument.MediaProfiles.ContainsKey(sourceName))
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(string name)
+        if (ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaProfiles))
+            if (string.IsNullOrWhiteSpace(model.Name))
             {
-                return Forbid();
+                ModelState.AddModelError(nameof(MediaProfileViewModel.Name), S["The name is mandatory."]);
             }
+        }
 
-            var mediaProfilesDocument = await _mediaProfilesManager.LoadMediaProfilesDocumentAsync();
+        if (ModelState.IsValid)
+        {
+            var isCustomWidth = Array.BinarySearch(_mediaOptions.SupportedSizes, model.SelectedWidth) < 0;
+            var isCustomHeight = Array.BinarySearch(_mediaOptions.SupportedSizes, model.SelectedHeight) < 0;
 
-            if (!mediaProfilesDocument.MediaProfiles.ContainsKey(name))
+            var mediaProfile = new MediaProfile
             {
-                return NotFound();
+                Hint = model.Hint,
+                Width = isCustomWidth ? model.CustomWidth : model.SelectedWidth,
+                Height = isCustomHeight ? model.CustomHeight : model.SelectedHeight,
+                Mode = model.SelectedMode,
+                Format = model.SelectedFormat,
+                Quality = model.Quality,
+                BackgroundColor = model.BackgroundColor
+            };
+
+            await _mediaProfilesManager.RemoveMediaProfileAsync(sourceName);
+
+            await _mediaProfilesManager.UpdateMediaProfileAsync(model.Name, mediaProfile);
+
+            if (submit != "SaveAndContinue")
+            {
+                return RedirectToAction(nameof(Index));
             }
+        }
+
+        // If we got this far, something failed, redisplay form
+        BuildViewModel(model);
 
-            await _mediaProfilesManager.RemoveMediaProfileAsync(name);
+        // If the name was changed or removed, prevent a 404 or a failure on the next post.
+        model.Name = sourceName;
 
-            await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
+        return View(model);
+    }
 
-            return RedirectToAction(nameof(Index));
+    [HttpPost]
+    public async Task<IActionResult> Delete(string name)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaProfiles))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName("Index")]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<string> itemIds)
+        var mediaProfilesDocument = await _mediaProfilesManager.LoadMediaProfilesDocumentAsync();
+
+        if (!mediaProfilesDocument.MediaProfiles.ContainsKey(name))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaProfiles))
-            {
-                return Forbid();
-            }
+            return NotFound();
+        }
 
-            if (itemIds?.Count() > 0)
-            {
-                var mediaProfilesDocument = await _mediaProfilesManager.LoadMediaProfilesDocumentAsync();
-                var checkedContentItems = mediaProfilesDocument.MediaProfiles.Where(x => itemIds.Contains(x.Key));
-                switch (options.BulkAction)
-                {
-                    case ContentsBulkAction.None:
-                        break;
-                    case ContentsBulkAction.Remove:
-                        foreach (var item in checkedContentItems)
-                        {
-                            await _mediaProfilesManager.RemoveMediaProfileAsync(item.Key);
-                        }
-                        await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException(options.BulkAction.ToString(), "Invalid bulk action.");
-                }
-            }
+        await _mediaProfilesManager.RemoveMediaProfileAsync(name);
 
-            return RedirectToAction(nameof(Index));
+        await _notifier.SuccessAsync(H["Media profile deleted successfully."]);
+
+        return RedirectToAction(nameof(Index));
+    }
+
+    [HttpPost, ActionName("Index")]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<string> itemIds)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMediaProfiles))
+        {
+            return Forbid();
         }
 
-        private void BuildViewModel(MediaProfileViewModel model)
+        if (itemIds?.Count() > 0)
         {
-            model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
-            model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
-            model.AvailableWidths.AddRange(_mediaOptions.SupportedSizes.Select(x => new SelectListItem() { Text = x.ToString(), Value = x.ToString() }));
-            model.AvailableHeights.AddRange(_mediaOptions.SupportedSizes.Select(x => new SelectListItem() { Text = x.ToString(), Value = x.ToString() }));
-            if (_mediaOptions.UseTokenizedQueryString)
+            var mediaProfilesDocument = await _mediaProfilesManager.LoadMediaProfilesDocumentAsync();
+            var checkedContentItems = mediaProfilesDocument.MediaProfiles.Where(x => itemIds.Contains(x.Key));
+            switch (options.BulkAction)
             {
-                model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
-                model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
+                case ContentsBulkAction.None:
+                    break;
+                case ContentsBulkAction.Remove:
+                    foreach (var item in checkedContentItems)
+                    {
+                        await _mediaProfilesManager.RemoveMediaProfileAsync(item.Key);
+                    }
+                    await _notifier.SuccessAsync(H["Media profiles successfully removed."]);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(options.BulkAction.ToString(), "Invalid bulk action.");
             }
+        }
+
+        return RedirectToAction(nameof(Index));
+    }
 
-            model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
-            model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
-            model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
-            model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
-            model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
-            model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
-            model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
-
-
-            model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
-            model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
-            model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
-            model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
-            model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
-            model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
-            model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
+    private void BuildViewModel(MediaProfileViewModel model)
+    {
+        model.AvailableWidths.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
+        model.AvailableHeights.Add(new SelectListItem() { Text = S["Default"], Value = "0" });
+        model.AvailableWidths.AddRange(_mediaOptions.SupportedSizes.Select(x => new SelectListItem() { Text = x.ToString(), Value = x.ToString() }));
+        model.AvailableHeights.AddRange(_mediaOptions.SupportedSizes.Select(x => new SelectListItem() { Text = x.ToString(), Value = x.ToString() }));
+        if (_mediaOptions.UseTokenizedQueryString)
+        {
+            model.AvailableWidths.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
+            model.AvailableHeights.Add(new SelectListItem() { Text = S["Custom Size"], Value = "-1" });
         }
+
+        model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Default (Max)"], Value = ((int)ResizeMode.Undefined).ToString() });
+        model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Max"], Value = ((int)ResizeMode.Max).ToString() });
+        model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Crop"], Value = ((int)ResizeMode.Crop).ToString() });
+        model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Pad"], Value = ((int)ResizeMode.Pad).ToString() });
+        model.AvailableResizeModes.Add(new SelectListItem() { Text = S["BoxPad"], Value = ((int)ResizeMode.BoxPad).ToString() });
+        model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Min"], Value = ((int)ResizeMode.Min).ToString() });
+        model.AvailableResizeModes.Add(new SelectListItem() { Text = S["Stretch"], Value = ((int)ResizeMode.Stretch).ToString() });
+
+
+        model.AvailableFormats.Add(new SelectListItem() { Text = S["Default"], Value = ((int)Format.Undefined).ToString() });
+        model.AvailableFormats.Add(new SelectListItem() { Text = S["Bmp"], Value = ((int)Format.Bmp).ToString() });
+        model.AvailableFormats.Add(new SelectListItem() { Text = S["Gif"], Value = ((int)Format.Gif).ToString() });
+        model.AvailableFormats.Add(new SelectListItem() { Text = S["Jpg"], Value = ((int)Format.Jpg).ToString() });
+        model.AvailableFormats.Add(new SelectListItem() { Text = S["Png"], Value = ((int)Format.Png).ToString() });
+        model.AvailableFormats.Add(new SelectListItem() { Text = S["Tga"], Value = ((int)Format.Tga).ToString() });
+        model.AvailableFormats.Add(new SelectListItem() { Text = S["WebP"], Value = ((int)Format.WebP).ToString() });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Deployment/AllMediaProfilesDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Media/Deployment/AllMediaProfilesDeploymentSource.cs
index 0c64a52b54b..53ecf8ab3fb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Deployment/AllMediaProfilesDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Deployment/AllMediaProfilesDeploymentSource.cs
@@ -3,31 +3,30 @@
 using OrchardCore.Deployment;
 using OrchardCore.Media.Services;
 
-namespace OrchardCore.Media.Deployment
+namespace OrchardCore.Media.Deployment;
+
+public class AllMediaProfilesDeploymentSource : IDeploymentSource
 {
-    public class AllMediaProfilesDeploymentSource : IDeploymentSource
+    private readonly MediaProfilesManager _mediaProfilesManager;
+
+    public AllMediaProfilesDeploymentSource(MediaProfilesManager mediaProfilesManager)
     {
-        private readonly MediaProfilesManager _mediaProfilesManager;
+        _mediaProfilesManager = mediaProfilesManager;
+    }
 
-        public AllMediaProfilesDeploymentSource(MediaProfilesManager mediaProfilesManager)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        if (step is not AllMediaProfilesDeploymentStep)
         {
-            _mediaProfilesManager = mediaProfilesManager;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
-        {
-            if (step is not AllMediaProfilesDeploymentStep)
-            {
-                return;
-            }
-
-            var mediaProfiles = await _mediaProfilesManager.GetMediaProfilesDocumentAsync();
+        var mediaProfiles = await _mediaProfilesManager.GetMediaProfilesDocumentAsync();
 
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "MediaProfiles",
-                ["MediaProfiles"] = JObject.FromObject(mediaProfiles.MediaProfiles),
-            });
-        }
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "MediaProfiles",
+            ["MediaProfiles"] = JObject.FromObject(mediaProfiles.MediaProfiles),
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Deployment/AllMediaProfilesDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Media/Deployment/AllMediaProfilesDeploymentStep.cs
index f13e6ceba1e..eb5aae8d5d8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Deployment/AllMediaProfilesDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Deployment/AllMediaProfilesDeploymentStep.cs
@@ -1,15 +1,14 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Media.Deployment
+namespace OrchardCore.Media.Deployment;
+
+/// <summary>
+/// Adds media profiles to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class AllMediaProfilesDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds media profiles to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class AllMediaProfilesDeploymentStep : DeploymentStep
+    public AllMediaProfilesDeploymentStep()
     {
-        public AllMediaProfilesDeploymentStep()
-        {
-            Name = "AllMediaProfiles";
-        }
+        Name = "AllMediaProfiles";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Deployment/AllMediaProfilesDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Media/Deployment/AllMediaProfilesDeploymentStepDriver.cs
index 02978d819cd..6e6765f6a4c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Deployment/AllMediaProfilesDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Deployment/AllMediaProfilesDeploymentStepDriver.cs
@@ -3,22 +3,21 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Media.Deployment
+namespace OrchardCore.Media.Deployment;
+
+public sealed class AllMediaProfilesDeploymentStepDriver : DisplayDriver<DeploymentStep, AllMediaProfilesDeploymentStep>
 {
-    public sealed class AllMediaProfilesDeploymentStepDriver : DisplayDriver<DeploymentStep, AllMediaProfilesDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(AllMediaProfilesDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(AllMediaProfilesDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("AllMediaProfilesDeploymentStep_Summary", step).Location("Summary", "Content"),
-                    View("AllMediaProfilesDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("AllMediaProfilesDeploymentStep_Summary", step).Location("Summary", "Content"),
+                View("AllMediaProfilesDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(AllMediaProfilesDeploymentStep step, BuildEditorContext context)
-        {
-            return View("AllMediaProfilesDeploymentStep_Edit", step).Location("Content");
-        }
+    public override IDisplayResult Edit(AllMediaProfilesDeploymentStep step, BuildEditorContext context)
+    {
+        return View("AllMediaProfilesDeploymentStep_Edit", step).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Deployment/MediaDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Media/Deployment/MediaDeploymentSource.cs
index ac818c320dc..d00f219832e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Deployment/MediaDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Deployment/MediaDeploymentSource.cs
@@ -4,63 +4,62 @@
 using System.Threading.Tasks;
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Media.Deployment
+namespace OrchardCore.Media.Deployment;
+
+public class MediaDeploymentSource : IDeploymentSource
 {
-    public class MediaDeploymentSource : IDeploymentSource
+    private readonly IMediaFileStore _mediaFileStore;
+
+    public MediaDeploymentSource(IMediaFileStore mediaFileStore)
     {
-        private readonly IMediaFileStore _mediaFileStore;
+        _mediaFileStore = mediaFileStore;
+    }
 
-        public MediaDeploymentSource(IMediaFileStore mediaFileStore)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        if (step is not MediaDeploymentStep mediaStep)
         {
-            _mediaFileStore = mediaFileStore;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
-        {
-            if (step is not MediaDeploymentStep mediaStep)
-            {
-                return;
-            }
+        IAsyncEnumerable<string> paths = null;
 
-            IAsyncEnumerable<string> paths = null;
+        if (mediaStep.IncludeAll)
+        {
+            paths = _mediaFileStore.GetDirectoryContentAsync(null, true).Where(e => !e.IsDirectory).Select(e => e.Path);
+        }
+        else
+        {
+            paths = new List<string>(mediaStep.FilePaths ?? []).ToAsyncEnumerable();
 
-            if (mediaStep.IncludeAll)
+            foreach (var directoryPath in mediaStep.DirectoryPaths ?? [])
             {
-                paths = _mediaFileStore.GetDirectoryContentAsync(null, true).Where(e => !e.IsDirectory).Select(e => e.Path);
+                paths = paths.Concat(_mediaFileStore.GetDirectoryContentAsync(directoryPath, true).Where(e => !e.IsDirectory).Select(e => e.Path));
             }
-            else
-            {
-                paths = new List<string>(mediaStep.FilePaths ?? []).ToAsyncEnumerable();
-
-                foreach (var directoryPath in mediaStep.DirectoryPaths ?? [])
-                {
-                    paths = paths.Concat(_mediaFileStore.GetDirectoryContentAsync(directoryPath, true).Where(e => !e.IsDirectory).Select(e => e.Path));
-                }
 
-                paths = paths.OrderBy(p => p);
-            }
-
-            var output = await paths.Select(p => new MediaDeploymentStepModel { SourcePath = p, TargetPath = p }).ToArrayAsync();
+            paths = paths.OrderBy(p => p);
+        }
 
-            foreach (var path in output)
-            {
-                var stream = await _mediaFileStore.GetFileStreamAsync(path.SourcePath);
+        var output = await paths.Select(p => new MediaDeploymentStepModel { SourcePath = p, TargetPath = p }).ToArrayAsync();
 
-                await result.FileBuilder.SetFileAsync(path.SourcePath, stream);
-            }
+        foreach (var path in output)
+        {
+            var stream = await _mediaFileStore.GetFileStreamAsync(path.SourcePath);
 
-            // Adding media files
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "media",
-                ["Files"] = JArray.FromObject(output),
-            });
+            await result.FileBuilder.SetFileAsync(path.SourcePath, stream);
         }
 
-        private sealed class MediaDeploymentStepModel
+        // Adding media files
+        result.Steps.Add(new JsonObject
         {
-            public string SourcePath { get; set; }
-            public string TargetPath { get; set; }
-        }
+            ["name"] = "media",
+            ["Files"] = JArray.FromObject(output),
+        });
+    }
+
+    private sealed class MediaDeploymentStepModel
+    {
+        public string SourcePath { get; set; }
+        public string TargetPath { get; set; }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Deployment/MediaDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Media/Deployment/MediaDeploymentStep.cs
index 89663aa0aeb..c0189b58459 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Deployment/MediaDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Deployment/MediaDeploymentStep.cs
@@ -1,21 +1,20 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Media.Deployment
+namespace OrchardCore.Media.Deployment;
+
+/// <summary>
+/// Adds layers to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class MediaDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds layers to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class MediaDeploymentStep : DeploymentStep
+    public MediaDeploymentStep()
     {
-        public MediaDeploymentStep()
-        {
-            Name = "Media";
-        }
+        Name = "Media";
+    }
 
-        public bool IncludeAll { get; set; } = true;
+    public bool IncludeAll { get; set; } = true;
 
-        public string[] FilePaths { get; set; }
+    public string[] FilePaths { get; set; }
 
-        public string[] DirectoryPaths { get; set; }
-    }
+    public string[] DirectoryPaths { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Deployment/MediaDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Media/Deployment/MediaDeploymentStepDriver.cs
index 84daf05c094..9aae07c7788 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Deployment/MediaDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Deployment/MediaDeploymentStepDriver.cs
@@ -6,78 +6,77 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Media.ViewModels;
 
-namespace OrchardCore.Media.Deployment
+namespace OrchardCore.Media.Deployment;
+
+public sealed class MediaDeploymentStepDriver : DisplayDriver<DeploymentStep, MediaDeploymentStep>
 {
-    public sealed class MediaDeploymentStepDriver : DisplayDriver<DeploymentStep, MediaDeploymentStep>
+    private readonly IMediaFileStore _mediaFileStore;
+
+    public MediaDeploymentStepDriver(IMediaFileStore mediaFileStore)
     {
-        private readonly IMediaFileStore _mediaFileStore;
+        _mediaFileStore = mediaFileStore;
+    }
 
-        public MediaDeploymentStepDriver(IMediaFileStore mediaFileStore)
-        {
-            _mediaFileStore = mediaFileStore;
-        }
+    public override Task<IDisplayResult> DisplayAsync(MediaDeploymentStep step, BuildDisplayContext context)
+    {
+        return
+            CombineAsync(
+                View("MediaDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("MediaDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(MediaDeploymentStep step, BuildDisplayContext context)
+    public override IDisplayResult Edit(MediaDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<MediaDeploymentStepViewModel>("MediaDeploymentStep_Fields_Edit", async model =>
         {
-            return
-                CombineAsync(
-                    View("MediaDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("MediaDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+            model.IncludeAll = step.IncludeAll;
+            model.FilePaths = step.FilePaths;
+            model.DirectoryPaths = step.DirectoryPaths;
+            model.Entries = await GetMediaStoreEntries();
+        }).Location("Content");
+    }
 
-        public override IDisplayResult Edit(MediaDeploymentStep step, BuildEditorContext context)
-        {
-            return Initialize<MediaDeploymentStepViewModel>("MediaDeploymentStep_Fields_Edit", async model =>
-            {
-                model.IncludeAll = step.IncludeAll;
-                model.FilePaths = step.FilePaths;
-                model.DirectoryPaths = step.DirectoryPaths;
-                model.Entries = await GetMediaStoreEntries();
-            }).Location("Content");
-        }
+    public override async Task<IDisplayResult> UpdateAsync(MediaDeploymentStep step, UpdateEditorContext context)
+    {
+        step.FilePaths = [];
+        step.DirectoryPaths = [];
+
+        await context.Updater.TryUpdateModelAsync(step,
+                                          Prefix,
+                                          x => x.FilePaths,
+                                          x => x.DirectoryPaths,
+                                          x => x.IncludeAll);
 
-        public override async Task<IDisplayResult> UpdateAsync(MediaDeploymentStep step, UpdateEditorContext context)
+        // Don't have the selected option if include all.
+        if (step.IncludeAll)
         {
             step.FilePaths = [];
             step.DirectoryPaths = [];
+        }
 
-            await context.Updater.TryUpdateModelAsync(step,
-                                              Prefix,
-                                              x => x.FilePaths,
-                                              x => x.DirectoryPaths,
-                                              x => x.IncludeAll);
+        return Edit(step, context);
+    }
 
-            // Don't have the selected option if include all.
-            if (step.IncludeAll)
+    private async Task<IList<MediaStoreEntryViewModel>> GetMediaStoreEntries(string path = null, MediaStoreEntryViewModel parent = null)
+    {
+        var mediaStoreEntries = await _mediaFileStore.GetDirectoryContentAsync(path)
+            .SelectAwait(async e =>
             {
-                step.FilePaths = [];
-                step.DirectoryPaths = [];
-            }
-
-            return Edit(step, context);
-        }
-
-        private async Task<IList<MediaStoreEntryViewModel>> GetMediaStoreEntries(string path = null, MediaStoreEntryViewModel parent = null)
-        {
-            var mediaStoreEntries = await _mediaFileStore.GetDirectoryContentAsync(path)
-                .SelectAwait(async e =>
+                var mediaStoreEntry = new MediaStoreEntryViewModel
                 {
-                    var mediaStoreEntry = new MediaStoreEntryViewModel
-                    {
-                        Name = e.Name,
-                        Path = e.Path,
-                        Parent = parent
-                    };
+                    Name = e.Name,
+                    Path = e.Path,
+                    Parent = parent
+                };
 
-                    mediaStoreEntry.Entries = e.IsDirectory
-                        ? await GetMediaStoreEntries(e.Path, mediaStoreEntry)
-                        : [];
+                mediaStoreEntry.Entries = e.IsDirectory
+                    ? await GetMediaStoreEntries(e.Path, mediaStoreEntry)
+                    : [];
 
-                    return mediaStoreEntry;
-                }).ToListAsync();
+                return mediaStoreEntry;
+            }).ToListAsync();
 
-            return mediaStoreEntries;
-        }
+        return mediaStoreEntries;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Drivers/MediaFieldDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Media/Drivers/MediaFieldDisplayDriver.cs
index 1fbd0d1c6e3..26339d51a60 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Drivers/MediaFieldDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Drivers/MediaFieldDisplayDriver.cs
@@ -17,149 +17,148 @@
 using OrchardCore.Media.ViewModels;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Media.Drivers
+namespace OrchardCore.Media.Drivers;
+
+public sealed class MediaFieldDisplayDriver : ContentFieldDisplayDriver<MediaField>
 {
-    public sealed class MediaFieldDisplayDriver : ContentFieldDisplayDriver<MediaField>
-    {
-        private readonly AttachedMediaFieldFileService _attachedMediaFieldFileService;
-        private readonly ILogger _logger;
+    private readonly AttachedMediaFieldFileService _attachedMediaFieldFileService;
+    private readonly ILogger _logger;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public MediaFieldDisplayDriver(AttachedMediaFieldFileService attachedMediaFieldFileService,
-            IStringLocalizer<MediaFieldDisplayDriver> localizer,
-            ILogger<MediaFieldDisplayDriver> logger)
-        {
-            _attachedMediaFieldFileService = attachedMediaFieldFileService;
-            S = localizer;
-            _logger = logger;
-        }
+    public MediaFieldDisplayDriver(AttachedMediaFieldFileService attachedMediaFieldFileService,
+        IStringLocalizer<MediaFieldDisplayDriver> localizer,
+        ILogger<MediaFieldDisplayDriver> logger)
+    {
+        _attachedMediaFieldFileService = attachedMediaFieldFileService;
+        S = localizer;
+        _logger = logger;
+    }
 
-        public override IDisplayResult Display(MediaField field, BuildFieldDisplayContext context)
+    public override IDisplayResult Display(MediaField field, BuildFieldDisplayContext context)
+    {
+        return Initialize<DisplayMediaFieldViewModel>(GetDisplayShapeType(context), model =>
         {
-            return Initialize<DisplayMediaFieldViewModel>(GetDisplayShapeType(context), model =>
-            {
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            })
-            .Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        })
+        .Location("Detail", "Content")
+        .Location("Summary", "Content");
+    }
+
+    public override IDisplayResult Edit(MediaField field, BuildFieldEditorContext context)
+    {
+        var itemPaths = field.Paths?.ToList().Select(p => new EditMediaFieldItemInfo { Path = p }).ToArray() ?? [];
 
-        public override IDisplayResult Edit(MediaField field, BuildFieldEditorContext context)
+        return Initialize<EditMediaFieldViewModel>(GetEditorShapeType(context), model =>
         {
-            var itemPaths = field.Paths?.ToList().Select(p => new EditMediaFieldItemInfo { Path = p }).ToArray() ?? [];
+            var settings = context.PartFieldDefinition.GetSettings<MediaFieldSettings>();
 
-            return Initialize<EditMediaFieldViewModel>(GetEditorShapeType(context), model =>
+            for (var i = 0; i < itemPaths.Length; i++)
             {
-                var settings = context.PartFieldDefinition.GetSettings<MediaFieldSettings>();
-
-                for (var i = 0; i < itemPaths.Length; i++)
+                if (settings.AllowMediaText && i < field.MediaTexts?.Length)
                 {
-                    if (settings.AllowMediaText && i < field.MediaTexts?.Length)
-                    {
-                        itemPaths[i].MediaText = field.MediaTexts[i];
-                    }
+                    itemPaths[i].MediaText = field.MediaTexts[i];
+                }
 
-                    if (settings.AllowAnchors)
+                if (settings.AllowAnchors)
+                {
+                    var anchors = field.GetAnchors();
+                    if (anchors != null && i < anchors.Length)
                     {
-                        var anchors = field.GetAnchors();
-                        if (anchors != null && i < anchors.Length)
-                        {
-                            itemPaths[i].Anchor = anchors[i];
-                        }
+                        itemPaths[i].Anchor = anchors[i];
                     }
+                }
 
-                    var filenames = field.GetAttachedFileNames();
-                    if (filenames != null && i < filenames.Length)
-                    {
-                        itemPaths[i].AttachedFileName = filenames[i];
-                    }
+                var filenames = field.GetAttachedFileNames();
+                if (filenames != null && i < filenames.Length)
+                {
+                    itemPaths[i].AttachedFileName = filenames[i];
                 }
+            }
 
-                model.Paths = JConvert.SerializeObject(itemPaths, JOptions.CamelCase);
-                model.TempUploadFolder = _attachedMediaFieldFileService.GetMediaFieldsTempSubFolder();
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-                model.AllowMediaText = settings.AllowMediaText;
-                model.AllowedExtensions = settings.AllowedExtensions ?? [];
-            });
-        }
+            model.Paths = JConvert.SerializeObject(itemPaths, JOptions.CamelCase);
+            model.TempUploadFolder = _attachedMediaFieldFileService.GetMediaFieldsTempSubFolder();
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+            model.AllowMediaText = settings.AllowMediaText;
+            model.AllowedExtensions = settings.AllowedExtensions ?? [];
+        });
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(MediaField field, UpdateFieldEditorContext context)
-        {
-            var model = new EditMediaFieldViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(MediaField field, UpdateFieldEditorContext context)
+    {
+        var model = new EditMediaFieldViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix, f => f.Paths);
+        await context.Updater.TryUpdateModelAsync(model, Prefix, f => f.Paths);
 
-            // Deserializing an empty string doesn't return an array
-            var items = string.IsNullOrWhiteSpace(model.Paths)
-                ? []
-                : JConvert.DeserializeObject<List<EditMediaFieldItemInfo>>(model.Paths, JOptions.CamelCase);
+        // Deserializing an empty string doesn't return an array
+        var items = string.IsNullOrWhiteSpace(model.Paths)
+            ? []
+            : JConvert.DeserializeObject<List<EditMediaFieldItemInfo>>(model.Paths, JOptions.CamelCase);
 
-            // If it's an attached media field editor the files are automatically handled by _attachedMediaFieldFileService.
-            if (string.Equals(context.PartFieldDefinition.Editor(), "Attached", StringComparison.OrdinalIgnoreCase))
+        // If it's an attached media field editor the files are automatically handled by _attachedMediaFieldFileService.
+        if (string.Equals(context.PartFieldDefinition.Editor(), "Attached", StringComparison.OrdinalIgnoreCase))
+        {
+            try
             {
-                try
-                {
-                    field.SetAttachedFileNames(items.Where(i => !i.IsRemoved).Select(i => i.AttachedFileName).ToArray());
-                    await _attachedMediaFieldFileService.HandleFilesOnFieldUpdateAsync(items, context.ContentPart.ContentItem);
-                }
-                catch (Exception e)
-                {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["{0}: There was an error handling the files.", context.PartFieldDefinition.DisplayName()]);
-                    _logger.LogError(e, "Error handling attached media files for field '{Field}'", context.PartFieldDefinition.DisplayName());
-                }
+                field.SetAttachedFileNames(items.Where(i => !i.IsRemoved).Select(i => i.AttachedFileName).ToArray());
+                await _attachedMediaFieldFileService.HandleFilesOnFieldUpdateAsync(items, context.ContentPart.ContentItem);
+            }
+            catch (Exception e)
+            {
+                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["{0}: There was an error handling the files.", context.PartFieldDefinition.DisplayName()]);
+                _logger.LogError(e, "Error handling attached media files for field '{Field}'", context.PartFieldDefinition.DisplayName());
             }
+        }
 
-            field.Paths = items.Where(p => !p.IsRemoved).Select(p => p.Path).ToArray();
+        field.Paths = items.Where(p => !p.IsRemoved).Select(p => p.Path).ToArray();
 
-            var settings = context.PartFieldDefinition.GetSettings<MediaFieldSettings>();
+        var settings = context.PartFieldDefinition.GetSettings<MediaFieldSettings>();
 
-            if (settings.AllowedExtensions?.Length > 0)
+        if (settings.AllowedExtensions?.Length > 0)
+        {
+            for (var i = 0; i < field.Paths.Length; i++)
             {
-                for (var i = 0; i < field.Paths.Length; i++)
-                {
-                    var extension = Path.GetExtension(field.Paths[i]);
+                var extension = Path.GetExtension(field.Paths[i]);
 
-                    if (!settings.AllowedExtensions.Contains(extension))
-                    {
-                        context.Updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
-                    }
+                if (!settings.AllowedExtensions.Contains(extension))
+                {
+                    context.Updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["Media extension is not allowed. Only media with '{0}' extensions are allowed.", string.Join(", ", settings.AllowedExtensions)]);
                 }
             }
+        }
 
-            if (settings.Required && field.Paths.Length < 1)
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
-            }
-
-            if (field.Paths.Length > 1 && !settings.Multiple)
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["{0}: Selecting multiple media is forbidden.", context.PartFieldDefinition.DisplayName()]);
-            }
+        if (settings.Required && field.Paths.Length < 1)
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
+        }
 
-            if (settings.AllowMediaText)
-            {
-                field.MediaTexts = items.Select(t => t.MediaText).ToArray();
-            }
-            else
-            {
-                field.MediaTexts = [];
-            }
+        if (field.Paths.Length > 1 && !settings.Multiple)
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(model.Paths), S["{0}: Selecting multiple media is forbidden.", context.PartFieldDefinition.DisplayName()]);
+        }
 
-            if (settings.AllowAnchors)
-            {
-                field.SetAnchors(items.Select(t => t.Anchor).ToArray());
-            }
-            else if (field.Content.ContainsKey("Anchors")) // Less well known properties should be self healing.
-            {
-                field.Content.Remove("Anchors");
-            }
+        if (settings.AllowMediaText)
+        {
+            field.MediaTexts = items.Select(t => t.MediaText).ToArray();
+        }
+        else
+        {
+            field.MediaTexts = [];
+        }
 
-            return Edit(field, context);
+        if (settings.AllowAnchors)
+        {
+            field.SetAnchors(items.Select(t => t.Anchor).ToArray());
+        }
+        else if (field.Content.ContainsKey("Anchors")) // Less well known properties should be self healing.
+        {
+            field.Content.Remove("Anchors");
         }
+
+        return Edit(field, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Fields/Anchor.cs b/src/OrchardCore.Modules/OrchardCore.Media/Fields/Anchor.cs
index 7e9e067f2c2..3abf7be90b5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Fields/Anchor.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Fields/Anchor.cs
@@ -1,12 +1,11 @@
-namespace OrchardCore.Media.Fields
+namespace OrchardCore.Media.Fields;
+
+/// <summary>
+/// An anchor represents two floats with an <see cref="X"/> and <see cref="Y"/> position.
+/// When anchoring is enabled the position defaults to the center of the media.
+/// </summary>
+public class Anchor
 {
-    /// <summary>
-    /// An anchor represents two floats with an <see cref="X"/> and <see cref="Y"/> position.
-    /// When anchoring is enabled the position defaults to the center of the media.
-    /// </summary>
-    public class Anchor
-    {
-        public float X { get; set; } = 0.5f;
-        public float Y { get; set; } = 0.5f;
-    }
+    public float X { get; set; } = 0.5f;
+    public float Y { get; set; } = 0.5f;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Fields/MediaFieldAnchorExtensions.cs b/src/OrchardCore.Modules/OrchardCore.Media/Fields/MediaFieldAnchorExtensions.cs
index 2a35ce75c30..48168b29b56 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Fields/MediaFieldAnchorExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Fields/MediaFieldAnchorExtensions.cs
@@ -1,26 +1,25 @@
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.Media.Fields
+namespace OrchardCore.Media.Fields;
+
+public static class MediaFieldAnchorExtensions
 {
-    public static class MediaFieldAnchorExtensions
+    /// <summary>
+    /// Anchors are a less well known property of a media field.
+    /// </summary>
+    public static Anchor[] GetAnchors(this MediaField mediaField)
     {
-        /// <summary>
-        /// Anchors are a less well known property of a media field.
-        /// </summary>
-        public static Anchor[] GetAnchors(this MediaField mediaField)
-        {
-            var anchors = (JsonArray)mediaField.Content["Anchors"];
-
-            return anchors is not null ? anchors.ToObject<Anchor[]>() : [];
-        }
+        var anchors = (JsonArray)mediaField.Content["Anchors"];
 
-        /// <summary>
-        /// Tags names are a less well known property of a media field.
-        /// </summary>
-        public static void SetAnchors(this MediaField mediaField, Anchor[] anchors)
-        {
-            mediaField.Content["Anchors"] = JArray.FromObject(anchors);
-        }
+        return anchors is not null ? anchors.ToObject<Anchor[]>() : [];
+    }
 
+    /// <summary>
+    /// Tags names are a less well known property of a media field.
+    /// </summary>
+    public static void SetAnchors(this MediaField mediaField, Anchor[] anchors)
+    {
+        mediaField.Content["Anchors"] = JArray.FromObject(anchors);
     }
+
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Fields/MediaFieldAttachedFileNameExtensions.cs b/src/OrchardCore.Modules/OrchardCore.Media/Fields/MediaFieldAttachedFileNameExtensions.cs
index 623368b566e..45a845d663e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Fields/MediaFieldAttachedFileNameExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Fields/MediaFieldAttachedFileNameExtensions.cs
@@ -1,28 +1,27 @@
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.Media.Fields
+namespace OrchardCore.Media.Fields;
+
+public static class MediaFieldAttachedFileNameExtensions
 {
-    public static class MediaFieldAttachedFileNameExtensions
+    /// <summary>
+    /// Gets the names of <see cref="MediaField"/> attached files.
+    /// </summary>
+    public static string[] GetAttachedFileNames(this MediaField mediaField)
     {
-        /// <summary>
-        /// Gets the names of <see cref="MediaField"/> attached files.
-        /// </summary>
-        public static string[] GetAttachedFileNames(this MediaField mediaField)
-        {
-            var filenames = (JsonArray)mediaField.Content["AttachedFileNames"];
-
-            return filenames != null
-                ? filenames.ToObject<string[]>()
-                : [];
-        }
+        var filenames = (JsonArray)mediaField.Content["AttachedFileNames"];
 
-        /// <summary>
-        /// Sets the names of <see cref="MediaField"/> attached files.
-        /// </summary>
-        public static void SetAttachedFileNames(this MediaField mediaField, string[] filenames)
-        {
-            mediaField.Content["AttachedFileNames"] = JArray.FromObject(filenames);
-        }
+        return filenames != null
+            ? filenames.ToObject<string[]>()
+            : [];
+    }
 
+    /// <summary>
+    /// Sets the names of <see cref="MediaField"/> attached files.
+    /// </summary>
+    public static void SetAttachedFileNames(this MediaField mediaField, string[] filenames)
+    {
+        mediaField.Content["AttachedFileNames"] = JArray.FromObject(filenames);
     }
+
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Filters/AssetUrlFilter.cs b/src/OrchardCore.Modules/OrchardCore.Media/Filters/AssetUrlFilter.cs
index 44250ba39e3..888da005bcd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Filters/AssetUrlFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Filters/AssetUrlFilter.cs
@@ -3,22 +3,21 @@
 using Fluid.Values;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Media.Filters
+namespace OrchardCore.Media.Filters;
+
+public class AssetUrlFilter : ILiquidFilter
 {
-    public class AssetUrlFilter : ILiquidFilter
-    {
-        private readonly IMediaFileStore _mediaFileStore;
+    private readonly IMediaFileStore _mediaFileStore;
 
-        public AssetUrlFilter(IMediaFileStore mediaFileStore)
-        {
-            _mediaFileStore = mediaFileStore;
-        }
+    public AssetUrlFilter(IMediaFileStore mediaFileStore)
+    {
+        _mediaFileStore = mediaFileStore;
+    }
 
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
-        {
-            var url = input.ToStringValue();
-            var imageUrl = _mediaFileStore.MapPathToPublicUrl(url);
-            return new ValueTask<FluidValue>(new StringValue(imageUrl ?? url));
-        }
+    public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
+    {
+        var url = input.ToStringValue();
+        var imageUrl = _mediaFileStore.MapPathToPublicUrl(url);
+        return new ValueTask<FluidValue>(new StringValue(imageUrl ?? url));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Filters/MediaFilters.cs b/src/OrchardCore.Modules/OrchardCore.Media/Filters/MediaFilters.cs
index d48873a49fe..22cb2b5f087 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Filters/MediaFilters.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Filters/MediaFilters.cs
@@ -2,24 +2,23 @@
 using Fluid;
 using Fluid.Values;
 
-namespace OrchardCore.Media.Filters
+namespace OrchardCore.Media.Filters;
+
+public static class MediaFilters
 {
-    public static class MediaFilters
+    public static ValueTask<FluidValue> ImgTag(FluidValue input, FilterArguments arguments, TemplateContext _)
     {
-        public static ValueTask<FluidValue> ImgTag(FluidValue input, FilterArguments arguments, TemplateContext _)
-        {
-            var url = input.ToStringValue();
+        var url = input.ToStringValue();
 
-            var imgTag = $"<img src=\"{url}\"";
+        var imgTag = $"<img src=\"{url}\"";
 
-            foreach (var name in arguments.Names)
-            {
-                imgTag += $" {name.Replace('_', '-')}=\"{arguments[name].ToStringValue()}\"";
-            }
+        foreach (var name in arguments.Names)
+        {
+            imgTag += $" {name.Replace('_', '-')}=\"{arguments[name].ToStringValue()}\"";
+        }
 
-            imgTag += " />";
+        imgTag += " />";
 
-            return new ValueTask<FluidValue>(new StringValue(imgTag) { Encode = false });
-        }
+        return new ValueTask<FluidValue>(new StringValue(imgTag) { Encode = false });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Filters/ResizeUrlFilter.cs b/src/OrchardCore.Modules/OrchardCore.Media/Filters/ResizeUrlFilter.cs
index 210aaff6cc4..43db52e3322 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Filters/ResizeUrlFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Filters/ResizeUrlFilter.cs
@@ -11,124 +11,123 @@
 using OrchardCore.Media.Fields;
 using OrchardCore.Media.Services;
 
-namespace OrchardCore.Media.Filters
+namespace OrchardCore.Media.Filters;
+
+public class ResizeUrlFilter : ILiquidFilter
 {
-    public class ResizeUrlFilter : ILiquidFilter
+    private readonly IMediaProfileService _mediaProfileService;
+    private readonly IMediaTokenService _mediaTokenService;
+    private readonly MediaOptions _options;
+
+    public ResizeUrlFilter(IMediaProfileService mediaProfileService, IMediaTokenService mediaTokenService, IOptions<MediaOptions> options)
     {
-        private readonly IMediaProfileService _mediaProfileService;
-        private readonly IMediaTokenService _mediaTokenService;
-        private readonly MediaOptions _options;
+        _mediaProfileService = mediaProfileService;
+        _mediaTokenService = mediaTokenService;
+        _options = options.Value;
+    }
 
-        public ResizeUrlFilter(IMediaProfileService mediaProfileService, IMediaTokenService mediaTokenService, IOptions<MediaOptions> options)
-        {
-            _mediaProfileService = mediaProfileService;
-            _mediaTokenService = mediaTokenService;
-            _options = options.Value;
-        }
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
+    {
+        var url = input.ToStringValue();
 
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
-        {
-            var url = input.ToStringValue();
+        // Profile is a named argument only.
+        var profile = arguments["profile"];
 
-            // Profile is a named argument only.
-            var profile = arguments["profile"];
+        IDictionary<string, string> queryStringParams;
 
-            IDictionary<string, string> queryStringParams;
+        if (!profile.IsNil())
+        {
+            queryStringParams = await _mediaProfileService.GetMediaProfileCommands(profile.ToStringValue());
+
+            // Additional commands to a profile must be named.
+            var width = arguments["width"];
+            var height = arguments["height"];
+            var mode = arguments["mode"];
+            var quality = arguments["quality"];
+            var format = arguments["format"];
+            var anchor = arguments["anchor"];
+            var bgcolor = arguments["bgcolor"];
+
+            ApplyQueryStringParams(queryStringParams, width, height, mode, quality, format, anchor, bgcolor);
+        }
+        else
+        {
+            queryStringParams = new Dictionary<string, string>();
 
-            if (!profile.IsNil())
-            {
-                queryStringParams = await _mediaProfileService.GetMediaProfileCommands(profile.ToStringValue());
-
-                // Additional commands to a profile must be named.
-                var width = arguments["width"];
-                var height = arguments["height"];
-                var mode = arguments["mode"];
-                var quality = arguments["quality"];
-                var format = arguments["format"];
-                var anchor = arguments["anchor"];
-                var bgcolor = arguments["bgcolor"];
-
-                ApplyQueryStringParams(queryStringParams, width, height, mode, quality, format, anchor, bgcolor);
-            }
-            else
-            {
-                queryStringParams = new Dictionary<string, string>();
+            // Never mix named and indexed arguments as this leads to unpredictable results.
+            var useNamed = arguments.Names.Any();
 
-                // Never mix named and indexed arguments as this leads to unpredictable results.
-                var useNamed = arguments.Names.Any();
+            var width = useNamed ? arguments["width"] : arguments.At(0);
+            var height = useNamed ? arguments["height"] : arguments.At(1);
+            var mode = useNamed ? arguments["mode"] : arguments.At(2);
+            var quality = useNamed ? arguments["quality"] : arguments.At(3);
+            var format = useNamed ? arguments["format"] : arguments.At(4);
+            var anchor = useNamed ? arguments["anchor"] : arguments.At(5);
+            var bgcolor = useNamed ? arguments["bgcolor"] : arguments.At(6);
 
-                var width = useNamed ? arguments["width"] : arguments.At(0);
-                var height = useNamed ? arguments["height"] : arguments.At(1);
-                var mode = useNamed ? arguments["mode"] : arguments.At(2);
-                var quality = useNamed ? arguments["quality"] : arguments.At(3);
-                var format = useNamed ? arguments["format"] : arguments.At(4);
-                var anchor = useNamed ? arguments["anchor"] : arguments.At(5);
-                var bgcolor = useNamed ? arguments["bgcolor"] : arguments.At(6);
+            ApplyQueryStringParams(queryStringParams, width, height, mode, quality, format, anchor, bgcolor);
+        }
 
-                ApplyQueryStringParams(queryStringParams, width, height, mode, quality, format, anchor, bgcolor);
-            }
+        var resizedUrl = QueryHelpers.AddQueryString(url, queryStringParams);
 
-            var resizedUrl = QueryHelpers.AddQueryString(url, queryStringParams);
 
+        if (_options.UseTokenizedQueryString)
+        {
+            resizedUrl = _mediaTokenService.AddTokenToPath(resizedUrl);
+        }
 
-            if (_options.UseTokenizedQueryString)
-            {
-                resizedUrl = _mediaTokenService.AddTokenToPath(resizedUrl);
-            }
+        return new StringValue(resizedUrl);
+    }
 
-            return new StringValue(resizedUrl);
+    private static void ApplyQueryStringParams(IDictionary<string, string> queryStringParams, FluidValue width, FluidValue height, FluidValue mode, FluidValue quality, FluidValue format, FluidValue anchorValue, FluidValue bgcolor)
+    {
+        if (!width.IsNil())
+        {
+            queryStringParams["width"] = width.ToStringValue();
         }
 
-        private static void ApplyQueryStringParams(IDictionary<string, string> queryStringParams, FluidValue width, FluidValue height, FluidValue mode, FluidValue quality, FluidValue format, FluidValue anchorValue, FluidValue bgcolor)
+        if (!height.IsNil())
         {
-            if (!width.IsNil())
-            {
-                queryStringParams["width"] = width.ToStringValue();
-            }
+            queryStringParams["height"] = height.ToStringValue();
+        }
 
-            if (!height.IsNil())
-            {
-                queryStringParams["height"] = height.ToStringValue();
-            }
+        if (!mode.IsNil())
+        {
+            queryStringParams["rmode"] = mode.ToStringValue();
+        }
 
-            if (!mode.IsNil())
-            {
-                queryStringParams["rmode"] = mode.ToStringValue();
-            }
+        if (!quality.IsNil())
+        {
+            queryStringParams["quality"] = quality.ToStringValue();
+        }
 
-            if (!quality.IsNil())
-            {
-                queryStringParams["quality"] = quality.ToStringValue();
-            }
+        if (!format.IsNil())
+        {
+            queryStringParams["format"] = format.ToStringValue();
+        }
 
-            if (!format.IsNil())
-            {
-                queryStringParams["format"] = format.ToStringValue();
-            }
+        if (!anchorValue.IsNil())
+        {
+            var obj = anchorValue.ToObjectValue();
 
-            if (!anchorValue.IsNil())
+            if (obj is not Anchor anchor)
             {
-                var obj = anchorValue.ToObjectValue();
+                anchor = null;
 
-                if (obj is not Anchor anchor)
+                if (obj is JsonObject jObject)
                 {
-                    anchor = null;
-
-                    if (obj is JsonObject jObject)
-                    {
-                        anchor = jObject.ToObject<Anchor>();
-                    }
-                }
-                if (anchor != null)
-                {
-                    queryStringParams["rxy"] = anchor.X.ToString(CultureInfo.InvariantCulture) + ',' + anchor.Y.ToString(CultureInfo.InvariantCulture);
+                    anchor = jObject.ToObject<Anchor>();
                 }
             }
-
-            if (!bgcolor.IsNil())
+            if (anchor != null)
             {
-                queryStringParams["bgcolor"] = bgcolor.ToStringValue();
+                queryStringParams["rxy"] = anchor.X.ToString(CultureInfo.InvariantCulture) + ',' + anchor.Y.ToString(CultureInfo.InvariantCulture);
             }
         }
+
+        if (!bgcolor.IsNil())
+        {
+            queryStringParams["bgcolor"] = bgcolor.ToStringValue();
+        }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/MediaAssetObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/MediaAssetObjectType.cs
index 467c5478e47..ec6caaa963e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/MediaAssetObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/MediaAssetObjectType.cs
@@ -2,29 +2,28 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.FileStorage;
 
-namespace OrchardCore.Media.GraphQL
+namespace OrchardCore.Media.GraphQL;
+
+public class MediaAssetObjectType : ObjectGraphType<IFileStoreEntry>
 {
-    public class MediaAssetObjectType : ObjectGraphType<IFileStoreEntry>
+    public MediaAssetObjectType()
     {
-        public MediaAssetObjectType()
-        {
-            Name = "MediaAsset";
+        Name = "MediaAsset";
 
-            Field(file => file.Name).Description("The name of the asset.");
+        Field(file => file.Name).Description("The name of the asset.");
 
-            Field<StringGraphType>("path")
-                .Description("The url to the asset.")
-                .Resolve(x =>
-                {
-                    var path = x.Source.Path;
-                    var mediaFileStore = x.RequestServices.GetService<IMediaFileStore>();
-                    return mediaFileStore.MapPathToPublicUrl(path);
-                });
+        Field<StringGraphType>("path")
+            .Description("The url to the asset.")
+            .Resolve(x =>
+            {
+                var path = x.Source.Path;
+                var mediaFileStore = x.RequestServices.GetService<IMediaFileStore>();
+                return mediaFileStore.MapPathToPublicUrl(path);
+            });
 
-            Field(file => file.Length).Description("The length of the file.");
-            Field<DateTimeGraphType>("lastModifiedUtc")
-                .Description("The date and time in UTC when the asset was last modified.")
-                .Resolve(file => file.Source.LastModifiedUtc);
-        }
+        Field(file => file.Length).Description("The length of the file.");
+        Field<DateTimeGraphType>("lastModifiedUtc")
+            .Description("The date and time in UTC when the asset was last modified.")
+            .Resolve(file => file.Source.LastModifiedUtc);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/MediaAssetQuery.cs b/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/MediaAssetQuery.cs
index 0880bed5c83..b8a19c5b011 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/MediaAssetQuery.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/MediaAssetQuery.cs
@@ -11,72 +11,71 @@
 using OrchardCore.ContentManagement.GraphQL.Options;
 using OrchardCore.FileStorage;
 
-namespace OrchardCore.Media.GraphQL
+namespace OrchardCore.Media.GraphQL;
+
+public class MediaAssetQuery : ISchemaBuilder
 {
-    public class MediaAssetQuery : ISchemaBuilder
+    protected readonly IStringLocalizer S;
+    private readonly GraphQLContentOptions _graphQLContentOptions;
+
+    public MediaAssetQuery(
+        IStringLocalizer<MediaAssetQuery> localizer,
+        IOptions<GraphQLContentOptions> graphQLContentOptions)
     {
-        protected readonly IStringLocalizer S;
-        private readonly GraphQLContentOptions _graphQLContentOptions;
+        S = localizer;
+        _graphQLContentOptions = graphQLContentOptions.Value;
+    }
+
+    public Task<string> GetIdentifierAsync() => Task.FromResult(string.Empty);
 
-        public MediaAssetQuery(
-            IStringLocalizer<MediaAssetQuery> localizer,
-            IOptions<GraphQLContentOptions> graphQLContentOptions)
+    public Task BuildAsync(ISchema schema)
+    {
+        if (_graphQLContentOptions.IsHiddenByDefault("MediaAssets"))
         {
-            S = localizer;
-            _graphQLContentOptions = graphQLContentOptions.Value;
+            return Task.CompletedTask;
         }
 
-        public Task<string> GetIdentifierAsync() => Task.FromResult(string.Empty);
-
-        public Task BuildAsync(ISchema schema)
+        var field = new FieldType
         {
-            if (_graphQLContentOptions.IsHiddenByDefault("MediaAssets"))
-            {
-                return Task.CompletedTask;
-            }
-
-            var field = new FieldType
-            {
-                Name = "MediaAssets",
-                Description = S["Media assets are items that are part of your media library."],
-                Type = typeof(ListGraphType<MediaAssetObjectType>),
-                Arguments = new QueryArguments(
-                    new QueryArgument<StringGraphType>
-                    {
-                        Name = "path",
-                        Description = S["Media asset path."]
-                    },
-                    new QueryArgument<BooleanGraphType>
-                    {
-                        Name = "includeSubDirectories",
-                        Description = S["Whether to get the assets from just the top directory or from all sub-directories as well."]
-                    }
-                ),
-                Resolver = new LockedAsyncFieldResolver<IEnumerable<IFileStoreEntry>>(ResolveAsync)
-            };
+            Name = "MediaAssets",
+            Description = S["Media assets are items that are part of your media library."],
+            Type = typeof(ListGraphType<MediaAssetObjectType>),
+            Arguments = new QueryArguments(
+                new QueryArgument<StringGraphType>
+                {
+                    Name = "path",
+                    Description = S["Media asset path."]
+                },
+                new QueryArgument<BooleanGraphType>
+                {
+                    Name = "includeSubDirectories",
+                    Description = S["Whether to get the assets from just the top directory or from all sub-directories as well."]
+                }
+            ),
+            Resolver = new LockedAsyncFieldResolver<IEnumerable<IFileStoreEntry>>(ResolveAsync)
+        };
 
-            schema.Query.AddField(field);
+        schema.Query.AddField(field);
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
+    }
 
-        private async ValueTask<IEnumerable<IFileStoreEntry>> ResolveAsync(IResolveFieldContext resolveContext)
-        {
-            var mediaFileStore = resolveContext.RequestServices.GetService<IMediaFileStore>();
+    private async ValueTask<IEnumerable<IFileStoreEntry>> ResolveAsync(IResolveFieldContext resolveContext)
+    {
+        var mediaFileStore = resolveContext.RequestServices.GetService<IMediaFileStore>();
 
-            var path = resolveContext.GetArgument("path", string.Empty);
-            var includeSubDirectories = resolveContext.GetArgument("includeSubDirectories", false);
+        var path = resolveContext.GetArgument("path", string.Empty);
+        var includeSubDirectories = resolveContext.GetArgument("includeSubDirectories", false);
 
-            var allFiles = mediaFileStore.GetDirectoryContentAsync(path, includeSubDirectories);
+        var allFiles = mediaFileStore.GetDirectoryContentAsync(path, includeSubDirectories);
 
-            if (includeSubDirectories)
-            {
-                return await allFiles.ToListAsync();
-            }
-            else
-            {
-                return await allFiles.Where(x => !x.IsDirectory).ToListAsync();
-            }
+        if (includeSubDirectories)
+        {
+            return await allFiles.ToListAsync();
+        }
+        else
+        {
+            return await allFiles.Where(x => !x.IsDirectory).ToListAsync();
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/MediaFieldQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/MediaFieldQueryObjectType.cs
index a09243a3c66..6a304c31aee 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/MediaFieldQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/MediaFieldQueryObjectType.cs
@@ -6,118 +6,117 @@
 using OrchardCore.Apis.GraphQL;
 using OrchardCore.Media.Fields;
 
-namespace OrchardCore.Media.GraphQL
+namespace OrchardCore.Media.GraphQL;
+
+public class MediaFieldQueryObjectType : ObjectGraphType<MediaField>
 {
-    public class MediaFieldQueryObjectType : ObjectGraphType<MediaField>
+    public MediaFieldQueryObjectType()
     {
-        public MediaFieldQueryObjectType()
-        {
-            Name = nameof(MediaField);
-
-            if (MediaAppContextSwitches.EnableLegacyMediaFields)
-            {
-                Field<ListGraphType<StringGraphType>, IEnumerable<string>>("paths")
-                    .Description("the media paths")
-                    .PagingArguments()
-                    .Resolve(x =>
-                    {
-                        if (x.Source?.Paths is null)
-                        {
-                            return Array.Empty<string>();
-                        }
+        Name = nameof(MediaField);
 
-                        return x.Page(x.Source.Paths);
-                    });
-
-                Field<ListGraphType<StringGraphType>, IEnumerable<string>>("fileNames")
-                    .Description("the media file names")
-                    .PagingArguments()
-                    .Resolve(x =>
-                    {
-                        var fileNames = x.Page(x.Source.GetAttachedFileNames());
-                        if (fileNames is null)
-                        {
-                            return Array.Empty<string>();
-                        }
-                        return fileNames;
-                    });
-
-                Field<ListGraphType<StringGraphType>, IEnumerable<string>>("urls")
-                    .Description("the absolute urls of the media items")
-                    .PagingArguments()
-                    .Resolve(x =>
+        if (MediaAppContextSwitches.EnableLegacyMediaFields)
+        {
+            Field<ListGraphType<StringGraphType>, IEnumerable<string>>("paths")
+                .Description("the media paths")
+                .PagingArguments()
+                .Resolve(x =>
+                {
+                    if (x.Source?.Paths is null)
                     {
-                        if (x.Source?.Paths is null)
-                        {
-                            return Array.Empty<string>();
-                        }
-                        var paths = x.Page(x.Source.Paths);
-                        var mediaFileStore = x.RequestServices.GetService<IMediaFileStore>();
+                        return Array.Empty<string>();
+                    }
 
-                        return paths.Select(p => mediaFileStore.MapPathToPublicUrl(p));
-                    });
+                    return x.Page(x.Source.Paths);
+                });
 
-                Field<ListGraphType<StringGraphType>, IEnumerable<string>>("mediatexts")
-                .Description("the media texts")
+            Field<ListGraphType<StringGraphType>, IEnumerable<string>>("fileNames")
+                .Description("the media file names")
                 .PagingArguments()
                 .Resolve(x =>
                 {
-                    if (x.Source?.MediaTexts is null)
+                    var fileNames = x.Page(x.Source.GetAttachedFileNames());
+                    if (fileNames is null)
                     {
                         return Array.Empty<string>();
                     }
-                    return x.Page(x.Source.MediaTexts);
+                    return fileNames;
                 });
-            }
 
-            Field<ListGraphType<MediaFileItemType>, IEnumerable<MediaFileItem>>("files")
-                .Description("the files of the media items")
+            Field<ListGraphType<StringGraphType>, IEnumerable<string>>("urls")
+                .Description("the absolute urls of the media items")
                 .PagingArguments()
                 .Resolve(x =>
                 {
                     if (x.Source?.Paths is null)
                     {
-                        return [];
+                        return Array.Empty<string>();
                     }
-
-                    var paths = x.Page(x.Source.Paths).ToArray();
+                    var paths = x.Page(x.Source.Paths);
                     var mediaFileStore = x.RequestServices.GetService<IMediaFileStore>();
-                    var urls = paths.Select(p => mediaFileStore.MapPathToPublicUrl(p)).ToArray();
-                    var fileNames = x.Page(x.Source?.GetAttachedFileNames()).ToArray();
-                    var items = new List<MediaFileItem>();
-                    var mediaTexts = x.Source?.MediaTexts ?? [];
-                    for (int i = 0; i < paths.Length; i++)
-                    {
-                        items.Add(new MediaFileItem
-                        {
-                            Path = paths[i],
-                            FileName = fileNames.Length > i ? fileNames[i] : string.Empty,
-                            Url = urls.Length > i ? urls[i] : string.Empty,
-                            MediaText = mediaTexts.Length > i ? mediaTexts[i] : string.Empty,
-                        });
-                    }
 
-                    return items;
+                    return paths.Select(p => mediaFileStore.MapPathToPublicUrl(p));
                 });
-        }
-    }
 
-    public sealed class MediaFileItemType : ObjectGraphType<MediaFileItem>
-    {
-        public MediaFileItemType()
-        {
-            Field<StringGraphType>("fileName").Description("the file name of the media file item").Resolve(x => x.Source.FileName);
-            Field<StringGraphType>("path").Description("the path of the media file item").Resolve(x => x.Source.Path);
-            Field<StringGraphType>("url").Description("the url name of the media file item").Resolve(x => x.Source.Url);
-            Field<StringGraphType>("mediaText").Description("the media text of the file item").Resolve(x => x.Source.MediaText);
+            Field<ListGraphType<StringGraphType>, IEnumerable<string>>("mediatexts")
+            .Description("the media texts")
+            .PagingArguments()
+            .Resolve(x =>
+            {
+                if (x.Source?.MediaTexts is null)
+                {
+                    return Array.Empty<string>();
+                }
+                return x.Page(x.Source.MediaTexts);
+            });
         }
+
+        Field<ListGraphType<MediaFileItemType>, IEnumerable<MediaFileItem>>("files")
+            .Description("the files of the media items")
+            .PagingArguments()
+            .Resolve(x =>
+            {
+                if (x.Source?.Paths is null)
+                {
+                    return [];
+                }
+
+                var paths = x.Page(x.Source.Paths).ToArray();
+                var mediaFileStore = x.RequestServices.GetService<IMediaFileStore>();
+                var urls = paths.Select(p => mediaFileStore.MapPathToPublicUrl(p)).ToArray();
+                var fileNames = x.Page(x.Source?.GetAttachedFileNames()).ToArray();
+                var items = new List<MediaFileItem>();
+                var mediaTexts = x.Source?.MediaTexts ?? [];
+                for (int i = 0; i < paths.Length; i++)
+                {
+                    items.Add(new MediaFileItem
+                    {
+                        Path = paths[i],
+                        FileName = fileNames.Length > i ? fileNames[i] : string.Empty,
+                        Url = urls.Length > i ? urls[i] : string.Empty,
+                        MediaText = mediaTexts.Length > i ? mediaTexts[i] : string.Empty,
+                    });
+                }
+
+                return items;
+            });
     }
+}
 
-    public sealed class MediaFileItem
+public sealed class MediaFileItemType : ObjectGraphType<MediaFileItem>
+{
+    public MediaFileItemType()
     {
-        public string FileName { get; set; }
-        public string Path { get; set; }
-        public string Url { get; set; }
-        public string MediaText { get; set; }
+        Field<StringGraphType>("fileName").Description("the file name of the media file item").Resolve(x => x.Source.FileName);
+        Field<StringGraphType>("path").Description("the path of the media file item").Resolve(x => x.Source.Path);
+        Field<StringGraphType>("url").Description("the url name of the media file item").Resolve(x => x.Source.Url);
+        Field<StringGraphType>("mediaText").Description("the media text of the file item").Resolve(x => x.Source.MediaText);
     }
 }
+
+public sealed class MediaFileItem
+{
+    public string FileName { get; set; }
+    public string Path { get; set; }
+    public string Url { get; set; }
+    public string MediaText { get; set; }
+}
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/Startup.cs
index 5848a96f0c6..7519e3f41fa 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/Startup.cs
@@ -4,16 +4,15 @@
 using OrchardCore.Media.Fields;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Media.GraphQL
+namespace OrchardCore.Media.GraphQL;
+
+[RequireFeatures("OrchardCore.Apis.GraphQL")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Apis.GraphQL")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSingleton<ISchemaBuilder, MediaAssetQuery>();
-            services.AddObjectGraphType<MediaField, MediaFieldQueryObjectType>();
-            services.AddTransient<MediaAssetObjectType>();
-        }
+        services.AddSingleton<ISchemaBuilder, MediaAssetQuery>();
+        services.AddObjectGraphType<MediaField, MediaFieldQueryObjectType>();
+        services.AddTransient<MediaAssetObjectType>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Handlers/AttachedMediaFieldContentHandler.cs b/src/OrchardCore.Modules/OrchardCore.Media/Handlers/AttachedMediaFieldContentHandler.cs
index d3d8dc9821e..422c8b591c9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Handlers/AttachedMediaFieldContentHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Handlers/AttachedMediaFieldContentHandler.cs
@@ -2,26 +2,25 @@
 using OrchardCore.ContentManagement.Handlers;
 using OrchardCore.Media.Services;
 
-namespace OrchardCore.Media.Handlers
+namespace OrchardCore.Media.Handlers;
+
+/// <summary>
+/// Content Handler to delete files used on attached media fields once the content item is deleted.
+/// </summary>
+public class AttachedMediaFieldContentHandler : ContentHandlerBase
 {
-    /// <summary>
-    /// Content Handler to delete files used on attached media fields once the content item is deleted.
-    /// </summary>
-    public class AttachedMediaFieldContentHandler : ContentHandlerBase
-    {
-        private readonly AttachedMediaFieldFileService _attachedMediaFieldFileService;
+    private readonly AttachedMediaFieldFileService _attachedMediaFieldFileService;
 
-        public AttachedMediaFieldContentHandler(AttachedMediaFieldFileService attachedMediaFieldFileService)
-        {
-            _attachedMediaFieldFileService = attachedMediaFieldFileService;
-        }
+    public AttachedMediaFieldContentHandler(AttachedMediaFieldFileService attachedMediaFieldFileService)
+    {
+        _attachedMediaFieldFileService = attachedMediaFieldFileService;
+    }
 
-        public override async Task RemovedAsync(RemoveContentContext context)
+    public override async Task RemovedAsync(RemoveContentContext context)
+    {
+        if (context.NoActiveVersionLeft)
         {
-            if (context.NoActiveVersionLeft)
-            {
-                await _attachedMediaFieldFileService.DeleteContentItemFolderAsync(context.ContentItem);
-            }
+            await _attachedMediaFieldFileService.DeleteContentItemFolderAsync(context.ContentItem);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Indexing/MediaFieldIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.Media/Indexing/MediaFieldIndexHandler.cs
index 37859eee99c..60fdb758e96 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Indexing/MediaFieldIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Indexing/MediaFieldIndexHandler.cs
@@ -9,93 +9,92 @@
 using OrchardCore.Media.Fields;
 using OrchardCore.Media.Settings;
 
-namespace OrchardCore.Media.Indexing
+namespace OrchardCore.Media.Indexing;
+
+public class MediaFieldIndexHandler : ContentFieldIndexHandler<MediaField>
 {
-    public class MediaFieldIndexHandler : ContentFieldIndexHandler<MediaField>
-    {
-        private const string MediaTextKeySuffix = ".MediaText";
-        private const string FileTextKeySuffix = ".FileText";
+    private const string MediaTextKeySuffix = ".MediaText";
+    private const string FileTextKeySuffix = ".FileText";
 
-        private readonly IMediaFileStore _mediaFileStore;
-        private readonly MediaFileIndexingOptions _mediaFileIndexingOptions;
-        private readonly IServiceProvider _serviceProvider;
+    private readonly IMediaFileStore _mediaFileStore;
+    private readonly MediaFileIndexingOptions _mediaFileIndexingOptions;
+    private readonly IServiceProvider _serviceProvider;
 
-        public MediaFieldIndexHandler(
-            IMediaFileStore mediaFileStore,
-            IOptions<MediaFileIndexingOptions> mediaFileIndexingOptions,
-            IServiceProvider serviceProvider)
-        {
-            _mediaFileStore = mediaFileStore;
-            _mediaFileIndexingOptions = mediaFileIndexingOptions.Value;
-            _serviceProvider = serviceProvider;
-        }
+    public MediaFieldIndexHandler(
+        IMediaFileStore mediaFileStore,
+        IOptions<MediaFileIndexingOptions> mediaFileIndexingOptions,
+        IServiceProvider serviceProvider)
+    {
+        _mediaFileStore = mediaFileStore;
+        _mediaFileIndexingOptions = mediaFileIndexingOptions.Value;
+        _serviceProvider = serviceProvider;
+    }
 
-        public async override Task BuildIndexAsync(MediaField field, BuildFieldIndexContext context)
-        {
-            var options = context.Settings.ToOptions();
-            var settings = context.ContentPartFieldDefinition.GetSettings<MediaFieldSettings>();
+    public async override Task BuildIndexAsync(MediaField field, BuildFieldIndexContext context)
+    {
+        var options = context.Settings.ToOptions();
+        var settings = context.ContentPartFieldDefinition.GetSettings<MediaFieldSettings>();
 
-            if (field.Paths?.Length is null || field.Paths.Length == 0)
+        if (field.Paths?.Length is null || field.Paths.Length == 0)
+        {
+            foreach (var key in context.Keys)
             {
-                foreach (var key in context.Keys)
-                {
-                    context.DocumentIndex.Set(key + MediaTextKeySuffix, IndexingConstants.NullValue, options);
-                    context.DocumentIndex.Set(key + FileTextKeySuffix, IndexingConstants.NullValue, options);
-                }
-
-                return;
+                context.DocumentIndex.Set(key + MediaTextKeySuffix, IndexingConstants.NullValue, options);
+                context.DocumentIndex.Set(key + FileTextKeySuffix, IndexingConstants.NullValue, options);
             }
 
-            if (settings.AllowMediaText)
+            return;
+        }
+
+        if (settings.AllowMediaText)
+        {
+            foreach (var key in context.Keys)
             {
-                foreach (var key in context.Keys)
+                if (field.MediaTexts != null)
                 {
-                    if (field.MediaTexts != null)
-                    {
-                        foreach (var mediaText in field.MediaTexts)
-                        {
-                            context.DocumentIndex.Set(key + MediaTextKeySuffix, mediaText, options);
-                        }
-                    }
-                    else
+                    foreach (var mediaText in field.MediaTexts)
                     {
-                        context.DocumentIndex.Set(key + MediaTextKeySuffix, IndexingConstants.NullValue, options);
+                        context.DocumentIndex.Set(key + MediaTextKeySuffix, mediaText, options);
                     }
                 }
+                else
+                {
+                    context.DocumentIndex.Set(key + MediaTextKeySuffix, IndexingConstants.NullValue, options);
+                }
             }
+        }
 
-            var paths = new HashSet<string>();
+        var paths = new HashSet<string>();
 
-            foreach (var path in field.Paths)
+        foreach (var path in field.Paths)
+        {
+            // The same file could be added several time to the field.
+            if (!paths.Add(path))
             {
-                // The same file could be added several time to the field.
-                if (!paths.Add(path))
-                {
-                    // When a path is already processed, skip it.
-                    continue;
-                }
+                // When a path is already processed, skip it.
+                continue;
+            }
 
-                var providerType = _mediaFileIndexingOptions.GetRegisteredMediaFileTextProvider(Path.GetExtension(path));
+            var providerType = _mediaFileIndexingOptions.GetRegisteredMediaFileTextProvider(Path.GetExtension(path));
 
-                if (providerType == null)
-                {
-                    continue;
-                }
+            if (providerType == null)
+            {
+                continue;
+            }
 
-                using var fileStream = await _mediaFileStore.GetFileStreamAsync(path);
+            using var fileStream = await _mediaFileStore.GetFileStreamAsync(path);
 
-                if (fileStream == null)
-                {
-                    continue;
-                }
+            if (fileStream == null)
+            {
+                continue;
+            }
 
-                var fileText = await _serviceProvider.CreateInstance<IMediaFileTextProvider>(providerType)
-                    .GetTextAsync(path, fileStream);
+            var fileText = await _serviceProvider.CreateInstance<IMediaFileTextProvider>(providerType)
+                .GetTextAsync(path, fileStream);
 
-                foreach (var key in context.Keys)
-                {
-                    context.DocumentIndex.Set(key + FileTextKeySuffix, fileText, options);
-                }
+            foreach (var key in context.Keys)
+            {
+                context.DocumentIndex.Set(key + FileTextKeySuffix, fileText, options);
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Liquid/MediaAnchorTag.cs b/src/OrchardCore.Modules/OrchardCore.Media/Liquid/MediaAnchorTag.cs
index cfa565023df..ca2d8615bd1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Liquid/MediaAnchorTag.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Liquid/MediaAnchorTag.cs
@@ -11,91 +11,90 @@
 using OrchardCore.DisplayManagement.Liquid.Tags;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Media.Liquid
+namespace OrchardCore.Media.Liquid;
+
+public class MediaAnchorTag : IAnchorTag
 {
-    public class MediaAnchorTag : IAnchorTag
-    {
-        public int Order => -20;
+    public int Order => -20;
 
-        public bool Match(IReadOnlyList<FilterArgument> argumentsList)
+    public bool Match(IReadOnlyList<FilterArgument> argumentsList)
+    {
+        foreach (var argument in argumentsList)
         {
-            foreach (var argument in argumentsList)
+            switch (argument.Name)
             {
-                switch (argument.Name)
-                {
-                    case "asset-href": return true;
-                }
+                case "asset-href": return true;
             }
-
-            return false;
         }
 
-        public async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, LiquidTemplateContext context)
-        {
-            var services = context.Services;
-            var mediaFileStore = services.GetRequiredService<IMediaFileStore>();
-            var fileVersionProvider = services.GetRequiredService<IFileVersionProvider>();
-            var httpContextAccessor = services.GetRequiredService<IHttpContextAccessor>();
+        return false;
+    }
+
+    public async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, LiquidTemplateContext context)
+    {
+        var services = context.Services;
+        var mediaFileStore = services.GetRequiredService<IMediaFileStore>();
+        var fileVersionProvider = services.GetRequiredService<IFileVersionProvider>();
+        var httpContextAccessor = services.GetRequiredService<IHttpContextAccessor>();
 
-            string assetHref = null;
-            string appendVersion = null;
+        string assetHref = null;
+        string appendVersion = null;
 
-            Dictionary<string, string> customAttributes = null;
+        Dictionary<string, string> customAttributes = null;
 
-            foreach (var argument in argumentsList)
+        foreach (var argument in argumentsList)
+        {
+            switch (argument.Name)
             {
-                switch (argument.Name)
-                {
-                    case "asset_href": assetHref = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "append_version": appendVersion = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "asset_href": assetHref = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "append_version": appendVersion = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
 
-                    default:
+                default:
 
-                        customAttributes ??= [];
-                        customAttributes[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToStringValue();
+                    customAttributes ??= [];
+                    customAttributes[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToStringValue();
 
-                        break;
-                }
+                    break;
             }
+        }
 
-            if (string.IsNullOrEmpty(assetHref))
-            {
-                return Completion.Normal;
-            }
+        if (string.IsNullOrEmpty(assetHref))
+        {
+            return Completion.Normal;
+        }
 
-            var resolvedUrl = mediaFileStore != null ? mediaFileStore.MapPathToPublicUrl(assetHref) : assetHref;
+        var resolvedUrl = mediaFileStore != null ? mediaFileStore.MapPathToPublicUrl(assetHref) : assetHref;
 
-            if (appendVersion != null && fileVersionProvider != null)
-            {
-                customAttributes["href"] = fileVersionProvider.AddFileVersionToPath(httpContextAccessor.HttpContext.Request.PathBase, resolvedUrl);
-            }
-            else
-            {
-                customAttributes["href"] = resolvedUrl;
-            }
+        if (appendVersion != null && fileVersionProvider != null)
+        {
+            customAttributes["href"] = fileVersionProvider.AddFileVersionToPath(httpContextAccessor.HttpContext.Request.PathBase, resolvedUrl);
+        }
+        else
+        {
+            customAttributes["href"] = resolvedUrl;
+        }
 
-            var tagBuilder = new TagBuilder("a");
+        var tagBuilder = new TagBuilder("a");
 
-            foreach (var attribute in customAttributes)
-            {
-                tagBuilder.Attributes[attribute.Key] = attribute.Value;
-            }
+        foreach (var attribute in customAttributes)
+        {
+            tagBuilder.Attributes[attribute.Key] = attribute.Value;
+        }
 
-            tagBuilder.RenderStartTag().WriteTo(writer, (HtmlEncoder)encoder);
+        tagBuilder.RenderStartTag().WriteTo(writer, (HtmlEncoder)encoder);
 
-            if (statements != null && statements.Count > 0)
-            {
-                var completion = await statements.RenderStatementsAsync(writer, encoder, context);
+        if (statements != null && statements.Count > 0)
+        {
+            var completion = await statements.RenderStatementsAsync(writer, encoder, context);
 
-                if (completion != Completion.Normal)
-                {
-                    return completion;
-                }
+            if (completion != Completion.Normal)
+            {
+                return completion;
             }
+        }
 
-            tagBuilder.RenderEndTag().WriteTo(writer, (HtmlEncoder)encoder);
+        tagBuilder.RenderEndTag().WriteTo(writer, (HtmlEncoder)encoder);
 
-            return Completion.Normal;
-        }
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Media/Migrations.cs
index b3ccfaaf070..6969657ce65 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Migrations.cs
@@ -6,36 +6,35 @@
 using OrchardCore.Media.Fields;
 using OrchardCore.Media.Settings;
 
-namespace OrchardCore.Media
+namespace OrchardCore.Media;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly ShellDescriptor _shellDescriptor;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ShellDescriptor _shellDescriptor;
 
-        public Migrations(
-            IContentDefinitionManager contentDefinitionManager,
-            ShellDescriptor shellDescriptor)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _shellDescriptor = shellDescriptor;
-        }
+    public Migrations(
+        IContentDefinitionManager contentDefinitionManager,
+        ShellDescriptor shellDescriptor)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+        _shellDescriptor = shellDescriptor;
+    }
 
-        // New installations don't need to be upgraded, but because there is no initial migration record,
-        // 'UpgradeAsync()' is called in a new 'CreateAsync()' but only if the feature was already installed.
-        public async Task<int> CreateAsync()
+    // New installations don't need to be upgraded, but because there is no initial migration record,
+    // 'UpgradeAsync()' is called in a new 'CreateAsync()' but only if the feature was already installed.
+    public async Task<int> CreateAsync()
+    {
+        if (_shellDescriptor.WasFeatureAlreadyInstalled("OrchardCore.Media"))
         {
-            if (_shellDescriptor.WasFeatureAlreadyInstalled("OrchardCore.Media"))
-            {
-                await UpgradeAsync();
-            }
-
-            // Shortcut other migration steps on new content definition schemas.
-            return 1;
+            await UpgradeAsync();
         }
 
-        // Upgrade an existing installation.
-        private Task UpgradeAsync()
-            => _contentDefinitionManager.MigrateFieldSettingsAsync<MediaField, MediaFieldSettings>();
+        // Shortcut other migration steps on new content definition schemas.
+        return 1;
     }
+
+    // Upgrade an existing installation.
+    private Task UpgradeAsync()
+        => _contentDefinitionManager.MigrateFieldSettingsAsync<MediaField, MediaFieldSettings>();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Models/MediaProfilesDocument.cs b/src/OrchardCore.Modules/OrchardCore.Media/Models/MediaProfilesDocument.cs
index 73701a468cd..2e916104119 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Models/MediaProfilesDocument.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Models/MediaProfilesDocument.cs
@@ -3,21 +3,20 @@
 using OrchardCore.Data.Documents;
 using OrchardCore.Media.Processing;
 
-namespace OrchardCore.Media.Models
+namespace OrchardCore.Media.Models;
+
+public class MediaProfilesDocument : Document
 {
-    public class MediaProfilesDocument : Document
-    {
-        public Dictionary<string, MediaProfile> MediaProfiles { get; init; } = new Dictionary<string, MediaProfile>(StringComparer.OrdinalIgnoreCase);
-    }
+    public Dictionary<string, MediaProfile> MediaProfiles { get; init; } = new Dictionary<string, MediaProfile>(StringComparer.OrdinalIgnoreCase);
+}
 
-    public class MediaProfile
-    {
-        public string Hint { get; set; }
-        public int Width { get; set; }
-        public int Height { get; set; }
-        public ResizeMode Mode { get; set; }
-        public Format Format { get; set; }
-        public int Quality { get; set; }
-        public string BackgroundColor { get; set; }
-    }
+public class MediaProfile
+{
+    public string Hint { get; set; }
+    public int Width { get; set; }
+    public int Height { get; set; }
+    public ResizeMode Mode { get; set; }
+    public Format Format { get; set; }
+    public int Quality { get; set; }
+    public string BackgroundColor { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Processing/BackwardsCompatibleCacheKey.cs b/src/OrchardCore.Modules/OrchardCore.Media/Processing/BackwardsCompatibleCacheKey.cs
index 7ab6c0e45e6..a6bbb0e418e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Processing/BackwardsCompatibleCacheKey.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Processing/BackwardsCompatibleCacheKey.cs
@@ -3,31 +3,30 @@
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.Commands;
 
-namespace OrchardCore.Media.Processing
+namespace OrchardCore.Media.Processing;
+
+/// <summary>
+/// Backwards compatible absolute url cache key.
+/// </summary>
+public class BackwardsCompatibleCacheKey : ICacheKey
 {
-    /// <summary>
-    /// Backwards compatible absolute url cache key.
-    /// </summary>
-    public class BackwardsCompatibleCacheKey : ICacheKey
+    /// <inheritdoc/>
+    public string Create(HttpContext context, CommandCollection commands)
     {
-        /// <inheritdoc/>
-        public string Create(HttpContext context, CommandCollection commands)
-        {
-
-            var pathBase = context.Request.PathBase;
-            if (pathBase.HasValue)
-            {
-                // Due to bugs with an earlier version of cache calculation the cache key result was
-                // localhost:44300/agency1//media/portfolio/5.jpg?width=600&height=480&rmode=stretch
-                // the default ImageSharp absolute cache builder produces the correct value
-                // localhost:44300/agency1/media/portfolio/5.jpg?width=600&height=480&rmode=stretch
-                // which causes an entire cache refresh.
-                // refer https://github.com/SixLabors/ImageSharp.Web/issues/254
 
-                pathBase = new PathString(pathBase + "//");
-            }
+        var pathBase = context.Request.PathBase;
+        if (pathBase.HasValue)
+        {
+            // Due to bugs with an earlier version of cache calculation the cache key result was
+            // localhost:44300/agency1//media/portfolio/5.jpg?width=600&height=480&rmode=stretch
+            // the default ImageSharp absolute cache builder produces the correct value
+            // localhost:44300/agency1/media/portfolio/5.jpg?width=600&height=480&rmode=stretch
+            // which causes an entire cache refresh.
+            // refer https://github.com/SixLabors/ImageSharp.Web/issues/254
 
-            return CaseHandlingUriBuilder.BuildAbsolute(CaseHandlingUriBuilder.CaseHandling.LowerInvariant, context.Request.Host, pathBase, context.Request.Path, QueryString.Create(commands));
+            pathBase = new PathString(pathBase + "//");
         }
+
+        return CaseHandlingUriBuilder.BuildAbsolute(CaseHandlingUriBuilder.CaseHandling.LowerInvariant, context.Request.Host, pathBase, context.Request.Path, QueryString.Create(commands));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Processing/ImageSharpUrlFormatter.cs b/src/OrchardCore.Modules/OrchardCore.Media/Processing/ImageSharpUrlFormatter.cs
index bd5e5ec26db..9bb607a2cc4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Processing/ImageSharpUrlFormatter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Processing/ImageSharpUrlFormatter.cs
@@ -3,79 +3,78 @@
 using Microsoft.AspNetCore.WebUtilities;
 using OrchardCore.Media.Fields;
 
-namespace OrchardCore.Media.Processing
+namespace OrchardCore.Media.Processing;
+
+public enum ResizeMode
 {
-    public enum ResizeMode
-    {
-        Undefined,
-        Max,
-        Crop,
-        Pad,
-        BoxPad,
-        Min,
-        Stretch
-    }
+    Undefined,
+    Max,
+    Crop,
+    Pad,
+    BoxPad,
+    Min,
+    Stretch
+}
 
-    public enum Format
-    {
-        Undefined,
-        Bmp,
-        Gif,
-        Jpg,
-        Png,
-        Tga,
-        WebP
-    }
+public enum Format
+{
+    Undefined,
+    Bmp,
+    Gif,
+    Jpg,
+    Png,
+    Tga,
+    WebP
+}
 
-    internal sealed class ImageSharpUrlFormatter
+internal sealed class ImageSharpUrlFormatter
+{
+    public static string GetImageResizeUrl(string path, IDictionary<string, string> queryStringParams = null, int? width = null, int? height = null, ResizeMode resizeMode = ResizeMode.Undefined, int? quality = null, Format format = Format.Undefined, Anchor anchor = null, string bgcolor = null)
     {
-        public static string GetImageResizeUrl(string path, IDictionary<string, string> queryStringParams = null, int? width = null, int? height = null, ResizeMode resizeMode = ResizeMode.Undefined, int? quality = null, Format format = Format.Undefined, Anchor anchor = null, string bgcolor = null)
+        if (string.IsNullOrEmpty(path) || (!width.HasValue && !height.HasValue && queryStringParams == null))
         {
-            if (string.IsNullOrEmpty(path) || (!width.HasValue && !height.HasValue && queryStringParams == null))
-            {
-                return path;
-            }
-
-            queryStringParams ??= new Dictionary<string, string>();
+            return path;
+        }
 
-            if (width.HasValue)
-            {
-                queryStringParams["width"] = width.ToString();
-            }
+        queryStringParams ??= new Dictionary<string, string>();
 
-            if (height.HasValue)
-            {
-                queryStringParams["height"] = height.ToString();
-            }
+        if (width.HasValue)
+        {
+            queryStringParams["width"] = width.ToString();
+        }
 
-            if (resizeMode != ResizeMode.Undefined)
-            {
-                queryStringParams["rmode"] = resizeMode.ToString().ToLower();
-            }
+        if (height.HasValue)
+        {
+            queryStringParams["height"] = height.ToString();
+        }
 
-            // The format is set before quality such that the quality is not
-            // invalidated when the url is generated.
-            if (format != Format.Undefined)
-            {
-                queryStringParams["format"] = format.ToString().ToLower();
-            }
+        if (resizeMode != ResizeMode.Undefined)
+        {
+            queryStringParams["rmode"] = resizeMode.ToString().ToLower();
+        }
 
-            if (quality.HasValue)
-            {
-                queryStringParams["quality"] = quality.ToString();
-            }
+        // The format is set before quality such that the quality is not
+        // invalidated when the url is generated.
+        if (format != Format.Undefined)
+        {
+            queryStringParams["format"] = format.ToString().ToLower();
+        }
 
-            if (anchor != null)
-            {
-                queryStringParams["rxy"] = anchor.X.ToString(CultureInfo.InvariantCulture) + ',' + anchor.Y.ToString(CultureInfo.InvariantCulture);
-            }
+        if (quality.HasValue)
+        {
+            queryStringParams["quality"] = quality.ToString();
+        }
 
-            if (!string.IsNullOrEmpty(bgcolor))
-            {
-                queryStringParams["bgcolor"] = bgcolor;
-            }
+        if (anchor != null)
+        {
+            queryStringParams["rxy"] = anchor.X.ToString(CultureInfo.InvariantCulture) + ',' + anchor.Y.ToString(CultureInfo.InvariantCulture);
+        }
 
-            return QueryHelpers.AddQueryString(path, queryStringParams);
+        if (!string.IsNullOrEmpty(bgcolor))
+        {
+            queryStringParams["bgcolor"] = bgcolor;
         }
+
+        return QueryHelpers.AddQueryString(path, queryStringParams);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Processing/ImageVersionProcessor.cs b/src/OrchardCore.Modules/OrchardCore.Media/Processing/ImageVersionProcessor.cs
index 6b939abbf81..7f9a754c8b7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Processing/ImageVersionProcessor.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Processing/ImageVersionProcessor.cs
@@ -5,26 +5,25 @@
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Processors;
 
-namespace OrchardCore.Media.Processing
+namespace OrchardCore.Media.Processing;
+
+/// <summary>
+/// Pass through processor which allows inclusion of a version query string in the cache key.
+/// </summary>
+public class ImageVersionProcessor : IImageWebProcessor
 {
     /// <summary>
-    /// Pass through processor which allows inclusion of a version query string in the cache key.
+    /// The command constant for a version query string.
     /// </summary>
-    public class ImageVersionProcessor : IImageWebProcessor
-    {
-        /// <summary>
-        /// The command constant for a version query string.
-        /// </summary>
-        public const string VersionCommand = "v";
+    public const string VersionCommand = "v";
 
-        private static readonly IEnumerable<string> _versionCommands = new[] { VersionCommand };
+    private static readonly IEnumerable<string> _versionCommands = new[] { VersionCommand };
 
-        public IEnumerable<string> Commands => _versionCommands;
+    public IEnumerable<string> Commands => _versionCommands;
 
-        public FormattedImage Process(FormattedImage image, ILogger logger, CommandCollection commands, CommandParser parser, CultureInfo culture)
-            => image;
+    public FormattedImage Process(FormattedImage image, ILogger logger, CommandCollection commands, CommandParser parser, CultureInfo culture)
+        => image;
 
-        public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture)
-            => false;
-    }
+    public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture)
+        => false;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaImageSharpConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaImageSharpConfiguration.cs
index 05e0415f0af..1e8ce70bda6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaImageSharpConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaImageSharpConfiguration.cs
@@ -7,131 +7,130 @@
 using SixLabors.ImageSharp.Web.Middleware;
 using SixLabors.ImageSharp.Web.Processors;
 
-namespace OrchardCore.Media.Processing
+namespace OrchardCore.Media.Processing;
+
+/// <summary>
+/// Provides default configuration for ImageSharp.
+/// </summary>
+public sealed class MediaImageSharpConfiguration : IConfigureOptions<ImageSharpMiddlewareOptions>
 {
-    /// <summary>
-    /// Provides default configuration for ImageSharp.
-    /// </summary>
-    public sealed class MediaImageSharpConfiguration : IConfigureOptions<ImageSharpMiddlewareOptions>
-    {
-        private readonly MediaOptions _mediaOptions;
+    private readonly MediaOptions _mediaOptions;
 
-        public MediaImageSharpConfiguration(IOptions<MediaOptions> mediaOptions)
-        {
-            _mediaOptions = mediaOptions.Value;
-        }
+    public MediaImageSharpConfiguration(IOptions<MediaOptions> mediaOptions)
+    {
+        _mediaOptions = mediaOptions.Value;
+    }
 
-        public void Configure(ImageSharpMiddlewareOptions options)
+    public void Configure(ImageSharpMiddlewareOptions options)
+    {
+        options.Configuration = Configuration.Default;
+        options.BrowserMaxAge = TimeSpan.FromDays(_mediaOptions.MaxBrowserCacheDays);
+        options.CacheMaxAge = TimeSpan.FromDays(_mediaOptions.MaxCacheDays);
+        options.CacheHashLength = 12;
+        options.OnParseCommandsAsync = context =>
         {
-            options.Configuration = Configuration.Default;
-            options.BrowserMaxAge = TimeSpan.FromDays(_mediaOptions.MaxBrowserCacheDays);
-            options.CacheMaxAge = TimeSpan.FromDays(_mediaOptions.MaxCacheDays);
-            options.CacheHashLength = 12;
-            options.OnParseCommandsAsync = context =>
+            if (context.Commands.Count == 0)
             {
-                if (context.Commands.Count == 0)
-                {
-                    return Task.CompletedTask;
-                }
+                return Task.CompletedTask;
+            }
 
-                var mediaOptions = context.Context.RequestServices.GetRequiredService<IOptions<MediaOptions>>().Value;
-                if (mediaOptions.UseTokenizedQueryString)
+            var mediaOptions = context.Context.RequestServices.GetRequiredService<IOptions<MediaOptions>>().Value;
+            if (mediaOptions.UseTokenizedQueryString)
+            {
+                if (context.Commands.TryGetValue(TokenCommandProcessor.TokenCommand, out var tokenString))
                 {
-                    if (context.Commands.TryGetValue(TokenCommandProcessor.TokenCommand, out var tokenString))
-                    {
-                        var mediaTokenService = context.Context.RequestServices.GetRequiredService<IMediaTokenService>();
-                        // The token must now be validated against the HMAC of the other commands.
-                        // Use the Raw value, not the parsed value.
-                        var token = context.Commands["token"];
+                    var mediaTokenService = context.Context.RequestServices.GetRequiredService<IMediaTokenService>();
+                    // The token must now be validated against the HMAC of the other commands.
+                    // Use the Raw value, not the parsed value.
+                    var token = context.Commands["token"];
 
-                        // Remove the token from the commands.
-                        context.Commands.Remove(TokenCommandProcessor.TokenCommand);
+                    // Remove the token from the commands.
+                    context.Commands.Remove(TokenCommandProcessor.TokenCommand);
 
-                        // When token is invalid no image commands will be processed.
-                        if (!mediaTokenService.TryValidateToken(context.Commands, token))
-                        {
-                            context.Commands.Clear();
-
-                            return Task.CompletedTask;
-                        }
-
-                        // Do not evaluate supported sizes here, as with tokenization any size is allowed.
-                    }
-                    else
+                    // When token is invalid no image commands will be processed.
+                    if (!mediaTokenService.TryValidateToken(context.Commands, token))
                     {
-                        ValidateTokenlessCommands(context, mediaOptions);
+                        context.Commands.Clear();
+
+                        return Task.CompletedTask;
                     }
+
+                    // Do not evaluate supported sizes here, as with tokenization any size is allowed.
                 }
                 else
                 {
                     ValidateTokenlessCommands(context, mediaOptions);
                 }
+            }
+            else
+            {
+                ValidateTokenlessCommands(context, mediaOptions);
+            }
 
-                // The following commands are not supported by default.
-                context.Commands.Remove(ResizeWebProcessor.Compand);
-                context.Commands.Remove(ResizeWebProcessor.Sampler);
-                context.Commands.Remove(ResizeWebProcessor.Anchor);
+            // The following commands are not supported by default.
+            context.Commands.Remove(ResizeWebProcessor.Compand);
+            context.Commands.Remove(ResizeWebProcessor.Sampler);
+            context.Commands.Remove(ResizeWebProcessor.Anchor);
 
-                // When only a version command is applied pass on this request.
-                if (context.Commands.Count == 1 && context.Commands.Contains(ImageVersionProcessor.VersionCommand))
-                {
-                    context.Commands.Clear();
-                }
-                else if (!context.Commands.Contains(ResizeWebProcessor.Mode))
-                {
-                    context.Commands[ResizeWebProcessor.Mode] = "max";
-                }
+            // When only a version command is applied pass on this request.
+            if (context.Commands.Count == 1 && context.Commands.Contains(ImageVersionProcessor.VersionCommand))
+            {
+                context.Commands.Clear();
+            }
+            else if (!context.Commands.Contains(ResizeWebProcessor.Mode))
+            {
+                context.Commands[ResizeWebProcessor.Mode] = "max";
+            }
 
-                return Task.CompletedTask;
-            };
+            return Task.CompletedTask;
+        };
 
-            var onPrepareResponse = options.OnPrepareResponseAsync;
-            options.OnPrepareResponseAsync = async context =>
+        var onPrepareResponse = options.OnPrepareResponseAsync;
+        options.OnPrepareResponseAsync = async context =>
+        {
+            if (onPrepareResponse is not null)
             {
-                if (onPrepareResponse is not null)
-                {
-                    await onPrepareResponse(context);
-                }
+                await onPrepareResponse(context);
+            }
 
-                // Override cache control for secure files
-                if (context.IsSecureMediaRequested())
-                {
-                    var mediaOptions = context.RequestServices.GetRequiredService<IOptions<MediaOptions>>().Value;
-                    var secureCacheControl = mediaOptions.MaxSecureFilesBrowserCacheDays == 0
-                        ? "no-store"
-                        : "public, must-revalidate, max-age=" + TimeSpan.FromDays(mediaOptions.MaxSecureFilesBrowserCacheDays).TotalSeconds.ToString();
+            // Override cache control for secure files
+            if (context.IsSecureMediaRequested())
+            {
+                var mediaOptions = context.RequestServices.GetRequiredService<IOptions<MediaOptions>>().Value;
+                var secureCacheControl = mediaOptions.MaxSecureFilesBrowserCacheDays == 0
+                    ? "no-store"
+                    : "public, must-revalidate, max-age=" + TimeSpan.FromDays(mediaOptions.MaxSecureFilesBrowserCacheDays).TotalSeconds.ToString();
 
-                    context.Response.Headers.CacheControl = secureCacheControl;
-                }
-            };
-        }
+                context.Response.Headers.CacheControl = secureCacheControl;
+            }
+        };
+    }
+
+    private static void ValidateTokenlessCommands(ImageCommandContext context, MediaOptions mediaOptions)
+    {
+        // The following commands are not supported without a tokenized query string.
+        context.Commands.Remove(ResizeWebProcessor.Xy);
+        context.Commands.Remove(ImageVersionProcessor.VersionCommand);
+        context.Commands.Remove(BackgroundColorWebProcessor.Color);
 
-        private static void ValidateTokenlessCommands(ImageCommandContext context, MediaOptions mediaOptions)
+        // Width and height must be part of the supported sizes array when tokenization is disabled.
+        if (context.Commands.TryGetValue(ResizeWebProcessor.Width, out var widthString))
         {
-            // The following commands are not supported without a tokenized query string.
-            context.Commands.Remove(ResizeWebProcessor.Xy);
-            context.Commands.Remove(ImageVersionProcessor.VersionCommand);
-            context.Commands.Remove(BackgroundColorWebProcessor.Color);
+            var width = context.Parser.ParseValue<int>(widthString, context.Culture);
 
-            // Width and height must be part of the supported sizes array when tokenization is disabled.
-            if (context.Commands.TryGetValue(ResizeWebProcessor.Width, out var widthString))
+            if (Array.BinarySearch<int>(mediaOptions.SupportedSizes, width) < 0)
             {
-                var width = context.Parser.ParseValue<int>(widthString, context.Culture);
-
-                if (Array.BinarySearch<int>(mediaOptions.SupportedSizes, width) < 0)
-                {
-                    context.Commands.Remove(ResizeWebProcessor.Width);
-                }
+                context.Commands.Remove(ResizeWebProcessor.Width);
             }
+        }
 
-            if (context.Commands.TryGetValue(ResizeWebProcessor.Height, out var heightString))
-            {
-                var height = context.Parser.ParseValue<int>(heightString, context.Culture);
+        if (context.Commands.TryGetValue(ResizeWebProcessor.Height, out var heightString))
+        {
+            var height = context.Parser.ParseValue<int>(heightString, context.Culture);
 
-                if (Array.BinarySearch<int>(mediaOptions.SupportedSizes, height) < 0)
-                {
-                    context.Commands.Remove(ResizeWebProcessor.Height);
-                }
+            if (Array.BinarySearch<int>(mediaOptions.SupportedSizes, height) < 0)
+            {
+                context.Commands.Remove(ResizeWebProcessor.Height);
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaResizingFileProvider.cs b/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaResizingFileProvider.cs
index 1d0eba6f35d..36606ef452b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaResizingFileProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaResizingFileProvider.cs
@@ -9,69 +9,68 @@
 using SixLabors.ImageSharp.Web.Providers;
 using SixLabors.ImageSharp.Web.Resolvers;
 
-namespace OrchardCore.Media.Processing
-{
-    public class MediaResizingFileProvider : IImageProvider
-    {
-        private readonly IMediaFileProvider _mediaFileProvider;
-        private readonly FormatUtilities _formatUtilities;
-        private readonly PathString _assetsRequestPath;
+namespace OrchardCore.Media.Processing;
 
-        /// <summary>
-        /// A match function used by the resolver to identify itself as the correct resolver to use.
-        /// </summary>
-        private Func<HttpContext, bool> _match;
+public class MediaResizingFileProvider : IImageProvider
+{
+    private readonly IMediaFileProvider _mediaFileProvider;
+    private readonly FormatUtilities _formatUtilities;
+    private readonly PathString _assetsRequestPath;
 
-        public MediaResizingFileProvider(
-            IMediaFileProvider mediaFileProvider,
-            IOptions<ImageSharpMiddlewareOptions> imageSharpOptions,
-            IOptions<MediaOptions> mediaOptions
-            )
-        {
-            _mediaFileProvider = mediaFileProvider;
-            _formatUtilities = new FormatUtilities(imageSharpOptions);
-            _assetsRequestPath = mediaOptions.Value.AssetsRequestPath;
-        }
+    /// <summary>
+    /// A match function used by the resolver to identify itself as the correct resolver to use.
+    /// </summary>
+    private Func<HttpContext, bool> _match;
 
-        /// <inheritdoc/>
-        public Func<HttpContext, bool> Match
-        {
-            get => _match ?? IsMatch;
-            set => _match = value;
-        }
+    public MediaResizingFileProvider(
+        IMediaFileProvider mediaFileProvider,
+        IOptions<ImageSharpMiddlewareOptions> imageSharpOptions,
+        IOptions<MediaOptions> mediaOptions
+        )
+    {
+        _mediaFileProvider = mediaFileProvider;
+        _formatUtilities = new FormatUtilities(imageSharpOptions);
+        _assetsRequestPath = mediaOptions.Value.AssetsRequestPath;
+    }
 
-        public ProcessingBehavior ProcessingBehavior => ProcessingBehavior.CommandOnly;
+    /// <inheritdoc/>
+    public Func<HttpContext, bool> Match
+    {
+        get => _match ?? IsMatch;
+        set => _match = value;
+    }
 
-        /// <inheritdoc/>
-        public bool IsValidRequest(HttpContext context)
-            => _formatUtilities.TryGetExtensionFromUri(context.Request.GetDisplayUrl(), out _);
+    public ProcessingBehavior ProcessingBehavior => ProcessingBehavior.CommandOnly;
 
-        /// <inheritdoc/>
-        public Task<IImageResolver> GetAsync(HttpContext context)
-        {
-            // Remove assets request path.
-            var path = context.Request.Path.Value[_assetsRequestPath.Value.Length..];
+    /// <inheritdoc/>
+    public bool IsValidRequest(HttpContext context)
+        => _formatUtilities.TryGetExtensionFromUri(context.Request.GetDisplayUrl(), out _);
 
-            var fileInfo = _mediaFileProvider.GetFileInfo(path);
+    /// <inheritdoc/>
+    public Task<IImageResolver> GetAsync(HttpContext context)
+    {
+        // Remove assets request path.
+        var path = context.Request.Path.Value[_assetsRequestPath.Value.Length..];
 
-            // Check to see if the file exists.
-            if (!fileInfo.Exists)
-            {
-                return Task.FromResult<IImageResolver>(null);
-            }
+        var fileInfo = _mediaFileProvider.GetFileInfo(path);
 
-            // We don't care about the content type nor cache control max age here.
-            return Task.FromResult<IImageResolver>(new FileProviderImageResolver(fileInfo));
+        // Check to see if the file exists.
+        if (!fileInfo.Exists)
+        {
+            return Task.FromResult<IImageResolver>(null);
         }
 
-        private bool IsMatch(HttpContext context)
-        {
-            if (!context.Request.Path.StartsWithNormalizedSegments(_assetsRequestPath, StringComparison.OrdinalIgnoreCase))
-            {
-                return false;
-            }
+        // We don't care about the content type nor cache control max age here.
+        return Task.FromResult<IImageResolver>(new FileProviderImageResolver(fileInfo));
+    }
 
-            return true;
+    private bool IsMatch(HttpContext context)
+    {
+        if (!context.Request.Path.StartsWithNormalizedSegments(_assetsRequestPath, StringComparison.OrdinalIgnoreCase))
+        {
+            return false;
         }
+
+        return true;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenOptions.cs b/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenOptions.cs
index 9c70b1fec53..1053b393ac5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenOptions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenOptions.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Media.Processing
+namespace OrchardCore.Media.Processing;
+
+public class MediaTokenOptions
 {
-    public class MediaTokenOptions
-    {
-        public byte[] HashKey { get; set; }
-    }
+    public byte[] HashKey { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenOptionsConfiguration.cs
index c2a0c1e23ad..3aef8ffb000 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenOptionsConfiguration.cs
@@ -1,23 +1,22 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Media.Processing
+namespace OrchardCore.Media.Processing;
+
+public sealed class MediaTokenOptionsConfiguration : IConfigureOptions<MediaTokenOptions>
 {
-    public sealed class MediaTokenOptionsConfiguration : IConfigureOptions<MediaTokenOptions>
-    {
-        private readonly ISiteService _siteService;
+    private readonly ISiteService _siteService;
 
-        public MediaTokenOptionsConfiguration(ISiteService siteService)
-        {
-            _siteService = siteService;
-        }
+    public MediaTokenOptionsConfiguration(ISiteService siteService)
+    {
+        _siteService = siteService;
+    }
 
-        public void Configure(MediaTokenOptions options)
-        {
-            options.HashKey = _siteService.GetSettingsAsync<MediaTokenSettings>()
-                .GetAwaiter()
-                .GetResult()
-                .HashKey;
-        }
+    public void Configure(MediaTokenOptions options)
+    {
+        options.HashKey = _siteService.GetSettingsAsync<MediaTokenSettings>()
+            .GetAwaiter()
+            .GetResult()
+            .HashKey;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenService.cs b/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenService.cs
index 8e1726a799a..d4e313580b2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenService.cs
@@ -11,218 +11,217 @@
 using Microsoft.Extensions.Primitives;
 using SixLabors.ImageSharp.Web.Processors;
 
-namespace OrchardCore.Media.Processing
+namespace OrchardCore.Media.Processing;
+
+public class MediaTokenService : IMediaTokenService
 {
-    public class MediaTokenService : IMediaTokenService
-    {
-        private const string TokenCacheKeyPrefix = "MediaToken:";
-        private readonly IMemoryCache _memoryCache;
+    private const string TokenCacheKeyPrefix = "MediaToken:";
+    private readonly IMemoryCache _memoryCache;
 
-        private readonly HashSet<string> _knownCommands = new(12);
-        private readonly byte[] _hashKey;
+    private readonly HashSet<string> _knownCommands = new(12);
+    private readonly byte[] _hashKey;
 
-        public MediaTokenService(
-            IMemoryCache memoryCache,
-            IOptions<MediaTokenOptions> options,
-            IEnumerable<IImageWebProcessor> processors)
-        {
-            _memoryCache = memoryCache;
+    public MediaTokenService(
+        IMemoryCache memoryCache,
+        IOptions<MediaTokenOptions> options,
+        IEnumerable<IImageWebProcessor> processors)
+    {
+        _memoryCache = memoryCache;
 
-            foreach (var processor in processors)
+        foreach (var processor in processors)
+        {
+            foreach (var command in processor.Commands)
             {
-                foreach (var command in processor.Commands)
-                {
-                    _knownCommands.Add(command);
-                }
+                _knownCommands.Add(command);
             }
+        }
+
+        _hashKey = options.Value.HashKey;
+    }
 
-            _hashKey = options.Value.HashKey;
+    public string AddTokenToPath(string path)
+    {
+        var pathIndex = path.IndexOf('?');
+
+        Dictionary<string, StringValues> processingCommands = null;
+        Dictionary<string, StringValues> otherCommands = null;
+
+        if (pathIndex != -1)
+        {
+            ParseQuery(path[(pathIndex + 1)..], out processingCommands, out otherCommands);
         }
 
-        public string AddTokenToPath(string path)
+        // If no commands or only a version command don't bother tokenizing.
+        if (processingCommands is null
+            || processingCommands.Count == 0
+            || processingCommands.Count == 1 && processingCommands.ContainsKey(ImageVersionProcessor.VersionCommand))
         {
-            var pathIndex = path.IndexOf('?');
+            return path;
+        }
 
-            Dictionary<string, StringValues> processingCommands = null;
-            Dictionary<string, StringValues> otherCommands = null;
+        // Using the command values as a key retrieve from cache.
+        var queryStringTokenKey = CreateQueryStringTokenKey(processingCommands);
+        var queryStringToken = GetHash(queryStringTokenKey);
 
-            if (pathIndex != -1)
-            {
-                ParseQuery(path[(pathIndex + 1)..], out processingCommands, out otherCommands);
-            }
+        processingCommands["token"] = queryStringToken;
 
-            // If no commands or only a version command don't bother tokenizing.
-            if (processingCommands is null
-                || processingCommands.Count == 0
-                || processingCommands.Count == 1 && processingCommands.ContainsKey(ImageVersionProcessor.VersionCommand))
+        // If any non-resizing parameters have been added to the path include these on the query string output.
+        if (otherCommands != null)
+        {
+            foreach (var command in otherCommands)
             {
-                return path;
+                processingCommands.Add(command.Key, command.Value);
             }
+        }
 
-            // Using the command values as a key retrieve from cache.
-            var queryStringTokenKey = CreateQueryStringTokenKey(processingCommands);
-            var queryStringToken = GetHash(queryStringTokenKey);
-
-            processingCommands["token"] = queryStringToken;
+        return AddQueryString(path.AsSpan(0, pathIndex), processingCommands);
+    }
 
-            // If any non-resizing parameters have been added to the path include these on the query string output.
-            if (otherCommands != null)
-            {
-                foreach (var command in otherCommands)
-                {
-                    processingCommands.Add(command.Key, command.Value);
-                }
-            }
+    private void ParseQuery(
+        string queryString,
+        out Dictionary<string, StringValues> processingCommands,
+        out Dictionary<string, StringValues> otherCommands)
+    {
+        processingCommands = null;
+        otherCommands = null;
 
-            return AddQueryString(path.AsSpan(0, pathIndex), processingCommands);
-        }
+        var accumulator = new KeyValueAccumulator();
+        var otherCommandAccumulator = new KeyValueAccumulator();
+        var enumerable = new QueryStringEnumerable(queryString);
 
-        private void ParseQuery(
-            string queryString,
-            out Dictionary<string, StringValues> processingCommands,
-            out Dictionary<string, StringValues> otherCommands)
+        foreach (var pair in enumerable)
         {
-            processingCommands = null;
-            otherCommands = null;
+            var key = pair.DecodeName().ToString();
+            var value = pair.DecodeValue().ToString();
 
-            var accumulator = new KeyValueAccumulator();
-            var otherCommandAccumulator = new KeyValueAccumulator();
-            var enumerable = new QueryStringEnumerable(queryString);
-
-            foreach (var pair in enumerable)
+            if (_knownCommands.Contains(key))
             {
-                var key = pair.DecodeName().ToString();
-                var value = pair.DecodeValue().ToString();
-
-                if (_knownCommands.Contains(key))
-                {
-                    accumulator.Append(key, value);
-                }
-                else
-                {
-                    otherCommandAccumulator.Append(key, value);
-                }
+                accumulator.Append(key, value);
             }
-
-            if (accumulator.HasValues)
+            else
             {
-                processingCommands = accumulator.GetResults();
+                otherCommandAccumulator.Append(key, value);
             }
+        }
 
-            if (otherCommandAccumulator.HasValues)
-            {
-                otherCommands = otherCommandAccumulator.GetResults();
-            }
+        if (accumulator.HasValues)
+        {
+            processingCommands = accumulator.GetResults();
         }
 
-        public bool TryValidateToken(KeyedCollection<string, KeyValuePair<string, string>> commands, string token)
+        if (otherCommandAccumulator.HasValues)
         {
-            var queryStringTokenKey = CreateCommandCollectionTokenKey(commands);
+            otherCommands = otherCommandAccumulator.GetResults();
+        }
+    }
 
-            // Store a hash of the valid query string commands.
-            var queryStringToken = GetHash(queryStringTokenKey);
+    public bool TryValidateToken(KeyedCollection<string, KeyValuePair<string, string>> commands, string token)
+    {
+        var queryStringTokenKey = CreateCommandCollectionTokenKey(commands);
 
-            if (string.Equals(queryStringToken, token, StringComparison.OrdinalIgnoreCase))
-            {
-                return true;
-            }
+        // Store a hash of the valid query string commands.
+        var queryStringToken = GetHash(queryStringTokenKey);
 
-            return false;
+        if (string.Equals(queryStringToken, token, StringComparison.OrdinalIgnoreCase))
+        {
+            return true;
         }
 
-        /// <summary>
-        /// Specialized version with fast enumeration and no StringValues string allocation.
-        /// </summary>
-        private static string CreateQueryStringTokenKey(Dictionary<string, StringValues> values)
-        {
-            using var builder = ZString.CreateStringBuilder();
-            builder.Append(TokenCacheKeyPrefix);
-            foreach (var pair in values)
-            {
-                builder.Append(pair.Value.ToString());
-            }
+        return false;
+    }
 
-            return builder.ToString();
+    /// <summary>
+    /// Specialized version with fast enumeration and no StringValues string allocation.
+    /// </summary>
+    private static string CreateQueryStringTokenKey(Dictionary<string, StringValues> values)
+    {
+        using var builder = ZString.CreateStringBuilder();
+        builder.Append(TokenCacheKeyPrefix);
+        foreach (var pair in values)
+        {
+            builder.Append(pair.Value.ToString());
         }
 
-        private static string CreateCommandCollectionTokenKey(KeyedCollection<string, KeyValuePair<string, string>> values)
-        {
-            using var builder = ZString.CreateStringBuilder();
-            builder.Append(TokenCacheKeyPrefix);
-            foreach (var pair in values)
-            {
-                builder.Append(pair.Value);
-            }
+        return builder.ToString();
+    }
 
-            return builder.ToString();
+    private static string CreateCommandCollectionTokenKey(KeyedCollection<string, KeyValuePair<string, string>> values)
+    {
+        using var builder = ZString.CreateStringBuilder();
+        builder.Append(TokenCacheKeyPrefix);
+        foreach (var pair in values)
+        {
+            builder.Append(pair.Value);
         }
 
-        private string GetHash(string queryStringTokenKey)
-        {
-            if (!_memoryCache.TryGetValue(queryStringTokenKey, out var result))
-            {
-                using var entry = _memoryCache.CreateEntry(queryStringTokenKey);
+        return builder.ToString();
+    }
 
-                entry.SlidingExpiration = TimeSpan.FromHours(5);
+    private string GetHash(string queryStringTokenKey)
+    {
+        if (!_memoryCache.TryGetValue(queryStringTokenKey, out var result))
+        {
+            using var entry = _memoryCache.CreateEntry(queryStringTokenKey);
 
-                // 'queryStringTokenKey' also contains prefix.
-                var chars = queryStringTokenKey.AsSpan(TokenCacheKeyPrefix.Length);
+            entry.SlidingExpiration = TimeSpan.FromHours(5);
 
-                // Only allocate on stack if it's small enough.
-                var requiredLength = Encoding.UTF8.GetByteCount(chars);
-                var stringBytes = requiredLength < 1024
-                    ? stackalloc byte[requiredLength]
-                    : new byte[requiredLength];
+            // 'queryStringTokenKey' also contains prefix.
+            var chars = queryStringTokenKey.AsSpan(TokenCacheKeyPrefix.Length);
 
-                // 256 for SHA-256, fits in stack nicely.
-                Span<byte> hashBytes = stackalloc byte[HMACSHA256.HashSizeInBytes];
+            // Only allocate on stack if it's small enough.
+            var requiredLength = Encoding.UTF8.GetByteCount(chars);
+            var stringBytes = requiredLength < 1024
+                ? stackalloc byte[requiredLength]
+                : new byte[requiredLength];
 
-                var stringBytesLength = Encoding.UTF8.GetBytes(chars, stringBytes);
+            // 256 for SHA-256, fits in stack nicely.
+            Span<byte> hashBytes = stackalloc byte[HMACSHA256.HashSizeInBytes];
 
-                HMACSHA256.TryHashData(_hashKey, stringBytes[..stringBytesLength], hashBytes, out var hashBytesLength);
+            var stringBytesLength = Encoding.UTF8.GetBytes(chars, stringBytes);
 
-                entry.Value = result = Convert.ToBase64String(hashBytes[..hashBytesLength]);
-            }
+            HMACSHA256.TryHashData(_hashKey, stringBytes[..stringBytesLength], hashBytes, out var hashBytesLength);
 
-            return (string)result;
+            entry.Value = result = Convert.ToBase64String(hashBytes[..hashBytesLength]);
         }
 
-        /// <summary>
-        /// Custom version of <see cref="QueryHelpers.AddQueryString(string,string,string)"/> that takes our pre-built
-        /// dictionary, uri as ReadOnlySpan&lt;char&gt; and uses ZString. Otherwise same logic.
-        /// </summary>
-        private static string AddQueryString(
-            ReadOnlySpan<char> uri,
-            Dictionary<string, StringValues> queryString)
-        {
-            var anchorIndex = uri.IndexOf('#');
-            var uriToBeAppended = uri;
-            var anchorText = ReadOnlySpan<char>.Empty;
-
-            // If there is an anchor, then the query string must be inserted before its first occurrence.
-            if (anchorIndex != -1)
-            {
-                anchorText = uri[anchorIndex..];
-                uriToBeAppended = uri[..anchorIndex];
-            }
+        return (string)result;
+    }
 
-            var queryIndex = uriToBeAppended.IndexOf('?');
-            var hasQuery = queryIndex != -1;
+    /// <summary>
+    /// Custom version of <see cref="QueryHelpers.AddQueryString(string,string,string)"/> that takes our pre-built
+    /// dictionary, uri as ReadOnlySpan&lt;char&gt; and uses ZString. Otherwise same logic.
+    /// </summary>
+    private static string AddQueryString(
+        ReadOnlySpan<char> uri,
+        Dictionary<string, StringValues> queryString)
+    {
+        var anchorIndex = uri.IndexOf('#');
+        var uriToBeAppended = uri;
+        var anchorText = ReadOnlySpan<char>.Empty;
 
-            using var sb = ZString.CreateStringBuilder();
-            sb.Append(uriToBeAppended);
-            foreach (var parameter in queryString)
-            {
-                sb.Append(hasQuery ? '&' : '?');
-                sb.Append(UrlEncoder.Default.Encode(parameter.Key));
-                sb.Append('=');
-                sb.Append(UrlEncoder.Default.Encode(parameter.Value));
-                hasQuery = true;
-            }
+        // If there is an anchor, then the query string must be inserted before its first occurrence.
+        if (anchorIndex != -1)
+        {
+            anchorText = uri[anchorIndex..];
+            uriToBeAppended = uri[..anchorIndex];
+        }
 
-            sb.Append(anchorText);
+        var queryIndex = uriToBeAppended.IndexOf('?');
+        var hasQuery = queryIndex != -1;
 
-            return sb.ToString();
+        using var sb = ZString.CreateStringBuilder();
+        sb.Append(uriToBeAppended);
+        foreach (var parameter in queryString)
+        {
+            sb.Append(hasQuery ? '&' : '?');
+            sb.Append(UrlEncoder.Default.Encode(parameter.Key));
+            sb.Append('=');
+            sb.Append(UrlEncoder.Default.Encode(parameter.Value));
+            hasQuery = true;
         }
+
+        sb.Append(anchorText);
+
+        return sb.ToString();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenSettings.cs b/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenSettings.cs
index 39a3885b56c..fcf3653b0c1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenSettings.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Media.Processing
+namespace OrchardCore.Media.Processing;
+
+public class MediaTokenSettings
 {
-    public class MediaTokenSettings
-    {
-        public byte[] HashKey { get; set; }
-    }
+    public byte[] HashKey { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenSettingsUpdater.cs b/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenSettingsUpdater.cs
index a6e1880b8a8..71663de9518 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenSettingsUpdater.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Processing/MediaTokenSettingsUpdater.cs
@@ -7,67 +7,66 @@
 using OrchardCore.Modules;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Media.Processing
+namespace OrchardCore.Media.Processing;
+
+/// <summary>
+/// Generates a random key for media token hashing.
+/// To regenerate the key disabled and enable the feature.
+/// </summary>
+public class MediaTokenSettingsUpdater : FeatureEventHandler, IModularTenantEvents
 {
-    /// <summary>
-    /// Generates a random key for media token hashing.
-    /// To regenerate the key disabled and enable the feature.
-    /// </summary>
-    public class MediaTokenSettingsUpdater : FeatureEventHandler, IModularTenantEvents
-    {
-        private const int DefaultMediaTokenKeySize = 64;
+    private const int DefaultMediaTokenKeySize = 64;
 
-        private readonly ISiteService _siteService;
-        private readonly ShellSettings _shellSettings;
+    private readonly ISiteService _siteService;
+    private readonly ShellSettings _shellSettings;
 
-        public MediaTokenSettingsUpdater(ISiteService siteService, ShellSettings shellSettings)
-        {
-            _siteService = siteService;
-            _shellSettings = shellSettings;
-        }
+    public MediaTokenSettingsUpdater(ISiteService siteService, ShellSettings shellSettings)
+    {
+        _siteService = siteService;
+        _shellSettings = shellSettings;
+    }
 
-        public async Task ActivatedAsync()
+    public async Task ActivatedAsync()
+    {
+        if (_shellSettings.IsUninitialized())
         {
-            if (_shellSettings.IsUninitialized())
-            {
-                // If the tenant is 'Uninitialized' there is no registered 'ISession' and then 'ISiteService' can't be used.
-                return;
-            }
+            // If the tenant is 'Uninitialized' there is no registered 'ISession' and then 'ISiteService' can't be used.
+            return;
+        }
 
-            var mediaTokenSettings = await _siteService.GetSettingsAsync<MediaTokenSettings>();
+        var mediaTokenSettings = await _siteService.GetSettingsAsync<MediaTokenSettings>();
 
-            if (mediaTokenSettings.HashKey == null)
-            {
-                var siteSettings = await _siteService.LoadSiteSettingsAsync();
+        if (mediaTokenSettings.HashKey == null)
+        {
+            var siteSettings = await _siteService.LoadSiteSettingsAsync();
 
-                mediaTokenSettings.HashKey = RandomNumberGenerator.GetBytes(DefaultMediaTokenKeySize);
-                siteSettings.Put(mediaTokenSettings);
+            mediaTokenSettings.HashKey = RandomNumberGenerator.GetBytes(DefaultMediaTokenKeySize);
+            siteSettings.Put(mediaTokenSettings);
 
-                await _siteService.UpdateSiteSettingsAsync(siteSettings);
-            }
+            await _siteService.UpdateSiteSettingsAsync(siteSettings);
         }
+    }
 
-        public Task ActivatingAsync() => Task.CompletedTask;
-        public Task RemovingAsync(ShellRemovingContext context) => Task.CompletedTask;
-        public Task TerminatedAsync() => Task.CompletedTask;
-        public Task TerminatingAsync() => Task.CompletedTask;
+    public Task ActivatingAsync() => Task.CompletedTask;
+    public Task RemovingAsync(ShellRemovingContext context) => Task.CompletedTask;
+    public Task TerminatedAsync() => Task.CompletedTask;
+    public Task TerminatingAsync() => Task.CompletedTask;
 
-        public override Task EnabledAsync(IFeatureInfo feature) => SetMediaTokenSettingsAsync(feature);
+    public override Task EnabledAsync(IFeatureInfo feature) => SetMediaTokenSettingsAsync(feature);
 
-        private async Task SetMediaTokenSettingsAsync(IFeatureInfo feature)
+    private async Task SetMediaTokenSettingsAsync(IFeatureInfo feature)
+    {
+        if (feature.Extension.Id != GetType().Assembly.GetName().Name)
         {
-            if (feature.Extension.Id != GetType().Assembly.GetName().Name)
-            {
-                return;
-            }
+            return;
+        }
 
-            var siteSettings = await _siteService.LoadSiteSettingsAsync();
-            var mediaTokenSettings = siteSettings.As<MediaTokenSettings>();
+        var siteSettings = await _siteService.LoadSiteSettingsAsync();
+        var mediaTokenSettings = siteSettings.As<MediaTokenSettings>();
 
-            mediaTokenSettings.HashKey = RandomNumberGenerator.GetBytes(DefaultMediaTokenKeySize);
-            siteSettings.Put(mediaTokenSettings);
+        mediaTokenSettings.HashKey = RandomNumberGenerator.GetBytes(DefaultMediaTokenKeySize);
+        siteSettings.Put(mediaTokenSettings);
 
-            await _siteService.UpdateSiteSettingsAsync(siteSettings);
-        }
+        await _siteService.UpdateSiteSettingsAsync(siteSettings);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Processing/TokenCommandProcessor.cs b/src/OrchardCore.Modules/OrchardCore.Media/Processing/TokenCommandProcessor.cs
index 62139dfa808..6ab57e72be6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Processing/TokenCommandProcessor.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Processing/TokenCommandProcessor.cs
@@ -5,27 +5,26 @@
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Processors;
 
-namespace OrchardCore.Media.Processing
+namespace OrchardCore.Media.Processing;
+
+/// <summary>
+/// Pass through processor which allows inclusion of a tokenized query string.
+/// </summary>
+public class TokenCommandProcessor : IImageWebProcessor
 {
     /// <summary>
-    /// Pass through processor which allows inclusion of a tokenized query string.
+    /// The command constant for a tokenized query string.
     /// </summary>
-    public class TokenCommandProcessor : IImageWebProcessor
-    {
-        /// <summary>
-        /// The command constant for a tokenized query string.
-        /// </summary>
-        public const string TokenCommand = "token";
+    public const string TokenCommand = "token";
 
-        private static readonly IEnumerable<string> _tokenCommands = new[] { TokenCommand };
+    private static readonly IEnumerable<string> _tokenCommands = new[] { TokenCommand };
 
-        public IEnumerable<string> Commands
-            => _tokenCommands;
+    public IEnumerable<string> Commands
+        => _tokenCommands;
 
-        public FormattedImage Process(FormattedImage image, ILogger logger, CommandCollection commands, CommandParser parser, CultureInfo culture)
-            => image;
+    public FormattedImage Process(FormattedImage image, ILogger logger, CommandCollection commands, CommandParser parser, CultureInfo culture)
+        => image;
 
-        public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture)
-            => false;
-    }
+    public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture)
+        => false;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Recipes/MediaProfileStep.cs b/src/OrchardCore.Modules/OrchardCore.Media/Recipes/MediaProfileStep.cs
index 883d89e33ed..15ab1057f79 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Recipes/MediaProfileStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Recipes/MediaProfileStep.cs
@@ -7,38 +7,37 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Media.Recipes
+namespace OrchardCore.Media.Recipes;
+
+/// <summary>
+/// This recipe step creates or updates a media profile.
+/// </summary>
+public sealed class MediaProfileStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step creates or updates a media profile.
-    /// </summary>
-    public sealed class MediaProfileStep : IRecipeStepHandler
+    private readonly MediaProfilesManager _mediaProfilesManager;
+
+    public MediaProfileStep(MediaProfilesManager mediaProfilesManager)
     {
-        private readonly MediaProfilesManager _mediaProfilesManager;
+        _mediaProfilesManager = mediaProfilesManager;
+    }
 
-        public MediaProfileStep(MediaProfilesManager mediaProfilesManager)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "MediaProfiles", StringComparison.OrdinalIgnoreCase))
         {
-            _mediaProfilesManager = mediaProfilesManager;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, "MediaProfiles", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            var model = context.Step.ToObject<MediaProfileStepModel>();
+        var model = context.Step.ToObject<MediaProfileStepModel>();
 
-            foreach (var mediaProfile in model.MediaProfiles)
-            {
-                await _mediaProfilesManager.UpdateMediaProfileAsync(mediaProfile.Key, mediaProfile.Value);
-            }
+        foreach (var mediaProfile in model.MediaProfiles)
+        {
+            await _mediaProfilesManager.UpdateMediaProfileAsync(mediaProfile.Key, mediaProfile.Value);
         }
     }
+}
 
-    public sealed class MediaProfileStepModel
-    {
-        public Dictionary<string, MediaProfile> MediaProfiles { get; set; }
-    }
+public sealed class MediaProfileStepModel
+{
+    public Dictionary<string, MediaProfile> MediaProfiles { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Recipes/MediaStep.cs b/src/OrchardCore.Modules/OrchardCore.Media/Recipes/MediaStep.cs
index 02b829b1d15..e80ce0addf1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Recipes/MediaStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Recipes/MediaStep.cs
@@ -11,132 +11,131 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Media.Recipes
+namespace OrchardCore.Media.Recipes;
+
+/// <summary>
+/// This recipe step creates a set of queries.
+/// </summary>
+public sealed class MediaStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step creates a set of queries.
-    /// </summary>
-    public sealed class MediaStep : IRecipeStepHandler
-    {
-        private readonly IMediaFileStore _mediaFileStore;
-        private readonly HashSet<string> _allowedFileExtensions;
-        private readonly IHttpClientFactory _httpClientFactory;
+    private readonly IMediaFileStore _mediaFileStore;
+    private readonly HashSet<string> _allowedFileExtensions;
+    private readonly IHttpClientFactory _httpClientFactory;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
+
+    public MediaStep(
+        IMediaFileStore mediaFileStore,
+        IOptions<MediaOptions> options,
+        IHttpClientFactory httpClientFactory,
+        IStringLocalizer<MediaStep> stringLocalizer)
+    {
+        _mediaFileStore = mediaFileStore;
+        _allowedFileExtensions = options.Value.AllowedFileExtensions;
+        _httpClientFactory = httpClientFactory;
+        S = stringLocalizer;
+    }
 
-        public MediaStep(
-            IMediaFileStore mediaFileStore,
-            IOptions<MediaOptions> options,
-            IHttpClientFactory httpClientFactory,
-            IStringLocalizer<MediaStep> stringLocalizer)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "media", StringComparison.OrdinalIgnoreCase))
         {
-            _mediaFileStore = mediaFileStore;
-            _allowedFileExtensions = options.Value.AllowedFileExtensions;
-            _httpClientFactory = httpClientFactory;
-            S = stringLocalizer;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        var model = context.Step.ToObject<MediaStepModel>();
+
+        foreach (var file in model.Files)
         {
-            if (!string.Equals(context.Name, "media", StringComparison.OrdinalIgnoreCase))
+            if (!_allowedFileExtensions.Contains(Path.GetExtension(file.TargetPath), StringComparer.OrdinalIgnoreCase))
             {
-                return;
+                context.Errors.Add(S["File extension not allowed: '{0}'", file.TargetPath]);
+
+                continue;
             }
 
-            var model = context.Step.ToObject<MediaStepModel>();
+            Stream stream = null;
 
-            foreach (var file in model.Files)
+            if (!string.IsNullOrWhiteSpace(file.Base64))
             {
-                if (!_allowedFileExtensions.Contains(Path.GetExtension(file.TargetPath), StringComparer.OrdinalIgnoreCase))
-                {
-                    context.Errors.Add(S["File extension not allowed: '{0}'", file.TargetPath]);
+                stream = new MemoryStream(Convert.FromBase64String(file.Base64));
+            }
+            else if (!string.IsNullOrWhiteSpace(file.SourcePath))
+            {
+                var fileInfo = context.RecipeDescriptor.FileProvider.GetRelativeFileInfo(context.RecipeDescriptor.BasePath, file.SourcePath);
 
-                    continue;
-                }
+                stream = fileInfo.CreateReadStream();
+            }
+            else if (!string.IsNullOrWhiteSpace(file.SourceUrl))
+            {
+                var httpClient = _httpClientFactory.CreateClient();
 
-                Stream stream = null;
+                var response = await httpClient.GetAsync(file.SourceUrl);
 
-                if (!string.IsNullOrWhiteSpace(file.Base64))
+                if (response.IsSuccessStatusCode)
                 {
-                    stream = new MemoryStream(Convert.FromBase64String(file.Base64));
+                    stream = await response.Content.ReadAsStreamAsync();
                 }
-                else if (!string.IsNullOrWhiteSpace(file.SourcePath))
-                {
-                    var fileInfo = context.RecipeDescriptor.FileProvider.GetRelativeFileInfo(context.RecipeDescriptor.BasePath, file.SourcePath);
+            }
 
-                    stream = fileInfo.CreateReadStream();
-                }
-                else if (!string.IsNullOrWhiteSpace(file.SourceUrl))
+            if (stream != null)
+            {
+                try
                 {
-                    var httpClient = _httpClientFactory.CreateClient();
-
-                    var response = await httpClient.GetAsync(file.SourceUrl);
-
-                    if (response.IsSuccessStatusCode)
-                    {
-                        stream = await response.Content.ReadAsStreamAsync();
-                    }
+                    await _mediaFileStore.CreateFileFromStreamAsync(file.TargetPath, stream, true);
                 }
-
-                if (stream != null)
+                finally
                 {
-                    try
-                    {
-                        await _mediaFileStore.CreateFileFromStreamAsync(file.TargetPath, stream, true);
-                    }
-                    finally
-                    {
-                        await stream.DisposeAsync();
-                    }
+                    await stream.DisposeAsync();
                 }
             }
         }
+    }
 
-        private sealed class MediaStepModel
-        {
-            /// <summary>
-            /// Collection of <see cref="MediaStepFile"/> objects.
-            /// </summary>
-            public MediaStepFile[] Files { get; set; }
-        }
+    private sealed class MediaStepModel
+    {
+        /// <summary>
+        /// Collection of <see cref="MediaStepFile"/> objects.
+        /// </summary>
+        public MediaStepFile[] Files { get; set; }
+    }
 
-        private sealed class MediaStepFile
-        {
-            /// <summary>
-            /// Path where the content will be written.
-            /// Use inter-changeably with <see cref="TargetPath"/>.
-            /// </summary>
-            public string Path { get => TargetPath; set => TargetPath = value; }
-
-            /// <summary>
-            /// Path where the content will be written.
-            /// Use inter-changeably with <see cref="Path"/>.
-            /// </summary>
-            public string TargetPath { get; set; }
-
-            /// <summary>
-            /// Base64 encoded content. Use when the source file will
-            /// not be available in this recipe step's file provider.
-            /// If both this and SourcePath properties are set with
-            /// non-null values, this property will be used.
-            /// </summary>
-            public string Base64 { get; set; }
-
-            /// <summary>
-            /// Path where the content is read from. Use when the file
-            /// will be available in this recipe step's file provider.
-            /// If both this and Base64 properties are set with
-            /// non-null values, the Base64 property will be used.
-            /// </summary>
-            public string SourcePath { get; set; }
-
-            /// <summary>
-            /// URL where the content is read from. Use when the file
-            /// will be available on a remote website.
-            /// If Base64 property or SourcePath property are set, they take
-            /// precedence over SourceUrl.
-            /// </summary>
-            public string SourceUrl { get; set; }
-        }
+    private sealed class MediaStepFile
+    {
+        /// <summary>
+        /// Path where the content will be written.
+        /// Use inter-changeably with <see cref="TargetPath"/>.
+        /// </summary>
+        public string Path { get => TargetPath; set => TargetPath = value; }
+
+        /// <summary>
+        /// Path where the content will be written.
+        /// Use inter-changeably with <see cref="Path"/>.
+        /// </summary>
+        public string TargetPath { get; set; }
+
+        /// <summary>
+        /// Base64 encoded content. Use when the source file will
+        /// not be available in this recipe step's file provider.
+        /// If both this and SourcePath properties are set with
+        /// non-null values, this property will be used.
+        /// </summary>
+        public string Base64 { get; set; }
+
+        /// <summary>
+        /// Path where the content is read from. Use when the file
+        /// will be available in this recipe step's file provider.
+        /// If both this and Base64 properties are set with
+        /// non-null values, the Base64 property will be used.
+        /// </summary>
+        public string SourcePath { get; set; }
+
+        /// <summary>
+        /// URL where the content is read from. Use when the file
+        /// will be available on a remote website.
+        /// If Base64 property or SourcePath property are set, they take
+        /// precedence over SourceUrl.
+        /// </summary>
+        public string SourceUrl { get; set; }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/RemotePublishing/MediaMetaWeblogDriver.cs b/src/OrchardCore.Modules/OrchardCore.Media/RemotePublishing/MediaMetaWeblogDriver.cs
index f82e242b984..cf4d8b17e2c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/RemotePublishing/MediaMetaWeblogDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/RemotePublishing/MediaMetaWeblogDriver.cs
@@ -1,13 +1,12 @@
 using System;
 using OrchardCore.MetaWeblog;
 
-namespace OrchardCore.Media.RemotePublishing
+namespace OrchardCore.Media.RemotePublishing;
+
+public sealed class MediaMetaWeblogDriver : MetaWeblogDriver
 {
-    public sealed class MediaMetaWeblogDriver : MetaWeblogDriver
+    public override void SetCapabilities(Action<string, string> setCapability)
     {
-        public override void SetCapabilities(Action<string, string> setCapability)
-        {
-            setCapability("supportsFileUpload", "Yes");
-        }
+        setCapability("supportsFileUpload", "Yes");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/RemotePublishing/RemotePublishingStartup.cs b/src/OrchardCore.Modules/OrchardCore.Media/RemotePublishing/RemotePublishingStartup.cs
index 6cbc5cd5f1a..294fb55afc9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/RemotePublishing/RemotePublishingStartup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/RemotePublishing/RemotePublishingStartup.cs
@@ -2,14 +2,13 @@
 using OrchardCore.MetaWeblog;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Media.RemotePublishing
+namespace OrchardCore.Media.RemotePublishing;
+
+[RequireFeatures("OrchardCore.RemotePublishing")]
+public sealed class RemotePublishingStartup : StartupBase
 {
-    [RequireFeatures("OrchardCore.RemotePublishing")]
-    public sealed class RemotePublishingStartup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IMetaWeblogDriver, MediaMetaWeblogDriver>();
-        }
+        services.AddScoped<IMetaWeblogDriver, MediaMetaWeblogDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/ResourceManifestOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Media/ResourceManifestOptionsConfiguration.cs
index 50e933d1be7..f47af586ea3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/ResourceManifestOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/ResourceManifestOptionsConfiguration.cs
@@ -1,32 +1,31 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Media
+namespace OrchardCore.Media;
+
+public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
 {
-    public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
-    {
-        private static readonly ResourceManifest _manifest;
+    private static readonly ResourceManifest _manifest;
 
-        static ResourceManagementOptionsConfiguration()
-        {
-            _manifest = new ResourceManifest();
+    static ResourceManagementOptionsConfiguration()
+    {
+        _manifest = new ResourceManifest();
 
-            _manifest
-                .DefineScript("media")
-                .SetUrl("~/OrchardCore.Media/Scripts/media.min.js", "~/OrchardCore.Media/Scripts/media.js")
-                .SetDependencies("vuejs", "Sortable", "vuedraggable", "jQuery-ui", "credential-helpers")
-                .SetVersion("1.0.0");
+        _manifest
+            .DefineScript("media")
+            .SetUrl("~/OrchardCore.Media/Scripts/media.min.js", "~/OrchardCore.Media/Scripts/media.js")
+            .SetDependencies("vuejs", "Sortable", "vuedraggable", "jQuery-ui", "credential-helpers")
+            .SetVersion("1.0.0");
 
-            _manifest
-                .DefineStyle("media")
-                .SetUrl("~/OrchardCore.Media/Styles/media.min.css", "~/OrchardCore.Media/Styles/media.css")
-                .SetVersion("1.0.0");
+        _manifest
+            .DefineStyle("media")
+            .SetUrl("~/OrchardCore.Media/Styles/media.min.css", "~/OrchardCore.Media/Styles/media.css")
+            .SetVersion("1.0.0");
 
-        }
+    }
 
-        public void Configure(ResourceManagementOptions options)
-        {
-            options.ResourceManifests.Add(_manifest);
-        }
+    public void Configure(ResourceManagementOptions options)
+    {
+        options.ResourceManifests.Add(_manifest);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/SecureMediaPermissions.cs b/src/OrchardCore.Modules/OrchardCore.Media/SecureMediaPermissions.cs
index 1ad9a0a02a4..1e3694318df 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/SecureMediaPermissions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/SecureMediaPermissions.cs
@@ -9,157 +9,156 @@
 using OrchardCore.Media.Services;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Media
+namespace OrchardCore.Media;
+
+public sealed class SecureMediaPermissions : IPermissionProvider
 {
-    public sealed class SecureMediaPermissions : IPermissionProvider
-    {
-        // Note: The ManageMediaFolder permission grants all access, so viewing must be implied by it too.
-        public static readonly Permission ViewMedia = new("ViewMediaContent", "View media content in all folders", new[] { Permissions.ManageMediaFolder });
-        public static readonly Permission ViewRootMedia = new("ViewRootMediaContent", "View media content in the root folder", new[] { ViewMedia });
-        public static readonly Permission ViewOthersMedia = new("ViewOthersMediaContent", "View others media content", new[] { Permissions.ManageMediaFolder });
-        public static readonly Permission ViewOwnMedia = new("ViewOwnMediaContent", "View own media content", new[] { ViewOthersMedia });
+    // Note: The ManageMediaFolder permission grants all access, so viewing must be implied by it too.
+    public static readonly Permission ViewMedia = new("ViewMediaContent", "View media content in all folders", new[] { Permissions.ManageMediaFolder });
+    public static readonly Permission ViewRootMedia = new("ViewRootMediaContent", "View media content in the root folder", new[] { ViewMedia });
+    public static readonly Permission ViewOthersMedia = new("ViewOthersMediaContent", "View others media content", new[] { Permissions.ManageMediaFolder });
+    public static readonly Permission ViewOwnMedia = new("ViewOwnMediaContent", "View own media content", new[] { ViewOthersMedia });
 
-        private static readonly Permission _viewMediaTemplate = new("ViewMediaContent_{0}", "View media content in folder '{0}'", new[] { ViewMedia });
+    private static readonly Permission _viewMediaTemplate = new("ViewMediaContent_{0}", "View media content in folder '{0}'", new[] { ViewMedia });
 
-        private static Dictionary<ValueTuple<string, string>, Permission> _permissionsByFolder = new();
-        private static readonly char[] _trimSecurePathChars = ['/', '\\', ' '];
-        private static readonly ReadOnlyDictionary<string, Permission> _permissionTemplates = new(new Dictionary<string, Permission>()
-        {
-            { ViewMedia.Name, _viewMediaTemplate },
-        });
+    private static Dictionary<ValueTuple<string, string>, Permission> _permissionsByFolder = new();
+    private static readonly char[] _trimSecurePathChars = ['/', '\\', ' '];
+    private static readonly ReadOnlyDictionary<string, Permission> _permissionTemplates = new(new Dictionary<string, Permission>()
+    {
+        { ViewMedia.Name, _viewMediaTemplate },
+    });
+
+    private readonly MediaOptions _mediaOptions;
+    private readonly AttachedMediaFieldFileService _attachedMediaFieldFileService;
+    private readonly ISignal _signal;
+    private readonly IMediaFileStore _fileStore;
+    private readonly IMemoryCache _cache;
+
+    public SecureMediaPermissions(
+        IOptions<MediaOptions> options,
+        IMediaFileStore fileStore,
+        IMemoryCache cache,
+        AttachedMediaFieldFileService attachedMediaFieldFileService,
+        ISignal signal)
+    {
+        _mediaOptions = options.Value;
+        _fileStore = fileStore;
+        _cache = cache;
+        _attachedMediaFieldFileService = attachedMediaFieldFileService;
+        _signal = signal;
+    }
 
-        private readonly MediaOptions _mediaOptions;
-        private readonly AttachedMediaFieldFileService _attachedMediaFieldFileService;
-        private readonly ISignal _signal;
-        private readonly IMediaFileStore _fileStore;
-        private readonly IMemoryCache _cache;
-
-        public SecureMediaPermissions(
-            IOptions<MediaOptions> options,
-            IMediaFileStore fileStore,
-            IMemoryCache cache,
-            AttachedMediaFieldFileService attachedMediaFieldFileService,
-            ISignal signal)
+    public async Task<IEnumerable<Permission>> GetPermissionsAsync()
+    {
+        return await _cache.GetOrCreateAsync(nameof(SecureMediaPermissions), async (entry) =>
         {
-            _mediaOptions = options.Value;
-            _fileStore = fileStore;
-            _cache = cache;
-            _attachedMediaFieldFileService = attachedMediaFieldFileService;
-            _signal = signal;
-        }
+            // Ensure to rebuild at least after some time, to detect directory changes from outside of
+            // the media module. The signal gets set if a directory is created or deleted in the Media
+            // Library directly.
+            entry.SetAbsoluteExpiration(TimeSpan.FromMinutes(5))
+                 .AddExpirationToken(_signal.GetToken(nameof(SecureMediaPermissions)));
 
-        public async Task<IEnumerable<Permission>> GetPermissionsAsync()
-        {
-            return await _cache.GetOrCreateAsync(nameof(SecureMediaPermissions), async (entry) =>
-            {
-                // Ensure to rebuild at least after some time, to detect directory changes from outside of
-                // the media module. The signal gets set if a directory is created or deleted in the Media
-                // Library directly.
-                entry.SetAbsoluteExpiration(TimeSpan.FromMinutes(5))
-                     .AddExpirationToken(_signal.GetToken(nameof(SecureMediaPermissions)));
-
-                return await GetPermissionsInternalAsync();
-            });
-        }
+            return await GetPermissionsInternalAsync();
+        });
+    }
 
-        public IEnumerable<PermissionStereotype> GetDefaultStereotypes()
+    public IEnumerable<PermissionStereotype> GetDefaultStereotypes()
+    {
+        return new[]
         {
-            return new[]
+            new PermissionStereotype
             {
-                new PermissionStereotype
+                Name = "Administrator",
+                Permissions = new[]
                 {
-                    Name = "Administrator",
-                    Permissions = new[]
-                    {
-                        ViewMedia,
-                        ViewOthersMedia
-                    }
-                },
-                new PermissionStereotype
+                    ViewMedia,
+                    ViewOthersMedia
+                }
+            },
+            new PermissionStereotype
+            {
+                Name = "Authenticated",
+                Permissions = new[]
                 {
-                    Name = "Authenticated",
-                    Permissions = new[]
-                    {
-                        ViewOwnMedia
-                    }
-                },
-                new PermissionStereotype
+                    ViewOwnMedia
+                }
+            },
+            new PermissionStereotype
+            {
+                Name = "Anonymous",
+                Permissions = new[]
                 {
-                    Name = "Anonymous",
-                    Permissions = new[]
-                    {
-                        ViewMedia
-                    }
+                    ViewMedia
                 }
-            };
-        }
+            }
+        };
+    }
 
-        /// <summary>
-        /// Returns a dynamic permission for a secure folder, based on a global view media permission template.
-        /// </summary>
-        internal static Permission ConvertToDynamicPermission(Permission permission) => _permissionTemplates.TryGetValue(permission.Name, out var result) ? result : null;
+    /// <summary>
+    /// Returns a dynamic permission for a secure folder, based on a global view media permission template.
+    /// </summary>
+    internal static Permission ConvertToDynamicPermission(Permission permission) => _permissionTemplates.TryGetValue(permission.Name, out var result) ? result : null;
 
-        internal static Permission CreateDynamicPermission(Permission template, string secureFolder)
-        {
-            ArgumentNullException.ThrowIfNull(template);
+    internal static Permission CreateDynamicPermission(Permission template, string secureFolder)
+    {
+        ArgumentNullException.ThrowIfNull(template);
 
-            secureFolder = secureFolder?.Trim(_trimSecurePathChars);
+        secureFolder = secureFolder?.Trim(_trimSecurePathChars);
 
-            var key = new ValueTuple<string, string>(template.Name, secureFolder);
+        var key = new ValueTuple<string, string>(template.Name, secureFolder);
 
-            if (_permissionsByFolder.TryGetValue(key, out var permission))
-            {
-                return permission;
-            }
+        if (_permissionsByFolder.TryGetValue(key, out var permission))
+        {
+            return permission;
+        }
 
-            permission = new Permission(
-                string.Format(template.Name, secureFolder),
-                string.Format(template.Description, secureFolder),
-                (template.ImpliedBy ?? Array.Empty<Permission>()).Select(t => CreateDynamicPermission(t, secureFolder))
-            );
+        permission = new Permission(
+            string.Format(template.Name, secureFolder),
+            string.Format(template.Description, secureFolder),
+            (template.ImpliedBy ?? Array.Empty<Permission>()).Select(t => CreateDynamicPermission(t, secureFolder))
+        );
 
-            var localPermissions = new Dictionary<ValueTuple<string, string>, Permission>(_permissionsByFolder)
-            {
-                [key] = permission,
-            };
+        var localPermissions = new Dictionary<ValueTuple<string, string>, Permission>(_permissionsByFolder)
+        {
+            [key] = permission,
+        };
 
-            _permissionsByFolder = localPermissions;
+        _permissionsByFolder = localPermissions;
 
-            return permission;
-        }
+        return permission;
+    }
 
-        private async Task<IEnumerable<Permission>> GetPermissionsInternalAsync()
+    private async Task<IEnumerable<Permission>> GetPermissionsInternalAsync()
+    {
+        // The ViewRootMedia permission must be implied by any subfolder permission.
+        var viewRootImpliedBy = new List<Permission>(ViewRootMedia.ImpliedBy);
+        var result = new List<Permission>()
         {
-            // The ViewRootMedia permission must be implied by any subfolder permission.
-            var viewRootImpliedBy = new List<Permission>(ViewRootMedia.ImpliedBy);
-            var result = new List<Permission>()
-            {
-                ViewMedia,
-                new (ViewRootMedia.Name, ViewRootMedia.Description, viewRootImpliedBy),
-                ViewOthersMedia,
-                ViewOwnMedia
-            };
+            ViewMedia,
+            new (ViewRootMedia.Name, ViewRootMedia.Description, viewRootImpliedBy),
+            ViewOthersMedia,
+            ViewOwnMedia
+        };
 
-            await foreach (var entry in _fileStore.GetDirectoryContentAsync())
-            {
-                if (!entry.IsDirectory)
-                    continue;
+        await foreach (var entry in _fileStore.GetDirectoryContentAsync())
+        {
+            if (!entry.IsDirectory)
+                continue;
 
-                if (entry.Name == _mediaOptions.AssetsUsersFolder ||
-                    entry.Name == _attachedMediaFieldFileService.MediaFieldsFolder)
-                    continue;
+            if (entry.Name == _mediaOptions.AssetsUsersFolder ||
+                entry.Name == _attachedMediaFieldFileService.MediaFieldsFolder)
+                continue;
 
-                var folderPath = entry.Path;
+            var folderPath = entry.Path;
 
-                foreach (var template in _permissionTemplates)
-                {
-                    var dynamicPermission = CreateDynamicPermission(template.Value, folderPath);
-                    result.Add(dynamicPermission);
-                    viewRootImpliedBy.Add(dynamicPermission);
-                }
+            foreach (var template in _permissionTemplates)
+            {
+                var dynamicPermission = CreateDynamicPermission(template.Value, folderPath);
+                result.Add(dynamicPermission);
+                viewRootImpliedBy.Add(dynamicPermission);
             }
-
-            return result.AsEnumerable();
         }
+
+        return result.AsEnumerable();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Services/AttachedMediaFieldFileService.cs b/src/OrchardCore.Modules/OrchardCore.Media/Services/AttachedMediaFieldFileService.cs
index 43e63d89616..54bcf51e5ca 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Services/AttachedMediaFieldFileService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Services/AttachedMediaFieldFileService.cs
@@ -10,153 +10,152 @@
 using OrchardCore.FileStorage;
 using OrchardCore.Media.ViewModels;
 
-namespace OrchardCore.Media.Services
+namespace OrchardCore.Media.Services;
+
+/// <summary>
+/// Handles file management operations related to the attached media field.
+/// </summary>
+public class AttachedMediaFieldFileService
 {
+    private readonly IMediaFileStore _fileStore;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IUserAssetFolderNameProvider _userAssetFolderNameProvider;
+    private readonly ILogger _logger;
+
+    public AttachedMediaFieldFileService(
+        IMediaFileStore fileStore,
+        IHttpContextAccessor httpContextAccessor,
+        IUserAssetFolderNameProvider userAssetFolderNameProvider,
+        ILogger<AttachedMediaFieldFileService> logger)
+    {
+        _fileStore = fileStore;
+        _httpContextAccessor = httpContextAccessor;
+        _userAssetFolderNameProvider = userAssetFolderNameProvider;
+        _logger = logger;
+
+        MediaFieldsFolder = "mediafields";
+        MediaFieldsTempSubFolder = _fileStore.Combine(MediaFieldsFolder, "temp");
+    }
+
+    public string MediaFieldsFolder { get; }
+    public string MediaFieldsTempSubFolder { get; }
+
     /// <summary>
-    /// Handles file management operations related to the attached media field.
+    /// Removes the assets attached to a content item through an attached media field.
     /// </summary>
-    public class AttachedMediaFieldFileService
+    /// <remarks>
+    /// To be used by content handlers when the content item is deleted.
+    /// </remarks>
+    public Task DeleteContentItemFolderAsync(ContentItem contentItem)
     {
-        private readonly IMediaFileStore _fileStore;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IUserAssetFolderNameProvider _userAssetFolderNameProvider;
-        private readonly ILogger _logger;
-
-        public AttachedMediaFieldFileService(
-            IMediaFileStore fileStore,
-            IHttpContextAccessor httpContextAccessor,
-            IUserAssetFolderNameProvider userAssetFolderNameProvider,
-            ILogger<AttachedMediaFieldFileService> logger)
-        {
-            _fileStore = fileStore;
-            _httpContextAccessor = httpContextAccessor;
-            _userAssetFolderNameProvider = userAssetFolderNameProvider;
-            _logger = logger;
-
-            MediaFieldsFolder = "mediafields";
-            MediaFieldsTempSubFolder = _fileStore.Combine(MediaFieldsFolder, "temp");
-        }
+        return _fileStore.TryDeleteDirectoryAsync(GetContentItemFolder(contentItem));
+    }
 
-        public string MediaFieldsFolder { get; }
-        public string MediaFieldsTempSubFolder { get; }
+    /// <summary>
+    /// Moves uploaded files to a folder specific for the content item.
+    /// </summary>
+    public async Task HandleFilesOnFieldUpdateAsync(List<EditMediaFieldItemInfo> items, ContentItem contentItem)
+    {
+        ArgumentNullException.ThrowIfNull(items);
 
-        /// <summary>
-        /// Removes the assets attached to a content item through an attached media field.
-        /// </summary>
-        /// <remarks>
-        /// To be used by content handlers when the content item is deleted.
-        /// </remarks>
-        public Task DeleteContentItemFolderAsync(ContentItem contentItem)
+        if (_httpContextAccessor.HttpContext?.Features.Get<ContentPreviewFeature>()?.Previewing == true)
         {
-            return _fileStore.TryDeleteDirectoryAsync(GetContentItemFolder(contentItem));
+            return;
         }
 
-        /// <summary>
-        /// Moves uploaded files to a folder specific for the content item.
-        /// </summary>
-        public async Task HandleFilesOnFieldUpdateAsync(List<EditMediaFieldItemInfo> items, ContentItem contentItem)
-        {
-            ArgumentNullException.ThrowIfNull(items);
-
-            if (_httpContextAccessor.HttpContext?.Features.Get<ContentPreviewFeature>()?.Previewing == true)
-            {
-                return;
-            }
+        await EnsureGlobalDirectoriesAsync();
 
-            await EnsureGlobalDirectoriesAsync();
+        await RemoveTemporaryAsync(items);
 
-            await RemoveTemporaryAsync(items);
+        await MoveNewFilesToContentItemDirAndUpdatePathsAsync(items, contentItem);
+    }
 
-            await MoveNewFilesToContentItemDirAndUpdatePathsAsync(items, contentItem);
-        }
+    /// <summary>
+    /// Gets the per-user temporary upload directory.
+    /// </summary>
+    /// <returns></returns>
+    public string GetMediaFieldsTempSubFolder()
+        => _fileStore.Combine(MediaFieldsTempSubFolder, _userAssetFolderNameProvider.GetUserAssetFolderName(_httpContextAccessor.HttpContext.User));
 
-        /// <summary>
-        /// Gets the per-user temporary upload directory.
-        /// </summary>
-        /// <returns></returns>
-        public string GetMediaFieldsTempSubFolder()
-            => _fileStore.Combine(MediaFieldsTempSubFolder, _userAssetFolderNameProvider.GetUserAssetFolderName(_httpContextAccessor.HttpContext.User));
+    private async Task EnsureGlobalDirectoriesAsync()
+    {
+        await _fileStore.TryCreateDirectoryAsync(MediaFieldsFolder);
+        await _fileStore.TryCreateDirectoryAsync(MediaFieldsTempSubFolder);
+    }
 
-        private async Task EnsureGlobalDirectoriesAsync()
+    // Files just uploaded and then immediately discarded.
+    private async Task RemoveTemporaryAsync(List<EditMediaFieldItemInfo> items)
+    {
+        foreach (var item in items.Where(i => i.IsRemoved && i.IsNew))
         {
-            await _fileStore.TryCreateDirectoryAsync(MediaFieldsFolder);
-            await _fileStore.TryCreateDirectoryAsync(MediaFieldsTempSubFolder);
+            await _fileStore.TryDeleteFileAsync(item.Path);
         }
+    }
 
-        // Files just uploaded and then immediately discarded.
-        private async Task RemoveTemporaryAsync(List<EditMediaFieldItemInfo> items)
+    // Newly added files
+    private async Task MoveNewFilesToContentItemDirAndUpdatePathsAsync(List<EditMediaFieldItemInfo> items, ContentItem contentItem)
+    {
+        foreach (var item in items.Where(i => !i.IsRemoved && !string.IsNullOrEmpty(i.Path)))
         {
-            foreach (var item in items.Where(i => i.IsRemoved && i.IsNew))
-            {
-                await _fileStore.TryDeleteFileAsync(item.Path);
-            }
-        }
+            var fileInfo = await _fileStore.GetFileInfoAsync(item.Path);
 
-        // Newly added files
-        private async Task MoveNewFilesToContentItemDirAndUpdatePathsAsync(List<EditMediaFieldItemInfo> items, ContentItem contentItem)
-        {
-            foreach (var item in items.Where(i => !i.IsRemoved && !string.IsNullOrEmpty(i.Path)))
+            if (fileInfo == null)
             {
-                var fileInfo = await _fileStore.GetFileInfoAsync(item.Path);
-
-                if (fileInfo == null)
-                {
-                    _logger.LogError("A file with the path '{Path}' does not exist.", item.Path);
-                    return;
-                }
+                _logger.LogError("A file with the path '{Path}' does not exist.", item.Path);
+                return;
+            }
 
-                var targetDir = GetContentItemFolder(contentItem);
-                var finalFileName = (await GetFileHashAsync(item.Path)) + GetFileExtension(item.Path);
-                var finalFilePath = _fileStore.Combine(targetDir, finalFileName);
+            var targetDir = GetContentItemFolder(contentItem);
+            var finalFileName = (await GetFileHashAsync(item.Path)) + GetFileExtension(item.Path);
+            var finalFilePath = _fileStore.Combine(targetDir, finalFileName);
 
-                await _fileStore.TryCreateDirectoryAsync(targetDir);
+            await _fileStore.TryCreateDirectoryAsync(targetDir);
 
-                // When there is a validation error before creating the content item we can end up with an empty folder
-                // because the content item is different on each form submit . We need to remove that empty folder.
-                var previousDirPath = fileInfo.DirectoryPath;
+            // When there is a validation error before creating the content item we can end up with an empty folder
+            // because the content item is different on each form submit . We need to remove that empty folder.
+            var previousDirPath = fileInfo.DirectoryPath;
 
-                // fileName is a hash of the file. We preserve disk space by reusing the file.
-                if (await _fileStore.GetFileInfoAsync(finalFilePath) == null)
-                {
-                    await _fileStore.MoveFileAsync(item.Path, finalFilePath);
-                }
+            // fileName is a hash of the file. We preserve disk space by reusing the file.
+            if (await _fileStore.GetFileInfoAsync(finalFilePath) == null)
+            {
+                await _fileStore.MoveFileAsync(item.Path, finalFilePath);
+            }
 
-                item.Path = finalFilePath;
+            item.Path = finalFilePath;
 
-                await DeleteDirIfEmptyAsync(previousDirPath);
-            }
+            await DeleteDirIfEmptyAsync(previousDirPath);
         }
+    }
 
-        private string GetContentItemFolder(ContentItem contentItem)
-        {
-            return _fileStore.Combine(MediaFieldsFolder, contentItem.ContentType, contentItem.ContentItemId);
-        }
+    private string GetContentItemFolder(ContentItem contentItem)
+    {
+        return _fileStore.Combine(MediaFieldsFolder, contentItem.ContentType, contentItem.ContentItemId);
+    }
 
-        private async Task<string> GetFileHashAsync(string filePath)
-        {
-            using var fs = await _fileStore.GetFileStreamAsync(filePath);
-            var hash = new XxHash32();
-            await hash.AppendAsync(fs);
-            return Convert.ToHexString(hash.GetCurrentHash()).ToLowerInvariant();
-        }
+    private async Task<string> GetFileHashAsync(string filePath)
+    {
+        using var fs = await _fileStore.GetFileStreamAsync(filePath);
+        var hash = new XxHash32();
+        await hash.AppendAsync(fs);
+        return Convert.ToHexString(hash.GetCurrentHash()).ToLowerInvariant();
+    }
+
+    private static string GetFileExtension(string path)
+    {
+        var lastPoint = path.LastIndexOf('.');
+        return lastPoint > -1 ? path[lastPoint..] : "";
+    }
 
-        private static string GetFileExtension(string path)
+    private async Task DeleteDirIfEmptyAsync(string previousDirPath)
+    {
+        if (await _fileStore.GetDirectoryInfoAsync(previousDirPath) == null)
         {
-            var lastPoint = path.LastIndexOf('.');
-            return lastPoint > -1 ? path[lastPoint..] : "";
+            return;
         }
 
-        private async Task DeleteDirIfEmptyAsync(string previousDirPath)
+        if (!(await _fileStore.GetDirectoryContentAsync(previousDirPath).AnyAsync()))
         {
-            if (await _fileStore.GetDirectoryInfoAsync(previousDirPath) == null)
-            {
-                return;
-            }
-
-            if (!(await _fileStore.GetDirectoryContentAsync(previousDirPath).AnyAsync()))
-            {
-                await _fileStore.TryDeleteDirectoryAsync(previousDirPath);
-            }
+            await _fileStore.TryDeleteDirectoryAsync(previousDirPath);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Services/DefaultUserAssetFolderNameProvider.cs b/src/OrchardCore.Modules/OrchardCore.Media/Services/DefaultUserAssetFolderNameProvider.cs
index 41343635ec7..fc606deb90b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Services/DefaultUserAssetFolderNameProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Services/DefaultUserAssetFolderNameProvider.cs
@@ -1,12 +1,11 @@
 using System.Security.Claims;
 
-namespace OrchardCore.Media.Services
+namespace OrchardCore.Media.Services;
+
+public class DefaultUserAssetFolderNameProvider : IUserAssetFolderNameProvider
 {
-    public class DefaultUserAssetFolderNameProvider : IUserAssetFolderNameProvider
+    public string GetUserAssetFolderName(ClaimsPrincipal claimsPrincipal)
     {
-        public string GetUserAssetFolderName(ClaimsPrincipal claimsPrincipal)
-        {
-            return claimsPrincipal.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
+        return claimsPrincipal.FindFirstValue(ClaimTypes.NameIdentifier);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Services/IMediaProfileService.cs b/src/OrchardCore.Modules/OrchardCore.Media/Services/IMediaProfileService.cs
index 55f5dbe446d..92f9aee8fe0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Services/IMediaProfileService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Services/IMediaProfileService.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Media.Services
+namespace OrchardCore.Media.Services;
+
+public interface IMediaProfileService
 {
-    public interface IMediaProfileService
-    {
-        Task<IDictionary<string, string>> GetMediaProfileCommands(string name);
-    }
+    Task<IDictionary<string, string>> GetMediaProfileCommands(string name);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Services/ManageMediaFolderAuthorizationHandler.cs b/src/OrchardCore.Modules/OrchardCore.Media/Services/ManageMediaFolderAuthorizationHandler.cs
index 55c936bc49c..b160dc34dc0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Services/ManageMediaFolderAuthorizationHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Services/ManageMediaFolderAuthorizationHandler.cs
@@ -6,113 +6,112 @@
 using OrchardCore.FileStorage;
 using OrchardCore.Security;
 
-namespace OrchardCore.Media.Services
+namespace OrchardCore.Media.Services;
+
+/// <summary>
+/// Checks if the user has related permission to manage the path resource which is passed from AuthorizationHandler.
+/// </summary>
+public class ManageMediaFolderAuthorizationHandler : AuthorizationHandler<PermissionRequirement>
 {
-    /// <summary>
-    /// Checks if the user has related permission to manage the path resource which is passed from AuthorizationHandler.
-    /// </summary>
-    public class ManageMediaFolderAuthorizationHandler : AuthorizationHandler<PermissionRequirement>
+    private readonly IServiceProvider _serviceProvider;
+    private readonly AttachedMediaFieldFileService _attachedMediaFieldFileService;
+    private readonly IMediaFileStore _fileStore;
+    private char _pathSeparator;
+    private string _mediaFieldsFolder;
+    private string _usersFolder;
+    private readonly MediaOptions _mediaOptions;
+    private readonly IUserAssetFolderNameProvider _userAssetFolderNameProvider;
+
+    public ManageMediaFolderAuthorizationHandler(IServiceProvider serviceProvider,
+        AttachedMediaFieldFileService attachedMediaFieldFileService,
+        IMediaFileStore fileStore,
+        IOptions<MediaOptions> options,
+        IUserAssetFolderNameProvider userAssetFolderNameProvider)
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly AttachedMediaFieldFileService _attachedMediaFieldFileService;
-        private readonly IMediaFileStore _fileStore;
-        private char _pathSeparator;
-        private string _mediaFieldsFolder;
-        private string _usersFolder;
-        private readonly MediaOptions _mediaOptions;
-        private readonly IUserAssetFolderNameProvider _userAssetFolderNameProvider;
-
-        public ManageMediaFolderAuthorizationHandler(IServiceProvider serviceProvider,
-            AttachedMediaFieldFileService attachedMediaFieldFileService,
-            IMediaFileStore fileStore,
-            IOptions<MediaOptions> options,
-            IUserAssetFolderNameProvider userAssetFolderNameProvider)
+        _serviceProvider = serviceProvider;
+        _attachedMediaFieldFileService = attachedMediaFieldFileService;
+        _fileStore = fileStore;
+        _mediaOptions = options.Value;
+        _userAssetFolderNameProvider = userAssetFolderNameProvider;
+    }
+
+    protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement)
+    {
+        if (context.HasSucceeded)
         {
-            _serviceProvider = serviceProvider;
-            _attachedMediaFieldFileService = attachedMediaFieldFileService;
-            _fileStore = fileStore;
-            _mediaOptions = options.Value;
-            _userAssetFolderNameProvider = userAssetFolderNameProvider;
+            // This handler is not revoking any pre-existing grants.
+            return;
         }
 
-        protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement)
+        if (requirement.Permission.Name != Permissions.ManageMediaFolder.Name)
         {
-            if (context.HasSucceeded)
-            {
-                // This handler is not revoking any pre-existing grants.
-                return;
-            }
-
-            if (requirement.Permission.Name != Permissions.ManageMediaFolder.Name)
-            {
-                return;
-            }
+            return;
+        }
 
-            if (context.Resource == null)
-            {
-                return;
-            }
+        if (context.Resource == null)
+        {
+            return;
+        }
 
-            _pathSeparator = _fileStore.Combine("a", "b").Contains('/') ? '/' : '\\';
+        _pathSeparator = _fileStore.Combine("a", "b").Contains('/') ? '/' : '\\';
 
-            // ensure end trailing slash
-            _mediaFieldsFolder = _fileStore.NormalizePath(_attachedMediaFieldFileService.MediaFieldsFolder)
-                                 .TrimEnd(_pathSeparator) + _pathSeparator;
+        // ensure end trailing slash
+        _mediaFieldsFolder = _fileStore.NormalizePath(_attachedMediaFieldFileService.MediaFieldsFolder)
+                             .TrimEnd(_pathSeparator) + _pathSeparator;
 
-            _usersFolder = _fileStore.NormalizePath(_mediaOptions.AssetsUsersFolder)
-                           .TrimEnd(_pathSeparator) + _pathSeparator;
+        _usersFolder = _fileStore.NormalizePath(_mediaOptions.AssetsUsersFolder)
+                       .TrimEnd(_pathSeparator) + _pathSeparator;
 
-            var path = context.Resource as string;
+        var path = context.Resource as string;
 
-            var userOwnFolder = _fileStore.NormalizePath(
-                                _fileStore.Combine(_usersFolder, _userAssetFolderNameProvider.GetUserAssetFolderName(context.User)))
-                                .TrimEnd(_pathSeparator) + _pathSeparator;
+        var userOwnFolder = _fileStore.NormalizePath(
+                            _fileStore.Combine(_usersFolder, _userAssetFolderNameProvider.GetUserAssetFolderName(context.User)))
+                            .TrimEnd(_pathSeparator) + _pathSeparator;
 
-            var permission = Permissions.ManageMedia;
+        var permission = Permissions.ManageMedia;
 
-            // Handle attached media field folder.
-            if (IsAuthorizedFolder(_mediaFieldsFolder, path) || IsDescendantOfauthorizedFolder(_mediaFieldsFolder, path))
-            {
-                permission = Permissions.ManageAttachedMediaFieldsFolder;
-            }
+        // Handle attached media field folder.
+        if (IsAuthorizedFolder(_mediaFieldsFolder, path) || IsDescendantOfauthorizedFolder(_mediaFieldsFolder, path))
+        {
+            permission = Permissions.ManageAttachedMediaFieldsFolder;
+        }
 
-            if (IsAuthorizedFolder(_usersFolder, path) || IsAuthorizedFolder(userOwnFolder, path) || IsDescendantOfauthorizedFolder(userOwnFolder, path))
-            {
-                permission = Permissions.ManageOwnMedia;
-            }
+        if (IsAuthorizedFolder(_usersFolder, path) || IsAuthorizedFolder(userOwnFolder, path) || IsDescendantOfauthorizedFolder(userOwnFolder, path))
+        {
+            permission = Permissions.ManageOwnMedia;
+        }
 
-            if (IsDescendantOfauthorizedFolder(_usersFolder, path) && !IsAuthorizedFolder(userOwnFolder, path) && !IsDescendantOfauthorizedFolder(userOwnFolder, path))
-            {
-                permission = Permissions.ManageOthersMedia;
-            }
+        if (IsDescendantOfauthorizedFolder(_usersFolder, path) && !IsAuthorizedFolder(userOwnFolder, path) && !IsDescendantOfauthorizedFolder(userOwnFolder, path))
+        {
+            permission = Permissions.ManageOthersMedia;
+        }
 
-            // Lazy load to prevent circular dependencies.
-            var authorizationService = _serviceProvider.GetService<IAuthorizationService>();
+        // Lazy load to prevent circular dependencies.
+        var authorizationService = _serviceProvider.GetService<IAuthorizationService>();
 
-            if (await authorizationService.AuthorizeAsync(context.User, permission))
+        if (await authorizationService.AuthorizeAsync(context.User, permission))
+        {
+            // Check if viewing is allowed for this folder, if secure media is also enabled.
+            if (!_serviceProvider.IsSecureMediaEnabled() ||
+                await authorizationService.AuthorizeAsync(context.User, SecureMediaPermissions.ViewMedia, (object)path))
             {
-                // Check if viewing is allowed for this folder, if secure media is also enabled.
-                if (!_serviceProvider.IsSecureMediaEnabled() ||
-                    await authorizationService.AuthorizeAsync(context.User, SecureMediaPermissions.ViewMedia, (object)path))
-                {
-                    context.Succeed(requirement);
-                }
+                context.Succeed(requirement);
             }
         }
+    }
 
-        private bool IsAuthorizedFolder(string authorizedFolder, string childPath)
-        {
-            // Ensure end trailing slash.
-            childPath = _fileStore.NormalizePath(childPath)
-                        .TrimEnd(_pathSeparator) + _pathSeparator;
+    private bool IsAuthorizedFolder(string authorizedFolder, string childPath)
+    {
+        // Ensure end trailing slash.
+        childPath = _fileStore.NormalizePath(childPath)
+                    .TrimEnd(_pathSeparator) + _pathSeparator;
 
-            return childPath.Equals(authorizedFolder, StringComparison.Ordinal);
-        }
+        return childPath.Equals(authorizedFolder, StringComparison.Ordinal);
+    }
 
-        private bool IsDescendantOfauthorizedFolder(string authorizedFolder, string childPath)
-        {
-            childPath = _fileStore.NormalizePath(childPath);
-            return childPath.StartsWith(authorizedFolder, StringComparison.Ordinal);
-        }
+    private bool IsDescendantOfauthorizedFolder(string authorizedFolder, string childPath)
+    {
+        childPath = _fileStore.NormalizePath(childPath);
+        return childPath.StartsWith(authorizedFolder, StringComparison.Ordinal);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaFileProvider.cs b/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaFileProvider.cs
index e21a7847d7a..02f858190b4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaFileProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaFileProvider.cs
@@ -2,20 +2,19 @@
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.FileProviders.Physical;
 
-namespace OrchardCore.Media.Services
+namespace OrchardCore.Media.Services;
+
+public class MediaFileProvider : PhysicalFileProvider, IMediaFileProvider
 {
-    public class MediaFileProvider : PhysicalFileProvider, IMediaFileProvider
+    public MediaFileProvider(PathString virtualPathBase, string root) : base(root)
     {
-        public MediaFileProvider(PathString virtualPathBase, string root) : base(root)
-        {
-            VirtualPathBase = virtualPathBase;
-        }
-
-        public MediaFileProvider(PathString virtualPathBase, string root, ExclusionFilters filters) : base(root, filters)
-        {
-            VirtualPathBase = virtualPathBase;
-        }
+        VirtualPathBase = virtualPathBase;
+    }
 
-        public PathString VirtualPathBase { get; }
+    public MediaFileProvider(PathString virtualPathBase, string root, ExclusionFilters filters) : base(root, filters)
+    {
+        VirtualPathBase = virtualPathBase;
     }
+
+    public PathString VirtualPathBase { get; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaFileStoreResolverMiddleware.cs b/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaFileStoreResolverMiddleware.cs
index 2df251d0655..5f99402e0dc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaFileStoreResolverMiddleware.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaFileStoreResolverMiddleware.cs
@@ -7,106 +7,105 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Routing;
 
-namespace OrchardCore.Media.Services
+namespace OrchardCore.Media.Services;
+
+/// <summary>
+/// Provides local caching for remote file store files.
+/// </summary>
+public class MediaFileStoreResolverMiddleware
 {
-    /// <summary>
-    /// Provides local caching for remote file store files.
-    /// </summary>
-    public class MediaFileStoreResolverMiddleware
-    {
-        private readonly ConcurrentDictionary<string, Lazy<Task>> _workers = new(StringComparer.OrdinalIgnoreCase);
+    private readonly ConcurrentDictionary<string, Lazy<Task>> _workers = new(StringComparer.OrdinalIgnoreCase);
 
-        private readonly RequestDelegate _next;
-        private readonly ILogger _logger;
-        private readonly IMediaFileStoreCache _mediaFileStoreCache;
-        private readonly IMediaFileStore _mediaFileStore;
+    private readonly RequestDelegate _next;
+    private readonly ILogger _logger;
+    private readonly IMediaFileStoreCache _mediaFileStoreCache;
+    private readonly IMediaFileStore _mediaFileStore;
 
-        private readonly PathString _assetsRequestPath;
+    private readonly PathString _assetsRequestPath;
 
-        public MediaFileStoreResolverMiddleware(
-            RequestDelegate next,
-            ILogger<MediaFileStoreResolverMiddleware> logger,
-            IMediaFileStoreCache mediaFileStoreCache,
-            IMediaFileStore mediaFileStore,
-            IOptions<MediaOptions> mediaOptions
-            )
-        {
-            _next = next;
-            _logger = logger;
-            _mediaFileStoreCache = mediaFileStoreCache;
-            _mediaFileStore = mediaFileStore;
+    public MediaFileStoreResolverMiddleware(
+        RequestDelegate next,
+        ILogger<MediaFileStoreResolverMiddleware> logger,
+        IMediaFileStoreCache mediaFileStoreCache,
+        IMediaFileStore mediaFileStore,
+        IOptions<MediaOptions> mediaOptions
+        )
+    {
+        _next = next;
+        _logger = logger;
+        _mediaFileStoreCache = mediaFileStoreCache;
+        _mediaFileStore = mediaFileStore;
 
-            _assetsRequestPath = mediaOptions.Value.AssetsRequestPath;
+        _assetsRequestPath = mediaOptions.Value.AssetsRequestPath;
+    }
+
+    /// <summary>
+    /// Processes a request to determine if it matches a known file from the media file store, and cache it locally.
+    /// </summary>
+    /// <param name="context"></param>
+    public async Task Invoke(HttpContext context)
+    {
+        // Support only Head requests or Get Requests.
+        if (!HttpMethods.IsGet(context.Request.Method) && !HttpMethods.IsHead(context.Request.Method))
+        {
+            await _next(context);
+            return;
         }
 
-        /// <summary>
-        /// Processes a request to determine if it matches a known file from the media file store, and cache it locally.
-        /// </summary>
-        /// <param name="context"></param>
-        public async Task Invoke(HttpContext context)
+        var validatePath = context.Request.Path.StartsWithNormalizedSegments(_assetsRequestPath, StringComparison.OrdinalIgnoreCase, out var subPath);
+        if (!validatePath)
         {
-            // Support only Head requests or Get Requests.
-            if (!HttpMethods.IsGet(context.Request.Method) && !HttpMethods.IsHead(context.Request.Method))
-            {
-                await _next(context);
-                return;
-            }
+            _logger.LogDebug("Request path {Path} does not match the assets request path {RequestPath}", subPath, _assetsRequestPath);
+            await _next(context);
+            return;
+        }
 
-            var validatePath = context.Request.Path.StartsWithNormalizedSegments(_assetsRequestPath, StringComparison.OrdinalIgnoreCase, out var subPath);
-            if (!validatePath)
+        // subPath.Value returns an unescaped path value, subPath returns an escaped path value.
+        var subPathValue = subPath.Value;
+
+        var isFileCached = await _mediaFileStoreCache.IsCachedAsync(subPathValue);
+        if (isFileCached)
+        {
+            // When multiple requests occur for the same file the download
+            // may already be in progress so we wait for it to complete.
+            if (_workers.TryGetValue(subPathValue, out var writeTask))
             {
-                _logger.LogDebug("Request path {Path} does not match the assets request path {RequestPath}", subPath, _assetsRequestPath);
-                await _next(context);
-                return;
+                await writeTask.Value;
             }
 
-            // subPath.Value returns an unescaped path value, subPath returns an escaped path value.
-            var subPathValue = subPath.Value;
+            await _next(context);
+            return;
+        }
 
-            var isFileCached = await _mediaFileStoreCache.IsCachedAsync(subPathValue);
-            if (isFileCached)
+        // When multiple requests occur for the same file we use a Lazy<Task>
+        // to initialize the file store request once.
+        await _workers.GetOrAdd(subPathValue, path => new Lazy<Task>(async () =>
+        {
+            try
             {
-                // When multiple requests occur for the same file the download
-                // may already be in progress so we wait for it to complete.
-                if (_workers.TryGetValue(subPathValue, out var writeTask))
+                var fileStoreEntry = await _mediaFileStore.GetFileInfoAsync(path);
+
+                if (fileStoreEntry != null)
                 {
-                    await writeTask.Value;
+                    using var stream = await _mediaFileStore.GetFileStreamAsync(fileStoreEntry);
+                    await _mediaFileStoreCache.SetCacheAsync(stream, fileStoreEntry, context.RequestAborted);
                 }
-
-                await _next(context);
-                return;
             }
-
-            // When multiple requests occur for the same file we use a Lazy<Task>
-            // to initialize the file store request once.
-            await _workers.GetOrAdd(subPathValue, path => new Lazy<Task>(async () =>
+            catch (Exception ex)
             {
-                try
-                {
-                    var fileStoreEntry = await _mediaFileStore.GetFileInfoAsync(path);
-
-                    if (fileStoreEntry != null)
-                    {
-                        using var stream = await _mediaFileStore.GetFileStreamAsync(fileStoreEntry);
-                        await _mediaFileStoreCache.SetCacheAsync(stream, fileStoreEntry, context.RequestAborted);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    // Log the error, and pass to pipeline to handle as 404.
-                    // Multiple requests at the same time will all receive the same 404
-                    // as we use LazyThreadSafetyMode.ExecutionAndPublication.
-                    _logger.LogError(ex, "Error retrieving file from media file store for request path {Path}", path);
-                }
-                finally
-                {
-                    _workers.TryRemove(path, out var writeTask);
-                }
-            }, LazyThreadSafetyMode.ExecutionAndPublication)).Value;
+                // Log the error, and pass to pipeline to handle as 404.
+                // Multiple requests at the same time will all receive the same 404
+                // as we use LazyThreadSafetyMode.ExecutionAndPublication.
+                _logger.LogError(ex, "Error retrieving file from media file store for request path {Path}", path);
+            }
+            finally
+            {
+                _workers.TryRemove(path, out var writeTask);
+            }
+        }, LazyThreadSafetyMode.ExecutionAndPublication)).Value;
 
-            // Always call next, this middleware always passes.
-            await _next(context);
-            return;
-        }
+        // Always call next, this middleware always passes.
+        await _next(context);
+        return;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaOptionsConfiguration.cs
index 61eabb75f0f..df03c27e300 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaOptionsConfiguration.cs
@@ -6,124 +6,123 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Environment.Shell.Configuration;
 
-namespace OrchardCore.Media.Services
+namespace OrchardCore.Media.Services;
+
+public sealed class MediaOptionsConfiguration : IConfigureOptions<MediaOptions>
 {
-    public sealed class MediaOptionsConfiguration : IConfigureOptions<MediaOptions>
+    private static readonly int[] _defaultSupportedSizes = [16, 32, 50, 100, 160, 240, 480, 600, 1024, 2048];
+
+    private static readonly string[] _defaultAllowedFileExtensions = [
+        // Images
+        ".jpg",
+        ".jpeg",
+        ".png",
+        ".gif",
+        ".ico",
+        ".svg",
+        ".webp",
+
+        // Documents
+        ".pdf", // (Portable Document Format; Adobe Acrobat)
+        ".doc",
+        ".docx", // (Microsoft Word Document)
+        ".ppt",
+        ".pptx",
+        ".pps",
+        ".ppsx", // (Microsoft PowerPoint Presentation)
+        ".odt", // (OpenDocument Text Document)
+        ".xls",
+        ".xlsx", // (Microsoft Excel Document)
+        ".psd", // (Adobe Photoshop Document)
+
+        // Audio
+        ".mp3",
+        ".m4a",
+        ".ogg",
+        ".wav",
+
+        // Video
+        ".mp4",
+        ".m4v", // (MPEG-4)
+        ".mov", // (QuickTime)
+        ".wmv", // (Windows Media Video)
+        ".avi",
+        ".mpg",
+        ".ogv", // (Ogg)
+        ".3gp", // (3GPP)
+    ];
+
+    private const int DefaultMaxBrowserCacheDays = 30;
+    private const int DefaultSecureFilesMaxBrowserCacheDays = 0;
+    private const int DefaultMaxCacheDays = 365;
+    private const int DefaultMaxFileSize = 30_000_000;
+
+    private const string DefaultAssetsPath = "Media";
+    private const string DefaultAssetsUsersFolder = "_Users";
+    private const string DefaultAssetsRequestPath = "/media";
+
+    private const bool DefaultUseTokenizedQueryString = true;
+
+    // default-src self applied to prevent possible svg xss injection.
+    // style-src applied to allow browser behaviour of wrapping raw images in a styled img element.
+    private const string DefaultContentSecurityPolicy = "default-src 'self'; style-src 'unsafe-inline'";
+
+    private const int DefaultMaxUploadChunkSize = 104_857_600; // 100MB
+
+    private static readonly TimeSpan _defaultTemporaryFileLifeTime = TimeSpan.FromHours(1);
+
+    private readonly IShellConfiguration _shellConfiguration;
+
+    public MediaOptionsConfiguration(IShellConfiguration shellConfiguration)
     {
-        private static readonly int[] _defaultSupportedSizes = [16, 32, 50, 100, 160, 240, 480, 600, 1024, 2048];
-
-        private static readonly string[] _defaultAllowedFileExtensions = [
-            // Images
-            ".jpg",
-            ".jpeg",
-            ".png",
-            ".gif",
-            ".ico",
-            ".svg",
-            ".webp",
-
-            // Documents
-            ".pdf", // (Portable Document Format; Adobe Acrobat)
-            ".doc",
-            ".docx", // (Microsoft Word Document)
-            ".ppt",
-            ".pptx",
-            ".pps",
-            ".ppsx", // (Microsoft PowerPoint Presentation)
-            ".odt", // (OpenDocument Text Document)
-            ".xls",
-            ".xlsx", // (Microsoft Excel Document)
-            ".psd", // (Adobe Photoshop Document)
-
-            // Audio
-            ".mp3",
-            ".m4a",
-            ".ogg",
-            ".wav",
-
-            // Video
-            ".mp4",
-            ".m4v", // (MPEG-4)
-            ".mov", // (QuickTime)
-            ".wmv", // (Windows Media Video)
-            ".avi",
-            ".mpg",
-            ".ogv", // (Ogg)
-            ".3gp", // (3GPP)
-        ];
-
-        private const int DefaultMaxBrowserCacheDays = 30;
-        private const int DefaultSecureFilesMaxBrowserCacheDays = 0;
-        private const int DefaultMaxCacheDays = 365;
-        private const int DefaultMaxFileSize = 30_000_000;
-
-        private const string DefaultAssetsPath = "Media";
-        private const string DefaultAssetsUsersFolder = "_Users";
-        private const string DefaultAssetsRequestPath = "/media";
-
-        private const bool DefaultUseTokenizedQueryString = true;
-
-        // default-src self applied to prevent possible svg xss injection.
-        // style-src applied to allow browser behaviour of wrapping raw images in a styled img element.
-        private const string DefaultContentSecurityPolicy = "default-src 'self'; style-src 'unsafe-inline'";
-
-        private const int DefaultMaxUploadChunkSize = 104_857_600; // 100MB
-
-        private static readonly TimeSpan _defaultTemporaryFileLifeTime = TimeSpan.FromHours(1);
-
-        private readonly IShellConfiguration _shellConfiguration;
-
-        public MediaOptionsConfiguration(IShellConfiguration shellConfiguration)
-        {
-            _shellConfiguration = shellConfiguration;
-        }
+        _shellConfiguration = shellConfiguration;
+    }
 
-        public void Configure(MediaOptions options)
+    public void Configure(MediaOptions options)
+    {
+        var section = _shellConfiguration.GetSection("OrchardCore_Media");
+
+        // Because IShellConfiguration treats arrays as key value pairs, we replace the array value,
+        // rather than letting Configure merge the default array with the appsettings value.
+        options.SupportedSizes = section.GetSection("SupportedSizes")
+            .Get<int[]>()?.OrderBy(s => s).ToArray() ?? _defaultSupportedSizes;
+
+        options.AllowedFileExtensions = new HashSet<string>(
+            section.GetSection("AllowedFileExtensions").Get<string[]>() ?? _defaultAllowedFileExtensions,
+            StringComparer.OrdinalIgnoreCase);
+
+        options.MaxBrowserCacheDays = section.GetValue("MaxBrowserCacheDays", DefaultMaxBrowserCacheDays);
+        options.MaxSecureFilesBrowserCacheDays = section.GetValue("MaxSecureFilesBrowserCacheDays", DefaultSecureFilesMaxBrowserCacheDays);
+        options.MaxCacheDays = section.GetValue("MaxCacheDays", DefaultMaxCacheDays);
+        options.ResizedCacheMaxStale = section.GetValue<TimeSpan?>(nameof(options.ResizedCacheMaxStale));
+        options.RemoteCacheMaxStale = section.GetValue<TimeSpan?>(nameof(options.RemoteCacheMaxStale));
+        options.MaxFileSize = section.GetValue("MaxFileSize", DefaultMaxFileSize);
+        options.CdnBaseUrl = section.GetValue("CdnBaseUrl", string.Empty).TrimEnd('/').ToLower();
+        options.AssetsRequestPath = section.GetValue("AssetsRequestPath", DefaultAssetsRequestPath);
+        options.AssetsPath = section.GetValue("AssetsPath", DefaultAssetsPath);
+        options.AssetsUsersFolder = section.GetValue("AssetsUsersFolder", DefaultAssetsUsersFolder);
+        options.UseTokenizedQueryString = section.GetValue("UseTokenizedQueryString", DefaultUseTokenizedQueryString);
+        options.MaxUploadChunkSize = section.GetValue(nameof(options.MaxUploadChunkSize), DefaultMaxUploadChunkSize);
+        options.TemporaryFileLifetime = section.GetValue(nameof(options.TemporaryFileLifetime), _defaultTemporaryFileLifeTime);
+
+        var contentSecurityPolicy = section.GetValue("ContentSecurityPolicy", DefaultContentSecurityPolicy);
+
+        // Use the same cache control header as ImageSharp does for resized images.
+        var cacheControl = "public, must-revalidate, max-age=" + TimeSpan.FromDays(options.MaxBrowserCacheDays).TotalSeconds.ToString();
+        // Secure files are not cached at all.
+        var secureCacheControl = options.MaxSecureFilesBrowserCacheDays == 0
+            ? "no-store"
+            : "public, must-revalidate, max-age=" + TimeSpan.FromDays(options.MaxSecureFilesBrowserCacheDays).TotalSeconds.ToString();
+
+        options.StaticFileOptions = new StaticFileOptions
         {
-            var section = _shellConfiguration.GetSection("OrchardCore_Media");
-
-            // Because IShellConfiguration treats arrays as key value pairs, we replace the array value,
-            // rather than letting Configure merge the default array with the appsettings value.
-            options.SupportedSizes = section.GetSection("SupportedSizes")
-                .Get<int[]>()?.OrderBy(s => s).ToArray() ?? _defaultSupportedSizes;
-
-            options.AllowedFileExtensions = new HashSet<string>(
-                section.GetSection("AllowedFileExtensions").Get<string[]>() ?? _defaultAllowedFileExtensions,
-                StringComparer.OrdinalIgnoreCase);
-
-            options.MaxBrowserCacheDays = section.GetValue("MaxBrowserCacheDays", DefaultMaxBrowserCacheDays);
-            options.MaxSecureFilesBrowserCacheDays = section.GetValue("MaxSecureFilesBrowserCacheDays", DefaultSecureFilesMaxBrowserCacheDays);
-            options.MaxCacheDays = section.GetValue("MaxCacheDays", DefaultMaxCacheDays);
-            options.ResizedCacheMaxStale = section.GetValue<TimeSpan?>(nameof(options.ResizedCacheMaxStale));
-            options.RemoteCacheMaxStale = section.GetValue<TimeSpan?>(nameof(options.RemoteCacheMaxStale));
-            options.MaxFileSize = section.GetValue("MaxFileSize", DefaultMaxFileSize);
-            options.CdnBaseUrl = section.GetValue("CdnBaseUrl", string.Empty).TrimEnd('/').ToLower();
-            options.AssetsRequestPath = section.GetValue("AssetsRequestPath", DefaultAssetsRequestPath);
-            options.AssetsPath = section.GetValue("AssetsPath", DefaultAssetsPath);
-            options.AssetsUsersFolder = section.GetValue("AssetsUsersFolder", DefaultAssetsUsersFolder);
-            options.UseTokenizedQueryString = section.GetValue("UseTokenizedQueryString", DefaultUseTokenizedQueryString);
-            options.MaxUploadChunkSize = section.GetValue(nameof(options.MaxUploadChunkSize), DefaultMaxUploadChunkSize);
-            options.TemporaryFileLifetime = section.GetValue(nameof(options.TemporaryFileLifetime), _defaultTemporaryFileLifeTime);
-
-            var contentSecurityPolicy = section.GetValue("ContentSecurityPolicy", DefaultContentSecurityPolicy);
-
-            // Use the same cache control header as ImageSharp does for resized images.
-            var cacheControl = "public, must-revalidate, max-age=" + TimeSpan.FromDays(options.MaxBrowserCacheDays).TotalSeconds.ToString();
-            // Secure files are not cached at all.
-            var secureCacheControl = options.MaxSecureFilesBrowserCacheDays == 0
-                ? "no-store"
-                : "public, must-revalidate, max-age=" + TimeSpan.FromDays(options.MaxSecureFilesBrowserCacheDays).TotalSeconds.ToString();
-
-            options.StaticFileOptions = new StaticFileOptions
+            RequestPath = options.AssetsRequestPath,
+            ServeUnknownFileTypes = true,
+            OnPrepareResponse = ctx =>
             {
-                RequestPath = options.AssetsRequestPath,
-                ServeUnknownFileTypes = true,
-                OnPrepareResponse = ctx =>
-                {
-                    ctx.Context.Response.Headers.CacheControl = ctx.Context.IsSecureMediaRequested() ? secureCacheControl : cacheControl;
-                    ctx.Context.Response.Headers.ContentSecurityPolicy = contentSecurityPolicy;
-                }
-            };
-        }
+                ctx.Context.Response.Headers.CacheControl = ctx.Context.IsSecureMediaRequested() ? secureCacheControl : cacheControl;
+                ctx.Context.Response.Headers.ContentSecurityPolicy = contentSecurityPolicy;
+            }
+        };
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaProfileService.cs b/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaProfileService.cs
index 07772fa1485..bca0a700d4d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaProfileService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaProfileService.cs
@@ -2,62 +2,61 @@
 using System.Threading.Tasks;
 using OrchardCore.Media.Processing;
 
-namespace OrchardCore.Media.Services
+namespace OrchardCore.Media.Services;
+
+public class MediaProfileService : IMediaProfileService
 {
-    public class MediaProfileService : IMediaProfileService
+    private static readonly IDictionary<string, string> _nullProfile = new Dictionary<string, string>();
+    private readonly MediaProfilesManager _mediaProfilesManager;
+
+    public MediaProfileService(MediaProfilesManager mediaProfilesManager)
     {
-        private static readonly IDictionary<string, string> _nullProfile = new Dictionary<string, string>();
-        private readonly MediaProfilesManager _mediaProfilesManager;
+        _mediaProfilesManager = mediaProfilesManager;
+    }
 
-        public MediaProfileService(MediaProfilesManager mediaProfilesManager)
-        {
-            _mediaProfilesManager = mediaProfilesManager;
-        }
+    public async Task<IDictionary<string, string>> GetMediaProfileCommands(string name)
+    {
+        var mediaProfilesDocument = await _mediaProfilesManager.GetMediaProfilesDocumentAsync();
 
-        public async Task<IDictionary<string, string>> GetMediaProfileCommands(string name)
+        if (mediaProfilesDocument.MediaProfiles.TryGetValue(name, out var mediaProfile))
         {
-            var mediaProfilesDocument = await _mediaProfilesManager.GetMediaProfilesDocumentAsync();
+            var commands = new Dictionary<string, string>();
+            if (mediaProfile.Width > 0)
+            {
+                commands["width"] = mediaProfile.Width.ToString();
+            }
 
-            if (mediaProfilesDocument.MediaProfiles.TryGetValue(name, out var mediaProfile))
+            if (mediaProfile.Height > 0)
             {
-                var commands = new Dictionary<string, string>();
-                if (mediaProfile.Width > 0)
-                {
-                    commands["width"] = mediaProfile.Width.ToString();
-                }
-
-                if (mediaProfile.Height > 0)
-                {
-                    commands["height"] = mediaProfile.Height.ToString();
-                }
-
-                if (mediaProfile.Mode != ResizeMode.Undefined)
-                {
-                    commands["rmode"] = mediaProfile.Mode.ToString().ToLower();
-                }
-
-                if (mediaProfile.Format != Format.Undefined)
-                {
-                    commands["format"] = mediaProfile.Format.ToString().ToLower();
-                }
-
-                if (mediaProfile.Quality > 0 && mediaProfile.Quality < 100)
-                {
-                    commands["quality"] = mediaProfile.Quality.ToString();
-                }
-
-                if (!string.IsNullOrEmpty(mediaProfile.BackgroundColor))
-                {
-                    commands["bgcolor"] = mediaProfile.BackgroundColor;
-                }
-
-                return commands;
+                commands["height"] = mediaProfile.Height.ToString();
             }
-            else
+
+            if (mediaProfile.Mode != ResizeMode.Undefined)
             {
-                return _nullProfile;
+                commands["rmode"] = mediaProfile.Mode.ToString().ToLower();
+            }
 
+            if (mediaProfile.Format != Format.Undefined)
+            {
+                commands["format"] = mediaProfile.Format.ToString().ToLower();
             }
+
+            if (mediaProfile.Quality > 0 && mediaProfile.Quality < 100)
+            {
+                commands["quality"] = mediaProfile.Quality.ToString();
+            }
+
+            if (!string.IsNullOrEmpty(mediaProfile.BackgroundColor))
+            {
+                commands["bgcolor"] = mediaProfile.BackgroundColor;
+            }
+
+            return commands;
+        }
+        else
+        {
+            return _nullProfile;
+
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaProfilesManager.cs b/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaProfilesManager.cs
index 3524939724e..dcd85b152a1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaProfilesManager.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Services/MediaProfilesManager.cs
@@ -2,36 +2,35 @@
 using OrchardCore.Documents;
 using OrchardCore.Media.Models;
 
-namespace OrchardCore.Media.Services
+namespace OrchardCore.Media.Services;
+
+public class MediaProfilesManager
 {
-    public class MediaProfilesManager
-    {
-        private readonly IDocumentManager<MediaProfilesDocument> _documentManager;
+    private readonly IDocumentManager<MediaProfilesDocument> _documentManager;
 
-        public MediaProfilesManager(IDocumentManager<MediaProfilesDocument> documentManager) => _documentManager = documentManager;
+    public MediaProfilesManager(IDocumentManager<MediaProfilesDocument> documentManager) => _documentManager = documentManager;
 
-        /// <summary>
-        /// Loads the media profiles document from the store for updating and that should not be cached.
-        /// </summary>
-        public Task<MediaProfilesDocument> LoadMediaProfilesDocumentAsync() => _documentManager.GetOrCreateMutableAsync();
+    /// <summary>
+    /// Loads the media profiles document from the store for updating and that should not be cached.
+    /// </summary>
+    public Task<MediaProfilesDocument> LoadMediaProfilesDocumentAsync() => _documentManager.GetOrCreateMutableAsync();
 
-        /// <summary>
-        /// Gets the media profiles document from the cache for sharing and that should not be updated.
-        /// </summary>
-        public Task<MediaProfilesDocument> GetMediaProfilesDocumentAsync() => _documentManager.GetOrCreateImmutableAsync();
+    /// <summary>
+    /// Gets the media profiles document from the cache for sharing and that should not be updated.
+    /// </summary>
+    public Task<MediaProfilesDocument> GetMediaProfilesDocumentAsync() => _documentManager.GetOrCreateImmutableAsync();
 
-        public async Task RemoveMediaProfileAsync(string name)
-        {
-            var document = await LoadMediaProfilesDocumentAsync();
-            document.MediaProfiles.Remove(name);
-            await _documentManager.UpdateAsync(document);
-        }
+    public async Task RemoveMediaProfileAsync(string name)
+    {
+        var document = await LoadMediaProfilesDocumentAsync();
+        document.MediaProfiles.Remove(name);
+        await _documentManager.UpdateAsync(document);
+    }
 
-        public async Task UpdateMediaProfileAsync(string name, MediaProfile mediaProfile)
-        {
-            var document = await LoadMediaProfilesDocumentAsync();
-            document.MediaProfiles[name.ToLower()] = mediaProfile;
-            await _documentManager.UpdateAsync(document);
-        }
+    public async Task UpdateMediaProfileAsync(string name, MediaProfile mediaProfile)
+    {
+        var document = await LoadMediaProfilesDocumentAsync();
+        document.MediaProfiles[name.ToLower()] = mediaProfile;
+        await _documentManager.UpdateAsync(document);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Services/NullMediaNameNormalizerService.cs b/src/OrchardCore.Modules/OrchardCore.Media/Services/NullMediaNameNormalizerService.cs
index 5baf5d4f5c7..53bf4f5becb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Services/NullMediaNameNormalizerService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Services/NullMediaNameNormalizerService.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Media.Services
+namespace OrchardCore.Media.Services;
+
+public class NullMediaNameNormalizerService : IMediaNameNormalizerService
 {
-    public class NullMediaNameNormalizerService : IMediaNameNormalizerService
-    {
-        public string NormalizeFolderName(string folderName) => folderName;
+    public string NormalizeFolderName(string folderName) => folderName;
 
-        public string NormalizeFileName(string fileName) => fileName;
-    }
+    public string NormalizeFileName(string fileName) => fileName;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Services/SecureMediaExtensions.cs b/src/OrchardCore.Modules/OrchardCore.Media/Services/SecureMediaExtensions.cs
index 89136080bd6..c4bc09319f1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Services/SecureMediaExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Services/SecureMediaExtensions.cs
@@ -1,22 +1,21 @@
-using System;
+using System;
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Media.Services
+namespace OrchardCore.Media.Services;
+
+internal static class SecureMediaExtensions
 {
-    internal static class SecureMediaExtensions
-    {
-        private const string IsSecureMediaKey = "IsSecureMedia";
+    private const string IsSecureMediaKey = "IsSecureMedia";
 
-        public static bool IsSecureMediaEnabled(this IServiceProvider serviceProvider)
-            => serviceProvider.GetService(typeof(SecureMediaMarker)) is not null;
+    public static bool IsSecureMediaEnabled(this IServiceProvider serviceProvider)
+        => serviceProvider.GetService(typeof(SecureMediaMarker)) is not null;
 
-        public static bool IsSecureMediaEnabled(this HttpContext httpContext)
-            => httpContext.RequestServices.IsSecureMediaEnabled();
+    public static bool IsSecureMediaEnabled(this HttpContext httpContext)
+        => httpContext.RequestServices.IsSecureMediaEnabled();
 
-        public static bool IsSecureMediaRequested(this HttpContext httpContext)
-            => httpContext.Items.ContainsKey(IsSecureMediaKey);
+    public static bool IsSecureMediaRequested(this HttpContext httpContext)
+        => httpContext.Items.ContainsKey(IsSecureMediaKey);
 
-        public static void MarkAsSecureMediaRequested(this HttpContext httpContext)
-            => httpContext.Items[IsSecureMediaKey] = bool.TrueString;
-    }
+    public static void MarkAsSecureMediaRequested(this HttpContext httpContext)
+        => httpContext.Items[IsSecureMediaKey] = bool.TrueString;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Services/SecureMediaMarker.cs b/src/OrchardCore.Modules/OrchardCore.Media/Services/SecureMediaMarker.cs
index 4e552bcfc01..2496468414c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Services/SecureMediaMarker.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Services/SecureMediaMarker.cs
@@ -1,4 +1,3 @@
-namespace OrchardCore.Media.Services
-{
-    internal sealed class SecureMediaMarker { }
-}
+namespace OrchardCore.Media.Services;
+
+internal sealed class SecureMediaMarker { }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Services/SecureMediaMiddleware.cs b/src/OrchardCore.Modules/OrchardCore.Media/Services/SecureMediaMiddleware.cs
index 8ceb738c472..0cebf264f0e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Services/SecureMediaMiddleware.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Services/SecureMediaMiddleware.cs
@@ -6,50 +6,49 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Routing;
 
-namespace OrchardCore.Media.Services
+namespace OrchardCore.Media.Services;
+
+public class SecureMediaMiddleware
 {
-    public class SecureMediaMiddleware
+    private readonly RequestDelegate _next;
+    private readonly PathString _assetsRequestPath;
+
+    public SecureMediaMiddleware(
+        RequestDelegate next,
+        IOptions<MediaOptions> mediaOptions)
     {
-        private readonly RequestDelegate _next;
-        private readonly PathString _assetsRequestPath;
+        _next = next;
+        _assetsRequestPath = mediaOptions.Value.AssetsRequestPath;
+    }
 
-        public SecureMediaMiddleware(
-            RequestDelegate next,
-            IOptions<MediaOptions> mediaOptions)
+    public async Task Invoke(HttpContext context, IAuthorizationService authorizationService, IAuthenticationService authenticationService)
+    {
+        var validateAssetsRequestPath = context.Request.Path.StartsWithNormalizedSegments(_assetsRequestPath, StringComparison.OrdinalIgnoreCase, out var subPath);
+        if (!validateAssetsRequestPath)
         {
-            _next = next;
-            _assetsRequestPath = mediaOptions.Value.AssetsRequestPath;
+            await _next(context);
+
+            return;
         }
 
-        public async Task Invoke(HttpContext context, IAuthorizationService authorizationService, IAuthenticationService authenticationService)
+        if (!(context.User.Identity?.IsAuthenticated ?? false))
         {
-            var validateAssetsRequestPath = context.Request.Path.StartsWithNormalizedSegments(_assetsRequestPath, StringComparison.OrdinalIgnoreCase, out var subPath);
-            if (!validateAssetsRequestPath)
-            {
-                await _next(context);
-
-                return;
-            }
+            // Allow bearer (API) authentication too.
+            var authenticateResult = await authenticationService.AuthenticateAsync(context, "Api");
 
-            if (!(context.User.Identity?.IsAuthenticated ?? false))
+            if (authenticateResult.Succeeded)
             {
-                // Allow bearer (API) authentication too.
-                var authenticateResult = await authenticationService.AuthenticateAsync(context, "Api");
-
-                if (authenticateResult.Succeeded)
-                {
-                    context.User = authenticateResult.Principal;
-                }
+                context.User = authenticateResult.Principal;
             }
+        }
 
-            if (await authorizationService.AuthorizeAsync(context.User, SecureMediaPermissions.ViewMedia, (object)subPath.ToString()))
-            {
-                await _next(context);
-            }
-            else
-            {
-                context.Response.StatusCode = StatusCodes.Status404NotFound;
-            }
+        if (await authorizationService.AuthorizeAsync(context.User, SecureMediaPermissions.ViewMedia, (object)subPath.ToString()))
+        {
+            await _next(context);
+        }
+        else
+        {
+            context.Response.StatusCode = StatusCodes.Status404NotFound;
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Services/SlugifyMediaNameNormalizerService.cs b/src/OrchardCore.Modules/OrchardCore.Media/Services/SlugifyMediaNameNormalizerService.cs
index b6f7697e364..9e092557ef9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Services/SlugifyMediaNameNormalizerService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Services/SlugifyMediaNameNormalizerService.cs
@@ -1,25 +1,24 @@
 using System.IO;
 using OrchardCore.Modules.Services;
 
-namespace OrchardCore.Media.Services
+namespace OrchardCore.Media.Services;
+
+public class SlugifyMediaNameNormalizerService : IMediaNameNormalizerService
 {
-    public class SlugifyMediaNameNormalizerService : IMediaNameNormalizerService
-    {
-        private readonly ISlugService _slugService;
+    private readonly ISlugService _slugService;
 
-        public SlugifyMediaNameNormalizerService(ISlugService slugService)
-        {
-            _slugService = slugService;
-        }
+    public SlugifyMediaNameNormalizerService(ISlugService slugService)
+    {
+        _slugService = slugService;
+    }
 
-        public string NormalizeFolderName(string folderName)
-        {
-            return _slugService.Slugify(folderName);
-        }
+    public string NormalizeFolderName(string folderName)
+    {
+        return _slugService.Slugify(folderName);
+    }
 
-        public string NormalizeFileName(string fileName)
-        {
-            return _slugService.Slugify(Path.GetFileNameWithoutExtension(fileName)) + Path.GetExtension(fileName);
-        }
+    public string NormalizeFileName(string fileName)
+    {
+        return _slugService.Slugify(Path.GetFileNameWithoutExtension(fileName)) + Path.GetExtension(fileName);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Services/TempDirCleanerService.cs b/src/OrchardCore.Modules/OrchardCore.Media/Services/TempDirCleanerService.cs
index abcecb5b2f8..74362956365 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Services/TempDirCleanerService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Services/TempDirCleanerService.cs
@@ -4,55 +4,54 @@
 using OrchardCore.Environment.Shell;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Media.Services
+namespace OrchardCore.Media.Services;
+
+public class TempDirCleanerService : ModularTenantEvents
 {
-    public class TempDirCleanerService : ModularTenantEvents
-    {
-        private readonly IMediaFileStore _fileStore;
-        private readonly AttachedMediaFieldFileService _attachedMediaFieldFileService;
-        private readonly ShellSettings _shellSettings;
-        private readonly ILogger _logger;
+    private readonly IMediaFileStore _fileStore;
+    private readonly AttachedMediaFieldFileService _attachedMediaFieldFileService;
+    private readonly ShellSettings _shellSettings;
+    private readonly ILogger _logger;
 
-        public TempDirCleanerService(IMediaFileStore fileStore,
-            AttachedMediaFieldFileService attachedMediaFieldFileService,
-            ShellSettings shellSettings,
-            ILogger<TempDirCleanerService> logger)
-        {
-            _fileStore = fileStore;
-            _attachedMediaFieldFileService = attachedMediaFieldFileService;
-            _shellSettings = shellSettings;
-            _logger = logger;
-        }
+    public TempDirCleanerService(IMediaFileStore fileStore,
+        AttachedMediaFieldFileService attachedMediaFieldFileService,
+        ShellSettings shellSettings,
+        ILogger<TempDirCleanerService> logger)
+    {
+        _fileStore = fileStore;
+        _attachedMediaFieldFileService = attachedMediaFieldFileService;
+        _shellSettings = shellSettings;
+        _logger = logger;
+    }
 
-        public override async Task ActivatedAsync()
+    public override async Task ActivatedAsync()
+    {
+        if (_shellSettings.IsRunning())
         {
-            if (_shellSettings.IsRunning())
+            try
             {
-                try
+                var tempDir = _attachedMediaFieldFileService.MediaFieldsTempSubFolder;
+
+                if (await _fileStore.GetDirectoryInfoAsync(tempDir) == null)
                 {
-                    var tempDir = _attachedMediaFieldFileService.MediaFieldsTempSubFolder;
+                    return;
+                }
 
-                    if (await _fileStore.GetDirectoryInfoAsync(tempDir) == null)
-                    {
-                        return;
-                    }
+                await foreach (var c in _fileStore.GetDirectoryContentAsync(tempDir))
+                {
+                    var result = c.IsDirectory ?
+                        await _fileStore.TryDeleteDirectoryAsync(c.Path)
+                        : await _fileStore.TryDeleteFileAsync(c.Path);
 
-                    await foreach (var c in _fileStore.GetDirectoryContentAsync(tempDir))
+                    if (!result)
                     {
-                        var result = c.IsDirectory ?
-                            await _fileStore.TryDeleteDirectoryAsync(c.Path)
-                            : await _fileStore.TryDeleteFileAsync(c.Path);
-
-                        if (!result)
-                        {
-                            _logger.LogWarning("Temporary entry {Path} could not be deleted.", c.Path);
-                        }
+                        _logger.LogWarning("Temporary entry {Path} could not be deleted.", c.Path);
                     }
                 }
-                catch (Exception e)
-                {
-                    _logger.LogError(e, "An error occurred while cleaning temporary media folder.");
-                }
+            }
+            catch (Exception e)
+            {
+                _logger.LogError(e, "An error occurred while cleaning temporary media folder.");
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Services/ViewMediaFolderAuthorizationHandler.cs b/src/OrchardCore.Modules/OrchardCore.Media/Services/ViewMediaFolderAuthorizationHandler.cs
index f5dfe038346..e57fa97a929 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Services/ViewMediaFolderAuthorizationHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Services/ViewMediaFolderAuthorizationHandler.cs
@@ -11,221 +11,220 @@
 using OrchardCore.Security;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Media.Services
+namespace OrchardCore.Media.Services;
+
+/// <summary>
+/// Checks if the user has related permission to view media in the path resource which is passed from AuthorizationHandler.
+/// </summary>
+public class ViewMediaFolderAuthorizationHandler : AuthorizationHandler<PermissionRequirement>
 {
-    /// <summary>
-    /// Checks if the user has related permission to view media in the path resource which is passed from AuthorizationHandler.
-    /// </summary>
-    public class ViewMediaFolderAuthorizationHandler : AuthorizationHandler<PermissionRequirement>
+    private const char PathSeparator = '/';
+
+    private static readonly ClaimsPrincipal _anonymous = new ClaimsPrincipal(new ClaimsIdentity());
+
+    private readonly IServiceProvider _serviceProvider;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IContentManager _contentManager;
+    private readonly IMediaFileStore _fileStore;
+    private readonly IUserAssetFolderNameProvider _userAssetFolderNameProvider;
+    private readonly MediaOptions _mediaOptions;
+    private readonly string _mediaFieldsFolder;
+    private readonly string _usersFolder;
+
+    public ViewMediaFolderAuthorizationHandler(
+        IServiceProvider serviceProvider,
+        IHttpContextAccessor httpContextAccessor,
+        AttachedMediaFieldFileService attachedMediaFieldFileService,
+        IMediaFileStore fileStore,
+        IOptions<MediaOptions> options,
+        IUserAssetFolderNameProvider userAssetFolderNameProvider,
+        IContentManager contentManager)
     {
-        private const char PathSeparator = '/';
-
-        private static readonly ClaimsPrincipal _anonymous = new ClaimsPrincipal(new ClaimsIdentity());
-
-        private readonly IServiceProvider _serviceProvider;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IContentManager _contentManager;
-        private readonly IMediaFileStore _fileStore;
-        private readonly IUserAssetFolderNameProvider _userAssetFolderNameProvider;
-        private readonly MediaOptions _mediaOptions;
-        private readonly string _mediaFieldsFolder;
-        private readonly string _usersFolder;
-
-        public ViewMediaFolderAuthorizationHandler(
-            IServiceProvider serviceProvider,
-            IHttpContextAccessor httpContextAccessor,
-            AttachedMediaFieldFileService attachedMediaFieldFileService,
-            IMediaFileStore fileStore,
-            IOptions<MediaOptions> options,
-            IUserAssetFolderNameProvider userAssetFolderNameProvider,
-            IContentManager contentManager)
+        _serviceProvider = serviceProvider;
+        _httpContextAccessor = httpContextAccessor;
+        _fileStore = fileStore;
+        _userAssetFolderNameProvider = userAssetFolderNameProvider;
+        _contentManager = contentManager;
+        _mediaOptions = options.Value;
+        _mediaFieldsFolder = EnsureTrailingSlash(attachedMediaFieldFileService.MediaFieldsFolder);
+        _usersFolder = EnsureTrailingSlash(_mediaOptions.AssetsUsersFolder);
+    }
+
+    protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement)
+    {
+        if (context.HasSucceeded)
         {
-            _serviceProvider = serviceProvider;
-            _httpContextAccessor = httpContextAccessor;
-            _fileStore = fileStore;
-            _userAssetFolderNameProvider = userAssetFolderNameProvider;
-            _contentManager = contentManager;
-            _mediaOptions = options.Value;
-            _mediaFieldsFolder = EnsureTrailingSlash(attachedMediaFieldFileService.MediaFieldsFolder);
-            _usersFolder = EnsureTrailingSlash(_mediaOptions.AssetsUsersFolder);
+            // This handler is not revoking any pre-existing grants.
+            return;
         }
 
-        protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement)
+        if (requirement.Permission.Name != SecureMediaPermissions.ViewMedia.Name)
         {
-            if (context.HasSucceeded)
-            {
-                // This handler is not revoking any pre-existing grants.
-                return;
-            }
+            return;
+        }
 
-            if (requirement.Permission.Name != SecureMediaPermissions.ViewMedia.Name)
-            {
-                return;
-            }
+        if (context.Resource is not string path)
+        {
+            return;
+        }
+
+        path = Uri.UnescapeDataString(path);
+
+        path = _fileStore.NormalizePath(path);
 
-            if (context.Resource is not string path)
+        // Permissions are only set for the root and the first folder tier. Only for users and
+        // media fields we will check sub folders too.
+        var i = path.IndexOf(PathSeparator);
+        var folderPath = i >= 0 ? path[..i] : path;
+        var directory = await _fileStore.GetDirectoryInfoAsync(folderPath);
+        if (directory is null && path.IndexOf(PathSeparator, folderPath.Length) < 0)
+        {
+            // This could be a new directory, or a new or existing file in the root folder. As we cannot directly determine
+            // whether a file is uploaded or a new directory is created, we will check against the list of allowed extensions.
+            // If none is matched, we assume a new directory is created, otherwise we will check the root access only.
+            // Note: The file path is currently not authorized during upload, only the folder is checked. Therefore checking 
+            // the file extensions is not actually required, but let's leave this in case we add an authorization call later.
+            if (await _fileStore.GetFileInfoAsync(folderPath) is not null ||
+               _mediaOptions.AllowedFileExtensions.Any(ext => path.EndsWith(ext, StringComparison.OrdinalIgnoreCase)))
             {
-                return;
+                path = string.Empty;
             }
+        }
 
-            path = Uri.UnescapeDataString(path);
+        if (IsAuthorizedFolder("/", path))
+        {
+            await AuthorizeAsync(context, requirement, SecureMediaPermissions.ViewRootMedia);
 
-            path = _fileStore.NormalizePath(path);
+            return;
+        }
 
-            // Permissions are only set for the root and the first folder tier. Only for users and
-            // media fields we will check sub folders too.
-            var i = path.IndexOf(PathSeparator);
-            var folderPath = i >= 0 ? path[..i] : path;
-            var directory = await _fileStore.GetDirectoryInfoAsync(folderPath);
-            if (directory is null && path.IndexOf(PathSeparator, folderPath.Length) < 0)
-            {
-                // This could be a new directory, or a new or existing file in the root folder. As we cannot directly determine
-                // whether a file is uploaded or a new directory is created, we will check against the list of allowed extensions.
-                // If none is matched, we assume a new directory is created, otherwise we will check the root access only.
-                // Note: The file path is currently not authorized during upload, only the folder is checked. Therefore checking 
-                // the file extensions is not actually required, but let's leave this in case we add an authorization call later.
-                if (await _fileStore.GetFileInfoAsync(folderPath) is not null ||
-                   _mediaOptions.AllowedFileExtensions.Any(ext => path.EndsWith(ext, StringComparison.OrdinalIgnoreCase)))
-                {
-                    path = string.Empty;
-                }
-            }
+        if (IsAuthorizedFolder(_mediaFieldsFolder, path) || IsDescendantOfAuthorizedFolder(_mediaFieldsFolder, path))
+        {
+            await AuthorizeAttachedMediaFieldsFolderAsync(context, requirement, path);
 
-            if (IsAuthorizedFolder("/", path))
-            {
-                await AuthorizeAsync(context, requirement, SecureMediaPermissions.ViewRootMedia);
+            return;
+        }
 
-                return;
-            }
+        if (IsAuthorizedFolder(_usersFolder, path) || IsDescendantOfAuthorizedFolder(_usersFolder, path))
+        {
+            await AuthorizeUsersFolderAsync(context, requirement, path);
 
-            if (IsAuthorizedFolder(_mediaFieldsFolder, path) || IsDescendantOfAuthorizedFolder(_mediaFieldsFolder, path))
-            {
-                await AuthorizeAttachedMediaFieldsFolderAsync(context, requirement, path);
+            return;
+        }
 
-                return;
-            }
+        // Create a dynamic permission for the folder path. This allows to give access to a specific folders only.
+        var template = SecureMediaPermissions.ConvertToDynamicPermission(SecureMediaPermissions.ViewMedia);
+        if (template != null)
+        {
+            var permission = SecureMediaPermissions.CreateDynamicPermission(template, folderPath);
+            await AuthorizeAsync(context, requirement, permission);
+        }
+        else
+        {
+            // Not a secure file
+            context.Succeed(requirement);
+        }
+    }
 
-            if (IsAuthorizedFolder(_usersFolder, path) || IsDescendantOfAuthorizedFolder(_usersFolder, path))
-            {
-                await AuthorizeUsersFolderAsync(context, requirement, path);
+    private async Task AuthorizeAttachedMediaFieldsFolderAsync(AuthorizationHandlerContext context, PermissionRequirement requirement, string path)
+    {
+        var attachedMediaPathParts = path
+            .Substring(_mediaFieldsFolder.Length - 1)
+            .Split(PathSeparator, 3, StringSplitOptions.RemoveEmptyEntries);
 
-                return;
-            }
+        // Don't allow 'mediafields' directly.
+        if (attachedMediaPathParts.Length == 0)
+            return;
+
+        if (string.Equals(attachedMediaPathParts[0], "temp", StringComparison.OrdinalIgnoreCase))
+        {
+            // Authorize per-user temporary files
+            var userId = attachedMediaPathParts.Length > 1 ? attachedMediaPathParts[1] : null;
+            var userAssetsFolderName = EnsureTrailingSlash(_userAssetFolderNameProvider.GetUserAssetFolderName(context.User));
 
-            // Create a dynamic permission for the folder path. This allows to give access to a specific folders only.
-            var template = SecureMediaPermissions.ConvertToDynamicPermission(SecureMediaPermissions.ViewMedia);
-            if (template != null)
+            if (IsAuthorizedFolder(userAssetsFolderName, userId))
             {
-                var permission = SecureMediaPermissions.CreateDynamicPermission(template, folderPath);
-                await AuthorizeAsync(context, requirement, permission);
+                await AuthorizeAsync(context, requirement, SecureMediaPermissions.ViewOwnMedia);
             }
             else
             {
-                // Not a secure file
-                context.Succeed(requirement);
+                await AuthorizeAsync(context, requirement, SecureMediaPermissions.ViewOthersMedia);
             }
         }
-
-        private async Task AuthorizeAttachedMediaFieldsFolderAsync(AuthorizationHandlerContext context, PermissionRequirement requirement, string path)
+        else
         {
-            var attachedMediaPathParts = path
-                .Substring(_mediaFieldsFolder.Length - 1)
-                .Split(PathSeparator, 3, StringSplitOptions.RemoveEmptyEntries);
-
-            // Don't allow 'mediafields' directly.
-            if (attachedMediaPathParts.Length == 0)
-                return;
+            // Authorize by using the content item permission. The user must have access to the content item to allow its media
+            // as well.
+            var contentItemId = attachedMediaPathParts.Length > 1 ? attachedMediaPathParts[1] : null;
+            var contentItem = !string.IsNullOrEmpty(contentItemId) ? await _contentManager.GetAsync(contentItemId) : null;
 
-            if (string.Equals(attachedMediaPathParts[0], "temp", StringComparison.OrdinalIgnoreCase))
-            {
-                // Authorize per-user temporary files
-                var userId = attachedMediaPathParts.Length > 1 ? attachedMediaPathParts[1] : null;
-                var userAssetsFolderName = EnsureTrailingSlash(_userAssetFolderNameProvider.GetUserAssetFolderName(context.User));
-
-                if (IsAuthorizedFolder(userAssetsFolderName, userId))
-                {
-                    await AuthorizeAsync(context, requirement, SecureMediaPermissions.ViewOwnMedia);
-                }
-                else
-                {
-                    await AuthorizeAsync(context, requirement, SecureMediaPermissions.ViewOthersMedia);
-                }
-            }
-            else
+            // Disallow if content item is not found or allowed
+            if (contentItem is not null)
             {
-                // Authorize by using the content item permission. The user must have access to the content item to allow its media
-                // as well.
-                var contentItemId = attachedMediaPathParts.Length > 1 ? attachedMediaPathParts[1] : null;
-                var contentItem = !string.IsNullOrEmpty(contentItemId) ? await _contentManager.GetAsync(contentItemId) : null;
-
-                // Disallow if content item is not found or allowed
-                if (contentItem is not null)
-                {
-                    await AuthorizeAsync(context, requirement, Contents.CommonPermissions.ViewContent, contentItem);
-                }
+                await AuthorizeAsync(context, requirement, Contents.CommonPermissions.ViewContent, contentItem);
             }
         }
+    }
 
-        private async Task AuthorizeUsersFolderAsync(AuthorizationHandlerContext context, PermissionRequirement requirement, string path)
+    private async Task AuthorizeUsersFolderAsync(AuthorizationHandlerContext context, PermissionRequirement requirement, string path)
+    {
+        // We need to allow the _Users folder for own media access too. If someone uploads into this folder, we are screwed.
+        Permission permission;
+        if (path.IndexOf(PathSeparator) < 0)
         {
-            // We need to allow the _Users folder for own media access too. If someone uploads into this folder, we are screwed.
-            Permission permission;
-            if (path.IndexOf(PathSeparator) < 0)
-            {
-                permission = SecureMediaPermissions.ViewOwnMedia;
-            }
-            else
+            permission = SecureMediaPermissions.ViewOwnMedia;
+        }
+        else
+        {
+            permission = SecureMediaPermissions.ViewOthersMedia;
+
+            var userFolderName = _userAssetFolderNameProvider.GetUserAssetFolderName(context.User);
+            if (!string.IsNullOrEmpty(userFolderName))
             {
-                permission = SecureMediaPermissions.ViewOthersMedia;
+                var userOwnFolder = EnsureTrailingSlash(_fileStore.Combine(_usersFolder, userFolderName));
 
-                var userFolderName = _userAssetFolderNameProvider.GetUserAssetFolderName(context.User);
-                if (!string.IsNullOrEmpty(userFolderName))
+                if (IsAuthorizedFolder(userOwnFolder, path) || IsDescendantOfAuthorizedFolder(userOwnFolder, path))
                 {
-                    var userOwnFolder = EnsureTrailingSlash(_fileStore.Combine(_usersFolder, userFolderName));
-
-                    if (IsAuthorizedFolder(userOwnFolder, path) || IsDescendantOfAuthorizedFolder(userOwnFolder, path))
-                    {
-                        permission = SecureMediaPermissions.ViewOwnMedia;
-                    }
+                    permission = SecureMediaPermissions.ViewOwnMedia;
                 }
             }
-
-            await AuthorizeAsync(context, requirement, permission);
         }
 
-        private async Task AuthorizeAsync(AuthorizationHandlerContext context, PermissionRequirement requirement, Permission permission, object resource = null)
-        {
-            var authorizationService = _serviceProvider.GetService<IAuthorizationService>();
-            if (await authorizationService.AuthorizeAsync(context.User, permission, resource))
-            {
-                // If anonymous access is also possible, we want to use default browser caching policies.
-                // Otherwise we set a marker which causes a different caching policy being used.
-                if ((context.User.Identity?.IsAuthenticated ?? false) && !await authorizationService.AuthorizeAsync(_anonymous, permission, resource))
-                {
-                    _httpContextAccessor.HttpContext.MarkAsSecureMediaRequested();
-                }
+        await AuthorizeAsync(context, requirement, permission);
+    }
 
-                context.Succeed(requirement);
-            }
-            else
+    private async Task AuthorizeAsync(AuthorizationHandlerContext context, PermissionRequirement requirement, Permission permission, object resource = null)
+    {
+        var authorizationService = _serviceProvider.GetService<IAuthorizationService>();
+        if (await authorizationService.AuthorizeAsync(context.User, permission, resource))
+        {
+            // If anonymous access is also possible, we want to use default browser caching policies.
+            // Otherwise we set a marker which causes a different caching policy being used.
+            if ((context.User.Identity?.IsAuthenticated ?? false) && !await authorizationService.AuthorizeAsync(_anonymous, permission, resource))
             {
-                // Note: We don't want other authorization handlers to succeed the requirement. This would allow access to the
-                // users and attached media field folders, e.g. if the anonymous role has the "ViewMedia" permission set.
-                context.Fail(new AuthorizationFailureReason(this, "View media permission not granted"));
+                _httpContextAccessor.HttpContext.MarkAsSecureMediaRequested();
             }
-        }
 
-        private static bool IsAuthorizedFolder(string authorizedFolder, string childPath)
+            context.Succeed(requirement);
+        }
+        else
         {
-            // Ensure end trailing slash. childPath is already normalized.
-            childPath += PathSeparator;
-
-            return childPath.Equals(authorizedFolder, StringComparison.OrdinalIgnoreCase);
+            // Note: We don't want other authorization handlers to succeed the requirement. This would allow access to the
+            // users and attached media field folders, e.g. if the anonymous role has the "ViewMedia" permission set.
+            context.Fail(new AuthorizationFailureReason(this, "View media permission not granted"));
         }
+    }
 
-        private static bool IsDescendantOfAuthorizedFolder(string authorizedFolder, string childPath)
-            => childPath.StartsWith(authorizedFolder, StringComparison.OrdinalIgnoreCase);
+    private static bool IsAuthorizedFolder(string authorizedFolder, string childPath)
+    {
+        // Ensure end trailing slash. childPath is already normalized.
+        childPath += PathSeparator;
 
-        private string EnsureTrailingSlash(string path) => _fileStore.NormalizePath(path) + PathSeparator;
+        return childPath.Equals(authorizedFolder, StringComparison.OrdinalIgnoreCase);
     }
+
+    private static bool IsDescendantOfAuthorizedFolder(string authorizedFolder, string childPath)
+        => childPath.StartsWith(authorizedFolder, StringComparison.OrdinalIgnoreCase);
+
+    private string EnsureTrailingSlash(string path) => _fileStore.NormalizePath(path) + PathSeparator;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Settings/MediaFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.Media/Settings/MediaFieldSettingsDriver.cs
index 96235657dfa..c03c041e79b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Settings/MediaFieldSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Settings/MediaFieldSettingsDriver.cs
@@ -13,99 +13,98 @@
 using OrchardCore.Media.ViewModels;
 using OrchardCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Media.Settings
+namespace OrchardCore.Media.Settings;
+
+public sealed class MediaFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<MediaField>
 {
-    public sealed class MediaFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<MediaField>
-    {
-        private readonly IContentTypeProvider _contentTypeProvider;
-        private readonly MediaOptions _mediaOptions;
+    private readonly IContentTypeProvider _contentTypeProvider;
+    private readonly MediaOptions _mediaOptions;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public MediaFieldSettingsDriver(
-            IContentTypeProvider contentTypeProvider,
-            IOptions<MediaOptions> mediaOptions,
-            IStringLocalizer<MediaFieldSettingsDriver> stringLocalizer)
-        {
-            _contentTypeProvider = contentTypeProvider;
-            _mediaOptions = mediaOptions.Value;
-            S = stringLocalizer;
-        }
+    public MediaFieldSettingsDriver(
+        IContentTypeProvider contentTypeProvider,
+        IOptions<MediaOptions> mediaOptions,
+        IStringLocalizer<MediaFieldSettingsDriver> stringLocalizer)
+    {
+        _contentTypeProvider = contentTypeProvider;
+        _mediaOptions = mediaOptions.Value;
+        S = stringLocalizer;
+    }
 
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+    {
+        return Initialize<MediaFieldSettingsViewModel>("MediaFieldSettings_Edit", model =>
         {
-            return Initialize<MediaFieldSettingsViewModel>("MediaFieldSettings_Edit", model =>
-            {
-                var settings = partFieldDefinition.GetSettings<MediaFieldSettings>();
+            var settings = partFieldDefinition.GetSettings<MediaFieldSettings>();
 
-                model.Hint = settings.Hint;
-                model.Required = settings.Required;
-                model.Multiple = settings.Multiple;
-                model.AllowMediaText = settings.AllowMediaText;
-                model.AllowAnchors = settings.AllowAnchors;
-                model.AllowAllDefaultMediaTypes = settings.AllowedExtensions == null || settings.AllowedExtensions.Length == 0;
+            model.Hint = settings.Hint;
+            model.Required = settings.Required;
+            model.Multiple = settings.Multiple;
+            model.AllowMediaText = settings.AllowMediaText;
+            model.AllowAnchors = settings.AllowAnchors;
+            model.AllowAllDefaultMediaTypes = settings.AllowedExtensions == null || settings.AllowedExtensions.Length == 0;
 
-                var items = new List<MediaTypeViewModel>();
-                foreach (var extension in _mediaOptions.AllowedFileExtensions)
+            var items = new List<MediaTypeViewModel>();
+            foreach (var extension in _mediaOptions.AllowedFileExtensions)
+            {
+                if (_contentTypeProvider.TryGetContentType(extension, out var contentType))
                 {
-                    if (_contentTypeProvider.TryGetContentType(extension, out var contentType))
+                    var item = new MediaTypeViewModel()
                     {
-                        var item = new MediaTypeViewModel()
-                        {
-                            Extension = extension,
-                            ContentType = contentType,
-                            IsSelected = settings.AllowedExtensions != null && settings.AllowedExtensions.Contains(extension)
-                        };
-
-                        var index = contentType.IndexOf('/');
+                        Extension = extension,
+                        ContentType = contentType,
+                        IsSelected = settings.AllowedExtensions != null && settings.AllowedExtensions.Contains(extension)
+                    };
 
-                        if (index > -1)
-                        {
-                            item.Type = contentType[..index];
-                        }
+                    var index = contentType.IndexOf('/');
 
-                        items.Add(item);
+                    if (index > -1)
+                    {
+                        item.Type = contentType[..index];
                     }
+
+                    items.Add(item);
                 }
-                model.MediaTypes = items
-                .OrderBy(vm => vm.ContentType)
-                .ToArray();
-            }).Location("Content");
-        }
+            }
+            model.MediaTypes = items
+            .OrderBy(vm => vm.ContentType)
+            .ToArray();
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        var model = new MediaFieldSettingsViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
+        var settings = new MediaFieldSettings()
         {
-            var model = new MediaFieldSettingsViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
-            var settings = new MediaFieldSettings()
-            {
-                Hint = model.Hint,
-                Required = model.Required,
-                Multiple = model.Multiple,
-                AllowMediaText = model.AllowMediaText,
-                AllowAnchors = model.AllowAnchors,
-            };
-
-            if (!model.AllowAllDefaultMediaTypes)
-            {
-                var selectedExtensions = model.MediaTypes.Where(vm => vm.IsSelected && _mediaOptions.AllowedFileExtensions.Contains(vm.Extension))
-                    .Select(x => x.Extension)
-                    .ToArray();
-
-                if (selectedExtensions.Length == 0)
-                {
-                    context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
-                }
+            Hint = model.Hint,
+            Required = model.Required,
+            Multiple = model.Multiple,
+            AllowMediaText = model.AllowMediaText,
+            AllowAnchors = model.AllowAnchors,
+        };
 
-                settings.AllowedExtensions = selectedExtensions;
-            }
+        if (!model.AllowAllDefaultMediaTypes)
+        {
+            var selectedExtensions = model.MediaTypes.Where(vm => vm.IsSelected && _mediaOptions.AllowedFileExtensions.Contains(vm.Extension))
+                .Select(x => x.Extension)
+                .ToArray();
 
-            if (context.Updater.ModelState.IsValid)
+            if (selectedExtensions.Length == 0)
             {
-                context.Builder.WithSettings(settings);
+                context.Updater.ModelState.AddModelError(Prefix, string.Empty, S["Please select at least one extension."]);
             }
 
-            return Edit(partFieldDefinition, context);
+            settings.AllowedExtensions = selectedExtensions;
         }
+
+        if (context.Updater.ModelState.IsValid)
+        {
+            context.Builder.WithSettings(settings);
+        }
+
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Shortcodes/AssetUrlShortcodeProvider.cs b/src/OrchardCore.Modules/OrchardCore.Media/Shortcodes/AssetUrlShortcodeProvider.cs
index 89eaa596c25..c3d86df4c0e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Shortcodes/AssetUrlShortcodeProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Shortcodes/AssetUrlShortcodeProvider.cs
@@ -7,100 +7,99 @@
 using OrchardCore.ResourceManagement;
 using Shortcodes;
 
-namespace OrchardCore.Media.Shortcodes
+namespace OrchardCore.Media.Shortcodes;
+
+public class AssetUrlShortcodeProvider : IShortcodeProvider
 {
-    public class AssetUrlShortcodeProvider : IShortcodeProvider
+    private readonly IMediaFileStore _mediaFileStore;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly ResourceManagementOptions _options;
+
+    public AssetUrlShortcodeProvider(
+        IMediaFileStore mediaFileStore,
+        IHttpContextAccessor httpContextAccessor,
+        IOptions<ResourceManagementOptions> options)
+    {
+        _mediaFileStore = mediaFileStore;
+        _httpContextAccessor = httpContextAccessor;
+        _options = options.Value;
+    }
+
+    public ValueTask<string> EvaluateAsync(string identifier, Arguments arguments, string content, Context context)
     {
-        private readonly IMediaFileStore _mediaFileStore;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly ResourceManagementOptions _options;
-
-        public AssetUrlShortcodeProvider(
-            IMediaFileStore mediaFileStore,
-            IHttpContextAccessor httpContextAccessor,
-            IOptions<ResourceManagementOptions> options)
+        if (!string.Equals(identifier, "asset_url", StringComparison.OrdinalIgnoreCase))
         {
-            _mediaFileStore = mediaFileStore;
-            _httpContextAccessor = httpContextAccessor;
-            _options = options.Value;
+            return new ValueTask<string>((string)null);
         }
 
-        public ValueTask<string> EvaluateAsync(string identifier, Arguments arguments, string content, Context context)
+        // Handle self closing shortcodes.
+        if (string.IsNullOrEmpty(content))
         {
-            if (!string.Equals(identifier, "asset_url", StringComparison.OrdinalIgnoreCase))
-            {
-                return new ValueTask<string>((string)null);
-            }
-
-            // Handle self closing shortcodes.
+            content = arguments.NamedOrDefault("src");
             if (string.IsNullOrEmpty(content))
             {
-                content = arguments.NamedOrDefault("src");
-                if (string.IsNullOrEmpty(content))
-                {
-                    return new ValueTask<string>("[asset_url]");
-                }
+                return new ValueTask<string>("[asset_url]");
             }
+        }
 
-            if (!content.StartsWith("//", StringComparison.Ordinal) && !content.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+        if (!content.StartsWith("//", StringComparison.Ordinal) && !content.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+        {
+            // Serve static files from virtual path.
+            if (content.StartsWith("~/", StringComparison.Ordinal))
             {
-                // Serve static files from virtual path.
-                if (content.StartsWith("~/", StringComparison.Ordinal))
+                content = _httpContextAccessor.HttpContext.Request.PathBase.Add(content[1..]).Value;
+                if (!string.IsNullOrEmpty(_options.CdnBaseUrl))
                 {
-                    content = _httpContextAccessor.HttpContext.Request.PathBase.Add(content[1..]).Value;
-                    if (!string.IsNullOrEmpty(_options.CdnBaseUrl))
-                    {
-                        content = _options.CdnBaseUrl + content;
-                    }
-                }
-                else
-                {
-                    content = content.RemoveQueryString(out var queryString);
-                    content = _mediaFileStore.MapPathToPublicUrl(content) + queryString;
+                    content = _options.CdnBaseUrl + content;
                 }
             }
-
-            if (arguments.Any())
+            else
             {
-                var queryStringParams = new Dictionary<string, string>();
-
-                var width = arguments.Named("width");
-                var height = arguments.Named("height");
-                var mode = arguments.Named("mode");
-                var quality = arguments.Named("quality");
-                var format = arguments.Named("format");
+                content = content.RemoveQueryString(out var queryString);
+                content = _mediaFileStore.MapPathToPublicUrl(content) + queryString;
+            }
+        }
 
-                if (width != null)
-                {
-                    queryStringParams.Add("width", width);
-                }
+        if (arguments.Any())
+        {
+            var queryStringParams = new Dictionary<string, string>();
 
-                if (height != null)
-                {
-                    queryStringParams.Add("height", height);
-                }
+            var width = arguments.Named("width");
+            var height = arguments.Named("height");
+            var mode = arguments.Named("mode");
+            var quality = arguments.Named("quality");
+            var format = arguments.Named("format");
 
-                if (mode != null)
-                {
-                    queryStringParams.Add("rmode", mode);
-                }
+            if (width != null)
+            {
+                queryStringParams.Add("width", width);
+            }
 
-                if (quality != null)
-                {
-                    queryStringParams.Add("quality", quality);
-                }
+            if (height != null)
+            {
+                queryStringParams.Add("height", height);
+            }
 
-                if (format != null)
-                {
-                    queryStringParams.Add("format", format);
-                }
+            if (mode != null)
+            {
+                queryStringParams.Add("rmode", mode);
+            }
 
-                content = QueryHelpers.AddQueryString(content, queryStringParams);
+            if (quality != null)
+            {
+                queryStringParams.Add("quality", quality);
             }
 
-            // This does not produce a tag, so sanitization is performed by the consumer (html body or markdown).
+            if (format != null)
+            {
+                queryStringParams.Add("format", format);
+            }
 
-            return new ValueTask<string>(content);
+            content = QueryHelpers.AddQueryString(content, queryStringParams);
         }
+
+        // This does not produce a tag, so sanitization is performed by the consumer (html body or markdown).
+
+        return new ValueTask<string>(content);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Shortcodes/ImageShortcodeProvider.cs b/src/OrchardCore.Modules/OrchardCore.Media/Shortcodes/ImageShortcodeProvider.cs
index c01540a8c06..3f226a64754 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Shortcodes/ImageShortcodeProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Shortcodes/ImageShortcodeProvider.cs
@@ -9,135 +9,134 @@
 using OrchardCore.ResourceManagement;
 using Shortcodes;
 
-namespace OrchardCore.Media.Shortcodes
+namespace OrchardCore.Media.Shortcodes;
+
+public class ImageShortcodeProvider : IShortcodeProvider
 {
-    public class ImageShortcodeProvider : IShortcodeProvider
+    private static ValueTask<string> Null => new((string)null);
+    private static ValueTask<string> ImageShortcode => new("[image]");
+    private static readonly HashSet<string> _shortcodes = new(StringComparer.OrdinalIgnoreCase)
     {
-        private static ValueTask<string> Null => new((string)null);
-        private static ValueTask<string> ImageShortcode => new("[image]");
-        private static readonly HashSet<string> _shortcodes = new(StringComparer.OrdinalIgnoreCase)
-        {
-            "image",
-            "media" // [media] is a deprecated shortcode, and can be removed in a future release.
-        };
-
-        private readonly IMediaFileStore _mediaFileStore;
-        private readonly IHtmlSanitizerService _htmlSanitizerService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly ResourceManagementOptions _options;
-        private readonly IFileVersionProvider _fileVersionProvider;
-
-        public ImageShortcodeProvider(
-            IMediaFileStore mediaFileStore,
-            IHtmlSanitizerService htmlSanitizerService,
-            IHttpContextAccessor httpContextAccessor,
-            IOptions<ResourceManagementOptions> options,
-            IFileVersionProvider fileVersionProvider)
+        "image",
+        "media" // [media] is a deprecated shortcode, and can be removed in a future release.
+    };
+
+    private readonly IMediaFileStore _mediaFileStore;
+    private readonly IHtmlSanitizerService _htmlSanitizerService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly ResourceManagementOptions _options;
+    private readonly IFileVersionProvider _fileVersionProvider;
+
+    public ImageShortcodeProvider(
+        IMediaFileStore mediaFileStore,
+        IHtmlSanitizerService htmlSanitizerService,
+        IHttpContextAccessor httpContextAccessor,
+        IOptions<ResourceManagementOptions> options,
+        IFileVersionProvider fileVersionProvider)
+    {
+        _mediaFileStore = mediaFileStore;
+        _htmlSanitizerService = htmlSanitizerService;
+        _httpContextAccessor = httpContextAccessor;
+        _options = options.Value;
+        _fileVersionProvider = fileVersionProvider;
+    }
+
+    public ValueTask<string> EvaluateAsync(string identifier, Arguments arguments, string content, Context context)
+    {
+        if (!_shortcodes.Contains(identifier))
         {
-            _mediaFileStore = mediaFileStore;
-            _htmlSanitizerService = htmlSanitizerService;
-            _httpContextAccessor = httpContextAccessor;
-            _options = options.Value;
-            _fileVersionProvider = fileVersionProvider;
+            return Null;
         }
 
-        public ValueTask<string> EvaluateAsync(string identifier, Arguments arguments, string content, Context context)
+        // Handle self closing shortcodes.
+        if (string.IsNullOrEmpty(content))
         {
-            if (!_shortcodes.Contains(identifier))
+            content = arguments.NamedOrDefault("src");
+            if (string.IsNullOrEmpty(content))
             {
-                return Null;
+                // Do not handle the deprecated media shortcode in this edge case.
+                return ImageShortcode;
             }
+        }
 
-            // Handle self closing shortcodes.
-            if (string.IsNullOrEmpty(content))
+        if (!content.StartsWith("//", StringComparison.Ordinal) && !content.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+        {
+            // Serve static files from virtual path.
+            if (content.StartsWith("~/", StringComparison.Ordinal))
             {
-                content = arguments.NamedOrDefault("src");
-                if (string.IsNullOrEmpty(content))
+                content = _httpContextAccessor.HttpContext.Request.PathBase.Add(content[1..]).Value;
+                if (!string.IsNullOrEmpty(_options.CdnBaseUrl))
                 {
-                    // Do not handle the deprecated media shortcode in this edge case.
-                    return ImageShortcode;
+                    content = _options.CdnBaseUrl + content;
                 }
             }
-
-            if (!content.StartsWith("//", StringComparison.Ordinal) && !content.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+            else
             {
-                // Serve static files from virtual path.
-                if (content.StartsWith("~/", StringComparison.Ordinal))
-                {
-                    content = _httpContextAccessor.HttpContext.Request.PathBase.Add(content[1..]).Value;
-                    if (!string.IsNullOrEmpty(_options.CdnBaseUrl))
-                    {
-                        content = _options.CdnBaseUrl + content;
-                    }
-                }
-                else
-                {
-                    content = content.RemoveQueryString(out var queryString);
-                    content = _mediaFileStore.MapPathToPublicUrl(content) + queryString;
-                }
+                content = content.RemoveQueryString(out var queryString);
+                content = _mediaFileStore.MapPathToPublicUrl(content) + queryString;
             }
-            var className = string.Empty;
-            var altText = string.Empty;
-            if (arguments.Any())
+        }
+        var className = string.Empty;
+        var altText = string.Empty;
+        if (arguments.Any())
+        {
+            var queryStringParams = new Dictionary<string, string>();
+
+            var width = arguments.Named("width");
+            var height = arguments.Named("height");
+            var mode = arguments.Named("mode");
+            var quality = arguments.Named("quality");
+            var format = arguments.Named("format");
+            var appendVersion = arguments.Named("append_version");
+            className = arguments.Named("class");
+            altText = arguments.Named("alt");
+
+            if (width != null)
             {
-                var queryStringParams = new Dictionary<string, string>();
-
-                var width = arguments.Named("width");
-                var height = arguments.Named("height");
-                var mode = arguments.Named("mode");
-                var quality = arguments.Named("quality");
-                var format = arguments.Named("format");
-                var appendVersion = arguments.Named("append_version");
-                className = arguments.Named("class");
-                altText = arguments.Named("alt");
-
-                if (width != null)
-                {
-                    queryStringParams.Add("width", width);
-                }
-
-                if (height != null)
-                {
-                    queryStringParams.Add("height", height);
-                }
-
-                if (mode != null)
-                {
-                    queryStringParams.Add("rmode", mode);
-                }
+                queryStringParams.Add("width", width);
+            }
 
-                if (quality != null)
-                {
-                    queryStringParams.Add("quality", quality);
-                }
+            if (height != null)
+            {
+                queryStringParams.Add("height", height);
+            }
 
-                if (format != null)
-                {
-                    queryStringParams.Add("format", format);
-                }
+            if (mode != null)
+            {
+                queryStringParams.Add("rmode", mode);
+            }
 
-                if (appendVersion?.Equals("true", StringComparison.OrdinalIgnoreCase) ?? false)
-                {
-                    content = _fileVersionProvider.AddFileVersionToPath(_httpContextAccessor.HttpContext.Request.PathBase, content);
-                }
+            if (quality != null)
+            {
+                queryStringParams.Add("quality", quality);
+            }
 
-                if (className != null)
-                {
-                    className = "class=\"" + className + "\" ";
-                }
+            if (format != null)
+            {
+                queryStringParams.Add("format", format);
+            }
 
-                if (altText != null)
-                {
-                    altText = "alt=\"" + altText + "\" ";
-                }
+            if (appendVersion?.Equals("true", StringComparison.OrdinalIgnoreCase) ?? false)
+            {
+                content = _fileVersionProvider.AddFileVersionToPath(_httpContextAccessor.HttpContext.Request.PathBase, content);
+            }
 
-                content = QueryHelpers.AddQueryString(content, queryStringParams);
+            if (className != null)
+            {
+                className = "class=\"" + className + "\" ";
             }
 
-            content = "<img " + altText + className + "src=\"" + content + "\">";
-            content = _htmlSanitizerService.Sanitize(content);
+            if (altText != null)
+            {
+                altText = "alt=\"" + altText + "\" ";
+            }
 
-            return new ValueTask<string>(content);
+            content = QueryHelpers.AddQueryString(content, queryStringParams);
         }
+
+        content = "<img " + altText + className + "src=\"" + content + "\">";
+        content = _htmlSanitizerService.Sanitize(content);
+
+        return new ValueTask<string>(content);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Media/Startup.cs
index 7e71d267ffc..7af369ae1fe 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Startup.cs
@@ -51,247 +51,247 @@
 using SixLabors.ImageSharp.Web.Middleware;
 using SixLabors.ImageSharp.Web.Providers;
 
-namespace OrchardCore.Media
+namespace OrchardCore.Media;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override int Order
+        => OrchardCoreConstants.ConfigureOrder.Media;
+
+    private const string ImageSharpCacheFolder = "is-cache";
+
+    private readonly ShellSettings _shellSettings;
+
+    public Startup(ShellSettings shellSettings)
     {
-        public override int Order
-            => OrchardCoreConstants.ConfigureOrder.Media;
+        _shellSettings = shellSettings;
+    }
 
-        private const string ImageSharpCacheFolder = "is-cache";
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddHttpClient();
 
-        private readonly ShellSettings _shellSettings;
+        services.AddSingleton<IAnchorTag, MediaAnchorTag>();
 
-        public Startup(ShellSettings shellSettings)
-        {
-            _shellSettings = shellSettings;
-        }
+        // Resized media and remote media caches cleanups.
+        services.AddSingleton<IBackgroundTask, ResizedMediaCacheBackgroundTask>();
+        services.AddSingleton<IBackgroundTask, RemoteMediaCacheBackgroundTask>();
 
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.AddHttpClient();
+            o.MemberAccessStrategy.Register<DisplayMediaFieldViewModel>();
+            o.MemberAccessStrategy.Register<Anchor>();
 
-            services.AddSingleton<IAnchorTag, MediaAnchorTag>();
+            o.Filters.AddFilter("img_tag", MediaFilters.ImgTag);
+        })
+        .AddLiquidFilter<AssetUrlFilter>("asset_url")
+        .AddLiquidFilter<ResizeUrlFilter>("resize_url");
 
-            // Resized media and remote media caches cleanups.
-            services.AddSingleton<IBackgroundTask, ResizedMediaCacheBackgroundTask>();
-            services.AddSingleton<IBackgroundTask, RemoteMediaCacheBackgroundTask>();
+        services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
 
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<DisplayMediaFieldViewModel>();
-                o.MemberAccessStrategy.Register<Anchor>();
-
-                o.Filters.AddFilter("img_tag", MediaFilters.ImgTag);
-            })
-            .AddLiquidFilter<AssetUrlFilter>("asset_url")
-            .AddLiquidFilter<ResizeUrlFilter>("resize_url");
+        services.AddTransient<IConfigureOptions<MediaOptions>, MediaOptionsConfiguration>();
 
-            services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
+        services.AddSingleton<IMediaFileProvider>(serviceProvider =>
+        {
+            var shellOptions = serviceProvider.GetRequiredService<IOptions<ShellOptions>>();
+            var shellSettings = serviceProvider.GetRequiredService<ShellSettings>();
+            var options = serviceProvider.GetRequiredService<IOptions<MediaOptions>>().Value;
 
-            services.AddTransient<IConfigureOptions<MediaOptions>, MediaOptionsConfiguration>();
+            var mediaPath = GetMediaPath(shellOptions.Value, shellSettings, options.AssetsPath);
 
-            services.AddSingleton<IMediaFileProvider>(serviceProvider =>
+            if (!Directory.Exists(mediaPath))
             {
-                var shellOptions = serviceProvider.GetRequiredService<IOptions<ShellOptions>>();
-                var shellSettings = serviceProvider.GetRequiredService<ShellSettings>();
-                var options = serviceProvider.GetRequiredService<IOptions<MediaOptions>>().Value;
+                Directory.CreateDirectory(mediaPath);
+            }
 
-                var mediaPath = GetMediaPath(shellOptions.Value, shellSettings, options.AssetsPath);
+            return new MediaFileProvider(options.AssetsRequestPath, mediaPath);
+        });
 
-                if (!Directory.Exists(mediaPath))
-                {
-                    Directory.CreateDirectory(mediaPath);
-                }
+        services.AddSingleton<IStaticFileProvider, IMediaFileProvider>(serviceProvider =>
+            serviceProvider.GetRequiredService<IMediaFileProvider>()
+        );
 
-                return new MediaFileProvider(options.AssetsRequestPath, mediaPath);
-            });
+        services.AddSingleton<IMediaFileStore>(serviceProvider =>
+        {
+            var shellOptions = serviceProvider.GetRequiredService<IOptions<ShellOptions>>();
+            var shellSettings = serviceProvider.GetRequiredService<ShellSettings>();
+            var mediaOptions = serviceProvider.GetRequiredService<IOptions<MediaOptions>>().Value;
+            var mediaEventHandlers = serviceProvider.GetServices<IMediaEventHandler>();
+            var mediaCreatingEventHandlers = serviceProvider.GetServices<IMediaCreatingEventHandler>();
+            var logger = serviceProvider.GetRequiredService<ILogger<DefaultMediaFileStore>>();
 
-            services.AddSingleton<IStaticFileProvider, IMediaFileProvider>(serviceProvider =>
-                serviceProvider.GetRequiredService<IMediaFileProvider>()
-            );
+            var mediaPath = GetMediaPath(shellOptions.Value, shellSettings, mediaOptions.AssetsPath);
+            var fileStore = new FileSystemStore(mediaPath);
 
-            services.AddSingleton<IMediaFileStore>(serviceProvider =>
-            {
-                var shellOptions = serviceProvider.GetRequiredService<IOptions<ShellOptions>>();
-                var shellSettings = serviceProvider.GetRequiredService<ShellSettings>();
-                var mediaOptions = serviceProvider.GetRequiredService<IOptions<MediaOptions>>().Value;
-                var mediaEventHandlers = serviceProvider.GetServices<IMediaEventHandler>();
-                var mediaCreatingEventHandlers = serviceProvider.GetServices<IMediaCreatingEventHandler>();
-                var logger = serviceProvider.GetRequiredService<ILogger<DefaultMediaFileStore>>();
-
-                var mediaPath = GetMediaPath(shellOptions.Value, shellSettings, mediaOptions.AssetsPath);
-                var fileStore = new FileSystemStore(mediaPath);
-
-                var mediaUrlBase = "/" + fileStore.Combine(shellSettings.RequestUrlPrefix, mediaOptions.AssetsRequestPath);
-
-                var originalPathBase = serviceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext
-                    ?.Features.Get<ShellContextFeature>()
-                    ?.OriginalPathBase ?? PathString.Empty;
-
-                if (originalPathBase.HasValue)
-                {
-                    mediaUrlBase = fileStore.Combine(originalPathBase.Value, mediaUrlBase);
-                }
-
-                return new DefaultMediaFileStore(fileStore, mediaUrlBase, mediaOptions.CdnBaseUrl, mediaEventHandlers, mediaCreatingEventHandlers, logger);
-            });
-
-            services.AddScoped<IPermissionProvider, PermissionProvider>();
-            services.AddScoped<IAuthorizationHandler, ManageMediaFolderAuthorizationHandler>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-
-            // ImageSharp
-
-            // Add ImageSharp Configuration first, to override ImageSharp defaults.
-            services.AddTransient<IConfigureOptions<ImageSharpMiddlewareOptions>, MediaImageSharpConfiguration>();
-
-            services
-                .AddImageSharp()
-                .RemoveProvider<PhysicalFileSystemProvider>()
-                // For multitenancy we must use an absolute path to prevent leakage across tenants on different hosts.
-                .SetCacheKey<BackwardsCompatibleCacheKey>()
-                .Configure<PhysicalFileSystemCacheOptions>(options =>
-                {
-                    options.CacheFolder = $"{_shellSettings.Name}/{ImageSharpCacheFolder}";
-                    options.CacheFolderDepth = 12;
-                })
-                .AddProvider<MediaResizingFileProvider>()
-                .AddProcessor<ImageVersionProcessor>()
-                .AddProcessor<TokenCommandProcessor>();
-
-            services.AddScoped<MediaTokenSettingsUpdater>();
-            services.AddSingleton<IMediaTokenService, MediaTokenService>();
-            services.AddTransient<IConfigureOptions<MediaTokenOptions>, MediaTokenOptionsConfiguration>();
-            services.AddScoped<IFeatureEventHandler>(sp => sp.GetRequiredService<MediaTokenSettingsUpdater>());
-            services.AddScoped<IModularTenantEvents>(sp => sp.GetRequiredService<MediaTokenSettingsUpdater>());
-
-            // Media Field
-            services.AddContentField<MediaField>()
-                .UseDisplayDriver<MediaFieldDisplayDriver>();
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, MediaFieldSettingsDriver>();
-            services.AddScoped<AttachedMediaFieldFileService, AttachedMediaFieldFileService>();
-            services.AddScoped<IContentHandler, AttachedMediaFieldContentHandler>();
-            services.AddScoped<IModularTenantEvents, TempDirCleanerService>();
-            services.AddDataMigration<Migrations>();
-            services.AddRecipeExecutionStep<MediaStep>();
-
-            // MIME types
-            services.TryAddSingleton<IContentTypeProvider, FileExtensionContentTypeProvider>();
-
-            services.AddTagHelpers<ImageTagHelper>();
-            services.AddTagHelpers<ImageResizeTagHelper>();
-            services.AddTagHelpers<AnchorTagHelper>();
-
-            // Media Profiles
-            services.AddScoped<MediaProfilesManager>();
-            services.AddScoped<IMediaProfileService, MediaProfileService>();
-            services.AddRecipeExecutionStep<MediaProfileStep>();
-
-            // Media Name Normalizer
-            services.AddScoped<IMediaNameNormalizerService, NullMediaNameNormalizerService>();
-
-            services.AddScoped<IUserAssetFolderNameProvider, DefaultUserAssetFolderNameProvider>();
-            services.AddSingleton<IChunkFileUploadService, ChunkFileUploadService>();
-            services.AddSingleton<IBackgroundTask, ChunkFileUploadBackgroundTask>();
-        }
+            var mediaUrlBase = "/" + fileStore.Combine(shellSettings.RequestUrlPrefix, mediaOptions.AssetsRequestPath);
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            var mediaFileProvider = serviceProvider.GetRequiredService<IMediaFileProvider>();
-            var mediaOptions = serviceProvider.GetRequiredService<IOptions<MediaOptions>>().Value;
-            var mediaFileStoreCache = serviceProvider.GetService<IMediaFileStoreCache>();
+            var originalPathBase = serviceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext
+                ?.Features.Get<ShellContextFeature>()
+                ?.OriginalPathBase ?? PathString.Empty;
 
-            // Move middleware into SecureMediaStartup if it is possible to insert it between the users and media
-            // module. See issue https://github.com/OrchardCMS/OrchardCore/issues/15716.
-            // Secure media file middleware, but only if the feature is enabled.
-            if (serviceProvider.IsSecureMediaEnabled())
+            if (originalPathBase.HasValue)
             {
-                app.UseMiddleware<SecureMediaMiddleware>();
+                mediaUrlBase = fileStore.Combine(originalPathBase.Value, mediaUrlBase);
             }
 
-            // FileStore middleware before ImageSharp, but only if a remote storage module has registered a cache provider.
-            if (mediaFileStoreCache != null)
-            {
-                app.UseMiddleware<MediaFileStoreResolverMiddleware>();
-            }
+            return new DefaultMediaFileStore(fileStore, mediaUrlBase, mediaOptions.CdnBaseUrl, mediaEventHandlers, mediaCreatingEventHandlers, logger);
+        });
+
+        services.AddScoped<IPermissionProvider, PermissionProvider>();
+        services.AddScoped<IAuthorizationHandler, ManageMediaFolderAuthorizationHandler>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
 
-            // ImageSharp before the static file provider.
-            app.UseImageSharp();
+        // ImageSharp
 
-            // The file provider is a circular dependency and replaceable via di.
-            mediaOptions.StaticFileOptions.FileProvider = mediaFileProvider;
+        // Add ImageSharp Configuration first, to override ImageSharp defaults.
+        services.AddTransient<IConfigureOptions<ImageSharpMiddlewareOptions>, MediaImageSharpConfiguration>();
+
+        services
+            .AddImageSharp()
+            .RemoveProvider<PhysicalFileSystemProvider>()
+            // For multitenancy we must use an absolute path to prevent leakage across tenants on different hosts.
+            .SetCacheKey<BackwardsCompatibleCacheKey>()
+            .Configure<PhysicalFileSystemCacheOptions>(options =>
+            {
+                options.CacheFolder = $"{_shellSettings.Name}/{ImageSharpCacheFolder}";
+                options.CacheFolderDepth = 12;
+            })
+            .AddProvider<MediaResizingFileProvider>()
+            .AddProcessor<ImageVersionProcessor>()
+            .AddProcessor<TokenCommandProcessor>();
+
+        services.AddScoped<MediaTokenSettingsUpdater>();
+        services.AddSingleton<IMediaTokenService, MediaTokenService>();
+        services.AddTransient<IConfigureOptions<MediaTokenOptions>, MediaTokenOptionsConfiguration>();
+        services.AddScoped<IFeatureEventHandler>(sp => sp.GetRequiredService<MediaTokenSettingsUpdater>());
+        services.AddScoped<IModularTenantEvents>(sp => sp.GetRequiredService<MediaTokenSettingsUpdater>());
+
+        // Media Field
+        services.AddContentField<MediaField>()
+            .UseDisplayDriver<MediaFieldDisplayDriver>();
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, MediaFieldSettingsDriver>();
+        services.AddScoped<AttachedMediaFieldFileService, AttachedMediaFieldFileService>();
+        services.AddScoped<IContentHandler, AttachedMediaFieldContentHandler>();
+        services.AddScoped<IModularTenantEvents, TempDirCleanerService>();
+        services.AddDataMigration<Migrations>();
+        services.AddRecipeExecutionStep<MediaStep>();
+
+        // MIME types
+        services.TryAddSingleton<IContentTypeProvider, FileExtensionContentTypeProvider>();
+
+        services.AddTagHelpers<ImageTagHelper>();
+        services.AddTagHelpers<ImageResizeTagHelper>();
+        services.AddTagHelpers<AnchorTagHelper>();
+
+        // Media Profiles
+        services.AddScoped<MediaProfilesManager>();
+        services.AddScoped<IMediaProfileService, MediaProfileService>();
+        services.AddRecipeExecutionStep<MediaProfileStep>();
+
+        // Media Name Normalizer
+        services.AddScoped<IMediaNameNormalizerService, NullMediaNameNormalizerService>();
+
+        services.AddScoped<IUserAssetFolderNameProvider, DefaultUserAssetFolderNameProvider>();
+        services.AddSingleton<IChunkFileUploadService, ChunkFileUploadService>();
+        services.AddSingleton<IBackgroundTask, ChunkFileUploadBackgroundTask>();
+    }
 
-            // Use services.PostConfigure<MediaOptions>() to alter the media static file options event handlers.
-            app.UseStaticFiles(mediaOptions.StaticFileOptions);
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        var mediaFileProvider = serviceProvider.GetRequiredService<IMediaFileProvider>();
+        var mediaOptions = serviceProvider.GetRequiredService<IOptions<MediaOptions>>().Value;
+        var mediaFileStoreCache = serviceProvider.GetService<IMediaFileStoreCache>();
+
+        // Move middleware into SecureMediaStartup if it is possible to insert it between the users and media
+        // module. See issue https://github.com/OrchardCMS/OrchardCore/issues/15716.
+        // Secure media file middleware, but only if the feature is enabled.
+        if (serviceProvider.IsSecureMediaEnabled())
+        {
+            app.UseMiddleware<SecureMediaMiddleware>();
         }
 
-        private static string GetMediaPath(ShellOptions shellOptions, ShellSettings shellSettings, string assetsPath)
+        // FileStore middleware before ImageSharp, but only if a remote storage module has registered a cache provider.
+        if (mediaFileStoreCache != null)
         {
-            return PathExtensions.Combine(shellOptions.ShellsApplicationDataPath, shellOptions.ShellsContainerName, shellSettings.Name, assetsPath);
+            app.UseMiddleware<MediaFileStoreResolverMiddleware>();
         }
+
+        // ImageSharp before the static file provider.
+        app.UseImageSharp();
+
+        // The file provider is a circular dependency and replaceable via di.
+        mediaOptions.StaticFileOptions.FileProvider = mediaFileProvider;
+
+        // Use services.PostConfigure<MediaOptions>() to alter the media static file options event handlers.
+        app.UseStaticFiles(mediaOptions.StaticFileOptions);
     }
 
-    [Feature("OrchardCore.Media.Cache")]
-    public sealed class MediaCacheStartup : StartupBase
+    private static string GetMediaPath(ShellOptions shellOptions, ShellSettings shellSettings, string assetsPath)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IPermissionProvider, MediaCachePermissions>();
-            services.AddScoped<INavigationProvider, MediaCacheAdminMenu>();
-        }
+        return PathExtensions.Combine(shellOptions.ShellsApplicationDataPath, shellOptions.ShellsContainerName, shellSettings.Name, assetsPath);
     }
+}
 
-    [Feature("OrchardCore.Media.Slugify")]
-    public sealed class MediaSlugifyStartup : StartupBase
+[Feature("OrchardCore.Media.Cache")]
+public sealed class MediaCacheStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            // Media Name Normalizer
-            services.AddScoped<IMediaNameNormalizerService, SlugifyMediaNameNormalizerService>();
-        }
+        services.AddScoped<IPermissionProvider, MediaCachePermissions>();
+        services.AddScoped<INavigationProvider, MediaCacheAdminMenu>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class DeploymentStartup : StartupBase
+[Feature("OrchardCore.Media.Slugify")]
+public sealed class MediaSlugifyStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<MediaDeploymentSource, MediaDeploymentStep, MediaDeploymentStepDriver>();
-            services.AddDeployment<AllMediaProfilesDeploymentSource, AllMediaProfilesDeploymentStep, AllMediaProfilesDeploymentStepDriver>();
-        }
+        // Media Name Normalizer
+        services.AddScoped<IMediaNameNormalizerService, SlugifyMediaNameNormalizerService>();
     }
+}
 
-    [Feature("OrchardCore.Media.Indexing")]
-    public sealed class MediaIndexingStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class DeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IContentFieldIndexHandler, MediaFieldIndexHandler>();
-        }
+        services.AddDeployment<MediaDeploymentSource, MediaDeploymentStep, MediaDeploymentStepDriver>();
+        services.AddDeployment<AllMediaProfilesDeploymentSource, AllMediaProfilesDeploymentStep, AllMediaProfilesDeploymentStepDriver>();
     }
+}
 
-    [Feature("OrchardCore.Media.Indexing.Text")]
-    public sealed class TextIndexingStartup : StartupBase
+[Feature("OrchardCore.Media.Indexing")]
+public sealed class MediaIndexingStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddMediaFileTextProvider<TextMediaFileTextProvider>(".txt");
-            services.AddMediaFileTextProvider<TextMediaFileTextProvider>(".md");
-        }
+        services.AddScoped<IContentFieldIndexHandler, MediaFieldIndexHandler>();
+    }
+}
+
+[Feature("OrchardCore.Media.Indexing.Text")]
+public sealed class TextIndexingStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddMediaFileTextProvider<TextMediaFileTextProvider>(".txt");
+        services.AddMediaFileTextProvider<TextMediaFileTextProvider>(".md");
     }
+}
 
-    [RequireFeatures("OrchardCore.Shortcodes")]
-    public sealed class ShortcodesStartup : StartupBase
+[RequireFeatures("OrchardCore.Shortcodes")]
+public sealed class ShortcodesStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        // Only add image as a descriptor as [media] is deprecated.
+        services.AddShortcode<ImageShortcodeProvider>("image", d =>
         {
-            // Only add image as a descriptor as [media] is deprecated.
-            services.AddShortcode<ImageShortcodeProvider>("image", d =>
-            {
-                d.DefaultValue = "[image] [/image]";
-                d.Hint = "Add a image from the media library.";
-                d.Usage =
+            d.DefaultValue = "[image] [/image]";
+            d.Hint = "Add a image from the media library.";
+            d.Usage =
 @"[image]foo.jpg[/image]<br>
 <table>
   <tr>
@@ -303,14 +303,14 @@ public override void ConfigureServices(IServiceCollection services)
     <td>class, alt</td>
   </tr>
 </table>";
-                d.Categories = ["HTML Content", "Media"];
-            });
+            d.Categories = ["HTML Content", "Media"];
+        });
 
-            services.AddShortcode<AssetUrlShortcodeProvider>("asset_url", d =>
-            {
-                d.DefaultValue = "[asset_url] [/asset_url]";
-                d.Hint = "Return a url from the media library.";
-                d.Usage =
+        services.AddShortcode<AssetUrlShortcodeProvider>("asset_url", d =>
+        {
+            d.DefaultValue = "[asset_url] [/asset_url]";
+            d.Hint = "Return a url from the media library.";
+            d.Usage =
 @"[asset_url]foo.jpg[/asset_url]<br>
 <table>
   <tr>
@@ -318,22 +318,21 @@ public override void ConfigureServices(IServiceCollection services)
     <td>width, height, mode</td>
   </tr>
 </table>";
-                d.Categories = ["HTML Content", "Media"];
-            });
-        }
+            d.Categories = ["HTML Content", "Media"];
+        });
     }
+}
 
-    [Feature("OrchardCore.Media.Security")]
-    public sealed class SecureMediaStartup : StartupBase
+[Feature("OrchardCore.Media.Security")]
+public sealed class SecureMediaStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            // Marker service to easily detect if the feature has been enabled.
-            services.AddSingleton<SecureMediaMarker>();
-            services.AddScoped<IPermissionProvider, SecureMediaPermissions>();
-            services.AddScoped<IAuthorizationHandler, ViewMediaFolderAuthorizationHandler>();
+        // Marker service to easily detect if the feature has been enabled.
+        services.AddSingleton<SecureMediaMarker>();
+        services.AddScoped<IPermissionProvider, SecureMediaPermissions>();
+        services.AddScoped<IAuthorizationHandler, ViewMediaFolderAuthorizationHandler>();
 
-            services.AddSingleton<IMediaEventHandler, SecureMediaFileStoreEventHandler>();
-        }
+        services.AddSingleton<IMediaEventHandler, SecureMediaFileStoreEventHandler>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/TagHelpers/AnchorTagHelper.cs b/src/OrchardCore.Modules/OrchardCore.Media/TagHelpers/AnchorTagHelper.cs
index 8826a27997f..30ca2d40fcc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/TagHelpers/AnchorTagHelper.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/TagHelpers/AnchorTagHelper.cs
@@ -2,62 +2,61 @@
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.Media.TagHelpers
+namespace OrchardCore.Media.TagHelpers;
+
+[HtmlTargetElement(AnchorTagName, Attributes = AssetHrefAttributeName)]
+public class AnchorTagHelper : TagHelper
 {
-    [HtmlTargetElement(AnchorTagName, Attributes = AssetHrefAttributeName)]
-    public class AnchorTagHelper : TagHelper
+    private const string AssetHrefAttributeName = "asset-href";
+    private const string AnchorTagName = "a";
+    private const string HrefAttributeName = "href";
+    private const string AppendVersionAttributeName = "asp-append-version";
+
+    private readonly IMediaFileStore _mediaFileStore;
+    private readonly IFileVersionProvider _fileVersionProvider;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+
+    public override int Order => -10;
+
+    [HtmlAttributeName(AssetHrefAttributeName)]
+    public string AssetHref { get; set; }
+
+    /// <summary>
+    /// Value indicating if file version should be appended to href url.
+    /// </summary>
+    /// <remarks>
+    /// If <c>true</c> then a query string "v" with the encoded content of the file is added.
+    /// </remarks>
+    [HtmlAttributeName(AppendVersionAttributeName)]
+    public bool AppendVersion { get; set; }
+
+    public AnchorTagHelper(
+        IMediaFileStore mediaFileStore,
+        IHttpContextAccessor httpContextAccessor,
+        IFileVersionProvider fileVersionProvider
+        )
+    {
+        _mediaFileStore = mediaFileStore;
+        _httpContextAccessor = httpContextAccessor;
+        _fileVersionProvider = fileVersionProvider;
+    }
+
+    public override void Process(TagHelperContext context, TagHelperOutput output)
     {
-        private const string AssetHrefAttributeName = "asset-href";
-        private const string AnchorTagName = "a";
-        private const string HrefAttributeName = "href";
-        private const string AppendVersionAttributeName = "asp-append-version";
-
-        private readonly IMediaFileStore _mediaFileStore;
-        private readonly IFileVersionProvider _fileVersionProvider;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-
-        public override int Order => -10;
-
-        [HtmlAttributeName(AssetHrefAttributeName)]
-        public string AssetHref { get; set; }
-
-        /// <summary>
-        /// Value indicating if file version should be appended to href url.
-        /// </summary>
-        /// <remarks>
-        /// If <c>true</c> then a query string "v" with the encoded content of the file is added.
-        /// </remarks>
-        [HtmlAttributeName(AppendVersionAttributeName)]
-        public bool AppendVersion { get; set; }
-
-        public AnchorTagHelper(
-            IMediaFileStore mediaFileStore,
-            IHttpContextAccessor httpContextAccessor,
-            IFileVersionProvider fileVersionProvider
-            )
+        if (string.IsNullOrEmpty(AssetHref))
         {
-            _mediaFileStore = mediaFileStore;
-            _httpContextAccessor = httpContextAccessor;
-            _fileVersionProvider = fileVersionProvider;
+            return;
         }
 
-        public override void Process(TagHelperContext context, TagHelperOutput output)
+        var resolvedUrl = _mediaFileStore != null ? _mediaFileStore.MapPathToPublicUrl(AssetHref) : AssetHref;
+
+        if (AppendVersion && _fileVersionProvider != null)
+        {
+            output.Attributes.SetAttribute(HrefAttributeName, _fileVersionProvider.AddFileVersionToPath(_httpContextAccessor.HttpContext.Request.PathBase, resolvedUrl));
+        }
+        else
         {
-            if (string.IsNullOrEmpty(AssetHref))
-            {
-                return;
-            }
-
-            var resolvedUrl = _mediaFileStore != null ? _mediaFileStore.MapPathToPublicUrl(AssetHref) : AssetHref;
-
-            if (AppendVersion && _fileVersionProvider != null)
-            {
-                output.Attributes.SetAttribute(HrefAttributeName, _fileVersionProvider.AddFileVersionToPath(_httpContextAccessor.HttpContext.Request.PathBase, resolvedUrl));
-            }
-            else
-            {
-                output.Attributes.SetAttribute(HrefAttributeName, resolvedUrl);
-            }
+            output.Attributes.SetAttribute(HrefAttributeName, resolvedUrl);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/TagHelpers/ImageResizeTagHelper.cs b/src/OrchardCore.Modules/OrchardCore.Media/TagHelpers/ImageResizeTagHelper.cs
index 828abd326b0..eb6ea7f64af 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/TagHelpers/ImageResizeTagHelper.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/TagHelpers/ImageResizeTagHelper.cs
@@ -6,96 +6,95 @@
 using OrchardCore.Media.Processing;
 using OrchardCore.Media.Services;
 
-namespace OrchardCore.Media.TagHelpers
+namespace OrchardCore.Media.TagHelpers;
+
+[HtmlTargetElement("img", Attributes = ImageSizeWidthAttributeName)]
+[HtmlTargetElement("img", Attributes = ImageSizeHeightAttributeName)]
+[HtmlTargetElement("img", Attributes = ImageProfileAttributeName)]
+[HtmlTargetElement("img", Attributes = ImageSizeWidthAttributeName + "," + ImageSizeModeAttributeName)]
+[HtmlTargetElement("img", Attributes = ImageSizeHeightAttributeName + "," + ImageSizeModeAttributeName)]
+public class ImageResizeTagHelper : TagHelper
 {
-    [HtmlTargetElement("img", Attributes = ImageSizeWidthAttributeName)]
-    [HtmlTargetElement("img", Attributes = ImageSizeHeightAttributeName)]
-    [HtmlTargetElement("img", Attributes = ImageProfileAttributeName)]
-    [HtmlTargetElement("img", Attributes = ImageSizeWidthAttributeName + "," + ImageSizeModeAttributeName)]
-    [HtmlTargetElement("img", Attributes = ImageSizeHeightAttributeName + "," + ImageSizeModeAttributeName)]
-    public class ImageResizeTagHelper : TagHelper
-    {
-        private const string ImageSizeAttributePrefix = "img-";
-        private const string ImageSizeWidthAttributeName = ImageSizeAttributePrefix + "width";
-        private const string ImageSizeHeightAttributeName = ImageSizeAttributePrefix + "height";
-        private const string ImageSizeModeAttributeName = ImageSizeAttributePrefix + "resize-mode";
-        private const string ImageQualityAttributeName = ImageSizeAttributePrefix + "quality";
-        private const string ImageFormatAttributeName = ImageSizeAttributePrefix + "format";
-        private const string ImageProfileAttributeName = ImageSizeAttributePrefix + "profile";
-        private const string ImageAnchorAttributeName = ImageSizeAttributePrefix + "anchor";
-        private const string ImageBackgroundColorAttributeName = ImageSizeAttributePrefix + "bgcolor";
+    private const string ImageSizeAttributePrefix = "img-";
+    private const string ImageSizeWidthAttributeName = ImageSizeAttributePrefix + "width";
+    private const string ImageSizeHeightAttributeName = ImageSizeAttributePrefix + "height";
+    private const string ImageSizeModeAttributeName = ImageSizeAttributePrefix + "resize-mode";
+    private const string ImageQualityAttributeName = ImageSizeAttributePrefix + "quality";
+    private const string ImageFormatAttributeName = ImageSizeAttributePrefix + "format";
+    private const string ImageProfileAttributeName = ImageSizeAttributePrefix + "profile";
+    private const string ImageAnchorAttributeName = ImageSizeAttributePrefix + "anchor";
+    private const string ImageBackgroundColorAttributeName = ImageSizeAttributePrefix + "bgcolor";
 
-        private readonly IMediaProfileService _mediaProfileService;
-        private readonly MediaOptions _mediaOptions;
-        private readonly IMediaTokenService _mediaTokenService;
+    private readonly IMediaProfileService _mediaProfileService;
+    private readonly MediaOptions _mediaOptions;
+    private readonly IMediaTokenService _mediaTokenService;
 
 
-        [HtmlAttributeName(ImageSizeWidthAttributeName)]
-        public int? ImageWidth { get; set; }
+    [HtmlAttributeName(ImageSizeWidthAttributeName)]
+    public int? ImageWidth { get; set; }
 
-        [HtmlAttributeName(ImageSizeHeightAttributeName)]
-        public int? ImageHeight { get; set; }
+    [HtmlAttributeName(ImageSizeHeightAttributeName)]
+    public int? ImageHeight { get; set; }
 
-        [HtmlAttributeName(ImageQualityAttributeName)]
-        public int? ImageQuality { get; set; }
+    [HtmlAttributeName(ImageQualityAttributeName)]
+    public int? ImageQuality { get; set; }
 
-        [HtmlAttributeName(ImageSizeModeAttributeName)]
-        public ResizeMode ResizeMode { get; set; }
+    [HtmlAttributeName(ImageSizeModeAttributeName)]
+    public ResizeMode ResizeMode { get; set; }
 
-        [HtmlAttributeName(ImageFormatAttributeName)]
-        public Format ImageFormat { get; set; }
+    [HtmlAttributeName(ImageFormatAttributeName)]
+    public Format ImageFormat { get; set; }
 
-        [HtmlAttributeName(ImageProfileAttributeName)]
-        public string ImageProfile { get; set; }
+    [HtmlAttributeName(ImageProfileAttributeName)]
+    public string ImageProfile { get; set; }
 
-        [HtmlAttributeName(ImageAnchorAttributeName)]
-        public Anchor ImageAnchor { get; set; }
+    [HtmlAttributeName(ImageAnchorAttributeName)]
+    public Anchor ImageAnchor { get; set; }
 
-        [HtmlAttributeName(ImageBackgroundColorAttributeName)]
-        public string ImageBackgroundColor { get; set; }
+    [HtmlAttributeName(ImageBackgroundColorAttributeName)]
+    public string ImageBackgroundColor { get; set; }
 
-        [HtmlAttributeName("src")]
-        public string Src { get; set; }
+    [HtmlAttributeName("src")]
+    public string Src { get; set; }
 
-        public ImageResizeTagHelper(
-            IMediaProfileService mediaProfileService,
-            IOptions<MediaOptions> mediaOptions,
-            IMediaTokenService mediaTokenService)
-        {
-            _mediaProfileService = mediaProfileService;
-            _mediaOptions = mediaOptions.Value;
-            _mediaTokenService = mediaTokenService;
-        }
+    public ImageResizeTagHelper(
+        IMediaProfileService mediaProfileService,
+        IOptions<MediaOptions> mediaOptions,
+        IMediaTokenService mediaTokenService)
+    {
+        _mediaProfileService = mediaProfileService;
+        _mediaOptions = mediaOptions.Value;
+        _mediaTokenService = mediaTokenService;
+    }
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+    public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+    {
+        if (!ImageWidth.HasValue && !ImageHeight.HasValue && string.IsNullOrEmpty(ImageProfile))
         {
-            if (!ImageWidth.HasValue && !ImageHeight.HasValue && string.IsNullOrEmpty(ImageProfile))
-            {
-                return;
-            }
-
-            var imgSrc = output.Attributes["src"]?.Value.ToString() ?? Src;
+            return;
+        }
 
-            if (string.IsNullOrEmpty(imgSrc))
-            {
-                return;
-            }
+        var imgSrc = output.Attributes["src"]?.Value.ToString() ?? Src;
 
-            IDictionary<string, string> queryStringParams = null;
+        if (string.IsNullOrEmpty(imgSrc))
+        {
+            return;
+        }
 
-            if (!string.IsNullOrEmpty(ImageProfile))
-            {
-                queryStringParams = await _mediaProfileService.GetMediaProfileCommands(ImageProfile);
-            }
+        IDictionary<string, string> queryStringParams = null;
 
-            var resizedSrc = ImageSharpUrlFormatter.GetImageResizeUrl(imgSrc, queryStringParams, ImageWidth, ImageHeight, ResizeMode, ImageQuality, ImageFormat, ImageAnchor, ImageBackgroundColor);
+        if (!string.IsNullOrEmpty(ImageProfile))
+        {
+            queryStringParams = await _mediaProfileService.GetMediaProfileCommands(ImageProfile);
+        }
 
-            if (_mediaOptions.UseTokenizedQueryString)
-            {
-                resizedSrc = _mediaTokenService.AddTokenToPath(resizedSrc);
-            }
+        var resizedSrc = ImageSharpUrlFormatter.GetImageResizeUrl(imgSrc, queryStringParams, ImageWidth, ImageHeight, ResizeMode, ImageQuality, ImageFormat, ImageAnchor, ImageBackgroundColor);
 
-            output.Attributes.SetAttribute("src", resizedSrc);
+        if (_mediaOptions.UseTokenizedQueryString)
+        {
+            resizedSrc = _mediaTokenService.AddTokenToPath(resizedSrc);
         }
+
+        output.Attributes.SetAttribute("src", resizedSrc);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/TagHelpers/ImageTagHelper.cs b/src/OrchardCore.Modules/OrchardCore.Media/TagHelpers/ImageTagHelper.cs
index f57ef8c0ae7..8cac68a6263 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/TagHelpers/ImageTagHelper.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/TagHelpers/ImageTagHelper.cs
@@ -2,67 +2,66 @@
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.Media.TagHelpers
+namespace OrchardCore.Media.TagHelpers;
+
+[HtmlTargetElement(ImageTagName, Attributes = AssetSrcAttributeName)]
+public class ImageTagHelper : TagHelper
 {
-    [HtmlTargetElement(ImageTagName, Attributes = AssetSrcAttributeName)]
-    public class ImageTagHelper : TagHelper
-    {
-        private const string AssetSrcAttributeName = "asset-src";
+    private const string AssetSrcAttributeName = "asset-src";
 
-        private const string ImageTagName = "img";
+    private const string ImageTagName = "img";
 
-        private const string SourceAttributeName = "src";
+    private const string SourceAttributeName = "src";
 
-        private const string AppendVersionAttributeName = "asp-append-version";
+    private const string AppendVersionAttributeName = "asp-append-version";
 
-        private readonly IMediaFileStore _mediaFileStore;
+    private readonly IMediaFileStore _mediaFileStore;
 
-        private readonly IFileVersionProvider _fileVersionProvider;
+    private readonly IFileVersionProvider _fileVersionProvider;
 
-        private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public override int Order => -10;
+    public override int Order => -10;
 
-        [HtmlAttributeName(AssetSrcAttributeName)]
-        public string AssetSrc { get; set; }
+    [HtmlAttributeName(AssetSrcAttributeName)]
+    public string AssetSrc { get; set; }
 
-        /// <summary>
-        /// Value indicating if file version should be appended to the src url.
-        /// </summary>
-        /// <remarks>
-        /// If <c>true</c> then a query string "v" with the encoded content of the file is added.
-        /// </remarks>
-        [HtmlAttributeName(AppendVersionAttributeName)]
-        public bool AppendVersion { get; set; }
+    /// <summary>
+    /// Value indicating if file version should be appended to the src url.
+    /// </summary>
+    /// <remarks>
+    /// If <c>true</c> then a query string "v" with the encoded content of the file is added.
+    /// </remarks>
+    [HtmlAttributeName(AppendVersionAttributeName)]
+    public bool AppendVersion { get; set; }
 
-        public ImageTagHelper(
-            IMediaFileStore mediaFileStore,
-            IHttpContextAccessor httpContextAccessor,
-            IFileVersionProvider fileVersionProvider
-            )
-        {
-            _mediaFileStore = mediaFileStore;
-            _httpContextAccessor = httpContextAccessor;
-            _fileVersionProvider = fileVersionProvider;
-        }
+    public ImageTagHelper(
+        IMediaFileStore mediaFileStore,
+        IHttpContextAccessor httpContextAccessor,
+        IFileVersionProvider fileVersionProvider
+        )
+    {
+        _mediaFileStore = mediaFileStore;
+        _httpContextAccessor = httpContextAccessor;
+        _fileVersionProvider = fileVersionProvider;
+    }
 
-        public override void Process(TagHelperContext context, TagHelperOutput output)
+    public override void Process(TagHelperContext context, TagHelperOutput output)
+    {
+        if (string.IsNullOrEmpty(AssetSrc))
         {
-            if (string.IsNullOrEmpty(AssetSrc))
-            {
-                return;
-            }
+            return;
+        }
 
-            var resolvedUrl = _mediaFileStore != null ? _mediaFileStore.MapPathToPublicUrl(AssetSrc) : AssetSrc;
+        var resolvedUrl = _mediaFileStore != null ? _mediaFileStore.MapPathToPublicUrl(AssetSrc) : AssetSrc;
 
-            if (AppendVersion && _fileVersionProvider != null)
-            {
-                output.Attributes.SetAttribute(SourceAttributeName, _fileVersionProvider.AddFileVersionToPath(_httpContextAccessor.HttpContext.Request.PathBase, resolvedUrl));
-            }
-            else
-            {
-                output.Attributes.SetAttribute(SourceAttributeName, resolvedUrl);
-            }
+        if (AppendVersion && _fileVersionProvider != null)
+        {
+            output.Attributes.SetAttribute(SourceAttributeName, _fileVersionProvider.AddFileVersionToPath(_httpContextAccessor.HttpContext.Request.PathBase, resolvedUrl));
+        }
+        else
+        {
+            output.Attributes.SetAttribute(SourceAttributeName, resolvedUrl);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/DisplayMediaFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/DisplayMediaFieldViewModel.cs
index 2c5a67aa97a..12be9e53743 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/DisplayMediaFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/DisplayMediaFieldViewModel.cs
@@ -2,13 +2,12 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Media.Fields;
 
-namespace OrchardCore.Media.ViewModels
+namespace OrchardCore.Media.ViewModels;
+
+public class DisplayMediaFieldViewModel
 {
-    public class DisplayMediaFieldViewModel
-    {
-        public string[] Paths => Field.Paths;
-        public MediaField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public string[] Paths => Field.Paths;
+    public MediaField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/EditMediaFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/EditMediaFieldViewModel.cs
index 037ada89a93..0e844693a85 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/EditMediaFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/EditMediaFieldViewModel.cs
@@ -2,50 +2,49 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Media.Fields;
 
-namespace OrchardCore.Media.ViewModels
+namespace OrchardCore.Media.ViewModels;
+
+public class EditMediaFieldViewModel
 {
-    public class EditMediaFieldViewModel
-    {
-        // A Json serialized array of media paths
-        public string Paths { get; set; }
+    // A Json serialized array of media paths
+    public string Paths { get; set; }
 
-        public MediaField Field { get; set; }
+    public MediaField Field { get; set; }
 
-        public ContentPart Part { get; set; }
+    public ContentPart Part { get; set; }
 
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 
-        // This will be used by the uploader of an attached media field
-        public string TempUploadFolder { get; set; }
+    // This will be used by the uploader of an attached media field
+    public string TempUploadFolder { get; set; }
 
-        // Media Text is an option that maybe applied to a media field through settings.
-        public bool AllowMediaText { get; set; }
+    // Media Text is an option that maybe applied to a media field through settings.
+    public bool AllowMediaText { get; set; }
 
-        public string MediaTexts { get; set; }
+    public string MediaTexts { get; set; }
 
-        // Anchor points are an option that maybe applied to a media field through settings.
-        public bool AllowAnchors { get; set; }
+    // Anchor points are an option that maybe applied to a media field through settings.
+    public bool AllowAnchors { get; set; }
 
-        public Anchor[] Anchors { get; set; } = [];
+    public Anchor[] Anchors { get; set; } = [];
 
-        public string[] AttachedFileNames { get; set; } = [];
+    public string[] AttachedFileNames { get; set; } = [];
 
-        public string[] AllowedExtensions { get; set; } = [];
-    }
+    public string[] AllowedExtensions { get; set; } = [];
+}
 
-    public class EditMediaFieldItemInfo
-    {
-        public string Path { get; set; }
-        public string AttachedFileName { get; set; }
+public class EditMediaFieldItemInfo
+{
+    public string Path { get; set; }
+    public string AttachedFileName { get; set; }
 
-        // It will be true if the media item is a new upload from a attached media field.
-        public bool IsNew { get; set; }
+    // It will be true if the media item is a new upload from a attached media field.
+    public bool IsNew { get; set; }
 
-        // It will be true if the media item has been marked for deletion using a attached media field.
-        public bool IsRemoved { get; set; }
+    // It will be true if the media item has been marked for deletion using a attached media field.
+    public bool IsRemoved { get; set; }
 
-        // Alt text is an option that maybe applied to a media field through settings.
-        public string MediaText { get; set; } = string.Empty;
-        public Anchor Anchor { get; set; } = new Anchor();
-    }
+    // Alt text is an option that maybe applied to a media field through settings.
+    public string MediaText { get; set; } = string.Empty;
+    public Anchor Anchor { get; set; } = new Anchor();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaCacheViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaCacheViewModel.cs
index d8c4b2265d9..897552ca0b2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaCacheViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaCacheViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Media.ViewModels
+namespace OrchardCore.Media.ViewModels;
+
+public class MediaCacheViewModel
 {
-    public class MediaCacheViewModel
-    {
-        public bool IsConfigured { get; set; }
-    }
+    public bool IsConfigured { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaDeploymentStepViewModel.cs
index 7477821f87a..70549f23345 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaDeploymentStepViewModel.cs
@@ -1,17 +1,16 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Media.ViewModels
+namespace OrchardCore.Media.ViewModels;
+
+public class MediaDeploymentStepViewModel
 {
-    public class MediaDeploymentStepViewModel
-    {
-        public bool IncludeAll { get; set; } = true;
+    public bool IncludeAll { get; set; } = true;
 
-        public string[] FilePaths { get; set; }
+    public string[] FilePaths { get; set; }
 
-        public string[] DirectoryPaths { get; set; }
+    public string[] DirectoryPaths { get; set; }
 
-        public MediaStoreEntryViewModel ParentEntry { get; set; }
+    public MediaStoreEntryViewModel ParentEntry { get; set; }
 
-        public IList<MediaStoreEntryViewModel> Entries { get; set; }
-    }
+    public IList<MediaStoreEntryViewModel> Entries { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaProfileIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaProfileIndexViewModel.cs
index 1c36a7e1345..28c1ff615df 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaProfileIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaProfileIndexViewModel.cs
@@ -3,38 +3,37 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using OrchardCore.Media.Models;
 
-namespace OrchardCore.Media.ViewModels
+namespace OrchardCore.Media.ViewModels;
+
+public class MediaProfileIndexViewModel
+{
+    public IList<MediaProfileEntry> MediaProfiles { get; set; }
+    public dynamic Pager { get; set; }
+    public ContentOptions Options { get; set; } = new ContentOptions();
+}
+
+public class MediaProfileEntry
+{
+    public string Name { get; set; }
+    public MediaProfile MediaProfile { get; set; }
+    public bool IsChecked { get; set; }
+}
+
+public class ContentOptions
+{
+    public string Search { get; set; }
+    public ContentsBulkAction BulkAction { get; set; }
+
+    #region Lists to populate
+
+    [BindNever]
+    public List<SelectListItem> ContentsBulkAction { get; set; }
+
+    #endregion Lists to populate
+}
+
+public enum ContentsBulkAction
 {
-    public class MediaProfileIndexViewModel
-    {
-        public IList<MediaProfileEntry> MediaProfiles { get; set; }
-        public dynamic Pager { get; set; }
-        public ContentOptions Options { get; set; } = new ContentOptions();
-    }
-
-    public class MediaProfileEntry
-    {
-        public string Name { get; set; }
-        public MediaProfile MediaProfile { get; set; }
-        public bool IsChecked { get; set; }
-    }
-
-    public class ContentOptions
-    {
-        public string Search { get; set; }
-        public ContentsBulkAction BulkAction { get; set; }
-
-        #region Lists to populate
-
-        [BindNever]
-        public List<SelectListItem> ContentsBulkAction { get; set; }
-
-        #endregion Lists to populate
-    }
-
-    public enum ContentsBulkAction
-    {
-        None,
-        Remove
-    }
+    None,
+    Remove
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaProfileViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaProfileViewModel.cs
index 6f4be6fef2a..1857e36290a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaProfileViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaProfileViewModel.cs
@@ -3,31 +3,30 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using OrchardCore.Media.Processing;
 
-namespace OrchardCore.Media.ViewModels
+namespace OrchardCore.Media.ViewModels;
+
+public class MediaProfileViewModel
 {
-    public class MediaProfileViewModel
-    {
-        public string Name { get; set; }
-        public string Hint { get; set; }
+    public string Name { get; set; }
+    public string Hint { get; set; }
 
-        public int SelectedWidth { get; set; }
-        public int CustomWidth { get; set; }
-        public int SelectedHeight { get; set; }
-        public int CustomHeight { get; set; }
-        public ResizeMode SelectedMode { get; set; }
-        public Format SelectedFormat { get; set; }
-        public int Quality { get; set; } = 100;
-        public string BackgroundColor { get; set; }
+    public int SelectedWidth { get; set; }
+    public int CustomWidth { get; set; }
+    public int SelectedHeight { get; set; }
+    public int CustomHeight { get; set; }
+    public ResizeMode SelectedMode { get; set; }
+    public Format SelectedFormat { get; set; }
+    public int Quality { get; set; } = 100;
+    public string BackgroundColor { get; set; }
 
-        [BindNever]
-        public List<SelectListItem> AvailableWidths { get; set; } = [];
+    [BindNever]
+    public List<SelectListItem> AvailableWidths { get; set; } = [];
 
-        [BindNever]
-        public List<SelectListItem> AvailableHeights { get; set; } = [];
+    [BindNever]
+    public List<SelectListItem> AvailableHeights { get; set; } = [];
 
-        [BindNever]
-        public List<SelectListItem> AvailableResizeModes { get; set; } = [];
-        [BindNever]
-        public List<SelectListItem> AvailableFormats { get; set; } = [];
-    }
+    [BindNever]
+    public List<SelectListItem> AvailableResizeModes { get; set; } = [];
+    [BindNever]
+    public List<SelectListItem> AvailableFormats { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaStoreEntryViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaStoreEntryViewModel.cs
index ee9283500ad..28004091a6f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaStoreEntryViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Media/ViewModels/MediaStoreEntryViewModel.cs
@@ -1,15 +1,14 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Media.ViewModels
+namespace OrchardCore.Media.ViewModels;
+
+public class MediaStoreEntryViewModel
 {
-    public class MediaStoreEntryViewModel
-    {
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        public string Path { get; set; }
+    public string Path { get; set; }
 
-        public MediaStoreEntryViewModel Parent { get; set; }
+    public MediaStoreEntryViewModel Parent { get; set; }
 
-        public IList<MediaStoreEntryViewModel> Entries { get; set; }
-    }
+    public IList<MediaStoreEntryViewModel> Entries { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Menu/AdminMenu.cs
index 98eb8b0ac7e..3078fef3b94 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/AdminMenu.cs
@@ -3,42 +3,41 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Menu
+namespace OrchardCore.Menu;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "contentTypeId", "Menu" },
-            { "Area", "OrchardCore.Contents" },
-            { "Options.SelectedContentType", "Menu" },
-            { "Options.CanCreateSelectedContentType", true }
-        };
+        { "contentTypeId", "Menu" },
+        { "Area", "OrchardCore.Contents" },
+        { "Options.SelectedContentType", "Menu" },
+        { "Options.CanCreateSelectedContentType", true }
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
-        {
-            S = localizer;
-        }
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Content"], design => design
-                    .Add(S["Menus"], S["Menus"].PrefixPosition(), menus => menus
-                        .Permission(Permissions.ManageMenu)
-                        .Action("List", "Admin", _routeValues)
-                        .LocalNav()
-                    )
-                );
-
             return Task.CompletedTask;
         }
+
+        builder
+            .Add(S["Content"], design => design
+                .Add(S["Menus"], S["Menus"].PrefixPosition(), menus => menus
+                    .Permission(Permissions.ManageMenu)
+                    .Action("List", "Admin", _routeValues)
+                    .LocalNav()
+                )
+            );
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Menu/Controllers/AdminController.cs
index a624d60a69a..9a76abf13a3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Controllers/AdminController.cs
@@ -15,300 +15,299 @@
 using OrchardCore.Menu.Models;
 using YesSql;
 
-namespace OrchardCore.Menu.Controllers
+namespace OrchardCore.Menu.Controllers;
+
+[Admin("Menu/{action}/{id?}", "Menu{action}")]
+public class AdminController : Controller
 {
-    [Admin("Menu/{action}/{id?}", "Menu{action}")]
-    public class AdminController : Controller
+    private readonly IContentManager _contentManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IContentItemDisplayManager _contentItemDisplayManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ISession _session;
+    private readonly INotifier _notifier;
+    protected readonly IHtmlLocalizer H;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+
+    public AdminController(
+        ISession session,
+        IContentManager contentManager,
+        IAuthorizationService authorizationService,
+        IContentItemDisplayManager contentItemDisplayManager,
+        IContentDefinitionManager contentDefinitionManager,
+        INotifier notifier,
+        IHtmlLocalizer<AdminController> localizer,
+        IUpdateModelAccessor updateModelAccessor)
     {
-        private readonly IContentManager _contentManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IContentItemDisplayManager _contentItemDisplayManager;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly ISession _session;
-        private readonly INotifier _notifier;
-        protected readonly IHtmlLocalizer H;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-
-        public AdminController(
-            ISession session,
-            IContentManager contentManager,
-            IAuthorizationService authorizationService,
-            IContentItemDisplayManager contentItemDisplayManager,
-            IContentDefinitionManager contentDefinitionManager,
-            INotifier notifier,
-            IHtmlLocalizer<AdminController> localizer,
-            IUpdateModelAccessor updateModelAccessor)
+        _contentManager = contentManager;
+        _authorizationService = authorizationService;
+        _contentItemDisplayManager = contentItemDisplayManager;
+        _contentDefinitionManager = contentDefinitionManager;
+        _session = session;
+        _notifier = notifier;
+        _updateModelAccessor = updateModelAccessor;
+        H = localizer;
+    }
+
+    public async Task<IActionResult> Create(string id, string menuContentItemId, string menuItemId)
+    {
+        if (string.IsNullOrWhiteSpace(id))
         {
-            _contentManager = contentManager;
-            _authorizationService = authorizationService;
-            _contentItemDisplayManager = contentItemDisplayManager;
-            _contentDefinitionManager = contentDefinitionManager;
-            _session = session;
-            _notifier = notifier;
-            _updateModelAccessor = updateModelAccessor;
-            H = localizer;
+            return NotFound();
         }
 
-        public async Task<IActionResult> Create(string id, string menuContentItemId, string menuItemId)
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMenu))
         {
-            if (string.IsNullOrWhiteSpace(id))
-            {
-                return NotFound();
-            }
+            return Forbid();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMenu))
-            {
-                return Forbid();
-            }
+        var contentItem = await _contentManager.NewAsync(id);
 
-            var contentItem = await _contentManager.NewAsync(id);
+        var model = await _contentItemDisplayManager.BuildEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, true);
 
-            var model = await _contentItemDisplayManager.BuildEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, true);
+        model.Properties["MenuContentItemId"] = menuContentItemId;
+        model.Properties["MenuItemId"] = menuItemId;
 
-            model.Properties["MenuContentItemId"] = menuContentItemId;
-            model.Properties["MenuItemId"] = menuItemId;
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost]
+    [ActionName("Create")]
+    public async Task<IActionResult> CreatePost(string id, string menuContentItemId, string menuItemId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMenu))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        [ActionName("Create")]
-        public async Task<IActionResult> CreatePost(string id, string menuContentItemId, string menuItemId)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMenu))
-            {
-                return Forbid();
-            }
+        ContentItem menu;
 
-            ContentItem menu;
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync("Menu");
 
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync("Menu");
+        if (!contentTypeDefinition.IsDraftable())
+        {
+            menu = await _contentManager.GetAsync(menuContentItemId, VersionOptions.Latest);
+        }
+        else
+        {
+            menu = await _contentManager.GetAsync(menuContentItemId, VersionOptions.DraftRequired);
+        }
 
-            if (!contentTypeDefinition.IsDraftable())
-            {
-                menu = await _contentManager.GetAsync(menuContentItemId, VersionOptions.Latest);
-            }
-            else
-            {
-                menu = await _contentManager.GetAsync(menuContentItemId, VersionOptions.DraftRequired);
-            }
+        if (menu == null)
+        {
+            return NotFound();
+        }
 
-            if (menu == null)
-            {
-                return NotFound();
-            }
+        var contentItem = await _contentManager.NewAsync(id);
 
-            var contentItem = await _contentManager.NewAsync(id);
+        var model = await _contentItemDisplayManager.UpdateEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, true);
 
-            var model = await _contentItemDisplayManager.UpdateEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, true);
+        if (!ModelState.IsValid)
+        {
+            model.Properties["MenuContentItemId"] = menuContentItemId;
+            model.Properties["MenuItemId"] = menuItemId;
 
-            if (!ModelState.IsValid)
-            {
-                model.Properties["MenuContentItemId"] = menuContentItemId;
-                model.Properties["MenuItemId"] = menuItemId;
+            return View(model);
+        }
 
-                return View(model);
-            }
+        if (menuItemId == null)
+        {
+            // Use the menu as the parent if no target is specified.
+            menu.Alter<MenuItemsListPart>(part => part.MenuItems.Add(contentItem));
+        }
+        else
+        {
+            // Look for the target menu item in the hierarchy.
+            var parentMenuItem = FindMenuItem((JsonObject)menu.Content, menuItemId);
 
-            if (menuItemId == null)
+            // Couldn't find targeted menu item.
+            if (parentMenuItem == null)
             {
-                // Use the menu as the parent if no target is specified.
-                menu.Alter<MenuItemsListPart>(part => part.MenuItems.Add(contentItem));
+                return NotFound();
             }
-            else
-            {
-                // Look for the target menu item in the hierarchy.
-                var parentMenuItem = FindMenuItem((JsonObject)menu.Content, menuItemId);
 
-                // Couldn't find targeted menu item.
-                if (parentMenuItem == null)
+            var menuItems = (JsonArray)parentMenuItem["MenuItemsListPart"]?["MenuItems"];
+
+            if (menuItems == null)
+            {
+                parentMenuItem["MenuItemsListPart"] = new JsonObject
                 {
-                    return NotFound();
-                }
+                    ["MenuItems"] = menuItems = [],
+                };
+            }
 
-                var menuItems = (JsonArray)parentMenuItem["MenuItemsListPart"]?["MenuItems"];
+            menuItems.Add(JObject.FromObject(contentItem));
+        }
 
-                if (menuItems == null)
-                {
-                    parentMenuItem["MenuItemsListPart"] = new JsonObject
-                    {
-                        ["MenuItems"] = menuItems = [],
-                    };
-                }
+        await _contentManager.SaveDraftAsync(menu);
 
-                menuItems.Add(JObject.FromObject(contentItem));
-            }
+        return RedirectToAction(nameof(Edit), "Admin", new { area = "OrchardCore.Contents", contentItemId = menuContentItemId });
+    }
 
-            await _contentManager.SaveDraftAsync(menu);
+    public async Task<IActionResult> Edit(string menuContentItemId, string menuItemId)
+    {
+        var menu = await _contentManager.GetAsync(menuContentItemId, VersionOptions.Latest);
 
-            return RedirectToAction(nameof(Edit), "Admin", new { area = "OrchardCore.Contents", contentItemId = menuContentItemId });
+        if (menu == null)
+        {
+            return NotFound();
         }
 
-        public async Task<IActionResult> Edit(string menuContentItemId, string menuItemId)
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMenu, menu))
         {
-            var menu = await _contentManager.GetAsync(menuContentItemId, VersionOptions.Latest);
-
-            if (menu == null)
-            {
-                return NotFound();
-            }
+            return Forbid();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMenu, menu))
-            {
-                return Forbid();
-            }
+        // Look for the target menu item in the hierarchy.
+        var menuItem = FindMenuItem((JsonObject)menu.Content, menuItemId);
 
-            // Look for the target menu item in the hierarchy.
-            var menuItem = FindMenuItem((JsonObject)menu.Content, menuItemId);
+        // Couldn't find targeted menu item.
+        if (menuItem == null)
+        {
+            return NotFound();
+        }
 
-            // Couldn't find targeted menu item.
-            if (menuItem == null)
-            {
-                return NotFound();
-            }
+        var contentItem = menuItem.ToObject<ContentItem>();
 
-            var contentItem = menuItem.ToObject<ContentItem>();
+        var model = await _contentItemDisplayManager.BuildEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, false);
 
-            var model = await _contentItemDisplayManager.BuildEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, false);
+        model.Properties["MenuContentItemId"] = menuContentItemId;
+        model.Properties["MenuItemId"] = menuItemId;
 
-            model.Properties["MenuContentItemId"] = menuContentItemId;
-            model.Properties["MenuItemId"] = menuItemId;
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost]
+    [ActionName("Edit")]
+    public async Task<IActionResult> EditPost(string menuContentItemId, string menuItemId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMenu))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        [ActionName("Edit")]
-        public async Task<IActionResult> EditPost(string menuContentItemId, string menuItemId)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMenu))
-            {
-                return Forbid();
-            }
+        ContentItem menu;
 
-            ContentItem menu;
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync("Menu");
 
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync("Menu");
+        if (!contentTypeDefinition.IsDraftable())
+        {
+            menu = await _contentManager.GetAsync(menuContentItemId, VersionOptions.Latest);
+        }
+        else
+        {
+            menu = await _contentManager.GetAsync(menuContentItemId, VersionOptions.DraftRequired);
+        }
 
-            if (!contentTypeDefinition.IsDraftable())
-            {
-                menu = await _contentManager.GetAsync(menuContentItemId, VersionOptions.Latest);
-            }
-            else
-            {
-                menu = await _contentManager.GetAsync(menuContentItemId, VersionOptions.DraftRequired);
-            }
+        if (menu == null)
+        {
+            return NotFound();
+        }
 
-            if (menu == null)
-            {
-                return NotFound();
-            }
+        // Look for the target menu item in the hierarchy.
+        var menuItem = FindMenuItem((JsonObject)menu.Content, menuItemId);
 
-            // Look for the target menu item in the hierarchy.
-            var menuItem = FindMenuItem((JsonObject)menu.Content, menuItemId);
+        // Couldn't find targeted menu item
+        if (menuItem == null)
+        {
+            return NotFound();
+        }
 
-            // Couldn't find targeted menu item
-            if (menuItem == null)
-            {
-                return NotFound();
-            }
+        var existing = menuItem.ToObject<ContentItem>();
 
-            var existing = menuItem.ToObject<ContentItem>();
+        // Create a new item to take into account the current type definition.
+        var contentItem = await _contentManager.NewAsync(existing.ContentType);
 
-            // Create a new item to take into account the current type definition.
-            var contentItem = await _contentManager.NewAsync(existing.ContentType);
+        contentItem.Merge(existing);
 
-            contentItem.Merge(existing);
+        var model = await _contentItemDisplayManager.UpdateEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, false);
 
-            var model = await _contentItemDisplayManager.UpdateEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, false);
+        if (!ModelState.IsValid)
+        {
+            model.Properties["MenuContentItemId"] = menuContentItemId;
+            model.Properties["MenuItemId"] = menuItemId;
 
-            if (!ModelState.IsValid)
-            {
-                model.Properties["MenuContentItemId"] = menuContentItemId;
-                model.Properties["MenuItemId"] = menuItemId;
+            return View(model);
+        }
 
-                return View(model);
-            }
+        menuItem.Merge((JsonObject)contentItem.Content, new JsonMergeSettings
+        {
+            MergeArrayHandling = MergeArrayHandling.Replace,
+            MergeNullValueHandling = MergeNullValueHandling.Merge
+        });
 
-            menuItem.Merge((JsonObject)contentItem.Content, new JsonMergeSettings
-            {
-                MergeArrayHandling = MergeArrayHandling.Replace,
-                MergeNullValueHandling = MergeNullValueHandling.Merge
-            });
+        // Merge doesn't copy the properties.
+        menuItem[nameof(ContentItem.DisplayText)] = contentItem.DisplayText;
 
-            // Merge doesn't copy the properties.
-            menuItem[nameof(ContentItem.DisplayText)] = contentItem.DisplayText;
+        await _contentManager.SaveDraftAsync(menu);
 
-            await _contentManager.SaveDraftAsync(menu);
+        return RedirectToAction(nameof(Edit), "Admin", new { area = "OrchardCore.Contents", contentItemId = menuContentItemId });
+    }
 
-            return RedirectToAction(nameof(Edit), "Admin", new { area = "OrchardCore.Contents", contentItemId = menuContentItemId });
+    [HttpPost]
+    public async Task<IActionResult> Delete(string menuContentItemId, string menuItemId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMenu))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(string menuContentItemId, string menuItemId)
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync("Menu");
+        var menu = contentTypeDefinition.IsDraftable()
+            ? await _contentManager.GetAsync(menuContentItemId, VersionOptions.DraftRequired)
+            : await _contentManager.GetAsync(menuContentItemId, VersionOptions.Latest);
+
+        if (menu == null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageMenu))
-            {
-                return Forbid();
-            }
+            return NotFound();
+        }
 
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync("Menu");
-            var menu = contentTypeDefinition.IsDraftable()
-                ? await _contentManager.GetAsync(menuContentItemId, VersionOptions.DraftRequired)
-                : await _contentManager.GetAsync(menuContentItemId, VersionOptions.Latest);
+        var menuContentAsJson = (JsonObject)menu.Content;
+        // Look for the target menu item in the hierarchy.
+        var menuItem = FindMenuItem(menuContentAsJson, menuItemId);
 
-            if (menu == null)
-            {
-                return NotFound();
-            }
-
-            var menuContentAsJson = (JsonObject)menu.Content;
-            // Look for the target menu item in the hierarchy.
-            var menuItem = FindMenuItem(menuContentAsJson, menuItemId);
+        // Couldn't find targeted menu item.
+        if (menuItem == null)
+        {
+            return NotFound();
+        }
 
-            // Couldn't find targeted menu item.
-            if (menuItem == null)
-            {
-                return NotFound();
-            }
+        var menuItems = menuContentAsJson[nameof(MenuItemsListPart)]?[nameof(MenuItemsListPart.MenuItems)] as JsonArray;
+        menuItems?.Remove(menuItem);
 
-            var menuItems = menuContentAsJson[nameof(MenuItemsListPart)]?[nameof(MenuItemsListPart.MenuItems)] as JsonArray;
-            menuItems?.Remove(menuItem);
+        await _contentManager.SaveDraftAsync(menu);
 
-            await _contentManager.SaveDraftAsync(menu);
+        await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
 
-            await _notifier.SuccessAsync(H["Menu item deleted successfully."]);
+        return RedirectToAction(nameof(Edit), "Admin", new { area = "OrchardCore.Contents", contentItemId = menuContentItemId });
+    }
 
-            return RedirectToAction(nameof(Edit), "Admin", new { area = "OrchardCore.Contents", contentItemId = menuContentItemId });
+    private static JsonObject FindMenuItem(JsonObject contentItem, string menuItemId)
+    {
+        if (contentItem["ContentItemId"]?.Value<string>() == menuItemId)
+        {
+            return contentItem;
         }
 
-        private static JsonObject FindMenuItem(JsonObject contentItem, string menuItemId)
+        if (contentItem["MenuItemsListPart"] is null)
         {
-            if (contentItem["ContentItemId"]?.Value<string>() == menuItemId)
-            {
-                return contentItem;
-            }
+            return null;
+        }
 
-            if (contentItem["MenuItemsListPart"] is null)
-            {
-                return null;
-            }
+        var menuItems = (JsonArray)contentItem["MenuItemsListPart"]["MenuItems"];
 
-            var menuItems = (JsonArray)contentItem["MenuItemsListPart"]["MenuItems"];
+        JsonObject result;
+        foreach (var menuItem in menuItems.Cast<JsonObject>())
+        {
+            // Search in inner menu items.
+            result = FindMenuItem(menuItem, menuItemId);
 
-            JsonObject result;
-            foreach (var menuItem in menuItems.Cast<JsonObject>())
+            if (result != null)
             {
-                // Search in inner menu items.
-                result = FindMenuItem(menuItem, menuItemId);
-
-                if (result != null)
-                {
-                    return result;
-                }
+                return result;
             }
-
-            return null;
         }
+
+        return null;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Drivers/ContentMenuItemPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Menu/Drivers/ContentMenuItemPartDisplayDriver.cs
index 1feada74a4e..793e88619f1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Drivers/ContentMenuItemPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Drivers/ContentMenuItemPartDisplayDriver.cs
@@ -6,44 +6,43 @@
 using OrchardCore.Menu.Models;
 using OrchardCore.Menu.ViewModels;
 
-namespace OrchardCore.Menu.Drivers
+namespace OrchardCore.Menu.Drivers;
+
+public sealed class ContentMenuItemPartDisplayDriver : ContentPartDisplayDriver<ContentMenuItemPart>
 {
-    public sealed class ContentMenuItemPartDisplayDriver : ContentPartDisplayDriver<ContentMenuItemPart>
+    public override IDisplayResult Display(ContentMenuItemPart part, BuildPartDisplayContext context)
     {
-        public override IDisplayResult Display(ContentMenuItemPart part, BuildPartDisplayContext context)
-        {
-            return Combine(
-                Dynamic("ContentMenuItemPart_Admin", shape =>
-                {
-                    shape.MenuItemPart = part;
-                })
-                .Location("Admin", "Content:10"),
-                Dynamic("ContentMenuItemPart_Thumbnail", shape =>
-                {
-                    shape.MenuItemPart = part;
-                })
-                .Location("Thumbnail", "Content:10")
-            );
-        }
-
-        public override IDisplayResult Edit(ContentMenuItemPart part, BuildPartEditorContext context)
-        {
-            return Initialize<ContentMenuItemPartEditViewModel>("ContentMenuItemPart_Edit", model =>
+        return Combine(
+            Dynamic("ContentMenuItemPart_Admin", shape =>
+            {
+                shape.MenuItemPart = part;
+            })
+            .Location("Admin", "Content:10"),
+            Dynamic("ContentMenuItemPart_Thumbnail", shape =>
             {
-                model.Name = part.ContentItem.DisplayText;
-                model.MenuItemPart = part;
-            });
-        }
+                shape.MenuItemPart = part;
+            })
+            .Location("Thumbnail", "Content:10")
+        );
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentMenuItemPart part, UpdatePartEditorContext context)
+    public override IDisplayResult Edit(ContentMenuItemPart part, BuildPartEditorContext context)
+    {
+        return Initialize<ContentMenuItemPartEditViewModel>("ContentMenuItemPart_Edit", model =>
         {
-            var model = new ContentMenuItemPartEditViewModel();
+            model.Name = part.ContentItem.DisplayText;
+            model.MenuItemPart = part;
+        });
+    }
+
+    public override async Task<IDisplayResult> UpdateAsync(ContentMenuItemPart part, UpdatePartEditorContext context)
+    {
+        var model = new ContentMenuItemPartEditViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            part.ContentItem.DisplayText = model.Name;
+        part.ContentItem.DisplayText = model.Name;
 
-            return Edit(part, context);
-        }
+        return Edit(part, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Drivers/HtmlMenuItemPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Menu/Drivers/HtmlMenuItemPartDisplayDriver.cs
index 0a72c3800f0..db2c4909079 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Drivers/HtmlMenuItemPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Drivers/HtmlMenuItemPartDisplayDriver.cs
@@ -13,108 +13,107 @@
 using OrchardCore.Menu.Settings;
 using OrchardCore.Menu.ViewModels;
 
-namespace OrchardCore.Menu.Drivers
+namespace OrchardCore.Menu.Drivers;
+
+public sealed class HtmlMenuItemPartDisplayDriver : ContentPartDisplayDriver<HtmlMenuItemPart>
 {
-    public sealed class HtmlMenuItemPartDisplayDriver : ContentPartDisplayDriver<HtmlMenuItemPart>
+    private readonly IUrlHelperFactory _urlHelperFactory;
+    private readonly IActionContextAccessor _actionContextAccessor;
+    private readonly IHtmlSanitizerService _htmlSanitizerService;
+    private readonly HtmlEncoder _htmlencoder;
+
+    internal readonly IStringLocalizer S;
+
+    public HtmlMenuItemPartDisplayDriver(
+        IUrlHelperFactory urlHelperFactory,
+        IActionContextAccessor actionContextAccessor,
+        IStringLocalizer<HtmlMenuItemPartDisplayDriver> localizer,
+        IHtmlSanitizerService htmlSanitizerService,
+        HtmlEncoder htmlencoder
+        )
     {
-        private readonly IUrlHelperFactory _urlHelperFactory;
-        private readonly IActionContextAccessor _actionContextAccessor;
-        private readonly IHtmlSanitizerService _htmlSanitizerService;
-        private readonly HtmlEncoder _htmlencoder;
-
-        internal readonly IStringLocalizer S;
-
-        public HtmlMenuItemPartDisplayDriver(
-            IUrlHelperFactory urlHelperFactory,
-            IActionContextAccessor actionContextAccessor,
-            IStringLocalizer<HtmlMenuItemPartDisplayDriver> localizer,
-            IHtmlSanitizerService htmlSanitizerService,
-            HtmlEncoder htmlencoder
-            )
-        {
-            _urlHelperFactory = urlHelperFactory;
-            _actionContextAccessor = actionContextAccessor;
-            _htmlSanitizerService = htmlSanitizerService;
-            _htmlencoder = htmlencoder;
-            S = localizer;
-        }
-
-        public override IDisplayResult Display(HtmlMenuItemPart part, BuildPartDisplayContext context)
-        {
-            var settings = context.TypePartDefinition.GetSettings<HtmlMenuItemPartSettings>();
+        _urlHelperFactory = urlHelperFactory;
+        _actionContextAccessor = actionContextAccessor;
+        _htmlSanitizerService = htmlSanitizerService;
+        _htmlencoder = htmlencoder;
+        S = localizer;
+    }
 
-            if (settings.SanitizeHtml)
-            {
-                part.Html = _htmlSanitizerService.Sanitize(part.Html);
-            }
+    public override IDisplayResult Display(HtmlMenuItemPart part, BuildPartDisplayContext context)
+    {
+        var settings = context.TypePartDefinition.GetSettings<HtmlMenuItemPartSettings>();
 
-            return Combine(
-                Dynamic("HtmlMenuItemPart_Admin", shape =>
-                {
-                    shape.MenuItemPart = part;
-                })
-                .Location("Admin", "Content:10"),
-                Dynamic("HtmlMenuItemPart_Thumbnail", shape =>
-                {
-                    shape.MenuItemPart = part;
-                })
-                .Location("Thumbnail", "Content:10")
-            );
+        if (settings.SanitizeHtml)
+        {
+            part.Html = _htmlSanitizerService.Sanitize(part.Html);
         }
 
-        public override IDisplayResult Edit(HtmlMenuItemPart part, BuildPartEditorContext context)
-        {
-            return Initialize<HtmlMenuItemPartEditViewModel>("HtmlMenuItemPart_Edit", model =>
+        return Combine(
+            Dynamic("HtmlMenuItemPart_Admin", shape =>
             {
-                model.Name = part.ContentItem.DisplayText;
-                model.Url = part.Url;
-                model.Target = part.Target;
-                model.Html = part.Html;
-                model.MenuItemPart = part;
-            });
-        }
+                shape.MenuItemPart = part;
+            })
+            .Location("Admin", "Content:10"),
+            Dynamic("HtmlMenuItemPart_Thumbnail", shape =>
+            {
+                shape.MenuItemPart = part;
+            })
+            .Location("Thumbnail", "Content:10")
+        );
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(HtmlMenuItemPart part, UpdatePartEditorContext context)
+    public override IDisplayResult Edit(HtmlMenuItemPart part, BuildPartEditorContext context)
+    {
+        return Initialize<HtmlMenuItemPartEditViewModel>("HtmlMenuItemPart_Edit", model =>
         {
-            var settings = context.TypePartDefinition.GetSettings<HtmlMenuItemPartSettings>();
-            var model = new HtmlMenuItemPartEditViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+            model.Name = part.ContentItem.DisplayText;
+            model.Url = part.Url;
+            model.Target = part.Target;
+            model.Html = part.Html;
+            model.MenuItemPart = part;
+        });
+    }
+
+    public override async Task<IDisplayResult> UpdateAsync(HtmlMenuItemPart part, UpdatePartEditorContext context)
+    {
+        var settings = context.TypePartDefinition.GetSettings<HtmlMenuItemPartSettings>();
+        var model = new HtmlMenuItemPartEditViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
+
+        part.ContentItem.DisplayText = model.Name;
+        part.Html = settings.SanitizeHtml ? _htmlSanitizerService.Sanitize(model.Html) : model.Html;
+        part.Url = model.Url;
+        part.Target = model.Target;
 
-            part.ContentItem.DisplayText = model.Name;
-            part.Html = settings.SanitizeHtml ? _htmlSanitizerService.Sanitize(model.Html) : model.Html;
-            part.Url = model.Url;
-            part.Target = model.Target;
+        var urlToValidate = part.Url;
 
-            var urlToValidate = part.Url;
+        if (!string.IsNullOrEmpty(urlToValidate))
+        {
+            urlToValidate = urlToValidate.Split('#', 2)[0];
 
-            if (!string.IsNullOrEmpty(urlToValidate))
+            if (urlToValidate.StartsWith("~/", StringComparison.Ordinal))
             {
-                urlToValidate = urlToValidate.Split('#', 2)[0];
+                var urlHelper = _urlHelperFactory.GetUrlHelper(_actionContextAccessor.ActionContext);
+                urlToValidate = urlHelper.Content(urlToValidate);
+            }
 
-                if (urlToValidate.StartsWith("~/", StringComparison.Ordinal))
-                {
-                    var urlHelper = _urlHelperFactory.GetUrlHelper(_actionContextAccessor.ActionContext);
-                    urlToValidate = urlHelper.Content(urlToValidate);
-                }
+            urlToValidate = urlToValidate.ToUriComponents();
 
-                urlToValidate = urlToValidate.ToUriComponents();
+            if (!Uri.IsWellFormedUriString(urlToValidate, UriKind.RelativeOrAbsolute))
+            {
+                context.Updater.ModelState.AddModelError(nameof(part.Url), S["{0} is an invalid url.", part.Url]);
+            }
+            else
+            {
+                var link = $"<a href=\"{_htmlencoder.Encode(urlToValidate)}\"></a>";
 
-                if (!Uri.IsWellFormedUriString(urlToValidate, UriKind.RelativeOrAbsolute))
+                if (!string.Equals(link, _htmlSanitizerService.Sanitize(link), StringComparison.OrdinalIgnoreCase))
                 {
                     context.Updater.ModelState.AddModelError(nameof(part.Url), S["{0} is an invalid url.", part.Url]);
                 }
-                else
-                {
-                    var link = $"<a href=\"{_htmlencoder.Encode(urlToValidate)}\"></a>";
-
-                    if (!string.Equals(link, _htmlSanitizerService.Sanitize(link), StringComparison.OrdinalIgnoreCase))
-                    {
-                        context.Updater.ModelState.AddModelError(nameof(part.Url), S["{0} is an invalid url.", part.Url]);
-                    }
-                }
             }
-
-            return Edit(part, context);
         }
+
+        return Edit(part, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Drivers/LinkMenuItemPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Menu/Drivers/LinkMenuItemPartDisplayDriver.cs
index 2e8cb84f694..ca52cc2fb38 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Drivers/LinkMenuItemPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Drivers/LinkMenuItemPartDisplayDriver.cs
@@ -12,99 +12,98 @@
 using OrchardCore.Menu.Models;
 using OrchardCore.Menu.ViewModels;
 
-namespace OrchardCore.Menu.Drivers
+namespace OrchardCore.Menu.Drivers;
+
+public sealed class LinkMenuItemPartDisplayDriver : ContentPartDisplayDriver<LinkMenuItemPart>
 {
-    public sealed class LinkMenuItemPartDisplayDriver : ContentPartDisplayDriver<LinkMenuItemPart>
-    {
-        private readonly IUrlHelperFactory _urlHelperFactory;
-        private readonly IActionContextAccessor _actionContextAccessor;
-        private readonly IHtmlSanitizerService _htmlSanitizerService;
-        private readonly HtmlEncoder _htmlEncoder;
-
-        internal readonly IStringLocalizer S;
-
-        public LinkMenuItemPartDisplayDriver(
-            IUrlHelperFactory urlHelperFactory,
-            IActionContextAccessor actionContextAccessor,
-            IStringLocalizer<LinkMenuItemPartDisplayDriver> localizer,
-            IHtmlSanitizerService htmlSanitizerService,
-            HtmlEncoder htmlEncoder
-            )
-        {
-            _urlHelperFactory = urlHelperFactory;
-            _actionContextAccessor = actionContextAccessor;
-            _htmlSanitizerService = htmlSanitizerService;
-            _htmlEncoder = htmlEncoder;
-            S = localizer;
-        }
+    private readonly IUrlHelperFactory _urlHelperFactory;
+    private readonly IActionContextAccessor _actionContextAccessor;
+    private readonly IHtmlSanitizerService _htmlSanitizerService;
+    private readonly HtmlEncoder _htmlEncoder;
 
-        public override IDisplayResult Display(LinkMenuItemPart part, BuildPartDisplayContext context)
-        {
-            return Combine(
-                Dynamic("LinkMenuItemPart_Admin", shape =>
-                {
-                    shape.MenuItemPart = part;
-                })
-                .Location("Admin", "Content:10"),
-                Dynamic("LinkMenuItemPart_Thumbnail", shape =>
-                {
-                    shape.MenuItemPart = part;
-                })
-                .Location("Thumbnail", "Content:10")
-            );
-        }
+    internal readonly IStringLocalizer S;
 
-        public override IDisplayResult Edit(LinkMenuItemPart part, BuildPartEditorContext context)
-        {
-            return Initialize<LinkMenuItemPartEditViewModel>("LinkMenuItemPart_Edit", model =>
+    public LinkMenuItemPartDisplayDriver(
+        IUrlHelperFactory urlHelperFactory,
+        IActionContextAccessor actionContextAccessor,
+        IStringLocalizer<LinkMenuItemPartDisplayDriver> localizer,
+        IHtmlSanitizerService htmlSanitizerService,
+        HtmlEncoder htmlEncoder
+        )
+    {
+        _urlHelperFactory = urlHelperFactory;
+        _actionContextAccessor = actionContextAccessor;
+        _htmlSanitizerService = htmlSanitizerService;
+        _htmlEncoder = htmlEncoder;
+        S = localizer;
+    }
+
+    public override IDisplayResult Display(LinkMenuItemPart part, BuildPartDisplayContext context)
+    {
+        return Combine(
+            Dynamic("LinkMenuItemPart_Admin", shape =>
             {
-                model.Name = part.ContentItem.DisplayText;
-                model.Url = part.Url;
-                model.Target = part.Target;
-                model.MenuItemPart = part;
-            });
-        }
+                shape.MenuItemPart = part;
+            })
+            .Location("Admin", "Content:10"),
+            Dynamic("LinkMenuItemPart_Thumbnail", shape =>
+            {
+                shape.MenuItemPart = part;
+            })
+            .Location("Thumbnail", "Content:10")
+        );
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(LinkMenuItemPart part, UpdatePartEditorContext context)
+    public override IDisplayResult Edit(LinkMenuItemPart part, BuildPartEditorContext context)
+    {
+        return Initialize<LinkMenuItemPartEditViewModel>("LinkMenuItemPart_Edit", model =>
         {
-            var model = new LinkMenuItemPartEditViewModel();
+            model.Name = part.ContentItem.DisplayText;
+            model.Url = part.Url;
+            model.Target = part.Target;
+            model.MenuItemPart = part;
+        });
+    }
+
+    public override async Task<IDisplayResult> UpdateAsync(LinkMenuItemPart part, UpdatePartEditorContext context)
+    {
+        var model = new LinkMenuItemPartEditViewModel();
+
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        part.Url = model.Url;
+        part.Target = model.Target;
+        part.ContentItem.DisplayText = model.Name;
 
-            part.Url = model.Url;
-            part.Target = model.Target;
-            part.ContentItem.DisplayText = model.Name;
+        var urlToValidate = part.Url;
 
-            var urlToValidate = part.Url;
+        if (!string.IsNullOrEmpty(urlToValidate))
+        {
+            urlToValidate = urlToValidate.Split('#', 2)[0];
 
-            if (!string.IsNullOrEmpty(urlToValidate))
+            if (urlToValidate.StartsWith("~/", StringComparison.Ordinal))
             {
-                urlToValidate = urlToValidate.Split('#', 2)[0];
+                var urlHelper = _urlHelperFactory.GetUrlHelper(_actionContextAccessor.ActionContext);
+                urlToValidate = urlHelper.Content(urlToValidate);
+            }
 
-                if (urlToValidate.StartsWith("~/", StringComparison.Ordinal))
-                {
-                    var urlHelper = _urlHelperFactory.GetUrlHelper(_actionContextAccessor.ActionContext);
-                    urlToValidate = urlHelper.Content(urlToValidate);
-                }
+            urlToValidate = urlToValidate.ToUriComponents();
 
-                urlToValidate = urlToValidate.ToUriComponents();
+            if (!Uri.IsWellFormedUriString(urlToValidate, UriKind.RelativeOrAbsolute))
+            {
+                context.Updater.ModelState.AddModelError(nameof(part.Url), S["{0} is an invalid url.", part.Url]);
+            }
+            else
+            {
+                var link = $"<a href=\"{_htmlEncoder.Encode(urlToValidate)}\"></a>";
 
-                if (!Uri.IsWellFormedUriString(urlToValidate, UriKind.RelativeOrAbsolute))
+                if (!string.Equals(link, _htmlSanitizerService.Sanitize(link), StringComparison.OrdinalIgnoreCase))
                 {
                     context.Updater.ModelState.AddModelError(nameof(part.Url), S["{0} is an invalid url.", part.Url]);
                 }
-                else
-                {
-                    var link = $"<a href=\"{_htmlEncoder.Encode(urlToValidate)}\"></a>";
-
-                    if (!string.Equals(link, _htmlSanitizerService.Sanitize(link), StringComparison.OrdinalIgnoreCase))
-                    {
-                        context.Updater.ModelState.AddModelError(nameof(part.Url), S["{0} is an invalid url.", part.Url]);
-                    }
-                }
             }
-
-            return Edit(part, context);
         }
+
+        return Edit(part, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Drivers/MenuPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Menu/Drivers/MenuPartDisplayDriver.cs
index c7f31e83f1f..87c02fcacde 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Drivers/MenuPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Drivers/MenuPartDisplayDriver.cs
@@ -16,139 +16,138 @@
 using OrchardCore.Menu.Models;
 using OrchardCore.Menu.ViewModels;
 
-namespace OrchardCore.Menu.Drivers
+namespace OrchardCore.Menu.Drivers;
+
+public sealed class MenuPartDisplayDriver : ContentPartDisplayDriver<MenuPart>
 {
-    public sealed class MenuPartDisplayDriver : ContentPartDisplayDriver<MenuPart>
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly INotifier _notifier;
+    private readonly ILogger _logger;
+
+    internal readonly IHtmlLocalizer H;
+
+    public MenuPartDisplayDriver(
+        IContentDefinitionManager contentDefinitionManager,
+        INotifier notifier,
+        ILogger<MenuPartDisplayDriver> logger,
+        IHtmlLocalizer<MenuPartDisplayDriver> htmlLocalizer
+        )
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly INotifier _notifier;
-        private readonly ILogger _logger;
-
-        internal readonly IHtmlLocalizer H;
-
-        public MenuPartDisplayDriver(
-            IContentDefinitionManager contentDefinitionManager,
-            INotifier notifier,
-            ILogger<MenuPartDisplayDriver> logger,
-            IHtmlLocalizer<MenuPartDisplayDriver> htmlLocalizer
-            )
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _notifier = notifier;
-            _logger = logger;
-            H = htmlLocalizer;
-        }
+        _contentDefinitionManager = contentDefinitionManager;
+        _notifier = notifier;
+        _logger = logger;
+        H = htmlLocalizer;
+    }
 
-        public override IDisplayResult Edit(MenuPart part, BuildPartEditorContext context)
+    public override IDisplayResult Edit(MenuPart part, BuildPartEditorContext context)
+    {
+        return Initialize<MenuPartEditViewModel>("MenuPart_Edit", async model =>
         {
-            return Initialize<MenuPartEditViewModel>("MenuPart_Edit", async model =>
-            {
-                var menuItemContentTypes = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
-                    .Where(t => t.StereotypeEquals("MenuItem"))
-                    .ToArray();
+            var menuItemContentTypes = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
+                .Where(t => t.StereotypeEquals("MenuItem"))
+                .ToArray();
 
-                var notify = false;
+            var notify = false;
 
-                foreach (var menuItem in part.ContentItem.As<MenuItemsListPart>().MenuItems)
+            foreach (var menuItem in part.ContentItem.As<MenuItemsListPart>().MenuItems)
+            {
+                if (!menuItemContentTypes.Any(c => c.Name == menuItem.ContentType))
                 {
-                    if (!menuItemContentTypes.Any(c => c.Name == menuItem.ContentType))
-                    {
-                        _logger.LogWarning("The menu item content item with id {ContentItemId} has no matching {ContentType} content type definition.", menuItem.ContentItem.ContentItemId, menuItem.ContentItem.ContentType);
-                        await _notifier.WarningAsync(H["The menu item content item with id {0} has no matching {1} content type definition.", menuItem.ContentItem.ContentItemId, menuItem.ContentItem.ContentType]);
-                        notify = true;
-                    }
+                    _logger.LogWarning("The menu item content item with id {ContentItemId} has no matching {ContentType} content type definition.", menuItem.ContentItem.ContentItemId, menuItem.ContentItem.ContentType);
+                    await _notifier.WarningAsync(H["The menu item content item with id {0} has no matching {1} content type definition.", menuItem.ContentItem.ContentItemId, menuItem.ContentItem.ContentType]);
+                    notify = true;
                 }
+            }
 
-                if (notify)
-                {
-                    await _notifier.WarningAsync(H["Publishing this content item may erase created content. Fix any content type issues beforehand."]);
-                }
+            if (notify)
+            {
+                await _notifier.WarningAsync(H["Publishing this content item may erase created content. Fix any content type issues beforehand."]);
+            }
 
-                model.MenuPart = part;
-                model.MenuItemContentTypes = menuItemContentTypes;
-            });
-        }
+            model.MenuPart = part;
+            model.MenuItemContentTypes = menuItemContentTypes;
+        });
+    }
+
+    public override async Task<IDisplayResult> UpdateAsync(MenuPart part, UpdatePartEditorContext context)
+    {
+        var model = new MenuPartEditViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix, t => t.Hierarchy);
 
-        public override async Task<IDisplayResult> UpdateAsync(MenuPart part, UpdatePartEditorContext context)
+        if (!string.IsNullOrWhiteSpace(model.Hierarchy))
         {
-            var model = new MenuPartEditViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix, t => t.Hierarchy);
+            var menuItems = new JsonArray();
 
-            if (!string.IsNullOrWhiteSpace(model.Hierarchy))
-            {
-                var menuItems = new JsonArray();
+            var originalMenuItems = part.ContentItem.As<MenuItemsListPart>();
 
-                var originalMenuItems = part.ContentItem.As<MenuItemsListPart>();
+            if (originalMenuItems is not null)
+            {
+                var newHierarchy = JArray.Parse(model.Hierarchy);
 
-                if (originalMenuItems is not null)
+                foreach (var item in newHierarchy)
                 {
-                    var newHierarchy = JArray.Parse(model.Hierarchy);
-
-                    foreach (var item in newHierarchy)
-                    {
-                        menuItems.Add(ProcessItem(originalMenuItems, item as JsonObject));
-                    }
+                    menuItems.Add(ProcessItem(originalMenuItems, item as JsonObject));
                 }
-
-                part.ContentItem.Content[nameof(MenuItemsListPart)] = new JsonObject
-                {
-                    [nameof(MenuItemsListPart.MenuItems)] = menuItems,
-                };
             }
 
-            return Edit(part, context);
+            part.ContentItem.Content[nameof(MenuItemsListPart)] = new JsonObject
+            {
+                [nameof(MenuItemsListPart.MenuItems)] = menuItems,
+            };
         }
 
-        /// <summary>
-        /// Clone the content items at the specific index.
-        /// </summary>
-        private static JsonObject GetMenuItemAt(MenuItemsListPart menuItems, int[] indexes)
-        {
-            ContentItem menuItem = null;
+        return Edit(part, context);
+    }
 
-            foreach (var index in indexes)
-            {
-                menuItem = menuItems.MenuItems[index];
-                menuItems = menuItem.As<MenuItemsListPart>();
-            }
+    /// <summary>
+    /// Clone the content items at the specific index.
+    /// </summary>
+    private static JsonObject GetMenuItemAt(MenuItemsListPart menuItems, int[] indexes)
+    {
+        ContentItem menuItem = null;
 
-            var newObj = JObject.FromObject(menuItem, JOptions.Default);
+        foreach (var index in indexes)
+        {
+            menuItem = menuItems.MenuItems[index];
+            menuItems = menuItem.As<MenuItemsListPart>();
+        }
 
-            if (newObj[nameof(MenuItemsListPart)] != null)
-            {
-                newObj[nameof(MenuItemsListPart)] = new JsonObject
-                {
-                    [nameof(MenuItemsListPart.MenuItems)] = new JsonArray()
-                };
-            }
+        var newObj = JObject.FromObject(menuItem, JOptions.Default);
 
-            return newObj;
+        if (newObj[nameof(MenuItemsListPart)] != null)
+        {
+            newObj[nameof(MenuItemsListPart)] = new JsonObject
+            {
+                [nameof(MenuItemsListPart.MenuItems)] = new JsonArray()
+            };
         }
 
-        private static JsonObject ProcessItem(MenuItemsListPart originalItems, JsonObject item)
-        {
-            var indexes = item["index"]?.ToString().Split('-').Select(x => Convert.ToInt32(x)).ToArray() ?? [];
+        return newObj;
+    }
 
-            var contentItem = GetMenuItemAt(originalItems, indexes);
+    private static JsonObject ProcessItem(MenuItemsListPart originalItems, JsonObject item)
+    {
+        var indexes = item["index"]?.ToString().Split('-').Select(x => Convert.ToInt32(x)).ToArray() ?? [];
 
-            var children = item["children"] as JsonArray;
+        var contentItem = GetMenuItemAt(originalItems, indexes);
 
-            if (children is not null)
-            {
-                var menuItems = new JsonArray();
+        var children = item["children"] as JsonArray;
 
-                for (var i = 0; i < children.Count; i++)
-                {
-                    menuItems.Add(ProcessItem(originalItems, children[i] as JsonObject));
-                }
+        if (children is not null)
+        {
+            var menuItems = new JsonArray();
 
-                contentItem[nameof(MenuItemsListPart)] = new JsonObject
-                {
-                    [nameof(MenuItemsListPart.MenuItems)] = menuItems,
-                };
+            for (var i = 0; i < children.Count; i++)
+            {
+                menuItems.Add(ProcessItem(originalItems, children[i] as JsonObject));
             }
 
-            return contentItem;
+            contentItem[nameof(MenuItemsListPart)] = new JsonObject
+            {
+                [nameof(MenuItemsListPart.MenuItems)] = menuItems,
+            };
         }
+
+        return contentItem;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/HtmlMenuItemQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/HtmlMenuItemQueryObjectType.cs
index bd57ae30466..c2fbf91727c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/HtmlMenuItemQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/HtmlMenuItemQueryObjectType.cs
@@ -1,17 +1,16 @@
 using GraphQL.Types;
 using OrchardCore.Menu.Models;
 
-namespace OrchardCore.Menu.GraphQL
+namespace OrchardCore.Menu.GraphQL;
+
+public class HtmlMenuItemQueryObjectType : ObjectGraphType<HtmlMenuItemPart>
 {
-    public class HtmlMenuItemQueryObjectType : ObjectGraphType<HtmlMenuItemPart>
+    public HtmlMenuItemQueryObjectType()
     {
-        public HtmlMenuItemQueryObjectType()
-        {
-            Name = "HtmlMenuItemPart";
+        Name = "HtmlMenuItemPart";
 
-            Field(x => x.Url, nullable: true);
-            Field(x => x.Target, nullable: true);
-            Field(x => x.Html, nullable: true);
-        }
+        Field(x => x.Url, nullable: true);
+        Field(x => x.Target, nullable: true);
+        Field(x => x.Html, nullable: true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/LinkMenuItemQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/LinkMenuItemQueryObjectType.cs
index 4c0d9746eae..2f357eae9dc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/LinkMenuItemQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/LinkMenuItemQueryObjectType.cs
@@ -1,15 +1,14 @@
 using GraphQL.Types;
 using OrchardCore.Menu.Models;
 
-namespace OrchardCore.Menu.GraphQL
+namespace OrchardCore.Menu.GraphQL;
+
+public class LinkMenuItemQueryObjectType : ObjectGraphType<LinkMenuItemPart>
 {
-    public class LinkMenuItemQueryObjectType : ObjectGraphType<LinkMenuItemPart>
+    public LinkMenuItemQueryObjectType()
     {
-        public LinkMenuItemQueryObjectType()
-        {
-            Name = "LinkMenuItemPart";
+        Name = "LinkMenuItemPart";
 
-            Field(x => x.Url, nullable: true);
-        }
+        Field(x => x.Url, nullable: true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/MenuItemContentTypeBuilder.cs b/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/MenuItemContentTypeBuilder.cs
index f8476e23840..6b1b8858d31 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/MenuItemContentTypeBuilder.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/MenuItemContentTypeBuilder.cs
@@ -6,25 +6,24 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Menu.Models;
 
-namespace OrchardCore.Menu.GraphQL
+namespace OrchardCore.Menu.GraphQL;
+
+public class MenuItemContentTypeBuilder : IContentTypeBuilder
 {
-    public class MenuItemContentTypeBuilder : IContentTypeBuilder
+    public void Build(ISchema schema, FieldType contentQuery, ContentTypeDefinition contentTypeDefinition, ContentItemType contentItemType)
     {
-        public void Build(ISchema schema, FieldType contentQuery, ContentTypeDefinition contentTypeDefinition, ContentItemType contentItemType)
+        if (contentTypeDefinition.GetStereotype() != "MenuItem")
         {
-            if (contentTypeDefinition.GetStereotype() != "MenuItem")
-            {
-                return;
-            }
+            return;
+        }
 
-            contentItemType.AddField(new FieldType
-            {
-                Type = typeof(MenuItemsListQueryObjectType),
-                Name = nameof(MenuItemsListPart).ToFieldName(),
-                Resolver = new FuncFieldResolver<ContentItem, MenuItemsListPart>(context => context.Source.As<MenuItemsListPart>())
-            });
+        contentItemType.AddField(new FieldType
+        {
+            Type = typeof(MenuItemsListQueryObjectType),
+            Name = nameof(MenuItemsListPart).ToFieldName(),
+            Resolver = new FuncFieldResolver<ContentItem, MenuItemsListPart>(context => context.Source.As<MenuItemsListPart>())
+        });
 
-            contentItemType.Interface<MenuItemInterface>();
-        }
+        contentItemType.Interface<MenuItemInterface>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/MenuItemInterface.cs b/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/MenuItemInterface.cs
index 9692509eb5b..23ef0cae5cc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/MenuItemInterface.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/MenuItemInterface.cs
@@ -1,14 +1,13 @@
 using GraphQL.Types;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Menu.GraphQL
+namespace OrchardCore.Menu.GraphQL;
+
+public class MenuItemInterface : InterfaceGraphType<ContentItem>
 {
-    public class MenuItemInterface : InterfaceGraphType<ContentItem>
+    public MenuItemInterface()
     {
-        public MenuItemInterface()
-        {
-            Name = "MenuItem";
-            Field<MenuItemsListQueryObjectType>("menuItemsList");
-        }
+        Name = "MenuItem";
+        Field<MenuItemsListQueryObjectType>("menuItemsList");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/MenuItemsListQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/MenuItemsListQueryObjectType.cs
index 19ccba88ccc..24308cf57ee 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/MenuItemsListQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/MenuItemsListQueryObjectType.cs
@@ -1,18 +1,17 @@
 using GraphQL.Types;
 using OrchardCore.Menu.Models;
 
-namespace OrchardCore.Menu.GraphQL
+namespace OrchardCore.Menu.GraphQL;
+
+public class MenuItemsListQueryObjectType : ObjectGraphType<MenuItemsListPart>
 {
-    public class MenuItemsListQueryObjectType : ObjectGraphType<MenuItemsListPart>
+    public MenuItemsListQueryObjectType()
     {
-        public MenuItemsListQueryObjectType()
-        {
-            Name = "MenuItemsListPart";
+        Name = "MenuItemsListPart";
 
-            Field<ListGraphType<MenuItemInterface>>("menuItems")
-               .Description("The menu items.")
-                .Resolve(context => context.Source.MenuItems);
+        Field<ListGraphType<MenuItemInterface>>("menuItems")
+           .Description("The menu items.")
+            .Resolve(context => context.Source.MenuItems);
 
-        }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/Startup.cs
index b26bd9dc8aa..9c4efb9e181 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/Startup.cs
@@ -4,17 +4,16 @@
 using OrchardCore.Menu.Models;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Menu.GraphQL
+namespace OrchardCore.Menu.GraphQL;
+
+[RequireFeatures("OrchardCore.Apis.GraphQL")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Apis.GraphQL")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddObjectGraphType<MenuItemsListPart, MenuItemsListQueryObjectType>();
-            services.AddObjectGraphType<LinkMenuItemPart, LinkMenuItemQueryObjectType>();
-            services.AddObjectGraphType<HtmlMenuItemPart, HtmlMenuItemQueryObjectType>();
-            services.AddScoped<IContentTypeBuilder, MenuItemContentTypeBuilder>();
-        }
+        services.AddObjectGraphType<MenuItemsListPart, MenuItemsListQueryObjectType>();
+        services.AddObjectGraphType<LinkMenuItemPart, LinkMenuItemQueryObjectType>();
+        services.AddObjectGraphType<HtmlMenuItemPart, HtmlMenuItemQueryObjectType>();
+        services.AddScoped<IContentTypeBuilder, MenuItemContentTypeBuilder>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Handlers/MenuContentHandler.cs b/src/OrchardCore.Modules/OrchardCore.Menu/Handlers/MenuContentHandler.cs
index 85261db1694..470b91d1178 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Handlers/MenuContentHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Handlers/MenuContentHandler.cs
@@ -3,20 +3,19 @@
 using OrchardCore.ContentManagement.Handlers;
 using OrchardCore.Menu.Models;
 
-namespace OrchardCore.Menu.Handlers
+namespace OrchardCore.Menu.Handlers;
+
+public class MenuContentHandler : ContentHandlerBase
 {
-    public class MenuContentHandler : ContentHandlerBase
+    public override Task ActivatedAsync(ActivatedContentContext context)
     {
-        public override Task ActivatedAsync(ActivatedContentContext context)
+        // When a Menu is created, we add a MenuPart to it
+        if (context.ContentItem.ContentType == "Menu")
         {
-            // When a Menu is created, we add a MenuPart to it
-            if (context.ContentItem.ContentType == "Menu")
-            {
-                context.ContentItem.Weld<MenuPart>(new { Position = "3" });
-                context.ContentItem.Weld<MenuItemsListPart>(new { Position = "4" });
-            }
-
-            return Task.CompletedTask;
+            context.ContentItem.Weld<MenuPart>(new { Position = "3" });
+            context.ContentItem.Weld<MenuItemsListPart>(new { Position = "4" });
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/MenuShapes.cs b/src/OrchardCore.Modules/OrchardCore.Menu/MenuShapes.cs
index f957782ed4a..66e2f518da8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/MenuShapes.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/MenuShapes.cs
@@ -9,211 +9,210 @@
 using OrchardCore.Menu.Models;
 using OrchardCore.Mvc.Utilities;
 
-namespace OrchardCore.Menu
+namespace OrchardCore.Menu;
+
+public class MenuShapes : ShapeTableProvider
 {
-    public class MenuShapes : ShapeTableProvider
+    public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
     {
-        public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
-        {
-            builder.Describe("Menu")
-                .OnProcessing(async context =>
+        builder.Describe("Menu")
+            .OnProcessing(async context =>
+            {
+                var menu = context.Shape;
+
+                // Menu population is executed when processing the shape so that its value
+                // can be cached. IShapeDisplayEvents is called before the ShapeDescriptor
+                // events and thus this code can be cached.
+
+                var shapeFactory = context.ServiceProvider.GetRequiredService<IShapeFactory>();
+                var contentManager = context.ServiceProvider.GetRequiredService<IContentManager>();
+                var handleManager = context.ServiceProvider.GetRequiredService<IContentHandleManager>();
+
+                var contentItemId = menu.TryGetProperty("Alias", out object alias) && alias != null
+                    ? await handleManager.GetContentItemIdAsync(alias.ToString())
+                    : menu.TryGetProperty("ContentItemId", out object id)
+                        ? id.ToString()
+                        : null;
+
+                if (contentItemId == null)
                 {
-                    var menu = context.Shape;
+                    return;
+                }
 
-                    // Menu population is executed when processing the shape so that its value
-                    // can be cached. IShapeDisplayEvents is called before the ShapeDescriptor
-                    // events and thus this code can be cached.
+                menu.Classes.Add("menu");
 
-                    var shapeFactory = context.ServiceProvider.GetRequiredService<IShapeFactory>();
-                    var contentManager = context.ServiceProvider.GetRequiredService<IContentManager>();
-                    var handleManager = context.ServiceProvider.GetRequiredService<IContentHandleManager>();
+                var menuContentItem = await contentManager.GetAsync(contentItemId);
 
-                    var contentItemId = menu.TryGetProperty("Alias", out object alias) && alias != null
-                        ? await handleManager.GetContentItemIdAsync(alias.ToString())
-                        : menu.TryGetProperty("ContentItemId", out object id)
-                            ? id.ToString()
-                            : null;
+                if (menuContentItem == null)
+                {
+                    return;
+                }
 
-                    if (contentItemId == null)
-                    {
-                        return;
-                    }
+                menu.Properties["ContentItem"] = menuContentItem;
 
-                    menu.Classes.Add("menu");
+                menu.Properties["MenuName"] = menuContentItem.DisplayText;
 
-                    var menuContentItem = await contentManager.GetAsync(contentItemId);
+                var menuItems = menuContentItem.As<MenuItemsListPart>()?.MenuItems;
 
-                    if (menuContentItem == null)
-                    {
-                        return;
-                    }
+                if (menuItems == null)
+                {
+                    return;
+                }
 
-                    menu.Properties["ContentItem"] = menuContentItem;
+                var differentiator = FormatName(menu.GetProperty<string>("MenuName"));
 
-                    menu.Properties["MenuName"] = menuContentItem.DisplayText;
+                if (!string.IsNullOrEmpty(differentiator))
+                {
+                    // Menu__[MenuName] e.g. Menu-MainMenu
+                    menu.Metadata.Alternates.Add("Menu__" + differentiator);
+                    menu.Metadata.Differentiator = differentiator;
+                    menu.Classes.Add(("menu-" + differentiator).HtmlClassify());
+                }
 
-                    var menuItems = menuContentItem.As<MenuItemsListPart>()?.MenuItems;
+                // The first level of menu item shapes is created.
+                // Each other level is created when the menu item is displayed.
 
-                    if (menuItems == null)
+                foreach (var contentItem in menuItems)
+                {
+                    var shape = await shapeFactory.CreateAsync("MenuItem", Arguments.From(new
                     {
-                        return;
-                    }
+                        ContentItem = contentItem,
+                        Level = 0,
+                        Menu = menu
+                    }));
 
-                    var differentiator = FormatName(menu.GetProperty<string>("MenuName"));
+                    shape.Metadata.Differentiator = differentiator;
 
-                    if (!string.IsNullOrEmpty(differentiator))
-                    {
-                        // Menu__[MenuName] e.g. Menu-MainMenu
-                        menu.Metadata.Alternates.Add("Menu__" + differentiator);
-                        menu.Metadata.Differentiator = differentiator;
-                        menu.Classes.Add(("menu-" + differentiator).HtmlClassify());
-                    }
+                    // Don't use Items.Add() or the collection won't be sorted
+                    await ((Shape)menu).AddAsync(shape);
+                }
+            });
 
-                    // The first level of menu item shapes is created.
-                    // Each other level is created when the menu item is displayed.
+        builder.Describe("MenuItem")
+            .OnDisplaying(async context =>
+            {
+                var menuItem = context.Shape;
+                var menuContentItem = menuItem.GetProperty<ContentItem>("ContentItem");
+                var menu = menuItem.GetProperty<IShape>("Menu");
+                var level = menuItem.GetProperty<int>("Level");
+                var differentiator = menuItem.Metadata.Differentiator;
 
+                var shapeFactory = context.ServiceProvider.GetRequiredService<IShapeFactory>();
+
+                var menuItems = menuContentItem.As<MenuItemsListPart>()?.MenuItems;
+
+                if (menuItems != null)
+                {
                     foreach (var contentItem in menuItems)
                     {
                         var shape = await shapeFactory.CreateAsync("MenuItem", Arguments.From(new
                         {
                             ContentItem = contentItem,
-                            Level = 0,
+                            Level = level + 1,
                             Menu = menu
                         }));
 
                         shape.Metadata.Differentiator = differentiator;
 
                         // Don't use Items.Add() or the collection won't be sorted
-                        await ((Shape)menu).AddAsync(shape);
+                        await menuItem.AddAsync(shape);
                     }
-                });
-
-            builder.Describe("MenuItem")
-                .OnDisplaying(async context =>
-                {
-                    var menuItem = context.Shape;
-                    var menuContentItem = menuItem.GetProperty<ContentItem>("ContentItem");
-                    var menu = menuItem.GetProperty<IShape>("Menu");
-                    var level = menuItem.GetProperty<int>("Level");
-                    var differentiator = menuItem.Metadata.Differentiator;
-
-                    var shapeFactory = context.ServiceProvider.GetRequiredService<IShapeFactory>();
-
-                    var menuItems = menuContentItem.As<MenuItemsListPart>()?.MenuItems;
+                }
 
-                    if (menuItems != null)
-                    {
-                        foreach (var contentItem in menuItems)
-                        {
-                            var shape = await shapeFactory.CreateAsync("MenuItem", Arguments.From(new
-                            {
-                                ContentItem = contentItem,
-                                Level = level + 1,
-                                Menu = menu
-                            }));
-
-                            shape.Metadata.Differentiator = differentiator;
-
-                            // Don't use Items.Add() or the collection won't be sorted
-                            await menuItem.AddAsync(shape);
-                        }
-                    }
+                var encodedContentType = menuContentItem.ContentItem.ContentType.EncodeAlternateElement();
 
-                    var encodedContentType = menuContentItem.ContentItem.ContentType.EncodeAlternateElement();
+                // MenuItem__level__[level] e.g. MenuItem-level-2
+                menuItem.Metadata.Alternates.Add("MenuItem__level__" + level);
 
-                    // MenuItem__level__[level] e.g. MenuItem-level-2
-                    menuItem.Metadata.Alternates.Add("MenuItem__level__" + level);
+                // MenuItem__[ContentType] e.g. MenuItem-HtmlMenuItem
+                // MenuItem__[ContentType]__level__[level] e.g. MenuItem-HtmlMenuItem-level-2
+                menuItem.Metadata.Alternates.Add("MenuItem__" + encodedContentType);
+                menuItem.Metadata.Alternates.Add("MenuItem__" + encodedContentType + "__level__" + level);
 
-                    // MenuItem__[ContentType] e.g. MenuItem-HtmlMenuItem
-                    // MenuItem__[ContentType]__level__[level] e.g. MenuItem-HtmlMenuItem-level-2
-                    menuItem.Metadata.Alternates.Add("MenuItem__" + encodedContentType);
-                    menuItem.Metadata.Alternates.Add("MenuItem__" + encodedContentType + "__level__" + level);
+                if (!string.IsNullOrEmpty(differentiator))
+                {
+                    // MenuItem__[MenuName] e.g. MenuItem-MainMenu
+                    // MenuItem__[MenuName]__level__[level] e.g. MenuItem-MainMenu-level-2
+                    menuItem.Metadata.Alternates.Add("MenuItem__" + differentiator);
+                    menuItem.Metadata.Alternates.Add("MenuItem__" + differentiator + "__level__" + level);
+
+                    // MenuItem__[MenuName]__[ContentType] e.g. MenuItem-MainMenu-HtmlMenuItem
+                    // MenuItem__[MenuName]__[ContentType]__level__[level] e.g. MenuItem-MainMenu-HtmlMenuItem-level-2
+                    menuItem.Metadata.Alternates.Add("MenuItem__" + differentiator + "__" + encodedContentType);
+                    menuItem.Metadata.Alternates.Add("MenuItem__" + differentiator + "__" + encodedContentType + "__level__" + level);
+                }
+            });
 
-                    if (!string.IsNullOrEmpty(differentiator))
-                    {
-                        // MenuItem__[MenuName] e.g. MenuItem-MainMenu
-                        // MenuItem__[MenuName]__level__[level] e.g. MenuItem-MainMenu-level-2
-                        menuItem.Metadata.Alternates.Add("MenuItem__" + differentiator);
-                        menuItem.Metadata.Alternates.Add("MenuItem__" + differentiator + "__level__" + level);
-
-                        // MenuItem__[MenuName]__[ContentType] e.g. MenuItem-MainMenu-HtmlMenuItem
-                        // MenuItem__[MenuName]__[ContentType]__level__[level] e.g. MenuItem-MainMenu-HtmlMenuItem-level-2
-                        menuItem.Metadata.Alternates.Add("MenuItem__" + differentiator + "__" + encodedContentType);
-                        menuItem.Metadata.Alternates.Add("MenuItem__" + differentiator + "__" + encodedContentType + "__level__" + level);
-                    }
-                });
+        builder.Describe("MenuItemLink")
+            .OnDisplaying(displaying =>
+            {
+                var menuItem = displaying.Shape;
+                var level = menuItem.GetProperty<int>("Level");
+                var differentiator = menuItem.Metadata.Differentiator;
 
-            builder.Describe("MenuItemLink")
-                .OnDisplaying(displaying =>
-                {
-                    var menuItem = displaying.Shape;
-                    var level = menuItem.GetProperty<int>("Level");
-                    var differentiator = menuItem.Metadata.Differentiator;
+                var menuContentItem = menuItem.GetProperty<ContentItem>("ContentItem");
 
-                    var menuContentItem = menuItem.GetProperty<ContentItem>("ContentItem");
+                var encodedContentType = menuContentItem.ContentItem.ContentType.EncodeAlternateElement();
 
-                    var encodedContentType = menuContentItem.ContentItem.ContentType.EncodeAlternateElement();
+                menuItem.Metadata.Alternates.Add("MenuItemLink__level__" + level);
 
-                    menuItem.Metadata.Alternates.Add("MenuItemLink__level__" + level);
+                // MenuItemLink__[ContentType] e.g. MenuItemLink-HtmlMenuItem
+                // MenuItemLink__[ContentType]__level__[level] e.g. MenuItemLink-HtmlMenuItem-level-2
+                menuItem.Metadata.Alternates.Add("MenuItemLink__" + encodedContentType);
+                menuItem.Metadata.Alternates.Add("MenuItemLink__" + encodedContentType + "__level__" + level);
 
-                    // MenuItemLink__[ContentType] e.g. MenuItemLink-HtmlMenuItem
-                    // MenuItemLink__[ContentType]__level__[level] e.g. MenuItemLink-HtmlMenuItem-level-2
-                    menuItem.Metadata.Alternates.Add("MenuItemLink__" + encodedContentType);
-                    menuItem.Metadata.Alternates.Add("MenuItemLink__" + encodedContentType + "__level__" + level);
+                if (!string.IsNullOrEmpty(differentiator))
+                {
+                    // MenuItemLink__[MenuName] e.g. MenuItemLink-MainMenu
+                    // MenuItemLink__[MenuName]__level__[level] e.g. MenuItemLink-MainMenu-level-2
+                    menuItem.Metadata.Alternates.Add("MenuItemLink__" + differentiator);
+                    menuItem.Metadata.Alternates.Add("MenuItemLink__" + differentiator + "__level__" + level);
+
+                    // MenuItemLink__[MenuName]__[ContentType] e.g. MenuItemLink-MainMenu-HtmlMenuItem
+                    // MenuItemLink__[MenuName]__[ContentType] e.g. MenuItemLink-MainMenu-HtmlMenuItem-level-2
+                    menuItem.Metadata.Alternates.Add("MenuItemLink__" + differentiator + "__" + encodedContentType);
+                    menuItem.Metadata.Alternates.Add("MenuItemLink__" + differentiator + "__" + encodedContentType + "__level__" + level);
+                }
+            });
 
-                    if (!string.IsNullOrEmpty(differentiator))
-                    {
-                        // MenuItemLink__[MenuName] e.g. MenuItemLink-MainMenu
-                        // MenuItemLink__[MenuName]__level__[level] e.g. MenuItemLink-MainMenu-level-2
-                        menuItem.Metadata.Alternates.Add("MenuItemLink__" + differentiator);
-                        menuItem.Metadata.Alternates.Add("MenuItemLink__" + differentiator + "__level__" + level);
-
-                        // MenuItemLink__[MenuName]__[ContentType] e.g. MenuItemLink-MainMenu-HtmlMenuItem
-                        // MenuItemLink__[MenuName]__[ContentType] e.g. MenuItemLink-MainMenu-HtmlMenuItem-level-2
-                        menuItem.Metadata.Alternates.Add("MenuItemLink__" + differentiator + "__" + encodedContentType);
-                        menuItem.Metadata.Alternates.Add("MenuItemLink__" + differentiator + "__" + encodedContentType + "__level__" + level);
-                    }
-                });
+        return ValueTask.CompletedTask;
+    }
 
-            return ValueTask.CompletedTask;
+    /// <summary>
+    /// Converts "foo-ba r" to "FooBaR".
+    /// </summary>
+    private static string FormatName(string name)
+    {
+        if (string.IsNullOrEmpty(name))
+        {
+            return null;
         }
 
-        /// <summary>
-        /// Converts "foo-ba r" to "FooBaR".
-        /// </summary>
-        private static string FormatName(string name)
+        name = name.Trim();
+        var nextIsUpper = true;
+        var result = new StringBuilder(name.Length);
+        for (var i = 0; i < name.Length; i++)
         {
-            if (string.IsNullOrEmpty(name))
+            var c = name[i];
+
+            if (c == '-' || char.IsWhiteSpace(c))
             {
-                return null;
+                nextIsUpper = true;
+                continue;
             }
 
-            name = name.Trim();
-            var nextIsUpper = true;
-            var result = new StringBuilder(name.Length);
-            for (var i = 0; i < name.Length; i++)
+            if (nextIsUpper)
             {
-                var c = name[i];
-
-                if (c == '-' || char.IsWhiteSpace(c))
-                {
-                    nextIsUpper = true;
-                    continue;
-                }
-
-                if (nextIsUpper)
-                {
-                    result.Append(c.ToString().ToUpper());
-                }
-                else
-                {
-                    result.Append(c);
-                }
-
-                nextIsUpper = false;
+                result.Append(c.ToString().ToUpper());
+            }
+            else
+            {
+                result.Append(c);
             }
 
-            return result.ToString();
+            nextIsUpper = false;
         }
+
+        return result.ToString();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Menu/Migrations.cs
index 9d4b556914d..21d08e0d5dd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Migrations.cs
@@ -8,76 +8,75 @@
 using OrchardCore.Recipes.Services;
 using YesSql;
 
-namespace OrchardCore.Menu
+namespace OrchardCore.Menu;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
+    private readonly IRecipeMigrator _recipeMigrator;
+    private readonly ISession _session;
+
+    public Migrations(
+        IRecipeMigrator recipeMigrator,
+        ISession session)
     {
-        private readonly IRecipeMigrator _recipeMigrator;
-        private readonly ISession _session;
+        _recipeMigrator = recipeMigrator;
+        _session = session;
+    }
 
-        public Migrations(
-            IRecipeMigrator recipeMigrator,
-            ISession session)
-        {
-            _recipeMigrator = recipeMigrator;
-            _session = session;
-        }
+    public async Task<int> CreateAsync()
+    {
+        await _recipeMigrator.ExecuteAsync($"menu{RecipesConstants.RecipeExtension}", this);
 
-        public async Task<int> CreateAsync()
-        {
-            await _recipeMigrator.ExecuteAsync($"menu{RecipesConstants.RecipeExtension}", this);
+        // Shortcut other migration steps on new content definition schemas.
+        return 4;
+    }
 
-            // Shortcut other migration steps on new content definition schemas.
-            return 4;
-        }
+    // Add content menu. This only needs to run on old content definition schemas.
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom1Async()
+    {
+        await _recipeMigrator.ExecuteAsync($"content-menu-updatefrom1{RecipesConstants.RecipeExtension}", this);
 
-        // Add content menu. This only needs to run on old content definition schemas.
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom1Async()
-        {
-            await _recipeMigrator.ExecuteAsync($"content-menu-updatefrom1{RecipesConstants.RecipeExtension}", this);
+        return 2;
+    }
 
-            return 2;
-        }
+    // Add html menu. This only needs to run on old content definition schemas.
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom2Async()
+    {
+        await _recipeMigrator.ExecuteAsync($"html-menu-updatefrom2{RecipesConstants.RecipeExtension}", this);
 
-        // Add html menu. This only needs to run on old content definition schemas.
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom2Async()
-        {
-            await _recipeMigrator.ExecuteAsync($"html-menu-updatefrom2{RecipesConstants.RecipeExtension}", this);
+        return 3;
+    }
 
-            return 3;
-        }
+    public async Task<int> UpdateFrom3Async()
+    {
+        var menus = await _session.Query<ContentItem, ContentItemIndex>(x => x.ContentType == "Menu").ListAsync();
 
-        public async Task<int> UpdateFrom3Async()
+        foreach (var menu in menus)
         {
-            var menus = await _session.Query<ContentItem, ContentItemIndex>(x => x.ContentType == "Menu").ListAsync();
-
-            foreach (var menu in menus)
+            var menuItemsListPart = menu.As<MenuItemsListPart>();
+            if (menuItemsListPart != null)
             {
-                var menuItemsListPart = menu.As<MenuItemsListPart>();
-                if (menuItemsListPart != null)
-                {
-                    MigrateMenuItems(menuItemsListPart.MenuItems);
-                    menu.Apply(menuItemsListPart);
-                }
-
-                await _session.SaveAsync(menu);
+                MigrateMenuItems(menuItemsListPart.MenuItems);
+                menu.Apply(menuItemsListPart);
             }
 
-            return 4;
+            await _session.SaveAsync(menu);
         }
 
-        private static void MigrateMenuItems(List<ContentItem> menuItems)
+        return 4;
+    }
+
+    private static void MigrateMenuItems(List<ContentItem> menuItems)
+    {
+        foreach (var menuItem in menuItems)
         {
-            foreach (var menuItem in menuItems)
+            var menuItemsListPart = menuItem.As<MenuItemsListPart>();
+            if (menuItemsListPart != null)
             {
-                var menuItemsListPart = menuItem.As<MenuItemsListPart>();
-                if (menuItemsListPart != null)
-                {
-                    MigrateMenuItems(menuItemsListPart.MenuItems);
-                    menuItem.Apply(menuItemsListPart);
-                }
+                MigrateMenuItems(menuItemsListPart.MenuItems);
+                menuItem.Apply(menuItemsListPart);
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Models/ContentMenuItemPart.cs b/src/OrchardCore.Modules/OrchardCore.Menu/Models/ContentMenuItemPart.cs
index 7506cd9e372..1d4303b56f1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Models/ContentMenuItemPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Models/ContentMenuItemPart.cs
@@ -1,8 +1,7 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Menu.Models
+namespace OrchardCore.Menu.Models;
+
+public class ContentMenuItemPart : ContentPart
 {
-    public class ContentMenuItemPart : ContentPart
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Models/HtmlMenuItemPart.cs b/src/OrchardCore.Modules/OrchardCore.Menu/Models/HtmlMenuItemPart.cs
index cabd9772546..e96e71f655a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Models/HtmlMenuItemPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Models/HtmlMenuItemPart.cs
@@ -1,22 +1,21 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Menu.Models
+namespace OrchardCore.Menu.Models;
+
+public class HtmlMenuItemPart : ContentPart
 {
-    public class HtmlMenuItemPart : ContentPart
-    {
-        /// <summary>
-        /// The url of the link to create.
-        /// </summary>
-        public string Url { get; set; }
+    /// <summary>
+    /// The url of the link to create.
+    /// </summary>
+    public string Url { get; set; }
 
-        /// <summary>
-        /// The target of the link to create.
-        /// </summary>
-        public string Target { get; set; }
+    /// <summary>
+    /// The target of the link to create.
+    /// </summary>
+    public string Target { get; set; }
 
-        /// <summary>
-        /// The raw html to display for this link.
-        /// </summary>
-        public string Html { get; set; }
-    }
+    /// <summary>
+    /// The raw html to display for this link.
+    /// </summary>
+    public string Html { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Models/LinkMenuItemPart.cs b/src/OrchardCore.Modules/OrchardCore.Menu/Models/LinkMenuItemPart.cs
index ad255bc864b..f310047cfcb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Models/LinkMenuItemPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Models/LinkMenuItemPart.cs
@@ -1,17 +1,16 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Menu.Models
+namespace OrchardCore.Menu.Models;
+
+public class LinkMenuItemPart : ContentPart
 {
-    public class LinkMenuItemPart : ContentPart
-    {
-        /// <summary>
-        /// The url of the link to create.
-        /// </summary>
-        public string Url { get; set; }
+    /// <summary>
+    /// The url of the link to create.
+    /// </summary>
+    public string Url { get; set; }
 
-        /// <summary>
-        /// The target of the link to create.
-        /// </summary>
-        public string Target { get; set; }
-    }
+    /// <summary>
+    /// The target of the link to create.
+    /// </summary>
+    public string Target { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Models/MenuItemsListPart.cs b/src/OrchardCore.Modules/OrchardCore.Menu/Models/MenuItemsListPart.cs
index ee60a48576d..6cf2d170c59 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Models/MenuItemsListPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Models/MenuItemsListPart.cs
@@ -1,12 +1,11 @@
 using System.Collections.Generic;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Menu.Models
+namespace OrchardCore.Menu.Models;
+
+// A content item with this part can have menu items.
+// This part is automatically added to all menus.
+public class MenuItemsListPart : ContentPart
 {
-    // A content item with this part can have menu items.
-    // This part is automatically added to all menus.
-    public class MenuItemsListPart : ContentPart
-    {
-        public List<ContentItem> MenuItems { get; set; } = [];
-    }
+    public List<ContentItem> MenuItems { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Models/MenuPart.cs b/src/OrchardCore.Modules/OrchardCore.Menu/Models/MenuPart.cs
index e728ea35723..8f826287747 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Models/MenuPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Models/MenuPart.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Menu.Models
+namespace OrchardCore.Menu.Models;
+
+// This part is added automatically to all menus
+public class MenuPart : ContentPart
 {
-    // This part is added automatically to all menus
-    public class MenuPart : ContentPart
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Settings/HtmlMenuItemPartSettings.cs b/src/OrchardCore.Modules/OrchardCore.Menu/Settings/HtmlMenuItemPartSettings.cs
index 2e853ec832a..1e5d2c2de95 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Settings/HtmlMenuItemPartSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Settings/HtmlMenuItemPartSettings.cs
@@ -1,13 +1,12 @@
 using System.ComponentModel;
 
-namespace OrchardCore.Menu.Settings
+namespace OrchardCore.Menu.Settings;
+
+public class HtmlMenuItemPartSettings
 {
-    public class HtmlMenuItemPartSettings
-    {
-        /// <summary>
-        /// Whether to sanitize the html input.
-        /// </summary>
-        [DefaultValue(true)]
-        public bool SanitizeHtml { get; set; } = true;
-    }
+    /// <summary>
+    /// Whether to sanitize the html input.
+    /// </summary>
+    [DefaultValue(true)]
+    public bool SanitizeHtml { get; set; } = true;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Settings/HtmlMenuItemPartSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Menu/Settings/HtmlMenuItemPartSettingsDisplayDriver.cs
index 809ecc95b37..20c80a8e9ba 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Settings/HtmlMenuItemPartSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Settings/HtmlMenuItemPartSettingsDisplayDriver.cs
@@ -6,32 +6,31 @@
 using OrchardCore.Menu.Models;
 using OrchardCore.Menu.ViewModels;
 
-namespace OrchardCore.Menu.Settings
+namespace OrchardCore.Menu.Settings;
+
+public sealed class HtmlMenuItemPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<HtmlMenuItemPart>
 {
-    public sealed class HtmlMenuItemPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<HtmlMenuItemPart>
+    public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+        return Initialize<HtmlMenuItemPartSettingsViewModel>("HtmlMenuItemPartSettings_Edit", model =>
         {
-            return Initialize<HtmlMenuItemPartSettingsViewModel>("HtmlMenuItemPartSettings_Edit", model =>
-            {
-                var settings = contentTypePartDefinition.GetSettings<HtmlMenuItemPartSettings>();
+            var settings = contentTypePartDefinition.GetSettings<HtmlMenuItemPartSettings>();
 
-                model.SanitizeHtml = settings.SanitizeHtml;
-            }).Location("Content:20");
-        }
+            model.SanitizeHtml = settings.SanitizeHtml;
+        }).Location("Content:20");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
-        {
-            var model = new HtmlMenuItemPartSettingsViewModel();
-            var settings = new HtmlMenuItemPartSettings();
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    {
+        var model = new HtmlMenuItemPartSettingsViewModel();
+        var settings = new HtmlMenuItemPartSettings();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            settings.SanitizeHtml = model.SanitizeHtml;
+        settings.SanitizeHtml = model.SanitizeHtml;
 
-            context.Builder.WithSettings(settings);
+        context.Builder.WithSettings(settings);
 
-            return Edit(contentTypePartDefinition, context);
-        }
+        return Edit(contentTypePartDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Menu/Startup.cs
index d283cebfa3a..f2aa2264d8e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Startup.cs
@@ -15,40 +15,39 @@
 using OrchardCore.Navigation;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Menu
+namespace OrchardCore.Menu;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDataMigration<Migrations>();
-            services.AddScoped<IShapeTableProvider, MenuShapes>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddDataMigration<Migrations>();
+        services.AddScoped<IShapeTableProvider, MenuShapes>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
 
-            services.AddScoped<IStereotypesProvider, MenuItemStereotypesProvider>();
+        services.AddScoped<IStereotypesProvider, MenuItemStereotypesProvider>();
 
-            // MenuPart
-            services.AddScoped<IContentHandler, MenuContentHandler>();
-            services.AddContentPart<MenuPart>()
-                .UseDisplayDriver<MenuPartDisplayDriver>();
+        // MenuPart
+        services.AddScoped<IContentHandler, MenuContentHandler>();
+        services.AddContentPart<MenuPart>()
+            .UseDisplayDriver<MenuPartDisplayDriver>();
 
-            services.AddContentPart<MenuItemsListPart>();
+        services.AddContentPart<MenuItemsListPart>();
 
-            // LinkMenuItemPart
-            services.AddContentPart<LinkMenuItemPart>()
-                .UseDisplayDriver<LinkMenuItemPartDisplayDriver>();
+        // LinkMenuItemPart
+        services.AddContentPart<LinkMenuItemPart>()
+            .UseDisplayDriver<LinkMenuItemPartDisplayDriver>();
 
-            // ContentMenuItemPart
-            services.AddContentPart<ContentMenuItemPart>()
-                .UseDisplayDriver<ContentMenuItemPartDisplayDriver>();
+        // ContentMenuItemPart
+        services.AddContentPart<ContentMenuItemPart>()
+            .UseDisplayDriver<ContentMenuItemPartDisplayDriver>();
 
-            // HtmlMenuItemPart
-            services.AddContentPart<HtmlMenuItemPart>()
-                .UseDisplayDriver<HtmlMenuItemPartDisplayDriver>();
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, HtmlMenuItemPartSettingsDisplayDriver>();
+        // HtmlMenuItemPart
+        services.AddContentPart<HtmlMenuItemPart>()
+            .UseDisplayDriver<HtmlMenuItemPartDisplayDriver>();
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, HtmlMenuItemPartSettingsDisplayDriver>();
 
-            services.AddTagHelpers<MenuTagHelper>();
-        }
+        services.AddTagHelpers<MenuTagHelper>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/TagHelper/MenuTagHelper.cs b/src/OrchardCore.Modules/OrchardCore.Menu/TagHelper/MenuTagHelper.cs
index 2fead4f6d67..76a8378e342 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/TagHelper/MenuTagHelper.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/TagHelper/MenuTagHelper.cs
@@ -2,15 +2,14 @@
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.TagHelpers;
 
-namespace OrchardCore.Menu.TagHelpers
+namespace OrchardCore.Menu.TagHelpers;
+
+[HtmlTargetElement("menu")]
+public class MenuTagHelper : BaseShapeTagHelper
 {
-    [HtmlTargetElement("menu")]
-    public class MenuTagHelper : BaseShapeTagHelper
+    public MenuTagHelper(IShapeFactory shapeFactory, IDisplayHelper displayHelper)
+        : base(shapeFactory, displayHelper)
     {
-        public MenuTagHelper(IShapeFactory shapeFactory, IDisplayHelper displayHelper)
-            : base(shapeFactory, displayHelper)
-        {
-            Type = "Menu";
-        }
+        Type = "Menu";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/ContentMenuItemPartEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/ContentMenuItemPartEditViewModel.cs
index a0a57d5dde1..890f98941db 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/ContentMenuItemPartEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/ContentMenuItemPartEditViewModel.cs
@@ -1,13 +1,12 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Menu.Models;
 
-namespace OrchardCore.Menu.ViewModels
+namespace OrchardCore.Menu.ViewModels;
+
+public class ContentMenuItemPartEditViewModel
 {
-    public class ContentMenuItemPartEditViewModel
-    {
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        [BindNever]
-        public ContentMenuItemPart MenuItemPart { get; set; }
-    }
+    [BindNever]
+    public ContentMenuItemPart MenuItemPart { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/HtmlMenuItemPartEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/HtmlMenuItemPartEditViewModel.cs
index 3a24a2c42f3..8f5bef23d60 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/HtmlMenuItemPartEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/HtmlMenuItemPartEditViewModel.cs
@@ -1,19 +1,18 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Menu.Models;
 
-namespace OrchardCore.Menu.ViewModels
+namespace OrchardCore.Menu.ViewModels;
+
+public class HtmlMenuItemPartEditViewModel
 {
-    public class HtmlMenuItemPartEditViewModel
-    {
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        public string Url { get; set; }
+    public string Url { get; set; }
 
-        public string Target { get; set; }
+    public string Target { get; set; }
 
-        public string Html { get; set; }
+    public string Html { get; set; }
 
-        [BindNever]
-        public HtmlMenuItemPart MenuItemPart { get; set; }
-    }
+    [BindNever]
+    public HtmlMenuItemPart MenuItemPart { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/HtmlMenuItemPartSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/HtmlMenuItemPartSettingsViewModel.cs
index 9f3d697fd6a..efc7cc50f49 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/HtmlMenuItemPartSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/HtmlMenuItemPartSettingsViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Menu.ViewModels
+namespace OrchardCore.Menu.ViewModels;
+
+public class HtmlMenuItemPartSettingsViewModel
 {
-    public class HtmlMenuItemPartSettingsViewModel
-    {
-        public bool SanitizeHtml { get; set; }
-    }
+    public bool SanitizeHtml { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/LinkMenuItemPartEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/LinkMenuItemPartEditViewModel.cs
index 301701c5b93..22f72fc8e3a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/LinkMenuItemPartEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/LinkMenuItemPartEditViewModel.cs
@@ -1,17 +1,16 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Menu.Models;
 
-namespace OrchardCore.Menu.ViewModels
+namespace OrchardCore.Menu.ViewModels;
+
+public class LinkMenuItemPartEditViewModel
 {
-    public class LinkMenuItemPartEditViewModel
-    {
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        public string Url { get; set; }
+    public string Url { get; set; }
 
-        public string Target { get; set; }
+    public string Target { get; set; }
 
-        [BindNever]
-        public LinkMenuItemPart MenuItemPart { get; set; }
-    }
+    [BindNever]
+    public LinkMenuItemPart MenuItemPart { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/MenuPartEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/MenuPartEditViewModel.cs
index 6e4bbd89d4e..5aa855b66e4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/MenuPartEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/MenuPartEditViewModel.cs
@@ -3,16 +3,15 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Menu.Models;
 
-namespace OrchardCore.Menu.ViewModels
+namespace OrchardCore.Menu.ViewModels;
+
+public class MenuPartEditViewModel
 {
-    public class MenuPartEditViewModel
-    {
-        public string Hierarchy { get; set; }
+    public string Hierarchy { get; set; }
 
-        [BindNever]
-        public MenuPart MenuPart { get; set; }
+    [BindNever]
+    public MenuPart MenuPart { get; set; }
 
-        [BindNever]
-        public IEnumerable<ContentTypeDefinition> MenuItemContentTypes { get; set; }
-    }
+    [BindNever]
+    public IEnumerable<ContentTypeDefinition> MenuItemContentTypes { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs
index 8a7a7657419..33b8b8444e9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs
@@ -3,77 +3,76 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Microsoft.Authentication
+namespace OrchardCore.Microsoft.Authentication;
+
+public sealed class AdminMenuMicrosoftAccount : INavigationProvider
 {
-    public sealed class AdminMenuMicrosoftAccount : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", MicrosoftAuthenticationConstants.Features.MicrosoftAccount },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", MicrosoftAuthenticationConstants.Features.MicrosoftAccount },
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenuMicrosoftAccount(IStringLocalizer<AdminMenuMicrosoftAccount> localizer)
-        {
-            S = localizer;
-        }
+    public AdminMenuMicrosoftAccount(IStringLocalizer<AdminMenuMicrosoftAccount> localizer)
+    {
+        S = localizer;
+    }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            builder
-                .Add(S["Security"], security => security
-                    .Add(S["Authentication"], authentication => authentication
-                        .Add(S["Microsoft"], S["Microsoft"].PrefixPosition(), microsoft => microsoft
-                            .AddClass("microsoft")
-                            .Id("microsoft")
-                            .Action("Index", "Admin", _routeValues)
-                            .Permission(Permissions.ManageMicrosoftAuthentication)
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Security"], security => security
+                .Add(S["Authentication"], authentication => authentication
+                    .Add(S["Microsoft"], S["Microsoft"].PrefixPosition(), microsoft => microsoft
+                        .AddClass("microsoft")
+                        .Id("microsoft")
+                        .Action("Index", "Admin", _routeValues)
+                        .Permission(Permissions.ManageMicrosoftAuthentication)
+                        .LocalNav()
                     )
-               );
+                )
+           );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
+}
 
-    public sealed class AdminMenuAAD : INavigationProvider
+public sealed class AdminMenuAAD : INavigationProvider
+{
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", MicrosoftAuthenticationConstants.Features.AAD },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", MicrosoftAuthenticationConstants.Features.AAD },
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenuAAD(IStringLocalizer<AdminMenuAAD> localizer) => S = localizer;
+    public AdminMenuAAD(IStringLocalizer<AdminMenuAAD> localizer) => S = localizer;
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Security"], security => security
-                    .Add(S["Authentication"], authentication => authentication
-                        .Add(S["Microsoft Entra ID"], S["Microsoft Entra ID"].PrefixPosition(), client => client
-                            .AddClass("microsoft-entra-id").Id("microsoft-entra-id")
-                            .Action("Index", "Admin", _routeValues)
-                            .Permission(Permissions.ManageMicrosoftAuthentication)
-                            .LocalNav())
-                ));
-
             return Task.CompletedTask;
         }
+
+        builder
+            .Add(S["Security"], security => security
+                .Add(S["Authentication"], authentication => authentication
+                    .Add(S["Microsoft Entra ID"], S["Microsoft Entra ID"].PrefixPosition(), client => client
+                        .AddClass("microsoft-entra-id").Id("microsoft-entra-id")
+                        .Action("Index", "Admin", _routeValues)
+                        .Permission(Permissions.ManageMicrosoftAuthentication)
+                        .LocalNav())
+            ));
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/AzureADOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/AzureADOptionsConfiguration.cs
index 186228b421d..33d58ac4afb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/AzureADOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/AzureADOptionsConfiguration.cs
@@ -9,87 +9,86 @@
 using MicrosoftIdentityDefaults = Microsoft.Identity.Web.Constants;
 
 
-namespace OrchardCore.Microsoft.Authentication.Configuration
+namespace OrchardCore.Microsoft.Authentication.Configuration;
+
+public class AzureADOptionsConfiguration :
+    IConfigureOptions<AuthenticationOptions>,
+    IConfigureNamedOptions<PolicySchemeOptions>,
+    IConfigureNamedOptions<MicrosoftIdentityOptions>
 {
-    public class AzureADOptionsConfiguration :
-        IConfigureOptions<AuthenticationOptions>,
-        IConfigureNamedOptions<PolicySchemeOptions>,
-        IConfigureNamedOptions<MicrosoftIdentityOptions>
+    public const string AzureAdOpenIdConnectScheme = MicrosoftIdentityDefaults.AzureAd + OpenIdConnectDefaults.AuthenticationScheme;
+
+    private readonly AzureADSettings _azureADSettings;
+    private readonly ILogger _logger;
+
+    public AzureADOptionsConfiguration(IOptions<AzureADSettings> azureADSettings, ILogger<AzureADOptionsConfiguration> logger)
     {
-        public const string AzureAdOpenIdConnectScheme = MicrosoftIdentityDefaults.AzureAd + OpenIdConnectDefaults.AuthenticationScheme;
+        _azureADSettings = azureADSettings.Value;
+        _logger = logger;
+    }
 
-        private readonly AzureADSettings _azureADSettings;
-        private readonly ILogger _logger;
+    public void Configure(AuthenticationOptions options)
+    {
+        var settings = _azureADSettings;
+        if (settings == null)
+        {
+            return;
+        }
 
-        public AzureADOptionsConfiguration(IOptions<AzureADSettings> azureADSettings, ILogger<AzureADOptionsConfiguration> logger)
+        if (string.IsNullOrWhiteSpace(settings.AppId) || string.IsNullOrWhiteSpace(settings.TenantId))
         {
-            _azureADSettings = azureADSettings.Value;
-            _logger = logger;
+            _logger.LogWarning("The AzureAD login provider is enabled but not configured.");
+
+            return;
         }
 
-        public void Configure(AuthenticationOptions options)
+        // Register the OpenID Connect client handler in the authentication handlers collection.
+        options.AddScheme(Constants.AzureAd, builder =>
+        {
+            builder.DisplayName = settings.DisplayName;
+            builder.HandlerType = typeof(PolicySchemeHandler);
+        });
+
+        options.AddScheme(AzureAdOpenIdConnectScheme, builder =>
         {
-            var settings = _azureADSettings;
-            if (settings == null)
-            {
-                return;
-            }
-
-            if (string.IsNullOrWhiteSpace(settings.AppId) || string.IsNullOrWhiteSpace(settings.TenantId))
-            {
-                _logger.LogWarning("The AzureAD login provider is enabled but not configured.");
-
-                return;
-            }
-
-            // Register the OpenID Connect client handler in the authentication handlers collection.
-            options.AddScheme(Constants.AzureAd, builder =>
-            {
-                builder.DisplayName = settings.DisplayName;
-                builder.HandlerType = typeof(PolicySchemeHandler);
-            });
-
-            options.AddScheme(AzureAdOpenIdConnectScheme, builder =>
-            {
-                builder.HandlerType = typeof(OpenIdConnectHandler);
-            });
+            builder.HandlerType = typeof(OpenIdConnectHandler);
+        });
+    }
+
+    public void Configure(string name, MicrosoftIdentityOptions options)
+    {
+        if (!string.Equals(name, MicrosoftIdentityDefaults.AzureAd, StringComparison.Ordinal))
+        {
+            return;
         }
 
-        public void Configure(string name, MicrosoftIdentityOptions options)
+        var loginSettings = _azureADSettings;
+        if (loginSettings == null)
         {
-            if (!string.Equals(name, MicrosoftIdentityDefaults.AzureAd, StringComparison.Ordinal))
-            {
-                return;
-            }
-
-            var loginSettings = _azureADSettings;
-            if (loginSettings == null)
-            {
-                return;
-            }
-
-            options.ClientId = loginSettings.AppId;
-            options.TenantId = loginSettings.TenantId;
-            options.Instance = "https://login.microsoftonline.com/";
-
-            if (loginSettings.CallbackPath.HasValue)
-            {
-                options.CallbackPath = loginSettings.CallbackPath;
-            }
+            return;
         }
 
-        public void Configure(MicrosoftIdentityOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
+        options.ClientId = loginSettings.AppId;
+        options.TenantId = loginSettings.TenantId;
+        options.Instance = "https://login.microsoftonline.com/";
 
-        public void Configure(string name, PolicySchemeOptions options)
+        if (loginSettings.CallbackPath.HasValue)
         {
-            if (!string.Equals(name, MicrosoftIdentityDefaults.AzureAd, StringComparison.Ordinal))
-            {
-                return;
-            }
+            options.CallbackPath = loginSettings.CallbackPath;
+        }
+    }
+
+    public void Configure(MicrosoftIdentityOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
 
-            options.ForwardDefault = "Identity.External";
-            options.ForwardChallenge = AzureAdOpenIdConnectScheme;
+    public void Configure(string name, PolicySchemeOptions options)
+    {
+        if (!string.Equals(name, MicrosoftIdentityDefaults.AzureAd, StringComparison.Ordinal))
+        {
+            return;
         }
-        public void Configure(PolicySchemeOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
+
+        options.ForwardDefault = "Identity.External";
+        options.ForwardChallenge = AzureAdOpenIdConnectScheme;
     }
+    public void Configure(PolicySchemeOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/CookieOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/CookieOptionsConfiguration.cs
index c525a189e97..5d2d6b3544f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/CookieOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/CookieOptionsConfiguration.cs
@@ -4,36 +4,35 @@
 using Microsoft.Extensions.Options;
 using MicrosoftIdentityDefaults = Microsoft.Identity.Web.Constants;
 
-namespace OrchardCore.Microsoft.Authentication.Configuration
+namespace OrchardCore.Microsoft.Authentication.Configuration;
+
+internal sealed class CookieOptionsConfiguration : IConfigureNamedOptions<CookieAuthenticationOptions>
 {
-    internal sealed class CookieOptionsConfiguration : IConfigureNamedOptions<CookieAuthenticationOptions>
-    {
-        private readonly string _tenantPrefix;
+    private readonly string _tenantPrefix;
 
-        public CookieOptionsConfiguration(IHttpContextAccessor httpContextAccessor)
+    public CookieOptionsConfiguration(IHttpContextAccessor httpContextAccessor)
+    {
+        var pathBase = httpContextAccessor.HttpContext?.Request.PathBase ?? PathString.Empty;
+        if (!pathBase.HasValue)
         {
-            var pathBase = httpContextAccessor.HttpContext?.Request.PathBase ?? PathString.Empty;
-            if (!pathBase.HasValue)
-            {
-                pathBase = "/";
-            }
-
-            _tenantPrefix = pathBase;
+            pathBase = "/";
         }
 
-        public void Configure(string name, CookieAuthenticationOptions options)
-        {
-            if (name != "Identity.External")
-            {
-                return;
-            }
+        _tenantPrefix = pathBase;
+    }
 
-            options.Cookie.Path = _tenantPrefix;
-            options.LoginPath = $"~/AzureAD/Account/SignIn/{MicrosoftIdentityDefaults.AzureAd}";
-            options.LogoutPath = $"~/AzureAD/Account/SignOut/{MicrosoftIdentityDefaults.AzureAd}";
-            options.AccessDeniedPath = "~/AzureAD/Account/AccessDenied";
+    public void Configure(string name, CookieAuthenticationOptions options)
+    {
+        if (name != "Identity.External")
+        {
+            return;
         }
 
-        public void Configure(CookieAuthenticationOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
+        options.Cookie.Path = _tenantPrefix;
+        options.LoginPath = $"~/AzureAD/Account/SignIn/{MicrosoftIdentityDefaults.AzureAd}";
+        options.LogoutPath = $"~/AzureAD/Account/SignOut/{MicrosoftIdentityDefaults.AzureAd}";
+        options.AccessDeniedPath = "~/AzureAD/Account/AccessDenied";
     }
+
+    public void Configure(CookieAuthenticationOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/MicrosoftAccountOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/MicrosoftAccountOptionsConfiguration.cs
index afa7b295b10..9bbbe072e03 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/MicrosoftAccountOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/MicrosoftAccountOptionsConfiguration.cs
@@ -7,81 +7,80 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Microsoft.Authentication.Settings;
 
-namespace OrchardCore.Microsoft.Authentication.Configuration
+namespace OrchardCore.Microsoft.Authentication.Configuration;
+
+public class MicrosoftAccountOptionsConfiguration :
+    IConfigureOptions<AuthenticationOptions>,
+    IConfigureNamedOptions<MicrosoftAccountOptions>
 {
-    public class MicrosoftAccountOptionsConfiguration :
-        IConfigureOptions<AuthenticationOptions>,
-        IConfigureNamedOptions<MicrosoftAccountOptions>
+    private readonly MicrosoftAccountSettings _microsoftAccountSettings;
+    private readonly IDataProtectionProvider _dataProtectionProvider;
+    private readonly ILogger _logger;
+
+    public MicrosoftAccountOptionsConfiguration(
+        IOptions<MicrosoftAccountSettings> microsoftAccountSettings,
+        IDataProtectionProvider dataProtectionProvider,
+        ILogger<MicrosoftAccountOptionsConfiguration> logger)
     {
-        private readonly MicrosoftAccountSettings _microsoftAccountSettings;
-        private readonly IDataProtectionProvider _dataProtectionProvider;
-        private readonly ILogger _logger;
+        _microsoftAccountSettings = microsoftAccountSettings.Value;
+        _dataProtectionProvider = dataProtectionProvider;
+        _logger = logger;
+    }
 
-        public MicrosoftAccountOptionsConfiguration(
-            IOptions<MicrosoftAccountSettings> microsoftAccountSettings,
-            IDataProtectionProvider dataProtectionProvider,
-            ILogger<MicrosoftAccountOptionsConfiguration> logger)
+    public void Configure(AuthenticationOptions options)
+    {
+        if (_microsoftAccountSettings == null)
         {
-            _microsoftAccountSettings = microsoftAccountSettings.Value;
-            _dataProtectionProvider = dataProtectionProvider;
-            _logger = logger;
+            return;
         }
 
-        public void Configure(AuthenticationOptions options)
+        if (string.IsNullOrWhiteSpace(_microsoftAccountSettings.AppId) ||
+            string.IsNullOrWhiteSpace(_microsoftAccountSettings.AppSecret))
         {
-            if (_microsoftAccountSettings == null)
-            {
-                return;
-            }
-
-            if (string.IsNullOrWhiteSpace(_microsoftAccountSettings.AppId) ||
-                string.IsNullOrWhiteSpace(_microsoftAccountSettings.AppSecret))
-            {
-                _logger.LogWarning("The Microsoft login provider is enabled but not configured.");
+            _logger.LogWarning("The Microsoft login provider is enabled but not configured.");
 
-                return;
-            }
-
-            // Register the OpenID Connect client handler in the authentication handlers collection.
-            options.AddScheme(MicrosoftAccountDefaults.AuthenticationScheme, builder =>
-            {
-                builder.DisplayName = "Microsoft Account";
-                builder.HandlerType = typeof(MicrosoftAccountHandler);
-            });
+            return;
         }
 
-        public void Configure(string name, MicrosoftAccountOptions options)
+        // Register the OpenID Connect client handler in the authentication handlers collection.
+        options.AddScheme(MicrosoftAccountDefaults.AuthenticationScheme, builder =>
         {
-            // Ignore OpenID Connect client handler instances that don't correspond to the instance managed by the OpenID module.
-            if (!string.Equals(name, MicrosoftAccountDefaults.AuthenticationScheme, StringComparison.Ordinal))
-            {
-                return;
-            }
+            builder.DisplayName = "Microsoft Account";
+            builder.HandlerType = typeof(MicrosoftAccountHandler);
+        });
+    }
 
-            if (_microsoftAccountSettings == null)
-            {
-                return;
-            }
+    public void Configure(string name, MicrosoftAccountOptions options)
+    {
+        // Ignore OpenID Connect client handler instances that don't correspond to the instance managed by the OpenID module.
+        if (!string.Equals(name, MicrosoftAccountDefaults.AuthenticationScheme, StringComparison.Ordinal))
+        {
+            return;
+        }
 
-            options.ClientId = _microsoftAccountSettings.AppId;
+        if (_microsoftAccountSettings == null)
+        {
+            return;
+        }
 
-            try
-            {
-                options.ClientSecret = _dataProtectionProvider.CreateProtector(MicrosoftAuthenticationConstants.Features.MicrosoftAccount).Unprotect(_microsoftAccountSettings.AppSecret);
-            }
-            catch
-            {
-                _logger.LogError("The Microsoft Account secret key could not be decrypted. It may have been encrypted using a different key.");
-            }
+        options.ClientId = _microsoftAccountSettings.AppId;
 
-            if (_microsoftAccountSettings.CallbackPath.HasValue)
-            {
-                options.CallbackPath = _microsoftAccountSettings.CallbackPath;
-            }
+        try
+        {
+            options.ClientSecret = _dataProtectionProvider.CreateProtector(MicrosoftAuthenticationConstants.Features.MicrosoftAccount).Unprotect(_microsoftAccountSettings.AppSecret);
+        }
+        catch
+        {
+            _logger.LogError("The Microsoft Account secret key could not be decrypted. It may have been encrypted using a different key.");
+        }
 
-            options.SaveTokens = _microsoftAccountSettings.SaveTokens;
+        if (_microsoftAccountSettings.CallbackPath.HasValue)
+        {
+            options.CallbackPath = _microsoftAccountSettings.CallbackPath;
         }
 
-        public void Configure(MicrosoftAccountOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
+        options.SaveTokens = _microsoftAccountSettings.SaveTokens;
     }
+
+    public void Configure(MicrosoftAccountOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/OpenIdConnectOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/OpenIdConnectOptionsConfiguration.cs
index 7ba2df61f96..7c139480030 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/OpenIdConnectOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/OpenIdConnectOptionsConfiguration.cs
@@ -7,41 +7,40 @@
 using OrchardCore.Microsoft.Authentication.Settings;
 using MicrosoftIdentityDefaults = Microsoft.Identity.Web.Constants;
 
-namespace OrchardCore.Microsoft.Authentication.Configuration
+namespace OrchardCore.Microsoft.Authentication.Configuration;
+
+internal sealed class OpenIdConnectOptionsConfiguration : IConfigureNamedOptions<OpenIdConnectOptions>
 {
-    internal sealed class OpenIdConnectOptionsConfiguration : IConfigureNamedOptions<OpenIdConnectOptions>
+    private readonly IOptionsMonitor<MicrosoftIdentityOptions> _azureADOptions;
+    private readonly AzureADSettings _azureADSettings;
+
+    public OpenIdConnectOptionsConfiguration(
+        IOptionsMonitor<MicrosoftIdentityOptions> azureADOptions,
+        IOptions<AzureADSettings> azureADSettings)
     {
-        private readonly IOptionsMonitor<MicrosoftIdentityOptions> _azureADOptions;
-        private readonly AzureADSettings _azureADSettings;
+        _azureADOptions = azureADOptions;
+        _azureADSettings = azureADSettings.Value;
+    }
 
-        public OpenIdConnectOptionsConfiguration(
-            IOptionsMonitor<MicrosoftIdentityOptions> azureADOptions,
-            IOptions<AzureADSettings> azureADSettings)
+    public void Configure(string name, OpenIdConnectOptions options)
+    {
+        if (name != AzureADOptionsConfiguration.AzureAdOpenIdConnectScheme)
         {
-            _azureADOptions = azureADOptions;
-            _azureADSettings = azureADSettings.Value;
+            return;
         }
 
-        public void Configure(string name, OpenIdConnectOptions options)
-        {
-            if (name != AzureADOptionsConfiguration.AzureAdOpenIdConnectScheme)
-            {
-                return;
-            }
+        var azureADOptions = _azureADOptions.Get(MicrosoftIdentityDefaults.AzureAd);
 
-            var azureADOptions = _azureADOptions.Get(MicrosoftIdentityDefaults.AzureAd);
-
-            options.ClientId = azureADOptions.ClientId;
-            options.ClientSecret = azureADOptions.ClientSecret;
-            options.Authority = new Uri(new Uri(azureADOptions.Instance), azureADOptions.TenantId).ToString();
-            options.CallbackPath = azureADOptions.CallbackPath.HasValue ? azureADOptions.CallbackPath : options.CallbackPath;
-            options.SignedOutCallbackPath = azureADOptions.SignedOutCallbackPath.HasValue ? azureADOptions.SignedOutCallbackPath : options.SignedOutCallbackPath;
-            options.SignInScheme = "Identity.External";
-            options.UseTokenLifetime = true;
-            options.SaveTokens = _azureADSettings.SaveTokens;
-            options.TokenValidationParameters.IssuerValidator = AadIssuerValidator.GetAadIssuerValidator(options.Authority, options.Backchannel).Validate;
-        }
-
-        public void Configure(OpenIdConnectOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
+        options.ClientId = azureADOptions.ClientId;
+        options.ClientSecret = azureADOptions.ClientSecret;
+        options.Authority = new Uri(new Uri(azureADOptions.Instance), azureADOptions.TenantId).ToString();
+        options.CallbackPath = azureADOptions.CallbackPath.HasValue ? azureADOptions.CallbackPath : options.CallbackPath;
+        options.SignedOutCallbackPath = azureADOptions.SignedOutCallbackPath.HasValue ? azureADOptions.SignedOutCallbackPath : options.SignedOutCallbackPath;
+        options.SignInScheme = "Identity.External";
+        options.UseTokenLifetime = true;
+        options.SaveTokens = _azureADSettings.SaveTokens;
+        options.TokenValidationParameters.IssuerValidator = AadIssuerValidator.GetAadIssuerValidator(options.Authority, options.Backchannel).Validate;
     }
+
+    public void Configure(OpenIdConnectOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Deployment/AzureADDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Deployment/AzureADDeploymentSource.cs
index a252c36473d..2f9a42e2758 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Deployment/AzureADDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Deployment/AzureADDeploymentSource.cs
@@ -5,31 +5,30 @@
 using OrchardCore.Microsoft.Authentication.Services;
 using OrchardCore.Microsoft.Authentication.Settings;
 
-namespace OrchardCore.Microsoft.Authentication.Deployment
+namespace OrchardCore.Microsoft.Authentication.Deployment;
+
+public class AzureADDeploymentSource : IDeploymentSource
 {
-    public class AzureADDeploymentSource : IDeploymentSource
+    private readonly IAzureADService _azureADService;
+
+    public AzureADDeploymentSource(IAzureADService azureADService)
     {
-        private readonly IAzureADService _azureADService;
+        _azureADService = azureADService;
+    }
 
-        public AzureADDeploymentSource(IAzureADService azureADService)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        if (step is not AzureADDeploymentStep azureADStep)
         {
-            _azureADService = azureADService;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
-        {
-            if (step is not AzureADDeploymentStep azureADStep)
-            {
-                return;
-            }
-
-            var settings = await _azureADService.GetSettingsAsync();
+        var settings = await _azureADService.GetSettingsAsync();
 
-            var obj = new JsonObject { ["name"] = nameof(AzureADSettings) };
+        var obj = new JsonObject { ["name"] = nameof(AzureADSettings) };
 
-            obj.Merge(JObject.FromObject(settings, JOptions.Default));
+        obj.Merge(JObject.FromObject(settings, JOptions.Default));
 
-            result.Steps.Add(obj);
-        }
+        result.Steps.Add(obj);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Deployment/AzureADDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Deployment/AzureADDeploymentStep.cs
index 2d01d1c6c10..7f62ee50bfd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Deployment/AzureADDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Deployment/AzureADDeploymentStep.cs
@@ -1,15 +1,14 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Microsoft.Authentication.Deployment
+namespace OrchardCore.Microsoft.Authentication.Deployment;
+
+/// <summary>
+/// Adds Microsoft Entra ID settings to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class AzureADDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds Microsoft Entra ID settings to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class AzureADDeploymentStep : DeploymentStep
+    public AzureADDeploymentStep()
     {
-        public AzureADDeploymentStep()
-        {
-            Name = "Microsoft Entra ID";
-        }
+        Name = "Microsoft Entra ID";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Deployment/AzureADDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Deployment/AzureADDeploymentStepDriver.cs
index d12c19921a0..1a377ccf48f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Deployment/AzureADDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Deployment/AzureADDeploymentStepDriver.cs
@@ -3,22 +3,21 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Microsoft.Authentication.Deployment
+namespace OrchardCore.Microsoft.Authentication.Deployment;
+
+public sealed class AzureADDeploymentStepDriver : DisplayDriver<DeploymentStep, AzureADDeploymentStep>
 {
-    public sealed class AzureADDeploymentStepDriver : DisplayDriver<DeploymentStep, AzureADDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(AzureADDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(AzureADDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("AzureADDeploymentStep_Summary", step).Location("Summary", "Content"),
-                    View("AzureADDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("AzureADDeploymentStep_Summary", step).Location("Summary", "Content"),
+                View("AzureADDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(AzureADDeploymentStep step, BuildEditorContext context)
-        {
-            return View("AzureADDeploymentStep_Edit", step).Location("Content");
-        }
+    public override IDisplayResult Edit(AzureADDeploymentStep step, BuildEditorContext context)
+    {
+        return View("AzureADDeploymentStep_Edit", step).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Drivers/AzureADSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Drivers/AzureADSettingsDisplayDriver.cs
index a5404b91a60..a52bf87c83d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Drivers/AzureADSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Drivers/AzureADSettingsDisplayDriver.cs
@@ -9,70 +9,69 @@
 using OrchardCore.Microsoft.Authentication.ViewModels;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Microsoft.Authentication.Drivers
+namespace OrchardCore.Microsoft.Authentication.Drivers;
+
+public class AzureADSettingsDisplayDriver : SiteDisplayDriver<AzureADSettings>
 {
-    public class AzureADSettingsDisplayDriver : SiteDisplayDriver<AzureADSettings>
+    private readonly IShellReleaseManager _shellReleaseManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+
+    public AzureADSettingsDisplayDriver(
+        IShellReleaseManager shellReleaseManager,
+        IAuthorizationService authorizationService,
+        IHttpContextAccessor httpContextAccessor)
     {
-        private readonly IShellReleaseManager _shellReleaseManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
+        _shellReleaseManager = shellReleaseManager;
+        _authorizationService = authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+    }
+
+    protected override string SettingsGroupId
+        => MicrosoftAuthenticationConstants.Features.AAD;
 
-        public AzureADSettingsDisplayDriver(
-            IShellReleaseManager shellReleaseManager,
-            IAuthorizationService authorizationService,
-            IHttpContextAccessor httpContextAccessor)
+    public override async Task<IDisplayResult> EditAsync(ISite site, AzureADSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageMicrosoftAuthentication))
         {
-            _shellReleaseManager = shellReleaseManager;
-            _authorizationService = authorizationService;
-            _httpContextAccessor = httpContextAccessor;
+            return null;
         }
 
-        protected override string SettingsGroupId
-            => MicrosoftAuthenticationConstants.Features.AAD;
-
-        public override async Task<IDisplayResult> EditAsync(ISite site, AzureADSettings settings, BuildEditorContext context)
+        return Initialize<AzureADSettingsViewModel>("MicrosoftEntraIDSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageMicrosoftAuthentication))
+            model.DisplayName = settings.DisplayName;
+            model.AppId = settings.AppId;
+            model.TenantId = settings.TenantId;
+            model.SaveTokens = settings.SaveTokens;
+            if (settings.CallbackPath.HasValue)
             {
-                return null;
+                model.CallbackPath = settings.CallbackPath.Value;
             }
+        }).Location("Content:0")
+        .OnGroup(SettingsGroupId);
+    }
 
-            return Initialize<AzureADSettingsViewModel>("MicrosoftEntraIDSettings_Edit", model =>
-            {
-                model.DisplayName = settings.DisplayName;
-                model.AppId = settings.AppId;
-                model.TenantId = settings.TenantId;
-                model.SaveTokens = settings.SaveTokens;
-                if (settings.CallbackPath.HasValue)
-                {
-                    model.CallbackPath = settings.CallbackPath.Value;
-                }
-            }).Location("Content:0")
-            .OnGroup(SettingsGroupId);
-        }
-
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, AzureADSettings settings, UpdateEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, AzureADSettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageMicrosoftAuthentication))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageMicrosoftAuthentication))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var model = new AzureADSettingsViewModel();
+        var model = new AzureADSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            settings.DisplayName = model.DisplayName;
-            settings.AppId = model.AppId;
-            settings.TenantId = model.TenantId;
-            settings.CallbackPath = model.CallbackPath;
-            settings.SaveTokens = model.SaveTokens;
+        settings.DisplayName = model.DisplayName;
+        settings.AppId = model.AppId;
+        settings.TenantId = model.TenantId;
+        settings.CallbackPath = model.CallbackPath;
+        settings.SaveTokens = model.SaveTokens;
 
-            _shellReleaseManager.RequestRelease();
+        _shellReleaseManager.RequestRelease();
 
-            return await EditAsync(site, settings, context);
-        }
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Drivers/MicrosoftAccountSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Drivers/MicrosoftAccountSettingsDisplayDriver.cs
index 477bcf932a8..e16d7a9ee5c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Drivers/MicrosoftAccountSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Drivers/MicrosoftAccountSettingsDisplayDriver.cs
@@ -12,96 +12,95 @@
 using OrchardCore.Microsoft.Authentication.ViewModels;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Microsoft.Authentication.Drivers
+namespace OrchardCore.Microsoft.Authentication.Drivers;
+
+public sealed class MicrosoftAccountSettingsDisplayDriver : SiteDisplayDriver<MicrosoftAccountSettings>
 {
-    public sealed class MicrosoftAccountSettingsDisplayDriver : SiteDisplayDriver<MicrosoftAccountSettings>
+    private readonly IShellReleaseManager _shellReleaseManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IDataProtectionProvider _dataProtectionProvider;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly ILogger _logger;
+
+    public MicrosoftAccountSettingsDisplayDriver(
+        IShellReleaseManager shellReleaseManager,
+        IAuthorizationService authorizationService,
+        IDataProtectionProvider dataProtectionProvider,
+        IHttpContextAccessor httpContextAccessor,
+        ILogger<MicrosoftAccountSettingsDisplayDriver> logger)
     {
-        private readonly IShellReleaseManager _shellReleaseManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IDataProtectionProvider _dataProtectionProvider;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly ILogger _logger;
+        _shellReleaseManager = shellReleaseManager;
+        _authorizationService = authorizationService;
+        _dataProtectionProvider = dataProtectionProvider;
+        _httpContextAccessor = httpContextAccessor;
+        _logger = logger;
+    }
+
+    protected override string SettingsGroupId
+        => MicrosoftAuthenticationConstants.Features.MicrosoftAccount;
 
-        public MicrosoftAccountSettingsDisplayDriver(
-            IShellReleaseManager shellReleaseManager,
-            IAuthorizationService authorizationService,
-            IDataProtectionProvider dataProtectionProvider,
-            IHttpContextAccessor httpContextAccessor,
-            ILogger<MicrosoftAccountSettingsDisplayDriver> logger)
+    public override async Task<IDisplayResult> EditAsync(ISite site, MicrosoftAccountSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageMicrosoftAuthentication))
         {
-            _shellReleaseManager = shellReleaseManager;
-            _authorizationService = authorizationService;
-            _dataProtectionProvider = dataProtectionProvider;
-            _httpContextAccessor = httpContextAccessor;
-            _logger = logger;
+            return null;
         }
 
-        protected override string SettingsGroupId
-            => MicrosoftAuthenticationConstants.Features.MicrosoftAccount;
-
-        public override async Task<IDisplayResult> EditAsync(ISite site, MicrosoftAccountSettings settings, BuildEditorContext context)
+        return Initialize<MicrosoftAccountSettingsViewModel>("MicrosoftAccountSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageMicrosoftAuthentication))
-            {
-                return null;
-            }
-
-            return Initialize<MicrosoftAccountSettingsViewModel>("MicrosoftAccountSettings_Edit", model =>
+            model.AppId = settings.AppId;
+            if (!string.IsNullOrWhiteSpace(settings.AppSecret))
             {
-                model.AppId = settings.AppId;
-                if (!string.IsNullOrWhiteSpace(settings.AppSecret))
+                try
                 {
-                    try
-                    {
-                        var protector = _dataProtectionProvider.CreateProtector(MicrosoftAuthenticationConstants.Features.MicrosoftAccount);
-                        model.AppSecret = protector.Unprotect(settings.AppSecret);
-                    }
-                    catch (CryptographicException)
-                    {
-                        _logger.LogError("The app secret could not be decrypted. It may have been encrypted using a different key.");
-                        model.AppSecret = string.Empty;
-                        model.HasDecryptionError = true;
-                    }
+                    var protector = _dataProtectionProvider.CreateProtector(MicrosoftAuthenticationConstants.Features.MicrosoftAccount);
+                    model.AppSecret = protector.Unprotect(settings.AppSecret);
                 }
-                else
+                catch (CryptographicException)
                 {
+                    _logger.LogError("The app secret could not be decrypted. It may have been encrypted using a different key.");
                     model.AppSecret = string.Empty;
+                    model.HasDecryptionError = true;
                 }
-                if (settings.CallbackPath.HasValue)
-                {
-                    model.CallbackPath = settings.CallbackPath.Value;
-                }
-                model.SaveTokens = settings.SaveTokens;
-            }).Location("Content:5")
-            .OnGroup(SettingsGroupId);
-        }
-
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, MicrosoftAccountSettings settings, UpdateEditorContext context)
-        {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageMicrosoftAuthentication))
+            }
+            else
             {
-                return null;
+                model.AppSecret = string.Empty;
             }
+            if (settings.CallbackPath.HasValue)
+            {
+                model.CallbackPath = settings.CallbackPath.Value;
+            }
+            model.SaveTokens = settings.SaveTokens;
+        }).Location("Content:5")
+        .OnGroup(SettingsGroupId);
+    }
 
-            var model = new MicrosoftAccountSettingsViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
-
-            settings.AppId = model.AppId;
-            settings.CallbackPath = model.CallbackPath;
-            settings.SaveTokens = model.SaveTokens;
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, MicrosoftAccountSettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageMicrosoftAuthentication))
+        {
+            return null;
+        }
 
-            if (context.Updater.ModelState.IsValid)
-            {
-                var protector = _dataProtectionProvider.CreateProtector(MicrosoftAuthenticationConstants.Features.MicrosoftAccount);
+        var model = new MicrosoftAccountSettingsViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-                settings.AppSecret = protector.Protect(model.AppSecret);
-            }
+        settings.AppId = model.AppId;
+        settings.CallbackPath = model.CallbackPath;
+        settings.SaveTokens = model.SaveTokens;
 
-            _shellReleaseManager.RequestRelease();
+        if (context.Updater.ModelState.IsValid)
+        {
+            var protector = _dataProtectionProvider.CreateProtector(MicrosoftAuthenticationConstants.Features.MicrosoftAccount);
 
-            return await EditAsync(site, settings, context);
+            settings.AppSecret = protector.Protect(model.AppSecret);
         }
+
+        _shellReleaseManager.RequestRelease();
+
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Extensions/OrchardCoreBuilderExtensions.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Extensions/OrchardCoreBuilderExtensions.cs
index 83494f8fb05..bc6e014a599 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Extensions/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Extensions/OrchardCoreBuilderExtensions.cs
@@ -2,32 +2,31 @@
 using OrchardCore.Environment.Shell.Configuration;
 using OrchardCore.Microsoft.Authentication.Settings;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class OrchardCoreBuilderExtensions
 {
-    public static class OrchardCoreBuilderExtensions
+    public static OrchardCoreBuilder ConfigureMicrosoftAccountSettings(this OrchardCoreBuilder builder)
     {
-        public static OrchardCoreBuilder ConfigureMicrosoftAccountSettings(this OrchardCoreBuilder builder)
+        builder.ConfigureServices((tenantServices, serviceProvider) =>
         {
-            builder.ConfigureServices((tenantServices, serviceProvider) =>
-            {
-                var configurationSection = serviceProvider.GetRequiredService<IShellConfiguration>().GetSection("OrchardCore_Microsoft_Authentication_MicrosoftAccount");
+            var configurationSection = serviceProvider.GetRequiredService<IShellConfiguration>().GetSection("OrchardCore_Microsoft_Authentication_MicrosoftAccount");
 
-                tenantServices.PostConfigure<MicrosoftAccountSettings>(settings => configurationSection.Bind(settings));
-            });
+            tenantServices.PostConfigure<MicrosoftAccountSettings>(settings => configurationSection.Bind(settings));
+        });
 
-            return builder;
-        }
+        return builder;
+    }
 
-        public static OrchardCoreBuilder ConfigureAzureADSettings(this OrchardCoreBuilder builder)
+    public static OrchardCoreBuilder ConfigureAzureADSettings(this OrchardCoreBuilder builder)
+    {
+        builder.ConfigureServices((tenantServices, serviceProvider) =>
         {
-            builder.ConfigureServices((tenantServices, serviceProvider) =>
-            {
-                var configurationSection = serviceProvider.GetRequiredService<IShellConfiguration>().GetSection("OrchardCore_Microsoft_Authentication_AzureAD");
+            var configurationSection = serviceProvider.GetRequiredService<IShellConfiguration>().GetSection("OrchardCore_Microsoft_Authentication_AzureAD");
 
-                tenantServices.PostConfigure<AzureADSettings>(settings => configurationSection.Bind(settings));
-            });
+            tenantServices.PostConfigure<AzureADSettings>(settings => configurationSection.Bind(settings));
+        });
 
-            return builder;
-        }
+        return builder;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/MIcrosoftAuthenticationConstants.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/MIcrosoftAuthenticationConstants.cs
index 2d8ee60e6c7..44992dbed63 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/MIcrosoftAuthenticationConstants.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/MIcrosoftAuthenticationConstants.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.Microsoft.Authentication
+namespace OrchardCore.Microsoft.Authentication;
+
+public static class MicrosoftAuthenticationConstants
 {
-    public static class MicrosoftAuthenticationConstants
+    public static class Features
     {
-        public static class Features
-        {
-            public const string MicrosoftAccount = "OrchardCore.Microsoft.Authentication.MicrosoftAccount";
-            public const string AAD = "OrchardCore.Microsoft.Authentication.AzureAD";
-        }
+        public const string MicrosoftAccount = "OrchardCore.Microsoft.Authentication.MicrosoftAccount";
+        public const string AAD = "OrchardCore.Microsoft.Authentication.AzureAD";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/MicrosoftAccountStartup.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/MicrosoftAccountStartup.cs
index a68164ffc0b..826174b7dad 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/MicrosoftAccountStartup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/MicrosoftAccountStartup.cs
@@ -19,70 +19,69 @@
 using OrchardCore.Security.Permissions;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Microsoft.Authentication
+namespace OrchardCore.Microsoft.Authentication;
+
+[Feature(MicrosoftAuthenticationConstants.Features.MicrosoftAccount)]
+public sealed class MicrosoftAccountStartup : StartupBase
 {
-    [Feature(MicrosoftAuthenticationConstants.Features.MicrosoftAccount)]
-    public sealed class MicrosoftAccountStartup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.TryAddEnumerable(new ServiceDescriptor(typeof(IPermissionProvider), typeof(Permissions), ServiceLifetime.Scoped));
+        services.TryAddEnumerable(new ServiceDescriptor(typeof(IPermissionProvider), typeof(Permissions), ServiceLifetime.Scoped));
 
-            services.AddSingleton<IMicrosoftAccountService, MicrosoftAccountService>();
-            services.AddScoped<IDisplayDriver<ISite>, MicrosoftAccountSettingsDisplayDriver>();
-            services.AddScoped<INavigationProvider, AdminMenuMicrosoftAccount>();
-            services.AddRecipeExecutionStep<MicrosoftAccountSettingsStep>();
+        services.AddSingleton<IMicrosoftAccountService, MicrosoftAccountService>();
+        services.AddScoped<IDisplayDriver<ISite>, MicrosoftAccountSettingsDisplayDriver>();
+        services.AddScoped<INavigationProvider, AdminMenuMicrosoftAccount>();
+        services.AddRecipeExecutionStep<MicrosoftAccountSettingsStep>();
 
-            services.AddTransient<IConfigureOptions<MicrosoftAccountSettings>, MicrosoftAccountSettingsConfiguration>();
+        services.AddTransient<IConfigureOptions<MicrosoftAccountSettings>, MicrosoftAccountSettingsConfiguration>();
 
-            // Register the options initializers required by the Microsoft Account Handler.
-            services.TryAddEnumerable(new[]
-            {
-                // Orchard-specific initializers:
-                ServiceDescriptor.Transient<IConfigureOptions<AuthenticationOptions>, MicrosoftAccountOptionsConfiguration>(),
-                ServiceDescriptor.Transient<IConfigureOptions<MicrosoftAccountOptions>, MicrosoftAccountOptionsConfiguration>(),
-                // Built-in initializers:
-                ServiceDescriptor.Transient<IPostConfigureOptions<MicrosoftAccountOptions>, OAuthPostConfigureOptions<MicrosoftAccountOptions, MicrosoftAccountHandler>>()
-            });
-        }
+        // Register the options initializers required by the Microsoft Account Handler.
+        services.TryAddEnumerable(new[]
+        {
+            // Orchard-specific initializers:
+            ServiceDescriptor.Transient<IConfigureOptions<AuthenticationOptions>, MicrosoftAccountOptionsConfiguration>(),
+            ServiceDescriptor.Transient<IConfigureOptions<MicrosoftAccountOptions>, MicrosoftAccountOptionsConfiguration>(),
+            // Built-in initializers:
+            ServiceDescriptor.Transient<IPostConfigureOptions<MicrosoftAccountOptions>, OAuthPostConfigureOptions<MicrosoftAccountOptions, MicrosoftAccountHandler>>()
+        });
     }
+}
 
-    [Feature(MicrosoftAuthenticationConstants.Features.AAD)]
-    public sealed class AzureADStartup : StartupBase
+[Feature(MicrosoftAuthenticationConstants.Features.AAD)]
+public sealed class AzureADStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.TryAddEnumerable(new ServiceDescriptor(typeof(IPermissionProvider), typeof(Permissions), ServiceLifetime.Scoped));
+        services.TryAddEnumerable(new ServiceDescriptor(typeof(IPermissionProvider), typeof(Permissions), ServiceLifetime.Scoped));
 
-            services.AddSingleton<IAzureADService, AzureADService>();
-            services.AddRecipeExecutionStep<AzureADSettingsStep>();
+        services.AddSingleton<IAzureADService, AzureADService>();
+        services.AddRecipeExecutionStep<AzureADSettingsStep>();
 
-            services.AddScoped<IDisplayDriver<ISite>, AzureADSettingsDisplayDriver>();
-            services.AddScoped<INavigationProvider, AdminMenuAAD>();
+        services.AddScoped<IDisplayDriver<ISite>, AzureADSettingsDisplayDriver>();
+        services.AddScoped<INavigationProvider, AdminMenuAAD>();
 
-            services.AddTransient<IConfigureOptions<AzureADSettings>, AzureADSettingsConfiguration>();
+        services.AddTransient<IConfigureOptions<AzureADSettings>, AzureADSettingsConfiguration>();
 
-            // Register the options initializers required by the Policy Scheme, Cookie and OpenId Connect Handler.
-            services.TryAddEnumerable(new[]
-            {
-                // Orchard-specific initializers.
-                ServiceDescriptor.Transient<IConfigureOptions<AuthenticationOptions>, AzureADOptionsConfiguration>(),
-                ServiceDescriptor.Transient<IConfigureOptions<MicrosoftIdentityOptions>, AzureADOptionsConfiguration>(),
-                ServiceDescriptor.Transient<IConfigureOptions<PolicySchemeOptions>, AzureADOptionsConfiguration>(),
-                ServiceDescriptor.Transient<IConfigureOptions<OpenIdConnectOptions>, OpenIdConnectOptionsConfiguration>(),
+        // Register the options initializers required by the Policy Scheme, Cookie and OpenId Connect Handler.
+        services.TryAddEnumerable(new[]
+        {
+            // Orchard-specific initializers.
+            ServiceDescriptor.Transient<IConfigureOptions<AuthenticationOptions>, AzureADOptionsConfiguration>(),
+            ServiceDescriptor.Transient<IConfigureOptions<MicrosoftIdentityOptions>, AzureADOptionsConfiguration>(),
+            ServiceDescriptor.Transient<IConfigureOptions<PolicySchemeOptions>, AzureADOptionsConfiguration>(),
+            ServiceDescriptor.Transient<IConfigureOptions<OpenIdConnectOptions>, OpenIdConnectOptionsConfiguration>(),
 
-                // Built-in initializers:
-                ServiceDescriptor.Singleton<IPostConfigureOptions<OpenIdConnectOptions>, OpenIdConnectPostConfigureOptions>(),
-            });
-        }
+            // Built-in initializers:
+            ServiceDescriptor.Singleton<IPostConfigureOptions<OpenIdConnectOptions>, OpenIdConnectPostConfigureOptions>(),
+        });
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class DeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class DeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<AzureADDeploymentSource, AzureADDeploymentStep, AzureADDeploymentStepDriver>();
-        }
+        services.AddDeployment<AzureADDeploymentSource, AzureADDeploymentStep, AzureADDeploymentStepDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Recipes/AzureADSettingsStep.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Recipes/AzureADSettingsStep.cs
index 10b0e2956e9..a48271db7bc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Recipes/AzureADSettingsStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Recipes/AzureADSettingsStep.cs
@@ -6,44 +6,43 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Microsoft.Authentication.Recipes
+namespace OrchardCore.Microsoft.Authentication.Recipes;
+
+/// <summary>
+/// This recipe step sets general Microsoft Entra ID settings.
+/// </summary>
+public sealed class AzureADSettingsStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step sets general Microsoft Entra ID settings.
-    /// </summary>
-    public sealed class AzureADSettingsStep : IRecipeStepHandler
+    private readonly IAzureADService _azureADService;
+
+    public AzureADSettingsStep(IAzureADService azureADService)
     {
-        private readonly IAzureADService _azureADService;
+        _azureADService = azureADService;
+    }
 
-        public AzureADSettingsStep(IAzureADService azureADService)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, nameof(AzureADSettings), StringComparison.OrdinalIgnoreCase))
         {
-            _azureADService = azureADService;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, nameof(AzureADSettings), StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            var model = context.Step.ToObject<AzureADSettingsStepModel>();
-            var settings = await _azureADService.LoadSettingsAsync();
+        var model = context.Step.ToObject<AzureADSettingsStepModel>();
+        var settings = await _azureADService.LoadSettingsAsync();
 
-            settings.AppId = model.AppId;
-            settings.TenantId = model.TenantId;
-            settings.DisplayName = model.DisplayName;
-            settings.CallbackPath = model.CallbackPath;
+        settings.AppId = model.AppId;
+        settings.TenantId = model.TenantId;
+        settings.DisplayName = model.DisplayName;
+        settings.CallbackPath = model.CallbackPath;
 
-            await _azureADService.UpdateSettingsAsync(settings);
-        }
+        await _azureADService.UpdateSettingsAsync(settings);
     }
+}
 
-    public sealed class AzureADSettingsStepModel
-    {
-        public string DisplayName { get; set; }
-        public string AppId { get; set; }
-        public string TenantId { get; set; }
-        public string CallbackPath { get; set; }
-    }
+public sealed class AzureADSettingsStepModel
+{
+    public string DisplayName { get; set; }
+    public string AppId { get; set; }
+    public string TenantId { get; set; }
+    public string CallbackPath { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Recipes/MicrosoftAccountSettingsStep.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Recipes/MicrosoftAccountSettingsStep.cs
index e62b0cb0099..a10f9c68a40 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Recipes/MicrosoftAccountSettingsStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Recipes/MicrosoftAccountSettingsStep.cs
@@ -6,42 +6,41 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Microsoft.Authentication.Recipes
+namespace OrchardCore.Microsoft.Authentication.Recipes;
+
+/// <summary>
+/// This recipe step sets Microsoft Account settings.
+/// </summary>
+public sealed class MicrosoftAccountSettingsStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step sets Microsoft Account settings.
-    /// </summary>
-    public sealed class MicrosoftAccountSettingsStep : IRecipeStepHandler
+    private readonly IMicrosoftAccountService _microsoftAccountService;
+
+    public MicrosoftAccountSettingsStep(IMicrosoftAccountService microsoftAccountService)
     {
-        private readonly IMicrosoftAccountService _microsoftAccountService;
+        _microsoftAccountService = microsoftAccountService;
+    }
 
-        public MicrosoftAccountSettingsStep(IMicrosoftAccountService microsoftAccountService)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, nameof(MicrosoftAccountSettings), StringComparison.OrdinalIgnoreCase))
         {
-            _microsoftAccountService = microsoftAccountService;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, nameof(MicrosoftAccountSettings), StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            var model = context.Step.ToObject<MicrosoftAccountSettingsStepModel>();
-            var settings = await _microsoftAccountService.LoadSettingsAsync();
+        var model = context.Step.ToObject<MicrosoftAccountSettingsStepModel>();
+        var settings = await _microsoftAccountService.LoadSettingsAsync();
 
-            settings.AppId = model.AppId;
-            settings.AppSecret = model.AppSecret;
-            settings.CallbackPath = model.CallbackPath;
+        settings.AppId = model.AppId;
+        settings.AppSecret = model.AppSecret;
+        settings.CallbackPath = model.CallbackPath;
 
-            await _microsoftAccountService.UpdateSettingsAsync(settings);
-        }
+        await _microsoftAccountService.UpdateSettingsAsync(settings);
     }
+}
 
-    public sealed class MicrosoftAccountSettingsStepModel
-    {
-        public string AppId { get; set; }
-        public string AppSecret { get; set; }
-        public string CallbackPath { get; set; }
-    }
+public sealed class MicrosoftAccountSettingsStepModel
+{
+    public string AppId { get; set; }
+    public string AppSecret { get; set; }
+    public string CallbackPath { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Services/AzureADService.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Services/AzureADService.cs
index 62d91d3bc1e..b12f09ef8cc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Services/AzureADService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Services/AzureADService.cs
@@ -7,64 +7,63 @@
 using OrchardCore.Microsoft.Authentication.Settings;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Microsoft.Authentication.Services
+namespace OrchardCore.Microsoft.Authentication.Services;
+
+public class AzureADService : IAzureADService
 {
-    public class AzureADService : IAzureADService
+    private readonly ISiteService _siteService;
+    protected readonly IStringLocalizer S;
+
+    public AzureADService(
+        ISiteService siteService,
+        IStringLocalizer<AzureADService> stringLocalizer)
     {
-        private readonly ISiteService _siteService;
-        protected readonly IStringLocalizer S;
+        _siteService = siteService;
+        S = stringLocalizer;
+    }
 
-        public AzureADService(
-            ISiteService siteService,
-            IStringLocalizer<AzureADService> stringLocalizer)
-        {
-            _siteService = siteService;
-            S = stringLocalizer;
-        }
+    public Task<AzureADSettings> GetSettingsAsync()
+        => _siteService.GetSettingsAsync<AzureADSettings>();
 
-        public Task<AzureADSettings> GetSettingsAsync()
-            => _siteService.GetSettingsAsync<AzureADSettings>();
+    public async Task<AzureADSettings> LoadSettingsAsync()
+    {
+        var container = await _siteService.LoadSiteSettingsAsync();
+        return container.As<AzureADSettings>();
+    }
 
-        public async Task<AzureADSettings> LoadSettingsAsync()
-        {
-            var container = await _siteService.LoadSiteSettingsAsync();
-            return container.As<AzureADSettings>();
-        }
+    public async Task UpdateSettingsAsync(AzureADSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-        public async Task UpdateSettingsAsync(AzureADSettings settings)
+        var container = await _siteService.LoadSiteSettingsAsync();
+        container.Alter<AzureADSettings>(aspect =>
         {
-            ArgumentNullException.ThrowIfNull(settings);
+            aspect.AppId = settings.AppId;
+            aspect.CallbackPath = settings.CallbackPath;
+            aspect.DisplayName = settings.DisplayName;
+            aspect.TenantId = settings.TenantId;
+        });
 
-            var container = await _siteService.LoadSiteSettingsAsync();
-            container.Alter<AzureADSettings>(aspect =>
-            {
-                aspect.AppId = settings.AppId;
-                aspect.CallbackPath = settings.CallbackPath;
-                aspect.DisplayName = settings.DisplayName;
-                aspect.TenantId = settings.TenantId;
-            });
+        await _siteService.UpdateSiteSettingsAsync(container);
+    }
 
-            await _siteService.UpdateSiteSettingsAsync(container);
-        }
+    public IEnumerable<ValidationResult> ValidateSettings(AzureADSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-        public IEnumerable<ValidationResult> ValidateSettings(AzureADSettings settings)
+        if (string.IsNullOrWhiteSpace(settings.DisplayName))
         {
-            ArgumentNullException.ThrowIfNull(settings);
-
-            if (string.IsNullOrWhiteSpace(settings.DisplayName))
-            {
-                yield return new ValidationResult(S["DisplayName is required"], new string[] { nameof(settings.DisplayName) });
-            }
+            yield return new ValidationResult(S["DisplayName is required"], new string[] { nameof(settings.DisplayName) });
+        }
 
-            if (string.IsNullOrWhiteSpace(settings.AppId))
-            {
-                yield return new ValidationResult(S["AppId is required"], new string[] { nameof(settings.AppId) });
-            }
+        if (string.IsNullOrWhiteSpace(settings.AppId))
+        {
+            yield return new ValidationResult(S["AppId is required"], new string[] { nameof(settings.AppId) });
+        }
 
-            if (string.IsNullOrWhiteSpace(settings.TenantId))
-            {
-                yield return new ValidationResult(S["TenantId is required"], new string[] { nameof(settings.TenantId) });
-            }
+        if (string.IsNullOrWhiteSpace(settings.TenantId))
+        {
+            yield return new ValidationResult(S["TenantId is required"], new string[] { nameof(settings.TenantId) });
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Services/IAzureADService.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Services/IAzureADService.cs
index 822b30a282e..a66c834dac4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Services/IAzureADService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Services/IAzureADService.cs
@@ -3,13 +3,12 @@
 using System.Threading.Tasks;
 using OrchardCore.Microsoft.Authentication.Settings;
 
-namespace OrchardCore.Microsoft.Authentication.Services
+namespace OrchardCore.Microsoft.Authentication.Services;
+
+public interface IAzureADService
 {
-    public interface IAzureADService
-    {
-        Task<AzureADSettings> GetSettingsAsync();
-        Task<AzureADSettings> LoadSettingsAsync();
-        Task UpdateSettingsAsync(AzureADSettings settings);
-        IEnumerable<ValidationResult> ValidateSettings(AzureADSettings settings);
-    }
+    Task<AzureADSettings> GetSettingsAsync();
+    Task<AzureADSettings> LoadSettingsAsync();
+    Task UpdateSettingsAsync(AzureADSettings settings);
+    IEnumerable<ValidationResult> ValidateSettings(AzureADSettings settings);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Services/IMicrosoftAccountService.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Services/IMicrosoftAccountService.cs
index 5e5c1a07efc..83f1ab455fc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Services/IMicrosoftAccountService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Services/IMicrosoftAccountService.cs
@@ -3,13 +3,12 @@
 using System.Threading.Tasks;
 using OrchardCore.Microsoft.Authentication.Settings;
 
-namespace OrchardCore.Microsoft.Authentication.Services
+namespace OrchardCore.Microsoft.Authentication.Services;
+
+public interface IMicrosoftAccountService
 {
-    public interface IMicrosoftAccountService
-    {
-        Task<MicrosoftAccountSettings> GetSettingsAsync();
-        Task<MicrosoftAccountSettings> LoadSettingsAsync();
-        Task UpdateSettingsAsync(MicrosoftAccountSettings settings);
-        IEnumerable<ValidationResult> ValidateSettings(MicrosoftAccountSettings settings);
-    }
+    Task<MicrosoftAccountSettings> GetSettingsAsync();
+    Task<MicrosoftAccountSettings> LoadSettingsAsync();
+    Task UpdateSettingsAsync(MicrosoftAccountSettings settings);
+    IEnumerable<ValidationResult> ValidateSettings(MicrosoftAccountSettings settings);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Services/MicrosoftAccountService.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Services/MicrosoftAccountService.cs
index 4828c1897d0..369fec3caf8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Services/MicrosoftAccountService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Services/MicrosoftAccountService.cs
@@ -7,58 +7,57 @@
 using OrchardCore.Microsoft.Authentication.Settings;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Microsoft.Authentication.Services
+namespace OrchardCore.Microsoft.Authentication.Services;
+
+public class MicrosoftAccountService : IMicrosoftAccountService
 {
-    public class MicrosoftAccountService : IMicrosoftAccountService
+    private readonly ISiteService _siteService;
+    protected readonly IStringLocalizer S;
+
+    public MicrosoftAccountService(
+        ISiteService siteService,
+        IStringLocalizer<MicrosoftAccountService> stringLocalizer)
     {
-        private readonly ISiteService _siteService;
-        protected readonly IStringLocalizer S;
+        _siteService = siteService;
+        S = stringLocalizer;
+    }
 
-        public MicrosoftAccountService(
-            ISiteService siteService,
-            IStringLocalizer<MicrosoftAccountService> stringLocalizer)
-        {
-            _siteService = siteService;
-            S = stringLocalizer;
-        }
+    public Task<MicrosoftAccountSettings> GetSettingsAsync()
+        => _siteService.GetSettingsAsync<MicrosoftAccountSettings>();
 
-        public Task<MicrosoftAccountSettings> GetSettingsAsync()
-            => _siteService.GetSettingsAsync<MicrosoftAccountSettings>();
+    public async Task<MicrosoftAccountSettings> LoadSettingsAsync()
+    {
+        var container = await _siteService.LoadSiteSettingsAsync();
+        return container.As<MicrosoftAccountSettings>();
+    }
 
-        public async Task<MicrosoftAccountSettings> LoadSettingsAsync()
-        {
-            var container = await _siteService.LoadSiteSettingsAsync();
-            return container.As<MicrosoftAccountSettings>();
-        }
+    public async Task UpdateSettingsAsync(MicrosoftAccountSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-        public async Task UpdateSettingsAsync(MicrosoftAccountSettings settings)
+        var container = await _siteService.LoadSiteSettingsAsync();
+        container.Alter<MicrosoftAccountSettings>(aspect =>
         {
-            ArgumentNullException.ThrowIfNull(settings);
+            aspect.AppId = settings.AppId;
+            aspect.AppSecret = settings.AppSecret;
+            aspect.CallbackPath = settings.CallbackPath;
+        });
 
-            var container = await _siteService.LoadSiteSettingsAsync();
-            container.Alter<MicrosoftAccountSettings>(aspect =>
-            {
-                aspect.AppId = settings.AppId;
-                aspect.AppSecret = settings.AppSecret;
-                aspect.CallbackPath = settings.CallbackPath;
-            });
+        await _siteService.UpdateSiteSettingsAsync(container);
+    }
 
-            await _siteService.UpdateSiteSettingsAsync(container);
-        }
+    public IEnumerable<ValidationResult> ValidateSettings(MicrosoftAccountSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-        public IEnumerable<ValidationResult> ValidateSettings(MicrosoftAccountSettings settings)
+        if (string.IsNullOrWhiteSpace(settings.AppId))
         {
-            ArgumentNullException.ThrowIfNull(settings);
-
-            if (string.IsNullOrWhiteSpace(settings.AppId))
-            {
-                yield return new ValidationResult(S["AppId is required"], new string[] { nameof(settings.AppId) });
-            }
+            yield return new ValidationResult(S["AppId is required"], new string[] { nameof(settings.AppId) });
+        }
 
-            if (string.IsNullOrWhiteSpace(settings.AppSecret))
-            {
-                yield return new ValidationResult(S["AppSecret is required"], new string[] { nameof(settings.AppSecret) });
-            }
+        if (string.IsNullOrWhiteSpace(settings.AppSecret))
+        {
+            yield return new ValidationResult(S["AppSecret is required"], new string[] { nameof(settings.AppSecret) });
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Settings/AzureADSettings.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Settings/AzureADSettings.cs
index cf87240f01b..c9bcf9ff6e7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Settings/AzureADSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Settings/AzureADSettings.cs
@@ -1,13 +1,12 @@
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Microsoft.Authentication.Settings
+namespace OrchardCore.Microsoft.Authentication.Settings;
+
+public class AzureADSettings
 {
-    public class AzureADSettings
-    {
-        public string DisplayName { get; set; }
-        public string AppId { get; set; }
-        public string TenantId { get; set; }
-        public PathString CallbackPath { get; set; }
-        public bool SaveTokens { get; set; }
-    }
+    public string DisplayName { get; set; }
+    public string AppId { get; set; }
+    public string TenantId { get; set; }
+    public PathString CallbackPath { get; set; }
+    public bool SaveTokens { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Settings/MicrosoftAccountSettings.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Settings/MicrosoftAccountSettings.cs
index 3655120635b..4a02e69e337 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Settings/MicrosoftAccountSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Settings/MicrosoftAccountSettings.cs
@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Microsoft.Authentication.Settings
+namespace OrchardCore.Microsoft.Authentication.Settings;
+
+public class MicrosoftAccountSettings
 {
-    public class MicrosoftAccountSettings
-    {
-        public string AppId { get; set; }
-        public string AppSecret { get; set; }
-        public PathString CallbackPath { get; set; }
-        public bool SaveTokens { get; set; }
-    }
+    public string AppId { get; set; }
+    public string AppSecret { get; set; }
+    public PathString CallbackPath { get; set; }
+    public bool SaveTokens { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/ViewModels/AzureADSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/ViewModels/AzureADSettingsViewModel.cs
index 49cf00cfa0e..2e3e1608e4a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/ViewModels/AzureADSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/ViewModels/AzureADSettingsViewModel.cs
@@ -1,21 +1,20 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Microsoft.Authentication.ViewModels
+namespace OrchardCore.Microsoft.Authentication.ViewModels;
+
+public class AzureADSettingsViewModel
 {
-    public class AzureADSettingsViewModel
-    {
-        [Required]
-        public string DisplayName { get; set; }
+    [Required]
+    public string DisplayName { get; set; }
 
-        [Required(AllowEmptyStrings = false, ErrorMessage = "Application Id is required")]
-        public string AppId { get; set; }
+    [Required(AllowEmptyStrings = false, ErrorMessage = "Application Id is required")]
+    public string AppId { get; set; }
 
-        [Required(AllowEmptyStrings = false, ErrorMessage = "Tenant Id is required")]
-        public string TenantId { get; set; }
+    [Required(AllowEmptyStrings = false, ErrorMessage = "Tenant Id is required")]
+    public string TenantId { get; set; }
 
-        [RegularExpression(@"\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]", ErrorMessage = "Invalid path")]
-        public string CallbackPath { get; set; }
+    [RegularExpression(@"\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]", ErrorMessage = "Invalid path")]
+    public string CallbackPath { get; set; }
 
-        public bool SaveTokens { get; set; }
-    }
+    public bool SaveTokens { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/ViewModels/ErrorViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/ViewModels/ErrorViewModel.cs
index c111f9a74f7..98bcd7c33eb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/ViewModels/ErrorViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/ViewModels/ErrorViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Facebook.ViewModels
+namespace OrchardCore.Facebook.ViewModels;
+
+public class ErrorViewModel
 {
-    public class ErrorViewModel
-    {
-        public string Error { get; set; }
+    public string Error { get; set; }
 
-        public string ErrorDescription { get; set; }
-    }
+    public string ErrorDescription { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/ViewModels/MicrosoftAccountSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/ViewModels/MicrosoftAccountSettingsViewModel.cs
index ac5e7595c40..cbac43c609a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/ViewModels/MicrosoftAccountSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/ViewModels/MicrosoftAccountSettingsViewModel.cs
@@ -1,20 +1,19 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Microsoft.Authentication.ViewModels
+namespace OrchardCore.Microsoft.Authentication.ViewModels;
+
+public class MicrosoftAccountSettingsViewModel
 {
-    public class MicrosoftAccountSettingsViewModel
-    {
-        [Required(AllowEmptyStrings = false, ErrorMessage = "Application Id is required")]
-        public string AppId { get; set; }
+    [Required(AllowEmptyStrings = false, ErrorMessage = "Application Id is required")]
+    public string AppId { get; set; }
 
-        [Required(AllowEmptyStrings = false, ErrorMessage = "Application Secret is required")]
-        public string AppSecret { get; set; }
+    [Required(AllowEmptyStrings = false, ErrorMessage = "Application Secret is required")]
+    public string AppSecret { get; set; }
 
-        [RegularExpression(@"\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]", ErrorMessage = "Invalid path")]
-        public string CallbackPath { get; set; }
+    [RegularExpression(@"\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]", ErrorMessage = "Invalid path")]
+    public string CallbackPath { get; set; }
 
-        public bool SaveTokens { get; set; }
+    public bool SaveTokens { get; set; }
 
-        public bool HasDecryptionError { get; set; }
-    }
+    public bool HasDecryptionError { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.MiniProfiler/CurrentDbProfiler.cs b/src/OrchardCore.Modules/OrchardCore.MiniProfiler/CurrentDbProfiler.cs
index 82b13059870..346dea04f25 100644
--- a/src/OrchardCore.Modules/OrchardCore.MiniProfiler/CurrentDbProfiler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.MiniProfiler/CurrentDbProfiler.cs
@@ -3,25 +3,24 @@
 using System.Data.Common;
 using StackExchange.Profiling.Data;
 
-namespace OrchardCore.MiniProfiler
+namespace OrchardCore.MiniProfiler;
+
+internal sealed class CurrentDbProfiler : IDbProfiler
 {
-    internal sealed class CurrentDbProfiler : IDbProfiler
-    {
-        private Func<IDbProfiler> GetProfiler { get; }
-        public CurrentDbProfiler(Func<IDbProfiler> getProfiler) => GetProfiler = getProfiler;
+    private Func<IDbProfiler> GetProfiler { get; }
+    public CurrentDbProfiler(Func<IDbProfiler> getProfiler) => GetProfiler = getProfiler;
 
-        public bool IsActive => ((IDbProfiler)StackExchange.Profiling.MiniProfiler.Current)?.IsActive ?? false;
+    public bool IsActive => ((IDbProfiler)StackExchange.Profiling.MiniProfiler.Current)?.IsActive ?? false;
 
-        public void ExecuteFinish(IDbCommand profiledDbCommand, SqlExecuteType executeType, DbDataReader reader) =>
-            GetProfiler()?.ExecuteFinish(profiledDbCommand, executeType, reader);
+    public void ExecuteFinish(IDbCommand profiledDbCommand, SqlExecuteType executeType, DbDataReader reader) =>
+        GetProfiler()?.ExecuteFinish(profiledDbCommand, executeType, reader);
 
-        public void ExecuteStart(IDbCommand profiledDbCommand, SqlExecuteType executeType) =>
-            GetProfiler()?.ExecuteStart(profiledDbCommand, executeType);
+    public void ExecuteStart(IDbCommand profiledDbCommand, SqlExecuteType executeType) =>
+        GetProfiler()?.ExecuteStart(profiledDbCommand, executeType);
 
-        public void OnError(IDbCommand profiledDbCommand, SqlExecuteType executeType, Exception exception) =>
-            GetProfiler()?.OnError(profiledDbCommand, executeType, exception);
+    public void OnError(IDbCommand profiledDbCommand, SqlExecuteType executeType, Exception exception) =>
+        GetProfiler()?.OnError(profiledDbCommand, executeType, exception);
 
-        public void ReaderFinish(IDataReader reader) =>
-            GetProfiler()?.ReaderFinish(reader);
-    }
+    public void ReaderFinish(IDataReader reader) =>
+        GetProfiler()?.ReaderFinish(reader);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.MiniProfiler/MiniProfilerConnectionFactory.cs b/src/OrchardCore.Modules/OrchardCore.MiniProfiler/MiniProfilerConnectionFactory.cs
index 555af9f3146..4d3ca7436a0 100644
--- a/src/OrchardCore.Modules/OrchardCore.MiniProfiler/MiniProfilerConnectionFactory.cs
+++ b/src/OrchardCore.Modules/OrchardCore.MiniProfiler/MiniProfilerConnectionFactory.cs
@@ -3,27 +3,26 @@
 using StackExchange.Profiling.Data;
 using YesSql;
 
-namespace OrchardCore.MiniProfiler
+namespace OrchardCore.MiniProfiler;
+
+internal sealed class MiniProfilerConnectionFactory : IConnectionFactory
 {
-    internal sealed class MiniProfilerConnectionFactory : IConnectionFactory
-    {
-        private static readonly string ConnectionName = nameof(ProfiledDbConnection).ToLower();
+    private static readonly string ConnectionName = nameof(ProfiledDbConnection).ToLower();
 
-        private readonly IConnectionFactory _factory;
+    private readonly IConnectionFactory _factory;
 
-        public Type DbConnectionType => typeof(ProfiledDbConnection);
+    public Type DbConnectionType => typeof(ProfiledDbConnection);
 
-        public MiniProfilerConnectionFactory(IConnectionFactory factory)
-        {
-            _factory = factory;
-        }
+    public MiniProfilerConnectionFactory(IConnectionFactory factory)
+    {
+        _factory = factory;
+    }
 
-        public DbConnection CreateConnection()
-        {
-            // Forward the call to the actual factory.
-            var connection = _factory.CreateConnection();
+    public DbConnection CreateConnection()
+    {
+        // Forward the call to the actual factory.
+        var connection = _factory.CreateConnection();
 
-            return new ProfiledDbConnection(connection, new CurrentDbProfiler(() => StackExchange.Profiling.MiniProfiler.Current));
-        }
+        return new ProfiledDbConnection(connection, new CurrentDbProfiler(() => StackExchange.Profiling.MiniProfiler.Current));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.MiniProfiler/MiniProfilerFilter.cs b/src/OrchardCore.Modules/OrchardCore.MiniProfiler/MiniProfilerFilter.cs
index fc4a23394cb..329e8fbd048 100644
--- a/src/OrchardCore.Modules/OrchardCore.MiniProfiler/MiniProfilerFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.MiniProfiler/MiniProfilerFilter.cs
@@ -6,46 +6,45 @@
 using OrchardCore.DisplayManagement.Layout;
 using OrchardCore.DisplayManagement.Shapes;
 
-namespace OrchardCore.MiniProfiler
+namespace OrchardCore.MiniProfiler;
+
+public sealed class MiniProfilerFilter : IAsyncResultFilter
 {
-    public sealed class MiniProfilerFilter : IAsyncResultFilter
+    private readonly ILayoutAccessor _layoutAccessor;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly IAuthorizationService _authorizationService;
+
+    public MiniProfilerFilter(
+        ILayoutAccessor layoutAccessor,
+        IShapeFactory shapeFactory,
+        IAuthorizationService authorizationService)
     {
-        private readonly ILayoutAccessor _layoutAccessor;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly IAuthorizationService _authorizationService;
+        _layoutAccessor = layoutAccessor;
+        _shapeFactory = shapeFactory;
+        _authorizationService = authorizationService;
+    }
 
-        public MiniProfilerFilter(
-            ILayoutAccessor layoutAccessor,
-            IShapeFactory shapeFactory,
-            IAuthorizationService authorizationService)
+    public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
+    {
+        var viewMiniProfilerOnFrontEnd = await _authorizationService.AuthorizeAsync(context.HttpContext.User, Permissions.ViewMiniProfilerOnFrontEnd);
+        var viewMiniProfilerOnBackEnd = await _authorizationService.AuthorizeAsync(context.HttpContext.User, Permissions.ViewMiniProfilerOnBackEnd);
+        if (
+                context.IsViewOrPageResult() &&
+                (
+                    (viewMiniProfilerOnFrontEnd && !AdminAttribute.IsApplied(context.HttpContext)) ||
+                    (viewMiniProfilerOnBackEnd && AdminAttribute.IsApplied(context.HttpContext))
+                )
+            )
         {
-            _layoutAccessor = layoutAccessor;
-            _shapeFactory = shapeFactory;
-            _authorizationService = authorizationService;
-        }
+            var layout = await _layoutAccessor.GetLayoutAsync();
+            var footerZone = layout.Zones["Footer"];
 
-        public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
-        {
-            var viewMiniProfilerOnFrontEnd = await _authorizationService.AuthorizeAsync(context.HttpContext.User, Permissions.ViewMiniProfilerOnFrontEnd);
-            var viewMiniProfilerOnBackEnd = await _authorizationService.AuthorizeAsync(context.HttpContext.User, Permissions.ViewMiniProfilerOnBackEnd);
-            if (
-                    context.IsViewOrPageResult() &&
-                    (
-                        (viewMiniProfilerOnFrontEnd && !AdminAttribute.IsApplied(context.HttpContext)) ||
-                        (viewMiniProfilerOnBackEnd && AdminAttribute.IsApplied(context.HttpContext))
-                    )
-                )
+            if (footerZone is Shape shape)
             {
-                var layout = await _layoutAccessor.GetLayoutAsync();
-                var footerZone = layout.Zones["Footer"];
-
-                if (footerZone is Shape shape)
-                {
-                    await shape.AddAsync(await _shapeFactory.CreateAsync("MiniProfiler"));
-                }
+                await shape.AddAsync(await _shapeFactory.CreateAsync("MiniProfiler"));
             }
-
-            await next.Invoke();
         }
+
+        await next.Invoke();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.MiniProfiler/ShapeStep.cs b/src/OrchardCore.Modules/OrchardCore.MiniProfiler/ShapeStep.cs
index 2253d3834b1..e3d9f51f2ba 100644
--- a/src/OrchardCore.Modules/OrchardCore.MiniProfiler/ShapeStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.MiniProfiler/ShapeStep.cs
@@ -4,39 +4,38 @@
 using OrchardCore.DisplayManagement.Implementation;
 using StackExchange.Profiling;
 
-namespace OrchardCore.MiniProfiler
+namespace OrchardCore.MiniProfiler;
+
+public class ShapeStep : IShapeDisplayEvents
 {
-    public class ShapeStep : IShapeDisplayEvents
-    {
-        private readonly Dictionary<object, IDisposable> _timings = [];
+    private readonly Dictionary<object, IDisposable> _timings = [];
 
-        public Task DisplayedAsync(ShapeDisplayContext context)
+    public Task DisplayedAsync(ShapeDisplayContext context)
+    {
+        if (_timings.TryGetValue(context, out var timing))
         {
-            if (_timings.TryGetValue(context, out var timing))
-            {
-                _timings.Remove(context);
-                timing.Dispose();
-            }
-
-            return Task.CompletedTask;
+            _timings.Remove(context);
+            timing.Dispose();
         }
 
-        public Task DisplayingAsync(ShapeDisplayContext context)
-        {
-            var timing = StackExchange.Profiling.MiniProfiler.Current.Step($"Shape: {context.Shape.Metadata.Type}");
-            _timings.Add(context, timing);
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
+    }
 
-        public Task DisplayingFinalizedAsync(ShapeDisplayContext context)
-        {
-            if (_timings.TryGetValue(context, out var timing))
-            {
-                _timings.Remove(context);
-                timing.Dispose();
-            }
+    public Task DisplayingAsync(ShapeDisplayContext context)
+    {
+        var timing = StackExchange.Profiling.MiniProfiler.Current.Step($"Shape: {context.Shape.Metadata.Type}");
+        _timings.Add(context, timing);
+        return Task.CompletedTask;
+    }
 
-            return Task.CompletedTask;
+    public Task DisplayingFinalizedAsync(ShapeDisplayContext context)
+    {
+        if (_timings.TryGetValue(context, out var timing))
+        {
+            _timings.Remove(context);
+            timing.Dispose();
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.MiniProfiler/Startup.cs b/src/OrchardCore.Modules/OrchardCore.MiniProfiler/Startup.cs
index f8ab4ce7380..c0532b3a7b3 100644
--- a/src/OrchardCore.Modules/OrchardCore.MiniProfiler/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.MiniProfiler/Startup.cs
@@ -8,35 +8,34 @@
 using OrchardCore.Security.Permissions;
 using YesSql;
 
-namespace OrchardCore.MiniProfiler
+namespace OrchardCore.MiniProfiler;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
-    {
-        // Early in the pipeline to wrap all other middleware
-        public override int Order => -500;
+    // Early in the pipeline to wrap all other middleware
+    public override int Order => -500;
 
-        public override void ConfigureServices(IServiceCollection services)
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.Configure<MvcOptions>((options) =>
         {
-            services.Configure<MvcOptions>((options) =>
-            {
-                options.Filters.Add<MiniProfilerFilter>();
-            });
+            options.Filters.Add<MiniProfilerFilter>();
+        });
 
-            services.AddScoped<IShapeDisplayEvents, ShapeStep>();
+        services.AddScoped<IShapeDisplayEvents, ShapeStep>();
 
-            services.AddMiniProfiler();
+        services.AddMiniProfiler();
 
-            services.AddScoped<IPermissionProvider, Permissions>();
-        }
+        services.AddScoped<IPermissionProvider, Permissions>();
+    }
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            app.UseMiniProfiler();
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        app.UseMiniProfiler();
 
-            var store = serviceProvider.GetService<IStore>();
+        var store = serviceProvider.GetService<IStore>();
 
-            // Wrap the current factory with MiniProfilerConnectionFactory.
-            store.Configuration.ConnectionFactory = new MiniProfilerConnectionFactory(store.Configuration.ConnectionFactory);
-        }
+        // Wrap the current factory with MiniProfilerConnectionFactory.
+        store.Configuration.ConnectionFactory = new MiniProfilerConnectionFactory(store.Configuration.ConnectionFactory);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Mvc.HelloWorld/Controllers/HomeController.cs b/src/OrchardCore.Modules/OrchardCore.Mvc.HelloWorld/Controllers/HomeController.cs
index dcd0e39e8e6..da8823cbb36 100644
--- a/src/OrchardCore.Modules/OrchardCore.Mvc.HelloWorld/Controllers/HomeController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Mvc.HelloWorld/Controllers/HomeController.cs
@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace HelloWorld.Controllers
+namespace HelloWorld.Controllers;
+
+public class HomeController : Controller
 {
-    public class HomeController : Controller
+    public IActionResult Index()
     {
-        public IActionResult Index()
-        {
-            return View();
-        }
+        return View();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Mvc.HelloWorld/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Mvc.HelloWorld/Startup.cs
index 8f41ef0fc09..beab65f1f56 100644
--- a/src/OrchardCore.Modules/OrchardCore.Mvc.HelloWorld/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Mvc.HelloWorld/Startup.cs
@@ -4,31 +4,30 @@
 using Microsoft.Extensions.Configuration;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Mvc.HelloWorld
+namespace OrchardCore.Mvc.HelloWorld;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    private readonly IConfiguration _configuration;
+
+    public Startup(IConfiguration configuration)
     {
-        private readonly IConfiguration _configuration;
+        _configuration = configuration;
+    }
 
-        public Startup(IConfiguration configuration)
+    public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        if (string.IsNullOrEmpty(_configuration["Sample"]))
         {
-            _configuration = configuration;
+            throw new Exception(":(");
         }
 
-        public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            if (string.IsNullOrEmpty(_configuration["Sample"]))
-            {
-                throw new Exception(":(");
-            }
-
-            routes.MapAreaControllerRoute
-            (
-                name: "Home",
-                areaName: "OrchardCore.Mvc.HelloWorld",
-                pattern: "",
-                defaults: new { controller = "Home", action = "Index" }
-            );
-        }
+        routes.MapAreaControllerRoute
+        (
+            name: "Home",
+            areaName: "OrchardCore.Mvc.HelloWorld",
+            pattern: "",
+            defaults: new { controller = "Home", action = "Index" }
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Navigation/NavigationShapes.cs b/src/OrchardCore.Modules/OrchardCore.Navigation/NavigationShapes.cs
index d984364033c..27e7e864691 100644
--- a/src/OrchardCore.Modules/OrchardCore.Navigation/NavigationShapes.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Navigation/NavigationShapes.cs
@@ -8,104 +8,103 @@
 using OrchardCore.DisplayManagement.Utilities;
 using OrchardCore.Mvc.Utilities;
 
-namespace OrchardCore.Navigation
+namespace OrchardCore.Navigation;
+
+public class NavigationShapes : ShapeTableProvider
 {
-    public class NavigationShapes : ShapeTableProvider
+    public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
     {
-        public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
-        {
-            builder.Describe("Navigation")
-                .OnDisplaying(displaying =>
-                {
-                    var menu = displaying.Shape;
-                    var menuName = menu.GetProperty<string>("MenuName");
-
-                    menu.Classes.Add("menu-" + menuName.HtmlClassify());
-                    menu.Classes.Add("menu");
-                    menu.Metadata.Alternates.Add("Navigation__" + menuName.EncodeAlternateElement());
-                })
-                .OnProcessing(async context =>
+        builder.Describe("Navigation")
+            .OnDisplaying(displaying =>
+            {
+                var menu = displaying.Shape;
+                var menuName = menu.GetProperty<string>("MenuName");
+
+                menu.Classes.Add("menu-" + menuName.HtmlClassify());
+                menu.Classes.Add("menu");
+                menu.Metadata.Alternates.Add("Navigation__" + menuName.EncodeAlternateElement());
+            })
+            .OnProcessing(async context =>
+            {
+                var menu = context.Shape;
+                var menuName = menu.GetProperty<string>("MenuName");
+
+                // Menu population is executed when processing the shape so that its value
+                // can be cached. IShapeDisplayEvents is called before the ShapeDescriptor
+                // events and thus this code can be cached.
+
+                if (menu is Shape shape && shape.HasItems)
                 {
-                    var menu = context.Shape;
-                    var menuName = menu.GetProperty<string>("MenuName");
-
-                    // Menu population is executed when processing the shape so that its value
-                    // can be cached. IShapeDisplayEvents is called before the ShapeDescriptor
-                    // events and thus this code can be cached.
+                    return;
+                }
 
-                    if (menu is Shape shape && shape.HasItems)
-                    {
-                        return;
-                    }
+                var viewContextAccessor = context.ServiceProvider.GetRequiredService<ViewContextAccessor>();
+                var viewContext = viewContextAccessor.ViewContext;
+                var navigationManagers = context.ServiceProvider.GetServices<INavigationManager>();
+                var shapeFactory = context.ServiceProvider.GetRequiredService<IShapeFactory>();
+                var httpContextAccessor = context.ServiceProvider.GetRequiredService<IHttpContextAccessor>();
 
-                    var viewContextAccessor = context.ServiceProvider.GetRequiredService<ViewContextAccessor>();
-                    var viewContext = viewContextAccessor.ViewContext;
-                    var navigationManagers = context.ServiceProvider.GetServices<INavigationManager>();
-                    var shapeFactory = context.ServiceProvider.GetRequiredService<IShapeFactory>();
-                    var httpContextAccessor = context.ServiceProvider.GetRequiredService<IHttpContextAccessor>();
+                foreach (var navigationManager in navigationManagers)
+                {
+                    var menuItems = await navigationManager.BuildMenuAsync(menuName, viewContext);
+                    var httpContext = httpContextAccessor.HttpContext;
 
-                    foreach (var navigationManager in navigationManagers)
+                    if (httpContext != null)
                     {
-                        var menuItems = await navigationManager.BuildMenuAsync(menuName, viewContext);
-                        var httpContext = httpContextAccessor.HttpContext;
+                        // adding query string parameters
+                        var route = menu.GetProperty<RouteData>("RouteData");
+                        var routeData = new RouteValueDictionary(route.Values);
+                        var query = httpContext.Request.Query;
 
-                        if (httpContext != null)
+                        if (query != null)
                         {
-                            // adding query string parameters
-                            var route = menu.GetProperty<RouteData>("RouteData");
-                            var routeData = new RouteValueDictionary(route.Values);
-                            var query = httpContext.Request.Query;
-
-                            if (query != null)
+                            foreach (var pair in query)
                             {
-                                foreach (var pair in query)
+                                if (pair.Key != null && !routeData.ContainsKey(pair.Key))
                                 {
-                                    if (pair.Key != null && !routeData.ContainsKey(pair.Key))
-                                    {
-                                        routeData[pair.Key] = pair.Value;
-                                    }
+                                    routeData[pair.Key] = pair.Value;
                                 }
                             }
                         }
-
-                        // TODO: Flag Selected menu item
-                        await NavigationHelper.PopulateMenuAsync(shapeFactory, menu, menu, menuItems, viewContext);
                     }
-                });
 
-            builder.Describe("NavigationItem")
-                .OnDisplaying(displaying =>
-                {
-                    var menuItem = displaying.Shape;
-                    var menu = menuItem.GetProperty<IShape>("Menu");
-                    var menuName = menu.GetProperty<string>("MenuName");
-                    var level = menuItem.GetProperty<int>("Level");
+                    // TODO: Flag Selected menu item
+                    await NavigationHelper.PopulateMenuAsync(shapeFactory, menu, menu, menuItems, viewContext);
+                }
+            });
 
-                    var encodedMenuName = menuName.EncodeAlternateElement();
+        builder.Describe("NavigationItem")
+            .OnDisplaying(displaying =>
+            {
+                var menuItem = displaying.Shape;
+                var menu = menuItem.GetProperty<IShape>("Menu");
+                var menuName = menu.GetProperty<string>("MenuName");
+                var level = menuItem.GetProperty<int>("Level");
 
-                    menuItem.Metadata.Alternates.Add("NavigationItem__level__" + level);
-                    menuItem.Metadata.Alternates.Add("NavigationItem__" + encodedMenuName);
-                    menuItem.Metadata.Alternates.Add("NavigationItem__" + encodedMenuName + "__level__" + level);
-                });
+                var encodedMenuName = menuName.EncodeAlternateElement();
 
-            builder.Describe("NavigationItemLink")
-                .OnDisplaying(displaying =>
-                {
-                    var menuItem = displaying.Shape;
-                    var menuName = menuItem.GetProperty<IShape>("Menu").GetProperty<string>("MenuName");
-                    var level = menuItem.GetProperty<int>("Level");
+                menuItem.Metadata.Alternates.Add("NavigationItem__level__" + level);
+                menuItem.Metadata.Alternates.Add("NavigationItem__" + encodedMenuName);
+                menuItem.Metadata.Alternates.Add("NavigationItem__" + encodedMenuName + "__level__" + level);
+            });
+
+        builder.Describe("NavigationItemLink")
+            .OnDisplaying(displaying =>
+            {
+                var menuItem = displaying.Shape;
+                var menuName = menuItem.GetProperty<IShape>("Menu").GetProperty<string>("MenuName");
+                var level = menuItem.GetProperty<int>("Level");
 
-                    menuItem.Metadata.Alternates.Add("NavigationItemLink__level__" + level);
+                menuItem.Metadata.Alternates.Add("NavigationItemLink__level__" + level);
 
-                    var encodedMenuName = menuName.EncodeAlternateElement();
+                var encodedMenuName = menuName.EncodeAlternateElement();
 
-                    // NavigationItemLink__[MenuName] e.g. NavigationItemLink-Main-Menu
-                    // NavigationItemLink__[MenuName]__level__[level] e.g. NavigationItemLink-Main-Menu-level-2
-                    menuItem.Metadata.Alternates.Add("NavigationItemLink__" + encodedMenuName);
-                    menuItem.Metadata.Alternates.Add("NavigationItemLink__" + encodedMenuName + "__level__" + level);
-                });
+                // NavigationItemLink__[MenuName] e.g. NavigationItemLink-Main-Menu
+                // NavigationItemLink__[MenuName]__level__[level] e.g. NavigationItemLink-Main-Menu-level-2
+                menuItem.Metadata.Alternates.Add("NavigationItemLink__" + encodedMenuName);
+                menuItem.Metadata.Alternates.Add("NavigationItemLink__" + encodedMenuName + "__level__" + level);
+            });
 
-            return ValueTask.CompletedTask;
-        }
+        return ValueTask.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Navigation/PagerShapesTableProvider.cs b/src/OrchardCore.Modules/OrchardCore.Navigation/PagerShapesTableProvider.cs
index b31b4841a54..3d7235a2c4f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Navigation/PagerShapesTableProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Navigation/PagerShapesTableProvider.cs
@@ -17,585 +17,584 @@
 using OrchardCore.DisplayManagement.Shapes;
 using OrchardCore.DisplayManagement.Utilities;
 
-namespace OrchardCore.Navigation
+namespace OrchardCore.Navigation;
+
+public class PagerShapesTableProvider : ShapeTableProvider
 {
-    public class PagerShapesTableProvider : ShapeTableProvider
+    public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
     {
-        public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
-        {
-            builder.Describe("Pager")
-                .OnCreated(created =>
-                {
-                    // Initializes the common properties of a Pager shape
-                    // such that views can safely add values to them.
-                    created.Shape.Properties["ItemClasses"] = new List<string>();
-                    created.Shape.Properties["ItemAttributes"] = new Dictionary<string, string>();
-                })
-                .OnDisplaying(displaying =>
+        builder.Describe("Pager")
+            .OnCreated(created =>
+            {
+                // Initializes the common properties of a Pager shape
+                // such that views can safely add values to them.
+                created.Shape.Properties["ItemClasses"] = new List<string>();
+                created.Shape.Properties["ItemAttributes"] = new Dictionary<string, string>();
+            })
+            .OnDisplaying(displaying =>
+            {
+                if (displaying.Shape.TryGetProperty("PagerId", out string pagerId) && !string.IsNullOrEmpty(pagerId))
                 {
-                    if (displaying.Shape.TryGetProperty("PagerId", out string pagerId) && !string.IsNullOrEmpty(pagerId))
-                    {
-                        displaying.Shape.Metadata.Alternates.Add("Pager__" + pagerId.EncodeAlternateElement());
-                    };
-                });
+                    displaying.Shape.Metadata.Alternates.Add("Pager__" + pagerId.EncodeAlternateElement());
+                };
+            });
 
-            builder.Describe("PagerSlim")
-                .OnCreated(created =>
-                {
-                    // Initializes the common properties of a Pager shape
-                    // such that views can safely add values to them.
-                    created.Shape.Properties["ItemClasses"] = new List<string>();
-                    created.Shape.Properties["ItemAttributes"] = new Dictionary<string, string>();
-                })
-                .OnDisplaying(displaying =>
+        builder.Describe("PagerSlim")
+            .OnCreated(created =>
+            {
+                // Initializes the common properties of a Pager shape
+                // such that views can safely add values to them.
+                created.Shape.Properties["ItemClasses"] = new List<string>();
+                created.Shape.Properties["ItemAttributes"] = new Dictionary<string, string>();
+            })
+            .OnDisplaying(displaying =>
+            {
+                if (displaying.Shape.TryGetProperty("PagerId", out string pagerId) && !string.IsNullOrEmpty(pagerId))
                 {
-                    if (displaying.Shape.TryGetProperty("PagerId", out string pagerId) && !string.IsNullOrEmpty(pagerId))
-                    {
-                        displaying.Shape.Metadata.Alternates.Add("Pager__" + pagerId.EncodeAlternateElement());
-                    };
-                });
+                    displaying.Shape.Metadata.Alternates.Add("Pager__" + pagerId.EncodeAlternateElement());
+                };
+            });
 
-            builder.Describe("Pager_Gap")
-                .OnDisplaying(displaying =>
+        builder.Describe("Pager_Gap")
+            .OnDisplaying(displaying =>
+            {
+                var shape = displaying.Shape;
+
+                if (shape.TryGetProperty("Pager", out IShape pager) && pager.TryGetProperty("PagerId", out string pagerId) && !string.IsNullOrEmpty(pagerId))
                 {
-                    var shape = displaying.Shape;
+                    displaying.Shape.Metadata.Alternates.Add("Pager_Gap__" + pagerId.EncodeAlternateElement());
+                }
+            });
 
-                    if (shape.TryGetProperty("Pager", out IShape pager) && pager.TryGetProperty("PagerId", out string pagerId) && !string.IsNullOrEmpty(pagerId))
-                    {
-                        displaying.Shape.Metadata.Alternates.Add("Pager_Gap__" + pagerId.EncodeAlternateElement());
-                    }
-                });
+        builder.Describe("Pager_First")
+            .OnDisplaying(displaying =>
+            {
+                var shape = displaying.Shape;
 
-            builder.Describe("Pager_First")
-                .OnDisplaying(displaying =>
+                if (shape.TryGetProperty("Pager", out IShape pager) && pager.TryGetProperty("PagerId", out string pagerId) && !string.IsNullOrEmpty(pagerId))
                 {
-                    var shape = displaying.Shape;
+                    displaying.Shape.Metadata.Alternates.Add("Pager_First__" + pagerId.EncodeAlternateElement());
+                }
+            });
 
-                    if (shape.TryGetProperty("Pager", out IShape pager) && pager.TryGetProperty("PagerId", out string pagerId) && !string.IsNullOrEmpty(pagerId))
-                    {
-                        displaying.Shape.Metadata.Alternates.Add("Pager_First__" + pagerId.EncodeAlternateElement());
-                    }
-                });
+        builder.Describe("Pager_Previous")
+            .OnDisplaying(displaying =>
+            {
+                var shape = displaying.Shape;
 
-            builder.Describe("Pager_Previous")
-                .OnDisplaying(displaying =>
+                if (shape.TryGetProperty("Pager", out IShape pager) && pager.TryGetProperty("PagerId", out string pagerId) && !string.IsNullOrEmpty(pagerId))
                 {
-                    var shape = displaying.Shape;
+                    displaying.Shape.Metadata.Alternates.Add("Pager_Previous__" + pagerId.EncodeAlternateElement());
+                }
+            });
 
-                    if (shape.TryGetProperty("Pager", out IShape pager) && pager.TryGetProperty("PagerId", out string pagerId) && !string.IsNullOrEmpty(pagerId))
-                    {
-                        displaying.Shape.Metadata.Alternates.Add("Pager_Previous__" + pagerId.EncodeAlternateElement());
-                    }
-                });
+        builder.Describe("Pager_Next")
+            .OnDisplaying(displaying =>
+            {
+                var shape = displaying.Shape;
 
-            builder.Describe("Pager_Next")
-                .OnDisplaying(displaying =>
+                if (shape.TryGetProperty("Pager", out IShape pager) && pager.TryGetProperty("PagerId", out string pagerId) && !string.IsNullOrEmpty(pagerId))
                 {
-                    var shape = displaying.Shape;
+                    displaying.Shape.Metadata.Alternates.Add("Pager_Next__" + pagerId.EncodeAlternateElement());
+                }
+            });
 
-                    if (shape.TryGetProperty("Pager", out IShape pager) && pager.TryGetProperty("PagerId", out string pagerId) && !string.IsNullOrEmpty(pagerId))
-                    {
-                        displaying.Shape.Metadata.Alternates.Add("Pager_Next__" + pagerId.EncodeAlternateElement());
-                    }
-                });
+        builder.Describe("Pager_Last")
+            .OnDisplaying(displaying =>
+            {
+                var shape = displaying.Shape;
 
-            builder.Describe("Pager_Last")
-                .OnDisplaying(displaying =>
+                if (shape.TryGetProperty("Pager", out IShape pager) && pager.TryGetProperty("PagerId", out string pagerId) && !string.IsNullOrEmpty(pagerId))
                 {
-                    var shape = displaying.Shape;
+                    displaying.Shape.Metadata.Alternates.Add("Pager_Last__" + pagerId.EncodeAlternateElement());
+                }
+            });
 
-                    if (shape.TryGetProperty("Pager", out IShape pager) && pager.TryGetProperty("PagerId", out string pagerId) && !string.IsNullOrEmpty(pagerId))
-                    {
-                        displaying.Shape.Metadata.Alternates.Add("Pager_Last__" + pagerId.EncodeAlternateElement());
-                    }
-                });
+        builder.Describe("Pager_CurrentPage")
+            .OnDisplaying(displaying =>
+            {
+                var shape = displaying.Shape;
 
-            builder.Describe("Pager_CurrentPage")
-                .OnDisplaying(displaying =>
+                if (shape.TryGetProperty("Pager", out IShape pager) && pager.TryGetProperty("PagerId", out string pagerId) && !string.IsNullOrEmpty(pagerId))
                 {
-                    var shape = displaying.Shape;
-
-                    if (shape.TryGetProperty("Pager", out IShape pager) && pager.TryGetProperty("PagerId", out string pagerId) && !string.IsNullOrEmpty(pagerId))
-                    {
-                        displaying.Shape.Metadata.Alternates.Add("Pager_CurrentPage__" + pagerId.EncodeAlternateElement());
-                    }
-                });
+                    displaying.Shape.Metadata.Alternates.Add("Pager_CurrentPage__" + pagerId.EncodeAlternateElement());
+                }
+            });
 
-            builder.Describe("Pager_Links")
-                .OnDisplaying(displaying =>
+        builder.Describe("Pager_Links")
+            .OnDisplaying(displaying =>
+            {
+                if (displaying.Shape.TryGetProperty("PagerId", out string pagerId))
                 {
-                    if (displaying.Shape.TryGetProperty("PagerId", out string pagerId))
-                    {
-                        displaying.Shape.Metadata.Alternates.Add("Pager_Links__" + pagerId.EncodeAlternateElement());
-                    }
-                });
+                    displaying.Shape.Metadata.Alternates.Add("Pager_Links__" + pagerId.EncodeAlternateElement());
+                }
+            });
 
-            return ValueTask.CompletedTask;
-        }
+        return ValueTask.CompletedTask;
     }
+}
 
-    public class PagerShapes : IShapeAttributeProvider
+public class PagerShapes : IShapeAttributeProvider
+{
+    protected readonly IStringLocalizer S;
+
+    public PagerShapes(IStringLocalizer<PagerShapes> localizer)
     {
-        protected readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public PagerShapes(IStringLocalizer<PagerShapes> localizer)
-        {
-            S = localizer;
-        }
+    [Shape]
+    public async Task<IHtmlContent> Pager_Links(Shape shape, DisplayContext displayContext, IShapeFactory shapeFactory, IHtmlHelper Html,
+        string PagerId,
+        int Page,
+        int PageSize,
+        double TotalItemCount,
+        int? Quantity,
+        object FirstText,
+        object PreviousText,
+        object NextText,
+        object LastText,
+        object GapText,
+        bool ShowNext,
+        Dictionary<string, string> UrlParams)
+    {
+        var noFollow = shape.Attributes.ContainsKey("rel") && shape.Attributes["rel"] == "no-follow";
+        var currentPage = Page;
+        if (currentPage < 1)
+            currentPage = 1;
 
-        [Shape]
-        public async Task<IHtmlContent> Pager_Links(Shape shape, DisplayContext displayContext, IShapeFactory shapeFactory, IHtmlHelper Html,
-            string PagerId,
-            int Page,
-            int PageSize,
-            double TotalItemCount,
-            int? Quantity,
-            object FirstText,
-            object PreviousText,
-            object NextText,
-            object LastText,
-            object GapText,
-            bool ShowNext,
-            Dictionary<string, string> UrlParams)
-        {
-            var noFollow = shape.Attributes.ContainsKey("rel") && shape.Attributes["rel"] == "no-follow";
-            var currentPage = Page;
-            if (currentPage < 1)
-                currentPage = 1;
+        var pageSize = PageSize;
 
-            var pageSize = PageSize;
+        var numberOfPagesToShow = Quantity ?? 0;
+        if (Quantity == null || Quantity < 0)
+            numberOfPagesToShow = 7;
 
-            var numberOfPagesToShow = Quantity ?? 0;
-            if (Quantity == null || Quantity < 0)
-                numberOfPagesToShow = 7;
+        var totalPageCount = pageSize > 0 ? (int)Math.Ceiling(TotalItemCount / pageSize) : 1;
 
-            var totalPageCount = pageSize > 0 ? (int)Math.Ceiling(TotalItemCount / pageSize) : 1;
+        // return shape early if pager is not needed.
+        if (totalPageCount < 2)
+        {
+            shape.Metadata.Type = "List";
+            return await displayContext.DisplayHelper.ShapeExecuteAsync(shape);
+        }
 
-            // return shape early if pager is not needed.
-            if (totalPageCount < 2)
-            {
-                shape.Metadata.Type = "List";
-                return await displayContext.DisplayHelper.ShapeExecuteAsync(shape);
-            }
+        var firstText = FirstText ?? S["<<"];
+        var previousText = PreviousText ?? S["<"];
+        var nextText = NextText ?? S[">"];
+        var lastText = LastText ?? S[">>"];
+        var gapText = GapText ?? S["..."];
 
-            var firstText = FirstText ?? S["<<"];
-            var previousText = PreviousText ?? S["<"];
-            var nextText = NextText ?? S[">"];
-            var lastText = LastText ?? S[">>"];
-            var gapText = GapText ?? S["..."];
+        var routeData = GetRouteData(shape, displayContext, Html);
+        SetCustomUrlParams(UrlParams, routeData);
 
-            var routeData = GetRouteData(shape, displayContext, Html);
-            SetCustomUrlParams(UrlParams, routeData);
+        var firstPage = Math.Max(1, Page - (numberOfPagesToShow / 2));
+        var lastPage = Math.Min(totalPageCount, Page + (numberOfPagesToShow / 2));
 
-            var firstPage = Math.Max(1, Page - (numberOfPagesToShow / 2));
-            var lastPage = Math.Min(totalPageCount, Page + (numberOfPagesToShow / 2));
+        var pageKey = string.IsNullOrEmpty(PagerId) ? "pagenum" : PagerId;
 
-            var pageKey = string.IsNullOrEmpty(PagerId) ? "pagenum" : PagerId;
+        shape.Classes.Add("pager");
+        shape.Classes.Add("pagination");
+        shape.Metadata.Alternates.Clear();
+        shape.Metadata.Type = "List";
 
-            shape.Classes.Add("pager");
-            shape.Classes.Add("pagination");
-            shape.Metadata.Alternates.Clear();
-            shape.Metadata.Type = "List";
+        // first and previous pages
+        if ((Page > 1) && (routeData.ContainsKey(pageKey)))
+        {
+            routeData.Remove(pageKey); // to keep from having "pagenum=1" in the query string
+        }
 
-            // first and previous pages
-            if ((Page > 1) && (routeData.ContainsKey(pageKey)))
-            {
-                routeData.Remove(pageKey); // to keep from having "pagenum=1" in the query string
-            }
+        // first
+        var firstItem = await shapeFactory.CreateAsync("Pager_First", Arguments.From(new
+        {
+            Value = firstText,
+            RouteValues = new RouteValueDictionary(routeData),
+            Pager = shape,
+            Disabled = Page < 2
+        }));
 
-            // first
-            var firstItem = await shapeFactory.CreateAsync("Pager_First", Arguments.From(new
-            {
-                Value = firstText,
-                RouteValues = new RouteValueDictionary(routeData),
-                Pager = shape,
-                Disabled = Page < 2
-            }));
+        if (noFollow)
+        {
+            firstItem.Attributes["rel"] = "no-follow";
+        }
 
-            if (noFollow)
-            {
-                firstItem.Attributes["rel"] = "no-follow";
-            }
+        await shape.AddAsync(firstItem);
 
-            await shape.AddAsync(firstItem);
+        // previous
+        if ((Page > 1) && (currentPage > 2))
+        { // also to keep from having "pagenum=1" in the query string
+            routeData[pageKey] = currentPage - 1;
+        }
 
-            // previous
-            if ((Page > 1) && (currentPage > 2))
-            { // also to keep from having "pagenum=1" in the query string
-                routeData[pageKey] = currentPage - 1;
-            }
+        var previousItem = await shapeFactory.CreateAsync("Pager_Previous", Arguments.From(new
+        {
+            Value = previousText,
+            RouteValues = new RouteValueDictionary(routeData),
+            Pager = shape,
+            Disabled = Page < 2
+        }));
 
-            var previousItem = await shapeFactory.CreateAsync("Pager_Previous", Arguments.From(new
-            {
-                Value = previousText,
-                RouteValues = new RouteValueDictionary(routeData),
-                Pager = shape,
-                Disabled = Page < 2
-            }));
+        if (noFollow)
+        {
+            previousItem.Attributes["rel"] = "no-follow";
+        }
 
-            if (noFollow)
-            {
-                previousItem.Attributes["rel"] = "no-follow";
-            }
+        await shape.AddAsync(previousItem);
 
-            await shape.AddAsync(previousItem);
+        // gap at the beginning of the pager
+        if (firstPage > 1 && numberOfPagesToShow > 0)
+        {
+            await shape.AddAsync(await shapeFactory.CreateAsync("Pager_Gap", Arguments.From(new
+            {
+                Value = gapText,
+                Pager = shape
+            })));
+        }
 
-            // gap at the beginning of the pager
-            if (firstPage > 1 && numberOfPagesToShow > 0)
+        // page numbers
+        if (numberOfPagesToShow > 0 && lastPage > 1)
+        {
+            for (var p = firstPage; p <= lastPage; p++)
             {
-                await shape.AddAsync(await shapeFactory.CreateAsync("Pager_Gap", Arguments.From(new
+                if (p == 1)
                 {
-                    Value = gapText,
-                    Pager = shape
-                })));
-            }
+                    // to keep from having "pagenum=1" in the query string
+                    routeData.Remove(pageKey);
+                }
+                else
+                {
+                    routeData[pageKey] = p;
+                }
 
-            // page numbers
-            if (numberOfPagesToShow > 0 && lastPage > 1)
-            {
-                for (var p = firstPage; p <= lastPage; p++)
+                if (p == currentPage)
                 {
-                    if (p == 1)
+                    var currentPageItem = await shapeFactory.CreateAsync("Pager_CurrentPage", Arguments.From(new
                     {
-                        // to keep from having "pagenum=1" in the query string
-                        routeData.Remove(pageKey);
-                    }
-                    else
+                        Value = p,
+                        RouteValues = new RouteValueDictionary(routeData),
+                        Pager = shape
+                    }));
+
+                    if (noFollow)
                     {
-                        routeData[pageKey] = p;
+                        currentPageItem.Attributes["rel"] = "no-follow";
                     }
 
-                    if (p == currentPage)
+                    await shape.AddAsync(currentPageItem);
+                }
+                else
+                {
+                    var pagerItem = await shapeFactory.CreateAsync("Pager_Link", Arguments.From(new
+                    {
+                        Value = p,
+                        RouteValues = new RouteValueDictionary(routeData),
+                        Pager = shape
+                    }));
+
+                    if (p > currentPage)
                     {
-                        var currentPageItem = await shapeFactory.CreateAsync("Pager_CurrentPage", Arguments.From(new
-                        {
-                            Value = p,
-                            RouteValues = new RouteValueDictionary(routeData),
-                            Pager = shape
-                        }));
-
-                        if (noFollow)
-                        {
-                            currentPageItem.Attributes["rel"] = "no-follow";
-                        }
-
-                        await shape.AddAsync(currentPageItem);
+                        pagerItem.Attributes["rel"] = noFollow ? "no-follow" : "next";
                     }
-                    else
+                    else if (p < currentPage)
                     {
-                        var pagerItem = await shapeFactory.CreateAsync("Pager_Link", Arguments.From(new
-                        {
-                            Value = p,
-                            RouteValues = new RouteValueDictionary(routeData),
-                            Pager = shape
-                        }));
-
-                        if (p > currentPage)
-                        {
-                            pagerItem.Attributes["rel"] = noFollow ? "no-follow" : "next";
-                        }
-                        else if (p < currentPage)
-                        {
-                            pagerItem.Attributes["rel"] = noFollow ? "no-follow" : "prev";
-                        }
-
-                        await shape.AddAsync(pagerItem);
+                        pagerItem.Attributes["rel"] = noFollow ? "no-follow" : "prev";
                     }
+
+                    await shape.AddAsync(pagerItem);
                 }
             }
+        }
 
-            // gap at the end of the pager
-            if (lastPage < totalPageCount && numberOfPagesToShow > 0)
+        // gap at the end of the pager
+        if (lastPage < totalPageCount && numberOfPagesToShow > 0)
+        {
+            await shape.AddAsync(await shapeFactory.CreateAsync("Pager_Gap", Arguments.From(new
             {
-                await shape.AddAsync(await shapeFactory.CreateAsync("Pager_Gap", Arguments.From(new
-                {
-                    Value = gapText,
-                    Pager = shape
-                })));
-            }
+                Value = gapText,
+                Pager = shape
+            })));
+        }
 
-            // Next
-            routeData[pageKey] = Page + 1;
-            var pagerNextItem = await shapeFactory.CreateAsync("Pager_Next", Arguments.From(new
-            {
-                Value = nextText,
-                RouteValues = new RouteValueDictionary(routeData),
-                Pager = shape,
-                Disabled = Page >= totalPageCount && !ShowNext
-            }));
+        // Next
+        routeData[pageKey] = Page + 1;
+        var pagerNextItem = await shapeFactory.CreateAsync("Pager_Next", Arguments.From(new
+        {
+            Value = nextText,
+            RouteValues = new RouteValueDictionary(routeData),
+            Pager = shape,
+            Disabled = Page >= totalPageCount && !ShowNext
+        }));
 
-            if (noFollow)
-            {
-                pagerNextItem.Attributes["rel"] = "no-follow";
-            }
+        if (noFollow)
+        {
+            pagerNextItem.Attributes["rel"] = "no-follow";
+        }
 
-            await shape.AddAsync(pagerNextItem);
+        await shape.AddAsync(pagerNextItem);
 
-            // Last
-            routeData[pageKey] = totalPageCount;
-            var pagerLastItem = await shapeFactory.CreateAsync("Pager_Last", Arguments.From(new
-            {
-                Value = lastText,
-                RouteValues = new RouteValueDictionary(routeData),
-                Pager = shape,
-                Disabled = Page >= totalPageCount
-            }));
+        // Last
+        routeData[pageKey] = totalPageCount;
+        var pagerLastItem = await shapeFactory.CreateAsync("Pager_Last", Arguments.From(new
+        {
+            Value = lastText,
+            RouteValues = new RouteValueDictionary(routeData),
+            Pager = shape,
+            Disabled = Page >= totalPageCount
+        }));
 
-            if (noFollow)
-            {
-                pagerLastItem.Attributes["rel"] = "no-follow";
-            }
+        if (noFollow)
+        {
+            pagerLastItem.Attributes["rel"] = "no-follow";
+        }
 
-            await shape.AddAsync(pagerLastItem);
+        await shape.AddAsync(pagerLastItem);
 
-            return await displayContext.DisplayHelper.ShapeExecuteAsync(shape);
-        }
+        return await displayContext.DisplayHelper.ShapeExecuteAsync(shape);
+    }
 
-        [Shape]
+    [Shape]
 #pragma warning disable CA1822 // Mark members as static
-        public Task<IHtmlContent> Pager(Shape shape, DisplayContext displayContext)
-        {
-            shape.Metadata.Alternates.Clear();
-            shape.Metadata.Type = "Pager_Links";
-            return displayContext.DisplayHelper.ShapeExecuteAsync(shape);
-        }
+    public Task<IHtmlContent> Pager(Shape shape, DisplayContext displayContext)
+    {
+        shape.Metadata.Alternates.Clear();
+        shape.Metadata.Type = "Pager_Links";
+        return displayContext.DisplayHelper.ShapeExecuteAsync(shape);
+    }
 
-        [Shape]
-        public async Task<IHtmlContent> PagerSlim(Shape shape, DisplayContext displayContext, IShapeFactory shapeFactory, IHtmlHelper Html,
-            object PreviousText,
-            object NextText,
-            string PreviousClass,
-            string NextClass,
-            Dictionary<string, string> UrlParams)
-        {
-            var noFollow = shape.Attributes.ContainsKey("rel") && shape.Attributes["rel"] == "no-follow";
-            var previousText = PreviousText ?? S["<"];
-            var nextText = NextText ?? S[">"];
+    [Shape]
+    public async Task<IHtmlContent> PagerSlim(Shape shape, DisplayContext displayContext, IShapeFactory shapeFactory, IHtmlHelper Html,
+        object PreviousText,
+        object NextText,
+        string PreviousClass,
+        string NextClass,
+        Dictionary<string, string> UrlParams)
+    {
+        var noFollow = shape.Attributes.ContainsKey("rel") && shape.Attributes["rel"] == "no-follow";
+        var previousText = PreviousText ?? S["<"];
+        var nextText = NextText ?? S[">"];
 
-            shape.Classes.Add("pager");
-            shape.Classes.Add("pagination");
-            shape.Metadata.Alternates.Clear();
-            shape.Metadata.Type = "List";
+        shape.Classes.Add("pager");
+        shape.Classes.Add("pagination");
+        shape.Metadata.Alternates.Clear();
+        shape.Metadata.Type = "List";
 
-            var routeData = GetRouteData(shape, displayContext, Html);
-            SetCustomUrlParams(UrlParams, routeData);
+        var routeData = GetRouteData(shape, displayContext, Html);
+        SetCustomUrlParams(UrlParams, routeData);
 
-            if (shape.TryGetProperty("Before", out string before))
+        if (shape.TryGetProperty("Before", out string before))
+        {
+            var beforeRouteData = new RouteValueDictionary(routeData)
             {
-                var beforeRouteData = new RouteValueDictionary(routeData)
-                {
-                    ["before"] = before
-                };
+                ["before"] = before
+            };
 
-                beforeRouteData.Remove("after");
+            beforeRouteData.Remove("after");
 
-                var previousItem = await shapeFactory.CreateAsync("Pager_Previous", Arguments.From(new
-                {
-                    Value = previousText,
-                    RouteValues = beforeRouteData,
-                    Pager = shape
-                }));
-
-                if (noFollow)
-                {
-                    previousItem.Attributes["rel"] = "no-follow";
-                }
+            var previousItem = await shapeFactory.CreateAsync("Pager_Previous", Arguments.From(new
+            {
+                Value = previousText,
+                RouteValues = beforeRouteData,
+                Pager = shape
+            }));
 
-                await shape.AddAsync(previousItem);
-                shape.Properties["FirstClass"] = PreviousClass;
-            }
-            else
+            if (noFollow)
             {
-                routeData.Remove("before");
+                previousItem.Attributes["rel"] = "no-follow";
             }
 
-            if (shape.TryGetProperty("After", out string after))
-            {
-                var afterRouteData = new RouteValueDictionary(routeData)
-                {
-                    ["after"] = after
-                };
+            await shape.AddAsync(previousItem);
+            shape.Properties["FirstClass"] = PreviousClass;
+        }
+        else
+        {
+            routeData.Remove("before");
+        }
 
-                afterRouteData.Remove("before");
+        if (shape.TryGetProperty("After", out string after))
+        {
+            var afterRouteData = new RouteValueDictionary(routeData)
+            {
+                ["after"] = after
+            };
 
-                var nextItem = await shapeFactory.CreateAsync("Pager_Next", Arguments.From(new
-                {
-                    Value = nextText,
-                    RouteValues = afterRouteData,
-                    Pager = shape
-                }));
+            afterRouteData.Remove("before");
 
-                if (noFollow)
-                {
-                    nextItem.Attributes["rel"] = "no-follow";
-                }
+            var nextItem = await shapeFactory.CreateAsync("Pager_Next", Arguments.From(new
+            {
+                Value = nextText,
+                RouteValues = afterRouteData,
+                Pager = shape
+            }));
 
-                await shape.AddAsync(nextItem);
-                shape.Properties["LastClass"] = NextClass;
-            }
-            else
+            if (noFollow)
             {
-                routeData.Remove("after");
+                nextItem.Attributes["rel"] = "no-follow";
             }
 
-            return await displayContext.DisplayHelper.ShapeExecuteAsync(shape);
+            await shape.AddAsync(nextItem);
+            shape.Properties["LastClass"] = NextClass;
         }
-
-        [Shape]
-        public Task<IHtmlContent> Pager_First(Shape shape, DisplayContext displayContext)
+        else
         {
-            shape.Metadata.Alternates.Clear();
-            shape.Metadata.Type = "Pager_Link";
-            return displayContext.DisplayHelper.ShapeExecuteAsync(shape);
+            routeData.Remove("after");
         }
 
-        [Shape]
-        public Task<IHtmlContent> Pager_Previous(Shape shape, DisplayContext displayContext)
-        {
-            shape.Metadata.Alternates.Clear();
-            shape.Metadata.Type = "Pager_Link";
+        return await displayContext.DisplayHelper.ShapeExecuteAsync(shape);
+    }
 
-            if (!shape.Attributes.ContainsKey("rel"))
-            {
-                shape.Attributes["rel"] = "prev";
-            }
+    [Shape]
+    public Task<IHtmlContent> Pager_First(Shape shape, DisplayContext displayContext)
+    {
+        shape.Metadata.Alternates.Clear();
+        shape.Metadata.Type = "Pager_Link";
+        return displayContext.DisplayHelper.ShapeExecuteAsync(shape);
+    }
 
-            return displayContext.DisplayHelper.ShapeExecuteAsync(shape);
-        }
+    [Shape]
+    public Task<IHtmlContent> Pager_Previous(Shape shape, DisplayContext displayContext)
+    {
+        shape.Metadata.Alternates.Clear();
+        shape.Metadata.Type = "Pager_Link";
 
-        [Shape]
-        public Task<IHtmlContent> Pager_CurrentPage(Shape shape, DisplayContext displayContext)
+        if (!shape.Attributes.ContainsKey("rel"))
         {
-            shape.Metadata.Alternates.Clear();
-            shape.Metadata.Type = "Pager_Link";
-            var parentTag = shape.GetProperty<TagBuilder>("Tag");
-            parentTag.AddCssClass("active");
-
-            return displayContext.DisplayHelper.ShapeExecuteAsync(shape);
+            shape.Attributes["rel"] = "prev";
         }
 
-        [Shape]
-        public Task<IHtmlContent> Pager_Next(Shape shape, DisplayContext displayContext)
+        return displayContext.DisplayHelper.ShapeExecuteAsync(shape);
+    }
+
+    [Shape]
+    public Task<IHtmlContent> Pager_CurrentPage(Shape shape, DisplayContext displayContext)
+    {
+        shape.Metadata.Alternates.Clear();
+        shape.Metadata.Type = "Pager_Link";
+        var parentTag = shape.GetProperty<TagBuilder>("Tag");
+        parentTag.AddCssClass("active");
+
+        return displayContext.DisplayHelper.ShapeExecuteAsync(shape);
+    }
+
+    [Shape]
+    public Task<IHtmlContent> Pager_Next(Shape shape, DisplayContext displayContext)
+    {
+        shape.Metadata.Alternates.Clear();
+        shape.Metadata.Type = "Pager_Link";
+
+        if (!shape.Attributes.ContainsKey("rel"))
         {
-            shape.Metadata.Alternates.Clear();
-            shape.Metadata.Type = "Pager_Link";
+            shape.Attributes["rel"] = "next";
+        }
 
-            if (!shape.Attributes.ContainsKey("rel"))
+        return displayContext.DisplayHelper.ShapeExecuteAsync(shape);
+    }
+
+    [Shape]
+    public Task<IHtmlContent> Pager_Last(Shape shape, DisplayContext displayContext)
+    {
+        shape.Metadata.Alternates.Clear();
+        shape.Metadata.Type = "Pager_Link";
+        return displayContext.DisplayHelper.ShapeExecuteAsync(shape);
+    }
+
+    [Shape]
+    public Task<IHtmlContent> Pager_Link(Shape shape, DisplayContext displayContext)
+    {
+        shape.Metadata.Alternates.Clear();
+        shape.Metadata.Type = "ActionLink";
+        return displayContext.DisplayHelper.ShapeExecuteAsync(shape);
+    }
+
+    [Shape]
+    public IHtmlContent ActionLink(Shape shape, IUrlHelper Url, object Value, bool Disabled = false)
+    {
+        if (Disabled)
+        {
+            if (shape.TryGetProperty("Tag", out TagBuilder tagBuilder))
             {
-                shape.Attributes["rel"] = "next";
+                tagBuilder.AddCssClass("disabled");
             }
-
-            return displayContext.DisplayHelper.ShapeExecuteAsync(shape);
         }
 
-        [Shape]
-        public Task<IHtmlContent> Pager_Last(Shape shape, DisplayContext displayContext)
+        var routeValues = shape.GetProperty<RouteValueDictionary>("RouteValues") ?? [];
+        if (!Disabled)
         {
-            shape.Metadata.Alternates.Clear();
-            shape.Metadata.Type = "Pager_Link";
-            return displayContext.DisplayHelper.ShapeExecuteAsync(shape);
+            shape.Attributes["href"] = Url.Action((string)routeValues["action"], (string)routeValues["controller"], routeValues);
         }
-
-        [Shape]
-        public Task<IHtmlContent> Pager_Link(Shape shape, DisplayContext displayContext)
+        else
         {
-            shape.Metadata.Alternates.Clear();
-            shape.Metadata.Type = "ActionLink";
-            return displayContext.DisplayHelper.ShapeExecuteAsync(shape);
+            shape.Attributes.Remove("href");
         }
 
-        [Shape]
-        public IHtmlContent ActionLink(Shape shape, IUrlHelper Url, object Value, bool Disabled = false)
-        {
-            if (Disabled)
-            {
-                if (shape.TryGetProperty("Tag", out TagBuilder tagBuilder))
-                {
-                    tagBuilder.AddCssClass("disabled");
-                }
-            }
+        var tag = shape.GetTagBuilder("a");
 
-            var routeValues = shape.GetProperty<RouteValueDictionary>("RouteValues") ?? [];
-            if (!Disabled)
-            {
-                shape.Attributes["href"] = Url.Action((string)routeValues["action"], (string)routeValues["controller"], routeValues);
-            }
-            else
-            {
-                shape.Attributes.Remove("href");
-            }
+        tag.InnerHtml.AppendHtml(CoerceHtmlString(Value));
+        return tag;
+    }
 
-            var tag = shape.GetTagBuilder("a");
+    [Shape]
+    public Task<IHtmlContent> Pager_Gap(IShape shape, DisplayContext displayContext)
+    {
+        shape.Metadata.Alternates.Clear();
+        shape.Metadata.Type = "Pager_Link";
+        var parentTag = shape.GetProperty<TagBuilder>("Tag");
+        parentTag.AddCssClass("disabled");
+        return displayContext.DisplayHelper.ShapeExecuteAsync(shape);
+    }
+#pragma warning restore CA1822 // Mark members as static
 
-            tag.InnerHtml.AppendHtml(CoerceHtmlString(Value));
-            return tag;
+    private static IHtmlContent CoerceHtmlString(object value)
+    {
+        if (value == null)
+        {
+            return HtmlString.Empty;
         }
 
-        [Shape]
-        public Task<IHtmlContent> Pager_Gap(IShape shape, DisplayContext displayContext)
+        if (value is IHtmlContent result)
         {
-            shape.Metadata.Alternates.Clear();
-            shape.Metadata.Type = "Pager_Link";
-            var parentTag = shape.GetProperty<TagBuilder>("Tag");
-            parentTag.AddCssClass("disabled");
-            return displayContext.DisplayHelper.ShapeExecuteAsync(shape);
+            return result;
         }
-#pragma warning restore CA1822 // Mark members as static
 
-        private static IHtmlContent CoerceHtmlString(object value)
-        {
-            if (value == null)
-            {
-                return HtmlString.Empty;
-            }
+        return new HtmlContentString(value.ToString());
+    }
 
-            if (value is IHtmlContent result)
-            {
-                return result;
-            }
+    private static RouteValueDictionary GetRouteData(Shape shape, DisplayContext displayContext, IHtmlHelper Html)
+    {
+        var httpContextAccessor = displayContext.ServiceProvider.GetService<IHttpContextAccessor>();
+        var httpContext = httpContextAccessor.HttpContext;
 
-            return new HtmlContentString(value.ToString());
-        }
+        var routeData = new RouteValueDictionary(Html.ViewContext.RouteData.Values);
 
-        private static RouteValueDictionary GetRouteData(Shape shape, DisplayContext displayContext, IHtmlHelper Html)
+        if (httpContext != null)
         {
-            var httpContextAccessor = displayContext.ServiceProvider.GetService<IHttpContextAccessor>();
-            var httpContext = httpContextAccessor.HttpContext;
+            var query = httpContext.Request.Query;
 
-            var routeData = new RouteValueDictionary(Html.ViewContext.RouteData.Values);
-
-            if (httpContext != null)
+            foreach (var key in query.Keys)
             {
-                var query = httpContext.Request.Query;
-
-                foreach (var key in query.Keys)
-                {
-                    routeData.TryAdd(key, query[key]);
-                }
+                routeData.TryAdd(key, query[key]);
             }
+        }
 
-            // specific cross-requests route data can be passed to the shape directly (e.g., OrchardCore.Users)
-            var shapeRouteData = shape.GetProperty<RouteData>("RouteData");
-            if (shapeRouteData != null)
+        // specific cross-requests route data can be passed to the shape directly (e.g., OrchardCore.Users)
+        var shapeRouteData = shape.GetProperty<RouteData>("RouteData");
+        if (shapeRouteData != null)
+        {
+            foreach (var rd in shapeRouteData.Values)
             {
-                foreach (var rd in shapeRouteData.Values)
-                {
-                    routeData[rd.Key] = rd.Value;
-                }
+                routeData[rd.Key] = rd.Value;
             }
-
-            return routeData;
         }
 
-        private static void SetCustomUrlParams(Dictionary<string, string> urlParams, RouteValueDictionary routeData)
+        return routeData;
+    }
+
+    private static void SetCustomUrlParams(Dictionary<string, string> urlParams, RouteValueDictionary routeData)
+    {
+        // Allows to pass custom url params to Pager
+        if (urlParams != null)
         {
-            // Allows to pass custom url params to Pager
-            if (urlParams != null)
+            foreach (var item in urlParams)
             {
-                foreach (var item in urlParams)
-                {
-                    routeData[item.Key] = item.Value;
-                }
+                routeData[item.Key] = item.Value;
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Navigation/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Navigation/Startup.cs
index cf00bbb1672..357588400d0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Navigation/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Navigation/Startup.cs
@@ -3,27 +3,26 @@
 using OrchardCore.Environment.Shell.Configuration;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Navigation
+namespace OrchardCore.Navigation;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
-    {
-        private readonly IShellConfiguration _shellConfiguration;
+    private readonly IShellConfiguration _shellConfiguration;
 
-        public Startup(IShellConfiguration shellConfiguration)
-        {
-            _shellConfiguration = shellConfiguration;
-        }
+    public Startup(IShellConfiguration shellConfiguration)
+    {
+        _shellConfiguration = shellConfiguration;
+    }
 
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddNavigation();
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddNavigation();
 
-            services.AddScoped<IShapeTableProvider, NavigationShapes>();
-            services.AddScoped<IShapeTableProvider, PagerShapesTableProvider>();
-            services.AddShapeAttributes<PagerShapes>();
+        services.AddScoped<IShapeTableProvider, NavigationShapes>();
+        services.AddScoped<IShapeTableProvider, PagerShapesTableProvider>();
+        services.AddShapeAttributes<PagerShapes>();
 
-            var navigationConfiguration = _shellConfiguration.GetSection("OrchardCore_Navigation");
-            services.Configure<PagerOptions>(navigationConfiguration.GetSection("PagerOptions"));
-        }
+        var navigationConfiguration = _shellConfiguration.GetSection("OrchardCore_Navigation");
+        services.Configure<PagerOptions>(navigationConfiguration.GetSection("PagerOptions"));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/AdminMenu.cs
index 600c10fd192..5a725c5f49b 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/AdminMenu.cs
@@ -6,91 +6,90 @@
 using OrchardCore.Environment.Shell.Descriptor.Models;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.OpenId
+namespace OrchardCore.OpenId;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _clientRouteValues = new()
     {
-        private static readonly RouteValueDictionary _clientRouteValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", "OrchardCore.OpenId.Client" },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", "OrchardCore.OpenId.Client" },
+    };
+
+    private readonly ShellDescriptor _shellDescriptor;
 
-        private readonly ShellDescriptor _shellDescriptor;
+    internal readonly IStringLocalizer S;
 
-        internal readonly IStringLocalizer S;
+    public AdminMenu(
+        IStringLocalizer<AdminMenu> localizer,
+        ShellDescriptor shellDescriptor)
+    {
+        S = localizer;
+        _shellDescriptor = shellDescriptor;
+    }
 
-        public AdminMenu(
-            IStringLocalizer<AdminMenu> localizer,
-            ShellDescriptor shellDescriptor)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
-            _shellDescriptor = shellDescriptor;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+        builder.Add(S["Security"], security => security
+        .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), category =>
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
+            category.AddClass("openid").Id("openid");
 
-            builder.Add(S["Security"], security => security
-            .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), category =>
+            var features = _shellDescriptor.Features.Select(feature => feature.Id).ToImmutableArray();
+            if (features.Contains(OpenIdConstants.Features.Client) ||
+                features.Contains(OpenIdConstants.Features.Server) ||
+                features.Contains(OpenIdConstants.Features.Validation))
             {
-                category.AddClass("openid").Id("openid");
-
-                var features = _shellDescriptor.Features.Select(feature => feature.Id).ToImmutableArray();
-                if (features.Contains(OpenIdConstants.Features.Client) ||
-                    features.Contains(OpenIdConstants.Features.Server) ||
-                    features.Contains(OpenIdConstants.Features.Validation))
+                category.Add(S["Settings"], "1", settings =>
                 {
-                    category.Add(S["Settings"], "1", settings =>
+                    if (features.Contains(OpenIdConstants.Features.Client))
                     {
-                        if (features.Contains(OpenIdConstants.Features.Client))
-                        {
-                            settings.Add(S["Authentication client"], "1", client => client
-                                    .Action("Index", "Admin", _clientRouteValues)
-                                    .Permission(Permissions.ManageClientSettings)
-                                    .LocalNav());
-                        }
+                        settings.Add(S["Authentication client"], "1", client => client
+                                .Action("Index", "Admin", _clientRouteValues)
+                                .Permission(Permissions.ManageClientSettings)
+                                .LocalNav());
+                    }
 
-                        if (features.Contains(OpenIdConstants.Features.Server))
-                        {
-                            settings.Add(S["Authorization server"], "2", server => server
-                                    .Action("Index", "ServerConfiguration", "OrchardCore.OpenId")
-                                    .Permission(Permissions.ManageServerSettings)
-                                    .LocalNav());
-                        }
+                    if (features.Contains(OpenIdConstants.Features.Server))
+                    {
+                        settings.Add(S["Authorization server"], "2", server => server
+                                .Action("Index", "ServerConfiguration", "OrchardCore.OpenId")
+                                .Permission(Permissions.ManageServerSettings)
+                                .LocalNav());
+                    }
 
-                        if (features.Contains(OpenIdConstants.Features.Validation))
-                        {
-                            settings.Add(S["Token validation"], "3", validation => validation
-                                    .Action("Index", "ValidationConfiguration", "OrchardCore.OpenId")
-                                    .Permission(Permissions.ManageValidationSettings)
-                                    .LocalNav());
-                        }
-                    });
-                }
+                    if (features.Contains(OpenIdConstants.Features.Validation))
+                    {
+                        settings.Add(S["Token validation"], "3", validation => validation
+                                .Action("Index", "ValidationConfiguration", "OrchardCore.OpenId")
+                                .Permission(Permissions.ManageValidationSettings)
+                                .LocalNav());
+                    }
+                });
+            }
 
-                if (features.Contains(OpenIdConstants.Features.Management))
+            if (features.Contains(OpenIdConstants.Features.Management))
+            {
+                category.Add(S["Management"], "2", management =>
                 {
-                    category.Add(S["Management"], "2", management =>
-                    {
-                        management.Add(S["Applications"], "1", applications => applications
-                                  .Action("Index", "Application", "OrchardCore.OpenId")
-                                  .Permission(Permissions.ManageApplications)
-                                  .LocalNav());
+                    management.Add(S["Applications"], "1", applications => applications
+                              .Action("Index", "Application", "OrchardCore.OpenId")
+                              .Permission(Permissions.ManageApplications)
+                              .LocalNav());
 
-                        management.Add(S["Scopes"], "2", applications => applications
-                                  .Action("Index", "Scope", "OrchardCore.OpenId")
-                                  .Permission(Permissions.ManageScopes)
-                                  .LocalNav());
-                    });
-                }
-            }));
+                    management.Add(S["Scopes"], "2", applications => applications
+                              .Action("Index", "Scope", "OrchardCore.OpenId")
+                              .Permission(Permissions.ManageScopes)
+                              .LocalNav());
+                });
+            }
+        }));
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Configuration/OpenIdClientConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Configuration/OpenIdClientConfiguration.cs
index 53cb8d059b5..d15be9b3825 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Configuration/OpenIdClientConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Configuration/OpenIdClientConfiguration.cs
@@ -12,129 +12,128 @@
 using OrchardCore.OpenId.Services;
 using OrchardCore.OpenId.Settings;
 
-namespace OrchardCore.OpenId.Configuration
+namespace OrchardCore.OpenId.Configuration;
+
+public sealed class OpenIdClientConfiguration :
+    IConfigureOptions<AuthenticationOptions>,
+    IConfigureNamedOptions<OpenIdConnectOptions>
 {
-    public sealed class OpenIdClientConfiguration :
-        IConfigureOptions<AuthenticationOptions>,
-        IConfigureNamedOptions<OpenIdConnectOptions>
+    private readonly IOpenIdClientService _clientService;
+    private readonly IDataProtectionProvider _dataProtectionProvider;
+    private readonly ShellSettings _shellSettings;
+    private readonly ILogger _logger;
+
+    public OpenIdClientConfiguration(
+        IOpenIdClientService clientService,
+        IDataProtectionProvider dataProtectionProvider,
+        ShellSettings shellSettings,
+        ILogger<OpenIdClientConfiguration> logger)
     {
-        private readonly IOpenIdClientService _clientService;
-        private readonly IDataProtectionProvider _dataProtectionProvider;
-        private readonly ShellSettings _shellSettings;
-        private readonly ILogger _logger;
-
-        public OpenIdClientConfiguration(
-            IOpenIdClientService clientService,
-            IDataProtectionProvider dataProtectionProvider,
-            ShellSettings shellSettings,
-            ILogger<OpenIdClientConfiguration> logger)
+        _clientService = clientService;
+        _dataProtectionProvider = dataProtectionProvider;
+        _shellSettings = shellSettings;
+        _logger = logger;
+    }
+
+    public void Configure(AuthenticationOptions options)
+    {
+        var settings = GetClientSettingsAsync().GetAwaiter().GetResult();
+        if (settings == null)
         {
-            _clientService = clientService;
-            _dataProtectionProvider = dataProtectionProvider;
-            _shellSettings = shellSettings;
-            _logger = logger;
+            return;
         }
 
-        public void Configure(AuthenticationOptions options)
-        {
-            var settings = GetClientSettingsAsync().GetAwaiter().GetResult();
-            if (settings == null)
-            {
-                return;
-            }
+        // Register the OpenID Connect client handler in the authentication handlers collection.
+        options.AddScheme<OpenIdConnectHandler>(OpenIdConnectDefaults.AuthenticationScheme, settings.DisplayName);
+    }
 
-            // Register the OpenID Connect client handler in the authentication handlers collection.
-            options.AddScheme<OpenIdConnectHandler>(OpenIdConnectDefaults.AuthenticationScheme, settings.DisplayName);
+    public void Configure(string name, OpenIdConnectOptions options)
+    {
+        // Ignore OpenID Connect client handler instances that don't correspond to the instance managed by the OpenID module.
+        if (!string.Equals(name, OpenIdConnectDefaults.AuthenticationScheme, StringComparison.Ordinal))
+        {
+            return;
         }
 
-        public void Configure(string name, OpenIdConnectOptions options)
+        var settings = GetClientSettingsAsync().GetAwaiter().GetResult();
+        if (settings == null)
         {
-            // Ignore OpenID Connect client handler instances that don't correspond to the instance managed by the OpenID module.
-            if (!string.Equals(name, OpenIdConnectDefaults.AuthenticationScheme, StringComparison.Ordinal))
-            {
-                return;
-            }
+            return;
+        }
+
+        options.Authority = settings.Authority.AbsoluteUri;
+        options.ClientId = settings.ClientId;
+        options.SignedOutRedirectUri = settings.SignedOutRedirectUri ?? options.SignedOutRedirectUri;
+        options.SignedOutCallbackPath = settings.SignedOutCallbackPath ?? options.SignedOutCallbackPath;
+        options.RequireHttpsMetadata = string.Equals(settings.Authority.Scheme, Uri.UriSchemeHttps, StringComparison.OrdinalIgnoreCase);
+        options.GetClaimsFromUserInfoEndpoint = true;
+        options.ResponseMode = settings.ResponseMode;
+        options.ResponseType = settings.ResponseType;
+        options.SaveTokens = settings.StoreExternalTokens;
+
+        options.CallbackPath = settings.CallbackPath ?? options.CallbackPath;
 
-            var settings = GetClientSettingsAsync().GetAwaiter().GetResult();
-            if (settings == null)
+        if (settings.Scopes != null)
+        {
+            foreach (var scope in settings.Scopes)
             {
-                return;
+                options.Scope.Add(scope);
             }
+        }
 
-            options.Authority = settings.Authority.AbsoluteUri;
-            options.ClientId = settings.ClientId;
-            options.SignedOutRedirectUri = settings.SignedOutRedirectUri ?? options.SignedOutRedirectUri;
-            options.SignedOutCallbackPath = settings.SignedOutCallbackPath ?? options.SignedOutCallbackPath;
-            options.RequireHttpsMetadata = string.Equals(settings.Authority.Scheme, Uri.UriSchemeHttps, StringComparison.OrdinalIgnoreCase);
-            options.GetClaimsFromUserInfoEndpoint = true;
-            options.ResponseMode = settings.ResponseMode;
-            options.ResponseType = settings.ResponseType;
-            options.SaveTokens = settings.StoreExternalTokens;
-
-            options.CallbackPath = settings.CallbackPath ?? options.CallbackPath;
+        if (!string.IsNullOrEmpty(settings.ClientSecret))
+        {
+            var protector = _dataProtectionProvider.CreateProtector(nameof(OpenIdClientConfiguration));
 
-            if (settings.Scopes != null)
+            try
             {
-                foreach (var scope in settings.Scopes)
-                {
-                    options.Scope.Add(scope);
-                }
+                options.ClientSecret = protector.Unprotect(settings.ClientSecret);
             }
-
-            if (!string.IsNullOrEmpty(settings.ClientSecret))
+            catch
             {
-                var protector = _dataProtectionProvider.CreateProtector(nameof(OpenIdClientConfiguration));
-
-                try
-                {
-                    options.ClientSecret = protector.Unprotect(settings.ClientSecret);
-                }
-                catch
-                {
-                    _logger.LogError("The client secret could not be decrypted. It may have been encrypted using a different key.");
-                }
+                _logger.LogError("The client secret could not be decrypted. It may have been encrypted using a different key.");
             }
+        }
 
-            if (settings.Parameters != null && settings.Parameters.Length > 0)
+        if (settings.Parameters != null && settings.Parameters.Length > 0)
+        {
+            var parameters = settings.Parameters;
+            options.Events.OnRedirectToIdentityProvider = (context) =>
             {
-                var parameters = settings.Parameters;
-                options.Events.OnRedirectToIdentityProvider = (context) =>
+                foreach (var parameter in parameters)
                 {
-                    foreach (var parameter in parameters)
-                    {
-                        context.ProtocolMessage.SetParameter(parameter.Name, parameter.Value);
-                    }
+                    context.ProtocolMessage.SetParameter(parameter.Name, parameter.Value);
+                }
 
-                    return Task.CompletedTask;
-                };
-            }
+                return Task.CompletedTask;
+            };
         }
+    }
 
-        public void Configure(OpenIdConnectOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
+    public void Configure(OpenIdConnectOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
 
-        private async Task<OpenIdClientSettings> GetClientSettingsAsync()
-        {
-            var settings = await _clientService.GetSettingsAsync();
+    private async Task<OpenIdClientSettings> GetClientSettingsAsync()
+    {
+        var settings = await _clientService.GetSettingsAsync();
 
-            var result = await _clientService.ValidateSettingsAsync(settings);
+        var result = await _clientService.ValidateSettingsAsync(settings);
 
-            if (result.Any(x => x != ValidationResult.Success))
+        if (result.Any(x => x != ValidationResult.Success))
+        {
+            if (_shellSettings.IsRunning())
             {
-                if (_shellSettings.IsRunning())
+                if (_logger.IsEnabled(LogLevel.Warning))
                 {
-                    if (_logger.IsEnabled(LogLevel.Warning))
-                    {
-                        var errors = result.Where(x => x != ValidationResult.Success)
-                            .Select(x => x.ErrorMessage);
+                    var errors = result.Where(x => x != ValidationResult.Success)
+                        .Select(x => x.ErrorMessage);
 
-                        _logger.LogWarning("The OpenID client settings are invalid: {Errors}", string.Join(System.Environment.NewLine, errors));
-                    }
-
-                    return null;
+                    _logger.LogWarning("The OpenID client settings are invalid: {Errors}", string.Join(System.Environment.NewLine, errors));
                 }
-            }
 
-            return settings;
+                return null;
+            }
         }
+
+        return settings;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Configuration/OpenIdServerConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Configuration/OpenIdServerConfiguration.cs
index 012b928e084..72c2dd89d43 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Configuration/OpenIdServerConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Configuration/OpenIdServerConfiguration.cs
@@ -15,239 +15,238 @@
 using OrchardCore.OpenId.Settings;
 using static OpenIddict.Abstractions.OpenIddictConstants;
 
-namespace OrchardCore.OpenId.Configuration
+namespace OrchardCore.OpenId.Configuration;
+
+public sealed class OpenIdServerConfiguration : IConfigureOptions<AuthenticationOptions>,
+    IConfigureOptions<OpenIddictServerOptions>,
+    IConfigureOptions<OpenIddictServerDataProtectionOptions>,
+    IConfigureNamedOptions<OpenIddictServerAspNetCoreOptions>
 {
-    public sealed class OpenIdServerConfiguration : IConfigureOptions<AuthenticationOptions>,
-        IConfigureOptions<OpenIddictServerOptions>,
-        IConfigureOptions<OpenIddictServerDataProtectionOptions>,
-        IConfigureNamedOptions<OpenIddictServerAspNetCoreOptions>
+    private readonly IOpenIdServerService _serverService;
+    private readonly ShellSettings _shellSettings;
+    private readonly ILogger _logger;
+
+    public OpenIdServerConfiguration(
+        IOpenIdServerService serverService,
+        ShellSettings shellSettings,
+        ILogger<OpenIdServerConfiguration> logger)
     {
-        private readonly IOpenIdServerService _serverService;
-        private readonly ShellSettings _shellSettings;
-        private readonly ILogger _logger;
+        _serverService = serverService;
+        _shellSettings = shellSettings;
+        _logger = logger;
+    }
 
-        public OpenIdServerConfiguration(
-            IOpenIdServerService serverService,
-            ShellSettings shellSettings,
-            ILogger<OpenIdServerConfiguration> logger)
+    public void Configure(AuthenticationOptions options)
+    {
+        var settings = GetServerSettingsAsync().GetAwaiter().GetResult();
+        if (settings == null)
         {
-            _serverService = serverService;
-            _shellSettings = shellSettings;
-            _logger = logger;
+            return;
         }
 
-        public void Configure(AuthenticationOptions options)
-        {
-            var settings = GetServerSettingsAsync().GetAwaiter().GetResult();
-            if (settings == null)
-            {
-                return;
-            }
-
-            options.AddScheme<OpenIddictServerAspNetCoreHandler>(
-                OpenIddictServerAspNetCoreDefaults.AuthenticationScheme, displayName: null);
-        }
+        options.AddScheme<OpenIddictServerAspNetCoreHandler>(
+            OpenIddictServerAspNetCoreDefaults.AuthenticationScheme, displayName: null);
+    }
 
-        public void Configure(OpenIddictServerOptions options)
+    public void Configure(OpenIddictServerOptions options)
+    {
+        var settings = GetServerSettingsAsync().GetAwaiter().GetResult();
+        if (settings == null)
         {
-            var settings = GetServerSettingsAsync().GetAwaiter().GetResult();
-            if (settings == null)
-            {
-                return;
-            }
+            return;
+        }
 
-            options.Issuer = settings.Authority;
-            options.DisableAccessTokenEncryption = settings.DisableAccessTokenEncryption;
-            options.DisableRollingRefreshTokens = settings.DisableRollingRefreshTokens;
-            options.UseReferenceAccessTokens = settings.UseReferenceAccessTokens;
+        options.Issuer = settings.Authority;
+        options.DisableAccessTokenEncryption = settings.DisableAccessTokenEncryption;
+        options.DisableRollingRefreshTokens = settings.DisableRollingRefreshTokens;
+        options.UseReferenceAccessTokens = settings.UseReferenceAccessTokens;
 
-            foreach (var key in _serverService.GetEncryptionKeysAsync().GetAwaiter().GetResult())
-            {
-                options.EncryptionCredentials.Add(new EncryptingCredentials(key,
-                    SecurityAlgorithms.RsaOAEP, SecurityAlgorithms.Aes256CbcHmacSha512));
-            }
+        foreach (var key in _serverService.GetEncryptionKeysAsync().GetAwaiter().GetResult())
+        {
+            options.EncryptionCredentials.Add(new EncryptingCredentials(key,
+                SecurityAlgorithms.RsaOAEP, SecurityAlgorithms.Aes256CbcHmacSha512));
+        }
 
-            foreach (var key in _serverService.GetSigningKeysAsync().GetAwaiter().GetResult())
-            {
-                options.SigningCredentials.Add(new SigningCredentials(key, SecurityAlgorithms.RsaSha256));
-            }
+        foreach (var key in _serverService.GetSigningKeysAsync().GetAwaiter().GetResult())
+        {
+            options.SigningCredentials.Add(new SigningCredentials(key, SecurityAlgorithms.RsaSha256));
+        }
 
-            // Note: while endpoint paths in OrchardCore are stored as PathString instances,
-            // OpenIddict uses System.Uri. To ensure the System.Uri instances created from
-            // a PathString don't represent root-relative URIs (which would break path-based
-            // multi-tenancy support), the leading '/' that is always present in PathString
-            // instances is manually removed from the endpoint path before URIs are created.
+        // Note: while endpoint paths in OrchardCore are stored as PathString instances,
+        // OpenIddict uses System.Uri. To ensure the System.Uri instances created from
+        // a PathString don't represent root-relative URIs (which would break path-based
+        // multi-tenancy support), the leading '/' that is always present in PathString
+        // instances is manually removed from the endpoint path before URIs are created.
 
-            if (settings.AuthorizationEndpointPath.HasValue)
-            {
-                options.AuthorizationEndpointUris.Add(new Uri(
-                    settings.AuthorizationEndpointPath.ToUriComponent()[1..], UriKind.Relative));
-            }
+        if (settings.AuthorizationEndpointPath.HasValue)
+        {
+            options.AuthorizationEndpointUris.Add(new Uri(
+                settings.AuthorizationEndpointPath.ToUriComponent()[1..], UriKind.Relative));
+        }
 
-            if (settings.LogoutEndpointPath.HasValue)
-            {
-                options.LogoutEndpointUris.Add(new Uri(
-                    settings.LogoutEndpointPath.ToUriComponent()[1..], UriKind.Relative));
-            }
+        if (settings.LogoutEndpointPath.HasValue)
+        {
+            options.LogoutEndpointUris.Add(new Uri(
+                settings.LogoutEndpointPath.ToUriComponent()[1..], UriKind.Relative));
+        }
 
-            if (settings.TokenEndpointPath.HasValue)
-            {
-                options.TokenEndpointUris.Add(new Uri(
-                    settings.TokenEndpointPath.ToUriComponent()[1..], UriKind.Relative));
-            }
+        if (settings.TokenEndpointPath.HasValue)
+        {
+            options.TokenEndpointUris.Add(new Uri(
+                settings.TokenEndpointPath.ToUriComponent()[1..], UriKind.Relative));
+        }
 
-            if (settings.UserinfoEndpointPath.HasValue)
-            {
-                options.UserinfoEndpointUris.Add(new Uri(
-                    settings.UserinfoEndpointPath.ToUriComponent()[1..], UriKind.Relative));
-            }
+        if (settings.UserinfoEndpointPath.HasValue)
+        {
+            options.UserinfoEndpointUris.Add(new Uri(
+                settings.UserinfoEndpointPath.ToUriComponent()[1..], UriKind.Relative));
+        }
 
-            if (settings.IntrospectionEndpointPath.HasValue)
-            {
-                options.IntrospectionEndpointUris.Add(new Uri(
-                    settings.IntrospectionEndpointPath.ToUriComponent()[1..], UriKind.Relative));
-            }
+        if (settings.IntrospectionEndpointPath.HasValue)
+        {
+            options.IntrospectionEndpointUris.Add(new Uri(
+                settings.IntrospectionEndpointPath.ToUriComponent()[1..], UriKind.Relative));
+        }
 
-            if (settings.RevocationEndpointPath.HasValue)
-            {
-                options.RevocationEndpointUris.Add(new Uri(
-                    settings.RevocationEndpointPath.ToUriComponent()[1..], UriKind.Relative));
-            }
+        if (settings.RevocationEndpointPath.HasValue)
+        {
+            options.RevocationEndpointUris.Add(new Uri(
+                settings.RevocationEndpointPath.ToUriComponent()[1..], UriKind.Relative));
+        }
 
-            // For now, response types and response modes are not directly
-            // configurable and are inferred from the selected flows.
-            if (settings.AllowAuthorizationCodeFlow)
-            {
-                options.CodeChallengeMethods.Add(CodeChallengeMethods.Plain);
-                options.CodeChallengeMethods.Add(CodeChallengeMethods.Sha256);
+        // For now, response types and response modes are not directly
+        // configurable and are inferred from the selected flows.
+        if (settings.AllowAuthorizationCodeFlow)
+        {
+            options.CodeChallengeMethods.Add(CodeChallengeMethods.Plain);
+            options.CodeChallengeMethods.Add(CodeChallengeMethods.Sha256);
 
-                options.GrantTypes.Add(GrantTypes.AuthorizationCode);
+            options.GrantTypes.Add(GrantTypes.AuthorizationCode);
 
-                options.ResponseModes.Add(ResponseModes.FormPost);
-                options.ResponseModes.Add(ResponseModes.Fragment);
-                options.ResponseModes.Add(ResponseModes.Query);
+            options.ResponseModes.Add(ResponseModes.FormPost);
+            options.ResponseModes.Add(ResponseModes.Fragment);
+            options.ResponseModes.Add(ResponseModes.Query);
 
-                options.ResponseTypes.Add(ResponseTypes.Code);
-            }
+            options.ResponseTypes.Add(ResponseTypes.Code);
+        }
 
-            if (settings.AllowClientCredentialsFlow)
-            {
-                options.GrantTypes.Add(GrantTypes.ClientCredentials);
-            }
+        if (settings.AllowClientCredentialsFlow)
+        {
+            options.GrantTypes.Add(GrantTypes.ClientCredentials);
+        }
 
-            if (settings.AllowHybridFlow)
-            {
-                options.CodeChallengeMethods.Add(CodeChallengeMethods.Plain);
-                options.CodeChallengeMethods.Add(CodeChallengeMethods.Sha256);
+        if (settings.AllowHybridFlow)
+        {
+            options.CodeChallengeMethods.Add(CodeChallengeMethods.Plain);
+            options.CodeChallengeMethods.Add(CodeChallengeMethods.Sha256);
 
-                options.GrantTypes.Add(GrantTypes.AuthorizationCode);
-                options.GrantTypes.Add(GrantTypes.Implicit);
+            options.GrantTypes.Add(GrantTypes.AuthorizationCode);
+            options.GrantTypes.Add(GrantTypes.Implicit);
 
-                options.ResponseModes.Add(ResponseModes.FormPost);
-                options.ResponseModes.Add(ResponseModes.Fragment);
+            options.ResponseModes.Add(ResponseModes.FormPost);
+            options.ResponseModes.Add(ResponseModes.Fragment);
 
-                options.ResponseTypes.Add(ResponseTypes.Code + ' ' + ResponseTypes.IdToken);
-                options.ResponseTypes.Add(ResponseTypes.Code + ' ' + ResponseTypes.IdToken + ' ' + ResponseTypes.Token);
-                options.ResponseTypes.Add(ResponseTypes.Code + ' ' + ResponseTypes.Token);
-            }
+            options.ResponseTypes.Add(ResponseTypes.Code + ' ' + ResponseTypes.IdToken);
+            options.ResponseTypes.Add(ResponseTypes.Code + ' ' + ResponseTypes.IdToken + ' ' + ResponseTypes.Token);
+            options.ResponseTypes.Add(ResponseTypes.Code + ' ' + ResponseTypes.Token);
+        }
 
-            if (settings.AllowImplicitFlow)
-            {
-                options.GrantTypes.Add(GrantTypes.Implicit);
+        if (settings.AllowImplicitFlow)
+        {
+            options.GrantTypes.Add(GrantTypes.Implicit);
 
-                options.ResponseModes.Add(ResponseModes.FormPost);
-                options.ResponseModes.Add(ResponseModes.Fragment);
+            options.ResponseModes.Add(ResponseModes.FormPost);
+            options.ResponseModes.Add(ResponseModes.Fragment);
 
-                options.ResponseTypes.Add(ResponseTypes.IdToken);
-                options.ResponseTypes.Add(ResponseTypes.IdToken + ' ' + ResponseTypes.Token);
-                options.ResponseTypes.Add(ResponseTypes.Token);
-            }
+            options.ResponseTypes.Add(ResponseTypes.IdToken);
+            options.ResponseTypes.Add(ResponseTypes.IdToken + ' ' + ResponseTypes.Token);
+            options.ResponseTypes.Add(ResponseTypes.Token);
+        }
 
-            if (settings.AllowPasswordFlow)
-            {
-                options.GrantTypes.Add(GrantTypes.Password);
-            }
+        if (settings.AllowPasswordFlow)
+        {
+            options.GrantTypes.Add(GrantTypes.Password);
+        }
 
-            if (settings.AllowRefreshTokenFlow)
-            {
-                options.GrantTypes.Add(GrantTypes.RefreshToken);
+        if (settings.AllowRefreshTokenFlow)
+        {
+            options.GrantTypes.Add(GrantTypes.RefreshToken);
 
-                options.Scopes.Add(Scopes.OfflineAccess);
-            }
+            options.Scopes.Add(Scopes.OfflineAccess);
+        }
 
-            options.RequireProofKeyForCodeExchange = settings.RequireProofKeyForCodeExchange;
+        options.RequireProofKeyForCodeExchange = settings.RequireProofKeyForCodeExchange;
 
-            options.Scopes.Add(Scopes.Email);
-            options.Scopes.Add(Scopes.Phone);
-            options.Scopes.Add(Scopes.Profile);
-            options.Scopes.Add(Scopes.Roles);
-        }
+        options.Scopes.Add(Scopes.Email);
+        options.Scopes.Add(Scopes.Phone);
+        options.Scopes.Add(Scopes.Profile);
+        options.Scopes.Add(Scopes.Roles);
+    }
 
-        public void Configure(OpenIddictServerDataProtectionOptions options)
+    public void Configure(OpenIddictServerDataProtectionOptions options)
+    {
+        var settings = GetServerSettingsAsync().GetAwaiter().GetResult();
+        if (settings == null)
         {
-            var settings = GetServerSettingsAsync().GetAwaiter().GetResult();
-            if (settings == null)
-            {
-                return;
-            }
-
-            // All the tokens produced by the server feature use ASP.NET Core Data Protection as the default
-            // token format, but an option is provided to allow switching to JWT for access tokens only.
-            options.PreferDefaultAccessTokenFormat = settings.AccessTokenFormat == OpenIdServerSettings.TokenFormat.JsonWebToken;
+            return;
         }
 
-        public void Configure(string name, OpenIddictServerAspNetCoreOptions options)
-        {
-            // Note: the OpenID module handles the authorization, logout, token and userinfo requests
-            // in its dedicated ASP.NET Core MVC controller, which requires enabling the pass-through mode.
-            options.EnableAuthorizationEndpointPassthrough = true;
-            options.EnableLogoutEndpointPassthrough = true;
-            options.EnableTokenEndpointPassthrough = true;
-            options.EnableUserinfoEndpointPassthrough = true;
+        // All the tokens produced by the server feature use ASP.NET Core Data Protection as the default
+        // token format, but an option is provided to allow switching to JWT for access tokens only.
+        options.PreferDefaultAccessTokenFormat = settings.AccessTokenFormat == OpenIdServerSettings.TokenFormat.JsonWebToken;
+    }
 
-            // Note: caching is enabled for both authorization and logout requests to allow sending
-            // large POST authorization and logout requests, but can be programmatically disabled, as the
-            // authorization and logout views support flowing the entire payload and not just the request_id.
-            options.EnableAuthorizationRequestCaching = true;
-            options.EnableLogoutRequestCaching = true;
+    public void Configure(string name, OpenIddictServerAspNetCoreOptions options)
+    {
+        // Note: the OpenID module handles the authorization, logout, token and userinfo requests
+        // in its dedicated ASP.NET Core MVC controller, which requires enabling the pass-through mode.
+        options.EnableAuthorizationEndpointPassthrough = true;
+        options.EnableLogoutEndpointPassthrough = true;
+        options.EnableTokenEndpointPassthrough = true;
+        options.EnableUserinfoEndpointPassthrough = true;
+
+        // Note: caching is enabled for both authorization and logout requests to allow sending
+        // large POST authorization and logout requests, but can be programmatically disabled, as the
+        // authorization and logout views support flowing the entire payload and not just the request_id.
+        options.EnableAuthorizationRequestCaching = true;
+        options.EnableLogoutRequestCaching = true;
+
+        // Note: error pass-through is enabled to allow the actions of the MVC authorization controller
+        // to handle the errors returned by the interactive endpoints without relying on the generic
+        // status code pages middleware to rewrite the response later in the request processing.
+        options.EnableErrorPassthrough = true;
+
+        // Note: in Orchard, transport security is usually configured via the dedicated HTTPS module.
+        // To make configuration easier and avoid having to configure it in two different features,
+        // the transport security requirement enforced by OpenIddict by default is always turned off.
+        options.DisableTransportSecurityRequirement = true;
+    }
 
-            // Note: error pass-through is enabled to allow the actions of the MVC authorization controller
-            // to handle the errors returned by the interactive endpoints without relying on the generic
-            // status code pages middleware to rewrite the response later in the request processing.
-            options.EnableErrorPassthrough = true;
+    public void Configure(OpenIddictServerAspNetCoreOptions options)
+        => Debug.Fail("This infrastructure method shouldn't be called.");
 
-            // Note: in Orchard, transport security is usually configured via the dedicated HTTPS module.
-            // To make configuration easier and avoid having to configure it in two different features,
-            // the transport security requirement enforced by OpenIddict by default is always turned off.
-            options.DisableTransportSecurityRequirement = true;
-        }
+    private async Task<OpenIdServerSettings> GetServerSettingsAsync()
+    {
+        var settings = await _serverService.GetSettingsAsync();
 
-        public void Configure(OpenIddictServerAspNetCoreOptions options)
-            => Debug.Fail("This infrastructure method shouldn't be called.");
+        var result = await _serverService.ValidateSettingsAsync(settings);
 
-        private async Task<OpenIdServerSettings> GetServerSettingsAsync()
+        if (result.Any(result => result != ValidationResult.Success))
         {
-            var settings = await _serverService.GetSettingsAsync();
-
-            var result = await _serverService.ValidateSettingsAsync(settings);
-
-            if (result.Any(result => result != ValidationResult.Success))
+            if (_shellSettings.IsRunning())
             {
-                if (_shellSettings.IsRunning())
+                if (_logger.IsEnabled(LogLevel.Warning))
                 {
-                    if (_logger.IsEnabled(LogLevel.Warning))
-                    {
-                        var errors = result.Where(x => x != ValidationResult.Success)
-                            .Select(x => x.ErrorMessage);
-
-                        _logger.LogWarning("The OpenID server settings are invalid: {Errors}", string.Join(System.Environment.NewLine, errors));
-                    }
+                    var errors = result.Where(x => x != ValidationResult.Success)
+                        .Select(x => x.ErrorMessage);
 
-                    return null;
+                    _logger.LogWarning("The OpenID server settings are invalid: {Errors}", string.Join(System.Environment.NewLine, errors));
                 }
-            }
 
-            return settings;
+                return null;
+            }
         }
+
+        return settings;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Configuration/OpenIdValidationConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Configuration/OpenIdValidationConfiguration.cs
index b6cbf6bff86..6098f770a0e 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Configuration/OpenIdValidationConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Configuration/OpenIdValidationConfiguration.cs
@@ -22,274 +22,273 @@
 using static OpenIddict.Abstractions.OpenIddictConstants;
 using SystemEnvironment = System.Environment;
 
-namespace OrchardCore.OpenId.Configuration
+namespace OrchardCore.OpenId.Configuration;
+
+public sealed class OpenIdValidationConfiguration : IConfigureOptions<AuthenticationOptions>,
+    IConfigureOptions<OpenIddictValidationOptions>,
+    IConfigureOptions<OpenIddictValidationDataProtectionOptions>,
+    IConfigureNamedOptions<ApiAuthorizationOptions>
 {
-    public sealed class OpenIdValidationConfiguration : IConfigureOptions<AuthenticationOptions>,
-        IConfigureOptions<OpenIddictValidationOptions>,
-        IConfigureOptions<OpenIddictValidationDataProtectionOptions>,
-        IConfigureNamedOptions<ApiAuthorizationOptions>
+    private readonly ILogger _logger;
+    private readonly IOpenIdValidationService _validationService;
+    private readonly IRunningShellTable _runningShellTable;
+    private readonly IShellHost _shellHost;
+    private readonly ShellSettings _shellSettings;
+
+    public OpenIdValidationConfiguration(
+        ILogger<OpenIdValidationConfiguration> logger,
+        IOpenIdValidationService validationService,
+        IRunningShellTable runningShellTable,
+        IShellHost shellHost,
+        ShellSettings shellSettings)
+    {
+        _logger = logger;
+        _validationService = validationService;
+        _runningShellTable = runningShellTable;
+        _shellHost = shellHost;
+        _shellSettings = shellSettings;
+    }
+
+    public void Configure(AuthenticationOptions options)
     {
-        private readonly ILogger _logger;
-        private readonly IOpenIdValidationService _validationService;
-        private readonly IRunningShellTable _runningShellTable;
-        private readonly IShellHost _shellHost;
-        private readonly ShellSettings _shellSettings;
-
-        public OpenIdValidationConfiguration(
-            ILogger<OpenIdValidationConfiguration> logger,
-            IOpenIdValidationService validationService,
-            IRunningShellTable runningShellTable,
-            IShellHost shellHost,
-            ShellSettings shellSettings)
+        var settings = GetValidationSettingsAsync().GetAwaiter().GetResult();
+        if (settings == null)
         {
-            _logger = logger;
-            _validationService = validationService;
-            _runningShellTable = runningShellTable;
-            _shellHost = shellHost;
-            _shellSettings = shellSettings;
+            return;
         }
 
-        public void Configure(AuthenticationOptions options)
+        if (settings.Authority != null)
         {
-            var settings = GetValidationSettingsAsync().GetAwaiter().GetResult();
-            if (settings == null)
+            options.AddScheme<OpenIddictValidationAspNetCoreHandler>(
+                OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme, displayName: null);
+
+            return;
+        }
+
+        // Note: the shell host guarantees that the OpenID server service resolved inside
+        // this using block won't be disposed until the service scope itself is released.
+        CreateTenantScope(settings.Tenant).UsingAsync(async scope =>
+        {
+            var service = scope.ServiceProvider.GetService<IOpenIdServerService>();
+            if (service == null)
             {
                 return;
             }
 
-            if (settings.Authority != null)
+            var configuration = await GetServerSettingsAsync(service);
+            if (configuration == null)
             {
-                options.AddScheme<OpenIddictValidationAspNetCoreHandler>(
-                    OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme, displayName: null);
-
                 return;
             }
 
-            // Note: the shell host guarantees that the OpenID server service resolved inside
-            // this using block won't be disposed until the service scope itself is released.
-            CreateTenantScope(settings.Tenant).UsingAsync(async scope =>
-            {
-                var service = scope.ServiceProvider.GetService<IOpenIdServerService>();
-                if (service == null)
-                {
-                    return;
-                }
-
-                var configuration = await GetServerSettingsAsync(service);
-                if (configuration == null)
-                {
-                    return;
-                }
+            options.AddScheme<OpenIddictValidationAspNetCoreHandler>(
+                OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme, displayName: null);
+        }).GetAwaiter().GetResult();
+    }
 
-                options.AddScheme<OpenIddictValidationAspNetCoreHandler>(
-                    OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme, displayName: null);
-            }).GetAwaiter().GetResult();
+    public void Configure(OpenIddictValidationOptions options)
+    {
+        var settings = GetValidationSettingsAsync().GetAwaiter().GetResult();
+        if (settings == null)
+        {
+            return;
         }
 
-        public void Configure(OpenIddictValidationOptions options)
+        // If the tokens are issued by an authorization server located in an Orchard tenant, retrieve the
+        // authority and the signing key and register them in the token validation parameters to prevent
+        // the handler from using an HTTP call to retrieve the discovery document from the other tenant.
+        // Otherwise, set the authority to allow the handler to retrieve the endpoint URLs/signing keys
+        // from the remote server's metadata by sending an OpenID Connect/OAuth 2.0 discovery request.
+
+        if (settings.Authority != null)
         {
-            var settings = GetValidationSettingsAsync().GetAwaiter().GetResult();
-            if (settings == null)
+            options.Issuer = settings.Authority;
+            options.ConfigurationEndpoint = settings.MetadataAddress;
+            options.Audiences.Add(settings.Audience);
+
+            // Note: OpenIddict 3.0 only accepts tokens issued with a non-empty token type (e.g "at+jwt")
+            // or with the generic "JWT" type and a special "token_type" claim containing the actual type
+            // for backward compatibility, which matches the recommended best practices and helps prevent
+            // token substitution attacks by ensuring JWT tokens of any other type are always rejected.
+            // Unfortunately, most of the OAuth 2.0/OpenID Connect servers haven't been updated to emit
+            // access tokens using the "at+jwt" token type header. To ensure the validation handler can still
+            // be used with these servers, an option is provided to disable the token validation logic.
+            // In this case, the received tokens are assumed to be access tokens (which is the only type
+            // currently used in the API validation feature), no matter what their actual "typ" header is.
+            if (settings.DisableTokenTypeValidation)
             {
-                return;
+                options.TokenValidationParameters.TypeValidator = (type, token, parameters)
+                    => JsonWebTokenTypes.AccessToken;
             }
+        }
 
-            // If the tokens are issued by an authorization server located in an Orchard tenant, retrieve the
-            // authority and the signing key and register them in the token validation parameters to prevent
-            // the handler from using an HTTP call to retrieve the discovery document from the other tenant.
-            // Otherwise, set the authority to allow the handler to retrieve the endpoint URLs/signing keys
-            // from the remote server's metadata by sending an OpenID Connect/OAuth 2.0 discovery request.
-
-            if (settings.Authority != null)
+        // Note: the shell host guarantees that the OpenID server service resolved inside
+        // this using block won't be disposed until the service scope itself is released.
+        CreateTenantScope(settings.Tenant).UsingAsync(async scope =>
+        {
+            var service = scope.ServiceProvider.GetService<IOpenIdServerService>();
+            if (service == null)
             {
-                options.Issuer = settings.Authority;
-                options.ConfigurationEndpoint = settings.MetadataAddress;
-                options.Audiences.Add(settings.Audience);
-
-                // Note: OpenIddict 3.0 only accepts tokens issued with a non-empty token type (e.g "at+jwt")
-                // or with the generic "JWT" type and a special "token_type" claim containing the actual type
-                // for backward compatibility, which matches the recommended best practices and helps prevent
-                // token substitution attacks by ensuring JWT tokens of any other type are always rejected.
-                // Unfortunately, most of the OAuth 2.0/OpenID Connect servers haven't been updated to emit
-                // access tokens using the "at+jwt" token type header. To ensure the validation handler can still
-                // be used with these servers, an option is provided to disable the token validation logic.
-                // In this case, the received tokens are assumed to be access tokens (which is the only type
-                // currently used in the API validation feature), no matter what their actual "typ" header is.
-                if (settings.DisableTokenTypeValidation)
-                {
-                    options.TokenValidationParameters.TypeValidator = (type, token, parameters)
-                        => JsonWebTokenTypes.AccessToken;
-                }
+                return;
             }
 
-            // Note: the shell host guarantees that the OpenID server service resolved inside
-            // this using block won't be disposed until the service scope itself is released.
-            CreateTenantScope(settings.Tenant).UsingAsync(async scope =>
+            var configuration = await GetServerSettingsAsync(service);
+            if (configuration == null)
             {
-                var service = scope.ServiceProvider.GetService<IOpenIdServerService>();
-                if (service == null)
-                {
-                    return;
-                }
-
-                var configuration = await GetServerSettingsAsync(service);
-                if (configuration == null)
-                {
-                    return;
-                }
+                return;
+            }
 
-                options.Configuration = new OpenIddictConfiguration();
+            options.Configuration = new OpenIddictConfiguration();
 
-                options.Issuer = configuration.Authority;
+            options.Issuer = configuration.Authority;
 
-                // Import the signing keys from the OpenID server configuration.
-                foreach (var key in await service.GetSigningKeysAsync())
-                {
-                    options.Configuration.SigningKeys.Add(key);
-                }
+            // Import the signing keys from the OpenID server configuration.
+            foreach (var key in await service.GetSigningKeysAsync())
+            {
+                options.Configuration.SigningKeys.Add(key);
+            }
 
-                // Register the encryption keys used by the OpenID Connect server.
-                foreach (var key in await service.GetEncryptionKeysAsync())
-                {
-                    options.EncryptionCredentials.Add(new EncryptingCredentials(key,
-                        SecurityAlgorithms.RsaOAEP, SecurityAlgorithms.Aes256CbcHmacSha512));
-                }
+            // Register the encryption keys used by the OpenID Connect server.
+            foreach (var key in await service.GetEncryptionKeysAsync())
+            {
+                options.EncryptionCredentials.Add(new EncryptingCredentials(key,
+                    SecurityAlgorithms.RsaOAEP, SecurityAlgorithms.Aes256CbcHmacSha512));
+            }
 
-                // When the server is another tenant, don't allow the current tenant
-                // to choose the valid audiences, as this would otherwise allow it
-                // to validate/introspect tokens meant to be used with another tenant.
-                options.Audiences.Add(OpenIdConstants.Prefixes.Tenant + _shellSettings.Name);
+            // When the server is another tenant, don't allow the current tenant
+            // to choose the valid audiences, as this would otherwise allow it
+            // to validate/introspect tokens meant to be used with another tenant.
+            options.Audiences.Add(OpenIdConstants.Prefixes.Tenant + _shellSettings.Name);
 
-                // Note: token entry validation must be enabled to be able to validate reference tokens.
-                options.EnableTokenEntryValidation = configuration.UseReferenceAccessTokens;
+            // Note: token entry validation must be enabled to be able to validate reference tokens.
+            options.EnableTokenEntryValidation = configuration.UseReferenceAccessTokens;
 
-                // If an authority was explicitly set in the OpenID server options,
-                // prefer it to the dynamic tenant comparison as it's more efficient.
-                if (configuration.Authority != null)
-                {
-                    options.TokenValidationParameters.ValidIssuer = configuration.Authority.AbsoluteUri;
-                }
-                else
-                {
-                    options.TokenValidationParameters.IssuerValidator = (issuer, token, parameters) =>
-                    {
-                        if (!Uri.TryCreate(issuer, UriKind.Absolute, out var uri))
-                        {
-                            throw new SecurityTokenInvalidIssuerException("The token issuer is not valid.");
-                        }
-
-                        var tenant = _runningShellTable.Match(HostString.FromUriComponent(uri), uri.AbsolutePath);
-                        if (tenant == null || !string.Equals(tenant.Name, settings.Tenant, StringComparison.Ordinal))
-                        {
-                            throw new SecurityTokenInvalidIssuerException("The token issuer is not valid.");
-                        }
-
-                        return issuer;
-                    };
-                }
-            }).GetAwaiter().GetResult();
-        }
-
-        public void Configure(OpenIddictValidationDataProtectionOptions options)
-        {
-            var settings = GetValidationSettingsAsync().GetAwaiter().GetResult();
-            if (settings == null)
+            // If an authority was explicitly set in the OpenID server options,
+            // prefer it to the dynamic tenant comparison as it's more efficient.
+            if (configuration.Authority != null)
             {
-                return;
+                options.TokenValidationParameters.ValidIssuer = configuration.Authority.AbsoluteUri;
             }
-
-            // If the tokens are issued by an authorization server located in a separate tenant,
-            // resolve the isolated data protection provider associated with the specified tenant.
-            if (!string.IsNullOrEmpty(settings.Tenant) &&
-                !string.Equals(settings.Tenant, _shellSettings.Name, StringComparison.Ordinal))
+            else
             {
-                CreateTenantScope(settings.Tenant).UsingAsync(async scope =>
+                options.TokenValidationParameters.IssuerValidator = (issuer, token, parameters) =>
                 {
-                    // If the other tenant is released, ensure the current tenant is also restarted as it
-                    // relies on a data protection provider whose lifetime is managed by the other tenant.
-                    // To make sure the other tenant is not disposed before all the pending requests are
-                    // processed by the current tenant, a tenant dependency is manually added.
-                    await scope.ShellContext.AddDependentShellAsync(await _shellHost.GetOrCreateShellContextAsync(_shellSettings));
-
-                    // Note: the data protection provider is always registered as a singleton and thus will
-                    // survive the current scope, which is mainly used to prevent the other tenant from being
-                    // released before we have a chance to declare the current tenant as a dependent tenant.
-                    options.DataProtectionProvider = scope.ServiceProvider.GetDataProtectionProvider();
-                }).GetAwaiter().GetResult();
+                    if (!Uri.TryCreate(issuer, UriKind.Absolute, out var uri))
+                    {
+                        throw new SecurityTokenInvalidIssuerException("The token issuer is not valid.");
+                    }
+
+                    var tenant = _runningShellTable.Match(HostString.FromUriComponent(uri), uri.AbsolutePath);
+                    if (tenant == null || !string.Equals(tenant.Name, settings.Tenant, StringComparison.Ordinal))
+                    {
+                        throw new SecurityTokenInvalidIssuerException("The token issuer is not valid.");
+                    }
+
+                    return issuer;
+                };
             }
-        }
+        }).GetAwaiter().GetResult();
+    }
 
-        public void Configure(string name, ApiAuthorizationOptions options)
+    public void Configure(OpenIddictValidationDataProtectionOptions options)
+    {
+        var settings = GetValidationSettingsAsync().GetAwaiter().GetResult();
+        if (settings == null)
         {
-            // The default Orchard API authentication handler uses "Bearer" as the forwarded
-            // authentication scheme, that corresponds to the default value used by the JWT
-            // bearer handler from Microsoft. Yet, the OpenIddict validation handler uses
-            // a different authentication scheme, so the API scheme must be manually replaced.
-            options.ApiAuthenticationScheme = OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme;
+            return;
         }
 
-        public void Configure(ApiAuthorizationOptions options)
-            => Debug.Fail("This infrastructure method shouldn't be called.");
-
-        private ShellScope CreateTenantScope(string tenant)
+        // If the tokens are issued by an authorization server located in a separate tenant,
+        // resolve the isolated data protection provider associated with the specified tenant.
+        if (!string.IsNullOrEmpty(settings.Tenant) &&
+            !string.Equals(settings.Tenant, _shellSettings.Name, StringComparison.Ordinal))
         {
-            // Optimization: if the specified name corresponds to the current tenant, use the current 'ShellScope'.
-            if (string.IsNullOrEmpty(tenant) || string.Equals(tenant, _shellSettings.Name, StringComparison.Ordinal))
+            CreateTenantScope(settings.Tenant).UsingAsync(async scope =>
             {
-                return ShellScope.Current;
-            }
-
-            return _shellHost.GetScopeAsync(tenant).GetAwaiter().GetResult();
+                // If the other tenant is released, ensure the current tenant is also restarted as it
+                // relies on a data protection provider whose lifetime is managed by the other tenant.
+                // To make sure the other tenant is not disposed before all the pending requests are
+                // processed by the current tenant, a tenant dependency is manually added.
+                await scope.ShellContext.AddDependentShellAsync(await _shellHost.GetOrCreateShellContextAsync(_shellSettings));
+
+                // Note: the data protection provider is always registered as a singleton and thus will
+                // survive the current scope, which is mainly used to prevent the other tenant from being
+                // released before we have a chance to declare the current tenant as a dependent tenant.
+                options.DataProtectionProvider = scope.ServiceProvider.GetDataProtectionProvider();
+            }).GetAwaiter().GetResult();
         }
+    }
+
+    public void Configure(string name, ApiAuthorizationOptions options)
+    {
+        // The default Orchard API authentication handler uses "Bearer" as the forwarded
+        // authentication scheme, that corresponds to the default value used by the JWT
+        // bearer handler from Microsoft. Yet, the OpenIddict validation handler uses
+        // a different authentication scheme, so the API scheme must be manually replaced.
+        options.ApiAuthenticationScheme = OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme;
+    }
 
-        private async Task<OpenIdServerSettings> GetServerSettingsAsync(IOpenIdServerService service)
+    public void Configure(ApiAuthorizationOptions options)
+        => Debug.Fail("This infrastructure method shouldn't be called.");
+
+    private ShellScope CreateTenantScope(string tenant)
+    {
+        // Optimization: if the specified name corresponds to the current tenant, use the current 'ShellScope'.
+        if (string.IsNullOrEmpty(tenant) || string.Equals(tenant, _shellSettings.Name, StringComparison.Ordinal))
         {
-            var settings = await service.GetSettingsAsync();
+            return ShellScope.Current;
+        }
+
+        return _shellHost.GetScopeAsync(tenant).GetAwaiter().GetResult();
+    }
+
+    private async Task<OpenIdServerSettings> GetServerSettingsAsync(IOpenIdServerService service)
+    {
+        var settings = await service.GetSettingsAsync();
 
-            var result = await service.ValidateSettingsAsync(settings);
+        var result = await service.ValidateSettingsAsync(settings);
 
-            if (result.Any(result => result != ValidationResult.Success))
+        if (result.Any(result => result != ValidationResult.Success))
+        {
+            if (_shellSettings.IsRunning())
             {
-                if (_shellSettings.IsRunning())
+                if (_logger.IsEnabled(LogLevel.Warning))
                 {
-                    if (_logger.IsEnabled(LogLevel.Warning))
-                    {
-                        var errors = result.Where(x => x != ValidationResult.Success)
-                            .Select(x => x.ErrorMessage);
+                    var errors = result.Where(x => x != ValidationResult.Success)
+                        .Select(x => x.ErrorMessage);
 
-                        _logger.LogWarning("The OpenID server settings are invalid: {Errors}", string.Join(SystemEnvironment.NewLine, errors));
-                    }
-
-                    return null;
+                    _logger.LogWarning("The OpenID server settings are invalid: {Errors}", string.Join(SystemEnvironment.NewLine, errors));
                 }
-            }
 
-            return settings;
+                return null;
+            }
         }
 
-        private async Task<OpenIdValidationSettings> GetValidationSettingsAsync()
-        {
-            var settings = await _validationService.GetSettingsAsync();
+        return settings;
+    }
 
-            var result = await _validationService.ValidateSettingsAsync(settings);
+    private async Task<OpenIdValidationSettings> GetValidationSettingsAsync()
+    {
+        var settings = await _validationService.GetSettingsAsync();
+
+        var result = await _validationService.ValidateSettingsAsync(settings);
 
-            if (result.Any(x => x != ValidationResult.Success))
+        if (result.Any(x => x != ValidationResult.Success))
+        {
+            if (_shellSettings.IsRunning())
             {
-                if (_shellSettings.IsRunning())
+                if (_logger.IsEnabled(LogLevel.Warning))
                 {
-                    if (_logger.IsEnabled(LogLevel.Warning))
-                    {
-                        var errors = result.Where(x => x != ValidationResult.Success)
-                            .Select(x => x.ErrorMessage);
-
-                        _logger.LogWarning("The OpenID validation settings are invalid: {Errors}", string.Join(SystemEnvironment.NewLine, errors));
-                    }
+                    var errors = result.Where(x => x != ValidationResult.Success)
+                        .Select(x => x.ErrorMessage);
 
-                    return null;
+                    _logger.LogWarning("The OpenID validation settings are invalid: {Errors}", string.Join(SystemEnvironment.NewLine, errors));
                 }
-            }
 
-            return settings;
+                return null;
+            }
         }
+
+        return settings;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/AccessController.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/AccessController.cs
index d23b6b199f0..3e69861290c 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/AccessController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/AccessController.cs
@@ -22,652 +22,651 @@
 using OrchardCore.Users.Services;
 using static OpenIddict.Abstractions.OpenIddictConstants;
 
-namespace OrchardCore.OpenId.Controllers
+namespace OrchardCore.OpenId.Controllers;
+
+// Note: the error descriptions used in this controller are deliberately not localized as
+// the OAuth 2.0 specification only allows select US-ASCII characters in error_description.
+[Authorize, Feature(OpenIdConstants.Features.Server)]
+public class AccessController : Controller
 {
-    // Note: the error descriptions used in this controller are deliberately not localized as
-    // the OAuth 2.0 specification only allows select US-ASCII characters in error_description.
-    [Authorize, Feature(OpenIdConstants.Features.Server)]
-    public class AccessController : Controller
+    private readonly IOpenIdApplicationManager _applicationManager;
+    private readonly IOpenIdAuthorizationManager _authorizationManager;
+    private readonly IOpenIdScopeManager _scopeManager;
+    private readonly ShellSettings _shellSettings;
+
+    public AccessController(
+        IOpenIdApplicationManager applicationManager,
+        IOpenIdAuthorizationManager authorizationManager,
+        IOpenIdScopeManager scopeManager,
+        ShellSettings shellSettings)
     {
-        private readonly IOpenIdApplicationManager _applicationManager;
-        private readonly IOpenIdAuthorizationManager _authorizationManager;
-        private readonly IOpenIdScopeManager _scopeManager;
-        private readonly ShellSettings _shellSettings;
+        _applicationManager = applicationManager;
+        _authorizationManager = authorizationManager;
+        _scopeManager = scopeManager;
+        _shellSettings = shellSettings;
+    }
 
-        public AccessController(
-            IOpenIdApplicationManager applicationManager,
-            IOpenIdAuthorizationManager authorizationManager,
-            IOpenIdScopeManager scopeManager,
-            ShellSettings shellSettings)
+    [AllowAnonymous, DisableCors, HttpGet, HttpPost, IgnoreAntiforgeryToken]
+    public async Task<IActionResult> Authorize()
+    {
+        var response = HttpContext.GetOpenIddictServerResponse();
+        if (response != null)
         {
-            _applicationManager = applicationManager;
-            _authorizationManager = authorizationManager;
-            _scopeManager = scopeManager;
-            _shellSettings = shellSettings;
+            return View("Error", new ErrorViewModel
+            {
+                Error = response.Error,
+                ErrorDescription = response.ErrorDescription
+            });
         }
 
-        [AllowAnonymous, DisableCors, HttpGet, HttpPost, IgnoreAntiforgeryToken]
-        public async Task<IActionResult> Authorize()
+        var request = HttpContext.GetOpenIddictServerRequest();
+        if (request == null)
         {
-            var response = HttpContext.GetOpenIddictServerResponse();
-            if (response != null)
-            {
-                return View("Error", new ErrorViewModel
-                {
-                    Error = response.Error,
-                    ErrorDescription = response.ErrorDescription
-                });
-            }
+            return NotFound();
+        }
 
-            var request = HttpContext.GetOpenIddictServerRequest();
-            if (request == null)
-            {
-                return NotFound();
-            }
+        // Retrieve the claims stored in the authentication cookie.
+        // If they can't be extracted, redirect the user to the login page.
+        var result = await HttpContext.AuthenticateAsync();
+        if (result == null || !result.Succeeded || request.HasPrompt(Prompts.Login))
+        {
+            return RedirectToLoginPage(request);
+        }
 
-            // Retrieve the claims stored in the authentication cookie.
-            // If they can't be extracted, redirect the user to the login page.
-            var result = await HttpContext.AuthenticateAsync();
-            if (result == null || !result.Succeeded || request.HasPrompt(Prompts.Login))
-            {
-                return RedirectToLoginPage(request);
-            }
+        // If a max_age parameter was provided, ensure that the cookie is not too old.
+        // If it's too old, automatically redirect the user agent to the login page.
+        if (request.MaxAge != null && result.Properties.IssuedUtc != null &&
+            DateTimeOffset.UtcNow - result.Properties.IssuedUtc > TimeSpan.FromSeconds(request.MaxAge.Value))
+        {
+            return RedirectToLoginPage(request);
+        }
 
-            // If a max_age parameter was provided, ensure that the cookie is not too old.
-            // If it's too old, automatically redirect the user agent to the login page.
-            if (request.MaxAge != null && result.Properties.IssuedUtc != null &&
-                DateTimeOffset.UtcNow - result.Properties.IssuedUtc > TimeSpan.FromSeconds(request.MaxAge.Value))
-            {
-                return RedirectToLoginPage(request);
-            }
+        var application = await _applicationManager.FindByClientIdAsync(request.ClientId) ??
+            throw new InvalidOperationException("The application details cannot be found.");
 
-            var application = await _applicationManager.FindByClientIdAsync(request.ClientId) ??
-                throw new InvalidOperationException("The application details cannot be found.");
+        var authorizations = await _authorizationManager.FindAsync(
+            subject: result.Principal.GetUserIdentifier(),
+            client: await _applicationManager.GetIdAsync(application),
+            status: Statuses.Valid,
+            type: AuthorizationTypes.Permanent,
+            scopes: request.GetScopes()).ToListAsync();
 
-            var authorizations = await _authorizationManager.FindAsync(
-                subject: result.Principal.GetUserIdentifier(),
-                client: await _applicationManager.GetIdAsync(application),
-                status: Statuses.Valid,
-                type: AuthorizationTypes.Permanent,
-                scopes: request.GetScopes()).ToListAsync();
+        switch (await _applicationManager.GetConsentTypeAsync(application))
+        {
+            case ConsentTypes.External when authorizations.Count == 0:
+                return Forbid(new AuthenticationProperties(new Dictionary<string, string>
+                {
+                    [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.ConsentRequired,
+                    [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] =
+                        "The logged in user is not allowed to access this client application."
+                }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
 
-            switch (await _applicationManager.GetConsentTypeAsync(application))
-            {
-                case ConsentTypes.External when authorizations.Count == 0:
-                    return Forbid(new AuthenticationProperties(new Dictionary<string, string>
-                    {
-                        [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.ConsentRequired,
-                        [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] =
-                            "The logged in user is not allowed to access this client application."
-                    }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
-
-                case ConsentTypes.Implicit:
-                case ConsentTypes.External when authorizations.Count > 0:
-                case ConsentTypes.Explicit when authorizations.Count > 0 && !request.HasPrompt(Prompts.Consent):
-                    var identity = new ClaimsIdentity(result.Principal.Claims, OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
-                    identity.AddClaim(new Claim(OpenIdConstants.Claims.EntityType, OpenIdConstants.EntityTypes.User));
-
-                    // Note: while ASP.NET Core Identity uses the legacy WS-Federation claims (exposed by the ClaimTypes class),
-                    // OpenIddict uses the newer JWT claims defined by the OpenID Connect specification. To ensure the mandatory
-                    // subject claim is correctly populated (and avoid an InvalidOperationException), it's manually added here.
-                    if (string.IsNullOrEmpty(result.Principal.FindFirst(Claims.Subject)?.Value))
-                    {
-                        identity.AddClaim(new Claim(Claims.Subject, result.Principal.GetUserIdentifier()));
-                    }
-                    if (string.IsNullOrEmpty(result.Principal.FindFirst(Claims.Name)?.Value))
-                    {
-                        identity.AddClaim(new Claim(Claims.Name, result.Principal.GetUserName()));
-                    }
-
-                    identity.SetScopes(request.GetScopes());
-                    identity.SetResources(await GetResourcesAsync(request.GetScopes()));
-
-                    // Automatically create a permanent authorization to avoid requiring explicit consent
-                    // for future authorization or token requests containing the same scopes.
-                    var authorization = authorizations.LastOrDefault();
-                    authorization ??= await _authorizationManager.CreateAsync(
-                        identity: identity,
-                        subject: identity.GetUserIdentifier(),
-                        client: await _applicationManager.GetIdAsync(application),
-                        type: AuthorizationTypes.Permanent,
-                        scopes: identity.GetScopes());
-
-                    identity.SetAuthorizationId(await _authorizationManager.GetIdAsync(authorization));
-                    identity.SetDestinations(GetDestinations);
-
-                    return SignIn(new ClaimsPrincipal(identity), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
-
-                case ConsentTypes.Explicit when request.HasPrompt(Prompts.None):
-                    return Forbid(new AuthenticationProperties(new Dictionary<string, string>
-                    {
-                        [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.ConsentRequired,
-                        [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] =
-                            "Interactive user consent is required."
-                    }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
-
-                default:
-                    return View(new AuthorizeViewModel
-                    {
-                        ApplicationName = await _applicationManager.GetLocalizedDisplayNameAsync(application),
-                        RequestId = request.RequestId,
-                        Scope = request.Scope
-                    });
-            }
+            case ConsentTypes.Implicit:
+            case ConsentTypes.External when authorizations.Count > 0:
+            case ConsentTypes.Explicit when authorizations.Count > 0 && !request.HasPrompt(Prompts.Consent):
+                var identity = new ClaimsIdentity(result.Principal.Claims, OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+                identity.AddClaim(new Claim(OpenIdConstants.Claims.EntityType, OpenIdConstants.EntityTypes.User));
 
-            IActionResult RedirectToLoginPage(OpenIddictRequest request)
-            {
-                // If the client application requested promptless authentication,
-                // return an error indicating that the user is not logged in.
-                if (request.HasPrompt(Prompts.None))
+                // Note: while ASP.NET Core Identity uses the legacy WS-Federation claims (exposed by the ClaimTypes class),
+                // OpenIddict uses the newer JWT claims defined by the OpenID Connect specification. To ensure the mandatory
+                // subject claim is correctly populated (and avoid an InvalidOperationException), it's manually added here.
+                if (string.IsNullOrEmpty(result.Principal.FindFirst(Claims.Subject)?.Value))
                 {
-                    return Forbid(new AuthenticationProperties(new Dictionary<string, string>
-                    {
-                        [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.LoginRequired,
-                        [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] = "The user is not logged in."
-                    }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+                    identity.AddClaim(new Claim(Claims.Subject, result.Principal.GetUserIdentifier()));
                 }
-
-                string GetRedirectUrl()
+                if (string.IsNullOrEmpty(result.Principal.FindFirst(Claims.Name)?.Value))
                 {
-                    // Override the prompt parameter to prevent infinite authentication/authorization loops.
-                    var parameters = Request.Query.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-                    parameters[Parameters.Prompt] = "continue";
-
-                    return Request.PathBase + Request.Path + QueryString.Create(parameters);
+                    identity.AddClaim(new Claim(Claims.Name, result.Principal.GetUserName()));
                 }
 
-                return Challenge(new AuthenticationProperties
+                identity.SetScopes(request.GetScopes());
+                identity.SetResources(await GetResourcesAsync(request.GetScopes()));
+
+                // Automatically create a permanent authorization to avoid requiring explicit consent
+                // for future authorization or token requests containing the same scopes.
+                var authorization = authorizations.LastOrDefault();
+                authorization ??= await _authorizationManager.CreateAsync(
+                    identity: identity,
+                    subject: identity.GetUserIdentifier(),
+                    client: await _applicationManager.GetIdAsync(application),
+                    type: AuthorizationTypes.Permanent,
+                    scopes: identity.GetScopes());
+
+                identity.SetAuthorizationId(await _authorizationManager.GetIdAsync(authorization));
+                identity.SetDestinations(GetDestinations);
+
+                return SignIn(new ClaimsPrincipal(identity), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+
+            case ConsentTypes.Explicit when request.HasPrompt(Prompts.None):
+                return Forbid(new AuthenticationProperties(new Dictionary<string, string>
+                {
+                    [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.ConsentRequired,
+                    [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] =
+                        "Interactive user consent is required."
+                }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+
+            default:
+                return View(new AuthorizeViewModel
                 {
-                    RedirectUri = GetRedirectUrl()
+                    ApplicationName = await _applicationManager.GetLocalizedDisplayNameAsync(application),
+                    RequestId = request.RequestId,
+                    Scope = request.Scope
                 });
-            }
         }
 
-        [ActionName(nameof(Authorize)), DisableCors]
-        [FormValueRequired("submit.Accept"), HttpPost]
-        public async Task<IActionResult> AuthorizeAccept()
+        IActionResult RedirectToLoginPage(OpenIddictRequest request)
         {
-            // Warning: unlike the main Authorize method, this method MUST NOT be decorated with
-            // [IgnoreAntiforgeryToken] as we must be able to reject authorization requests
-            // sent by a malicious client that could abuse this interactive endpoint to silently
-            // get codes/tokens without the user explicitly approving the authorization demand.
-
-            var response = HttpContext.GetOpenIddictServerResponse();
-            if (response != null)
+            // If the client application requested promptless authentication,
+            // return an error indicating that the user is not logged in.
+            if (request.HasPrompt(Prompts.None))
             {
-                return View("Error", new ErrorViewModel
+                return Forbid(new AuthenticationProperties(new Dictionary<string, string>
                 {
-                    Error = response.Error,
-                    ErrorDescription = response.ErrorDescription
-                });
+                    [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.LoginRequired,
+                    [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] = "The user is not logged in."
+                }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
             }
 
-            var request = HttpContext.GetOpenIddictServerRequest();
-            if (request == null)
+            string GetRedirectUrl()
             {
-                return NotFound();
+                // Override the prompt parameter to prevent infinite authentication/authorization loops.
+                var parameters = Request.Query.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+                parameters[Parameters.Prompt] = "continue";
+
+                return Request.PathBase + Request.Path + QueryString.Create(parameters);
             }
 
-            var application = await _applicationManager.FindByClientIdAsync(request.ClientId)
-                ?? throw new InvalidOperationException("The application details cannot be found.");
+            return Challenge(new AuthenticationProperties
+            {
+                RedirectUri = GetRedirectUrl()
+            });
+        }
+    }
 
-            var authorizations = await _authorizationManager.FindAsync(
-                subject: User.GetUserIdentifier(),
-                client: await _applicationManager.GetIdAsync(application),
-                status: Statuses.Valid,
-                type: AuthorizationTypes.Permanent,
-                scopes: request.GetScopes()).ToListAsync();
+    [ActionName(nameof(Authorize)), DisableCors]
+    [FormValueRequired("submit.Accept"), HttpPost]
+    public async Task<IActionResult> AuthorizeAccept()
+    {
+        // Warning: unlike the main Authorize method, this method MUST NOT be decorated with
+        // [IgnoreAntiforgeryToken] as we must be able to reject authorization requests
+        // sent by a malicious client that could abuse this interactive endpoint to silently
+        // get codes/tokens without the user explicitly approving the authorization demand.
 
-            // Note: the same check is already made in the GET action but is repeated
-            // here to ensure a malicious user can't abuse this POST endpoint and
-            // force it to return a valid response without the external authorization.
-            switch (await _applicationManager.GetConsentTypeAsync(application))
+        var response = HttpContext.GetOpenIddictServerResponse();
+        if (response != null)
+        {
+            return View("Error", new ErrorViewModel
             {
-                case ConsentTypes.External when authorizations.Count == 0:
-                    return Forbid(new AuthenticationProperties(new Dictionary<string, string>
-                    {
-                        [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.ConsentRequired,
-                        [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] =
-                            "The logged in user is not allowed to access this client application."
-                    }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
-
-                default:
-                    var identity = new ClaimsIdentity(User.Claims, OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
-                    identity.AddClaim(new Claim(OpenIdConstants.Claims.EntityType, OpenIdConstants.EntityTypes.User));
-
-                    // Note: while ASP.NET Core Identity uses the legacy WS-Federation claims (exposed by the ClaimTypes class),
-                    // OpenIddict uses the newer JWT claims defined by the OpenID Connect specification. To ensure the mandatory
-                    // subject claim is correctly populated (and avoid an InvalidOperationException), it's manually added here.
-                    if (string.IsNullOrEmpty(User.FindFirst(Claims.Subject)?.Value))
-                    {
-                        identity.AddClaim(new Claim(Claims.Subject, User.GetUserIdentifier()));
-                    }
-                    if (string.IsNullOrEmpty(User.FindFirst(Claims.Name)?.Value))
-                    {
-                        identity.AddClaim(new Claim(Claims.Name, User.GetUserName()));
-                    }
-
-                    identity.SetScopes(request.GetScopes());
-                    identity.SetResources(await GetResourcesAsync(request.GetScopes()));
-
-                    // Automatically create a permanent authorization to avoid requiring explicit consent
-                    // for future authorization or token requests containing the same scopes.
-                    var authorization = authorizations.LastOrDefault();
-                    authorization ??= await _authorizationManager.CreateAsync(
-                        identity: identity,
-                        subject: identity.GetUserIdentifier(),
-                        client: await _applicationManager.GetIdAsync(application),
-                        type: AuthorizationTypes.Permanent,
-                        scopes: identity.GetScopes());
-
-                    identity.SetAuthorizationId(await _authorizationManager.GetIdAsync(authorization));
-                    identity.SetDestinations(GetDestinations);
-
-                    return SignIn(new ClaimsPrincipal(identity), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
-            }
+                Error = response.Error,
+                ErrorDescription = response.ErrorDescription
+            });
         }
 
-        [ActionName(nameof(Authorize)), DisableCors]
-        [FormValueRequired("submit.Deny"), HttpPost]
-        public IActionResult AuthorizeDeny()
+        var request = HttpContext.GetOpenIddictServerRequest();
+        if (request == null)
         {
-            var response = HttpContext.GetOpenIddictServerResponse();
-            if (response != null)
-            {
-                return View("Error", new ErrorViewModel
-                {
-                    Error = response.Error,
-                    ErrorDescription = response.ErrorDescription
-                });
-            }
+            return NotFound();
+        }
 
-            var request = HttpContext.GetOpenIddictServerRequest();
-            if (request == null)
-            {
-                return NotFound();
-            }
+        var application = await _applicationManager.FindByClientIdAsync(request.ClientId)
+            ?? throw new InvalidOperationException("The application details cannot be found.");
 
-            return Forbid(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
-        }
+        var authorizations = await _authorizationManager.FindAsync(
+            subject: User.GetUserIdentifier(),
+            client: await _applicationManager.GetIdAsync(application),
+            status: Statuses.Valid,
+            type: AuthorizationTypes.Permanent,
+            scopes: request.GetScopes()).ToListAsync();
 
-        [AllowAnonymous, DisableCors, HttpGet, HttpPost, IgnoreAntiforgeryToken]
-        public async Task<IActionResult> Logout()
+        // Note: the same check is already made in the GET action but is repeated
+        // here to ensure a malicious user can't abuse this POST endpoint and
+        // force it to return a valid response without the external authorization.
+        switch (await _applicationManager.GetConsentTypeAsync(application))
         {
-            var response = HttpContext.GetOpenIddictServerResponse();
-            if (response != null)
-            {
-                return View("Error", new ErrorViewModel
+            case ConsentTypes.External when authorizations.Count == 0:
+                return Forbid(new AuthenticationProperties(new Dictionary<string, string>
                 {
-                    Error = response.Error,
-                    ErrorDescription = response.ErrorDescription
-                });
-            }
+                    [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.ConsentRequired,
+                    [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] =
+                        "The logged in user is not allowed to access this client application."
+                }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
 
-            var request = HttpContext.GetOpenIddictServerRequest();
-            if (request == null)
-            {
-                return NotFound();
-            }
+            default:
+                var identity = new ClaimsIdentity(User.Claims, OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+                identity.AddClaim(new Claim(OpenIdConstants.Claims.EntityType, OpenIdConstants.EntityTypes.User));
 
-            if (!string.IsNullOrEmpty(request.PostLogoutRedirectUri))
-            {
-                // If the user is not logged in, allow redirecting the user agent back to the
-                // specified post_logout_redirect_uri without rendering a confirmation form.
-                var result = await HttpContext.AuthenticateAsync();
-                if (result == null || !result.Succeeded)
+                // Note: while ASP.NET Core Identity uses the legacy WS-Federation claims (exposed by the ClaimTypes class),
+                // OpenIddict uses the newer JWT claims defined by the OpenID Connect specification. To ensure the mandatory
+                // subject claim is correctly populated (and avoid an InvalidOperationException), it's manually added here.
+                if (string.IsNullOrEmpty(User.FindFirst(Claims.Subject)?.Value))
                 {
-                    return SignOut(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+                    identity.AddClaim(new Claim(Claims.Subject, User.GetUserIdentifier()));
+                }
+                if (string.IsNullOrEmpty(User.FindFirst(Claims.Name)?.Value))
+                {
+                    identity.AddClaim(new Claim(Claims.Name, User.GetUserName()));
                 }
-            }
 
-            return View(new LogoutViewModel
-            {
-                RequestId = request.RequestId
-            });
+                identity.SetScopes(request.GetScopes());
+                identity.SetResources(await GetResourcesAsync(request.GetScopes()));
+
+                // Automatically create a permanent authorization to avoid requiring explicit consent
+                // for future authorization or token requests containing the same scopes.
+                var authorization = authorizations.LastOrDefault();
+                authorization ??= await _authorizationManager.CreateAsync(
+                    identity: identity,
+                    subject: identity.GetUserIdentifier(),
+                    client: await _applicationManager.GetIdAsync(application),
+                    type: AuthorizationTypes.Permanent,
+                    scopes: identity.GetScopes());
+
+                identity.SetAuthorizationId(await _authorizationManager.GetIdAsync(authorization));
+                identity.SetDestinations(GetDestinations);
+
+                return SignIn(new ClaimsPrincipal(identity), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
         }
+    }
 
-        [ActionName(nameof(Logout)), AllowAnonymous, DisableCors]
-        [FormValueRequired("submit.Accept"), HttpPost]
-        public async Task<IActionResult> LogoutAccept()
+    [ActionName(nameof(Authorize)), DisableCors]
+    [FormValueRequired("submit.Deny"), HttpPost]
+    public IActionResult AuthorizeDeny()
+    {
+        var response = HttpContext.GetOpenIddictServerResponse();
+        if (response != null)
         {
-            var response = HttpContext.GetOpenIddictServerResponse();
-            if (response != null)
-            {
-                return View("Error", new ErrorViewModel
-                {
-                    Error = response.Error,
-                    ErrorDescription = response.ErrorDescription
-                });
-            }
-
-            var request = HttpContext.GetOpenIddictServerRequest();
-            if (request == null)
+            return View("Error", new ErrorViewModel
             {
-                return NotFound();
-            }
+                Error = response.Error,
+                ErrorDescription = response.ErrorDescription
+            });
+        }
 
-            // Warning: unlike the main Logout method, this method MUST NOT be decorated with
-            // [IgnoreAntiforgeryToken] as we must be able to reject end session requests
-            // sent by a malicious client that could abuse this interactive endpoint to silently
-            // log the user out without the user explicitly approving the log out operation.
+        var request = HttpContext.GetOpenIddictServerRequest();
+        if (request == null)
+        {
+            return NotFound();
+        }
 
-            await HttpContext.SignOutAsync();
+        return Forbid(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+    }
 
-            // If no post_logout_redirect_uri was specified, redirect the user agent
-            // to the root page, that should correspond to the home page in most cases.
-            if (string.IsNullOrEmpty(request.PostLogoutRedirectUri))
+    [AllowAnonymous, DisableCors, HttpGet, HttpPost, IgnoreAntiforgeryToken]
+    public async Task<IActionResult> Logout()
+    {
+        var response = HttpContext.GetOpenIddictServerResponse();
+        if (response != null)
+        {
+            return View("Error", new ErrorViewModel
             {
-                return Redirect("~/");
-            }
+                Error = response.Error,
+                ErrorDescription = response.ErrorDescription
+            });
+        }
 
-            return SignOut(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+        var request = HttpContext.GetOpenIddictServerRequest();
+        if (request == null)
+        {
+            return NotFound();
         }
 
-        [ActionName(nameof(Logout)), AllowAnonymous, DisableCors]
-        [FormValueRequired("submit.Deny"), HttpPost]
-        public IActionResult LogoutDeny()
+        if (!string.IsNullOrEmpty(request.PostLogoutRedirectUri))
         {
-            var response = HttpContext.GetOpenIddictServerResponse();
-            if (response != null)
+            // If the user is not logged in, allow redirecting the user agent back to the
+            // specified post_logout_redirect_uri without rendering a confirmation form.
+            var result = await HttpContext.AuthenticateAsync();
+            if (result == null || !result.Succeeded)
             {
-                return View("Error", new ErrorViewModel
-                {
-                    Error = response.Error,
-                    ErrorDescription = response.ErrorDescription
-                });
+                return SignOut(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
             }
+        }
 
-            var request = HttpContext.GetOpenIddictServerRequest();
-            if (request == null)
+        return View(new LogoutViewModel
+        {
+            RequestId = request.RequestId
+        });
+    }
+
+    [ActionName(nameof(Logout)), AllowAnonymous, DisableCors]
+    [FormValueRequired("submit.Accept"), HttpPost]
+    public async Task<IActionResult> LogoutAccept()
+    {
+        var response = HttpContext.GetOpenIddictServerResponse();
+        if (response != null)
+        {
+            return View("Error", new ErrorViewModel
             {
-                return NotFound();
-            }
+                Error = response.Error,
+                ErrorDescription = response.ErrorDescription
+            });
+        }
 
-            return Redirect("~/");
+        var request = HttpContext.GetOpenIddictServerRequest();
+        if (request == null)
+        {
+            return NotFound();
         }
 
-        [AllowAnonymous, HttpPost]
-        [IgnoreAntiforgeryToken]
-        [Produces("application/json")]
-        public Task<IActionResult> Token()
+        // Warning: unlike the main Logout method, this method MUST NOT be decorated with
+        // [IgnoreAntiforgeryToken] as we must be able to reject end session requests
+        // sent by a malicious client that could abuse this interactive endpoint to silently
+        // log the user out without the user explicitly approving the log out operation.
+
+        await HttpContext.SignOutAsync();
+
+        // If no post_logout_redirect_uri was specified, redirect the user agent
+        // to the root page, that should correspond to the home page in most cases.
+        if (string.IsNullOrEmpty(request.PostLogoutRedirectUri))
         {
-            // Warning: this action is decorated with IgnoreAntiforgeryTokenAttribute to override
-            // the global antiforgery token validation policy applied by the MVC modules stack,
-            // which is required for this stateless OAuth2/OIDC token endpoint to work correctly.
-            // To prevent effective CSRF/session fixation attacks, this action MUST NOT return
-            // an authentication cookie or try to establish an ASP.NET Core user session.
+            return Redirect("~/");
+        }
 
-            var request = HttpContext.GetOpenIddictServerRequest();
-            if (request == null)
-            {
-                return Task.FromResult((IActionResult)NotFound());
-            }
+        return SignOut(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+    }
 
-            if (request.IsPasswordGrantType())
+    [ActionName(nameof(Logout)), AllowAnonymous, DisableCors]
+    [FormValueRequired("submit.Deny"), HttpPost]
+    public IActionResult LogoutDeny()
+    {
+        var response = HttpContext.GetOpenIddictServerResponse();
+        if (response != null)
+        {
+            return View("Error", new ErrorViewModel
             {
-                return ExchangePasswordGrantType(request);
-            }
+                Error = response.Error,
+                ErrorDescription = response.ErrorDescription
+            });
+        }
 
-            if (request.IsClientCredentialsGrantType())
-            {
-                return ExchangeClientCredentialsGrantType(request);
-            }
+        var request = HttpContext.GetOpenIddictServerRequest();
+        if (request == null)
+        {
+            return NotFound();
+        }
 
-            if (request.IsAuthorizationCodeGrantType() || request.IsRefreshTokenGrantType())
-            {
-                return ExchangeAuthorizationCodeOrRefreshTokenGrantType(request);
-            }
+        return Redirect("~/");
+    }
+
+    [AllowAnonymous, HttpPost]
+    [IgnoreAntiforgeryToken]
+    [Produces("application/json")]
+    public Task<IActionResult> Token()
+    {
+        // Warning: this action is decorated with IgnoreAntiforgeryTokenAttribute to override
+        // the global antiforgery token validation policy applied by the MVC modules stack,
+        // which is required for this stateless OAuth2/OIDC token endpoint to work correctly.
+        // To prevent effective CSRF/session fixation attacks, this action MUST NOT return
+        // an authentication cookie or try to establish an ASP.NET Core user session.
+
+        var request = HttpContext.GetOpenIddictServerRequest();
+        if (request == null)
+        {
+            return Task.FromResult((IActionResult)NotFound());
+        }
+
+        if (request.IsPasswordGrantType())
+        {
+            return ExchangePasswordGrantType(request);
+        }
+
+        if (request.IsClientCredentialsGrantType())
+        {
+            return ExchangeClientCredentialsGrantType(request);
+        }
 
-            throw new NotSupportedException("The specified grant type is not supported.");
+        if (request.IsAuthorizationCodeGrantType() || request.IsRefreshTokenGrantType())
+        {
+            return ExchangeAuthorizationCodeOrRefreshTokenGrantType(request);
         }
 
-        private async Task<IActionResult> ExchangeClientCredentialsGrantType(OpenIddictRequest request)
+        throw new NotSupportedException("The specified grant type is not supported.");
+    }
+
+    private async Task<IActionResult> ExchangeClientCredentialsGrantType(OpenIddictRequest request)
+    {
+        if (request.HasScope(Scopes.OfflineAccess))
         {
-            if (request.HasScope(Scopes.OfflineAccess))
+            return Forbid(new AuthenticationProperties(new Dictionary<string, string>
             {
-                return Forbid(new AuthenticationProperties(new Dictionary<string, string>
-                {
-                    [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.InvalidScope,
-                    [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] =
-                        "The 'offline_access' scope is not allowed when using the client credentials grant."
-                }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
-            }
+                [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.InvalidScope,
+                [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] =
+                    "The 'offline_access' scope is not allowed when using the client credentials grant."
+            }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+        }
 
-            // Note: client authentication is always enforced by OpenIddict before this action is invoked.
-            var application = await _applicationManager.FindByClientIdAsync(request.ClientId) ??
-                throw new InvalidOperationException("The application details cannot be found.");
+        // Note: client authentication is always enforced by OpenIddict before this action is invoked.
+        var application = await _applicationManager.FindByClientIdAsync(request.ClientId) ??
+            throw new InvalidOperationException("The application details cannot be found.");
 
-            var identity = new ClaimsIdentity(
-                OpenIddictServerAspNetCoreDefaults.AuthenticationScheme,
-                Claims.Name, Claims.Role);
+        var identity = new ClaimsIdentity(
+            OpenIddictServerAspNetCoreDefaults.AuthenticationScheme,
+            Claims.Name, Claims.Role);
 
-            identity.AddClaim(new Claim(OpenIdConstants.Claims.EntityType, OpenIdConstants.EntityTypes.Application));
-            identity.AddClaim(new Claim(Claims.Subject, request.ClientId));
+        identity.AddClaim(new Claim(OpenIdConstants.Claims.EntityType, OpenIdConstants.EntityTypes.Application));
+        identity.AddClaim(new Claim(Claims.Subject, request.ClientId));
 
-            // Always add a "name" claim for grant_type=client_credentials in both
-            // access and identity tokens even if the "name" scope wasn't requested.
-            identity.AddClaim(new Claim(Claims.Name, await _applicationManager.GetDisplayNameAsync(application))
-                .SetDestinations(Destinations.AccessToken, Destinations.IdentityToken));
+        // Always add a "name" claim for grant_type=client_credentials in both
+        // access and identity tokens even if the "name" scope wasn't requested.
+        identity.AddClaim(new Claim(Claims.Name, await _applicationManager.GetDisplayNameAsync(application))
+            .SetDestinations(Destinations.AccessToken, Destinations.IdentityToken));
 
-            // If the role service is available, add all the role claims
-            // associated with the application roles in the database.
-            var roleService = HttpContext.RequestServices.GetService<IRoleService>();
+        // If the role service is available, add all the role claims
+        // associated with the application roles in the database.
+        var roleService = HttpContext.RequestServices.GetService<IRoleService>();
 
-            foreach (var role in await _applicationManager.GetRolesAsync(application))
-            {
-                // Since the claims added in this block have a dynamic name, directly set the destinations
-                // here instead of relying on the GetDestination() helper that only works with static claims.
+        foreach (var role in await _applicationManager.GetRolesAsync(application))
+        {
+            // Since the claims added in this block have a dynamic name, directly set the destinations
+            // here instead of relying on the GetDestination() helper that only works with static claims.
 
-                identity.AddClaim(new Claim(identity.RoleClaimType, role)
-                    .SetDestinations(Destinations.AccessToken, Destinations.IdentityToken));
+            identity.AddClaim(new Claim(identity.RoleClaimType, role)
+                .SetDestinations(Destinations.AccessToken, Destinations.IdentityToken));
 
-                if (roleService != null)
+            if (roleService != null)
+            {
+                foreach (var claim in await roleService.GetRoleClaimsAsync(role))
                 {
-                    foreach (var claim in await roleService.GetRoleClaimsAsync(role))
-                    {
-                        identity.AddClaim(claim.SetDestinations(Destinations.AccessToken, Destinations.IdentityToken));
-                    }
+                    identity.AddClaim(claim.SetDestinations(Destinations.AccessToken, Destinations.IdentityToken));
                 }
             }
+        }
 
-            identity.SetScopes(request.GetScopes());
-            identity.SetResources(await GetResourcesAsync(request.GetScopes()));
-            identity.SetDestinations(GetDestinations);
+        identity.SetScopes(request.GetScopes());
+        identity.SetResources(await GetResourcesAsync(request.GetScopes()));
+        identity.SetDestinations(GetDestinations);
 
-            return SignIn(new ClaimsPrincipal(identity), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
-        }
+        return SignIn(new ClaimsPrincipal(identity), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+    }
 
-        private async Task<IActionResult> ExchangePasswordGrantType(OpenIddictRequest request)
-        {
-            var application = await _applicationManager.FindByClientIdAsync(request.ClientId) ??
-                throw new InvalidOperationException("The application details cannot be found.");
+    private async Task<IActionResult> ExchangePasswordGrantType(OpenIddictRequest request)
+    {
+        var application = await _applicationManager.FindByClientIdAsync(request.ClientId) ??
+            throw new InvalidOperationException("The application details cannot be found.");
 
-            // By design, the password flow requires direct username/password validation, which is performed by
-            // the user service. If this service is not registered, prevent the password flow from being used.
-            var service = HttpContext.RequestServices.GetService<IUserService>();
-            if (service == null)
+        // By design, the password flow requires direct username/password validation, which is performed by
+        // the user service. If this service is not registered, prevent the password flow from being used.
+        var service = HttpContext.RequestServices.GetService<IUserService>();
+        if (service == null)
+        {
+            return Forbid(new AuthenticationProperties(new Dictionary<string, string>
             {
-                return Forbid(new AuthenticationProperties(new Dictionary<string, string>
-                {
-                    [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.UnsupportedGrantType,
-                    [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] =
-                        "The resource owner password credentials grant is not supported."
-                }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
-            }
+                [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.UnsupportedGrantType,
+                [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] =
+                    "The resource owner password credentials grant is not supported."
+            }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+        }
 
-            string error = null;
-            var user = await service.AuthenticateAsync(request.Username, request.Password, (key, message) => error = message);
-            if (user == null)
+        string error = null;
+        var user = await service.AuthenticateAsync(request.Username, request.Password, (key, message) => error = message);
+        if (user == null)
+        {
+            return Forbid(new AuthenticationProperties(new Dictionary<string, string>
             {
+                [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.InvalidGrant,
+                [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] = error
+            }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+        }
+
+        var principal = await service.CreatePrincipalAsync(user);
+
+        var authorizations = await _authorizationManager.FindAsync(
+            subject: principal.GetUserIdentifier(),
+            client: await _applicationManager.GetIdAsync(application),
+            status: Statuses.Valid,
+            type: AuthorizationTypes.Permanent,
+            scopes: request.GetScopes()).ToListAsync();
+
+        // If the application is configured to use external consent,
+        // reject the request if no existing authorization can be found.
+        switch (await _applicationManager.GetConsentTypeAsync(application))
+        {
+            case ConsentTypes.External when authorizations.Count == 0:
                 return Forbid(new AuthenticationProperties(new Dictionary<string, string>
                 {
-                    [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.InvalidGrant,
-                    [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] = error
+                    [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.ConsentRequired,
+                    [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] =
+                        "The logged in user is not allowed to access this client application."
                 }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
-            }
-
-            var principal = await service.CreatePrincipalAsync(user);
+        }
 
-            var authorizations = await _authorizationManager.FindAsync(
-                subject: principal.GetUserIdentifier(),
-                client: await _applicationManager.GetIdAsync(application),
-                status: Statuses.Valid,
-                type: AuthorizationTypes.Permanent,
-                scopes: request.GetScopes()).ToListAsync();
+        var identity = (ClaimsIdentity)principal.Identity;
+        identity.AddClaim(new Claim(OpenIdConstants.Claims.EntityType, OpenIdConstants.EntityTypes.User));
 
-            // If the application is configured to use external consent,
-            // reject the request if no existing authorization can be found.
-            switch (await _applicationManager.GetConsentTypeAsync(application))
-            {
-                case ConsentTypes.External when authorizations.Count == 0:
-                    return Forbid(new AuthenticationProperties(new Dictionary<string, string>
-                    {
-                        [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.ConsentRequired,
-                        [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] =
-                            "The logged in user is not allowed to access this client application."
-                    }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
-            }
-
-            var identity = (ClaimsIdentity)principal.Identity;
-            identity.AddClaim(new Claim(OpenIdConstants.Claims.EntityType, OpenIdConstants.EntityTypes.User));
+        // Note: while ASP.NET Core Identity uses the legacy WS-Federation claims (exposed by the ClaimTypes class),
+        // OpenIddict uses the newer JWT claims defined by the OpenID Connect specification. To ensure the mandatory
+        // subject claim is correctly populated (and avoid an InvalidOperationException), it's manually added here.
+        if (string.IsNullOrEmpty(principal.FindFirst(Claims.Subject)?.Value))
+        {
+            identity.AddClaim(new Claim(Claims.Subject, principal.GetUserIdentifier()));
+        }
+        if (string.IsNullOrEmpty(principal.FindFirst(Claims.Name)?.Value))
+        {
+            identity.AddClaim(new Claim(Claims.Name, principal.GetUserName()));
+        }
 
-            // Note: while ASP.NET Core Identity uses the legacy WS-Federation claims (exposed by the ClaimTypes class),
-            // OpenIddict uses the newer JWT claims defined by the OpenID Connect specification. To ensure the mandatory
-            // subject claim is correctly populated (and avoid an InvalidOperationException), it's manually added here.
-            if (string.IsNullOrEmpty(principal.FindFirst(Claims.Subject)?.Value))
-            {
-                identity.AddClaim(new Claim(Claims.Subject, principal.GetUserIdentifier()));
-            }
-            if (string.IsNullOrEmpty(principal.FindFirst(Claims.Name)?.Value))
-            {
-                identity.AddClaim(new Claim(Claims.Name, principal.GetUserName()));
-            }
+        identity.SetScopes(request.GetScopes());
+        identity.SetResources(await GetResourcesAsync(request.GetScopes()));
 
-            identity.SetScopes(request.GetScopes());
-            identity.SetResources(await GetResourcesAsync(request.GetScopes()));
+        // Automatically create a permanent authorization to avoid requiring explicit consent
+        // for future authorization or token requests containing the same scopes.
+        var authorization = authorizations.FirstOrDefault();
+        authorization ??= await _authorizationManager.CreateAsync(
+            identity: identity,
+            subject: identity.GetUserIdentifier(),
+            client: await _applicationManager.GetIdAsync(application),
+            type: AuthorizationTypes.Permanent,
+            scopes: identity.GetScopes());
 
-            // Automatically create a permanent authorization to avoid requiring explicit consent
-            // for future authorization or token requests containing the same scopes.
-            var authorization = authorizations.FirstOrDefault();
-            authorization ??= await _authorizationManager.CreateAsync(
-                identity: identity,
-                subject: identity.GetUserIdentifier(),
-                client: await _applicationManager.GetIdAsync(application),
-                type: AuthorizationTypes.Permanent,
-                scopes: identity.GetScopes());
+        identity.SetAuthorizationId(await _authorizationManager.GetIdAsync(authorization));
+        identity.SetDestinations(GetDestinations);
 
-            identity.SetAuthorizationId(await _authorizationManager.GetIdAsync(authorization));
-            identity.SetDestinations(GetDestinations);
+        return SignIn(principal, OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+    }
 
-            return SignIn(principal, OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
-        }
+    private async Task<IActionResult> ExchangeAuthorizationCodeOrRefreshTokenGrantType(OpenIddictRequest request)
+    {
+        // Retrieve the claims principal stored in the authorization code/refresh token.
+        var info = await HttpContext.AuthenticateAsync(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme) ??
+            throw new InvalidOperationException("The user principal cannot be resolved.");
 
-        private async Task<IActionResult> ExchangeAuthorizationCodeOrRefreshTokenGrantType(OpenIddictRequest request)
+        if (request.IsRefreshTokenGrantType())
         {
-            // Retrieve the claims principal stored in the authorization code/refresh token.
-            var info = await HttpContext.AuthenticateAsync(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme) ??
-                throw new InvalidOperationException("The user principal cannot be resolved.");
-
-            if (request.IsRefreshTokenGrantType())
+            var type = info.Principal.FindFirst(OpenIdConstants.Claims.EntityType)?.Value;
+            if (!string.Equals(type, OpenIdConstants.EntityTypes.User, StringComparison.Ordinal))
             {
-                var type = info.Principal.FindFirst(OpenIdConstants.Claims.EntityType)?.Value;
-                if (!string.Equals(type, OpenIdConstants.EntityTypes.User, StringComparison.Ordinal))
+                return Forbid(new AuthenticationProperties(new Dictionary<string, string>
                 {
-                    return Forbid(new AuthenticationProperties(new Dictionary<string, string>
-                    {
-                        [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.UnauthorizedClient,
-                        [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] =
-                            "The refresh token grant type is not allowed for refresh tokens retrieved using the client credentials flow."
-                    }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
-                }
+                    [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.UnauthorizedClient,
+                    [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] =
+                        "The refresh token grant type is not allowed for refresh tokens retrieved using the client credentials flow."
+                }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
             }
+        }
 
-            // By default, re-use the principal stored in the authorization code/refresh token.
-            var principal = info.Principal;
+        // By default, re-use the principal stored in the authorization code/refresh token.
+        var principal = info.Principal;
 
-            // If the user service is available, try to refresh the principal by retrieving
-            // the user object from the database and creating a new claims-based principal.
-            var service = HttpContext.RequestServices.GetService<IUserService>();
-            if (service != null)
+        // If the user service is available, try to refresh the principal by retrieving
+        // the user object from the database and creating a new claims-based principal.
+        var service = HttpContext.RequestServices.GetService<IUserService>();
+        if (service != null)
+        {
+            var user = await service.GetUserByUniqueIdAsync(principal.GetUserIdentifier());
+            if (user != null)
             {
-                var user = await service.GetUserByUniqueIdAsync(principal.GetUserIdentifier());
-                if (user != null)
-                {
-                    principal = await service.CreatePrincipalAsync(user);
-                    // Copy the granted scopes and resources from the original authorization code/refresh token principal
-                    principal.SetScopes(info.Principal.GetScopes());
-                    principal.SetResources(await GetResourcesAsync(info.Principal.GetScopes()));
-                }
+                principal = await service.CreatePrincipalAsync(user);
+                // Copy the granted scopes and resources from the original authorization code/refresh token principal
+                principal.SetScopes(info.Principal.GetScopes());
+                principal.SetResources(await GetResourcesAsync(info.Principal.GetScopes()));
             }
+        }
 
-            var identity = (ClaimsIdentity)principal.Identity;
-            identity.AddClaim(new Claim(OpenIdConstants.Claims.EntityType, OpenIdConstants.EntityTypes.User));
+        var identity = (ClaimsIdentity)principal.Identity;
+        identity.AddClaim(new Claim(OpenIdConstants.Claims.EntityType, OpenIdConstants.EntityTypes.User));
 
-            // Note: while ASP.NET Core Identity uses the legacy WS-Federation claims (exposed by the ClaimTypes class),
-            // OpenIddict uses the newer JWT claims defined by the OpenID Connect specification. To ensure the mandatory
-            // subject claim is correctly populated (and avoid an InvalidOperationException), it's manually added here.
-            if (string.IsNullOrEmpty(principal.FindFirst(Claims.Subject)?.Value))
-            {
-                identity.AddClaim(new Claim(Claims.Subject, principal.GetUserIdentifier()));
-            }
-            if (string.IsNullOrEmpty(principal.FindFirst(Claims.Name)?.Value))
-            {
-                identity.AddClaim(new Claim(Claims.Name, principal.GetUserName()));
-            }
+        // Note: while ASP.NET Core Identity uses the legacy WS-Federation claims (exposed by the ClaimTypes class),
+        // OpenIddict uses the newer JWT claims defined by the OpenID Connect specification. To ensure the mandatory
+        // subject claim is correctly populated (and avoid an InvalidOperationException), it's manually added here.
+        if (string.IsNullOrEmpty(principal.FindFirst(Claims.Subject)?.Value))
+        {
+            identity.AddClaim(new Claim(Claims.Subject, principal.GetUserIdentifier()));
+        }
+        if (string.IsNullOrEmpty(principal.FindFirst(Claims.Name)?.Value))
+        {
+            identity.AddClaim(new Claim(Claims.Name, principal.GetUserName()));
+        }
 
-            identity.SetDestinations(GetDestinations);
+        identity.SetDestinations(GetDestinations);
 
-            return SignIn(principal, OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
-        }
+        return SignIn(principal, OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+    }
+
+    private static IEnumerable<string> GetDestinations(Claim claim)
+    {
+        // Note: by default, claims are NOT automatically included in the access and identity tokens.
+        // To allow OpenIddict to serialize them, you must attach them a destination, that specifies
+        // whether they should be included in access tokens, in identity tokens or in both.
 
-        private static IEnumerable<string> GetDestinations(Claim claim)
+        switch (claim.Type)
         {
-            // Note: by default, claims are NOT automatically included in the access and identity tokens.
-            // To allow OpenIddict to serialize them, you must attach them a destination, that specifies
-            // whether they should be included in access tokens, in identity tokens or in both.
+            // If the claim already includes destinations (set before this helper is called), flow them as-is.
+            case string when claim.GetDestinations() is { IsDefaultOrEmpty: false } destinations:
+                return destinations;
+
+            // Never include the security stamp in the access and identity tokens, as it's a secret value.
+            case "AspNet.Identity.SecurityStamp":
+                return [];
+
+            // Only add the claim to the id_token if the corresponding scope was granted.
+            // The other claims will only be added to the access_token.
+            case OpenIdConstants.Claims.EntityType:
+            case Claims.Name when claim.Subject.HasScope(Scopes.Profile):
+            case Claims.Email when claim.Subject.HasScope(Scopes.Email):
+            case Claims.Role when claim.Subject.HasScope(Scopes.Roles):
+                return new[]
+                {
+                    Destinations.AccessToken,
+                    Destinations.IdentityToken
+                };
 
-            switch (claim.Type)
-            {
-                // If the claim already includes destinations (set before this helper is called), flow them as-is.
-                case string when claim.GetDestinations() is { IsDefaultOrEmpty: false } destinations:
-                    return destinations;
-
-                // Never include the security stamp in the access and identity tokens, as it's a secret value.
-                case "AspNet.Identity.SecurityStamp":
-                    return [];
-
-                // Only add the claim to the id_token if the corresponding scope was granted.
-                // The other claims will only be added to the access_token.
-                case OpenIdConstants.Claims.EntityType:
-                case Claims.Name when claim.Subject.HasScope(Scopes.Profile):
-                case Claims.Email when claim.Subject.HasScope(Scopes.Email):
-                case Claims.Role when claim.Subject.HasScope(Scopes.Roles):
-                    return new[]
-                    {
-                        Destinations.AccessToken,
-                        Destinations.IdentityToken
-                    };
-
-                default: return new[] { Destinations.AccessToken };
-            }
+            default: return new[] { Destinations.AccessToken };
         }
+    }
 
-        private async Task<IEnumerable<string>> GetResourcesAsync(ImmutableArray<string> scopes)
+    private async Task<IEnumerable<string>> GetResourcesAsync(ImmutableArray<string> scopes)
+    {
+        // Note: the current tenant name is always added as a valid resource/audience,
+        // which allows the end user to use the corresponding tokens with the APIs
+        // located in the current tenant without having to explicitly register a scope.
+        var resources = new List<string>()
         {
-            // Note: the current tenant name is always added as a valid resource/audience,
-            // which allows the end user to use the corresponding tokens with the APIs
-            // located in the current tenant without having to explicitly register a scope.
-            var resources = new List<string>()
-            {
-                OpenIdConstants.Prefixes.Tenant + _shellSettings.Name
-            };
+            OpenIdConstants.Prefixes.Tenant + _shellSettings.Name
+        };
 
-            await foreach (var resource in _scopeManager.ListResourcesAsync(scopes))
-            {
-                resources.Add(resource);
-            }
-
-            return resources;
+        await foreach (var resource in _scopeManager.ListResourcesAsync(scopes))
+        {
+            resources.Add(resource);
         }
+
+        return resources;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/ApplicationController.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/ApplicationController.cs
index 0d02e2ba2ad..62b965ce821 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/ApplicationController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/ApplicationController.cs
@@ -22,381 +22,380 @@
 using OrchardCore.OpenId.ViewModels;
 using OrchardCore.Security.Services;
 
-namespace OrchardCore.OpenId.Controllers
+namespace OrchardCore.OpenId.Controllers;
+
+[Feature(OpenIdConstants.Features.Management)]
+[Admin("OpenId/Application/{action}/{id?}", "OpenIdApplication{action}")]
+public class ApplicationController : Controller
 {
-    [Feature(OpenIdConstants.Features.Management)]
-    [Admin("OpenId/Application/{action}/{id?}", "OpenIdApplication{action}")]
-    public class ApplicationController : Controller
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly PagerOptions _pagerOptions;
+    private readonly IOpenIdApplicationManager _applicationManager;
+    private readonly IOpenIdScopeManager _scopeManager;
+    private readonly INotifier _notifier;
+    private readonly ShellDescriptor _shellDescriptor;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public ApplicationController(
+        IShapeFactory shapeFactory,
+        IOptions<PagerOptions> pagerOptions,
+        IStringLocalizer<ApplicationController> stringLocalizer,
+        IAuthorizationService authorizationService,
+        IOpenIdApplicationManager applicationManager,
+        IOpenIdScopeManager scopeManager,
+        IHtmlLocalizer<ApplicationController> htmlLocalizer,
+        INotifier notifier,
+        ShellDescriptor shellDescriptor)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly PagerOptions _pagerOptions;
-        private readonly IOpenIdApplicationManager _applicationManager;
-        private readonly IOpenIdScopeManager _scopeManager;
-        private readonly INotifier _notifier;
-        private readonly ShellDescriptor _shellDescriptor;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public ApplicationController(
-            IShapeFactory shapeFactory,
-            IOptions<PagerOptions> pagerOptions,
-            IStringLocalizer<ApplicationController> stringLocalizer,
-            IAuthorizationService authorizationService,
-            IOpenIdApplicationManager applicationManager,
-            IOpenIdScopeManager scopeManager,
-            IHtmlLocalizer<ApplicationController> htmlLocalizer,
-            INotifier notifier,
-            ShellDescriptor shellDescriptor)
+        _shapeFactory = shapeFactory;
+        _pagerOptions = pagerOptions.Value;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+        _authorizationService = authorizationService;
+        _applicationManager = applicationManager;
+        _scopeManager = scopeManager;
+        _notifier = notifier;
+        _shellDescriptor = shellDescriptor;
+    }
+
+    [Admin("OpenId/Application", "OpenIdApplication")]
+    public async Task<ActionResult> Index(PagerParameters pagerParameters)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageApplications))
         {
-            _shapeFactory = shapeFactory;
-            _pagerOptions = pagerOptions.Value;
-            S = stringLocalizer;
-            H = htmlLocalizer;
-            _authorizationService = authorizationService;
-            _applicationManager = applicationManager;
-            _scopeManager = scopeManager;
-            _notifier = notifier;
-            _shellDescriptor = shellDescriptor;
+            return Forbid();
         }
 
-        [Admin("OpenId/Application", "OpenIdApplication")]
-        public async Task<ActionResult> Index(PagerParameters pagerParameters)
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+        var count = await _applicationManager.CountAsync();
+
+        var applications = new List<OpenIdApplicationEntry>();
+
+        await foreach (var application in _applicationManager.ListAsync(pager.PageSize, pager.GetStartIndex()))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageApplications))
+            applications.Add(new OpenIdApplicationEntry
             {
-                return Forbid();
-            }
+                DisplayName = await _applicationManager.GetDisplayNameAsync(application),
+                Id = await _applicationManager.GetPhysicalIdAsync(application)
+            });
+        }
 
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
-            var count = await _applicationManager.CountAsync();
+        var model = new OpenIdApplicationsIndexViewModel
+        {
+            Pager = await _shapeFactory.PagerAsync(pager, (int)count),
+            Applications = applications.OrderBy(x => x.DisplayName)
+            .ThenBy(x => x.Id)
+            .ToArray(),
+        };
 
-            var applications = new List<OpenIdApplicationEntry>();
+        return View(model);
+    }
 
-            await foreach (var application in _applicationManager.ListAsync(pager.PageSize, pager.GetStartIndex()))
+    [HttpGet]
+    public async Task<IActionResult> Create(string returnUrl = null)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageApplications))
+        {
+            return Forbid();
+        }
+
+        var model = new CreateOpenIdApplicationViewModel();
+
+        var roleService = HttpContext.RequestServices?.GetService<IRoleService>();
+        if (roleService != null)
+        {
+            foreach (var role in await roleService.GetRoleNamesAsync())
             {
-                applications.Add(new OpenIdApplicationEntry
+                model.RoleEntries.Add(new CreateOpenIdApplicationViewModel.RoleEntry
                 {
-                    DisplayName = await _applicationManager.GetDisplayNameAsync(application),
-                    Id = await _applicationManager.GetPhysicalIdAsync(application)
+                    Name = role
                 });
             }
-
-            var model = new OpenIdApplicationsIndexViewModel
-            {
-                Pager = await _shapeFactory.PagerAsync(pager, (int)count),
-                Applications = applications.OrderBy(x => x.DisplayName)
-                .ThenBy(x => x.Id)
-                .ToArray(),
-            };
-
-            return View(model);
+        }
+        else
+        {
+            await _notifier.WarningAsync(H["There are no registered services to provide roles."]);
         }
 
-        [HttpGet]
-        public async Task<IActionResult> Create(string returnUrl = null)
+        await foreach (var scope in _scopeManager.ListAsync(null, null, default))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageApplications))
+            model.ScopeEntries.Add(new CreateOpenIdApplicationViewModel.ScopeEntry
             {
-                return Forbid();
-            }
+                Name = await _scopeManager.GetNameAsync(scope)
+            });
+        }
 
-            var model = new CreateOpenIdApplicationViewModel();
+        ViewData[nameof(OpenIdServerSettings)] = await GetServerSettingsAsync();
+        ViewData["ReturnUrl"] = returnUrl;
+        return View(model);
+    }
 
-            var roleService = HttpContext.RequestServices?.GetService<IRoleService>();
-            if (roleService != null)
-            {
-                foreach (var role in await roleService.GetRoleNamesAsync())
-                {
-                    model.RoleEntries.Add(new CreateOpenIdApplicationViewModel.RoleEntry
-                    {
-                        Name = role
-                    });
-                }
-            }
-            else
-            {
-                await _notifier.WarningAsync(H["There are no registered services to provide roles."]);
-            }
+    [HttpPost]
+    public async Task<IActionResult> Create(CreateOpenIdApplicationViewModel model, string returnUrl = null)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageApplications))
+        {
+            return Forbid();
+        }
 
-            await foreach (var scope in _scopeManager.ListAsync(null, null, default))
-            {
-                model.ScopeEntries.Add(new CreateOpenIdApplicationViewModel.ScopeEntry
-                {
-                    Name = await _scopeManager.GetNameAsync(scope)
-                });
-            }
+        if (!string.IsNullOrEmpty(model.ClientSecret) &&
+             string.Equals(model.Type, OpenIddictConstants.ClientTypes.Public, StringComparison.OrdinalIgnoreCase))
+        {
+            ModelState.AddModelError(nameof(model.ClientSecret), S["No client secret can be set for public applications."]);
+        }
+        else if (string.IsNullOrEmpty(model.ClientSecret) &&
+                 string.Equals(model.Type, OpenIddictConstants.ClientTypes.Confidential, StringComparison.OrdinalIgnoreCase))
+        {
+            ModelState.AddModelError(nameof(model.ClientSecret), S["The client secret is required for confidential applications."]);
+        }
+
+        if (!string.IsNullOrEmpty(model.ClientId) && await _applicationManager.FindByClientIdAsync(model.ClientId) != null)
+        {
+            ModelState.AddModelError(nameof(model.ClientId), S["The client identifier is already taken by another application."]);
+        }
 
+        if (!ModelState.IsValid)
+        {
             ViewData[nameof(OpenIdServerSettings)] = await GetServerSettingsAsync();
             ViewData["ReturnUrl"] = returnUrl;
             return View(model);
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Create(CreateOpenIdApplicationViewModel model, string returnUrl = null)
+        var settings = new OpenIdApplicationSettings()
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageApplications))
-            {
-                return Forbid();
-            }
-
-            if (!string.IsNullOrEmpty(model.ClientSecret) &&
-                 string.Equals(model.Type, OpenIddictConstants.ClientTypes.Public, StringComparison.OrdinalIgnoreCase))
-            {
-                ModelState.AddModelError(nameof(model.ClientSecret), S["No client secret can be set for public applications."]);
-            }
-            else if (string.IsNullOrEmpty(model.ClientSecret) &&
-                     string.Equals(model.Type, OpenIddictConstants.ClientTypes.Confidential, StringComparison.OrdinalIgnoreCase))
-            {
-                ModelState.AddModelError(nameof(model.ClientSecret), S["The client secret is required for confidential applications."]);
-            }
-
-            if (!string.IsNullOrEmpty(model.ClientId) && await _applicationManager.FindByClientIdAsync(model.ClientId) != null)
-            {
-                ModelState.AddModelError(nameof(model.ClientId), S["The client identifier is already taken by another application."]);
-            }
-
-            if (!ModelState.IsValid)
-            {
-                ViewData[nameof(OpenIdServerSettings)] = await GetServerSettingsAsync();
-                ViewData["ReturnUrl"] = returnUrl;
-                return View(model);
-            }
+            AllowAuthorizationCodeFlow = model.AllowAuthorizationCodeFlow,
+            AllowClientCredentialsFlow = model.AllowClientCredentialsFlow,
+            AllowHybridFlow = model.AllowHybridFlow,
+            AllowImplicitFlow = model.AllowImplicitFlow,
+            AllowIntrospectionEndpoint = model.AllowIntrospectionEndpoint,
+            AllowLogoutEndpoint = model.AllowLogoutEndpoint,
+            AllowPasswordFlow = model.AllowPasswordFlow,
+            AllowRefreshTokenFlow = model.AllowRefreshTokenFlow,
+            AllowRevocationEndpoint = model.AllowRevocationEndpoint,
+            ClientId = model.ClientId,
+            ClientSecret = model.ClientSecret,
+            ConsentType = model.ConsentType,
+            DisplayName = model.DisplayName,
+            PostLogoutRedirectUris = model.PostLogoutRedirectUris,
+            RedirectUris = model.RedirectUris,
+            Roles = model.RoleEntries.Where(x => x.Selected).Select(x => x.Name).ToArray(),
+            Scopes = model.ScopeEntries.Where(x => x.Selected).Select(x => x.Name).ToArray(),
+            Type = model.Type,
+            RequireProofKeyForCodeExchange = model.RequireProofKeyForCodeExchange
+        };
+
+        await _applicationManager.UpdateDescriptorFromSettings(settings);
+
+        if (string.IsNullOrEmpty(returnUrl))
+        {
+            return RedirectToAction(nameof(Index));
+        }
 
-            var settings = new OpenIdApplicationSettings()
-            {
-                AllowAuthorizationCodeFlow = model.AllowAuthorizationCodeFlow,
-                AllowClientCredentialsFlow = model.AllowClientCredentialsFlow,
-                AllowHybridFlow = model.AllowHybridFlow,
-                AllowImplicitFlow = model.AllowImplicitFlow,
-                AllowIntrospectionEndpoint = model.AllowIntrospectionEndpoint,
-                AllowLogoutEndpoint = model.AllowLogoutEndpoint,
-                AllowPasswordFlow = model.AllowPasswordFlow,
-                AllowRefreshTokenFlow = model.AllowRefreshTokenFlow,
-                AllowRevocationEndpoint = model.AllowRevocationEndpoint,
-                ClientId = model.ClientId,
-                ClientSecret = model.ClientSecret,
-                ConsentType = model.ConsentType,
-                DisplayName = model.DisplayName,
-                PostLogoutRedirectUris = model.PostLogoutRedirectUris,
-                RedirectUris = model.RedirectUris,
-                Roles = model.RoleEntries.Where(x => x.Selected).Select(x => x.Name).ToArray(),
-                Scopes = model.ScopeEntries.Where(x => x.Selected).Select(x => x.Name).ToArray(),
-                Type = model.Type,
-                RequireProofKeyForCodeExchange = model.RequireProofKeyForCodeExchange
-            };
-
-            await _applicationManager.UpdateDescriptorFromSettings(settings);
-
-            if (string.IsNullOrEmpty(returnUrl))
-            {
-                return RedirectToAction(nameof(Index));
-            }
+        return this.LocalRedirect(returnUrl, true);
+    }
 
-            return this.LocalRedirect(returnUrl, true);
+    public async Task<IActionResult> Edit(string id, string returnUrl = null)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageApplications))
+        {
+            return Forbid();
         }
 
-        public async Task<IActionResult> Edit(string id, string returnUrl = null)
+        var application = await _applicationManager.FindByPhysicalIdAsync(id);
+        if (application == null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageApplications))
-            {
-                return Forbid();
-            }
-
-            var application = await _applicationManager.FindByPhysicalIdAsync(id);
-            if (application == null)
-            {
-                return NotFound();
-            }
+            return NotFound();
+        }
 
-            ValueTask<bool> HasPermissionAsync(string permission) => _applicationManager.HasPermissionAsync(application, permission);
-            ValueTask<bool> HasRequirementAsync(string requirement) => _applicationManager.HasRequirementAsync(application, requirement);
+        ValueTask<bool> HasPermissionAsync(string permission) => _applicationManager.HasPermissionAsync(application, permission);
+        ValueTask<bool> HasRequirementAsync(string requirement) => _applicationManager.HasRequirementAsync(application, requirement);
 
-            var model = new EditOpenIdApplicationViewModel
-            {
-                AllowAuthorizationCodeFlow = await HasPermissionAsync(OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode) &&
-                                             await HasPermissionAsync(OpenIddictConstants.Permissions.ResponseTypes.Code),
-
-                AllowClientCredentialsFlow = await HasPermissionAsync(OpenIddictConstants.Permissions.GrantTypes.ClientCredentials),
-
-                // Note: the hybrid flow doesn't have a dedicated grant_type but is treated as a combination
-                // of both the authorization code and implicit grants. As such, to determine whether the hybrid
-                // flow is enabled, both the authorization code grant and the implicit grant MUST be enabled.
-                AllowHybridFlow = await HasPermissionAsync(OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode) &&
-                                  await HasPermissionAsync(OpenIddictConstants.Permissions.GrantTypes.Implicit) &&
-                                  (await HasPermissionAsync(OpenIddictConstants.Permissions.ResponseTypes.CodeIdToken) ||
-                                   await HasPermissionAsync(OpenIddictConstants.Permissions.ResponseTypes.CodeIdTokenToken) ||
-                                   await HasPermissionAsync(OpenIddictConstants.Permissions.ResponseTypes.CodeToken)),
-
-                AllowImplicitFlow = await HasPermissionAsync(OpenIddictConstants.Permissions.GrantTypes.Implicit) &&
-                                    (await HasPermissionAsync(OpenIddictConstants.Permissions.ResponseTypes.IdToken) ||
-                                     await HasPermissionAsync(OpenIddictConstants.Permissions.ResponseTypes.IdTokenToken) ||
-                                     await HasPermissionAsync(OpenIddictConstants.Permissions.ResponseTypes.Token)),
-
-                AllowPasswordFlow = await HasPermissionAsync(OpenIddictConstants.Permissions.GrantTypes.Password),
-                AllowRefreshTokenFlow = await HasPermissionAsync(OpenIddictConstants.Permissions.GrantTypes.RefreshToken),
-                AllowLogoutEndpoint = await HasPermissionAsync(OpenIddictConstants.Permissions.Endpoints.Logout),
-                AllowIntrospectionEndpoint = await HasPermissionAsync(OpenIddictConstants.Permissions.Endpoints.Introspection),
-                AllowRevocationEndpoint = await HasPermissionAsync(OpenIddictConstants.Permissions.Endpoints.Revocation),
-                ClientId = await _applicationManager.GetClientIdAsync(application),
-                ConsentType = await _applicationManager.GetConsentTypeAsync(application),
-                DisplayName = await _applicationManager.GetDisplayNameAsync(application),
-                Id = await _applicationManager.GetPhysicalIdAsync(application),
-                PostLogoutRedirectUris = string.Join(" ", await _applicationManager.GetPostLogoutRedirectUrisAsync(application)),
-                RedirectUris = string.Join(" ", await _applicationManager.GetRedirectUrisAsync(application)),
-                Type = await _applicationManager.GetClientTypeAsync(application),
-                RequireProofKeyForCodeExchange = await HasRequirementAsync(OpenIddictConstants.Requirements.Features.ProofKeyForCodeExchange)
-            };
-
-            var roleService = HttpContext.RequestServices?.GetService<IRoleService>();
-            if (roleService != null)
-            {
-                var roles = await _applicationManager.GetRolesAsync(application);
-
-                foreach (var role in await roleService.GetRoleNamesAsync())
-                {
-                    model.RoleEntries.Add(new EditOpenIdApplicationViewModel.RoleEntry
-                    {
-                        Name = role,
-                        Selected = roles.Contains(role, StringComparer.OrdinalIgnoreCase)
-                    });
-                }
-            }
-            else
-            {
-                await _notifier.WarningAsync(H["There are no registered services to provide roles."]);
-            }
+        var model = new EditOpenIdApplicationViewModel
+        {
+            AllowAuthorizationCodeFlow = await HasPermissionAsync(OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode) &&
+                                         await HasPermissionAsync(OpenIddictConstants.Permissions.ResponseTypes.Code),
+
+            AllowClientCredentialsFlow = await HasPermissionAsync(OpenIddictConstants.Permissions.GrantTypes.ClientCredentials),
+
+            // Note: the hybrid flow doesn't have a dedicated grant_type but is treated as a combination
+            // of both the authorization code and implicit grants. As such, to determine whether the hybrid
+            // flow is enabled, both the authorization code grant and the implicit grant MUST be enabled.
+            AllowHybridFlow = await HasPermissionAsync(OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode) &&
+                              await HasPermissionAsync(OpenIddictConstants.Permissions.GrantTypes.Implicit) &&
+                              (await HasPermissionAsync(OpenIddictConstants.Permissions.ResponseTypes.CodeIdToken) ||
+                               await HasPermissionAsync(OpenIddictConstants.Permissions.ResponseTypes.CodeIdTokenToken) ||
+                               await HasPermissionAsync(OpenIddictConstants.Permissions.ResponseTypes.CodeToken)),
+
+            AllowImplicitFlow = await HasPermissionAsync(OpenIddictConstants.Permissions.GrantTypes.Implicit) &&
+                                (await HasPermissionAsync(OpenIddictConstants.Permissions.ResponseTypes.IdToken) ||
+                                 await HasPermissionAsync(OpenIddictConstants.Permissions.ResponseTypes.IdTokenToken) ||
+                                 await HasPermissionAsync(OpenIddictConstants.Permissions.ResponseTypes.Token)),
+
+            AllowPasswordFlow = await HasPermissionAsync(OpenIddictConstants.Permissions.GrantTypes.Password),
+            AllowRefreshTokenFlow = await HasPermissionAsync(OpenIddictConstants.Permissions.GrantTypes.RefreshToken),
+            AllowLogoutEndpoint = await HasPermissionAsync(OpenIddictConstants.Permissions.Endpoints.Logout),
+            AllowIntrospectionEndpoint = await HasPermissionAsync(OpenIddictConstants.Permissions.Endpoints.Introspection),
+            AllowRevocationEndpoint = await HasPermissionAsync(OpenIddictConstants.Permissions.Endpoints.Revocation),
+            ClientId = await _applicationManager.GetClientIdAsync(application),
+            ConsentType = await _applicationManager.GetConsentTypeAsync(application),
+            DisplayName = await _applicationManager.GetDisplayNameAsync(application),
+            Id = await _applicationManager.GetPhysicalIdAsync(application),
+            PostLogoutRedirectUris = string.Join(" ", await _applicationManager.GetPostLogoutRedirectUrisAsync(application)),
+            RedirectUris = string.Join(" ", await _applicationManager.GetRedirectUrisAsync(application)),
+            Type = await _applicationManager.GetClientTypeAsync(application),
+            RequireProofKeyForCodeExchange = await HasRequirementAsync(OpenIddictConstants.Requirements.Features.ProofKeyForCodeExchange)
+        };
+
+        var roleService = HttpContext.RequestServices?.GetService<IRoleService>();
+        if (roleService != null)
+        {
+            var roles = await _applicationManager.GetRolesAsync(application);
 
-            var permissions = await _applicationManager.GetPermissionsAsync(application);
-            await foreach (var scope in _scopeManager.ListAsync())
+            foreach (var role in await roleService.GetRoleNamesAsync())
             {
-                var scopeName = await _scopeManager.GetNameAsync(scope);
-                model.ScopeEntries.Add(new EditOpenIdApplicationViewModel.ScopeEntry
+                model.RoleEntries.Add(new EditOpenIdApplicationViewModel.RoleEntry
                 {
-                    Name = scopeName,
-                    Selected = await _applicationManager.HasPermissionAsync(application, OpenIddictConstants.Permissions.Prefixes.Scope + scopeName)
+                    Name = role,
+                    Selected = roles.Contains(role, StringComparer.OrdinalIgnoreCase)
                 });
             }
-
-            ViewData[nameof(OpenIdServerSettings)] = await GetServerSettingsAsync();
-            ViewData["ReturnUrl"] = returnUrl;
-            return View(model);
+        }
+        else
+        {
+            await _notifier.WarningAsync(H["There are no registered services to provide roles."]);
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Edit(EditOpenIdApplicationViewModel model, string returnUrl = null)
+        var permissions = await _applicationManager.GetPermissionsAsync(application);
+        await foreach (var scope in _scopeManager.ListAsync())
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageApplications))
+            var scopeName = await _scopeManager.GetNameAsync(scope);
+            model.ScopeEntries.Add(new EditOpenIdApplicationViewModel.ScopeEntry
             {
-                return Forbid();
-            }
+                Name = scopeName,
+                Selected = await _applicationManager.HasPermissionAsync(application, OpenIddictConstants.Permissions.Prefixes.Scope + scopeName)
+            });
+        }
 
-            var application = await _applicationManager.FindByPhysicalIdAsync(model.Id);
-            if (application == null)
-            {
-                return NotFound();
-            }
+        ViewData[nameof(OpenIdServerSettings)] = await GetServerSettingsAsync();
+        ViewData["ReturnUrl"] = returnUrl;
+        return View(model);
+    }
 
-            // If the application was a public client and is now a confidential client, ensure a client secret was provided.
-            if (string.IsNullOrEmpty(model.ClientSecret) &&
-               !string.Equals(model.Type, OpenIddictConstants.ClientTypes.Public, StringComparison.OrdinalIgnoreCase) &&
-                await _applicationManager.HasClientTypeAsync(application, OpenIddictConstants.ClientTypes.Public))
-            {
-                ModelState.AddModelError(nameof(model.ClientSecret), S["Setting a new client secret is required."]);
-            }
+    [HttpPost]
+    public async Task<IActionResult> Edit(EditOpenIdApplicationViewModel model, string returnUrl = null)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageApplications))
+        {
+            return Forbid();
+        }
 
-            if (!string.IsNullOrEmpty(model.ClientSecret) &&
-                 string.Equals(model.Type, OpenIddictConstants.ClientTypes.Public, StringComparison.OrdinalIgnoreCase))
-            {
-                ModelState.AddModelError(nameof(model.ClientSecret), S["No client secret can be set for public applications."]);
-            }
+        var application = await _applicationManager.FindByPhysicalIdAsync(model.Id);
+        if (application == null)
+        {
+            return NotFound();
+        }
 
-            if (ModelState.IsValid)
-            {
-                var other = await _applicationManager.FindByClientIdAsync(model.ClientId);
-                if (other != null && !string.Equals(
-                    await _applicationManager.GetIdAsync(other),
-                    await _applicationManager.GetIdAsync(application), StringComparison.Ordinal))
-                {
-                    ModelState.AddModelError(nameof(model.ClientId), S["The client identifier is already taken by another application."]);
-                }
-            }
+        // If the application was a public client and is now a confidential client, ensure a client secret was provided.
+        if (string.IsNullOrEmpty(model.ClientSecret) &&
+           !string.Equals(model.Type, OpenIddictConstants.ClientTypes.Public, StringComparison.OrdinalIgnoreCase) &&
+            await _applicationManager.HasClientTypeAsync(application, OpenIddictConstants.ClientTypes.Public))
+        {
+            ModelState.AddModelError(nameof(model.ClientSecret), S["Setting a new client secret is required."]);
+        }
 
-            if (!ModelState.IsValid)
-            {
-                ViewData[nameof(OpenIdServerSettings)] = await GetServerSettingsAsync();
-                ViewData["ReturnUrl"] = returnUrl;
-                return View(model);
-            }
+        if (!string.IsNullOrEmpty(model.ClientSecret) &&
+             string.Equals(model.Type, OpenIddictConstants.ClientTypes.Public, StringComparison.OrdinalIgnoreCase))
+        {
+            ModelState.AddModelError(nameof(model.ClientSecret), S["No client secret can be set for public applications."]);
+        }
 
-            var settings = new OpenIdApplicationSettings()
-            {
-                AllowAuthorizationCodeFlow = model.AllowAuthorizationCodeFlow,
-                AllowClientCredentialsFlow = model.AllowClientCredentialsFlow,
-                AllowHybridFlow = model.AllowHybridFlow,
-                AllowImplicitFlow = model.AllowImplicitFlow,
-                AllowIntrospectionEndpoint = model.AllowIntrospectionEndpoint,
-                AllowLogoutEndpoint = model.AllowLogoutEndpoint,
-                AllowPasswordFlow = model.AllowPasswordFlow,
-                AllowRefreshTokenFlow = model.AllowRefreshTokenFlow,
-                AllowRevocationEndpoint = model.AllowRevocationEndpoint,
-                ClientId = model.ClientId,
-                ClientSecret = model.ClientSecret,
-                ConsentType = model.ConsentType,
-                DisplayName = model.DisplayName,
-                PostLogoutRedirectUris = model.PostLogoutRedirectUris,
-                RedirectUris = model.RedirectUris,
-                Roles = model.RoleEntries.Where(x => x.Selected).Select(x => x.Name).ToArray(),
-                Scopes = model.ScopeEntries.Where(x => x.Selected).Select(x => x.Name).ToArray(),
-                Type = model.Type,
-                RequireProofKeyForCodeExchange = model.RequireProofKeyForCodeExchange
-            };
-
-            await _applicationManager.UpdateDescriptorFromSettings(settings, application);
-
-            if (string.IsNullOrEmpty(returnUrl))
+        if (ModelState.IsValid)
+        {
+            var other = await _applicationManager.FindByClientIdAsync(model.ClientId);
+            if (other != null && !string.Equals(
+                await _applicationManager.GetIdAsync(other),
+                await _applicationManager.GetIdAsync(application), StringComparison.Ordinal))
             {
-                return RedirectToAction(nameof(Index));
+                ModelState.AddModelError(nameof(model.ClientId), S["The client identifier is already taken by another application."]);
             }
+        }
 
-            return this.LocalRedirect(returnUrl, true);
+        if (!ModelState.IsValid)
+        {
+            ViewData[nameof(OpenIdServerSettings)] = await GetServerSettingsAsync();
+            ViewData["ReturnUrl"] = returnUrl;
+            return View(model);
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(string id)
+        var settings = new OpenIdApplicationSettings()
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageApplications))
-            {
-                return Forbid();
-            }
+            AllowAuthorizationCodeFlow = model.AllowAuthorizationCodeFlow,
+            AllowClientCredentialsFlow = model.AllowClientCredentialsFlow,
+            AllowHybridFlow = model.AllowHybridFlow,
+            AllowImplicitFlow = model.AllowImplicitFlow,
+            AllowIntrospectionEndpoint = model.AllowIntrospectionEndpoint,
+            AllowLogoutEndpoint = model.AllowLogoutEndpoint,
+            AllowPasswordFlow = model.AllowPasswordFlow,
+            AllowRefreshTokenFlow = model.AllowRefreshTokenFlow,
+            AllowRevocationEndpoint = model.AllowRevocationEndpoint,
+            ClientId = model.ClientId,
+            ClientSecret = model.ClientSecret,
+            ConsentType = model.ConsentType,
+            DisplayName = model.DisplayName,
+            PostLogoutRedirectUris = model.PostLogoutRedirectUris,
+            RedirectUris = model.RedirectUris,
+            Roles = model.RoleEntries.Where(x => x.Selected).Select(x => x.Name).ToArray(),
+            Scopes = model.ScopeEntries.Where(x => x.Selected).Select(x => x.Name).ToArray(),
+            Type = model.Type,
+            RequireProofKeyForCodeExchange = model.RequireProofKeyForCodeExchange
+        };
+
+        await _applicationManager.UpdateDescriptorFromSettings(settings, application);
+
+        if (string.IsNullOrEmpty(returnUrl))
+        {
+            return RedirectToAction(nameof(Index));
+        }
 
-            var application = await _applicationManager.FindByPhysicalIdAsync(id);
-            if (application == null)
-            {
-                return NotFound();
-            }
+        return this.LocalRedirect(returnUrl, true);
+    }
 
-            await _applicationManager.DeleteAsync(application);
+    [HttpPost]
+    public async Task<IActionResult> Delete(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageApplications))
+        {
+            return Forbid();
+        }
 
-            return RedirectToAction(nameof(Index));
+        var application = await _applicationManager.FindByPhysicalIdAsync(id);
+        if (application == null)
+        {
+            return NotFound();
         }
 
-        private async Task<OpenIdServerSettings> GetServerSettingsAsync()
+        await _applicationManager.DeleteAsync(application);
+
+        return RedirectToAction(nameof(Index));
+    }
+
+    private async Task<OpenIdServerSettings> GetServerSettingsAsync()
+    {
+        if (_shellDescriptor.Features.Any(feature => feature.Id == OpenIdConstants.Features.Server))
         {
-            if (_shellDescriptor.Features.Any(feature => feature.Id == OpenIdConstants.Features.Server))
+            var service = HttpContext.RequestServices.GetRequiredService<IOpenIdServerService>();
+            var settings = await service.GetSettingsAsync();
+            if ((await service.ValidateSettingsAsync(settings)).Any(result => result != ValidationResult.Success))
             {
-                var service = HttpContext.RequestServices.GetRequiredService<IOpenIdServerService>();
-                var settings = await service.GetSettingsAsync();
-                if ((await service.ValidateSettingsAsync(settings)).Any(result => result != ValidationResult.Success))
-                {
-                    await _notifier.WarningAsync(H["OpenID Connect settings are not properly configured."]);
-                }
-
-                return settings;
+                await _notifier.WarningAsync(H["OpenID Connect settings are not properly configured."]);
             }
 
-            return null;
+            return settings;
         }
+
+        return null;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/ScopeController.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/ScopeController.cs
index 4a31540ed34..87991468e92 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/ScopeController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/ScopeController.cs
@@ -16,261 +16,260 @@
 using OrchardCore.OpenId.Abstractions.Managers;
 using OrchardCore.OpenId.ViewModels;
 
-namespace OrchardCore.OpenId.Controllers
+namespace OrchardCore.OpenId.Controllers;
+
+[Feature(OpenIdConstants.Features.Management)]
+[Admin("OpenId/Scope/{action}/{id?}", "OpenIdScope{action}")]
+public class ScopeController : Controller
 {
-    [Feature(OpenIdConstants.Features.Management)]
-    [Admin("OpenId/Scope/{action}/{id?}", "OpenIdScope{action}")]
-    public class ScopeController : Controller
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IOpenIdScopeManager _scopeManager;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly PagerOptions _pagerOptions;
+    private readonly INotifier _notifier;
+    private readonly ShellDescriptor _shellDescriptor;
+    private readonly ShellSettings _shellSettings;
+    private readonly IShellHost _shellHost;
+
+    protected readonly IStringLocalizer S;
+
+    public ScopeController(
+        IOpenIdScopeManager scopeManager,
+        IShapeFactory shapeFactory,
+        IOptions<PagerOptions> pagerOptions,
+        IStringLocalizer<ScopeController> stringLocalizer,
+        IAuthorizationService authorizationService,
+        INotifier notifier,
+        ShellDescriptor shellDescriptor,
+        ShellSettings shellSettings,
+        IShellHost shellHost)
+    {
+        _scopeManager = scopeManager;
+        _shapeFactory = shapeFactory;
+        _pagerOptions = pagerOptions.Value;
+        S = stringLocalizer;
+        _authorizationService = authorizationService;
+        _notifier = notifier;
+        _shellDescriptor = shellDescriptor;
+        _shellSettings = shellSettings;
+        _shellHost = shellHost;
+    }
+
+    [Admin("OpenId/Scope", "OpenIdScope")]
+    public async Task<ActionResult> Index(PagerParameters pagerParameters)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IOpenIdScopeManager _scopeManager;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly PagerOptions _pagerOptions;
-        private readonly INotifier _notifier;
-        private readonly ShellDescriptor _shellDescriptor;
-        private readonly ShellSettings _shellSettings;
-        private readonly IShellHost _shellHost;
-
-        protected readonly IStringLocalizer S;
-
-        public ScopeController(
-            IOpenIdScopeManager scopeManager,
-            IShapeFactory shapeFactory,
-            IOptions<PagerOptions> pagerOptions,
-            IStringLocalizer<ScopeController> stringLocalizer,
-            IAuthorizationService authorizationService,
-            INotifier notifier,
-            ShellDescriptor shellDescriptor,
-            ShellSettings shellSettings,
-            IShellHost shellHost)
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageScopes))
         {
-            _scopeManager = scopeManager;
-            _shapeFactory = shapeFactory;
-            _pagerOptions = pagerOptions.Value;
-            S = stringLocalizer;
-            _authorizationService = authorizationService;
-            _notifier = notifier;
-            _shellDescriptor = shellDescriptor;
-            _shellSettings = shellSettings;
-            _shellHost = shellHost;
+            return Forbid();
         }
 
-        [Admin("OpenId/Scope", "OpenIdScope")]
-        public async Task<ActionResult> Index(PagerParameters pagerParameters)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageScopes))
-            {
-                return Forbid();
-            }
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+        var count = await _scopeManager.CountAsync();
 
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
-            var count = await _scopeManager.CountAsync();
+        var model = new OpenIdScopeIndexViewModel
+        {
+            Pager = await _shapeFactory.PagerAsync(pager, (int)count),
+        };
 
-            var model = new OpenIdScopeIndexViewModel
+        await foreach (var scope in _scopeManager.ListAsync(pager.PageSize, pager.GetStartIndex()))
+        {
+            model.Scopes.Add(new OpenIdScopeEntry
             {
-                Pager = await _shapeFactory.PagerAsync(pager, (int)count),
-            };
+                Description = await _scopeManager.GetDescriptionAsync(scope),
+                DisplayName = await _scopeManager.GetDisplayNameAsync(scope),
+                Id = await _scopeManager.GetPhysicalIdAsync(scope),
+                Name = await _scopeManager.GetNameAsync(scope)
+            });
+        }
 
-            await foreach (var scope in _scopeManager.ListAsync(pager.PageSize, pager.GetStartIndex()))
-            {
-                model.Scopes.Add(new OpenIdScopeEntry
-                {
-                    Description = await _scopeManager.GetDescriptionAsync(scope),
-                    DisplayName = await _scopeManager.GetDisplayNameAsync(scope),
-                    Id = await _scopeManager.GetPhysicalIdAsync(scope),
-                    Name = await _scopeManager.GetNameAsync(scope)
-                });
-            }
+        return View(model);
+    }
 
-            return View(model);
+    [HttpGet]
+    public async Task<IActionResult> Create(string returnUrl = null)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageScopes))
+        {
+            return Forbid();
         }
 
-        [HttpGet]
-        public async Task<IActionResult> Create(string returnUrl = null)
+        var model = new CreateOpenIdScopeViewModel();
+
+        foreach (var tenant in _shellHost.GetAllSettings().Where(s => s.IsRunning()))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageScopes))
+            model.Tenants.Add(new CreateOpenIdScopeViewModel.TenantEntry
             {
-                return Forbid();
-            }
+                Current = string.Equals(tenant.Name, _shellSettings.Name, StringComparison.Ordinal),
+                Name = tenant.Name
+            });
+        }
 
-            var model = new CreateOpenIdScopeViewModel();
+        ViewData["ReturnUrl"] = returnUrl;
+        return View(model);
+    }
 
-            foreach (var tenant in _shellHost.GetAllSettings().Where(s => s.IsRunning()))
-            {
-                model.Tenants.Add(new CreateOpenIdScopeViewModel.TenantEntry
-                {
-                    Current = string.Equals(tenant.Name, _shellSettings.Name, StringComparison.Ordinal),
-                    Name = tenant.Name
-                });
-            }
+    [HttpPost]
+    public async Task<IActionResult> Create(CreateOpenIdScopeViewModel model, string returnUrl = null)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageScopes))
+        {
+            return Forbid();
+        }
 
+        if (await _scopeManager.FindByNameAsync(model.Name) != null)
+        {
+            ModelState.AddModelError(nameof(model.Name), S["The name is already taken by another scope."]);
+        }
+
+        if (!ModelState.IsValid)
+        {
             ViewData["ReturnUrl"] = returnUrl;
             return View(model);
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Create(CreateOpenIdScopeViewModel model, string returnUrl = null)
+        var descriptor = new OpenIdScopeDescriptor
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageScopes))
-            {
-                return Forbid();
-            }
+            Description = model.Description,
+            DisplayName = model.DisplayName,
+            Name = model.Name
+        };
 
-            if (await _scopeManager.FindByNameAsync(model.Name) != null)
-            {
-                ModelState.AddModelError(nameof(model.Name), S["The name is already taken by another scope."]);
-            }
-
-            if (!ModelState.IsValid)
-            {
-                ViewData["ReturnUrl"] = returnUrl;
-                return View(model);
-            }
+        if (!string.IsNullOrEmpty(model.Resources))
+        {
+            descriptor.Resources.UnionWith(model.Resources.Split(' ', StringSplitOptions.RemoveEmptyEntries));
+        }
 
-            var descriptor = new OpenIdScopeDescriptor
-            {
-                Description = model.Description,
-                DisplayName = model.DisplayName,
-                Name = model.Name
-            };
+        descriptor.Resources.UnionWith(model.Tenants
+            .Where(tenant => tenant.Selected)
+            .Where(tenant => !string.Equals(tenant.Name, _shellSettings.Name, StringComparison.Ordinal))
+            .Select(tenant => OpenIdConstants.Prefixes.Tenant + tenant.Name));
 
-            if (!string.IsNullOrEmpty(model.Resources))
-            {
-                descriptor.Resources.UnionWith(model.Resources.Split(' ', StringSplitOptions.RemoveEmptyEntries));
-            }
-
-            descriptor.Resources.UnionWith(model.Tenants
-                .Where(tenant => tenant.Selected)
-                .Where(tenant => !string.Equals(tenant.Name, _shellSettings.Name, StringComparison.Ordinal))
-                .Select(tenant => OpenIdConstants.Prefixes.Tenant + tenant.Name));
+        await _scopeManager.CreateAsync(descriptor);
 
-            await _scopeManager.CreateAsync(descriptor);
+        if (string.IsNullOrEmpty(returnUrl))
+        {
+            return RedirectToAction("Index");
+        }
 
-            if (string.IsNullOrEmpty(returnUrl))
-            {
-                return RedirectToAction("Index");
-            }
+        return this.LocalRedirect(returnUrl, true);
+    }
 
-            return this.LocalRedirect(returnUrl, true);
+    public async Task<IActionResult> Edit(string id, string returnUrl = null)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageScopes))
+        {
+            return Forbid();
         }
 
-        public async Task<IActionResult> Edit(string id, string returnUrl = null)
+        var scope = await _scopeManager.FindByPhysicalIdAsync(id);
+        if (scope == null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageScopes))
-            {
-                return Forbid();
-            }
-
-            var scope = await _scopeManager.FindByPhysicalIdAsync(id);
-            if (scope == null)
-            {
-                return NotFound();
-            }
+            return NotFound();
+        }
 
-            var model = new EditOpenIdScopeViewModel
-            {
-                Description = await _scopeManager.GetDescriptionAsync(scope),
-                DisplayName = await _scopeManager.GetDisplayNameAsync(scope),
-                Id = await _scopeManager.GetPhysicalIdAsync(scope),
-                Name = await _scopeManager.GetNameAsync(scope)
-            };
+        var model = new EditOpenIdScopeViewModel
+        {
+            Description = await _scopeManager.GetDescriptionAsync(scope),
+            DisplayName = await _scopeManager.GetDisplayNameAsync(scope),
+            Id = await _scopeManager.GetPhysicalIdAsync(scope),
+            Name = await _scopeManager.GetNameAsync(scope)
+        };
 
-            var resources = await _scopeManager.GetResourcesAsync(scope);
+        var resources = await _scopeManager.GetResourcesAsync(scope);
 
-            model.Resources = string.Join(" ",
-                from resource in resources
-                where !string.IsNullOrEmpty(resource) && !resource.StartsWith(OpenIdConstants.Prefixes.Tenant, StringComparison.Ordinal)
-                select resource);
+        model.Resources = string.Join(" ",
+            from resource in resources
+            where !string.IsNullOrEmpty(resource) && !resource.StartsWith(OpenIdConstants.Prefixes.Tenant, StringComparison.Ordinal)
+            select resource);
 
-            foreach (var tenant in _shellHost.GetAllSettings().Where(s => s.IsRunning()))
+        foreach (var tenant in _shellHost.GetAllSettings().Where(s => s.IsRunning()))
+        {
+            model.Tenants.Add(new EditOpenIdScopeViewModel.TenantEntry
             {
-                model.Tenants.Add(new EditOpenIdScopeViewModel.TenantEntry
-                {
-                    Current = string.Equals(tenant.Name, _shellSettings.Name, StringComparison.Ordinal),
-                    Name = tenant.Name,
-                    Selected = resources.Contains(OpenIdConstants.Prefixes.Tenant + tenant.Name)
-                });
-            }
+                Current = string.Equals(tenant.Name, _shellSettings.Name, StringComparison.Ordinal),
+                Name = tenant.Name,
+                Selected = resources.Contains(OpenIdConstants.Prefixes.Tenant + tenant.Name)
+            });
+        }
 
-            ViewData["ReturnUrl"] = returnUrl;
-            return View(model);
+        ViewData["ReturnUrl"] = returnUrl;
+        return View(model);
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Edit(EditOpenIdScopeViewModel model, string returnUrl = null)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageScopes))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Edit(EditOpenIdScopeViewModel model, string returnUrl = null)
+        var scope = await _scopeManager.FindByPhysicalIdAsync(model.Id);
+        if (scope == null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageScopes))
-            {
-                return Forbid();
-            }
+            return NotFound();
+        }
 
-            var scope = await _scopeManager.FindByPhysicalIdAsync(model.Id);
-            if (scope == null)
+        if (ModelState.IsValid)
+        {
+            var other = await _scopeManager.FindByNameAsync(model.Name);
+            if (other != null && !string.Equals(await _scopeManager.GetIdAsync(other), await _scopeManager.GetIdAsync(scope), StringComparison.Ordinal))
             {
-                return NotFound();
+                ModelState.AddModelError(nameof(model.Name), S["The name is already taken by another scope."]);
             }
+        }
 
-            if (ModelState.IsValid)
-            {
-                var other = await _scopeManager.FindByNameAsync(model.Name);
-                if (other != null && !string.Equals(await _scopeManager.GetIdAsync(other), await _scopeManager.GetIdAsync(scope), StringComparison.Ordinal))
-                {
-                    ModelState.AddModelError(nameof(model.Name), S["The name is already taken by another scope."]);
-                }
-            }
+        if (!ModelState.IsValid)
+        {
+            ViewData["ReturnUrl"] = returnUrl;
+            return View(model);
+        }
 
-            if (!ModelState.IsValid)
-            {
-                ViewData["ReturnUrl"] = returnUrl;
-                return View(model);
-            }
+        var descriptor = new OpenIdScopeDescriptor();
+        await _scopeManager.PopulateAsync(descriptor, scope);
 
-            var descriptor = new OpenIdScopeDescriptor();
-            await _scopeManager.PopulateAsync(descriptor, scope);
+        descriptor.Description = model.Description;
+        descriptor.DisplayName = model.DisplayName;
+        descriptor.Name = model.Name;
 
-            descriptor.Description = model.Description;
-            descriptor.DisplayName = model.DisplayName;
-            descriptor.Name = model.Name;
+        descriptor.Resources.Clear();
 
-            descriptor.Resources.Clear();
+        if (!string.IsNullOrEmpty(model.Resources))
+        {
+            descriptor.Resources.UnionWith(model.Resources.Split(' ', StringSplitOptions.RemoveEmptyEntries));
+        }
 
-            if (!string.IsNullOrEmpty(model.Resources))
-            {
-                descriptor.Resources.UnionWith(model.Resources.Split(' ', StringSplitOptions.RemoveEmptyEntries));
-            }
+        descriptor.Resources.UnionWith(model.Tenants
+            .Where(tenant => tenant.Selected)
+            .Where(tenant => !string.Equals(tenant.Name, _shellSettings.Name, StringComparison.Ordinal))
+            .Select(tenant => OpenIdConstants.Prefixes.Tenant + tenant.Name));
 
-            descriptor.Resources.UnionWith(model.Tenants
-                .Where(tenant => tenant.Selected)
-                .Where(tenant => !string.Equals(tenant.Name, _shellSettings.Name, StringComparison.Ordinal))
-                .Select(tenant => OpenIdConstants.Prefixes.Tenant + tenant.Name));
+        await _scopeManager.UpdateAsync(scope, descriptor);
 
-            await _scopeManager.UpdateAsync(scope, descriptor);
+        if (string.IsNullOrEmpty(returnUrl))
+        {
+            return RedirectToAction("Index");
+        }
 
-            if (string.IsNullOrEmpty(returnUrl))
-            {
-                return RedirectToAction("Index");
-            }
+        return this.LocalRedirect(returnUrl, true);
+    }
 
-            return this.LocalRedirect(returnUrl, true);
+    [HttpPost]
+    public async Task<IActionResult> Delete(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageScopes))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(string id)
+        var scope = await _scopeManager.FindByPhysicalIdAsync(id);
+        if (scope == null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageScopes))
-            {
-                return Forbid();
-            }
-
-            var scope = await _scopeManager.FindByPhysicalIdAsync(id);
-            if (scope == null)
-            {
-                return NotFound();
-            }
+            return NotFound();
+        }
 
-            await _scopeManager.DeleteAsync(scope);
+        await _scopeManager.DeleteAsync(scope);
 
-            return RedirectToAction(nameof(Index));
-        }
+        return RedirectToAction(nameof(Index));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/ServerConfigurationController.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/ServerConfigurationController.cs
index f6c408a2b51..a967dba6577 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/ServerConfigurationController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/ServerConfigurationController.cs
@@ -13,92 +13,91 @@
 using OrchardCore.OpenId.Services;
 using OrchardCore.OpenId.Settings;
 
-namespace OrchardCore.OpenId.Controllers
+namespace OrchardCore.OpenId.Controllers;
+
+[Admin, Feature(OpenIdConstants.Features.Server)]
+public class ServerConfigurationController : Controller
 {
-    [Admin, Feature(OpenIdConstants.Features.Server)]
-    public class ServerConfigurationController : Controller
+    private readonly IAuthorizationService _authorizationService;
+    private readonly INotifier _notifier;
+    private readonly IOpenIdServerService _serverService;
+    private readonly IDisplayManager<OpenIdServerSettings> _serverSettingsDisplayManager;
+    private readonly IShellHost _shellHost;
+    private readonly ShellSettings _shellSettings;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    protected readonly IHtmlLocalizer H;
+
+    public ServerConfigurationController(
+        IAuthorizationService authorizationService,
+        IHtmlLocalizer<ServerConfigurationController> htmlLocalizer,
+        INotifier notifier,
+        IOpenIdServerService serverService,
+        IDisplayManager<OpenIdServerSettings> serverSettingsDisplayManager,
+        IShellHost shellHost,
+        ShellSettings shellSettings,
+        IUpdateModelAccessor updateModelAccessor)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly INotifier _notifier;
-        private readonly IOpenIdServerService _serverService;
-        private readonly IDisplayManager<OpenIdServerSettings> _serverSettingsDisplayManager;
-        private readonly IShellHost _shellHost;
-        private readonly ShellSettings _shellSettings;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        protected readonly IHtmlLocalizer H;
+        _authorizationService = authorizationService;
+        H = htmlLocalizer;
+        _notifier = notifier;
+        _serverService = serverService;
+        _serverSettingsDisplayManager = serverSettingsDisplayManager;
+        _shellHost = shellHost;
+        _shellSettings = shellSettings;
+        _updateModelAccessor = updateModelAccessor;
+    }
 
-        public ServerConfigurationController(
-            IAuthorizationService authorizationService,
-            IHtmlLocalizer<ServerConfigurationController> htmlLocalizer,
-            INotifier notifier,
-            IOpenIdServerService serverService,
-            IDisplayManager<OpenIdServerSettings> serverSettingsDisplayManager,
-            IShellHost shellHost,
-            ShellSettings shellSettings,
-            IUpdateModelAccessor updateModelAccessor)
+    [Admin("OpenId/ServerConfiguration", "OpenIdServerConfiguration")]
+    public async Task<IActionResult> Index()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageServerSettings))
         {
-            _authorizationService = authorizationService;
-            H = htmlLocalizer;
-            _notifier = notifier;
-            _serverService = serverService;
-            _serverSettingsDisplayManager = serverSettingsDisplayManager;
-            _shellHost = shellHost;
-            _shellSettings = shellSettings;
-            _updateModelAccessor = updateModelAccessor;
+            return Forbid();
         }
 
-        [Admin("OpenId/ServerConfiguration", "OpenIdServerConfiguration")]
-        public async Task<IActionResult> Index()
+        var settings = await _serverService.GetSettingsAsync();
+        var shape = await _serverSettingsDisplayManager.BuildEditorAsync(settings, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "");
+
+        return View(shape);
+    }
+
+    [HttpPost]
+    [ActionName(nameof(Index))]
+    public async Task<IActionResult> IndexPost()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageServerSettings))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageServerSettings))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var settings = await _serverService.GetSettingsAsync();
-            var shape = await _serverSettingsDisplayManager.BuildEditorAsync(settings, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "");
+        var settings = await _serverService.GetSettingsAsync();
+        var shape = await _serverSettingsDisplayManager.UpdateEditorAsync(settings, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "");
 
+        if (!ModelState.IsValid)
+        {
             return View(shape);
         }
 
-        [HttpPost]
-        [ActionName(nameof(Index))]
-        public async Task<IActionResult> IndexPost()
+        foreach (var result in await _serverService.ValidateSettingsAsync(settings))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageServerSettings))
-            {
-                return Forbid();
-            }
-
-            var settings = await _serverService.GetSettingsAsync();
-            var shape = await _serverSettingsDisplayManager.UpdateEditorAsync(settings, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "");
-
-            if (!ModelState.IsValid)
+            if (result != ValidationResult.Success)
             {
-                return View(shape);
-            }
-
-            foreach (var result in await _serverService.ValidateSettingsAsync(settings))
-            {
-                if (result != ValidationResult.Success)
-                {
-                    var key = result.MemberNames.FirstOrDefault() ?? string.Empty;
-                    ModelState.AddModelError(key, result.ErrorMessage);
-                }
+                var key = result.MemberNames.FirstOrDefault() ?? string.Empty;
+                ModelState.AddModelError(key, result.ErrorMessage);
             }
+        }
 
-            if (!ModelState.IsValid)
-            {
-                return View(shape);
-            }
+        if (!ModelState.IsValid)
+        {
+            return View(shape);
+        }
 
-            await _serverService.UpdateSettingsAsync(settings);
+        await _serverService.UpdateSettingsAsync(settings);
 
-            await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
+        await _notifier.SuccessAsync(H["OpenID server configuration successfully updated."]);
 
-            await _shellHost.ReleaseShellContextAsync(_shellSettings);
+        await _shellHost.ReleaseShellContextAsync(_shellSettings);
 
-            return RedirectToAction(nameof(Index));
-        }
+        return RedirectToAction(nameof(Index));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/UserInfoController.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/UserInfoController.cs
index af7a118ef9c..eeace0f93b8 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/UserInfoController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/UserInfoController.cs
@@ -12,154 +12,153 @@
 using OrchardCore.Modules;
 using static OpenIddict.Abstractions.OpenIddictConstants;
 
-namespace OrchardCore.OpenId.Controllers
+namespace OrchardCore.OpenId.Controllers;
+
+// Note: the error descriptions used in this controller are deliberately not localized as
+// the OAuth 2.0 specification only allows select US-ASCII characters in error_description.
+[Feature(OpenIdConstants.Features.Server), SkipStatusCodePages]
+public class UserInfoController : Controller
 {
-    // Note: the error descriptions used in this controller are deliberately not localized as
-    // the OAuth 2.0 specification only allows select US-ASCII characters in error_description.
-    [Feature(OpenIdConstants.Features.Server), SkipStatusCodePages]
-    public class UserInfoController : Controller
+    // GET/POST: /connect/userinfo
+    [AcceptVerbs("GET", "POST")]
+    [IgnoreAntiforgeryToken]
+    [Produces("application/json")]
+    public async Task<IActionResult> Me()
     {
-        // GET/POST: /connect/userinfo
-        [AcceptVerbs("GET", "POST")]
-        [IgnoreAntiforgeryToken]
-        [Produces("application/json")]
-        public async Task<IActionResult> Me()
+        // Warning: this action is decorated with IgnoreAntiforgeryTokenAttribute to override
+        // the global antiforgery token validation policy applied by the MVC modules stack,
+        // which is required for this stateless OpenID userinfo endpoint to work correctly.
+        // To prevent effective CSRF/session fixation attacks, this action MUST NOT return
+        // an authentication cookie or try to establish an ASP.NET Core user session.
+
+        var request = HttpContext.GetOpenIddictServerRequest();
+        if (request == null)
+        {
+            return NotFound();
+        }
+
+        // Note: this controller doesn't use [Authorize] to prevent MVC from throwing
+        // an exception if the OpenIddict server handler was not registered (e.g because the
+        // OpenID server feature was not enabled or because the configuration was invalid).
+        var principal = (await HttpContext.AuthenticateAsync(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme))?.Principal;
+        if (principal == null)
+        {
+            return Challenge(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+        }
+
+        // Ensure the access token represents a user and not an application.
+        var type = principal.FindFirst(OpenIdConstants.Claims.EntityType)?.Value;
+        if (!string.Equals(type, OpenIdConstants.EntityTypes.User, StringComparison.Ordinal))
         {
-            // Warning: this action is decorated with IgnoreAntiforgeryTokenAttribute to override
-            // the global antiforgery token validation policy applied by the MVC modules stack,
-            // which is required for this stateless OpenID userinfo endpoint to work correctly.
-            // To prevent effective CSRF/session fixation attacks, this action MUST NOT return
-            // an authentication cookie or try to establish an ASP.NET Core user session.
-
-            var request = HttpContext.GetOpenIddictServerRequest();
-            if (request == null)
+            return Forbid(new AuthenticationProperties(new Dictionary<string, string>
             {
-                return NotFound();
+                [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.InvalidRequest,
+                [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] =
+                    "The userinfo endpoint can only be used with access tokens representing users."
+            }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+        }
+
+        var claims = new Dictionary<string, object>();
+
+        if (principal.HasScope(Scopes.Profile))
+        {
+            var preferredUsername = principal.FindFirst(Claims.PreferredUsername)?.Value;
+            if (!string.IsNullOrEmpty(preferredUsername))
+            {
+                claims[Claims.PreferredUsername] = preferredUsername;
             }
 
-            // Note: this controller doesn't use [Authorize] to prevent MVC from throwing
-            // an exception if the OpenIddict server handler was not registered (e.g because the
-            // OpenID server feature was not enabled or because the configuration was invalid).
-            var principal = (await HttpContext.AuthenticateAsync(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme))?.Principal;
-            if (principal == null)
+            var name = principal.FindFirst(Claims.Name)?.Value ?? principal.FindFirst(ClaimTypes.Name)?.Value;
+            if (!string.IsNullOrEmpty(name))
             {
-                return Challenge(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+                claims[Claims.Name] = name;
             }
 
-            // Ensure the access token represents a user and not an application.
-            var type = principal.FindFirst(OpenIdConstants.Claims.EntityType)?.Value;
-            if (!string.Equals(type, OpenIdConstants.EntityTypes.User, StringComparison.Ordinal))
+            var familyName = principal.FindFirst(Claims.FamilyName)?.Value ?? principal.FindFirst(ClaimTypes.Surname)?.Value;
+            if (!string.IsNullOrEmpty(familyName))
             {
-                return Forbid(new AuthenticationProperties(new Dictionary<string, string>
-                {
-                    [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.InvalidRequest,
-                    [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] =
-                        "The userinfo endpoint can only be used with access tokens representing users."
-                }), OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+                claims[Claims.FamilyName] = familyName;
             }
 
-            var claims = new Dictionary<string, object>();
+            var givenName = principal.FindFirst(Claims.GivenName)?.Value ?? principal.FindFirst(ClaimTypes.GivenName)?.Value;
+            if (!string.IsNullOrEmpty(givenName))
+            {
+                claims[Claims.GivenName] = givenName;
+            }
 
-            if (principal.HasScope(Scopes.Profile))
+            var middleName = principal.FindFirst(Claims.MiddleName)?.Value;
+            if (!string.IsNullOrEmpty(middleName))
             {
-                var preferredUsername = principal.FindFirst(Claims.PreferredUsername)?.Value;
-                if (!string.IsNullOrEmpty(preferredUsername))
-                {
-                    claims[Claims.PreferredUsername] = preferredUsername;
-                }
+                claims[Claims.MiddleName] = middleName;
+            }
 
-                var name = principal.FindFirst(Claims.Name)?.Value ?? principal.FindFirst(ClaimTypes.Name)?.Value;
-                if (!string.IsNullOrEmpty(name))
-                {
-                    claims[Claims.Name] = name;
-                }
+            var picture = principal.FindFirst(Claims.Picture)?.Value;
+            if (!string.IsNullOrEmpty(picture))
+            {
+                claims[Claims.Picture] = picture;
+            }
 
-                var familyName = principal.FindFirst(Claims.FamilyName)?.Value ?? principal.FindFirst(ClaimTypes.Surname)?.Value;
-                if (!string.IsNullOrEmpty(familyName))
-                {
-                    claims[Claims.FamilyName] = familyName;
-                }
+            var updatedAtClaimValue = principal.FindFirst(Claims.UpdatedAt)?.Value;
+            if (!string.IsNullOrEmpty(updatedAtClaimValue))
+            {
+                claims[Claims.UpdatedAt] = long.Parse(updatedAtClaimValue, CultureInfo.InvariantCulture);
+            }
+        }
 
-                var givenName = principal.FindFirst(Claims.GivenName)?.Value ?? principal.FindFirst(ClaimTypes.GivenName)?.Value;
-                if (!string.IsNullOrEmpty(givenName))
-                {
-                    claims[Claims.GivenName] = givenName;
-                }
+        // Note: the "sub" claim is a mandatory claim and must be included in the JSON response.
+        claims[Claims.Subject] = principal.GetUserIdentifier();
 
-                var middleName = principal.FindFirst(Claims.MiddleName)?.Value;
-                if (!string.IsNullOrEmpty(middleName))
-                {
-                    claims[Claims.MiddleName] = middleName;
-                }
+        if (principal.HasScope(Scopes.Email))
+        {
+            var address = principal.FindFirst(Claims.Email)?.Value ?? principal.FindFirst(ClaimTypes.Email)?.Value;
 
-                var picture = principal.FindFirst(Claims.Picture)?.Value;
-                if (!string.IsNullOrEmpty(picture))
-                {
-                    claims[Claims.Picture] = picture;
-                }
+            if (!string.IsNullOrEmpty(address))
+            {
+                claims[Claims.Email] = address;
 
-                var updatedAtClaimValue = principal.FindFirst(Claims.UpdatedAt)?.Value;
-                if (!string.IsNullOrEmpty(updatedAtClaimValue))
+                var status = principal.FindFirst(Claims.EmailVerified)?.Value;
+                if (!string.IsNullOrEmpty(status))
                 {
-                    claims[Claims.UpdatedAt] = long.Parse(updatedAtClaimValue, CultureInfo.InvariantCulture);
+                    claims[Claims.EmailVerified] = bool.Parse(status);
                 }
             }
+        }
 
-            // Note: the "sub" claim is a mandatory claim and must be included in the JSON response.
-            claims[Claims.Subject] = principal.GetUserIdentifier();
+        if (principal.HasScope(Scopes.Phone))
+        {
+            var phone = principal.FindFirst(Claims.PhoneNumber)?.Value ??
+                        principal.FindFirst(ClaimTypes.MobilePhone)?.Value ??
+                        principal.FindFirst(ClaimTypes.HomePhone)?.Value ??
+                        principal.FindFirst(ClaimTypes.OtherPhone)?.Value;
 
-            if (principal.HasScope(Scopes.Email))
+            if (!string.IsNullOrEmpty(phone))
             {
-                var address = principal.FindFirst(Claims.Email)?.Value ?? principal.FindFirst(ClaimTypes.Email)?.Value;
+                claims[Claims.PhoneNumber] = phone;
 
-                if (!string.IsNullOrEmpty(address))
+                var status = principal.FindFirst(Claims.PhoneNumberVerified)?.Value;
+                if (!string.IsNullOrEmpty(status))
                 {
-                    claims[Claims.Email] = address;
-
-                    var status = principal.FindFirst(Claims.EmailVerified)?.Value;
-                    if (!string.IsNullOrEmpty(status))
-                    {
-                        claims[Claims.EmailVerified] = bool.Parse(status);
-                    }
+                    claims[Claims.PhoneNumberVerified] = bool.Parse(status);
                 }
             }
+        }
 
-            if (principal.HasScope(Scopes.Phone))
-            {
-                var phone = principal.FindFirst(Claims.PhoneNumber)?.Value ??
-                            principal.FindFirst(ClaimTypes.MobilePhone)?.Value ??
-                            principal.FindFirst(ClaimTypes.HomePhone)?.Value ??
-                            principal.FindFirst(ClaimTypes.OtherPhone)?.Value;
-
-                if (!string.IsNullOrEmpty(phone))
-                {
-                    claims[Claims.PhoneNumber] = phone;
-
-                    var status = principal.FindFirst(Claims.PhoneNumberVerified)?.Value;
-                    if (!string.IsNullOrEmpty(status))
-                    {
-                        claims[Claims.PhoneNumberVerified] = bool.Parse(status);
-                    }
-                }
-            }
+        if (principal.HasScope(Scopes.Roles))
+        {
+            var roles = principal.FindAll(Claims.Role)
+                                 .Concat(principal.FindAll(ClaimTypes.Role))
+                                 .Select(claim => claim.Value)
+                                 .ToArray();
 
-            if (principal.HasScope(Scopes.Roles))
+            if (roles.Length != 0)
             {
-                var roles = principal.FindAll(Claims.Role)
-                                     .Concat(principal.FindAll(ClaimTypes.Role))
-                                     .Select(claim => claim.Value)
-                                     .ToArray();
-
-                if (roles.Length != 0)
-                {
-                    claims["roles"] = roles;
-                }
+                claims["roles"] = roles;
             }
+        }
 
-            // Note: the complete list of standard claims supported by the OpenID Connect specification
-            // can be found here: http://openid.net/specs/openid-connect-core-1_0.html#StandardClaims
+        // Note: the complete list of standard claims supported by the OpenID Connect specification
+        // can be found here: http://openid.net/specs/openid-connect-core-1_0.html#StandardClaims
 
-            return Ok(claims);
-        }
+        return Ok(claims);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/ValidationConfigurationController.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/ValidationConfigurationController.cs
index 7935372dea5..bce962d9510 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/ValidationConfigurationController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Controllers/ValidationConfigurationController.cs
@@ -13,92 +13,91 @@
 using OrchardCore.OpenId.Services;
 using OrchardCore.OpenId.Settings;
 
-namespace OrchardCore.OpenId.Controllers
+namespace OrchardCore.OpenId.Controllers;
+
+[Admin, Feature(OpenIdConstants.Features.Validation)]
+public class ValidationConfigurationController : Controller
 {
-    [Admin, Feature(OpenIdConstants.Features.Validation)]
-    public class ValidationConfigurationController : Controller
+    private readonly IAuthorizationService _authorizationService;
+    private readonly INotifier _notifier;
+    private readonly IOpenIdValidationService _validationService;
+    private readonly IDisplayManager<OpenIdValidationSettings> _validationSettingsDisplayManager;
+    private readonly IShellHost _shellHost;
+    private readonly ShellSettings _shellSettings;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    protected readonly IHtmlLocalizer H;
+
+    public ValidationConfigurationController(
+        IAuthorizationService authorizationService,
+        IHtmlLocalizer<ValidationConfigurationController> htmlLocalizer,
+        INotifier notifier,
+        IOpenIdValidationService validationService,
+        IDisplayManager<OpenIdValidationSettings> validationSettingsDisplayManager,
+        IShellHost shellHost,
+        ShellSettings shellSettings,
+        IUpdateModelAccessor updateModelAccessor)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly INotifier _notifier;
-        private readonly IOpenIdValidationService _validationService;
-        private readonly IDisplayManager<OpenIdValidationSettings> _validationSettingsDisplayManager;
-        private readonly IShellHost _shellHost;
-        private readonly ShellSettings _shellSettings;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        protected readonly IHtmlLocalizer H;
+        _authorizationService = authorizationService;
+        H = htmlLocalizer;
+        _notifier = notifier;
+        _validationService = validationService;
+        _validationSettingsDisplayManager = validationSettingsDisplayManager;
+        _shellHost = shellHost;
+        _shellSettings = shellSettings;
+        _updateModelAccessor = updateModelAccessor;
+    }
 
-        public ValidationConfigurationController(
-            IAuthorizationService authorizationService,
-            IHtmlLocalizer<ValidationConfigurationController> htmlLocalizer,
-            INotifier notifier,
-            IOpenIdValidationService validationService,
-            IDisplayManager<OpenIdValidationSettings> validationSettingsDisplayManager,
-            IShellHost shellHost,
-            ShellSettings shellSettings,
-            IUpdateModelAccessor updateModelAccessor)
+    [Admin("OpenId/ValidationConfiguration", "OpenIdValidationConfiguration")]
+    public async Task<IActionResult> Index()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageValidationSettings))
         {
-            _authorizationService = authorizationService;
-            H = htmlLocalizer;
-            _notifier = notifier;
-            _validationService = validationService;
-            _validationSettingsDisplayManager = validationSettingsDisplayManager;
-            _shellHost = shellHost;
-            _shellSettings = shellSettings;
-            _updateModelAccessor = updateModelAccessor;
+            return Forbid();
         }
 
-        [Admin("OpenId/ValidationConfiguration", "OpenIdValidationConfiguration")]
-        public async Task<IActionResult> Index()
+        var settings = await _validationService.GetSettingsAsync();
+        var shape = await _validationSettingsDisplayManager.BuildEditorAsync(settings, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "");
+
+        return View(shape);
+    }
+
+    [HttpPost]
+    [ActionName(nameof(Index))]
+    public async Task<IActionResult> IndexPost()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageValidationSettings))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageValidationSettings))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var settings = await _validationService.GetSettingsAsync();
-            var shape = await _validationSettingsDisplayManager.BuildEditorAsync(settings, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "");
+        var settings = await _validationService.GetSettingsAsync();
+        var shape = await _validationSettingsDisplayManager.UpdateEditorAsync(settings, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "");
 
+        if (!ModelState.IsValid)
+        {
             return View(shape);
         }
 
-        [HttpPost]
-        [ActionName(nameof(Index))]
-        public async Task<IActionResult> IndexPost()
+        foreach (var result in await _validationService.ValidateSettingsAsync(settings))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageValidationSettings))
-            {
-                return Forbid();
-            }
-
-            var settings = await _validationService.GetSettingsAsync();
-            var shape = await _validationSettingsDisplayManager.UpdateEditorAsync(settings, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "");
-
-            if (!ModelState.IsValid)
+            if (result != ValidationResult.Success)
             {
-                return View(shape);
-            }
-
-            foreach (var result in await _validationService.ValidateSettingsAsync(settings))
-            {
-                if (result != ValidationResult.Success)
-                {
-                    var key = result.MemberNames.FirstOrDefault() ?? string.Empty;
-                    ModelState.AddModelError(key, result.ErrorMessage);
-                }
+                var key = result.MemberNames.FirstOrDefault() ?? string.Empty;
+                ModelState.AddModelError(key, result.ErrorMessage);
             }
+        }
 
-            if (!ModelState.IsValid)
-            {
-                return View(shape);
-            }
+        if (!ModelState.IsValid)
+        {
+            return View(shape);
+        }
 
-            await _validationService.UpdateSettingsAsync(settings);
+        await _validationService.UpdateSettingsAsync(settings);
 
-            await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
+        await _notifier.SuccessAsync(H["OpenID validation configuration successfully updated."]);
 
-            await _shellHost.ReleaseShellContextAsync(_shellSettings);
+        await _shellHost.ReleaseShellContextAsync(_shellSettings);
 
-            return RedirectToAction(nameof(Index));
-        }
+        return RedirectToAction(nameof(Index));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdServerDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdServerDeploymentSource.cs
index a3474788075..a5569891bd7 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdServerDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdServerDeploymentSource.cs
@@ -5,74 +5,73 @@
 using OrchardCore.OpenId.Services;
 using OrchardCore.OpenId.Settings;
 
-namespace OrchardCore.OpenId.Deployment
+namespace OrchardCore.OpenId.Deployment;
+
+public class OpenIdServerDeploymentSource : IDeploymentSource
 {
-    public class OpenIdServerDeploymentSource : IDeploymentSource
+    private readonly IOpenIdServerService _openIdServerService;
+
+    public OpenIdServerDeploymentSource(IOpenIdServerService openIdServerService)
     {
-        private readonly IOpenIdServerService _openIdServerService;
+        _openIdServerService = openIdServerService;
+    }
 
-        public OpenIdServerDeploymentSource(IOpenIdServerService openIdServerService)
-        {
-            _openIdServerService = openIdServerService;
-        }
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        var openIdServerStep = step as OpenIdServerDeploymentStep;
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        if (openIdServerStep == null)
         {
-            var openIdServerStep = step as OpenIdServerDeploymentStep;
-
-            if (openIdServerStep == null)
-            {
-                return;
-            }
+            return;
+        }
 
-            var settings = await _openIdServerService
-                .GetSettingsAsync();
+        var settings = await _openIdServerService
+            .GetSettingsAsync();
 
-            var settingsModel = new OpenIdServerSettingsStepModel
-            {
-                AccessTokenFormat = settings.AccessTokenFormat,
-                Authority = settings.Authority?.AbsoluteUri,
+        var settingsModel = new OpenIdServerSettingsStepModel
+        {
+            AccessTokenFormat = settings.AccessTokenFormat,
+            Authority = settings.Authority?.AbsoluteUri,
 
-                EncryptionCertificateStoreLocation = settings.EncryptionCertificateStoreLocation,
-                EncryptionCertificateStoreName = settings.EncryptionCertificateStoreName,
-                EncryptionCertificateThumbprint = settings.EncryptionCertificateThumbprint,
+            EncryptionCertificateStoreLocation = settings.EncryptionCertificateStoreLocation,
+            EncryptionCertificateStoreName = settings.EncryptionCertificateStoreName,
+            EncryptionCertificateThumbprint = settings.EncryptionCertificateThumbprint,
 
-                SigningCertificateStoreLocation = settings.SigningCertificateStoreLocation,
-                SigningCertificateStoreName = settings.SigningCertificateStoreName,
-                SigningCertificateThumbprint = settings.SigningCertificateThumbprint,
+            SigningCertificateStoreLocation = settings.SigningCertificateStoreLocation,
+            SigningCertificateStoreName = settings.SigningCertificateStoreName,
+            SigningCertificateThumbprint = settings.SigningCertificateThumbprint,
 
-                // The recipe step only reads these flags, and uses constants for the paths.
-                // Conversely, we export true for endpoints with a path, false for those without.
-                EnableAuthorizationEndpoint = !string.IsNullOrWhiteSpace(settings.AuthorizationEndpointPath),
-                EnableLogoutEndpoint = !string.IsNullOrWhiteSpace(settings.LogoutEndpointPath),
-                EnableTokenEndpoint = !string.IsNullOrWhiteSpace(settings.TokenEndpointPath),
-                EnableUserInfoEndpoint = !string.IsNullOrWhiteSpace(settings.UserinfoEndpointPath),
-                EnableIntrospectionEndpoint = !string.IsNullOrWhiteSpace(settings.IntrospectionEndpointPath),
-                EnableRevocationEndpoint = !string.IsNullOrWhiteSpace(settings.RevocationEndpointPath),
+            // The recipe step only reads these flags, and uses constants for the paths.
+            // Conversely, we export true for endpoints with a path, false for those without.
+            EnableAuthorizationEndpoint = !string.IsNullOrWhiteSpace(settings.AuthorizationEndpointPath),
+            EnableLogoutEndpoint = !string.IsNullOrWhiteSpace(settings.LogoutEndpointPath),
+            EnableTokenEndpoint = !string.IsNullOrWhiteSpace(settings.TokenEndpointPath),
+            EnableUserInfoEndpoint = !string.IsNullOrWhiteSpace(settings.UserinfoEndpointPath),
+            EnableIntrospectionEndpoint = !string.IsNullOrWhiteSpace(settings.IntrospectionEndpointPath),
+            EnableRevocationEndpoint = !string.IsNullOrWhiteSpace(settings.RevocationEndpointPath),
 
-                AllowAuthorizationCodeFlow = settings.AllowAuthorizationCodeFlow,
-                AllowClientCredentialsFlow = settings.AllowClientCredentialsFlow,
-                AllowHybridFlow = settings.AllowHybridFlow,
-                AllowImplicitFlow = settings.AllowImplicitFlow,
-                AllowPasswordFlow = settings.AllowPasswordFlow,
-                AllowRefreshTokenFlow = settings.AllowRefreshTokenFlow,
+            AllowAuthorizationCodeFlow = settings.AllowAuthorizationCodeFlow,
+            AllowClientCredentialsFlow = settings.AllowClientCredentialsFlow,
+            AllowHybridFlow = settings.AllowHybridFlow,
+            AllowImplicitFlow = settings.AllowImplicitFlow,
+            AllowPasswordFlow = settings.AllowPasswordFlow,
+            AllowRefreshTokenFlow = settings.AllowRefreshTokenFlow,
 
-                DisableAccessTokenEncryption = settings.DisableAccessTokenEncryption,
-                DisableRollingRefreshTokens = settings.DisableRollingRefreshTokens,
-                UseReferenceAccessTokens = settings.UseReferenceAccessTokens,
-                RequireProofKeyForCodeExchange = settings.RequireProofKeyForCodeExchange,
-            };
+            DisableAccessTokenEncryption = settings.DisableAccessTokenEncryption,
+            DisableRollingRefreshTokens = settings.DisableRollingRefreshTokens,
+            UseReferenceAccessTokens = settings.UseReferenceAccessTokens,
+            RequireProofKeyForCodeExchange = settings.RequireProofKeyForCodeExchange,
+        };
 
-            // Use nameof(OpenIdServerSettings) as name,
-            // to match the recipe step.
-            var obj = new JsonObject
-            {
-                ["name"] = nameof(OpenIdServerSettings),
-            };
+        // Use nameof(OpenIdServerSettings) as name,
+        // to match the recipe step.
+        var obj = new JsonObject
+        {
+            ["name"] = nameof(OpenIdServerSettings),
+        };
 
-            obj.Merge(JObject.FromObject(settingsModel));
+        obj.Merge(JObject.FromObject(settingsModel));
 
-            result.Steps.Add(obj);
-        }
+        result.Steps.Add(obj);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdServerDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdServerDeploymentStep.cs
index 348e474febe..53fc76daa00 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdServerDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdServerDeploymentStep.cs
@@ -1,15 +1,14 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.OpenId.Deployment
+namespace OrchardCore.OpenId.Deployment;
+
+/// <summary>
+/// Adds Open ID settings to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class OpenIdServerDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds Open ID settings to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class OpenIdServerDeploymentStep : DeploymentStep
+    public OpenIdServerDeploymentStep()
     {
-        public OpenIdServerDeploymentStep()
-        {
-            Name = "OpenID Server";
-        }
+        Name = "OpenID Server";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdServerDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdServerDeploymentStepDriver.cs
index fc8862fd1e4..9b9b4a25849 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdServerDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdServerDeploymentStepDriver.cs
@@ -3,22 +3,21 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.OpenId.Deployment
+namespace OrchardCore.OpenId.Deployment;
+
+public sealed class OpenIdServerDeploymentStepDriver : DisplayDriver<DeploymentStep, OpenIdServerDeploymentStep>
 {
-    public sealed class OpenIdServerDeploymentStepDriver : DisplayDriver<DeploymentStep, OpenIdServerDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(OpenIdServerDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(OpenIdServerDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("OpenIdServerDeploymentStep_Summary", step).Location("Summary", "Content"),
-                    View("OpenIdServerDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("OpenIdServerDeploymentStep_Summary", step).Location("Summary", "Content"),
+                View("OpenIdServerDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(OpenIdServerDeploymentStep step, BuildEditorContext context)
-        {
-            return View("OpenIdServerDeploymentStep_Edit", step).Location("Content");
-        }
+    public override IDisplayResult Edit(OpenIdServerDeploymentStep step, BuildEditorContext context)
+    {
+        return View("OpenIdServerDeploymentStep_Edit", step).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdValidationDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdValidationDeploymentSource.cs
index 66bd3305445..70b5524073f 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdValidationDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdValidationDeploymentSource.cs
@@ -4,35 +4,34 @@
 using OrchardCore.OpenId.Services;
 using OrchardCore.OpenId.Settings;
 
-namespace OrchardCore.OpenId.Deployment
+namespace OrchardCore.OpenId.Deployment;
+
+public class OpenIdValidationDeploymentSource : IDeploymentSource
 {
-    public class OpenIdValidationDeploymentSource : IDeploymentSource
+    private readonly IOpenIdValidationService _openIdValidationService;
+
+    public OpenIdValidationDeploymentSource(IOpenIdValidationService openIdValidationService)
     {
-        private readonly IOpenIdValidationService _openIdValidationService;
+        _openIdValidationService = openIdValidationService;
+    }
 
-        public OpenIdValidationDeploymentSource(IOpenIdValidationService openIdValidationService)
-        {
-            _openIdValidationService = openIdValidationService;
-        }
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        var openIdValidationStep = step as OpenIdValidationDeploymentStep;
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        if (openIdValidationStep == null)
         {
-            var openIdValidationStep = step as OpenIdValidationDeploymentStep;
-
-            if (openIdValidationStep == null)
-            {
-                return;
-            }
+            return;
+        }
 
-            var validationSettings = await _openIdValidationService.GetSettingsAsync();
+        var validationSettings = await _openIdValidationService.GetSettingsAsync();
 
-            // The 'name' property should match the related recipe step name.
-            var jObject = new JsonObject { ["name"] = nameof(OpenIdValidationSettings) };
+        // The 'name' property should match the related recipe step name.
+        var jObject = new JsonObject { ["name"] = nameof(OpenIdValidationSettings) };
 
-            // Merge settings as the recipe step doesn't use a child property.
-            jObject.Merge(JObject.FromObject(validationSettings));
+        // Merge settings as the recipe step doesn't use a child property.
+        jObject.Merge(JObject.FromObject(validationSettings));
 
-            result.Steps.Add(jObject);
-        }
+        result.Steps.Add(jObject);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdValidationDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdValidationDeploymentStep.cs
index d5b51715d87..729abc83a55 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdValidationDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdValidationDeploymentStep.cs
@@ -1,15 +1,14 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.OpenId.Deployment
+namespace OrchardCore.OpenId.Deployment;
+
+/// <summary>
+/// Adds Open ID settings to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class OpenIdValidationDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds Open ID settings to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class OpenIdValidationDeploymentStep : DeploymentStep
+    public OpenIdValidationDeploymentStep()
     {
-        public OpenIdValidationDeploymentStep()
-        {
-            Name = "OpenID Validation";
-        }
+        Name = "OpenID Validation";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdValidationDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdValidationDeploymentStepDriver.cs
index 43f8b0e3f16..2fc99b8e6a5 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdValidationDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Deployment/OpenIdValidationDeploymentStepDriver.cs
@@ -3,22 +3,21 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.OpenId.Deployment
+namespace OrchardCore.OpenId.Deployment;
+
+public sealed class OpenIdValidationDeploymentStepDriver : DisplayDriver<DeploymentStep, OpenIdValidationDeploymentStep>
 {
-    public sealed class OpenIdValidationDeploymentStepDriver : DisplayDriver<DeploymentStep, OpenIdValidationDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(OpenIdValidationDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(OpenIdValidationDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("OpenIdValidationDeploymentStep_Summary", step).Location("Summary", "Content"),
-                    View("OpenIdValidationDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("OpenIdValidationDeploymentStep_Summary", step).Location("Summary", "Content"),
+                View("OpenIdValidationDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(OpenIdValidationDeploymentStep step, BuildEditorContext context)
-        {
-            return View("OpenIdValidationDeploymentStep_Edit", step).Location("Content");
-        }
+    public override IDisplayResult Edit(OpenIdValidationDeploymentStep step, BuildEditorContext context)
+    {
+        return View("OpenIdValidationDeploymentStep_Edit", step).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Drivers/OpenIdClientSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Drivers/OpenIdClientSettingsDisplayDriver.cs
index b03b125da35..eb5193950dd 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Drivers/OpenIdClientSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Drivers/OpenIdClientSettingsDisplayDriver.cs
@@ -18,189 +18,188 @@
 using OrchardCore.OpenId.ViewModels;
 using OrchardCore.Settings;
 
-namespace OrchardCore.OpenId.Drivers
+namespace OrchardCore.OpenId.Drivers;
+
+public sealed class OpenIdClientSettingsDisplayDriver : SiteDisplayDriver<OpenIdClientSettings>
 {
-    public sealed class OpenIdClientSettingsDisplayDriver : SiteDisplayDriver<OpenIdClientSettings>
+    private static readonly char[] _separator = [' ', ','];
+
+    private readonly IShellReleaseManager _shellReleaseManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IDataProtectionProvider _dataProtectionProvider;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IOpenIdClientService _clientService;
+
+    internal readonly IStringLocalizer S;
+
+    protected override string SettingsGroupId
+        => "OrchardCore.OpenId.Client";
+
+    public OpenIdClientSettingsDisplayDriver(
+        IShellReleaseManager shellReleaseManager,
+        IAuthorizationService authorizationService,
+        IDataProtectionProvider dataProtectionProvider,
+        IOpenIdClientService clientService,
+        IHttpContextAccessor httpContextAccessor,
+        IStringLocalizer<OpenIdClientSettingsDisplayDriver> stringLocalizer)
     {
-        private static readonly char[] _separator = [' ', ','];
-
-        private readonly IShellReleaseManager _shellReleaseManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IDataProtectionProvider _dataProtectionProvider;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IOpenIdClientService _clientService;
-
-        internal readonly IStringLocalizer S;
-
-        protected override string SettingsGroupId
-            => "OrchardCore.OpenId.Client";
-
-        public OpenIdClientSettingsDisplayDriver(
-            IShellReleaseManager shellReleaseManager,
-            IAuthorizationService authorizationService,
-            IDataProtectionProvider dataProtectionProvider,
-            IOpenIdClientService clientService,
-            IHttpContextAccessor httpContextAccessor,
-            IStringLocalizer<OpenIdClientSettingsDisplayDriver> stringLocalizer)
-        {
-            _shellReleaseManager = shellReleaseManager;
-            _authorizationService = authorizationService;
-            _dataProtectionProvider = dataProtectionProvider;
-            _clientService = clientService;
-            _httpContextAccessor = httpContextAccessor;
-            S = stringLocalizer;
-        }
+        _shellReleaseManager = shellReleaseManager;
+        _authorizationService = authorizationService;
+        _dataProtectionProvider = dataProtectionProvider;
+        _clientService = clientService;
+        _httpContextAccessor = httpContextAccessor;
+        S = stringLocalizer;
+    }
 
-        public override async Task<IDisplayResult> EditAsync(ISite site, OpenIdClientSettings settings, BuildEditorContext context)
+    public override async Task<IDisplayResult> EditAsync(ISite site, OpenIdClientSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageClientSettings))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageClientSettings))
-            {
-                return null;
-            }
-
-            context.AddTenantReloadWarningWrapper();
-
-            return Initialize<OpenIdClientSettingsViewModel>("OpenIdClientSettings_Edit", model =>
-            {
-                model.DisplayName = settings.DisplayName;
-                model.Scopes = settings.Scopes != null ? string.Join(" ", settings.Scopes) : null;
-                model.Authority = settings.Authority?.AbsoluteUri;
-                model.CallbackPath = settings.CallbackPath;
-                model.ClientId = settings.ClientId;
-                model.ClientSecret = settings.ClientSecret;
-                model.SignedOutCallbackPath = settings.SignedOutCallbackPath;
-                model.SignedOutRedirectUri = settings.SignedOutRedirectUri;
-                model.ResponseMode = settings.ResponseMode;
-                model.StoreExternalTokens = settings.StoreExternalTokens;
-
-                if (settings.ResponseType == OpenIdConnectResponseType.Code)
-                {
-                    model.UseCodeFlow = true;
-                }
-                else if (settings.ResponseType == OpenIdConnectResponseType.CodeIdToken)
-                {
-                    model.UseCodeIdTokenFlow = true;
-                }
-                else if (settings.ResponseType == OpenIdConnectResponseType.CodeIdTokenToken)
-                {
-                    model.UseCodeIdTokenTokenFlow = true;
-                }
-                else if (settings.ResponseType == OpenIdConnectResponseType.CodeToken)
-                {
-                    model.UseCodeTokenFlow = true;
-                }
-                else if (settings.ResponseType == OpenIdConnectResponseType.IdToken)
-                {
-                    model.UseIdTokenFlow = true;
-                }
-                else if (settings.ResponseType == OpenIdConnectResponseType.IdTokenToken)
-                {
-                    model.UseIdTokenTokenFlow = true;
-                }
-
-                model.Parameters = JConvert.SerializeObject(settings.Parameters, JOptions.CamelCase);
-            }).Location("Content:2")
-            .OnGroup(SettingsGroupId);
+            return null;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, OpenIdClientSettings settings, UpdateEditorContext context)
-        {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageClientSettings))
-            {
-                return null;
-            }
-
-            var previousClientSecret = settings.ClientSecret;
-            var model = new OpenIdClientSettingsViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        context.AddTenantReloadWarningWrapper();
 
-            model.Scopes ??= string.Empty;
-
-            settings.DisplayName = model.DisplayName;
-            settings.Scopes = model.Scopes.Split(_separator, StringSplitOptions.RemoveEmptyEntries);
-            settings.Authority = !string.IsNullOrEmpty(model.Authority) ? new Uri(model.Authority, UriKind.Absolute) : null;
-            settings.CallbackPath = model.CallbackPath;
-            settings.ClientId = model.ClientId;
-            settings.SignedOutCallbackPath = model.SignedOutCallbackPath;
-            settings.SignedOutRedirectUri = model.SignedOutRedirectUri;
-            settings.ResponseMode = model.ResponseMode;
-            settings.StoreExternalTokens = model.StoreExternalTokens;
-
-            var useClientSecret = true;
-
-            if (model.UseCodeFlow)
-            {
-                settings.ResponseType = OpenIdConnectResponseType.Code;
-            }
-            else if (model.UseCodeIdTokenFlow)
-            {
-                settings.ResponseType = OpenIdConnectResponseType.CodeIdToken;
+        return Initialize<OpenIdClientSettingsViewModel>("OpenIdClientSettings_Edit", model =>
+        {
+            model.DisplayName = settings.DisplayName;
+            model.Scopes = settings.Scopes != null ? string.Join(" ", settings.Scopes) : null;
+            model.Authority = settings.Authority?.AbsoluteUri;
+            model.CallbackPath = settings.CallbackPath;
+            model.ClientId = settings.ClientId;
+            model.ClientSecret = settings.ClientSecret;
+            model.SignedOutCallbackPath = settings.SignedOutCallbackPath;
+            model.SignedOutRedirectUri = settings.SignedOutRedirectUri;
+            model.ResponseMode = settings.ResponseMode;
+            model.StoreExternalTokens = settings.StoreExternalTokens;
+
+            if (settings.ResponseType == OpenIdConnectResponseType.Code)
+            {
+                model.UseCodeFlow = true;
             }
-            else if (model.UseCodeIdTokenTokenFlow)
+            else if (settings.ResponseType == OpenIdConnectResponseType.CodeIdToken)
             {
-                settings.ResponseType = OpenIdConnectResponseType.CodeIdTokenToken;
+                model.UseCodeIdTokenFlow = true;
             }
-            else if (model.UseCodeTokenFlow)
+            else if (settings.ResponseType == OpenIdConnectResponseType.CodeIdTokenToken)
             {
-                settings.ResponseType = OpenIdConnectResponseType.CodeToken;
+                model.UseCodeIdTokenTokenFlow = true;
             }
-            else if (model.UseIdTokenFlow)
+            else if (settings.ResponseType == OpenIdConnectResponseType.CodeToken)
             {
-                settings.ResponseType = OpenIdConnectResponseType.IdToken;
-                useClientSecret = false;
+                model.UseCodeTokenFlow = true;
             }
-            else if (model.UseIdTokenTokenFlow)
+            else if (settings.ResponseType == OpenIdConnectResponseType.IdToken)
             {
-                settings.ResponseType = OpenIdConnectResponseType.IdTokenToken;
-                useClientSecret = false;
+                model.UseIdTokenFlow = true;
             }
-            else
+            else if (settings.ResponseType == OpenIdConnectResponseType.IdTokenToken)
             {
-                settings.ResponseType = OpenIdConnectResponseType.None;
-                useClientSecret = false;
+                model.UseIdTokenTokenFlow = true;
             }
 
-            try
-            {
-                settings.Parameters = string.IsNullOrWhiteSpace(model.Parameters)
-                    ? []
-                    : JConvert.DeserializeObject<ParameterSetting[]>(model.Parameters);
-            }
-            catch
-            {
-                context.Updater.ModelState.AddModelError(Prefix, S["The parameters are written in an incorrect format."]);
-            }
+            model.Parameters = JConvert.SerializeObject(settings.Parameters, JOptions.CamelCase);
+        }).Location("Content:2")
+        .OnGroup(SettingsGroupId);
+    }
 
-            if (!useClientSecret)
-            {
-                model.ClientSecret = previousClientSecret = null;
-            }
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, OpenIdClientSettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageClientSettings))
+        {
+            return null;
+        }
 
-            // Restore the client secret if the input is empty (i.e if it hasn't been reset).
-            if (string.IsNullOrEmpty(model.ClientSecret))
-            {
-                settings.ClientSecret = previousClientSecret;
-            }
-            else
-            {
-                var protector = _dataProtectionProvider.CreateProtector(nameof(OpenIdClientConfiguration));
-                settings.ClientSecret = protector.Protect(model.ClientSecret);
-            }
+        var previousClientSecret = settings.ClientSecret;
+        var model = new OpenIdClientSettingsViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            foreach (var result in await _clientService.ValidateSettingsAsync(settings))
+        model.Scopes ??= string.Empty;
+
+        settings.DisplayName = model.DisplayName;
+        settings.Scopes = model.Scopes.Split(_separator, StringSplitOptions.RemoveEmptyEntries);
+        settings.Authority = !string.IsNullOrEmpty(model.Authority) ? new Uri(model.Authority, UriKind.Absolute) : null;
+        settings.CallbackPath = model.CallbackPath;
+        settings.ClientId = model.ClientId;
+        settings.SignedOutCallbackPath = model.SignedOutCallbackPath;
+        settings.SignedOutRedirectUri = model.SignedOutRedirectUri;
+        settings.ResponseMode = model.ResponseMode;
+        settings.StoreExternalTokens = model.StoreExternalTokens;
+
+        var useClientSecret = true;
+
+        if (model.UseCodeFlow)
+        {
+            settings.ResponseType = OpenIdConnectResponseType.Code;
+        }
+        else if (model.UseCodeIdTokenFlow)
+        {
+            settings.ResponseType = OpenIdConnectResponseType.CodeIdToken;
+        }
+        else if (model.UseCodeIdTokenTokenFlow)
+        {
+            settings.ResponseType = OpenIdConnectResponseType.CodeIdTokenToken;
+        }
+        else if (model.UseCodeTokenFlow)
+        {
+            settings.ResponseType = OpenIdConnectResponseType.CodeToken;
+        }
+        else if (model.UseIdTokenFlow)
+        {
+            settings.ResponseType = OpenIdConnectResponseType.IdToken;
+            useClientSecret = false;
+        }
+        else if (model.UseIdTokenTokenFlow)
+        {
+            settings.ResponseType = OpenIdConnectResponseType.IdTokenToken;
+            useClientSecret = false;
+        }
+        else
+        {
+            settings.ResponseType = OpenIdConnectResponseType.None;
+            useClientSecret = false;
+        }
+
+        try
+        {
+            settings.Parameters = string.IsNullOrWhiteSpace(model.Parameters)
+                ? []
+                : JConvert.DeserializeObject<ParameterSetting[]>(model.Parameters);
+        }
+        catch
+        {
+            context.Updater.ModelState.AddModelError(Prefix, S["The parameters are written in an incorrect format."]);
+        }
+
+        if (!useClientSecret)
+        {
+            model.ClientSecret = previousClientSecret = null;
+        }
+
+        // Restore the client secret if the input is empty (i.e if it hasn't been reset).
+        if (string.IsNullOrEmpty(model.ClientSecret))
+        {
+            settings.ClientSecret = previousClientSecret;
+        }
+        else
+        {
+            var protector = _dataProtectionProvider.CreateProtector(nameof(OpenIdClientConfiguration));
+            settings.ClientSecret = protector.Protect(model.ClientSecret);
+        }
+
+        foreach (var result in await _clientService.ValidateSettingsAsync(settings))
+        {
+            if (result != ValidationResult.Success)
             {
-                if (result != ValidationResult.Success)
-                {
-                    var key = result.MemberNames.FirstOrDefault() ?? string.Empty;
-                    context.Updater.ModelState.AddModelError(key, result.ErrorMessage);
-                }
+                var key = result.MemberNames.FirstOrDefault() ?? string.Empty;
+                context.Updater.ModelState.AddModelError(key, result.ErrorMessage);
             }
+        }
 
-            _shellReleaseManager.RequestRelease();
+        _shellReleaseManager.RequestRelease();
 
-            return await EditAsync(site, settings, context);
-        }
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Drivers/OpenIdServerSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Drivers/OpenIdServerSettingsDisplayDriver.cs
index 9ff33b459ad..c010c85f8e9 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Drivers/OpenIdServerSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Drivers/OpenIdServerSettingsDisplayDriver.cs
@@ -8,112 +8,111 @@
 using OrchardCore.OpenId.ViewModels;
 using static OrchardCore.OpenId.ViewModels.OpenIdServerSettingsViewModel;
 
-namespace OrchardCore.OpenId.Drivers
+namespace OrchardCore.OpenId.Drivers;
+
+public sealed class OpenIdServerSettingsDisplayDriver : DisplayDriver<OpenIdServerSettings>
 {
-    public sealed class OpenIdServerSettingsDisplayDriver : DisplayDriver<OpenIdServerSettings>
-    {
-        private readonly IOpenIdServerService _serverService;
+    private readonly IOpenIdServerService _serverService;
 
-        public OpenIdServerSettingsDisplayDriver(IOpenIdServerService serverService)
-            => _serverService = serverService;
+    public OpenIdServerSettingsDisplayDriver(IOpenIdServerService serverService)
+        => _serverService = serverService;
 
-        public override IDisplayResult Edit(OpenIdServerSettings settings, BuildEditorContext context)
-        {
-            context.AddTenantReloadWarningWrapper();
+    public override IDisplayResult Edit(OpenIdServerSettings settings, BuildEditorContext context)
+    {
+        context.AddTenantReloadWarningWrapper();
 
-            return Initialize<OpenIdServerSettingsViewModel>("OpenIdServerSettings_Edit", async model =>
+        return Initialize<OpenIdServerSettingsViewModel>("OpenIdServerSettings_Edit", async model =>
+        {
+            model.AccessTokenFormat = settings.AccessTokenFormat;
+            model.Authority = settings.Authority?.AbsoluteUri;
+
+            model.EncryptionCertificateStoreLocation = settings.EncryptionCertificateStoreLocation;
+            model.EncryptionCertificateStoreName = settings.EncryptionCertificateStoreName;
+            model.EncryptionCertificateThumbprint = settings.EncryptionCertificateThumbprint;
+
+            model.SigningCertificateStoreLocation = settings.SigningCertificateStoreLocation;
+            model.SigningCertificateStoreName = settings.SigningCertificateStoreName;
+            model.SigningCertificateThumbprint = settings.SigningCertificateThumbprint;
+
+            model.EnableAuthorizationEndpoint = settings.AuthorizationEndpointPath.HasValue;
+            model.EnableLogoutEndpoint = settings.LogoutEndpointPath.HasValue;
+            model.EnableTokenEndpoint = settings.TokenEndpointPath.HasValue;
+            model.EnableUserInfoEndpoint = settings.UserinfoEndpointPath.HasValue;
+            model.EnableIntrospectionEndpoint = settings.IntrospectionEndpointPath.HasValue;
+            model.EnableRevocationEndpoint = settings.RevocationEndpointPath.HasValue;
+
+            model.AllowAuthorizationCodeFlow = settings.AllowAuthorizationCodeFlow;
+            model.AllowClientCredentialsFlow = settings.AllowClientCredentialsFlow;
+            model.AllowHybridFlow = settings.AllowHybridFlow;
+            model.AllowImplicitFlow = settings.AllowImplicitFlow;
+            model.AllowPasswordFlow = settings.AllowPasswordFlow;
+            model.AllowRefreshTokenFlow = settings.AllowRefreshTokenFlow;
+
+            model.DisableAccessTokenEncryption = settings.DisableAccessTokenEncryption;
+            model.DisableRollingRefreshTokens = settings.DisableRollingRefreshTokens;
+            model.UseReferenceAccessTokens = settings.UseReferenceAccessTokens;
+            model.RequireProofKeyForCodeExchange = settings.RequireProofKeyForCodeExchange;
+
+            foreach (var (certificate, location, name) in await _serverService.GetAvailableCertificatesAsync())
             {
-                model.AccessTokenFormat = settings.AccessTokenFormat;
-                model.Authority = settings.Authority?.AbsoluteUri;
-
-                model.EncryptionCertificateStoreLocation = settings.EncryptionCertificateStoreLocation;
-                model.EncryptionCertificateStoreName = settings.EncryptionCertificateStoreName;
-                model.EncryptionCertificateThumbprint = settings.EncryptionCertificateThumbprint;
-
-                model.SigningCertificateStoreLocation = settings.SigningCertificateStoreLocation;
-                model.SigningCertificateStoreName = settings.SigningCertificateStoreName;
-                model.SigningCertificateThumbprint = settings.SigningCertificateThumbprint;
-
-                model.EnableAuthorizationEndpoint = settings.AuthorizationEndpointPath.HasValue;
-                model.EnableLogoutEndpoint = settings.LogoutEndpointPath.HasValue;
-                model.EnableTokenEndpoint = settings.TokenEndpointPath.HasValue;
-                model.EnableUserInfoEndpoint = settings.UserinfoEndpointPath.HasValue;
-                model.EnableIntrospectionEndpoint = settings.IntrospectionEndpointPath.HasValue;
-                model.EnableRevocationEndpoint = settings.RevocationEndpointPath.HasValue;
-
-                model.AllowAuthorizationCodeFlow = settings.AllowAuthorizationCodeFlow;
-                model.AllowClientCredentialsFlow = settings.AllowClientCredentialsFlow;
-                model.AllowHybridFlow = settings.AllowHybridFlow;
-                model.AllowImplicitFlow = settings.AllowImplicitFlow;
-                model.AllowPasswordFlow = settings.AllowPasswordFlow;
-                model.AllowRefreshTokenFlow = settings.AllowRefreshTokenFlow;
-
-                model.DisableAccessTokenEncryption = settings.DisableAccessTokenEncryption;
-                model.DisableRollingRefreshTokens = settings.DisableRollingRefreshTokens;
-                model.UseReferenceAccessTokens = settings.UseReferenceAccessTokens;
-                model.RequireProofKeyForCodeExchange = settings.RequireProofKeyForCodeExchange;
-
-                foreach (var (certificate, location, name) in await _serverService.GetAvailableCertificatesAsync())
+                model.AvailableCertificates.Add(new CertificateInfo
                 {
-                    model.AvailableCertificates.Add(new CertificateInfo
-                    {
-                        StoreLocation = location,
-                        StoreName = name,
-                        FriendlyName = certificate.FriendlyName,
-                        Issuer = certificate.Issuer,
-                        Subject = certificate.Subject,
-                        NotBefore = certificate.NotBefore,
-                        NotAfter = certificate.NotAfter,
-                        ThumbPrint = certificate.Thumbprint,
-                        HasPrivateKey = certificate.HasPrivateKey,
-                        Archived = certificate.Archived
-                    });
-                }
-            }).Location("Content:2");
-        }
-
-        public override async Task<IDisplayResult> UpdateAsync(OpenIdServerSettings settings, UpdateEditorContext context)
-        {
-            var model = new OpenIdServerSettingsViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
-
-            settings.AccessTokenFormat = model.AccessTokenFormat;
-            settings.Authority = !string.IsNullOrEmpty(model.Authority) ? new Uri(model.Authority, UriKind.Absolute) : null;
-
-            settings.EncryptionCertificateStoreLocation = model.EncryptionCertificateStoreLocation;
-            settings.EncryptionCertificateStoreName = model.EncryptionCertificateStoreName;
-            settings.EncryptionCertificateThumbprint = model.EncryptionCertificateThumbprint;
-
-            settings.SigningCertificateStoreLocation = model.SigningCertificateStoreLocation;
-            settings.SigningCertificateStoreName = model.SigningCertificateStoreName;
-            settings.SigningCertificateThumbprint = model.SigningCertificateThumbprint;
-
-            settings.AuthorizationEndpointPath = model.EnableAuthorizationEndpoint ?
-                new PathString("/connect/authorize") : PathString.Empty;
-            settings.LogoutEndpointPath = model.EnableLogoutEndpoint ?
-                new PathString("/connect/logout") : PathString.Empty;
-            settings.TokenEndpointPath = model.EnableTokenEndpoint ?
-                new PathString("/connect/token") : PathString.Empty;
-            settings.UserinfoEndpointPath = model.EnableUserInfoEndpoint ?
-                new PathString("/connect/userinfo") : PathString.Empty;
-            settings.IntrospectionEndpointPath = model.EnableIntrospectionEndpoint ?
-                new PathString("/connect/introspect") : PathString.Empty;
-            settings.RevocationEndpointPath = model.EnableRevocationEndpoint ?
-                new PathString("/connect/revoke") : PathString.Empty;
-
-            settings.AllowAuthorizationCodeFlow = model.AllowAuthorizationCodeFlow;
-            settings.AllowClientCredentialsFlow = model.AllowClientCredentialsFlow;
-            settings.AllowHybridFlow = model.AllowHybridFlow;
-            settings.AllowImplicitFlow = model.AllowImplicitFlow;
-            settings.AllowPasswordFlow = model.AllowPasswordFlow;
-            settings.AllowRefreshTokenFlow = model.AllowRefreshTokenFlow;
-
-            settings.DisableAccessTokenEncryption = model.DisableAccessTokenEncryption;
-            settings.DisableRollingRefreshTokens = model.DisableRollingRefreshTokens;
-            settings.UseReferenceAccessTokens = model.UseReferenceAccessTokens;
-            settings.RequireProofKeyForCodeExchange = model.RequireProofKeyForCodeExchange;
-
-            return await EditAsync(settings, context);
-        }
+                    StoreLocation = location,
+                    StoreName = name,
+                    FriendlyName = certificate.FriendlyName,
+                    Issuer = certificate.Issuer,
+                    Subject = certificate.Subject,
+                    NotBefore = certificate.NotBefore,
+                    NotAfter = certificate.NotAfter,
+                    ThumbPrint = certificate.Thumbprint,
+                    HasPrivateKey = certificate.HasPrivateKey,
+                    Archived = certificate.Archived
+                });
+            }
+        }).Location("Content:2");
+    }
+
+    public override async Task<IDisplayResult> UpdateAsync(OpenIdServerSettings settings, UpdateEditorContext context)
+    {
+        var model = new OpenIdServerSettingsViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
+
+        settings.AccessTokenFormat = model.AccessTokenFormat;
+        settings.Authority = !string.IsNullOrEmpty(model.Authority) ? new Uri(model.Authority, UriKind.Absolute) : null;
+
+        settings.EncryptionCertificateStoreLocation = model.EncryptionCertificateStoreLocation;
+        settings.EncryptionCertificateStoreName = model.EncryptionCertificateStoreName;
+        settings.EncryptionCertificateThumbprint = model.EncryptionCertificateThumbprint;
+
+        settings.SigningCertificateStoreLocation = model.SigningCertificateStoreLocation;
+        settings.SigningCertificateStoreName = model.SigningCertificateStoreName;
+        settings.SigningCertificateThumbprint = model.SigningCertificateThumbprint;
+
+        settings.AuthorizationEndpointPath = model.EnableAuthorizationEndpoint ?
+            new PathString("/connect/authorize") : PathString.Empty;
+        settings.LogoutEndpointPath = model.EnableLogoutEndpoint ?
+            new PathString("/connect/logout") : PathString.Empty;
+        settings.TokenEndpointPath = model.EnableTokenEndpoint ?
+            new PathString("/connect/token") : PathString.Empty;
+        settings.UserinfoEndpointPath = model.EnableUserInfoEndpoint ?
+            new PathString("/connect/userinfo") : PathString.Empty;
+        settings.IntrospectionEndpointPath = model.EnableIntrospectionEndpoint ?
+            new PathString("/connect/introspect") : PathString.Empty;
+        settings.RevocationEndpointPath = model.EnableRevocationEndpoint ?
+            new PathString("/connect/revoke") : PathString.Empty;
+
+        settings.AllowAuthorizationCodeFlow = model.AllowAuthorizationCodeFlow;
+        settings.AllowClientCredentialsFlow = model.AllowClientCredentialsFlow;
+        settings.AllowHybridFlow = model.AllowHybridFlow;
+        settings.AllowImplicitFlow = model.AllowImplicitFlow;
+        settings.AllowPasswordFlow = model.AllowPasswordFlow;
+        settings.AllowRefreshTokenFlow = model.AllowRefreshTokenFlow;
+
+        settings.DisableAccessTokenEncryption = model.DisableAccessTokenEncryption;
+        settings.DisableRollingRefreshTokens = model.DisableRollingRefreshTokens;
+        settings.UseReferenceAccessTokens = model.UseReferenceAccessTokens;
+        settings.RequireProofKeyForCodeExchange = model.RequireProofKeyForCodeExchange;
+
+        return await EditAsync(settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Drivers/OpenIdValidationSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Drivers/OpenIdValidationSettingsDisplayDriver.cs
index b0ae23aa395..58aaff01b87 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Drivers/OpenIdValidationSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Drivers/OpenIdValidationSettingsDisplayDriver.cs
@@ -10,61 +10,60 @@
 using OrchardCore.OpenId.Settings;
 using OrchardCore.OpenId.ViewModels;
 
-namespace OrchardCore.OpenId.Drivers
+namespace OrchardCore.OpenId.Drivers;
+
+public sealed class OpenIdValidationSettingsDisplayDriver : DisplayDriver<OpenIdValidationSettings>
 {
-    public sealed class OpenIdValidationSettingsDisplayDriver : DisplayDriver<OpenIdValidationSettings>
-    {
-        private readonly IShellHost _shellHost;
+    private readonly IShellHost _shellHost;
 
-        public OpenIdValidationSettingsDisplayDriver(IShellHost shellHost)
-            => _shellHost = shellHost;
+    public OpenIdValidationSettingsDisplayDriver(IShellHost shellHost)
+        => _shellHost = shellHost;
 
-        public override IDisplayResult Edit(OpenIdValidationSettings settings, BuildEditorContext context)
+    public override IDisplayResult Edit(OpenIdValidationSettings settings, BuildEditorContext context)
+    {
+        context.AddTenantReloadWarningWrapper();
+
+        return Initialize<OpenIdValidationSettingsViewModel>("OpenIdValidationSettings_Edit", async model =>
         {
-            context.AddTenantReloadWarningWrapper();
+            model.Authority = settings.Authority?.AbsoluteUri;
+            model.MetadataAddress = settings.MetadataAddress?.AbsoluteUri;
+            model.Audience = settings.Audience;
+            model.DisableTokenTypeValidation = settings.DisableTokenTypeValidation;
+            model.Tenant = settings.Tenant;
 
-            return Initialize<OpenIdValidationSettingsViewModel>("OpenIdValidationSettings_Edit", async model =>
-            {
-                model.Authority = settings.Authority?.AbsoluteUri;
-                model.MetadataAddress = settings.MetadataAddress?.AbsoluteUri;
-                model.Audience = settings.Audience;
-                model.DisableTokenTypeValidation = settings.DisableTokenTypeValidation;
-                model.Tenant = settings.Tenant;
+            var availableTenants = new List<string>();
 
-                var availableTenants = new List<string>();
+            foreach (var shellSettings in _shellHost.GetAllSettings().Where(s => s.IsRunning()))
+            {
+                var shellScope = await _shellHost.GetScopeAsync(shellSettings);
 
-                foreach (var shellSettings in _shellHost.GetAllSettings().Where(s => s.IsRunning()))
+                await shellScope.UsingAsync(scope =>
                 {
-                    var shellScope = await _shellHost.GetScopeAsync(shellSettings);
-
-                    await shellScope.UsingAsync(scope =>
+                    var descriptor = scope.ServiceProvider.GetRequiredService<ShellDescriptor>();
+                    if (descriptor.Features.Any(feature => feature.Id == OpenIdConstants.Features.Server))
                     {
-                        var descriptor = scope.ServiceProvider.GetRequiredService<ShellDescriptor>();
-                        if (descriptor.Features.Any(feature => feature.Id == OpenIdConstants.Features.Server))
-                        {
-                            availableTenants.Add(shellSettings.Name);
-                        }
-                        return Task.CompletedTask;
-                    });
-                }
+                        availableTenants.Add(shellSettings.Name);
+                    }
+                    return Task.CompletedTask;
+                });
+            }
 
-                model.AvailableTenants = availableTenants;
-            }).Location("Content:2");
-        }
+            model.AvailableTenants = availableTenants;
+        }).Location("Content:2");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(OpenIdValidationSettings settings, UpdateEditorContext context)
-        {
-            var model = new OpenIdValidationSettingsViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(OpenIdValidationSettings settings, UpdateEditorContext context)
+    {
+        var model = new OpenIdValidationSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            settings.Authority = !string.IsNullOrEmpty(model.Authority) ? new Uri(model.Authority, UriKind.Absolute) : null;
-            settings.MetadataAddress = !string.IsNullOrEmpty(model.MetadataAddress) ? new Uri(model.MetadataAddress, UriKind.Absolute) : null;
-            settings.Audience = model.Audience?.Trim();
-            settings.DisableTokenTypeValidation = model.DisableTokenTypeValidation;
-            settings.Tenant = model.Tenant;
+        settings.Authority = !string.IsNullOrEmpty(model.Authority) ? new Uri(model.Authority, UriKind.Absolute) : null;
+        settings.MetadataAddress = !string.IsNullOrEmpty(model.MetadataAddress) ? new Uri(model.MetadataAddress, UriKind.Absolute) : null;
+        settings.Audience = model.Audience?.Trim();
+        settings.DisableTokenTypeValidation = model.DisableTokenTypeValidation;
+        settings.Tenant = model.Tenant;
 
-            return await EditAsync(settings, context);
-        }
+        return await EditAsync(settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Handlers/OpenIdApplicationRoleRemovedEventHandler.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Handlers/OpenIdApplicationRoleRemovedEventHandler.cs
index cbfbca53565..764fc36017f 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Handlers/OpenIdApplicationRoleRemovedEventHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Handlers/OpenIdApplicationRoleRemovedEventHandler.cs
@@ -3,22 +3,21 @@
 using OrchardCore.OpenId.Abstractions.Managers;
 using OrchardCore.Security;
 
-namespace OrchardCore.OpenId.Services.Handlers
+namespace OrchardCore.OpenId.Services.Handlers;
+
+public class OpenIdApplicationRoleRemovedEventHandler : IRoleRemovedEventHandler
 {
-    public class OpenIdApplicationRoleRemovedEventHandler : IRoleRemovedEventHandler
-    {
-        private readonly IOpenIdApplicationManager _manager;
+    private readonly IOpenIdApplicationManager _manager;
 
-        public OpenIdApplicationRoleRemovedEventHandler(IOpenIdApplicationManager manager)
-            => _manager = manager;
+    public OpenIdApplicationRoleRemovedEventHandler(IOpenIdApplicationManager manager)
+        => _manager = manager;
 
-        public async Task RoleRemovedAsync(string roleName)
+    public async Task RoleRemovedAsync(string roleName)
+    {
+        await foreach (var application in _manager.ListInRoleAsync(roleName))
         {
-            await foreach (var application in _manager.ListInRoleAsync(roleName))
-            {
-                var roles = await _manager.GetRolesAsync(application);
-                await _manager.SetRolesAsync(application, roles.Remove(roleName, StringComparer.OrdinalIgnoreCase));
-            }
+            var roles = await _manager.GetRolesAsync(application);
+            await _manager.SetRolesAsync(application, roles.Remove(roleName, StringComparer.OrdinalIgnoreCase));
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/OpenIdApplicationSettings.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/OpenIdApplicationSettings.cs
index 7c634610ada..1f0682a5968 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/OpenIdApplicationSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/OpenIdApplicationSettings.cs
@@ -5,250 +5,249 @@
 using OrchardCore.OpenId.Abstractions.Descriptors;
 using OrchardCore.OpenId.Abstractions.Managers;
 
-namespace OrchardCore.OpenId
+namespace OrchardCore.OpenId;
+
+public class OpenIdApplicationSettings
 {
-    public class OpenIdApplicationSettings
-    {
-        public string ClientId { get; set; }
-        public string DisplayName { get; set; }
-        public string RedirectUris { get; set; }
-        public string PostLogoutRedirectUris { get; set; }
-        public string Type { get; set; }
-        public string ConsentType { get; set; }
-        public string ClientSecret { get; set; }
-        public string[] Roles { get; set; }
-        public string[] Scopes { get; set; }
-        public bool AllowPasswordFlow { get; set; }
-        public bool AllowClientCredentialsFlow { get; set; }
-        public bool AllowAuthorizationCodeFlow { get; set; }
-        public bool AllowRefreshTokenFlow { get; set; }
-        public bool AllowHybridFlow { get; set; }
-        public bool AllowImplicitFlow { get; set; }
-        public bool AllowLogoutEndpoint { get; set; }
-        public bool AllowIntrospectionEndpoint { get; set; }
-        public bool AllowRevocationEndpoint { get; set; }
-        public bool RequireProofKeyForCodeExchange { get; set; }
-    }
+    public string ClientId { get; set; }
+    public string DisplayName { get; set; }
+    public string RedirectUris { get; set; }
+    public string PostLogoutRedirectUris { get; set; }
+    public string Type { get; set; }
+    public string ConsentType { get; set; }
+    public string ClientSecret { get; set; }
+    public string[] Roles { get; set; }
+    public string[] Scopes { get; set; }
+    public bool AllowPasswordFlow { get; set; }
+    public bool AllowClientCredentialsFlow { get; set; }
+    public bool AllowAuthorizationCodeFlow { get; set; }
+    public bool AllowRefreshTokenFlow { get; set; }
+    public bool AllowHybridFlow { get; set; }
+    public bool AllowImplicitFlow { get; set; }
+    public bool AllowLogoutEndpoint { get; set; }
+    public bool AllowIntrospectionEndpoint { get; set; }
+    public bool AllowRevocationEndpoint { get; set; }
+    public bool RequireProofKeyForCodeExchange { get; set; }
+}
+
+internal static class OpenIdApplicationExtensions
+{
+    internal static readonly string[] _separator = [" ", ","];
 
-    internal static class OpenIdApplicationExtensions
+    public static async Task UpdateDescriptorFromSettings(this IOpenIdApplicationManager _applicationManager, OpenIdApplicationSettings model, object application = null)
     {
-        internal static readonly string[] _separator = [" ", ","];
+        var descriptor = new OpenIdApplicationDescriptor();
 
-        public static async Task UpdateDescriptorFromSettings(this IOpenIdApplicationManager _applicationManager, OpenIdApplicationSettings model, object application = null)
+        if (application != null)
         {
-            var descriptor = new OpenIdApplicationDescriptor();
+            await _applicationManager.PopulateAsync(descriptor, application);
+        }
 
-            if (application != null)
-            {
-                await _applicationManager.PopulateAsync(descriptor, application);
-            }
+        descriptor.ClientId = model.ClientId;
+        descriptor.ConsentType = model.ConsentType;
+        descriptor.DisplayName = model.DisplayName;
+        descriptor.ClientType = model.Type;
 
-            descriptor.ClientId = model.ClientId;
-            descriptor.ConsentType = model.ConsentType;
-            descriptor.DisplayName = model.DisplayName;
-            descriptor.ClientType = model.Type;
+        if (!string.IsNullOrEmpty(model.ClientSecret))
+        {
+            descriptor.ClientSecret = model.ClientSecret;
+        }
 
-            if (!string.IsNullOrEmpty(model.ClientSecret))
-            {
-                descriptor.ClientSecret = model.ClientSecret;
-            }
+        if (string.Equals(descriptor.ClientType, OpenIddictConstants.ClientTypes.Public, StringComparison.OrdinalIgnoreCase))
+        {
+            descriptor.ClientSecret = null;
+        }
 
-            if (string.Equals(descriptor.ClientType, OpenIddictConstants.ClientTypes.Public, StringComparison.OrdinalIgnoreCase))
-            {
-                descriptor.ClientSecret = null;
-            }
+        if (model.AllowLogoutEndpoint)
+        {
+            descriptor.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Logout);
+        }
+        else
+        {
+            descriptor.Permissions.Remove(OpenIddictConstants.Permissions.Endpoints.Logout);
+        }
 
-            if (model.AllowLogoutEndpoint)
-            {
-                descriptor.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Logout);
-            }
-            else
-            {
-                descriptor.Permissions.Remove(OpenIddictConstants.Permissions.Endpoints.Logout);
-            }
+        if (model.AllowAuthorizationCodeFlow || model.AllowHybridFlow)
+        {
+            descriptor.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode);
+        }
+        else
+        {
+            descriptor.Permissions.Remove(OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode);
+        }
 
-            if (model.AllowAuthorizationCodeFlow || model.AllowHybridFlow)
-            {
-                descriptor.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode);
-            }
-            else
-            {
-                descriptor.Permissions.Remove(OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode);
-            }
+        if (model.AllowClientCredentialsFlow)
+        {
+            descriptor.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.ClientCredentials);
+        }
+        else
+        {
+            descriptor.Permissions.Remove(OpenIddictConstants.Permissions.GrantTypes.ClientCredentials);
+        }
 
-            if (model.AllowClientCredentialsFlow)
-            {
-                descriptor.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.ClientCredentials);
-            }
-            else
-            {
-                descriptor.Permissions.Remove(OpenIddictConstants.Permissions.GrantTypes.ClientCredentials);
-            }
+        if (model.AllowHybridFlow || model.AllowImplicitFlow)
+        {
+            descriptor.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.Implicit);
+        }
+        else
+        {
+            descriptor.Permissions.Remove(OpenIddictConstants.Permissions.GrantTypes.Implicit);
+        }
 
-            if (model.AllowHybridFlow || model.AllowImplicitFlow)
-            {
-                descriptor.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.Implicit);
-            }
-            else
-            {
-                descriptor.Permissions.Remove(OpenIddictConstants.Permissions.GrantTypes.Implicit);
-            }
+        if (model.AllowPasswordFlow)
+        {
+            descriptor.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.Password);
+        }
+        else
+        {
+            descriptor.Permissions.Remove(OpenIddictConstants.Permissions.GrantTypes.Password);
+        }
 
-            if (model.AllowPasswordFlow)
-            {
-                descriptor.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.Password);
-            }
-            else
-            {
-                descriptor.Permissions.Remove(OpenIddictConstants.Permissions.GrantTypes.Password);
-            }
+        if (model.AllowRefreshTokenFlow)
+        {
+            descriptor.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.RefreshToken);
+        }
+        else
+        {
+            descriptor.Permissions.Remove(OpenIddictConstants.Permissions.GrantTypes.RefreshToken);
+        }
 
-            if (model.AllowRefreshTokenFlow)
-            {
-                descriptor.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.RefreshToken);
-            }
-            else
-            {
-                descriptor.Permissions.Remove(OpenIddictConstants.Permissions.GrantTypes.RefreshToken);
-            }
+        if (model.AllowAuthorizationCodeFlow || model.AllowHybridFlow || model.AllowImplicitFlow)
+        {
+            descriptor.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Authorization);
+        }
+        else
+        {
+            descriptor.Permissions.Remove(OpenIddictConstants.Permissions.Endpoints.Authorization);
+        }
 
-            if (model.AllowAuthorizationCodeFlow || model.AllowHybridFlow || model.AllowImplicitFlow)
-            {
-                descriptor.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Authorization);
-            }
-            else
-            {
-                descriptor.Permissions.Remove(OpenIddictConstants.Permissions.Endpoints.Authorization);
-            }
+        if (model.AllowAuthorizationCodeFlow || model.AllowHybridFlow ||
+            model.AllowClientCredentialsFlow || model.AllowPasswordFlow || model.AllowRefreshTokenFlow)
+        {
+            descriptor.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Token);
+        }
+        else
+        {
+            descriptor.Permissions.Remove(OpenIddictConstants.Permissions.Endpoints.Token);
+        }
 
-            if (model.AllowAuthorizationCodeFlow || model.AllowHybridFlow ||
-                model.AllowClientCredentialsFlow || model.AllowPasswordFlow || model.AllowRefreshTokenFlow)
-            {
-                descriptor.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Token);
-            }
-            else
-            {
-                descriptor.Permissions.Remove(OpenIddictConstants.Permissions.Endpoints.Token);
-            }
+        if (model.AllowAuthorizationCodeFlow)
+        {
+            descriptor.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.Code);
+        }
+        else
+        {
+            descriptor.Permissions.Remove(OpenIddictConstants.Permissions.ResponseTypes.Code);
+        }
 
-            if (model.AllowAuthorizationCodeFlow)
-            {
-                descriptor.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.Code);
-            }
-            else
-            {
-                descriptor.Permissions.Remove(OpenIddictConstants.Permissions.ResponseTypes.Code);
-            }
+        if (model.AllowImplicitFlow)
+        {
+            descriptor.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.IdToken);
 
-            if (model.AllowImplicitFlow)
+            if (string.Equals(model.Type, OpenIddictConstants.ClientTypes.Public, StringComparison.OrdinalIgnoreCase))
             {
-                descriptor.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.IdToken);
-
-                if (string.Equals(model.Type, OpenIddictConstants.ClientTypes.Public, StringComparison.OrdinalIgnoreCase))
-                {
-                    descriptor.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.IdTokenToken);
-                    descriptor.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.Token);
-                }
-                else
-                {
-                    descriptor.Permissions.Remove(OpenIddictConstants.Permissions.ResponseTypes.IdTokenToken);
-                    descriptor.Permissions.Remove(OpenIddictConstants.Permissions.ResponseTypes.Token);
-                }
+                descriptor.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.IdTokenToken);
+                descriptor.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.Token);
             }
             else
             {
-                descriptor.Permissions.Remove(OpenIddictConstants.Permissions.ResponseTypes.IdToken);
                 descriptor.Permissions.Remove(OpenIddictConstants.Permissions.ResponseTypes.IdTokenToken);
                 descriptor.Permissions.Remove(OpenIddictConstants.Permissions.ResponseTypes.Token);
             }
+        }
+        else
+        {
+            descriptor.Permissions.Remove(OpenIddictConstants.Permissions.ResponseTypes.IdToken);
+            descriptor.Permissions.Remove(OpenIddictConstants.Permissions.ResponseTypes.IdTokenToken);
+            descriptor.Permissions.Remove(OpenIddictConstants.Permissions.ResponseTypes.Token);
+        }
 
-            if (model.AllowHybridFlow)
+        if (model.AllowHybridFlow)
+        {
+            descriptor.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.CodeIdToken);
+
+            if (string.Equals(model.Type, OpenIddictConstants.ClientTypes.Public, StringComparison.OrdinalIgnoreCase))
             {
-                descriptor.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.CodeIdToken);
-
-                if (string.Equals(model.Type, OpenIddictConstants.ClientTypes.Public, StringComparison.OrdinalIgnoreCase))
-                {
-                    descriptor.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.CodeIdTokenToken);
-                    descriptor.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.CodeToken);
-                }
-                else
-                {
-                    descriptor.Permissions.Remove(OpenIddictConstants.Permissions.ResponseTypes.CodeIdTokenToken);
-                    descriptor.Permissions.Remove(OpenIddictConstants.Permissions.ResponseTypes.CodeToken);
-                }
+                descriptor.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.CodeIdTokenToken);
+                descriptor.Permissions.Add(OpenIddictConstants.Permissions.ResponseTypes.CodeToken);
             }
             else
             {
-                descriptor.Permissions.Remove(OpenIddictConstants.Permissions.ResponseTypes.CodeIdToken);
                 descriptor.Permissions.Remove(OpenIddictConstants.Permissions.ResponseTypes.CodeIdTokenToken);
                 descriptor.Permissions.Remove(OpenIddictConstants.Permissions.ResponseTypes.CodeToken);
             }
+        }
+        else
+        {
+            descriptor.Permissions.Remove(OpenIddictConstants.Permissions.ResponseTypes.CodeIdToken);
+            descriptor.Permissions.Remove(OpenIddictConstants.Permissions.ResponseTypes.CodeIdTokenToken);
+            descriptor.Permissions.Remove(OpenIddictConstants.Permissions.ResponseTypes.CodeToken);
+        }
 
-            if (model.AllowIntrospectionEndpoint)
-            {
-                descriptor.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Introspection);
-            }
-            else
-            {
-                descriptor.Permissions.Remove(OpenIddictConstants.Permissions.Endpoints.Introspection);
-            }
-
-            if (model.AllowRevocationEndpoint)
-            {
-                descriptor.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Revocation);
-            }
-            else
-            {
-                descriptor.Permissions.Remove(OpenIddictConstants.Permissions.Endpoints.Revocation);
-            }
+        if (model.AllowIntrospectionEndpoint)
+        {
+            descriptor.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Introspection);
+        }
+        else
+        {
+            descriptor.Permissions.Remove(OpenIddictConstants.Permissions.Endpoints.Introspection);
+        }
 
-            if (model.RequireProofKeyForCodeExchange)
-            {
-                descriptor.Requirements.Add(OpenIddictConstants.Requirements.Features.ProofKeyForCodeExchange);
-            }
-            else
-            {
-                descriptor.Requirements.Remove(OpenIddictConstants.Requirements.Features.ProofKeyForCodeExchange);
-            }
+        if (model.AllowRevocationEndpoint)
+        {
+            descriptor.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Revocation);
+        }
+        else
+        {
+            descriptor.Permissions.Remove(OpenIddictConstants.Permissions.Endpoints.Revocation);
+        }
 
-            descriptor.Roles.Clear();
+        if (model.RequireProofKeyForCodeExchange)
+        {
+            descriptor.Requirements.Add(OpenIddictConstants.Requirements.Features.ProofKeyForCodeExchange);
+        }
+        else
+        {
+            descriptor.Requirements.Remove(OpenIddictConstants.Requirements.Features.ProofKeyForCodeExchange);
+        }
 
-            foreach (var role in model.Roles)
-            {
-                descriptor.Roles.Add(role);
-            }
+        descriptor.Roles.Clear();
 
-            descriptor.Permissions.RemoveWhere(permission => permission.StartsWith(OpenIddictConstants.Permissions.Prefixes.Scope));
-            foreach (var scope in model.Scopes)
-            {
-                descriptor.Permissions.Add(OpenIddictConstants.Permissions.Prefixes.Scope + scope);
-            }
+        foreach (var role in model.Roles)
+        {
+            descriptor.Roles.Add(role);
+        }
 
-            descriptor.PostLogoutRedirectUris.Clear();
-            foreach (var uri in
-                (from uri in model.PostLogoutRedirectUris?.Split(_separator, StringSplitOptions.RemoveEmptyEntries) ?? []
-                 select new Uri(uri, UriKind.Absolute)))
-            {
-                descriptor.PostLogoutRedirectUris.Add(uri);
-            }
+        descriptor.Permissions.RemoveWhere(permission => permission.StartsWith(OpenIddictConstants.Permissions.Prefixes.Scope));
+        foreach (var scope in model.Scopes)
+        {
+            descriptor.Permissions.Add(OpenIddictConstants.Permissions.Prefixes.Scope + scope);
+        }
 
-            descriptor.RedirectUris.Clear();
-            foreach (var uri in
-               (from uri in model.RedirectUris?.Split(_separator, StringSplitOptions.RemoveEmptyEntries) ?? []
-                select new Uri(uri, UriKind.Absolute)))
-            {
-                descriptor.RedirectUris.Add(uri);
-            }
+        descriptor.PostLogoutRedirectUris.Clear();
+        foreach (var uri in
+            (from uri in model.PostLogoutRedirectUris?.Split(_separator, StringSplitOptions.RemoveEmptyEntries) ?? []
+             select new Uri(uri, UriKind.Absolute)))
+        {
+            descriptor.PostLogoutRedirectUris.Add(uri);
+        }
 
-            if (application == null)
-            {
-                await _applicationManager.CreateAsync(descriptor);
-            }
-            else
-            {
-                await _applicationManager.UpdateAsync(application, descriptor);
-            }
+        descriptor.RedirectUris.Clear();
+        foreach (var uri in
+           (from uri in model.RedirectUris?.Split(_separator, StringSplitOptions.RemoveEmptyEntries) ?? []
+            select new Uri(uri, UriKind.Absolute)))
+        {
+            descriptor.RedirectUris.Add(uri);
+        }
 
+        if (application == null)
+        {
+            await _applicationManager.CreateAsync(descriptor);
         }
+        else
+        {
+            await _applicationManager.UpdateAsync(application, descriptor);
+        }
+
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/OpenIdExtensions.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/OpenIdExtensions.cs
index c5b808e913f..81ab9f7f261 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/OpenIdExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/OpenIdExtensions.cs
@@ -4,52 +4,51 @@
 using System.Threading.Tasks;
 using static OpenIddict.Abstractions.OpenIddictConstants;
 
-namespace OrchardCore.OpenId
+namespace OrchardCore.OpenId;
+
+internal static class OpenIdExtensions
 {
-    internal static class OpenIdExtensions
+    internal static string GetUserIdentifier(this ClaimsIdentity identity)
+        => identity.FindFirst(Claims.Subject)?.Value ??
+           identity.FindFirst(ClaimTypes.NameIdentifier)?.Value ??
+           identity.FindFirst(ClaimTypes.Upn)?.Value ??
+           throw new InvalidOperationException("No suitable user identifier can be found in the identity.");
+
+    internal static string GetUserIdentifier(this ClaimsPrincipal principal)
+        => principal.FindFirst(Claims.Subject)?.Value ??
+           principal.FindFirst(ClaimTypes.NameIdentifier)?.Value ??
+           principal.FindFirst(ClaimTypes.Upn)?.Value ??
+           throw new InvalidOperationException("No suitable user identifier can be found in the principal.");
+
+    internal static string GetUserName(this ClaimsPrincipal principal)
+        => principal.FindFirst(Claims.Name)?.Value ??
+           principal.FindFirst(ClaimTypes.Name)?.Value ??
+           throw new InvalidOperationException("No suitable user name can be found in the principal.");
+
+    internal static async Task<bool> AnyAsync<T>(this IAsyncEnumerable<T> source)
     {
-        internal static string GetUserIdentifier(this ClaimsIdentity identity)
-            => identity.FindFirst(Claims.Subject)?.Value ??
-               identity.FindFirst(ClaimTypes.NameIdentifier)?.Value ??
-               identity.FindFirst(ClaimTypes.Upn)?.Value ??
-               throw new InvalidOperationException("No suitable user identifier can be found in the identity.");
-
-        internal static string GetUserIdentifier(this ClaimsPrincipal principal)
-            => principal.FindFirst(Claims.Subject)?.Value ??
-               principal.FindFirst(ClaimTypes.NameIdentifier)?.Value ??
-               principal.FindFirst(ClaimTypes.Upn)?.Value ??
-               throw new InvalidOperationException("No suitable user identifier can be found in the principal.");
-
-        internal static string GetUserName(this ClaimsPrincipal principal)
-            => principal.FindFirst(Claims.Name)?.Value ??
-               principal.FindFirst(ClaimTypes.Name)?.Value ??
-               throw new InvalidOperationException("No suitable user name can be found in the principal.");
-
-        internal static async Task<bool> AnyAsync<T>(this IAsyncEnumerable<T> source)
-        {
-            ArgumentNullException.ThrowIfNull(source);
-
-            await using var enumerator = source.GetAsyncEnumerator();
-            return await enumerator.MoveNextAsync();
-        }
+        ArgumentNullException.ThrowIfNull(source);
 
-        internal static Task<List<T>> ToListAsync<T>(this IAsyncEnumerable<T> source)
-        {
-            ArgumentNullException.ThrowIfNull(source);
+        await using var enumerator = source.GetAsyncEnumerator();
+        return await enumerator.MoveNextAsync();
+    }
 
-            return ExecuteAsync();
+    internal static Task<List<T>> ToListAsync<T>(this IAsyncEnumerable<T> source)
+    {
+        ArgumentNullException.ThrowIfNull(source);
 
-            async Task<List<T>> ExecuteAsync()
-            {
-                var list = new List<T>();
+        return ExecuteAsync();
 
-                await foreach (var element in source)
-                {
-                    list.Add(element);
-                }
+        async Task<List<T>> ExecuteAsync()
+        {
+            var list = new List<T>();
 
-                return list;
+            await foreach (var element in source)
+            {
+                list.Add(element);
             }
+
+            return list;
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdApplicationStep.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdApplicationStep.cs
index ccc2bae111f..6f7de446179 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdApplicationStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdApplicationStep.cs
@@ -6,54 +6,53 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.OpenId.Recipes
+namespace OrchardCore.OpenId.Recipes;
+
+public sealed class OpenIdApplicationStep : IRecipeStepHandler
 {
-    public sealed class OpenIdApplicationStep : IRecipeStepHandler
+    private readonly IOpenIdApplicationManager _applicationManager;
+
+    /// <summary>
+    /// This recipe step adds an OpenID Connect app.
+    /// </summary>
+    public OpenIdApplicationStep(IOpenIdApplicationManager applicationManager)
     {
-        private readonly IOpenIdApplicationManager _applicationManager;
+        _applicationManager = applicationManager;
+    }
 
-        /// <summary>
-        /// This recipe step adds an OpenID Connect app.
-        /// </summary>
-        public OpenIdApplicationStep(IOpenIdApplicationManager applicationManager)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "OpenIdApplication", StringComparison.OrdinalIgnoreCase))
         {
-            _applicationManager = applicationManager;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, "OpenIdApplication", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            var model = context.Step.ToObject<OpenIdApplicationStepModel>();
-            var app = await _applicationManager.FindByClientIdAsync(model.ClientId);
+        var model = context.Step.ToObject<OpenIdApplicationStepModel>();
+        var app = await _applicationManager.FindByClientIdAsync(model.ClientId);
 
-            var settings = new OpenIdApplicationSettings()
-            {
-                AllowAuthorizationCodeFlow = model.AllowAuthorizationCodeFlow,
-                AllowClientCredentialsFlow = model.AllowClientCredentialsFlow,
-                AllowHybridFlow = model.AllowHybridFlow,
-                AllowImplicitFlow = model.AllowImplicitFlow,
-                AllowIntrospectionEndpoint = model.AllowIntrospectionEndpoint,
-                AllowLogoutEndpoint = model.AllowLogoutEndpoint,
-                AllowPasswordFlow = model.AllowPasswordFlow,
-                AllowRefreshTokenFlow = model.AllowRefreshTokenFlow,
-                AllowRevocationEndpoint = model.AllowRevocationEndpoint,
-                ClientId = model.ClientId,
-                ClientSecret = model.ClientSecret,
-                ConsentType = model.ConsentType,
-                DisplayName = model.DisplayName,
-                PostLogoutRedirectUris = model.PostLogoutRedirectUris,
-                RedirectUris = model.RedirectUris,
-                Roles = model.RoleEntries.Select(x => x.Name).ToArray(),
-                Scopes = model.ScopeEntries.Select(x => x.Name).ToArray(),
-                Type = model.Type,
-                RequireProofKeyForCodeExchange = model.RequireProofKeyForCodeExchange,
-            };
+        var settings = new OpenIdApplicationSettings()
+        {
+            AllowAuthorizationCodeFlow = model.AllowAuthorizationCodeFlow,
+            AllowClientCredentialsFlow = model.AllowClientCredentialsFlow,
+            AllowHybridFlow = model.AllowHybridFlow,
+            AllowImplicitFlow = model.AllowImplicitFlow,
+            AllowIntrospectionEndpoint = model.AllowIntrospectionEndpoint,
+            AllowLogoutEndpoint = model.AllowLogoutEndpoint,
+            AllowPasswordFlow = model.AllowPasswordFlow,
+            AllowRefreshTokenFlow = model.AllowRefreshTokenFlow,
+            AllowRevocationEndpoint = model.AllowRevocationEndpoint,
+            ClientId = model.ClientId,
+            ClientSecret = model.ClientSecret,
+            ConsentType = model.ConsentType,
+            DisplayName = model.DisplayName,
+            PostLogoutRedirectUris = model.PostLogoutRedirectUris,
+            RedirectUris = model.RedirectUris,
+            Roles = model.RoleEntries.Select(x => x.Name).ToArray(),
+            Scopes = model.ScopeEntries.Select(x => x.Name).ToArray(),
+            Type = model.Type,
+            RequireProofKeyForCodeExchange = model.RequireProofKeyForCodeExchange,
+        };
 
-            await _applicationManager.UpdateDescriptorFromSettings(settings, app);
-        }
+        await _applicationManager.UpdateDescriptorFromSettings(settings, app);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdApplicationStepModel.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdApplicationStepModel.cs
index 3015c25a778..a41023d416b 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdApplicationStepModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdApplicationStepModel.cs
@@ -1,35 +1,34 @@
-namespace OrchardCore.OpenId.Recipes
+namespace OrchardCore.OpenId.Recipes;
+
+public class OpenIdApplicationStepModel
 {
-    public class OpenIdApplicationStepModel
-    {
-        public string ClientId { get; set; }
-        public string DisplayName { get; set; }
-        public string RedirectUris { get; set; }
-        public string PostLogoutRedirectUris { get; set; }
-        public string Type { get; set; }
-        public string ConsentType { get; set; }
-        public string ClientSecret { get; set; }
-        public RoleEntry[] RoleEntries { get; set; } = [];
-        public ScopeEntry[] ScopeEntries { get; set; } = [];
-        public bool AllowPasswordFlow { get; set; }
-        public bool AllowClientCredentialsFlow { get; set; }
-        public bool AllowAuthorizationCodeFlow { get; set; }
-        public bool AllowRefreshTokenFlow { get; set; }
-        public bool AllowHybridFlow { get; set; }
-        public bool AllowImplicitFlow { get; set; }
-        public bool AllowLogoutEndpoint { get; set; }
-        public bool AllowIntrospectionEndpoint { get; set; }
-        public bool AllowRevocationEndpoint { get; set; }
-        public bool RequireProofKeyForCodeExchange { get; set; }
+    public string ClientId { get; set; }
+    public string DisplayName { get; set; }
+    public string RedirectUris { get; set; }
+    public string PostLogoutRedirectUris { get; set; }
+    public string Type { get; set; }
+    public string ConsentType { get; set; }
+    public string ClientSecret { get; set; }
+    public RoleEntry[] RoleEntries { get; set; } = [];
+    public ScopeEntry[] ScopeEntries { get; set; } = [];
+    public bool AllowPasswordFlow { get; set; }
+    public bool AllowClientCredentialsFlow { get; set; }
+    public bool AllowAuthorizationCodeFlow { get; set; }
+    public bool AllowRefreshTokenFlow { get; set; }
+    public bool AllowHybridFlow { get; set; }
+    public bool AllowImplicitFlow { get; set; }
+    public bool AllowLogoutEndpoint { get; set; }
+    public bool AllowIntrospectionEndpoint { get; set; }
+    public bool AllowRevocationEndpoint { get; set; }
+    public bool RequireProofKeyForCodeExchange { get; set; }
 
-        public class RoleEntry
-        {
-            public string Name { get; set; }
-        }
+    public class RoleEntry
+    {
+        public string Name { get; set; }
+    }
 
-        public class ScopeEntry
-        {
-            public string Name { get; set; }
-        }
+    public class ScopeEntry
+    {
+        public string Name { get; set; }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdClientSettingsStep.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdClientSettingsStep.cs
index 6a1a0d19ee9..c4cb37f2ab7 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdClientSettingsStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdClientSettingsStep.cs
@@ -6,63 +6,62 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.OpenId.Recipes
+namespace OrchardCore.OpenId.Recipes;
+
+/// <summary>
+/// This recipe step sets general OpenID Connect Client settings.
+/// </summary>
+public sealed class OpenIdClientSettingsStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step sets general OpenID Connect Client settings.
-    /// </summary>
-    public sealed class OpenIdClientSettingsStep : IRecipeStepHandler
+    private readonly IOpenIdClientService _clientService;
+
+    public OpenIdClientSettingsStep(IOpenIdClientService clientService)
     {
-        private readonly IOpenIdClientService _clientService;
+        _clientService = clientService;
+    }
 
-        public OpenIdClientSettingsStep(IOpenIdClientService clientService)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "OpenIdClientSettings", StringComparison.OrdinalIgnoreCase))
         {
-            _clientService = clientService;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, "OpenIdClientSettings", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            var model = context.Step.ToObject<OpenIdClientSettingsStepModel>();
-            var settings = await _clientService.LoadSettingsAsync();
+        var model = context.Step.ToObject<OpenIdClientSettingsStepModel>();
+        var settings = await _clientService.LoadSettingsAsync();
 
-            settings.Scopes = model.Scopes.Split(' ', ',');
-            settings.Authority = !string.IsNullOrEmpty(model.Authority) ? new Uri(model.Authority, UriKind.Absolute) : null;
-            settings.CallbackPath = model.CallbackPath;
-            settings.ClientId = model.ClientId;
-            settings.ClientSecret = model.ClientSecret;
-            settings.DisplayName = model.DisplayName;
-            settings.ResponseMode = model.ResponseMode;
-            settings.ResponseType = model.ResponseType;
-            settings.SignedOutCallbackPath = model.SignedOutCallbackPath;
-            settings.SignedOutRedirectUri = model.SignedOutRedirectUri;
-            settings.StoreExternalTokens = model.StoreExternalTokens;
-            settings.Parameters = model.Parameters;
+        settings.Scopes = model.Scopes.Split(' ', ',');
+        settings.Authority = !string.IsNullOrEmpty(model.Authority) ? new Uri(model.Authority, UriKind.Absolute) : null;
+        settings.CallbackPath = model.CallbackPath;
+        settings.ClientId = model.ClientId;
+        settings.ClientSecret = model.ClientSecret;
+        settings.DisplayName = model.DisplayName;
+        settings.ResponseMode = model.ResponseMode;
+        settings.ResponseType = model.ResponseType;
+        settings.SignedOutCallbackPath = model.SignedOutCallbackPath;
+        settings.SignedOutRedirectUri = model.SignedOutRedirectUri;
+        settings.StoreExternalTokens = model.StoreExternalTokens;
+        settings.Parameters = model.Parameters;
 
-            await _clientService.UpdateSettingsAsync(settings);
-        }
+        await _clientService.UpdateSettingsAsync(settings);
     }
+}
 
-    public sealed class OpenIdClientSettingsStepModel
-    {
-        public string DisplayName { get; set; }
+public sealed class OpenIdClientSettingsStepModel
+{
+    public string DisplayName { get; set; }
 
-        [Url]
-        public string Authority { get; set; }
+    [Url]
+    public string Authority { get; set; }
 
-        public string ClientId { get; set; }
-        public string ClientSecret { get; set; }
-        public string CallbackPath { get; set; }
-        public string SignedOutRedirectUri { get; set; }
-        public string SignedOutCallbackPath { get; set; }
-        public string Scopes { get; set; }
-        public string ResponseType { get; set; }
-        public string ResponseMode { get; set; }
-        public bool StoreExternalTokens { get; set; }
-        public ParameterSetting[] Parameters { get; set; }
-    }
+    public string ClientId { get; set; }
+    public string ClientSecret { get; set; }
+    public string CallbackPath { get; set; }
+    public string SignedOutRedirectUri { get; set; }
+    public string SignedOutCallbackPath { get; set; }
+    public string Scopes { get; set; }
+    public string ResponseType { get; set; }
+    public string ResponseMode { get; set; }
+    public bool StoreExternalTokens { get; set; }
+    public ParameterSetting[] Parameters { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdScopeStep.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdScopeStep.cs
index 4402739198c..e255efa8ed9 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdScopeStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdScopeStep.cs
@@ -6,57 +6,56 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.OpenId.Recipes
+namespace OrchardCore.OpenId.Recipes;
+
+public sealed class OpenIdScopeStep : IRecipeStepHandler
 {
-    public sealed class OpenIdScopeStep : IRecipeStepHandler
+    private readonly IOpenIdScopeManager _scopeManager;
+
+    /// <summary>
+    /// This recipe step adds an OpenID Connect scope.
+    /// </summary>
+    public OpenIdScopeStep(IOpenIdScopeManager scopeManager)
     {
-        private readonly IOpenIdScopeManager _scopeManager;
+        _scopeManager = scopeManager;
+    }
+
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "OpenIdScope", StringComparison.OrdinalIgnoreCase))
+        {
+            return;
+        }
 
-        /// <summary>
-        /// This recipe step adds an OpenID Connect scope.
-        /// </summary>
-        public OpenIdScopeStep(IOpenIdScopeManager scopeManager)
+        var model = context.Step.ToObject<OpenIdScopeStepModel>();
+        var scope = await _scopeManager.FindByNameAsync(model.ScopeName);
+        var descriptor = new OpenIdScopeDescriptor();
+        var isNew = true;
+
+        if (scope != null)
         {
-            _scopeManager = scopeManager;
+            isNew = false;
+            await _scopeManager.PopulateAsync(scope, descriptor);
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        descriptor.Description = model.Description;
+        descriptor.Name = model.ScopeName;
+        descriptor.DisplayName = model.DisplayName;
+
+        if (!string.IsNullOrEmpty(model.Resources))
+        {
+            descriptor.Resources.Clear();
+            descriptor.Resources.UnionWith(
+                model.Resources.Split(' ', StringSplitOptions.RemoveEmptyEntries));
+        }
+
+        if (isNew)
+        {
+            await _scopeManager.CreateAsync(descriptor);
+        }
+        else
         {
-            if (!string.Equals(context.Name, "OpenIdScope", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            var model = context.Step.ToObject<OpenIdScopeStepModel>();
-            var scope = await _scopeManager.FindByNameAsync(model.ScopeName);
-            var descriptor = new OpenIdScopeDescriptor();
-            var isNew = true;
-
-            if (scope != null)
-            {
-                isNew = false;
-                await _scopeManager.PopulateAsync(scope, descriptor);
-            }
-
-            descriptor.Description = model.Description;
-            descriptor.Name = model.ScopeName;
-            descriptor.DisplayName = model.DisplayName;
-
-            if (!string.IsNullOrEmpty(model.Resources))
-            {
-                descriptor.Resources.Clear();
-                descriptor.Resources.UnionWith(
-                    model.Resources.Split(' ', StringSplitOptions.RemoveEmptyEntries));
-            }
-
-            if (isNew)
-            {
-                await _scopeManager.CreateAsync(descriptor);
-            }
-            else
-            {
-                await _scopeManager.UpdateAsync(scope, descriptor);
-            }
+            await _scopeManager.UpdateAsync(scope, descriptor);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdScopeStepModel.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdScopeStepModel.cs
index 6b65d539c47..2ca78ef3198 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdScopeStepModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdScopeStepModel.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.OpenId.Recipes
+namespace OrchardCore.OpenId.Recipes;
+
+public class OpenIdScopeStepModel
 {
-    public class OpenIdScopeStepModel
-    {
-        public string Description { get; set; }
-        public string DisplayName { get; set; }
-        public string ScopeName { get; set; }
-        public string Resources { get; set; }
-    }
+    public string Description { get; set; }
+    public string DisplayName { get; set; }
+    public string ScopeName { get; set; }
+    public string Resources { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdServerSettingsStep.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdServerSettingsStep.cs
index f79794e085a..3f82540b00d 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdServerSettingsStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdServerSettingsStep.cs
@@ -7,67 +7,66 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.OpenId.Recipes
+namespace OrchardCore.OpenId.Recipes;
+
+/// <summary>
+/// This recipe step sets general OpenID Connect settings.
+/// </summary>
+public sealed class OpenIdServerSettingsStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step sets general OpenID Connect settings.
-    /// </summary>
-    public sealed class OpenIdServerSettingsStep : IRecipeStepHandler
+    private readonly IOpenIdServerService _serverService;
+
+    public OpenIdServerSettingsStep(IOpenIdServerService serverService)
     {
-        private readonly IOpenIdServerService _serverService;
+        _serverService = serverService;
+    }
 
-        public OpenIdServerSettingsStep(IOpenIdServerService serverService)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, nameof(OpenIdServerSettings), StringComparison.OrdinalIgnoreCase))
         {
-            _serverService = serverService;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, nameof(OpenIdServerSettings), StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            var model = context.Step.ToObject<OpenIdServerSettingsStepModel>();
-            var settings = await _serverService.LoadSettingsAsync();
+        var model = context.Step.ToObject<OpenIdServerSettingsStepModel>();
+        var settings = await _serverService.LoadSettingsAsync();
 
-            settings.AccessTokenFormat = model.AccessTokenFormat;
-            settings.Authority = !string.IsNullOrEmpty(model.Authority) ? new Uri(model.Authority, UriKind.Absolute) : null;
+        settings.AccessTokenFormat = model.AccessTokenFormat;
+        settings.Authority = !string.IsNullOrEmpty(model.Authority) ? new Uri(model.Authority, UriKind.Absolute) : null;
 
-            settings.EncryptionCertificateStoreLocation = model.EncryptionCertificateStoreLocation;
-            settings.EncryptionCertificateStoreName = model.EncryptionCertificateStoreName;
-            settings.EncryptionCertificateThumbprint = model.EncryptionCertificateThumbprint;
+        settings.EncryptionCertificateStoreLocation = model.EncryptionCertificateStoreLocation;
+        settings.EncryptionCertificateStoreName = model.EncryptionCertificateStoreName;
+        settings.EncryptionCertificateThumbprint = model.EncryptionCertificateThumbprint;
 
-            settings.SigningCertificateStoreLocation = model.SigningCertificateStoreLocation;
-            settings.SigningCertificateStoreName = model.SigningCertificateStoreName;
-            settings.SigningCertificateThumbprint = model.SigningCertificateThumbprint;
+        settings.SigningCertificateStoreLocation = model.SigningCertificateStoreLocation;
+        settings.SigningCertificateStoreName = model.SigningCertificateStoreName;
+        settings.SigningCertificateThumbprint = model.SigningCertificateThumbprint;
 
-            settings.AuthorizationEndpointPath = model.EnableAuthorizationEndpoint ?
-                new PathString("/connect/authorize") : PathString.Empty;
-            settings.LogoutEndpointPath = model.EnableLogoutEndpoint ?
-                new PathString("/connect/logout") : PathString.Empty;
-            settings.TokenEndpointPath = model.EnableTokenEndpoint ?
-                new PathString("/connect/token") : PathString.Empty;
-            settings.UserinfoEndpointPath = model.EnableUserInfoEndpoint ?
-                new PathString("/connect/userinfo") : PathString.Empty;
-            settings.IntrospectionEndpointPath = model.EnableIntrospectionEndpoint ?
-                new PathString("/connect/introspect") : PathString.Empty;
-            settings.RevocationEndpointPath = model.EnableRevocationEndpoint ?
-                new PathString("/connect/revoke") : PathString.Empty;
+        settings.AuthorizationEndpointPath = model.EnableAuthorizationEndpoint ?
+            new PathString("/connect/authorize") : PathString.Empty;
+        settings.LogoutEndpointPath = model.EnableLogoutEndpoint ?
+            new PathString("/connect/logout") : PathString.Empty;
+        settings.TokenEndpointPath = model.EnableTokenEndpoint ?
+            new PathString("/connect/token") : PathString.Empty;
+        settings.UserinfoEndpointPath = model.EnableUserInfoEndpoint ?
+            new PathString("/connect/userinfo") : PathString.Empty;
+        settings.IntrospectionEndpointPath = model.EnableIntrospectionEndpoint ?
+            new PathString("/connect/introspect") : PathString.Empty;
+        settings.RevocationEndpointPath = model.EnableRevocationEndpoint ?
+            new PathString("/connect/revoke") : PathString.Empty;
 
-            settings.AllowAuthorizationCodeFlow = model.AllowAuthorizationCodeFlow;
-            settings.AllowClientCredentialsFlow = model.AllowClientCredentialsFlow;
-            settings.AllowHybridFlow = model.AllowHybridFlow;
-            settings.AllowImplicitFlow = model.AllowImplicitFlow;
-            settings.AllowPasswordFlow = model.AllowPasswordFlow;
-            settings.AllowRefreshTokenFlow = model.AllowRefreshTokenFlow;
+        settings.AllowAuthorizationCodeFlow = model.AllowAuthorizationCodeFlow;
+        settings.AllowClientCredentialsFlow = model.AllowClientCredentialsFlow;
+        settings.AllowHybridFlow = model.AllowHybridFlow;
+        settings.AllowImplicitFlow = model.AllowImplicitFlow;
+        settings.AllowPasswordFlow = model.AllowPasswordFlow;
+        settings.AllowRefreshTokenFlow = model.AllowRefreshTokenFlow;
 
-            settings.DisableAccessTokenEncryption = model.DisableAccessTokenEncryption;
-            settings.DisableRollingRefreshTokens = model.DisableRollingRefreshTokens;
-            settings.UseReferenceAccessTokens = model.UseReferenceAccessTokens;
-            settings.RequireProofKeyForCodeExchange = model.RequireProofKeyForCodeExchange;
+        settings.DisableAccessTokenEncryption = model.DisableAccessTokenEncryption;
+        settings.DisableRollingRefreshTokens = model.DisableRollingRefreshTokens;
+        settings.UseReferenceAccessTokens = model.UseReferenceAccessTokens;
+        settings.RequireProofKeyForCodeExchange = model.RequireProofKeyForCodeExchange;
 
-            await _serverService.UpdateSettingsAsync(settings);
-        }
+        await _serverService.UpdateSettingsAsync(settings);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdServerSettingsStepModel.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdServerSettingsStepModel.cs
index 5693b4b040e..7cfb2ee3206 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdServerSettingsStepModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdServerSettingsStepModel.cs
@@ -1,35 +1,34 @@
 using System.Security.Cryptography.X509Certificates;
 using static OrchardCore.OpenId.Settings.OpenIdServerSettings;
 
-namespace OrchardCore.OpenId.Recipes
+namespace OrchardCore.OpenId.Recipes;
+
+public class OpenIdServerSettingsStepModel
 {
-    public class OpenIdServerSettingsStepModel
-    {
-        public TokenFormat AccessTokenFormat { get; set; } = TokenFormat.DataProtection;
-        [Url]
-        public string Authority { get; set; }
-        public bool DisableAccessTokenEncryption { get; set; }
-        public StoreLocation? EncryptionCertificateStoreLocation { get; set; }
-        public StoreName? EncryptionCertificateStoreName { get; set; }
-        public string EncryptionCertificateThumbprint { get; set; }
-        public StoreLocation? SigningCertificateStoreLocation { get; set; }
-        public StoreName? SigningCertificateStoreName { get; set; }
-        public string SigningCertificateThumbprint { get; set; }
-        public bool EnableTokenEndpoint { get; set; }
-        public bool EnableAuthorizationEndpoint { get; set; }
-        public bool EnableLogoutEndpoint { get; set; }
-        public bool EnableUserInfoEndpoint { get; set; }
-        public bool EnableIntrospectionEndpoint { get; set; }
-        public bool EnableRevocationEndpoint { get; set; }
-        public bool AllowPasswordFlow { get; set; }
-        public bool AllowClientCredentialsFlow { get; set; }
-        public bool AllowAuthorizationCodeFlow { get; set; }
-        public bool AllowRefreshTokenFlow { get; set; }
-        public bool AllowHybridFlow { get; set; }
-        public bool AllowImplicitFlow { get; set; }
-        public bool DisableRollingRefreshTokens { get; set; }
-        public bool RequireProofKeyForCodeExchange { get; set; }
+    public TokenFormat AccessTokenFormat { get; set; } = TokenFormat.DataProtection;
+    [Url]
+    public string Authority { get; set; }
+    public bool DisableAccessTokenEncryption { get; set; }
+    public StoreLocation? EncryptionCertificateStoreLocation { get; set; }
+    public StoreName? EncryptionCertificateStoreName { get; set; }
+    public string EncryptionCertificateThumbprint { get; set; }
+    public StoreLocation? SigningCertificateStoreLocation { get; set; }
+    public StoreName? SigningCertificateStoreName { get; set; }
+    public string SigningCertificateThumbprint { get; set; }
+    public bool EnableTokenEndpoint { get; set; }
+    public bool EnableAuthorizationEndpoint { get; set; }
+    public bool EnableLogoutEndpoint { get; set; }
+    public bool EnableUserInfoEndpoint { get; set; }
+    public bool EnableIntrospectionEndpoint { get; set; }
+    public bool EnableRevocationEndpoint { get; set; }
+    public bool AllowPasswordFlow { get; set; }
+    public bool AllowClientCredentialsFlow { get; set; }
+    public bool AllowAuthorizationCodeFlow { get; set; }
+    public bool AllowRefreshTokenFlow { get; set; }
+    public bool AllowHybridFlow { get; set; }
+    public bool AllowImplicitFlow { get; set; }
+    public bool DisableRollingRefreshTokens { get; set; }
+    public bool RequireProofKeyForCodeExchange { get; set; }
 
-        public bool UseReferenceAccessTokens { get; set; }
-    }
+    public bool UseReferenceAccessTokens { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdValidationSettingsStep.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdValidationSettingsStep.cs
index f33be3eeb69..2f182ce2d56 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdValidationSettingsStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdValidationSettingsStep.cs
@@ -6,37 +6,36 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.OpenId.Recipes
+namespace OrchardCore.OpenId.Recipes;
+
+/// <summary>
+/// This recipe step sets Token Validation OpenID Connect settings.
+/// </summary>
+public sealed class OpenIdValidationSettingsStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step sets Token Validation OpenID Connect settings.
-    /// </summary>
-    public sealed class OpenIdValidationSettingsStep : IRecipeStepHandler
+    private readonly IOpenIdValidationService _validationService;
+
+    public OpenIdValidationSettingsStep(IOpenIdValidationService validationService)
     {
-        private readonly IOpenIdValidationService _validationService;
+        _validationService = validationService;
+    }
 
-        public OpenIdValidationSettingsStep(IOpenIdValidationService validationService)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, nameof(OpenIdValidationSettings), StringComparison.OrdinalIgnoreCase))
         {
-            _validationService = validationService;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, nameof(OpenIdValidationSettings), StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            var model = context.Step.ToObject<OpenIdValidationSettingsStepModel>();
-            var settings = await _validationService.LoadSettingsAsync();
+        var model = context.Step.ToObject<OpenIdValidationSettingsStepModel>();
+        var settings = await _validationService.LoadSettingsAsync();
 
-            settings.Tenant = model.Tenant;
-            settings.MetadataAddress = !string.IsNullOrEmpty(model.MetadataAddress) ? new Uri(model.MetadataAddress, UriKind.Absolute) : null;
-            settings.Authority = !string.IsNullOrEmpty(model.Authority) ? new Uri(model.Authority, UriKind.Absolute) : null;
-            settings.Audience = model.Audience;
-            settings.DisableTokenTypeValidation = model.DisableTokenTypeValidation;
+        settings.Tenant = model.Tenant;
+        settings.MetadataAddress = !string.IsNullOrEmpty(model.MetadataAddress) ? new Uri(model.MetadataAddress, UriKind.Absolute) : null;
+        settings.Authority = !string.IsNullOrEmpty(model.Authority) ? new Uri(model.Authority, UriKind.Absolute) : null;
+        settings.Audience = model.Audience;
+        settings.DisableTokenTypeValidation = model.DisableTokenTypeValidation;
 
-            await _validationService.UpdateSettingsAsync(settings);
-        }
+        await _validationService.UpdateSettingsAsync(settings);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdValidationSettingsStepModel.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdValidationSettingsStepModel.cs
index deb28ced670..026088e321e 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdValidationSettingsStepModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Recipes/OpenIdValidationSettingsStepModel.cs
@@ -1,15 +1,14 @@
-namespace OrchardCore.OpenId.Recipes
+namespace OrchardCore.OpenId.Recipes;
+
+public class OpenIdValidationSettingsStepModel
 {
-    public class OpenIdValidationSettingsStepModel
-    {
-        public string MetadataAddress { get; set; }
+    public string MetadataAddress { get; set; }
 
-        public string Audience { get; set; }
+    public string Audience { get; set; }
 
-        public string Authority { get; set; }
+    public string Authority { get; set; }
 
-        public bool DisableTokenTypeValidation { get; set; }
+    public bool DisableTokenTypeValidation { get; set; }
 
-        public string Tenant { get; set; }
-    }
+    public string Tenant { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Services/IOpenIdClientService.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Services/IOpenIdClientService.cs
index 5f8974be0a9..dc01d183e3f 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Services/IOpenIdClientService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Services/IOpenIdClientService.cs
@@ -3,13 +3,12 @@
 using System.Threading.Tasks;
 using OrchardCore.OpenId.Settings;
 
-namespace OrchardCore.OpenId.Services
+namespace OrchardCore.OpenId.Services;
+
+public interface IOpenIdClientService
 {
-    public interface IOpenIdClientService
-    {
-        Task<OpenIdClientSettings> GetSettingsAsync();
-        Task<OpenIdClientSettings> LoadSettingsAsync();
-        Task UpdateSettingsAsync(OpenIdClientSettings settings);
-        Task<ImmutableArray<ValidationResult>> ValidateSettingsAsync(OpenIdClientSettings settings);
-    }
+    Task<OpenIdClientSettings> GetSettingsAsync();
+    Task<OpenIdClientSettings> LoadSettingsAsync();
+    Task UpdateSettingsAsync(OpenIdClientSettings settings);
+    Task<ImmutableArray<ValidationResult>> ValidateSettingsAsync(OpenIdClientSettings settings);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Services/IOpenIdServerService.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Services/IOpenIdServerService.cs
index 59190710fe8..94637af51d9 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Services/IOpenIdServerService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Services/IOpenIdServerService.cs
@@ -5,17 +5,16 @@
 using Microsoft.IdentityModel.Tokens;
 using OrchardCore.OpenId.Settings;
 
-namespace OrchardCore.OpenId.Services
+namespace OrchardCore.OpenId.Services;
+
+public interface IOpenIdServerService
 {
-    public interface IOpenIdServerService
-    {
-        Task<OpenIdServerSettings> GetSettingsAsync();
-        Task<OpenIdServerSettings> LoadSettingsAsync();
-        Task UpdateSettingsAsync(OpenIdServerSettings settings);
-        Task<ImmutableArray<ValidationResult>> ValidateSettingsAsync(OpenIdServerSettings settings);
-        Task<ImmutableArray<(X509Certificate2 certificate, StoreLocation location, StoreName name)>> GetAvailableCertificatesAsync();
-        Task<ImmutableArray<SecurityKey>> GetEncryptionKeysAsync();
-        Task<ImmutableArray<SecurityKey>> GetSigningKeysAsync();
-        Task PruneManagedCertificatesAsync();
-    }
+    Task<OpenIdServerSettings> GetSettingsAsync();
+    Task<OpenIdServerSettings> LoadSettingsAsync();
+    Task UpdateSettingsAsync(OpenIdServerSettings settings);
+    Task<ImmutableArray<ValidationResult>> ValidateSettingsAsync(OpenIdServerSettings settings);
+    Task<ImmutableArray<(X509Certificate2 certificate, StoreLocation location, StoreName name)>> GetAvailableCertificatesAsync();
+    Task<ImmutableArray<SecurityKey>> GetEncryptionKeysAsync();
+    Task<ImmutableArray<SecurityKey>> GetSigningKeysAsync();
+    Task PruneManagedCertificatesAsync();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Services/IOpenIdValidationService.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Services/IOpenIdValidationService.cs
index 5b5accde605..0303ac718c6 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Services/IOpenIdValidationService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Services/IOpenIdValidationService.cs
@@ -3,13 +3,12 @@
 using System.Threading.Tasks;
 using OrchardCore.OpenId.Settings;
 
-namespace OrchardCore.OpenId.Services
+namespace OrchardCore.OpenId.Services;
+
+public interface IOpenIdValidationService
 {
-    public interface IOpenIdValidationService
-    {
-        Task<OpenIdValidationSettings> GetSettingsAsync();
-        Task<OpenIdValidationSettings> LoadSettingsAsync();
-        Task UpdateSettingsAsync(OpenIdValidationSettings settings);
-        Task<ImmutableArray<ValidationResult>> ValidateSettingsAsync(OpenIdValidationSettings settings);
-    }
+    Task<OpenIdValidationSettings> GetSettingsAsync();
+    Task<OpenIdValidationSettings> LoadSettingsAsync();
+    Task UpdateSettingsAsync(OpenIdValidationSettings settings);
+    Task<ImmutableArray<ValidationResult>> ValidateSettingsAsync(OpenIdValidationSettings settings);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Services/OpenIdClientService.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Services/OpenIdClientService.cs
index 739a33ab9b8..bfed1df4a71 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Services/OpenIdClientService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Services/OpenIdClientService.cs
@@ -8,102 +8,101 @@
 using OrchardCore.OpenId.Settings;
 using OrchardCore.Settings;
 
-namespace OrchardCore.OpenId.Services
+namespace OrchardCore.OpenId.Services;
+
+public class OpenIdClientService : IOpenIdClientService
 {
-    public class OpenIdClientService : IOpenIdClientService
-    {
-        private readonly ISiteService _siteService;
+    private readonly ISiteService _siteService;
 
-        protected readonly IStringLocalizer S;
+    protected readonly IStringLocalizer S;
 
-        public OpenIdClientService(
-            ISiteService siteService,
-            IStringLocalizer<OpenIdClientService> stringLocalizer)
-        {
-            _siteService = siteService;
-            S = stringLocalizer;
-        }
+    public OpenIdClientService(
+        ISiteService siteService,
+        IStringLocalizer<OpenIdClientService> stringLocalizer)
+    {
+        _siteService = siteService;
+        S = stringLocalizer;
+    }
 
-        public Task<OpenIdClientSettings> GetSettingsAsync()
-            => _siteService.GetSettingsAsync<OpenIdClientSettings>();
+    public Task<OpenIdClientSettings> GetSettingsAsync()
+        => _siteService.GetSettingsAsync<OpenIdClientSettings>();
 
-        public async Task<OpenIdClientSettings> LoadSettingsAsync()
-        {
-            var container = await _siteService.LoadSiteSettingsAsync();
-            return container.As<OpenIdClientSettings>();
-        }
+    public async Task<OpenIdClientSettings> LoadSettingsAsync()
+    {
+        var container = await _siteService.LoadSiteSettingsAsync();
+        return container.As<OpenIdClientSettings>();
+    }
 
-        public async Task UpdateSettingsAsync(OpenIdClientSettings settings)
-        {
-            ArgumentNullException.ThrowIfNull(settings);
+    public async Task UpdateSettingsAsync(OpenIdClientSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-            var container = await _siteService.LoadSiteSettingsAsync();
-            container.Properties[nameof(OpenIdClientSettings)] = JObject.FromObject(settings);
-            await _siteService.UpdateSiteSettingsAsync(container);
-        }
+        var container = await _siteService.LoadSiteSettingsAsync();
+        container.Properties[nameof(OpenIdClientSettings)] = JObject.FromObject(settings);
+        await _siteService.UpdateSiteSettingsAsync(container);
+    }
 
-        public Task<ImmutableArray<ValidationResult>> ValidateSettingsAsync(OpenIdClientSettings settings)
-        {
-            ArgumentNullException.ThrowIfNull(settings);
+    public Task<ImmutableArray<ValidationResult>> ValidateSettingsAsync(OpenIdClientSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-            var results = ImmutableArray.CreateBuilder<ValidationResult>();
+        var results = ImmutableArray.CreateBuilder<ValidationResult>();
 
-            if (settings.Authority == null)
+        if (settings.Authority == null)
+        {
+            results.Add(new ValidationResult(S["The authority cannot be null or empty."], new[]
             {
-                results.Add(new ValidationResult(S["The authority cannot be null or empty."], new[]
-                {
-                    nameof(settings.Authority)
-                }));
-            }
-            else if (!settings.Authority.IsAbsoluteUri || !settings.Authority.IsWellFormedOriginalString())
+                nameof(settings.Authority)
+            }));
+        }
+        else if (!settings.Authority.IsAbsoluteUri || !settings.Authority.IsWellFormedOriginalString())
+        {
+            results.Add(new ValidationResult(S["The authority must be a valid absolute URL."], new[]
             {
-                results.Add(new ValidationResult(S["The authority must be a valid absolute URL."], new[]
-                {
-                    nameof(settings.Authority)
-                }));
-            }
-            else if (!string.IsNullOrEmpty(settings.Authority.Query) || !string.IsNullOrEmpty(settings.Authority.Fragment))
+                nameof(settings.Authority)
+            }));
+        }
+        else if (!string.IsNullOrEmpty(settings.Authority.Query) || !string.IsNullOrEmpty(settings.Authority.Fragment))
+        {
+            results.Add(new ValidationResult(S["The authority cannot contain a query string or a fragment."], new[]
             {
-                results.Add(new ValidationResult(S["The authority cannot contain a query string or a fragment."], new[]
-                {
-                    nameof(settings.Authority)
-                }));
-            }
+                nameof(settings.Authority)
+            }));
+        }
 
-            if (string.IsNullOrEmpty(settings.ResponseType))
+        if (string.IsNullOrEmpty(settings.ResponseType))
+        {
+            results.Add(new ValidationResult(S["The response type cannot be null or empty."], new[]
             {
-                results.Add(new ValidationResult(S["The response type cannot be null or empty."], new[]
-                {
-                    nameof(settings.ResponseType)
-                }));
-            }
-            else if (settings.ResponseType != OpenIdConnectResponseType.Code && settings.ResponseType != OpenIdConnectResponseType.CodeIdToken &&
-                settings.ResponseType != OpenIdConnectResponseType.CodeIdTokenToken && settings.ResponseType != OpenIdConnectResponseType.CodeToken &&
-                settings.ResponseType != OpenIdConnectResponseType.IdToken && settings.ResponseType != OpenIdConnectResponseType.IdTokenToken)
+                nameof(settings.ResponseType)
+            }));
+        }
+        else if (settings.ResponseType != OpenIdConnectResponseType.Code && settings.ResponseType != OpenIdConnectResponseType.CodeIdToken &&
+            settings.ResponseType != OpenIdConnectResponseType.CodeIdTokenToken && settings.ResponseType != OpenIdConnectResponseType.CodeToken &&
+            settings.ResponseType != OpenIdConnectResponseType.IdToken && settings.ResponseType != OpenIdConnectResponseType.IdTokenToken)
+        {
+            results.Add(new ValidationResult(S["Unknown response type ."], new[]
             {
-                results.Add(new ValidationResult(S["Unknown response type ."], new[]
-                {
-                    nameof(settings.ResponseType)
-                }));
-            }
+                nameof(settings.ResponseType)
+            }));
+        }
 
-            if (string.IsNullOrEmpty(settings.ResponseMode))
+        if (string.IsNullOrEmpty(settings.ResponseMode))
+        {
+            results.Add(new ValidationResult(S["The response mode cannot be null or empty."], new[]
             {
-                results.Add(new ValidationResult(S["The response mode cannot be null or empty."], new[]
-                {
-                    nameof(settings.ResponseMode)
-                }));
-            }
-            else if (settings.ResponseMode != OpenIdConnectResponseMode.FormPost && settings.ResponseMode != OpenIdConnectResponseMode.Fragment &&
-                settings.ResponseMode != OpenIdConnectResponseMode.Query)
+                nameof(settings.ResponseMode)
+            }));
+        }
+        else if (settings.ResponseMode != OpenIdConnectResponseMode.FormPost && settings.ResponseMode != OpenIdConnectResponseMode.Fragment &&
+            settings.ResponseMode != OpenIdConnectResponseMode.Query)
+        {
+            results.Add(new ValidationResult(S["Unknown response mode."], new[]
             {
-                results.Add(new ValidationResult(S["Unknown response mode."], new[]
-                {
-                    nameof(settings.ResponseMode)
-                }));
-            }
-
-            return Task.FromResult(results.ToImmutable());
+                nameof(settings.ResponseMode)
+            }));
         }
+
+        return Task.FromResult(results.ToImmutable());
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Services/OpenIdServerService.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Services/OpenIdServerService.cs
index f555ff5a902..ba3649be61b 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Services/OpenIdServerService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Services/OpenIdServerService.cs
@@ -20,623 +20,622 @@
 using OrchardCore.OpenId.Settings;
 using OrchardCore.Settings;
 
-namespace OrchardCore.OpenId.Services
+namespace OrchardCore.OpenId.Services;
+
+public class OpenIdServerService : IOpenIdServerService
 {
-    public class OpenIdServerService : IOpenIdServerService
+    private readonly IDataProtector _dataProtector;
+    private readonly ILogger _logger;
+    private readonly IMemoryCache _memoryCache;
+    private readonly IOptionsMonitor<ShellOptions> _shellOptions;
+    private readonly ShellSettings _shellSettings;
+    private readonly ISiteService _siteService;
+
+    protected readonly IStringLocalizer S;
+
+    public OpenIdServerService(
+        IDataProtectionProvider dataProtectionProvider,
+        ILogger<OpenIdServerService> logger,
+        IMemoryCache memoryCache,
+        IOptionsMonitor<ShellOptions> shellOptions,
+        ShellSettings shellSettings,
+        ISiteService siteService,
+        IStringLocalizer<OpenIdServerService> stringLocalizer)
     {
-        private readonly IDataProtector _dataProtector;
-        private readonly ILogger _logger;
-        private readonly IMemoryCache _memoryCache;
-        private readonly IOptionsMonitor<ShellOptions> _shellOptions;
-        private readonly ShellSettings _shellSettings;
-        private readonly ISiteService _siteService;
-
-        protected readonly IStringLocalizer S;
-
-        public OpenIdServerService(
-            IDataProtectionProvider dataProtectionProvider,
-            ILogger<OpenIdServerService> logger,
-            IMemoryCache memoryCache,
-            IOptionsMonitor<ShellOptions> shellOptions,
-            ShellSettings shellSettings,
-            ISiteService siteService,
-            IStringLocalizer<OpenIdServerService> stringLocalizer)
-        {
-            _dataProtector = dataProtectionProvider.CreateProtector(nameof(OpenIdServerService));
-            _logger = logger;
-            _memoryCache = memoryCache;
-            _shellOptions = shellOptions;
-            _shellSettings = shellSettings;
-            _siteService = siteService;
-            S = stringLocalizer;
-        }
+        _dataProtector = dataProtectionProvider.CreateProtector(nameof(OpenIdServerService));
+        _logger = logger;
+        _memoryCache = memoryCache;
+        _shellOptions = shellOptions;
+        _shellSettings = shellSettings;
+        _siteService = siteService;
+        S = stringLocalizer;
+    }
 
-        public async Task<OpenIdServerSettings> GetSettingsAsync()
-        {
-            var container = await _siteService.GetSiteSettingsAsync();
-            return GetSettingsFromContainer(container);
-        }
+    public async Task<OpenIdServerSettings> GetSettingsAsync()
+    {
+        var container = await _siteService.GetSiteSettingsAsync();
+        return GetSettingsFromContainer(container);
+    }
 
-        public async Task<OpenIdServerSettings> LoadSettingsAsync()
+    public async Task<OpenIdServerSettings> LoadSettingsAsync()
+    {
+        var container = await _siteService.LoadSiteSettingsAsync();
+        return GetSettingsFromContainer(container);
+    }
+
+    private OpenIdServerSettings GetSettingsFromContainer(ISite container)
+    {
+        if (container.Properties.TryGetPropertyValue(nameof(OpenIdServerSettings), out var settings))
         {
-            var container = await _siteService.LoadSiteSettingsAsync();
-            return GetSettingsFromContainer(container);
+            return settings.ToObject<OpenIdServerSettings>(JOptions.Default);
         }
 
-        private OpenIdServerSettings GetSettingsFromContainer(ISite container)
+        // If the OpenID server settings haven't been populated yet, the authorization,
+        // logout, token, userinfo, introspection and revocation endpoints are assumed to be enabled by default.
+        // In this case, only the authorization code and refresh token flows are used.
+        return new OpenIdServerSettings
         {
-            if (container.Properties.TryGetPropertyValue(nameof(OpenIdServerSettings), out var settings))
-            {
-                return settings.ToObject<OpenIdServerSettings>(JOptions.Default);
-            }
+            AllowAuthorizationCodeFlow = true,
+            AllowRefreshTokenFlow = true,
+            AuthorizationEndpointPath = "/connect/authorize",
+            LogoutEndpointPath = "/connect/logout",
+            TokenEndpointPath = "/connect/token",
+            UserinfoEndpointPath = "/connect/userinfo",
+            IntrospectionEndpointPath = "/connect/introspect",
+            RevocationEndpointPath = "/connect/revoke"
+        };
+    }
 
-            // If the OpenID server settings haven't been populated yet, the authorization,
-            // logout, token, userinfo, introspection and revocation endpoints are assumed to be enabled by default.
-            // In this case, only the authorization code and refresh token flows are used.
-            return new OpenIdServerSettings
-            {
-                AllowAuthorizationCodeFlow = true,
-                AllowRefreshTokenFlow = true,
-                AuthorizationEndpointPath = "/connect/authorize",
-                LogoutEndpointPath = "/connect/logout",
-                TokenEndpointPath = "/connect/token",
-                UserinfoEndpointPath = "/connect/userinfo",
-                IntrospectionEndpointPath = "/connect/introspect",
-                RevocationEndpointPath = "/connect/revoke"
-            };
-        }
+    public async Task UpdateSettingsAsync(OpenIdServerSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-        public async Task UpdateSettingsAsync(OpenIdServerSettings settings)
-        {
-            ArgumentNullException.ThrowIfNull(settings);
+        var container = await _siteService.LoadSiteSettingsAsync();
+        container.Properties[nameof(OpenIdServerSettings)] = JObject.FromObject(settings, JOptions.Default);
+        await _siteService.UpdateSiteSettingsAsync(container);
+    }
 
-            var container = await _siteService.LoadSiteSettingsAsync();
-            container.Properties[nameof(OpenIdServerSettings)] = JObject.FromObject(settings, JOptions.Default);
-            await _siteService.UpdateSiteSettingsAsync(container);
-        }
+    public Task<ImmutableArray<ValidationResult>> ValidateSettingsAsync(OpenIdServerSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-        public Task<ImmutableArray<ValidationResult>> ValidateSettingsAsync(OpenIdServerSettings settings)
-        {
-            ArgumentNullException.ThrowIfNull(settings);
+        var results = ImmutableArray.CreateBuilder<ValidationResult>();
 
-            var results = ImmutableArray.CreateBuilder<ValidationResult>();
+        if (!settings.AllowAuthorizationCodeFlow && !settings.AllowClientCredentialsFlow &&
+            !settings.AllowHybridFlow && !settings.AllowImplicitFlow &&
+            !settings.AllowPasswordFlow && !settings.AllowRefreshTokenFlow)
+        {
+            results.Add(new ValidationResult(S["At least one OpenID Connect flow must be enabled."]));
+        }
 
-            if (!settings.AllowAuthorizationCodeFlow && !settings.AllowClientCredentialsFlow &&
-                !settings.AllowHybridFlow && !settings.AllowImplicitFlow &&
-                !settings.AllowPasswordFlow && !settings.AllowRefreshTokenFlow)
+        if (settings.Authority != null)
+        {
+            if (!settings.Authority.IsAbsoluteUri || !settings.Authority.IsWellFormedOriginalString())
             {
-                results.Add(new ValidationResult(S["At least one OpenID Connect flow must be enabled."]));
+                results.Add(new ValidationResult(S["The authority must be a valid absolute URL."], new[]
+                {
+                    nameof(settings.Authority)
+                }));
             }
 
-            if (settings.Authority != null)
+            if (!string.IsNullOrEmpty(settings.Authority.Query) || !string.IsNullOrEmpty(settings.Authority.Fragment))
             {
-                if (!settings.Authority.IsAbsoluteUri || !settings.Authority.IsWellFormedOriginalString())
-                {
-                    results.Add(new ValidationResult(S["The authority must be a valid absolute URL."], new[]
-                    {
-                        nameof(settings.Authority)
-                    }));
-                }
-
-                if (!string.IsNullOrEmpty(settings.Authority.Query) || !string.IsNullOrEmpty(settings.Authority.Fragment))
+                results.Add(new ValidationResult(S["The authority cannot contain a query string or a fragment."], new[]
                 {
-                    results.Add(new ValidationResult(S["The authority cannot contain a query string or a fragment."], new[]
-                    {
-                        nameof(settings.Authority)
-                    }));
-                }
+                    nameof(settings.Authority)
+                }));
             }
+        }
 
-            if (settings.SigningCertificateStoreLocation != null &&
-                settings.SigningCertificateStoreName != null &&
-                !string.IsNullOrEmpty(settings.SigningCertificateThumbprint))
-            {
-                var certificate = GetCertificate(
-                    settings.SigningCertificateStoreLocation.Value,
-                    settings.SigningCertificateStoreName.Value, settings.SigningCertificateThumbprint);
+        if (settings.SigningCertificateStoreLocation != null &&
+            settings.SigningCertificateStoreName != null &&
+            !string.IsNullOrEmpty(settings.SigningCertificateThumbprint))
+        {
+            var certificate = GetCertificate(
+                settings.SigningCertificateStoreLocation.Value,
+                settings.SigningCertificateStoreName.Value, settings.SigningCertificateThumbprint);
 
-                if (certificate == null)
-                {
-                    results.Add(new ValidationResult(S["The certificate cannot be found."], new[]
-                    {
-                        nameof(settings.SigningCertificateThumbprint)
-                    }));
-                }
-                else if (!certificate.HasPrivateKey)
-                {
-                    results.Add(new ValidationResult(S["The certificate doesn't contain the required private key."], new[]
-                    {
-                        nameof(settings.SigningCertificateThumbprint)
-                    }));
-                }
-                else if (certificate.Archived)
-                {
-                    results.Add(new ValidationResult(S["The certificate is not valid because it is marked as archived."], new[]
-                    {
-                        nameof(settings.SigningCertificateThumbprint)
-                    }));
-                }
-                else if (certificate.NotBefore > DateTime.Now || certificate.NotAfter < DateTime.Now)
+            if (certificate == null)
+            {
+                results.Add(new ValidationResult(S["The certificate cannot be found."], new[]
                 {
-                    results.Add(new ValidationResult(S["The certificate is not valid for current date."], new[]
-                    {
-                        nameof(settings.SigningCertificateThumbprint)
-                    }));
-                }
+                    nameof(settings.SigningCertificateThumbprint)
+                }));
             }
-
-            if (settings.AllowPasswordFlow && !settings.TokenEndpointPath.HasValue)
+            else if (!certificate.HasPrivateKey)
             {
-                results.Add(new ValidationResult(S["The password flow cannot be enabled when the token endpoint is disabled."], new[]
+                results.Add(new ValidationResult(S["The certificate doesn't contain the required private key."], new[]
                 {
-                    nameof(settings.AllowPasswordFlow)
+                    nameof(settings.SigningCertificateThumbprint)
                 }));
             }
-
-            if (settings.AllowClientCredentialsFlow && !settings.TokenEndpointPath.HasValue)
+            else if (certificate.Archived)
             {
-                results.Add(new ValidationResult(S["The client credentials flow cannot be enabled when the token endpoint is disabled."], new[]
+                results.Add(new ValidationResult(S["The certificate is not valid because it is marked as archived."], new[]
                 {
-                    nameof(settings.AllowClientCredentialsFlow)
+                    nameof(settings.SigningCertificateThumbprint)
                 }));
             }
-
-            if (settings.AllowAuthorizationCodeFlow && (!settings.AuthorizationEndpointPath.HasValue || !settings.TokenEndpointPath.HasValue))
+            else if (certificate.NotBefore > DateTime.Now || certificate.NotAfter < DateTime.Now)
             {
-                results.Add(new ValidationResult(S["The authorization code flow cannot be enabled when the authorization and token endpoints are disabled."], new[]
+                results.Add(new ValidationResult(S["The certificate is not valid for current date."], new[]
                 {
-                    nameof(settings.AllowAuthorizationCodeFlow)
+                    nameof(settings.SigningCertificateThumbprint)
                 }));
             }
+        }
 
-            if (settings.AllowRefreshTokenFlow)
+        if (settings.AllowPasswordFlow && !settings.TokenEndpointPath.HasValue)
+        {
+            results.Add(new ValidationResult(S["The password flow cannot be enabled when the token endpoint is disabled."], new[]
             {
-                if (!settings.TokenEndpointPath.HasValue)
-                {
-                    results.Add(new ValidationResult(S["The refresh token flow cannot be enabled when the token endpoint is disabled."], new[]
-                    {
-                        nameof(settings.AllowRefreshTokenFlow)
-                    }));
-                }
+                nameof(settings.AllowPasswordFlow)
+            }));
+        }
 
-                if (!settings.AllowPasswordFlow && !settings.AllowAuthorizationCodeFlow && !settings.AllowHybridFlow)
-                {
-                    results.Add(new ValidationResult(S["The refresh token flow can only be enabled if the password, authorization code or hybrid flows are enabled."], new[]
-                    {
-                        nameof(settings.AllowRefreshTokenFlow)
-                    }));
-                }
-            }
+        if (settings.AllowClientCredentialsFlow && !settings.TokenEndpointPath.HasValue)
+        {
+            results.Add(new ValidationResult(S["The client credentials flow cannot be enabled when the token endpoint is disabled."], new[]
+            {
+                nameof(settings.AllowClientCredentialsFlow)
+            }));
+        }
 
-            if (settings.AllowImplicitFlow && !settings.AuthorizationEndpointPath.HasValue)
+        if (settings.AllowAuthorizationCodeFlow && (!settings.AuthorizationEndpointPath.HasValue || !settings.TokenEndpointPath.HasValue))
+        {
+            results.Add(new ValidationResult(S["The authorization code flow cannot be enabled when the authorization and token endpoints are disabled."], new[]
             {
-                results.Add(new ValidationResult(S["The implicit flow cannot be enabled when the authorization endpoint is disabled."], new[]
-                {
-                    nameof(settings.AllowImplicitFlow)
-                }));
-            }
+                nameof(settings.AllowAuthorizationCodeFlow)
+            }));
+        }
 
-            if (settings.AllowHybridFlow && (!settings.AuthorizationEndpointPath.HasValue || !settings.TokenEndpointPath.HasValue))
+        if (settings.AllowRefreshTokenFlow)
+        {
+            if (!settings.TokenEndpointPath.HasValue)
             {
-                results.Add(new ValidationResult(S["The hybrid flow cannot be enabled when the authorization and token endpoints are disabled."], new[]
+                results.Add(new ValidationResult(S["The refresh token flow cannot be enabled when the token endpoint is disabled."], new[]
                 {
-                    nameof(settings.AllowHybridFlow)
+                    nameof(settings.AllowRefreshTokenFlow)
                 }));
             }
 
-            if (settings.DisableAccessTokenEncryption && settings.AccessTokenFormat != OpenIdServerSettings.TokenFormat.JsonWebToken)
+            if (!settings.AllowPasswordFlow && !settings.AllowAuthorizationCodeFlow && !settings.AllowHybridFlow)
             {
-                results.Add(new ValidationResult(S["Access token encryption can only be disabled when using JWT tokens."], new[]
+                results.Add(new ValidationResult(S["The refresh token flow can only be enabled if the password, authorization code or hybrid flows are enabled."], new[]
                 {
-                    nameof(settings.DisableAccessTokenEncryption)
+                    nameof(settings.AllowRefreshTokenFlow)
                 }));
             }
+        }
+
+        if (settings.AllowImplicitFlow && !settings.AuthorizationEndpointPath.HasValue)
+        {
+            results.Add(new ValidationResult(S["The implicit flow cannot be enabled when the authorization endpoint is disabled."], new[]
+            {
+                nameof(settings.AllowImplicitFlow)
+            }));
+        }
 
-            return Task.FromResult(results.ToImmutable());
+        if (settings.AllowHybridFlow && (!settings.AuthorizationEndpointPath.HasValue || !settings.TokenEndpointPath.HasValue))
+        {
+            results.Add(new ValidationResult(S["The hybrid flow cannot be enabled when the authorization and token endpoints are disabled."], new[]
+            {
+                nameof(settings.AllowHybridFlow)
+            }));
         }
 
-        public Task<ImmutableArray<(X509Certificate2 certificate, StoreLocation location, StoreName name)>> GetAvailableCertificatesAsync()
+        if (settings.DisableAccessTokenEncryption && settings.AccessTokenFormat != OpenIdServerSettings.TokenFormat.JsonWebToken)
         {
-            var certificates = ImmutableArray.CreateBuilder<(X509Certificate2, StoreLocation, StoreName)>();
+            results.Add(new ValidationResult(S["Access token encryption can only be disabled when using JWT tokens."], new[]
+            {
+                nameof(settings.DisableAccessTokenEncryption)
+            }));
+        }
+
+        return Task.FromResult(results.ToImmutable());
+    }
 
-            foreach (StoreLocation location in Enum.GetValues<StoreLocation>())
+    public Task<ImmutableArray<(X509Certificate2 certificate, StoreLocation location, StoreName name)>> GetAvailableCertificatesAsync()
+    {
+        var certificates = ImmutableArray.CreateBuilder<(X509Certificate2, StoreLocation, StoreName)>();
+
+        foreach (StoreLocation location in Enum.GetValues<StoreLocation>())
+        {
+            foreach (StoreName name in Enum.GetValues<StoreName>())
             {
-                foreach (StoreName name in Enum.GetValues<StoreName>())
+                // Note: on non-Windows platforms, an exception can
+                // be thrown if the store location/name doesn't exist.
+                try
                 {
-                    // Note: on non-Windows platforms, an exception can
-                    // be thrown if the store location/name doesn't exist.
-                    try
-                    {
-                        using var store = new X509Store(name, location);
-                        store.Open(OpenFlags.ReadOnly);
+                    using var store = new X509Store(name, location);
+                    store.Open(OpenFlags.ReadOnly);
 
-                        foreach (var certificate in store.Certificates)
+                    foreach (var certificate in store.Certificates)
+                    {
+                        if (!certificate.Archived && certificate.HasPrivateKey)
                         {
-                            if (!certificate.Archived && certificate.HasPrivateKey)
-                            {
-                                certificates.Add((certificate, location, name));
-                            }
+                            certificates.Add((certificate, location, name));
                         }
                     }
-                    catch (CryptographicException)
-                    {
-                        continue;
-                    }
+                }
+                catch (CryptographicException)
+                {
+                    continue;
                 }
             }
-
-            return Task.FromResult(certificates.ToImmutable());
         }
 
-        public async Task<ImmutableArray<SecurityKey>> GetEncryptionKeysAsync()
+        return Task.FromResult(certificates.ToImmutable());
+    }
+
+    public async Task<ImmutableArray<SecurityKey>> GetEncryptionKeysAsync()
+    {
+        var settings = await GetSettingsAsync();
+
+        // If a certificate was explicitly provided, return it immediately
+        // instead of using the fallback managed certificates logic.
+        if (settings.EncryptionCertificateStoreLocation != null &&
+            settings.EncryptionCertificateStoreName != null &&
+            !string.IsNullOrEmpty(settings.EncryptionCertificateThumbprint))
         {
-            var settings = await GetSettingsAsync();
+            var certificate = GetCertificate(
+                settings.EncryptionCertificateStoreLocation.Value,
+                settings.EncryptionCertificateStoreName.Value, settings.EncryptionCertificateThumbprint);
 
-            // If a certificate was explicitly provided, return it immediately
-            // instead of using the fallback managed certificates logic.
-            if (settings.EncryptionCertificateStoreLocation != null &&
-                settings.EncryptionCertificateStoreName != null &&
-                !string.IsNullOrEmpty(settings.EncryptionCertificateThumbprint))
+            if (certificate != null)
             {
-                var certificate = GetCertificate(
-                    settings.EncryptionCertificateStoreLocation.Value,
-                    settings.EncryptionCertificateStoreName.Value, settings.EncryptionCertificateThumbprint);
+                return [new X509SecurityKey(certificate)];
+            }
 
-                if (certificate != null)
-                {
-                    return [new X509SecurityKey(certificate)];
-                }
+            _logger.LogWarning("The encryption certificate '{Thumbprint}' could not be found in the " +
+                               "{StoreLocation}/{StoreName} store.", settings.EncryptionCertificateThumbprint,
+                               settings.EncryptionCertificateStoreLocation.Value.ToString(),
+                               settings.EncryptionCertificateStoreName.Value.ToString());
+        }
+
+        try
+        {
+            var directory = GetEncryptionCertificateDirectory(_shellOptions.CurrentValue, _shellSettings);
 
-                _logger.LogWarning("The encryption certificate '{Thumbprint}' could not be found in the " +
-                                   "{StoreLocation}/{StoreName} store.", settings.EncryptionCertificateThumbprint,
-                                   settings.EncryptionCertificateStoreLocation.Value.ToString(),
-                                   settings.EncryptionCertificateStoreName.Value.ToString());
+            var certificates = (await GetCertificatesAsync(directory)).Select(tuple => tuple.certificate).ToList();
+            if (certificates.Any(certificate => certificate.NotAfter.AddDays(-7) > DateTime.Now))
+            {
+                return ImmutableArray.CreateRange<SecurityKey>(
+                    from certificate in certificates
+                    select new X509SecurityKey(certificate));
             }
 
             try
             {
-                var directory = GetEncryptionCertificateDirectory(_shellOptions.CurrentValue, _shellSettings);
-
-                var certificates = (await GetCertificatesAsync(directory)).Select(tuple => tuple.certificate).ToList();
-                if (certificates.Any(certificate => certificate.NotAfter.AddDays(-7) > DateTime.Now))
-                {
-                    return ImmutableArray.CreateRange<SecurityKey>(
-                        from certificate in certificates
-                        select new X509SecurityKey(certificate));
-                }
-
-                try
-                {
-                    // If the certificates list is empty or only contains certificates about to expire,
-                    // generate a new certificate and add it on top of the list to ensure it's preferred
-                    // by OpenIddict to the other certificates when issuing new IdentityModel tokens.
-                    var certificate = GenerateEncryptionCertificate(_shellSettings);
-                    await PersistCertificateAsync(directory, certificate);
+                // If the certificates list is empty or only contains certificates about to expire,
+                // generate a new certificate and add it on top of the list to ensure it's preferred
+                // by OpenIddict to the other certificates when issuing new IdentityModel tokens.
+                var certificate = GenerateEncryptionCertificate(_shellSettings);
+                await PersistCertificateAsync(directory, certificate);
 
-                    certificates.Insert(0, certificate);
+                certificates.Insert(0, certificate);
 
-                    return certificates.Select(certificate => new X509SecurityKey(certificate)).ToImmutableArray<SecurityKey>();
-                }
-                catch (Exception exception)
-                {
-                    _logger.LogError(exception, "An error occurred while trying to generate a X.509 encryption certificate.");
-                }
+                return certificates.Select(certificate => new X509SecurityKey(certificate)).ToImmutableArray<SecurityKey>();
             }
             catch (Exception exception)
             {
-                _logger.LogWarning(exception, "An error occurred while trying to retrieve the X.509 encryption certificates.");
+                _logger.LogError(exception, "An error occurred while trying to generate a X.509 encryption certificate.");
             }
+        }
+        catch (Exception exception)
+        {
+            _logger.LogWarning(exception, "An error occurred while trying to retrieve the X.509 encryption certificates.");
+        }
 
-            // If none of the previous attempts succeeded, try to generate an ephemeral RSA key
-            // and add it in the tenant memory cache so that future calls to this method return it.
-            return
-            [
-                _memoryCache.GetOrCreate("05A24221-8C15-4E58-A0A7-56EC3E42E783", entry =>
-                {
-                    entry.SetPriority(CacheItemPriority.NeverRemove);
+        // If none of the previous attempts succeeded, try to generate an ephemeral RSA key
+        // and add it in the tenant memory cache so that future calls to this method return it.
+        return
+        [
+            _memoryCache.GetOrCreate("05A24221-8C15-4E58-A0A7-56EC3E42E783", entry =>
+            {
+                entry.SetPriority(CacheItemPriority.NeverRemove);
 
-                    return new RsaSecurityKey(GenerateRsaSecurityKey(size: 2048));
-                }),
-            ];
-        }
+                return new RsaSecurityKey(GenerateRsaSecurityKey(size: 2048));
+            }),
+        ];
+    }
 
-        public async Task<ImmutableArray<SecurityKey>> GetSigningKeysAsync()
+    public async Task<ImmutableArray<SecurityKey>> GetSigningKeysAsync()
+    {
+        var settings = await GetSettingsAsync();
+
+        // If a certificate was explicitly provided, return it immediately
+        // instead of using the fallback managed certificates logic.
+        if (settings.SigningCertificateStoreLocation != null &&
+            settings.SigningCertificateStoreName != null &&
+            !string.IsNullOrEmpty(settings.SigningCertificateThumbprint))
         {
-            var settings = await GetSettingsAsync();
+            var certificate = GetCertificate(
+                settings.SigningCertificateStoreLocation.Value,
+                settings.SigningCertificateStoreName.Value, settings.SigningCertificateThumbprint);
 
-            // If a certificate was explicitly provided, return it immediately
-            // instead of using the fallback managed certificates logic.
-            if (settings.SigningCertificateStoreLocation != null &&
-                settings.SigningCertificateStoreName != null &&
-                !string.IsNullOrEmpty(settings.SigningCertificateThumbprint))
+            if (certificate != null)
             {
-                var certificate = GetCertificate(
-                    settings.SigningCertificateStoreLocation.Value,
-                    settings.SigningCertificateStoreName.Value, settings.SigningCertificateThumbprint);
+                return [new X509SecurityKey(certificate)];
+            }
 
-                if (certificate != null)
-                {
-                    return [new X509SecurityKey(certificate)];
-                }
+            _logger.LogWarning("The signing certificate '{Thumbprint}' could not be found in the " +
+                               "{StoreLocation}/{StoreName} store.", settings.SigningCertificateThumbprint,
+                               settings.SigningCertificateStoreLocation.Value.ToString(),
+                               settings.SigningCertificateStoreName.Value.ToString());
+        }
+
+        try
+        {
+            var directory = GetSigningCertificateDirectory(_shellOptions.CurrentValue, _shellSettings);
 
-                _logger.LogWarning("The signing certificate '{Thumbprint}' could not be found in the " +
-                                   "{StoreLocation}/{StoreName} store.", settings.SigningCertificateThumbprint,
-                                   settings.SigningCertificateStoreLocation.Value.ToString(),
-                                   settings.SigningCertificateStoreName.Value.ToString());
+            var certificates = (await GetCertificatesAsync(directory)).Select(tuple => tuple.certificate).ToList();
+            if (certificates.Any(certificate => certificate.NotAfter.AddDays(-7) > DateTime.Now))
+            {
+                return ImmutableArray.CreateRange<SecurityKey>(
+                    from certificate in certificates
+                    select new X509SecurityKey(certificate));
             }
 
             try
             {
-                var directory = GetSigningCertificateDirectory(_shellOptions.CurrentValue, _shellSettings);
-
-                var certificates = (await GetCertificatesAsync(directory)).Select(tuple => tuple.certificate).ToList();
-                if (certificates.Any(certificate => certificate.NotAfter.AddDays(-7) > DateTime.Now))
-                {
-                    return ImmutableArray.CreateRange<SecurityKey>(
-                        from certificate in certificates
-                        select new X509SecurityKey(certificate));
-                }
-
-                try
-                {
-                    // If the certificates list is empty or only contains certificates about to expire,
-                    // generate a new certificate and add it on top of the list to ensure it's preferred
-                    // by OpenIddict to the other certificates when issuing new IdentityModel tokens.
-                    var certificate = GenerateSigningCertificate(_shellSettings);
-                    await PersistCertificateAsync(directory, certificate);
+                // If the certificates list is empty or only contains certificates about to expire,
+                // generate a new certificate and add it on top of the list to ensure it's preferred
+                // by OpenIddict to the other certificates when issuing new IdentityModel tokens.
+                var certificate = GenerateSigningCertificate(_shellSettings);
+                await PersistCertificateAsync(directory, certificate);
 
-                    certificates.Insert(0, certificate);
+                certificates.Insert(0, certificate);
 
-                    return certificates.Select(certificate => new X509SecurityKey(certificate)).ToImmutableArray<SecurityKey>();
-                }
-                catch (Exception exception)
-                {
-                    _logger.LogError(exception, "An error occurred while trying to generate a X.509 signing certificate.");
-                }
+                return certificates.Select(certificate => new X509SecurityKey(certificate)).ToImmutableArray<SecurityKey>();
             }
             catch (Exception exception)
             {
-                _logger.LogWarning(exception, "An error occurred while trying to retrieve the X.509 signing certificates.");
+                _logger.LogError(exception, "An error occurred while trying to generate a X.509 signing certificate.");
             }
+        }
+        catch (Exception exception)
+        {
+            _logger.LogWarning(exception, "An error occurred while trying to retrieve the X.509 signing certificates.");
+        }
 
-            // If none of the previous attempts succeeded, try to generate an ephemeral RSA key
-            // and add it in the tenant memory cache so that future calls to this method return it.
-            return
-            [
-                _memoryCache.GetOrCreate("44788774-20E3-4499-86F0-AB7CE2DF97F6", entry =>
-                {
-                    entry.SetPriority(CacheItemPriority.NeverRemove);
+        // If none of the previous attempts succeeded, try to generate an ephemeral RSA key
+        // and add it in the tenant memory cache so that future calls to this method return it.
+        return
+        [
+            _memoryCache.GetOrCreate("44788774-20E3-4499-86F0-AB7CE2DF97F6", entry =>
+            {
+                entry.SetPriority(CacheItemPriority.NeverRemove);
 
-                    return new RsaSecurityKey(GenerateRsaSecurityKey(size: 2048));
-                }),
-            ];
-        }
+                return new RsaSecurityKey(GenerateRsaSecurityKey(size: 2048));
+            }),
+        ];
+    }
 
-        public async Task PruneManagedCertificatesAsync()
-        {
-            List<Exception> exceptions = null;
+    public async Task PruneManagedCertificatesAsync()
+    {
+        List<Exception> exceptions = null;
 
-            var certificates = new List<(string path, X509Certificate2 certificate)>();
-            certificates.AddRange(await GetCertificatesAsync(GetEncryptionCertificateDirectory(_shellOptions.CurrentValue, _shellSettings)));
-            certificates.AddRange(await GetCertificatesAsync(GetSigningCertificateDirectory(_shellOptions.CurrentValue, _shellSettings)));
+        var certificates = new List<(string path, X509Certificate2 certificate)>();
+        certificates.AddRange(await GetCertificatesAsync(GetEncryptionCertificateDirectory(_shellOptions.CurrentValue, _shellSettings)));
+        certificates.AddRange(await GetCertificatesAsync(GetSigningCertificateDirectory(_shellOptions.CurrentValue, _shellSettings)));
 
-            foreach (var (path, certificate) in certificates)
+        foreach (var (path, certificate) in certificates)
+        {
+            // Only delete expired certificates that expired at least 7 days ago.
+            if (certificate.NotAfter.AddDays(7) < DateTime.Now)
             {
-                // Only delete expired certificates that expired at least 7 days ago.
-                if (certificate.NotAfter.AddDays(7) < DateTime.Now)
+                try
                 {
-                    try
-                    {
-                        // Delete both the X.509 certificate and its password file.
-                        File.Delete(path);
-                        File.Delete(Path.ChangeExtension(path, ".pwd"));
-                    }
-                    catch (Exception exception)
-                    {
-                        exceptions ??= [];
-
-                        exceptions.Add(exception);
-                    }
+                    // Delete both the X.509 certificate and its password file.
+                    File.Delete(path);
+                    File.Delete(Path.ChangeExtension(path, ".pwd"));
                 }
-            }
+                catch (Exception exception)
+                {
+                    exceptions ??= [];
 
-            if (exceptions != null)
-            {
-                throw new AggregateException(exceptions);
+                    exceptions.Add(exception);
+                }
             }
         }
 
-        private static X509Certificate2 GetCertificate(StoreLocation location, StoreName name, string thumbprint)
+        if (exceptions != null)
         {
-            using var store = new X509Store(name, location);
-            store.Open(OpenFlags.ReadOnly);
+            throw new AggregateException(exceptions);
+        }
+    }
 
-            var certificates = store.Certificates.Find(X509FindType.FindByThumbprint, thumbprint, validOnly: false);
+    private static X509Certificate2 GetCertificate(StoreLocation location, StoreName name, string thumbprint)
+    {
+        using var store = new X509Store(name, location);
+        store.Open(OpenFlags.ReadOnly);
 
-            return certificates.Count switch
-            {
-                0 => null,
-                1 => certificates[0],
-                _ => throw new InvalidOperationException("Multiple certificates with the same thumbprint were found."),
-            };
-        }
+        var certificates = store.Certificates.Find(X509FindType.FindByThumbprint, thumbprint, validOnly: false);
 
-        private static DirectoryInfo GetEncryptionCertificateDirectory(ShellOptions options, ShellSettings settings)
-            => Directory.CreateDirectory(Path.Combine(
-                options.ShellsApplicationDataPath,
-                options.ShellsContainerName,
-                settings.Name, "IdentityModel-Encryption-Certificates"));
+        return certificates.Count switch
+        {
+            0 => null,
+            1 => certificates[0],
+            _ => throw new InvalidOperationException("Multiple certificates with the same thumbprint were found."),
+        };
+    }
 
-        private static DirectoryInfo GetSigningCertificateDirectory(ShellOptions options, ShellSettings settings)
-            => Directory.CreateDirectory(Path.Combine(
-                options.ShellsApplicationDataPath,
-                options.ShellsContainerName,
-                settings.Name, "IdentityModel-Signing-Certificates"));
+    private static DirectoryInfo GetEncryptionCertificateDirectory(ShellOptions options, ShellSettings settings)
+        => Directory.CreateDirectory(Path.Combine(
+            options.ShellsApplicationDataPath,
+            options.ShellsContainerName,
+            settings.Name, "IdentityModel-Encryption-Certificates"));
 
-        private async Task<ImmutableArray<(string path, X509Certificate2 certificate)>> GetCertificatesAsync(DirectoryInfo directory)
+    private static DirectoryInfo GetSigningCertificateDirectory(ShellOptions options, ShellSettings settings)
+        => Directory.CreateDirectory(Path.Combine(
+            options.ShellsApplicationDataPath,
+            options.ShellsContainerName,
+            settings.Name, "IdentityModel-Signing-Certificates"));
+
+    private async Task<ImmutableArray<(string path, X509Certificate2 certificate)>> GetCertificatesAsync(DirectoryInfo directory)
+    {
+        if (!directory.Exists)
         {
-            if (!directory.Exists)
-            {
-                return ImmutableArray.Create<(string, X509Certificate2)>();
-            }
+            return ImmutableArray.Create<(string, X509Certificate2)>();
+        }
 
-            var certificates = ImmutableArray.CreateBuilder<(string, X509Certificate2)>();
+        var certificates = ImmutableArray.CreateBuilder<(string, X509Certificate2)>();
 
-            foreach (var file in directory.EnumerateFiles("*.pfx", SearchOption.TopDirectoryOnly))
+        foreach (var file in directory.EnumerateFiles("*.pfx", SearchOption.TopDirectoryOnly))
+        {
+            try
             {
-                try
+                // Only add the certificate if it's still valid.
+                var certificate = await GetCertificateAsync(file.FullName);
+                if (certificate.NotBefore <= DateTime.Now && certificate.NotAfter > DateTime.Now)
                 {
-                    // Only add the certificate if it's still valid.
-                    var certificate = await GetCertificateAsync(file.FullName);
-                    if (certificate.NotBefore <= DateTime.Now && certificate.NotAfter > DateTime.Now)
-                    {
-                        certificates.Add((file.FullName, certificate));
-                    }
-                }
-                catch (Exception exception)
-                {
-                    _logger.LogWarning(exception, "An error occurred while trying to extract a X.509 certificate.");
-
-                    continue;
+                    certificates.Add((file.FullName, certificate));
                 }
             }
-
-            return certificates.ToImmutable();
-
-            async Task<string> GetPasswordAsync(string path)
+            catch (Exception exception)
             {
-                using var stream = File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read);
-                using var reader = new StreamReader(stream);
+                _logger.LogWarning(exception, "An error occurred while trying to extract a X.509 certificate.");
 
-                return _dataProtector.Unprotect(await reader.ReadToEndAsync());
+                continue;
             }
+        }
 
-            async Task<X509Certificate2> GetCertificateAsync(string path)
-            {
-                // Extract the certificate password from the separate .pwd file.
-                var password = await GetPasswordAsync(Path.ChangeExtension(path, ".pwd"));
+        return certificates.ToImmutable();
 
-                try
-                {
-                    // Note: ephemeral key sets are not supported on non-Windows platforms.
-                    var flags = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
-                        X509KeyStorageFlags.EphemeralKeySet :
-                        X509KeyStorageFlags.MachineKeySet;
-
-                    return new X509Certificate2(path, password, flags);
-                }
-                // Some cloud platforms (e.g Azure App Service/Antares) are known to fail to import .pfx files if the
-                // private key is not persisted or marked as exportable. To ensure X.509 certificates can be correctly
-                // read on these platforms, a second pass is made by specifying the PersistKeySet and Exportable flags.
-                // For more information, visit https://github.com/OrchardCMS/OrchardCore/issues/3222.
-                catch (CryptographicException exception)
-                {
-                    _logger.LogDebug(exception, "A first-chance exception occurred while trying to extract " +
-                                                "a X.509 certificate with the default key storage options.");
+        async Task<string> GetPasswordAsync(string path)
+        {
+            using var stream = File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read);
+            using var reader = new StreamReader(stream);
 
-                    return new X509Certificate2(path, password,
-                        X509KeyStorageFlags.MachineKeySet |
-                        X509KeyStorageFlags.PersistKeySet |
-                        X509KeyStorageFlags.Exportable);
-                }
-                // Don't swallow exceptions thrown from the catch handler to ensure unrecoverable exceptions
-                // (e.g caused by malformed X.509 certificates or invalid password) are correctly logged.
-            }
+            return _dataProtector.Unprotect(await reader.ReadToEndAsync());
         }
 
-        private static X509Certificate2 GenerateEncryptionCertificate(ShellSettings settings)
+        async Task<X509Certificate2> GetCertificateAsync(string path)
         {
-            var algorithm = GenerateRsaSecurityKey(size: 2048);
-            var certificate = GenerateCertificate(X509KeyUsageFlags.KeyEncipherment, algorithm, settings);
+            // Extract the certificate password from the separate .pwd file.
+            var password = await GetPasswordAsync(Path.ChangeExtension(path, ".pwd"));
 
-            // Note: setting the friendly name is not supported on Unix machines (including Linux and macOS).
-            // To ensure an exception is not thrown by the property setter, an OS runtime check is used here.
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            try
             {
-                certificate.FriendlyName = "OrchardCore OpenID Server Encryption Certificate";
+                // Note: ephemeral key sets are not supported on non-Windows platforms.
+                var flags = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
+                    X509KeyStorageFlags.EphemeralKeySet :
+                    X509KeyStorageFlags.MachineKeySet;
+
+                return new X509Certificate2(path, password, flags);
             }
+            // Some cloud platforms (e.g Azure App Service/Antares) are known to fail to import .pfx files if the
+            // private key is not persisted or marked as exportable. To ensure X.509 certificates can be correctly
+            // read on these platforms, a second pass is made by specifying the PersistKeySet and Exportable flags.
+            // For more information, visit https://github.com/OrchardCMS/OrchardCore/issues/3222.
+            catch (CryptographicException exception)
+            {
+                _logger.LogDebug(exception, "A first-chance exception occurred while trying to extract " +
+                                            "a X.509 certificate with the default key storage options.");
 
-            return certificate;
+                return new X509Certificate2(path, password,
+                    X509KeyStorageFlags.MachineKeySet |
+                    X509KeyStorageFlags.PersistKeySet |
+                    X509KeyStorageFlags.Exportable);
+            }
+            // Don't swallow exceptions thrown from the catch handler to ensure unrecoverable exceptions
+            // (e.g caused by malformed X.509 certificates or invalid password) are correctly logged.
         }
+    }
+
+    private static X509Certificate2 GenerateEncryptionCertificate(ShellSettings settings)
+    {
+        var algorithm = GenerateRsaSecurityKey(size: 2048);
+        var certificate = GenerateCertificate(X509KeyUsageFlags.KeyEncipherment, algorithm, settings);
 
-        private static X509Certificate2 GenerateSigningCertificate(ShellSettings settings)
+        // Note: setting the friendly name is not supported on Unix machines (including Linux and macOS).
+        // To ensure an exception is not thrown by the property setter, an OS runtime check is used here.
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
-            var algorithm = GenerateRsaSecurityKey(size: 2048);
-            var certificate = GenerateCertificate(X509KeyUsageFlags.DigitalSignature, algorithm, settings);
+            certificate.FriendlyName = "OrchardCore OpenID Server Encryption Certificate";
+        }
 
-            // Note: setting the friendly name is not supported on Unix machines (including Linux and macOS).
-            // To ensure an exception is not thrown by the property setter, an OS runtime check is used here.
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                certificate.FriendlyName = "OrchardCore OpenID Server Signing Certificate";
-            }
+        return certificate;
+    }
 
-            return certificate;
-        }
+    private static X509Certificate2 GenerateSigningCertificate(ShellSettings settings)
+    {
+        var algorithm = GenerateRsaSecurityKey(size: 2048);
+        var certificate = GenerateCertificate(X509KeyUsageFlags.DigitalSignature, algorithm, settings);
 
-        private static X509Certificate2 GenerateCertificate(X509KeyUsageFlags type, RSA algorithm, ShellSettings settings)
+        // Note: setting the friendly name is not supported on Unix machines (including Linux and macOS).
+        // To ensure an exception is not thrown by the property setter, an OS runtime check is used here.
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
-            var subject = GetSubjectName();
+            certificate.FriendlyName = "OrchardCore OpenID Server Signing Certificate";
+        }
+
+        return certificate;
+    }
+
+    private static X509Certificate2 GenerateCertificate(X509KeyUsageFlags type, RSA algorithm, ShellSettings settings)
+    {
+        var subject = GetSubjectName();
 
-            // Note: ensure the digitalSignature bit is added to the certificate, so that no validation error
-            // is returned to clients that fully validate the certificates chain and their X.509 key usages.
-            var request = new CertificateRequest(subject, algorithm, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
-            request.CertificateExtensions.Add(new X509KeyUsageExtension(type, critical: true));
+        // Note: ensure the digitalSignature bit is added to the certificate, so that no validation error
+        // is returned to clients that fully validate the certificates chain and their X.509 key usages.
+        var request = new CertificateRequest(subject, algorithm, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+        request.CertificateExtensions.Add(new X509KeyUsageExtension(type, critical: true));
 
-            return request.CreateSelfSigned(DateTimeOffset.UtcNow, DateTimeOffset.UtcNow.AddMonths(3));
+        return request.CreateSelfSigned(DateTimeOffset.UtcNow, DateTimeOffset.UtcNow.AddMonths(3));
 
-            X500DistinguishedName GetSubjectName()
+        X500DistinguishedName GetSubjectName()
+        {
+            var host = settings.RequestUrlHosts.FirstOrDefault(host => host != "localhost");
+            try
             {
-                var host = settings.RequestUrlHosts.FirstOrDefault(host => host != "localhost");
-                try
-                {
-                    return new X500DistinguishedName("CN=" + (host ?? "localhost"));
-                }
-                catch
-                {
-                    return new X500DistinguishedName("CN=localhost");
-                }
+                return new X500DistinguishedName("CN=" + (host ?? "localhost"));
+            }
+            catch
+            {
+                return new X500DistinguishedName("CN=localhost");
             }
         }
+    }
 
-        private static RSA GenerateRsaSecurityKey(int size)
+    private static RSA GenerateRsaSecurityKey(int size)
+    {
+        // By default, the default RSA implementation used by .NET Core relies on the newest Windows CNG APIs.
+        // Unfortunately, when a new key is generated using the default RSA.Create() method, it is not bound
+        // to the machine account, which may cause security exceptions when running Orchard on IIS using a
+        // virtual application pool identity or without the profile loading feature enabled (off by default).
+        // To ensure a RSA key can be generated flawlessly, it is manually created using the managed CNG APIs.
+        // For more information, visit https://github.com/openiddict/openiddict-core/issues/204.
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
-            // By default, the default RSA implementation used by .NET Core relies on the newest Windows CNG APIs.
-            // Unfortunately, when a new key is generated using the default RSA.Create() method, it is not bound
-            // to the machine account, which may cause security exceptions when running Orchard on IIS using a
-            // virtual application pool identity or without the profile loading feature enabled (off by default).
-            // To ensure a RSA key can be generated flawlessly, it is manually created using the managed CNG APIs.
-            // For more information, visit https://github.com/openiddict/openiddict-core/issues/204.
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // Warning: ensure a null key name is specified to ensure the RSA key is not persisted by CNG.
-                var key = CngKey.Create(CngAlgorithm.Rsa, keyName: null, new CngKeyCreationParameters
-                {
-                    ExportPolicy = CngExportPolicies.AllowPlaintextExport,
-                    KeyCreationOptions = CngKeyCreationOptions.MachineKey,
-                    Parameters = { new CngProperty("Length", BitConverter.GetBytes(size), CngPropertyOptions.None) }
-                });
-
-                return new RSACng(key);
-            }
+            // Warning: ensure a null key name is specified to ensure the RSA key is not persisted by CNG.
+            var key = CngKey.Create(CngAlgorithm.Rsa, keyName: null, new CngKeyCreationParameters
+            {
+                ExportPolicy = CngExportPolicies.AllowPlaintextExport,
+                KeyCreationOptions = CngKeyCreationOptions.MachineKey,
+                Parameters = { new CngProperty("Length", BitConverter.GetBytes(size), CngPropertyOptions.None) }
+            });
 
-            return RSA.Create(size);
+            return new RSACng(key);
         }
 
-        private async Task PersistCertificateAsync(DirectoryInfo directory, X509Certificate2 certificate)
-        {
-            var password = GeneratePassword();
-            var path = Path.Combine(directory.FullName, Guid.NewGuid().ToString());
+        return RSA.Create(size);
+    }
 
-            await File.WriteAllBytesAsync(Path.ChangeExtension(path, ".pfx"), certificate.Export(X509ContentType.Pfx, password));
-            await File.WriteAllTextAsync(Path.ChangeExtension(path, ".pwd"), _dataProtector.Protect(password));
+    private async Task PersistCertificateAsync(DirectoryInfo directory, X509Certificate2 certificate)
+    {
+        var password = GeneratePassword();
+        var path = Path.Combine(directory.FullName, Guid.NewGuid().ToString());
 
-            static string GeneratePassword()
-            {
-                Span<byte> data = stackalloc byte[256 / 8];
-                RandomNumberGenerator.Fill(data);
-                return Convert.ToBase64String(data, Base64FormattingOptions.None);
-            }
+        await File.WriteAllBytesAsync(Path.ChangeExtension(path, ".pfx"), certificate.Export(X509ContentType.Pfx, password));
+        await File.WriteAllTextAsync(Path.ChangeExtension(path, ".pwd"), _dataProtector.Protect(password));
+
+        static string GeneratePassword()
+        {
+            Span<byte> data = stackalloc byte[256 / 8];
+            RandomNumberGenerator.Fill(data);
+            return Convert.ToBase64String(data, Base64FormattingOptions.None);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Services/OpenIdValidationService.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Services/OpenIdValidationService.cs
index 4a63ac63eb3..f3ead40e48e 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Services/OpenIdValidationService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Services/OpenIdValidationService.cs
@@ -14,215 +14,214 @@
 using OrchardCore.OpenId.Settings;
 using OrchardCore.Settings;
 
-namespace OrchardCore.OpenId.Services
+namespace OrchardCore.OpenId.Services;
+
+public class OpenIdValidationService : IOpenIdValidationService
 {
-    public class OpenIdValidationService : IOpenIdValidationService
+    private readonly ShellDescriptor _shellDescriptor;
+    private readonly ShellSettings _shellSettings;
+    private readonly IShellHost _shellHost;
+    private readonly ISiteService _siteService;
+
+    protected readonly IStringLocalizer S;
+
+    public OpenIdValidationService(
+        ShellDescriptor shellDescriptor,
+        ShellSettings shellSettings,
+        IShellHost shellHost,
+        ISiteService siteService,
+        IStringLocalizer<OpenIdValidationService> stringLocalizer)
     {
-        private readonly ShellDescriptor _shellDescriptor;
-        private readonly ShellSettings _shellSettings;
-        private readonly IShellHost _shellHost;
-        private readonly ISiteService _siteService;
-
-        protected readonly IStringLocalizer S;
-
-        public OpenIdValidationService(
-            ShellDescriptor shellDescriptor,
-            ShellSettings shellSettings,
-            IShellHost shellHost,
-            ISiteService siteService,
-            IStringLocalizer<OpenIdValidationService> stringLocalizer)
-        {
-            _shellDescriptor = shellDescriptor;
-            _shellSettings = shellSettings;
-            _shellHost = shellHost;
-            _siteService = siteService;
-            S = stringLocalizer;
-        }
+        _shellDescriptor = shellDescriptor;
+        _shellSettings = shellSettings;
+        _shellHost = shellHost;
+        _siteService = siteService;
+        S = stringLocalizer;
+    }
 
-        public async Task<OpenIdValidationSettings> GetSettingsAsync()
-        {
-            var container = await _siteService.GetSiteSettingsAsync();
-            return GetSettingsFromContainer(container);
-        }
+    public async Task<OpenIdValidationSettings> GetSettingsAsync()
+    {
+        var container = await _siteService.GetSiteSettingsAsync();
+        return GetSettingsFromContainer(container);
+    }
+
+    public async Task<OpenIdValidationSettings> LoadSettingsAsync()
+    {
+        var container = await _siteService.LoadSiteSettingsAsync();
+        return GetSettingsFromContainer(container);
+    }
 
-        public async Task<OpenIdValidationSettings> LoadSettingsAsync()
+    private OpenIdValidationSettings GetSettingsFromContainer(ISite container)
+    {
+        if (container.Properties.TryGetPropertyValue(nameof(OpenIdValidationSettings), out var settings))
         {
-            var container = await _siteService.LoadSiteSettingsAsync();
-            return GetSettingsFromContainer(container);
+            return settings.ToObject<OpenIdValidationSettings>();
         }
 
-        private OpenIdValidationSettings GetSettingsFromContainer(ISite container)
+        // If the OpenID validation settings haven't been populated yet, assume the validation
+        // feature will use the OpenID server registered in this tenant if it's been enabled.
+        if (_shellDescriptor.Features.Any(feature => feature.Id == OpenIdConstants.Features.Server))
         {
-            if (container.Properties.TryGetPropertyValue(nameof(OpenIdValidationSettings), out var settings))
+            return new OpenIdValidationSettings
             {
-                return settings.ToObject<OpenIdValidationSettings>();
-            }
+                Tenant = _shellSettings.Name,
+            };
+        }
 
-            // If the OpenID validation settings haven't been populated yet, assume the validation
-            // feature will use the OpenID server registered in this tenant if it's been enabled.
-            if (_shellDescriptor.Features.Any(feature => feature.Id == OpenIdConstants.Features.Server))
-            {
-                return new OpenIdValidationSettings
-                {
-                    Tenant = _shellSettings.Name,
-                };
-            }
+        return new OpenIdValidationSettings();
+    }
 
-            return new OpenIdValidationSettings();
-        }
+    public async Task UpdateSettingsAsync(OpenIdValidationSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-        public async Task UpdateSettingsAsync(OpenIdValidationSettings settings)
-        {
-            ArgumentNullException.ThrowIfNull(settings);
+        var container = await _siteService.LoadSiteSettingsAsync();
+        container.Properties[nameof(OpenIdValidationSettings)] = JObject.FromObject(settings);
+        await _siteService.UpdateSiteSettingsAsync(container);
+    }
 
-            var container = await _siteService.LoadSiteSettingsAsync();
-            container.Properties[nameof(OpenIdValidationSettings)] = JObject.FromObject(settings);
-            await _siteService.UpdateSiteSettingsAsync(container);
-        }
+    public async Task<ImmutableArray<ValidationResult>> ValidateSettingsAsync(OpenIdValidationSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-        public async Task<ImmutableArray<ValidationResult>> ValidateSettingsAsync(OpenIdValidationSettings settings)
-        {
-            ArgumentNullException.ThrowIfNull(settings);
+        var results = ImmutableArray.CreateBuilder<ValidationResult>();
 
-            var results = ImmutableArray.CreateBuilder<ValidationResult>();
+        if (!(settings.Authority == null ^ string.IsNullOrEmpty(settings.Tenant)))
+        {
+            results.Add(new ValidationResult(S["Either a tenant or an authority must be registered."], new[]
+            {
+                nameof(settings.Authority),
+                nameof(settings.Tenant),
+            }));
+        }
 
-            if (!(settings.Authority == null ^ string.IsNullOrEmpty(settings.Tenant)))
+        if (settings.Authority != null)
+        {
+            if (!settings.Authority.IsAbsoluteUri || !settings.Authority.IsWellFormedOriginalString())
             {
-                results.Add(new ValidationResult(S["Either a tenant or an authority must be registered."], new[]
+                results.Add(new ValidationResult(S["The specified authority is not valid."], new[]
                 {
-                    nameof(settings.Authority),
-                    nameof(settings.Tenant),
+                    nameof(settings.Authority)
                 }));
             }
 
-            if (settings.Authority != null)
+            if (!string.IsNullOrEmpty(settings.Authority.Query) || !string.IsNullOrEmpty(settings.Authority.Fragment))
             {
-                if (!settings.Authority.IsAbsoluteUri || !settings.Authority.IsWellFormedOriginalString())
-                {
-                    results.Add(new ValidationResult(S["The specified authority is not valid."], new[]
-                    {
-                        nameof(settings.Authority)
-                    }));
-                }
-
-                if (!string.IsNullOrEmpty(settings.Authority.Query) || !string.IsNullOrEmpty(settings.Authority.Fragment))
+                results.Add(new ValidationResult(S["The authority cannot contain a query string or a fragment."], new[]
                 {
-                    results.Add(new ValidationResult(S["The authority cannot contain a query string or a fragment."], new[]
-                    {
-                        nameof(settings.Authority),
-                    }));
-                }
-
+                    nameof(settings.Authority),
+                }));
             }
 
-            if (settings.MetadataAddress != null)
-            {
-                if (!settings.MetadataAddress.IsAbsoluteUri || !settings.MetadataAddress.IsWellFormedOriginalString())
-                {
-                    results.Add(new ValidationResult(S["The specified metadata address is not valid."], new[]
-                    {
-                        nameof(settings.MetadataAddress),
-                    }));
-                }
-
-                if (!string.IsNullOrEmpty(settings.MetadataAddress.Query) || !string.IsNullOrEmpty(settings.MetadataAddress.Fragment))
-                {
-                    results.Add(new ValidationResult(S["The metadata address cannot contain a query string or a fragment."], new[]
-                    {
-                        nameof(settings.MetadataAddress),
-                    }));
-                }
-
-                if (!string.IsNullOrEmpty(settings.Tenant))
-                {
-                    results.Add(new ValidationResult(S["No metatada address can be set when using another tenant."], new[]
-                    {
-                        nameof(settings.MetadataAddress),
-                    }));
-                }
-            }
+        }
 
-            if (!string.IsNullOrEmpty(settings.Tenant) && !string.IsNullOrEmpty(settings.Audience))
+        if (settings.MetadataAddress != null)
+        {
+            if (!settings.MetadataAddress.IsAbsoluteUri || !settings.MetadataAddress.IsWellFormedOriginalString())
             {
-                results.Add(new ValidationResult(S["No audience can be set when using another tenant."], new[]
+                results.Add(new ValidationResult(S["The specified metadata address is not valid."], new[]
                 {
-                    nameof(settings.Audience),
+                    nameof(settings.MetadataAddress),
                 }));
             }
 
-            if (settings.Authority != null && string.IsNullOrEmpty(settings.Audience))
+            if (!string.IsNullOrEmpty(settings.MetadataAddress.Query) || !string.IsNullOrEmpty(settings.MetadataAddress.Fragment))
             {
-                results.Add(new ValidationResult(S["An audience must be set when configuring the authority."], new[]
+                results.Add(new ValidationResult(S["The metadata address cannot contain a query string or a fragment."], new[]
                 {
-                    nameof(settings.Audience),
+                    nameof(settings.MetadataAddress),
                 }));
             }
 
-            if (settings.Authority == null && settings.DisableTokenTypeValidation)
+            if (!string.IsNullOrEmpty(settings.Tenant))
             {
-                results.Add(new ValidationResult(S["Token type validation can only be disabled for remote servers."], new[]
+                results.Add(new ValidationResult(S["No metatada address can be set when using another tenant."], new[]
                 {
-                    nameof(settings.DisableTokenTypeValidation),
+                    nameof(settings.MetadataAddress),
                 }));
             }
+        }
 
-            if (!string.IsNullOrEmpty(settings.Audience) &&
-                settings.Audience.StartsWith(OpenIdConstants.Prefixes.Tenant, StringComparison.OrdinalIgnoreCase))
+        if (!string.IsNullOrEmpty(settings.Tenant) && !string.IsNullOrEmpty(settings.Audience))
+        {
+            results.Add(new ValidationResult(S["No audience can be set when using another tenant."], new[]
             {
-                results.Add(new ValidationResult(S["The audience cannot start with the special 'oct:' prefix."], new[]
-                {
-                    nameof(settings.Audience),
-                }));
-            }
+                nameof(settings.Audience),
+            }));
+        }
 
-            // If a tenant was specified, ensure it is valid, that the OpenID server feature
-            // was enabled and that at least a scope linked with the current tenant exists.
-            if (!string.IsNullOrEmpty(settings.Tenant) &&
-                !string.Equals(settings.Tenant, _shellSettings.Name, StringComparison.Ordinal))
+        if (settings.Authority != null && string.IsNullOrEmpty(settings.Audience))
+        {
+            results.Add(new ValidationResult(S["An audience must be set when configuring the authority."], new[]
             {
-                if (!_shellHost.TryGetSettings(settings.Tenant, out var shellSettings))
-                {
-                    results.Add(new ValidationResult(S["The specified tenant is not valid."]));
-                }
-                else
-                {
-                    var shellScope = await _shellHost.GetScopeAsync(shellSettings);
+                nameof(settings.Audience),
+            }));
+        }
+
+        if (settings.Authority == null && settings.DisableTokenTypeValidation)
+        {
+            results.Add(new ValidationResult(S["Token type validation can only be disabled for remote servers."], new[]
+            {
+                nameof(settings.DisableTokenTypeValidation),
+            }));
+        }
+
+        if (!string.IsNullOrEmpty(settings.Audience) &&
+            settings.Audience.StartsWith(OpenIdConstants.Prefixes.Tenant, StringComparison.OrdinalIgnoreCase))
+        {
+            results.Add(new ValidationResult(S["The audience cannot start with the special 'oct:' prefix."], new[]
+            {
+                nameof(settings.Audience),
+            }));
+        }
 
-                    await shellScope.UsingAsync(async scope =>
+        // If a tenant was specified, ensure it is valid, that the OpenID server feature
+        // was enabled and that at least a scope linked with the current tenant exists.
+        if (!string.IsNullOrEmpty(settings.Tenant) &&
+            !string.Equals(settings.Tenant, _shellSettings.Name, StringComparison.Ordinal))
+        {
+            if (!_shellHost.TryGetSettings(settings.Tenant, out var shellSettings))
+            {
+                results.Add(new ValidationResult(S["The specified tenant is not valid."]));
+            }
+            else
+            {
+                var shellScope = await _shellHost.GetScopeAsync(shellSettings);
+
+                await shellScope.UsingAsync(async scope =>
+                {
+                    var options = scope.ServiceProvider.GetRequiredService<IOptionsMonitor<OpenIddictServerOptions>>().CurrentValue;
+                    if (options.UseReferenceAccessTokens)
                     {
-                        var options = scope.ServiceProvider.GetRequiredService<IOptionsMonitor<OpenIddictServerOptions>>().CurrentValue;
-                        if (options.UseReferenceAccessTokens)
+                        results.Add(new ValidationResult(S["Selecting a server tenant for which reference access tokens are enabled is currently not supported."], new[]
                         {
-                            results.Add(new ValidationResult(S["Selecting a server tenant for which reference access tokens are enabled is currently not supported."], new[]
-                            {
-                                nameof(settings.Tenant),
-                            }));
-                        }
+                            nameof(settings.Tenant),
+                        }));
+                    }
 
-                        var manager = scope.ServiceProvider.GetService<IOpenIdScopeManager>();
-                        if (manager == null)
+                    var manager = scope.ServiceProvider.GetService<IOpenIdScopeManager>();
+                    if (manager == null)
+                    {
+                        results.Add(new ValidationResult(S["The specified tenant is not valid."], new[]
+                        {
+                            nameof(settings.Tenant),
+                        }));
+                    }
+                    else
+                    {
+                        var resource = OpenIdConstants.Prefixes.Tenant + _shellSettings.Name;
+                        if (!await manager.FindByResourceAsync(resource).AnyAsync())
                         {
-                            results.Add(new ValidationResult(S["The specified tenant is not valid."], new[]
+                            results.Add(new ValidationResult(S["No appropriate scope was found."], new[]
                             {
                                 nameof(settings.Tenant),
                             }));
                         }
-                        else
-                        {
-                            var resource = OpenIdConstants.Prefixes.Tenant + _shellSettings.Name;
-                            if (!await manager.FindByResourceAsync(resource).AnyAsync())
-                            {
-                                results.Add(new ValidationResult(S["No appropriate scope was found."], new[]
-                                {
-                                    nameof(settings.Tenant),
-                                }));
-                            }
-                        }
-                    });
-                }
+                    }
+                });
             }
-
-            return results.ToImmutable();
         }
+
+        return results.ToImmutable();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Settings/OpenIdClientSettings.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Settings/OpenIdClientSettings.cs
index d6d02500e1d..9c399a14558 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Settings/OpenIdClientSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Settings/OpenIdClientSettings.cs
@@ -1,27 +1,26 @@
 using System;
 using System.Collections.Generic;
 
-namespace OrchardCore.OpenId.Settings
+namespace OrchardCore.OpenId.Settings;
+
+public class OpenIdClientSettings
 {
-    public class OpenIdClientSettings
-    {
-        public string DisplayName { get; set; }
-        public Uri Authority { get; set; }
-        public string ClientId { get; set; }
-        public string ClientSecret { get; set; }
-        public string CallbackPath { get; set; }
-        public string SignedOutRedirectUri { get; set; }
-        public string SignedOutCallbackPath { get; set; }
-        public IEnumerable<string> Scopes { get; set; }
-        public string ResponseType { get; set; }
-        public string ResponseMode { get; set; }
-        public bool StoreExternalTokens { get; set; }
-        public ParameterSetting[] Parameters { get; set; } = [];
-    }
+    public string DisplayName { get; set; }
+    public Uri Authority { get; set; }
+    public string ClientId { get; set; }
+    public string ClientSecret { get; set; }
+    public string CallbackPath { get; set; }
+    public string SignedOutRedirectUri { get; set; }
+    public string SignedOutCallbackPath { get; set; }
+    public IEnumerable<string> Scopes { get; set; }
+    public string ResponseType { get; set; }
+    public string ResponseMode { get; set; }
+    public bool StoreExternalTokens { get; set; }
+    public ParameterSetting[] Parameters { get; set; } = [];
+}
 
-    public class ParameterSetting
-    {
-        public string Name { get; set; }
-        public string Value { get; set; }
-    }
+public class ParameterSetting
+{
+    public string Name { get; set; }
+    public string Value { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Settings/OpenIdServerSettings.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Settings/OpenIdServerSettings.cs
index 10d63b6a7ed..f87bf2a3c3c 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Settings/OpenIdServerSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Settings/OpenIdServerSettings.cs
@@ -2,50 +2,49 @@
 using System.Security.Cryptography.X509Certificates;
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.OpenId.Settings
+namespace OrchardCore.OpenId.Settings;
+
+public class OpenIdServerSettings
 {
-    public class OpenIdServerSettings
-    {
-        public TokenFormat AccessTokenFormat { get; set; }
+    public TokenFormat AccessTokenFormat { get; set; }
 
-        public Uri Authority { get; set; }
+    public Uri Authority { get; set; }
 
-        public bool DisableAccessTokenEncryption { get; set; }
-        public StoreLocation? EncryptionCertificateStoreLocation { get; set; }
-        public StoreName? EncryptionCertificateStoreName { get; set; }
-        public string EncryptionCertificateThumbprint { get; set; }
-        public StoreLocation? SigningCertificateStoreLocation { get; set; }
-        public StoreName? SigningCertificateStoreName { get; set; }
-        public string SigningCertificateThumbprint { get; set; }
-        public PathString AuthorizationEndpointPath { get; set; }
+    public bool DisableAccessTokenEncryption { get; set; }
+    public StoreLocation? EncryptionCertificateStoreLocation { get; set; }
+    public StoreName? EncryptionCertificateStoreName { get; set; }
+    public string EncryptionCertificateThumbprint { get; set; }
+    public StoreLocation? SigningCertificateStoreLocation { get; set; }
+    public StoreName? SigningCertificateStoreName { get; set; }
+    public string SigningCertificateThumbprint { get; set; }
+    public PathString AuthorizationEndpointPath { get; set; }
 
-        public PathString LogoutEndpointPath { get; set; }
+    public PathString LogoutEndpointPath { get; set; }
 
-        public PathString TokenEndpointPath { get; set; }
+    public PathString TokenEndpointPath { get; set; }
 
-        public PathString UserinfoEndpointPath { get; set; }
+    public PathString UserinfoEndpointPath { get; set; }
 
-        public PathString IntrospectionEndpointPath { get; set; }
+    public PathString IntrospectionEndpointPath { get; set; }
 
-        public PathString RevocationEndpointPath { get; set; }
+    public PathString RevocationEndpointPath { get; set; }
 
-        public bool AllowPasswordFlow { get; set; }
-        public bool AllowClientCredentialsFlow { get; set; }
-        public bool AllowAuthorizationCodeFlow { get; set; }
-        public bool AllowRefreshTokenFlow { get; set; }
-        public bool AllowHybridFlow { get; set; }
-        public bool AllowImplicitFlow { get; set; }
+    public bool AllowPasswordFlow { get; set; }
+    public bool AllowClientCredentialsFlow { get; set; }
+    public bool AllowAuthorizationCodeFlow { get; set; }
+    public bool AllowRefreshTokenFlow { get; set; }
+    public bool AllowHybridFlow { get; set; }
+    public bool AllowImplicitFlow { get; set; }
 
-        public bool DisableRollingRefreshTokens { get; set; }
+    public bool DisableRollingRefreshTokens { get; set; }
 
-        public bool UseReferenceAccessTokens { get; set; }
+    public bool UseReferenceAccessTokens { get; set; }
 
-        public bool RequireProofKeyForCodeExchange { get; set; }
+    public bool RequireProofKeyForCodeExchange { get; set; }
 
-        public enum TokenFormat
-        {
-            DataProtection = 0,
-            JsonWebToken = 1
-        }
+    public enum TokenFormat
+    {
+        DataProtection = 0,
+        JsonWebToken = 1
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Settings/OpenIdValidationSettings.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Settings/OpenIdValidationSettings.cs
index 873bd399c00..8b77f571a99 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Settings/OpenIdValidationSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Settings/OpenIdValidationSettings.cs
@@ -1,13 +1,12 @@
 using System;
 
-namespace OrchardCore.OpenId.Settings
+namespace OrchardCore.OpenId.Settings;
+
+public class OpenIdValidationSettings
 {
-    public class OpenIdValidationSettings
-    {
-        public string Audience { get; set; }
-        public Uri Authority { get; set; }
-        public bool DisableTokenTypeValidation { get; set; }
-        public string Tenant { get; set; }
-        public Uri MetadataAddress { get; set; }
-    }
+    public string Audience { get; set; }
+    public Uri Authority { get; set; }
+    public bool DisableTokenTypeValidation { get; set; }
+    public string Tenant { get; set; }
+    public Uri MetadataAddress { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Startup.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Startup.cs
index 392fc2808bb..7fd227b4e45 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Startup.cs
@@ -35,245 +35,244 @@
 using OrchardCore.Security.Permissions;
 using OrchardCore.Settings;
 
-namespace OrchardCore.OpenId
+namespace OrchardCore.OpenId;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            // Register the OpenIddict core services and the Orchard migrations, managers and default YesSql stores.
-            // The default YesSql stores can be replaced by another database by referencing the corresponding
-            // OpenIddict package (e.g OpenIddict.EntityFrameworkCore) and registering it in the options.
-            services.AddOpenIddict()
-                .AddCore(options =>
-                {
-                    options.AddOrchardMigrations()
-                           .UseOrchardManagers()
-                           .UseYesSql();
-                });
-
-            // Note: the following services are registered using TryAddEnumerable to prevent duplicate registrations.
-            services.TryAddEnumerable(new[]
+        // Register the OpenIddict core services and the Orchard migrations, managers and default YesSql stores.
+        // The default YesSql stores can be replaced by another database by referencing the corresponding
+        // OpenIddict package (e.g OpenIddict.EntityFrameworkCore) and registering it in the options.
+        services.AddOpenIddict()
+            .AddCore(options =>
             {
-                ServiceDescriptor.Scoped<IPermissionProvider, Permissions>(),
-                ServiceDescriptor.Scoped<INavigationProvider, AdminMenu>(),
+                options.AddOrchardMigrations()
+                       .UseOrchardManagers()
+                       .UseYesSql();
             });
-        }
+
+        // Note: the following services are registered using TryAddEnumerable to prevent duplicate registrations.
+        services.TryAddEnumerable(new[]
+        {
+            ServiceDescriptor.Scoped<IPermissionProvider, Permissions>(),
+            ServiceDescriptor.Scoped<INavigationProvider, AdminMenu>(),
+        });
     }
+}
 
-    [Feature(OpenIdConstants.Features.Client)]
-    public sealed class ClientStartup : StartupBase
+[Feature(OpenIdConstants.Features.Client)]
+public sealed class ClientStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.TryAddSingleton<IOpenIdClientService, OpenIdClientService>();
+        services.TryAddSingleton<IOpenIdClientService, OpenIdClientService>();
 
-            // Note: the following services are registered using TryAddEnumerable to prevent duplicate registrations.
-            services.TryAddEnumerable(new[]
-            {
-                ServiceDescriptor.Scoped<IDisplayDriver<ISite>, OpenIdClientSettingsDisplayDriver>(),
-                ServiceDescriptor.Scoped<IRecipeStepHandler, OpenIdClientSettingsStep>()
-            });
+        // Note: the following services are registered using TryAddEnumerable to prevent duplicate registrations.
+        services.TryAddEnumerable(new[]
+        {
+            ServiceDescriptor.Scoped<IDisplayDriver<ISite>, OpenIdClientSettingsDisplayDriver>(),
+            ServiceDescriptor.Scoped<IRecipeStepHandler, OpenIdClientSettingsStep>()
+        });
 
-            // Register the options initializers required by the OpenID Connect client handler.
-            services.TryAddEnumerable(new[]
-            {
-                // Orchard-specific initializers:
-                ServiceDescriptor.Singleton<IConfigureOptions<AuthenticationOptions>, OpenIdClientConfiguration>(),
-                ServiceDescriptor.Singleton<IConfigureOptions<OpenIdConnectOptions>, OpenIdClientConfiguration>(),
+        // Register the options initializers required by the OpenID Connect client handler.
+        services.TryAddEnumerable(new[]
+        {
+            // Orchard-specific initializers:
+            ServiceDescriptor.Singleton<IConfigureOptions<AuthenticationOptions>, OpenIdClientConfiguration>(),
+            ServiceDescriptor.Singleton<IConfigureOptions<OpenIdConnectOptions>, OpenIdClientConfiguration>(),
 
-                // Built-in initializers:
-                ServiceDescriptor.Singleton<IPostConfigureOptions<OpenIdConnectOptions>, OpenIdConnectPostConfigureOptions>()
-            });
-        }
+            // Built-in initializers:
+            ServiceDescriptor.Singleton<IPostConfigureOptions<OpenIdConnectOptions>, OpenIdConnectPostConfigureOptions>()
+        });
     }
+}
 
-    [Feature(OpenIdConstants.Features.Server)]
-    public sealed class ServerStartup : StartupBase
+[Feature(OpenIdConstants.Features.Server)]
+public sealed class ServerStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.AddOpenIddict()
+            .AddServer(options =>
+            {
+                options.UseAspNetCore();
+                options.UseDataProtection();
+            });
+
+        services.TryAddSingleton<IOpenIdServerService, OpenIdServerService>();
+
+        // Note: the following services are registered using TryAddEnumerable to prevent duplicate registrations.
+        services.TryAddEnumerable(new[]
         {
-            services.AddOpenIddict()
-                .AddServer(options =>
-                {
-                    options.UseAspNetCore();
-                    options.UseDataProtection();
-                });
+            ServiceDescriptor.Scoped<IRoleRemovedEventHandler, OpenIdApplicationRoleRemovedEventHandler>(),
+            ServiceDescriptor.Scoped<IDisplayDriver<OpenIdServerSettings>, OpenIdServerSettingsDisplayDriver>(),
+            ServiceDescriptor.Scoped<IRecipeStepHandler, OpenIdServerSettingsStep>(),
+            ServiceDescriptor.Scoped<IRecipeStepHandler, OpenIdApplicationStep>(),
+            ServiceDescriptor.Scoped<IRecipeStepHandler, OpenIdScopeStep>(),
 
-            services.TryAddSingleton<IOpenIdServerService, OpenIdServerService>();
+            ServiceDescriptor.Singleton<IBackgroundTask, OpenIdBackgroundTask>()
+        });
 
-            // Note: the following services are registered using TryAddEnumerable to prevent duplicate registrations.
-            services.TryAddEnumerable(new[]
-            {
-                ServiceDescriptor.Scoped<IRoleRemovedEventHandler, OpenIdApplicationRoleRemovedEventHandler>(),
-                ServiceDescriptor.Scoped<IDisplayDriver<OpenIdServerSettings>, OpenIdServerSettingsDisplayDriver>(),
-                ServiceDescriptor.Scoped<IRecipeStepHandler, OpenIdServerSettingsStep>(),
-                ServiceDescriptor.Scoped<IRecipeStepHandler, OpenIdApplicationStep>(),
-                ServiceDescriptor.Scoped<IRecipeStepHandler, OpenIdScopeStep>(),
+        // Note: the OpenIddict ASP.NET host adds an authentication options initializer that takes care of
+        // registering the server ASP.NET Core handler. Yet, it MUST NOT be registered at this stage
+        // as it is lazily registered by OpenIdServerConfiguration only after checking the OpenID server
+        // settings are valid and can be safely used in this tenant without causing runtime exceptions.
+        // To prevent that, the initializer is manually removed from the services collection of the tenant.
+        services.RemoveAll<IConfigureOptions<AuthenticationOptions>, OpenIddictServerAspNetCoreConfiguration>();
 
-                ServiceDescriptor.Singleton<IBackgroundTask, OpenIdBackgroundTask>()
-            });
+        services.TryAddEnumerable(new[]
+        {
+            ServiceDescriptor.Singleton<IConfigureOptions<AuthenticationOptions>, OpenIdServerConfiguration>(),
+            ServiceDescriptor.Singleton<IConfigureOptions<OpenIddictServerOptions>, OpenIdServerConfiguration>(),
+            ServiceDescriptor.Singleton<IConfigureOptions<OpenIddictServerAspNetCoreOptions>, OpenIdServerConfiguration>(),
+            ServiceDescriptor.Singleton<IConfigureOptions<OpenIddictServerDataProtectionOptions>, OpenIdServerConfiguration>()
+        });
+    }
 
-            // Note: the OpenIddict ASP.NET host adds an authentication options initializer that takes care of
-            // registering the server ASP.NET Core handler. Yet, it MUST NOT be registered at this stage
-            // as it is lazily registered by OpenIdServerConfiguration only after checking the OpenID server
-            // settings are valid and can be safely used in this tenant without causing runtime exceptions.
-            // To prevent that, the initializer is manually removed from the services collection of the tenant.
-            services.RemoveAll<IConfigureOptions<AuthenticationOptions>, OpenIddictServerAspNetCoreConfiguration>();
+    public override async ValueTask ConfigureAsync(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        var settings = await GetServerSettingsAsync();
+        if (settings == null)
+        {
+            return;
+        }
 
-            services.TryAddEnumerable(new[]
-            {
-                ServiceDescriptor.Singleton<IConfigureOptions<AuthenticationOptions>, OpenIdServerConfiguration>(),
-                ServiceDescriptor.Singleton<IConfigureOptions<OpenIddictServerOptions>, OpenIdServerConfiguration>(),
-                ServiceDescriptor.Singleton<IConfigureOptions<OpenIddictServerAspNetCoreOptions>, OpenIdServerConfiguration>(),
-                ServiceDescriptor.Singleton<IConfigureOptions<OpenIddictServerDataProtectionOptions>, OpenIdServerConfiguration>()
-            });
+        if (settings.AuthorizationEndpointPath.HasValue)
+        {
+            routes.MapAreaControllerRoute(
+                name: "Access.Authorize",
+                areaName: typeof(Startup).Namespace,
+                pattern: settings.AuthorizationEndpointPath.Value,
+                defaults: new { controller = "Access", action = "Authorize" }
+            );
         }
 
-        public override async ValueTask ConfigureAsync(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+        if (settings.LogoutEndpointPath.HasValue)
         {
-            var settings = await GetServerSettingsAsync();
-            if (settings == null)
-            {
-                return;
-            }
+            routes.MapAreaControllerRoute(
+                name: "Access.Logout",
+                areaName: typeof(Startup).Namespace,
+                pattern: settings.LogoutEndpointPath.Value,
+                defaults: new { controller = "Access", action = "Logout" }
+            );
+        }
 
-            if (settings.AuthorizationEndpointPath.HasValue)
-            {
-                routes.MapAreaControllerRoute(
-                    name: "Access.Authorize",
-                    areaName: typeof(Startup).Namespace,
-                    pattern: settings.AuthorizationEndpointPath.Value,
-                    defaults: new { controller = "Access", action = "Authorize" }
-                );
-            }
+        if (settings.TokenEndpointPath.HasValue)
+        {
+            routes.MapAreaControllerRoute(
+                name: "Access.Token",
+                areaName: typeof(Startup).Namespace,
+                pattern: settings.TokenEndpointPath.Value,
+                defaults: new { controller = "Access", action = "Token" }
+            );
+        }
 
-            if (settings.LogoutEndpointPath.HasValue)
-            {
-                routes.MapAreaControllerRoute(
-                    name: "Access.Logout",
-                    areaName: typeof(Startup).Namespace,
-                    pattern: settings.LogoutEndpointPath.Value,
-                    defaults: new { controller = "Access", action = "Logout" }
-                );
-            }
+        if (settings.UserinfoEndpointPath.HasValue)
+        {
+            routes.MapAreaControllerRoute(
+                name: "UserInfo.Me",
+                areaName: typeof(Startup).Namespace,
+                pattern: settings.UserinfoEndpointPath.Value,
+                defaults: new { controller = "UserInfo", action = "Me" }
+            );
+        }
 
-            if (settings.TokenEndpointPath.HasValue)
-            {
-                routes.MapAreaControllerRoute(
-                    name: "Access.Token",
-                    areaName: typeof(Startup).Namespace,
-                    pattern: settings.TokenEndpointPath.Value,
-                    defaults: new { controller = "Access", action = "Token" }
-                );
-            }
+        async Task<OpenIdServerSettings> GetServerSettingsAsync()
+        {
+            // Note: the OpenID server service is registered as a singleton service and thus can be
+            // safely used with the non-scoped/root service provider available at this stage.
+            var service = serviceProvider.GetRequiredService<IOpenIdServerService>();
 
-            if (settings.UserinfoEndpointPath.HasValue)
+            var configuration = await service.GetSettingsAsync();
+            if ((await service.ValidateSettingsAsync(configuration)).Any(result => result != ValidationResult.Success))
             {
-                routes.MapAreaControllerRoute(
-                    name: "UserInfo.Me",
-                    areaName: typeof(Startup).Namespace,
-                    pattern: settings.UserinfoEndpointPath.Value,
-                    defaults: new { controller = "UserInfo", action = "Me" }
-                );
+                return null;
             }
 
-            async Task<OpenIdServerSettings> GetServerSettingsAsync()
-            {
-                // Note: the OpenID server service is registered as a singleton service and thus can be
-                // safely used with the non-scoped/root service provider available at this stage.
-                var service = serviceProvider.GetRequiredService<IOpenIdServerService>();
-
-                var configuration = await service.GetSettingsAsync();
-                if ((await service.ValidateSettingsAsync(configuration)).Any(result => result != ValidationResult.Success))
-                {
-                    return null;
-                }
-
-                return configuration;
-            }
+            return configuration;
         }
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment", OpenIdConstants.Features.Server)]
-    public sealed class ServerDeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment", OpenIdConstants.Features.Server)]
+public sealed class ServerDeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<OpenIdServerDeploymentSource, OpenIdServerDeploymentStep, OpenIdServerDeploymentStepDriver>();
-        }
+        services.AddDeployment<OpenIdServerDeploymentSource, OpenIdServerDeploymentStep, OpenIdServerDeploymentStepDriver>();
     }
+}
 
-    [Feature(OpenIdConstants.Features.Validation)]
-    public sealed class ValidationStartup : StartupBase
+[Feature(OpenIdConstants.Features.Validation)]
+public sealed class ValidationStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddOpenIddict()
-                .AddValidation(options =>
-                {
-                    options.UseAspNetCore();
-                    options.UseDataProtection();
-                    options.UseSystemNetHttp();
-                });
-
-            services.TryAddSingleton<IOpenIdValidationService, OpenIdValidationService>();
-
-            // Note: the following services are registered using TryAddEnumerable to prevent duplicate registrations.
-            services.TryAddEnumerable(new[]
+        services.AddOpenIddict()
+            .AddValidation(options =>
             {
-                ServiceDescriptor.Scoped<IDisplayDriver<OpenIdValidationSettings>, OpenIdValidationSettingsDisplayDriver>(),
-                ServiceDescriptor.Scoped<IRecipeStepHandler, OpenIdValidationSettingsStep>()
+                options.UseAspNetCore();
+                options.UseDataProtection();
+                options.UseSystemNetHttp();
             });
 
-            // Note: the OpenIddict ASP.NET host adds an authentication options initializer that takes care of
-            // registering the validation handler. Yet, it MUST NOT be registered at this stage as it is
-            // lazily registered by OpenIdValidationConfiguration only after checking the OpenID validation
-            // settings are valid and can be safely used in this tenant without causing runtime exceptions.
-            // To prevent that, the initializer is manually removed from the services collection of the tenant.
-            services.RemoveAll<IConfigureOptions<AuthenticationOptions>, OpenIddictValidationAspNetCoreConfiguration>();
+        services.TryAddSingleton<IOpenIdValidationService, OpenIdValidationService>();
 
-            services.TryAddEnumerable(new[]
-            {
-                ServiceDescriptor.Singleton<IConfigureOptions<AuthenticationOptions>, OpenIdValidationConfiguration>(),
-                ServiceDescriptor.Singleton<IConfigureOptions<ApiAuthorizationOptions>, OpenIdValidationConfiguration>(),
-                ServiceDescriptor.Singleton<IConfigureOptions<OpenIddictValidationOptions>, OpenIdValidationConfiguration>(),
-                ServiceDescriptor.Singleton<IConfigureOptions<OpenIddictValidationDataProtectionOptions>, OpenIdValidationConfiguration>()
-            });
-        }
+        // Note: the following services are registered using TryAddEnumerable to prevent duplicate registrations.
+        services.TryAddEnumerable(new[]
+        {
+            ServiceDescriptor.Scoped<IDisplayDriver<OpenIdValidationSettings>, OpenIdValidationSettingsDisplayDriver>(),
+            ServiceDescriptor.Scoped<IRecipeStepHandler, OpenIdValidationSettingsStep>()
+        });
+
+        // Note: the OpenIddict ASP.NET host adds an authentication options initializer that takes care of
+        // registering the validation handler. Yet, it MUST NOT be registered at this stage as it is
+        // lazily registered by OpenIdValidationConfiguration only after checking the OpenID validation
+        // settings are valid and can be safely used in this tenant without causing runtime exceptions.
+        // To prevent that, the initializer is manually removed from the services collection of the tenant.
+        services.RemoveAll<IConfigureOptions<AuthenticationOptions>, OpenIddictValidationAspNetCoreConfiguration>();
+
+        services.TryAddEnumerable(new[]
+        {
+            ServiceDescriptor.Singleton<IConfigureOptions<AuthenticationOptions>, OpenIdValidationConfiguration>(),
+            ServiceDescriptor.Singleton<IConfigureOptions<ApiAuthorizationOptions>, OpenIdValidationConfiguration>(),
+            ServiceDescriptor.Singleton<IConfigureOptions<OpenIddictValidationOptions>, OpenIdValidationConfiguration>(),
+            ServiceDescriptor.Singleton<IConfigureOptions<OpenIddictValidationDataProtectionOptions>, OpenIdValidationConfiguration>()
+        });
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment", OpenIdConstants.Features.Validation)]
-    public sealed class ValidationDeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment", OpenIdConstants.Features.Validation)]
+public sealed class ValidationDeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<OpenIdValidationDeploymentSource, OpenIdValidationDeploymentStep, OpenIdValidationDeploymentStepDriver>();
-        }
+        services.AddDeployment<OpenIdValidationDeploymentSource, OpenIdValidationDeploymentStep, OpenIdValidationDeploymentStepDriver>();
     }
+}
 
-    internal static class OpenIdServiceCollectionExtensions
+internal static class OpenIdServiceCollectionExtensions
+{
+    public static IServiceCollection RemoveAll(this IServiceCollection services, Type serviceType, Type implementationType)
     {
-        public static IServiceCollection RemoveAll(this IServiceCollection services, Type serviceType, Type implementationType)
-        {
-            Debug.Assert(services != null, "The services collection shouldn't be null.");
-            Debug.Assert(serviceType != null, "The service type shouldn't be null.");
-            Debug.Assert(implementationType != null, "The implementation type shouldn't be null.");
+        Debug.Assert(services != null, "The services collection shouldn't be null.");
+        Debug.Assert(serviceType != null, "The service type shouldn't be null.");
+        Debug.Assert(implementationType != null, "The implementation type shouldn't be null.");
 
-            for (var index = services.Count - 1; index >= 0; index--)
+        for (var index = services.Count - 1; index >= 0; index--)
+        {
+            var descriptor = services[index];
+            if (descriptor.ServiceType == serviceType && descriptor.GetImplementationType() == implementationType)
             {
-                var descriptor = services[index];
-                if (descriptor.ServiceType == serviceType && descriptor.GetImplementationType() == implementationType)
-                {
-                    services.RemoveAt(index);
-                }
+                services.RemoveAt(index);
             }
-
-            return services;
         }
 
-        public static IServiceCollection RemoveAll<TService, TImplementation>(this IServiceCollection services)
-            where TImplementation : TService
-            => services.RemoveAll(typeof(TService), typeof(TImplementation));
+        return services;
     }
+
+    public static IServiceCollection RemoveAll<TService, TImplementation>(this IServiceCollection services)
+        where TImplementation : TService
+        => services.RemoveAll(typeof(TService), typeof(TImplementation));
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Tasks/OpenIdBackgroundTask.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Tasks/OpenIdBackgroundTask.cs
index 826c530a217..52f8acbc829 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Tasks/OpenIdBackgroundTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Tasks/OpenIdBackgroundTask.cs
@@ -8,85 +8,84 @@
 using OrchardCore.OpenId.Abstractions.Managers;
 using OrchardCore.OpenId.Services;
 
-namespace OrchardCore.OpenId.Tasks
+namespace OrchardCore.OpenId.Tasks;
+
+[BackgroundTask(
+    Title = "OpenID Cleaner",
+    Schedule = "*/30 * * * *",
+    Description = "Performs various cleanup operations for OpenID features.")]
+public sealed class OpenIdBackgroundTask : IBackgroundTask
 {
-    [BackgroundTask(
-        Title = "OpenID Cleaner",
-        Schedule = "*/30 * * * *",
-        Description = "Performs various cleanup operations for OpenID features.")]
-    public sealed class OpenIdBackgroundTask : IBackgroundTask
+    private readonly ILogger _logger;
+    private readonly IOpenIdServerService _serverService;
+
+    public OpenIdBackgroundTask(
+        ILogger<OpenIdBackgroundTask> logger,
+        IOpenIdServerService serverService)
     {
-        private readonly ILogger _logger;
-        private readonly IOpenIdServerService _serverService;
+        _logger = logger;
+        _serverService = serverService;
+    }
 
-        public OpenIdBackgroundTask(
-            ILogger<OpenIdBackgroundTask> logger,
-            IOpenIdServerService serverService)
+    public async Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken)
+    {
+        try
         {
-            _logger = logger;
-            _serverService = serverService;
+            await _serverService.PruneManagedCertificatesAsync();
         }
-
-        public async Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken)
+        catch (OperationCanceledException exception) when (exception.CancellationToken == cancellationToken)
+        {
+            _logger.LogDebug("The X.509 certificates pruning task was aborted.");
+        }
+        catch (Exception exception)
         {
-            try
-            {
-                await _serverService.PruneManagedCertificatesAsync();
-            }
-            catch (OperationCanceledException exception) when (exception.CancellationToken == cancellationToken)
-            {
-                _logger.LogDebug("The X.509 certificates pruning task was aborted.");
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(exception, "An error occurred while pruning X.509 certificates from the shell storage.");
-            }
+            _logger.LogError(exception, "An error occurred while pruning X.509 certificates from the shell storage.");
+        }
 
-            // Note: this background task is responsible of automatically removing orphaned tokens/authorizations
-            // (i.e tokens that are no longer valid and ad-hoc authorizations that have no valid tokens associated).
-            // Import: since tokens associated to ad-hoc authorizations are not removed as part of the same operation,
-            // the tokens MUST be deleted before removing the ad-hoc authorizations that no longer have any token.
+        // Note: this background task is responsible of automatically removing orphaned tokens/authorizations
+        // (i.e tokens that are no longer valid and ad-hoc authorizations that have no valid tokens associated).
+        // Import: since tokens associated to ad-hoc authorizations are not removed as part of the same operation,
+        // the tokens MUST be deleted before removing the ad-hoc authorizations that no longer have any token.
 
-            // Note: the authorization/token managers MUST be resolved from the scoped provider
-            // as they depend on scoped stores that should be disposed as soon as possible.
+        // Note: the authorization/token managers MUST be resolved from the scoped provider
+        // as they depend on scoped stores that should be disposed as soon as possible.
 
-            // Note: this task uses a hardcoded minimum token/authorization lifespan of 14 days,
-            // which matches the default value used by the OpenIddict Quartz.NET integration.
-            var threshold = DateTimeOffset.UtcNow - TimeSpan.FromDays(14);
+        // Note: this task uses a hardcoded minimum token/authorization lifespan of 14 days,
+        // which matches the default value used by the OpenIddict Quartz.NET integration.
+        var threshold = DateTimeOffset.UtcNow - TimeSpan.FromDays(14);
 
-            try
-            {
-                await serviceProvider.GetRequiredService<IOpenIdTokenManager>().PruneAsync(threshold, cancellationToken);
-            }
-            catch (OpenIddictExceptions.ConcurrencyException exception)
-            {
-                _logger.LogDebug(exception, "A concurrency error occurred while pruning tokens from the database.");
-            }
-            catch (OperationCanceledException exception) when (exception.CancellationToken == cancellationToken)
-            {
-                _logger.LogDebug("The tokens pruning task was aborted.");
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(exception, "An error occurred while pruning tokens from the database.");
-            }
+        try
+        {
+            await serviceProvider.GetRequiredService<IOpenIdTokenManager>().PruneAsync(threshold, cancellationToken);
+        }
+        catch (OpenIddictExceptions.ConcurrencyException exception)
+        {
+            _logger.LogDebug(exception, "A concurrency error occurred while pruning tokens from the database.");
+        }
+        catch (OperationCanceledException exception) when (exception.CancellationToken == cancellationToken)
+        {
+            _logger.LogDebug("The tokens pruning task was aborted.");
+        }
+        catch (Exception exception)
+        {
+            _logger.LogError(exception, "An error occurred while pruning tokens from the database.");
+        }
 
-            try
-            {
-                await serviceProvider.GetRequiredService<IOpenIdAuthorizationManager>().PruneAsync(threshold, cancellationToken);
-            }
-            catch (OpenIddictExceptions.ConcurrencyException exception)
-            {
-                _logger.LogDebug(exception, "A concurrency error occurred while pruning authorizations from the database.");
-            }
-            catch (OperationCanceledException exception) when (exception.CancellationToken == cancellationToken)
-            {
-                _logger.LogDebug("The authorizations pruning task was aborted.");
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(exception, "An error occurred while pruning authorizations from the database.");
-            }
+        try
+        {
+            await serviceProvider.GetRequiredService<IOpenIdAuthorizationManager>().PruneAsync(threshold, cancellationToken);
+        }
+        catch (OpenIddictExceptions.ConcurrencyException exception)
+        {
+            _logger.LogDebug(exception, "A concurrency error occurred while pruning authorizations from the database.");
+        }
+        catch (OperationCanceledException exception) when (exception.CancellationToken == cancellationToken)
+        {
+            _logger.LogDebug("The authorizations pruning task was aborted.");
+        }
+        catch (Exception exception)
+        {
+            _logger.LogError(exception, "An error occurred while pruning authorizations from the database.");
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/AuthorizeViewModel.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/AuthorizeViewModel.cs
index 52d56dee49d..94daf0fe2cd 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/AuthorizeViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/AuthorizeViewModel.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.OpenId.ViewModels
+namespace OrchardCore.OpenId.ViewModels;
+
+public class AuthorizeViewModel
 {
-    public class AuthorizeViewModel
-    {
-        public string ApplicationName { get; set; }
+    public string ApplicationName { get; set; }
 
-        public string RequestId { get; set; }
+    public string RequestId { get; set; }
 
-        public string Scope { get; set; }
-    }
+    public string Scope { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/CreateOpenIdApplicationViewModel.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/CreateOpenIdApplicationViewModel.cs
index c8b9d6218eb..7fbb3959261 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/CreateOpenIdApplicationViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/CreateOpenIdApplicationViewModel.cs
@@ -1,61 +1,60 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.OpenId.ViewModels
+namespace OrchardCore.OpenId.ViewModels;
+
+public class CreateOpenIdApplicationViewModel
 {
-    public class CreateOpenIdApplicationViewModel
-    {
-        [Required]
-        public string ClientId { get; set; }
+    [Required]
+    public string ClientId { get; set; }
 
-        [Required]
-        public string DisplayName { get; set; }
+    [Required]
+    public string DisplayName { get; set; }
 
-        [Url(ErrorMessage = "{0} is not well-formed")]
-        public string RedirectUris { get; set; }
+    [Url(ErrorMessage = "{0} is not well-formed")]
+    public string RedirectUris { get; set; }
 
-        [Url(ErrorMessage = "{0} is not well-formed")]
-        public string PostLogoutRedirectUris { get; set; }
+    [Url(ErrorMessage = "{0} is not well-formed")]
+    public string PostLogoutRedirectUris { get; set; }
 
-        public string Type { get; set; }
+    public string Type { get; set; }
 
-        public string ConsentType { get; set; }
+    public string ConsentType { get; set; }
 
-        public string ClientSecret { get; set; }
+    public string ClientSecret { get; set; }
 
-        public List<RoleEntry> RoleEntries { get; } = [];
+    public List<RoleEntry> RoleEntries { get; } = [];
 
-        public List<ScopeEntry> ScopeEntries { get; } = [];
+    public List<ScopeEntry> ScopeEntries { get; } = [];
 
-        public bool AllowPasswordFlow { get; set; }
+    public bool AllowPasswordFlow { get; set; }
 
-        public bool AllowClientCredentialsFlow { get; set; }
+    public bool AllowClientCredentialsFlow { get; set; }
 
-        public bool AllowAuthorizationCodeFlow { get; set; }
+    public bool AllowAuthorizationCodeFlow { get; set; }
 
-        public bool AllowRefreshTokenFlow { get; set; }
+    public bool AllowRefreshTokenFlow { get; set; }
 
-        public bool AllowHybridFlow { get; set; }
+    public bool AllowHybridFlow { get; set; }
 
-        public bool AllowImplicitFlow { get; set; }
+    public bool AllowImplicitFlow { get; set; }
 
-        public bool AllowLogoutEndpoint { get; set; }
+    public bool AllowLogoutEndpoint { get; set; }
 
-        public bool AllowIntrospectionEndpoint { get; set; }
+    public bool AllowIntrospectionEndpoint { get; set; }
 
-        public bool AllowRevocationEndpoint { get; set; }
+    public bool AllowRevocationEndpoint { get; set; }
 
-        public bool RequireProofKeyForCodeExchange { get; set; }
+    public bool RequireProofKeyForCodeExchange { get; set; }
 
-        public class RoleEntry
-        {
-            public string Name { get; set; }
-            public bool Selected { get; set; }
-        }
-        public class ScopeEntry
-        {
-            public string Name { get; set; }
-            public bool Selected { get; set; }
-        }
+    public class RoleEntry
+    {
+        public string Name { get; set; }
+        public bool Selected { get; set; }
+    }
+    public class ScopeEntry
+    {
+        public string Name { get; set; }
+        public bool Selected { get; set; }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/CreateOpenIdScopeViewModel.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/CreateOpenIdScopeViewModel.cs
index df91516a6fa..343ac8130b1 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/CreateOpenIdScopeViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/CreateOpenIdScopeViewModel.cs
@@ -1,27 +1,26 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.OpenId.ViewModels
+namespace OrchardCore.OpenId.ViewModels;
+
+public class CreateOpenIdScopeViewModel
 {
-    public class CreateOpenIdScopeViewModel
-    {
-        public string Description { get; set; }
+    public string Description { get; set; }
 
-        [Required]
-        public string DisplayName { get; set; }
+    [Required]
+    public string DisplayName { get; set; }
 
-        [Required]
-        public string Name { get; set; }
+    [Required]
+    public string Name { get; set; }
 
-        public string Resources { get; set; }
+    public string Resources { get; set; }
 
-        public List<TenantEntry> Tenants { get; } = [];
+    public List<TenantEntry> Tenants { get; } = [];
 
-        public class TenantEntry
-        {
-            public bool Current { get; set; }
-            public string Name { get; set; }
-            public bool Selected { get; set; }
-        }
+    public class TenantEntry
+    {
+        public bool Current { get; set; }
+        public string Name { get; set; }
+        public bool Selected { get; set; }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/EditOpenIdApplicationViewModel.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/EditOpenIdApplicationViewModel.cs
index f7a71099bdd..2dd85cfdbdb 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/EditOpenIdApplicationViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/EditOpenIdApplicationViewModel.cs
@@ -2,65 +2,64 @@
 using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Mvc;
 
-namespace OrchardCore.OpenId.ViewModels
+namespace OrchardCore.OpenId.ViewModels;
+
+public class EditOpenIdApplicationViewModel
 {
-    public class EditOpenIdApplicationViewModel
-    {
-        [HiddenInput]
-        public string Id { get; set; }
+    [HiddenInput]
+    public string Id { get; set; }
 
-        [Required]
-        public string ClientId { get; set; }
+    [Required]
+    public string ClientId { get; set; }
 
-        [Required]
-        public string DisplayName { get; set; }
+    [Required]
+    public string DisplayName { get; set; }
 
-        [Url(ErrorMessage = "{0} is not well-formed")]
-        public string RedirectUris { get; set; }
+    [Url(ErrorMessage = "{0} is not well-formed")]
+    public string RedirectUris { get; set; }
 
-        [Url(ErrorMessage = "{0} is not well-formed")]
-        public string PostLogoutRedirectUris { get; set; }
+    [Url(ErrorMessage = "{0} is not well-formed")]
+    public string PostLogoutRedirectUris { get; set; }
 
-        public string Type { get; set; }
+    public string Type { get; set; }
 
-        public string ConsentType { get; set; }
+    public string ConsentType { get; set; }
 
-        public string ClientSecret { get; set; }
+    public string ClientSecret { get; set; }
 
-        public List<RoleEntry> RoleEntries { get; } = [];
+    public List<RoleEntry> RoleEntries { get; } = [];
 
-        public List<ScopeEntry> ScopeEntries { get; } = [];
+    public List<ScopeEntry> ScopeEntries { get; } = [];
 
-        public bool AllowPasswordFlow { get; set; }
+    public bool AllowPasswordFlow { get; set; }
 
-        public bool AllowClientCredentialsFlow { get; set; }
+    public bool AllowClientCredentialsFlow { get; set; }
 
-        public bool AllowAuthorizationCodeFlow { get; set; }
+    public bool AllowAuthorizationCodeFlow { get; set; }
 
-        public bool AllowRefreshTokenFlow { get; set; }
+    public bool AllowRefreshTokenFlow { get; set; }
 
-        public bool AllowHybridFlow { get; set; }
+    public bool AllowHybridFlow { get; set; }
 
-        public bool AllowImplicitFlow { get; set; }
+    public bool AllowImplicitFlow { get; set; }
 
-        public bool AllowLogoutEndpoint { get; set; }
+    public bool AllowLogoutEndpoint { get; set; }
 
-        public bool AllowIntrospectionEndpoint { get; set; }
+    public bool AllowIntrospectionEndpoint { get; set; }
 
-        public bool AllowRevocationEndpoint { get; set; }
+    public bool AllowRevocationEndpoint { get; set; }
 
-        public bool RequireProofKeyForCodeExchange { get; set; }
+    public bool RequireProofKeyForCodeExchange { get; set; }
 
-        public class RoleEntry
-        {
-            public string Name { get; set; }
-            public bool Selected { get; set; }
-        }
+    public class RoleEntry
+    {
+        public string Name { get; set; }
+        public bool Selected { get; set; }
+    }
 
-        public class ScopeEntry
-        {
-            public string Name { get; set; }
-            public bool Selected { get; set; }
-        }
+    public class ScopeEntry
+    {
+        public string Name { get; set; }
+        public bool Selected { get; set; }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/EditOpenIdScopeViewModel.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/EditOpenIdScopeViewModel.cs
index 69aad5944a2..251bae17efd 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/EditOpenIdScopeViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/EditOpenIdScopeViewModel.cs
@@ -1,30 +1,29 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.OpenId.ViewModels
+namespace OrchardCore.OpenId.ViewModels;
+
+public class EditOpenIdScopeViewModel
 {
-    public class EditOpenIdScopeViewModel
-    {
-        public string Description { get; set; }
+    public string Description { get; set; }
 
-        [Required]
-        public string DisplayName { get; set; }
+    [Required]
+    public string DisplayName { get; set; }
 
-        [Required]
-        public string Id { get; set; }
+    [Required]
+    public string Id { get; set; }
 
-        [Required]
-        public string Name { get; set; }
+    [Required]
+    public string Name { get; set; }
 
-        public string Resources { get; set; }
+    public string Resources { get; set; }
 
-        public List<TenantEntry> Tenants { get; } = [];
+    public List<TenantEntry> Tenants { get; } = [];
 
-        public class TenantEntry
-        {
-            public bool Current { get; set; }
-            public string Name { get; set; }
-            public bool Selected { get; set; }
-        }
+    public class TenantEntry
+    {
+        public bool Current { get; set; }
+        public string Name { get; set; }
+        public bool Selected { get; set; }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/ErrorViewModel.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/ErrorViewModel.cs
index 9181bc08cb8..6a358012659 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/ErrorViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/ErrorViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.OpenId.ViewModels
+namespace OrchardCore.OpenId.ViewModels;
+
+public class ErrorViewModel
 {
-    public class ErrorViewModel
-    {
-        public string Error { get; set; }
+    public string Error { get; set; }
 
-        public string ErrorDescription { get; set; }
-    }
+    public string ErrorDescription { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/LogoutViewModel.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/LogoutViewModel.cs
index 21d66c6c609..6a30919e9b7 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/LogoutViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/LogoutViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.OpenId.ViewModels
+namespace OrchardCore.OpenId.ViewModels;
+
+public class LogoutViewModel
 {
-    public class LogoutViewModel
-    {
-        public string RequestId { get; set; }
-    }
+    public string RequestId { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdApplicationsIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdApplicationsIndexViewModel.cs
index 14b74fb0cf4..4e69e90eb3c 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdApplicationsIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdApplicationsIndexViewModel.cs
@@ -1,21 +1,20 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.OpenId.ViewModels
+namespace OrchardCore.OpenId.ViewModels;
+
+public class OpenIdApplicationsIndexViewModel
 {
-    public class OpenIdApplicationsIndexViewModel
-    {
-        [BindNever]
-        public IList<OpenIdApplicationEntry> Applications { get; set; }
+    [BindNever]
+    public IList<OpenIdApplicationEntry> Applications { get; set; }
 
-        [BindNever]
-        public dynamic Pager { get; set; }
-    }
+    [BindNever]
+    public dynamic Pager { get; set; }
+}
 
-    public class OpenIdApplicationEntry
-    {
-        public string DisplayName { get; set; }
-        public string Id { get; set; }
-        public bool IsChecked { get; set; }
-    }
+public class OpenIdApplicationEntry
+{
+    public string DisplayName { get; set; }
+    public string Id { get; set; }
+    public bool IsChecked { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdClientSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdClientSettingsViewModel.cs
index d23510b4da4..ad4255ed0ed 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdClientSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdClientSettingsViewModel.cs
@@ -1,40 +1,39 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.OpenId.ViewModels
+namespace OrchardCore.OpenId.ViewModels;
+
+public class OpenIdClientSettingsViewModel
 {
-    public class OpenIdClientSettingsViewModel
-    {
-        [Required]
-        public string DisplayName { get; set; }
+    [Required]
+    public string DisplayName { get; set; }
 
-        public bool TestingModeEnabled { get; set; }
+    public bool TestingModeEnabled { get; set; }
 
-        [Required(ErrorMessage = "Authority is required")]
-        public string Authority { get; set; }
+    [Required(ErrorMessage = "Authority is required")]
+    public string Authority { get; set; }
 
-        [Required(ErrorMessage = "ClientId is required")]
-        public string ClientId { get; set; }
+    [Required(ErrorMessage = "ClientId is required")]
+    public string ClientId { get; set; }
 
-        public string ClientSecret { get; set; }
+    public string ClientSecret { get; set; }
 
-        [RegularExpression(@"\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]", ErrorMessage = "Invalid path")]
-        public string CallbackPath { get; set; }
+    [RegularExpression(@"\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]", ErrorMessage = "Invalid path")]
+    public string CallbackPath { get; set; }
 
-        [Url(ErrorMessage = "Invalid SignedOut redirect url")]
-        public string SignedOutRedirectUri { get; set; }
+    [Url(ErrorMessage = "Invalid SignedOut redirect url")]
+    public string SignedOutRedirectUri { get; set; }
 
-        [RegularExpression(@"\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]", ErrorMessage = "Invalid path")]
-        public string SignedOutCallbackPath { get; set; }
+    [RegularExpression(@"\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]", ErrorMessage = "Invalid path")]
+    public string SignedOutCallbackPath { get; set; }
 
-        public string Scopes { get; set; }
-        public string ResponseMode { get; set; }
-        public bool StoreExternalTokens { get; set; }
-        public bool UseCodeFlow { get; set; }
-        public bool UseCodeIdTokenTokenFlow { get; set; }
-        public bool UseCodeIdTokenFlow { get; set; }
-        public bool UseCodeTokenFlow { get; set; }
-        public bool UseIdTokenFlow { get; set; }
-        public bool UseIdTokenTokenFlow { get; set; }
-        public string Parameters { get; set; }
-    }
+    public string Scopes { get; set; }
+    public string ResponseMode { get; set; }
+    public bool StoreExternalTokens { get; set; }
+    public bool UseCodeFlow { get; set; }
+    public bool UseCodeIdTokenTokenFlow { get; set; }
+    public bool UseCodeIdTokenFlow { get; set; }
+    public bool UseCodeTokenFlow { get; set; }
+    public bool UseIdTokenFlow { get; set; }
+    public bool UseIdTokenTokenFlow { get; set; }
+    public string Parameters { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdScopeIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdScopeIndexViewModel.cs
index 2f078b947dd..e700d18eb31 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdScopeIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdScopeIndexViewModel.cs
@@ -1,19 +1,18 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.OpenId.ViewModels
+namespace OrchardCore.OpenId.ViewModels;
+
+public class OpenIdScopeIndexViewModel
 {
-    public class OpenIdScopeIndexViewModel
-    {
-        public IList<OpenIdScopeEntry> Scopes { get; } = [];
-        public dynamic Pager { get; set; }
-    }
+    public IList<OpenIdScopeEntry> Scopes { get; } = [];
+    public dynamic Pager { get; set; }
+}
 
-    public class OpenIdScopeEntry
-    {
-        public string Description { get; set; }
-        public string DisplayName { get; set; }
-        public string Id { get; set; }
-        public bool IsChecked { get; set; }
-        public string Name { get; set; }
-    }
+public class OpenIdScopeEntry
+{
+    public string Description { get; set; }
+    public string DisplayName { get; set; }
+    public string Id { get; set; }
+    public bool IsChecked { get; set; }
+    public string Name { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdScopeStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdScopeStepViewModel.cs
index 6733bf40e50..713082ed8a4 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdScopeStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdScopeStepViewModel.cs
@@ -1,13 +1,12 @@
-namespace OrchardCore.OpenId.ViewModels
+namespace OrchardCore.OpenId.ViewModels;
+
+public class OpenIdScopeStepViewModel
 {
-    public class OpenIdScopeStepViewModel
-    {
-        public string Description { get; set; }
+    public string Description { get; set; }
 
-        public string DisplayName { get; set; }
+    public string DisplayName { get; set; }
 
-        public string ScopeName { get; set; }
+    public string ScopeName { get; set; }
 
-        public string Resources { get; set; }
-    }
+    public string Resources { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdServerSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdServerSettingsViewModel.cs
index 01ef1da703b..7e73b48ee86 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdServerSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdServerSettingsViewModel.cs
@@ -3,50 +3,49 @@
 using System.Security.Cryptography.X509Certificates;
 using static OrchardCore.OpenId.Settings.OpenIdServerSettings;
 
-namespace OrchardCore.OpenId.ViewModels
+namespace OrchardCore.OpenId.ViewModels;
+
+public class OpenIdServerSettingsViewModel
 {
-    public class OpenIdServerSettingsViewModel
-    {
-        public TokenFormat AccessTokenFormat { get; set; }
+    public TokenFormat AccessTokenFormat { get; set; }
 
-        [Url]
-        public string Authority { get; set; }
-        public bool DisableAccessTokenEncryption { get; set; }
-        public StoreLocation? EncryptionCertificateStoreLocation { get; set; }
-        public StoreName? EncryptionCertificateStoreName { get; set; }
-        public string EncryptionCertificateThumbprint { get; set; }
-        public StoreLocation? SigningCertificateStoreLocation { get; set; }
-        public StoreName? SigningCertificateStoreName { get; set; }
-        public string SigningCertificateThumbprint { get; set; }
-        public IList<CertificateInfo> AvailableCertificates { get; } = [];
-        public bool EnableTokenEndpoint { get; set; }
-        public bool EnableAuthorizationEndpoint { get; set; }
-        public bool EnableLogoutEndpoint { get; set; }
-        public bool EnableUserInfoEndpoint { get; set; }
-        public bool EnableIntrospectionEndpoint { get; set; }
-        public bool EnableRevocationEndpoint { get; set; }
-        public bool AllowPasswordFlow { get; set; }
-        public bool AllowClientCredentialsFlow { get; set; }
-        public bool AllowAuthorizationCodeFlow { get; set; }
-        public bool AllowRefreshTokenFlow { get; set; }
-        public bool AllowHybridFlow { get; set; }
-        public bool AllowImplicitFlow { get; set; }
-        public bool DisableRollingRefreshTokens { get; set; }
-        public bool UseReferenceAccessTokens { get; set; }
-        public bool RequireProofKeyForCodeExchange { get; set; }
+    [Url]
+    public string Authority { get; set; }
+    public bool DisableAccessTokenEncryption { get; set; }
+    public StoreLocation? EncryptionCertificateStoreLocation { get; set; }
+    public StoreName? EncryptionCertificateStoreName { get; set; }
+    public string EncryptionCertificateThumbprint { get; set; }
+    public StoreLocation? SigningCertificateStoreLocation { get; set; }
+    public StoreName? SigningCertificateStoreName { get; set; }
+    public string SigningCertificateThumbprint { get; set; }
+    public IList<CertificateInfo> AvailableCertificates { get; } = [];
+    public bool EnableTokenEndpoint { get; set; }
+    public bool EnableAuthorizationEndpoint { get; set; }
+    public bool EnableLogoutEndpoint { get; set; }
+    public bool EnableUserInfoEndpoint { get; set; }
+    public bool EnableIntrospectionEndpoint { get; set; }
+    public bool EnableRevocationEndpoint { get; set; }
+    public bool AllowPasswordFlow { get; set; }
+    public bool AllowClientCredentialsFlow { get; set; }
+    public bool AllowAuthorizationCodeFlow { get; set; }
+    public bool AllowRefreshTokenFlow { get; set; }
+    public bool AllowHybridFlow { get; set; }
+    public bool AllowImplicitFlow { get; set; }
+    public bool DisableRollingRefreshTokens { get; set; }
+    public bool UseReferenceAccessTokens { get; set; }
+    public bool RequireProofKeyForCodeExchange { get; set; }
 
-        public class CertificateInfo
-        {
-            public string FriendlyName { get; set; }
-            public string Issuer { get; set; }
-            public DateTime NotAfter { get; set; }
-            public DateTime NotBefore { get; set; }
-            public StoreLocation StoreLocation { get; set; }
-            public StoreName StoreName { get; set; }
-            public string Subject { get; set; }
-            public string ThumbPrint { get; set; }
-            public bool HasPrivateKey { get; set; }
-            public bool Archived { get; set; }
-        }
+    public class CertificateInfo
+    {
+        public string FriendlyName { get; set; }
+        public string Issuer { get; set; }
+        public DateTime NotAfter { get; set; }
+        public DateTime NotBefore { get; set; }
+        public StoreLocation StoreLocation { get; set; }
+        public StoreName StoreName { get; set; }
+        public string Subject { get; set; }
+        public string ThumbPrint { get; set; }
+        public bool HasPrivateKey { get; set; }
+        public bool Archived { get; set; }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdValidationSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdValidationSettingsViewModel.cs
index 4681020715d..e9bf706cc7c 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdValidationSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ViewModels/OpenIdValidationSettingsViewModel.cs
@@ -1,18 +1,17 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.OpenId.ViewModels
+namespace OrchardCore.OpenId.ViewModels;
+
+public class OpenIdValidationSettingsViewModel
 {
-    public class OpenIdValidationSettingsViewModel
-    {
-        [Url]
-        public string MetadataAddress { get; set; }
+    [Url]
+    public string MetadataAddress { get; set; }
 
-        [Url]
-        public string Authority { get; set; }
+    [Url]
+    public string Authority { get; set; }
 
-        public string Audience { get; set; }
-        public bool DisableTokenTypeValidation { get; set; }
-        public string Tenant { get; set; }
-        public IEnumerable<string> AvailableTenants { get; set; }
-    }
+    public string Audience { get; set; }
+    public bool DisableTokenTypeValidation { get; set; }
+    public string Tenant { get; set; }
+    public IEnumerable<string> AvailableTenants { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Placements/AdminMenu.cs
index c86701ba31d..988cdbce6a2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/AdminMenu.cs
@@ -2,34 +2,33 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Placements
+namespace OrchardCore.Placements;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    internal readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Design"], design => design
-                    .Add(S["Placements"], S["Placements"].PrefixPosition(), import => import
-                        .Action("Index", "Admin", "OrchardCore.Placements")
-                        .Permission(Permissions.ManagePlacements)
-                        .LocalNav()
-                    )
-                );
+        builder
+            .Add(S["Design"], design => design
+                .Add(S["Placements"], S["Placements"].PrefixPosition(), import => import
+                    .Action("Index", "Admin", "OrchardCore.Placements")
+                    .Permission(Permissions.ManagePlacements)
+                    .LocalNav()
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Placements/Controllers/AdminController.cs
index 674c73ec045..200cf87866e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/Controllers/AdminController.cs
@@ -21,323 +21,322 @@
 using OrchardCore.Placements.ViewModels;
 using OrchardCore.Routing;
 
-namespace OrchardCore.Placements.Controllers
+namespace OrchardCore.Placements.Controllers;
+
+[Admin("Placements/{action}/{shapeType?}", "Placements.{action}")]
+public class AdminController : Controller
 {
-    [Admin("Placements/{action}/{shapeType?}", "Placements.{action}")]
-    public class AdminController : Controller
+    private const string _optionsSearch = "Options.Search";
+
+    private readonly ILogger _logger;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly PlacementsManager _placementsManager;
+    private readonly INotifier _notifier;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly PagerOptions _pagerOptions;
+
+    protected readonly IHtmlLocalizer H;
+    protected readonly IStringLocalizer S;
+
+    public AdminController(
+        ILogger<AdminController> logger,
+        IAuthorizationService authorizationService,
+        PlacementsManager placementsManager,
+        IHtmlLocalizer<AdminController> htmlLocalizer,
+        IStringLocalizer<AdminController> stringLocalizer,
+        INotifier notifier,
+        IOptions<PagerOptions> pagerOptions,
+        IShapeFactory shapeFactory)
+    {
+        _logger = logger;
+        _authorizationService = authorizationService;
+        _placementsManager = placementsManager;
+        _notifier = notifier;
+        _shapeFactory = shapeFactory;
+        _pagerOptions = pagerOptions.Value;
+
+        H = htmlLocalizer;
+        S = stringLocalizer;
+    }
+
+    [Admin("Placements", "Placements.Index")]
+    public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
     {
-        private const string _optionsSearch = "Options.Search";
-
-        private readonly ILogger _logger;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly PlacementsManager _placementsManager;
-        private readonly INotifier _notifier;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly PagerOptions _pagerOptions;
-
-        protected readonly IHtmlLocalizer H;
-        protected readonly IStringLocalizer S;
-
-        public AdminController(
-            ILogger<AdminController> logger,
-            IAuthorizationService authorizationService,
-            PlacementsManager placementsManager,
-            IHtmlLocalizer<AdminController> htmlLocalizer,
-            IStringLocalizer<AdminController> stringLocalizer,
-            INotifier notifier,
-            IOptions<PagerOptions> pagerOptions,
-            IShapeFactory shapeFactory)
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManagePlacements))
         {
-            _logger = logger;
-            _authorizationService = authorizationService;
-            _placementsManager = placementsManager;
-            _notifier = notifier;
-            _shapeFactory = shapeFactory;
-            _pagerOptions = pagerOptions.Value;
-
-            H = htmlLocalizer;
-            S = stringLocalizer;
+            return Forbid();
         }
 
-        [Admin("Placements", "Placements.Index")]
-        public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+
+        var shapeTypes = await _placementsManager.ListShapePlacementsAsync();
+
+        var shapeList = shapeTypes.Select(entry => new ShapePlacementViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManagePlacements))
-            {
-                return Forbid();
-            }
+            ShapeType = entry.Key
+        }).ToList();
 
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+        if (!string.IsNullOrWhiteSpace(options.Search))
+        {
+            shapeList = shapeList.Where(x => x.ShapeType.Contains(options.Search, StringComparison.OrdinalIgnoreCase)).ToList();
+        }
 
-            var shapeTypes = await _placementsManager.ListShapePlacementsAsync();
+        var count = shapeList.Count;
 
-            var shapeList = shapeTypes.Select(entry => new ShapePlacementViewModel
-            {
-                ShapeType = entry.Key
-            }).ToList();
+        shapeList = shapeList.OrderBy(x => x.ShapeType)
+            .Skip(pager.GetStartIndex())
+            .Take(pager.PageSize).ToList();
 
-            if (!string.IsNullOrWhiteSpace(options.Search))
-            {
-                shapeList = shapeList.Where(x => x.ShapeType.Contains(options.Search, StringComparison.OrdinalIgnoreCase)).ToList();
-            }
+        // Maintain previous route data when generating page links.
+        var routeData = new RouteData();
 
-            var count = shapeList.Count;
+        if (!string.IsNullOrEmpty(options.Search))
+        {
+            routeData.Values.TryAdd(_optionsSearch, options.Search);
+        }
 
-            shapeList = shapeList.OrderBy(x => x.ShapeType)
-                .Skip(pager.GetStartIndex())
-                .Take(pager.PageSize).ToList();
+        var pagerShape = await _shapeFactory.PagerAsync(pager, count, routeData);
 
-            // Maintain previous route data when generating page links.
-            var routeData = new RouteData();
+        var model = new ListShapePlacementsViewModel
+        {
+            ShapePlacements = shapeList,
+            Pager = pagerShape,
+            Options = options,
+        };
 
-            if (!string.IsNullOrEmpty(options.Search))
-            {
-                routeData.Values.TryAdd(_optionsSearch, options.Search);
-            }
+        model.Options.ContentsBulkAction =
+        [
+            new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+        ];
 
-            var pagerShape = await _shapeFactory.PagerAsync(pager, count, routeData);
+        return View(model);
+    }
 
-            var model = new ListShapePlacementsViewModel
-            {
-                ShapePlacements = shapeList,
-                Pager = pagerShape,
-                Options = options,
-            };
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.Filter")]
+    public ActionResult IndexFilterPOST(ListShapePlacementsViewModel model)
+        => RedirectToAction(nameof(Index), new RouteValueDictionary
+        {
+            { _optionsSearch, model.Options.Search }
+        });
 
-            model.Options.ContentsBulkAction =
-            [
-                new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
-            ];
+    public async Task<IActionResult> Create(string suggestion, string returnUrl = null)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManagePlacements))
+        {
+            return Forbid();
+        }
+
+        var template = new PlacementNode[] { new() };
 
-            return View(model);
+        var viewModel = new EditShapePlacementViewModel
+        {
+            Creating = true,
+            ShapeType = suggestion,
+            Nodes = JConvert.SerializeObject(template, JOptions.Indented)
+        };
+
+        ViewData["ReturnUrl"] = returnUrl;
+        return View(nameof(Edit), viewModel);
+    }
+
+    public async Task<IActionResult> Edit(string shapeType, string displayType = null, string contentType = null, string contentPart = null, string differentiator = null, string returnUrl = null)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManagePlacements))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.Filter")]
-        public ActionResult IndexFilterPOST(ListShapePlacementsViewModel model)
-            => RedirectToAction(nameof(Index), new RouteValueDictionary
-            {
-                { _optionsSearch, model.Options.Search }
-            });
+        var placementNodes = (await _placementsManager.GetShapePlacementsAsync(shapeType))?.ToList() ?? [];
 
-        public async Task<IActionResult> Create(string suggestion, string returnUrl = null)
+        if (placementNodes.Count == 0 || ShouldCreateNode(placementNodes, displayType, contentType, contentPart, differentiator))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManagePlacements))
+            var generatedNode = new PlacementNode
             {
-                return Forbid();
-            }
+                DisplayType = displayType,
+                Differentiator = differentiator
+            };
 
-            var template = new PlacementNode[] { new() };
+            if (!string.IsNullOrEmpty(contentType))
+            {
+                generatedNode.Filters.Add("contentType", new JsonArray(contentType));
+            }
 
-            var viewModel = new EditShapePlacementViewModel
+            if (!string.IsNullOrEmpty(contentPart))
             {
-                Creating = true,
-                ShapeType = suggestion,
-                Nodes = JConvert.SerializeObject(template, JOptions.Indented)
-            };
+                generatedNode.Filters.Add("contentPart", new JsonArray(contentPart));
+            }
 
-            ViewData["ReturnUrl"] = returnUrl;
-            return View(nameof(Edit), viewModel);
+            placementNodes.Add(generatedNode);
         }
 
-        public async Task<IActionResult> Edit(string shapeType, string displayType = null, string contentType = null, string contentPart = null, string differentiator = null, string returnUrl = null)
+        var viewModel = new EditShapePlacementViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManagePlacements))
-            {
-                return Forbid();
-            }
+            ShapeType = shapeType,
+            Nodes = JConvert.SerializeObject(placementNodes, JOptions.Indented)
+        };
 
-            var placementNodes = (await _placementsManager.GetShapePlacementsAsync(shapeType))?.ToList() ?? [];
+        ViewData["ReturnUrl"] = returnUrl;
+        return View(viewModel);
+    }
 
-            if (placementNodes.Count == 0 || ShouldCreateNode(placementNodes, displayType, contentType, contentPart, differentiator))
-            {
-                var generatedNode = new PlacementNode
-                {
-                    DisplayType = displayType,
-                    Differentiator = differentiator
-                };
-
-                if (!string.IsNullOrEmpty(contentType))
-                {
-                    generatedNode.Filters.Add("contentType", new JsonArray(contentType));
-                }
-
-                if (!string.IsNullOrEmpty(contentPart))
-                {
-                    generatedNode.Filters.Add("contentPart", new JsonArray(contentPart));
-                }
-
-                placementNodes.Add(generatedNode);
-            }
+    [HttpPost, ActionName(nameof(Edit))]
+    public async Task<IActionResult> Edit(EditShapePlacementViewModel viewModel, string submit, string returnUrl = null)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManagePlacements))
+        {
+            return Forbid();
+        }
 
-            var viewModel = new EditShapePlacementViewModel
-            {
-                ShapeType = shapeType,
-                Nodes = JConvert.SerializeObject(placementNodes, JOptions.Indented)
-            };
+        ViewData["ReturnUrl"] = returnUrl;
 
-            ViewData["ReturnUrl"] = returnUrl;
+        if (viewModel.Creating && await _placementsManager.GetShapePlacementsAsync(viewModel.ShapeType) != null)
+        {
+            // Prevent overriding existing rules on creation.
+            await _notifier.WarningAsync(H["Placement rules for \"{0}\" already exists. Please edit existing rule.", viewModel.ShapeType]);
             return View(viewModel);
         }
 
-        [HttpPost, ActionName(nameof(Edit))]
-        public async Task<IActionResult> Edit(EditShapePlacementViewModel viewModel, string submit, string returnUrl = null)
+        try
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManagePlacements))
-            {
-                return Forbid();
-            }
+            var placementNodes = JConvert.DeserializeObject<PlacementNode[]>(viewModel.Nodes)
+                ?? Enumerable.Empty<PlacementNode>();
 
-            ViewData["ReturnUrl"] = returnUrl;
+            // Remove empty nodes.
+            placementNodes = placementNodes.Where(node => !IsEmpty(node));
 
-            if (viewModel.Creating && await _placementsManager.GetShapePlacementsAsync(viewModel.ShapeType) != null)
+            if (placementNodes.Any())
             {
-                // Prevent overriding existing rules on creation.
-                await _notifier.WarningAsync(H["Placement rules for \"{0}\" already exists. Please edit existing rule.", viewModel.ShapeType]);
-                return View(viewModel);
-            }
+                // Save.
+                await _placementsManager.UpdateShapePlacementsAsync(viewModel.ShapeType, placementNodes);
+                viewModel.Creating = false;
 
-            try
-            {
-                var placementNodes = JConvert.DeserializeObject<PlacementNode[]>(viewModel.Nodes)
-                    ?? Enumerable.Empty<PlacementNode>();
-
-                // Remove empty nodes.
-                placementNodes = placementNodes.Where(node => !IsEmpty(node));
-
-                if (placementNodes.Any())
-                {
-                    // Save.
-                    await _placementsManager.UpdateShapePlacementsAsync(viewModel.ShapeType, placementNodes);
-                    viewModel.Creating = false;
-
-                    await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
-                }
-                else if (viewModel.Creating)
-                {
-                    await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
-                    return View(viewModel);
-                }
-                else
-                {
-                    // Remove if empty.
-                    await _placementsManager.RemoveShapePlacementsAsync(viewModel.ShapeType);
-                    await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
-                }
+                await _notifier.SuccessAsync(H["The \"{0}\" placement have been saved.", viewModel.ShapeType]);
             }
-            catch (JsonException jsonException)
+            else if (viewModel.Creating)
             {
-                await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
+                await _notifier.WarningAsync(H["The \"{0}\" placement is empty.", viewModel.ShapeType]);
                 return View(viewModel);
             }
-            catch (Exception e)
-            {
-                await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
-                _logger.LogError(e, "An error occurred while saving the placement.");
-                return View(viewModel);
-            }
-
-            if (submit != "SaveAndContinue")
+            else
             {
-                return RedirectToReturnUrlOrIndex(returnUrl);
+                // Remove if empty.
+                await _placementsManager.RemoveShapePlacementsAsync(viewModel.ShapeType);
+                await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", viewModel.ShapeType]);
             }
-
+        }
+        catch (JsonException jsonException)
+        {
+            await _notifier.ErrorAsync(H["An error occurred while parsing the placement<br/>{0}", jsonException.Message]);
             return View(viewModel);
         }
-
-        [HttpPost, ActionName(nameof(Delete))]
-        public async Task<IActionResult> Delete(string shapeType, string returnUrl = null)
+        catch (Exception e)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManagePlacements))
-            {
-                return Forbid();
-            }
-
-            await _placementsManager.RemoveShapePlacementsAsync(shapeType);
-            await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
+            await _notifier.ErrorAsync(H["An error occurred while saving the placement."]);
+            _logger.LogError(e, "An error occurred while saving the placement.");
+            return View(viewModel);
+        }
 
+        if (submit != "SaveAndContinue")
+        {
             return RedirectToReturnUrlOrIndex(returnUrl);
         }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<string> itemIds)
+        return View(viewModel);
+    }
+
+    [HttpPost, ActionName(nameof(Delete))]
+    public async Task<IActionResult> Delete(string shapeType, string returnUrl = null)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManagePlacements))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManagePlacements))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            if (itemIds?.Count() > 0)
-            {
-                switch (options.BulkAction)
-                {
-                    case ContentsBulkAction.None:
-                        break;
-                    case ContentsBulkAction.Remove:
-                        foreach (var item in itemIds)
-                        {
-                            await _placementsManager.RemoveShapePlacementsAsync(item);
-                        }
-                        await _notifier.SuccessAsync(H["Placements successfully removed."]);
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException(options.BulkAction.ToString(), "Invalid bulk action.");
-                }
-            }
+        await _placementsManager.RemoveShapePlacementsAsync(shapeType);
+        await _notifier.SuccessAsync(H["The \"{0}\" placement has been deleted.", shapeType]);
 
-            return RedirectToAction(nameof(Index));
+        return RedirectToReturnUrlOrIndex(returnUrl);
+    }
+
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<string> itemIds)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManagePlacements))
+        {
+            return Forbid();
         }
 
-        private IActionResult RedirectToReturnUrlOrIndex(string returnUrl)
+        if (itemIds?.Count() > 0)
         {
-            if ((string.IsNullOrEmpty(returnUrl) == false) && (Url.IsLocalUrl(returnUrl)))
-            {
-                return this.Redirect(returnUrl, true);
-            }
-            else
+            switch (options.BulkAction)
             {
-                return RedirectToAction(nameof(Index));
+                case ContentsBulkAction.None:
+                    break;
+                case ContentsBulkAction.Remove:
+                    foreach (var item in itemIds)
+                    {
+                        await _placementsManager.RemoveShapePlacementsAsync(item);
+                    }
+                    await _notifier.SuccessAsync(H["Placements successfully removed."]);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(options.BulkAction.ToString(), "Invalid bulk action.");
             }
         }
 
-        private static bool ShouldCreateNode(IEnumerable<PlacementNode> nodes, string displayType, string contentType, string contentPart, string differentiator)
+        return RedirectToAction(nameof(Index));
+    }
+
+    private IActionResult RedirectToReturnUrlOrIndex(string returnUrl)
+    {
+        if ((string.IsNullOrEmpty(returnUrl) == false) && (Url.IsLocalUrl(returnUrl)))
         {
-            if (string.IsNullOrEmpty(displayType) && string.IsNullOrEmpty(differentiator))
-            {
-                return false;
-            }
-            else
-            {
-                return !nodes.Any(node =>
-                    (string.IsNullOrEmpty(displayType) || node.DisplayType == displayType) &&
-                    (string.IsNullOrEmpty(contentType) || (node.Filters.ContainsKey("contentType") && FilterEquals(node.Filters["contentType"], contentType))) &&
-                    (string.IsNullOrEmpty(contentPart) || (node.Filters.ContainsKey("contentPart") && FilterEquals(node.Filters["contentPart"], contentPart))) &&
-                    (string.IsNullOrEmpty(differentiator) || node.Differentiator == differentiator));
-            }
+            return this.Redirect(returnUrl, true);
         }
+        else
+        {
+            return RedirectToAction(nameof(Index));
+        }
+    }
 
-        private static bool IsEmpty(PlacementNode node)
+    private static bool ShouldCreateNode(IEnumerable<PlacementNode> nodes, string displayType, string contentType, string contentPart, string differentiator)
+    {
+        if (string.IsNullOrEmpty(displayType) && string.IsNullOrEmpty(differentiator))
         {
-            return string.IsNullOrEmpty(node.Location)
-                && string.IsNullOrEmpty(node.ShapeType)
-                && (node.Alternates == null || node.Alternates.Length == 0)
-                && (node.Wrappers == null || node.Wrappers.Length == 0);
+            return false;
         }
+        else
+        {
+            return !nodes.Any(node =>
+                (string.IsNullOrEmpty(displayType) || node.DisplayType == displayType) &&
+                (string.IsNullOrEmpty(contentType) || (node.Filters.ContainsKey("contentType") && FilterEquals(node.Filters["contentType"], contentType))) &&
+                (string.IsNullOrEmpty(contentPart) || (node.Filters.ContainsKey("contentPart") && FilterEquals(node.Filters["contentPart"], contentPart))) &&
+                (string.IsNullOrEmpty(differentiator) || node.Differentiator == differentiator));
+        }
+    }
+
+    private static bool IsEmpty(PlacementNode node)
+    {
+        return string.IsNullOrEmpty(node.Location)
+            && string.IsNullOrEmpty(node.ShapeType)
+            && (node.Alternates == null || node.Alternates.Length == 0)
+            && (node.Wrappers == null || node.Wrappers.Length == 0);
+    }
 
 
-        private static bool FilterEquals(object node, string value)
+    private static bool FilterEquals(object node, string value)
+    {
+        var jsonNode = JNode.FromObject(node);
+        if (jsonNode is JsonArray jsonArray)
         {
-            var jsonNode = JNode.FromObject(node);
-            if (jsonNode is JsonArray jsonArray)
-            {
-                var tokenValues = jsonArray.Values<string>();
-                return tokenValues.Count() == 1 && tokenValues.First() == value;
-            }
-            else
-            {
-                return jsonNode.Value<string>() == value;
-            }
+            var tokenValues = jsonArray.Values<string>();
+            return tokenValues.Count() == 1 && tokenValues.First() == value;
+        }
+        else
+        {
+            return jsonNode.Value<string>() == value;
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/Deployment/PlacementsDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Placements/Deployment/PlacementsDeploymentSource.cs
index be7bbb50065..54b181a23b7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/Deployment/PlacementsDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/Deployment/PlacementsDeploymentSource.cs
@@ -6,41 +6,40 @@
 using OrchardCore.Json;
 using OrchardCore.Placements.Services;
 
-namespace OrchardCore.Placements.Deployment
+namespace OrchardCore.Placements.Deployment;
+
+public class PlacementsDeploymentSource : IDeploymentSource
 {
-    public class PlacementsDeploymentSource : IDeploymentSource
+    private readonly PlacementsManager _placementsManager;
+    private readonly JsonSerializerOptions _jsonSerializerOptions;
+
+    public PlacementsDeploymentSource(
+        PlacementsManager placementsManager,
+        IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions)
     {
-        private readonly PlacementsManager _placementsManager;
-        private readonly JsonSerializerOptions _jsonSerializerOptions;
+        _placementsManager = placementsManager;
+        _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
+    }
 
-        public PlacementsDeploymentSource(
-            PlacementsManager placementsManager,
-            IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        if (step is not PlacementsDeploymentStep)
         {
-            _placementsManager = placementsManager;
-            _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
-        {
-            if (step is not PlacementsDeploymentStep)
-            {
-                return;
-            }
-
-            var placementObjects = new JsonObject();
-            var placements = await _placementsManager.ListShapePlacementsAsync();
-
-            foreach (var placement in placements)
-            {
-                placementObjects[placement.Key] = JArray.FromObject(placement.Value, _jsonSerializerOptions);
-            }
+        var placementObjects = new JsonObject();
+        var placements = await _placementsManager.ListShapePlacementsAsync();
 
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "Placements",
-                ["Placements"] = placementObjects,
-            });
+        foreach (var placement in placements)
+        {
+            placementObjects[placement.Key] = JArray.FromObject(placement.Value, _jsonSerializerOptions);
         }
+
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "Placements",
+            ["Placements"] = placementObjects,
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/Deployment/PlacementsDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Placements/Deployment/PlacementsDeploymentStep.cs
index f612747c1ba..ef8cc96a5b6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/Deployment/PlacementsDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/Deployment/PlacementsDeploymentStep.cs
@@ -1,15 +1,14 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Placements.Deployment
+namespace OrchardCore.Placements.Deployment;
+
+/// <summary>
+/// Adds placements to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class PlacementsDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds placements to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class PlacementsDeploymentStep : DeploymentStep
+    public PlacementsDeploymentStep()
     {
-        public PlacementsDeploymentStep()
-        {
-            Name = "Placements";
-        }
+        Name = "Placements";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/Deployment/PlacementsDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Placements/Deployment/PlacementsDeploymentStepDriver.cs
index de344a187f4..5c656ff6ec4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/Deployment/PlacementsDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/Deployment/PlacementsDeploymentStepDriver.cs
@@ -3,22 +3,21 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Placements.Deployment
+namespace OrchardCore.Placements.Deployment;
+
+public sealed class PlacementsDeploymentStepDriver : DisplayDriver<DeploymentStep, PlacementsDeploymentStep>
 {
-    public sealed class PlacementsDeploymentStepDriver : DisplayDriver<DeploymentStep, PlacementsDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(PlacementsDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(PlacementsDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("PlacementsDeploymentStep_Summary", step).Location("Summary", "Content"),
-                    View("PlacementsDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("PlacementsDeploymentStep_Summary", step).Location("Summary", "Content"),
+                View("PlacementsDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(PlacementsDeploymentStep step, BuildEditorContext context)
-        {
-            return View("PlacementsDeploymentStep_Edit", step).Location("Content");
-        }
+    public override IDisplayResult Edit(PlacementsDeploymentStep step, BuildEditorContext context)
+    {
+        return View("PlacementsDeploymentStep_Edit", step).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/Models/PlacementsDocument.cs b/src/OrchardCore.Modules/OrchardCore.Placements/Models/PlacementsDocument.cs
index 98412581b48..d840cfd76f3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/Models/PlacementsDocument.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/Models/PlacementsDocument.cs
@@ -3,10 +3,9 @@
 using OrchardCore.Data.Documents;
 using OrchardCore.DisplayManagement.Descriptors.ShapePlacementStrategy;
 
-namespace OrchardCore.Placements.Models
+namespace OrchardCore.Placements.Models;
+
+public class PlacementsDocument : Document
 {
-    public class PlacementsDocument : Document
-    {
-        public Dictionary<string, PlacementNode[]> Placements { get; init; } = new(StringComparer.OrdinalIgnoreCase);
-    }
+    public Dictionary<string, PlacementNode[]> Placements { get; init; } = new(StringComparer.OrdinalIgnoreCase);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/Recipes/PlacementStep.cs b/src/OrchardCore.Modules/OrchardCore.Placements/Recipes/PlacementStep.cs
index dd340b6af72..83abe1c6819 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/Recipes/PlacementStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/Recipes/PlacementStep.cs
@@ -6,36 +6,35 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Placements.Recipes
+namespace OrchardCore.Placements.Recipes;
+
+/// <summary>
+/// This recipe step creates a set of placements.
+/// </summary>
+public sealed class PlacementStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step creates a set of placements.
-    /// </summary>
-    public sealed class PlacementStep : IRecipeStepHandler
+    private readonly PlacementsManager _placementsManager;
+
+    public PlacementStep(PlacementsManager placementsManager)
     {
-        private readonly PlacementsManager _placementsManager;
+        _placementsManager = placementsManager;
+    }
 
-        public PlacementStep(PlacementsManager placementsManager)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "Placements", StringComparison.OrdinalIgnoreCase))
         {
-            _placementsManager = placementsManager;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        if (context.Step.TryGetPropertyValue("Placements", out var jsonNode) && jsonNode is JsonObject templates)
         {
-            if (!string.Equals(context.Name, "Placements", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            if (context.Step.TryGetPropertyValue("Placements", out var jsonNode) && jsonNode is JsonObject templates)
+            foreach (var property in templates)
             {
-                foreach (var property in templates)
-                {
-                    var name = property.Key;
-                    var value = property.Value.ToObject<PlacementNode[]>();
+                var name = property.Key;
+                var value = property.Value.ToObject<PlacementNode[]>();
 
-                    await _placementsManager.UpdateShapePlacementsAsync(name, value);
-                }
+                await _placementsManager.UpdateShapePlacementsAsync(name, value);
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/Services/DatabasePlacementsStore.cs b/src/OrchardCore.Modules/OrchardCore.Placements/Services/DatabasePlacementsStore.cs
index a101c3b91d4..37dffeee647 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/Services/DatabasePlacementsStore.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/Services/DatabasePlacementsStore.cs
@@ -2,24 +2,23 @@
 using OrchardCore.Documents;
 using OrchardCore.Placements.Models;
 
-namespace OrchardCore.Placements.Services
+namespace OrchardCore.Placements.Services;
+
+public class DatabasePlacementsStore : IPlacementStore
 {
-    public class DatabasePlacementsStore : IPlacementStore
-    {
-        private readonly IDocumentManager<PlacementsDocument> _documentManager;
+    private readonly IDocumentManager<PlacementsDocument> _documentManager;
 
-        public DatabasePlacementsStore(IDocumentManager<PlacementsDocument> documentManager)
-        {
-            _documentManager = documentManager;
-        }
+    public DatabasePlacementsStore(IDocumentManager<PlacementsDocument> documentManager)
+    {
+        _documentManager = documentManager;
+    }
 
-        /// <inheritdoc />
-        public Task<PlacementsDocument> LoadPlacementsAsync() => _documentManager.GetOrCreateMutableAsync();
+    /// <inheritdoc />
+    public Task<PlacementsDocument> LoadPlacementsAsync() => _documentManager.GetOrCreateMutableAsync();
 
-        /// <inheritdoc />
-        public Task<PlacementsDocument> GetPlacementsAsync() => _documentManager.GetOrCreateImmutableAsync();
+    /// <inheritdoc />
+    public Task<PlacementsDocument> GetPlacementsAsync() => _documentManager.GetOrCreateImmutableAsync();
 
-        /// <inheritdoc />
-        public Task SavePlacementsAsync(PlacementsDocument placementsDocument) => _documentManager.UpdateAsync(placementsDocument);
-    }
+    /// <inheritdoc />
+    public Task SavePlacementsAsync(PlacementsDocument placementsDocument) => _documentManager.UpdateAsync(placementsDocument);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/Services/FilePlacementsStore.cs b/src/OrchardCore.Modules/OrchardCore.Placements/Services/FilePlacementsStore.cs
index 28401a571fc..eeb1bc84826 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/Services/FilePlacementsStore.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/Services/FilePlacementsStore.cs
@@ -3,24 +3,23 @@
 using OrchardCore.Documents;
 using OrchardCore.Placements.Models;
 
-namespace OrchardCore.Placements.Services
+namespace OrchardCore.Placements.Services;
+
+public class FilePlacementsStore : IPlacementStore
 {
-    public class FilePlacementsStore : IPlacementStore
-    {
-        private readonly IDocumentManager<IFileDocumentStore, PlacementsDocument> _documentManager;
+    private readonly IDocumentManager<IFileDocumentStore, PlacementsDocument> _documentManager;
 
-        public FilePlacementsStore(IDocumentManager<IFileDocumentStore, PlacementsDocument> documentManager)
-        {
-            _documentManager = documentManager;
-        }
+    public FilePlacementsStore(IDocumentManager<IFileDocumentStore, PlacementsDocument> documentManager)
+    {
+        _documentManager = documentManager;
+    }
 
-        /// <inheritdoc />
-        public Task<PlacementsDocument> LoadPlacementsAsync() => _documentManager.GetOrCreateMutableAsync();
+    /// <inheritdoc />
+    public Task<PlacementsDocument> LoadPlacementsAsync() => _documentManager.GetOrCreateMutableAsync();
 
-        /// <inheritdoc />
-        public Task<PlacementsDocument> GetPlacementsAsync() => _documentManager.GetOrCreateImmutableAsync();
+    /// <inheritdoc />
+    public Task<PlacementsDocument> GetPlacementsAsync() => _documentManager.GetOrCreateImmutableAsync();
 
-        /// <inheritdoc />
-        public Task SavePlacementsAsync(PlacementsDocument placementsDocument) => _documentManager.UpdateAsync(placementsDocument);
-    }
+    /// <inheritdoc />
+    public Task SavePlacementsAsync(PlacementsDocument placementsDocument) => _documentManager.UpdateAsync(placementsDocument);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/Services/IPlacementStore.cs b/src/OrchardCore.Modules/OrchardCore.Placements/Services/IPlacementStore.cs
index eed22816293..59a4461bdff 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/Services/IPlacementStore.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/Services/IPlacementStore.cs
@@ -1,23 +1,22 @@
 using System.Threading.Tasks;
 using OrchardCore.Placements.Models;
 
-namespace OrchardCore.Placements.Services
+namespace OrchardCore.Placements.Services;
+
+public interface IPlacementStore
 {
-    public interface IPlacementStore
-    {
-        /// <summary>
-        /// Loads the placements document from the store for updating and that should not be cached.
-        /// </summary>
-        Task<PlacementsDocument> LoadPlacementsAsync();
+    /// <summary>
+    /// Loads the placements document from the store for updating and that should not be cached.
+    /// </summary>
+    Task<PlacementsDocument> LoadPlacementsAsync();
 
-        /// <summary>
-        /// Gets the placements document from the cache for sharing and that should not be updated.
-        /// </summary>
-        Task<PlacementsDocument> GetPlacementsAsync();
+    /// <summary>
+    /// Gets the placements document from the cache for sharing and that should not be updated.
+    /// </summary>
+    Task<PlacementsDocument> GetPlacementsAsync();
 
-        /// <summary>
-        /// Updates the store with the provided placements document and then updates the cache.
-        /// </summary>
-        Task SavePlacementsAsync(PlacementsDocument placementsDocument);
-    }
+    /// <summary>
+    /// Updates the store with the provided placements document and then updates the cache.
+    /// </summary>
+    Task SavePlacementsAsync(PlacementsDocument placementsDocument);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/Services/PlacementProvider.cs b/src/OrchardCore.Modules/OrchardCore.Placements/Services/PlacementProvider.cs
index b39dd7ed118..06901e3297f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/Services/PlacementProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/Services/PlacementProvider.cs
@@ -7,102 +7,101 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Shapes;
 
-namespace OrchardCore.Placements.Services
+namespace OrchardCore.Placements.Services;
+
+public class PlacementProvider : IShapePlacementProvider
 {
-    public class PlacementProvider : IShapePlacementProvider
+    private readonly PlacementsManager _placementsManager;
+    private readonly IEnumerable<IPlacementNodeFilterProvider> _placementNodeFilterProviders;
+
+    public PlacementProvider(
+        PlacementsManager placementsManager,
+        IEnumerable<IPlacementNodeFilterProvider> placementNodeFilterProviders)
+    {
+        _placementsManager = placementsManager;
+        _placementNodeFilterProviders = placementNodeFilterProviders;
+    }
+
+    public async Task<IPlacementInfoResolver> BuildPlacementInfoResolverAsync(IBuildShapeContext context)
     {
-        private readonly PlacementsManager _placementsManager;
+        var placements = await _placementsManager.ListShapePlacementsAsync();
+        return new PlacementInfoResolver(placements, _placementNodeFilterProviders);
+    }
+
+    public class PlacementInfoResolver : IPlacementInfoResolver
+    {
+        private readonly IReadOnlyDictionary<string, PlacementNode[]> _placements;
         private readonly IEnumerable<IPlacementNodeFilterProvider> _placementNodeFilterProviders;
 
-        public PlacementProvider(
-            PlacementsManager placementsManager,
+        public PlacementInfoResolver(
+            IReadOnlyDictionary<string, PlacementNode[]> placements,
             IEnumerable<IPlacementNodeFilterProvider> placementNodeFilterProviders)
         {
-            _placementsManager = placementsManager;
+            _placements = placements;
             _placementNodeFilterProviders = placementNodeFilterProviders;
         }
 
-        public async Task<IPlacementInfoResolver> BuildPlacementInfoResolverAsync(IBuildShapeContext context)
+        public PlacementInfo ResolvePlacement(ShapePlacementContext placementContext)
         {
-            var placements = await _placementsManager.ListShapePlacementsAsync();
-            return new PlacementInfoResolver(placements, _placementNodeFilterProviders);
-        }
+            PlacementInfo placement = null;
 
-        public class PlacementInfoResolver : IPlacementInfoResolver
-        {
-            private readonly IReadOnlyDictionary<string, PlacementNode[]> _placements;
-            private readonly IEnumerable<IPlacementNodeFilterProvider> _placementNodeFilterProviders;
-
-            public PlacementInfoResolver(
-                IReadOnlyDictionary<string, PlacementNode[]> placements,
-                IEnumerable<IPlacementNodeFilterProvider> placementNodeFilterProviders)
+            if (_placements.ContainsKey(placementContext.ShapeType))
             {
-                _placements = placements;
-                _placementNodeFilterProviders = placementNodeFilterProviders;
-            }
+                var shapePlacements = _placements[placementContext.ShapeType];
 
-            public PlacementInfo ResolvePlacement(ShapePlacementContext placementContext)
-            {
-                PlacementInfo placement = null;
-
-                if (_placements.ContainsKey(placementContext.ShapeType))
+                foreach (var placementRule in shapePlacements)
                 {
-                    var shapePlacements = _placements[placementContext.ShapeType];
+                    var filters = placementRule.Filters.ToList();
+
+                    Func<ShapePlacementContext, bool> predicate = ctx => CheckFilter(ctx, placementRule);
 
-                    foreach (var placementRule in shapePlacements)
+                    if (filters.Count > 0)
                     {
-                        var filters = placementRule.Filters.ToList();
-
-                        Func<ShapePlacementContext, bool> predicate = ctx => CheckFilter(ctx, placementRule);
-
-                        if (filters.Count > 0)
-                        {
-                            predicate = filters.Aggregate(predicate, BuildPredicate);
-                        }
-
-                        if (!predicate(placementContext))
-                        {
-                            // Ignore rule
-                            continue;
-                        }
-
-                        placement ??= new PlacementInfo
-                        {
-                            Source = "OrchardCore.Placements",
-                        };
-
-                        if (!string.IsNullOrEmpty(placementRule.Location))
-                        {
-                            placement.Location = placementRule.Location;
-                        }
-
-                        if (!string.IsNullOrEmpty(placementRule.ShapeType))
-                        {
-                            placement.ShapeType = placementRule.ShapeType;
-                        }
-
-                        if (placementRule.Alternates?.Length > 0)
-                        {
-                            placement.Alternates = placement.Alternates.Combine(new AlternatesCollection(placementRule.Alternates));
-                        }
-
-                        if (placementRule.Wrappers?.Length > 0)
-                        {
-                            placement.Wrappers = placement.Wrappers.Combine(new AlternatesCollection(placementRule.Wrappers));
-                        }
+                        predicate = filters.Aggregate(predicate, BuildPredicate);
                     }
-                }
 
-                return placement;
-            }
+                    if (!predicate(placementContext))
+                    {
+                        // Ignore rule
+                        continue;
+                    }
 
-            private static bool CheckFilter(ShapePlacementContext ctx, PlacementNode filter) => ShapePlacementParsingStrategy.CheckFilter(ctx, filter);
+                    placement ??= new PlacementInfo
+                    {
+                        Source = "OrchardCore.Placements",
+                    };
 
-            private Func<ShapePlacementContext, bool> BuildPredicate(Func<ShapePlacementContext, bool> predicate,
-                  KeyValuePair<string, object> term)
-            {
-                return ShapePlacementParsingStrategy.BuildPredicate(predicate, term, _placementNodeFilterProviders);
+                    if (!string.IsNullOrEmpty(placementRule.Location))
+                    {
+                        placement.Location = placementRule.Location;
+                    }
+
+                    if (!string.IsNullOrEmpty(placementRule.ShapeType))
+                    {
+                        placement.ShapeType = placementRule.ShapeType;
+                    }
+
+                    if (placementRule.Alternates?.Length > 0)
+                    {
+                        placement.Alternates = placement.Alternates.Combine(new AlternatesCollection(placementRule.Alternates));
+                    }
+
+                    if (placementRule.Wrappers?.Length > 0)
+                    {
+                        placement.Wrappers = placement.Wrappers.Combine(new AlternatesCollection(placementRule.Wrappers));
+                    }
+                }
             }
+
+            return placement;
+        }
+
+        private static bool CheckFilter(ShapePlacementContext ctx, PlacementNode filter) => ShapePlacementParsingStrategy.CheckFilter(ctx, filter);
+
+        private Func<ShapePlacementContext, bool> BuildPredicate(Func<ShapePlacementContext, bool> predicate,
+              KeyValuePair<string, object> term)
+        {
+            return ShapePlacementParsingStrategy.BuildPredicate(predicate, term, _placementNodeFilterProviders);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/Services/PlacementsManager.cs b/src/OrchardCore.Modules/OrchardCore.Placements/Services/PlacementsManager.cs
index ce9d47ff7d2..55d6c88177b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/Services/PlacementsManager.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/Services/PlacementsManager.cs
@@ -3,55 +3,54 @@
 using System.Threading.Tasks;
 using OrchardCore.DisplayManagement.Descriptors.ShapePlacementStrategy;
 
-namespace OrchardCore.Placements.Services
+namespace OrchardCore.Placements.Services;
+
+public sealed class PlacementsManager
 {
-    public sealed class PlacementsManager
+    private readonly IPlacementStore _placementStore;
+
+    public PlacementsManager(IPlacementStore placementStore)
     {
-        private readonly IPlacementStore _placementStore;
+        _placementStore = placementStore;
+    }
 
-        public PlacementsManager(IPlacementStore placementStore)
-        {
-            _placementStore = placementStore;
-        }
+    public async Task<IReadOnlyDictionary<string, PlacementNode[]>> ListShapePlacementsAsync()
+    {
+        var document = await _placementStore.GetPlacementsAsync();
 
-        public async Task<IReadOnlyDictionary<string, PlacementNode[]>> ListShapePlacementsAsync()
-        {
-            var document = await _placementStore.GetPlacementsAsync();
+        return document.Placements;
+    }
 
-            return document.Placements;
-        }
+    public async Task<PlacementNode[]> GetShapePlacementsAsync(string shapeType)
+    {
+        var document = await _placementStore.GetPlacementsAsync();
 
-        public async Task<PlacementNode[]> GetShapePlacementsAsync(string shapeType)
+        if (document.Placements.TryGetValue(shapeType, out var nodes))
         {
-            var document = await _placementStore.GetPlacementsAsync();
-
-            if (document.Placements.TryGetValue(shapeType, out var nodes))
-            {
-                return nodes;
-            }
-            else
-            {
-                return null;
-            }
+            return nodes;
         }
-
-        public async Task UpdateShapePlacementsAsync(string shapeType, IEnumerable<PlacementNode> placementNodes)
+        else
         {
-            var document = await _placementStore.LoadPlacementsAsync();
+            return null;
+        }
+    }
 
-            document.Placements[shapeType] = placementNodes.ToArray();
+    public async Task UpdateShapePlacementsAsync(string shapeType, IEnumerable<PlacementNode> placementNodes)
+    {
+        var document = await _placementStore.LoadPlacementsAsync();
 
-            await _placementStore.SavePlacementsAsync(document);
-        }
+        document.Placements[shapeType] = placementNodes.ToArray();
 
-        public async Task RemoveShapePlacementsAsync(string shapeType)
-        {
-            var document = await _placementStore.LoadPlacementsAsync();
+        await _placementStore.SavePlacementsAsync(document);
+    }
+
+    public async Task RemoveShapePlacementsAsync(string shapeType)
+    {
+        var document = await _placementStore.LoadPlacementsAsync();
 
-            if (document.Placements.Remove(shapeType))
-            {
-                await _placementStore.SavePlacementsAsync(document);
-            }
+        if (document.Placements.Remove(shapeType))
+        {
+            await _placementStore.SavePlacementsAsync(document);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/Settings/PlacementContentPartDefinitionDriver.cs b/src/OrchardCore.Modules/OrchardCore.Placements/Settings/PlacementContentPartDefinitionDriver.cs
index 25af5c81c26..e007ac88e50 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/Settings/PlacementContentPartDefinitionDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/Settings/PlacementContentPartDefinitionDriver.cs
@@ -6,54 +6,53 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Placements.ViewModels;
 
-namespace OrchardCore.Placements.Settings
+namespace OrchardCore.Placements.Settings;
+
+public sealed class PlacementContentPartDefinitionDriver : ContentPartDefinitionDisplayDriver
 {
-    public sealed class PlacementContentPartDefinitionDriver : ContentPartDefinitionDisplayDriver
+    internal readonly IStringLocalizer S;
+
+    public PlacementContentPartDefinitionDriver(IStringLocalizer<PlacementContentPartDefinitionDriver> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public PlacementContentPartDefinitionDriver(IStringLocalizer<PlacementContentPartDefinitionDriver> localizer)
-        {
-            S = localizer;
-        }
+    public override IDisplayResult Edit(ContentPartDefinition contentPartDefinition, BuildEditorContext context)
+    {
+        var displayName = contentPartDefinition.DisplayName();
 
-        public override IDisplayResult Edit(ContentPartDefinition contentPartDefinition, BuildEditorContext context)
+        return Initialize<ContentSettingsViewModel>("PlacementSettings", model =>
         {
-            var displayName = contentPartDefinition.DisplayName();
-
-            return Initialize<ContentSettingsViewModel>("PlacementSettings", model =>
-            {
-                model.ContentSettingsEntries.Add(
-                    new ContentSettingsEntry
-                    {
-                        ShapeType = contentPartDefinition.Name,
-                        Description = S["Placement for a {0} part", displayName]
-                    });
-
-                model.ContentSettingsEntries.Add(
-                    new ContentSettingsEntry
-                    {
-                        ShapeType = contentPartDefinition.Name,
-                        DisplayType = "Detail",
-                        Description = S["Placement for a {0} part in detail views", displayName]
-                    });
-
-                model.ContentSettingsEntries.Add(
-                    new ContentSettingsEntry
-                    {
-                        ShapeType = contentPartDefinition.Name,
-                        DisplayType = "Summary",
-                        Description = S["Placement for a {0} part in summary views", displayName]
-                    });
-
-                model.ContentSettingsEntries.Add(
-                    new ContentSettingsEntry
-                    {
-                        ShapeType = $"{contentPartDefinition.Name}_Edit",
-                        Description = S["Placement in admin editor for a {0} part", displayName]
-                    });
-
-            }).Location("Shortcuts");
-        }
+            model.ContentSettingsEntries.Add(
+                new ContentSettingsEntry
+                {
+                    ShapeType = contentPartDefinition.Name,
+                    Description = S["Placement for a {0} part", displayName]
+                });
+
+            model.ContentSettingsEntries.Add(
+                new ContentSettingsEntry
+                {
+                    ShapeType = contentPartDefinition.Name,
+                    DisplayType = "Detail",
+                    Description = S["Placement for a {0} part in detail views", displayName]
+                });
+
+            model.ContentSettingsEntries.Add(
+                new ContentSettingsEntry
+                {
+                    ShapeType = contentPartDefinition.Name,
+                    DisplayType = "Summary",
+                    Description = S["Placement for a {0} part in summary views", displayName]
+                });
+
+            model.ContentSettingsEntries.Add(
+                new ContentSettingsEntry
+                {
+                    ShapeType = $"{contentPartDefinition.Name}_Edit",
+                    Description = S["Placement in admin editor for a {0} part", displayName]
+                });
+
+        }).Location("Shortcuts");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/Settings/PlacementContentPartFieldDefinitionDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Placements/Settings/PlacementContentPartFieldDefinitionDisplayDriver.cs
index e73a44a5c67..3386b946e3b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/Settings/PlacementContentPartFieldDefinitionDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/Settings/PlacementContentPartFieldDefinitionDisplayDriver.cs
@@ -5,61 +5,60 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Placements.ViewModels;
 
-namespace OrchardCore.Placements.Settings
+namespace OrchardCore.Placements.Settings;
+
+public sealed class PlacementContentPartFieldDefinitionDisplayDriver : ContentPartFieldDefinitionDisplayDriver
 {
-    public sealed class PlacementContentPartFieldDefinitionDisplayDriver : ContentPartFieldDefinitionDisplayDriver
-    {
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public PlacementContentPartFieldDefinitionDisplayDriver(IStringLocalizer<PlacementContentTypePartDefinitionDriver> localizer)
-        {
-            S = localizer;
-        }
+    public PlacementContentPartFieldDefinitionDisplayDriver(IStringLocalizer<PlacementContentTypePartDefinitionDriver> localizer)
+    {
+        S = localizer;
+    }
 
-        public override IDisplayResult Edit(ContentPartFieldDefinition contentPartFieldDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentPartFieldDefinition contentPartFieldDefinition, BuildEditorContext context)
+    {
+        return Initialize<ContentSettingsViewModel>("PlacementSettings", model =>
         {
-            return Initialize<ContentSettingsViewModel>("PlacementSettings", model =>
-            {
-                var shapeType = contentPartFieldDefinition.FieldDefinition.Name;
-                var partName = contentPartFieldDefinition.PartDefinition.Name;
-                var differentiator = $"{contentPartFieldDefinition.PartDefinition.Name}-{contentPartFieldDefinition.Name}";
-                var displayName = contentPartFieldDefinition.DisplayName();
+            var shapeType = contentPartFieldDefinition.FieldDefinition.Name;
+            var partName = contentPartFieldDefinition.PartDefinition.Name;
+            var differentiator = $"{contentPartFieldDefinition.PartDefinition.Name}-{contentPartFieldDefinition.Name}";
+            var displayName = contentPartFieldDefinition.DisplayName();
 
-                model.ContentSettingsEntries.Add(
-                    new ContentSettingsEntry
-                    {
-                        ShapeType = shapeType,
-                        Differentiator = differentiator,
-                        Description = S["Placement for the {0} field in a {1}", displayName, partName]
-                    });
+            model.ContentSettingsEntries.Add(
+                new ContentSettingsEntry
+                {
+                    ShapeType = shapeType,
+                    Differentiator = differentiator,
+                    Description = S["Placement for the {0} field in a {1}", displayName, partName]
+                });
 
-                model.ContentSettingsEntries.Add(
-                    new ContentSettingsEntry
-                    {
-                        ShapeType = shapeType,
-                        Differentiator = differentiator,
-                        DisplayType = "Detail",
-                        Description = S["Placement for the {0} field in a {1} in detail views", displayName, partName]
-                    });
+            model.ContentSettingsEntries.Add(
+                new ContentSettingsEntry
+                {
+                    ShapeType = shapeType,
+                    Differentiator = differentiator,
+                    DisplayType = "Detail",
+                    Description = S["Placement for the {0} field in a {1} in detail views", displayName, partName]
+                });
 
-                model.ContentSettingsEntries.Add(
-                    new ContentSettingsEntry
-                    {
-                        ShapeType = shapeType,
-                        Differentiator = differentiator,
-                        DisplayType = "Summary",
-                        Description = S["Placement for the {0} field in a {1} in summary views", displayName, partName]
-                    });
+            model.ContentSettingsEntries.Add(
+                new ContentSettingsEntry
+                {
+                    ShapeType = shapeType,
+                    Differentiator = differentiator,
+                    DisplayType = "Summary",
+                    Description = S["Placement for the {0} field in a {1} in summary views", displayName, partName]
+                });
 
-                model.ContentSettingsEntries.Add(
-                    new ContentSettingsEntry
-                    {
-                        ShapeType = $"{shapeType}_Edit",
-                        Differentiator = differentiator,
-                        Description = S["Placement in admin editor for the {0} field in a {1}", displayName, partName]
-                    });
+            model.ContentSettingsEntries.Add(
+                new ContentSettingsEntry
+                {
+                    ShapeType = $"{shapeType}_Edit",
+                    Differentiator = differentiator,
+                    Description = S["Placement in admin editor for the {0} field in a {1}", displayName, partName]
+                });
 
-            }).Location("Shortcuts");
-        }
+        }).Location("Shortcuts");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/Settings/PlacementContentTypePartDefinitionDriver.cs b/src/OrchardCore.Modules/OrchardCore.Placements/Settings/PlacementContentTypePartDefinitionDriver.cs
index d197cac9fb3..8f53f8567a9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/Settings/PlacementContentTypePartDefinitionDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/Settings/PlacementContentTypePartDefinitionDriver.cs
@@ -5,60 +5,59 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Placements.ViewModels;
 
-namespace OrchardCore.Placements.Settings
+namespace OrchardCore.Placements.Settings;
+
+public sealed class PlacementContentTypePartDefinitionDriver : ContentTypePartDefinitionDisplayDriver
 {
-    public sealed class PlacementContentTypePartDefinitionDriver : ContentTypePartDefinitionDisplayDriver
-    {
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public PlacementContentTypePartDefinitionDriver(IStringLocalizer<PlacementContentTypePartDefinitionDriver> localizer)
-        {
-            S = localizer;
-        }
+    public PlacementContentTypePartDefinitionDriver(IStringLocalizer<PlacementContentTypePartDefinitionDriver> localizer)
+    {
+        S = localizer;
+    }
 
-        public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    {
+        return Initialize<ContentSettingsViewModel>("PlacementSettings", model =>
         {
-            return Initialize<ContentSettingsViewModel>("PlacementSettings", model =>
-            {
-                var contentType = contentTypePartDefinition.ContentTypeDefinition.Name;
-                var partName = contentTypePartDefinition.Name;
-                var displayName = contentTypePartDefinition.ContentTypeDefinition.DisplayName;
-
-                model.ContentSettingsEntries.Add(
-                    new ContentSettingsEntry
-                    {
-                        ShapeType = partName,
-                        ContentType = contentType,
-                        Description = S["Placement for the {0} part in a {1} type", partName, displayName]
-                    });
-
-                model.ContentSettingsEntries.Add(
-                    new ContentSettingsEntry
-                    {
-                        ShapeType = partName,
-                        ContentType = contentType,
-                        DisplayType = "Detail",
-                        Description = S["Placement for the {0} part in a {1} type in detail views", partName, displayName]
-                    });
-
-                model.ContentSettingsEntries.Add(
-                    new ContentSettingsEntry
-                    {
-                        ShapeType = partName,
-                        ContentType = contentType,
-                        DisplayType = "Summary",
-                        Description = S["Placement for the {0} part in a {1} type in summary views", partName, displayName]
-                    });
-
-                model.ContentSettingsEntries.Add(
-                    new ContentSettingsEntry
-                    {
-                        ShapeType = $"{partName}_Edit",
-                        ContentType = contentType,
-                        Description = S["Placement in admin editor for the {0} part in a {1} type", partName, displayName]
-                    });
-
-            }).Location("Shortcuts");
-        }
+            var contentType = contentTypePartDefinition.ContentTypeDefinition.Name;
+            var partName = contentTypePartDefinition.Name;
+            var displayName = contentTypePartDefinition.ContentTypeDefinition.DisplayName;
+
+            model.ContentSettingsEntries.Add(
+                new ContentSettingsEntry
+                {
+                    ShapeType = partName,
+                    ContentType = contentType,
+                    Description = S["Placement for the {0} part in a {1} type", partName, displayName]
+                });
+
+            model.ContentSettingsEntries.Add(
+                new ContentSettingsEntry
+                {
+                    ShapeType = partName,
+                    ContentType = contentType,
+                    DisplayType = "Detail",
+                    Description = S["Placement for the {0} part in a {1} type in detail views", partName, displayName]
+                });
+
+            model.ContentSettingsEntries.Add(
+                new ContentSettingsEntry
+                {
+                    ShapeType = partName,
+                    ContentType = contentType,
+                    DisplayType = "Summary",
+                    Description = S["Placement for the {0} part in a {1} type in summary views", partName, displayName]
+                });
+
+            model.ContentSettingsEntries.Add(
+                new ContentSettingsEntry
+                {
+                    ShapeType = $"{partName}_Edit",
+                    ContentType = contentType,
+                    Description = S["Placement in admin editor for the {0} part in a {1} type", partName, displayName]
+                });
+
+        }).Location("Shortcuts");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Placements/Startup.cs
index b2a041e08e6..450a8552e11 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/Startup.cs
@@ -12,45 +12,44 @@
 using OrchardCore.Recipes;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Placements
+namespace OrchardCore.Placements;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
 
-            services.TryAddScoped<IPlacementStore, DatabasePlacementsStore>();
-            services.AddScoped<PlacementsManager>();
-            services.AddScoped<IShapePlacementProvider, PlacementProvider>();
+        services.TryAddScoped<IPlacementStore, DatabasePlacementsStore>();
+        services.AddScoped<PlacementsManager>();
+        services.AddScoped<IShapePlacementProvider, PlacementProvider>();
 
-            // Shortcuts in settings
-            services.AddScoped<IContentPartDefinitionDisplayDriver, PlacementContentPartDefinitionDriver>();
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, PlacementContentTypePartDefinitionDriver>();
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, PlacementContentPartFieldDefinitionDisplayDriver>();
+        // Shortcuts in settings
+        services.AddScoped<IContentPartDefinitionDisplayDriver, PlacementContentPartDefinitionDriver>();
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, PlacementContentTypePartDefinitionDriver>();
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, PlacementContentPartFieldDefinitionDisplayDriver>();
 
-            // Recipes
-            services.AddRecipeExecutionStep<PlacementStep>();
-        }
+        // Recipes
+        services.AddRecipeExecutionStep<PlacementStep>();
     }
+}
 
-    [Feature("OrchardCore.Placements.FileStorage")]
-    public class FileContentDefinitionStartup : StartupBase
+[Feature("OrchardCore.Placements.FileStorage")]
+public class FileContentDefinitionStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.RemoveAll<IPlacementStore>();
-            services.AddScoped<IPlacementStore, FilePlacementsStore>();
-        }
+        services.RemoveAll<IPlacementStore>();
+        services.AddScoped<IPlacementStore, FilePlacementsStore>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment")]
-    public class DeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment")]
+public class DeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<PlacementsDeploymentSource, PlacementsDeploymentStep, PlacementsDeploymentStepDriver>();
-        }
+        services.AddDeployment<PlacementsDeploymentSource, PlacementsDeploymentStep, PlacementsDeploymentStepDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/ViewModels/ContentSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Placements/ViewModels/ContentSettingsViewModel.cs
index 60c4afdd19d..782232f0bf5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/ViewModels/ContentSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/ViewModels/ContentSettingsViewModel.cs
@@ -1,20 +1,19 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Placements.ViewModels
+namespace OrchardCore.Placements.ViewModels;
+
+public class ContentSettingsViewModel
 {
-    public class ContentSettingsViewModel
-    {
-        public List<ContentSettingsEntry> ContentSettingsEntries { get; set; } = [];
-    }
+    public List<ContentSettingsEntry> ContentSettingsEntries { get; set; } = [];
+}
 
-    public class ContentSettingsEntry
-    {
-        public string ShapeType { get; set; }
-        public string DisplayType { get; set; }
-        public string ContentType { get; set; }
-        public string ContentPart { get; set; }
-        public string Differentiator { get; set; }
-        public LocalizedString Description { get; set; }
-    }
+public class ContentSettingsEntry
+{
+    public string ShapeType { get; set; }
+    public string DisplayType { get; set; }
+    public string ContentType { get; set; }
+    public string ContentPart { get; set; }
+    public string Differentiator { get; set; }
+    public LocalizedString Description { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/ViewModels/EditShapePlacementViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Placements/ViewModels/EditShapePlacementViewModel.cs
index 62b93ebedd9..d850dbf0138 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/ViewModels/EditShapePlacementViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/ViewModels/EditShapePlacementViewModel.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.Placements.ViewModels
+namespace OrchardCore.Placements.ViewModels;
+
+public class EditShapePlacementViewModel
 {
-    public class EditShapePlacementViewModel
-    {
-        public bool Creating { get; set; }
+    public bool Creating { get; set; }
 
-        public string ShapeType { get; set; }
+    public string ShapeType { get; set; }
 
-        public string Nodes { get; set; }
-    }
+    public string Nodes { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/ViewModels/ListShapePlacementsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Placements/ViewModels/ListShapePlacementsViewModel.cs
index aa3709a78a3..cc83226580b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/ViewModels/ListShapePlacementsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/ViewModels/ListShapePlacementsViewModel.cs
@@ -2,31 +2,30 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.Placements.ViewModels
+namespace OrchardCore.Placements.ViewModels;
+
+public class ListShapePlacementsViewModel
 {
-    public class ListShapePlacementsViewModel
-    {
-        public IList<ShapePlacementViewModel> ShapePlacements { get; set; }
-        public dynamic Pager { get; set; }
-        public ContentOptions Options { get; set; } = new ContentOptions();
-    }
+    public IList<ShapePlacementViewModel> ShapePlacements { get; set; }
+    public dynamic Pager { get; set; }
+    public ContentOptions Options { get; set; } = new ContentOptions();
+}
 
-    public class ContentOptions
-    {
-        public string Search { get; set; }
-        public ContentsBulkAction BulkAction { get; set; }
+public class ContentOptions
+{
+    public string Search { get; set; }
+    public ContentsBulkAction BulkAction { get; set; }
 
-        #region Lists to populate
+    #region Lists to populate
 
-        [BindNever]
-        public List<SelectListItem> ContentsBulkAction { get; set; }
+    [BindNever]
+    public List<SelectListItem> ContentsBulkAction { get; set; }
 
-        #endregion Lists to populate
-    }
+    #endregion Lists to populate
+}
 
-    public enum ContentsBulkAction
-    {
-        None,
-        Remove
-    }
+public enum ContentsBulkAction
+{
+    None,
+    Remove
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Placements/ViewModels/ShapePlacementViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Placements/ViewModels/ShapePlacementViewModel.cs
index 2c8e0625ae7..c262fc3ebd4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Placements/ViewModels/ShapePlacementViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Placements/ViewModels/ShapePlacementViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Placements.ViewModels
+namespace OrchardCore.Placements.ViewModels;
+
+public class ShapePlacementViewModel
 {
-    public class ShapePlacementViewModel
-    {
-        public string ShapeType { get; set; }
-    }
+    public string ShapeType { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.PublishLater/Drivers/PublishLaterPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.PublishLater/Drivers/PublishLaterPartDisplayDriver.cs
index f0293c728e3..220ca1b07b9 100644
--- a/src/OrchardCore.Modules/OrchardCore.PublishLater/Drivers/PublishLaterPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.PublishLater/Drivers/PublishLaterPartDisplayDriver.cs
@@ -10,68 +10,67 @@
 using OrchardCore.PublishLater.Models;
 using OrchardCore.PublishLater.ViewModels;
 
-namespace OrchardCore.PublishLater.Drivers
+namespace OrchardCore.PublishLater.Drivers;
+
+public sealed class PublishLaterPartDisplayDriver : ContentPartDisplayDriver<PublishLaterPart>
 {
-    public sealed class PublishLaterPartDisplayDriver : ContentPartDisplayDriver<PublishLaterPart>
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly ILocalClock _localClock;
+
+    public PublishLaterPartDisplayDriver(
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService,
+        ILocalClock localClock)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly ILocalClock _localClock;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+        _localClock = localClock;
+    }
 
-        public PublishLaterPartDisplayDriver(
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService,
-            ILocalClock localClock)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-            _localClock = localClock;
-        }
+    public override IDisplayResult Display(PublishLaterPart part, BuildPartDisplayContext context)
+    {
+        return Initialize<PublishLaterPartViewModel>($"{nameof(PublishLaterPart)}_SummaryAdmin",
+            model => PopulateViewModel(part, model))
+            .Location("SummaryAdmin", "Meta:25");
+    }
 
-        public override IDisplayResult Display(PublishLaterPart part, BuildPartDisplayContext context)
-        {
-            return Initialize<PublishLaterPartViewModel>($"{nameof(PublishLaterPart)}_SummaryAdmin",
-                model => PopulateViewModel(part, model))
-                .Location("SummaryAdmin", "Meta:25");
-        }
+    public override IDisplayResult Edit(PublishLaterPart part, BuildPartEditorContext context)
+    {
+        return Initialize<PublishLaterPartViewModel>(GetEditorShapeType(context),
+            model => PopulateViewModel(part, model))
+        .Location("Actions:10");
+    }
 
-        public override IDisplayResult Edit(PublishLaterPart part, BuildPartEditorContext context)
-        {
-            return Initialize<PublishLaterPartViewModel>(GetEditorShapeType(context),
-                model => PopulateViewModel(part, model))
-            .Location("Actions:10");
-        }
+    public override async Task<IDisplayResult> UpdateAsync(PublishLaterPart part, UpdatePartEditorContext context)
+    {
+        var httpContext = _httpContextAccessor.HttpContext;
 
-        public override async Task<IDisplayResult> UpdateAsync(PublishLaterPart part, UpdatePartEditorContext context)
+        if (await _authorizationService.AuthorizeAsync(httpContext?.User, CommonPermissions.PublishContent, part.ContentItem))
         {
-            var httpContext = _httpContextAccessor.HttpContext;
-
-            if (await _authorizationService.AuthorizeAsync(httpContext?.User, CommonPermissions.PublishContent, part.ContentItem))
-            {
-                var viewModel = new PublishLaterPartViewModel();
+            var viewModel = new PublishLaterPartViewModel();
 
-                await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
+            await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
 
-                if (viewModel.ScheduledPublishLocalDateTime == null || httpContext.Request.Form["submit.Save"] == "submit.CancelPublishLater")
-                {
-                    part.ScheduledPublishUtc = null;
-                }
-                else
-                {
-                    part.ScheduledPublishUtc = await _localClock.ConvertToUtcAsync(viewModel.ScheduledPublishLocalDateTime.Value);
-                }
+            if (viewModel.ScheduledPublishLocalDateTime == null || httpContext.Request.Form["submit.Save"] == "submit.CancelPublishLater")
+            {
+                part.ScheduledPublishUtc = null;
+            }
+            else
+            {
+                part.ScheduledPublishUtc = await _localClock.ConvertToUtcAsync(viewModel.ScheduledPublishLocalDateTime.Value);
             }
-
-            return Edit(part, context);
         }
 
-        private async ValueTask PopulateViewModel(PublishLaterPart part, PublishLaterPartViewModel viewModel)
-        {
-            viewModel.ContentItem = part.ContentItem;
-            viewModel.ScheduledPublishUtc = part.ScheduledPublishUtc;
-            viewModel.ScheduledPublishLocalDateTime = part.ScheduledPublishUtc.HasValue ?
-                (await _localClock.ConvertToLocalAsync(part.ScheduledPublishUtc.Value)).DateTime :
-                null;
-        }
+        return Edit(part, context);
+    }
+
+    private async ValueTask PopulateViewModel(PublishLaterPart part, PublishLaterPartViewModel viewModel)
+    {
+        viewModel.ContentItem = part.ContentItem;
+        viewModel.ScheduledPublishUtc = part.ScheduledPublishUtc;
+        viewModel.ScheduledPublishLocalDateTime = part.ScheduledPublishUtc.HasValue ?
+            (await _localClock.ConvertToLocalAsync(part.ScheduledPublishUtc.Value)).DateTime :
+            null;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.PublishLater/Startup.cs b/src/OrchardCore.Modules/OrchardCore.PublishLater/Startup.cs
index cd33be08b44..434523818b2 100644
--- a/src/OrchardCore.Modules/OrchardCore.PublishLater/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.PublishLater/Startup.cs
@@ -13,28 +13,27 @@
 using OrchardCore.PublishLater.Services;
 using OrchardCore.PublishLater.ViewModels;
 
-namespace OrchardCore.PublishLater
+namespace OrchardCore.PublishLater;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<PublishLaterPartViewModel>();
-            });
+            o.MemberAccessStrategy.Register<PublishLaterPartViewModel>();
+        });
 
-            services
-                .AddContentPart<PublishLaterPart>()
-                .UseDisplayDriver<PublishLaterPartDisplayDriver>();
+        services
+            .AddContentPart<PublishLaterPart>()
+            .UseDisplayDriver<PublishLaterPartDisplayDriver>();
 
-            services.AddDataMigration<Migrations>();
+        services.AddDataMigration<Migrations>();
 
-            services.AddScoped<PublishLaterPartIndexProvider>();
-            services.AddScoped<IScopedIndexProvider>(sp => sp.GetRequiredService<PublishLaterPartIndexProvider>());
-            services.AddScoped<IContentHandler>(sp => sp.GetRequiredService<PublishLaterPartIndexProvider>());
+        services.AddScoped<PublishLaterPartIndexProvider>();
+        services.AddScoped<IScopedIndexProvider>(sp => sp.GetRequiredService<PublishLaterPartIndexProvider>());
+        services.AddScoped<IContentHandler>(sp => sp.GetRequiredService<PublishLaterPartIndexProvider>());
 
-            services.AddSingleton<IBackgroundTask, ScheduledPublishingBackgroundTask>();
-        }
+        services.AddSingleton<IBackgroundTask, ScheduledPublishingBackgroundTask>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.PublishLater/ViewModels/PublishLaterPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.PublishLater/ViewModels/PublishLaterPartViewModel.cs
index 5d01c036227..beb56aeec1f 100644
--- a/src/OrchardCore.Modules/OrchardCore.PublishLater/ViewModels/PublishLaterPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.PublishLater/ViewModels/PublishLaterPartViewModel.cs
@@ -2,15 +2,14 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.PublishLater.ViewModels
+namespace OrchardCore.PublishLater.ViewModels;
+
+public class PublishLaterPartViewModel
 {
-    public class PublishLaterPartViewModel
-    {
-        [BindNever]
-        public ContentItem ContentItem { get; set; }
+    [BindNever]
+    public ContentItem ContentItem { get; set; }
 
-        public DateTime? ScheduledPublishUtc { get; set; }
+    public DateTime? ScheduledPublishUtc { get; set; }
 
-        public DateTime? ScheduledPublishLocalDateTime { get; set; }
-    }
+    public DateTime? ScheduledPublishLocalDateTime { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Queries/AdminMenu.cs
index 2bb1b22d61f..12e40d3813c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/AdminMenu.cs
@@ -2,40 +2,39 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Queries
+namespace OrchardCore.Queries;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    internal readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
-                    .AddClass("search")
-                    .Id("search")
-                    .Add(S["Queries"], S["Queries"].PrefixPosition(), queries => queries
-                        .Add(S["All queries"], "1", allQueries => allQueries
-                        .Action("Index", "Admin", "OrchardCore.Queries")
-                        .AddClass("searchallqueries")
-                        .Id("searchallqueries")
-                        .Permission(Permissions.ManageQueries)
-                        .LocalNav()
-                    )
+        builder
+            .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
+                .AddClass("search")
+                .Id("search")
+                .Add(S["Queries"], S["Queries"].PrefixPosition(), queries => queries
+                    .Add(S["All queries"], "1", allQueries => allQueries
+                    .Action("Index", "Admin", "OrchardCore.Queries")
+                    .AddClass("searchallqueries")
+                    .Id("searchallqueries")
+                    .Permission(Permissions.ManageQueries)
+                    .LocalNav()
                 )
-            );
+            )
+        );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Controllers/AdminController.cs
index c3fb7118456..f0fe7e769f8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Controllers/AdminController.cs
@@ -19,267 +19,266 @@
 using OrchardCore.Routing;
 using YesSql.Services;
 
-namespace OrchardCore.Queries.Controllers
+namespace OrchardCore.Queries.Controllers;
+
+[Admin("Queries/{action}/{id?}", "Queries{action}")]
+public sealed class AdminController : Controller
 {
-    [Admin("Queries/{action}/{id?}", "Queries{action}")]
-    public sealed class AdminController : Controller
+    private const string _optionsSearch = "Options.Search";
+
+    private readonly IAuthorizationService _authorizationService;
+    private readonly PagerOptions _pagerOptions;
+    private readonly INotifier _notifier;
+    private readonly IServiceProvider _serviceProvider;
+    private readonly IQueryManager _queryManager;
+    private readonly IDisplayManager<Query> _displayManager;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly IShapeFactory _shapeFactory;
+
+    internal readonly IStringLocalizer S;
+    internal readonly IHtmlLocalizer H;
+
+    public AdminController(
+        IDisplayManager<Query> displayManager,
+        IAuthorizationService authorizationService,
+        IOptions<PagerOptions> pagerOptions,
+        IShapeFactory shapeFactory,
+        IStringLocalizer<AdminController> stringLocalizer,
+        IHtmlLocalizer<AdminController> htmlLocalizer,
+        INotifier notifier,
+        IQueryManager queryManager,
+        IServiceProvider serviceProvider,
+        IUpdateModelAccessor updateModelAccessor)
+    {
+        _displayManager = displayManager;
+        _authorizationService = authorizationService;
+        _pagerOptions = pagerOptions.Value;
+        _queryManager = queryManager;
+        _serviceProvider = serviceProvider;
+        _updateModelAccessor = updateModelAccessor;
+        _shapeFactory = shapeFactory;
+        _notifier = notifier;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+    }
+
+    public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
     {
-        private const string _optionsSearch = "Options.Search";
-
-        private readonly IAuthorizationService _authorizationService;
-        private readonly PagerOptions _pagerOptions;
-        private readonly INotifier _notifier;
-        private readonly IServiceProvider _serviceProvider;
-        private readonly IQueryManager _queryManager;
-        private readonly IDisplayManager<Query> _displayManager;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly IShapeFactory _shapeFactory;
-
-        internal readonly IStringLocalizer S;
-        internal readonly IHtmlLocalizer H;
-
-        public AdminController(
-            IDisplayManager<Query> displayManager,
-            IAuthorizationService authorizationService,
-            IOptions<PagerOptions> pagerOptions,
-            IShapeFactory shapeFactory,
-            IStringLocalizer<AdminController> stringLocalizer,
-            IHtmlLocalizer<AdminController> htmlLocalizer,
-            INotifier notifier,
-            IQueryManager queryManager,
-            IServiceProvider serviceProvider,
-            IUpdateModelAccessor updateModelAccessor)
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageQueries))
         {
-            _displayManager = displayManager;
-            _authorizationService = authorizationService;
-            _pagerOptions = pagerOptions.Value;
-            _queryManager = queryManager;
-            _serviceProvider = serviceProvider;
-            _updateModelAccessor = updateModelAccessor;
-            _shapeFactory = shapeFactory;
-            _notifier = notifier;
-            S = stringLocalizer;
-            H = htmlLocalizer;
+            return Forbid();
         }
 
-        public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageQueries))
-            {
-                return Forbid();
-            }
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
 
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+        // Maintain previous route data when generating page links.
+        var routeData = new RouteData();
 
-            // Maintain previous route data when generating page links.
-            var routeData = new RouteData();
+        if (!string.IsNullOrEmpty(options.Search))
+        {
+            routeData.Values.TryAdd(_optionsSearch, options.Search);
+        }
 
-            if (!string.IsNullOrEmpty(options.Search))
-            {
-                routeData.Values.TryAdd(_optionsSearch, options.Search);
-            }
+        var result = await _queryManager.PageQueriesAsync(pager.Page, pager.PageSize, new QueryContext()
+        {
+            Name = options.Search,
+        });
 
-            var result = await _queryManager.PageQueriesAsync(pager.Page, pager.PageSize, new QueryContext()
+        var model = new QueriesIndexViewModel
+        {
+            Queries = [],
+            Options = options,
+            Pager = await _shapeFactory.PagerAsync(pager, result.Count, routeData),
+            QuerySourceNames = _serviceProvider.GetServices<IQuerySource>().Select(x => x.Name).ToArray(),
+        };
+
+        foreach (var query in result.Records)
+        {
+            model.Queries.Add(new QueryEntry
             {
-                Name = options.Search,
+                Query = query,
+                Shape = await _displayManager.BuildDisplayAsync(query, _updateModelAccessor.ModelUpdater, "SummaryAdmin")
             });
+        }
 
-            var model = new QueriesIndexViewModel
-            {
-                Queries = [],
-                Options = options,
-                Pager = await _shapeFactory.PagerAsync(pager, result.Count, routeData),
-                QuerySourceNames = _serviceProvider.GetServices<IQuerySource>().Select(x => x.Name).ToArray(),
-            };
+        model.Options.ContentsBulkAction =
+        [
+            new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+        ];
 
-            foreach (var query in result.Records)
-            {
-                model.Queries.Add(new QueryEntry
-                {
-                    Query = query,
-                    Shape = await _displayManager.BuildDisplayAsync(query, _updateModelAccessor.ModelUpdater, "SummaryAdmin")
-                });
-            }
+        return View(model);
+    }
 
-            model.Options.ContentsBulkAction =
-            [
-                new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
-            ];
+    [HttpPost]
+    [ActionName(nameof(Index))]
+    [FormValueRequired("submit.Filter")]
+    public ActionResult IndexFilterPOST(QueriesIndexViewModel model)
+        => RedirectToAction(nameof(Index), new RouteValueDictionary
+        {
+            { _optionsSearch, model.Options.Search }
+        });
 
-            return View(model);
+    public async Task<IActionResult> Create(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageQueries))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        [ActionName(nameof(Index))]
-        [FormValueRequired("submit.Filter")]
-        public ActionResult IndexFilterPOST(QueriesIndexViewModel model)
-            => RedirectToAction(nameof(Index), new RouteValueDictionary
-            {
-                { _optionsSearch, model.Options.Search }
-            });
+        var query = await _queryManager.NewAsync(id);
 
-        public async Task<IActionResult> Create(string id)
+        if (query == null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageQueries))
-            {
-                return Forbid();
-            }
-
-            var query = await _queryManager.NewAsync(id);
+            return NotFound();
+        }
 
-            if (query == null)
-            {
-                return NotFound();
-            }
+        var model = new QueriesCreateViewModel
+        {
+            Editor = await _displayManager.BuildEditorAsync(query, _updateModelAccessor.ModelUpdater, true),
+            SourceName = id
+        };
 
-            var model = new QueriesCreateViewModel
-            {
-                Editor = await _displayManager.BuildEditorAsync(query, _updateModelAccessor.ModelUpdater, true),
-                SourceName = id
-            };
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost]
+    [ActionName(nameof(Create))]
+    public async Task<IActionResult> CreatePost(QueriesCreateViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageQueries))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        [ActionName(nameof(Create))]
-        public async Task<IActionResult> CreatePost(QueriesCreateViewModel model)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageQueries))
-            {
-                return Forbid();
-            }
+        var query = await _queryManager.NewAsync(model.SourceName);
 
-            var query = await _queryManager.NewAsync(model.SourceName);
+        if (query == null)
+        {
+            return NotFound();
+        }
 
-            if (query == null)
-            {
-                return NotFound();
-            }
+        var editor = await _displayManager.UpdateEditorAsync(query, _updateModelAccessor.ModelUpdater, true);
 
-            var editor = await _displayManager.UpdateEditorAsync(query, _updateModelAccessor.ModelUpdater, true);
+        if (ModelState.IsValid)
+        {
+            await _queryManager.SaveAsync(query);
 
-            if (ModelState.IsValid)
-            {
-                await _queryManager.SaveAsync(query);
+            await _notifier.SuccessAsync(H["Query created successfully."]);
 
-                await _notifier.SuccessAsync(H["Query created successfully."]);
+            return RedirectToAction(nameof(Index));
+        }
 
-                return RedirectToAction(nameof(Index));
-            }
+        // If we got this far, something failed, redisplay form.
+        model.Editor = editor;
 
-            // If we got this far, something failed, redisplay form.
-            model.Editor = editor;
+        return View(model);
+    }
 
-            return View(model);
+    public async Task<IActionResult> Edit(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageQueries))
+        {
+            return Forbid();
         }
 
-        public async Task<IActionResult> Edit(string id)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageQueries))
-            {
-                return Forbid();
-            }
+        var query = await _queryManager.GetQueryAsync(id);
 
-            var query = await _queryManager.GetQueryAsync(id);
+        if (query == null)
+        {
+            return NotFound();
+        }
 
-            if (query == null)
-            {
-                return NotFound();
-            }
+        var model = new QueriesEditViewModel
+        {
+            QueryId = id,
+            Name = query.Name,
+            Editor = await _displayManager.BuildEditorAsync(query, _updateModelAccessor.ModelUpdater, false)
+        };
 
-            var model = new QueriesEditViewModel
-            {
-                QueryId = id,
-                Name = query.Name,
-                Editor = await _displayManager.BuildEditorAsync(query, _updateModelAccessor.ModelUpdater, false)
-            };
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost]
+    [ActionName(nameof(Edit))]
+    public async Task<IActionResult> EditPost(QueriesEditViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageQueries))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        [ActionName(nameof(Edit))]
-        public async Task<IActionResult> EditPost(QueriesEditViewModel model)
+        if (string.IsNullOrEmpty(model.QueryId))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageQueries))
-            {
-                return Forbid();
-            }
+            return BadRequest();
+        }
 
-            if (string.IsNullOrEmpty(model.QueryId))
-            {
-                return BadRequest();
-            }
+        var query = await _queryManager.GetQueryAsync(model.QueryId);
 
-            var query = await _queryManager.GetQueryAsync(model.QueryId);
+        if (query == null)
+        {
+            return NotFound();
+        }
 
-            if (query == null)
-            {
-                return NotFound();
-            }
+        var editor = await _displayManager.UpdateEditorAsync(query, _updateModelAccessor.ModelUpdater, false);
 
-            var editor = await _displayManager.UpdateEditorAsync(query, _updateModelAccessor.ModelUpdater, false);
+        if (ModelState.IsValid)
+        {
+            await _queryManager.DeleteQueryAsync(model.QueryId);
+            await _queryManager.UpdateAsync(query);
+            await _notifier.SuccessAsync(H["Query updated successfully."]);
 
-            if (ModelState.IsValid)
-            {
-                await _queryManager.DeleteQueryAsync(model.QueryId);
-                await _queryManager.UpdateAsync(query);
-                await _notifier.SuccessAsync(H["Query updated successfully."]);
+            return RedirectToAction(nameof(Index));
+        }
 
-                return RedirectToAction(nameof(Index));
-            }
+        model.Editor = editor;
 
-            model.Editor = editor;
+        // If we got this far, something failed, redisplay form.
+        return View(model);
+    }
 
-            // If we got this far, something failed, redisplay form.
-            return View(model);
+    [HttpPost]
+    public async Task<IActionResult> Delete(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageQueries))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(string id)
+        if (!await _queryManager.DeleteQueryAsync(id))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageQueries))
-            {
-                return Forbid();
-            }
+            return NotFound();
+        }
 
-            if (!await _queryManager.DeleteQueryAsync(id))
-            {
-                return NotFound();
-            }
+        await _notifier.SuccessAsync(H["Query deleted successfully."]);
 
-            await _notifier.SuccessAsync(H["Query deleted successfully."]);
+        return RedirectToAction(nameof(Index));
+    }
 
-            return RedirectToAction(nameof(Index));
+    [HttpPost]
+    [ActionName(nameof(Index))]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<string> itemIds)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageQueries))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        [ActionName(nameof(Index))]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<string> itemIds)
+        if (itemIds?.Count() > 0)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageQueries))
+            switch (options.BulkAction)
             {
-                return Forbid();
+                case ContentsBulkAction.None:
+                    break;
+                case ContentsBulkAction.Remove:
+                    await _queryManager.DeleteQueryAsync(itemIds.ToArray());
+                    await _notifier.SuccessAsync(H["Queries successfully removed."]);
+                    break;
+                default:
+                    return BadRequest();
             }
-
-            if (itemIds?.Count() > 0)
-            {
-                switch (options.BulkAction)
-                {
-                    case ContentsBulkAction.None:
-                        break;
-                    case ContentsBulkAction.Remove:
-                        await _queryManager.DeleteQueryAsync(itemIds.ToArray());
-                        await _notifier.SuccessAsync(H["Queries successfully removed."]);
-                        break;
-                    default:
-                        return BadRequest();
-                }
-            }
-
-            return RedirectToAction(nameof(Index));
         }
+
+        return RedirectToAction(nameof(Index));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Controllers/QueryApiController.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Controllers/QueryApiController.cs
index 88c7e62938f..4b938cb9d86 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Controllers/QueryApiController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Controllers/QueryApiController.cs
@@ -7,60 +7,59 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
-namespace OrchardCore.Queries.Controllers
+namespace OrchardCore.Queries.Controllers;
+
+[Route("api/queries")]
+[ApiController]
+[Authorize(AuthenticationSchemes = "Api")]
+[IgnoreAntiforgeryToken]
+[AllowAnonymous]
+public sealed class QueryApiController : ControllerBase
 {
-    [Route("api/queries")]
-    [ApiController]
-    [Authorize(AuthenticationSchemes = "Api")]
-    [IgnoreAntiforgeryToken]
-    [AllowAnonymous]
-    public sealed class QueryApiController : ControllerBase
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IQueryManager _queryManager;
+
+    public QueryApiController(
+        IAuthorizationService authorizationService,
+        IQueryManager queryManager
+        )
+    {
+        _authorizationService = authorizationService;
+        _queryManager = queryManager;
+    }
+
+    [HttpPost, HttpGet]
+    [Route("{name}")]
+    public async Task<IActionResult> Query(
+        string name,
+        string parameters)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IQueryManager _queryManager;
+        var query = await _queryManager.GetQueryAsync(name);
 
-        public QueryApiController(
-            IAuthorizationService authorizationService,
-            IQueryManager queryManager
-            )
+        if (query == null)
         {
-            _authorizationService = authorizationService;
-            _queryManager = queryManager;
+            return NotFound();
         }
 
-        [HttpPost, HttpGet]
-        [Route("{name}")]
-        public async Task<IActionResult> Query(
-            string name,
-            string parameters)
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.CreatePermissionForQuery(query.Name)))
         {
-            var query = await _queryManager.GetQueryAsync(name);
-
-            if (query == null)
-            {
-                return NotFound();
-            }
-
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.CreatePermissionForQuery(query.Name)))
-            {
-                // Intentionally not returning Unauthorized as it is not usable from APIs and would
-                // expose the existence of a named query (not a concern per se).
-                return NotFound();
-            }
+            // Intentionally not returning Unauthorized as it is not usable from APIs and would
+            // expose the existence of a named query (not a concern per se).
+            return NotFound();
+        }
 
-            if (Request.Method == HttpMethods.Post && string.IsNullOrEmpty(parameters))
-            {
-                using var reader = new StreamReader(Request.Body, Encoding.UTF8);
-                parameters = await reader.ReadToEndAsync();
-            }
+        if (Request.Method == HttpMethods.Post && string.IsNullOrEmpty(parameters))
+        {
+            using var reader = new StreamReader(Request.Body, Encoding.UTF8);
+            parameters = await reader.ReadToEndAsync();
+        }
 
-            var queryParameters = !string.IsNullOrEmpty(parameters) ?
-                JConvert.DeserializeObject<Dictionary<string, object>>(parameters)
-                : [];
+        var queryParameters = !string.IsNullOrEmpty(parameters) ?
+            JConvert.DeserializeObject<Dictionary<string, object>>(parameters)
+            : [];
 
-            var result = await _queryManager.ExecuteQueryAsync(query, queryParameters);
+        var result = await _queryManager.ExecuteQueryAsync(query, queryParameters);
 
-            return new ObjectResult(result);
-        }
+        return new ObjectResult(result);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/AllQueriesDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/AllQueriesDeploymentSource.cs
index ebcb38dcb46..b31c897670d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/AllQueriesDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/AllQueriesDeploymentSource.cs
@@ -5,37 +5,36 @@
 using OrchardCore.Deployment;
 using OrchardCore.Json;
 
-namespace OrchardCore.Queries.Deployment
+namespace OrchardCore.Queries.Deployment;
+
+public class AllQueriesDeploymentSource : IDeploymentSource
 {
-    public class AllQueriesDeploymentSource : IDeploymentSource
+    private readonly IQueryManager _queryManager;
+    private readonly JsonSerializerOptions _jsonSerializerOptions;
+
+    public AllQueriesDeploymentSource(
+        IQueryManager queryManager,
+        IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions)
     {
-        private readonly IQueryManager _queryManager;
-        private readonly JsonSerializerOptions _jsonSerializerOptions;
+        _queryManager = queryManager;
+        _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
+    }
 
-        public AllQueriesDeploymentSource(
-            IQueryManager queryManager,
-            IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions)
-        {
-            _queryManager = queryManager;
-            _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
-        }
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        var allQueriesStep = step as AllQueriesDeploymentStep;
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        if (allQueriesStep == null)
         {
-            var allQueriesStep = step as AllQueriesDeploymentStep;
-
-            if (allQueriesStep == null)
-            {
-                return;
-            }
+            return;
+        }
 
-            var queries = await _queryManager.ListQueriesAsync();
+        var queries = await _queryManager.ListQueriesAsync();
 
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "Queries",
-                ["Queries"] = JArray.FromObject(queries, _jsonSerializerOptions),
-            });
-        }
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "Queries",
+            ["Queries"] = JArray.FromObject(queries, _jsonSerializerOptions),
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/AllQueriesDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/AllQueriesDeploymentStep.cs
index d8360abaa1f..5c47f5df4e5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/AllQueriesDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/AllQueriesDeploymentStep.cs
@@ -1,15 +1,14 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Queries.Deployment
+namespace OrchardCore.Queries.Deployment;
+
+/// <summary>
+/// Adds all queries to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class AllQueriesDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds all queries to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class AllQueriesDeploymentStep : DeploymentStep
+    public AllQueriesDeploymentStep()
     {
-        public AllQueriesDeploymentStep()
-        {
-            Name = "AllQueries";
-        }
+        Name = "AllQueries";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/AllQueriesDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/AllQueriesDeploymentStepDriver.cs
index 47e0159b732..2f549a70677 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/AllQueriesDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/AllQueriesDeploymentStepDriver.cs
@@ -3,22 +3,21 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Queries.Deployment
+namespace OrchardCore.Queries.Deployment;
+
+public sealed class AllQueriesDeploymentStepDriver : DisplayDriver<DeploymentStep, AllQueriesDeploymentStep>
 {
-    public sealed class AllQueriesDeploymentStepDriver : DisplayDriver<DeploymentStep, AllQueriesDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(AllQueriesDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(AllQueriesDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("AllQueriesDeploymentStep_Summary", step).Location("Summary", "Content"),
-                    View("AllQueriesDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("AllQueriesDeploymentStep_Summary", step).Location("Summary", "Content"),
+                View("AllQueriesDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(AllQueriesDeploymentStep step, BuildEditorContext context)
-        {
-            return View("AllQueriesDeploymentStep_Edit", step).Location("Content");
-        }
+    public override IDisplayResult Edit(AllQueriesDeploymentStep step, BuildEditorContext context)
+    {
+        return View("AllQueriesDeploymentStep_Edit", step).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/QueryBasedContentDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/QueryBasedContentDeploymentSource.cs
index 1f2168b6e56..954dffd3eea 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/QueryBasedContentDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/QueryBasedContentDeploymentSource.cs
@@ -5,91 +5,90 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Queries.Deployment
+namespace OrchardCore.Queries.Deployment;
+
+public class QueryBasedContentDeploymentSource : IDeploymentSource
 {
-    public class QueryBasedContentDeploymentSource : IDeploymentSource
+    private readonly IQueryManager _queryManager;
+
+    public QueryBasedContentDeploymentSource(IQueryManager queryManager)
+    {
+        _queryManager = queryManager;
+    }
+
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
     {
-        private readonly IQueryManager _queryManager;
+        var queryDeploymentStep = step as QueryBasedContentDeploymentStep;
 
-        public QueryBasedContentDeploymentSource(IQueryManager queryManager)
+        if (queryDeploymentStep == null)
         {
-            _queryManager = queryManager;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
-        {
-            var queryDeploymentStep = step as QueryBasedContentDeploymentStep;
+        var data = new JsonArray();
 
-            if (queryDeploymentStep == null)
-            {
-                return;
-            }
+        var query = await _queryManager.GetQueryAsync(queryDeploymentStep.QueryName);
 
-            var data = new JsonArray();
+        if (query == null)
+        {
+            return;
+        }
 
-            var query = await _queryManager.GetQueryAsync(queryDeploymentStep.QueryName);
+        if (!query.CanReturnContentItems || !query.ReturnContentItems)
+        {
+            return;
+        }
 
-            if (query == null)
-            {
-                return;
-            }
+        if (!TryDeserializeParameters(queryDeploymentStep.QueryParameters ?? "{ }", out var parameters))
+        {
+            return;
+        }
 
-            if (!query.CanReturnContentItems || !query.ReturnContentItems)
-            {
-                return;
-            }
+        var results = await _queryManager.ExecuteQueryAsync(query, parameters);
 
-            if (!TryDeserializeParameters(queryDeploymentStep.QueryParameters ?? "{ }", out var parameters))
-            {
-                return;
-            }
+        foreach (var contentItem in results.Items)
+        {
+            var objectData = JObject.FromObject(contentItem);
 
-            var results = await _queryManager.ExecuteQueryAsync(query, parameters);
+            // Don't serialize the Id as it could be interpreted as an updated object when added back to YesSql.
+            objectData.Remove(nameof(ContentItem.Id));
 
-            foreach (var contentItem in results.Items)
+            if (queryDeploymentStep.ExportAsSetupRecipe)
             {
-                var objectData = JObject.FromObject(contentItem);
-
-                // Don't serialize the Id as it could be interpreted as an updated object when added back to YesSql.
-                objectData.Remove(nameof(ContentItem.Id));
-
-                if (queryDeploymentStep.ExportAsSetupRecipe)
-                {
-                    objectData[nameof(ContentItem.Owner)] = "[js: parameters('AdminUserId')]";
-                    objectData[nameof(ContentItem.Author)] = "[js: parameters('AdminUsername')]";
-                    objectData[nameof(ContentItem.ContentItemId)] = "[js: uuid()]";
-                    objectData.Remove(nameof(ContentItem.ContentItemVersionId));
-                    objectData.Remove(nameof(ContentItem.CreatedUtc));
-                    objectData.Remove(nameof(ContentItem.ModifiedUtc));
-                    objectData.Remove(nameof(ContentItem.PublishedUtc));
-                }
-                data.Add(objectData);
+                objectData[nameof(ContentItem.Owner)] = "[js: parameters('AdminUserId')]";
+                objectData[nameof(ContentItem.Author)] = "[js: parameters('AdminUsername')]";
+                objectData[nameof(ContentItem.ContentItemId)] = "[js: uuid()]";
+                objectData.Remove(nameof(ContentItem.ContentItemVersionId));
+                objectData.Remove(nameof(ContentItem.CreatedUtc));
+                objectData.Remove(nameof(ContentItem.ModifiedUtc));
+                objectData.Remove(nameof(ContentItem.PublishedUtc));
             }
+            data.Add(objectData);
+        }
 
-            if (data.HasValues())
+        if (data.HasValues())
+        {
+            var jObj = new JsonObject
             {
-                var jObj = new JsonObject
-                {
-                    ["name"] = "content",
-                    ["data"] = data
-                };
+                ["name"] = "content",
+                ["data"] = data
+            };
 
-                result.Steps.Add(jObj);
-            }
+            result.Steps.Add(jObj);
         }
+    }
 
-        private static bool TryDeserializeParameters(string parameters, out Dictionary<string, object> queryParameters)
+    private static bool TryDeserializeParameters(string parameters, out Dictionary<string, object> queryParameters)
+    {
+        try
         {
-            try
-            {
-                queryParameters = JConvert.DeserializeObject<Dictionary<string, object>>(parameters) ?? [];
-                return true;
-            }
-            catch (JsonException)
-            {
-                queryParameters = [];
-                return false;
-            }
+            queryParameters = JConvert.DeserializeObject<Dictionary<string, object>>(parameters) ?? [];
+            return true;
+        }
+        catch (JsonException)
+        {
+            queryParameters = [];
+            return false;
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/QueryBasedContentDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/QueryBasedContentDeploymentStep.cs
index de2085517e3..ac1157e5f67 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/QueryBasedContentDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/QueryBasedContentDeploymentStep.cs
@@ -1,21 +1,20 @@
 using System.ComponentModel.DataAnnotations;
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Queries.Deployment
+namespace OrchardCore.Queries.Deployment;
+
+/// <summary>
+/// Adds all content items from the result of a Query to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class QueryBasedContentDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds all content items from the result of a Query to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class QueryBasedContentDeploymentStep : DeploymentStep
+    public QueryBasedContentDeploymentStep()
     {
-        public QueryBasedContentDeploymentStep()
-        {
-            Name = "QueryBasedContentDeploymentStep";
-        }
-
-        [Required]
-        public string QueryName { get; set; }
-        public string QueryParameters { get; set; }
-        public bool ExportAsSetupRecipe { get; set; }
+        Name = "QueryBasedContentDeploymentStep";
     }
+
+    [Required]
+    public string QueryName { get; set; }
+    public string QueryParameters { get; set; }
+    public bool ExportAsSetupRecipe { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/QueryBasedContentDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/QueryBasedContentDeploymentStepDriver.cs
index b733e8c4f5a..029ce6eb3d6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/QueryBasedContentDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Deployment/QueryBasedContentDeploymentStepDriver.cs
@@ -8,78 +8,77 @@
 using OrchardCore.Mvc.ModelBinding;
 using OrchardCore.Queries.ViewModels;
 
-namespace OrchardCore.Queries.Deployment
+namespace OrchardCore.Queries.Deployment;
+
+public sealed class QueryBasedContentDeploymentStepDriver : DisplayDriver<DeploymentStep, QueryBasedContentDeploymentStep>
 {
-    public sealed class QueryBasedContentDeploymentStepDriver : DisplayDriver<DeploymentStep, QueryBasedContentDeploymentStep>
+    private readonly IQueryManager _queryManager;
+
+    internal readonly IStringLocalizer S;
+
+    public QueryBasedContentDeploymentStepDriver(
+        IQueryManager queryManager,
+        IStringLocalizer<QueryBasedContentDeploymentStepDriver> stringLocalizer)
     {
-        private readonly IQueryManager _queryManager;
+        _queryManager = queryManager;
+        S = stringLocalizer;
+    }
 
-        internal readonly IStringLocalizer S;
+    public override Task<IDisplayResult> DisplayAsync(QueryBasedContentDeploymentStep step, BuildDisplayContext context)
+    {
+        return
+            CombineAsync(
+                View("QueryBasedContentDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("QueryBasedContentDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public QueryBasedContentDeploymentStepDriver(
-            IQueryManager queryManager,
-            IStringLocalizer<QueryBasedContentDeploymentStepDriver> stringLocalizer)
+    public override IDisplayResult Edit(QueryBasedContentDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<QueryBasedContentDeploymentStepViewModel>("QueryBasedContentDeploymentStep_Fields_Edit", async model =>
         {
-            _queryManager = queryManager;
-            S = stringLocalizer;
-        }
+            model.QueryName = step.QueryName;
+            model.QueryParameters = step.QueryParameters;
+            model.ExportAsSetupRecipe = step.ExportAsSetupRecipe;
+            model.Queries = await _queryManager.ListQueriesAsync(true);
+        }).Location("Content");
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(QueryBasedContentDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("QueryBasedContentDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("QueryBasedContentDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+    public override async Task<IDisplayResult> UpdateAsync(QueryBasedContentDeploymentStep step, UpdateEditorContext context)
+    {
+        var queryBasedContentViewModel = new QueryBasedContentDeploymentStepViewModel();
+        await context.Updater.TryUpdateModelAsync(queryBasedContentViewModel, Prefix,
+            viewModel => viewModel.QueryName,
+            viewModel => viewModel.QueryParameters,
+            viewModel => viewModel.ExportAsSetupRecipe);
+
+        var query = await _queryManager.GetQueryAsync(queryBasedContentViewModel.QueryName);
 
-        public override IDisplayResult Edit(QueryBasedContentDeploymentStep step, BuildEditorContext context)
+        if (!query.CanReturnContentItems || !query.ReturnContentItems)
         {
-            return Initialize<QueryBasedContentDeploymentStepViewModel>("QueryBasedContentDeploymentStep_Fields_Edit", async model =>
-            {
-                model.QueryName = step.QueryName;
-                model.QueryParameters = step.QueryParameters;
-                model.ExportAsSetupRecipe = step.ExportAsSetupRecipe;
-                model.Queries = await _queryManager.ListQueriesAsync(true);
-            }).Location("Content");
+            context.Updater.ModelState.AddModelError(Prefix, nameof(step.QueryName), S["Your Query is not returning content items."]);
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(QueryBasedContentDeploymentStep step, UpdateEditorContext context)
+        if (queryBasedContentViewModel.QueryParameters != null)
         {
-            var queryBasedContentViewModel = new QueryBasedContentDeploymentStepViewModel();
-            await context.Updater.TryUpdateModelAsync(queryBasedContentViewModel, Prefix,
-                viewModel => viewModel.QueryName,
-                viewModel => viewModel.QueryParameters,
-                viewModel => viewModel.ExportAsSetupRecipe);
-
-            var query = await _queryManager.GetQueryAsync(queryBasedContentViewModel.QueryName);
-
-            if (!query.CanReturnContentItems || !query.ReturnContentItems)
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(step.QueryName), S["Your Query is not returning content items."]);
-            }
-
-            if (queryBasedContentViewModel.QueryParameters != null)
+            try
             {
-                try
+                var parameters = JConvert.DeserializeObject<Dictionary<string, object>>(queryBasedContentViewModel.QueryParameters);
+                if (parameters == null)
                 {
-                    var parameters = JConvert.DeserializeObject<Dictionary<string, object>>(queryBasedContentViewModel.QueryParameters);
-                    if (parameters == null)
-                    {
-                        context.Updater.ModelState.AddModelError(Prefix, nameof(step.QueryParameters), S["Make sure it is a valid JSON object. Example: { key : 'value' }"]);
-                    }
-                }
-                catch (JsonException)
-                {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(step.QueryParameters), S["Something is wrong with your JSON."]);
+                    context.Updater.ModelState.AddModelError(Prefix, nameof(step.QueryParameters), S["Make sure it is a valid JSON object. Example: { key : 'value' }"]);
                 }
             }
+            catch (JsonException)
+            {
+                context.Updater.ModelState.AddModelError(Prefix, nameof(step.QueryParameters), S["Something is wrong with your JSON."]);
+            }
+        }
 
-            step.QueryName = queryBasedContentViewModel.QueryName;
-            step.ExportAsSetupRecipe = queryBasedContentViewModel.ExportAsSetupRecipe;
-            step.QueryParameters = queryBasedContentViewModel.QueryParameters;
+        step.QueryName = queryBasedContentViewModel.QueryName;
+        step.ExportAsSetupRecipe = queryBasedContentViewModel.ExportAsSetupRecipe;
+        step.QueryParameters = queryBasedContentViewModel.QueryParameters;
 
-            return Edit(step, context);
-        }
+        return Edit(step, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Drivers/QueryDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Drivers/QueryDisplayDriver.cs
index 27fbcee13e4..0c6fc5a96ef 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Drivers/QueryDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Drivers/QueryDisplayDriver.cs
@@ -6,94 +6,93 @@
 using OrchardCore.Mvc.Utilities;
 using OrchardCore.Queries.ViewModels;
 
-namespace OrchardCore.Queries.Drivers
+namespace OrchardCore.Queries.Drivers;
+
+public sealed class QueryDisplayDriver : DisplayDriver<Query>
 {
-    public sealed class QueryDisplayDriver : DisplayDriver<Query>
+    private readonly IQueryManager _queryManager;
+
+    internal readonly IStringLocalizer S;
+
+    public QueryDisplayDriver(
+        IQueryManager queryManager,
+        IStringLocalizer<QueryDisplayDriver> stringLocalizer)
     {
-        private readonly IQueryManager _queryManager;
+        _queryManager = queryManager;
+        S = stringLocalizer;
+    }
+
+    public override Task<IDisplayResult> DisplayAsync(Query query, BuildDisplayContext context)
+    {
+        return CombineAsync(
+            Dynamic("Query_Fields_SummaryAdmin", model =>
+            {
+                model.Name = query.Name;
+                model.Source = query.Source;
+                model.Schema = query.Schema;
+                model.Query = query;
+            }).Location("Content:1"),
+            Dynamic("Query_Buttons_SummaryAdmin", model =>
+            {
+                model.Name = query.Name;
+                model.Source = query.Source;
+                model.Schema = query.Schema;
+                model.Query = query;
+            }).Location("Actions:5")
+        );
+    }
 
-        internal readonly IStringLocalizer S;
+    public override Task<IDisplayResult> EditAsync(Query query, BuildEditorContext context)
+    {
+        return CombineAsync(
+            Initialize<EditQueryViewModel>("Query_Fields_Edit", model =>
+            {
+                model.Name = query.Name;
+                model.Source = query.Source;
+                model.Schema = query.Schema;
+                model.Query = query;
+            }).Location("Content:1"),
+            Initialize<EditQueryViewModel>("Query_Fields_Buttons", model =>
+            {
+                model.Name = query.Name;
+                model.Source = query.Source;
+                model.Schema = query.Schema;
+                model.Query = query;
+            }).Location("Actions:5")
+        );
+    }
 
-        public QueryDisplayDriver(
-            IQueryManager queryManager,
-            IStringLocalizer<QueryDisplayDriver> stringLocalizer)
+    public override async Task<IDisplayResult> UpdateAsync(Query model, UpdateEditorContext context)
+    {
+        await context.Updater.TryUpdateModelAsync(model, Prefix,
+            m => m.Name,
+            m => m.Source,
+            m => m.Schema);
+
+        if (string.IsNullOrEmpty(model.Name))
         {
-            _queryManager = queryManager;
-            S = stringLocalizer;
+            context.Updater.ModelState.AddModelError(Prefix, nameof(model.Name), S["Name is required"]);
         }
 
-        public override Task<IDisplayResult> DisplayAsync(Query query, BuildDisplayContext context)
+        if (!string.IsNullOrEmpty(model.Schema) && !model.Schema.IsJson())
         {
-            return CombineAsync(
-                Dynamic("Query_Fields_SummaryAdmin", model =>
-                {
-                    model.Name = query.Name;
-                    model.Source = query.Source;
-                    model.Schema = query.Schema;
-                    model.Query = query;
-                }).Location("Content:1"),
-                Dynamic("Query_Buttons_SummaryAdmin", model =>
-                {
-                    model.Name = query.Name;
-                    model.Source = query.Source;
-                    model.Schema = query.Schema;
-                    model.Query = query;
-                }).Location("Actions:5")
-            );
+            context.Updater.ModelState.AddModelError(Prefix, nameof(model.Schema), S["Invalid schema JSON supplied."]);
         }
-
-        public override Task<IDisplayResult> EditAsync(Query query, BuildEditorContext context)
+        var safeName = model.Name.ToSafeName();
+        if (string.IsNullOrEmpty(safeName) || model.Name != safeName)
         {
-            return CombineAsync(
-                Initialize<EditQueryViewModel>("Query_Fields_Edit", model =>
-                {
-                    model.Name = query.Name;
-                    model.Source = query.Source;
-                    model.Schema = query.Schema;
-                    model.Query = query;
-                }).Location("Content:1"),
-                Initialize<EditQueryViewModel>("Query_Fields_Buttons", model =>
-                {
-                    model.Name = query.Name;
-                    model.Source = query.Source;
-                    model.Schema = query.Schema;
-                    model.Query = query;
-                }).Location("Actions:5")
-            );
+            context.Updater.ModelState.AddModelError(Prefix, nameof(model.Name), S["Name contains illegal characters"]);
         }
-
-        public override async Task<IDisplayResult> UpdateAsync(Query model, UpdateEditorContext context)
+        else
         {
-            await context.Updater.TryUpdateModelAsync(model, Prefix,
-                m => m.Name,
-                m => m.Source,
-                m => m.Schema);
+            var existing = await _queryManager.GetQueryAsync(safeName);
 
-            if (string.IsNullOrEmpty(model.Name))
+            if (existing != null && existing != model)
             {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Name), S["Name is required"]);
+                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Name), S["A query with the same name already exists"]);
             }
-
-            if (!string.IsNullOrEmpty(model.Schema) && !model.Schema.IsJson())
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Schema), S["Invalid schema JSON supplied."]);
-            }
-            var safeName = model.Name.ToSafeName();
-            if (string.IsNullOrEmpty(safeName) || model.Name != safeName)
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Name), S["Name contains illegal characters"]);
-            }
-            else
-            {
-                var existing = await _queryManager.GetQueryAsync(safeName);
-
-                if (existing != null && existing != model)
-                {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(model.Name), S["A query with the same name already exists"]);
-                }
-            }
-
-            return await EditAsync(model, context);
         }
+
+        return await EditAsync(model, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Liquid/LiquidQueriesAccessor.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Liquid/LiquidQueriesAccessor.cs
index adc2334b6cc..237d103f626 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Liquid/LiquidQueriesAccessor.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Liquid/LiquidQueriesAccessor.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Liquid
+namespace OrchardCore.Liquid;
+
+/// <summary>
+/// This is a placeholder class that allows modules to extend the `Queries` property in the current Liquid scope.
+/// </summary>
+public class LiquidQueriesAccessor
 {
-    /// <summary>
-    /// This is a placeholder class that allows modules to extend the `Queries` property in the current Liquid scope.
-    /// </summary>
-    public class LiquidQueriesAccessor
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Liquid/QueryFilter.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Liquid/QueryFilter.cs
index ce52bdf98d3..9e27407b2d8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Liquid/QueryFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Liquid/QueryFilter.cs
@@ -6,38 +6,37 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Queries.Liquid
+namespace OrchardCore.Queries.Liquid;
+
+public class QueryFilter : ILiquidFilter
 {
-    public class QueryFilter : ILiquidFilter
+    private readonly IServiceProvider _serviceProvider;
+
+    public QueryFilter(IServiceProvider serviceProvider)
     {
-        private readonly IServiceProvider _serviceProvider;
+        _serviceProvider = serviceProvider;
+    }
 
-        public QueryFilter(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        var query = input.ToObjectValue() as Query;
 
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+        if (query == null)
         {
-            var query = input.ToObjectValue() as Query;
-
-            if (query == null)
-            {
-                return NilValue.Instance;
-            }
+            return NilValue.Instance;
+        }
 
-            var parameters = new Dictionary<string, object>();
+        var parameters = new Dictionary<string, object>();
 
-            foreach (var name in arguments.Names)
-            {
-                parameters.Add(name, arguments[name].ToObjectValue());
-            }
+        foreach (var name in arguments.Names)
+        {
+            parameters.Add(name, arguments[name].ToObjectValue());
+        }
 
-            var queryManager = _serviceProvider.GetRequiredService<IQueryManager>();
+        var queryManager = _serviceProvider.GetRequiredService<IQueryManager>();
 
-            var result = await queryManager.ExecuteQueryAsync(query, parameters);
+        var result = await queryManager.ExecuteQueryAsync(query, parameters);
 
-            return FluidValue.Create(result.Items, ctx.Options);
-        }
+        return FluidValue.Create(result.Items, ctx.Options);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/QueryGlobalMethodProvider.cs b/src/OrchardCore.Modules/OrchardCore.Queries/QueryGlobalMethodProvider.cs
index 467138317d0..985fb708446 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/QueryGlobalMethodProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/QueryGlobalMethodProvider.cs
@@ -3,41 +3,40 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Scripting;
 
-namespace OrchardCore.Queries
+namespace OrchardCore.Queries;
+
+public class QueryGlobalMethodProvider : IGlobalMethodProvider
 {
-    public class QueryGlobalMethodProvider : IGlobalMethodProvider
-    {
-        private readonly GlobalMethod _executeQuery;
+    private readonly GlobalMethod _executeQuery;
 
-        /// <summary>
-        /// Usage: executeQuery(name, parameters)
-        /// Ex: executeQuery("MySqlQuery", {"Owner":"bob"});.
-        /// </summary>
-        public QueryGlobalMethodProvider()
+    /// <summary>
+    /// Usage: executeQuery(name, parameters)
+    /// Ex: executeQuery("MySqlQuery", {"Owner":"bob"});.
+    /// </summary>
+    public QueryGlobalMethodProvider()
+    {
+        _executeQuery = new GlobalMethod
         {
-            _executeQuery = new GlobalMethod
+            Name = "executeQuery",
+            Method = serviceProvider => (Func<string, object, object>)((name, parameters) =>
             {
-                Name = "executeQuery",
-                Method = serviceProvider => (Func<string, object, object>)((name, parameters) =>
-                {
-                    var queryManager = serviceProvider.GetRequiredService<IQueryManager>();
-                    var query = queryManager.GetQueryAsync(name).GetAwaiter().GetResult();
+                var queryManager = serviceProvider.GetRequiredService<IQueryManager>();
+                var query = queryManager.GetQueryAsync(name).GetAwaiter().GetResult();
 
-                    if (query == null)
-                    {
-                        return null;
-                    }
+                if (query == null)
+                {
+                    return null;
+                }
 
-                    var result = queryManager.ExecuteQueryAsync(query, (IDictionary<string, object>)parameters).GetAwaiter().GetResult();
+                var result = queryManager.ExecuteQueryAsync(query, (IDictionary<string, object>)parameters).GetAwaiter().GetResult();
 
-                    return result.Items;
-                }),
-            };
-        }
+                return result.Items;
+            }),
+        };
+    }
 
-        public IEnumerable<GlobalMethod> GetMethods()
-        {
-            return [_executeQuery];
-        }
+    public IEnumerable<GlobalMethod> GetMethods()
+    {
+        return [_executeQuery];
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Recipes/QueryStep.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Recipes/QueryStep.cs
index 4bd19af3493..d24365d586f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Recipes/QueryStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Recipes/QueryStep.cs
@@ -11,89 +11,88 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Queries.Recipes
+namespace OrchardCore.Queries.Recipes;
+
+/// <summary>
+/// This recipe step creates a set of queries.
+/// </summary>
+public sealed class QueryStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step creates a set of queries.
-    /// </summary>
-    public sealed class QueryStep : IRecipeStepHandler
-    {
-        private readonly IQueryManager _queryManager;
-        private readonly JsonSerializerOptions _jsonSerializerOptions;
-        private readonly ILogger _logger;
+    private readonly IQueryManager _queryManager;
+    private readonly JsonSerializerOptions _jsonSerializerOptions;
+    private readonly ILogger _logger;
+
+    internal readonly IStringLocalizer S;
 
-        internal readonly IStringLocalizer S;
+    public QueryStep(
+        IQueryManager queryManager,
+        IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions,
+        ILogger<QueryStep> logger,
+        IStringLocalizer<QueryStep> stringLocalizer)
+    {
+        _queryManager = queryManager;
+        _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
+        _logger = logger;
+        S = stringLocalizer;
+    }
 
-        public QueryStep(
-            IQueryManager queryManager,
-            IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions,
-            ILogger<QueryStep> logger,
-            IStringLocalizer<QueryStep> stringLocalizer)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "Queries", StringComparison.OrdinalIgnoreCase))
         {
-            _queryManager = queryManager;
-            _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
-            _logger = logger;
-            S = stringLocalizer;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, "Queries", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
+        var model = context.Step.ToObject<QueryStepModel>(_jsonSerializerOptions);
 
-            var model = context.Step.ToObject<QueryStepModel>(_jsonSerializerOptions);
+        var queries = new List<Query>();
 
-            var queries = new List<Query>();
+        foreach (var token in model.Queries.Cast<JsonObject>())
+        {
+            var name = token[nameof(Query.Name)]?.GetValue<string>();
 
-            foreach (var token in model.Queries.Cast<JsonObject>())
+            if (string.IsNullOrEmpty(name))
             {
-                var name = token[nameof(Query.Name)]?.GetValue<string>();
+                context.Errors.Add(S["Query name is missing or empty. The query will not be imported."]);
 
-                if (string.IsNullOrEmpty(name))
-                {
-                    context.Errors.Add(S["Query name is missing or empty. The query will not be imported."]);
+                continue;
+            }
 
-                    continue;
-                }
+            var sourceName = token[nameof(Query.Source)]?.GetValue<string>();
 
-                var sourceName = token[nameof(Query.Source)]?.GetValue<string>();
+            if (string.IsNullOrEmpty(sourceName))
+            {
+                context.Errors.Add(S["Could not find query source value. The query '{0}' will not be imported.", name]);
 
-                if (string.IsNullOrEmpty(sourceName))
-                {
-                    context.Errors.Add(S["Could not find query source value. The query '{0}' will not be imported.", name]);
+                continue;
+            }
 
-                    continue;
-                }
+            var query = await _queryManager.GetQueryAsync(name);
 
-                var query = await _queryManager.GetQueryAsync(name);
+            if (query == null)
+            {
+                query = await _queryManager.NewAsync(sourceName, token);
 
                 if (query == null)
                 {
-                    query = await _queryManager.NewAsync(sourceName, token);
-
-                    if (query == null)
-                    {
-                        context.Errors.Add(S["Could not find query source: '{0}'. The query '{1}' will not be imported.", sourceName, name]);
-
-                        continue;
-                    }
+                    context.Errors.Add(S["Could not find query source: '{0}'. The query '{1}' will not be imported.", sourceName, name]);
 
-                    queries.Add(query);
-                }
-                else
-                {
-                    await _queryManager.UpdateAsync(query, token);
+                    continue;
                 }
-            }
 
-            await _queryManager.SaveAsync(queries.ToArray());
+                queries.Add(query);
+            }
+            else
+            {
+                await _queryManager.UpdateAsync(query, token);
+            }
         }
-    }
 
-    public sealed class QueryStepModel
-    {
-        public JsonArray Queries { get; set; }
+        await _queryManager.SaveAsync(queries.ToArray());
     }
 }
+
+public sealed class QueryStepModel
+{
+    public JsonArray Queries { get; set; }
+}
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/AdminMenu.cs
index 1efdb1e6033..bfd9bb36425 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/AdminMenu.cs
@@ -2,36 +2,35 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Queries.Sql
+namespace OrchardCore.Queries.Sql;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    internal readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Search"], search => search
-                    .Add(S["Queries"], S["Queries"].PrefixPosition(), queries => queries
-                        .Add(S["Run SQL Query"], S["Run SQL Query"].PrefixPosition(), sql => sql
-                             .Action("Query", "Admin", "OrchardCore.Queries")
-                             .Permission(Permissions.ManageSqlQueries)
-                             .LocalNav()
-                        )
+        builder
+            .Add(S["Search"], search => search
+                .Add(S["Queries"], S["Queries"].PrefixPosition(), queries => queries
+                    .Add(S["Run SQL Query"], S["Run SQL Query"].PrefixPosition(), sql => sql
+                         .Action("Query", "Admin", "OrchardCore.Queries")
+                         .Permission(Permissions.ManageSqlQueries)
+                         .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/Controllers/AdminController.cs
index e725dd18a30..eb50a9409d6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/Controllers/AdminController.cs
@@ -17,99 +17,98 @@
 using OrchardCore.Queries.Sql.ViewModels;
 using YesSql;
 
-namespace OrchardCore.Queries.Sql.Controllers
+namespace OrchardCore.Queries.Sql.Controllers;
+
+[Feature("OrchardCore.Queries.Sql")]
+public class AdminController : Controller
 {
-    [Feature("OrchardCore.Queries.Sql")]
-    public class AdminController : Controller
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IStore _store;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    protected readonly IStringLocalizer S;
+    private readonly TemplateOptions _templateOptions;
+
+    public AdminController(
+        IAuthorizationService authorizationService,
+        IStore store,
+        ILiquidTemplateManager liquidTemplateManager,
+        IStringLocalizer<AdminController> stringLocalizer,
+        IOptions<TemplateOptions> templateOptions)
+
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IStore _store;
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        protected readonly IStringLocalizer S;
-        private readonly TemplateOptions _templateOptions;
-
-        public AdminController(
-            IAuthorizationService authorizationService,
-            IStore store,
-            ILiquidTemplateManager liquidTemplateManager,
-            IStringLocalizer<AdminController> stringLocalizer,
-            IOptions<TemplateOptions> templateOptions)
+        _authorizationService = authorizationService;
+        _store = store;
+        _liquidTemplateManager = liquidTemplateManager;
+        S = stringLocalizer;
+        _templateOptions = templateOptions.Value;
+    }
 
+    [Admin("Queries/Sql/Query", "QueriesRunSql")]
+    public Task<IActionResult> Query(string query)
+    {
+        query = string.IsNullOrWhiteSpace(query) ? "" : System.Text.Encoding.UTF8.GetString(Convert.FromBase64String(query));
+        return Query(new AdminQueryViewModel
         {
-            _authorizationService = authorizationService;
-            _store = store;
-            _liquidTemplateManager = liquidTemplateManager;
-            S = stringLocalizer;
-            _templateOptions = templateOptions.Value;
-        }
+            DecodedQuery = query,
+            FactoryName = _store.Configuration.ConnectionFactory.GetType().FullName
+        });
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Query(AdminQueryViewModel model)
+    {
+        model.FactoryName = _store.Configuration.ConnectionFactory.GetType().FullName;
 
-        [Admin("Queries/Sql/Query", "QueriesRunSql")]
-        public Task<IActionResult> Query(string query)
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSqlQueries))
         {
-            query = string.IsNullOrWhiteSpace(query) ? "" : System.Text.Encoding.UTF8.GetString(Convert.FromBase64String(query));
-            return Query(new AdminQueryViewModel
-            {
-                DecodedQuery = query,
-                FactoryName = _store.Configuration.ConnectionFactory.GetType().FullName
-            });
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Query(AdminQueryViewModel model)
+        if (string.IsNullOrWhiteSpace(model.DecodedQuery))
         {
-            model.FactoryName = _store.Configuration.ConnectionFactory.GetType().FullName;
-
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSqlQueries))
-            {
-                return Forbid();
-            }
+            return View(model);
+        }
 
-            if (string.IsNullOrWhiteSpace(model.DecodedQuery))
-            {
-                return View(model);
-            }
+        if (string.IsNullOrEmpty(model.Parameters))
+        {
+            model.Parameters = "{ }";
+        }
 
-            if (string.IsNullOrEmpty(model.Parameters))
-            {
-                model.Parameters = "{ }";
-            }
+        var stopwatch = new Stopwatch();
+        stopwatch.Start();
 
-            var stopwatch = new Stopwatch();
-            stopwatch.Start();
+        var dialect = _store.Configuration.SqlDialect;
 
-            var dialect = _store.Configuration.SqlDialect;
+        var parameters = JConvert.DeserializeObject<Dictionary<string, object>>(model.Parameters);
 
-            var parameters = JConvert.DeserializeObject<Dictionary<string, object>>(model.Parameters);
+        var tokenizedQuery = await _liquidTemplateManager.RenderStringAsync(model.DecodedQuery, NullEncoder.Default, parameters.Select(x => new KeyValuePair<string, FluidValue>(x.Key, FluidValue.Create(x.Value, _templateOptions))));
 
-            var tokenizedQuery = await _liquidTemplateManager.RenderStringAsync(model.DecodedQuery, NullEncoder.Default, parameters.Select(x => new KeyValuePair<string, FluidValue>(x.Key, FluidValue.Create(x.Value, _templateOptions))));
+        if (SqlParser.TryParse(tokenizedQuery, _store.Configuration.Schema, dialect, _store.Configuration.TablePrefix, parameters, out var rawQuery, out var messages))
+        {
+            model.RawSql = rawQuery;
+            model.Parameters = JConvert.SerializeObject(parameters, JOptions.Indented);
 
-            if (SqlParser.TryParse(tokenizedQuery, _store.Configuration.Schema, dialect, _store.Configuration.TablePrefix, parameters, out var rawQuery, out var messages))
+            try
             {
-                model.RawSql = rawQuery;
-                model.Parameters = JConvert.SerializeObject(parameters, JOptions.Indented);
-
-                try
-                {
-                    await using var connection = _store.Configuration.ConnectionFactory.CreateConnection();
-                    await connection.OpenAsync();
-                    model.Documents = await connection.QueryAsync(rawQuery, parameters);
-                }
-                catch (Exception e)
-                {
-                    ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
-                }
+                await using var connection = _store.Configuration.ConnectionFactory.CreateConnection();
+                await connection.OpenAsync();
+                model.Documents = await connection.QueryAsync(rawQuery, parameters);
             }
-            else
+            catch (Exception e)
             {
-                foreach (var message in messages)
-                {
-                    ModelState.AddModelError("", message);
-                }
+                ModelState.AddModelError("", S["An error occurred while executing the SQL query: {0}", e.Message]);
             }
+        }
+        else
+        {
+            foreach (var message in messages)
+            {
+                ModelState.AddModelError("", message);
+            }
+        }
 
-            model.Elapsed = stopwatch.Elapsed;
+        model.Elapsed = stopwatch.Elapsed;
 
-            return View(model);
-        }
+        return View(model);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/Drivers/SqlQueryDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/Drivers/SqlQueryDisplayDriver.cs
index 2a1b0ccd6a4..44cd77c4adb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/Drivers/SqlQueryDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/Drivers/SqlQueryDisplayDriver.cs
@@ -7,82 +7,81 @@
 using OrchardCore.Queries.Sql.Models;
 using OrchardCore.Queries.Sql.ViewModels;
 
-namespace OrchardCore.Queries.Sql.Drivers
+namespace OrchardCore.Queries.Sql.Drivers;
+
+public sealed class SqlQueryDisplayDriver : DisplayDriver<Query>
 {
-    public sealed class SqlQueryDisplayDriver : DisplayDriver<Query>
+    internal readonly IStringLocalizer S;
+
+    public SqlQueryDisplayDriver(IStringLocalizer<SqlQueryDisplayDriver> stringLocalizer)
     {
-        internal readonly IStringLocalizer S;
+        S = stringLocalizer;
+    }
 
-        public SqlQueryDisplayDriver(IStringLocalizer<SqlQueryDisplayDriver> stringLocalizer)
+    public override IDisplayResult Display(Query query, BuildDisplayContext context)
+    {
+        if (query.Source != SqlQuerySource.SourceName)
         {
-            S = stringLocalizer;
+            return null;
         }
 
-        public override IDisplayResult Display(Query query, BuildDisplayContext context)
-        {
-            if (query.Source != SqlQuerySource.SourceName)
+        return Combine(
+            Dynamic("SqlQuery_SummaryAdmin", model =>
             {
-                return null;
-            }
+                model.Query = query;
+            }).Location("Content:5"),
+            Dynamic("SqlQuery_Buttons_SummaryAdmin", model =>
+            {
+                model.Query = query;
+            }).Location("Actions:2")
+        );
+    }
 
-            return Combine(
-                Dynamic("SqlQuery_SummaryAdmin", model =>
-                {
-                    model.Query = query;
-                }).Location("Content:5"),
-                Dynamic("SqlQuery_Buttons_SummaryAdmin", model =>
-                {
-                    model.Query = query;
-                }).Location("Actions:2")
-            );
+    public override IDisplayResult Edit(Query query, BuildEditorContext context)
+    {
+        if (query.Source != SqlQuerySource.SourceName)
+        {
+            return null;
         }
 
-        public override IDisplayResult Edit(Query query, BuildEditorContext context)
+        return Initialize<SqlQueryViewModel>("SqlQuery_Edit", async model =>
         {
-            if (query.Source != SqlQuerySource.SourceName)
+            model.ReturnDocuments = query.ReturnContentItems;
+
+            var metadata = query.As<SqlQueryMetadata>();
+            model.Query = metadata.Template;
+
+            // Extract query from the query string if we come from the main query editor.
+            if (string.IsNullOrEmpty(metadata.Template))
             {
-                return null;
+                await context.Updater.TryUpdateModelAsync(model, string.Empty, m => m.Query);
             }
+        }).Location("Content:5");
+    }
 
-            return Initialize<SqlQueryViewModel>("SqlQuery_Edit", async model =>
-            {
-                model.ReturnDocuments = query.ReturnContentItems;
+    public override async Task<IDisplayResult> UpdateAsync(Query query, UpdateEditorContext context)
+    {
+        if (query.Source != SqlQuerySource.SourceName)
+        {
+            return null;
+        }
 
-                var metadata = query.As<SqlQueryMetadata>();
-                model.Query = metadata.Template;
+        var viewModel = new SqlQueryViewModel();
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix,
+            m => m.Query,
+            m => m.ReturnDocuments);
 
-                // Extract query from the query string if we come from the main query editor.
-                if (string.IsNullOrEmpty(metadata.Template))
-                {
-                    await context.Updater.TryUpdateModelAsync(model, string.Empty, m => m.Query);
-                }
-            }).Location("Content:5");
+        if (string.IsNullOrWhiteSpace(viewModel.Query))
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Query), S["The query field is required"]);
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(Query query, UpdateEditorContext context)
+        query.ReturnContentItems = viewModel.ReturnDocuments;
+        query.Put(new SqlQueryMetadata()
         {
-            if (query.Source != SqlQuerySource.SourceName)
-            {
-                return null;
-            }
-
-            var viewModel = new SqlQueryViewModel();
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix,
-                m => m.Query,
-                m => m.ReturnDocuments);
+            Template = viewModel.Query,
+        });
 
-            if (string.IsNullOrWhiteSpace(viewModel.Query))
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Query), S["The query field is required"]);
-            }
-
-            query.ReturnContentItems = viewModel.ReturnDocuments;
-            query.Put(new SqlQueryMetadata()
-            {
-                Template = viewModel.Query,
-            });
-
-            return Edit(query, context);
-        }
+        return Edit(query, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/GraphQL/SqlQueryFieldTypeProvider.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/GraphQL/SqlQueryFieldTypeProvider.cs
index 1df672f97d8..3bf7234b706 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/GraphQL/SqlQueryFieldTypeProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/GraphQL/SqlQueryFieldTypeProvider.cs
@@ -16,210 +16,209 @@
 using OrchardCore.Entities;
 using OrchardCore.Queries.Sql.Models;
 
-namespace OrchardCore.Queries.Sql.GraphQL.Queries
+namespace OrchardCore.Queries.Sql.GraphQL.Queries;
+
+/// <summary>
+/// This implementation of <see cref="ISchemaBuilder"/> registers
+/// all SQL Queries as GraphQL queries.
+/// </summary>
+public class SqlQueryFieldTypeProvider : ISchemaBuilder
 {
-    /// <summary>
-    /// This implementation of <see cref="ISchemaBuilder"/> registers
-    /// all SQL Queries as GraphQL queries.
-    /// </summary>
-    public class SqlQueryFieldTypeProvider : ISchemaBuilder
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly ILogger _logger;
+
+    public SqlQueryFieldTypeProvider(
+        IHttpContextAccessor httpContextAccessor,
+        ILogger<SqlQueryFieldTypeProvider> logger)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly ILogger _logger;
+        _httpContextAccessor = httpContextAccessor;
+        _logger = logger;
+    }
 
-        public SqlQueryFieldTypeProvider(
-            IHttpContextAccessor httpContextAccessor,
-            ILogger<SqlQueryFieldTypeProvider> logger)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _logger = logger;
-        }
+    public Task<string> GetIdentifierAsync()
+    {
+        var queryManager = _httpContextAccessor.HttpContext.RequestServices.GetService<IQueryManager>();
 
-        public Task<string> GetIdentifierAsync()
-        {
-            var queryManager = _httpContextAccessor.HttpContext.RequestServices.GetService<IQueryManager>();
+        return queryManager.GetIdentifierAsync();
+    }
 
-            return queryManager.GetIdentifierAsync();
-        }
+    public async Task BuildAsync(ISchema schema)
+    {
+        var queryManager = _httpContextAccessor.HttpContext.RequestServices.GetService<IQueryManager>();
 
-        public async Task BuildAsync(ISchema schema)
+        var queries = await queryManager.ListQueriesBySourceAsync(SqlQuerySource.SourceName);
+
+        foreach (var query in queries)
         {
-            var queryManager = _httpContextAccessor.HttpContext.RequestServices.GetService<IQueryManager>();
+            if (string.IsNullOrWhiteSpace(query.Schema))
+            {
+                continue;
+            }
 
-            var queries = await queryManager.ListQueriesBySourceAsync(SqlQuerySource.SourceName);
+            var name = query.Name;
 
-            foreach (var query in queries)
+            try
             {
-                if (string.IsNullOrWhiteSpace(query.Schema))
+                var querySchema = JObject.Parse(query.Schema);
+                if (!querySchema.ContainsKey("type"))
                 {
+                    _logger.LogError("The Query '{Name}' schema is invalid, the 'type' property was not found.", name);
                     continue;
                 }
+                var type = querySchema["type"].ToString();
+                FieldType fieldType;
 
-                var name = query.Name;
-
-                try
-                {
-                    var querySchema = JObject.Parse(query.Schema);
-                    if (!querySchema.ContainsKey("type"))
-                    {
-                        _logger.LogError("The Query '{Name}' schema is invalid, the 'type' property was not found.", name);
-                        continue;
-                    }
-                    var type = querySchema["type"].ToString();
-                    FieldType fieldType;
+                var metadata = query.As<SqlQueryMetadata>();
 
-                    var metadata = query.As<SqlQueryMetadata>();
+                var fieldTypeName = querySchema["fieldTypeName"]?.ToString() ?? query.Name;
 
-                    var fieldTypeName = querySchema["fieldTypeName"]?.ToString() ?? query.Name;
-
-                    if (query.ReturnContentItems && type.StartsWith("ContentItem/", StringComparison.OrdinalIgnoreCase))
-                    {
-                        var contentType = type.Remove(0, 12);
-                        fieldType = BuildContentTypeFieldType(schema, contentType, query, fieldTypeName);
-                    }
-                    else
-                    {
-                        fieldType = BuildSchemaBasedFieldType(query, querySchema, fieldTypeName);
-                    }
-
-                    if (fieldType != null)
-                    {
-                        schema.Query.AddField(fieldType);
-                    }
+                if (query.ReturnContentItems && type.StartsWith("ContentItem/", StringComparison.OrdinalIgnoreCase))
+                {
+                    var contentType = type.Remove(0, 12);
+                    fieldType = BuildContentTypeFieldType(schema, contentType, query, fieldTypeName);
                 }
-                catch (Exception e)
+                else
                 {
-                    _logger.LogError(e, "The Query '{Name}' has an invalid schema.", name);
+                    fieldType = BuildSchemaBasedFieldType(query, querySchema, fieldTypeName);
                 }
+
+                if (fieldType != null)
+                {
+                    schema.Query.AddField(fieldType);
+                }
+            }
+            catch (Exception e)
+            {
+                _logger.LogError(e, "The Query '{Name}' has an invalid schema.", name);
             }
         }
+    }
 
-        private static FieldType BuildSchemaBasedFieldType(Query query, JsonNode querySchema, string fieldTypeName)
+    private static FieldType BuildSchemaBasedFieldType(Query query, JsonNode querySchema, string fieldTypeName)
+    {
+        var properties = querySchema["properties"]?.AsObject();
+        if (properties == null)
         {
-            var properties = querySchema["properties"]?.AsObject();
-            if (properties == null)
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var typeType = new ObjectGraphType<JsonObject>
-            {
-                Name = fieldTypeName
-            };
+        var typeType = new ObjectGraphType<JsonObject>
+        {
+            Name = fieldTypeName
+        };
 
-            foreach (var child in properties)
-            {
-                var name = child.Key;
-                var nameLower = name.Replace('.', '_');
-                var type = child.Value["type"].ToString();
-                var description = child.Value["description"]?.ToString();
+        foreach (var child in properties)
+        {
+            var name = child.Key;
+            var nameLower = name.Replace('.', '_');
+            var type = child.Value["type"].ToString();
+            var description = child.Value["description"]?.ToString();
 
-                if (type == "string")
+            if (type == "string")
+            {
+                var field = new FieldType()
                 {
-                    var field = new FieldType()
+                    Name = nameLower,
+                    Description = description,
+                    Type = typeof(StringGraphType),
+                    Resolver = new FuncFieldResolver<JsonObject, string>(context =>
                     {
-                        Name = nameLower,
-                        Description = description,
-                        Type = typeof(StringGraphType),
-                        Resolver = new FuncFieldResolver<JsonObject, string>(context =>
-                        {
-                            var source = context.Source;
-                            return source[context.FieldDefinition.Metadata["Name"].ToString()].ToObject<string>();
-                        }),
-                    };
-                    field.Metadata.Add("Name", name);
-                    typeType.AddField(field);
-                }
-                else if (type == "integer")
+                        var source = context.Source;
+                        return source[context.FieldDefinition.Metadata["Name"].ToString()].ToObject<string>();
+                    }),
+                };
+                field.Metadata.Add("Name", name);
+                typeType.AddField(field);
+            }
+            else if (type == "integer")
+            {
+                var field = new FieldType()
                 {
-                    var field = new FieldType()
+                    Name = nameLower,
+                    Description = description,
+                    Type = typeof(IntGraphType),
+                    Resolver = new FuncFieldResolver<JsonObject, int?>(context =>
                     {
-                        Name = nameLower,
-                        Description = description,
-                        Type = typeof(IntGraphType),
-                        Resolver = new FuncFieldResolver<JsonObject, int?>(context =>
-                        {
-                            var source = context.Source;
-                            return source[context.FieldDefinition.Metadata["Name"].ToString()].ToObject<int>();
-                        }),
-                    };
-
-                    field.Metadata.Add("Name", name);
-                    typeType.AddField(field);
-                }
-            }
+                        var source = context.Source;
+                        return source[context.FieldDefinition.Metadata["Name"].ToString()].ToObject<int>();
+                    }),
+                };
 
-            var fieldType = new FieldType
-            {
-                Arguments = new QueryArguments(
-                    new QueryArgument<StringGraphType> { Name = "parameters" }
-                ),
-
-                Name = fieldTypeName,
-                Description = "Represents the " + query.Source + " Query : " + query.Name,
-                ResolvedType = new ListGraphType(typeType),
-                Resolver = new LockedAsyncFieldResolver<object, object>(ResolveAsync),
-                Type = typeof(ListGraphType<ObjectGraphType<JsonObject>>)
-            };
-
-            async ValueTask<object> ResolveAsync(IResolveFieldContext<object> context)
-            {
-                var queryManager = context.RequestServices.GetRequiredService<IQueryManager>();
+                field.Metadata.Add("Name", name);
+                typeType.AddField(field);
+            }
+        }
 
-                var iQuery = await queryManager.GetQueryAsync(query.Name);
+        var fieldType = new FieldType
+        {
+            Arguments = new QueryArguments(
+                new QueryArgument<StringGraphType> { Name = "parameters" }
+            ),
+
+            Name = fieldTypeName,
+            Description = "Represents the " + query.Source + " Query : " + query.Name,
+            ResolvedType = new ListGraphType(typeType),
+            Resolver = new LockedAsyncFieldResolver<object, object>(ResolveAsync),
+            Type = typeof(ListGraphType<ObjectGraphType<JsonObject>>)
+        };
+
+        async ValueTask<object> ResolveAsync(IResolveFieldContext<object> context)
+        {
+            var queryManager = context.RequestServices.GetRequiredService<IQueryManager>();
 
-                var parameters = context.GetArgument<string>("parameters");
+            var iQuery = await queryManager.GetQueryAsync(query.Name);
 
-                var queryParameters = parameters != null
-                    ? JConvert.DeserializeObject<Dictionary<string, object>>(parameters)
-                    : [];
+            var parameters = context.GetArgument<string>("parameters");
 
-                var result = await queryManager.ExecuteQueryAsync(iQuery, queryParameters);
+            var queryParameters = parameters != null
+                ? JConvert.DeserializeObject<Dictionary<string, object>>(parameters)
+                : [];
 
-                return result.Items;
-            }
+            var result = await queryManager.ExecuteQueryAsync(iQuery, queryParameters);
 
-            return fieldType;
+            return result.Items;
         }
 
-        private static FieldType BuildContentTypeFieldType(ISchema schema, string contentType, Query query, string fieldTypeName)
-        {
-            var typeType = schema.Query.Fields.OfType<ContentItemsFieldType>().FirstOrDefault(x => x.Name == contentType);
-            if (typeType == null)
-            {
-                return null;
-            }
+        return fieldType;
+    }
 
-            var fieldType = new FieldType
-            {
-                Arguments = new QueryArguments(
-                    new QueryArgument<StringGraphType> { Name = "parameters" }
-                ),
-                Name = fieldTypeName,
-                Description = "Represents the " + query.Source + " Query : " + query.Name,
-                ResolvedType = typeType.ResolvedType,
-                Resolver = new LockedAsyncFieldResolver<object, object>(ResolveAsync),
-                Type = typeType.Type
-            };
-
-            async ValueTask<object> ResolveAsync(IResolveFieldContext<object> context)
-            {
-                var queryManager = context.RequestServices.GetRequiredService<IQueryManager>();
+    private static FieldType BuildContentTypeFieldType(ISchema schema, string contentType, Query query, string fieldTypeName)
+    {
+        var typeType = schema.Query.Fields.OfType<ContentItemsFieldType>().FirstOrDefault(x => x.Name == contentType);
+        if (typeType == null)
+        {
+            return null;
+        }
 
-                var iQuery = await queryManager.GetQueryAsync(query.Name);
+        var fieldType = new FieldType
+        {
+            Arguments = new QueryArguments(
+                new QueryArgument<StringGraphType> { Name = "parameters" }
+            ),
+            Name = fieldTypeName,
+            Description = "Represents the " + query.Source + " Query : " + query.Name,
+            ResolvedType = typeType.ResolvedType,
+            Resolver = new LockedAsyncFieldResolver<object, object>(ResolveAsync),
+            Type = typeType.Type
+        };
+
+        async ValueTask<object> ResolveAsync(IResolveFieldContext<object> context)
+        {
+            var queryManager = context.RequestServices.GetRequiredService<IQueryManager>();
 
-                var parameters = context.GetArgument<string>("parameters");
+            var iQuery = await queryManager.GetQueryAsync(query.Name);
 
-                var queryParameters = parameters != null
-                    ? JConvert.DeserializeObject<Dictionary<string, object>>(parameters)
-                    : [];
+            var parameters = context.GetArgument<string>("parameters");
 
-                var result = await queryManager.ExecuteQueryAsync(iQuery, queryParameters);
+            var queryParameters = parameters != null
+                ? JConvert.DeserializeObject<Dictionary<string, object>>(parameters)
+                : [];
 
-                return result.Items;
-            }
+            var result = await queryManager.ExecuteQueryAsync(iQuery, queryParameters);
 
-            return fieldType;
+            return result.Items;
         }
+
+        return fieldType;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/GraphQL/Startup.cs
index 21c3f37abbf..e2e09ab3c2f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/GraphQL/Startup.cs
@@ -3,18 +3,17 @@
 using OrchardCore.Modules;
 using OrchardCore.Queries.Sql.GraphQL.Queries;
 
-namespace OrchardCore.Queries.Sql.GraphQL
+namespace OrchardCore.Queries.Sql.GraphQL;
+
+/// <summary>
+/// These services are registered on the tenant service collection.
+/// </summary>
+[Feature("OrchardCore.Queries.Sql")]
+[RequireFeatures("OrchardCore.Apis.GraphQL")]
+public sealed class Startup : StartupBase
 {
-    /// <summary>
-    /// These services are registered on the tenant service collection.
-    /// </summary>
-    [Feature("OrchardCore.Queries.Sql")]
-    [RequireFeatures("OrchardCore.Apis.GraphQL")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSingleton<ISchemaBuilder, SqlQueryFieldTypeProvider>();
-        }
+        services.AddSingleton<ISchemaBuilder, SqlQueryFieldTypeProvider>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlGrammar.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlGrammar.cs
index eb48ec77bae..319b7a8d4b6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlGrammar.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlGrammar.cs
@@ -1,225 +1,224 @@
 using Irony.Parsing;
 
-namespace OrchardCore.Queries.Sql
+namespace OrchardCore.Queries.Sql;
+
+public class SqlGrammar : Grammar
 {
-    public class SqlGrammar : Grammar
+    public SqlGrammar() : base(false)
     {
-        public SqlGrammar() : base(false)
-        {
-            var comment = new CommentTerminal("comment", "/*", "*/");
-            var lineComment = new CommentTerminal("line_comment", "--", "\n", "\r\n");
-            NonGrammarTerminals.Add(comment);
-            NonGrammarTerminals.Add(lineComment);
-            var number = new NumberLiteral("number");
-            var string_literal = new StringLiteral("string", "'", StringOptions.AllowsDoubledQuote);
-            var Id_simple = TerminalFactory.CreateSqlExtIdentifier(this, "id_simple"); // covers normal identifiers (abc) and quoted id's ([abc d], "abc d")
-            var comma = ToTerm(",");
-            var dot = ToTerm(".");
+        var comment = new CommentTerminal("comment", "/*", "*/");
+        var lineComment = new CommentTerminal("line_comment", "--", "\n", "\r\n");
+        NonGrammarTerminals.Add(comment);
+        NonGrammarTerminals.Add(lineComment);
+        var number = new NumberLiteral("number");
+        var string_literal = new StringLiteral("string", "'", StringOptions.AllowsDoubledQuote);
+        var Id_simple = TerminalFactory.CreateSqlExtIdentifier(this, "id_simple"); // covers normal identifiers (abc) and quoted id's ([abc d], "abc d")
+        var comma = ToTerm(",");
+        var dot = ToTerm(".");
 #pragma warning disable IDE0059 // Unnecessary assignment of a value
-            var CREATE = ToTerm("CREATE");
-            var NULL = ToTerm("NULL");
+        var CREATE = ToTerm("CREATE");
+        var NULL = ToTerm("NULL");
 #pragma warning restore IDE0059 // Unnecessary assignment of a value
-            var NOT = ToTerm("NOT");
-            var ON = ToTerm("ON");
-            var SELECT = ToTerm("SELECT");
-            var FROM = ToTerm("FROM");
-            var AS = ToTerm("AS");
+        var NOT = ToTerm("NOT");
+        var ON = ToTerm("ON");
+        var SELECT = ToTerm("SELECT");
+        var FROM = ToTerm("FROM");
+        var AS = ToTerm("AS");
 #pragma warning disable IDE0059 // Unnecessary assignment of a value
-            var COUNT = ToTerm("COUNT");
+        var COUNT = ToTerm("COUNT");
 #pragma warning restore IDE0059 // Unnecessary assignment of a value
-            var JOIN = ToTerm("JOIN");
-            var BY = ToTerm("BY");
-            var TRUE = ToTerm("TRUE");
-            var FALSE = ToTerm("FALSE");
-            var AND = ToTerm("AND");
-            var OVER = ToTerm("OVER");
-            var UNION = ToTerm("UNION");
-            var ALL = ToTerm("ALL");
-            var WITH = ToTerm("WITH");
-            var CTE = TerminalFactory.CreateSqlExtIdentifier(this, "CTE");
-            var ColumnAlias = TerminalFactory.CreateSqlExtIdentifier(this, "ColumnAlias");
-            var TableAlias = TerminalFactory.CreateSqlExtIdentifier(this, "TableAlias");
-
-            // Non-terminals.
-            var Id = new NonTerminal("Id");
-            var statement = new NonTerminal("stmt");
-            var selectStatement = new NonTerminal("selectStatement");
-            var idlist = new NonTerminal("idlist");
-            var tableAliasList = new NonTerminal("tableAliasList");
-            var tableAliasItem = new NonTerminal("tableAliasItem");
-            var orderList = new NonTerminal("orderList");
-            var orderMember = new NonTerminal("orderMember");
-            var orderDirOptional = new NonTerminal("orderDirOpt");
-            var whereClauseOptional = new NonTerminal("whereClauseOpt");
-            var expression = new NonTerminal("expression");
-            var expressionList = new NonTerminal("exprList");
-            var optionalSelectRestriction = new NonTerminal("optionalSelectRestriction");
-            var selectorList = new NonTerminal("selList");
-            var fromClauseOpt = new NonTerminal("fromClauseOpt");
-            var groupClauseOpt = new NonTerminal("groupClauseOpt");
-            var havingClauseOpt = new NonTerminal("havingClauseOpt");
-            var orderClauseOpt = new NonTerminal("orderClauseOpt");
-            var limitClauseOpt = new NonTerminal("limitClauseOpt");
-            var offsetClauseOpt = new NonTerminal("offsetClauseOpt");
-            var columnItemList = new NonTerminal("columnItemList");
-            var columnItem = new NonTerminal("columnItem");
-            var columnSource = new NonTerminal("columnSource");
-            var asOpt = new NonTerminal("asOpt");
-            var tableAliasOpt = new NonTerminal("tableAliasOpt");
-            var tuple = new NonTerminal("tuple");
-            var joinChainOpt = new NonTerminal("joinChainOpt");
-            var joinStatement = new NonTerminal("joinStatement");
-            var joinKindOpt = new NonTerminal("joinKindOpt");
-            var joinConditions = new NonTerminal("joinConditions");
-            var joinCondition = new NonTerminal("joinCondition");
-            var joinConditionArgument = new NonTerminal("joinConditionArgument");
-            var term = new NonTerminal("term");
-            var unExpr = new NonTerminal("unExpr");
-            var unOp = new NonTerminal("unOp");
-            var binExpr = new NonTerminal("binExpr");
-            var binOp = new NonTerminal("binOp");
-            var betweenExpr = new NonTerminal("betweenExpr");
-            var inExpr = new NonTerminal("inExpr");
-            var parSelectStatement = new NonTerminal("parSelectStmt");
-            var notOpt = new NonTerminal("notOpt");
-            var funCall = new NonTerminal("funCall");
-            var parameter = new NonTerminal("parameter");
-            var statementLine = new NonTerminal("stmtLine");
-            var optionalSemicolon = new NonTerminal("semiOpt");
-            var statementList = new NonTerminal("stmtList");
-            var functionArguments = new NonTerminal("funArgs");
-            var boolean = new NonTerminal("boolean");
-            var overClauseOpt = new NonTerminal("overClauseOpt");
-            var overArgumentsOpt = new NonTerminal("overArgumentsOpt");
-            var overPartitionByClauseOpt = new NonTerminal("overPartitionByClauseOpt");
-            var overOrderByClauseOpt = new NonTerminal("overOrderByClauseOpt");
-            var unionStatementList = new NonTerminal("unionStmtList");
-            var unionStatement = new NonTerminal("unionStmt");
-            var unionClauseOpt = new NonTerminal("unionClauseOpt");
-            var withClauseOpt = new NonTerminal("withClauseOpt");
-            var cteList = new NonTerminal("cteList");
-            var cte = new NonTerminal("cte");
-            var cteColumnListOpt = new NonTerminal("cteColumnListOpt");
-            var columnNames = new NonTerminal("columnNames");
-            var IdColumn = new NonTerminal("IdColumn");
-            var columnAliasOpt = new NonTerminal("columnAliasOpt");
-            var IdTable = new NonTerminal("IdTable");
-            var subQuery = new NonTerminal("subQuery");
-            var tableAliasItemOrSubQuery = new NonTerminal("tableAliasItemOrSubQuery");
-            var tableAliasOrSubQueryList = new NonTerminal("tableAliasOrSubQueryList");
-
-            // BNF Rules.
-            Root = statementList;
-            unionClauseOpt.Rule = Empty | UNION | UNION + ALL;
-            unionStatement.Rule = statement + unionClauseOpt;
-            unionStatementList.Rule = MakePlusRule(unionStatementList, unionStatement);
-
-            statementLine.Rule = unionStatementList + optionalSemicolon;
-            optionalSemicolon.Rule = Empty | ";";
-            statementList.Rule = MakePlusRule(statementList, statementLine);
-
-            columnNames.Rule = MakePlusRule(columnNames, comma, Id_simple);
-            cteColumnListOpt.Rule = Empty | "(" + columnNames + ")";
-            cte.Rule = CTE + cteColumnListOpt + AS + "(" + unionStatementList + ")";
-            cteList.Rule = MakePlusRule(cteList, comma, cte);
-            withClauseOpt.Rule = Empty | WITH + cteList;
-
-            statement.Rule = withClauseOpt + selectStatement;
-
-            Id.Rule = MakePlusRule(Id, dot, Id_simple);
-            IdTable.Rule = MakePlusRule(IdTable, dot, TableAlias);
-
-            tableAliasOpt.Rule = Empty | asOpt + IdTable;
-            IdColumn.Rule = MakePlusRule(IdColumn, dot, ColumnAlias);
-            columnAliasOpt.Rule = Empty | asOpt + IdColumn;
-
-            asOpt.Rule = Empty | AS;
-
-            idlist.Rule = MakePlusRule(idlist, comma, columnSource);
-
-            tableAliasList.Rule = MakePlusRule(tableAliasList, comma, tableAliasItem);
-            tableAliasItem.Rule = Id + tableAliasOpt;
-
-            subQuery.Rule = "(" + unionStatementList + ")" + AS + TableAlias;
-            tableAliasOrSubQueryList.Rule = MakePlusRule(tableAliasOrSubQueryList, comma, tableAliasItemOrSubQuery);
-            tableAliasItemOrSubQuery.Rule = tableAliasItem | subQuery;
-
-            // Create Index.
-            orderList.Rule = MakePlusRule(orderList, comma, orderMember);
-            orderMember.Rule = Id + orderDirOptional;
-            orderDirOptional.Rule = Empty | "ASC" | "DESC";
-
-            // Select stmt.
-            selectStatement.Rule = SELECT + optionalSelectRestriction + selectorList + fromClauseOpt + whereClauseOptional +
-                              groupClauseOpt + havingClauseOpt + orderClauseOpt + limitClauseOpt + offsetClauseOpt;
-            optionalSelectRestriction.Rule = Empty | "ALL" | "DISTINCT";
-            selectorList.Rule = columnItemList | "*";
-            columnItemList.Rule = MakePlusRule(columnItemList, comma, columnItem);
-            columnItem.Rule = columnSource + columnAliasOpt;
-
-            columnSource.Rule = funCall + overClauseOpt | Id;
-            fromClauseOpt.Rule = Empty | FROM + tableAliasOrSubQueryList + joinChainOpt;
-
-            joinChainOpt.Rule = MakeStarRule(joinChainOpt, joinStatement);
-            joinStatement.Rule = joinKindOpt + JOIN + tableAliasList + ON + joinConditions;
-            joinConditions.Rule = MakePlusRule(joinConditions, AND, joinCondition);
-            joinCondition.Rule = joinConditionArgument + "=" + joinConditionArgument;
-            joinConditionArgument.Rule = Id | boolean | string_literal | number | parameter;
-            joinKindOpt.Rule = Empty | "INNER" | "LEFT" | "RIGHT";
-
-            whereClauseOptional.Rule = Empty | "WHERE" + expression;
-            groupClauseOpt.Rule = Empty | "GROUP" + BY + idlist;
-            havingClauseOpt.Rule = Empty | "HAVING" + expression;
-            orderClauseOpt.Rule = Empty | "ORDER" + BY + orderList;
-            limitClauseOpt.Rule = Empty | "LIMIT" + expression;
-            offsetClauseOpt.Rule = Empty | "OFFSET" + expression;
-
-            overPartitionByClauseOpt.Rule = Empty | "PARTITION" + BY + columnItemList;
-            overOrderByClauseOpt.Rule = Empty | "ORDER" + BY + orderList;
-            overArgumentsOpt.Rule = Empty | overPartitionByClauseOpt + overOrderByClauseOpt;
-            overClauseOpt.Rule = Empty | OVER + "(" + overArgumentsOpt + ")";
-
-            // Expression.
-            expressionList.Rule = MakePlusRule(expressionList, comma, expression);
-            expression.Rule = term | unExpr | binExpr | betweenExpr | inExpr | parameter;
-            term.Rule = Id | boolean | string_literal | number | funCall | tuple | parSelectStatement;
-            boolean.Rule = TRUE | FALSE;
-            tuple.Rule = "(" + expressionList + ")";
-            parSelectStatement.Rule = "(" + selectStatement + ")";
-            unExpr.Rule = unOp + term;
-            unOp.Rule = NOT | "+" | "-" | "~";
-            binExpr.Rule = expression + binOp + expression;
-            binOp.Rule = ToTerm("+") | "-" | "*" | "/" | "%" // Arithmetic.
-                       | "&" | "|" | "^"                     // Bit.
-                       | "=" | ">" | "<" | ">=" | "<=" | "<>" | "!=" | "!<" | "!>"
-                       | "AND" | "OR" | "LIKE" | "NOT LIKE";
-            betweenExpr.Rule = expression + notOpt + "BETWEEN" + expression + "AND" + expression;
-            inExpr.Rule = expression + notOpt + "IN" + "(" + functionArguments + ")";
-            notOpt.Rule = Empty | NOT;
-
-            // 'funCall' covers some pseudo-operators and special forms like ANY(...), SOME(...), ALL(...), EXISTS(...), IN(...).
-            funCall.Rule = Id + "(" + functionArguments + ")";
-            functionArguments.Rule = Empty | selectStatement | expressionList | "*";
-            parameter.Rule = "@" + Id | "@" + Id + ":" + term;
-
-            // Operators.
-            RegisterOperators(10, "*", "/", "%");
-            RegisterOperators(9, "+", "-");
-            RegisterOperators(8, "=", ">", "<", ">=", "<=", "<>", "!=", "!<", "!>", "LIKE", "IN");
-            RegisterOperators(7, "^", "&", "|");
-            RegisterOperators(6, NOT);
-            RegisterOperators(5, "AND");
-            RegisterOperators(4, "OR");
-
-            MarkPunctuation(",", "(", ")");
-            MarkPunctuation(asOpt, optionalSemicolon);
-
-            // Note: we cannot declare binOp as transient because it includes operators "NOT LIKE", "NOT IN" consisting of two tokens.
-            // Transient non-terminals cannot have more than one non-punctuation child nodes.
-            // Instead, we set flag InheritPrecedence on binOp , so that it inherits precedence value from it's children, and this precedence is used
-            // in conflict resolution when binOp node is sitting on the stack.
-            MarkTransient(tableAliasItemOrSubQuery, term, asOpt, tableAliasOpt, columnAliasOpt, statementLine, expression, unOp, tuple);
-            binOp.SetFlag(TermFlags.InheritPrecedence);
-        }
+        var JOIN = ToTerm("JOIN");
+        var BY = ToTerm("BY");
+        var TRUE = ToTerm("TRUE");
+        var FALSE = ToTerm("FALSE");
+        var AND = ToTerm("AND");
+        var OVER = ToTerm("OVER");
+        var UNION = ToTerm("UNION");
+        var ALL = ToTerm("ALL");
+        var WITH = ToTerm("WITH");
+        var CTE = TerminalFactory.CreateSqlExtIdentifier(this, "CTE");
+        var ColumnAlias = TerminalFactory.CreateSqlExtIdentifier(this, "ColumnAlias");
+        var TableAlias = TerminalFactory.CreateSqlExtIdentifier(this, "TableAlias");
+
+        // Non-terminals.
+        var Id = new NonTerminal("Id");
+        var statement = new NonTerminal("stmt");
+        var selectStatement = new NonTerminal("selectStatement");
+        var idlist = new NonTerminal("idlist");
+        var tableAliasList = new NonTerminal("tableAliasList");
+        var tableAliasItem = new NonTerminal("tableAliasItem");
+        var orderList = new NonTerminal("orderList");
+        var orderMember = new NonTerminal("orderMember");
+        var orderDirOptional = new NonTerminal("orderDirOpt");
+        var whereClauseOptional = new NonTerminal("whereClauseOpt");
+        var expression = new NonTerminal("expression");
+        var expressionList = new NonTerminal("exprList");
+        var optionalSelectRestriction = new NonTerminal("optionalSelectRestriction");
+        var selectorList = new NonTerminal("selList");
+        var fromClauseOpt = new NonTerminal("fromClauseOpt");
+        var groupClauseOpt = new NonTerminal("groupClauseOpt");
+        var havingClauseOpt = new NonTerminal("havingClauseOpt");
+        var orderClauseOpt = new NonTerminal("orderClauseOpt");
+        var limitClauseOpt = new NonTerminal("limitClauseOpt");
+        var offsetClauseOpt = new NonTerminal("offsetClauseOpt");
+        var columnItemList = new NonTerminal("columnItemList");
+        var columnItem = new NonTerminal("columnItem");
+        var columnSource = new NonTerminal("columnSource");
+        var asOpt = new NonTerminal("asOpt");
+        var tableAliasOpt = new NonTerminal("tableAliasOpt");
+        var tuple = new NonTerminal("tuple");
+        var joinChainOpt = new NonTerminal("joinChainOpt");
+        var joinStatement = new NonTerminal("joinStatement");
+        var joinKindOpt = new NonTerminal("joinKindOpt");
+        var joinConditions = new NonTerminal("joinConditions");
+        var joinCondition = new NonTerminal("joinCondition");
+        var joinConditionArgument = new NonTerminal("joinConditionArgument");
+        var term = new NonTerminal("term");
+        var unExpr = new NonTerminal("unExpr");
+        var unOp = new NonTerminal("unOp");
+        var binExpr = new NonTerminal("binExpr");
+        var binOp = new NonTerminal("binOp");
+        var betweenExpr = new NonTerminal("betweenExpr");
+        var inExpr = new NonTerminal("inExpr");
+        var parSelectStatement = new NonTerminal("parSelectStmt");
+        var notOpt = new NonTerminal("notOpt");
+        var funCall = new NonTerminal("funCall");
+        var parameter = new NonTerminal("parameter");
+        var statementLine = new NonTerminal("stmtLine");
+        var optionalSemicolon = new NonTerminal("semiOpt");
+        var statementList = new NonTerminal("stmtList");
+        var functionArguments = new NonTerminal("funArgs");
+        var boolean = new NonTerminal("boolean");
+        var overClauseOpt = new NonTerminal("overClauseOpt");
+        var overArgumentsOpt = new NonTerminal("overArgumentsOpt");
+        var overPartitionByClauseOpt = new NonTerminal("overPartitionByClauseOpt");
+        var overOrderByClauseOpt = new NonTerminal("overOrderByClauseOpt");
+        var unionStatementList = new NonTerminal("unionStmtList");
+        var unionStatement = new NonTerminal("unionStmt");
+        var unionClauseOpt = new NonTerminal("unionClauseOpt");
+        var withClauseOpt = new NonTerminal("withClauseOpt");
+        var cteList = new NonTerminal("cteList");
+        var cte = new NonTerminal("cte");
+        var cteColumnListOpt = new NonTerminal("cteColumnListOpt");
+        var columnNames = new NonTerminal("columnNames");
+        var IdColumn = new NonTerminal("IdColumn");
+        var columnAliasOpt = new NonTerminal("columnAliasOpt");
+        var IdTable = new NonTerminal("IdTable");
+        var subQuery = new NonTerminal("subQuery");
+        var tableAliasItemOrSubQuery = new NonTerminal("tableAliasItemOrSubQuery");
+        var tableAliasOrSubQueryList = new NonTerminal("tableAliasOrSubQueryList");
+
+        // BNF Rules.
+        Root = statementList;
+        unionClauseOpt.Rule = Empty | UNION | UNION + ALL;
+        unionStatement.Rule = statement + unionClauseOpt;
+        unionStatementList.Rule = MakePlusRule(unionStatementList, unionStatement);
+
+        statementLine.Rule = unionStatementList + optionalSemicolon;
+        optionalSemicolon.Rule = Empty | ";";
+        statementList.Rule = MakePlusRule(statementList, statementLine);
+
+        columnNames.Rule = MakePlusRule(columnNames, comma, Id_simple);
+        cteColumnListOpt.Rule = Empty | "(" + columnNames + ")";
+        cte.Rule = CTE + cteColumnListOpt + AS + "(" + unionStatementList + ")";
+        cteList.Rule = MakePlusRule(cteList, comma, cte);
+        withClauseOpt.Rule = Empty | WITH + cteList;
+
+        statement.Rule = withClauseOpt + selectStatement;
+
+        Id.Rule = MakePlusRule(Id, dot, Id_simple);
+        IdTable.Rule = MakePlusRule(IdTable, dot, TableAlias);
+
+        tableAliasOpt.Rule = Empty | asOpt + IdTable;
+        IdColumn.Rule = MakePlusRule(IdColumn, dot, ColumnAlias);
+        columnAliasOpt.Rule = Empty | asOpt + IdColumn;
+
+        asOpt.Rule = Empty | AS;
+
+        idlist.Rule = MakePlusRule(idlist, comma, columnSource);
+
+        tableAliasList.Rule = MakePlusRule(tableAliasList, comma, tableAliasItem);
+        tableAliasItem.Rule = Id + tableAliasOpt;
+
+        subQuery.Rule = "(" + unionStatementList + ")" + AS + TableAlias;
+        tableAliasOrSubQueryList.Rule = MakePlusRule(tableAliasOrSubQueryList, comma, tableAliasItemOrSubQuery);
+        tableAliasItemOrSubQuery.Rule = tableAliasItem | subQuery;
+
+        // Create Index.
+        orderList.Rule = MakePlusRule(orderList, comma, orderMember);
+        orderMember.Rule = Id + orderDirOptional;
+        orderDirOptional.Rule = Empty | "ASC" | "DESC";
+
+        // Select stmt.
+        selectStatement.Rule = SELECT + optionalSelectRestriction + selectorList + fromClauseOpt + whereClauseOptional +
+                          groupClauseOpt + havingClauseOpt + orderClauseOpt + limitClauseOpt + offsetClauseOpt;
+        optionalSelectRestriction.Rule = Empty | "ALL" | "DISTINCT";
+        selectorList.Rule = columnItemList | "*";
+        columnItemList.Rule = MakePlusRule(columnItemList, comma, columnItem);
+        columnItem.Rule = columnSource + columnAliasOpt;
+
+        columnSource.Rule = funCall + overClauseOpt | Id;
+        fromClauseOpt.Rule = Empty | FROM + tableAliasOrSubQueryList + joinChainOpt;
+
+        joinChainOpt.Rule = MakeStarRule(joinChainOpt, joinStatement);
+        joinStatement.Rule = joinKindOpt + JOIN + tableAliasList + ON + joinConditions;
+        joinConditions.Rule = MakePlusRule(joinConditions, AND, joinCondition);
+        joinCondition.Rule = joinConditionArgument + "=" + joinConditionArgument;
+        joinConditionArgument.Rule = Id | boolean | string_literal | number | parameter;
+        joinKindOpt.Rule = Empty | "INNER" | "LEFT" | "RIGHT";
+
+        whereClauseOptional.Rule = Empty | "WHERE" + expression;
+        groupClauseOpt.Rule = Empty | "GROUP" + BY + idlist;
+        havingClauseOpt.Rule = Empty | "HAVING" + expression;
+        orderClauseOpt.Rule = Empty | "ORDER" + BY + orderList;
+        limitClauseOpt.Rule = Empty | "LIMIT" + expression;
+        offsetClauseOpt.Rule = Empty | "OFFSET" + expression;
+
+        overPartitionByClauseOpt.Rule = Empty | "PARTITION" + BY + columnItemList;
+        overOrderByClauseOpt.Rule = Empty | "ORDER" + BY + orderList;
+        overArgumentsOpt.Rule = Empty | overPartitionByClauseOpt + overOrderByClauseOpt;
+        overClauseOpt.Rule = Empty | OVER + "(" + overArgumentsOpt + ")";
+
+        // Expression.
+        expressionList.Rule = MakePlusRule(expressionList, comma, expression);
+        expression.Rule = term | unExpr | binExpr | betweenExpr | inExpr | parameter;
+        term.Rule = Id | boolean | string_literal | number | funCall | tuple | parSelectStatement;
+        boolean.Rule = TRUE | FALSE;
+        tuple.Rule = "(" + expressionList + ")";
+        parSelectStatement.Rule = "(" + selectStatement + ")";
+        unExpr.Rule = unOp + term;
+        unOp.Rule = NOT | "+" | "-" | "~";
+        binExpr.Rule = expression + binOp + expression;
+        binOp.Rule = ToTerm("+") | "-" | "*" | "/" | "%" // Arithmetic.
+                   | "&" | "|" | "^"                     // Bit.
+                   | "=" | ">" | "<" | ">=" | "<=" | "<>" | "!=" | "!<" | "!>"
+                   | "AND" | "OR" | "LIKE" | "NOT LIKE";
+        betweenExpr.Rule = expression + notOpt + "BETWEEN" + expression + "AND" + expression;
+        inExpr.Rule = expression + notOpt + "IN" + "(" + functionArguments + ")";
+        notOpt.Rule = Empty | NOT;
+
+        // 'funCall' covers some pseudo-operators and special forms like ANY(...), SOME(...), ALL(...), EXISTS(...), IN(...).
+        funCall.Rule = Id + "(" + functionArguments + ")";
+        functionArguments.Rule = Empty | selectStatement | expressionList | "*";
+        parameter.Rule = "@" + Id | "@" + Id + ":" + term;
+
+        // Operators.
+        RegisterOperators(10, "*", "/", "%");
+        RegisterOperators(9, "+", "-");
+        RegisterOperators(8, "=", ">", "<", ">=", "<=", "<>", "!=", "!<", "!>", "LIKE", "IN");
+        RegisterOperators(7, "^", "&", "|");
+        RegisterOperators(6, NOT);
+        RegisterOperators(5, "AND");
+        RegisterOperators(4, "OR");
+
+        MarkPunctuation(",", "(", ")");
+        MarkPunctuation(asOpt, optionalSemicolon);
+
+        // Note: we cannot declare binOp as transient because it includes operators "NOT LIKE", "NOT IN" consisting of two tokens.
+        // Transient non-terminals cannot have more than one non-punctuation child nodes.
+        // Instead, we set flag InheritPrecedence on binOp , so that it inherits precedence value from it's children, and this precedence is used
+        // in conflict resolution when binOp node is sitting on the stack.
+        MarkTransient(tableAliasItemOrSubQuery, term, asOpt, tableAliasOpt, columnAliasOpt, statementLine, expression, unOp, tuple);
+        binOp.SetFlag(TermFlags.InheritPrecedence);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlParser.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlParser.cs
index 0445e0eee45..92323b2b927 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlParser.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlParser.cs
@@ -5,728 +5,712 @@
 using Irony.Parsing;
 using YesSql;
 
-namespace OrchardCore.Queries.Sql
+namespace OrchardCore.Queries.Sql;
+
+public class SqlParser
 {
-    public class SqlParser
+    private readonly string _schema;
+
+    private StringBuilder _builder;
+    private readonly IDictionary<string, object> _parameters;
+    private readonly ISqlDialect _dialect;
+    private readonly string _tablePrefix;
+    private HashSet<string> _tableAliases;
+    private HashSet<string> _ctes;
+    private readonly ParseTree _tree;
+    private static readonly LanguageData _language = new(new SqlGrammar());
+    private readonly Stack<FormattingModes> _modes;
+
+    private string _limit;
+    private string _offset;
+    private string _select;
+    private string _from;
+    private string _where;
+    private string _having;
+    private string _groupBy;
+    private string _orderBy;
+
+    private SqlParser(
+        ParseTree tree,
+        string schema,
+        ISqlDialect dialect,
+        string tablePrefix,
+        IDictionary<string, object> parameters)
     {
-        private readonly string _schema;
-
-        private StringBuilder _builder;
-        private readonly IDictionary<string, object> _parameters;
-        private readonly ISqlDialect _dialect;
-        private readonly string _tablePrefix;
-        private HashSet<string> _tableAliases;
-        private HashSet<string> _ctes;
-        private readonly ParseTree _tree;
-        private static readonly LanguageData _language = new(new SqlGrammar());
-        private readonly Stack<FormattingModes> _modes;
-
-        private string _limit;
-        private string _offset;
-        private string _select;
-        private string _from;
-        private string _where;
-        private string _having;
-        private string _groupBy;
-        private string _orderBy;
-
-        private SqlParser(
-            ParseTree tree,
-            string schema,
-            ISqlDialect dialect,
-            string tablePrefix,
-            IDictionary<string, object> parameters)
-        {
-            _tree = tree;
-            _schema = schema;
-            _dialect = dialect;
-            _tablePrefix = tablePrefix;
-            _parameters = parameters;
-            _builder = new StringBuilder(tree.SourceText.Length);
-            _modes = new Stack<FormattingModes>();
-        }
-
-        public static bool TryParse(string sql, string schema, ISqlDialect dialect, string tablePrefix, IDictionary<string, object> parameters, out string query, out IEnumerable<string> messages)
-        {
-            try
-            {
-                var tree = new Parser(_language).Parse(sql);
-
-                if (tree.HasErrors())
-                {
-                    query = null;
-
-                    messages = tree
-                        .ParserMessages
-                        .Select(x => $"{x.Message} at line:{x.Location.Line}, col:{x.Location.Column}")
-                        .ToArray();
-
-                    return false;
-                }
-
-                var sqlParser = new SqlParser(tree, schema, dialect, tablePrefix, parameters);
-                query = sqlParser.Evaluate();
+        _tree = tree;
+        _schema = schema;
+        _dialect = dialect;
+        _tablePrefix = tablePrefix;
+        _parameters = parameters;
+        _builder = new StringBuilder(tree.SourceText.Length);
+        _modes = new Stack<FormattingModes>();
+    }
 
-                messages = Array.Empty<string>();
+    public static bool TryParse(string sql, string schema, ISqlDialect dialect, string tablePrefix, IDictionary<string, object> parameters, out string query, out IEnumerable<string> messages)
+    {
+        try
+        {
+            var tree = new Parser(_language).Parse(sql);
 
-                return true;
-            }
-            catch (SqlParserException se)
+            if (tree.HasErrors())
             {
                 query = null;
-                messages = new string[] { se.Message };
-            }
-            catch (Exception e)
-            {
-                query = null;
-                messages = new string[] { "Unexpected error: " + e.Message };
-            }
 
-            return false;
-        }
+                messages = tree
+                    .ParserMessages
+                    .Select(x => $"{x.Message} at line:{x.Location.Line}, col:{x.Location.Column}")
+                    .ToArray();
 
-        private string Evaluate()
-        {
-            PopulateAliases(_tree);
-            PopulateCteNames(_tree);
-            var statementList = _tree.Root;
-
-            var statementsBuilder = new StringBuilder();
-
-            foreach (var unionStatementList in statementList.ChildNodes)
-            {
-                EvaluateStatementList(statementsBuilder, unionStatementList, true);
+                return false;
             }
 
-            statementsBuilder.Append(';');
+            var sqlParser = new SqlParser(tree, schema, dialect, tablePrefix, parameters);
+            query = sqlParser.Evaluate();
 
-            return statementsBuilder.ToString();
-        }
+            messages = Array.Empty<string>();
 
-        private void PopulateAliases(ParseTree tree)
+            return true;
+        }
+        catch (SqlParserException se)
         {
-            // In order to determine if an Id is a table name or an alias, we
-            // analyze every Alias and store the value.
-
-            _tableAliases = [];
-
-            for (var i = 0; i < tree.Tokens.Count; i++)
-            {
-                if (tree.Tokens[i].Terminal.Name == "TableAlias")
-                {
-                    _tableAliases.Add(tree.Tokens[i].ValueString);
-                }
-            }
+            query = null;
+            messages = new string[] { se.Message };
         }
-
-        private void PopulateCteNames(ParseTree tree)
+        catch (Exception e)
         {
-            _ctes = [];
-
-            for (var i = 0; i < tree.Tokens.Count; i++)
-            {
-                if (tree.Tokens[i].Terminal.Name == "CTE")
-                {
-                    _ctes.Add(tree.Tokens[i].ValueString);
-                }
-            }
+            query = null;
+            messages = new string[] { "Unexpected error: " + e.Message };
         }
 
-        private string EvaluateSelectStatement(ParseTreeNode selectStatement)
-        {
-            ClearSelectStatement();
+        return false;
+    }
 
-            var previousContent = _builder.Length > 0 ? _builder.ToString() : null;
-            _builder.Clear();
+    private string Evaluate()
+    {
+        PopulateAliases(_tree);
+        PopulateCteNames(_tree);
+        var statementList = _tree.Root;
 
-            var sqlBuilder = _dialect.CreateBuilder(_tablePrefix);
+        var statementsBuilder = new StringBuilder();
 
-            EvaluateSelectRestriction(selectStatement.ChildNodes[1]);
-            EvaluateSelectorList(selectStatement.ChildNodes[2]);
+        foreach (var unionStatementList in statementList.ChildNodes)
+        {
+            EvaluateStatementList(statementsBuilder, unionStatementList, true);
+        }
 
-            sqlBuilder.Select();
-            sqlBuilder.Selector(_select);
+        statementsBuilder.Append(';');
 
-            EvaluateFromClause(selectStatement.ChildNodes[3]);
+        return statementsBuilder.ToString();
+    }
 
-            if (!string.IsNullOrEmpty(_from))
-            {
-                sqlBuilder.From(_from);
-            }
+    private void PopulateAliases(ParseTree tree)
+    {
+        // In order to determine if an Id is a table name or an alias, we
+        // analyze every Alias and store the value.
 
-            EvaluateWhereClause(selectStatement.ChildNodes[4]);
+        _tableAliases = [];
 
-            if (!string.IsNullOrEmpty(_where))
+        for (var i = 0; i < tree.Tokens.Count; i++)
+        {
+            if (tree.Tokens[i].Terminal.Name == "TableAlias")
             {
-                sqlBuilder.WhereAnd(_where);
+                _tableAliases.Add(tree.Tokens[i].ValueString);
             }
+        }
+    }
 
-            EvaluateGroupClause(selectStatement.ChildNodes[5]);
+    private void PopulateCteNames(ParseTree tree)
+    {
+        _ctes = [];
 
-            if (!string.IsNullOrEmpty(_groupBy))
+        for (var i = 0; i < tree.Tokens.Count; i++)
+        {
+            if (tree.Tokens[i].Terminal.Name == "CTE")
             {
-                sqlBuilder.GroupBy(_groupBy);
+                _ctes.Add(tree.Tokens[i].ValueString);
             }
+        }
+    }
 
-            EvaluateHavingClause(selectStatement.ChildNodes[6]);
+    private string EvaluateSelectStatement(ParseTreeNode selectStatement)
+    {
+        ClearSelectStatement();
 
-            if (!string.IsNullOrEmpty(_having))
-            {
-                sqlBuilder.Having(_having);
-            }
+        var previousContent = _builder.Length > 0 ? _builder.ToString() : null;
+        _builder.Clear();
 
-            EvaluateOrderClause(selectStatement.ChildNodes[7]);
+        var sqlBuilder = _dialect.CreateBuilder(_tablePrefix);
 
-            if (!string.IsNullOrEmpty(_orderBy))
-            {
-                sqlBuilder.OrderBy(_orderBy);
-            }
+        EvaluateSelectRestriction(selectStatement.ChildNodes[1]);
+        EvaluateSelectorList(selectStatement.ChildNodes[2]);
 
-            EvaluateLimitClause(selectStatement.ChildNodes[8]);
+        sqlBuilder.Select();
+        sqlBuilder.Selector(_select);
 
-            if (!string.IsNullOrEmpty(_limit))
-            {
-                sqlBuilder.Take(_limit);
-            }
+        EvaluateFromClause(selectStatement.ChildNodes[3]);
 
-            EvaluateOffsetClause(selectStatement.ChildNodes[9]);
+        if (!string.IsNullOrEmpty(_from))
+        {
+            sqlBuilder.From(_from);
+        }
 
-            if (!string.IsNullOrEmpty(_offset))
-            {
-                sqlBuilder.Skip(_offset);
-            }
+        EvaluateWhereClause(selectStatement.ChildNodes[4]);
 
-            if (previousContent != null)
-            {
-                _builder.Clear();
-                _builder.Append(new StringBuilder(previousContent));
-            }
+        if (!string.IsNullOrEmpty(_where))
+        {
+            sqlBuilder.WhereAnd(_where);
+        }
 
-            ClearSelectStatement();
+        EvaluateGroupClause(selectStatement.ChildNodes[5]);
 
-            return sqlBuilder.ToSqlString();
+        if (!string.IsNullOrEmpty(_groupBy))
+        {
+            sqlBuilder.GroupBy(_groupBy);
         }
 
-        private void EvaluateLimitClause(ParseTreeNode parseTreeNode)
+        EvaluateHavingClause(selectStatement.ChildNodes[6]);
+
+        if (!string.IsNullOrEmpty(_having))
         {
-            if (parseTreeNode.ChildNodes.Count == 0)
-            {
-                return;
-            }
+            sqlBuilder.Having(_having);
+        }
 
-            _builder.Clear();
+        EvaluateOrderClause(selectStatement.ChildNodes[7]);
 
-            // Evaluating so that the value can be transformed as a parameter.
-            EvaluateExpression(parseTreeNode.ChildNodes[1]);
+        if (!string.IsNullOrEmpty(_orderBy))
+        {
+            sqlBuilder.OrderBy(_orderBy);
+        }
+
+        EvaluateLimitClause(selectStatement.ChildNodes[8]);
 
-            _limit = _builder.ToString();
+        if (!string.IsNullOrEmpty(_limit))
+        {
+            sqlBuilder.Take(_limit);
         }
 
-        private void EvaluateOffsetClause(ParseTreeNode parseTreeNode)
+        EvaluateOffsetClause(selectStatement.ChildNodes[9]);
+
+        if (!string.IsNullOrEmpty(_offset))
         {
-            if (parseTreeNode.ChildNodes.Count == 0)
-            {
-                return;
-            }
+            sqlBuilder.Skip(_offset);
+        }
 
+        if (previousContent != null)
+        {
             _builder.Clear();
+            _builder.Append(new StringBuilder(previousContent));
+        }
 
-            // Evaluating so that the value can be transformed as a parameter.
-            EvaluateExpression(parseTreeNode.ChildNodes[1]);
+        ClearSelectStatement();
 
-            _offset = _builder.ToString();
-        }
+        return sqlBuilder.ToSqlString();
+    }
 
-        private void EvaluateOrderClause(ParseTreeNode parseTreeNode)
+    private void EvaluateLimitClause(ParseTreeNode parseTreeNode)
+    {
+        if (parseTreeNode.ChildNodes.Count == 0)
         {
-            if (parseTreeNode.ChildNodes.Count == 0)
-            {
-                return;
-            }
+            return;
+        }
 
-            _builder.Clear();
+        _builder.Clear();
 
-            var idList = parseTreeNode.ChildNodes[2];
+        // Evaluating so that the value can be transformed as a parameter.
+        EvaluateExpression(parseTreeNode.ChildNodes[1]);
 
-            _modes.Push(FormattingModes.SelectClause);
-            for (var i = 0; i < idList.ChildNodes.Count; i++)
-            {
-                var id = idList.ChildNodes[i].ChildNodes[0];
+        _limit = _builder.ToString();
+    }
 
-                if (i > 0)
-                {
-                    _builder.Append(", ");
-                }
+    private void EvaluateOffsetClause(ParseTreeNode parseTreeNode)
+    {
+        if (parseTreeNode.ChildNodes.Count == 0)
+        {
+            return;
+        }
 
-                EvaluateId(id);
+        _builder.Clear();
 
-                if (idList.ChildNodes[i].ChildNodes[1].ChildNodes.Count > 0)
-                {
-                    _builder.Append(' ').Append(idList.ChildNodes[i].ChildNodes[1].ChildNodes[0].Term.Name);
-                }
-            }
+        // Evaluating so that the value can be transformed as a parameter.
+        EvaluateExpression(parseTreeNode.ChildNodes[1]);
 
-            _orderBy = _builder.ToString();
+        _offset = _builder.ToString();
+    }
 
-            _modes.Pop();
+    private void EvaluateOrderClause(ParseTreeNode parseTreeNode)
+    {
+        if (parseTreeNode.ChildNodes.Count == 0)
+        {
+            return;
         }
 
-        private void EvaluateHavingClause(ParseTreeNode parseTreeNode)
+        _builder.Clear();
+
+        var idList = parseTreeNode.ChildNodes[2];
+
+        _modes.Push(FormattingModes.SelectClause);
+        for (var i = 0; i < idList.ChildNodes.Count; i++)
         {
-            if (parseTreeNode.ChildNodes.Count == 0)
+            var id = idList.ChildNodes[i].ChildNodes[0];
+
+            if (i > 0)
             {
-                return;
+                _builder.Append(", ");
             }
 
-            _builder.Clear();
+            EvaluateId(id);
 
-            _modes.Push(FormattingModes.SelectClause);
-            EvaluateExpression(parseTreeNode.ChildNodes[1]);
+            if (idList.ChildNodes[i].ChildNodes[1].ChildNodes.Count > 0)
+            {
+                _builder.Append(' ').Append(idList.ChildNodes[i].ChildNodes[1].ChildNodes[0].Term.Name);
+            }
+        }
 
-            _having = _builder.ToString();
+        _orderBy = _builder.ToString();
 
-            _modes.Pop();
-        }
+        _modes.Pop();
+    }
 
-        private void EvaluateGroupClause(ParseTreeNode parseTreeNode)
+    private void EvaluateHavingClause(ParseTreeNode parseTreeNode)
+    {
+        if (parseTreeNode.ChildNodes.Count == 0)
         {
-            if (parseTreeNode.ChildNodes.Count == 0)
-            {
-                return;
-            }
+            return;
+        }
 
-            _builder.Clear();
+        _builder.Clear();
 
-            var idList = parseTreeNode.ChildNodes[2];
+        _modes.Push(FormattingModes.SelectClause);
+        EvaluateExpression(parseTreeNode.ChildNodes[1]);
 
-            _modes.Push(FormattingModes.SelectClause);
-            for (var i = 0; i < idList.ChildNodes.Count; i++)
-            {
-                var columnSource = idList.ChildNodes[i];
+        _having = _builder.ToString();
 
-                if (i > 0)
-                {
-                    _builder.Append(", ");
-                }
+        _modes.Pop();
+    }
 
-                if (columnSource.ChildNodes[0].Term.Name == "Id")
-                {
-                    EvaluateId(columnSource.ChildNodes[0]);
-                }
-                else
-                {
-                    EvaluateFunCall(columnSource.ChildNodes[0]);
-                }
-            }
+    private void EvaluateGroupClause(ParseTreeNode parseTreeNode)
+    {
+        if (parseTreeNode.ChildNodes.Count == 0)
+        {
+            return;
+        }
 
-            _groupBy = _builder.ToString();
+        _builder.Clear();
 
-            _modes.Pop();
-        }
+        var idList = parseTreeNode.ChildNodes[2];
 
-        private void EvaluateWhereClause(ParseTreeNode parseTreeNode)
+        _modes.Push(FormattingModes.SelectClause);
+        for (var i = 0; i < idList.ChildNodes.Count; i++)
         {
-            if (parseTreeNode.ChildNodes.Count == 0)
+            var columnSource = idList.ChildNodes[i];
+
+            if (i > 0)
             {
-                // EMPTY
-                return;
+                _builder.Append(", ");
             }
 
-            _builder.Clear();
+            if (columnSource.ChildNodes[0].Term.Name == "Id")
+            {
+                EvaluateId(columnSource.ChildNodes[0]);
+            }
+            else
+            {
+                EvaluateFunCall(columnSource.ChildNodes[0]);
+            }
+        }
 
-            _modes.Push(FormattingModes.SelectClause);
-            EvaluateExpression(parseTreeNode.ChildNodes[1]);
+        _groupBy = _builder.ToString();
 
-            _where = _builder.ToString();
+        _modes.Pop();
+    }
 
-            _modes.Pop();
+    private void EvaluateWhereClause(ParseTreeNode parseTreeNode)
+    {
+        if (parseTreeNode.ChildNodes.Count == 0)
+        {
+            // EMPTY
+            return;
         }
 
-        private void EvaluateExpression(ParseTreeNode parseTreeNode)
+        _builder.Clear();
+
+        _modes.Push(FormattingModes.SelectClause);
+        EvaluateExpression(parseTreeNode.ChildNodes[1]);
+
+        _where = _builder.ToString();
+
+        _modes.Pop();
+    }
+
+    private void EvaluateExpression(ParseTreeNode parseTreeNode)
+    {
+        switch (parseTreeNode.Term.Name)
         {
-            switch (parseTreeNode.Term.Name)
-            {
-                case "unExpr":
-                    _builder.Append(parseTreeNode.ChildNodes[0].Term.Name);
-                    EvaluateExpression(parseTreeNode.ChildNodes[1]);
-                    break;
-                case "binExpr":
-                    EvaluateExpression(parseTreeNode.ChildNodes[0]);
-                    _builder.Append(' ');
-                    _builder.Append(parseTreeNode.ChildNodes[1].ChildNodes[0].Term.Name).Append(' ');
-                    EvaluateExpression(parseTreeNode.ChildNodes[2]);
-                    break;
-                case "betweenExpr":
-                    EvaluateExpression(parseTreeNode.ChildNodes[0]);
-                    _builder.Append(' ');
-                    if (parseTreeNode.ChildNodes[1].ChildNodes.Count > 0)
-                    {
-                        _builder.Append("NOT ");
-                    }
-                    _builder.Append("BETWEEN ");
-                    EvaluateExpression(parseTreeNode.ChildNodes[3]);
-                    _builder.Append(' ');
-                    _builder.Append("AND ");
-                    EvaluateExpression(parseTreeNode.ChildNodes[5]);
-                    break;
-                case "inExpr":
-                    EvaluateExpression(parseTreeNode.ChildNodes[0]);
-                    _builder.Append(' ');
-                    if (parseTreeNode.ChildNodes[1].ChildNodes.Count > 0)
+            case "unExpr":
+                _builder.Append(parseTreeNode.ChildNodes[0].Term.Name);
+                EvaluateExpression(parseTreeNode.ChildNodes[1]);
+                break;
+            case "binExpr":
+                EvaluateExpression(parseTreeNode.ChildNodes[0]);
+                _builder.Append(' ');
+                _builder.Append(parseTreeNode.ChildNodes[1].ChildNodes[0].Term.Name).Append(' ');
+                EvaluateExpression(parseTreeNode.ChildNodes[2]);
+                break;
+            case "betweenExpr":
+                EvaluateExpression(parseTreeNode.ChildNodes[0]);
+                _builder.Append(' ');
+                if (parseTreeNode.ChildNodes[1].ChildNodes.Count > 0)
+                {
+                    _builder.Append("NOT ");
+                }
+                _builder.Append("BETWEEN ");
+                EvaluateExpression(parseTreeNode.ChildNodes[3]);
+                _builder.Append(' ');
+                _builder.Append("AND ");
+                EvaluateExpression(parseTreeNode.ChildNodes[5]);
+                break;
+            case "inExpr":
+                EvaluateExpression(parseTreeNode.ChildNodes[0]);
+                _builder.Append(' ');
+                if (parseTreeNode.ChildNodes[1].ChildNodes.Count > 0)
+                {
+                    _builder.Append("NOT ");
+                }
+                _builder.Append("IN (");
+                EvaluateInArgs(parseTreeNode.ChildNodes[3]);
+                _builder.Append(')');
+                break;
+            // Term and Tuple are transient, so they appear directly.
+            case "Id":
+                EvaluateId(parseTreeNode);
+                break;
+            case "boolean":
+                _builder.Append(_dialect.GetSqlValue(parseTreeNode.ChildNodes[0].Term.Name == "TRUE"));
+                break;
+            case "string":
+                _builder.Append(_dialect.GetSqlValue(parseTreeNode.Token.ValueString));
+                break;
+            case "number":
+                _builder.Append(_dialect.GetSqlValue(parseTreeNode.Token.Value));
+                break;
+            case "funCall":
+                EvaluateFunCall(parseTreeNode);
+                break;
+            case "exprList":
+                _builder.Append('(');
+                EvaluateExpression(parseTreeNode.ChildNodes[0]);
+                _builder.Append(')');
+                break;
+            case "parSelectStmt":
+                _builder.Append('(');
+                _builder.Append(EvaluateSelectStatement(parseTreeNode.ChildNodes[0]));
+                _builder.Append(')');
+                break;
+            case "parameter":
+                var name = parseTreeNode.ChildNodes[1].ChildNodes[0].Token.ValueString;
+
+                _builder.Append("@" + name);
+
+                if (_parameters != null && !_parameters.ContainsKey(name))
+                {
+                    // If a parameter is not set and there is no default value, report it.
+                    if (parseTreeNode.ChildNodes.Count < 3)
                     {
-                        _builder.Append("NOT ");
+                        throw new SqlParserException("Missing parameters: " + name);
                     }
-                    _builder.Append("IN (");
-                    EvaluateInArgs(parseTreeNode.ChildNodes[3]);
-                    _builder.Append(')');
-                    break;
-                // Term and Tuple are transient, so they appear directly.
-                case "Id":
-                    EvaluateId(parseTreeNode);
-                    break;
-                case "boolean":
-                    _builder.Append(_dialect.GetSqlValue(parseTreeNode.ChildNodes[0].Term.Name == "TRUE"));
-                    break;
-                case "string":
-                    _builder.Append(_dialect.GetSqlValue(parseTreeNode.Token.ValueString));
-                    break;
-                case "number":
-                    _builder.Append(_dialect.GetSqlValue(parseTreeNode.Token.Value));
-                    break;
-                case "funCall":
-                    EvaluateFunCall(parseTreeNode);
-                    break;
-                case "exprList":
-                    _builder.Append('(');
-                    EvaluateExpression(parseTreeNode.ChildNodes[0]);
-                    _builder.Append(')');
-                    break;
-                case "parSelectStmt":
-                    _builder.Append('(');
-                    _builder.Append(EvaluateSelectStatement(parseTreeNode.ChildNodes[0]));
-                    _builder.Append(')');
-                    break;
-                case "parameter":
-                    var name = parseTreeNode.ChildNodes[1].ChildNodes[0].Token.ValueString;
-
-                    _builder.Append("@" + name);
-
-                    if (_parameters != null && !_parameters.ContainsKey(name))
+                    else
                     {
-                        // If a parameter is not set and there is no default value, report it.
-                        if (parseTreeNode.ChildNodes.Count < 3)
+                        if (parseTreeNode.ChildNodes[3].Token != null)
                         {
-                            throw new SqlParserException("Missing parameters: " + name);
+                            _parameters[name] = parseTreeNode.ChildNodes[3].Token.Value;
                         }
                         else
                         {
-                            if (parseTreeNode.ChildNodes[3].Token != null)
+                            // Example: true.
+                            if (parseTreeNode.ChildNodes[3].ChildNodes[0].Token != null)
                             {
-                                _parameters[name] = parseTreeNode.ChildNodes[3].Token.Value;
+                                _parameters[name] = parseTreeNode.ChildNodes[3].ChildNodes[0].Token.Value;
                             }
                             else
                             {
-                                // Example: true.
-                                if (parseTreeNode.ChildNodes[3].ChildNodes[0].Token != null)
-                                {
-                                    _parameters[name] = parseTreeNode.ChildNodes[3].ChildNodes[0].Token.Value;
-                                }
-                                else
-                                {
-                                    throw new SqlParserException("Unsupported syntax for parameter: " + name);
-                                }
+                                throw new SqlParserException("Unsupported syntax for parameter: " + name);
                             }
                         }
                     }
+                }
 
-                    break;
-                case "*":
-                    _builder.Append('*');
-                    break;
-            }
+                break;
+            case "*":
+                _builder.Append('*');
+                break;
         }
+    }
 
-        private void EvaluateInArgs(ParseTreeNode inArgs)
+    private void EvaluateInArgs(ParseTreeNode inArgs)
+    {
+        if (inArgs.ChildNodes[0].Term.Name == "selectStatement")
         {
-            if (inArgs.ChildNodes[0].Term.Name == "selectStatement")
-            {
-                // 'selectStatement'.
-                _builder.Append(EvaluateSelectStatement(inArgs.ChildNodes[0]));
-            }
-            else
-            {
-                // 'expressionList'.
-                EvaluateExpressionList(inArgs.ChildNodes[0]);
-            }
+            // 'selectStatement'.
+            _builder.Append(EvaluateSelectStatement(inArgs.ChildNodes[0]));
         }
-
-        private void EvaluateFunCall(ParseTreeNode funCall)
+        else
         {
-            var funcName = funCall.ChildNodes[0].ChildNodes[0].Token.ValueString;
-            IList<string> arguments;
-            var tempBuilder = _builder;
+            // 'expressionList'.
+            EvaluateExpressionList(inArgs.ChildNodes[0]);
+        }
+    }
 
-            if (funCall.ChildNodes[1].ChildNodes.Count == 0)
-            {
-                arguments = Array.Empty<string>();
-            }
-            else if (funCall.ChildNodes[1].ChildNodes[0].Term.Name == "selectStatement")
+    private void EvaluateFunCall(ParseTreeNode funCall)
+    {
+        var funcName = funCall.ChildNodes[0].ChildNodes[0].Token.ValueString;
+        IList<string> arguments;
+        var tempBuilder = _builder;
+
+        if (funCall.ChildNodes[1].ChildNodes.Count == 0)
+        {
+            arguments = Array.Empty<string>();
+        }
+        else if (funCall.ChildNodes[1].ChildNodes[0].Term.Name == "selectStatement")
+        {
+            // 'selectStatement'.
+            _builder = new StringBuilder();
+            _builder.Append(EvaluateSelectStatement(funCall.ChildNodes[1].ChildNodes[0]));
+            arguments = new string[] { _builder.ToString() };
+            _builder = tempBuilder;
+        }
+        else if (funCall.ChildNodes[1].ChildNodes[0].Term.Name == "*")
+        {
+            arguments = new string[] { "*" };
+        }
+        else
+        {
+            // 'expressionList'.
+            arguments = new List<string>();
+            for (var i = 0; i < funCall.ChildNodes[1].ChildNodes[0].ChildNodes.Count; i++)
             {
-                // 'selectStatement'.
                 _builder = new StringBuilder();
-                _builder.Append(EvaluateSelectStatement(funCall.ChildNodes[1].ChildNodes[0]));
-                arguments = new string[] { _builder.ToString() };
+                EvaluateExpression(funCall.ChildNodes[1].ChildNodes[0].ChildNodes[i]);
+                arguments.Add(_builder.ToString());
                 _builder = tempBuilder;
             }
-            else if (funCall.ChildNodes[1].ChildNodes[0].Term.Name == "*")
-            {
-                arguments = new string[] { "*" };
-            }
-            else
-            {
-                // 'expressionList'.
-                arguments = new List<string>();
-                for (var i = 0; i < funCall.ChildNodes[1].ChildNodes[0].ChildNodes.Count; i++)
-                {
-                    _builder = new StringBuilder();
-                    EvaluateExpression(funCall.ChildNodes[1].ChildNodes[0].ChildNodes[i]);
-                    arguments.Add(_builder.ToString());
-                    _builder = tempBuilder;
-                }
-            }
-
-            _builder.Append(_dialect.RenderMethod(funcName, arguments.ToArray()));
         }
 
-        private void EvaluateExpressionList(ParseTreeNode expressionList)
+        _builder.Append(_dialect.RenderMethod(funcName, arguments.ToArray()));
+    }
+
+    private void EvaluateExpressionList(ParseTreeNode expressionList)
+    {
+        for (var i = 0; i < expressionList.ChildNodes.Count; i++)
         {
-            for (var i = 0; i < expressionList.ChildNodes.Count; i++)
+            if (i > 0)
             {
-                if (i > 0)
-                {
-                    _builder.Append(", ");
-                }
-
-                EvaluateExpression(expressionList.ChildNodes[i]);
+                _builder.Append(", ");
             }
+
+            EvaluateExpression(expressionList.ChildNodes[i]);
         }
+    }
 
-        private void EvaluateFromClause(ParseTreeNode parseTreeNode)
+    private void EvaluateFromClause(ParseTreeNode parseTreeNode)
+    {
+        if (parseTreeNode.ChildNodes.Count == 0)
         {
-            if (parseTreeNode.ChildNodes.Count == 0)
-            {
-                // 'EMPTY'.
-                return;
-            }
+            // 'EMPTY'.
+            return;
+        }
 
-            _builder.Clear();
+        _builder.Clear();
 
-            var aliasList = parseTreeNode.ChildNodes[1];
+        var aliasList = parseTreeNode.ChildNodes[1];
 
-            _modes.Push(FormattingModes.FromClause);
+        _modes.Push(FormattingModes.FromClause);
 
-            EvaluateAliasOrSubQueryList(aliasList);
+        EvaluateAliasOrSubQueryList(aliasList);
 
-            _modes.Pop();
+        _modes.Pop();
 
-            var joins = parseTreeNode.ChildNodes[2];
+        var joins = parseTreeNode.ChildNodes[2];
 
-            // Process join statements.
-            if (joins.ChildNodes.Count != 0)
+        // Process join statements.
+        if (joins.ChildNodes.Count != 0)
+        {
+            foreach (var joinStatement in joins.ChildNodes)
             {
-                foreach (var joinStatement in joins.ChildNodes)
-                {
-                    _modes.Push(FormattingModes.FromClause);
+                _modes.Push(FormattingModes.FromClause);
 
-                    var jointKindOpt = joinStatement.ChildNodes[0];
+                var jointKindOpt = joinStatement.ChildNodes[0];
 
-                    if (jointKindOpt.ChildNodes.Count > 0)
-                    {
-                        _builder.Append(' ').Append(jointKindOpt.ChildNodes[0].Term.Name);
-                    }
+                if (jointKindOpt.ChildNodes.Count > 0)
+                {
+                    _builder.Append(' ').Append(jointKindOpt.ChildNodes[0].Term.Name);
+                }
 
-                    _builder.Append(" JOIN ");
+                _builder.Append(" JOIN ");
 
-                    EvaluateAliasList(joinStatement.ChildNodes[2]);
+                EvaluateAliasList(joinStatement.ChildNodes[2]);
 
-                    _builder.Append(" ON ");
+                _builder.Append(" ON ");
 
-                    var joinConditions = joinStatement.ChildNodes[4].ChildNodes;
+                var joinConditions = joinStatement.ChildNodes[4].ChildNodes;
 
-                    for (var i = 0; i < joinConditions.Count; i++)
+                for (var i = 0; i < joinConditions.Count; i++)
+                {
+                    if (i > 0)
                     {
-                        if (i > 0)
-                        {
-                            _builder.Append(" AND ");
-                        }
-                        _modes.Push(FormattingModes.SelectClause);
-                        var joinCondition = joinConditions[i];
-                        EvaluateExpression(joinCondition.ChildNodes[0].ChildNodes[0]);
-                        _builder.Append(" = ");
-                        EvaluateExpression(joinCondition.ChildNodes[2].ChildNodes[0]);
-                        _modes.Pop();
+                        _builder.Append(" AND ");
                     }
+                    _modes.Push(FormattingModes.SelectClause);
+                    var joinCondition = joinConditions[i];
+                    EvaluateExpression(joinCondition.ChildNodes[0].ChildNodes[0]);
+                    _builder.Append(" = ");
+                    EvaluateExpression(joinCondition.ChildNodes[2].ChildNodes[0]);
+                    _modes.Pop();
                 }
             }
-
-            _from = _builder.ToString();
         }
 
-        private void EvaluateAliasList(ParseTreeNode aliasList)
+        _from = _builder.ToString();
+    }
+
+    private void EvaluateAliasList(ParseTreeNode aliasList)
+    {
+        for (var i = 0; i < aliasList.ChildNodes.Count; i++)
         {
-            for (var i = 0; i < aliasList.ChildNodes.Count; i++)
-            {
-                var aliasItem = aliasList.ChildNodes[i];
+            var aliasItem = aliasList.ChildNodes[i];
 
-                if (i > 0)
-                {
-                    _builder.Append(", ");
-                }
+            if (i > 0)
+            {
+                _builder.Append(", ");
+            }
 
-                EvaluateId(aliasItem.ChildNodes[0]);
+            EvaluateId(aliasItem.ChildNodes[0]);
 
-                if (aliasItem.ChildNodes.Count > 1)
-                {
-                    EvaluateAliasOptional(aliasItem.ChildNodes[1]);
-                }
+            if (aliasItem.ChildNodes.Count > 1)
+            {
+                EvaluateAliasOptional(aliasItem.ChildNodes[1]);
             }
         }
+    }
 
-        private void EvaluateAliasOrSubQueryList(ParseTreeNode aliasList)
+    private void EvaluateAliasOrSubQueryList(ParseTreeNode aliasList)
+    {
+        for (var i = 0; i < aliasList.ChildNodes.Count; i++)
         {
-            for (var i = 0; i < aliasList.ChildNodes.Count; i++)
+            var aliasItemOrSubQuery = aliasList.ChildNodes[i];
+
+            if (i > 0)
             {
-                var aliasItemOrSubQuery = aliasList.ChildNodes[i];
+                _builder.Append(", ");
+            }
 
-                if (i > 0)
-                {
-                    _builder.Append(", ");
-                }
+            if (aliasItemOrSubQuery.Term.Name == "tableAliasItem")
+            {
+                EvaluateId(aliasItemOrSubQuery.ChildNodes[0]);
 
-                if (aliasItemOrSubQuery.Term.Name == "tableAliasItem")
+                if (aliasItemOrSubQuery.ChildNodes.Count > 1)
                 {
-                    EvaluateId(aliasItemOrSubQuery.ChildNodes[0]);
-
-                    if (aliasItemOrSubQuery.ChildNodes.Count > 1)
-                    {
-                        EvaluateAliasOptional(aliasItemOrSubQuery.ChildNodes[1]);
-                    }
+                    EvaluateAliasOptional(aliasItemOrSubQuery.ChildNodes[1]);
                 }
-                else if (aliasItemOrSubQuery.Term.Name == "subQuery")
-                {
-                    _builder.Append('(');
+            }
+            else if (aliasItemOrSubQuery.Term.Name == "subQuery")
+            {
+                _builder.Append('(');
 
-                    EvaluateStatementList(_builder, aliasItemOrSubQuery.ChildNodes[0], false);
+                EvaluateStatementList(_builder, aliasItemOrSubQuery.ChildNodes[0], false);
 
-                    _builder.Append(") AS ");
-                    _builder.Append(aliasItemOrSubQuery.ChildNodes[2].Token.ValueString);
-                }
+                _builder.Append(") AS ");
+                _builder.Append(aliasItemOrSubQuery.ChildNodes[2].Token.ValueString);
             }
         }
+    }
+
+    private void EvaluateSelectorList(ParseTreeNode parseTreeNode)
+    {
+        var selectorList = parseTreeNode.ChildNodes[0];
 
-        private void EvaluateSelectorList(ParseTreeNode parseTreeNode)
+        if (selectorList.Term.Name == "*")
         {
-            var selectorList = parseTreeNode.ChildNodes[0];
+            _builder.Append('*');
+        }
+        else
+        {
+            _modes.Push(FormattingModes.SelectClause);
 
-            if (selectorList.Term.Name == "*")
+            // 'columnItemList'.
+            for (var i = 0; i < selectorList.ChildNodes.Count; i++)
             {
-                _builder.Append('*');
-            }
-            else
-            {
-                _modes.Push(FormattingModes.SelectClause);
-
-                // 'columnItemList'.
-                for (var i = 0; i < selectorList.ChildNodes.Count; i++)
+                if (i > 0)
                 {
-                    if (i > 0)
-                    {
-                        _builder.Append(", ");
-                    }
-
-                    var columnItem = selectorList.ChildNodes[i];
+                    _builder.Append(", ");
+                }
 
-                    // 'columnItem'.
-                    var columnSource = columnItem.ChildNodes[0];
-                    var funCallOrId = columnSource.ChildNodes[0];
-                    if (funCallOrId.Term.Name == "Id")
-                    {
-                        EvaluateId(funCallOrId);
-                    }
-                    else
-                    {
-                        EvaluateFunCall(funCallOrId);
-                        var overClauseOpt = columnSource.ChildNodes[1];
-                        if (overClauseOpt.ChildNodes.Count > 0)
-                        {
-                            EvaluateOverClauseOptional(overClauseOpt);
-                        }
-                    }
+                var columnItem = selectorList.ChildNodes[i];
 
-                    if (columnItem.ChildNodes.Count > 1)
+                // 'columnItem'.
+                var columnSource = columnItem.ChildNodes[0];
+                var funCallOrId = columnSource.ChildNodes[0];
+                if (funCallOrId.Term.Name == "Id")
+                {
+                    EvaluateId(funCallOrId);
+                }
+                else
+                {
+                    EvaluateFunCall(funCallOrId);
+                    var overClauseOpt = columnSource.ChildNodes[1];
+                    if (overClauseOpt.ChildNodes.Count > 0)
                     {
-                        // 'AS'.
-                        EvaluateAliasOptional(columnItem.ChildNodes[1]);
+                        EvaluateOverClauseOptional(overClauseOpt);
                     }
                 }
 
-                _modes.Pop();
+                if (columnItem.ChildNodes.Count > 1)
+                {
+                    // 'AS'.
+                    EvaluateAliasOptional(columnItem.ChildNodes[1]);
+                }
             }
 
-            _select = _builder.ToString();
+            _modes.Pop();
         }
 
-        private void EvaluateId(ParseTreeNode id)
+        _select = _builder.ToString();
+    }
+
+    private void EvaluateId(ParseTreeNode id)
+    {
+        switch (_modes.Peek())
         {
-            switch (_modes.Peek())
-            {
-                case FormattingModes.SelectClause:
-                    EvaluateSelectId(id);
-                    break;
-                case FormattingModes.FromClause:
-                    EvaluateFromId(id);
-                    break;
-            }
+            case FormattingModes.SelectClause:
+                EvaluateSelectId(id);
+                break;
+            case FormattingModes.FromClause:
+                EvaluateFromId(id);
+                break;
         }
+    }
 
-        private void EvaluateSelectId(ParseTreeNode id)
+    private void EvaluateSelectId(ParseTreeNode id)
+    {
+        for (var i = 0; i < id.ChildNodes.Count; i++)
         {
-            for (var i = 0; i < id.ChildNodes.Count; i++)
+            if (i == 0 && id.ChildNodes.Count > 1 && !_tableAliases.Contains(id.ChildNodes[i].Token.ValueString))
             {
-                if (i == 0 && id.ChildNodes.Count > 1 && !_tableAliases.Contains(id.ChildNodes[i].Token.ValueString))
-                {
-                    _builder.Append(_dialect.QuoteForTableName(_tablePrefix + id.ChildNodes[i].Token.ValueString, _schema));
-                }
-                else if (i == 0 && id.ChildNodes.Count == 1)
-                {
-                    _builder.Append(_dialect.QuoteForColumnName(id.ChildNodes[i].Token.ValueString));
-                }
-                else
+                _builder.Append(_dialect.QuoteForTableName(_tablePrefix + id.ChildNodes[i].Token.ValueString, _schema));
+            }
+            else if (i == 0 && id.ChildNodes.Count == 1)
+            {
+                _builder.Append(_dialect.QuoteForColumnName(id.ChildNodes[i].Token.ValueString));
+            }
+            else
+            {
+                if (i > 0)
                 {
-                    if (i > 0)
-                    {
-                        _builder.Append('.');
-                    }
-
-                    if (_tableAliases.Contains(id.ChildNodes[i].Token.ValueString))
-                    {
-                        _builder.Append(id.ChildNodes[i].Token.ValueString);
-                    }
-                    else
-                    {
-                        _builder.Append(_dialect.QuoteForColumnName(id.ChildNodes[i].Token.ValueString));
-                    }
+                    _builder.Append('.');
                 }
-            }
-        }
 
-        private void EvaluateFromId(ParseTreeNode id)
-        {
-            for (var i = 0; i < id.ChildNodes.Count; i++)
-            {
-                if (i == 0 && !_tableAliases.Contains(id.ChildNodes[i].Token.ValueString) && !_ctes.Contains(id.ChildNodes[i].Token.ValueString))
+                if (_tableAliases.Contains(id.ChildNodes[i].Token.ValueString))
                 {
-                    _builder.Append(_dialect.QuoteForTableName(_tablePrefix + id.ChildNodes[i].Token.ValueString, _schema));
+                    _builder.Append(id.ChildNodes[i].Token.ValueString);
                 }
                 else
                 {
@@ -734,183 +718,198 @@ private void EvaluateFromId(ParseTreeNode id)
                 }
             }
         }
+    }
 
-        private void EvaluateAliasOptional(ParseTreeNode parseTreeNode)
+    private void EvaluateFromId(ParseTreeNode id)
+    {
+        for (var i = 0; i < id.ChildNodes.Count; i++)
         {
-            if (parseTreeNode.ChildNodes.Count > 0)
+            if (i == 0 && !_tableAliases.Contains(id.ChildNodes[i].Token.ValueString) && !_ctes.Contains(id.ChildNodes[i].Token.ValueString))
             {
-                _builder.Append(" AS ");
-                _builder.Append(parseTreeNode.ChildNodes[0].Token.ValueString);
+                _builder.Append(_dialect.QuoteForTableName(_tablePrefix + id.ChildNodes[i].Token.ValueString, _schema));
+            }
+            else
+            {
+                _builder.Append(_dialect.QuoteForColumnName(id.ChildNodes[i].Token.ValueString));
             }
         }
+    }
 
-        private void EvaluateSelectRestriction(ParseTreeNode parseTreeNode)
+    private void EvaluateAliasOptional(ParseTreeNode parseTreeNode)
+    {
+        if (parseTreeNode.ChildNodes.Count > 0)
         {
-            _builder.Clear();
-
-            if (parseTreeNode.ChildNodes.Count > 0)
-            {
-                _builder.Append(parseTreeNode.ChildNodes[0].Term.Name).Append(' ');
-            }
+            _builder.Append(" AS ");
+            _builder.Append(parseTreeNode.ChildNodes[0].Token.ValueString);
         }
+    }
 
-        private void EvaluateOverClauseOptional(ParseTreeNode overClauseOpt)
+    private void EvaluateSelectRestriction(ParseTreeNode parseTreeNode)
+    {
+        _builder.Clear();
+
+        if (parseTreeNode.ChildNodes.Count > 0)
         {
-            var overArgumentsOpt = overClauseOpt.ChildNodes[1];
+            _builder.Append(parseTreeNode.ChildNodes[0].Term.Name).Append(' ');
+        }
+    }
 
-            _builder.Append(" OVER ");
-            _builder.Append('(');
+    private void EvaluateOverClauseOptional(ParseTreeNode overClauseOpt)
+    {
+        var overArgumentsOpt = overClauseOpt.ChildNodes[1];
 
-            if (overArgumentsOpt.ChildNodes.Count == 0)
-            {
-                _builder.Append(')');
-                return;
-            }
+        _builder.Append(" OVER ");
+        _builder.Append('(');
+
+        if (overArgumentsOpt.ChildNodes.Count == 0)
+        {
+            _builder.Append(')');
+            return;
+        }
 
-            var overPartitionByClauseOpt = overArgumentsOpt.ChildNodes[0];
-            var overOrderByClauseOpt = overArgumentsOpt.ChildNodes[1];
+        var overPartitionByClauseOpt = overArgumentsOpt.ChildNodes[0];
+        var overOrderByClauseOpt = overArgumentsOpt.ChildNodes[1];
 
-            var hasOverPartitionByClause = overPartitionByClauseOpt.ChildNodes.Count > 0;
-            var hasOverOrderByClause = overOrderByClauseOpt.ChildNodes.Count > 0;
+        var hasOverPartitionByClause = overPartitionByClauseOpt.ChildNodes.Count > 0;
+        var hasOverOrderByClause = overOrderByClauseOpt.ChildNodes.Count > 0;
 
-            if (hasOverPartitionByClause)
+        if (hasOverPartitionByClause)
+        {
+            _builder.Append("PARTITION BY ");
+            var columnItemList = overPartitionByClauseOpt.ChildNodes[2];
+            for (var i = 0; i < columnItemList.ChildNodes.Count; i++)
             {
-                _builder.Append("PARTITION BY ");
-                var columnItemList = overPartitionByClauseOpt.ChildNodes[2];
-                for (var i = 0; i < columnItemList.ChildNodes.Count; i++)
+                if (i > 0)
                 {
-                    if (i > 0)
-                    {
-                        _builder.Append(", ");
-                    }
-                    var columnItem = columnItemList.ChildNodes[i];
-                    var id = columnItem.ChildNodes[0].ChildNodes[0];
-                    EvaluateSelectId(id);
+                    _builder.Append(", ");
                 }
+                var columnItem = columnItemList.ChildNodes[i];
+                var id = columnItem.ChildNodes[0].ChildNodes[0];
+                EvaluateSelectId(id);
             }
+        }
 
-            if (hasOverOrderByClause)
+        if (hasOverOrderByClause)
+        {
+            if (hasOverPartitionByClause)
             {
-                if (hasOverPartitionByClause)
-                {
-                    _builder.Append(' ');
-                }
+                _builder.Append(' ');
+            }
 
-                _builder.Append("ORDER BY ");
+            _builder.Append("ORDER BY ");
 
-                var orderList = overOrderByClauseOpt.ChildNodes[2];
-                for (var i = 0; i < orderList.ChildNodes.Count; i++)
+            var orderList = overOrderByClauseOpt.ChildNodes[2];
+            for (var i = 0; i < orderList.ChildNodes.Count; i++)
+            {
+                if (i > 0)
                 {
-                    if (i > 0)
-                    {
-                        _builder.Append(", ");
-                    }
-                    var orderMember = orderList.ChildNodes[i];
-                    var id = orderMember.ChildNodes[0];
-                    EvaluateSelectId(id);
-                    var orderDirOpt = orderMember.ChildNodes[1];
-                    if (orderDirOpt.ChildNodes.Count > 0)
-                    {
-                        _builder.Append(' ').Append(orderDirOpt.ChildNodes[0].Term.Name);
-                    }
+                    _builder.Append(", ");
+                }
+                var orderMember = orderList.ChildNodes[i];
+                var id = orderMember.ChildNodes[0];
+                EvaluateSelectId(id);
+                var orderDirOpt = orderMember.ChildNodes[1];
+                if (orderDirOpt.ChildNodes.Count > 0)
+                {
+                    _builder.Append(' ').Append(orderDirOpt.ChildNodes[0].Term.Name);
                 }
             }
-
-            _builder.Append(')');
         }
 
-        private string EvaluateCteStatement(ParseTreeNode cteStatement)
-        {
-            _builder.Append("WITH ");
+        _builder.Append(')');
+    }
+
+    private string EvaluateCteStatement(ParseTreeNode cteStatement)
+    {
+        _builder.Append("WITH ");
 
-            for (var i = 0; i < cteStatement.ChildNodes[1].ChildNodes.Count; i++)
+        for (var i = 0; i < cteStatement.ChildNodes[1].ChildNodes.Count; i++)
+        {
+            var cte = cteStatement.ChildNodes[1].ChildNodes[i];
+            if (i > 0)
             {
-                var cte = cteStatement.ChildNodes[1].ChildNodes[i];
-                if (i > 0)
-                {
-                    _builder.Append(", ");
-                }
+                _builder.Append(", ");
+            }
 
-                var expressionName = cte.ChildNodes[0].Token.ValueString;
-                var optionalColumns = cte.ChildNodes[1];
-                _builder.Append(expressionName);
+            var expressionName = cte.ChildNodes[0].Token.ValueString;
+            var optionalColumns = cte.ChildNodes[1];
+            _builder.Append(expressionName);
 
-                if (optionalColumns.ChildNodes.Count > 0)
-                {
-                    var columns = optionalColumns.ChildNodes[0].ChildNodes;
-                    _builder.Append('(');
+            if (optionalColumns.ChildNodes.Count > 0)
+            {
+                var columns = optionalColumns.ChildNodes[0].ChildNodes;
+                _builder.Append('(');
 
-                    for (var j = 0; j < columns.Count; j++)
+                for (var j = 0; j < columns.Count; j++)
+                {
+                    if (j > 0)
                     {
-                        if (j > 0)
-                        {
-                            _builder.Append(", ");
-                        }
-
-                        _builder.Append(columns[j].Token.ValueString);
+                        _builder.Append(", ");
                     }
 
-                    _builder.Append(')');
+                    _builder.Append(columns[j].Token.ValueString);
                 }
 
-                _builder.Append(" AS (");
-                EvaluateStatementList(_builder, cte.ChildNodes[3], false);
                 _builder.Append(')');
             }
 
-            _builder.Append(' ');
-
-            return _builder.ToString();
+            _builder.Append(" AS (");
+            EvaluateStatementList(_builder, cte.ChildNodes[3], false);
+            _builder.Append(')');
         }
 
-        private void EvaluateStatementList(StringBuilder builder, ParseTreeNode unionStatementList, bool isCteAllowed)
+        _builder.Append(' ');
+
+        return _builder.ToString();
+    }
+
+    private void EvaluateStatementList(StringBuilder builder, ParseTreeNode unionStatementList, bool isCteAllowed)
+    {
+        foreach (var unionStatement in unionStatementList.ChildNodes)
         {
-            foreach (var unionStatement in unionStatementList.ChildNodes)
+            var statement = unionStatement.ChildNodes[0];
+            var selectStatement = statement.ChildNodes[1];
+            var unionClauseOpt = unionStatement.ChildNodes[1];
+            if (isCteAllowed)
             {
-                var statement = unionStatement.ChildNodes[0];
-                var selectStatement = statement.ChildNodes[1];
-                var unionClauseOpt = unionStatement.ChildNodes[1];
-                if (isCteAllowed)
+                var cte = statement.ChildNodes[0];
+                if (cte.ChildNodes.Count > 0)
                 {
-                    var cte = statement.ChildNodes[0];
-                    if (cte.ChildNodes.Count > 0)
-                    {
-                        builder.Append(EvaluateCteStatement(cte));
-                    }
+                    builder.Append(EvaluateCteStatement(cte));
                 }
+            }
 
-                builder.Append(EvaluateSelectStatement(selectStatement));
+            builder.Append(EvaluateSelectStatement(selectStatement));
 
-                for (var i = 0; i < unionClauseOpt.ChildNodes.Count; i++)
+            for (var i = 0; i < unionClauseOpt.ChildNodes.Count; i++)
+            {
+                if (i == 0)
                 {
-                    if (i == 0)
-                    {
-                        builder.Append(' ');
-                    }
+                    builder.Append(' ');
+                }
 
-                    var term = unionClauseOpt.ChildNodes[i].Term;
+                var term = unionClauseOpt.ChildNodes[i].Term;
 
-                    builder.Append(term).Append(' ');
-                }
+                builder.Append(term).Append(' ');
             }
         }
+    }
 
-        private enum FormattingModes
-        {
-            SelectClause,
-            FromClause
-        }
+    private enum FormattingModes
+    {
+        SelectClause,
+        FromClause
+    }
 
-        private void ClearSelectStatement()
-        {
-            _limit = null;
-            _offset = null;
-            _select = null;
-            _from = null;
-            _where = null;
-            _having = null;
-            _groupBy = null;
-            _orderBy = null;
-        }
+    private void ClearSelectStatement()
+    {
+        _limit = null;
+        _offset = null;
+        _select = null;
+        _from = null;
+        _where = null;
+        _having = null;
+        _groupBy = null;
+        _orderBy = null;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlParserException.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlParserException.cs
index e7daf5013fd..a4eb4fe7982 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlParserException.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlParserException.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace OrchardCore.Queries.Sql
+namespace OrchardCore.Queries.Sql;
+
+public class SqlParserException : Exception
 {
-    public class SqlParserException : Exception
+    public SqlParserException(string message) : base(message)
     {
-        public SqlParserException(string message) : base(message)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlQuerySource.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlQuerySource.cs
index c5a1a2a3e91..3503afb2548 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlQuerySource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlQuerySource.cs
@@ -16,105 +16,104 @@
 using OrchardCore.Queries.Sql.Models;
 using YesSql;
 
-namespace OrchardCore.Queries.Sql
+namespace OrchardCore.Queries.Sql;
+
+public sealed class SqlQuerySource : IQuerySource
 {
-    public sealed class SqlQuerySource : IQuerySource
+    public const string SourceName = "Sql";
+
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly IDbConnectionAccessor _dbConnectionAccessor;
+    private readonly ISession _session;
+    private readonly JsonSerializerOptions _jsonSerializerOptions;
+    private readonly TemplateOptions _templateOptions;
+
+    public SqlQuerySource(
+        ILiquidTemplateManager liquidTemplateManager,
+        IDbConnectionAccessor dbConnectionAccessor,
+        ISession session,
+        IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions,
+        IOptions<TemplateOptions> templateOptions)
     {
-        public const string SourceName = "Sql";
-
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly IDbConnectionAccessor _dbConnectionAccessor;
-        private readonly ISession _session;
-        private readonly JsonSerializerOptions _jsonSerializerOptions;
-        private readonly TemplateOptions _templateOptions;
-
-        public SqlQuerySource(
-            ILiquidTemplateManager liquidTemplateManager,
-            IDbConnectionAccessor dbConnectionAccessor,
-            ISession session,
-            IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions,
-            IOptions<TemplateOptions> templateOptions)
-        {
-            _liquidTemplateManager = liquidTemplateManager;
-            _dbConnectionAccessor = dbConnectionAccessor;
-            _session = session;
-            _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
-            _templateOptions = templateOptions.Value;
-        }
+        _liquidTemplateManager = liquidTemplateManager;
+        _dbConnectionAccessor = dbConnectionAccessor;
+        _session = session;
+        _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
+        _templateOptions = templateOptions.Value;
+    }
 
-        public string Name
-            => SourceName;
+    public string Name
+        => SourceName;
 
-        public async Task<IQueryResults> ExecuteQueryAsync(Query query, IDictionary<string, object> parameters)
-        {
-            var metadata = query.As<SqlQueryMetadata>();
+    public async Task<IQueryResults> ExecuteQueryAsync(Query query, IDictionary<string, object> parameters)
+    {
+        var metadata = query.As<SqlQueryMetadata>();
 
-            var sqlQueryResults = new SQLQueryResults();
+        var sqlQueryResults = new SQLQueryResults();
 
-            var tokenizedQuery = await _liquidTemplateManager.RenderStringAsync(metadata.Template, NullEncoder.Default,
-                parameters.Select(x => new KeyValuePair<string, FluidValue>(x.Key, FluidValue.Create(x.Value, _templateOptions))));
+        var tokenizedQuery = await _liquidTemplateManager.RenderStringAsync(metadata.Template, NullEncoder.Default,
+            parameters.Select(x => new KeyValuePair<string, FluidValue>(x.Key, FluidValue.Create(x.Value, _templateOptions))));
 
-            var dialect = _session.Store.Configuration.SqlDialect;
+        var dialect = _session.Store.Configuration.SqlDialect;
 
-            if (!SqlParser.TryParse(tokenizedQuery, _session.Store.Configuration.Schema, dialect, _session.Store.Configuration.TablePrefix, parameters, out var rawQuery, out var messages))
-            {
-                sqlQueryResults.Items = [];
+        if (!SqlParser.TryParse(tokenizedQuery, _session.Store.Configuration.Schema, dialect, _session.Store.Configuration.TablePrefix, parameters, out var rawQuery, out var messages))
+        {
+            sqlQueryResults.Items = [];
 
-                return sqlQueryResults;
-            }
+            return sqlQueryResults;
+        }
 
-            await using var connection = _dbConnectionAccessor.CreateConnection();
+        await using var connection = _dbConnectionAccessor.CreateConnection();
 
-            await connection.OpenAsync();
+        await connection.OpenAsync();
 
-            if (query.ReturnContentItems)
-            {
-                using var transaction = await connection.BeginTransactionAsync(_session.Store.Configuration.IsolationLevel);
-                var queryResult = await connection.QueryAsync(rawQuery, parameters, transaction);
+        if (query.ReturnContentItems)
+        {
+            using var transaction = await connection.BeginTransactionAsync(_session.Store.Configuration.IsolationLevel);
+            var queryResult = await connection.QueryAsync(rawQuery, parameters, transaction);
 
-                string column = null;
+            string column = null;
 
-                var documentIds = queryResult.Select(row =>
-                {
-                    var rowDictionary = (IDictionary<string, object>)row;
+            var documentIds = queryResult.Select(row =>
+            {
+                var rowDictionary = (IDictionary<string, object>)row;
 
-                    if (column == null)
+                if (column == null)
+                {
+                    if (rowDictionary.ContainsKey(nameof(ContentItemIndex.DocumentId)))
+                    {
+                        column = nameof(ContentItemIndex.DocumentId);
+                    }
+                    else
                     {
-                        if (rowDictionary.ContainsKey(nameof(ContentItemIndex.DocumentId)))
-                        {
-                            column = nameof(ContentItemIndex.DocumentId);
-                        }
-                        else
-                        {
-                            column = rowDictionary.FirstOrDefault(kv => kv.Value is long).Key
-                                ?? rowDictionary.First().Key;
-                        }
+                        column = rowDictionary.FirstOrDefault(kv => kv.Value is long).Key
+                            ?? rowDictionary.First().Key;
                     }
+                }
 
-                    return rowDictionary.TryGetValue(column, out var documentIdObject) && documentIdObject is long documentId
-                        ? documentId
-                        : 0;
-                }).ToArray();
+                return rowDictionary.TryGetValue(column, out var documentIdObject) && documentIdObject is long documentId
+                    ? documentId
+                    : 0;
+            }).ToArray();
 
-                sqlQueryResults.Items = await _session.GetAsync<ContentItem>(documentIds);
+            sqlQueryResults.Items = await _session.GetAsync<ContentItem>(documentIds);
 
-                return sqlQueryResults;
-            }
-            else
-            {
-                using var transaction = await connection.BeginTransactionAsync(_session.Store.Configuration.IsolationLevel);
-                var queryResults = await connection.QueryAsync(rawQuery, parameters, transaction);
+            return sqlQueryResults;
+        }
+        else
+        {
+            using var transaction = await connection.BeginTransactionAsync(_session.Store.Configuration.IsolationLevel);
+            var queryResults = await connection.QueryAsync(rawQuery, parameters, transaction);
 
-                var results = new List<JsonObject>();
-                foreach (var document in queryResults)
-                {
-                    results.Add(JObject.FromObject(document, _jsonSerializerOptions));
-                }
+            var results = new List<JsonObject>();
+            foreach (var document in queryResults)
+            {
+                results.Add(JObject.FromObject(document, _jsonSerializerOptions));
+            }
 
-                sqlQueryResults.Items = results;
+            sqlQueryResults.Items = results;
 
-                return sqlQueryResults;
-            }
+            return sqlQueryResults;
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/Startup.cs
index 7c7ffcc1c6a..98fb4e817d6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/Startup.cs
@@ -8,23 +8,22 @@
 using OrchardCore.Queries.Sql.Migrations;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Queries.Sql
+namespace OrchardCore.Queries.Sql;
+
+/// <summary>
+/// These services are registered on the tenant service collection.
+/// </summary>
+[Feature("OrchardCore.Queries.Sql")]
+public sealed class Startup : StartupBase
 {
-    /// <summary>
-    /// These services are registered on the tenant service collection.
-    /// </summary>
-    [Feature("OrchardCore.Queries.Sql")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<IDisplayDriver<Query>, SqlQueryDisplayDriver>();
-            services.AddQuerySource<SqlQuerySource>(SqlQuerySource.SourceName);
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<IDisplayDriver<Query>, SqlQueryDisplayDriver>();
+        services.AddQuerySource<SqlQuerySource>(SqlQuerySource.SourceName);
 
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddDataMigration<SqlQueryMigrations>();
-            services.AddScoped<IQueryHandler, SqlQueryHandler>();
-        }
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddDataMigration<SqlQueryMigrations>();
+        services.AddScoped<IQueryHandler, SqlQueryHandler>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/ViewModels/AdminQueryViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/ViewModels/AdminQueryViewModel.cs
index f4529747a8c..5eb38c99c58 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/ViewModels/AdminQueryViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/ViewModels/AdminQueryViewModel.cs
@@ -2,25 +2,24 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Queries.Sql.ViewModels
+namespace OrchardCore.Queries.Sql.ViewModels;
+
+public class AdminQueryViewModel
 {
-    public class AdminQueryViewModel
-    {
-        public static string MatchAllQueryBase64 { get; } = Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(@"SELECT * FROM ContentItemIndex"));
+    public static string MatchAllQueryBase64 { get; } = Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(@"SELECT * FROM ContentItemIndex"));
 
-        public string DecodedQuery { get; set; }
-        public string Parameters { get; set; } = "";
+    public string DecodedQuery { get; set; }
+    public string Parameters { get; set; } = "";
 
-        [BindNever]
-        public string RawSql { get; set; }
+    [BindNever]
+    public string RawSql { get; set; }
 
-        [BindNever]
-        public TimeSpan Elapsed { get; set; } = TimeSpan.Zero;
+    [BindNever]
+    public TimeSpan Elapsed { get; set; } = TimeSpan.Zero;
 
-        [BindNever]
-        public IEnumerable<dynamic> Documents { get; set; } = [];
+    [BindNever]
+    public IEnumerable<dynamic> Documents { get; set; } = [];
 
-        [BindNever]
-        public string FactoryName { get; set; }
-    }
+    [BindNever]
+    public string FactoryName { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/ViewModels/SqlQueryViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/ViewModels/SqlQueryViewModel.cs
index 02d94cce61e..6d55d8b37fb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/ViewModels/SqlQueryViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/ViewModels/SqlQueryViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Queries.Sql.ViewModels
+namespace OrchardCore.Queries.Sql.ViewModels;
+
+public class SqlQueryViewModel
 {
-    public class SqlQueryViewModel
-    {
-        public string Query { get; set; }
+    public string Query { get; set; }
 
-        public bool ReturnDocuments { get; set; }
-    }
+    public bool ReturnDocuments { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Startup.cs
index c601dbe8c8b..83e1bb1d35d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Startup.cs
@@ -15,55 +15,54 @@
 using OrchardCore.Scripting;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Queries
+namespace OrchardCore.Queries;
+
+/// <summary>
+/// These services are registered on the tenant service collection.
+/// </summary>
+public sealed class Startup : StartupBase
 {
-    /// <summary>
-    /// These services are registered on the tenant service collection.
-    /// </summary>
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IDisplayDriver<Query>, QueryDisplayDriver>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-        }
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IDisplayDriver<Query>, QueryDisplayDriver>();
+        services.AddScoped<IPermissionProvider, Permissions>();
     }
+}
 
-    [Feature("OrchardCore.Queries.Core")]
-    public sealed class CoreStartup : StartupBase
+[Feature("OrchardCore.Queries.Core")]
+public sealed class CoreStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddRecipeExecutionStep<QueryStep>();
-            services.AddDeployment<AllQueriesDeploymentSource, AllQueriesDeploymentStep, AllQueriesDeploymentStepDriver>();
-            services.AddSingleton<IGlobalMethodProvider, QueryGlobalMethodProvider>();
+        services.AddRecipeExecutionStep<QueryStep>();
+        services.AddDeployment<AllQueriesDeploymentSource, AllQueriesDeploymentStep, AllQueriesDeploymentStepDriver>();
+        services.AddSingleton<IGlobalMethodProvider, QueryGlobalMethodProvider>();
 
-            services.Configure<TemplateOptions>(o =>
+        services.Configure<TemplateOptions>(o =>
+        {
+            o.Scope.SetValue("Queries", new ObjectValue(new LiquidQueriesAccessor()));
+            o.MemberAccessStrategy.Register<LiquidQueriesAccessor, FluidValue>(async (obj, name, context) =>
             {
-                o.Scope.SetValue("Queries", new ObjectValue(new LiquidQueriesAccessor()));
-                o.MemberAccessStrategy.Register<LiquidQueriesAccessor, FluidValue>(async (obj, name, context) =>
-                {
-                    var liquidTemplateContext = (LiquidTemplateContext)context;
-                    var queryManager = liquidTemplateContext.Services.GetRequiredService<IQueryManager>();
+                var liquidTemplateContext = (LiquidTemplateContext)context;
+                var queryManager = liquidTemplateContext.Services.GetRequiredService<IQueryManager>();
 
-                    var query = await queryManager.GetQueryAsync(name);
+                var query = await queryManager.GetQueryAsync(name);
 
-                    return FluidValue.Create(query, context.Options);
-                });
-            })
-            .AddLiquidFilter<QueryFilter>("query");
+                return FluidValue.Create(query, context.Options);
+            });
+        })
+        .AddLiquidFilter<QueryFilter>("query");
 
-            services.AddScoped<IQueryManager, DefaultQueryManager>();
-        }
+        services.AddScoped<IQueryManager, DefaultQueryManager>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment", "OrchardCore.Contents")]
-    public class DeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment", "OrchardCore.Contents")]
+public class DeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<QueryBasedContentDeploymentSource, QueryBasedContentDeploymentStep, QueryBasedContentDeploymentStepDriver>();
-        }
+        services.AddDeployment<QueryBasedContentDeploymentSource, QueryBasedContentDeploymentStep, QueryBasedContentDeploymentStepDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/ViewModels/EditQueryViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Queries/ViewModels/EditQueryViewModel.cs
index cd11cfcf8fe..c91d10cced2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/ViewModels/EditQueryViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/ViewModels/EditQueryViewModel.cs
@@ -1,15 +1,14 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Queries.ViewModels
+namespace OrchardCore.Queries.ViewModels;
+
+public class EditQueryViewModel
 {
-    public class EditQueryViewModel
-    {
-        public int Id { get; set; }
-        public string Name { get; set; }
-        public string Source { get; set; }
-        public string Schema { get; set; }
+    public int Id { get; set; }
+    public string Name { get; set; }
+    public string Source { get; set; }
+    public string Schema { get; set; }
 
-        [BindNever]
-        public Query Query { get; set; }
-    }
+    [BindNever]
+    public Query Query { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/ViewModels/QueriesIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Queries/ViewModels/QueriesIndexViewModel.cs
index 251c882a3b6..6825bdca581 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/ViewModels/QueriesIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/ViewModels/QueriesIndexViewModel.cs
@@ -2,39 +2,38 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.Queries.ViewModels
+namespace OrchardCore.Queries.ViewModels;
+
+public class QueriesIndexViewModel
+{
+    public IList<QueryEntry> Queries { get; set; }
+    public ContentOptions Options { get; set; } = new ContentOptions();
+    public dynamic Pager { get; set; }
+    public IEnumerable<string> QuerySourceNames { get; set; }
+}
+
+public class QueryEntry
+{
+    public Query Query { get; set; }
+    public bool IsChecked { get; set; }
+    public dynamic Shape { get; set; }
+}
+
+public class ContentOptions
+{
+    public string Search { get; set; }
+    public ContentsBulkAction BulkAction { get; set; }
+
+    #region Lists to populate
+
+    [BindNever]
+    public List<SelectListItem> ContentsBulkAction { get; set; }
+
+    #endregion Lists to populate
+}
+
+public enum ContentsBulkAction
 {
-    public class QueriesIndexViewModel
-    {
-        public IList<QueryEntry> Queries { get; set; }
-        public ContentOptions Options { get; set; } = new ContentOptions();
-        public dynamic Pager { get; set; }
-        public IEnumerable<string> QuerySourceNames { get; set; }
-    }
-
-    public class QueryEntry
-    {
-        public Query Query { get; set; }
-        public bool IsChecked { get; set; }
-        public dynamic Shape { get; set; }
-    }
-
-    public class ContentOptions
-    {
-        public string Search { get; set; }
-        public ContentsBulkAction BulkAction { get; set; }
-
-        #region Lists to populate
-
-        [BindNever]
-        public List<SelectListItem> ContentsBulkAction { get; set; }
-
-        #endregion Lists to populate
-    }
-
-    public enum ContentsBulkAction
-    {
-        None,
-        Remove
-    }
+    None,
+    Remove
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/ViewModels/QueryBasedContentDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Queries/ViewModels/QueryBasedContentDeploymentStepViewModel.cs
index e29bd2621b8..9daeedd2b3c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/ViewModels/QueryBasedContentDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/ViewModels/QueryBasedContentDeploymentStepViewModel.cs
@@ -1,17 +1,16 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Queries.ViewModels
+namespace OrchardCore.Queries.ViewModels;
+
+public class QueryBasedContentDeploymentStepViewModel
 {
-    public class QueryBasedContentDeploymentStepViewModel
-    {
-        public string QueryName { get; set; }
+    public string QueryName { get; set; }
 
-        public string QueryParameters { get; set; } = "{}";
+    public string QueryParameters { get; set; } = "{}";
 
-        public bool ExportAsSetupRecipe { get; set; }
+    public bool ExportAsSetupRecipe { get; set; }
 
-        [BindNever]
-        public IEnumerable<Query> Queries { get; set; }
-    }
+    [BindNever]
+    public IEnumerable<Query> Queries { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/AdminMenu.cs
index ea1b7a26911..617df9d3917 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/AdminMenu.cs
@@ -4,42 +4,41 @@
 using OrchardCore.Navigation;
 using OrchardCore.ReCaptcha.Drivers;
 
-namespace OrchardCore.ReCaptcha
+namespace OrchardCore.ReCaptcha;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", ReCaptchaSettingsDisplayDriver.GroupId },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", ReCaptchaSettingsDisplayDriver.GroupId },
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
-        {
-            S = localizer;
-        }
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            builder
-                .Add(S["Security"], security => security
-                    .Add(S["Settings"], settings => settings
-                        .Add(S["reCaptcha"], S["reCaptcha"].PrefixPosition(), reCaptcha => reCaptcha
-                            .Permission(Permissions.ManageReCaptchaSettings)
-                            .Action("Index", "Admin", _routeValues)
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Security"], security => security
+                .Add(S["Settings"], settings => settings
+                    .Add(S["reCaptcha"], S["reCaptcha"].PrefixPosition(), reCaptcha => reCaptcha
+                        .Permission(Permissions.ManageReCaptchaSettings)
+                        .Action("Index", "Admin", _routeValues)
+                        .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Drivers/ReCaptchaSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Drivers/ReCaptchaSettingsDisplayDriver.cs
index 6dc073a5564..4c31e74bade 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Drivers/ReCaptchaSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Drivers/ReCaptchaSettingsDisplayDriver.cs
@@ -9,67 +9,66 @@
 using OrchardCore.ReCaptcha.ViewModels;
 using OrchardCore.Settings;
 
-namespace OrchardCore.ReCaptcha.Drivers
+namespace OrchardCore.ReCaptcha.Drivers;
+
+public sealed class ReCaptchaSettingsDisplayDriver : SiteDisplayDriver<ReCaptchaSettings>
 {
-    public sealed class ReCaptchaSettingsDisplayDriver : SiteDisplayDriver<ReCaptchaSettings>
+    public const string GroupId = "recaptcha";
+
+    private readonly IShellReleaseManager _shellReleaseManager;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+
+    public ReCaptchaSettingsDisplayDriver(
+        IShellReleaseManager shellReleaseManager,
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService)
     {
-        public const string GroupId = "recaptcha";
+        _shellReleaseManager = shellReleaseManager;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
 
-        private readonly IShellReleaseManager _shellReleaseManager;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+    protected override string SettingsGroupId
+        => GroupId;
 
-        public ReCaptchaSettingsDisplayDriver(
-            IShellReleaseManager shellReleaseManager,
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService)
+    public override async Task<IDisplayResult> EditAsync(ISite site, ReCaptchaSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageReCaptchaSettings))
         {
-            _shellReleaseManager = shellReleaseManager;
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
+            return null;
         }
 
-        protected override string SettingsGroupId
-            => GroupId;
+        context.AddTenantReloadWarningWrapper();
 
-        public override async Task<IDisplayResult> EditAsync(ISite site, ReCaptchaSettings settings, BuildEditorContext context)
+        return Initialize<ReCaptchaSettingsViewModel>("ReCaptchaSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageReCaptchaSettings))
-            {
-                return null;
-            }
-
-            context.AddTenantReloadWarningWrapper();
+            model.SiteKey = settings.SiteKey;
+            model.SecretKey = settings.SecretKey;
+        }).Location("Content")
+        .OnGroup(SettingsGroupId);
+    }
 
-            return Initialize<ReCaptchaSettingsViewModel>("ReCaptchaSettings_Edit", model =>
-            {
-                model.SiteKey = settings.SiteKey;
-                model.SecretKey = settings.SecretKey;
-            }).Location("Content")
-            .OnGroup(SettingsGroupId);
-        }
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, ReCaptchaSettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, ReCaptchaSettings settings, UpdateEditorContext context)
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageReCaptchaSettings))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageReCaptchaSettings))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var model = new ReCaptchaSettingsViewModel();
+        var model = new ReCaptchaSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            settings.SiteKey = model.SiteKey?.Trim();
-            settings.SecretKey = model.SecretKey?.Trim();
+        settings.SiteKey = model.SiteKey?.Trim();
+        settings.SecretKey = model.SecretKey?.Trim();
 
-            _shellReleaseManager.RequestRelease();
+        _shellReleaseManager.RequestRelease();
 
-            return await EditAsync(site, settings, context);
-        }
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/Migrations.cs
index 7eed71debd2..7d8f01f0a27 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/Migrations.cs
@@ -3,27 +3,26 @@
 using OrchardCore.ContentManagement.Metadata.Settings;
 using OrchardCore.Data.Migration;
 
-namespace OrchardCore.ReCaptcha.Forms
+namespace OrchardCore.ReCaptcha.Forms;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        public Migrations(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public Migrations(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public async Task<int> CreateAsync()
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync("ReCaptchaPart", part => part
-                .WithDescription("Provides captcha properties."));
+    public async Task<int> CreateAsync()
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync("ReCaptchaPart", part => part
+            .WithDescription("Provides captcha properties."));
 
-            await _contentDefinitionManager.AlterTypeDefinitionAsync("ReCaptcha", type => type
-                .WithPart("ReCaptchaPart")
-                .Stereotype("Widget"));
+        await _contentDefinitionManager.AlterTypeDefinitionAsync("ReCaptcha", type => type
+            .WithPart("ReCaptchaPart")
+            .Stereotype("Widget"));
 
-            return 1;
-        }
+        return 1;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/ReCaptchaPart.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/ReCaptchaPart.cs
index cd4fd2847f9..4027b7a9dc2 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/ReCaptchaPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/ReCaptchaPart.cs
@@ -1,8 +1,7 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.ReCaptcha.Forms
+namespace OrchardCore.ReCaptcha.Forms;
+
+public class ReCaptchaPart : ContentPart
 {
-    public class ReCaptchaPart : ContentPart
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/ReCaptchaPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/ReCaptchaPartDisplayDriver.cs
index d5acf04d6a4..bba0e70dbca 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/ReCaptchaPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/ReCaptchaPartDisplayDriver.cs
@@ -4,33 +4,32 @@
 using OrchardCore.ReCaptcha.Configuration;
 using OrchardCore.Settings;
 
-namespace OrchardCore.ReCaptcha.Forms
+namespace OrchardCore.ReCaptcha.Forms;
+
+public sealed class ReCaptchaPartDisplayDriver : ContentPartDisplayDriver<ReCaptchaPart>
 {
-    public sealed class ReCaptchaPartDisplayDriver : ContentPartDisplayDriver<ReCaptchaPart>
-    {
-        private readonly ISiteService _siteService;
+    private readonly ISiteService _siteService;
 
-        public ReCaptchaPartDisplayDriver(ISiteService siteService)
-        {
-            _siteService = siteService;
-        }
+    public ReCaptchaPartDisplayDriver(ISiteService siteService)
+    {
+        _siteService = siteService;
+    }
 
-        public override IDisplayResult Display(ReCaptchaPart part, BuildPartDisplayContext context)
+    public override IDisplayResult Display(ReCaptchaPart part, BuildPartDisplayContext context)
+    {
+        return Initialize<ReCaptchaPartViewModel>("ReCaptchaPart", async model =>
         {
-            return Initialize<ReCaptchaPartViewModel>("ReCaptchaPart", async model =>
-            {
-                var settings = await _siteService.GetSettingsAsync<ReCaptchaSettings>();
-                model.SettingsAreConfigured = settings.IsValid();
-            }).Location("Detail", "Content");
-        }
+            var settings = await _siteService.GetSettingsAsync<ReCaptchaSettings>();
+            model.SettingsAreConfigured = settings.IsValid();
+        }).Location("Detail", "Content");
+    }
 
-        public override IDisplayResult Edit(ReCaptchaPart part, BuildPartEditorContext context)
+    public override IDisplayResult Edit(ReCaptchaPart part, BuildPartEditorContext context)
+    {
+        return Initialize<ReCaptchaPartViewModel>("ReCaptchaPart_Fields_Edit", async model =>
         {
-            return Initialize<ReCaptchaPartViewModel>("ReCaptchaPart_Fields_Edit", async model =>
-            {
-                var settings = await _siteService.GetSettingsAsync<ReCaptchaSettings>();
-                model.SettingsAreConfigured = settings.IsValid();
-            });
-        }
+            var settings = await _siteService.GetSettingsAsync<ReCaptchaSettings>();
+            model.SettingsAreConfigured = settings.IsValid();
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/ReCaptchaPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/ReCaptchaPartViewModel.cs
index 51ce1a4ca1d..6440930181c 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/ReCaptchaPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/ReCaptchaPartViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.ReCaptcha.Forms
+namespace OrchardCore.ReCaptcha.Forms;
+
+public class ReCaptchaPartViewModel
 {
-    public class ReCaptchaPartViewModel
-    {
-        public bool SettingsAreConfigured { get; set; }
-    }
+    public bool SettingsAreConfigured { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/Startup.cs
index bb3d4d3a1e8..43cec8ea712 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Forms/Startup.cs
@@ -5,22 +5,21 @@
 using OrchardCore.Data.Migration;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ReCaptcha.Forms
+namespace OrchardCore.ReCaptcha.Forms;
+
+[RequireFeatures("OrchardCore.Forms", "OrchardCore.ReCaptcha")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Forms", "OrchardCore.ReCaptcha")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<ReCaptchaPart>();
-            });
+            o.MemberAccessStrategy.Register<ReCaptchaPart>();
+        });
 
-            services.AddContentPart<ReCaptchaPart>()
-                .UseDisplayDriver<ReCaptchaPartDisplayDriver>();
+        services.AddContentPart<ReCaptchaPart>()
+            .UseDisplayDriver<ReCaptchaPartDisplayDriver>();
 
-            services.AddDataMigration<Migrations>();
-        }
+        services.AddDataMigration<Migrations>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Startup.cs
index 32274a3b8e1..5d0b1ce96cd 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Startup.cs
@@ -13,61 +13,60 @@
 using OrchardCore.Users.Events;
 using OrchardCore.Users.Models;
 
-namespace OrchardCore.ReCaptcha
+namespace OrchardCore.ReCaptcha;
+
+[Feature("OrchardCore.ReCaptcha")]
+public sealed class Startup : StartupBase
 {
-    [Feature("OrchardCore.ReCaptcha")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddReCaptcha();
+        services.AddReCaptcha();
 
-            services.AddScoped<IDisplayDriver<ISite>, ReCaptchaSettingsDisplayDriver>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-        }
+        services.AddScoped<IDisplayDriver<ISite>, ReCaptchaSettingsDisplayDriver>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IPermissionProvider, Permissions>();
     }
+}
 
-    [Feature("OrchardCore.ReCaptcha")]
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class DeploymentStartup : StartupBase
+[Feature("OrchardCore.ReCaptcha")]
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class DeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSiteSettingsPropertyDeploymentStep<ReCaptchaSettings, DeploymentStartup>(S => S["ReCaptcha settings"], S => S["Exports the ReCaptcha settings."]);
-        }
+        services.AddSiteSettingsPropertyDeploymentStep<ReCaptchaSettings, DeploymentStartup>(S => S["ReCaptcha settings"], S => S["Exports the ReCaptcha settings."]);
     }
+}
 
-    [Feature("OrchardCore.ReCaptcha.Users")]
-    public sealed class UsersStartup : StartupBase
+[Feature("OrchardCore.ReCaptcha.Users")]
+public sealed class UsersStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IRegistrationFormEvents, RegistrationFormEventHandler>();
-            services.AddScoped<ILoginFormEvent, LoginFormEventEventHandler>();
-            services.AddScoped<IPasswordRecoveryFormEvents, PasswordRecoveryFormEventEventHandler>();
-            services.AddScoped<IDisplayDriver<LoginForm>, ReCaptchaLoginFormDisplayDriver>();
-        }
+        services.AddScoped<IRegistrationFormEvents, RegistrationFormEventHandler>();
+        services.AddScoped<ILoginFormEvent, LoginFormEventEventHandler>();
+        services.AddScoped<IPasswordRecoveryFormEvents, PasswordRecoveryFormEventEventHandler>();
+        services.AddScoped<IDisplayDriver<LoginForm>, ReCaptchaLoginFormDisplayDriver>();
     }
+}
 
-    [Feature("OrchardCore.ReCaptcha.Users")]
-    [RequireFeatures(UserConstants.Features.ResetPassword)]
-    public sealed class UsersResetPasswordStartup : StartupBase
+[Feature("OrchardCore.ReCaptcha.Users")]
+[RequireFeatures(UserConstants.Features.ResetPassword)]
+public sealed class UsersResetPasswordStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IDisplayDriver<ForgotPasswordForm>, ReCaptchaForgotPasswordFormDisplayDriver>();
-            services.AddScoped<IDisplayDriver<ResetPasswordForm>, ReCaptchaResetPasswordFormDisplayDriver>();
-        }
+        services.AddScoped<IDisplayDriver<ForgotPasswordForm>, ReCaptchaForgotPasswordFormDisplayDriver>();
+        services.AddScoped<IDisplayDriver<ResetPasswordForm>, ReCaptchaResetPasswordFormDisplayDriver>();
     }
+}
 
-    [Feature("OrchardCore.ReCaptcha.Users")]
-    [RequireFeatures(UserConstants.Features.UserRegistration)]
-    public sealed class UsersRegistrationStartup : StartupBase
+[Feature("OrchardCore.ReCaptcha.Users")]
+[RequireFeatures(UserConstants.Features.UserRegistration)]
+public sealed class UsersRegistrationStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IDisplayDriver<RegisterUserForm>, RegisterUserFormDisplayDriver>();
-        }
+        services.AddScoped<IDisplayDriver<RegisterUserForm>, RegisterUserFormDisplayDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Users/Handlers/LoginFormEventEventHandler.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Users/Handlers/LoginFormEventEventHandler.cs
index 1509864b5c2..a5ffe17f757 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Users/Handlers/LoginFormEventEventHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Users/Handlers/LoginFormEventEventHandler.cs
@@ -4,43 +4,42 @@
 using OrchardCore.Users;
 using OrchardCore.Users.Events;
 
-namespace OrchardCore.ReCaptcha.Users.Handlers
+namespace OrchardCore.ReCaptcha.Users.Handlers;
+
+public class LoginFormEventEventHandler : ILoginFormEvent
 {
-    public class LoginFormEventEventHandler : ILoginFormEvent
-    {
-        private readonly ReCaptchaService _reCaptchaService;
+    private readonly ReCaptchaService _reCaptchaService;
 
-        public LoginFormEventEventHandler(ReCaptchaService reCaptchaService)
-        {
-            _reCaptchaService = reCaptchaService;
-        }
+    public LoginFormEventEventHandler(ReCaptchaService reCaptchaService)
+    {
+        _reCaptchaService = reCaptchaService;
+    }
 
-        public Task IsLockedOutAsync(IUser user) => Task.CompletedTask;
+    public Task IsLockedOutAsync(IUser user) => Task.CompletedTask;
 
-        public Task LoggedInAsync(IUser user)
-        {
-            _reCaptchaService.ThisIsAHuman();
-            return Task.CompletedTask;
-        }
+    public Task LoggedInAsync(IUser user)
+    {
+        _reCaptchaService.ThisIsAHuman();
+        return Task.CompletedTask;
+    }
 
-        public async Task LoggingInAsync(string userName, Action<string, string> reportError)
+    public async Task LoggingInAsync(string userName, Action<string, string> reportError)
+    {
+        if (_reCaptchaService.IsThisARobot())
         {
-            if (_reCaptchaService.IsThisARobot())
-            {
-                await _reCaptchaService.ValidateCaptchaAsync(reportError);
-            }
+            await _reCaptchaService.ValidateCaptchaAsync(reportError);
         }
+    }
 
-        public Task LoggingInFailedAsync(string userName)
-        {
-            _reCaptchaService.MaybeThisIsARobot();
-            return Task.CompletedTask;
-        }
+    public Task LoggingInFailedAsync(string userName)
+    {
+        _reCaptchaService.MaybeThisIsARobot();
+        return Task.CompletedTask;
+    }
 
-        public Task LoggingInFailedAsync(IUser user)
-        {
-            _reCaptchaService.MaybeThisIsARobot();
-            return Task.CompletedTask;
-        }
+    public Task LoggingInFailedAsync(IUser user)
+    {
+        _reCaptchaService.MaybeThisIsARobot();
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Users/Handlers/PasswordRecoveryFormEventEventHandler.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Users/Handlers/PasswordRecoveryFormEventEventHandler.cs
index b5dfc9e7d86..7535e4a31f7 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Users/Handlers/PasswordRecoveryFormEventEventHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Users/Handlers/PasswordRecoveryFormEventEventHandler.cs
@@ -3,35 +3,34 @@
 using OrchardCore.ReCaptcha.Services;
 using OrchardCore.Users.Events;
 
-namespace OrchardCore.ReCaptcha.Users.Handlers
+namespace OrchardCore.ReCaptcha.Users.Handlers;
+
+public class PasswordRecoveryFormEventEventHandler : IPasswordRecoveryFormEvents
 {
-    public class PasswordRecoveryFormEventEventHandler : IPasswordRecoveryFormEvents
-    {
-        private readonly ReCaptchaService _recaptchaService;
+    private readonly ReCaptchaService _recaptchaService;
 
-        public PasswordRecoveryFormEventEventHandler(ReCaptchaService recaptchaService)
-        {
-            _recaptchaService = recaptchaService;
-        }
+    public PasswordRecoveryFormEventEventHandler(ReCaptchaService recaptchaService)
+    {
+        _recaptchaService = recaptchaService;
+    }
 
-        public Task RecoveringPasswordAsync(Action<string, string> reportError)
-        {
-            return _recaptchaService.ValidateCaptchaAsync(reportError);
-        }
+    public Task RecoveringPasswordAsync(Action<string, string> reportError)
+    {
+        return _recaptchaService.ValidateCaptchaAsync(reportError);
+    }
 
-        public Task PasswordResetAsync(PasswordRecoveryContext context)
-        {
-            return Task.CompletedTask;
-        }
+    public Task PasswordResetAsync(PasswordRecoveryContext context)
+    {
+        return Task.CompletedTask;
+    }
 
-        public Task ResettingPasswordAsync(Action<string, string> reportError)
-        {
-            return _recaptchaService.ValidateCaptchaAsync(reportError);
-        }
+    public Task ResettingPasswordAsync(Action<string, string> reportError)
+    {
+        return _recaptchaService.ValidateCaptchaAsync(reportError);
+    }
 
-        public Task PasswordRecoveredAsync(PasswordRecoveryContext context)
-        {
-            return Task.CompletedTask;
-        }
+    public Task PasswordRecoveredAsync(PasswordRecoveryContext context)
+    {
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Users/Handlers/RegistrationFormEventHandler.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Users/Handlers/RegistrationFormEventHandler.cs
index 3d8eaae9b45..a4a33519bc2 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Users/Handlers/RegistrationFormEventHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Users/Handlers/RegistrationFormEventHandler.cs
@@ -4,25 +4,24 @@
 using OrchardCore.Users;
 using OrchardCore.Users.Events;
 
-namespace OrchardCore.ReCaptcha.Users.Handlers
+namespace OrchardCore.ReCaptcha.Users.Handlers;
+
+public class RegistrationFormEventHandler : IRegistrationFormEvents
 {
-    public class RegistrationFormEventHandler : IRegistrationFormEvents
-    {
-        private readonly ReCaptchaService _reCaptchaService;
+    private readonly ReCaptchaService _reCaptchaService;
 
-        public RegistrationFormEventHandler(ReCaptchaService recaptchaService)
-        {
-            _reCaptchaService = recaptchaService;
-        }
+    public RegistrationFormEventHandler(ReCaptchaService recaptchaService)
+    {
+        _reCaptchaService = recaptchaService;
+    }
 
-        public Task RegisteredAsync(IUser user)
-        {
-            return Task.CompletedTask;
-        }
+    public Task RegisteredAsync(IUser user)
+    {
+        return Task.CompletedTask;
+    }
 
-        public Task RegistrationValidationAsync(Action<string, string> reportError)
-        {
-            return _reCaptchaService.ValidateCaptchaAsync(reportError);
-        }
+    public Task RegistrationValidationAsync(Action<string, string> reportError)
+    {
+        return _reCaptchaService.ValidateCaptchaAsync(reportError);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/ViewModels/ReCaptchaSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/ViewModels/ReCaptchaSettingsViewModel.cs
index a1802f0d2d1..ae91239f56d 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/ViewModels/ReCaptchaSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/ViewModels/ReCaptchaSettingsViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.ReCaptcha.ViewModels
+namespace OrchardCore.ReCaptcha.ViewModels;
+
+public class ReCaptchaSettingsViewModel
 {
-    public class ReCaptchaSettingsViewModel
-    {
-        public string SiteKey { get; set; }
+    public string SiteKey { get; set; }
 
-        public string SecretKey { get; set; }
-    }
+    public string SecretKey { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Workflows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Workflows/Startup.cs
index b157a02e4f6..5637f483997 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Workflows/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Workflows/Startup.cs
@@ -2,14 +2,13 @@
 using OrchardCore.Modules;
 using OrchardCore.Workflows.Helpers;
 
-namespace OrchardCore.ReCaptcha.Workflows
+namespace OrchardCore.ReCaptcha.Workflows;
+
+[RequireFeatures("OrchardCore.Workflows", "OrchardCore.ReCaptcha")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Workflows", "OrchardCore.ReCaptcha")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddActivity<ValidateReCaptchaTask, ValidateReCaptchaTaskDisplayDriver>();
-        }
+        services.AddActivity<ValidateReCaptchaTask, ValidateReCaptchaTaskDisplayDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Workflows/ValidateReCaptchaTask.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Workflows/ValidateReCaptchaTask.cs
index 5d5167c1e63..2e8652d41ad 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Workflows/ValidateReCaptchaTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Workflows/ValidateReCaptchaTask.cs
@@ -7,49 +7,48 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.ReCaptcha.Workflows
+namespace OrchardCore.ReCaptcha.Workflows;
+
+public class ValidateReCaptchaTask : TaskActivity<ValidateReCaptchaTask>
 {
-    public class ValidateReCaptchaTask : TaskActivity<ValidateReCaptchaTask>
+    private readonly ReCaptchaService _reCaptchaService;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    protected readonly IStringLocalizer S;
+
+    public ValidateReCaptchaTask(
+        ReCaptchaService reCaptchaService,
+        IUpdateModelAccessor updateModelAccessor,
+        IStringLocalizer<ValidateReCaptchaTask> localizer
+    )
     {
-        private readonly ReCaptchaService _reCaptchaService;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        protected readonly IStringLocalizer S;
-
-        public ValidateReCaptchaTask(
-            ReCaptchaService reCaptchaService,
-            IUpdateModelAccessor updateModelAccessor,
-            IStringLocalizer<ValidateReCaptchaTask> localizer
-        )
-        {
-            _reCaptchaService = reCaptchaService;
-            _updateModelAccessor = updateModelAccessor;
-            S = localizer;
-        }
+        _reCaptchaService = reCaptchaService;
+        _updateModelAccessor = updateModelAccessor;
+        S = localizer;
+    }
 
-        public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
+    public override LocalizedString DisplayText => S["Validate ReCaptcha Task"];
 
-        public override LocalizedString Category => S["Validation"];
+    public override LocalizedString Category => S["Validation"];
 
-        public override bool HasEditor => false;
+    public override bool HasEditor => false;
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-        }
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
+    }
 
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var outcome = "Valid";
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var outcome = "Valid";
 
-            await _reCaptchaService.ValidateCaptchaAsync((key, error) =>
-            {
-                var updater = _updateModelAccessor.ModelUpdater;
-                outcome = "Invalid";
+        await _reCaptchaService.ValidateCaptchaAsync((key, error) =>
+        {
+            var updater = _updateModelAccessor.ModelUpdater;
+            outcome = "Invalid";
 
-                updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
-            });
+            updater?.ModelState.TryAddModelError(Constants.ReCaptchaServerResponseHeaderName, S["Captcha validation failed. Try again."]);
+        });
 
-            return Outcomes("Done", outcome);
-        }
+        return Outcomes("Done", outcome);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Workflows/ValidateReCaptchaTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Workflows/ValidateReCaptchaTaskDisplayDriver.cs
index f2db8d400b1..698532ef544 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Workflows/ValidateReCaptchaTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Workflows/ValidateReCaptchaTaskDisplayDriver.cs
@@ -1,8 +1,7 @@
 using OrchardCore.Workflows.Display;
 
-namespace OrchardCore.ReCaptcha.Workflows
+namespace OrchardCore.ReCaptcha.Workflows;
+
+public sealed class ValidateReCaptchaTaskDisplayDriver : ActivityDisplayDriver<ValidateReCaptchaTask>
 {
-    public sealed class ValidateReCaptchaTaskDisplayDriver : ActivityDisplayDriver<ValidateReCaptchaTask>
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Recipes/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Recipes/AdminMenu.cs
index b56a6b82ae8..a724373258f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Recipes/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Recipes/AdminMenu.cs
@@ -3,36 +3,35 @@
 using OrchardCore.Navigation;
 using OrchardCore.Security;
 
-namespace OrchardCore.Recipes
+namespace OrchardCore.Recipes;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    internal readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["Recipes"], S["Recipes"].PrefixPosition(), recipes => recipes
-                        .AddClass("recipes")
-                        .Id("recipes")
-                        .Permission(StandardPermissions.SiteOwner)
-                        .Action("Index", "Admin", "OrchardCore.Recipes")
-                        .LocalNav()
-                    )
-                );
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["Recipes"], S["Recipes"].PrefixPosition(), recipes => recipes
+                    .AddClass("recipes")
+                    .Id("recipes")
+                    .Permission(StandardPermissions.SiteOwner)
+                    .Action("Index", "Admin", "OrchardCore.Recipes")
+                    .LocalNav()
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Recipes/Commands/RecipesCommands.cs b/src/OrchardCore.Modules/OrchardCore.Recipes/Commands/RecipesCommands.cs
index 11f8b2d4deb..a2abdb0107d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Recipes/Commands/RecipesCommands.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Recipes/Commands/RecipesCommands.cs
@@ -5,45 +5,44 @@
 using OrchardCore.Environment.Commands;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Recipes.Commands
+namespace OrchardCore.Recipes.Commands;
+
+public class RecipesCommands : DefaultCommandHandler
 {
-    public class RecipesCommands : DefaultCommandHandler
+    private readonly IEnumerable<IRecipeHarvester> _recipeHarvesters;
+
+    public RecipesCommands(
+        IEnumerable<IRecipeHarvester> recipeHarvesters,
+        IStringLocalizer<RecipesCommands> localizer) : base(localizer)
     {
-        private readonly IEnumerable<IRecipeHarvester> _recipeHarvesters;
+        _recipeHarvesters = recipeHarvesters;
+    }
 
-        public RecipesCommands(
-            IEnumerable<IRecipeHarvester> recipeHarvesters,
-            IStringLocalizer<RecipesCommands> localizer) : base(localizer)
-        {
-            _recipeHarvesters = recipeHarvesters;
-        }
+    [CommandHelp("recipes harvest", "\tDisplays a list of available recipes.")]
+    [CommandName("recipes harvest")]
+    public async Task Harvest()
+    {
+        var recipeCollections = await Task.WhenAll(_recipeHarvesters.Select(x => x.HarvestRecipesAsync()));
+        var recipes = recipeCollections.SelectMany(x => x).ToArray();
 
-        [CommandHelp("recipes harvest", "\tDisplays a list of available recipes.")]
-        [CommandName("recipes harvest")]
-        public async Task Harvest()
+        if (recipes.Length == 0)
         {
-            var recipeCollections = await Task.WhenAll(_recipeHarvesters.Select(x => x.HarvestRecipesAsync()));
-            var recipes = recipeCollections.SelectMany(x => x).ToArray();
-
-            if (recipes.Length == 0)
-            {
-                await Context.Output.WriteLineAsync(S["No recipes found."]);
-                return;
-            }
+            await Context.Output.WriteLineAsync(S["No recipes found."]);
+            return;
+        }
 
-            await Context.Output.WriteLineAsync(S["List of available recipes"]);
-            await Context.Output.WriteLineAsync("--------------------------");
-            await Context.Output.WriteLineAsync();
+        await Context.Output.WriteLineAsync(S["List of available recipes"]);
+        await Context.Output.WriteLineAsync("--------------------------");
+        await Context.Output.WriteLineAsync();
 
-            foreach (var recipe in recipes)
-            {
-                await Context.Output.WriteLineAsync(S["Recipe: {0}", recipe.Name]);
-                await Context.Output.WriteLineAsync(S["  Version:     {0}", recipe.Version]);
-                await Context.Output.WriteLineAsync(S["  Tags:        {0}", string.Join(",", recipe.Tags)]);
-                await Context.Output.WriteLineAsync(S["  Description: {0}", recipe.Description]);
-                await Context.Output.WriteLineAsync(S["  Author:      {0}", recipe.Author]);
-                await Context.Output.WriteLineAsync(S["  Website:     {0}", recipe.WebSite]);
-            }
+        foreach (var recipe in recipes)
+        {
+            await Context.Output.WriteLineAsync(S["Recipe: {0}", recipe.Name]);
+            await Context.Output.WriteLineAsync(S["  Version:     {0}", recipe.Version]);
+            await Context.Output.WriteLineAsync(S["  Tags:        {0}", string.Join(",", recipe.Tags)]);
+            await Context.Output.WriteLineAsync(S["  Description: {0}", recipe.Description]);
+            await Context.Output.WriteLineAsync(S["  Author:      {0}", recipe.Author]);
+            await Context.Output.WriteLineAsync(S["  Website:     {0}", recipe.WebSite]);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Recipes/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Recipes/Controllers/AdminController.cs
index 401a534ce9c..e416e007bcf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Recipes/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Recipes/Controllers/AdminController.cs
@@ -18,133 +18,132 @@
 using OrchardCore.Recipes.ViewModels;
 using OrchardCore.Security;
 
-namespace OrchardCore.Recipes.Controllers
+namespace OrchardCore.Recipes.Controllers;
+
+[Admin("Recipes/{action}", "Recipes{action}")]
+public class AdminController : Controller
 {
-    [Admin("Recipes/{action}", "Recipes{action}")]
-    public class AdminController : Controller
+    private readonly IShellHost _shellHost;
+    private readonly ShellSettings _shellSettings;
+    private readonly IShellFeaturesManager _shellFeaturesManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IEnumerable<IRecipeHarvester> _recipeHarvesters;
+    private readonly IRecipeExecutor _recipeExecutor;
+    private readonly IEnumerable<IRecipeEnvironmentProvider> _environmentProviders;
+    private readonly INotifier _notifier;
+    private readonly ILogger _logger;
+
+    protected readonly IHtmlLocalizer H;
+    protected readonly IStringLocalizer S;
+
+    public AdminController(
+        IShellHost shellHost,
+        ShellSettings shellSettings,
+        IShellFeaturesManager shellFeaturesManager,
+        IAuthorizationService authorizationService,
+        IEnumerable<IRecipeHarvester> recipeHarvesters,
+        IRecipeExecutor recipeExecutor,
+        IEnumerable<IRecipeEnvironmentProvider> environmentProviders,
+        INotifier notifier,
+        ILogger<AdminController> logger,
+        IHtmlLocalizer<AdminController> htmlLocalizer,
+        IStringLocalizer<AdminController> stringLocalizer)
     {
-        private readonly IShellHost _shellHost;
-        private readonly ShellSettings _shellSettings;
-        private readonly IShellFeaturesManager _shellFeaturesManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IEnumerable<IRecipeHarvester> _recipeHarvesters;
-        private readonly IRecipeExecutor _recipeExecutor;
-        private readonly IEnumerable<IRecipeEnvironmentProvider> _environmentProviders;
-        private readonly INotifier _notifier;
-        private readonly ILogger _logger;
-
-        protected readonly IHtmlLocalizer H;
-        protected readonly IStringLocalizer S;
-
-        public AdminController(
-            IShellHost shellHost,
-            ShellSettings shellSettings,
-            IShellFeaturesManager shellFeaturesManager,
-            IAuthorizationService authorizationService,
-            IEnumerable<IRecipeHarvester> recipeHarvesters,
-            IRecipeExecutor recipeExecutor,
-            IEnumerable<IRecipeEnvironmentProvider> environmentProviders,
-            INotifier notifier,
-            ILogger<AdminController> logger,
-            IHtmlLocalizer<AdminController> htmlLocalizer,
-            IStringLocalizer<AdminController> stringLocalizer)
-        {
-            _shellHost = shellHost;
-            _shellSettings = shellSettings;
-            _shellFeaturesManager = shellFeaturesManager;
-            _authorizationService = authorizationService;
-            _recipeHarvesters = recipeHarvesters;
-            _recipeExecutor = recipeExecutor;
-            _environmentProviders = environmentProviders;
-            _notifier = notifier;
-            _logger = logger;
-            H = htmlLocalizer;
-            S = stringLocalizer;
-        }
+        _shellHost = shellHost;
+        _shellSettings = shellSettings;
+        _shellFeaturesManager = shellFeaturesManager;
+        _authorizationService = authorizationService;
+        _recipeHarvesters = recipeHarvesters;
+        _recipeExecutor = recipeExecutor;
+        _environmentProviders = environmentProviders;
+        _notifier = notifier;
+        _logger = logger;
+        H = htmlLocalizer;
+        S = stringLocalizer;
+    }
 
-        [Admin("Recipes", "Recipes")]
-        public async Task<ActionResult> Index()
+    [Admin("Recipes", "Recipes")]
+    public async Task<ActionResult> Index()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, StandardPermissions.SiteOwner))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, StandardPermissions.SiteOwner))
-            {
-                return Forbid();
-            }
-
-            var features = await _shellFeaturesManager.GetAvailableFeaturesAsync();
-            var recipes = await GetRecipesAsync(features);
-
-            var model = recipes.Select(recipe => new RecipeViewModel
-            {
-                Name = recipe.Name,
-                DisplayName = recipe.DisplayName,
-                FileName = recipe.RecipeFileInfo.Name,
-                BasePath = recipe.BasePath,
-                Tags = recipe.Tags,
-                IsSetupRecipe = recipe.IsSetupRecipe,
-                Feature = features.FirstOrDefault(f => recipe.BasePath.Contains(f.Extension.SubPath))?.Name ?? "Application",
-                Description = recipe.Description
-            }).ToArray();
-
-            return View(model);
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<ActionResult> Execute(string basePath, string fileName)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, StandardPermissions.SiteOwner))
-            {
-                return Forbid();
-            }
-
-            var features = await _shellFeaturesManager.GetAvailableFeaturesAsync();
-            var recipes = await GetRecipesAsync(features);
+        var features = await _shellFeaturesManager.GetAvailableFeaturesAsync();
+        var recipes = await GetRecipesAsync(features);
 
-            var recipe = recipes.FirstOrDefault(c => c.RecipeFileInfo.Name == fileName && c.BasePath == basePath);
+        var model = recipes.Select(recipe => new RecipeViewModel
+        {
+            Name = recipe.Name,
+            DisplayName = recipe.DisplayName,
+            FileName = recipe.RecipeFileInfo.Name,
+            BasePath = recipe.BasePath,
+            Tags = recipe.Tags,
+            IsSetupRecipe = recipe.IsSetupRecipe,
+            Feature = features.FirstOrDefault(f => recipe.BasePath.Contains(f.Extension.SubPath))?.Name ?? "Application",
+            Description = recipe.Description
+        }).ToArray();
+
+        return View(model);
+    }
 
-            if (recipe == null)
-            {
-                await _notifier.ErrorAsync(H["Recipe was not found."]);
-                return RedirectToAction(nameof(Index));
-            }
+    [HttpPost]
+    public async Task<ActionResult> Execute(string basePath, string fileName)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, StandardPermissions.SiteOwner))
+        {
+            return Forbid();
+        }
 
-            var environment = new Dictionary<string, object>();
-            await _environmentProviders.OrderBy(x => x.Order).InvokeAsync((provider, env) => provider.PopulateEnvironmentAsync(env), environment, _logger);
+        var features = await _shellFeaturesManager.GetAvailableFeaturesAsync();
+        var recipes = await GetRecipesAsync(features);
 
-            try
-            {
-                var executionId = Guid.NewGuid().ToString("n");
+        var recipe = recipes.FirstOrDefault(c => c.RecipeFileInfo.Name == fileName && c.BasePath == basePath);
 
-                await _recipeExecutor.ExecuteAsync(executionId, recipe, environment, CancellationToken.None);
+        if (recipe == null)
+        {
+            await _notifier.ErrorAsync(H["Recipe was not found."]);
+            return RedirectToAction(nameof(Index));
+        }
 
-                await _shellHost.ReleaseShellContextAsync(_shellSettings);
+        var environment = new Dictionary<string, object>();
+        await _environmentProviders.OrderBy(x => x.Order).InvokeAsync((provider, env) => provider.PopulateEnvironmentAsync(env), environment, _logger);
 
-                await _notifier.SuccessAsync(H["The recipe '{0}' has been run successfully.", recipe.DisplayName]);
-            }
-            catch (RecipeExecutionException e)
-            {
-                _logger.LogError(e, "Unable to import a recipe file.");
+        try
+        {
+            var executionId = Guid.NewGuid().ToString("n");
 
-                await _notifier.ErrorAsync(H["The recipe '{0}' failed to run do to the following errors: {1}", recipe.DisplayName, string.Join(' ', e.StepResult.Errors)]);
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "Unable to import a recipe file.");
+            await _recipeExecutor.ExecuteAsync(executionId, recipe, environment, CancellationToken.None);
 
-                await _notifier.ErrorAsync(H["Unexpected error occurred while running the '{0}' recipe.", recipe.DisplayName]);
-            }
+            await _shellHost.ReleaseShellContextAsync(_shellSettings);
 
-            return RedirectToAction(nameof(Index));
+            await _notifier.SuccessAsync(H["The recipe '{0}' has been run successfully.", recipe.DisplayName]);
         }
+        catch (RecipeExecutionException e)
+        {
+            _logger.LogError(e, "Unable to import a recipe file.");
 
-        private async Task<IEnumerable<RecipeDescriptor>> GetRecipesAsync(IEnumerable<IFeatureInfo> features)
+            await _notifier.ErrorAsync(H["The recipe '{0}' failed to run do to the following errors: {1}", recipe.DisplayName, string.Join(' ', e.StepResult.Errors)]);
+        }
+        catch (Exception e)
         {
-            var recipeCollections = await Task.WhenAll(_recipeHarvesters.Select(x => x.HarvestRecipesAsync()));
-            var recipes = recipeCollections.SelectMany(x => x)
-                .Where(r => !r.IsSetupRecipe &&
-                    (r.Tags == null || !r.Tags.Contains("hidden", StringComparer.InvariantCultureIgnoreCase)) &&
-                    features.Any(f => r.BasePath != null && f.Extension?.SubPath != null && r.BasePath.Contains(f.Extension.SubPath, StringComparison.OrdinalIgnoreCase)));
+            _logger.LogError(e, "Unable to import a recipe file.");
 
-            return recipes;
+            await _notifier.ErrorAsync(H["Unexpected error occurred while running the '{0}' recipe.", recipe.DisplayName]);
         }
+
+        return RedirectToAction(nameof(Index));
+    }
+
+    private async Task<IEnumerable<RecipeDescriptor>> GetRecipesAsync(IEnumerable<IFeatureInfo> features)
+    {
+        var recipeCollections = await Task.WhenAll(_recipeHarvesters.Select(x => x.HarvestRecipesAsync()));
+        var recipes = recipeCollections.SelectMany(x => x)
+            .Where(r => !r.IsSetupRecipe &&
+                (r.Tags == null || !r.Tags.Contains("hidden", StringComparer.InvariantCultureIgnoreCase)) &&
+                features.Any(f => r.BasePath != null && f.Extension?.SubPath != null && r.BasePath.Contains(f.Extension.SubPath, StringComparison.OrdinalIgnoreCase)));
+
+        return recipes;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Recipes/RecipeSteps/CommandStep.cs b/src/OrchardCore.Modules/OrchardCore.Recipes/RecipeSteps/CommandStep.cs
index 2e260ecce5a..661f7f6db5c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Recipes/RecipeSteps/CommandStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Recipes/RecipeSteps/CommandStep.cs
@@ -8,58 +8,57 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Recipes.RecipeSteps
+namespace OrchardCore.Recipes.RecipeSteps;
+
+/// <summary>
+/// This recipe step executes a set of commands.
+/// </summary>
+public sealed class CommandStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step executes a set of commands.
-    /// </summary>
-    public sealed class CommandStep : IRecipeStepHandler
+    private readonly ICommandManager _commandManager;
+    private readonly ICommandParser _commandParser;
+    private readonly ICommandParametersParser _commandParameterParser;
+    private readonly ILogger _logger;
+
+    public CommandStep(ICommandManager commandManager,
+        ICommandParser commandParser,
+        ICommandParametersParser commandParameterParser,
+        ILogger<CommandStep> logger)
     {
-        private readonly ICommandManager _commandManager;
-        private readonly ICommandParser _commandParser;
-        private readonly ICommandParametersParser _commandParameterParser;
-        private readonly ILogger _logger;
+        _commandManager = commandManager;
+        _commandParser = commandParser;
+        _commandParameterParser = commandParameterParser;
+        _logger = logger;
+    }
 
-        public CommandStep(ICommandManager commandManager,
-            ICommandParser commandParser,
-            ICommandParametersParser commandParameterParser,
-            ILogger<CommandStep> logger)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "Command", StringComparison.OrdinalIgnoreCase))
         {
-            _commandManager = commandManager;
-            _commandParser = commandParser;
-            _commandParameterParser = commandParameterParser;
-            _logger = logger;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, "Command", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            var step = context.Step.ToObject<CommandStepModel>();
+        var step = context.Step.ToObject<CommandStepModel>();
 
-            foreach (var command in step.Commands)
+        foreach (var command in step.Commands)
+        {
+            await using (var output = new ZStringWriter())
             {
-                await using (var output = new ZStringWriter())
-                {
-                    _logger.LogInformation("Executing command: {Command}", command);
-
-                    var commandParameters = _commandParameterParser.Parse(_commandParser.Parse(command));
-                    commandParameters.Output = output;
-                    await _commandManager.ExecuteAsync(commandParameters);
+                _logger.LogInformation("Executing command: {Command}", command);
 
-                    _logger.LogInformation("Command executed with output: {CommandOutput}", output);
-                }
+                var commandParameters = _commandParameterParser.Parse(_commandParser.Parse(command));
+                commandParameters.Output = output;
+                await _commandManager.ExecuteAsync(commandParameters);
 
-                _logger.LogInformation("Executed command: {Command}", command);
+                _logger.LogInformation("Command executed with output: {CommandOutput}", output);
             }
-        }
 
-        private sealed class CommandStepModel
-        {
-            public string[] Commands { get; set; }
+            _logger.LogInformation("Executed command: {Command}", command);
         }
     }
+
+    private sealed class CommandStepModel
+    {
+        public string[] Commands { get; set; }
+    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Recipes/RecipeSteps/RecipesStep.cs b/src/OrchardCore.Modules/OrchardCore.Recipes/RecipeSteps/RecipesStep.cs
index dce986da558..f06590ec331 100644
--- a/src/OrchardCore.Modules/OrchardCore.Recipes/RecipeSteps/RecipesStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Recipes/RecipeSteps/RecipesStep.cs
@@ -7,63 +7,62 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Recipes.RecipeSteps
+namespace OrchardCore.Recipes.RecipeSteps;
+
+/// <summary>
+/// This recipe step executes a set of external recipes.
+/// </summary>
+public sealed class RecipesStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step executes a set of external recipes.
-    /// </summary>
-    public sealed class RecipesStep : IRecipeStepHandler
-    {
-        private readonly IEnumerable<IRecipeHarvester> _recipeHarvesters;
+    private readonly IEnumerable<IRecipeHarvester> _recipeHarvesters;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public RecipesStep(
-            IEnumerable<IRecipeHarvester> recipeHarvesters,
-            IStringLocalizer<RecipesStep> stringLocalizer)
-        {
-            _recipeHarvesters = recipeHarvesters;
-            S = stringLocalizer;
-        }
+    public RecipesStep(
+        IEnumerable<IRecipeHarvester> recipeHarvesters,
+        IStringLocalizer<RecipesStep> stringLocalizer)
+    {
+        _recipeHarvesters = recipeHarvesters;
+        S = stringLocalizer;
+    }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "Recipes", StringComparison.OrdinalIgnoreCase))
         {
-            if (!string.Equals(context.Name, "Recipes", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
+            return;
+        }
 
-            var step = context.Step.ToObject<InternalStep>();
+        var step = context.Step.ToObject<InternalStep>();
 
-            var recipeCollections = await Task.WhenAll(_recipeHarvesters.Select(harvester => harvester.HarvestRecipesAsync()));
-            var recipes = recipeCollections.SelectMany(recipe => recipe).ToDictionary(recipe => recipe.Name);
+        var recipeCollections = await Task.WhenAll(_recipeHarvesters.Select(harvester => harvester.HarvestRecipesAsync()));
+        var recipes = recipeCollections.SelectMany(recipe => recipe).ToDictionary(recipe => recipe.Name);
 
-            var innerRecipes = new List<RecipeDescriptor>();
-            foreach (var recipe in step.Values)
+        var innerRecipes = new List<RecipeDescriptor>();
+        foreach (var recipe in step.Values)
+        {
+            if (!recipes.TryGetValue(recipe.Name, out var value))
             {
-                if (!recipes.TryGetValue(recipe.Name, out var value))
-                {
-                    context.Errors.Add(S["No recipe named '{0}' was found.", recipe.Name]);
+                context.Errors.Add(S["No recipe named '{0}' was found.", recipe.Name]);
 
-                    continue;
-                }
-
-                innerRecipes.Add(value);
+                continue;
             }
 
-            context.InnerRecipes = innerRecipes;
+            innerRecipes.Add(value);
         }
 
-        private sealed class InternalStep
-        {
-            public InternalStepValue[] Values { get; set; }
-        }
+        context.InnerRecipes = innerRecipes;
+    }
 
-        private sealed class InternalStepValue
-        {
-            public string ExecutionId { get; set; }
+    private sealed class InternalStep
+    {
+        public InternalStepValue[] Values { get; set; }
+    }
 
-            public string Name { get; set; }
-        }
+    private sealed class InternalStepValue
+    {
+        public string ExecutionId { get; set; }
+
+        public string Name { get; set; }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Recipes/Services/RecipeDeploymentTargetHandler.cs b/src/OrchardCore.Modules/OrchardCore.Recipes/Services/RecipeDeploymentTargetHandler.cs
index cdd31f5ffa4..eada53d96d2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Recipes/Services/RecipeDeploymentTargetHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Recipes/Services/RecipeDeploymentTargetHandler.cs
@@ -10,45 +10,44 @@
 using OrchardCore.Modules;
 using OrchardCore.Recipes.Models;
 
-namespace OrchardCore.Recipes.Services
+namespace OrchardCore.Recipes.Services;
+
+public class RecipeDeploymentTargetHandler : IDeploymentTargetHandler
 {
-    public class RecipeDeploymentTargetHandler : IDeploymentTargetHandler
-    {
-        private readonly IShellHost _shellHost;
-        private readonly ShellSettings _shellSettings;
-        private readonly IRecipeExecutor _recipeExecutor;
-        private readonly IEnumerable<IRecipeEnvironmentProvider> _environmentProviders;
-        private readonly ILogger _logger;
+    private readonly IShellHost _shellHost;
+    private readonly ShellSettings _shellSettings;
+    private readonly IRecipeExecutor _recipeExecutor;
+    private readonly IEnumerable<IRecipeEnvironmentProvider> _environmentProviders;
+    private readonly ILogger _logger;
 
-        public RecipeDeploymentTargetHandler(IShellHost shellHost,
-            ShellSettings shellSettings,
-            IRecipeExecutor recipeExecutor,
-            IEnumerable<IRecipeEnvironmentProvider> environmentProviders,
-            ILogger<RecipeDeploymentTargetHandler> logger)
-        {
-            _shellHost = shellHost;
-            _shellSettings = shellSettings;
-            _recipeExecutor = recipeExecutor;
-            _environmentProviders = environmentProviders;
-            _logger = logger;
-        }
+    public RecipeDeploymentTargetHandler(IShellHost shellHost,
+        ShellSettings shellSettings,
+        IRecipeExecutor recipeExecutor,
+        IEnumerable<IRecipeEnvironmentProvider> environmentProviders,
+        ILogger<RecipeDeploymentTargetHandler> logger)
+    {
+        _shellHost = shellHost;
+        _shellSettings = shellSettings;
+        _recipeExecutor = recipeExecutor;
+        _environmentProviders = environmentProviders;
+        _logger = logger;
+    }
 
-        public async Task ImportFromFileAsync(IFileProvider fileProvider)
+    public async Task ImportFromFileAsync(IFileProvider fileProvider)
+    {
+        var executionId = Guid.NewGuid().ToString("n");
+        var recipeDescriptor = new RecipeDescriptor
         {
-            var executionId = Guid.NewGuid().ToString("n");
-            var recipeDescriptor = new RecipeDescriptor
-            {
-                FileProvider = fileProvider,
-                BasePath = "",
-                RecipeFileInfo = fileProvider.GetFileInfo("Recipe.json")
-            };
+            FileProvider = fileProvider,
+            BasePath = "",
+            RecipeFileInfo = fileProvider.GetFileInfo("Recipe.json")
+        };
 
-            var environment = new Dictionary<string, object>();
-            await _environmentProviders.OrderBy(x => x.Order).InvokeAsync((provider, env) => provider.PopulateEnvironmentAsync(env), environment, _logger);
+        var environment = new Dictionary<string, object>();
+        await _environmentProviders.OrderBy(x => x.Order).InvokeAsync((provider, env) => provider.PopulateEnvironmentAsync(env), environment, _logger);
 
-            await _recipeExecutor.ExecuteAsync(executionId, recipeDescriptor, environment, CancellationToken.None);
+        await _recipeExecutor.ExecuteAsync(executionId, recipeDescriptor, environment, CancellationToken.None);
 
-            await _shellHost.ReleaseShellContextAsync(_shellSettings);
-        }
+        await _shellHost.ReleaseShellContextAsync(_shellSettings);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Recipes/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Recipes/Startup.cs
index e35aa0e575a..6342412b4f0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Recipes/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Recipes/Startup.cs
@@ -5,30 +5,29 @@
 using OrchardCore.Recipes.RecipeSteps;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Recipes
+namespace OrchardCore.Recipes;
+
+/// <summary>
+/// These services are registered on the tenant service collection.
+/// </summary>
+public sealed class Startup : StartupBase
 {
-    /// <summary>
-    /// These services are registered on the tenant service collection.
-    /// </summary>
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
 
-            services.AddRecipeExecutionStep<CommandStep>();
-            services.AddRecipeExecutionStep<RecipesStep>();
+        services.AddRecipeExecutionStep<CommandStep>();
+        services.AddRecipeExecutionStep<RecipesStep>();
 
-            services.AddDeploymentTargetHandler<RecipeDeploymentTargetHandler>();
-        }
+        services.AddDeploymentTargetHandler<RecipeDeploymentTargetHandler>();
     }
+}
 
-    [Feature("OrchardCore.Recipes.Core")]
-    public sealed class RecipesCoreStartup : StartupBase
+[Feature("OrchardCore.Recipes.Core")]
+public sealed class RecipesCoreStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddRecipes();
-        }
+        services.AddRecipes();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Recipes/ViewModels/RecipeViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Recipes/ViewModels/RecipeViewModel.cs
index 393417b14d1..c9d481fb2b3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Recipes/ViewModels/RecipeViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Recipes/ViewModels/RecipeViewModel.cs
@@ -1,14 +1,13 @@
-namespace OrchardCore.Recipes.ViewModels
+namespace OrchardCore.Recipes.ViewModels;
+
+public class RecipeViewModel
 {
-    public class RecipeViewModel
-    {
-        public string FileName { get; set; }
-        public string Name { get; set; }
-        public string DisplayName { get; set; }
-        public string[] Tags { get; set; }
-        public bool IsSetupRecipe { get; set; }
-        public string Description { get; set; }
-        public string BasePath { get; set; }
-        public string Feature { get; set; }
-    }
+    public string FileName { get; set; }
+    public string Name { get; set; }
+    public string DisplayName { get; set; }
+    public string[] Tags { get; set; }
+    public bool IsSetupRecipe { get; set; }
+    public string Description { get; set; }
+    public string BasePath { get; set; }
+    public string Feature { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Redis/Options/RedisCacheOptionsSetup.cs b/src/OrchardCore.Modules/OrchardCore.Redis/Options/RedisCacheOptionsSetup.cs
index 7452103046b..c90cd0da7e5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Redis/Options/RedisCacheOptionsSetup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Redis/Options/RedisCacheOptionsSetup.cs
@@ -2,33 +2,32 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Environment.Shell;
 
-namespace OrchardCore.Redis.Options
+namespace OrchardCore.Redis.Options;
+
+public sealed class RedisCacheOptionsSetup : IConfigureOptions<RedisCacheOptions>
 {
-    public sealed class RedisCacheOptionsSetup : IConfigureOptions<RedisCacheOptions>
-    {
-        private readonly IRedisService _redis;
-        private readonly string _tenant;
+    private readonly IRedisService _redis;
+    private readonly string _tenant;
 
-        public RedisCacheOptionsSetup(IRedisService redis, ShellSettings shellSettings)
-        {
-            _redis = redis;
-            _tenant = shellSettings.Name;
-        }
+    public RedisCacheOptionsSetup(IRedisService redis, ShellSettings shellSettings)
+    {
+        _redis = redis;
+        _tenant = shellSettings.Name;
+    }
 
-        public void Configure(RedisCacheOptions options)
+    public void Configure(RedisCacheOptions options)
+    {
+        var redis = _redis;
+        options.ConnectionMultiplexerFactory = async () =>
         {
-            var redis = _redis;
-            options.ConnectionMultiplexerFactory = async () =>
+            if (redis.Connection == null)
             {
-                if (redis.Connection == null)
-                {
-                    await redis.ConnectAsync();
-                }
+                await redis.ConnectAsync();
+            }
 
-                return redis.Connection;
-            };
+            return redis.Connection;
+        };
 
-            options.InstanceName = $"{redis.InstancePrefix}{_tenant}";
-        }
+        options.InstanceName = $"{redis.InstancePrefix}{_tenant}";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Redis/Options/RedisKeyManagementOptionsSetup.cs b/src/OrchardCore.Modules/OrchardCore.Redis/Options/RedisKeyManagementOptionsSetup.cs
index f495363410b..44a77b118c2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Redis/Options/RedisKeyManagementOptionsSetup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Redis/Options/RedisKeyManagementOptionsSetup.cs
@@ -3,32 +3,31 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Environment.Shell;
 
-namespace OrchardCore.Redis.Options
+namespace OrchardCore.Redis.Options;
+
+public sealed class RedisKeyManagementOptionsSetup : IConfigureOptions<KeyManagementOptions>
 {
-    public sealed class RedisKeyManagementOptionsSetup : IConfigureOptions<KeyManagementOptions>
-    {
-        private readonly IRedisService _redis;
-        private readonly string _tenant;
+    private readonly IRedisService _redis;
+    private readonly string _tenant;
 
-        public RedisKeyManagementOptionsSetup(IRedisService redis, ShellSettings shellSettings)
-        {
-            _redis = redis;
-            _tenant = shellSettings.Name;
-        }
+    public RedisKeyManagementOptionsSetup(IRedisService redis, ShellSettings shellSettings)
+    {
+        _redis = redis;
+        _tenant = shellSettings.Name;
+    }
 
-        public void Configure(KeyManagementOptions options)
+    public void Configure(KeyManagementOptions options)
+    {
+        var redis = _redis;
+        options.XmlRepository = new RedisXmlRepository(() =>
         {
-            var redis = _redis;
-            options.XmlRepository = new RedisXmlRepository(() =>
+            if (redis.Database == null)
             {
-                if (redis.Database == null)
-                {
-                    redis.ConnectAsync().GetAwaiter().GetResult();
-                }
+                redis.ConnectAsync().GetAwaiter().GetResult();
+            }
 
-                return redis.Database;
-            },
-            $"({redis.InstancePrefix}{_tenant}:DataProtection-Keys");
-        }
+            return redis.Database;
+        },
+        $"({redis.InstancePrefix}{_tenant}:DataProtection-Keys");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Redis/Services/RedisBus.cs b/src/OrchardCore.Modules/OrchardCore.Redis/Services/RedisBus.cs
index 58a7bec351c..186b3c7b34f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Redis/Services/RedisBus.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Redis/Services/RedisBus.cs
@@ -7,79 +7,78 @@
 using OrchardCore.Environment.Shell;
 using StackExchange.Redis;
 
-namespace OrchardCore.Redis.Services
+namespace OrchardCore.Redis.Services;
+
+public class RedisBus : IMessageBus
 {
-    public class RedisBus : IMessageBus
-    {
-        private readonly IRedisService _redis;
-        private readonly string _hostName;
-        private readonly string _channelPrefix;
-        private readonly string _messagePrefix;
-        private readonly ILogger _logger;
+    private readonly IRedisService _redis;
+    private readonly string _hostName;
+    private readonly string _channelPrefix;
+    private readonly string _messagePrefix;
+    private readonly ILogger _logger;
 
-        public RedisBus(IRedisService redis, ShellSettings shellSettings, ILogger<RedisBus> logger)
-        {
-            _redis = redis;
-            _hostName = Dns.GetHostName() + ':' + System.Environment.ProcessId;
-            _channelPrefix = redis.InstancePrefix + shellSettings.Name + ':';
-            _messagePrefix = _hostName + '/';
-            _logger = logger;
-        }
+    public RedisBus(IRedisService redis, ShellSettings shellSettings, ILogger<RedisBus> logger)
+    {
+        _redis = redis;
+        _hostName = Dns.GetHostName() + ':' + System.Environment.ProcessId;
+        _channelPrefix = redis.InstancePrefix + shellSettings.Name + ':';
+        _messagePrefix = _hostName + '/';
+        _logger = logger;
+    }
 
-        public async Task SubscribeAsync(string channel, Action<string, string> handler)
+    public async Task SubscribeAsync(string channel, Action<string, string> handler)
+    {
+        if (_redis.Connection == null)
         {
+            await _redis.ConnectAsync();
             if (_redis.Connection == null)
             {
-                await _redis.ConnectAsync();
-                if (_redis.Connection == null)
-                {
-                    _logger.LogError("Unable to subscribe to the channel '{ChannelName}'.", _channelPrefix + channel);
-                    return;
-                }
+                _logger.LogError("Unable to subscribe to the channel '{ChannelName}'.", _channelPrefix + channel);
+                return;
             }
+        }
+
+        try
+        {
+            var subscriber = _redis.Connection.GetSubscriber();
 
-            try
+            await subscriber.SubscribeAsync(RedisChannel.Literal(_channelPrefix + channel), (redisChannel, redisValue) =>
             {
-                var subscriber = _redis.Connection.GetSubscriber();
+                var tokens = redisValue.ToString().Split('/').ToArray();
 
-                await subscriber.SubscribeAsync(RedisChannel.Literal(_channelPrefix + channel), (redisChannel, redisValue) =>
+                if (tokens.Length != 2 || tokens[0].Length == 0 || tokens[0].Equals(_hostName, StringComparison.OrdinalIgnoreCase))
                 {
-                    var tokens = redisValue.ToString().Split('/').ToArray();
-
-                    if (tokens.Length != 2 || tokens[0].Length == 0 || tokens[0].Equals(_hostName, StringComparison.OrdinalIgnoreCase))
-                    {
-                        return;
-                    }
+                    return;
+                }
 
-                    handler(channel, tokens[1]);
-                });
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "Unable to subscribe to the channel '{ChannelName}'.", _channelPrefix + channel);
-            }
+                handler(channel, tokens[1]);
+            });
         }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "Unable to subscribe to the channel '{ChannelName}'.", _channelPrefix + channel);
+        }
+    }
 
-        public async Task PublishAsync(string channel, string message)
+    public async Task PublishAsync(string channel, string message)
+    {
+        if (_redis.Connection == null)
         {
+            await _redis.ConnectAsync();
             if (_redis.Connection == null)
             {
-                await _redis.ConnectAsync();
-                if (_redis.Connection == null)
-                {
-                    _logger.LogError("Unable to publish to the channel '{ChannelName}'.", _channelPrefix + channel);
-                    return;
-                }
+                _logger.LogError("Unable to publish to the channel '{ChannelName}'.", _channelPrefix + channel);
+                return;
             }
+        }
 
-            try
-            {
-                await _redis.Connection.GetSubscriber().PublishAsync(RedisChannel.Literal(_channelPrefix + channel), _messagePrefix + message);
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "Unable to publish to the channel '{ChannelName}'.", _channelPrefix + channel);
-            }
+        try
+        {
+            await _redis.Connection.GetSubscriber().PublishAsync(RedisChannel.Literal(_channelPrefix + channel), _messagePrefix + message);
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "Unable to publish to the channel '{ChannelName}'.", _channelPrefix + channel);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Redis/Services/RedisLock.cs b/src/OrchardCore.Modules/OrchardCore.Redis/Services/RedisLock.cs
index dc24da9ce9d..1e4eb204919 100644
--- a/src/OrchardCore.Modules/OrchardCore.Redis/Services/RedisLock.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Redis/Services/RedisLock.cs
@@ -8,204 +8,203 @@
 using OrchardCore.Locking.Distributed;
 using StackExchange.Redis;
 
-namespace OrchardCore.Redis.Services
+namespace OrchardCore.Redis.Services;
+
+/// <summary>
+/// This component is a tenant singleton which allows to acquire distributed named locks for a given tenant.
+/// </summary>
+public class RedisLock : IDistributedLock
 {
+    private readonly IRedisService _redis;
+    private readonly ILogger _logger;
+    private readonly string _hostName;
+    private readonly string _prefix;
+
+    public RedisLock(IRedisService redis, ShellSettings shellSettings, ILogger<RedisLock> logger)
+    {
+        _redis = redis;
+        _hostName = Dns.GetHostName() + ':' + System.Environment.ProcessId;
+        _prefix = redis.InstancePrefix + shellSettings.Name + ':';
+        _logger = logger;
+    }
+
     /// <summary>
-    /// This component is a tenant singleton which allows to acquire distributed named locks for a given tenant.
+    /// Waits indefinitely until acquiring a named lock with a given expiration for the current tenant.
+    /// After 'expiration' the lock is auto released, a null value is equivalent to 'TimeSpan.MaxValue'.
     /// </summary>
-    public class RedisLock : IDistributedLock
+    public async Task<ILocker> AcquireLockAsync(string key, TimeSpan? expiration = null)
     {
-        private readonly IRedisService _redis;
-        private readonly ILogger _logger;
-        private readonly string _hostName;
-        private readonly string _prefix;
+        return (await TryAcquireLockAsync(key, TimeSpan.MaxValue, expiration)).locker;
+    }
 
-        public RedisLock(IRedisService redis, ShellSettings shellSettings, ILogger<RedisLock> logger)
+    /// <summary>
+    /// Tries to acquire a named lock in a given timeout with a given expiration for the current tenant.
+    /// After 'expiration' the lock is auto released, a null value is equivalent to 'TimeSpan.MaxValue'.
+    /// </summary>
+    public async Task<(ILocker locker, bool locked)> TryAcquireLockAsync(string key, TimeSpan timeout, TimeSpan? expiration = null)
+    {
+        using (var cts = new CancellationTokenSource(timeout != TimeSpan.MaxValue ? timeout : Timeout.InfiniteTimeSpan))
         {
-            _redis = redis;
-            _hostName = Dns.GetHostName() + ':' + System.Environment.ProcessId;
-            _prefix = redis.InstancePrefix + shellSettings.Name + ':';
-            _logger = logger;
-        }
+            var retries = 0.0;
 
-        /// <summary>
-        /// Waits indefinitely until acquiring a named lock with a given expiration for the current tenant.
-        /// After 'expiration' the lock is auto released, a null value is equivalent to 'TimeSpan.MaxValue'.
-        /// </summary>
-        public async Task<ILocker> AcquireLockAsync(string key, TimeSpan? expiration = null)
-        {
-            return (await TryAcquireLockAsync(key, TimeSpan.MaxValue, expiration)).locker;
-        }
-
-        /// <summary>
-        /// Tries to acquire a named lock in a given timeout with a given expiration for the current tenant.
-        /// After 'expiration' the lock is auto released, a null value is equivalent to 'TimeSpan.MaxValue'.
-        /// </summary>
-        public async Task<(ILocker locker, bool locked)> TryAcquireLockAsync(string key, TimeSpan timeout, TimeSpan? expiration = null)
-        {
-            using (var cts = new CancellationTokenSource(timeout != TimeSpan.MaxValue ? timeout : Timeout.InfiniteTimeSpan))
+            while (!cts.IsCancellationRequested)
             {
-                var retries = 0.0;
+                var locked = await LockAsync(key, expiration ?? TimeSpan.MaxValue);
 
-                while (!cts.IsCancellationRequested)
+                if (locked)
                 {
-                    var locked = await LockAsync(key, expiration ?? TimeSpan.MaxValue);
-
-                    if (locked)
-                    {
-                        return (new Locker(this, key), locked);
-                    }
+                    return (new Locker(this, key), locked);
+                }
 
-                    try
-                    {
-                        await Task.Delay(GetDelay(++retries), cts.Token);
-                    }
-                    catch (TaskCanceledException)
+                try
+                {
+                    await Task.Delay(GetDelay(++retries), cts.Token);
+                }
+                catch (TaskCanceledException)
+                {
+                    if (_logger.IsEnabled(LogLevel.Debug))
                     {
-                        if (_logger.IsEnabled(LogLevel.Debug))
-                        {
-                            _logger.LogDebug("Timeout elapsed before acquiring the named lock '{LockName}' after the given timeout of '{Timeout}'.",
-                                _prefix + key, timeout.ToString());
-                        }
+                        _logger.LogDebug("Timeout elapsed before acquiring the named lock '{LockName}' after the given timeout of '{Timeout}'.",
+                            _prefix + key, timeout.ToString());
                     }
                 }
             }
-
-            return (null, false);
         }
 
-        public async Task<bool> IsLockAcquiredAsync(string key)
+        return (null, false);
+    }
+
+    public async Task<bool> IsLockAcquiredAsync(string key)
+    {
+        if (_redis.Database == null)
         {
+            await _redis.ConnectAsync();
             if (_redis.Database == null)
             {
-                await _redis.ConnectAsync();
-                if (_redis.Database == null)
-                {
-                    _logger.LogError("Fails to check whether the named lock '{LockName}' is already acquired.", _prefix + key);
-                    return false;
-                }
-            }
-
-            try
-            {
-                return (await _redis.Database.LockQueryAsync(_prefix + key)).HasValue;
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "Fails to check whether the named lock '{LockName}' is already acquired.", _prefix + key);
+                _logger.LogError("Fails to check whether the named lock '{LockName}' is already acquired.", _prefix + key);
+                return false;
             }
+        }
 
-            return false;
+        try
+        {
+            return (await _redis.Database.LockQueryAsync(_prefix + key)).HasValue;
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "Fails to check whether the named lock '{LockName}' is already acquired.", _prefix + key);
         }
 
-        private async Task<bool> LockAsync(string key, TimeSpan expiry)
+        return false;
+    }
+
+    private async Task<bool> LockAsync(string key, TimeSpan expiry)
+    {
+        if (_redis.Database == null)
         {
+            await _redis.ConnectAsync();
             if (_redis.Database == null)
             {
-                await _redis.ConnectAsync();
-                if (_redis.Database == null)
-                {
-                    _logger.LogError("Fails to acquire the named lock '{LockName}'.", _prefix + key);
-                    return false;
-                }
-            }
-
-            try
-            {
-                return await _redis.Database.LockTakeAsync(_prefix + key, _hostName, expiry);
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "Fails to acquire the named lock '{LockName}'.", _prefix + key);
+                _logger.LogError("Fails to acquire the named lock '{LockName}'.", _prefix + key);
+                return false;
             }
+        }
 
-            return false;
+        try
+        {
+            return await _redis.Database.LockTakeAsync(_prefix + key, _hostName, expiry);
         }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "Fails to acquire the named lock '{LockName}'.", _prefix + key);
+        }
+
+        return false;
+    }
 
-        private async ValueTask ReleaseAsync(string key)
+    private async ValueTask ReleaseAsync(string key)
+    {
+        try
         {
-            try
-            {
-                await _redis.Database.LockReleaseAsync(_prefix + key, _hostName);
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "Fails to release the named lock '{LockName}'.", _prefix + key);
-            }
+            await _redis.Database.LockReleaseAsync(_prefix + key, _hostName);
         }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "Fails to release the named lock '{LockName}'.", _prefix + key);
+        }
+    }
 
-        private void Release(string key)
+    private void Release(string key)
+    {
+        try
         {
-            try
-            {
-                _redis.Database.LockRelease(_prefix + key, _hostName, CommandFlags.FireAndForget);
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "Fails to release the named lock '{LockName}'.", _prefix + key);
-            }
+            _redis.Database.LockRelease(_prefix + key, _hostName, CommandFlags.FireAndForget);
         }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "Fails to release the named lock '{LockName}'.", _prefix + key);
+        }
+    }
 
-        private sealed class Locker : ILocker
+    private sealed class Locker : ILocker
+    {
+        private readonly RedisLock _lock;
+        private readonly string _key;
+        private bool _disposed;
+
+        public Locker(RedisLock redislock, string key)
         {
-            private readonly RedisLock _lock;
-            private readonly string _key;
-            private bool _disposed;
+            _lock = redislock;
+            _key = key;
+        }
 
-            public Locker(RedisLock redislock, string key)
+        public ValueTask DisposeAsync()
+        {
+            if (_disposed)
             {
-                _lock = redislock;
-                _key = key;
+                return default;
             }
 
-            public ValueTask DisposeAsync()
-            {
-                if (_disposed)
-                {
-                    return default;
-                }
-
-                _disposed = true;
+            _disposed = true;
 
-                return _lock.ReleaseAsync(_key);
-            }
+            return _lock.ReleaseAsync(_key);
+        }
 
-            public void Dispose()
+        public void Dispose()
+        {
+            if (_disposed)
             {
-                if (_disposed)
-                {
-                    return;
-                }
+                return;
+            }
 
-                _disposed = true;
+            _disposed = true;
 
-                _lock.Release(_key);
-            }
+            _lock.Release(_key);
         }
+    }
 
-        private static readonly double _baseDelay = 100;
-        private static readonly double _maxDelay = 10000;
+    private static readonly double _baseDelay = 100;
+    private static readonly double _maxDelay = 10000;
 
-        private static TimeSpan GetDelay(double retries)
-        {
-            var delay = _baseDelay
-                * (1.0 + ((Math.Pow(1.8, retries - 1.0) - 1.0)
-                    * (0.6 + new Random().NextDouble() * 0.4)));
-
-            return TimeSpan.FromMilliseconds(Math.Min(delay, _maxDelay));
-
-            // 2 examples with 10 retries
-            // --------------------------
-            // 100     100 (start from base)
-            // 164     171
-            // 256     312
-            // 401     519
-            // 754     766
-            // 1327    1562
-            // 2950    3257
-            // 4596    4966
-            // 7215    8667
-            // 10000   10000 (max reached)
-        }
+    private static TimeSpan GetDelay(double retries)
+    {
+        var delay = _baseDelay
+            * (1.0 + ((Math.Pow(1.8, retries - 1.0) - 1.0)
+                * (0.6 + new Random().NextDouble() * 0.4)));
+
+        return TimeSpan.FromMilliseconds(Math.Min(delay, _maxDelay));
+
+        // 2 examples with 10 retries
+        // --------------------------
+        // 100     100 (start from base)
+        // 164     171
+        // 256     312
+        // 401     519
+        // 754     766
+        // 1327    1562
+        // 2950    3257
+        // 4596    4966
+        // 7215    8667
+        // 10000   10000 (max reached)
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Redis/Services/RedisService.cs b/src/OrchardCore.Modules/OrchardCore.Redis/Services/RedisService.cs
index 92b245bb15f..d9b64e024bc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Redis/Services/RedisService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Redis/Services/RedisService.cs
@@ -3,27 +3,26 @@
 using OrchardCore.Modules;
 using StackExchange.Redis;
 
-namespace OrchardCore.Redis.Services
+namespace OrchardCore.Redis.Services;
+
+public class RedisService : ModularTenantEvents, IRedisService
 {
-    public class RedisService : ModularTenantEvents, IRedisService
-    {
-        private readonly IRedisDatabaseFactory _factory;
-        private readonly RedisOptions _options;
+    private readonly IRedisDatabaseFactory _factory;
+    private readonly RedisOptions _options;
 
-        public RedisService(IRedisDatabaseFactory factory, IOptions<RedisOptions> options)
-        {
-            _factory = factory;
-            _options = options.Value;
-        }
+    public RedisService(IRedisDatabaseFactory factory, IOptions<RedisOptions> options)
+    {
+        _factory = factory;
+        _options = options.Value;
+    }
 
-        public IConnectionMultiplexer Connection => Database?.Multiplexer;
+    public IConnectionMultiplexer Connection => Database?.Multiplexer;
 
-        public string InstancePrefix => _options.InstancePrefix;
+    public string InstancePrefix => _options.InstancePrefix;
 
-        public IDatabase Database { get; private set; }
+    public IDatabase Database { get; private set; }
 
-        public override Task ActivatingAsync() => ConnectAsync();
+    public override Task ActivatingAsync() => ConnectAsync();
 
-        public async Task ConnectAsync() => Database ??= await _factory.CreateAsync(_options);
-    }
+    public async Task ConnectAsync() => Database ??= await _factory.CreateAsync(_options);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Redis/Services/RedisTagCache.cs b/src/OrchardCore.Modules/OrchardCore.Redis/Services/RedisTagCache.cs
index 95af43a1f5f..cfabca455d6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Redis/Services/RedisTagCache.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Redis/Services/RedisTagCache.cs
@@ -7,114 +7,113 @@
 using OrchardCore.Environment.Shell;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Redis.Services
+namespace OrchardCore.Redis.Services;
+
+public class RedisTagCache : ITagCache
 {
-    public class RedisTagCache : ITagCache
+    private readonly IRedisService _redis;
+    private readonly string _prefix;
+    private readonly IEnumerable<ITagRemovedEventHandler> _tagRemovedEventHandlers;
+    private readonly ILogger _logger;
+
+    public RedisTagCache(
+        IRedisService redis,
+        ShellSettings shellSettings,
+        IEnumerable<ITagRemovedEventHandler> tagRemovedEventHandlers,
+        ILogger<RedisTagCache> logger)
     {
-        private readonly IRedisService _redis;
-        private readonly string _prefix;
-        private readonly IEnumerable<ITagRemovedEventHandler> _tagRemovedEventHandlers;
-        private readonly ILogger _logger;
-
-        public RedisTagCache(
-            IRedisService redis,
-            ShellSettings shellSettings,
-            IEnumerable<ITagRemovedEventHandler> tagRemovedEventHandlers,
-            ILogger<RedisTagCache> logger)
-        {
-            _redis = redis;
-            _prefix = redis.InstancePrefix + shellSettings.Name + ":Tag:";
-            _tagRemovedEventHandlers = tagRemovedEventHandlers;
-            _logger = logger;
-        }
+        _redis = redis;
+        _prefix = redis.InstancePrefix + shellSettings.Name + ":Tag:";
+        _tagRemovedEventHandlers = tagRemovedEventHandlers;
+        _logger = logger;
+    }
 
-        public async Task TagAsync(string key, params string[] tags)
+    public async Task TagAsync(string key, params string[] tags)
+    {
+        if (_redis.Database == null)
         {
+            await _redis.ConnectAsync();
             if (_redis.Database == null)
             {
-                await _redis.ConnectAsync();
-                if (_redis.Database == null)
-                {
-                    _logger.LogError("Fails to add the '{KeyName}' to the {PrefixName} tags.", key, _prefix);
-                    return;
-                }
+                _logger.LogError("Fails to add the '{KeyName}' to the {PrefixName} tags.", key, _prefix);
+                return;
             }
+        }
 
-            try
-            {
-                foreach (var tag in tags)
-                {
-                    await _redis.Database.SetAddAsync(_prefix + tag, key);
-                }
-            }
-            catch (Exception e)
+        try
+        {
+            foreach (var tag in tags)
             {
-                _logger.LogError(e, "Fails to add the '{KeyName}' to the {PrefixName} tags.", key, _prefix);
+                await _redis.Database.SetAddAsync(_prefix + tag, key);
             }
         }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "Fails to add the '{KeyName}' to the {PrefixName} tags.", key, _prefix);
+        }
+    }
 
-        public async Task<IEnumerable<string>> GetTaggedItemsAsync(string tag)
+    public async Task<IEnumerable<string>> GetTaggedItemsAsync(string tag)
+    {
+        if (_redis.Database == null)
         {
+            await _redis.ConnectAsync();
             if (_redis.Database == null)
             {
-                await _redis.ConnectAsync();
-                if (_redis.Database == null)
-                {
-                    _logger.LogError("Fails to get '{TagName}' items.", _prefix + tag);
-                    return [];
-                }
+                _logger.LogError("Fails to get '{TagName}' items.", _prefix + tag);
+                return [];
             }
+        }
 
-            try
-            {
-                var values = await _redis.Database.SetMembersAsync(_prefix + tag);
-
-                if (values == null || values.Length == 0)
-                {
-                    return [];
-                }
+        try
+        {
+            var values = await _redis.Database.SetMembersAsync(_prefix + tag);
 
-                return values.Select(v => (string)v).ToArray();
-            }
-            catch (Exception e)
+            if (values == null || values.Length == 0)
             {
-                _logger.LogError(e, "Fails to get '{TagName}' items.", _prefix + tag);
+                return [];
             }
 
-            return [];
+            return values.Select(v => (string)v).ToArray();
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "Fails to get '{TagName}' items.", _prefix + tag);
         }
 
-        public async Task RemoveTagAsync(string tag)
+        return [];
+    }
+
+    public async Task RemoveTagAsync(string tag)
+    {
+        if (_redis.Database == null)
         {
+            await _redis.ConnectAsync();
             if (_redis.Database == null)
             {
-                await _redis.ConnectAsync();
-                if (_redis.Database == null)
-                {
-                    _logger.LogError("Fails to remove the '{TagName}'.", _prefix + tag);
-                    return;
-                }
+                _logger.LogError("Fails to remove the '{TagName}'.", _prefix + tag);
+                return;
             }
+        }
 
-            try
-            {
-                var values = await _redis.Database.SetMembersAsync(_prefix + tag);
+        try
+        {
+            var values = await _redis.Database.SetMembersAsync(_prefix + tag);
 
-                if (values == null || values.Length == 0)
-                {
-                    return;
-                }
+            if (values == null || values.Length == 0)
+            {
+                return;
+            }
 
-                var set = values.Select(v => (string)v).ToArray();
+            var set = values.Select(v => (string)v).ToArray();
 
-                await _redis.Database.KeyDeleteAsync(_prefix + tag);
+            await _redis.Database.KeyDeleteAsync(_prefix + tag);
 
-                await _tagRemovedEventHandlers.InvokeAsync(x => x.TagRemovedAsync(tag, set), _logger);
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "Fails to remove the '{TagName}'.", _prefix + tag);
-            }
+            await _tagRemovedEventHandlers.InvokeAsync(x => x.TagRemovedAsync(tag, set), _logger);
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "Fails to remove the '{TagName}'.", _prefix + tag);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Redis/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Redis/Startup.cs
index cd3604af529..516a7e846bd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Redis/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Redis/Startup.cs
@@ -19,107 +19,106 @@
 using OrchardCore.Redis.Services;
 using StackExchange.Redis;
 
-namespace OrchardCore.Redis
+namespace OrchardCore.Redis;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
-    {
-        private readonly string _tenant;
-        private readonly IShellConfiguration _configuration;
-        private readonly ILogger _logger;
+    private readonly string _tenant;
+    private readonly IShellConfiguration _configuration;
+    private readonly ILogger _logger;
 
-        public Startup(ShellSettings shellSettings, IShellConfiguration configuration, ILogger<Startup> logger)
-        {
-            _tenant = shellSettings.Name;
-            _configuration = configuration;
-            _logger = logger;
-        }
+    public Startup(ShellSettings shellSettings, IShellConfiguration configuration, ILogger<Startup> logger)
+    {
+        _tenant = shellSettings.Name;
+        _configuration = configuration;
+        _logger = logger;
+    }
 
-        public override void ConfigureServices(IServiceCollection services)
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        try
         {
-            try
-            {
-                var section = _configuration.GetSection("OrchardCore_Redis");
+            var section = _configuration.GetSection("OrchardCore_Redis");
 
-                var configuration = section["Configuration"];
-                var configurationOptions = ConfigurationOptions.Parse(configuration);
-                var instancePrefix = section["InstancePrefix"];
+            var configuration = section["Configuration"];
+            var configurationOptions = ConfigurationOptions.Parse(configuration);
+            var instancePrefix = section["InstancePrefix"];
 
-                if (section.GetValue("DisableCertificateVerification", false))
-                {
-                    configurationOptions.CertificateValidation += IgnoreCertificateErrors;
-                }
-
-                services.Configure<RedisOptions>(options =>
-                {
-                    options.Configuration = configuration;
-                    options.ConfigurationOptions = configurationOptions;
-                    options.InstancePrefix = instancePrefix;
-                });
-            }
-            catch (Exception e)
+            if (section.GetValue("DisableCertificateVerification", false))
             {
-                _logger.LogError(e, "'Redis' features are not active on tenant '{TenantName}' as the 'Configuration' string is missing or invalid.", _tenant);
-                return;
+                configurationOptions.CertificateValidation += IgnoreCertificateErrors;
             }
 
-            services.AddSingleton<IRedisService, RedisService>();
-            services.AddSingleton<IModularTenantEvents>(sp => sp.GetRequiredService<IRedisService>());
-            services.AddSingleton<IRedisDatabaseFactory, RedisDatabaseFactory>();
+            services.Configure<RedisOptions>(options =>
+            {
+                options.Configuration = configuration;
+                options.ConfigurationOptions = configurationOptions;
+                options.InstancePrefix = instancePrefix;
+            });
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "'Redis' features are not active on tenant '{TenantName}' as the 'Configuration' string is missing or invalid.", _tenant);
+            return;
         }
 
-        // Callback for accepting any certificate as long as it exists, while ignoring other SSL policy errors.
-        // This allows the use of self-signed certificates on the Redis server.
-        private static bool IgnoreCertificateErrors(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
-            => (sslPolicyErrors & SslPolicyErrors.RemoteCertificateNotAvailable) == 0;
+        services.AddSingleton<IRedisService, RedisService>();
+        services.AddSingleton<IModularTenantEvents>(sp => sp.GetRequiredService<IRedisService>());
+        services.AddSingleton<IRedisDatabaseFactory, RedisDatabaseFactory>();
     }
 
-    [Feature("OrchardCore.Redis.Cache")]
-    public sealed class RedisCacheStartup : StartupBase
+    // Callback for accepting any certificate as long as it exists, while ignoring other SSL policy errors.
+    // This allows the use of self-signed certificates on the Redis server.
+    private static bool IgnoreCertificateErrors(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
+        => (sslPolicyErrors & SslPolicyErrors.RemoteCertificateNotAvailable) == 0;
+}
+
+[Feature("OrchardCore.Redis.Cache")]
+public sealed class RedisCacheStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        if (services.Any(d => d.ServiceType == typeof(IRedisService)))
         {
-            if (services.Any(d => d.ServiceType == typeof(IRedisService)))
-            {
-                services.AddSingleton<IDistributedCache, RedisCacheWrapper>();
-                services.AddTransient<IConfigureOptions<RedisCacheOptions>, RedisCacheOptionsSetup>();
-                services.AddScoped<ITagCache, RedisTagCache>();
-            }
+            services.AddSingleton<IDistributedCache, RedisCacheWrapper>();
+            services.AddTransient<IConfigureOptions<RedisCacheOptions>, RedisCacheOptionsSetup>();
+            services.AddScoped<ITagCache, RedisTagCache>();
         }
     }
+}
 
-    [Feature("OrchardCore.Redis.Bus")]
-    public sealed class RedisBusStartup : StartupBase
+[Feature("OrchardCore.Redis.Bus")]
+public sealed class RedisBusStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        if (services.Any(d => d.ServiceType == typeof(IRedisService)))
         {
-            if (services.Any(d => d.ServiceType == typeof(IRedisService)))
-            {
-                services.AddSingleton<IMessageBus, RedisBus>();
-            }
+            services.AddSingleton<IMessageBus, RedisBus>();
         }
     }
+}
 
-    [Feature("OrchardCore.Redis.Lock")]
-    public sealed class RedisLockStartup : StartupBase
+[Feature("OrchardCore.Redis.Lock")]
+public sealed class RedisLockStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        if (services.Any(d => d.ServiceType == typeof(IRedisService)))
         {
-            if (services.Any(d => d.ServiceType == typeof(IRedisService)))
-            {
-                services.AddSingleton<IDistributedLock, RedisLock>();
-            }
+            services.AddSingleton<IDistributedLock, RedisLock>();
         }
     }
+}
 
-    [Feature("OrchardCore.Redis.DataProtection")]
-    public sealed class RedisDataProtectionStartup : StartupBase
+[Feature("OrchardCore.Redis.DataProtection")]
+public sealed class RedisDataProtectionStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        if (services.Any(d => d.ServiceType == typeof(IRedisService)))
         {
-            if (services.Any(d => d.ServiceType == typeof(IRedisService)))
-            {
-                services.AddTransient<IConfigureOptions<KeyManagementOptions>, RedisKeyManagementOptionsSetup>();
-            }
+            services.AddTransient<IConfigureOptions<KeyManagementOptions>, RedisKeyManagementOptionsSetup>();
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/LinkTag.cs b/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/LinkTag.cs
index 665404d82b6..268a3301f17 100644
--- a/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/LinkTag.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/LinkTag.cs
@@ -8,81 +8,80 @@
 using OrchardCore.Liquid;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Resources.Liquid
+namespace OrchardCore.Resources.Liquid;
+
+public class LinkTag
 {
-    public class LinkTag
+    public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, TextWriter _1, TextEncoder _2, TemplateContext context)
-        {
-            var services = ((LiquidTemplateContext)context).Services;
-            var resourceManager = services.GetRequiredService<IResourceManager>();
+        var services = ((LiquidTemplateContext)context).Services;
+        var resourceManager = services.GetRequiredService<IResourceManager>();
 
-            string src = null;
-            string rel = null;
-            string condition = null;
-            string title = null;
-            string type = null;
-            bool? appendVersion = null;
+        string src = null;
+        string rel = null;
+        string condition = null;
+        string title = null;
+        string type = null;
+        bool? appendVersion = null;
 
-            Dictionary<string, string> customAttributes = null;
+        Dictionary<string, string> customAttributes = null;
 
-            foreach (var argument in argumentsList)
+        foreach (var argument in argumentsList)
+        {
+            switch (argument.Name)
             {
-                switch (argument.Name)
-                {
-                    case "src": src = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "rel": rel = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "condition": condition = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "title": title = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "type": type = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "append_version": appendVersion = (await argument.Expression.EvaluateAsync(context)).ToBooleanValue(); break;
-                    default: (customAttributes ??= [])[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                }
+                case "src": src = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "rel": rel = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "condition": condition = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "title": title = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "type": type = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "append_version": appendVersion = (await argument.Expression.EvaluateAsync(context)).ToBooleanValue(); break;
+                default: (customAttributes ??= [])[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
             }
+        }
 
-            var linkEntry = new LinkEntry();
+        var linkEntry = new LinkEntry();
 
-            if (!string.IsNullOrEmpty(src))
-            {
-                linkEntry.Href = src;
-            }
+        if (!string.IsNullOrEmpty(src))
+        {
+            linkEntry.Href = src;
+        }
 
-            if (!string.IsNullOrEmpty(rel))
-            {
-                linkEntry.Rel = rel;
-            }
+        if (!string.IsNullOrEmpty(rel))
+        {
+            linkEntry.Rel = rel;
+        }
 
-            if (!string.IsNullOrEmpty(condition))
-            {
-                linkEntry.Condition = condition;
-            }
+        if (!string.IsNullOrEmpty(condition))
+        {
+            linkEntry.Condition = condition;
+        }
 
-            if (!string.IsNullOrEmpty(title))
-            {
-                linkEntry.Title = title;
-            }
+        if (!string.IsNullOrEmpty(title))
+        {
+            linkEntry.Title = title;
+        }
 
-            if (!string.IsNullOrEmpty(type))
-            {
-                linkEntry.Type = type;
-            }
+        if (!string.IsNullOrEmpty(type))
+        {
+            linkEntry.Type = type;
+        }
 
-            if (appendVersion.HasValue)
-            {
-                linkEntry.AppendVersion = appendVersion.Value;
-            }
+        if (appendVersion.HasValue)
+        {
+            linkEntry.AppendVersion = appendVersion.Value;
+        }
 
-            if (customAttributes != null)
+        if (customAttributes != null)
+        {
+            foreach (var attribute in customAttributes)
             {
-                foreach (var attribute in customAttributes)
-                {
-                    linkEntry.SetAttribute(attribute.Key, attribute.Value);
-                }
+                linkEntry.SetAttribute(attribute.Key, attribute.Value);
             }
+        }
 
-            resourceManager.RegisterLink(linkEntry);
+        resourceManager.RegisterLink(linkEntry);
 
-            return Completion.Normal;
-        }
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/MetaTag.cs b/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/MetaTag.cs
index b2def0e9ecb..634d16c3b3f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/MetaTag.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/MetaTag.cs
@@ -8,51 +8,50 @@
 using OrchardCore.Liquid;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Resources.Liquid
+namespace OrchardCore.Resources.Liquid;
+
+public class MetaTag
 {
-    public class MetaTag
+    public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, TextWriter _1, TextEncoder _2, TemplateContext context)
-        {
-            var services = ((LiquidTemplateContext)context).Services;
-            var resourceManager = services.GetRequiredService<IResourceManager>();
+        var services = ((LiquidTemplateContext)context).Services;
+        var resourceManager = services.GetRequiredService<IResourceManager>();
 
-            string name = null;
-            string property = null;
-            string content = null;
-            string httpEquiv = null;
-            string charset = null;
-            string separator = null;
+        string name = null;
+        string property = null;
+        string content = null;
+        string httpEquiv = null;
+        string charset = null;
+        string separator = null;
 
-            Dictionary<string, string> customAttributes = null;
+        Dictionary<string, string> customAttributes = null;
 
-            foreach (var argument in argumentsList)
+        foreach (var argument in argumentsList)
+        {
+            switch (argument.Name)
             {
-                switch (argument.Name)
-                {
-                    case "name": name = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "property": property = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "content": content = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "http_equiv": httpEquiv = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "charset": charset = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "separator": separator = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    default: (customAttributes ??= [])[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                }
+                case "name": name = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "property": property = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "content": content = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "http_equiv": httpEquiv = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "charset": charset = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "separator": separator = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                default: (customAttributes ??= [])[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
             }
+        }
 
-            var metaEntry = new MetaEntry(name, property, content, httpEquiv, charset);
+        var metaEntry = new MetaEntry(name, property, content, httpEquiv, charset);
 
-            if (customAttributes != null)
+        if (customAttributes != null)
+        {
+            foreach (var attribute in customAttributes)
             {
-                foreach (var attribute in customAttributes)
-                {
-                    metaEntry.SetAttribute(attribute.Key, attribute.Value);
-                }
+                metaEntry.SetAttribute(attribute.Key, attribute.Value);
             }
+        }
 
-            resourceManager.AppendMeta(metaEntry, separator ?? ", ");
+        resourceManager.AppendMeta(metaEntry, separator ?? ", ");
 
-            return Completion.Normal;
-        }
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/ResourcesTag.cs b/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/ResourcesTag.cs
index 88770c2ed9c..d23676a7706 100644
--- a/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/ResourcesTag.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/ResourcesTag.cs
@@ -9,38 +9,37 @@
 using OrchardCore.Liquid;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Resources.Liquid
+namespace OrchardCore.Resources.Liquid;
+
+public class ResourcesTag
 {
-    public class ResourcesTag
+    public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, TextWriter writer, TextEncoder _, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, TextWriter writer, TextEncoder _, TemplateContext context)
-        {
-            var services = ((LiquidTemplateContext)context).Services;
-            var processors = services.GetRequiredService<IEnumerable<IResourcesTagHelperProcessor>>();
+        var services = ((LiquidTemplateContext)context).Services;
+        var processors = services.GetRequiredService<IEnumerable<IResourcesTagHelperProcessor>>();
 
-            var processorContext = new ResourcesTagHelperProcessorContext(ResourceTagType.Footer, writer);
+        var processorContext = new ResourcesTagHelperProcessorContext(ResourceTagType.Footer, writer);
 
-            foreach (var argument in argumentsList)
+        foreach (var argument in argumentsList)
+        {
+            switch (argument.Name)
             {
-                switch (argument.Name)
-                {
-                    case "type":
-                        var typeString = (await argument.Expression.EvaluateAsync(context)).ToStringValue();
-                        if (Enum.TryParse<ResourceTagType>(typeString, out var type))
-                        {
-                            processorContext = processorContext with { Type = type };
-                        }
+                case "type":
+                    var typeString = (await argument.Expression.EvaluateAsync(context)).ToStringValue();
+                    if (Enum.TryParse<ResourceTagType>(typeString, out var type))
+                    {
+                        processorContext = processorContext with { Type = type };
+                    }
 
-                        break;
-                }
-            }
-
-            foreach (var processor in processors)
-            {
-                await processor.ProcessAsync(processorContext);
+                    break;
             }
+        }
 
-            return Completion.Normal;
+        foreach (var processor in processors)
+        {
+            await processor.ProcessAsync(processorContext);
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/ScriptBlock.cs b/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/ScriptBlock.cs
index 1b1b588bdad..6f23b765cfc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/ScriptBlock.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/ScriptBlock.cs
@@ -11,124 +11,88 @@
 using OrchardCore.Liquid;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Resources.Liquid
+namespace OrchardCore.Resources.Liquid;
+
+public class ScriptBlock
 {
-    public class ScriptBlock
-    {
-        private static readonly char[] _separators = [',', ' '];
+    private static readonly char[] _separators = [',', ' '];
 
-        public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, TemplateContext context)
-        {
-            var services = ((LiquidTemplateContext)context).Services;
-            var resourceManager = services.GetRequiredService<IResourceManager>();
+    public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, TemplateContext context)
+    {
+        var services = ((LiquidTemplateContext)context).Services;
+        var resourceManager = services.GetRequiredService<IResourceManager>();
 
-            string name = null;
-            bool? useCdn = null;
-            string condition = null;
-            string culture = null;
-            bool? debug = null;
-            string dependsOn = null;
-            string version = null;
-            var at = ResourceLocation.Unspecified;
+        string name = null;
+        bool? useCdn = null;
+        string condition = null;
+        string culture = null;
+        bool? debug = null;
+        string dependsOn = null;
+        string version = null;
+        var at = ResourceLocation.Unspecified;
 
-            Dictionary<string, string> customAttributes = null;
+        Dictionary<string, string> customAttributes = null;
 
-            foreach (var argument in argumentsList)
+        foreach (var argument in argumentsList)
+        {
+            switch (argument.Name)
             {
-                switch (argument.Name)
-                {
-                    case "name": name = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "condition": condition = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "culture": culture = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "debug": debug = (await argument.Expression.EvaluateAsync(context)).ToBooleanValue(); break;
-                    case "depends_on": dependsOn = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "version": version = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "at": Enum.TryParse((await argument.Expression.EvaluateAsync(context)).ToStringValue(), ignoreCase: true, out at); break;
-                    default: (customAttributes ??= [])[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                }
+                case "name": name = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "condition": condition = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "culture": culture = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "debug": debug = (await argument.Expression.EvaluateAsync(context)).ToBooleanValue(); break;
+                case "depends_on": dependsOn = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "version": version = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "at": Enum.TryParse((await argument.Expression.EvaluateAsync(context)).ToStringValue(), ignoreCase: true, out at); break;
+                default: (customAttributes ??= [])[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
             }
+        }
 
-            if (!string.IsNullOrEmpty(name))
-            {
-                // Resource required
-
-                var setting = resourceManager.RegisterResource("script", name);
-
-                if (at != ResourceLocation.Unspecified)
-                {
-                    setting.AtLocation(at);
-                }
-
-                if (useCdn != null)
-                {
-                    setting.UseCdn(useCdn.Value);
-                }
-
-                if (!string.IsNullOrEmpty(condition))
-                {
-                    setting.UseCondition(condition);
-                }
-
-                if (debug != null)
-                {
-                    setting.UseDebugMode(debug.Value);
-                }
-
-                if (!string.IsNullOrEmpty(culture))
-                {
-                    setting.UseCulture(culture);
-                }
-
-                if (!string.IsNullOrEmpty(version))
-                {
-                    setting.UseVersion(version);
-                }
+        if (!string.IsNullOrEmpty(name))
+        {
+            // Resource required
 
-                // This allows additions to the pre registered scripts dependencies.
-                if (!string.IsNullOrEmpty(dependsOn))
-                {
-                    setting.SetDependencies(dependsOn.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
-                }
+            var setting = resourceManager.RegisterResource("script", name);
 
-                // Allow Inline to work with both named scripts, and named inline scripts.
-                if (at != ResourceLocation.Unspecified)
-                {
-                    var content = "";
+            if (at != ResourceLocation.Unspecified)
+            {
+                setting.AtLocation(at);
+            }
 
-                    if (statements != null && statements.Count > 0)
-                    {
-                        using var sw = new ZStringWriter();
-                        var completion = await statements.RenderStatementsAsync(sw, encoder, context);
+            if (useCdn != null)
+            {
+                setting.UseCdn(useCdn.Value);
+            }
 
-                        if (completion != Completion.Normal)
-                        {
-                            return completion;
-                        }
+            if (!string.IsNullOrEmpty(condition))
+            {
+                setting.UseCondition(condition);
+            }
 
-                        content = sw.ToString();
-                    }
+            if (debug != null)
+            {
+                setting.UseDebugMode(debug.Value);
+            }
 
-                    // Named inline declaration.
-                    if (!string.IsNullOrWhiteSpace(content))
-                    {
-                        // Inline content definition
-                        resourceManager.InlineManifest.DefineScript(name).SetInnerContent(content);
-                    }
+            if (!string.IsNullOrEmpty(culture))
+            {
+                setting.UseCulture(culture);
+            }
 
-                    if (at == ResourceLocation.Inline)
-                    {
-                        resourceManager.RenderLocalScript(setting, writer);
-                    }
-                }
-                else
-                {
-                    resourceManager.RenderLocalScript(setting, writer);
-                }
+            if (!string.IsNullOrEmpty(version))
+            {
+                setting.UseVersion(version);
             }
-            else
+
+            // This allows additions to the pre registered scripts dependencies.
+            if (!string.IsNullOrEmpty(dependsOn))
             {
-                // Custom script content
+                setting.SetDependencies(dependsOn.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
+            }
 
+            // Allow Inline to work with both named scripts, and named inline scripts.
+            if (at != ResourceLocation.Unspecified)
+            {
                 var content = "";
 
                 if (statements != null && statements.Count > 0)
@@ -144,33 +108,68 @@ public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgum
                     content = sw.ToString();
                 }
 
-                var builder = new TagBuilder("script");
-                builder.InnerHtml.AppendHtml(content);
-                builder.TagRenderMode = TagRenderMode.Normal;
-
-                if (customAttributes != null)
+                // Named inline declaration.
+                if (!string.IsNullOrWhiteSpace(content))
                 {
-                    foreach (var attribute in customAttributes)
-                    {
-                        builder.Attributes.Add(attribute.Key, attribute.Value);
-                    }
+                    // Inline content definition
+                    resourceManager.InlineManifest.DefineScript(name).SetInnerContent(content);
                 }
 
-                if (at == ResourceLocation.Head)
+                if (at == ResourceLocation.Inline)
                 {
-                    resourceManager.RegisterHeadScript(builder);
+                    resourceManager.RenderLocalScript(setting, writer);
                 }
-                else if (at == ResourceLocation.Inline)
+            }
+            else
+            {
+                resourceManager.RenderLocalScript(setting, writer);
+            }
+        }
+        else
+        {
+            // Custom script content
+
+            var content = "";
+
+            if (statements != null && statements.Count > 0)
+            {
+                using var sw = new ZStringWriter();
+                var completion = await statements.RenderStatementsAsync(sw, encoder, context);
+
+                if (completion != Completion.Normal)
                 {
-                    builder.WriteTo(writer, (HtmlEncoder)encoder);
+                    return completion;
                 }
-                else
+
+                content = sw.ToString();
+            }
+
+            var builder = new TagBuilder("script");
+            builder.InnerHtml.AppendHtml(content);
+            builder.TagRenderMode = TagRenderMode.Normal;
+
+            if (customAttributes != null)
+            {
+                foreach (var attribute in customAttributes)
                 {
-                    resourceManager.RegisterFootScript(builder);
+                    builder.Attributes.Add(attribute.Key, attribute.Value);
                 }
             }
 
-            return Completion.Normal;
+            if (at == ResourceLocation.Head)
+            {
+                resourceManager.RegisterHeadScript(builder);
+            }
+            else if (at == ResourceLocation.Inline)
+            {
+                builder.WriteTo(writer, (HtmlEncoder)encoder);
+            }
+            else
+            {
+                resourceManager.RegisterFootScript(builder);
+            }
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/ScriptTag.cs b/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/ScriptTag.cs
index 118e074e4dd..cfe65a5a460 100644
--- a/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/ScriptTag.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/ScriptTag.cs
@@ -9,284 +9,283 @@
 using OrchardCore.Liquid;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Resources.Liquid
+namespace OrchardCore.Resources.Liquid;
+
+public class ScriptTag
 {
-    public class ScriptTag
-    {
-        private static readonly char[] _separators = [',', ' '];
+    private static readonly char[] _separators = [',', ' '];
 
-        public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, TextWriter writer, TextEncoder _, TemplateContext context)
+    public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, TextWriter writer, TextEncoder _, TemplateContext context)
+    {
+        var services = ((LiquidTemplateContext)context).Services;
+        var resourceManager = services.GetRequiredService<IResourceManager>();
+
+        string name = null;
+        string src = null;
+        bool? appendVersion = null;
+        string cdnSrc = null;
+        string debugSrc = null;
+        string debugCdnSrc = null;
+        bool? useCdn = null;
+        string condition = null;
+        string culture = null;
+        bool? debug = null;
+        string dependsOn = null;
+        string version = null;
+        var at = ResourceLocation.Unspecified;
+
+        Dictionary<string, string> customAttributes = null;
+
+        foreach (var argument in argumentsList)
         {
-            var services = ((LiquidTemplateContext)context).Services;
-            var resourceManager = services.GetRequiredService<IResourceManager>();
-
-            string name = null;
-            string src = null;
-            bool? appendVersion = null;
-            string cdnSrc = null;
-            string debugSrc = null;
-            string debugCdnSrc = null;
-            bool? useCdn = null;
-            string condition = null;
-            string culture = null;
-            bool? debug = null;
-            string dependsOn = null;
-            string version = null;
-            var at = ResourceLocation.Unspecified;
-
-            Dictionary<string, string> customAttributes = null;
-
-            foreach (var argument in argumentsList)
+            switch (argument.Name)
             {
-                switch (argument.Name)
-                {
-                    case "name": name = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "src": src = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "append_version": appendVersion = (await argument.Expression.EvaluateAsync(context)).ToBooleanValue(); break;
-                    case "cdn_src": cdnSrc = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "debug_src": debugSrc = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "debug_cdn_src": debugCdnSrc = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "use_cdn": useCdn = (await argument.Expression.EvaluateAsync(context)).ToBooleanValue(); break;
-                    case "condition": condition = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "culture": culture = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "debug": debug = (await argument.Expression.EvaluateAsync(context)).ToBooleanValue(); break;
-                    case "depends_on": dependsOn = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "version": version = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "at": Enum.TryParse((await argument.Expression.EvaluateAsync(context)).ToStringValue(), ignoreCase: true, out at); break;
-                    default: (customAttributes ??= [])[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                }
+                case "name": name = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "src": src = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "append_version": appendVersion = (await argument.Expression.EvaluateAsync(context)).ToBooleanValue(); break;
+                case "cdn_src": cdnSrc = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "debug_src": debugSrc = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "debug_cdn_src": debugCdnSrc = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "use_cdn": useCdn = (await argument.Expression.EvaluateAsync(context)).ToBooleanValue(); break;
+                case "condition": condition = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "culture": culture = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "debug": debug = (await argument.Expression.EvaluateAsync(context)).ToBooleanValue(); break;
+                case "depends_on": dependsOn = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "version": version = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "at": Enum.TryParse((await argument.Expression.EvaluateAsync(context)).ToStringValue(), ignoreCase: true, out at); break;
+                default: (customAttributes ??= [])[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
             }
+        }
 
-            if (string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(src))
-            {
-                // {% script src:"~/TheBlogTheme/js/clean-blog.min.js" %}
-                RequireSettings setting;
-
-                if (string.IsNullOrEmpty(dependsOn))
-                {
-                    // Include custom script url
-                    setting = resourceManager.RegisterUrl("script", src, debugSrc);
-                }
-                else
-                {
-                    // Anonymous declaration with dependencies, then display
-
-                    // Using the source as the name to prevent duplicate references to the same file
-                    var s = src.ToLowerInvariant();
-
-                    var definition = resourceManager.InlineManifest.DefineScript(s);
-                    definition.SetUrl(src, debugSrc);
-
-                    if (!string.IsNullOrEmpty(version))
-                    {
-                        definition.SetVersion(version);
-                    }
-
-                    if (!string.IsNullOrEmpty(cdnSrc))
-                    {
-                        definition.SetCdn(cdnSrc, debugCdnSrc);
-                    }
-
-                    if (!string.IsNullOrEmpty(culture))
-                    {
-                        definition.SetCultures(culture.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
-                    }
-
-                    definition.SetDependencies(dependsOn.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
-
-                    if (appendVersion.HasValue)
-                    {
-                        definition.ShouldAppendVersion(appendVersion);
-                    }
+        if (string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(src))
+        {
+            // {% script src:"~/TheBlogTheme/js/clean-blog.min.js" %}
+            RequireSettings setting;
 
-                    if (!string.IsNullOrEmpty(version))
-                    {
-                        definition.SetVersion(version);
-                    }
+            if (string.IsNullOrEmpty(dependsOn))
+            {
+                // Include custom script url
+                setting = resourceManager.RegisterUrl("script", src, debugSrc);
+            }
+            else
+            {
+                // Anonymous declaration with dependencies, then display
 
-                    setting = resourceManager.RegisterResource("script", s);
-                }
+                // Using the source as the name to prevent duplicate references to the same file
+                var s = src.ToLowerInvariant();
 
-                if (at != ResourceLocation.Unspecified)
-                {
-                    setting.AtLocation(at);
-                }
+                var definition = resourceManager.InlineManifest.DefineScript(s);
+                definition.SetUrl(src, debugSrc);
 
-                if (!string.IsNullOrEmpty(condition))
+                if (!string.IsNullOrEmpty(version))
                 {
-                    setting.UseCondition(condition);
+                    definition.SetVersion(version);
                 }
 
-                if (debug != null)
+                if (!string.IsNullOrEmpty(cdnSrc))
                 {
-                    setting.UseDebugMode(debug.Value);
+                    definition.SetCdn(cdnSrc, debugCdnSrc);
                 }
 
                 if (!string.IsNullOrEmpty(culture))
                 {
-                    setting.UseCulture(culture);
+                    definition.SetCultures(culture.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
                 }
 
+                definition.SetDependencies(dependsOn.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
+
                 if (appendVersion.HasValue)
                 {
-                    setting.ShouldAppendVersion(appendVersion);
+                    definition.ShouldAppendVersion(appendVersion);
                 }
 
-                if (customAttributes != null)
+                if (!string.IsNullOrEmpty(version))
                 {
-                    foreach (var attribute in customAttributes)
-                    {
-                        setting.SetAttribute(attribute.Key, attribute.Value);
-                    }
+                    definition.SetVersion(version);
                 }
 
-                if (at == ResourceLocation.Unspecified || at == ResourceLocation.Inline)
-                {
-                    resourceManager.RenderLocalScript(setting, writer);
-                }
+                setting = resourceManager.RegisterResource("script", s);
             }
-            else if (!string.IsNullOrEmpty(name) && string.IsNullOrEmpty(src))
+
+            if (at != ResourceLocation.Unspecified)
             {
-                // Resource required
-                // {% script name:"bootstrap" %}
+                setting.AtLocation(at);
+            }
 
-                var setting = resourceManager.RegisterResource("script", name);
+            if (!string.IsNullOrEmpty(condition))
+            {
+                setting.UseCondition(condition);
+            }
 
-                if (customAttributes != null)
-                {
-                    foreach (var attribute in customAttributes)
-                    {
-                        setting.SetAttribute(attribute.Key, attribute.Value);
-                    }
-                }
+            if (debug != null)
+            {
+                setting.UseDebugMode(debug.Value);
+            }
 
-                if (at != ResourceLocation.Unspecified)
-                {
-                    setting.AtLocation(at);
-                }
+            if (!string.IsNullOrEmpty(culture))
+            {
+                setting.UseCulture(culture);
+            }
 
-                if (useCdn != null)
-                {
-                    setting.UseCdn(useCdn.Value);
-                }
+            if (appendVersion.HasValue)
+            {
+                setting.ShouldAppendVersion(appendVersion);
+            }
 
-                if (!string.IsNullOrEmpty(condition))
+            if (customAttributes != null)
+            {
+                foreach (var attribute in customAttributes)
                 {
-                    setting.UseCondition(condition);
+                    setting.SetAttribute(attribute.Key, attribute.Value);
                 }
+            }
 
-                if (debug != null)
-                {
-                    setting.UseDebugMode(debug.Value);
-                }
+            if (at == ResourceLocation.Unspecified || at == ResourceLocation.Inline)
+            {
+                resourceManager.RenderLocalScript(setting, writer);
+            }
+        }
+        else if (!string.IsNullOrEmpty(name) && string.IsNullOrEmpty(src))
+        {
+            // Resource required
+            // {% script name:"bootstrap" %}
 
-                if (!string.IsNullOrEmpty(culture))
-                {
-                    setting.UseCulture(culture);
-                }
+            var setting = resourceManager.RegisterResource("script", name);
 
-                if (appendVersion.HasValue)
+            if (customAttributes != null)
+            {
+                foreach (var attribute in customAttributes)
                 {
-                    setting.ShouldAppendVersion(appendVersion);
+                    setting.SetAttribute(attribute.Key, attribute.Value);
                 }
+            }
 
-                if (!string.IsNullOrEmpty(version))
-                {
-                    setting.UseVersion(version);
-                }
+            if (at != ResourceLocation.Unspecified)
+            {
+                setting.AtLocation(at);
+            }
 
-                // This allows additions to the pre registered scripts dependencies.
-                if (!string.IsNullOrEmpty(dependsOn))
-                {
-                    setting.SetDependencies(dependsOn.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
-                }
+            if (useCdn != null)
+            {
+                setting.UseCdn(useCdn.Value);
+            }
 
-                if (at == ResourceLocation.Unspecified || at == ResourceLocation.Inline)
-                {
-                    resourceManager.RenderLocalScript(setting, writer);
-                }
+            if (!string.IsNullOrEmpty(condition))
+            {
+                setting.UseCondition(condition);
             }
-            else if (!string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(src))
+
+            if (debug != null)
             {
-                // Inline declaration
+                setting.UseDebugMode(debug.Value);
+            }
 
-                var definition = resourceManager.InlineManifest.DefineScript(name);
-                definition.SetUrl(src, debugSrc);
+            if (!string.IsNullOrEmpty(culture))
+            {
+                setting.UseCulture(culture);
+            }
 
-                if (!string.IsNullOrEmpty(version))
-                {
-                    definition.SetVersion(version);
-                }
+            if (appendVersion.HasValue)
+            {
+                setting.ShouldAppendVersion(appendVersion);
+            }
 
-                if (!string.IsNullOrEmpty(cdnSrc))
-                {
-                    definition.SetCdn(cdnSrc, debugCdnSrc);
-                }
+            if (!string.IsNullOrEmpty(version))
+            {
+                setting.UseVersion(version);
+            }
 
-                if (!string.IsNullOrEmpty(culture))
+            // This allows additions to the pre registered scripts dependencies.
+            if (!string.IsNullOrEmpty(dependsOn))
+            {
+                setting.SetDependencies(dependsOn.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
+            }
+
+            if (at == ResourceLocation.Unspecified || at == ResourceLocation.Inline)
+            {
+                resourceManager.RenderLocalScript(setting, writer);
+            }
+        }
+        else if (!string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(src))
+        {
+            // Inline declaration
+
+            var definition = resourceManager.InlineManifest.DefineScript(name);
+            definition.SetUrl(src, debugSrc);
+
+            if (!string.IsNullOrEmpty(version))
+            {
+                definition.SetVersion(version);
+            }
+
+            if (!string.IsNullOrEmpty(cdnSrc))
+            {
+                definition.SetCdn(cdnSrc, debugCdnSrc);
+            }
+
+            if (!string.IsNullOrEmpty(culture))
+            {
+                definition.SetCultures(culture.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
+            }
+
+            if (!string.IsNullOrEmpty(dependsOn))
+            {
+                definition.SetDependencies(dependsOn.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
+            }
+
+            if (appendVersion.HasValue)
+            {
+                definition.ShouldAppendVersion(appendVersion);
+            }
+
+            if (!string.IsNullOrEmpty(version))
+            {
+                definition.SetVersion(version);
+            }
+
+            // If At is specified then we also render it
+            if (at != ResourceLocation.Unspecified)
+            {
+                var setting = resourceManager.RegisterResource("script", name);
+
+                setting.AtLocation(at);
+
+                if (useCdn != null)
                 {
-                    definition.SetCultures(culture.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
+                    setting.UseCdn(useCdn.Value);
                 }
 
-                if (!string.IsNullOrEmpty(dependsOn))
+                if (!string.IsNullOrEmpty(condition))
                 {
-                    definition.SetDependencies(dependsOn.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
+                    setting.UseCondition(condition);
                 }
 
-                if (appendVersion.HasValue)
+                if (debug != null)
                 {
-                    definition.ShouldAppendVersion(appendVersion);
+                    setting.UseDebugMode(debug.Value);
                 }
 
-                if (!string.IsNullOrEmpty(version))
+                if (!string.IsNullOrEmpty(culture))
                 {
-                    definition.SetVersion(version);
+                    setting.UseCulture(culture);
                 }
 
-                // If At is specified then we also render it
-                if (at != ResourceLocation.Unspecified)
+                if (customAttributes != null)
                 {
-                    var setting = resourceManager.RegisterResource("script", name);
-
-                    setting.AtLocation(at);
-
-                    if (useCdn != null)
-                    {
-                        setting.UseCdn(useCdn.Value);
-                    }
-
-                    if (!string.IsNullOrEmpty(condition))
-                    {
-                        setting.UseCondition(condition);
-                    }
-
-                    if (debug != null)
-                    {
-                        setting.UseDebugMode(debug.Value);
-                    }
-
-                    if (!string.IsNullOrEmpty(culture))
-                    {
-                        setting.UseCulture(culture);
-                    }
-
-                    if (customAttributes != null)
-                    {
-                        foreach (var attribute in customAttributes)
-                        {
-                            setting.SetAttribute(attribute.Key, attribute.Value);
-                        }
-                    }
-
-                    if (at == ResourceLocation.Inline)
+                    foreach (var attribute in customAttributes)
                     {
-                        resourceManager.RenderLocalScript(setting, writer);
+                        setting.SetAttribute(attribute.Key, attribute.Value);
                     }
+                }
 
+                if (at == ResourceLocation.Inline)
+                {
+                    resourceManager.RenderLocalScript(setting, writer);
                 }
-            }
 
-            return Completion.Normal;
+            }
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/StyleBlock.cs b/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/StyleBlock.cs
index 8f011159dfc..bfa93afff62 100644
--- a/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/StyleBlock.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/StyleBlock.cs
@@ -11,165 +11,164 @@
 using OrchardCore.Liquid;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Resources.Liquid
+namespace OrchardCore.Resources.Liquid;
+
+public class StyleBlock
 {
-    public class StyleBlock
+    private static readonly char[] _separators = [',', ' '];
+
+    public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, TemplateContext context)
     {
-        private static readonly char[] _separators = [',', ' '];
+        var services = ((LiquidTemplateContext)context).Services;
+        var resourceManager = services.GetRequiredService<IResourceManager>();
+
+        string name = null;
+        string condition = null;
+        string culture = null;
+        bool? debug = null;
+        string dependsOn = null;
+        string version = null;
+        var at = ResourceLocation.Unspecified;
 
-        public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, TemplateContext context)
+        Dictionary<string, string> customAttributes = null;
+
+        foreach (var argument in argumentsList)
         {
-            var services = ((LiquidTemplateContext)context).Services;
-            var resourceManager = services.GetRequiredService<IResourceManager>();
+            switch (argument.Name)
+            {
+                case "name": name = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "condition": condition = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "culture": culture = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "debug": debug = (await argument.Expression.EvaluateAsync(context)).ToBooleanValue(); break;
+                case "depends_on": dependsOn = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "version": version = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "at": Enum.TryParse((await argument.Expression.EvaluateAsync(context)).ToStringValue(), ignoreCase: true, out at); break;
+                default: (customAttributes ??= [])[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+            }
+        }
 
-            string name = null;
-            string condition = null;
-            string culture = null;
-            bool? debug = null;
-            string dependsOn = null;
-            string version = null;
-            var at = ResourceLocation.Unspecified;
+        if (!string.IsNullOrEmpty(name))
+        {
+            // Resource required
 
-            Dictionary<string, string> customAttributes = null;
+            var setting = resourceManager.RegisterResource("stylesheet", name);
 
-            foreach (var argument in argumentsList)
+            if (customAttributes != null)
             {
-                switch (argument.Name)
+                foreach (var attribute in customAttributes)
                 {
-                    case "name": name = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "condition": condition = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "culture": culture = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "debug": debug = (await argument.Expression.EvaluateAsync(context)).ToBooleanValue(); break;
-                    case "depends_on": dependsOn = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "version": version = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "at": Enum.TryParse((await argument.Expression.EvaluateAsync(context)).ToStringValue(), ignoreCase: true, out at); break;
-                    default: (customAttributes ??= [])[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                    setting.SetAttribute(attribute.Key, attribute.Value);
                 }
             }
 
-            if (!string.IsNullOrEmpty(name))
+            if (at != ResourceLocation.Unspecified)
+            {
+                setting.AtLocation(at);
+            }
+            else
             {
-                // Resource required
+                setting.AtLocation(ResourceLocation.Head);
+            }
 
-                var setting = resourceManager.RegisterResource("stylesheet", name);
+            if (!string.IsNullOrEmpty(condition))
+            {
+                setting.UseCondition(condition);
+            }
 
-                if (customAttributes != null)
-                {
-                    foreach (var attribute in customAttributes)
-                    {
-                        setting.SetAttribute(attribute.Key, attribute.Value);
-                    }
-                }
+            if (debug != null)
+            {
+                setting.UseDebugMode(debug.Value);
+            }
 
-                if (at != ResourceLocation.Unspecified)
-                {
-                    setting.AtLocation(at);
-                }
-                else
-                {
-                    setting.AtLocation(ResourceLocation.Head);
-                }
+            if (!string.IsNullOrEmpty(culture))
+            {
+                setting.UseCulture(culture);
+            }
 
-                if (!string.IsNullOrEmpty(condition))
-                {
-                    setting.UseCondition(condition);
-                }
+            if (!string.IsNullOrEmpty(version))
+            {
+                setting.UseVersion(version);
+            }
 
-                if (debug != null)
-                {
-                    setting.UseDebugMode(debug.Value);
-                }
+            // This allows additions to the pre registered style dependencies.
+            if (!string.IsNullOrEmpty(dependsOn))
+            {
+                setting.SetDependencies(dependsOn.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
+            }
 
-                if (!string.IsNullOrEmpty(culture))
-                {
-                    setting.UseCulture(culture);
-                }
+            var content = "";
 
-                if (!string.IsNullOrEmpty(version))
-                {
-                    setting.UseVersion(version);
-                }
+            if (statements != null && statements.Count > 0)
+            {
+                using var sw = new ZStringWriter();
+                var completion = await statements.RenderStatementsAsync(sw, encoder, context);
 
-                // This allows additions to the pre registered style dependencies.
-                if (!string.IsNullOrEmpty(dependsOn))
+                if (completion != Completion.Normal)
                 {
-                    setting.SetDependencies(dependsOn.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
+                    return completion;
                 }
 
-                var content = "";
-
-                if (statements != null && statements.Count > 0)
-                {
-                    using var sw = new ZStringWriter();
-                    var completion = await statements.RenderStatementsAsync(sw, encoder, context);
+                content = sw.ToString();
+            }
 
-                    if (completion != Completion.Normal)
-                    {
-                        return completion;
-                    }
+            if (!string.IsNullOrWhiteSpace(content))
+            {
+                // Inline named style definition
+                resourceManager.InlineManifest.DefineStyle(name).SetInnerContent(content);
+            }
 
-                    content = sw.ToString();
-                }
+            if (at == ResourceLocation.Inline)
+            {
+                resourceManager.RenderLocalStyle(setting, writer);
+            }
+        }
+        else
+        {
+            // Custom style content
 
-                if (!string.IsNullOrWhiteSpace(content))
-                {
-                    // Inline named style definition
-                    resourceManager.InlineManifest.DefineStyle(name).SetInnerContent(content);
-                }
+            var content = "";
 
-                if (at == ResourceLocation.Inline)
-                {
-                    resourceManager.RenderLocalStyle(setting, writer);
-                }
-            }
-            else
+            if (statements != null && statements.Count > 0)
             {
-                // Custom style content
-
-                var content = "";
+                using var sw = new ZStringWriter();
+                var completion = await statements.RenderStatementsAsync(sw, encoder, context);
 
-                if (statements != null && statements.Count > 0)
+                if (completion != Completion.Normal)
                 {
-                    using var sw = new ZStringWriter();
-                    var completion = await statements.RenderStatementsAsync(sw, encoder, context);
-
-                    if (completion != Completion.Normal)
-                    {
-                        return completion;
-                    }
-
-                    content = sw.ToString();
+                    return completion;
                 }
 
-                var builder = new TagBuilder("style");
-                builder.InnerHtml.AppendHtml(content);
-                builder.TagRenderMode = TagRenderMode.Normal;
+                content = sw.ToString();
+            }
 
-                if (customAttributes != null)
-                {
-                    foreach (var attribute in customAttributes)
-                    {
-                        builder.Attributes.Add(attribute.Key, attribute.Value);
-                    }
-                }
+            var builder = new TagBuilder("style");
+            builder.InnerHtml.AppendHtml(content);
+            builder.TagRenderMode = TagRenderMode.Normal;
 
-                // If no type was specified, define a default one
-                if (!builder.Attributes.ContainsKey("type"))
+            if (customAttributes != null)
+            {
+                foreach (var attribute in customAttributes)
                 {
-                    builder.Attributes.Add("type", "text/css");
+                    builder.Attributes.Add(attribute.Key, attribute.Value);
                 }
+            }
 
-                if (at == ResourceLocation.Inline)
-                {
-                    builder.WriteTo(writer, (HtmlEncoder)encoder);
-                }
-                else
-                {
-                    resourceManager.RegisterStyle(builder);
-                }
+            // If no type was specified, define a default one
+            if (!builder.Attributes.ContainsKey("type"))
+            {
+                builder.Attributes.Add("type", "text/css");
             }
 
-            return Completion.Normal;
+            if (at == ResourceLocation.Inline)
+            {
+                builder.WriteTo(writer, (HtmlEncoder)encoder);
+            }
+            else
+            {
+                resourceManager.RegisterStyle(builder);
+            }
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/StyleTag.cs b/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/StyleTag.cs
index b611a8b93b8..a8359e1cf26 100644
--- a/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/StyleTag.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Resources/Liquid/StyleTag.cs
@@ -9,244 +9,243 @@
 using OrchardCore.Liquid;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Resources.Liquid
+namespace OrchardCore.Resources.Liquid;
+
+public class StyleTag
 {
-    public class StyleTag
-    {
-        private static readonly char[] _separators = [',', ' '];
+    private static readonly char[] _separators = [',', ' '];
 
-        public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, TextWriter writer, TextEncoder _, TemplateContext context)
+    public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, TextWriter writer, TextEncoder _, TemplateContext context)
+    {
+        var services = ((LiquidTemplateContext)context).Services;
+        var resourceManager = services.GetRequiredService<IResourceManager>();
+
+        string name = null;
+        string src = null;
+        bool? appendversion = null;
+        string cdnSrc = null;
+        string debugSrc = null;
+        string debugCdnSrc = null;
+        bool? useCdn = null;
+        string condition = null;
+        string culture = null;
+        bool? debug = null;
+        string dependsOn = null;
+        string version = null;
+        var at = ResourceLocation.Unspecified;
+
+        Dictionary<string, string> customAttributes = null;
+
+        foreach (var argument in argumentsList)
         {
-            var services = ((LiquidTemplateContext)context).Services;
-            var resourceManager = services.GetRequiredService<IResourceManager>();
-
-            string name = null;
-            string src = null;
-            bool? appendversion = null;
-            string cdnSrc = null;
-            string debugSrc = null;
-            string debugCdnSrc = null;
-            bool? useCdn = null;
-            string condition = null;
-            string culture = null;
-            bool? debug = null;
-            string dependsOn = null;
-            string version = null;
-            var at = ResourceLocation.Unspecified;
-
-            Dictionary<string, string> customAttributes = null;
-
-            foreach (var argument in argumentsList)
-            {
-                switch (argument.Name)
-                {
-                    case "name": name = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "src": src = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "append_version": appendversion = (await argument.Expression.EvaluateAsync(context)).ToBooleanValue(); break;
-                    case "cdn_src": cdnSrc = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "debug_src": debugSrc = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "debug_cdn_src": debugCdnSrc = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "use_cdn": useCdn = (await argument.Expression.EvaluateAsync(context)).ToBooleanValue(); break;
-                    case "condition": condition = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "culture": culture = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "debug": debug = (await argument.Expression.EvaluateAsync(context)).ToBooleanValue(); break;
-                    case "depends_on": dependsOn = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "version": version = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "at": Enum.TryParse((await argument.Expression.EvaluateAsync(context)).ToStringValue(), ignoreCase: true, out at); break;
-                    default: (customAttributes ??= [])[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                }
-            }
-
-            if (string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(src))
+            switch (argument.Name)
             {
-                // Include custom style
-                var setting = resourceManager.RegisterUrl("stylesheet", src, debugSrc);
-
-                if (customAttributes != null)
-                {
-                    foreach (var attribute in customAttributes)
-                    {
-                        setting.SetAttribute(attribute.Key, attribute.Value);
-                    }
-                }
-
-                if (at != ResourceLocation.Unspecified)
-                {
-                    setting.AtLocation(at);
-                }
-                else
-                {
-                    setting.AtLocation(ResourceLocation.Head);
-                }
+                case "name": name = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "src": src = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "append_version": appendversion = (await argument.Expression.EvaluateAsync(context)).ToBooleanValue(); break;
+                case "cdn_src": cdnSrc = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "debug_src": debugSrc = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "debug_cdn_src": debugCdnSrc = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "use_cdn": useCdn = (await argument.Expression.EvaluateAsync(context)).ToBooleanValue(); break;
+                case "condition": condition = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "culture": culture = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "debug": debug = (await argument.Expression.EvaluateAsync(context)).ToBooleanValue(); break;
+                case "depends_on": dependsOn = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "version": version = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "at": Enum.TryParse((await argument.Expression.EvaluateAsync(context)).ToStringValue(), ignoreCase: true, out at); break;
+                default: (customAttributes ??= [])[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+            }
+        }
 
-                if (!string.IsNullOrEmpty(condition))
-                {
-                    setting.UseCondition(condition);
-                }
+        if (string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(src))
+        {
+            // Include custom style
+            var setting = resourceManager.RegisterUrl("stylesheet", src, debugSrc);
 
-                if (appendversion.HasValue)
+            if (customAttributes != null)
+            {
+                foreach (var attribute in customAttributes)
                 {
-                    setting.ShouldAppendVersion(appendversion);
+                    setting.SetAttribute(attribute.Key, attribute.Value);
                 }
+            }
 
-                if (debug != null)
-                {
-                    setting.UseDebugMode(debug.Value);
-                }
+            if (at != ResourceLocation.Unspecified)
+            {
+                setting.AtLocation(at);
+            }
+            else
+            {
+                setting.AtLocation(ResourceLocation.Head);
+            }
 
-                if (!string.IsNullOrEmpty(culture))
-                {
-                    setting.UseCulture(culture);
-                }
+            if (!string.IsNullOrEmpty(condition))
+            {
+                setting.UseCondition(condition);
+            }
 
-                if (!string.IsNullOrEmpty(dependsOn))
-                {
-                    setting.SetDependencies(dependsOn.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
-                }
+            if (appendversion.HasValue)
+            {
+                setting.ShouldAppendVersion(appendversion);
+            }
 
-                if (at == ResourceLocation.Inline)
-                {
-                    resourceManager.RenderLocalStyle(setting, writer);
-                }
+            if (debug != null)
+            {
+                setting.UseDebugMode(debug.Value);
             }
-            else if (!string.IsNullOrEmpty(name) && string.IsNullOrEmpty(src))
+
+            if (!string.IsNullOrEmpty(culture))
             {
-                // Resource required
+                setting.UseCulture(culture);
+            }
 
-                var setting = resourceManager.RegisterResource("stylesheet", name);
+            if (!string.IsNullOrEmpty(dependsOn))
+            {
+                setting.SetDependencies(dependsOn.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
+            }
 
-                if (customAttributes != null)
-                {
-                    foreach (var attribute in customAttributes)
-                    {
-                        setting.SetAttribute(attribute.Key, attribute.Value);
-                    }
-                }
+            if (at == ResourceLocation.Inline)
+            {
+                resourceManager.RenderLocalStyle(setting, writer);
+            }
+        }
+        else if (!string.IsNullOrEmpty(name) && string.IsNullOrEmpty(src))
+        {
+            // Resource required
 
-                if (at != ResourceLocation.Unspecified)
-                {
-                    setting.AtLocation(at);
-                }
-                else
-                {
-                    setting.AtLocation(ResourceLocation.Head);
-                }
+            var setting = resourceManager.RegisterResource("stylesheet", name);
 
-                if (useCdn != null)
+            if (customAttributes != null)
+            {
+                foreach (var attribute in customAttributes)
                 {
-                    setting.UseCdn(useCdn.Value);
+                    setting.SetAttribute(attribute.Key, attribute.Value);
                 }
+            }
 
-                if (!string.IsNullOrEmpty(condition))
-                {
-                    setting.UseCondition(condition);
-                }
+            if (at != ResourceLocation.Unspecified)
+            {
+                setting.AtLocation(at);
+            }
+            else
+            {
+                setting.AtLocation(ResourceLocation.Head);
+            }
 
-                if (debug != null)
-                {
-                    setting.UseDebugMode(debug.Value);
-                }
+            if (useCdn != null)
+            {
+                setting.UseCdn(useCdn.Value);
+            }
 
-                if (!string.IsNullOrEmpty(culture))
-                {
-                    setting.UseCulture(culture);
-                }
+            if (!string.IsNullOrEmpty(condition))
+            {
+                setting.UseCondition(condition);
+            }
 
-                if (appendversion.HasValue)
-                {
-                    setting.ShouldAppendVersion(appendversion);
-                }
+            if (debug != null)
+            {
+                setting.UseDebugMode(debug.Value);
+            }
 
-                if (!string.IsNullOrEmpty(version))
-                {
-                    setting.UseVersion(version);
-                }
+            if (!string.IsNullOrEmpty(culture))
+            {
+                setting.UseCulture(culture);
+            }
 
-                // This allows additions to the pre registered style dependencies.
-                if (!string.IsNullOrEmpty(dependsOn))
-                {
-                    setting.SetDependencies(dependsOn.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
-                }
+            if (appendversion.HasValue)
+            {
+                setting.ShouldAppendVersion(appendversion);
+            }
 
-                if (at == ResourceLocation.Inline)
-                {
-                    resourceManager.RenderLocalStyle(setting, writer);
-                }
+            if (!string.IsNullOrEmpty(version))
+            {
+                setting.UseVersion(version);
             }
-            else if (!string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(src))
+
+            // This allows additions to the pre registered style dependencies.
+            if (!string.IsNullOrEmpty(dependsOn))
             {
-                // Inline declaration
+                setting.SetDependencies(dependsOn.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
+            }
 
-                var definition = resourceManager.InlineManifest.DefineStyle(name);
-                definition.SetUrl(src, debugSrc);
+            if (at == ResourceLocation.Inline)
+            {
+                resourceManager.RenderLocalStyle(setting, writer);
+            }
+        }
+        else if (!string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(src))
+        {
+            // Inline declaration
 
-                if (customAttributes != null)
-                {
-                    foreach (var attribute in customAttributes)
-                    {
-                        definition.SetAttribute(attribute.Key, attribute.Value);
-                    }
-                }
+            var definition = resourceManager.InlineManifest.DefineStyle(name);
+            definition.SetUrl(src, debugSrc);
 
-                if (!string.IsNullOrEmpty(version))
+            if (customAttributes != null)
+            {
+                foreach (var attribute in customAttributes)
                 {
-                    definition.SetVersion(version);
+                    definition.SetAttribute(attribute.Key, attribute.Value);
                 }
+            }
 
-                if (!string.IsNullOrEmpty(cdnSrc))
-                {
-                    definition.SetCdn(cdnSrc, debugCdnSrc);
-                }
+            if (!string.IsNullOrEmpty(version))
+            {
+                definition.SetVersion(version);
+            }
 
-                if (!string.IsNullOrEmpty(culture))
-                {
-                    definition.SetCultures(culture.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
-                }
+            if (!string.IsNullOrEmpty(cdnSrc))
+            {
+                definition.SetCdn(cdnSrc, debugCdnSrc);
+            }
 
-                if (!string.IsNullOrEmpty(dependsOn))
-                {
-                    definition.SetDependencies(dependsOn.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
-                }
+            if (!string.IsNullOrEmpty(culture))
+            {
+                definition.SetCultures(culture.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
+            }
 
-                // Also include the style.
-                var setting = resourceManager.RegisterResource("stylesheet", name);
+            if (!string.IsNullOrEmpty(dependsOn))
+            {
+                definition.SetDependencies(dependsOn.Split(_separators, StringSplitOptions.RemoveEmptyEntries));
+            }
 
-                if (useCdn != null)
-                {
-                    setting.UseCdn(useCdn.Value);
-                }
+            // Also include the style.
+            var setting = resourceManager.RegisterResource("stylesheet", name);
 
-                if (!string.IsNullOrEmpty(condition))
-                {
-                    setting.UseCondition(condition);
-                }
+            if (useCdn != null)
+            {
+                setting.UseCdn(useCdn.Value);
+            }
 
-                if (debug != null)
-                {
-                    setting.UseDebugMode(debug.Value);
-                }
+            if (!string.IsNullOrEmpty(condition))
+            {
+                setting.UseCondition(condition);
+            }
 
-                if (!string.IsNullOrEmpty(culture))
-                {
-                    setting.UseCulture(culture);
-                }
+            if (debug != null)
+            {
+                setting.UseDebugMode(debug.Value);
+            }
 
-                if (at != ResourceLocation.Unspecified)
-                {
-                    setting.AtLocation(at);
-                }
-                else
-                {
-                    setting.AtLocation(ResourceLocation.Head);
-                }
+            if (!string.IsNullOrEmpty(culture))
+            {
+                setting.UseCulture(culture);
+            }
 
-                if (at == ResourceLocation.Inline)
-                {
-                    resourceManager.RenderLocalStyle(setting, writer);
-                }
+            if (at != ResourceLocation.Unspecified)
+            {
+                setting.AtLocation(at);
+            }
+            else
+            {
+                setting.AtLocation(ResourceLocation.Head);
             }
 
-            return Completion.Normal;
+            if (at == ResourceLocation.Inline)
+            {
+                resourceManager.RenderLocalStyle(setting, writer);
+            }
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Resources/ResourceManagementOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Resources/ResourceManagementOptionsConfiguration.cs
index 6b94502fa3e..3a56ad057dc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Resources/ResourceManagementOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Resources/ResourceManagementOptionsConfiguration.cs
@@ -4,539 +4,538 @@
 using OrchardCore.ResourceManagement;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Resources
+namespace OrchardCore.Resources;
+
+public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
 {
-    public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
+    private readonly ResourceOptions _resourceOptions;
+    private readonly IHostEnvironment _env;
+    private readonly PathString _pathBase;
+    // Versions
+    private const string CodeMirrorVersion = "5.65.7";
+    private const string MonacoEditorVersion = "0.46.0";
+    // URLs
+    private const string CloudflareUrl = "https://cdnjs.cloudflare.com/ajax/libs/";
+    private const string CodeMirrorUrl = CloudflareUrl + "codemirror/" + CodeMirrorVersion + "/";
+
+    public ResourceManagementOptionsConfiguration(
+        IOptions<ResourceOptions> resourceOptions,
+        IHostEnvironment env,
+        IHttpContextAccessor httpContextAccessor)
     {
-        private readonly ResourceOptions _resourceOptions;
-        private readonly IHostEnvironment _env;
-        private readonly PathString _pathBase;
-        // Versions
-        private const string CodeMirrorVersion = "5.65.7";
-        private const string MonacoEditorVersion = "0.46.0";
-        // URLs
-        private const string CloudflareUrl = "https://cdnjs.cloudflare.com/ajax/libs/";
-        private const string CodeMirrorUrl = CloudflareUrl + "codemirror/" + CodeMirrorVersion + "/";
-
-        public ResourceManagementOptionsConfiguration(
-            IOptions<ResourceOptions> resourceOptions,
-            IHostEnvironment env,
-            IHttpContextAccessor httpContextAccessor)
-        {
-            _resourceOptions = resourceOptions.Value;
-            _env = env;
-            _pathBase = httpContextAccessor.HttpContext.Request.PathBase;
-        }
+        _resourceOptions = resourceOptions.Value;
+        _env = env;
+        _pathBase = httpContextAccessor.HttpContext.Request.PathBase;
+    }
 
-        ResourceManifest BuildManifest()
-        {
-            var manifest = new ResourceManifest();
-
-            manifest
-                .DefineScript("jQuery")
-                .SetUrl("~/OrchardCore.Resources/Scripts/jquery.min.js", "~/OrchardCore.Resources/Scripts/jquery.js")
-                .SetCdn("https://code.jquery.com/jquery-3.7.1.min.js", "https://code.jquery.com/jquery-3.7.1.js")
-                .SetCdnIntegrity("sha384-1H217gwSVyLSIfaLxHbE7dRb3v4mYCKbpQvzx0cegeju1MVsGrX5xXxAvs/HgeFs", "sha384-wsqsSADZR1YRBEZ4/kKHNSmU+aX8ojbnKUMN4RyD3jDkxw5mHtoe2z/T/n4l56U/")
-                .SetVersion("3.7.1");
-
-            manifest
-                .DefineScript("jQuery.slim")
-                .SetUrl("~/OrchardCore.Resources/Scripts/jquery.slim.min.js", "~/OrchardCore.Resources/Scripts/jquery.slim.js")
-                .SetCdn("https://code.jquery.com/jquery-3.7.1.slim.min.js", "https://code.jquery.com/jquery-3.7.1.slim.js")
-                .SetCdnIntegrity("sha384-5AkRS45j4ukf+JbWAfHL8P4onPA9p0KwwP7pUdjSQA3ss9edbJUJc/XcYAiheSSz", "sha384-5yyt26go0PtGiMk9qStZt+lySzAg8ZSY0i7q6l05kHEEChYiHvf0NsjlexoEdASI")
-                .SetVersion("3.7.1");
-
-            manifest
-                .DefineScript("jQuery")
-                .SetUrl("~/OrchardCore.Resources/Vendor/jquery-3.6.0/jquery.min.js", "~/OrchardCore.Resources/Scripts/jquery.js")
-                .SetCdn("https://code.jquery.com/jquery-3.6.0.min.js", "https://code.jquery.com/jquery-3.6.0.js")
-                .SetCdnIntegrity("sha384-vtXRMe3mGCbOeY7l30aIg8H9p3GdeSe4IFlP6G8JMa7o7lXvnz3GFKzPxzJdPfGK", "sha384-S58meLBGKxIiQmJ/pJ8ilvFUcGcqgla+mWH9EEKGm6i6rKxSTA2kpXJQJ8n7XK4w")
-                .SetVersion("3.6.0");
-
-            manifest
-                .DefineScript("jQuery.slim")
-                .SetUrl("~/OrchardCore.Resources/Vendor/jquery-3.6.0/jquery.slim.min.js", "~/OrchardCore.Resources/Scripts/jquery.slim.js")
-                .SetCdn("https://code.jquery.com/jquery-3.6.0.slim.min.js", "https://code.jquery.com/jquery-3.6.0.slim.js")
-                .SetCdnIntegrity("sha384-Qg00WFl9r0Xr6rUqNLv1ffTSSKEFFCDCKVyHZ+sVt8KuvG99nWw5RNvbhuKgif9z", "sha384-fuUlMletgG/KCb0NwIZTW6aMv/YBbXe0Wt71nwLRreZZpesG/N/aURjEZCG6mtYn")
-                .SetVersion("3.6.0");
-
-            manifest
-                .DefineScript("jQuery")
-                .SetUrl("~/OrchardCore.Resources/Vendor/jquery-3.5.1/jquery.min.js", "~/OrchardCore.Resources/Vendor/jquery-3.5.1/jquery.js")
-                .SetCdn("https://code.jquery.com/jquery-3.5.1.min.js", "https://code.jquery.com/jquery-3.5.1.js")
-                .SetCdnIntegrity("sha384-ZvpUoO/+PpLXR1lu4jmpXWu80pZlYUAfxl5NsBMWOEPSjUn/6Z/hRTt8+pR6L4N2", "sha384-/LjQZzcpTzaYn7qWqRIWYC5l8FWEZ2bIHIz0D73Uzba4pShEcdLdZyZkI4Kv676E")
-                .SetVersion("3.5.1");
-
-            manifest
-                .DefineScript("jQuery.slim")
-                .SetUrl("~/OrchardCore.Resources/Vendor/jquery-3.5.1/jquery.slim.min.js", "~/OrchardCore.Resources/Vendor/jquery-3.5.1/jquery.slim.js")
-                .SetCdn("https://code.jquery.com/jquery-3.5.1.slim.min.js", "https://code.jquery.com/jquery-3.5.1.slim.js")
-                .SetCdnIntegrity("sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj", "sha384-x6NENSfxadikq2gB4e6/qompriNc+y1J3eqWg3hAAMNBs4dFU303XMTcU3uExJgZ")
-                .SetVersion("3.5.1");
-
-            manifest
-                .DefineScript("jQuery")
-                .SetUrl("~/OrchardCore.Resources/Vendor/jquery-3.4.1/jquery.min.js", "~/OrchardCore.Resources/Vendor/jquery-3.4.1/jquery.js")
-                .SetCdn("https://code.jquery.com/jquery-3.4.1.min.js", "https://code.jquery.com/jquery-3.4.1.js")
-                .SetCdnIntegrity("sha384-vk5WoKIaW/vJyUAd9n/wmopsmNhiy+L2Z+SBxGYnUkunIxVxAv/UtMOhba/xskxh", "sha384-mlceH9HlqLp7GMKHrj5Ara1+LvdTZVMx4S1U43/NxCvAkzIo8WJ0FE7duLel3wVo")
-                .SetVersion("3.4.1");
-
-            manifest
-                .DefineScript("jQuery.slim")
-                .SetUrl("~/OrchardCore.Resources/Vendor/jquery-3.4.1/jquery.slim.min.js", "~/OrchardCore.Resources/Vendor/jquery-3.4.1/jquery.slim.js")
-                .SetCdn("https://code.jquery.com/jquery-3.4.1.slim.min.js", "https://code.jquery.com/jquery-3.4.1.slim.js")
-                .SetCdnIntegrity("sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n", "sha384-teRaFq/YbXOM/9FZ1qTavgUgTagWUPsk6xapwcjkrkBHoWvKdZZuAeV8hhaykl+G")
-                .SetVersion("3.4.1");
-
-            manifest
-                .DefineScript("jQuery.easing")
-                .SetDependencies("jQuery")
-                .SetUrl("~/OrchardCore.Resources/Scripts/jquery.easing.min.js", "~/OrchardCore.Resources/Scripts/jquery.easing.js")
-                .SetCdn("https://cdn.jsdelivr.net/npm/jquery.easing@1.4.1/jquery.easing.min.js", "https://cdn.jsdelivr.net/npm/jquery.easing@1.4.1/jquery.easing.js")
-                .SetCdnIntegrity("sha384-leGYpHE9Tc4N9OwRd98xg6YFpB9shlc/RkilpFi0ljr3QD4tFoFptZvgnnzzwG4Q", "sha384-fwPA0FyfPOiDsglgAC4ZWmBGwpXSZNkq9IG+cM9HL4CkpNQo4xgCDkOIPdWypLMX")
-                .SetVersion("1.4.1");
-
-            manifest
-                .DefineScript("jQuery-ui")
-                .SetDependencies("jQuery")
-                .SetUrl("~/OrchardCore.Resources/Scripts/jquery-ui.min.js", "~/OrchardCore.Resources/Scripts/jquery-ui.js")
-                .SetCdn("https://code.jquery.com/ui/1.12.1/jquery-ui.min.js", "https://code.jquery.com/ui/1.12.1/jquery-ui.js")
-                .SetCdnIntegrity("sha384-Dziy8F2VlJQLMShA6FHWNul/veM9bCkRUaLqr199K94ntO5QUrLJBEbYegdSkkqX", "sha384-JPbtLYL10d/Z1crlc6GGGGM3PavCzzoUJ1UxH0bXHOfguWHQ6XAWrIzW+MBGGXe5")
-                .SetVersion("1.12.1");
-
-            manifest
-                .DefineStyle("jQuery-ui")
-                .SetUrl("~/OrchardCore.Resources/Styles/jquery-ui.min.css", "~/OrchardCore.Resources/Styles/jquery-ui.css")
-                .SetCdn("https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.min.css", "https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css")
-                .SetCdnIntegrity("sha384-kcAOn9fN4XSd+TGsNu2OQKSuV5ngOwt7tg73O4EpaD91QXvrfgvf0MR7/2dUjoI6", "sha384-xewr6kSkq3dBbEtB6Z/3oFZmknWn7nHqhLVLrYgzEFRbU/DHSxW7K3B44yWUN60D")
-                .SetVersion("1.12.1");
-
-            manifest
-                .DefineScript("jQuery-ui-i18n")
-                .SetDependencies("jQuery-ui")
-                .SetUrl("~/OrchardCore.Resources/Scripts/jquery-ui-i18n.min.js", "~/OrchardCore.Resources/Scripts/jquery-ui-i18n.js")
-                .SetCdn("https://code.jquery.com/ui/1.7.2/i18n/jquery-ui-i18n.min.js", "https://code.jquery.com/ui/1.7.2/i18n/jquery-ui-i18n.min.js")
-                .SetCdnIntegrity("sha384-0rV7y4NH7acVmq+7Y9GM6evymvReojk9li+7BYb/ug61uqPSsXJ4uIScVY+N9qtd", "sha384-0rV7y4NH7acVmq+7Y9GM6evymvReojk9li+7BYb/ug61uqPSsXJ4uIScVY+N9qtd")
-                .SetVersion("1.7.2");
-
-            manifest
-                .DefineScript("bootstrap")
-                .SetDependencies("jQuery")
-                .SetCdn("https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js", "https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.js")
-                .SetCdnIntegrity("sha384-vhJnz1OVIdLktyixHY4Uk3OHEwdQqPppqYR8+5mjsauETgLOcEynD9oPHhhz18Nw", "sha384-it0Suwx+VjMafDIVf5t+ozEbrflmNjEddSX5LstI/Xdw3nv4qP/a4e8K4k5hH6l4")
-                .SetVersion("3.4.0");
-
-            manifest
-                .DefineStyle("bootstrap")
-                .SetCdn("https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css", "https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.css")
-                .SetCdnIntegrity("sha384-PmY9l28YgO4JwMKbTvgaS7XNZJ30MK9FAZjjzXtlqyZCqBY6X6bXIkM++IkyinN+", "sha384-/5bQ8UYbZnrNY3Mfy6zo9QLgIQD/0CximLKk733r8/pQnXn2mgvhvKhcy43gZtJV")
-                .SetVersion("3.4.0");
-
-            manifest
-                .DefineStyle("bootstrap-theme")
-                .SetCdn("https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap-theme.min.css", "https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap-theme.css")
-                .SetCdnIntegrity("sha384-jzngWsPS6op3fgRCDTESqrEJwRKck+CILhJVO5VvaAZCq8JYf8HsR/HPpBOOPZfR", "sha384-RtiWe5OsslAYZ9AVyorBziI2VQL7E27rzWygBJh7wrZuVPyK5jeQLLytnJIpJqfD")
-                .SetVersion("3.4.0");
-
-            manifest
-                .DefineScript("popper")
-                .SetUrl("~/OrchardCore.Resources/Vendor/popper-1.16.1/popper.min.js", "~/OrchardCore.Resources/Vendor/popper-1.16.1/popper.js")
-                .SetCdn("https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js", "https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.js")
-                .SetCdnIntegrity("sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN", "sha384-cpSm/ilDFOWiMuF2bj03ZzJinb48NO9IGCXcYDtUzdP5y64Ober65chnoOj1XFoA")
-                .SetVersion("1.16.1");
-
-            manifest
-                .DefineScript("bootstrap")
-                .SetDependencies("jQuery", "popper")
-                .SetUrl("~/OrchardCore.Resources/Vendor/bootstrap-4.6.1/bootstrap.min.js", "~/OrchardCore.Resources/Vendor/bootstrap-4.6.1/bootstrap.js")
-                .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.min.js", "https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.js")
-                .SetCdnIntegrity("sha384-VHvPCCyXqtD5DqJeNxl2dtTyhF78xXNXdkwX1CZeRusQfRKp+tA7hAShOK/B/fQ2", "sha384-acUSOMj/FOTIzZ4qpiZXd/6avQezsTkra+wBPeduOyUIA5anC5YcLndJ3Wn4b4pF")
-                .SetVersion("4.6.1");
-
-            manifest
-                .DefineScript("bootstrap-bundle")
-                .SetDependencies("jQuery")
-                .SetUrl("~/OrchardCore.Resources/Vendor/bootstrap-4.6.1/bootstrap.bundle.min.js", "~/OrchardCore.Resources/Vendor/bootstrap-4.6.1/bootstrap.bundle.js")
-                .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js", "https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.js")
-                .SetCdnIntegrity("sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF", "sha384-fAPB/5gOv3oOdZZ9/se34OICi8gkYHlNY5skCVFZPzGe+F2puEgM5hu8ctpXyKFM")
-                .SetVersion("4.6.1");
-
-            manifest
-                .DefineStyle("bootstrap")
-                .SetUrl("~/OrchardCore.Resources/Vendor/bootstrap-4.6.1/bootstrap.min.css", "~/OrchardCore.Resources/Vendor/bootstrap-4.6.1/bootstrap.css")
-                .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css", "https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.css")
-                .SetCdnIntegrity("sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn", "sha384-ztSeENTvhymkwcI8wMyrHLHIyPJgek5ErHOMw9p96EzJKwbiuJBWBDuPJpGNqOar")
-                .SetVersion("4.6.1");
-
-            manifest
-               .DefineScript("popperjs")
-               .SetUrl("~/OrchardCore.Resources/Scripts/popper.min.js", "~/OrchardCore.Resources/Scripts/popper.js")
-               .SetCdn("https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.min.js", "https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.js")
-               .SetCdnIntegrity("sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r", "sha384-yBknSWNrSUPkBtbhhCJ07i/BOmbrigRhLKPzTAny+TT4uGAwIdfNTAkBd/3VzXbg")
-               .SetVersion("2.11.8");
-
-            manifest
-                .DefineScript("bootstrap")
-                .SetDependencies("popperjs")
-                .SetUrl("~/OrchardCore.Resources/Scripts/bootstrap.min.js", "~/OrchardCore.Resources/Scripts/bootstrap.js")
-                .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.min.js", "https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.js")
-                .SetCdnIntegrity("sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy", "sha384-jYoAmFjufJZfBzwTARyz2gk7Jj9mQb2cLeP9n5PcgLCVVd+8QfjY1+qFj+rBkViV")
-                .SetVersion("5.3.3");
-
-            manifest
-                .DefineScript("bootstrap-bundle")
-                .SetDependencies("jQuery")
-                .SetUrl("~/OrchardCore.Resources/Scripts/bootstrap.bundle.min.js", "~/OrchardCore.Resources/Scripts/bootstrap.bundle.js")
-                .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js", "https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.js")
-                .SetCdnIntegrity("sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz", "sha384-5xO2n1cyGKAe630nacBqFQxWoXjUIkhoc/FxQrWM07EIZ3TuqkAsusDeyPDOIeid")
-                .SetVersion("5.3.3");
-
-            manifest
-                .DefineStyle("bootstrap")
-                .SetUrl("~/OrchardCore.Resources/Styles/bootstrap.min.css", "~/OrchardCore.Resources/Styles/bootstrap.css")
-                .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css", "https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.css")
-                .SetCdnIntegrity("sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH", "sha384-qAlWxD5RDF+aEdUc1Z7GR/tE4zYjX1Igo/LrIexlnzM6G63a6F1fXZWpZKSrSW86")
-                .SetVersion("5.3.3");
-
-            manifest
-                .DefineStyle("bootstrap-rtl")
-                .SetUrl("~/OrchardCore.Resources/Styles/bootstrap.rtl.min.css", "~/OrchardCore.Resources/Styles/bootstrap.rtl.css")
-                .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.rtl.min.css", "https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.rtl.css")
-                .SetCdnIntegrity("sha384-nU14brUcp6StFntEOOEBvcJm4huWjB0OcIeQ3fltAfSmuZFrkAif0T+UtNGlKKQv", "sha384-CEku08bnqQAT/vzi6/zxMQmSyxoOTK1jx7mbT8P7etf/YhPbxASCX5BIVuAK9sfy")
-                .SetVersion("5.3.3");
-
-            manifest
-                .DefineStyle("bootstrap-select")
-                .SetUrl("~/OrchardCore.Resources/Styles/bootstrap-select.min.css", "~/OrchardCore.Resources/Styles/bootstrap-select.css")
-                .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap-select@1.14.0-beta3/dist/css/bootstrap-select.min.css", "https://cdn.jsdelivr.net/npm/bootstrap-select@1.14.0-beta3/dist/css/bootstrap-select.css")
-                .SetCdnIntegrity("sha384-xF1Y2i6HgC34+4EWddbDhlQuru7cLSKRcPT3hoL3mPoKoV+624vVSZJmegPX77vS", "sha384-DtuOZ7LbR+xAYzDGD4YLpe9eiAayUBwZRqAcoy+RepIoV53tAoJbXnr4AX1xTJ43")
-                .SetVersion("1.14.0");
-
-            manifest
-                .DefineScript("bootstrap-select")
-                .SetDependencies("jQuery")
-                .SetUrl("~/OrchardCore.Resources/Scripts/bootstrap-select.min.js", "~/OrchardCore.Resources/Scripts/bootstrap-select.js")
-                .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap-select@1.14.0-beta3/dist/js/bootstrap-select.min.js", "https://cdn.jsdelivr.net/npm/bootstrap-select@1.14.0-beta3/dist/js/bootstrap-select.js")
-                .SetCdnIntegrity("sha384-0O3sg2SQIGn4393xwamQISjphC8DIXjCzlhj1gPAMC5xGg+2perF5Mehr5njv0fZ", "sha384-2b0aLFg/Ejp4OF57nW0BUqNzm259RHYYMf/mpKClBijsEH2P+4ea2oWAq0twd8L0")
-                .SetVersion("1.14.0");
-
-            manifest
-                .DefineStyle("nouislider")
-                .SetUrl("~/OrchardCore.Resources/Styles/nouislider.min.css", "~/OrchardCore.Resources/Styles/nouislider.css")
-                .SetCdn("https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/15.7.0/nouislider.min.css", "https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/15.7.0/nouislider.css")
-                .SetCdnIntegrity("sha384-PSZaVsyG9jDu8hFaSJev5s/9poIJlX7cuxSGdqCgXRHpo2DzIaZAyCd2rG/DJJmV", "sha384-SW0/EWtnMakMnwC9RHA27DeNtNCLsJ0l+oZrXlFbb2123lhLdZIbiDiwRPogNY8T")
-                .SetVersion("15.7.0");
-
-            manifest
-                .DefineScript("nouislider")
-                .SetDependencies("jQuery")
-                .SetUrl("~/OrchardCore.Resources/Scripts/nouislider/nouislider.min.js", "~/OrchardCore.Resources/Scripts/nouislider/nouislider.js")
-                .SetCdn("https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/15.7.0/nouislider.min.js", "https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/15.7.0/nouislider.js")
-                .SetCdnIntegrity("sha384-/gBUOLHADjY2rp6bHB0IyW9AC28q4OsnirJScje4l1crgYW7Qarx3dH8zcqcUgmy", "sha384-ZRTsSqAkR2D5UR6P8ew9nDImNmAueqBx3QIljDVMucOjF3eVskkMIk50HUW239mY")
-                .SetVersion("15.7.0");
-
-            manifest
-                .DefineStyle("codemirror")
-                .SetUrl("~/OrchardCore.Resources/Styles/codemirror/codemirror.min.css", "~/OrchardCore.Resources/Styles/codemirror/codemirror.css")
-                .SetCdn(CodeMirrorUrl + "codemirror.min.css", CodeMirrorUrl + "codemirror.css")
-                .SetCdnIntegrity("sha384-zaeBlB/vwYsDRSlFajnDd7OydJ0cWk+c2OWybl3eSUf6hW2EbhlCsQPqKr3gkznT", "sha384-bsaAhvdduZPAwUb7RRLRvDgtEtOsggrgjkr/EjPO1i/vdoi+DmdLaG79UOt6M5hD")
-                .SetVersion(CodeMirrorVersion);
-
-            manifest
-                .DefineScript("codemirror")
-                .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/codemirror.min.js", "~/OrchardCore.Resources/Scripts/codemirror/codemirror.js")
-                .SetCdn(CodeMirrorUrl + "codemirror.min.js", CodeMirrorUrl + "codemirror.js")
-                .SetCdnIntegrity("sha384-FIV1f0SplvlwhOxrMYdXpUcnVM79A9u4ffl0lEOVVZunLMuGpxFyQmnBHl24EQFR", "sha384-VAGlhrJE9eY6OkSfl3ioNR4jWUGp1mLeF/ECkHxBUEfTB9u2xVVH14acAUBDc3Y8")
-                .SetVersion(CodeMirrorVersion);
-
-            manifest
-                .DefineScript("codemirror-addon-display-autorefresh")
-                .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/addon/display/autorefresh.min.js", "~/OrchardCore.Resources/Scripts/codemirror/addon/display/autorefresh.js")
-                .SetCdn(CodeMirrorUrl + "addon/display/autorefresh.min.js", CodeMirrorUrl + "addon/display/autorefresh.js")
-                .SetCdnIntegrity("sha384-pn83o6MtS8kicn/sV6AhRaBqXQ5tau8NzA2ovcobkcc1uRFP7D8CMhRx231QwKST", "sha384-B1M1WS08oqd1y3zKAPdhkOSNwy+NYMREyK9qXNWl+QfXDlqj+Y+TYuBUkc/uAnox")
-                .SetVersion(CodeMirrorVersion);
-
-            manifest
-                .DefineStyle("codemirror-addon-display-fullscreen")
-                .SetUrl("~/OrchardCore.Resources/Styles/codemirror/addon/display/fullscreen.min.css", "~/OrchardCore.Resources/Styles/codemirror/addon/display/fullscreen.css")
-                .SetCdn(CodeMirrorUrl + "addon/display/fullscreen.min.css", CodeMirrorUrl + "addon/display/fullscreen.css")
-                .SetCdnIntegrity("sha384-uuIczW2AGKADJpvg6YiNBJQWE7duDkgQDkndYEsbUGaLm8SPJZzlly6hcEo0aTlW", "sha384-+glu1jsbG+T5ocmkeMvIYh5w07IXKxmJZaCdkNbVfpEr3xi+M0gopFSR/oLKXxio")
-                .SetVersion(CodeMirrorVersion);
-
-            manifest
-                .DefineScript("codemirror-addon-display-fullscreen")
-                .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/addon/display/fullscreen.min.js", "~/OrchardCore.Resources/Scripts/codemirror/addon/display/fullscreen.js")
-                .SetCdn(CodeMirrorUrl + "addon/display/fullscreen.min.js", CodeMirrorUrl + "addon/display/fullscreen.js")
-                .SetCdnIntegrity("sha384-mlEZFcWl5HzvZ6rIROEnNm825OC0Gw5KMZkilPtaJL7BGiluUu4c8Ws3IaNauZTh", "sha384-vU/yRPnV0VIhELETYT5fG/k7uMzeHddzkMo4NFrLzHdJepeb46v0b61P8FADXtN4")
-                .SetVersion(CodeMirrorVersion);
-
-            manifest
-                .DefineScript("codemirror-addon-edit-closetag")
-                .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/addon/edit/closetag.min.js", "~/OrchardCore.Resources/Scripts/codemirror/addon/edit/closetag.js")
-                .SetCdn(CodeMirrorUrl + "addon/edit/closetag.min.js", CodeMirrorUrl + "addon/edit/closetag.js")
-                .SetCdnIntegrity("sha384-WIyvbwMte2q6VXgBkN7prVo9ZSmBm47nI2ftVjoJLPY4yOu9gmI6lqaNXjBwHU5k", "sha384-i4ai3UXE5wIk3ILN77PB9DhNmku+sefNKDTHXRvsrYX2bxWzm+EDmoBui5wsNU2v")
-                .SetVersion(CodeMirrorVersion);
-
-            manifest
-                .DefineStyle("codemirror-addon-hint-show-hint")
-                .SetUrl("~/OrchardCore.Resources/Styles/codemirror/addon/hint/show-hint.min.css", "~/OrchardCore.Resources/Styles/codemirror/addon/hint/show-hint.css")
-                .SetCdn(CodeMirrorUrl + "addon/hint/show-hint.min.css", CodeMirrorUrl + "addon/hint/show-hint.css")
-                .SetCdnIntegrity("sha384-qqTWkykzuDLx4yDYa7bVrwNwBHuqVvklDUMVaU4eezgNUEgGbP8Zv6i3u8OmtuWg", "sha384-ZZbLvEvLoXKrHo3Tkh7W8amMgoHFkDzWe8IAm1ZgxsG5y35H+fJCVMWwr0YBAEGA")
-                .SetVersion(CodeMirrorVersion);
-
-            manifest
-                .DefineScript("codemirror-addon-hint-show-hint")
-                .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/addon/hint/show-hint.min.js", "~/OrchardCore.Resources/Scripts/codemirror/addon/hint/show-hint.js")
-                .SetCdn(CodeMirrorUrl + "addon/hint/show-hint.min.js", CodeMirrorUrl + "addon/hint/show-hint.js")
-                .SetCdnIntegrity("sha384-8i/ZCyq/QakicQDFEJhSl5oJEzzChdhEHhFBvtlxJMWdzohX6j+7O7L7NGgVjaL2", "sha384-X99dMoDW1QAOqOa49NoR3mVQPZMAmWdk1EtGVfWHdqFrD0mKdc4TVCugISfW0wEv")
-                .SetVersion(CodeMirrorVersion);
-
-            manifest
-                .DefineScript("codemirror-addon-hint-sql-hint")
-                .SetDependencies("codemirror-addon-hint-show-hint")
-                .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/addon/hint/sql-hint.min.js", "~/OrchardCore.Resources/Scripts/codemirror/addon/hint/sql-hint.js")
-                .SetCdn(CodeMirrorUrl + "addon/hint/sql-hint.min.js", CodeMirrorUrl + "addon/hint/sql-hint.js")
-                .SetCdnIntegrity("sha384-TT6FzU/qfXKsyGpknyPBSW9YUv9boLL9TStdfYRJTMjLDdUaQwWceBVs8I326z16", "sha384-v0PZIWVaXK+SdJWDH/8f3lMh+4SXRujsh67aPj27BlUq4ocyn0Yime8qyi8AArtz")
-                .SetVersion(CodeMirrorVersion);
-
-            manifest
-                .DefineScript("codemirror-addon-mode-multiplex")
-                .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/addon/mode/multiplex.min.js", "~/OrchardCore.Resources/Scripts/codemirror/addon/mode/multiplex.js")
-                .SetCdn(CodeMirrorUrl + "addon/mode/multiplex.min.js", CodeMirrorUrl + "addon/mode/multiplex.js")
-                .SetCdnIntegrity("sha384-Qr/1hjoJmzEf6ToQLo1nr8/GF5ekpaqUx0DM71QHZ4N8+c8l8aqlQ25whgApmChE", "sha384-pgj6NfGJNeIBDFqYM8m/ah3J269WhaJDiT0fN/C0c335qDMJAbfz/O2rVB53w+1D")
-                .SetVersion(CodeMirrorVersion);
-
-            manifest
-                .DefineScript("codemirror-addon-mode-simple")
-                .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/addon/mode/simple.min.js", "~/OrchardCore.Resources/Scripts/codemirror/addon/mode/simple.js")
-                .SetCdn(CodeMirrorUrl + "addon/mode/simple.min.js", CodeMirrorUrl + "addon/mode/simple.js")
-                .SetCdnIntegrity("sha384-5+aYjV0V2W3IwhAYp/9WOrGMv1TaYkCjnkkW7Hv3yJQo28MergRCSRaUIUzDUs2J", "sha384-qeu+SDWpTAqXUyXdqdwbMDeYSQiv6rErEHLJ/cITY3wtuYhN2LdBSBZeS7Jyn8nv")
-                .SetVersion(CodeMirrorVersion);
-
-            manifest
-                .DefineScript("codemirror-addon-selection-active-line")
-                .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/addon/selection/active-line.min.js", "~/OrchardCore.Resources/Scripts/codemirror/addon/selection/active-line.js")
-                .SetCdn(CodeMirrorUrl + "addon/selection/active-line.min.js", CodeMirrorUrl + "addon/selection/active-line.js")
-                .SetCdnIntegrity("sha384-hcxaXyAtJ30s2NeDu1OHWsQRiHiWuYLTbI596+YFb+f2pFhzO0mDuahZziRPPDxg", "sha384-QhD10EHRrst6CIOzeEBXQhUT95YVJN1EV8uX2Jb5S3+qw/ozbvUE5Zn5uILnZg96")
-                .SetVersion(CodeMirrorVersion);
-
-            manifest
-                .DefineScript("codemirror-mode-css")
-                .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/mode/css/css.min.js", "~/OrchardCore.Resources/Scripts/codemirror/mode/css/css.js")
-                .SetCdn(CodeMirrorUrl + "mode/css/css.min.js", CodeMirrorUrl + "mode/css/css.js")
-                .SetCdnIntegrity("sha384-fpeIC2FZuPmw7mIsTvgB5BNc8QVxQC/nWg2W+CgPYOAiBiYVuHe2E8HiTWHBMIJQ", "sha384-ZD4C1ohrucZOfP7+jQSuBELICO7Z73CFD5stbjic1D3DbZk88mqj3KsRjSml/NCK")
-                .SetVersion(CodeMirrorVersion);
-
-            manifest
-                .DefineScript("codemirror-mode-htmlmixed")
-                .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/mode/htmlmixed/htmlmixed.min.js", "~/OrchardCore.Resources/Scripts/codemirror/mode/htmlmixed/htmlmixed.js")
-                .SetCdn(CodeMirrorUrl + "mode/htmlmixed/htmlmixed.min.js", CodeMirrorUrl + "mode/htmlmixed/htmlmixed.js")
-                .SetCdnIntegrity("sha384-xYIbc5F55vPi7pb/lUnFj3wu24HlpAMZdtBHkNrb2YhPzJV3pX7+eqXT2PXSNMrw", "sha384-0MH/N0DfWPIbCXDe9I7tmLw0dsJ4gKQUijwCcpaTgGxrTTrypsJwEOOqi5yhkQiK")
-                .SetVersion(CodeMirrorVersion);
-
-            manifest
-                .DefineScript("codemirror-mode-javascript")
-                .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/mode/javascript/javascript.min.js", "~/OrchardCore.Resources/Scripts/codemirror/mode/javascript/javascript.js")
-                .SetCdn(CodeMirrorUrl + "mode/javascript/javascript.min.js", CodeMirrorUrl + "mode/javascript/javascript.js")
-                .SetCdnIntegrity("sha384-kmQrbJf09Uo1WRLMDVGoVG3nM6F48frIhcj7f3FDUjeRzsiHwyBWDjMUIttnIeAf", "sha384-fgstVTG7RpZvquT2ZtQeU9iJXfvK9wTstlhasVKML77E5oe3Wi0AfLzY2grsjwmh")
-                .SetVersion(CodeMirrorVersion);
-
-            manifest
-                .DefineScript("codemirror-mode-sql")
-                .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/mode/sql/sql.min.js", "~/OrchardCore.Resources/Scripts/codemirror/mode/sql/sql.js")
-                .SetCdn(CodeMirrorUrl + "mode/sql/sql.min.js", CodeMirrorUrl + "mode/sql/sql.js")
-                .SetCdnIntegrity("sha384-cof/65v3Fn+7YeqmMp8aCI1xZ2yeX8JnWhQYdMzaO7VDpBOtLjfdwx6pEfUo7SFT", "sha384-Llr4/OHf89ufsfG7HbSwqB7KTd1d4hXok/Yxi72qWvLwtd6pz6nqJdOGlDdpjw6I")
-                .SetVersion(CodeMirrorVersion);
-
-            manifest
-                .DefineScript("codemirror-mode-xml")
-                .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/mode/xml/xml.min.js", "~/OrchardCore.Resources/Scripts/codemirror/mode/xml/xml.js")
-                .SetCdn(CodeMirrorUrl + "mode/xml/xml.min.js", CodeMirrorUrl + "mode/xml/xml.js")
-                .SetCdnIntegrity("sha384-xPpkMo5nDgD98fIcuRVYhxkZV6/9Y4L8s3p0J5c4MxgJkyKJ8BJr+xfRkq7kn6Tw", "sha384-KX/+LdYWr3JcKfT7HK55DC3oPVJwnJSympb1qoO14sxVDtDIg+xHPVLltqJEbitI")
-                .SetVersion(CodeMirrorVersion);
-
-            manifest
-                .DefineStyle("font-awesome")
-                .SetUrl("~/OrchardCore.Resources/Styles/font-awesome.min.css", "~/OrchardCore.Resources/Styles/font-awesome.css")
-                .SetCdn("https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", "https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.css")
-                .SetCdnIntegrity("sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN", "sha384-FckWOBo7yuyMS7In0aXZ0aoVvnInlnFMwCv77x9sZpFgOonQgnBj1uLwenWVtsEj")
-                .SetVersion("4.7.0");
-
-            manifest
-                .DefineStyle("font-awesome")
-                .SetUrl("~/OrchardCore.Resources/Vendor/fontawesome-free/css/all.min.css", "~/OrchardCore.Resources/Vendor/fontawesome-free/css/all.css")
-                .SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/css/all.min.css", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/css/all.css")
-                .SetCdnIntegrity("sha384-DyZ88mC6Up2uqS4h/KRgHuoeGwBcD4Ng9SiP4dIRy0EXTlnuz47vAwmeGwVChigm", "sha384-7rgjkhkxJ95zOzIjk97UrBOe14KgYpH9+zQm5BdgzjQELBU6kHf4WwoQzHfTx5sw")
-                .SetVersion("5.15.4");
-
-            manifest
-                .DefineScript("font-awesome")
-                .SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/js/all.min.js", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/js/all.js")
-                .SetCdnIntegrity("sha384-rOA1PnstxnOBLzCLMcre8ybwbTmemjzdNlILg8O7z1lUkLXozs4DHonlDtnE7fpc", "sha384-HfU7cInvKb8zxQuLKtKr/suuRgcSH1OYsdJU+8lGA/t8nyNgdJF09UIkRzg1iefj")
-                .SetVersion("5.15.4");
-
-            manifest
-                .DefineScript("font-awesome-v4-shims")
-                .SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/js/v4-shims.min.js", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/js/v4-shims.js")
-                .SetCdnIntegrity("sha384-bx00wqJq+zY9QLCMa/zViZPu1f0GJ3VXwF4GSw3GbfjwO28QCFr4qadCrNmJQ/9N", "sha384-SGuqaGE4bcW7Xl5T06BsUPUA91qaNtT53uGOcGpavQMje3goIFJbDsC0VAwtgL5g")
-                .SetVersion("5.15.4");
-
-            manifest
-                .DefineStyle("font-awesome")
-                .SetUrl("~/OrchardCore.Resources/Vendor/fontawesome-free/css/all.min.css", "~/OrchardCore.Resources/Vendor/fontawesome-free/css/all.css")
-                .SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.6.0/css/all.min.css", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.6.0/css/all.css")
-                .SetCdnIntegrity("sha384-h/hnnw1Bi4nbpD6kE7nYfCXzovi622sY5WBxww8ARKwpdLj5kUWjRuyiXaD1U2JT", "sha384-vMdawx0r3BjxHQwcfWi0YSemtW6u5mKxTKPPh1ogUICPLaEa/6e42yg2wRYzzJtx")
-                .SetVersion("6.6.0");
-
-            manifest
-                .DefineScript("font-awesome")
-                .SetUrl("~/OrchardCore.Resources/Vendor/fontawesome-free/js/all.min.js", "~/OrchardCore.Resources/Vendor/fontawesome-free/js/all.js")
-                .SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.6.0/js/all.min.js", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.6.0/js/all.js")
-                .SetCdnIntegrity("sha384-dgEl3vRKux81M373f/TdgoDTV5oZj+yjHrr/1qR5b4btG5q63kYS62t5kod+7Q6v", "sha384-v72QeVpDL6Ne4X2S+fwIXCOLhO57lwIR/qRV05SHAExDg1QoyJGWDxx6VQO3rzlC")
-                .SetVersion("6.6.0");
-
-            manifest
-                .DefineScript("font-awesome-v4-shims")
-                .SetUrl("~/OrchardCore.Resources/Vendor/fontawesome-free/js/v4-shims.min.js", "~/OrchardCore.Resources/Vendor/fontawesome-free/js/v4-shims.js")
-                .SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.6.0/js/v4-shims.min.js", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.6.0/js/v4-shims.js")
-                .SetCdnIntegrity("sha384-M9y++reQwf5nddw5loUHChCbGE4kwaeHzeEM2yWidMfaRMQeHM6MSwwPuiSnSMHF", "sha384-WrIndr6nwB5l/sVUyZkWDlpNS9Vx/Y+zhmjZNP+j2UJOBmy36ufaIIqd7o2kL0BL")
-                .SetVersion("6.6.0");
-
-            manifest
-                .DefineScript("jquery-resizable")
-                .SetDependencies("jQuery")
-                .SetUrl("~/OrchardCore.Resources/Scripts/jquery-resizable.min.js", "~/OrchardCore.Resources/Scripts/jquery-resizable.js")
-                .SetCdn("https://cdn.jsdelivr.net/npm/jquery-resizable-dom@0.35.0/dist/jquery-resizable.min.js")
-                .SetCdnIntegrity("sha384-1LMjDEezsSgzlRgsyFIAvLW7FWSdFIHqBGjUa+ad5EqtK1FORC8XpTJ/pahxj5GB", "sha384-0yk9X0IG0cXxuN9yTTkps/3TNNI9ZcaKKhh8dgqOEAWGXxIYS5xaY2as6b32Ov3P")
-                .SetVersion("0.35.0");
-
-            manifest
-                .DefineStyle("trumbowyg")
-                .SetUrl("~/OrchardCore.Resources/Styles/trumbowyg/trumbowyg.min.css", "~/OrchardCore.Resources/Styles/trumbowyg/trumbowyg.css")
-                .SetCdn("https://cdn.jsdelivr.net/npm/trumbowyg@2.28.0/dist/ui/trumbowyg.min.css", "https://cdn.jsdelivr.net/npm/trumbowyg@2.28.0/dist/ui/trumbowyg.css")
-                .SetCdnIntegrity("sha384-XfI6P0jtm0X3QDEQxS1DotzhIXkJeuSV1wtBOntPaRxzpzTkMWkpZpkuzj8qVHzl", "sha384-GUyfWhYsIKKkAMejJuy50VTSfyfkrrJX2csg7fxJJt7vi+gXH8qxqH29C5GURaum")
-                .SetVersion("2.28.0");
-
-            manifest
-                .DefineScript("trumbowyg")
-                .SetDependencies("jquery-resizable")
-                .SetUrl("~/OrchardCore.Resources/Scripts/trumbowyg/trumbowyg.min.js", "~/OrchardCore.Resources/Scripts/trumbowyg/trumbowyg.js")
-                .SetCdn("https://cdn.jsdelivr.net/npm/trumbowyg@2.28.0/dist/trumbowyg.min.js", "https://cdn.jsdelivr.net/npm/trumbowyg@2.28.0/dist/trumbowyg.js")
-                .SetCdnIntegrity("sha384-O4OAGMDq5hnqt4/WQz+fW6yVgZ02jmw+Yf1j02zIgglnCYXf/7TmET8tFbrTN6u5", "sha384-dNxlebCuuiNWPhPBEd69nEAtkEWa7Z9IWkrL+OSmJ456dlu6TAASXgL72Bn4GGju")
-                .SetVersion("2.28.0");
-
-            manifest
-                .DefineScript("trumbowyg-shortcodes")
-                .SetDependencies("trumbowyg")
-                .SetUrl("~/OrchardCore.Resources/Scripts/trumbowyg/trumbowyg.shortcodes.min.js", "~/OrchardCore.Resources/Scripts/trumbowyg/trumbowyg.shortcodes.js")
-                .SetVersion("1.0.0");
-
-            manifest
-                .DefineScript("trumbowyg-theme")
-                .SetUrl("~/OrchardCore.Resources/Scripts/trumbowyg/trumbowyg.theme.min.js", "~/OrchardCore.Resources/Scripts/trumbowyg/trumbowyg.theme.js")
-                .SetDependencies("trumbowyg", "theme-head")
-                .SetVersion("1.0.0");
-
-            manifest
-                .DefineStyle("trumbowyg-plugins")
-                .SetDependencies("trumbowyg")
-                .SetUrl("~/OrchardCore.Resources/Styles/trumbowyg/trumbowyg-plugins.min.css", "~/OrchardCore.Resources/Styles/trumbowyg/trumbowyg-plugins.css")
-                .SetVersion("2.28.0");
-
-            manifest
-                .DefineScript("trumbowyg-plugins")
-                .SetDependencies("trumbowyg")
-                .SetUrl("~/OrchardCore.Resources/Scripts/trumbowyg/trumbowyg-plugins.min.js", "~/OrchardCore.Resources/Scripts/trumbowyg/trumbowyg-plugins.js")
-                .SetVersion("2.28.0");
-
-            manifest
-                .DefineScript("credential-helpers")
-                .SetUrl("~/OrchardCore.Resources/Scripts/credential-helpers.min.js", "~/OrchardCore.Resources/Scripts/credential-helpers.js")
-                .SetVersion("1.0.0");
-
-            manifest
-                .DefineScript("vuejs")
-                .SetUrl("~/OrchardCore.Resources/Scripts/vue.min.js", "~/OrchardCore.Resources/Scripts/vue.js")
-                .SetCdn("https://cdn.jsdelivr.net/npm/vue@2.6.14/dist/vue.min.js", "https://cdn.jsdelivr.net/npm/vue@2.6.14/dist/vue.js")
-                .SetCdnIntegrity("sha384-ULpZhk1pvhc/UK5ktA9kwb2guy9ovNSTyxPNHANnA35YjBQgdwI+AhLkixDvdlw4", "sha384-t1tHLsbM7bYMJCXlhr0//00jSs7ZhsAhxgm191xFsyzvieTMCbUWKMhFg9I6ci8q")
-                .SetVersion("2.6.14");
-
-            manifest
-                .DefineScript("vue-multiselect")
-                .SetDependencies("vuejs")
-                .SetUrl("~/OrchardCore.Resources/Scripts/vue-multiselect.min.js", "~/OrchardCore.Resources/Scripts/vue-multiselect.min.js")
-                .SetCdn("https://cdn.jsdelivr.net/npm/vue-multiselect@2.1.6/dist/vue-multiselect.min.js", "https://cdn.jsdelivr.net/npm/vue-multiselect@2.1.6/dist/vue-multiselect.min.js")
-                .SetCdnIntegrity("sha384-a4eXewRTYCwYdFtSnMCZTNtiXrfdul6aQdueRgHPAx2y1Ldp0QaFdCTpOx0ycsXU", "sha384-a4eXewRTYCwYdFtSnMCZTNtiXrfdul6aQdueRgHPAx2y1Ldp0QaFdCTpOx0ycsXU")
-                .SetVersion("2.1.6");
-
-            manifest
-                .DefineStyle("vue-multiselect")
-                .SetUrl("~/OrchardCore.Resources/Styles/vue-multiselect.min.css", "~/OrchardCore.Resources/Styles/vue-multiselect.min.css")
-                .SetCdn("https://cdn.jsdelivr.net/npm/vue-multiselect@2.1.6/dist/vue-multiselect.min.css", "https://cdn.jsdelivr.net/npm/vue-multiselect@2.1.6/dist/vue-multiselect.min.css")
-                .SetCdnIntegrity("sha384-PPH/T7V86Z1+B4eMPef4FJXLD5fsTpObWoCoK3CiNtSX7aji+5qxpOCn1f2TDYAM", "sha384-PPH/T7V86Z1+B4eMPef4FJXLD5fsTpObWoCoK3CiNtSX7aji+5qxpOCn1f2TDYAM")
-                .SetVersion("2.1.6");
-
-            manifest
-                .DefineScript("Sortable")
-                .SetUrl("~/OrchardCore.Resources/Scripts/Sortable.min.js", "~/OrchardCore.Resources/Scripts/Sortable.js")
-                .SetCdn("https://cdn.jsdelivr.net/npm/sortablejs@1.15.0/Sortable.min.js", "https://cdn.jsdelivr.net/npm/sortablejs@1.15.0/Sortable.js")
-                .SetCdnIntegrity("sha384-eeLEhtwdMwD3X9y+8P3Cn7Idl/M+w8H4uZqkgD/2eJVkWIN1yKzEj6XegJ9dL3q0", "sha384-OFIl93h6jYoAF+hATXncsLYMiLo81FpuReH3fgCI4wep7qNCmiA2I0bwcvVqHSBj")
-                .SetVersion("1.15.0");
-
-            manifest
-                .DefineScript("vuedraggable")
-                .SetDependencies("vuejs", "Sortable")
-                .SetUrl("~/OrchardCore.Resources/Scripts/vuedraggable.umd.min.js", "~/OrchardCore.Resources/Scripts/vuedraggable.umd.js")
-                .SetCdn("https://cdn.jsdelivr.net/npm/vuedraggable@2.24.3/dist/vuedraggable.umd.min.js", "https://cdn.jsdelivr.net/npm/vuedraggable@2.24.3/dist/vuedraggable.umd.js")
-                .SetCdnIntegrity("sha384-qUA1xXJiX23E4GOeW/XHtsBkV9MUcHLSjhi3FzO08mv8+W8bv5AQ1cwqLskycOTs", "sha384-+jB9vXc/EaIJTlNiZG2tv+TUpKm6GR9HCRZb3VkI3lscZWqrCYDbX2ZXffNJldL9")
-                .SetVersion("2.24.3");
-
-            manifest
-                .DefineScript("js-cookie")
-                .SetUrl("~/OrchardCore.Resources/Scripts/js.cookie.min.js", "~/OrchardCore.Resources/Scripts/js.cookie.js")
-                .SetCdn("https://cdn.jsdelivr.net/npm/js-cookie@3.0.5/dist/js.cookie.min.js", "https://cdn.jsdelivr.net/npm/js-cookie@3.0.5/dist/js.cookie.js")
-                .SetCdnIntegrity("sha384-/vxhYfM1LENRhdpZ8dwEsQn/X4VhpbEZSiU4m/FwR+PVpzar4fkEOw8FP9Y+OfQN", "sha384-b1TD0tFP+Ao4jmFaQw9RQxezUooFrLdlqfDfoh1SKv5L3jG7dD44QiwD+UzckH8W")
-                .SetVersion("3.0.5");
-
-            manifest
-                .DefineScript("monaco-loader")
-                .SetUrl("~/OrchardCore.Resources/Scripts/monaco/vs/loader.js")
-                .SetPosition(ResourcePosition.Last)
-                .SetVersion(MonacoEditorVersion);
-
-            manifest
-                .DefineScript("monaco")
-                .SetAttribute("data-tenant-prefix", _pathBase)
-                .SetUrl("~/OrchardCore.Resources/Scripts/monaco/ocmonaco.js")
-                .SetDependencies("monaco-loader")
-                .SetVersion(MonacoEditorVersion);
-
-            return manifest;
-        }
+    ResourceManifest BuildManifest()
+    {
+        var manifest = new ResourceManifest();
+
+        manifest
+            .DefineScript("jQuery")
+            .SetUrl("~/OrchardCore.Resources/Scripts/jquery.min.js", "~/OrchardCore.Resources/Scripts/jquery.js")
+            .SetCdn("https://code.jquery.com/jquery-3.7.1.min.js", "https://code.jquery.com/jquery-3.7.1.js")
+            .SetCdnIntegrity("sha384-1H217gwSVyLSIfaLxHbE7dRb3v4mYCKbpQvzx0cegeju1MVsGrX5xXxAvs/HgeFs", "sha384-wsqsSADZR1YRBEZ4/kKHNSmU+aX8ojbnKUMN4RyD3jDkxw5mHtoe2z/T/n4l56U/")
+            .SetVersion("3.7.1");
+
+        manifest
+            .DefineScript("jQuery.slim")
+            .SetUrl("~/OrchardCore.Resources/Scripts/jquery.slim.min.js", "~/OrchardCore.Resources/Scripts/jquery.slim.js")
+            .SetCdn("https://code.jquery.com/jquery-3.7.1.slim.min.js", "https://code.jquery.com/jquery-3.7.1.slim.js")
+            .SetCdnIntegrity("sha384-5AkRS45j4ukf+JbWAfHL8P4onPA9p0KwwP7pUdjSQA3ss9edbJUJc/XcYAiheSSz", "sha384-5yyt26go0PtGiMk9qStZt+lySzAg8ZSY0i7q6l05kHEEChYiHvf0NsjlexoEdASI")
+            .SetVersion("3.7.1");
+
+        manifest
+            .DefineScript("jQuery")
+            .SetUrl("~/OrchardCore.Resources/Vendor/jquery-3.6.0/jquery.min.js", "~/OrchardCore.Resources/Scripts/jquery.js")
+            .SetCdn("https://code.jquery.com/jquery-3.6.0.min.js", "https://code.jquery.com/jquery-3.6.0.js")
+            .SetCdnIntegrity("sha384-vtXRMe3mGCbOeY7l30aIg8H9p3GdeSe4IFlP6G8JMa7o7lXvnz3GFKzPxzJdPfGK", "sha384-S58meLBGKxIiQmJ/pJ8ilvFUcGcqgla+mWH9EEKGm6i6rKxSTA2kpXJQJ8n7XK4w")
+            .SetVersion("3.6.0");
+
+        manifest
+            .DefineScript("jQuery.slim")
+            .SetUrl("~/OrchardCore.Resources/Vendor/jquery-3.6.0/jquery.slim.min.js", "~/OrchardCore.Resources/Scripts/jquery.slim.js")
+            .SetCdn("https://code.jquery.com/jquery-3.6.0.slim.min.js", "https://code.jquery.com/jquery-3.6.0.slim.js")
+            .SetCdnIntegrity("sha384-Qg00WFl9r0Xr6rUqNLv1ffTSSKEFFCDCKVyHZ+sVt8KuvG99nWw5RNvbhuKgif9z", "sha384-fuUlMletgG/KCb0NwIZTW6aMv/YBbXe0Wt71nwLRreZZpesG/N/aURjEZCG6mtYn")
+            .SetVersion("3.6.0");
+
+        manifest
+            .DefineScript("jQuery")
+            .SetUrl("~/OrchardCore.Resources/Vendor/jquery-3.5.1/jquery.min.js", "~/OrchardCore.Resources/Vendor/jquery-3.5.1/jquery.js")
+            .SetCdn("https://code.jquery.com/jquery-3.5.1.min.js", "https://code.jquery.com/jquery-3.5.1.js")
+            .SetCdnIntegrity("sha384-ZvpUoO/+PpLXR1lu4jmpXWu80pZlYUAfxl5NsBMWOEPSjUn/6Z/hRTt8+pR6L4N2", "sha384-/LjQZzcpTzaYn7qWqRIWYC5l8FWEZ2bIHIz0D73Uzba4pShEcdLdZyZkI4Kv676E")
+            .SetVersion("3.5.1");
+
+        manifest
+            .DefineScript("jQuery.slim")
+            .SetUrl("~/OrchardCore.Resources/Vendor/jquery-3.5.1/jquery.slim.min.js", "~/OrchardCore.Resources/Vendor/jquery-3.5.1/jquery.slim.js")
+            .SetCdn("https://code.jquery.com/jquery-3.5.1.slim.min.js", "https://code.jquery.com/jquery-3.5.1.slim.js")
+            .SetCdnIntegrity("sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj", "sha384-x6NENSfxadikq2gB4e6/qompriNc+y1J3eqWg3hAAMNBs4dFU303XMTcU3uExJgZ")
+            .SetVersion("3.5.1");
+
+        manifest
+            .DefineScript("jQuery")
+            .SetUrl("~/OrchardCore.Resources/Vendor/jquery-3.4.1/jquery.min.js", "~/OrchardCore.Resources/Vendor/jquery-3.4.1/jquery.js")
+            .SetCdn("https://code.jquery.com/jquery-3.4.1.min.js", "https://code.jquery.com/jquery-3.4.1.js")
+            .SetCdnIntegrity("sha384-vk5WoKIaW/vJyUAd9n/wmopsmNhiy+L2Z+SBxGYnUkunIxVxAv/UtMOhba/xskxh", "sha384-mlceH9HlqLp7GMKHrj5Ara1+LvdTZVMx4S1U43/NxCvAkzIo8WJ0FE7duLel3wVo")
+            .SetVersion("3.4.1");
+
+        manifest
+            .DefineScript("jQuery.slim")
+            .SetUrl("~/OrchardCore.Resources/Vendor/jquery-3.4.1/jquery.slim.min.js", "~/OrchardCore.Resources/Vendor/jquery-3.4.1/jquery.slim.js")
+            .SetCdn("https://code.jquery.com/jquery-3.4.1.slim.min.js", "https://code.jquery.com/jquery-3.4.1.slim.js")
+            .SetCdnIntegrity("sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n", "sha384-teRaFq/YbXOM/9FZ1qTavgUgTagWUPsk6xapwcjkrkBHoWvKdZZuAeV8hhaykl+G")
+            .SetVersion("3.4.1");
+
+        manifest
+            .DefineScript("jQuery.easing")
+            .SetDependencies("jQuery")
+            .SetUrl("~/OrchardCore.Resources/Scripts/jquery.easing.min.js", "~/OrchardCore.Resources/Scripts/jquery.easing.js")
+            .SetCdn("https://cdn.jsdelivr.net/npm/jquery.easing@1.4.1/jquery.easing.min.js", "https://cdn.jsdelivr.net/npm/jquery.easing@1.4.1/jquery.easing.js")
+            .SetCdnIntegrity("sha384-leGYpHE9Tc4N9OwRd98xg6YFpB9shlc/RkilpFi0ljr3QD4tFoFptZvgnnzzwG4Q", "sha384-fwPA0FyfPOiDsglgAC4ZWmBGwpXSZNkq9IG+cM9HL4CkpNQo4xgCDkOIPdWypLMX")
+            .SetVersion("1.4.1");
+
+        manifest
+            .DefineScript("jQuery-ui")
+            .SetDependencies("jQuery")
+            .SetUrl("~/OrchardCore.Resources/Scripts/jquery-ui.min.js", "~/OrchardCore.Resources/Scripts/jquery-ui.js")
+            .SetCdn("https://code.jquery.com/ui/1.12.1/jquery-ui.min.js", "https://code.jquery.com/ui/1.12.1/jquery-ui.js")
+            .SetCdnIntegrity("sha384-Dziy8F2VlJQLMShA6FHWNul/veM9bCkRUaLqr199K94ntO5QUrLJBEbYegdSkkqX", "sha384-JPbtLYL10d/Z1crlc6GGGGM3PavCzzoUJ1UxH0bXHOfguWHQ6XAWrIzW+MBGGXe5")
+            .SetVersion("1.12.1");
+
+        manifest
+            .DefineStyle("jQuery-ui")
+            .SetUrl("~/OrchardCore.Resources/Styles/jquery-ui.min.css", "~/OrchardCore.Resources/Styles/jquery-ui.css")
+            .SetCdn("https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.min.css", "https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css")
+            .SetCdnIntegrity("sha384-kcAOn9fN4XSd+TGsNu2OQKSuV5ngOwt7tg73O4EpaD91QXvrfgvf0MR7/2dUjoI6", "sha384-xewr6kSkq3dBbEtB6Z/3oFZmknWn7nHqhLVLrYgzEFRbU/DHSxW7K3B44yWUN60D")
+            .SetVersion("1.12.1");
+
+        manifest
+            .DefineScript("jQuery-ui-i18n")
+            .SetDependencies("jQuery-ui")
+            .SetUrl("~/OrchardCore.Resources/Scripts/jquery-ui-i18n.min.js", "~/OrchardCore.Resources/Scripts/jquery-ui-i18n.js")
+            .SetCdn("https://code.jquery.com/ui/1.7.2/i18n/jquery-ui-i18n.min.js", "https://code.jquery.com/ui/1.7.2/i18n/jquery-ui-i18n.min.js")
+            .SetCdnIntegrity("sha384-0rV7y4NH7acVmq+7Y9GM6evymvReojk9li+7BYb/ug61uqPSsXJ4uIScVY+N9qtd", "sha384-0rV7y4NH7acVmq+7Y9GM6evymvReojk9li+7BYb/ug61uqPSsXJ4uIScVY+N9qtd")
+            .SetVersion("1.7.2");
+
+        manifest
+            .DefineScript("bootstrap")
+            .SetDependencies("jQuery")
+            .SetCdn("https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.min.js", "https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/js/bootstrap.js")
+            .SetCdnIntegrity("sha384-vhJnz1OVIdLktyixHY4Uk3OHEwdQqPppqYR8+5mjsauETgLOcEynD9oPHhhz18Nw", "sha384-it0Suwx+VjMafDIVf5t+ozEbrflmNjEddSX5LstI/Xdw3nv4qP/a4e8K4k5hH6l4")
+            .SetVersion("3.4.0");
+
+        manifest
+            .DefineStyle("bootstrap")
+            .SetCdn("https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css", "https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.css")
+            .SetCdnIntegrity("sha384-PmY9l28YgO4JwMKbTvgaS7XNZJ30MK9FAZjjzXtlqyZCqBY6X6bXIkM++IkyinN+", "sha384-/5bQ8UYbZnrNY3Mfy6zo9QLgIQD/0CximLKk733r8/pQnXn2mgvhvKhcy43gZtJV")
+            .SetVersion("3.4.0");
+
+        manifest
+            .DefineStyle("bootstrap-theme")
+            .SetCdn("https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap-theme.min.css", "https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap-theme.css")
+            .SetCdnIntegrity("sha384-jzngWsPS6op3fgRCDTESqrEJwRKck+CILhJVO5VvaAZCq8JYf8HsR/HPpBOOPZfR", "sha384-RtiWe5OsslAYZ9AVyorBziI2VQL7E27rzWygBJh7wrZuVPyK5jeQLLytnJIpJqfD")
+            .SetVersion("3.4.0");
+
+        manifest
+            .DefineScript("popper")
+            .SetUrl("~/OrchardCore.Resources/Vendor/popper-1.16.1/popper.min.js", "~/OrchardCore.Resources/Vendor/popper-1.16.1/popper.js")
+            .SetCdn("https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js", "https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.js")
+            .SetCdnIntegrity("sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN", "sha384-cpSm/ilDFOWiMuF2bj03ZzJinb48NO9IGCXcYDtUzdP5y64Ober65chnoOj1XFoA")
+            .SetVersion("1.16.1");
+
+        manifest
+            .DefineScript("bootstrap")
+            .SetDependencies("jQuery", "popper")
+            .SetUrl("~/OrchardCore.Resources/Vendor/bootstrap-4.6.1/bootstrap.min.js", "~/OrchardCore.Resources/Vendor/bootstrap-4.6.1/bootstrap.js")
+            .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.min.js", "https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.js")
+            .SetCdnIntegrity("sha384-VHvPCCyXqtD5DqJeNxl2dtTyhF78xXNXdkwX1CZeRusQfRKp+tA7hAShOK/B/fQ2", "sha384-acUSOMj/FOTIzZ4qpiZXd/6avQezsTkra+wBPeduOyUIA5anC5YcLndJ3Wn4b4pF")
+            .SetVersion("4.6.1");
+
+        manifest
+            .DefineScript("bootstrap-bundle")
+            .SetDependencies("jQuery")
+            .SetUrl("~/OrchardCore.Resources/Vendor/bootstrap-4.6.1/bootstrap.bundle.min.js", "~/OrchardCore.Resources/Vendor/bootstrap-4.6.1/bootstrap.bundle.js")
+            .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js", "https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.js")
+            .SetCdnIntegrity("sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF", "sha384-fAPB/5gOv3oOdZZ9/se34OICi8gkYHlNY5skCVFZPzGe+F2puEgM5hu8ctpXyKFM")
+            .SetVersion("4.6.1");
+
+        manifest
+            .DefineStyle("bootstrap")
+            .SetUrl("~/OrchardCore.Resources/Vendor/bootstrap-4.6.1/bootstrap.min.css", "~/OrchardCore.Resources/Vendor/bootstrap-4.6.1/bootstrap.css")
+            .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css", "https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.css")
+            .SetCdnIntegrity("sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn", "sha384-ztSeENTvhymkwcI8wMyrHLHIyPJgek5ErHOMw9p96EzJKwbiuJBWBDuPJpGNqOar")
+            .SetVersion("4.6.1");
+
+        manifest
+           .DefineScript("popperjs")
+           .SetUrl("~/OrchardCore.Resources/Scripts/popper.min.js", "~/OrchardCore.Resources/Scripts/popper.js")
+           .SetCdn("https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.min.js", "https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.js")
+           .SetCdnIntegrity("sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r", "sha384-yBknSWNrSUPkBtbhhCJ07i/BOmbrigRhLKPzTAny+TT4uGAwIdfNTAkBd/3VzXbg")
+           .SetVersion("2.11.8");
+
+        manifest
+            .DefineScript("bootstrap")
+            .SetDependencies("popperjs")
+            .SetUrl("~/OrchardCore.Resources/Scripts/bootstrap.min.js", "~/OrchardCore.Resources/Scripts/bootstrap.js")
+            .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.min.js", "https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.js")
+            .SetCdnIntegrity("sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy", "sha384-jYoAmFjufJZfBzwTARyz2gk7Jj9mQb2cLeP9n5PcgLCVVd+8QfjY1+qFj+rBkViV")
+            .SetVersion("5.3.3");
+
+        manifest
+            .DefineScript("bootstrap-bundle")
+            .SetDependencies("jQuery")
+            .SetUrl("~/OrchardCore.Resources/Scripts/bootstrap.bundle.min.js", "~/OrchardCore.Resources/Scripts/bootstrap.bundle.js")
+            .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js", "https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.js")
+            .SetCdnIntegrity("sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz", "sha384-5xO2n1cyGKAe630nacBqFQxWoXjUIkhoc/FxQrWM07EIZ3TuqkAsusDeyPDOIeid")
+            .SetVersion("5.3.3");
+
+        manifest
+            .DefineStyle("bootstrap")
+            .SetUrl("~/OrchardCore.Resources/Styles/bootstrap.min.css", "~/OrchardCore.Resources/Styles/bootstrap.css")
+            .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css", "https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.css")
+            .SetCdnIntegrity("sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH", "sha384-qAlWxD5RDF+aEdUc1Z7GR/tE4zYjX1Igo/LrIexlnzM6G63a6F1fXZWpZKSrSW86")
+            .SetVersion("5.3.3");
+
+        manifest
+            .DefineStyle("bootstrap-rtl")
+            .SetUrl("~/OrchardCore.Resources/Styles/bootstrap.rtl.min.css", "~/OrchardCore.Resources/Styles/bootstrap.rtl.css")
+            .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.rtl.min.css", "https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.rtl.css")
+            .SetCdnIntegrity("sha384-nU14brUcp6StFntEOOEBvcJm4huWjB0OcIeQ3fltAfSmuZFrkAif0T+UtNGlKKQv", "sha384-CEku08bnqQAT/vzi6/zxMQmSyxoOTK1jx7mbT8P7etf/YhPbxASCX5BIVuAK9sfy")
+            .SetVersion("5.3.3");
+
+        manifest
+            .DefineStyle("bootstrap-select")
+            .SetUrl("~/OrchardCore.Resources/Styles/bootstrap-select.min.css", "~/OrchardCore.Resources/Styles/bootstrap-select.css")
+            .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap-select@1.14.0-beta3/dist/css/bootstrap-select.min.css", "https://cdn.jsdelivr.net/npm/bootstrap-select@1.14.0-beta3/dist/css/bootstrap-select.css")
+            .SetCdnIntegrity("sha384-xF1Y2i6HgC34+4EWddbDhlQuru7cLSKRcPT3hoL3mPoKoV+624vVSZJmegPX77vS", "sha384-DtuOZ7LbR+xAYzDGD4YLpe9eiAayUBwZRqAcoy+RepIoV53tAoJbXnr4AX1xTJ43")
+            .SetVersion("1.14.0");
+
+        manifest
+            .DefineScript("bootstrap-select")
+            .SetDependencies("jQuery")
+            .SetUrl("~/OrchardCore.Resources/Scripts/bootstrap-select.min.js", "~/OrchardCore.Resources/Scripts/bootstrap-select.js")
+            .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap-select@1.14.0-beta3/dist/js/bootstrap-select.min.js", "https://cdn.jsdelivr.net/npm/bootstrap-select@1.14.0-beta3/dist/js/bootstrap-select.js")
+            .SetCdnIntegrity("sha384-0O3sg2SQIGn4393xwamQISjphC8DIXjCzlhj1gPAMC5xGg+2perF5Mehr5njv0fZ", "sha384-2b0aLFg/Ejp4OF57nW0BUqNzm259RHYYMf/mpKClBijsEH2P+4ea2oWAq0twd8L0")
+            .SetVersion("1.14.0");
+
+        manifest
+            .DefineStyle("nouislider")
+            .SetUrl("~/OrchardCore.Resources/Styles/nouislider.min.css", "~/OrchardCore.Resources/Styles/nouislider.css")
+            .SetCdn("https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/15.7.0/nouislider.min.css", "https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/15.7.0/nouislider.css")
+            .SetCdnIntegrity("sha384-PSZaVsyG9jDu8hFaSJev5s/9poIJlX7cuxSGdqCgXRHpo2DzIaZAyCd2rG/DJJmV", "sha384-SW0/EWtnMakMnwC9RHA27DeNtNCLsJ0l+oZrXlFbb2123lhLdZIbiDiwRPogNY8T")
+            .SetVersion("15.7.0");
+
+        manifest
+            .DefineScript("nouislider")
+            .SetDependencies("jQuery")
+            .SetUrl("~/OrchardCore.Resources/Scripts/nouislider/nouislider.min.js", "~/OrchardCore.Resources/Scripts/nouislider/nouislider.js")
+            .SetCdn("https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/15.7.0/nouislider.min.js", "https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/15.7.0/nouislider.js")
+            .SetCdnIntegrity("sha384-/gBUOLHADjY2rp6bHB0IyW9AC28q4OsnirJScje4l1crgYW7Qarx3dH8zcqcUgmy", "sha384-ZRTsSqAkR2D5UR6P8ew9nDImNmAueqBx3QIljDVMucOjF3eVskkMIk50HUW239mY")
+            .SetVersion("15.7.0");
+
+        manifest
+            .DefineStyle("codemirror")
+            .SetUrl("~/OrchardCore.Resources/Styles/codemirror/codemirror.min.css", "~/OrchardCore.Resources/Styles/codemirror/codemirror.css")
+            .SetCdn(CodeMirrorUrl + "codemirror.min.css", CodeMirrorUrl + "codemirror.css")
+            .SetCdnIntegrity("sha384-zaeBlB/vwYsDRSlFajnDd7OydJ0cWk+c2OWybl3eSUf6hW2EbhlCsQPqKr3gkznT", "sha384-bsaAhvdduZPAwUb7RRLRvDgtEtOsggrgjkr/EjPO1i/vdoi+DmdLaG79UOt6M5hD")
+            .SetVersion(CodeMirrorVersion);
+
+        manifest
+            .DefineScript("codemirror")
+            .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/codemirror.min.js", "~/OrchardCore.Resources/Scripts/codemirror/codemirror.js")
+            .SetCdn(CodeMirrorUrl + "codemirror.min.js", CodeMirrorUrl + "codemirror.js")
+            .SetCdnIntegrity("sha384-FIV1f0SplvlwhOxrMYdXpUcnVM79A9u4ffl0lEOVVZunLMuGpxFyQmnBHl24EQFR", "sha384-VAGlhrJE9eY6OkSfl3ioNR4jWUGp1mLeF/ECkHxBUEfTB9u2xVVH14acAUBDc3Y8")
+            .SetVersion(CodeMirrorVersion);
+
+        manifest
+            .DefineScript("codemirror-addon-display-autorefresh")
+            .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/addon/display/autorefresh.min.js", "~/OrchardCore.Resources/Scripts/codemirror/addon/display/autorefresh.js")
+            .SetCdn(CodeMirrorUrl + "addon/display/autorefresh.min.js", CodeMirrorUrl + "addon/display/autorefresh.js")
+            .SetCdnIntegrity("sha384-pn83o6MtS8kicn/sV6AhRaBqXQ5tau8NzA2ovcobkcc1uRFP7D8CMhRx231QwKST", "sha384-B1M1WS08oqd1y3zKAPdhkOSNwy+NYMREyK9qXNWl+QfXDlqj+Y+TYuBUkc/uAnox")
+            .SetVersion(CodeMirrorVersion);
+
+        manifest
+            .DefineStyle("codemirror-addon-display-fullscreen")
+            .SetUrl("~/OrchardCore.Resources/Styles/codemirror/addon/display/fullscreen.min.css", "~/OrchardCore.Resources/Styles/codemirror/addon/display/fullscreen.css")
+            .SetCdn(CodeMirrorUrl + "addon/display/fullscreen.min.css", CodeMirrorUrl + "addon/display/fullscreen.css")
+            .SetCdnIntegrity("sha384-uuIczW2AGKADJpvg6YiNBJQWE7duDkgQDkndYEsbUGaLm8SPJZzlly6hcEo0aTlW", "sha384-+glu1jsbG+T5ocmkeMvIYh5w07IXKxmJZaCdkNbVfpEr3xi+M0gopFSR/oLKXxio")
+            .SetVersion(CodeMirrorVersion);
+
+        manifest
+            .DefineScript("codemirror-addon-display-fullscreen")
+            .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/addon/display/fullscreen.min.js", "~/OrchardCore.Resources/Scripts/codemirror/addon/display/fullscreen.js")
+            .SetCdn(CodeMirrorUrl + "addon/display/fullscreen.min.js", CodeMirrorUrl + "addon/display/fullscreen.js")
+            .SetCdnIntegrity("sha384-mlEZFcWl5HzvZ6rIROEnNm825OC0Gw5KMZkilPtaJL7BGiluUu4c8Ws3IaNauZTh", "sha384-vU/yRPnV0VIhELETYT5fG/k7uMzeHddzkMo4NFrLzHdJepeb46v0b61P8FADXtN4")
+            .SetVersion(CodeMirrorVersion);
+
+        manifest
+            .DefineScript("codemirror-addon-edit-closetag")
+            .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/addon/edit/closetag.min.js", "~/OrchardCore.Resources/Scripts/codemirror/addon/edit/closetag.js")
+            .SetCdn(CodeMirrorUrl + "addon/edit/closetag.min.js", CodeMirrorUrl + "addon/edit/closetag.js")
+            .SetCdnIntegrity("sha384-WIyvbwMte2q6VXgBkN7prVo9ZSmBm47nI2ftVjoJLPY4yOu9gmI6lqaNXjBwHU5k", "sha384-i4ai3UXE5wIk3ILN77PB9DhNmku+sefNKDTHXRvsrYX2bxWzm+EDmoBui5wsNU2v")
+            .SetVersion(CodeMirrorVersion);
+
+        manifest
+            .DefineStyle("codemirror-addon-hint-show-hint")
+            .SetUrl("~/OrchardCore.Resources/Styles/codemirror/addon/hint/show-hint.min.css", "~/OrchardCore.Resources/Styles/codemirror/addon/hint/show-hint.css")
+            .SetCdn(CodeMirrorUrl + "addon/hint/show-hint.min.css", CodeMirrorUrl + "addon/hint/show-hint.css")
+            .SetCdnIntegrity("sha384-qqTWkykzuDLx4yDYa7bVrwNwBHuqVvklDUMVaU4eezgNUEgGbP8Zv6i3u8OmtuWg", "sha384-ZZbLvEvLoXKrHo3Tkh7W8amMgoHFkDzWe8IAm1ZgxsG5y35H+fJCVMWwr0YBAEGA")
+            .SetVersion(CodeMirrorVersion);
+
+        manifest
+            .DefineScript("codemirror-addon-hint-show-hint")
+            .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/addon/hint/show-hint.min.js", "~/OrchardCore.Resources/Scripts/codemirror/addon/hint/show-hint.js")
+            .SetCdn(CodeMirrorUrl + "addon/hint/show-hint.min.js", CodeMirrorUrl + "addon/hint/show-hint.js")
+            .SetCdnIntegrity("sha384-8i/ZCyq/QakicQDFEJhSl5oJEzzChdhEHhFBvtlxJMWdzohX6j+7O7L7NGgVjaL2", "sha384-X99dMoDW1QAOqOa49NoR3mVQPZMAmWdk1EtGVfWHdqFrD0mKdc4TVCugISfW0wEv")
+            .SetVersion(CodeMirrorVersion);
+
+        manifest
+            .DefineScript("codemirror-addon-hint-sql-hint")
+            .SetDependencies("codemirror-addon-hint-show-hint")
+            .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/addon/hint/sql-hint.min.js", "~/OrchardCore.Resources/Scripts/codemirror/addon/hint/sql-hint.js")
+            .SetCdn(CodeMirrorUrl + "addon/hint/sql-hint.min.js", CodeMirrorUrl + "addon/hint/sql-hint.js")
+            .SetCdnIntegrity("sha384-TT6FzU/qfXKsyGpknyPBSW9YUv9boLL9TStdfYRJTMjLDdUaQwWceBVs8I326z16", "sha384-v0PZIWVaXK+SdJWDH/8f3lMh+4SXRujsh67aPj27BlUq4ocyn0Yime8qyi8AArtz")
+            .SetVersion(CodeMirrorVersion);
+
+        manifest
+            .DefineScript("codemirror-addon-mode-multiplex")
+            .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/addon/mode/multiplex.min.js", "~/OrchardCore.Resources/Scripts/codemirror/addon/mode/multiplex.js")
+            .SetCdn(CodeMirrorUrl + "addon/mode/multiplex.min.js", CodeMirrorUrl + "addon/mode/multiplex.js")
+            .SetCdnIntegrity("sha384-Qr/1hjoJmzEf6ToQLo1nr8/GF5ekpaqUx0DM71QHZ4N8+c8l8aqlQ25whgApmChE", "sha384-pgj6NfGJNeIBDFqYM8m/ah3J269WhaJDiT0fN/C0c335qDMJAbfz/O2rVB53w+1D")
+            .SetVersion(CodeMirrorVersion);
+
+        manifest
+            .DefineScript("codemirror-addon-mode-simple")
+            .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/addon/mode/simple.min.js", "~/OrchardCore.Resources/Scripts/codemirror/addon/mode/simple.js")
+            .SetCdn(CodeMirrorUrl + "addon/mode/simple.min.js", CodeMirrorUrl + "addon/mode/simple.js")
+            .SetCdnIntegrity("sha384-5+aYjV0V2W3IwhAYp/9WOrGMv1TaYkCjnkkW7Hv3yJQo28MergRCSRaUIUzDUs2J", "sha384-qeu+SDWpTAqXUyXdqdwbMDeYSQiv6rErEHLJ/cITY3wtuYhN2LdBSBZeS7Jyn8nv")
+            .SetVersion(CodeMirrorVersion);
+
+        manifest
+            .DefineScript("codemirror-addon-selection-active-line")
+            .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/addon/selection/active-line.min.js", "~/OrchardCore.Resources/Scripts/codemirror/addon/selection/active-line.js")
+            .SetCdn(CodeMirrorUrl + "addon/selection/active-line.min.js", CodeMirrorUrl + "addon/selection/active-line.js")
+            .SetCdnIntegrity("sha384-hcxaXyAtJ30s2NeDu1OHWsQRiHiWuYLTbI596+YFb+f2pFhzO0mDuahZziRPPDxg", "sha384-QhD10EHRrst6CIOzeEBXQhUT95YVJN1EV8uX2Jb5S3+qw/ozbvUE5Zn5uILnZg96")
+            .SetVersion(CodeMirrorVersion);
+
+        manifest
+            .DefineScript("codemirror-mode-css")
+            .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/mode/css/css.min.js", "~/OrchardCore.Resources/Scripts/codemirror/mode/css/css.js")
+            .SetCdn(CodeMirrorUrl + "mode/css/css.min.js", CodeMirrorUrl + "mode/css/css.js")
+            .SetCdnIntegrity("sha384-fpeIC2FZuPmw7mIsTvgB5BNc8QVxQC/nWg2W+CgPYOAiBiYVuHe2E8HiTWHBMIJQ", "sha384-ZD4C1ohrucZOfP7+jQSuBELICO7Z73CFD5stbjic1D3DbZk88mqj3KsRjSml/NCK")
+            .SetVersion(CodeMirrorVersion);
+
+        manifest
+            .DefineScript("codemirror-mode-htmlmixed")
+            .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/mode/htmlmixed/htmlmixed.min.js", "~/OrchardCore.Resources/Scripts/codemirror/mode/htmlmixed/htmlmixed.js")
+            .SetCdn(CodeMirrorUrl + "mode/htmlmixed/htmlmixed.min.js", CodeMirrorUrl + "mode/htmlmixed/htmlmixed.js")
+            .SetCdnIntegrity("sha384-xYIbc5F55vPi7pb/lUnFj3wu24HlpAMZdtBHkNrb2YhPzJV3pX7+eqXT2PXSNMrw", "sha384-0MH/N0DfWPIbCXDe9I7tmLw0dsJ4gKQUijwCcpaTgGxrTTrypsJwEOOqi5yhkQiK")
+            .SetVersion(CodeMirrorVersion);
+
+        manifest
+            .DefineScript("codemirror-mode-javascript")
+            .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/mode/javascript/javascript.min.js", "~/OrchardCore.Resources/Scripts/codemirror/mode/javascript/javascript.js")
+            .SetCdn(CodeMirrorUrl + "mode/javascript/javascript.min.js", CodeMirrorUrl + "mode/javascript/javascript.js")
+            .SetCdnIntegrity("sha384-kmQrbJf09Uo1WRLMDVGoVG3nM6F48frIhcj7f3FDUjeRzsiHwyBWDjMUIttnIeAf", "sha384-fgstVTG7RpZvquT2ZtQeU9iJXfvK9wTstlhasVKML77E5oe3Wi0AfLzY2grsjwmh")
+            .SetVersion(CodeMirrorVersion);
+
+        manifest
+            .DefineScript("codemirror-mode-sql")
+            .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/mode/sql/sql.min.js", "~/OrchardCore.Resources/Scripts/codemirror/mode/sql/sql.js")
+            .SetCdn(CodeMirrorUrl + "mode/sql/sql.min.js", CodeMirrorUrl + "mode/sql/sql.js")
+            .SetCdnIntegrity("sha384-cof/65v3Fn+7YeqmMp8aCI1xZ2yeX8JnWhQYdMzaO7VDpBOtLjfdwx6pEfUo7SFT", "sha384-Llr4/OHf89ufsfG7HbSwqB7KTd1d4hXok/Yxi72qWvLwtd6pz6nqJdOGlDdpjw6I")
+            .SetVersion(CodeMirrorVersion);
+
+        manifest
+            .DefineScript("codemirror-mode-xml")
+            .SetUrl("~/OrchardCore.Resources/Scripts/codemirror/mode/xml/xml.min.js", "~/OrchardCore.Resources/Scripts/codemirror/mode/xml/xml.js")
+            .SetCdn(CodeMirrorUrl + "mode/xml/xml.min.js", CodeMirrorUrl + "mode/xml/xml.js")
+            .SetCdnIntegrity("sha384-xPpkMo5nDgD98fIcuRVYhxkZV6/9Y4L8s3p0J5c4MxgJkyKJ8BJr+xfRkq7kn6Tw", "sha384-KX/+LdYWr3JcKfT7HK55DC3oPVJwnJSympb1qoO14sxVDtDIg+xHPVLltqJEbitI")
+            .SetVersion(CodeMirrorVersion);
+
+        manifest
+            .DefineStyle("font-awesome")
+            .SetUrl("~/OrchardCore.Resources/Styles/font-awesome.min.css", "~/OrchardCore.Resources/Styles/font-awesome.css")
+            .SetCdn("https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", "https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.css")
+            .SetCdnIntegrity("sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN", "sha384-FckWOBo7yuyMS7In0aXZ0aoVvnInlnFMwCv77x9sZpFgOonQgnBj1uLwenWVtsEj")
+            .SetVersion("4.7.0");
+
+        manifest
+            .DefineStyle("font-awesome")
+            .SetUrl("~/OrchardCore.Resources/Vendor/fontawesome-free/css/all.min.css", "~/OrchardCore.Resources/Vendor/fontawesome-free/css/all.css")
+            .SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/css/all.min.css", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/css/all.css")
+            .SetCdnIntegrity("sha384-DyZ88mC6Up2uqS4h/KRgHuoeGwBcD4Ng9SiP4dIRy0EXTlnuz47vAwmeGwVChigm", "sha384-7rgjkhkxJ95zOzIjk97UrBOe14KgYpH9+zQm5BdgzjQELBU6kHf4WwoQzHfTx5sw")
+            .SetVersion("5.15.4");
+
+        manifest
+            .DefineScript("font-awesome")
+            .SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/js/all.min.js", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/js/all.js")
+            .SetCdnIntegrity("sha384-rOA1PnstxnOBLzCLMcre8ybwbTmemjzdNlILg8O7z1lUkLXozs4DHonlDtnE7fpc", "sha384-HfU7cInvKb8zxQuLKtKr/suuRgcSH1OYsdJU+8lGA/t8nyNgdJF09UIkRzg1iefj")
+            .SetVersion("5.15.4");
+
+        manifest
+            .DefineScript("font-awesome-v4-shims")
+            .SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/js/v4-shims.min.js", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/js/v4-shims.js")
+            .SetCdnIntegrity("sha384-bx00wqJq+zY9QLCMa/zViZPu1f0GJ3VXwF4GSw3GbfjwO28QCFr4qadCrNmJQ/9N", "sha384-SGuqaGE4bcW7Xl5T06BsUPUA91qaNtT53uGOcGpavQMje3goIFJbDsC0VAwtgL5g")
+            .SetVersion("5.15.4");
+
+        manifest
+            .DefineStyle("font-awesome")
+            .SetUrl("~/OrchardCore.Resources/Vendor/fontawesome-free/css/all.min.css", "~/OrchardCore.Resources/Vendor/fontawesome-free/css/all.css")
+            .SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.6.0/css/all.min.css", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.6.0/css/all.css")
+            .SetCdnIntegrity("sha384-h/hnnw1Bi4nbpD6kE7nYfCXzovi622sY5WBxww8ARKwpdLj5kUWjRuyiXaD1U2JT", "sha384-vMdawx0r3BjxHQwcfWi0YSemtW6u5mKxTKPPh1ogUICPLaEa/6e42yg2wRYzzJtx")
+            .SetVersion("6.6.0");
+
+        manifest
+            .DefineScript("font-awesome")
+            .SetUrl("~/OrchardCore.Resources/Vendor/fontawesome-free/js/all.min.js", "~/OrchardCore.Resources/Vendor/fontawesome-free/js/all.js")
+            .SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.6.0/js/all.min.js", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.6.0/js/all.js")
+            .SetCdnIntegrity("sha384-dgEl3vRKux81M373f/TdgoDTV5oZj+yjHrr/1qR5b4btG5q63kYS62t5kod+7Q6v", "sha384-v72QeVpDL6Ne4X2S+fwIXCOLhO57lwIR/qRV05SHAExDg1QoyJGWDxx6VQO3rzlC")
+            .SetVersion("6.6.0");
+
+        manifest
+            .DefineScript("font-awesome-v4-shims")
+            .SetUrl("~/OrchardCore.Resources/Vendor/fontawesome-free/js/v4-shims.min.js", "~/OrchardCore.Resources/Vendor/fontawesome-free/js/v4-shims.js")
+            .SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.6.0/js/v4-shims.min.js", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.6.0/js/v4-shims.js")
+            .SetCdnIntegrity("sha384-M9y++reQwf5nddw5loUHChCbGE4kwaeHzeEM2yWidMfaRMQeHM6MSwwPuiSnSMHF", "sha384-WrIndr6nwB5l/sVUyZkWDlpNS9Vx/Y+zhmjZNP+j2UJOBmy36ufaIIqd7o2kL0BL")
+            .SetVersion("6.6.0");
+
+        manifest
+            .DefineScript("jquery-resizable")
+            .SetDependencies("jQuery")
+            .SetUrl("~/OrchardCore.Resources/Scripts/jquery-resizable.min.js", "~/OrchardCore.Resources/Scripts/jquery-resizable.js")
+            .SetCdn("https://cdn.jsdelivr.net/npm/jquery-resizable-dom@0.35.0/dist/jquery-resizable.min.js")
+            .SetCdnIntegrity("sha384-1LMjDEezsSgzlRgsyFIAvLW7FWSdFIHqBGjUa+ad5EqtK1FORC8XpTJ/pahxj5GB", "sha384-0yk9X0IG0cXxuN9yTTkps/3TNNI9ZcaKKhh8dgqOEAWGXxIYS5xaY2as6b32Ov3P")
+            .SetVersion("0.35.0");
+
+        manifest
+            .DefineStyle("trumbowyg")
+            .SetUrl("~/OrchardCore.Resources/Styles/trumbowyg/trumbowyg.min.css", "~/OrchardCore.Resources/Styles/trumbowyg/trumbowyg.css")
+            .SetCdn("https://cdn.jsdelivr.net/npm/trumbowyg@2.28.0/dist/ui/trumbowyg.min.css", "https://cdn.jsdelivr.net/npm/trumbowyg@2.28.0/dist/ui/trumbowyg.css")
+            .SetCdnIntegrity("sha384-XfI6P0jtm0X3QDEQxS1DotzhIXkJeuSV1wtBOntPaRxzpzTkMWkpZpkuzj8qVHzl", "sha384-GUyfWhYsIKKkAMejJuy50VTSfyfkrrJX2csg7fxJJt7vi+gXH8qxqH29C5GURaum")
+            .SetVersion("2.28.0");
+
+        manifest
+            .DefineScript("trumbowyg")
+            .SetDependencies("jquery-resizable")
+            .SetUrl("~/OrchardCore.Resources/Scripts/trumbowyg/trumbowyg.min.js", "~/OrchardCore.Resources/Scripts/trumbowyg/trumbowyg.js")
+            .SetCdn("https://cdn.jsdelivr.net/npm/trumbowyg@2.28.0/dist/trumbowyg.min.js", "https://cdn.jsdelivr.net/npm/trumbowyg@2.28.0/dist/trumbowyg.js")
+            .SetCdnIntegrity("sha384-O4OAGMDq5hnqt4/WQz+fW6yVgZ02jmw+Yf1j02zIgglnCYXf/7TmET8tFbrTN6u5", "sha384-dNxlebCuuiNWPhPBEd69nEAtkEWa7Z9IWkrL+OSmJ456dlu6TAASXgL72Bn4GGju")
+            .SetVersion("2.28.0");
+
+        manifest
+            .DefineScript("trumbowyg-shortcodes")
+            .SetDependencies("trumbowyg")
+            .SetUrl("~/OrchardCore.Resources/Scripts/trumbowyg/trumbowyg.shortcodes.min.js", "~/OrchardCore.Resources/Scripts/trumbowyg/trumbowyg.shortcodes.js")
+            .SetVersion("1.0.0");
+
+        manifest
+            .DefineScript("trumbowyg-theme")
+            .SetUrl("~/OrchardCore.Resources/Scripts/trumbowyg/trumbowyg.theme.min.js", "~/OrchardCore.Resources/Scripts/trumbowyg/trumbowyg.theme.js")
+            .SetDependencies("trumbowyg", "theme-head")
+            .SetVersion("1.0.0");
+
+        manifest
+            .DefineStyle("trumbowyg-plugins")
+            .SetDependencies("trumbowyg")
+            .SetUrl("~/OrchardCore.Resources/Styles/trumbowyg/trumbowyg-plugins.min.css", "~/OrchardCore.Resources/Styles/trumbowyg/trumbowyg-plugins.css")
+            .SetVersion("2.28.0");
+
+        manifest
+            .DefineScript("trumbowyg-plugins")
+            .SetDependencies("trumbowyg")
+            .SetUrl("~/OrchardCore.Resources/Scripts/trumbowyg/trumbowyg-plugins.min.js", "~/OrchardCore.Resources/Scripts/trumbowyg/trumbowyg-plugins.js")
+            .SetVersion("2.28.0");
+
+        manifest
+            .DefineScript("credential-helpers")
+            .SetUrl("~/OrchardCore.Resources/Scripts/credential-helpers.min.js", "~/OrchardCore.Resources/Scripts/credential-helpers.js")
+            .SetVersion("1.0.0");
+
+        manifest
+            .DefineScript("vuejs")
+            .SetUrl("~/OrchardCore.Resources/Scripts/vue.min.js", "~/OrchardCore.Resources/Scripts/vue.js")
+            .SetCdn("https://cdn.jsdelivr.net/npm/vue@2.6.14/dist/vue.min.js", "https://cdn.jsdelivr.net/npm/vue@2.6.14/dist/vue.js")
+            .SetCdnIntegrity("sha384-ULpZhk1pvhc/UK5ktA9kwb2guy9ovNSTyxPNHANnA35YjBQgdwI+AhLkixDvdlw4", "sha384-t1tHLsbM7bYMJCXlhr0//00jSs7ZhsAhxgm191xFsyzvieTMCbUWKMhFg9I6ci8q")
+            .SetVersion("2.6.14");
+
+        manifest
+            .DefineScript("vue-multiselect")
+            .SetDependencies("vuejs")
+            .SetUrl("~/OrchardCore.Resources/Scripts/vue-multiselect.min.js", "~/OrchardCore.Resources/Scripts/vue-multiselect.min.js")
+            .SetCdn("https://cdn.jsdelivr.net/npm/vue-multiselect@2.1.6/dist/vue-multiselect.min.js", "https://cdn.jsdelivr.net/npm/vue-multiselect@2.1.6/dist/vue-multiselect.min.js")
+            .SetCdnIntegrity("sha384-a4eXewRTYCwYdFtSnMCZTNtiXrfdul6aQdueRgHPAx2y1Ldp0QaFdCTpOx0ycsXU", "sha384-a4eXewRTYCwYdFtSnMCZTNtiXrfdul6aQdueRgHPAx2y1Ldp0QaFdCTpOx0ycsXU")
+            .SetVersion("2.1.6");
+
+        manifest
+            .DefineStyle("vue-multiselect")
+            .SetUrl("~/OrchardCore.Resources/Styles/vue-multiselect.min.css", "~/OrchardCore.Resources/Styles/vue-multiselect.min.css")
+            .SetCdn("https://cdn.jsdelivr.net/npm/vue-multiselect@2.1.6/dist/vue-multiselect.min.css", "https://cdn.jsdelivr.net/npm/vue-multiselect@2.1.6/dist/vue-multiselect.min.css")
+            .SetCdnIntegrity("sha384-PPH/T7V86Z1+B4eMPef4FJXLD5fsTpObWoCoK3CiNtSX7aji+5qxpOCn1f2TDYAM", "sha384-PPH/T7V86Z1+B4eMPef4FJXLD5fsTpObWoCoK3CiNtSX7aji+5qxpOCn1f2TDYAM")
+            .SetVersion("2.1.6");
+
+        manifest
+            .DefineScript("Sortable")
+            .SetUrl("~/OrchardCore.Resources/Scripts/Sortable.min.js", "~/OrchardCore.Resources/Scripts/Sortable.js")
+            .SetCdn("https://cdn.jsdelivr.net/npm/sortablejs@1.15.0/Sortable.min.js", "https://cdn.jsdelivr.net/npm/sortablejs@1.15.0/Sortable.js")
+            .SetCdnIntegrity("sha384-eeLEhtwdMwD3X9y+8P3Cn7Idl/M+w8H4uZqkgD/2eJVkWIN1yKzEj6XegJ9dL3q0", "sha384-OFIl93h6jYoAF+hATXncsLYMiLo81FpuReH3fgCI4wep7qNCmiA2I0bwcvVqHSBj")
+            .SetVersion("1.15.0");
+
+        manifest
+            .DefineScript("vuedraggable")
+            .SetDependencies("vuejs", "Sortable")
+            .SetUrl("~/OrchardCore.Resources/Scripts/vuedraggable.umd.min.js", "~/OrchardCore.Resources/Scripts/vuedraggable.umd.js")
+            .SetCdn("https://cdn.jsdelivr.net/npm/vuedraggable@2.24.3/dist/vuedraggable.umd.min.js", "https://cdn.jsdelivr.net/npm/vuedraggable@2.24.3/dist/vuedraggable.umd.js")
+            .SetCdnIntegrity("sha384-qUA1xXJiX23E4GOeW/XHtsBkV9MUcHLSjhi3FzO08mv8+W8bv5AQ1cwqLskycOTs", "sha384-+jB9vXc/EaIJTlNiZG2tv+TUpKm6GR9HCRZb3VkI3lscZWqrCYDbX2ZXffNJldL9")
+            .SetVersion("2.24.3");
+
+        manifest
+            .DefineScript("js-cookie")
+            .SetUrl("~/OrchardCore.Resources/Scripts/js.cookie.min.js", "~/OrchardCore.Resources/Scripts/js.cookie.js")
+            .SetCdn("https://cdn.jsdelivr.net/npm/js-cookie@3.0.5/dist/js.cookie.min.js", "https://cdn.jsdelivr.net/npm/js-cookie@3.0.5/dist/js.cookie.js")
+            .SetCdnIntegrity("sha384-/vxhYfM1LENRhdpZ8dwEsQn/X4VhpbEZSiU4m/FwR+PVpzar4fkEOw8FP9Y+OfQN", "sha384-b1TD0tFP+Ao4jmFaQw9RQxezUooFrLdlqfDfoh1SKv5L3jG7dD44QiwD+UzckH8W")
+            .SetVersion("3.0.5");
+
+        manifest
+            .DefineScript("monaco-loader")
+            .SetUrl("~/OrchardCore.Resources/Scripts/monaco/vs/loader.js")
+            .SetPosition(ResourcePosition.Last)
+            .SetVersion(MonacoEditorVersion);
+
+        manifest
+            .DefineScript("monaco")
+            .SetAttribute("data-tenant-prefix", _pathBase)
+            .SetUrl("~/OrchardCore.Resources/Scripts/monaco/ocmonaco.js")
+            .SetDependencies("monaco-loader")
+            .SetVersion(MonacoEditorVersion);
+
+        return manifest;
+    }
+
+    public void Configure(ResourceManagementOptions options)
+    {
+        options.ResourceManifests.Add(BuildManifest());
 
-        public void Configure(ResourceManagementOptions options)
+        switch (_resourceOptions.ResourceDebugMode)
         {
-            options.ResourceManifests.Add(BuildManifest());
-
-            switch (_resourceOptions.ResourceDebugMode)
-            {
-                case ResourceDebugMode.Enabled:
-                    options.DebugMode = true;
-                    break;
-
-                case ResourceDebugMode.Disabled:
-                    options.DebugMode = false;
-                    break;
-
-                case ResourceDebugMode.FromConfiguration:
-                    options.DebugMode = !_env.IsProduction();
-                    break;
-            }
-
-            options.UseCdn = _resourceOptions.UseCdn;
-            options.CdnBaseUrl = _resourceOptions.CdnBaseUrl;
-            options.AppendVersion = _resourceOptions.AppendVersion;
-            options.ContentBasePath = _pathBase.Value;
+            case ResourceDebugMode.Enabled:
+                options.DebugMode = true;
+                break;
+
+            case ResourceDebugMode.Disabled:
+                options.DebugMode = false;
+                break;
+
+            case ResourceDebugMode.FromConfiguration:
+                options.DebugMode = !_env.IsProduction();
+                break;
         }
+
+        options.UseCdn = _resourceOptions.UseCdn;
+        options.CdnBaseUrl = _resourceOptions.CdnBaseUrl;
+        options.AppendVersion = _resourceOptions.AppendVersion;
+        options.ContentBasePath = _pathBase.Value;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Resources/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Resources/Startup.cs
index cb6cdb4e6d4..85dfe85272b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Resources/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Resources/Startup.cs
@@ -7,36 +7,35 @@
 using OrchardCore.Resources.Liquid;
 using OrchardCore.Resources.Services;
 
-namespace OrchardCore.Resources
+namespace OrchardCore.Resources;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
-    {
-        private readonly IShellConfiguration _shellConfiguration;
+    private readonly IShellConfiguration _shellConfiguration;
 
-        public Startup(IShellConfiguration shellConfiguration)
-        {
-            _shellConfiguration = shellConfiguration;
-        }
+    public Startup(IShellConfiguration shellConfiguration)
+    {
+        _shellConfiguration = shellConfiguration;
+    }
 
-        public override void ConfigureServices(IServiceCollection serviceCollection)
+    public override void ConfigureServices(IServiceCollection serviceCollection)
+    {
+        serviceCollection.Configure<LiquidViewOptions>(o =>
         {
-            serviceCollection.Configure<LiquidViewOptions>(o =>
-            {
-                o.LiquidViewParserConfiguration.Add(parser => parser.RegisterParserTag("meta", parser.ArgumentsListParser, MetaTag.WriteToAsync));
-                o.LiquidViewParserConfiguration.Add(parser => parser.RegisterParserTag("link", parser.ArgumentsListParser, LinkTag.WriteToAsync));
-                o.LiquidViewParserConfiguration.Add(parser => parser.RegisterParserTag("script", parser.ArgumentsListParser, ScriptTag.WriteToAsync));
-                o.LiquidViewParserConfiguration.Add(parser => parser.RegisterParserTag("style", parser.ArgumentsListParser, StyleTag.WriteToAsync));
-                o.LiquidViewParserConfiguration.Add(parser => parser.RegisterParserTag("resources", parser.ArgumentsListParser, ResourcesTag.WriteToAsync));
-                o.LiquidViewParserConfiguration.Add(parser => parser.RegisterParserBlock("scriptblock", parser.ArgumentsListParser, ScriptBlock.WriteToAsync));
-                o.LiquidViewParserConfiguration.Add(parser => parser.RegisterParserBlock("styleblock", parser.ArgumentsListParser, StyleBlock.WriteToAsync));
-            });
+            o.LiquidViewParserConfiguration.Add(parser => parser.RegisterParserTag("meta", parser.ArgumentsListParser, MetaTag.WriteToAsync));
+            o.LiquidViewParserConfiguration.Add(parser => parser.RegisterParserTag("link", parser.ArgumentsListParser, LinkTag.WriteToAsync));
+            o.LiquidViewParserConfiguration.Add(parser => parser.RegisterParserTag("script", parser.ArgumentsListParser, ScriptTag.WriteToAsync));
+            o.LiquidViewParserConfiguration.Add(parser => parser.RegisterParserTag("style", parser.ArgumentsListParser, StyleTag.WriteToAsync));
+            o.LiquidViewParserConfiguration.Add(parser => parser.RegisterParserTag("resources", parser.ArgumentsListParser, ResourcesTag.WriteToAsync));
+            o.LiquidViewParserConfiguration.Add(parser => parser.RegisterParserBlock("scriptblock", parser.ArgumentsListParser, ScriptBlock.WriteToAsync));
+            o.LiquidViewParserConfiguration.Add(parser => parser.RegisterParserBlock("styleblock", parser.ArgumentsListParser, StyleBlock.WriteToAsync));
+        });
 
-            serviceCollection.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
+        serviceCollection.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
 
-            var resourceConfiguration = _shellConfiguration.GetSection("OrchardCore_Resources");
-            serviceCollection.Configure<ResourceOptions>(resourceConfiguration);
+        var resourceConfiguration = _shellConfiguration.GetSection("OrchardCore_Resources");
+        serviceCollection.Configure<ResourceOptions>(resourceConfiguration);
 
-            serviceCollection.AddScoped<IResourcesTagHelperProcessor, ResourcesTagHelperProcessor>();
-        }
+        serviceCollection.AddScoped<IResourcesTagHelperProcessor, ResourcesTagHelperProcessor>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ResponseCompression/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ResponseCompression/Startup.cs
index 0b03e28a9fc..d8a37564d32 100644
--- a/src/OrchardCore.Modules/OrchardCore.ResponseCompression/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ResponseCompression/Startup.cs
@@ -4,20 +4,19 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ResponseCompression
+namespace OrchardCore.ResponseCompression;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
-    {
-        public override int Order => -5;
+    public override int Order => -5;
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            app.UseResponseCompression();
-        }
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        app.UseResponseCompression();
+    }
 
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddResponseCompression(options => options.EnableForHttps = true);
-        }
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddResponseCompression(options => options.EnableForHttps = true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs
index ff9ba235152..d15bcdd1dd8 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs
@@ -4,44 +4,43 @@
 using OrchardCore.Navigation;
 using OrchardCore.ReverseProxy.Drivers;
 
-namespace OrchardCore.ReverseProxy
+namespace OrchardCore.ReverseProxy;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", ReverseProxySettingsDisplayDriver.GroupId},
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", ReverseProxySettingsDisplayDriver.GroupId},
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
-        {
-            S = localizer;
-        }
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["Settings"], settings => settings
-                        .Add(S["Reverse Proxy"], S["Reverse Proxy"].PrefixPosition(), entry => entry
-                        .AddClass("reverseproxy")
-                        .Id("reverseproxy")
-                            .Action("Index", "Admin", _routeValues)
-                            .Permission(Permissions.ManageReverseProxySettings)
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["Settings"], settings => settings
+                    .Add(S["Reverse Proxy"], S["Reverse Proxy"].PrefixPosition(), entry => entry
+                    .AddClass("reverseproxy")
+                    .Id("reverseproxy")
+                        .Action("Index", "Admin", _routeValues)
+                        .Permission(Permissions.ManageReverseProxySettings)
+                        .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Drivers/ReverseProxySettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Drivers/ReverseProxySettingsDisplayDriver.cs
index f092529334e..96c262cfa83 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Drivers/ReverseProxySettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Drivers/ReverseProxySettingsDisplayDriver.cs
@@ -10,82 +10,81 @@
 using OrchardCore.ReverseProxy.ViewModels;
 using OrchardCore.Settings;
 
-namespace OrchardCore.ReverseProxy.Drivers
+namespace OrchardCore.ReverseProxy.Drivers;
+
+public sealed class ReverseProxySettingsDisplayDriver : SiteDisplayDriver<ReverseProxySettings>
 {
-    public sealed class ReverseProxySettingsDisplayDriver : SiteDisplayDriver<ReverseProxySettings>
+    public const string GroupId = "ReverseProxy";
+
+    private readonly IShellReleaseManager _shellReleaseManager;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+
+    public ReverseProxySettingsDisplayDriver(
+        IShellReleaseManager shellReleaseManager,
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService)
     {
-        public const string GroupId = "ReverseProxy";
+        _shellReleaseManager = shellReleaseManager;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
+
+    protected override string SettingsGroupId
+        => GroupId;
 
-        private readonly IShellReleaseManager _shellReleaseManager;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+    public override async Task<IDisplayResult> EditAsync(ISite site, ReverseProxySettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-        public ReverseProxySettingsDisplayDriver(
-            IShellReleaseManager shellReleaseManager,
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService)
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageReverseProxySettings))
         {
-            _shellReleaseManager = shellReleaseManager;
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
+            return null;
         }
 
-        protected override string SettingsGroupId
-            => GroupId;
+        context.AddTenantReloadWarningWrapper();
 
-        public override async Task<IDisplayResult> EditAsync(ISite site, ReverseProxySettings settings, BuildEditorContext context)
+        return Initialize<ReverseProxySettingsViewModel>("ReverseProxySettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageReverseProxySettings))
-            {
-                return null;
-            }
-
-            context.AddTenantReloadWarningWrapper();
-
-            return Initialize<ReverseProxySettingsViewModel>("ReverseProxySettings_Edit", model =>
-            {
-                model.EnableXForwardedFor = settings.ForwardedHeaders.HasFlag(ForwardedHeaders.XForwardedFor);
-                model.EnableXForwardedHost = settings.ForwardedHeaders.HasFlag(ForwardedHeaders.XForwardedHost);
-                model.EnableXForwardedProto = settings.ForwardedHeaders.HasFlag(ForwardedHeaders.XForwardedProto);
-            }).Location("Content:2")
-            .OnGroup(SettingsGroupId);
-        }
+            model.EnableXForwardedFor = settings.ForwardedHeaders.HasFlag(ForwardedHeaders.XForwardedFor);
+            model.EnableXForwardedHost = settings.ForwardedHeaders.HasFlag(ForwardedHeaders.XForwardedHost);
+            model.EnableXForwardedProto = settings.ForwardedHeaders.HasFlag(ForwardedHeaders.XForwardedProto);
+        }).Location("Content:2")
+        .OnGroup(SettingsGroupId);
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, ReverseProxySettings settings, UpdateEditorContext context)
-        {
-            var user = _httpContextAccessor.HttpContext?.User;
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, ReverseProxySettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageReverseProxySettings))
-            {
-                return null;
-            }
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageReverseProxySettings))
+        {
+            return null;
+        }
 
-            var model = new ReverseProxySettingsViewModel();
+        var model = new ReverseProxySettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            settings.ForwardedHeaders = ForwardedHeaders.None;
+        settings.ForwardedHeaders = ForwardedHeaders.None;
 
-            if (model.EnableXForwardedFor)
-            {
-                settings.ForwardedHeaders |= ForwardedHeaders.XForwardedFor;
-            }
+        if (model.EnableXForwardedFor)
+        {
+            settings.ForwardedHeaders |= ForwardedHeaders.XForwardedFor;
+        }
 
-            if (model.EnableXForwardedHost)
-            {
-                settings.ForwardedHeaders |= ForwardedHeaders.XForwardedHost;
-            }
+        if (model.EnableXForwardedHost)
+        {
+            settings.ForwardedHeaders |= ForwardedHeaders.XForwardedHost;
+        }
 
-            if (model.EnableXForwardedProto)
-            {
-                settings.ForwardedHeaders |= ForwardedHeaders.XForwardedProto;
-            }
+        if (model.EnableXForwardedProto)
+        {
+            settings.ForwardedHeaders |= ForwardedHeaders.XForwardedProto;
+        }
 
-            _shellReleaseManager.RequestRelease();
+        _shellReleaseManager.RequestRelease();
 
-            return await EditAsync(site, settings, context);
-        }
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Extensions/OrchardCoreBuilderExtensions.cs b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Extensions/OrchardCoreBuilderExtensions.cs
index bfa6e78e732..fd3665f6768 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Extensions/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Extensions/OrchardCoreBuilderExtensions.cs
@@ -2,20 +2,19 @@
 using OrchardCore.Environment.Shell.Configuration;
 using OrchardCore.ReverseProxy.Settings;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class OrchardCoreBuilderExtensions
 {
-    public static class OrchardCoreBuilderExtensions
+    public static OrchardCoreBuilder ConfigureReverseProxySettings(this OrchardCoreBuilder builder)
     {
-        public static OrchardCoreBuilder ConfigureReverseProxySettings(this OrchardCoreBuilder builder)
+        builder.ConfigureServices((tenantServices, serviceProvider) =>
         {
-            builder.ConfigureServices((tenantServices, serviceProvider) =>
-            {
-                var configurationSection = serviceProvider.GetRequiredService<IShellConfiguration>().GetSection("OrchardCore_ReverseProxy");
+            var configurationSection = serviceProvider.GetRequiredService<IShellConfiguration>().GetSection("OrchardCore_ReverseProxy");
 
-                tenantServices.PostConfigure<ReverseProxySettings>(settings => configurationSection.Bind(settings));
-            });
+            tenantServices.PostConfigure<ReverseProxySettings>(settings => configurationSection.Bind(settings));
+        });
 
-            return builder;
-        }
+        return builder;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Services/ForwardedHeadersOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Services/ForwardedHeadersOptionsConfiguration.cs
index d79a0ebeead..abcfa690dba 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Services/ForwardedHeadersOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Services/ForwardedHeadersOptionsConfiguration.cs
@@ -1,25 +1,24 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.ReverseProxy.Services
+namespace OrchardCore.ReverseProxy.Services;
+
+public sealed class ForwardedHeadersOptionsConfiguration : IConfigureOptions<ForwardedHeadersOptions>
 {
-    public sealed class ForwardedHeadersOptionsConfiguration : IConfigureOptions<ForwardedHeadersOptions>
-    {
-        private readonly ReverseProxyService _reverseProxyService;
+    private readonly ReverseProxyService _reverseProxyService;
 
-        public ForwardedHeadersOptionsConfiguration(ReverseProxyService reverseProxyService)
-        {
-            _reverseProxyService = reverseProxyService;
-        }
+    public ForwardedHeadersOptionsConfiguration(ReverseProxyService reverseProxyService)
+    {
+        _reverseProxyService = reverseProxyService;
+    }
 
-        public void Configure(ForwardedHeadersOptions options)
-        {
-            var reverseProxySettings = _reverseProxyService.GetSettingsAsync().GetAwaiter().GetResult();
-            options.ForwardedHeaders = reverseProxySettings.ForwardedHeaders;
+    public void Configure(ForwardedHeadersOptions options)
+    {
+        var reverseProxySettings = _reverseProxyService.GetSettingsAsync().GetAwaiter().GetResult();
+        options.ForwardedHeaders = reverseProxySettings.ForwardedHeaders;
 
-            // later we can add known networks and know proxies, for now we accept all
-            options.KnownNetworks.Clear();
-            options.KnownProxies.Clear();
-        }
+        // later we can add known networks and know proxies, for now we accept all
+        options.KnownNetworks.Clear();
+        options.KnownProxies.Clear();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Services/ReverseProxyService.cs b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Services/ReverseProxyService.cs
index 69e16baa3ca..fbd73e94cef 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Services/ReverseProxyService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Services/ReverseProxyService.cs
@@ -2,18 +2,17 @@
 using OrchardCore.ReverseProxy.Settings;
 using OrchardCore.Settings;
 
-namespace OrchardCore.ReverseProxy.Services
-{
-    public class ReverseProxyService
-    {
-        private readonly ISiteService _siteService;
+namespace OrchardCore.ReverseProxy.Services;
 
-        public ReverseProxyService(ISiteService siteService)
-        {
-            _siteService = siteService;
-        }
+public class ReverseProxyService
+{
+    private readonly ISiteService _siteService;
 
-        public Task<ReverseProxySettings> GetSettingsAsync()
-            => _siteService.GetSettingsAsync<ReverseProxySettings>();
+    public ReverseProxyService(ISiteService siteService)
+    {
+        _siteService = siteService;
     }
+
+    public Task<ReverseProxySettings> GetSettingsAsync()
+        => _siteService.GetSettingsAsync<ReverseProxySettings>();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Settings/ReverseProxySettings.cs b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Settings/ReverseProxySettings.cs
index 82593ede6bc..f4e1097d921 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Settings/ReverseProxySettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Settings/ReverseProxySettings.cs
@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.HttpOverrides;
 
-namespace OrchardCore.ReverseProxy.Settings
+namespace OrchardCore.ReverseProxy.Settings;
+
+public class ReverseProxySettings
 {
-    public class ReverseProxySettings
-    {
-        public ForwardedHeaders ForwardedHeaders { get; set; }
-    }
+    public ForwardedHeaders ForwardedHeaders { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Startup.cs
index f709971fd15..bf61dd99d23 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Startup.cs
@@ -14,37 +14,36 @@
 using OrchardCore.Settings;
 using OrchardCore.Settings.Deployment;
 
-namespace OrchardCore.ReverseProxy
+namespace OrchardCore.ReverseProxy;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
-    {
-        public override int Order
-            => OrchardCoreConstants.ConfigureOrder.ReverseProxy;
+    public override int Order
+        => OrchardCoreConstants.ConfigureOrder.ReverseProxy;
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            app.UseForwardedHeaders();
-        }
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        app.UseForwardedHeaders();
+    }
 
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<IDisplayDriver<ISite>, ReverseProxySettingsDisplayDriver>();
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<IDisplayDriver<ISite>, ReverseProxySettingsDisplayDriver>();
 
-            services.AddSingleton<ReverseProxyService>();
+        services.AddSingleton<ReverseProxyService>();
 
-            services.TryAddEnumerable(ServiceDescriptor
-                .Transient<IConfigureOptions<ForwardedHeadersOptions>, ForwardedHeadersOptionsConfiguration>());
-        }
+        services.TryAddEnumerable(ServiceDescriptor
+            .Transient<IConfigureOptions<ForwardedHeadersOptions>, ForwardedHeadersOptionsConfiguration>());
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class DeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class DeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSiteSettingsPropertyDeploymentStep<ReverseProxySettings, DeploymentStartup>(S => S["Reverse Proxy settings"], S => S["Exports the Reverse Proxy settings."]);
-        }
+        services.AddSiteSettingsPropertyDeploymentStep<ReverseProxySettings, DeploymentStartup>(S => S["Reverse Proxy settings"], S => S["Exports the Reverse Proxy settings."]);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/ViewModels/ReverseProxySettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/ViewModels/ReverseProxySettingsViewModel.cs
index bb7c93fc822..a578523f882 100644
--- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/ViewModels/ReverseProxySettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/ViewModels/ReverseProxySettingsViewModel.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.ReverseProxy.ViewModels
+namespace OrchardCore.ReverseProxy.ViewModels;
+
+public class ReverseProxySettingsViewModel
 {
-    public class ReverseProxySettingsViewModel
-    {
-        public bool EnableXForwardedFor { get; set; }
+    public bool EnableXForwardedFor { get; set; }
 
-        public bool EnableXForwardedProto { get; set; }
+    public bool EnableXForwardedProto { get; set; }
 
-        public bool EnableXForwardedHost { get; set; }
-    }
+    public bool EnableXForwardedHost { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Roles/AdminMenu.cs
index 3a884cc4729..bed37dd4b12 100644
--- a/src/OrchardCore.Modules/OrchardCore.Roles/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Roles/AdminMenu.cs
@@ -2,35 +2,34 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Roles
+namespace OrchardCore.Roles;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    internal readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Security"], security => security
-                    .Add(S["Roles"], S["Roles"].PrefixPosition(), roles => roles
-                        .AddClass("roles").Id("roles")
-                        .Action("Index", "Admin", "OrchardCore.Roles")
-                        .Permission(CommonPermissions.ManageRoles)
-                        .LocalNav()
-                    )
-                );
+        builder
+            .Add(S["Security"], security => security
+                .Add(S["Roles"], S["Roles"].PrefixPosition(), roles => roles
+                    .AddClass("roles").Id("roles")
+                    .Action("Index", "Admin", "OrchardCore.Roles")
+                    .Permission(CommonPermissions.ManageRoles)
+                    .LocalNav()
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Roles/Controllers/AdminController.cs
index 2eec27f675d..cccc10ca69a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Roles/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Roles/Controllers/AdminController.cs
@@ -19,300 +19,299 @@
 using OrchardCore.Security.Permissions;
 using OrchardCore.Security.Services;
 
-namespace OrchardCore.Roles.Controllers
+namespace OrchardCore.Roles.Controllers;
+
+[Admin("Roles/{action}/{id?}", "Roles{action}")]
+public class AdminController : Controller
 {
-    [Admin("Roles/{action}/{id?}", "Roles{action}")]
-    public class AdminController : Controller
+    private readonly IDocumentStore _documentStore;
+    private readonly RoleManager<IRole> _roleManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IEnumerable<IPermissionProvider> _permissionProviders;
+    private readonly ITypeFeatureProvider _typeFeatureProvider;
+    private readonly IShellFeaturesManager _shellFeaturesManager;
+    private readonly IRoleService _roleService;
+    private readonly INotifier _notifier;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public AdminController(
+        IDocumentStore documentStore,
+        RoleManager<IRole> roleManager,
+        IAuthorizationService authorizationService,
+        IEnumerable<IPermissionProvider> permissionProviders,
+        ITypeFeatureProvider typeFeatureProvider,
+        IShellFeaturesManager shellFeaturesManager,
+        IRoleService roleService,
+        INotifier notifier,
+        IStringLocalizer<AdminController> stringLocalizer,
+        IHtmlLocalizer<AdminController> htmlLocalizer)
+    {
+        _documentStore = documentStore;
+        _roleManager = roleManager;
+        _authorizationService = authorizationService;
+        _permissionProviders = permissionProviders;
+        _typeFeatureProvider = typeFeatureProvider;
+        _shellFeaturesManager = shellFeaturesManager;
+        _roleService = roleService;
+        _notifier = notifier;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+    }
+
+    public async Task<ActionResult> Index()
     {
-        private readonly IDocumentStore _documentStore;
-        private readonly RoleManager<IRole> _roleManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IEnumerable<IPermissionProvider> _permissionProviders;
-        private readonly ITypeFeatureProvider _typeFeatureProvider;
-        private readonly IShellFeaturesManager _shellFeaturesManager;
-        private readonly IRoleService _roleService;
-        private readonly INotifier _notifier;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public AdminController(
-            IDocumentStore documentStore,
-            RoleManager<IRole> roleManager,
-            IAuthorizationService authorizationService,
-            IEnumerable<IPermissionProvider> permissionProviders,
-            ITypeFeatureProvider typeFeatureProvider,
-            IShellFeaturesManager shellFeaturesManager,
-            IRoleService roleService,
-            INotifier notifier,
-            IStringLocalizer<AdminController> stringLocalizer,
-            IHtmlLocalizer<AdminController> htmlLocalizer)
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageRoles))
         {
-            _documentStore = documentStore;
-            _roleManager = roleManager;
-            _authorizationService = authorizationService;
-            _permissionProviders = permissionProviders;
-            _typeFeatureProvider = typeFeatureProvider;
-            _shellFeaturesManager = shellFeaturesManager;
-            _roleService = roleService;
-            _notifier = notifier;
-            S = stringLocalizer;
-            H = htmlLocalizer;
+            return Forbid();
         }
 
-        public async Task<ActionResult> Index()
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageRoles))
-            {
-                return Forbid();
-            }
+        var roles = await _roleService.GetRolesAsync();
 
-            var roles = await _roleService.GetRolesAsync();
+        var model = new RolesViewModel
+        {
+            RoleEntries = roles.Select(BuildRoleEntry).ToList()
+        };
 
-            var model = new RolesViewModel
-            {
-                RoleEntries = roles.Select(BuildRoleEntry).ToList()
-            };
+        return View(model);
+    }
 
-            return View(model);
+    public async Task<IActionResult> Create()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageRoles))
+        {
+            return Forbid();
         }
 
-        public async Task<IActionResult> Create()
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageRoles))
-            {
-                return Forbid();
-            }
+        var model = new CreateRoleViewModel();
 
-            var model = new CreateRoleViewModel();
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost]
+    public async Task<IActionResult> Create(CreateRoleViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageRoles))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Create(CreateRoleViewModel model)
+        if (ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageRoles))
-            {
-                return Forbid();
-            }
+            model.RoleName = model.RoleName.Trim();
 
-            if (ModelState.IsValid)
+            if (model.RoleName.Contains('/'))
             {
-                model.RoleName = model.RoleName.Trim();
-
-                if (model.RoleName.Contains('/'))
-                {
-                    ModelState.AddModelError(string.Empty, S["Invalid role name."]);
-                }
-
-                if (await _roleManager.FindByNameAsync(_roleManager.NormalizeKey(model.RoleName)) != null)
-                {
-                    ModelState.AddModelError(string.Empty, S["The role is already used."]);
-                }
+                ModelState.AddModelError(string.Empty, S["Invalid role name."]);
             }
 
-            if (ModelState.IsValid)
+            if (await _roleManager.FindByNameAsync(_roleManager.NormalizeKey(model.RoleName)) != null)
             {
-                var role = new Role { RoleName = model.RoleName, RoleDescription = model.RoleDescription };
-                var result = await _roleManager.CreateAsync(role);
-                if (result.Succeeded)
-                {
-                    await _notifier.SuccessAsync(H["Role created successfully."]);
-                    return RedirectToAction(nameof(Index));
-                }
-
-                await _documentStore.CancelAsync();
-
-                foreach (var error in result.Errors)
-                {
-                    ModelState.AddModelError(string.Empty, error.Description);
-                }
+                ModelState.AddModelError(string.Empty, S["The role is already used."]);
             }
-
-            // If we got this far, something failed, redisplay form
-            return View(model);
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(string id)
+        if (ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageRoles))
+            var role = new Role { RoleName = model.RoleName, RoleDescription = model.RoleDescription };
+            var result = await _roleManager.CreateAsync(role);
+            if (result.Succeeded)
             {
-                return Forbid();
+                await _notifier.SuccessAsync(H["Role created successfully."]);
+                return RedirectToAction(nameof(Index));
             }
 
-            var currentRole = await _roleManager.FindByIdAsync(id);
+            await _documentStore.CancelAsync();
 
-            if (currentRole == null)
+            foreach (var error in result.Errors)
             {
-                return NotFound();
+                ModelState.AddModelError(string.Empty, error.Description);
             }
+        }
 
-            var result = await _roleManager.DeleteAsync(currentRole);
-
-            if (result.Succeeded)
-            {
-                await _notifier.SuccessAsync(H["Role deleted successfully."]);
-            }
-            else
-            {
-                await _documentStore.CancelAsync();
+        // If we got this far, something failed, redisplay form
+        return View(model);
+    }
 
-                await _notifier.ErrorAsync(H["Could not delete this role."]);
+    [HttpPost]
+    public async Task<IActionResult> Delete(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageRoles))
+        {
+            return Forbid();
+        }
 
-                foreach (var error in result.Errors)
-                {
-                    await _notifier.ErrorAsync(H[error.Description]);
-                }
-            }
+        var currentRole = await _roleManager.FindByIdAsync(id);
 
-            return RedirectToAction(nameof(Index));
+        if (currentRole == null)
+        {
+            return NotFound();
         }
 
-        public async Task<IActionResult> Edit(string id)
+        var result = await _roleManager.DeleteAsync(currentRole);
+
+        if (result.Succeeded)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageRoles))
-            {
-                return Forbid();
-            }
+            await _notifier.SuccessAsync(H["Role deleted successfully."]);
+        }
+        else
+        {
+            await _documentStore.CancelAsync();
+
+            await _notifier.ErrorAsync(H["Could not delete this role."]);
 
-            if (await _roleManager.FindByNameAsync(_roleManager.NormalizeKey(id)) is not Role role)
+            foreach (var error in result.Errors)
             {
-                return NotFound();
+                await _notifier.ErrorAsync(H[error.Description]);
             }
+        }
 
-            var installedPermissions = await GetInstalledPermissionsAsync();
-            var allPermissions = installedPermissions.SelectMany(x => x.Value);
+        return RedirectToAction(nameof(Index));
+    }
 
-            var model = new EditRoleViewModel
-            {
-                Role = role,
-                Name = role.RoleName,
-                RoleDescription = role.RoleDescription,
-                EffectivePermissions = await GetEffectivePermissions(role, allPermissions),
-                RoleCategoryPermissions = installedPermissions
-            };
-
-            return View(model);
+    public async Task<IActionResult> Edit(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageRoles))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName(nameof(Edit))]
-        public async Task<IActionResult> EditPost(string id, string roleDescription)
+        if (await _roleManager.FindByNameAsync(_roleManager.NormalizeKey(id)) is not Role role)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageRoles))
-            {
-                return Forbid();
-            }
+            return NotFound();
+        }
 
-            if (await _roleManager.FindByNameAsync(_roleManager.NormalizeKey(id)) is not Role role)
-            {
-                return NotFound();
-            }
+        var installedPermissions = await GetInstalledPermissionsAsync();
+        var allPermissions = installedPermissions.SelectMany(x => x.Value);
 
-            role.RoleDescription = roleDescription;
+        var model = new EditRoleViewModel
+        {
+            Role = role,
+            Name = role.RoleName,
+            RoleDescription = role.RoleDescription,
+            EffectivePermissions = await GetEffectivePermissions(role, allPermissions),
+            RoleCategoryPermissions = installedPermissions
+        };
+
+        return View(model);
+    }
 
-            // Save.
-            var rolePermissions = new List<RoleClaim>();
-            foreach (var key in Request.Form.Keys)
+    [HttpPost, ActionName(nameof(Edit))]
+    public async Task<IActionResult> EditPost(string id, string roleDescription)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ManageRoles))
+        {
+            return Forbid();
+        }
+
+        if (await _roleManager.FindByNameAsync(_roleManager.NormalizeKey(id)) is not Role role)
+        {
+            return NotFound();
+        }
+
+        role.RoleDescription = roleDescription;
+
+        // Save.
+        var rolePermissions = new List<RoleClaim>();
+        foreach (var key in Request.Form.Keys)
+        {
+            if (key.StartsWith("Checkbox.", StringComparison.Ordinal) && Request.Form[key] == "true")
             {
-                if (key.StartsWith("Checkbox.", StringComparison.Ordinal) && Request.Form[key] == "true")
-                {
-                    var permissionName = key["Checkbox.".Length..];
-                    rolePermissions.Add(new RoleClaim { ClaimType = Permission.ClaimType, ClaimValue = permissionName });
-                }
+                var permissionName = key["Checkbox.".Length..];
+                rolePermissions.Add(new RoleClaim { ClaimType = Permission.ClaimType, ClaimValue = permissionName });
             }
+        }
 
-            role.RoleClaims.RemoveAll(c => c.ClaimType == Permission.ClaimType);
-            role.RoleClaims.AddRange(rolePermissions);
+        role.RoleClaims.RemoveAll(c => c.ClaimType == Permission.ClaimType);
+        role.RoleClaims.AddRange(rolePermissions);
 
-            await _roleManager.UpdateAsync(role);
+        await _roleManager.UpdateAsync(role);
 
-            await _notifier.SuccessAsync(H["Role updated successfully."]);
+        await _notifier.SuccessAsync(H["Role updated successfully."]);
 
-            return RedirectToAction(nameof(Index));
-        }
+        return RedirectToAction(nameof(Index));
+    }
 
-        private RoleEntry BuildRoleEntry(IRole role)
+    private RoleEntry BuildRoleEntry(IRole role)
+    {
+        return new RoleEntry
         {
-            return new RoleEntry
-            {
-                Name = role.RoleName,
-                Description = role.RoleDescription,
-                Selected = false
-            };
-        }
+            Name = role.RoleName,
+            Description = role.RoleDescription,
+            Selected = false
+        };
+    }
+
+    private async Task<IDictionary<PermissionGroupKey, IEnumerable<Permission>>> GetInstalledPermissionsAsync()
+    {
+        var installedPermissions = new Dictionary<PermissionGroupKey, IEnumerable<Permission>>();
+        var enabledFeatures = await _shellFeaturesManager.GetEnabledFeaturesAsync();
 
-        private async Task<IDictionary<PermissionGroupKey, IEnumerable<Permission>>> GetInstalledPermissionsAsync()
+        foreach (var permissionProvider in _permissionProviders)
         {
-            var installedPermissions = new Dictionary<PermissionGroupKey, IEnumerable<Permission>>();
-            var enabledFeatures = await _shellFeaturesManager.GetEnabledFeaturesAsync();
+            // Two features could use the same permission.
+            var feature = _typeFeatureProvider
+                .GetFeaturesForDependency(permissionProvider.GetType())
+                .LastOrDefault(feature => enabledFeatures.Any(enabledFeature => feature.Id == enabledFeature.Id));
 
-            foreach (var permissionProvider in _permissionProviders)
-            {
-                // Two features could use the same permission.
-                var feature = _typeFeatureProvider
-                    .GetFeaturesForDependency(permissionProvider.GetType())
-                    .LastOrDefault(feature => enabledFeatures.Any(enabledFeature => feature.Id == enabledFeature.Id));
+            var permissions = await permissionProvider.GetPermissionsAsync();
 
-                var permissions = await permissionProvider.GetPermissionsAsync();
+            foreach (var permission in permissions)
+            {
+                var groupKey = GetGroupKey(feature, permission.Category);
 
-                foreach (var permission in permissions)
+                if (installedPermissions.TryGetValue(groupKey, out var value))
                 {
-                    var groupKey = GetGroupKey(feature, permission.Category);
-
-                    if (installedPermissions.TryGetValue(groupKey, out var value))
-                    {
-                        installedPermissions[groupKey] = value.Concat(new[] { permission });
+                    installedPermissions[groupKey] = value.Concat(new[] { permission });
 
-                        continue;
-                    }
-
-                    installedPermissions.Add(groupKey, new[] { permission });
+                    continue;
                 }
-            }
-
-            return installedPermissions;
-        }
 
-        private PermissionGroupKey GetGroupKey(IFeatureInfo feature, string category)
-        {
-            if (!string.IsNullOrWhiteSpace(category))
-            {
-                return new PermissionGroupKey(category, category);
+                installedPermissions.Add(groupKey, new[] { permission });
             }
+        }
 
-            var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+        return installedPermissions;
+    }
 
-            return new PermissionGroupKey(feature.Id, title)
-            {
-                Source = feature.Id,
-            };
+    private PermissionGroupKey GetGroupKey(IFeatureInfo feature, string category)
+    {
+        if (!string.IsNullOrWhiteSpace(category))
+        {
+            return new PermissionGroupKey(category, category);
         }
 
-        private async Task<IEnumerable<string>> GetEffectivePermissions(Role role, IEnumerable<Permission> allPermissions)
+        var title = string.IsNullOrWhiteSpace(feature.Name) ? S["{0} Feature", feature.Id] : feature.Name;
+
+        return new PermissionGroupKey(feature.Id, title)
         {
-            // Create a fake user to check the actual permissions. If the role is anonymous
-            // IsAuthenticated needs to be false.
-            var fakeIdentity = new ClaimsIdentity([new Claim(ClaimTypes.Role, role.RoleName)],
-                !string.Equals(role.RoleName, OrchardCoreConstants.Roles.Anonymous, StringComparison.OrdinalIgnoreCase) ? "FakeAuthenticationType" : null);
+            Source = feature.Id,
+        };
+    }
 
-            // Add role claims
-            fakeIdentity.AddClaims(role.RoleClaims.Select(c => c.ToClaim()));
+    private async Task<IEnumerable<string>> GetEffectivePermissions(Role role, IEnumerable<Permission> allPermissions)
+    {
+        // Create a fake user to check the actual permissions. If the role is anonymous
+        // IsAuthenticated needs to be false.
+        var fakeIdentity = new ClaimsIdentity([new Claim(ClaimTypes.Role, role.RoleName)],
+            !string.Equals(role.RoleName, OrchardCoreConstants.Roles.Anonymous, StringComparison.OrdinalIgnoreCase) ? "FakeAuthenticationType" : null);
 
-            var fakePrincipal = new ClaimsPrincipal(fakeIdentity);
+        // Add role claims
+        fakeIdentity.AddClaims(role.RoleClaims.Select(c => c.ToClaim()));
 
-            var result = new List<string>();
+        var fakePrincipal = new ClaimsPrincipal(fakeIdentity);
 
-            foreach (var permission in allPermissions)
+        var result = new List<string>();
+
+        foreach (var permission in allPermissions)
+        {
+            if (await _authorizationService.AuthorizeAsync(fakePrincipal, permission))
             {
-                if (await _authorizationService.AuthorizeAsync(fakePrincipal, permission))
-                {
-                    result.Add(permission.Name);
-                }
+                result.Add(permission.Name);
             }
-
-            return result;
         }
+
+        return result;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/Deployment/AllRolesDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Roles/Deployment/AllRolesDeploymentSource.cs
index 49a769415fa..b2ca3281b07 100644
--- a/src/OrchardCore.Modules/OrchardCore.Roles/Deployment/AllRolesDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Roles/Deployment/AllRolesDeploymentSource.cs
@@ -9,56 +9,55 @@
 using OrchardCore.Security.Permissions;
 using OrchardCore.Security.Services;
 
-namespace OrchardCore.Roles.Deployment
+namespace OrchardCore.Roles.Deployment;
+
+public class AllRolesDeploymentSource : IDeploymentSource
 {
-    public class AllRolesDeploymentSource : IDeploymentSource
+    private readonly RoleManager<IRole> _roleManager;
+    private readonly IRoleService _roleService;
+
+    public AllRolesDeploymentSource(
+        RoleManager<IRole> roleManager,
+        IRoleService roleService)
+    {
+        _roleManager = roleManager;
+        _roleService = roleService;
+    }
+
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
     {
-        private readonly RoleManager<IRole> _roleManager;
-        private readonly IRoleService _roleService;
+        var allRolesStep = step as AllRolesDeploymentStep;
 
-        public AllRolesDeploymentSource(
-            RoleManager<IRole> roleManager,
-            IRoleService roleService)
+        if (allRolesStep == null)
         {
-            _roleManager = roleManager;
-            _roleService = roleService;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
-        {
-            var allRolesStep = step as AllRolesDeploymentStep;
+        // Get all roles
+        var allRoles = await _roleService.GetRolesAsync();
+        var permissions = new JsonArray();
+        var tasks = new List<Task>();
 
-            if (allRolesStep == null)
-            {
-                return;
-            }
-
-            // Get all roles
-            var allRoles = await _roleService.GetRolesAsync();
-            var permissions = new JsonArray();
-            var tasks = new List<Task>();
+        foreach (var role in allRoles)
+        {
+            var currentRole = (Role)await _roleManager.FindByNameAsync(_roleManager.NormalizeKey(role.RoleName));
 
-            foreach (var role in allRoles)
+            if (currentRole != null)
             {
-                var currentRole = (Role)await _roleManager.FindByNameAsync(_roleManager.NormalizeKey(role.RoleName));
-
-                if (currentRole != null)
-                {
-                    permissions.Add(JObject.FromObject(
-                        new RolesStepRoleModel
-                        {
-                            Name = currentRole.RoleName,
-                            Description = currentRole.RoleDescription,
-                            Permissions = currentRole.RoleClaims.Where(x => x.ClaimType == Permission.ClaimType).Select(x => x.ClaimValue).ToArray()
-                        }));
-                }
+                permissions.Add(JObject.FromObject(
+                    new RolesStepRoleModel
+                    {
+                        Name = currentRole.RoleName,
+                        Description = currentRole.RoleDescription,
+                        Permissions = currentRole.RoleClaims.Where(x => x.ClaimType == Permission.ClaimType).Select(x => x.ClaimValue).ToArray()
+                    }));
             }
-
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "Roles",
-                ["Roles"] = permissions,
-            });
         }
+
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "Roles",
+            ["Roles"] = permissions,
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/Deployment/AllRolesDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Roles/Deployment/AllRolesDeploymentStep.cs
index f2a140a5296..d1db4a0c039 100644
--- a/src/OrchardCore.Modules/OrchardCore.Roles/Deployment/AllRolesDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Roles/Deployment/AllRolesDeploymentStep.cs
@@ -1,15 +1,14 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Roles.Deployment
+namespace OrchardCore.Roles.Deployment;
+
+/// <summary>
+/// Adds roles to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class AllRolesDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds roles to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class AllRolesDeploymentStep : DeploymentStep
+    public AllRolesDeploymentStep()
     {
-        public AllRolesDeploymentStep()
-        {
-            Name = "AllRoles";
-        }
+        Name = "AllRoles";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/Deployment/AllRolesDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Roles/Deployment/AllRolesDeploymentStepDriver.cs
index d09e3ec2430..c5e07acf8ca 100644
--- a/src/OrchardCore.Modules/OrchardCore.Roles/Deployment/AllRolesDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Roles/Deployment/AllRolesDeploymentStepDriver.cs
@@ -3,22 +3,21 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Roles.Deployment
+namespace OrchardCore.Roles.Deployment;
+
+public sealed class AllRolesDeploymentStepDriver : DisplayDriver<DeploymentStep, AllRolesDeploymentStep>
 {
-    public sealed class AllRolesDeploymentStepDriver : DisplayDriver<DeploymentStep, AllRolesDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(AllRolesDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(AllRolesDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("AllRolesDeploymentStep_Summary", step).Location("Summary", "Content"),
-                    View("AllRolesDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("AllRolesDeploymentStep_Summary", step).Location("Summary", "Content"),
+                View("AllRolesDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(AllRolesDeploymentStep step, BuildEditorContext context)
-        {
-            return View("AllRolesDeploymentStep_Edit", step).Location("Content");
-        }
+    public override IDisplayResult Edit(AllRolesDeploymentStep step, BuildEditorContext context)
+    {
+        return View("AllRolesDeploymentStep_Edit", step).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/Models/RolesDocument.cs b/src/OrchardCore.Modules/OrchardCore.Roles/Models/RolesDocument.cs
index 286b853cb6f..6fe8229f57a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Roles/Models/RolesDocument.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Roles/Models/RolesDocument.cs
@@ -2,11 +2,10 @@
 using OrchardCore.Data.Documents;
 using OrchardCore.Security;
 
-namespace OrchardCore.Roles.Models
+namespace OrchardCore.Roles.Models;
+
+public class RolesDocument : Document
 {
-    public class RolesDocument : Document
-    {
-        public List<Role> Roles { get; set; } = [];
-        public Dictionary<string, List<string>> MissingFeaturesByRole { get; set; } = [];
-    }
+    public List<Role> Roles { get; set; } = [];
+    public Dictionary<string, List<string>> MissingFeaturesByRole { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/Recipes/RolesStep.cs b/src/OrchardCore.Modules/OrchardCore.Roles/Recipes/RolesStep.cs
index 8488e4fc0d5..0f66ded8ba9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Roles/Recipes/RolesStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Roles/Recipes/RolesStep.cs
@@ -8,76 +8,75 @@
 using OrchardCore.Security;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Roles.Recipes
+namespace OrchardCore.Roles.Recipes;
+
+/// <summary>
+/// This recipe step creates a set of roles.
+/// </summary>
+public sealed class RolesStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step creates a set of roles.
-    /// </summary>
-    public sealed class RolesStep : IRecipeStepHandler
+    private readonly RoleManager<IRole> _roleManager;
+
+    public RolesStep(RoleManager<IRole> roleManager)
     {
-        private readonly RoleManager<IRole> _roleManager;
+        _roleManager = roleManager;
+    }
 
-        public RolesStep(RoleManager<IRole> roleManager)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "Roles", StringComparison.OrdinalIgnoreCase))
         {
-            _roleManager = roleManager;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        var model = context.Step.ToObject<RolesStepModel>();
+
+        foreach (var importedRole in model.Roles)
         {
-            if (!string.Equals(context.Name, "Roles", StringComparison.OrdinalIgnoreCase))
+            if (string.IsNullOrWhiteSpace(importedRole.Name))
             {
-                return;
+                continue;
             }
 
-            var model = context.Step.ToObject<RolesStepModel>();
+            var role = (Role)await _roleManager.FindByNameAsync(importedRole.Name);
+            var isNewRole = role == null;
 
-            foreach (var importedRole in model.Roles)
+            if (isNewRole)
             {
-                if (string.IsNullOrWhiteSpace(importedRole.Name))
-                {
-                    continue;
-                }
-
-                var role = (Role)await _roleManager.FindByNameAsync(importedRole.Name);
-                var isNewRole = role == null;
-
-                if (isNewRole)
+                role = new Role
                 {
-                    role = new Role
-                    {
-                        RoleName = importedRole.Name
-                    };
-                }
+                    RoleName = importedRole.Name
+                };
+            }
 
-                role.RoleDescription = importedRole.Description;
-                role.RoleClaims.RemoveAll(c => c.ClaimType == Permission.ClaimType);
-                role.RoleClaims.AddRange(importedRole.Permissions.Select(p => new RoleClaim
-                {
-                    ClaimType = Permission.ClaimType,
-                    ClaimValue = p,
-                }));
+            role.RoleDescription = importedRole.Description;
+            role.RoleClaims.RemoveAll(c => c.ClaimType == Permission.ClaimType);
+            role.RoleClaims.AddRange(importedRole.Permissions.Select(p => new RoleClaim
+            {
+                ClaimType = Permission.ClaimType,
+                ClaimValue = p,
+            }));
 
-                if (isNewRole)
-                {
-                    await _roleManager.CreateAsync(role);
-                }
-                else
-                {
-                    await _roleManager.UpdateAsync(role);
-                }
+            if (isNewRole)
+            {
+                await _roleManager.CreateAsync(role);
+            }
+            else
+            {
+                await _roleManager.UpdateAsync(role);
             }
         }
     }
+}
 
-    public sealed class RolesStepModel
-    {
-        public RolesStepRoleModel[] Roles { get; set; }
-    }
+public sealed class RolesStepModel
+{
+    public RolesStepRoleModel[] Roles { get; set; }
+}
 
-    public sealed class RolesStepRoleModel
-    {
-        public string Name { get; set; }
-        public string Description { get; set; }
-        public string[] Permissions { get; set; }
-    }
+public sealed class RolesStepRoleModel
+{
+    public string Name { get; set; }
+    public string Description { get; set; }
+    public string[] Permissions { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/Services/RoleStore.cs b/src/OrchardCore.Modules/OrchardCore.Roles/Services/RoleStore.cs
index 8b8ac87027f..3f520e752e1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Roles/Services/RoleStore.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Roles/Services/RoleStore.cs
@@ -13,219 +13,218 @@
 using OrchardCore.Roles.Models;
 using OrchardCore.Security;
 
-namespace OrchardCore.Roles.Services
+namespace OrchardCore.Roles.Services;
+
+public class RoleStore : IRoleClaimStore<IRole>, IQueryableRoleStore<IRole>
 {
-    public class RoleStore : IRoleClaimStore<IRole>, IQueryableRoleStore<IRole>
+    private readonly IServiceProvider _serviceProvider;
+    private readonly IDocumentManager<RolesDocument> _documentManager;
+    protected readonly IStringLocalizer S;
+    private readonly ILogger _logger;
+
+    private bool _updating;
+
+    public RoleStore(
+        IServiceProvider serviceProvider,
+        IDocumentManager<RolesDocument> documentManager,
+        IStringLocalizer<RoleStore> stringLocalizer,
+        ILogger<RoleStore> logger)
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly IDocumentManager<RolesDocument> _documentManager;
-        protected readonly IStringLocalizer S;
-        private readonly ILogger _logger;
+        _serviceProvider = serviceProvider;
+        _documentManager = documentManager;
+        S = stringLocalizer;
+        _logger = logger;
+    }
 
-        private bool _updating;
+    public IQueryable<IRole> Roles => GetRolesAsync().GetAwaiter().GetResult().Roles.AsQueryable();
 
-        public RoleStore(
-            IServiceProvider serviceProvider,
-            IDocumentManager<RolesDocument> documentManager,
-            IStringLocalizer<RoleStore> stringLocalizer,
-            ILogger<RoleStore> logger)
-        {
-            _serviceProvider = serviceProvider;
-            _documentManager = documentManager;
-            S = stringLocalizer;
-            _logger = logger;
-        }
+    /// <summary>
+    /// Loads the roles document from the store for updating and that should not be cached.
+    /// </summary>
+    private Task<RolesDocument> LoadRolesAsync() => _documentManager.GetOrCreateMutableAsync();
 
-        public IQueryable<IRole> Roles => GetRolesAsync().GetAwaiter().GetResult().Roles.AsQueryable();
+    /// <summary>
+    /// Gets the roles document from the cache for sharing and that should not be updated.
+    /// </summary>
+    private Task<RolesDocument> GetRolesAsync() => _documentManager.GetOrCreateImmutableAsync();
 
-        /// <summary>
-        /// Loads the roles document from the store for updating and that should not be cached.
-        /// </summary>
-        private Task<RolesDocument> LoadRolesAsync() => _documentManager.GetOrCreateMutableAsync();
+    /// <summary>
+    /// Updates the store with the provided roles document and then updates the cache.
+    /// </summary>
+    private Task UpdateRolesAsync(RolesDocument roles)
+    {
+        _updating = true;
 
-        /// <summary>
-        /// Gets the roles document from the cache for sharing and that should not be updated.
-        /// </summary>
-        private Task<RolesDocument> GetRolesAsync() => _documentManager.GetOrCreateImmutableAsync();
+        return _documentManager.UpdateAsync(roles);
+    }
 
-        /// <summary>
-        /// Updates the store with the provided roles document and then updates the cache.
-        /// </summary>
-        private Task UpdateRolesAsync(RolesDocument roles)
-        {
-            _updating = true;
+    #region IRoleStore<IRole>
 
-            return _documentManager.UpdateAsync(roles);
-        }
+    public async Task<IdentityResult> CreateAsync(IRole role, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(role);
 
-        #region IRoleStore<IRole>
+        var roleToCreate = (Role)role;
 
-        public async Task<IdentityResult> CreateAsync(IRole role, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(role);
+        var roles = await LoadRolesAsync();
+        roles.Roles.Add(roleToCreate);
+        await UpdateRolesAsync(roles);
 
-            var roleToCreate = (Role)role;
+        var roleCreatedEventHandlers = _serviceProvider.GetRequiredService<IEnumerable<IRoleCreatedEventHandler>>();
 
-            var roles = await LoadRolesAsync();
-            roles.Roles.Add(roleToCreate);
-            await UpdateRolesAsync(roles);
+        await roleCreatedEventHandlers.InvokeAsync((handler, roleToCreate) =>
+            handler.RoleCreatedAsync(roleToCreate.RoleName), roleToCreate, _logger);
 
-            var roleCreatedEventHandlers = _serviceProvider.GetRequiredService<IEnumerable<IRoleCreatedEventHandler>>();
+        return IdentityResult.Success;
+    }
 
-            await roleCreatedEventHandlers.InvokeAsync((handler, roleToCreate) =>
-                handler.RoleCreatedAsync(roleToCreate.RoleName), roleToCreate, _logger);
+    public async Task<IdentityResult> DeleteAsync(IRole role, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(role);
 
-            return IdentityResult.Success;
-        }
+        var roleToRemove = (Role)role;
 
-        public async Task<IdentityResult> DeleteAsync(IRole role, CancellationToken cancellationToken)
+        if (string.Equals(roleToRemove.NormalizedRoleName, "ANONYMOUS", StringComparison.Ordinal) ||
+            string.Equals(roleToRemove.NormalizedRoleName, "AUTHENTICATED", StringComparison.Ordinal))
         {
-            ArgumentNullException.ThrowIfNull(role);
+            return IdentityResult.Failed(new IdentityError { Description = S["Can't delete system roles."] });
+        }
 
-            var roleToRemove = (Role)role;
+        var roleRemovedEventHandlers = _serviceProvider.GetRequiredService<IEnumerable<IRoleRemovedEventHandler>>();
 
-            if (string.Equals(roleToRemove.NormalizedRoleName, "ANONYMOUS", StringComparison.Ordinal) ||
-                string.Equals(roleToRemove.NormalizedRoleName, "AUTHENTICATED", StringComparison.Ordinal))
-            {
-                return IdentityResult.Failed(new IdentityError { Description = S["Can't delete system roles."] });
-            }
+        await roleRemovedEventHandlers.InvokeAsync((handler, roleToRemove) =>
+            handler.RoleRemovedAsync(roleToRemove.RoleName), roleToRemove, _logger);
 
-            var roleRemovedEventHandlers = _serviceProvider.GetRequiredService<IEnumerable<IRoleRemovedEventHandler>>();
+        var roles = await LoadRolesAsync();
+        roleToRemove = roles.Roles.FirstOrDefault(r => string.Equals(r.RoleName, roleToRemove.RoleName, StringComparison.OrdinalIgnoreCase));
+        roles.Roles.Remove(roleToRemove);
 
-            await roleRemovedEventHandlers.InvokeAsync((handler, roleToRemove) =>
-                handler.RoleRemovedAsync(roleToRemove.RoleName), roleToRemove, _logger);
+        await UpdateRolesAsync(roles);
 
-            var roles = await LoadRolesAsync();
-            roleToRemove = roles.Roles.FirstOrDefault(r => string.Equals(r.RoleName, roleToRemove.RoleName, StringComparison.OrdinalIgnoreCase));
-            roles.Roles.Remove(roleToRemove);
+        return IdentityResult.Success;
+    }
 
-            await UpdateRolesAsync(roles);
+    public async Task<IRole> FindByIdAsync(string roleId, CancellationToken cancellationToken)
+    {
+        // While updating find a role from the loaded document being mutated.
+        var roles = _updating ? await LoadRolesAsync() : await GetRolesAsync();
 
-            return IdentityResult.Success;
-        }
+        var role = roles.Roles.FirstOrDefault(x => string.Equals(x.RoleName, roleId, StringComparison.OrdinalIgnoreCase));
 
-        public async Task<IRole> FindByIdAsync(string roleId, CancellationToken cancellationToken)
+        if (role == null)
         {
-            // While updating find a role from the loaded document being mutated.
-            var roles = _updating ? await LoadRolesAsync() : await GetRolesAsync();
-
-            var role = roles.Roles.FirstOrDefault(x => string.Equals(x.RoleName, roleId, StringComparison.OrdinalIgnoreCase));
-
-            if (role == null)
-            {
-                return null;
-            }
-
-            return _updating ? role : role.Clone();
+            return null;
         }
 
-        public async Task<IRole> FindByNameAsync(string normalizedRoleName, CancellationToken cancellationToken)
-        {
-            // While updating find a role from the loaded document being mutated.
-            var roles = _updating ? await LoadRolesAsync() : await GetRolesAsync();
+        return _updating ? role : role.Clone();
+    }
 
-            var role = roles.Roles.FirstOrDefault(x => x.NormalizedRoleName == normalizedRoleName);
+    public async Task<IRole> FindByNameAsync(string normalizedRoleName, CancellationToken cancellationToken)
+    {
+        // While updating find a role from the loaded document being mutated.
+        var roles = _updating ? await LoadRolesAsync() : await GetRolesAsync();
 
-            if (role == null)
-            {
-                return null;
-            }
+        var role = roles.Roles.FirstOrDefault(x => x.NormalizedRoleName == normalizedRoleName);
 
-            return _updating ? role : role.Clone();
+        if (role == null)
+        {
+            return null;
         }
 
-        public Task<string> GetNormalizedRoleNameAsync(IRole role, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(role);
+        return _updating ? role : role.Clone();
+    }
 
-            return Task.FromResult(((Role)role).NormalizedRoleName);
-        }
+    public Task<string> GetNormalizedRoleNameAsync(IRole role, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(role);
 
-        public Task<string> GetRoleIdAsync(IRole role, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(role);
+        return Task.FromResult(((Role)role).NormalizedRoleName);
+    }
 
-            return Task.FromResult(role.RoleName.ToUpperInvariant());
-        }
+    public Task<string> GetRoleIdAsync(IRole role, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(role);
 
-        public Task<string> GetRoleNameAsync(IRole role, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(role);
+        return Task.FromResult(role.RoleName.ToUpperInvariant());
+    }
 
-            return Task.FromResult(role.RoleName);
-        }
+    public Task<string> GetRoleNameAsync(IRole role, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(role);
 
-        public Task SetNormalizedRoleNameAsync(IRole role, string normalizedName, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(role);
+        return Task.FromResult(role.RoleName);
+    }
 
-            ((Role)role).NormalizedRoleName = normalizedName;
+    public Task SetNormalizedRoleNameAsync(IRole role, string normalizedName, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(role);
 
-            return Task.CompletedTask;
-        }
+        ((Role)role).NormalizedRoleName = normalizedName;
 
-        public Task SetRoleNameAsync(IRole role, string roleName, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(role);
+        return Task.CompletedTask;
+    }
 
-            ((Role)role).RoleName = roleName;
+    public Task SetRoleNameAsync(IRole role, string roleName, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(role);
 
-            return Task.CompletedTask;
-        }
+        ((Role)role).RoleName = roleName;
 
-        public async Task<IdentityResult> UpdateAsync(IRole role, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(role);
+        return Task.CompletedTask;
+    }
 
-            var roles = await LoadRolesAsync();
-            var existingRole = roles.Roles.FirstOrDefault(x => string.Equals(x.RoleName, role.RoleName, StringComparison.OrdinalIgnoreCase));
-            roles.Roles.Remove(existingRole);
-            roles.Roles.Add((Role)role);
+    public async Task<IdentityResult> UpdateAsync(IRole role, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(role);
 
-            await UpdateRolesAsync(roles);
+        var roles = await LoadRolesAsync();
+        var existingRole = roles.Roles.FirstOrDefault(x => string.Equals(x.RoleName, role.RoleName, StringComparison.OrdinalIgnoreCase));
+        roles.Roles.Remove(existingRole);
+        roles.Roles.Add((Role)role);
 
-            return IdentityResult.Success;
-        }
+        await UpdateRolesAsync(roles);
 
-        #endregion IRoleStore<IRole>
+        return IdentityResult.Success;
+    }
 
-        #region IRoleClaimStore<IRole>
+    #endregion IRoleStore<IRole>
 
-        public Task AddClaimAsync(IRole role, Claim claim, CancellationToken cancellationToken = default)
-        {
-            ArgumentNullException.ThrowIfNull(role);
+    #region IRoleClaimStore<IRole>
 
-            ArgumentNullException.ThrowIfNull(claim);
+    public Task AddClaimAsync(IRole role, Claim claim, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(role);
 
-            ((Role)role).RoleClaims.Add(new RoleClaim { ClaimType = claim.Type, ClaimValue = claim.Value });
+        ArgumentNullException.ThrowIfNull(claim);
 
-            return Task.CompletedTask;
-        }
+        ((Role)role).RoleClaims.Add(new RoleClaim { ClaimType = claim.Type, ClaimValue = claim.Value });
 
-        public Task<IList<Claim>> GetClaimsAsync(IRole role, CancellationToken cancellationToken = default)
-        {
-            ArgumentNullException.ThrowIfNull(role);
+        return Task.CompletedTask;
+    }
 
-            return Task.FromResult<IList<Claim>>(((Role)role).RoleClaims.Select(x => x.ToClaim()).ToList());
-        }
+    public Task<IList<Claim>> GetClaimsAsync(IRole role, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(role);
 
-        public Task RemoveClaimAsync(IRole role, Claim claim, CancellationToken cancellationToken = default)
-        {
-            ArgumentNullException.ThrowIfNull(role);
+        return Task.FromResult<IList<Claim>>(((Role)role).RoleClaims.Select(x => x.ToClaim()).ToList());
+    }
+
+    public Task RemoveClaimAsync(IRole role, Claim claim, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(role);
 
-            ArgumentNullException.ThrowIfNull(claim);
+        ArgumentNullException.ThrowIfNull(claim);
 
-            ((Role)role).RoleClaims.RemoveAll(x => x.ClaimType == claim.Type && x.ClaimValue == claim.Value);
+        ((Role)role).RoleClaims.RemoveAll(x => x.ClaimType == claim.Type && x.ClaimValue == claim.Value);
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
+    }
 
-        #endregion IRoleClaimStore<IRole>
+    #endregion IRoleClaimStore<IRole>
 
 #pragma warning disable CA1816
-        public void Dispose()
-        {
-        }
-#pragma warning restore CA1816
+    public void Dispose()
+    {
     }
+#pragma warning restore CA1816
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/Services/RoleUpdater.cs b/src/OrchardCore.Modules/OrchardCore.Roles/Services/RoleUpdater.cs
index c4440bbfb87..65cdf3a92e4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Roles/Services/RoleUpdater.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Roles/Services/RoleUpdater.cs
@@ -12,220 +12,219 @@
 using OrchardCore.Security;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Roles.Services
+namespace OrchardCore.Roles.Services;
+
+public class RoleUpdater : FeatureEventHandler, IRoleCreatedEventHandler, IRoleRemovedEventHandler
 {
-    public class RoleUpdater : FeatureEventHandler, IRoleCreatedEventHandler, IRoleRemovedEventHandler
+    private readonly ShellDescriptor _shellDescriptor;
+    private readonly IExtensionManager _extensionManager;
+    private readonly IDocumentManager<RolesDocument> _documentManager;
+    private readonly IEnumerable<IPermissionProvider> _permissionProviders;
+    private readonly ITypeFeatureProvider _typeFeatureProvider;
+    private readonly ILogger _logger;
+
+    private readonly HashSet<string> _installedFeatures = [];
+
+    public RoleUpdater(
+        ShellDescriptor shellDescriptor,
+        IExtensionManager extensionManager,
+        IDocumentManager<RolesDocument> documentManager,
+        IEnumerable<IPermissionProvider> permissionProviders,
+        ITypeFeatureProvider typeFeatureProvider,
+        ILogger<RoleUpdater> logger)
     {
-        private readonly ShellDescriptor _shellDescriptor;
-        private readonly IExtensionManager _extensionManager;
-        private readonly IDocumentManager<RolesDocument> _documentManager;
-        private readonly IEnumerable<IPermissionProvider> _permissionProviders;
-        private readonly ITypeFeatureProvider _typeFeatureProvider;
-        private readonly ILogger _logger;
-
-        private readonly HashSet<string> _installedFeatures = [];
-
-        public RoleUpdater(
-            ShellDescriptor shellDescriptor,
-            IExtensionManager extensionManager,
-            IDocumentManager<RolesDocument> documentManager,
-            IEnumerable<IPermissionProvider> permissionProviders,
-            ITypeFeatureProvider typeFeatureProvider,
-            ILogger<RoleUpdater> logger)
-        {
-            _shellDescriptor = shellDescriptor;
-            _extensionManager = extensionManager;
-            _documentManager = documentManager;
-            _permissionProviders = permissionProviders;
-            _typeFeatureProvider = typeFeatureProvider;
-            _logger = logger;
-        }
+        _shellDescriptor = shellDescriptor;
+        _extensionManager = extensionManager;
+        _documentManager = documentManager;
+        _permissionProviders = permissionProviders;
+        _typeFeatureProvider = typeFeatureProvider;
+        _logger = logger;
+    }
 
-        public override Task InstalledAsync(IFeatureInfo feature) => UpdateRolesForInstalledFeatureAsync(feature);
+    public override Task InstalledAsync(IFeatureInfo feature) => UpdateRolesForInstalledFeatureAsync(feature);
 
-        public override Task EnabledAsync(IFeatureInfo feature) => UpdateRolesForEnabledFeatureAsync(feature);
+    public override Task EnabledAsync(IFeatureInfo feature) => UpdateRolesForEnabledFeatureAsync(feature);
 
-        public Task RoleCreatedAsync(string roleName) => UpdateRoleForInstalledFeaturesAsync(roleName);
+    public Task RoleCreatedAsync(string roleName) => UpdateRoleForInstalledFeaturesAsync(roleName);
 
-        public Task RoleRemovedAsync(string roleName) => RemoveRoleForMissingFeaturesAsync(roleName);
+    public Task RoleRemovedAsync(string roleName) => RemoveRoleForMissingFeaturesAsync(roleName);
 
-        private async Task UpdateRolesForInstalledFeatureAsync(IFeatureInfo feature)
-        {
-            _installedFeatures.Add(feature.Id);
+    private async Task UpdateRolesForInstalledFeatureAsync(IFeatureInfo feature)
+    {
+        _installedFeatures.Add(feature.Id);
 
-            var providers = _permissionProviders
-                .Where(provider => _typeFeatureProvider.GetFeaturesForDependency(provider.GetType()).Any(p => p.Id == feature.Id));
+        var providers = _permissionProviders
+            .Where(provider => _typeFeatureProvider.GetFeaturesForDependency(provider.GetType()).Any(p => p.Id == feature.Id));
 
-            if (!providers.Any())
-            {
-                return;
-            }
+        if (!providers.Any())
+        {
+            return;
+        }
 
-            var updated = false;
-            var rolesDocument = await _documentManager.GetOrCreateMutableAsync();
-            foreach (var provider in providers)
+        var updated = false;
+        var rolesDocument = await _documentManager.GetOrCreateMutableAsync();
+        foreach (var provider in providers)
+        {
+            var stereotypes = provider.GetDefaultStereotypes();
+            foreach (var stereotype in stereotypes)
             {
-                var stereotypes = provider.GetDefaultStereotypes();
-                foreach (var stereotype in stereotypes)
+                var role = rolesDocument.Roles.FirstOrDefault(role => string.Equals(role.RoleName, stereotype.Name, StringComparison.OrdinalIgnoreCase));
+                if (role == null)
                 {
-                    var role = rolesDocument.Roles.FirstOrDefault(role => string.Equals(role.RoleName, stereotype.Name, StringComparison.OrdinalIgnoreCase));
-                    if (role == null)
-                    {
-                        continue;
-                    }
-
-                    var permissions = (stereotype.Permissions ?? [])
-                        .Select(stereotype => stereotype.Name);
-
-                    if (UpdateRole(role, permissions, _logger))
-                    {
-                        updated = true;
-                    }
+                    continue;
                 }
-            }
 
-            if (updated)
-            {
-                await _documentManager.UpdateAsync(rolesDocument);
+                var permissions = (stereotype.Permissions ?? [])
+                    .Select(stereotype => stereotype.Name);
+
+                if (UpdateRole(role, permissions, _logger))
+                {
+                    updated = true;
+                }
             }
         }
 
-        private async Task UpdateRolesForEnabledFeatureAsync(IFeatureInfo feature)
+        if (updated)
         {
-            if (_installedFeatures.Contains(feature.Id))
-            {
-                return;
-            }
-
-            var providers = _permissionProviders
-                .Where(provider => _typeFeatureProvider.GetFeaturesForDependency(provider.GetType()).Any(p => p.Id == feature.Id));
-
-            if (!providers.Any())
-            {
-                return;
-            }
-
-            var updated = false;
-            var rolesDocument = await _documentManager.GetOrCreateMutableAsync();
-            foreach (var role in rolesDocument.Roles)
-            {
-                if (!rolesDocument.MissingFeaturesByRole.TryGetValue(role.RoleName, out var missingFeatures) ||
-                    !missingFeatures.Contains(feature.Id))
-                {
-                    continue;
-                }
+            await _documentManager.UpdateAsync(rolesDocument);
+        }
+    }
 
-                updated = true;
+    private async Task UpdateRolesForEnabledFeatureAsync(IFeatureInfo feature)
+    {
+        if (_installedFeatures.Contains(feature.Id))
+        {
+            return;
+        }
 
-                missingFeatures.Remove(feature.Id);
-                UpdateRolesForEnabledFeature(role, providers, _logger);
-            }
+        var providers = _permissionProviders
+            .Where(provider => _typeFeatureProvider.GetFeaturesForDependency(provider.GetType()).Any(p => p.Id == feature.Id));
 
-            if (updated)
-            {
-                await _documentManager.UpdateAsync(rolesDocument);
-            }
+        if (!providers.Any())
+        {
+            return;
         }
 
-        private async Task UpdateRoleForInstalledFeaturesAsync(string roleName)
+        var updated = false;
+        var rolesDocument = await _documentManager.GetOrCreateMutableAsync();
+        foreach (var role in rolesDocument.Roles)
         {
-            var rolesDocument = await _documentManager.GetOrCreateMutableAsync();
-            var role = rolesDocument.Roles.FirstOrDefault(role => string.Equals(role.RoleName, roleName, StringComparison.OrdinalIgnoreCase));
-            if (role == null)
+            if (!rolesDocument.MissingFeaturesByRole.TryGetValue(role.RoleName, out var missingFeatures) ||
+                !missingFeatures.Contains(feature.Id))
             {
-                return;
+                continue;
             }
 
-            // Get installed features that are no more enabled.
-            var missingFeatures = _shellDescriptor.Installed
-                .Except(_shellDescriptor.Features)
-                .Select(feature => feature.Id)
-                .ToArray();
+            updated = true;
 
-            // And defining at least one 'IPermissionProvider'.
-            rolesDocument.MissingFeaturesByRole[roleName] = (await _extensionManager.LoadFeaturesAsync(missingFeatures))
-                .Where(entry => _typeFeatureProvider.GetTypesForFeature(entry).Any(type => type.IsAssignableTo(typeof(IPermissionProvider))))
-                .Select(entry => entry.Id)
-                .ToList();
+            missingFeatures.Remove(feature.Id);
+            UpdateRolesForEnabledFeature(role, providers, _logger);
+        }
 
+        if (updated)
+        {
             await _documentManager.UpdateAsync(rolesDocument);
+        }
+    }
+
+    private async Task UpdateRoleForInstalledFeaturesAsync(string roleName)
+    {
+        var rolesDocument = await _documentManager.GetOrCreateMutableAsync();
+        var role = rolesDocument.Roles.FirstOrDefault(role => string.Equals(role.RoleName, roleName, StringComparison.OrdinalIgnoreCase));
+        if (role == null)
+        {
+            return;
+        }
 
-            var stereotypes = _permissionProviders
-                .SelectMany(provider => provider.GetDefaultStereotypes())
-                .Where(stereotype => string.Equals(stereotype.Name, roleName, StringComparison.OrdinalIgnoreCase));
+        // Get installed features that are no more enabled.
+        var missingFeatures = _shellDescriptor.Installed
+            .Except(_shellDescriptor.Features)
+            .Select(feature => feature.Id)
+            .ToArray();
 
-            if (!stereotypes.Any())
-            {
-                return;
-            }
+        // And defining at least one 'IPermissionProvider'.
+        rolesDocument.MissingFeaturesByRole[roleName] = (await _extensionManager.LoadFeaturesAsync(missingFeatures))
+            .Where(entry => _typeFeatureProvider.GetTypesForFeature(entry).Any(type => type.IsAssignableTo(typeof(IPermissionProvider))))
+            .Select(entry => entry.Id)
+            .ToList();
 
-            var permissions = stereotypes
-                .SelectMany(stereotype => stereotype.Permissions ?? [])
-                .Select(stereotype => stereotype.Name);
+        await _documentManager.UpdateAsync(rolesDocument);
 
-            UpdateRole(role, permissions, _logger);
-        }
+        var stereotypes = _permissionProviders
+            .SelectMany(provider => provider.GetDefaultStereotypes())
+            .Where(stereotype => string.Equals(stereotype.Name, roleName, StringComparison.OrdinalIgnoreCase));
 
-        private async Task RemoveRoleForMissingFeaturesAsync(string roleName)
+        if (!stereotypes.Any())
         {
-            var rolesDocument = await _documentManager.GetOrCreateMutableAsync();
-            if (rolesDocument.MissingFeaturesByRole.TryGetValue(roleName, out _))
-            {
-                rolesDocument.MissingFeaturesByRole.Remove(roleName);
-                await _documentManager.UpdateAsync(rolesDocument);
-            }
+            return;
         }
 
-        private static bool UpdateRolesForEnabledFeature(Role role, IEnumerable<IPermissionProvider> providers, ILogger logger)
-        {
-            var stereotypes = providers
-                .SelectMany(provider => provider.GetDefaultStereotypes())
-                .Where(stereotype => string.Equals(stereotype.Name, role.RoleName, StringComparison.OrdinalIgnoreCase));
+        var permissions = stereotypes
+            .SelectMany(stereotype => stereotype.Permissions ?? [])
+            .Select(stereotype => stereotype.Name);
 
-            if (!stereotypes.Any())
-            {
-                return false;
-            }
+        UpdateRole(role, permissions, _logger);
+    }
 
-            var permissions = stereotypes
-                .SelectMany(stereotype => stereotype.Permissions ?? [])
-                .Select(stereotype => stereotype.Name);
+    private async Task RemoveRoleForMissingFeaturesAsync(string roleName)
+    {
+        var rolesDocument = await _documentManager.GetOrCreateMutableAsync();
+        if (rolesDocument.MissingFeaturesByRole.TryGetValue(roleName, out _))
+        {
+            rolesDocument.MissingFeaturesByRole.Remove(roleName);
+            await _documentManager.UpdateAsync(rolesDocument);
+        }
+    }
 
-            if (!permissions.Any())
-            {
-                return false;
-            }
+    private static bool UpdateRolesForEnabledFeature(Role role, IEnumerable<IPermissionProvider> providers, ILogger logger)
+    {
+        var stereotypes = providers
+            .SelectMany(provider => provider.GetDefaultStereotypes())
+            .Where(stereotype => string.Equals(stereotype.Name, role.RoleName, StringComparison.OrdinalIgnoreCase));
 
-            return UpdateRole(role, permissions, logger);
+        if (!stereotypes.Any())
+        {
+            return false;
         }
 
-        private static bool UpdateRole(Role role, IEnumerable<string> permissions, ILogger logger)
+        var permissions = stereotypes
+            .SelectMany(stereotype => stereotype.Permissions ?? [])
+            .Select(stereotype => stereotype.Name);
+
+        if (!permissions.Any())
         {
-            var currentPermissions = role.RoleClaims
-                .Where(roleClaim => roleClaim.ClaimType == Permission.ClaimType)
-                .Select(roleClaim => roleClaim.ClaimValue);
+            return false;
+        }
 
-            var distinctPermissions = currentPermissions
-                .Union(permissions)
-                .Distinct();
+        return UpdateRole(role, permissions, logger);
+    }
 
-            var additionalPermissions = distinctPermissions.Except(currentPermissions);
-            if (!additionalPermissions.Any())
-            {
-                return false;
-            }
+    private static bool UpdateRole(Role role, IEnumerable<string> permissions, ILogger logger)
+    {
+        var currentPermissions = role.RoleClaims
+            .Where(roleClaim => roleClaim.ClaimType == Permission.ClaimType)
+            .Select(roleClaim => roleClaim.ClaimValue);
 
-            foreach (var permission in additionalPermissions)
-            {
-                if (logger.IsEnabled(LogLevel.Debug))
-                {
-                    logger.LogDebug("Default role '{RoleName}' granted permission '{PermissionName}'.", role.RoleName, permission);
-                }
+        var distinctPermissions = currentPermissions
+            .Union(permissions)
+            .Distinct();
 
-                role.RoleClaims.Add(new RoleClaim { ClaimType = Permission.ClaimType, ClaimValue = permission });
+        var additionalPermissions = distinctPermissions.Except(currentPermissions);
+        if (!additionalPermissions.Any())
+        {
+            return false;
+        }
+
+        foreach (var permission in additionalPermissions)
+        {
+            if (logger.IsEnabled(LogLevel.Debug))
+            {
+                logger.LogDebug("Default role '{RoleName}' granted permission '{PermissionName}'.", role.RoleName, permission);
             }
 
-            return true;
+            role.RoleClaims.Add(new RoleClaim { ClaimType = Permission.ClaimType, ClaimValue = permission });
         }
+
+        return true;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/Services/RolesPermissionsHandler.cs b/src/OrchardCore.Modules/OrchardCore.Roles/Services/RolesPermissionsHandler.cs
index e3ee93a31d2..d328be3ff3e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Roles/Services/RolesPermissionsHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Roles/Services/RolesPermissionsHandler.cs
@@ -5,67 +5,66 @@
 using Microsoft.AspNetCore.Identity;
 using OrchardCore.Security;
 
-namespace OrchardCore.Roles
+namespace OrchardCore.Roles;
+
+/// <summary>
+/// This authorization handler ensures that Anonymous and Authenticated permissions are checked.
+/// </summary>
+public class RolesPermissionsHandler : AuthorizationHandler<PermissionRequirement>
 {
-    /// <summary>
-    /// This authorization handler ensures that Anonymous and Authenticated permissions are checked.
-    /// </summary>
-    public class RolesPermissionsHandler : AuthorizationHandler<PermissionRequirement>
-    {
-        private readonly RoleManager<IRole> _roleManager;
-        private readonly IPermissionGrantingService _permissionGrantingService;
+    private readonly RoleManager<IRole> _roleManager;
+    private readonly IPermissionGrantingService _permissionGrantingService;
+
 
+    private IEnumerable<RoleClaim> _anonymousClaims;
+    private IEnumerable<RoleClaim> _authenticatedClaims;
 
-        private IEnumerable<RoleClaim> _anonymousClaims;
-        private IEnumerable<RoleClaim> _authenticatedClaims;
+    public RolesPermissionsHandler(
+        RoleManager<IRole> roleManager,
+        IPermissionGrantingService permissionGrantingService)
+    {
+        _roleManager = roleManager;
+        _permissionGrantingService = permissionGrantingService;
+    }
 
-        public RolesPermissionsHandler(
-            RoleManager<IRole> roleManager,
-            IPermissionGrantingService permissionGrantingService)
+    protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement)
+    {
+        if (context.HasSucceeded)
         {
-            _roleManager = roleManager;
-            _permissionGrantingService = permissionGrantingService;
+            // This handler is not revoking any pre-existing grants.
+            return;
         }
 
-        protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement)
+        var claims = new HashSet<Claim>();
+        foreach (var claim in _anonymousClaims ??= await GetRoleClaimsAsync(OrchardCoreConstants.Roles.Anonymous))
         {
-            if (context.HasSucceeded)
-            {
-                // This handler is not revoking any pre-existing grants.
-                return;
-            }
+            claims.Add(claim);
+        }
 
-            var claims = new HashSet<Claim>();
-            foreach (var claim in _anonymousClaims ??= await GetRoleClaimsAsync(OrchardCoreConstants.Roles.Anonymous))
+        if (context.User.Identity.IsAuthenticated)
+        {
+            foreach (var claim in _authenticatedClaims ??= await GetRoleClaimsAsync(OrchardCoreConstants.Roles.Authenticated))
             {
                 claims.Add(claim);
             }
-
-            if (context.User.Identity.IsAuthenticated)
-            {
-                foreach (var claim in _authenticatedClaims ??= await GetRoleClaimsAsync(OrchardCoreConstants.Roles.Authenticated))
-                {
-                    claims.Add(claim);
-                }
-            }
-
-            if (_permissionGrantingService.IsGranted(requirement, claims))
-            {
-                context.Succeed(requirement);
-                return;
-            }
         }
 
-        private async Task<IEnumerable<RoleClaim>> GetRoleClaimsAsync(string roleName)
+        if (_permissionGrantingService.IsGranted(requirement, claims))
         {
-            var role = await _roleManager.FindByNameAsync(roleName);
+            context.Succeed(requirement);
+            return;
+        }
+    }
 
-            if (role != null)
-            {
-                return ((Role)role).RoleClaims;
-            }
+    private async Task<IEnumerable<RoleClaim>> GetRoleClaimsAsync(string roleName)
+    {
+        var role = await _roleManager.FindByNameAsync(roleName);
 
-            return [];
+        if (role != null)
+        {
+            return ((Role)role).RoleClaims;
         }
+
+        return [];
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Roles/Startup.cs
index 7d15ae2fda8..38984dc3784 100644
--- a/src/OrchardCore.Modules/OrchardCore.Roles/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Roles/Startup.cs
@@ -14,44 +14,43 @@
 using OrchardCore.Security.Permissions;
 using OrchardCore.Security.Services;
 
-namespace OrchardCore.Roles
+namespace OrchardCore.Roles;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<RoleStore>();
-            services.Replace(ServiceDescriptor.Scoped<IRoleClaimStore<IRole>>(sp => sp.GetRequiredService<RoleStore>()));
-            services.Replace(ServiceDescriptor.Scoped<IRoleStore<IRole>>(sp => sp.GetRequiredService<RoleStore>()));
+        services.AddScoped<RoleStore>();
+        services.Replace(ServiceDescriptor.Scoped<IRoleClaimStore<IRole>>(sp => sp.GetRequiredService<RoleStore>()));
+        services.Replace(ServiceDescriptor.Scoped<IRoleStore<IRole>>(sp => sp.GetRequiredService<RoleStore>()));
 
-            services.AddRecipeExecutionStep<RolesStep>();
-            services.AddScoped<IAuthorizationHandler, RolesPermissionsHandler>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-        }
+        services.AddRecipeExecutionStep<RolesStep>();
+        services.AddScoped<IAuthorizationHandler, RolesPermissionsHandler>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class DeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class DeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<AllRolesDeploymentSource, AllRolesDeploymentStep, AllRolesDeploymentStepDriver>();
-        }
+        services.AddDeployment<AllRolesDeploymentSource, AllRolesDeploymentStep, AllRolesDeploymentStepDriver>();
     }
+}
 
-    [Feature("OrchardCore.Roles.Core")]
-    public sealed class RoleUpdaterStartup : StartupBase
+[Feature("OrchardCore.Roles.Core")]
+public sealed class RoleUpdaterStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<RoleManager<IRole>>();
-            services.AddScoped<IRoleService, RoleService>();
+        services.AddScoped<RoleManager<IRole>>();
+        services.AddScoped<IRoleService, RoleService>();
 
-            services.AddScoped<RoleUpdater>();
-            services.AddScoped<IFeatureEventHandler>(sp => sp.GetRequiredService<RoleUpdater>());
-            services.AddScoped<IRoleCreatedEventHandler>(sp => sp.GetRequiredService<RoleUpdater>());
-            services.AddScoped<IRoleRemovedEventHandler>(sp => sp.GetRequiredService<RoleUpdater>());
-        }
+        services.AddScoped<RoleUpdater>();
+        services.AddScoped<IFeatureEventHandler>(sp => sp.GetRequiredService<RoleUpdater>());
+        services.AddScoped<IRoleCreatedEventHandler>(sp => sp.GetRequiredService<RoleUpdater>());
+        services.AddScoped<IRoleRemovedEventHandler>(sp => sp.GetRequiredService<RoleUpdater>());
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/ViewComponents/SelectRolesViewComponent.cs b/src/OrchardCore.Modules/OrchardCore.Roles/ViewComponents/SelectRolesViewComponent.cs
index 34dfddedfa3..18e1ca87685 100644
--- a/src/OrchardCore.Modules/OrchardCore.Roles/ViewComponents/SelectRolesViewComponent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Roles/ViewComponents/SelectRolesViewComponent.cs
@@ -5,60 +5,59 @@
 using Microsoft.AspNetCore.Mvc;
 using OrchardCore.Security.Services;
 
-namespace OrchardCore.Roles.ViewComponents
+namespace OrchardCore.Roles.ViewComponents;
+
+public class SelectRolesViewComponent : ViewComponent
 {
-    public class SelectRolesViewComponent : ViewComponent
+    private readonly IRoleService _roleService;
+
+    public SelectRolesViewComponent(IRoleService roleService)
     {
-        private readonly IRoleService _roleService;
+        _roleService = roleService;
+    }
 
-        public SelectRolesViewComponent(IRoleService roleService)
-        {
-            _roleService = roleService;
-        }
+    public async Task<IViewComponentResult> InvokeAsync(IEnumerable<string> selectedRoles, string htmlName, IEnumerable<string> except = null)
+    {
+        selectedRoles ??= Array.Empty<string>();
 
-        public async Task<IViewComponentResult> InvokeAsync(IEnumerable<string> selectedRoles, string htmlName, IEnumerable<string> except = null)
+        var roleSelections = await BuildRoleSelectionsAsync(selectedRoles, except);
+
+        var model = new SelectRolesViewModel
         {
-            selectedRoles ??= Array.Empty<string>();
+            HtmlName = htmlName,
+            RoleSelections = roleSelections
+        };
 
-            var roleSelections = await BuildRoleSelectionsAsync(selectedRoles, except);
+        return View(model);
+    }
 
-            var model = new SelectRolesViewModel
-            {
-                HtmlName = htmlName,
-                RoleSelections = roleSelections
-            };
+    private async Task<IList<Selection<string>>> BuildRoleSelectionsAsync(IEnumerable<string> selectedRoles, IEnumerable<string> except)
+    {
+        var roleNames = await _roleService.GetRoleNamesAsync();
 
-            return View(model);
+        if (except != null)
+        {
+            roleNames = roleNames.Except(except, StringComparer.OrdinalIgnoreCase);
         }
 
-        private async Task<IList<Selection<string>>> BuildRoleSelectionsAsync(IEnumerable<string> selectedRoles, IEnumerable<string> except)
+        return roleNames.Select(x => new Selection<string>
         {
-            var roleNames = await _roleService.GetRoleNamesAsync();
-
-            if (except != null)
-            {
-                roleNames = roleNames.Except(except, StringComparer.OrdinalIgnoreCase);
-            }
-
-            return roleNames.Select(x => new Selection<string>
-            {
-                IsSelected = selectedRoles.Contains(x),
-                Item = x
-            })
-            .OrderBy(x => x.Item)
-            .ToList();
-        }
+            IsSelected = selectedRoles.Contains(x),
+            Item = x
+        })
+        .OrderBy(x => x.Item)
+        .ToList();
     }
+}
 
-    public class SelectRolesViewModel
-    {
-        public string HtmlName { get; set; }
-        public IList<Selection<string>> RoleSelections { get; set; }
-    }
+public class SelectRolesViewModel
+{
+    public string HtmlName { get; set; }
+    public IList<Selection<string>> RoleSelections { get; set; }
+}
 
-    public class Selection<T>
-    {
-        public bool IsSelected { get; set; }
-        public T Item { get; set; }
-    }
+public class Selection<T>
+{
+    public bool IsSelected { get; set; }
+    public T Item { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/ViewModels/CreateRoleViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Roles/ViewModels/CreateRoleViewModel.cs
index 9e0a534ded9..cad7c8724ec 100644
--- a/src/OrchardCore.Modules/OrchardCore.Roles/ViewModels/CreateRoleViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Roles/ViewModels/CreateRoleViewModel.cs
@@ -1,12 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Roles.ViewModels
+namespace OrchardCore.Roles.ViewModels;
+
+public class CreateRoleViewModel
 {
-    public class CreateRoleViewModel
-    {
-        [Required]
-        public string RoleName { get; set; }
+    [Required]
+    public string RoleName { get; set; }
 
-        public string RoleDescription { get; set; }
-    }
+    public string RoleDescription { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/ViewModels/EditRoleViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Roles/ViewModels/EditRoleViewModel.cs
index 279529f79fb..2e053b701fb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Roles/ViewModels/EditRoleViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Roles/ViewModels/EditRoleViewModel.cs
@@ -3,20 +3,19 @@
 using OrchardCore.Security;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Roles.ViewModels
+namespace OrchardCore.Roles.ViewModels;
+
+public class EditRoleViewModel
 {
-    public class EditRoleViewModel
-    {
-        public string Name { get; set; }
-        public string RoleDescription { get; set; }
+    public string Name { get; set; }
+    public string RoleDescription { get; set; }
 
-        [BindNever]
-        public IDictionary<PermissionGroupKey, IEnumerable<Permission>> RoleCategoryPermissions { get; set; }
+    [BindNever]
+    public IDictionary<PermissionGroupKey, IEnumerable<Permission>> RoleCategoryPermissions { get; set; }
 
-        [BindNever]
-        public IEnumerable<string> EffectivePermissions { get; set; }
+    [BindNever]
+    public IEnumerable<string> EffectivePermissions { get; set; }
 
-        [BindNever]
-        public Role Role { get; set; }
-    }
+    [BindNever]
+    public Role Role { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/ViewModels/RolesViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Roles/ViewModels/RolesViewModel.cs
index 2bd26ef4d4f..d7f8595ce17 100644
--- a/src/OrchardCore.Modules/OrchardCore.Roles/ViewModels/RolesViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Roles/ViewModels/RolesViewModel.cs
@@ -1,16 +1,15 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Roles.ViewModels
+namespace OrchardCore.Roles.ViewModels;
+
+public class RolesViewModel
 {
-    public class RolesViewModel
-    {
-        public List<RoleEntry> RoleEntries { get; set; } = [];
-    }
+    public List<RoleEntry> RoleEntries { get; set; } = [];
+}
 
-    public class RoleEntry
-    {
-        public string Name { get; set; }
-        public string Description { get; set; }
-        public bool Selected { get; set; }
-    }
+public class RoleEntry
+{
+    public string Name { get; set; }
+    public string Description { get; set; }
+    public bool Selected { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/AllConditionDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/AllConditionDisplayDriver.cs
index 46622e2d554..459ca8a4a32 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/AllConditionDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/AllConditionDisplayDriver.cs
@@ -5,38 +5,37 @@
 using OrchardCore.Rules.Models;
 using OrchardCore.Rules.ViewModels;
 
-namespace OrchardCore.Rules.Drivers
+namespace OrchardCore.Rules.Drivers;
+
+public sealed class AllConditionDisplayDriver : DisplayDriver<Condition, AllConditionGroup>
 {
-    public sealed class AllConditionDisplayDriver : DisplayDriver<Condition, AllConditionGroup>
+    public override Task<IDisplayResult> DisplayAsync(AllConditionGroup condition, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(AllConditionGroup condition, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("AllCondition_Fields_Summary", condition).Location("Summary", "Content"),
-                    View("AllCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content"),
-                    Initialize<ConditionGroupViewModel>("ConditionGroup_Fields_Summary", m =>
-                    {
-                        m.Entries = condition.Conditions.Select(x => new ConditionEntry { Condition = x }).ToArray();
-                        m.Condition = condition;
-                    }).Location("Summary", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("AllCondition_Fields_Summary", condition).Location("Summary", "Content"),
+                View("AllCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content"),
+                Initialize<ConditionGroupViewModel>("ConditionGroup_Fields_Summary", m =>
+                {
+                    m.Entries = condition.Conditions.Select(x => new ConditionEntry { Condition = x }).ToArray();
+                    m.Condition = condition;
+                }).Location("Summary", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(AllConditionGroup condition, BuildEditorContext context)
+    public override IDisplayResult Edit(AllConditionGroup condition, BuildEditorContext context)
+    {
+        return Initialize<AllConditionViewModel>("AllCondition_Fields_Edit", m =>
         {
-            return Initialize<AllConditionViewModel>("AllCondition_Fields_Edit", m =>
-            {
-                m.DisplayText = condition.DisplayText;
-                m.Condition = condition;
-            }).Location("Content");
-        }
+            m.DisplayText = condition.DisplayText;
+            m.Condition = condition;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(AllConditionGroup condition, UpdateEditorContext context)
-        {
-            await context.Updater.TryUpdateModelAsync(condition, Prefix, x => x.DisplayText);
+    public override async Task<IDisplayResult> UpdateAsync(AllConditionGroup condition, UpdateEditorContext context)
+    {
+        await context.Updater.TryUpdateModelAsync(condition, Prefix, x => x.DisplayText);
 
-            return Edit(condition, context);
-        }
+        return Edit(condition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/AnyConditionDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/AnyConditionDisplayDriver.cs
index de72483711e..30a6e30dae0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/AnyConditionDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/AnyConditionDisplayDriver.cs
@@ -5,38 +5,37 @@
 using OrchardCore.Rules.Models;
 using OrchardCore.Rules.ViewModels;
 
-namespace OrchardCore.Rules.Drivers
+namespace OrchardCore.Rules.Drivers;
+
+public sealed class AnyConditionDisplayDriver : DisplayDriver<Condition, AnyConditionGroup>
 {
-    public sealed class AnyConditionDisplayDriver : DisplayDriver<Condition, AnyConditionGroup>
+    public override Task<IDisplayResult> DisplayAsync(AnyConditionGroup condition, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(AnyConditionGroup condition, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("AnyCondition_Fields_Summary", condition).Location("Summary", "Content"),
-                    View("AnyCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content"),
-                    Initialize<ConditionGroupViewModel>("ConditionGroup_Fields_Summary", m =>
-                    {
-                        m.Entries = condition.Conditions.Select(x => new ConditionEntry { Condition = x }).ToArray();
-                        m.Condition = condition;
-                    }).Location("Summary", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("AnyCondition_Fields_Summary", condition).Location("Summary", "Content"),
+                View("AnyCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content"),
+                Initialize<ConditionGroupViewModel>("ConditionGroup_Fields_Summary", m =>
+                {
+                    m.Entries = condition.Conditions.Select(x => new ConditionEntry { Condition = x }).ToArray();
+                    m.Condition = condition;
+                }).Location("Summary", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(AnyConditionGroup condition, BuildEditorContext context)
+    public override IDisplayResult Edit(AnyConditionGroup condition, BuildEditorContext context)
+    {
+        return Initialize<AnyConditionViewModel>("AnyCondition_Fields_Edit", m =>
         {
-            return Initialize<AnyConditionViewModel>("AnyCondition_Fields_Edit", m =>
-            {
-                m.DisplayText = condition.DisplayText;
-                m.Condition = condition;
-            }).Location("Content");
-        }
+            m.DisplayText = condition.DisplayText;
+            m.Condition = condition;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(AnyConditionGroup condition, UpdateEditorContext context)
-        {
-            await context.Updater.TryUpdateModelAsync(condition, Prefix, x => x.DisplayText);
+    public override async Task<IDisplayResult> UpdateAsync(AnyConditionGroup condition, UpdateEditorContext context)
+    {
+        await context.Updater.TryUpdateModelAsync(condition, Prefix, x => x.DisplayText);
 
-            return Edit(condition, context);
-        }
+        return Edit(condition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/BooleanConditionDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/BooleanConditionDisplayDriver.cs
index b92af91edc0..2da93b08b58 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/BooleanConditionDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/BooleanConditionDisplayDriver.cs
@@ -4,33 +4,32 @@
 using OrchardCore.Rules.Models;
 using OrchardCore.Rules.ViewModels;
 
-namespace OrchardCore.Rules.Drivers
+namespace OrchardCore.Rules.Drivers;
+
+public sealed class BooleanConditionDisplayDriver : DisplayDriver<Condition, BooleanCondition>
 {
-    public sealed class BooleanConditionDisplayDriver : DisplayDriver<Condition, BooleanCondition>
+    public override Task<IDisplayResult> DisplayAsync(BooleanCondition condition, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(BooleanCondition condition, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("BooleanCondition_Fields_Summary", condition).Location("Summary", "Content"),
-                    View("BooleanCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("BooleanCondition_Fields_Summary", condition).Location("Summary", "Content"),
+                View("BooleanCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(BooleanCondition condition, BuildEditorContext context)
+    public override IDisplayResult Edit(BooleanCondition condition, BuildEditorContext context)
+    {
+        return Initialize<BooleanConditionViewModel>("BooleanCondition_Fields_Edit", m =>
         {
-            return Initialize<BooleanConditionViewModel>("BooleanCondition_Fields_Edit", m =>
-            {
-                m.Value = condition.Value;
-                m.Condition = condition;
-            }).Location("Content");
-        }
+            m.Value = condition.Value;
+            m.Condition = condition;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(BooleanCondition condition, UpdateEditorContext context)
-        {
-            await context.Updater.TryUpdateModelAsync(condition, Prefix, x => x.Value);
+    public override async Task<IDisplayResult> UpdateAsync(BooleanCondition condition, UpdateEditorContext context)
+    {
+        await context.Updater.TryUpdateModelAsync(condition, Prefix, x => x.Value);
 
-            return Edit(condition, context);
-        }
+        return Edit(condition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/ContentTypeConditionDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/ContentTypeConditionDisplayDriver.cs
index 6814011b950..6144c36df8e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/ContentTypeConditionDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/ContentTypeConditionDisplayDriver.cs
@@ -5,51 +5,50 @@
 using OrchardCore.Rules.Models;
 using OrchardCore.Rules.ViewModels;
 
-namespace OrchardCore.Rules.Drivers
-{
-    public sealed class ContentTypeConditionDisplayDriver : DisplayDriver<Condition, ContentTypeCondition>
-    {
-        private readonly ConditionOperatorOptions _options;
+namespace OrchardCore.Rules.Drivers;
 
-        public ContentTypeConditionDisplayDriver(IOptions<ConditionOperatorOptions> options)
-        {
-            _options = options.Value;
-        }
+public sealed class ContentTypeConditionDisplayDriver : DisplayDriver<Condition, ContentTypeCondition>
+{
+    private readonly ConditionOperatorOptions _options;
 
-        public override Task<IDisplayResult> DisplayAsync(ContentTypeCondition condition, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("ContentTypeCondition_Fields_Summary", condition).Location("Summary", "Content"),
-                    View("ContentTypeCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content")
-                );
-        }
+    public ContentTypeConditionDisplayDriver(IOptions<ConditionOperatorOptions> options)
+    {
+        _options = options.Value;
+    }
 
-        public override IDisplayResult Edit(ContentTypeCondition condition, BuildEditorContext context)
-        {
-            return Initialize<ContentTypeConditionViewModel>("ContentTypeCondition_Fields_Edit", m =>
-            {
-                if (condition.Operation != null && _options.ConditionOperatorOptionByType.TryGetValue(condition.Operation.GetType(), out var option))
-                {
-                    m.SelectedOperation = option.Factory.Name;
-                }
-                m.Value = condition.Value;
-                m.Condition = condition;
-            }).Location("Content");
-        }
+    public override Task<IDisplayResult> DisplayAsync(ContentTypeCondition condition, BuildDisplayContext context)
+    {
+        return
+            CombineAsync(
+                View("ContentTypeCondition_Fields_Summary", condition).Location("Summary", "Content"),
+                View("ContentTypeCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypeCondition condition, UpdateEditorContext context)
+    public override IDisplayResult Edit(ContentTypeCondition condition, BuildEditorContext context)
+    {
+        return Initialize<ContentTypeConditionViewModel>("ContentTypeCondition_Fields_Edit", m =>
         {
-            var model = new ContentTypeConditionViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
-
-            condition.Value = model.Value;
-            if (!string.IsNullOrEmpty(model.SelectedOperation) && _options.Factories.TryGetValue(model.SelectedOperation, out var factory))
+            if (condition.Operation != null && _options.ConditionOperatorOptionByType.TryGetValue(condition.Operation.GetType(), out var option))
             {
-                condition.Operation = factory.Create();
+                m.SelectedOperation = option.Factory.Name;
             }
+            m.Value = condition.Value;
+            m.Condition = condition;
+        }).Location("Content");
+    }
+
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypeCondition condition, UpdateEditorContext context)
+    {
+        var model = new ContentTypeConditionViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            return Edit(condition, context);
+        condition.Value = model.Value;
+        if (!string.IsNullOrEmpty(model.SelectedOperation) && _options.Factories.TryGetValue(model.SelectedOperation, out var factory))
+        {
+            condition.Operation = factory.Create();
         }
+
+        return Edit(condition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/ContentTypeConditionEvaluatorDriver.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/ContentTypeConditionEvaluatorDriver.cs
index d881cb3902c..2240ae54512 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/ContentTypeConditionEvaluatorDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/ContentTypeConditionEvaluatorDriver.cs
@@ -9,57 +9,56 @@
 using OrchardCore.Rules.Models;
 using OrchardCore.Rules.Services;
 
-namespace OrchardCore.Rules.Drivers
+namespace OrchardCore.Rules.Drivers;
+
+/// <summary>
+/// Saves references to content types which have been displayed during a request.
+/// </summary>
+public sealed class ContentTypeConditionEvaluatorDriver : ContentDisplayDriver, IConditionEvaluator
 {
-    /// <summary>
-    /// Saves references to content types which have been displayed during a request.
-    /// </summary>
-    public sealed class ContentTypeConditionEvaluatorDriver : ContentDisplayDriver, IConditionEvaluator
-    {
-        private readonly IConditionOperatorResolver _operatorResolver;
+    private readonly IConditionOperatorResolver _operatorResolver;
+
+    // Hashset to prevent duplicate entries, but comparison is done by the comparers.
+    private readonly HashSet<string> _contentTypes = [];
 
-        // Hashset to prevent duplicate entries, but comparison is done by the comparers.
-        private readonly HashSet<string> _contentTypes = [];
+    public ContentTypeConditionEvaluatorDriver(IConditionOperatorResolver operatorResolver)
+    {
+        _operatorResolver = operatorResolver;
+    }
 
-        public ContentTypeConditionEvaluatorDriver(IConditionOperatorResolver operatorResolver)
+    public override Task<IDisplayResult> DisplayAsync(ContentItem contentItem, BuildDisplayContext context)
+    {
+        // Do not include Widgets or any display type other than Detail.
+        if (context.DisplayType == "Detail" && (!context.Shape.TryGetProperty(nameof(ContentTypeSettings.Stereotype), out string stereotype) || stereotype != "Widget"))
         {
-            _operatorResolver = operatorResolver;
+            _contentTypes.Add(contentItem.ContentType);
         }
 
-        public override Task<IDisplayResult> DisplayAsync(ContentItem contentItem, BuildDisplayContext context)
-        {
-            // Do not include Widgets or any display type other than Detail.
-            if (context.DisplayType == "Detail" && (!context.Shape.TryGetProperty(nameof(ContentTypeSettings.Stereotype), out string stereotype) || stereotype != "Widget"))
-            {
-                _contentTypes.Add(contentItem.ContentType);
-            }
+        return Task.FromResult<IDisplayResult>(null);
+    }
 
-            return Task.FromResult<IDisplayResult>(null);
-        }
+    public ValueTask<bool> EvaluateAsync(Condition condition)
+        => EvaluateAsync(condition as ContentTypeCondition);
 
-        public ValueTask<bool> EvaluateAsync(Condition condition)
-            => EvaluateAsync(condition as ContentTypeCondition);
+    private ValueTask<bool> EvaluateAsync(ContentTypeCondition condition)
+    {
+        var operatorComparer = _operatorResolver.GetOperatorComparer(condition.Operation);
 
-        private ValueTask<bool> EvaluateAsync(ContentTypeCondition condition)
+        // If no content types are considered, use the empty string as the value to compare against,
+        // since we still want comparisons such as "Does Not Equal", "Does Not Start With", etc. to evaluate to true in this case.
+        if (_contentTypes.Count == 0)
         {
-            var operatorComparer = _operatorResolver.GetOperatorComparer(condition.Operation);
-
-            // If no content types are considered, use the empty string as the value to compare against,
-            // since we still want comparisons such as "Does Not Equal", "Does Not Start With", etc. to evaluate to true in this case.
-            if (_contentTypes.Count == 0)
-            {
-                return ValueTask.FromResult(operatorComparer.Compare(condition.Operation, string.Empty, condition.Value));
-            }
+            return ValueTask.FromResult(operatorComparer.Compare(condition.Operation, string.Empty, condition.Value));
+        }
 
-            foreach (var contentType in _contentTypes)
+        foreach (var contentType in _contentTypes)
+        {
+            if (operatorComparer.Compare(condition.Operation, contentType, condition.Value))
             {
-                if (operatorComparer.Compare(condition.Operation, contentType, condition.Value))
-                {
-                    return ValueTask.FromResult(true);
-                }
+                return ValueTask.FromResult(true);
             }
-
-            return ValueTask.FromResult(false);
         }
+
+        return ValueTask.FromResult(false);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/CultureConditionDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/CultureConditionDisplayDriver.cs
index ef5a63dc019..c31bf1459a5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/CultureConditionDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/CultureConditionDisplayDriver.cs
@@ -5,51 +5,50 @@
 using OrchardCore.Rules.Models;
 using OrchardCore.Rules.ViewModels;
 
-namespace OrchardCore.Rules.Drivers
+namespace OrchardCore.Rules.Drivers;
+
+public sealed class CultureConditionDisplayDriver : DisplayDriver<Condition, CultureCondition>
 {
-    public sealed class CultureConditionDisplayDriver : DisplayDriver<Condition, CultureCondition>
-    {
-        private readonly ConditionOperatorOptions _options;
+    private readonly ConditionOperatorOptions _options;
 
-        public CultureConditionDisplayDriver(IOptions<ConditionOperatorOptions> options)
-        {
-            _options = options.Value;
-        }
+    public CultureConditionDisplayDriver(IOptions<ConditionOperatorOptions> options)
+    {
+        _options = options.Value;
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(CultureCondition condition, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("CultureCondition_Fields_Summary", condition).Location("Summary", "Content"),
-                    View("CultureCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content")
-                );
-        }
+    public override Task<IDisplayResult> DisplayAsync(CultureCondition condition, BuildDisplayContext context)
+    {
+        return
+            CombineAsync(
+                View("CultureCondition_Fields_Summary", condition).Location("Summary", "Content"),
+                View("CultureCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(CultureCondition condition, BuildEditorContext context)
-        {
-            return Initialize<CultureConditionViewModel>("CultureCondition_Fields_Edit", m =>
+    public override IDisplayResult Edit(CultureCondition condition, BuildEditorContext context)
+    {
+        return Initialize<CultureConditionViewModel>("CultureCondition_Fields_Edit", m =>
+            {
+                if (condition.Operation != null && _options.ConditionOperatorOptionByType.TryGetValue(condition.Operation.GetType(), out var option))
                 {
-                    if (condition.Operation != null && _options.ConditionOperatorOptionByType.TryGetValue(condition.Operation.GetType(), out var option))
-                    {
-                        m.SelectedOperation = option.Factory.Name;
-                    }
-                    m.Value = condition.Value;
-                    m.Condition = condition;
-                }).Location("Content");
-        }
-
-        public override async Task<IDisplayResult> UpdateAsync(CultureCondition condition, UpdateEditorContext context)
-        {
-            var model = new CultureConditionViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+                    m.SelectedOperation = option.Factory.Name;
+                }
+                m.Value = condition.Value;
+                m.Condition = condition;
+            }).Location("Content");
+    }
 
-            condition.Value = model.Value;
-            if (!string.IsNullOrEmpty(model.SelectedOperation) && _options.Factories.TryGetValue(model.SelectedOperation, out var factory))
-            {
-                condition.Operation = factory.Create();
-            }
+    public override async Task<IDisplayResult> UpdateAsync(CultureCondition condition, UpdateEditorContext context)
+    {
+        var model = new CultureConditionViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            return Edit(condition, context);
+        condition.Value = model.Value;
+        if (!string.IsNullOrEmpty(model.SelectedOperation) && _options.Factories.TryGetValue(model.SelectedOperation, out var factory))
+        {
+            condition.Operation = factory.Create();
         }
+
+        return Edit(condition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/HomepageConditionDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/HomepageConditionDisplayDriver.cs
index acc9d2eb6dd..356b1870ad1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/HomepageConditionDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/HomepageConditionDisplayDriver.cs
@@ -4,33 +4,32 @@
 using OrchardCore.Rules.Models;
 using OrchardCore.Rules.ViewModels;
 
-namespace OrchardCore.Rules.Drivers
+namespace OrchardCore.Rules.Drivers;
+
+public sealed class HomepageConditionDisplayDriver : DisplayDriver<Condition, HomepageCondition>
 {
-    public sealed class HomepageConditionDisplayDriver : DisplayDriver<Condition, HomepageCondition>
+    public override Task<IDisplayResult> DisplayAsync(HomepageCondition condition, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(HomepageCondition condition, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("HomepageCondition_Fields_Summary", condition).Location("Summary", "Content"),
-                    View("HomepageCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("HomepageCondition_Fields_Summary", condition).Location("Summary", "Content"),
+                View("HomepageCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(HomepageCondition condition, BuildEditorContext context)
+    public override IDisplayResult Edit(HomepageCondition condition, BuildEditorContext context)
+    {
+        return Initialize<HomepageConditionViewModel>("HomepageCondition_Fields_Edit", m =>
         {
-            return Initialize<HomepageConditionViewModel>("HomepageCondition_Fields_Edit", m =>
-            {
-                m.Value = condition.Value;
-                m.Condition = condition;
-            }).Location("Content");
-        }
+            m.Value = condition.Value;
+            m.Condition = condition;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(HomepageCondition condition, UpdateEditorContext context)
-        {
-            await context.Updater.TryUpdateModelAsync(condition, Prefix, x => x.Value);
+    public override async Task<IDisplayResult> UpdateAsync(HomepageCondition condition, UpdateEditorContext context)
+    {
+        await context.Updater.TryUpdateModelAsync(condition, Prefix, x => x.Value);
 
-            return Edit(condition, context);
-        }
+        return Edit(condition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/IsAnonymousConditionDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/IsAnonymousConditionDisplayDriver.cs
index 929866cef0d..c06313ef58b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/IsAnonymousConditionDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/IsAnonymousConditionDisplayDriver.cs
@@ -3,22 +3,21 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.Drivers
+namespace OrchardCore.Rules.Drivers;
+
+public sealed class IsAnonymousConditionDisplayDriver : DisplayDriver<Condition, IsAnonymousCondition>
 {
-    public sealed class IsAnonymousConditionDisplayDriver : DisplayDriver<Condition, IsAnonymousCondition>
+    public override Task<IDisplayResult> DisplayAsync(IsAnonymousCondition condition, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(IsAnonymousCondition condition, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("IsAnonymousCondition_Fields_Summary", condition).Location("Summary", "Content"),
-                    View("IsAnonymousCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("IsAnonymousCondition_Fields_Summary", condition).Location("Summary", "Content"),
+                View("IsAnonymousCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(IsAnonymousCondition condition, BuildEditorContext context)
-        {
-            return View("IsAnonymousCondition_Fields_Edit", condition).Location("Content");
-        }
+    public override IDisplayResult Edit(IsAnonymousCondition condition, BuildEditorContext context)
+    {
+        return View("IsAnonymousCondition_Fields_Edit", condition).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/IsAuthenticatedConditionDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/IsAuthenticatedConditionDisplayDriver.cs
index 7866871f909..555fe982317 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/IsAuthenticatedConditionDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/IsAuthenticatedConditionDisplayDriver.cs
@@ -3,22 +3,21 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.Drivers
+namespace OrchardCore.Rules.Drivers;
+
+public sealed class IsAuthenticatedConditionDisplayDriver : DisplayDriver<Condition, IsAuthenticatedCondition>
 {
-    public sealed class IsAuthenticatedConditionDisplayDriver : DisplayDriver<Condition, IsAuthenticatedCondition>
+    public override Task<IDisplayResult> DisplayAsync(IsAuthenticatedCondition condition, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(IsAuthenticatedCondition condition, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("IsAuthenticatedCondition_Fields_Summary", condition).Location("Summary", "Content"),
-                    View("IsAuthenticatedCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("IsAuthenticatedCondition_Fields_Summary", condition).Location("Summary", "Content"),
+                View("IsAuthenticatedCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(IsAuthenticatedCondition condition, BuildEditorContext context)
-        {
-            return View("IsAuthenticatedCondition_Fields_Edit", condition).Location("Content");
-        }
+    public override IDisplayResult Edit(IsAuthenticatedCondition condition, BuildEditorContext context)
+    {
+        return View("IsAuthenticatedCondition_Fields_Edit", condition).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/JavascriptConditionDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/JavascriptConditionDisplayDriver.cs
index 8075fccb3b8..e0e6176256e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/JavascriptConditionDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/JavascriptConditionDisplayDriver.cs
@@ -12,88 +12,87 @@
 using OrchardCore.Rules.Services;
 using OrchardCore.Rules.ViewModels;
 
-namespace OrchardCore.Rules.Drivers
+namespace OrchardCore.Rules.Drivers;
+
+public sealed class JavascriptConditionDisplayDriver : DisplayDriver<Condition, JavascriptCondition>
 {
-    public sealed class JavascriptConditionDisplayDriver : DisplayDriver<Condition, JavascriptCondition>
+    private readonly INotifier _notifier;
+    private readonly JavascriptConditionEvaluator _evaluator;
+
+    internal readonly IHtmlLocalizer H;
+    internal readonly IStringLocalizer S;
+
+    public JavascriptConditionDisplayDriver(
+        IHtmlLocalizer<JavascriptConditionDisplayDriver> htmlLocalizer,
+        IStringLocalizer<JavascriptConditionDisplayDriver> stringLocalizer,
+        JavascriptConditionEvaluator evaluator,
+        INotifier notifier)
     {
-        private readonly INotifier _notifier;
-        private readonly JavascriptConditionEvaluator _evaluator;
+        H = htmlLocalizer;
+        S = stringLocalizer;
+        _evaluator = evaluator;
+        _notifier = notifier;
+    }
 
-        internal readonly IHtmlLocalizer H;
-        internal readonly IStringLocalizer S;
+    public override Task<IDisplayResult> DisplayAsync(JavascriptCondition condition, BuildDisplayContext context)
+    {
+        return
+            CombineAsync(
+                View("JavascriptCondition_Fields_Summary", condition).Location("Summary", "Content"),
+                View("JavascriptCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content")
+            );
+    }
 
-        public JavascriptConditionDisplayDriver(
-            IHtmlLocalizer<JavascriptConditionDisplayDriver> htmlLocalizer,
-            IStringLocalizer<JavascriptConditionDisplayDriver> stringLocalizer,
-            JavascriptConditionEvaluator evaluator,
-            INotifier notifier)
+    public override IDisplayResult Edit(JavascriptCondition condition, BuildEditorContext context)
+    {
+        return Initialize<JavascriptConditionViewModel>("JavascriptCondition_Fields_Edit", m =>
         {
-            H = htmlLocalizer;
-            S = stringLocalizer;
-            _evaluator = evaluator;
-            _notifier = notifier;
-        }
+            m.Script = condition.Script;
+            m.Condition = condition;
+        }).Location("Content");
+    }
+
+    public override async Task<IDisplayResult> UpdateAsync(JavascriptCondition condition, UpdateEditorContext context)
+    {
+        var model = new JavascriptConditionViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-        public override Task<IDisplayResult> DisplayAsync(JavascriptCondition condition, BuildDisplayContext context)
+        // CodeMirror hides the textarea which displays the error when updater.ModelState.AddModelError() is used,
+        // that's why a notifier is used to show validation errors.
+        if (string.IsNullOrWhiteSpace(model.Script))
         {
-            return
-                CombineAsync(
-                    View("JavascriptCondition_Fields_Summary", condition).Location("Summary", "Content"),
-                    View("JavascriptCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content")
-                );
+            context.Updater.ModelState.AddModelError(Prefix, nameof(model.Script), S["Please provide a script."]);
+            await _notifier.ErrorAsync(H["Please provide a script."]);
+
+            return Edit(condition, context);
         }
 
-        public override IDisplayResult Edit(JavascriptCondition condition, BuildEditorContext context)
+        try
         {
-            return Initialize<JavascriptConditionViewModel>("JavascriptCondition_Fields_Edit", m =>
+            _ = await _evaluator.EvaluateAsync(new()
             {
-                m.Script = condition.Script;
-                m.Condition = condition;
-            }).Location("Content");
+                ConditionId = condition.ConditionId,
+                Name = condition.Name,
+                Script = model.Script
+            });
+            condition.Script = model.Script;
         }
-
-        public override async Task<IDisplayResult> UpdateAsync(JavascriptCondition condition, UpdateEditorContext context)
+        catch (ParseErrorException ex) // Invalid syntax
         {
-            var model = new JavascriptConditionViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
-
-            // CodeMirror hides the textarea which displays the error when updater.ModelState.AddModelError() is used,
-            // that's why a notifier is used to show validation errors.
-            if (string.IsNullOrWhiteSpace(model.Script))
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Script), S["Please provide a script."]);
-                await _notifier.ErrorAsync(H["Please provide a script."]);
-
-                return Edit(condition, context);
-            }
-
-            try
-            {
-                _ = await _evaluator.EvaluateAsync(new()
-                {
-                    ConditionId = condition.ConditionId,
-                    Name = condition.Name,
-                    Script = model.Script
-                });
-                condition.Script = model.Script;
-            }
-            catch (ParseErrorException ex) // Invalid syntax
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Script), S["The script couldn't be parsed. Details: {0}", ex.Message]);
-                await _notifier.ErrorAsync(H["The script couldn't be parsed. Details: {0}", ex.Message]);
-            }
-            catch (JavaScriptException ex) // Evaluation threw an Error
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Script), S["JavaScript evaluation resulted in an exception. Details: {0}", ex.Message]);
-                await _notifier.ErrorAsync(H["JavaScript evaluation resulted in an exception. Details: {0}", ex.Message]);
-            }
-            catch (Exception ex) when (ex is InvalidCastException or FormatException) // Evaluation completes successfully, but the result cannot be converted to Boolean
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Script), S["The script evaluation failed. Details: {0}", ex.Message]);
-                await _notifier.ErrorAsync(H["The script evaluation failed. Details: {0}", ex.Message]);
-            }
-
-            return Edit(condition, context);
+            context.Updater.ModelState.AddModelError(Prefix, nameof(model.Script), S["The script couldn't be parsed. Details: {0}", ex.Message]);
+            await _notifier.ErrorAsync(H["The script couldn't be parsed. Details: {0}", ex.Message]);
+        }
+        catch (JavaScriptException ex) // Evaluation threw an Error
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(model.Script), S["JavaScript evaluation resulted in an exception. Details: {0}", ex.Message]);
+            await _notifier.ErrorAsync(H["JavaScript evaluation resulted in an exception. Details: {0}", ex.Message]);
         }
+        catch (Exception ex) when (ex is InvalidCastException or FormatException) // Evaluation completes successfully, but the result cannot be converted to Boolean
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(model.Script), S["The script evaluation failed. Details: {0}", ex.Message]);
+            await _notifier.ErrorAsync(H["The script evaluation failed. Details: {0}", ex.Message]);
+        }
+
+        return Edit(condition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/RoleConditionDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/RoleConditionDisplayDriver.cs
index 03801203b3f..1cd49c42bfa 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/RoleConditionDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/RoleConditionDisplayDriver.cs
@@ -5,51 +5,50 @@
 using OrchardCore.Rules.Models;
 using OrchardCore.Rules.ViewModels;
 
-namespace OrchardCore.Rules.Drivers
+namespace OrchardCore.Rules.Drivers;
+
+public sealed class RoleConditionDisplayDriver : DisplayDriver<Condition, RoleCondition>
 {
-    public sealed class RoleConditionDisplayDriver : DisplayDriver<Condition, RoleCondition>
-    {
-        private readonly ConditionOperatorOptions _options;
+    private readonly ConditionOperatorOptions _options;
 
-        public RoleConditionDisplayDriver(IOptions<ConditionOperatorOptions> options)
-        {
-            _options = options.Value;
-        }
+    public RoleConditionDisplayDriver(IOptions<ConditionOperatorOptions> options)
+    {
+        _options = options.Value;
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(RoleCondition condition, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("RoleCondition_Fields_Summary", condition).Location("Summary", "Content"),
-                    View("RoleCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content")
-                );
-        }
+    public override Task<IDisplayResult> DisplayAsync(RoleCondition condition, BuildDisplayContext context)
+    {
+        return
+            CombineAsync(
+                View("RoleCondition_Fields_Summary", condition).Location("Summary", "Content"),
+                View("RoleCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(RoleCondition condition, BuildEditorContext context)
-        {
-            return Initialize<RoleConditionViewModel>("RoleCondition_Fields_Edit", m =>
+    public override IDisplayResult Edit(RoleCondition condition, BuildEditorContext context)
+    {
+        return Initialize<RoleConditionViewModel>("RoleCondition_Fields_Edit", m =>
+            {
+                if (condition.Operation != null && _options.ConditionOperatorOptionByType.TryGetValue(condition.Operation.GetType(), out var option))
                 {
-                    if (condition.Operation != null && _options.ConditionOperatorOptionByType.TryGetValue(condition.Operation.GetType(), out var option))
-                    {
-                        m.SelectedOperation = option.Factory.Name;
-                    }
-                    m.Value = condition.Value;
-                    m.Condition = condition;
-                }).Location("Content");
-        }
-
-        public override async Task<IDisplayResult> UpdateAsync(RoleCondition condition, UpdateEditorContext context)
-        {
-            var model = new RoleConditionViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
-            condition.Value = model.Value;
+                    m.SelectedOperation = option.Factory.Name;
+                }
+                m.Value = condition.Value;
+                m.Condition = condition;
+            }).Location("Content");
+    }
 
-            if (!string.IsNullOrEmpty(model.SelectedOperation) && _options.Factories.TryGetValue(model.SelectedOperation, out var factory))
-            {
-                condition.Operation = factory.Create();
-            }
+    public override async Task<IDisplayResult> UpdateAsync(RoleCondition condition, UpdateEditorContext context)
+    {
+        var model = new RoleConditionViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
+        condition.Value = model.Value;
 
-            return Edit(condition, context);
+        if (!string.IsNullOrEmpty(model.SelectedOperation) && _options.Factories.TryGetValue(model.SelectedOperation, out var factory))
+        {
+            condition.Operation = factory.Create();
         }
+
+        return Edit(condition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/RuleDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/RuleDisplayDriver.cs
index d393a4c9e53..f71b9ee93aa 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/RuleDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/RuleDisplayDriver.cs
@@ -4,20 +4,19 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Rules.ViewModels;
 
-namespace OrchardCore.Rules.Drivers
+namespace OrchardCore.Rules.Drivers;
+
+public sealed class RuleDisplayDriver : DisplayDriver<Rule>
 {
-    public sealed class RuleDisplayDriver : DisplayDriver<Rule>
+    public override Task<IDisplayResult> DisplayAsync(Rule rule, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(Rule rule, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                View("Rule_Fields_Summary", rule).Location("Summary", "Content"),
-                Initialize<ConditionGroupViewModel>("ConditionGroup_Fields_Summary", m =>
-                {
-                    m.Entries = rule.Conditions.Select(x => new ConditionEntry { Condition = x }).ToArray();
-                    m.Condition = rule;
-                }).Location("Summary", "Content")
-            );
-        }
+        return CombineAsync(
+            View("Rule_Fields_Summary", rule).Location("Summary", "Content"),
+            Initialize<ConditionGroupViewModel>("ConditionGroup_Fields_Summary", m =>
+            {
+                m.Entries = rule.Conditions.Select(x => new ConditionEntry { Condition = x }).ToArray();
+                m.Condition = rule;
+            }).Location("Summary", "Content")
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/UrlConditionDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/UrlConditionDisplayDriver.cs
index 5f74ac21bf1..8576b2485a4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/UrlConditionDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Drivers/UrlConditionDisplayDriver.cs
@@ -5,51 +5,50 @@
 using OrchardCore.Rules.Models;
 using OrchardCore.Rules.ViewModels;
 
-namespace OrchardCore.Rules.Drivers
-{
-    public sealed class UrlConditionDisplayDriver : DisplayDriver<Condition, UrlCondition>
-    {
-        private readonly ConditionOperatorOptions _options;
+namespace OrchardCore.Rules.Drivers;
 
-        public UrlConditionDisplayDriver(IOptions<ConditionOperatorOptions> options)
-        {
-            _options = options.Value;
-        }
+public sealed class UrlConditionDisplayDriver : DisplayDriver<Condition, UrlCondition>
+{
+    private readonly ConditionOperatorOptions _options;
 
-        public override Task<IDisplayResult> DisplayAsync(UrlCondition condition, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("UrlCondition_Fields_Summary", condition).Location("Summary", "Content"),
-                    View("UrlCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content")
-                );
-        }
+    public UrlConditionDisplayDriver(IOptions<ConditionOperatorOptions> options)
+    {
+        _options = options.Value;
+    }
 
-        public override IDisplayResult Edit(UrlCondition condition, BuildEditorContext context)
-        {
-            return Initialize<UrlConditionViewModel>("UrlCondition_Fields_Edit", m =>
-            {
-                if (condition.Operation != null && _options.ConditionOperatorOptionByType.TryGetValue(condition.Operation.GetType(), out var option))
-                {
-                    m.SelectedOperation = option.Factory.Name;
-                }
-                m.Value = condition.Value;
-                m.Condition = condition;
-            }).Location("Content");
-        }
+    public override Task<IDisplayResult> DisplayAsync(UrlCondition condition, BuildDisplayContext context)
+    {
+        return
+            CombineAsync(
+                View("UrlCondition_Fields_Summary", condition).Location("Summary", "Content"),
+                View("UrlCondition_Fields_Thumbnail", condition).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(UrlCondition condition, UpdateEditorContext context)
+    public override IDisplayResult Edit(UrlCondition condition, BuildEditorContext context)
+    {
+        return Initialize<UrlConditionViewModel>("UrlCondition_Fields_Edit", m =>
         {
-            var model = new UrlConditionViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
-            condition.Value = model.Value;
-
-            if (!string.IsNullOrEmpty(model.SelectedOperation) && _options.Factories.TryGetValue(model.SelectedOperation, out var factory))
+            if (condition.Operation != null && _options.ConditionOperatorOptionByType.TryGetValue(condition.Operation.GetType(), out var option))
             {
-                condition.Operation = factory.Create();
+                m.SelectedOperation = option.Factory.Name;
             }
+            m.Value = condition.Value;
+            m.Condition = condition;
+        }).Location("Content");
+    }
+
+    public override async Task<IDisplayResult> UpdateAsync(UrlCondition condition, UpdateEditorContext context)
+    {
+        var model = new UrlConditionViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
+        condition.Value = model.Value;
 
-            return Edit(condition, context);
+        if (!string.IsNullOrEmpty(model.SelectedOperation) && _options.Factories.TryGetValue(model.SelectedOperation, out var factory))
+        {
+            condition.Operation = factory.Create();
         }
+
+        return Edit(condition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Models/AllConditionGroup.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Models/AllConditionGroup.cs
index be35b1dc547..99dec096329 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Models/AllConditionGroup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Models/AllConditionGroup.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Rules.Models
+namespace OrchardCore.Rules.Models;
+
+public class AllConditionGroup : DisplayTextConditionGroup
 {
-    public class AllConditionGroup : DisplayTextConditionGroup
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Models/AnyConditionGroup.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Models/AnyConditionGroup.cs
index 5b7d887f052..ad1a1c6459c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Models/AnyConditionGroup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Models/AnyConditionGroup.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Rules.Models
+namespace OrchardCore.Rules.Models;
+
+public class AnyConditionGroup : DisplayTextConditionGroup
 {
-    public class AnyConditionGroup : DisplayTextConditionGroup
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Models/BooleanCondition.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Models/BooleanCondition.cs
index 54608d773eb..5a8cc106aee 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Models/BooleanCondition.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Models/BooleanCondition.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Rules.Models
+namespace OrchardCore.Rules.Models;
+
+public class BooleanCondition : Condition
 {
-    public class BooleanCondition : Condition
-    {
-        public bool Value { get; set; } = true;
-    }
+    public bool Value { get; set; } = true;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Models/ContentTypeCondition.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Models/ContentTypeCondition.cs
index c6bc4801579..084752e9cb5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Models/ContentTypeCondition.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Models/ContentTypeCondition.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Rules.Models
+namespace OrchardCore.Rules.Models;
+
+public class ContentTypeCondition : Condition
 {
-    public class ContentTypeCondition : Condition
-    {
-        public string Value { get; set; }
-        public ConditionOperator Operation { get; set; }
-    }
+    public string Value { get; set; }
+    public ConditionOperator Operation { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Models/CultureCondition.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Models/CultureCondition.cs
index 36c0978a957..fa0deb1ea5d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Models/CultureCondition.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Models/CultureCondition.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Rules.Models
+namespace OrchardCore.Rules.Models;
+
+public class CultureCondition : Condition
 {
-    public class CultureCondition : Condition
-    {
-        public string Value { get; set; }
-        public ConditionOperator Operation { get; set; }
-    }
+    public string Value { get; set; }
+    public ConditionOperator Operation { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Models/HomepageCondition.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Models/HomepageCondition.cs
index b1ac78fc441..d7729d26c5b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Models/HomepageCondition.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Models/HomepageCondition.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Rules.Models
+namespace OrchardCore.Rules.Models;
+
+public class HomepageCondition : Condition
 {
-    public class HomepageCondition : Condition
-    {
-        public bool Value { get; set; } = true;
-    }
+    public bool Value { get; set; } = true;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Models/IsAnonymousCondition.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Models/IsAnonymousCondition.cs
index 6da53467093..d07585e26b4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Models/IsAnonymousCondition.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Models/IsAnonymousCondition.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Rules.Models
+namespace OrchardCore.Rules.Models;
+
+public class IsAnonymousCondition : Condition
 {
-    public class IsAnonymousCondition : Condition
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Models/IsAuthenticatedCondition.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Models/IsAuthenticatedCondition.cs
index e597654cb10..e5b69f8c153 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Models/IsAuthenticatedCondition.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Models/IsAuthenticatedCondition.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Rules.Models
+namespace OrchardCore.Rules.Models;
+
+public class IsAuthenticatedCondition : Condition
 {
-    public class IsAuthenticatedCondition : Condition
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Models/JavascriptCondition.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Models/JavascriptCondition.cs
index e15ad5c8f4f..2d884c30b71 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Models/JavascriptCondition.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Models/JavascriptCondition.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Rules.Models
+namespace OrchardCore.Rules.Models;
+
+public class JavascriptCondition : Condition
 {
-    public class JavascriptCondition : Condition
-    {
-        public string Script { get; set; }
-    }
+    public string Script { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Models/RoleCondition.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Models/RoleCondition.cs
index 27b9ab182db..2787e2d8e2d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Models/RoleCondition.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Models/RoleCondition.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Rules.Models
+namespace OrchardCore.Rules.Models;
+
+public class RoleCondition : Condition
 {
-    public class RoleCondition : Condition
-    {
-        public string Value { get; set; }
-        public ConditionOperator Operation { get; set; }
-    }
+    public string Value { get; set; }
+    public ConditionOperator Operation { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Models/StringOperators.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Models/StringOperators.cs
index 38231a650c2..6f56ce28090 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Models/StringOperators.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Models/StringOperators.cs
@@ -1,39 +1,38 @@
-namespace OrchardCore.Rules.Models
+namespace OrchardCore.Rules.Models;
+
+public abstract class StringOperator : ConditionOperator
 {
-    public abstract class StringOperator : ConditionOperator
-    {
-        public bool CaseSensitive { get; set; }
-    }
+    public bool CaseSensitive { get; set; }
+}
 
-    public class StringEqualsOperator : StringOperator
-    {
-    }
+public class StringEqualsOperator : StringOperator
+{
+}
 
-    public class StringNotEqualsOperator : StringOperator, INegateOperator
-    {
-    }
+public class StringNotEqualsOperator : StringOperator, INegateOperator
+{
+}
 
-    public class StringStartsWithOperator : StringOperator
-    {
-    }
+public class StringStartsWithOperator : StringOperator
+{
+}
 
-    public class StringNotStartsWithOperator : StringOperator, INegateOperator
-    {
-    }
+public class StringNotStartsWithOperator : StringOperator, INegateOperator
+{
+}
 
-    public class StringEndsWithOperator : StringOperator
-    {
-    }
+public class StringEndsWithOperator : StringOperator
+{
+}
 
-    public class StringNotEndsWithOperator : StringOperator, INegateOperator
-    {
-    }
+public class StringNotEndsWithOperator : StringOperator, INegateOperator
+{
+}
 
-    public class StringContainsOperator : StringOperator
-    {
-    }
+public class StringContainsOperator : StringOperator
+{
+}
 
-    public class StringNotContainsOperator : StringOperator, INegateOperator
-    {
-    }
+public class StringNotContainsOperator : StringOperator, INegateOperator
+{
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Models/UrlCondition.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Models/UrlCondition.cs
index a2850c186f2..eae336ba264 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Models/UrlCondition.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Models/UrlCondition.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Rules.Models
+namespace OrchardCore.Rules.Models;
+
+public class UrlCondition : Condition
 {
-    public class UrlCondition : Condition
-    {
-        public string Value { get; set; }
-        public ConditionOperator Operation { get; set; }
-    }
+    public string Value { get; set; }
+    public ConditionOperator Operation { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Services/AllConditionEvaluator.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Services/AllConditionEvaluator.cs
index 9a6ab5e334d..5dc4e8a9b73 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Services/AllConditionEvaluator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Services/AllConditionEvaluator.cs
@@ -1,35 +1,34 @@
 using System.Threading.Tasks;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.Services
+namespace OrchardCore.Rules.Services;
+
+public class AllConditionEvaluator : ConditionEvaluator<AllConditionGroup>
 {
-    public class AllConditionEvaluator : ConditionEvaluator<AllConditionGroup>
-    {
-        private readonly IConditionResolver _conditionResolver;
+    private readonly IConditionResolver _conditionResolver;
 
-        public AllConditionEvaluator(IConditionResolver conditionResolver)
-        {
-            _conditionResolver = conditionResolver;
-        }
+    public AllConditionEvaluator(IConditionResolver conditionResolver)
+    {
+        _conditionResolver = conditionResolver;
+    }
 
-        public async override ValueTask<bool> EvaluateAsync(AllConditionGroup condition)
+    public async override ValueTask<bool> EvaluateAsync(AllConditionGroup condition)
+    {
+        foreach (var childCondition in condition.Conditions)
         {
-            foreach (var childCondition in condition.Conditions)
+            var evaluator = _conditionResolver.GetConditionEvaluator(childCondition);
+            if (evaluator is null || !await evaluator.EvaluateAsync(childCondition))
             {
-                var evaluator = _conditionResolver.GetConditionEvaluator(childCondition);
-                if (evaluator is null || !await evaluator.EvaluateAsync(childCondition))
-                {
-                    return false;
-                }
-            }
-
-            if (condition.Conditions.Count > 0)
-            {
-                return true;
+                return false;
             }
+        }
 
-            // This rule requires all conditions to be evaluated as true.
-            return false;
+        if (condition.Conditions.Count > 0)
+        {
+            return true;
         }
+
+        // This rule requires all conditions to be evaluated as true.
+        return false;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Services/AnyConditionEvaluator.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Services/AnyConditionEvaluator.cs
index 2208270a29e..fc3593125d7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Services/AnyConditionEvaluator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Services/AnyConditionEvaluator.cs
@@ -1,29 +1,28 @@
 using System.Threading.Tasks;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.Services
+namespace OrchardCore.Rules.Services;
+
+public class AnyConditionEvaluator : ConditionEvaluator<AnyConditionGroup>
 {
-    public class AnyConditionEvaluator : ConditionEvaluator<AnyConditionGroup>
-    {
-        private readonly IConditionResolver _conditionResolver;
+    private readonly IConditionResolver _conditionResolver;
 
-        public AnyConditionEvaluator(IConditionResolver conditionResolver)
-        {
-            _conditionResolver = conditionResolver;
-        }
+    public AnyConditionEvaluator(IConditionResolver conditionResolver)
+    {
+        _conditionResolver = conditionResolver;
+    }
 
-        public async override ValueTask<bool> EvaluateAsync(AnyConditionGroup condition)
+    public async override ValueTask<bool> EvaluateAsync(AnyConditionGroup condition)
+    {
+        foreach (var childCondition in condition.Conditions)
         {
-            foreach (var childCondition in condition.Conditions)
+            var evaluator = _conditionResolver.GetConditionEvaluator(childCondition);
+            if (evaluator is null || await evaluator.EvaluateAsync(childCondition))
             {
-                var evaluator = _conditionResolver.GetConditionEvaluator(childCondition);
-                if (evaluator is null || await evaluator.EvaluateAsync(childCondition))
-                {
-                    return true;
-                }
+                return true;
             }
-
-            return false;
         }
+
+        return false;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Services/BooleanConditionEvaluator.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Services/BooleanConditionEvaluator.cs
index 6070a993a78..eabfc31a6ca 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Services/BooleanConditionEvaluator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Services/BooleanConditionEvaluator.cs
@@ -1,11 +1,10 @@
 using System.Threading.Tasks;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.Services
+namespace OrchardCore.Rules.Services;
+
+public class BooleanConditionEvaluator : ConditionEvaluator<BooleanCondition>
 {
-    public class BooleanConditionEvaluator : ConditionEvaluator<BooleanCondition>
-    {
-        public override ValueTask<bool> EvaluateAsync(BooleanCondition condition)
-            => condition.Value ? True : False;
-    }
+    public override ValueTask<bool> EvaluateAsync(BooleanCondition condition)
+        => condition.Value ? True : False;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Services/ConditionIdGenerator.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Services/ConditionIdGenerator.cs
index 84e61bf09db..ae2262e3c4e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Services/ConditionIdGenerator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Services/ConditionIdGenerator.cs
@@ -1,19 +1,18 @@
 using OrchardCore.Entities;
 
-namespace OrchardCore.Rules.Services
+namespace OrchardCore.Rules.Services;
+
+public class ConditionIdGenerator : IConditionIdGenerator
 {
-    public class ConditionIdGenerator : IConditionIdGenerator
-    {
-        private readonly IIdGenerator _idGenerator;
+    private readonly IIdGenerator _idGenerator;
 
-        public ConditionIdGenerator(IIdGenerator idGenerator)
-        {
-            _idGenerator = idGenerator;
-        }
+    public ConditionIdGenerator(IIdGenerator idGenerator)
+    {
+        _idGenerator = idGenerator;
+    }
 
-        public void GenerateUniqueId(Condition condition)
-        {
-            condition.ConditionId = _idGenerator.GenerateUniqueId();
-        }
+    public void GenerateUniqueId(Condition condition)
+    {
+        condition.ConditionId = _idGenerator.GenerateUniqueId();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Services/ConditionOperatorConfigureOptions.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Services/ConditionOperatorConfigureOptions.cs
index 6d73135e950..914bdc4c980 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Services/ConditionOperatorConfigureOptions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Services/ConditionOperatorConfigureOptions.cs
@@ -1,63 +1,62 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.Services
+namespace OrchardCore.Rules.Services;
+
+public sealed class ConditionOperatorConfigureOptions : IConfigureOptions<ConditionOperatorOptions>
 {
-    public sealed class ConditionOperatorConfigureOptions : IConfigureOptions<ConditionOperatorOptions>
+    public void Configure(ConditionOperatorOptions options)
     {
-        public void Configure(ConditionOperatorOptions options)
-        {
-            options.Operators.AddRange(
-            [
-                new ConditionOperatorOption<ConditionOperatorConfigureOptions>(
-                    (S) => S["Equals"],
-                    new StringEqualsOperatorComparer(),
-                    typeof(StringEqualsOperator),
-                    new ConditionOperatorFactory<StringEqualsOperator>()
-                ),
-                new ConditionOperatorOption<ConditionOperatorConfigureOptions>(
-                    (S) => S["Does not equal"],
-                    new StringNotEqualsOperatorComparer(),
-                    typeof(StringNotEqualsOperator),
-                    new ConditionOperatorFactory<StringNotEqualsOperator>()
-                ),
-                new ConditionOperatorOption<ConditionOperatorConfigureOptions>(
-                    (S) => S["Starts with"],
-                    new StringStartsWithOperatorComparer(),
-                    typeof(StringStartsWithOperator),
-                    new ConditionOperatorFactory<StringStartsWithOperator>()
-                ),
-                new ConditionOperatorOption<ConditionOperatorConfigureOptions>(
-                    (S) => S["Does not start with"],
-                    new StringNotStartsWithOperatorComparer(),
-                    typeof(StringNotStartsWithOperator),
-                    new ConditionOperatorFactory<StringNotStartsWithOperator>()
-                ),
-                new ConditionOperatorOption<ConditionOperatorConfigureOptions>(
-                    (S) => S["Ends with"],
-                    new StringEndsWithOperatorComparer(),
-                    typeof(StringEndsWithOperator),
-                    new ConditionOperatorFactory<StringEndsWithOperator>()
-                ),
-                new ConditionOperatorOption<ConditionOperatorConfigureOptions>(
-                    (S) => S["Does not end with"],
-                    new StringNotEndsWithOperatorComparer(),
-                    typeof(StringNotEndsWithOperator),
-                    new ConditionOperatorFactory<StringNotEndsWithOperator>()
-                ),
-                new ConditionOperatorOption<ConditionOperatorConfigureOptions>(
-                    (S) => S["Contains"],
-                    new StringContainsOperatorComparer(),
-                    typeof(StringContainsOperator),
-                    new ConditionOperatorFactory<StringContainsOperator>()
-                ),
-                new ConditionOperatorOption<ConditionOperatorConfigureOptions>(
-                    (S) => S["Does not contain"],
-                    new StringNotContainsOperatorComparer(),
-                    typeof(StringNotContainsOperator),
-                    new ConditionOperatorFactory<StringNotContainsOperator>()
-                )
-            ]);
-        }
+        options.Operators.AddRange(
+        [
+            new ConditionOperatorOption<ConditionOperatorConfigureOptions>(
+                (S) => S["Equals"],
+                new StringEqualsOperatorComparer(),
+                typeof(StringEqualsOperator),
+                new ConditionOperatorFactory<StringEqualsOperator>()
+            ),
+            new ConditionOperatorOption<ConditionOperatorConfigureOptions>(
+                (S) => S["Does not equal"],
+                new StringNotEqualsOperatorComparer(),
+                typeof(StringNotEqualsOperator),
+                new ConditionOperatorFactory<StringNotEqualsOperator>()
+            ),
+            new ConditionOperatorOption<ConditionOperatorConfigureOptions>(
+                (S) => S["Starts with"],
+                new StringStartsWithOperatorComparer(),
+                typeof(StringStartsWithOperator),
+                new ConditionOperatorFactory<StringStartsWithOperator>()
+            ),
+            new ConditionOperatorOption<ConditionOperatorConfigureOptions>(
+                (S) => S["Does not start with"],
+                new StringNotStartsWithOperatorComparer(),
+                typeof(StringNotStartsWithOperator),
+                new ConditionOperatorFactory<StringNotStartsWithOperator>()
+            ),
+            new ConditionOperatorOption<ConditionOperatorConfigureOptions>(
+                (S) => S["Ends with"],
+                new StringEndsWithOperatorComparer(),
+                typeof(StringEndsWithOperator),
+                new ConditionOperatorFactory<StringEndsWithOperator>()
+            ),
+            new ConditionOperatorOption<ConditionOperatorConfigureOptions>(
+                (S) => S["Does not end with"],
+                new StringNotEndsWithOperatorComparer(),
+                typeof(StringNotEndsWithOperator),
+                new ConditionOperatorFactory<StringNotEndsWithOperator>()
+            ),
+            new ConditionOperatorOption<ConditionOperatorConfigureOptions>(
+                (S) => S["Contains"],
+                new StringContainsOperatorComparer(),
+                typeof(StringContainsOperator),
+                new ConditionOperatorFactory<StringContainsOperator>()
+            ),
+            new ConditionOperatorOption<ConditionOperatorConfigureOptions>(
+                (S) => S["Does not contain"],
+                new StringNotContainsOperatorComparer(),
+                typeof(StringNotContainsOperator),
+                new ConditionOperatorFactory<StringNotContainsOperator>()
+            )
+        ]);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Services/ConditionOperatorResolver.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Services/ConditionOperatorResolver.cs
index f5c977190d2..0ef482f6c24 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Services/ConditionOperatorResolver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Services/ConditionOperatorResolver.cs
@@ -1,25 +1,24 @@
 using System;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Rules.Services
+namespace OrchardCore.Rules.Services;
+
+public class ConditionOperatorResolver : IConditionOperatorResolver
 {
-    public class ConditionOperatorResolver : IConditionOperatorResolver
+    private readonly ConditionOperatorOptions _options;
+
+    public ConditionOperatorResolver(IOptions<ConditionOperatorOptions> options)
     {
-        private readonly ConditionOperatorOptions _options;
+        _options = options.Value;
+    }
 
-        public ConditionOperatorResolver(IOptions<ConditionOperatorOptions> options)
+    public IOperatorComparer GetOperatorComparer(ConditionOperator conditionOperator)
+    {
+        if (_options.ConditionOperatorOptionByType.TryGetValue(conditionOperator.GetType(), out var option))
         {
-            _options = options.Value;
+            return option.Comparer;
         }
 
-        public IOperatorComparer GetOperatorComparer(ConditionOperator conditionOperator)
-        {
-            if (_options.ConditionOperatorOptionByType.TryGetValue(conditionOperator.GetType(), out var option))
-            {
-                return option.Comparer;
-            }
-
-            throw new InvalidOperationException($"Operator comparer for '{conditionOperator.GetType().Name}; not registered");
-        }
+        throw new InvalidOperationException($"Operator comparer for '{conditionOperator.GetType().Name}; not registered");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Services/ConditionResolver.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Services/ConditionResolver.cs
index 83968e9254d..25f6e0946da 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Services/ConditionResolver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Services/ConditionResolver.cs
@@ -2,29 +2,28 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Rules.Services
+namespace OrchardCore.Rules.Services;
+
+public class ConditionResolver : IConditionResolver
 {
-    public class ConditionResolver : IConditionResolver
+    private readonly IServiceProvider _serviceProvider;
+    private readonly ConditionOptions _options;
+
+    public ConditionResolver(IServiceProvider serviceProvider, IOptions<ConditionOptions> options)
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly ConditionOptions _options;
+        _serviceProvider = serviceProvider;
+        _options = options.Value;
+    }
 
-        public ConditionResolver(IServiceProvider serviceProvider, IOptions<ConditionOptions> options)
+    public IConditionEvaluator GetConditionEvaluator(Condition condition)
+    {
+        if (_options.Evaluators.TryGetValue(condition.GetType(), out var conditionEvaluatorType))
         {
-            _serviceProvider = serviceProvider;
-            _options = options.Value;
+            return _serviceProvider.GetRequiredService(conditionEvaluatorType) as IConditionEvaluator;
         }
 
-        public IConditionEvaluator GetConditionEvaluator(Condition condition)
-        {
-            if (_options.Evaluators.TryGetValue(condition.GetType(), out var conditionEvaluatorType))
-            {
-                return _serviceProvider.GetRequiredService(conditionEvaluatorType) as IConditionEvaluator;
-            }
-
-            // throw new InvalidOperationException($"Condition evaluator for '{condition.GetType().Name}; not registered");
+        // throw new InvalidOperationException($"Condition evaluator for '{condition.GetType().Name}; not registered");
 
-            return null;
-        }
+        return null;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Services/CultureConditionEvaluator.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Services/CultureConditionEvaluator.cs
index 374ad81a726..30e9d7ebac9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Services/CultureConditionEvaluator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Services/CultureConditionEvaluator.cs
@@ -2,27 +2,26 @@
 using System.Threading.Tasks;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.Services
+namespace OrchardCore.Rules.Services;
+
+public class CultureConditionEvaluator : ConditionEvaluator<CultureCondition>
 {
-    public class CultureConditionEvaluator : ConditionEvaluator<CultureCondition>
-    {
-        private readonly IConditionOperatorResolver _operatorResolver;
+    private readonly IConditionOperatorResolver _operatorResolver;
 
-        public CultureConditionEvaluator(IConditionOperatorResolver operatorResolver)
-        {
-            _operatorResolver = operatorResolver;
-        }
+    public CultureConditionEvaluator(IConditionOperatorResolver operatorResolver)
+    {
+        _operatorResolver = operatorResolver;
+    }
 
-        public override ValueTask<bool> EvaluateAsync(CultureCondition condition)
-        {
-            var currentCulture = CultureInfo.CurrentCulture;
+    public override ValueTask<bool> EvaluateAsync(CultureCondition condition)
+    {
+        var currentCulture = CultureInfo.CurrentCulture;
 
-            var operatorComparer = _operatorResolver.GetOperatorComparer(condition.Operation);
+        var operatorComparer = _operatorResolver.GetOperatorComparer(condition.Operation);
 
-            var result = operatorComparer.Compare(condition.Operation, currentCulture.Name, condition.Value) ||
-                operatorComparer.Compare(condition.Operation, currentCulture.Parent.Name, condition.Value);
+        var result = operatorComparer.Compare(condition.Operation, currentCulture.Name, condition.Value) ||
+            operatorComparer.Compare(condition.Operation, currentCulture.Parent.Name, condition.Value);
 
-            return result ? True : False;
-        }
+        return result ? True : False;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Services/HomepageConditionEvaluator.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Services/HomepageConditionEvaluator.cs
index 8a6103cb516..0c96b02ca1c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Services/HomepageConditionEvaluator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Services/HomepageConditionEvaluator.cs
@@ -3,29 +3,28 @@
 using Microsoft.AspNetCore.Http;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.Services
-{
-    public class HomepageConditionEvaluator : ConditionEvaluator<HomepageCondition>
-    {
-        private readonly IHttpContextAccessor _httpContextAccessor;
+namespace OrchardCore.Rules.Services;
 
-        public HomepageConditionEvaluator(IHttpContextAccessor httpContextAccessor)
-        {
-            _httpContextAccessor = httpContextAccessor;
-        }
+public class HomepageConditionEvaluator : ConditionEvaluator<HomepageCondition>
+{
+    private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public override ValueTask<bool> EvaluateAsync(HomepageCondition condition)
-        {
-            var requestPath = _httpContextAccessor.HttpContext.Request.Path.Value;
+    public HomepageConditionEvaluator(IHttpContextAccessor httpContextAccessor)
+    {
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-            var result = string.Equals("/", requestPath, StringComparison.Ordinal) || string.IsNullOrEmpty(requestPath);
+    public override ValueTask<bool> EvaluateAsync(HomepageCondition condition)
+    {
+        var requestPath = _httpContextAccessor.HttpContext.Request.Path.Value;
 
-            if (!condition.Value)
-            {
-                result = !result;
-            }
+        var result = string.Equals("/", requestPath, StringComparison.Ordinal) || string.IsNullOrEmpty(requestPath);
 
-            return result ? True : False;
+        if (!condition.Value)
+        {
+            result = !result;
         }
+
+        return result ? True : False;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Services/IsAnonymousConditionEvaluator.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Services/IsAnonymousConditionEvaluator.cs
index 8d2234f0c15..9f84707324b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Services/IsAnonymousConditionEvaluator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Services/IsAnonymousConditionEvaluator.cs
@@ -2,18 +2,17 @@
 using Microsoft.AspNetCore.Http;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.Services
-{
-    public class IsAnonymousConditionEvaluator : ConditionEvaluator<IsAnonymousCondition>
-    {
-        private readonly IHttpContextAccessor _httpContextAccessor;
+namespace OrchardCore.Rules.Services;
 
-        public IsAnonymousConditionEvaluator(IHttpContextAccessor httpContextAccessor)
-        {
-            _httpContextAccessor = httpContextAccessor;
-        }
+public class IsAnonymousConditionEvaluator : ConditionEvaluator<IsAnonymousCondition>
+{
+    private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public override ValueTask<bool> EvaluateAsync(IsAnonymousCondition condition)
-            => _httpContextAccessor.HttpContext.User?.Identity.IsAuthenticated != true ? True : False;
+    public IsAnonymousConditionEvaluator(IHttpContextAccessor httpContextAccessor)
+    {
+        _httpContextAccessor = httpContextAccessor;
     }
+
+    public override ValueTask<bool> EvaluateAsync(IsAnonymousCondition condition)
+        => _httpContextAccessor.HttpContext.User?.Identity.IsAuthenticated != true ? True : False;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Services/IsAuthenticatedConditionEvaluator.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Services/IsAuthenticatedConditionEvaluator.cs
index d0b147ac393..abcc1d89d6d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Services/IsAuthenticatedConditionEvaluator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Services/IsAuthenticatedConditionEvaluator.cs
@@ -2,18 +2,17 @@
 using Microsoft.AspNetCore.Http;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.Services
-{
-    public class IsAuthenticatedConditionEvaluator : ConditionEvaluator<IsAuthenticatedCondition>
-    {
-        private readonly IHttpContextAccessor _httpContextAccessor;
+namespace OrchardCore.Rules.Services;
 
-        public IsAuthenticatedConditionEvaluator(IHttpContextAccessor httpContextAccessor)
-        {
-            _httpContextAccessor = httpContextAccessor;
-        }
+public class IsAuthenticatedConditionEvaluator : ConditionEvaluator<IsAuthenticatedCondition>
+{
+    private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public override ValueTask<bool> EvaluateAsync(IsAuthenticatedCondition condition)
-            => _httpContextAccessor.HttpContext.User?.Identity.IsAuthenticated == true ? True : False;
+    public IsAuthenticatedConditionEvaluator(IHttpContextAccessor httpContextAccessor)
+    {
+        _httpContextAccessor = httpContextAccessor;
     }
+
+    public override ValueTask<bool> EvaluateAsync(IsAuthenticatedCondition condition)
+        => _httpContextAccessor.HttpContext.User?.Identity.IsAuthenticated == true ? True : False;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Services/JavascriptConditionEvaluator.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Services/JavascriptConditionEvaluator.cs
index 44454b42398..e5419c9b02b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Services/JavascriptConditionEvaluator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Services/JavascriptConditionEvaluator.cs
@@ -4,30 +4,29 @@
 using OrchardCore.Rules.Models;
 using OrchardCore.Scripting;
 
-namespace OrchardCore.Rules.Services
+namespace OrchardCore.Rules.Services;
+
+public class JavascriptConditionEvaluator : ConditionEvaluator<JavascriptCondition>
 {
-    public class JavascriptConditionEvaluator : ConditionEvaluator<JavascriptCondition>
-    {
-        private readonly IScriptingManager _scriptingManager;
-        private readonly IServiceProvider _serviceProvider;
+    private readonly IScriptingManager _scriptingManager;
+    private readonly IServiceProvider _serviceProvider;
 
-        // The scope is built lazily once per request.
-        private IScriptingScope _scope;
-        private IScriptingEngine _engine;
+    // The scope is built lazily once per request.
+    private IScriptingScope _scope;
+    private IScriptingEngine _engine;
 
 
-        public JavascriptConditionEvaluator(IScriptingManager scriptingManager, IServiceProvider serviceProvider)
-        {
-            _scriptingManager = scriptingManager;
-            _serviceProvider = serviceProvider;
-        }
+    public JavascriptConditionEvaluator(IScriptingManager scriptingManager, IServiceProvider serviceProvider)
+    {
+        _scriptingManager = scriptingManager;
+        _serviceProvider = serviceProvider;
+    }
 
-        public override ValueTask<bool> EvaluateAsync(JavascriptCondition condition)
-        {
-            _engine ??= _scriptingManager.GetScriptingEngine("js");
-            _scope ??= _engine.CreateScope(_scriptingManager.GlobalMethodProviders.SelectMany(x => x.GetMethods()), _serviceProvider, null, null);
+    public override ValueTask<bool> EvaluateAsync(JavascriptCondition condition)
+    {
+        _engine ??= _scriptingManager.GetScriptingEngine("js");
+        _scope ??= _engine.CreateScope(_scriptingManager.GlobalMethodProviders.SelectMany(x => x.GetMethods()), _serviceProvider, null, null);
 
-            return Convert.ToBoolean(_engine.Evaluate(_scope, condition.Script)) ? True : False;
-        }
+        return Convert.ToBoolean(_engine.Evaluate(_scope, condition.Script)) ? True : False;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Services/RoleConditionEvaluator.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Services/RoleConditionEvaluator.cs
index 4636a1b30ce..ba83e92337e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Services/RoleConditionEvaluator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Services/RoleConditionEvaluator.cs
@@ -5,43 +5,42 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.Services
-{
-    public class RoleConditionEvaluator : ConditionEvaluator<RoleCondition>
-    {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IdentityOptions _options;
-        private readonly IConditionOperatorResolver _operatorResolver;
+namespace OrchardCore.Rules.Services;
 
-        public RoleConditionEvaluator(
-            IHttpContextAccessor httpContextAccessor,
-            IOptions<IdentityOptions> options,
-            IConditionOperatorResolver operatorResolver)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _options = options.Value;
-            _operatorResolver = operatorResolver;
-        }
+public class RoleConditionEvaluator : ConditionEvaluator<RoleCondition>
+{
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IdentityOptions _options;
+    private readonly IConditionOperatorResolver _operatorResolver;
 
-        public override ValueTask<bool> EvaluateAsync(RoleCondition condition)
-        {
-            var roleClaimType = _options.ClaimsIdentity.RoleClaimType;
+    public RoleConditionEvaluator(
+        IHttpContextAccessor httpContextAccessor,
+        IOptions<IdentityOptions> options,
+        IConditionOperatorResolver operatorResolver)
+    {
+        _httpContextAccessor = httpContextAccessor;
+        _options = options.Value;
+        _operatorResolver = operatorResolver;
+    }
 
-            // IsInRole() & HasClaim() are case sensitive.
-            var operatorComparer = _operatorResolver.GetOperatorComparer(condition.Operation);
+    public override ValueTask<bool> EvaluateAsync(RoleCondition condition)
+    {
+        var roleClaimType = _options.ClaimsIdentity.RoleClaimType;
 
-            // Claim all if the operator is negative
-            if (condition.Operation is INegateOperator)
-            {
-                return (_httpContextAccessor.HttpContext.User?.Claims.Where(c => c.Type == roleClaimType).All(claim =>
-                    operatorComparer.Compare(condition.Operation, claim.Value, condition.Value))
-                ).GetValueOrDefault() ? True : False;
-            }
+        // IsInRole() & HasClaim() are case sensitive.
+        var operatorComparer = _operatorResolver.GetOperatorComparer(condition.Operation);
 
-            return (_httpContextAccessor.HttpContext.User?.Claims.Any(claim =>
-                claim.Type == roleClaimType &&
+        // Claim all if the operator is negative
+        if (condition.Operation is INegateOperator)
+        {
+            return (_httpContextAccessor.HttpContext.User?.Claims.Where(c => c.Type == roleClaimType).All(claim =>
                 operatorComparer.Compare(condition.Operation, claim.Value, condition.Value))
             ).GetValueOrDefault() ? True : False;
         }
+
+        return (_httpContextAccessor.HttpContext.User?.Claims.Any(claim =>
+            claim.Type == roleClaimType &&
+            operatorComparer.Compare(condition.Operation, claim.Value, condition.Value))
+        ).GetValueOrDefault() ? True : False;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Services/RuleService.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Services/RuleService.cs
index 903a94ead22..0044a40a974 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Services/RuleService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Services/RuleService.cs
@@ -1,34 +1,33 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Rules.Services
+namespace OrchardCore.Rules.Services;
+
+public class RuleService : IRuleService
 {
-    public class RuleService : IRuleService
-    {
-        private readonly IConditionResolver _conditionResolver;
+    private readonly IConditionResolver _conditionResolver;
 
-        public RuleService(IConditionResolver conditionResolver)
-        {
-            _conditionResolver = conditionResolver;
-        }
+    public RuleService(IConditionResolver conditionResolver)
+    {
+        _conditionResolver = conditionResolver;
+    }
 
-        public async ValueTask<bool> EvaluateAsync(Rule rule)
+    public async ValueTask<bool> EvaluateAsync(Rule rule)
+    {
+        foreach (var childCondition in rule.Conditions)
         {
-            foreach (var childCondition in rule.Conditions)
+            var evaluator = _conditionResolver.GetConditionEvaluator(childCondition);
+            if (evaluator is null || !await evaluator.EvaluateAsync(childCondition))
             {
-                var evaluator = _conditionResolver.GetConditionEvaluator(childCondition);
-                if (evaluator is null || !await evaluator.EvaluateAsync(childCondition))
-                {
-                    return false;
-                }
-            }
-
-            if (rule.Conditions.Count > 0)
-            {
-                return true;
+                return false;
             }
+        }
 
-            // This rule requires all conditions to be evaluated as true.
-            return false;
+        if (rule.Conditions.Count > 0)
+        {
+            return true;
         }
+
+        // This rule requires all conditions to be evaluated as true.
+        return false;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Services/StringOperatorComparer.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Services/StringOperatorComparer.cs
index ceeeb32be65..39b7b1efe9d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Services/StringOperatorComparer.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Services/StringOperatorComparer.cs
@@ -1,69 +1,68 @@
 using System;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.Services
+namespace OrchardCore.Rules.Services;
+
+public class StringEqualsOperatorComparer : OperatorComparer<StringOperator, string>
 {
-    public class StringEqualsOperatorComparer : OperatorComparer<StringOperator, string>
-    {
-        public override bool Compare(StringOperator conditionOperator, string a, string b)
-            => conditionOperator.CaseSensitive ?
-                string.Equals(a, b, StringComparison.Ordinal) :
-                string.Equals(a, b, StringComparison.OrdinalIgnoreCase);
-    }
+    public override bool Compare(StringOperator conditionOperator, string a, string b)
+        => conditionOperator.CaseSensitive ?
+            string.Equals(a, b, StringComparison.Ordinal) :
+            string.Equals(a, b, StringComparison.OrdinalIgnoreCase);
+}
 
-    public class StringNotEqualsOperatorComparer : OperatorComparer<StringOperator, string>
-    {
-        public override bool Compare(StringOperator conditionOperator, string a, string b)
-            => conditionOperator.CaseSensitive ?
-                !string.Equals(a, b, StringComparison.Ordinal) :
-                !string.Equals(a, b, StringComparison.OrdinalIgnoreCase);
-    }
+public class StringNotEqualsOperatorComparer : OperatorComparer<StringOperator, string>
+{
+    public override bool Compare(StringOperator conditionOperator, string a, string b)
+        => conditionOperator.CaseSensitive ?
+            !string.Equals(a, b, StringComparison.Ordinal) :
+            !string.Equals(a, b, StringComparison.OrdinalIgnoreCase);
+}
 
-    public class StringStartsWithOperatorComparer : OperatorComparer<StringOperator, string>
-    {
-        public override bool Compare(StringOperator conditionOperator, string a, string b)
-            => conditionOperator.CaseSensitive ?
-                a.StartsWith(b) :
-                a.StartsWith(b, StringComparison.OrdinalIgnoreCase);
-    }
+public class StringStartsWithOperatorComparer : OperatorComparer<StringOperator, string>
+{
+    public override bool Compare(StringOperator conditionOperator, string a, string b)
+        => conditionOperator.CaseSensitive ?
+            a.StartsWith(b) :
+            a.StartsWith(b, StringComparison.OrdinalIgnoreCase);
+}
 
-    public class StringNotStartsWithOperatorComparer : OperatorComparer<StringOperator, string>
-    {
-        public override bool Compare(StringOperator conditionOperator, string a, string b)
-            => conditionOperator.CaseSensitive ?
-                !a.StartsWith(b) :
-                !a.StartsWith(b, StringComparison.OrdinalIgnoreCase);
-    }
+public class StringNotStartsWithOperatorComparer : OperatorComparer<StringOperator, string>
+{
+    public override bool Compare(StringOperator conditionOperator, string a, string b)
+        => conditionOperator.CaseSensitive ?
+            !a.StartsWith(b) :
+            !a.StartsWith(b, StringComparison.OrdinalIgnoreCase);
+}
 
-    public class StringEndsWithOperatorComparer : OperatorComparer<StringOperator, string>
-    {
-        public override bool Compare(StringOperator conditionOperator, string a, string b)
-            => conditionOperator.CaseSensitive ?
-                a.EndsWith(b) :
-                a.EndsWith(b, StringComparison.OrdinalIgnoreCase);
-    }
+public class StringEndsWithOperatorComparer : OperatorComparer<StringOperator, string>
+{
+    public override bool Compare(StringOperator conditionOperator, string a, string b)
+        => conditionOperator.CaseSensitive ?
+            a.EndsWith(b) :
+            a.EndsWith(b, StringComparison.OrdinalIgnoreCase);
+}
 
-    public class StringNotEndsWithOperatorComparer : OperatorComparer<StringOperator, string>
-    {
-        public override bool Compare(StringOperator conditionOperator, string a, string b)
-            => conditionOperator.CaseSensitive ?
-                !a.EndsWith(b) :
-                !a.EndsWith(b, StringComparison.OrdinalIgnoreCase);
-    }
+public class StringNotEndsWithOperatorComparer : OperatorComparer<StringOperator, string>
+{
+    public override bool Compare(StringOperator conditionOperator, string a, string b)
+        => conditionOperator.CaseSensitive ?
+            !a.EndsWith(b) :
+            !a.EndsWith(b, StringComparison.OrdinalIgnoreCase);
+}
 
-    public class StringContainsOperatorComparer : OperatorComparer<StringOperator, string>
-    {
-        public override bool Compare(StringOperator conditionOperator, string a, string b)
-            => conditionOperator.CaseSensitive ?
-                a.Contains(b) :
-                a.Contains(b, StringComparison.OrdinalIgnoreCase);
-    }
+public class StringContainsOperatorComparer : OperatorComparer<StringOperator, string>
+{
+    public override bool Compare(StringOperator conditionOperator, string a, string b)
+        => conditionOperator.CaseSensitive ?
+            a.Contains(b) :
+            a.Contains(b, StringComparison.OrdinalIgnoreCase);
+}
 
-    public class StringNotContainsOperatorComparer : OperatorComparer<StringOperator, string>
-    {
-        public override bool Compare(StringOperator conditionOperator, string a, string b)
-            => conditionOperator.CaseSensitive ?
-                !a.Contains(b) :
-                !a.Contains(b, StringComparison.OrdinalIgnoreCase);
-    }
+public class StringNotContainsOperatorComparer : OperatorComparer<StringOperator, string>
+{
+    public override bool Compare(StringOperator conditionOperator, string a, string b)
+        => conditionOperator.CaseSensitive ?
+            !a.Contains(b) :
+            !a.Contains(b, StringComparison.OrdinalIgnoreCase);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Services/UrlConditionEvaluator.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Services/UrlConditionEvaluator.cs
index 6d663b3fae1..3f44295ab06 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Services/UrlConditionEvaluator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Services/UrlConditionEvaluator.cs
@@ -3,37 +3,36 @@
 using Microsoft.AspNetCore.Http;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.Services
+namespace OrchardCore.Rules.Services;
+
+public class UrlConditionEvaluator : ConditionEvaluator<UrlCondition>
 {
-    public class UrlConditionEvaluator : ConditionEvaluator<UrlCondition>
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IConditionOperatorResolver _operatorResolver;
+
+    public UrlConditionEvaluator(IHttpContextAccessor httpContextAccessor, IConditionOperatorResolver operatorResolver)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IConditionOperatorResolver _operatorResolver;
+        _httpContextAccessor = httpContextAccessor;
+        _operatorResolver = operatorResolver;
+    }
 
-        public UrlConditionEvaluator(IHttpContextAccessor httpContextAccessor, IConditionOperatorResolver operatorResolver)
+    public override ValueTask<bool> EvaluateAsync(UrlCondition condition)
+    {
+        if (condition.Value.StartsWith("~/", StringComparison.Ordinal))
         {
-            _httpContextAccessor = httpContextAccessor;
-            _operatorResolver = operatorResolver;
+            condition.Value = condition.Value[1..];
         }
 
-        public override ValueTask<bool> EvaluateAsync(UrlCondition condition)
-        {
-            if (condition.Value.StartsWith("~/", StringComparison.Ordinal))
-            {
-                condition.Value = condition.Value[1..];
-            }
+        var requestPath = _httpContextAccessor.HttpContext.Request.Path.Value;
 
-            var requestPath = _httpContextAccessor.HttpContext.Request.Path.Value;
-
-            // Tenant home page could have an empty string as a request path, where
-            // the default tenant does not.
-            if (string.IsNullOrEmpty(requestPath))
-            {
-                requestPath = "/";
-            }
-
-            var operatorComparer = _operatorResolver.GetOperatorComparer(condition.Operation);
-            return operatorComparer.Compare(condition.Operation, requestPath, condition.Value) ? True : False;
+        // Tenant home page could have an empty string as a request path, where
+        // the default tenant does not.
+        if (string.IsNullOrEmpty(requestPath))
+        {
+            requestPath = "/";
         }
+
+        var operatorComparer = _operatorResolver.GetOperatorComparer(condition.Operation);
+        return operatorComparer.Compare(condition.Operation, requestPath, condition.Value) ? True : False;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Startup.cs
index 68944d35554..3709db57e0c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Startup.cs
@@ -7,67 +7,66 @@
 using OrchardCore.Rules.Models;
 using OrchardCore.Rules.Services;
 
-namespace OrchardCore.Rules
+namespace OrchardCore.Rules;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddOptions<ConditionOptions>();
+        services.AddOptions<ConditionOptions>();
 
-            // Rule services.
-            services
-                .AddScoped<IDisplayDriver<Rule>, RuleDisplayDriver>()
-                .AddSingleton<IConditionIdGenerator, ConditionIdGenerator>()
-                .AddTransient<IConfigureOptions<ConditionOperatorOptions>, ConditionOperatorConfigureOptions>()
-                .AddScoped<IConditionResolver, ConditionResolver>()
-                .AddScoped<IConditionOperatorResolver, ConditionOperatorResolver>()
-                .AddScoped<IRuleService, RuleService>();
+        // Rule services.
+        services
+            .AddScoped<IDisplayDriver<Rule>, RuleDisplayDriver>()
+            .AddSingleton<IConditionIdGenerator, ConditionIdGenerator>()
+            .AddTransient<IConfigureOptions<ConditionOperatorOptions>, ConditionOperatorConfigureOptions>()
+            .AddScoped<IConditionResolver, ConditionResolver>()
+            .AddScoped<IConditionOperatorResolver, ConditionOperatorResolver>()
+            .AddScoped<IRuleService, RuleService>();
 
-            // All condition.
-            services.AddRule<AllConditionGroup, AllConditionEvaluator, AllConditionDisplayDriver>();
+        // All condition.
+        services.AddRule<AllConditionGroup, AllConditionEvaluator, AllConditionDisplayDriver>();
 
-            // Any condition.
-            services.AddRule<AnyConditionGroup, AnyConditionEvaluator, AnyConditionDisplayDriver>();
+        // Any condition.
+        services.AddRule<AnyConditionGroup, AnyConditionEvaluator, AnyConditionDisplayDriver>();
 
-            // Boolean condition.
-            services.AddRule<BooleanCondition, BooleanConditionEvaluator, BooleanConditionDisplayDriver>();
+        // Boolean condition.
+        services.AddRule<BooleanCondition, BooleanConditionEvaluator, BooleanConditionDisplayDriver>();
 
-            // Homepage condition.
-            services.AddRule<HomepageCondition, HomepageConditionEvaluator, HomepageConditionDisplayDriver>();
+        // Homepage condition.
+        services.AddRule<HomepageCondition, HomepageConditionEvaluator, HomepageConditionDisplayDriver>();
 
-            // Url condition.
-            services.AddRule<UrlCondition, UrlConditionEvaluator, UrlConditionDisplayDriver>();
+        // Url condition.
+        services.AddRule<UrlCondition, UrlConditionEvaluator, UrlConditionDisplayDriver>();
 
-            // Culture condition.
-            services.AddRule<CultureCondition, CultureConditionEvaluator, CultureConditionDisplayDriver>();
+        // Culture condition.
+        services.AddRule<CultureCondition, CultureConditionEvaluator, CultureConditionDisplayDriver>();
 
-            // Role condition.
-            services.AddRule<RoleCondition, RoleConditionEvaluator, RoleConditionDisplayDriver>();
+        // Role condition.
+        services.AddRule<RoleCondition, RoleConditionEvaluator, RoleConditionDisplayDriver>();
 
-            // JavaScript condition.
-            services.AddRule<JavascriptCondition, JavascriptConditionEvaluator, JavascriptConditionDisplayDriver>();
+        // JavaScript condition.
+        services.AddRule<JavascriptCondition, JavascriptConditionEvaluator, JavascriptConditionDisplayDriver>();
 
-            // Is authenticated condition.
-            services.AddRule<IsAuthenticatedCondition, IsAuthenticatedConditionEvaluator, IsAuthenticatedConditionDisplayDriver>();
+        // Is authenticated condition.
+        services.AddRule<IsAuthenticatedCondition, IsAuthenticatedConditionEvaluator, IsAuthenticatedConditionDisplayDriver>();
 
-            // Is anonymous condition.
-            services.AddRule<IsAnonymousCondition, IsAnonymousConditionEvaluator, IsAnonymousConditionDisplayDriver>();
+        // Is anonymous condition.
+        services.AddRule<IsAnonymousCondition, IsAnonymousConditionEvaluator, IsAnonymousConditionDisplayDriver>();
 
-            // Content type condition.
-            services.AddScoped<IDisplayDriver<Condition>, ContentTypeConditionDisplayDriver>()
-                .AddRuleCondition<ContentTypeCondition, ContentTypeConditionEvaluatorDriver>()
-                .AddScoped<IContentDisplayDriver>(sp => sp.GetRequiredService<ContentTypeConditionEvaluatorDriver>());
+        // Content type condition.
+        services.AddScoped<IDisplayDriver<Condition>, ContentTypeConditionDisplayDriver>()
+            .AddRuleCondition<ContentTypeCondition, ContentTypeConditionEvaluatorDriver>()
+            .AddScoped<IContentDisplayDriver>(sp => sp.GetRequiredService<ContentTypeConditionEvaluatorDriver>());
 
-            // Allows to serialize 'ConditionOperator' derived types
-            services.AddRuleConditionOperator<StringEqualsOperator>()
-                .AddRuleConditionOperator<StringNotEqualsOperator>()
-                .AddRuleConditionOperator<StringStartsWithOperator>()
-                .AddRuleConditionOperator<StringNotStartsWithOperator>()
-                .AddRuleConditionOperator<StringEndsWithOperator>()
-                .AddRuleConditionOperator<StringNotEndsWithOperator>()
-                .AddRuleConditionOperator<StringContainsOperator>()
-                .AddRuleConditionOperator<StringNotContainsOperator>();
-        }
+        // Allows to serialize 'ConditionOperator' derived types
+        services.AddRuleConditionOperator<StringEqualsOperator>()
+            .AddRuleConditionOperator<StringNotEqualsOperator>()
+            .AddRuleConditionOperator<StringStartsWithOperator>()
+            .AddRuleConditionOperator<StringNotStartsWithOperator>()
+            .AddRuleConditionOperator<StringEndsWithOperator>()
+            .AddRuleConditionOperator<StringNotEndsWithOperator>()
+            .AddRuleConditionOperator<StringContainsOperator>()
+            .AddRuleConditionOperator<StringNotContainsOperator>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/ViewComponents/SelectStringOperationViewComponent.cs b/src/OrchardCore.Modules/OrchardCore.Rules/ViewComponents/SelectStringOperationViewComponent.cs
index dce865427a9..2f042fd15d2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/ViewComponents/SelectStringOperationViewComponent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/ViewComponents/SelectStringOperationViewComponent.cs
@@ -6,38 +6,37 @@
 using OrchardCore.Rules.Models;
 using OrchardCore.Rules.ViewModels;
 
-namespace OrchardCore.Rules.ViewComponents
+namespace OrchardCore.Rules.ViewComponents;
+
+public class SelectStringOperationViewComponent : ViewComponent
 {
-    public class SelectStringOperationViewComponent : ViewComponent
-    {
-        private readonly ConditionOperatorOptions _options;
-        private readonly IServiceProvider _serviceProvider;
+    private readonly ConditionOperatorOptions _options;
+    private readonly IServiceProvider _serviceProvider;
 
-        public SelectStringOperationViewComponent(IOptions<ConditionOperatorOptions> options, IServiceProvider serviceProvider)
-        {
-            _options = options.Value;
-            _serviceProvider = serviceProvider;
-        }
+    public SelectStringOperationViewComponent(IOptions<ConditionOperatorOptions> options, IServiceProvider serviceProvider)
+    {
+        _options = options.Value;
+        _serviceProvider = serviceProvider;
+    }
 
-        public IViewComponentResult Invoke(string selectedOperation, string htmlName)
-        {
-            var stringOperators = _options.Operators.Where(x => typeof(StringOperator).IsAssignableFrom(x.Operator));
+    public IViewComponentResult Invoke(string selectedOperation, string htmlName)
+    {
+        var stringOperators = _options.Operators.Where(x => typeof(StringOperator).IsAssignableFrom(x.Operator));
 
-            var items = stringOperators
-                .Select(x =>
-                    new SelectListItem(
-                        x.DisplayText(_serviceProvider),
-                        x.Operator.Name,
-                        string.Equals(x.Factory.Name, selectedOperation, StringComparison.OrdinalIgnoreCase))
-                ).ToList();
+        var items = stringOperators
+            .Select(x =>
+                new SelectListItem(
+                    x.DisplayText(_serviceProvider),
+                    x.Operator.Name,
+                    string.Equals(x.Factory.Name, selectedOperation, StringComparison.OrdinalIgnoreCase))
+            ).ToList();
 
-            var model = new SelectStringOperationViewModel
-            {
-                HtmlName = htmlName,
-                Items = items
-            };
+        var model = new SelectStringOperationViewModel
+        {
+            HtmlName = htmlName,
+            Items = items
+        };
 
-            return View(model);
-        }
+        return View(model);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/AllConditionViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/AllConditionViewModel.cs
index 564ba349ba0..8133484678a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/AllConditionViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/AllConditionViewModel.cs
@@ -1,13 +1,12 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.ViewModels
+namespace OrchardCore.Rules.ViewModels;
+
+public class AllConditionViewModel
 {
-    public class AllConditionViewModel
-    {
-        public string DisplayText { get; set; }
+    public string DisplayText { get; set; }
 
-        [BindNever]
-        public AllConditionGroup Condition { get; set; }
-    }
+    [BindNever]
+    public AllConditionGroup Condition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/AnyConditionViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/AnyConditionViewModel.cs
index 358707f7095..e774d4d7825 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/AnyConditionViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/AnyConditionViewModel.cs
@@ -1,13 +1,12 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.ViewModels
+namespace OrchardCore.Rules.ViewModels;
+
+public class AnyConditionViewModel
 {
-    public class AnyConditionViewModel
-    {
-        public string DisplayText { get; set; }
+    public string DisplayText { get; set; }
 
-        [BindNever]
-        public AnyConditionGroup Condition { get; set; }
-    }
+    [BindNever]
+    public AnyConditionGroup Condition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/BooleanConditionViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/BooleanConditionViewModel.cs
index 72f6f93f0c0..9b00f98c842 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/BooleanConditionViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/BooleanConditionViewModel.cs
@@ -1,13 +1,12 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.ViewModels
+namespace OrchardCore.Rules.ViewModels;
+
+public class BooleanConditionViewModel
 {
-    public class BooleanConditionViewModel
-    {
-        public bool Value { get; set; }
+    public bool Value { get; set; }
 
-        [BindNever]
-        public BooleanCondition Condition { get; set; }
-    }
+    [BindNever]
+    public BooleanCondition Condition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/ConditionGroupViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/ConditionGroupViewModel.cs
index c739cfe0448..f620ce22b98 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/ConditionGroupViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/ConditionGroupViewModel.cs
@@ -1,18 +1,17 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Rules.ViewModels
+namespace OrchardCore.Rules.ViewModels;
+
+public class ConditionGroupViewModel
 {
-    public class ConditionGroupViewModel
-    {
-        public ConditionEntry[] Entries { get; set; }
+    public ConditionEntry[] Entries { get; set; }
 
-        [BindNever]
-        public ConditionGroup Condition { get; set; }
-    }
+    [BindNever]
+    public ConditionGroup Condition { get; set; }
+}
 
-    public class ConditionEntry
-    {
-        [BindNever]
-        public Condition Condition { get; set; }
-    }
+public class ConditionEntry
+{
+    [BindNever]
+    public Condition Condition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/ContentTypeConditionViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/ContentTypeConditionViewModel.cs
index 2650b76a2ef..c6fc60122aa 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/ContentTypeConditionViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/ContentTypeConditionViewModel.cs
@@ -1,14 +1,13 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.ViewModels
+namespace OrchardCore.Rules.ViewModels;
+
+public class ContentTypeConditionViewModel
 {
-    public class ContentTypeConditionViewModel
-    {
-        public string SelectedOperation { get; set; }
-        public string Value { get; set; }
+    public string SelectedOperation { get; set; }
+    public string Value { get; set; }
 
-        [BindNever]
-        public ContentTypeCondition Condition { get; set; }
-    }
+    [BindNever]
+    public ContentTypeCondition Condition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/CultureConditionViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/CultureConditionViewModel.cs
index 8a7e874cc8d..9ea6482765d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/CultureConditionViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/CultureConditionViewModel.cs
@@ -1,14 +1,13 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.ViewModels
+namespace OrchardCore.Rules.ViewModels;
+
+public class CultureConditionViewModel
 {
-    public class CultureConditionViewModel
-    {
-        public string SelectedOperation { get; set; }
-        public string Value { get; set; }
+    public string SelectedOperation { get; set; }
+    public string Value { get; set; }
 
-        [BindNever]
-        public CultureCondition Condition { get; set; }
-    }
+    [BindNever]
+    public CultureCondition Condition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/HomepageConditionViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/HomepageConditionViewModel.cs
index a6a93f79790..f1966d52d7d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/HomepageConditionViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/HomepageConditionViewModel.cs
@@ -1,13 +1,12 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.ViewModels
+namespace OrchardCore.Rules.ViewModels;
+
+public class HomepageConditionViewModel
 {
-    public class HomepageConditionViewModel
-    {
-        public bool Value { get; set; }
+    public bool Value { get; set; }
 
-        [BindNever]
-        public HomepageCondition Condition { get; set; }
-    }
+    [BindNever]
+    public HomepageCondition Condition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/JavascriptConditionViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/JavascriptConditionViewModel.cs
index 6427824aeaa..fdeebc37600 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/JavascriptConditionViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/JavascriptConditionViewModel.cs
@@ -1,13 +1,12 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.ViewModels
+namespace OrchardCore.Rules.ViewModels;
+
+public class JavascriptConditionViewModel
 {
-    public class JavascriptConditionViewModel
-    {
-        public string Script { get; set; }
+    public string Script { get; set; }
 
-        [BindNever]
-        public JavascriptCondition Condition { get; set; }
-    }
+    [BindNever]
+    public JavascriptCondition Condition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/RoleConditionViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/RoleConditionViewModel.cs
index fe192c3e8e9..2b52cc228db 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/RoleConditionViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/RoleConditionViewModel.cs
@@ -1,14 +1,13 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.ViewModels
+namespace OrchardCore.Rules.ViewModels;
+
+public class RoleConditionViewModel
 {
-    public class RoleConditionViewModel
-    {
-        public string SelectedOperation { get; set; }
-        public string Value { get; set; }
+    public string SelectedOperation { get; set; }
+    public string Value { get; set; }
 
-        [BindNever]
-        public RoleCondition Condition { get; set; }
-    }
+    [BindNever]
+    public RoleCondition Condition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/SelectStringOperationViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/SelectStringOperationViewModel.cs
index 48d2fe77585..f3eed12023f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/SelectStringOperationViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/SelectStringOperationViewModel.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.Rules.ViewModels
+namespace OrchardCore.Rules.ViewModels;
+
+public class SelectStringOperationViewModel
 {
-    public class SelectStringOperationViewModel
-    {
-        public string HtmlName { get; set; }
-        public List<SelectListItem> Items { get; set; }
-    }
+    public string HtmlName { get; set; }
+    public List<SelectListItem> Items { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/UrlConditionViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/UrlConditionViewModel.cs
index ab476402ece..7e19ee8e0ba 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/UrlConditionViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/ViewModels/UrlConditionViewModel.cs
@@ -1,14 +1,13 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Rules.Models;
 
-namespace OrchardCore.Rules.ViewModels
+namespace OrchardCore.Rules.ViewModels;
+
+public class UrlConditionViewModel
 {
-    public class UrlConditionViewModel
-    {
-        public string SelectedOperation { get; set; }
-        public string Value { get; set; }
+    public string SelectedOperation { get; set; }
+    public string Value { get; set; }
 
-        [BindNever]
-        public UrlCondition Condition { get; set; }
-    }
+    [BindNever]
+    public UrlCondition Condition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Scripting/Providers/LogProvider.cs b/src/OrchardCore.Modules/OrchardCore.Scripting/Providers/LogProvider.cs
index b95873d35c8..f3ab73cd30a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Scripting/Providers/LogProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Scripting/Providers/LogProvider.cs
@@ -2,59 +2,58 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Logging;
 
-namespace OrchardCore.Scripting.Providers
+namespace OrchardCore.Scripting.Providers;
+
+public class LogProvider : IGlobalMethodProvider
 {
-    public class LogProvider : IGlobalMethodProvider
-    {
-        private readonly GlobalMethod _log;
+    private readonly GlobalMethod _log;
 
-        public LogProvider(ILogger<LogProvider> logger)
+    public LogProvider(ILogger<LogProvider> logger)
+    {
+        _log = new GlobalMethod
         {
-            _log = new GlobalMethod
+            Name = "log",
+            Method = serviceProvider => (Action<string, string, object>)((level, text, param) =>
             {
-                Name = "log",
-                Method = serviceProvider => (Action<string, string, object>)((level, text, param) =>
+                try
                 {
-                    try
+                    if (!Enum.TryParse<LogLevel>(level, true, out var logLevel))
+                    {
+                        logLevel = LogLevel.Information;
+                    }
+                    if (param == null)
                     {
-                        if (!Enum.TryParse<LogLevel>(level, true, out var logLevel))
-                        {
-                            logLevel = LogLevel.Information;
-                        }
-                        if (param == null)
-                        {
 #pragma warning disable CA2254 // Template should be a static expression
-                            logger.Log(logLevel, text);
+                        logger.Log(logLevel, text);
 #pragma warning restore CA2254 // Template should be a static expression
+                    }
+                    else
+                    {
+                        object[] args;
+                        if (param is not Array)
+                        {
+                            args = [param];
                         }
                         else
                         {
-                            object[] args;
-                            if (param is not Array)
-                            {
-                                args = [param];
-                            }
-                            else
-                            {
-                                args = (object[])param;
-                            }
+                            args = (object[])param;
+                        }
 
 #pragma warning disable CA2254 // Template should be a static expression
-                            logger.Log(logLevel, text, args);
+                        logger.Log(logLevel, text, args);
 #pragma warning restore CA2254 // Template should be a static expression
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        logger.Log(LogLevel.Error, ex, "Error logging text template {text} with param {param} from Scripting Engine.", text, param);
                     }
-                }),
-            };
-        }
+                }
+                catch (Exception ex)
+                {
+                    logger.Log(LogLevel.Error, ex, "Error logging text template {text} with param {param} from Scripting Engine.", text, param);
+                }
+            }),
+        };
+    }
 
-        public IEnumerable<GlobalMethod> GetMethods()
-        {
-            return new[] { _log };
-        }
+    public IEnumerable<GlobalMethod> GetMethods()
+    {
+        return new[] { _log };
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Scripting/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Scripting/Startup.cs
index 79bd02d6f3c..46d66032d53 100644
--- a/src/OrchardCore.Modules/OrchardCore.Scripting/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Scripting/Startup.cs
@@ -3,14 +3,13 @@
 using OrchardCore.Scripting.JavaScript;
 using OrchardCore.Scripting.Providers;
 
-namespace OrchardCore.Scripting
+namespace OrchardCore.Scripting;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddJavaScriptEngine();
-            services.AddSingleton<IGlobalMethodProvider, LogProvider>();
-        }
+        services.AddJavaScriptEngine();
+        services.AddSingleton<IGlobalMethodProvider, LogProvider>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Controllers/AdminController.cs
index 28f1b3ff25c..5e270e43dfe 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Controllers/AdminController.cs
@@ -33,620 +33,619 @@
 using OrchardCore.Settings;
 using YesSql;
 
-namespace OrchardCore.Search.Elasticsearch
+namespace OrchardCore.Search.Elasticsearch;
+
+[Admin("elasticsearch/{action}/{id?}", "Elasticsearch.{action}")]
+public class AdminController : Controller
 {
-    [Admin("elasticsearch/{action}/{id?}", "Elasticsearch.{action}")]
-    public class AdminController : Controller
+    private const string _optionsSearch = "Options.Search";
+
+    private readonly ISession _session;
+    private readonly ISiteService _siteService;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IElasticQueryService _queryService;
+    private readonly ElasticIndexManager _elasticIndexManager;
+    private readonly ElasticIndexingService _elasticIndexingService;
+    private readonly ElasticIndexSettingsService _elasticIndexSettingsService;
+    private readonly JavaScriptEncoder _javaScriptEncoder;
+    private readonly ElasticsearchOptions _elasticSearchOptions;
+    private readonly INotifier _notifier;
+    private readonly ILogger _logger;
+    private readonly IOptions<TemplateOptions> _templateOptions;
+    private readonly ElasticConnectionOptions _elasticConnectionOptions;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly ILocalizationService _localizationService;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public AdminController(
+        ISession session,
+        ISiteService siteService,
+        ILiquidTemplateManager liquidTemplateManager,
+        IContentDefinitionManager contentDefinitionManager,
+        IAuthorizationService authorizationService,
+        IElasticQueryService queryService,
+        ElasticIndexManager elasticIndexManager,
+        ElasticIndexingService elasticIndexingService,
+        ElasticIndexSettingsService elasticIndexSettingsService,
+        JavaScriptEncoder javaScriptEncoder,
+        IOptions<ElasticsearchOptions> elasticSearchOptions,
+        INotifier notifier,
+        ILogger<AdminController> logger,
+        IOptions<TemplateOptions> templateOptions,
+        IOptions<ElasticConnectionOptions> elasticConnectionOptions,
+        IShapeFactory shapeFactory,
+        ILocalizationService localizationService,
+        IStringLocalizer<AdminController> stringLocalizer,
+        IHtmlLocalizer<AdminController> htmlLocalizer)
     {
-        private const string _optionsSearch = "Options.Search";
-
-        private readonly ISession _session;
-        private readonly ISiteService _siteService;
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IElasticQueryService _queryService;
-        private readonly ElasticIndexManager _elasticIndexManager;
-        private readonly ElasticIndexingService _elasticIndexingService;
-        private readonly ElasticIndexSettingsService _elasticIndexSettingsService;
-        private readonly JavaScriptEncoder _javaScriptEncoder;
-        private readonly ElasticsearchOptions _elasticSearchOptions;
-        private readonly INotifier _notifier;
-        private readonly ILogger _logger;
-        private readonly IOptions<TemplateOptions> _templateOptions;
-        private readonly ElasticConnectionOptions _elasticConnectionOptions;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly ILocalizationService _localizationService;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public AdminController(
-            ISession session,
-            ISiteService siteService,
-            ILiquidTemplateManager liquidTemplateManager,
-            IContentDefinitionManager contentDefinitionManager,
-            IAuthorizationService authorizationService,
-            IElasticQueryService queryService,
-            ElasticIndexManager elasticIndexManager,
-            ElasticIndexingService elasticIndexingService,
-            ElasticIndexSettingsService elasticIndexSettingsService,
-            JavaScriptEncoder javaScriptEncoder,
-            IOptions<ElasticsearchOptions> elasticSearchOptions,
-            INotifier notifier,
-            ILogger<AdminController> logger,
-            IOptions<TemplateOptions> templateOptions,
-            IOptions<ElasticConnectionOptions> elasticConnectionOptions,
-            IShapeFactory shapeFactory,
-            ILocalizationService localizationService,
-            IStringLocalizer<AdminController> stringLocalizer,
-            IHtmlLocalizer<AdminController> htmlLocalizer)
-        {
-            _session = session;
-            _siteService = siteService;
-            _liquidTemplateManager = liquidTemplateManager;
-            _contentDefinitionManager = contentDefinitionManager;
-            _authorizationService = authorizationService;
-            _queryService = queryService;
-            _elasticIndexManager = elasticIndexManager;
-            _elasticIndexingService = elasticIndexingService;
-            _elasticIndexSettingsService = elasticIndexSettingsService;
-            _javaScriptEncoder = javaScriptEncoder;
-            _elasticSearchOptions = elasticSearchOptions.Value;
-            _notifier = notifier;
-            _logger = logger;
-            _templateOptions = templateOptions;
-            _elasticConnectionOptions = elasticConnectionOptions.Value;
-            _shapeFactory = shapeFactory;
-            _localizationService = localizationService;
-            S = stringLocalizer;
-            H = htmlLocalizer;
-        }
-
-        public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
-            {
-                return Forbid();
-            }
+        _session = session;
+        _siteService = siteService;
+        _liquidTemplateManager = liquidTemplateManager;
+        _contentDefinitionManager = contentDefinitionManager;
+        _authorizationService = authorizationService;
+        _queryService = queryService;
+        _elasticIndexManager = elasticIndexManager;
+        _elasticIndexingService = elasticIndexingService;
+        _elasticIndexSettingsService = elasticIndexSettingsService;
+        _javaScriptEncoder = javaScriptEncoder;
+        _elasticSearchOptions = elasticSearchOptions.Value;
+        _notifier = notifier;
+        _logger = logger;
+        _templateOptions = templateOptions;
+        _elasticConnectionOptions = elasticConnectionOptions.Value;
+        _shapeFactory = shapeFactory;
+        _localizationService = localizationService;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+    }
 
-            if (!_elasticConnectionOptions.FileConfigurationExists())
-            {
-                return NotConfigured();
-            }
+    public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
+        {
+            return Forbid();
+        }
 
-            var indexes = (await _elasticIndexSettingsService.GetSettingsAsync())
-                .Select(i => new IndexViewModel { Name = i.IndexName })
-                .ToList();
+        if (!_elasticConnectionOptions.FileConfigurationExists())
+        {
+            return NotConfigured();
+        }
 
-            var totalIndexes = indexes.Count;
-            var siteSettings = await _siteService.GetSiteSettingsAsync();
-            var pager = new Pager(pagerParameters, siteSettings.PageSize);
+        var indexes = (await _elasticIndexSettingsService.GetSettingsAsync())
+            .Select(i => new IndexViewModel { Name = i.IndexName })
+            .ToList();
 
-            if (!string.IsNullOrWhiteSpace(options.Search))
-            {
-                indexes = indexes.Where(q => q.Name.Contains(options.Search, StringComparison.OrdinalIgnoreCase)).ToList();
-            }
+        var totalIndexes = indexes.Count;
+        var siteSettings = await _siteService.GetSiteSettingsAsync();
+        var pager = new Pager(pagerParameters, siteSettings.PageSize);
 
-            indexes = indexes
-                .Skip(pager.GetStartIndex())
-                .Take(pager.PageSize)
-                .ToList();
+        if (!string.IsNullOrWhiteSpace(options.Search))
+        {
+            indexes = indexes.Where(q => q.Name.Contains(options.Search, StringComparison.OrdinalIgnoreCase)).ToList();
+        }
 
-            // Maintain previous route data when generating page links.
-            var routeData = new RouteData();
+        indexes = indexes
+            .Skip(pager.GetStartIndex())
+            .Take(pager.PageSize)
+            .ToList();
 
-            if (!string.IsNullOrEmpty(options.Search))
-            {
-                routeData.Values.TryAdd(_optionsSearch, options.Search);
-            }
+        // Maintain previous route data when generating page links.
+        var routeData = new RouteData();
 
-            var pagerShape = await _shapeFactory.PagerAsync(pager, totalIndexes, routeData);
+        if (!string.IsNullOrEmpty(options.Search))
+        {
+            routeData.Values.TryAdd(_optionsSearch, options.Search);
+        }
 
-            var model = new AdminIndexViewModel
-            {
-                Indexes = indexes,
-                Options = options,
-                Pager = pagerShape
-            };
+        var pagerShape = await _shapeFactory.PagerAsync(pager, totalIndexes, routeData);
 
-            model.Options.ContentsBulkAction =
-            [
-                new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
-                new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
-                new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
-            ];
+        var model = new AdminIndexViewModel
+        {
+            Indexes = indexes,
+            Options = options,
+            Pager = pagerShape
+        };
 
+        model.Options.ContentsBulkAction =
+        [
+            new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+            new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+            new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+        ];
 
-            return View(model);
-        }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.Filter")]
-        public IActionResult IndexFilterPOST(AdminIndexViewModel model)
-            => RedirectToAction(nameof(Index), new RouteValueDictionary
-            {
-                { _optionsSearch, model.Options.Search }
-            });
+        return View(model);
+    }
 
-        public async Task<IActionResult> Edit(string indexName = null)
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.Filter")]
+    public IActionResult IndexFilterPOST(AdminIndexViewModel model)
+        => RedirectToAction(nameof(Index), new RouteValueDictionary
         {
-            var IsCreate = string.IsNullOrWhiteSpace(indexName);
-            var settings = new ElasticIndexSettings();
+            { _optionsSearch, model.Options.Search }
+        });
 
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
-            {
-                return Forbid();
-            }
+    public async Task<IActionResult> Edit(string indexName = null)
+    {
+        var IsCreate = string.IsNullOrWhiteSpace(indexName);
+        var settings = new ElasticIndexSettings();
 
-            if (!_elasticConnectionOptions.FileConfigurationExists())
-            {
-                return NotConfigured();
-            }
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
+        {
+            return Forbid();
+        }
 
-            if (!IsCreate)
-            {
-                settings = await _elasticIndexSettingsService.GetSettingsAsync(indexName);
+        if (!_elasticConnectionOptions.FileConfigurationExists())
+        {
+            return NotConfigured();
+        }
 
-                if (settings == null)
-                {
-                    return NotFound();
-                }
-            }
+        if (!IsCreate)
+        {
+            settings = await _elasticIndexSettingsService.GetSettingsAsync(indexName);
 
-            var model = new ElasticIndexSettingsViewModel
+            if (settings == null)
             {
-                IsCreate = IsCreate,
-                IndexName = IsCreate ? string.Empty : settings.IndexName,
-                AnalyzerName = IsCreate ? "standardanalyzer" : settings.AnalyzerName,
-                IndexLatest = settings.IndexLatest,
-                Culture = settings.Culture,
-                IndexedContentTypes = settings.IndexedContentTypes,
-                StoreSourceData = settings.StoreSourceData
-            };
+                return NotFound();
+            }
+        }
 
-            await PopulateMenuOptionsAsync(model);
+        var model = new ElasticIndexSettingsViewModel
+        {
+            IsCreate = IsCreate,
+            IndexName = IsCreate ? string.Empty : settings.IndexName,
+            AnalyzerName = IsCreate ? "standardanalyzer" : settings.AnalyzerName,
+            IndexLatest = settings.IndexLatest,
+            Culture = settings.Culture,
+            IndexedContentTypes = settings.IndexedContentTypes,
+            StoreSourceData = settings.StoreSourceData
+        };
+
+        await PopulateMenuOptionsAsync(model);
+
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost, ActionName(nameof(Edit))]
+    public async Task<ActionResult> EditPost(ElasticIndexSettingsViewModel model, string[] indexedContentTypes)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName(nameof(Edit))]
-        public async Task<ActionResult> EditPost(ElasticIndexSettingsViewModel model, string[] indexedContentTypes)
+        if (!_elasticConnectionOptions.FileConfigurationExists())
+        {
+            return BadRequest();
+        }
+
+        ValidateModel(model);
+
+        if (model.IsCreate)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
+            if (await _elasticIndexManager.ExistsAsync(model.IndexName))
             {
-                return Forbid();
+                ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
             }
-
-            if (!_elasticConnectionOptions.FileConfigurationExists())
+        }
+        else
+        {
+            if (!await _elasticIndexManager.ExistsAsync(model.IndexName))
             {
-                return BadRequest();
+                ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
             }
+        }
+
+        if (!ModelState.IsValid)
+        {
+            await PopulateMenuOptionsAsync(model);
 
-            ValidateModel(model);
+            return View(model);
+        }
 
-            if (model.IsCreate)
+        if (model.IsCreate)
+        {
+            try
             {
-                if (await _elasticIndexManager.ExistsAsync(model.IndexName))
+                var settings = new ElasticIndexSettings
                 {
-                    ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-                }
+                    IndexName = model.IndexName,
+                    AnalyzerName = model.AnalyzerName,
+                    QueryAnalyzerName = model.AnalyzerName,
+                    IndexLatest = model.IndexLatest,
+                    IndexedContentTypes = indexedContentTypes,
+                    Culture = model.Culture ?? string.Empty,
+                    StoreSourceData = model.StoreSourceData
+                };
+
+                // We call Rebuild in order to reset the index state cursor too in case the same index
+                // name was also used previously.
+                await _elasticIndexingService.CreateIndexAsync(settings);
             }
-            else
+            catch (Exception e)
             {
-                if (!await _elasticIndexManager.ExistsAsync(model.IndexName))
-                {
-                    ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-                }
-            }
+                await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
+                _logger.LogError(e, "An error occurred while creating index: {indexName}.", _elasticIndexManager.GetFullIndexName(model.IndexName));
 
-            if (!ModelState.IsValid)
-            {
                 await PopulateMenuOptionsAsync(model);
 
                 return View(model);
             }
 
-            if (model.IsCreate)
+            await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+        }
+        else
+        {
+            try
             {
-                try
-                {
-                    var settings = new ElasticIndexSettings
-                    {
-                        IndexName = model.IndexName,
-                        AnalyzerName = model.AnalyzerName,
-                        QueryAnalyzerName = model.AnalyzerName,
-                        IndexLatest = model.IndexLatest,
-                        IndexedContentTypes = indexedContentTypes,
-                        Culture = model.Culture ?? string.Empty,
-                        StoreSourceData = model.StoreSourceData
-                    };
-
-                    // We call Rebuild in order to reset the index state cursor too in case the same index
-                    // name was also used previously.
-                    await _elasticIndexingService.CreateIndexAsync(settings);
-                }
-                catch (Exception e)
+                var settings = new ElasticIndexSettings
                 {
-                    await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-                    _logger.LogError(e, "An error occurred while creating index: {indexName}.", _elasticIndexManager.GetFullIndexName(model.IndexName));
+                    IndexName = model.IndexName,
+                    AnalyzerName = model.AnalyzerName,
+                    IndexLatest = model.IndexLatest,
+                    IndexedContentTypes = indexedContentTypes,
+                    Culture = model.Culture ?? string.Empty,
+                    StoreSourceData = model.StoreSourceData
+                };
 
-                    await PopulateMenuOptionsAsync(model);
-
-                    return View(model);
-                }
-
-                await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+                await _elasticIndexingService.UpdateIndexAsync(settings);
             }
-            else
+            catch (Exception e)
             {
-                try
-                {
-                    var settings = new ElasticIndexSettings
-                    {
-                        IndexName = model.IndexName,
-                        AnalyzerName = model.AnalyzerName,
-                        IndexLatest = model.IndexLatest,
-                        IndexedContentTypes = indexedContentTypes,
-                        Culture = model.Culture ?? string.Empty,
-                        StoreSourceData = model.StoreSourceData
-                    };
-
-                    await _elasticIndexingService.UpdateIndexAsync(settings);
-                }
-                catch (Exception e)
-                {
-                    await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-                    _logger.LogError(e, "An error occurred while editing index: {indexName}.", _elasticIndexManager.GetFullIndexName(model.IndexName));
+                await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
+                _logger.LogError(e, "An error occurred while editing index: {indexName}.", _elasticIndexManager.GetFullIndexName(model.IndexName));
 
-                    await PopulateMenuOptionsAsync(model);
-
-                    return View(model);
-                }
+                await PopulateMenuOptionsAsync(model);
 
-                await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
+                return View(model);
             }
 
-            return RedirectToAction(nameof(Index));
+            await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider rebuilding the index.</strong>", model.IndexName]);
         }
 
-        [HttpPost]
-        public async Task<ActionResult> Reset(string id)
+        return RedirectToAction(nameof(Index));
+    }
+
+    [HttpPost]
+    public async Task<ActionResult> Reset(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            if (!_elasticConnectionOptions.FileConfigurationExists())
-            {
-                return BadRequest();
-            }
+        if (!_elasticConnectionOptions.FileConfigurationExists())
+        {
+            return BadRequest();
+        }
 
-            if (!await _elasticIndexManager.ExistsAsync(id))
-            {
-                return NotFound();
-            }
+        if (!await _elasticIndexManager.ExistsAsync(id))
+        {
+            return NotFound();
+        }
 
-            await _elasticIndexingService.ResetIndexAsync(id);
-            await ProcessContentItemsAsync(id);
+        await _elasticIndexingService.ResetIndexAsync(id);
+        await ProcessContentItemsAsync(id);
 
-            await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
+        await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
 
-            return RedirectToAction("Index");
+        return RedirectToAction("Index");
+    }
+
+    [HttpPost]
+    public async Task<ActionResult> Rebuild(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<ActionResult> Rebuild(string id)
+        if (!_elasticConnectionOptions.FileConfigurationExists())
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
-            {
-                return Forbid();
-            }
+            return BadRequest();
+        }
 
-            if (!_elasticConnectionOptions.FileConfigurationExists())
-            {
-                return BadRequest();
-            }
+        if (!await _elasticIndexManager.ExistsAsync(id))
+        {
+            return NotFound();
+        }
 
-            if (!await _elasticIndexManager.ExistsAsync(id))
-            {
-                return NotFound();
-            }
+        var settings = await _elasticIndexSettingsService.GetSettingsAsync(id);
 
-            var settings = await _elasticIndexSettingsService.GetSettingsAsync(id);
+        await _elasticIndexingService.RebuildIndexAsync(settings);
 
-            await _elasticIndexingService.RebuildIndexAsync(settings);
+        if (settings.QueryAnalyzerName != settings.AnalyzerName)
+        {
+            // Query Analyzer may be different until the index in rebuilt.
+            // Since the index is rebuilt, lets make sure we query using the same analyzer.
+            settings.QueryAnalyzerName = settings.AnalyzerName;
 
-            if (settings.QueryAnalyzerName != settings.AnalyzerName)
-            {
-                // Query Analyzer may be different until the index in rebuilt.
-                // Since the index is rebuilt, lets make sure we query using the same analyzer.
-                settings.QueryAnalyzerName = settings.AnalyzerName;
+            await _elasticIndexSettingsService.UpdateIndexAsync(settings);
+        }
 
-                await _elasticIndexSettingsService.UpdateIndexAsync(settings);
-            }
+        await ProcessContentItemsAsync(id);
 
-            await ProcessContentItemsAsync(id);
+        await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
 
-            await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
+        return RedirectToAction(nameof(Index));
+    }
 
-            return RedirectToAction(nameof(Index));
+    [HttpPost]
+    public async Task<ActionResult> Delete(ElasticIndexSettingsViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<ActionResult> Delete(ElasticIndexSettingsViewModel model)
+        if (!_elasticConnectionOptions.FileConfigurationExists())
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
-            {
-                return Forbid();
-            }
+            return BadRequest();
+        }
 
-            if (!_elasticConnectionOptions.FileConfigurationExists())
-            {
-                return BadRequest();
-            }
+        if (!await _elasticIndexManager.ExistsAsync(model.IndexName))
+        {
+            await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
+            return RedirectToAction("Index");
+        }
 
-            if (!await _elasticIndexManager.ExistsAsync(model.IndexName))
-            {
-                await _notifier.SuccessAsync(H["Index not found on Elasticsearch server.", model.IndexName]);
-                return RedirectToAction("Index");
-            }
+        try
+        {
+            await _elasticIndexingService.DeleteIndexAsync(model.IndexName);
 
-            try
-            {
-                await _elasticIndexingService.DeleteIndexAsync(model.IndexName);
+            await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+        }
+        catch (Exception e)
+        {
+            await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
+            _logger.LogError(e, "An error occurred while deleting the index {indexName}", _elasticIndexManager.GetFullIndexName(model.IndexName));
+        }
 
-                await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-            }
-            catch (Exception e)
-            {
-                await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-                _logger.LogError(e, "An error occurred while deleting the index {indexName}", _elasticIndexManager.GetFullIndexName(model.IndexName));
-            }
+        return RedirectToAction("Index");
+    }
 
-            return RedirectToAction("Index");
+    [HttpPost]
+    public async Task<ActionResult> ForceDelete(ElasticIndexSettingsViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<ActionResult> ForceDelete(ElasticIndexSettingsViewModel model)
+        if (!_elasticConnectionOptions.FileConfigurationExists())
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
-            {
-                return Forbid();
-            }
+            return BadRequest();
+        }
 
-            if (!_elasticConnectionOptions.FileConfigurationExists())
-            {
-                return BadRequest();
-            }
+        try
+        {
+            await _elasticIndexingService.DeleteIndexAsync(model.IndexName);
 
-            try
-            {
-                await _elasticIndexingService.DeleteIndexAsync(model.IndexName);
+            await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+        }
+        catch (Exception e)
+        {
+            await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
+            _logger.LogError(e, "An error occurred while deleting the index {indexName}", _elasticIndexManager.GetFullIndexName(model.IndexName));
+        }
 
-                await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-            }
-            catch (Exception e)
-            {
-                await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-                _logger.LogError(e, "An error occurred while deleting the index {indexName}", _elasticIndexManager.GetFullIndexName(model.IndexName));
-            }
+        return RedirectToAction(nameof(Index));
+    }
 
-            return RedirectToAction(nameof(Index));
-        }
+    public async Task<IActionResult> Mappings(string indexName)
+    {
+        var mappings = await _elasticIndexManager.GetIndexMappings(indexName);
+        var formattedJson = JNode.Parse(mappings).ToJsonString(JOptions.Indented);
+        return View(new MappingsViewModel
+        {
+            IndexName = _elasticIndexManager.GetFullIndexName(indexName),
+            Mappings = formattedJson
+        });
+    }
 
-        public async Task<IActionResult> Mappings(string indexName)
+    public async Task<IActionResult> SyncSettings()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
         {
-            var mappings = await _elasticIndexManager.GetIndexMappings(indexName);
-            var formattedJson = JNode.Parse(mappings).ToJsonString(JOptions.Indented);
-            return View(new MappingsViewModel
-            {
-                IndexName = _elasticIndexManager.GetFullIndexName(indexName),
-                Mappings = formattedJson
-            });
+            return Forbid();
         }
 
-        public async Task<IActionResult> SyncSettings()
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
-            {
-                return Forbid();
-            }
+        await _elasticIndexingService.SyncSettings();
 
-            await _elasticIndexingService.SyncSettings();
+        return RedirectToAction(nameof(Index));
+    }
 
-            return RedirectToAction(nameof(Index));
+    public async Task<IActionResult> Query(string indexName, string query)
+    {
+        if (!_elasticConnectionOptions.FileConfigurationExists())
+        {
+            return NotConfigured();
         }
 
-        public async Task<IActionResult> Query(string indexName, string query)
+        return await Query(new AdminQueryViewModel
         {
-            if (!_elasticConnectionOptions.FileConfigurationExists())
-            {
-                return NotConfigured();
-            }
+            IndexName = indexName,
+            DecodedQuery = string.IsNullOrWhiteSpace(query) ? string.Empty : System.Text.Encoding.UTF8.GetString(Convert.FromBase64String(query))
+        });
+    }
 
-            return await Query(new AdminQueryViewModel
-            {
-                IndexName = indexName,
-                DecodedQuery = string.IsNullOrWhiteSpace(query) ? string.Empty : System.Text.Encoding.UTF8.GetString(Convert.FromBase64String(query))
-            });
+    [HttpPost]
+    public async Task<IActionResult> Query(AdminQueryViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Query(AdminQueryViewModel model)
+        if (!_elasticConnectionOptions.FileConfigurationExists())
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
-            {
-                return Forbid();
-            }
-
-            if (!_elasticConnectionOptions.FileConfigurationExists())
-            {
-                return BadRequest();
-            }
+            return BadRequest();
+        }
 
-            model.Indices = (await _elasticIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
+        model.Indices = (await _elasticIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
 
-            // Can't query if there are no indices.
-            if (model.Indices.Length == 0)
-            {
-                return RedirectToAction(nameof(Index));
-            }
+        // Can't query if there are no indices.
+        if (model.Indices.Length == 0)
+        {
+            return RedirectToAction(nameof(Index));
+        }
 
-            if (string.IsNullOrEmpty(model.IndexName))
-            {
-                model.IndexName = model.Indices[0];
-            }
+        if (string.IsNullOrEmpty(model.IndexName))
+        {
+            model.IndexName = model.Indices[0];
+        }
 
-            if (!await _elasticIndexManager.ExistsAsync(model.IndexName))
-            {
-                return NotFound();
-            }
+        if (!await _elasticIndexManager.ExistsAsync(model.IndexName))
+        {
+            return NotFound();
+        }
 
-            if (string.IsNullOrWhiteSpace(model.DecodedQuery))
-            {
-                return View(model);
-            }
+        if (string.IsNullOrWhiteSpace(model.DecodedQuery))
+        {
+            return View(model);
+        }
 
-            if (string.IsNullOrEmpty(model.Parameters))
-            {
-                model.Parameters = "{ }";
-            }
+        if (string.IsNullOrEmpty(model.Parameters))
+        {
+            model.Parameters = "{ }";
+        }
 
-            var stopwatch = new Stopwatch();
-            stopwatch.Start();
+        var stopwatch = new Stopwatch();
+        stopwatch.Start();
 
-            var parameters = JConvert.DeserializeObject<Dictionary<string, object>>(model.Parameters);
-            var tokenizedContent = await _liquidTemplateManager.RenderStringAsync(model.DecodedQuery, _javaScriptEncoder, parameters.Select(x => new KeyValuePair<string, FluidValue>(x.Key, FluidValue.Create(x.Value, _templateOptions.Value))));
+        var parameters = JConvert.DeserializeObject<Dictionary<string, object>>(model.Parameters);
+        var tokenizedContent = await _liquidTemplateManager.RenderStringAsync(model.DecodedQuery, _javaScriptEncoder, parameters.Select(x => new KeyValuePair<string, FluidValue>(x.Key, FluidValue.Create(x.Value, _templateOptions.Value))));
 
-            try
-            {
-                var elasticTopDocs = await _queryService.SearchAsync(model.IndexName, tokenizedContent);
+        try
+        {
+            var elasticTopDocs = await _queryService.SearchAsync(model.IndexName, tokenizedContent);
 
-                if (elasticTopDocs != null)
-                {
-                    model.Documents = elasticTopDocs.TopDocs.Where(x => x != null);
-                    model.Fields = elasticTopDocs.Fields;
-                    model.Count = elasticTopDocs.Count;
-                }
-            }
-            catch (Exception e)
+            if (elasticTopDocs != null)
             {
-                _logger.LogError(e, "Error while executing query");
-                ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
+                model.Documents = elasticTopDocs.TopDocs.Where(x => x != null);
+                model.Fields = elasticTopDocs.Fields;
+                model.Count = elasticTopDocs.Count;
             }
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, "Error while executing query");
+            ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
+        }
 
-            stopwatch.Stop();
-            model.Elapsed = stopwatch.Elapsed;
-            return View(model);
+        stopwatch.Stop();
+        model.Elapsed = stopwatch.Elapsed;
+        return View(model);
+    }
+
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<string> itemIds)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<string> itemIds)
+        if (!_elasticConnectionOptions.FileConfigurationExists())
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageElasticIndexes))
-            {
-                return Forbid();
-            }
+            return BadRequest();
+        }
 
-            if (!_elasticConnectionOptions.FileConfigurationExists())
-            {
-                return BadRequest();
-            }
+        if (itemIds?.Count() > 0)
+        {
+            var elasticIndexSettings = await _elasticIndexSettingsService.GetSettingsAsync();
+            var checkedContentItems = elasticIndexSettings.Where(x => itemIds.Contains(x.IndexName));
 
-            if (itemIds?.Count() > 0)
+            switch (options.BulkAction)
             {
-                var elasticIndexSettings = await _elasticIndexSettingsService.GetSettingsAsync();
-                var checkedContentItems = elasticIndexSettings.Where(x => itemIds.Contains(x.IndexName));
-
-                switch (options.BulkAction)
-                {
-                    case ContentsBulkAction.None:
-                        break;
-                    case ContentsBulkAction.Remove:
-                        foreach (var item in checkedContentItems)
+                case ContentsBulkAction.None:
+                    break;
+                case ContentsBulkAction.Remove:
+                    foreach (var item in checkedContentItems)
+                    {
+                        await _elasticIndexingService.DeleteIndexAsync(item.IndexName);
+                    }
+                    await _notifier.SuccessAsync(H["Indices successfully removed."]);
+                    break;
+                case ContentsBulkAction.Reset:
+                    foreach (var item in checkedContentItems)
+                    {
+                        if (!await _elasticIndexManager.ExistsAsync(item.IndexName))
                         {
-                            await _elasticIndexingService.DeleteIndexAsync(item.IndexName);
+                            return NotFound();
                         }
-                        await _notifier.SuccessAsync(H["Indices successfully removed."]);
-                        break;
-                    case ContentsBulkAction.Reset:
-                        foreach (var item in checkedContentItems)
-                        {
-                            if (!await _elasticIndexManager.ExistsAsync(item.IndexName))
-                            {
-                                return NotFound();
-                            }
 
-                            await _elasticIndexingService.ResetIndexAsync(item.IndexName);
-                            await ProcessContentItemsAsync(item.IndexName);
+                        await _elasticIndexingService.ResetIndexAsync(item.IndexName);
+                        await ProcessContentItemsAsync(item.IndexName);
 
-                            await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-                        }
-                        break;
-                    case ContentsBulkAction.Rebuild:
-                        foreach (var item in checkedContentItems)
+                        await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+                    }
+                    break;
+                case ContentsBulkAction.Rebuild:
+                    foreach (var item in checkedContentItems)
+                    {
+                        if (!await _elasticIndexManager.ExistsAsync(item.IndexName))
                         {
-                            if (!await _elasticIndexManager.ExistsAsync(item.IndexName))
-                            {
-                                return NotFound();
-                            }
+                            return NotFound();
+                        }
 
-                            await _elasticIndexingService.RebuildIndexAsync(await _elasticIndexSettingsService.GetSettingsAsync(item.IndexName));
+                        await _elasticIndexingService.RebuildIndexAsync(await _elasticIndexSettingsService.GetSettingsAsync(item.IndexName));
 
-                            await ProcessContentItemsAsync(item.IndexName);
-                            await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-                        }
-                        break;
-                    default:
-                        return BadRequest();
-                }
+                        await ProcessContentItemsAsync(item.IndexName);
+                        await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+                    }
+                    break;
+                default:
+                    return BadRequest();
             }
-
-            return RedirectToAction(nameof(Index));
         }
 
-        private void ValidateModel(ElasticIndexSettingsViewModel model)
-        {
-            if (model.IndexedContentTypes == null || model.IndexedContentTypes.Length < 1)
-            {
-                ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
-            }
+        return RedirectToAction(nameof(Index));
+    }
 
-            if (string.IsNullOrWhiteSpace(model.IndexName))
-            {
-                ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
-            }
-            else if (ElasticIndexManager.ToSafeIndexName(model.IndexName) != model.IndexName)
-            {
-                ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
-            }
+    private void ValidateModel(ElasticIndexSettingsViewModel model)
+    {
+        if (model.IndexedContentTypes == null || model.IndexedContentTypes.Length < 1)
+        {
+            ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexedContentTypes), S["At least one content type is required."]);
         }
 
-        private async Task PopulateMenuOptionsAsync(ElasticIndexSettingsViewModel model)
+        if (string.IsNullOrWhiteSpace(model.IndexName))
         {
-            var supportedCultures = await _localizationService.GetSupportedCulturesAsync();
-
-            model.Cultures = supportedCultures.Select(c => new SelectListItem
-            {
-                Text = $"{c} ({CultureInfo.GetCultureInfo(c).DisplayName})",
-                Value = c
-            });
-
-            model.Analyzers = _elasticSearchOptions.Analyzers
-                .Select(x => new SelectListItem { Text = x.Key, Value = x.Key });
+            ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name is required."]);
+        }
+        else if (ElasticIndexManager.ToSafeIndexName(model.IndexName) != model.IndexName)
+        {
+            ModelState.AddModelError(nameof(ElasticIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
         }
+    }
 
-        private ViewResult NotConfigured()
-            => View("NotConfigured");
+    private async Task PopulateMenuOptionsAsync(ElasticIndexSettingsViewModel model)
+    {
+        var supportedCultures = await _localizationService.GetSupportedCulturesAsync();
 
-        private static Task ProcessContentItemsAsync(string indexName)
-            => HttpBackgroundJob.ExecuteAfterEndOfRequestAsync("sync-content-items-elasticsearch-" + indexName, async (scope) =>
-            {
-                var indexingService = scope.ServiceProvider.GetRequiredService<ElasticIndexingService>();
-                await indexingService.ProcessContentItemsAsync(indexName);
-            });
+        model.Cultures = supportedCultures.Select(c => new SelectListItem
+        {
+            Text = $"{c} ({CultureInfo.GetCultureInfo(c).DisplayName})",
+            Value = c
+        });
+
+        model.Analyzers = _elasticSearchOptions.Analyzers
+            .Select(x => new SelectListItem { Text = x.Key, Value = x.Key });
     }
+
+    private ViewResult NotConfigured()
+        => View("NotConfigured");
+
+    private static Task ProcessContentItemsAsync(string indexName)
+        => HttpBackgroundJob.ExecuteAfterEndOfRequestAsync("sync-content-items-elasticsearch-" + indexName, async (scope) =>
+        {
+            var indexingService = scope.ServiceProvider.GetRequiredService<ElasticIndexingService>();
+            await indexingService.ProcessContentItemsAsync(indexName);
+        });
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Controllers/ElasticsearchApiController.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Controllers/ElasticsearchApiController.cs
index a37ce6da0ce..1f61db0906e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Controllers/ElasticsearchApiController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Controllers/ElasticsearchApiController.cs
@@ -9,98 +9,97 @@
 using OrchardCore.Search.Elasticsearch.Models;
 using OrchardCore.Search.Elasticsearch.ViewModels;
 
-namespace OrchardCore.Search.Elasticsearch
+namespace OrchardCore.Search.Elasticsearch;
+
+[Route("api/elasticsearch")]
+[ApiController]
+[Authorize(AuthenticationSchemes = "Api"), IgnoreAntiforgeryToken, AllowAnonymous]
+public sealed class ElasticsearchApiController : ControllerBase
 {
-    [Route("api/elasticsearch")]
-    [ApiController]
-    [Authorize(AuthenticationSchemes = "Api"), IgnoreAntiforgeryToken, AllowAnonymous]
-    public sealed class ElasticsearchApiController : ControllerBase
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IQueryManager _queryManager;
+
+    public ElasticsearchApiController(
+        IAuthorizationService authorizationService,
+        IQueryManager queryManager)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IQueryManager _queryManager;
+        _authorizationService = authorizationService;
+        _queryManager = queryManager;
+    }
 
-        public ElasticsearchApiController(
-            IAuthorizationService authorizationService,
-            IQueryManager queryManager)
+    [HttpGet]
+    [Route("content")]
+    public async Task<IActionResult> Content([FromQuery] ElasticApiQueryViewModel queryModel)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.QueryElasticApi))
         {
-            _authorizationService = authorizationService;
-            _queryManager = queryManager;
+            return this.ChallengeOrForbid("Api");
         }
 
-        [HttpGet]
-        [Route("content")]
-        public async Task<IActionResult> Content([FromQuery] ElasticApiQueryViewModel queryModel)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.QueryElasticApi))
-            {
-                return this.ChallengeOrForbid("Api");
-            }
+        var result = await ElasticQueryApiAsync(queryModel, returnContentItems: true);
 
-            var result = await ElasticQueryApiAsync(queryModel, returnContentItems: true);
+        return new ObjectResult(result);
+    }
 
-            return new ObjectResult(result);
+    [HttpPost]
+    [Route("content")]
+    public async Task<IActionResult> ContentPost(ElasticApiQueryViewModel queryModel)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.QueryElasticApi))
+        {
+            return this.ChallengeOrForbid();
         }
 
-        [HttpPost]
-        [Route("content")]
-        public async Task<IActionResult> ContentPost(ElasticApiQueryViewModel queryModel)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.QueryElasticApi))
-            {
-                return this.ChallengeOrForbid();
-            }
+        var result = await ElasticQueryApiAsync(queryModel, returnContentItems: true);
 
-            var result = await ElasticQueryApiAsync(queryModel, returnContentItems: true);
+        return new ObjectResult(result);
+    }
 
-            return new ObjectResult(result);
+    [HttpGet]
+    [Route("documents")]
+    public async Task<IActionResult> Documents([FromQuery] ElasticApiQueryViewModel queryModel)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.QueryElasticApi))
+        {
+            return this.ChallengeOrForbid();
         }
 
-        [HttpGet]
-        [Route("documents")]
-        public async Task<IActionResult> Documents([FromQuery] ElasticApiQueryViewModel queryModel)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.QueryElasticApi))
-            {
-                return this.ChallengeOrForbid();
-            }
+        var result = await ElasticQueryApiAsync(queryModel);
 
-            var result = await ElasticQueryApiAsync(queryModel);
+        return new ObjectResult(result);
+    }
 
-            return new ObjectResult(result);
+    [HttpPost]
+    [Route("documents")]
+    public async Task<IActionResult> DocumentsPost(ElasticApiQueryViewModel queryModel)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.QueryElasticApi))
+        {
+            return this.ChallengeOrForbid("Api");
         }
 
-        [HttpPost]
-        [Route("documents")]
-        public async Task<IActionResult> DocumentsPost(ElasticApiQueryViewModel queryModel)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.QueryElasticApi))
-            {
-                return this.ChallengeOrForbid("Api");
-            }
+        var result = await ElasticQueryApiAsync(queryModel);
 
-            var result = await ElasticQueryApiAsync(queryModel);
+        return new ObjectResult(result);
+    }
 
-            return new ObjectResult(result);
-        }
+    private async Task<IQueryResults> ElasticQueryApiAsync(ElasticApiQueryViewModel queryModel, bool returnContentItems = false)
+    {
+        var elasticQuery = await _queryManager.NewAsync(ElasticQuerySource.SourceName);
+        elasticQuery.ReturnContentItems = returnContentItems;
 
-        private async Task<IQueryResults> ElasticQueryApiAsync(ElasticApiQueryViewModel queryModel, bool returnContentItems = false)
+        elasticQuery.Put(new ElasticsearchQueryMetadata
         {
-            var elasticQuery = await _queryManager.NewAsync(ElasticQuerySource.SourceName);
-            elasticQuery.ReturnContentItems = returnContentItems;
+            Index = queryModel.IndexName,
+            Template = queryModel.Query,
+        });
 
-            elasticQuery.Put(new ElasticsearchQueryMetadata
-            {
-                Index = queryModel.IndexName,
-                Template = queryModel.Query,
-            });
+        var queryParameters = queryModel.Parameters != null
+            ? JConvert.DeserializeObject<Dictionary<string, object>>(queryModel.Parameters)
+            : [];
 
-            var queryParameters = queryModel.Parameters != null
-                ? JConvert.DeserializeObject<Dictionary<string, object>>(queryModel.Parameters)
-                : [];
+        var result = await _queryManager.ExecuteQueryAsync(elasticQuery, queryParameters);
 
-            var result = await _queryManager.ExecuteQueryAsync(elasticQuery, queryParameters);
-
-            return result;
-        }
+        return result;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ContentPartFieldIndexSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ContentPartFieldIndexSettingsDisplayDriver.cs
index 72c3472b830..a2ac796aa7b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ContentPartFieldIndexSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ContentPartFieldIndexSettingsDisplayDriver.cs
@@ -8,48 +8,47 @@
 using OrchardCore.Search.Elasticsearch.Core.Models;
 using OrchardCore.Search.Elasticsearch.ViewModels;
 
-namespace OrchardCore.Search.Elasticsearch.Drivers
+namespace OrchardCore.Search.Elasticsearch.Drivers;
+
+public sealed class ContentPartFieldIndexSettingsDisplayDriver : ContentPartFieldDefinitionDisplayDriver
 {
-    public sealed class ContentPartFieldIndexSettingsDisplayDriver : ContentPartFieldDefinitionDisplayDriver
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+
+    public ContentPartFieldIndexSettingsDisplayDriver(
+        IAuthorizationService authorizationService,
+        IHttpContextAccessor httpContextAccessor)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
 
-        public ContentPartFieldIndexSettingsDisplayDriver(
-            IAuthorizationService authorizationService,
-            IHttpContextAccessor httpContextAccessor)
+    public override async Task<IDisplayResult> EditAsync(ContentPartFieldDefinition contentPartFieldDefinition, BuildEditorContext context)
+    {
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageElasticIndexes))
         {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
+            return null;
         }
 
-        public override async Task<IDisplayResult> EditAsync(ContentPartFieldDefinition contentPartFieldDefinition, BuildEditorContext context)
+        return Initialize<ElasticContentIndexSettingsViewModel>("ElasticContentIndexSettings_Edit", model =>
         {
-            if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageElasticIndexes))
-            {
-                return null;
-            }
-
-            return Initialize<ElasticContentIndexSettingsViewModel>("ElasticContentIndexSettings_Edit", model =>
-            {
-                model.ElasticContentIndexSettings = contentPartFieldDefinition.GetSettings<ElasticContentIndexSettings>();
-            }).Location("Content:10");
-        }
+            model.ElasticContentIndexSettings = contentPartFieldDefinition.GetSettings<ElasticContentIndexSettings>();
+        }).Location("Content:10");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition contentPartFieldDefinition, UpdatePartFieldEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition contentPartFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageElasticIndexes))
         {
-            if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageElasticIndexes))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var model = new ElasticContentIndexSettingsViewModel();
+        var model = new ElasticContentIndexSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            context.Builder.WithSettings(model.ElasticContentIndexSettings);
+        context.Builder.WithSettings(model.ElasticContentIndexSettings);
 
-            return await EditAsync(contentPartFieldDefinition, context);
-        }
+        return await EditAsync(contentPartFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ContentPickerFieldElasticEditorSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ContentPickerFieldElasticEditorSettingsDriver.cs
index 70c7eb749d5..4033c9852e3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ContentPickerFieldElasticEditorSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ContentPickerFieldElasticEditorSettingsDriver.cs
@@ -9,46 +9,45 @@
 using OrchardCore.Search.Elasticsearch.Core.Models;
 using OrchardCore.Search.Elasticsearch.Core.Services;
 
-namespace OrchardCore.Search.Elasticsearch.Drivers
+namespace OrchardCore.Search.Elasticsearch.Drivers;
+
+public sealed class ContentPickerFieldElasticEditorSettingsDriver : ContentPartFieldDefinitionDisplayDriver
 {
-    public sealed class ContentPickerFieldElasticEditorSettingsDriver : ContentPartFieldDefinitionDisplayDriver
-    {
-        private readonly ElasticIndexSettingsService _elasticIndexSettingsService;
+    private readonly ElasticIndexSettingsService _elasticIndexSettingsService;
 
-        public ContentPickerFieldElasticEditorSettingsDriver(ElasticIndexSettingsService elasticIndexSettingsService)
-        {
-            _elasticIndexSettingsService = elasticIndexSettingsService;
-        }
+    public ContentPickerFieldElasticEditorSettingsDriver(ElasticIndexSettingsService elasticIndexSettingsService)
+    {
+        _elasticIndexSettingsService = elasticIndexSettingsService;
+    }
 
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+    {
+        return Initialize<ContentPickerFieldElasticEditorSettings>("ContentPickerFieldElasticEditorSettings_Edit", async model =>
         {
-            return Initialize<ContentPickerFieldElasticEditorSettings>("ContentPickerFieldElasticEditorSettings_Edit", async model =>
-            {
-                var settings = partFieldDefinition.Settings.ToObject<ContentPickerFieldElasticEditorSettings>();
+            var settings = partFieldDefinition.Settings.ToObject<ContentPickerFieldElasticEditorSettings>();
 
-                model.Index = settings.Index;
+            model.Index = settings.Index;
 
-                model.Indices = (await _elasticIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
-            }).Location("Editor");
-        }
+            model.Indices = (await _elasticIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
+        }).Location("Editor");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        if (partFieldDefinition.Editor() == "Elasticsearch")
         {
-            if (partFieldDefinition.Editor() == "Elasticsearch")
-            {
-                var model = new ContentPickerFieldElasticEditorSettings();
+            var model = new ContentPickerFieldElasticEditorSettings();
 
-                await context.Updater.TryUpdateModelAsync(model, Prefix);
+            await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-                context.Builder.WithSettings(model);
-            }
-
-            return Edit(partFieldDefinition, context);
+            context.Builder.WithSettings(model);
         }
 
-        public override bool CanHandleModel(ContentPartFieldDefinition model)
-        {
-            return string.Equals("ContentPickerField", model.FieldDefinition.Name, StringComparison.Ordinal);
-        }
+        return Edit(partFieldDefinition, context);
+    }
+
+    public override bool CanHandleModel(ContentPartFieldDefinition model)
+    {
+        return string.Equals("ContentPickerField", model.FieldDefinition.Name, StringComparison.Ordinal);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ContentTypePartIndexSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ContentTypePartIndexSettingsDisplayDriver.cs
index 46c3391313a..09fe0469113 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ContentTypePartIndexSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ContentTypePartIndexSettingsDisplayDriver.cs
@@ -8,48 +8,47 @@
 using OrchardCore.Search.Elasticsearch.Core.Models;
 using OrchardCore.Search.Elasticsearch.ViewModels;
 
-namespace OrchardCore.Search.Elasticsearch.Drivers
+namespace OrchardCore.Search.Elasticsearch.Drivers;
+
+public sealed class ContentTypePartIndexSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver
 {
-    public sealed class ContentTypePartIndexSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+
+    public ContentTypePartIndexSettingsDisplayDriver(
+        IAuthorizationService authorizationService,
+        IHttpContextAccessor httpContextAccessor)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
 
-        public ContentTypePartIndexSettingsDisplayDriver(
-            IAuthorizationService authorizationService,
-            IHttpContextAccessor httpContextAccessor)
+    public override async Task<IDisplayResult> EditAsync(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    {
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageElasticIndexes))
         {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
+            return null;
         }
 
-        public override async Task<IDisplayResult> EditAsync(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+        return Initialize<ElasticContentIndexSettingsViewModel>("ElasticContentIndexSettings_Edit", model =>
         {
-            if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageElasticIndexes))
-            {
-                return null;
-            }
-
-            return Initialize<ElasticContentIndexSettingsViewModel>("ElasticContentIndexSettings_Edit", model =>
-            {
-                model.ElasticContentIndexSettings = contentTypePartDefinition.GetSettings<ElasticContentIndexSettings>();
-            }).Location("Content:10");
-        }
+            model.ElasticContentIndexSettings = contentTypePartDefinition.GetSettings<ElasticContentIndexSettings>();
+        }).Location("Content:10");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    {
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageElasticIndexes))
         {
-            if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageElasticIndexes))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var model = new ElasticContentIndexSettingsViewModel();
+        var model = new ElasticContentIndexSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            context.Builder.WithSettings(model.ElasticContentIndexSettings);
+        context.Builder.WithSettings(model.ElasticContentIndexSettings);
 
-            return await EditAsync(contentTypePartDefinition, context);
-        }
+        return await EditAsync(contentTypePartDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticIndexDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticIndexDeploymentStepDriver.cs
index 80805a0f0eb..8400beec841 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticIndexDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticIndexDeploymentStepDriver.cs
@@ -6,52 +6,51 @@
 using OrchardCore.Search.Elasticsearch.Core.Services;
 using OrchardCore.Search.Elasticsearch.ViewModels;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Deployment
+namespace OrchardCore.Search.Elasticsearch.Core.Deployment;
+
+public sealed class ElasticIndexDeploymentStepDriver : DisplayDriver<DeploymentStep, ElasticIndexDeploymentStep>
 {
-    public sealed class ElasticIndexDeploymentStepDriver : DisplayDriver<DeploymentStep, ElasticIndexDeploymentStep>
+    private readonly ElasticIndexSettingsService _elasticIndexSettingsService;
+
+    public ElasticIndexDeploymentStepDriver(ElasticIndexSettingsService elasticIndexSettingsService)
     {
-        private readonly ElasticIndexSettingsService _elasticIndexSettingsService;
+        _elasticIndexSettingsService = elasticIndexSettingsService;
+    }
 
-        public ElasticIndexDeploymentStepDriver(ElasticIndexSettingsService elasticIndexSettingsService)
-        {
-            _elasticIndexSettingsService = elasticIndexSettingsService;
-        }
+    public override Task<IDisplayResult> DisplayAsync(ElasticIndexDeploymentStep step, BuildDisplayContext context)
+    {
+        return
+            CombineAsync(
+                View("ElasticIndexDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("ElasticIndexDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(ElasticIndexDeploymentStep step, BuildDisplayContext context)
+    public override IDisplayResult Edit(ElasticIndexDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<ElasticIndexDeploymentStepViewModel>("ElasticIndexDeploymentStep_Fields_Edit", async model =>
         {
-            return
-                CombineAsync(
-                    View("ElasticIndexDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("ElasticIndexDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+            model.IncludeAll = step.IncludeAll;
+            model.IndexNames = step.IndexNames;
+            model.AllIndexNames = (await _elasticIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
+        }).Location("Content");
+    }
 
-        public override IDisplayResult Edit(ElasticIndexDeploymentStep step, BuildEditorContext context)
-        {
-            return Initialize<ElasticIndexDeploymentStepViewModel>("ElasticIndexDeploymentStep_Fields_Edit", async model =>
-            {
-                model.IncludeAll = step.IncludeAll;
-                model.IndexNames = step.IndexNames;
-                model.AllIndexNames = (await _elasticIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
-            }).Location("Content");
-        }
+    public override async Task<IDisplayResult> UpdateAsync(ElasticIndexDeploymentStep step, UpdateEditorContext context)
+    {
+        step.IndexNames = [];
+
+        await context.Updater.TryUpdateModelAsync(step,
+                                          Prefix,
+                                          x => x.IndexNames,
+                                          x => x.IncludeAll);
 
-        public override async Task<IDisplayResult> UpdateAsync(ElasticIndexDeploymentStep step, UpdateEditorContext context)
+        // Don't have the selected option if include all.
+        if (step.IncludeAll)
         {
             step.IndexNames = [];
-
-            await context.Updater.TryUpdateModelAsync(step,
-                                              Prefix,
-                                              x => x.IndexNames,
-                                              x => x.IncludeAll);
-
-            // Don't have the selected option if include all.
-            if (step.IncludeAll)
-            {
-                step.IndexNames = [];
-            }
-
-            return Edit(step, context);
         }
+
+        return Edit(step, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticIndexRebuildDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticIndexRebuildDeploymentStepDriver.cs
index 2a436222f8d..8a3cd411dde 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticIndexRebuildDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticIndexRebuildDeploymentStepDriver.cs
@@ -6,48 +6,47 @@
 using OrchardCore.Search.Elasticsearch.Core.Services;
 using OrchardCore.Search.Elasticsearch.ViewModels;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Deployment
+namespace OrchardCore.Search.Elasticsearch.Core.Deployment;
+
+public sealed class ElasticIndexRebuildDeploymentStepDriver : DisplayDriver<DeploymentStep, ElasticIndexRebuildDeploymentStep>
 {
-    public sealed class ElasticIndexRebuildDeploymentStepDriver : DisplayDriver<DeploymentStep, ElasticIndexRebuildDeploymentStep>
+    private readonly ElasticIndexSettingsService _elasticIndexSettingsService;
+
+    public ElasticIndexRebuildDeploymentStepDriver(ElasticIndexSettingsService elasticIndexSettingsService)
     {
-        private readonly ElasticIndexSettingsService _elasticIndexSettingsService;
+        _elasticIndexSettingsService = elasticIndexSettingsService;
+    }
 
-        public ElasticIndexRebuildDeploymentStepDriver(ElasticIndexSettingsService elasticIndexSettingsService)
-        {
-            _elasticIndexSettingsService = elasticIndexSettingsService;
-        }
+    public override Task<IDisplayResult> DisplayAsync(ElasticIndexRebuildDeploymentStep step, BuildDisplayContext context)
+    {
+        return
+            CombineAsync(
+                View("ElasticIndexRebuildDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("ElasticIndexRebuildDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(ElasticIndexRebuildDeploymentStep step, BuildDisplayContext context)
+    public override IDisplayResult Edit(ElasticIndexRebuildDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<ElasticIndexRebuildDeploymentStepViewModel>("ElasticIndexRebuildDeploymentStep_Fields_Edit", async model =>
         {
-            return
-                CombineAsync(
-                    View("ElasticIndexRebuildDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("ElasticIndexRebuildDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+            model.IncludeAll = step.IncludeAll;
+            model.IndexNames = step.Indices;
+            model.AllIndexNames = (await _elasticIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
+        }).Location("Content");
+    }
 
-        public override IDisplayResult Edit(ElasticIndexRebuildDeploymentStep step, BuildEditorContext context)
-        {
-            return Initialize<ElasticIndexRebuildDeploymentStepViewModel>("ElasticIndexRebuildDeploymentStep_Fields_Edit", async model =>
-            {
-                model.IncludeAll = step.IncludeAll;
-                model.IndexNames = step.Indices;
-                model.AllIndexNames = (await _elasticIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
-            }).Location("Content");
-        }
+    public override async Task<IDisplayResult> UpdateAsync(ElasticIndexRebuildDeploymentStep rebuildIndexStep, UpdateEditorContext context)
+    {
+        rebuildIndexStep.Indices = [];
+
+        await context.Updater.TryUpdateModelAsync(rebuildIndexStep, Prefix, step => step.Indices, step => step.IncludeAll);
 
-        public override async Task<IDisplayResult> UpdateAsync(ElasticIndexRebuildDeploymentStep rebuildIndexStep, UpdateEditorContext context)
+        if (rebuildIndexStep.IncludeAll)
         {
             rebuildIndexStep.Indices = [];
-
-            await context.Updater.TryUpdateModelAsync(rebuildIndexStep, Prefix, step => step.Indices, step => step.IncludeAll);
-
-            if (rebuildIndexStep.IncludeAll)
-            {
-                rebuildIndexStep.Indices = [];
-            }
-
-            return Edit(rebuildIndexStep, context);
         }
+
+        return Edit(rebuildIndexStep, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticIndexResetDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticIndexResetDeploymentStepDriver.cs
index 724f4f2cb1b..f65835fd499 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticIndexResetDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticIndexResetDeploymentStepDriver.cs
@@ -6,48 +6,47 @@
 using OrchardCore.Search.Elasticsearch.Core.Services;
 using OrchardCore.Search.Elasticsearch.ViewModels;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Deployment
+namespace OrchardCore.Search.Elasticsearch.Core.Deployment;
+
+public sealed class ElasticIndexResetDeploymentStepDriver : DisplayDriver<DeploymentStep, ElasticIndexResetDeploymentStep>
 {
-    public sealed class ElasticIndexResetDeploymentStepDriver : DisplayDriver<DeploymentStep, ElasticIndexResetDeploymentStep>
+    private readonly ElasticIndexSettingsService _elasticIndexSettingsService;
+
+    public ElasticIndexResetDeploymentStepDriver(ElasticIndexSettingsService elasticIndexSettingsService)
     {
-        private readonly ElasticIndexSettingsService _elasticIndexSettingsService;
+        _elasticIndexSettingsService = elasticIndexSettingsService;
+    }
 
-        public ElasticIndexResetDeploymentStepDriver(ElasticIndexSettingsService elasticIndexSettingsService)
-        {
-            _elasticIndexSettingsService = elasticIndexSettingsService;
-        }
+    public override Task<IDisplayResult> DisplayAsync(ElasticIndexResetDeploymentStep step, BuildDisplayContext context)
+    {
+        return
+            CombineAsync(
+                View("ElasticIndexResetDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("ElasticIndexResetDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(ElasticIndexResetDeploymentStep step, BuildDisplayContext context)
+    public override IDisplayResult Edit(ElasticIndexResetDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<ElasticIndexResetDeploymentStepViewModel>("ElasticIndexResetDeploymentStep_Fields_Edit", async model =>
         {
-            return
-                CombineAsync(
-                    View("ElasticIndexResetDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("ElasticIndexResetDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+            model.IncludeAll = step.IncludeAll;
+            model.IndexNames = step.Indices;
+            model.AllIndexNames = (await _elasticIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
+        }).Location("Content");
+    }
 
-        public override IDisplayResult Edit(ElasticIndexResetDeploymentStep step, BuildEditorContext context)
-        {
-            return Initialize<ElasticIndexResetDeploymentStepViewModel>("ElasticIndexResetDeploymentStep_Fields_Edit", async model =>
-            {
-                model.IncludeAll = step.IncludeAll;
-                model.IndexNames = step.Indices;
-                model.AllIndexNames = (await _elasticIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
-            }).Location("Content");
-        }
+    public override async Task<IDisplayResult> UpdateAsync(ElasticIndexResetDeploymentStep resetIndexStep, UpdateEditorContext context)
+    {
+        resetIndexStep.Indices = [];
+
+        await context.Updater.TryUpdateModelAsync(resetIndexStep, Prefix, step => step.Indices, step => step.IncludeAll);
 
-        public override async Task<IDisplayResult> UpdateAsync(ElasticIndexResetDeploymentStep resetIndexStep, UpdateEditorContext context)
+        if (resetIndexStep.IncludeAll)
         {
             resetIndexStep.Indices = [];
-
-            await context.Updater.TryUpdateModelAsync(resetIndexStep, Prefix, step => step.Indices, step => step.IncludeAll);
-
-            if (resetIndexStep.IncludeAll)
-            {
-                resetIndexStep.Indices = [];
-            }
-
-            return Edit(resetIndexStep, context);
         }
+
+        return Edit(resetIndexStep, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticQueryDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticQueryDisplayDriver.cs
index 52fc490cebd..1b518f02163 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticQueryDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticQueryDisplayDriver.cs
@@ -10,90 +10,89 @@
 using OrchardCore.Search.Elasticsearch.Models;
 using OrchardCore.Search.Elasticsearch.ViewModels;
 
-namespace OrchardCore.Search.Elasticsearch.Drivers
+namespace OrchardCore.Search.Elasticsearch.Drivers;
+
+public sealed class ElasticQueryDisplayDriver : DisplayDriver<Query>
 {
-    public sealed class ElasticQueryDisplayDriver : DisplayDriver<Query>
-    {
-        private readonly ElasticIndexSettingsService _elasticIndexSettingsService;
+    private readonly ElasticIndexSettingsService _elasticIndexSettingsService;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public ElasticQueryDisplayDriver(
-            IStringLocalizer<ElasticQueryDisplayDriver> stringLocalizer,
-            ElasticIndexSettingsService elasticIndexSettingsService)
-        {
-            _elasticIndexSettingsService = elasticIndexSettingsService;
-            S = stringLocalizer;
-        }
+    public ElasticQueryDisplayDriver(
+        IStringLocalizer<ElasticQueryDisplayDriver> stringLocalizer,
+        ElasticIndexSettingsService elasticIndexSettingsService)
+    {
+        _elasticIndexSettingsService = elasticIndexSettingsService;
+        S = stringLocalizer;
+    }
 
-        public override IDisplayResult Display(Query query, BuildDisplayContext context)
+    public override IDisplayResult Display(Query query, BuildDisplayContext context)
+    {
+        if (query.Source != ElasticQuerySource.SourceName)
         {
-            if (query.Source != ElasticQuerySource.SourceName)
-            {
-                return null;
-            }
-
-            return Combine(
-                Dynamic("ElasticQuery_SummaryAdmin", model => { model.Query = query; }).Location("Content:5"),
-                Dynamic("ElasticQuery_Buttons_SummaryAdmin", model => { model.Query = query; }).Location("Actions:2")
-            );
+            return null;
         }
 
-        public override IDisplayResult Edit(Query query, BuildEditorContext context)
-        {
-            if (query.Source != ElasticQuerySource.SourceName)
-            {
-                return null;
-            }
+        return Combine(
+            Dynamic("ElasticQuery_SummaryAdmin", model => { model.Query = query; }).Location("Content:5"),
+            Dynamic("ElasticQuery_Buttons_SummaryAdmin", model => { model.Query = query; }).Location("Actions:2")
+        );
+    }
 
-            return Initialize<ElasticQueryViewModel>("ElasticQuery_Edit", async model =>
-            {
-                var metadata = query.As<ElasticsearchQueryMetadata>();
-
-                model.Query = metadata.Template;
-                model.Index = metadata.Index;
-                model.ReturnContentItems = query.ReturnContentItems;
-                model.Indices = (await _elasticIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
-
-                // Extract query from the query string if we come from the main query editor.
-                if (string.IsNullOrEmpty(metadata.Template))
-                {
-                    await context.Updater.TryUpdateModelAsync(model, string.Empty, m => m.Query);
-                }
-            }).Location("Content:5");
+    public override IDisplayResult Edit(Query query, BuildEditorContext context)
+    {
+        if (query.Source != ElasticQuerySource.SourceName)
+        {
+            return null;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(Query query, UpdateEditorContext context)
+        return Initialize<ElasticQueryViewModel>("ElasticQuery_Edit", async model =>
         {
-            if (query.Source != ElasticQuerySource.SourceName)
-            {
-                return null;
-            }
+            var metadata = query.As<ElasticsearchQueryMetadata>();
 
-            var viewModel = new ElasticQueryViewModel();
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix,
-                m => m.Query,
-                m => m.Index,
-                m => m.ReturnContentItems);
+            model.Query = metadata.Template;
+            model.Index = metadata.Index;
+            model.ReturnContentItems = query.ReturnContentItems;
+            model.Indices = (await _elasticIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
 
-            if (string.IsNullOrWhiteSpace(viewModel.Query))
+            // Extract query from the query string if we come from the main query editor.
+            if (string.IsNullOrEmpty(metadata.Template))
             {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Query), S["The query field is required"]);
+                await context.Updater.TryUpdateModelAsync(model, string.Empty, m => m.Query);
             }
+        }).Location("Content:5");
+    }
 
-            if (string.IsNullOrWhiteSpace(viewModel.Index))
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Index), S["The index field is required"]);
-            }
+    public override async Task<IDisplayResult> UpdateAsync(Query query, UpdateEditorContext context)
+    {
+        if (query.Source != ElasticQuerySource.SourceName)
+        {
+            return null;
+        }
 
-            query.ReturnContentItems = viewModel.ReturnContentItems;
-            query.Put(new ElasticsearchQueryMetadata
-            {
-                Template = viewModel.Query,
-                Index = viewModel.Index,
-            });
+        var viewModel = new ElasticQueryViewModel();
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix,
+            m => m.Query,
+            m => m.Index,
+            m => m.ReturnContentItems);
+
+        if (string.IsNullOrWhiteSpace(viewModel.Query))
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Query), S["The query field is required"]);
+        }
 
-            return Edit(query, context);
+        if (string.IsNullOrWhiteSpace(viewModel.Index))
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Index), S["The index field is required"]);
         }
+
+        query.ReturnContentItems = viewModel.ReturnContentItems;
+        query.Put(new ElasticsearchQueryMetadata
+        {
+            Template = viewModel.Query,
+            Index = viewModel.Index,
+        });
+
+        return Edit(query, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticSettingsDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticSettingsDeploymentStepDriver.cs
index 3c6a6780f9a..533969956cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticSettingsDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Drivers/ElasticSettingsDeploymentStepDriver.cs
@@ -4,22 +4,21 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Search.Elasticsearch.Core.Deployment;
 
-namespace OrchardCore.Search.Elasticsearch.Drivers
+namespace OrchardCore.Search.Elasticsearch.Drivers;
+
+public sealed class ElasticSettingsDeploymentStepDriver : DisplayDriver<DeploymentStep, ElasticSettingsDeploymentStep>
 {
-    public sealed class ElasticSettingsDeploymentStepDriver : DisplayDriver<DeploymentStep, ElasticSettingsDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(ElasticSettingsDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(ElasticSettingsDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("ElasticSettingsDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("ElasticSettingsDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("ElasticSettingsDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("ElasticSettingsDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(ElasticSettingsDeploymentStep step, BuildEditorContext context)
-        {
-            return View("ElasticSettingsDeploymentStep_Fields_Edit", step).Location("Content");
-        }
+    public override IDisplayResult Edit(ElasticSettingsDeploymentStep step, BuildEditorContext context)
+    {
+        return View("ElasticSettingsDeploymentStep_Fields_Edit", step).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/GraphQL/ElasticQueryFieldTypeProvider.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/GraphQL/ElasticQueryFieldTypeProvider.cs
index 0cb9bf4af84..a5ed8a9673c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/GraphQL/ElasticQueryFieldTypeProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/GraphQL/ElasticQueryFieldTypeProvider.cs
@@ -18,201 +18,200 @@
 using OrchardCore.Search.Elasticsearch.Core.Services;
 using OrchardCore.Search.Elasticsearch.Models;
 
-namespace OrchardCore.Search.Elasticsearch.GraphQL.Queries
+namespace OrchardCore.Search.Elasticsearch.GraphQL.Queries;
+
+public class ElasticQueryFieldTypeProvider : ISchemaBuilder
 {
-    public class ElasticQueryFieldTypeProvider : ISchemaBuilder
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly ILogger _logger;
+
+    public ElasticQueryFieldTypeProvider(IHttpContextAccessor httpContextAccessor, ILogger<ElasticQueryFieldTypeProvider> logger)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly ILogger _logger;
+        _httpContextAccessor = httpContextAccessor;
+        _logger = logger;
+    }
 
-        public ElasticQueryFieldTypeProvider(IHttpContextAccessor httpContextAccessor, ILogger<ElasticQueryFieldTypeProvider> logger)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _logger = logger;
-        }
+    public Task<string> GetIdentifierAsync()
+    {
+        var queryManager = _httpContextAccessor.HttpContext.RequestServices.GetService<IQueryManager>();
 
-        public Task<string> GetIdentifierAsync()
-        {
-            var queryManager = _httpContextAccessor.HttpContext.RequestServices.GetService<IQueryManager>();
+        return queryManager.GetIdentifierAsync();
+    }
 
-            return queryManager.GetIdentifierAsync();
-        }
+    public async Task BuildAsync(ISchema schema)
+    {
+        var queryManager = _httpContextAccessor.HttpContext.RequestServices.GetService<IQueryManager>();
 
-        public async Task BuildAsync(ISchema schema)
+        var queries = await queryManager.ListQueriesBySourceAsync(ElasticQuerySource.SourceName);
+
+        foreach (var query in queries)
         {
-            var queryManager = _httpContextAccessor.HttpContext.RequestServices.GetService<IQueryManager>();
+            if (string.IsNullOrWhiteSpace(query.Schema))
+                continue;
 
-            var queries = await queryManager.ListQueriesBySourceAsync(ElasticQuerySource.SourceName);
+            var name = query.Name;
 
-            foreach (var query in queries)
+            try
             {
-                if (string.IsNullOrWhiteSpace(query.Schema))
+                var querySchema = JObject.Parse(query.Schema);
+                if (!querySchema.ContainsKey("type"))
+                {
+                    _logger.LogError("The Query '{Name}' schema is invalid, the 'type' property was not found.", name);
                     continue;
+                }
+                var type = querySchema["type"].ToString();
+                FieldType fieldType;
 
-                var name = query.Name;
-
-                try
+                var fieldTypeName = querySchema["fieldTypeName"]?.ToString() ?? query.Name;
+                var metadata = query.As<ElasticsearchQueryMetadata>();
+                if (query.ReturnContentItems &&
+                    type.StartsWith("ContentItem/", StringComparison.OrdinalIgnoreCase))
                 {
-                    var querySchema = JObject.Parse(query.Schema);
-                    if (!querySchema.ContainsKey("type"))
-                    {
-                        _logger.LogError("The Query '{Name}' schema is invalid, the 'type' property was not found.", name);
-                        continue;
-                    }
-                    var type = querySchema["type"].ToString();
-                    FieldType fieldType;
-
-                    var fieldTypeName = querySchema["fieldTypeName"]?.ToString() ?? query.Name;
-                    var metadata = query.As<ElasticsearchQueryMetadata>();
-                    if (query.ReturnContentItems &&
-                        type.StartsWith("ContentItem/", StringComparison.OrdinalIgnoreCase))
-                    {
-                        var contentType = type.Remove(0, 12);
-                        fieldType = BuildContentTypeFieldType(schema, contentType, query, fieldTypeName);
-                    }
-                    else
-                    {
-                        fieldType = BuildSchemaBasedFieldType(query, querySchema, fieldTypeName);
-                    }
-
-                    if (fieldType != null)
-                    {
-                        schema.Query.AddField(fieldType);
-                    }
+                    var contentType = type.Remove(0, 12);
+                    fieldType = BuildContentTypeFieldType(schema, contentType, query, fieldTypeName);
                 }
-                catch (Exception e)
+                else
                 {
-                    _logger.LogError(e, "The Query '{Name}' has an invalid schema.", name);
+                    fieldType = BuildSchemaBasedFieldType(query, querySchema, fieldTypeName);
+                }
+
+                if (fieldType != null)
+                {
+                    schema.Query.AddField(fieldType);
                 }
             }
+            catch (Exception e)
+            {
+                _logger.LogError(e, "The Query '{Name}' has an invalid schema.", name);
+            }
         }
+    }
 
-        private static FieldType BuildSchemaBasedFieldType(Query query, JsonNode querySchema, string fieldTypeName)
+    private static FieldType BuildSchemaBasedFieldType(Query query, JsonNode querySchema, string fieldTypeName)
+    {
+        var properties = querySchema["properties"]?.AsObject();
+        if (properties == null)
         {
-            var properties = querySchema["properties"]?.AsObject();
-            if (properties == null)
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var typeType = new ObjectGraphType<JsonObject>
-            {
-                Name = fieldTypeName
-            };
+        var typeType = new ObjectGraphType<JsonObject>
+        {
+            Name = fieldTypeName
+        };
 
-            foreach (var child in properties)
-            {
-                var name = child.Key;
-                var nameLower = name.Replace('.', '_');
-                var type = child.Value["type"].ToString();
-                var description = child.Value["description"]?.ToString();
+        foreach (var child in properties)
+        {
+            var name = child.Key;
+            var nameLower = name.Replace('.', '_');
+            var type = child.Value["type"].ToString();
+            var description = child.Value["description"]?.ToString();
 
-                if (type == "string")
+            if (type == "string")
+            {
+                var field = new FieldType()
                 {
-                    var field = new FieldType()
+                    Name = nameLower,
+                    Description = description,
+                    Type = typeof(StringGraphType),
+                    Resolver = new FuncFieldResolver<JsonObject, string>(context =>
                     {
-                        Name = nameLower,
-                        Description = description,
-                        Type = typeof(StringGraphType),
-                        Resolver = new FuncFieldResolver<JsonObject, string>(context =>
-                        {
-                            var source = context.Source;
-                            return source[context.FieldDefinition.Metadata["Name"].ToString()].ToObject<string>();
-                        }),
-                    };
-                    field.Metadata.Add("Name", name);
-                    typeType.AddField(field);
-                }
-                else if (type == "integer")
+                        var source = context.Source;
+                        return source[context.FieldDefinition.Metadata["Name"].ToString()].ToObject<string>();
+                    }),
+                };
+                field.Metadata.Add("Name", name);
+                typeType.AddField(field);
+            }
+            else if (type == "integer")
+            {
+                var field = new FieldType()
                 {
-                    var field = new FieldType()
+                    Name = nameLower,
+                    Description = description,
+                    Type = typeof(IntGraphType),
+                    Resolver = new FuncFieldResolver<JsonObject, int?>(context =>
                     {
-                        Name = nameLower,
-                        Description = description,
-                        Type = typeof(IntGraphType),
-                        Resolver = new FuncFieldResolver<JsonObject, int?>(context =>
-                        {
-                            var source = context.Source;
-                            return source[context.FieldDefinition.Metadata["Name"].ToString()].ToObject<int>();
-                        }),
-                    };
-
-                    field.Metadata.Add("Name", name);
-                    typeType.AddField(field);
-                }
+                        var source = context.Source;
+                        return source[context.FieldDefinition.Metadata["Name"].ToString()].ToObject<int>();
+                    }),
+                };
+
+                field.Metadata.Add("Name", name);
+                typeType.AddField(field);
             }
+        }
 
-            var fieldType = new FieldType
-            {
-                Arguments = new QueryArguments(
-                    new QueryArgument<StringGraphType> { Name = "parameters" }
-                ),
-                Name = fieldTypeName,
-                Description = "Represents the " + query.Source + " Query : " + query.Name,
-                ResolvedType = new ListGraphType(typeType),
-                Resolver = new LockedAsyncFieldResolver<object, object>(ResolveAsync),
-                Type = typeof(ListGraphType<ObjectGraphType<JsonObject>>)
-            };
-
-            async ValueTask<object> ResolveAsync(IResolveFieldContext<object> context)
-            {
-                var queryManager = context.RequestServices.GetRequiredService<IQueryManager>();
+        var fieldType = new FieldType
+        {
+            Arguments = new QueryArguments(
+                new QueryArgument<StringGraphType> { Name = "parameters" }
+            ),
+            Name = fieldTypeName,
+            Description = "Represents the " + query.Source + " Query : " + query.Name,
+            ResolvedType = new ListGraphType(typeType),
+            Resolver = new LockedAsyncFieldResolver<object, object>(ResolveAsync),
+            Type = typeof(ListGraphType<ObjectGraphType<JsonObject>>)
+        };
+
+        async ValueTask<object> ResolveAsync(IResolveFieldContext<object> context)
+        {
+            var queryManager = context.RequestServices.GetRequiredService<IQueryManager>();
 
-                var iQuery = await queryManager.GetQueryAsync(query.Name);
+            var iQuery = await queryManager.GetQueryAsync(query.Name);
 
-                var parameters = context.GetArgument<string>("parameters");
+            var parameters = context.GetArgument<string>("parameters");
 
-                var queryParameters = parameters != null
-                    ? JConvert.DeserializeObject<Dictionary<string, object>>(parameters)
-                    : [];
+            var queryParameters = parameters != null
+                ? JConvert.DeserializeObject<Dictionary<string, object>>(parameters)
+                : [];
 
-                var result = await queryManager.ExecuteQueryAsync(iQuery, queryParameters);
+            var result = await queryManager.ExecuteQueryAsync(iQuery, queryParameters);
 
-                return result.Items;
-            }
-
-            return fieldType;
+            return result.Items;
         }
 
-        private static FieldType BuildContentTypeFieldType(ISchema schema, string contentType, Query query, string fieldTypeName)
-        {
-            var typeType = schema.Query.Fields.OfType<ContentItemsFieldType>().FirstOrDefault(x => x.Name == contentType);
+        return fieldType;
+    }
 
-            if (typeType == null)
-            {
-                return null;
-            }
+    private static FieldType BuildContentTypeFieldType(ISchema schema, string contentType, Query query, string fieldTypeName)
+    {
+        var typeType = schema.Query.Fields.OfType<ContentItemsFieldType>().FirstOrDefault(x => x.Name == contentType);
 
-            var fieldType = new FieldType
-            {
-                Arguments = new QueryArguments(
-                    new QueryArgument<StringGraphType> { Name = "parameters" }
-                ),
-                Name = fieldTypeName,
-                Description = "Represents the " + query.Source + " Query : " + query.Name,
-                ResolvedType = typeType.ResolvedType,
-                Resolver = new LockedAsyncFieldResolver<object, object>(ResolveAsync),
-                Type = typeType.Type
-            };
-
-            async ValueTask<object> ResolveAsync(IResolveFieldContext<object> context)
-            {
-                var queryManager = context.RequestServices.GetRequiredService<IQueryManager>();
+        if (typeType == null)
+        {
+            return null;
+        }
 
-                var iQuery = await queryManager.GetQueryAsync(query.Name);
+        var fieldType = new FieldType
+        {
+            Arguments = new QueryArguments(
+                new QueryArgument<StringGraphType> { Name = "parameters" }
+            ),
+            Name = fieldTypeName,
+            Description = "Represents the " + query.Source + " Query : " + query.Name,
+            ResolvedType = typeType.ResolvedType,
+            Resolver = new LockedAsyncFieldResolver<object, object>(ResolveAsync),
+            Type = typeType.Type
+        };
+
+        async ValueTask<object> ResolveAsync(IResolveFieldContext<object> context)
+        {
+            var queryManager = context.RequestServices.GetRequiredService<IQueryManager>();
 
-                var parameters = context.GetArgument<string>("parameters");
+            var iQuery = await queryManager.GetQueryAsync(query.Name);
 
-                var queryParameters = parameters != null
-                    ? JConvert.DeserializeObject<Dictionary<string, object>>(parameters)
-                    : [];
+            var parameters = context.GetArgument<string>("parameters");
 
-                var result = await queryManager.ExecuteQueryAsync(iQuery, queryParameters);
+            var queryParameters = parameters != null
+                ? JConvert.DeserializeObject<Dictionary<string, object>>(parameters)
+                : [];
 
-                return result.Items;
-            }
+            var result = await queryManager.ExecuteQueryAsync(iQuery, queryParameters);
 
-            return fieldType;
+            return result.Items;
         }
+
+        return fieldType;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/GraphQL/Startup.cs
index 1dfba7f2e77..e64c0c5acf7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/GraphQL/Startup.cs
@@ -3,17 +3,16 @@
 using OrchardCore.Modules;
 using OrchardCore.Search.Elasticsearch.GraphQL.Queries;
 
-namespace OrchardCore.Search.Elasticsearch.GraphQL
+namespace OrchardCore.Search.Elasticsearch.GraphQL;
+
+/// <summary>
+/// These services are registered on the tenant service collection.
+/// </summary>
+[RequireFeatures("OrchardCore.Apis.GraphQL", "OrchardCore.Queries")]
+public sealed class Startup : StartupBase
 {
-    /// <summary>
-    /// These services are registered on the tenant service collection.
-    /// </summary>
-    [RequireFeatures("OrchardCore.Apis.GraphQL", "OrchardCore.Queries")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSingleton<ISchemaBuilder, ElasticQueryFieldTypeProvider>();
-        }
+        services.AddSingleton<ISchemaBuilder, ElasticQueryFieldTypeProvider>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Startup.cs
index f2fcae10a5f..093bbc6aa3d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Startup.cs
@@ -29,129 +29,128 @@
 using OrchardCore.Security.Permissions;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Search.Elasticsearch
+namespace OrchardCore.Search.Elasticsearch;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    private readonly IShellConfiguration _shellConfiguration;
+
+    public Startup(IShellConfiguration shellConfiguration)
+    {
+        _shellConfiguration = shellConfiguration;
+    }
+
+    public override void ConfigureServices(IServiceCollection services)
     {
-        private readonly IShellConfiguration _shellConfiguration;
+        services.AddTransient<IConfigureOptions<ElasticConnectionOptions>, ElasticConnectionOptionsConfigurations>();
 
-        public Startup(IShellConfiguration shellConfiguration)
+        services.AddSingleton<IElasticClient>((sp) =>
         {
-            _shellConfiguration = shellConfiguration;
-        }
+            var options = sp.GetRequiredService<IOptions<ElasticConnectionOptions>>().Value;
 
-        public override void ConfigureServices(IServiceCollection services)
+            return new ElasticClient(options.GetConnectionSettings() ?? new ConnectionSettings());
+        });
+
+        services.Configure<ElasticsearchOptions>(o =>
         {
-            services.AddTransient<IConfigureOptions<ElasticConnectionOptions>, ElasticConnectionOptionsConfigurations>();
+            var configuration = _shellConfiguration.GetSection(ElasticConnectionOptionsConfigurations.ConfigSectionName);
 
-            services.AddSingleton<IElasticClient>((sp) =>
-            {
-                var options = sp.GetRequiredService<IOptions<ElasticConnectionOptions>>().Value;
+            o.IndexPrefix = configuration.GetValue<string>(nameof(o.IndexPrefix));
 
-                return new ElasticClient(options.GetConnectionSettings() ?? new ConnectionSettings());
-            });
+            var jsonNode = configuration.GetSection(nameof(o.Analyzers)).AsJsonNode();
+            var jsonElement = JsonSerializer.Deserialize<JsonElement>(jsonNode);
 
-            services.Configure<ElasticsearchOptions>(o =>
+            var analyzersObject = JsonObject.Create(jsonElement, new JsonNodeOptions()
             {
-                var configuration = _shellConfiguration.GetSection(ElasticConnectionOptionsConfigurations.ConfigSectionName);
+                PropertyNameCaseInsensitive = true,
+            });
 
+            if (analyzersObject != null)
+            {
                 o.IndexPrefix = configuration.GetValue<string>(nameof(o.IndexPrefix));
 
-                var jsonNode = configuration.GetSection(nameof(o.Analyzers)).AsJsonNode();
-                var jsonElement = JsonSerializer.Deserialize<JsonElement>(jsonNode);
-
-                var analyzersObject = JsonObject.Create(jsonElement, new JsonNodeOptions()
+                if (jsonNode is JsonObject jAnalyzers)
                 {
-                    PropertyNameCaseInsensitive = true,
-                });
-
-                if (analyzersObject != null)
-                {
-                    o.IndexPrefix = configuration.GetValue<string>(nameof(o.IndexPrefix));
-
-                    if (jsonNode is JsonObject jAnalyzers)
+                    foreach (var analyzer in jAnalyzers)
                     {
-                        foreach (var analyzer in jAnalyzers)
+                        if (analyzer.Value is not JsonObject jAnalyzer)
                         {
-                            if (analyzer.Value is not JsonObject jAnalyzer)
-                            {
-                                continue;
-                            }
-
-                            o.Analyzers.Add(analyzer.Key, jAnalyzer);
+                            continue;
                         }
+
+                        o.Analyzers.Add(analyzer.Key, jAnalyzer);
                     }
                 }
+            }
 
-                if (o.Analyzers.Count == 0)
+            if (o.Analyzers.Count == 0)
+            {
+                // When no analyzers are configured, we'll define a default analyzer.
+                o.Analyzers.Add(ElasticsearchConstants.DefaultAnalyzer, new JsonObject
                 {
-                    // When no analyzers are configured, we'll define a default analyzer.
-                    o.Analyzers.Add(ElasticsearchConstants.DefaultAnalyzer, new JsonObject
-                    {
-                        ["type"] = "standard",
-                    });
-                }
-            });
-
-            services.AddElasticServices();
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IDisplayDriver<Query>, ElasticQueryDisplayDriver>();
-            services.AddDataMigration<ElasticsearchQueryMigrations>();
-            services.AddScoped<IQueryHandler, ElasticsearchQueryHandler>();
-        }
+                    ["type"] = "standard",
+                });
+            }
+        });
+
+        services.AddElasticServices();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IDisplayDriver<Query>, ElasticQueryDisplayDriver>();
+        services.AddDataMigration<ElasticsearchQueryMigrations>();
+        services.AddScoped<IQueryHandler, ElasticsearchQueryHandler>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Search")]
-    public sealed class SearchStartup : StartupBase
+[RequireFeatures("OrchardCore.Search")]
+public sealed class SearchStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<ISearchService, ElasticsearchService>();
-            services.AddScoped<IDisplayDriver<ISite>, ElasticSettingsDisplayDriver>();
-            services.AddScoped<IAuthorizationHandler, ElasticsearchAuthorizationHandler>();
-        }
+        services.AddScoped<ISearchService, ElasticsearchService>();
+        services.AddScoped<IDisplayDriver<ISite>, ElasticSettingsDisplayDriver>();
+        services.AddScoped<IAuthorizationHandler, ElasticsearchAuthorizationHandler>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class DeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class DeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<ElasticIndexDeploymentSource, ElasticIndexDeploymentStep, ElasticIndexDeploymentStepDriver>();
-            services.AddDeployment<ElasticSettingsDeploymentSource, ElasticSettingsDeploymentStep, ElasticSettingsDeploymentStepDriver>();
-            services.AddDeployment<ElasticIndexRebuildDeploymentSource, ElasticIndexRebuildDeploymentStep, ElasticIndexRebuildDeploymentStepDriver>();
-            services.AddDeployment<ElasticIndexResetDeploymentSource, ElasticIndexResetDeploymentStep, ElasticIndexResetDeploymentStepDriver>();
-        }
+        services.AddDeployment<ElasticIndexDeploymentSource, ElasticIndexDeploymentStep, ElasticIndexDeploymentStepDriver>();
+        services.AddDeployment<ElasticSettingsDeploymentSource, ElasticSettingsDeploymentStep, ElasticSettingsDeploymentStepDriver>();
+        services.AddDeployment<ElasticIndexRebuildDeploymentSource, ElasticIndexRebuildDeploymentStep, ElasticIndexRebuildDeploymentStepDriver>();
+        services.AddDeployment<ElasticIndexResetDeploymentSource, ElasticIndexResetDeploymentStep, ElasticIndexResetDeploymentStepDriver>();
     }
+}
 
-    [Feature("OrchardCore.Search.Elasticsearch.Worker")]
-    public sealed class ElasticWorkerStartup : StartupBase
+[Feature("OrchardCore.Search.Elasticsearch.Worker")]
+public sealed class ElasticWorkerStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSingleton<IBackgroundTask, IndexingBackgroundTask>();
-        }
+        services.AddSingleton<IBackgroundTask, IndexingBackgroundTask>();
     }
+}
 
-    [Feature("OrchardCore.Search.Elasticsearch.ContentPicker")]
-    public sealed class ElasticContentPickerStartup : StartupBase
+[Feature("OrchardCore.Search.Elasticsearch.ContentPicker")]
+public sealed class ElasticContentPickerStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IContentPickerResultProvider, ElasticContentPickerResultProvider>();
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, ContentPickerFieldElasticEditorSettingsDriver>();
-            services.AddShapeAttributes<ElasticContentPickerShapeProvider>();
-        }
+        services.AddScoped<IContentPickerResultProvider, ElasticContentPickerResultProvider>();
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, ContentPickerFieldElasticEditorSettingsDriver>();
+        services.AddShapeAttributes<ElasticContentPickerShapeProvider>();
     }
+}
 
-    [RequireFeatures("OrchardCore.ContentTypes")]
-    public sealed class ContentTypesStartup : StartupBase
+[RequireFeatures("OrchardCore.ContentTypes")]
+public sealed class ContentTypesStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, ContentTypePartIndexSettingsDisplayDriver>();
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, ContentPartFieldIndexSettingsDisplayDriver>();
-        }
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, ContentTypePartIndexSettingsDisplayDriver>();
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, ContentPartFieldIndexSettingsDisplayDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/AdminIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/AdminIndexViewModel.cs
index a41a87cb477..35f6e65cbe9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/AdminIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/AdminIndexViewModel.cs
@@ -2,37 +2,36 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.Search.Elasticsearch.ViewModels
+namespace OrchardCore.Search.Elasticsearch.ViewModels;
+
+public class AdminIndexViewModel
 {
-    public class AdminIndexViewModel
-    {
-        public IEnumerable<IndexViewModel> Indexes { get; set; }
+    public IEnumerable<IndexViewModel> Indexes { get; set; }
 
-        public ContentOptions Options { get; set; } = new ContentOptions();
+    public ContentOptions Options { get; set; } = new ContentOptions();
 
-        [BindNever]
-        public dynamic Pager { get; set; }
-    }
+    [BindNever]
+    public dynamic Pager { get; set; }
+}
 
-    public class ContentOptions
-    {
-        public ContentsBulkAction BulkAction { get; set; }
+public class ContentOptions
+{
+    public ContentsBulkAction BulkAction { get; set; }
 
-        public string Search { get; set; }
+    public string Search { get; set; }
 
-        #region Lists to populate
+    #region Lists to populate
 
-        [BindNever]
-        public List<SelectListItem> ContentsBulkAction { get; set; }
+    [BindNever]
+    public List<SelectListItem> ContentsBulkAction { get; set; }
 
-        #endregion Lists to populate
-    }
+    #endregion Lists to populate
+}
 
-    public enum ContentsBulkAction
-    {
-        None,
-        Reset,
-        Rebuild,
-        Remove
-    }
+public enum ContentsBulkAction
+{
+    None,
+    Reset,
+    Rebuild,
+    Remove
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/AdminQueryViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/AdminQueryViewModel.cs
index f4406d00f6c..09386bd8ecb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/AdminQueryViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/AdminQueryViewModel.cs
@@ -2,27 +2,26 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Search.Elasticsearch.ViewModels
+namespace OrchardCore.Search.Elasticsearch.ViewModels;
+
+public class AdminQueryViewModel
 {
-    public class AdminQueryViewModel
-    {
-        public string DecodedQuery { get; set; }
-        public string IndexName { get; set; }
-        public string Parameters { get; set; }
+    public string DecodedQuery { get; set; }
+    public string IndexName { get; set; }
+    public string Parameters { get; set; }
 
-        [BindNever]
-        public long Count { get; set; }
+    [BindNever]
+    public long Count { get; set; }
 
-        [BindNever]
-        public string[] Indices { get; set; }
+    [BindNever]
+    public string[] Indices { get; set; }
 
-        [BindNever]
-        public TimeSpan Elapsed { get; set; } = TimeSpan.Zero;
+    [BindNever]
+    public TimeSpan Elapsed { get; set; } = TimeSpan.Zero;
 
-        [BindNever]
-        public IEnumerable<Dictionary<string, object>> Documents { get; set; } = [];
+    [BindNever]
+    public IEnumerable<Dictionary<string, object>> Documents { get; set; } = [];
 
-        [BindNever]
-        public IEnumerable<Dictionary<string, object>> Fields { get; set; } = [];
-    }
+    [BindNever]
+    public IEnumerable<Dictionary<string, object>> Fields { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticApiQueryViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticApiQueryViewModel.cs
index fd7870aa8ae..58abf70b3d8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticApiQueryViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticApiQueryViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Search.Elasticsearch.ViewModels
+namespace OrchardCore.Search.Elasticsearch.ViewModels;
+
+public class ElasticApiQueryViewModel
 {
-    public class ElasticApiQueryViewModel
-    {
-        public string IndexName { set; get; }
-        public string Query { set; get; }
-        public string Parameters { set; get; }
-    }
+    public string IndexName { set; get; }
+    public string Query { set; get; }
+    public string Parameters { set; get; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticContentIndexSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticContentIndexSettingsViewModel.cs
index 7cae6a8180e..b4cb3d26d6b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticContentIndexSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticContentIndexSettingsViewModel.cs
@@ -1,9 +1,8 @@
 using OrchardCore.Search.Elasticsearch.Core.Models;
 
-namespace OrchardCore.Search.Elasticsearch.ViewModels
+namespace OrchardCore.Search.Elasticsearch.ViewModels;
+
+public class ElasticContentIndexSettingsViewModel
 {
-    public class ElasticContentIndexSettingsViewModel
-    {
-        public ElasticContentIndexSettings ElasticContentIndexSettings { get; set; }
-    }
+    public ElasticContentIndexSettings ElasticContentIndexSettings { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticIndexDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticIndexDeploymentStepViewModel.cs
index 9cde8bb3479..0c671e183e8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticIndexDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticIndexDeploymentStepViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Search.Elasticsearch.ViewModels
+namespace OrchardCore.Search.Elasticsearch.ViewModels;
+
+public class ElasticIndexDeploymentStepViewModel
 {
-    public class ElasticIndexDeploymentStepViewModel
-    {
-        public bool IncludeAll { get; set; }
-        public string[] IndexNames { get; set; }
-        public string[] AllIndexNames { get; set; }
-    }
+    public bool IncludeAll { get; set; }
+    public string[] IndexNames { get; set; }
+    public string[] AllIndexNames { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticIndexRebuildDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticIndexRebuildDeploymentStepViewModel.cs
index a0876412b4d..45a98a542fe 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticIndexRebuildDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticIndexRebuildDeploymentStepViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Search.Elasticsearch.ViewModels
+namespace OrchardCore.Search.Elasticsearch.ViewModels;
+
+public class ElasticIndexRebuildDeploymentStepViewModel
 {
-    public class ElasticIndexRebuildDeploymentStepViewModel
-    {
-        public bool IncludeAll { get; set; }
-        public string[] IndexNames { get; set; }
-        public string[] AllIndexNames { get; set; }
-    }
+    public bool IncludeAll { get; set; }
+    public string[] IndexNames { get; set; }
+    public string[] AllIndexNames { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticIndexResetDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticIndexResetDeploymentStepViewModel.cs
index 056cbae9d82..cabc3337c64 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticIndexResetDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticIndexResetDeploymentStepViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Search.Elasticsearch.ViewModels
+namespace OrchardCore.Search.Elasticsearch.ViewModels;
+
+public class ElasticIndexResetDeploymentStepViewModel
 {
-    public class ElasticIndexResetDeploymentStepViewModel
-    {
-        public bool IncludeAll { get; set; }
-        public string[] IndexNames { get; set; }
-        public string[] AllIndexNames { get; set; }
-    }
+    public bool IncludeAll { get; set; }
+    public string[] IndexNames { get; set; }
+    public string[] AllIndexNames { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticIndexSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticIndexSettingsViewModel.cs
index 017ef230c5e..86644769990 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticIndexSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticIndexSettingsViewModel.cs
@@ -2,32 +2,31 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.Search.Elasticsearch.ViewModels
+namespace OrchardCore.Search.Elasticsearch.ViewModels;
+
+public class ElasticIndexSettingsViewModel
 {
-    public class ElasticIndexSettingsViewModel
-    {
-        public string IndexName { get; set; }
+    public string IndexName { get; set; }
 
-        public string AnalyzerName { get; set; }
+    public string AnalyzerName { get; set; }
 
-        public bool IndexLatest { get; set; }
+    public bool IndexLatest { get; set; }
 
-        public string Culture { get; set; }
+    public string Culture { get; set; }
 
-        public string[] IndexedContentTypes { get; set; }
+    public string[] IndexedContentTypes { get; set; }
 
-        public bool IsCreate { get; set; }
+    public bool IsCreate { get; set; }
 
-        public bool StoreSourceData { get; set; }
+    public bool StoreSourceData { get; set; }
 
-        #region List to populate
+    #region List to populate
 
-        [BindNever]
-        public IEnumerable<SelectListItem> Analyzers { get; set; }
+    [BindNever]
+    public IEnumerable<SelectListItem> Analyzers { get; set; }
 
-        [BindNever]
-        public IEnumerable<SelectListItem> Cultures { get; set; }
+    [BindNever]
+    public IEnumerable<SelectListItem> Cultures { get; set; }
 
-        #endregion List to populate
-    }
+    #endregion List to populate
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticQueryViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticQueryViewModel.cs
index dc5b7ef7e88..47bcaf8627f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticQueryViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticQueryViewModel.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.Search.Elasticsearch.ViewModels
+namespace OrchardCore.Search.Elasticsearch.ViewModels;
+
+public class ElasticQueryViewModel
 {
-    public class ElasticQueryViewModel
-    {
-        public string[] Indices { get; set; }
-        public string Index { get; set; }
-        public string Query { get; set; }
-        public bool ReturnContentItems { get; set; }
-    }
+    public string[] Indices { get; set; }
+    public string Index { get; set; }
+    public string Query { get; set; }
+    public bool ReturnContentItems { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticSettingsViewModel.cs
index c06bc3f4ff1..38ec862292e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/ElasticSettingsViewModel.cs
@@ -2,23 +2,22 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.Search.Elasticsearch.ViewModels
+namespace OrchardCore.Search.Elasticsearch.ViewModels;
+
+public class ElasticSettingsViewModel
 {
-    public class ElasticSettingsViewModel
-    {
-        public string Analyzer { get; set; }
+    public string Analyzer { get; set; }
 
-        public string SearchIndex { get; set; }
+    public string SearchIndex { get; set; }
 
-        public IEnumerable<string> SearchIndexes { get; set; }
+    public IEnumerable<string> SearchIndexes { get; set; }
 
-        public string SearchFields { get; set; }
+    public string SearchFields { get; set; }
 
-        public string DefaultQuery { get; set; }
+    public string DefaultQuery { get; set; }
 
-        public string SearchType { get; set; }
+    public string SearchType { get; set; }
 
-        [BindNever]
-        public IEnumerable<SelectListItem> SearchTypes { get; set; }
-    }
+    [BindNever]
+    public IEnumerable<SelectListItem> SearchTypes { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/IndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/IndexViewModel.cs
index c639a91e979..a7248b89a2f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/IndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/IndexViewModel.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace OrchardCore.Search.Elasticsearch.ViewModels
+namespace OrchardCore.Search.Elasticsearch.ViewModels;
+
+public class IndexViewModel
 {
-    public class IndexViewModel
-    {
-        public string Name { get; set; }
-        public string AnalyzerName { get; set; }
-        public DateTime LastUpdateUtc { get; set; }
-    }
+    public string Name { get; set; }
+    public string AnalyzerName { get; set; }
+    public DateTime LastUpdateUtc { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/MappingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/MappingsViewModel.cs
index 721771ae1e8..0d350b911f0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/MappingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/MappingsViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Search.Elasticsearch.ViewModels
+namespace OrchardCore.Search.Elasticsearch.ViewModels;
+
+public class MappingsViewModel
 {
-    public class MappingsViewModel
-    {
-        public string IndexName { get; set; }
-        public string Mappings { get; set; }
-    }
+    public string IndexName { get; set; }
+    public string Mappings { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/QueryIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/QueryIndexViewModel.cs
index 4ad74637422..663e9b9f783 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/QueryIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/ViewModels/QueryIndexViewModel.cs
@@ -2,17 +2,16 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Search.Elasticsearch.ViewModels
+namespace OrchardCore.Search.Elasticsearch.ViewModels;
+
+public class QueryIndexViewModel
 {
-    public class QueryIndexViewModel
-    {
-        public string Query { get; set; }
-        public string IndexName { get; set; }
+    public string Query { get; set; }
+    public string IndexName { get; set; }
 
-        [BindNever]
-        public TimeSpan Duration { get; set; }
+    [BindNever]
+    public TimeSpan Duration { get; set; }
 
-        [BindNever]
-        public IEnumerable<Dictionary<string, object>> Documents { get; set; } = [];
-    }
+    [BindNever]
+    public IEnumerable<Dictionary<string, object>> Documents { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Controllers/AdminController.cs
index 03fdec5f624..9237cfc2051 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Controllers/AdminController.cs
@@ -31,485 +31,484 @@
 using OrchardCore.Search.Lucene.ViewModels;
 using YesSql;
 
-namespace OrchardCore.Search.Lucene.Controllers
+namespace OrchardCore.Search.Lucene.Controllers;
+
+[Admin("Lucene/{action}/{id?}", "Lucene.{action}")]
+public class AdminController : Controller
 {
-    [Admin("Lucene/{action}/{id?}", "Lucene.{action}")]
-    public class AdminController : Controller
+    private const string _optionsSearch = "Options.Search";
+
+    private readonly ISession _session;
+    private readonly LuceneIndexManager _luceneIndexManager;
+    private readonly LuceneIndexingService _luceneIndexingService;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly INotifier _notifier;
+    private readonly LuceneAnalyzerManager _luceneAnalyzerManager;
+    private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
+    private readonly ILuceneQueryService _queryService;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly PagerOptions _pagerOptions;
+    private readonly JavaScriptEncoder _javaScriptEncoder;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly ILogger _logger;
+    private readonly IOptions<TemplateOptions> _templateOptions;
+    private readonly ILocalizationService _localizationService;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public AdminController(
+        ISession session,
+        IContentDefinitionManager contentDefinitionManager,
+        LuceneIndexManager luceneIndexManager,
+        LuceneIndexingService luceneIndexingService,
+        IAuthorizationService authorizationService,
+        LuceneAnalyzerManager luceneAnalyzerManager,
+        LuceneIndexSettingsService luceneIndexSettingsService,
+        ILuceneQueryService queryService,
+        ILiquidTemplateManager liquidTemplateManager,
+        INotifier notifier,
+        IOptions<PagerOptions> pagerOptions,
+        JavaScriptEncoder javaScriptEncoder,
+        IShapeFactory shapeFactory,
+        IStringLocalizer<AdminController> stringLocalizer,
+        IHtmlLocalizer<AdminController> htmlLocalizer,
+        ILogger<AdminController> logger,
+        IOptions<TemplateOptions> templateOptions,
+        ILocalizationService localizationService)
+    {
+        _session = session;
+        _luceneIndexManager = luceneIndexManager;
+        _luceneIndexingService = luceneIndexingService;
+        _authorizationService = authorizationService;
+        _luceneAnalyzerManager = luceneAnalyzerManager;
+        _luceneIndexSettingsService = luceneIndexSettingsService;
+        _queryService = queryService;
+        _liquidTemplateManager = liquidTemplateManager;
+        _contentDefinitionManager = contentDefinitionManager;
+        _notifier = notifier;
+        _pagerOptions = pagerOptions.Value;
+        _javaScriptEncoder = javaScriptEncoder;
+        _shapeFactory = shapeFactory;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+        _logger = logger;
+        _templateOptions = templateOptions;
+        _localizationService = localizationService;
+    }
+
+    public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
     {
-        private const string _optionsSearch = "Options.Search";
-
-        private readonly ISession _session;
-        private readonly LuceneIndexManager _luceneIndexManager;
-        private readonly LuceneIndexingService _luceneIndexingService;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly INotifier _notifier;
-        private readonly LuceneAnalyzerManager _luceneAnalyzerManager;
-        private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
-        private readonly ILuceneQueryService _queryService;
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly PagerOptions _pagerOptions;
-        private readonly JavaScriptEncoder _javaScriptEncoder;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly ILogger _logger;
-        private readonly IOptions<TemplateOptions> _templateOptions;
-        private readonly ILocalizationService _localizationService;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public AdminController(
-            ISession session,
-            IContentDefinitionManager contentDefinitionManager,
-            LuceneIndexManager luceneIndexManager,
-            LuceneIndexingService luceneIndexingService,
-            IAuthorizationService authorizationService,
-            LuceneAnalyzerManager luceneAnalyzerManager,
-            LuceneIndexSettingsService luceneIndexSettingsService,
-            ILuceneQueryService queryService,
-            ILiquidTemplateManager liquidTemplateManager,
-            INotifier notifier,
-            IOptions<PagerOptions> pagerOptions,
-            JavaScriptEncoder javaScriptEncoder,
-            IShapeFactory shapeFactory,
-            IStringLocalizer<AdminController> stringLocalizer,
-            IHtmlLocalizer<AdminController> htmlLocalizer,
-            ILogger<AdminController> logger,
-            IOptions<TemplateOptions> templateOptions,
-            ILocalizationService localizationService)
-        {
-            _session = session;
-            _luceneIndexManager = luceneIndexManager;
-            _luceneIndexingService = luceneIndexingService;
-            _authorizationService = authorizationService;
-            _luceneAnalyzerManager = luceneAnalyzerManager;
-            _luceneIndexSettingsService = luceneIndexSettingsService;
-            _queryService = queryService;
-            _liquidTemplateManager = liquidTemplateManager;
-            _contentDefinitionManager = contentDefinitionManager;
-            _notifier = notifier;
-            _pagerOptions = pagerOptions.Value;
-            _javaScriptEncoder = javaScriptEncoder;
-            _shapeFactory = shapeFactory;
-            S = stringLocalizer;
-            H = htmlLocalizer;
-            _logger = logger;
-            _templateOptions = templateOptions;
-            _localizationService = localizationService;
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLuceneIndexes))
+        {
+            return Forbid();
         }
 
-        public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
+        var indexes = (await _luceneIndexSettingsService.GetSettingsAsync()).Select(i => new IndexViewModel { Name = i.IndexName });
+
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+        var count = indexes.Count();
+        var results = indexes;
+
+        if (!string.IsNullOrWhiteSpace(options.Search))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLuceneIndexes))
-            {
-                return Forbid();
-            }
+            results = results.Where(q => q.Name.Contains(options.Search, StringComparison.OrdinalIgnoreCase));
+        }
 
-            var indexes = (await _luceneIndexSettingsService.GetSettingsAsync()).Select(i => new IndexViewModel { Name = i.IndexName });
+        results = results
+            .Skip(pager.GetStartIndex())
+            .Take(pager.PageSize)
+            .ToList();
 
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
-            var count = indexes.Count();
-            var results = indexes;
+        // Maintain previous route data when generating page links.
+        var routeData = new RouteData();
 
-            if (!string.IsNullOrWhiteSpace(options.Search))
-            {
-                results = results.Where(q => q.Name.Contains(options.Search, StringComparison.OrdinalIgnoreCase));
-            }
+        if (!string.IsNullOrEmpty(options.Search))
+        {
+            routeData.Values.TryAdd(_optionsSearch, options.Search);
+        }
 
-            results = results
-                .Skip(pager.GetStartIndex())
-                .Take(pager.PageSize)
-                .ToList();
+        var model = new AdminIndexViewModel
+        {
+            Indexes = results,
+            Options = options,
+            Pager = await _shapeFactory.PagerAsync(pager, count, routeData)
+        };
+
+        model.Options.ContentsBulkAction =
+        [
+            new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
+            new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
+            new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+        ];
+
+        return View(model);
+    }
 
-            // Maintain previous route data when generating page links.
-            var routeData = new RouteData();
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.Filter")]
+    public ActionResult IndexFilterPOST(AdminIndexViewModel model)
+        => RedirectToAction(nameof(Index), new RouteValueDictionary
+        {
+            { _optionsSearch, model.Options.Search }
+        });
 
-            if (!string.IsNullOrEmpty(options.Search))
+    public async Task<ActionResult> Edit(string indexName = null)
+    {
+        var IsCreate = string.IsNullOrWhiteSpace(indexName);
+        var settings = new LuceneIndexSettings();
+
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLuceneIndexes))
+        {
+            return Forbid();
+        }
+
+        if (!IsCreate)
+        {
+            settings = await _luceneIndexSettingsService.GetSettingsAsync(indexName);
+
+            if (settings == null)
             {
-                routeData.Values.TryAdd(_optionsSearch, options.Search);
+                return NotFound();
             }
+        }
 
-            var model = new AdminIndexViewModel
-            {
-                Indexes = results,
-                Options = options,
-                Pager = await _shapeFactory.PagerAsync(pager, count, routeData)
-            };
-
-            model.Options.ContentsBulkAction =
-            [
-                new SelectListItem(S["Reset"], nameof(ContentsBulkAction.Reset)),
-                new SelectListItem(S["Rebuild"], nameof(ContentsBulkAction.Rebuild)),
-                new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
-            ];
+        var model = new LuceneIndexSettingsViewModel
+        {
+            IsCreate = IsCreate,
+            IndexName = IsCreate ? string.Empty : settings.IndexName,
+            AnalyzerName = IsCreate ? "standardanalyzer" : settings.AnalyzerName,
+            IndexLatest = settings.IndexLatest,
+            Culture = settings.Culture,
+            Cultures = ILocalizationService.GetAllCulturesAndAliases()
+                .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
+            Analyzers = _luceneAnalyzerManager.GetAnalyzers()
+                .Select(x => new SelectListItem { Text = x.Name, Value = x.Name }),
+            IndexedContentTypes = IsCreate ? (await _contentDefinitionManager.ListTypeDefinitionsAsync())
+                .Select(x => x.Name).ToArray() : settings.IndexedContentTypes,
+            StoreSourceData = !IsCreate && settings.StoreSourceData
+        };
+
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost, ActionName(nameof(Edit))]
+    public async Task<ActionResult> EditPost(LuceneIndexSettingsViewModel model, string[] indexedContentTypes)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLuceneIndexes))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.Filter")]
-        public ActionResult IndexFilterPOST(AdminIndexViewModel model)
-            => RedirectToAction(nameof(Index), new RouteValueDictionary
-            {
-                { _optionsSearch, model.Options.Search }
-            });
+        ValidateModel(model);
 
-        public async Task<ActionResult> Edit(string indexName = null)
+        if (model.IsCreate)
         {
-            var IsCreate = string.IsNullOrWhiteSpace(indexName);
-            var settings = new LuceneIndexSettings();
-
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLuceneIndexes))
+            if (_luceneIndexManager.Exists(model.IndexName))
             {
-                return Forbid();
+                ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
             }
-
-            if (!IsCreate)
+        }
+        else
+        {
+            if (!_luceneIndexManager.Exists(model.IndexName))
             {
-                settings = await _luceneIndexSettingsService.GetSettingsAsync(indexName);
-
-                if (settings == null)
-                {
-                    return NotFound();
-                }
+                ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
             }
+        }
 
-            var model = new LuceneIndexSettingsViewModel
-            {
-                IsCreate = IsCreate,
-                IndexName = IsCreate ? string.Empty : settings.IndexName,
-                AnalyzerName = IsCreate ? "standardanalyzer" : settings.AnalyzerName,
-                IndexLatest = settings.IndexLatest,
-                Culture = settings.Culture,
-                Cultures = ILocalizationService.GetAllCulturesAndAliases()
-                    .Select(x => new SelectListItem { Text = x.Name + " (" + x.DisplayName + ")", Value = x.Name }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" }),
-                Analyzers = _luceneAnalyzerManager.GetAnalyzers()
-                    .Select(x => new SelectListItem { Text = x.Name, Value = x.Name }),
-                IndexedContentTypes = IsCreate ? (await _contentDefinitionManager.ListTypeDefinitionsAsync())
-                    .Select(x => x.Name).ToArray() : settings.IndexedContentTypes,
-                StoreSourceData = !IsCreate && settings.StoreSourceData
-            };
+        if (!ModelState.IsValid)
+        {
+            var supportedCultures = await _localizationService.GetSupportedCulturesAsync();
 
+            model.Cultures = supportedCultures
+                .Select(c => new SelectListItem
+                {
+                    Text = $"{c} ({CultureInfo.GetCultureInfo(c).DisplayName})",
+                    Value = c
+                }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
+            model.Analyzers = _luceneAnalyzerManager.GetAnalyzers()
+                .Select(x => new SelectListItem { Text = x.Name, Value = x.Name });
             return View(model);
         }
 
-        [HttpPost, ActionName(nameof(Edit))]
-        public async Task<ActionResult> EditPost(LuceneIndexSettingsViewModel model, string[] indexedContentTypes)
+        if (model.IsCreate)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLuceneIndexes))
+            try
             {
-                return Forbid();
-            }
+                var settings = new LuceneIndexSettings { IndexName = model.IndexName, AnalyzerName = model.AnalyzerName, IndexLatest = model.IndexLatest, IndexedContentTypes = indexedContentTypes, Culture = model.Culture ?? "", StoreSourceData = model.StoreSourceData };
 
-            ValidateModel(model);
-
-            if (model.IsCreate)
-            {
-                if (_luceneIndexManager.Exists(model.IndexName))
-                {
-                    ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} already exists.", model.IndexName]);
-                }
+                // We call Rebuild in order to reset the index state cursor too in case the same index
+                // name was also used previously.
+                await _luceneIndexingService.CreateIndexAsync(settings);
             }
-            else
+            catch (Exception e)
             {
-                if (!_luceneIndexManager.Exists(model.IndexName))
-                {
-                    ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["An index named {0} doesn't exist.", model.IndexName]);
-                }
+                await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
+                _logger.LogError(e, "An error occurred while creating an index.");
+                return View(model);
             }
 
-            if (!ModelState.IsValid)
+            await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+        }
+        else
+        {
+            try
             {
-                var supportedCultures = await _localizationService.GetSupportedCulturesAsync();
+                var settings = new LuceneIndexSettings { IndexName = model.IndexName, AnalyzerName = model.AnalyzerName, IndexLatest = model.IndexLatest, IndexedContentTypes = indexedContentTypes, Culture = model.Culture ?? "", StoreSourceData = model.StoreSourceData };
 
-                model.Cultures = supportedCultures
-                    .Select(c => new SelectListItem
-                    {
-                        Text = $"{c} ({CultureInfo.GetCultureInfo(c).DisplayName})",
-                        Value = c
-                    }).Prepend(new SelectListItem { Text = S["Any culture"], Value = "any" });
-                model.Analyzers = _luceneAnalyzerManager.GetAnalyzers()
-                    .Select(x => new SelectListItem { Text = x.Name, Value = x.Name });
+                await _luceneIndexingService.UpdateIndexAsync(settings);
+            }
+            catch (Exception e)
+            {
+                await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
+                _logger.LogError(e, "An error occurred while editing an index.");
                 return View(model);
             }
 
-            if (model.IsCreate)
-            {
-                try
-                {
-                    var settings = new LuceneIndexSettings { IndexName = model.IndexName, AnalyzerName = model.AnalyzerName, IndexLatest = model.IndexLatest, IndexedContentTypes = indexedContentTypes, Culture = model.Culture ?? "", StoreSourceData = model.StoreSourceData };
+            await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
+        }
 
-                    // We call Rebuild in order to reset the index state cursor too in case the same index
-                    // name was also used previously.
-                    await _luceneIndexingService.CreateIndexAsync(settings);
-                }
-                catch (Exception e)
-                {
-                    await _notifier.ErrorAsync(H["An error occurred while creating the index."]);
-                    _logger.LogError(e, "An error occurred while creating an index.");
-                    return View(model);
-                }
+        return RedirectToAction(nameof(Index));
+    }
+
+    [HttpPost]
+    public async Task<ActionResult> Reset(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLuceneIndexes))
+        {
+            return Forbid();
+        }
 
-                await _notifier.SuccessAsync(H["Index <em>{0}</em> created successfully.", model.IndexName]);
+        var luceneIndexSettings = await _luceneIndexSettingsService.GetSettingsAsync(id);
+
+        if (luceneIndexSettings != null)
+        {
+            if (!_luceneIndexManager.Exists(id))
+            {
+                await _luceneIndexingService.CreateIndexAsync(luceneIndexSettings);
+                await _luceneIndexingService.ProcessContentItemsAsync(id);
             }
             else
             {
-                try
-                {
-                    var settings = new LuceneIndexSettings { IndexName = model.IndexName, AnalyzerName = model.AnalyzerName, IndexLatest = model.IndexLatest, IndexedContentTypes = indexedContentTypes, Culture = model.Culture ?? "", StoreSourceData = model.StoreSourceData };
-
-                    await _luceneIndexingService.UpdateIndexAsync(settings);
-                }
-                catch (Exception e)
-                {
-                    await _notifier.ErrorAsync(H["An error occurred while editing the index."]);
-                    _logger.LogError(e, "An error occurred while editing an index.");
-                    return View(model);
-                }
-
-                await _notifier.SuccessAsync(H["Index <em>{0}</em> modified successfully, <strong>please consider doing a rebuild on the index.</strong>", model.IndexName]);
+                _luceneIndexingService.ResetIndexAsync(id);
+                await _luceneIndexingService.ProcessContentItemsAsync(id);
             }
 
-            return RedirectToAction(nameof(Index));
+            await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
         }
 
-        [HttpPost]
-        public async Task<ActionResult> Reset(string id)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLuceneIndexes))
-            {
-                return Forbid();
-            }
+        return RedirectToAction(nameof(Index));
+    }
 
-            var luceneIndexSettings = await _luceneIndexSettingsService.GetSettingsAsync(id);
+    [HttpPost]
+    public async Task<ActionResult> Rebuild(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLuceneIndexes))
+        {
+            return Forbid();
+        }
 
-            if (luceneIndexSettings != null)
-            {
-                if (!_luceneIndexManager.Exists(id))
-                {
-                    await _luceneIndexingService.CreateIndexAsync(luceneIndexSettings);
-                    await _luceneIndexingService.ProcessContentItemsAsync(id);
-                }
-                else
-                {
-                    _luceneIndexingService.ResetIndexAsync(id);
-                    await _luceneIndexingService.ProcessContentItemsAsync(id);
-                }
+        var luceneIndexSettings = await _luceneIndexSettingsService.GetSettingsAsync(id);
 
-                await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", id]);
-            }
+        if (luceneIndexSettings != null)
+        {
+            await _luceneIndexingService.RebuildIndexAsync(id);
+            await _luceneIndexingService.ProcessContentItemsAsync(id);
 
-            return RedirectToAction(nameof(Index));
+            await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
         }
-
-        [HttpPost]
-        public async Task<ActionResult> Rebuild(string id)
+        else
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLuceneIndexes))
-            {
-                return Forbid();
-            }
+            return NotFound();
+        }
 
-            var luceneIndexSettings = await _luceneIndexSettingsService.GetSettingsAsync(id);
+        return RedirectToAction(nameof(Index));
+    }
 
-            if (luceneIndexSettings != null)
-            {
-                await _luceneIndexingService.RebuildIndexAsync(id);
-                await _luceneIndexingService.ProcessContentItemsAsync(id);
+    [HttpPost]
+    public async Task<ActionResult> Delete(LuceneIndexSettingsViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLuceneIndexes))
+        {
+            return Forbid();
+        }
 
-                await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", id]);
-            }
-            else
-            {
-                return NotFound();
-            }
+        var luceneIndexSettings = await _luceneIndexSettingsService.GetSettingsAsync(model.IndexName);
 
-            return RedirectToAction(nameof(Index));
+        if (luceneIndexSettings == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        public async Task<ActionResult> Delete(LuceneIndexSettingsViewModel model)
+        try
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLuceneIndexes))
-            {
-                return Forbid();
-            }
+            await _luceneIndexingService.DeleteIndexAsync(model.IndexName);
 
-            var luceneIndexSettings = await _luceneIndexSettingsService.GetSettingsAsync(model.IndexName);
+            await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
+        }
+        catch (Exception e)
+        {
+            await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
+            _logger.LogError(e, "An error occurred while deleting the index '{IndexName}'.", model.IndexName);
+        }
 
-            if (luceneIndexSettings == null)
-            {
-                return NotFound();
-            }
+        return RedirectToAction(nameof(Index));
+    }
 
-            try
-            {
-                await _luceneIndexingService.DeleteIndexAsync(model.IndexName);
+    public Task<IActionResult> Query(string indexName, string query)
+    {
+        query = string.IsNullOrWhiteSpace(query) ? "" : System.Text.Encoding.UTF8.GetString(Convert.FromBase64String(query));
+        return Query(new AdminQueryViewModel { IndexName = indexName, DecodedQuery = query });
+    }
 
-                await _notifier.SuccessAsync(H["Index <em>{0}</em> deleted successfully.", model.IndexName]);
-            }
-            catch (Exception e)
-            {
-                await _notifier.ErrorAsync(H["An error occurred while deleting the index."]);
-                _logger.LogError(e, "An error occurred while deleting the index '{IndexName}'.", model.IndexName);
-            }
+    [HttpPost]
+    public async Task<IActionResult> Query(AdminQueryViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLuceneIndexes))
+        {
+            return Forbid();
+        }
+
+        model.Indices = (await _luceneIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
 
+        // Can't query if there are no indices
+        if (model.Indices.Length == 0)
+        {
             return RedirectToAction(nameof(Index));
         }
 
-        public Task<IActionResult> Query(string indexName, string query)
+        if (string.IsNullOrEmpty(model.IndexName))
         {
-            query = string.IsNullOrWhiteSpace(query) ? "" : System.Text.Encoding.UTF8.GetString(Convert.FromBase64String(query));
-            return Query(new AdminQueryViewModel { IndexName = indexName, DecodedQuery = query });
+            model.IndexName = model.Indices[0];
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Query(AdminQueryViewModel model)
+        if (!_luceneIndexManager.Exists(model.IndexName))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLuceneIndexes))
-            {
-                return Forbid();
-            }
-
-            model.Indices = (await _luceneIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
+            return NotFound();
+        }
 
-            // Can't query if there are no indices
-            if (model.Indices.Length == 0)
-            {
-                return RedirectToAction(nameof(Index));
-            }
+        if (string.IsNullOrWhiteSpace(model.DecodedQuery))
+        {
+            return View(model);
+        }
 
-            if (string.IsNullOrEmpty(model.IndexName))
-            {
-                model.IndexName = model.Indices[0];
-            }
+        if (string.IsNullOrEmpty(model.Parameters))
+        {
+            model.Parameters = "{ }";
+        }
 
-            if (!_luceneIndexManager.Exists(model.IndexName))
-            {
-                return NotFound();
-            }
+        var stopwatch = new Stopwatch();
+        stopwatch.Start();
 
-            if (string.IsNullOrWhiteSpace(model.DecodedQuery))
-            {
-                return View(model);
-            }
+        await _luceneIndexManager.SearchAsync(model.IndexName, async searcher =>
+        {
+            var analyzer = _luceneAnalyzerManager.CreateAnalyzer(await _luceneIndexSettingsService.GetIndexAnalyzerAsync(model.IndexName));
+            var context = new LuceneQueryContext(searcher, LuceneSettings.DefaultVersion, analyzer);
 
-            if (string.IsNullOrEmpty(model.Parameters))
-            {
-                model.Parameters = "{ }";
-            }
+            var parameters = JConvert.DeserializeObject<Dictionary<string, object>>(model.Parameters);
 
-            var stopwatch = new Stopwatch();
-            stopwatch.Start();
+            var tokenizedContent = await _liquidTemplateManager.RenderStringAsync(model.DecodedQuery, _javaScriptEncoder, parameters.Select(x => new KeyValuePair<string, FluidValue>(x.Key, FluidValue.Create(x.Value, _templateOptions.Value))));
 
-            await _luceneIndexManager.SearchAsync(model.IndexName, async searcher =>
+            try
             {
-                var analyzer = _luceneAnalyzerManager.CreateAnalyzer(await _luceneIndexSettingsService.GetIndexAnalyzerAsync(model.IndexName));
-                var context = new LuceneQueryContext(searcher, LuceneSettings.DefaultVersion, analyzer);
-
-                var parameters = JConvert.DeserializeObject<Dictionary<string, object>>(model.Parameters);
-
-                var tokenizedContent = await _liquidTemplateManager.RenderStringAsync(model.DecodedQuery, _javaScriptEncoder, parameters.Select(x => new KeyValuePair<string, FluidValue>(x.Key, FluidValue.Create(x.Value, _templateOptions.Value))));
+                var parameterizedQuery = JsonNode.Parse(tokenizedContent).AsObject();
+                var luceneTopDocs = await _queryService.SearchAsync(context, parameterizedQuery);
 
-                try
+                if (luceneTopDocs != null)
                 {
-                    var parameterizedQuery = JsonNode.Parse(tokenizedContent).AsObject();
-                    var luceneTopDocs = await _queryService.SearchAsync(context, parameterizedQuery);
-
-                    if (luceneTopDocs != null)
-                    {
-                        model.Documents = luceneTopDocs.TopDocs.ScoreDocs.Select(hit => searcher.Doc(hit.Doc)).ToList();
-                        model.Count = luceneTopDocs.Count;
-                    }
-                }
-                catch (Exception e)
-                {
-                    _logger.LogError(e, "Error while executing query");
-                    ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
+                    model.Documents = luceneTopDocs.TopDocs.ScoreDocs.Select(hit => searcher.Doc(hit.Doc)).ToList();
+                    model.Count = luceneTopDocs.Count;
                 }
+            }
+            catch (Exception e)
+            {
+                _logger.LogError(e, "Error while executing query");
+                ModelState.AddModelError(nameof(model.DecodedQuery), S["Invalid query : {0}", e.Message]);
+            }
 
-                stopwatch.Stop();
-                model.Elapsed = stopwatch.Elapsed;
-            });
+            stopwatch.Stop();
+            model.Elapsed = stopwatch.Elapsed;
+        });
 
-            return View(model);
-        }
+        return View(model);
+    }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<string> itemIds)
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<string> itemIds)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLuceneIndexes))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageLuceneIndexes))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            if (itemIds?.Count() > 0)
-            {
-                var luceneIndexSettings = await _luceneIndexSettingsService.GetSettingsAsync();
-                var checkedContentItems = luceneIndexSettings.Where(x => itemIds.Contains(x.IndexName));
-                switch (options.BulkAction)
-                {
-                    case ContentsBulkAction.None:
-                        break;
-                    case ContentsBulkAction.Remove:
-                        foreach (var item in checkedContentItems)
+        if (itemIds?.Count() > 0)
+        {
+            var luceneIndexSettings = await _luceneIndexSettingsService.GetSettingsAsync();
+            var checkedContentItems = luceneIndexSettings.Where(x => itemIds.Contains(x.IndexName));
+            switch (options.BulkAction)
+            {
+                case ContentsBulkAction.None:
+                    break;
+                case ContentsBulkAction.Remove:
+                    foreach (var item in checkedContentItems)
+                    {
+                        await _luceneIndexingService.DeleteIndexAsync(item.IndexName);
+                    }
+                    await _notifier.SuccessAsync(H["Indices successfully removed."]);
+                    break;
+                case ContentsBulkAction.Reset:
+                    foreach (var item in checkedContentItems)
+                    {
+                        if (!_luceneIndexManager.Exists(item.IndexName))
                         {
-                            await _luceneIndexingService.DeleteIndexAsync(item.IndexName);
+                            return NotFound();
                         }
-                        await _notifier.SuccessAsync(H["Indices successfully removed."]);
-                        break;
-                    case ContentsBulkAction.Reset:
-                        foreach (var item in checkedContentItems)
-                        {
-                            if (!_luceneIndexManager.Exists(item.IndexName))
-                            {
-                                return NotFound();
-                            }
 
-                            _luceneIndexingService.ResetIndexAsync(item.IndexName);
-                            await _luceneIndexingService.ProcessContentItemsAsync(item.IndexName);
+                        _luceneIndexingService.ResetIndexAsync(item.IndexName);
+                        await _luceneIndexingService.ProcessContentItemsAsync(item.IndexName);
 
-                            await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
-                        }
-                        break;
-                    case ContentsBulkAction.Rebuild:
-                        foreach (var item in checkedContentItems)
+                        await _notifier.SuccessAsync(H["Index <em>{0}</em> reset successfully.", item.IndexName]);
+                    }
+                    break;
+                case ContentsBulkAction.Rebuild:
+                    foreach (var item in checkedContentItems)
+                    {
+                        if (!_luceneIndexManager.Exists(item.IndexName))
                         {
-                            if (!_luceneIndexManager.Exists(item.IndexName))
-                            {
-                                return NotFound();
-                            }
+                            return NotFound();
+                        }
 
-                            await _luceneIndexingService.RebuildIndexAsync(item.IndexName);
-                            await _luceneIndexingService.ProcessContentItemsAsync(item.IndexName);
+                        await _luceneIndexingService.RebuildIndexAsync(item.IndexName);
+                        await _luceneIndexingService.ProcessContentItemsAsync(item.IndexName);
 
-                            await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
-                        }
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException(options.BulkAction.ToString(), "Invalid bulk action.");
-                }
+                        await _notifier.SuccessAsync(H["Index <em>{0}</em> rebuilt successfully.", item.IndexName]);
+                    }
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(options.BulkAction.ToString(), "Invalid bulk action.");
             }
-
-            return RedirectToAction(nameof(Index));
         }
 
-        private void ValidateModel(LuceneIndexSettingsViewModel model)
+        return RedirectToAction(nameof(Index));
+    }
+
+    private void ValidateModel(LuceneIndexSettingsViewModel model)
+    {
+        if (model.IndexedContentTypes == null || model.IndexedContentTypes.Length < 1)
         {
-            if (model.IndexedContentTypes == null || model.IndexedContentTypes.Length < 1)
-            {
-                ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
-            }
+            ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexedContentTypes), S["At least one content type selection is required."]);
+        }
 
-            if (string.IsNullOrWhiteSpace(model.IndexName))
-            {
-                ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
-            }
-            else if (model.IndexName.ToSafeName() != model.IndexName)
-            {
-                ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
-            }
+        if (string.IsNullOrWhiteSpace(model.IndexName))
+        {
+            ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name is required."]);
+        }
+        else if (model.IndexName.ToSafeName() != model.IndexName)
+        {
+            ModelState.AddModelError(nameof(LuceneIndexSettingsViewModel.IndexName), S["The index name contains forbidden characters."]);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Controllers/LuceneApiController.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Controllers/LuceneApiController.cs
index dcca3f52166..183aa31e73e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Controllers/LuceneApiController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Controllers/LuceneApiController.cs
@@ -7,98 +7,97 @@
 using OrchardCore.Queries;
 using OrchardCore.Search.Lucene.Model;
 
-namespace OrchardCore.Search.Lucene.Controllers
+namespace OrchardCore.Search.Lucene.Controllers;
+
+[Route("api/lucene")]
+[ApiController]
+[Authorize(AuthenticationSchemes = "Api")]
+[IgnoreAntiforgeryToken]
+[AllowAnonymous]
+public sealed class LuceneApiController : ControllerBase
 {
-    [Route("api/lucene")]
-    [ApiController]
-    [Authorize(AuthenticationSchemes = "Api")]
-    [IgnoreAntiforgeryToken]
-    [AllowAnonymous]
-    public sealed class LuceneApiController : ControllerBase
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IQueryManager _queryManager;
+
+    public LuceneApiController(
+        IAuthorizationService authorizationService,
+        IQueryManager queryManager)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IQueryManager _queryManager;
+        _authorizationService = authorizationService;
+        _queryManager = queryManager;
+    }
 
-        public LuceneApiController(
-            IAuthorizationService authorizationService,
-            IQueryManager queryManager)
+    [HttpGet]
+    [Route("content")]
+    public async Task<IActionResult> Content([FromQuery] LuceneQueryModel queryModel)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.QueryLuceneApi))
         {
-            _authorizationService = authorizationService;
-            _queryManager = queryManager;
+            return this.ChallengeOrForbid("Api");
         }
 
-        [HttpGet]
-        [Route("content")]
-        public async Task<IActionResult> Content([FromQuery] LuceneQueryModel queryModel)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.QueryLuceneApi))
-            {
-                return this.ChallengeOrForbid("Api");
-            }
+        var result = await LuceneQueryApiAsync(queryModel, returnContentItems: true);
 
-            var result = await LuceneQueryApiAsync(queryModel, returnContentItems: true);
+        return new ObjectResult(result);
+    }
 
-            return new ObjectResult(result);
+    [HttpPost]
+    [Route("content")]
+    public async Task<IActionResult> ContentPost(LuceneQueryModel queryModel)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.QueryLuceneApi))
+        {
+            return this.ChallengeOrForbid();
         }
 
-        [HttpPost]
-        [Route("content")]
-        public async Task<IActionResult> ContentPost(LuceneQueryModel queryModel)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.QueryLuceneApi))
-            {
-                return this.ChallengeOrForbid();
-            }
+        var result = await LuceneQueryApiAsync(queryModel, returnContentItems: true);
 
-            var result = await LuceneQueryApiAsync(queryModel, returnContentItems: true);
+        return new ObjectResult(result);
+    }
 
-            return new ObjectResult(result);
+    [HttpGet]
+    [Route("documents")]
+    public async Task<IActionResult> Documents([FromQuery] LuceneQueryModel queryModel)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.QueryLuceneApi))
+        {
+            return this.ChallengeOrForbid();
         }
 
-        [HttpGet]
-        [Route("documents")]
-        public async Task<IActionResult> Documents([FromQuery] LuceneQueryModel queryModel)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.QueryLuceneApi))
-            {
-                return this.ChallengeOrForbid();
-            }
+        var result = await LuceneQueryApiAsync(queryModel);
 
-            var result = await LuceneQueryApiAsync(queryModel);
+        return new ObjectResult(result);
+    }
 
-            return new ObjectResult(result);
+    [HttpPost]
+    [Route("documents")]
+    public async Task<IActionResult> DocumentsPost(LuceneQueryModel queryModel)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.QueryLuceneApi))
+        {
+            return this.ChallengeOrForbid("Api");
         }
 
-        [HttpPost]
-        [Route("documents")]
-        public async Task<IActionResult> DocumentsPost(LuceneQueryModel queryModel)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.QueryLuceneApi))
-            {
-                return this.ChallengeOrForbid("Api");
-            }
+        var result = await LuceneQueryApiAsync(queryModel);
 
-            var result = await LuceneQueryApiAsync(queryModel);
+        return new ObjectResult(result);
+    }
 
-            return new ObjectResult(result);
-        }
+    private async Task<IQueryResults> LuceneQueryApiAsync(LuceneQueryModel queryModel, bool returnContentItems = false)
+    {
+        var luceneQuery = await _queryManager.NewAsync(LuceneQuerySource.SourceName);
+        luceneQuery.ReturnContentItems = returnContentItems;
 
-        private async Task<IQueryResults> LuceneQueryApiAsync(LuceneQueryModel queryModel, bool returnContentItems = false)
+        luceneQuery.Put(new LuceneQueryMetadata()
         {
-            var luceneQuery = await _queryManager.NewAsync(LuceneQuerySource.SourceName);
-            luceneQuery.ReturnContentItems = returnContentItems;
+            Index = queryModel.IndexName,
+            Template = queryModel.Query,
+        });
 
-            luceneQuery.Put(new LuceneQueryMetadata()
-            {
-                Index = queryModel.IndexName,
-                Template = queryModel.Query,
-            });
+        var queryParameters = queryModel.Parameters != null
+            ? JConvert.DeserializeObject<Dictionary<string, object>>(queryModel.Parameters)
+            : [];
 
-            var queryParameters = queryModel.Parameters != null
-                ? JConvert.DeserializeObject<Dictionary<string, object>>(queryModel.Parameters)
-                : [];
-
-            return await _queryManager.ExecuteQueryAsync(luceneQuery, queryParameters);
-        }
+        return await _queryManager.ExecuteQueryAsync(luceneQuery, queryParameters);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexDeploymentSource.cs
index a2c024f00c8..00802cfee38 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexDeploymentSource.cs
@@ -5,48 +5,47 @@
 using OrchardCore.Deployment;
 using OrchardCore.Search.Lucene.Model;
 
-namespace OrchardCore.Search.Lucene.Deployment
+namespace OrchardCore.Search.Lucene.Deployment;
+
+public class LuceneIndexDeploymentSource : IDeploymentSource
 {
-    public class LuceneIndexDeploymentSource : IDeploymentSource
+    private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
+
+    public LuceneIndexDeploymentSource(LuceneIndexSettingsService luceneIndexSettingsService)
     {
-        private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
+        _luceneIndexSettingsService = luceneIndexSettingsService;
+    }
 
-        public LuceneIndexDeploymentSource(LuceneIndexSettingsService luceneIndexSettingsService)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        if (step is not LuceneIndexDeploymentStep luceneIndexStep)
         {
-            _luceneIndexSettingsService = luceneIndexSettingsService;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
-        {
-            if (step is not LuceneIndexDeploymentStep luceneIndexStep)
-            {
-                return;
-            }
+        var indexSettings = await _luceneIndexSettingsService.GetSettingsAsync();
 
-            var indexSettings = await _luceneIndexSettingsService.GetSettingsAsync();
+        var data = new JsonArray();
+        var indicesToAdd = luceneIndexStep.IncludeAll ? indexSettings.Select(x => x.IndexName).ToArray() : luceneIndexStep.IndexNames;
 
-            var data = new JsonArray();
-            var indicesToAdd = luceneIndexStep.IncludeAll ? indexSettings.Select(x => x.IndexName).ToArray() : luceneIndexStep.IndexNames;
-
-            foreach (var index in indexSettings)
+        foreach (var index in indexSettings)
+        {
+            if (indicesToAdd.Contains(index.IndexName))
             {
-                if (indicesToAdd.Contains(index.IndexName))
+                var indexSettingsDict = new Dictionary<string, LuceneIndexSettings>
                 {
-                    var indexSettingsDict = new Dictionary<string, LuceneIndexSettings>
-                    {
-                        { index.IndexName, index },
-                    };
+                    { index.IndexName, index },
+                };
 
-                    data.Add(JObject.FromObject(indexSettingsDict));
-                }
+                data.Add(JObject.FromObject(indexSettingsDict));
             }
-
-            // Adding Lucene settings
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "lucene-index",
-                ["Indices"] = data,
-            });
         }
+
+        // Adding Lucene settings
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "lucene-index",
+            ["Indices"] = data,
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexDeploymentStep.cs
index 3ee686c9946..dae65615236 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexDeploymentStep.cs
@@ -1,19 +1,18 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Search.Lucene.Deployment
+namespace OrchardCore.Search.Lucene.Deployment;
+
+/// <summary>
+/// Adds layers to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class LuceneIndexDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds layers to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class LuceneIndexDeploymentStep : DeploymentStep
+    public LuceneIndexDeploymentStep()
     {
-        public LuceneIndexDeploymentStep()
-        {
-            Name = "LuceneIndex";
-        }
+        Name = "LuceneIndex";
+    }
 
-        public bool IncludeAll { get; set; } = true;
+    public bool IncludeAll { get; set; } = true;
 
-        public string[] IndexNames { get; set; }
-    }
+    public string[] IndexNames { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexDeploymentStepDriver.cs
index cf956e05eb4..7974aef2c0f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexDeploymentStepDriver.cs
@@ -5,52 +5,51 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Search.Lucene.ViewModels;
 
-namespace OrchardCore.Search.Lucene.Deployment
+namespace OrchardCore.Search.Lucene.Deployment;
+
+public sealed class LuceneIndexDeploymentStepDriver : DisplayDriver<DeploymentStep, LuceneIndexDeploymentStep>
 {
-    public sealed class LuceneIndexDeploymentStepDriver : DisplayDriver<DeploymentStep, LuceneIndexDeploymentStep>
+    private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
+
+    public LuceneIndexDeploymentStepDriver(LuceneIndexSettingsService luceneIndexSettingsService)
     {
-        private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
+        _luceneIndexSettingsService = luceneIndexSettingsService;
+    }
 
-        public LuceneIndexDeploymentStepDriver(LuceneIndexSettingsService luceneIndexSettingsService)
-        {
-            _luceneIndexSettingsService = luceneIndexSettingsService;
-        }
+    public override Task<IDisplayResult> DisplayAsync(LuceneIndexDeploymentStep step, BuildDisplayContext context)
+    {
+        return
+            CombineAsync(
+                View("LuceneIndexDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("LuceneIndexDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(LuceneIndexDeploymentStep step, BuildDisplayContext context)
+    public override IDisplayResult Edit(LuceneIndexDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<LuceneIndexDeploymentStepViewModel>("LuceneIndexDeploymentStep_Fields_Edit", async model =>
         {
-            return
-                CombineAsync(
-                    View("LuceneIndexDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("LuceneIndexDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+            model.IncludeAll = step.IncludeAll;
+            model.IndexNames = step.IndexNames;
+            model.AllIndexNames = (await _luceneIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
+        }).Location("Content");
+    }
 
-        public override IDisplayResult Edit(LuceneIndexDeploymentStep step, BuildEditorContext context)
-        {
-            return Initialize<LuceneIndexDeploymentStepViewModel>("LuceneIndexDeploymentStep_Fields_Edit", async model =>
-            {
-                model.IncludeAll = step.IncludeAll;
-                model.IndexNames = step.IndexNames;
-                model.AllIndexNames = (await _luceneIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
-            }).Location("Content");
-        }
+    public override async Task<IDisplayResult> UpdateAsync(LuceneIndexDeploymentStep step, UpdateEditorContext context)
+    {
+        step.IndexNames = [];
+
+        await context.Updater.TryUpdateModelAsync(step,
+                                          Prefix,
+                                          x => x.IndexNames,
+                                          x => x.IncludeAll);
 
-        public override async Task<IDisplayResult> UpdateAsync(LuceneIndexDeploymentStep step, UpdateEditorContext context)
+        // don't have the selected option if include all
+        if (step.IncludeAll)
         {
             step.IndexNames = [];
-
-            await context.Updater.TryUpdateModelAsync(step,
-                                              Prefix,
-                                              x => x.IndexNames,
-                                              x => x.IncludeAll);
-
-            // don't have the selected option if include all
-            if (step.IncludeAll)
-            {
-                step.IndexNames = [];
-            }
-
-            return Edit(step, context);
         }
+
+        return Edit(step, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexRebuildDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexRebuildDeploymentSource.cs
index c2952037285..bac3bf0ecc5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexRebuildDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexRebuildDeploymentSource.cs
@@ -2,29 +2,28 @@
 using System.Threading.Tasks;
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Search.Lucene.Deployment
+namespace OrchardCore.Search.Lucene.Deployment;
+
+public class LuceneIndexRebuildDeploymentSource : IDeploymentSource
 {
-    public class LuceneIndexRebuildDeploymentSource : IDeploymentSource
+    public Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
     {
-        public Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
-        {
-            var luceneIndexRebuildStep = step as LuceneIndexRebuildDeploymentStep;
+        var luceneIndexRebuildStep = step as LuceneIndexRebuildDeploymentStep;
 
-            if (luceneIndexRebuildStep == null)
-            {
-                return Task.CompletedTask;
-            }
+        if (luceneIndexRebuildStep == null)
+        {
+            return Task.CompletedTask;
+        }
 
-            var indicesToRebuild = luceneIndexRebuildStep.IncludeAll ? [] : luceneIndexRebuildStep.IndexNames;
+        var indicesToRebuild = luceneIndexRebuildStep.IncludeAll ? [] : luceneIndexRebuildStep.IndexNames;
 
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "lucene-index-rebuild",
-                ["includeAll"] = luceneIndexRebuildStep.IncludeAll,
-                ["Indices"] = JArray.FromObject(indicesToRebuild),
-            });
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "lucene-index-rebuild",
+            ["includeAll"] = luceneIndexRebuildStep.IncludeAll,
+            ["Indices"] = JArray.FromObject(indicesToRebuild),
+        });
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexRebuildDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexRebuildDeploymentStep.cs
index 1cb69648465..2366fb0fb9c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexRebuildDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexRebuildDeploymentStep.cs
@@ -1,19 +1,18 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Search.Lucene.Deployment
+namespace OrchardCore.Search.Lucene.Deployment;
+
+/// <summary>
+/// Adds rebuild Lucene index task to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class LuceneIndexRebuildDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds rebuild Lucene index task to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class LuceneIndexRebuildDeploymentStep : DeploymentStep
+    public LuceneIndexRebuildDeploymentStep()
     {
-        public LuceneIndexRebuildDeploymentStep()
-        {
-            Name = "LuceneIndexRebuild";
-        }
+        Name = "LuceneIndexRebuild";
+    }
 
-        public bool IncludeAll { get; set; } = true;
+    public bool IncludeAll { get; set; } = true;
 
-        public string[] IndexNames { get; set; }
-    }
+    public string[] IndexNames { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexRebuildDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexRebuildDeploymentStepDriver.cs
index c8ffeae3271..db1567f67d0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexRebuildDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexRebuildDeploymentStepDriver.cs
@@ -5,48 +5,47 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Search.Lucene.ViewModels;
 
-namespace OrchardCore.Search.Lucene.Deployment
+namespace OrchardCore.Search.Lucene.Deployment;
+
+public sealed class LuceneIndexRebuildDeploymentStepDriver : DisplayDriver<DeploymentStep, LuceneIndexRebuildDeploymentStep>
 {
-    public sealed class LuceneIndexRebuildDeploymentStepDriver : DisplayDriver<DeploymentStep, LuceneIndexRebuildDeploymentStep>
+    private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
+
+    public LuceneIndexRebuildDeploymentStepDriver(LuceneIndexSettingsService luceneIndexSettingsService)
     {
-        private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
+        _luceneIndexSettingsService = luceneIndexSettingsService;
+    }
 
-        public LuceneIndexRebuildDeploymentStepDriver(LuceneIndexSettingsService luceneIndexSettingsService)
-        {
-            _luceneIndexSettingsService = luceneIndexSettingsService;
-        }
+    public override Task<IDisplayResult> DisplayAsync(LuceneIndexRebuildDeploymentStep step, BuildDisplayContext context)
+    {
+        return
+            CombineAsync(
+                View("LuceneIndexRebuildDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("LuceneIndexRebuildDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(LuceneIndexRebuildDeploymentStep step, BuildDisplayContext context)
+    public override IDisplayResult Edit(LuceneIndexRebuildDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<LuceneIndexRebuildDeploymentStepViewModel>("LuceneIndexRebuildDeploymentStep_Fields_Edit", async model =>
         {
-            return
-                CombineAsync(
-                    View("LuceneIndexRebuildDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("LuceneIndexRebuildDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+            model.IncludeAll = step.IncludeAll;
+            model.IndexNames = step.IndexNames;
+            model.AllIndexNames = (await _luceneIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
+        }).Location("Content");
+    }
 
-        public override IDisplayResult Edit(LuceneIndexRebuildDeploymentStep step, BuildEditorContext context)
-        {
-            return Initialize<LuceneIndexRebuildDeploymentStepViewModel>("LuceneIndexRebuildDeploymentStep_Fields_Edit", async model =>
-            {
-                model.IncludeAll = step.IncludeAll;
-                model.IndexNames = step.IndexNames;
-                model.AllIndexNames = (await _luceneIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
-            }).Location("Content");
-        }
+    public override async Task<IDisplayResult> UpdateAsync(LuceneIndexRebuildDeploymentStep rebuildIndexStep, UpdateEditorContext context)
+    {
+        rebuildIndexStep.IndexNames = [];
+
+        await context.Updater.TryUpdateModelAsync(rebuildIndexStep, Prefix, step => step.IndexNames, step => step.IncludeAll);
 
-        public override async Task<IDisplayResult> UpdateAsync(LuceneIndexRebuildDeploymentStep rebuildIndexStep, UpdateEditorContext context)
+        if (rebuildIndexStep.IncludeAll)
         {
             rebuildIndexStep.IndexNames = [];
-
-            await context.Updater.TryUpdateModelAsync(rebuildIndexStep, Prefix, step => step.IndexNames, step => step.IncludeAll);
-
-            if (rebuildIndexStep.IncludeAll)
-            {
-                rebuildIndexStep.IndexNames = [];
-            }
-
-            return Edit(rebuildIndexStep, context);
         }
+
+        return Edit(rebuildIndexStep, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexResetDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexResetDeploymentSource.cs
index 91500be0020..8784c7c23c0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexResetDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexResetDeploymentSource.cs
@@ -2,29 +2,28 @@
 using System.Threading.Tasks;
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Search.Lucene.Deployment
+namespace OrchardCore.Search.Lucene.Deployment;
+
+public class LuceneIndexResetDeploymentSource : IDeploymentSource
 {
-    public class LuceneIndexResetDeploymentSource : IDeploymentSource
+    public Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
     {
-        public Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
-        {
-            var luceneIndexResetStep = step as LuceneIndexResetDeploymentStep;
+        var luceneIndexResetStep = step as LuceneIndexResetDeploymentStep;
 
-            if (luceneIndexResetStep == null)
-            {
-                return Task.CompletedTask;
-            }
+        if (luceneIndexResetStep == null)
+        {
+            return Task.CompletedTask;
+        }
 
-            var indicesToReset = luceneIndexResetStep.IncludeAll ? [] : luceneIndexResetStep.IndexNames;
+        var indicesToReset = luceneIndexResetStep.IncludeAll ? [] : luceneIndexResetStep.IndexNames;
 
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "lucene-index-reset",
-                ["includeAll"] = luceneIndexResetStep.IncludeAll,
-                ["Indices"] = JArray.FromObject(indicesToReset),
-            });
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "lucene-index-reset",
+            ["includeAll"] = luceneIndexResetStep.IncludeAll,
+            ["Indices"] = JArray.FromObject(indicesToReset),
+        });
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexResetDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexResetDeploymentStep.cs
index 80a878f2163..9080f34336f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexResetDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexResetDeploymentStep.cs
@@ -1,19 +1,18 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Search.Lucene.Deployment
+namespace OrchardCore.Search.Lucene.Deployment;
+
+/// <summary>
+/// Adds reset Lucene index task to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class LuceneIndexResetDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds reset Lucene index task to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class LuceneIndexResetDeploymentStep : DeploymentStep
+    public LuceneIndexResetDeploymentStep()
     {
-        public LuceneIndexResetDeploymentStep()
-        {
-            Name = "LuceneIndexReset";
-        }
+        Name = "LuceneIndexReset";
+    }
 
-        public bool IncludeAll { get; set; } = true;
+    public bool IncludeAll { get; set; } = true;
 
-        public string[] IndexNames { get; set; }
-    }
+    public string[] IndexNames { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexResetDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexResetDeploymentStepDriver.cs
index de9ecb1b52d..f6c3bb88d15 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexResetDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneIndexResetDeploymentStepDriver.cs
@@ -5,48 +5,47 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Search.Lucene.ViewModels;
 
-namespace OrchardCore.Search.Lucene.Deployment
+namespace OrchardCore.Search.Lucene.Deployment;
+
+public sealed class LuceneIndexResetDeploymentStepDriver : DisplayDriver<DeploymentStep, LuceneIndexResetDeploymentStep>
 {
-    public sealed class LuceneIndexResetDeploymentStepDriver : DisplayDriver<DeploymentStep, LuceneIndexResetDeploymentStep>
+    private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
+
+    public LuceneIndexResetDeploymentStepDriver(LuceneIndexSettingsService luceneIndexSettingsService)
     {
-        private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
+        _luceneIndexSettingsService = luceneIndexSettingsService;
+    }
 
-        public LuceneIndexResetDeploymentStepDriver(LuceneIndexSettingsService luceneIndexSettingsService)
-        {
-            _luceneIndexSettingsService = luceneIndexSettingsService;
-        }
+    public override Task<IDisplayResult> DisplayAsync(LuceneIndexResetDeploymentStep step, BuildDisplayContext context)
+    {
+        return
+            CombineAsync(
+                View("LuceneIndexResetDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("LuceneIndexResetDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(LuceneIndexResetDeploymentStep step, BuildDisplayContext context)
+    public override IDisplayResult Edit(LuceneIndexResetDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<LuceneIndexResetDeploymentStepViewModel>("LuceneIndexResetDeploymentStep_Fields_Edit", async model =>
         {
-            return
-                CombineAsync(
-                    View("LuceneIndexResetDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("LuceneIndexResetDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+            model.IncludeAll = step.IncludeAll;
+            model.IndexNames = step.IndexNames;
+            model.AllIndexNames = (await _luceneIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
+        }).Location("Content");
+    }
 
-        public override IDisplayResult Edit(LuceneIndexResetDeploymentStep step, BuildEditorContext context)
-        {
-            return Initialize<LuceneIndexResetDeploymentStepViewModel>("LuceneIndexResetDeploymentStep_Fields_Edit", async model =>
-            {
-                model.IncludeAll = step.IncludeAll;
-                model.IndexNames = step.IndexNames;
-                model.AllIndexNames = (await _luceneIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
-            }).Location("Content");
-        }
+    public override async Task<IDisplayResult> UpdateAsync(LuceneIndexResetDeploymentStep resetIndexStep, UpdateEditorContext context)
+    {
+        resetIndexStep.IndexNames = [];
+
+        await context.Updater.TryUpdateModelAsync(resetIndexStep, Prefix, step => step.IndexNames, step => step.IncludeAll);
 
-        public override async Task<IDisplayResult> UpdateAsync(LuceneIndexResetDeploymentStep resetIndexStep, UpdateEditorContext context)
+        if (resetIndexStep.IncludeAll)
         {
             resetIndexStep.IndexNames = [];
-
-            await context.Updater.TryUpdateModelAsync(resetIndexStep, Prefix, step => step.IndexNames, step => step.IncludeAll);
-
-            if (resetIndexStep.IncludeAll)
-            {
-                resetIndexStep.IndexNames = [];
-            }
-
-            return Edit(resetIndexStep, context);
         }
+
+        return Edit(resetIndexStep, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneSettingsDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneSettingsDeploymentSource.cs
index 40191ae032d..c02938120c9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneSettingsDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneSettingsDeploymentSource.cs
@@ -2,32 +2,31 @@
 using System.Threading.Tasks;
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Search.Lucene.Deployment
+namespace OrchardCore.Search.Lucene.Deployment;
+
+public class LuceneSettingsDeploymentSource : IDeploymentSource
 {
-    public class LuceneSettingsDeploymentSource : IDeploymentSource
+    private readonly LuceneIndexingService _luceneIndexingService;
+
+    public LuceneSettingsDeploymentSource(LuceneIndexingService luceneIndexingService)
     {
-        private readonly LuceneIndexingService _luceneIndexingService;
+        _luceneIndexingService = luceneIndexingService;
+    }
 
-        public LuceneSettingsDeploymentSource(LuceneIndexingService luceneIndexingService)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        if (step is not LuceneSettingsDeploymentStep)
         {
-            _luceneIndexingService = luceneIndexingService;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
-        {
-            if (step is not LuceneSettingsDeploymentStep)
-            {
-                return;
-            }
-
-            var luceneSettings = await _luceneIndexingService.GetLuceneSettingsAsync();
+        var luceneSettings = await _luceneIndexingService.GetLuceneSettingsAsync();
 
-            // Adding Lucene settings
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "Settings",
-                ["LuceneSettings"] = JObject.FromObject(luceneSettings),
-            });
-        }
+        // Adding Lucene settings
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "Settings",
+            ["LuceneSettings"] = JObject.FromObject(luceneSettings),
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneSettingsDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneSettingsDeploymentStep.cs
index 711f79457e6..6d532469c0c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneSettingsDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneSettingsDeploymentStep.cs
@@ -1,15 +1,14 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Search.Lucene.Deployment
+namespace OrchardCore.Search.Lucene.Deployment;
+
+/// <summary>
+/// Adds layers to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class LuceneSettingsDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds layers to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class LuceneSettingsDeploymentStep : DeploymentStep
+    public LuceneSettingsDeploymentStep()
     {
-        public LuceneSettingsDeploymentStep()
-        {
-            Name = "LuceneSettings";
-        }
+        Name = "LuceneSettings";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneSettingsDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneSettingsDeploymentStepDriver.cs
index e70565b01d0..d743928a324 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneSettingsDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Deployment/LuceneSettingsDeploymentStepDriver.cs
@@ -3,22 +3,21 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Search.Lucene.Deployment
+namespace OrchardCore.Search.Lucene.Deployment;
+
+public sealed class LuceneSettingsDeploymentStepDriver : DisplayDriver<DeploymentStep, LuceneSettingsDeploymentStep>
 {
-    public sealed class LuceneSettingsDeploymentStepDriver : DisplayDriver<DeploymentStep, LuceneSettingsDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(LuceneSettingsDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(LuceneSettingsDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("LuceneSettingsDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("LuceneSettingsDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("LuceneSettingsDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("LuceneSettingsDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(LuceneSettingsDeploymentStep step, BuildEditorContext context)
-        {
-            return View("LuceneSettingsDeploymentStep_Fields_Edit", step).Location("Content");
-        }
+    public override IDisplayResult Edit(LuceneSettingsDeploymentStep step, BuildEditorContext context)
+    {
+        return View("LuceneSettingsDeploymentStep_Fields_Edit", step).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Drivers/LuceneQueryDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Drivers/LuceneQueryDisplayDriver.cs
index fe4bb3de489..1371a786d17 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Drivers/LuceneQueryDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Drivers/LuceneQueryDisplayDriver.cs
@@ -9,90 +9,89 @@
 using OrchardCore.Search.Lucene.Model;
 using OrchardCore.Search.Lucene.ViewModels;
 
-namespace OrchardCore.Search.Lucene.Drivers
+namespace OrchardCore.Search.Lucene.Drivers;
+
+public sealed class LuceneQueryDisplayDriver : DisplayDriver<Query>
 {
-    public sealed class LuceneQueryDisplayDriver : DisplayDriver<Query>
-    {
-        private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
+    private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public LuceneQueryDisplayDriver(
-            IStringLocalizer<LuceneQueryDisplayDriver> stringLocalizer,
-            LuceneIndexSettingsService luceneIndexSettingsService)
-        {
-            _luceneIndexSettingsService = luceneIndexSettingsService;
-            S = stringLocalizer;
-        }
+    public LuceneQueryDisplayDriver(
+        IStringLocalizer<LuceneQueryDisplayDriver> stringLocalizer,
+        LuceneIndexSettingsService luceneIndexSettingsService)
+    {
+        _luceneIndexSettingsService = luceneIndexSettingsService;
+        S = stringLocalizer;
+    }
 
-        public override IDisplayResult Display(Query query, BuildDisplayContext context)
+    public override IDisplayResult Display(Query query, BuildDisplayContext context)
+    {
+        if (query.Source != LuceneQuerySource.SourceName)
         {
-            if (query.Source != LuceneQuerySource.SourceName)
-            {
-                return null;
-            }
-
-            return Combine(
-                Dynamic("LuceneQuery_SummaryAdmin", model => { model.Query = query; }).Location("Content:5"),
-                Dynamic("LuceneQuery_Buttons_SummaryAdmin", model => { model.Query = query; }).Location("Actions:2")
-            );
+            return null;
         }
 
-        public override IDisplayResult Edit(Query query, BuildEditorContext context)
-        {
-            if (query.Source != LuceneQuerySource.SourceName)
-            {
-                return null;
-            }
+        return Combine(
+            Dynamic("LuceneQuery_SummaryAdmin", model => { model.Query = query; }).Location("Content:5"),
+            Dynamic("LuceneQuery_Buttons_SummaryAdmin", model => { model.Query = query; }).Location("Actions:2")
+        );
+    }
 
-            return Initialize<LuceneQueryViewModel>("LuceneQuery_Edit", async model =>
-            {
-                var metadata = query.As<LuceneQueryMetadata>();
-
-                model.Query = metadata.Template;
-                model.Index = metadata.Index;
-                model.ReturnContentItems = query.ReturnContentItems;
-                model.Indices = (await _luceneIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
-
-                // Extract query from the query string if we come from the main query editor.
-                if (string.IsNullOrEmpty(metadata.Template))
-                {
-                    await context.Updater.TryUpdateModelAsync(model, string.Empty, m => m.Query);
-                }
-            }).Location("Content:5");
+    public override IDisplayResult Edit(Query query, BuildEditorContext context)
+    {
+        if (query.Source != LuceneQuerySource.SourceName)
+        {
+            return null;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(Query query, UpdateEditorContext context)
+        return Initialize<LuceneQueryViewModel>("LuceneQuery_Edit", async model =>
         {
-            if (query.Source != LuceneQuerySource.SourceName)
-            {
-                return null;
-            }
+            var metadata = query.As<LuceneQueryMetadata>();
 
-            var viewModel = new LuceneQueryViewModel();
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix,
-                m => m.Query,
-                m => m.Index,
-                m => m.ReturnContentItems);
+            model.Query = metadata.Template;
+            model.Index = metadata.Index;
+            model.ReturnContentItems = query.ReturnContentItems;
+            model.Indices = (await _luceneIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
 
-            if (string.IsNullOrWhiteSpace(viewModel.Query))
+            // Extract query from the query string if we come from the main query editor.
+            if (string.IsNullOrEmpty(metadata.Template))
             {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Query), S["The query field is required"]);
+                await context.Updater.TryUpdateModelAsync(model, string.Empty, m => m.Query);
             }
+        }).Location("Content:5");
+    }
 
-            if (string.IsNullOrWhiteSpace(viewModel.Index))
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Index), S["The index field is required"]);
-            }
+    public override async Task<IDisplayResult> UpdateAsync(Query query, UpdateEditorContext context)
+    {
+        if (query.Source != LuceneQuerySource.SourceName)
+        {
+            return null;
+        }
 
-            query.ReturnContentItems = viewModel.ReturnContentItems;
-            query.Put(new LuceneQueryMetadata()
-            {
-                Template = viewModel.Query,
-                Index = viewModel.Index,
-            });
+        var viewModel = new LuceneQueryViewModel();
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix,
+            m => m.Query,
+            m => m.Index,
+            m => m.ReturnContentItems);
+
+        if (string.IsNullOrWhiteSpace(viewModel.Query))
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Query), S["The query field is required"]);
+        }
 
-            return Edit(query, context);
+        if (string.IsNullOrWhiteSpace(viewModel.Index))
+        {
+            context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Index), S["The index field is required"]);
         }
+
+        query.ReturnContentItems = viewModel.ReturnContentItems;
+        query.Put(new LuceneQueryMetadata()
+        {
+            Template = viewModel.Query,
+            Index = viewModel.Index,
+        });
+
+        return Edit(query, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Drivers/LuceneSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Drivers/LuceneSettingsDisplayDriver.cs
index 466cdf9afd8..e62d2b1f6c3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Drivers/LuceneSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Drivers/LuceneSettingsDisplayDriver.cs
@@ -10,66 +10,65 @@
 using OrchardCore.Search.Lucene.ViewModels;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Search.Lucene.Drivers
+namespace OrchardCore.Search.Lucene.Drivers;
+
+public sealed class LuceneSettingsDisplayDriver : SiteDisplayDriver<LuceneSettings>
 {
-    public sealed class LuceneSettingsDisplayDriver : SiteDisplayDriver<LuceneSettings>
+    private static readonly char[] _separator = [',', ' '];
+
+    private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+
+    public LuceneSettingsDisplayDriver(
+        LuceneIndexSettingsService luceneIndexSettingsService,
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService)
     {
-        private static readonly char[] _separator = [',', ' '];
+        _luceneIndexSettingsService = luceneIndexSettingsService;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
 
-        private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+    protected override string SettingsGroupId
+        => SearchConstants.SearchSettingsGroupId;
 
-        public LuceneSettingsDisplayDriver(
-            LuceneIndexSettingsService luceneIndexSettingsService,
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService)
+    public override async Task<IDisplayResult> EditAsync(ISite site, LuceneSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageLuceneIndexes))
         {
-            _luceneIndexSettingsService = luceneIndexSettingsService;
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
+            return null;
         }
 
-        protected override string SettingsGroupId
-            => SearchConstants.SearchSettingsGroupId;
-
-        public override async Task<IDisplayResult> EditAsync(ISite site, LuceneSettings settings, BuildEditorContext context)
+        return Initialize<LuceneSettingsViewModel>("LuceneSettings_Edit", async model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageLuceneIndexes))
-            {
-                return null;
-            }
+            model.SearchIndex = settings.SearchIndex;
+            model.SearchFields = string.Join(", ", settings.DefaultSearchFields ?? []);
+            model.SearchIndexes = (await _luceneIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName);
+            model.AllowLuceneQueriesInSearch = settings.AllowLuceneQueriesInSearch;
+        }).Location("Content:2#Lucene;15")
+        .OnGroup(SettingsGroupId);
+    }
 
-            return Initialize<LuceneSettingsViewModel>("LuceneSettings_Edit", async model =>
-            {
-                model.SearchIndex = settings.SearchIndex;
-                model.SearchFields = string.Join(", ", settings.DefaultSearchFields ?? []);
-                model.SearchIndexes = (await _luceneIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName);
-                model.AllowLuceneQueriesInSearch = settings.AllowLuceneQueriesInSearch;
-            }).Location("Content:2#Lucene;15")
-            .OnGroup(SettingsGroupId);
-        }
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, LuceneSettings section, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, LuceneSettings section, UpdateEditorContext context)
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageLuceneIndexes))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageLuceneIndexes))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var model = new LuceneSettingsViewModel();
+        var model = new LuceneSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            section.SearchIndex = model.SearchIndex;
-            section.DefaultSearchFields = model.SearchFields?.Split(_separator, StringSplitOptions.RemoveEmptyEntries);
-            section.AllowLuceneQueriesInSearch = model.AllowLuceneQueriesInSearch;
+        section.SearchIndex = model.SearchIndex;
+        section.DefaultSearchFields = model.SearchFields?.Split(_separator, StringSplitOptions.RemoveEmptyEntries);
+        section.AllowLuceneQueriesInSearch = model.AllowLuceneQueriesInSearch;
 
-            return await EditAsync(site, section, context);
-        }
+        return await EditAsync(site, section, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/GraphQL/LuceneQueryFieldTypeProvider.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/GraphQL/LuceneQueryFieldTypeProvider.cs
index 1a3192a3689..a9ed0cd84e0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/GraphQL/LuceneQueryFieldTypeProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/GraphQL/LuceneQueryFieldTypeProvider.cs
@@ -17,206 +17,205 @@
 using OrchardCore.Search.Lucene;
 using OrchardCore.Search.Lucene.Model;
 
-namespace OrchardCore.Queries.Lucene.GraphQL.Queries
+namespace OrchardCore.Queries.Lucene.GraphQL.Queries;
+
+public class LuceneQueryFieldTypeProvider : ISchemaBuilder
 {
-    public class LuceneQueryFieldTypeProvider : ISchemaBuilder
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly ILogger _logger;
+
+    public LuceneQueryFieldTypeProvider(
+        IHttpContextAccessor httpContextAccessor,
+        ILogger<LuceneQueryFieldTypeProvider> logger)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly ILogger _logger;
+        _httpContextAccessor = httpContextAccessor;
+        _logger = logger;
+    }
 
-        public LuceneQueryFieldTypeProvider(
-            IHttpContextAccessor httpContextAccessor,
-            ILogger<LuceneQueryFieldTypeProvider> logger)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _logger = logger;
-        }
+    public Task<string> GetIdentifierAsync()
+    {
+        var queryManager = _httpContextAccessor.HttpContext.RequestServices.GetService<IQueryManager>();
 
-        public Task<string> GetIdentifierAsync()
-        {
-            var queryManager = _httpContextAccessor.HttpContext.RequestServices.GetService<IQueryManager>();
+        return queryManager.GetIdentifierAsync();
+    }
 
-            return queryManager.GetIdentifierAsync();
-        }
+    public async Task BuildAsync(ISchema schema)
+    {
+        var queryManager = _httpContextAccessor.HttpContext.RequestServices.GetService<IQueryManager>();
 
-        public async Task BuildAsync(ISchema schema)
-        {
-            var queryManager = _httpContextAccessor.HttpContext.RequestServices.GetService<IQueryManager>();
+        var queries = await queryManager.ListQueriesBySourceAsync(LuceneQuerySource.SourceName);
 
-            var queries = await queryManager.ListQueriesBySourceAsync(LuceneQuerySource.SourceName);
+        foreach (var query in queries)
+        {
+            if (string.IsNullOrWhiteSpace(query.Schema))
+            {
+                continue;
+            }
 
-            foreach (var query in queries)
+            try
             {
-                if (string.IsNullOrWhiteSpace(query.Schema))
+                var querySchema = JObject.Parse(query.Schema);
+                if (!querySchema.ContainsKey("type"))
                 {
+                    _logger.LogError("The Query '{Name}' schema is invalid, the 'type' property was not found.", query.Name);
+
                     continue;
                 }
 
-                try
-                {
-                    var querySchema = JObject.Parse(query.Schema);
-                    if (!querySchema.ContainsKey("type"))
-                    {
-                        _logger.LogError("The Query '{Name}' schema is invalid, the 'type' property was not found.", query.Name);
-
-                        continue;
-                    }
-
-                    var type = querySchema["type"].ToString();
-                    FieldType fieldType;
-
-                    var fieldTypeName = querySchema["fieldTypeName"]?.ToString() ?? query.Name;
-                    var metadata = query.As<LuceneQueryMetadata>();
+                var type = querySchema["type"].ToString();
+                FieldType fieldType;
 
-                    if (query.ReturnContentItems &&
-                        type.StartsWith("ContentItem/", StringComparison.OrdinalIgnoreCase))
-                    {
-                        var contentType = type.Remove(0, 12);
-                        fieldType = BuildContentTypeFieldType(schema, contentType, query, fieldTypeName);
-                    }
-                    else
-                    {
-                        fieldType = BuildSchemaBasedFieldType(query, querySchema, fieldTypeName);
-                    }
+                var fieldTypeName = querySchema["fieldTypeName"]?.ToString() ?? query.Name;
+                var metadata = query.As<LuceneQueryMetadata>();
 
-                    if (fieldType != null)
-                    {
-                        schema.Query.AddField(fieldType);
-                    }
+                if (query.ReturnContentItems &&
+                    type.StartsWith("ContentItem/", StringComparison.OrdinalIgnoreCase))
+                {
+                    var contentType = type.Remove(0, 12);
+                    fieldType = BuildContentTypeFieldType(schema, contentType, query, fieldTypeName);
                 }
-                catch (Exception e)
+                else
                 {
-                    _logger.LogError(e, "The Query '{Name}' has an invalid schema.", query.Name);
+                    fieldType = BuildSchemaBasedFieldType(query, querySchema, fieldTypeName);
                 }
+
+                if (fieldType != null)
+                {
+                    schema.Query.AddField(fieldType);
+                }
+            }
+            catch (Exception e)
+            {
+                _logger.LogError(e, "The Query '{Name}' has an invalid schema.", query.Name);
             }
         }
+    }
 
-        private static FieldType BuildSchemaBasedFieldType(Query query, JsonNode querySchema, string fieldTypeName)
+    private static FieldType BuildSchemaBasedFieldType(Query query, JsonNode querySchema, string fieldTypeName)
+    {
+        var properties = querySchema["properties"]?.AsObject();
+        if (properties == null)
         {
-            var properties = querySchema["properties"]?.AsObject();
-            if (properties == null)
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var typeType = new ObjectGraphType<JsonObject>
-            {
-                Name = fieldTypeName
-            };
+        var typeType = new ObjectGraphType<JsonObject>
+        {
+            Name = fieldTypeName
+        };
 
-            foreach (var child in properties)
-            {
-                var name = child.Key;
-                var nameLower = name.Replace('.', '_');
-                var type = child.Value["type"].ToString();
-                var description = child.Value["description"]?.ToString();
+        foreach (var child in properties)
+        {
+            var name = child.Key;
+            var nameLower = name.Replace('.', '_');
+            var type = child.Value["type"].ToString();
+            var description = child.Value["description"]?.ToString();
 
-                if (type == "string")
+            if (type == "string")
+            {
+                var field = new FieldType()
                 {
-                    var field = new FieldType()
+                    Name = nameLower,
+                    Description = description,
+                    Type = typeof(StringGraphType),
+                    Resolver = new FuncFieldResolver<JsonObject, string>(context =>
                     {
-                        Name = nameLower,
-                        Description = description,
-                        Type = typeof(StringGraphType),
-                        Resolver = new FuncFieldResolver<JsonObject, string>(context =>
-                        {
-                            var source = context.Source;
-                            return source[context.FieldDefinition.Metadata["Name"].ToString()].ToObject<string>();
-                        }),
-                    };
-                    field.Metadata.Add("Name", name);
-                    typeType.AddField(field);
-                }
-                else if (type == "integer")
+                        var source = context.Source;
+                        return source[context.FieldDefinition.Metadata["Name"].ToString()].ToObject<string>();
+                    }),
+                };
+                field.Metadata.Add("Name", name);
+                typeType.AddField(field);
+            }
+            else if (type == "integer")
+            {
+                var field = new FieldType()
                 {
-                    var field = new FieldType()
+                    Name = nameLower,
+                    Description = description,
+                    Type = typeof(IntGraphType),
+                    Resolver = new FuncFieldResolver<JsonObject, int?>(context =>
                     {
-                        Name = nameLower,
-                        Description = description,
-                        Type = typeof(IntGraphType),
-                        Resolver = new FuncFieldResolver<JsonObject, int?>(context =>
-                        {
-                            var source = context.Source;
-                            return source[context.FieldDefinition.Metadata["Name"].ToString()].ToObject<int>();
-                        }),
-                    };
-
-                    field.Metadata.Add("Name", name);
-                    typeType.AddField(field);
-                }
-            }
+                        var source = context.Source;
+                        return source[context.FieldDefinition.Metadata["Name"].ToString()].ToObject<int>();
+                    }),
+                };
 
-            var fieldType = new FieldType
-            {
-                Arguments = new QueryArguments(
-                    new QueryArgument<StringGraphType> { Name = "parameters" }
-                ),
-                Name = fieldTypeName,
-                Description = "Represents the " + query.Source + " Query : " + query.Name,
-                ResolvedType = new ListGraphType(typeType),
-                Resolver = new LockedAsyncFieldResolver<object, object>(ResolveAsync),
-                Type = typeof(ListGraphType<ObjectGraphType<JsonObject>>)
-            };
-
-            async ValueTask<object> ResolveAsync(IResolveFieldContext<object> context)
-            {
-                var queryManager = context.RequestServices.GetRequiredService<IQueryManager>();
+                field.Metadata.Add("Name", name);
+                typeType.AddField(field);
+            }
+        }
 
-                var iQuery = await queryManager.GetQueryAsync(query.Name);
+        var fieldType = new FieldType
+        {
+            Arguments = new QueryArguments(
+                new QueryArgument<StringGraphType> { Name = "parameters" }
+            ),
+            Name = fieldTypeName,
+            Description = "Represents the " + query.Source + " Query : " + query.Name,
+            ResolvedType = new ListGraphType(typeType),
+            Resolver = new LockedAsyncFieldResolver<object, object>(ResolveAsync),
+            Type = typeof(ListGraphType<ObjectGraphType<JsonObject>>)
+        };
+
+        async ValueTask<object> ResolveAsync(IResolveFieldContext<object> context)
+        {
+            var queryManager = context.RequestServices.GetRequiredService<IQueryManager>();
 
-                var parameters = context.GetArgument<string>("parameters");
+            var iQuery = await queryManager.GetQueryAsync(query.Name);
 
-                var queryParameters = parameters != null
-                    ? JConvert.DeserializeObject<Dictionary<string, object>>(parameters)
-                    : [];
+            var parameters = context.GetArgument<string>("parameters");
 
-                var result = await queryManager.ExecuteQueryAsync(iQuery, queryParameters);
+            var queryParameters = parameters != null
+                ? JConvert.DeserializeObject<Dictionary<string, object>>(parameters)
+                : [];
 
-                return result.Items;
-            }
+            var result = await queryManager.ExecuteQueryAsync(iQuery, queryParameters);
 
-            return fieldType;
+            return result.Items;
         }
 
-        private static FieldType BuildContentTypeFieldType(ISchema schema, string contentType, Query query, string fieldTypeName)
-        {
-            var typeType = schema.Query.Fields.OfType<ContentItemsFieldType>().FirstOrDefault(x => x.Name == contentType);
+        return fieldType;
+    }
 
-            if (typeType == null)
-            {
-                return null;
-            }
+    private static FieldType BuildContentTypeFieldType(ISchema schema, string contentType, Query query, string fieldTypeName)
+    {
+        var typeType = schema.Query.Fields.OfType<ContentItemsFieldType>().FirstOrDefault(x => x.Name == contentType);
 
-            var fieldType = new FieldType
-            {
-                Arguments = new QueryArguments(
-                    new QueryArgument<StringGraphType> { Name = "parameters" }
-                ),
-                Name = fieldTypeName,
-                Description = "Represents the " + query.Source + " Query : " + query.Name,
-                ResolvedType = typeType.ResolvedType,
-                Resolver = new LockedAsyncFieldResolver<object, object>(ResolveAsync),
-                Type = typeType.Type
-            };
-
-            async ValueTask<object> ResolveAsync(IResolveFieldContext<object> context)
-            {
-                var queryManager = context.RequestServices.GetRequiredService<IQueryManager>();
+        if (typeType == null)
+        {
+            return null;
+        }
 
-                var iQuery = await queryManager.GetQueryAsync(query.Name);
+        var fieldType = new FieldType
+        {
+            Arguments = new QueryArguments(
+                new QueryArgument<StringGraphType> { Name = "parameters" }
+            ),
+            Name = fieldTypeName,
+            Description = "Represents the " + query.Source + " Query : " + query.Name,
+            ResolvedType = typeType.ResolvedType,
+            Resolver = new LockedAsyncFieldResolver<object, object>(ResolveAsync),
+            Type = typeType.Type
+        };
+
+        async ValueTask<object> ResolveAsync(IResolveFieldContext<object> context)
+        {
+            var queryManager = context.RequestServices.GetRequiredService<IQueryManager>();
 
-                var parameters = context.GetArgument<string>("parameters");
+            var iQuery = await queryManager.GetQueryAsync(query.Name);
 
-                var queryParameters = parameters != null
-                    ? JConvert.DeserializeObject<Dictionary<string, object>>(parameters)
-                    : [];
+            var parameters = context.GetArgument<string>("parameters");
 
-                var result = await queryManager.ExecuteQueryAsync(iQuery, queryParameters);
+            var queryParameters = parameters != null
+                ? JConvert.DeserializeObject<Dictionary<string, object>>(parameters)
+                : [];
 
-                return result.Items;
-            }
+            var result = await queryManager.ExecuteQueryAsync(iQuery, queryParameters);
 
-            return fieldType;
+            return result.Items;
         }
+
+        return fieldType;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/GraphQL/Startup.cs
index 9c7e2f8af0b..88b900009cb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/GraphQL/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/GraphQL/Startup.cs
@@ -3,17 +3,16 @@
 using OrchardCore.Modules;
 using OrchardCore.Queries.Lucene.GraphQL.Queries;
 
-namespace OrchardCore.Search.Lucene.GraphQL
+namespace OrchardCore.Search.Lucene.GraphQL;
+
+/// <summary>
+/// These services are registered on the tenant service collection.
+/// </summary>
+[RequireFeatures("OrchardCore.Apis.GraphQL", "OrchardCore.Queries")]
+public sealed class Startup : StartupBase
 {
-    /// <summary>
-    /// These services are registered on the tenant service collection.
-    /// </summary>
-    [RequireFeatures("OrchardCore.Apis.GraphQL", "OrchardCore.Queries")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSingleton<ISchemaBuilder, LuceneQueryFieldTypeProvider>();
-        }
+        services.AddSingleton<ISchemaBuilder, LuceneQueryFieldTypeProvider>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Handler/LuceneIndexingContentHandler.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Handler/LuceneIndexingContentHandler.cs
index e81a8e09112..ffc985a36fb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Handler/LuceneIndexingContentHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Handler/LuceneIndexingContentHandler.cs
@@ -14,106 +14,105 @@
 using OrchardCore.Modules;
 using OrchardCore.Search.Lucene.Model;
 
-namespace OrchardCore.Search.Lucene.Handlers
+namespace OrchardCore.Search.Lucene.Handlers;
+
+public class LuceneIndexingContentHandler : ContentHandlerBase
 {
-    public class LuceneIndexingContentHandler : ContentHandlerBase
+    private readonly List<ContentContextBase> _contexts = [];
+    private readonly IHttpContextAccessor _httpContextAccessor;
+
+    public LuceneIndexingContentHandler(IHttpContextAccessor httpContextAccessor)
     {
-        private readonly List<ContentContextBase> _contexts = [];
-        private readonly IHttpContextAccessor _httpContextAccessor;
+        _httpContextAccessor = httpContextAccessor;
+    }
+
+    public override Task PublishedAsync(PublishContentContext context) => AddContextAsync(context);
+    public override Task CreatedAsync(CreateContentContext context) => AddContextAsync(context);
+    public override Task UpdatedAsync(UpdateContentContext context) => AddContextAsync(context);
+    public override Task RemovedAsync(RemoveContentContext context) => AddContextAsync(context);
+    public override Task UnpublishedAsync(PublishContentContext context) => AddContextAsync(context);
 
-        public LuceneIndexingContentHandler(IHttpContextAccessor httpContextAccessor)
+    private Task AddContextAsync(ContentContextBase context)
+    {
+        // Do not index a preview content item.
+        if (_httpContextAccessor.HttpContext?.Features.Get<ContentPreviewFeature>()?.Previewing == true)
         {
-            _httpContextAccessor = httpContextAccessor;
+            return Task.CompletedTask;
         }
 
-        public override Task PublishedAsync(PublishContentContext context) => AddContextAsync(context);
-        public override Task CreatedAsync(CreateContentContext context) => AddContextAsync(context);
-        public override Task UpdatedAsync(UpdateContentContext context) => AddContextAsync(context);
-        public override Task RemovedAsync(RemoveContentContext context) => AddContextAsync(context);
-        public override Task UnpublishedAsync(PublishContentContext context) => AddContextAsync(context);
+        if (context.ContentItem.Id == 0)
+        {
+            // Ignore that case, when Update is called on a content item which has not be "created" yet.
+            return Task.CompletedTask;
+        }
 
-        private Task AddContextAsync(ContentContextBase context)
+        if (_contexts.Count == 0)
         {
-            // Do not index a preview content item.
-            if (_httpContextAccessor.HttpContext?.Features.Get<ContentPreviewFeature>()?.Previewing == true)
-            {
-                return Task.CompletedTask;
-            }
+            var contexts = _contexts;
 
-            if (context.ContentItem.Id == 0)
-            {
-                // Ignore that case, when Update is called on a content item which has not be "created" yet.
-                return Task.CompletedTask;
-            }
+            // Using a local var prevents the lambda from holding a ref on this scoped service.
+            ShellScope.AddDeferredTask(scope => IndexingAsync(scope, contexts));
+        }
 
-            if (_contexts.Count == 0)
-            {
-                var contexts = _contexts;
+        _contexts.Add(context);
 
-                // Using a local var prevents the lambda from holding a ref on this scoped service.
-                ShellScope.AddDeferredTask(scope => IndexingAsync(scope, contexts));
-            }
+        return Task.CompletedTask;
+    }
 
-            _contexts.Add(context);
+    private static async Task IndexingAsync(ShellScope scope, IEnumerable<ContentContextBase> contexts)
+    {
+        var services = scope.ServiceProvider;
+        var contentManager = services.GetRequiredService<IContentManager>();
+        var contentItemIndexHandlers = services.GetServices<IContentItemIndexHandler>();
+        var luceneIndexManager = services.GetRequiredService<LuceneIndexManager>();
+        var luceneIndexSettingsService = services.GetRequiredService<LuceneIndexSettingsService>();
+        var logger = services.GetRequiredService<ILogger<LuceneIndexingContentHandler>>();
+
+        // Multiple items may have been updated in the same scope, e.g through a recipe.
+        var contextsGroupById = contexts.GroupBy(c => c.ContentItem.ContentItemId, c => c);
+
+        // Get all contexts for each content item id.
+        foreach (var ContextsById in contextsGroupById)
+        {
+            // Only process the last context.
+            var context = ContextsById.Last();
 
-            return Task.CompletedTask;
-        }
+            ContentItem published = null, latest = null;
+            bool publishedLoaded = false, latestLoaded = false;
 
-        private static async Task IndexingAsync(ShellScope scope, IEnumerable<ContentContextBase> contexts)
-        {
-            var services = scope.ServiceProvider;
-            var contentManager = services.GetRequiredService<IContentManager>();
-            var contentItemIndexHandlers = services.GetServices<IContentItemIndexHandler>();
-            var luceneIndexManager = services.GetRequiredService<LuceneIndexManager>();
-            var luceneIndexSettingsService = services.GetRequiredService<LuceneIndexSettingsService>();
-            var logger = services.GetRequiredService<ILogger<LuceneIndexingContentHandler>>();
-
-            // Multiple items may have been updated in the same scope, e.g through a recipe.
-            var contextsGroupById = contexts.GroupBy(c => c.ContentItem.ContentItemId, c => c);
-
-            // Get all contexts for each content item id.
-            foreach (var ContextsById in contextsGroupById)
+            foreach (var indexSettings in await luceneIndexSettingsService.GetSettingsAsync())
             {
-                // Only process the last context.
-                var context = ContextsById.Last();
+                var cultureAspect = await contentManager.PopulateAspectAsync<CultureAspect>(context.ContentItem);
+                var culture = cultureAspect.HasCulture ? cultureAspect.Culture.Name : null;
+                var ignoreIndexedCulture = indexSettings.Culture != "any" && culture != indexSettings.Culture;
 
-                ContentItem published = null, latest = null;
-                bool publishedLoaded = false, latestLoaded = false;
-
-                foreach (var indexSettings in await luceneIndexSettingsService.GetSettingsAsync())
+                if (indexSettings.IndexedContentTypes.Contains(context.ContentItem.ContentType) && !ignoreIndexedCulture)
                 {
-                    var cultureAspect = await contentManager.PopulateAspectAsync<CultureAspect>(context.ContentItem);
-                    var culture = cultureAspect.HasCulture ? cultureAspect.Culture.Name : null;
-                    var ignoreIndexedCulture = indexSettings.Culture != "any" && culture != indexSettings.Culture;
+                    if (!indexSettings.IndexLatest && !publishedLoaded)
+                    {
+                        publishedLoaded = true;
+                        published = await contentManager.GetAsync(context.ContentItem.ContentItemId, VersionOptions.Published);
+                    }
+
+                    if (indexSettings.IndexLatest && !latestLoaded)
+                    {
+                        latestLoaded = true;
+                        latest = await contentManager.GetAsync(context.ContentItem.ContentItemId, VersionOptions.Latest);
+                    }
 
-                    if (indexSettings.IndexedContentTypes.Contains(context.ContentItem.ContentType) && !ignoreIndexedCulture)
+                    var contentItem = !indexSettings.IndexLatest ? published : latest;
+
+                    if (contentItem == null)
+                    {
+                        await luceneIndexManager.DeleteDocumentsAsync(indexSettings.IndexName, new string[] { context.ContentItem.ContentItemId });
+                    }
+                    else
                     {
-                        if (!indexSettings.IndexLatest && !publishedLoaded)
-                        {
-                            publishedLoaded = true;
-                            published = await contentManager.GetAsync(context.ContentItem.ContentItemId, VersionOptions.Published);
-                        }
-
-                        if (indexSettings.IndexLatest && !latestLoaded)
-                        {
-                            latestLoaded = true;
-                            latest = await contentManager.GetAsync(context.ContentItem.ContentItemId, VersionOptions.Latest);
-                        }
-
-                        var contentItem = !indexSettings.IndexLatest ? published : latest;
-
-                        if (contentItem == null)
-                        {
-                            await luceneIndexManager.DeleteDocumentsAsync(indexSettings.IndexName, new string[] { context.ContentItem.ContentItemId });
-                        }
-                        else
-                        {
-                            var buildIndexContext = new BuildIndexContext(new DocumentIndex(contentItem.ContentItemId, contentItem.ContentItemVersionId), contentItem, new string[] { contentItem.ContentType }, new LuceneContentIndexSettings());
-                            await contentItemIndexHandlers.InvokeAsync(x => x.BuildIndexAsync(buildIndexContext), logger);
-
-                            await luceneIndexManager.DeleteDocumentsAsync(indexSettings.IndexName, new string[] { contentItem.ContentItemId });
-                            await luceneIndexManager.StoreDocumentsAsync(indexSettings.IndexName, new DocumentIndex[] { buildIndexContext.DocumentIndex });
-                        }
+                        var buildIndexContext = new BuildIndexContext(new DocumentIndex(contentItem.ContentItemId, contentItem.ContentItemVersionId), contentItem, new string[] { contentItem.ContentType }, new LuceneContentIndexSettings());
+                        await contentItemIndexHandlers.InvokeAsync(x => x.BuildIndexAsync(buildIndexContext), logger);
+
+                        await luceneIndexManager.DeleteDocumentsAsync(indexSettings.IndexName, new string[] { contentItem.ContentItemId });
+                        await luceneIndexManager.StoreDocumentsAsync(indexSettings.IndexName, new DocumentIndex[] { buildIndexContext.DocumentIndex });
                     }
                 }
             }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Migrations.cs
index d0b635136a8..291a1fefee6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Migrations.cs
@@ -13,87 +13,42 @@
 using OrchardCore.Search.Lucene.Model;
 using YesSql;
 
-namespace OrchardCore.Search.Lucene
+namespace OrchardCore.Search.Lucene;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ShellDescriptor _shellDescriptor;
+
+    public Migrations(
+        IContentDefinitionManager contentDefinitionManager,
+        ShellDescriptor shellDescriptor)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly ShellDescriptor _shellDescriptor;
+        _contentDefinitionManager = contentDefinitionManager;
+        _shellDescriptor = shellDescriptor;
+    }
 
-        public Migrations(
-            IContentDefinitionManager contentDefinitionManager,
-            ShellDescriptor shellDescriptor)
+    // New installations don't need to be upgraded, but because there is no initial migration record,
+    // 'UpgradeAsync()' is called in a new 'CreateAsync()' but only if the feature was already installed.
+    public async Task<int> CreateAsync()
+    {
+        if (_shellDescriptor.WasFeatureAlreadyInstalled("OrchardCore.Search.Lucene"))
         {
-            _contentDefinitionManager = contentDefinitionManager;
-            _shellDescriptor = shellDescriptor;
+            await UpgradeAsync();
         }
 
-        // New installations don't need to be upgraded, but because there is no initial migration record,
-        // 'UpgradeAsync()' is called in a new 'CreateAsync()' but only if the feature was already installed.
-        public async Task<int> CreateAsync()
-        {
-            if (_shellDescriptor.WasFeatureAlreadyInstalled("OrchardCore.Search.Lucene"))
-            {
-                await UpgradeAsync();
-            }
+        // Shortcut other migration steps on new content definition schemas.
+        return 1;
+    }
 
-            // Shortcut other migration steps on new content definition schemas.
-            return 1;
-        }
+    // Upgrade an existing installation.
+    private async Task UpgradeAsync()
+    {
+        var contentTypeDefinitions = await _contentDefinitionManager.LoadTypeDefinitionsAsync();
 
-        // Upgrade an existing installation.
-        private async Task UpgradeAsync()
+        foreach (var contentTypeDefinition in contentTypeDefinitions)
         {
-            var contentTypeDefinitions = await _contentDefinitionManager.LoadTypeDefinitionsAsync();
-
-            foreach (var contentTypeDefinition in contentTypeDefinitions)
-            {
-                foreach (var partDefinition in contentTypeDefinition.Parts)
-                {
-                    await _contentDefinitionManager.AlterPartDefinitionAsync(partDefinition.Name, partBuilder =>
-                    {
-                        if (partDefinition.Settings.TryGetPropertyValue("ContentIndexSettings", out var existingPartSettings) &&
-                            !partDefinition.Settings.ContainsKey(nameof(LuceneContentIndexSettings)))
-                        {
-                            var included = existingPartSettings["Included"];
-                            var analyzed = existingPartSettings["Analyzed"];
-
-                            if (included is not null)
-                            {
-                                if (analyzed is not null)
-                                {
-                                    if ((bool)included && !(bool)analyzed)
-                                    {
-                                        existingPartSettings["Keyword"] = true;
-                                    }
-                                }
-                                else
-                                {
-                                    if ((bool)included)
-                                    {
-                                        existingPartSettings["Keyword"] = true;
-                                    }
-                                }
-                            }
-
-                            var jExistingPartSettings = existingPartSettings.AsObject();
-
-                            // We remove unnecessary properties from old releases.
-                            jExistingPartSettings.Remove("Analyzed");
-                            jExistingPartSettings.Remove("Tokenized");
-                            jExistingPartSettings.Remove("Template");
-
-                            partDefinition.Settings.Add(nameof(LuceneContentIndexSettings), jExistingPartSettings.Clone());
-                        }
-
-                        partDefinition.Settings.Remove("ContentIndexSettings");
-                    });
-                }
-            }
-
-            var partDefinitions = await _contentDefinitionManager.LoadPartDefinitionsAsync();
-
-            foreach (var partDefinition in partDefinitions)
+            foreach (var partDefinition in contentTypeDefinition.Parts)
             {
                 await _contentDefinitionManager.AlterPartDefinitionAsync(partDefinition.Name, partBuilder =>
                 {
@@ -103,9 +58,9 @@ await _contentDefinitionManager.AlterPartDefinitionAsync(partDefinition.Name, pa
                         var included = existingPartSettings["Included"];
                         var analyzed = existingPartSettings["Analyzed"];
 
-                        if (included != null)
+                        if (included is not null)
                         {
-                            if (analyzed != null)
+                            if (analyzed is not null)
                             {
                                 if ((bool)included && !(bool)analyzed)
                                 {
@@ -132,106 +87,150 @@ await _contentDefinitionManager.AlterPartDefinitionAsync(partDefinition.Name, pa
                     }
 
                     partDefinition.Settings.Remove("ContentIndexSettings");
+                });
+            }
+        }
 
-                    foreach (var fieldDefinition in partDefinition.Fields)
+        var partDefinitions = await _contentDefinitionManager.LoadPartDefinitionsAsync();
+
+        foreach (var partDefinition in partDefinitions)
+        {
+            await _contentDefinitionManager.AlterPartDefinitionAsync(partDefinition.Name, partBuilder =>
+            {
+                if (partDefinition.Settings.TryGetPropertyValue("ContentIndexSettings", out var existingPartSettings) &&
+                    !partDefinition.Settings.ContainsKey(nameof(LuceneContentIndexSettings)))
+                {
+                    var included = existingPartSettings["Included"];
+                    var analyzed = existingPartSettings["Analyzed"];
+
+                    if (included != null)
                     {
-                        if (fieldDefinition.Settings.TryGetPropertyValue("ContentIndexSettings", out var existingFieldSettings) &&
-                            !fieldDefinition.Settings.TryGetPropertyValue(nameof(LuceneContentIndexSettings), out _))
+                        if (analyzed != null)
                         {
-                            var included = existingFieldSettings["Included"];
-                            var analyzed = existingFieldSettings["Analyzed"];
+                            if ((bool)included && !(bool)analyzed)
+                            {
+                                existingPartSettings["Keyword"] = true;
+                            }
+                        }
+                        else
+                        {
+                            if ((bool)included)
+                            {
+                                existingPartSettings["Keyword"] = true;
+                            }
+                        }
+                    }
+
+                    var jExistingPartSettings = existingPartSettings.AsObject();
+
+                    // We remove unnecessary properties from old releases.
+                    jExistingPartSettings.Remove("Analyzed");
+                    jExistingPartSettings.Remove("Tokenized");
+                    jExistingPartSettings.Remove("Template");
+
+                    partDefinition.Settings.Add(nameof(LuceneContentIndexSettings), jExistingPartSettings.Clone());
+                }
+
+                partDefinition.Settings.Remove("ContentIndexSettings");
+
+                foreach (var fieldDefinition in partDefinition.Fields)
+                {
+                    if (fieldDefinition.Settings.TryGetPropertyValue("ContentIndexSettings", out var existingFieldSettings) &&
+                        !fieldDefinition.Settings.TryGetPropertyValue(nameof(LuceneContentIndexSettings), out _))
+                    {
+                        var included = existingFieldSettings["Included"];
+                        var analyzed = existingFieldSettings["Analyzed"];
 
-                            if (included != null)
+                        if (included != null)
+                        {
+                            if (analyzed != null)
                             {
-                                if (analyzed != null)
+                                if ((bool)included && !(bool)analyzed)
                                 {
-                                    if ((bool)included && !(bool)analyzed)
-                                    {
-                                        existingFieldSettings["Keyword"] = true;
-                                    }
+                                    existingFieldSettings["Keyword"] = true;
                                 }
-                                else
+                            }
+                            else
+                            {
+                                if ((bool)included)
                                 {
-                                    if ((bool)included)
-                                    {
-                                        existingFieldSettings["Keyword"] = true;
-                                    }
+                                    existingFieldSettings["Keyword"] = true;
                                 }
                             }
+                        }
 
-                            var jExistingFieldSettings = existingFieldSettings.AsObject();
-
-                            // We remove unnecessary properties from old releases.
-                            jExistingFieldSettings.Remove("Analyzed");
-                            jExistingFieldSettings.Remove("Tokenized");
-                            jExistingFieldSettings.Remove("Template");
+                        var jExistingFieldSettings = existingFieldSettings.AsObject();
 
-                            fieldDefinition.Settings.Add(nameof(LuceneContentIndexSettings), jExistingFieldSettings.Clone());
-                        }
+                        // We remove unnecessary properties from old releases.
+                        jExistingFieldSettings.Remove("Analyzed");
+                        jExistingFieldSettings.Remove("Tokenized");
+                        jExistingFieldSettings.Remove("Template");
 
-                        fieldDefinition.Settings.Remove("ContentIndexSettings");
+                        fieldDefinition.Settings.Add(nameof(LuceneContentIndexSettings), jExistingFieldSettings.Clone());
                     }
-                });
-            }
 
-            // Defer this until after the subsequent migrations have succeeded as the schema has changed.
-            ShellScope.AddDeferredTask(async scope =>
-            {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
-                var dbConnectionAccessor = scope.ServiceProvider.GetService<IDbConnectionAccessor>();
-                var logger = scope.ServiceProvider.GetService<ILogger<Migrations>>();
-                var tablePrefix = session.Store.Configuration.TablePrefix;
-                var documentTableName = session.Store.Configuration.TableNameConvention.GetDocumentTable();
-                var table = $"{session.Store.Configuration.TablePrefix}{documentTableName}";
+                    fieldDefinition.Settings.Remove("ContentIndexSettings");
+                }
+            });
+        }
 
-                await using var connection = dbConnectionAccessor.CreateConnection();
-                await connection.OpenAsync();
+        // Defer this until after the subsequent migrations have succeeded as the schema has changed.
+        ShellScope.AddDeferredTask(async scope =>
+        {
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
+            var dbConnectionAccessor = scope.ServiceProvider.GetService<IDbConnectionAccessor>();
+            var logger = scope.ServiceProvider.GetService<ILogger<Migrations>>();
+            var tablePrefix = session.Store.Configuration.TablePrefix;
+            var documentTableName = session.Store.Configuration.TableNameConvention.GetDocumentTable();
+            var table = $"{session.Store.Configuration.TablePrefix}{documentTableName}";
 
-                using var transaction = await connection.BeginTransactionAsync(session.Store.Configuration.IsolationLevel);
-                var dialect = session.Store.Configuration.SqlDialect;
+            await using var connection = dbConnectionAccessor.CreateConnection();
+            await connection.OpenAsync();
 
-                try
-                {
-                    logger.LogDebug("Updating Lucene indices settings and queries");
+            using var transaction = await connection.BeginTransactionAsync(session.Store.Configuration.IsolationLevel);
+            var dialect = session.Store.Configuration.SqlDialect;
 
-                    var quotedTableName = dialect.QuoteForTableName(table, session.Store.Configuration.Schema);
-                    var quotedContentColumnName = dialect.QuoteForColumnName("Content");
-                    var quotedTypeColumnName = dialect.QuoteForColumnName("Type");
+            try
+            {
+                logger.LogDebug("Updating Lucene indices settings and queries");
 
-                    var updateCmd = $"UPDATE {quotedTableName} SET {quotedContentColumnName} = REPLACE({quotedContentColumnName}, '\"$type\":\"OrchardCore.Lucene.LuceneQuery, OrchardCore.Lucene\"', '\"$type\":\"OrchardCore.Search.Lucene.LuceneQuery, OrchardCore.Search.Lucene\"') WHERE {quotedTypeColumnName}  = 'OrchardCore.Queries.Services.QueriesDocument, OrchardCore.Queries'";
+                var quotedTableName = dialect.QuoteForTableName(table, session.Store.Configuration.Schema);
+                var quotedContentColumnName = dialect.QuoteForColumnName("Content");
+                var quotedTypeColumnName = dialect.QuoteForColumnName("Type");
 
-                    await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
+                var updateCmd = $"UPDATE {quotedTableName} SET {quotedContentColumnName} = REPLACE({quotedContentColumnName}, '\"$type\":\"OrchardCore.Lucene.LuceneQuery, OrchardCore.Lucene\"', '\"$type\":\"OrchardCore.Search.Lucene.LuceneQuery, OrchardCore.Search.Lucene\"') WHERE {quotedTypeColumnName}  = 'OrchardCore.Queries.Services.QueriesDocument, OrchardCore.Queries'";
 
-                    updateCmd = $"UPDATE {quotedTableName} SET {quotedContentColumnName} = REPLACE({quotedContentColumnName}, '\"$type\":\"OrchardCore.Lucene.Deployment.LuceneIndexDeploymentStep, OrchardCore.Lucene\"', '\"$type\":\"OrchardCore.Search.Lucene.Deployment.LuceneIndexDeploymentStep, OrchardCore.Search.Lucene\"') WHERE {quotedTypeColumnName}  = 'OrchardCore.Deployment.DeploymentPlan, OrchardCore.Deployment.Abstractions'";
+                await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
 
-                    await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
+                updateCmd = $"UPDATE {quotedTableName} SET {quotedContentColumnName} = REPLACE({quotedContentColumnName}, '\"$type\":\"OrchardCore.Lucene.Deployment.LuceneIndexDeploymentStep, OrchardCore.Lucene\"', '\"$type\":\"OrchardCore.Search.Lucene.Deployment.LuceneIndexDeploymentStep, OrchardCore.Search.Lucene\"') WHERE {quotedTypeColumnName}  = 'OrchardCore.Deployment.DeploymentPlan, OrchardCore.Deployment.Abstractions'";
 
-                    updateCmd = $"UPDATE {quotedTableName} SET {quotedContentColumnName} = REPLACE({quotedContentColumnName}, '\"$type\":\"OrchardCore.Lucene.Deployment.LuceneSettingsDeploymentStep, OrchardCore.Lucene\"', '\"$type\":\"OrchardCore.Search.Lucene.Deployment.LuceneSettingsDeploymentStep, OrchardCore.Search.Lucene\"') WHERE {quotedTypeColumnName}  = 'OrchardCore.Deployment.DeploymentPlan, OrchardCore.Deployment.Abstractions'";
+                await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
 
-                    await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
+                updateCmd = $"UPDATE {quotedTableName} SET {quotedContentColumnName} = REPLACE({quotedContentColumnName}, '\"$type\":\"OrchardCore.Lucene.Deployment.LuceneSettingsDeploymentStep, OrchardCore.Lucene\"', '\"$type\":\"OrchardCore.Search.Lucene.Deployment.LuceneSettingsDeploymentStep, OrchardCore.Search.Lucene\"') WHERE {quotedTypeColumnName}  = 'OrchardCore.Deployment.DeploymentPlan, OrchardCore.Deployment.Abstractions'";
 
-                    updateCmd = $"UPDATE {quotedTableName} SET {quotedContentColumnName} = REPLACE({quotedContentColumnName}, '\"$type\":\"OrchardCore.Lucene.Deployment.LuceneIndexResetDeploymentStep, OrchardCore.Lucene\"', '\"$type\":\"OrchardCore.Search.Lucene.Deployment.LuceneIndexResetDeploymentStep, OrchardCore.Search.Lucene\"') WHERE {quotedTypeColumnName}  = 'OrchardCore.Deployment.DeploymentPlan, OrchardCore.Deployment.Abstractions'";
+                await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
 
-                    await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
+                updateCmd = $"UPDATE {quotedTableName} SET {quotedContentColumnName} = REPLACE({quotedContentColumnName}, '\"$type\":\"OrchardCore.Lucene.Deployment.LuceneIndexResetDeploymentStep, OrchardCore.Lucene\"', '\"$type\":\"OrchardCore.Search.Lucene.Deployment.LuceneIndexResetDeploymentStep, OrchardCore.Search.Lucene\"') WHERE {quotedTypeColumnName}  = 'OrchardCore.Deployment.DeploymentPlan, OrchardCore.Deployment.Abstractions'";
 
-                    updateCmd = $"UPDATE {quotedTableName} SET {quotedContentColumnName} = REPLACE({quotedContentColumnName}, '\"$type\":\"OrchardCore.Lucene.Deployment.LuceneIndexRebuildDeploymentStep, OrchardCore.Lucene\"', '\"$type\":\"OrchardCore.Search.Lucene.Deployment.LuceneIndexRebuildDeploymentStep, OrchardCore.Search.Lucene\"') WHERE {quotedTypeColumnName}  = 'OrchardCore.Deployment.DeploymentPlan, OrchardCore.Deployment.Abstractions'";
+                await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
 
-                    await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
+                updateCmd = $"UPDATE {quotedTableName} SET {quotedContentColumnName} = REPLACE({quotedContentColumnName}, '\"$type\":\"OrchardCore.Lucene.Deployment.LuceneIndexRebuildDeploymentStep, OrchardCore.Lucene\"', '\"$type\":\"OrchardCore.Search.Lucene.Deployment.LuceneIndexRebuildDeploymentStep, OrchardCore.Search.Lucene\"') WHERE {quotedTypeColumnName}  = 'OrchardCore.Deployment.DeploymentPlan, OrchardCore.Deployment.Abstractions'";
 
-                    updateCmd = $"UPDATE {quotedTableName} SET {quotedTypeColumnName} = 'OrchardCore.Search.Lucene.Model.LuceneIndexSettingsDocument, OrchardCore.Search.Lucene' WHERE {quotedTypeColumnName}  = 'OrchardCore.Lucene.Model.LuceneIndexSettingsDocument, OrchardCore.Lucene'";
+                await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
 
-                    await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
+                updateCmd = $"UPDATE {quotedTableName} SET {quotedTypeColumnName} = 'OrchardCore.Search.Lucene.Model.LuceneIndexSettingsDocument, OrchardCore.Search.Lucene' WHERE {quotedTypeColumnName}  = 'OrchardCore.Lucene.Model.LuceneIndexSettingsDocument, OrchardCore.Lucene'";
 
-                    await transaction.CommitAsync();
-                }
-                catch (Exception e)
-                {
-                    await transaction.RollbackAsync();
-                    logger.LogError(e, "An error occurred while updating Lucene indices settings and queries");
+                await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
 
-                    throw;
-                }
-            });
-        }
+                await transaction.CommitAsync();
+            }
+            catch (Exception e)
+            {
+                await transaction.RollbackAsync();
+                logger.LogError(e, "An error occurred while updating Lucene indices settings and queries");
+
+                throw;
+            }
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Model/LuceneContentIndexSettings.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Model/LuceneContentIndexSettings.cs
index ef7494bb135..0ee7502c240 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Model/LuceneContentIndexSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Model/LuceneContentIndexSettings.cs
@@ -1,31 +1,30 @@
 using OrchardCore.Indexing;
 
-namespace OrchardCore.Search.Lucene.Model
+namespace OrchardCore.Search.Lucene.Model;
+
+/// <summary>
+/// Represents the indexing settings for a content part or a field.
+/// </summary>
+public class LuceneContentIndexSettings : IContentIndexSettings
 {
-    /// <summary>
-    /// Represents the indexing settings for a content part or a field.
-    /// </summary>
-    public class LuceneContentIndexSettings : IContentIndexSettings
+    public bool Included { get; set; }
+    public bool Stored { get; set; }
+    public bool Keyword { get; set; }
+
+    public DocumentIndexOptions ToOptions()
     {
-        public bool Included { get; set; }
-        public bool Stored { get; set; }
-        public bool Keyword { get; set; }
+        var options = DocumentIndexOptions.None;
 
-        public DocumentIndexOptions ToOptions()
+        if (Stored)
         {
-            var options = DocumentIndexOptions.None;
-
-            if (Stored)
-            {
-                options |= DocumentIndexOptions.Store;
-            }
-
-            if (Keyword)
-            {
-                options |= DocumentIndexOptions.Keyword;
-            }
+            options |= DocumentIndexOptions.Store;
+        }
 
-            return options;
+        if (Keyword)
+        {
+            options |= DocumentIndexOptions.Keyword;
         }
+
+        return options;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Model/LuceneIndexSettings.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Model/LuceneIndexSettings.cs
index bd3f93f64ad..ae7bad3605f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Model/LuceneIndexSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Model/LuceneIndexSettings.cs
@@ -2,26 +2,25 @@
 using System.Text.Json.Serialization;
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.Search.Lucene.Model
+namespace OrchardCore.Search.Lucene.Model;
+
+public class LuceneIndexSettings
 {
-    public class LuceneIndexSettings
-    {
-        [JsonIgnore]
-        public string IndexName { get; set; }
+    [JsonIgnore]
+    public string IndexName { get; set; }
 
-        public string AnalyzerName { get; set; }
+    public string AnalyzerName { get; set; }
 
-        public bool IndexLatest { get; set; }
+    public bool IndexLatest { get; set; }
 
-        public string[] IndexedContentTypes { get; set; }
+    public string[] IndexedContentTypes { get; set; }
 
-        public string Culture { get; set; }
+    public string Culture { get; set; }
 
-        public bool StoreSourceData { get; set; }
-    }
+    public bool StoreSourceData { get; set; }
+}
 
-    public class LuceneIndexSettingsDocument : Document
-    {
-        public Dictionary<string, LuceneIndexSettings> LuceneIndexSettings { get; set; } = [];
-    }
+public class LuceneIndexSettingsDocument : Document
+{
+    public Dictionary<string, LuceneIndexSettings> LuceneIndexSettings { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Model/LuceneQueryModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Model/LuceneQueryModel.cs
index 58ee62a75e1..c323040b425 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Model/LuceneQueryModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Model/LuceneQueryModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Search.Lucene.Model
+namespace OrchardCore.Search.Lucene.Model;
+
+public class LuceneQueryModel
 {
-    public class LuceneQueryModel
-    {
-        public string IndexName { set; get; }
-        public string Query { set; get; }
-        public string Parameters { set; get; }
-    }
+    public string IndexName { set; get; }
+    public string Query { set; get; }
+    public string Parameters { set; get; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Model/LuceneSettings.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Model/LuceneSettings.cs
index d040dd82dc4..d966a361b3f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Model/LuceneSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Model/LuceneSettings.cs
@@ -1,20 +1,19 @@
 using Lucene.Net.Util;
 using OrchardCore.Contents.Indexing;
 
-namespace OrchardCore.Search.Lucene.Model
+namespace OrchardCore.Search.Lucene.Model;
+
+public class LuceneSettings
 {
-    public class LuceneSettings
-    {
-        public const string StandardAnalyzer = "standardanalyzer";
+    public const string StandardAnalyzer = "standardanalyzer";
 
-        public static readonly string[] FullTextField = [IndexingConstants.FullTextKey];
+    public static readonly string[] FullTextField = [IndexingConstants.FullTextKey];
 
-        public static readonly LuceneVersion DefaultVersion = LuceneVersion.LUCENE_48;
+    public static readonly LuceneVersion DefaultVersion = LuceneVersion.LUCENE_48;
 
-        public string SearchIndex { get; set; }
+    public string SearchIndex { get; set; }
 
-        public string[] DefaultSearchFields { get; set; } = FullTextField;
+    public string[] DefaultSearchFields { get; set; } = FullTextField;
 
-        public bool AllowLuceneQueriesInSearch { get; set; }
-    }
+    public bool AllowLuceneQueriesInSearch { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Recipes/LuceneIndexRebuildStep.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Recipes/LuceneIndexRebuildStep.cs
index 0bd2542d876..e5c1871c552 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Recipes/LuceneIndexRebuildStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Recipes/LuceneIndexRebuildStep.cs
@@ -7,50 +7,49 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Search.Lucene.Recipes
+namespace OrchardCore.Search.Lucene.Recipes;
+
+/// <summary>
+/// This recipe step rebuilds a Lucene index.
+/// </summary>
+public sealed class LuceneIndexRebuildStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step rebuilds a Lucene index.
-    /// </summary>
-    public sealed class LuceneIndexRebuildStep : IRecipeStepHandler
+    public async Task ExecuteAsync(RecipeExecutionContext context)
     {
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        if (!string.Equals(context.Name, "lucene-index-rebuild", StringComparison.OrdinalIgnoreCase))
         {
-            if (!string.Equals(context.Name, "lucene-index-rebuild", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
+            return;
+        }
 
-            var model = context.Step.ToObject<LuceneIndexRebuildStepModel>();
+        var model = context.Step.ToObject<LuceneIndexRebuildStepModel>();
 
-            if (model.IncludeAll || model.Indices.Length > 0)
+        if (model.IncludeAll || model.Indices.Length > 0)
+        {
+            await HttpBackgroundJob.ExecuteAfterEndOfRequestAsync("lucene-index-rebuild", async (scope) =>
             {
-                await HttpBackgroundJob.ExecuteAfterEndOfRequestAsync("lucene-index-rebuild", async (scope) =>
-                {
-                    var luceneIndexSettingsService = scope.ServiceProvider.GetRequiredService<LuceneIndexSettingsService>();
-                    var luceneIndexingService = scope.ServiceProvider.GetRequiredService<LuceneIndexingService>();
+                var luceneIndexSettingsService = scope.ServiceProvider.GetRequiredService<LuceneIndexSettingsService>();
+                var luceneIndexingService = scope.ServiceProvider.GetRequiredService<LuceneIndexingService>();
 
-                    var indices = model.IncludeAll
-                    ? (await luceneIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray()
-                    : model.Indices;
+                var indices = model.IncludeAll
+                ? (await luceneIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray()
+                : model.Indices;
 
-                    foreach (var indexName in indices)
+                foreach (var indexName in indices)
+                {
+                    var luceneIndexSettings = await luceneIndexSettingsService.GetSettingsAsync(indexName);
+                    if (luceneIndexSettings != null)
                     {
-                        var luceneIndexSettings = await luceneIndexSettingsService.GetSettingsAsync(indexName);
-                        if (luceneIndexSettings != null)
-                        {
-                            await luceneIndexingService.RebuildIndexAsync(indexName);
-                            await luceneIndexingService.ProcessContentItemsAsync(indexName);
-                        }
+                        await luceneIndexingService.RebuildIndexAsync(indexName);
+                        await luceneIndexingService.ProcessContentItemsAsync(indexName);
                     }
-                });
-            }
+                }
+            });
         }
+    }
 
-        private sealed class LuceneIndexRebuildStepModel
-        {
-            public bool IncludeAll { get; set; }
-            public string[] Indices { get; set; } = [];
-        }
+    private sealed class LuceneIndexRebuildStepModel
+    {
+        public bool IncludeAll { get; set; }
+        public string[] Indices { get; set; } = [];
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Recipes/LuceneIndexResetStep.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Recipes/LuceneIndexResetStep.cs
index 89e4b359ce6..cd9f9356c90 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Recipes/LuceneIndexResetStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Recipes/LuceneIndexResetStep.cs
@@ -7,58 +7,57 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Search.Lucene.Recipes
+namespace OrchardCore.Search.Lucene.Recipes;
+
+/// <summary>
+/// This recipe step resets a lucene index.
+/// </summary>
+public sealed class LuceneIndexResetStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step resets a lucene index.
-    /// </summary>
-    public sealed class LuceneIndexResetStep : IRecipeStepHandler
+    public async Task ExecuteAsync(RecipeExecutionContext context)
     {
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        if (!string.Equals(context.Name, "lucene-index-reset", StringComparison.OrdinalIgnoreCase))
         {
-            if (!string.Equals(context.Name, "lucene-index-reset", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
+            return;
+        }
 
-            var model = context.Step.ToObject<LuceneIndexResetStepModel>();
+        var model = context.Step.ToObject<LuceneIndexResetStepModel>();
 
-            if (model.IncludeAll || model.Indices.Length > 0)
+        if (model.IncludeAll || model.Indices.Length > 0)
+        {
+            await HttpBackgroundJob.ExecuteAfterEndOfRequestAsync("lucene-index-reset", async (scope) =>
             {
-                await HttpBackgroundJob.ExecuteAfterEndOfRequestAsync("lucene-index-reset", async (scope) =>
-                {
-                    var luceneIndexSettingsService = scope.ServiceProvider.GetRequiredService<LuceneIndexSettingsService>();
-                    var luceneIndexingService = scope.ServiceProvider.GetRequiredService<LuceneIndexingService>();
-                    var luceneIndexManager = scope.ServiceProvider.GetRequiredService<LuceneIndexManager>();
+                var luceneIndexSettingsService = scope.ServiceProvider.GetRequiredService<LuceneIndexSettingsService>();
+                var luceneIndexingService = scope.ServiceProvider.GetRequiredService<LuceneIndexingService>();
+                var luceneIndexManager = scope.ServiceProvider.GetRequiredService<LuceneIndexManager>();
 
-                    var indices = model.IncludeAll
-                    ? (await luceneIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray()
-                    : model.Indices;
+                var indices = model.IncludeAll
+                ? (await luceneIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray()
+                : model.Indices;
 
-                    foreach (var indexName in indices)
+                foreach (var indexName in indices)
+                {
+                    var luceneIndexSettings = await luceneIndexSettingsService.GetSettingsAsync(indexName);
+                    if (luceneIndexSettings != null)
                     {
-                        var luceneIndexSettings = await luceneIndexSettingsService.GetSettingsAsync(indexName);
-                        if (luceneIndexSettings != null)
+                        if (!luceneIndexManager.Exists(indexName))
                         {
-                            if (!luceneIndexManager.Exists(indexName))
-                            {
-                                await luceneIndexingService.CreateIndexAsync(luceneIndexSettings);
-                            }
-                            else
-                            {
-                                luceneIndexingService.ResetIndexAsync(indexName);
-                            }
-                            await luceneIndexingService.ProcessContentItemsAsync(indexName);
+                            await luceneIndexingService.CreateIndexAsync(luceneIndexSettings);
                         }
+                        else
+                        {
+                            luceneIndexingService.ResetIndexAsync(indexName);
+                        }
+                        await luceneIndexingService.ProcessContentItemsAsync(indexName);
                     }
-                });
-            }
+                }
+            });
         }
+    }
 
-        private sealed class LuceneIndexResetStepModel
-        {
-            public bool IncludeAll { get; set; }
-            public string[] Indices { get; set; } = [];
-        }
+    private sealed class LuceneIndexResetStepModel
+    {
+        public bool IncludeAll { get; set; }
+        public string[] Indices { get; set; } = [];
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Recipes/LuceneIndexStep.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Recipes/LuceneIndexStep.cs
index e1e6b1acc30..11bbe64ffa0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Recipes/LuceneIndexStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Recipes/LuceneIndexStep.cs
@@ -7,52 +7,51 @@
 using OrchardCore.Recipes.Services;
 using OrchardCore.Search.Lucene.Model;
 
-namespace OrchardCore.Search.Lucene.Recipes
+namespace OrchardCore.Search.Lucene.Recipes;
+
+/// <summary>
+/// This recipe step creates a lucene index.
+/// </summary>
+public sealed class LuceneIndexStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step creates a lucene index.
-    /// </summary>
-    public sealed class LuceneIndexStep : IRecipeStepHandler
+    private readonly LuceneIndexingService _luceneIndexingService;
+    private readonly LuceneIndexManager _luceneIndexManager;
+
+    public LuceneIndexStep(
+        LuceneIndexingService luceneIndexingService,
+        LuceneIndexManager luceneIndexManager
+        )
     {
-        private readonly LuceneIndexingService _luceneIndexingService;
-        private readonly LuceneIndexManager _luceneIndexManager;
+        _luceneIndexManager = luceneIndexManager;
+        _luceneIndexingService = luceneIndexingService;
+    }
 
-        public LuceneIndexStep(
-            LuceneIndexingService luceneIndexingService,
-            LuceneIndexManager luceneIndexManager
-            )
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "lucene-index", StringComparison.OrdinalIgnoreCase))
         {
-            _luceneIndexManager = luceneIndexManager;
-            _luceneIndexingService = luceneIndexingService;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        if (context.Step["Indices"] is not JsonArray jsonArray)
         {
-            if (!string.Equals(context.Name, "lucene-index", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
+            return;
+        }
 
-            if (context.Step["Indices"] is not JsonArray jsonArray)
-            {
-                return;
-            }
+        foreach (var index in jsonArray)
+        {
+            var luceneIndexSettings = index.ToObject<Dictionary<string, LuceneIndexSettings>>().FirstOrDefault();
 
-            foreach (var index in jsonArray)
+            if (!_luceneIndexManager.Exists(luceneIndexSettings.Key))
             {
-                var luceneIndexSettings = index.ToObject<Dictionary<string, LuceneIndexSettings>>().FirstOrDefault();
-
-                if (!_luceneIndexManager.Exists(luceneIndexSettings.Key))
-                {
-                    luceneIndexSettings.Value.IndexName = luceneIndexSettings.Key;
-                    await _luceneIndexingService.CreateIndexAsync(luceneIndexSettings.Value);
-                }
+                luceneIndexSettings.Value.IndexName = luceneIndexSettings.Key;
+                await _luceneIndexingService.CreateIndexAsync(luceneIndexSettings.Value);
             }
         }
     }
+}
 
-    public sealed class ContentStepModel
-    {
-        public JsonObject Data { get; set; }
-    }
+public sealed class ContentStepModel
+{
+    public JsonObject Data { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/IndexingBackgroundTask.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/IndexingBackgroundTask.cs
index e31971be76e..91698ffe5f3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/IndexingBackgroundTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/IndexingBackgroundTask.cs
@@ -4,24 +4,23 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.BackgroundTasks;
 
-namespace OrchardCore.Search.Lucene
+namespace OrchardCore.Search.Lucene;
+
+/// <summary>
+/// This background task will index content items using Lucene.
+/// </summary>
+/// <remarks>
+/// This services is only registered from OrchardCore.Search.Lucene.Worker feature.
+/// </remarks>
+[BackgroundTask(
+    Title = "Lucene Indexes Updater",
+    Schedule = "* * * * *",
+    Description = "Updates lucene indexes.")]
+public sealed class IndexingBackgroundTask : IBackgroundTask
 {
-    /// <summary>
-    /// This background task will index content items using Lucene.
-    /// </summary>
-    /// <remarks>
-    /// This services is only registered from OrchardCore.Search.Lucene.Worker feature.
-    /// </remarks>
-    [BackgroundTask(
-        Title = "Lucene Indexes Updater",
-        Schedule = "* * * * *",
-        Description = "Updates lucene indexes.")]
-    public sealed class IndexingBackgroundTask : IBackgroundTask
+    public Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken)
     {
-        public Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken)
-        {
-            var indexingService = serviceProvider.GetService<LuceneIndexingService>();
-            return indexingService.ProcessContentItemsAsync();
-        }
+        var indexingService = serviceProvider.GetService<LuceneIndexingService>();
+        return indexingService.ProcessContentItemsAsync();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneAnalyzer.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneAnalyzer.cs
index 1ab4662d7d3..645c732b8d6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneAnalyzer.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneAnalyzer.cs
@@ -1,26 +1,25 @@
 using System;
 using Lucene.Net.Analysis;
 
-namespace OrchardCore.Search.Lucene.Services
+namespace OrchardCore.Search.Lucene.Services;
+
+public class LuceneAnalyzer : ILuceneAnalyzer
 {
-    public class LuceneAnalyzer : ILuceneAnalyzer
-    {
-        private readonly Func<Analyzer> _factory;
+    private readonly Func<Analyzer> _factory;
 
-        public LuceneAnalyzer(string name, Func<Analyzer> factory)
-        {
-            _factory = factory;
-            Name = name;
-        }
+    public LuceneAnalyzer(string name, Func<Analyzer> factory)
+    {
+        _factory = factory;
+        Name = name;
+    }
 
-        public LuceneAnalyzer(string name, Analyzer instance) : this(name, () => instance)
-        {
-        }
+    public LuceneAnalyzer(string name, Analyzer instance) : this(name, () => instance)
+    {
+    }
 
-        public string Name { get; }
-        public Analyzer CreateAnalyzer()
-        {
-            return _factory();
-        }
+    public string Name { get; }
+    public Analyzer CreateAnalyzer()
+    {
+        return _factory();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneAnalyzerManager.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneAnalyzerManager.cs
index 55135882eb2..307dd58d997 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneAnalyzerManager.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneAnalyzerManager.cs
@@ -3,39 +3,38 @@
 using Lucene.Net.Analysis;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Search.Lucene.Services
+namespace OrchardCore.Search.Lucene.Services;
+
+/// <summary>
+/// Coordinates <see cref="ILuceneAnalyzer"/> implementations provided by <see cref="LuceneOptions"/>
+/// to return the list of all available <see cref="ILuceneAnalyzer"/> objects.
+/// </summary>
+public class LuceneAnalyzerManager
 {
-    /// <summary>
-    /// Coordinates <see cref="ILuceneAnalyzer"/> implementations provided by <see cref="LuceneOptions"/>
-    /// to return the list of all available <see cref="ILuceneAnalyzer"/> objects.
-    /// </summary>
-    public class LuceneAnalyzerManager
+    private readonly Dictionary<string, ILuceneAnalyzer> _analyzers;
+
+    public LuceneAnalyzerManager(IOptions<LuceneOptions> options)
     {
-        private readonly Dictionary<string, ILuceneAnalyzer> _analyzers;
+        _analyzers = new Dictionary<string, ILuceneAnalyzer>(StringComparer.OrdinalIgnoreCase);
 
-        public LuceneAnalyzerManager(IOptions<LuceneOptions> options)
+        foreach (var analyzer in options.Value.Analyzers)
         {
-            _analyzers = new Dictionary<string, ILuceneAnalyzer>(StringComparer.OrdinalIgnoreCase);
-
-            foreach (var analyzer in options.Value.Analyzers)
-            {
-                _analyzers[analyzer.Name] = analyzer;
-            }
+            _analyzers[analyzer.Name] = analyzer;
         }
+    }
 
-        public IEnumerable<ILuceneAnalyzer> GetAnalyzers()
-        {
-            return _analyzers.Values;
-        }
+    public IEnumerable<ILuceneAnalyzer> GetAnalyzers()
+    {
+        return _analyzers.Values;
+    }
 
-        public Analyzer CreateAnalyzer(string name)
+    public Analyzer CreateAnalyzer(string name)
+    {
+        if (_analyzers.TryGetValue(name, out var analyzer))
         {
-            if (_analyzers.TryGetValue(name, out var analyzer))
-            {
-                return analyzer.CreateAnalyzer();
-            }
-
-            return null;
+            return analyzer.CreateAnalyzer();
         }
+
+        return null;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneContentPickerResultProvider.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneContentPickerResultProvider.cs
index 18592a9f90c..adeceb4d997 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneContentPickerResultProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneContentPickerResultProvider.cs
@@ -7,70 +7,69 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Search.Lucene.Settings;
 
-namespace OrchardCore.Search.Lucene.Services
+namespace OrchardCore.Search.Lucene.Services;
+
+public class LuceneContentPickerResultProvider : IContentPickerResultProvider
 {
-    public class LuceneContentPickerResultProvider : IContentPickerResultProvider
+    private readonly LuceneIndexManager _luceneIndexManager;
+
+    public LuceneContentPickerResultProvider(LuceneIndexManager luceneIndexManager)
+    {
+        _luceneIndexManager = luceneIndexManager;
+    }
+
+    public string Name => "Lucene";
+
+    public async Task<IEnumerable<ContentPickerResult>> Search(ContentPickerSearchContext searchContext)
     {
-        private readonly LuceneIndexManager _luceneIndexManager;
+        var indexName = "Search";
 
-        public LuceneContentPickerResultProvider(LuceneIndexManager luceneIndexManager)
+        var fieldSettings = searchContext.PartFieldDefinition?.GetSettings<ContentPickerFieldLuceneEditorSettings>();
+
+        if (!string.IsNullOrWhiteSpace(fieldSettings?.Index))
         {
-            _luceneIndexManager = luceneIndexManager;
+            indexName = fieldSettings.Index;
         }
 
-        public string Name => "Lucene";
-
-        public async Task<IEnumerable<ContentPickerResult>> Search(ContentPickerSearchContext searchContext)
+        if (!_luceneIndexManager.Exists(indexName))
         {
-            var indexName = "Search";
+            return [];
+        }
 
-            var fieldSettings = searchContext.PartFieldDefinition?.GetSettings<ContentPickerFieldLuceneEditorSettings>();
+        var results = new List<ContentPickerResult>();
 
-            if (!string.IsNullOrWhiteSpace(fieldSettings?.Index))
-            {
-                indexName = fieldSettings.Index;
-            }
+        await _luceneIndexManager.SearchAsync(indexName, searcher =>
+        {
+            Query query = null;
 
-            if (!_luceneIndexManager.Exists(indexName))
+            if (string.IsNullOrWhiteSpace(searchContext.Query))
             {
-                return [];
+                query = new MatchAllDocsQuery();
             }
-
-            var results = new List<ContentPickerResult>();
-
-            await _luceneIndexManager.SearchAsync(indexName, searcher =>
+            else
             {
-                Query query = null;
+                query = new WildcardQuery(new Term("Content.ContentItem.DisplayText.Normalized", searchContext.Query.ToLowerInvariant() + "*"));
+            }
 
-                if (string.IsNullOrWhiteSpace(searchContext.Query))
-                {
-                    query = new MatchAllDocsQuery();
-                }
-                else
-                {
-                    query = new WildcardQuery(new Term("Content.ContentItem.DisplayText.Normalized", searchContext.Query.ToLowerInvariant() + "*"));
-                }
+            var filter = new FieldCacheTermsFilter("Content.ContentItem.ContentType", searchContext.ContentTypes.ToArray());
 
-                var filter = new FieldCacheTermsFilter("Content.ContentItem.ContentType", searchContext.ContentTypes.ToArray());
+            var docs = searcher.Search(query, filter, 50, Sort.RELEVANCE);
 
-                var docs = searcher.Search(query, filter, 50, Sort.RELEVANCE);
+            foreach (var hit in docs.ScoreDocs)
+            {
+                var doc = searcher.Doc(hit.Doc);
 
-                foreach (var hit in docs.ScoreDocs)
+                results.Add(new ContentPickerResult
                 {
-                    var doc = searcher.Doc(hit.Doc);
-
-                    results.Add(new ContentPickerResult
-                    {
-                        ContentItemId = doc.GetField("ContentItemId").GetStringValue(),
-                        DisplayText = doc.GetField("Content.ContentItem.DisplayText.keyword").GetStringValue(),
-                        HasPublished = doc.GetField("Content.ContentItem.Published").GetStringValue().Equals("true", StringComparison.OrdinalIgnoreCase),
-                    });
-                }
+                    ContentItemId = doc.GetField("ContentItemId").GetStringValue(),
+                    DisplayText = doc.GetField("Content.ContentItem.DisplayText.keyword").GetStringValue(),
+                    HasPublished = doc.GetField("Content.ContentItem.Published").GetStringValue().Equals("true", StringComparison.OrdinalIgnoreCase),
+                });
+            }
 
-                return Task.CompletedTask;
-            });
+            return Task.CompletedTask;
+        });
 
-            return results.OrderBy(x => x.DisplayText);
-        }
+        return results.OrderBy(x => x.DisplayText);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexInitializerService.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexInitializerService.cs
index daa6e929e0f..4267358de11 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexInitializerService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexInitializerService.cs
@@ -4,41 +4,40 @@
 using OrchardCore.Environment.Shell.Scope;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Search.Lucene
+namespace OrchardCore.Search.Lucene;
+
+public class LuceneIndexInitializerService : ModularTenantEvents
 {
-    public class LuceneIndexInitializerService : ModularTenantEvents
-    {
-        private readonly ShellSettings _shellSettings;
+    private readonly ShellSettings _shellSettings;
 
-        public LuceneIndexInitializerService(ShellSettings shellSettings)
-        {
-            _shellSettings = shellSettings;
-        }
+    public LuceneIndexInitializerService(ShellSettings shellSettings)
+    {
+        _shellSettings = shellSettings;
+    }
 
-        public override Task ActivatedAsync()
+    public override Task ActivatedAsync()
+    {
+        if (_shellSettings.IsRunning())
         {
-            if (_shellSettings.IsRunning())
+            ShellScope.AddDeferredTask(async scope =>
             {
-                ShellScope.AddDeferredTask(async scope =>
-                {
-                    var luceneIndexSettingsService = scope.ServiceProvider.GetRequiredService<LuceneIndexSettingsService>();
-                    var luceneIndexingService = scope.ServiceProvider.GetRequiredService<LuceneIndexingService>();
-                    var indexManager = scope.ServiceProvider.GetRequiredService<LuceneIndexManager>();
+                var luceneIndexSettingsService = scope.ServiceProvider.GetRequiredService<LuceneIndexSettingsService>();
+                var luceneIndexingService = scope.ServiceProvider.GetRequiredService<LuceneIndexingService>();
+                var indexManager = scope.ServiceProvider.GetRequiredService<LuceneIndexManager>();
 
-                    var luceneIndexSettings = await luceneIndexSettingsService.GetSettingsAsync();
+                var luceneIndexSettings = await luceneIndexSettingsService.GetSettingsAsync();
 
-                    foreach (var settings in luceneIndexSettings)
+                foreach (var settings in luceneIndexSettings)
+                {
+                    if (!indexManager.Exists(settings.IndexName))
                     {
-                        if (!indexManager.Exists(settings.IndexName))
-                        {
-                            await luceneIndexingService.CreateIndexAsync(settings);
-                            await luceneIndexingService.ProcessContentItemsAsync(settings.IndexName);
-                        }
+                        await luceneIndexingService.CreateIndexAsync(settings);
+                        await luceneIndexingService.ProcessContentItemsAsync(settings.IndexName);
                     }
-                });
-            }
-
-            return Task.CompletedTask;
+                }
+            });
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexManager.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexManager.cs
index 50d1c3434db..5617a9d330b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexManager.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexManager.cs
@@ -24,564 +24,563 @@
 using LDirectory = Lucene.Net.Store.Directory;
 using LuceneLock = Lucene.Net.Store.Lock;
 
-namespace OrchardCore.Search.Lucene
+namespace OrchardCore.Search.Lucene;
+
+/// <summary>
+/// Provides methods to manage physical Lucene indices.
+/// This class is provided as a singleton to that the index searcher can be reused across requests.
+/// </summary>
+public class LuceneIndexManager : IDisposable
 {
-    /// <summary>
-    /// Provides methods to manage physical Lucene indices.
-    /// This class is provided as a singleton to that the index searcher can be reused across requests.
-    /// </summary>
-    public class LuceneIndexManager : IDisposable
+    private readonly IClock _clock;
+    private readonly ILogger _logger;
+    private readonly string _rootPath;
+    private bool _disposed;
+    private readonly ConcurrentDictionary<string, IndexReaderPool> _indexPools = new(StringComparer.OrdinalIgnoreCase);
+    private readonly ConcurrentDictionary<string, IndexWriterWrapper> _writers = new(StringComparer.OrdinalIgnoreCase);
+    private readonly ConcurrentDictionary<string, DateTime> _timestamps = new(StringComparer.OrdinalIgnoreCase);
+    private readonly LuceneAnalyzerManager _luceneAnalyzerManager;
+    private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
+    private readonly SpatialContext _ctx;
+    private readonly GeohashPrefixTree _grid;
+    private readonly static object _synLock = new();
+
+    public LuceneIndexManager(
+        IClock clock,
+        IOptions<ShellOptions> shellOptions,
+        ShellSettings shellSettings,
+        ILogger<LuceneIndexManager> logger,
+        LuceneAnalyzerManager luceneAnalyzerManager,
+        LuceneIndexSettingsService luceneIndexSettingsService
+        )
     {
-        private readonly IClock _clock;
-        private readonly ILogger _logger;
-        private readonly string _rootPath;
-        private bool _disposed;
-        private readonly ConcurrentDictionary<string, IndexReaderPool> _indexPools = new(StringComparer.OrdinalIgnoreCase);
-        private readonly ConcurrentDictionary<string, IndexWriterWrapper> _writers = new(StringComparer.OrdinalIgnoreCase);
-        private readonly ConcurrentDictionary<string, DateTime> _timestamps = new(StringComparer.OrdinalIgnoreCase);
-        private readonly LuceneAnalyzerManager _luceneAnalyzerManager;
-        private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
-        private readonly SpatialContext _ctx;
-        private readonly GeohashPrefixTree _grid;
-        private readonly static object _synLock = new();
-
-        public LuceneIndexManager(
-            IClock clock,
-            IOptions<ShellOptions> shellOptions,
-            ShellSettings shellSettings,
-            ILogger<LuceneIndexManager> logger,
-            LuceneAnalyzerManager luceneAnalyzerManager,
-            LuceneIndexSettingsService luceneIndexSettingsService
-            )
-        {
-            _clock = clock;
-            _logger = logger;
-            _rootPath = PathExtensions.Combine(
-                shellOptions.Value.ShellsApplicationDataPath,
-                shellOptions.Value.ShellsContainerName,
-                shellSettings.Name, "Lucene");
-            Directory.CreateDirectory(_rootPath);
-            _luceneAnalyzerManager = luceneAnalyzerManager;
-            _luceneIndexSettingsService = luceneIndexSettingsService;
-
-            // Typical geospatial context.
-            // These can also be constructed from SpatialContextFactory.
-            _ctx = SpatialContext.Geo;
-
-            var maxLevels = 11; // Results in sub-meter precision for geohash.
-
-            // TODO demo lookup by detail distance.
-            // This can also be constructed from SpatialPrefixTreeFactory.
-            _grid = new GeohashPrefixTree(_ctx, maxLevels);
-        }
+        _clock = clock;
+        _logger = logger;
+        _rootPath = PathExtensions.Combine(
+            shellOptions.Value.ShellsApplicationDataPath,
+            shellOptions.Value.ShellsContainerName,
+            shellSettings.Name, "Lucene");
+        Directory.CreateDirectory(_rootPath);
+        _luceneAnalyzerManager = luceneAnalyzerManager;
+        _luceneIndexSettingsService = luceneIndexSettingsService;
+
+        // Typical geospatial context.
+        // These can also be constructed from SpatialContextFactory.
+        _ctx = SpatialContext.Geo;
+
+        var maxLevels = 11; // Results in sub-meter precision for geohash.
+
+        // TODO demo lookup by detail distance.
+        // This can also be constructed from SpatialPrefixTreeFactory.
+        _grid = new GeohashPrefixTree(_ctx, maxLevels);
+    }
 
-        public async Task CreateIndexAsync(string indexName)
-        {
-            await WriteAsync(indexName, _ => { }, true);
-        }
+    public async Task CreateIndexAsync(string indexName)
+    {
+        await WriteAsync(indexName, _ => { }, true);
+    }
 
-        public async Task DeleteDocumentsAsync(string indexName, IEnumerable<string> contentItemIds)
+    public async Task DeleteDocumentsAsync(string indexName, IEnumerable<string> contentItemIds)
+    {
+        await WriteAsync(indexName, writer =>
         {
-            await WriteAsync(indexName, writer =>
-            {
-                writer.DeleteDocuments(contentItemIds.Select(x => new Term("ContentItemId", x)).ToArray());
+            writer.DeleteDocuments(contentItemIds.Select(x => new Term("ContentItemId", x)).ToArray());
 
-                writer.Commit();
+            writer.Commit();
 
-                if (_indexPools.TryRemove(indexName, out var pool))
-                {
-                    pool.MakeDirty();
-                    pool.Release();
-                }
-            });
-        }
+            if (_indexPools.TryRemove(indexName, out var pool))
+            {
+                pool.MakeDirty();
+                pool.Release();
+            }
+        });
+    }
 
-        public void DeleteIndex(string indexName)
+    public void DeleteIndex(string indexName)
+    {
+        lock (this)
         {
-            lock (this)
+            if (_writers.TryGetValue(indexName, out var writer))
             {
-                if (_writers.TryGetValue(indexName, out var writer))
-                {
-                    writer.IsClosing = true;
-                    writer.Dispose();
-                }
+                writer.IsClosing = true;
+                writer.Dispose();
+            }
 
-                if (_indexPools.TryRemove(indexName, out var reader))
-                {
-                    reader.Dispose();
-                }
+            if (_indexPools.TryRemove(indexName, out var reader))
+            {
+                reader.Dispose();
+            }
 
-                _timestamps.TryRemove(indexName, out _);
+            _timestamps.TryRemove(indexName, out _);
 
-                var indexFolder = PathExtensions.Combine(_rootPath, indexName);
+            var indexFolder = PathExtensions.Combine(_rootPath, indexName);
 
-                if (Directory.Exists(indexFolder))
+            if (Directory.Exists(indexFolder))
+            {
+                try
                 {
-                    try
-                    {
-                        Directory.Delete(indexFolder, true);
-                    }
-                    catch { }
+                    Directory.Delete(indexFolder, true);
                 }
-
-                _writers.TryRemove(indexName, out _);
+                catch { }
             }
+
+            _writers.TryRemove(indexName, out _);
         }
+    }
 
-        public bool Exists(string indexName)
+    public bool Exists(string indexName)
+    {
+        if (string.IsNullOrWhiteSpace(indexName))
         {
-            if (string.IsNullOrWhiteSpace(indexName))
-            {
-                return false;
-            }
-
-            return Directory.Exists(PathExtensions.Combine(_rootPath, indexName));
+            return false;
         }
 
-        public async Task StoreDocumentsAsync(string indexName, IEnumerable<DocumentIndex> indexDocuments)
-        {
-            var luceneIndexSettings = await _luceneIndexSettingsService.GetSettingsAsync(indexName);
+        return Directory.Exists(PathExtensions.Combine(_rootPath, indexName));
+    }
 
-            await WriteAsync(indexName, writer =>
+    public async Task StoreDocumentsAsync(string indexName, IEnumerable<DocumentIndex> indexDocuments)
+    {
+        var luceneIndexSettings = await _luceneIndexSettingsService.GetSettingsAsync(indexName);
+
+        await WriteAsync(indexName, writer =>
+        {
+            foreach (var indexDocument in indexDocuments)
             {
-                foreach (var indexDocument in indexDocuments)
-                {
-                    writer.AddDocument(CreateLuceneDocument(indexDocument, luceneIndexSettings));
-                }
+                writer.AddDocument(CreateLuceneDocument(indexDocument, luceneIndexSettings));
+            }
 
-                writer.Commit();
+            writer.Commit();
 
-                if (_indexPools.TryRemove(indexName, out var pool))
-                {
-                    pool.MakeDirty();
-                    pool.Release();
-                }
-            });
-        }
+            if (_indexPools.TryRemove(indexName, out var pool))
+            {
+                pool.MakeDirty();
+                pool.Release();
+            }
+        });
+    }
 
-        public async Task SearchAsync(string indexName, Func<IndexSearcher, Task> searcher)
+    public async Task SearchAsync(string indexName, Func<IndexSearcher, Task> searcher)
+    {
+        if (Exists(indexName))
         {
-            if (Exists(indexName))
+            using (var reader = GetReader(indexName))
             {
-                using (var reader = GetReader(indexName))
-                {
-                    var indexSearcher = new IndexSearcher(reader.IndexReader);
-                    await searcher(indexSearcher);
-                }
-
-                _timestamps[indexName] = _clock.UtcNow;
+                var indexSearcher = new IndexSearcher(reader.IndexReader);
+                await searcher(indexSearcher);
             }
+
+            _timestamps[indexName] = _clock.UtcNow;
         }
+    }
 
-        public void Read(string indexName, Action<IndexReader> reader)
+    public void Read(string indexName, Action<IndexReader> reader)
+    {
+        if (Exists(indexName))
         {
-            if (Exists(indexName))
+            using (var indexReader = GetReader(indexName))
             {
-                using (var indexReader = GetReader(indexName))
-                {
-                    reader(indexReader.IndexReader);
-                }
-
-                _timestamps[indexName] = _clock.UtcNow;
+                reader(indexReader.IndexReader);
             }
+
+            _timestamps[indexName] = _clock.UtcNow;
         }
+    }
 
-        private Document CreateLuceneDocument(DocumentIndex documentIndex, LuceneIndexSettings indexSettings)
+    private Document CreateLuceneDocument(DocumentIndex documentIndex, LuceneIndexSettings indexSettings)
+    {
+        var doc = new Document
         {
-            var doc = new Document
-            {
-                // Always store the content item id and version id.
-                // These fields need to be indexed as a StringField because it needs to be searchable for the writer.DeleteDocuments method.
-                // Else it won't be able to prune oldest draft from the indexes.
-                // Maybe eventually find a way to remove a document from a StoredDocument.
-                new StringField(IndexingConstants.ContentItemIdKey, documentIndex.ContentItemId.ToString(), Field.Store.YES),
-                new StringField(IndexingConstants.ContentItemVersionIdKey, documentIndex.ContentItemVersionId.ToString(), Field.Store.YES),
-            };
-
-            if (indexSettings.StoreSourceData)
-            {
-                doc.Add(new StoredField(IndexingConstants.SourceKey + IndexingConstants.ContentItemIdKey, documentIndex.ContentItemId.ToString()));
-                doc.Add(new StoredField(IndexingConstants.SourceKey + IndexingConstants.ContentItemVersionIdKey, documentIndex.ContentItemVersionId.ToString()));
-            }
+            // Always store the content item id and version id.
+            // These fields need to be indexed as a StringField because it needs to be searchable for the writer.DeleteDocuments method.
+            // Else it won't be able to prune oldest draft from the indexes.
+            // Maybe eventually find a way to remove a document from a StoredDocument.
+            new StringField(IndexingConstants.ContentItemIdKey, documentIndex.ContentItemId.ToString(), Field.Store.YES),
+            new StringField(IndexingConstants.ContentItemVersionIdKey, documentIndex.ContentItemVersionId.ToString(), Field.Store.YES),
+        };
+
+        if (indexSettings.StoreSourceData)
+        {
+            doc.Add(new StoredField(IndexingConstants.SourceKey + IndexingConstants.ContentItemIdKey, documentIndex.ContentItemId.ToString()));
+            doc.Add(new StoredField(IndexingConstants.SourceKey + IndexingConstants.ContentItemVersionIdKey, documentIndex.ContentItemVersionId.ToString()));
+        }
 
-            foreach (var entry in documentIndex.Entries)
+        foreach (var entry in documentIndex.Entries)
+        {
+            var store = entry.Options.HasFlag(DocumentIndexOptions.Store)
+                        ? Field.Store.YES
+                        : Field.Store.NO;
+
+            switch (entry.Type)
             {
-                var store = entry.Options.HasFlag(DocumentIndexOptions.Store)
-                            ? Field.Store.YES
-                            : Field.Store.NO;
+                case DocumentIndex.Types.Boolean:
+                    // Store "true"/"false" for boolean.
+                    doc.Add(new StringField(entry.Name, Convert.ToString(entry.Value).ToLowerInvariant(), store));
 
-                switch (entry.Type)
-                {
-                    case DocumentIndex.Types.Boolean:
-                        // Store "true"/"false" for boolean.
-                        doc.Add(new StringField(entry.Name, Convert.ToString(entry.Value).ToLowerInvariant(), store));
+                    if (indexSettings.StoreSourceData)
+                    {
+                        doc.Add(new StoredField(IndexingConstants.SourceKey + entry.Name, Convert.ToString(entry.Value).ToLowerInvariant()));
+                    }
+                    break;
 
-                        if (indexSettings.StoreSourceData)
+                case DocumentIndex.Types.DateTime:
+                    if (entry.Value != null)
+                    {
+                        if (entry.Value is DateTimeOffset)
+                        {
+                            doc.Add(new StringField(entry.Name, DateTools.DateToString(((DateTimeOffset)entry.Value).UtcDateTime, DateResolution.SECOND), store));
+                        }
+                        else
                         {
-                            doc.Add(new StoredField(IndexingConstants.SourceKey + entry.Name, Convert.ToString(entry.Value).ToLowerInvariant()));
+                            doc.Add(new StringField(entry.Name, DateTools.DateToString(((DateTime)entry.Value).ToUniversalTime(), DateResolution.SECOND), store));
                         }
-                        break;
 
-                    case DocumentIndex.Types.DateTime:
-                        if (entry.Value != null)
+                        if (indexSettings.StoreSourceData)
                         {
                             if (entry.Value is DateTimeOffset)
                             {
-                                doc.Add(new StringField(entry.Name, DateTools.DateToString(((DateTimeOffset)entry.Value).UtcDateTime, DateResolution.SECOND), store));
+                                doc.Add(new StoredField(IndexingConstants.SourceKey + entry.Name, DateTools.DateToString(((DateTimeOffset)entry.Value).UtcDateTime, DateResolution.SECOND)));
                             }
                             else
                             {
-                                doc.Add(new StringField(entry.Name, DateTools.DateToString(((DateTime)entry.Value).ToUniversalTime(), DateResolution.SECOND), store));
-                            }
-
-                            if (indexSettings.StoreSourceData)
-                            {
-                                if (entry.Value is DateTimeOffset)
-                                {
-                                    doc.Add(new StoredField(IndexingConstants.SourceKey + entry.Name, DateTools.DateToString(((DateTimeOffset)entry.Value).UtcDateTime, DateResolution.SECOND)));
-                                }
-                                else
-                                {
-                                    doc.Add(new StoredField(IndexingConstants.SourceKey + entry.Name, DateTools.DateToString(((DateTime)entry.Value).ToUniversalTime(), DateResolution.SECOND)));
-                                }
+                                doc.Add(new StoredField(IndexingConstants.SourceKey + entry.Name, DateTools.DateToString(((DateTime)entry.Value).ToUniversalTime(), DateResolution.SECOND)));
                             }
                         }
-                        else
+                    }
+                    else
+                    {
+                        doc.Add(new StringField(entry.Name, IndexingConstants.NullValue, store));
+                    }
+                    break;
+
+                case DocumentIndex.Types.Integer:
+                    if (entry.Value != null && long.TryParse(entry.Value.ToString(), out var value))
+                    {
+                        doc.Add(new Int64Field(entry.Name, value, store));
+
+                        if (indexSettings.StoreSourceData)
                         {
-                            doc.Add(new StringField(entry.Name, IndexingConstants.NullValue, store));
+                            doc.Add(new StoredField(IndexingConstants.SourceKey + entry.Name, value));
                         }
-                        break;
+                    }
+                    else
+                    {
+                        doc.Add(new StringField(entry.Name, IndexingConstants.NullValue, store));
+                    }
 
-                    case DocumentIndex.Types.Integer:
-                        if (entry.Value != null && long.TryParse(entry.Value.ToString(), out var value))
-                        {
-                            doc.Add(new Int64Field(entry.Name, value, store));
+                    break;
 
-                            if (indexSettings.StoreSourceData)
-                            {
-                                doc.Add(new StoredField(IndexingConstants.SourceKey + entry.Name, value));
-                            }
-                        }
-                        else
+                case DocumentIndex.Types.Number:
+                    if (entry.Value != null)
+                    {
+                        doc.Add(new DoubleField(entry.Name, Convert.ToDouble(entry.Value), store));
+
+                        if (indexSettings.StoreSourceData)
                         {
-                            doc.Add(new StringField(entry.Name, IndexingConstants.NullValue, store));
+                            doc.Add(new StoredField(IndexingConstants.SourceKey + entry.Name, Convert.ToDouble(entry.Value)));
                         }
+                    }
+                    else
+                    {
+                        doc.Add(new StringField(entry.Name, IndexingConstants.NullValue, store));
+                    }
+                    break;
 
-                        break;
+                case DocumentIndex.Types.Text:
+                    if (entry.Value != null && !string.IsNullOrEmpty(Convert.ToString(entry.Value)))
+                    {
+                        var stringValue = Convert.ToString(entry.Value);
 
-                    case DocumentIndex.Types.Number:
-                        if (entry.Value != null)
+                        if (entry.Options.HasFlag(DocumentIndexOptions.Keyword))
                         {
-                            doc.Add(new DoubleField(entry.Name, Convert.ToDouble(entry.Value), store));
-
-                            if (indexSettings.StoreSourceData)
-                            {
-                                doc.Add(new StoredField(IndexingConstants.SourceKey + entry.Name, Convert.ToDouble(entry.Value)));
-                            }
+                            doc.Add(new StringField(entry.Name, stringValue, store));
                         }
                         else
                         {
-                            doc.Add(new StringField(entry.Name, IndexingConstants.NullValue, store));
+                            doc.Add(new TextField(entry.Name, stringValue, store));
                         }
-                        break;
 
-                    case DocumentIndex.Types.Text:
-                        if (entry.Value != null && !string.IsNullOrEmpty(Convert.ToString(entry.Value)))
+                        // This is for ElasticSearch Queries compatibility since a keyword field is always indexed
+                        // by default when indexing without explicit mapping in ElasticSearch.
+                        // Keyword ignore above 256 chars by default.
+                        if (store == Field.Store.NO && !entry.Options.HasFlag(DocumentIndexOptions.Keyword) && stringValue.Length <= 256)
                         {
-                            var stringValue = Convert.ToString(entry.Value);
-
-                            if (entry.Options.HasFlag(DocumentIndexOptions.Keyword))
-                            {
-                                doc.Add(new StringField(entry.Name, stringValue, store));
-                            }
-                            else
-                            {
-                                doc.Add(new TextField(entry.Name, stringValue, store));
-                            }
-
-                            // This is for ElasticSearch Queries compatibility since a keyword field is always indexed
-                            // by default when indexing without explicit mapping in ElasticSearch.
-                            // Keyword ignore above 256 chars by default.
-                            if (store == Field.Store.NO && !entry.Options.HasFlag(DocumentIndexOptions.Keyword) && stringValue.Length <= 256)
-                            {
-                                doc.Add(new StringField($"{entry.Name}.keyword", stringValue, Field.Store.NO));
-                            }
+                            doc.Add(new StringField($"{entry.Name}.keyword", stringValue, Field.Store.NO));
+                        }
 
-                            if (indexSettings.StoreSourceData)
-                            {
-                                doc.Add(new StoredField(IndexingConstants.SourceKey + entry.Name, stringValue));
-                            }
+                        if (indexSettings.StoreSourceData)
+                        {
+                            doc.Add(new StoredField(IndexingConstants.SourceKey + entry.Name, stringValue));
+                        }
+                    }
+                    else
+                    {
+                        if (entry.Options.HasFlag(DocumentIndexOptions.Keyword))
+                        {
+                            doc.Add(new StringField(entry.Name, IndexingConstants.NullValue, store));
                         }
                         else
                         {
-                            if (entry.Options.HasFlag(DocumentIndexOptions.Keyword))
-                            {
-                                doc.Add(new StringField(entry.Name, IndexingConstants.NullValue, store));
-                            }
-                            else
-                            {
-                                doc.Add(new TextField(entry.Name, IndexingConstants.NullValue, store));
-                            }
+                            doc.Add(new TextField(entry.Name, IndexingConstants.NullValue, store));
                         }
-                        break;
+                    }
+                    break;
 
-                    case DocumentIndex.Types.GeoPoint:
-                        var strategy = new RecursivePrefixTreeStrategy(_grid, entry.Name);
+                case DocumentIndex.Types.GeoPoint:
+                    var strategy = new RecursivePrefixTreeStrategy(_grid, entry.Name);
 
-                        if (entry.Value != null && entry.Value is DocumentIndex.GeoPoint point)
+                    if (entry.Value != null && entry.Value is DocumentIndex.GeoPoint point)
+                    {
+                        var geoPoint = _ctx.MakePoint((double)point.Longitude, (double)point.Latitude);
+                        foreach (var field in strategy.CreateIndexableFields(geoPoint))
                         {
-                            var geoPoint = _ctx.MakePoint((double)point.Longitude, (double)point.Latitude);
-                            foreach (var field in strategy.CreateIndexableFields(geoPoint))
-                            {
-                                doc.Add(field);
-                            }
+                            doc.Add(field);
+                        }
 
-                            doc.Add(new StoredField(strategy.FieldName, $"{point.Latitude},{point.Longitude}"));
+                        doc.Add(new StoredField(strategy.FieldName, $"{point.Latitude},{point.Longitude}"));
 
-                            if (indexSettings.StoreSourceData)
-                            {
-                                doc.Add(new StoredField(IndexingConstants.SourceKey + strategy.FieldName, $"{point.Latitude},{point.Longitude}"));
-                            }
-                        }
-                        else
+                        if (indexSettings.StoreSourceData)
                         {
-                            doc.Add(new StoredField(strategy.FieldName, IndexingConstants.NullValue));
+                            doc.Add(new StoredField(IndexingConstants.SourceKey + strategy.FieldName, $"{point.Latitude},{point.Longitude}"));
                         }
-                        break;
-                }
+                    }
+                    else
+                    {
+                        doc.Add(new StoredField(strategy.FieldName, IndexingConstants.NullValue));
+                    }
+                    break;
             }
-
-            return doc;
         }
 
-        private FSDirectory CreateDirectory(string indexName)
+        return doc;
+    }
+
+    private FSDirectory CreateDirectory(string indexName)
+    {
+        lock (this)
         {
-            lock (this)
-            {
-                var path = new DirectoryInfo(PathExtensions.Combine(_rootPath, indexName));
+            var path = new DirectoryInfo(PathExtensions.Combine(_rootPath, indexName));
 
-                if (!path.Exists)
-                {
-                    path.Create();
-                }
+            if (!path.Exists)
+            {
+                path.Create();
+            }
 
-                // Lucene is not thread safe on this call.
-                lock (_synLock)
-                {
-                    return FSDirectory.Open(path);
-                }
+            // Lucene is not thread safe on this call.
+            lock (_synLock)
+            {
+                return FSDirectory.Open(path);
             }
         }
+    }
 
-        private async Task WriteAsync(string indexName, Action<IndexWriter> action, bool close = false)
+    private async Task WriteAsync(string indexName, Action<IndexWriter> action, bool close = false)
+    {
+        if (!_writers.TryGetValue(indexName, out var writer))
         {
-            if (!_writers.TryGetValue(indexName, out var writer))
+            var indexAnalyzer = await _luceneIndexSettingsService.LoadIndexAnalyzerAsync(indexName);
+            lock (this)
             {
-                var indexAnalyzer = await _luceneIndexSettingsService.LoadIndexAnalyzerAsync(indexName);
-                lock (this)
+                if (!_writers.TryGetValue(indexName, out writer))
                 {
-                    if (!_writers.TryGetValue(indexName, out writer))
+                    var directory = CreateDirectory(indexName);
+                    var analyzer = _luceneAnalyzerManager.CreateAnalyzer(indexAnalyzer);
+                    var config = new IndexWriterConfig(LuceneSettings.DefaultVersion, analyzer)
                     {
-                        var directory = CreateDirectory(indexName);
-                        var analyzer = _luceneAnalyzerManager.CreateAnalyzer(indexAnalyzer);
-                        var config = new IndexWriterConfig(LuceneSettings.DefaultVersion, analyzer)
-                        {
-                            OpenMode = OpenMode.CREATE_OR_APPEND,
-                            WriteLockTimeout = LuceneLock.LOCK_POLL_INTERVAL * 3
-                        };
+                        OpenMode = OpenMode.CREATE_OR_APPEND,
+                        WriteLockTimeout = LuceneLock.LOCK_POLL_INTERVAL * 3
+                    };
 
-                        writer = new IndexWriterWrapper(directory, config);
+                    writer = new IndexWriterWrapper(directory, config);
 
-                        if (close)
-                        {
-                            action?.Invoke(writer);
-                            writer.Dispose();
-                            _timestamps[indexName] = _clock.UtcNow;
-                            return;
-                        }
-
-                        _writers[indexName] = writer;
+                    if (close)
+                    {
+                        action?.Invoke(writer);
+                        writer.Dispose();
+                        _timestamps[indexName] = _clock.UtcNow;
+                        return;
                     }
+
+                    _writers[indexName] = writer;
                 }
             }
+        }
 
-            if (writer.IsClosing)
-            {
-                return;
-            }
+        if (writer.IsClosing)
+        {
+            return;
+        }
 
-            action?.Invoke(writer);
+        action?.Invoke(writer);
 
-            _timestamps[indexName] = _clock.UtcNow;
-        }
+        _timestamps[indexName] = _clock.UtcNow;
+    }
 
-        private IndexReaderPool.IndexReaderLease GetReader(string indexName)
+    private IndexReaderPool.IndexReaderLease GetReader(string indexName)
+    {
+        var pool = _indexPools.GetOrAdd(indexName, n =>
         {
-            var pool = _indexPools.GetOrAdd(indexName, n =>
-            {
-                var path = new DirectoryInfo(PathExtensions.Combine(_rootPath, indexName));
-                var reader = DirectoryReader.Open(FSDirectory.Open(path));
-                return new IndexReaderPool(reader);
-            });
+            var path = new DirectoryInfo(PathExtensions.Combine(_rootPath, indexName));
+            var reader = DirectoryReader.Open(FSDirectory.Open(path));
+            return new IndexReaderPool(reader);
+        });
 
-            return pool.Acquire();
-        }
+        return pool.Acquire();
+    }
 
-        /// <summary>
-        /// Releases all readers and writers. This can be used after some time of innactivity to free resources.
-        /// </summary>
-        public void FreeReaderWriter()
+    /// <summary>
+    /// Releases all readers and writers. This can be used after some time of innactivity to free resources.
+    /// </summary>
+    public void FreeReaderWriter()
+    {
+        lock (this)
         {
-            lock (this)
+            foreach (var writer in _writers)
             {
-                foreach (var writer in _writers)
+                if (_logger.IsEnabled(LogLevel.Information))
                 {
-                    if (_logger.IsEnabled(LogLevel.Information))
-                    {
-                        _logger.LogInformation("Freeing writer for: '{IndexName}'.", writer.Key);
-                    }
-
-                    writer.Value.IsClosing = true;
-                    writer.Value.Dispose();
+                    _logger.LogInformation("Freeing writer for: '{IndexName}'.", writer.Key);
                 }
 
-                foreach (var reader in _indexPools)
-                {
-                    if (_logger.IsEnabled(LogLevel.Information))
-                    {
-                        _logger.LogInformation("Freeing reader for: '{IndexName}'.", reader.Key);
-                    }
+                writer.Value.IsClosing = true;
+                writer.Value.Dispose();
+            }
 
-                    reader.Value.Dispose();
+            foreach (var reader in _indexPools)
+            {
+                if (_logger.IsEnabled(LogLevel.Information))
+                {
+                    _logger.LogInformation("Freeing reader for: '{IndexName}'.", reader.Key);
                 }
 
-                _writers.Clear();
-                _indexPools.Clear();
-                _timestamps.Clear();
+                reader.Value.Dispose();
             }
+
+            _writers.Clear();
+            _indexPools.Clear();
+            _timestamps.Clear();
         }
+    }
 
-        /// <summary>
-        /// Releases all readers and writers. This can be used after some time of innactivity to free resources.
-        /// </summary>
-        public void FreeReaderWriter(string indexName)
+    /// <summary>
+    /// Releases all readers and writers. This can be used after some time of innactivity to free resources.
+    /// </summary>
+    public void FreeReaderWriter(string indexName)
+    {
+        lock (this)
         {
-            lock (this)
+            if (_writers.TryGetValue(indexName, out var writer))
             {
-                if (_writers.TryGetValue(indexName, out var writer))
+                if (_logger.IsEnabled(LogLevel.Information))
                 {
-                    if (_logger.IsEnabled(LogLevel.Information))
-                    {
-                        _logger.LogInformation("Freeing writer for: '{IndexName}'.", indexName);
-                    }
-
-                    writer.IsClosing = true;
-                    writer.Dispose();
+                    _logger.LogInformation("Freeing writer for: '{IndexName}'.", indexName);
                 }
 
-                if (_indexPools.TryGetValue(indexName, out var reader))
-                {
-                    if (_logger.IsEnabled(LogLevel.Information))
-                    {
-                        _logger.LogInformation("Freeing reader for: '{IndexName}'.", indexName);
-                    }
-
-                    reader.Dispose();
-                }
-
-                _timestamps.TryRemove(indexName, out _);
-
-                _writers.TryRemove(indexName, out _);
+                writer.IsClosing = true;
+                writer.Dispose();
             }
-        }
 
-        public void Dispose()
-        {
-            if (_disposed)
+            if (_indexPools.TryGetValue(indexName, out var reader))
             {
-                return;
-            }
+                if (_logger.IsEnabled(LogLevel.Information))
+                {
+                    _logger.LogInformation("Freeing reader for: '{IndexName}'.", indexName);
+                }
 
-            _disposed = true;
+                reader.Dispose();
+            }
 
-            FreeReaderWriter();
+            _timestamps.TryRemove(indexName, out _);
 
-            GC.SuppressFinalize(this);
+            _writers.TryRemove(indexName, out _);
         }
+    }
 
-        ~LuceneIndexManager()
+    public void Dispose()
+    {
+        if (_disposed)
         {
-            if (_disposed)
-            {
-                return;
-            }
-
-            FreeReaderWriter();
+            return;
         }
+
+        _disposed = true;
+
+        FreeReaderWriter();
+
+        GC.SuppressFinalize(this);
     }
 
-    internal sealed class IndexWriterWrapper : IndexWriter
+    ~LuceneIndexManager()
     {
-        public IndexWriterWrapper(LDirectory directory, IndexWriterConfig config) : base(directory, config)
+        if (_disposed)
         {
-            IsClosing = false;
+            return;
         }
 
-        public bool IsClosing { get; set; }
+        FreeReaderWriter();
     }
+}
 
-    internal sealed class IndexReaderPool : IDisposable
+internal sealed class IndexWriterWrapper : IndexWriter
+{
+    public IndexWriterWrapper(LDirectory directory, IndexWriterConfig config) : base(directory, config)
     {
-        private bool _dirty;
-        private int _count;
-        private readonly IndexReader _reader;
+        IsClosing = false;
+    }
 
-        public IndexReaderPool(IndexReader reader)
-        {
-            _reader = reader;
-        }
+    public bool IsClosing { get; set; }
+}
 
-        public void MakeDirty()
-        {
-            _dirty = true;
-        }
+internal sealed class IndexReaderPool : IDisposable
+{
+    private bool _dirty;
+    private int _count;
+    private readonly IndexReader _reader;
 
-        public IndexReaderLease Acquire()
-        {
-            return new IndexReaderLease(this, _reader);
-        }
+    public IndexReaderPool(IndexReader reader)
+    {
+        _reader = reader;
+    }
 
-        public void Release()
-        {
-            if (_dirty && _count == 0)
-            {
-                _reader.Dispose();
-            }
-        }
+    public void MakeDirty()
+    {
+        _dirty = true;
+    }
 
-        public void Dispose()
+    public IndexReaderLease Acquire()
+    {
+        return new IndexReaderLease(this, _reader);
+    }
+
+    public void Release()
+    {
+        if (_dirty && _count == 0)
         {
             _reader.Dispose();
         }
+    }
 
-        public readonly struct IndexReaderLease : IDisposable
-        {
-            private readonly IndexReaderPool _pool;
+    public void Dispose()
+    {
+        _reader.Dispose();
+    }
 
-            public IndexReaderLease(IndexReaderPool pool, IndexReader reader)
-            {
-                _pool = pool;
-                Interlocked.Increment(ref _pool._count);
-                IndexReader = reader;
-            }
+    public readonly struct IndexReaderLease : IDisposable
+    {
+        private readonly IndexReaderPool _pool;
 
-            public IndexReader IndexReader { get; }
+        public IndexReaderLease(IndexReaderPool pool, IndexReader reader)
+        {
+            _pool = pool;
+            Interlocked.Increment(ref _pool._count);
+            IndexReader = reader;
+        }
 
-            public void Dispose()
-            {
-                Interlocked.Decrement(ref _pool._count);
-                _pool.Release();
-            }
+        public IndexReader IndexReader { get; }
+
+        public void Dispose()
+        {
+            Interlocked.Decrement(ref _pool._count);
+            _pool.Release();
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexSettingsService.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexSettingsService.cs
index b4a9cd4b1a0..339ffbc94a3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexSettingsService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexSettingsService.cs
@@ -3,90 +3,89 @@
 using OrchardCore.Documents;
 using OrchardCore.Search.Lucene.Model;
 
-namespace OrchardCore.Search.Lucene
-{
-    public class LuceneIndexSettingsService
-    {
-        private readonly IDocumentManager<LuceneIndexSettingsDocument> _documentManager;
-
-        public LuceneIndexSettingsService(IDocumentManager<LuceneIndexSettingsDocument> documentManager)
-        {
-            _documentManager = documentManager;
-        }
+namespace OrchardCore.Search.Lucene;
 
-        /// <summary>
-        /// Loads the index settings document from the store for updating and that should not be cached.
-        /// </summary>
-        public Task<LuceneIndexSettingsDocument> LoadDocumentAsync() => _documentManager.GetOrCreateMutableAsync();
+public class LuceneIndexSettingsService
+{
+    private readonly IDocumentManager<LuceneIndexSettingsDocument> _documentManager;
 
-        /// <summary>
-        /// Gets the index settings document from the cache for sharing and that should not be updated.
-        /// </summary>
-        public async Task<LuceneIndexSettingsDocument> GetDocumentAsync()
-        {
-            var document = await _documentManager.GetOrCreateImmutableAsync();
+    public LuceneIndexSettingsService(IDocumentManager<LuceneIndexSettingsDocument> documentManager)
+    {
+        _documentManager = documentManager;
+    }
 
-            foreach (var name in document.LuceneIndexSettings.Keys)
-            {
-                document.LuceneIndexSettings[name].IndexName = name;
-            }
+    /// <summary>
+    /// Loads the index settings document from the store for updating and that should not be cached.
+    /// </summary>
+    public Task<LuceneIndexSettingsDocument> LoadDocumentAsync() => _documentManager.GetOrCreateMutableAsync();
 
-            return document;
-        }
+    /// <summary>
+    /// Gets the index settings document from the cache for sharing and that should not be updated.
+    /// </summary>
+    public async Task<LuceneIndexSettingsDocument> GetDocumentAsync()
+    {
+        var document = await _documentManager.GetOrCreateImmutableAsync();
 
-        public async Task<IEnumerable<LuceneIndexSettings>> GetSettingsAsync()
+        foreach (var name in document.LuceneIndexSettings.Keys)
         {
-            return (await GetDocumentAsync()).LuceneIndexSettings.Values;
+            document.LuceneIndexSettings[name].IndexName = name;
         }
 
-        public async Task<LuceneIndexSettings> GetSettingsAsync(string indexName)
-        {
-            var document = await GetDocumentAsync();
+        return document;
+    }
 
-            if (document.LuceneIndexSettings.TryGetValue(indexName, out var settings))
-            {
-                return settings;
-            }
+    public async Task<IEnumerable<LuceneIndexSettings>> GetSettingsAsync()
+    {
+        return (await GetDocumentAsync()).LuceneIndexSettings.Values;
+    }
 
-            return null;
-        }
+    public async Task<LuceneIndexSettings> GetSettingsAsync(string indexName)
+    {
+        var document = await GetDocumentAsync();
 
-        public async Task<string> GetIndexAnalyzerAsync(string indexName)
+        if (document.LuceneIndexSettings.TryGetValue(indexName, out var settings))
         {
-            var document = await GetDocumentAsync();
+            return settings;
+        }
 
-            if (document.LuceneIndexSettings.TryGetValue(indexName, out var settings))
-            {
-                return settings.AnalyzerName;
-            }
+        return null;
+    }
 
-            return LuceneSettings.StandardAnalyzer;
-        }
+    public async Task<string> GetIndexAnalyzerAsync(string indexName)
+    {
+        var document = await GetDocumentAsync();
 
-        public async Task<string> LoadIndexAnalyzerAsync(string indexName)
+        if (document.LuceneIndexSettings.TryGetValue(indexName, out var settings))
         {
-            var document = await LoadDocumentAsync();
+            return settings.AnalyzerName;
+        }
 
-            if (document.LuceneIndexSettings.TryGetValue(indexName, out var settings))
-            {
-                return settings.AnalyzerName;
-            }
+        return LuceneSettings.StandardAnalyzer;
+    }
 
-            return LuceneSettings.StandardAnalyzer;
-        }
+    public async Task<string> LoadIndexAnalyzerAsync(string indexName)
+    {
+        var document = await LoadDocumentAsync();
 
-        public async Task UpdateIndexAsync(LuceneIndexSettings settings)
+        if (document.LuceneIndexSettings.TryGetValue(indexName, out var settings))
         {
-            var document = await LoadDocumentAsync();
-            document.LuceneIndexSettings[settings.IndexName] = settings;
-            await _documentManager.UpdateAsync(document);
+            return settings.AnalyzerName;
         }
 
-        public async Task DeleteIndexAsync(string indexName)
-        {
-            var document = await LoadDocumentAsync();
-            document.LuceneIndexSettings.Remove(indexName);
-            await _documentManager.UpdateAsync(document);
-        }
+        return LuceneSettings.StandardAnalyzer;
+    }
+
+    public async Task UpdateIndexAsync(LuceneIndexSettings settings)
+    {
+        var document = await LoadDocumentAsync();
+        document.LuceneIndexSettings[settings.IndexName] = settings;
+        await _documentManager.UpdateAsync(document);
+    }
+
+    public async Task DeleteIndexAsync(string indexName)
+    {
+        var document = await LoadDocumentAsync();
+        document.LuceneIndexSettings.Remove(indexName);
+        await _documentManager.UpdateAsync(document);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexingService.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexingService.cs
index c633e130e8d..d216b0c4a9c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexingService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexingService.cs
@@ -12,291 +12,290 @@
 using OrchardCore.Search.Lucene.Model;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Search.Lucene
+namespace OrchardCore.Search.Lucene;
+
+/// <summary>
+/// This class provides services to update all the Lucene indices. It is non-rentrant so that calls
+/// from different components can be done simultaneously, e.g. from a background task, an event or a UI interaction.
+/// It also indexes one content item at a time and provides the result to all indices.
+/// </summary>
+public class LuceneIndexingService
 {
-    /// <summary>
-    /// This class provides services to update all the Lucene indices. It is non-rentrant so that calls
-    /// from different components can be done simultaneously, e.g. from a background task, an event or a UI interaction.
-    /// It also indexes one content item at a time and provides the result to all indices.
-    /// </summary>
-    public class LuceneIndexingService
+    private const int BatchSize = 100;
+    private readonly IShellHost _shellHost;
+    private readonly ShellSettings _shellSettings;
+    private readonly LuceneIndexingState _indexingState;
+    private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
+    private readonly LuceneIndexManager _indexManager;
+    private readonly IIndexingTaskManager _indexingTaskManager;
+    private readonly ISiteService _siteService;
+    private readonly ILogger _logger;
+
+    public LuceneIndexingService(
+        IShellHost shellHost,
+        ShellSettings shellSettings,
+        LuceneIndexingState indexingState,
+        LuceneIndexSettingsService luceneIndexSettingsService,
+        LuceneIndexManager indexManager,
+        IIndexingTaskManager indexingTaskManager,
+        ISiteService siteService,
+        ILogger<LuceneIndexingService> logger)
     {
-        private const int BatchSize = 100;
-        private readonly IShellHost _shellHost;
-        private readonly ShellSettings _shellSettings;
-        private readonly LuceneIndexingState _indexingState;
-        private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
-        private readonly LuceneIndexManager _indexManager;
-        private readonly IIndexingTaskManager _indexingTaskManager;
-        private readonly ISiteService _siteService;
-        private readonly ILogger _logger;
-
-        public LuceneIndexingService(
-            IShellHost shellHost,
-            ShellSettings shellSettings,
-            LuceneIndexingState indexingState,
-            LuceneIndexSettingsService luceneIndexSettingsService,
-            LuceneIndexManager indexManager,
-            IIndexingTaskManager indexingTaskManager,
-            ISiteService siteService,
-            ILogger<LuceneIndexingService> logger)
-        {
-            _shellHost = shellHost;
-            _shellSettings = shellSettings;
-            _indexingState = indexingState;
-            _luceneIndexSettingsService = luceneIndexSettingsService;
-            _indexManager = indexManager;
-            _indexingTaskManager = indexingTaskManager;
-            _siteService = siteService;
-            _logger = logger;
-        }
+        _shellHost = shellHost;
+        _shellSettings = shellSettings;
+        _indexingState = indexingState;
+        _luceneIndexSettingsService = luceneIndexSettingsService;
+        _indexManager = indexManager;
+        _indexingTaskManager = indexingTaskManager;
+        _siteService = siteService;
+        _logger = logger;
+    }
+
+    public async Task ProcessContentItemsAsync(string indexName = default)
+    {
+        // TODO: Lock over the filesystem in case two instances get a command to rebuild the index concurrently.
+        var allIndices = new Dictionary<string, long>();
+        var lastTaskId = long.MaxValue;
+        IEnumerable<LuceneIndexSettings> indexSettingsList = null;
 
-        public async Task ProcessContentItemsAsync(string indexName = default)
+        if (string.IsNullOrEmpty(indexName))
         {
-            // TODO: Lock over the filesystem in case two instances get a command to rebuild the index concurrently.
-            var allIndices = new Dictionary<string, long>();
-            var lastTaskId = long.MaxValue;
-            IEnumerable<LuceneIndexSettings> indexSettingsList = null;
+            indexSettingsList = await _luceneIndexSettingsService.GetSettingsAsync();
 
-            if (string.IsNullOrEmpty(indexName))
+            if (!indexSettingsList.Any())
             {
-                indexSettingsList = await _luceneIndexSettingsService.GetSettingsAsync();
-
-                if (!indexSettingsList.Any())
-                {
-                    return;
-                }
-
-                // Find the lowest task id to process.
-                foreach (var indexSetting in indexSettingsList)
-                {
-                    var taskId = _indexingState.GetLastTaskId(indexSetting.IndexName);
-                    lastTaskId = Math.Min(lastTaskId, taskId);
-                    allIndices.Add(indexSetting.IndexName, taskId);
-                }
+                return;
             }
-            else
-            {
-                var settings = await _luceneIndexSettingsService.GetSettingsAsync(indexName);
-
-                if (settings == null)
-                {
-                    return;
-                }
-
-                indexSettingsList = new LuceneIndexSettings[1] { settings }.AsEnumerable();
 
-                var taskId = _indexingState.GetLastTaskId(indexName);
+            // Find the lowest task id to process.
+            foreach (var indexSetting in indexSettingsList)
+            {
+                var taskId = _indexingState.GetLastTaskId(indexSetting.IndexName);
                 lastTaskId = Math.Min(lastTaskId, taskId);
-                allIndices.Add(indexName, taskId);
+                allIndices.Add(indexSetting.IndexName, taskId);
             }
+        }
+        else
+        {
+            var settings = await _luceneIndexSettingsService.GetSettingsAsync(indexName);
 
-            if (allIndices.Count == 0)
+            if (settings == null)
             {
                 return;
             }
 
-            var batch = Array.Empty<IndexingTask>();
+            indexSettingsList = new LuceneIndexSettings[1] { settings }.AsEnumerable();
+
+            var taskId = _indexingState.GetLastTaskId(indexName);
+            lastTaskId = Math.Min(lastTaskId, taskId);
+            allIndices.Add(indexName, taskId);
+        }
+
+        if (allIndices.Count == 0)
+        {
+            return;
+        }
 
-            do
+        var batch = Array.Empty<IndexingTask>();
+
+        do
+        {
+            // Create a scope for the content manager.
+            var shellScope = await _shellHost.GetScopeAsync(_shellSettings);
+
+            await shellScope.UsingAsync(async scope =>
             {
-                // Create a scope for the content manager.
-                var shellScope = await _shellHost.GetScopeAsync(_shellSettings);
+                // Load the next batch of tasks.
+                batch = (await _indexingTaskManager.GetIndexingTasksAsync(lastTaskId, BatchSize)).ToArray();
 
-                await shellScope.UsingAsync(async scope =>
+                if (batch.Length == 0)
                 {
-                    // Load the next batch of tasks.
-                    batch = (await _indexingTaskManager.GetIndexingTasksAsync(lastTaskId, BatchSize)).ToArray();
-
-                    if (batch.Length == 0)
-                    {
-                        return;
-                    }
+                    return;
+                }
 
-                    var contentManager = scope.ServiceProvider.GetRequiredService<IContentManager>();
-                    var indexHandlers = scope.ServiceProvider.GetServices<IContentItemIndexHandler>();
+                var contentManager = scope.ServiceProvider.GetRequiredService<IContentManager>();
+                var indexHandlers = scope.ServiceProvider.GetServices<IContentItemIndexHandler>();
 
-                    // Pre-load all content items to prevent SELECT N+1.
-                    var updatedContentItemIds = batch
-                        .Where(x => x.Type == IndexingTaskTypes.Update)
-                        .Select(x => x.ContentItemId)
-                        .ToArray();
+                // Pre-load all content items to prevent SELECT N+1.
+                var updatedContentItemIds = batch
+                    .Where(x => x.Type == IndexingTaskTypes.Update)
+                    .Select(x => x.ContentItemId)
+                    .ToArray();
 
-                    var allPublished = new Dictionary<string, ContentItem>();
-                    var allLatest = new Dictionary<string, ContentItem>();
+                var allPublished = new Dictionary<string, ContentItem>();
+                var allLatest = new Dictionary<string, ContentItem>();
 
-                    var allPublishedContentItems = await contentManager.GetAsync(updatedContentItemIds);
-                    allPublished = allPublishedContentItems.DistinctBy(x => x.ContentItemId).ToDictionary(k => k.ContentItemId, v => v);
-                    var allLatestContentItems = await contentManager.GetAsync(updatedContentItemIds, VersionOptions.Latest);
-                    allLatest = allLatestContentItems.DistinctBy(x => x.ContentItemId).ToDictionary(k => k.ContentItemId, v => v);
+                var allPublishedContentItems = await contentManager.GetAsync(updatedContentItemIds);
+                allPublished = allPublishedContentItems.DistinctBy(x => x.ContentItemId).ToDictionary(k => k.ContentItemId, v => v);
+                var allLatestContentItems = await contentManager.GetAsync(updatedContentItemIds, VersionOptions.Latest);
+                allLatest = allLatestContentItems.DistinctBy(x => x.ContentItemId).ToDictionary(k => k.ContentItemId, v => v);
 
-                    // Group all DocumentIndex by index to batch update them.
-                    var updatedDocumentsByIndex = new Dictionary<string, List<DocumentIndex>>();
+                // Group all DocumentIndex by index to batch update them.
+                var updatedDocumentsByIndex = new Dictionary<string, List<DocumentIndex>>();
 
-                    foreach (var index in allIndices)
-                    {
-                        updatedDocumentsByIndex[index.Key] = [];
-                    }
+                foreach (var index in allIndices)
+                {
+                    updatedDocumentsByIndex[index.Key] = [];
+                }
 
-                    if (indexName != null)
-                    {
-                        indexSettingsList = indexSettingsList.Where(x => x.IndexName == indexName);
-                    }
+                if (indexName != null)
+                {
+                    indexSettingsList = indexSettingsList.Where(x => x.IndexName == indexName);
+                }
 
-                    var needLatest = indexSettingsList.FirstOrDefault(x => x.IndexLatest) != null;
-                    var needPublished = indexSettingsList.FirstOrDefault(x => !x.IndexLatest) != null;
+                var needLatest = indexSettingsList.FirstOrDefault(x => x.IndexLatest) != null;
+                var needPublished = indexSettingsList.FirstOrDefault(x => !x.IndexLatest) != null;
 
-                    var settingsByIndex = indexSettingsList.ToDictionary(x => x.IndexName, x => x);
+                var settingsByIndex = indexSettingsList.ToDictionary(x => x.IndexName, x => x);
 
-                    foreach (var task in batch)
+                foreach (var task in batch)
+                {
+                    if (task.Type == IndexingTaskTypes.Update)
                     {
-                        if (task.Type == IndexingTaskTypes.Update)
+                        BuildIndexContext publishedIndexContext = null, latestIndexContext = null;
+
+                        if (needPublished)
                         {
-                            BuildIndexContext publishedIndexContext = null, latestIndexContext = null;
+                            allPublished.TryGetValue(task.ContentItemId, out var contentItem);
 
-                            if (needPublished)
+                            if (contentItem != null)
                             {
-                                allPublished.TryGetValue(task.ContentItemId, out var contentItem);
+                                publishedIndexContext = new BuildIndexContext(new DocumentIndex(task.ContentItemId, contentItem.ContentItemVersionId), contentItem, new string[] { contentItem.ContentType }, new LuceneContentIndexSettings());
+                                await indexHandlers.InvokeAsync(x => x.BuildIndexAsync(publishedIndexContext), _logger);
+                            }
+                        }
+
+                        if (needLatest)
+                        {
+                            allLatest.TryGetValue(task.ContentItemId, out var contentItem);
 
-                                if (contentItem != null)
-                                {
-                                    publishedIndexContext = new BuildIndexContext(new DocumentIndex(task.ContentItemId, contentItem.ContentItemVersionId), contentItem, new string[] { contentItem.ContentType }, new LuceneContentIndexSettings());
-                                    await indexHandlers.InvokeAsync(x => x.BuildIndexAsync(publishedIndexContext), _logger);
-                                }
+                            if (contentItem != null)
+                            {
+                                latestIndexContext = new BuildIndexContext(new DocumentIndex(task.ContentItemId, contentItem.ContentItemVersionId), contentItem, new string[] { contentItem.ContentType }, new LuceneContentIndexSettings());
+                                await indexHandlers.InvokeAsync(x => x.BuildIndexAsync(latestIndexContext), _logger);
                             }
+                        }
 
-                            if (needLatest)
+                        // Update the document from the index if its lastIndexId is smaller than the current task id.
+                        foreach (var index in allIndices)
+                        {
+                            if (index.Value >= task.Id || !settingsByIndex.TryGetValue(index.Key, out var settings))
                             {
-                                allLatest.TryGetValue(task.ContentItemId, out var contentItem);
+                                continue;
+                            }
+
+                            var context = !settings.IndexLatest ? publishedIndexContext : latestIndexContext;
 
-                                if (contentItem != null)
-                                {
-                                    latestIndexContext = new BuildIndexContext(new DocumentIndex(task.ContentItemId, contentItem.ContentItemVersionId), contentItem, new string[] { contentItem.ContentType }, new LuceneContentIndexSettings());
-                                    await indexHandlers.InvokeAsync(x => x.BuildIndexAsync(latestIndexContext), _logger);
-                                }
+                            // We index only if we actually found a content item in the database.
+                            if (context == null)
+                            {
+                                // TODO purge these content items from IndexingTask table.
+                                continue;
                             }
 
-                            // Update the document from the index if its lastIndexId is smaller than the current task id.
-                            foreach (var index in allIndices)
+                            var cultureAspect = await contentManager.PopulateAspectAsync<CultureAspect>(context.ContentItem);
+                            var culture = cultureAspect.HasCulture ? cultureAspect.Culture.Name : null;
+                            var ignoreIndexedCulture = settings.Culture != "any" && culture != settings.Culture;
+
+                            // Ignore if the content item content type or culture is not indexed in this index.
+                            if (!settings.IndexedContentTypes.Contains(context.ContentItem.ContentType) || ignoreIndexedCulture)
                             {
-                                if (index.Value >= task.Id || !settingsByIndex.TryGetValue(index.Key, out var settings))
-                                {
-                                    continue;
-                                }
-
-                                var context = !settings.IndexLatest ? publishedIndexContext : latestIndexContext;
-
-                                // We index only if we actually found a content item in the database.
-                                if (context == null)
-                                {
-                                    // TODO purge these content items from IndexingTask table.
-                                    continue;
-                                }
-
-                                var cultureAspect = await contentManager.PopulateAspectAsync<CultureAspect>(context.ContentItem);
-                                var culture = cultureAspect.HasCulture ? cultureAspect.Culture.Name : null;
-                                var ignoreIndexedCulture = settings.Culture != "any" && culture != settings.Culture;
-
-                                // Ignore if the content item content type or culture is not indexed in this index.
-                                if (!settings.IndexedContentTypes.Contains(context.ContentItem.ContentType) || ignoreIndexedCulture)
-                                {
-                                    continue;
-                                }
-
-                                updatedDocumentsByIndex[index.Key].Add(context.DocumentIndex);
+                                continue;
                             }
+
+                            updatedDocumentsByIndex[index.Key].Add(context.DocumentIndex);
                         }
                     }
+                }
 
-                    // Delete all the existing documents.
-                    foreach (var index in updatedDocumentsByIndex)
-                    {
-                        var deletedDocuments = updatedDocumentsByIndex[index.Key].Select(x => x.ContentItemId);
+                // Delete all the existing documents.
+                foreach (var index in updatedDocumentsByIndex)
+                {
+                    var deletedDocuments = updatedDocumentsByIndex[index.Key].Select(x => x.ContentItemId);
 
-                        await _indexManager.DeleteDocumentsAsync(index.Key, deletedDocuments);
-                    }
+                    await _indexManager.DeleteDocumentsAsync(index.Key, deletedDocuments);
+                }
 
-                    // Submits all the new documents to the index.
-                    foreach (var index in updatedDocumentsByIndex)
-                    {
-                        await _indexManager.StoreDocumentsAsync(index.Key, updatedDocumentsByIndex[index.Key]);
-                    }
+                // Submits all the new documents to the index.
+                foreach (var index in updatedDocumentsByIndex)
+                {
+                    await _indexManager.StoreDocumentsAsync(index.Key, updatedDocumentsByIndex[index.Key]);
+                }
 
-                    // Update task ids.
-                    lastTaskId = batch.Last().Id;
+                // Update task ids.
+                lastTaskId = batch.Last().Id;
 
-                    foreach (var indexStatus in allIndices)
+                foreach (var indexStatus in allIndices)
+                {
+                    if (indexStatus.Value < lastTaskId)
                     {
-                        if (indexStatus.Value < lastTaskId)
-                        {
-                            _indexingState.SetLastTaskId(indexStatus.Key, lastTaskId);
-                        }
+                        _indexingState.SetLastTaskId(indexStatus.Key, lastTaskId);
                     }
+                }
 
-                    _indexingState.Update();
-                }, activateShell: false);
-            } while (batch.Length == BatchSize);
-        }
+                _indexingState.Update();
+            }, activateShell: false);
+        } while (batch.Length == BatchSize);
+    }
 
-        /// <summary>
-        /// Creates a new index.
-        /// </summary>
-        /// <returns></returns>
-        public async Task CreateIndexAsync(LuceneIndexSettings indexSettings)
-        {
-            await _luceneIndexSettingsService.UpdateIndexAsync(indexSettings);
-            await RebuildIndexAsync(indexSettings.IndexName);
-        }
+    /// <summary>
+    /// Creates a new index.
+    /// </summary>
+    /// <returns></returns>
+    public async Task CreateIndexAsync(LuceneIndexSettings indexSettings)
+    {
+        await _luceneIndexSettingsService.UpdateIndexAsync(indexSettings);
+        await RebuildIndexAsync(indexSettings.IndexName);
+    }
 
-        /// <summary>
-        /// Update an existing index.
-        /// </summary>
-        /// <returns></returns>
-        public Task UpdateIndexAsync(LuceneIndexSettings indexSettings)
+    /// <summary>
+    /// Update an existing index.
+    /// </summary>
+    /// <returns></returns>
+    public Task UpdateIndexAsync(LuceneIndexSettings indexSettings)
+    {
+        return _luceneIndexSettingsService.UpdateIndexAsync(indexSettings);
+    }
+
+    /// <summary>
+    /// Deletes permanently an index.
+    /// </summary>
+    /// <returns></returns>
+    public Task DeleteIndexAsync(string indexName)
+    {
+        if (_indexManager.Exists(indexName))
         {
-            return _luceneIndexSettingsService.UpdateIndexAsync(indexSettings);
+            _indexManager.DeleteIndex(indexName);
         }
 
-        /// <summary>
-        /// Deletes permanently an index.
-        /// </summary>
-        /// <returns></returns>
-        public Task DeleteIndexAsync(string indexName)
-        {
-            if (_indexManager.Exists(indexName))
-            {
-                _indexManager.DeleteIndex(indexName);
-            }
+        return _luceneIndexSettingsService.DeleteIndexAsync(indexName);
+    }
 
-            return _luceneIndexSettingsService.DeleteIndexAsync(indexName);
-        }
+    /// <summary>
+    /// Restarts the indexing process from the beginning in order to update
+    /// current content items. It doesn't delete existing entries from the index.
+    /// </summary>
+    public void ResetIndexAsync(string indexName)
+    {
+        _indexingState.SetLastTaskId(indexName, 0);
+        _indexingState.Update();
+    }
 
-        /// <summary>
-        /// Restarts the indexing process from the beginning in order to update
-        /// current content items. It doesn't delete existing entries from the index.
-        /// </summary>
-        public void ResetIndexAsync(string indexName)
+    /// <summary>
+    /// Deletes and recreates the full index content.
+    /// </summary>
+    public async Task RebuildIndexAsync(string indexName)
+    {
+        if (_indexManager.Exists(indexName))
         {
-            _indexingState.SetLastTaskId(indexName, 0);
-            _indexingState.Update();
+            _indexManager.DeleteIndex(indexName);
         }
 
-        /// <summary>
-        /// Deletes and recreates the full index content.
-        /// </summary>
-        public async Task RebuildIndexAsync(string indexName)
-        {
-            if (_indexManager.Exists(indexName))
-            {
-                _indexManager.DeleteIndex(indexName);
-            }
-
-            await _indexManager.CreateIndexAsync(indexName);
+        await _indexManager.CreateIndexAsync(indexName);
 
-            ResetIndexAsync(indexName);
-        }
-
-        public async Task<LuceneSettings> GetLuceneSettingsAsync()
-            => await _siteService.GetSettingsAsync<LuceneSettings>() ?? new LuceneSettings();
+        ResetIndexAsync(indexName);
     }
+
+    public async Task<LuceneSettings> GetLuceneSettingsAsync()
+        => await _siteService.GetSettingsAsync<LuceneSettings>() ?? new LuceneSettings();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexingState.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexingState.cs
index 6a1bdc67cb2..f4a44349da6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexingState.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneIndexingState.cs
@@ -4,69 +4,68 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Environment.Shell;
 
-namespace OrchardCore.Search.Lucene
+namespace OrchardCore.Search.Lucene;
+
+/// <summary>
+/// This class persists the indexing state, a cursor, on the filesystem alongside the index itself.
+/// This state has to be on the filesystem as each node has its own local storage for the index.
+/// </summary>
+public class LuceneIndexingState
 {
-    /// <summary>
-    /// This class persists the indexing state, a cursor, on the filesystem alongside the index itself.
-    /// This state has to be on the filesystem as each node has its own local storage for the index.
-    /// </summary>
-    public class LuceneIndexingState
+    private readonly string _indexSettingsFilename;
+    private readonly JsonObject _content;
+
+    public LuceneIndexingState(
+        IOptions<ShellOptions> shellOptions,
+        ShellSettings shellSettings
+        )
     {
-        private readonly string _indexSettingsFilename;
-        private readonly JsonObject _content;
+        _indexSettingsFilename = PathExtensions.Combine(
+            shellOptions.Value.ShellsApplicationDataPath,
+            shellOptions.Value.ShellsContainerName,
+            shellSettings.Name,
+            "lucene.status.json");
 
-        public LuceneIndexingState(
-            IOptions<ShellOptions> shellOptions,
-            ShellSettings shellSettings
-            )
+        if (!File.Exists(_indexSettingsFilename))
         {
-            _indexSettingsFilename = PathExtensions.Combine(
-                shellOptions.Value.ShellsApplicationDataPath,
-                shellOptions.Value.ShellsContainerName,
-                shellSettings.Name,
-                "lucene.status.json");
+            Directory.CreateDirectory(Path.GetDirectoryName(_indexSettingsFilename));
 
-            if (!File.Exists(_indexSettingsFilename))
-            {
-                Directory.CreateDirectory(Path.GetDirectoryName(_indexSettingsFilename));
+            File.WriteAllText(_indexSettingsFilename, new JsonObject().ToJsonString(JOptions.Indented));
+        }
 
-                File.WriteAllText(_indexSettingsFilename, new JsonObject().ToJsonString(JOptions.Indented));
-            }
+        _content = JObject.Parse(File.ReadAllText(_indexSettingsFilename));
+    }
 
-            _content = JObject.Parse(File.ReadAllText(_indexSettingsFilename));
+    public long GetLastTaskId(string indexName)
+    {
+        if (_content.TryGetPropertyValue(indexName, out var value))
+        {
+            return value.Value<long>();
         }
-
-        public long GetLastTaskId(string indexName)
+        else
         {
-            if (_content.TryGetPropertyValue(indexName, out var value))
+            lock (this)
             {
-                return value.Value<long>();
+                _content.Add(indexName, JsonValue.Create<long>(0));
             }
-            else
-            {
-                lock (this)
-                {
-                    _content.Add(indexName, JsonValue.Create<long>(0));
-                }
 
-                return 0L;
-            }
+            return 0L;
         }
+    }
 
-        public void SetLastTaskId(string indexName, long taskId)
+    public void SetLastTaskId(string indexName, long taskId)
+    {
+        lock (this)
         {
-            lock (this)
-            {
-                _content[indexName] = taskId;
-            }
+            _content[indexName] = taskId;
         }
+    }
 
-        public void Update()
+    public void Update()
+    {
+        lock (this)
         {
-            lock (this)
-            {
-                File.WriteAllText(_indexSettingsFilename, _content.ToJsonString(JOptions.Indented));
-            }
+            File.WriteAllText(_indexSettingsFilename, _content.ToJsonString(JOptions.Indented));
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneQuerySource.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneQuerySource.cs
index f68d9156e14..d4d05b4b44c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneQuerySource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneQuerySource.cs
@@ -16,92 +16,91 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.Search.Lucene
+namespace OrchardCore.Search.Lucene;
+
+public sealed class LuceneQuerySource : IQuerySource
 {
-    public sealed class LuceneQuerySource : IQuerySource
+    public const string SourceName = "Lucene";
+
+    private readonly LuceneIndexManager _luceneIndexManager;
+    private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
+    private readonly LuceneAnalyzerManager _luceneAnalyzerManager;
+    private readonly ILuceneQueryService _queryService;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly ISession _session;
+    private readonly JavaScriptEncoder _javaScriptEncoder;
+    private readonly TemplateOptions _templateOptions;
+
+    public LuceneQuerySource(
+        LuceneIndexManager luceneIndexManager,
+        LuceneIndexSettingsService luceneIndexSettingsService,
+        LuceneAnalyzerManager luceneAnalyzerManager,
+        ILuceneQueryService queryService,
+        ILiquidTemplateManager liquidTemplateManager,
+        ISession session,
+        JavaScriptEncoder javaScriptEncoder,
+        IOptions<TemplateOptions> templateOptions)
     {
-        public const string SourceName = "Lucene";
+        _luceneIndexManager = luceneIndexManager;
+        _luceneIndexSettingsService = luceneIndexSettingsService;
+        _luceneAnalyzerManager = luceneAnalyzerManager;
+        _queryService = queryService;
+        _liquidTemplateManager = liquidTemplateManager;
+        _session = session;
+        _javaScriptEncoder = javaScriptEncoder;
+        _templateOptions = templateOptions.Value;
+    }
 
-        private readonly LuceneIndexManager _luceneIndexManager;
-        private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
-        private readonly LuceneAnalyzerManager _luceneAnalyzerManager;
-        private readonly ILuceneQueryService _queryService;
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly ISession _session;
-        private readonly JavaScriptEncoder _javaScriptEncoder;
-        private readonly TemplateOptions _templateOptions;
+    public string Name
+        => SourceName;
 
-        public LuceneQuerySource(
-            LuceneIndexManager luceneIndexManager,
-            LuceneIndexSettingsService luceneIndexSettingsService,
-            LuceneAnalyzerManager luceneAnalyzerManager,
-            ILuceneQueryService queryService,
-            ILiquidTemplateManager liquidTemplateManager,
-            ISession session,
-            JavaScriptEncoder javaScriptEncoder,
-            IOptions<TemplateOptions> templateOptions)
+    public async Task<IQueryResults> ExecuteQueryAsync(Query query, IDictionary<string, object> parameters)
+    {
+        var luceneQueryResults = new LuceneQueryResults();
+        var metadata = query.As<LuceneQueryMetadata>();
+
+        await _luceneIndexManager.SearchAsync(metadata.Index, async searcher =>
         {
-            _luceneIndexManager = luceneIndexManager;
-            _luceneIndexSettingsService = luceneIndexSettingsService;
-            _luceneAnalyzerManager = luceneAnalyzerManager;
-            _queryService = queryService;
-            _liquidTemplateManager = liquidTemplateManager;
-            _session = session;
-            _javaScriptEncoder = javaScriptEncoder;
-            _templateOptions = templateOptions.Value;
-        }
+            var tokenizedContent = await _liquidTemplateManager.RenderStringAsync(metadata.Template, _javaScriptEncoder, parameters.Select(x => new KeyValuePair<string, FluidValue>(x.Key, FluidValue.Create(x.Value, _templateOptions))));
 
-        public string Name
-            => SourceName;
+            var parameterizedQuery = JsonNode.Parse(tokenizedContent).AsObject();
 
-        public async Task<IQueryResults> ExecuteQueryAsync(Query query, IDictionary<string, object> parameters)
-        {
-            var luceneQueryResults = new LuceneQueryResults();
-            var metadata = query.As<LuceneQueryMetadata>();
+            var analyzer = _luceneAnalyzerManager.CreateAnalyzer(await _luceneIndexSettingsService.GetIndexAnalyzerAsync(metadata.Index));
+            var context = new LuceneQueryContext(searcher, LuceneSettings.DefaultVersion, analyzer);
+            var docs = await _queryService.SearchAsync(context, parameterizedQuery);
+            luceneQueryResults.Count = docs.Count;
 
-            await _luceneIndexManager.SearchAsync(metadata.Index, async searcher =>
+            if (query.ReturnContentItems)
             {
-                var tokenizedContent = await _liquidTemplateManager.RenderStringAsync(metadata.Template, _javaScriptEncoder, parameters.Select(x => new KeyValuePair<string, FluidValue>(x.Key, FluidValue.Create(x.Value, _templateOptions))));
-
-                var parameterizedQuery = JsonNode.Parse(tokenizedContent).AsObject();
+                // We always return an empty collection if the bottom lines queries have no results.
+                luceneQueryResults.Items = [];
 
-                var analyzer = _luceneAnalyzerManager.CreateAnalyzer(await _luceneIndexSettingsService.GetIndexAnalyzerAsync(metadata.Index));
-                var context = new LuceneQueryContext(searcher, LuceneSettings.DefaultVersion, analyzer);
-                var docs = await _queryService.SearchAsync(context, parameterizedQuery);
-                luceneQueryResults.Count = docs.Count;
+                // Load corresponding content item versions.
+                var indexedContentItemVersionIds = docs.TopDocs.ScoreDocs.Select(x => searcher.Doc(x.Doc).Get("ContentItemVersionId")).ToArray();
+                var dbContentItems = await _session.Query<ContentItem, ContentItemIndex>(x => x.ContentItemVersionId.IsIn(indexedContentItemVersionIds)).ListAsync();
 
-                if (query.ReturnContentItems)
+                // Reorder the result to preserve the one from the lucene query.
+                if (dbContentItems.Any())
                 {
-                    // We always return an empty collection if the bottom lines queries have no results.
-                    luceneQueryResults.Items = [];
-
-                    // Load corresponding content item versions.
-                    var indexedContentItemVersionIds = docs.TopDocs.ScoreDocs.Select(x => searcher.Doc(x.Doc).Get("ContentItemVersionId")).ToArray();
-                    var dbContentItems = await _session.Query<ContentItem, ContentItemIndex>(x => x.ContentItemVersionId.IsIn(indexedContentItemVersionIds)).ListAsync();
-
-                    // Reorder the result to preserve the one from the lucene query.
-                    if (dbContentItems.Any())
-                    {
-                        var dbContentItemVersionIds = dbContentItems.ToDictionary(x => x.ContentItemVersionId, x => x);
-                        var indexedAndInDB = indexedContentItemVersionIds.Where(dbContentItemVersionIds.ContainsKey);
-                        luceneQueryResults.Items = indexedAndInDB.Select(x => dbContentItemVersionIds[x]).ToArray();
-                    }
+                    var dbContentItemVersionIds = dbContentItems.ToDictionary(x => x.ContentItemVersionId, x => x);
+                    var indexedAndInDB = indexedContentItemVersionIds.Where(dbContentItemVersionIds.ContainsKey);
+                    luceneQueryResults.Items = indexedAndInDB.Select(x => dbContentItemVersionIds[x]).ToArray();
                 }
-                else
-                {
-                    var results = new List<JsonObject>();
-
-                    foreach (var document in docs.TopDocs.ScoreDocs.Select(hit => searcher.Doc(hit.Doc)))
-                    {
-                        results.Add(new JsonObject(document.Select(x =>
-                            KeyValuePair.Create(x.Name, (JsonNode)JsonValue.Create(x.GetStringValue())))));
-                    }
+            }
+            else
+            {
+                var results = new List<JsonObject>();
 
-                    luceneQueryResults.Items = results;
+                foreach (var document in docs.TopDocs.ScoreDocs.Select(hit => searcher.Doc(hit.Doc)))
+                {
+                    results.Add(new JsonObject(document.Select(x =>
+                        KeyValuePair.Create(x.Name, (JsonNode)JsonValue.Create(x.GetStringValue())))));
                 }
-            });
 
-            return luceneQueryResults;
-        }
+                luceneQueryResults.Items = results;
+            }
+        });
+
+        return luceneQueryResults;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneSearchQueryService.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneSearchQueryService.cs
index a3958366b06..0274ccfd78f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneSearchQueryService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneSearchQueryService.cs
@@ -2,43 +2,42 @@
 using System.Threading.Tasks;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.Services
+namespace OrchardCore.Search.Lucene.Services;
+
+public class LuceneSearchQueryService : ILuceneSearchQueryService
 {
-    public class LuceneSearchQueryService : ILuceneSearchQueryService
-    {
-        private readonly LuceneIndexManager _luceneIndexManager;
+    private readonly LuceneIndexManager _luceneIndexManager;
 
-        private static readonly HashSet<string> _idSet = new(["ContentItemId"]);
+    private static readonly HashSet<string> _idSet = new(["ContentItemId"]);
 
-        public LuceneSearchQueryService(LuceneIndexManager luceneIndexManager)
-        {
-            _luceneIndexManager = luceneIndexManager;
-        }
+    public LuceneSearchQueryService(LuceneIndexManager luceneIndexManager)
+    {
+        _luceneIndexManager = luceneIndexManager;
+    }
 
-        public async Task<IList<string>> ExecuteQueryAsync(Query query, string indexName, int start, int end)
-        {
-            var contentItemIds = new List<string>();
+    public async Task<IList<string>> ExecuteQueryAsync(Query query, string indexName, int start, int end)
+    {
+        var contentItemIds = new List<string>();
 
-            await _luceneIndexManager.SearchAsync(indexName, searcher =>
+        await _luceneIndexManager.SearchAsync(indexName, searcher =>
+        {
+            if (end > 0)
             {
-                if (end > 0)
-                {
-                    var collector = TopScoreDocCollector.Create(end, true);
+                var collector = TopScoreDocCollector.Create(end, true);
 
-                    searcher.Search(query, collector);
-                    var hits = collector.GetTopDocs(start, end);
+                searcher.Search(query, collector);
+                var hits = collector.GetTopDocs(start, end);
 
-                    foreach (var hit in hits.ScoreDocs)
-                    {
-                        var d = searcher.Doc(hit.Doc, _idSet);
-                        contentItemIds.Add(d.GetField("ContentItemId").GetStringValue());
-                    }
+                foreach (var hit in hits.ScoreDocs)
+                {
+                    var d = searcher.Doc(hit.Doc, _idSet);
+                    contentItemIds.Add(d.GetField("ContentItemId").GetStringValue());
                 }
+            }
 
-                return Task.CompletedTask;
-            });
+            return Task.CompletedTask;
+        });
 
-            return contentItemIds;
-        }
+        return contentItemIds;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Settings/ContentPartFieldIndexSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Settings/ContentPartFieldIndexSettingsDisplayDriver.cs
index cbcc28fd7f5..e29c3a159d6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Settings/ContentPartFieldIndexSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Settings/ContentPartFieldIndexSettingsDisplayDriver.cs
@@ -8,48 +8,47 @@
 using OrchardCore.Search.Lucene.Model;
 using OrchardCore.Search.Lucene.ViewModels;
 
-namespace OrchardCore.Search.Lucene.Settings
+namespace OrchardCore.Search.Lucene.Settings;
+
+public sealed class ContentPartFieldIndexSettingsDisplayDriver : ContentPartFieldDefinitionDisplayDriver
 {
-    public sealed class ContentPartFieldIndexSettingsDisplayDriver : ContentPartFieldDefinitionDisplayDriver
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+
+    public ContentPartFieldIndexSettingsDisplayDriver(
+        IAuthorizationService authorizationService,
+        IHttpContextAccessor httpContextAccessor)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
 
-        public ContentPartFieldIndexSettingsDisplayDriver(
-            IAuthorizationService authorizationService,
-            IHttpContextAccessor httpContextAccessor)
+    public override async Task<IDisplayResult> EditAsync(ContentPartFieldDefinition contentPartFieldDefinition, BuildEditorContext updater)
+    {
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageLuceneIndexes))
         {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
+            return null;
         }
 
-        public override async Task<IDisplayResult> EditAsync(ContentPartFieldDefinition contentPartFieldDefinition, BuildEditorContext updater)
+        return Initialize<LuceneContentIndexSettingsViewModel>("LuceneContentIndexSettings_Edit", model =>
         {
-            if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageLuceneIndexes))
-            {
-                return null;
-            }
-
-            return Initialize<LuceneContentIndexSettingsViewModel>("LuceneContentIndexSettings_Edit", model =>
-            {
-                model.LuceneContentIndexSettings = contentPartFieldDefinition.GetSettings<LuceneContentIndexSettings>();
-            }).Location("Content:10");
-        }
+            model.LuceneContentIndexSettings = contentPartFieldDefinition.GetSettings<LuceneContentIndexSettings>();
+        }).Location("Content:10");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition contentPartFieldDefinition, UpdatePartFieldEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition contentPartFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageLuceneIndexes))
         {
-            if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageLuceneIndexes))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var model = new LuceneContentIndexSettingsViewModel();
+        var model = new LuceneContentIndexSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            context.Builder.WithSettings(model.LuceneContentIndexSettings);
+        context.Builder.WithSettings(model.LuceneContentIndexSettings);
 
-            return await EditAsync(contentPartFieldDefinition, context);
-        }
+        return await EditAsync(contentPartFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Settings/ContentPickerFieldLuceneEditorSettings.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Settings/ContentPickerFieldLuceneEditorSettings.cs
index 447df5ebb81..ee7d86fc2d9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Settings/ContentPickerFieldLuceneEditorSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Settings/ContentPickerFieldLuceneEditorSettings.cs
@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Search.Lucene.Settings
+namespace OrchardCore.Search.Lucene.Settings;
+
+public class ContentPickerFieldLuceneEditorSettings
 {
-    public class ContentPickerFieldLuceneEditorSettings
-    {
-        public string Index { get; set; }
+    public string Index { get; set; }
 
-        [BindNever]
-        public string[] Indices { get; set; }
-    }
+    [BindNever]
+    public string[] Indices { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Settings/ContentPickerFieldLuceneEditorSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Settings/ContentPickerFieldLuceneEditorSettingsDriver.cs
index b56d1c2be31..26e6a2cffc2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Settings/ContentPickerFieldLuceneEditorSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Settings/ContentPickerFieldLuceneEditorSettingsDriver.cs
@@ -7,45 +7,44 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Search.Lucene.Settings
+namespace OrchardCore.Search.Lucene.Settings;
+
+public sealed class ContentPickerFieldLuceneEditorSettingsDriver : ContentPartFieldDefinitionDisplayDriver
 {
-    public sealed class ContentPickerFieldLuceneEditorSettingsDriver : ContentPartFieldDefinitionDisplayDriver
-    {
-        private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
+    private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
 
-        public ContentPickerFieldLuceneEditorSettingsDriver(LuceneIndexSettingsService luceneIndexSettingsService)
-        {
-            _luceneIndexSettingsService = luceneIndexSettingsService;
-        }
+    public ContentPickerFieldLuceneEditorSettingsDriver(LuceneIndexSettingsService luceneIndexSettingsService)
+    {
+        _luceneIndexSettingsService = luceneIndexSettingsService;
+    }
 
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+    {
+        return Initialize<ContentPickerFieldLuceneEditorSettings>("ContentPickerFieldLuceneEditorSettings_Edit", async model =>
         {
-            return Initialize<ContentPickerFieldLuceneEditorSettings>("ContentPickerFieldLuceneEditorSettings_Edit", async model =>
-            {
-                var settings = partFieldDefinition.Settings.ToObject<ContentPickerFieldLuceneEditorSettings>();
+            var settings = partFieldDefinition.Settings.ToObject<ContentPickerFieldLuceneEditorSettings>();
 
-                model.Index = settings.Index;
-                model.Indices = (await _luceneIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
-            }).Location("Editor");
-        }
+            model.Index = settings.Index;
+            model.Indices = (await _luceneIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray();
+        }).Location("Editor");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        if (partFieldDefinition.Editor() == "Lucene")
         {
-            if (partFieldDefinition.Editor() == "Lucene")
-            {
-                var model = new ContentPickerFieldLuceneEditorSettings();
+            var model = new ContentPickerFieldLuceneEditorSettings();
 
-                await context.Updater.TryUpdateModelAsync(model, Prefix);
+            await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-                context.Builder.WithSettings(model);
-            }
-
-            return Edit(partFieldDefinition, context);
+            context.Builder.WithSettings(model);
         }
 
-        public override bool CanHandleModel(ContentPartFieldDefinition model)
-        {
-            return string.Equals("ContentPickerField", model.FieldDefinition.Name, StringComparison.Ordinal);
-        }
+        return Edit(partFieldDefinition, context);
+    }
+
+    public override bool CanHandleModel(ContentPartFieldDefinition model)
+    {
+        return string.Equals("ContentPickerField", model.FieldDefinition.Name, StringComparison.Ordinal);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Settings/ContentTypePartIndexSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Settings/ContentTypePartIndexSettingsDisplayDriver.cs
index 5b0e64c8ca0..7fb67654c78 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Settings/ContentTypePartIndexSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Settings/ContentTypePartIndexSettingsDisplayDriver.cs
@@ -8,48 +8,47 @@
 using OrchardCore.Search.Lucene.Model;
 using OrchardCore.Search.Lucene.ViewModels;
 
-namespace OrchardCore.Search.Lucene.Settings
+namespace OrchardCore.Search.Lucene.Settings;
+
+public sealed class ContentTypePartIndexSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver
 {
-    public sealed class ContentTypePartIndexSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+
+    public ContentTypePartIndexSettingsDisplayDriver(
+        IAuthorizationService authorizationService,
+        IHttpContextAccessor httpContextAccessor)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
 
-        public ContentTypePartIndexSettingsDisplayDriver(
-            IAuthorizationService authorizationService,
-            IHttpContextAccessor httpContextAccessor)
+    public override async Task<IDisplayResult> EditAsync(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    {
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageLuceneIndexes))
         {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
+            return null;
         }
 
-        public override async Task<IDisplayResult> EditAsync(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+        return Initialize<LuceneContentIndexSettingsViewModel>("LuceneContentIndexSettings_Edit", model =>
         {
-            if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageLuceneIndexes))
-            {
-                return null;
-            }
-
-            return Initialize<LuceneContentIndexSettingsViewModel>("LuceneContentIndexSettings_Edit", model =>
-            {
-                model.LuceneContentIndexSettings = contentTypePartDefinition.GetSettings<LuceneContentIndexSettings>();
-            }).Location("Content:10");
-        }
+            model.LuceneContentIndexSettings = contentTypePartDefinition.GetSettings<LuceneContentIndexSettings>();
+        }).Location("Content:10");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    {
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageLuceneIndexes))
         {
-            if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageLuceneIndexes))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var model = new LuceneContentIndexSettingsViewModel();
+        var model = new LuceneContentIndexSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            context.Builder.WithSettings(model.LuceneContentIndexSettings);
+        context.Builder.WithSettings(model.LuceneContentIndexSettings);
 
-            return await EditAsync(contentTypePartDefinition, context);
-        }
+        return await EditAsync(contentTypePartDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Shapes/LuceneContentPickerShapeProvider.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Shapes/LuceneContentPickerShapeProvider.cs
index 7c2335d0278..246bc0cbe65 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Shapes/LuceneContentPickerShapeProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Shapes/LuceneContentPickerShapeProvider.cs
@@ -4,28 +4,27 @@
 using OrchardCore.DisplayManagement.Descriptors;
 using OrchardCore.DisplayManagement.Shapes;
 
-namespace OrchardCore.Search.Lucene
+namespace OrchardCore.Search.Lucene;
+
+public class LuceneContentPickerShapeProvider : IShapeAttributeProvider
 {
-    public class LuceneContentPickerShapeProvider : IShapeAttributeProvider
-    {
-        protected readonly IStringLocalizer S;
+    protected readonly IStringLocalizer S;
 
-        public LuceneContentPickerShapeProvider(IStringLocalizer<LuceneContentPickerShapeProvider> stringLocalizer)
-        {
-            S = stringLocalizer;
-        }
+    public LuceneContentPickerShapeProvider(IStringLocalizer<LuceneContentPickerShapeProvider> stringLocalizer)
+    {
+        S = stringLocalizer;
+    }
 
-        [Shape]
+    [Shape]
 #pragma warning disable CA1707 // Remove the underscores from member name
-        public IHtmlContent ContentPickerField_Option__Lucene(dynamic shape)
+    public IHtmlContent ContentPickerField_Option__Lucene(dynamic shape)
 #pragma warning restore CA1707
+    {
+        var selected = shape.Editor == "Lucene";
+        if (selected)
         {
-            var selected = shape.Editor == "Lucene";
-            if (selected)
-            {
-                return new HtmlString($"<option value=\"Lucene\" selected=\"selected\">{S["Lucene"]}</option>");
-            }
-            return new HtmlString($"<option value=\"Lucene\">{S["Lucene"]}</option>");
+            return new HtmlString($"<option value=\"Lucene\" selected=\"selected\">{S["Lucene"]}</option>");
         }
+        return new HtmlString($"<option value=\"Lucene\">{S["Lucene"]}</option>");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Startup.cs
index 70845b2ce49..4db6f1ee0d4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Startup.cs
@@ -27,92 +27,91 @@
 using OrchardCore.Security.Permissions;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Search.Lucene
+namespace OrchardCore.Search.Lucene;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDataMigration<Migrations>();
-            services.AddSingleton<LuceneIndexingState>();
-            services.AddSingleton<LuceneIndexSettingsService>();
-            services.AddSingleton<LuceneIndexManager>();
-            services.AddSingleton<LuceneAnalyzerManager>();
-            services.AddScoped<LuceneIndexingService>();
-            services.AddScoped<IModularTenantEvents, LuceneIndexInitializerService>();
-            services.AddScoped<ILuceneSearchQueryService, LuceneSearchQueryService>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddDataMigration<Migrations>();
+        services.AddSingleton<LuceneIndexingState>();
+        services.AddSingleton<LuceneIndexSettingsService>();
+        services.AddSingleton<LuceneIndexManager>();
+        services.AddSingleton<LuceneAnalyzerManager>();
+        services.AddScoped<LuceneIndexingService>();
+        services.AddScoped<IModularTenantEvents, LuceneIndexInitializerService>();
+        services.AddScoped<ILuceneSearchQueryService, LuceneSearchQueryService>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IPermissionProvider, Permissions>();
 
-            services.Configure<LuceneOptions>(o =>
-                o.Analyzers.Add(new LuceneAnalyzer(LuceneSettings.StandardAnalyzer,
-                    new StandardAnalyzer(LuceneSettings.DefaultVersion))));
+        services.Configure<LuceneOptions>(o =>
+            o.Analyzers.Add(new LuceneAnalyzer(LuceneSettings.StandardAnalyzer,
+                new StandardAnalyzer(LuceneSettings.DefaultVersion))));
 
-            services.AddScoped<IDisplayDriver<Query>, LuceneQueryDisplayDriver>();
-            services.AddScoped<IContentHandler, LuceneIndexingContentHandler>();
+        services.AddScoped<IDisplayDriver<Query>, LuceneQueryDisplayDriver>();
+        services.AddScoped<IContentHandler, LuceneIndexingContentHandler>();
 
-            services.AddLuceneQueries()
-                .AddQuerySource<LuceneQuerySource>(LuceneQuerySource.SourceName);
+        services.AddLuceneQueries()
+            .AddQuerySource<LuceneQuerySource>(LuceneQuerySource.SourceName);
 
-            services.AddRecipeExecutionStep<LuceneIndexStep>();
-            services.AddRecipeExecutionStep<LuceneIndexRebuildStep>();
-            services.AddRecipeExecutionStep<LuceneIndexResetStep>();
-            services.AddScoped<IAuthorizationHandler, LuceneAuthorizationHandler>();
-            services.AddDataMigration<LuceneQueryMigrations>();
-            services.AddScoped<IQueryHandler, LuceneQueryHandler>();
-        }
+        services.AddRecipeExecutionStep<LuceneIndexStep>();
+        services.AddRecipeExecutionStep<LuceneIndexRebuildStep>();
+        services.AddRecipeExecutionStep<LuceneIndexResetStep>();
+        services.AddScoped<IAuthorizationHandler, LuceneAuthorizationHandler>();
+        services.AddDataMigration<LuceneQueryMigrations>();
+        services.AddScoped<IQueryHandler, LuceneQueryHandler>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Search")]
-    public sealed class SearchStartup : StartupBase
+[RequireFeatures("OrchardCore.Search")]
+public sealed class SearchStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<ISearchService, LuceneSearchService>();
-            services.AddScoped<IDisplayDriver<ISite>, LuceneSettingsDisplayDriver>();
-            services.AddScoped<IAuthorizationHandler, LuceneAuthorizationHandler>();
-        }
+        services.AddScoped<ISearchService, LuceneSearchService>();
+        services.AddScoped<IDisplayDriver<ISite>, LuceneSettingsDisplayDriver>();
+        services.AddScoped<IAuthorizationHandler, LuceneAuthorizationHandler>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class DeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class DeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<LuceneIndexDeploymentSource, LuceneIndexDeploymentStep, LuceneIndexDeploymentStepDriver>();
-            services.AddDeployment<LuceneSettingsDeploymentSource, LuceneSettingsDeploymentStep, LuceneSettingsDeploymentStepDriver>();
-            services.AddDeployment<LuceneIndexRebuildDeploymentSource, LuceneIndexRebuildDeploymentStep, LuceneIndexRebuildDeploymentStepDriver>();
-            services.AddDeployment<LuceneIndexResetDeploymentSource, LuceneIndexResetDeploymentStep, LuceneIndexResetDeploymentStepDriver>();
-        }
+        services.AddDeployment<LuceneIndexDeploymentSource, LuceneIndexDeploymentStep, LuceneIndexDeploymentStepDriver>();
+        services.AddDeployment<LuceneSettingsDeploymentSource, LuceneSettingsDeploymentStep, LuceneSettingsDeploymentStepDriver>();
+        services.AddDeployment<LuceneIndexRebuildDeploymentSource, LuceneIndexRebuildDeploymentStep, LuceneIndexRebuildDeploymentStepDriver>();
+        services.AddDeployment<LuceneIndexResetDeploymentSource, LuceneIndexResetDeploymentStep, LuceneIndexResetDeploymentStepDriver>();
     }
+}
 
-    [Feature("OrchardCore.Search.Lucene.Worker")]
-    public sealed class LuceneWorkerStartup : StartupBase
+[Feature("OrchardCore.Search.Lucene.Worker")]
+public sealed class LuceneWorkerStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSingleton<IBackgroundTask, IndexingBackgroundTask>();
-        }
+        services.AddSingleton<IBackgroundTask, IndexingBackgroundTask>();
     }
+}
 
-    [Feature("OrchardCore.Search.Lucene.ContentPicker")]
-    public sealed class LuceneContentPickerStartup : StartupBase
+[Feature("OrchardCore.Search.Lucene.ContentPicker")]
+public sealed class LuceneContentPickerStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IContentPickerResultProvider, LuceneContentPickerResultProvider>();
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, ContentPickerFieldLuceneEditorSettingsDriver>();
-            services.AddShapeAttributes<LuceneContentPickerShapeProvider>();
-        }
+        services.AddScoped<IContentPickerResultProvider, LuceneContentPickerResultProvider>();
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, ContentPickerFieldLuceneEditorSettingsDriver>();
+        services.AddShapeAttributes<LuceneContentPickerShapeProvider>();
     }
+}
 
-    [RequireFeatures("OrchardCore.ContentTypes")]
-    public sealed class ContentTypesStartup : StartupBase
+[RequireFeatures("OrchardCore.ContentTypes")]
+public sealed class ContentTypesStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, ContentTypePartIndexSettingsDisplayDriver>();
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, ContentPartFieldIndexSettingsDisplayDriver>();
-        }
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, ContentTypePartIndexSettingsDisplayDriver>();
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, ContentPartFieldIndexSettingsDisplayDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/AdminIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/AdminIndexViewModel.cs
index 03ffde772b5..381c9d1a842 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/AdminIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/AdminIndexViewModel.cs
@@ -2,37 +2,36 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.Search.Lucene.ViewModels
+namespace OrchardCore.Search.Lucene.ViewModels;
+
+public class AdminIndexViewModel
 {
-    public class AdminIndexViewModel
-    {
-        public IEnumerable<IndexViewModel> Indexes { get; set; }
+    public IEnumerable<IndexViewModel> Indexes { get; set; }
 
-        public ContentOptions Options { get; set; } = new ContentOptions();
+    public ContentOptions Options { get; set; } = new ContentOptions();
 
-        [BindNever]
-        public dynamic Pager { get; set; }
-    }
+    [BindNever]
+    public dynamic Pager { get; set; }
+}
 
-    public class ContentOptions
-    {
-        public ContentsBulkAction BulkAction { get; set; }
+public class ContentOptions
+{
+    public ContentsBulkAction BulkAction { get; set; }
 
-        public string Search { get; set; }
+    public string Search { get; set; }
 
-        #region Lists to populate
+    #region Lists to populate
 
-        [BindNever]
-        public List<SelectListItem> ContentsBulkAction { get; set; }
+    [BindNever]
+    public List<SelectListItem> ContentsBulkAction { get; set; }
 
-        #endregion Lists to populate
-    }
+    #endregion Lists to populate
+}
 
-    public enum ContentsBulkAction
-    {
-        None,
-        Reset,
-        Rebuild,
-        Remove
-    }
+public enum ContentsBulkAction
+{
+    None,
+    Reset,
+    Rebuild,
+    Remove
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/AdminQueryViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/AdminQueryViewModel.cs
index 74694a8a570..61f33b6f2da 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/AdminQueryViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/AdminQueryViewModel.cs
@@ -3,24 +3,23 @@
 using Lucene.Net.Documents;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Search.Lucene.ViewModels
+namespace OrchardCore.Search.Lucene.ViewModels;
+
+public class AdminQueryViewModel
 {
-    public class AdminQueryViewModel
-    {
-        public string DecodedQuery { get; set; }
-        public string IndexName { get; set; }
-        public string Parameters { get; set; }
+    public string DecodedQuery { get; set; }
+    public string IndexName { get; set; }
+    public string Parameters { get; set; }
 
-        [BindNever]
-        public int Count { get; set; }
+    [BindNever]
+    public int Count { get; set; }
 
-        [BindNever]
-        public string[] Indices { get; set; }
+    [BindNever]
+    public string[] Indices { get; set; }
 
-        [BindNever]
-        public TimeSpan Elapsed { get; set; } = TimeSpan.Zero;
+    [BindNever]
+    public TimeSpan Elapsed { get; set; } = TimeSpan.Zero;
 
-        [BindNever]
-        public IEnumerable<Document> Documents { get; set; } = [];
-    }
+    [BindNever]
+    public IEnumerable<Document> Documents { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/IndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/IndexViewModel.cs
index 913ad71c997..ad14879f254 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/IndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/IndexViewModel.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace OrchardCore.Search.Lucene.ViewModels
+namespace OrchardCore.Search.Lucene.ViewModels;
+
+public class IndexViewModel
 {
-    public class IndexViewModel
-    {
-        public string Name { get; set; }
-        public string AnalyzerName { get; set; }
-        public DateTime LastUpdateUtc { get; set; }
-    }
+    public string Name { get; set; }
+    public string AnalyzerName { get; set; }
+    public DateTime LastUpdateUtc { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneContentIndexSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneContentIndexSettingsViewModel.cs
index 4f2b08dbe57..2aa3074dd75 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneContentIndexSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneContentIndexSettingsViewModel.cs
@@ -1,9 +1,8 @@
 using OrchardCore.Search.Lucene.Model;
 
-namespace OrchardCore.Search.Lucene.ViewModels
+namespace OrchardCore.Search.Lucene.ViewModels;
+
+public class LuceneContentIndexSettingsViewModel
 {
-    public class LuceneContentIndexSettingsViewModel
-    {
-        public LuceneContentIndexSettings LuceneContentIndexSettings { get; set; }
-    }
+    public LuceneContentIndexSettings LuceneContentIndexSettings { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneIndexDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneIndexDeploymentStepViewModel.cs
index 388d798a89a..a0b3f826237 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneIndexDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneIndexDeploymentStepViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Search.Lucene.ViewModels
+namespace OrchardCore.Search.Lucene.ViewModels;
+
+public class LuceneIndexDeploymentStepViewModel
 {
-    public class LuceneIndexDeploymentStepViewModel
-    {
-        public bool IncludeAll { get; set; }
-        public string[] IndexNames { get; set; }
-        public string[] AllIndexNames { get; set; }
-    }
+    public bool IncludeAll { get; set; }
+    public string[] IndexNames { get; set; }
+    public string[] AllIndexNames { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneIndexRebuildDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneIndexRebuildDeploymentStepViewModel.cs
index 71864a638bd..93c9b9fc0f2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneIndexRebuildDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneIndexRebuildDeploymentStepViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Search.Lucene.ViewModels
+namespace OrchardCore.Search.Lucene.ViewModels;
+
+public class LuceneIndexRebuildDeploymentStepViewModel
 {
-    public class LuceneIndexRebuildDeploymentStepViewModel
-    {
-        public bool IncludeAll { get; set; }
-        public string[] IndexNames { get; set; }
-        public string[] AllIndexNames { get; set; }
-    }
+    public bool IncludeAll { get; set; }
+    public string[] IndexNames { get; set; }
+    public string[] AllIndexNames { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneIndexResetDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneIndexResetDeploymentStepViewModel.cs
index da3a86f1127..5a8eac15d25 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneIndexResetDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneIndexResetDeploymentStepViewModel.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Search.Lucene.ViewModels
+namespace OrchardCore.Search.Lucene.ViewModels;
+
+public class LuceneIndexResetDeploymentStepViewModel
 {
-    public class LuceneIndexResetDeploymentStepViewModel
-    {
-        public bool IncludeAll { get; set; }
-        public string[] IndexNames { get; set; }
-        public string[] AllIndexNames { get; set; }
-    }
+    public bool IncludeAll { get; set; }
+    public string[] IndexNames { get; set; }
+    public string[] AllIndexNames { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneIndexSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneIndexSettingsViewModel.cs
index 33e25b7047c..8731ce006b0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneIndexSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneIndexSettingsViewModel.cs
@@ -2,32 +2,31 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.Search.Lucene.ViewModels
+namespace OrchardCore.Search.Lucene.ViewModels;
+
+public class LuceneIndexSettingsViewModel
 {
-    public class LuceneIndexSettingsViewModel
-    {
-        public string IndexName { get; set; }
+    public string IndexName { get; set; }
 
-        public string AnalyzerName { get; set; }
+    public string AnalyzerName { get; set; }
 
-        public bool IndexLatest { get; set; }
+    public bool IndexLatest { get; set; }
 
-        public string Culture { get; set; }
+    public string Culture { get; set; }
 
-        public string[] IndexedContentTypes { get; set; }
+    public string[] IndexedContentTypes { get; set; }
 
-        public bool IsCreate { get; set; }
+    public bool IsCreate { get; set; }
 
-        public bool StoreSourceData { get; set; }
+    public bool StoreSourceData { get; set; }
 
-        #region List to populate
+    #region List to populate
 
-        [BindNever]
-        public IEnumerable<SelectListItem> Analyzers { get; set; }
+    [BindNever]
+    public IEnumerable<SelectListItem> Analyzers { get; set; }
 
-        [BindNever]
-        public IEnumerable<SelectListItem> Cultures { get; set; }
+    [BindNever]
+    public IEnumerable<SelectListItem> Cultures { get; set; }
 
-        #endregion List to populate
-    }
+    #endregion List to populate
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneQueryViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneQueryViewModel.cs
index 09c5567cc54..b29ea658989 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneQueryViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneQueryViewModel.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.Search.Lucene.ViewModels
+namespace OrchardCore.Search.Lucene.ViewModels;
+
+public class LuceneQueryViewModel
 {
-    public class LuceneQueryViewModel
-    {
-        public string[] Indices { get; set; }
-        public string Index { get; set; }
-        public string Query { get; set; }
-        public bool ReturnContentItems { get; set; }
-    }
+    public string[] Indices { get; set; }
+    public string Index { get; set; }
+    public string Query { get; set; }
+    public bool ReturnContentItems { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneSettingsViewModel.cs
index 2e591c59686..71c60a7702a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/LuceneSettingsViewModel.cs
@@ -1,13 +1,12 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Search.Lucene.ViewModels
+namespace OrchardCore.Search.Lucene.ViewModels;
+
+public class LuceneSettingsViewModel
 {
-    public class LuceneSettingsViewModel
-    {
-        public string Analyzer { get; set; }
-        public string SearchIndex { get; set; }
-        public IEnumerable<string> SearchIndexes { get; set; }
-        public string SearchFields { get; set; }
-        public bool AllowLuceneQueriesInSearch { get; set; }
-    }
+    public string Analyzer { get; set; }
+    public string SearchIndex { get; set; }
+    public IEnumerable<string> SearchIndexes { get; set; }
+    public string SearchFields { get; set; }
+    public bool AllowLuceneQueriesInSearch { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/QueryIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/QueryIndexViewModel.cs
index 8e3d9cba608..06c1e31e767 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/QueryIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/ViewModels/QueryIndexViewModel.cs
@@ -3,17 +3,16 @@
 using Lucene.Net.Documents;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Search.Lucene.ViewModels
+namespace OrchardCore.Search.Lucene.ViewModels;
+
+public class QueryIndexViewModel
 {
-    public class QueryIndexViewModel
-    {
-        public string Query { get; set; }
-        public string IndexName { get; set; }
+    public string Query { get; set; }
+    public string IndexName { get; set; }
 
-        [BindNever]
-        public TimeSpan Duration { get; set; }
+    [BindNever]
+    public TimeSpan Duration { get; set; }
 
-        [BindNever]
-        public IEnumerable<Document> Documents { get; set; } = [];
-    }
+    [BindNever]
+    public IEnumerable<Document> Documents { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs
index c1a3be29143..8fe4f9a1135 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs
@@ -3,44 +3,43 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Search
+namespace OrchardCore.Search;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", SearchConstants.SearchSettingsGroupId },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", SearchConstants.SearchSettingsGroupId },
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
-        {
-            S = localizer;
-        }
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
-                    .AddClass("search")
-                    .Id("search")
-                    .Add(S["Settings"], S["Settings"].PrefixPosition(), settings => settings
-                        .Action("Index", "Admin", _routeValues)
-                        .AddClass("searchsettings")
-                        .Id("searchsettings")
-                        .Permission(Permissions.ManageSearchSettings)
-                        .LocalNav()
-                    )
-                );
-
             return Task.CompletedTask;
         }
+
+        builder
+            .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search
+                .AddClass("search")
+                .Id("search")
+                .Add(S["Settings"], S["Settings"].PrefixPosition(), settings => settings
+                    .Action("Index", "Admin", _routeValues)
+                    .AddClass("searchsettings")
+                    .Id("searchsettings")
+                    .Permission(Permissions.ManageSearchSettings)
+                    .LocalNav()
+                )
+            );
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search/Deployment/SearchSettingsDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Search/Deployment/SearchSettingsDeploymentSource.cs
index 9d1c201a7a6..af19dad1773 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search/Deployment/SearchSettingsDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search/Deployment/SearchSettingsDeploymentSource.cs
@@ -4,31 +4,30 @@
 using OrchardCore.Search.Models;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Search.Deployment
+namespace OrchardCore.Search.Deployment;
+
+public class SearchSettingsDeploymentSource : IDeploymentSource
 {
-    public class SearchSettingsDeploymentSource : IDeploymentSource
+    private readonly ISiteService _siteService;
+
+    public SearchSettingsDeploymentSource(ISiteService site)
     {
-        private readonly ISiteService _siteService;
+        _siteService = site;
+    }
 
-        public SearchSettingsDeploymentSource(ISiteService site)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        if (step is not SearchSettingsDeploymentStep)
         {
-            _siteService = site;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
-        {
-            if (step is not SearchSettingsDeploymentStep)
-            {
-                return;
-            }
-
-            var searchSettings = await _siteService.GetSettingsAsync<SearchSettings>();
+        var searchSettings = await _siteService.GetSettingsAsync<SearchSettings>();
 
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "Settings",
-                ["SearchSettings"] = JObject.FromObject(searchSettings),
-            });
-        }
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "Settings",
+            ["SearchSettings"] = JObject.FromObject(searchSettings),
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search/Deployment/SearchSettingsDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Search/Deployment/SearchSettingsDeploymentStep.cs
index e0eca39d37a..e8362236c3e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search/Deployment/SearchSettingsDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search/Deployment/SearchSettingsDeploymentStep.cs
@@ -1,15 +1,14 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Search.Deployment
+namespace OrchardCore.Search.Deployment;
+
+/// <summary>
+/// Adds layers to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class SearchSettingsDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds layers to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class SearchSettingsDeploymentStep : DeploymentStep
+    public SearchSettingsDeploymentStep()
     {
-        public SearchSettingsDeploymentStep()
-        {
-            Name = "SearchSettings";
-        }
+        Name = "SearchSettings";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search/Deployment/SearchSettingsDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Search/Deployment/SearchSettingsDeploymentStepDriver.cs
index b166778b1c9..155710f10e9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search/Deployment/SearchSettingsDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search/Deployment/SearchSettingsDeploymentStepDriver.cs
@@ -3,22 +3,21 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Search.Deployment
+namespace OrchardCore.Search.Deployment;
+
+public sealed class SearchSettingsDeploymentStepDriver : DisplayDriver<DeploymentStep, SearchSettingsDeploymentStep>
 {
-    public sealed class SearchSettingsDeploymentStepDriver : DisplayDriver<DeploymentStep, SearchSettingsDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(SearchSettingsDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(SearchSettingsDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("SearchSettingsDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("SearchSettingsDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("SearchSettingsDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("SearchSettingsDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(SearchSettingsDeploymentStep step, BuildEditorContext context)
-        {
-            return View("SearchSettingsDeploymentStep_Fields_Edit", step).Location("Content");
-        }
+    public override IDisplayResult Edit(SearchSettingsDeploymentStep step, BuildEditorContext context)
+    {
+        return View("SearchSettingsDeploymentStep_Fields_Edit", step).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search/Drivers/SearchSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Search/Drivers/SearchSettingsDisplayDriver.cs
index 2c28ce66707..0c6abba8908 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search/Drivers/SearchSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search/Drivers/SearchSettingsDisplayDriver.cs
@@ -13,70 +13,69 @@
 using OrchardCore.Search.ViewModels;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Search.Drivers
+namespace OrchardCore.Search.Drivers;
+
+public sealed class SearchSettingsDisplayDriver : SiteDisplayDriver<SearchSettings>
 {
-    public sealed class SearchSettingsDisplayDriver : SiteDisplayDriver<SearchSettings>
+    [Obsolete("This property should not be used. Instead use  SearchConstants.SearchSettingsGroupId.")]
+    public const string GroupId = SearchConstants.SearchSettingsGroupId;
+
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IServiceProvider _serviceProvider;
+
+    public SearchSettingsDisplayDriver(
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService,
+        IServiceProvider serviceProvider
+        )
     {
-        [Obsolete("This property should not be used. Instead use  SearchConstants.SearchSettingsGroupId.")]
-        public const string GroupId = SearchConstants.SearchSettingsGroupId;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+        _serviceProvider = serviceProvider;
+    }
 
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IServiceProvider _serviceProvider;
+    protected override string SettingsGroupId
+        => SearchConstants.SearchSettingsGroupId;
 
-        public SearchSettingsDisplayDriver(
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService,
-            IServiceProvider serviceProvider
-            )
+    public override async Task<IDisplayResult> EditAsync(ISite site, SearchSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageSearchSettings))
         {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-            _serviceProvider = serviceProvider;
+            return null;
         }
 
-        protected override string SettingsGroupId
-            => SearchConstants.SearchSettingsGroupId;
-
-        public override async Task<IDisplayResult> EditAsync(ISite site, SearchSettings settings, BuildEditorContext context)
+        return Initialize<SearchSettingsViewModel>("SearchSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
+            var searchServices = _serviceProvider.GetServices<ISearchService>();
 
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageSearchSettings))
-            {
-                return null;
-            }
-
-            return Initialize<SearchSettingsViewModel>("SearchSettings_Edit", model =>
-            {
-                var searchServices = _serviceProvider.GetServices<ISearchService>();
+            model.SearchServices = searchServices.Select(service => new SelectListItem(service.Name, service.Name)).ToList();
+            model.Placeholder = settings.Placeholder;
+            model.PageTitle = settings.PageTitle;
+            model.ProviderName = settings.ProviderName;
+        }).Location("Content:2")
+        .OnGroup(SettingsGroupId);
+    }
 
-                model.SearchServices = searchServices.Select(service => new SelectListItem(service.Name, service.Name)).ToList();
-                model.Placeholder = settings.Placeholder;
-                model.PageTitle = settings.PageTitle;
-                model.ProviderName = settings.ProviderName;
-            }).Location("Content:2")
-            .OnGroup(SettingsGroupId);
-        }
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, SearchSettings section, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, SearchSettings section, UpdateEditorContext context)
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageSearchSettings))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageSearchSettings))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var model = new SearchSettingsViewModel();
+        var model = new SearchSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            section.ProviderName = model.ProviderName;
-            section.Placeholder = model.Placeholder;
-            section.PageTitle = model.PageTitle;
+        section.ProviderName = model.ProviderName;
+        section.Placeholder = model.Placeholder;
+        section.PageTitle = model.PageTitle;
 
-            return await EditAsync(site, section, context);
-        }
+        return await EditAsync(site, section, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search/Model/SearchSettings.cs b/src/OrchardCore.Modules/OrchardCore.Search/Model/SearchSettings.cs
index 98cb737ebe5..e366f278854 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search/Model/SearchSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search/Model/SearchSettings.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.Search.Models
+namespace OrchardCore.Search.Models;
+
+public class SearchSettings
 {
-    public class SearchSettings
-    {
-        public string ProviderName { get; set; }
+    public string ProviderName { get; set; }
 
-        public string Placeholder { get; set; }
+    public string Placeholder { get; set; }
 
-        public string PageTitle { get; set; }
-    }
+    public string PageTitle { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search/Services/SearchSettingsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Search/Services/SearchSettingsConfiguration.cs
index c632e5555ed..76e221c42df 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search/Services/SearchSettingsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search/Services/SearchSettingsConfiguration.cs
@@ -2,24 +2,23 @@
 using OrchardCore.Search.Models;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Search.Configuration
+namespace OrchardCore.Search.Configuration;
+
+public sealed class SearchSettingsConfiguration : IConfigureOptions<SearchSettings>
 {
-    public sealed class SearchSettingsConfiguration : IConfigureOptions<SearchSettings>
-    {
-        private readonly ISiteService _siteService;
+    private readonly ISiteService _siteService;
 
-        public SearchSettingsConfiguration(ISiteService site)
-        {
-            _siteService = site;
-        }
+    public SearchSettingsConfiguration(ISiteService site)
+    {
+        _siteService = site;
+    }
 
-        public void Configure(SearchSettings options)
-        {
-            var settings = _siteService.GetSettingsAsync<SearchSettings>()
-                .GetAwaiter()
-                .GetResult();
+    public void Configure(SearchSettings options)
+    {
+        var settings = _siteService.GetSettingsAsync<SearchSettings>()
+            .GetAwaiter()
+            .GetResult();
 
-            options.ProviderName = settings.ProviderName;
-        }
+        options.ProviderName = settings.ProviderName;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Search/Startup.cs
index 0d066865872..33819e18b65 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search/Startup.cs
@@ -21,57 +21,56 @@
 using OrchardCore.Security.Permissions;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Search
+namespace OrchardCore.Search;
+
+/// <summary>
+/// These services are registered on the tenant service collection.
+/// </summary>
+public sealed class Startup : StartupBase
 {
-    /// <summary>
-    /// These services are registered on the tenant service collection.
-    /// </summary>
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddTransient<IConfigureOptions<SearchSettings>, SearchSettingsConfiguration>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<IDisplayDriver<ISite>, SearchSettingsDisplayDriver>();
+        services.AddTransient<IConfigureOptions<SearchSettings>, SearchSettingsConfiguration>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<IDisplayDriver<ISite>, SearchSettingsDisplayDriver>();
 
-            services.AddContentPart<SearchFormPart>()
-                    .UseDisplayDriver<SearchFormPartDisplayDriver>();
+        services.AddContentPart<SearchFormPart>()
+                .UseDisplayDriver<SearchFormPartDisplayDriver>();
 
-            services.AddDataMigration<SearchMigrations>();
-        }
+        services.AddDataMigration<SearchMigrations>();
+    }
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            routes.MapAreaControllerRoute(
-                name: "Search",
-                areaName: "OrchardCore.Search",
-                pattern: "search/{index?}",
-                defaults: new { controller = typeof(SearchController).ControllerName(), action = nameof(SearchController.Search) }
-            );
-        }
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        routes.MapAreaControllerRoute(
+            name: "Search",
+            areaName: "OrchardCore.Search",
+            pattern: "search/{index?}",
+            defaults: new { controller = typeof(SearchController).ControllerName(), action = nameof(SearchController.Search) }
+        );
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class DeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class DeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<SearchSettingsDeploymentSource, SearchSettingsDeploymentStep, SearchSettingsDeploymentStepDriver>();
-        }
+        services.AddDeployment<SearchSettingsDeploymentSource, SearchSettingsDeploymentStep, SearchSettingsDeploymentStepDriver>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Liquid")]
-    public sealed class LiquidStartup : StartupBase
+[RequireFeatures("OrchardCore.Liquid")]
+public sealed class LiquidStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<SearchIndexViewModel>();
-                o.MemberAccessStrategy.Register<SearchFormViewModel>();
-                o.MemberAccessStrategy.Register<SearchResultsViewModel>();
-            });
-        }
+            o.MemberAccessStrategy.Register<SearchIndexViewModel>();
+            o.MemberAccessStrategy.Register<SearchFormViewModel>();
+            o.MemberAccessStrategy.Register<SearchResultsViewModel>();
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search/ViewModel/SearchSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Search/ViewModel/SearchSettingsViewModel.cs
index ff51f450ae7..eca2c9f5c5b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search/ViewModel/SearchSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search/ViewModel/SearchSettingsViewModel.cs
@@ -2,17 +2,16 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.Search.ViewModels
+namespace OrchardCore.Search.ViewModels;
+
+public class SearchSettingsViewModel
 {
-    public class SearchSettingsViewModel
-    {
-        public string ProviderName { get; set; }
+    public string ProviderName { get; set; }
 
-        public string Placeholder { get; set; }
+    public string Placeholder { get; set; }
 
-        public string PageTitle { get; set; }
+    public string PageTitle { get; set; }
 
-        [BindNever]
-        public IList<SelectListItem> SearchServices { get; set; }
-    }
+    [BindNever]
+    public IList<SelectListItem> SearchServices { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs
index 71e84ce9b5f..0a79a029868 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs
@@ -4,45 +4,44 @@
 using OrchardCore.Navigation;
 using OrchardCore.Security.Drivers;
 
-namespace OrchardCore.Security
+namespace OrchardCore.Security;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", SecuritySettingsDisplayDriver.GroupId },
+        { "area", "OrchardCore.Settings" },
+        { "groupId", SecuritySettingsDisplayDriver.GroupId },
+
+    };
 
-        };
+    internal readonly IStringLocalizer S;
 
-        internal readonly IStringLocalizer S;
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
-                    .AddClass("security")
-                    .Id("security")
-                    .Add(S["Settings"], settings => settings
-                        .Add(S["Security Headers"], S["Security Headers"].PrefixPosition(), headers => headers
-                            .Permission(SecurityPermissions.ManageSecurityHeadersSettings)
-                            .Action("Index", "Admin", _routeValues)
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
+                .AddClass("security")
+                .Id("security")
+                .Add(S["Settings"], settings => settings
+                    .Add(S["Security Headers"], S["Security Headers"].PrefixPosition(), headers => headers
+                        .Permission(SecurityPermissions.ManageSecurityHeadersSettings)
+                        .Action("Index", "Admin", _routeValues)
+                        .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Drivers/SecuritySettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Security/Drivers/SecuritySettingsDisplayDriver.cs
index d2b794ae071..1d6d0dd073c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Drivers/SecuritySettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Drivers/SecuritySettingsDisplayDriver.cs
@@ -11,110 +11,109 @@
 using OrchardCore.Security.ViewModels;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Security.Drivers
+namespace OrchardCore.Security.Drivers;
+
+public sealed class SecuritySettingsDisplayDriver : SiteDisplayDriver<SecuritySettings>
 {
-    public sealed class SecuritySettingsDisplayDriver : SiteDisplayDriver<SecuritySettings>
-    {
-        internal const string GroupId = "SecurityHeaders";
+    internal const string GroupId = "SecurityHeaders";
+
+    private readonly IShellReleaseManager _shellReleaseManager;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly SecuritySettings _securitySettings;
 
-        private readonly IShellReleaseManager _shellReleaseManager;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly SecuritySettings _securitySettings;
+    protected override string SettingsGroupId
+        => GroupId;
 
-        protected override string SettingsGroupId
-            => GroupId;
+    public SecuritySettingsDisplayDriver(
+        IShellReleaseManager shellReleaseManager,
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService,
+        IOptionsSnapshot<SecuritySettings> securitySettings)
+    {
+        _shellReleaseManager = shellReleaseManager;
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+        _securitySettings = securitySettings.Value;
+    }
 
-        public SecuritySettingsDisplayDriver(
-            IShellReleaseManager shellReleaseManager,
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService,
-            IOptionsSnapshot<SecuritySettings> securitySettings)
+    public override async Task<IDisplayResult> EditAsync(ISite site, SecuritySettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+
+        if (!await _authorizationService.AuthorizeAsync(user, SecurityPermissions.ManageSecurityHeadersSettings))
         {
-            _shellReleaseManager = shellReleaseManager;
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-            _securitySettings = securitySettings.Value;
+            return null;
         }
 
-        public override async Task<IDisplayResult> EditAsync(ISite site, SecuritySettings settings, BuildEditorContext context)
-        {
-            var user = _httpContextAccessor.HttpContext?.User;
+        context.AddTenantReloadWarningWrapper();
 
-            if (!await _authorizationService.AuthorizeAsync(user, SecurityPermissions.ManageSecurityHeadersSettings))
+        return Initialize<SecuritySettingsViewModel>("SecurityHeadersSettings_Edit", model =>
+        {
+            // Set the settings from configuration when AdminSettings are overridden via ConfigureSecuritySettings()
+            var currentSettings = settings;
+            if (_securitySettings.FromConfiguration)
             {
-                return null;
+                currentSettings = _securitySettings;
             }
 
-            context.AddTenantReloadWarningWrapper();
+            model.FromConfiguration = currentSettings.FromConfiguration;
+            model.ContentSecurityPolicy = currentSettings.ContentSecurityPolicy;
+            model.PermissionsPolicy = currentSettings.PermissionsPolicy;
+            model.ReferrerPolicy = currentSettings.ReferrerPolicy;
 
-            return Initialize<SecuritySettingsViewModel>("SecurityHeadersSettings_Edit", model =>
-            {
-                // Set the settings from configuration when AdminSettings are overridden via ConfigureSecuritySettings()
-                var currentSettings = settings;
-                if (_securitySettings.FromConfiguration)
-                {
-                    currentSettings = _securitySettings;
-                }
-
-                model.FromConfiguration = currentSettings.FromConfiguration;
-                model.ContentSecurityPolicy = currentSettings.ContentSecurityPolicy;
-                model.PermissionsPolicy = currentSettings.PermissionsPolicy;
-                model.ReferrerPolicy = currentSettings.ReferrerPolicy;
-
-                model.EnableSandbox = currentSettings.ContentSecurityPolicy != null &&
-                    currentSettings.ContentSecurityPolicy.ContainsKey(ContentSecurityPolicyValue.Sandbox);
-
-                model.UpgradeInsecureRequests = currentSettings.ContentSecurityPolicy != null &&
-                    currentSettings.ContentSecurityPolicy.ContainsKey(ContentSecurityPolicyValue.UpgradeInsecureRequests);
-            }).Location("Content:2")
-            .OnGroup(SettingsGroupId);
-        }
+            model.EnableSandbox = currentSettings.ContentSecurityPolicy != null &&
+                currentSettings.ContentSecurityPolicy.ContainsKey(ContentSecurityPolicyValue.Sandbox);
+
+            model.UpgradeInsecureRequests = currentSettings.ContentSecurityPolicy != null &&
+                currentSettings.ContentSecurityPolicy.ContainsKey(ContentSecurityPolicyValue.UpgradeInsecureRequests);
+        }).Location("Content:2")
+        .OnGroup(SettingsGroupId);
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, SecuritySettings settings, UpdateEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, SecuritySettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+
+        if (!await _authorizationService.AuthorizeAsync(user, SecurityPermissions.ManageSecurityHeadersSettings))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
+            return null;
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(user, SecurityPermissions.ManageSecurityHeadersSettings))
-            {
-                return null;
-            }
+        var model = new SecuritySettingsViewModel();
 
-            var model = new SecuritySettingsViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        PrepareContentSecurityPolicyValues(model);
 
-            PrepareContentSecurityPolicyValues(model);
+        settings.ContentTypeOptions = SecurityHeaderDefaults.ContentTypeOptions;
+        settings.ContentSecurityPolicy = model.ContentSecurityPolicy;
+        settings.PermissionsPolicy = model.PermissionsPolicy;
+        settings.ReferrerPolicy = model.ReferrerPolicy;
 
-            settings.ContentTypeOptions = SecurityHeaderDefaults.ContentTypeOptions;
-            settings.ContentSecurityPolicy = model.ContentSecurityPolicy;
-            settings.PermissionsPolicy = model.PermissionsPolicy;
-            settings.ReferrerPolicy = model.ReferrerPolicy;
+        _shellReleaseManager.RequestRelease();
 
-            _shellReleaseManager.RequestRelease();
+        return await EditAsync(site, settings, context);
+    }
 
-            return await EditAsync(site, settings, context);
+    private static void PrepareContentSecurityPolicyValues(SecuritySettingsViewModel model)
+    {
+        if (!model.EnableSandbox)
+        {
+            model.ContentSecurityPolicy.Remove(ContentSecurityPolicyValue.Sandbox);
         }
-
-        private static void PrepareContentSecurityPolicyValues(SecuritySettingsViewModel model)
+        else if (!model.ContentSecurityPolicy.TryGetValue(ContentSecurityPolicyValue.Sandbox, out _))
         {
-            if (!model.EnableSandbox)
-            {
-                model.ContentSecurityPolicy.Remove(ContentSecurityPolicyValue.Sandbox);
-            }
-            else if (!model.ContentSecurityPolicy.TryGetValue(ContentSecurityPolicyValue.Sandbox, out _))
-            {
-                model.ContentSecurityPolicy[ContentSecurityPolicyValue.Sandbox] = null;
-            }
+            model.ContentSecurityPolicy[ContentSecurityPolicyValue.Sandbox] = null;
+        }
 
-            if (!model.UpgradeInsecureRequests)
-            {
-                model.ContentSecurityPolicy.Remove(ContentSecurityPolicyValue.UpgradeInsecureRequests);
-            }
-            else
-            {
-                model.ContentSecurityPolicy[ContentSecurityPolicyValue.UpgradeInsecureRequests] = null;
-            }
+        if (!model.UpgradeInsecureRequests)
+        {
+            model.ContentSecurityPolicy.Remove(ContentSecurityPolicyValue.UpgradeInsecureRequests);
+        }
+        else
+        {
+            model.ContentSecurityPolicy[ContentSecurityPolicyValue.UpgradeInsecureRequests] = null;
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Extensions/OrchardCoreBuilderExtensions.cs b/src/OrchardCore.Modules/OrchardCore.Security/Extensions/OrchardCoreBuilderExtensions.cs
index 445ffc4fbb3..e649bc3a8bb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Extensions/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Extensions/OrchardCoreBuilderExtensions.cs
@@ -2,28 +2,27 @@
 using OrchardCore.Environment.Shell.Configuration;
 using OrchardCore.Security.Settings;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class OrchardCoreBuilderExtensions
 {
-    public static class OrchardCoreBuilderExtensions
+    public static OrchardCoreBuilder ConfigureSecuritySettings(this OrchardCoreBuilder builder)
     {
-        public static OrchardCoreBuilder ConfigureSecuritySettings(this OrchardCoreBuilder builder)
+        builder.ConfigureServices((tenantServices, serviceProvider) =>
         {
-            builder.ConfigureServices((tenantServices, serviceProvider) =>
-            {
-                var configurationSection = serviceProvider.GetRequiredService<IShellConfiguration>().GetSection("OrchardCore_Security");
+            var configurationSection = serviceProvider.GetRequiredService<IShellConfiguration>().GetSection("OrchardCore_Security");
 
-                tenantServices.PostConfigure<SecuritySettings>(settings =>
-                {
-                    settings.ContentSecurityPolicy.Clear();
-                    settings.PermissionsPolicy.Clear();
+            tenantServices.PostConfigure<SecuritySettings>(settings =>
+            {
+                settings.ContentSecurityPolicy.Clear();
+                settings.PermissionsPolicy.Clear();
 
-                    configurationSection.Bind(settings);
+                configurationSection.Bind(settings);
 
-                    settings.FromConfiguration = true;
-                });
+                settings.FromConfiguration = true;
             });
+        });
 
-            return builder;
-        }
+        return builder;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Extensions/SecurityHeadersApplicationBuilderExtensions.cs b/src/OrchardCore.Modules/OrchardCore.Security/Extensions/SecurityHeadersApplicationBuilderExtensions.cs
index e51d3c1919e..636880752f3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Extensions/SecurityHeadersApplicationBuilderExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Extensions/SecurityHeadersApplicationBuilderExtensions.cs
@@ -2,37 +2,36 @@
 using OrchardCore.Security.Options;
 using OrchardCore.Security.Services;
 
-namespace Microsoft.AspNetCore.Builder
+namespace Microsoft.AspNetCore.Builder;
+
+public static class SecurityHeadersApplicationBuilderExtensions
 {
-    public static class SecurityHeadersApplicationBuilderExtensions
+    public static IApplicationBuilder UseSecurityHeaders(this IApplicationBuilder app)
     {
-        public static IApplicationBuilder UseSecurityHeaders(this IApplicationBuilder app)
-        {
-            ArgumentNullException.ThrowIfNull(app);
+        ArgumentNullException.ThrowIfNull(app);
 
-            return app.UseSecurityHeaders(new SecurityHeadersOptions());
-        }
+        return app.UseSecurityHeaders(new SecurityHeadersOptions());
+    }
 
-        public static IApplicationBuilder UseSecurityHeaders(this IApplicationBuilder app, SecurityHeadersOptions options)
-        {
-            ArgumentNullException.ThrowIfNull(app);
-            ArgumentNullException.ThrowIfNull(options);
+    public static IApplicationBuilder UseSecurityHeaders(this IApplicationBuilder app, SecurityHeadersOptions options)
+    {
+        ArgumentNullException.ThrowIfNull(app);
+        ArgumentNullException.ThrowIfNull(options);
 
-            app.UseMiddleware<SecurityHeadersMiddleware>(options);
+        app.UseMiddleware<SecurityHeadersMiddleware>(options);
 
-            return app;
-        }
+        return app;
+    }
 
-        public static IApplicationBuilder UseSecurityHeaders(this IApplicationBuilder app, Action<SecurityHeadersOptions> optionsAction)
-        {
-            ArgumentNullException.ThrowIfNull(app);
-            ArgumentNullException.ThrowIfNull(optionsAction);
+    public static IApplicationBuilder UseSecurityHeaders(this IApplicationBuilder app, Action<SecurityHeadersOptions> optionsAction)
+    {
+        ArgumentNullException.ThrowIfNull(app);
+        ArgumentNullException.ThrowIfNull(optionsAction);
 
-            var options = new SecurityHeadersOptions();
+        var options = new SecurityHeadersOptions();
 
-            optionsAction.Invoke(options);
+        optionsAction.Invoke(options);
 
-            return app.UseSecurityHeaders(options);
-        }
+        return app.UseSecurityHeaders(options);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Options/ContentSecurityPolicyOriginValue.cs b/src/OrchardCore.Modules/OrchardCore.Security/Options/ContentSecurityPolicyOriginValue.cs
index c55a98337f1..97076aa7850 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Options/ContentSecurityPolicyOriginValue.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Options/ContentSecurityPolicyOriginValue.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.Security.Options
+namespace OrchardCore.Security.Options;
+
+public class ContentSecurityPolicyOriginValue
 {
-    public class ContentSecurityPolicyOriginValue
-    {
-        public const string Any = "*";
+    public const string Any = "*";
 
-        public const string None = "'none'";
+    public const string None = "'none'";
 
-        public const string Self = "'self'";
-    }
+    public const string Self = "'self'";
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Options/ContentSecurityPolicyValue.cs b/src/OrchardCore.Modules/OrchardCore.Security/Options/ContentSecurityPolicyValue.cs
index 8259ec15e5d..d3fe1738379 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Options/ContentSecurityPolicyValue.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Options/ContentSecurityPolicyValue.cs
@@ -1,39 +1,38 @@
-namespace OrchardCore.Security.Options
+namespace OrchardCore.Security.Options;
+
+public class ContentSecurityPolicyValue
 {
-    public class ContentSecurityPolicyValue
-    {
-        public const string BaseUri = "base-uri";
+    public const string BaseUri = "base-uri";
 
-        public const string ChildSource = "child-src";
+    public const string ChildSource = "child-src";
 
-        public const string ConnectSource = "connect-src";
+    public const string ConnectSource = "connect-src";
 
-        public const string DefaultSource = "default-src";
+    public const string DefaultSource = "default-src";
 
-        public const string FontSource = "font-src";
+    public const string FontSource = "font-src";
 
-        public const string FormAction = "form-action";
+    public const string FormAction = "form-action";
 
-        public const string FrameAncestors = "frame-ancestors";
+    public const string FrameAncestors = "frame-ancestors";
 
-        public const string FrameSource = "frame-src";
+    public const string FrameSource = "frame-src";
 
-        public const string ImageSource = "img-src";
+    public const string ImageSource = "img-src";
 
-        public const string ManifestSource = "manifest-src";
+    public const string ManifestSource = "manifest-src";
 
-        public const string MediaSource = "media-src";
+    public const string MediaSource = "media-src";
 
-        public const string ObjectSource = "object-src";
+    public const string ObjectSource = "object-src";
 
-        public const string ReportUri = "report-uri";
+    public const string ReportUri = "report-uri";
 
-        public const string Sandbox = "sandbox";
+    public const string Sandbox = "sandbox";
 
-        public const string ScriptSource = "script-src";
+    public const string ScriptSource = "script-src";
 
-        public const string StyleSource = "style-src";
+    public const string StyleSource = "style-src";
 
-        public const string UpgradeInsecureRequests = "upgrade-insecure-requests";
-    }
+    public const string UpgradeInsecureRequests = "upgrade-insecure-requests";
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Options/ContentTypeOptionsValue.cs b/src/OrchardCore.Modules/OrchardCore.Security/Options/ContentTypeOptionsValue.cs
index b2e6115bb8e..f8bad1a017f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Options/ContentTypeOptionsValue.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Options/ContentTypeOptionsValue.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Security.Options
+namespace OrchardCore.Security.Options;
+
+public class ContentTypeOptionsValue
 {
-    public class ContentTypeOptionsValue
-    {
-        public const string NoSniff = "nosniff";
-    }
+    public const string NoSniff = "nosniff";
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Options/PermissionsPolicyOriginValue.cs b/src/OrchardCore.Modules/OrchardCore.Security/Options/PermissionsPolicyOriginValue.cs
index 09f7d7585e8..2b74f4ef5aa 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Options/PermissionsPolicyOriginValue.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Options/PermissionsPolicyOriginValue.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.Security.Options
+namespace OrchardCore.Security.Options;
+
+public class PermissionsPolicyOriginValue
 {
-    public class PermissionsPolicyOriginValue
-    {
-        public const string Any = "*";
+    public const string Any = "*";
 
-        public const string None = "()";
+    public const string None = "()";
 
-        public const string Self = "self";
-    }
+    public const string Self = "self";
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Options/PermissionsPolicyValue.cs b/src/OrchardCore.Modules/OrchardCore.Security/Options/PermissionsPolicyValue.cs
index 3203daadefd..077714d6e95 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Options/PermissionsPolicyValue.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Options/PermissionsPolicyValue.cs
@@ -1,65 +1,64 @@
-namespace OrchardCore.Security.Options
+namespace OrchardCore.Security.Options;
+
+public class PermissionsPolicyValue
 {
-    public class PermissionsPolicyValue
-    {
-        public const string Accelerometer = "accelerometer";
+    public const string Accelerometer = "accelerometer";
 
-        public const string AmbientLightSensor = "ambient-light-sensor";
+    public const string AmbientLightSensor = "ambient-light-sensor";
 
-        public const string Autoplay = "autoplay";
+    public const string Autoplay = "autoplay";
 
-        public const string Battery = "battery";
+    public const string Battery = "battery";
 
-        public const string Camera = "camera";
+    public const string Camera = "camera";
 
-        public const string DisplayCapture = "display-capture";
+    public const string DisplayCapture = "display-capture";
 
-        public const string DocumentDomain = "document-domain";
+    public const string DocumentDomain = "document-domain";
 
-        public const string EncryptedMedia = "encrypted-media";
+    public const string EncryptedMedia = "encrypted-media";
 
-        public const string FullScreen = "fullscreen";
+    public const string FullScreen = "fullscreen";
 
-        public const string GamePad = "gamepad";
+    public const string GamePad = "gamepad";
 
-        public const string Geolocation = "geolocation";
+    public const string Geolocation = "geolocation";
 
-        public const string Gyroscope = "gyroscope";
+    public const string Gyroscope = "gyroscope";
 
-        public const string LayoutAnimations = "layout-animations";
+    public const string LayoutAnimations = "layout-animations";
 
-        public const string LegacyImageFormat = "legacy-image-format";
+    public const string LegacyImageFormat = "legacy-image-format";
 
-        public const string Magnetometer = "magnetometer";
+    public const string Magnetometer = "magnetometer";
 
-        public const string Microphone = "microphone";
+    public const string Microphone = "microphone";
 
-        public const string Midi = "midi";
+    public const string Midi = "midi";
 
-        public const string OversizedImages = "oversized-images";
+    public const string OversizedImages = "oversized-images";
 
-        public const string Payment = "payment";
+    public const string Payment = "payment";
 
-        public const string PictureInPicture = "picture-in-picture";
+    public const string PictureInPicture = "picture-in-picture";
 
-        public const string PublicKeyRetrieval = "publickey-credentials-get";
+    public const string PublicKeyRetrieval = "publickey-credentials-get";
 
-        public const string Push = "push";
+    public const string Push = "push";
 
-        public const string SpeakerSelection = "speaker-selection";
+    public const string SpeakerSelection = "speaker-selection";
 
-        public const string ScreenWakeLock = "screen-wake-lock";
+    public const string ScreenWakeLock = "screen-wake-lock";
 
-        public const string SyncXhr = "sync-xhr";
+    public const string SyncXhr = "sync-xhr";
 
-        public const string UnoptimizedImages = "unoptimized-images";
+    public const string UnoptimizedImages = "unoptimized-images";
 
-        public const string UnsizedMedia = "unsized-media";
+    public const string UnsizedMedia = "unsized-media";
 
-        public const string Usb = "usb";
+    public const string Usb = "usb";
 
-        public const string WebShare = "web-share";
+    public const string WebShare = "web-share";
 
-        public const string WebXR = "xr-spatial-tracking";
-    }
+    public const string WebXR = "xr-spatial-tracking";
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Options/ReferrerPolicyValue.cs b/src/OrchardCore.Modules/OrchardCore.Security/Options/ReferrerPolicyValue.cs
index b2fc88e7c4c..87e86842f6b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Options/ReferrerPolicyValue.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Options/ReferrerPolicyValue.cs
@@ -1,21 +1,20 @@
-namespace OrchardCore.Security.Options
+namespace OrchardCore.Security.Options;
+
+public class ReferrerPolicyValue
 {
-    public class ReferrerPolicyValue
-    {
-        public const string NoReferrer = "no-referrer";
+    public const string NoReferrer = "no-referrer";
 
-        public const string NoReferrerWhenDowngrade = "no-referrer-when-downgrade";
+    public const string NoReferrerWhenDowngrade = "no-referrer-when-downgrade";
 
-        public const string Origin = "origin";
+    public const string Origin = "origin";
 
-        public const string OriginWhenCrossOrigin = "origin-when-cross-origin";
+    public const string OriginWhenCrossOrigin = "origin-when-cross-origin";
 
-        public const string SameOrigin = "same-origin";
+    public const string SameOrigin = "same-origin";
 
-        public const string StrictOrigin = "strict-origin";
+    public const string StrictOrigin = "strict-origin";
 
-        public const string StrictOriginWhenCrossOrigin = "strict-origin-when-cross-origin";
+    public const string StrictOriginWhenCrossOrigin = "strict-origin-when-cross-origin";
 
-        public const string UnsafeUrl = "unsafe-url";
-    }
+    public const string UnsafeUrl = "unsafe-url";
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Options/SecurityHeadersOptions.cs b/src/OrchardCore.Modules/OrchardCore.Security/Options/SecurityHeadersOptions.cs
index f09415cc030..17bcdc954e2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Options/SecurityHeadersOptions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Options/SecurityHeadersOptions.cs
@@ -2,72 +2,71 @@
 using System.Linq;
 using OrchardCore.Security.Services;
 
-namespace OrchardCore.Security.Options
+namespace OrchardCore.Security.Options;
+
+public class SecurityHeadersOptions
 {
-    public class SecurityHeadersOptions
+    public SecurityHeadersOptions()
     {
-        public SecurityHeadersOptions()
-        {
-            HeaderPolicyProviders =
-            [
-                new ContentSecurityPolicyHeaderPolicyProvider { Options = this },
-                new ContentTypeOptionsHeaderPolicyProvider { Options = this },
-                new PermissionsHeaderPolicyProvider { Options = this },
-                new ReferrerHeaderPolicyProvider { Options = this }
-            ];
-        }
-
-        public string[] ContentSecurityPolicy { get; set; } = SecurityHeaderDefaults.ContentSecurityPolicy;
+        HeaderPolicyProviders =
+        [
+            new ContentSecurityPolicyHeaderPolicyProvider { Options = this },
+            new ContentTypeOptionsHeaderPolicyProvider { Options = this },
+            new PermissionsHeaderPolicyProvider { Options = this },
+            new ReferrerHeaderPolicyProvider { Options = this }
+        ];
+    }
 
-        public string ContentTypeOptions { get; set; } = SecurityHeaderDefaults.ContentTypeOptions;
+    public string[] ContentSecurityPolicy { get; set; } = SecurityHeaderDefaults.ContentSecurityPolicy;
 
-        public string[] PermissionsPolicy { get; set; } = SecurityHeaderDefaults.PermissionsPolicy;
+    public string ContentTypeOptions { get; set; } = SecurityHeaderDefaults.ContentTypeOptions;
 
-        public string ReferrerPolicy { get; set; } = SecurityHeaderDefaults.ReferrerPolicy;
+    public string[] PermissionsPolicy { get; set; } = SecurityHeaderDefaults.PermissionsPolicy;
 
-        public IList<IHeaderPolicyProvider> HeaderPolicyProviders { get; set; }
+    public string ReferrerPolicy { get; set; } = SecurityHeaderDefaults.ReferrerPolicy;
 
-        public SecurityHeadersOptions AddContentSecurityPolicy(Dictionary<string, string> policies)
-        {
-            ContentSecurityPolicy = policies
-                .Where(kvp => kvp.Value != null ||
-                    kvp.Key == ContentSecurityPolicyValue.Sandbox ||
-                    kvp.Key == ContentSecurityPolicyValue.UpgradeInsecureRequests)
-                .Select(kvp => kvp.Key + (kvp.Value != null ? " " + kvp.Value : string.Empty))
-                .ToArray();
+    public IList<IHeaderPolicyProvider> HeaderPolicyProviders { get; set; }
 
-            return this;
-        }
+    public SecurityHeadersOptions AddContentSecurityPolicy(Dictionary<string, string> policies)
+    {
+        ContentSecurityPolicy = policies
+            .Where(kvp => kvp.Value != null ||
+                kvp.Key == ContentSecurityPolicyValue.Sandbox ||
+                kvp.Key == ContentSecurityPolicyValue.UpgradeInsecureRequests)
+            .Select(kvp => kvp.Key + (kvp.Value != null ? " " + kvp.Value : string.Empty))
+            .ToArray();
+
+        return this;
+    }
 
-        public SecurityHeadersOptions AddContentSecurityPolicy(params string[] policies)
-        {
-            ContentSecurityPolicy = policies;
+    public SecurityHeadersOptions AddContentSecurityPolicy(params string[] policies)
+    {
+        ContentSecurityPolicy = policies;
 
-            return this;
-        }
+        return this;
+    }
 
-        public SecurityHeadersOptions AddContentTypeOptions()
-        {
-            ContentTypeOptions = ContentTypeOptionsValue.NoSniff;
+    public SecurityHeadersOptions AddContentTypeOptions()
+    {
+        ContentTypeOptions = ContentTypeOptionsValue.NoSniff;
 
-            return this;
-        }
+        return this;
+    }
 
-        public SecurityHeadersOptions AddPermissionsPolicy(IDictionary<string, string> policies)
-        {
-            PermissionsPolicy = policies
-                .Where(kvp => kvp.Value != PermissionsPolicyOriginValue.None)
-                .Select(kvp => kvp.Key + "=" + kvp.Value)
-                .ToArray();
+    public SecurityHeadersOptions AddPermissionsPolicy(IDictionary<string, string> policies)
+    {
+        PermissionsPolicy = policies
+            .Where(kvp => kvp.Value != PermissionsPolicyOriginValue.None)
+            .Select(kvp => kvp.Key + "=" + kvp.Value)
+            .ToArray();
 
-            return this;
-        }
+        return this;
+    }
 
-        public SecurityHeadersOptions AddReferrerPolicy(string policy)
-        {
-            ReferrerPolicy = policy;
+    public SecurityHeadersOptions AddReferrerPolicy(string policy)
+    {
+        ReferrerPolicy = policy;
 
-            return this;
-        }
+        return this;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/SecurityHeaderDefaults.cs b/src/OrchardCore.Modules/OrchardCore.Security/SecurityHeaderDefaults.cs
index e3da8387024..2ba55346c29 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/SecurityHeaderDefaults.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/SecurityHeaderDefaults.cs
@@ -1,67 +1,66 @@
 using OrchardCore.Security.Options;
 
-namespace OrchardCore.Security
+namespace OrchardCore.Security;
+
+public static class SecurityHeaderDefaults
 {
-    public static class SecurityHeaderDefaults
-    {
-        internal static readonly char PoliciesSeparator = ',';
-        internal static readonly string[] ContentSecurityPolicyNames =
-        [
-            ContentSecurityPolicyValue.BaseUri,
-            ContentSecurityPolicyValue.ChildSource,
-            ContentSecurityPolicyValue.ConnectSource,
-            ContentSecurityPolicyValue.DefaultSource,
-            ContentSecurityPolicyValue.FontSource,
-            ContentSecurityPolicyValue.FormAction,
-            ContentSecurityPolicyValue.FrameAncestors,
-            ContentSecurityPolicyValue.FrameSource,
-            ContentSecurityPolicyValue.ImageSource,
-            ContentSecurityPolicyValue.ManifestSource,
-            ContentSecurityPolicyValue.MediaSource,
-            ContentSecurityPolicyValue.ObjectSource,
-            ContentSecurityPolicyValue.ScriptSource,
-            ContentSecurityPolicyValue.StyleSource,
-            ContentSecurityPolicyValue.Sandbox
-        ];
-        internal static readonly string[] PermissionsPolicyNames =
-        [
-            PermissionsPolicyValue.Accelerometer,
-            PermissionsPolicyValue.AmbientLightSensor,
-            PermissionsPolicyValue.Autoplay,
-            PermissionsPolicyValue.Battery,
-            PermissionsPolicyValue.Camera,
-            PermissionsPolicyValue.DisplayCapture,
-            PermissionsPolicyValue.DocumentDomain,
-            PermissionsPolicyValue.EncryptedMedia,
-            PermissionsPolicyValue.FullScreen,
-            PermissionsPolicyValue.GamePad,
-            PermissionsPolicyValue.Geolocation,
-            PermissionsPolicyValue.Gyroscope,
-            PermissionsPolicyValue.LayoutAnimations,
-            PermissionsPolicyValue.LegacyImageFormat,
-            PermissionsPolicyValue.Magnetometer,
-            PermissionsPolicyValue.Microphone,
-            PermissionsPolicyValue.Midi,
-            PermissionsPolicyValue.OversizedImages,
-            PermissionsPolicyValue.Payment,
-            PermissionsPolicyValue.PictureInPicture,
-            PermissionsPolicyValue.PublicKeyRetrieval,
-            PermissionsPolicyValue.SpeakerSelection,
-            PermissionsPolicyValue.ScreenWakeLock,
-            PermissionsPolicyValue.SyncXhr,
-            PermissionsPolicyValue.UnoptimizedImages,
-            PermissionsPolicyValue.UnsizedMedia,
-            PermissionsPolicyValue.Usb,
-            PermissionsPolicyValue.WebShare,
-            PermissionsPolicyValue.WebXR
-        ];
+    internal static readonly char PoliciesSeparator = ',';
+    internal static readonly string[] ContentSecurityPolicyNames =
+    [
+        ContentSecurityPolicyValue.BaseUri,
+        ContentSecurityPolicyValue.ChildSource,
+        ContentSecurityPolicyValue.ConnectSource,
+        ContentSecurityPolicyValue.DefaultSource,
+        ContentSecurityPolicyValue.FontSource,
+        ContentSecurityPolicyValue.FormAction,
+        ContentSecurityPolicyValue.FrameAncestors,
+        ContentSecurityPolicyValue.FrameSource,
+        ContentSecurityPolicyValue.ImageSource,
+        ContentSecurityPolicyValue.ManifestSource,
+        ContentSecurityPolicyValue.MediaSource,
+        ContentSecurityPolicyValue.ObjectSource,
+        ContentSecurityPolicyValue.ScriptSource,
+        ContentSecurityPolicyValue.StyleSource,
+        ContentSecurityPolicyValue.Sandbox
+    ];
+    internal static readonly string[] PermissionsPolicyNames =
+    [
+        PermissionsPolicyValue.Accelerometer,
+        PermissionsPolicyValue.AmbientLightSensor,
+        PermissionsPolicyValue.Autoplay,
+        PermissionsPolicyValue.Battery,
+        PermissionsPolicyValue.Camera,
+        PermissionsPolicyValue.DisplayCapture,
+        PermissionsPolicyValue.DocumentDomain,
+        PermissionsPolicyValue.EncryptedMedia,
+        PermissionsPolicyValue.FullScreen,
+        PermissionsPolicyValue.GamePad,
+        PermissionsPolicyValue.Geolocation,
+        PermissionsPolicyValue.Gyroscope,
+        PermissionsPolicyValue.LayoutAnimations,
+        PermissionsPolicyValue.LegacyImageFormat,
+        PermissionsPolicyValue.Magnetometer,
+        PermissionsPolicyValue.Microphone,
+        PermissionsPolicyValue.Midi,
+        PermissionsPolicyValue.OversizedImages,
+        PermissionsPolicyValue.Payment,
+        PermissionsPolicyValue.PictureInPicture,
+        PermissionsPolicyValue.PublicKeyRetrieval,
+        PermissionsPolicyValue.SpeakerSelection,
+        PermissionsPolicyValue.ScreenWakeLock,
+        PermissionsPolicyValue.SyncXhr,
+        PermissionsPolicyValue.UnoptimizedImages,
+        PermissionsPolicyValue.UnsizedMedia,
+        PermissionsPolicyValue.Usb,
+        PermissionsPolicyValue.WebShare,
+        PermissionsPolicyValue.WebXR
+    ];
 
-        public static readonly string[] ContentSecurityPolicy = [];
+    public static readonly string[] ContentSecurityPolicy = [];
 
-        public static readonly string ContentTypeOptions = ContentTypeOptionsValue.NoSniff;
+    public static readonly string ContentTypeOptions = ContentTypeOptionsValue.NoSniff;
 
-        public static readonly string[] PermissionsPolicy = [];
+    public static readonly string[] PermissionsPolicy = [];
 
-        public static readonly string ReferrerPolicy = ReferrerPolicyValue.NoReferrer;
-    }
+    public static readonly string ReferrerPolicy = ReferrerPolicyValue.NoReferrer;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Services/ContentSecurityPolicyHeaderPolicyProvider.cs b/src/OrchardCore.Modules/OrchardCore.Security/Services/ContentSecurityPolicyHeaderPolicyProvider.cs
index 687206f8242..6bac57d1b7b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Services/ContentSecurityPolicyHeaderPolicyProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Services/ContentSecurityPolicyHeaderPolicyProvider.cs
@@ -1,25 +1,24 @@
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Security.Services
+namespace OrchardCore.Security.Services;
+
+public class ContentSecurityPolicyHeaderPolicyProvider : HeaderPolicyProvider
 {
-    public class ContentSecurityPolicyHeaderPolicyProvider : HeaderPolicyProvider
-    {
-        private string _policy;
+    private string _policy;
 
-        public override void InitializePolicy()
+    public override void InitializePolicy()
+    {
+        if (Options.ContentSecurityPolicy.Length > 0)
         {
-            if (Options.ContentSecurityPolicy.Length > 0)
-            {
-                _policy = string.Join(SecurityHeaderDefaults.PoliciesSeparator, Options.ContentSecurityPolicy);
-            }
+            _policy = string.Join(SecurityHeaderDefaults.PoliciesSeparator, Options.ContentSecurityPolicy);
         }
+    }
 
-        public override void ApplyPolicy(HttpContext httpContext)
+    public override void ApplyPolicy(HttpContext httpContext)
+    {
+        if (_policy != null)
         {
-            if (_policy != null)
-            {
-                httpContext.Response.Headers[SecurityHeaderNames.ContentSecurityPolicy] = _policy;
-            }
+            httpContext.Response.Headers[SecurityHeaderNames.ContentSecurityPolicy] = _policy;
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Services/ContentTypeOptionsHeaderPolicyProvider.cs b/src/OrchardCore.Modules/OrchardCore.Security/Services/ContentTypeOptionsHeaderPolicyProvider.cs
index 59e6e8620ab..f023bcdba8b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Services/ContentTypeOptionsHeaderPolicyProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Services/ContentTypeOptionsHeaderPolicyProvider.cs
@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Security.Services
+namespace OrchardCore.Security.Services;
+
+public class ContentTypeOptionsHeaderPolicyProvider : HeaderPolicyProvider
 {
-    public class ContentTypeOptionsHeaderPolicyProvider : HeaderPolicyProvider
+    public override void ApplyPolicy(HttpContext httpContext)
     {
-        public override void ApplyPolicy(HttpContext httpContext)
-        {
-            httpContext.Response.Headers[SecurityHeaderNames.XContentTypeOptions] = Options.ContentTypeOptions;
-        }
+        httpContext.Response.Headers[SecurityHeaderNames.XContentTypeOptions] = Options.ContentTypeOptions;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Services/HeaderPolicyProvider.cs b/src/OrchardCore.Modules/OrchardCore.Security/Services/HeaderPolicyProvider.cs
index ef477dd612e..3b895fb66cf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Services/HeaderPolicyProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Services/HeaderPolicyProvider.cs
@@ -1,17 +1,16 @@
 using Microsoft.AspNetCore.Http;
 using OrchardCore.Security.Options;
 
-namespace OrchardCore.Security.Services
-{
-    public abstract class HeaderPolicyProvider : IHeaderPolicyProvider
-    {
-        public SecurityHeadersOptions Options { get; set; }
+namespace OrchardCore.Security.Services;
 
-        public virtual void InitializePolicy()
-        {
-            // This is intentionally empty, only header policy provider(s) that need an initialization should override this
-        }
+public abstract class HeaderPolicyProvider : IHeaderPolicyProvider
+{
+    public SecurityHeadersOptions Options { get; set; }
 
-        public abstract void ApplyPolicy(HttpContext httpContext);
+    public virtual void InitializePolicy()
+    {
+        // This is intentionally empty, only header policy provider(s) that need an initialization should override this
     }
+
+    public abstract void ApplyPolicy(HttpContext httpContext);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Services/IHeaderPolicyProvider.cs b/src/OrchardCore.Modules/OrchardCore.Security/Services/IHeaderPolicyProvider.cs
index e07cb91319e..bf5f2ae2342 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Services/IHeaderPolicyProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Services/IHeaderPolicyProvider.cs
@@ -1,11 +1,10 @@
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Security.Services
+namespace OrchardCore.Security.Services;
+
+public interface IHeaderPolicyProvider
 {
-    public interface IHeaderPolicyProvider
-    {
-        void InitializePolicy();
+    void InitializePolicy();
 
-        void ApplyPolicy(HttpContext httpContext);
-    }
+    void ApplyPolicy(HttpContext httpContext);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Services/ISecurityService.cs b/src/OrchardCore.Modules/OrchardCore.Security/Services/ISecurityService.cs
index e58a9c10cc8..0f780c2b0fd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Services/ISecurityService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Services/ISecurityService.cs
@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
 using OrchardCore.Security.Settings;
 
-namespace OrchardCore.Security.Services
+namespace OrchardCore.Security.Services;
+
+public interface ISecurityService
 {
-    public interface ISecurityService
-    {
-        Task<SecuritySettings> GetSettingsAsync();
-    }
+    Task<SecuritySettings> GetSettingsAsync();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Services/PermissionsHeaderPolicyProvider.cs b/src/OrchardCore.Modules/OrchardCore.Security/Services/PermissionsHeaderPolicyProvider.cs
index 72f842be3e3..83ef025a838 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Services/PermissionsHeaderPolicyProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Services/PermissionsHeaderPolicyProvider.cs
@@ -1,25 +1,24 @@
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Security.Services
+namespace OrchardCore.Security.Services;
+
+public class PermissionsHeaderPolicyProvider : HeaderPolicyProvider
 {
-    public class PermissionsHeaderPolicyProvider : HeaderPolicyProvider
-    {
-        private string _policy;
+    private string _policy;
 
-        public override void InitializePolicy()
+    public override void InitializePolicy()
+    {
+        if (Options.PermissionsPolicy.Length > 0)
         {
-            if (Options.PermissionsPolicy.Length > 0)
-            {
-                _policy = string.Join(SecurityHeaderDefaults.PoliciesSeparator, Options.PermissionsPolicy);
-            }
+            _policy = string.Join(SecurityHeaderDefaults.PoliciesSeparator, Options.PermissionsPolicy);
         }
+    }
 
-        public override void ApplyPolicy(HttpContext httpContext)
+    public override void ApplyPolicy(HttpContext httpContext)
+    {
+        if (_policy != null)
         {
-            if (_policy != null)
-            {
-                httpContext.Response.Headers[SecurityHeaderNames.PermissionsPolicy] = _policy;
-            }
+            httpContext.Response.Headers[SecurityHeaderNames.PermissionsPolicy] = _policy;
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Services/ReferrerHeaderPolicyProvider.cs b/src/OrchardCore.Modules/OrchardCore.Security/Services/ReferrerHeaderPolicyProvider.cs
index a3f3adf8873..b7f02bc5be2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Services/ReferrerHeaderPolicyProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Services/ReferrerHeaderPolicyProvider.cs
@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Security.Services
+namespace OrchardCore.Security.Services;
+
+public class ReferrerHeaderPolicyProvider : HeaderPolicyProvider
 {
-    public class ReferrerHeaderPolicyProvider : HeaderPolicyProvider
+    public override void ApplyPolicy(HttpContext httpContext)
     {
-        public override void ApplyPolicy(HttpContext httpContext)
-        {
-            httpContext.Response.Headers[SecurityHeaderNames.ReferrerPolicy] = Options.ReferrerPolicy;
-        }
+        httpContext.Response.Headers[SecurityHeaderNames.ReferrerPolicy] = Options.ReferrerPolicy;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Services/SecurityHeadersMiddleware.cs b/src/OrchardCore.Modules/OrchardCore.Security/Services/SecurityHeadersMiddleware.cs
index 5558cb4e5b0..2fdfb4d8246 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Services/SecurityHeadersMiddleware.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Services/SecurityHeadersMiddleware.cs
@@ -2,32 +2,31 @@
 using Microsoft.AspNetCore.Http;
 using OrchardCore.Security.Options;
 
-namespace OrchardCore.Security.Services
+namespace OrchardCore.Security.Services;
+
+public class SecurityHeadersMiddleware
 {
-    public class SecurityHeadersMiddleware
+    private readonly SecurityHeadersOptions _options;
+    private readonly RequestDelegate _next;
+
+    public SecurityHeadersMiddleware(SecurityHeadersOptions options, RequestDelegate next)
     {
-        private readonly SecurityHeadersOptions _options;
-        private readonly RequestDelegate _next;
+        _options = options;
+        _next = next;
 
-        public SecurityHeadersMiddleware(SecurityHeadersOptions options, RequestDelegate next)
+        foreach (var provider in _options.HeaderPolicyProviders)
         {
-            _options = options;
-            _next = next;
-
-            foreach (var provider in _options.HeaderPolicyProviders)
-            {
-                provider.InitializePolicy();
-            }
+            provider.InitializePolicy();
         }
+    }
 
-        public Task Invoke(HttpContext context)
+    public Task Invoke(HttpContext context)
+    {
+        foreach (var provider in _options.HeaderPolicyProviders)
         {
-            foreach (var provider in _options.HeaderPolicyProviders)
-            {
-                provider.ApplyPolicy(context);
-            }
-
-            return _next.Invoke(context);
+            provider.ApplyPolicy(context);
         }
+
+        return _next.Invoke(context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Services/SecurityService.cs b/src/OrchardCore.Modules/OrchardCore.Security/Services/SecurityService.cs
index 11599cc8136..e3a045a7b3d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Services/SecurityService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Services/SecurityService.cs
@@ -2,18 +2,17 @@
 using OrchardCore.Security.Settings;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Security.Services
-{
-    public class SecurityService : ISecurityService
-    {
-        private readonly ISiteService _siteService;
+namespace OrchardCore.Security.Services;
 
-        public SecurityService(ISiteService siteService)
-        {
-            _siteService = siteService;
-        }
+public class SecurityService : ISecurityService
+{
+    private readonly ISiteService _siteService;
 
-        public Task<SecuritySettings> GetSettingsAsync()
-            => _siteService.GetSettingsAsync<SecuritySettings>();
+    public SecurityService(ISiteService siteService)
+    {
+        _siteService = siteService;
     }
+
+    public Task<SecuritySettings> GetSettingsAsync()
+        => _siteService.GetSettingsAsync<SecuritySettings>();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Services/SecuritySettingsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Security/Services/SecuritySettingsConfiguration.cs
index 52a7d1f8b12..01b287e9c1e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Services/SecuritySettingsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Services/SecuritySettingsConfiguration.cs
@@ -1,24 +1,23 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Security.Settings;
 
-namespace OrchardCore.Security.Services
+namespace OrchardCore.Security.Services;
+
+public sealed class SecuritySettingsConfiguration : IConfigureOptions<SecuritySettings>
 {
-    public sealed class SecuritySettingsConfiguration : IConfigureOptions<SecuritySettings>
-    {
-        private readonly ISecurityService _securityService;
+    private readonly ISecurityService _securityService;
 
-        public SecuritySettingsConfiguration(ISecurityService securityService)
-            => _securityService = securityService;
+    public SecuritySettingsConfiguration(ISecurityService securityService)
+        => _securityService = securityService;
 
-        public void Configure(SecuritySettings options)
-        {
-            var securitySettings = _securityService.GetSettingsAsync()
-                .GetAwaiter().GetResult();
+    public void Configure(SecuritySettings options)
+    {
+        var securitySettings = _securityService.GetSettingsAsync()
+            .GetAwaiter().GetResult();
 
-            options.ContentSecurityPolicy = securitySettings.ContentSecurityPolicy;
-            options.ContentTypeOptions = securitySettings.ContentTypeOptions;
-            options.PermissionsPolicy = securitySettings.PermissionsPolicy;
-            options.ReferrerPolicy = securitySettings.ReferrerPolicy;
-        }
+        options.ContentSecurityPolicy = securitySettings.ContentSecurityPolicy;
+        options.ContentTypeOptions = securitySettings.ContentTypeOptions;
+        options.PermissionsPolicy = securitySettings.PermissionsPolicy;
+        options.ReferrerPolicy = securitySettings.ReferrerPolicy;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Settings/SecuritySettings.cs b/src/OrchardCore.Modules/OrchardCore.Security/Settings/SecuritySettings.cs
index 17318ead6ef..96148cc0115 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Settings/SecuritySettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Settings/SecuritySettings.cs
@@ -2,58 +2,57 @@
 using System.Linq;
 using OrchardCore.Security.Options;
 
-namespace OrchardCore.Security.Settings
+namespace OrchardCore.Security.Settings;
+
+public class SecuritySettings
 {
-    public class SecuritySettings
-    {
-        private Dictionary<string, string> _contentSecurityPolicy = [];
-        private Dictionary<string, string> _permissionsPolicy = [];
+    private Dictionary<string, string> _contentSecurityPolicy = [];
+    private Dictionary<string, string> _permissionsPolicy = [];
 
-        public Dictionary<string, string> ContentSecurityPolicy
+    public Dictionary<string, string> ContentSecurityPolicy
+    {
+        get => _contentSecurityPolicy;
+        set
         {
-            get => _contentSecurityPolicy;
-            set
+            if (value == null)
+            {
+                return;
+            }
+
+            // Exclude null values and clone the dictionary to not be shared by site settings and options instances.
+            _contentSecurityPolicy = value
+                .Where(kvp => kvp.Value != null ||
+                    kvp.Key == ContentSecurityPolicyValue.Sandbox ||
+                    kvp.Key == ContentSecurityPolicyValue.UpgradeInsecureRequests)
+                .ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+
+            if (_contentSecurityPolicy.TryGetValue(ContentSecurityPolicyValue.UpgradeInsecureRequests, out _))
             {
-                if (value == null)
-                {
-                    return;
-                }
-
-                // Exclude null values and clone the dictionary to not be shared by site settings and options instances.
-                _contentSecurityPolicy = value
-                    .Where(kvp => kvp.Value != null ||
-                        kvp.Key == ContentSecurityPolicyValue.Sandbox ||
-                        kvp.Key == ContentSecurityPolicyValue.UpgradeInsecureRequests)
-                    .ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-
-                if (_contentSecurityPolicy.TryGetValue(ContentSecurityPolicyValue.UpgradeInsecureRequests, out _))
-                {
-                    _contentSecurityPolicy[ContentSecurityPolicyValue.UpgradeInsecureRequests] = null;
-                }
+                _contentSecurityPolicy[ContentSecurityPolicyValue.UpgradeInsecureRequests] = null;
             }
         }
+    }
 
-        public string ContentTypeOptions { get; set; } = SecurityHeaderDefaults.ContentTypeOptions;
+    public string ContentTypeOptions { get; set; } = SecurityHeaderDefaults.ContentTypeOptions;
 
-        public Dictionary<string, string> PermissionsPolicy
+    public Dictionary<string, string> PermissionsPolicy
+    {
+        get => _permissionsPolicy;
+        set
         {
-            get => _permissionsPolicy;
-            set
+            if (value == null)
             {
-                if (value == null)
-                {
-                    return;
-                }
-
-                // Exlude 'None' values and clone the dictionary to not be shared by site settings and options instances.
-                _permissionsPolicy = value
-                    .Where(kvp => kvp.Value != PermissionsPolicyOriginValue.None)
-                    .ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+                return;
             }
+
+            // Exlude 'None' values and clone the dictionary to not be shared by site settings and options instances.
+            _permissionsPolicy = value
+                .Where(kvp => kvp.Value != PermissionsPolicyOriginValue.None)
+                .ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
         }
+    }
 
-        public string ReferrerPolicy { get; set; } = SecurityHeaderDefaults.ReferrerPolicy;
+    public string ReferrerPolicy { get; set; } = SecurityHeaderDefaults.ReferrerPolicy;
 
-        public bool FromConfiguration { get; set; }
-    }
+    public bool FromConfiguration { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Security/Startup.cs
index 41c32163cf1..d5b9afef5ee 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/Startup.cs
@@ -12,36 +12,35 @@
 using OrchardCore.Security.Settings;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Security
+namespace OrchardCore.Security;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override int Order
+        => OrchardCoreConstants.ConfigureOrder.Security;
+
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override int Order
-            => OrchardCoreConstants.ConfigureOrder.Security;
+        services.AddScoped<IPermissionProvider, SecurityPermissions>();
+        services.AddScoped<IDisplayDriver<ISite>, SecuritySettingsDisplayDriver>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
 
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IPermissionProvider, SecurityPermissions>();
-            services.AddScoped<IDisplayDriver<ISite>, SecuritySettingsDisplayDriver>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddSingleton<ISecurityService, SecurityService>();
 
-            services.AddSingleton<ISecurityService, SecurityService>();
+        services.AddTransient<IConfigureOptions<SecuritySettings>, SecuritySettingsConfiguration>();
+    }
 
-            services.AddTransient<IConfigureOptions<SecuritySettings>, SecuritySettingsConfiguration>();
-        }
+    public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        var securityOptions = serviceProvider.GetRequiredService<IOptions<SecuritySettings>>().Value;
 
-        public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+        builder.UseSecurityHeaders(options =>
         {
-            var securityOptions = serviceProvider.GetRequiredService<IOptions<SecuritySettings>>().Value;
-
-            builder.UseSecurityHeaders(options =>
-            {
-                options
-                    .AddContentSecurityPolicy(securityOptions.ContentSecurityPolicy)
-                    .AddContentTypeOptions()
-                    .AddPermissionsPolicy(securityOptions.PermissionsPolicy)
-                    .AddReferrerPolicy(securityOptions.ReferrerPolicy);
-            });
-        }
+            options
+                .AddContentSecurityPolicy(securityOptions.ContentSecurityPolicy)
+                .AddContentTypeOptions()
+                .AddPermissionsPolicy(securityOptions.PermissionsPolicy)
+                .AddReferrerPolicy(securityOptions.ReferrerPolicy);
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Security/ViewModels/SecuritySettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Security/ViewModels/SecuritySettingsViewModel.cs
index ea1a469addb..b0c69c1ab14 100644
--- a/src/OrchardCore.Modules/OrchardCore.Security/ViewModels/SecuritySettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Security/ViewModels/SecuritySettingsViewModel.cs
@@ -3,48 +3,47 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Security.Options;
 
-namespace OrchardCore.Security.ViewModels
+namespace OrchardCore.Security.ViewModels;
+
+public class SecuritySettingsViewModel
 {
-    public class SecuritySettingsViewModel
-    {
-        private Dictionary<string, string> _contentSecurityPolicy = [];
-        private Dictionary<string, string> _permissionsPolicy = [];
+    private Dictionary<string, string> _contentSecurityPolicy = [];
+    private Dictionary<string, string> _permissionsPolicy = [];
 
-        public Dictionary<string, string> ContentSecurityPolicy
+    public Dictionary<string, string> ContentSecurityPolicy
+    {
+        get => _contentSecurityPolicy;
+        set
         {
-            get => _contentSecurityPolicy;
-            set
-            {
-                // Populate all policy values for the editor (null if not provided).
-                _contentSecurityPolicy = SecurityHeaderDefaults.ContentSecurityPolicyNames
-                    .ToDictionary(name => name, name =>
-                        value?.ContainsKey(name) ?? false
-                            ? value[name]
-                            : null);
-            }
+            // Populate all policy values for the editor (null if not provided).
+            _contentSecurityPolicy = SecurityHeaderDefaults.ContentSecurityPolicyNames
+                .ToDictionary(name => name, name =>
+                    value?.ContainsKey(name) ?? false
+                        ? value[name]
+                        : null);
         }
+    }
 
-        public bool EnableSandbox { get; set; }
+    public bool EnableSandbox { get; set; }
 
-        public bool UpgradeInsecureRequests { get; set; }
+    public bool UpgradeInsecureRequests { get; set; }
 
-        public Dictionary<string, string> PermissionsPolicy
+    public Dictionary<string, string> PermissionsPolicy
+    {
+        get => _permissionsPolicy;
+        set
         {
-            get => _permissionsPolicy;
-            set
-            {
-                // Populate all policy values for the editor ('None' if not provided).
-                _permissionsPolicy = SecurityHeaderDefaults.PermissionsPolicyNames
-                    .ToDictionary(name => name, name =>
-                        value?.ContainsKey(name) ?? false
-                            ? value[name]
-                            : PermissionsPolicyOriginValue.None);
-            }
+            // Populate all policy values for the editor ('None' if not provided).
+            _permissionsPolicy = SecurityHeaderDefaults.PermissionsPolicyNames
+                .ToDictionary(name => name, name =>
+                    value?.ContainsKey(name) ?? false
+                        ? value[name]
+                        : PermissionsPolicyOriginValue.None);
         }
+    }
 
-        public string ReferrerPolicy { get; set; }
+    public string ReferrerPolicy { get; set; }
 
-        [BindNever]
-        public bool FromConfiguration { get; set; }
-    }
+    [BindNever]
+    public bool FromConfiguration { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/Drivers/SeoContentDriver.cs b/src/OrchardCore.Modules/OrchardCore.Seo/Drivers/SeoContentDriver.cs
index bceb1199e2d..8bce6b5fa91 100644
--- a/src/OrchardCore.Modules/OrchardCore.Seo/Drivers/SeoContentDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Seo/Drivers/SeoContentDriver.cs
@@ -14,287 +14,286 @@
 using OrchardCore.Shortcodes.Services;
 using Shortcodes;
 
-namespace OrchardCore.Seo.Drivers
+namespace OrchardCore.Seo.Drivers;
+
+public sealed class SeoContentDriver : ContentDisplayDriver
 {
-    public sealed class SeoContentDriver : ContentDisplayDriver
+    private readonly IContentManager _contentManager;
+    private readonly IPageTitleBuilder _pageTitleBuilder;
+    private readonly IResourceManager _resourceManager;
+    private readonly IShortcodeService _shortcodeService;
+    private readonly HtmlEncoder _htmlEncoder;
+
+    private bool _primaryContentRendered { get; set; }
+
+    public SeoContentDriver(
+        IContentManager contentManager,
+        IPageTitleBuilder pageTitleBuilder,
+        IResourceManager resourceManager,
+        IShortcodeService shortcodeService,
+        HtmlEncoder htmlEncoder
+        )
+    {
+        _contentManager = contentManager;
+        _pageTitleBuilder = pageTitleBuilder;
+        _resourceManager = resourceManager;
+        _shortcodeService = shortcodeService;
+        _htmlEncoder = htmlEncoder;
+    }
+
+    public override async Task<IDisplayResult> DisplayAsync(ContentItem contentItem, BuildDisplayContext context)
     {
-        private readonly IContentManager _contentManager;
-        private readonly IPageTitleBuilder _pageTitleBuilder;
-        private readonly IResourceManager _resourceManager;
-        private readonly IShortcodeService _shortcodeService;
-        private readonly HtmlEncoder _htmlEncoder;
-
-        private bool _primaryContentRendered { get; set; }
-
-        public SeoContentDriver(
-            IContentManager contentManager,
-            IPageTitleBuilder pageTitleBuilder,
-            IResourceManager resourceManager,
-            IShortcodeService shortcodeService,
-            HtmlEncoder htmlEncoder
-            )
+        // We only apply this on the primary content item, which is considered the first call to BuildDisplay.
+        if (_primaryContentRendered)
         {
-            _contentManager = contentManager;
-            _pageTitleBuilder = pageTitleBuilder;
-            _resourceManager = resourceManager;
-            _shortcodeService = shortcodeService;
-            _htmlEncoder = htmlEncoder;
+            return null;
         }
 
-        public override async Task<IDisplayResult> DisplayAsync(ContentItem contentItem, BuildDisplayContext context)
+        _primaryContentRendered = true;
+
+        // Do not include Widgets or any display type other than detail.
+        if (context.DisplayType != "Detail" || context.Shape.TryGetProperty(nameof(ContentTypeSettings.Stereotype), out string _))
         {
-            // We only apply this on the primary content item, which is considered the first call to BuildDisplay.
-            if (_primaryContentRendered)
-            {
-                return null;
-            }
+            return null;
+        }
 
-            _primaryContentRendered = true;
+        var aspect = await _contentManager.PopulateAspectAsync<SeoAspect>(contentItem);
 
-            // Do not include Widgets or any display type other than detail.
-            if (context.DisplayType != "Detail" || context.Shape.TryGetProperty(nameof(ContentTypeSettings.Stereotype), out string _))
-            {
-                return null;
-            }
+        if (!aspect.Render)
+        {
+            return null;
+        }
 
-            var aspect = await _contentManager.PopulateAspectAsync<SeoAspect>(contentItem);
+        var shortCodeContext = new Context
+        {
+            ["ContentItem"] = contentItem
+        };
 
-            if (!aspect.Render)
-            {
-                return null;
-            }
+        if (!string.IsNullOrEmpty(aspect.PageTitle))
+        {
+            _pageTitleBuilder.SetFixedTitle(new HtmlString(_htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.PageTitle, shortCodeContext))));
+        }
 
-            var shortCodeContext = new Context
+        if (!string.IsNullOrEmpty(aspect.MetaDescription))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                ["ContentItem"] = contentItem
-            };
+                Name = "description",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.MetaDescription, shortCodeContext))
+            });
+        }
 
-            if (!string.IsNullOrEmpty(aspect.PageTitle))
+        if (!string.IsNullOrEmpty(aspect.MetaKeywords))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                _pageTitleBuilder.SetFixedTitle(new HtmlString(_htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.PageTitle, shortCodeContext))));
-            }
+                Name = "keywords",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.MetaKeywords, shortCodeContext))
+            });
+        }
 
-            if (!string.IsNullOrEmpty(aspect.MetaDescription))
+        if (!string.IsNullOrEmpty(aspect.Canonical))
+        {
+            _resourceManager.RegisterLink(new LinkEntry
             {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Name = "description",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.MetaDescription, shortCodeContext))
-                });
-            }
+                Href = aspect.Canonical,
+                Rel = "canonical"
+            });
+        }
 
-            if (!string.IsNullOrEmpty(aspect.MetaKeywords))
+        if (!string.IsNullOrEmpty(aspect.MetaRobots))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Name = "keywords",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.MetaKeywords, shortCodeContext))
-                });
-            }
+                Name = "robots",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.MetaRobots, shortCodeContext))
+            });
+        }
 
-            if (!string.IsNullOrEmpty(aspect.Canonical))
-            {
-                _resourceManager.RegisterLink(new LinkEntry
-                {
-                    Href = aspect.Canonical,
-                    Rel = "canonical"
-                });
-            }
+        foreach (var customMetaTag in aspect.CustomMetaTags)
+        {
+            // Generate a new meta entry as the builder is prepopulated.
+            _resourceManager.RegisterMeta(new MetaEntry(
+                _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(customMetaTag.Name, shortCodeContext)),
+                _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(customMetaTag.Property, shortCodeContext)),
+                _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(customMetaTag.Content, shortCodeContext)),
+                _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(customMetaTag.HttpEquiv, shortCodeContext)),
+                _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(customMetaTag.Charset, shortCodeContext))));
+        }
 
-            if (!string.IsNullOrEmpty(aspect.MetaRobots))
+        // OpenGraph.
+        if (!string.IsNullOrEmpty(aspect.OpenGraphType))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Name = "robots",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.MetaRobots, shortCodeContext))
-                });
-            }
+                Property = "og:type",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.OpenGraphType, shortCodeContext))
+            });
+        }
 
-            foreach (var customMetaTag in aspect.CustomMetaTags)
+        if (!string.IsNullOrEmpty(aspect.OpenGraphTitle))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                // Generate a new meta entry as the builder is prepopulated.
-                _resourceManager.RegisterMeta(new MetaEntry(
-                    _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(customMetaTag.Name, shortCodeContext)),
-                    _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(customMetaTag.Property, shortCodeContext)),
-                    _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(customMetaTag.Content, shortCodeContext)),
-                    _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(customMetaTag.HttpEquiv, shortCodeContext)),
-                    _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(customMetaTag.Charset, shortCodeContext))));
-            }
+                Property = "og:title",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.OpenGraphTitle, shortCodeContext))
+            });
+        }
 
-            // OpenGraph.
-            if (!string.IsNullOrEmpty(aspect.OpenGraphType))
+        if (!string.IsNullOrEmpty(aspect.OpenGraphDescription))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Property = "og:type",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.OpenGraphType, shortCodeContext))
-                });
-            }
+                Property = "og:description",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.OpenGraphDescription, shortCodeContext))
+            });
+        }
 
-            if (!string.IsNullOrEmpty(aspect.OpenGraphTitle))
+        if (!string.IsNullOrEmpty(aspect.OpenGraphImage))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Property = "og:title",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.OpenGraphTitle, shortCodeContext))
-                });
-            }
+                Property = "og:image",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.OpenGraphImage, shortCodeContext))
+            });
+        }
 
-            if (!string.IsNullOrEmpty(aspect.OpenGraphDescription))
+        if (!string.IsNullOrEmpty(aspect.OpenGraphImageAlt))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Property = "og:description",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.OpenGraphDescription, shortCodeContext))
-                });
-            }
+                Property = "og:image:alt",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.OpenGraphImageAlt, shortCodeContext))
+            });
+        }
 
-            if (!string.IsNullOrEmpty(aspect.OpenGraphImage))
+        if (!string.IsNullOrEmpty(aspect.OpenGraphUrl))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Property = "og:image",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.OpenGraphImage, shortCodeContext))
-                });
-            }
+                Property = "og:url",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.OpenGraphUrl, shortCodeContext))
+            });
+        }
 
-            if (!string.IsNullOrEmpty(aspect.OpenGraphImageAlt))
+        if (!string.IsNullOrEmpty(aspect.OpenGraphSiteName))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Property = "og:image:alt",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.OpenGraphImageAlt, shortCodeContext))
-                });
-            }
+                Property = "og:site_name",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.OpenGraphSiteName, shortCodeContext))
+            });
+        }
 
-            if (!string.IsNullOrEmpty(aspect.OpenGraphUrl))
+        if (!string.IsNullOrEmpty(aspect.OpenGraphAppId))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Property = "og:url",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.OpenGraphUrl, shortCodeContext))
-                });
-            }
+                Property = "fb:app_id",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.OpenGraphAppId, shortCodeContext))
+            });
+        }
 
-            if (!string.IsNullOrEmpty(aspect.OpenGraphSiteName))
+        if (!string.IsNullOrEmpty(aspect.OpenGraphLocale))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Property = "og:site_name",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.OpenGraphSiteName, shortCodeContext))
-                });
-            }
+                Property = "og:locale",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.OpenGraphLocale, shortCodeContext))
+            });
+        }
 
-            if (!string.IsNullOrEmpty(aspect.OpenGraphAppId))
+        // Twitter.
+        if (!string.IsNullOrEmpty(aspect.TwitterCard))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Property = "fb:app_id",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.OpenGraphAppId, shortCodeContext))
-                });
-            }
+                Property = "twitter:card",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.TwitterCard, shortCodeContext))
+            });
+        }
 
-            if (!string.IsNullOrEmpty(aspect.OpenGraphLocale))
+        if (!string.IsNullOrEmpty(aspect.TwitterSite))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Property = "og:locale",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.OpenGraphLocale, shortCodeContext))
-                });
-            }
+                Property = "twitter:site",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.TwitterSite, shortCodeContext))
+            });
+        }
 
-            // Twitter.
-            if (!string.IsNullOrEmpty(aspect.TwitterCard))
+        if (!string.IsNullOrEmpty(aspect.TwitterTitle))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Property = "twitter:card",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.TwitterCard, shortCodeContext))
-                });
-            }
+                Name = "twitter:title",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.TwitterTitle, shortCodeContext))
+            });
+        }
 
-            if (!string.IsNullOrEmpty(aspect.TwitterSite))
+        if (!string.IsNullOrEmpty(aspect.TwitterDescription))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Property = "twitter:site",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.TwitterSite, shortCodeContext))
-                });
-            }
+                Name = "twitter:description",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.TwitterDescription, shortCodeContext))
+            });
+        }
 
-            if (!string.IsNullOrEmpty(aspect.TwitterTitle))
+        if (!string.IsNullOrEmpty(aspect.TwitterImage))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Name = "twitter:title",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.TwitterTitle, shortCodeContext))
-                });
-            }
+                Name = "twitter:image",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.TwitterImage, shortCodeContext))
+            });
+        }
 
-            if (!string.IsNullOrEmpty(aspect.TwitterDescription))
+        if (!string.IsNullOrEmpty(aspect.TwitterImageAlt))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Name = "twitter:description",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.TwitterDescription, shortCodeContext))
-                });
-            }
+                Name = "twitter:image:alt",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.TwitterImageAlt, shortCodeContext))
+            });
+        }
 
-            if (!string.IsNullOrEmpty(aspect.TwitterImage))
+        if (!string.IsNullOrEmpty(aspect.TwitterCreator))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Name = "twitter:image",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.TwitterImage, shortCodeContext))
-                });
-            }
+                Name = "twitter:creator",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.TwitterCreator, shortCodeContext))
+            });
+        }
 
-            if (!string.IsNullOrEmpty(aspect.TwitterImageAlt))
+        if (!string.IsNullOrEmpty(aspect.TwitterUrl))
+        {
+            _resourceManager.RegisterMeta(new MetaEntry
             {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Name = "twitter:image:alt",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.TwitterImageAlt, shortCodeContext))
-                });
-            }
+                Name = "twitter:url",
+                Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.TwitterUrl, shortCodeContext))
+            });
+        }
 
-            if (!string.IsNullOrEmpty(aspect.TwitterCreator))
-            {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Name = "twitter:creator",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.TwitterCreator, shortCodeContext))
-                });
-            }
+        if (!string.IsNullOrEmpty(aspect.GoogleSchema))
+        {
+            var json = await _shortcodeService.ProcessAsync(aspect.GoogleSchema, shortCodeContext);
 
-            if (!string.IsNullOrEmpty(aspect.TwitterUrl))
+            try
             {
-                _resourceManager.RegisterMeta(new MetaEntry
-                {
-                    Name = "twitter:url",
-                    Content = _htmlEncoder.Encode(await _shortcodeService.ProcessAsync(aspect.TwitterUrl, shortCodeContext))
-                });
+                // Validate json format
+                JsonDocument.Parse(json);
             }
-
-            if (!string.IsNullOrEmpty(aspect.GoogleSchema))
+            catch
             {
-                var json = await _shortcodeService.ProcessAsync(aspect.GoogleSchema, shortCodeContext);
-
-                try
-                {
-                    // Validate json format
-                    JsonDocument.Parse(json);
-                }
-                catch
-                {
-                    json = "{ \"error\": \"Invalid JSON content in SEO settings\" }";
-                }
-
-                _resourceManager.RegisterHeadScript(new HtmlString($"<script type=\"application/ld+json\">\n{json}\n</script>"));
-
+                json = "{ \"error\": \"Invalid JSON content in SEO settings\" }";
             }
 
-            return null;
+            _resourceManager.RegisterHeadScript(new HtmlString($"<script type=\"application/ld+json\">\n{json}\n</script>"));
+
         }
+
+        return null;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/Drivers/SeoMetaPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Seo/Drivers/SeoMetaPartDisplayDriver.cs
index d58d92e1451..f1e6c12fded 100644
--- a/src/OrchardCore.Modules/OrchardCore.Seo/Drivers/SeoMetaPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Seo/Drivers/SeoMetaPartDisplayDriver.cs
@@ -11,130 +11,129 @@
 using OrchardCore.Seo.Models;
 using OrchardCore.Seo.ViewModels;
 
-namespace OrchardCore.Seo.Drivers
+namespace OrchardCore.Seo.Drivers;
+
+public sealed class SeoMetaPartDisplayDriver : ContentPartDisplayDriver<SeoMetaPart>
 {
-    public sealed class SeoMetaPartDisplayDriver : ContentPartDisplayDriver<SeoMetaPart>
+    internal readonly IStringLocalizer S;
+
+    public SeoMetaPartDisplayDriver(IStringLocalizer<SeoMetaPartDisplayDriver> stringLocalizer)
     {
-        internal readonly IStringLocalizer S;
+        S = stringLocalizer;
+    }
 
-        public SeoMetaPartDisplayDriver(IStringLocalizer<SeoMetaPartDisplayDriver> stringLocalizer)
-        {
-            S = stringLocalizer;
-        }
+    public override IDisplayResult Edit(SeoMetaPart part, BuildPartEditorContext context)
+    {
+        var settings = context.TypePartDefinition.GetSettings<SeoMetaPartSettings>();
 
-        public override IDisplayResult Edit(SeoMetaPart part, BuildPartEditorContext context)
+        var results = new List<IDisplayResult>
         {
-            var settings = context.TypePartDefinition.GetSettings<SeoMetaPartSettings>();
-
-            var results = new List<IDisplayResult>
+            Initialize<SeoMetaPartViewModel>("SeoMetaPart_Edit", model =>
             {
-                Initialize<SeoMetaPartViewModel>("SeoMetaPart_Edit", model =>
-                {
-                    model.PageTitle = part.PageTitle;
-                    model.Render = part.Render;
-                    model.MetaDescription = part.MetaDescription;
-                    model.MetaKeywords = part.MetaKeywords;
-                    model.Canonical = part.Canonical;
-                    model.MetaRobots = part.MetaRobots;
-                    model.CustomMetaTags = JConvert.SerializeObject(part.CustomMetaTags, JOptions.CamelCaseIndented);
-                    model.SeoMetaPart = part;
-                    model.Settings = settings;
-                }).Location("Parts#SEO;50"),
-            };
-
-            if (settings.DisplayOpenGraph)
+                model.PageTitle = part.PageTitle;
+                model.Render = part.Render;
+                model.MetaDescription = part.MetaDescription;
+                model.MetaKeywords = part.MetaKeywords;
+                model.Canonical = part.Canonical;
+                model.MetaRobots = part.MetaRobots;
+                model.CustomMetaTags = JConvert.SerializeObject(part.CustomMetaTags, JOptions.CamelCaseIndented);
+                model.SeoMetaPart = part;
+                model.Settings = settings;
+            }).Location("Parts#SEO;50"),
+        };
+
+        if (settings.DisplayOpenGraph)
+        {
+            results.Add(Initialize<SeoMetaPartOpenGraphViewModel>("SeoMetaPartOpenGraph_Edit", model =>
             {
-                results.Add(Initialize<SeoMetaPartOpenGraphViewModel>("SeoMetaPartOpenGraph_Edit", model =>
-                {
-                    model.OpenGraphType = part.OpenGraphType;
-                    model.OpenGraphTitle = part.OpenGraphTitle;
-                    model.OpenGraphDescription = part.OpenGraphDescription;
-                    model.SeoMetaPart = part;
-                }).Location("Parts#SEO;50%Open Graph;20"));
-            }
+                model.OpenGraphType = part.OpenGraphType;
+                model.OpenGraphTitle = part.OpenGraphTitle;
+                model.OpenGraphDescription = part.OpenGraphDescription;
+                model.SeoMetaPart = part;
+            }).Location("Parts#SEO;50%Open Graph;20"));
+        }
 
-            if (settings.DisplayTwitter)
+        if (settings.DisplayTwitter)
+        {
+            results.Add(Initialize<SeoMetaPartTwitterViewModel>("SeoMetaPartTwitter_Edit", model =>
             {
-                results.Add(Initialize<SeoMetaPartTwitterViewModel>("SeoMetaPartTwitter_Edit", model =>
-                {
-                    model.TwitterTitle = part.TwitterTitle;
-                    model.TwitterDescription = part.TwitterDescription;
-                    model.TwitterCard = part.TwitterCard;
-                    model.TwitterCreator = part.TwitterCreator;
-                    model.TwitterSite = part.TwitterSite;
-                    model.SeoMetaPart = part;
-                }).Location("Parts#SEO;50%Twitter;30"));
-            }
+                model.TwitterTitle = part.TwitterTitle;
+                model.TwitterDescription = part.TwitterDescription;
+                model.TwitterCard = part.TwitterCard;
+                model.TwitterCreator = part.TwitterCreator;
+                model.TwitterSite = part.TwitterSite;
+                model.SeoMetaPart = part;
+            }).Location("Parts#SEO;50%Twitter;30"));
+        }
 
-            if (settings.DisplayGoogleSchema)
+        if (settings.DisplayGoogleSchema)
+        {
+            results.Add(Initialize<SeoMetaPartGoogleSchemaViewModel>("SeoMetaPartGoogleSchema_Edit", model =>
             {
-                results.Add(Initialize<SeoMetaPartGoogleSchemaViewModel>("SeoMetaPartGoogleSchema_Edit", model =>
-                {
-                    model.GoogleSchema = part.GoogleSchema;
-                    model.SeoMetaPart = part;
-                }).Location("Parts#SEO;50%Google Schema;40"));
-            }
-
-            return Combine(results);
+                model.GoogleSchema = part.GoogleSchema;
+                model.SeoMetaPart = part;
+            }).Location("Parts#SEO;50%Google Schema;40"));
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(SeoMetaPart part, UpdatePartEditorContext context)
-        {
-            var partViewModel = new SeoMetaPartViewModel();
-            await context.Updater.TryUpdateModelAsync(partViewModel, Prefix);
+        return Combine(results);
+    }
 
-            try
-            {
-                part.Render = partViewModel.Render;
-                part.PageTitle = partViewModel.PageTitle;
-                part.MetaDescription = partViewModel.MetaDescription;
-                part.MetaKeywords = partViewModel.MetaKeywords;
-                part.Canonical = partViewModel.Canonical;
-                part.MetaRobots = partViewModel.MetaRobots;
-
-                part.CustomMetaTags = string.IsNullOrWhiteSpace(partViewModel.CustomMetaTags)
-                    ? []
-                    : JConvert.DeserializeObject<MetaEntry[]>(partViewModel.CustomMetaTags);
-
-                if (part.Canonical?.IndexOfAny(SeoMetaPart.InvalidCharactersForCanoncial) > -1 || part.Canonical?.IndexOf(' ') > -1)
-                {
-                    context.Updater.ModelState.AddModelError(Prefix, S["The canonical entry contains invalid characters."]);
-                }
-            }
-            catch
+    public override async Task<IDisplayResult> UpdateAsync(SeoMetaPart part, UpdatePartEditorContext context)
+    {
+        var partViewModel = new SeoMetaPartViewModel();
+        await context.Updater.TryUpdateModelAsync(partViewModel, Prefix);
+
+        try
+        {
+            part.Render = partViewModel.Render;
+            part.PageTitle = partViewModel.PageTitle;
+            part.MetaDescription = partViewModel.MetaDescription;
+            part.MetaKeywords = partViewModel.MetaKeywords;
+            part.Canonical = partViewModel.Canonical;
+            part.MetaRobots = partViewModel.MetaRobots;
+
+            part.CustomMetaTags = string.IsNullOrWhiteSpace(partViewModel.CustomMetaTags)
+                ? []
+                : JConvert.DeserializeObject<MetaEntry[]>(partViewModel.CustomMetaTags);
+
+            if (part.Canonical?.IndexOfAny(SeoMetaPart.InvalidCharactersForCanoncial) > -1 || part.Canonical?.IndexOf(' ') > -1)
             {
-                context.Updater.ModelState.AddModelError(Prefix, S["The meta entries are written in an incorrect format."]);
+                context.Updater.ModelState.AddModelError(Prefix, S["The canonical entry contains invalid characters."]);
             }
+        }
+        catch
+        {
+            context.Updater.ModelState.AddModelError(Prefix, S["The meta entries are written in an incorrect format."]);
+        }
 
-            var openGraphModel = new SeoMetaPartOpenGraphViewModel();
-
-            await context.Updater.TryUpdateModelAsync(openGraphModel, Prefix);
+        var openGraphModel = new SeoMetaPartOpenGraphViewModel();
 
-            part.OpenGraphType = openGraphModel.OpenGraphType;
-            part.OpenGraphTitle = openGraphModel.OpenGraphTitle;
-            part.OpenGraphDescription = openGraphModel.OpenGraphDescription;
+        await context.Updater.TryUpdateModelAsync(openGraphModel, Prefix);
 
-            var twitterModel = new SeoMetaPartTwitterViewModel();
+        part.OpenGraphType = openGraphModel.OpenGraphType;
+        part.OpenGraphTitle = openGraphModel.OpenGraphTitle;
+        part.OpenGraphDescription = openGraphModel.OpenGraphDescription;
 
-            await context.Updater.TryUpdateModelAsync(twitterModel, Prefix);
+        var twitterModel = new SeoMetaPartTwitterViewModel();
 
-            part.TwitterTitle = twitterModel.TwitterTitle;
-            part.TwitterDescription = twitterModel.TwitterDescription;
-            part.TwitterCard = twitterModel.TwitterCard;
-            part.TwitterCreator = twitterModel.TwitterCreator;
-            part.TwitterSite = twitterModel.TwitterSite;
+        await context.Updater.TryUpdateModelAsync(twitterModel, Prefix);
 
-            var googleSchemaModel = new SeoMetaPartGoogleSchemaViewModel();
+        part.TwitterTitle = twitterModel.TwitterTitle;
+        part.TwitterDescription = twitterModel.TwitterDescription;
+        part.TwitterCard = twitterModel.TwitterCard;
+        part.TwitterCreator = twitterModel.TwitterCreator;
+        part.TwitterSite = twitterModel.TwitterSite;
 
-            await context.Updater.TryUpdateModelAsync(googleSchemaModel, Prefix);
+        var googleSchemaModel = new SeoMetaPartGoogleSchemaViewModel();
 
-            part.GoogleSchema = googleSchemaModel.GoogleSchema;
-            if (!string.IsNullOrWhiteSpace(googleSchemaModel.GoogleSchema) && !googleSchemaModel.GoogleSchema.IsJson())
-            {
-                context.Updater.ModelState.AddModelError(Prefix, S["The google schema is written in an incorrect format."]);
-            }
+        await context.Updater.TryUpdateModelAsync(googleSchemaModel, Prefix);
 
-            return Edit(part, context);
+        part.GoogleSchema = googleSchemaModel.GoogleSchema;
+        if (!string.IsNullOrWhiteSpace(googleSchemaModel.GoogleSchema) && !googleSchemaModel.GoogleSchema.IsJson())
+        {
+            context.Updater.ModelState.AddModelError(Prefix, S["The google schema is written in an incorrect format."]);
         }
+
+        return Edit(part, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/Handlers/SeoMetaPartHandler.cs b/src/OrchardCore.Modules/OrchardCore.Seo/Handlers/SeoMetaPartHandler.cs
index 2854c4aa8e9..ce5be865cad 100644
--- a/src/OrchardCore.Modules/OrchardCore.Seo/Handlers/SeoMetaPartHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Seo/Handlers/SeoMetaPartHandler.cs
@@ -14,189 +14,188 @@
 using OrchardCore.Seo.Models;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Seo.Drivers
+namespace OrchardCore.Seo.Drivers;
+
+public class SeoMetaPartHandler : ContentPartHandler<SeoMetaPart>
 {
-    public class SeoMetaPartHandler : ContentPartHandler<SeoMetaPart>
+    private readonly IMediaFileStore _mediaFileStore;
+    private readonly ISiteService _siteService;
+    private readonly IActionContextAccessor _actionContextAccessor;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IUrlHelperFactory _urlHelperFactory;
+    private readonly IContentManager _contentManager;
+
+    public SeoMetaPartHandler(
+        IMediaFileStore mediaFileStore,
+        ISiteService siteService,
+        IActionContextAccessor actionContextAccessor,
+        IHttpContextAccessor httpContextAccessor,
+        IUrlHelperFactory urlHelperFactory,
+        IContentManager contentManager
+        )
     {
-        private readonly IMediaFileStore _mediaFileStore;
-        private readonly ISiteService _siteService;
-        private readonly IActionContextAccessor _actionContextAccessor;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IUrlHelperFactory _urlHelperFactory;
-        private readonly IContentManager _contentManager;
-
-        public SeoMetaPartHandler(
-            IMediaFileStore mediaFileStore,
-            ISiteService siteService,
-            IActionContextAccessor actionContextAccessor,
-            IHttpContextAccessor httpContextAccessor,
-            IUrlHelperFactory urlHelperFactory,
-            IContentManager contentManager
-            )
-        {
-            _mediaFileStore = mediaFileStore;
-            _siteService = siteService;
-            _actionContextAccessor = actionContextAccessor;
-            _httpContextAccessor = httpContextAccessor;
-            _urlHelperFactory = urlHelperFactory;
-            _contentManager = contentManager;
-        }
+        _mediaFileStore = mediaFileStore;
+        _siteService = siteService;
+        _actionContextAccessor = actionContextAccessor;
+        _httpContextAccessor = httpContextAccessor;
+        _urlHelperFactory = urlHelperFactory;
+        _contentManager = contentManager;
+    }
 
-        public override Task GetContentItemAspectAsync(ContentItemAspectContext context, SeoMetaPart part)
+    public override Task GetContentItemAspectAsync(ContentItemAspectContext context, SeoMetaPart part)
+    {
+        return context.ForAsync<SeoAspect>(async aspect =>
         {
-            return context.ForAsync<SeoAspect>(async aspect =>
-            {
-                aspect.Render = part.Render;
-
-                if (!string.IsNullOrEmpty(part.PageTitle))
-                {
-                    aspect.PageTitle = part.PageTitle;
-                }
-
-                if (!string.IsNullOrEmpty(part.MetaDescription))
-                {
-                    aspect.MetaDescription = part.MetaDescription;
-                }
-
-                if (!string.IsNullOrEmpty(part.MetaKeywords))
-                {
-                    aspect.MetaKeywords = part.MetaKeywords;
-                }
-
-                if (!string.IsNullOrEmpty(part.MetaRobots))
-                {
-                    aspect.MetaRobots = part.MetaRobots;
-                }
-
-                aspect.CustomMetaTags = part.CustomMetaTags;
-
-                var siteSettings = await _siteService.GetSiteSettingsAsync();
-
-                var actionContext = _actionContextAccessor.ActionContext;
-
-                actionContext ??= await GetActionContextAsync(_httpContextAccessor.HttpContext);
-
-                var urlHelper = _urlHelperFactory.GetUrlHelper(actionContext);
-
-                if (!string.IsNullOrEmpty(part.Canonical))
-                {
-                    aspect.Canonical = part.Canonical;
-                }
-                else
-                {
-                    var contentItemMetadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(part.ContentItem);
-                    var relativeUrl = urlHelper.RouteUrl(contentItemMetadata.DisplayRouteValues);
-                    aspect.Canonical = urlHelper.ToAbsoluteUrl(relativeUrl);
-                }
-
-                // OpenGraph
-                if (part.OpenGraphImage?.Paths?.Length > 0)
-                {
-                    aspect.OpenGraphImage = urlHelper.ToAbsoluteUrl(_mediaFileStore.MapPathToPublicUrl(part.OpenGraphImage.Paths[0]));
-                }
-                else if (part.DefaultSocialImage?.Paths?.Length > 0)
-                {
-                    aspect.OpenGraphImage = urlHelper.ToAbsoluteUrl(_mediaFileStore.MapPathToPublicUrl(part.DefaultSocialImage.Paths[0]));
-                }
-
-                if (part.OpenGraphImage?.MediaTexts?.Length > 0)
-                {
-                    aspect.OpenGraphImageAlt = part.OpenGraphImage.MediaTexts[0];
-                }
-                else if (part.DefaultSocialImage?.MediaTexts?.Length > 0)
-                {
-                    aspect.OpenGraphImageAlt = part.DefaultSocialImage.MediaTexts[0];
-                }
-
-                if (!string.IsNullOrEmpty(part.OpenGraphTitle))
-                {
-                    aspect.OpenGraphTitle = part.OpenGraphTitle;
-                }
-                else
-                {
-                    aspect.OpenGraphTitle = part.PageTitle;
-                }
-
-                if (!string.IsNullOrEmpty(part.OpenGraphDescription))
-                {
-                    aspect.OpenGraphDescription = part.OpenGraphDescription;
-                }
-                else
-                {
-                    aspect.OpenGraphDescription = part.MetaDescription;
-                }
-
-                // Twitter
-
-                if (part.TwitterImage?.Paths?.Length > 0)
-                {
-                    aspect.TwitterImage = urlHelper.ToAbsoluteUrl(_mediaFileStore.MapPathToPublicUrl(part.TwitterImage.Paths[0]));
-                }
-                else if (part.DefaultSocialImage?.Paths?.Length > 0)
-                {
-                    aspect.TwitterImage = urlHelper.ToAbsoluteUrl(_mediaFileStore.MapPathToPublicUrl(part.DefaultSocialImage.Paths[0]));
-                }
-
-                if (part.TwitterImage?.MediaTexts?.Length > 0)
-                {
-                    aspect.TwitterImageAlt = part.TwitterImage.MediaTexts[0];
-                }
-                else if (part.DefaultSocialImage?.MediaTexts?.Length > 0)
-                {
-                    aspect.TwitterImageAlt = part.DefaultSocialImage.MediaTexts[0];
-                }
-
-                if (!string.IsNullOrEmpty(part.TwitterTitle))
-                {
-                    aspect.TwitterTitle = part.TwitterTitle;
-                }
-                else
-                {
-                    aspect.TwitterTitle = part.PageTitle;
-                }
-
-                if (!string.IsNullOrEmpty(part.TwitterDescription))
-                {
-                    aspect.TwitterDescription = part.TwitterDescription;
-                }
-                else
-                {
-                    aspect.TwitterDescription = part.MetaDescription;
-                }
-
-                if (!string.IsNullOrEmpty(part.TwitterCard))
-                {
-                    aspect.TwitterCard = part.TwitterCard;
-                }
-
-                if (!string.IsNullOrEmpty(part.TwitterCreator))
-                {
-                    aspect.TwitterCreator = part.TwitterCreator;
-                }
-
-                if (!string.IsNullOrEmpty(part.TwitterSite))
-                {
-                    aspect.TwitterSite = part.TwitterSite;
-                }
-
-                aspect.GoogleSchema = part.GoogleSchema;
-            });
-        }
+            aspect.Render = part.Render;
 
-        internal static async Task<ActionContext> GetActionContextAsync(HttpContext httpContext)
-        {
-            var routeData = new RouteData();
-            routeData.Routers.Add(new RouteCollection());
+            if (!string.IsNullOrEmpty(part.PageTitle))
+            {
+                aspect.PageTitle = part.PageTitle;
+            }
 
-            var actionContext = new ActionContext(httpContext, routeData, new ActionDescriptor());
-            var filters = httpContext.RequestServices.GetServices<IAsyncViewActionFilter>();
+            if (!string.IsNullOrEmpty(part.MetaDescription))
+            {
+                aspect.MetaDescription = part.MetaDescription;
+            }
 
-            foreach (var filter in filters)
+            if (!string.IsNullOrEmpty(part.MetaKeywords))
             {
-                await filter.OnActionExecutionAsync(actionContext);
+                aspect.MetaKeywords = part.MetaKeywords;
             }
 
-            return actionContext;
+            if (!string.IsNullOrEmpty(part.MetaRobots))
+            {
+                aspect.MetaRobots = part.MetaRobots;
+            }
+
+            aspect.CustomMetaTags = part.CustomMetaTags;
+
+            var siteSettings = await _siteService.GetSiteSettingsAsync();
+
+            var actionContext = _actionContextAccessor.ActionContext;
+
+            actionContext ??= await GetActionContextAsync(_httpContextAccessor.HttpContext);
+
+            var urlHelper = _urlHelperFactory.GetUrlHelper(actionContext);
+
+            if (!string.IsNullOrEmpty(part.Canonical))
+            {
+                aspect.Canonical = part.Canonical;
+            }
+            else
+            {
+                var contentItemMetadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(part.ContentItem);
+                var relativeUrl = urlHelper.RouteUrl(contentItemMetadata.DisplayRouteValues);
+                aspect.Canonical = urlHelper.ToAbsoluteUrl(relativeUrl);
+            }
+
+            // OpenGraph
+            if (part.OpenGraphImage?.Paths?.Length > 0)
+            {
+                aspect.OpenGraphImage = urlHelper.ToAbsoluteUrl(_mediaFileStore.MapPathToPublicUrl(part.OpenGraphImage.Paths[0]));
+            }
+            else if (part.DefaultSocialImage?.Paths?.Length > 0)
+            {
+                aspect.OpenGraphImage = urlHelper.ToAbsoluteUrl(_mediaFileStore.MapPathToPublicUrl(part.DefaultSocialImage.Paths[0]));
+            }
+
+            if (part.OpenGraphImage?.MediaTexts?.Length > 0)
+            {
+                aspect.OpenGraphImageAlt = part.OpenGraphImage.MediaTexts[0];
+            }
+            else if (part.DefaultSocialImage?.MediaTexts?.Length > 0)
+            {
+                aspect.OpenGraphImageAlt = part.DefaultSocialImage.MediaTexts[0];
+            }
+
+            if (!string.IsNullOrEmpty(part.OpenGraphTitle))
+            {
+                aspect.OpenGraphTitle = part.OpenGraphTitle;
+            }
+            else
+            {
+                aspect.OpenGraphTitle = part.PageTitle;
+            }
+
+            if (!string.IsNullOrEmpty(part.OpenGraphDescription))
+            {
+                aspect.OpenGraphDescription = part.OpenGraphDescription;
+            }
+            else
+            {
+                aspect.OpenGraphDescription = part.MetaDescription;
+            }
+
+            // Twitter
+
+            if (part.TwitterImage?.Paths?.Length > 0)
+            {
+                aspect.TwitterImage = urlHelper.ToAbsoluteUrl(_mediaFileStore.MapPathToPublicUrl(part.TwitterImage.Paths[0]));
+            }
+            else if (part.DefaultSocialImage?.Paths?.Length > 0)
+            {
+                aspect.TwitterImage = urlHelper.ToAbsoluteUrl(_mediaFileStore.MapPathToPublicUrl(part.DefaultSocialImage.Paths[0]));
+            }
+
+            if (part.TwitterImage?.MediaTexts?.Length > 0)
+            {
+                aspect.TwitterImageAlt = part.TwitterImage.MediaTexts[0];
+            }
+            else if (part.DefaultSocialImage?.MediaTexts?.Length > 0)
+            {
+                aspect.TwitterImageAlt = part.DefaultSocialImage.MediaTexts[0];
+            }
+
+            if (!string.IsNullOrEmpty(part.TwitterTitle))
+            {
+                aspect.TwitterTitle = part.TwitterTitle;
+            }
+            else
+            {
+                aspect.TwitterTitle = part.PageTitle;
+            }
+
+            if (!string.IsNullOrEmpty(part.TwitterDescription))
+            {
+                aspect.TwitterDescription = part.TwitterDescription;
+            }
+            else
+            {
+                aspect.TwitterDescription = part.MetaDescription;
+            }
+
+            if (!string.IsNullOrEmpty(part.TwitterCard))
+            {
+                aspect.TwitterCard = part.TwitterCard;
+            }
+
+            if (!string.IsNullOrEmpty(part.TwitterCreator))
+            {
+                aspect.TwitterCreator = part.TwitterCreator;
+            }
+
+            if (!string.IsNullOrEmpty(part.TwitterSite))
+            {
+                aspect.TwitterSite = part.TwitterSite;
+            }
+
+            aspect.GoogleSchema = part.GoogleSchema;
+        });
+    }
+
+    internal static async Task<ActionContext> GetActionContextAsync(HttpContext httpContext)
+    {
+        var routeData = new RouteData();
+        routeData.Routers.Add(new RouteCollection());
+
+        var actionContext = new ActionContext(httpContext, routeData, new ActionDescriptor());
+        var filters = httpContext.RequestServices.GetServices<IAsyncViewActionFilter>();
+
+        foreach (var filter in filters)
+        {
+            await filter.OnActionExecutionAsync(actionContext);
         }
+
+        return actionContext;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/Handlers/SeoMetaSettingsHandler.cs b/src/OrchardCore.Modules/OrchardCore.Seo/Handlers/SeoMetaSettingsHandler.cs
index d9f4aed055d..7628af52a2c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Seo/Handlers/SeoMetaSettingsHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Seo/Handlers/SeoMetaSettingsHandler.cs
@@ -15,211 +15,210 @@
 using OrchardCore.Seo.Models;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Seo.Drivers
+namespace OrchardCore.Seo.Drivers;
+
+public class SeoMetaSettingsHandler : ContentHandlerBase
 {
-    public class SeoMetaSettingsHandler : ContentHandlerBase
+    private readonly IMediaFileStore _mediaFileStore;
+    private readonly ISiteService _siteService;
+    private readonly IActionContextAccessor _actionContextAccessor;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IUrlHelperFactory _urlHelperFactory;
+    private IContentManager _contentManager;
+
+    public SeoMetaSettingsHandler(
+        IMediaFileStore mediaFileStore,
+        ISiteService siteService,
+        IActionContextAccessor actionContextAccessor,
+        IHttpContextAccessor httpContextAccessor,
+        IUrlHelperFactory urlHelperFactory
+        )
     {
-        private readonly IMediaFileStore _mediaFileStore;
-        private readonly ISiteService _siteService;
-        private readonly IActionContextAccessor _actionContextAccessor;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IUrlHelperFactory _urlHelperFactory;
-        private IContentManager _contentManager;
-
-        public SeoMetaSettingsHandler(
-            IMediaFileStore mediaFileStore,
-            ISiteService siteService,
-            IActionContextAccessor actionContextAccessor,
-            IHttpContextAccessor httpContextAccessor,
-            IUrlHelperFactory urlHelperFactory
-            )
-        {
-            _mediaFileStore = mediaFileStore;
-            _siteService = siteService;
-            _actionContextAccessor = actionContextAccessor;
-            _httpContextAccessor = httpContextAccessor;
-            _urlHelperFactory = urlHelperFactory;
-        }
+        _mediaFileStore = mediaFileStore;
+        _siteService = siteService;
+        _actionContextAccessor = actionContextAccessor;
+        _httpContextAccessor = httpContextAccessor;
+        _urlHelperFactory = urlHelperFactory;
+    }
 
-        public override Task GetContentItemAspectAsync(ContentItemAspectContext context)
+    public override Task GetContentItemAspectAsync(ContentItemAspectContext context)
+    {
+        return context.ForAsync<SeoAspect>(async aspect =>
         {
-            return context.ForAsync<SeoAspect>(async aspect =>
-            {
-                // This handlers provides defaults, either from the Seo Meta Settings, or ensures values by default. (title etc)
-                _contentManager ??= _httpContextAccessor.HttpContext.RequestServices.GetRequiredService<IContentManager>();
-                var siteSettings = await _siteService.GetSiteSettingsAsync();
-                var metaSettings = siteSettings.As<ContentItem>("SocialMetaSettings");
+            // This handlers provides defaults, either from the Seo Meta Settings, or ensures values by default. (title etc)
+            _contentManager ??= _httpContextAccessor.HttpContext.RequestServices.GetRequiredService<IContentManager>();
+            var siteSettings = await _siteService.GetSiteSettingsAsync();
+            var metaSettings = siteSettings.As<ContentItem>("SocialMetaSettings");
 
-                var actionContext = _actionContextAccessor.ActionContext;
+            var actionContext = _actionContextAccessor.ActionContext;
 
-                actionContext ??= await GetActionContextAsync(_httpContextAccessor.HttpContext);
+            actionContext ??= await GetActionContextAsync(_httpContextAccessor.HttpContext);
 
-                var urlHelper = _urlHelperFactory.GetUrlHelper(actionContext);
-                var contentItemMetadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(context.ContentItem);
+            var urlHelper = _urlHelperFactory.GetUrlHelper(actionContext);
+            var contentItemMetadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(context.ContentItem);
 
-                var relativeUrl = urlHelper.RouteUrl(contentItemMetadata.DisplayRouteValues);
-                var absoluteUrl = urlHelper.ToAbsoluteUrl(relativeUrl);
+            var relativeUrl = urlHelper.RouteUrl(contentItemMetadata.DisplayRouteValues);
+            var absoluteUrl = urlHelper.ToAbsoluteUrl(relativeUrl);
 
-                // Logic is this happens last after the part settings.
-                // so if values are not set it is responsible for settings them.
+            // Logic is this happens last after the part settings.
+            // so if values are not set it is responsible for settings them.
 
-                string defaultImage = metaSettings.Content.SocialMetaSettings?.DefaultSocialImage?.Paths?.Count > 0 ? metaSettings.Content.SocialMetaSettings.DefaultSocialImage.Paths[0] : string.Empty;
-                string openGraphImage = metaSettings.Content.SocialMetaSettings?.OpenGraphImage?.Paths?.Count > 0 ? metaSettings.Content.SocialMetaSettings?.OpenGraphImage?.Paths[0] : string.Empty;
-                string twitterImage = metaSettings.Content.SocialMetaSettings?.TwitterImage?.Paths?.Count > 0 ? metaSettings.Content.SocialMetaSettings?.TwitterImage?.Paths[0] : string.Empty;
+            string defaultImage = metaSettings.Content.SocialMetaSettings?.DefaultSocialImage?.Paths?.Count > 0 ? metaSettings.Content.SocialMetaSettings.DefaultSocialImage.Paths[0] : string.Empty;
+            string openGraphImage = metaSettings.Content.SocialMetaSettings?.OpenGraphImage?.Paths?.Count > 0 ? metaSettings.Content.SocialMetaSettings?.OpenGraphImage?.Paths[0] : string.Empty;
+            string twitterImage = metaSettings.Content.SocialMetaSettings?.TwitterImage?.Paths?.Count > 0 ? metaSettings.Content.SocialMetaSettings?.TwitterImage?.Paths[0] : string.Empty;
 
-                string defaultAltText = metaSettings.Content.SocialMetaSettings?.DefaultSocialImage?.MediaTexts?.Count > 0 ? metaSettings.Content.SocialMetaSettings.DefaultSocialImage.MediaTexts[0] : string.Empty;
-                string openGraphAltText = metaSettings.Content.SocialMetaSettings?.OpenGraphImage?.MediaTexts?.Count > 0 ? metaSettings.Content.SocialMetaSettings?.OpenGraphImage?.MediaTexts[0] : string.Empty;
-                string twitterAltText = metaSettings.Content.SocialMetaSettings?.TwitterImage?.MediaTexts?.Count > 0 ? metaSettings.Content.SocialMetaSettings?.TwitterImage?.MediaTexts[0] : string.Empty;
+            string defaultAltText = metaSettings.Content.SocialMetaSettings?.DefaultSocialImage?.MediaTexts?.Count > 0 ? metaSettings.Content.SocialMetaSettings.DefaultSocialImage.MediaTexts[0] : string.Empty;
+            string openGraphAltText = metaSettings.Content.SocialMetaSettings?.OpenGraphImage?.MediaTexts?.Count > 0 ? metaSettings.Content.SocialMetaSettings?.OpenGraphImage?.MediaTexts[0] : string.Empty;
+            string twitterAltText = metaSettings.Content.SocialMetaSettings?.TwitterImage?.MediaTexts?.Count > 0 ? metaSettings.Content.SocialMetaSettings?.TwitterImage?.MediaTexts[0] : string.Empty;
 
-                string twitterCard = metaSettings.Content.SocialMetaSettings?.TwitterCard?.Text?.ToString();
-                string twitterCreator = metaSettings.Content.SocialMetaSettings?.TwitterCreator?.Text?.ToString();
-                string twitterSite = metaSettings.Content.SocialMetaSettings?.TwitterSite?.Text?.ToString();
+            string twitterCard = metaSettings.Content.SocialMetaSettings?.TwitterCard?.Text?.ToString();
+            string twitterCreator = metaSettings.Content.SocialMetaSettings?.TwitterCreator?.Text?.ToString();
+            string twitterSite = metaSettings.Content.SocialMetaSettings?.TwitterSite?.Text?.ToString();
 
-                string googleSchema = metaSettings.Content.SocialMetaSettings?.GoogleSchema?.Text?.ToString();
+            string googleSchema = metaSettings.Content.SocialMetaSettings?.GoogleSchema?.Text?.ToString();
 
-                // Meta
+            // Meta
 
-                if (string.IsNullOrEmpty(aspect.MetaDescription))
-                {
-                    aspect.MetaDescription = metaSettings.Content.SocialMetaSettings?.DefaultMetaDescription?.Text?.ToString();
-                }
+            if (string.IsNullOrEmpty(aspect.MetaDescription))
+            {
+                aspect.MetaDescription = metaSettings.Content.SocialMetaSettings?.DefaultMetaDescription?.Text?.ToString();
+            }
 
-                // OpenGraph
+            // OpenGraph
 
-                aspect.OpenGraphUrl = aspect.Canonical ??= absoluteUrl;
+            aspect.OpenGraphUrl = aspect.Canonical ??= absoluteUrl;
 
-                if (string.IsNullOrEmpty(aspect.OpenGraphType))
-                {
-                    aspect.OpenGraphType = metaSettings.Content.SocialMetaSettings?.OpenGraphType?.Text?.ToString();
-                }
+            if (string.IsNullOrEmpty(aspect.OpenGraphType))
+            {
+                aspect.OpenGraphType = metaSettings.Content.SocialMetaSettings?.OpenGraphType?.Text?.ToString();
+            }
 
-                if (string.IsNullOrEmpty(aspect.OpenGraphTitle))
-                {
-                    aspect.OpenGraphTitle = context.ContentItem.DisplayText;
-                }
+            if (string.IsNullOrEmpty(aspect.OpenGraphTitle))
+            {
+                aspect.OpenGraphTitle = context.ContentItem.DisplayText;
+            }
 
-                if (string.IsNullOrEmpty(aspect.OpenGraphDescription))
-                {
-                    aspect.OpenGraphDescription = metaSettings.Content.SocialMetaSettings?.DefaultOpenGraphDescription?.Text?.ToString();
-                }
+            if (string.IsNullOrEmpty(aspect.OpenGraphDescription))
+            {
+                aspect.OpenGraphDescription = metaSettings.Content.SocialMetaSettings?.DefaultOpenGraphDescription?.Text?.ToString();
+            }
 
+            if (string.IsNullOrEmpty(aspect.OpenGraphSiteName))
+            {
+                aspect.OpenGraphSiteName = metaSettings.Content.SocialMetaSettings?.OpenGraphSiteName?.Text?.ToString();
                 if (string.IsNullOrEmpty(aspect.OpenGraphSiteName))
                 {
-                    aspect.OpenGraphSiteName = metaSettings.Content.SocialMetaSettings?.OpenGraphSiteName?.Text?.ToString();
-                    if (string.IsNullOrEmpty(aspect.OpenGraphSiteName))
-                    {
-                        aspect.OpenGraphSiteName = siteSettings.SiteName;
-                    }
+                    aspect.OpenGraphSiteName = siteSettings.SiteName;
                 }
+            }
 
-                if (string.IsNullOrEmpty(aspect.OpenGraphAppId))
-                {
-                    aspect.OpenGraphAppId = metaSettings.Content.SocialMetaSettings?.OpenGraphAppId?.Text?.ToString();
-                }
+            if (string.IsNullOrEmpty(aspect.OpenGraphAppId))
+            {
+                aspect.OpenGraphAppId = metaSettings.Content.SocialMetaSettings?.OpenGraphAppId?.Text?.ToString();
+            }
 
-                if (string.IsNullOrEmpty(aspect.OpenGraphImage))
+            if (string.IsNullOrEmpty(aspect.OpenGraphImage))
+            {
+                if (string.IsNullOrEmpty(openGraphImage))
                 {
-                    if (string.IsNullOrEmpty(openGraphImage))
-                    {
-                        if (!string.IsNullOrEmpty(defaultImage))
-                        {
-                            aspect.OpenGraphImage = urlHelper.ToAbsoluteUrl(_mediaFileStore.MapPathToPublicUrl(defaultImage));
-                        }
-                    }
-                    else
+                    if (!string.IsNullOrEmpty(defaultImage))
                     {
-                        aspect.OpenGraphImage = urlHelper.ToAbsoluteUrl(_mediaFileStore.MapPathToPublicUrl(openGraphImage));
+                        aspect.OpenGraphImage = urlHelper.ToAbsoluteUrl(_mediaFileStore.MapPathToPublicUrl(defaultImage));
                     }
                 }
-
-                if (string.IsNullOrEmpty(aspect.OpenGraphImageAlt))
+                else
                 {
-                    if (string.IsNullOrEmpty(openGraphAltText))
-                    {
-                        aspect.OpenGraphImageAlt = defaultAltText;
-                    }
-                    else
-                    {
-                        aspect.OpenGraphImageAlt = openGraphAltText;
-                    }
+                    aspect.OpenGraphImage = urlHelper.ToAbsoluteUrl(_mediaFileStore.MapPathToPublicUrl(openGraphImage));
                 }
+            }
 
-                // Twitter
-                aspect.TwitterUrl = aspect.Canonical ??= absoluteUrl;
-
-                if (string.IsNullOrEmpty(aspect.TwitterTitle))
+            if (string.IsNullOrEmpty(aspect.OpenGraphImageAlt))
+            {
+                if (string.IsNullOrEmpty(openGraphAltText))
                 {
-                    aspect.TwitterTitle = context.ContentItem.DisplayText;
+                    aspect.OpenGraphImageAlt = defaultAltText;
                 }
-
-                if (string.IsNullOrEmpty(aspect.TwitterDescription))
+                else
                 {
-                    aspect.TwitterDescription = metaSettings.Content.SocialMetaSettings?.DefaultTwitterDescription?.Text?.ToString();
+                    aspect.OpenGraphImageAlt = openGraphAltText;
                 }
+            }
 
-                if (string.IsNullOrEmpty(aspect.TwitterCard))
-                {
-                    aspect.TwitterCard = twitterCard;
-                }
+            // Twitter
+            aspect.TwitterUrl = aspect.Canonical ??= absoluteUrl;
 
-                if (string.IsNullOrEmpty(aspect.TwitterSite))
-                {
-                    aspect.TwitterSite = twitterSite;
-                }
+            if (string.IsNullOrEmpty(aspect.TwitterTitle))
+            {
+                aspect.TwitterTitle = context.ContentItem.DisplayText;
+            }
 
-                if (string.IsNullOrEmpty(aspect.TwitterCreator))
-                {
-                    aspect.TwitterCreator = twitterCreator;
-                }
+            if (string.IsNullOrEmpty(aspect.TwitterDescription))
+            {
+                aspect.TwitterDescription = metaSettings.Content.SocialMetaSettings?.DefaultTwitterDescription?.Text?.ToString();
+            }
 
-                if (string.IsNullOrEmpty(aspect.TwitterImage))
+            if (string.IsNullOrEmpty(aspect.TwitterCard))
+            {
+                aspect.TwitterCard = twitterCard;
+            }
+
+            if (string.IsNullOrEmpty(aspect.TwitterSite))
+            {
+                aspect.TwitterSite = twitterSite;
+            }
+
+            if (string.IsNullOrEmpty(aspect.TwitterCreator))
+            {
+                aspect.TwitterCreator = twitterCreator;
+            }
+
+            if (string.IsNullOrEmpty(aspect.TwitterImage))
+            {
+                if (string.IsNullOrEmpty(twitterImage))
                 {
-                    if (string.IsNullOrEmpty(twitterImage))
-                    {
-                        if (!string.IsNullOrEmpty(defaultImage))
-                        {
-                            aspect.TwitterImage = urlHelper.ToAbsoluteUrl(_mediaFileStore.MapPathToPublicUrl(defaultImage));
-                        }
-                    }
-                    else
+                    if (!string.IsNullOrEmpty(defaultImage))
                     {
-                        aspect.TwitterImage = urlHelper.ToAbsoluteUrl(_mediaFileStore.MapPathToPublicUrl(twitterImage));
+                        aspect.TwitterImage = urlHelper.ToAbsoluteUrl(_mediaFileStore.MapPathToPublicUrl(defaultImage));
                     }
                 }
-
-                if (string.IsNullOrEmpty(aspect.TwitterImageAlt))
+                else
                 {
-                    if (string.IsNullOrEmpty(twitterAltText))
-                    {
-                        aspect.TwitterImageAlt = defaultAltText;
-                    }
-                    else
-                    {
-                        aspect.TwitterImageAlt = twitterAltText;
-                    }
+                    aspect.TwitterImage = urlHelper.ToAbsoluteUrl(_mediaFileStore.MapPathToPublicUrl(twitterImage));
                 }
+            }
 
-                if (string.IsNullOrEmpty(aspect.GoogleSchema))
+            if (string.IsNullOrEmpty(aspect.TwitterImageAlt))
+            {
+                if (string.IsNullOrEmpty(twitterAltText))
                 {
-                    aspect.GoogleSchema = googleSchema;
+                    aspect.TwitterImageAlt = defaultAltText;
                 }
-            });
-        }
-
-        internal static async Task<ActionContext> GetActionContextAsync(HttpContext httpContext)
-        {
-            var routeData = new RouteData();
-            routeData.Routers.Add(new RouteCollection());
-
-            var actionContext = new ActionContext(httpContext, routeData, new ActionDescriptor());
-            var filters = httpContext.RequestServices.GetServices<IAsyncViewActionFilter>();
+                else
+                {
+                    aspect.TwitterImageAlt = twitterAltText;
+                }
+            }
 
-            foreach (var filter in filters)
+            if (string.IsNullOrEmpty(aspect.GoogleSchema))
             {
-                await filter.OnActionExecutionAsync(actionContext);
+                aspect.GoogleSchema = googleSchema;
             }
+        });
+    }
 
-            return actionContext;
+    internal static async Task<ActionContext> GetActionContextAsync(HttpContext httpContext)
+    {
+        var routeData = new RouteData();
+        routeData.Routers.Add(new RouteCollection());
+
+        var actionContext = new ActionContext(httpContext, routeData, new ActionDescriptor());
+        var filters = httpContext.RequestServices.GetServices<IAsyncViewActionFilter>();
+
+        foreach (var filter in filters)
+        {
+            await filter.OnActionExecutionAsync(actionContext);
         }
+
+        return actionContext;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Seo/Migrations.cs
index a9f4be20eb5..7c7d1d5159b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Seo/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Seo/Migrations.cs
@@ -6,48 +6,47 @@
 using OrchardCore.Recipes;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Seo
+namespace OrchardCore.Seo;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IRecipeMigrator _recipeMigrator;
+
+    public Migrations(IContentDefinitionManager contentDefinitionManager, IRecipeMigrator recipeMigrator)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+        _recipeMigrator = recipeMigrator;
+    }
+
+    public async Task<int> CreateAsync()
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IRecipeMigrator _recipeMigrator;
-
-        public Migrations(IContentDefinitionManager contentDefinitionManager, IRecipeMigrator recipeMigrator)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _recipeMigrator = recipeMigrator;
-        }
-
-        public async Task<int> CreateAsync()
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync("SeoMetaPart", builder => builder
-                .Attachable()
-                .WithDescription("Provides a part that allows SEO meta descriptions to be applied to a content item.")
-                .WithField("DefaultSocialImage", field => field
-                    .OfType("MediaField")
-                    .WithDisplayName("Default social image")
-                    .WithSettings(new MediaFieldSettings { Multiple = false }))
-                .WithField("OpenGraphImage", field => field
-                    .OfType("MediaField")
-                    .WithDisplayName("Open graph image")
-                    .WithSettings(new MediaFieldSettings { Multiple = false }))
-                .WithField("TwitterImage", field => field
-                    .OfType("MediaField")
-                    .WithDisplayName("Twitter image")
-                    .WithSettings(new MediaFieldSettings { Multiple = false }))
-            );
-
-            await _recipeMigrator.ExecuteAsync("socialmetasettings.recipe.json", this);
-
-            return 2;
-        }
-
-        public async Task<int> UpdateFrom1Async()
-        {
-            await _recipeMigrator.ExecuteAsync($"socialmetasettings{RecipesConstants.RecipeExtension}", this);
-
-            return 2;
-        }
+        await _contentDefinitionManager.AlterPartDefinitionAsync("SeoMetaPart", builder => builder
+            .Attachable()
+            .WithDescription("Provides a part that allows SEO meta descriptions to be applied to a content item.")
+            .WithField("DefaultSocialImage", field => field
+                .OfType("MediaField")
+                .WithDisplayName("Default social image")
+                .WithSettings(new MediaFieldSettings { Multiple = false }))
+            .WithField("OpenGraphImage", field => field
+                .OfType("MediaField")
+                .WithDisplayName("Open graph image")
+                .WithSettings(new MediaFieldSettings { Multiple = false }))
+            .WithField("TwitterImage", field => field
+                .OfType("MediaField")
+                .WithDisplayName("Twitter image")
+                .WithSettings(new MediaFieldSettings { Multiple = false }))
+        );
+
+        await _recipeMigrator.ExecuteAsync("socialmetasettings.recipe.json", this);
+
+        return 2;
+    }
+
+    public async Task<int> UpdateFrom1Async()
+    {
+        await _recipeMigrator.ExecuteAsync($"socialmetasettings{RecipesConstants.RecipeExtension}", this);
+
+        return 2;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/Models/SeoAspect.cs b/src/OrchardCore.Modules/OrchardCore.Seo/Models/SeoAspect.cs
index e6814f3ae15..369525c8761 100644
--- a/src/OrchardCore.Modules/OrchardCore.Seo/Models/SeoAspect.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Seo/Models/SeoAspect.cs
@@ -1,43 +1,42 @@
 using System.Globalization;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Seo.Models
+namespace OrchardCore.Seo.Models;
+
+public class SeoAspect
 {
-    public class SeoAspect
-    {
-        public string PageTitle { get; set; }
-        public bool Render { get; set; } = true;
-
-        public string MetaDescription { get; set; }
-
-        public string MetaKeywords { get; set; }
-        public string Canonical { get; set; }
-
-        public string MetaRobots { get; set; }
-        public MetaEntry[] CustomMetaTags { get; set; } = [];
-
-        // Twitter card
-        public string TwitterCard { get; set; }
-        public string TwitterSite { get; set; } // comes from settings.
-        public string TwitterCreator { get; set; }
-        public string TwitterTitle { get; set; } // comes from page title.
-        public string TwitterDescription { get; set; } // comes from MetaDescription
-        public string TwitterUrl { get; set; }
-
-        public string TwitterImage { get; set; }
-        public string TwitterImageAlt { get; set; }
-
-        // OpenGraph
-        public string OpenGraphType { get; set; }
-        public string OpenGraphTitle { get; set; } // comes from page title
-        public string OpenGraphSiteName { get; set; }
-        public string OpenGraphDescription { get; set; } // comes from MetaDescription
-        public string OpenGraphUrl { get; set; }
-        public string OpenGraphImage { get; set; }
-        public string OpenGraphImageAlt { get; set; }
-        public string OpenGraphLocale { get; set; } = CultureInfo.CurrentUICulture.Name;
-        public string OpenGraphAppId { get; set; }
-
-        public string GoogleSchema { get; set; }
-    }
+    public string PageTitle { get; set; }
+    public bool Render { get; set; } = true;
+
+    public string MetaDescription { get; set; }
+
+    public string MetaKeywords { get; set; }
+    public string Canonical { get; set; }
+
+    public string MetaRobots { get; set; }
+    public MetaEntry[] CustomMetaTags { get; set; } = [];
+
+    // Twitter card
+    public string TwitterCard { get; set; }
+    public string TwitterSite { get; set; } // comes from settings.
+    public string TwitterCreator { get; set; }
+    public string TwitterTitle { get; set; } // comes from page title.
+    public string TwitterDescription { get; set; } // comes from MetaDescription
+    public string TwitterUrl { get; set; }
+
+    public string TwitterImage { get; set; }
+    public string TwitterImageAlt { get; set; }
+
+    // OpenGraph
+    public string OpenGraphType { get; set; }
+    public string OpenGraphTitle { get; set; } // comes from page title
+    public string OpenGraphSiteName { get; set; }
+    public string OpenGraphDescription { get; set; } // comes from MetaDescription
+    public string OpenGraphUrl { get; set; }
+    public string OpenGraphImage { get; set; }
+    public string OpenGraphImageAlt { get; set; }
+    public string OpenGraphLocale { get; set; } = CultureInfo.CurrentUICulture.Name;
+    public string OpenGraphAppId { get; set; }
+
+    public string GoogleSchema { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/Models/SeoMetaPart.cs b/src/OrchardCore.Modules/OrchardCore.Seo/Models/SeoMetaPart.cs
index aea656f5afe..3b61110318a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Seo/Models/SeoMetaPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Seo/Models/SeoMetaPart.cs
@@ -3,41 +3,40 @@
 using OrchardCore.Media.Fields;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Seo.Models
+namespace OrchardCore.Seo.Models;
+
+public class SeoMetaPart : ContentPart
 {
-    public class SeoMetaPart : ContentPart
-    {
-        public static readonly char[] InvalidCharactersForCanoncial = "?#[]@!$&'()*+,;=<>\\|%".ToCharArray();
-        public string PageTitle { get; set; }
+    public static readonly char[] InvalidCharactersForCanoncial = "?#[]@!$&'()*+,;=<>\\|%".ToCharArray();
+    public string PageTitle { get; set; }
 
-        [DefaultValue(true)]
-        public bool Render { get; set; } = true;
+    [DefaultValue(true)]
+    public bool Render { get; set; } = true;
 
-        public string MetaDescription { get; set; }
+    public string MetaDescription { get; set; }
 
-        public string MetaKeywords { get; set; }
+    public string MetaKeywords { get; set; }
 
-        public string Canonical { get; set; }
+    public string Canonical { get; set; }
 
-        public string MetaRobots { get; set; }
-        public MetaEntry[] CustomMetaTags { get; set; } = [];
+    public string MetaRobots { get; set; }
+    public MetaEntry[] CustomMetaTags { get; set; } = [];
 
 
-        public MediaField DefaultSocialImage { get; set; }
+    public MediaField DefaultSocialImage { get; set; }
 
 
-        public MediaField OpenGraphImage { get; set; }
-        public string OpenGraphType { get; set; }
-        public string OpenGraphTitle { get; set; }
-        public string OpenGraphDescription { get; set; }
+    public MediaField OpenGraphImage { get; set; }
+    public string OpenGraphType { get; set; }
+    public string OpenGraphTitle { get; set; }
+    public string OpenGraphDescription { get; set; }
 
-        public MediaField TwitterImage { get; set; }
-        public string TwitterTitle { get; set; }
-        public string TwitterDescription { get; set; }
-        public string TwitterCard { get; set; }
-        public string TwitterCreator { get; set; }
-        public string TwitterSite { get; set; }
+    public MediaField TwitterImage { get; set; }
+    public string TwitterTitle { get; set; }
+    public string TwitterDescription { get; set; }
+    public string TwitterCard { get; set; }
+    public string TwitterCreator { get; set; }
+    public string TwitterSite { get; set; }
 
-        public string GoogleSchema { get; set; }
-    }
+    public string GoogleSchema { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/Models/SeoMetaPartSettings.cs b/src/OrchardCore.Modules/OrchardCore.Seo/Models/SeoMetaPartSettings.cs
index 6141a334e33..c7c90b72ce3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Seo/Models/SeoMetaPartSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Seo/Models/SeoMetaPartSettings.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.Seo.Models
+namespace OrchardCore.Seo.Models;
+
+public class SeoMetaPartSettings
 {
-    public class SeoMetaPartSettings
-    {
-        public bool DisplayKeywords { get; set; }
-        public bool DisplayCustomMetaTags { get; set; }
-        public bool DisplayOpenGraph { get; set; }
-        public bool DisplayTwitter { get; set; }
-        public bool DisplayGoogleSchema { get; set; }
-    }
+    public bool DisplayKeywords { get; set; }
+    public bool DisplayCustomMetaTags { get; set; }
+    public bool DisplayOpenGraph { get; set; }
+    public bool DisplayTwitter { get; set; }
+    public bool DisplayGoogleSchema { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/Settings/SeoMetaPartSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Seo/Settings/SeoMetaPartSettingsDisplayDriver.cs
index f4f41a1c30c..7e547e03633 100644
--- a/src/OrchardCore.Modules/OrchardCore.Seo/Settings/SeoMetaPartSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Seo/Settings/SeoMetaPartSettingsDisplayDriver.cs
@@ -6,45 +6,44 @@
 using OrchardCore.Seo.Models;
 using OrchardCore.Seo.ViewModels;
 
-namespace OrchardCore.SeoMeta.Settings
+namespace OrchardCore.SeoMeta.Settings;
+
+public sealed class SeoMetaPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<SeoMetaPart>
 {
-    public sealed class SeoMetaPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<SeoMetaPart>
+    public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+        return Initialize<SeoMetaPartSettingsViewModel>("SeoMetaPartSettings_Edit", model =>
         {
-            return Initialize<SeoMetaPartSettingsViewModel>("SeoMetaPartSettings_Edit", model =>
-            {
-                var settings = contentTypePartDefinition.GetSettings<SeoMetaPartSettings>();
+            var settings = contentTypePartDefinition.GetSettings<SeoMetaPartSettings>();
 
-                model.DisplayKeywords = settings.DisplayKeywords;
-                model.DisplayCustomMetaTags = settings.DisplayCustomMetaTags;
-                model.DisplayOpenGraph = settings.DisplayOpenGraph;
-                model.DisplayTwitter = settings.DisplayTwitter;
-                model.DisplayGoogleSchema = settings.DisplayGoogleSchema;
-            }).Location("Content");
-        }
+            model.DisplayKeywords = settings.DisplayKeywords;
+            model.DisplayCustomMetaTags = settings.DisplayCustomMetaTags;
+            model.DisplayOpenGraph = settings.DisplayOpenGraph;
+            model.DisplayTwitter = settings.DisplayTwitter;
+            model.DisplayGoogleSchema = settings.DisplayGoogleSchema;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
-        {
-            var model = new SeoMetaPartSettingsViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    {
+        var model = new SeoMetaPartSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix,
-                m => m.DisplayKeywords,
-                m => m.DisplayCustomMetaTags,
-                m => m.DisplayOpenGraph,
-                m => m.DisplayTwitter,
-                m => m.DisplayGoogleSchema);
+        await context.Updater.TryUpdateModelAsync(model, Prefix,
+            m => m.DisplayKeywords,
+            m => m.DisplayCustomMetaTags,
+            m => m.DisplayOpenGraph,
+            m => m.DisplayTwitter,
+            m => m.DisplayGoogleSchema);
 
-            context.Builder.WithSettings(new SeoMetaPartSettings
-            {
-                DisplayKeywords = model.DisplayKeywords,
-                DisplayCustomMetaTags = model.DisplayCustomMetaTags,
-                DisplayOpenGraph = model.DisplayOpenGraph,
-                DisplayTwitter = model.DisplayTwitter,
-                DisplayGoogleSchema = model.DisplayGoogleSchema
-            });
+        context.Builder.WithSettings(new SeoMetaPartSettings
+        {
+            DisplayKeywords = model.DisplayKeywords,
+            DisplayCustomMetaTags = model.DisplayCustomMetaTags,
+            DisplayOpenGraph = model.DisplayOpenGraph,
+            DisplayTwitter = model.DisplayTwitter,
+            DisplayGoogleSchema = model.DisplayGoogleSchema
+        });
 
-            return Edit(contentTypePartDefinition, context);
-        }
+        return Edit(contentTypePartDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Seo/Startup.cs
index 61af003681d..ddddee917fb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Seo/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Seo/Startup.cs
@@ -19,34 +19,33 @@
 using OrchardCore.SeoMeta.Settings;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Seo
+namespace OrchardCore.Seo;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDataMigration<Migrations>();
+        services.AddDataMigration<Migrations>();
 
-            services.AddContentPart<SeoMetaPart>()
-                .UseDisplayDriver<SeoMetaPartDisplayDriver>()
-                .AddHandler<SeoMetaPartHandler>();
+        services.AddContentPart<SeoMetaPart>()
+            .UseDisplayDriver<SeoMetaPartDisplayDriver>()
+            .AddHandler<SeoMetaPartHandler>();
 
-            services.AddScoped<IContentDisplayDriver, SeoContentDriver>();
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, SeoMetaPartSettingsDisplayDriver>();
+        services.AddScoped<IContentDisplayDriver, SeoContentDriver>();
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, SeoMetaPartSettingsDisplayDriver>();
 
-            // This must be last, and the module dependent on Contents so this runs after the part handlers.
-            services.AddScoped<IContentHandler, SeoMetaSettingsHandler>();
-            services.AddScoped<IContentItemIndexHandler, SeoMetaPartContentIndexHandler>();
+        // This must be last, and the module dependent on Contents so this runs after the part handlers.
+        services.AddScoped<IContentHandler, SeoMetaSettingsHandler>();
+        services.AddScoped<IContentItemIndexHandler, SeoMetaPartContentIndexHandler>();
 
-            services.AddScoped<IPermissionProvider, SeoPermissionProvider>();
-            services.AddScoped<IDisplayDriver<ISite>, RobotsSettingsDisplayDriver>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddTransient<IRobotsProvider, SiteSettingsRobotsProvider>();
-        }
+        services.AddScoped<IPermissionProvider, SeoPermissionProvider>();
+        services.AddScoped<IDisplayDriver<ISite>, RobotsSettingsDisplayDriver>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddTransient<IRobotsProvider, SiteSettingsRobotsProvider>();
+    }
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            app.UseMiddleware<RobotsMiddleware>();
-        }
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        app.UseMiddleware<RobotsMiddleware>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartGoogleSchemaViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartGoogleSchemaViewModel.cs
index dc58d6f93be..607e3495389 100644
--- a/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartGoogleSchemaViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartGoogleSchemaViewModel.cs
@@ -1,13 +1,12 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Seo.Models;
 
-namespace OrchardCore.Seo.ViewModels
+namespace OrchardCore.Seo.ViewModels;
+
+public class SeoMetaPartGoogleSchemaViewModel
 {
-    public class SeoMetaPartGoogleSchemaViewModel
-    {
-        public string GoogleSchema { get; set; }
+    public string GoogleSchema { get; set; }
 
-        [BindNever]
-        public SeoMetaPart SeoMetaPart { get; set; }
-    }
+    [BindNever]
+    public SeoMetaPart SeoMetaPart { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartOpenGraphViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartOpenGraphViewModel.cs
index 57b5c672853..0d463c3da49 100644
--- a/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartOpenGraphViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartOpenGraphViewModel.cs
@@ -1,15 +1,14 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Seo.Models;
 
-namespace OrchardCore.Seo.ViewModels
+namespace OrchardCore.Seo.ViewModels;
+
+public class SeoMetaPartOpenGraphViewModel
 {
-    public class SeoMetaPartOpenGraphViewModel
-    {
-        public string OpenGraphType { get; set; }
-        public string OpenGraphTitle { get; set; }
-        public string OpenGraphDescription { get; set; }
+    public string OpenGraphType { get; set; }
+    public string OpenGraphTitle { get; set; }
+    public string OpenGraphDescription { get; set; }
 
-        [BindNever]
-        public SeoMetaPart SeoMetaPart { get; set; }
-    }
+    [BindNever]
+    public SeoMetaPart SeoMetaPart { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartSettingsViewModel.cs
index e3600ea22dc..0c116d3f25d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartSettingsViewModel.cs
@@ -1,14 +1,13 @@
 using OrchardCore.Seo.Models;
 
-namespace OrchardCore.Seo.ViewModels
+namespace OrchardCore.Seo.ViewModels;
+
+public class SeoMetaPartSettingsViewModel
 {
-    public class SeoMetaPartSettingsViewModel
-    {
-        public bool DisplayKeywords { get; set; }
-        public bool DisplayCustomMetaTags { get; set; }
-        public bool DisplayOpenGraph { get; set; }
-        public bool DisplayTwitter { get; set; }
-        public bool DisplayGoogleSchema { get; set; }
-        public SeoMetaPartSettings SeoMetaPartSettings { get; set; }
-    }
+    public bool DisplayKeywords { get; set; }
+    public bool DisplayCustomMetaTags { get; set; }
+    public bool DisplayOpenGraph { get; set; }
+    public bool DisplayTwitter { get; set; }
+    public bool DisplayGoogleSchema { get; set; }
+    public SeoMetaPartSettings SeoMetaPartSettings { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartTwitterViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartTwitterViewModel.cs
index a3682c30117..48f56e12940 100644
--- a/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartTwitterViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartTwitterViewModel.cs
@@ -1,17 +1,16 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Seo.Models;
 
-namespace OrchardCore.Seo.ViewModels
+namespace OrchardCore.Seo.ViewModels;
+
+public class SeoMetaPartTwitterViewModel
 {
-    public class SeoMetaPartTwitterViewModel
-    {
-        public string TwitterTitle { get; set; }
-        public string TwitterDescription { get; set; }
-        public string TwitterCard { get; set; }
-        public string TwitterCreator { get; set; }
-        public string TwitterSite { get; set; }
+    public string TwitterTitle { get; set; }
+    public string TwitterDescription { get; set; }
+    public string TwitterCard { get; set; }
+    public string TwitterCreator { get; set; }
+    public string TwitterSite { get; set; }
 
-        [BindNever]
-        public SeoMetaPart SeoMetaPart { get; set; }
-    }
+    [BindNever]
+    public SeoMetaPart SeoMetaPart { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartViewModel.cs
index 9ff96f49b89..b54e40c9e9b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Seo/ViewModels/SeoMetaPartViewModel.cs
@@ -1,24 +1,23 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Seo.Models;
 
-namespace OrchardCore.Seo.ViewModels
+namespace OrchardCore.Seo.ViewModels;
+
+public class SeoMetaPartViewModel
 {
-    public class SeoMetaPartViewModel
-    {
-        public string PageTitle { get; set; }
-        public bool Render { get; set; }
+    public string PageTitle { get; set; }
+    public bool Render { get; set; }
 
-        public string MetaDescription { get; set; }
-        public string Canonical { get; set; }
+    public string MetaDescription { get; set; }
+    public string Canonical { get; set; }
 
-        public string MetaKeywords { get; set; }
-        public string MetaRobots { get; set; }
-        public string CustomMetaTags { get; set; }
+    public string MetaKeywords { get; set; }
+    public string MetaRobots { get; set; }
+    public string CustomMetaTags { get; set; }
 
-        [BindNever]
-        public SeoMetaPart SeoMetaPart { get; set; }
+    [BindNever]
+    public SeoMetaPart SeoMetaPart { get; set; }
 
-        [BindNever]
-        public SeoMetaPartSettings Settings { get; set; }
-    }
+    [BindNever]
+    public SeoMetaPartSettings Settings { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs
index 8c881ec1528..5ad263942f3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs
@@ -4,46 +4,45 @@
 using OrchardCore.Navigation;
 using OrchardCore.Settings.Drivers;
 
-namespace OrchardCore.Settings
+namespace OrchardCore.Settings;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", DefaultSiteSettingsDisplayDriver.GroupId },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", DefaultSiteSettingsDisplayDriver.GroupId },
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
-        {
-            S = localizer;
-        }
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
-                    .AddClass("menu-configuration")
-                    .Id("configuration")
-                    .Add(S["Settings"], "1", settings => settings
-                        .Add(S["General"], "1", entry => entry
-                            .AddClass("general")
-                            .Id("general")
-                            .Action("Index", "Admin", _routeValues)
-                            .Permission(Permissions.ManageGroupSettings)
-                            .LocalNav()
-                        ),
-                    priority: 1)
-                );
-
             return Task.CompletedTask;
         }
+
+        builder
+            .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration
+                .AddClass("menu-configuration")
+                .Id("configuration")
+                .Add(S["Settings"], "1", settings => settings
+                    .Add(S["General"], "1", entry => entry
+                        .AddClass("general")
+                        .Id("general")
+                        .Action("Index", "Admin", _routeValues)
+                        .Permission(Permissions.ManageGroupSettings)
+                        .LocalNav()
+                    ),
+                priority: 1)
+            );
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Settings/Controllers/AdminController.cs
index 3b8f5eb850b..14fc4ffbf9c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Controllers/AdminController.cs
@@ -12,101 +12,100 @@
 using OrchardCore.Localization;
 using OrchardCore.Settings.ViewModels;
 
-namespace OrchardCore.Settings.Controllers
+namespace OrchardCore.Settings.Controllers;
+
+public class AdminController : Controller
 {
-    public class AdminController : Controller
+    private readonly IDisplayManager<ISite> _siteSettingsDisplayManager;
+    private readonly IShellReleaseManager _shellReleaseManager;
+    private readonly ISiteService _siteService;
+    private readonly INotifier _notifier;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly CultureOptions _cultureOptions;
+
+    protected readonly IHtmlLocalizer H;
+
+    public AdminController(
+        IShellReleaseManager shellReleaseManager,
+        ISiteService siteService,
+        IDisplayManager<ISite> siteSettingsDisplayManager,
+        IAuthorizationService authorizationService,
+        INotifier notifier,
+        IOptions<CultureOptions> cultureOptions,
+        IUpdateModelAccessor updateModelAccessor,
+        IHtmlLocalizer<AdminController> htmlLocalizer)
     {
-        private readonly IDisplayManager<ISite> _siteSettingsDisplayManager;
-        private readonly IShellReleaseManager _shellReleaseManager;
-        private readonly ISiteService _siteService;
-        private readonly INotifier _notifier;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly CultureOptions _cultureOptions;
-
-        protected readonly IHtmlLocalizer H;
-
-        public AdminController(
-            IShellReleaseManager shellReleaseManager,
-            ISiteService siteService,
-            IDisplayManager<ISite> siteSettingsDisplayManager,
-            IAuthorizationService authorizationService,
-            INotifier notifier,
-            IOptions<CultureOptions> cultureOptions,
-            IUpdateModelAccessor updateModelAccessor,
-            IHtmlLocalizer<AdminController> htmlLocalizer)
+        _siteSettingsDisplayManager = siteSettingsDisplayManager;
+        _shellReleaseManager = shellReleaseManager;
+        _siteService = siteService;
+        _notifier = notifier;
+        _authorizationService = authorizationService;
+        _updateModelAccessor = updateModelAccessor;
+        _cultureOptions = cultureOptions.Value;
+        H = htmlLocalizer;
+    }
+
+    [Admin("Settings/{groupId}", "AdminSettings")]
+    public async Task<IActionResult> Index(string groupId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageGroupSettings, (object)groupId))
         {
-            _siteSettingsDisplayManager = siteSettingsDisplayManager;
-            _shellReleaseManager = shellReleaseManager;
-            _siteService = siteService;
-            _notifier = notifier;
-            _authorizationService = authorizationService;
-            _updateModelAccessor = updateModelAccessor;
-            _cultureOptions = cultureOptions.Value;
-            H = htmlLocalizer;
+            return Forbid();
         }
 
-        [Admin("Settings/{groupId}", "AdminSettings")]
-        public async Task<IActionResult> Index(string groupId)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageGroupSettings, (object)groupId))
-            {
-                return Forbid();
-            }
+        var site = await _siteService.GetSiteSettingsAsync();
 
-            var site = await _siteService.GetSiteSettingsAsync();
+        var viewModel = new AdminIndexViewModel
+        {
+            GroupId = groupId,
+            Shape = await _siteSettingsDisplayManager.BuildEditorAsync(site, _updateModelAccessor.ModelUpdater, false, groupId, string.Empty)
+        };
 
-            var viewModel = new AdminIndexViewModel
-            {
-                GroupId = groupId,
-                Shape = await _siteSettingsDisplayManager.BuildEditorAsync(site, _updateModelAccessor.ModelUpdater, false, groupId, string.Empty)
-            };
+        return View(viewModel);
+    }
 
-            return View(viewModel);
+    [HttpPost]
+    [ActionName(nameof(Index))]
+    public async Task<IActionResult> IndexPost(string groupId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageGroupSettings, (object)groupId))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        [ActionName(nameof(Index))]
-        public async Task<IActionResult> IndexPost(string groupId)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageGroupSettings, (object)groupId))
-            {
-                return Forbid();
-            }
+        var site = await _siteService.LoadSiteSettingsAsync();
 
-            var site = await _siteService.LoadSiteSettingsAsync();
+        var viewModel = new AdminIndexViewModel
+        {
+            GroupId = groupId,
+            Shape = await _siteSettingsDisplayManager.UpdateEditorAsync(site, _updateModelAccessor.ModelUpdater, false, groupId, string.Empty)
+        };
 
-            var viewModel = new AdminIndexViewModel
-            {
-                GroupId = groupId,
-                Shape = await _siteSettingsDisplayManager.UpdateEditorAsync(site, _updateModelAccessor.ModelUpdater, false, groupId, string.Empty)
-            };
+        if (ModelState.IsValid)
+        {
+            await _siteService.UpdateSiteSettingsAsync(site);
 
-            if (ModelState.IsValid)
+            string culture = null;
+            if (site.Properties.TryGetPropertyValue("LocalizationSettings", out var settings))
             {
-                await _siteService.UpdateSiteSettingsAsync(site);
-
-                string culture = null;
-                if (site.Properties.TryGetPropertyValue("LocalizationSettings", out var settings))
-                {
-                    culture = settings.Value<string>("DefaultCulture");
-                }
-
-                // We create a transient scope with the newly selected culture to create a notification that will use it instead of the previous culture
-                using (culture != null ? CultureScope.Create(culture, ignoreSystemSettings: _cultureOptions.IgnoreSystemSettings) : null)
-                {
-                    await _notifier.SuccessAsync(H["Site settings updated successfully."]);
-                }
-
-                return RedirectToAction(nameof(Index), new { groupId });
+                culture = settings.Value<string>("DefaultCulture");
             }
-            else
+
+            // We create a transient scope with the newly selected culture to create a notification that will use it instead of the previous culture
+            using (culture != null ? CultureScope.Create(culture, ignoreSystemSettings: _cultureOptions.IgnoreSystemSettings) : null)
             {
-                // If the model state is invalid, suspend the request to release the shell so that the tenant is not reloaded.
-                _shellReleaseManager.SuspendReleaseRequest();
+                await _notifier.SuccessAsync(H["Site settings updated successfully."]);
             }
 
-            return View(viewModel);
+            return RedirectToAction(nameof(Index), new { groupId });
         }
+        else
+        {
+            // If the model state is invalid, suspend the request to release the shell so that the tenant is not reloaded.
+            _shellReleaseManager.SuspendReleaseRequest();
+        }
+
+        return View(viewModel);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Deployment/SiteSettingsDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Settings/Deployment/SiteSettingsDeploymentSource.cs
index 3a163c5705d..1035a9f9e56 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Deployment/SiteSettingsDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Deployment/SiteSettingsDeploymentSource.cs
@@ -3,104 +3,103 @@
 using System.Threading.Tasks;
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Settings.Deployment
+namespace OrchardCore.Settings.Deployment;
+
+public class SiteSettingsDeploymentSource : IDeploymentSource
 {
-    public class SiteSettingsDeploymentSource : IDeploymentSource
+    private readonly ISiteService _siteService;
+
+    public SiteSettingsDeploymentSource(ISiteService siteService)
     {
-        private readonly ISiteService _siteService;
+        _siteService = siteService;
+    }
 
-        public SiteSettingsDeploymentSource(ISiteService siteService)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        if (step is not SiteSettingsDeploymentStep settingsStep)
         {
-            _siteService = siteService;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        var site = await _siteService.GetSiteSettingsAsync();
+
+        var data = new JsonObject { ["name"] = "Settings" };
+
+        foreach (var settingName in settingsStep.Settings)
         {
-            if (step is not SiteSettingsDeploymentStep settingsStep)
+            switch (settingName)
             {
-                return;
-            }
+                case "BaseUrl":
+                    data.Add(nameof(ISite.BaseUrl), site.BaseUrl);
+                    break;
 
-            var site = await _siteService.GetSiteSettingsAsync();
+                case "Calendar":
+                    data.Add(nameof(ISite.Calendar), site.Calendar);
+                    break;
 
-            var data = new JsonObject { ["name"] = "Settings" };
+                case "MaxPagedCount":
+                    data.Add(nameof(ISite.MaxPagedCount), site.MaxPagedCount);
+                    break;
 
-            foreach (var settingName in settingsStep.Settings)
-            {
-                switch (settingName)
-                {
-                    case "BaseUrl":
-                        data.Add(nameof(ISite.BaseUrl), site.BaseUrl);
-                        break;
-
-                    case "Calendar":
-                        data.Add(nameof(ISite.Calendar), site.Calendar);
-                        break;
-
-                    case "MaxPagedCount":
-                        data.Add(nameof(ISite.MaxPagedCount), site.MaxPagedCount);
-                        break;
-
-                    case "MaxPageSize":
-                        data.Add(nameof(ISite.MaxPageSize), site.MaxPageSize);
-                        break;
-
-                    case "PageSize":
-                        data.Add(nameof(ISite.PageSize), site.PageSize);
-                        break;
-
-                    case "ResourceDebugMode":
-                        data.Add(nameof(ISite.ResourceDebugMode), JsonValue.Create(site.ResourceDebugMode));
-                        break;
-
-                    case "SiteName":
-                        data.Add(nameof(ISite.SiteName), site.SiteName);
-                        break;
-
-                    case "PageTitleFormat":
-                        data.Add(nameof(ISite.PageTitleFormat), site.PageTitleFormat);
-                        break;
-
-                    case "SiteSalt":
-                        data.Add(nameof(ISite.SiteSalt), site.SiteSalt);
-                        break;
-
-                    case "SuperUser":
-                        data.Add(nameof(ISite.SuperUser), site.SuperUser);
-                        break;
-
-                    case "TimeZoneId":
-                        data.Add(nameof(ISite.TimeZoneId), site.TimeZoneId);
-                        break;
-
-                    case "UseCdn":
-                        data.Add(nameof(ISite.UseCdn), site.UseCdn);
-                        break;
-
-                    case "CdnBaseUrl":
-                        data.Add(nameof(ISite.CdnBaseUrl), site.CdnBaseUrl);
-                        break;
-
-                    case "AppendVersion":
-                        data.Add(nameof(ISite.AppendVersion), site.AppendVersion);
-                        break;
-
-                    case "HomeRoute":
-                        data.Add(nameof(ISite.HomeRoute), JObject.FromObject(site.HomeRoute));
-                        break;
-
-                    case "CacheMode":
-                        data.Add(nameof(ISite.CacheMode), JsonValue.Create(site.CacheMode));
-                        break;
-
-                    default:
-                        throw new InvalidOperationException($"Unsupported setting '{settingName}'");
-                }
-            }
+                case "MaxPageSize":
+                    data.Add(nameof(ISite.MaxPageSize), site.MaxPageSize);
+                    break;
 
-            result.Steps.Add(data);
+                case "PageSize":
+                    data.Add(nameof(ISite.PageSize), site.PageSize);
+                    break;
 
-            return;
+                case "ResourceDebugMode":
+                    data.Add(nameof(ISite.ResourceDebugMode), JsonValue.Create(site.ResourceDebugMode));
+                    break;
+
+                case "SiteName":
+                    data.Add(nameof(ISite.SiteName), site.SiteName);
+                    break;
+
+                case "PageTitleFormat":
+                    data.Add(nameof(ISite.PageTitleFormat), site.PageTitleFormat);
+                    break;
+
+                case "SiteSalt":
+                    data.Add(nameof(ISite.SiteSalt), site.SiteSalt);
+                    break;
+
+                case "SuperUser":
+                    data.Add(nameof(ISite.SuperUser), site.SuperUser);
+                    break;
+
+                case "TimeZoneId":
+                    data.Add(nameof(ISite.TimeZoneId), site.TimeZoneId);
+                    break;
+
+                case "UseCdn":
+                    data.Add(nameof(ISite.UseCdn), site.UseCdn);
+                    break;
+
+                case "CdnBaseUrl":
+                    data.Add(nameof(ISite.CdnBaseUrl), site.CdnBaseUrl);
+                    break;
+
+                case "AppendVersion":
+                    data.Add(nameof(ISite.AppendVersion), site.AppendVersion);
+                    break;
+
+                case "HomeRoute":
+                    data.Add(nameof(ISite.HomeRoute), JObject.FromObject(site.HomeRoute));
+                    break;
+
+                case "CacheMode":
+                    data.Add(nameof(ISite.CacheMode), JsonValue.Create(site.CacheMode));
+                    break;
+
+                default:
+                    throw new InvalidOperationException($"Unsupported setting '{settingName}'");
+            }
         }
+
+        result.Steps.Add(data);
+
+        return;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Deployment/SiteSettingsDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Settings/Deployment/SiteSettingsDeploymentStep.cs
index 79e2a23940e..a307a5cf315 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Deployment/SiteSettingsDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Deployment/SiteSettingsDeploymentStep.cs
@@ -1,17 +1,16 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Settings.Deployment
+namespace OrchardCore.Settings.Deployment;
+
+/// <summary>
+/// Adds the current site settings to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class SiteSettingsDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds the current site settings to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class SiteSettingsDeploymentStep : DeploymentStep
+    public SiteSettingsDeploymentStep()
     {
-        public SiteSettingsDeploymentStep()
-        {
-            Name = nameof(SiteSettings);
-        }
-
-        public string[] Settings { get; set; }
+        Name = nameof(SiteSettings);
     }
+
+    public string[] Settings { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Deployment/SiteSettingsDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Settings/Deployment/SiteSettingsDeploymentStepDriver.cs
index 6371565103a..6cf58183ea6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Deployment/SiteSettingsDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Deployment/SiteSettingsDeploymentStepDriver.cs
@@ -4,35 +4,34 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Settings.ViewModels;
 
-namespace OrchardCore.Settings.Deployment
+namespace OrchardCore.Settings.Deployment;
+
+public sealed class SiteSettingsDeploymentStepDriver : DisplayDriver<DeploymentStep, SiteSettingsDeploymentStep>
 {
-    public sealed class SiteSettingsDeploymentStepDriver : DisplayDriver<DeploymentStep, SiteSettingsDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(SiteSettingsDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(SiteSettingsDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("SiteSettingsDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("SiteSettingsDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("SiteSettingsDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("SiteSettingsDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(SiteSettingsDeploymentStep step, BuildEditorContext context)
+    public override IDisplayResult Edit(SiteSettingsDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<SiteSettingsDeploymentStepViewModel>("SiteSettingsDeploymentStep_Fields_Edit", model =>
         {
-            return Initialize<SiteSettingsDeploymentStepViewModel>("SiteSettingsDeploymentStep_Fields_Edit", model =>
-            {
-                model.Settings = step.Settings;
-            }).Location("Content");
-        }
+            model.Settings = step.Settings;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(SiteSettingsDeploymentStep step, UpdateEditorContext context)
-        {
-            // Initializes the value to empty otherwise the model is not updated if no type is selected.
-            step.Settings = [];
+    public override async Task<IDisplayResult> UpdateAsync(SiteSettingsDeploymentStep step, UpdateEditorContext context)
+    {
+        // Initializes the value to empty otherwise the model is not updated if no type is selected.
+        step.Settings = [];
 
-            await context.Updater.TryUpdateModelAsync(step, Prefix, x => x.Settings);
+        await context.Updater.TryUpdateModelAsync(step, Prefix, x => x.Settings);
 
-            return Edit(step, context);
-        }
+        return Edit(step, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Drivers/ButtonsSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Settings/Drivers/ButtonsSettingsDisplayDriver.cs
index e093af251ee..7e3462aca88 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Drivers/ButtonsSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Drivers/ButtonsSettingsDisplayDriver.cs
@@ -2,17 +2,16 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Settings.Drivers
+namespace OrchardCore.Settings.Drivers;
+
+public sealed class ButtonsSettingsDisplayDriver : DisplayDriver<ISite>
 {
-    public sealed class ButtonsSettingsDisplayDriver : DisplayDriver<ISite>
-    {
-        public const string GroupId = "general";
+    public const string GroupId = "general";
 
-        public override IDisplayResult Edit(ISite site, BuildEditorContext context)
-        {
-            return Dynamic("SiteSettings_SaveButton")
-                .Location("Actions")
-                .OnGroup(context.GroupId); // Trick to render the shape for all groups
-        }
+    public override IDisplayResult Edit(ISite site, BuildEditorContext context)
+    {
+        return Dynamic("SiteSettings_SaveButton")
+            .Location("Actions")
+            .OnGroup(context.GroupId); // Trick to render the shape for all groups
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Drivers/DefaultSiteSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Settings/Drivers/DefaultSiteSettingsDisplayDriver.cs
index 4f8f4c0c2d7..bbb262b9c00 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Drivers/DefaultSiteSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Drivers/DefaultSiteSettingsDisplayDriver.cs
@@ -7,105 +7,104 @@
 using OrchardCore.Mvc.ModelBinding;
 using OrchardCore.Settings.ViewModels;
 
-namespace OrchardCore.Settings.Drivers
+namespace OrchardCore.Settings.Drivers;
+
+public sealed class DefaultSiteSettingsDisplayDriver : DisplayDriver<ISite>
 {
-    public sealed class DefaultSiteSettingsDisplayDriver : DisplayDriver<ISite>
+    public const string GroupId = "general";
+
+    private readonly IShellReleaseManager _shellReleaseManager;
+
+    internal readonly IStringLocalizer S;
+
+    public DefaultSiteSettingsDisplayDriver(
+        IShellReleaseManager shellReleaseManager,
+        IStringLocalizer<DefaultSiteSettingsDisplayDriver> stringLocalizer)
     {
-        public const string GroupId = "general";
+        _shellReleaseManager = shellReleaseManager;
+        S = stringLocalizer;
+    }
 
-        private readonly IShellReleaseManager _shellReleaseManager;
+    public override IDisplayResult Edit(ISite site, BuildEditorContext context)
+    {
+        if (!IsGeneralGroup(context))
+        {
+            return null;
+        }
 
-        internal readonly IStringLocalizer S;
+        context.AddTenantReloadWarningWrapper();
+
+        var result = Combine(
+            Initialize<SiteSettingsViewModel>("Settings_Edit__Site", model => PopulateProperties(site, model))
+                .Location("Content:1#Site;10")
+                .OnGroup(GroupId),
+            Initialize<SiteSettingsViewModel>("Settings_Edit__Resources", model => PopulateProperties(site, model))
+                .Location("Content:1#Resources;20")
+                .OnGroup(GroupId),
+            Initialize<SiteSettingsViewModel>("Settings_Edit__Cache", model => PopulateProperties(site, model))
+                .Location("Content:1#Cache;30")
+                .OnGroup(GroupId)
+        );
+
+        return result;
+    }
 
-        public DefaultSiteSettingsDisplayDriver(
-            IShellReleaseManager shellReleaseManager,
-            IStringLocalizer<DefaultSiteSettingsDisplayDriver> stringLocalizer)
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, UpdateEditorContext context)
+    {
+        if (!IsGeneralGroup(context))
         {
-            _shellReleaseManager = shellReleaseManager;
-            S = stringLocalizer;
+            return null;
         }
 
-        public override IDisplayResult Edit(ISite site, BuildEditorContext context)
+        var model = new SiteSettingsViewModel();
+
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
+
+        site.SiteName = model.SiteName;
+        site.PageTitleFormat = model.PageTitleFormat;
+        site.BaseUrl = model.BaseUrl;
+        site.TimeZoneId = model.TimeZone;
+        site.PageSize = model.PageSize.Value;
+        site.UseCdn = model.UseCdn;
+        site.CdnBaseUrl = model.CdnBaseUrl;
+        site.ResourceDebugMode = model.ResourceDebugMode;
+        site.AppendVersion = model.AppendVersion;
+        site.CacheMode = model.CacheMode;
+
+        if (model.PageSize.Value < 1)
         {
-            if (!IsGeneralGroup(context))
-            {
-                return null;
-            }
-
-            context.AddTenantReloadWarningWrapper();
-
-            var result = Combine(
-                Initialize<SiteSettingsViewModel>("Settings_Edit__Site", model => PopulateProperties(site, model))
-                    .Location("Content:1#Site;10")
-                    .OnGroup(GroupId),
-                Initialize<SiteSettingsViewModel>("Settings_Edit__Resources", model => PopulateProperties(site, model))
-                    .Location("Content:1#Resources;20")
-                    .OnGroup(GroupId),
-                Initialize<SiteSettingsViewModel>("Settings_Edit__Cache", model => PopulateProperties(site, model))
-                    .Location("Content:1#Cache;30")
-                    .OnGroup(GroupId)
-            );
-
-            return result;
+            context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, UpdateEditorContext context)
+        if (site.MaxPageSize > 0 && model.PageSize.Value > site.MaxPageSize)
         {
-            if (!IsGeneralGroup(context))
-            {
-                return null;
-            }
-
-            var model = new SiteSettingsViewModel();
-
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
-
-            site.SiteName = model.SiteName;
-            site.PageTitleFormat = model.PageTitleFormat;
-            site.BaseUrl = model.BaseUrl;
-            site.TimeZoneId = model.TimeZone;
-            site.PageSize = model.PageSize.Value;
-            site.UseCdn = model.UseCdn;
-            site.CdnBaseUrl = model.CdnBaseUrl;
-            site.ResourceDebugMode = model.ResourceDebugMode;
-            site.AppendVersion = model.AppendVersion;
-            site.CacheMode = model.CacheMode;
-
-            if (model.PageSize.Value < 1)
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be greater than zero."]);
-            }
-
-            if (site.MaxPageSize > 0 && model.PageSize.Value > site.MaxPageSize)
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
-            }
-
-            if (!string.IsNullOrEmpty(site.BaseUrl) && !Uri.TryCreate(site.BaseUrl, UriKind.Absolute, out _))
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
-            }
-
-            _shellReleaseManager.RequestRelease();
-
-            return await EditAsync(site, context);
+            context.Updater.ModelState.AddModelError(Prefix, nameof(model.PageSize), S["The page size must be less than or equal to {0}.", site.MaxPageSize]);
         }
 
-        private static void PopulateProperties(ISite site, SiteSettingsViewModel model)
+        if (!string.IsNullOrEmpty(site.BaseUrl) && !Uri.TryCreate(site.BaseUrl, UriKind.Absolute, out _))
         {
-            model.SiteName = site.SiteName;
-            model.PageTitleFormat = site.PageTitleFormat;
-            model.BaseUrl = site.BaseUrl;
-            model.TimeZone = site.TimeZoneId;
-            model.PageSize = site.PageSize;
-            model.UseCdn = site.UseCdn;
-            model.CdnBaseUrl = site.CdnBaseUrl;
-            model.ResourceDebugMode = site.ResourceDebugMode;
-            model.AppendVersion = site.AppendVersion;
-            model.CacheMode = site.CacheMode;
+            context.Updater.ModelState.AddModelError(Prefix, nameof(model.BaseUrl), S["The Base url must be a fully qualified URL."]);
         }
 
-        private static bool IsGeneralGroup(BuildEditorContext context)
-            => context.GroupId.Equals(GroupId, StringComparison.OrdinalIgnoreCase);
+        _shellReleaseManager.RequestRelease();
+
+        return await EditAsync(site, context);
     }
+
+    private static void PopulateProperties(ISite site, SiteSettingsViewModel model)
+    {
+        model.SiteName = site.SiteName;
+        model.PageTitleFormat = site.PageTitleFormat;
+        model.BaseUrl = site.BaseUrl;
+        model.TimeZone = site.TimeZoneId;
+        model.PageSize = site.PageSize;
+        model.UseCdn = site.UseCdn;
+        model.CdnBaseUrl = site.CdnBaseUrl;
+        model.ResourceDebugMode = site.ResourceDebugMode;
+        model.AppendVersion = site.AppendVersion;
+        model.CacheMode = site.CacheMode;
+    }
+
+    private static bool IsGeneralGroup(BuildEditorContext context)
+        => context.GroupId.Equals(GroupId, StringComparison.OrdinalIgnoreCase);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Liquid/LiquidSiteSettingsAccessor.cs b/src/OrchardCore.Modules/OrchardCore.Settings/Liquid/LiquidSiteSettingsAccessor.cs
index f6b16d41f36..7cb357c62fa 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Liquid/LiquidSiteSettingsAccessor.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Liquid/LiquidSiteSettingsAccessor.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Liquid
+namespace OrchardCore.Liquid;
+
+/// <summary>
+/// This is a placeholder class that allows modules to extend the `Site` property in the current Liquid scope.
+/// </summary>
+public class LiquidSiteSettingsAccessor
 {
-    /// <summary>
-    /// This is a placeholder class that allows modules to extend the `Site` property in the current Liquid scope.
-    /// </summary>
-    public class LiquidSiteSettingsAccessor
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Recipes/SettingsStep.cs b/src/OrchardCore.Modules/OrchardCore.Settings/Recipes/SettingsStep.cs
index 94c8240f571..3ce17d82af5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Recipes/SettingsStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Recipes/SettingsStep.cs
@@ -5,105 +5,104 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Settings.Recipes
+namespace OrchardCore.Settings.Recipes;
+
+/// <summary>
+/// This recipe step updates the site settings.
+/// </summary>
+public sealed class SettingsStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step updates the site settings.
-    /// </summary>
-    public sealed class SettingsStep : IRecipeStepHandler
+    private readonly ISiteService _siteService;
+
+    public SettingsStep(ISiteService siteService)
     {
-        private readonly ISiteService _siteService;
+        _siteService = siteService;
+    }
 
-        public SettingsStep(ISiteService siteService)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "Settings", StringComparison.OrdinalIgnoreCase))
         {
-            _siteService = siteService;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        var model = context.Step;
+        var site = await _siteService.LoadSiteSettingsAsync();
+
+        foreach (var property in model)
         {
-            if (!string.Equals(context.Name, "Settings", StringComparison.OrdinalIgnoreCase))
+            switch (property.Key)
             {
-                return;
-            }
+                case "BaseUrl":
+                    site.BaseUrl = property.Value.ToString();
+                    break;
 
-            var model = context.Step;
-            var site = await _siteService.LoadSiteSettingsAsync();
+                case "Calendar":
+                    site.Calendar = property.Value.ToString();
+                    break;
 
-            foreach (var property in model)
-            {
-                switch (property.Key)
-                {
-                    case "BaseUrl":
-                        site.BaseUrl = property.Value.ToString();
-                        break;
-
-                    case "Calendar":
-                        site.Calendar = property.Value.ToString();
-                        break;
-
-                    case "MaxPagedCount":
-                        site.MaxPagedCount = property.Value.Value<int>();
-                        break;
-
-                    case "MaxPageSize":
-                        site.MaxPageSize = property.Value.Value<int>();
-                        break;
-
-                    case "PageSize":
-                        site.PageSize = property.Value.Value<int>();
-                        break;
-
-                    case "ResourceDebugMode":
-                        site.ResourceDebugMode = (ResourceDebugMode)property.Value.Value<int>();
-                        break;
-
-                    case "SiteName":
-                        site.SiteName = property.Value.ToString();
-                        break;
-
-                    case "PageTitleFormat":
-                        site.PageTitleFormat = property.Value.ToString();
-                        break;
-
-                    case "SiteSalt":
-                        site.SiteSalt = property.Value.ToString();
-                        break;
-
-                    case "SuperUser":
-                        site.SuperUser = property.Value.ToString();
-                        break;
-
-                    case "TimeZoneId":
-                        site.TimeZoneId = property.Value.ToString();
-                        break;
-
-                    case "UseCdn":
-                        site.UseCdn = property.Value.Value<bool>();
-                        break;
-
-                    case "CdnBaseUrl":
-                        site.CdnBaseUrl = property.Value.ToString();
-                        break;
-
-                    case "AppendVersion":
-                        site.AppendVersion = property.Value.Value<bool>();
-                        break;
-
-                    case "HomeRoute":
-                        site.HomeRoute = property.Value.ToObject<RouteValueDictionary>();
-                        break;
-
-                    case "CacheMode":
-                        site.CacheMode = (CacheMode)property.Value.Value<int>();
-                        break;
-
-                    default:
-                        site.Properties[property.Key] = property.Value.Clone();
-                        break;
-                }
-            }
+                case "MaxPagedCount":
+                    site.MaxPagedCount = property.Value.Value<int>();
+                    break;
+
+                case "MaxPageSize":
+                    site.MaxPageSize = property.Value.Value<int>();
+                    break;
+
+                case "PageSize":
+                    site.PageSize = property.Value.Value<int>();
+                    break;
+
+                case "ResourceDebugMode":
+                    site.ResourceDebugMode = (ResourceDebugMode)property.Value.Value<int>();
+                    break;
+
+                case "SiteName":
+                    site.SiteName = property.Value.ToString();
+                    break;
 
-            await _siteService.UpdateSiteSettingsAsync(site);
+                case "PageTitleFormat":
+                    site.PageTitleFormat = property.Value.ToString();
+                    break;
+
+                case "SiteSalt":
+                    site.SiteSalt = property.Value.ToString();
+                    break;
+
+                case "SuperUser":
+                    site.SuperUser = property.Value.ToString();
+                    break;
+
+                case "TimeZoneId":
+                    site.TimeZoneId = property.Value.ToString();
+                    break;
+
+                case "UseCdn":
+                    site.UseCdn = property.Value.Value<bool>();
+                    break;
+
+                case "CdnBaseUrl":
+                    site.CdnBaseUrl = property.Value.ToString();
+                    break;
+
+                case "AppendVersion":
+                    site.AppendVersion = property.Value.Value<bool>();
+                    break;
+
+                case "HomeRoute":
+                    site.HomeRoute = property.Value.ToObject<RouteValueDictionary>();
+                    break;
+
+                case "CacheMode":
+                    site.CacheMode = (CacheMode)property.Value.Value<int>();
+                    break;
+
+                default:
+                    site.Properties[property.Key] = property.Value.Clone();
+                    break;
+            }
         }
+
+        await _siteService.UpdateSiteSettingsAsync(site);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Services/DefaultTimeZoneSelector.cs b/src/OrchardCore.Modules/OrchardCore.Settings/Services/DefaultTimeZoneSelector.cs
index ed6fb3ba700..8a064ff13c2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Services/DefaultTimeZoneSelector.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Services/DefaultTimeZoneSelector.cs
@@ -1,29 +1,28 @@
 using System.Threading.Tasks;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Settings.Services
+namespace OrchardCore.Settings.Services;
+
+/// <summary>
+/// Provides the timezone defined in the site configuration for the current scope (request).
+/// The same <see cref="TimeZoneSelectorResult"/> is returned if called multiple times
+/// during the same scope.
+/// </summary>
+public class DefaultTimeZoneSelector : ITimeZoneSelector
 {
-    /// <summary>
-    /// Provides the timezone defined in the site configuration for the current scope (request).
-    /// The same <see cref="TimeZoneSelectorResult"/> is returned if called multiple times
-    /// during the same scope.
-    /// </summary>
-    public class DefaultTimeZoneSelector : ITimeZoneSelector
-    {
-        private readonly ISiteService _siteService;
+    private readonly ISiteService _siteService;
 
-        public DefaultTimeZoneSelector(ISiteService siteService)
-        {
-            _siteService = siteService;
-        }
+    public DefaultTimeZoneSelector(ISiteService siteService)
+    {
+        _siteService = siteService;
+    }
 
-        public Task<TimeZoneSelectorResult> GetTimeZoneAsync()
+    public Task<TimeZoneSelectorResult> GetTimeZoneAsync()
+    {
+        return Task.FromResult(new TimeZoneSelectorResult
         {
-            return Task.FromResult(new TimeZoneSelectorResult
-            {
-                Priority = 0,
-                TimeZoneId = async () => (await _siteService.GetSiteSettingsAsync())?.TimeZoneId
-            });
-        }
+            Priority = 0,
+            TimeZoneId = async () => (await _siteService.GetSiteSettingsAsync())?.TimeZoneId
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Services/RecipeEnvironmentSiteNameProvider.cs b/src/OrchardCore.Modules/OrchardCore.Settings/Services/RecipeEnvironmentSiteNameProvider.cs
index 5d2b9243e29..1ab5f03d7c6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Services/RecipeEnvironmentSiteNameProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Services/RecipeEnvironmentSiteNameProvider.cs
@@ -2,26 +2,25 @@
 using System.Threading.Tasks;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Settings
+namespace OrchardCore.Settings;
+
+public class RecipeEnvironmentSiteNameProvider : IRecipeEnvironmentProvider
 {
-    public class RecipeEnvironmentSiteNameProvider : IRecipeEnvironmentProvider
-    {
-        private readonly ISiteService _siteService;
+    private readonly ISiteService _siteService;
 
-        public RecipeEnvironmentSiteNameProvider(ISiteService siteService)
-        {
-            _siteService = siteService;
-        }
+    public RecipeEnvironmentSiteNameProvider(ISiteService siteService)
+    {
+        _siteService = siteService;
+    }
 
-        public int Order => 0;
+    public int Order => 0;
 
-        public async Task PopulateEnvironmentAsync(IDictionary<string, object> environment)
+    public async Task PopulateEnvironmentAsync(IDictionary<string, object> environment)
+    {
+        var siteSettings = await _siteService.GetSiteSettingsAsync();
+        if (!string.IsNullOrEmpty(siteSettings.SiteName))
         {
-            var siteSettings = await _siteService.GetSiteSettingsAsync();
-            if (!string.IsNullOrEmpty(siteSettings.SiteName))
-            {
-                environment[nameof(SiteSettings.SiteName)] = siteSettings.SiteName;
-            }
+            environment[nameof(SiteSettings.SiteName)] = siteSettings.SiteName;
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Services/SetupEventHandler.cs b/src/OrchardCore.Modules/OrchardCore.Settings/Services/SetupEventHandler.cs
index 111db9c0fba..56ea03cac9d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Services/SetupEventHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Services/SetupEventHandler.cs
@@ -3,31 +3,30 @@
 using OrchardCore.Setup.Events;
 using OrchardCore.Setup.Services;
 
-namespace OrchardCore.Settings.Services
+namespace OrchardCore.Settings.Services;
+
+/// <summary>
+/// During setup, registers the Super User.
+/// </summary>
+public class SetupEventHandler : ISetupEventHandler
 {
-    /// <summary>
-    /// During setup, registers the Super User.
-    /// </summary>
-    public class SetupEventHandler : ISetupEventHandler
-    {
-        private readonly ISiteService _siteService;
+    private readonly ISiteService _siteService;
 
-        public SetupEventHandler(ISiteService siteService)
-        {
-            _siteService = siteService;
-        }
+    public SetupEventHandler(ISiteService siteService)
+    {
+        _siteService = siteService;
+    }
 
-        public async Task SetupAsync(SetupContext context)
-        {
-            // Updating site settings.
-            var siteSettings = await _siteService.LoadSiteSettingsAsync();
-            siteSettings.SiteName = context.Properties.TryGetValue(SetupConstants.SiteName, out var siteName) ? siteName?.ToString() : string.Empty;
-            siteSettings.SuperUser = context.Properties.TryGetValue(SetupConstants.AdminUserId, out var adminUserId) ? adminUserId?.ToString() : string.Empty;
-            siteSettings.TimeZoneId = context.Properties.TryGetValue(SetupConstants.SiteTimeZone, out var siteTimeZone) ? siteTimeZone?.ToString() : string.Empty;
+    public async Task SetupAsync(SetupContext context)
+    {
+        // Updating site settings.
+        var siteSettings = await _siteService.LoadSiteSettingsAsync();
+        siteSettings.SiteName = context.Properties.TryGetValue(SetupConstants.SiteName, out var siteName) ? siteName?.ToString() : string.Empty;
+        siteSettings.SuperUser = context.Properties.TryGetValue(SetupConstants.AdminUserId, out var adminUserId) ? adminUserId?.ToString() : string.Empty;
+        siteSettings.TimeZoneId = context.Properties.TryGetValue(SetupConstants.SiteTimeZone, out var siteTimeZone) ? siteTimeZone?.ToString() : string.Empty;
 
-            await _siteService.UpdateSiteSettingsAsync(siteSettings);
+        await _siteService.UpdateSiteSettingsAsync(siteSettings);
 
-            // TODO: Add Encryption Settings in.
-        }
+        // TODO: Add Encryption Settings in.
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Services/SiteService.cs b/src/OrchardCore.Modules/OrchardCore.Settings/Services/SiteService.cs
index afe59310951..984ec24d091 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Services/SiteService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Services/SiteService.cs
@@ -3,65 +3,64 @@
 using OrchardCore.Documents;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Settings.Services
+namespace OrchardCore.Settings.Services;
+
+/// <summary>
+/// Implements <see cref="ISiteService"/> by storing the site settings as a document.
+/// </summary>
+public class SiteService : ISiteService
 {
-    /// <summary>
-    /// Implements <see cref="ISiteService"/> by storing the site settings as a document.
-    /// </summary>
-    public class SiteService : ISiteService
-    {
-        private readonly IDocumentManager<SiteSettings> _documentManager;
-        private readonly IClock _clock;
+    private readonly IDocumentManager<SiteSettings> _documentManager;
+    private readonly IClock _clock;
 
-        public SiteService(IDocumentManager<SiteSettings> documentManager, IClock clock)
-        {
-            _documentManager = documentManager;
-            _clock = clock;
-        }
+    public SiteService(IDocumentManager<SiteSettings> documentManager, IClock clock)
+    {
+        _documentManager = documentManager;
+        _clock = clock;
+    }
 
-        /// <summary>
-        /// Loads the site settings from the store for updating and that should not be cached.
-        /// </summary>
-        // Await as we can't cast 'Task<SiteSettings>' to 'Task<ISite>'.
-        public async Task<ISite> LoadSiteSettingsAsync()
-            => await _documentManager.GetOrCreateMutableAsync(GetDefaultSettingsAsync);
+    /// <summary>
+    /// Loads the site settings from the store for updating and that should not be cached.
+    /// </summary>
+    // Await as we can't cast 'Task<SiteSettings>' to 'Task<ISite>'.
+    public async Task<ISite> LoadSiteSettingsAsync()
+        => await _documentManager.GetOrCreateMutableAsync(GetDefaultSettingsAsync);
 
-        /// <summary>
-        /// Gets the site settings from the cache for sharing and that should not be updated.
-        /// </summary>
-        // Await as we can't cast 'Task<SiteSettings>' to 'Task<ISite>'.
-        public async Task<ISite> GetSiteSettingsAsync()
-            => await _documentManager.GetOrCreateImmutableAsync(GetDefaultSettingsAsync);
+    /// <summary>
+    /// Gets the site settings from the cache for sharing and that should not be updated.
+    /// </summary>
+    // Await as we can't cast 'Task<SiteSettings>' to 'Task<ISite>'.
+    public async Task<ISite> GetSiteSettingsAsync()
+        => await _documentManager.GetOrCreateImmutableAsync(GetDefaultSettingsAsync);
 
-        /// <summary>
-        /// Updates the store with the provided site settings and then updates the cache.
-        /// </summary>
-        public async Task UpdateSiteSettingsAsync(ISite site)
+    /// <summary>
+    /// Updates the store with the provided site settings and then updates the cache.
+    /// </summary>
+    public async Task UpdateSiteSettingsAsync(ISite site)
+    {
+        if (site is not SiteSettings siteSettings)
         {
-            if (site is not SiteSettings siteSettings)
-            {
-                return;
-            }
+            return;
+        }
 
-            await _documentManager.UpdateAsync(siteSettings);
+        await _documentManager.UpdateAsync(siteSettings);
 
-            // Clear the internal cache to ensure that any other lookup against
-            // this document will load the new values until the site is reloaded.
-            siteSettings.ClearCache();
-        }
+        // Clear the internal cache to ensure that any other lookup against
+        // this document will load the new values until the site is reloaded.
+        siteSettings.ClearCache();
+    }
 
-        private Task<SiteSettings> GetDefaultSettingsAsync()
+    private Task<SiteSettings> GetDefaultSettingsAsync()
+    {
+        return Task.FromResult(new SiteSettings
         {
-            return Task.FromResult(new SiteSettings
-            {
-                SiteSalt = Guid.NewGuid().ToString("N"),
-                SiteName = "My Orchard Project Application",
-                PageTitleFormat = "{% page_title Site.SiteName, position: \"after\", separator: \" - \" %}",
-                TimeZoneId = _clock.GetSystemTimeZone().TimeZoneId,
-                PageSize = 10,
-                MaxPageSize = 100,
-                MaxPagedCount = 0
-            });
-        }
+            SiteSalt = Guid.NewGuid().ToString("N"),
+            SiteName = "My Orchard Project Application",
+            PageTitleFormat = "{% page_title Site.SiteName, position: \"after\", separator: \" - \" %}",
+            TimeZoneId = _clock.GetSystemTimeZone().TimeZoneId,
+            PageSize = 10,
+            MaxPageSize = 100,
+            MaxPagedCount = 0
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Services/SuperUserHandler.cs b/src/OrchardCore.Modules/OrchardCore.Settings/Services/SuperUserHandler.cs
index ae37337a7a0..4567c0f38d9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Services/SuperUserHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Services/SuperUserHandler.cs
@@ -5,42 +5,41 @@
 using Microsoft.AspNetCore.Authorization;
 using OrchardCore.Security;
 
-namespace OrchardCore.Settings.Services
+namespace OrchardCore.Settings.Services;
+
+/// <summary>
+/// This authorization handler validates any permission when the user is the site owner.
+/// </summary>
+public class SuperUserHandler : IAuthorizationHandler
 {
-    /// <summary>
-    /// This authorization handler validates any permission when the user is the site owner.
-    /// </summary>
-    public class SuperUserHandler : IAuthorizationHandler
+    private readonly ISiteService _siteService;
+
+    public SuperUserHandler(ISiteService siteService)
     {
-        private readonly ISiteService _siteService;
+        _siteService = siteService;
+    }
 
-        public SuperUserHandler(ISiteService siteService)
+    public async Task HandleAsync(AuthorizationHandlerContext context)
+    {
+        var userId = context?.User?.FindFirstValue(ClaimTypes.NameIdentifier);
+        if (userId == null)
         {
-            _siteService = siteService;
+            return;
         }
 
-        public async Task HandleAsync(AuthorizationHandlerContext context)
-        {
-            var userId = context?.User?.FindFirstValue(ClaimTypes.NameIdentifier);
-            if (userId == null)
-            {
-                return;
-            }
+        var site = await _siteService.GetSiteSettingsAsync();
 
-            var site = await _siteService.GetSiteSettingsAsync();
-
-            if (string.Equals(userId, site.SuperUser, StringComparison.OrdinalIgnoreCase))
-            {
-                SucceedAllRequirements(context);
-            }
+        if (string.Equals(userId, site.SuperUser, StringComparison.OrdinalIgnoreCase))
+        {
+            SucceedAllRequirements(context);
         }
+    }
 
-        private static void SucceedAllRequirements(AuthorizationHandlerContext context)
+    private static void SucceedAllRequirements(AuthorizationHandlerContext context)
+    {
+        foreach (var requirement in context.Requirements.OfType<PermissionRequirement>())
         {
-            foreach (var requirement in context.Requirements.OfType<PermissionRequirement>())
-            {
-                context.Succeed(requirement);
-            }
+            context.Succeed(requirement);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/SiteSettings.cs b/src/OrchardCore.Modules/OrchardCore.Settings/SiteSettings.cs
index b47ca92b1e9..023c1dcfe96 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/SiteSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/SiteSettings.cs
@@ -3,52 +3,51 @@
 using OrchardCore.Documents;
 using OrchardCore.Entities;
 
-namespace OrchardCore.Settings
-{
-    // When updating class also update SiteSettingsDeploymentSource and SettingsStep.
-    public class SiteSettings : DocumentEntity, ISite
-    {
-        private readonly ConcurrentDictionary<string, object> _cache = new();
-
-        public string BaseUrl { get; set; }
-        public string Calendar { get; set; }
-        public int MaxPagedCount { get; set; }
-        public int MaxPageSize { get; set; }
-        public int PageSize { get; set; }
-        public string TimeZoneId { get; set; }
-        public ResourceDebugMode ResourceDebugMode { get; set; }
-        public string SiteName { get; set; }
-        public string SiteSalt { get; set; }
-        public string PageTitleFormat { get; set; }
-        public string SuperUser { get; set; }
-        public bool UseCdn { get; set; }
-        public string CdnBaseUrl { get; set; }
-        public RouteValueDictionary HomeRoute { get; set; } = [];
-        public bool AppendVersion { get; set; } = true;
-        public CacheMode CacheMode { get; set; }
-
-        public T As<T>() where T : new()
-        {
-            var name = typeof(T).Name;
-            if (!IsReadOnly)
-            {
-                return this.As<T>(name);
-            }
+namespace OrchardCore.Settings;
 
-            if (_cache.TryGetValue(name, out var obj) && obj is T value)
-            {
-                return value;
-            }
+// When updating class also update SiteSettingsDeploymentSource and SettingsStep.
+public class SiteSettings : DocumentEntity, ISite
+{
+    private readonly ConcurrentDictionary<string, object> _cache = new();
 
-            var settings = this.As<T>(name);
-            _cache[name] = settings;
+    public string BaseUrl { get; set; }
+    public string Calendar { get; set; }
+    public int MaxPagedCount { get; set; }
+    public int MaxPageSize { get; set; }
+    public int PageSize { get; set; }
+    public string TimeZoneId { get; set; }
+    public ResourceDebugMode ResourceDebugMode { get; set; }
+    public string SiteName { get; set; }
+    public string SiteSalt { get; set; }
+    public string PageTitleFormat { get; set; }
+    public string SuperUser { get; set; }
+    public bool UseCdn { get; set; }
+    public string CdnBaseUrl { get; set; }
+    public RouteValueDictionary HomeRoute { get; set; } = [];
+    public bool AppendVersion { get; set; } = true;
+    public CacheMode CacheMode { get; set; }
 
-            return settings;
+    public T As<T>() where T : new()
+    {
+        var name = typeof(T).Name;
+        if (!IsReadOnly)
+        {
+            return this.As<T>(name);
         }
 
-        internal void ClearCache()
+        if (_cache.TryGetValue(name, out var obj) && obj is T value)
         {
-            _cache.Clear();
+            return value;
         }
+
+        var settings = this.As<T>(name);
+        _cache[name] = settings;
+
+        return settings;
+    }
+
+    internal void ClearCache()
+    {
+        _cache.Clear();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Settings/Startup.cs
index cee923e65b5..3ca02e824af 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Startup.cs
@@ -18,71 +18,70 @@
 using OrchardCore.Settings.Services;
 using OrchardCore.Setup.Events;
 
-namespace OrchardCore.Settings
+namespace OrchardCore.Settings;
+
+/// <summary>
+/// These services are registered on the tenant service collection.
+/// </summary>
+public sealed class Startup : StartupBase
 {
-    /// <summary>
-    /// These services are registered on the tenant service collection.
-    /// </summary>
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
+            o.Scope.SetValue("Site", new ObjectValue(new LiquidSiteSettingsAccessor()));
+            o.MemberAccessStrategy.Register<LiquidSiteSettingsAccessor, FluidValue>(async (obj, name, context) =>
             {
-                o.Scope.SetValue("Site", new ObjectValue(new LiquidSiteSettingsAccessor()));
-                o.MemberAccessStrategy.Register<LiquidSiteSettingsAccessor, FluidValue>(async (obj, name, context) =>
-                {
-                    var liquidTemplateContext = (LiquidTemplateContext)context;
+                var liquidTemplateContext = (LiquidTemplateContext)context;
 
-                    var siteService = liquidTemplateContext.Services.GetRequiredService<ISiteService>();
-                    var site = await siteService.GetSiteSettingsAsync();
+                var siteService = liquidTemplateContext.Services.GetRequiredService<ISiteService>();
+                var site = await siteService.GetSiteSettingsAsync();
 
-                    FluidValue result = name switch
-                    {
-                        nameof(ISite.SiteName) => new StringValue(site.SiteName),
-                        nameof(ISite.PageTitleFormat) => new StringValue(site.PageTitleFormat),
-                        nameof(ISite.SiteSalt) => new StringValue(site.SiteSalt),
-                        nameof(ISite.SuperUser) => new StringValue(site.SuperUser),
-                        nameof(ISite.Calendar) => new StringValue(site.Calendar),
-                        nameof(ISite.TimeZoneId) => new StringValue(site.TimeZoneId),
-                        nameof(ISite.ResourceDebugMode) => new StringValue(site.ResourceDebugMode.ToString()),
-                        nameof(ISite.UseCdn) => BooleanValue.Create(site.UseCdn),
-                        nameof(ISite.CdnBaseUrl) => new StringValue(site.CdnBaseUrl),
-                        nameof(ISite.PageSize) => NumberValue.Create(site.PageSize),
-                        nameof(ISite.MaxPageSize) => NumberValue.Create(site.MaxPageSize),
-                        nameof(ISite.MaxPagedCount) => NumberValue.Create(site.MaxPagedCount),
-                        nameof(ISite.BaseUrl) => new StringValue(site.BaseUrl),
-                        nameof(ISite.HomeRoute) => new ObjectValue(site.HomeRoute),
-                        nameof(ISite.AppendVersion) => BooleanValue.Create(site.AppendVersion),
-                        nameof(ISite.CacheMode) => new StringValue(site.CacheMode.ToString()),
-                        nameof(ISite.Properties) => new ObjectValue(site.Properties),
-                        _ => NilValue.Instance
-                    };
+                FluidValue result = name switch
+                {
+                    nameof(ISite.SiteName) => new StringValue(site.SiteName),
+                    nameof(ISite.PageTitleFormat) => new StringValue(site.PageTitleFormat),
+                    nameof(ISite.SiteSalt) => new StringValue(site.SiteSalt),
+                    nameof(ISite.SuperUser) => new StringValue(site.SuperUser),
+                    nameof(ISite.Calendar) => new StringValue(site.Calendar),
+                    nameof(ISite.TimeZoneId) => new StringValue(site.TimeZoneId),
+                    nameof(ISite.ResourceDebugMode) => new StringValue(site.ResourceDebugMode.ToString()),
+                    nameof(ISite.UseCdn) => BooleanValue.Create(site.UseCdn),
+                    nameof(ISite.CdnBaseUrl) => new StringValue(site.CdnBaseUrl),
+                    nameof(ISite.PageSize) => NumberValue.Create(site.PageSize),
+                    nameof(ISite.MaxPageSize) => NumberValue.Create(site.MaxPageSize),
+                    nameof(ISite.MaxPagedCount) => NumberValue.Create(site.MaxPagedCount),
+                    nameof(ISite.BaseUrl) => new StringValue(site.BaseUrl),
+                    nameof(ISite.HomeRoute) => new ObjectValue(site.HomeRoute),
+                    nameof(ISite.AppendVersion) => BooleanValue.Create(site.AppendVersion),
+                    nameof(ISite.CacheMode) => new StringValue(site.CacheMode.ToString()),
+                    nameof(ISite.Properties) => new ObjectValue(site.Properties),
+                    _ => NilValue.Instance
+                };
 
-                    return result;
-                });
+                return result;
             });
+        });
 
-            services.AddScoped<ISetupEventHandler, SetupEventHandler>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<IAuthorizationHandler, SuperUserHandler>();
+        services.AddScoped<ISetupEventHandler, SetupEventHandler>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<IAuthorizationHandler, SuperUserHandler>();
 
-            services.AddRecipeExecutionStep<SettingsStep>();
-            services.AddSingleton<ISiteService, SiteService>();
+        services.AddRecipeExecutionStep<SettingsStep>();
+        services.AddSingleton<ISiteService, SiteService>();
 
-            // Site Settings editor
-            services.AddScoped<IDisplayDriver<ISite>, DefaultSiteSettingsDisplayDriver>();
-            services.AddScoped<IDisplayDriver<ISite>, ButtonsSettingsDisplayDriver>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
+        // Site Settings editor
+        services.AddScoped<IDisplayDriver<ISite>, DefaultSiteSettingsDisplayDriver>();
+        services.AddScoped<IDisplayDriver<ISite>, ButtonsSettingsDisplayDriver>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
 
-            services.AddScoped<ITimeZoneSelector, DefaultTimeZoneSelector>();
+        services.AddScoped<ITimeZoneSelector, DefaultTimeZoneSelector>();
 
-            services.AddDeployment<SiteSettingsDeploymentSource, SiteSettingsDeploymentStep, SiteSettingsDeploymentStepDriver>();
+        services.AddDeployment<SiteSettingsDeploymentSource, SiteSettingsDeploymentStep, SiteSettingsDeploymentStepDriver>();
 
-            services.AddScoped<IRecipeEnvironmentProvider, RecipeEnvironmentSiteNameProvider>();
+        services.AddScoped<IRecipeEnvironmentProvider, RecipeEnvironmentSiteNameProvider>();
 
-            services.AddTransient<IPostConfigureOptions<ResourceOptions>, ResourceOptionsConfiguration>();
-            services.AddTransient<IPostConfigureOptions<PagerOptions>, PagerOptionsConfiguration>();
-        }
+        services.AddTransient<IPostConfigureOptions<ResourceOptions>, ResourceOptionsConfiguration>();
+        services.AddTransient<IPostConfigureOptions<PagerOptions>, PagerOptionsConfiguration>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/ViewModels/AdminIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Settings/ViewModels/AdminIndexViewModel.cs
index 7f98ae32787..6cb175bb21c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/ViewModels/AdminIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/ViewModels/AdminIndexViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Settings.ViewModels
+namespace OrchardCore.Settings.ViewModels;
+
+public class AdminIndexViewModel
 {
-    public class AdminIndexViewModel
-    {
-        public dynamic Shape { get; set; }
-        public string GroupId { get; set; }
-    }
+    public dynamic Shape { get; set; }
+    public string GroupId { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/ViewModels/SiteCulturesViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Settings/ViewModels/SiteCulturesViewModel.cs
index 4421fe1f726..5bdb12164e8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/ViewModels/SiteCulturesViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/ViewModels/SiteCulturesViewModel.cs
@@ -1,12 +1,11 @@
 using System.Collections.Generic;
 using System.Globalization;
 
-namespace OrchardCore.Settings.ViewModels
+namespace OrchardCore.Settings.ViewModels;
+
+public class SiteCulturesViewModel
 {
-    public class SiteCulturesViewModel
-    {
-        public string CurrentCulture { get; set; }
-        public IEnumerable<string> SiteCultures { get; set; }
-        public IEnumerable<CultureInfo> AvailableSystemCultures { get; set; }
-    }
+    public string CurrentCulture { get; set; }
+    public IEnumerable<string> SiteCultures { get; set; }
+    public IEnumerable<CultureInfo> AvailableSystemCultures { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/ViewModels/SiteSettingsDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Settings/ViewModels/SiteSettingsDeploymentStepViewModel.cs
index 36039af06b6..edbba5ed8de 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/ViewModels/SiteSettingsDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/ViewModels/SiteSettingsDeploymentStepViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Settings.ViewModels
+namespace OrchardCore.Settings.ViewModels;
+
+public class SiteSettingsDeploymentStepViewModel
 {
-    public class SiteSettingsDeploymentStepViewModel
-    {
-        public string[] Settings { get; set; }
-    }
+    public string[] Settings { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/ViewModels/SiteSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Settings/ViewModels/SiteSettingsViewModel.cs
index c4570fda419..d08a3c6679b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/ViewModels/SiteSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/ViewModels/SiteSettingsViewModel.cs
@@ -1,22 +1,21 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Settings.ViewModels
+namespace OrchardCore.Settings.ViewModels;
+
+public class SiteSettingsViewModel
 {
-    public class SiteSettingsViewModel
-    {
-        public string SiteName { get; set; }
-        public string PageTitleFormat { get; set; }
-        public string BaseUrl { get; set; }
-        public string TimeZone { get; set; }
+    public string SiteName { get; set; }
+    public string PageTitleFormat { get; set; }
+    public string BaseUrl { get; set; }
+    public string TimeZone { get; set; }
 
-        [Required]
-        public int? PageSize { get; set; }
+    [Required]
+    public int? PageSize { get; set; }
 
-        public bool UseCdn { get; set; }
-        public string CdnBaseUrl { get; set; }
-        public ResourceDebugMode ResourceDebugMode { get; set; }
-        public bool AppendVersion { get; set; }
-        public string Meta { get; set; }
-        public CacheMode CacheMode { get; set; }
-    }
+    public bool UseCdn { get; set; }
+    public string CdnBaseUrl { get; set; }
+    public ResourceDebugMode ResourceDebugMode { get; set; }
+    public bool AppendVersion { get; set; }
+    public string Meta { get; set; }
+    public CacheMode CacheMode { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Setup/Controllers/SetupController.cs b/src/OrchardCore.Modules/OrchardCore.Setup/Controllers/SetupController.cs
index d96ec02a46a..4d5ec7b0888 100644
--- a/src/OrchardCore.Modules/OrchardCore.Setup/Controllers/SetupController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Setup/Controllers/SetupController.cs
@@ -18,248 +18,247 @@
 using OrchardCore.Setup.Services;
 using OrchardCore.Setup.ViewModels;
 
-namespace OrchardCore.Setup.Controllers
+namespace OrchardCore.Setup.Controllers;
+
+public class SetupController : Controller
 {
-    public class SetupController : Controller
+    private readonly IClock _clock;
+    private readonly ISetupService _setupService;
+    private readonly ShellSettings _shellSettings;
+    private readonly IShellHost _shellHost;
+    private readonly IdentityOptions _identityOptions;
+    private readonly IEmailAddressValidator _emailAddressValidator;
+    private readonly IEnumerable<DatabaseProvider> _databaseProviders;
+    private readonly ILogger _logger;
+    protected readonly IStringLocalizer S;
+
+    public SetupController(
+        IClock clock,
+        ISetupService setupService,
+        ShellSettings shellSettings,
+        IShellHost shellHost,
+        IOptions<IdentityOptions> identityOptions,
+        IEmailAddressValidator emailAddressValidator,
+        IEnumerable<DatabaseProvider> databaseProviders,
+        IStringLocalizer<SetupController> localizer,
+        ILogger<SetupController> logger)
+    {
+        _clock = clock;
+        _setupService = setupService;
+        _shellSettings = shellSettings;
+        _shellHost = shellHost;
+        _identityOptions = identityOptions.Value;
+        _emailAddressValidator = emailAddressValidator;
+        _databaseProviders = databaseProviders;
+        _logger = logger;
+        S = localizer;
+    }
+
+    public async Task<ActionResult> Index(string token)
     {
-        private readonly IClock _clock;
-        private readonly ISetupService _setupService;
-        private readonly ShellSettings _shellSettings;
-        private readonly IShellHost _shellHost;
-        private readonly IdentityOptions _identityOptions;
-        private readonly IEmailAddressValidator _emailAddressValidator;
-        private readonly IEnumerable<DatabaseProvider> _databaseProviders;
-        private readonly ILogger _logger;
-        protected readonly IStringLocalizer S;
-
-        public SetupController(
-            IClock clock,
-            ISetupService setupService,
-            ShellSettings shellSettings,
-            IShellHost shellHost,
-            IOptions<IdentityOptions> identityOptions,
-            IEmailAddressValidator emailAddressValidator,
-            IEnumerable<DatabaseProvider> databaseProviders,
-            IStringLocalizer<SetupController> localizer,
-            ILogger<SetupController> logger)
+        var recipes = await _setupService.GetSetupRecipesAsync();
+        var defaultRecipe = recipes.FirstOrDefault(x => x.Tags.Contains("default")) ?? recipes.FirstOrDefault();
+
+        if (!await ShouldProceedWithTokenAsync(token))
         {
-            _clock = clock;
-            _setupService = setupService;
-            _shellSettings = shellSettings;
-            _shellHost = shellHost;
-            _identityOptions = identityOptions.Value;
-            _emailAddressValidator = emailAddressValidator;
-            _databaseProviders = databaseProviders;
-            _logger = logger;
-            S = localizer;
+            return NotFound();
         }
 
-        public async Task<ActionResult> Index(string token)
+        var model = new SetupViewModel
         {
-            var recipes = await _setupService.GetSetupRecipesAsync();
-            var defaultRecipe = recipes.FirstOrDefault(x => x.Tags.Contains("default")) ?? recipes.FirstOrDefault();
-
-            if (!await ShouldProceedWithTokenAsync(token))
-            {
-                return NotFound();
-            }
+            DatabaseProviders = _databaseProviders,
+            Recipes = recipes,
+            RecipeName = defaultRecipe?.Name,
+            Secret = token,
+        };
 
-            var model = new SetupViewModel
-            {
-                DatabaseProviders = _databaseProviders,
-                Recipes = recipes,
-                RecipeName = defaultRecipe?.Name,
-                Secret = token,
-            };
+        CopyShellSettingsValues(model);
 
-            CopyShellSettingsValues(model);
+        if (!string.IsNullOrEmpty(_shellSettings["TablePrefix"]))
+        {
+            model.DatabaseConfigurationPreset = true;
+            model.TablePrefix = _shellSettings["TablePrefix"];
+        }
 
-            if (!string.IsNullOrEmpty(_shellSettings["TablePrefix"]))
-            {
-                model.DatabaseConfigurationPreset = true;
-                model.TablePrefix = _shellSettings["TablePrefix"];
-            }
+        if (!string.IsNullOrEmpty(_shellSettings["Schema"]))
+        {
+            model.DatabaseConfigurationPreset = true;
+            model.Schema = _shellSettings["Schema"];
+        }
 
-            if (!string.IsNullOrEmpty(_shellSettings["Schema"]))
-            {
-                model.DatabaseConfigurationPreset = true;
-                model.Schema = _shellSettings["Schema"];
-            }
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost, ActionName("Index")]
+    public async Task<ActionResult> IndexPOST(SetupViewModel model)
+    {
+        if (!await ShouldProceedWithTokenAsync(model.Secret))
+        {
+            return StatusCode(404);
         }
 
-        [HttpPost, ActionName("Index")]
-        public async Task<ActionResult> IndexPOST(SetupViewModel model)
+        model.DatabaseProviders = _databaseProviders;
+        model.Recipes = await _setupService.GetSetupRecipesAsync();
+
+        if (string.IsNullOrEmpty(model.Password))
         {
-            if (!await ShouldProceedWithTokenAsync(model.Secret))
-            {
-                return StatusCode(404);
-            }
+            ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
+        }
 
-            model.DatabaseProviders = _databaseProviders;
-            model.Recipes = await _setupService.GetSetupRecipesAsync();
+        if (model.Password != model.PasswordConfirmation)
+        {
+            ModelState.AddModelError(nameof(model.PasswordConfirmation), S["The password confirmation doesn't match the password."]);
+        }
 
-            if (string.IsNullOrEmpty(model.Password))
+        RecipeDescriptor selectedRecipe = null;
+        if (!string.IsNullOrEmpty(_shellSettings["RecipeName"]))
+        {
+            selectedRecipe = model.Recipes.FirstOrDefault(x => x.Name == _shellSettings["RecipeName"]);
+            if (selectedRecipe == null)
             {
-                ModelState.AddModelError(nameof(model.Password), S["The password is required."]);
+                ModelState.AddModelError(nameof(model.RecipeName), S["Invalid recipe."]);
             }
+        }
+        else if (string.IsNullOrEmpty(model.RecipeName) || (selectedRecipe = model.Recipes.FirstOrDefault(x => x.Name == model.RecipeName)) == null)
+        {
+            ModelState.AddModelError(nameof(model.RecipeName), S["Invalid recipe."]);
+        }
 
-            if (model.Password != model.PasswordConfirmation)
-            {
-                ModelState.AddModelError(nameof(model.PasswordConfirmation), S["The password confirmation doesn't match the password."]);
-            }
+        // Only add additional errors if attribute validation has passed.
+        if (!string.IsNullOrEmpty(model.Email) && !_emailAddressValidator.Validate(model.Email))
+        {
+            ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
+        }
 
-            RecipeDescriptor selectedRecipe = null;
-            if (!string.IsNullOrEmpty(_shellSettings["RecipeName"]))
-            {
-                selectedRecipe = model.Recipes.FirstOrDefault(x => x.Name == _shellSettings["RecipeName"]);
-                if (selectedRecipe == null)
-                {
-                    ModelState.AddModelError(nameof(model.RecipeName), S["Invalid recipe."]);
-                }
-            }
-            else if (string.IsNullOrEmpty(model.RecipeName) || (selectedRecipe = model.Recipes.FirstOrDefault(x => x.Name == model.RecipeName)) == null)
-            {
-                ModelState.AddModelError(nameof(model.RecipeName), S["Invalid recipe."]);
-            }
+        if (!string.IsNullOrEmpty(model.UserName) && model.UserName.Any(c => !_identityOptions.User.AllowedUserNameCharacters.Contains(c)))
+        {
+            ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
+        }
 
-            // Only add additional errors if attribute validation has passed.
-            if (!string.IsNullOrEmpty(model.Email) && !_emailAddressValidator.Validate(model.Email))
-            {
-                ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-            }
+        if (!ModelState.IsValid)
+        {
+            CopyShellSettingsValues(model);
+            return View(model);
+        }
 
-            if (!string.IsNullOrEmpty(model.UserName) && model.UserName.Any(c => !_identityOptions.User.AllowedUserNameCharacters.Contains(c)))
+        var setupContext = new SetupContext
+        {
+            ShellSettings = _shellSettings,
+            EnabledFeatures = null, // default list,
+            Errors = new Dictionary<string, string>(),
+            Recipe = selectedRecipe,
+            Properties = new Dictionary<string, object>
             {
-                ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
+                { SetupConstants.SiteName, model.SiteName },
+                { SetupConstants.AdminUsername, model.UserName },
+                { SetupConstants.AdminEmail, model.Email },
+                { SetupConstants.AdminPassword, model.Password },
+                { SetupConstants.SiteTimeZone, model.SiteTimeZone },
             }
+        };
 
-            if (!ModelState.IsValid)
-            {
-                CopyShellSettingsValues(model);
-                return View(model);
-            }
+        if (!string.IsNullOrEmpty(_shellSettings["ConnectionString"]))
+        {
+            model.DatabaseConfigurationPreset = true;
+            setupContext.Properties[SetupConstants.DatabaseProvider] = _shellSettings["DatabaseProvider"];
+            setupContext.Properties[SetupConstants.DatabaseConnectionString] = _shellSettings["ConnectionString"];
+            setupContext.Properties[SetupConstants.DatabaseTablePrefix] = _shellSettings["TablePrefix"];
+            setupContext.Properties[SetupConstants.DatabaseSchema] = _shellSettings["Schema"];
+        }
+        else
+        {
+            setupContext.Properties[SetupConstants.DatabaseProvider] = model.DatabaseProvider;
+            setupContext.Properties[SetupConstants.DatabaseConnectionString] = model.ConnectionString;
+            setupContext.Properties[SetupConstants.DatabaseTablePrefix] = model.TablePrefix;
+            setupContext.Properties[SetupConstants.DatabaseSchema] = model.Schema;
+        }
 
-            var setupContext = new SetupContext
-            {
-                ShellSettings = _shellSettings,
-                EnabledFeatures = null, // default list,
-                Errors = new Dictionary<string, string>(),
-                Recipe = selectedRecipe,
-                Properties = new Dictionary<string, object>
-                {
-                    { SetupConstants.SiteName, model.SiteName },
-                    { SetupConstants.AdminUsername, model.UserName },
-                    { SetupConstants.AdminEmail, model.Email },
-                    { SetupConstants.AdminPassword, model.Password },
-                    { SetupConstants.SiteTimeZone, model.SiteTimeZone },
-                }
-            };
+        var executionId = await _setupService.SetupAsync(setupContext);
 
-            if (!string.IsNullOrEmpty(_shellSettings["ConnectionString"]))
-            {
-                model.DatabaseConfigurationPreset = true;
-                setupContext.Properties[SetupConstants.DatabaseProvider] = _shellSettings["DatabaseProvider"];
-                setupContext.Properties[SetupConstants.DatabaseConnectionString] = _shellSettings["ConnectionString"];
-                setupContext.Properties[SetupConstants.DatabaseTablePrefix] = _shellSettings["TablePrefix"];
-                setupContext.Properties[SetupConstants.DatabaseSchema] = _shellSettings["Schema"];
-            }
-            else
+        // Check if any Setup component failed (e.g., database connection validation)
+        if (setupContext.Errors.Count > 0)
+        {
+            foreach (var error in setupContext.Errors)
             {
-                setupContext.Properties[SetupConstants.DatabaseProvider] = model.DatabaseProvider;
-                setupContext.Properties[SetupConstants.DatabaseConnectionString] = model.ConnectionString;
-                setupContext.Properties[SetupConstants.DatabaseTablePrefix] = model.TablePrefix;
-                setupContext.Properties[SetupConstants.DatabaseSchema] = model.Schema;
+                ModelState.AddModelError(error.Key, error.Value);
             }
 
-            var executionId = await _setupService.SetupAsync(setupContext);
-
-            // Check if any Setup component failed (e.g., database connection validation)
-            if (setupContext.Errors.Count > 0)
-            {
-                foreach (var error in setupContext.Errors)
-                {
-                    ModelState.AddModelError(error.Key, error.Value);
-                }
+            return View(model);
+        }
 
-                return View(model);
-            }
+        return Redirect("~/");
+    }
 
-            return Redirect("~/");
+    private void CopyShellSettingsValues(SetupViewModel model)
+    {
+        if (!string.IsNullOrEmpty(_shellSettings["ConnectionString"]))
+        {
+            model.DatabaseConfigurationPreset = true;
+            model.ConnectionString = _shellSettings["ConnectionString"];
         }
 
-        private void CopyShellSettingsValues(SetupViewModel model)
+        if (!string.IsNullOrEmpty(_shellSettings["RecipeName"]))
         {
-            if (!string.IsNullOrEmpty(_shellSettings["ConnectionString"]))
-            {
-                model.DatabaseConfigurationPreset = true;
-                model.ConnectionString = _shellSettings["ConnectionString"];
-            }
-
-            if (!string.IsNullOrEmpty(_shellSettings["RecipeName"]))
-            {
-                model.RecipeNamePreset = true;
-                model.RecipeName = _shellSettings["RecipeName"];
-            }
+            model.RecipeNamePreset = true;
+            model.RecipeName = _shellSettings["RecipeName"];
+        }
 
-            if (!string.IsNullOrEmpty(_shellSettings["DatabaseProvider"]))
-            {
-                model.DatabaseConfigurationPreset = true;
-                model.DatabaseProvider = _shellSettings["DatabaseProvider"];
-            }
-            else
-            {
-                model.DatabaseProvider = model.DatabaseProviders.FirstOrDefault(p => p.IsDefault)?.Value;
-            }
+        if (!string.IsNullOrEmpty(_shellSettings["DatabaseProvider"]))
+        {
+            model.DatabaseConfigurationPreset = true;
+            model.DatabaseProvider = _shellSettings["DatabaseProvider"];
+        }
+        else
+        {
+            model.DatabaseProvider = model.DatabaseProviders.FirstOrDefault(p => p.IsDefault)?.Value;
         }
+    }
 
-        private async Task<bool> ShouldProceedWithTokenAsync(string token)
+    private async Task<bool> ShouldProceedWithTokenAsync(string token)
+    {
+        if (!string.IsNullOrWhiteSpace(_shellSettings["Secret"]))
         {
-            if (!string.IsNullOrWhiteSpace(_shellSettings["Secret"]))
+            if (string.IsNullOrEmpty(token) || !await IsTokenValid(token))
             {
-                if (string.IsNullOrEmpty(token) || !await IsTokenValid(token))
-                {
-                    _logger.LogWarning("An attempt to access '{TenantName}' without providing a secret was made", _shellSettings.Name);
+                _logger.LogWarning("An attempt to access '{TenantName}' without providing a secret was made", _shellSettings.Name);
 
-                    return false;
-                }
+                return false;
             }
-
-            return true;
         }
 
-        private async Task<bool> IsTokenValid(string token)
+        return true;
+    }
+
+    private async Task<bool> IsTokenValid(string token)
+    {
+        var result = false;
+        try
         {
-            var result = false;
-            try
-            {
-                var shellScope = await _shellHost.GetScopeAsync(ShellSettings.DefaultShellName);
+            var shellScope = await _shellHost.GetScopeAsync(ShellSettings.DefaultShellName);
 
-                await shellScope.UsingAsync(scope =>
-                {
-                    var dataProtectionProvider = scope.ServiceProvider.GetRequiredService<IDataProtectionProvider>();
-                    var dataProtector = dataProtectionProvider.CreateProtector("Tokens").ToTimeLimitedDataProtector();
+            await shellScope.UsingAsync(scope =>
+            {
+                var dataProtectionProvider = scope.ServiceProvider.GetRequiredService<IDataProtectionProvider>();
+                var dataProtector = dataProtectionProvider.CreateProtector("Tokens").ToTimeLimitedDataProtector();
 
-                    var tokenValue = dataProtector.Unprotect(token, out var expiration);
+                var tokenValue = dataProtector.Unprotect(token, out var expiration);
 
-                    if (_clock.UtcNow < expiration.ToUniversalTime())
+                if (_clock.UtcNow < expiration.ToUniversalTime())
+                {
+                    if (_shellSettings["Secret"] == tokenValue)
                     {
-                        if (_shellSettings["Secret"] == tokenValue)
-                        {
-                            result = true;
-                        }
+                        result = true;
                     }
+                }
 
-                    return Task.CompletedTask;
-                });
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error in decrypting the token");
-            }
-
-            return result;
+                return Task.CompletedTask;
+            });
         }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error in decrypting the token");
+        }
+
+        return result;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Setup/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Setup/Startup.cs
index a0dcdb7b6ca..0c6c8171791 100644
--- a/src/OrchardCore.Modules/OrchardCore.Setup/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Setup/Startup.cs
@@ -13,87 +13,86 @@
 using OrchardCore.Localization;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Setup
+namespace OrchardCore.Setup;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    private readonly string _defaultCulture = CultureInfo.InstalledUICulture.Name;
+
+    private string[] _supportedCultures =
+    [
+        "ar",
+        "cs",
+        "de",
+        "el",
+        "en",
+        "es",
+        "fa",
+        "fr",
+        "it",
+        "ja",
+        "pl",
+        "pt-BR",
+        "ru",
+        "sv",
+        "tr",
+        "vi",
+        "zh-CN",
+        "zh-TW",
+        "zh-Hans-CN",
+        "zh-Hant-TW"
+    ];
+
+    public Startup(IShellConfiguration shellConfiguration)
     {
-        private readonly string _defaultCulture = CultureInfo.InstalledUICulture.Name;
+        var configurationSection = shellConfiguration.GetSection("OrchardCore_Setup");
 
-        private string[] _supportedCultures =
-        [
-            "ar",
-            "cs",
-            "de",
-            "el",
-            "en",
-            "es",
-            "fa",
-            "fr",
-            "it",
-            "ja",
-            "pl",
-            "pt-BR",
-            "ru",
-            "sv",
-            "tr",
-            "vi",
-            "zh-CN",
-            "zh-TW",
-            "zh-Hans-CN",
-            "zh-Hant-TW"
-        ];
+        _defaultCulture = configurationSection["DefaultCulture"] ?? _defaultCulture;
+        _supportedCultures = configurationSection.GetSection("SupportedCultures").Get<List<string>>()?.ToArray() ?? _supportedCultures;
+    }
 
-        public Startup(IShellConfiguration shellConfiguration)
-        {
-            var configurationSection = shellConfiguration.GetSection("OrchardCore_Setup");
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddPortableObjectLocalization(options => options.ResourcesPath = "Localization");
+        services.Replace(ServiceDescriptor.Singleton<ILocalizationFileLocationProvider, ModularPoFileLocationProvider>());
 
-            _defaultCulture = configurationSection["DefaultCulture"] ?? _defaultCulture;
-            _supportedCultures = configurationSection.GetSection("SupportedCultures").Get<List<string>>()?.ToArray() ?? _supportedCultures;
-        }
+        services.AddSetup();
 
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<IdentityOptions>(options =>
         {
-            services.AddPortableObjectLocalization(options => options.ResourcesPath = "Localization");
-            services.Replace(ServiceDescriptor.Singleton<ILocalizationFileLocationProvider, ModularPoFileLocationProvider>());
+            options.User.AllowedUserNameCharacters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._+";
+            options.User.RequireUniqueEmail = true;
+        });
+    }
 
-            services.AddSetup();
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        var localizationOptions = serviceProvider.GetService<IOptions<RequestLocalizationOptions>>().Value;
+        var cultureOptions = serviceProvider.GetService<IOptions<CultureOptions>>().Value;
 
-            services.Configure<IdentityOptions>(options =>
-            {
-                options.User.AllowedUserNameCharacters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._+";
-                options.User.RequireUniqueEmail = true;
-            });
-        }
+        localizationOptions.CultureInfoUseUserOverride = !cultureOptions.IgnoreSystemSettings;
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+        if (!string.IsNullOrEmpty(_defaultCulture))
         {
-            var localizationOptions = serviceProvider.GetService<IOptions<RequestLocalizationOptions>>().Value;
-            var cultureOptions = serviceProvider.GetService<IOptions<CultureOptions>>().Value;
-
-            localizationOptions.CultureInfoUseUserOverride = !cultureOptions.IgnoreSystemSettings;
-
-            if (!string.IsNullOrEmpty(_defaultCulture))
-            {
-                localizationOptions.SetDefaultCulture(_defaultCulture);
+            localizationOptions.SetDefaultCulture(_defaultCulture);
 
-                _supportedCultures = _supportedCultures.Union(new[] { _defaultCulture }).ToArray();
-            }
+            _supportedCultures = _supportedCultures.Union(new[] { _defaultCulture }).ToArray();
+        }
 
-            if (_supportedCultures?.Length > 0)
-            {
-                localizationOptions
-                    .AddSupportedCultures(_supportedCultures)
-                    .AddSupportedUICultures(_supportedCultures);
-            }
+        if (_supportedCultures?.Length > 0)
+        {
+            localizationOptions
+                .AddSupportedCultures(_supportedCultures)
+                .AddSupportedUICultures(_supportedCultures);
+        }
 
-            app.UseRequestLocalization(localizationOptions);
+        app.UseRequestLocalization(localizationOptions);
 
-            routes.MapAreaControllerRoute(
-                name: "Setup",
-                areaName: "OrchardCore.Setup",
-                pattern: "",
-                defaults: new { controller = "Setup", action = "Index" }
-            );
-        }
+        routes.MapAreaControllerRoute(
+            name: "Setup",
+            areaName: "OrchardCore.Setup",
+            pattern: "",
+            defaults: new { controller = "Setup", action = "Index" }
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Setup/ViewModels/SetupViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Setup/ViewModels/SetupViewModel.cs
index d872a88bcf4..94e26b2b46c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Setup/ViewModels/SetupViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Setup/ViewModels/SetupViewModel.cs
@@ -4,54 +4,53 @@
 using OrchardCore.Data;
 using OrchardCore.Recipes.Models;
 
-namespace OrchardCore.Setup.ViewModels
+namespace OrchardCore.Setup.ViewModels;
+
+public class SetupViewModel
 {
-    public class SetupViewModel
-    {
-        [Required]
-        [StringLength(70)]
-        public string SiteName { get; set; }
+    [Required]
+    [StringLength(70)]
+    public string SiteName { get; set; }
 
-        public string Description { get; set; }
+    public string Description { get; set; }
 
-        public string DatabaseProvider { get; set; }
+    public string DatabaseProvider { get; set; }
 
-        public string ConnectionString { get; set; }
+    public string ConnectionString { get; set; }
 
-        public string TablePrefix { get; set; }
+    public string TablePrefix { get; set; }
 
-        public string Schema { get; set; }
+    public string Schema { get; set; }
 
-        /// <summary>
-        /// True if the database configuration is preset and can't be changed or displayed on the Setup screen.
-        /// </summary>
-        [BindNever]
-        public bool DatabaseConfigurationPreset { get; set; }
+    /// <summary>
+    /// True if the database configuration is preset and can't be changed or displayed on the Setup screen.
+    /// </summary>
+    [BindNever]
+    public bool DatabaseConfigurationPreset { get; set; }
 
-        [Required]
-        public string UserName { get; set; }
+    [Required]
+    public string UserName { get; set; }
 
-        [Required]
-        public string Email { get; set; }
+    [Required]
+    public string Email { get; set; }
 
-        [DataType(DataType.Password)]
-        public string Password { get; set; }
+    [DataType(DataType.Password)]
+    public string Password { get; set; }
 
-        [DataType(DataType.Password)]
-        public string PasswordConfirmation { get; set; }
+    [DataType(DataType.Password)]
+    public string PasswordConfirmation { get; set; }
 
-        [BindNever]
-        public IEnumerable<DatabaseProvider> DatabaseProviders { get; set; } = [];
+    [BindNever]
+    public IEnumerable<DatabaseProvider> DatabaseProviders { get; set; } = [];
 
-        [BindNever]
-        public IEnumerable<RecipeDescriptor> Recipes { get; set; }
+    [BindNever]
+    public IEnumerable<RecipeDescriptor> Recipes { get; set; }
 
-        public bool RecipeNamePreset { get; set; }
+    public bool RecipeNamePreset { get; set; }
 
-        public string RecipeName { get; set; }
+    public string RecipeName { get; set; }
 
-        public string SiteTimeZone { get; set; }
+    public string SiteTimeZone { get; set; }
 
-        public string Secret { get; set; }
-    }
+    public string Secret { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/AdminMenu.cs
index 4258ca7c78c..0c1a5c6dc04 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/AdminMenu.cs
@@ -2,34 +2,33 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Shortcodes
+namespace OrchardCore.Shortcodes;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    internal readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Design"], design => design
-                    .Add(S["Shortcodes"], S["Shortcodes"].PrefixPosition(), import => import
-                        .Action("Index", "Admin", "OrchardCore.Shortcodes")
-                        .Permission(Permissions.ManageShortcodeTemplates)
-                        .LocalNav()
-                    )
-                );
+        builder
+            .Add(S["Design"], design => design
+                .Add(S["Shortcodes"], S["Shortcodes"].PrefixPosition(), import => import
+                    .Action("Index", "Admin", "OrchardCore.Shortcodes")
+                    .Permission(Permissions.ManageShortcodeTemplates)
+                    .LocalNav()
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Controllers/AdminController.cs
index 4024dc02aa9..c8be761bebe 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Controllers/AdminController.cs
@@ -23,336 +23,335 @@
 using OrchardCore.Shortcodes.ViewModels;
 using Parlot;
 
-namespace OrchardCore.Shortcodes.Controllers
+namespace OrchardCore.Shortcodes.Controllers;
+
+[Feature("OrchardCore.Shortcodes.Templates")]
+public class AdminController : Controller
 {
-    [Feature("OrchardCore.Shortcodes.Templates")]
-    public class AdminController : Controller
+    private const string _optionsSearch = "Options.Search";
+
+    private readonly IAuthorizationService _authorizationService;
+    private readonly ShortcodeTemplatesManager _shortcodeTemplatesManager;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly PagerOptions _pagerOptions;
+    private readonly INotifier _notifier;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly IHtmlSanitizerService _htmlSanitizerService;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public AdminController(
+        IAuthorizationService authorizationService,
+        ShortcodeTemplatesManager shortcodeTemplatesManager,
+        ILiquidTemplateManager liquidTemplateManager,
+        IOptions<PagerOptions> pagerOptions,
+        INotifier notifier,
+        IShapeFactory shapeFactory,
+        IStringLocalizer<AdminController> stringLocalizer,
+        IHtmlLocalizer<AdminController> htmlLocalizer,
+        IHtmlSanitizerService htmlSanitizerService
+        )
     {
-        private const string _optionsSearch = "Options.Search";
-
-        private readonly IAuthorizationService _authorizationService;
-        private readonly ShortcodeTemplatesManager _shortcodeTemplatesManager;
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly PagerOptions _pagerOptions;
-        private readonly INotifier _notifier;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly IHtmlSanitizerService _htmlSanitizerService;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public AdminController(
-            IAuthorizationService authorizationService,
-            ShortcodeTemplatesManager shortcodeTemplatesManager,
-            ILiquidTemplateManager liquidTemplateManager,
-            IOptions<PagerOptions> pagerOptions,
-            INotifier notifier,
-            IShapeFactory shapeFactory,
-            IStringLocalizer<AdminController> stringLocalizer,
-            IHtmlLocalizer<AdminController> htmlLocalizer,
-            IHtmlSanitizerService htmlSanitizerService
-            )
+        _authorizationService = authorizationService;
+        _shortcodeTemplatesManager = shortcodeTemplatesManager;
+        _liquidTemplateManager = liquidTemplateManager;
+        _pagerOptions = pagerOptions.Value;
+        _notifier = notifier;
+        _shapeFactory = shapeFactory;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+        _htmlSanitizerService = htmlSanitizerService;
+    }
+
+    [Admin("Shortcodes", "Shortcodes.Index")]
+    public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageShortcodeTemplates))
         {
-            _authorizationService = authorizationService;
-            _shortcodeTemplatesManager = shortcodeTemplatesManager;
-            _liquidTemplateManager = liquidTemplateManager;
-            _pagerOptions = pagerOptions.Value;
-            _notifier = notifier;
-            _shapeFactory = shapeFactory;
-            S = stringLocalizer;
-            H = htmlLocalizer;
-            _htmlSanitizerService = htmlSanitizerService;
+            return Forbid();
         }
 
-        [Admin("Shortcodes", "Shortcodes.Index")]
-        public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageShortcodeTemplates))
-            {
-                return Forbid();
-            }
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+        var shortcodeTemplatesDocument = await _shortcodeTemplatesManager.GetShortcodeTemplatesDocumentAsync();
 
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
-            var shortcodeTemplatesDocument = await _shortcodeTemplatesManager.GetShortcodeTemplatesDocumentAsync();
+        var shortcodeTemplates = shortcodeTemplatesDocument.ShortcodeTemplates.ToList();
 
-            var shortcodeTemplates = shortcodeTemplatesDocument.ShortcodeTemplates.ToList();
+        if (!string.IsNullOrWhiteSpace(options.Search))
+        {
+            shortcodeTemplates = shortcodeTemplates.Where(x => x.Key.Contains(options.Search, StringComparison.OrdinalIgnoreCase)).ToList();
+        }
 
-            if (!string.IsNullOrWhiteSpace(options.Search))
-            {
-                shortcodeTemplates = shortcodeTemplates.Where(x => x.Key.Contains(options.Search, StringComparison.OrdinalIgnoreCase)).ToList();
-            }
+        var count = shortcodeTemplates.Count;
 
-            var count = shortcodeTemplates.Count;
+        shortcodeTemplates = shortcodeTemplates.OrderBy(x => x.Key)
+            .Skip(pager.GetStartIndex())
+            .Take(pager.PageSize).ToList();
 
-            shortcodeTemplates = shortcodeTemplates.OrderBy(x => x.Key)
-                .Skip(pager.GetStartIndex())
-                .Take(pager.PageSize).ToList();
+        // Maintain previous route data when generating page links.
+        var routeData = new RouteData();
 
-            // Maintain previous route data when generating page links.
-            var routeData = new RouteData();
+        if (!string.IsNullOrEmpty(options.Search))
+        {
+            routeData.Values.TryAdd(_optionsSearch, options.Search);
+        }
 
-            if (!string.IsNullOrEmpty(options.Search))
-            {
-                routeData.Values.TryAdd(_optionsSearch, options.Search);
-            }
+        var pagerShape = await _shapeFactory.PagerAsync(pager, count, routeData);
 
-            var pagerShape = await _shapeFactory.PagerAsync(pager, count, routeData);
+        var model = new ShortcodeTemplateIndexViewModel
+        {
+            ShortcodeTemplates = shortcodeTemplates.Select(x => new ShortcodeTemplateEntry { Name = x.Key, ShortcodeTemplate = x.Value }).ToList(),
+            Options = options,
+            Pager = pagerShape
+        };
 
-            var model = new ShortcodeTemplateIndexViewModel
-            {
-                ShortcodeTemplates = shortcodeTemplates.Select(x => new ShortcodeTemplateEntry { Name = x.Key, ShortcodeTemplate = x.Value }).ToList(),
-                Options = options,
-                Pager = pagerShape
-            };
+        model.Options.ContentsBulkAction =
+        [
+            new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+        ];
 
-            model.Options.ContentsBulkAction =
-            [
-                new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
-            ];
+        return View(model);
+    }
+
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.Filter")]
+    public ActionResult IndexFilterPOST(ShortcodeTemplateIndexViewModel model)
+        => RedirectToAction(nameof(Index), new RouteValueDictionary
+        {
+            { _optionsSearch, model.Options.Search }
+        });
 
-            return View(model);
+    [Admin("Shortcodes/Create", "Shortcodes.Create")]
+    public async Task<IActionResult> Create()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageShortcodeTemplates))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.Filter")]
-        public ActionResult IndexFilterPOST(ShortcodeTemplateIndexViewModel model)
-            => RedirectToAction(nameof(Index), new RouteValueDictionary
-            {
-                { _optionsSearch, model.Options.Search }
-            });
+        return View(new ShortcodeTemplateViewModel());
+    }
 
-        [Admin("Shortcodes/Create", "Shortcodes.Create")]
-        public async Task<IActionResult> Create()
+    [HttpPost, ActionName(nameof(Create))]
+    public async Task<IActionResult> CreatePost(ShortcodeTemplateViewModel model, string submit)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageShortcodeTemplates))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageShortcodeTemplates))
-            {
-                return Forbid();
-            }
-
-            return View(new ShortcodeTemplateViewModel());
+            return Forbid();
         }
 
-        [HttpPost, ActionName(nameof(Create))]
-        public async Task<IActionResult> CreatePost(ShortcodeTemplateViewModel model, string submit)
+        if (ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageShortcodeTemplates))
+            if (string.IsNullOrWhiteSpace(model.Name))
             {
-                return Forbid();
+                ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Name), S["The name is mandatory."]);
             }
-
-            if (ModelState.IsValid)
+            else if (!IsValidShortcodeName(model.Name))
             {
-                if (string.IsNullOrWhiteSpace(model.Name))
-                {
-                    ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Name), S["The name is mandatory."]);
-                }
-                else if (!IsValidShortcodeName(model.Name))
-                {
-                    ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Name), S["The name contains invalid characters."]);
-                }
-                else
-                {
-                    var shortcodeTemplatesDocument = await _shortcodeTemplatesManager.GetShortcodeTemplatesDocumentAsync();
-
-                    if (shortcodeTemplatesDocument.ShortcodeTemplates.ContainsKey(model.Name))
-                    {
-                        ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Name), S["A template with the same name already exists."]);
-                    }
-                }
+                ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Name), S["The name contains invalid characters."]);
+            }
+            else
+            {
+                var shortcodeTemplatesDocument = await _shortcodeTemplatesManager.GetShortcodeTemplatesDocumentAsync();
 
-                if (string.IsNullOrEmpty(model.Content))
-                {
-                    ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template content is mandatory."]);
-                }
-                else if (!_liquidTemplateManager.Validate(model.Content, out var errors))
+                if (shortcodeTemplatesDocument.ShortcodeTemplates.ContainsKey(model.Name))
                 {
-                    ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+                    ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Name), S["A template with the same name already exists."]);
                 }
             }
 
-            if (ModelState.IsValid)
+            if (string.IsNullOrEmpty(model.Content))
             {
-                var template = new ShortcodeTemplate
-                {
-                    Content = model.Content,
-                    Hint = model.Hint,
-                    Usage = _htmlSanitizerService.Sanitize(model.Usage),
-                    DefaultValue = model.DefaultValue,
-                    Categories = JConvert.DeserializeObject<string[]>(model.SelectedCategories)
-                };
+                ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template content is mandatory."]);
+            }
+            else if (!_liquidTemplateManager.Validate(model.Content, out var errors))
+            {
+                ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+            }
+        }
 
-                await _shortcodeTemplatesManager.UpdateShortcodeTemplateAsync(model.Name, template);
+        if (ModelState.IsValid)
+        {
+            var template = new ShortcodeTemplate
+            {
+                Content = model.Content,
+                Hint = model.Hint,
+                Usage = _htmlSanitizerService.Sanitize(model.Usage),
+                DefaultValue = model.DefaultValue,
+                Categories = JConvert.DeserializeObject<string[]>(model.SelectedCategories)
+            };
 
-                if (submit == "SaveAndContinue")
-                {
-                    return RedirectToAction(nameof(Edit), new { name = model.Name });
-                }
+            await _shortcodeTemplatesManager.UpdateShortcodeTemplateAsync(model.Name, template);
 
-                return RedirectToAction(nameof(Index));
+            if (submit == "SaveAndContinue")
+            {
+                return RedirectToAction(nameof(Edit), new { name = model.Name });
             }
 
-            // If we got this far, something failed, redisplay form
-            return View(model);
+            return RedirectToAction(nameof(Index));
         }
 
-        [Admin("Shortcodes/Edit/{name}", "Shortcodes.Edit")]
-        public async Task<IActionResult> Edit(string name)
+        // If we got this far, something failed, redisplay form
+        return View(model);
+    }
+
+    [Admin("Shortcodes/Edit/{name}", "Shortcodes.Edit")]
+    public async Task<IActionResult> Edit(string name)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageShortcodeTemplates))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageShortcodeTemplates))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var shortcodeTemplatesDocument = await _shortcodeTemplatesManager.GetShortcodeTemplatesDocumentAsync();
+        var shortcodeTemplatesDocument = await _shortcodeTemplatesManager.GetShortcodeTemplatesDocumentAsync();
 
-            if (!shortcodeTemplatesDocument.ShortcodeTemplates.TryGetValue(name, out var template))
-            {
-                return RedirectToAction(nameof(Create), new { name });
-            }
+        if (!shortcodeTemplatesDocument.ShortcodeTemplates.TryGetValue(name, out var template))
+        {
+            return RedirectToAction(nameof(Create), new { name });
+        }
 
-            var model = new ShortcodeTemplateViewModel
-            {
-                Name = name,
-                Content = template.Content,
-                Hint = template.Hint,
-                Usage = template.Usage,
-                DefaultValue = template.DefaultValue,
-                Categories = template.Categories
-            };
+        var model = new ShortcodeTemplateViewModel
+        {
+            Name = name,
+            Content = template.Content,
+            Hint = template.Hint,
+            Usage = template.Usage,
+            DefaultValue = template.DefaultValue,
+            Categories = template.Categories
+        };
+
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost]
+    public async Task<IActionResult> Edit(string sourceName, ShortcodeTemplateViewModel model, string submit)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageShortcodeTemplates))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Edit(string sourceName, ShortcodeTemplateViewModel model, string submit)
+        var shortcodeTemplatesDocument = await _shortcodeTemplatesManager.LoadShortcodeTemplatesDocumentAsync();
+
+        if (!shortcodeTemplatesDocument.ShortcodeTemplates.ContainsKey(sourceName))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageShortcodeTemplates))
+            return NotFound();
+        }
+
+        if (ModelState.IsValid)
+        {
+            if (string.IsNullOrWhiteSpace(model.Name))
             {
-                return Forbid();
+                ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Name), S["The name is mandatory."]);
             }
-
-            var shortcodeTemplatesDocument = await _shortcodeTemplatesManager.LoadShortcodeTemplatesDocumentAsync();
-
-            if (!shortcodeTemplatesDocument.ShortcodeTemplates.ContainsKey(sourceName))
+            else if (!IsValidShortcodeName(model.Name))
             {
-                return NotFound();
+                ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Name), S["The name contains invalid characters."]);
             }
-
-            if (ModelState.IsValid)
+            else if (!string.Equals(model.Name, sourceName, StringComparison.OrdinalIgnoreCase)
+                && shortcodeTemplatesDocument.ShortcodeTemplates.ContainsKey(model.Name))
             {
-                if (string.IsNullOrWhiteSpace(model.Name))
-                {
-                    ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Name), S["The name is mandatory."]);
-                }
-                else if (!IsValidShortcodeName(model.Name))
-                {
-                    ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Name), S["The name contains invalid characters."]);
-                }
-                else if (!string.Equals(model.Name, sourceName, StringComparison.OrdinalIgnoreCase)
-                    && shortcodeTemplatesDocument.ShortcodeTemplates.ContainsKey(model.Name))
-                {
-                    ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Name), S["A template with the same name already exists."]);
-                }
-
-                if (string.IsNullOrEmpty(model.Content))
-                {
-                    ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template content is mandatory."]);
-                }
-                else if (!_liquidTemplateManager.Validate(model.Content, out var errors))
-                {
-                    ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-                }
+                ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Name), S["A template with the same name already exists."]);
             }
 
-            if (ModelState.IsValid)
+            if (string.IsNullOrEmpty(model.Content))
             {
-                var template = new ShortcodeTemplate
-                {
-                    Content = model.Content,
-                    Hint = model.Hint,
-                    Usage = _htmlSanitizerService.Sanitize(model.Usage),
-                    DefaultValue = model.DefaultValue,
-                    Categories = JConvert.DeserializeObject<string[]>(model.SelectedCategories)
-                };
+                ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template content is mandatory."]);
+            }
+            else if (!_liquidTemplateManager.Validate(model.Content, out var errors))
+            {
+                ModelState.AddModelError(nameof(ShortcodeTemplateViewModel.Content), S["The template doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
+            }
+        }
 
-                await _shortcodeTemplatesManager.RemoveShortcodeTemplateAsync(sourceName);
+        if (ModelState.IsValid)
+        {
+            var template = new ShortcodeTemplate
+            {
+                Content = model.Content,
+                Hint = model.Hint,
+                Usage = _htmlSanitizerService.Sanitize(model.Usage),
+                DefaultValue = model.DefaultValue,
+                Categories = JConvert.DeserializeObject<string[]>(model.SelectedCategories)
+            };
 
-                await _shortcodeTemplatesManager.UpdateShortcodeTemplateAsync(model.Name, template);
+            await _shortcodeTemplatesManager.RemoveShortcodeTemplateAsync(sourceName);
 
-                if (submit == "SaveAndContinue")
-                {
-                    return RedirectToAction(nameof(Edit), new { name = model.Name });
-                }
+            await _shortcodeTemplatesManager.UpdateShortcodeTemplateAsync(model.Name, template);
 
-                return RedirectToAction(nameof(Index));
+            if (submit == "SaveAndContinue")
+            {
+                return RedirectToAction(nameof(Edit), new { name = model.Name });
             }
 
-            // If we got this far, something failed, redisplay form
+            return RedirectToAction(nameof(Index));
+        }
 
-            // If the name was changed or removed, prevent a 404 or a failure on the next post.
-            model.Name = sourceName;
+        // If we got this far, something failed, redisplay form
 
-            return View(model);
-        }
+        // If the name was changed or removed, prevent a 404 or a failure on the next post.
+        model.Name = sourceName;
+
+        return View(model);
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(string name)
+    [HttpPost]
+    public async Task<IActionResult> Delete(string name)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageShortcodeTemplates))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageShortcodeTemplates))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var shortcodeTemplatesDocument = await _shortcodeTemplatesManager.LoadShortcodeTemplatesDocumentAsync();
+        var shortcodeTemplatesDocument = await _shortcodeTemplatesManager.LoadShortcodeTemplatesDocumentAsync();
 
-            if (!shortcodeTemplatesDocument.ShortcodeTemplates.ContainsKey(name))
-            {
-                return NotFound();
-            }
+        if (!shortcodeTemplatesDocument.ShortcodeTemplates.ContainsKey(name))
+        {
+            return NotFound();
+        }
 
-            await _shortcodeTemplatesManager.RemoveShortcodeTemplateAsync(name);
+        await _shortcodeTemplatesManager.RemoveShortcodeTemplateAsync(name);
 
-            await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
+        await _notifier.SuccessAsync(H["Shortcode template deleted successfully."]);
 
-            return RedirectToAction(nameof(Index));
-        }
+        return RedirectToAction(nameof(Index));
+    }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<string> itemIds)
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<string> itemIds)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageShortcodeTemplates))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageShortcodeTemplates))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            if (itemIds?.Count() > 0)
+        if (itemIds?.Count() > 0)
+        {
+            var shortcodeTemplatesDocument = await _shortcodeTemplatesManager.LoadShortcodeTemplatesDocumentAsync();
+            var checkedContentItems = shortcodeTemplatesDocument.ShortcodeTemplates.Where(x => itemIds.Contains(x.Key));
+            switch (options.BulkAction)
             {
-                var shortcodeTemplatesDocument = await _shortcodeTemplatesManager.LoadShortcodeTemplatesDocumentAsync();
-                var checkedContentItems = shortcodeTemplatesDocument.ShortcodeTemplates.Where(x => itemIds.Contains(x.Key));
-                switch (options.BulkAction)
-                {
-                    case ContentsBulkAction.None:
-                        break;
-                    case ContentsBulkAction.Remove:
-                        foreach (var item in checkedContentItems)
-                        {
-                            await _shortcodeTemplatesManager.RemoveShortcodeTemplateAsync(item.Key);
-                        }
-                        await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException(options.BulkAction.ToString(), "Invalid bulk action.");
-                }
+                case ContentsBulkAction.None:
+                    break;
+                case ContentsBulkAction.Remove:
+                    foreach (var item in checkedContentItems)
+                    {
+                        await _shortcodeTemplatesManager.RemoveShortcodeTemplateAsync(item.Key);
+                    }
+                    await _notifier.SuccessAsync(H["Shortcode templates successfully removed."]);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(options.BulkAction.ToString(), "Invalid bulk action.");
             }
-
-            return RedirectToAction(nameof(Index));
         }
 
-        private static bool IsValidShortcodeName(string name)
-        {
-            var scanner = new Scanner(name);
-            return scanner.ReadIdentifier(out var result) && name.Length == result.Length;
-        }
+        return RedirectToAction(nameof(Index));
+    }
+
+    private static bool IsValidShortcodeName(string name)
+    {
+        var scanner = new Scanner(name);
+        return scanner.ReadIdentifier(out var result) && name.Length == result.Length;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Deployment/AllShortcodeTemplatesDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Deployment/AllShortcodeTemplatesDeploymentSource.cs
index 277093f5b0d..f79c8af83c9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Deployment/AllShortcodeTemplatesDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Deployment/AllShortcodeTemplatesDeploymentSource.cs
@@ -3,37 +3,36 @@
 using OrchardCore.Deployment;
 using OrchardCore.Shortcodes.Services;
 
-namespace OrchardCore.Shortcodes.Deployment
+namespace OrchardCore.Shortcodes.Deployment;
+
+public class AllShortcodeTemplatesDeploymentSource : IDeploymentSource
 {
-    public class AllShortcodeTemplatesDeploymentSource : IDeploymentSource
+    private readonly ShortcodeTemplatesManager _templatesManager;
+
+    public AllShortcodeTemplatesDeploymentSource(ShortcodeTemplatesManager templatesManager)
     {
-        private readonly ShortcodeTemplatesManager _templatesManager;
+        _templatesManager = templatesManager;
+    }
 
-        public AllShortcodeTemplatesDeploymentSource(ShortcodeTemplatesManager templatesManager)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        if (step is not AllShortcodeTemplatesDeploymentStep)
         {
-            _templatesManager = templatesManager;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
-        {
-            if (step is not AllShortcodeTemplatesDeploymentStep)
-            {
-                return;
-            }
-
-            var templateObjects = new JsonObject();
-            var templates = await _templatesManager.GetShortcodeTemplatesDocumentAsync();
-
-            foreach (var template in templates.ShortcodeTemplates)
-            {
-                templateObjects[template.Key] = JObject.FromObject(template.Value);
-            }
+        var templateObjects = new JsonObject();
+        var templates = await _templatesManager.GetShortcodeTemplatesDocumentAsync();
 
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "ShortcodeTemplates",
-                ["ShortcodeTemplates"] = templateObjects,
-            });
+        foreach (var template in templates.ShortcodeTemplates)
+        {
+            templateObjects[template.Key] = JObject.FromObject(template.Value);
         }
+
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "ShortcodeTemplates",
+            ["ShortcodeTemplates"] = templateObjects,
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Deployment/AllShortcodeTemplatesDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Deployment/AllShortcodeTemplatesDeploymentStep.cs
index e9683eec35b..ef3461ed2ce 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Deployment/AllShortcodeTemplatesDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Deployment/AllShortcodeTemplatesDeploymentStep.cs
@@ -1,12 +1,11 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Shortcodes.Deployment
+namespace OrchardCore.Shortcodes.Deployment;
+
+public class AllShortcodeTemplatesDeploymentStep : DeploymentStep
 {
-    public class AllShortcodeTemplatesDeploymentStep : DeploymentStep
+    public AllShortcodeTemplatesDeploymentStep()
     {
-        public AllShortcodeTemplatesDeploymentStep()
-        {
-            Name = "AllShortcodeTemplates";
-        }
+        Name = "AllShortcodeTemplates";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Deployment/AllShortcodeTemplatesDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Deployment/AllShortcodeTemplatesDeploymentStepDriver.cs
index 6f5315bd3d5..dc718f6a3b5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Deployment/AllShortcodeTemplatesDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Deployment/AllShortcodeTemplatesDeploymentStepDriver.cs
@@ -3,22 +3,21 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Shortcodes.Deployment
+namespace OrchardCore.Shortcodes.Deployment;
+
+public sealed class AllShortcodeTemplatesDeploymentStepDriver : DisplayDriver<DeploymentStep, AllShortcodeTemplatesDeploymentStep>
 {
-    public sealed class AllShortcodeTemplatesDeploymentStepDriver : DisplayDriver<DeploymentStep, AllShortcodeTemplatesDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(AllShortcodeTemplatesDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(AllShortcodeTemplatesDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("AllShortcodeTemplatesDeploymentStep_Summary", step).Location("Summary", "Content"),
-                    View("AllShortcodeTemplatesDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("AllShortcodeTemplatesDeploymentStep_Summary", step).Location("Summary", "Content"),
+                View("AllShortcodeTemplatesDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(AllShortcodeTemplatesDeploymentStep step, BuildEditorContext context)
-        {
-            return View("AllShortcodeTemplatesDeploymentStep_Edit", step).Location("Content");
-        }
+    public override IDisplayResult Edit(AllShortcodeTemplatesDeploymentStep step, BuildEditorContext context)
+    {
+        return View("AllShortcodeTemplatesDeploymentStep_Edit", step).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Drivers/ShortcodeDescriptorDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Drivers/ShortcodeDescriptorDisplayDriver.cs
index 5c7e45b364f..36db09e49fd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Drivers/ShortcodeDescriptorDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Drivers/ShortcodeDescriptorDisplayDriver.cs
@@ -2,16 +2,15 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Shortcodes.Drivers
+namespace OrchardCore.Shortcodes.Drivers;
+
+public sealed class ShortcodeDescriptorDisplayDriver : DisplayDriver<ShortcodeDescriptor>
 {
-    public sealed class ShortcodeDescriptorDisplayDriver : DisplayDriver<ShortcodeDescriptor>
+    public override Task<IDisplayResult> DisplayAsync(ShortcodeDescriptor descriptor, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(ShortcodeDescriptor descriptor, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                View("ShortcodeDescriptor_Fields_SummaryAdmin", descriptor).Location("SummaryAdmin", "Content"),
-                View("ShortcodeDescriptor_SummaryAdmin__Button__Actions", descriptor).Location("SummaryAdmin", "Actions")
-            );
-        }
+        return CombineAsync(
+            View("ShortcodeDescriptor_Fields_SummaryAdmin", descriptor).Location("SummaryAdmin", "Content"),
+            View("ShortcodeDescriptor_SummaryAdmin__Button__Actions", descriptor).Location("SummaryAdmin", "Actions")
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Models/ShortcodeTemplatesDocument.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Models/ShortcodeTemplatesDocument.cs
index 4265670120f..c03b55acecc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Models/ShortcodeTemplatesDocument.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Models/ShortcodeTemplatesDocument.cs
@@ -2,19 +2,18 @@
 using System.Collections.Generic;
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.Shortcodes.Models
+namespace OrchardCore.Shortcodes.Models;
+
+public class ShortcodeTemplatesDocument : Document
 {
-    public class ShortcodeTemplatesDocument : Document
-    {
-        public Dictionary<string, ShortcodeTemplate> ShortcodeTemplates { get; init; } = new Dictionary<string, ShortcodeTemplate>(StringComparer.OrdinalIgnoreCase);
-    }
+    public Dictionary<string, ShortcodeTemplate> ShortcodeTemplates { get; init; } = new Dictionary<string, ShortcodeTemplate>(StringComparer.OrdinalIgnoreCase);
+}
 
-    public class ShortcodeTemplate
-    {
-        public string Content { get; set; }
-        public string Hint { get; set; }
-        public string Usage { get; set; }
-        public string DefaultValue { get; set; }
-        public string[] Categories { get; set; } = [];
-    }
+public class ShortcodeTemplate
+{
+    public string Content { get; set; }
+    public string Hint { get; set; }
+    public string Usage { get; set; }
+    public string DefaultValue { get; set; }
+    public string[] Categories { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Providers/LocaleShortcodeProvider.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Providers/LocaleShortcodeProvider.cs
index bd3f3af1f4f..0613edbe4d4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Providers/LocaleShortcodeProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Providers/LocaleShortcodeProvider.cs
@@ -3,52 +3,51 @@
 using System.Threading.Tasks;
 using Shortcodes;
 
-namespace OrchardCore.Shortcodes.Providers
+namespace OrchardCore.Shortcodes.Providers;
+
+public class LocaleShortcodeProvider : IShortcodeProvider
 {
-    public class LocaleShortcodeProvider : IShortcodeProvider
-    {
-        public const string ShortCodeIdentifier = "locale";
+    public const string ShortCodeIdentifier = "locale";
 
-        private static ValueTask<string> Empty => new(string.Empty);
-        private static ValueTask<string> Null => new((string)null);
+    private static ValueTask<string> Empty => new(string.Empty);
+    private static ValueTask<string> Null => new((string)null);
 
-        public ValueTask<string> EvaluateAsync(string identifier, Arguments arguments, string content, Context context)
+    public ValueTask<string> EvaluateAsync(string identifier, Arguments arguments, string content, Context context)
+    {
+        if (identifier != ShortCodeIdentifier)
         {
-            if (identifier != ShortCodeIdentifier)
-            {
-                return Null;
-            }
+            return Null;
+        }
 
-            var language = arguments.NamedOrDefault("lang")?.ToLower();
-            var argFallback = arguments.NamedOrAt("fallback", 1);
+        var language = arguments.NamedOrDefault("lang")?.ToLower();
+        var argFallback = arguments.NamedOrAt("fallback", 1);
 
-            // Default value of true for the fallback argument.
-            var fallback = argFallback == null || Convert.ToBoolean(argFallback);
-            var currentCulture = CultureInfo.CurrentUICulture;
+        // Default value of true for the fallback argument.
+        var fallback = argFallback == null || Convert.ToBoolean(argFallback);
+        var currentCulture = CultureInfo.CurrentUICulture;
 
-            if (fallback)
-            {
-                // Fallback to parent culture, if the current culture is en-CA and the shortcode targets en, the html will be output.
-                do
-                {
-                    if (currentCulture.Name.Equals(language, StringComparison.OrdinalIgnoreCase))
-                    {
-                        return new ValueTask<string>(content);
-                    }
-
-                    currentCulture = currentCulture.Parent;
-                }
-                while (currentCulture != CultureInfo.InvariantCulture);
-            }
-            else
+        if (fallback)
+        {
+            // Fallback to parent culture, if the current culture is en-CA and the shortcode targets en, the html will be output.
+            do
             {
                 if (currentCulture.Name.Equals(language, StringComparison.OrdinalIgnoreCase))
                 {
                     return new ValueTask<string>(content);
                 }
-            }
 
-            return Empty;
+                currentCulture = currentCulture.Parent;
+            }
+            while (currentCulture != CultureInfo.InvariantCulture);
         }
+        else
+        {
+            if (currentCulture.Name.Equals(language, StringComparison.OrdinalIgnoreCase))
+            {
+                return new ValueTask<string>(content);
+            }
+        }
+
+        return Empty;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Recipes/ShortcodeTemplateStep.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Recipes/ShortcodeTemplateStep.cs
index e622011d772..0090fc955fa 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Recipes/ShortcodeTemplateStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Recipes/ShortcodeTemplateStep.cs
@@ -6,36 +6,35 @@
 using OrchardCore.Shortcodes.Models;
 using OrchardCore.Shortcodes.Services;
 
-namespace OrchardCore.Shortcodes.Recipes
+namespace OrchardCore.Shortcodes.Recipes;
+
+/// <summary>
+/// This recipe step creates a set of shortcodes.
+/// </summary>
+public sealed class ShortcodeTemplateStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step creates a set of shortcodes.
-    /// </summary>
-    public sealed class ShortcodeTemplateStep : IRecipeStepHandler
+    private readonly ShortcodeTemplatesManager _templatesManager;
+
+    public ShortcodeTemplateStep(ShortcodeTemplatesManager templatesManager)
     {
-        private readonly ShortcodeTemplatesManager _templatesManager;
+        _templatesManager = templatesManager;
+    }
 
-        public ShortcodeTemplateStep(ShortcodeTemplatesManager templatesManager)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "ShortcodeTemplates", StringComparison.OrdinalIgnoreCase))
         {
-            _templatesManager = templatesManager;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        if (context.Step.TryGetPropertyValue("ShortcodeTemplates", out var jsonNode) && jsonNode is JsonObject templates)
         {
-            if (!string.Equals(context.Name, "ShortcodeTemplates", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            if (context.Step.TryGetPropertyValue("ShortcodeTemplates", out var jsonNode) && jsonNode is JsonObject templates)
+            foreach (var property in templates)
             {
-                foreach (var property in templates)
-                {
-                    var name = property.Key;
-                    var value = property.Value.ToObject<ShortcodeTemplate>();
+                var name = property.Key;
+                var value = property.Value.ToObject<ShortcodeTemplate>();
 
-                    await _templatesManager.UpdateShortcodeTemplateAsync(name, value);
-                }
+                await _templatesManager.UpdateShortcodeTemplateAsync(name, value);
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/DefaultShortcodeContextProvider.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/DefaultShortcodeContextProvider.cs
index 390c84c9d77..96ff5a92cd7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/DefaultShortcodeContextProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/DefaultShortcodeContextProvider.cs
@@ -1,23 +1,22 @@
 using System;
 using Shortcodes;
 
-namespace OrchardCore.Shortcodes.Services
+namespace OrchardCore.Shortcodes.Services;
+
+/// <summary>
+/// Provides a default context to the shortcode processor.
+/// </summary>
+public class DefaultShortcodeContextProvider : IShortcodeContextProvider
 {
-    /// <summary>
-    /// Provides a default context to the shortcode processor.
-    /// </summary>
-    public class DefaultShortcodeContextProvider : IShortcodeContextProvider
-    {
-        private readonly IServiceProvider _serviceProvider;
+    private readonly IServiceProvider _serviceProvider;
 
-        public DefaultShortcodeContextProvider(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
+    public DefaultShortcodeContextProvider(IServiceProvider serviceProvider)
+    {
+        _serviceProvider = serviceProvider;
+    }
 
-        public void Contextualize(Context context)
-        {
-            context["ServiceProvider"] = _serviceProvider;
-        }
+    public void Contextualize(Context context)
+    {
+        context["ServiceProvider"] = _serviceProvider;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/OptionsShortcodeProvider.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/OptionsShortcodeProvider.cs
index 473681d6c2b..d518a1e9310 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/OptionsShortcodeProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/OptionsShortcodeProvider.cs
@@ -3,32 +3,31 @@
 using Microsoft.Extensions.Options;
 using Shortcodes;
 
-namespace OrchardCore.Shortcodes.Services
+namespace OrchardCore.Shortcodes.Services;
+
+public class OptionsShortcodeProvider : IShortcodeProvider
 {
-    public class OptionsShortcodeProvider : IShortcodeProvider
-    {
-        private static ValueTask<string> Null => new((string)null);
+    private static ValueTask<string> Null => new((string)null);
 
-        private readonly ShortcodeOptions _options;
+    private readonly ShortcodeOptions _options;
 
-        public OptionsShortcodeProvider(IOptions<ShortcodeOptions> options)
-        {
-            _options = options.Value;
-        }
+    public OptionsShortcodeProvider(IOptions<ShortcodeOptions> options)
+    {
+        _options = options.Value;
+    }
 
-        public ValueTask<string> EvaluateAsync(string identifier, Arguments arguments, string content, Context context)
+    public ValueTask<string> EvaluateAsync(string identifier, Arguments arguments, string content, Context context)
+    {
+        if (_options.ShortcodeDelegates.TryGetValue(identifier, out var shortcode))
         {
-            if (_options.ShortcodeDelegates.TryGetValue(identifier, out var shortcode))
+            if (shortcode == null)
             {
-                if (shortcode == null)
-                {
-                    return Null;
-                }
-
-                return shortcode.Invoke(arguments, content, context);
+                return Null;
             }
 
-            return Null;
+            return shortcode.Invoke(arguments, content, context);
         }
+
+        return Null;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeDescriptorManager.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeDescriptorManager.cs
index af46b281729..1364cb285f2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeDescriptorManager.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeDescriptorManager.cs
@@ -3,36 +3,35 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Shortcodes.Services
+namespace OrchardCore.Shortcodes.Services;
+
+public class ShortcodeDescriptorManager : IShortcodeDescriptorManager
 {
-    public class ShortcodeDescriptorManager : IShortcodeDescriptorManager
-    {
-        private readonly IEnumerable<IShortcodeDescriptorProvider> _shortcodeDescriptorProviders;
+    private readonly IEnumerable<IShortcodeDescriptorProvider> _shortcodeDescriptorProviders;
 
-        public ShortcodeDescriptorManager(IEnumerable<IShortcodeDescriptorProvider> shortcodeDescriptorProviders)
-        {
-            _shortcodeDescriptorProviders = shortcodeDescriptorProviders;
-        }
+    public ShortcodeDescriptorManager(IEnumerable<IShortcodeDescriptorProvider> shortcodeDescriptorProviders)
+    {
+        _shortcodeDescriptorProviders = shortcodeDescriptorProviders;
+    }
 
-        public async Task<IEnumerable<ShortcodeDescriptor>> GetShortcodeDescriptors()
-        {
-            var result = new Dictionary<string, ShortcodeDescriptor>(StringComparer.OrdinalIgnoreCase);
+    public async Task<IEnumerable<ShortcodeDescriptor>> GetShortcodeDescriptors()
+    {
+        var result = new Dictionary<string, ShortcodeDescriptor>(StringComparer.OrdinalIgnoreCase);
 
-            // During discover providers are reversed so that first registered wins.
-            // This allows the templates feature to override code based shortcodes.
-            var reversedShortcodeDescriptorProviders = _shortcodeDescriptorProviders.Reverse();
+        // During discover providers are reversed so that first registered wins.
+        // This allows the templates feature to override code based shortcodes.
+        var reversedShortcodeDescriptorProviders = _shortcodeDescriptorProviders.Reverse();
 
-            foreach (var provider in reversedShortcodeDescriptorProviders)
+        foreach (var provider in reversedShortcodeDescriptorProviders)
+        {
+            var descriptors = await provider.DiscoverAsync();
+            foreach (var descriptor in descriptors)
             {
-                var descriptors = await provider.DiscoverAsync();
-                foreach (var descriptor in descriptors)
-                {
-                    // Overwrite existing descriptors if they have been replaced.
-                    result[descriptor.Name] = descriptor;
-                }
+                // Overwrite existing descriptors if they have been replaced.
+                result[descriptor.Name] = descriptor;
             }
-
-            return result.Values;
         }
+
+        return result.Values;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeOptionsDescriptorProvider.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeOptionsDescriptorProvider.cs
index 33e99b44826..a71db07c424 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeOptionsDescriptorProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeOptionsDescriptorProvider.cs
@@ -3,26 +3,25 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Shortcodes.Services
-{
-    public class ShortcodeOptionsDescriptorProvider : IShortcodeDescriptorProvider
-    {
-        private readonly ShortcodeOptions _options;
+namespace OrchardCore.Shortcodes.Services;
 
-        public ShortcodeOptionsDescriptorProvider(IOptions<ShortcodeOptions> options)
-        {
-            _options = options.Value;
-        }
+public class ShortcodeOptionsDescriptorProvider : IShortcodeDescriptorProvider
+{
+    private readonly ShortcodeOptions _options;
 
-        public Task<IEnumerable<ShortcodeDescriptor>> DiscoverAsync() =>
-            Task.FromResult(_options.Shortcodes.Values.Select(option =>
-                new ShortcodeDescriptor
-                {
-                    Name = option.Name,
-                    DefaultValue = option.DefaultValue,
-                    Usage = option.Usage,
-                    Hint = option.Hint,
-                    Categories = option.Categories
-                }));
+    public ShortcodeOptionsDescriptorProvider(IOptions<ShortcodeOptions> options)
+    {
+        _options = options.Value;
     }
+
+    public Task<IEnumerable<ShortcodeDescriptor>> DiscoverAsync() =>
+        Task.FromResult(_options.Shortcodes.Values.Select(option =>
+            new ShortcodeDescriptor
+            {
+                Name = option.Name,
+                DefaultValue = option.DefaultValue,
+                Usage = option.Usage,
+                Hint = option.Hint,
+                Categories = option.Categories
+            }));
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeService.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeService.cs
index d7e021ea3bd..2ede20777b7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeService.cs
@@ -2,31 +2,30 @@
 using System.Threading.Tasks;
 using Shortcodes;
 
-namespace OrchardCore.Shortcodes.Services
+namespace OrchardCore.Shortcodes.Services;
+
+public class ShortcodeService : IShortcodeService
 {
-    public class ShortcodeService : IShortcodeService
+    private readonly IEnumerable<IShortcodeContextProvider> _shortcodeContextProviders;
+    private readonly ShortcodesProcessor _shortcodesProcessor;
+
+    public ShortcodeService(
+        IEnumerable<IShortcodeProvider> shortcodeProviders,
+        IEnumerable<IShortcodeContextProvider> shortcodeContextProviders)
     {
-        private readonly IEnumerable<IShortcodeContextProvider> _shortcodeContextProviders;
-        private readonly ShortcodesProcessor _shortcodesProcessor;
+        _shortcodesProcessor = new ShortcodesProcessor(shortcodeProviders);
+        _shortcodeContextProviders = shortcodeContextProviders;
+    }
 
-        public ShortcodeService(
-            IEnumerable<IShortcodeProvider> shortcodeProviders,
-            IEnumerable<IShortcodeContextProvider> shortcodeContextProviders)
-        {
-            _shortcodesProcessor = new ShortcodesProcessor(shortcodeProviders);
-            _shortcodeContextProviders = shortcodeContextProviders;
-        }
+    public ValueTask<string> ProcessAsync(string input, Context context = null)
+    {
+        context ??= new Context();
 
-        public ValueTask<string> ProcessAsync(string input, Context context = null)
+        foreach (var contextProvider in _shortcodeContextProviders)
         {
-            context ??= new Context();
-
-            foreach (var contextProvider in _shortcodeContextProviders)
-            {
-                contextProvider.Contextualize(context);
-            }
-
-            return _shortcodesProcessor.EvaluateAsync(input, context);
+            contextProvider.Contextualize(context);
         }
+
+        return _shortcodesProcessor.EvaluateAsync(input, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeTemplatesDescriptorProvider.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeTemplatesDescriptorProvider.cs
index 782edc62a19..d1e71f470b1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeTemplatesDescriptorProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeTemplatesDescriptorProvider.cs
@@ -2,30 +2,29 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Shortcodes.Services
+namespace OrchardCore.Shortcodes.Services;
+
+public class ShortcodeTemplatesDescriptorProvider : IShortcodeDescriptorProvider
 {
-    public class ShortcodeTemplatesDescriptorProvider : IShortcodeDescriptorProvider
-    {
-        private readonly ShortcodeTemplatesManager _shortcodeTemplatesManager;
+    private readonly ShortcodeTemplatesManager _shortcodeTemplatesManager;
 
-        public ShortcodeTemplatesDescriptorProvider(ShortcodeTemplatesManager shortcodeTemplatesManager)
-        {
-            _shortcodeTemplatesManager = shortcodeTemplatesManager;
-        }
+    public ShortcodeTemplatesDescriptorProvider(ShortcodeTemplatesManager shortcodeTemplatesManager)
+    {
+        _shortcodeTemplatesManager = shortcodeTemplatesManager;
+    }
 
-        public async Task<IEnumerable<ShortcodeDescriptor>> DiscoverAsync()
-        {
-            var document = await _shortcodeTemplatesManager.GetShortcodeTemplatesDocumentAsync();
+    public async Task<IEnumerable<ShortcodeDescriptor>> DiscoverAsync()
+    {
+        var document = await _shortcodeTemplatesManager.GetShortcodeTemplatesDocumentAsync();
 
-            return document.ShortcodeTemplates.Select(kvp =>
-                new ShortcodeDescriptor
-                {
-                    Name = kvp.Key,
-                    Hint = kvp.Value.Hint,
-                    DefaultValue = kvp.Value.DefaultValue,
-                    Usage = kvp.Value.Usage,
-                    Categories = kvp.Value.Categories
-                });
-        }
+        return document.ShortcodeTemplates.Select(kvp =>
+            new ShortcodeDescriptor
+            {
+                Name = kvp.Key,
+                Hint = kvp.Value.Hint,
+                DefaultValue = kvp.Value.DefaultValue,
+                Usage = kvp.Value.Usage,
+                Categories = kvp.Value.Categories
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeTemplatesManager.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeTemplatesManager.cs
index d95d6d459e9..75fc30ad6af 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeTemplatesManager.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/ShortcodeTemplatesManager.cs
@@ -2,36 +2,35 @@
 using OrchardCore.Documents;
 using OrchardCore.Shortcodes.Models;
 
-namespace OrchardCore.Shortcodes.Services
+namespace OrchardCore.Shortcodes.Services;
+
+public class ShortcodeTemplatesManager
 {
-    public class ShortcodeTemplatesManager
-    {
-        private readonly IDocumentManager<ShortcodeTemplatesDocument> _documentManager;
+    private readonly IDocumentManager<ShortcodeTemplatesDocument> _documentManager;
 
-        public ShortcodeTemplatesManager(IDocumentManager<ShortcodeTemplatesDocument> documentManager) => _documentManager = documentManager;
+    public ShortcodeTemplatesManager(IDocumentManager<ShortcodeTemplatesDocument> documentManager) => _documentManager = documentManager;
 
-        /// <summary>
-        /// Loads the shortcode templates document from the store for updating and that should not be cached.
-        /// </summary>
-        public Task<ShortcodeTemplatesDocument> LoadShortcodeTemplatesDocumentAsync() => _documentManager.GetOrCreateMutableAsync();
+    /// <summary>
+    /// Loads the shortcode templates document from the store for updating and that should not be cached.
+    /// </summary>
+    public Task<ShortcodeTemplatesDocument> LoadShortcodeTemplatesDocumentAsync() => _documentManager.GetOrCreateMutableAsync();
 
-        /// <summary>
-        /// Gets the shortcode templates document from the cache for sharing and that should not be updated.
-        /// </summary>
-        public Task<ShortcodeTemplatesDocument> GetShortcodeTemplatesDocumentAsync() => _documentManager.GetOrCreateImmutableAsync();
+    /// <summary>
+    /// Gets the shortcode templates document from the cache for sharing and that should not be updated.
+    /// </summary>
+    public Task<ShortcodeTemplatesDocument> GetShortcodeTemplatesDocumentAsync() => _documentManager.GetOrCreateImmutableAsync();
 
-        public async Task RemoveShortcodeTemplateAsync(string name)
-        {
-            var document = await LoadShortcodeTemplatesDocumentAsync();
-            document.ShortcodeTemplates.Remove(name);
-            await _documentManager.UpdateAsync(document);
-        }
+    public async Task RemoveShortcodeTemplateAsync(string name)
+    {
+        var document = await LoadShortcodeTemplatesDocumentAsync();
+        document.ShortcodeTemplates.Remove(name);
+        await _documentManager.UpdateAsync(document);
+    }
 
-        public async Task UpdateShortcodeTemplateAsync(string name, ShortcodeTemplate template)
-        {
-            var document = await LoadShortcodeTemplatesDocumentAsync();
-            document.ShortcodeTemplates[name.ToLower()] = template;
-            await _documentManager.UpdateAsync(document);
-        }
+    public async Task UpdateShortcodeTemplateAsync(string name, ShortcodeTemplate template)
+    {
+        var document = await LoadShortcodeTemplatesDocumentAsync();
+        document.ShortcodeTemplates[name.ToLower()] = template;
+        await _documentManager.UpdateAsync(document);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/TemplateShortcodeProvider.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/TemplateShortcodeProvider.cs
index 61462f10414..38683dee25b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/TemplateShortcodeProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Services/TemplateShortcodeProvider.cs
@@ -7,69 +7,68 @@
 using OrchardCore.Shortcodes.ViewModels;
 using Shortcodes;
 
-namespace OrchardCore.Shortcodes.Services
+namespace OrchardCore.Shortcodes.Services;
+
+public class TemplateShortcodeProvider : IShortcodeProvider
 {
-    public class TemplateShortcodeProvider : IShortcodeProvider
-    {
-        private readonly ShortcodeTemplatesManager _shortcodeTemplatesManager;
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly HtmlEncoder _htmlEncoder;
+    private readonly ShortcodeTemplatesManager _shortcodeTemplatesManager;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly HtmlEncoder _htmlEncoder;
 
-        private ShortcodeTemplatesDocument _shortcodeTemplatesDocument;
-        private readonly HashSet<string> _identifiers = [];
+    private ShortcodeTemplatesDocument _shortcodeTemplatesDocument;
+    private readonly HashSet<string> _identifiers = [];
+
+    public TemplateShortcodeProvider(
+        ShortcodeTemplatesManager shortcodeTemplatesManager,
+        ILiquidTemplateManager liquidTemplateManager,
+        HtmlEncoder htmlEncoder)
+    {
+        _shortcodeTemplatesManager = shortcodeTemplatesManager;
+        _liquidTemplateManager = liquidTemplateManager;
+        _htmlEncoder = htmlEncoder;
+    }
 
-        public TemplateShortcodeProvider(
-            ShortcodeTemplatesManager shortcodeTemplatesManager,
-            ILiquidTemplateManager liquidTemplateManager,
-            HtmlEncoder htmlEncoder)
+    public async ValueTask<string> EvaluateAsync(string identifier, Arguments arguments, string content, Context context)
+    {
+        _shortcodeTemplatesDocument ??= await _shortcodeTemplatesManager.GetShortcodeTemplatesDocumentAsync();
+        if (!_shortcodeTemplatesDocument.ShortcodeTemplates.TryGetValue(identifier, out var template))
         {
-            _shortcodeTemplatesManager = shortcodeTemplatesManager;
-            _liquidTemplateManager = liquidTemplateManager;
-            _htmlEncoder = htmlEncoder;
+            return null;
         }
 
-        public async ValueTask<string> EvaluateAsync(string identifier, Arguments arguments, string content, Context context)
+        // Check if a shortcode template is recursively called.
+        if (!_identifiers.Add(identifier))
         {
-            _shortcodeTemplatesDocument ??= await _shortcodeTemplatesManager.GetShortcodeTemplatesDocumentAsync();
-            if (!_shortcodeTemplatesDocument.ShortcodeTemplates.TryGetValue(identifier, out var template))
-            {
-                return null;
-            }
-
-            // Check if a shortcode template is recursively called.
-            if (!_identifiers.Add(identifier))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var model = new ShortcodeViewModel
-            {
-                Args = arguments,
-                Content = content,
-                Context = context,
-            };
+        var model = new ShortcodeViewModel
+        {
+            Args = arguments,
+            Content = content,
+            Context = context,
+        };
 
-            var parameters = new Dictionary<string, FluidValue>
-            {
-                [identifier] = new StringValue(""),
-                ["Args"] = new ObjectValue(model.Args),
-                ["Content"] = new ObjectValue(new Content(model.Content)),
-                ["Context"] = new ObjectValue(model.Context)
-            };
+        var parameters = new Dictionary<string, FluidValue>
+        {
+            [identifier] = new StringValue(""),
+            ["Args"] = new ObjectValue(model.Args),
+            ["Content"] = new ObjectValue(new Content(model.Content)),
+            ["Context"] = new ObjectValue(model.Context)
+        };
 
-            var result = await _liquidTemplateManager.RenderStringAsync(template.Content, _htmlEncoder, model, parameters);
+        var result = await _liquidTemplateManager.RenderStringAsync(template.Content, _htmlEncoder, model, parameters);
 
-            // Allow multiple serial calls of this shortcode template.
-            _identifiers.Remove(identifier);
+        // Allow multiple serial calls of this shortcode template.
+        _identifiers.Remove(identifier);
 
-            return result;
-        }
+        return result;
+    }
 
-        internal sealed class Content : LiquidContentAccessor
-        {
-            public readonly string _content;
-            public Content(string content) => _content = content;
-            public override string ToString() => _content;
-        }
+    internal sealed class Content : LiquidContentAccessor
+    {
+        public readonly string _content;
+        public Content(string content) => _content = content;
+        public override string ToString() => _content;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Startup.cs
index 24cbedf8f08..8c9b473fd0b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Startup.cs
@@ -15,73 +15,73 @@
 using OrchardCore.Shortcodes.ViewModels;
 using Sc = Shortcodes;
 
-namespace OrchardCore.Shortcodes
+namespace OrchardCore.Shortcodes;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<ShortcodeViewModel>();
+            o.MemberAccessStrategy.Register<ShortcodeViewModel>();
 
-                o.MemberAccessStrategy.Register<Sc.Context, object>((obj, name) => obj[name]);
+            o.MemberAccessStrategy.Register<Sc.Context, object>((obj, name) => obj[name]);
 
-                o.ValueConverters.Add(x =>
+            o.ValueConverters.Add(x =>
+            {
+                return x switch
                 {
-                    return x switch
-                    {
-                        // Prevent Context from being converted to an ArrayValue as it implements IEnumerable
-                        Sc.Context c => new ObjectValue(c),
-                        // Prevent Arguments from being converted to an ArrayValue as it implements IEnumerable
-                        Sc.Arguments a => new ObjectValue(a),
-                        _ => null
-                    };
-                });
-
-                o.MemberAccessStrategy.Register<Sc.Arguments, object>((obj, name) => obj.Named(name));
+                    // Prevent Context from being converted to an ArrayValue as it implements IEnumerable
+                    Sc.Context c => new ObjectValue(c),
+                    // Prevent Arguments from being converted to an ArrayValue as it implements IEnumerable
+                    Sc.Arguments a => new ObjectValue(a),
+                    _ => null
+                };
             });
 
-            services.AddScoped<IShortcodeService, ShortcodeService>();
-            services.AddScoped<IShortcodeDescriptorManager, ShortcodeDescriptorManager>();
-            services.AddScoped<IShortcodeDescriptorProvider, ShortcodeOptionsDescriptorProvider>();
-            services.AddScoped<IShortcodeContextProvider, DefaultShortcodeContextProvider>();
+            o.MemberAccessStrategy.Register<Sc.Arguments, object>((obj, name) => obj.Named(name));
+        });
+
+        services.AddScoped<IShortcodeService, ShortcodeService>();
+        services.AddScoped<IShortcodeDescriptorManager, ShortcodeDescriptorManager>();
+        services.AddScoped<IShortcodeDescriptorProvider, ShortcodeOptionsDescriptorProvider>();
+        services.AddScoped<IShortcodeContextProvider, DefaultShortcodeContextProvider>();
 
-            services.AddOptions<ShortcodeOptions>();
-            services.AddScoped<Sc.IShortcodeProvider, OptionsShortcodeProvider>();
-            services.AddScoped<IDisplayDriver<ShortcodeDescriptor>, ShortcodeDescriptorDisplayDriver>();
-        }
+        services.AddOptions<ShortcodeOptions>();
+        services.AddScoped<Sc.IShortcodeProvider, OptionsShortcodeProvider>();
+        services.AddScoped<IDisplayDriver<ShortcodeDescriptor>, ShortcodeDescriptorDisplayDriver>();
     }
+}
 
-    [Feature("OrchardCore.Shortcodes.Templates")]
-    public sealed class ShortcodeTemplatesStartup : StartupBase
-    {
-        // Register this first so the templates provide overrides for any code driven shortcodes.
-        public override int Order => -10;
+[Feature("OrchardCore.Shortcodes.Templates")]
+public sealed class ShortcodeTemplatesStartup : StartupBase
+{
+    // Register this first so the templates provide overrides for any code driven shortcodes.
+    public override int Order => -10;
 
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<ShortcodeTemplatesManager>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddScoped<ShortcodeTemplatesManager>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
 
-            services.AddRecipeExecutionStep<ShortcodeTemplateStep>();
+        services.AddRecipeExecutionStep<ShortcodeTemplateStep>();
 
-            services.AddScoped<Sc.IShortcodeProvider, TemplateShortcodeProvider>();
-            services.AddScoped<IShortcodeDescriptorProvider, ShortcodeTemplatesDescriptorProvider>();
-        }
+        services.AddScoped<Sc.IShortcodeProvider, TemplateShortcodeProvider>();
+        services.AddScoped<IShortcodeDescriptorProvider, ShortcodeTemplatesDescriptorProvider>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Localization")]
-    public sealed class LocaleShortcodeProviderStartup : StartupBase
+[RequireFeatures("OrchardCore.Localization")]
+public sealed class LocaleShortcodeProviderStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.AddShortcode<LocaleShortcodeProvider>("locale", d =>
         {
-            services.AddShortcode<LocaleShortcodeProvider>("locale", d =>
-            {
-                d.DefaultValue = "[locale {language_code}] [/locale]";
-                d.Hint = "Conditionally render content in the specified language";
-                d.Usage =
+            d.DefaultValue = "[locale {language_code}] [/locale]";
+            d.Hint = "Conditionally render content in the specified language";
+            d.Usage =
 @"[locale en]English Text[/locale][locale fr false]French Text[/locale]<br>
 <table>
   <tr>
@@ -89,17 +89,16 @@ public override void ConfigureServices(IServiceCollection services)
     <td>lang, fallback</td>
   </tr>
 </table>";
-                d.Categories = ["Localization"];
-            });
-        }
+            d.Categories = ["Localization"];
+        });
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment", "OrchardCore.Shortcodes.Templates")]
-    public sealed class ShortcodeTemplatesDeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment", "OrchardCore.Shortcodes.Templates")]
+public sealed class ShortcodeTemplatesDeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<AllShortcodeTemplatesDeploymentSource, AllShortcodeTemplatesDeploymentStep, AllShortcodeTemplatesDeploymentStepDriver>();
-        }
+        services.AddDeployment<AllShortcodeTemplatesDeploymentSource, AllShortcodeTemplatesDeploymentStep, AllShortcodeTemplatesDeploymentStepDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/ViewModels/ShortcodeTemplateIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/ViewModels/ShortcodeTemplateIndexViewModel.cs
index aef1f518de6..fcbfe39f2ec 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/ViewModels/ShortcodeTemplateIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/ViewModels/ShortcodeTemplateIndexViewModel.cs
@@ -3,38 +3,37 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using OrchardCore.Shortcodes.Models;
 
-namespace OrchardCore.Shortcodes.ViewModels
+namespace OrchardCore.Shortcodes.ViewModels;
+
+public class ShortcodeTemplateIndexViewModel
+{
+    public IList<ShortcodeTemplateEntry> ShortcodeTemplates { get; set; }
+    public dynamic Pager { get; set; }
+    public ContentOptions Options { get; set; } = new ContentOptions();
+}
+
+public class ShortcodeTemplateEntry
+{
+    public string Name { get; set; }
+    public ShortcodeTemplate ShortcodeTemplate { get; set; }
+    public bool IsChecked { get; set; }
+}
+
+public class ContentOptions
+{
+    public string Search { get; set; }
+    public ContentsBulkAction BulkAction { get; set; }
+
+    #region Lists to populate
+
+    [BindNever]
+    public List<SelectListItem> ContentsBulkAction { get; set; }
+
+    #endregion Lists to populate
+}
+
+public enum ContentsBulkAction
 {
-    public class ShortcodeTemplateIndexViewModel
-    {
-        public IList<ShortcodeTemplateEntry> ShortcodeTemplates { get; set; }
-        public dynamic Pager { get; set; }
-        public ContentOptions Options { get; set; } = new ContentOptions();
-    }
-
-    public class ShortcodeTemplateEntry
-    {
-        public string Name { get; set; }
-        public ShortcodeTemplate ShortcodeTemplate { get; set; }
-        public bool IsChecked { get; set; }
-    }
-
-    public class ContentOptions
-    {
-        public string Search { get; set; }
-        public ContentsBulkAction BulkAction { get; set; }
-
-        #region Lists to populate
-
-        [BindNever]
-        public List<SelectListItem> ContentsBulkAction { get; set; }
-
-        #endregion Lists to populate
-    }
-
-    public enum ContentsBulkAction
-    {
-        None,
-        Remove
-    }
+    None,
+    Remove
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/ViewModels/ShortcodeTemplateViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/ViewModels/ShortcodeTemplateViewModel.cs
index 3e44e892dd8..0cd5a5d1933 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/ViewModels/ShortcodeTemplateViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/ViewModels/ShortcodeTemplateViewModel.cs
@@ -1,13 +1,12 @@
-namespace OrchardCore.Shortcodes.ViewModels
+namespace OrchardCore.Shortcodes.ViewModels;
+
+public class ShortcodeTemplateViewModel
 {
-    public class ShortcodeTemplateViewModel
-    {
-        public string Name { get; set; }
-        public string Content { get; set; }
-        public string Hint { get; set; }
-        public string Usage { get; set; }
-        public string DefaultValue { get; set; }
-        public string[] Categories { get; set; } = [];
-        public string SelectedCategories { get; set; }
-    }
+    public string Name { get; set; }
+    public string Content { get; set; }
+    public string Hint { get; set; }
+    public string Usage { get; set; }
+    public string DefaultValue { get; set; }
+    public string[] Categories { get; set; } = [];
+    public string SelectedCategories { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/ViewModels/ShortcodeViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/ViewModels/ShortcodeViewModel.cs
index fe5f72cb389..4a74e5b28d9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/ViewModels/ShortcodeViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/ViewModels/ShortcodeViewModel.cs
@@ -1,11 +1,10 @@
 using Shortcodes;
 
-namespace OrchardCore.Shortcodes.ViewModels
+namespace OrchardCore.Shortcodes.ViewModels;
+
+public class ShortcodeViewModel
 {
-    public class ShortcodeViewModel
-    {
-        public Arguments Args { get; set; }
-        public string Content { get; set; }
-        public Context Context { get; set; }
-    }
+    public Arguments Args { get; set; }
+    public string Content { get; set; }
+    public Context Context { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs
index a6fe6eb2cdb..462e8d2c843 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs
@@ -2,44 +2,43 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Sitemaps
+namespace OrchardCore.Sitemaps;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    internal readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["SEO"], S["SEO"].PrefixPosition(), seo => seo
-                        .Permission(Permissions.ManageSitemaps)
-                        .Add(S["Sitemaps"], S["Sitemaps"].PrefixPosition("1"), sitemaps => sitemaps
-                            .Action("List", "Admin", "OrchardCore.Sitemaps")
-                            .LocalNav()
-                        )
-                        .Add(S["Sitemap Indexes"], S["Sitemap Indexes"].PrefixPosition("2"), indexes => indexes
-                            .Action("List", "SitemapIndex", "OrchardCore.Sitemaps")
-                            .LocalNav()
-                        )
-                        .Add(S["Sitemaps Cache"], S["Sitemaps Cache"].PrefixPosition("3"), cache => cache
-                            .Action("List", "SitemapCache", "OrchardCore.Sitemaps")
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["SEO"], S["SEO"].PrefixPosition(), seo => seo
+                    .Permission(Permissions.ManageSitemaps)
+                    .Add(S["Sitemaps"], S["Sitemaps"].PrefixPosition("1"), sitemaps => sitemaps
+                        .Action("List", "Admin", "OrchardCore.Sitemaps")
+                        .LocalNav()
+                    )
+                    .Add(S["Sitemap Indexes"], S["Sitemap Indexes"].PrefixPosition("2"), indexes => indexes
+                        .Action("List", "SitemapIndex", "OrchardCore.Sitemaps")
+                        .LocalNav()
+                    )
+                    .Add(S["Sitemaps Cache"], S["Sitemaps Cache"].PrefixPosition("3"), cache => cache
+                        .Action("List", "SitemapCache", "OrchardCore.Sitemaps")
+                        .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/CustomPathSitemapSourceBuilder.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/CustomPathSitemapSourceBuilder.cs
index db63b1e2105..f2c1468ab4b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/CustomPathSitemapSourceBuilder.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/CustomPathSitemapSourceBuilder.cs
@@ -3,74 +3,73 @@
 using System.Xml.Linq;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Builders
+namespace OrchardCore.Sitemaps.Builders;
+
+public class CustomPathSitemapSourceBuilder : SitemapSourceBuilderBase<CustomPathSitemapSource>
 {
-    public class CustomPathSitemapSourceBuilder : SitemapSourceBuilderBase<CustomPathSitemapSource>
+    private static readonly XNamespace _namespace = "http://www.sitemaps.org/schemas/sitemap/0.9";
+
+    public override async Task BuildSourceAsync(CustomPathSitemapSource source, SitemapBuilderContext context)
     {
-        private static readonly XNamespace _namespace = "http://www.sitemaps.org/schemas/sitemap/0.9";
+        var url = new XElement(_namespace + "url");
 
-        public override async Task BuildSourceAsync(CustomPathSitemapSource source, SitemapBuilderContext context)
+        if (await BuildUrlsetMetadataAsync(source, context, url))
         {
-            var url = new XElement(_namespace + "url");
-
-            if (await BuildUrlsetMetadataAsync(source, context, url))
-            {
-                context.Response.ResponseElement.Add(url);
-            }
+            context.Response.ResponseElement.Add(url);
         }
+    }
 
-        private static Task<bool> BuildUrlsetMetadataAsync(CustomPathSitemapSource source, SitemapBuilderContext context, XElement url)
+    private static Task<bool> BuildUrlsetMetadataAsync(CustomPathSitemapSource source, SitemapBuilderContext context, XElement url)
+    {
+        if (BuildUrl(context, source, url))
         {
-            if (BuildUrl(context, source, url))
-            {
-                PopulateLastMod(source, url);
-                PopulateChangeFrequencyPriority(source, url);
+            PopulateLastMod(source, url);
+            PopulateChangeFrequencyPriority(source, url);
 
-                return Task.FromResult(true);
-            }
-
-            return Task.FromResult(false);
+            return Task.FromResult(true);
         }
 
-        private static bool BuildUrl(SitemapBuilderContext context, CustomPathSitemapSource source, XElement url)
-        {
-            if (string.IsNullOrEmpty(source.Path))
-                return false;
+        return Task.FromResult(false);
+    }
 
-            // Add ~/ to the path, because the it is inserted without leading /.
-            var path = "~/" + source.Path;
+    private static bool BuildUrl(SitemapBuilderContext context, CustomPathSitemapSource source, XElement url)
+    {
+        if (string.IsNullOrEmpty(source.Path))
+            return false;
 
-            var loc = new XElement(_namespace + "loc");
-            loc.Add(context.HostPrefix + context.UrlHelper.Content(path));
-            url.Add(loc);
-            return true;
-        }
+        // Add ~/ to the path, because the it is inserted without leading /.
+        var path = "~/" + source.Path;
 
-        private static void PopulateChangeFrequencyPriority(CustomPathSitemapSource source, XElement url)
-        {
-            var changeFrequencyValue = source.ChangeFrequency.ToString();
-            var priorityIntValue = source.Priority;
+        var loc = new XElement(_namespace + "loc");
+        loc.Add(context.HostPrefix + context.UrlHelper.Content(path));
+        url.Add(loc);
+        return true;
+    }
+
+    private static void PopulateChangeFrequencyPriority(CustomPathSitemapSource source, XElement url)
+    {
+        var changeFrequencyValue = source.ChangeFrequency.ToString();
+        var priorityIntValue = source.Priority;
 
-            var priorityValue = (priorityIntValue * 0.1f).ToString(CultureInfo.InvariantCulture);
+        var priorityValue = (priorityIntValue * 0.1f).ToString(CultureInfo.InvariantCulture);
 
-            var changeFreq = new XElement(_namespace + "changefreq");
-            changeFreq.Add(changeFrequencyValue.ToLower());
-            url.Add(changeFreq);
+        var changeFreq = new XElement(_namespace + "changefreq");
+        changeFreq.Add(changeFrequencyValue.ToLower());
+        url.Add(changeFreq);
 
-            var priority = new XElement(_namespace + "priority");
-            priority.Add(priorityValue);
-            url.Add(priority);
-        }
+        var priority = new XElement(_namespace + "priority");
+        priority.Add(priorityValue);
+        url.Add(priority);
+    }
 
-        private static void PopulateLastMod(CustomPathSitemapSource source, XElement url)
+    private static void PopulateLastMod(CustomPathSitemapSource source, XElement url)
+    {
+        // Last modified is not required. Do not include if the path has no modified date.
+        if (source.LastUpdate.HasValue)
         {
-            // Last modified is not required. Do not include if the path has no modified date.
-            if (source.LastUpdate.HasValue)
-            {
-                var lastMod = new XElement(_namespace + "lastmod");
-                lastMod.Add(source.LastUpdate.GetValueOrDefault().ToString("yyyy-MM-ddTHH:mm:sszzz", CultureInfo.InvariantCulture));
-                url.Add(lastMod);
-            }
+            var lastMod = new XElement(_namespace + "lastmod");
+            lastMod.Add(source.LastUpdate.GetValueOrDefault().ToString("yyyy-MM-ddTHH:mm:sszzz", CultureInfo.InvariantCulture));
+            url.Add(lastMod);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/CustomPathSitemapSourceModifiedDateProvider.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/CustomPathSitemapSourceModifiedDateProvider.cs
index e8bedf44f18..1d1a0e32466 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/CustomPathSitemapSourceModifiedDateProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/CustomPathSitemapSourceModifiedDateProvider.cs
@@ -2,13 +2,12 @@
 using System.Threading.Tasks;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Builders
+namespace OrchardCore.Sitemaps.Builders;
+
+public class CustomPathSitemapSourceModifiedDateProvider : SitemapSourceModifiedDateProviderBase<CustomPathSitemapSource>
 {
-    public class CustomPathSitemapSourceModifiedDateProvider : SitemapSourceModifiedDateProviderBase<CustomPathSitemapSource>
+    public override Task<DateTime?> GetLastModifiedDateAsync(CustomPathSitemapSource source)
     {
-        public override Task<DateTime?> GetLastModifiedDateAsync(CustomPathSitemapSource source)
-        {
-            return Task.FromResult(source.LastUpdate);
-        }
+        return Task.FromResult(source.LastUpdate);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/DefaultSitemapBuilder.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/DefaultSitemapBuilder.cs
index a32b8350e8f..24511668d8f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/DefaultSitemapBuilder.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/DefaultSitemapBuilder.cs
@@ -3,36 +3,35 @@
 using System.Xml.Linq;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Builders
+namespace OrchardCore.Sitemaps.Builders;
+
+public class DefaultSitemapBuilder : ISitemapBuilder
 {
-    public class DefaultSitemapBuilder : ISitemapBuilder
+    private readonly IEnumerable<ISitemapTypeBuilder> _sitemapTypeBuilders;
+
+    public DefaultSitemapBuilder(IEnumerable<ISitemapTypeBuilder> sitemapTypeBuilders)
     {
-        private readonly IEnumerable<ISitemapTypeBuilder> _sitemapTypeBuilders;
+        _sitemapTypeBuilders = sitemapTypeBuilders;
+    }
 
-        public DefaultSitemapBuilder(IEnumerable<ISitemapTypeBuilder> sitemapTypeBuilders)
+    public async Task<XDocument> BuildAsync(SitemapType sitemap, SitemapBuilderContext context)
+    {
+        if (!sitemap.Enabled)
         {
-            _sitemapTypeBuilders = sitemapTypeBuilders;
+            return null;
         }
 
-        public async Task<XDocument> BuildAsync(SitemapType sitemap, SitemapBuilderContext context)
+        foreach (var sitemapTypeBuilder in _sitemapTypeBuilders)
         {
-            if (!sitemap.Enabled)
+            await sitemapTypeBuilder.BuildAsync(sitemap, context);
+            if (context.Response != null)
             {
-                return null;
-            }
+                var document = new XDocument(context.Response.ResponseElement);
 
-            foreach (var sitemapTypeBuilder in _sitemapTypeBuilders)
-            {
-                await sitemapTypeBuilder.BuildAsync(sitemap, context);
-                if (context.Response != null)
-                {
-                    var document = new XDocument(context.Response.ResponseElement);
-
-                    return new XDocument(document);
-                }
+                return new XDocument(document);
             }
-
-            return null;
         }
+
+        return null;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/DefaultSitemapModifiedDateProvider.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/DefaultSitemapModifiedDateProvider.cs
index e65e74a240b..c56e46bc27b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/DefaultSitemapModifiedDateProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/DefaultSitemapModifiedDateProvider.cs
@@ -3,33 +3,32 @@
 using System.Threading.Tasks;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Builders
+namespace OrchardCore.Sitemaps.Builders;
+
+public class DefaultSitemapModifiedDateProvider : ISitemapModifiedDateProvider
 {
-    public class DefaultSitemapModifiedDateProvider : ISitemapModifiedDateProvider
-    {
-        private readonly IEnumerable<ISitemapSourceModifiedDateProvider> _sitemapSourceModifiedDateProviders;
+    private readonly IEnumerable<ISitemapSourceModifiedDateProvider> _sitemapSourceModifiedDateProviders;
 
-        public DefaultSitemapModifiedDateProvider(IEnumerable<ISitemapSourceModifiedDateProvider> sitemapSourceModifiedDateProviders)
-        {
-            _sitemapSourceModifiedDateProviders = sitemapSourceModifiedDateProviders;
-        }
+    public DefaultSitemapModifiedDateProvider(IEnumerable<ISitemapSourceModifiedDateProvider> sitemapSourceModifiedDateProviders)
+    {
+        _sitemapSourceModifiedDateProviders = sitemapSourceModifiedDateProviders;
+    }
 
-        public async Task<DateTime?> GetLastModifiedDateAsync(SitemapType sitemap)
+    public async Task<DateTime?> GetLastModifiedDateAsync(SitemapType sitemap)
+    {
+        DateTime? lastModifiedDate = null;
+        foreach (var source in sitemap.SitemapSources)
         {
-            DateTime? lastModifiedDate = null;
-            foreach (var source in sitemap.SitemapSources)
+            foreach (var modifiedDateProviders in _sitemapSourceModifiedDateProviders)
             {
-                foreach (var modifiedDateProviders in _sitemapSourceModifiedDateProviders)
+                var result = await modifiedDateProviders.GetLastModifiedDateAsync(source);
+                if (result.HasValue && (lastModifiedDate == null || result.Value > lastModifiedDate))
                 {
-                    var result = await modifiedDateProviders.GetLastModifiedDateAsync(source);
-                    if (result.HasValue && (lastModifiedDate == null || result.Value > lastModifiedDate))
-                    {
-                        lastModifiedDate = result;
-                    }
+                    lastModifiedDate = result;
                 }
             }
-
-            return lastModifiedDate;
         }
+
+        return lastModifiedDate;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/SitemapIndexTypeBuilder.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/SitemapIndexTypeBuilder.cs
index 62ef910321a..4e2d84e0ff3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/SitemapIndexTypeBuilder.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/SitemapIndexTypeBuilder.cs
@@ -8,71 +8,70 @@
 using OrchardCore.Sitemaps.Models;
 using OrchardCore.Sitemaps.Services;
 
-namespace OrchardCore.Sitemaps.Builders
+namespace OrchardCore.Sitemaps.Builders;
+
+public class SitemapIndexTypeBuilder : SitemapTypeBuilderBase<SitemapIndex>
 {
-    public class SitemapIndexTypeBuilder : SitemapTypeBuilderBase<SitemapIndex>
+    private static readonly XNamespace _namespace = "http://www.sitemaps.org/schemas/sitemap/0.9";
+    private static readonly XNamespace _schemaInstance = "http://www.w3.org/2001/XMLSchema-instance";
+    private static readonly XNamespace _schemaLocation = "http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd";
+
+    private readonly ISitemapManager _sitemapManager;
+    private readonly ISitemapModifiedDateProvider _sitemapModifiedDateProvider;
+    private readonly SitemapsOptions _sitemapsOptions;
+
+    public SitemapIndexTypeBuilder(
+        ISitemapManager sitemapManager,
+        ISitemapModifiedDateProvider sitemapModifiedDateProvider,
+        IOptions<SitemapsOptions> options
+        )
+    {
+        _sitemapManager = sitemapManager;
+        _sitemapModifiedDateProvider = sitemapModifiedDateProvider;
+        _sitemapsOptions = options.Value;
+    }
+
+    public override async Task BuildSitemapTypeAsync(SitemapIndex sitemap, SitemapBuilderContext context)
     {
-        private static readonly XNamespace _namespace = "http://www.sitemaps.org/schemas/sitemap/0.9";
-        private static readonly XNamespace _schemaInstance = "http://www.w3.org/2001/XMLSchema-instance";
-        private static readonly XNamespace _schemaLocation = "http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd";
+        context.Response = new SitemapResponse
+        {
+            ResponseElement = new XElement(_namespace + "sitemapindex",
+                new XAttribute(XNamespace.Xmlns + "xsi", _schemaInstance),
+                new XAttribute(_schemaInstance + "schemaLocation", _schemaLocation))
+        };
 
-        private readonly ISitemapManager _sitemapManager;
-        private readonly ISitemapModifiedDateProvider _sitemapModifiedDateProvider;
-        private readonly SitemapsOptions _sitemapsOptions;
+        var indexSource = sitemap.SitemapSources.FirstOrDefault() as SitemapIndexSource;
 
-        public SitemapIndexTypeBuilder(
-            ISitemapManager sitemapManager,
-            ISitemapModifiedDateProvider sitemapModifiedDateProvider,
-            IOptions<SitemapsOptions> options
-            )
+        if (indexSource == null)
         {
-            _sitemapManager = sitemapManager;
-            _sitemapModifiedDateProvider = sitemapModifiedDateProvider;
-            _sitemapsOptions = options.Value;
+            return;
         }
 
-        public override async Task BuildSitemapTypeAsync(SitemapIndex sitemap, SitemapBuilderContext context)
+        var containedSitemaps = (await _sitemapManager.GetSitemapsAsync())
+            .Where(s => s.Enabled && indexSource.ContainedSitemapIds.Any(id => id == s.SitemapId));
+
+        foreach (var containedSitemap in containedSitemaps)
         {
-            context.Response = new SitemapResponse
+            var xmlSitemap = new XElement(_namespace + "sitemap");
+            var loc = new XElement(_namespace + "loc");
+
+            var routeValues = new RouteValueDictionary(_sitemapsOptions.GlobalRouteValues)
             {
-                ResponseElement = new XElement(_namespace + "sitemapindex",
-                    new XAttribute(XNamespace.Xmlns + "xsi", _schemaInstance),
-                    new XAttribute(_schemaInstance + "schemaLocation", _schemaLocation))
+                [_sitemapsOptions.SitemapIdKey] = containedSitemap.SitemapId
             };
 
-            var indexSource = sitemap.SitemapSources.FirstOrDefault() as SitemapIndexSource;
+            loc.Add(context.HostPrefix + context.UrlHelper.Action(routeValues["Action"].ToString(), routeValues));
+            xmlSitemap.Add(loc);
 
-            if (indexSource == null)
+            var lastModDate = await _sitemapModifiedDateProvider.GetLastModifiedDateAsync(containedSitemap);
+            if (lastModDate.HasValue)
             {
-                return;
+                var lastMod = new XElement(_namespace + "lastmod");
+                lastMod.Add(lastModDate.GetValueOrDefault().ToString("yyyy-MM-ddTHH:mm:sszzz", CultureInfo.InvariantCulture));
+                xmlSitemap.Add(lastMod);
             }
 
-            var containedSitemaps = (await _sitemapManager.GetSitemapsAsync())
-                .Where(s => s.Enabled && indexSource.ContainedSitemapIds.Any(id => id == s.SitemapId));
-
-            foreach (var containedSitemap in containedSitemaps)
-            {
-                var xmlSitemap = new XElement(_namespace + "sitemap");
-                var loc = new XElement(_namespace + "loc");
-
-                var routeValues = new RouteValueDictionary(_sitemapsOptions.GlobalRouteValues)
-                {
-                    [_sitemapsOptions.SitemapIdKey] = containedSitemap.SitemapId
-                };
-
-                loc.Add(context.HostPrefix + context.UrlHelper.Action(routeValues["Action"].ToString(), routeValues));
-                xmlSitemap.Add(loc);
-
-                var lastModDate = await _sitemapModifiedDateProvider.GetLastModifiedDateAsync(containedSitemap);
-                if (lastModDate.HasValue)
-                {
-                    var lastMod = new XElement(_namespace + "lastmod");
-                    lastMod.Add(lastModDate.GetValueOrDefault().ToString("yyyy-MM-ddTHH:mm:sszzz", CultureInfo.InvariantCulture));
-                    xmlSitemap.Add(lastMod);
-                }
-
-                context.Response.ResponseElement.Add(xmlSitemap);
-            }
+            context.Response.ResponseElement.Add(xmlSitemap);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/SitemapTypeBuilder.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/SitemapTypeBuilder.cs
index be820753337..0773a1eb44f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/SitemapTypeBuilder.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Builders/SitemapTypeBuilder.cs
@@ -3,32 +3,31 @@
 using System.Xml.Linq;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Builders
+namespace OrchardCore.Sitemaps.Builders;
+
+public class SitemapTypeBuilder : SitemapTypeBuilderBase<Sitemap>
 {
-    public class SitemapTypeBuilder : SitemapTypeBuilderBase<Sitemap>
-    {
-        private static readonly XNamespace _namespace = "http://www.sitemaps.org/schemas/sitemap/0.9";
+    private static readonly XNamespace _namespace = "http://www.sitemaps.org/schemas/sitemap/0.9";
 
-        private readonly IEnumerable<ISitemapSourceBuilder> _sitemapSourceBuilders;
+    private readonly IEnumerable<ISitemapSourceBuilder> _sitemapSourceBuilders;
 
-        public SitemapTypeBuilder(IEnumerable<ISitemapSourceBuilder> sitemapSourceBuilders)
-        {
-            _sitemapSourceBuilders = sitemapSourceBuilders;
-        }
+    public SitemapTypeBuilder(IEnumerable<ISitemapSourceBuilder> sitemapSourceBuilders)
+    {
+        _sitemapSourceBuilders = sitemapSourceBuilders;
+    }
 
-        public override async Task BuildSitemapTypeAsync(Sitemap sitemap, SitemapBuilderContext context)
+    public override async Task BuildSitemapTypeAsync(Sitemap sitemap, SitemapBuilderContext context)
+    {
+        context.Response = new SitemapResponse
         {
-            context.Response = new SitemapResponse
-            {
-                ResponseElement = new XElement(_namespace + "urlset")
-            };
+            ResponseElement = new XElement(_namespace + "urlset")
+        };
 
-            foreach (var source in sitemap.SitemapSources)
+        foreach (var source in sitemap.SitemapSources)
+        {
+            foreach (var sourceBuilder in _sitemapSourceBuilders)
             {
-                foreach (var sourceBuilder in _sitemapSourceBuilders)
-                {
-                    await sourceBuilder.BuildAsync(source, context);
-                }
+                await sourceBuilder.BuildAsync(source, context);
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Cache/DefaultSitemapCacheProvider.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Cache/DefaultSitemapCacheProvider.cs
index e26321dfd61..69d23cbfdac 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Cache/DefaultSitemapCacheProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Cache/DefaultSitemapCacheProvider.cs
@@ -9,93 +9,74 @@
 using Microsoft.Extensions.Logging;
 using OrchardCore.Environment.Shell;
 
-namespace OrchardCore.Sitemaps.Cache
+namespace OrchardCore.Sitemaps.Cache;
+
+public class DefaultSitemapCacheProvider : ISitemapCacheProvider
 {
-    public class DefaultSitemapCacheProvider : ISitemapCacheProvider
-    {
-        // Use default stream copy buffer size to stay in gen0 garbage collection.
-        private const int StreamCopyBufferSize = 81920;
+    // Use default stream copy buffer size to stay in gen0 garbage collection.
+    private const int StreamCopyBufferSize = 81920;
 
-        public const string SitemapCachePath = "sm-cache";
+    public const string SitemapCachePath = "sm-cache";
 
-        private readonly PhysicalFileProvider _fileProvider;
-        private readonly ILogger _logger;
+    private readonly PhysicalFileProvider _fileProvider;
+    private readonly ILogger _logger;
 
-        public DefaultSitemapCacheProvider(
-            IWebHostEnvironment webHostEnvironment,
-            ShellSettings shellSettings,
-            ILogger<DefaultSitemapCacheProvider> logger
-            )
-        {
-            var path = GetSitemapCachePath(webHostEnvironment, shellSettings, SitemapCachePath);
+    public DefaultSitemapCacheProvider(
+        IWebHostEnvironment webHostEnvironment,
+        ShellSettings shellSettings,
+        ILogger<DefaultSitemapCacheProvider> logger
+        )
+    {
+        var path = GetSitemapCachePath(webHostEnvironment, shellSettings, SitemapCachePath);
 
-            if (!Directory.Exists(path))
-            {
-                Directory.CreateDirectory(path);
-            }
+        if (!Directory.Exists(path))
+        {
+            Directory.CreateDirectory(path);
+        }
 
-            _fileProvider = new PhysicalFileProvider(path);
+        _fileProvider = new PhysicalFileProvider(path);
 
-            _logger = logger;
-        }
+        _logger = logger;
+    }
 
-        public Task<ISitemapCacheFileResolver> GetCachedSitemapAsync(string cacheFileName)
+    public Task<ISitemapCacheFileResolver> GetCachedSitemapAsync(string cacheFileName)
+    {
+        var fileInfo = _fileProvider.GetFileInfo(cacheFileName);
+        if (fileInfo.Exists)
         {
-            var fileInfo = _fileProvider.GetFileInfo(cacheFileName);
-            if (fileInfo.Exists)
-            {
-                return Task.FromResult<ISitemapCacheFileResolver>(new PhysicalSitemapCacheFileResolver(fileInfo));
-            }
-
-            return Task.FromResult<ISitemapCacheFileResolver>(null);
+            return Task.FromResult<ISitemapCacheFileResolver>(new PhysicalSitemapCacheFileResolver(fileInfo));
         }
 
-        public async Task SetSitemapCacheAsync(Stream stream, string cacheFileName, CancellationToken cancellationToken)
-        {
-            var cachePath = Path.Combine(_fileProvider.Root, cacheFileName);
+        return Task.FromResult<ISitemapCacheFileResolver>(null);
+    }
 
-            using var fileStream = File.Create(cachePath);
-            stream.Position = 0;
-            await stream.CopyToAsync(fileStream, StreamCopyBufferSize, cancellationToken);
-        }
+    public async Task SetSitemapCacheAsync(Stream stream, string cacheFileName, CancellationToken cancellationToken)
+    {
+        var cachePath = Path.Combine(_fileProvider.Root, cacheFileName);
+
+        using var fileStream = File.Create(cachePath);
+        stream.Position = 0;
+        await stream.CopyToAsync(fileStream, StreamCopyBufferSize, cancellationToken);
+    }
 
-        public Task CleanSitemapCacheAsync(IEnumerable<string> validCacheFileNames)
+    public Task CleanSitemapCacheAsync(IEnumerable<string> validCacheFileNames)
+    {
+        var folders = _fileProvider.GetDirectoryContents(string.Empty);
+        foreach (var fileInfo in folders)
         {
-            var folders = _fileProvider.GetDirectoryContents(string.Empty);
-            foreach (var fileInfo in folders)
+            if (fileInfo.IsDirectory)
             {
-                if (fileInfo.IsDirectory)
+                // Sitemap cache only stores files, so any folder that has been created by the user will be ignored.
+                continue;
+            }
+            else
+            {
+                // Check if the file is valid and still needs to be cached.
+                if (validCacheFileNames.Contains(fileInfo.Name, StringComparer.OrdinalIgnoreCase))
                 {
-                    // Sitemap cache only stores files, so any folder that has been created by the user will be ignored.
                     continue;
                 }
-                else
-                {
-                    // Check if the file is valid and still needs to be cached.
-                    if (validCacheFileNames.Contains(fileInfo.Name, StringComparer.OrdinalIgnoreCase))
-                    {
-                        continue;
-                    }
-
-                    try
-                    {
-                        File.Delete(fileInfo.PhysicalPath);
-                    }
-                    catch (IOException ex)
-                    {
-                        _logger.LogError(ex, "Error deleting cache file {Path}", fileInfo.PhysicalPath);
-                    }
-                }
-            }
 
-            return Task.CompletedTask;
-        }
-
-        public Task ClearSitemapCacheAsync(string cacheFileName)
-        {
-            var fileInfo = _fileProvider.GetFileInfo(cacheFileName);
-            if (fileInfo.Exists)
-            {
                 try
                 {
                     File.Delete(fileInfo.PhysicalPath);
@@ -105,43 +86,41 @@ public Task ClearSitemapCacheAsync(string cacheFileName)
                     _logger.LogError(ex, "Error deleting cache file {Path}", fileInfo.PhysicalPath);
                 }
             }
-
-            return Task.CompletedTask;
         }
 
-        public Task<bool> PurgeAllAsync()
+        return Task.CompletedTask;
+    }
+
+    public Task ClearSitemapCacheAsync(string cacheFileName)
+    {
+        var fileInfo = _fileProvider.GetFileInfo(cacheFileName);
+        if (fileInfo.Exists)
         {
-            var hasErrors = false;
-            var folders = _fileProvider.GetDirectoryContents(string.Empty);
-            foreach (var fileInfo in folders)
+            try
             {
-                if (fileInfo.IsDirectory)
-                {
-                    // Sitemap cache only stores files, so any folder that has been created by the user will be ignored.
-                    continue;
-                }
-                else
-                {
-                    try
-                    {
-                        File.Delete(fileInfo.PhysicalPath);
-                    }
-                    catch (IOException ex)
-                    {
-                        _logger.LogError(ex, "Error deleting cache file {Path}", fileInfo.PhysicalPath);
-                        hasErrors = true;
-                    }
-                }
+                File.Delete(fileInfo.PhysicalPath);
+            }
+            catch (IOException ex)
+            {
+                _logger.LogError(ex, "Error deleting cache file {Path}", fileInfo.PhysicalPath);
             }
-
-            return Task.FromResult(hasErrors);
         }
 
-        public Task<bool> PurgeAsync(string cacheFileName)
+        return Task.CompletedTask;
+    }
+
+    public Task<bool> PurgeAllAsync()
+    {
+        var hasErrors = false;
+        var folders = _fileProvider.GetDirectoryContents(string.Empty);
+        foreach (var fileInfo in folders)
         {
-            var failed = false;
-            var fileInfo = _fileProvider.GetFileInfo(cacheFileName);
-            if (fileInfo.Exists)
+            if (fileInfo.IsDirectory)
+            {
+                // Sitemap cache only stores files, so any folder that has been created by the user will be ignored.
+                continue;
+            }
+            else
             {
                 try
                 {
@@ -150,41 +129,61 @@ public Task<bool> PurgeAsync(string cacheFileName)
                 catch (IOException ex)
                 {
                     _logger.LogError(ex, "Error deleting cache file {Path}", fileInfo.PhysicalPath);
-                    failed = true;
+                    hasErrors = true;
                 }
             }
-            else
+        }
+
+        return Task.FromResult(hasErrors);
+    }
+
+    public Task<bool> PurgeAsync(string cacheFileName)
+    {
+        var failed = false;
+        var fileInfo = _fileProvider.GetFileInfo(cacheFileName);
+        if (fileInfo.Exists)
+        {
+            try
             {
-                _logger.LogError("Cache file {Name} does not exist", cacheFileName);
+                File.Delete(fileInfo.PhysicalPath);
+            }
+            catch (IOException ex)
+            {
+                _logger.LogError(ex, "Error deleting cache file {Path}", fileInfo.PhysicalPath);
                 failed = true;
             }
-
-            return Task.FromResult(failed);
+        }
+        else
+        {
+            _logger.LogError("Cache file {Name} does not exist", cacheFileName);
+            failed = true;
         }
 
-        public Task<IEnumerable<string>> ListAsync()
+        return Task.FromResult(failed);
+    }
+
+    public Task<IEnumerable<string>> ListAsync()
+    {
+        var results = new List<string>();
+        var folders = _fileProvider.GetDirectoryContents(string.Empty);
+        foreach (var fileInfo in folders)
         {
-            var results = new List<string>();
-            var folders = _fileProvider.GetDirectoryContents(string.Empty);
-            foreach (var fileInfo in folders)
+            if (fileInfo.IsDirectory)
             {
-                if (fileInfo.IsDirectory)
-                {
-                    // Sitemap cache only stores files, so any folder that has been created by the user will be ignored.
-                    continue;
-                }
-                else
-                {
-                    results.Add(fileInfo.Name);
-                }
+                // Sitemap cache only stores files, so any folder that has been created by the user will be ignored.
+                continue;
+            }
+            else
+            {
+                results.Add(fileInfo.Name);
             }
-
-            return Task.FromResult<IEnumerable<string>>(results);
         }
 
-        private static string GetSitemapCachePath(IWebHostEnvironment webHostEnvironment, ShellSettings shellSettings, string cachePath)
-        {
-            return PathExtensions.Combine(webHostEnvironment.WebRootPath, shellSettings.Name, cachePath);
-        }
+        return Task.FromResult<IEnumerable<string>>(results);
+    }
+
+    private static string GetSitemapCachePath(IWebHostEnvironment webHostEnvironment, ShellSettings shellSettings, string cachePath)
+    {
+        return PathExtensions.Combine(webHostEnvironment.WebRootPath, shellSettings.Name, cachePath);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Cache/PhysicalSitemapCacheFileResolver.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Cache/PhysicalSitemapCacheFileResolver.cs
index ae1ebd71e72..d3d5d2b523f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Cache/PhysicalSitemapCacheFileResolver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Cache/PhysicalSitemapCacheFileResolver.cs
@@ -2,20 +2,19 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.Sitemaps.Cache
+namespace OrchardCore.Sitemaps.Cache;
+
+public class PhysicalSitemapCacheFileResolver : ISitemapCacheFileResolver
 {
-    public class PhysicalSitemapCacheFileResolver : ISitemapCacheFileResolver
-    {
-        private readonly IFileInfo _fileInfo;
+    private readonly IFileInfo _fileInfo;
 
-        public PhysicalSitemapCacheFileResolver(IFileInfo fileInfo)
-        {
-            _fileInfo = fileInfo;
-        }
+    public PhysicalSitemapCacheFileResolver(IFileInfo fileInfo)
+    {
+        _fileInfo = fileInfo;
+    }
 
-        public Task<Stream> OpenReadStreamAsync()
-        {
-            return Task.FromResult(_fileInfo.CreateReadStream());
-        }
+    public Task<Stream> OpenReadStreamAsync()
+    {
+        return Task.FromResult(_fileInfo.CreateReadStream());
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Cache/SitemapCacheBackgroundTask.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Cache/SitemapCacheBackgroundTask.cs
index 70abf9acc7d..aac9165294c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Cache/SitemapCacheBackgroundTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Cache/SitemapCacheBackgroundTask.cs
@@ -6,21 +6,20 @@
 using OrchardCore.BackgroundTasks;
 using OrchardCore.Sitemaps.Services;
 
-namespace OrchardCore.Sitemaps.Cache
+namespace OrchardCore.Sitemaps.Cache;
+
+[BackgroundTask(
+    Title = "Sitemap Cache Cleaner",
+    Schedule = "*/5 * * * *",
+    Description = "Cleans up sitemap cache files.")]
+public sealed class SitemapCacheBackgroundTask : IBackgroundTask
 {
-    [BackgroundTask(
-        Title = "Sitemap Cache Cleaner",
-        Schedule = "*/5 * * * *",
-        Description = "Cleans up sitemap cache files.")]
-    public sealed class SitemapCacheBackgroundTask : IBackgroundTask
+    public async Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken)
     {
-        public async Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken)
-        {
-            var sitemapManager = serviceProvider.GetRequiredService<ISitemapManager>();
-            var sitemapCacheProvider = serviceProvider.GetRequiredService<ISitemapCacheProvider>();
+        var sitemapManager = serviceProvider.GetRequiredService<ISitemapManager>();
+        var sitemapCacheProvider = serviceProvider.GetRequiredService<ISitemapCacheProvider>();
 
-            var sitemaps = await sitemapManager.GetSitemapsAsync();
-            await sitemapCacheProvider.CleanSitemapCacheAsync(sitemaps.Select(s => s.CacheFileName));
-        }
+        var sitemaps = await sitemapManager.GetSitemapsAsync();
+        await sitemapCacheProvider.CleanSitemapCacheAsync(sitemaps.Select(s => s.CacheFileName));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/AdminController.cs
index 7f6fd000557..f9065b964c1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/AdminController.cs
@@ -19,347 +19,346 @@
 using OrchardCore.Sitemaps.Services;
 using OrchardCore.Sitemaps.ViewModels;
 
-namespace OrchardCore.Sitemaps.Controllers
+namespace OrchardCore.Sitemaps.Controllers;
+
+[Admin("Sitemaps/{action}/{sitemapId?}", "Sitemaps{action}")]
+public class AdminController : Controller
 {
-    [Admin("Sitemaps/{action}/{sitemapId?}", "Sitemaps{action}")]
-    public class AdminController : Controller
+    private const string _optionsSearch = "Options.Search";
+
+    private readonly ISitemapHelperService _sitemapService;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IDisplayManager<SitemapSource> _displayManager;
+    private readonly IEnumerable<ISitemapSourceFactory> _sourceFactories;
+    private readonly ISitemapManager _sitemapManager;
+    private readonly ISitemapIdGenerator _sitemapIdGenerator;
+    private readonly PagerOptions _pagerOptions;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly INotifier _notifier;
+    private readonly IShapeFactory _shapeFactory;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public AdminController(
+        ISitemapHelperService sitemapService,
+        IAuthorizationService authorizationService,
+        IDisplayManager<SitemapSource> displayManager,
+        IEnumerable<ISitemapSourceFactory> sourceFactories,
+        ISitemapManager sitemapManager,
+        ISitemapIdGenerator sitemapIdGenerator,
+        IOptions<PagerOptions> pagerOptions,
+        IUpdateModelAccessor updateModelAccessor,
+        INotifier notifier,
+        IShapeFactory shapeFactory,
+        IStringLocalizer<AdminController> stringLocalizer,
+        IHtmlLocalizer<AdminController> htmlLocalizer)
+    {
+        _sitemapService = sitemapService;
+        _displayManager = displayManager;
+        _sourceFactories = sourceFactories;
+        _authorizationService = authorizationService;
+        _sitemapManager = sitemapManager;
+        _sitemapIdGenerator = sitemapIdGenerator;
+        _pagerOptions = pagerOptions.Value;
+        _updateModelAccessor = updateModelAccessor;
+        _notifier = notifier;
+        _shapeFactory = shapeFactory;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+    }
+
+    public async Task<IActionResult> List(ContentOptions options, PagerParameters pagerParameters)
     {
-        private const string _optionsSearch = "Options.Search";
-
-        private readonly ISitemapHelperService _sitemapService;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IDisplayManager<SitemapSource> _displayManager;
-        private readonly IEnumerable<ISitemapSourceFactory> _sourceFactories;
-        private readonly ISitemapManager _sitemapManager;
-        private readonly ISitemapIdGenerator _sitemapIdGenerator;
-        private readonly PagerOptions _pagerOptions;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly INotifier _notifier;
-        private readonly IShapeFactory _shapeFactory;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public AdminController(
-            ISitemapHelperService sitemapService,
-            IAuthorizationService authorizationService,
-            IDisplayManager<SitemapSource> displayManager,
-            IEnumerable<ISitemapSourceFactory> sourceFactories,
-            ISitemapManager sitemapManager,
-            ISitemapIdGenerator sitemapIdGenerator,
-            IOptions<PagerOptions> pagerOptions,
-            IUpdateModelAccessor updateModelAccessor,
-            INotifier notifier,
-            IShapeFactory shapeFactory,
-            IStringLocalizer<AdminController> stringLocalizer,
-            IHtmlLocalizer<AdminController> htmlLocalizer)
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
         {
-            _sitemapService = sitemapService;
-            _displayManager = displayManager;
-            _sourceFactories = sourceFactories;
-            _authorizationService = authorizationService;
-            _sitemapManager = sitemapManager;
-            _sitemapIdGenerator = sitemapIdGenerator;
-            _pagerOptions = pagerOptions.Value;
-            _updateModelAccessor = updateModelAccessor;
-            _notifier = notifier;
-            _shapeFactory = shapeFactory;
-            S = stringLocalizer;
-            H = htmlLocalizer;
+            return Forbid();
         }
 
-        public async Task<IActionResult> List(ContentOptions options, PagerParameters pagerParameters)
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+
+        var sitemaps = (await _sitemapManager.GetSitemapsAsync())
+            .OfType<Sitemap>();
+
+        if (!string.IsNullOrWhiteSpace(options.Search))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
+            sitemaps = sitemaps.Where(x => x.Name.Contains(options.Search, StringComparison.OrdinalIgnoreCase));
+        }
 
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+        var count = sitemaps.Count();
 
-            var sitemaps = (await _sitemapManager.GetSitemapsAsync())
-                .OfType<Sitemap>();
+        var results = sitemaps
+            .Skip(pager.GetStartIndex())
+            .Take(pager.PageSize)
+            .ToList();
 
-            if (!string.IsNullOrWhiteSpace(options.Search))
-            {
-                sitemaps = sitemaps.Where(x => x.Name.Contains(options.Search, StringComparison.OrdinalIgnoreCase));
-            }
+        // Maintain previous route data when generating page links.
+        var routeData = new RouteData();
 
-            var count = sitemaps.Count();
+        if (!string.IsNullOrEmpty(options.Search))
+        {
+            routeData.Values.TryAdd(_optionsSearch, options.Search);
+        }
 
-            var results = sitemaps
-                .Skip(pager.GetStartIndex())
-                .Take(pager.PageSize)
-                .ToList();
+        var model = new ListSitemapViewModel
+        {
+            Sitemaps = results.Select(sm => new SitemapListEntry { SitemapId = sm.SitemapId, Name = sm.Name, Enabled = sm.Enabled }).ToList(),
+            Options = options,
+            Pager = await _shapeFactory.PagerAsync(pager, count, routeData)
+        };
 
-            // Maintain previous route data when generating page links.
-            var routeData = new RouteData();
+        model.Options.ContentsBulkAction =
+        [
+            new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+        ];
 
-            if (!string.IsNullOrEmpty(options.Search))
-            {
-                routeData.Values.TryAdd(_optionsSearch, options.Search);
-            }
+        return View(model);
+    }
 
-            var model = new ListSitemapViewModel
-            {
-                Sitemaps = results.Select(sm => new SitemapListEntry { SitemapId = sm.SitemapId, Name = sm.Name, Enabled = sm.Enabled }).ToList(),
-                Options = options,
-                Pager = await _shapeFactory.PagerAsync(pager, count, routeData)
-            };
+    [HttpPost, ActionName(nameof(List))]
+    [FormValueRequired("submit.Filter")]
+    public ActionResult ListFilterPOST(ListSitemapViewModel model)
+        => RedirectToAction(nameof(List), new RouteValueDictionary
+        {
+            { _optionsSearch, model.Options.Search }
+        });
 
-            model.Options.ContentsBulkAction =
-            [
-                new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
-            ];
+    public async Task<IActionResult> Display(string sitemapId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
+        {
+            return Forbid();
+        }
 
-            return View(model);
+        var sitemap = await _sitemapManager.GetSitemapAsync(sitemapId);
+
+        if (sitemap == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost, ActionName(nameof(List))]
-        [FormValueRequired("submit.Filter")]
-        public ActionResult ListFilterPOST(ListSitemapViewModel model)
-            => RedirectToAction(nameof(List), new RouteValueDictionary
-            {
-                { _optionsSearch, model.Options.Search }
-            });
+        var items = new List<dynamic>();
+        foreach (var source in sitemap.SitemapSources)
+        {
+            var item = await _displayManager.BuildDisplayAsync(source, _updateModelAccessor.ModelUpdater, "SummaryAdmin");
+            item.Properties["SitemapId"] = sitemap.SitemapId;
+            item.Properties["SitemapSource"] = source;
+            items.Add(item);
+        }
 
-        public async Task<IActionResult> Display(string sitemapId)
+        var thumbnails = new Dictionary<string, dynamic>();
+        foreach (var factory in _sourceFactories)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
+            var source = factory.Create();
+            var thumbnail = await _displayManager.BuildDisplayAsync(source, _updateModelAccessor.ModelUpdater, "Thumbnail");
+            thumbnail.Properties["SitemapSource"] = source;
+            thumbnail.Properties["SitemapSourceType"] = factory.Name;
+            thumbnail.Properties["Sitemap"] = sitemap;
 
-            var sitemap = await _sitemapManager.GetSitemapAsync(sitemapId);
+            thumbnails.Add(factory.Name, thumbnail);
+        }
 
-            if (sitemap == null)
-            {
-                return NotFound();
-            }
+        var model = new DisplaySitemapViewModel
+        {
+            Sitemap = sitemap,
+            Items = items,
+            Thumbnails = thumbnails,
+        };
 
-            var items = new List<dynamic>();
-            foreach (var source in sitemap.SitemapSources)
-            {
-                var item = await _displayManager.BuildDisplayAsync(source, _updateModelAccessor.ModelUpdater, "SummaryAdmin");
-                item.Properties["SitemapId"] = sitemap.SitemapId;
-                item.Properties["SitemapSource"] = source;
-                items.Add(item);
-            }
+        return View(model);
+    }
 
-            var thumbnails = new Dictionary<string, dynamic>();
-            foreach (var factory in _sourceFactories)
-            {
-                var source = factory.Create();
-                var thumbnail = await _displayManager.BuildDisplayAsync(source, _updateModelAccessor.ModelUpdater, "Thumbnail");
-                thumbnail.Properties["SitemapSource"] = source;
-                thumbnail.Properties["SitemapSourceType"] = factory.Name;
-                thumbnail.Properties["Sitemap"] = sitemap;
+    public async Task<IActionResult> Create()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
+        {
+            return Forbid();
+        }
 
-                thumbnails.Add(factory.Name, thumbnail);
-            }
+        var model = new CreateSitemapViewModel();
 
-            var model = new DisplaySitemapViewModel
-            {
-                Sitemap = sitemap,
-                Items = items,
-                Thumbnails = thumbnails,
-            };
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost]
+    public async Task<IActionResult> Create(CreateSitemapViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
+        {
+            return Forbid();
         }
 
-        public async Task<IActionResult> Create()
+        if (ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
+            if (string.IsNullOrEmpty(model.Path))
             {
-                return Forbid();
+                model.Path = _sitemapService.GetSitemapSlug(model.Name);
             }
 
-            var model = new CreateSitemapViewModel();
-
-            return View(model);
+            await _sitemapService.ValidatePathAsync(model.Path, _updateModelAccessor.ModelUpdater);
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Create(CreateSitemapViewModel model)
+        if (ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
+            var sitemap = new Sitemap
             {
-                return Forbid();
-            }
+                SitemapId = _sitemapIdGenerator.GenerateUniqueId(),
+                Name = model.Name,
+                Path = model.Path,
+                Enabled = model.Enabled
+            };
 
-            if (ModelState.IsValid)
-            {
-                if (string.IsNullOrEmpty(model.Path))
-                {
-                    model.Path = _sitemapService.GetSitemapSlug(model.Name);
-                }
+            await _sitemapManager.UpdateSitemapAsync(sitemap);
 
-                await _sitemapService.ValidatePathAsync(model.Path, _updateModelAccessor.ModelUpdater);
-            }
+            return RedirectToAction(nameof(List));
+        }
 
-            if (ModelState.IsValid)
-            {
-                var sitemap = new Sitemap
-                {
-                    SitemapId = _sitemapIdGenerator.GenerateUniqueId(),
-                    Name = model.Name,
-                    Path = model.Path,
-                    Enabled = model.Enabled
-                };
+        // If we got this far, something failed, redisplay form
+        return View(model);
+    }
 
-                await _sitemapManager.UpdateSitemapAsync(sitemap);
+    public async Task<IActionResult> Edit(string sitemapId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
+        {
+            return Forbid();
+        }
 
-                return RedirectToAction(nameof(List));
-            }
+        var sitemap = (await _sitemapManager.GetSitemapAsync(sitemapId)) as Sitemap;
 
-            // If we got this far, something failed, redisplay form
-            return View(model);
+        if (sitemap == null)
+        {
+            return NotFound();
         }
 
-        public async Task<IActionResult> Edit(string sitemapId)
+        var model = new EditSitemapViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
+            SitemapId = sitemap.SitemapId,
+            Name = sitemap.Name,
+            Enabled = sitemap.Enabled,
+            Path = sitemap.Path
+        };
 
-            var sitemap = (await _sitemapManager.GetSitemapAsync(sitemapId)) as Sitemap;
+        return View(model);
+    }
 
-            if (sitemap == null)
-            {
-                return NotFound();
-            }
+    [HttpPost]
+    public async Task<IActionResult> Edit(EditSitemapViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
+        {
+            return Forbid();
+        }
 
-            var model = new EditSitemapViewModel
-            {
-                SitemapId = sitemap.SitemapId,
-                Name = sitemap.Name,
-                Enabled = sitemap.Enabled,
-                Path = sitemap.Path
-            };
+        var sitemap = (await _sitemapManager.LoadSitemapAsync(model.SitemapId)) as Sitemap;
 
-            return View(model);
+        if (sitemap == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Edit(EditSitemapViewModel model)
+        if (ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
-
-            var sitemap = (await _sitemapManager.LoadSitemapAsync(model.SitemapId)) as Sitemap;
-
-            if (sitemap == null)
+            if (string.IsNullOrEmpty(model.Path))
             {
-                return NotFound();
+                model.Path = _sitemapService.GetSitemapSlug(model.Name);
             }
 
-            if (ModelState.IsValid)
-            {
-                if (string.IsNullOrEmpty(model.Path))
-                {
-                    model.Path = _sitemapService.GetSitemapSlug(model.Name);
-                }
+            await _sitemapService.ValidatePathAsync(model.Path, _updateModelAccessor.ModelUpdater, model.SitemapId);
+        }
 
-                await _sitemapService.ValidatePathAsync(model.Path, _updateModelAccessor.ModelUpdater, model.SitemapId);
-            }
+        if (ModelState.IsValid)
+        {
+            sitemap.Name = model.Name;
+            sitemap.Enabled = model.Enabled;
+            sitemap.Path = model.Path;
 
-            if (ModelState.IsValid)
-            {
-                sitemap.Name = model.Name;
-                sitemap.Enabled = model.Enabled;
-                sitemap.Path = model.Path;
+            await _sitemapManager.UpdateSitemapAsync(sitemap);
 
-                await _sitemapManager.UpdateSitemapAsync(sitemap);
+            await _notifier.SuccessAsync(H["Sitemap updated successfully."]);
 
-                await _notifier.SuccessAsync(H["Sitemap updated successfully."]);
+            return RedirectToAction(nameof(List));
+        }
 
-                return RedirectToAction(nameof(List));
-            }
+        // If we got this far, something failed, redisplay form
+        return View(model);
+    }
 
-            // If we got this far, something failed, redisplay form
-            return View(model);
+    [HttpPost]
+    public async Task<IActionResult> Delete(string sitemapId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(string sitemapId)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
+        var sitemap = await _sitemapManager.LoadSitemapAsync(sitemapId);
 
-            var sitemap = await _sitemapManager.LoadSitemapAsync(sitemapId);
+        if (sitemap == null)
+        {
+            return NotFound();
+        }
 
-            if (sitemap == null)
-            {
-                return NotFound();
-            }
+        await _sitemapManager.DeleteSitemapAsync(sitemapId);
 
-            await _sitemapManager.DeleteSitemapAsync(sitemapId);
+        await _notifier.SuccessAsync(H["Sitemap deleted successfully."]);
 
-            await _notifier.SuccessAsync(H["Sitemap deleted successfully."]);
+        return RedirectToAction(nameof(List));
+    }
 
-            return RedirectToAction(nameof(List));
+    [HttpPost]
+    public async Task<IActionResult> Toggle(string sitemapId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Toggle(string sitemapId)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
+        var sitemap = await _sitemapManager.LoadSitemapAsync(sitemapId);
 
-            var sitemap = await _sitemapManager.LoadSitemapAsync(sitemapId);
+        if (sitemap == null)
+        {
+            return NotFound();
+        }
 
-            if (sitemap == null)
-            {
-                return NotFound();
-            }
+        sitemap.Enabled = !sitemap.Enabled;
 
-            sitemap.Enabled = !sitemap.Enabled;
+        await _sitemapManager.UpdateSitemapAsync(sitemap);
 
-            await _sitemapManager.UpdateSitemapAsync(sitemap);
+        await _notifier.SuccessAsync(H["Sitemap toggled successfully."]);
 
-            await _notifier.SuccessAsync(H["Sitemap toggled successfully."]);
+        return RedirectToAction(nameof(List));
+    }
 
-            return RedirectToAction(nameof(List));
+    [HttpPost, ActionName("List")]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<ActionResult> ListPost(ViewModels.ContentOptions options, IEnumerable<string> itemIds)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName("List")]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<ActionResult> ListPost(ViewModels.ContentOptions options, IEnumerable<string> itemIds)
+        if (itemIds?.Count() > 0)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
-
-            if (itemIds?.Count() > 0)
+            var sitemapsList = await _sitemapManager.LoadSitemapsAsync();
+            var checkedContentItems = sitemapsList.Where(x => itemIds.Contains(x.SitemapId));
+            switch (options.BulkAction)
             {
-                var sitemapsList = await _sitemapManager.LoadSitemapsAsync();
-                var checkedContentItems = sitemapsList.Where(x => itemIds.Contains(x.SitemapId));
-                switch (options.BulkAction)
-                {
-                    case ContentsBulkAction.None:
-                        break;
-                    case ContentsBulkAction.Remove:
-                        foreach (var item in checkedContentItems)
-                        {
-                            await _sitemapManager.DeleteSitemapAsync(item.SitemapId);
-                        }
-                        await _notifier.SuccessAsync(H["Sitemaps successfully removed."]);
-                        break;
-                    default:
-                        return BadRequest();
-                }
+                case ContentsBulkAction.None:
+                    break;
+                case ContentsBulkAction.Remove:
+                    foreach (var item in checkedContentItems)
+                    {
+                        await _sitemapManager.DeleteSitemapAsync(item.SitemapId);
+                    }
+                    await _notifier.SuccessAsync(H["Sitemaps successfully removed."]);
+                    break;
+                default:
+                    return BadRequest();
             }
-
-            return RedirectToAction(nameof(List));
         }
+
+        return RedirectToAction(nameof(List));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/SitemapCacheController.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/SitemapCacheController.cs
index 9f364545d89..350828ec518 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/SitemapCacheController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/SitemapCacheController.cs
@@ -8,84 +8,83 @@
 using OrchardCore.Sitemaps.Cache;
 using OrchardCore.Sitemaps.ViewModels;
 
-namespace OrchardCore.Sitemaps.Controllers
+namespace OrchardCore.Sitemaps.Controllers;
+
+[Admin("SitemapsCache/{action}/{cacheFileName?}", "SitemapsCache{action}")]
+public class SitemapCacheController : Controller
 {
-    [Admin("SitemapsCache/{action}/{cacheFileName?}", "SitemapsCache{action}")]
-    public class SitemapCacheController : Controller
+    private readonly IAuthorizationService _authorizationService;
+    private readonly ISitemapCacheProvider _sitemapCacheProvider;
+    private readonly INotifier _notifier;
+    protected readonly IHtmlLocalizer H;
+
+    public SitemapCacheController(
+        IAuthorizationService authorizationService,
+        ISitemapCacheProvider sitemapCacheProvider,
+        INotifier notifier,
+        IHtmlLocalizer<SitemapCacheController> htmlLocalizer
+        )
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly ISitemapCacheProvider _sitemapCacheProvider;
-        private readonly INotifier _notifier;
-        protected readonly IHtmlLocalizer H;
+        _authorizationService = authorizationService;
+        _sitemapCacheProvider = sitemapCacheProvider;
+        _notifier = notifier;
+        H = htmlLocalizer;
+    }
 
-        public SitemapCacheController(
-            IAuthorizationService authorizationService,
-            ISitemapCacheProvider sitemapCacheProvider,
-            INotifier notifier,
-            IHtmlLocalizer<SitemapCacheController> htmlLocalizer
-            )
+    public async Task<IActionResult> List()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
         {
-            _authorizationService = authorizationService;
-            _sitemapCacheProvider = sitemapCacheProvider;
-            _notifier = notifier;
-            H = htmlLocalizer;
+            return Forbid();
         }
 
-        public async Task<IActionResult> List()
+        var model = new ListSitemapCacheViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
+            CachedFileNames = (await _sitemapCacheProvider.ListAsync()).ToArray()
+        };
 
-            var model = new ListSitemapCacheViewModel
-            {
-                CachedFileNames = (await _sitemapCacheProvider.ListAsync()).ToArray()
-            };
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost]
+    public async Task<IActionResult> PurgeAll()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> PurgeAll()
+        var hasErrors = await _sitemapCacheProvider.PurgeAllAsync();
+        if (hasErrors)
+        {
+            await _notifier.ErrorAsync(H["Sitemap cache purged, with errors."]);
+        }
+        else
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
+            await _notifier.InformationAsync(H["Sitemap cache purged."]);
+        }
 
-            var hasErrors = await _sitemapCacheProvider.PurgeAllAsync();
-            if (hasErrors)
-            {
-                await _notifier.ErrorAsync(H["Sitemap cache purged, with errors."]);
-            }
-            else
-            {
-                await _notifier.InformationAsync(H["Sitemap cache purged."]);
-            }
+        return RedirectToAction(nameof(List));
+    }
 
-            return RedirectToAction(nameof(List));
+    [HttpPost]
+    public async Task<IActionResult> Purge(string cacheFileName)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Purge(string cacheFileName)
+        var failed = await _sitemapCacheProvider.PurgeAsync(cacheFileName);
+        if (failed)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
-
-            var failed = await _sitemapCacheProvider.PurgeAsync(cacheFileName);
-            if (failed)
-            {
-                await _notifier.ErrorAsync(H["Error purging sitemap cache item."]);
-            }
-            else
-            {
-                await _notifier.InformationAsync(H["Sitemap cache item purged."]);
-            }
-
-            return RedirectToAction(nameof(List));
+            await _notifier.ErrorAsync(H["Error purging sitemap cache item."]);
+        }
+        else
+        {
+            await _notifier.InformationAsync(H["Sitemap cache item purged."]);
         }
+
+        return RedirectToAction(nameof(List));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/SitemapController.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/SitemapController.cs
index c0159ded7c3..8788b256371 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/SitemapController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/SitemapController.cs
@@ -12,116 +12,115 @@
 using OrchardCore.Sitemaps.Cache;
 using OrchardCore.Sitemaps.Services;
 
-namespace OrchardCore.Sitemaps.Controllers
+namespace OrchardCore.Sitemaps.Controllers;
+
+public class SitemapController : Controller
 {
-    public class SitemapController : Controller
+    private const int WarningLength = 47_185_920;
+    private const int ErrorLength = 52_428_800;
+
+    private static readonly ConcurrentDictionary<string, Lazy<Task<Stream>>> _workers = new(StringComparer.OrdinalIgnoreCase);
+
+    private readonly ISitemapManager _sitemapManager;
+    private readonly ISiteService _siteService;
+    private readonly ISitemapBuilder _sitemapBuilder;
+    private readonly ISitemapCacheProvider _sitemapCacheProvider;
+    private readonly string _tenantName;
+    private readonly ILogger _logger;
+
+    public SitemapController(
+        ISitemapManager sitemapManager,
+        ISiteService siteService,
+        ISitemapBuilder sitemapBuilder,
+        ISitemapCacheProvider sitemapCacheProvider,
+        ShellSettings shellSettings,
+        ILogger<SitemapController> logger
+        )
+    {
+        _sitemapManager = sitemapManager;
+        _siteService = siteService;
+        _sitemapBuilder = sitemapBuilder;
+        _sitemapCacheProvider = sitemapCacheProvider;
+        _tenantName = shellSettings.Name;
+        _logger = logger;
+    }
+
+    public async Task<IActionResult> Index(string sitemapId, CancellationToken cancellationToken)
     {
-        private const int WarningLength = 47_185_920;
-        private const int ErrorLength = 52_428_800;
-
-        private static readonly ConcurrentDictionary<string, Lazy<Task<Stream>>> _workers = new(StringComparer.OrdinalIgnoreCase);
-
-        private readonly ISitemapManager _sitemapManager;
-        private readonly ISiteService _siteService;
-        private readonly ISitemapBuilder _sitemapBuilder;
-        private readonly ISitemapCacheProvider _sitemapCacheProvider;
-        private readonly string _tenantName;
-        private readonly ILogger _logger;
-
-        public SitemapController(
-            ISitemapManager sitemapManager,
-            ISiteService siteService,
-            ISitemapBuilder sitemapBuilder,
-            ISitemapCacheProvider sitemapCacheProvider,
-            ShellSettings shellSettings,
-            ILogger<SitemapController> logger
-            )
+        var sitemap = await _sitemapManager.GetSitemapAsync(sitemapId);
+        if (sitemap == null || !sitemap.Enabled)
         {
-            _sitemapManager = sitemapManager;
-            _siteService = siteService;
-            _sitemapBuilder = sitemapBuilder;
-            _sitemapCacheProvider = sitemapCacheProvider;
-            _tenantName = shellSettings.Name;
-            _logger = logger;
+            return NotFound();
         }
 
-        public async Task<IActionResult> Index(string sitemapId, CancellationToken cancellationToken)
+        var fileResolver = await _sitemapCacheProvider.GetCachedSitemapAsync(sitemap.CacheFileName);
+        if (fileResolver != null)
         {
-            var sitemap = await _sitemapManager.GetSitemapAsync(sitemapId);
-            if (sitemap == null || !sitemap.Enabled)
+            // When multiple requests occur for the same sitemap it 
+            // may still be building, so we wait for it to complete.
+            if (_workers.TryGetValue(_tenantName + sitemap.Path, out var writeTask))
             {
-                return NotFound();
+                await writeTask.Value;
             }
 
-            var fileResolver = await _sitemapCacheProvider.GetCachedSitemapAsync(sitemap.CacheFileName);
-            if (fileResolver != null)
+            // File result will dispose of stream.
+            var stream = await fileResolver.OpenReadStreamAsync();
+            return File(stream, "application/xml");
+        }
+        else
+        {
+            var work = await _workers.GetOrAdd(_tenantName + sitemap.Path, x => new Lazy<Task<Stream>>(async () =>
             {
-                // When multiple requests occur for the same sitemap it 
-                // may still be building, so we wait for it to complete.
-                if (_workers.TryGetValue(_tenantName + sitemap.Path, out var writeTask))
+                try
                 {
-                    await writeTask.Value;
-                }
+                    var siteSettings = await _siteService.GetSiteSettingsAsync();
 
-                // File result will dispose of stream.
-                var stream = await fileResolver.OpenReadStreamAsync();
-                return File(stream, "application/xml");
-            }
-            else
-            {
-                var work = await _workers.GetOrAdd(_tenantName + sitemap.Path, x => new Lazy<Task<Stream>>(async () =>
-                {
-                    try
+                    var context = new SitemapBuilderContext()
                     {
-                        var siteSettings = await _siteService.GetSiteSettingsAsync();
-
-                        var context = new SitemapBuilderContext()
-                        {
-                            HostPrefix = siteSettings.BaseUrl,
-                            UrlHelper = Url
-                        };
+                        HostPrefix = siteSettings.BaseUrl,
+                        UrlHelper = Url
+                    };
 
-                        var document = await _sitemapBuilder.BuildAsync(sitemap, context);
+                    var document = await _sitemapBuilder.BuildAsync(sitemap, context);
 
-                        if (document == null)
-                        {
-                            return null;
-                        }
-
-                        document.Declaration = new XDeclaration("1.0", "utf-8", null);
-
-                        var stream = new MemoryStream();
-                        await document.SaveAsync(stream, SaveOptions.None, cancellationToken);
+                    if (document == null)
+                    {
+                        return null;
+                    }
 
-                        if (stream.Length >= ErrorLength)
-                        {
-                            _logger.LogError("Sitemap 50MB maximum length limit exceeded");
-                        }
-                        else if (stream.Length >= WarningLength)
-                        {
-                            _logger.LogWarning("Sitemap nearing 50MB length limit");
-                        }
+                    document.Declaration = new XDeclaration("1.0", "utf-8", null);
 
-                        await _sitemapCacheProvider.SetSitemapCacheAsync(stream, sitemap.CacheFileName, cancellationToken);
+                    var stream = new MemoryStream();
+                    await document.SaveAsync(stream, SaveOptions.None, cancellationToken);
 
-                        return stream;
+                    if (stream.Length >= ErrorLength)
+                    {
+                        _logger.LogError("Sitemap 50MB maximum length limit exceeded");
                     }
-                    finally
+                    else if (stream.Length >= WarningLength)
                     {
-                        _workers.TryRemove(_tenantName + sitemap.Path, out var writeCacheTask);
+                        _logger.LogWarning("Sitemap nearing 50MB length limit");
                     }
-                }, LazyThreadSafetyMode.ExecutionAndPublication)).Value;
 
-                if (work == null)
+                    await _sitemapCacheProvider.SetSitemapCacheAsync(stream, sitemap.CacheFileName, cancellationToken);
+
+                    return stream;
+                }
+                finally
                 {
-                    return NotFound();
+                    _workers.TryRemove(_tenantName + sitemap.Path, out var writeCacheTask);
                 }
+            }, LazyThreadSafetyMode.ExecutionAndPublication)).Value;
 
-                work.Position = 0;
-
-                // File result will dispose of stream.
-                return File(work, "application/xml");
+            if (work == null)
+            {
+                return NotFound();
             }
+
+            work.Position = 0;
+
+            // File result will dispose of stream.
+            return File(work, "application/xml");
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/SitemapIndexController.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/SitemapIndexController.cs
index d381f0532a4..491d6ba95a6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/SitemapIndexController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/SitemapIndexController.cs
@@ -19,349 +19,348 @@
 using OrchardCore.Sitemaps.Services;
 using OrchardCore.Sitemaps.ViewModels;
 
-namespace OrchardCore.Sitemaps.Controllers
+namespace OrchardCore.Sitemaps.Controllers;
+
+[Admin("SitemapIndexes/{action}/{sitemapId?}", "SitemapIndexes{action}")]
+public class SitemapIndexController : Controller
 {
-    [Admin("SitemapIndexes/{action}/{sitemapId?}", "SitemapIndexes{action}")]
-    public class SitemapIndexController : Controller
+    private const string _optionsSearch = "Options.Search";
+
+    private readonly ISitemapHelperService _sitemapService;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly ISitemapIdGenerator _sitemapIdGenerator;
+    private readonly ISitemapManager _sitemapManager;
+    private readonly PagerOptions _pagerOptions;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly INotifier _notifier;
+    private readonly IShapeFactory _shapeFactory;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public SitemapIndexController(
+        ISitemapHelperService sitemapService,
+        IAuthorizationService authorizationService,
+        ISitemapIdGenerator sitemapIdGenerator,
+        ISitemapManager sitemapManager,
+        IOptions<PagerOptions> pagerOptions,
+        IUpdateModelAccessor updateModelAccessor,
+        IShapeFactory shapeFactory,
+        IStringLocalizer<SitemapIndexController> stringLocalizer,
+        IHtmlLocalizer<SitemapIndexController> htmlLocalizer,
+        INotifier notifier)
     {
-        private const string _optionsSearch = "Options.Search";
-
-        private readonly ISitemapHelperService _sitemapService;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly ISitemapIdGenerator _sitemapIdGenerator;
-        private readonly ISitemapManager _sitemapManager;
-        private readonly PagerOptions _pagerOptions;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly INotifier _notifier;
-        private readonly IShapeFactory _shapeFactory;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public SitemapIndexController(
-            ISitemapHelperService sitemapService,
-            IAuthorizationService authorizationService,
-            ISitemapIdGenerator sitemapIdGenerator,
-            ISitemapManager sitemapManager,
-            IOptions<PagerOptions> pagerOptions,
-            IUpdateModelAccessor updateModelAccessor,
-            IShapeFactory shapeFactory,
-            IStringLocalizer<SitemapIndexController> stringLocalizer,
-            IHtmlLocalizer<SitemapIndexController> htmlLocalizer,
-            INotifier notifier)
-        {
-            _sitemapService = sitemapService;
-            _authorizationService = authorizationService;
-            _sitemapIdGenerator = sitemapIdGenerator;
-            _sitemapManager = sitemapManager;
-            _pagerOptions = pagerOptions.Value;
-            _updateModelAccessor = updateModelAccessor;
-            _notifier = notifier;
-            _shapeFactory = shapeFactory;
-            S = stringLocalizer;
-            H = htmlLocalizer;
-        }
+        _sitemapService = sitemapService;
+        _authorizationService = authorizationService;
+        _sitemapIdGenerator = sitemapIdGenerator;
+        _sitemapManager = sitemapManager;
+        _pagerOptions = pagerOptions.Value;
+        _updateModelAccessor = updateModelAccessor;
+        _notifier = notifier;
+        _shapeFactory = shapeFactory;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+    }
 
-        public async Task<IActionResult> List(ContentOptions options, PagerParameters pagerParameters)
+    public async Task<IActionResult> List(ContentOptions options, PagerParameters pagerParameters)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
 
-            var sitemaps = (await _sitemapManager.GetSitemapsAsync())
-                .OfType<SitemapIndex>();
+        var sitemaps = (await _sitemapManager.GetSitemapsAsync())
+            .OfType<SitemapIndex>();
 
-            if (!string.IsNullOrWhiteSpace(options.Search))
-            {
-                sitemaps = sitemaps.Where(x => x.Name.Contains(options.Search, StringComparison.OrdinalIgnoreCase));
-            }
+        if (!string.IsNullOrWhiteSpace(options.Search))
+        {
+            sitemaps = sitemaps.Where(x => x.Name.Contains(options.Search, StringComparison.OrdinalIgnoreCase));
+        }
 
-            var count = sitemaps.Count();
+        var count = sitemaps.Count();
 
-            var results = sitemaps
-                .Skip(pager.GetStartIndex())
-                .Take(pager.PageSize)
-                .ToList();
+        var results = sitemaps
+            .Skip(pager.GetStartIndex())
+            .Take(pager.PageSize)
+            .ToList();
 
-            // Maintain previous route data when generating page links.
-            var routeData = new RouteData();
+        // Maintain previous route data when generating page links.
+        var routeData = new RouteData();
 
-            if (!string.IsNullOrEmpty(options.Search))
-            {
-                routeData.Values.TryAdd(_optionsSearch, options.Search);
-            }
+        if (!string.IsNullOrEmpty(options.Search))
+        {
+            routeData.Values.TryAdd(_optionsSearch, options.Search);
+        }
 
-            var pagerShape = await _shapeFactory.PagerAsync(pager, count, routeData);
+        var pagerShape = await _shapeFactory.PagerAsync(pager, count, routeData);
 
-            var model = new ListSitemapIndexViewModel
-            {
-                SitemapIndexes = results.Select(sm => new SitemapIndexListEntry { SitemapId = sm.SitemapId, Name = sm.Name, Enabled = sm.Enabled }).ToList(),
-                Options = options,
-                Pager = pagerShape
-            };
+        var model = new ListSitemapIndexViewModel
+        {
+            SitemapIndexes = results.Select(sm => new SitemapIndexListEntry { SitemapId = sm.SitemapId, Name = sm.Name, Enabled = sm.Enabled }).ToList(),
+            Options = options,
+            Pager = pagerShape
+        };
 
-            model.Options.ContentsBulkAction =
-            [
-                new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
-            ];
+        model.Options.ContentsBulkAction =
+        [
+            new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+        ];
 
 
-            return View(model);
-        }
+        return View(model);
+    }
 
-        [HttpPost, ActionName(nameof(List))]
-        [FormValueRequired("submit.Filter")]
-        public ActionResult ListFilterPOST(ListSitemapIndexViewModel model)
-            => RedirectToAction(nameof(List), new RouteValueDictionary
-            {
-                { _optionsSearch, model.Options.Search }
-            });
+    [HttpPost, ActionName(nameof(List))]
+    [FormValueRequired("submit.Filter")]
+    public ActionResult ListFilterPOST(ListSitemapIndexViewModel model)
+        => RedirectToAction(nameof(List), new RouteValueDictionary
+        {
+            { _optionsSearch, model.Options.Search }
+        });
 
-        public async Task<IActionResult> Create()
+    public async Task<IActionResult> Create()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var sitemaps = await _sitemapManager.GetSitemapsAsync();
-
-            var containableSitemaps = sitemaps
-                .Where(s => s.GetType() != typeof(SitemapIndex))
-                .Select(s => new ContainableSitemapEntryViewModel
-                {
-                    SitemapId = s.SitemapId,
-                    Name = s.Name,
-                    IsChecked = false
-                })
-                .OrderBy(s => s.Name)
-                .ToArray();
+        var sitemaps = await _sitemapManager.GetSitemapsAsync();
 
-            var model = new CreateSitemapIndexViewModel
+        var containableSitemaps = sitemaps
+            .Where(s => s.GetType() != typeof(SitemapIndex))
+            .Select(s => new ContainableSitemapEntryViewModel
             {
-                ContainableSitemaps = containableSitemaps
-            };
+                SitemapId = s.SitemapId,
+                Name = s.Name,
+                IsChecked = false
+            })
+            .OrderBy(s => s.Name)
+            .ToArray();
+
+        var model = new CreateSitemapIndexViewModel
+        {
+            ContainableSitemaps = containableSitemaps
+        };
 
-            return View(model);
-        }
+        return View(model);
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> Create(CreateSitemapIndexViewModel model)
+    [HttpPost]
+    public async Task<IActionResult> Create(CreateSitemapIndexViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
-
-            var sitemap = new SitemapIndex
-            {
-                SitemapId = _sitemapIdGenerator.GenerateUniqueId()
-            };
+            return Forbid();
+        }
 
-            var indexSource = new SitemapIndexSource
-            {
-                Id = _sitemapIdGenerator.GenerateUniqueId()
-            };
+        var sitemap = new SitemapIndex
+        {
+            SitemapId = _sitemapIdGenerator.GenerateUniqueId()
+        };
 
-            sitemap.SitemapSources.Add(indexSource);
+        var indexSource = new SitemapIndexSource
+        {
+            Id = _sitemapIdGenerator.GenerateUniqueId()
+        };
 
-            if (ModelState.IsValid)
-            {
-                await _sitemapService.ValidatePathAsync(model.Path, _updateModelAccessor.ModelUpdater);
+        sitemap.SitemapSources.Add(indexSource);
 
-            }
+        if (ModelState.IsValid)
+        {
+            await _sitemapService.ValidatePathAsync(model.Path, _updateModelAccessor.ModelUpdater);
 
-            // Path validation may invalidate model state.
-            if (ModelState.IsValid)
-            {
-                sitemap.Name = model.Name;
-                sitemap.Enabled = model.Enabled;
-                sitemap.Path = model.Path;
+        }
 
-                indexSource.ContainedSitemapIds = model.ContainableSitemaps
-                    .Where(m => m.IsChecked)
-                    .Select(m => m.SitemapId)
-                    .ToArray();
+        // Path validation may invalidate model state.
+        if (ModelState.IsValid)
+        {
+            sitemap.Name = model.Name;
+            sitemap.Enabled = model.Enabled;
+            sitemap.Path = model.Path;
 
-                await _sitemapManager.UpdateSitemapAsync(sitemap);
+            indexSource.ContainedSitemapIds = model.ContainableSitemaps
+                .Where(m => m.IsChecked)
+                .Select(m => m.SitemapId)
+                .ToArray();
 
-                await _notifier.SuccessAsync(H["Sitemap index created successfully"]);
+            await _sitemapManager.UpdateSitemapAsync(sitemap);
 
-                return RedirectToAction(nameof(List));
-            }
+            await _notifier.SuccessAsync(H["Sitemap index created successfully"]);
 
-            // If we got this far, something failed, redisplay form
-            return View(model);
+            return RedirectToAction(nameof(List));
         }
 
-        public async Task<IActionResult> Edit(string sitemapId)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
+        // If we got this far, something failed, redisplay form
+        return View(model);
+    }
 
-            var sitemap = (await _sitemapManager.GetSitemapAsync(sitemapId)) as SitemapIndex;
+    public async Task<IActionResult> Edit(string sitemapId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
+        {
+            return Forbid();
+        }
 
-            if (sitemap == null)
-            {
-                return NotFound();
-            }
+        var sitemap = (await _sitemapManager.GetSitemapAsync(sitemapId)) as SitemapIndex;
 
-            var sitemaps = await _sitemapManager.GetSitemapsAsync();
+        if (sitemap == null)
+        {
+            return NotFound();
+        }
 
-            var indexSource = sitemap.SitemapSources.FirstOrDefault() as SitemapIndexSource;
+        var sitemaps = await _sitemapManager.GetSitemapsAsync();
 
-            var containableSitemaps = sitemaps
-                .Where(s => s.GetType() != typeof(SitemapIndex))
-                .Select(s => new ContainableSitemapEntryViewModel
-                {
-                    SitemapId = s.SitemapId,
-                    Name = s.Name,
-                    IsChecked = indexSource.ContainedSitemapIds.Any(id => id == s.SitemapId)
-                })
-                .OrderBy(s => s.Name)
-                .ToArray();
+        var indexSource = sitemap.SitemapSources.FirstOrDefault() as SitemapIndexSource;
 
-            var model = new EditSitemapIndexViewModel
+        var containableSitemaps = sitemaps
+            .Where(s => s.GetType() != typeof(SitemapIndex))
+            .Select(s => new ContainableSitemapEntryViewModel
             {
-                SitemapId = sitemap.SitemapId,
-                Name = sitemap.Name,
-                Enabled = sitemap.Enabled,
-                Path = sitemap.Path,
-                SitemapIndexSource = indexSource,
-                ContainableSitemaps = containableSitemaps
-            };
-
-            return View(model);
-        }
+                SitemapId = s.SitemapId,
+                Name = s.Name,
+                IsChecked = indexSource.ContainedSitemapIds.Any(id => id == s.SitemapId)
+            })
+            .OrderBy(s => s.Name)
+            .ToArray();
+
+        var model = new EditSitemapIndexViewModel
+        {
+            SitemapId = sitemap.SitemapId,
+            Name = sitemap.Name,
+            Enabled = sitemap.Enabled,
+            Path = sitemap.Path,
+            SitemapIndexSource = indexSource,
+            ContainableSitemaps = containableSitemaps
+        };
+
+        return View(model);
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> Edit(EditSitemapIndexViewModel model)
+    [HttpPost]
+    public async Task<IActionResult> Edit(EditSitemapIndexViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var sitemap = await _sitemapManager.LoadSitemapAsync(model.SitemapId);
+        var sitemap = await _sitemapManager.LoadSitemapAsync(model.SitemapId);
 
-            if (sitemap == null)
-            {
-                return NotFound();
-            }
+        if (sitemap == null)
+        {
+            return NotFound();
+        }
 
-            var indexSource = sitemap.SitemapSources.FirstOrDefault() as SitemapIndexSource;
+        var indexSource = sitemap.SitemapSources.FirstOrDefault() as SitemapIndexSource;
 
-            model.SitemapIndexSource = indexSource;
+        model.SitemapIndexSource = indexSource;
 
-            if (ModelState.IsValid)
-            {
-                await _sitemapService.ValidatePathAsync(model.Path, _updateModelAccessor.ModelUpdater, sitemap.SitemapId);
-            }
-
-            // Path validation may invalidate model state.
-            if (ModelState.IsValid)
-            {
-                sitemap.Name = model.Name;
-                sitemap.Enabled = model.Enabled;
-                sitemap.Path = model.Path;
+        if (ModelState.IsValid)
+        {
+            await _sitemapService.ValidatePathAsync(model.Path, _updateModelAccessor.ModelUpdater, sitemap.SitemapId);
+        }
 
-                indexSource.ContainedSitemapIds = model.ContainableSitemaps
-                    .Where(m => m.IsChecked)
-                    .Select(m => m.SitemapId)
-                    .ToArray();
+        // Path validation may invalidate model state.
+        if (ModelState.IsValid)
+        {
+            sitemap.Name = model.Name;
+            sitemap.Enabled = model.Enabled;
+            sitemap.Path = model.Path;
 
-                await _sitemapManager.UpdateSitemapAsync(sitemap);
+            indexSource.ContainedSitemapIds = model.ContainableSitemaps
+                .Where(m => m.IsChecked)
+                .Select(m => m.SitemapId)
+                .ToArray();
 
-                await _notifier.SuccessAsync(H["Sitemap index updated successfully"]);
+            await _sitemapManager.UpdateSitemapAsync(sitemap);
 
-                return RedirectToAction(nameof(List));
-            }
+            await _notifier.SuccessAsync(H["Sitemap index updated successfully"]);
 
-            // If we got this far, something failed, redisplay form
-            return View(model);
+            return RedirectToAction(nameof(List));
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(string sitemapId)
+        // If we got this far, something failed, redisplay form
+        return View(model);
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Delete(string sitemapId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var sitemap = await _sitemapManager.LoadSitemapAsync(sitemapId);
+        var sitemap = await _sitemapManager.LoadSitemapAsync(sitemapId);
 
-            if (sitemap == null)
-            {
-                return NotFound();
-            }
+        if (sitemap == null)
+        {
+            return NotFound();
+        }
 
-            await _sitemapManager.DeleteSitemapAsync(sitemapId);
+        await _sitemapManager.DeleteSitemapAsync(sitemapId);
 
-            await _notifier.SuccessAsync(H["Sitemap index deleted successfully."]);
+        await _notifier.SuccessAsync(H["Sitemap index deleted successfully."]);
 
-            return RedirectToAction(nameof(List));
-        }
+        return RedirectToAction(nameof(List));
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> Toggle(string sitemapId)
+    [HttpPost]
+    public async Task<IActionResult> Toggle(string sitemapId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var sitemap = await _sitemapManager.LoadSitemapAsync(sitemapId);
+        var sitemap = await _sitemapManager.LoadSitemapAsync(sitemapId);
 
-            if (sitemap == null)
-            {
-                return NotFound();
-            }
+        if (sitemap == null)
+        {
+            return NotFound();
+        }
 
-            sitemap.Enabled = !sitemap.Enabled;
+        sitemap.Enabled = !sitemap.Enabled;
 
-            await _sitemapManager.UpdateSitemapAsync(sitemap);
+        await _sitemapManager.UpdateSitemapAsync(sitemap);
 
-            await _notifier.SuccessAsync(H["Sitemap index menu toggled successfully."]);
+        await _notifier.SuccessAsync(H["Sitemap index menu toggled successfully."]);
 
-            return RedirectToAction(nameof(List));
-        }
+        return RedirectToAction(nameof(List));
+    }
 
-        [HttpPost, ActionName("List")]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<ActionResult> ListPost(ViewModels.ContentOptions options, IEnumerable<string> itemIds)
+    [HttpPost, ActionName("List")]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<ActionResult> ListPost(ViewModels.ContentOptions options, IEnumerable<string> itemIds)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            if (itemIds?.Count() > 0)
+        if (itemIds?.Count() > 0)
+        {
+            var sitemapsList = await _sitemapManager.LoadSitemapsAsync();
+            var checkedContentItems = sitemapsList.Where(x => itemIds.Contains(x.SitemapId));
+            switch (options.BulkAction)
             {
-                var sitemapsList = await _sitemapManager.LoadSitemapsAsync();
-                var checkedContentItems = sitemapsList.Where(x => itemIds.Contains(x.SitemapId));
-                switch (options.BulkAction)
-                {
-                    case ContentsBulkAction.None:
-                        break;
-                    case ContentsBulkAction.Remove:
-                        foreach (var item in checkedContentItems)
-                        {
-                            await _sitemapManager.DeleteSitemapAsync(item.SitemapId);
-                        }
-                        await _notifier.SuccessAsync(H["Sitemap indices successfully removed."]);
-                        break;
-                    default:
-                        return BadRequest();
-                }
+                case ContentsBulkAction.None:
+                    break;
+                case ContentsBulkAction.Remove:
+                    foreach (var item in checkedContentItems)
+                    {
+                        await _sitemapManager.DeleteSitemapAsync(item.SitemapId);
+                    }
+                    await _notifier.SuccessAsync(H["Sitemap indices successfully removed."]);
+                    break;
+                default:
+                    return BadRequest();
             }
-
-            return RedirectToAction(nameof(List));
         }
+
+        return RedirectToAction(nameof(List));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/SourceController.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/SourceController.cs
index 89140252c0b..d878da35d16 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/SourceController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Controllers/SourceController.cs
@@ -14,223 +14,222 @@
 using OrchardCore.Sitemaps.Services;
 using OrchardCore.Sitemaps.ViewModels;
 
-namespace OrchardCore.Sitemaps.Controllers
+namespace OrchardCore.Sitemaps.Controllers;
+
+[Admin]
+public class SourceController : Controller
 {
-    [Admin]
-    public class SourceController : Controller
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IDisplayManager<SitemapSource> _displayManager;
+    private readonly IEnumerable<ISitemapSourceFactory> _factories;
+    private readonly ISitemapManager _sitemapManager;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly INotifier _notifier;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public SourceController(
+        IAuthorizationService authorizationService,
+        IDisplayManager<SitemapSource> displayManager,
+        IEnumerable<ISitemapSourceFactory> factories,
+        ISitemapManager sitemapManager,
+        IUpdateModelAccessor updateModelAccessor,
+        INotifier notifier,
+        IStringLocalizer<SourceController> stringLocalizer,
+        IHtmlLocalizer<SourceController> htmlLocalizer)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IDisplayManager<SitemapSource> _displayManager;
-        private readonly IEnumerable<ISitemapSourceFactory> _factories;
-        private readonly ISitemapManager _sitemapManager;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly INotifier _notifier;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
+        _displayManager = displayManager;
+        _factories = factories;
+        _authorizationService = authorizationService;
+        _sitemapManager = sitemapManager;
+        _updateModelAccessor = updateModelAccessor;
+        _notifier = notifier;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+    }
 
-        public SourceController(
-            IAuthorizationService authorizationService,
-            IDisplayManager<SitemapSource> displayManager,
-            IEnumerable<ISitemapSourceFactory> factories,
-            ISitemapManager sitemapManager,
-            IUpdateModelAccessor updateModelAccessor,
-            INotifier notifier,
-            IStringLocalizer<SourceController> stringLocalizer,
-            IHtmlLocalizer<SourceController> htmlLocalizer)
+    [Admin("SitemapSource/Create/{sitemapId}/{sourceType}", "SitemapsSourceCreate")]
+    public async Task<IActionResult> Create(string sitemapId, string sourceType)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
         {
-            _displayManager = displayManager;
-            _factories = factories;
-            _authorizationService = authorizationService;
-            _sitemapManager = sitemapManager;
-            _updateModelAccessor = updateModelAccessor;
-            _notifier = notifier;
-            S = stringLocalizer;
-            H = htmlLocalizer;
+            return Forbid();
         }
 
-        [Admin("SitemapSource/Create/{sitemapId}/{sourceType}", "SitemapsSourceCreate")]
-        public async Task<IActionResult> Create(string sitemapId, string sourceType)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
-
-            var sitemap = await _sitemapManager.GetSitemapAsync(sitemapId);
+        var sitemap = await _sitemapManager.GetSitemapAsync(sitemapId);
 
-            if (sitemap == null)
-            {
-                return NotFound();
-            }
+        if (sitemap == null)
+        {
+            return NotFound();
+        }
 
-            var source = _factories.FirstOrDefault(x => x.Name == sourceType)?.Create();
+        var source = _factories.FirstOrDefault(x => x.Name == sourceType)?.Create();
 
-            if (source == null)
-            {
-                return NotFound();
-            }
+        if (source == null)
+        {
+            return NotFound();
+        }
 
-            var model = new CreateSourceViewModel
-            {
-                SitemapId = sitemapId,
-                SitemapSource = source,
-                SitemapSourceId = source.Id,
-                SitemapSourceType = sourceType,
-                Editor = await _displayManager.BuildEditorAsync(source, updater: _updateModelAccessor.ModelUpdater, isNew: true, "", "")
-            };
+        var model = new CreateSourceViewModel
+        {
+            SitemapId = sitemapId,
+            SitemapSource = source,
+            SitemapSourceId = source.Id,
+            SitemapSourceType = sourceType,
+            Editor = await _displayManager.BuildEditorAsync(source, updater: _updateModelAccessor.ModelUpdater, isNew: true, "", "")
+        };
 
-            model.Editor.SitemapSource = source;
+        model.Editor.SitemapSource = source;
 
-            return View(model);
-        }
+        return View(model);
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> Create(CreateSourceViewModel model)
+    [HttpPost]
+    public async Task<IActionResult> Create(CreateSourceViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var sitemap = await _sitemapManager.LoadSitemapAsync(model.SitemapId);
+        var sitemap = await _sitemapManager.LoadSitemapAsync(model.SitemapId);
 
-            if (sitemap == null)
-            {
-                return NotFound();
-            }
+        if (sitemap == null)
+        {
+            return NotFound();
+        }
 
-            var source = _factories.FirstOrDefault(x => x.Name == model.SitemapSourceType)?.Create();
+        var source = _factories.FirstOrDefault(x => x.Name == model.SitemapSourceType)?.Create();
 
-            if (source == null)
-            {
-                return NotFound();
-            }
+        if (source == null)
+        {
+            return NotFound();
+        }
 
-            var editor = await _displayManager.UpdateEditorAsync(source, updater: _updateModelAccessor.ModelUpdater, isNew: true, "", "");
-            editor.Properties["SitemapStep"] = source;
+        var editor = await _displayManager.UpdateEditorAsync(source, updater: _updateModelAccessor.ModelUpdater, isNew: true, "", "");
+        editor.Properties["SitemapStep"] = source;
 
-            if (ModelState.IsValid)
-            {
-                source.Id = model.SitemapSourceId;
-                sitemap.SitemapSources.Add(source);
+        if (ModelState.IsValid)
+        {
+            source.Id = model.SitemapSourceId;
+            sitemap.SitemapSources.Add(source);
 
-                await _sitemapManager.UpdateSitemapAsync(sitemap);
+            await _sitemapManager.UpdateSitemapAsync(sitemap);
 
-                await _notifier.SuccessAsync(H["Sitemap source added successfully."]);
-                return RedirectToAction("Display", "Admin", new { sitemapId = model.SitemapId });
-            }
+            await _notifier.SuccessAsync(H["Sitemap source added successfully."]);
+            return RedirectToAction("Display", "Admin", new { sitemapId = model.SitemapId });
+        }
 
-            model.Editor = editor;
+        model.Editor = editor;
 
-            // If we got this far, something failed, redisplay form
-            return View(model);
-        }
+        // If we got this far, something failed, redisplay form
+        return View(model);
+    }
 
-        [Admin("SitemapSource/Edit/{sitemapId}/{sourceId}", "SitemapsSourceEdit")]
-        public async Task<IActionResult> Edit(string sitemapId, string sourceId)
+    [Admin("SitemapSource/Edit/{sitemapId}/{sourceId}", "SitemapsSourceEdit")]
+    public async Task<IActionResult> Edit(string sitemapId, string sourceId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var sitemap = await _sitemapManager.GetSitemapAsync(sitemapId);
+        var sitemap = await _sitemapManager.GetSitemapAsync(sitemapId);
 
-            if (sitemap == null)
-            {
-                return NotFound();
-            }
+        if (sitemap == null)
+        {
+            return NotFound();
+        }
 
-            var source = sitemap.SitemapSources.FirstOrDefault(x => string.Equals(x.Id, sourceId, StringComparison.OrdinalIgnoreCase));
+        var source = sitemap.SitemapSources.FirstOrDefault(x => string.Equals(x.Id, sourceId, StringComparison.OrdinalIgnoreCase));
 
-            if (source == null)
-            {
-                return NotFound();
-            }
+        if (source == null)
+        {
+            return NotFound();
+        }
 
-            var model = new EditSourceViewModel
-            {
-                SitemapId = sitemapId,
-                SitemapSource = source,
-                SitemapSourceId = source.Id,
-                Editor = await _displayManager.BuildEditorAsync(source, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "")
-            };
+        var model = new EditSourceViewModel
+        {
+            SitemapId = sitemapId,
+            SitemapSource = source,
+            SitemapSourceId = source.Id,
+            Editor = await _displayManager.BuildEditorAsync(source, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "")
+        };
 
-            model.Editor.SitemapSource = source;
+        model.Editor.SitemapSource = source;
 
-            return View(model);
-        }
+        return View(model);
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> Edit(EditSourceViewModel model)
+    [HttpPost]
+    public async Task<IActionResult> Edit(EditSourceViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var sitemap = await _sitemapManager.LoadSitemapAsync(model.SitemapId);
+        var sitemap = await _sitemapManager.LoadSitemapAsync(model.SitemapId);
 
-            if (sitemap == null)
-            {
-                return NotFound();
-            }
+        if (sitemap == null)
+        {
+            return NotFound();
+        }
 
-            var source = sitemap.SitemapSources.FirstOrDefault(x => string.Equals(x.Id, model.SitemapSourceId, StringComparison.OrdinalIgnoreCase));
+        var source = sitemap.SitemapSources.FirstOrDefault(x => string.Equals(x.Id, model.SitemapSourceId, StringComparison.OrdinalIgnoreCase));
 
-            if (source == null)
-            {
-                return NotFound();
-            }
+        if (source == null)
+        {
+            return NotFound();
+        }
 
-            var editor = await _displayManager.UpdateEditorAsync(source, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "");
+        var editor = await _displayManager.UpdateEditorAsync(source, updater: _updateModelAccessor.ModelUpdater, isNew: false, "", "");
 
-            if (ModelState.IsValid)
-            {
-                await _sitemapManager.UpdateSitemapAsync(sitemap);
+        if (ModelState.IsValid)
+        {
+            await _sitemapManager.UpdateSitemapAsync(sitemap);
 
-                await _notifier.SuccessAsync(H["Sitemap source updated successfully."]);
-                return RedirectToAction("Display", "Admin", new { sitemapId = model.SitemapId });
-            }
+            await _notifier.SuccessAsync(H["Sitemap source updated successfully."]);
+            return RedirectToAction("Display", "Admin", new { sitemapId = model.SitemapId });
+        }
 
-            await _notifier.ErrorAsync(H["The sitemap source has validation errors."]);
-            model.Editor = editor;
+        await _notifier.ErrorAsync(H["The sitemap source has validation errors."]);
+        model.Editor = editor;
 
-            // If we got this far, something failed, redisplay form
-            return View(model);
-        }
+        // If we got this far, something failed, redisplay form
+        return View(model);
+    }
 
-        [HttpPost]
-        [Admin("SitemapSource/Delete/{sitemapId}/{sourceId}", "SitemapsSourceDelete")]
-        public async Task<IActionResult> Delete(string sitemapId, string sourceId)
+    [HttpPost]
+    [Admin("SitemapSource/Delete/{sitemapId}/{sourceId}", "SitemapsSourceDelete")]
+    public async Task<IActionResult> Delete(string sitemapId, string sourceId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageSitemaps))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var sitemap = await _sitemapManager.LoadSitemapAsync(sitemapId);
+        var sitemap = await _sitemapManager.LoadSitemapAsync(sitemapId);
 
-            if (sitemap == null)
-            {
-                return NotFound();
-            }
+        if (sitemap == null)
+        {
+            return NotFound();
+        }
 
-            var source = sitemap.SitemapSources.FirstOrDefault(x => string.Equals(x.Id, sourceId, StringComparison.OrdinalIgnoreCase));
+        var source = sitemap.SitemapSources.FirstOrDefault(x => string.Equals(x.Id, sourceId, StringComparison.OrdinalIgnoreCase));
 
-            if (source == null)
-            {
-                return NotFound();
-            }
+        if (source == null)
+        {
+            return NotFound();
+        }
 
-            sitemap.SitemapSources.Remove(source);
+        sitemap.SitemapSources.Remove(source);
 
-            await _sitemapManager.UpdateSitemapAsync(sitemap);
+        await _sitemapManager.UpdateSitemapAsync(sitemap);
 
-            await _notifier.SuccessAsync(H["Sitemap source deleted successfully."]);
+        await _notifier.SuccessAsync(H["Sitemap source deleted successfully."]);
 
-            return RedirectToAction("Display", "Admin", new { sitemapId });
-        }
+        return RedirectToAction("Display", "Admin", new { sitemapId });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Deployment/AllSitemapsDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Deployment/AllSitemapsDeploymentSource.cs
index 67a817cba33..7ad943c3231 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Deployment/AllSitemapsDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Deployment/AllSitemapsDeploymentSource.cs
@@ -5,37 +5,36 @@
 using OrchardCore.Json;
 using OrchardCore.Sitemaps.Services;
 
-namespace OrchardCore.Sitemaps.Deployment
+namespace OrchardCore.Sitemaps.Deployment;
+
+public sealed class AllSitemapsDeploymentSource : IDeploymentSource
 {
-    public sealed class AllSitemapsDeploymentSource : IDeploymentSource
+    private readonly ISitemapManager _sitemapManager;
+    private readonly DocumentJsonSerializerOptions _documentJsonSerializerOptions;
+
+    public AllSitemapsDeploymentSource(
+        ISitemapManager sitemapManager,
+        IOptions<DocumentJsonSerializerOptions> documentJsonSerializerOptions)
     {
-        private readonly ISitemapManager _sitemapManager;
-        private readonly DocumentJsonSerializerOptions _documentJsonSerializerOptions;
+        _sitemapManager = sitemapManager;
+        _documentJsonSerializerOptions = documentJsonSerializerOptions.Value;
+    }
 
-        public AllSitemapsDeploymentSource(
-            ISitemapManager sitemapManager,
-            IOptions<DocumentJsonSerializerOptions> documentJsonSerializerOptions)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        if (step is not AllSitemapsDeploymentStep)
         {
-            _sitemapManager = sitemapManager;
-            _documentJsonSerializerOptions = documentJsonSerializerOptions.Value;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
-        {
-            if (step is not AllSitemapsDeploymentStep)
-            {
-                return;
-            }
-
-            var sitemaps = await _sitemapManager.GetSitemapsAsync();
+        var sitemaps = await _sitemapManager.GetSitemapsAsync();
 
-            var jArray = JArray.FromObject(sitemaps, _documentJsonSerializerOptions.SerializerOptions);
+        var jArray = JArray.FromObject(sitemaps, _documentJsonSerializerOptions.SerializerOptions);
 
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "Sitemaps",
-                ["data"] = jArray,
-            });
-        }
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "Sitemaps",
+            ["data"] = jArray,
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Deployment/AllSitemapsDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Deployment/AllSitemapsDeploymentStep.cs
index 3b408d8a00b..53d4aed7a5c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Deployment/AllSitemapsDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Deployment/AllSitemapsDeploymentStep.cs
@@ -1,12 +1,11 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Sitemaps.Deployment
+namespace OrchardCore.Sitemaps.Deployment;
+
+public sealed class AllSitemapsDeploymentStep : DeploymentStep
 {
-    public sealed class AllSitemapsDeploymentStep : DeploymentStep
+    public AllSitemapsDeploymentStep()
     {
-        public AllSitemapsDeploymentStep()
-        {
-            Name = "AllSitemaps";
-        }
+        Name = "AllSitemaps";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Deployment/AllSitemapsDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Deployment/AllSitemapsDeploymentStepDriver.cs
index 3a34244e9f0..94b121597cd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Deployment/AllSitemapsDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Deployment/AllSitemapsDeploymentStepDriver.cs
@@ -3,22 +3,21 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Sitemaps.Deployment
+namespace OrchardCore.Sitemaps.Deployment;
+
+public sealed class AllSitemapsDeploymentStepDriver : DisplayDriver<DeploymentStep, AllSitemapsDeploymentStep>
 {
-    public sealed class AllSitemapsDeploymentStepDriver : DisplayDriver<DeploymentStep, AllSitemapsDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(AllSitemapsDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(AllSitemapsDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("AllSitemapsDeploymentStep_Summary", step).Location("Summary", "Content"),
-                    View("AllSitemapsDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("AllSitemapsDeploymentStep_Summary", step).Location("Summary", "Content"),
+                View("AllSitemapsDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(AllSitemapsDeploymentStep step, BuildEditorContext context)
-        {
-            return View("AllSitemapsDeploymentStep_Edit", step).Location("Content");
-        }
+    public override IDisplayResult Edit(AllSitemapsDeploymentStep step, BuildEditorContext context)
+    {
+        return View("AllSitemapsDeploymentStep_Edit", step).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Drivers/CustomPathSitemapSourceDriver.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Drivers/CustomPathSitemapSourceDriver.cs
index 31826e48d77..91bd4b2e385 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Drivers/CustomPathSitemapSourceDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Drivers/CustomPathSitemapSourceDriver.cs
@@ -8,64 +8,63 @@
 using OrchardCore.Sitemaps.Models;
 using OrchardCore.Sitemaps.ViewModels;
 
-namespace OrchardCore.Sitemaps.Drivers
+namespace OrchardCore.Sitemaps.Drivers;
+
+public sealed class CustomPathSitemapSourceDriver : DisplayDriver<SitemapSource, CustomPathSitemapSource>
 {
-    public sealed class CustomPathSitemapSourceDriver : DisplayDriver<SitemapSource, CustomPathSitemapSource>
-    {
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public CustomPathSitemapSourceDriver(IStringLocalizer<CustomPathSitemapSourceDriver> localizer)
-        {
-            S = localizer;
-        }
+    public CustomPathSitemapSourceDriver(IStringLocalizer<CustomPathSitemapSourceDriver> localizer)
+    {
+        S = localizer;
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(CustomPathSitemapSource sitemapSource, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                View("CustomPathSitemapSource_SummaryAdmin", sitemapSource).Location("SummaryAdmin", "Content"),
-                View("CustomPathSitemapSource_Thumbnail", sitemapSource).Location("Thumbnail", "Content")
-            );
-        }
+    public override Task<IDisplayResult> DisplayAsync(CustomPathSitemapSource sitemapSource, BuildDisplayContext context)
+    {
+        return CombineAsync(
+            View("CustomPathSitemapSource_SummaryAdmin", sitemapSource).Location("SummaryAdmin", "Content"),
+            View("CustomPathSitemapSource_Thumbnail", sitemapSource).Location("Thumbnail", "Content")
+        );
+    }
 
-        public override IDisplayResult Edit(CustomPathSitemapSource sitemapSource, BuildEditorContext context)
+    public override IDisplayResult Edit(CustomPathSitemapSource sitemapSource, BuildEditorContext context)
+    {
+        return Initialize<CustomPathSitemapSourceViewModel>("CustomPathSitemapSource_Edit", model =>
         {
-            return Initialize<CustomPathSitemapSourceViewModel>("CustomPathSitemapSource_Edit", model =>
-            {
-                model.Path = sitemapSource.Path;
-                model.Priority = sitemapSource.Priority;
-                model.ChangeFrequency = sitemapSource.ChangeFrequency;
-
-            }).Location("Content");
-        }
+            model.Path = sitemapSource.Path;
+            model.Priority = sitemapSource.Priority;
+            model.ChangeFrequency = sitemapSource.ChangeFrequency;
 
-        public override async Task<IDisplayResult> UpdateAsync(CustomPathSitemapSource sitemap, UpdateEditorContext context)
-        {
-            var model = new CustomPathSitemapSourceViewModel();
+        }).Location("Content");
+    }
 
-            await context.Updater.TryUpdateModelAsync(model,
-                    Prefix,
-                    m => m.Path,
-                    m => m.Priority,
-                    m => m.ChangeFrequency
-                );
+    public override async Task<IDisplayResult> UpdateAsync(CustomPathSitemapSource sitemap, UpdateEditorContext context)
+    {
+        var model = new CustomPathSitemapSourceViewModel();
 
-            sitemap.Path = model.Path;
-            sitemap.Priority = model.Priority;
-            sitemap.ChangeFrequency = model.ChangeFrequency;
-            sitemap.LastUpdate = DateTime.Now;
+        await context.Updater.TryUpdateModelAsync(model,
+                Prefix,
+                m => m.Path,
+                m => m.Priority,
+                m => m.ChangeFrequency
+            );
 
-            if (sitemap.Path?.IndexOfAny(CustomPathSitemapSource.InvalidCharactersForPath) > -1 || sitemap.Path?.IndexOf(' ') > -1 || sitemap.Path?.IndexOf("//") > -1)
-            {
-                var invalidCharactersForMessage = string.Join(", ", CustomPathSitemapSource.InvalidCharactersForPath.Select(c => $"\"{c}\""));
-                context.Updater.ModelState.AddModelError(Prefix, sitemap.Path, S["Please do not use any of the following characters in your permalink: {0}. No spaces, or consecutive slashes, are allowed (please use dashes or underscores instead).", invalidCharactersForMessage]);
-            }
+        sitemap.Path = model.Path;
+        sitemap.Priority = model.Priority;
+        sitemap.ChangeFrequency = model.ChangeFrequency;
+        sitemap.LastUpdate = DateTime.Now;
 
-            if (sitemap.Path?.Length > CustomPathSitemapSource.MaxPathLength)
-            {
-                context.Updater.ModelState.AddModelError(Prefix, sitemap.Path, S["Your path is too long. The path can only be up to {0} characters.", CustomPathSitemapSource.MaxPathLength]);
-            }
+        if (sitemap.Path?.IndexOfAny(CustomPathSitemapSource.InvalidCharactersForPath) > -1 || sitemap.Path?.IndexOf(' ') > -1 || sitemap.Path?.IndexOf("//") > -1)
+        {
+            var invalidCharactersForMessage = string.Join(", ", CustomPathSitemapSource.InvalidCharactersForPath.Select(c => $"\"{c}\""));
+            context.Updater.ModelState.AddModelError(Prefix, sitemap.Path, S["Please do not use any of the following characters in your permalink: {0}. No spaces, or consecutive slashes, are allowed (please use dashes or underscores instead).", invalidCharactersForMessage]);
+        }
 
-            return Edit(sitemap, context);
+        if (sitemap.Path?.Length > CustomPathSitemapSource.MaxPathLength)
+        {
+            context.Updater.ModelState.AddModelError(Prefix, sitemap.Path, S["Your path is too long. The path can only be up to {0} characters.", CustomPathSitemapSource.MaxPathLength]);
         }
+
+        return Edit(sitemap, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Drivers/SitemapPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Drivers/SitemapPartDisplayDriver.cs
index 57800b497b3..c17e4a8af03 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Drivers/SitemapPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Drivers/SitemapPartDisplayDriver.cs
@@ -6,43 +6,42 @@
 using OrchardCore.Sitemaps.Models;
 using OrchardCore.Sitemaps.ViewModels;
 
-namespace OrchardCore.Sitemaps.Drivers
+namespace OrchardCore.Sitemaps.Drivers;
+
+public sealed class SitemapPartDisplayDriver : ContentPartDisplayDriver<SitemapPart>
 {
-    public sealed class SitemapPartDisplayDriver : ContentPartDisplayDriver<SitemapPart>
+    public override IDisplayResult Edit(SitemapPart part, BuildPartEditorContext context)
+    {
+        return Initialize<SitemapPartViewModel>("SitemapPart_Edit", m => BuildViewModel(m, part))
+            .Location("Parts#SEO:5");
+    }
+
+    public override async Task<IDisplayResult> UpdateAsync(SitemapPart model, UpdatePartEditorContext context)
+    {
+        var viewModel = new SitemapPartViewModel();
+
+        await context.Updater.TryUpdateModelAsync(viewModel,
+            Prefix,
+            t => t.OverrideSitemapConfig,
+            t => t.ChangeFrequency,
+            t => t.Exclude,
+            t => t.Priority);
+
+        model.OverrideSitemapConfig = viewModel.OverrideSitemapConfig;
+        model.ChangeFrequency = viewModel.ChangeFrequency;
+        model.Exclude = viewModel.Exclude;
+        model.Priority = viewModel.Priority;
+
+        return Edit(model, context);
+    }
+
+
+    private static void BuildViewModel(SitemapPartViewModel model, SitemapPart part)
     {
-        public override IDisplayResult Edit(SitemapPart part, BuildPartEditorContext context)
-        {
-            return Initialize<SitemapPartViewModel>("SitemapPart_Edit", m => BuildViewModel(m, part))
-                .Location("Parts#SEO:5");
-        }
-
-        public override async Task<IDisplayResult> UpdateAsync(SitemapPart model, UpdatePartEditorContext context)
-        {
-            var viewModel = new SitemapPartViewModel();
-
-            await context.Updater.TryUpdateModelAsync(viewModel,
-                Prefix,
-                t => t.OverrideSitemapConfig,
-                t => t.ChangeFrequency,
-                t => t.Exclude,
-                t => t.Priority);
-
-            model.OverrideSitemapConfig = viewModel.OverrideSitemapConfig;
-            model.ChangeFrequency = viewModel.ChangeFrequency;
-            model.Exclude = viewModel.Exclude;
-            model.Priority = viewModel.Priority;
-
-            return Edit(model, context);
-        }
-
-
-        private static void BuildViewModel(SitemapPartViewModel model, SitemapPart part)
-        {
-            model.OverrideSitemapConfig = part.OverrideSitemapConfig;
-            model.ChangeFrequency = part.ChangeFrequency;
-            model.Exclude = part.Exclude;
-            model.Priority = part.Priority;
-            model.SitemapPart = part;
-        }
+        model.OverrideSitemapConfig = part.OverrideSitemapConfig;
+        model.ChangeFrequency = part.ChangeFrequency;
+        model.Exclude = part.Exclude;
+        model.Priority = part.Priority;
+        model.SitemapPart = part;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/CustomPathSitemapSourceUpdateHandler.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/CustomPathSitemapSourceUpdateHandler.cs
index f3155ed4502..23277e2d250 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/CustomPathSitemapSourceUpdateHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/CustomPathSitemapSourceUpdateHandler.cs
@@ -3,42 +3,41 @@
 using OrchardCore.Sitemaps.Models;
 using OrchardCore.Sitemaps.Services;
 
-namespace OrchardCore.Sitemaps.Handlers
+namespace OrchardCore.Sitemaps.Handlers;
+
+public class CustomPathSitemapSourceUpdateHandler : ISitemapSourceUpdateHandler
 {
-    public class CustomPathSitemapSourceUpdateHandler : ISitemapSourceUpdateHandler
+    private readonly ISitemapManager _sitemapManager;
+
+    public CustomPathSitemapSourceUpdateHandler(ISitemapManager sitemapManager)
     {
-        private readonly ISitemapManager _sitemapManager;
+        _sitemapManager = sitemapManager;
+    }
 
-        public CustomPathSitemapSourceUpdateHandler(ISitemapManager sitemapManager)
+    public async Task UpdateSitemapAsync(SitemapUpdateContext context)
+    {
+        var sitemaps = (await _sitemapManager.LoadSitemapsAsync()).Where(s => s.GetType() == typeof(Sitemap));
+
+        if (!sitemaps.Any())
         {
-            _sitemapManager = sitemapManager;
+            return;
         }
 
-        public async Task UpdateSitemapAsync(SitemapUpdateContext context)
+        foreach (var sitemap in sitemaps)
         {
-            var sitemaps = (await _sitemapManager.LoadSitemapsAsync()).Where(s => s.GetType() == typeof(Sitemap));
-
-            if (!sitemaps.Any())
+            // Do not break out of this loop, as it must check each sitemap.
+            foreach (var source in sitemap.SitemapSources
+                .Select(s => s as CustomPathSitemapSource))
             {
-                return;
-            }
-
-            foreach (var sitemap in sitemaps)
-            {
-                // Do not break out of this loop, as it must check each sitemap.
-                foreach (var source in sitemap.SitemapSources
-                    .Select(s => s as CustomPathSitemapSource))
+                if (source == null)
                 {
-                    if (source == null)
-                    {
-                        continue;
-                    }
-
-                    sitemap.Identifier = IdGenerator.GenerateId();
+                    continue;
                 }
-            }
 
-            await _sitemapManager.UpdateSitemapAsync();
+                sitemap.Identifier = IdGenerator.GenerateId();
+            }
         }
+
+        await _sitemapManager.UpdateSitemapAsync();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/DefaultSitemapUpdateHandler.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/DefaultSitemapUpdateHandler.cs
index e5fc591d66f..cf02075136b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/DefaultSitemapUpdateHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/DefaultSitemapUpdateHandler.cs
@@ -3,40 +3,39 @@
 using System.Threading.Tasks;
 using OrchardCore.Locking.Distributed;
 
-namespace OrchardCore.Sitemaps.Handlers
+namespace OrchardCore.Sitemaps.Handlers;
+
+public class DefaultSitemapUpdateHandler : ISitemapUpdateHandler
 {
-    public class DefaultSitemapUpdateHandler : ISitemapUpdateHandler
+    private readonly IEnumerable<ISitemapTypeUpdateHandler> _sitemapTypeUpdateHandlers;
+    private readonly IDistributedLock _distributedLock;
+
+    public DefaultSitemapUpdateHandler(
+        IEnumerable<ISitemapTypeUpdateHandler> sitemapTypeUpdateHandlers,
+        IDistributedLock distributedLock)
+    {
+        _sitemapTypeUpdateHandlers = sitemapTypeUpdateHandlers;
+        _distributedLock = distributedLock;
+    }
+
+    public async Task UpdateSitemapAsync(SitemapUpdateContext context)
     {
-        private readonly IEnumerable<ISitemapTypeUpdateHandler> _sitemapTypeUpdateHandlers;
-        private readonly IDistributedLock _distributedLock;
+        // Doing the update in a synchronized way makes sure that two simultaneous content item updates don't cause
+        // a ConcurrencyException due to the same sitemap document being updated.
+
+        var timeout = TimeSpan.FromMilliseconds(20_000);
+        (var locker, var locked) = await _distributedLock.TryAcquireLockAsync("SITEMAPS_UPDATE_LOCK", timeout, timeout);
 
-        public DefaultSitemapUpdateHandler(
-            IEnumerable<ISitemapTypeUpdateHandler> sitemapTypeUpdateHandlers,
-            IDistributedLock distributedLock)
+        if (!locked)
         {
-            _sitemapTypeUpdateHandlers = sitemapTypeUpdateHandlers;
-            _distributedLock = distributedLock;
+            throw new TimeoutException($"Couldn't acquire a lock to update the sitemap within {timeout.Seconds} seconds.");
         }
 
-        public async Task UpdateSitemapAsync(SitemapUpdateContext context)
+        using (locker)
         {
-            // Doing the update in a synchronized way makes sure that two simultaneous content item updates don't cause
-            // a ConcurrencyException due to the same sitemap document being updated.
-
-            var timeout = TimeSpan.FromMilliseconds(20_000);
-            (var locker, var locked) = await _distributedLock.TryAcquireLockAsync("SITEMAPS_UPDATE_LOCK", timeout, timeout);
-
-            if (!locked)
-            {
-                throw new TimeoutException($"Couldn't acquire a lock to update the sitemap within {timeout.Seconds} seconds.");
-            }
-
-            using (locker)
+            foreach (var sitemapTypeUpdateHandler in _sitemapTypeUpdateHandlers)
             {
-                foreach (var sitemapTypeUpdateHandler in _sitemapTypeUpdateHandlers)
-                {
-                    await sitemapTypeUpdateHandler.UpdateSitemapAsync(context);
-                }
+                await sitemapTypeUpdateHandler.UpdateSitemapAsync(context);
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/SitemapIndexTypeUpdateHandler.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/SitemapIndexTypeUpdateHandler.cs
index 235febbd27f..0b21a97a262 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/SitemapIndexTypeUpdateHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/SitemapIndexTypeUpdateHandler.cs
@@ -5,68 +5,67 @@
 using OrchardCore.Sitemaps.Models;
 using OrchardCore.Sitemaps.Services;
 
-namespace OrchardCore.Sitemaps.Handlers
+namespace OrchardCore.Sitemaps.Handlers;
+
+public class SitemapIndexTypeUpdateHandler : ISitemapTypeUpdateHandler
 {
-    public class SitemapIndexTypeUpdateHandler : ISitemapTypeUpdateHandler
-    {
-        private readonly ISitemapManager _sitemapManager;
+    private readonly ISitemapManager _sitemapManager;
 
-        public SitemapIndexTypeUpdateHandler(ISitemapManager sitemapManager)
-        {
-            _sitemapManager = sitemapManager;
-        }
+    public SitemapIndexTypeUpdateHandler(ISitemapManager sitemapManager)
+    {
+        _sitemapManager = sitemapManager;
+    }
 
-        public async Task UpdateSitemapAsync(SitemapUpdateContext context)
-        {
-            var contentItem = context.UpdateObject as ContentItem;
+    public async Task UpdateSitemapAsync(SitemapUpdateContext context)
+    {
+        var contentItem = context.UpdateObject as ContentItem;
 
-            var allSitemaps = await _sitemapManager.LoadSitemapsAsync();
+        var allSitemaps = await _sitemapManager.LoadSitemapsAsync();
 
-            var sitemapIndex = allSitemaps
-                .FirstOrDefault(s => s.GetType() == typeof(SitemapIndex));
+        var sitemapIndex = allSitemaps
+            .FirstOrDefault(s => s.GetType() == typeof(SitemapIndex));
 
-            if (contentItem == null || sitemapIndex == null)
-            {
-                return;
-            }
+        if (contentItem == null || sitemapIndex == null)
+        {
+            return;
+        }
 
-            var sitemaps = allSitemaps.OfType<Sitemap>();
+        var sitemaps = allSitemaps.OfType<Sitemap>();
 
-            if (!sitemaps.Any())
-            {
-                return;
-            }
+        if (!sitemaps.Any())
+        {
+            return;
+        }
 
-            var contentTypeName = contentItem.ContentType;
+        var contentTypeName = contentItem.ContentType;
 
-            foreach (var sitemap in sitemaps)
+        foreach (var sitemap in sitemaps)
+        {
+            foreach (var source in sitemap.SitemapSources.Select(x => x as ContentTypesSitemapSource))
             {
-                foreach (var source in sitemap.SitemapSources.Select(x => x as ContentTypesSitemapSource))
+                if (source == null)
                 {
-                    if (source == null)
-                    {
-                        continue;
-                    }
+                    continue;
+                }
 
-                    if (source.IndexAll)
-                    {
-                        sitemap.Identifier = IdGenerator.GenerateId();
-                        break;
-                    }
-                    else if (source.LimitItems && string.Equals(source.LimitedContentType.ContentTypeName, contentTypeName, StringComparison.Ordinal))
-                    {
-                        sitemap.Identifier = IdGenerator.GenerateId();
-                        break;
-                    }
-                    else if (source.ContentTypes.Any(ct => string.Equals(ct.ContentTypeName, contentTypeName, StringComparison.Ordinal)))
-                    {
-                        sitemap.Identifier = IdGenerator.GenerateId();
-                        break;
-                    }
+                if (source.IndexAll)
+                {
+                    sitemap.Identifier = IdGenerator.GenerateId();
+                    break;
+                }
+                else if (source.LimitItems && string.Equals(source.LimitedContentType.ContentTypeName, contentTypeName, StringComparison.Ordinal))
+                {
+                    sitemap.Identifier = IdGenerator.GenerateId();
+                    break;
+                }
+                else if (source.ContentTypes.Any(ct => string.Equals(ct.ContentTypeName, contentTypeName, StringComparison.Ordinal)))
+                {
+                    sitemap.Identifier = IdGenerator.GenerateId();
+                    break;
                 }
             }
-
-            await _sitemapManager.UpdateSitemapAsync();
         }
+
+        await _sitemapManager.UpdateSitemapAsync();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/SitemapPartHandler.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/SitemapPartHandler.cs
index b45eb11c1ad..0ebfde23e02 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/SitemapPartHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/SitemapPartHandler.cs
@@ -3,23 +3,22 @@
 using OrchardCore.Sitemaps.Aspects;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Handlers
+namespace OrchardCore.Sitemaps.Handlers;
+
+public class SitemapPartHandler : ContentPartHandler<SitemapPart>
 {
-    public class SitemapPartHandler : ContentPartHandler<SitemapPart>
+    public override Task GetContentItemAspectAsync(ContentItemAspectContext context, SitemapPart part)
     {
-        public override Task GetContentItemAspectAsync(ContentItemAspectContext context, SitemapPart part)
+        return context.ForAsync<SitemapMetadataAspect>(aspect =>
         {
-            return context.ForAsync<SitemapMetadataAspect>(aspect =>
+            if (part.OverrideSitemapConfig)
             {
-                if (part.OverrideSitemapConfig)
-                {
-                    aspect.ChangeFrequency = part.ChangeFrequency.ToString();
-                    aspect.Priority = part.Priority;
-                    aspect.Exclude = part.Exclude;
-                }
+                aspect.ChangeFrequency = part.ChangeFrequency.ToString();
+                aspect.Priority = part.Priority;
+                aspect.Exclude = part.Exclude;
+            }
 
-                return Task.CompletedTask;
-            });
-        }
+            return Task.CompletedTask;
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/SitemapTypeUpdateHandler.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/SitemapTypeUpdateHandler.cs
index b11ccfd2a25..483f71094af 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/SitemapTypeUpdateHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Handlers/SitemapTypeUpdateHandler.cs
@@ -1,23 +1,22 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Sitemaps.Handlers
+namespace OrchardCore.Sitemaps.Handlers;
+
+public class SitemapTypeUpdateHandler : ISitemapTypeUpdateHandler
 {
-    public class SitemapTypeUpdateHandler : ISitemapTypeUpdateHandler
-    {
-        private readonly IEnumerable<ISitemapSourceUpdateHandler> _sitemapSourceUpdateHandlers;
+    private readonly IEnumerable<ISitemapSourceUpdateHandler> _sitemapSourceUpdateHandlers;
 
-        public SitemapTypeUpdateHandler(IEnumerable<ISitemapSourceUpdateHandler> sitemapSourceUpdateHandlers)
-        {
-            _sitemapSourceUpdateHandlers = sitemapSourceUpdateHandlers;
-        }
+    public SitemapTypeUpdateHandler(IEnumerable<ISitemapSourceUpdateHandler> sitemapSourceUpdateHandlers)
+    {
+        _sitemapSourceUpdateHandlers = sitemapSourceUpdateHandlers;
+    }
 
-        public async Task UpdateSitemapAsync(SitemapUpdateContext context)
+    public async Task UpdateSitemapAsync(SitemapUpdateContext context)
+    {
+        foreach (var sitemapSourceUpdateHandler in _sitemapSourceUpdateHandlers)
         {
-            foreach (var sitemapSourceUpdateHandler in _sitemapSourceUpdateHandlers)
-            {
-                await sitemapSourceUpdateHandler.UpdateSitemapAsync(context);
-            }
+            await sitemapSourceUpdateHandler.UpdateSitemapAsync(context);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Migrations.cs
index 5d7fdc1f16b..a9497412f70 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Migrations.cs
@@ -3,24 +3,23 @@
 using OrchardCore.ContentManagement.Metadata.Settings;
 using OrchardCore.Data.Migration;
 
-namespace OrchardCore.Sitemaps
+namespace OrchardCore.Sitemaps;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        public Migrations(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public Migrations(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public async Task<int> CreateAsync()
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync("SitemapPart", builder => builder
-                .Attachable()
-                .WithDescription("Provides an optional part that allows content items to be excluded, or configured, on a content item."));
+    public async Task<int> CreateAsync()
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync("SitemapPart", builder => builder
+            .Attachable()
+            .WithDescription("Provides an optional part that allows content items to be excluded, or configured, on a content item."));
 
-            return 1;
-        }
+        return 1;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Models/SitemapDocument.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Models/SitemapDocument.cs
index 4b109bc6279..cc48c463be7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Models/SitemapDocument.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Models/SitemapDocument.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.Sitemaps.Models
+namespace OrchardCore.Sitemaps.Models;
+
+public class SitemapDocument : Document
 {
-    public class SitemapDocument : Document
-    {
-        public IDictionary<string, SitemapType> Sitemaps { get; set; } = new Dictionary<string, SitemapType>();
-    }
+    public IDictionary<string, SitemapType> Sitemaps { get; set; } = new Dictionary<string, SitemapType>();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Models/SitemapIndex.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Models/SitemapIndex.cs
index 1fd578ea7b8..755327e2b72 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Models/SitemapIndex.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Models/SitemapIndex.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Sitemaps.Models
+namespace OrchardCore.Sitemaps.Models;
+
+public class SitemapIndex : SitemapType
 {
-    public class SitemapIndex : SitemapType
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Models/SitemapIndexSource.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Models/SitemapIndexSource.cs
index 6dd27c11e47..f8f130cb892 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Models/SitemapIndexSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Models/SitemapIndexSource.cs
@@ -1,13 +1,12 @@
-namespace OrchardCore.Sitemaps.Models
-{
-    // This is a single use Sitemap Index Source.
-    // It is a SitemapSource because it works better when handling routing lookups.
-    // but it intentionally is hidden from normal sources and, 
-    // will only ever be used a single time inside a sitemap.
-    // For that reason there are no drivers.
+namespace OrchardCore.Sitemaps.Models;
+
+// This is a single use Sitemap Index Source.
+// It is a SitemapSource because it works better when handling routing lookups.
+// but it intentionally is hidden from normal sources and, 
+// will only ever be used a single time inside a sitemap.
+// For that reason there are no drivers.
 
-    public class SitemapIndexSource : SitemapSource
-    {
-        public string[] ContainedSitemapIds { get; set; } = [];
-    }
+public class SitemapIndexSource : SitemapSource
+{
+    public string[] ContainedSitemapIds { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Models/SitemapPart.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Models/SitemapPart.cs
index 7d238cb5ced..37e1621def0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Models/SitemapPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Models/SitemapPart.cs
@@ -1,15 +1,14 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Sitemaps.Models
+namespace OrchardCore.Sitemaps.Models;
+
+/// <summary>
+/// SitemapPart is an optional part, which allows individual content items to be excluded from sitemaps.
+/// </summary>
+public class SitemapPart : ContentPart
 {
-    /// <summary>
-    /// SitemapPart is an optional part, which allows individual content items to be excluded from sitemaps.
-    /// </summary>
-    public class SitemapPart : ContentPart
-    {
-        public bool OverrideSitemapConfig { get; set; }
-        public ChangeFrequency ChangeFrequency { get; set; } = ChangeFrequency.Daily;
-        public int Priority { get; set; } = 5;
-        public bool Exclude { get; set; }
-    }
+    public bool OverrideSitemapConfig { get; set; }
+    public ChangeFrequency ChangeFrequency { get; set; } = ChangeFrequency.Daily;
+    public int Priority { get; set; } = 5;
+    public bool Exclude { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Recipes/SitemapsStep.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Recipes/SitemapsStep.cs
index 7291387ed65..ebb8a43bb6f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Recipes/SitemapsStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Recipes/SitemapsStep.cs
@@ -9,43 +9,42 @@
 using OrchardCore.Sitemaps.Models;
 using OrchardCore.Sitemaps.Services;
 
-namespace OrchardCore.Sitemaps.Recipes
+namespace OrchardCore.Sitemaps.Recipes;
+
+/// <summary>
+/// This recipe step creates a set of sitemaps.
+/// </summary>
+public sealed class SitemapsStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step creates a set of sitemaps.
-    /// </summary>
-    public sealed class SitemapsStep : IRecipeStepHandler
+    private readonly ISitemapManager _sitemapManager;
+    private readonly DocumentJsonSerializerOptions _documentJsonSerializerOptions;
+
+    public SitemapsStep(
+        ISitemapManager sitemapManager,
+        IOptions<DocumentJsonSerializerOptions> documentJsonSerializerOptions)
     {
-        private readonly ISitemapManager _sitemapManager;
-        private readonly DocumentJsonSerializerOptions _documentJsonSerializerOptions;
+        _sitemapManager = sitemapManager;
+        _documentJsonSerializerOptions = documentJsonSerializerOptions.Value;
+    }
 
-        public SitemapsStep(
-            ISitemapManager sitemapManager,
-            IOptions<DocumentJsonSerializerOptions> documentJsonSerializerOptions)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "Sitemaps", StringComparison.OrdinalIgnoreCase))
         {
-            _sitemapManager = sitemapManager;
-            _documentJsonSerializerOptions = documentJsonSerializerOptions.Value;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, "Sitemaps", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            var model = context.Step.ToObject<SitemapStepModel>();
+        var model = context.Step.ToObject<SitemapStepModel>();
 
-            foreach (var token in model.Data.Cast<JsonObject>())
-            {
-                var sitemap = token.ToObject<SitemapType>(_documentJsonSerializerOptions.SerializerOptions);
-                await _sitemapManager.UpdateSitemapAsync(sitemap);
-            }
-        }
-
-        public sealed class SitemapStepModel
+        foreach (var token in model.Data.Cast<JsonObject>())
         {
-            public JsonArray Data { get; set; }
+            var sitemap = token.ToObject<SitemapType>(_documentJsonSerializerOptions.SerializerOptions);
+            await _sitemapManager.UpdateSitemapAsync(sitemap);
         }
     }
+
+    public sealed class SitemapStepModel
+    {
+        public JsonArray Data { get; set; }
+    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Routing/SitemapEntries.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Routing/SitemapEntries.cs
index 6e78c73c299..eb03680ac2d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Routing/SitemapEntries.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Routing/SitemapEntries.cs
@@ -1,71 +1,70 @@
 using System.Threading.Tasks;
 using OrchardCore.Sitemaps.Services;
 
-namespace OrchardCore.Sitemaps.Routing
+namespace OrchardCore.Sitemaps.Routing;
+
+public class SitemapEntries
 {
-    public class SitemapEntries
-    {
-        private readonly ISitemapManager _sitemapManager;
+    private readonly ISitemapManager _sitemapManager;
 
-        private SitemapRouteDocument _document;
+    private SitemapRouteDocument _document;
 
-        public SitemapEntries(ISitemapManager sitemapManager)
+    public SitemapEntries(ISitemapManager sitemapManager)
+    {
+        _sitemapManager = sitemapManager;
+    }
+
+    public async Task<(bool, string)> TryGetSitemapIdByPathAsync(string path)
+    {
+        var identifier = await _sitemapManager.GetIdentifierAsync();
+        if (_document == null || _document.Identifier != identifier)
         {
-            _sitemapManager = sitemapManager;
+            await BuildEntriesAsync(identifier);
         }
 
-        public async Task<(bool, string)> TryGetSitemapIdByPathAsync(string path)
+        if (_document.SitemapIds.TryGetValue(path, out var sitemapId))
         {
-            var identifier = await _sitemapManager.GetIdentifierAsync();
-            if (_document == null || _document.Identifier != identifier)
-            {
-                await BuildEntriesAsync(identifier);
-            }
+            return (true, sitemapId);
+        }
 
-            if (_document.SitemapIds.TryGetValue(path, out var sitemapId))
-            {
-                return (true, sitemapId);
-            }
+        return (false, sitemapId);
+    }
 
-            return (false, sitemapId);
+    public async Task<(bool, string)> TryGetPathBySitemapIdAsync(string sitemapId)
+    {
+        var identifier = await _sitemapManager.GetIdentifierAsync();
+        if (_document == null || _document.Identifier != identifier)
+        {
+            await BuildEntriesAsync(identifier);
         }
 
-        public async Task<(bool, string)> TryGetPathBySitemapIdAsync(string sitemapId)
+        if (_document.SitemapPaths.TryGetValue(sitemapId, out var path))
         {
-            var identifier = await _sitemapManager.GetIdentifierAsync();
-            if (_document == null || _document.Identifier != identifier)
-            {
-                await BuildEntriesAsync(identifier);
-            }
-
-            if (_document.SitemapPaths.TryGetValue(sitemapId, out var path))
-            {
-                return (true, path);
-            }
-
-            return (false, path);
+            return (true, path);
         }
 
-        private async Task BuildEntriesAsync(string identifier)
+        return (false, path);
+    }
+
+    private async Task BuildEntriesAsync(string identifier)
+    {
+        var document = new SitemapRouteDocument()
         {
-            var document = new SitemapRouteDocument()
-            {
-                Identifier = identifier
-            };
+            Identifier = identifier
+        };
 
-            var sitemaps = await _sitemapManager.GetSitemapsAsync();
-            foreach (var sitemap in sitemaps)
+        var sitemaps = await _sitemapManager.GetSitemapsAsync();
+        foreach (var sitemap in sitemaps)
+        {
+            if (!sitemap.Enabled)
             {
-                if (!sitemap.Enabled)
-                {
-                    continue;
-                }
-
-                document.SitemapIds[sitemap.Path] = sitemap.SitemapId;
-                document.SitemapPaths[sitemap.SitemapId] = sitemap.Path;
+                continue;
             }
 
-            _document = document;
+            document.SitemapIds[sitemap.Path] = sitemap.SitemapId;
+            document.SitemapPaths[sitemap.SitemapId] = sitemap.Path;
         }
+
+        _document = document;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Routing/SitemapRouteDocument.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Routing/SitemapRouteDocument.cs
index 2a14bb10e4c..93a9a81761d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Routing/SitemapRouteDocument.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Routing/SitemapRouteDocument.cs
@@ -2,11 +2,10 @@
 using System.Collections.Generic;
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.Sitemaps.Routing
+namespace OrchardCore.Sitemaps.Routing;
+
+public class SitemapRouteDocument : Document
 {
-    public class SitemapRouteDocument : Document
-    {
-        public Dictionary<string, string> SitemapIds { get; set; } = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-        public Dictionary<string, string> SitemapPaths { get; set; } = [];
-    }
+    public Dictionary<string, string> SitemapIds { get; set; } = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+    public Dictionary<string, string> SitemapPaths { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Routing/SitemapRouteTransformer.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Routing/SitemapRouteTransformer.cs
index 9c695f0b094..602d3a44e25 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Routing/SitemapRouteTransformer.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Routing/SitemapRouteTransformer.cs
@@ -4,40 +4,39 @@
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Sitemaps.Routing
+namespace OrchardCore.Sitemaps.Routing;
+
+public class SitemapRouteTransformer : DynamicRouteValueTransformer
 {
-    public class SitemapRouteTransformer : DynamicRouteValueTransformer
+    private readonly SitemapEntries _entries;
+    private readonly SitemapsOptions _options;
+
+    public SitemapRouteTransformer(SitemapEntries entries, IOptions<SitemapsOptions> options)
     {
-        private readonly SitemapEntries _entries;
-        private readonly SitemapsOptions _options;
+        _entries = entries;
+        _options = options.Value;
+    }
 
-        public SitemapRouteTransformer(SitemapEntries entries, IOptions<SitemapsOptions> options)
-        {
-            _entries = entries;
-            _options = options.Value;
-        }
+    public override async ValueTask<RouteValueDictionary> TransformAsync(HttpContext httpContext, RouteValueDictionary values)
+    {
+        // Use route value provided by SitemapTransformer template.
+        var path = values["sitemap"] as string;
 
-        public override async ValueTask<RouteValueDictionary> TransformAsync(HttpContext httpContext, RouteValueDictionary values)
+        if (!string.IsNullOrEmpty(path))
         {
-            // Use route value provided by SitemapTransformer template.
-            var path = values["sitemap"] as string;
+            (var found, var sitemapId) = await _entries.TryGetSitemapIdByPathAsync(path);
 
-            if (!string.IsNullOrEmpty(path))
+            if (found)
             {
-                (var found, var sitemapId) = await _entries.TryGetSitemapIdByPathAsync(path);
-
-                if (found)
+                var routeValues = new RouteValueDictionary(_options.GlobalRouteValues)
                 {
-                    var routeValues = new RouteValueDictionary(_options.GlobalRouteValues)
-                    {
-                        [_options.SitemapIdKey] = sitemapId
-                    };
+                    [_options.SitemapIdKey] = sitemapId
+                };
 
-                    return routeValues;
-                }
+                return routeValues;
             }
-
-            return null;
         }
+
+        return null;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Routing/SitemapValuesAddressScheme.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Routing/SitemapValuesAddressScheme.cs
index 6b62155db10..e1adccef57b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Routing/SitemapValuesAddressScheme.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Routing/SitemapValuesAddressScheme.cs
@@ -6,86 +6,85 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Routing;
 
-namespace OrchardCore.Sitemaps.Routing
+namespace OrchardCore.Sitemaps.Routing;
+
+internal sealed class SitemapValuesAddressScheme : IShellRouteValuesAddressScheme
 {
-    internal sealed class SitemapValuesAddressScheme : IShellRouteValuesAddressScheme
+    private readonly SitemapEntries _entries;
+    private readonly SitemapsOptions _options;
+
+    public SitemapValuesAddressScheme(SitemapEntries entries, IOptions<SitemapsOptions> options)
     {
-        private readonly SitemapEntries _entries;
-        private readonly SitemapsOptions _options;
+        _entries = entries;
+        _options = options.Value;
+    }
 
-        public SitemapValuesAddressScheme(SitemapEntries entries, IOptions<SitemapsOptions> options)
+    public IEnumerable<Endpoint> FindEndpoints(RouteValuesAddress address)
+    {
+        if (address.AmbientValues == null || address.ExplicitValues == null)
         {
-            _entries = entries;
-            _options = options.Value;
+            return [];
         }
 
-        public IEnumerable<Endpoint> FindEndpoints(RouteValuesAddress address)
-        {
-            if (address.AmbientValues == null || address.ExplicitValues == null)
-            {
-                return [];
-            }
+        var sitemapId = address.ExplicitValues[_options.SitemapIdKey]?.ToString();
 
-            var sitemapId = address.ExplicitValues[_options.SitemapIdKey]?.ToString();
+        if (string.IsNullOrEmpty(sitemapId))
+        {
+            return [];
+        }
 
-            if (string.IsNullOrEmpty(sitemapId))
-            {
-                return [];
-            }
+        (var found, var path) = _entries.TryGetPathBySitemapIdAsync(sitemapId).GetAwaiter().GetResult();
 
-            (var found, var path) = _entries.TryGetPathBySitemapIdAsync(sitemapId).GetAwaiter().GetResult();
+        if (!found)
+        {
+            return [];
+        }
 
-            if (!found)
-            {
-                return [];
-            }
+        if (Match(address.ExplicitValues))
+        {
+            var routeValues = new RouteValueDictionary(address.ExplicitValues);
 
-            if (Match(address.ExplicitValues))
+            if (address.ExplicitValues.Count > _options.GlobalRouteValues.Count + 1)
             {
-                var routeValues = new RouteValueDictionary(address.ExplicitValues);
-
-                if (address.ExplicitValues.Count > _options.GlobalRouteValues.Count + 1)
+                foreach (var entry in address.ExplicitValues)
                 {
-                    foreach (var entry in address.ExplicitValues)
+                    if (string.Equals(entry.Key, _options.SitemapIdKey, StringComparison.OrdinalIgnoreCase))
                     {
-                        if (string.Equals(entry.Key, _options.SitemapIdKey, StringComparison.OrdinalIgnoreCase))
-                        {
-                            continue;
-                        }
-
-                        if (!_options.GlobalRouteValues.ContainsKey(entry.Key))
-                        {
-                            routeValues.Remove(entry.Key);
-                        }
+                        continue;
                     }
-                }
-
-                var endpoint = new RouteEndpoint
-                (
-                    c => null,
-                    RoutePatternFactory.Parse(path, routeValues, null),
-                    0,
-                    null,
-                    null
-                );
 
-                return [endpoint];
+                    if (!_options.GlobalRouteValues.ContainsKey(entry.Key))
+                    {
+                        routeValues.Remove(entry.Key);
+                    }
+                }
             }
 
-            return [];
+            var endpoint = new RouteEndpoint
+            (
+                c => null,
+                RoutePatternFactory.Parse(path, routeValues, null),
+                0,
+                null,
+                null
+            );
+
+            return [endpoint];
         }
 
-        private bool Match(RouteValueDictionary explicitValues)
+        return [];
+    }
+
+    private bool Match(RouteValueDictionary explicitValues)
+    {
+        foreach (var entry in _options.GlobalRouteValues)
         {
-            foreach (var entry in _options.GlobalRouteValues)
+            if (!string.Equals(explicitValues[entry.Key]?.ToString(), entry.Value?.ToString(), StringComparison.OrdinalIgnoreCase))
             {
-                if (!string.Equals(explicitValues[entry.Key]?.ToString(), entry.Value?.ToString(), StringComparison.OrdinalIgnoreCase))
-                {
-                    return false;
-                }
+                return false;
             }
-
-            return true;
         }
+
+        return true;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/DefaultRouteableContentTypeCoordinator.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/DefaultRouteableContentTypeCoordinator.cs
index 74b0c557f1f..fbe84c740ff 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/DefaultRouteableContentTypeCoordinator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/DefaultRouteableContentTypeCoordinator.cs
@@ -4,41 +4,40 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Sitemaps.Builders;
 
-namespace OrchardCore.Sitemaps.Services
+namespace OrchardCore.Sitemaps.Services;
+
+public class DefaultRouteableContentTypeCoordinator : IRouteableContentTypeCoordinator
 {
-    public class DefaultRouteableContentTypeCoordinator : IRouteableContentTypeCoordinator
-    {
-        private readonly IEnumerable<IRouteableContentTypeProvider> _routeableContentTypeProviders;
+    private readonly IEnumerable<IRouteableContentTypeProvider> _routeableContentTypeProviders;
 
-        public DefaultRouteableContentTypeCoordinator(IEnumerable<IRouteableContentTypeProvider> routeableContentTypeProviders)
-        {
-            _routeableContentTypeProviders = routeableContentTypeProviders;
-        }
+    public DefaultRouteableContentTypeCoordinator(IEnumerable<IRouteableContentTypeProvider> routeableContentTypeProviders)
+    {
+        _routeableContentTypeProviders = routeableContentTypeProviders;
+    }
 
-        public async Task<string> GetRouteAsync(SitemapBuilderContext context, ContentItem contentItem)
+    public async Task<string> GetRouteAsync(SitemapBuilderContext context, ContentItem contentItem)
+    {
+        foreach (var rctp in _routeableContentTypeProviders)
         {
-            foreach (var rctp in _routeableContentTypeProviders)
+            var result = await rctp.GetRouteAsync(context, contentItem);
+            if (result != null)
             {
-                var result = await rctp.GetRouteAsync(context, contentItem);
-                if (result != null)
-                {
-                    return result;
-                }
+                return result;
             }
-
-            return null;
         }
 
-        public async Task<IEnumerable<ContentTypeDefinition>> ListRoutableTypeDefinitionsAsync()
-        {
-            var results = new List<ContentTypeDefinition>();
+        return null;
+    }
 
-            foreach (var routeableContentTypeProvider in _routeableContentTypeProviders)
-            {
-                results.AddRange(await routeableContentTypeProvider.ListRoutableTypeDefinitionsAsync());
-            }
+    public async Task<IEnumerable<ContentTypeDefinition>> ListRoutableTypeDefinitionsAsync()
+    {
+        var results = new List<ContentTypeDefinition>();
 
-            return results;
+        foreach (var routeableContentTypeProvider in _routeableContentTypeProviders)
+        {
+            results.AddRange(await routeableContentTypeProvider.ListRoutableTypeDefinitionsAsync());
         }
+
+        return results;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/RazorPagesContentTypeProvider.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/RazorPagesContentTypeProvider.cs
index 5c6391758d0..dffaf743f77 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/RazorPagesContentTypeProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/RazorPagesContentTypeProvider.cs
@@ -8,47 +8,46 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Sitemaps.Builders;
 
-namespace OrchardCore.Sitemaps.Services
+namespace OrchardCore.Sitemaps.Services;
+
+public class RazorPagesContentTypeProvider : IRouteableContentTypeProvider
 {
-    public class RazorPagesContentTypeProvider : IRouteableContentTypeProvider
+    private readonly SitemapsRazorPagesOptions _options;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+
+    public RazorPagesContentTypeProvider(
+        IOptions<SitemapsRazorPagesOptions> options,
+        IContentDefinitionManager contentDefinitionManager
+        )
     {
-        private readonly SitemapsRazorPagesOptions _options;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+        _options = options.Value;
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public RazorPagesContentTypeProvider(
-            IOptions<SitemapsRazorPagesOptions> options,
-            IContentDefinitionManager contentDefinitionManager
-            )
+    public Task<string> GetRouteAsync(SitemapBuilderContext context, ContentItem contentItem)
+    {
+        var option = _options.ContentTypeOptions.FirstOrDefault(o => o.ContentType == contentItem.ContentType);
+        if (option != null && option.RouteValues != null)
         {
-            _options = options.Value;
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+            var pageName = string.IsNullOrEmpty(option.PageName) ? option.ContentType : option.PageName;
 
-        public Task<string> GetRouteAsync(SitemapBuilderContext context, ContentItem contentItem)
-        {
-            var option = _options.ContentTypeOptions.FirstOrDefault(o => o.ContentType == contentItem.ContentType);
-            if (option != null && option.RouteValues != null)
+            // When used from outside a razor page name must start with a /
+            if (!pageName.StartsWith('/'))
             {
-                var pageName = string.IsNullOrEmpty(option.PageName) ? option.ContentType : option.PageName;
-
-                // When used from outside a razor page name must start with a /
-                if (!pageName.StartsWith('/'))
-                {
-                    pageName = '/' + pageName;
-                }
-
-                var url = context.HostPrefix + context.UrlHelper.Page(pageName, option.RouteValues.Invoke(contentItem));
-                return Task.FromResult(url);
+                pageName = '/' + pageName;
             }
 
-            return Task.FromResult<string>(null);
+            var url = context.HostPrefix + context.UrlHelper.Page(pageName, option.RouteValues.Invoke(contentItem));
+            return Task.FromResult(url);
         }
 
-        public async Task<IEnumerable<ContentTypeDefinition>> ListRoutableTypeDefinitionsAsync()
-        {
-            var definitions = await _contentDefinitionManager.ListTypeDefinitionsAsync();
+        return Task.FromResult<string>(null);
+    }
 
-            return definitions.Where(definition => _options.ContentTypeOptions.Any(o => o.ContentType == definition.Name));
-        }
+    public async Task<IEnumerable<ContentTypeDefinition>> ListRoutableTypeDefinitionsAsync()
+    {
+        var definitions = await _contentDefinitionManager.ListTypeDefinitionsAsync();
+
+        return definitions.Where(definition => _options.ContentTypeOptions.Any(o => o.ContentType == definition.Name));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/SitemapHelperService.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/SitemapHelperService.cs
index 8aaa0df2b1f..252be621ca7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/SitemapHelperService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/SitemapHelperService.cs
@@ -7,78 +7,77 @@
 using OrchardCore.Mvc.ModelBinding;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Services
+namespace OrchardCore.Sitemaps.Services;
+
+public class SitemapHelperService : ISitemapHelperService
 {
-    public class SitemapHelperService : ISitemapHelperService
-    {
-        // Path requirements for sitemaps include . as acceptable character.
-        public static readonly char[] InvalidCharactersForPath = ":?#[]@!$&'()*+,;=<>\\|%".ToCharArray();
-        public const int MaxPathLength = 1024;
-        public const string Prefix = "";
-        public const string Path = "Path";
+    // Path requirements for sitemaps include . as acceptable character.
+    public static readonly char[] InvalidCharactersForPath = ":?#[]@!$&'()*+,;=<>\\|%".ToCharArray();
+    public const int MaxPathLength = 1024;
+    public const string Prefix = "";
+    public const string Path = "Path";
+
+    private readonly ISlugService _slugService;
+    private readonly ISitemapManager _sitemapManager;
+    protected readonly IStringLocalizer S;
 
-        private readonly ISlugService _slugService;
-        private readonly ISitemapManager _sitemapManager;
-        protected readonly IStringLocalizer S;
+    public SitemapHelperService(
+        ISlugService slugService,
+        ISitemapManager sitemapManager,
+        IStringLocalizer<SitemapHelperService> stringLocalizer
+        )
+    {
+        _slugService = slugService;
+        _sitemapManager = sitemapManager;
+        S = stringLocalizer;
+    }
 
-        public SitemapHelperService(
-            ISlugService slugService,
-            ISitemapManager sitemapManager,
-            IStringLocalizer<SitemapHelperService> stringLocalizer
-            )
+    public async Task ValidatePathAsync(string path, IUpdateModel updater, string sitemapId = null)
+    {
+        // Keep localized text as similar to Autoroute as possible.
+        if (path == "/")
         {
-            _slugService = slugService;
-            _sitemapManager = sitemapManager;
-            S = stringLocalizer;
+            updater.ModelState.AddModelError(Prefix, Path, S["Your permalink can't be set to the homepage"]);
         }
 
-        public async Task ValidatePathAsync(string path, IUpdateModel updater, string sitemapId = null)
+        if (path.IndexOfAny(InvalidCharactersForPath) > -1 || path.IndexOf(' ') > -1)
         {
-            // Keep localized text as similar to Autoroute as possible.
-            if (path == "/")
-            {
-                updater.ModelState.AddModelError(Prefix, Path, S["Your permalink can't be set to the homepage"]);
-            }
-
-            if (path.IndexOfAny(InvalidCharactersForPath) > -1 || path.IndexOf(' ') > -1)
-            {
-                var invalidCharactersForMessage = string.Join(", ", InvalidCharactersForPath.Select(c => $"\"{c}\""));
-                updater.ModelState.AddModelError(Prefix, Path, S["Please do not use any of the following characters in your permalink: {0}. No spaces are allowed (please use dashes or underscores instead).", invalidCharactersForMessage]);
-            }
-
-            // Precludes possibility of collision with Autoroute as Autoroute excludes . as a valid path character.
-            if (!path.EndsWith(Sitemap.PathExtension))
-            {
-                updater.ModelState.AddModelError(Prefix, Path, S["Your permalink must end with {0}.", Sitemap.PathExtension]);
-            }
+            var invalidCharactersForMessage = string.Join(", ", InvalidCharactersForPath.Select(c => $"\"{c}\""));
+            updater.ModelState.AddModelError(Prefix, Path, S["Please do not use any of the following characters in your permalink: {0}. No spaces are allowed (please use dashes or underscores instead).", invalidCharactersForMessage]);
+        }
 
-            if (path.Length > MaxPathLength)
-            {
-                updater.ModelState.AddModelError(Prefix, Path, S["Your permalink is too long. The permalink can only be up to {0} characters.", MaxPathLength]);
-            }
+        // Precludes possibility of collision with Autoroute as Autoroute excludes . as a valid path character.
+        if (!path.EndsWith(Sitemap.PathExtension))
+        {
+            updater.ModelState.AddModelError(Prefix, Path, S["Your permalink must end with {0}.", Sitemap.PathExtension]);
+        }
 
-            var routeExists = false;
-            if (string.IsNullOrEmpty(sitemapId))
-            {
-                routeExists = (await _sitemapManager.GetSitemapsAsync())
-                    .Any(p => string.Equals(p.Path, path.TrimStart('/'), StringComparison.OrdinalIgnoreCase));
-            }
-            else
-            {
-                routeExists = (await _sitemapManager.GetSitemapsAsync())
-                    .Any(p => p.SitemapId != sitemapId && string.Equals(p.Path, path.TrimStart('/'), StringComparison.OrdinalIgnoreCase));
-            }
+        if (path.Length > MaxPathLength)
+        {
+            updater.ModelState.AddModelError(Prefix, Path, S["Your permalink is too long. The permalink can only be up to {0} characters.", MaxPathLength]);
+        }
 
-            if (routeExists)
-            {
-                updater.ModelState.AddModelError(Prefix, Path, S["Your permalink is already in use."]);
-            }
+        var routeExists = false;
+        if (string.IsNullOrEmpty(sitemapId))
+        {
+            routeExists = (await _sitemapManager.GetSitemapsAsync())
+                .Any(p => string.Equals(p.Path, path.TrimStart('/'), StringComparison.OrdinalIgnoreCase));
+        }
+        else
+        {
+            routeExists = (await _sitemapManager.GetSitemapsAsync())
+                .Any(p => p.SitemapId != sitemapId && string.Equals(p.Path, path.TrimStart('/'), StringComparison.OrdinalIgnoreCase));
         }
 
-        public string GetSitemapSlug(string name)
+        if (routeExists)
         {
-            return _slugService.Slugify(name) + Sitemap.PathExtension;
+            updater.ModelState.AddModelError(Prefix, Path, S["Your permalink is already in use."]);
         }
+    }
 
+    public string GetSitemapSlug(string name)
+    {
+        return _slugService.Slugify(name) + Sitemap.PathExtension;
     }
+
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/SitemapIdGenerator.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/SitemapIdGenerator.cs
index e30a4bd9840..a184f6ca913 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/SitemapIdGenerator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/SitemapIdGenerator.cs
@@ -1,19 +1,18 @@
 using OrchardCore.Entities;
 
-namespace OrchardCore.Sitemaps.Services
+namespace OrchardCore.Sitemaps.Services;
+
+public class SitemapIdGenerator : ISitemapIdGenerator
 {
-    public class SitemapIdGenerator : ISitemapIdGenerator
-    {
-        private readonly IIdGenerator _idGenerator;
+    private readonly IIdGenerator _idGenerator;
 
-        public SitemapIdGenerator(IIdGenerator idGenerator)
-        {
-            _idGenerator = idGenerator;
-        }
+    public SitemapIdGenerator(IIdGenerator idGenerator)
+    {
+        _idGenerator = idGenerator;
+    }
 
-        public string GenerateUniqueId()
-        {
-            return _idGenerator.GenerateUniqueId();
-        }
+    public string GenerateUniqueId()
+    {
+        return _idGenerator.GenerateUniqueId();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/SitemapManager.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/SitemapManager.cs
index c74cae93d63..f9abb79333f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/SitemapManager.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Services/SitemapManager.cs
@@ -4,80 +4,79 @@
 using OrchardCore.Documents;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Services
+namespace OrchardCore.Sitemaps.Services;
+
+public class SitemapManager : ISitemapManager
 {
-    public class SitemapManager : ISitemapManager
-    {
-        private readonly IDocumentManager<SitemapDocument> _documentManager;
+    private readonly IDocumentManager<SitemapDocument> _documentManager;
 
-        public SitemapManager(IDocumentManager<SitemapDocument> documentManager)
-        {
-            _documentManager = documentManager;
-        }
+    public SitemapManager(IDocumentManager<SitemapDocument> documentManager)
+    {
+        _documentManager = documentManager;
+    }
 
-        public async Task<string> GetIdentifierAsync() => (await GetDocumentAsync()).Identifier;
+    public async Task<string> GetIdentifierAsync() => (await GetDocumentAsync()).Identifier;
 
-        public async Task<IEnumerable<SitemapType>> LoadSitemapsAsync()
-        {
-            return (await LoadDocumentAsync()).Sitemaps.Values.ToArray();
-        }
+    public async Task<IEnumerable<SitemapType>> LoadSitemapsAsync()
+    {
+        return (await LoadDocumentAsync()).Sitemaps.Values.ToArray();
+    }
 
-        public async Task<IEnumerable<SitemapType>> GetSitemapsAsync()
-        {
-            return (await GetDocumentAsync()).Sitemaps.Values.ToArray();
-        }
+    public async Task<IEnumerable<SitemapType>> GetSitemapsAsync()
+    {
+        return (await GetDocumentAsync()).Sitemaps.Values.ToArray();
+    }
 
-        public async Task<SitemapType> LoadSitemapAsync(string sitemapId)
+    public async Task<SitemapType> LoadSitemapAsync(string sitemapId)
+    {
+        var document = await LoadDocumentAsync();
+        if (document.Sitemaps.TryGetValue(sitemapId, out var sitemap))
         {
-            var document = await LoadDocumentAsync();
-            if (document.Sitemaps.TryGetValue(sitemapId, out var sitemap))
-            {
-                return sitemap;
-            }
-
-            return null;
+            return sitemap;
         }
 
-        public async Task<SitemapType> GetSitemapAsync(string sitemapId)
-        {
-            var document = await GetDocumentAsync();
-            if (document.Sitemaps.TryGetValue(sitemapId, out var sitemap))
-            {
-                return sitemap;
-            }
-
-            return null;
-        }
+        return null;
+    }
 
-        public async Task DeleteSitemapAsync(string sitemapId)
+    public async Task<SitemapType> GetSitemapAsync(string sitemapId)
+    {
+        var document = await GetDocumentAsync();
+        if (document.Sitemaps.TryGetValue(sitemapId, out var sitemap))
         {
-            var existing = await LoadDocumentAsync();
-            existing.Sitemaps.Remove(sitemapId);
-            await _documentManager.UpdateAsync(existing);
+            return sitemap;
         }
 
-        public async Task UpdateSitemapAsync(SitemapType sitemap)
-        {
-            var existing = await LoadDocumentAsync();
-            existing.Sitemaps[sitemap.SitemapId] = sitemap;
-            sitemap.Identifier = IdGenerator.GenerateId();
-            await _documentManager.UpdateAsync(existing);
-        }
+        return null;
+    }
 
-        public async Task UpdateSitemapAsync()
-        {
-            var existing = await LoadDocumentAsync();
-            await _documentManager.UpdateAsync(existing);
-        }
+    public async Task DeleteSitemapAsync(string sitemapId)
+    {
+        var existing = await LoadDocumentAsync();
+        existing.Sitemaps.Remove(sitemapId);
+        await _documentManager.UpdateAsync(existing);
+    }
 
-        /// <summary>
-        /// Loads the sitemap document from the store for updating and that should not be cached.
-        /// </summary>
-        private Task<SitemapDocument> LoadDocumentAsync() => _documentManager.GetOrCreateMutableAsync();
+    public async Task UpdateSitemapAsync(SitemapType sitemap)
+    {
+        var existing = await LoadDocumentAsync();
+        existing.Sitemaps[sitemap.SitemapId] = sitemap;
+        sitemap.Identifier = IdGenerator.GenerateId();
+        await _documentManager.UpdateAsync(existing);
+    }
 
-        /// <summary>
-        /// Gets the sitemap document from the cache for sharing and that should not be updated.
-        /// </summary>
-        private Task<SitemapDocument> GetDocumentAsync() => _documentManager.GetOrCreateImmutableAsync();
+    public async Task UpdateSitemapAsync()
+    {
+        var existing = await LoadDocumentAsync();
+        await _documentManager.UpdateAsync(existing);
     }
+
+    /// <summary>
+    /// Loads the sitemap document from the store for updating and that should not be cached.
+    /// </summary>
+    private Task<SitemapDocument> LoadDocumentAsync() => _documentManager.GetOrCreateMutableAsync();
+
+    /// <summary>
+    /// Gets the sitemap document from the cache for sharing and that should not be updated.
+    /// </summary>
+    private Task<SitemapDocument> GetDocumentAsync() => _documentManager.GetOrCreateImmutableAsync();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Startup.cs
index 3a403bc06a9..488fdbbfb4b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Startup.cs
@@ -26,113 +26,112 @@
 using OrchardCore.Sitemaps.Routing;
 using OrchardCore.Sitemaps.Services;
 
-namespace OrchardCore.Sitemaps
+namespace OrchardCore.Sitemaps;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDataMigration<Migrations>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddDataMigration<Migrations>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IPermissionProvider, Permissions>();
 
-            services.Configure<SitemapsOptions>(options =>
+        services.Configure<SitemapsOptions>(options =>
+        {
+            if (options.GlobalRouteValues.Count == 0)
             {
-                if (options.GlobalRouteValues.Count == 0)
+                options.GlobalRouteValues = new RouteValueDictionary
                 {
-                    options.GlobalRouteValues = new RouteValueDictionary
-                    {
-                        {"Area", "OrchardCore.Sitemaps"},
-                        {"Controller", "Sitemap"},
-                        {"Action", "Index"}
-                    };
-
-                    options.SitemapIdKey = "sitemapId";
-                }
-            });
-
-            services.AddSingleton<SitemapEntries>();
-            services.AddSingleton<ISitemapManager, SitemapManager>();
-            services.AddSingleton<IShellRouteValuesAddressScheme, SitemapValuesAddressScheme>();
-            services.AddSingleton<SitemapRouteTransformer>();
-
-            services.AddScoped<ISitemapIdGenerator, SitemapIdGenerator>();
-            services.AddScoped<ISitemapHelperService, SitemapHelperService>();
-            services.AddScoped<ISitemapBuilder, DefaultSitemapBuilder>();
-            services.AddScoped<ISitemapTypeBuilder, SitemapTypeBuilder>();
-            services.AddScoped<ISitemapCacheProvider, DefaultSitemapCacheProvider>();
-            services.AddScoped<ISitemapUpdateHandler, DefaultSitemapUpdateHandler>();
-            services.AddScoped<ISitemapTypeUpdateHandler, SitemapTypeUpdateHandler>();
-            services.AddScoped<ISitemapTypeBuilder, SitemapIndexTypeBuilder>();
-            services.AddScoped<ISitemapTypeUpdateHandler, SitemapIndexTypeUpdateHandler>();
-            services.AddScoped<ISitemapModifiedDateProvider, DefaultSitemapModifiedDateProvider>();
-            services.AddScoped<IRouteableContentTypeCoordinator, DefaultRouteableContentTypeCoordinator>();
-
-            // Sitemap Part.
-            services.AddContentPart<SitemapPart>()
-                .UseDisplayDriver<SitemapPartDisplayDriver>()
-                .AddHandler<SitemapPartHandler>();
-
-            // Custom sitemap path.
-            services.AddScoped<ISitemapSourceBuilder, CustomPathSitemapSourceBuilder>();
-            services.AddScoped<ISitemapSourceUpdateHandler, CustomPathSitemapSourceUpdateHandler>();
-            services.AddScoped<ISitemapSourceModifiedDateProvider, CustomPathSitemapSourceModifiedDateProvider>();
-            services.AddScoped<IDisplayDriver<SitemapSource>, CustomPathSitemapSourceDriver>();
-            services.AddScoped<ISitemapSourceFactory, SitemapSourceFactory<CustomPathSitemapSource>>();
-
-            services.AddRecipeExecutionStep<SitemapsStep>();
-
-            // Allows to serialize 'SitemapType' derived types.
-            services.AddJsonDerivedTypeInfo<Sitemap, SitemapType>();
-            services.AddJsonDerivedTypeInfo<SitemapIndex, SitemapType>();
-
-            // Allows to serialize 'SitemapSource' derived types.
-            services.AddJsonDerivedTypeInfo<ContentTypesSitemapSource, SitemapSource>();
-            services.AddJsonDerivedTypeInfo<CustomPathSitemapSource, SitemapSource>();
-            services.AddJsonDerivedTypeInfo<SitemapIndexSource, SitemapSource>();
-        }
-
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            routes.MapDynamicControllerRoute<SitemapRouteTransformer>("/{**sitemap}");
-        }
+                    {"Area", "OrchardCore.Sitemaps"},
+                    {"Controller", "Sitemap"},
+                    {"Action", "Index"}
+                };
+
+                options.SitemapIdKey = "sitemapId";
+            }
+        });
+
+        services.AddSingleton<SitemapEntries>();
+        services.AddSingleton<ISitemapManager, SitemapManager>();
+        services.AddSingleton<IShellRouteValuesAddressScheme, SitemapValuesAddressScheme>();
+        services.AddSingleton<SitemapRouteTransformer>();
+
+        services.AddScoped<ISitemapIdGenerator, SitemapIdGenerator>();
+        services.AddScoped<ISitemapHelperService, SitemapHelperService>();
+        services.AddScoped<ISitemapBuilder, DefaultSitemapBuilder>();
+        services.AddScoped<ISitemapTypeBuilder, SitemapTypeBuilder>();
+        services.AddScoped<ISitemapCacheProvider, DefaultSitemapCacheProvider>();
+        services.AddScoped<ISitemapUpdateHandler, DefaultSitemapUpdateHandler>();
+        services.AddScoped<ISitemapTypeUpdateHandler, SitemapTypeUpdateHandler>();
+        services.AddScoped<ISitemapTypeBuilder, SitemapIndexTypeBuilder>();
+        services.AddScoped<ISitemapTypeUpdateHandler, SitemapIndexTypeUpdateHandler>();
+        services.AddScoped<ISitemapModifiedDateProvider, DefaultSitemapModifiedDateProvider>();
+        services.AddScoped<IRouteableContentTypeCoordinator, DefaultRouteableContentTypeCoordinator>();
+
+        // Sitemap Part.
+        services.AddContentPart<SitemapPart>()
+            .UseDisplayDriver<SitemapPartDisplayDriver>()
+            .AddHandler<SitemapPartHandler>();
+
+        // Custom sitemap path.
+        services.AddScoped<ISitemapSourceBuilder, CustomPathSitemapSourceBuilder>();
+        services.AddScoped<ISitemapSourceUpdateHandler, CustomPathSitemapSourceUpdateHandler>();
+        services.AddScoped<ISitemapSourceModifiedDateProvider, CustomPathSitemapSourceModifiedDateProvider>();
+        services.AddScoped<IDisplayDriver<SitemapSource>, CustomPathSitemapSourceDriver>();
+        services.AddScoped<ISitemapSourceFactory, SitemapSourceFactory<CustomPathSitemapSource>>();
+
+        services.AddRecipeExecutionStep<SitemapsStep>();
+
+        // Allows to serialize 'SitemapType' derived types.
+        services.AddJsonDerivedTypeInfo<Sitemap, SitemapType>();
+        services.AddJsonDerivedTypeInfo<SitemapIndex, SitemapType>();
+
+        // Allows to serialize 'SitemapSource' derived types.
+        services.AddJsonDerivedTypeInfo<ContentTypesSitemapSource, SitemapSource>();
+        services.AddJsonDerivedTypeInfo<CustomPathSitemapSource, SitemapSource>();
+        services.AddJsonDerivedTypeInfo<SitemapIndexSource, SitemapSource>();
     }
 
-    [Feature("OrchardCore.Sitemaps.RazorPages")]
-    public sealed class SitemapsRazorPagesStartup : StartupBase
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddOptions<SitemapsRazorPagesOptions>();
-            services.AddScoped<IRouteableContentTypeProvider, RazorPagesContentTypeProvider>();
-        }
+        routes.MapDynamicControllerRoute<SitemapRouteTransformer>("/{**sitemap}");
     }
+}
 
-    [Feature("OrchardCore.Sitemaps.Cleanup")]
-    public sealed class SitemapsCleanupStartup : StartupBase
+[Feature("OrchardCore.Sitemaps.RazorPages")]
+public sealed class SitemapsRazorPagesStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSingleton<IBackgroundTask, SitemapCacheBackgroundTask>();
-        }
+        services.AddOptions<SitemapsRazorPagesOptions>();
+        services.AddScoped<IRouteableContentTypeProvider, RazorPagesContentTypeProvider>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment", "OrchardCore.Sitemaps")]
-    public sealed class SitemapsDeploymentStartup : StartupBase
+[Feature("OrchardCore.Sitemaps.Cleanup")]
+public sealed class SitemapsCleanupStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<AllSitemapsDeploymentSource, AllSitemapsDeploymentStep, AllSitemapsDeploymentStepDriver>();
-        }
+        services.AddSingleton<IBackgroundTask, SitemapCacheBackgroundTask>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Seo")]
-    public sealed class SeoStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment", "OrchardCore.Sitemaps")]
+public sealed class SitemapsDeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddTransient<IRobotsProvider, SitemapsRobotsProvider>();
-            services.AddScoped<IDisplayDriver<ISite>, SitemapsRobotsSettingsDisplayDriver>();
-        }
+        services.AddDeployment<AllSitemapsDeploymentSource, AllSitemapsDeploymentStep, AllSitemapsDeploymentStepDriver>();
+    }
+}
+
+[RequireFeatures("OrchardCore.Seo")]
+public sealed class SeoStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddTransient<IRobotsProvider, SitemapsRobotsProvider>();
+        services.AddScoped<IDisplayDriver<ISite>, SitemapsRobotsSettingsDisplayDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/CreateSitemapIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/CreateSitemapIndexViewModel.cs
index a2b3bfac5f2..891c510a2b5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/CreateSitemapIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/CreateSitemapIndexViewModel.cs
@@ -1,25 +1,24 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Sitemaps.ViewModels
+namespace OrchardCore.Sitemaps.ViewModels;
+
+public class CreateSitemapIndexViewModel
 {
-    public class CreateSitemapIndexViewModel
-    {
-        [Required]
-        public string Name { get; set; }
+    [Required]
+    public string Name { get; set; }
 
-        [Required]
-        public string Path { get; set; }
+    [Required]
+    public string Path { get; set; }
 
-        public bool Enabled { get; set; }
+    public bool Enabled { get; set; }
 
-        public ContainableSitemapEntryViewModel[] ContainableSitemaps { get; set; } = [];
+    public ContainableSitemapEntryViewModel[] ContainableSitemaps { get; set; } = [];
 
-    }
+}
 
-    public class ContainableSitemapEntryViewModel
-    {
-        public bool IsChecked { get; set; }
-        public string SitemapId { get; set; }
-        public string Name { get; set; }
-    }
+public class ContainableSitemapEntryViewModel
+{
+    public bool IsChecked { get; set; }
+    public string SitemapId { get; set; }
+    public string Name { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/CreateSitemapViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/CreateSitemapViewModel.cs
index 6553b72c947..db6251554cf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/CreateSitemapViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/CreateSitemapViewModel.cs
@@ -1,14 +1,13 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Sitemaps.ViewModels
+namespace OrchardCore.Sitemaps.ViewModels;
+
+public class CreateSitemapViewModel
 {
-    public class CreateSitemapViewModel
-    {
-        [Required]
-        public string Name { get; set; }
+    [Required]
+    public string Name { get; set; }
 
-        public string Path { get; set; }
+    public string Path { get; set; }
 
-        public bool Enabled { get; set; } = true;
-    }
+    public bool Enabled { get; set; } = true;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/CreateSourceViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/CreateSourceViewModel.cs
index 12bf01a2b96..7cbb2a3575e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/CreateSourceViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/CreateSourceViewModel.cs
@@ -1,17 +1,16 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.ViewModels
+namespace OrchardCore.Sitemaps.ViewModels;
+
+public class CreateSourceViewModel
 {
-    public class CreateSourceViewModel
-    {
-        public string SitemapId { get; set; }
-        public string SitemapSourceId { get; set; }
-        public string SitemapSourceType { get; set; }
-        public dynamic Editor { get; set; }
+    public string SitemapId { get; set; }
+    public string SitemapSourceId { get; set; }
+    public string SitemapSourceType { get; set; }
+    public dynamic Editor { get; set; }
 
-        [BindNever]
-        public SitemapSource SitemapSource { get; set; }
+    [BindNever]
+    public SitemapSource SitemapSource { get; set; }
 
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/CustomPathSitemapSourceViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/CustomPathSitemapSourceViewModel.cs
index 65664699d6a..9e0d5840be7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/CustomPathSitemapSourceViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/CustomPathSitemapSourceViewModel.cs
@@ -1,25 +1,24 @@
 using System.ComponentModel.DataAnnotations;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.ViewModels
+namespace OrchardCore.Sitemaps.ViewModels;
+
+/// <summary>
+/// A sitemap source for managing custom url.
+/// </summary>
+public class CustomPathSitemapSourceViewModel
 {
     /// <summary>
-    /// A sitemap source for managing custom url.
+    /// Gets and sets the custom url.
     /// </summary>
-    public class CustomPathSitemapSourceViewModel
-    {
-        /// <summary>
-        /// Gets and sets the custom url.
-        /// </summary>
-        [Required]
-        public string Path { get; set; }
+    [Required]
+    public string Path { get; set; }
 
-        /// <summary>
-        /// Gets and sets the frequency to apply to sitemap entries.
-        /// </summary>
-        public ChangeFrequency ChangeFrequency { get; set; }
+    /// <summary>
+    /// Gets and sets the frequency to apply to sitemap entries.
+    /// </summary>
+    public ChangeFrequency ChangeFrequency { get; set; }
 
-        // Handle as int, and convert to float, when building, to support localization.
-        public int Priority { get; set; } = 5;
-    }
+    // Handle as int, and convert to float, when building, to support localization.
+    public int Priority { get; set; } = 5;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/DisplaySitemapViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/DisplaySitemapViewModel.cs
index 265a7aa5711..515fe50e869 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/DisplaySitemapViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/DisplaySitemapViewModel.cs
@@ -1,12 +1,11 @@
 using System.Collections.Generic;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.ViewModels
+namespace OrchardCore.Sitemaps.ViewModels;
+
+public class DisplaySitemapViewModel
 {
-    public class DisplaySitemapViewModel
-    {
-        public SitemapType Sitemap { get; set; }
-        public IEnumerable<dynamic> Items { get; set; }
-        public IDictionary<string, dynamic> Thumbnails { get; set; }
-    }
+    public SitemapType Sitemap { get; set; }
+    public IEnumerable<dynamic> Items { get; set; }
+    public IDictionary<string, dynamic> Thumbnails { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/EditSitemapIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/EditSitemapIndexViewModel.cs
index 3966676813a..190b166bd00 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/EditSitemapIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/EditSitemapIndexViewModel.cs
@@ -2,14 +2,13 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.ViewModels
+namespace OrchardCore.Sitemaps.ViewModels;
+
+public class EditSitemapIndexViewModel : CreateSitemapIndexViewModel
 {
-    public class EditSitemapIndexViewModel : CreateSitemapIndexViewModel
-    {
-        [Required]
-        public string SitemapId { get; set; }
+    [Required]
+    public string SitemapId { get; set; }
 
-        [BindNever]
-        public SitemapIndexSource SitemapIndexSource { get; set; }
-    }
+    [BindNever]
+    public SitemapIndexSource SitemapIndexSource { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/EditSitemapViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/EditSitemapViewModel.cs
index 3346b664198..b0d3825767b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/EditSitemapViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/EditSitemapViewModel.cs
@@ -1,16 +1,15 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Sitemaps.ViewModels
+namespace OrchardCore.Sitemaps.ViewModels;
+
+public class EditSitemapViewModel
 {
-    public class EditSitemapViewModel
-    {
-        public string SitemapId { get; set; }
+    public string SitemapId { get; set; }
 
-        [Required]
-        public string Name { get; set; }
+    [Required]
+    public string Name { get; set; }
 
-        public string Path { get; set; }
+    public string Path { get; set; }
 
-        public bool Enabled { get; set; }
-    }
+    public bool Enabled { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/EditSourceViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/EditSourceViewModel.cs
index 494c288db5a..bbffaa06029 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/EditSourceViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/EditSourceViewModel.cs
@@ -1,16 +1,15 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.ViewModels
+namespace OrchardCore.Sitemaps.ViewModels;
+
+public class EditSourceViewModel
 {
-    public class EditSourceViewModel
-    {
-        public string SitemapId { get; set; }
-        public string SitemapSourceId { get; set; }
-        public dynamic Editor { get; set; }
+    public string SitemapId { get; set; }
+    public string SitemapSourceId { get; set; }
+    public dynamic Editor { get; set; }
 
-        [BindNever]
-        public SitemapSource SitemapSource { get; set; }
+    [BindNever]
+    public SitemapSource SitemapSource { get; set; }
 
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/ListSitemapCacheViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/ListSitemapCacheViewModel.cs
index 0b265170313..99553a79fe8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/ListSitemapCacheViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/ListSitemapCacheViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Sitemaps.ViewModels
+namespace OrchardCore.Sitemaps.ViewModels;
+
+public class ListSitemapCacheViewModel
 {
-    public class ListSitemapCacheViewModel
-    {
-        public string[] CachedFileNames { get; set; }
-    }
+    public string[] CachedFileNames { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/ListSitemapIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/ListSitemapIndexViewModel.cs
index bb2fd1fad9b..a87010bab0c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/ListSitemapIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/ListSitemapIndexViewModel.cs
@@ -1,18 +1,17 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Sitemaps.ViewModels
+namespace OrchardCore.Sitemaps.ViewModels;
+
+public class ListSitemapIndexViewModel
 {
-    public class ListSitemapIndexViewModel
-    {
-        public IList<SitemapIndexListEntry> SitemapIndexes { get; set; }
-        public ContentOptions Options { get; set; } = new ContentOptions();
-        public dynamic Pager { get; set; }
-    }
+    public IList<SitemapIndexListEntry> SitemapIndexes { get; set; }
+    public ContentOptions Options { get; set; } = new ContentOptions();
+    public dynamic Pager { get; set; }
+}
 
-    public class SitemapIndexListEntry
-    {
-        public string SitemapId { get; set; }
-        public string Name { get; set; }
-        public bool Enabled { get; set; }
-    }
+public class SitemapIndexListEntry
+{
+    public string SitemapId { get; set; }
+    public string Name { get; set; }
+    public bool Enabled { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/ListSitemapViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/ListSitemapViewModel.cs
index 5174fa4e893..ca996311894 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/ListSitemapViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/ListSitemapViewModel.cs
@@ -2,39 +2,37 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.Sitemaps.ViewModels
+namespace OrchardCore.Sitemaps.ViewModels;
+
+public class ListSitemapViewModel
+{
+    public IList<SitemapListEntry> Sitemaps { get; set; }
+    public ContentOptions Options { get; set; } = new ContentOptions();
+    public dynamic Pager { get; set; }
+}
+
+public class SitemapListEntry
+{
+    public string SitemapId { get; set; }
+    public string Name { get; set; }
+    public bool Enabled { get; set; }
+}
+
+public class ContentOptions
 {
-    public class ListSitemapViewModel
-    {
-        public IList<SitemapListEntry> Sitemaps { get; set; }
-        public ContentOptions Options { get; set; } = new ContentOptions();
-        public dynamic Pager { get; set; }
-    }
-
-    public class SitemapListEntry
-    {
-        public string SitemapId { get; set; }
-        public string Name { get; set; }
-        public bool Enabled { get; set; }
-    }
-
-    public class ContentOptions
-    {
-        public string Search { get; set; }
-        public ContentsBulkAction BulkAction { get; set; }
-
-        #region Lists to populate
-
-        [BindNever]
-        public List<SelectListItem> ContentsBulkAction { get; set; }
-
-        #endregion Lists to populate
-    }
-
-    public enum ContentsBulkAction
-    {
-        None,
-        Remove
-    }
+    public string Search { get; set; }
+    public ContentsBulkAction BulkAction { get; set; }
+
+    #region Lists to populate
+
+    [BindNever]
+    public List<SelectListItem> ContentsBulkAction { get; set; }
 
+    #endregion Lists to populate
+}
+
+public enum ContentsBulkAction
+{
+    None,
+    Remove
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/SitemapPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/SitemapPartViewModel.cs
index 03f7a700e69..7d7637cc9c4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/SitemapPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/ViewModels/SitemapPartViewModel.cs
@@ -1,19 +1,18 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.ViewModels
+namespace OrchardCore.Sitemaps.ViewModels;
+
+public class SitemapPartViewModel
 {
-    public class SitemapPartViewModel
-    {
-        public bool OverrideSitemapConfig { get; set; }
+    public bool OverrideSitemapConfig { get; set; }
 
-        public ChangeFrequency ChangeFrequency { get; set; }
+    public ChangeFrequency ChangeFrequency { get; set; }
 
-        public int Priority { get; set; }
+    public int Priority { get; set; }
 
-        public bool Exclude { get; set; }
+    public bool Exclude { get; set; }
 
-        [BindNever]
-        public SitemapPart SitemapPart { get; set; }
-    }
+    [BindNever]
+    public SitemapPart SitemapPart { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Spatial/Drivers/GeoPointFieldDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Spatial/Drivers/GeoPointFieldDisplayDriver.cs
index 36d3cf69726..968e2139617 100644
--- a/src/OrchardCore.Modules/OrchardCore.Spatial/Drivers/GeoPointFieldDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Spatial/Drivers/GeoPointFieldDisplayDriver.cs
@@ -13,95 +13,94 @@
 using OrchardCore.Spatial.Settings;
 using OrchardCore.Spatial.ViewModels;
 
-namespace OrchardCore.Spatial.Drivers
+namespace OrchardCore.Spatial.Drivers;
+
+public sealed class GeoPointFieldDisplayDriver : ContentFieldDisplayDriver<GeoPointField>
 {
-    public sealed class GeoPointFieldDisplayDriver : ContentFieldDisplayDriver<GeoPointField>
+    internal readonly IStringLocalizer S;
+
+    public GeoPointFieldDisplayDriver(IStringLocalizer<GeoPointFieldDisplayDriver> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public GeoPointFieldDisplayDriver(IStringLocalizer<GeoPointFieldDisplayDriver> localizer)
+    public override IDisplayResult Display(GeoPointField field, BuildFieldDisplayContext context)
+    {
+        return Initialize<DisplayGeoPointFieldViewModel>(GetDisplayShapeType(context), model =>
         {
-            S = localizer;
-        }
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        }).Location("Detail", "Content")
+        .Location("Summary", "Content");
+    }
 
-        public override IDisplayResult Display(GeoPointField field, BuildFieldDisplayContext context)
+    public override IDisplayResult Edit(GeoPointField field, BuildFieldEditorContext context)
+    {
+        return Initialize<EditGeoPointFieldViewModel>(GetEditorShapeType(context), model =>
         {
-            return Initialize<DisplayGeoPointFieldViewModel>(GetDisplayShapeType(context), model =>
-            {
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            }).Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
+            model.Latitude = Convert.ToString(field.Latitude, CultureInfo.InvariantCulture);
+            model.Longitude = Convert.ToString(field.Longitude, CultureInfo.InvariantCulture);
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        });
+    }
 
-        public override IDisplayResult Edit(GeoPointField field, BuildFieldEditorContext context)
-        {
-            return Initialize<EditGeoPointFieldViewModel>(GetEditorShapeType(context), model =>
-            {
-                model.Latitude = Convert.ToString(field.Latitude, CultureInfo.InvariantCulture);
-                model.Longitude = Convert.ToString(field.Longitude, CultureInfo.InvariantCulture);
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            });
-        }
+    public override async Task<IDisplayResult> UpdateAsync(GeoPointField field, UpdateFieldEditorContext context)
+    {
+        var viewModel = new EditGeoPointFieldViewModel();
+
+        var modelUpdated = await context.Updater.TryUpdateModelAsync(viewModel, Prefix, f => f.Latitude, f => f.Longitude);
 
-        public override async Task<IDisplayResult> UpdateAsync(GeoPointField field, UpdateFieldEditorContext context)
+        if (modelUpdated)
         {
-            var viewModel = new EditGeoPointFieldViewModel();
+            decimal latitude;
+            decimal longitude;
 
-            var modelUpdated = await context.Updater.TryUpdateModelAsync(viewModel, Prefix, f => f.Latitude, f => f.Longitude);
+            var settings = context.PartFieldDefinition.GetSettings<GeoPointFieldSettings>();
 
-            if (modelUpdated)
+            if (string.IsNullOrWhiteSpace(viewModel.Latitude))
             {
-                decimal latitude;
-                decimal longitude;
-
-                var settings = context.PartFieldDefinition.GetSettings<GeoPointFieldSettings>();
-
-                if (string.IsNullOrWhiteSpace(viewModel.Latitude))
+                if (settings.Required)
                 {
-                    if (settings.Required)
-                    {
-                        context.Updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
-                    }
-                    else
-                    {
-                        field.Latitude = null;
-                    }
-                }
-                else if (!decimal.TryParse(viewModel.Latitude, NumberStyles.Any, CultureInfo.InvariantCulture, out latitude))
-                {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Latitude), S["{0} is an invalid number.", context.PartFieldDefinition.DisplayName()]);
+                    context.Updater.ModelState.AddModelError(Prefix, nameof(field.Latitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
                 }
                 else
                 {
-                    field.Latitude = latitude;
+                    field.Latitude = null;
                 }
+            }
+            else if (!decimal.TryParse(viewModel.Latitude, NumberStyles.Any, CultureInfo.InvariantCulture, out latitude))
+            {
+                context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Latitude), S["{0} is an invalid number.", context.PartFieldDefinition.DisplayName()]);
+            }
+            else
+            {
+                field.Latitude = latitude;
+            }
 
-                if (string.IsNullOrWhiteSpace(viewModel.Longitude))
-                {
-                    if (settings.Required)
-                    {
-                        context.Updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
-                    }
-                    else
-                    {
-                        field.Longitude = null;
-                    }
-                }
-                else if (!decimal.TryParse(viewModel.Longitude, NumberStyles.Any, CultureInfo.InvariantCulture, out longitude))
+            if (string.IsNullOrWhiteSpace(viewModel.Longitude))
+            {
+                if (settings.Required)
                 {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Longitude), S["{0} is an invalid number.", context.PartFieldDefinition.DisplayName()]);
+                    context.Updater.ModelState.AddModelError(Prefix, nameof(field.Longitude), S["The {0} field is required.", context.PartFieldDefinition.DisplayName()]);
                 }
                 else
                 {
-                    field.Longitude = longitude;
+                    field.Longitude = null;
                 }
             }
-
-            return Edit(field, context);
+            else if (!decimal.TryParse(viewModel.Longitude, NumberStyles.Any, CultureInfo.InvariantCulture, out longitude))
+            {
+                context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.Longitude), S["{0} is an invalid number.", context.PartFieldDefinition.DisplayName()]);
+            }
+            else
+            {
+                field.Longitude = longitude;
+            }
         }
+
+        return Edit(field, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Spatial/Drivers/GeoPointFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.Spatial/Drivers/GeoPointFieldSettingsDriver.cs
index f159c482549..7fb8f939a76 100644
--- a/src/OrchardCore.Modules/OrchardCore.Spatial/Drivers/GeoPointFieldSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Spatial/Drivers/GeoPointFieldSettingsDriver.cs
@@ -7,30 +7,29 @@
 using OrchardCore.Spatial.Fields;
 using OrchardCore.Spatial.Settings;
 
-namespace OrchardCore.Spatial.Drivers
+namespace OrchardCore.Spatial.Drivers;
+
+public sealed class GeoPointFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<GeoPointField>
 {
-    public sealed class GeoPointFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<GeoPointField>
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+        return Initialize<GeoPointFieldSettings>("GeoPointFieldSettings_Edit", model =>
         {
-            return Initialize<GeoPointFieldSettings>("GeoPointFieldSettings_Edit", model =>
-            {
-                var settings = partFieldDefinition.Settings.ToObject<GeoPointFieldSettings>();
+            var settings = partFieldDefinition.Settings.ToObject<GeoPointFieldSettings>();
 
-                model.Hint = settings.Hint;
-                model.Required = settings.Required;
-            }).Location("Content");
-        }
+            model.Hint = settings.Hint;
+            model.Required = settings.Required;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
-        {
-            var model = new GeoPointFieldSettings();
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        var model = new GeoPointFieldSettings();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            context.Builder.WithSettings(model);
+        context.Builder.WithSettings(model);
 
-            return Edit(partFieldDefinition, context);
-        }
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Spatial/Fields/GeoPointField.cs b/src/OrchardCore.Modules/OrchardCore.Spatial/Fields/GeoPointField.cs
index a7275250ca3..7d028596197 100644
--- a/src/OrchardCore.Modules/OrchardCore.Spatial/Fields/GeoPointField.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Spatial/Fields/GeoPointField.cs
@@ -1,11 +1,10 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Spatial.Fields
+namespace OrchardCore.Spatial.Fields;
+
+public class GeoPointField : ContentField
 {
-    public class GeoPointField : ContentField
-    {
-        public decimal? Latitude { get; set; }
+    public decimal? Latitude { get; set; }
 
-        public decimal? Longitude { get; set; }
-    }
+    public decimal? Longitude { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Spatial/Indexing/GeoPointFieldIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.Spatial/Indexing/GeoPointFieldIndexHandler.cs
index 9e66d3f269c..8e9926304fc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Spatial/Indexing/GeoPointFieldIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Spatial/Indexing/GeoPointFieldIndexHandler.cs
@@ -2,33 +2,32 @@
 using OrchardCore.Indexing;
 using OrchardCore.Spatial.Fields;
 
-namespace OrchardCore.Spatial.Indexing
+namespace OrchardCore.Spatial.Indexing;
+
+public class GeoPointFieldIndexHandler : ContentFieldIndexHandler<GeoPointField>
 {
-    public class GeoPointFieldIndexHandler : ContentFieldIndexHandler<GeoPointField>
+    public override Task BuildIndexAsync(GeoPointField field, BuildFieldIndexContext context)
     {
-        public override Task BuildIndexAsync(GeoPointField field, BuildFieldIndexContext context)
-        {
-            var options = context.Settings.ToOptions();
-            DocumentIndex.GeoPoint value = null;
+        var options = context.Settings.ToOptions();
+        DocumentIndex.GeoPoint value = null;
 
-            if (field.Longitude != null && field.Latitude != null)
+        if (field.Longitude != null && field.Latitude != null)
+        {
+            value = new DocumentIndex.GeoPoint
             {
-                value = new DocumentIndex.GeoPoint
-                {
-                    Longitude = (decimal)field.Longitude,
-                    Latitude = (decimal)field.Latitude
-                };
-            }
+                Longitude = (decimal)field.Longitude,
+                Latitude = (decimal)field.Latitude
+            };
+        }
 
-            foreach (var key in context.Keys)
-            {
-                context.DocumentIndex.Set(key, value, options);
-            }
+        foreach (var key in context.Keys)
+        {
+            context.DocumentIndex.Set(key, value, options);
+        }
 
-            // Also index as "Location" to be able to search on multiple Content Types
-            context.DocumentIndex.Set("Location", value, DocumentIndexOptions.Store);
+        // Also index as "Location" to be able to search on multiple Content Types
+        context.DocumentIndex.Set("Location", value, DocumentIndexOptions.Store);
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Spatial/ResourceManagementOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Spatial/ResourceManagementOptionsConfiguration.cs
index 0d75d6d5555..8be8e614764 100644
--- a/src/OrchardCore.Modules/OrchardCore.Spatial/ResourceManagementOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Spatial/ResourceManagementOptionsConfiguration.cs
@@ -1,34 +1,33 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Spatial
+namespace OrchardCore.Spatial;
+
+public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
 {
-    public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
-    {
-        private static readonly ResourceManifest _manifest;
+    private static readonly ResourceManifest _manifest;
 
-        static ResourceManagementOptionsConfiguration()
-        {
-            _manifest = new ResourceManifest();
+    static ResourceManagementOptionsConfiguration()
+    {
+        _manifest = new ResourceManifest();
 
-            _manifest
-                .DefineScript("leaflet")
-                .SetUrl("/OrchardCore.Spatial/Scripts/leaflet/leaflet.js", "/OrchardCore.Spatial/Scripts/leaflet/leaflet-src.js")
-                .SetCdn("https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.9.4/leaflet.js", "https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.9.4/leaflet-src.js")
-                .SetCdnIntegrity("sha384-cxOPjt7s7Iz04uaHJceBmS+qpjv2JkIHNVcuOrM+YHwZOmJGBXI00mdUXEq65HTH", "sha384-4aETf8z71hiSsoK0xYsa5JtiJHfL3h7uMAsZ2QYOLvcySDL/cEDfdLt0SaBypTQZ")
-                .SetVersion("1.9.4");
+        _manifest
+            .DefineScript("leaflet")
+            .SetUrl("/OrchardCore.Spatial/Scripts/leaflet/leaflet.js", "/OrchardCore.Spatial/Scripts/leaflet/leaflet-src.js")
+            .SetCdn("https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.9.4/leaflet.js", "https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.9.4/leaflet-src.js")
+            .SetCdnIntegrity("sha384-cxOPjt7s7Iz04uaHJceBmS+qpjv2JkIHNVcuOrM+YHwZOmJGBXI00mdUXEq65HTH", "sha384-4aETf8z71hiSsoK0xYsa5JtiJHfL3h7uMAsZ2QYOLvcySDL/cEDfdLt0SaBypTQZ")
+            .SetVersion("1.9.4");
 
-            _manifest
-                .DefineStyle("leaflet")
-                .SetUrl("/OrchardCore.Spatial/Styles/leaflet.min.css", "/OrchardCore.Spatial/Styles/leaflet.css")
-                .SetCdn("https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.9.4/leaflet.min.css", "https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.9.4/leaflet.css")
-                .SetCdnIntegrity("sha384-c6Rcwz4e4CITMbu/NBmnNS8yN2sC3cUElMEMfP3vqqKFp7GOYaaBBCqmaWBjmkjb", "sha384-sHL9NAb7lN7rfvG5lfHpm643Xkcjzp4jFvuavGOndn6pjVqS6ny56CAt3nsEVT4H")
-                .SetVersion("1.9.4");
-        }
+        _manifest
+            .DefineStyle("leaflet")
+            .SetUrl("/OrchardCore.Spatial/Styles/leaflet.min.css", "/OrchardCore.Spatial/Styles/leaflet.css")
+            .SetCdn("https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.9.4/leaflet.min.css", "https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.9.4/leaflet.css")
+            .SetCdnIntegrity("sha384-c6Rcwz4e4CITMbu/NBmnNS8yN2sC3cUElMEMfP3vqqKFp7GOYaaBBCqmaWBjmkjb", "sha384-sHL9NAb7lN7rfvG5lfHpm643Xkcjzp4jFvuavGOndn6pjVqS6ny56CAt3nsEVT4H")
+            .SetVersion("1.9.4");
+    }
 
-        public void Configure(ResourceManagementOptions options)
-        {
-            options.ResourceManifests.Add(_manifest);
-        }
+    public void Configure(ResourceManagementOptions options)
+    {
+        options.ResourceManifests.Add(_manifest);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Spatial/Settings/GeoPointFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.Spatial/Settings/GeoPointFieldSettings.cs
index 6b1b979442c..978334109b7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Spatial/Settings/GeoPointFieldSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Spatial/Settings/GeoPointFieldSettings.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Spatial.Settings
+namespace OrchardCore.Spatial.Settings;
+
+public class GeoPointFieldSettings
 {
-    public class GeoPointFieldSettings
-    {
-        public string Hint { get; set; }
-        public bool Required { get; set; }
-    }
+    public string Hint { get; set; }
+    public bool Required { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Spatial/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Spatial/Startup.cs
index f75c6438195..9a5d11a65f7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Spatial/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Spatial/Startup.cs
@@ -13,29 +13,28 @@
 using OrchardCore.Spatial.Indexing;
 using OrchardCore.Spatial.ViewModels;
 
-namespace OrchardCore.Spatial
+namespace OrchardCore.Spatial;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
+        services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
 
-            // Coordinate Field
-            services.AddContentField<GeoPointField>()
-                .UseDisplayDriver<GeoPointFieldDisplayDriver>()
-                .AddHandler<GeoPointFieldHandler>();
+        // Coordinate Field
+        services.AddContentField<GeoPointField>()
+            .UseDisplayDriver<GeoPointFieldDisplayDriver>()
+            .AddHandler<GeoPointFieldHandler>();
 
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, GeoPointFieldSettingsDriver>();
-            services.AddScoped<IContentFieldIndexHandler, GeoPointFieldIndexHandler>();
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, GeoPointFieldSettingsDriver>();
+        services.AddScoped<IContentFieldIndexHandler, GeoPointFieldIndexHandler>();
 
-            // Registering both field types and shape types are necessary as they can
-            // be accessed from inner properties.
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<GeoPointField>();
-                o.MemberAccessStrategy.Register<DisplayGeoPointFieldViewModel>();
-            });
-        }
+        // Registering both field types and shape types are necessary as they can
+        // be accessed from inner properties.
+        services.Configure<TemplateOptions>(o =>
+        {
+            o.MemberAccessStrategy.Register<GeoPointField>();
+            o.MemberAccessStrategy.Register<DisplayGeoPointFieldViewModel>();
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Spatial/ViewModels/DisplayGeoPointFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Spatial/ViewModels/DisplayGeoPointFieldViewModel.cs
index ed99a8cf565..7a568565dfd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Spatial/ViewModels/DisplayGeoPointFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Spatial/ViewModels/DisplayGeoPointFieldViewModel.cs
@@ -2,12 +2,11 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Spatial.Fields;
 
-namespace OrchardCore.Spatial.ViewModels
+namespace OrchardCore.Spatial.ViewModels;
+
+public class DisplayGeoPointFieldViewModel
 {
-    public class DisplayGeoPointFieldViewModel
-    {
-        public GeoPointField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public GeoPointField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Spatial/ViewModels/EditGeoPointFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Spatial/ViewModels/EditGeoPointFieldViewModel.cs
index be34f7b1f81..8daabf2f229 100644
--- a/src/OrchardCore.Modules/OrchardCore.Spatial/ViewModels/EditGeoPointFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Spatial/ViewModels/EditGeoPointFieldViewModel.cs
@@ -3,20 +3,19 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Spatial.Fields;
 
-namespace OrchardCore.Spatial.ViewModels
+namespace OrchardCore.Spatial.ViewModels;
+
+public class EditGeoPointFieldViewModel
 {
-    public class EditGeoPointFieldViewModel
-    {
-        public string Latitude { get; set; }
-        public string Longitude { get; set; }
+    public string Latitude { get; set; }
+    public string Longitude { get; set; }
 
-        [BindNever]
-        public GeoPointField Field { get; set; }
+    [BindNever]
+    public GeoPointField Field { get; set; }
 
-        [BindNever]
-        public ContentPart Part { get; set; }
+    [BindNever]
+    public ContentPart Part { get; set; }
 
-        [BindNever]
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    [BindNever]
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs
index 539df6231c3..f37bf24fb42 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs
@@ -4,44 +4,43 @@
 using OrchardCore.Navigation;
 using OrchardCore.Taxonomies.Settings;
 
-namespace OrchardCore.Taxonomies
+namespace OrchardCore.Taxonomies;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", TaxonomyContentsAdminListSettingsDisplayDriver.GroupId },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", TaxonomyContentsAdminListSettingsDisplayDriver.GroupId },
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
-        {
-            S = localizer;
-        }
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["Settings"], "1", settings => settings
-                        .Add(S["Taxonomy Filters"], S["Taxonomy Filters"].PrefixPosition(), filters => filters
-                            .AddClass("taxonomyfilters")
-                            .Id("taxonomyfilters")
-                            .Permission(Permissions.ManageTaxonomies)
-                            .Action("Index", "Admin", _routeValues)
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["Settings"], "1", settings => settings
+                    .Add(S["Taxonomy Filters"], S["Taxonomy Filters"].PrefixPosition(), filters => filters
+                        .AddClass("taxonomyfilters")
+                        .Id("taxonomyfilters")
+                        .Permission(Permissions.ManageTaxonomies)
+                        .Action("Index", "Admin", _routeValues)
+                        .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Controllers/AdminController.cs
index c05eb7f6b5b..32183d7afc3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Controllers/AdminController.cs
@@ -15,378 +15,377 @@
 using OrchardCore.Taxonomies.Models;
 using YesSql;
 
-namespace OrchardCore.Taxonomies.Controllers
+namespace OrchardCore.Taxonomies.Controllers;
+
+[Admin]
+public class AdminController : Controller
 {
-    [Admin]
-    public class AdminController : Controller
+    private readonly IContentManager _contentManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IContentItemDisplayManager _contentItemDisplayManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ISession _session;
+    private readonly INotifier _notifier;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+
+    protected readonly IHtmlLocalizer H;
+
+    public AdminController(
+        ISession session,
+        IContentManager contentManager,
+        IAuthorizationService authorizationService,
+        IContentItemDisplayManager contentItemDisplayManager,
+        IContentDefinitionManager contentDefinitionManager,
+        INotifier notifier,
+        IHtmlLocalizer<AdminController> localizer,
+        IUpdateModelAccessor updateModelAccessor)
     {
-        private readonly IContentManager _contentManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IContentItemDisplayManager _contentItemDisplayManager;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly ISession _session;
-        private readonly INotifier _notifier;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-
-        protected readonly IHtmlLocalizer H;
-
-        public AdminController(
-            ISession session,
-            IContentManager contentManager,
-            IAuthorizationService authorizationService,
-            IContentItemDisplayManager contentItemDisplayManager,
-            IContentDefinitionManager contentDefinitionManager,
-            INotifier notifier,
-            IHtmlLocalizer<AdminController> localizer,
-            IUpdateModelAccessor updateModelAccessor)
-        {
-            _contentManager = contentManager;
-            _authorizationService = authorizationService;
-            _contentItemDisplayManager = contentItemDisplayManager;
-            _contentDefinitionManager = contentDefinitionManager;
-            _session = session;
-            _notifier = notifier;
-            _updateModelAccessor = updateModelAccessor;
-            H = localizer;
-        }
-
-        [Admin("Taxonomies/Create/{id}", "Taxonomies.Create")]
-        public async Task<IActionResult> Create(string id, string taxonomyContentItemId, string taxonomyItemId)
-        {
-            if (string.IsNullOrWhiteSpace(id))
-            {
-                return NotFound();
-            }
+        _contentManager = contentManager;
+        _authorizationService = authorizationService;
+        _contentItemDisplayManager = contentItemDisplayManager;
+        _contentDefinitionManager = contentDefinitionManager;
+        _session = session;
+        _notifier = notifier;
+        _updateModelAccessor = updateModelAccessor;
+        H = localizer;
+    }
 
-            if (await _contentDefinitionManager.GetTypeDefinitionAsync(id) == null)
-            {
-                return NotFound();
-            }
+    [Admin("Taxonomies/Create/{id}", "Taxonomies.Create")]
+    public async Task<IActionResult> Create(string id, string taxonomyContentItemId, string taxonomyItemId)
+    {
+        if (string.IsNullOrWhiteSpace(id))
+        {
+            return NotFound();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTaxonomies))
-            {
-                return Forbid();
-            }
+        if (await _contentDefinitionManager.GetTypeDefinitionAsync(id) == null)
+        {
+            return NotFound();
+        }
 
-            var contentItem = await _contentManager.NewAsync(id);
-            contentItem.Weld<TermPart>();
-            contentItem.Alter<TermPart>(t => t.TaxonomyContentItemId = taxonomyContentItemId);
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTaxonomies))
+        {
+            return Forbid();
+        }
 
-            var model = await _contentItemDisplayManager.BuildEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, true);
+        var contentItem = await _contentManager.NewAsync(id);
+        contentItem.Weld<TermPart>();
+        contentItem.Alter<TermPart>(t => t.TaxonomyContentItemId = taxonomyContentItemId);
 
-            model.Properties["TaxonomyContentItemId"] = taxonomyContentItemId;
-            model.Properties["TaxonomyItemId"] = taxonomyItemId;
+        var model = await _contentItemDisplayManager.BuildEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, true);
 
-            return View(model);
+        model.Properties["TaxonomyContentItemId"] = taxonomyContentItemId;
+        model.Properties["TaxonomyItemId"] = taxonomyItemId;
+
+        return View(model);
+    }
+
+    [HttpPost]
+    [ActionName("Create")]
+    public async Task<IActionResult> CreatePost(string id, string taxonomyContentItemId, string taxonomyItemId)
+    {
+        if (string.IsNullOrWhiteSpace(id))
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        [ActionName("Create")]
-        public async Task<IActionResult> CreatePost(string id, string taxonomyContentItemId, string taxonomyItemId)
+        if (await _contentDefinitionManager.GetTypeDefinitionAsync(id) == null)
         {
-            if (string.IsNullOrWhiteSpace(id))
-            {
-                return NotFound();
-            }
+            return NotFound();
+        }
 
-            if (await _contentDefinitionManager.GetTypeDefinitionAsync(id) == null)
-            {
-                return NotFound();
-            }
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTaxonomies))
+        {
+            return Forbid();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTaxonomies))
-            {
-                return Forbid();
-            }
+        ContentItem taxonomy;
 
-            ContentItem taxonomy;
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync("Taxonomy");
 
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync("Taxonomy");
+        if (!contentTypeDefinition.IsDraftable())
+        {
+            taxonomy = await _contentManager.GetAsync(taxonomyContentItemId, VersionOptions.Latest);
+        }
+        else
+        {
+            taxonomy = await _contentManager.GetAsync(taxonomyContentItemId, VersionOptions.DraftRequired);
+        }
 
-            if (!contentTypeDefinition.IsDraftable())
-            {
-                taxonomy = await _contentManager.GetAsync(taxonomyContentItemId, VersionOptions.Latest);
-            }
-            else
-            {
-                taxonomy = await _contentManager.GetAsync(taxonomyContentItemId, VersionOptions.DraftRequired);
-            }
+        if (taxonomy == null)
+        {
+            return NotFound();
+        }
 
-            if (taxonomy == null)
-            {
-                return NotFound();
-            }
+        var contentItem = await _contentManager.NewAsync(id);
+        contentItem.Weld<TermPart>();
+        contentItem.Alter<TermPart>(t => t.TaxonomyContentItemId = taxonomyContentItemId);
 
-            var contentItem = await _contentManager.NewAsync(id);
-            contentItem.Weld<TermPart>();
-            contentItem.Alter<TermPart>(t => t.TaxonomyContentItemId = taxonomyContentItemId);
+        var model = await _contentItemDisplayManager.UpdateEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, true);
 
-            var model = await _contentItemDisplayManager.UpdateEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, true);
+        if (!ModelState.IsValid)
+        {
+            model.Properties["TaxonomyContentItemId"] = taxonomyContentItemId;
+            model.Properties["TaxonomyItemId"] = taxonomyItemId;
 
-            if (!ModelState.IsValid)
-            {
-                model.Properties["TaxonomyContentItemId"] = taxonomyContentItemId;
-                model.Properties["TaxonomyItemId"] = taxonomyItemId;
+            return View(model);
+        }
 
-                return View(model);
-            }
+        if (taxonomyItemId == null)
+        {
+            // Use the taxonomy as the parent if no target is specified.
+            taxonomy.Alter<TaxonomyPart>(part => part.Terms.Add(contentItem));
+        }
+        else
+        {
+            // Look for the target taxonomy item in the hierarchy.
+            var parentTaxonomyItem = FindTaxonomyItem((JsonObject)taxonomy.As<TaxonomyPart>().Content, taxonomyItemId);
 
-            if (taxonomyItemId == null)
+            // Couldn't find targeted taxonomy item.
+            if (parentTaxonomyItem == null)
             {
-                // Use the taxonomy as the parent if no target is specified.
-                taxonomy.Alter<TaxonomyPart>(part => part.Terms.Add(contentItem));
+                return NotFound();
             }
-            else
-            {
-                // Look for the target taxonomy item in the hierarchy.
-                var parentTaxonomyItem = FindTaxonomyItem((JsonObject)taxonomy.As<TaxonomyPart>().Content, taxonomyItemId);
 
-                // Couldn't find targeted taxonomy item.
-                if (parentTaxonomyItem == null)
-                {
-                    return NotFound();
-                }
+            var taxonomyItems = (JsonArray)parentTaxonomyItem?["Terms"];
 
-                var taxonomyItems = (JsonArray)parentTaxonomyItem?["Terms"];
+            if (taxonomyItems == null)
+            {
+                parentTaxonomyItem["Terms"] = taxonomyItems = [];
+            }
 
-                if (taxonomyItems == null)
-                {
-                    parentTaxonomyItem["Terms"] = taxonomyItems = [];
-                }
+            taxonomyItems.Add(JObject.FromObject(contentItem));
+        }
 
-                taxonomyItems.Add(JObject.FromObject(contentItem));
-            }
+        await _session.SaveAsync(taxonomy);
 
-            await _session.SaveAsync(taxonomy);
+        return RedirectToAction(nameof(Edit), "Admin", new { area = "OrchardCore.Contents", contentItemId = taxonomyContentItemId });
+    }
 
-            return RedirectToAction(nameof(Edit), "Admin", new { area = "OrchardCore.Contents", contentItemId = taxonomyContentItemId });
+    [Admin("Taxonomies/Edit/{taxonomyContentItemId}/{taxonomyItemId}", "Taxonomies.Create")]
+    public async Task<IActionResult> Edit(string taxonomyContentItemId, string taxonomyItemId)
+    {
+        if (string.IsNullOrWhiteSpace(taxonomyContentItemId) || string.IsNullOrWhiteSpace(taxonomyItemId))
+        {
+            return NotFound();
         }
 
-        [Admin("Taxonomies/Edit/{taxonomyContentItemId}/{taxonomyItemId}", "Taxonomies.Create")]
-        public async Task<IActionResult> Edit(string taxonomyContentItemId, string taxonomyItemId)
-        {
-            if (string.IsNullOrWhiteSpace(taxonomyContentItemId) || string.IsNullOrWhiteSpace(taxonomyItemId))
-            {
-                return NotFound();
-            }
+        var taxonomy = await _contentManager.GetAsync(taxonomyContentItemId, VersionOptions.Latest);
 
-            var taxonomy = await _contentManager.GetAsync(taxonomyContentItemId, VersionOptions.Latest);
+        if (taxonomy == null)
+        {
+            return NotFound();
+        }
 
-            if (taxonomy == null)
-            {
-                return NotFound();
-            }
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTaxonomies, taxonomy))
+        {
+            return Forbid();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTaxonomies, taxonomy))
-            {
-                return Forbid();
-            }
+        // Look for the target taxonomy item in the hierarchy.
+        var taxonomyItem = FindTaxonomyItem((JsonObject)taxonomy.As<TaxonomyPart>().Content, taxonomyItemId);
 
-            // Look for the target taxonomy item in the hierarchy.
-            var taxonomyItem = FindTaxonomyItem((JsonObject)taxonomy.As<TaxonomyPart>().Content, taxonomyItemId);
+        // Couldn't find targeted taxonomy item.
+        if (taxonomyItem == null)
+        {
+            return NotFound();
+        }
 
-            // Couldn't find targeted taxonomy item.
-            if (taxonomyItem == null)
-            {
-                return NotFound();
-            }
+        var contentItem = taxonomyItem.ToObject<ContentItem>();
+        contentItem.Weld<TermPart>();
+        contentItem.Alter<TermPart>(t => t.TaxonomyContentItemId = taxonomyContentItemId);
 
-            var contentItem = taxonomyItem.ToObject<ContentItem>();
-            contentItem.Weld<TermPart>();
-            contentItem.Alter<TermPart>(t => t.TaxonomyContentItemId = taxonomyContentItemId);
+        var model = await _contentItemDisplayManager.BuildEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, false);
 
-            var model = await _contentItemDisplayManager.BuildEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, false);
+        model.Properties["TaxonomyContentItemId"] = taxonomyContentItemId;
+        model.Properties["TaxonomyItemId"] = taxonomyItemId;
 
-            model.Properties["TaxonomyContentItemId"] = taxonomyContentItemId;
-            model.Properties["TaxonomyItemId"] = taxonomyItemId;
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost]
+    [ActionName("Edit")]
+    public async Task<IActionResult> EditPost(string taxonomyContentItemId, string taxonomyItemId)
+    {
+        if (string.IsNullOrWhiteSpace(taxonomyContentItemId) || string.IsNullOrWhiteSpace(taxonomyItemId))
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        [ActionName("Edit")]
-        public async Task<IActionResult> EditPost(string taxonomyContentItemId, string taxonomyItemId)
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTaxonomies))
         {
-            if (string.IsNullOrWhiteSpace(taxonomyContentItemId) || string.IsNullOrWhiteSpace(taxonomyItemId))
-            {
-                return NotFound();
-            }
+            return Forbid();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTaxonomies))
-            {
-                return Forbid();
-            }
+        ContentItem taxonomy;
 
-            ContentItem taxonomy;
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync("Taxonomy");
 
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync("Taxonomy");
+        if (!contentTypeDefinition.IsDraftable())
+        {
+            taxonomy = await _contentManager.GetAsync(taxonomyContentItemId, VersionOptions.Latest);
+        }
+        else
+        {
+            taxonomy = await _contentManager.GetAsync(taxonomyContentItemId, VersionOptions.DraftRequired);
+        }
 
-            if (!contentTypeDefinition.IsDraftable())
-            {
-                taxonomy = await _contentManager.GetAsync(taxonomyContentItemId, VersionOptions.Latest);
-            }
-            else
-            {
-                taxonomy = await _contentManager.GetAsync(taxonomyContentItemId, VersionOptions.DraftRequired);
-            }
+        if (taxonomy == null)
+        {
+            return NotFound();
+        }
 
-            if (taxonomy == null)
-            {
-                return NotFound();
-            }
+        // Look for the target taxonomy item in the hierarchy.
+        var taxonomyItem = FindTaxonomyItem((JsonObject)taxonomy.As<TaxonomyPart>().Content, taxonomyItemId);
 
-            // Look for the target taxonomy item in the hierarchy.
-            var taxonomyItem = FindTaxonomyItem((JsonObject)taxonomy.As<TaxonomyPart>().Content, taxonomyItemId);
+        // Couldn't find targeted taxonomy item.
+        if (taxonomyItem == null)
+        {
+            return NotFound();
+        }
 
-            // Couldn't find targeted taxonomy item.
-            if (taxonomyItem == null)
-            {
-                return NotFound();
-            }
+        var existing = taxonomyItem.ToObject<ContentItem>();
 
-            var existing = taxonomyItem.ToObject<ContentItem>();
+        // Create a new item to take into account the current type definition.
+        var contentItem = await _contentManager.NewAsync(existing.ContentType);
 
-            // Create a new item to take into account the current type definition.
-            var contentItem = await _contentManager.NewAsync(existing.ContentType);
+        contentItem.ContentItemId = existing.ContentItemId;
+        contentItem.Merge(existing);
+        contentItem.Weld<TermPart>();
+        contentItem.Alter<TermPart>(t => t.TaxonomyContentItemId = taxonomyContentItemId);
 
-            contentItem.ContentItemId = existing.ContentItemId;
-            contentItem.Merge(existing);
-            contentItem.Weld<TermPart>();
-            contentItem.Alter<TermPart>(t => t.TaxonomyContentItemId = taxonomyContentItemId);
+        var model = await _contentItemDisplayManager.UpdateEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, false);
 
-            var model = await _contentItemDisplayManager.UpdateEditorAsync(contentItem, _updateModelAccessor.ModelUpdater, false);
+        if (!ModelState.IsValid)
+        {
+            model.Properties["TaxonomyContentItemId"] = taxonomyContentItemId;
+            model.Properties["TaxonomyItemId"] = taxonomyItemId;
 
-            if (!ModelState.IsValid)
-            {
-                model.Properties["TaxonomyContentItemId"] = taxonomyContentItemId;
-                model.Properties["TaxonomyItemId"] = taxonomyItemId;
+            return View(model);
+        }
 
-                return View(model);
-            }
+        taxonomyItem.Merge((JsonObject)contentItem.Content, new JsonMergeSettings
+        {
+            MergeArrayHandling = MergeArrayHandling.Replace,
+            MergeNullValueHandling = MergeNullValueHandling.Merge
+        });
 
-            taxonomyItem.Merge((JsonObject)contentItem.Content, new JsonMergeSettings
-            {
-                MergeArrayHandling = MergeArrayHandling.Replace,
-                MergeNullValueHandling = MergeNullValueHandling.Merge
-            });
+        // Merge doesn't copy the properties.
+        taxonomyItem[nameof(ContentItem.DisplayText)] = contentItem.DisplayText;
 
-            // Merge doesn't copy the properties.
-            taxonomyItem[nameof(ContentItem.DisplayText)] = contentItem.DisplayText;
+        await _session.SaveAsync(taxonomy);
 
-            await _session.SaveAsync(taxonomy);
+        return RedirectToAction(nameof(Edit), "Admin", new { area = "OrchardCore.Contents", contentItemId = taxonomyContentItemId });
+    }
 
-            return RedirectToAction(nameof(Edit), "Admin", new { area = "OrchardCore.Contents", contentItemId = taxonomyContentItemId });
+    [HttpPost]
+    [Admin("Taxonomies/Delete/{taxonomyContentItemId}/{taxonomyItemId}", "Taxonomies.Delete")]
+    public async Task<IActionResult> Delete(string taxonomyContentItemId, string taxonomyItemId)
+    {
+        if (string.IsNullOrWhiteSpace(taxonomyContentItemId) || string.IsNullOrWhiteSpace(taxonomyItemId))
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        [Admin("Taxonomies/Delete/{taxonomyContentItemId}/{taxonomyItemId}", "Taxonomies.Delete")]
-        public async Task<IActionResult> Delete(string taxonomyContentItemId, string taxonomyItemId)
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTaxonomies))
         {
-            if (string.IsNullOrWhiteSpace(taxonomyContentItemId) || string.IsNullOrWhiteSpace(taxonomyItemId))
-            {
-                return NotFound();
-            }
+            return Forbid();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTaxonomies))
-            {
-                return Forbid();
-            }
+        ContentItem taxonomy;
 
-            ContentItem taxonomy;
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync("Taxonomy");
 
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync("Taxonomy");
+        if (!contentTypeDefinition.IsDraftable())
+        {
+            taxonomy = await _contentManager.GetAsync(taxonomyContentItemId, VersionOptions.Latest);
+        }
+        else
+        {
+            taxonomy = await _contentManager.GetAsync(taxonomyContentItemId, VersionOptions.DraftRequired);
+        }
 
-            if (!contentTypeDefinition.IsDraftable())
-            {
-                taxonomy = await _contentManager.GetAsync(taxonomyContentItemId, VersionOptions.Latest);
-            }
-            else
-            {
-                taxonomy = await _contentManager.GetAsync(taxonomyContentItemId, VersionOptions.DraftRequired);
-            }
+        if (taxonomy == null)
+        {
+            return NotFound();
+        }
 
-            if (taxonomy == null)
-            {
-                return NotFound();
-            }
+        // Look for the target taxonomy item in the hierarchy.
+        var content = (JsonObject)taxonomy.As<TaxonomyPart>().Content;
 
-            // Look for the target taxonomy item in the hierarchy.
-            var content = (JsonObject)taxonomy.As<TaxonomyPart>().Content;
+        RemoveTaxonomyItem(content, taxonomyItemId);
 
-            RemoveTaxonomyItem(content, taxonomyItemId);
+        var updatedPart = content.ToObject<TaxonomyPart>();
 
-            var updatedPart = content.ToObject<TaxonomyPart>();
+        if (updatedPart == null)
+        {
+            return NotFound();
+        }
 
-            if (updatedPart == null)
-            {
-                return NotFound();
-            }
+        taxonomy.Apply(updatedPart);
 
-            taxonomy.Apply(updatedPart);
+        await _session.SaveAsync(taxonomy);
 
-            await _session.SaveAsync(taxonomy);
+        await _notifier.SuccessAsync(H["Taxonomy item deleted successfully."]);
 
-            await _notifier.SuccessAsync(H["Taxonomy item deleted successfully."]);
+        return RedirectToAction(nameof(Edit), "Admin", new { area = "OrchardCore.Contents", contentItemId = taxonomyContentItemId });
+    }
 
-            return RedirectToAction(nameof(Edit), "Admin", new { area = "OrchardCore.Contents", contentItemId = taxonomyContentItemId });
+    private static JsonObject FindTaxonomyItem(JsonObject contentItem, string taxonomyItemId)
+    {
+        if (contentItem["ContentItemId"]?.Value<string>() == taxonomyItemId)
+        {
+            return contentItem;
         }
 
-        private static JsonObject FindTaxonomyItem(JsonObject contentItem, string taxonomyItemId)
+        if (!contentItem.TryGetPropertyValue("Terms", out var terms) || terms is not JsonArray taxonomyItems)
         {
-            if (contentItem["ContentItemId"]?.Value<string>() == taxonomyItemId)
-            {
-                return contentItem;
-            }
+            return null;
+        }
 
-            if (!contentItem.TryGetPropertyValue("Terms", out var terms) || terms is not JsonArray taxonomyItems)
+        JsonObject result;
+        foreach (var taxonomyItem in taxonomyItems.Cast<JsonObject>())
+        {
+            // Search in inner taxonomy items.
+            result = FindTaxonomyItem(taxonomyItem, taxonomyItemId);
+
+            if (result != null)
             {
-                return null;
+                return result;
             }
+        }
 
-            JsonObject result;
-            foreach (var taxonomyItem in taxonomyItems.Cast<JsonObject>())
-            {
-                // Search in inner taxonomy items.
-                result = FindTaxonomyItem(taxonomyItem, taxonomyItemId);
+        return null;
+    }
 
-                if (result != null)
-                {
-                    return result;
-                }
-            }
+    private static bool RemoveTaxonomyItem(JsonObject contentItem, string taxonomyItemToRemove)
+    {
+        if (contentItem == null)
+        {
+            return false;
+        }
 
-            return null;
+        if (contentItem["ContentItemId"]?.Value<string>() == taxonomyItemToRemove)
+        {
+            return true;
         }
 
-        private static bool RemoveTaxonomyItem(JsonObject contentItem, string taxonomyItemToRemove)
+        if (!contentItem.TryGetPropertyValue("Terms", out var terms) || terms is not JsonArray taxonomyItems)
         {
-            if (contentItem == null)
-            {
-                return false;
-            }
+            return false;
+        }
 
-            if (contentItem["ContentItemId"]?.Value<string>() == taxonomyItemToRemove)
+        for (var i = taxonomyItems.Count - 1; i >= 0; i--)
+        {
+            var taxonomyItem = taxonomyItems[i] as JsonObject;
+            if (RemoveTaxonomyItem(taxonomyItem, taxonomyItemToRemove))
             {
-                return true;
-            }
+                taxonomyItems.RemoveAt(i);
 
-            if (!contentItem.TryGetPropertyValue("Terms", out var terms) || terms is not JsonArray taxonomyItems)
-            {
                 return false;
             }
-
-            for (var i = taxonomyItems.Count - 1; i >= 0; i--)
-            {
-                var taxonomyItem = taxonomyItems[i] as JsonObject;
-                if (RemoveTaxonomyItem(taxonomyItem, taxonomyItemToRemove))
-                {
-                    taxonomyItems.RemoveAt(i);
-
-                    return false;
-                }
-            }
-
-            return false;
         }
+
+        return false;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Controllers/TagController.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Controllers/TagController.cs
index a598ea8e370..35eba8ccc99 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Controllers/TagController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Controllers/TagController.cs
@@ -15,98 +15,97 @@
 using OrchardCore.Taxonomies.ViewModels;
 using YesSql;
 
-namespace OrchardCore.Taxonomies.Controllers
+namespace OrchardCore.Taxonomies.Controllers;
+
+[Admin]
+public class TagController : Controller, IUpdateModel
 {
-    [Admin]
-    public class TagController : Controller, IUpdateModel
+    private readonly IContentManager _contentManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IEnumerable<IContentHandler> _contentHandlers;
+    private readonly ISession _session;
+    private readonly ILogger _logger;
+
+    public TagController(
+        IContentManager contentManager,
+        IAuthorizationService authorizationService,
+        IContentDefinitionManager contentDefinitionManager,
+        IEnumerable<IContentHandler> contentHandlers,
+        ISession session,
+        ILogger<TagController> logger)
+    {
+        _contentManager = contentManager;
+        _authorizationService = authorizationService;
+        _contentDefinitionManager = contentDefinitionManager;
+        _contentHandlers = contentHandlers;
+        _session = session;
+        _logger = logger;
+    }
+
+    [HttpPost]
+    [ActionName("Create")]
+    public async Task<IActionResult> CreatePost(string taxonomyContentItemId, string displayText)
     {
-        private readonly IContentManager _contentManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IEnumerable<IContentHandler> _contentHandlers;
-        private readonly ISession _session;
-        private readonly ILogger _logger;
-
-        public TagController(
-            IContentManager contentManager,
-            IAuthorizationService authorizationService,
-            IContentDefinitionManager contentDefinitionManager,
-            IEnumerable<IContentHandler> contentHandlers,
-            ISession session,
-            ILogger<TagController> logger)
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTaxonomies))
         {
-            _contentManager = contentManager;
-            _authorizationService = authorizationService;
-            _contentDefinitionManager = contentDefinitionManager;
-            _contentHandlers = contentHandlers;
-            _session = session;
-            _logger = logger;
+            return Unauthorized();
         }
 
-        [HttpPost]
-        [ActionName("Create")]
-        public async Task<IActionResult> CreatePost(string taxonomyContentItemId, string displayText)
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync("Taxonomy");
+        var versionOption = VersionOptions.Latest;
+
+        if (contentTypeDefinition.IsDraftable())
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTaxonomies))
-            {
-                return Unauthorized();
-            }
-
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync("Taxonomy");
-            var versionOption = VersionOptions.Latest;
-
-            if (contentTypeDefinition.IsDraftable())
-            {
-                versionOption = VersionOptions.DraftRequired;
-            }
-
-            var taxonomy = await _contentManager.GetAsync(taxonomyContentItemId, versionOption);
-
-            if (taxonomy == null)
-            {
-                return NotFound();
-            }
-
-            var part = taxonomy.As<TaxonomyPart>();
-
-            // Create tag term but only run content handlers not content item display manager update editor.
-            // This creates empty parts, if parts are attached to the tag term, with empty data.
-            // But still generates valid autoroute paths from the handler. 
-            var contentItem = await _contentManager.NewAsync(part.TermContentType);
-            contentItem.DisplayText = displayText;
-            contentItem.Weld<TermPart>();
-            contentItem.Alter<TermPart>(t => t.TaxonomyContentItemId = taxonomyContentItemId);
-
-            var updateContentContext = new UpdateContentContext(contentItem);
-
-            await _contentHandlers.InvokeAsync((handler, updateContentContext) => handler.UpdatingAsync(updateContentContext), updateContentContext, _logger);
-            await _contentHandlers.Reverse().InvokeAsync((handler, updateContentContext) => handler.UpdatedAsync(updateContentContext), updateContentContext, _logger);
-
-            if (!ModelState.IsValid)
-            {
-                return BadRequest();
-            }
-
-            // Tag terms are always added to the root taxonomy element.
-            taxonomy.Alter<TaxonomyPart>(part => part.Terms.Add(contentItem));
-
-            // Auto publish draftable taxonomies when creating a new tag term.
-            if (contentTypeDefinition.IsDraftable())
-            {
-                await _contentManager.PublishAsync(taxonomy);
-            }
-            else
-            {
-                await _session.SaveAsync(taxonomy);
-            }
-
-            var viewModel = new CreatedTagViewModel
-            {
-                ContentItemId = contentItem.ContentItemId,
-                DisplayText = contentItem.DisplayText
-            };
-
-            return Ok(viewModel);
+            versionOption = VersionOptions.DraftRequired;
         }
+
+        var taxonomy = await _contentManager.GetAsync(taxonomyContentItemId, versionOption);
+
+        if (taxonomy == null)
+        {
+            return NotFound();
+        }
+
+        var part = taxonomy.As<TaxonomyPart>();
+
+        // Create tag term but only run content handlers not content item display manager update editor.
+        // This creates empty parts, if parts are attached to the tag term, with empty data.
+        // But still generates valid autoroute paths from the handler. 
+        var contentItem = await _contentManager.NewAsync(part.TermContentType);
+        contentItem.DisplayText = displayText;
+        contentItem.Weld<TermPart>();
+        contentItem.Alter<TermPart>(t => t.TaxonomyContentItemId = taxonomyContentItemId);
+
+        var updateContentContext = new UpdateContentContext(contentItem);
+
+        await _contentHandlers.InvokeAsync((handler, updateContentContext) => handler.UpdatingAsync(updateContentContext), updateContentContext, _logger);
+        await _contentHandlers.Reverse().InvokeAsync((handler, updateContentContext) => handler.UpdatedAsync(updateContentContext), updateContentContext, _logger);
+
+        if (!ModelState.IsValid)
+        {
+            return BadRequest();
+        }
+
+        // Tag terms are always added to the root taxonomy element.
+        taxonomy.Alter<TaxonomyPart>(part => part.Terms.Add(contentItem));
+
+        // Auto publish draftable taxonomies when creating a new tag term.
+        if (contentTypeDefinition.IsDraftable())
+        {
+            await _contentManager.PublishAsync(taxonomy);
+        }
+        else
+        {
+            await _session.SaveAsync(taxonomy);
+        }
+
+        var viewModel = new CreatedTagViewModel
+        {
+            ContentItemId = contentItem.ContentItemId,
+            DisplayText = contentItem.DisplayText
+        };
+
+        return Ok(viewModel);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyContentsAdminListDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyContentsAdminListDisplayDriver.cs
index 2d7c9984273..3cf06073f65 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyContentsAdminListDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyContentsAdminListDisplayDriver.cs
@@ -18,163 +18,162 @@
 using OrchardCore.Taxonomies.Settings;
 using OrchardCore.Taxonomies.ViewModels;
 
-namespace OrchardCore.Taxonomies.Drivers
+namespace OrchardCore.Taxonomies.Drivers;
+
+public sealed class TaxonomyContentsAdminListDisplayDriver : DisplayDriver<ContentOptionsViewModel>
 {
-    public sealed class TaxonomyContentsAdminListDisplayDriver : DisplayDriver<ContentOptionsViewModel>
-    {
-        private const string LevelPadding = "\xA0\xA0";
+    private const string LevelPadding = "\xA0\xA0";
 
-        private readonly ISiteService _siteService;
-        private readonly IContentManager _contentManager;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ISiteService _siteService;
+    private readonly IContentManager _contentManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
+
+    public TaxonomyContentsAdminListDisplayDriver(
+        ISiteService siteService,
+        IContentManager contentManager,
+        IContentDefinitionManager contentDefinitionManager,
+        IStringLocalizer<TaxonomyContentsAdminListDisplayDriver> stringLocalizer)
+    {
+        _siteService = siteService;
+        _contentManager = contentManager;
+        _contentDefinitionManager = contentDefinitionManager;
+        S = stringLocalizer;
+    }
+
+    public override async Task<IDisplayResult> EditAsync(ContentOptionsViewModel model, BuildEditorContext context)
+    {
+        var settings = await _siteService.GetSettingsAsync<TaxonomyContentsAdminListSettings>();
 
-        public TaxonomyContentsAdminListDisplayDriver(
-            ISiteService siteService,
-            IContentManager contentManager,
-            IContentDefinitionManager contentDefinitionManager,
-            IStringLocalizer<TaxonomyContentsAdminListDisplayDriver> stringLocalizer)
+        if (settings.TaxonomyContentItemIds.Length == 0)
         {
-            _siteService = siteService;
-            _contentManager = contentManager;
-            _contentDefinitionManager = contentDefinitionManager;
-            S = stringLocalizer;
+            return null;
         }
 
-        public override async Task<IDisplayResult> EditAsync(ContentOptionsViewModel model, BuildEditorContext context)
+        var taxonomyContentItemIds = settings.TaxonomyContentItemIds;
+        if (!string.IsNullOrEmpty(model.SelectedContentType))
         {
-            var settings = await _siteService.GetSettingsAsync<TaxonomyContentsAdminListSettings>();
+            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(model.SelectedContentType);
+            var fieldDefinitions = contentTypeDefinition
+                .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(TaxonomyField)));
+            var fieldTaxonomyContentItemIds = fieldDefinitions.Select(x => x.GetSettings<TaxonomyFieldSettings>().TaxonomyContentItemId);
+            taxonomyContentItemIds = taxonomyContentItemIds.Intersect(fieldTaxonomyContentItemIds).ToArray();
 
-            if (settings.TaxonomyContentItemIds.Length == 0)
+            if (taxonomyContentItemIds.Length == 0)
             {
                 return null;
             }
+        }
 
-            var taxonomyContentItemIds = settings.TaxonomyContentItemIds;
-            if (!string.IsNullOrEmpty(model.SelectedContentType))
-            {
-                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(model.SelectedContentType);
-                var fieldDefinitions = contentTypeDefinition
-                    .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(TaxonomyField)));
-                var fieldTaxonomyContentItemIds = fieldDefinitions.Select(x => x.GetSettings<TaxonomyFieldSettings>().TaxonomyContentItemId);
-                taxonomyContentItemIds = taxonomyContentItemIds.Intersect(fieldTaxonomyContentItemIds).ToArray();
+        var results = new List<IDisplayResult>();
+        var taxonomies = await _contentManager.GetAsync(taxonomyContentItemIds);
 
-                if (taxonomyContentItemIds.Length == 0)
+        var position = 5;
+        foreach (var taxonomy in taxonomies)
+        {
+            results.Add(
+                Initialize<TaxonomyContentsAdminFilterViewModel>("ContentsAdminListTaxonomyFilter", m =>
                 {
-                    return null;
-                }
-            }
-
-            var results = new List<IDisplayResult>();
-            var taxonomies = await _contentManager.GetAsync(taxonomyContentItemIds);
-
-            var position = 5;
-            foreach (var taxonomy in taxonomies)
-            {
-                results.Add(
-                    Initialize<TaxonomyContentsAdminFilterViewModel>("ContentsAdminListTaxonomyFilter", m =>
-                    {
-                        using var sb = ZString.CreateStringBuilder();
-                        var termEntries = new List<FilterTermEntry>();
-                        PopulateTermEntries(termEntries, taxonomy.As<TaxonomyPart>().Terms, 0);
-                        var terms = new List<SelectListItem>
-                            {
-                                new()
-                                {
-                                    Text = S["Clear filter"],
-                                    Value = string.Empty,
-                                },
-                                new()
-                                {
-                                    Text = S["Show all"],
-                                    Value = "Taxonomy:" + taxonomy.ContentItemId,
-                                }
-                            };
-
-                        foreach (var term in termEntries)
+                    using var sb = ZString.CreateStringBuilder();
+                    var termEntries = new List<FilterTermEntry>();
+                    PopulateTermEntries(termEntries, taxonomy.As<TaxonomyPart>().Terms, 0);
+                    var terms = new List<SelectListItem>
                         {
-                            sb.Clear();
-                            for (var l = 0; l < term.Level; l++)
+                            new()
                             {
-                                sb.Append(LevelPadding);
-                            }
-                            sb.Append(term.DisplayText);
-                            var item = new SelectListItem
+                                Text = S["Clear filter"],
+                                Value = string.Empty,
+                            },
+                            new()
                             {
-                                Text = sb.ToString(),
-                                Value = "Term:" + term.ContentItemId,
-                            };
-                            terms.Add(item);
+                                Text = S["Show all"],
+                                Value = "Taxonomy:" + taxonomy.ContentItemId,
+                            }
+                        };
+
+                    foreach (var term in termEntries)
+                    {
+                        sb.Clear();
+                        for (var l = 0; l < term.Level; l++)
+                        {
+                            sb.Append(LevelPadding);
                         }
+                        sb.Append(term.DisplayText);
+                        var item = new SelectListItem
+                        {
+                            Text = sb.ToString(),
+                            Value = "Term:" + term.ContentItemId,
+                        };
+                        terms.Add(item);
+                    }
+
+                    m.DisplayText = taxonomy.DisplayText;
+                    m.Taxonomies = terms;
+                })
+                .Location("Actions:40." + position)
+                .Prefix("Taxonomy" + taxonomy.ContentItemId)
+            );
+
+            position += 5;
+        }
+
+        if (results.Count > 0)
+        {
+            return Combine(results);
+        }
 
-                        m.DisplayText = taxonomy.DisplayText;
-                        m.Taxonomies = terms;
-                    })
-                    .Location("Actions:40." + position)
-                    .Prefix("Taxonomy" + taxonomy.ContentItemId)
-                );
+        return null;
+    }
 
-                position += 5;
-            }
+    public override async Task<IDisplayResult> UpdateAsync(ContentOptionsViewModel model, UpdateEditorContext context)
+    {
+        var settings = await _siteService.GetSettingsAsync<TaxonomyContentsAdminListSettings>();
+        foreach (var contentItemId in settings.TaxonomyContentItemIds)
+        {
+            var viewModel = new TaxonomyContentsAdminFilterViewModel();
+            await context.Updater.TryUpdateModelAsync(viewModel, "Taxonomy" + contentItemId);
 
-            if (results.Count > 0)
+            if (!string.IsNullOrEmpty(viewModel.SelectedContentItemId))
             {
-                return Combine(results);
+                model.RouteValues.TryAdd("Taxonomy" + contentItemId + ".SelectedContentItemId", viewModel.SelectedContentItemId);
             }
-
-            return null;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentOptionsViewModel model, UpdateEditorContext context)
+        return await EditAsync(model, context);
+    }
+
+    private static void PopulateTermEntries(List<FilterTermEntry> termEntries, IEnumerable<ContentItem> contentItems, int level)
+    {
+        foreach (var contentItem in contentItems)
         {
-            var settings = await _siteService.GetSettingsAsync<TaxonomyContentsAdminListSettings>();
-            foreach (var contentItemId in settings.TaxonomyContentItemIds)
-            {
-                var viewModel = new TaxonomyContentsAdminFilterViewModel();
-                await context.Updater.TryUpdateModelAsync(viewModel, "Taxonomy" + contentItemId);
+            var children = Array.Empty<ContentItem>();
 
-                if (!string.IsNullOrEmpty(viewModel.SelectedContentItemId))
-                {
-                    model.RouteValues.TryAdd("Taxonomy" + contentItemId + ".SelectedContentItemId", viewModel.SelectedContentItemId);
-                }
+            if (((JsonObject)contentItem.Content)["Terms"] is JsonArray termsArray)
+            {
+                children = termsArray.ToObject<ContentItem[]>();
             }
 
-            return await EditAsync(model, context);
-        }
-
-        private static void PopulateTermEntries(List<FilterTermEntry> termEntries, IEnumerable<ContentItem> contentItems, int level)
-        {
-            foreach (var contentItem in contentItems)
+            var termEntry = new FilterTermEntry
             {
-                var children = Array.Empty<ContentItem>();
-
-                if (((JsonObject)contentItem.Content)["Terms"] is JsonArray termsArray)
-                {
-                    children = termsArray.ToObject<ContentItem[]>();
-                }
-
-                var termEntry = new FilterTermEntry
-                {
-                    DisplayText = contentItem.DisplayText,
-                    ContentItemId = contentItem.ContentItemId,
-                    Level = level
-                };
+                DisplayText = contentItem.DisplayText,
+                ContentItemId = contentItem.ContentItemId,
+                Level = level
+            };
 
-                termEntries.Add(termEntry);
+            termEntries.Add(termEntry);
 
-                if (children.Length > 0)
-                {
-                    PopulateTermEntries(termEntries, children, level + 1);
-                }
+            if (children.Length > 0)
+            {
+                PopulateTermEntries(termEntries, children, level + 1);
             }
         }
     }
+}
 
-    public class FilterTermEntry
-    {
-        public string DisplayText { get; set; }
-        public string ContentItemId { get; set; }
-        public int Level { get; set; }
-    }
+public class FilterTermEntry
+{
+    public string DisplayText { get; set; }
+    public string ContentItemId { get; set; }
+    public int Level { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyFieldDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyFieldDisplayDriver.cs
index 5d3c82b1b46..d776427569e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyFieldDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyFieldDisplayDriver.cs
@@ -13,79 +13,78 @@
 using OrchardCore.Taxonomies.Settings;
 using OrchardCore.Taxonomies.ViewModels;
 
-namespace OrchardCore.Taxonomies.Drivers
+namespace OrchardCore.Taxonomies.Drivers;
+
+public sealed class TaxonomyFieldDisplayDriver : ContentFieldDisplayDriver<TaxonomyField>
 {
-    public sealed class TaxonomyFieldDisplayDriver : ContentFieldDisplayDriver<TaxonomyField>
-    {
-        private readonly IContentManager _contentManager;
+    private readonly IContentManager _contentManager;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public TaxonomyFieldDisplayDriver(
-            IContentManager contentManager,
-            IStringLocalizer<TaxonomyFieldDisplayDriver> localizer)
-        {
-            _contentManager = contentManager;
-            S = localizer;
-        }
+    public TaxonomyFieldDisplayDriver(
+        IContentManager contentManager,
+        IStringLocalizer<TaxonomyFieldDisplayDriver> localizer)
+    {
+        _contentManager = contentManager;
+        S = localizer;
+    }
 
-        public override IDisplayResult Display(TaxonomyField field, BuildFieldDisplayContext context)
+    public override IDisplayResult Display(TaxonomyField field, BuildFieldDisplayContext context)
+    {
+        return Initialize<DisplayTaxonomyFieldViewModel>(GetDisplayShapeType(context), model =>
         {
-            return Initialize<DisplayTaxonomyFieldViewModel>(GetDisplayShapeType(context), model =>
-            {
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            }).Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        }).Location("Detail", "Content")
+        .Location("Summary", "Content");
+    }
 
-        public override IDisplayResult Edit(TaxonomyField field, BuildFieldEditorContext context)
+    public override IDisplayResult Edit(TaxonomyField field, BuildFieldEditorContext context)
+    {
+        return Initialize<EditTaxonomyFieldViewModel>(GetEditorShapeType(context), async model =>
         {
-            return Initialize<EditTaxonomyFieldViewModel>(GetEditorShapeType(context), async model =>
+            var settings = context.PartFieldDefinition.GetSettings<TaxonomyFieldSettings>();
+            model.Taxonomy = await _contentManager.GetAsync(settings.TaxonomyContentItemId, VersionOptions.Latest);
+
+            if (model.Taxonomy != null)
             {
-                var settings = context.PartFieldDefinition.GetSettings<TaxonomyFieldSettings>();
-                model.Taxonomy = await _contentManager.GetAsync(settings.TaxonomyContentItemId, VersionOptions.Latest);
-
-                if (model.Taxonomy != null)
-                {
-                    var termEntries = new List<TermEntry>();
-                    TaxonomyFieldDriverHelper.PopulateTermEntries(termEntries, field, model.Taxonomy.As<TaxonomyPart>().Terms, 0);
-
-                    model.TermEntries = termEntries;
-                    model.UniqueValue = termEntries.FirstOrDefault(x => x.Selected)?.ContentItemId;
-                }
-
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            });
-        }
+                var termEntries = new List<TermEntry>();
+                TaxonomyFieldDriverHelper.PopulateTermEntries(termEntries, field, model.Taxonomy.As<TaxonomyPart>().Terms, 0);
 
-        public override async Task<IDisplayResult> UpdateAsync(TaxonomyField field, UpdateFieldEditorContext context)
-        {
-            var model = new EditTaxonomyFieldViewModel();
+                model.TermEntries = termEntries;
+                model.UniqueValue = termEntries.FirstOrDefault(x => x.Selected)?.ContentItemId;
+            }
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        });
+    }
 
-            var settings = context.PartFieldDefinition.GetSettings<TaxonomyFieldSettings>();
+    public override async Task<IDisplayResult> UpdateAsync(TaxonomyField field, UpdateFieldEditorContext context)
+    {
+        var model = new EditTaxonomyFieldViewModel();
 
-            field.TaxonomyContentItemId = settings.TaxonomyContentItemId;
-            field.TermContentItemIds = model.TermEntries.Where(x => x.Selected).Select(x => x.ContentItemId).ToArray();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            if (settings.Unique && !string.IsNullOrEmpty(model.UniqueValue))
-            {
-                field.TermContentItemIds = [model.UniqueValue];
-            }
+        var settings = context.PartFieldDefinition.GetSettings<TaxonomyFieldSettings>();
 
-            if (settings.Required && field.TermContentItemIds.Length == 0)
-            {
-                context.Updater.ModelState.AddModelError(
-                    nameof(EditTaxonomyFieldViewModel.TermEntries),
-                    S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
-            }
+        field.TaxonomyContentItemId = settings.TaxonomyContentItemId;
+        field.TermContentItemIds = model.TermEntries.Where(x => x.Selected).Select(x => x.ContentItemId).ToArray();
 
-            return Edit(field, context);
+        if (settings.Unique && !string.IsNullOrEmpty(model.UniqueValue))
+        {
+            field.TermContentItemIds = [model.UniqueValue];
         }
+
+        if (settings.Required && field.TermContentItemIds.Length == 0)
+        {
+            context.Updater.ModelState.AddModelError(
+                nameof(EditTaxonomyFieldViewModel.TermEntries),
+                S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
+        }
+
+        return Edit(field, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyFieldDriverHelper.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyFieldDriverHelper.cs
index b20b9b7509e..3458616a52d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyFieldDriverHelper.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyFieldDriverHelper.cs
@@ -7,40 +7,39 @@
 using OrchardCore.Taxonomies.Fields;
 using OrchardCore.Taxonomies.ViewModels;
 
-namespace OrchardCore.Taxonomies.Drivers
+namespace OrchardCore.Taxonomies.Drivers;
+
+public static class TaxonomyFieldDriverHelper
 {
-    public static class TaxonomyFieldDriverHelper
+    /// <summary>
+    /// Populates a list of <see cref="TermEntry"/> with the hierarchy of terms.
+    /// The list is ordered so that roots appear right before their child terms.
+    /// </summary>
+    public static void PopulateTermEntries(List<TermEntry> termEntries, TaxonomyField field, IEnumerable<ContentItem> contentItems, int level)
     {
-        /// <summary>
-        /// Populates a list of <see cref="TermEntry"/> with the hierarchy of terms.
-        /// The list is ordered so that roots appear right before their child terms.
-        /// </summary>
-        public static void PopulateTermEntries(List<TermEntry> termEntries, TaxonomyField field, IEnumerable<ContentItem> contentItems, int level)
+        foreach (var contentItem in contentItems)
         {
-            foreach (var contentItem in contentItems)
-            {
-                var children = Array.Empty<ContentItem>();
+            var children = Array.Empty<ContentItem>();
 
-                if (((JsonObject)contentItem.Content)["Terms"] is JsonArray termsArray)
-                {
-                    children = termsArray.ToObject<ContentItem[]>();
-                }
+            if (((JsonObject)contentItem.Content)["Terms"] is JsonArray termsArray)
+            {
+                children = termsArray.ToObject<ContentItem[]>();
+            }
 
-                var termEntry = new TermEntry
-                {
-                    Term = contentItem,
-                    ContentItemId = contentItem.ContentItemId,
-                    Selected = field.TermContentItemIds.Contains(contentItem.ContentItemId),
-                    Level = level,
-                    IsLeaf = children.Length == 0
-                };
+            var termEntry = new TermEntry
+            {
+                Term = contentItem,
+                ContentItemId = contentItem.ContentItemId,
+                Selected = field.TermContentItemIds.Contains(contentItem.ContentItemId),
+                Level = level,
+                IsLeaf = children.Length == 0
+            };
 
-                termEntries.Add(termEntry);
+            termEntries.Add(termEntry);
 
-                if (children.Length > 0)
-                {
-                    PopulateTermEntries(termEntries, field, children, level + 1);
-                }
+            if (children.Length > 0)
+            {
+                PopulateTermEntries(termEntries, field, children, level + 1);
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyFieldTagsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyFieldTagsDisplayDriver.cs
index 069591235a7..2a2fef9e60f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyFieldTagsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyFieldTagsDisplayDriver.cs
@@ -16,103 +16,102 @@
 using OrchardCore.Taxonomies.Settings;
 using OrchardCore.Taxonomies.ViewModels;
 
-namespace OrchardCore.Taxonomies.Drivers
+namespace OrchardCore.Taxonomies.Drivers;
+
+public sealed class TaxonomyFieldTagsDisplayDriver : ContentFieldDisplayDriver<TaxonomyField>
 {
-    public sealed class TaxonomyFieldTagsDisplayDriver : ContentFieldDisplayDriver<TaxonomyField>
-    {
-        private readonly IContentManager _contentManager;
+    private readonly IContentManager _contentManager;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public TaxonomyFieldTagsDisplayDriver(
-            IContentManager contentManager,
-            IStringLocalizer<TaxonomyFieldTagsDisplayDriver> stringLocalizer)
-        {
-            _contentManager = contentManager;
-            S = stringLocalizer;
-        }
+    public TaxonomyFieldTagsDisplayDriver(
+        IContentManager contentManager,
+        IStringLocalizer<TaxonomyFieldTagsDisplayDriver> stringLocalizer)
+    {
+        _contentManager = contentManager;
+        S = stringLocalizer;
+    }
 
-        public override IDisplayResult Display(TaxonomyField field, BuildFieldDisplayContext context)
+    public override IDisplayResult Display(TaxonomyField field, BuildFieldDisplayContext context)
+    {
+        return Initialize<DisplayTaxonomyFieldTagsViewModel>(GetDisplayShapeType(context), model =>
         {
-            return Initialize<DisplayTaxonomyFieldTagsViewModel>(GetDisplayShapeType(context), model =>
-            {
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            }).Location("Detail", "Content")
-            .Location("Summary", "Content");
-        }
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        }).Location("Detail", "Content")
+        .Location("Summary", "Content");
+    }
 
-        public override IDisplayResult Edit(TaxonomyField field, BuildFieldEditorContext context)
+    public override IDisplayResult Edit(TaxonomyField field, BuildFieldEditorContext context)
+    {
+        return Initialize<EditTagTaxonomyFieldViewModel>(GetEditorShapeType(context), async model =>
         {
-            return Initialize<EditTagTaxonomyFieldViewModel>(GetEditorShapeType(context), async model =>
-            {
-                var settings = context.PartFieldDefinition.GetSettings<TaxonomyFieldSettings>();
-                model.Taxonomy = await _contentManager.GetAsync(settings.TaxonomyContentItemId, VersionOptions.Latest);
+            var settings = context.PartFieldDefinition.GetSettings<TaxonomyFieldSettings>();
+            model.Taxonomy = await _contentManager.GetAsync(settings.TaxonomyContentItemId, VersionOptions.Latest);
 
-                if (model.Taxonomy != null)
+            if (model.Taxonomy != null)
+            {
+                var termEntries = new List<TermEntry>();
+                TaxonomyFieldDriverHelper.PopulateTermEntries(termEntries, field, model.Taxonomy.As<TaxonomyPart>().Terms, 0);
+                var tagTermEntries = termEntries.Select(te => new TagTermEntry
                 {
-                    var termEntries = new List<TermEntry>();
-                    TaxonomyFieldDriverHelper.PopulateTermEntries(termEntries, field, model.Taxonomy.As<TaxonomyPart>().Terms, 0);
-                    var tagTermEntries = termEntries.Select(te => new TagTermEntry
-                    {
-                        ContentItemId = te.ContentItemId,
-                        Selected = te.Selected,
-                        DisplayText = te.Term.DisplayText,
-                        IsLeaf = te.IsLeaf
-                    });
-
-                    model.TagTermEntries = JNode.FromObject(tagTermEntries, JOptions.CamelCase).ToJsonString(JOptions.Default);
-                }
-
-                model.Field = field;
-                model.Part = context.ContentPart;
-                model.PartFieldDefinition = context.PartFieldDefinition;
-            });
-        }
+                    ContentItemId = te.ContentItemId,
+                    Selected = te.Selected,
+                    DisplayText = te.Term.DisplayText,
+                    IsLeaf = te.IsLeaf
+                });
 
-        public override async Task<IDisplayResult> UpdateAsync(TaxonomyField field, UpdateFieldEditorContext context)
-        {
-            var model = new EditTagTaxonomyFieldViewModel();
+                model.TagTermEntries = JNode.FromObject(tagTermEntries, JOptions.CamelCase).ToJsonString(JOptions.Default);
+            }
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix, f => f.TermContentItemIds);
+            model.Field = field;
+            model.Part = context.ContentPart;
+            model.PartFieldDefinition = context.PartFieldDefinition;
+        });
+    }
 
-            var settings = context.PartFieldDefinition.GetSettings<TaxonomyFieldSettings>();
+    public override async Task<IDisplayResult> UpdateAsync(TaxonomyField field, UpdateFieldEditorContext context)
+    {
+        var model = new EditTagTaxonomyFieldViewModel();
 
-            field.TaxonomyContentItemId = settings.TaxonomyContentItemId;
+        await context.Updater.TryUpdateModelAsync(model, Prefix, f => f.TermContentItemIds);
 
-            field.TermContentItemIds = model.TermContentItemIds == null
-                ? [] : model.TermContentItemIds.Split(',', StringSplitOptions.RemoveEmptyEntries);
+        var settings = context.PartFieldDefinition.GetSettings<TaxonomyFieldSettings>();
 
-            if (settings.Required && field.TermContentItemIds.Length == 0)
-            {
-                context.Updater.ModelState.AddModelError(
-                    nameof(EditTagTaxonomyFieldViewModel.TermContentItemIds),
-                    S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
-            }
+        field.TaxonomyContentItemId = settings.TaxonomyContentItemId;
 
-            // Update display text for tags.
-            var taxonomy = await _contentManager.GetAsync(settings.TaxonomyContentItemId, VersionOptions.Latest);
+        field.TermContentItemIds = model.TermContentItemIds == null
+            ? [] : model.TermContentItemIds.Split(',', StringSplitOptions.RemoveEmptyEntries);
 
-            if (taxonomy == null)
-            {
-                return null;
-            }
+        if (settings.Required && field.TermContentItemIds.Length == 0)
+        {
+            context.Updater.ModelState.AddModelError(
+                nameof(EditTagTaxonomyFieldViewModel.TermContentItemIds),
+                S["A value is required for {0}.", context.PartFieldDefinition.DisplayName()]);
+        }
 
-            var terms = new List<ContentItem>();
+        // Update display text for tags.
+        var taxonomy = await _contentManager.GetAsync(settings.TaxonomyContentItemId, VersionOptions.Latest);
 
-            foreach (var termContentItemId in field.TermContentItemIds)
-            {
-                var term = TaxonomyOrchardHelperExtensions.FindTerm(
-                    (JsonArray)taxonomy.Content["TaxonomyPart"]["Terms"],
-                    termContentItemId);
+        if (taxonomy == null)
+        {
+            return null;
+        }
 
-                terms.Add(term);
-            }
+        var terms = new List<ContentItem>();
 
-            field.SetTagNames(terms.Select(t => t.DisplayText).ToArray());
+        foreach (var termContentItemId in field.TermContentItemIds)
+        {
+            var term = TaxonomyOrchardHelperExtensions.FindTerm(
+                (JsonArray)taxonomy.Content["TaxonomyPart"]["Terms"],
+                termContentItemId);
 
-            return Edit(field, context);
+            terms.Add(term);
         }
+
+        field.SetTagNames(terms.Select(t => t.DisplayText).ToArray());
+
+        return Edit(field, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyPartDisplayDriver.cs
index 71a3da03a20..f744f32c857 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyPartDisplayDriver.cs
@@ -13,119 +13,118 @@
 using OrchardCore.Taxonomies.Models;
 using OrchardCore.Taxonomies.ViewModels;
 
-namespace OrchardCore.Taxonomies.Drivers
+namespace OrchardCore.Taxonomies.Drivers;
+
+public sealed class TaxonomyPartDisplayDriver : ContentPartDisplayDriver<TaxonomyPart>
 {
-    public sealed class TaxonomyPartDisplayDriver : ContentPartDisplayDriver<TaxonomyPart>
+    internal readonly IStringLocalizer S;
+
+    public TaxonomyPartDisplayDriver(IStringLocalizer<TaxonomyPartDisplayDriver> stringLocalizer)
+    {
+        S = stringLocalizer;
+    }
+
+    public override IDisplayResult Display(TaxonomyPart part, BuildPartDisplayContext context)
     {
-        internal readonly IStringLocalizer S;
+        var hasItems = part.Terms.Count > 0;
 
-        public TaxonomyPartDisplayDriver(IStringLocalizer<TaxonomyPartDisplayDriver> stringLocalizer)
+        return Initialize<TaxonomyPartViewModel>(hasItems ? "TaxonomyPart" : "TaxonomyPart_Empty", m =>
         {
-            S = stringLocalizer;
-        }
+            m.ContentItem = part.ContentItem;
+            m.TaxonomyPart = part;
+        }).Location("Detail", "Content");
+    }
 
-        public override IDisplayResult Display(TaxonomyPart part, BuildPartDisplayContext context)
+    public override IDisplayResult Edit(TaxonomyPart part, BuildPartEditorContext context)
+    {
+        return Initialize<TaxonomyPartEditViewModel>("TaxonomyPart_Edit", model =>
         {
-            var hasItems = part.Terms.Count > 0;
+            model.TermContentType = part.TermContentType;
+            model.TaxonomyPart = part;
+        });
+    }
 
-            return Initialize<TaxonomyPartViewModel>(hasItems ? "TaxonomyPart" : "TaxonomyPart_Empty", m =>
-            {
-                m.ContentItem = part.ContentItem;
-                m.TaxonomyPart = part;
-            }).Location("Detail", "Content");
-        }
+    public override async Task<IDisplayResult> UpdateAsync(TaxonomyPart part, UpdatePartEditorContext context)
+    {
+        var model = new TaxonomyPartEditViewModel();
+
+        await context.Updater.TryUpdateModelAsync(model, Prefix, t => t.Hierarchy, t => t.TermContentType);
 
-        public override IDisplayResult Edit(TaxonomyPart part, BuildPartEditorContext context)
+        if (string.IsNullOrWhiteSpace(model.TermContentType))
         {
-            return Initialize<TaxonomyPartEditViewModel>("TaxonomyPart_Edit", model =>
-            {
-                model.TermContentType = part.TermContentType;
-                model.TaxonomyPart = part;
-            });
+            context.Updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(TaxonomyPart part, UpdatePartEditorContext context)
+        if (!string.IsNullOrWhiteSpace(model.Hierarchy))
         {
-            var model = new TaxonomyPartEditViewModel();
+            var originalTaxonomyItems = part.ContentItem.As<TaxonomyPart>();
+
+            var newHierarchy = JsonNode.Parse(model.Hierarchy).AsArray();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix, t => t.Hierarchy, t => t.TermContentType);
+            var taxonomyItems = new JsonArray();
 
-            if (string.IsNullOrWhiteSpace(model.TermContentType))
+            foreach (var item in newHierarchy)
             {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(model.TermContentType), S["The Term Content Type field is required."]);
+                taxonomyItems.Add(ProcessItem(originalTaxonomyItems, item as JsonObject));
             }
 
-            if (!string.IsNullOrWhiteSpace(model.Hierarchy))
-            {
-                var originalTaxonomyItems = part.ContentItem.As<TaxonomyPart>();
+            part.Terms = taxonomyItems.ToObject<List<ContentItem>>();
+        }
 
-                var newHierarchy = JsonNode.Parse(model.Hierarchy).AsArray();
+        part.TermContentType = model.TermContentType;
 
-                var taxonomyItems = new JsonArray();
+        return Edit(part, context);
+    }
 
-                foreach (var item in newHierarchy)
-                {
-                    taxonomyItems.Add(ProcessItem(originalTaxonomyItems, item as JsonObject));
-                }
+    /// <summary>
+    /// Clone the content items at the specific index.
+    /// </summary>
+    private static JsonObject GetTaxonomyItemAt(List<ContentItem> taxonomyItems, int[] indexes)
+    {
+        ContentItem taxonomyItem = null;
 
-                part.Terms = taxonomyItems.ToObject<List<ContentItem>>();
+        // Seek the term represented by the list of indexes
+        foreach (var index in indexes)
+        {
+            if (taxonomyItems == null || taxonomyItems.Count < index)
+            {
+                // Trying to access an unknown index
+                return null;
             }
 
-            part.TermContentType = model.TermContentType;
+            taxonomyItem = taxonomyItems[index];
 
-            return Edit(part, context);
+            var terms = (JsonArray)taxonomyItem.Content["Terms"];
+            taxonomyItems = terms?.ToObject<List<ContentItem>>();
         }
 
-        /// <summary>
-        /// Clone the content items at the specific index.
-        /// </summary>
-        private static JsonObject GetTaxonomyItemAt(List<ContentItem> taxonomyItems, int[] indexes)
-        {
-            ContentItem taxonomyItem = null;
-
-            // Seek the term represented by the list of indexes
-            foreach (var index in indexes)
-            {
-                if (taxonomyItems == null || taxonomyItems.Count < index)
-                {
-                    // Trying to access an unknown index
-                    return null;
-                }
+        var newObj = JObject.FromObject(taxonomyItem);
 
-                taxonomyItem = taxonomyItems[index];
-
-                var terms = (JsonArray)taxonomyItem.Content["Terms"];
-                taxonomyItems = terms?.ToObject<List<ContentItem>>();
-            }
+        if (newObj["Terms"] != null)
+        {
+            newObj["Terms"] = new JsonArray();
+        }
 
-            var newObj = JObject.FromObject(taxonomyItem);
+        return newObj;
+    }
 
-            if (newObj["Terms"] != null)
-            {
-                newObj["Terms"] = new JsonArray();
-            }
+    private static JsonObject ProcessItem(TaxonomyPart originalItems, JsonObject item)
+    {
+        var contentItem = GetTaxonomyItemAt(originalItems.Terms, item["index"].ToString().Split('-').Select(x => Convert.ToInt32(x)).ToArray());
 
-            return newObj;
-        }
+        var children = item["children"] as JsonArray;
 
-        private static JsonObject ProcessItem(TaxonomyPart originalItems, JsonObject item)
+        if (children is not null)
         {
-            var contentItem = GetTaxonomyItemAt(originalItems.Terms, item["index"].ToString().Split('-').Select(x => Convert.ToInt32(x)).ToArray());
+            var taxonomyItems = new JsonArray();
 
-            var children = item["children"] as JsonArray;
-
-            if (children is not null)
+            for (var i = 0; i < children.Count; i++)
             {
-                var taxonomyItems = new JsonArray();
-
-                for (var i = 0; i < children.Count; i++)
-                {
-                    taxonomyItems.Add(ProcessItem(originalItems, children[i] as JsonObject));
-                    contentItem["Terms"] = taxonomyItems;
-                }
+                taxonomyItems.Add(ProcessItem(originalItems, children[i] as JsonObject));
+                contentItem["Terms"] = taxonomyItems;
             }
-
-            return contentItem;
         }
+
+        return contentItem;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TermPartContentDriver.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TermPartContentDriver.cs
index 410ded748a5..b7c7a3ed54e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TermPartContentDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TermPartContentDriver.cs
@@ -16,153 +16,152 @@
 using OrchardCore.Taxonomies.ViewModels;
 using YesSql;
 
-namespace OrchardCore.Taxonomies.Drivers
+namespace OrchardCore.Taxonomies.Drivers;
+
+public sealed class TermPartContentDriver : ContentDisplayDriver
 {
-    public sealed class TermPartContentDriver : ContentDisplayDriver
+    private readonly ISession _session;
+    private readonly PagerOptions _pagerOptions;
+    private readonly IContentManager _contentManager;
+
+    public TermPartContentDriver(
+        ISession session,
+        IOptions<PagerOptions> pagerOptions,
+        IContentManager contentManager)
     {
-        private readonly ISession _session;
-        private readonly PagerOptions _pagerOptions;
-        private readonly IContentManager _contentManager;
-
-        public TermPartContentDriver(
-            ISession session,
-            IOptions<PagerOptions> pagerOptions,
-            IContentManager contentManager)
-        {
-            _session = session;
-            _pagerOptions = pagerOptions.Value;
-            _contentManager = contentManager;
-        }
+        _session = session;
+        _pagerOptions = pagerOptions.Value;
+        _contentManager = contentManager;
+    }
 
-        public override IDisplayResult Display(ContentItem model, BuildDisplayContext context)
+    public override IDisplayResult Display(ContentItem model, BuildDisplayContext context)
+    {
+        var part = model.As<TermPart>();
+        if (part != null)
         {
-            var part = model.As<TermPart>();
-            if (part != null)
+            return Initialize<TermPartViewModel>("TermPart", async m =>
             {
-                return Initialize<TermPartViewModel>("TermPart", async m =>
-                {
-                    var pager = await GetPagerAsync(context.Updater, _pagerOptions.GetPageSize());
-                    m.TaxonomyContentItemId = part.TaxonomyContentItemId;
-                    m.ContentItem = part.ContentItem;
-                    m.ContentItems = (await QueryTermItemsAsync(part, pager)).ToArray();
-                    m.Pager = await context.New.PagerSlim(pager);
-                }).Location("Detail", "Content:5");
-            }
-
-            return null;
+                var pager = await GetPagerAsync(context.Updater, _pagerOptions.GetPageSize());
+                m.TaxonomyContentItemId = part.TaxonomyContentItemId;
+                m.ContentItem = part.ContentItem;
+                m.ContentItems = (await QueryTermItemsAsync(part, pager)).ToArray();
+                m.Pager = await context.New.PagerSlim(pager);
+            }).Location("Detail", "Content:5");
         }
 
-        private async Task<IEnumerable<ContentItem>> QueryTermItemsAsync(TermPart termPart, PagerSlim pager)
-        {
-            if (pager.Before != null)
-            {
-                var beforeValue = new DateTime(long.Parse(pager.Before));
-                var query = _session.Query<ContentItem>()
-                    .With<TaxonomyIndex>(x => x.TermContentItemId == termPart.ContentItem.ContentItemId)
-                    .With<ContentItemIndex>(CreateContentIndexFilter(beforeValue, null))
-                    .OrderBy(x => x.CreatedUtc)
-                    .Take(pager.PageSize + 1);
+        return null;
+    }
 
-                var containedItems = await query.ListAsync();
+    private async Task<IEnumerable<ContentItem>> QueryTermItemsAsync(TermPart termPart, PagerSlim pager)
+    {
+        if (pager.Before != null)
+        {
+            var beforeValue = new DateTime(long.Parse(pager.Before));
+            var query = _session.Query<ContentItem>()
+                .With<TaxonomyIndex>(x => x.TermContentItemId == termPart.ContentItem.ContentItemId)
+                .With<ContentItemIndex>(CreateContentIndexFilter(beforeValue, null))
+                .OrderBy(x => x.CreatedUtc)
+                .Take(pager.PageSize + 1);
 
-                if (!containedItems.Any())
-                {
-                    return containedItems;
-                }
+            var containedItems = await query.ListAsync();
 
-                containedItems = containedItems.Reverse();
+            if (!containedItems.Any())
+            {
+                return containedItems;
+            }
 
-                // There is always an After as we clicked on Before.
-                pager.Before = null;
-                pager.After = containedItems.Last().CreatedUtc.Value.Ticks.ToString();
+            containedItems = containedItems.Reverse();
 
-                if (containedItems.Count() == pager.PageSize + 1)
-                {
-                    containedItems = containedItems.Skip(1);
-                    pager.Before = containedItems.First().CreatedUtc.Value.Ticks.ToString();
-                }
+            // There is always an After as we clicked on Before.
+            pager.Before = null;
+            pager.After = containedItems.Last().CreatedUtc.Value.Ticks.ToString();
 
-                return await _contentManager.LoadAsync(containedItems);
-            }
-            else if (pager.After != null)
+            if (containedItems.Count() == pager.PageSize + 1)
             {
-                var afterValue = new DateTime(long.Parse(pager.After));
-                var query = _session.Query<ContentItem>()
-                    .With<TaxonomyIndex>(x => x.TermContentItemId == termPart.ContentItem.ContentItemId)
-                    .With<ContentItemIndex>(CreateContentIndexFilter(null, afterValue))
-                    .OrderByDescending(x => x.CreatedUtc)
-                    .Take(pager.PageSize + 1);
+                containedItems = containedItems.Skip(1);
+                pager.Before = containedItems.First().CreatedUtc.Value.Ticks.ToString();
+            }
 
-                var containedItems = await query.ListAsync();
+            return await _contentManager.LoadAsync(containedItems);
+        }
+        else if (pager.After != null)
+        {
+            var afterValue = new DateTime(long.Parse(pager.After));
+            var query = _session.Query<ContentItem>()
+                .With<TaxonomyIndex>(x => x.TermContentItemId == termPart.ContentItem.ContentItemId)
+                .With<ContentItemIndex>(CreateContentIndexFilter(null, afterValue))
+                .OrderByDescending(x => x.CreatedUtc)
+                .Take(pager.PageSize + 1);
 
-                if (!containedItems.Any())
-                {
-                    return containedItems;
-                }
+            var containedItems = await query.ListAsync();
 
-                // There is always a Before page as we clicked on After.
-                pager.Before = containedItems.First().CreatedUtc.Value.Ticks.ToString();
-                pager.After = null;
+            if (!containedItems.Any())
+            {
+                return containedItems;
+            }
 
-                if (containedItems.Count() == pager.PageSize + 1)
-                {
-                    containedItems = containedItems.Take(pager.PageSize);
-                    pager.After = containedItems.Last().CreatedUtc.Value.Ticks.ToString();
-                }
+            // There is always a Before page as we clicked on After.
+            pager.Before = containedItems.First().CreatedUtc.Value.Ticks.ToString();
+            pager.After = null;
 
-                return await _contentManager.LoadAsync(containedItems);
-            }
-            else
+            if (containedItems.Count() == pager.PageSize + 1)
             {
-                var query = _session.Query<ContentItem>()
-                    .With<TaxonomyIndex>(x => x.TermContentItemId == termPart.ContentItem.ContentItemId)
-                    .With<ContentItemIndex>(CreateContentIndexFilter(null, null))
-                    .OrderByDescending(x => x.CreatedUtc)
-                    .Take(pager.PageSize + 1);
+                containedItems = containedItems.Take(pager.PageSize);
+                pager.After = containedItems.Last().CreatedUtc.Value.Ticks.ToString();
+            }
 
-                var containedItems = await query.ListAsync();
+            return await _contentManager.LoadAsync(containedItems);
+        }
+        else
+        {
+            var query = _session.Query<ContentItem>()
+                .With<TaxonomyIndex>(x => x.TermContentItemId == termPart.ContentItem.ContentItemId)
+                .With<ContentItemIndex>(CreateContentIndexFilter(null, null))
+                .OrderByDescending(x => x.CreatedUtc)
+                .Take(pager.PageSize + 1);
 
-                if (!containedItems.Any())
-                {
-                    return containedItems;
-                }
+            var containedItems = await query.ListAsync();
 
-                pager.Before = null;
-                pager.After = null;
+            if (!containedItems.Any())
+            {
+                return containedItems;
+            }
 
-                if (containedItems.Count() == pager.PageSize + 1)
-                {
-                    containedItems = containedItems.Take(pager.PageSize);
-                    pager.After = containedItems.Last().CreatedUtc.Value.Ticks.ToString();
-                }
+            pager.Before = null;
+            pager.After = null;
 
-                return await _contentManager.LoadAsync(containedItems);
+            if (containedItems.Count() == pager.PageSize + 1)
+            {
+                containedItems = containedItems.Take(pager.PageSize);
+                pager.After = containedItems.Last().CreatedUtc.Value.Ticks.ToString();
             }
+
+            return await _contentManager.LoadAsync(containedItems);
         }
+    }
 
-        private static async Task<PagerSlim> GetPagerAsync(IUpdateModel updater, int pageSize)
-        {
-            var pagerParameters = new PagerSlimParameters();
-            await updater.TryUpdateModelAsync(pagerParameters);
+    private static async Task<PagerSlim> GetPagerAsync(IUpdateModel updater, int pageSize)
+    {
+        var pagerParameters = new PagerSlimParameters();
+        await updater.TryUpdateModelAsync(pagerParameters);
 
-            var pager = new PagerSlim(pagerParameters, pageSize);
+        var pager = new PagerSlim(pagerParameters, pageSize);
 
-            return pager;
-        }
+        return pager;
+    }
 
-        private static Expression<Func<ContentItemIndex, bool>> CreateContentIndexFilter(DateTime? before, DateTime? after)
+    private static Expression<Func<ContentItemIndex, bool>> CreateContentIndexFilter(DateTime? before, DateTime? after)
+    {
+        if (before != null)
         {
-            if (before != null)
-            {
-                return x => x.Published && x.CreatedUtc > before;
-            }
-
-            if (after != null)
-            {
-                return x => x.Published && x.CreatedUtc < after;
-            }
+            return x => x.Published && x.CreatedUtc > before;
+        }
 
-            return x => x.Published;
+        if (after != null)
+        {
+            return x => x.Published && x.CreatedUtc < after;
         }
+
+        return x => x.Published;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Fields/TagNamesExtensions.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Fields/TagNamesExtensions.cs
index 2c8dc075fd3..8bef07eb1df 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Fields/TagNamesExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Fields/TagNamesExtensions.cs
@@ -1,28 +1,27 @@
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.Taxonomies.Fields
+namespace OrchardCore.Taxonomies.Fields;
+
+public static class TagNamesExtensions
 {
-    public static class TagNamesExtensions
+    /// <summary>
+    /// Tag names are a less well known property of a taxonomy field
+    /// managed by the tags editor and tags display mode. 
+    /// </summary>
+    public static string[] GetTagNames(this TaxonomyField taxonomyField)
     {
-        /// <summary>
-        /// Tag names are a less well known property of a taxonomy field
-        /// managed by the tags editor and tags display mode. 
-        /// </summary>
-        public static string[] GetTagNames(this TaxonomyField taxonomyField)
-        {
-            var tagNames = (JsonArray)taxonomyField.Content["TagNames"];
+        var tagNames = (JsonArray)taxonomyField.Content["TagNames"];
 
-            return tagNames != null ? tagNames.ToObject<string[]>() : [];
-        }
+        return tagNames != null ? tagNames.ToObject<string[]>() : [];
+    }
 
-        /// <summary>
-        /// Tags names are a less well known property of a taxonomy field
-        /// managed by the tags editor and tags display mode.
-        /// They are updated only when saving the content item.
-        /// </summary>
-        public static void SetTagNames(this TaxonomyField taxonomyField, string[] tagNames)
-        {
-            taxonomyField.Content["TagNames"] = JArray.FromObject(tagNames);
-        }
+    /// <summary>
+    /// Tags names are a less well known property of a taxonomy field
+    /// managed by the tags editor and tags display mode.
+    /// They are updated only when saving the content item.
+    /// </summary>
+    public static void SetTagNames(this TaxonomyField taxonomyField, string[] tagNames)
+    {
+        taxonomyField.Content["TagNames"] = JArray.FromObject(tagNames);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Fields/TaxonomyField.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Fields/TaxonomyField.cs
index 9016b584adb..b2b046a7dd6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Fields/TaxonomyField.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Fields/TaxonomyField.cs
@@ -1,10 +1,9 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Taxonomies.Fields
+namespace OrchardCore.Taxonomies.Fields;
+
+public class TaxonomyField : ContentField
 {
-    public class TaxonomyField : ContentField
-    {
-        public string TaxonomyContentItemId { get; set; }
-        public string[] TermContentItemIds { get; set; } = [];
-    }
+    public string TaxonomyContentItemId { get; set; }
+    public string[] TermContentItemIds { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/GraphQL/TaxonomyFieldQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/GraphQL/TaxonomyFieldQueryObjectType.cs
index ad4942e525d..4a6767c0058 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/GraphQL/TaxonomyFieldQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/GraphQL/TaxonomyFieldQueryObjectType.cs
@@ -7,66 +7,65 @@
 using OrchardCore.ContentManagement.GraphQL.Queries.Types;
 using OrchardCore.Taxonomies.Fields;
 
-namespace OrchardCore.Taxonomies.GraphQL
+namespace OrchardCore.Taxonomies.GraphQL;
+
+public class TaxonomyFieldQueryObjectType : ObjectGraphType<TaxonomyField>
 {
-    public class TaxonomyFieldQueryObjectType : ObjectGraphType<TaxonomyField>
+    public TaxonomyFieldQueryObjectType()
     {
-        public TaxonomyFieldQueryObjectType()
-        {
-            Name = nameof(TaxonomyField);
+        Name = nameof(TaxonomyField);
 
-            Field<ListGraphType<StringGraphType>, IEnumerable<string>>("termContentItemIds")
-                .Description("term content item ids")
-                .PagingArguments()
-                .Resolve(x =>
-                {
-                    return x.Page(x.Source.TermContentItemIds);
-                });
+        Field<ListGraphType<StringGraphType>, IEnumerable<string>>("termContentItemIds")
+            .Description("term content item ids")
+            .PagingArguments()
+            .Resolve(x =>
+            {
+                return x.Page(x.Source.TermContentItemIds);
+            });
 
-            Field<StringGraphType, string>("taxonomyContentItemId")
-                .Description("taxonomy content item id")
-                .Resolve(x =>
-                {
-                    return x.Source.TaxonomyContentItemId;
-                });
+        Field<StringGraphType, string>("taxonomyContentItemId")
+            .Description("taxonomy content item id")
+            .Resolve(x =>
+            {
+                return x.Source.TaxonomyContentItemId;
+            });
 
-            Field<ListGraphType<ContentItemInterface>, List<ContentItem>>("termContentItems")
-                .Description("the term content items")
-                .PagingArguments()
-                .ResolveLockedAsync(async x =>
-                {
-                    var ids = x.Page(x.Source.TermContentItemIds);
-                    var contentManager = x.RequestServices.GetService<IContentManager>();
+        Field<ListGraphType<ContentItemInterface>, List<ContentItem>>("termContentItems")
+            .Description("the term content items")
+            .PagingArguments()
+            .ResolveLockedAsync(async x =>
+            {
+                var ids = x.Page(x.Source.TermContentItemIds);
+                var contentManager = x.RequestServices.GetService<IContentManager>();
 
-                    var taxonomy = await contentManager.GetAsync(x.Source.TaxonomyContentItemId);
+                var taxonomy = await contentManager.GetAsync(x.Source.TaxonomyContentItemId);
 
-                    if (taxonomy == null)
-                    {
-                        return null;
-                    }
+                if (taxonomy == null)
+                {
+                    return null;
+                }
 
-                    var terms = new List<ContentItem>();
+                var terms = new List<ContentItem>();
 
-                    foreach (var termContentItemId in ids)
-                    {
-                        var term = TaxonomyOrchardHelperExtensions.FindTerm(
-                            (JsonArray)taxonomy.Content["TaxonomyPart"]["Terms"],
-                            termContentItemId);
+                foreach (var termContentItemId in ids)
+                {
+                    var term = TaxonomyOrchardHelperExtensions.FindTerm(
+                        (JsonArray)taxonomy.Content["TaxonomyPart"]["Terms"],
+                        termContentItemId);
 
-                        terms.Add(term);
-                    }
+                    terms.Add(term);
+                }
 
-                    return terms;
-                });
+                return terms;
+            });
 
-            Field<ContentItemInterface, ContentItem>("taxonomyContentItem")
-                .Description("the taxonomy content item")
-                .ResolveLockedAsync(async context =>
-                {
-                    var contentManager = context.RequestServices.GetService<IContentManager>();
+        Field<ContentItemInterface, ContentItem>("taxonomyContentItem")
+            .Description("the taxonomy content item")
+            .ResolveLockedAsync(async context =>
+            {
+                var contentManager = context.RequestServices.GetService<IContentManager>();
 
-                    return await contentManager.GetAsync(context.Source.TaxonomyContentItemId);
-                });
-        }
+                return await contentManager.GetAsync(context.Source.TaxonomyContentItemId);
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/GraphQL/TaxonomyPartQueryObjectType.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/GraphQL/TaxonomyPartQueryObjectType.cs
index f1fe006fa68..b2f80b6cd10 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/GraphQL/TaxonomyPartQueryObjectType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/GraphQL/TaxonomyPartQueryObjectType.cs
@@ -5,20 +5,19 @@
 using OrchardCore.ContentManagement.GraphQL.Queries.Types;
 using OrchardCore.Taxonomies.Models;
 
-namespace OrchardCore.Taxonomies.GraphQL
+namespace OrchardCore.Taxonomies.GraphQL;
+
+public class TaxonomyPartQueryObjectType : ObjectGraphType<TaxonomyPart>
 {
-    public class TaxonomyPartQueryObjectType : ObjectGraphType<TaxonomyPart>
+    public TaxonomyPartQueryObjectType()
     {
-        public TaxonomyPartQueryObjectType()
-        {
-            Name = "TaxonomyPart";
+        Name = "TaxonomyPart";
 
-            Field(x => x.TermContentType);
+        Field(x => x.TermContentType);
 
-            Field<ListGraphType<ContentItemInterface>, IEnumerable<ContentItem>>("contentItems")
-                .Description("the content items")
-                .PagingArguments()
-                .Resolve(x => x.Page(x.Source.Terms));
-        }
+        Field<ListGraphType<ContentItemInterface>, IEnumerable<ContentItem>>("contentItems")
+            .Description("the content items")
+            .PagingArguments()
+            .Resolve(x => x.Page(x.Source.Terms));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Handlers/TaxonomyPartHandler.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Handlers/TaxonomyPartHandler.cs
index 58fd760402c..582cfc2f094 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Handlers/TaxonomyPartHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Handlers/TaxonomyPartHandler.cs
@@ -4,21 +4,20 @@
 using OrchardCore.ContentManagement.Routing;
 using OrchardCore.Taxonomies.Models;
 
-namespace OrchardCore.Taxonomies.Handlers
+namespace OrchardCore.Taxonomies.Handlers;
+
+public class TaxonomyPartHandler : ContentPartHandler<TaxonomyPart>
 {
-    public class TaxonomyPartHandler : ContentPartHandler<TaxonomyPart>
+    public override Task GetContentItemAspectAsync(ContentItemAspectContext context, TaxonomyPart part)
     {
-        public override Task GetContentItemAspectAsync(ContentItemAspectContext context, TaxonomyPart part)
+        return context.ForAsync<ContainedContentItemsAspect>(aspect =>
         {
-            return context.ForAsync<ContainedContentItemsAspect>(aspect =>
+            aspect.Accessors.Add((jsonObject) =>
             {
-                aspect.Accessors.Add((jsonObject) =>
-                {
-                    return jsonObject["TaxonomyPart"]["Terms"] as JsonArray;
-                });
-
-                return Task.CompletedTask;
+                return jsonObject["TaxonomyPart"]["Terms"] as JsonArray;
             });
-        }
+
+            return Task.CompletedTask;
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Handlers/TermPartContentHandler.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Handlers/TermPartContentHandler.cs
index 2fde41a6d46..de0c8b2c596 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Handlers/TermPartContentHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Handlers/TermPartContentHandler.cs
@@ -3,25 +3,24 @@
 using OrchardCore.ContentManagement.Handlers;
 using OrchardCore.ContentManagement.Routing;
 
-namespace OrchardCore.Taxonomies.Handlers
+namespace OrchardCore.Taxonomies.Handlers;
+
+public class TermPartContentHandler : ContentHandlerBase
 {
-    public class TermPartContentHandler : ContentHandlerBase
+    public override Task GetContentItemAspectAsync(ContentItemAspectContext context)
     {
-        public override Task GetContentItemAspectAsync(ContentItemAspectContext context)
+        return context.ForAsync<ContainedContentItemsAspect>(aspect =>
         {
-            return context.ForAsync<ContainedContentItemsAspect>(aspect =>
+            // Check this content item contains Terms.
+            if (((JsonNode)context.ContentItem.Content)["Terms"] is JsonArray)
             {
-                // Check this content item contains Terms.
-                if (((JsonNode)context.ContentItem.Content)["Terms"] is JsonArray)
+                aspect.Accessors.Add((jsonObject) =>
                 {
-                    aspect.Accessors.Add((jsonObject) =>
-                    {
-                        return jsonObject["Terms"] as JsonArray;
-                    });
-                }
+                    return jsonObject["Terms"] as JsonArray;
+                });
+            }
 
-                return Task.CompletedTask;
-            });
-        }
+            return Task.CompletedTask;
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Indexing/TaxonomyFieldIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Indexing/TaxonomyFieldIndexHandler.cs
index cb0882fbded..0816ce762a2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Indexing/TaxonomyFieldIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Indexing/TaxonomyFieldIndexHandler.cs
@@ -8,49 +8,48 @@
 using OrchardCore.Indexing;
 using OrchardCore.Taxonomies.Fields;
 
-namespace OrchardCore.Taxonomies.Indexing
+namespace OrchardCore.Taxonomies.Indexing;
+
+public class TaxonomyFieldIndexHandler : ContentFieldIndexHandler<TaxonomyField>
 {
-    public class TaxonomyFieldIndexHandler : ContentFieldIndexHandler<TaxonomyField>
-    {
-        private readonly IServiceProvider _serviceProvider;
+    private readonly IServiceProvider _serviceProvider;
 
-        public TaxonomyFieldIndexHandler(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
+    public TaxonomyFieldIndexHandler(IServiceProvider serviceProvider)
+    {
+        _serviceProvider = serviceProvider;
+    }
 
-        public override async Task BuildIndexAsync(TaxonomyField field, BuildFieldIndexContext context)
-        {
-            // TODO: Also add the parents of each term, probably as a separate field
+    public override async Task BuildIndexAsync(TaxonomyField field, BuildFieldIndexContext context)
+    {
+        // TODO: Also add the parents of each term, probably as a separate field
 
-            var options = context.Settings.ToOptions();
-            options |= DocumentIndexOptions.Keyword | DocumentIndexOptions.Store;
+        var options = context.Settings.ToOptions();
+        options |= DocumentIndexOptions.Keyword | DocumentIndexOptions.Store;
 
-            // Directly selected term ids are added to the default field name
-            foreach (var contentItemId in field.TermContentItemIds)
+        // Directly selected term ids are added to the default field name
+        foreach (var contentItemId in field.TermContentItemIds)
+        {
+            foreach (var key in context.Keys)
             {
-                foreach (var key in context.Keys)
-                {
-                    context.DocumentIndex.Set(key + IndexingConstants.IdsKey, contentItemId, options);
-                }
+                context.DocumentIndex.Set(key + IndexingConstants.IdsKey, contentItemId, options);
             }
+        }
 
-            // Inherited term ids are added to a distinct field, prefixed with "Inherited"
-            var contentManager = _serviceProvider.GetRequiredService<IContentManager>();
-            var taxonomy = await contentManager.GetAsync(field.TaxonomyContentItemId);
+        // Inherited term ids are added to a distinct field, prefixed with "Inherited"
+        var contentManager = _serviceProvider.GetRequiredService<IContentManager>();
+        var taxonomy = await contentManager.GetAsync(field.TaxonomyContentItemId);
 
-            var inheritedContentItems = new List<ContentItem>();
-            foreach (var contentItemId in field.TermContentItemIds)
-            {
-                TaxonomyOrchardHelperExtensions.FindTermHierarchy((JsonArray)taxonomy.Content.TaxonomyPart.Terms, contentItemId, inheritedContentItems);
-            }
+        var inheritedContentItems = new List<ContentItem>();
+        foreach (var contentItemId in field.TermContentItemIds)
+        {
+            TaxonomyOrchardHelperExtensions.FindTermHierarchy((JsonArray)taxonomy.Content.TaxonomyPart.Terms, contentItemId, inheritedContentItems);
+        }
 
-            foreach (var key in context.Keys)
+        foreach (var key in context.Keys)
+        {
+            foreach (var contentItem in inheritedContentItems)
             {
-                foreach (var contentItem in inheritedContentItems)
-                {
-                    context.DocumentIndex.Set(key + IndexingConstants.InheritedKey, contentItem.ContentItemId, options);
-                }
+                context.DocumentIndex.Set(key + IndexingConstants.InheritedKey, contentItem.ContentItemId, options);
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Indexing/TaxonomyIndex.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Indexing/TaxonomyIndex.cs
index 2a48c14b072..d5572077ad8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Indexing/TaxonomyIndex.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Indexing/TaxonomyIndex.cs
@@ -9,110 +9,109 @@
 using OrchardCore.Taxonomies.Fields;
 using YesSql.Indexes;
 
-namespace OrchardCore.Taxonomies.Indexing
+namespace OrchardCore.Taxonomies.Indexing;
+
+public class TaxonomyIndex : MapIndex
+{
+    public string TaxonomyContentItemId { get; set; }
+    public string ContentItemId { get; set; }
+    public string ContentType { get; set; }
+    public string ContentPart { get; set; }
+    public string ContentField { get; set; }
+    public string TermContentItemId { get; set; }
+    public bool Published { get; set; }
+    public bool Latest { get; set; }
+}
+
+public class TaxonomyIndexProvider : IndexProvider<ContentItem>, IScopedIndexProvider
 {
-    public class TaxonomyIndex : MapIndex
+    private readonly IServiceProvider _serviceProvider;
+    private readonly HashSet<string> _ignoredTypes = [];
+    private IContentDefinitionManager _contentDefinitionManager;
+
+    public TaxonomyIndexProvider(
+        IServiceProvider serviceProvider)
     {
-        public string TaxonomyContentItemId { get; set; }
-        public string ContentItemId { get; set; }
-        public string ContentType { get; set; }
-        public string ContentPart { get; set; }
-        public string ContentField { get; set; }
-        public string TermContentItemId { get; set; }
-        public bool Published { get; set; }
-        public bool Latest { get; set; }
+        _serviceProvider = serviceProvider;
     }
 
-    public class TaxonomyIndexProvider : IndexProvider<ContentItem>, IScopedIndexProvider
+    public override void Describe(DescribeContext<ContentItem> context)
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly HashSet<string> _ignoredTypes = [];
-        private IContentDefinitionManager _contentDefinitionManager;
-
-        public TaxonomyIndexProvider(
-            IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
-
-        public override void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<TaxonomyIndex>()
-                .Map(async contentItem =>
+        context.For<TaxonomyIndex>()
+            .Map(async contentItem =>
+            {
+                // Remove index records of soft deleted items.
+                if (!contentItem.Published && !contentItem.Latest)
                 {
-                    // Remove index records of soft deleted items.
-                    if (!contentItem.Published && !contentItem.Latest)
-                    {
-                        return null;
-                    }
+                    return null;
+                }
 
-                    // Can we safely ignore this content item?
-                    if (_ignoredTypes.Contains(contentItem.ContentType))
-                    {
-                        return null;
-                    }
+                // Can we safely ignore this content item?
+                if (_ignoredTypes.Contains(contentItem.ContentType))
+                {
+                    return null;
+                }
 
-                    // Lazy initialization because of ISession cyclic dependency
-                    _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
+                // Lazy initialization because of ISession cyclic dependency
+                _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-                    // Search for Taxonomy fields
-                    var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+                // Search for Taxonomy fields
+                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-                    // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
-                    if (contentTypeDefinition == null)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This can occur when content items become orphaned, particularly layer widgets when a layer is removed, before its widgets have been unpublished.
+                if (contentTypeDefinition == null)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    var fieldDefinitions = contentTypeDefinition
-                        .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(TaxonomyField)))
-                        .ToArray();
+                var fieldDefinitions = contentTypeDefinition
+                    .Parts.SelectMany(x => x.PartDefinition.Fields.Where(f => f.FieldDefinition.Name == nameof(TaxonomyField)))
+                    .ToArray();
 
-                    // This type doesn't have any TaxonomyField, ignore it
-                    if (fieldDefinitions.Length == 0)
-                    {
-                        _ignoredTypes.Add(contentItem.ContentType);
-                        return null;
-                    }
+                // This type doesn't have any TaxonomyField, ignore it
+                if (fieldDefinitions.Length == 0)
+                {
+                    _ignoredTypes.Add(contentItem.ContentType);
+                    return null;
+                }
 
-                    var results = new List<TaxonomyIndex>();
+                var results = new List<TaxonomyIndex>();
 
-                    // Get all field values
-                    foreach (var fieldDefinition in fieldDefinitions)
+                // Get all field values
+                foreach (var fieldDefinition in fieldDefinitions)
+                {
+                    var jPart = contentItem.Content[fieldDefinition.PartDefinition.Name];
+                    if (jPart is null)
                     {
-                        var jPart = contentItem.Content[fieldDefinition.PartDefinition.Name];
-                        if (jPart is null)
-                        {
-                            continue;
-                        }
+                        continue;
+                    }
 
-                        var jField = jPart[fieldDefinition.Name];
-                        if (jField is null)
-                        {
-                            continue;
-                        }
+                    var jField = jPart[fieldDefinition.Name];
+                    if (jField is null)
+                    {
+                        continue;
+                    }
 
-                        var field = ((JsonObject)jField).ToObject<TaxonomyField>();
+                    var field = ((JsonObject)jField).ToObject<TaxonomyField>();
 
-                        foreach (var termContentItemId in field.TermContentItemIds)
+                    foreach (var termContentItemId in field.TermContentItemIds)
+                    {
+                        results.Add(new TaxonomyIndex
                         {
-                            results.Add(new TaxonomyIndex
-                            {
-                                TaxonomyContentItemId = field.TaxonomyContentItemId,
-                                ContentItemId = contentItem.ContentItemId,
-                                ContentType = contentItem.ContentType,
-                                ContentPart = fieldDefinition.PartDefinition.Name,
-                                ContentField = fieldDefinition.Name,
-                                TermContentItemId = termContentItemId,
-                                Published = contentItem.Published,
-                                Latest = contentItem.Latest
-                            });
-                        }
+                            TaxonomyContentItemId = field.TaxonomyContentItemId,
+                            ContentItemId = contentItem.ContentItemId,
+                            ContentType = contentItem.ContentType,
+                            ContentPart = fieldDefinition.PartDefinition.Name,
+                            ContentField = fieldDefinition.Name,
+                            TermContentItemId = termContentItemId,
+                            Published = contentItem.Published,
+                            Latest = contentItem.Latest
+                        });
                     }
+                }
 
-                    return results;
-                });
-        }
+                return results;
+            });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Liquid/InheritedTermsFilter.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Liquid/InheritedTermsFilter.cs
index 7bb674db146..3b10d93bd1c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Liquid/InheritedTermsFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Liquid/InheritedTermsFilter.cs
@@ -6,39 +6,38 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Taxonomies.Liquid
+namespace OrchardCore.Taxonomies.Liquid;
+
+public class InheritedTermsFilter : ILiquidFilter
 {
-    public class InheritedTermsFilter : ILiquidFilter
+    private readonly IContentManager _contentManager;
+
+    public InheritedTermsFilter(IContentManager contentManager)
+    {
+        _contentManager = contentManager;
+    }
+
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
     {
-        private readonly IContentManager _contentManager;
+        var termContentItemId = input.Type == FluidValues.Object && input.ToObjectValue() is ContentItem term
+            ? term.ContentItemId
+            : input.ToStringValue();
 
-        public InheritedTermsFilter(IContentManager contentManager)
+        var firstArg = arguments.At(0);
+        if (firstArg.Type != FluidValues.Object || input.ToObjectValue() is not ContentItem taxonomy)
         {
-            _contentManager = contentManager;
+            taxonomy = await _contentManager.GetAsync(firstArg.ToStringValue());
         }
 
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+        if (taxonomy == null)
         {
-            var termContentItemId = input.Type == FluidValues.Object && input.ToObjectValue() is ContentItem term
-                ? term.ContentItemId
-                : input.ToStringValue();
-
-            var firstArg = arguments.At(0);
-            if (firstArg.Type != FluidValues.Object || input.ToObjectValue() is not ContentItem taxonomy)
-            {
-                taxonomy = await _contentManager.GetAsync(firstArg.ToStringValue());
-            }
-
-            if (taxonomy == null)
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var terms = new List<ContentItem>();
+        var terms = new List<ContentItem>();
 
-            TaxonomyOrchardHelperExtensions.FindTermHierarchy((JsonArray)taxonomy.Content.TaxonomyPart.Terms, termContentItemId, terms);
+        TaxonomyOrchardHelperExtensions.FindTermHierarchy((JsonArray)taxonomy.Content.TaxonomyPart.Terms, termContentItemId, terms);
 
-            return FluidValue.Create(terms, ctx.Options);
-        }
+        return FluidValue.Create(terms, ctx.Options);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Liquid/TaxonomyTermsFilter.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Liquid/TaxonomyTermsFilter.cs
index ad2f392701a..3c7446a311e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Liquid/TaxonomyTermsFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Liquid/TaxonomyTermsFilter.cs
@@ -8,67 +8,66 @@
 using OrchardCore.Liquid;
 using OrchardCore.Taxonomies.Fields;
 
-namespace OrchardCore.Taxonomies.Liquid
+namespace OrchardCore.Taxonomies.Liquid;
+
+public class TaxonomyTermsFilter : ILiquidFilter
 {
-    public class TaxonomyTermsFilter : ILiquidFilter
+    private readonly IContentManager _contentManager;
+
+    public TaxonomyTermsFilter(IContentManager contentManager)
     {
-        private readonly IContentManager _contentManager;
+        _contentManager = contentManager;
+    }
 
-        public TaxonomyTermsFilter(IContentManager contentManager)
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        string taxonomyContentItemId = null;
+        string[] termContentItemIds = null;
+
+        if (input.Type == FluidValues.Object && input.ToObjectValue() is TaxonomyField field)
         {
-            _contentManager = contentManager;
+            taxonomyContentItemId = field.TaxonomyContentItemId;
+            termContentItemIds = field.TermContentItemIds;
         }
-
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+        else if (input.Type == FluidValues.Object
+            && input.ToObjectValue() is JsonObject jobj
+            && jobj.ContainsKey(nameof(TaxonomyField.TermContentItemIds))
+            && jobj.ContainsKey(nameof(TaxonomyField.TaxonomyContentItemId)))
+        {
+            taxonomyContentItemId = jobj["TaxonomyContentItemId"].Value<string>();
+            termContentItemIds = jobj["TermContentItemIds"].Values<string>().ToArray();
+        }
+        else if (input.Type == FluidValues.Array)
+        {
+            taxonomyContentItemId = arguments.At(0).ToStringValue();
+            termContentItemIds = input.Enumerate(ctx).Select(x => x.ToStringValue()).ToArray();
+        }
+        else
         {
-            string taxonomyContentItemId = null;
-            string[] termContentItemIds = null;
+            return NilValue.Instance;
+        }
 
-            if (input.Type == FluidValues.Object && input.ToObjectValue() is TaxonomyField field)
-            {
-                taxonomyContentItemId = field.TaxonomyContentItemId;
-                termContentItemIds = field.TermContentItemIds;
-            }
-            else if (input.Type == FluidValues.Object
-                && input.ToObjectValue() is JsonObject jobj
-                && jobj.ContainsKey(nameof(TaxonomyField.TermContentItemIds))
-                && jobj.ContainsKey(nameof(TaxonomyField.TaxonomyContentItemId)))
-            {
-                taxonomyContentItemId = jobj["TaxonomyContentItemId"].Value<string>();
-                termContentItemIds = jobj["TermContentItemIds"].Values<string>().ToArray();
-            }
-            else if (input.Type == FluidValues.Array)
-            {
-                taxonomyContentItemId = arguments.At(0).ToStringValue();
-                termContentItemIds = input.Enumerate(ctx).Select(x => x.ToStringValue()).ToArray();
-            }
-            else
-            {
-                return NilValue.Instance;
-            }
+        var taxonomy = await _contentManager.GetAsync(taxonomyContentItemId);
 
-            var taxonomy = await _contentManager.GetAsync(taxonomyContentItemId);
+        if (taxonomy == null)
+        {
+            return null;
+        }
 
-            if (taxonomy == null)
-            {
-                return null;
-            }
+        var terms = new List<ContentItem>();
 
-            var terms = new List<ContentItem>();
+        foreach (var termContentItemId in termContentItemIds)
+        {
+            var term = TaxonomyOrchardHelperExtensions.FindTerm(
+                (JsonArray)taxonomy.Content["TaxonomyPart"]["Terms"],
+                termContentItemId);
 
-            foreach (var termContentItemId in termContentItemIds)
+            if (term is not null)
             {
-                var term = TaxonomyOrchardHelperExtensions.FindTerm(
-                    (JsonArray)taxonomy.Content["TaxonomyPart"]["Terms"],
-                    termContentItemId);
-
-                if (term is not null)
-                {
-                    terms.Add(term);
-                }
+                terms.Add(term);
             }
-
-            return FluidValue.Create(terms, ctx.Options);
         }
+
+        return FluidValue.Create(terms, ctx.Options);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Migrations.cs
index 8de9361f9e3..114bce3e873 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Migrations.cs
@@ -8,175 +8,174 @@
 using OrchardCore.Taxonomies.Settings;
 using YesSql.Sql;
 
-namespace OrchardCore.Taxonomies
+namespace OrchardCore.Taxonomies;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+
+    public Migrations(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
+
+    public async Task<int> CreateAsync()
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-
-        public Migrations(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
-
-        public async Task<int> CreateAsync()
-        {
-            await _contentDefinitionManager.AlterTypeDefinitionAsync("Taxonomy", taxonomy => taxonomy
-                .Draftable()
-                .Versionable()
-                .Creatable()
-                .Listable()
-                .WithPart("TitlePart", part => part.WithPosition("1"))
-                .WithPart("AliasPart", part => part
-                    .WithPosition("2")
-                    .WithSettings(new AliasPartSettings
-                    {
-                        Pattern = "{{ Model.ContentItem | display_text | slugify }}"
-                    }))
-                .WithPart("AutoroutePart", part => part
-                    .WithPosition("3")
-                    .WithSettings(new AutoroutePartSettings
-                    {
-                        Pattern = "{{ Model.ContentItem | display_text | slugify }}",
-                        AllowRouteContainedItems = true
-                    }))
-                .WithPart("TaxonomyPart", part => part.WithPosition("4"))
-            );
-
-            await SchemaBuilder.CreateMapIndexTableAsync<TaxonomyIndex>(table => table
-                .Column<string>("TaxonomyContentItemId", c => c.WithLength(26))
-                .Column<string>("ContentItemId", c => c.WithLength(26))
-                .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
-                .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
-                .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
-                .Column<string>("TermContentItemId", column => column.WithLength(26))
-                .Column<bool>("Published", c => c.WithDefault(true))
-                .Column<bool>("Latest", c => c.WithDefault(false))
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<TaxonomyIndex>(table => table
-                .CreateIndex("IDX_TaxonomyIndex_DocumentId",
-                    "DocumentId",
-                    "TaxonomyContentItemId",
-                    "ContentItemId",
-                    "TermContentItemId",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<TaxonomyIndex>(table => table
-                .CreateIndex("IDX_TaxonomyIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
-
-            // Shortcut other migration steps on new content definition schemas.
-            return 5;
-        }
-
-        // Migrate FieldSettings. This only needs to run on old content definition schemas.
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom1Async()
-        {
-            await _contentDefinitionManager.MigrateFieldSettingsAsync<TaxonomyField, TaxonomyFieldSettings>();
-            return 2;
-        }
-
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom2Async()
-        {
-            await _contentDefinitionManager.AlterTypeDefinitionAsync("Taxonomy", taxonomy => taxonomy
-                .WithPart("AutoroutePart", part => part
-                    .WithPosition("3")
-                    .WithSettings(new AutoroutePartSettings
-                    {
-                        Pattern = "{{ Model.ContentItem | display_text | slugify }}",
-                        AllowRouteContainedItems = true
-                    }))
-                .WithPart("TaxonomyPart", part => part.WithPosition("4"))
-            );
-
-            return 3;
-        }
-
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom3Async()
-        {
-            // This step has been updated to also add these new columns.
-            await SchemaBuilder.AlterIndexTableAsync<TaxonomyIndex>(table => table
-                .AddColumn<bool>("Published", c => c.WithDefault(true))
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<TaxonomyIndex>(table => table
-                .AddColumn<bool>("Latest", c => c.WithDefault(false))
-            );
-
-            // So that the new indexes can be fully created.
-            await SchemaBuilder.AlterIndexTableAsync<TaxonomyIndex>(table => table
-                .CreateIndex("IDX_TaxonomyIndex_DocumentId",
-                    "DocumentId",
-                    "TaxonomyContentItemId",
-                    "ContentItemId",
-                    "TermContentItemId",
-                    "Published",
-                    "Latest")
-            );
-
-            // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
-            // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
-            await SchemaBuilder.AlterIndexTableAsync<TaxonomyIndex>(table => table
-                .CreateIndex("IDX_TaxonomyIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType(254)",
-                    "ContentPart(254)",
-                    "ContentField(254)",
-                    "Published",
-                    "Latest")
-            );
-
-            // We then shortcut the next migration step.
-            return 5;
-        }
-
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom4Async()
-        {
-            // This step run only if the previous one was executed before
-            // it was updated, so here we also add the following columns.
-            await SchemaBuilder.AlterIndexTableAsync<TaxonomyIndex>(table => table
-                .AddColumn<bool>("Published", c => c.WithDefault(true))
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<TaxonomyIndex>(table => table
-                .AddColumn<bool>("Latest", c => c.WithDefault(false))
-            );
-
-            // But we create a separate index for these new columns.
-            await SchemaBuilder.AlterIndexTableAsync<TaxonomyIndex>(table => table
-                .CreateIndex("IDX_TaxonomyIndex_DocumentId_Published",
-                    "DocumentId",
-                    "Published",
-                    "Latest")
-            );
-
-            return 5;
-        }
+        await _contentDefinitionManager.AlterTypeDefinitionAsync("Taxonomy", taxonomy => taxonomy
+            .Draftable()
+            .Versionable()
+            .Creatable()
+            .Listable()
+            .WithPart("TitlePart", part => part.WithPosition("1"))
+            .WithPart("AliasPart", part => part
+                .WithPosition("2")
+                .WithSettings(new AliasPartSettings
+                {
+                    Pattern = "{{ Model.ContentItem | display_text | slugify }}"
+                }))
+            .WithPart("AutoroutePart", part => part
+                .WithPosition("3")
+                .WithSettings(new AutoroutePartSettings
+                {
+                    Pattern = "{{ Model.ContentItem | display_text | slugify }}",
+                    AllowRouteContainedItems = true
+                }))
+            .WithPart("TaxonomyPart", part => part.WithPosition("4"))
+        );
+
+        await SchemaBuilder.CreateMapIndexTableAsync<TaxonomyIndex>(table => table
+            .Column<string>("TaxonomyContentItemId", c => c.WithLength(26))
+            .Column<string>("ContentItemId", c => c.WithLength(26))
+            .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
+            .Column<string>("ContentPart", column => column.WithLength(ContentItemIndex.MaxContentPartSize))
+            .Column<string>("ContentField", column => column.WithLength(ContentItemIndex.MaxContentFieldSize))
+            .Column<string>("TermContentItemId", column => column.WithLength(26))
+            .Column<bool>("Published", c => c.WithDefault(true))
+            .Column<bool>("Latest", c => c.WithDefault(false))
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<TaxonomyIndex>(table => table
+            .CreateIndex("IDX_TaxonomyIndex_DocumentId",
+                "DocumentId",
+                "TaxonomyContentItemId",
+                "ContentItemId",
+                "TermContentItemId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<TaxonomyIndex>(table => table
+            .CreateIndex("IDX_TaxonomyIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        // Shortcut other migration steps on new content definition schemas.
+        return 5;
     }
 
-    internal sealed class AliasPartSettings
+    // Migrate FieldSettings. This only needs to run on old content definition schemas.
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom1Async()
     {
-        public string Pattern { get; set; }
+        await _contentDefinitionManager.MigrateFieldSettingsAsync<TaxonomyField, TaxonomyFieldSettings>();
+        return 2;
     }
 
-    internal sealed class AutoroutePartSettings
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom2Async()
     {
-        public string Pattern { get; set; }
-        public bool AllowRouteContainedItems { get; set; }
+        await _contentDefinitionManager.AlterTypeDefinitionAsync("Taxonomy", taxonomy => taxonomy
+            .WithPart("AutoroutePart", part => part
+                .WithPosition("3")
+                .WithSettings(new AutoroutePartSettings
+                {
+                    Pattern = "{{ Model.ContentItem | display_text | slugify }}",
+                    AllowRouteContainedItems = true
+                }))
+            .WithPart("TaxonomyPart", part => part.WithPosition("4"))
+        );
+
+        return 3;
     }
+
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom3Async()
+    {
+        // This step has been updated to also add these new columns.
+        await SchemaBuilder.AlterIndexTableAsync<TaxonomyIndex>(table => table
+            .AddColumn<bool>("Published", c => c.WithDefault(true))
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<TaxonomyIndex>(table => table
+            .AddColumn<bool>("Latest", c => c.WithDefault(false))
+        );
+
+        // So that the new indexes can be fully created.
+        await SchemaBuilder.AlterIndexTableAsync<TaxonomyIndex>(table => table
+            .CreateIndex("IDX_TaxonomyIndex_DocumentId",
+                "DocumentId",
+                "TaxonomyContentItemId",
+                "ContentItemId",
+                "TermContentItemId",
+                "Published",
+                "Latest")
+        );
+
+        // The index in MySQL can accommodate up to 768 characters or 3072 bytes.
+        // DocumentId (2) + ContentType (254) + ContentPart (254) + ContentField (254) + Published and Latest (1) = 765 (< 768).
+        await SchemaBuilder.AlterIndexTableAsync<TaxonomyIndex>(table => table
+            .CreateIndex("IDX_TaxonomyIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType(254)",
+                "ContentPart(254)",
+                "ContentField(254)",
+                "Published",
+                "Latest")
+        );
+
+        // We then shortcut the next migration step.
+        return 5;
+    }
+
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom4Async()
+    {
+        // This step run only if the previous one was executed before
+        // it was updated, so here we also add the following columns.
+        await SchemaBuilder.AlterIndexTableAsync<TaxonomyIndex>(table => table
+            .AddColumn<bool>("Published", c => c.WithDefault(true))
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<TaxonomyIndex>(table => table
+            .AddColumn<bool>("Latest", c => c.WithDefault(false))
+        );
+
+        // But we create a separate index for these new columns.
+        await SchemaBuilder.AlterIndexTableAsync<TaxonomyIndex>(table => table
+            .CreateIndex("IDX_TaxonomyIndex_DocumentId_Published",
+                "DocumentId",
+                "Published",
+                "Latest")
+        );
+
+        return 5;
+    }
+}
+
+internal sealed class AliasPartSettings
+{
+    public string Pattern { get; set; }
+}
+
+internal sealed class AutoroutePartSettings
+{
+    public string Pattern { get; set; }
+    public bool AllowRouteContainedItems { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Models/TaxonomyPart.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Models/TaxonomyPart.cs
index 905248df884..d5bd6fceaf1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Models/TaxonomyPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Models/TaxonomyPart.cs
@@ -1,12 +1,11 @@
 using System.Collections.Generic;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Taxonomies.Models
+namespace OrchardCore.Taxonomies.Models;
+
+// This part is added automatically to all taxonomies
+public class TaxonomyPart : ContentPart
 {
-    // This part is added automatically to all taxonomies
-    public class TaxonomyPart : ContentPart
-    {
-        public string TermContentType { get; set; }
-        public List<ContentItem> Terms { get; set; } = [];
-    }
+    public string TermContentType { get; set; }
+    public List<ContentItem> Terms { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Models/TermPart.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Models/TermPart.cs
index 796bb8f7fc6..a36030164ea 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Models/TermPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Models/TermPart.cs
@@ -1,10 +1,9 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Taxonomies.Models
+namespace OrchardCore.Taxonomies.Models;
+
+// This part is added automatically to all terms
+public class TermPart : ContentPart
 {
-    // This part is added automatically to all terms
-    public class TermPart : ContentPart
-    {
-        public string TaxonomyContentItemId { get; set; }
-    }
+    public string TaxonomyContentItemId { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Services/TaxonomyContentsAdminListFilter.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Services/TaxonomyContentsAdminListFilter.cs
index 922cdda0e65..3398e1ad3e0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Services/TaxonomyContentsAdminListFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Services/TaxonomyContentsAdminListFilter.cs
@@ -10,45 +10,44 @@
 using OrchardCore.Taxonomies.ViewModels;
 using YesSql;
 
-namespace OrchardCore.Taxonomies.Services
+namespace OrchardCore.Taxonomies.Services;
+
+// TODO Create a Terms Index independent of the standard index, which can index taxonomy terms by their display text
+// Refer https://github.com/OrchardCMS/OrchardCore/issues/5214
+// This could then be migrated to use the filter parser.
+public class TaxonomyContentsAdminListFilter : IContentsAdminListFilter
 {
-    // TODO Create a Terms Index independent of the standard index, which can index taxonomy terms by their display text
-    // Refer https://github.com/OrchardCMS/OrchardCore/issues/5214
-    // This could then be migrated to use the filter parser.
-    public class TaxonomyContentsAdminListFilter : IContentsAdminListFilter
+    private readonly ISiteService _siteService;
+
+    public TaxonomyContentsAdminListFilter(ISiteService siteService)
     {
-        private readonly ISiteService _siteService;
+        _siteService = siteService;
+    }
 
-        public TaxonomyContentsAdminListFilter(ISiteService siteService)
+    public async Task FilterAsync(ContentOptionsViewModel model, IQuery<ContentItem> query, IUpdateModel updater)
+    {
+        var settings = await _siteService.GetSettingsAsync<TaxonomyContentsAdminListSettings>();
+        foreach (var contentItemId in settings.TaxonomyContentItemIds)
         {
-            _siteService = siteService;
-        }
+            var viewModel = new TaxonomyContentsAdminFilterViewModel();
+            await updater.TryUpdateModelAsync(viewModel, "Taxonomy" + contentItemId);
 
-        public async Task FilterAsync(ContentOptionsViewModel model, IQuery<ContentItem> query, IUpdateModel updater)
-        {
-            var settings = await _siteService.GetSettingsAsync<TaxonomyContentsAdminListSettings>();
-            foreach (var contentItemId in settings.TaxonomyContentItemIds)
+            // Show all items categorized by the taxonomy
+            if (!string.IsNullOrEmpty(viewModel.SelectedContentItemId))
             {
-                var viewModel = new TaxonomyContentsAdminFilterViewModel();
-                await updater.TryUpdateModelAsync(viewModel, "Taxonomy" + contentItemId);
-
-                // Show all items categorized by the taxonomy
-                if (!string.IsNullOrEmpty(viewModel.SelectedContentItemId))
+                if (viewModel.SelectedContentItemId.StartsWith("Taxonomy:", StringComparison.OrdinalIgnoreCase))
+                {
+                    viewModel.SelectedContentItemId = viewModel.SelectedContentItemId[9..];
+                    query.All(
+                        x => query.With<TaxonomyIndex>(x => x.TaxonomyContentItemId == viewModel.SelectedContentItemId)
+                    );
+                }
+                else if (viewModel.SelectedContentItemId.StartsWith("Term:", StringComparison.OrdinalIgnoreCase))
                 {
-                    if (viewModel.SelectedContentItemId.StartsWith("Taxonomy:", StringComparison.OrdinalIgnoreCase))
-                    {
-                        viewModel.SelectedContentItemId = viewModel.SelectedContentItemId[9..];
-                        query.All(
-                            x => query.With<TaxonomyIndex>(x => x.TaxonomyContentItemId == viewModel.SelectedContentItemId)
-                        );
-                    }
-                    else if (viewModel.SelectedContentItemId.StartsWith("Term:", StringComparison.OrdinalIgnoreCase))
-                    {
-                        viewModel.SelectedContentItemId = viewModel.SelectedContentItemId[5..];
-                        query.All(
-                            x => query.With<TaxonomyIndex>(x => x.TermContentItemId == viewModel.SelectedContentItemId)
-                        );
-                    }
+                    viewModel.SelectedContentItemId = viewModel.SelectedContentItemId[5..];
+                    query.All(
+                        x => query.With<TaxonomyIndex>(x => x.TermContentItemId == viewModel.SelectedContentItemId)
+                    );
                 }
             }
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyContentsAdminListSettings.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyContentsAdminListSettings.cs
index b48bd93141e..d64e6a98a2e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyContentsAdminListSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyContentsAdminListSettings.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Taxonomies.Settings
+namespace OrchardCore.Taxonomies.Settings;
+
+public class TaxonomyContentsAdminListSettings
 {
-    public class TaxonomyContentsAdminListSettings
-    {
-        public string[] TaxonomyContentItemIds { get; set; } = [];
-    }
+    public string[] TaxonomyContentItemIds { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyContentsAdminListSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyContentsAdminListSettingsDisplayDriver.cs
index f6a76d68360..92f4cd1e069 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyContentsAdminListSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyContentsAdminListSettingsDisplayDriver.cs
@@ -12,62 +12,61 @@
 using OrchardCore.Taxonomies.ViewModels;
 using YesSql;
 
-namespace OrchardCore.Taxonomies.Settings
+namespace OrchardCore.Taxonomies.Settings;
+
+public sealed class TaxonomyContentsAdminListSettingsDisplayDriver : SiteDisplayDriver<TaxonomyContentsAdminListSettings>
 {
-    public sealed class TaxonomyContentsAdminListSettingsDisplayDriver : SiteDisplayDriver<TaxonomyContentsAdminListSettings>
+    public const string GroupId = "taxonomyContentsAdminList";
+
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly YesSql.ISession _session;
+
+    public TaxonomyContentsAdminListSettingsDisplayDriver(
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService,
+        YesSql.ISession session)
     {
-        public const string GroupId = "taxonomyContentsAdminList";
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+        _session = session;
+    }
 
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly YesSql.ISession _session;
+    protected override string SettingsGroupId
+        => GroupId;
 
-        public TaxonomyContentsAdminListSettingsDisplayDriver(
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService,
-            YesSql.ISession session)
+    public override async Task<IDisplayResult> EditAsync(ISite site, TaxonomyContentsAdminListSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageTaxonomies))
         {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-            _session = session;
+            return null;
         }
 
-        protected override string SettingsGroupId
-            => GroupId;
+        var taxonomies = await _session.Query<ContentItem, ContentItemIndex>(q => q.ContentType == "Taxonomy" && q.Published).ListAsync();
 
-        public override async Task<IDisplayResult> EditAsync(ISite site, TaxonomyContentsAdminListSettings settings, BuildEditorContext context)
+        var entries = taxonomies.Select(x => new TaxonomyEntry
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageTaxonomies))
-            {
-                return null;
-            }
-
-            var taxonomies = await _session.Query<ContentItem, ContentItemIndex>(q => q.ContentType == "Taxonomy" && q.Published).ListAsync();
-
-            var entries = taxonomies.Select(x => new TaxonomyEntry
-            {
-                DisplayText = x.DisplayText,
-                ContentItemId = x.ContentItemId,
-                IsChecked = settings.TaxonomyContentItemIds.Any(id => string.Equals(x.ContentItemId, id, StringComparison.OrdinalIgnoreCase))
-            }).ToArray();
+            DisplayText = x.DisplayText,
+            ContentItemId = x.ContentItemId,
+            IsChecked = settings.TaxonomyContentItemIds.Any(id => string.Equals(x.ContentItemId, id, StringComparison.OrdinalIgnoreCase))
+        }).ToArray();
 
-            return Initialize<TaxonomyContentsAdminListSettingsViewModel>("TaxonomyContentsAdminListSettings_Edit", model =>
-            {
-                model.TaxonomyEntries = entries;
-            }).Location("Content:2")
-            .OnGroup(SettingsGroupId);
-        }
-
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, TaxonomyContentsAdminListSettings settings, UpdateEditorContext context)
+        return Initialize<TaxonomyContentsAdminListSettingsViewModel>("TaxonomyContentsAdminListSettings_Edit", model =>
         {
-            var model = new TaxonomyContentsAdminListSettingsViewModel();
+            model.TaxonomyEntries = entries;
+        }).Location("Content:2")
+        .OnGroup(SettingsGroupId);
+    }
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, TaxonomyContentsAdminListSettings settings, UpdateEditorContext context)
+    {
+        var model = new TaxonomyContentsAdminListSettingsViewModel();
 
-            settings.TaxonomyContentItemIds = model.TaxonomyEntries.Where(e => e.IsChecked).Select(e => e.ContentItemId).ToArray();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            return await EditAsync(site, settings, context);
-        }
+        settings.TaxonomyContentItemIds = model.TaxonomyEntries.Where(e => e.IsChecked).Select(e => e.ContentItemId).ToArray();
+
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyFieldSettings.cs
index 9d5241afdce..29d2fc32c28 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyFieldSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyFieldSettings.cs
@@ -1,32 +1,31 @@
-namespace OrchardCore.Taxonomies.Settings
+namespace OrchardCore.Taxonomies.Settings;
+
+public class TaxonomyFieldSettings
 {
-    public class TaxonomyFieldSettings
-    {
-        public string Hint { get; set; }
+    public string Hint { get; set; }
 
-        /// <summary>
-        /// Whether a selection is required.
-        /// </summary>
-        public bool Required { get; set; }
+    /// <summary>
+    /// Whether a selection is required.
+    /// </summary>
+    public bool Required { get; set; }
 
-        /// <summary>
-        /// The content item id of the taxonomy to choose from.
-        /// </summary>
-        public string TaxonomyContentItemId { get; set; }
+    /// <summary>
+    /// The content item id of the taxonomy to choose from.
+    /// </summary>
+    public string TaxonomyContentItemId { get; set; }
 
-        /// <summary>
-        /// Whether the user can select only one term or not.
-        /// </summary>
-        public bool Unique { get; set; }
+    /// <summary>
+    /// Whether the user can select only one term or not.
+    /// </summary>
+    public bool Unique { get; set; }
 
-        /// <summary>
-        /// Whether the user can only select leaves in the taxonomy.
-        /// </summary>
-        public bool LeavesOnly { get; set; }
+    /// <summary>
+    /// Whether the user can only select leaves in the taxonomy.
+    /// </summary>
+    public bool LeavesOnly { get; set; }
 
-        /// <summary>
-        /// Whether the field allows the user to add new Terms to the taxonomy (similar to tags).
-        /// </summary>
-        public bool Open { get; set; }
-    }
+    /// <summary>
+    /// Whether the field allows the user to add new Terms to the taxonomy (similar to tags).
+    /// </summary>
+    public bool Open { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyFieldSettingsDriver.cs
index af748ab2b87..59e5c6e1de0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyFieldSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyFieldSettingsDriver.cs
@@ -6,34 +6,33 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Taxonomies.Fields;
 
-namespace OrchardCore.Taxonomies.Settings
+namespace OrchardCore.Taxonomies.Settings;
+
+public sealed class TaxonomyFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<TaxonomyField>
 {
-    public sealed class TaxonomyFieldSettingsDriver : ContentPartFieldDefinitionDisplayDriver<TaxonomyField>
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+        return Initialize<TaxonomyFieldSettings>("TaxonomyFieldSettings_Edit", model =>
         {
-            return Initialize<TaxonomyFieldSettings>("TaxonomyFieldSettings_Edit", model =>
-            {
-                var settings = partFieldDefinition.Settings.ToObject<TaxonomyFieldSettings>();
+            var settings = partFieldDefinition.Settings.ToObject<TaxonomyFieldSettings>();
 
-                model.Hint = settings.Hint;
-                model.Required = settings.Required;
-                model.TaxonomyContentItemId = settings.TaxonomyContentItemId;
-                model.Unique = settings.Unique;
-                model.LeavesOnly = settings.LeavesOnly;
-                model.Open = settings.Open;
-            }).Location("Content");
-        }
+            model.Hint = settings.Hint;
+            model.Required = settings.Required;
+            model.TaxonomyContentItemId = settings.TaxonomyContentItemId;
+            model.Unique = settings.Unique;
+            model.LeavesOnly = settings.LeavesOnly;
+            model.Open = settings.Open;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
-        {
-            var model = new TaxonomyFieldSettings();
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        var model = new TaxonomyFieldSettings();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            context.Builder.WithSettings(model);
+        context.Builder.WithSettings(model);
 
-            return await EditAsync(partFieldDefinition, context);
-        }
+        return await EditAsync(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyFieldTagsEditorSettings.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyFieldTagsEditorSettings.cs
index 9a823efb3d4..afac90d0213 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyFieldTagsEditorSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyFieldTagsEditorSettings.cs
@@ -1,17 +1,16 @@
 using System.ComponentModel;
 
-namespace OrchardCore.Taxonomies.Settings
+namespace OrchardCore.Taxonomies.Settings;
+
+/// <summary>
+/// When transitioning a tag to a taxonomy editor these settings will need to be reset.
+/// </summary>
+// Despite being similar settings, we want different defaults when creating a tag editor.
+public class TaxonomyFieldTagsEditorSettings
 {
     /// <summary>
-    /// When transitioning a tag to a taxonomy editor these settings will need to be reset.
+    /// Whether the field allows the user to add new tags to the taxonomy.
     /// </summary>
-    // Despite being similar settings, we want different defaults when creating a tag editor.
-    public class TaxonomyFieldTagsEditorSettings
-    {
-        /// <summary>
-        /// Whether the field allows the user to add new tags to the taxonomy.
-        /// </summary>
-        [DefaultValue(true)]
-        public bool Open { get; set; } = true;
-    }
+    [DefaultValue(true)]
+    public bool Open { get; set; } = true;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyFieldTagsEditorSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyFieldTagsEditorSettingsDriver.cs
index e5b88d45d56..a3a67a3ea9f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyFieldTagsEditorSettingsDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyFieldTagsEditorSettingsDriver.cs
@@ -6,32 +6,31 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Taxonomies.Fields;
 
-namespace OrchardCore.Taxonomies.Settings
+namespace OrchardCore.Taxonomies.Settings;
+
+public sealed class TaxonomyFieldTagsEditorSettingsDriver : ContentPartFieldDefinitionDisplayDriver<TaxonomyField>
 {
-    public sealed class TaxonomyFieldTagsEditorSettingsDriver : ContentPartFieldDefinitionDisplayDriver<TaxonomyField>
+    public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+        return Initialize<TaxonomyFieldTagsEditorSettings>("TaxonomyFieldTagsEditorSettings_Edit", model =>
         {
-            return Initialize<TaxonomyFieldTagsEditorSettings>("TaxonomyFieldTagsEditorSettings_Edit", model =>
-            {
-                var settings = partFieldDefinition.Settings.ToObject<TaxonomyFieldTagsEditorSettings>();
+            var settings = partFieldDefinition.Settings.ToObject<TaxonomyFieldTagsEditorSettings>();
 
-                model.Open = settings.Open;
-            }).Location("Content");
-        }
+            model.Open = settings.Open;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)
+    {
+        if (partFieldDefinition.Editor() == "Tags")
         {
-            if (partFieldDefinition.Editor() == "Tags")
-            {
-                var model = new TaxonomyFieldTagsEditorSettings();
-
-                await context.Updater.TryUpdateModelAsync(model, Prefix);
+            var model = new TaxonomyFieldTagsEditorSettings();
 
-                context.Builder.WithSettings(model);
-            }
+            await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            return Edit(partFieldDefinition, context);
+            context.Builder.WithSettings(model);
         }
+
+        return Edit(partFieldDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Startup.cs
index 16afbbb3819..12bd93bce60 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Startup.cs
@@ -30,85 +30,84 @@
 using OrchardCore.Taxonomies.Settings;
 using OrchardCore.Taxonomies.ViewModels;
 
-namespace OrchardCore.Taxonomies
+namespace OrchardCore.Taxonomies;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<TaxonomyField>();
-                o.MemberAccessStrategy.Register<TaxonomyPartViewModel>();
-                o.MemberAccessStrategy.Register<TermPartViewModel>();
-                o.MemberAccessStrategy.Register<DisplayTaxonomyFieldViewModel>();
-                o.MemberAccessStrategy.Register<DisplayTaxonomyFieldTagsViewModel>();
-            })
-            .AddLiquidFilter<InheritedTermsFilter>("inherited_terms")
-            .AddLiquidFilter<TaxonomyTermsFilter>("taxonomy_terms");
+            o.MemberAccessStrategy.Register<TaxonomyField>();
+            o.MemberAccessStrategy.Register<TaxonomyPartViewModel>();
+            o.MemberAccessStrategy.Register<TermPartViewModel>();
+            o.MemberAccessStrategy.Register<DisplayTaxonomyFieldViewModel>();
+            o.MemberAccessStrategy.Register<DisplayTaxonomyFieldTagsViewModel>();
+        })
+        .AddLiquidFilter<InheritedTermsFilter>("inherited_terms")
+        .AddLiquidFilter<TaxonomyTermsFilter>("taxonomy_terms");
 
-            services.AddDataMigration<Migrations>();
-            services.AddScoped<IShapeTableProvider, TermShapes>();
-            services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddDataMigration<Migrations>();
+        services.AddScoped<IShapeTableProvider, TermShapes>();
+        services.AddScoped<IPermissionProvider, Permissions>();
 
-            // Taxonomy Part
-            services.AddContentPart<TaxonomyPart>()
-                .UseDisplayDriver<TaxonomyPartDisplayDriver>()
-                .AddHandler<TaxonomyPartHandler>();
+        // Taxonomy Part
+        services.AddContentPart<TaxonomyPart>()
+            .UseDisplayDriver<TaxonomyPartDisplayDriver>()
+            .AddHandler<TaxonomyPartHandler>();
 
-            // Taxonomy Field
-            services.AddContentField<TaxonomyField>()
-                .UseDisplayDriver<TaxonomyFieldDisplayDriver>(d => !string.Equals(d, "Tags", StringComparison.OrdinalIgnoreCase))
-                .AddHandler<TaxonomyFieldHandler>();
+        // Taxonomy Field
+        services.AddContentField<TaxonomyField>()
+            .UseDisplayDriver<TaxonomyFieldDisplayDriver>(d => !string.Equals(d, "Tags", StringComparison.OrdinalIgnoreCase))
+            .AddHandler<TaxonomyFieldHandler>();
 
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, TaxonomyFieldSettingsDriver>();
-            services.AddScoped<IContentFieldIndexHandler, TaxonomyFieldIndexHandler>();
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, TaxonomyFieldSettingsDriver>();
+        services.AddScoped<IContentFieldIndexHandler, TaxonomyFieldIndexHandler>();
 
-            // Taxonomy Tags Display Mode and Editor.
-            services.AddContentField<TaxonomyField>()
-                .UseDisplayDriver<TaxonomyFieldTagsDisplayDriver>(d => string.Equals(d, "Tags", StringComparison.OrdinalIgnoreCase));
+        // Taxonomy Tags Display Mode and Editor.
+        services.AddContentField<TaxonomyField>()
+            .UseDisplayDriver<TaxonomyFieldTagsDisplayDriver>(d => string.Equals(d, "Tags", StringComparison.OrdinalIgnoreCase));
 
-            services.AddScoped<IContentPartFieldDefinitionDisplayDriver, TaxonomyFieldTagsEditorSettingsDriver>();
+        services.AddScoped<IContentPartFieldDefinitionDisplayDriver, TaxonomyFieldTagsEditorSettingsDriver>();
 
-            services.AddScopedIndexProvider<TaxonomyIndexProvider>();
+        services.AddScopedIndexProvider<TaxonomyIndexProvider>();
 
-            // Terms.
-            services.AddContentPart<TermPart>();
-            services.AddScoped<IContentHandler, TermPartContentHandler>();
-            services.AddScoped<IContentDisplayDriver, TermPartContentDriver>();
-        }
+        // Terms.
+        services.AddContentPart<TermPart>();
+        services.AddScoped<IContentHandler, TermPartContentHandler>();
+        services.AddScoped<IContentDisplayDriver, TermPartContentDriver>();
     }
+}
 
-    [Feature("OrchardCore.Taxonomies.ContentsAdminList")]
-    public sealed class ContentsAdminListStartup : StartupBase
+[Feature("OrchardCore.Taxonomies.ContentsAdminList")]
+public sealed class ContentsAdminListStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IContentsAdminListFilter, TaxonomyContentsAdminListFilter>();
-            services.AddScoped<IDisplayDriver<ContentOptionsViewModel>, TaxonomyContentsAdminListDisplayDriver>();
+        services.AddScoped<IContentsAdminListFilter, TaxonomyContentsAdminListFilter>();
+        services.AddScoped<IDisplayDriver<ContentOptionsViewModel>, TaxonomyContentsAdminListDisplayDriver>();
 
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IDisplayDriver<ISite>, TaxonomyContentsAdminListSettingsDisplayDriver>();
-        }
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IDisplayDriver<ISite>, TaxonomyContentsAdminListSettingsDisplayDriver>();
     }
+}
 
-    [Feature("OrchardCore.Taxonomies.ContentsAdminList")]
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class ContentsAdminListDeploymentStartup : StartupBase
+[Feature("OrchardCore.Taxonomies.ContentsAdminList")]
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class ContentsAdminListDeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSiteSettingsPropertyDeploymentStep<TaxonomyContentsAdminListSettings, ContentsAdminListDeploymentStartup>(S => S["Taxonomy Filters settings"], S => S["Exports the Taxonomy filters settings."]);
-        }
+        services.AddSiteSettingsPropertyDeploymentStep<TaxonomyContentsAdminListSettings, ContentsAdminListDeploymentStartup>(S => S["Taxonomy Filters settings"], S => S["Exports the Taxonomy filters settings."]);
     }
+}
 
-    [RequireFeatures("OrchardCore.Apis.GraphQL")]
-    public sealed class GraphQLStartup : StartupBase
+[RequireFeatures("OrchardCore.Apis.GraphQL")]
+public sealed class GraphQLStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddObjectGraphType<TaxonomyPart, TaxonomyPartQueryObjectType>();
-            services.AddObjectGraphType<TaxonomyField, TaxonomyFieldQueryObjectType>();
-        }
+        services.AddObjectGraphType<TaxonomyPart, TaxonomyPartQueryObjectType>();
+        services.AddObjectGraphType<TaxonomyField, TaxonomyFieldQueryObjectType>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/TermShapes.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/TermShapes.cs
index bbd5edeaec5..cfce135932b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/TermShapes.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/TermShapes.cs
@@ -12,308 +12,307 @@
 using OrchardCore.Taxonomies.Models;
 using OrchardCore.Taxonomies.ViewModels;
 
-namespace OrchardCore.Taxonomies
+namespace OrchardCore.Taxonomies;
+
+public class TermShapes : ShapeTableProvider
 {
-    public class TermShapes : ShapeTableProvider
+    public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
     {
-        public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
-        {
-            // Add standard alternates to a TermPart because it is rendered by a content display driver not a part display driver.
-            builder.Describe("TermPart")
-                .OnDisplaying(context =>
+        // Add standard alternates to a TermPart because it is rendered by a content display driver not a part display driver.
+        builder.Describe("TermPart")
+            .OnDisplaying(context =>
+            {
+                var viewModel = context.Shape as TermPartViewModel;
+
+                var contentType = viewModel?.ContentItem?.ContentType;
+                var displayTypes = new[] { string.Empty, "_" + context.Shape.Metadata.DisplayType };
+
+                // [ShapeType]_[DisplayType], e.g. TermPart.Summary, TermPart.Detail.
+                context.Shape.Metadata.Alternates.Add($"TermPart_{context.Shape.Metadata.DisplayType}");
+
+                foreach (var displayType in displayTypes)
+                {
+                    // [ContentType]_[DisplayType]__[PartType], e.g. Category-TermPart, Category-TermPart.Detail.
+                    context.Shape.Metadata.Alternates.Add($"{contentType}{displayType}__TermPart");
+                }
+            });
+
+        builder.Describe("Term")
+            .OnProcessing(async context =>
+            {
+                var termShape = context.Shape;
+                var identifier = termShape.GetProperty<string>("TaxonomyContentItemId") ?? termShape.GetProperty<string>("Alias");
+
+                if (string.IsNullOrEmpty(identifier))
                 {
-                    var viewModel = context.Shape as TermPartViewModel;
+                    return;
+                }
 
-                    var contentType = viewModel?.ContentItem?.ContentType;
-                    var displayTypes = new[] { string.Empty, "_" + context.Shape.Metadata.DisplayType };
+                termShape.Classes.Add("term");
 
-                    // [ShapeType]_[DisplayType], e.g. TermPart.Summary, TermPart.Detail.
-                    context.Shape.Metadata.Alternates.Add($"TermPart_{context.Shape.Metadata.DisplayType}");
+                // Term population is executed when processing the shape so that its value
+                // can be cached. IShapeDisplayEvents is called before the ShapeDescriptor
+                // events and thus this code can be cached.
 
-                    foreach (var displayType in displayTypes)
-                    {
-                        // [ContentType]_[DisplayType]__[PartType], e.g. Category-TermPart, Category-TermPart.Detail.
-                        context.Shape.Metadata.Alternates.Add($"{contentType}{displayType}__TermPart");
-                    }
-                });
+                var shapeFactory = context.ServiceProvider.GetRequiredService<IShapeFactory>();
+                var contentManager = context.ServiceProvider.GetRequiredService<IContentManager>();
+                var handleManager = context.ServiceProvider.GetRequiredService<IContentHandleManager>();
 
-            builder.Describe("Term")
-                .OnProcessing(async context =>
+                var taxonomyContentItemId = termShape.TryGetProperty("Alias", out object alias) && alias != null
+                    ? await handleManager.GetContentItemIdAsync(alias.ToString())
+                    : termShape.Properties["TaxonomyContentItemId"].ToString();
+
+                if (taxonomyContentItemId == null)
                 {
-                    var termShape = context.Shape;
-                    var identifier = termShape.GetProperty<string>("TaxonomyContentItemId") ?? termShape.GetProperty<string>("Alias");
+                    return;
+                }
 
-                    if (string.IsNullOrEmpty(identifier))
-                    {
-                        return;
-                    }
+                var taxonomyContentItem = await contentManager.GetAsync(taxonomyContentItemId);
 
-                    termShape.Classes.Add("term");
+                if (taxonomyContentItem == null)
+                {
+                    return;
+                }
 
-                    // Term population is executed when processing the shape so that its value
-                    // can be cached. IShapeDisplayEvents is called before the ShapeDescriptor
-                    // events and thus this code can be cached.
+                termShape.Properties["TaxonomyContentItem"] = taxonomyContentItem;
+                termShape.Properties["TaxonomyName"] = taxonomyContentItem.DisplayText;
 
-                    var shapeFactory = context.ServiceProvider.GetRequiredService<IShapeFactory>();
-                    var contentManager = context.ServiceProvider.GetRequiredService<IContentManager>();
-                    var handleManager = context.ServiceProvider.GetRequiredService<IContentHandleManager>();
+                var taxonomyPart = taxonomyContentItem.As<TaxonomyPart>();
+                if (taxonomyPart == null)
+                {
+                    return;
+                }
 
-                    var taxonomyContentItemId = termShape.TryGetProperty("Alias", out object alias) && alias != null
-                        ? await handleManager.GetContentItemIdAsync(alias.ToString())
-                        : termShape.Properties["TaxonomyContentItemId"].ToString();
+                // When a TermContentItemId is provided render the term and its child terms.
+                var level = 0;
+                List<ContentItem> termItems = null;
+                var termContentItemId = termShape.GetProperty<string>("TermContentItemId");
+                if (!string.IsNullOrEmpty(termContentItemId))
+                {
+                    level = FindTerm((JsonArray)taxonomyContentItem.Content.TaxonomyPart.Terms, termContentItemId, level, out var termContentItem);
 
-                    if (taxonomyContentItemId == null)
+                    if (termContentItem == null)
                     {
                         return;
                     }
 
-                    var taxonomyContentItem = await contentManager.GetAsync(taxonomyContentItemId);
+                    termItems =
+                    [
+                        termContentItem
+                    ];
+                }
+                else
+                {
+                    termItems = taxonomyPart.Terms;
+                }
 
-                    if (taxonomyContentItem == null)
-                    {
-                        return;
-                    }
+                if (termItems == null)
+                {
+                    return;
+                }
 
-                    termShape.Properties["TaxonomyContentItem"] = taxonomyContentItem;
-                    termShape.Properties["TaxonomyName"] = taxonomyContentItem.DisplayText;
+                var differentiator = FormatName(termShape.GetProperty<string>("TaxonomyName"));
 
-                    var taxonomyPart = taxonomyContentItem.As<TaxonomyPart>();
-                    if (taxonomyPart == null)
-                    {
-                        return;
-                    }
+                if (!string.IsNullOrEmpty(differentiator))
+                {
+                    // Term__[Differentiator] e.g. Term-Categories, Term-Tags.
+                    termShape.Metadata.Alternates.Add("Term__" + differentiator);
+                    termShape.Metadata.Differentiator = differentiator;
+                    termShape.Classes.Add(("term-" + differentiator).HtmlClassify());
+                }
 
-                    // When a TermContentItemId is provided render the term and its child terms.
-                    var level = 0;
-                    List<ContentItem> termItems = null;
-                    var termContentItemId = termShape.GetProperty<string>("TermContentItemId");
-                    if (!string.IsNullOrEmpty(termContentItemId))
-                    {
-                        level = FindTerm((JsonArray)taxonomyContentItem.Content.TaxonomyPart.Terms, termContentItemId, level, out var termContentItem);
+                termShape.Classes.Add(("term-" + taxonomyPart.TermContentType).HtmlClassify());
 
-                        if (termContentItem == null)
-                        {
-                            return;
-                        }
+                var encodedContentType = taxonomyPart.TermContentType.EncodeAlternateElement();
+                // Term__[ContentType] e.g. Term-Category, Term-Tag.
+                termShape.Metadata.Alternates.Add("Term__" + encodedContentType);
 
-                        termItems =
-                        [
-                            termContentItem
-                        ];
-                    }
-                    else
-                    {
-                        termItems = taxonomyPart.Terms;
-                    }
+                // The first level of term item shapes is created.
+                // Each other level is created when the term item is displayed.
 
-                    if (termItems == null)
+                foreach (var termContentItem in termItems)
+                {
+                    ContentItem[] childTerms = null;
+                    if (((JsonObject)termContentItem.Content)["Terms"] is JsonArray termsArray)
                     {
-                        return;
+                        childTerms = termsArray.ToObject<ContentItem[]>();
                     }
 
-                    var differentiator = FormatName(termShape.GetProperty<string>("TaxonomyName"));
-
-                    if (!string.IsNullOrEmpty(differentiator))
+                    var shape = await shapeFactory.CreateAsync("TermItem", Arguments.From(new
                     {
-                        // Term__[Differentiator] e.g. Term-Categories, Term-Tags.
-                        termShape.Metadata.Alternates.Add("Term__" + differentiator);
-                        termShape.Metadata.Differentiator = differentiator;
-                        termShape.Classes.Add(("term-" + differentiator).HtmlClassify());
-                    }
+                        Level = level,
+                        Term = termShape,
+                        TermContentItem = termContentItem,
+                        Terms = childTerms ?? [],
+                        TaxonomyContentItem = taxonomyContentItem
+                    }));
+
+                    shape.Metadata.Differentiator = differentiator;
 
-                    termShape.Classes.Add(("term-" + taxonomyPart.TermContentType).HtmlClassify());
+                    // Don't use Items.Add() or the collection won't be sorted.
+                    await termShape.AddAsync(shape);
+                }
+            });
 
-                    var encodedContentType = taxonomyPart.TermContentType.EncodeAlternateElement();
-                    // Term__[ContentType] e.g. Term-Category, Term-Tag.
-                    termShape.Metadata.Alternates.Add("Term__" + encodedContentType);
+        builder.Describe("TermItem")
+            .OnDisplaying(async context =>
+            {
+                var termItem = context.Shape;
+                var termShape = termItem.GetProperty<IShape>("Term");
+                var level = termItem.GetProperty<int>("Level");
+                var taxonomyContentItem = termItem.GetProperty<ContentItem>("TaxonomyContentItem");
+                var taxonomyPart = taxonomyContentItem.As<TaxonomyPart>();
+                var differentiator = termItem.Metadata.Differentiator;
 
-                    // The first level of term item shapes is created.
-                    // Each other level is created when the term item is displayed.
+                var shapeFactory = context.ServiceProvider.GetRequiredService<IShapeFactory>();
 
-                    foreach (var termContentItem in termItems)
+                if (termItem.GetProperty<ContentItem[]>("Terms") != null)
+                {
+                    foreach (var termContentItem in termItem.GetProperty<ContentItem[]>("Terms"))
                     {
                         ContentItem[] childTerms = null;
                         if (((JsonObject)termContentItem.Content)["Terms"] is JsonArray termsArray)
                         {
                             childTerms = termsArray.ToObject<ContentItem[]>();
                         }
-
                         var shape = await shapeFactory.CreateAsync("TermItem", Arguments.From(new
                         {
-                            Level = level,
-                            Term = termShape,
+                            Level = level + 1,
+                            TaxonomyContentItem = taxonomyContentItem,
                             TermContentItem = termContentItem,
-                            Terms = childTerms ?? [],
-                            TaxonomyContentItem = taxonomyContentItem
+                            Term = termShape,
+                            Terms = childTerms ?? []
                         }));
 
                         shape.Metadata.Differentiator = differentiator;
 
                         // Don't use Items.Add() or the collection won't be sorted.
-                        await termShape.AddAsync(shape);
-                    }
-                });
-
-            builder.Describe("TermItem")
-                .OnDisplaying(async context =>
-                {
-                    var termItem = context.Shape;
-                    var termShape = termItem.GetProperty<IShape>("Term");
-                    var level = termItem.GetProperty<int>("Level");
-                    var taxonomyContentItem = termItem.GetProperty<ContentItem>("TaxonomyContentItem");
-                    var taxonomyPart = taxonomyContentItem.As<TaxonomyPart>();
-                    var differentiator = termItem.Metadata.Differentiator;
-
-                    var shapeFactory = context.ServiceProvider.GetRequiredService<IShapeFactory>();
-
-                    if (termItem.GetProperty<ContentItem[]>("Terms") != null)
-                    {
-                        foreach (var termContentItem in termItem.GetProperty<ContentItem[]>("Terms"))
-                        {
-                            ContentItem[] childTerms = null;
-                            if (((JsonObject)termContentItem.Content)["Terms"] is JsonArray termsArray)
-                            {
-                                childTerms = termsArray.ToObject<ContentItem[]>();
-                            }
-                            var shape = await shapeFactory.CreateAsync("TermItem", Arguments.From(new
-                            {
-                                Level = level + 1,
-                                TaxonomyContentItem = taxonomyContentItem,
-                                TermContentItem = termContentItem,
-                                Term = termShape,
-                                Terms = childTerms ?? []
-                            }));
-
-                            shape.Metadata.Differentiator = differentiator;
-
-                            // Don't use Items.Add() or the collection won't be sorted.
-                            await termItem.AddAsync(shape);
-                        }
+                        await termItem.AddAsync(shape);
                     }
+                }
 
-                    var encodedContentType = taxonomyPart.TermContentType.EncodeAlternateElement();
-
-                    // TermItem__level__[level] e.g. TermItem-level-2.
-                    termItem.Metadata.Alternates.Add("TermItem__level__" + level);
+                var encodedContentType = taxonomyPart.TermContentType.EncodeAlternateElement();
 
-                    // TermItem__[ContentType] e.g. TermItem-Category
-                    // TermItem__[ContentType]__level__[level] e.g. TermItem-Category-level-2.
-                    termItem.Metadata.Alternates.Add("TermItem__" + encodedContentType);
-                    termItem.Metadata.Alternates.Add("TermItem__" + encodedContentType + "__level__" + level);
+                // TermItem__level__[level] e.g. TermItem-level-2.
+                termItem.Metadata.Alternates.Add("TermItem__level__" + level);
 
-                    if (!string.IsNullOrEmpty(differentiator))
-                    {
-                        // TermItem__[Differentiator] e.g. TermItem-Categories, TermItem-Travel.
-                        // TermItem__[Differentiator]__level__[level] e.g. TermItem-Categories-level-2.
-                        termItem.Metadata.Alternates.Add("TermItem__" + differentiator);
-                        termItem.Metadata.Alternates.Add("TermItem__" + differentiator + "__level__" + level);
-
-                        // TermItem__[Differentiator]__[ContentType] e.g. TermItem-Categories-Category.
-                        // TermItem__[Differentiator]__[ContentType]__level__[level] e.g. TermItem-Categories-Category-level-2.
-                        termItem.Metadata.Alternates.Add("TermItem__" + differentiator + "__" + encodedContentType);
-                        termItem.Metadata.Alternates.Add("TermItem__" + differentiator + "__" + encodedContentType + "__level__" + level);
-                    }
-                });
+                // TermItem__[ContentType] e.g. TermItem-Category
+                // TermItem__[ContentType]__level__[level] e.g. TermItem-Category-level-2.
+                termItem.Metadata.Alternates.Add("TermItem__" + encodedContentType);
+                termItem.Metadata.Alternates.Add("TermItem__" + encodedContentType + "__level__" + level);
 
-            builder.Describe("TermContentItem")
-                .OnDisplaying(displaying =>
+                if (!string.IsNullOrEmpty(differentiator))
                 {
-                    var termItem = displaying.Shape;
-                    var level = termItem.GetProperty<int>("Level");
-                    var differentiator = termItem.Metadata.Differentiator;
+                    // TermItem__[Differentiator] e.g. TermItem-Categories, TermItem-Travel.
+                    // TermItem__[Differentiator]__level__[level] e.g. TermItem-Categories-level-2.
+                    termItem.Metadata.Alternates.Add("TermItem__" + differentiator);
+                    termItem.Metadata.Alternates.Add("TermItem__" + differentiator + "__level__" + level);
+
+                    // TermItem__[Differentiator]__[ContentType] e.g. TermItem-Categories-Category.
+                    // TermItem__[Differentiator]__[ContentType]__level__[level] e.g. TermItem-Categories-Category-level-2.
+                    termItem.Metadata.Alternates.Add("TermItem__" + differentiator + "__" + encodedContentType);
+                    termItem.Metadata.Alternates.Add("TermItem__" + differentiator + "__" + encodedContentType + "__level__" + level);
+                }
+            });
 
-                    var termContentItem = termItem.GetProperty<ContentItem>("TermContentItem");
+        builder.Describe("TermContentItem")
+            .OnDisplaying(displaying =>
+            {
+                var termItem = displaying.Shape;
+                var level = termItem.GetProperty<int>("Level");
+                var differentiator = termItem.Metadata.Differentiator;
 
-                    var encodedContentType = termContentItem.ContentItem.ContentType.EncodeAlternateElement();
+                var termContentItem = termItem.GetProperty<ContentItem>("TermContentItem");
 
-                    termItem.Metadata.Alternates.Add("TermContentItem__level__" + level);
+                var encodedContentType = termContentItem.ContentItem.ContentType.EncodeAlternateElement();
 
-                    // TermContentItem__[ContentType] e.g. TermContentItem-Category.
-                    // TermContentItem__[ContentType]__level__[level] e.g. TermContentItem-Category-level-2.
-                    termItem.Metadata.Alternates.Add("TermContentItem__" + encodedContentType);
-                    termItem.Metadata.Alternates.Add("TermContentItem__" + encodedContentType + "__level__" + level);
+                termItem.Metadata.Alternates.Add("TermContentItem__level__" + level);
 
-                    if (!string.IsNullOrEmpty(differentiator))
-                    {
-                        // TermContentItem__[Differentiator] e.g. TermContentItem-Categories.
-                        termItem.Metadata.Alternates.Add("TermContentItem__" + differentiator);
-                        // TermContentItem__[Differentiator]__level__[level] e.g. TermContentItem-Categories-level-2.
-                        termItem.Metadata.Alternates.Add("TermContentItem__" + differentiator + "__level__" + level);
-
-                        // TermContentItem__[Differentiator]__[ContentType] e.g. TermContentItem-Categories-Category.
-                        // TermContentItem__[Differentiator]__[ContentType] e.g. TermContentItem-Categories-Category-level-2.
-                        termItem.Metadata.Alternates.Add("TermContentItem__" + differentiator + "__" + encodedContentType);
-                        termItem.Metadata.Alternates.Add("TermContentItem__" + differentiator + "__" + encodedContentType + "__level__" + level);
-                    }
-                });
+                // TermContentItem__[ContentType] e.g. TermContentItem-Category.
+                // TermContentItem__[ContentType]__level__[level] e.g. TermContentItem-Category-level-2.
+                termItem.Metadata.Alternates.Add("TermContentItem__" + encodedContentType);
+                termItem.Metadata.Alternates.Add("TermContentItem__" + encodedContentType + "__level__" + level);
 
-            return ValueTask.CompletedTask;
-        }
+                if (!string.IsNullOrEmpty(differentiator))
+                {
+                    // TermContentItem__[Differentiator] e.g. TermContentItem-Categories.
+                    termItem.Metadata.Alternates.Add("TermContentItem__" + differentiator);
+                    // TermContentItem__[Differentiator]__level__[level] e.g. TermContentItem-Categories-level-2.
+                    termItem.Metadata.Alternates.Add("TermContentItem__" + differentiator + "__level__" + level);
+
+                    // TermContentItem__[Differentiator]__[ContentType] e.g. TermContentItem-Categories-Category.
+                    // TermContentItem__[Differentiator]__[ContentType] e.g. TermContentItem-Categories-Category-level-2.
+                    termItem.Metadata.Alternates.Add("TermContentItem__" + differentiator + "__" + encodedContentType);
+                    termItem.Metadata.Alternates.Add("TermContentItem__" + differentiator + "__" + encodedContentType + "__level__" + level);
+                }
+            });
 
-        private static int FindTerm(JsonArray termsArray, string termContentItemId, int level, out ContentItem contentItem)
+        return ValueTask.CompletedTask;
+    }
+
+    private static int FindTerm(JsonArray termsArray, string termContentItemId, int level, out ContentItem contentItem)
+    {
+        foreach (var term in termsArray.Cast<JsonObject>())
         {
-            foreach (var term in termsArray.Cast<JsonObject>())
+            var contentItemId = term["ContentItemId"]?.ToString();
+            if (contentItemId == termContentItemId)
             {
-                var contentItemId = term["ContentItemId"]?.ToString();
-                if (contentItemId == termContentItemId)
-                {
-                    contentItem = term.ToObject<ContentItem>();
-                    return level;
-                }
+                contentItem = term.ToObject<ContentItem>();
+                return level;
+            }
 
-                if (term["Terms"] is JsonArray children)
-                {
-                    level += 1;
-                    level = FindTerm(children, termContentItemId, level, out var foundContentItem);
+            if (term["Terms"] is JsonArray children)
+            {
+                level += 1;
+                level = FindTerm(children, termContentItemId, level, out var foundContentItem);
 
-                    if (foundContentItem != null)
-                    {
-                        contentItem = foundContentItem;
-                        return level;
-                    }
+                if (foundContentItem != null)
+                {
+                    contentItem = foundContentItem;
+                    return level;
                 }
             }
-            contentItem = null;
+        }
+        contentItem = null;
+
+        return level;
+    }
 
-            return level;
+    /// <summary>
+    /// Converts "foo-ba r" to "FooBaR".
+    /// </summary>
+    private static string FormatName(string name)
+    {
+        if (string.IsNullOrEmpty(name))
+        {
+            return null;
         }
 
-        /// <summary>
-        /// Converts "foo-ba r" to "FooBaR".
-        /// </summary>
-        private static string FormatName(string name)
+        name = name.Trim();
+        var nextIsUpper = true;
+        var result = new StringBuilder(name.Length);
+        for (var i = 0; i < name.Length; i++)
         {
-            if (string.IsNullOrEmpty(name))
+            var c = name[i];
+
+            if (c == '-' || char.IsWhiteSpace(c))
             {
-                return null;
+                nextIsUpper = true;
+                continue;
             }
 
-            name = name.Trim();
-            var nextIsUpper = true;
-            var result = new StringBuilder(name.Length);
-            for (var i = 0; i < name.Length; i++)
+            if (nextIsUpper)
             {
-                var c = name[i];
-
-                if (c == '-' || char.IsWhiteSpace(c))
-                {
-                    nextIsUpper = true;
-                    continue;
-                }
-
-                if (nextIsUpper)
-                {
-                    result.Append(c.ToString().ToUpper());
-                }
-                else
-                {
-                    result.Append(c);
-                }
-
-                nextIsUpper = false;
+                result.Append(c.ToString().ToUpper());
+            }
+            else
+            {
+                result.Append(c);
             }
 
-            return result.ToString();
+            nextIsUpper = false;
         }
+
+        return result.ToString();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/CreatedTagViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/CreatedTagViewModel.cs
index f7ef2c4a2db..413618122ac 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/CreatedTagViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/CreatedTagViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Taxonomies.ViewModels
+namespace OrchardCore.Taxonomies.ViewModels;
+
+public class CreatedTagViewModel
 {
-    public class CreatedTagViewModel
-    {
-        public string ContentItemId { get; set; }
-        public string DisplayText { get; set; }
-    }
+    public string ContentItemId { get; set; }
+    public string DisplayText { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/DisplayTaxonomyFieldTagsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/DisplayTaxonomyFieldTagsViewModel.cs
index ab072b504ce..a617d01dd97 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/DisplayTaxonomyFieldTagsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/DisplayTaxonomyFieldTagsViewModel.cs
@@ -1,9 +1,8 @@
 using OrchardCore.Taxonomies.Fields;
 
-namespace OrchardCore.Taxonomies.ViewModels
+namespace OrchardCore.Taxonomies.ViewModels;
+
+public class DisplayTaxonomyFieldTagsViewModel : DisplayTaxonomyFieldViewModel
 {
-    public class DisplayTaxonomyFieldTagsViewModel : DisplayTaxonomyFieldViewModel
-    {
-        public string[] TagNames => Field.GetTagNames();
-    }
+    public string[] TagNames => Field.GetTagNames();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/DisplayTaxonomyFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/DisplayTaxonomyFieldViewModel.cs
index 6ae1987034c..71cfc7d560e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/DisplayTaxonomyFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/DisplayTaxonomyFieldViewModel.cs
@@ -2,14 +2,13 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Taxonomies.Fields;
 
-namespace OrchardCore.Taxonomies.ViewModels
+namespace OrchardCore.Taxonomies.ViewModels;
+
+public class DisplayTaxonomyFieldViewModel
 {
-    public class DisplayTaxonomyFieldViewModel
-    {
-        public string TaxonomyContentItemId => Field.TaxonomyContentItemId;
-        public string[] TermContentItemIds => Field.TermContentItemIds;
-        public TaxonomyField Field { get; set; }
-        public ContentPart Part { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    public string TaxonomyContentItemId => Field.TaxonomyContentItemId;
+    public string[] TermContentItemIds => Field.TermContentItemIds;
+    public TaxonomyField Field { get; set; }
+    public ContentPart Part { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/EditTagTaxonomyFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/EditTagTaxonomyFieldViewModel.cs
index 619b7116b9f..84ec303b0ad 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/EditTagTaxonomyFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/EditTagTaxonomyFieldViewModel.cs
@@ -3,33 +3,32 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Taxonomies.Fields;
 
-namespace OrchardCore.Taxonomies.ViewModels
+namespace OrchardCore.Taxonomies.ViewModels;
+
+public class EditTagTaxonomyFieldViewModel
 {
-    public class EditTagTaxonomyFieldViewModel
-    {
-        public string TermContentItemIds { get; set; }
+    public string TermContentItemIds { get; set; }
 
-        [BindNever]
-        public string TagTermEntries { get; set; }
+    [BindNever]
+    public string TagTermEntries { get; set; }
 
-        [BindNever]
-        public ContentItem Taxonomy { get; set; }
+    [BindNever]
+    public ContentItem Taxonomy { get; set; }
 
-        [BindNever]
-        public TaxonomyField Field { get; set; }
+    [BindNever]
+    public TaxonomyField Field { get; set; }
 
-        [BindNever]
-        public ContentPart Part { get; set; }
+    [BindNever]
+    public ContentPart Part { get; set; }
 
-        [BindNever]
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    [BindNever]
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
+}
 
-    public class TagTermEntry
-    {
-        public bool Selected { get; set; }
-        public string ContentItemId { get; set; }
-        public string DisplayText { get; set; }
-        public bool IsLeaf { get; set; }
-    }
+public class TagTermEntry
+{
+    public bool Selected { get; set; }
+    public string ContentItemId { get; set; }
+    public string DisplayText { get; set; }
+    public bool IsLeaf { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/EditTaxonomyFieldViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/EditTaxonomyFieldViewModel.cs
index 468075ff76a..c1d53187431 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/EditTaxonomyFieldViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/EditTaxonomyFieldViewModel.cs
@@ -4,37 +4,36 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Taxonomies.Fields;
 
-namespace OrchardCore.Taxonomies.ViewModels
+namespace OrchardCore.Taxonomies.ViewModels;
+
+public class EditTaxonomyFieldViewModel
 {
-    public class EditTaxonomyFieldViewModel
-    {
-        public string UniqueValue { get; set; }
-        public List<TermEntry> TermEntries { get; set; } = [];
+    public string UniqueValue { get; set; }
+    public List<TermEntry> TermEntries { get; set; } = [];
 
-        [BindNever]
-        public ContentItem Taxonomy { get; set; }
+    [BindNever]
+    public ContentItem Taxonomy { get; set; }
 
-        [BindNever]
-        public TaxonomyField Field { get; set; }
+    [BindNever]
+    public TaxonomyField Field { get; set; }
 
-        [BindNever]
-        public ContentPart Part { get; set; }
+    [BindNever]
+    public ContentPart Part { get; set; }
 
-        [BindNever]
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+    [BindNever]
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
+}
 
-    public class TermEntry
-    {
-        [BindNever]
-        public ContentItem Term { get; set; }
+public class TermEntry
+{
+    [BindNever]
+    public ContentItem Term { get; set; }
 
-        public bool Selected { get; set; }
-        public string ContentItemId { get; set; }
+    public bool Selected { get; set; }
+    public string ContentItemId { get; set; }
 
-        [BindNever]
-        public int Level { get; set; }
+    [BindNever]
+    public int Level { get; set; }
 
-        public bool IsLeaf { get; set; }
-    }
+    public bool IsLeaf { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TaxonomyContentsAdminFilterViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TaxonomyContentsAdminFilterViewModel.cs
index 27e5a666081..d589d5ef95b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TaxonomyContentsAdminFilterViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TaxonomyContentsAdminFilterViewModel.cs
@@ -2,16 +2,15 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.Taxonomies.ViewModels
+namespace OrchardCore.Taxonomies.ViewModels;
+
+public class TaxonomyContentsAdminFilterViewModel
 {
-    public class TaxonomyContentsAdminFilterViewModel
-    {
-        public string SelectedContentItemId { get; set; }
+    public string SelectedContentItemId { get; set; }
 
-        [BindNever]
-        public string DisplayText { get; set; }
+    [BindNever]
+    public string DisplayText { get; set; }
 
-        [BindNever]
-        public List<SelectListItem> Taxonomies { get; set; }
-    }
+    [BindNever]
+    public List<SelectListItem> Taxonomies { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TaxonomyContentsAdminListSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TaxonomyContentsAdminListSettingsViewModel.cs
index c616317e3e2..5abd82410bc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TaxonomyContentsAdminListSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TaxonomyContentsAdminListSettingsViewModel.cs
@@ -1,14 +1,13 @@
-namespace OrchardCore.Taxonomies.ViewModels
+namespace OrchardCore.Taxonomies.ViewModels;
+
+public class TaxonomyContentsAdminListSettingsViewModel
 {
-    public class TaxonomyContentsAdminListSettingsViewModel
-    {
-        public TaxonomyEntry[] TaxonomyEntries { get; set; }
-    }
+    public TaxonomyEntry[] TaxonomyEntries { get; set; }
+}
 
-    public class TaxonomyEntry
-    {
-        public string DisplayText { get; set; }
-        public string ContentItemId { get; set; }
-        public bool IsChecked { get; set; }
-    }
+public class TaxonomyEntry
+{
+    public string DisplayText { get; set; }
+    public string ContentItemId { get; set; }
+    public bool IsChecked { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TaxonomyPartEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TaxonomyPartEditViewModel.cs
index 217955af34f..ee0244a9f8e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TaxonomyPartEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TaxonomyPartEditViewModel.cs
@@ -1,15 +1,14 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Taxonomies.Models;
 
-namespace OrchardCore.Taxonomies.ViewModels
+namespace OrchardCore.Taxonomies.ViewModels;
+
+public class TaxonomyPartEditViewModel
 {
-    public class TaxonomyPartEditViewModel
-    {
-        public string Hierarchy { get; set; }
+    public string Hierarchy { get; set; }
 
-        public string TermContentType { get; set; }
+    public string TermContentType { get; set; }
 
-        [BindNever]
-        public TaxonomyPart TaxonomyPart { get; set; }
-    }
+    [BindNever]
+    public TaxonomyPart TaxonomyPart { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TaxonomyPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TaxonomyPartViewModel.cs
index f36ee178dad..a472d9b3354 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TaxonomyPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TaxonomyPartViewModel.cs
@@ -2,16 +2,15 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Taxonomies.Models;
 
-namespace OrchardCore.Taxonomies.ViewModels
+namespace OrchardCore.Taxonomies.ViewModels;
+
+public class TaxonomyPartViewModel
 {
-    public class TaxonomyPartViewModel
-    {
-        public string TaxonomyContentItemId => ContentItem.ContentItemId;
+    public string TaxonomyContentItemId => ContentItem.ContentItemId;
 
-        [BindNever]
-        public ContentItem ContentItem { get; set; }
+    [BindNever]
+    public ContentItem ContentItem { get; set; }
 
-        [BindNever]
-        public TaxonomyPart TaxonomyPart { get; set; }
-    }
+    [BindNever]
+    public TaxonomyPart TaxonomyPart { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TermPartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TermPartViewModel.cs
index b8395baa4a8..10b60b30131 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TermPartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/ViewModels/TermPartViewModel.cs
@@ -2,16 +2,15 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Taxonomies.ViewModels
+namespace OrchardCore.Taxonomies.ViewModels;
+
+public class TermPartViewModel
 {
-    public class TermPartViewModel
-    {
-        public string TermContentItemId => ContentItem.ContentItemId;
-        public string TaxonomyContentItemId { get; set; }
-        public IEnumerable<ContentItem> ContentItems { get; set; }
-        public dynamic Pager { get; set; }
+    public string TermContentItemId => ContentItem.ContentItemId;
+    public string TaxonomyContentItemId { get; set; }
+    public IEnumerable<ContentItem> ContentItems { get; set; }
+    public dynamic Pager { get; set; }
 
-        [BindNever]
-        public ContentItem ContentItem { get; set; }
-    }
+    [BindNever]
+    public ContentItem ContentItem { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Templates/AdminMenu.cs
index b15e981a595..e1aecd03a7f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/AdminMenu.cs
@@ -2,34 +2,33 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Templates
+namespace OrchardCore.Templates;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    internal readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Design"], design => design
-                    .Add(S["Templates"], S["Templates"].PrefixPosition(), import => import
-                        .Action("Index", "Template", "OrchardCore.Templates")
-                        .Permission(Permissions.ManageTemplates)
-                        .LocalNav()
-                    )
-                );
+        builder
+            .Add(S["Design"], design => design
+                .Add(S["Templates"], S["Templates"].PrefixPosition(), import => import
+                    .Action("Index", "Template", "OrchardCore.Templates")
+                    .Permission(Permissions.ManageTemplates)
+                    .LocalNav()
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/AdminTemplatesAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Templates/AdminTemplatesAdminMenu.cs
index 08560028e79..7f6e7e2381a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/AdminTemplatesAdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/AdminTemplatesAdminMenu.cs
@@ -2,34 +2,33 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Templates
+namespace OrchardCore.Templates;
+
+public sealed class AdminTemplatesAdminMenu : INavigationProvider
 {
-    public sealed class AdminTemplatesAdminMenu : INavigationProvider
+    internal readonly IStringLocalizer S;
+
+    public AdminTemplatesAdminMenu(IStringLocalizer<AdminTemplatesAdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public AdminTemplatesAdminMenu(IStringLocalizer<AdminTemplatesAdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Design"], design => design
-                    .Add(S["Admin Templates"], S["Admin Templates"].PrefixPosition(), import => import
-                        .Action("Admin", "Template", "OrchardCore.Templates")
-                        .Permission(AdminTemplatesPermissions.ManageAdminTemplates)
-                        .LocalNav()
-                    )
-                );
+        builder
+            .Add(S["Design"], design => design
+                .Add(S["Admin Templates"], S["Admin Templates"].PrefixPosition(), import => import
+                    .Action("Admin", "Template", "OrchardCore.Templates")
+                    .Permission(AdminTemplatesPermissions.ManageAdminTemplates)
+                    .LocalNav()
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Controllers/PreviewController.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Controllers/PreviewController.cs
index adc4723102d..44e302bcd37 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Controllers/PreviewController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Controllers/PreviewController.cs
@@ -11,93 +11,92 @@
 using OrchardCore.Settings;
 using OrchardCore.Templates.ViewModels;
 
-namespace OrchardCore.Templates.Controllers
+namespace OrchardCore.Templates.Controllers;
+
+public class PreviewController : Controller
 {
-    public class PreviewController : Controller
+    private readonly IContentManager _contentManager;
+    private readonly IContentHandleManager _contentHandleManager;
+    private readonly IContentItemDisplayManager _contentItemDisplayManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly ISiteService _siteService;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly string _homeUrl;
+
+    public PreviewController(
+        IContentManager contentManager,
+        IContentHandleManager contentHandleManager,
+        IContentItemDisplayManager contentItemDisplayManager,
+        IAuthorizationService authorizationService,
+        ISiteService siteService,
+        IUpdateModelAccessor updateModelAccessor,
+        IHttpContextAccessor httpContextAccessor)
     {
-        private readonly IContentManager _contentManager;
-        private readonly IContentHandleManager _contentHandleManager;
-        private readonly IContentItemDisplayManager _contentItemDisplayManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly ISiteService _siteService;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly string _homeUrl;
-
-        public PreviewController(
-            IContentManager contentManager,
-            IContentHandleManager contentHandleManager,
-            IContentItemDisplayManager contentItemDisplayManager,
-            IAuthorizationService authorizationService,
-            ISiteService siteService,
-            IUpdateModelAccessor updateModelAccessor,
-            IHttpContextAccessor httpContextAccessor)
-        {
-            _contentManager = contentManager;
-            _contentHandleManager = contentHandleManager;
-            _contentItemDisplayManager = contentItemDisplayManager;
-            _authorizationService = authorizationService;
-            _siteService = siteService;
-            _updateModelAccessor = updateModelAccessor;
-            _homeUrl = httpContextAccessor.HttpContext.Request.PathBase.Add("/");
-        }
+        _contentManager = contentManager;
+        _contentHandleManager = contentHandleManager;
+        _contentItemDisplayManager = contentItemDisplayManager;
+        _authorizationService = authorizationService;
+        _siteService = siteService;
+        _updateModelAccessor = updateModelAccessor;
+        _homeUrl = httpContextAccessor.HttpContext.Request.PathBase.Add("/");
+    }
 
-        public IActionResult Index()
-        {
-            return View();
-        }
+    public IActionResult Index()
+    {
+        return View();
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> Render()
+    [HttpPost]
+    public async Task<IActionResult> Render()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTemplates))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTemplates))
-            {
-                return this.ChallengeOrForbid();
-            }
+            return this.ChallengeOrForbid();
+        }
 
-            // Mark request as a `Preview` request so that drivers / handlers or underlying services can be aware of an active preview mode.
-            HttpContext.Features.Set(new ContentPreviewFeature());
+        // Mark request as a `Preview` request so that drivers / handlers or underlying services can be aware of an active preview mode.
+        HttpContext.Features.Set(new ContentPreviewFeature());
 
-            var name = Request.Form["Name"];
-            var content = Request.Form["Content"];
+        var name = Request.Form["Name"];
+        var content = Request.Form["Content"];
 
-            if (!string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(content))
-            {
-                HttpContext.Items["OrchardCore.PreviewTemplate"] = new TemplateViewModel { Name = name, Content = content };
-            }
+        if (!string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(content))
+        {
+            HttpContext.Items["OrchardCore.PreviewTemplate"] = new TemplateViewModel { Name = name, Content = content };
+        }
 
-            var handle = Request.Form["Handle"].ToString();
+        var handle = Request.Form["Handle"].ToString();
 
-            string contentItemId;
+        string contentItemId;
 
-            if (string.IsNullOrEmpty(handle) || handle == _homeUrl)
-            {
-                var homeRoute = (await _siteService.GetSiteSettingsAsync()).HomeRoute;
-                contentItemId = homeRoute["contentItemId"]?.ToString();
-            }
-            else
-            {
-                var index = handle.IndexOf(_homeUrl, StringComparison.Ordinal);
+        if (string.IsNullOrEmpty(handle) || handle == _homeUrl)
+        {
+            var homeRoute = (await _siteService.GetSiteSettingsAsync()).HomeRoute;
+            contentItemId = homeRoute["contentItemId"]?.ToString();
+        }
+        else
+        {
+            var index = handle.IndexOf(_homeUrl, StringComparison.Ordinal);
 
-                handle = (index < 0 ? handle : handle[_homeUrl.Length..])
-                    .ToUriComponents(UriFormat.SafeUnescaped);
+            handle = (index < 0 ? handle : handle[_homeUrl.Length..])
+                .ToUriComponents(UriFormat.SafeUnescaped);
 
-                contentItemId = await _contentHandleManager.GetContentItemIdAsync(AutorouteConstants.SlugPrefix + handle);
-            }
+            contentItemId = await _contentHandleManager.GetContentItemIdAsync(AutorouteConstants.SlugPrefix + handle);
+        }
 
-            if (string.IsNullOrEmpty(contentItemId))
-            {
-                return NotFound();
-            }
+        if (string.IsNullOrEmpty(contentItemId))
+        {
+            return NotFound();
+        }
 
-            var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Published);
-            if (contentItem is null)
-            {
-                return NotFound();
-            }
+        var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Published);
+        if (contentItem is null)
+        {
+            return NotFound();
+        }
 
-            var model = await _contentItemDisplayManager.BuildDisplayAsync(contentItem, _updateModelAccessor.ModelUpdater, "Detail");
+        var model = await _contentItemDisplayManager.BuildDisplayAsync(contentItem, _updateModelAccessor.ModelUpdater, "Detail");
 
-            return View(model);
-        }
+        return View(model);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Controllers/TemplateController.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Controllers/TemplateController.cs
index 679c39b5e8f..a2a314c0e1a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Controllers/TemplateController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Controllers/TemplateController.cs
@@ -18,390 +18,389 @@
 using OrchardCore.Templates.Services;
 using OrchardCore.Templates.ViewModels;
 
-namespace OrchardCore.Templates.Controllers
+namespace OrchardCore.Templates.Controllers;
+
+[Admin("Templates/{action}/{name?}", "Templates.{action}")]
+public class TemplateController : Controller
 {
-    [Admin("Templates/{action}/{name?}", "Templates.{action}")]
-    public class TemplateController : Controller
+    private const string _optionsSearch = "Options.Search";
+
+    private readonly IAuthorizationService _authorizationService;
+    private readonly TemplatesManager _templatesManager;
+    private readonly AdminTemplatesManager _adminTemplatesManager;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly PagerOptions _pagerOptions;
+    private readonly INotifier _notifier;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public TemplateController(
+        IAuthorizationService authorizationService,
+        TemplatesManager templatesManager,
+        AdminTemplatesManager adminTemplatesManager,
+        IShapeFactory shapeFactory,
+        IOptions<PagerOptions> pagerOptions,
+        IStringLocalizer<TemplateController> stringLocalizer,
+        IHtmlLocalizer<TemplateController> htmlLocalizer,
+        INotifier notifier)
+    {
+        _authorizationService = authorizationService;
+        _templatesManager = templatesManager;
+        _adminTemplatesManager = adminTemplatesManager;
+        _shapeFactory = shapeFactory;
+        _pagerOptions = pagerOptions.Value;
+        _notifier = notifier;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+    }
+
+    public Task<IActionResult> Admin(ContentOptions options, PagerParameters pagerParameters)
+    {
+        options.AdminTemplates = true;
+
+        // Used to provide a different url such that the Admin Templates menu entry doesn't collide with the Templates ones.
+        return Index(options, pagerParameters);
+    }
+
+    [Admin("Templates", "Templates.Index")]
+    public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
     {
-        private const string _optionsSearch = "Options.Search";
-
-        private readonly IAuthorizationService _authorizationService;
-        private readonly TemplatesManager _templatesManager;
-        private readonly AdminTemplatesManager _adminTemplatesManager;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly PagerOptions _pagerOptions;
-        private readonly INotifier _notifier;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public TemplateController(
-            IAuthorizationService authorizationService,
-            TemplatesManager templatesManager,
-            AdminTemplatesManager adminTemplatesManager,
-            IShapeFactory shapeFactory,
-            IOptions<PagerOptions> pagerOptions,
-            IStringLocalizer<TemplateController> stringLocalizer,
-            IHtmlLocalizer<TemplateController> htmlLocalizer,
-            INotifier notifier)
+        if (!options.AdminTemplates && !await _authorizationService.AuthorizeAsync(User, Permissions.ManageTemplates))
         {
-            _authorizationService = authorizationService;
-            _templatesManager = templatesManager;
-            _adminTemplatesManager = adminTemplatesManager;
-            _shapeFactory = shapeFactory;
-            _pagerOptions = pagerOptions.Value;
-            _notifier = notifier;
-            S = stringLocalizer;
-            H = htmlLocalizer;
+            return Forbid();
         }
 
-        public Task<IActionResult> Admin(ContentOptions options, PagerParameters pagerParameters)
+        if (options.AdminTemplates && !await _authorizationService.AuthorizeAsync(User, AdminTemplatesPermissions.ManageAdminTemplates))
         {
-            options.AdminTemplates = true;
-
-            // Used to provide a different url such that the Admin Templates menu entry doesn't collide with the Templates ones.
-            return Index(options, pagerParameters);
+            return Forbid();
         }
 
-        [Admin("Templates", "Templates.Index")]
-        public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
-        {
-            if (!options.AdminTemplates && !await _authorizationService.AuthorizeAsync(User, Permissions.ManageTemplates))
-            {
-                return Forbid();
-            }
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+        var templatesDocument = options.AdminTemplates
+            ? await _adminTemplatesManager.GetTemplatesDocumentAsync()
+            : await _templatesManager.GetTemplatesDocumentAsync()
+            ;
 
-            if (options.AdminTemplates && !await _authorizationService.AuthorizeAsync(User, AdminTemplatesPermissions.ManageAdminTemplates))
-            {
-                return Forbid();
-            }
+        var templates = templatesDocument.Templates.ToList();
 
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
-            var templatesDocument = options.AdminTemplates
-                ? await _adminTemplatesManager.GetTemplatesDocumentAsync()
-                : await _templatesManager.GetTemplatesDocumentAsync()
-                ;
+        if (!string.IsNullOrWhiteSpace(options.Search))
+        {
+            templates = templates.Where(x => x.Key.Contains(options.Search, StringComparison.OrdinalIgnoreCase)).ToList();
+        }
 
-            var templates = templatesDocument.Templates.ToList();
+        var count = templates.Count;
 
-            if (!string.IsNullOrWhiteSpace(options.Search))
-            {
-                templates = templates.Where(x => x.Key.Contains(options.Search, StringComparison.OrdinalIgnoreCase)).ToList();
-            }
+        templates = templates.OrderBy(x => x.Key)
+            .Skip(pager.GetStartIndex())
+            .Take(pager.PageSize).ToList();
 
-            var count = templates.Count;
+        // Maintain previous route data when generating page links.
+        var routeData = new RouteData();
 
-            templates = templates.OrderBy(x => x.Key)
-                .Skip(pager.GetStartIndex())
-                .Take(pager.PageSize).ToList();
+        if (!string.IsNullOrEmpty(options.Search))
+        {
+            routeData.Values.TryAdd(_optionsSearch, options.Search);
+        }
 
-            // Maintain previous route data when generating page links.
-            var routeData = new RouteData();
+        var pagerShape = await _shapeFactory.PagerAsync(pager, count, routeData);
+        var model = new TemplateIndexViewModel
+        {
+            Templates = templates.Select(x => new TemplateEntry { Name = x.Key, Template = x.Value }).ToList(),
+            Options = options,
+            Pager = pagerShape
+        };
+
+        model.Options.ContentsBulkAction =
+        [
+            new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+        ];
+
+        // The 'Admin' action redirect the user to the 'Index' action.
+        // To ensure we render the same 'Index' view in both cases, we have to explicitly specify the name of the view that should be rendered.
+        return View(nameof(Index), model);
+    }
 
-            if (!string.IsNullOrEmpty(options.Search))
-            {
-                routeData.Values.TryAdd(_optionsSearch, options.Search);
-            }
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.Filter")]
+    public ActionResult IndexFilterPOST(TemplateIndexViewModel model)
+        => RedirectToAction(nameof(Index), new RouteValueDictionary
+        {
+            { _optionsSearch, model.Options.Search }
+        });
 
-            var pagerShape = await _shapeFactory.PagerAsync(pager, count, routeData);
-            var model = new TemplateIndexViewModel
-            {
-                Templates = templates.Select(x => new TemplateEntry { Name = x.Key, Template = x.Value }).ToList(),
-                Options = options,
-                Pager = pagerShape
-            };
-
-            model.Options.ContentsBulkAction =
-            [
-                new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
-            ];
-
-            // The 'Admin' action redirect the user to the 'Index' action.
-            // To ensure we render the same 'Index' view in both cases, we have to explicitly specify the name of the view that should be rendered.
-            return View(nameof(Index), model);
+    public async Task<IActionResult> Create(string name = null, bool adminTemplates = false, string returnUrl = null)
+    {
+        if (!adminTemplates && !await _authorizationService.AuthorizeAsync(User, Permissions.ManageTemplates))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.Filter")]
-        public ActionResult IndexFilterPOST(TemplateIndexViewModel model)
-            => RedirectToAction(nameof(Index), new RouteValueDictionary
-            {
-                { _optionsSearch, model.Options.Search }
-            });
+        if (adminTemplates && !await _authorizationService.AuthorizeAsync(User, AdminTemplatesPermissions.ManageAdminTemplates))
+        {
+            return Forbid();
+        }
 
-        public async Task<IActionResult> Create(string name = null, bool adminTemplates = false, string returnUrl = null)
+        var model = new TemplateViewModel
         {
-            if (!adminTemplates && !await _authorizationService.AuthorizeAsync(User, Permissions.ManageTemplates))
-            {
-                return Forbid();
-            }
+            AdminTemplates = adminTemplates,
+            Name = name
+        };
 
-            if (adminTemplates && !await _authorizationService.AuthorizeAsync(User, AdminTemplatesPermissions.ManageAdminTemplates))
-            {
-                return Forbid();
-            }
+        ViewData["ReturnUrl"] = returnUrl;
+        return View(model);
+    }
 
-            var model = new TemplateViewModel
-            {
-                AdminTemplates = adminTemplates,
-                Name = name
-            };
+    [HttpPost, ActionName(nameof(Create))]
+    public async Task<IActionResult> CreatePost(TemplateViewModel model, string submit, string returnUrl = null)
+    {
+        if (!model.AdminTemplates && !await _authorizationService.AuthorizeAsync(User, Permissions.ManageTemplates))
+        {
+            return Forbid();
+        }
 
-            ViewData["ReturnUrl"] = returnUrl;
-            return View(model);
+        if (model.AdminTemplates && !await _authorizationService.AuthorizeAsync(User, AdminTemplatesPermissions.ManageAdminTemplates))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName(nameof(Create))]
-        public async Task<IActionResult> CreatePost(TemplateViewModel model, string submit, string returnUrl = null)
+        ViewData["ReturnUrl"] = returnUrl;
+
+        if (ModelState.IsValid)
         {
-            if (!model.AdminTemplates && !await _authorizationService.AuthorizeAsync(User, Permissions.ManageTemplates))
+            if (string.IsNullOrWhiteSpace(model.Name))
             {
-                return Forbid();
+                ModelState.AddModelError(nameof(TemplateViewModel.Name), S["The name is mandatory."]);
             }
-
-            if (model.AdminTemplates && !await _authorizationService.AuthorizeAsync(User, AdminTemplatesPermissions.ManageAdminTemplates))
+            else if (string.IsNullOrWhiteSpace(model.Content))
             {
-                return Forbid();
+                ModelState.AddModelError(nameof(TemplateViewModel.Content), S["The content is mandatory."]);
             }
-
-            ViewData["ReturnUrl"] = returnUrl;
-
-            if (ModelState.IsValid)
+            else
             {
-                if (string.IsNullOrWhiteSpace(model.Name))
-                {
-                    ModelState.AddModelError(nameof(TemplateViewModel.Name), S["The name is mandatory."]);
-                }
-                else if (string.IsNullOrWhiteSpace(model.Content))
-                {
-                    ModelState.AddModelError(nameof(TemplateViewModel.Content), S["The content is mandatory."]);
-                }
-                else
-                {
-                    var templatesDocument = model.AdminTemplates
-                        ? await _adminTemplatesManager.GetTemplatesDocumentAsync()
-                        : await _templatesManager.GetTemplatesDocumentAsync()
-                        ;
+                var templatesDocument = model.AdminTemplates
+                    ? await _adminTemplatesManager.GetTemplatesDocumentAsync()
+                    : await _templatesManager.GetTemplatesDocumentAsync()
+                    ;
 
-                    if (templatesDocument.Templates.ContainsKey(model.Name))
-                    {
-                        ModelState.AddModelError(nameof(TemplateViewModel.Name), S["A template with the same name already exists."]);
-                    }
+                if (templatesDocument.Templates.ContainsKey(model.Name))
+                {
+                    ModelState.AddModelError(nameof(TemplateViewModel.Name), S["A template with the same name already exists."]);
                 }
             }
+        }
 
-            if (ModelState.IsValid)
-            {
-                var template = new Template { Content = model.Content, Description = model.Description };
+        if (ModelState.IsValid)
+        {
+            var template = new Template { Content = model.Content, Description = model.Description };
 
-                await (model.AdminTemplates
-                    ? _adminTemplatesManager.UpdateTemplateAsync(model.Name, template)
-                    : _templatesManager.UpdateTemplateAsync(model.Name, template)
-                    );
+            await (model.AdminTemplates
+                ? _adminTemplatesManager.UpdateTemplateAsync(model.Name, template)
+                : _templatesManager.UpdateTemplateAsync(model.Name, template)
+                );
 
-                await _notifier.SuccessAsync(H["The \"{0}\" template has been created.", model.Name]);
+            await _notifier.SuccessAsync(H["The \"{0}\" template has been created.", model.Name]);
 
-                if (submit == "SaveAndContinue")
-                {
-                    return RedirectToAction(nameof(Edit), new { name = model.Name, adminTemplates = model.AdminTemplates, returnUrl });
-                }
-                else
-                {
-                    return RedirectToReturnUrlOrIndex(returnUrl);
-                }
+            if (submit == "SaveAndContinue")
+            {
+                return RedirectToAction(nameof(Edit), new { name = model.Name, adminTemplates = model.AdminTemplates, returnUrl });
             }
+            else
+            {
+                return RedirectToReturnUrlOrIndex(returnUrl);
+            }
+        }
 
-            // If we got this far, something failed, redisplay form.
-            return View(model);
+        // If we got this far, something failed, redisplay form.
+        return View(model);
+    }
+
+    public async Task<IActionResult> Edit(string name, bool adminTemplates = false, string returnUrl = null)
+    {
+        if (!adminTemplates && !await _authorizationService.AuthorizeAsync(User, Permissions.ManageTemplates))
+        {
+            return Forbid();
         }
 
-        public async Task<IActionResult> Edit(string name, bool adminTemplates = false, string returnUrl = null)
+        if (adminTemplates && !await _authorizationService.AuthorizeAsync(User, AdminTemplatesPermissions.ManageAdminTemplates))
         {
-            if (!adminTemplates && !await _authorizationService.AuthorizeAsync(User, Permissions.ManageTemplates))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            if (adminTemplates && !await _authorizationService.AuthorizeAsync(User, AdminTemplatesPermissions.ManageAdminTemplates))
-            {
-                return Forbid();
-            }
+        var templatesDocument = adminTemplates
+            ? await _adminTemplatesManager.GetTemplatesDocumentAsync()
+            : await _templatesManager.GetTemplatesDocumentAsync()
+            ;
 
-            var templatesDocument = adminTemplates
-                ? await _adminTemplatesManager.GetTemplatesDocumentAsync()
-                : await _templatesManager.GetTemplatesDocumentAsync()
-                ;
+        if (!templatesDocument.Templates.TryGetValue(name, out var template))
+        {
+            return RedirectToAction(nameof(Create), new { name, returnUrl });
+        }
 
-            if (!templatesDocument.Templates.TryGetValue(name, out var template))
-            {
-                return RedirectToAction(nameof(Create), new { name, returnUrl });
-            }
+        var model = new TemplateViewModel
+        {
+            AdminTemplates = adminTemplates,
+            Name = name,
+            Content = template.Content,
+            Description = template.Description
+        };
+
+        ViewData["ReturnUrl"] = returnUrl;
+        return View(model);
+    }
 
-            var model = new TemplateViewModel
-            {
-                AdminTemplates = adminTemplates,
-                Name = name,
-                Content = template.Content,
-                Description = template.Description
-            };
-
-            ViewData["ReturnUrl"] = returnUrl;
-            return View(model);
+    [HttpPost]
+    public async Task<IActionResult> Edit(string sourceName, TemplateViewModel model, string submit, string returnUrl = null)
+    {
+        if (!model.AdminTemplates && !await _authorizationService.AuthorizeAsync(User, Permissions.ManageTemplates))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Edit(string sourceName, TemplateViewModel model, string submit, string returnUrl = null)
+        if (model.AdminTemplates && !await _authorizationService.AuthorizeAsync(User, AdminTemplatesPermissions.ManageAdminTemplates))
         {
-            if (!model.AdminTemplates && !await _authorizationService.AuthorizeAsync(User, Permissions.ManageTemplates))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
+
+        var templatesDocument = model.AdminTemplates
+            ? await _adminTemplatesManager.LoadTemplatesDocumentAsync()
+            : await _templatesManager.LoadTemplatesDocumentAsync()
+            ;
 
-            if (model.AdminTemplates && !await _authorizationService.AuthorizeAsync(User, AdminTemplatesPermissions.ManageAdminTemplates))
+        if (ModelState.IsValid)
+        {
+            if (string.IsNullOrWhiteSpace(model.Name))
             {
-                return Forbid();
+                ModelState.AddModelError(nameof(TemplateViewModel.Name), S["The name is mandatory."]);
             }
-
-            var templatesDocument = model.AdminTemplates
-                ? await _adminTemplatesManager.LoadTemplatesDocumentAsync()
-                : await _templatesManager.LoadTemplatesDocumentAsync()
-                ;
-
-            if (ModelState.IsValid)
+            else if (!model.Name.Equals(sourceName, StringComparison.OrdinalIgnoreCase) && templatesDocument.Templates.ContainsKey(model.Name))
             {
-                if (string.IsNullOrWhiteSpace(model.Name))
-                {
-                    ModelState.AddModelError(nameof(TemplateViewModel.Name), S["The name is mandatory."]);
-                }
-                else if (!model.Name.Equals(sourceName, StringComparison.OrdinalIgnoreCase) && templatesDocument.Templates.ContainsKey(model.Name))
-                {
-                    ModelState.AddModelError(nameof(TemplateViewModel.Name), S["A template with the same name already exists."]);
-                }
-                else if (string.IsNullOrWhiteSpace(model.Content))
-                {
-                    ModelState.AddModelError(nameof(TemplateViewModel.Content), S["The content is mandatory."]);
-                }
+                ModelState.AddModelError(nameof(TemplateViewModel.Name), S["A template with the same name already exists."]);
             }
-
-            if (!templatesDocument.Templates.ContainsKey(sourceName))
+            else if (string.IsNullOrWhiteSpace(model.Content))
             {
-                return NotFound();
+                ModelState.AddModelError(nameof(TemplateViewModel.Content), S["The content is mandatory."]);
             }
+        }
 
-            if (ModelState.IsValid)
-            {
-                var template = new Template { Content = model.Content, Description = model.Description };
+        if (!templatesDocument.Templates.ContainsKey(sourceName))
+        {
+            return NotFound();
+        }
 
-                await (model.AdminTemplates
-                    ? _adminTemplatesManager.RemoveTemplateAsync(sourceName)
-                    : _templatesManager.RemoveTemplateAsync(sourceName)
-                    );
+        if (ModelState.IsValid)
+        {
+            var template = new Template { Content = model.Content, Description = model.Description };
 
-                await (model.AdminTemplates
-                    ? _adminTemplatesManager.UpdateTemplateAsync(model.Name, template)
-                    : _templatesManager.UpdateTemplateAsync(model.Name, template)
-                    );
+            await (model.AdminTemplates
+                ? _adminTemplatesManager.RemoveTemplateAsync(sourceName)
+                : _templatesManager.RemoveTemplateAsync(sourceName)
+                );
 
-                if (submit != "SaveAndContinue")
-                {
-                    return RedirectToReturnUrlOrIndex(returnUrl);
-                }
+            await (model.AdminTemplates
+                ? _adminTemplatesManager.UpdateTemplateAsync(model.Name, template)
+                : _templatesManager.UpdateTemplateAsync(model.Name, template)
+                );
+
+            if (submit != "SaveAndContinue")
+            {
+                return RedirectToReturnUrlOrIndex(returnUrl);
             }
+        }
 
-            // If we got this far, something failed, redisplay form.
-            ViewData["ReturnUrl"] = returnUrl;
+        // If we got this far, something failed, redisplay form.
+        ViewData["ReturnUrl"] = returnUrl;
 
-            // If the name was changed or removed, prevent a 404 or a failure on the next post.
-            model.Name = sourceName;
+        // If the name was changed or removed, prevent a 404 or a failure on the next post.
+        model.Name = sourceName;
 
-            return View(model);
+        return View(model);
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Delete(string name, string returnUrl, bool adminTemplates = false)
+    {
+        if (!adminTemplates && !await _authorizationService.AuthorizeAsync(User, Permissions.ManageTemplates))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(string name, string returnUrl, bool adminTemplates = false)
+        if (adminTemplates && !await _authorizationService.AuthorizeAsync(User, AdminTemplatesPermissions.ManageAdminTemplates))
         {
-            if (!adminTemplates && !await _authorizationService.AuthorizeAsync(User, Permissions.ManageTemplates))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            if (adminTemplates && !await _authorizationService.AuthorizeAsync(User, AdminTemplatesPermissions.ManageAdminTemplates))
-            {
-                return Forbid();
-            }
+        var templatesDocument = adminTemplates
+            ? await _adminTemplatesManager.LoadTemplatesDocumentAsync()
+            : await _templatesManager.LoadTemplatesDocumentAsync();
 
-            var templatesDocument = adminTemplates
-                ? await _adminTemplatesManager.LoadTemplatesDocumentAsync()
-                : await _templatesManager.LoadTemplatesDocumentAsync();
+        if (!templatesDocument.Templates.ContainsKey(name))
+        {
+            return NotFound();
+        }
 
-            if (!templatesDocument.Templates.ContainsKey(name))
-            {
-                return NotFound();
-            }
+        await (adminTemplates
+                ? _adminTemplatesManager.RemoveTemplateAsync(name)
+                : _templatesManager.RemoveTemplateAsync(name));
 
-            await (adminTemplates
-                    ? _adminTemplatesManager.RemoveTemplateAsync(name)
-                    : _templatesManager.RemoveTemplateAsync(name));
+        await _notifier.SuccessAsync(H["Template deleted successfully."]);
 
-            await _notifier.SuccessAsync(H["Template deleted successfully."]);
+        return RedirectToReturnUrlOrIndex(returnUrl);
+    }
 
-            return RedirectToReturnUrlOrIndex(returnUrl);
+    [HttpPost, ActionName("Index")]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<ActionResult> ListPost(ContentOptions options, IEnumerable<string> itemIds)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTemplates))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName("Index")]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<ActionResult> ListPost(ContentOptions options, IEnumerable<string> itemIds)
+        if (itemIds?.Count() > 0)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTemplates))
-            {
-                return Forbid();
-            }
+            var templatesDocument = options.AdminTemplates
+                    ? await _adminTemplatesManager.LoadTemplatesDocumentAsync()
+                    : await _templatesManager.LoadTemplatesDocumentAsync();
+            var checkedContentItems = templatesDocument.Templates.Where(x => itemIds.Contains(x.Key));
 
-            if (itemIds?.Count() > 0)
+            switch (options.BulkAction)
             {
-                var templatesDocument = options.AdminTemplates
-                        ? await _adminTemplatesManager.LoadTemplatesDocumentAsync()
-                        : await _templatesManager.LoadTemplatesDocumentAsync();
-                var checkedContentItems = templatesDocument.Templates.Where(x => itemIds.Contains(x.Key));
-
-                switch (options.BulkAction)
-                {
-                    case ContentsBulkAction.None:
-                        break;
-                    case ContentsBulkAction.Remove:
-                        foreach (var item in checkedContentItems)
-                        {
-                            await (options.AdminTemplates
-                                    ? _adminTemplatesManager.RemoveTemplateAsync(item.Key)
-                                    : _templatesManager.RemoveTemplateAsync(item.Key));
-                        }
-                        await _notifier.SuccessAsync(H["Templates successfully removed."]);
-                        break;
-                    default:
-                        return BadRequest();
-                }
+                case ContentsBulkAction.None:
+                    break;
+                case ContentsBulkAction.Remove:
+                    foreach (var item in checkedContentItems)
+                    {
+                        await (options.AdminTemplates
+                                ? _adminTemplatesManager.RemoveTemplateAsync(item.Key)
+                                : _templatesManager.RemoveTemplateAsync(item.Key));
+                    }
+                    await _notifier.SuccessAsync(H["Templates successfully removed."]);
+                    break;
+                default:
+                    return BadRequest();
             }
+        }
 
-            if (options.AdminTemplates)
-            {
-                return RedirectToAction(nameof(Admin));
-            }
-            else
-            {
-                return RedirectToAction(nameof(Index));
-            }
+        if (options.AdminTemplates)
+        {
+            return RedirectToAction(nameof(Admin));
+        }
+        else
+        {
+            return RedirectToAction(nameof(Index));
         }
+    }
 
-        private IActionResult RedirectToReturnUrlOrIndex(string returnUrl)
+    private IActionResult RedirectToReturnUrlOrIndex(string returnUrl)
+    {
+        if ((string.IsNullOrEmpty(returnUrl) == false) && (Url.IsLocalUrl(returnUrl)))
         {
-            if ((string.IsNullOrEmpty(returnUrl) == false) && (Url.IsLocalUrl(returnUrl)))
-            {
-                return this.Redirect(returnUrl, true);
-            }
-            else
-            {
-                return RedirectToAction(nameof(Index));
-            }
+            return this.Redirect(returnUrl, true);
+        }
+        else
+        {
+            return RedirectToAction(nameof(Index));
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllAdminTemplatesDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllAdminTemplatesDeploymentSource.cs
index 243f1d83879..80eacda3a78 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllAdminTemplatesDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllAdminTemplatesDeploymentSource.cs
@@ -5,50 +5,49 @@
 using OrchardCore.Templates.Models;
 using OrchardCore.Templates.Services;
 
-namespace OrchardCore.Templates.Deployment
+namespace OrchardCore.Templates.Deployment;
+
+public class AllAdminTemplatesDeploymentSource : IDeploymentSource
 {
-    public class AllAdminTemplatesDeploymentSource : IDeploymentSource
+    private readonly AdminTemplatesManager _templatesManager;
+
+    public AllAdminTemplatesDeploymentSource(AdminTemplatesManager templatesManager)
     {
-        private readonly AdminTemplatesManager _templatesManager;
+        _templatesManager = templatesManager;
+    }
 
-        public AllAdminTemplatesDeploymentSource(AdminTemplatesManager templatesManager)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        if (step is not AllAdminTemplatesDeploymentStep allTemplatesStep)
         {
-            _templatesManager = templatesManager;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
-        {
-            if (step is not AllAdminTemplatesDeploymentStep allTemplatesStep)
-            {
-                return;
-            }
-
-            var templateObjects = new JsonObject();
-            var templates = await _templatesManager.GetTemplatesDocumentAsync();
+        var templateObjects = new JsonObject();
+        var templates = await _templatesManager.GetTemplatesDocumentAsync();
 
-            if (allTemplatesStep.ExportAsFiles)
+        if (allTemplatesStep.ExportAsFiles)
+        {
+            foreach (var template in templates.Templates)
             {
-                foreach (var template in templates.Templates)
-                {
-                    var fileName = "AdminTemplates/" + template.Key.Replace("__", "-").Replace("_", ".") + ".liquid";
-                    var templateValue = new Template { Description = template.Value.Description, Content = $"[file:text('{fileName}')]" };
-                    await result.FileBuilder.SetFileAsync(fileName, Encoding.UTF8.GetBytes(template.Value.Content));
-                    templateObjects[template.Key] = JObject.FromObject(templateValue);
-                }
+                var fileName = "AdminTemplates/" + template.Key.Replace("__", "-").Replace("_", ".") + ".liquid";
+                var templateValue = new Template { Description = template.Value.Description, Content = $"[file:text('{fileName}')]" };
+                await result.FileBuilder.SetFileAsync(fileName, Encoding.UTF8.GetBytes(template.Value.Content));
+                templateObjects[template.Key] = JObject.FromObject(templateValue);
             }
-            else
+        }
+        else
+        {
+            foreach (var template in templates.Templates)
             {
-                foreach (var template in templates.Templates)
-                {
-                    templateObjects[template.Key] = JObject.FromObject(template.Value);
-                }
+                templateObjects[template.Key] = JObject.FromObject(template.Value);
             }
-
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "AdminTemplates",
-                ["AdminTemplates"] = templateObjects,
-            });
         }
+
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "AdminTemplates",
+            ["AdminTemplates"] = templateObjects,
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllAdminTemplatesDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllAdminTemplatesDeploymentStep.cs
index bf2ce055a54..fcb6d35f057 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllAdminTemplatesDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllAdminTemplatesDeploymentStep.cs
@@ -1,16 +1,15 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Templates.Deployment
+namespace OrchardCore.Templates.Deployment;
+
+/// <summary>
+/// Adds templates to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class AllAdminTemplatesDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds templates to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class AllAdminTemplatesDeploymentStep : DeploymentStep
+    public AllAdminTemplatesDeploymentStep()
     {
-        public AllAdminTemplatesDeploymentStep()
-        {
-            Name = "AllAdminTemplates";
-        }
-        public bool ExportAsFiles { get; set; }
+        Name = "AllAdminTemplates";
     }
+    public bool ExportAsFiles { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllAdminTemplatesDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllAdminTemplatesDeploymentStepDriver.cs
index 14c88380113..c5c35a155cc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllAdminTemplatesDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllAdminTemplatesDeploymentStepDriver.cs
@@ -4,31 +4,30 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Templates.ViewModels;
 
-namespace OrchardCore.Templates.Deployment
+namespace OrchardCore.Templates.Deployment;
+
+public sealed class AllAdminTemplatesDeploymentStepDriver : DisplayDriver<DeploymentStep, AllAdminTemplatesDeploymentStep>
 {
-    public sealed class AllAdminTemplatesDeploymentStepDriver : DisplayDriver<DeploymentStep, AllAdminTemplatesDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(AllAdminTemplatesDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(AllAdminTemplatesDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("AllAdminTemplatesDeploymentStep_Summary", step).Location("Summary", "Content"),
-                    View("AllAdminTemplatesDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("AllAdminTemplatesDeploymentStep_Summary", step).Location("Summary", "Content"),
+                View("AllAdminTemplatesDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(AllAdminTemplatesDeploymentStep step, BuildEditorContext context)
-        {
-            return Initialize<AllAdminTemplatesDeploymentStepViewModel>("AllAdminTemplatesDeploymentStep_Fields_Edit", model =>
-            {
-                model.ExportAsFiles = step.ExportAsFiles;
-            }).Location("Content");
-        }
-        public override async Task<IDisplayResult> UpdateAsync(AllAdminTemplatesDeploymentStep step, UpdateEditorContext context)
+    public override IDisplayResult Edit(AllAdminTemplatesDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<AllAdminTemplatesDeploymentStepViewModel>("AllAdminTemplatesDeploymentStep_Fields_Edit", model =>
         {
-            await context.Updater.TryUpdateModelAsync(step, Prefix, x => x.ExportAsFiles);
+            model.ExportAsFiles = step.ExportAsFiles;
+        }).Location("Content");
+    }
+    public override async Task<IDisplayResult> UpdateAsync(AllAdminTemplatesDeploymentStep step, UpdateEditorContext context)
+    {
+        await context.Updater.TryUpdateModelAsync(step, Prefix, x => x.ExportAsFiles);
 
-            return Edit(step, context);
-        }
+        return Edit(step, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllTemplatesDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllTemplatesDeploymentSource.cs
index 83d004cc175..ee26fb837a2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllTemplatesDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllTemplatesDeploymentSource.cs
@@ -5,52 +5,51 @@
 using OrchardCore.Templates.Models;
 using OrchardCore.Templates.Services;
 
-namespace OrchardCore.Templates.Deployment
+namespace OrchardCore.Templates.Deployment;
+
+public class AllTemplatesDeploymentSource : IDeploymentSource
 {
-    public class AllTemplatesDeploymentSource : IDeploymentSource
+    private readonly TemplatesManager _templatesManager;
+
+    public AllTemplatesDeploymentSource(TemplatesManager templatesManager)
     {
-        private readonly TemplatesManager _templatesManager;
+        _templatesManager = templatesManager;
+    }
 
-        public AllTemplatesDeploymentSource(TemplatesManager templatesManager)
-        {
-            _templatesManager = templatesManager;
-        }
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        var allTemplatesStep = step as AllTemplatesDeploymentStep;
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        if (allTemplatesStep == null)
         {
-            var allTemplatesStep = step as AllTemplatesDeploymentStep;
-
-            if (allTemplatesStep == null)
-            {
-                return;
-            }
+            return;
+        }
 
-            var templateObjects = new JsonObject();
-            var templates = await _templatesManager.GetTemplatesDocumentAsync();
+        var templateObjects = new JsonObject();
+        var templates = await _templatesManager.GetTemplatesDocumentAsync();
 
-            if (allTemplatesStep.ExportAsFiles)
+        if (allTemplatesStep.ExportAsFiles)
+        {
+            foreach (var template in templates.Templates)
             {
-                foreach (var template in templates.Templates)
-                {
-                    var fileName = "Templates/" + template.Key.Replace("__", "-").Replace("_", ".") + ".liquid";
-                    var templateValue = new Template { Description = template.Value.Description, Content = $"[file:text('{fileName}')]" };
-                    await result.FileBuilder.SetFileAsync(fileName, Encoding.UTF8.GetBytes(template.Value.Content));
-                    templateObjects[template.Key] = JObject.FromObject(templateValue);
-                }
+                var fileName = "Templates/" + template.Key.Replace("__", "-").Replace("_", ".") + ".liquid";
+                var templateValue = new Template { Description = template.Value.Description, Content = $"[file:text('{fileName}')]" };
+                await result.FileBuilder.SetFileAsync(fileName, Encoding.UTF8.GetBytes(template.Value.Content));
+                templateObjects[template.Key] = JObject.FromObject(templateValue);
             }
-            else
+        }
+        else
+        {
+            foreach (var template in templates.Templates)
             {
-                foreach (var template in templates.Templates)
-                {
-                    templateObjects[template.Key] = JObject.FromObject(template.Value);
-                }
+                templateObjects[template.Key] = JObject.FromObject(template.Value);
             }
-
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "Templates",
-                ["Templates"] = templateObjects,
-            });
         }
+
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "Templates",
+            ["Templates"] = templateObjects,
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllTemplatesDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllTemplatesDeploymentStep.cs
index 089b1a3e210..36ddb8f3ae4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllTemplatesDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllTemplatesDeploymentStep.cs
@@ -1,16 +1,15 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Templates.Deployment
+namespace OrchardCore.Templates.Deployment;
+
+/// <summary>
+/// Adds templates to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class AllTemplatesDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds templates to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class AllTemplatesDeploymentStep : DeploymentStep
+    public AllTemplatesDeploymentStep()
     {
-        public AllTemplatesDeploymentStep()
-        {
-            Name = "AllTemplates";
-        }
-        public bool ExportAsFiles { get; set; }
+        Name = "AllTemplates";
     }
+    public bool ExportAsFiles { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllTemplatesDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllTemplatesDeploymentStepDriver.cs
index 2f3aeb2424a..5b80adc05cc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllTemplatesDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Deployment/AllTemplatesDeploymentStepDriver.cs
@@ -4,31 +4,30 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Templates.ViewModels;
 
-namespace OrchardCore.Templates.Deployment
+namespace OrchardCore.Templates.Deployment;
+
+public sealed class AllTemplatesDeploymentStepDriver : DisplayDriver<DeploymentStep, AllTemplatesDeploymentStep>
 {
-    public sealed class AllTemplatesDeploymentStepDriver : DisplayDriver<DeploymentStep, AllTemplatesDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(AllTemplatesDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(AllTemplatesDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("AllTemplatesDeploymentStep_Summary", step).Location("Summary", "Content"),
-                    View("AllTemplatesDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("AllTemplatesDeploymentStep_Summary", step).Location("Summary", "Content"),
+                View("AllTemplatesDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(AllTemplatesDeploymentStep step, BuildEditorContext context)
-        {
-            return Initialize<AllTemplatesDeploymentStepViewModel>("AllTemplatesDeploymentStep_Fields_Edit", model =>
-            {
-                model.ExportAsFiles = step.ExportAsFiles;
-            }).Location("Content");
-        }
-        public override async Task<IDisplayResult> UpdateAsync(AllTemplatesDeploymentStep step, UpdateEditorContext context)
+    public override IDisplayResult Edit(AllTemplatesDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<AllTemplatesDeploymentStepViewModel>("AllTemplatesDeploymentStep_Fields_Edit", model =>
         {
-            await context.Updater.TryUpdateModelAsync(step, Prefix, x => x.ExportAsFiles);
+            model.ExportAsFiles = step.ExportAsFiles;
+        }).Location("Content");
+    }
+    public override async Task<IDisplayResult> UpdateAsync(AllTemplatesDeploymentStep step, UpdateEditorContext context)
+    {
+        await context.Updater.TryUpdateModelAsync(step, Prefix, x => x.ExportAsFiles);
 
-            return Edit(step, context);
-        }
+        return Edit(step, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Models/AdminTemplatesDocument.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Models/AdminTemplatesDocument.cs
index 62265e6fa9d..a93f1d445a6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Models/AdminTemplatesDocument.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Models/AdminTemplatesDocument.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Templates.Models
+namespace OrchardCore.Templates.Models;
+
+public class AdminTemplatesDocument : TemplatesDocument
 {
-    public class AdminTemplatesDocument : TemplatesDocument
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Models/TemplatesDocument.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Models/TemplatesDocument.cs
index 67d0b857ca2..87774a328d8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Models/TemplatesDocument.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Models/TemplatesDocument.cs
@@ -2,16 +2,15 @@
 using System.Collections.Generic;
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.Templates.Models
+namespace OrchardCore.Templates.Models;
+
+public class TemplatesDocument : Document
 {
-    public class TemplatesDocument : Document
-    {
-        public Dictionary<string, Template> Templates { get; set; } = new Dictionary<string, Template>(StringComparer.OrdinalIgnoreCase);
-    }
+    public Dictionary<string, Template> Templates { get; set; } = new Dictionary<string, Template>(StringComparer.OrdinalIgnoreCase);
+}
 
-    public class Template
-    {
-        public string Content { get; set; }
-        public string Description { get; set; }
-    }
+public class Template
+{
+    public string Content { get; set; }
+    public string Description { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Recipes/AdminTemplateStep.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Recipes/AdminTemplateStep.cs
index 9c434b8f83a..233dcec2af1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Recipes/AdminTemplateStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Recipes/AdminTemplateStep.cs
@@ -6,36 +6,35 @@
 using OrchardCore.Templates.Models;
 using OrchardCore.Templates.Services;
 
-namespace OrchardCore.Templates.Recipes
+namespace OrchardCore.Templates.Recipes;
+
+/// <summary>
+/// This recipe step creates a set of templates.
+/// </summary>
+public sealed class AdminTemplateStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step creates a set of templates.
-    /// </summary>
-    public sealed class AdminTemplateStep : IRecipeStepHandler
+    private readonly AdminTemplatesManager _adminTemplatesManager;
+
+    public AdminTemplateStep(AdminTemplatesManager templatesManager)
     {
-        private readonly AdminTemplatesManager _adminTemplatesManager;
+        _adminTemplatesManager = templatesManager;
+    }
 
-        public AdminTemplateStep(AdminTemplatesManager templatesManager)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "AdminTemplates", StringComparison.OrdinalIgnoreCase))
         {
-            _adminTemplatesManager = templatesManager;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        if (context.Step.TryGetPropertyValue("AdminTemplates", out var jsonNode) && jsonNode is JsonObject templates)
         {
-            if (!string.Equals(context.Name, "AdminTemplates", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            if (context.Step.TryGetPropertyValue("AdminTemplates", out var jsonNode) && jsonNode is JsonObject templates)
+            foreach (var property in templates)
             {
-                foreach (var property in templates)
-                {
-                    var name = property.Key;
-                    var value = property.Value.ToObject<Template>();
+                var name = property.Key;
+                var value = property.Value.ToObject<Template>();
 
-                    await _adminTemplatesManager.UpdateTemplateAsync(name, value);
-                }
+                await _adminTemplatesManager.UpdateTemplateAsync(name, value);
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Recipes/TemplateStep.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Recipes/TemplateStep.cs
index f87b7c06433..6e7d9d82b5b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Recipes/TemplateStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Recipes/TemplateStep.cs
@@ -6,37 +6,36 @@
 using OrchardCore.Templates.Models;
 using OrchardCore.Templates.Services;
 
-namespace OrchardCore.Templates.Recipes
+namespace OrchardCore.Templates.Recipes;
+
+/// <summary>
+/// This recipe step creates a set of templates.
+/// </summary>
+public sealed class TemplateStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step creates a set of templates.
-    /// </summary>
-    public sealed class TemplateStep : IRecipeStepHandler
+    private readonly TemplatesManager _templatesManager;
+
+    public TemplateStep(
+        TemplatesManager templatesManager)
     {
-        private readonly TemplatesManager _templatesManager;
+        _templatesManager = templatesManager;
+    }
 
-        public TemplateStep(
-            TemplatesManager templatesManager)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "Templates", StringComparison.OrdinalIgnoreCase))
         {
-            _templatesManager = templatesManager;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        if (context.Step.TryGetPropertyValue("Templates", out var jsonNode) && jsonNode is JsonObject templates)
         {
-            if (!string.Equals(context.Name, "Templates", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            if (context.Step.TryGetPropertyValue("Templates", out var jsonNode) && jsonNode is JsonObject templates)
+            foreach (var property in templates)
             {
-                foreach (var property in templates)
-                {
-                    var name = property.Key;
-                    var value = property.Value.ToObject<Template>();
+                var name = property.Key;
+                var value = property.Value.ToObject<Template>();
 
-                    await _templatesManager.UpdateTemplateAsync(name, value);
-                }
+                await _templatesManager.UpdateTemplateAsync(name, value);
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/ResourceManagementOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Templates/ResourceManagementOptionsConfiguration.cs
index 98b85b6c175..146866b0701 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/ResourceManagementOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/ResourceManagementOptionsConfiguration.cs
@@ -1,25 +1,24 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Templates
+namespace OrchardCore.Templates;
+
+public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
 {
-    public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
-    {
-        private static readonly ResourceManifest _manifest;
+    private static readonly ResourceManifest _manifest;
 
-        static ResourceManagementOptionsConfiguration()
-        {
-            _manifest = new ResourceManifest();
+    static ResourceManagementOptionsConfiguration()
+    {
+        _manifest = new ResourceManifest();
 
-            _manifest
-                .DefineScript("templatepreview-edit")
-                .SetUrl("~/OrchardCore.Templates/Scripts/templatepreview.edit.min.js", "~/OrchardCore.Templates/Scripts/templatepreview.edit.js")
-                .SetVersion("1.0.0");
-        }
+        _manifest
+            .DefineScript("templatepreview-edit")
+            .SetUrl("~/OrchardCore.Templates/Scripts/templatepreview.edit.min.js", "~/OrchardCore.Templates/Scripts/templatepreview.edit.js")
+            .SetVersion("1.0.0");
+    }
 
-        public void Configure(ResourceManagementOptions options)
-        {
-            options.ResourceManifests.Add(_manifest);
-        }
+    public void Configure(ResourceManagementOptions options)
+    {
+        options.ResourceManifests.Add(_manifest);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Services/AdminPreviewTemplatesProvider.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Services/AdminPreviewTemplatesProvider.cs
index 3fa0447b40b..b804b9ae8c5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Services/AdminPreviewTemplatesProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Services/AdminPreviewTemplatesProvider.cs
@@ -3,43 +3,42 @@
 using OrchardCore.Templates.Models;
 using OrchardCore.Templates.ViewModels;
 
-namespace OrchardCore.Templates.Services
+namespace OrchardCore.Templates.Services;
+
+/// <summary>
+/// And instance of this class provides custom templates to use while previewing a page.
+/// </summary>
+public class AdminPreviewTemplatesProvider
 {
-    /// <summary>
-    /// And instance of this class provides custom templates to use while previewing a page.
-    /// </summary>
-    public class AdminPreviewTemplatesProvider
-    {
-        private readonly Lazy<AdminTemplatesDocument> _templatesDocument;
+    private readonly Lazy<AdminTemplatesDocument> _templatesDocument;
 
-        public AdminPreviewTemplatesProvider(IHttpContextAccessor httpContextAccessor)
+    public AdminPreviewTemplatesProvider(IHttpContextAccessor httpContextAccessor)
+    {
+        _templatesDocument = new Lazy<AdminTemplatesDocument>(() =>
         {
-            _templatesDocument = new Lazy<AdminTemplatesDocument>(() =>
-            {
-                var httpContext = httpContextAccessor.HttpContext;
-
-                var templatesDocument = new AdminTemplatesDocument();
+            var httpContext = httpContextAccessor.HttpContext;
 
-                if (httpContext.Items.TryGetValue("OrchardCore.PreviewTemplate", out var model))
-                {
-                    var viewModel = model as TemplateViewModel;
+            var templatesDocument = new AdminTemplatesDocument();
 
-                    if (viewModel == null || viewModel.Name == null)
-                    {
-                        return templatesDocument;
-                    }
+            if (httpContext.Items.TryGetValue("OrchardCore.PreviewTemplate", out var model))
+            {
+                var viewModel = model as TemplateViewModel;
 
-                    var template = new Template { Content = viewModel.Content };
-                    templatesDocument.Templates.Add(viewModel.Name, template);
+                if (viewModel == null || viewModel.Name == null)
+                {
+                    return templatesDocument;
                 }
 
-                return templatesDocument;
-            });
-        }
+                var template = new Template { Content = viewModel.Content };
+                templatesDocument.Templates.Add(viewModel.Name, template);
+            }
 
-        public AdminTemplatesDocument GetTemplates()
-        {
-            return _templatesDocument.Value;
-        }
+            return templatesDocument;
+        });
+    }
+
+    public AdminTemplatesDocument GetTemplates()
+    {
+        return _templatesDocument.Value;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Services/AdminTemplatesManager.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Services/AdminTemplatesManager.cs
index 5fa66aa30ae..27db67dd298 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Services/AdminTemplatesManager.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Services/AdminTemplatesManager.cs
@@ -2,36 +2,35 @@
 using OrchardCore.Documents;
 using OrchardCore.Templates.Models;
 
-namespace OrchardCore.Templates.Services
+namespace OrchardCore.Templates.Services;
+
+public class AdminTemplatesManager
 {
-    public class AdminTemplatesManager
-    {
-        private readonly IDocumentManager<AdminTemplatesDocument> _documentManager;
+    private readonly IDocumentManager<AdminTemplatesDocument> _documentManager;
 
-        public AdminTemplatesManager(IDocumentManager<AdminTemplatesDocument> documentManager) => _documentManager = documentManager;
+    public AdminTemplatesManager(IDocumentManager<AdminTemplatesDocument> documentManager) => _documentManager = documentManager;
 
-        /// <summary>
-        /// Loads the templates document from the store for updating and that should not be cached.
-        /// </summary>
-        public Task<AdminTemplatesDocument> LoadTemplatesDocumentAsync() => _documentManager.GetOrCreateMutableAsync();
+    /// <summary>
+    /// Loads the templates document from the store for updating and that should not be cached.
+    /// </summary>
+    public Task<AdminTemplatesDocument> LoadTemplatesDocumentAsync() => _documentManager.GetOrCreateMutableAsync();
 
-        /// <summary>
-        /// Gets the background task document from the cache for sharing and that should not be updated.
-        /// </summary>
-        public Task<AdminTemplatesDocument> GetTemplatesDocumentAsync() => _documentManager.GetOrCreateImmutableAsync();
+    /// <summary>
+    /// Gets the background task document from the cache for sharing and that should not be updated.
+    /// </summary>
+    public Task<AdminTemplatesDocument> GetTemplatesDocumentAsync() => _documentManager.GetOrCreateImmutableAsync();
 
-        public async Task RemoveTemplateAsync(string name)
-        {
-            var document = await LoadTemplatesDocumentAsync();
-            document.Templates.Remove(name);
-            await _documentManager.UpdateAsync(document);
-        }
+    public async Task RemoveTemplateAsync(string name)
+    {
+        var document = await LoadTemplatesDocumentAsync();
+        document.Templates.Remove(name);
+        await _documentManager.UpdateAsync(document);
+    }
 
-        public async Task UpdateTemplateAsync(string name, Template template)
-        {
-            var document = await LoadTemplatesDocumentAsync();
-            document.Templates[name] = template;
-            await _documentManager.UpdateAsync(document);
-        }
+    public async Task UpdateTemplateAsync(string name, Template template)
+    {
+        var document = await LoadTemplatesDocumentAsync();
+        document.Templates[name] = template;
+        await _documentManager.UpdateAsync(document);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Services/AdminTemplatesShapeBindingResolver.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Services/AdminTemplatesShapeBindingResolver.cs
index a8f0abcbaf1..a5eb19d8d42 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Services/AdminTemplatesShapeBindingResolver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Services/AdminTemplatesShapeBindingResolver.cs
@@ -7,68 +7,67 @@
 using OrchardCore.Liquid;
 using OrchardCore.Templates.Models;
 
-namespace OrchardCore.Templates.Services
+namespace OrchardCore.Templates.Services;
+
+public class AdminTemplatesShapeBindingResolver : IShapeBindingResolver
 {
-    public class AdminTemplatesShapeBindingResolver : IShapeBindingResolver
+    private AdminTemplatesDocument _templatesDocument;
+    private readonly AdminTemplatesManager _templatesManager;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly AdminPreviewTemplatesProvider _previewTemplatesProvider;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly HtmlEncoder _htmlEncoder;
+    private bool? _isAdmin;
+
+    public AdminTemplatesShapeBindingResolver(
+        AdminTemplatesManager templatesManager,
+        ILiquidTemplateManager liquidTemplateManager,
+        AdminPreviewTemplatesProvider previewTemplatesProvider,
+        IHttpContextAccessor httpContextAccessor,
+        HtmlEncoder htmlEncoder)
     {
-        private AdminTemplatesDocument _templatesDocument;
-        private readonly AdminTemplatesManager _templatesManager;
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly AdminPreviewTemplatesProvider _previewTemplatesProvider;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly HtmlEncoder _htmlEncoder;
-        private bool? _isAdmin;
+        _templatesManager = templatesManager;
+        _liquidTemplateManager = liquidTemplateManager;
+        _previewTemplatesProvider = previewTemplatesProvider;
+        _httpContextAccessor = httpContextAccessor;
+        _htmlEncoder = htmlEncoder;
+    }
 
-        public AdminTemplatesShapeBindingResolver(
-            AdminTemplatesManager templatesManager,
-            ILiquidTemplateManager liquidTemplateManager,
-            AdminPreviewTemplatesProvider previewTemplatesProvider,
-            IHttpContextAccessor httpContextAccessor,
-            HtmlEncoder htmlEncoder)
-        {
-            _templatesManager = templatesManager;
-            _liquidTemplateManager = liquidTemplateManager;
-            _previewTemplatesProvider = previewTemplatesProvider;
-            _httpContextAccessor = httpContextAccessor;
-            _htmlEncoder = htmlEncoder;
-        }
+    public async Task<ShapeBinding> GetShapeBindingAsync(string shapeType)
+    {
+        // Cache this value since the service is scoped and this method is invoked for every
+        // alternate of every shape.
+        _isAdmin ??= AdminAttribute.IsApplied(_httpContextAccessor.HttpContext);
 
-        public async Task<ShapeBinding> GetShapeBindingAsync(string shapeType)
+        if (!_isAdmin.Value)
         {
-            // Cache this value since the service is scoped and this method is invoked for every
-            // alternate of every shape.
-            _isAdmin ??= AdminAttribute.IsApplied(_httpContextAccessor.HttpContext);
-
-            if (!_isAdmin.Value)
-            {
-                return null;
-            }
-
-            var localTemplates = _previewTemplatesProvider.GetTemplates();
+            return null;
+        }
 
-            if (localTemplates != null && localTemplates.Templates.TryGetValue(shapeType, out var localTemplate))
-            {
-                return BuildShapeBinding(shapeType, localTemplate);
-            }
+        var localTemplates = _previewTemplatesProvider.GetTemplates();
 
-            _templatesDocument ??= await _templatesManager.GetTemplatesDocumentAsync();
+        if (localTemplates != null && localTemplates.Templates.TryGetValue(shapeType, out var localTemplate))
+        {
+            return BuildShapeBinding(shapeType, localTemplate);
+        }
 
-            if (_templatesDocument.Templates.TryGetValue(shapeType, out var template))
-            {
-                return BuildShapeBinding(shapeType, template);
-            }
+        _templatesDocument ??= await _templatesManager.GetTemplatesDocumentAsync();
 
-            return null;
+        if (_templatesDocument.Templates.TryGetValue(shapeType, out var template))
+        {
+            return BuildShapeBinding(shapeType, template);
         }
 
-        private ShapeBinding BuildShapeBinding(string shapeType, Template template)
+        return null;
+    }
+
+    private ShapeBinding BuildShapeBinding(string shapeType, Template template)
+    {
+        return new ShapeBinding()
         {
-            return new ShapeBinding()
-            {
-                BindingName = shapeType,
-                BindingSource = shapeType,
-                BindingAsync = displayContext => _liquidTemplateManager.RenderHtmlContentAsync(template.Content, _htmlEncoder, displayContext.Value)
-            };
-        }
+            BindingName = shapeType,
+            BindingSource = shapeType,
+            BindingAsync = displayContext => _liquidTemplateManager.RenderHtmlContentAsync(template.Content, _htmlEncoder, displayContext.Value)
+        };
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Services/PreviewTemplatesProvider.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Services/PreviewTemplatesProvider.cs
index 3fbb70a2340..fcc02522fff 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Services/PreviewTemplatesProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Services/PreviewTemplatesProvider.cs
@@ -3,43 +3,42 @@
 using OrchardCore.Templates.Models;
 using OrchardCore.Templates.ViewModels;
 
-namespace OrchardCore.Templates.Services
+namespace OrchardCore.Templates.Services;
+
+/// <summary>
+/// And instance of this class provides custom templates to use while previewing a page.
+/// </summary>
+public class PreviewTemplatesProvider
 {
-    /// <summary>
-    /// And instance of this class provides custom templates to use while previewing a page.
-    /// </summary>
-    public class PreviewTemplatesProvider
-    {
-        private readonly Lazy<TemplatesDocument> _templatesDocument;
+    private readonly Lazy<TemplatesDocument> _templatesDocument;
 
-        public PreviewTemplatesProvider(IHttpContextAccessor httpContextAccessor)
+    public PreviewTemplatesProvider(IHttpContextAccessor httpContextAccessor)
+    {
+        _templatesDocument = new Lazy<TemplatesDocument>(() =>
         {
-            _templatesDocument = new Lazy<TemplatesDocument>(() =>
-            {
-                var httpContext = httpContextAccessor.HttpContext;
-
-                var templatesDocument = new TemplatesDocument();
+            var httpContext = httpContextAccessor.HttpContext;
 
-                if (httpContext.Items.TryGetValue("OrchardCore.PreviewTemplate", out var model))
-                {
-                    var viewModel = model as TemplateViewModel;
+            var templatesDocument = new TemplatesDocument();
 
-                    if (viewModel == null || viewModel.Name == null)
-                    {
-                        return templatesDocument;
-                    }
+            if (httpContext.Items.TryGetValue("OrchardCore.PreviewTemplate", out var model))
+            {
+                var viewModel = model as TemplateViewModel;
 
-                    var template = new Template { Content = viewModel.Content };
-                    templatesDocument.Templates.Add(viewModel.Name, template);
+                if (viewModel == null || viewModel.Name == null)
+                {
+                    return templatesDocument;
                 }
 
-                return templatesDocument;
-            });
-        }
+                var template = new Template { Content = viewModel.Content };
+                templatesDocument.Templates.Add(viewModel.Name, template);
+            }
 
-        public TemplatesDocument GetTemplates()
-        {
-            return _templatesDocument.Value;
-        }
+            return templatesDocument;
+        });
+    }
+
+    public TemplatesDocument GetTemplates()
+    {
+        return _templatesDocument.Value;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Services/TemplatesManager.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Services/TemplatesManager.cs
index ce19343fe87..4f216f758b8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Services/TemplatesManager.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Services/TemplatesManager.cs
@@ -2,36 +2,35 @@
 using OrchardCore.Documents;
 using OrchardCore.Templates.Models;
 
-namespace OrchardCore.Templates.Services
+namespace OrchardCore.Templates.Services;
+
+public class TemplatesManager
 {
-    public class TemplatesManager
-    {
-        private readonly IDocumentManager<TemplatesDocument> _documentManager;
+    private readonly IDocumentManager<TemplatesDocument> _documentManager;
 
-        public TemplatesManager(IDocumentManager<TemplatesDocument> documentManager) => _documentManager = documentManager;
+    public TemplatesManager(IDocumentManager<TemplatesDocument> documentManager) => _documentManager = documentManager;
 
-        /// <summary>
-        /// Loads the templates document from the store for updating and that should not be cached.
-        /// </summary>
-        public Task<TemplatesDocument> LoadTemplatesDocumentAsync() => _documentManager.GetOrCreateMutableAsync();
+    /// <summary>
+    /// Loads the templates document from the store for updating and that should not be cached.
+    /// </summary>
+    public Task<TemplatesDocument> LoadTemplatesDocumentAsync() => _documentManager.GetOrCreateMutableAsync();
 
-        /// <summary>
-        /// Gets the templates document from the cache for sharing and that should not be updated.
-        /// </summary>
-        public Task<TemplatesDocument> GetTemplatesDocumentAsync() => _documentManager.GetOrCreateImmutableAsync();
+    /// <summary>
+    /// Gets the templates document from the cache for sharing and that should not be updated.
+    /// </summary>
+    public Task<TemplatesDocument> GetTemplatesDocumentAsync() => _documentManager.GetOrCreateImmutableAsync();
 
-        public async Task RemoveTemplateAsync(string name)
-        {
-            var document = await LoadTemplatesDocumentAsync();
-            document.Templates.Remove(name);
-            await _documentManager.UpdateAsync(document);
-        }
+    public async Task RemoveTemplateAsync(string name)
+    {
+        var document = await LoadTemplatesDocumentAsync();
+        document.Templates.Remove(name);
+        await _documentManager.UpdateAsync(document);
+    }
 
-        public async Task UpdateTemplateAsync(string name, Template template)
-        {
-            var document = await LoadTemplatesDocumentAsync();
-            document.Templates[name] = template;
-            await _documentManager.UpdateAsync(document);
-        }
+    public async Task UpdateTemplateAsync(string name, Template template)
+    {
+        var document = await LoadTemplatesDocumentAsync();
+        document.Templates[name] = template;
+        await _documentManager.UpdateAsync(document);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Services/TemplatesShapeBindingResolver.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Services/TemplatesShapeBindingResolver.cs
index 86df95fc5c4..7982c1d5c2d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Services/TemplatesShapeBindingResolver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Services/TemplatesShapeBindingResolver.cs
@@ -8,70 +8,69 @@
 using OrchardCore.Liquid;
 using OrchardCore.Templates.Models;
 
-namespace OrchardCore.Templates.Services
+namespace OrchardCore.Templates.Services;
+
+public class TemplatesShapeBindingResolver : IShapeBindingResolver
 {
-    public class TemplatesShapeBindingResolver : IShapeBindingResolver
+    private TemplatesDocument _templatesDocument;
+    private readonly TemplatesDocument _localTemplates;
+
+    private readonly TemplatesManager _templatesManager;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly HtmlEncoder _htmlEncoder;
+    private bool? _isAdmin;
+
+    public TemplatesShapeBindingResolver(
+        TemplatesManager templatesManager,
+        ILiquidTemplateManager liquidTemplateManager,
+        PreviewTemplatesProvider previewTemplatesProvider,
+        IHttpContextAccessor httpContextAccessor,
+        HtmlEncoder htmlEncoder)
     {
-        private TemplatesDocument _templatesDocument;
-        private readonly TemplatesDocument _localTemplates;
+        _templatesManager = templatesManager;
+        _liquidTemplateManager = liquidTemplateManager;
+        _httpContextAccessor = httpContextAccessor;
+        _htmlEncoder = htmlEncoder;
+        _localTemplates = previewTemplatesProvider.GetTemplates();
+    }
 
-        private readonly TemplatesManager _templatesManager;
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly HtmlEncoder _htmlEncoder;
-        private bool? _isAdmin;
+    public async Task<ShapeBinding> GetShapeBindingAsync(string shapeType)
+    {
+        // Cache this value since the service is scoped and this method is invoked for every
+        // alternate of every shape.
+        _isAdmin ??= AdminAttribute.IsApplied(_httpContextAccessor.HttpContext);
 
-        public TemplatesShapeBindingResolver(
-            TemplatesManager templatesManager,
-            ILiquidTemplateManager liquidTemplateManager,
-            PreviewTemplatesProvider previewTemplatesProvider,
-            IHttpContextAccessor httpContextAccessor,
-            HtmlEncoder htmlEncoder)
+        if (_isAdmin.Value)
         {
-            _templatesManager = templatesManager;
-            _liquidTemplateManager = liquidTemplateManager;
-            _httpContextAccessor = httpContextAccessor;
-            _htmlEncoder = htmlEncoder;
-            _localTemplates = previewTemplatesProvider.GetTemplates();
+            return null;
         }
 
-        public async Task<ShapeBinding> GetShapeBindingAsync(string shapeType)
+        if (_localTemplates?.Templates?.Count != 0)
         {
-            // Cache this value since the service is scoped and this method is invoked for every
-            // alternate of every shape.
-            _isAdmin ??= AdminAttribute.IsApplied(_httpContextAccessor.HttpContext);
-
-            if (_isAdmin.Value)
+            if (_localTemplates.Templates.TryGetValue(shapeType, out var localTemplate))
             {
-                return null;
+                return BuildShapeBinding(shapeType, localTemplate);
             }
+        }
 
-            if (_localTemplates?.Templates?.Count != 0)
-            {
-                if (_localTemplates.Templates.TryGetValue(shapeType, out var localTemplate))
-                {
-                    return BuildShapeBinding(shapeType, localTemplate);
-                }
-            }
-
-            _templatesDocument ??= await _templatesManager.GetTemplatesDocumentAsync();
-
-            if (_templatesDocument.Templates.TryGetValue(shapeType, out var template))
-            {
-                return BuildShapeBinding(shapeType, template);
-            }
+        _templatesDocument ??= await _templatesManager.GetTemplatesDocumentAsync();
 
-            return null;
+        if (_templatesDocument.Templates.TryGetValue(shapeType, out var template))
+        {
+            return BuildShapeBinding(shapeType, template);
         }
 
-        private ShapeBinding BuildShapeBinding(string shapeType, Template template)
+        return null;
+    }
+
+    private ShapeBinding BuildShapeBinding(string shapeType, Template template)
+    {
+        return new ShapeBinding()
         {
-            return new ShapeBinding()
-            {
-                BindingName = shapeType,
-                BindingSource = shapeType,
-                BindingAsync = displayContext => _liquidTemplateManager.RenderHtmlContentAsync(template.Content, _htmlEncoder, displayContext.Value)
-            };
-        }
+            BindingName = shapeType,
+            BindingSource = shapeType,
+            BindingAsync = displayContext => _liquidTemplateManager.RenderHtmlContentAsync(template.Content, _htmlEncoder, displayContext.Value)
+        };
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Settings/TemplateContentPartDefinitionDriver.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Settings/TemplateContentPartDefinitionDriver.cs
index 1684a6cdea1..45ea0ddd524 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Settings/TemplateContentPartDefinitionDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Settings/TemplateContentPartDefinitionDriver.cs
@@ -6,35 +6,34 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Templates.ViewModels;
 
-namespace OrchardCore.Templates.Settings
+namespace OrchardCore.Templates.Settings;
+
+public sealed class TemplateContentPartDefinitionDriver : ContentPartDefinitionDisplayDriver
 {
-    public sealed class TemplateContentPartDefinitionDriver : ContentPartDefinitionDisplayDriver
-    {
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public TemplateContentPartDefinitionDriver(IStringLocalizer<TemplateContentPartDefinitionDriver> localizer)
-        {
-            S = localizer;
-        }
+    public TemplateContentPartDefinitionDriver(IStringLocalizer<TemplateContentPartDefinitionDriver> localizer)
+    {
+        S = localizer;
+    }
 
-        public override IDisplayResult Edit(ContentPartDefinition contentPartDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentPartDefinition contentPartDefinition, BuildEditorContext context)
+    {
+        return Initialize<ContentSettingsViewModel>("TemplateSettings", model =>
         {
-            return Initialize<ContentSettingsViewModel>("TemplateSettings", model =>
-            {
-                model.ContentSettingsEntries.Add(
-                    new ContentSettingsEntry
-                    {
-                        Key = contentPartDefinition.Name,
-                        Description = S["Template for a {0} part in detail views", contentPartDefinition.DisplayName()]
-                    });
+            model.ContentSettingsEntries.Add(
+                new ContentSettingsEntry
+                {
+                    Key = contentPartDefinition.Name,
+                    Description = S["Template for a {0} part in detail views", contentPartDefinition.DisplayName()]
+                });
 
-                model.ContentSettingsEntries.Add(
-                    new ContentSettingsEntry
-                    {
-                        Key = $"{contentPartDefinition.Name}_Summary",
-                        Description = S["Template for a {0} part in summary views", contentPartDefinition.DisplayName()]
-                    });
-            }).Location("Shortcuts");
-        }
+            model.ContentSettingsEntries.Add(
+                new ContentSettingsEntry
+                {
+                    Key = $"{contentPartDefinition.Name}_Summary",
+                    Description = S["Template for a {0} part in summary views", contentPartDefinition.DisplayName()]
+                });
+        }).Location("Shortcuts");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Settings/TemplateContentTypeDefinitionDriver.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Settings/TemplateContentTypeDefinitionDriver.cs
index ee8f4a2aadb..41201b647d8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Settings/TemplateContentTypeDefinitionDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Settings/TemplateContentTypeDefinitionDriver.cs
@@ -5,40 +5,39 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Templates.ViewModels;
 
-namespace OrchardCore.Templates.Settings
+namespace OrchardCore.Templates.Settings;
+
+public sealed class TemplateContentTypeDefinitionDriver : ContentTypeDefinitionDisplayDriver
 {
-    public sealed class TemplateContentTypeDefinitionDriver : ContentTypeDefinitionDisplayDriver
-    {
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public TemplateContentTypeDefinitionDriver(IStringLocalizer<TemplateContentTypeDefinitionDriver> localizer)
-        {
-            S = localizer;
-        }
+    public TemplateContentTypeDefinitionDriver(IStringLocalizer<TemplateContentTypeDefinitionDriver> localizer)
+    {
+        S = localizer;
+    }
 
-        public override IDisplayResult Edit(ContentTypeDefinition contentTypeDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentTypeDefinition contentTypeDefinition, BuildEditorContext context)
+    {
+        return Initialize<ContentSettingsViewModel>("TemplateSettings", model =>
         {
-            return Initialize<ContentSettingsViewModel>("TemplateSettings", model =>
+            if (!contentTypeDefinition.TryGetStereotype(out var stereotype))
             {
-                if (!contentTypeDefinition.TryGetStereotype(out var stereotype))
-                {
-                    stereotype = "Content";
-                }
+                stereotype = "Content";
+            }
 
-                model.ContentSettingsEntries.Add(
-                    new ContentSettingsEntry
-                    {
-                        Key = $"{stereotype}__{contentTypeDefinition.Name}",
-                        Description = S["Template for a {0} content item in detail views", contentTypeDefinition.DisplayName]
-                    });
+            model.ContentSettingsEntries.Add(
+                new ContentSettingsEntry
+                {
+                    Key = $"{stereotype}__{contentTypeDefinition.Name}",
+                    Description = S["Template for a {0} content item in detail views", contentTypeDefinition.DisplayName]
+                });
 
-                model.ContentSettingsEntries.Add(
-                    new ContentSettingsEntry
-                    {
-                        Key = $"{stereotype}_Summary__{contentTypeDefinition.Name}",
-                        Description = S["Template for a {0} content item in summary views", contentTypeDefinition.DisplayName]
-                    });
-            }).Location("Shortcuts");
-        }
+            model.ContentSettingsEntries.Add(
+                new ContentSettingsEntry
+                {
+                    Key = $"{stereotype}_Summary__{contentTypeDefinition.Name}",
+                    Description = S["Template for a {0} content item in summary views", contentTypeDefinition.DisplayName]
+                });
+        }).Location("Shortcuts");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Settings/TemplateContentTypePartDefinitionDriver.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Settings/TemplateContentTypePartDefinitionDriver.cs
index 5893deb8de8..24a19b90a59 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Settings/TemplateContentTypePartDefinitionDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Settings/TemplateContentTypePartDefinitionDriver.cs
@@ -5,38 +5,37 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Templates.ViewModels;
 
-namespace OrchardCore.Templates.Settings
+namespace OrchardCore.Templates.Settings;
+
+public sealed class TemplateContentTypePartDefinitionDriver : ContentTypePartDefinitionDisplayDriver
 {
-    public sealed class TemplateContentTypePartDefinitionDriver : ContentTypePartDefinitionDisplayDriver
-    {
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public TemplateContentTypePartDefinitionDriver(IStringLocalizer<TemplateContentTypePartDefinitionDriver> localizer)
-        {
-            S = localizer;
-        }
+    public TemplateContentTypePartDefinitionDriver(IStringLocalizer<TemplateContentTypePartDefinitionDriver> localizer)
+    {
+        S = localizer;
+    }
 
-        public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    {
+        return Initialize<ContentSettingsViewModel>("TemplateSettings", model =>
         {
-            return Initialize<ContentSettingsViewModel>("TemplateSettings", model =>
-            {
-                var contentType = contentTypePartDefinition.ContentTypeDefinition.Name;
-                var partName = contentTypePartDefinition.Name;
+            var contentType = contentTypePartDefinition.ContentTypeDefinition.Name;
+            var partName = contentTypePartDefinition.Name;
 
-                model.ContentSettingsEntries.Add(
-                    new ContentSettingsEntry
-                    {
-                        Key = $"{contentType}__{partName}",
-                        Description = S["Template for the {0} part in a {1} type in detail views", partName, contentTypePartDefinition.ContentTypeDefinition.DisplayName]
-                    });
+            model.ContentSettingsEntries.Add(
+                new ContentSettingsEntry
+                {
+                    Key = $"{contentType}__{partName}",
+                    Description = S["Template for the {0} part in a {1} type in detail views", partName, contentTypePartDefinition.ContentTypeDefinition.DisplayName]
+                });
 
-                model.ContentSettingsEntries.Add(
-                    new ContentSettingsEntry
-                    {
-                        Key = $"{contentType}_Summary__{partName}",
-                        Description = S["Template for the {0} part in a {1} type in summary views", partName, contentTypePartDefinition.ContentTypeDefinition.DisplayName]
-                    });
-            }).Location("Shortcuts");
-        }
+            model.ContentSettingsEntries.Add(
+                new ContentSettingsEntry
+                {
+                    Key = $"{contentType}_Summary__{partName}",
+                    Description = S["Template for the {0} part in a {1} type in summary views", partName, contentTypePartDefinition.ContentTypeDefinition.DisplayName]
+                });
+        }).Location("Shortcuts");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Templates/Startup.cs
index 201a106f2f1..c90363e57d7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/Startup.cs
@@ -13,43 +13,42 @@
 using OrchardCore.Templates.Services;
 using OrchardCore.Templates.Settings;
 
-namespace OrchardCore.Templates
+namespace OrchardCore.Templates;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
+        services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
 
-            services.AddScoped<IShapeBindingResolver, TemplatesShapeBindingResolver>();
-            services.AddScoped<PreviewTemplatesProvider>();
-            services.AddScoped<TemplatesManager>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddRecipeExecutionStep<TemplateStep>();
+        services.AddScoped<IShapeBindingResolver, TemplatesShapeBindingResolver>();
+        services.AddScoped<PreviewTemplatesProvider>();
+        services.AddScoped<TemplatesManager>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddRecipeExecutionStep<TemplateStep>();
 
-            // Template shortcuts in settings
-            services.AddScoped<IContentPartDefinitionDisplayDriver, TemplateContentPartDefinitionDriver>();
-            services.AddScoped<IContentTypeDefinitionDisplayDriver, TemplateContentTypeDefinitionDriver>();
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, TemplateContentTypePartDefinitionDriver>();
+        // Template shortcuts in settings
+        services.AddScoped<IContentPartDefinitionDisplayDriver, TemplateContentPartDefinitionDriver>();
+        services.AddScoped<IContentTypeDefinitionDisplayDriver, TemplateContentTypeDefinitionDriver>();
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, TemplateContentTypePartDefinitionDriver>();
 
-            services.AddDeployment<AllTemplatesDeploymentSource, AllTemplatesDeploymentStep, AllTemplatesDeploymentStepDriver>();
+        services.AddDeployment<AllTemplatesDeploymentSource, AllTemplatesDeploymentStep, AllTemplatesDeploymentStepDriver>();
 
-            services.AddScoped<AdminTemplatesManager>();
-            services.AddScoped<IPermissionProvider, AdminTemplatesPermissions>();
-        }
+        services.AddScoped<AdminTemplatesManager>();
+        services.AddScoped<IPermissionProvider, AdminTemplatesPermissions>();
     }
+}
 
-    [Feature("OrchardCore.AdminTemplates")]
-    public sealed class AdminTemplatesStartup : StartupBase
+[Feature("OrchardCore.AdminTemplates")]
+public sealed class AdminTemplatesStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IShapeBindingResolver, AdminTemplatesShapeBindingResolver>();
-            services.AddScoped<AdminPreviewTemplatesProvider>();
-            services.AddScoped<INavigationProvider, AdminTemplatesAdminMenu>();
-            services.AddRecipeExecutionStep<AdminTemplateStep>();
-            services.AddDeployment<AllAdminTemplatesDeploymentSource, AllAdminTemplatesDeploymentStep, AllAdminTemplatesDeploymentStepDriver>();
-        }
+        services.AddScoped<IShapeBindingResolver, AdminTemplatesShapeBindingResolver>();
+        services.AddScoped<AdminPreviewTemplatesProvider>();
+        services.AddScoped<INavigationProvider, AdminTemplatesAdminMenu>();
+        services.AddRecipeExecutionStep<AdminTemplateStep>();
+        services.AddDeployment<AllAdminTemplatesDeploymentSource, AllAdminTemplatesDeploymentStep, AllAdminTemplatesDeploymentStepDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/AllAdminTemplatesDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/AllAdminTemplatesDeploymentStepViewModel.cs
index 5522ac706a5..e86bb7e35be 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/AllAdminTemplatesDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/AllAdminTemplatesDeploymentStepViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Templates.ViewModels
+namespace OrchardCore.Templates.ViewModels;
+
+public class AllAdminTemplatesDeploymentStepViewModel
 {
-    public class AllAdminTemplatesDeploymentStepViewModel
-    {
-        public bool ExportAsFiles { get; set; }
-    }
+    public bool ExportAsFiles { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/AllTemplatesDeploymentStepViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/AllTemplatesDeploymentStepViewModel.cs
index fb582fbed31..16714b37edd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/AllTemplatesDeploymentStepViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/AllTemplatesDeploymentStepViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Templates.ViewModels
+namespace OrchardCore.Templates.ViewModels;
+
+public class AllTemplatesDeploymentStepViewModel
 {
-    public class AllTemplatesDeploymentStepViewModel
-    {
-        public bool ExportAsFiles { get; set; }
-    }
+    public bool ExportAsFiles { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/ContentSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/ContentSettingsViewModel.cs
index 41086152203..81c01df014e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/ContentSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/ContentSettingsViewModel.cs
@@ -1,16 +1,15 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Templates.ViewModels
+namespace OrchardCore.Templates.ViewModels;
+
+public class ContentSettingsViewModel
 {
-    public class ContentSettingsViewModel
-    {
-        public List<ContentSettingsEntry> ContentSettingsEntries { get; set; } = [];
-    }
+    public List<ContentSettingsEntry> ContentSettingsEntries { get; set; } = [];
+}
 
-    public class ContentSettingsEntry
-    {
-        public string Key { get; set; }
-        public LocalizedString Description { get; set; }
-    }
+public class ContentSettingsEntry
+{
+    public string Key { get; set; }
+    public LocalizedString Description { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/TemplateIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/TemplateIndexViewModel.cs
index 10da7ecf103..c5e718f9d50 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/TemplateIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/TemplateIndexViewModel.cs
@@ -3,39 +3,38 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using OrchardCore.Templates.Models;
 
-namespace OrchardCore.Templates.ViewModels
+namespace OrchardCore.Templates.ViewModels;
+
+public class TemplateIndexViewModel
+{
+    public IList<TemplateEntry> Templates { get; set; }
+    public dynamic Pager { get; set; }
+    public ContentOptions Options { get; set; } = new ContentOptions();
+}
+
+public class TemplateEntry
+{
+    public string Name { get; set; }
+    public Template Template { get; set; }
+    public bool IsChecked { get; set; }
+}
+
+public class ContentOptions
+{
+    public bool AdminTemplates { get; set; }
+    public string Search { get; set; }
+    public ContentsBulkAction BulkAction { get; set; }
+
+    #region Lists to populate
+
+    [BindNever]
+    public List<SelectListItem> ContentsBulkAction { get; set; }
+
+    #endregion Lists to populate
+}
+
+public enum ContentsBulkAction
 {
-    public class TemplateIndexViewModel
-    {
-        public IList<TemplateEntry> Templates { get; set; }
-        public dynamic Pager { get; set; }
-        public ContentOptions Options { get; set; } = new ContentOptions();
-    }
-
-    public class TemplateEntry
-    {
-        public string Name { get; set; }
-        public Template Template { get; set; }
-        public bool IsChecked { get; set; }
-    }
-
-    public class ContentOptions
-    {
-        public bool AdminTemplates { get; set; }
-        public string Search { get; set; }
-        public ContentsBulkAction BulkAction { get; set; }
-
-        #region Lists to populate
-
-        [BindNever]
-        public List<SelectListItem> ContentsBulkAction { get; set; }
-
-        #endregion Lists to populate
-    }
-
-    public enum ContentsBulkAction
-    {
-        None,
-        Remove
-    }
+    None,
+    Remove
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/TemplateViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/TemplateViewModel.cs
index af22e58a8b8..7f720e40505 100644
--- a/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/TemplateViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Templates/ViewModels/TemplateViewModel.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.Templates.ViewModels
+namespace OrchardCore.Templates.ViewModels;
+
+public class TemplateViewModel
 {
-    public class TemplateViewModel
-    {
-        public bool AdminTemplates { get; set; }
-        public string Name { get; set; }
-        public string Content { get; set; }
-        public string Description { get; set; }
-    }
+    public bool AdminTemplates { get; set; }
+    public string Name { get; set; }
+    public string Content { get; set; }
+    public string Description { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/AdminMenu.cs
index 98f71cccd88..a6b47e08aad 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/AdminMenu.cs
@@ -3,45 +3,44 @@
 using OrchardCore.Environment.Shell;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Tenants
+namespace OrchardCore.Tenants;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
-    {
-        private readonly ShellSettings _shellSettings;
+    private readonly ShellSettings _shellSettings;
+
+    internal readonly IStringLocalizer S;
 
-        internal readonly IStringLocalizer S;
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer, ShellSettings shellSettings)
+    {
+        _shellSettings = shellSettings;
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer, ShellSettings shellSettings)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            _shellSettings = shellSettings;
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+        // Don't add the menu item on non-default tenants
+        if (!_shellSettings.IsDefaultShell())
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            // Don't add the menu item on non-default tenants
-            if (!_shellSettings.IsDefaultShell())
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
-                    .AddClass("menu-multitenancy")
-                    .Id("multitenancy")
-                    .Add(S["Tenants"], S["Tenants"].PrefixPosition(), tenant => tenant
-                        .Action("Index", "Admin", "OrchardCore.Tenants")
-                        .Permission(Permissions.ManageTenants)
-                        .LocalNav()
-                    ),
-                    priority: 1);
-
             return Task.CompletedTask;
         }
+
+        builder
+            .Add(S["Multi-Tenancy"], "after", tenancy => tenancy
+                .AddClass("menu-multitenancy")
+                .Id("multitenancy")
+                .Add(S["Tenants"], S["Tenants"].PrefixPosition(), tenant => tenant
+                    .Action("Index", "Admin", "OrchardCore.Tenants")
+                    .Permission(Permissions.ManageTenants)
+                    .LocalNav()
+                ),
+                priority: 1);
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/AdminController.cs
index 294d926dfda..9852edb0b4b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/AdminController.cs
@@ -25,647 +25,646 @@
 using OrchardCore.Tenants.Services;
 using OrchardCore.Tenants.ViewModels;
 
-namespace OrchardCore.Tenants.Controllers
+namespace OrchardCore.Tenants.Controllers;
+
+[Admin("Tenants/{action}/{id?}", "Tenants{action}")]
+public class AdminController : Controller
 {
-    [Admin("Tenants/{action}/{id?}", "Tenants{action}")]
-    public class AdminController : Controller
+    private readonly IShellHost _shellHost;
+    private readonly IShellSettingsManager _shellSettingsManager;
+    private readonly IShellRemovalManager _shellRemovalManager;
+    private readonly IEnumerable<DatabaseProvider> _databaseProviders;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly ShellSettings _currentShellSettings;
+    private readonly IFeatureProfilesService _featureProfilesService;
+    private readonly IEnumerable<IRecipeHarvester> _recipeHarvesters;
+    private readonly IDataProtectionProvider _dataProtectorProvider;
+    private readonly IClock _clock;
+    private readonly INotifier _notifier;
+    private readonly ITenantValidator _tenantValidator;
+    private readonly PagerOptions _pagerOptions;
+    private readonly TenantsOptions _tenantsOptions;
+    private readonly ILogger _logger;
+    private readonly IShapeFactory _shapeFactory;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public AdminController(
+        IShellHost shellHost,
+        IShellSettingsManager shellSettingsManager,
+        IShellRemovalManager shellRemovalManager,
+        IEnumerable<DatabaseProvider> databaseProviders,
+        IAuthorizationService authorizationService,
+        ShellSettings currentShellSettings,
+        IFeatureProfilesService featureProfilesService,
+        IEnumerable<IRecipeHarvester> recipeHarvesters,
+        IDataProtectionProvider dataProtectorProvider,
+        IClock clock,
+        INotifier notifier,
+        ITenantValidator tenantValidator,
+        IOptions<PagerOptions> pagerOptions,
+        IOptions<TenantsOptions> tenantsOptions,
+        ILogger<AdminController> logger,
+        IShapeFactory shapeFactory,
+        IStringLocalizer<AdminController> stringLocalizer,
+        IHtmlLocalizer<AdminController> htmlLocalizer)
     {
-        private readonly IShellHost _shellHost;
-        private readonly IShellSettingsManager _shellSettingsManager;
-        private readonly IShellRemovalManager _shellRemovalManager;
-        private readonly IEnumerable<DatabaseProvider> _databaseProviders;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly ShellSettings _currentShellSettings;
-        private readonly IFeatureProfilesService _featureProfilesService;
-        private readonly IEnumerable<IRecipeHarvester> _recipeHarvesters;
-        private readonly IDataProtectionProvider _dataProtectorProvider;
-        private readonly IClock _clock;
-        private readonly INotifier _notifier;
-        private readonly ITenantValidator _tenantValidator;
-        private readonly PagerOptions _pagerOptions;
-        private readonly TenantsOptions _tenantsOptions;
-        private readonly ILogger _logger;
-        private readonly IShapeFactory _shapeFactory;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public AdminController(
-            IShellHost shellHost,
-            IShellSettingsManager shellSettingsManager,
-            IShellRemovalManager shellRemovalManager,
-            IEnumerable<DatabaseProvider> databaseProviders,
-            IAuthorizationService authorizationService,
-            ShellSettings currentShellSettings,
-            IFeatureProfilesService featureProfilesService,
-            IEnumerable<IRecipeHarvester> recipeHarvesters,
-            IDataProtectionProvider dataProtectorProvider,
-            IClock clock,
-            INotifier notifier,
-            ITenantValidator tenantValidator,
-            IOptions<PagerOptions> pagerOptions,
-            IOptions<TenantsOptions> tenantsOptions,
-            ILogger<AdminController> logger,
-            IShapeFactory shapeFactory,
-            IStringLocalizer<AdminController> stringLocalizer,
-            IHtmlLocalizer<AdminController> htmlLocalizer)
-        {
-            _shellHost = shellHost;
-            _shellSettingsManager = shellSettingsManager;
-            _shellRemovalManager = shellRemovalManager;
-            _databaseProviders = databaseProviders;
-            _authorizationService = authorizationService;
-            _currentShellSettings = currentShellSettings;
-            _featureProfilesService = featureProfilesService;
-            _recipeHarvesters = recipeHarvesters;
-            _dataProtectorProvider = dataProtectorProvider;
-            _clock = clock;
-            _notifier = notifier;
-            _tenantValidator = tenantValidator;
-            _pagerOptions = pagerOptions.Value;
-            _tenantsOptions = tenantsOptions.Value;
-            _logger = logger;
-            _shapeFactory = shapeFactory;
-            S = stringLocalizer;
-            H = htmlLocalizer;
-        }
-
-        [Admin("Tenants", "Tenants")]
-        public async Task<IActionResult> Index(TenantIndexOptions options, PagerParameters pagerParameters)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
-            {
-                return Forbid();
-            }
+        _shellHost = shellHost;
+        _shellSettingsManager = shellSettingsManager;
+        _shellRemovalManager = shellRemovalManager;
+        _databaseProviders = databaseProviders;
+        _authorizationService = authorizationService;
+        _currentShellSettings = currentShellSettings;
+        _featureProfilesService = featureProfilesService;
+        _recipeHarvesters = recipeHarvesters;
+        _dataProtectorProvider = dataProtectorProvider;
+        _clock = clock;
+        _notifier = notifier;
+        _tenantValidator = tenantValidator;
+        _pagerOptions = pagerOptions.Value;
+        _tenantsOptions = tenantsOptions.Value;
+        _logger = logger;
+        _shapeFactory = shapeFactory;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+    }
 
-            if (!_currentShellSettings.IsDefaultShell())
-            {
-                return Forbid();
-            }
+    [Admin("Tenants", "Tenants")]
+    public async Task<IActionResult> Index(TenantIndexOptions options, PagerParameters pagerParameters)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
+        {
+            return Forbid();
+        }
 
-            var allSettings = _shellHost.GetAllSettings().OrderBy(s => s.Name);
-            var dataProtector = _dataProtectorProvider.CreateProtector("Tokens").ToTimeLimitedDataProtector();
+        if (!_currentShellSettings.IsDefaultShell())
+        {
+            return Forbid();
+        }
 
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+        var allSettings = _shellHost.GetAllSettings().OrderBy(s => s.Name);
+        var dataProtector = _dataProtectorProvider.CreateProtector("Tokens").ToTimeLimitedDataProtector();
 
-            var entries = allSettings.Select(settings =>
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+
+        var entries = allSettings.Select(settings =>
+           {
+               var entry = new ShellSettingsEntry
                {
-                   var entry = new ShellSettingsEntry
-                   {
-                       Category = settings["Category"],
-                       Description = settings["Description"],
-                       Name = settings.Name,
-                       ShellSettings = settings,
-                   };
-
-                   if (settings.IsUninitialized() && !string.IsNullOrEmpty(settings["Secret"]))
-                   {
-                       entry.Token = dataProtector.Protect(settings["Secret"], _clock.UtcNow.Add(new TimeSpan(24, 0, 0)));
-                   }
-
-                   return entry;
-               }).ToList();
-
-            if (!string.IsNullOrWhiteSpace(options.Search))
-            {
-                entries = entries.Where(t => t.Name.IndexOf(options.Search, StringComparison.OrdinalIgnoreCase) > -1 ||
-                    (t.ShellSettings != null &&
-                     ((t.ShellSettings.RequestUrlHost != null && t.ShellSettings.RequestUrlHost.IndexOf(options.Search, StringComparison.OrdinalIgnoreCase) > -1) ||
-                     (t.ShellSettings.RequestUrlPrefix != null && t.ShellSettings.RequestUrlPrefix.IndexOf(options.Search, StringComparison.OrdinalIgnoreCase) > -1)))).ToList();
-            }
+                   Category = settings["Category"],
+                   Description = settings["Description"],
+                   Name = settings.Name,
+                   ShellSettings = settings,
+               };
 
-            if (!string.IsNullOrWhiteSpace(options.Category))
-            {
-                entries = entries.Where(t => t.Category?.Equals(options.Category, StringComparison.OrdinalIgnoreCase) == true).ToList();
-            }
+               if (settings.IsUninitialized() && !string.IsNullOrEmpty(settings["Secret"]))
+               {
+                   entry.Token = dataProtector.Protect(settings["Secret"], _clock.UtcNow.Add(new TimeSpan(24, 0, 0)));
+               }
 
-            entries = options.Status switch
-            {
-                TenantsState.Disabled => entries.Where(t => t.ShellSettings.IsDisabled()).ToList(),
-                TenantsState.Running => entries.Where(t => t.ShellSettings.IsRunning()).ToList(),
-                TenantsState.Uninitialized => entries.Where(t => t.ShellSettings.IsUninitialized()).ToList(),
-                _ => entries,
-            };
+               return entry;
+           }).ToList();
 
-            entries = options.OrderBy switch
-            {
-                TenantsOrder.Name => entries.OrderBy(t => t.Name).ToList(),
-                TenantsOrder.State => entries.OrderBy(t => t.ShellSettings?.State).ToList(),
-                _ => entries.OrderByDescending(t => t.Name).ToList(),
-            };
+        if (!string.IsNullOrWhiteSpace(options.Search))
+        {
+            entries = entries.Where(t => t.Name.IndexOf(options.Search, StringComparison.OrdinalIgnoreCase) > -1 ||
+                (t.ShellSettings != null &&
+                 ((t.ShellSettings.RequestUrlHost != null && t.ShellSettings.RequestUrlHost.IndexOf(options.Search, StringComparison.OrdinalIgnoreCase) > -1) ||
+                 (t.ShellSettings.RequestUrlPrefix != null && t.ShellSettings.RequestUrlPrefix.IndexOf(options.Search, StringComparison.OrdinalIgnoreCase) > -1)))).ToList();
+        }
 
-            var results = entries
-                .Skip(pager.GetStartIndex())
-                .Take(pager.PageSize).ToList();
+        if (!string.IsNullOrWhiteSpace(options.Category))
+        {
+            entries = entries.Where(t => t.Category?.Equals(options.Category, StringComparison.OrdinalIgnoreCase) == true).ToList();
+        }
 
-            // Maintain previous route data when generating page links
-            var routeData = new RouteData();
-            routeData.Values.Add("Options.Status", options.Status);
-            routeData.Values.Add("Options.OrderBy", options.OrderBy);
+        entries = options.Status switch
+        {
+            TenantsState.Disabled => entries.Where(t => t.ShellSettings.IsDisabled()).ToList(),
+            TenantsState.Running => entries.Where(t => t.ShellSettings.IsRunning()).ToList(),
+            TenantsState.Uninitialized => entries.Where(t => t.ShellSettings.IsUninitialized()).ToList(),
+            _ => entries,
+        };
 
-            if (!string.IsNullOrEmpty(options.Category))
-            {
-                routeData.Values.TryAdd("Options.Category", options.Category);
-            }
+        entries = options.OrderBy switch
+        {
+            TenantsOrder.Name => entries.OrderBy(t => t.Name).ToList(),
+            TenantsOrder.State => entries.OrderBy(t => t.ShellSettings?.State).ToList(),
+            _ => entries.OrderByDescending(t => t.Name).ToList(),
+        };
 
-            if (!string.IsNullOrEmpty(options.Search))
-            {
-                routeData.Values.TryAdd("Options.Search", options.Search);
-            }
+        var results = entries
+            .Skip(pager.GetStartIndex())
+            .Take(pager.PageSize).ToList();
 
-            var pagerShape = await _shapeFactory.PagerAsync(pager, entries.Count, routeData);
+        // Maintain previous route data when generating page links
+        var routeData = new RouteData();
+        routeData.Values.Add("Options.Status", options.Status);
+        routeData.Values.Add("Options.OrderBy", options.OrderBy);
 
-            var model = new AdminIndexViewModel
-            {
-                ShellSettingsEntries = results,
-                Options = options,
-                Pager = pagerShape
-            };
-
-            // We populate the SelectLists
-            model.Options.TenantsCategories = allSettings
-                .GroupBy(settings => settings["Category"])
-                .Where(group => !string.IsNullOrEmpty(group.Key))
-                .Select(group => new SelectListItem(group.Key, group.Key, string.Equals(options.Category, group.Key, StringComparison.OrdinalIgnoreCase)))
-                .ToList();
-
-            model.Options.TenantsCategories.Insert(0, new SelectListItem(
-                S["All"],
-                string.Empty,
-                selected: string.IsNullOrEmpty(options.Category)));
-
-            model.Options.TenantsStates =
-            [
-                new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
-                new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
-                new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
-                new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
-            ];
-
-            model.Options.TenantsSorts =
-            [
-                new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
-                new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
-            ];
-
-            model.Options.TenantsBulkAction =
-            [
-                new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
-                new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
-            ];
-
-            return View(model);
-        }
-
-        [HttpPost, ActionName("Index")]
-        [FormValueRequired("submit.Filter")]
-        public ActionResult IndexFilterPOST(AdminIndexViewModel model)
-            => RedirectToAction("Index", new RouteValueDictionary
-            {
-                { "Options.Category", model.Options.Category },
-                { "Options.Status", model.Options.Status },
-                { "Options.OrderBy", model.Options.OrderBy },
-                { "Options.Search", model.Options.Search },
-                { "Options.TenantsStates", model.Options.TenantsStates }
-            });
-
-        [HttpPost]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<IActionResult> Index(BulkActionViewModel model)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
-            {
-                return Forbid();
-            }
+        if (!string.IsNullOrEmpty(options.Category))
+        {
+            routeData.Values.TryAdd("Options.Category", options.Category);
+        }
 
-            if (!_currentShellSettings.IsDefaultShell())
-            {
-                return Forbid();
-            }
+        if (!string.IsNullOrEmpty(options.Search))
+        {
+            routeData.Values.TryAdd("Options.Search", options.Search);
+        }
 
-            if (model.BulkAction.ToString() == nameof(TenantsBulkAction.Remove) && !_tenantsOptions.TenantRemovalAllowed)
-            {
-                return Forbid();
-            }
+        var pagerShape = await _shapeFactory.PagerAsync(pager, entries.Count, routeData);
 
-            var allSettings = _shellHost.GetAllSettings();
+        var model = new AdminIndexViewModel
+        {
+            ShellSettingsEntries = results,
+            Options = options,
+            Pager = pagerShape
+        };
+
+        // We populate the SelectLists
+        model.Options.TenantsCategories = allSettings
+            .GroupBy(settings => settings["Category"])
+            .Where(group => !string.IsNullOrEmpty(group.Key))
+            .Select(group => new SelectListItem(group.Key, group.Key, string.Equals(options.Category, group.Key, StringComparison.OrdinalIgnoreCase)))
+            .ToList();
+
+        model.Options.TenantsCategories.Insert(0, new SelectListItem(
+            S["All"],
+            string.Empty,
+            selected: string.IsNullOrEmpty(options.Category)));
+
+        model.Options.TenantsStates =
+        [
+            new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
+            new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
+            new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
+            new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
+        ];
+
+        model.Options.TenantsSorts =
+        [
+            new SelectListItem() { Text = S["Name"], Value = nameof(TenantsOrder.Name) },
+            new SelectListItem() { Text = S["State"], Value = nameof(TenantsOrder.State) }
+        ];
+
+        model.Options.TenantsBulkAction =
+        [
+            new SelectListItem() { Text = S["Disable"], Value = nameof(TenantsBulkAction.Disable) },
+            new SelectListItem() { Text = S["Enable"], Value = nameof(TenantsBulkAction.Enable) },
+        ];
+
+        return View(model);
+    }
 
-            foreach (var tenantName in model.TenantNames ?? [])
-            {
-                if (!_shellHost.TryGetSettings(tenantName, out var shellSettings))
-                {
-                    break;
-                }
-
-                switch (model.BulkAction.ToString())
-                {
-                    case "Disable":
-                        if (shellSettings.IsDefaultShell())
-                        {
-                            await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
-                        }
-                        else if (!shellSettings.IsRunning())
-                        {
-                            await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
-                        }
-                        else
-                        {
-                            await _shellHost.UpdateShellSettingsAsync(shellSettings.AsDisabled());
-                        }
-
-                        break;
-
-                    case "Enable":
-                        if (!shellSettings.IsDisabled())
-                        {
-                            await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
-                        }
-                        else
-                        {
-                            await _shellHost.UpdateShellSettingsAsync(shellSettings.AsRunning());
-                        }
-
-                        break;
-
-                    default:
-                        break;
-                }
-            }
+    [HttpPost, ActionName("Index")]
+    [FormValueRequired("submit.Filter")]
+    public ActionResult IndexFilterPOST(AdminIndexViewModel model)
+        => RedirectToAction("Index", new RouteValueDictionary
+        {
+            { "Options.Category", model.Options.Category },
+            { "Options.Status", model.Options.Status },
+            { "Options.OrderBy", model.Options.OrderBy },
+            { "Options.Search", model.Options.Search },
+            { "Options.TenantsStates", model.Options.TenantsStates }
+        });
+
+    [HttpPost]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<IActionResult> Index(BulkActionViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
+        {
+            return Forbid();
+        }
 
-            return RedirectToAction(nameof(Index));
+        if (!_currentShellSettings.IsDefaultShell())
+        {
+            return Forbid();
+        }
+
+        if (model.BulkAction.ToString() == nameof(TenantsBulkAction.Remove) && !_tenantsOptions.TenantRemovalAllowed)
+        {
+            return Forbid();
         }
 
-        public async Task<IActionResult> Create()
+        var allSettings = _shellHost.GetAllSettings();
+
+        foreach (var tenantName in model.TenantNames ?? [])
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
+            if (!_shellHost.TryGetSettings(tenantName, out var shellSettings))
             {
-                return Forbid();
+                break;
             }
 
-            if (!_currentShellSettings.IsDefaultShell())
+            switch (model.BulkAction.ToString())
             {
-                return Forbid();
-            }
+                case "Disable":
+                    if (shellSettings.IsDefaultShell())
+                    {
+                        await _notifier.WarningAsync(H["You cannot disable the default tenant."]);
+                    }
+                    else if (!shellSettings.IsRunning())
+                    {
+                        await _notifier.WarningAsync(H["The tenant '{0}' is already disabled.", shellSettings.Name]);
+                    }
+                    else
+                    {
+                        await _shellHost.UpdateShellSettingsAsync(shellSettings.AsDisabled());
+                    }
 
-            var recipeCollections = await Task.WhenAll(_recipeHarvesters.Select(x => x.HarvestRecipesAsync()));
-            var recipes = recipeCollections.SelectMany(x => x).Where(x => x.IsSetupRecipe).OrderBy(r => r.DisplayName).ToArray();
+                    break;
 
-            // Creates a default shell settings based on the configuration.
-            using var shellSettings = _shellSettingsManager
-                .CreateDefaultSettings()
-                .AsUninitialized()
-                .AsDisposable();
+                case "Enable":
+                    if (!shellSettings.IsDisabled())
+                    {
+                        await _notifier.WarningAsync(H["The tenant '{0}' is already enabled.", shellSettings.Name]);
+                    }
+                    else
+                    {
+                        await _shellHost.UpdateShellSettingsAsync(shellSettings.AsRunning());
+                    }
 
-            var currentFeatureProfiles = shellSettings.GetFeatureProfiles();
-            var featureProfiles = await GetFeatureProfilesAsync(currentFeatureProfiles);
+                    break;
 
-            var model = new EditTenantViewModel
-            {
-                Recipes = recipes,
-                RequestUrlHost = shellSettings.RequestUrlHost,
-                RequestUrlPrefix = shellSettings.RequestUrlPrefix,
-                RecipeName = shellSettings["RecipeName"],
-                FeatureProfiles = currentFeatureProfiles,
-                FeatureProfilesItems = featureProfiles,
-                DatabaseProvider = shellSettings["DatabaseProvider"],
-                ConnectionString = shellSettings["ConnectionString"],
-                TablePrefix = shellSettings["TablePrefix"],
-                Schema = shellSettings["Schema"],
-            };
-
-            model.DatabaseConfigurationPreset =
-                !string.IsNullOrEmpty(model.ConnectionString) ||
-                !string.IsNullOrEmpty(model.DatabaseProvider);
+                default:
+                    break;
+            }
+        }
 
-            model.Recipes = recipes;
+        return RedirectToAction(nameof(Index));
+    }
 
-            return View(model);
+    public async Task<IActionResult> Create()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Create(EditTenantViewModel model)
+        if (!_currentShellSettings.IsDefaultShell())
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            if (!_currentShellSettings.IsDefaultShell())
-            {
-                return Forbid();
-            }
+        var recipeCollections = await Task.WhenAll(_recipeHarvesters.Select(x => x.HarvestRecipesAsync()));
+        var recipes = recipeCollections.SelectMany(x => x).Where(x => x.IsSetupRecipe).OrderBy(r => r.DisplayName).ToArray();
 
-            if (ModelState.IsValid)
-            {
-                await ValidateViewModelAsync(model, true);
-            }
+        // Creates a default shell settings based on the configuration.
+        using var shellSettings = _shellSettingsManager
+            .CreateDefaultSettings()
+            .AsUninitialized()
+            .AsDisposable();
 
-            if (ModelState.IsValid)
-            {
-                // Creates a default shell settings based on the configuration.
-                using var shellSettings = _shellSettingsManager
-                    .CreateDefaultSettings()
-                    .AsUninitialized()
-                    .AsDisposable();
-
-                shellSettings.Name = model.Name;
-                shellSettings.RequestUrlHost = model.RequestUrlHost;
-                shellSettings.RequestUrlPrefix = model.RequestUrlPrefix;
-
-                shellSettings["Category"] = model.Category;
-                shellSettings["Description"] = model.Description;
-                shellSettings["ConnectionString"] = model.ConnectionString;
-                shellSettings["TablePrefix"] = model.TablePrefix;
-                shellSettings["Schema"] = model.Schema;
-                shellSettings["DatabaseProvider"] = model.DatabaseProvider;
-                shellSettings["Secret"] = Guid.NewGuid().ToString();
-                shellSettings["RecipeName"] = model.RecipeName;
-                shellSettings["FeatureProfile"] = string.Join(',', model.FeatureProfiles ?? []);
+        var currentFeatureProfiles = shellSettings.GetFeatureProfiles();
+        var featureProfiles = await GetFeatureProfilesAsync(currentFeatureProfiles);
 
-                await _shellHost.UpdateShellSettingsAsync(shellSettings);
+        var model = new EditTenantViewModel
+        {
+            Recipes = recipes,
+            RequestUrlHost = shellSettings.RequestUrlHost,
+            RequestUrlPrefix = shellSettings.RequestUrlPrefix,
+            RecipeName = shellSettings["RecipeName"],
+            FeatureProfiles = currentFeatureProfiles,
+            FeatureProfilesItems = featureProfiles,
+            DatabaseProvider = shellSettings["DatabaseProvider"],
+            ConnectionString = shellSettings["ConnectionString"],
+            TablePrefix = shellSettings["TablePrefix"],
+            Schema = shellSettings["Schema"],
+        };
+
+        model.DatabaseConfigurationPreset =
+            !string.IsNullOrEmpty(model.ConnectionString) ||
+            !string.IsNullOrEmpty(model.DatabaseProvider);
+
+        model.Recipes = recipes;
+
+        return View(model);
+    }
 
-                return RedirectToAction(nameof(Index));
-            }
+    [HttpPost]
+    public async Task<IActionResult> Create(EditTenantViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
+        {
+            return Forbid();
+        }
 
-            var recipeCollections = await Task.WhenAll(_recipeHarvesters.Select(x => x.HarvestRecipesAsync()));
-            var recipes = recipeCollections.SelectMany(x => x).Where(x => x.IsSetupRecipe).OrderBy(r => r.DisplayName).ToArray();
-            model.Recipes = recipes;
-            model.FeatureProfilesItems = await GetFeatureProfilesAsync(model.FeatureProfiles);
+        if (!_currentShellSettings.IsDefaultShell())
+        {
+            return Forbid();
+        }
 
-            // If we got this far, something failed, redisplay form
-            return View(model);
+        if (ModelState.IsValid)
+        {
+            await ValidateViewModelAsync(model, true);
         }
 
-        public async Task<IActionResult> Edit(string id)
+        if (ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
-            {
-                return Forbid();
-            }
+            // Creates a default shell settings based on the configuration.
+            using var shellSettings = _shellSettingsManager
+                .CreateDefaultSettings()
+                .AsUninitialized()
+                .AsDisposable();
 
-            if (!_currentShellSettings.IsDefaultShell())
-            {
-                return Forbid();
-            }
+            shellSettings.Name = model.Name;
+            shellSettings.RequestUrlHost = model.RequestUrlHost;
+            shellSettings.RequestUrlPrefix = model.RequestUrlPrefix;
 
-            if (!_shellHost.TryGetSettings(id, out var shellSettings))
-            {
-                return NotFound();
-            }
+            shellSettings["Category"] = model.Category;
+            shellSettings["Description"] = model.Description;
+            shellSettings["ConnectionString"] = model.ConnectionString;
+            shellSettings["TablePrefix"] = model.TablePrefix;
+            shellSettings["Schema"] = model.Schema;
+            shellSettings["DatabaseProvider"] = model.DatabaseProvider;
+            shellSettings["Secret"] = Guid.NewGuid().ToString();
+            shellSettings["RecipeName"] = model.RecipeName;
+            shellSettings["FeatureProfile"] = string.Join(',', model.FeatureProfiles ?? []);
 
-            var currentFeatureProfiles = shellSettings.GetFeatureProfiles();
+            await _shellHost.UpdateShellSettingsAsync(shellSettings);
 
-            var featureProfiles = await GetFeatureProfilesAsync(currentFeatureProfiles);
+            return RedirectToAction(nameof(Index));
+        }
 
-            var model = new EditTenantViewModel
-            {
-                Category = shellSettings["Category"],
-                Description = shellSettings["Description"],
-                Name = shellSettings.Name,
-                RequestUrlHost = shellSettings.RequestUrlHost,
-                RequestUrlPrefix = shellSettings.RequestUrlPrefix,
-                FeatureProfiles = currentFeatureProfiles,
-                FeatureProfilesItems = featureProfiles
-            };
+        var recipeCollections = await Task.WhenAll(_recipeHarvesters.Select(x => x.HarvestRecipesAsync()));
+        var recipes = recipeCollections.SelectMany(x => x).Where(x => x.IsSetupRecipe).OrderBy(r => r.DisplayName).ToArray();
+        model.Recipes = recipes;
+        model.FeatureProfilesItems = await GetFeatureProfilesAsync(model.FeatureProfiles);
 
-            // The user can change the 'preset' database information only if the
-            // tenant has not been initialized yet
-            if (shellSettings.IsUninitialized())
-            {
-                var recipeCollections = await Task.WhenAll(_recipeHarvesters.Select(x => x.HarvestRecipesAsync()));
-                var recipes = recipeCollections.SelectMany(x => x).Where(x => x.IsSetupRecipe).OrderBy(r => r.DisplayName).ToArray();
-                model.Recipes = recipes;
-
-                model.DatabaseProvider = shellSettings["DatabaseProvider"];
-                model.TablePrefix = shellSettings["TablePrefix"];
-                model.Schema = shellSettings["Schema"];
-                model.ConnectionString = shellSettings["ConnectionString"];
-                model.RecipeName = shellSettings["RecipeName"];
-                model.CanEditDatabasePresets = true;
-            }
+        // If we got this far, something failed, redisplay form
+        return View(model);
+    }
 
-            return View(model);
+    public async Task<IActionResult> Edit(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Edit(EditTenantViewModel model)
+        if (!_currentShellSettings.IsDefaultShell())
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
-            {
-                return Forbid();
-            }
-
-            if (!_currentShellSettings.IsDefaultShell())
-            {
-                return Forbid();
-            }
-
-            if (ModelState.IsValid)
-            {
-                await ValidateViewModelAsync(model, false);
-            }
-
-            if (!_shellHost.TryGetSettings(model.Name, out var shellSettings))
-            {
-                return NotFound();
-            }
+            return Forbid();
+        }
 
-            if (ModelState.IsValid)
-            {
-                shellSettings["Description"] = model.Description;
-                shellSettings["Category"] = model.Category;
-                shellSettings.RequestUrlPrefix = model.RequestUrlPrefix;
-                shellSettings.RequestUrlHost = model.RequestUrlHost;
-                shellSettings["FeatureProfile"] = string.Join(',', model.FeatureProfiles ?? []);
-
-                // The user can change the 'preset' database information only if the
-                // tenant has not been initialized yet
-                if (shellSettings.IsUninitialized())
-                {
-                    shellSettings["DatabaseProvider"] = model.DatabaseProvider;
-                    shellSettings["TablePrefix"] = model.TablePrefix;
-                    shellSettings["Schema"] = model.Schema;
-                    shellSettings["ConnectionString"] = model.ConnectionString;
-                    shellSettings["RecipeName"] = model.RecipeName;
-                    shellSettings["Secret"] = Guid.NewGuid().ToString();
-                }
-
-                await _shellHost.UpdateShellSettingsAsync(shellSettings);
-
-                return RedirectToAction(nameof(Index));
-            }
+        if (!_shellHost.TryGetSettings(id, out var shellSettings))
+        {
+            return NotFound();
+        }
 
-            // If we got this far, something failed. Reinitialize the model and re-display form.
+        var currentFeatureProfiles = shellSettings.GetFeatureProfiles();
 
-            // The user can change the 'preset' database information only if the
-            // tenant has not been initialized yet
-            if (shellSettings.IsUninitialized())
-            {
-                model.DatabaseProvider = shellSettings["DatabaseProvider"];
-                model.TablePrefix = shellSettings["TablePrefix"];
-                model.Schema = shellSettings["Schema"];
-                model.ConnectionString = shellSettings["ConnectionString"];
-                model.RecipeName = shellSettings["RecipeName"];
-                model.CanEditDatabasePresets = true;
-            }
+        var featureProfiles = await GetFeatureProfilesAsync(currentFeatureProfiles);
 
+        var model = new EditTenantViewModel
+        {
+            Category = shellSettings["Category"],
+            Description = shellSettings["Description"],
+            Name = shellSettings.Name,
+            RequestUrlHost = shellSettings.RequestUrlHost,
+            RequestUrlPrefix = shellSettings.RequestUrlPrefix,
+            FeatureProfiles = currentFeatureProfiles,
+            FeatureProfilesItems = featureProfiles
+        };
+
+        // The user can change the 'preset' database information only if the
+        // tenant has not been initialized yet
+        if (shellSettings.IsUninitialized())
+        {
             var recipeCollections = await Task.WhenAll(_recipeHarvesters.Select(x => x.HarvestRecipesAsync()));
             var recipes = recipeCollections.SelectMany(x => x).Where(x => x.IsSetupRecipe).OrderBy(r => r.DisplayName).ToArray();
             model.Recipes = recipes;
-            model.FeatureProfilesItems = await GetFeatureProfilesAsync(model.FeatureProfiles);
 
-            return View(model);
+            model.DatabaseProvider = shellSettings["DatabaseProvider"];
+            model.TablePrefix = shellSettings["TablePrefix"];
+            model.Schema = shellSettings["Schema"];
+            model.ConnectionString = shellSettings["ConnectionString"];
+            model.RecipeName = shellSettings["RecipeName"];
+            model.CanEditDatabasePresets = true;
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Disable(string id)
+        return View(model);
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Edit(EditTenantViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            if (!_currentShellSettings.IsDefaultShell())
-            {
-                return Forbid();
-            }
+        if (!_currentShellSettings.IsDefaultShell())
+        {
+            return Forbid();
+        }
 
-            if (!_shellHost.TryGetSettings(id, out var shellSettings))
-            {
-                return NotFound();
-            }
+        if (ModelState.IsValid)
+        {
+            await ValidateViewModelAsync(model, false);
+        }
 
-            if (shellSettings.IsDefaultShell())
-            {
-                await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
-                return RedirectToAction(nameof(Index));
-            }
+        if (!_shellHost.TryGetSettings(model.Name, out var shellSettings))
+        {
+            return NotFound();
+        }
+
+        if (ModelState.IsValid)
+        {
+            shellSettings["Description"] = model.Description;
+            shellSettings["Category"] = model.Category;
+            shellSettings.RequestUrlPrefix = model.RequestUrlPrefix;
+            shellSettings.RequestUrlHost = model.RequestUrlHost;
+            shellSettings["FeatureProfile"] = string.Join(',', model.FeatureProfiles ?? []);
 
-            if (!shellSettings.IsRunning())
+            // The user can change the 'preset' database information only if the
+            // tenant has not been initialized yet
+            if (shellSettings.IsUninitialized())
             {
-                await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
-                return RedirectToAction(nameof(Index));
+                shellSettings["DatabaseProvider"] = model.DatabaseProvider;
+                shellSettings["TablePrefix"] = model.TablePrefix;
+                shellSettings["Schema"] = model.Schema;
+                shellSettings["ConnectionString"] = model.ConnectionString;
+                shellSettings["RecipeName"] = model.RecipeName;
+                shellSettings["Secret"] = Guid.NewGuid().ToString();
             }
 
-            await _shellHost.UpdateShellSettingsAsync(shellSettings.AsDisabled());
+            await _shellHost.UpdateShellSettingsAsync(shellSettings);
 
             return RedirectToAction(nameof(Index));
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Enable(string id)
+        // If we got this far, something failed. Reinitialize the model and re-display form.
+
+        // The user can change the 'preset' database information only if the
+        // tenant has not been initialized yet
+        if (shellSettings.IsUninitialized())
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
-            {
-                return Forbid();
-            }
+            model.DatabaseProvider = shellSettings["DatabaseProvider"];
+            model.TablePrefix = shellSettings["TablePrefix"];
+            model.Schema = shellSettings["Schema"];
+            model.ConnectionString = shellSettings["ConnectionString"];
+            model.RecipeName = shellSettings["RecipeName"];
+            model.CanEditDatabasePresets = true;
+        }
 
-            if (!_currentShellSettings.IsDefaultShell())
-            {
-                return Forbid();
-            }
+        var recipeCollections = await Task.WhenAll(_recipeHarvesters.Select(x => x.HarvestRecipesAsync()));
+        var recipes = recipeCollections.SelectMany(x => x).Where(x => x.IsSetupRecipe).OrderBy(r => r.DisplayName).ToArray();
+        model.Recipes = recipes;
+        model.FeatureProfilesItems = await GetFeatureProfilesAsync(model.FeatureProfiles);
 
-            if (!_shellHost.TryGetSettings(id, out var shellSettings))
-            {
-                return NotFound();
-            }
+        return View(model);
+    }
 
-            if (!shellSettings.IsDisabled())
-            {
-                await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
-                return RedirectToAction(nameof(Index));
-            }
+    [HttpPost]
+    public async Task<IActionResult> Disable(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
+        {
+            return Forbid();
+        }
+
+        if (!_currentShellSettings.IsDefaultShell())
+        {
+            return Forbid();
+        }
+
+        if (!_shellHost.TryGetSettings(id, out var shellSettings))
+        {
+            return NotFound();
+        }
 
-            await _shellHost.UpdateShellSettingsAsync(shellSettings.AsRunning());
+        if (shellSettings.IsDefaultShell())
+        {
+            await _notifier.ErrorAsync(H["You cannot disable the default tenant."]);
+            return RedirectToAction(nameof(Index));
+        }
 
+        if (!shellSettings.IsRunning())
+        {
+            await _notifier.ErrorAsync(H["You can only disable a Running tenant."]);
             return RedirectToAction(nameof(Index));
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Reload(string id)
+        await _shellHost.UpdateShellSettingsAsync(shellSettings.AsDisabled());
+
+        return RedirectToAction(nameof(Index));
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Enable(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            if (!_currentShellSettings.IsDefaultShell())
-            {
-                return Forbid();
-            }
+        if (!_currentShellSettings.IsDefaultShell())
+        {
+            return Forbid();
+        }
 
-            if (!_shellHost.TryGetSettings(id, out var shellSettings))
-            {
-                return NotFound();
-            }
+        if (!_shellHost.TryGetSettings(id, out var shellSettings))
+        {
+            return NotFound();
+        }
 
-            // Generating routes can fail while the tenant is recycled as routes can use services.
-            // It could be fixed by waiting for the next request or the end of the current one
-            // to actually release the tenant. Right now we render the url before recycling the tenant.
+        if (!shellSettings.IsDisabled())
+        {
+            await _notifier.ErrorAsync(H["You can only enable a Disabled tenant."]);
+            return RedirectToAction(nameof(Index));
+        }
 
-            var redirectUrl = Url.Action(nameof(Index));
+        await _shellHost.UpdateShellSettingsAsync(shellSettings.AsRunning());
 
-            await _shellHost.ReloadShellContextAsync(shellSettings);
+        return RedirectToAction(nameof(Index));
+    }
 
-            return Redirect(redirectUrl);
+    [HttpPost]
+    public async Task<IActionResult> Reload(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Remove(string id)
+        if (!_currentShellSettings.IsDefaultShell())
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants) || !_tenantsOptions.TenantRemovalAllowed)
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            if (!_currentShellSettings.IsDefaultShell())
-            {
-                return Forbid();
-            }
+        if (!_shellHost.TryGetSettings(id, out var shellSettings))
+        {
+            return NotFound();
+        }
 
-            if (!_shellHost.TryGetSettings(id, out var shellSettings))
-            {
-                return NotFound();
-            }
+        // Generating routes can fail while the tenant is recycled as routes can use services.
+        // It could be fixed by waiting for the next request or the end of the current one
+        // to actually release the tenant. Right now we render the url before recycling the tenant.
 
-            if (!shellSettings.IsRemovable())
-            {
-                await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
-                return RedirectToAction(nameof(Index));
-            }
+        var redirectUrl = Url.Action(nameof(Index));
 
-            var context = await _shellRemovalManager.RemoveAsync(shellSettings);
-            if (!context.Success)
-            {
-                await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
-            }
-            else
-            {
-                if (_logger.IsEnabled(LogLevel.Warning))
-                {
-                    _logger.LogWarning("The tenant '{TenantName}' was removed.", shellSettings.Name);
-                }
+        await _shellHost.ReloadShellContextAsync(shellSettings);
 
-                await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
-            }
+        return Redirect(redirectUrl);
+    }
 
-            return RedirectToAction(nameof(Index));
+    [HttpPost]
+    public async Task<IActionResult> Remove(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants) || !_tenantsOptions.TenantRemovalAllowed)
+        {
+            return Forbid();
+        }
+
+        if (!_currentShellSettings.IsDefaultShell())
+        {
+            return Forbid();
         }
 
-        private async Task<List<SelectListItem>> GetFeatureProfilesAsync(IEnumerable<string> currentFeatureProfiles)
+        if (!_shellHost.TryGetSettings(id, out var shellSettings))
         {
-            var featureProfiles = (await _featureProfilesService.GetFeatureProfilesAsync())
-                .Select(x => new SelectListItem(x.Value.Name ?? x.Key, x.Key, currentFeatureProfiles != null && currentFeatureProfiles.Contains(x.Key)))
-                .ToList();
+            return NotFound();
+        }
 
-            return featureProfiles;
+        if (!shellSettings.IsRemovable())
+        {
+            await _notifier.ErrorAsync(H["You can only remove a 'Disabled' or 'Uninitialized' tenant."]);
+            return RedirectToAction(nameof(Index));
         }
 
-        private async Task ValidateViewModelAsync(EditTenantViewModel model, bool isNewTenant)
+        var context = await _shellRemovalManager.RemoveAsync(shellSettings);
+        if (!context.Success)
+        {
+            await _notifier.ErrorAsync(H["An error occurred while removing the tenant '{0}'. {1}", id, context.ErrorMessage]);
+        }
+        else
         {
-            model.IsNewTenant = isNewTenant;
+            if (_logger.IsEnabled(LogLevel.Warning))
+            {
+                _logger.LogWarning("The tenant '{TenantName}' was removed.", shellSettings.Name);
+            }
 
-            ModelState.AddModelErrors(await _tenantValidator.ValidateAsync(model));
+            await _notifier.SuccessAsync(H["The tenant '{0}' was removed, see the log file for more info.", shellSettings.Name]);
         }
+
+        return RedirectToAction(nameof(Index));
+    }
+
+    private async Task<List<SelectListItem>> GetFeatureProfilesAsync(IEnumerable<string> currentFeatureProfiles)
+    {
+        var featureProfiles = (await _featureProfilesService.GetFeatureProfilesAsync())
+            .Select(x => new SelectListItem(x.Value.Name ?? x.Key, x.Key, currentFeatureProfiles != null && currentFeatureProfiles.Contains(x.Key)))
+            .ToList();
+
+        return featureProfiles;
+    }
+
+    private async Task ValidateViewModelAsync(EditTenantViewModel model, bool isNewTenant)
+    {
+        model.IsNewTenant = isNewTenant;
+
+        ModelState.AddModelErrors(await _tenantValidator.ValidateAsync(model));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/FeatureProfilesController.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/FeatureProfilesController.cs
index 7b50c1b44a7..c10cf2616eb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/FeatureProfilesController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/FeatureProfilesController.cs
@@ -21,268 +21,267 @@
 using OrchardCore.Tenants.Services;
 using OrchardCore.Tenants.ViewModels;
 
-namespace OrchardCore.Tenants.Controllers
+namespace OrchardCore.Tenants.Controllers;
+
+[Feature("OrchardCore.Tenants.FeatureProfiles")]
+[Admin("TenantFeatureProfiles/{action}/{id?}", "TenantFeatureProfiles{action}")]
+public class FeatureProfilesController : Controller
 {
-    [Feature("OrchardCore.Tenants.FeatureProfiles")]
-    [Admin("TenantFeatureProfiles/{action}/{id?}", "TenantFeatureProfiles{action}")]
-    public class FeatureProfilesController : Controller
+    private const string _optionsSearch = "Options.Search";
+
+    private readonly IAuthorizationService _authorizationService;
+    private readonly FeatureProfilesManager _featureProfilesManager;
+    private readonly INotifier _notifier;
+    private readonly PagerOptions _pagerOptions;
+    private readonly IShapeFactory _shapeFactory;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public FeatureProfilesController(
+        IAuthorizationService authorizationService,
+        FeatureProfilesManager featureProfilesManager,
+        INotifier notifier,
+        IOptions<PagerOptions> pagerOptions,
+        IShapeFactory shapeFactory,
+        IStringLocalizer<FeatureProfilesController> stringLocalizer,
+        IHtmlLocalizer<FeatureProfilesController> htmlLocalizer
+        )
     {
-        private const string _optionsSearch = "Options.Search";
-
-        private readonly IAuthorizationService _authorizationService;
-        private readonly FeatureProfilesManager _featureProfilesManager;
-        private readonly INotifier _notifier;
-        private readonly PagerOptions _pagerOptions;
-        private readonly IShapeFactory _shapeFactory;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public FeatureProfilesController(
-            IAuthorizationService authorizationService,
-            FeatureProfilesManager featureProfilesManager,
-            INotifier notifier,
-            IOptions<PagerOptions> pagerOptions,
-            IShapeFactory shapeFactory,
-            IStringLocalizer<FeatureProfilesController> stringLocalizer,
-            IHtmlLocalizer<FeatureProfilesController> htmlLocalizer
-            )
-        {
-            _authorizationService = authorizationService;
-            _featureProfilesManager = featureProfilesManager;
-            _notifier = notifier;
-            _pagerOptions = pagerOptions.Value;
-            _shapeFactory = shapeFactory;
-            S = stringLocalizer;
-            H = htmlLocalizer;
-        }
+        _authorizationService = authorizationService;
+        _featureProfilesManager = featureProfilesManager;
+        _notifier = notifier;
+        _pagerOptions = pagerOptions.Value;
+        _shapeFactory = shapeFactory;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+    }
 
-        [Admin("TenantFeatureProfiles", "TenantFeatureProfilesIndex")]
-        public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
+    [Admin("TenantFeatureProfiles", "TenantFeatureProfilesIndex")]
+    public async Task<IActionResult> Index(ContentOptions options, PagerParameters pagerParameters)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenantFeatureProfiles))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenantFeatureProfiles))
-            {
-                return Forbid();
-            }
-
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
-            var featureProfilesDocument = await _featureProfilesManager.GetFeatureProfilesDocumentAsync();
-
-            var featureProfiles = featureProfilesDocument.FeatureProfiles.ToList();
+            return Forbid();
+        }
 
-            if (!string.IsNullOrWhiteSpace(options.Search))
-            {
-                featureProfiles = featureProfiles.Where(x => x.Key.Contains(options.Search, StringComparison.OrdinalIgnoreCase)).ToList();
-            }
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+        var featureProfilesDocument = await _featureProfilesManager.GetFeatureProfilesDocumentAsync();
 
-            var count = featureProfiles.Count;
+        var featureProfiles = featureProfilesDocument.FeatureProfiles.ToList();
 
-            featureProfiles = featureProfiles.OrderBy(x => x.Key)
-                .Skip(pager.GetStartIndex())
-                .Take(pager.PageSize).ToList();
+        if (!string.IsNullOrWhiteSpace(options.Search))
+        {
+            featureProfiles = featureProfiles.Where(x => x.Key.Contains(options.Search, StringComparison.OrdinalIgnoreCase)).ToList();
+        }
 
-            // Maintain previous route data when generating page links.
-            var routeData = new RouteData();
+        var count = featureProfiles.Count;
 
-            if (!string.IsNullOrEmpty(options.Search))
-            {
-                routeData.Values.TryAdd(_optionsSearch, options.Search);
-            }
+        featureProfiles = featureProfiles.OrderBy(x => x.Key)
+            .Skip(pager.GetStartIndex())
+            .Take(pager.PageSize).ToList();
 
-            var pagerShape = await _shapeFactory.PagerAsync(pager, count, routeData);
+        // Maintain previous route data when generating page links.
+        var routeData = new RouteData();
 
-            var model = new FeatureProfilesIndexViewModel
-            {
-                FeatureProfiles = featureProfiles.Select(x => new FeatureProfileEntry
-                {
-                    Name = x.Value.Name ?? x.Key,
-                    FeatureProfile = x.Value,
-                    Id = x.Key
-                }).ToList(),
-                Options = options,
-                Pager = pagerShape
-            };
-
-            model.Options.ContentsBulkAction =
-            [
-                new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
-            ];
-
-            return View(model);
+        if (!string.IsNullOrEmpty(options.Search))
+        {
+            routeData.Values.TryAdd(_optionsSearch, options.Search);
         }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.Filter")]
-        public ActionResult IndexFilterPOST(FeatureProfilesIndexViewModel model)
-            => RedirectToAction(nameof(Index), new RouteValueDictionary
-            {
-                { _optionsSearch, model.Options.Search }
-            });
+        var pagerShape = await _shapeFactory.PagerAsync(pager, count, routeData);
 
-        public async Task<IActionResult> Create()
+        var model = new FeatureProfilesIndexViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenantFeatureProfiles))
-            {
-                return Forbid();
-            }
-
-            var viewModel = new FeatureProfileViewModel()
+            FeatureProfiles = featureProfiles.Select(x => new FeatureProfileEntry
             {
-                Id = IdGenerator.GenerateId(),
-            };
+                Name = x.Value.Name ?? x.Key,
+                FeatureProfile = x.Value,
+                Id = x.Key
+            }).ToList(),
+            Options = options,
+            Pager = pagerShape
+        };
+
+        model.Options.ContentsBulkAction =
+        [
+            new SelectListItem(S["Delete"], nameof(ContentsBulkAction.Remove)),
+        ];
+
+        return View(model);
+    }
 
-            return View(viewModel);
-        }
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.Filter")]
+    public ActionResult IndexFilterPOST(FeatureProfilesIndexViewModel model)
+        => RedirectToAction(nameof(Index), new RouteValueDictionary
+        {
+            { _optionsSearch, model.Options.Search }
+        });
 
-        [HttpPost, ActionName(nameof(Create))]
-        public async Task<IActionResult> CreatePost(FeatureProfileViewModel model, string submit)
+    public async Task<IActionResult> Create()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenantFeatureProfiles))
         {
-            return await ProcessSaveAsync(model, submit, true, async (profile) =>
-            {
-                await _featureProfilesManager.UpdateFeatureProfileAsync(profile.Id, profile);
-            });
+            return Forbid();
         }
 
-        public async Task<IActionResult> Edit(string id)
+        var viewModel = new FeatureProfileViewModel()
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenantFeatureProfiles))
-            {
-                return Forbid();
-            }
+            Id = IdGenerator.GenerateId(),
+        };
 
-            var featureProfilesDocument = await _featureProfilesManager.GetFeatureProfilesDocumentAsync();
+        return View(viewModel);
+    }
 
-            if (!featureProfilesDocument.FeatureProfiles.TryGetValue(id, out var featureProfile))
-            {
-                return NotFound();
-            }
+    [HttpPost, ActionName(nameof(Create))]
+    public async Task<IActionResult> CreatePost(FeatureProfileViewModel model, string submit)
+    {
+        return await ProcessSaveAsync(model, submit, true, async (profile) =>
+        {
+            await _featureProfilesManager.UpdateFeatureProfileAsync(profile.Id, profile);
+        });
+    }
 
-            var model = new FeatureProfileViewModel
-            {
-                // For backward compatibility, we use the name as id where id does not exists
-                // the id is immutable whereas the name is mutable
-                Id = featureProfile.Id ?? id,
-                Name = featureProfile.Name ?? id,
-                FeatureRules = JConvert.SerializeObject(featureProfile.FeatureRules, JOptions.Indented),
-            };
-
-            return View(model);
+    public async Task<IActionResult> Edit(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenantFeatureProfiles))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName(nameof(Edit))]
-        public async Task<IActionResult> EditPost(FeatureProfileViewModel model, string submit)
-        {
-            return await ProcessSaveAsync(model, submit, false, async (profile) =>
-            {
-                await _featureProfilesManager.RemoveFeatureProfileAsync(profile.Id);
+        var featureProfilesDocument = await _featureProfilesManager.GetFeatureProfilesDocumentAsync();
 
-                await _featureProfilesManager.UpdateFeatureProfileAsync(profile.Id, profile);
-            });
+        if (!featureProfilesDocument.FeatureProfiles.TryGetValue(id, out var featureProfile))
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(string id)
+        var model = new FeatureProfileViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenantFeatureProfiles))
-            {
-                return Forbid();
-            }
+            // For backward compatibility, we use the name as id where id does not exists
+            // the id is immutable whereas the name is mutable
+            Id = featureProfile.Id ?? id,
+            Name = featureProfile.Name ?? id,
+            FeatureRules = JConvert.SerializeObject(featureProfile.FeatureRules, JOptions.Indented),
+        };
+
+        return View(model);
+    }
 
-            var featureProfilesDocument = await _featureProfilesManager.LoadFeatureProfilesDocumentAsync();
+    [HttpPost, ActionName(nameof(Edit))]
+    public async Task<IActionResult> EditPost(FeatureProfileViewModel model, string submit)
+    {
+        return await ProcessSaveAsync(model, submit, false, async (profile) =>
+        {
+            await _featureProfilesManager.RemoveFeatureProfileAsync(profile.Id);
 
-            if (!featureProfilesDocument.FeatureProfiles.ContainsKey(id))
-            {
-                return NotFound();
-            }
+            await _featureProfilesManager.UpdateFeatureProfileAsync(profile.Id, profile);
+        });
+    }
 
-            await _featureProfilesManager.RemoveFeatureProfileAsync(id);
+    [HttpPost]
+    public async Task<IActionResult> Delete(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenantFeatureProfiles))
+        {
+            return Forbid();
+        }
 
-            await _notifier.SuccessAsync(H["Feature profile deleted successfully."]);
+        var featureProfilesDocument = await _featureProfilesManager.LoadFeatureProfilesDocumentAsync();
 
-            return RedirectToAction(nameof(Index));
+        if (!featureProfilesDocument.FeatureProfiles.ContainsKey(id))
+        {
+            return NotFound();
         }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<string> itemIds)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenantFeatureProfiles))
-            {
-                return Forbid();
-            }
+        await _featureProfilesManager.RemoveFeatureProfileAsync(id);
 
-            if (itemIds?.Count() > 0)
-            {
-                var featureProfilesDocument = await _featureProfilesManager.LoadFeatureProfilesDocumentAsync();
-                var checkItems = featureProfilesDocument.FeatureProfiles.Where(x => itemIds.Contains(x.Key));
-                switch (options.BulkAction)
-                {
-                    case ContentsBulkAction.Remove:
-                        foreach (var item in checkItems)
-                        {
-                            await _featureProfilesManager.RemoveFeatureProfileAsync(item.Key);
-                        }
-                        await _notifier.SuccessAsync(H["Feature profiles successfully removed."]);
-                        break;
-                    default:
-                        break;
-                }
-            }
+        await _notifier.SuccessAsync(H["Feature profile deleted successfully."]);
 
-            return RedirectToAction(nameof(Index));
+        return RedirectToAction(nameof(Index));
+    }
+
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<string> itemIds)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenantFeatureProfiles))
+        {
+            return Forbid();
         }
 
-        private async Task<IActionResult> ProcessSaveAsync(FeatureProfileViewModel model, string submit, bool isNew, Func<FeatureProfile, Task> onSuccessAsync)
+        if (itemIds?.Count() > 0)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenantFeatureProfiles))
+            var featureProfilesDocument = await _featureProfilesManager.LoadFeatureProfilesDocumentAsync();
+            var checkItems = featureProfilesDocument.FeatureProfiles.Where(x => itemIds.Contains(x.Key));
+            switch (options.BulkAction)
             {
-                return Forbid();
+                case ContentsBulkAction.Remove:
+                    foreach (var item in checkItems)
+                    {
+                        await _featureProfilesManager.RemoveFeatureProfileAsync(item.Key);
+                    }
+                    await _notifier.SuccessAsync(H["Feature profiles successfully removed."]);
+                    break;
+                default:
+                    break;
             }
+        }
 
-            var profile = new FeatureProfile();
+        return RedirectToAction(nameof(Index));
+    }
+
+    private async Task<IActionResult> ProcessSaveAsync(FeatureProfileViewModel model, string submit, bool isNew, Func<FeatureProfile, Task> onSuccessAsync)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenantFeatureProfiles))
+        {
+            return Forbid();
+        }
+
+        var profile = new FeatureProfile();
 
-            if (ModelState.IsValid)
+        if (ModelState.IsValid)
+        {
+            try
             {
-                try
-                {
-                    profile.Id = model.Id;
-                    profile.Name = model.Name;
-                    profile.FeatureRules = JConvert.DeserializeObject<List<FeatureRule>>(model.FeatureRules);
+                profile.Id = model.Id;
+                profile.Name = model.Name;
+                profile.FeatureRules = JConvert.DeserializeObject<List<FeatureRule>>(model.FeatureRules);
 
-                    var featureProfilesDocument = await _featureProfilesManager.GetFeatureProfilesDocumentAsync();
+                var featureProfilesDocument = await _featureProfilesManager.GetFeatureProfilesDocumentAsync();
 
-                    if (FeatureExists(profile, featureProfilesDocument, isNew))
-                    {
-                        ModelState.AddModelError(nameof(FeatureProfileViewModel.Name), S["A feature profile with the same name already exists."]);
-                    }
-                }
-                catch (Exception)
+                if (FeatureExists(profile, featureProfilesDocument, isNew))
                 {
-                    ModelState.AddModelError(nameof(FeatureProfileViewModel.FeatureRules), S["Invalid json supplied."]);
+                    ModelState.AddModelError(nameof(FeatureProfileViewModel.Name), S["A feature profile with the same name already exists."]);
                 }
             }
-
-            if (ModelState.IsValid)
+            catch (Exception)
             {
-                await onSuccessAsync(profile);
+                ModelState.AddModelError(nameof(FeatureProfileViewModel.FeatureRules), S["Invalid json supplied."]);
+            }
+        }
 
-                if (submit == "SaveAndContinue")
-                {
-                    return RedirectToAction(nameof(Edit), new { id = profile.Id });
-                }
+        if (ModelState.IsValid)
+        {
+            await onSuccessAsync(profile);
 
-                return RedirectToAction(nameof(Index));
+            if (submit == "SaveAndContinue")
+            {
+                return RedirectToAction(nameof(Edit), new { id = profile.Id });
             }
 
-            return View(model);
+            return RedirectToAction(nameof(Index));
         }
 
-        private static bool FeatureExists(FeatureProfile model, FeatureProfilesDocument featureProfilesDocument, bool isNew)
-        {
-            // For backward compatibility, we use the key value as the name when the new name property is not set.
-            var profiles = featureProfilesDocument.FeatureProfiles.Where(x => (x.Value.Name ?? x.Key) == model.Name);
+        return View(model);
+    }
 
-            return profiles.Any(x => isNew || x.Key != model.Id);
-        }
+    private static bool FeatureExists(FeatureProfile model, FeatureProfilesDocument featureProfilesDocument, bool isNew)
+    {
+        // For backward compatibility, we use the key value as the name when the new name property is not set.
+        var profiles = featureProfilesDocument.FeatureProfiles.Where(x => (x.Value.Name ?? x.Key) == model.Name);
+
+        return profiles.Any(x => isNew || x.Key != model.Id);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/TenantApiController.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/TenantApiController.cs
index 599b24f5597..84b9a7947c1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/TenantApiController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/TenantApiController.cs
@@ -27,471 +27,470 @@
 using OrchardCore.Tenants.Services;
 using OrchardCore.Tenants.ViewModels;
 
-namespace OrchardCore.Tenants.Controllers
+namespace OrchardCore.Tenants.Controllers;
+
+[Route("api/tenants")]
+[ApiController]
+[Authorize(AuthenticationSchemes = "Api"), IgnoreAntiforgeryToken, AllowAnonymous]
+public class TenantApiController : ControllerBase
 {
-    [Route("api/tenants")]
-    [ApiController]
-    [Authorize(AuthenticationSchemes = "Api"), IgnoreAntiforgeryToken, AllowAnonymous]
-    public class TenantApiController : ControllerBase
+    private readonly IShellHost _shellHost;
+    private readonly ShellSettings _currentShellSettings;
+    private readonly IShellRemovalManager _shellRemovalManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IShellSettingsManager _shellSettingsManager;
+    private readonly IDataProtectionProvider _dataProtectorProvider;
+    private readonly ISetupService _setupService;
+    private readonly IClock _clock;
+    private readonly IEmailAddressValidator _emailAddressValidator;
+    private readonly IdentityOptions _identityOptions;
+    private readonly TenantsOptions _tenantsOptions;
+    private readonly IEnumerable<DatabaseProvider> _databaseProviders;
+    private readonly ITenantValidator _tenantValidator;
+    protected readonly IStringLocalizer S;
+    private readonly ILogger _logger;
+
+    public TenantApiController(
+        IShellHost shellHost,
+        ShellSettings currentShellSettings,
+        IShellRemovalManager shellRemovalManager,
+        IAuthorizationService authorizationService,
+        IShellSettingsManager shellSettingsManager,
+        IDataProtectionProvider dataProtectorProvider,
+        ISetupService setupService,
+        IClock clock,
+        IEmailAddressValidator emailAddressValidator,
+        IOptions<IdentityOptions> identityOptions,
+        IOptions<TenantsOptions> tenantsOptions,
+        IEnumerable<DatabaseProvider> databaseProviders,
+        ITenantValidator tenantValidator,
+        IStringLocalizer<TenantApiController> stringLocalizer,
+        ILogger<TenantApiController> logger)
     {
-        private readonly IShellHost _shellHost;
-        private readonly ShellSettings _currentShellSettings;
-        private readonly IShellRemovalManager _shellRemovalManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IShellSettingsManager _shellSettingsManager;
-        private readonly IDataProtectionProvider _dataProtectorProvider;
-        private readonly ISetupService _setupService;
-        private readonly IClock _clock;
-        private readonly IEmailAddressValidator _emailAddressValidator;
-        private readonly IdentityOptions _identityOptions;
-        private readonly TenantsOptions _tenantsOptions;
-        private readonly IEnumerable<DatabaseProvider> _databaseProviders;
-        private readonly ITenantValidator _tenantValidator;
-        protected readonly IStringLocalizer S;
-        private readonly ILogger _logger;
-
-        public TenantApiController(
-            IShellHost shellHost,
-            ShellSettings currentShellSettings,
-            IShellRemovalManager shellRemovalManager,
-            IAuthorizationService authorizationService,
-            IShellSettingsManager shellSettingsManager,
-            IDataProtectionProvider dataProtectorProvider,
-            ISetupService setupService,
-            IClock clock,
-            IEmailAddressValidator emailAddressValidator,
-            IOptions<IdentityOptions> identityOptions,
-            IOptions<TenantsOptions> tenantsOptions,
-            IEnumerable<DatabaseProvider> databaseProviders,
-            ITenantValidator tenantValidator,
-            IStringLocalizer<TenantApiController> stringLocalizer,
-            ILogger<TenantApiController> logger)
-        {
-            _shellHost = shellHost;
-            _currentShellSettings = currentShellSettings;
-            _shellRemovalManager = shellRemovalManager;
-            _authorizationService = authorizationService;
-            _dataProtectorProvider = dataProtectorProvider;
-            _shellSettingsManager = shellSettingsManager;
-            _setupService = setupService;
-            _clock = clock;
-            _emailAddressValidator = emailAddressValidator;
-            _identityOptions = identityOptions.Value;
-            _tenantsOptions = tenantsOptions.Value;
-            _databaseProviders = databaseProviders;
-            _tenantValidator = tenantValidator;
-            S = stringLocalizer;
-            _logger = logger;
-        }
-
-        [HttpPost]
-        [Route("create")]
-        public async Task<IActionResult> Create(TenantApiModel model)
-        {
-            if (!_currentShellSettings.IsDefaultShell())
-            {
-                return Forbid();
-            }
-
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
-            {
-                return this.ChallengeOrForbid("Api");
-            }
-
-            await ValidateModelAsync(model, isNewTenant: !_shellHost.TryGetSettings(model.Name, out var settings));
-
-            if (ModelState.IsValid)
-            {
-                if (model.IsNewTenant)
-                {
-                    // Creates a default shell settings based on the configuration.
-                    using var shellSettings = _shellSettingsManager
-                        .CreateDefaultSettings()
-                        .AsUninitialized()
-                        .AsDisposable();
-
-                    shellSettings.Name = model.Name;
-                    shellSettings.RequestUrlHost = model.RequestUrlHost;
-                    shellSettings.RequestUrlPrefix = model.RequestUrlPrefix;
-
-                    shellSettings["Category"] = model.Category;
-                    shellSettings["Description"] = model.Description;
-                    shellSettings["ConnectionString"] = model.ConnectionString;
-                    shellSettings["TablePrefix"] = model.TablePrefix;
-                    shellSettings["Schema"] = model.Schema;
-                    shellSettings["DatabaseProvider"] = model.DatabaseProvider;
-                    shellSettings["Secret"] = Guid.NewGuid().ToString();
-                    shellSettings["RecipeName"] = model.RecipeName;
-                    shellSettings["FeatureProfile"] = string.Join(',', model.FeatureProfiles ?? []);
-
-                    await _shellHost.UpdateShellSettingsAsync(shellSettings);
-                    var reloadedSettings = _shellHost.GetSettings(shellSettings.Name);
-
-                    var token = CreateSetupToken(reloadedSettings);
-
-                    return Ok(GetEncodedUrl(reloadedSettings, token));
-                }
-                else
-                {
-                    // Site already exists, return 201 for idempotency purposes.
-
-                    var token = CreateSetupToken(settings);
-
-                    return Created(GetEncodedUrl(settings, token), null);
-                }
-            }
+        _shellHost = shellHost;
+        _currentShellSettings = currentShellSettings;
+        _shellRemovalManager = shellRemovalManager;
+        _authorizationService = authorizationService;
+        _dataProtectorProvider = dataProtectorProvider;
+        _shellSettingsManager = shellSettingsManager;
+        _setupService = setupService;
+        _clock = clock;
+        _emailAddressValidator = emailAddressValidator;
+        _identityOptions = identityOptions.Value;
+        _tenantsOptions = tenantsOptions.Value;
+        _databaseProviders = databaseProviders;
+        _tenantValidator = tenantValidator;
+        S = stringLocalizer;
+        _logger = logger;
+    }
 
-            return BadRequest(ModelState);
+    [HttpPost]
+    [Route("create")]
+    public async Task<IActionResult> Create(TenantApiModel model)
+    {
+        if (!_currentShellSettings.IsDefaultShell())
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        [Route("edit")]
-        public async Task<IActionResult> Edit(TenantApiModel model)
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
         {
-            if (!_currentShellSettings.IsDefaultShell())
-            {
-                return Forbid();
-            }
+            return this.ChallengeOrForbid("Api");
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
-            {
-                return this.ChallengeOrForbid("Api");
-            }
+        await ValidateModelAsync(model, isNewTenant: !_shellHost.TryGetSettings(model.Name, out var settings));
 
-            if (ModelState.IsValid)
+        if (ModelState.IsValid)
+        {
+            if (model.IsNewTenant)
             {
-                await ValidateModelAsync(model, isNewTenant: false);
-            }
+                // Creates a default shell settings based on the configuration.
+                using var shellSettings = _shellSettingsManager
+                    .CreateDefaultSettings()
+                    .AsUninitialized()
+                    .AsDisposable();
 
-            if (!_shellHost.TryGetSettings(model.Name, out var shellSettings))
-            {
-                return NotFound();
-            }
+                shellSettings.Name = model.Name;
+                shellSettings.RequestUrlHost = model.RequestUrlHost;
+                shellSettings.RequestUrlPrefix = model.RequestUrlPrefix;
 
-            if (ModelState.IsValid)
-            {
-                shellSettings["Description"] = model.Description;
                 shellSettings["Category"] = model.Category;
-                shellSettings.RequestUrlPrefix = model.RequestUrlPrefix;
-                shellSettings.RequestUrlHost = model.RequestUrlHost;
+                shellSettings["Description"] = model.Description;
+                shellSettings["ConnectionString"] = model.ConnectionString;
+                shellSettings["TablePrefix"] = model.TablePrefix;
+                shellSettings["Schema"] = model.Schema;
+                shellSettings["DatabaseProvider"] = model.DatabaseProvider;
+                shellSettings["Secret"] = Guid.NewGuid().ToString();
+                shellSettings["RecipeName"] = model.RecipeName;
                 shellSettings["FeatureProfile"] = string.Join(',', model.FeatureProfiles ?? []);
 
-                if (shellSettings.IsUninitialized())
-                {
-                    shellSettings["DatabaseProvider"] = model.DatabaseProvider;
-                    shellSettings["TablePrefix"] = model.TablePrefix;
-                    shellSettings["Schema"] = model.Schema;
-                    shellSettings["ConnectionString"] = model.ConnectionString;
-                    shellSettings["RecipeName"] = model.RecipeName;
-                    shellSettings["Secret"] = Guid.NewGuid().ToString();
-                }
-
                 await _shellHost.UpdateShellSettingsAsync(shellSettings);
+                var reloadedSettings = _shellHost.GetSettings(shellSettings.Name);
 
-                return Ok();
+                var token = CreateSetupToken(reloadedSettings);
+
+                return Ok(GetEncodedUrl(reloadedSettings, token));
             }
+            else
+            {
+                // Site already exists, return 201 for idempotency purposes.
 
-            return BadRequest(ModelState);
+                var token = CreateSetupToken(settings);
+
+                return Created(GetEncodedUrl(settings, token), null);
+            }
         }
 
-        [HttpPost]
-        [Route("disable/{tenantName}")]
-        public async Task<IActionResult> Disable(string tenantName)
+        return BadRequest(ModelState);
+    }
+
+    [HttpPost]
+    [Route("edit")]
+    public async Task<IActionResult> Edit(TenantApiModel model)
+    {
+        if (!_currentShellSettings.IsDefaultShell())
         {
-            if (!_currentShellSettings.IsDefaultShell())
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
-            {
-                return this.ChallengeOrForbid("Api");
-            }
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
+        {
+            return this.ChallengeOrForbid("Api");
+        }
 
-            if (!_shellHost.TryGetSettings(tenantName, out var shellSettings))
-            {
-                return NotFound();
-            }
+        if (ModelState.IsValid)
+        {
+            await ValidateModelAsync(model, isNewTenant: false);
+        }
+
+        if (!_shellHost.TryGetSettings(model.Name, out var shellSettings))
+        {
+            return NotFound();
+        }
 
-            if (!shellSettings.IsRunning())
+        if (ModelState.IsValid)
+        {
+            shellSettings["Description"] = model.Description;
+            shellSettings["Category"] = model.Category;
+            shellSettings.RequestUrlPrefix = model.RequestUrlPrefix;
+            shellSettings.RequestUrlHost = model.RequestUrlHost;
+            shellSettings["FeatureProfile"] = string.Join(',', model.FeatureProfiles ?? []);
+
+            if (shellSettings.IsUninitialized())
             {
-                return BadRequest(S["You can only disable a Running tenant."]);
+                shellSettings["DatabaseProvider"] = model.DatabaseProvider;
+                shellSettings["TablePrefix"] = model.TablePrefix;
+                shellSettings["Schema"] = model.Schema;
+                shellSettings["ConnectionString"] = model.ConnectionString;
+                shellSettings["RecipeName"] = model.RecipeName;
+                shellSettings["Secret"] = Guid.NewGuid().ToString();
             }
 
-            await _shellHost.UpdateShellSettingsAsync(shellSettings.AsDisabled());
+            await _shellHost.UpdateShellSettingsAsync(shellSettings);
 
             return Ok();
         }
 
-        [HttpPost]
-        [Route("enable/{tenantName}")]
-        public async Task<IActionResult> Enable(string tenantName)
+        return BadRequest(ModelState);
+    }
+
+    [HttpPost]
+    [Route("disable/{tenantName}")]
+    public async Task<IActionResult> Disable(string tenantName)
+    {
+        if (!_currentShellSettings.IsDefaultShell())
         {
-            if (!_currentShellSettings.IsDefaultShell())
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
-            {
-                return this.ChallengeOrForbid("Api");
-            }
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
+        {
+            return this.ChallengeOrForbid("Api");
+        }
 
-            if (!_shellHost.TryGetSettings(tenantName, out var shellSettings))
-            {
-                return NotFound();
-            }
+        if (!_shellHost.TryGetSettings(tenantName, out var shellSettings))
+        {
+            return NotFound();
+        }
 
-            if (!shellSettings.IsDisabled())
-            {
-                return BadRequest(S["You can only enable a Disabled tenant."]);
-            }
+        if (!shellSettings.IsRunning())
+        {
+            return BadRequest(S["You can only disable a Running tenant."]);
+        }
 
-            await _shellHost.UpdateShellSettingsAsync(shellSettings.AsRunning());
+        await _shellHost.UpdateShellSettingsAsync(shellSettings.AsDisabled());
 
-            return Ok();
-        }
+        return Ok();
+    }
 
-        [HttpPost]
-        [Route("remove/{tenantName}")]
-        public async Task<IActionResult> Remove(string tenantName)
+    [HttpPost]
+    [Route("enable/{tenantName}")]
+    public async Task<IActionResult> Enable(string tenantName)
+    {
+        if (!_currentShellSettings.IsDefaultShell())
         {
-            if (!_currentShellSettings.IsDefaultShell() || !_tenantsOptions.TenantRemovalAllowed)
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
-            {
-                return this.ChallengeOrForbid("Api");
-            }
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
+        {
+            return this.ChallengeOrForbid("Api");
+        }
 
-            if (!_shellHost.TryGetSettings(tenantName, out var shellSettings))
-            {
-                return NotFound();
-            }
+        if (!_shellHost.TryGetSettings(tenantName, out var shellSettings))
+        {
+            return NotFound();
+        }
 
-            if (!shellSettings.IsRemovable())
-            {
-                return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
-            }
+        if (!shellSettings.IsDisabled())
+        {
+            return BadRequest(S["You can only enable a Disabled tenant."]);
+        }
 
-            var context = await _shellRemovalManager.RemoveAsync(shellSettings);
-            if (!context.Success)
-            {
-                return Problem(
-                    title: S["An error occurred while removing the tenant '{0}'.", tenantName],
-                    detail: context.ErrorMessage,
-                    statusCode: (int)HttpStatusCode.BadRequest);
-            }
+        await _shellHost.UpdateShellSettingsAsync(shellSettings.AsRunning());
 
-            if (_logger.IsEnabled(LogLevel.Warning))
-            {
-                _logger.LogWarning("The tenant '{TenantName}' was removed.", shellSettings.Name);
-            }
+        return Ok();
+    }
 
-            return Ok();
+    [HttpPost]
+    [Route("remove/{tenantName}")]
+    public async Task<IActionResult> Remove(string tenantName)
+    {
+        if (!_currentShellSettings.IsDefaultShell() || !_tenantsOptions.TenantRemovalAllowed)
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        [Route("setup")]
-        public async Task<ActionResult> Setup(SetupApiViewModel model)
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
         {
-            if (!_currentShellSettings.IsDefaultShell())
-            {
-                return this.ChallengeOrForbid("Api");
-            }
+            return this.ChallengeOrForbid("Api");
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
-            {
-                return this.ChallengeOrForbid("Api");
-            }
+        if (!_shellHost.TryGetSettings(tenantName, out var shellSettings))
+        {
+            return NotFound();
+        }
 
-            if (!string.IsNullOrEmpty(model.UserName) && model.UserName.Any(c => !_identityOptions.User.AllowedUserNameCharacters.Contains(c)))
-            {
-                ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
-            }
+        if (!shellSettings.IsRemovable())
+        {
+            return BadRequest(S["You can only remove a 'Disabled' or an 'Uninitialized' tenant."]);
+        }
 
-            // Only add additional error if attribute validation has passed.
-            if (!string.IsNullOrEmpty(model.Email) && !_emailAddressValidator.Validate(model.Email))
-            {
-                ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
-            }
+        var context = await _shellRemovalManager.RemoveAsync(shellSettings);
+        if (!context.Success)
+        {
+            return Problem(
+                title: S["An error occurred while removing the tenant '{0}'.", tenantName],
+                detail: context.ErrorMessage,
+                statusCode: (int)HttpStatusCode.BadRequest);
+        }
 
-            if (!ModelState.IsValid)
-            {
-                return BadRequest();
-            }
+        if (_logger.IsEnabled(LogLevel.Warning))
+        {
+            _logger.LogWarning("The tenant '{TenantName}' was removed.", shellSettings.Name);
+        }
 
-            if (!_shellHost.TryGetSettings(model.Name, out var shellSettings))
-            {
-                ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
-            }
+        return Ok();
+    }
 
-            if (shellSettings.IsRunning())
-            {
-                return Created(GetEncodedUrl(shellSettings, null), null);
-            }
+    [HttpPost]
+    [Route("setup")]
+    public async Task<ActionResult> Setup(SetupApiViewModel model)
+    {
+        if (!_currentShellSettings.IsDefaultShell())
+        {
+            return this.ChallengeOrForbid("Api");
+        }
 
-            if (!shellSettings.IsUninitialized())
-            {
-                return BadRequest(S["The tenant can't be setup."]);
-            }
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageTenants))
+        {
+            return this.ChallengeOrForbid("Api");
+        }
 
-            var databaseProvider = shellSettings["DatabaseProvider"];
+        if (!string.IsNullOrEmpty(model.UserName) && model.UserName.Any(c => !_identityOptions.User.AllowedUserNameCharacters.Contains(c)))
+        {
+            ModelState.AddModelError(nameof(model.UserName), S["User name '{0}' is invalid, can only contain letters or digits.", model.UserName]);
+        }
 
-            if (string.IsNullOrEmpty(databaseProvider))
-            {
-                databaseProvider = model.DatabaseProvider;
-            }
+        // Only add additional error if attribute validation has passed.
+        if (!string.IsNullOrEmpty(model.Email) && !_emailAddressValidator.Validate(model.Email))
+        {
+            ModelState.AddModelError(nameof(model.Email), S["The email is invalid."]);
+        }
 
-            if (string.IsNullOrEmpty(databaseProvider))
-            {
-                return BadRequest(S["The database provider is not defined."]);
-            }
+        if (!ModelState.IsValid)
+        {
+            return BadRequest();
+        }
 
-            var selectedProvider = _databaseProviders.FirstOrDefault(provider => provider.Value == databaseProvider);
-            if (selectedProvider == null)
-            {
-                return BadRequest(S["The database provider is not supported."]);
-            }
+        if (!_shellHost.TryGetSettings(model.Name, out var shellSettings))
+        {
+            ModelState.AddModelError(nameof(SetupApiViewModel.Name), S["Tenant not found: '{0}'", model.Name]);
+        }
 
-            var tablePrefix = shellSettings["TablePrefix"];
+        if (shellSettings.IsRunning())
+        {
+            return Created(GetEncodedUrl(shellSettings, null), null);
+        }
 
-            if (string.IsNullOrEmpty(tablePrefix))
-            {
-                tablePrefix = model.TablePrefix;
-            }
+        if (!shellSettings.IsUninitialized())
+        {
+            return BadRequest(S["The tenant can't be setup."]);
+        }
 
-            var schema = shellSettings["Schema"];
+        var databaseProvider = shellSettings["DatabaseProvider"];
 
-            if (string.IsNullOrEmpty(schema))
-            {
-                schema = model.Schema;
-            }
+        if (string.IsNullOrEmpty(databaseProvider))
+        {
+            databaseProvider = model.DatabaseProvider;
+        }
 
-            var connectionString = shellSettings["connectionString"];
+        if (string.IsNullOrEmpty(databaseProvider))
+        {
+            return BadRequest(S["The database provider is not defined."]);
+        }
 
-            if (string.IsNullOrEmpty(connectionString))
-            {
-                connectionString = model.ConnectionString;
-            }
+        var selectedProvider = _databaseProviders.FirstOrDefault(provider => provider.Value == databaseProvider);
+        if (selectedProvider == null)
+        {
+            return BadRequest(S["The database provider is not supported."]);
+        }
 
-            if (selectedProvider.HasConnectionString && string.IsNullOrEmpty(connectionString))
-            {
-                return BadRequest(S["The connection string is required for this database provider."]);
-            }
+        var tablePrefix = shellSettings["TablePrefix"];
 
-            var recipeName = shellSettings["RecipeName"];
+        if (string.IsNullOrEmpty(tablePrefix))
+        {
+            tablePrefix = model.TablePrefix;
+        }
 
-            if (string.IsNullOrEmpty(recipeName))
-            {
-                recipeName = model.RecipeName;
-            }
+        var schema = shellSettings["Schema"];
 
-            RecipeDescriptor recipeDescriptor = null;
+        if (string.IsNullOrEmpty(schema))
+        {
+            schema = model.Schema;
+        }
 
-            if (string.IsNullOrEmpty(recipeName))
-            {
-                if (model.Recipe == null)
-                {
-                    return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
-                }
+        var connectionString = shellSettings["connectionString"];
 
-                var tempFilename = Path.GetTempFileName();
+        if (string.IsNullOrEmpty(connectionString))
+        {
+            connectionString = model.ConnectionString;
+        }
 
-                await System.IO.File.WriteAllTextAsync(tempFilename, model.Recipe);
+        if (selectedProvider.HasConnectionString && string.IsNullOrEmpty(connectionString))
+        {
+            return BadRequest(S["The connection string is required for this database provider."]);
+        }
 
-                var fileProvider = new PhysicalFileProvider(Path.GetDirectoryName(tempFilename));
+        var recipeName = shellSettings["RecipeName"];
 
-                recipeDescriptor = new RecipeDescriptor
-                {
-                    FileProvider = fileProvider,
-                    BasePath = string.Empty,
-                    RecipeFileInfo = fileProvider.GetFileInfo(Path.GetFileName(tempFilename))
-                };
-            }
-            else
-            {
-                var setupRecipes = await _setupService.GetSetupRecipesAsync();
-                recipeDescriptor = setupRecipes.FirstOrDefault(x => string.Equals(x.Name, recipeName, StringComparison.OrdinalIgnoreCase));
+        if (string.IsNullOrEmpty(recipeName))
+        {
+            recipeName = model.RecipeName;
+        }
 
-                if (recipeDescriptor == null)
-                {
-                    return BadRequest(S["Recipe '{0}' not found.", recipeName]);
-                }
-            }
+        RecipeDescriptor recipeDescriptor = null;
 
-            var setupContext = new SetupContext
+        if (string.IsNullOrEmpty(recipeName))
+        {
+            if (model.Recipe == null)
             {
-                ShellSettings = shellSettings,
-                EnabledFeatures = null, // default list,
-                Errors = new Dictionary<string, string>(),
-                Recipe = recipeDescriptor,
-                Properties = new Dictionary<string, object>
-                {
-                    { SetupConstants.SiteName, model.SiteName },
-                    { SetupConstants.AdminUsername, model.UserName },
-                    { SetupConstants.AdminEmail, model.Email },
-                    { SetupConstants.AdminPassword, model.Password },
-                    { SetupConstants.SiteTimeZone, model.SiteTimeZone },
-                    { SetupConstants.DatabaseProvider, selectedProvider.Value },
-                    { SetupConstants.DatabaseConnectionString, connectionString },
-                    { SetupConstants.DatabaseTablePrefix, tablePrefix },
-                    { SetupConstants.DatabaseSchema, schema },
-                }
-            };
+                return BadRequest(S["Either a 'recipe' file or 'RecipeName' is required."]);
+            }
 
-            var executionId = await _setupService.SetupAsync(setupContext);
+            var tempFilename = Path.GetTempFileName();
 
-            // Check if a component in the Setup failed.
-            if (setupContext.Errors.Count > 0)
-            {
-                foreach (var error in setupContext.Errors)
-                {
-                    ModelState.AddModelError(error.Key, error.Value);
-                }
+            await System.IO.File.WriteAllTextAsync(tempFilename, model.Recipe);
 
-                return this.InternalServerError(ModelState);
-            }
+            var fileProvider = new PhysicalFileProvider(Path.GetDirectoryName(tempFilename));
 
-            return Ok(executionId);
+            recipeDescriptor = new RecipeDescriptor
+            {
+                FileProvider = fileProvider,
+                BasePath = string.Empty,
+                RecipeFileInfo = fileProvider.GetFileInfo(Path.GetFileName(tempFilename))
+            };
         }
-
-        private string GetEncodedUrl(ShellSettings shellSettings, string token)
+        else
         {
-            var host = shellSettings.RequestUrlHosts.FirstOrDefault();
-            var hostString = host != null ? new HostString(host) : Request.Host;
+            var setupRecipes = await _setupService.GetSetupRecipesAsync();
+            recipeDescriptor = setupRecipes.FirstOrDefault(x => string.Equals(x.Name, recipeName, StringComparison.OrdinalIgnoreCase));
 
-            var pathString = HttpContext.Features.Get<ShellContextFeature>()?.OriginalPathBase ?? PathString.Empty;
-            if (!string.IsNullOrEmpty(shellSettings.RequestUrlPrefix))
+            if (recipeDescriptor == null)
             {
-                pathString = pathString.Add('/' + shellSettings.RequestUrlPrefix);
+                return BadRequest(S["Recipe '{0}' not found.", recipeName]);
             }
+        }
 
-            var queryString = QueryString.Empty;
-            if (!string.IsNullOrEmpty(token))
+        var setupContext = new SetupContext
+        {
+            ShellSettings = shellSettings,
+            EnabledFeatures = null, // default list,
+            Errors = new Dictionary<string, string>(),
+            Recipe = recipeDescriptor,
+            Properties = new Dictionary<string, object>
+            {
+                { SetupConstants.SiteName, model.SiteName },
+                { SetupConstants.AdminUsername, model.UserName },
+                { SetupConstants.AdminEmail, model.Email },
+                { SetupConstants.AdminPassword, model.Password },
+                { SetupConstants.SiteTimeZone, model.SiteTimeZone },
+                { SetupConstants.DatabaseProvider, selectedProvider.Value },
+                { SetupConstants.DatabaseConnectionString, connectionString },
+                { SetupConstants.DatabaseTablePrefix, tablePrefix },
+                { SetupConstants.DatabaseSchema, schema },
+            }
+        };
+
+        var executionId = await _setupService.SetupAsync(setupContext);
+
+        // Check if a component in the Setup failed.
+        if (setupContext.Errors.Count > 0)
+        {
+            foreach (var error in setupContext.Errors)
             {
-                queryString = QueryString.Create("token", token);
+                ModelState.AddModelError(error.Key, error.Value);
             }
 
-            return $"{Request.Scheme}://{hostString + pathString + queryString}";
+            return this.InternalServerError(ModelState);
         }
 
-        private string CreateSetupToken(ShellSettings shellSettings)
-        {
-            // Create a public url to setup the new tenant
-            var dataProtector = _dataProtectorProvider.CreateProtector("Tokens").ToTimeLimitedDataProtector();
-            var token = dataProtector.Protect(shellSettings["Secret"], _clock.UtcNow.Add(new TimeSpan(24, 0, 0)));
+        return Ok(executionId);
+    }
 
-            return token;
-        }
+    private string GetEncodedUrl(ShellSettings shellSettings, string token)
+    {
+        var host = shellSettings.RequestUrlHosts.FirstOrDefault();
+        var hostString = host != null ? new HostString(host) : Request.Host;
 
-        private async Task ValidateModelAsync(TenantApiModel model, bool isNewTenant)
+        var pathString = HttpContext.Features.Get<ShellContextFeature>()?.OriginalPathBase ?? PathString.Empty;
+        if (!string.IsNullOrEmpty(shellSettings.RequestUrlPrefix))
         {
-            model.IsNewTenant = isNewTenant;
+            pathString = pathString.Add('/' + shellSettings.RequestUrlPrefix);
+        }
 
-            ModelState.AddModelErrors(await _tenantValidator.ValidateAsync(model));
+        var queryString = QueryString.Empty;
+        if (!string.IsNullOrEmpty(token))
+        {
+            queryString = QueryString.Create("token", token);
         }
+
+        return $"{Request.Scheme}://{hostString + pathString + queryString}";
+    }
+
+    private string CreateSetupToken(ShellSettings shellSettings)
+    {
+        // Create a public url to setup the new tenant
+        var dataProtector = _dataProtectorProvider.CreateProtector("Tokens").ToTimeLimitedDataProtector();
+        var token = dataProtector.Protect(shellSettings["Secret"], _clock.UtcNow.Add(new TimeSpan(24, 0, 0)));
+
+        return token;
+    }
+
+    private async Task ValidateModelAsync(TenantApiModel model, bool isNewTenant)
+    {
+        model.IsNewTenant = isNewTenant;
+
+        ModelState.AddModelErrors(await _tenantValidator.ValidateAsync(model));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Deployment/AllFeatureProfilesDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Deployment/AllFeatureProfilesDeploymentSource.cs
index b415fb40f8e..d31d032882f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Deployment/AllFeatureProfilesDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Deployment/AllFeatureProfilesDeploymentSource.cs
@@ -3,37 +3,36 @@
 using OrchardCore.Deployment;
 using OrchardCore.Tenants.Services;
 
-namespace OrchardCore.Tenants.Deployment
+namespace OrchardCore.Tenants.Deployment;
+
+public class AllFeatureProfilesDeploymentSource : IDeploymentSource
 {
-    public class AllFeatureProfilesDeploymentSource : IDeploymentSource
+    private readonly FeatureProfilesManager _featureProfilesManager;
+
+    public AllFeatureProfilesDeploymentSource(FeatureProfilesManager featureProfilesManager)
     {
-        private readonly FeatureProfilesManager _featureProfilesManager;
+        _featureProfilesManager = featureProfilesManager;
+    }
 
-        public AllFeatureProfilesDeploymentSource(FeatureProfilesManager featureProfilesManager)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        if (step is not AllFeatureProfilesDeploymentStep)
         {
-            _featureProfilesManager = featureProfilesManager;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
-        {
-            if (step is not AllFeatureProfilesDeploymentStep)
-            {
-                return;
-            }
-
-            var featureProfileObjects = new JsonObject();
-            var featureProfiles = await _featureProfilesManager.GetFeatureProfilesDocumentAsync();
-
-            foreach (var featureProfile in featureProfiles.FeatureProfiles)
-            {
-                featureProfileObjects[featureProfile.Key] = JObject.FromObject(featureProfile.Value);
-            }
+        var featureProfileObjects = new JsonObject();
+        var featureProfiles = await _featureProfilesManager.GetFeatureProfilesDocumentAsync();
 
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "FeatureProfiles",
-                ["FeatureProfiles"] = featureProfileObjects,
-            });
+        foreach (var featureProfile in featureProfiles.FeatureProfiles)
+        {
+            featureProfileObjects[featureProfile.Key] = JObject.FromObject(featureProfile.Value);
         }
+
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "FeatureProfiles",
+            ["FeatureProfiles"] = featureProfileObjects,
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Deployment/AllFeatureProfilesDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Deployment/AllFeatureProfilesDeploymentStep.cs
index 82ad168c52a..588002e270b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Deployment/AllFeatureProfilesDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Deployment/AllFeatureProfilesDeploymentStep.cs
@@ -1,12 +1,11 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Tenants.Deployment
+namespace OrchardCore.Tenants.Deployment;
+
+public class AllFeatureProfilesDeploymentStep : DeploymentStep
 {
-    public class AllFeatureProfilesDeploymentStep : DeploymentStep
+    public AllFeatureProfilesDeploymentStep()
     {
-        public AllFeatureProfilesDeploymentStep()
-        {
-            Name = "AllFeatureProfiles";
-        }
+        Name = "AllFeatureProfiles";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Deployment/AllFeatureProfilesDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Deployment/AllFeatureProfilesDeploymentStepDriver.cs
index b70d5601ae9..5493f0d0415 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Deployment/AllFeatureProfilesDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Deployment/AllFeatureProfilesDeploymentStepDriver.cs
@@ -3,22 +3,21 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Tenants.Deployment
+namespace OrchardCore.Tenants.Deployment;
+
+public sealed class AllFeatureProfilesDeploymentStepDriver : DisplayDriver<DeploymentStep, AllFeatureProfilesDeploymentStep>
 {
-    public sealed class AllFeatureProfilesDeploymentStepDriver : DisplayDriver<DeploymentStep, AllFeatureProfilesDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(AllFeatureProfilesDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(AllFeatureProfilesDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("AllFeatureProfilesDeploymentStep_Summary", step).Location("Summary", "Content"),
-                    View("AllFeatureProfilesDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("AllFeatureProfilesDeploymentStep_Summary", step).Location("Summary", "Content"),
+                View("AllFeatureProfilesDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(AllFeatureProfilesDeploymentStep step, BuildEditorContext context)
-        {
-            return View("AllFeatureProfilesDeploymentStep_Edit", step).Location("Content");
-        }
+    public override IDisplayResult Edit(AllFeatureProfilesDeploymentStep step, BuildEditorContext context)
+    {
+        return View("AllFeatureProfilesDeploymentStep_Edit", step).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/FeatureProfilesAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/FeatureProfilesAdminMenu.cs
index fe2d023402d..25a74085c16 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/FeatureProfilesAdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/FeatureProfilesAdminMenu.cs
@@ -3,44 +3,43 @@
 using OrchardCore.Environment.Shell;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Tenants
+namespace OrchardCore.Tenants;
+
+public sealed class FeatureProfilesAdminMenu : INavigationProvider
 {
-    public sealed class FeatureProfilesAdminMenu : INavigationProvider
-    {
-        private readonly ShellSettings _shellSettings;
+    private readonly ShellSettings _shellSettings;
+
+    internal readonly IStringLocalizer S;
 
-        internal readonly IStringLocalizer S;
+    public FeatureProfilesAdminMenu(IStringLocalizer<FeatureProfilesAdminMenu> localizer, ShellSettings shellSettings)
+    {
+        _shellSettings = shellSettings;
+        S = localizer;
+    }
 
-        public FeatureProfilesAdminMenu(IStringLocalizer<FeatureProfilesAdminMenu> localizer, ShellSettings shellSettings)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            _shellSettings = shellSettings;
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+        // Don't add the menu item on non-default tenants
+        if (!_shellSettings.IsDefaultShell())
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            // Don't add the menu item on non-default tenants
-            if (!_shellSettings.IsDefaultShell())
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Multi-Tenancy"], tenancy => tenancy
-                    .AddClass("menu-multitenancy")
-                    .Add(S["Feature Profiles"], S["Feature Profiles"].PrefixPosition(), featureProfiles => featureProfiles
-                        .Action("Index", "FeatureProfiles", "OrchardCore.Tenants")
-                        .Permission(Permissions.ManageTenantFeatureProfiles)
-                        .LocalNav()
-                    )
-                );
-
             return Task.CompletedTask;
         }
+
+        builder
+            .Add(S["Multi-Tenancy"], tenancy => tenancy
+                .AddClass("menu-multitenancy")
+                .Add(S["Feature Profiles"], S["Feature Profiles"].PrefixPosition(), featureProfiles => featureProfiles
+                    .Action("Index", "FeatureProfiles", "OrchardCore.Tenants")
+                    .Permission(Permissions.ManageTenantFeatureProfiles)
+                    .LocalNav()
+                )
+            );
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Recipes/FeatureProfilesStep.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Recipes/FeatureProfilesStep.cs
index 45879d3599d..bf56a028f85 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Recipes/FeatureProfilesStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Recipes/FeatureProfilesStep.cs
@@ -6,36 +6,35 @@
 using OrchardCore.Recipes.Services;
 using OrchardCore.Tenants.Services;
 
-namespace OrchardCore.Tenants.Recipes
+namespace OrchardCore.Tenants.Recipes;
+
+/// <summary>
+/// This recipe step creates a set of feature profiles.
+/// </summary>
+public sealed class FeatureProfilesStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step creates a set of feature profiles.
-    /// </summary>
-    public sealed class FeatureProfilesStep : IRecipeStepHandler
+    private readonly FeatureProfilesManager _featureProfilesManager;
+
+    public FeatureProfilesStep(FeatureProfilesManager featureProfilesManager)
     {
-        private readonly FeatureProfilesManager _featureProfilesManager;
+        _featureProfilesManager = featureProfilesManager;
+    }
 
-        public FeatureProfilesStep(FeatureProfilesManager featureProfilesManager)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "FeatureProfiles", StringComparison.OrdinalIgnoreCase))
         {
-            _featureProfilesManager = featureProfilesManager;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        if (context.Step.TryGetPropertyValue("FeatureProfiles", out var jsonNode) && jsonNode is JsonObject featureProfiles)
         {
-            if (!string.Equals(context.Name, "FeatureProfiles", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            if (context.Step.TryGetPropertyValue("FeatureProfiles", out var jsonNode) && jsonNode is JsonObject featureProfiles)
+            foreach (var property in featureProfiles)
             {
-                foreach (var property in featureProfiles)
-                {
-                    var name = property.Key;
-                    var value = property.Value.ToObject<FeatureProfile>();
+                var name = property.Key;
+                var value = property.Value.ToObject<FeatureProfile>();
 
-                    await _featureProfilesManager.UpdateFeatureProfileAsync(name, value);
-                }
+                await _featureProfilesManager.UpdateFeatureProfileAsync(name, value);
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Services/FeatureProfilesManager.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Services/FeatureProfilesManager.cs
index 2be00b316fb..ce3eca4804d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Services/FeatureProfilesManager.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Services/FeatureProfilesManager.cs
@@ -3,36 +3,35 @@
 using OrchardCore.Environment.Shell.Models;
 using OrchardCore.Tenants.Models;
 
-namespace OrchardCore.Tenants.Services
+namespace OrchardCore.Tenants.Services;
+
+public class FeatureProfilesManager
 {
-    public class FeatureProfilesManager
-    {
-        private readonly IDocumentManager<FeatureProfilesDocument> _documentManager;
+    private readonly IDocumentManager<FeatureProfilesDocument> _documentManager;
 
-        public FeatureProfilesManager(IDocumentManager<FeatureProfilesDocument> documentManager) => _documentManager = documentManager;
+    public FeatureProfilesManager(IDocumentManager<FeatureProfilesDocument> documentManager) => _documentManager = documentManager;
 
-        /// <summary>
-        /// Loads the feature profiles document from the store for updating and that should not be cached.
-        /// </summary>
-        public Task<FeatureProfilesDocument> LoadFeatureProfilesDocumentAsync() => _documentManager.GetOrCreateMutableAsync();
+    /// <summary>
+    /// Loads the feature profiles document from the store for updating and that should not be cached.
+    /// </summary>
+    public Task<FeatureProfilesDocument> LoadFeatureProfilesDocumentAsync() => _documentManager.GetOrCreateMutableAsync();
 
-        /// <summary>
-        /// Gets the feature profiles document from the cache for sharing and that should not be updated.
-        /// </summary>
-        public Task<FeatureProfilesDocument> GetFeatureProfilesDocumentAsync() => _documentManager.GetOrCreateImmutableAsync();
+    /// <summary>
+    /// Gets the feature profiles document from the cache for sharing and that should not be updated.
+    /// </summary>
+    public Task<FeatureProfilesDocument> GetFeatureProfilesDocumentAsync() => _documentManager.GetOrCreateImmutableAsync();
 
-        public async Task RemoveFeatureProfileAsync(string id)
-        {
-            var document = await LoadFeatureProfilesDocumentAsync();
-            document.FeatureProfiles.Remove(id);
-            await _documentManager.UpdateAsync(document);
-        }
+    public async Task RemoveFeatureProfileAsync(string id)
+    {
+        var document = await LoadFeatureProfilesDocumentAsync();
+        document.FeatureProfiles.Remove(id);
+        await _documentManager.UpdateAsync(document);
+    }
 
-        public async Task UpdateFeatureProfileAsync(string id, FeatureProfile profile)
-        {
-            var document = await LoadFeatureProfilesDocumentAsync();
-            document.FeatureProfiles[id] = profile;
-            await _documentManager.UpdateAsync(document);
-        }
+    public async Task UpdateFeatureProfileAsync(string id, FeatureProfile profile)
+    {
+        var document = await LoadFeatureProfilesDocumentAsync();
+        document.FeatureProfiles[id] = profile;
+        await _documentManager.UpdateAsync(document);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Services/FeatureProfilesSchemaService.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Services/FeatureProfilesSchemaService.cs
index 4cde1640875..860368feb00 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Services/FeatureProfilesSchemaService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Services/FeatureProfilesSchemaService.cs
@@ -3,55 +3,54 @@
 using NJsonSchema;
 using OrchardCore.Environment.Shell.Models;
 
-namespace OrchardCore.Tenants.Services
+namespace OrchardCore.Tenants.Services;
+
+/// <summary>
+/// Generates a json schema for a <see cref="FeatureRule"/>.
+/// </summary>
+public class FeatureProfilesSchemaService : IFeatureProfilesSchemaService
 {
-    /// <summary>
-    /// Generates a json schema for a <see cref="FeatureRule"/>.
-    /// </summary>
-    public class FeatureProfilesSchemaService : IFeatureProfilesSchemaService
-    {
-        private readonly FeatureProfilesRuleOptions _featureProfilesRuleOptions;
-        private readonly IHostEnvironment _hostEnvironment;
+    private readonly FeatureProfilesRuleOptions _featureProfilesRuleOptions;
+    private readonly IHostEnvironment _hostEnvironment;
 
-        public FeatureProfilesSchemaService(
-            IOptions<FeatureProfilesRuleOptions> options,
-            IHostEnvironment hostEnvironment)
-        {
-            _hostEnvironment = hostEnvironment;
-            _featureProfilesRuleOptions = options.Value;
-        }
+    public FeatureProfilesSchemaService(
+        IOptions<FeatureProfilesRuleOptions> options,
+        IHostEnvironment hostEnvironment)
+    {
+        _hostEnvironment = hostEnvironment;
+        _featureProfilesRuleOptions = options.Value;
+    }
 
-        public string GetJsonSchema()
-        {
-            // Generate a schema, then localize and mutate the schema to add dynamic properties.
-            var schema = JsonSchema.FromType<FeatureRule[]>();
+    public string GetJsonSchema()
+    {
+        // Generate a schema, then localize and mutate the schema to add dynamic properties.
+        var schema = JsonSchema.FromType<FeatureRule[]>();
 
-            schema.Title = "Feature rules";
-            schema.Description = "An array of feature rules";
+        schema.Title = "Feature rules";
+        schema.Description = "An array of feature rules";
 
-            if (schema.Definitions.TryGetValue(nameof(FeatureRule), out var featureRule) && featureRule.ActualProperties.TryGetValue(nameof(FeatureRule.Rule), out var rule))
+        if (schema.Definitions.TryGetValue(nameof(FeatureRule), out var featureRule) && featureRule.ActualProperties.TryGetValue(nameof(FeatureRule.Rule), out var rule))
+        {
+            var ruleProperty = new JsonSchema()
             {
-                var ruleProperty = new JsonSchema()
-                {
-                    Type = JsonObjectType.String,
-                    Description = "The rule to apply to this expression"
-                };
-
-                foreach (var ruleOption in _featureProfilesRuleOptions.Rules.Keys)
-                {
-                    ruleProperty.Enumeration.Add(ruleOption);
-                }
-
-                schema.Definitions.Add(nameof(FeatureRule.Rule), ruleProperty);
-                rule.Reference = ruleProperty;
-            }
+                Type = JsonObjectType.String,
+                Description = "The rule to apply to this expression"
+            };
 
-            if (_hostEnvironment.IsDevelopment())
+            foreach (var ruleOption in _featureProfilesRuleOptions.Rules.Keys)
             {
-                return schema.ToJson();
+                ruleProperty.Enumeration.Add(ruleOption);
             }
 
+            schema.Definitions.Add(nameof(FeatureRule.Rule), ruleProperty);
+            rule.Reference = ruleProperty;
+        }
+
+        if (_hostEnvironment.IsDevelopment())
+        {
             return schema.ToJson();
         }
+
+        return schema.ToJson();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Services/FeatureProfilesService.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Services/FeatureProfilesService.cs
index 2b54d313e31..005c52d797f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Services/FeatureProfilesService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Services/FeatureProfilesService.cs
@@ -3,22 +3,21 @@
 using OrchardCore.Environment.Shell;
 using OrchardCore.Environment.Shell.Models;
 
-namespace OrchardCore.Tenants.Services
+namespace OrchardCore.Tenants.Services;
+
+public class FeatureProfilesService : IFeatureProfilesService
 {
-    public class FeatureProfilesService : IFeatureProfilesService
-    {
-        private readonly FeatureProfilesManager _featureProfilesManager;
+    private readonly FeatureProfilesManager _featureProfilesManager;
 
-        public FeatureProfilesService(FeatureProfilesManager featureProfilesManager)
-        {
-            _featureProfilesManager = featureProfilesManager;
-        }
+    public FeatureProfilesService(FeatureProfilesManager featureProfilesManager)
+    {
+        _featureProfilesManager = featureProfilesManager;
+    }
 
-        public async Task<IDictionary<string, FeatureProfile>> GetFeatureProfilesAsync()
-        {
-            var document = await _featureProfilesManager.LoadFeatureProfilesDocumentAsync();
+    public async Task<IDictionary<string, FeatureProfile>> GetFeatureProfilesAsync()
+    {
+        var document = await _featureProfilesManager.LoadFeatureProfilesDocumentAsync();
 
-            return document.FeatureProfiles;
-        }
+        return document.FeatureProfiles;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Services/IFeatureProfilesSchemaService.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Services/IFeatureProfilesSchemaService.cs
index 049f1a29a64..4cc431b610b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Services/IFeatureProfilesSchemaService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Services/IFeatureProfilesSchemaService.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Tenants.Services
+namespace OrchardCore.Tenants.Services;
+
+public interface IFeatureProfilesSchemaService
 {
-    public interface IFeatureProfilesSchemaService
-    {
-        string GetJsonSchema();
-    }
+    string GetJsonSchema();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Services/ITenantFileProvider.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Services/ITenantFileProvider.cs
index 1fe3d6931b0..c9bb561f458 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Services/ITenantFileProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Services/ITenantFileProvider.cs
@@ -1,8 +1,7 @@
 using OrchardCore.Modules.FileProviders;
 
-namespace OrchardCore.Tenants.Services
+namespace OrchardCore.Tenants.Services;
+
+public interface ITenantFileProvider : IStaticFileProvider
 {
-    public interface ITenantFileProvider : IStaticFileProvider
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Services/ITenantValidator.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Services/ITenantValidator.cs
index f76a9090ea8..89c1a685dd0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Services/ITenantValidator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Services/ITenantValidator.cs
@@ -3,10 +3,9 @@
 using OrchardCore.Mvc.ModelBinding;
 using OrchardCore.Tenants.Models;
 
-namespace OrchardCore.Tenants.Services
+namespace OrchardCore.Tenants.Services;
+
+public interface ITenantValidator
 {
-    public interface ITenantValidator
-    {
-        Task<IEnumerable<ModelError>> ValidateAsync(TenantModelBase model);
-    }
+    Task<IEnumerable<ModelError>> ValidateAsync(TenantModelBase model);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Services/TenantFileProvider.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Services/TenantFileProvider.cs
index 0b03b45b415..3cec869416e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Services/TenantFileProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Services/TenantFileProvider.cs
@@ -1,16 +1,15 @@
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.FileProviders.Physical;
 
-namespace OrchardCore.Tenants.Services
+namespace OrchardCore.Tenants.Services;
+
+public class TenantFileProvider : PhysicalFileProvider, ITenantFileProvider
 {
-    public class TenantFileProvider : PhysicalFileProvider, ITenantFileProvider
+    public TenantFileProvider(string root) : base(root)
     {
-        public TenantFileProvider(string root) : base(root)
-        {
-        }
+    }
 
-        public TenantFileProvider(string root, ExclusionFilters filters) : base(root, filters)
-        {
-        }
+    public TenantFileProvider(string root, ExclusionFilters filters) : base(root, filters)
+    {
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Services/TenantValidator.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Services/TenantValidator.cs
index d1c7082f94a..a58990c4348 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Services/TenantValidator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Services/TenantValidator.cs
@@ -9,156 +9,155 @@
 using OrchardCore.Tenants.Models;
 using OrchardCore.Tenants.ViewModels;
 
-namespace OrchardCore.Tenants.Services
+namespace OrchardCore.Tenants.Services;
+
+public partial class TenantValidator : ITenantValidator
 {
-    public partial class TenantValidator : ITenantValidator
+    private readonly IShellHost _shellHost;
+    private readonly IShellSettingsManager _shellSettingsManager;
+    private readonly IFeatureProfilesService _featureProfilesService;
+    private readonly IDbConnectionValidator _dbConnectionValidator;
+
+    protected readonly IStringLocalizer S;
+
+    public TenantValidator(
+        IShellHost shellHost,
+        IShellSettingsManager shellSettingsManager,
+        IFeatureProfilesService featureProfilesService,
+        IDbConnectionValidator dbConnectionValidator,
+        IStringLocalizer<TenantValidator> stringLocalizer)
+    {
+        _shellHost = shellHost;
+        _shellSettingsManager = shellSettingsManager;
+        _featureProfilesService = featureProfilesService;
+        _dbConnectionValidator = dbConnectionValidator;
+        S = stringLocalizer;
+    }
+
+    public async Task<IEnumerable<ModelError>> ValidateAsync(TenantModelBase model)
     {
-        private readonly IShellHost _shellHost;
-        private readonly IShellSettingsManager _shellSettingsManager;
-        private readonly IFeatureProfilesService _featureProfilesService;
-        private readonly IDbConnectionValidator _dbConnectionValidator;
-
-        protected readonly IStringLocalizer S;
-
-        public TenantValidator(
-            IShellHost shellHost,
-            IShellSettingsManager shellSettingsManager,
-            IFeatureProfilesService featureProfilesService,
-            IDbConnectionValidator dbConnectionValidator,
-            IStringLocalizer<TenantValidator> stringLocalizer)
+        var errors = new List<ModelError>();
+
+        if (string.IsNullOrWhiteSpace(model.Name))
         {
-            _shellHost = shellHost;
-            _shellSettingsManager = shellSettingsManager;
-            _featureProfilesService = featureProfilesService;
-            _dbConnectionValidator = dbConnectionValidator;
-            S = stringLocalizer;
+            errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
         }
 
-        public async Task<IEnumerable<ModelError>> ValidateAsync(TenantModelBase model)
+        if (model.FeatureProfiles is not null && model.FeatureProfiles.Length > 0)
         {
-            var errors = new List<ModelError>();
-
-            if (string.IsNullOrWhiteSpace(model.Name))
-            {
-                errors.Add(new ModelError(nameof(model.Name), S["The tenant name is mandatory."]));
-            }
+            var featureProfiles = await _featureProfilesService.GetFeatureProfilesAsync();
 
-            if (model.FeatureProfiles is not null && model.FeatureProfiles.Length > 0)
+            foreach (var featureProfile in model.FeatureProfiles)
             {
-                var featureProfiles = await _featureProfilesService.GetFeatureProfilesAsync();
-
-                foreach (var featureProfile in model.FeatureProfiles)
+                if (!featureProfiles.ContainsKey(featureProfile))
                 {
-                    if (!featureProfiles.ContainsKey(featureProfile))
-                    {
-                        errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
-                    }
+                    errors.Add(new ModelError(nameof(model.FeatureProfiles), S["The feature profile does not exist."]));
                 }
             }
+        }
 
-            if (!string.IsNullOrEmpty(model.Name) && !TenantNameRuleRegex().IsMatch(model.Name))
-            {
-                errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
-            }
+        if (!string.IsNullOrEmpty(model.Name) && !TenantNameRuleRegex().IsMatch(model.Name))
+        {
+            errors.Add(new ModelError(nameof(model.Name), S["Invalid tenant name. Must contain characters only and no spaces."]));
+        }
 
-            _ = _shellHost.TryGetSettings(model.Name, out var existingShellSettings);
+        _ = _shellHost.TryGetSettings(model.Name, out var existingShellSettings);
 
-            if (!string.IsNullOrWhiteSpace(model.RequestUrlPrefix) && model.RequestUrlPrefix.Contains('/'))
-            {
-                errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
-            }
+        if (!string.IsNullOrWhiteSpace(model.RequestUrlPrefix) && model.RequestUrlPrefix.Contains('/'))
+        {
+            errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["The url prefix can not contain more than one segment."]));
+        }
 
-            if (_shellHost.GetAllSettings().Any(settings =>
-                settings != existingShellSettings &&
-                settings.HasUrlPrefix(model.RequestUrlPrefix) &&
-                settings.HasUrlHost(model.RequestUrlHost)))
-            {
-                errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
-            }
+        if (_shellHost.GetAllSettings().Any(settings =>
+            settings != existingShellSettings &&
+            settings.HasUrlPrefix(model.RequestUrlPrefix) &&
+            settings.HasUrlHost(model.RequestUrlHost)))
+        {
+            errors.Add(new ModelError(nameof(model.RequestUrlPrefix), S["A tenant with the same host and prefix already exists."]));
+        }
 
-            ShellSettings shellSettings = null;
-            if (model.IsNewTenant)
+        ShellSettings shellSettings = null;
+        if (model.IsNewTenant)
+        {
+            if (existingShellSettings is null)
             {
-                if (existingShellSettings is null)
-                {
-                    // Set the settings to be validated.
-                    shellSettings = _shellSettingsManager
-                        .CreateDefaultSettings()
-                        .AsUninitialized()
-                        .AsDisposable();
+                // Set the settings to be validated.
+                shellSettings = _shellSettingsManager
+                    .CreateDefaultSettings()
+                    .AsUninitialized()
+                    .AsDisposable();
 
-                    shellSettings.Name = model.Name;
-                }
-                else if (existingShellSettings.IsDefaultShell())
-                {
-                    errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
-                }
-                else
-                {
-                    errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
-                }
+                shellSettings.Name = model.Name;
             }
-            else if (existingShellSettings is null)
+            else if (existingShellSettings.IsDefaultShell())
             {
-                errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
+                errors.Add(new ModelError(nameof(model.Name), S["The tenant name is in conflict with the 'Default' tenant."]));
             }
-            else if (existingShellSettings.IsUninitialized())
+            else
             {
-                // Database settings may still have been changed.
-                shellSettings = existingShellSettings;
+                errors.Add(new ModelError(nameof(model.Name), S["A tenant with the same name already exists."]));
             }
-
-            if (shellSettings is not null)
-            {
-                // A newly loaded settings from the configuration should be disposed.
-                using var disposable = existingShellSettings is null ? shellSettings : null;
-
-                var validationContext = new DbConnectionValidatorContext(shellSettings, model);
-                await ValidateConnectionAsync(validationContext, errors);
-            }
-
-            return errors;
         }
-
-        private async Task ValidateConnectionAsync(DbConnectionValidatorContext validationContext, List<ModelError> errors)
+        else if (existingShellSettings is null)
         {
-            switch (await _dbConnectionValidator.ValidateAsync(validationContext))
-            {
-                case DbConnectionValidatorResult.UnsupportedProvider:
-                    errors.Add(new ModelError(nameof(
-                        TenantViewModel.DatabaseProvider),
-                        S["The provided database provider is not supported."]));
-                    break;
+            errors.Add(new ModelError(nameof(model.Name), S["The existing tenant to be validated was not found."]));
+        }
+        else if (existingShellSettings.IsUninitialized())
+        {
+            // Database settings may still have been changed.
+            shellSettings = existingShellSettings;
+        }
 
-                case DbConnectionValidatorResult.InvalidConnection:
-                    errors.Add(new ModelError(
-                        nameof(TenantViewModel.ConnectionString),
-                        S["The provided connection string is invalid or server is unreachable."]));
-                    break;
+        if (shellSettings is not null)
+        {
+            // A newly loaded settings from the configuration should be disposed.
+            using var disposable = existingShellSettings is null ? shellSettings : null;
 
-                case DbConnectionValidatorResult.InvalidCertificate:
-                    errors.Add(new ModelError(
-                        nameof(TenantViewModel.ConnectionString),
-                        S["The security certificate on the server is from a non-trusted source (the certificate issuing authority isn't listed as a trusted authority in Trusted Root Certification Authorities on the client machine). In a development environment, you have the option to use the '{0}' parameter in your connection string to bypass the validation performed by the certificate authority.", "TrustServerCertificate=True"]));
-                    break;
+            var validationContext = new DbConnectionValidatorContext(shellSettings, model);
+            await ValidateConnectionAsync(validationContext, errors);
+        }
 
-                case DbConnectionValidatorResult.DocumentTableFound:
-                    if (validationContext.DatabaseProvider == DatabaseProviderValue.Sqlite)
-                    {
-                        errors.Add(new ModelError(
-                            string.Empty,
-                            S["The related database file is already in use."]));
-                        break;
-                    }
+        return errors;
+    }
 
+    private async Task ValidateConnectionAsync(DbConnectionValidatorContext validationContext, List<ModelError> errors)
+    {
+        switch (await _dbConnectionValidator.ValidateAsync(validationContext))
+        {
+            case DbConnectionValidatorResult.UnsupportedProvider:
+                errors.Add(new ModelError(nameof(
+                    TenantViewModel.DatabaseProvider),
+                    S["The provided database provider is not supported."]));
+                break;
+
+            case DbConnectionValidatorResult.InvalidConnection:
+                errors.Add(new ModelError(
+                    nameof(TenantViewModel.ConnectionString),
+                    S["The provided connection string is invalid or server is unreachable."]));
+                break;
+
+            case DbConnectionValidatorResult.InvalidCertificate:
+                errors.Add(new ModelError(
+                    nameof(TenantViewModel.ConnectionString),
+                    S["The security certificate on the server is from a non-trusted source (the certificate issuing authority isn't listed as a trusted authority in Trusted Root Certification Authorities on the client machine). In a development environment, you have the option to use the '{0}' parameter in your connection string to bypass the validation performed by the certificate authority.", "TrustServerCertificate=True"]));
+                break;
+
+            case DbConnectionValidatorResult.DocumentTableFound:
+                if (validationContext.DatabaseProvider == DatabaseProviderValue.Sqlite)
+                {
                     errors.Add(new ModelError(
-                        nameof(TenantViewModel.TablePrefix),
-                        S["The provided database, table prefix and schema are already in use."]));
+                        string.Empty,
+                        S["The related database file is already in use."]));
                     break;
-            }
-        }
+                }
 
-        [GeneratedRegex(@"^\w+$")]
-        private static partial Regex TenantNameRuleRegex();
+                errors.Add(new ModelError(
+                    nameof(TenantViewModel.TablePrefix),
+                    S["The provided database, table prefix and schema are already in use."]));
+                break;
+        }
     }
+
+    [GeneratedRegex(@"^\w+$")]
+    private static partial Regex TenantNameRuleRegex();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Startup.cs
index b9b1539d223..edb22742094 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Startup.cs
@@ -20,123 +20,122 @@
 using OrchardCore.Tenants.Recipes;
 using OrchardCore.Tenants.Services;
 
-namespace OrchardCore.Tenants
+namespace OrchardCore.Tenants;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    private readonly IShellConfiguration _shellConfiguration;
+
+    public Startup(IShellConfiguration shellConfiguration)
     {
-        private readonly IShellConfiguration _shellConfiguration;
+        _shellConfiguration = shellConfiguration;
+    }
 
-        public Startup(IShellConfiguration shellConfiguration)
-        {
-            _shellConfiguration = shellConfiguration;
-        }
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<ITenantValidator, TenantValidator>();
+        services.AddScoped<IShapeTableProvider, TenantShapeTableProvider>();
+        services.AddSetup();
 
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<ITenantValidator, TenantValidator>();
-            services.AddScoped<IShapeTableProvider, TenantShapeTableProvider>();
-            services.AddSetup();
-
-            services.Configure<TenantsOptions>(_shellConfiguration.GetSection("OrchardCore_Tenants"));
-        }
+        services.Configure<TenantsOptions>(_shellConfiguration.GetSection("OrchardCore_Tenants"));
     }
+}
 
-    [Feature("OrchardCore.Tenants.FileProvider")]
-    public sealed class FileProviderStartup : StartupBase
-    {
-        /// <summary>
-        /// The path in the tenant's App_Data folder containing the files.
-        /// </summary>
-        private const string AssetsPath = "wwwroot";
+[Feature("OrchardCore.Tenants.FileProvider")]
+public sealed class FileProviderStartup : StartupBase
+{
+    /// <summary>
+    /// The path in the tenant's App_Data folder containing the files.
+    /// </summary>
+    private const string AssetsPath = "wwwroot";
 
-        // Run after other middlewares.
-        public override int Order => 10;
+    // Run after other middlewares.
+    public override int Order => 10;
 
-        public override void ConfigureServices(IServiceCollection services)
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddSingleton<ITenantFileProvider>(serviceProvider =>
         {
-            services.AddSingleton<ITenantFileProvider>(serviceProvider =>
-            {
-                var shellOptions = serviceProvider.GetRequiredService<IOptions<ShellOptions>>();
-                var shellSettings = serviceProvider.GetRequiredService<ShellSettings>();
-
-                var contentRoot = GetContentRoot(shellOptions.Value, shellSettings);
+            var shellOptions = serviceProvider.GetRequiredService<IOptions<ShellOptions>>();
+            var shellSettings = serviceProvider.GetRequiredService<ShellSettings>();
 
-                if (!Directory.Exists(contentRoot))
-                {
-                    Directory.CreateDirectory(contentRoot);
-                }
-                return new TenantFileProvider(contentRoot);
-            });
+            var contentRoot = GetContentRoot(shellOptions.Value, shellSettings);
 
-            services.AddSingleton<IStaticFileProvider>(serviceProvider =>
+            if (!Directory.Exists(contentRoot))
             {
-                return serviceProvider.GetRequiredService<ITenantFileProvider>();
-            });
-        }
+                Directory.CreateDirectory(contentRoot);
+            }
+            return new TenantFileProvider(contentRoot);
+        });
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+        services.AddSingleton<IStaticFileProvider>(serviceProvider =>
         {
-            var tenantFileProvider = serviceProvider.GetRequiredService<ITenantFileProvider>();
+            return serviceProvider.GetRequiredService<ITenantFileProvider>();
+        });
+    }
+
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        var tenantFileProvider = serviceProvider.GetRequiredService<ITenantFileProvider>();
 
-            app.UseStaticFiles(new StaticFileOptions
+        app.UseStaticFiles(new StaticFileOptions
+        {
+            FileProvider = tenantFileProvider,
+            DefaultContentType = "application/octet-stream",
+            ServeUnknownFileTypes = true,
+
+            // Cache the tenant static files for 30 days.
+            OnPrepareResponse = ctx =>
             {
-                FileProvider = tenantFileProvider,
-                DefaultContentType = "application/octet-stream",
-                ServeUnknownFileTypes = true,
-
-                // Cache the tenant static files for 30 days.
-                OnPrepareResponse = ctx =>
-                {
-                    ctx.Context.Response.Headers[HeaderNames.CacheControl] = $"public, max-age={TimeSpan.FromDays(30).TotalSeconds}, s-max-age={TimeSpan.FromDays(365.25).TotalSeconds}";
-                }
-            });
-        }
-
-        private static string GetContentRoot(ShellOptions shellOptions, ShellSettings shellSettings) =>
-            Path.Combine(shellOptions.ShellsApplicationDataPath, shellOptions.ShellsContainerName, shellSettings.Name, AssetsPath);
+                ctx.Context.Response.Headers[HeaderNames.CacheControl] = $"public, max-age={TimeSpan.FromDays(30).TotalSeconds}, s-max-age={TimeSpan.FromDays(365.25).TotalSeconds}";
+            }
+        });
     }
 
-    [Feature("OrchardCore.Tenants.Distributed")]
-    public sealed class DistributedStartup : StartupBase
+    private static string GetContentRoot(ShellOptions shellOptions, ShellSettings shellSettings) =>
+        Path.Combine(shellOptions.ShellsApplicationDataPath, shellOptions.ShellsContainerName, shellSettings.Name, AssetsPath);
+}
+
+[Feature("OrchardCore.Tenants.Distributed")]
+public sealed class DistributedStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSingleton<DistributedShellMarkerService>();
-        }
+        services.AddSingleton<DistributedShellMarkerService>();
     }
+}
 
-    [Feature("OrchardCore.Tenants.FeatureProfiles")]
-    public sealed class FeatureProfilesStartup : StartupBase
+[Feature("OrchardCore.Tenants.FeatureProfiles")]
+public sealed class FeatureProfilesStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<INavigationProvider, FeatureProfilesAdminMenu>();
-            services.AddScoped<FeatureProfilesManager>();
-            services.AddScoped<IFeatureProfilesService, FeatureProfilesService>();
-            services.AddScoped<IFeatureProfilesSchemaService, FeatureProfilesSchemaService>();
-            services.AddScoped<IShapeTableProvider, TenantFeatureProfileShapeTableProvider>();
-
-            services.AddRecipeExecutionStep<FeatureProfilesStep>();
-        }
+        services.AddScoped<INavigationProvider, FeatureProfilesAdminMenu>();
+        services.AddScoped<FeatureProfilesManager>();
+        services.AddScoped<IFeatureProfilesService, FeatureProfilesService>();
+        services.AddScoped<IFeatureProfilesSchemaService, FeatureProfilesSchemaService>();
+        services.AddScoped<IShapeTableProvider, TenantFeatureProfileShapeTableProvider>();
+
+        services.AddRecipeExecutionStep<FeatureProfilesStep>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment", "OrchardCore.Tenants.FeatureProfiles")]
-    public sealed class FeatureProfilesDeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment", "OrchardCore.Tenants.FeatureProfiles")]
+public sealed class FeatureProfilesDeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<AllFeatureProfilesDeploymentSource, AllFeatureProfilesDeploymentStep, AllFeatureProfilesDeploymentStepDriver>();
-        }
+        services.AddDeployment<AllFeatureProfilesDeploymentSource, AllFeatureProfilesDeploymentStep, AllFeatureProfilesDeploymentStepDriver>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Features")]
-    public sealed class TenantFeatureProfilesStartup : StartupBase
+[RequireFeatures("OrchardCore.Features")]
+public sealed class TenantFeatureProfilesStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IShapeTableProvider, TenantFeatureShapeTableProvider>();
-        }
+        services.AddScoped<IShapeTableProvider, TenantFeatureShapeTableProvider>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/AdminIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/AdminIndexViewModel.cs
index 97cabe7608e..111808da02c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/AdminIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/AdminIndexViewModel.cs
@@ -3,90 +3,89 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using OrchardCore.Environment.Shell;
 
-namespace OrchardCore.Tenants.ViewModels
+namespace OrchardCore.Tenants.ViewModels;
+
+public class AdminIndexViewModel
 {
-    public class AdminIndexViewModel
-    {
-        public List<ShellSettingsEntry> ShellSettingsEntries { get; set; } = [];
+    public List<ShellSettingsEntry> ShellSettingsEntries { get; set; } = [];
 
-        public TenantIndexOptions Options { get; set; } = new TenantIndexOptions();
+    public TenantIndexOptions Options { get; set; } = new TenantIndexOptions();
 
-        [BindNever]
-        public dynamic Pager { get; set; }
-    }
+    [BindNever]
+    public dynamic Pager { get; set; }
+}
 
-    public class BulkActionViewModel
-    {
-        public BulkAction BulkAction { get; set; }
-        public string[] TenantNames { get; set; }
-    }
+public class BulkActionViewModel
+{
+    public BulkAction BulkAction { get; set; }
+    public string[] TenantNames { get; set; }
+}
 
-    public enum BulkAction
-    {
-        Disable,
-        Enable,
-        Remove
-    }
+public enum BulkAction
+{
+    Disable,
+    Enable,
+    Remove
+}
 
-    public class ShellSettingsEntry
-    {
-        public string Category { get; set; }
+public class ShellSettingsEntry
+{
+    public string Category { get; set; }
 
-        public string Description { get; set; }
+    public string Description { get; set; }
 
-        public bool Selected { get; set; }
+    public bool Selected { get; set; }
 
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        public string Token { get; set; }
+    public string Token { get; set; }
 
-        [BindNever]
-        public ShellSettings ShellSettings { get; set; }
-    }
+    [BindNever]
+    public ShellSettings ShellSettings { get; set; }
+}
 
-    public class TenantIndexOptions
-    {
-        public string Search { get; set; }
+public class TenantIndexOptions
+{
+    public string Search { get; set; }
 
-        public string Category { get; set; }
+    public string Category { get; set; }
 
-        public TenantsState Status { get; set; }
+    public TenantsState Status { get; set; }
 
-        public TenantsBulkAction BulkAction { get; set; }
+    public TenantsBulkAction BulkAction { get; set; }
 
-        public TenantsOrder OrderBy { get; set; }
+    public TenantsOrder OrderBy { get; set; }
 
-        public List<SelectListItem> TenantsCategories { get; set; }
+    public List<SelectListItem> TenantsCategories { get; set; }
 
-        [BindNever]
-        public List<SelectListItem> TenantsStates { get; set; }
+    [BindNever]
+    public List<SelectListItem> TenantsStates { get; set; }
 
-        [BindNever]
-        public List<SelectListItem> TenantsSorts { get; set; }
+    [BindNever]
+    public List<SelectListItem> TenantsSorts { get; set; }
 
-        [BindNever]
-        public List<SelectListItem> TenantsBulkAction { get; set; }
-    }
+    [BindNever]
+    public List<SelectListItem> TenantsBulkAction { get; set; }
+}
 
-    public enum TenantsState
-    {
-        All,
-        Running,
-        Disabled,
-        Uninitialized
-    }
+public enum TenantsState
+{
+    All,
+    Running,
+    Disabled,
+    Uninitialized
+}
 
-    public enum TenantsBulkAction
-    {
-        None,
-        Disable,
-        Enable,
-        Remove
-    }
+public enum TenantsBulkAction
+{
+    None,
+    Disable,
+    Enable,
+    Remove
+}
 
-    public enum TenantsOrder
-    {
-        Name,
-        State
-    }
+public enum TenantsOrder
+{
+    Name,
+    State
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/CreateApiViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/CreateApiViewModel.cs
index 8602c8c44b1..4c257e41793 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/CreateApiViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/CreateApiViewModel.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Tenants.ViewModels
+namespace OrchardCore.Tenants.ViewModels;
+
+public class CreateApiViewModel : TenantViewModel
 {
-    public class CreateApiViewModel : TenantViewModel
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/EditTenantViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/EditTenantViewModel.cs
index dca6eff1fcb..d9c4869e0d5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/EditTenantViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/EditTenantViewModel.cs
@@ -2,16 +2,15 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using OrchardCore.Recipes.Models;
 
-namespace OrchardCore.Tenants.ViewModels
+namespace OrchardCore.Tenants.ViewModels;
+
+public class EditTenantViewModel : TenantViewModel
 {
-    public class EditTenantViewModel : TenantViewModel
-    {
-        public List<SelectListItem> FeatureProfilesItems { get; set; }
+    public List<SelectListItem> FeatureProfilesItems { get; set; }
 
-        public IEnumerable<RecipeDescriptor> Recipes { get; set; }
+    public IEnumerable<RecipeDescriptor> Recipes { get; set; }
 
-        public bool CanEditDatabasePresets { get; set; }
+    public bool CanEditDatabasePresets { get; set; }
 
-        public bool DatabaseConfigurationPreset { get; set; }
-    }
+    public bool DatabaseConfigurationPreset { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/FeatureProfileViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/FeatureProfileViewModel.cs
index 2f44d8660ec..fc0147c1688 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/FeatureProfileViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/FeatureProfileViewModel.cs
@@ -1,16 +1,15 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Tenants.ViewModels
+namespace OrchardCore.Tenants.ViewModels;
+
+public class FeatureProfileViewModel
 {
-    public class FeatureProfileViewModel
-    {
-        [Required]
-        public string Id { get; set; }
+    [Required]
+    public string Id { get; set; }
 
-        [Required]
-        public string Name { get; set; }
+    [Required]
+    public string Name { get; set; }
 
-        [Required]
-        public string FeatureRules { get; set; }
-    }
+    [Required]
+    public string FeatureRules { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/FeatureProfilesIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/FeatureProfilesIndexViewModel.cs
index 6d3b0c52cb7..1678a1070dc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/FeatureProfilesIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/FeatureProfilesIndexViewModel.cs
@@ -3,42 +3,41 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using OrchardCore.Environment.Shell.Models;
 
-namespace OrchardCore.Tenants.ViewModels
+namespace OrchardCore.Tenants.ViewModels;
+
+public class FeatureProfilesIndexViewModel
 {
-    public class FeatureProfilesIndexViewModel
-    {
-        public List<FeatureProfileEntry> FeatureProfiles { get; set; }
-        public dynamic Pager { get; set; }
-        public ContentOptions Options { get; set; } = new ContentOptions();
-    }
+    public List<FeatureProfileEntry> FeatureProfiles { get; set; }
+    public dynamic Pager { get; set; }
+    public ContentOptions Options { get; set; } = new ContentOptions();
+}
 
-    public class FeatureProfileEntry
-    {
-        public string Id { get; set; }
+public class FeatureProfileEntry
+{
+    public string Id { get; set; }
 
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        public FeatureProfile FeatureProfile { get; set; }
+    public FeatureProfile FeatureProfile { get; set; }
 
-        public bool IsChecked { get; set; }
-    }
+    public bool IsChecked { get; set; }
+}
 
-    public class ContentOptions
-    {
-        public string Search { get; set; }
-        public ContentsBulkAction BulkAction { get; set; }
+public class ContentOptions
+{
+    public string Search { get; set; }
+    public ContentsBulkAction BulkAction { get; set; }
 
-        #region Lists to populate
+    #region Lists to populate
 
-        [BindNever]
-        public List<SelectListItem> ContentsBulkAction { get; set; }
+    [BindNever]
+    public List<SelectListItem> ContentsBulkAction { get; set; }
 
-        #endregion Lists to populate
-    }
+    #endregion Lists to populate
+}
 
-    public enum ContentsBulkAction
-    {
-        None,
-        Remove
-    }
+public enum ContentsBulkAction
+{
+    None,
+    Remove
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/SetupApiViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/SetupApiViewModel.cs
index 6f92cb165aa..753aa6156fa 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/SetupApiViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/SetupApiViewModel.cs
@@ -1,42 +1,41 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Tenants.ViewModels
+namespace OrchardCore.Tenants.ViewModels;
+
+public class SetupApiViewModel
 {
-    public class SetupApiViewModel
-    {
-        [Required]
-        public string Name { get; set; }
+    [Required]
+    public string Name { get; set; }
 
-        [Required]
-        public string SiteName { get; set; }
+    [Required]
+    public string SiteName { get; set; }
 
-        public string DatabaseProvider { get; set; }
+    public string DatabaseProvider { get; set; }
 
-        public string ConnectionString { get; set; }
+    public string ConnectionString { get; set; }
 
-        public string TablePrefix { get; set; }
+    public string TablePrefix { get; set; }
 
-        [Required]
-        public string UserName { get; set; }
+    [Required]
+    public string UserName { get; set; }
 
-        [Required]
-        public string Email { get; set; }
+    [Required]
+    public string Email { get; set; }
 
-        [DataType(DataType.Password)]
-        public string Password { get; set; }
+    [DataType(DataType.Password)]
+    public string Password { get; set; }
 
-        /// <summary>
-        /// The name of a recipe available in the app.
-        /// </summary>
-        public string RecipeName { get; set; }
+    /// <summary>
+    /// The name of a recipe available in the app.
+    /// </summary>
+    public string RecipeName { get; set; }
 
-        /// <summary>
-        /// A JSON string representing a custom recipe.
-        /// </summary>
-        public string Recipe { get; set; }
+    /// <summary>
+    /// A JSON string representing a custom recipe.
+    /// </summary>
+    public string Recipe { get; set; }
 
-        public string SiteTimeZone { get; set; }
+    public string SiteTimeZone { get; set; }
 
-        public string Schema { get; set; }
-    }
+    public string Schema { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/TenantViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/TenantViewModel.cs
index 979d4723b96..e98eeed3e0e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/TenantViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/TenantViewModel.cs
@@ -1,9 +1,8 @@
 using OrchardCore.Tenants.Models;
 
-namespace OrchardCore.Tenants.ViewModels
+namespace OrchardCore.Tenants.ViewModels;
+
+public class TenantViewModel : TenantModelBase
 {
-    public class TenantViewModel : TenantModelBase
-    {
 
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/CreateTenantTask.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/CreateTenantTask.cs
index 6e158d335eb..daa94e2056e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/CreateTenantTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/CreateTenantTask.cs
@@ -9,178 +9,177 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Tenants.Workflows.Activities
+namespace OrchardCore.Tenants.Workflows.Activities;
+
+public class CreateTenantTask : TenantTask
 {
-    public class CreateTenantTask : TenantTask
+    public CreateTenantTask(
+        IShellSettingsManager shellSettingsManager,
+        IShellHost shellHost,
+        IWorkflowExpressionEvaluator expressionEvaluator,
+        IWorkflowScriptEvaluator scriptEvaluator,
+        IStringLocalizer<CreateTenantTask> localizer)
+        : base(shellSettingsManager, shellHost, expressionEvaluator, scriptEvaluator, localizer)
     {
-        public CreateTenantTask(
-            IShellSettingsManager shellSettingsManager,
-            IShellHost shellHost,
-            IWorkflowExpressionEvaluator expressionEvaluator,
-            IWorkflowScriptEvaluator scriptEvaluator,
-            IStringLocalizer<CreateTenantTask> localizer)
-            : base(shellSettingsManager, shellHost, expressionEvaluator, scriptEvaluator, localizer)
-        {
-        }
+    }
+
+    public override string Name => nameof(CreateTenantTask);
+
+    public override LocalizedString Category => S["Tenant"];
+
+    public override LocalizedString DisplayText => S["Create Tenant Task"];
+
+    public WorkflowExpression<string> Description
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<string> RequestUrlPrefix
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<string> RequestUrlHost
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<string> DatabaseProvider
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<string> ConnectionString
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        public override string Name => nameof(CreateTenantTask);
+    public WorkflowExpression<string> TablePrefix
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<string> Schema
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<string> RecipeName
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<string> FeatureProfile
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        public override LocalizedString Category => S["Tenant"];
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"], S["Failed"]);
+    }
+
+    public async override Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        if (!ShellScope.Context.Settings.IsDefaultShell())
+        {
+            return Outcomes("Failed");
+        }
 
-        public override LocalizedString DisplayText => S["Create Tenant Task"];
+        var tenantName = (await ExpressionEvaluator.EvaluateAsync(TenantName, workflowContext, null))?.Trim();
 
-        public WorkflowExpression<string> Description
+        if (string.IsNullOrEmpty(tenantName))
         {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
+            return Outcomes("Failed");
         }
 
-        public WorkflowExpression<string> RequestUrlPrefix
+        if (ShellHost.TryGetSettings(tenantName, out _))
         {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
+            return Outcomes("Failed");
         }
 
-        public WorkflowExpression<string> RequestUrlHost
+        var description = (await ExpressionEvaluator.EvaluateAsync(Description, workflowContext, null))?.Trim();
+        var requestUrlPrefix = (await ExpressionEvaluator.EvaluateAsync(RequestUrlPrefix, workflowContext, null))?.Trim();
+        var requestUrlHost = (await ExpressionEvaluator.EvaluateAsync(RequestUrlHost, workflowContext, null))?.Trim();
+        var databaseProvider = (await ExpressionEvaluator.EvaluateAsync(DatabaseProvider, workflowContext, null))?.Trim();
+        var connectionString = (await ExpressionEvaluator.EvaluateAsync(ConnectionString, workflowContext, null))?.Trim();
+        var tablePrefix = (await ExpressionEvaluator.EvaluateAsync(TablePrefix, workflowContext, null))?.Trim();
+        var schema = (await ExpressionEvaluator.EvaluateAsync(Schema, workflowContext, null))?.Trim();
+        var recipeName = (await ExpressionEvaluator.EvaluateAsync(RecipeName, workflowContext, null))?.Trim();
+        var featureProfile = (await ExpressionEvaluator.EvaluateAsync(FeatureProfile, workflowContext, null))?.Trim();
+
+        // Creates a default shell settings based on the configuration.
+        using var shellSettings = ShellSettingsManager
+            .CreateDefaultSettings()
+            .AsUninitialized()
+            .AsDisposable();
+
+        shellSettings.Name = tenantName;
+
+        if (!string.IsNullOrEmpty(description))
         {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
+            shellSettings["Description"] = description;
         }
 
-        public WorkflowExpression<string> DatabaseProvider
+        if (!string.IsNullOrEmpty(requestUrlHost))
         {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
+            shellSettings.RequestUrlHost = requestUrlHost;
         }
 
-        public WorkflowExpression<string> ConnectionString
+        if (!string.IsNullOrEmpty(requestUrlPrefix))
         {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
+            shellSettings.RequestUrlPrefix = requestUrlPrefix;
         }
 
-        public WorkflowExpression<string> TablePrefix
+        shellSettings.AsUninitialized();
+
+        if (!string.IsNullOrEmpty(connectionString))
         {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
+            shellSettings["ConnectionString"] = connectionString;
         }
 
-        public WorkflowExpression<string> Schema
+        if (!string.IsNullOrEmpty(tablePrefix))
         {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
+            shellSettings["TablePrefix"] = tablePrefix;
         }
 
-        public WorkflowExpression<string> RecipeName
+        if (!string.IsNullOrEmpty(schema))
         {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
+            shellSettings["Schema"] = schema;
         }
 
-        public WorkflowExpression<string> FeatureProfile
+        if (!string.IsNullOrEmpty(databaseProvider))
         {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
+            shellSettings["DatabaseProvider"] = databaseProvider;
         }
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        if (!string.IsNullOrEmpty(recipeName))
         {
-            return Outcomes(S["Done"], S["Failed"]);
+            shellSettings["RecipeName"] = recipeName;
         }
 
-        public async override Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        if (!string.IsNullOrEmpty(featureProfile))
         {
-            if (!ShellScope.Context.Settings.IsDefaultShell())
-            {
-                return Outcomes("Failed");
-            }
-
-            var tenantName = (await ExpressionEvaluator.EvaluateAsync(TenantName, workflowContext, null))?.Trim();
-
-            if (string.IsNullOrEmpty(tenantName))
-            {
-                return Outcomes("Failed");
-            }
-
-            if (ShellHost.TryGetSettings(tenantName, out _))
-            {
-                return Outcomes("Failed");
-            }
-
-            var description = (await ExpressionEvaluator.EvaluateAsync(Description, workflowContext, null))?.Trim();
-            var requestUrlPrefix = (await ExpressionEvaluator.EvaluateAsync(RequestUrlPrefix, workflowContext, null))?.Trim();
-            var requestUrlHost = (await ExpressionEvaluator.EvaluateAsync(RequestUrlHost, workflowContext, null))?.Trim();
-            var databaseProvider = (await ExpressionEvaluator.EvaluateAsync(DatabaseProvider, workflowContext, null))?.Trim();
-            var connectionString = (await ExpressionEvaluator.EvaluateAsync(ConnectionString, workflowContext, null))?.Trim();
-            var tablePrefix = (await ExpressionEvaluator.EvaluateAsync(TablePrefix, workflowContext, null))?.Trim();
-            var schema = (await ExpressionEvaluator.EvaluateAsync(Schema, workflowContext, null))?.Trim();
-            var recipeName = (await ExpressionEvaluator.EvaluateAsync(RecipeName, workflowContext, null))?.Trim();
-            var featureProfile = (await ExpressionEvaluator.EvaluateAsync(FeatureProfile, workflowContext, null))?.Trim();
-
-            // Creates a default shell settings based on the configuration.
-            using var shellSettings = ShellSettingsManager
-                .CreateDefaultSettings()
-                .AsUninitialized()
-                .AsDisposable();
-
-            shellSettings.Name = tenantName;
-
-            if (!string.IsNullOrEmpty(description))
-            {
-                shellSettings["Description"] = description;
-            }
-
-            if (!string.IsNullOrEmpty(requestUrlHost))
-            {
-                shellSettings.RequestUrlHost = requestUrlHost;
-            }
-
-            if (!string.IsNullOrEmpty(requestUrlPrefix))
-            {
-                shellSettings.RequestUrlPrefix = requestUrlPrefix;
-            }
-
-            shellSettings.AsUninitialized();
-
-            if (!string.IsNullOrEmpty(connectionString))
-            {
-                shellSettings["ConnectionString"] = connectionString;
-            }
-
-            if (!string.IsNullOrEmpty(tablePrefix))
-            {
-                shellSettings["TablePrefix"] = tablePrefix;
-            }
-
-            if (!string.IsNullOrEmpty(schema))
-            {
-                shellSettings["Schema"] = schema;
-            }
-
-            if (!string.IsNullOrEmpty(databaseProvider))
-            {
-                shellSettings["DatabaseProvider"] = databaseProvider;
-            }
-
-            if (!string.IsNullOrEmpty(recipeName))
-            {
-                shellSettings["RecipeName"] = recipeName;
-            }
-
-            if (!string.IsNullOrEmpty(featureProfile))
-            {
-                shellSettings["FeatureProfile"] = featureProfile;
-            }
-
-            shellSettings["Secret"] = Guid.NewGuid().ToString();
-
-            await ShellHost.UpdateShellSettingsAsync(shellSettings);
-            var reloadedSettings = ShellHost.GetSettings(shellSettings.Name);
-
-            workflowContext.LastResult = reloadedSettings;
-            workflowContext.CorrelationId = reloadedSettings.Name;
-
-            return Outcomes("Done");
+            shellSettings["FeatureProfile"] = featureProfile;
         }
+
+        shellSettings["Secret"] = Guid.NewGuid().ToString();
+
+        await ShellHost.UpdateShellSettingsAsync(shellSettings);
+        var reloadedSettings = ShellHost.GetSettings(shellSettings.Name);
+
+        workflowContext.LastResult = reloadedSettings;
+        workflowContext.CorrelationId = reloadedSettings.Name;
+
+        return Outcomes("Done");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/DisableTenantTask.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/DisableTenantTask.cs
index 8c53e002ae7..6d7449fa0a9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/DisableTenantTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/DisableTenantTask.cs
@@ -8,57 +8,56 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Tenants.Workflows.Activities
+namespace OrchardCore.Tenants.Workflows.Activities;
+
+public class DisableTenantTask : TenantTask
 {
-    public class DisableTenantTask : TenantTask
+    public DisableTenantTask(IShellSettingsManager shellSettingsManager, IShellHost shellHost, IWorkflowExpressionEvaluator expressionEvaluator, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<DisableTenantTask> localizer)
+        : base(shellSettingsManager, shellHost, expressionEvaluator, scriptEvaluator, localizer)
     {
-        public DisableTenantTask(IShellSettingsManager shellSettingsManager, IShellHost shellHost, IWorkflowExpressionEvaluator expressionEvaluator, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<DisableTenantTask> localizer)
-            : base(shellSettingsManager, shellHost, expressionEvaluator, scriptEvaluator, localizer)
-        {
-        }
-        public override string Name => nameof(DisableTenantTask);
+    }
+    public override string Name => nameof(DisableTenantTask);
 
-        public override LocalizedString Category => S["Tenant"];
+    public override LocalizedString Category => S["Tenant"];
 
-        public override LocalizedString DisplayText => S["Disable Tenant Task"];
+    public override LocalizedString DisplayText => S["Disable Tenant Task"];
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Disabled"], S["Failed"]);
-        }
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Disabled"], S["Failed"]);
+    }
 
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        if (!ShellScope.Context.Settings.IsDefaultShell())
         {
-            if (!ShellScope.Context.Settings.IsDefaultShell())
-            {
-                return Outcomes("Failed");
-            }
+            return Outcomes("Failed");
+        }
 
-            var tenantName = (await ExpressionEvaluator.EvaluateAsync(TenantName, workflowContext, null))?.Trim();
+        var tenantName = (await ExpressionEvaluator.EvaluateAsync(TenantName, workflowContext, null))?.Trim();
 
-            if (string.IsNullOrEmpty(tenantName))
-            {
-                return Outcomes("Failed");
-            }
+        if (string.IsNullOrEmpty(tenantName))
+        {
+            return Outcomes("Failed");
+        }
 
-            if (!ShellHost.TryGetSettings(tenantName, out var shellSettings))
-            {
-                return Outcomes("Failed");
-            }
+        if (!ShellHost.TryGetSettings(tenantName, out var shellSettings))
+        {
+            return Outcomes("Failed");
+        }
 
-            if (shellSettings.IsDefaultShell())
-            {
-                return Outcomes("Failed");
-            }
+        if (shellSettings.IsDefaultShell())
+        {
+            return Outcomes("Failed");
+        }
 
-            if (!shellSettings.IsRunning())
-            {
-                return Outcomes("Failed");
-            }
+        if (!shellSettings.IsRunning())
+        {
+            return Outcomes("Failed");
+        }
 
-            await ShellHost.UpdateShellSettingsAsync(shellSettings.AsDisabled());
+        await ShellHost.UpdateShellSettingsAsync(shellSettings.AsDisabled());
 
-            return Outcomes("Disabled");
-        }
+        return Outcomes("Disabled");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/EnableTenantTask.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/EnableTenantTask.cs
index 0b671b689d9..99247106861 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/EnableTenantTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/EnableTenantTask.cs
@@ -8,58 +8,57 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Tenants.Workflows.Activities
+namespace OrchardCore.Tenants.Workflows.Activities;
+
+public class EnableTenantTask : TenantTask
 {
-    public class EnableTenantTask : TenantTask
+    public EnableTenantTask(IShellSettingsManager shellSettingsManager, IShellHost shellHost, IWorkflowExpressionEvaluator expressionEvaluator, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<EnableTenantTask> localizer)
+        : base(shellSettingsManager, shellHost, expressionEvaluator, scriptEvaluator, localizer)
     {
-        public EnableTenantTask(IShellSettingsManager shellSettingsManager, IShellHost shellHost, IWorkflowExpressionEvaluator expressionEvaluator, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<EnableTenantTask> localizer)
-            : base(shellSettingsManager, shellHost, expressionEvaluator, scriptEvaluator, localizer)
-        {
-        }
+    }
 
-        public override string Name => nameof(EnableTenantTask);
+    public override string Name => nameof(EnableTenantTask);
 
-        public override LocalizedString Category => S["Tenant"];
+    public override LocalizedString Category => S["Tenant"];
 
-        public override LocalizedString DisplayText => S["Enable Tenant Task"];
+    public override LocalizedString DisplayText => S["Enable Tenant Task"];
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Enabled"], S["Failed"]);
-        }
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Enabled"], S["Failed"]);
+    }
 
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        if (!ShellScope.Context.Settings.IsDefaultShell())
         {
-            if (!ShellScope.Context.Settings.IsDefaultShell())
-            {
-                return Outcomes("Failed");
-            }
+            return Outcomes("Failed");
+        }
 
-            var tenantName = (await ExpressionEvaluator.EvaluateAsync(TenantName, workflowContext, null))?.Trim();
+        var tenantName = (await ExpressionEvaluator.EvaluateAsync(TenantName, workflowContext, null))?.Trim();
 
-            if (string.IsNullOrEmpty(tenantName))
-            {
-                return Outcomes("Failed");
-            }
+        if (string.IsNullOrEmpty(tenantName))
+        {
+            return Outcomes("Failed");
+        }
 
-            if (!ShellHost.TryGetSettings(tenantName, out var shellSettings))
-            {
-                return Outcomes("Failed");
-            }
+        if (!ShellHost.TryGetSettings(tenantName, out var shellSettings))
+        {
+            return Outcomes("Failed");
+        }
 
-            if (shellSettings.IsDefaultShell())
-            {
-                return Outcomes("Failed");
-            }
+        if (shellSettings.IsDefaultShell())
+        {
+            return Outcomes("Failed");
+        }
 
-            if (!shellSettings.IsDisabled())
-            {
-                return Outcomes("Failed");
-            }
+        if (!shellSettings.IsDisabled())
+        {
+            return Outcomes("Failed");
+        }
 
-            await ShellHost.UpdateShellSettingsAsync(shellSettings.AsRunning());
+        await ShellHost.UpdateShellSettingsAsync(shellSettings.AsRunning());
 
-            return Outcomes("Enabled");
-        }
+        return Outcomes("Enabled");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/SetupTenantTask.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/SetupTenantTask.cs
index 2856346634b..e494160c66f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/SetupTenantTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/SetupTenantTask.cs
@@ -16,217 +16,216 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Tenants.Workflows.Activities
+namespace OrchardCore.Tenants.Workflows.Activities;
+
+public class SetupTenantTask : TenantTask
 {
-    public class SetupTenantTask : TenantTask
+    private readonly IClock _clock;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly IEmailAddressValidator _emailAddressValidator;
+    private readonly IdentityOptions _identityOptions;
+
+    public SetupTenantTask(
+        IClock clock,
+        IUpdateModelAccessor updateModelAccessor,
+        IEmailAddressValidator emailAddressValidator,
+        IOptions<IdentityOptions> identityOptions,
+        IShellSettingsManager shellSettingsManager,
+        IShellHost shellHost,
+        ISetupService setupService,
+        IWorkflowExpressionEvaluator expressionEvaluator,
+        IWorkflowScriptEvaluator scriptEvaluator,
+        IStringLocalizer<SetupTenantTask> localizer)
+        : base(shellSettingsManager, shellHost, expressionEvaluator, scriptEvaluator, localizer)
     {
-        private readonly IClock _clock;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly IEmailAddressValidator _emailAddressValidator;
-        private readonly IdentityOptions _identityOptions;
-
-        public SetupTenantTask(
-            IClock clock,
-            IUpdateModelAccessor updateModelAccessor,
-            IEmailAddressValidator emailAddressValidator,
-            IOptions<IdentityOptions> identityOptions,
-            IShellSettingsManager shellSettingsManager,
-            IShellHost shellHost,
-            ISetupService setupService,
-            IWorkflowExpressionEvaluator expressionEvaluator,
-            IWorkflowScriptEvaluator scriptEvaluator,
-            IStringLocalizer<SetupTenantTask> localizer)
-            : base(shellSettingsManager, shellHost, expressionEvaluator, scriptEvaluator, localizer)
-        {
-            SetupService = setupService;
-            _clock = clock;
-            _updateModelAccessor = updateModelAccessor;
-            _emailAddressValidator = emailAddressValidator;
-            _identityOptions = identityOptions.Value;
-        }
+        SetupService = setupService;
+        _clock = clock;
+        _updateModelAccessor = updateModelAccessor;
+        _emailAddressValidator = emailAddressValidator;
+        _identityOptions = identityOptions.Value;
+    }
 
-        protected ISetupService SetupService { get; }
+    protected ISetupService SetupService { get; }
 
-        public override string Name => nameof(SetupTenantTask);
+    public override string Name => nameof(SetupTenantTask);
 
-        public override LocalizedString Category => S["Tenant"];
+    public override LocalizedString Category => S["Tenant"];
 
-        public override LocalizedString DisplayText => S["Setup Tenant Task"];
+    public override LocalizedString DisplayText => S["Setup Tenant Task"];
 
-        public WorkflowExpression<string> SiteName
+    public WorkflowExpression<string> SiteName
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<string> AdminUsername
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<string> AdminEmail
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<string> AdminPassword
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<string> DatabaseProvider
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<string> DatabaseConnectionString
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<string> DatabaseTablePrefix
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<string> DatabaseSchema
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<string> RecipeName
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"], S["Failed"]);
+    }
+
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        if (!ShellScope.Context.Settings.IsDefaultShell())
         {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
+            return Outcomes("Failed");
         }
 
-        public WorkflowExpression<string> AdminUsername
+        var tenantName = (await ExpressionEvaluator.EvaluateAsync(TenantName, workflowContext, null))?.Trim();
+
+        if (string.IsNullOrWhiteSpace(tenantName))
         {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
+            return Outcomes("Failed");
         }
 
-        public WorkflowExpression<string> AdminEmail
+        if (!ShellHost.TryGetSettings(tenantName, out var shellSettings))
         {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
+            return Outcomes("Failed");
         }
 
-        public WorkflowExpression<string> AdminPassword
+        if (shellSettings.IsRunning())
         {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
+            return Outcomes("Failed");
         }
 
-        public WorkflowExpression<string> DatabaseProvider
+        if (!shellSettings.IsUninitialized())
         {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
+            return Outcomes("Failed");
         }
 
-        public WorkflowExpression<string> DatabaseConnectionString
+        var siteName = (await ExpressionEvaluator.EvaluateAsync(SiteName, workflowContext, null))?.Trim();
+        var adminUsername = (await ExpressionEvaluator.EvaluateAsync(AdminUsername, workflowContext, null))?.Trim();
+        var adminEmail = (await ExpressionEvaluator.EvaluateAsync(AdminEmail, workflowContext, null))?.Trim();
+
+        if (string.IsNullOrEmpty(adminUsername) || adminUsername.Any(c => !_identityOptions.User.AllowedUserNameCharacters.Contains(c)))
         {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
+            return Outcomes("Failed");
         }
 
-        public WorkflowExpression<string> DatabaseTablePrefix
+        if (string.IsNullOrEmpty(adminEmail) || !_emailAddressValidator.Validate(adminEmail))
         {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
+            return Outcomes("Failed");
         }
 
-        public WorkflowExpression<string> DatabaseSchema
+        var adminPassword = (await ExpressionEvaluator.EvaluateAsync(AdminPassword, workflowContext, null))?.Trim();
+
+        var databaseProvider = (await ExpressionEvaluator.EvaluateAsync(DatabaseProvider, workflowContext, null))?.Trim();
+        var databaseConnectionString = (await ExpressionEvaluator.EvaluateAsync(DatabaseConnectionString, workflowContext, null))?.Trim();
+        var databaseTablePrefix = (await ExpressionEvaluator.EvaluateAsync(DatabaseTablePrefix, workflowContext, null))?.Trim();
+        var databaseSchema = (await ExpressionEvaluator.EvaluateAsync(DatabaseSchema, workflowContext, null))?.Trim();
+        var recipeName = (await ExpressionEvaluator.EvaluateAsync(RecipeName, workflowContext, null))?.Trim();
+
+        if (string.IsNullOrEmpty(databaseProvider))
         {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
+            databaseProvider = shellSettings["DatabaseProvider"];
         }
 
-        public WorkflowExpression<string> RecipeName
+        if (string.IsNullOrEmpty(databaseConnectionString))
         {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
+            databaseConnectionString = shellSettings["ConnectionString"];
         }
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        if (string.IsNullOrEmpty(databaseTablePrefix))
         {
-            return Outcomes(S["Done"], S["Failed"]);
+            databaseTablePrefix = shellSettings["TablePrefix"];
         }
 
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        if (string.IsNullOrWhiteSpace(databaseSchema))
         {
-            if (!ShellScope.Context.Settings.IsDefaultShell())
-            {
-                return Outcomes("Failed");
-            }
-
-            var tenantName = (await ExpressionEvaluator.EvaluateAsync(TenantName, workflowContext, null))?.Trim();
-
-            if (string.IsNullOrWhiteSpace(tenantName))
-            {
-                return Outcomes("Failed");
-            }
-
-            if (!ShellHost.TryGetSettings(tenantName, out var shellSettings))
-            {
-                return Outcomes("Failed");
-            }
-
-            if (shellSettings.IsRunning())
-            {
-                return Outcomes("Failed");
-            }
-
-            if (!shellSettings.IsUninitialized())
-            {
-                return Outcomes("Failed");
-            }
-
-            var siteName = (await ExpressionEvaluator.EvaluateAsync(SiteName, workflowContext, null))?.Trim();
-            var adminUsername = (await ExpressionEvaluator.EvaluateAsync(AdminUsername, workflowContext, null))?.Trim();
-            var adminEmail = (await ExpressionEvaluator.EvaluateAsync(AdminEmail, workflowContext, null))?.Trim();
-
-            if (string.IsNullOrEmpty(adminUsername) || adminUsername.Any(c => !_identityOptions.User.AllowedUserNameCharacters.Contains(c)))
-            {
-                return Outcomes("Failed");
-            }
-
-            if (string.IsNullOrEmpty(adminEmail) || !_emailAddressValidator.Validate(adminEmail))
-            {
-                return Outcomes("Failed");
-            }
-
-            var adminPassword = (await ExpressionEvaluator.EvaluateAsync(AdminPassword, workflowContext, null))?.Trim();
-
-            var databaseProvider = (await ExpressionEvaluator.EvaluateAsync(DatabaseProvider, workflowContext, null))?.Trim();
-            var databaseConnectionString = (await ExpressionEvaluator.EvaluateAsync(DatabaseConnectionString, workflowContext, null))?.Trim();
-            var databaseTablePrefix = (await ExpressionEvaluator.EvaluateAsync(DatabaseTablePrefix, workflowContext, null))?.Trim();
-            var databaseSchema = (await ExpressionEvaluator.EvaluateAsync(DatabaseSchema, workflowContext, null))?.Trim();
-            var recipeName = (await ExpressionEvaluator.EvaluateAsync(RecipeName, workflowContext, null))?.Trim();
-
-            if (string.IsNullOrEmpty(databaseProvider))
-            {
-                databaseProvider = shellSettings["DatabaseProvider"];
-            }
+            databaseSchema = shellSettings["Schema"];
+        }
 
-            if (string.IsNullOrEmpty(databaseConnectionString))
-            {
-                databaseConnectionString = shellSettings["ConnectionString"];
-            }
+        if (string.IsNullOrEmpty(recipeName))
+        {
+            recipeName = shellSettings["RecipeName"];
+        }
 
-            if (string.IsNullOrEmpty(databaseTablePrefix))
-            {
-                databaseTablePrefix = shellSettings["TablePrefix"];
-            }
+        var recipes = await SetupService.GetSetupRecipesAsync();
+        var recipe = recipes.FirstOrDefault(r => r.Name == recipeName);
 
-            if (string.IsNullOrWhiteSpace(databaseSchema))
+        var setupContext = new SetupContext
+        {
+            ShellSettings = shellSettings,
+            EnabledFeatures = null,
+            Errors = new Dictionary<string, string>(),
+            Recipe = recipe,
+            Properties = new Dictionary<string, object>
             {
-                databaseSchema = shellSettings["Schema"];
+                { SetupConstants.SiteName, siteName },
+                { SetupConstants.AdminUsername, adminUsername },
+                { SetupConstants.AdminEmail, AdminEmail },
+                { SetupConstants.AdminPassword, adminPassword },
+                { SetupConstants.SiteTimeZone, _clock.GetSystemTimeZone().TimeZoneId },
+                { SetupConstants.DatabaseProvider, databaseProvider },
+                { SetupConstants.DatabaseConnectionString, databaseConnectionString },
+                { SetupConstants.DatabaseTablePrefix, databaseTablePrefix },
+                { SetupConstants.DatabaseSchema, databaseSchema },
             }
+        };
 
-            if (string.IsNullOrEmpty(recipeName))
-            {
-                recipeName = shellSettings["RecipeName"];
-            }
+        var executionId = await SetupService.SetupAsync(setupContext);
 
-            var recipes = await SetupService.GetSetupRecipesAsync();
-            var recipe = recipes.FirstOrDefault(r => r.Name == recipeName);
+        // Check if a component in the Setup failed.
+        if (setupContext.Errors.Count > 0)
+        {
+            var updater = _updateModelAccessor.ModelUpdater;
 
-            var setupContext = new SetupContext
-            {
-                ShellSettings = shellSettings,
-                EnabledFeatures = null,
-                Errors = new Dictionary<string, string>(),
-                Recipe = recipe,
-                Properties = new Dictionary<string, object>
-                {
-                    { SetupConstants.SiteName, siteName },
-                    { SetupConstants.AdminUsername, adminUsername },
-                    { SetupConstants.AdminEmail, AdminEmail },
-                    { SetupConstants.AdminPassword, adminPassword },
-                    { SetupConstants.SiteTimeZone, _clock.GetSystemTimeZone().TimeZoneId },
-                    { SetupConstants.DatabaseProvider, databaseProvider },
-                    { SetupConstants.DatabaseConnectionString, databaseConnectionString },
-                    { SetupConstants.DatabaseTablePrefix, databaseTablePrefix },
-                    { SetupConstants.DatabaseSchema, databaseSchema },
-                }
-            };
-
-            var executionId = await SetupService.SetupAsync(setupContext);
-
-            // Check if a component in the Setup failed.
-            if (setupContext.Errors.Count > 0)
+            foreach (var error in setupContext.Errors)
             {
-                var updater = _updateModelAccessor.ModelUpdater;
-
-                foreach (var error in setupContext.Errors)
-                {
-                    updater.ModelState.AddModelError(error.Key, error.Value);
-                }
-
-                return Outcomes("Failed");
+                updater.ModelState.AddModelError(error.Key, error.Value);
             }
 
-            return Outcomes("Done");
+            return Outcomes("Failed");
         }
+
+        return Outcomes("Done");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/TenantActivity.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/TenantActivity.cs
index 7612f6a3384..d3cfecfb131 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/TenantActivity.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/TenantActivity.cs
@@ -6,42 +6,41 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Tenants.Workflows.Activities
+namespace OrchardCore.Tenants.Workflows.Activities;
+
+public abstract class TenantActivity : Activity
 {
-    public abstract class TenantActivity : Activity
+    protected readonly IStringLocalizer S;
+
+    protected TenantActivity(IShellSettingsManager shellSettingsManager, IShellHost shellHost, IWorkflowExpressionEvaluator expressionEvaluator, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer localizer)
+    {
+        ShellSettingsManager = shellSettingsManager;
+        ShellHost = shellHost;
+        ExpressionEvaluator = expressionEvaluator;
+        ScriptEvaluator = scriptEvaluator;
+        S = localizer;
+    }
+
+    public WorkflowExpression<string> TenantName
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    protected IShellSettingsManager ShellSettingsManager { get; }
+    protected IShellHost ShellHost { get; }
+    protected IWorkflowExpressionEvaluator ExpressionEvaluator { get; }
+    protected IWorkflowScriptEvaluator ScriptEvaluator { get; }
+
+    public override LocalizedString Category => S["Tenant"];
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"]);
+    }
+
+    public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
     {
-        protected readonly IStringLocalizer S;
-
-        protected TenantActivity(IShellSettingsManager shellSettingsManager, IShellHost shellHost, IWorkflowExpressionEvaluator expressionEvaluator, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer localizer)
-        {
-            ShellSettingsManager = shellSettingsManager;
-            ShellHost = shellHost;
-            ExpressionEvaluator = expressionEvaluator;
-            ScriptEvaluator = scriptEvaluator;
-            S = localizer;
-        }
-
-        public WorkflowExpression<string> TenantName
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
-
-        protected IShellSettingsManager ShellSettingsManager { get; }
-        protected IShellHost ShellHost { get; }
-        protected IWorkflowExpressionEvaluator ExpressionEvaluator { get; }
-        protected IWorkflowScriptEvaluator ScriptEvaluator { get; }
-
-        public override LocalizedString Category => S["Tenant"];
-
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"]);
-        }
-
-        public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes("Done");
-        }
+        return Outcomes("Done");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/TenantTask.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/TenantTask.cs
index 17d323d5445..fac41d8d0b6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/TenantTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/TenantTask.cs
@@ -3,13 +3,12 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Tenants.Workflows.Activities
+namespace OrchardCore.Tenants.Workflows.Activities;
+
+public abstract class TenantTask : TenantActivity, ITask
 {
-    public abstract class TenantTask : TenantActivity, ITask
+    protected TenantTask(IShellSettingsManager shellSettingsManager, IShellHost shellHost, IWorkflowExpressionEvaluator expressionEvaluator, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer localizer)
+        : base(shellSettingsManager, shellHost, expressionEvaluator, scriptEvaluator, localizer)
     {
-        protected TenantTask(IShellSettingsManager shellSettingsManager, IShellHost shellHost, IWorkflowExpressionEvaluator expressionEvaluator, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer localizer)
-            : base(shellSettingsManager, shellHost, expressionEvaluator, scriptEvaluator, localizer)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/CreateTenantTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/CreateTenantTaskDisplayDriver.cs
index 0cb95af1eac..7a36300b528 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/CreateTenantTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/CreateTenantTaskDisplayDriver.cs
@@ -2,36 +2,35 @@
 using OrchardCore.Tenants.Workflows.ViewModels;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Tenants.Workflows.Drivers
+namespace OrchardCore.Tenants.Workflows.Drivers;
+
+public sealed class CreateTenantTaskDisplayDriver : TenantTaskDisplayDriver<CreateTenantTask, CreateTenantTaskViewModel>
 {
-    public sealed class CreateTenantTaskDisplayDriver : TenantTaskDisplayDriver<CreateTenantTask, CreateTenantTaskViewModel>
+    protected override void EditActivity(CreateTenantTask activity, CreateTenantTaskViewModel model)
     {
-        protected override void EditActivity(CreateTenantTask activity, CreateTenantTaskViewModel model)
-        {
-            model.TenantNameExpression = activity.TenantName.Expression;
-            model.DescriptionExpression = activity.Description.Expression;
-            model.RequestUrlPrefixExpression = activity.RequestUrlPrefix.Expression;
-            model.RequestUrlHostExpression = activity.RequestUrlHost.Expression;
-            model.DatabaseProviderExpression = activity.DatabaseProvider.Expression;
-            model.ConnectionStringExpression = activity.ConnectionString.Expression;
-            model.TablePrefixExpression = activity.TablePrefix.Expression;
-            model.SchemaExpression = activity.Schema.Expression;
-            model.RecipeNameExpression = activity.RecipeName.Expression;
-            model.FeatureProfileExpression = activity.FeatureProfile.Expression;
-        }
+        model.TenantNameExpression = activity.TenantName.Expression;
+        model.DescriptionExpression = activity.Description.Expression;
+        model.RequestUrlPrefixExpression = activity.RequestUrlPrefix.Expression;
+        model.RequestUrlHostExpression = activity.RequestUrlHost.Expression;
+        model.DatabaseProviderExpression = activity.DatabaseProvider.Expression;
+        model.ConnectionStringExpression = activity.ConnectionString.Expression;
+        model.TablePrefixExpression = activity.TablePrefix.Expression;
+        model.SchemaExpression = activity.Schema.Expression;
+        model.RecipeNameExpression = activity.RecipeName.Expression;
+        model.FeatureProfileExpression = activity.FeatureProfile.Expression;
+    }
 
-        protected override void UpdateActivity(CreateTenantTaskViewModel model, CreateTenantTask activity)
-        {
-            activity.TenantName = new WorkflowExpression<string>(model.DescriptionExpression);
-            activity.Description = new WorkflowExpression<string>(model.TenantNameExpression);
-            activity.RequestUrlPrefix = new WorkflowExpression<string>(model.RequestUrlPrefixExpression);
-            activity.RequestUrlHost = new WorkflowExpression<string>(model.RequestUrlHostExpression);
-            activity.DatabaseProvider = new WorkflowExpression<string>(model.DatabaseProviderExpression);
-            activity.ConnectionString = new WorkflowExpression<string>(model.ConnectionStringExpression);
-            activity.TablePrefix = new WorkflowExpression<string>(model.TablePrefixExpression);
-            activity.Schema = new WorkflowExpression<string>(model.SchemaExpression);
-            activity.RecipeName = new WorkflowExpression<string>(model.RecipeNameExpression);
-            activity.FeatureProfile = new WorkflowExpression<string>(model.FeatureProfileExpression);
-        }
+    protected override void UpdateActivity(CreateTenantTaskViewModel model, CreateTenantTask activity)
+    {
+        activity.TenantName = new WorkflowExpression<string>(model.DescriptionExpression);
+        activity.Description = new WorkflowExpression<string>(model.TenantNameExpression);
+        activity.RequestUrlPrefix = new WorkflowExpression<string>(model.RequestUrlPrefixExpression);
+        activity.RequestUrlHost = new WorkflowExpression<string>(model.RequestUrlHostExpression);
+        activity.DatabaseProvider = new WorkflowExpression<string>(model.DatabaseProviderExpression);
+        activity.ConnectionString = new WorkflowExpression<string>(model.ConnectionStringExpression);
+        activity.TablePrefix = new WorkflowExpression<string>(model.TablePrefixExpression);
+        activity.Schema = new WorkflowExpression<string>(model.SchemaExpression);
+        activity.RecipeName = new WorkflowExpression<string>(model.RecipeNameExpression);
+        activity.FeatureProfile = new WorkflowExpression<string>(model.FeatureProfileExpression);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/DisableTenantTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/DisableTenantTaskDisplayDriver.cs
index fba27fccf5b..2b1677fb0c4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/DisableTenantTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/DisableTenantTaskDisplayDriver.cs
@@ -2,18 +2,17 @@
 using OrchardCore.Tenants.Workflows.ViewModels;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Tenants.Workflows.Drivers
+namespace OrchardCore.Tenants.Workflows.Drivers;
+
+public sealed class DisableTenantTaskDisplayDriver : TenantTaskDisplayDriver<DisableTenantTask, DisableTenantTaskViewModel>
 {
-    public sealed class DisableTenantTaskDisplayDriver : TenantTaskDisplayDriver<DisableTenantTask, DisableTenantTaskViewModel>
+    protected override void EditActivity(DisableTenantTask activity, DisableTenantTaskViewModel model)
     {
-        protected override void EditActivity(DisableTenantTask activity, DisableTenantTaskViewModel model)
-        {
-            model.TenantNameExpression = activity.TenantName.Expression;
-        }
+        model.TenantNameExpression = activity.TenantName.Expression;
+    }
 
-        protected override void UpdateActivity(DisableTenantTaskViewModel model, DisableTenantTask activity)
-        {
-            activity.TenantName = new WorkflowExpression<string>(model.TenantNameExpression);
-        }
+    protected override void UpdateActivity(DisableTenantTaskViewModel model, DisableTenantTask activity)
+    {
+        activity.TenantName = new WorkflowExpression<string>(model.TenantNameExpression);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/EnableTenantTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/EnableTenantTaskDisplayDriver.cs
index 05a053e01e3..7fc4d84f6f4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/EnableTenantTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/EnableTenantTaskDisplayDriver.cs
@@ -2,18 +2,17 @@
 using OrchardCore.Tenants.Workflows.ViewModels;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Tenants.Workflows.Drivers
+namespace OrchardCore.Tenants.Workflows.Drivers;
+
+public sealed class EnableTenantTaskDisplayDriver : TenantTaskDisplayDriver<EnableTenantTask, EnableTenantTaskViewModel>
 {
-    public sealed class EnableTenantTaskDisplayDriver : TenantTaskDisplayDriver<EnableTenantTask, EnableTenantTaskViewModel>
+    protected override void EditActivity(EnableTenantTask activity, EnableTenantTaskViewModel model)
     {
-        protected override void EditActivity(EnableTenantTask activity, EnableTenantTaskViewModel model)
-        {
-            model.TenantNameExpression = activity.TenantName.Expression;
-        }
+        model.TenantNameExpression = activity.TenantName.Expression;
+    }
 
-        protected override void UpdateActivity(EnableTenantTaskViewModel model, EnableTenantTask activity)
-        {
-            activity.TenantName = new WorkflowExpression<string>(model.TenantNameExpression);
-        }
+    protected override void UpdateActivity(EnableTenantTaskViewModel model, EnableTenantTask activity)
+    {
+        activity.TenantName = new WorkflowExpression<string>(model.TenantNameExpression);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/SetupTenantTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/SetupTenantTaskDisplayDriver.cs
index 2d2eaca14cb..bf08653de5d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/SetupTenantTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/SetupTenantTaskDisplayDriver.cs
@@ -2,36 +2,35 @@
 using OrchardCore.Tenants.Workflows.ViewModels;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Tenants.Workflows.Drivers
+namespace OrchardCore.Tenants.Workflows.Drivers;
+
+public sealed class SetupTenantTaskDisplayDriver : TenantTaskDisplayDriver<SetupTenantTask, SetupTenantTaskViewModel>
 {
-    public sealed class SetupTenantTaskDisplayDriver : TenantTaskDisplayDriver<SetupTenantTask, SetupTenantTaskViewModel>
+    protected override void EditActivity(SetupTenantTask activity, SetupTenantTaskViewModel model)
     {
-        protected override void EditActivity(SetupTenantTask activity, SetupTenantTaskViewModel model)
-        {
-            model.TenantNameExpression = activity.TenantName.Expression;
-            model.SiteNameExpression = activity.SiteName.Expression;
-            model.AdminUsernameExpression = activity.AdminUsername.Expression;
-            model.AdminEmailExpression = activity.AdminEmail.Expression;
-            model.AdminPasswordExpression = activity.AdminPassword.Expression;
-            model.DatabaseProviderExpression = activity.DatabaseProvider.Expression;
-            model.DatabaseConnectionStringExpression = activity.DatabaseConnectionString.Expression;
-            model.DatabaseTablePrefixExpression = activity.DatabaseTablePrefix.Expression;
-            model.DatabaseSchemaExpression = activity.DatabaseSchema.Expression;
-            model.RecipeNameExpression = activity.RecipeName.Expression;
-        }
+        model.TenantNameExpression = activity.TenantName.Expression;
+        model.SiteNameExpression = activity.SiteName.Expression;
+        model.AdminUsernameExpression = activity.AdminUsername.Expression;
+        model.AdminEmailExpression = activity.AdminEmail.Expression;
+        model.AdminPasswordExpression = activity.AdminPassword.Expression;
+        model.DatabaseProviderExpression = activity.DatabaseProvider.Expression;
+        model.DatabaseConnectionStringExpression = activity.DatabaseConnectionString.Expression;
+        model.DatabaseTablePrefixExpression = activity.DatabaseTablePrefix.Expression;
+        model.DatabaseSchemaExpression = activity.DatabaseSchema.Expression;
+        model.RecipeNameExpression = activity.RecipeName.Expression;
+    }
 
-        protected override void UpdateActivity(SetupTenantTaskViewModel model, SetupTenantTask activity)
-        {
-            activity.TenantName = new WorkflowExpression<string>(model.TenantNameExpression);
-            activity.SiteName = new WorkflowExpression<string>(model.SiteNameExpression);
-            activity.AdminUsername = new WorkflowExpression<string>(model.AdminUsernameExpression);
-            activity.AdminEmail = new WorkflowExpression<string>(model.AdminEmailExpression);
-            activity.AdminPassword = new WorkflowExpression<string>(model.AdminPasswordExpression);
-            activity.DatabaseProvider = new WorkflowExpression<string>(model.DatabaseProviderExpression);
-            activity.DatabaseConnectionString = new WorkflowExpression<string>(model.DatabaseConnectionStringExpression);
-            activity.DatabaseTablePrefix = new WorkflowExpression<string>(model.DatabaseTablePrefixExpression);
-            activity.DatabaseSchema = new WorkflowExpression<string>(model.DatabaseSchemaExpression);
-            activity.RecipeName = new WorkflowExpression<string>(model.RecipeNameExpression);
-        }
+    protected override void UpdateActivity(SetupTenantTaskViewModel model, SetupTenantTask activity)
+    {
+        activity.TenantName = new WorkflowExpression<string>(model.TenantNameExpression);
+        activity.SiteName = new WorkflowExpression<string>(model.SiteNameExpression);
+        activity.AdminUsername = new WorkflowExpression<string>(model.AdminUsernameExpression);
+        activity.AdminEmail = new WorkflowExpression<string>(model.AdminEmailExpression);
+        activity.AdminPassword = new WorkflowExpression<string>(model.AdminPasswordExpression);
+        activity.DatabaseProvider = new WorkflowExpression<string>(model.DatabaseProviderExpression);
+        activity.DatabaseConnectionString = new WorkflowExpression<string>(model.DatabaseConnectionStringExpression);
+        activity.DatabaseTablePrefix = new WorkflowExpression<string>(model.DatabaseTablePrefixExpression);
+        activity.DatabaseSchema = new WorkflowExpression<string>(model.DatabaseSchemaExpression);
+        activity.RecipeName = new WorkflowExpression<string>(model.RecipeNameExpression);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/TenantTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/TenantTaskDisplayDriver.cs
index 8482fe94f9c..2f539ec16de 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/TenantTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Drivers/TenantTaskDisplayDriver.cs
@@ -5,19 +5,18 @@
 using OrchardCore.Tenants.Workflows.ViewModels;
 using OrchardCore.Workflows.Display;
 
-namespace OrchardCore.Tenants.Workflows.Drivers
+namespace OrchardCore.Tenants.Workflows.Drivers;
+
+public abstract class TenantTaskDisplayDriver<TActivity, TViewModel> : ActivityDisplayDriver<TActivity, TViewModel>
+    where TActivity : TenantTask where TViewModel : TenantTaskViewModel<TActivity>, new()
 {
-    public abstract class TenantTaskDisplayDriver<TActivity, TViewModel> : ActivityDisplayDriver<TActivity, TViewModel>
-        where TActivity : TenantTask where TViewModel : TenantTaskViewModel<TActivity>, new()
-    {
-        public string TenantName { get; set; }
+    public string TenantName { get; set; }
 
-        public override Task<IDisplayResult> DisplayAsync(TActivity activity, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                Shape($"{typeof(TActivity).Name}_Fields_Thumbnail", new TenantTaskViewModel<TActivity>(activity)).Location("Thumbnail", "Content"),
-                Shape($"{typeof(TActivity).Name}_Fields_Design", new TenantTaskViewModel<TActivity>(activity)).Location("Design", "Content")
-            );
-        }
+    public override Task<IDisplayResult> DisplayAsync(TActivity activity, BuildDisplayContext context)
+    {
+        return CombineAsync(
+            Shape($"{typeof(TActivity).Name}_Fields_Thumbnail", new TenantTaskViewModel<TActivity>(activity)).Location("Thumbnail", "Content"),
+            Shape($"{typeof(TActivity).Name}_Fields_Design", new TenantTaskViewModel<TActivity>(activity)).Location("Design", "Content")
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Startup.cs
index f1842b8669b..54ac0671906 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Startup.cs
@@ -4,17 +4,16 @@
 using OrchardCore.Tenants.Workflows.Drivers;
 using OrchardCore.Workflows.Helpers;
 
-namespace OrchardCore.Tenants.Workflows
+namespace OrchardCore.Tenants.Workflows;
+
+[RequireFeatures("OrchardCore.Workflows")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Workflows")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddActivity<DisableTenantTask, DisableTenantTaskDisplayDriver>();
-            services.AddActivity<EnableTenantTask, EnableTenantTaskDisplayDriver>();
-            services.AddActivity<CreateTenantTask, CreateTenantTaskDisplayDriver>();
-            services.AddActivity<SetupTenantTask, SetupTenantTaskDisplayDriver>();
-        }
+        services.AddActivity<DisableTenantTask, DisableTenantTaskDisplayDriver>();
+        services.AddActivity<EnableTenantTask, EnableTenantTaskDisplayDriver>();
+        services.AddActivity<CreateTenantTask, CreateTenantTaskDisplayDriver>();
+        services.AddActivity<SetupTenantTask, SetupTenantTaskDisplayDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/CreateTenantTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/CreateTenantTaskViewModel.cs
index 33329658463..000ea7e57a7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/CreateTenantTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/CreateTenantTaskViewModel.cs
@@ -1,25 +1,24 @@
 using OrchardCore.Tenants.Workflows.Activities;
 
-namespace OrchardCore.Tenants.Workflows.ViewModels
+namespace OrchardCore.Tenants.Workflows.ViewModels;
+
+public class CreateTenantTaskViewModel : TenantTaskViewModel<CreateTenantTask>
 {
-    public class CreateTenantTaskViewModel : TenantTaskViewModel<CreateTenantTask>
-    {
-        public string DescriptionExpression { get; set; }
+    public string DescriptionExpression { get; set; }
 
-        public string RequestUrlPrefixExpression { get; set; }
+    public string RequestUrlPrefixExpression { get; set; }
 
-        public string RequestUrlHostExpression { get; set; }
+    public string RequestUrlHostExpression { get; set; }
 
-        public string DatabaseProviderExpression { get; set; }
+    public string DatabaseProviderExpression { get; set; }
 
-        public string ConnectionStringExpression { get; set; }
+    public string ConnectionStringExpression { get; set; }
 
-        public string TablePrefixExpression { get; set; }
+    public string TablePrefixExpression { get; set; }
 
-        public string SchemaExpression { get; set; }
+    public string SchemaExpression { get; set; }
 
-        public string RecipeNameExpression { get; set; }
+    public string RecipeNameExpression { get; set; }
 
-        public string FeatureProfileExpression { get; set; }
-    }
+    public string FeatureProfileExpression { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/DisableTenantTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/DisableTenantTaskViewModel.cs
index 5b12376671b..2cb860cf00a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/DisableTenantTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/DisableTenantTaskViewModel.cs
@@ -1,8 +1,7 @@
 using OrchardCore.Tenants.Workflows.Activities;
 
-namespace OrchardCore.Tenants.Workflows.ViewModels
+namespace OrchardCore.Tenants.Workflows.ViewModels;
+
+public class DisableTenantTaskViewModel : TenantTaskViewModel<DisableTenantTask>
 {
-    public class DisableTenantTaskViewModel : TenantTaskViewModel<DisableTenantTask>
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/EnableTenantTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/EnableTenantTaskViewModel.cs
index 03653726412..6981e8bdfa2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/EnableTenantTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/EnableTenantTaskViewModel.cs
@@ -1,8 +1,7 @@
 using OrchardCore.Tenants.Workflows.Activities;
 
-namespace OrchardCore.Tenants.Workflows.ViewModels
+namespace OrchardCore.Tenants.Workflows.ViewModels;
+
+public class EnableTenantTaskViewModel : TenantTaskViewModel<EnableTenantTask>
 {
-    public class EnableTenantTaskViewModel : TenantTaskViewModel<EnableTenantTask>
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/SetupTenantTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/SetupTenantTaskViewModel.cs
index 59c6c6f4b70..ef79b9cf820 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/SetupTenantTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/SetupTenantTaskViewModel.cs
@@ -1,25 +1,24 @@
 using OrchardCore.Tenants.Workflows.Activities;
 
-namespace OrchardCore.Tenants.Workflows.ViewModels
+namespace OrchardCore.Tenants.Workflows.ViewModels;
+
+public class SetupTenantTaskViewModel : TenantTaskViewModel<SetupTenantTask>
 {
-    public class SetupTenantTaskViewModel : TenantTaskViewModel<SetupTenantTask>
-    {
-        public string SiteNameExpression { get; set; }
+    public string SiteNameExpression { get; set; }
 
-        public string AdminUsernameExpression { get; set; }
+    public string AdminUsernameExpression { get; set; }
 
-        public string AdminEmailExpression { get; set; }
+    public string AdminEmailExpression { get; set; }
 
-        public string AdminPasswordExpression { get; set; }
+    public string AdminPasswordExpression { get; set; }
 
-        public string DatabaseProviderExpression { get; set; }
+    public string DatabaseProviderExpression { get; set; }
 
-        public string DatabaseConnectionStringExpression { get; set; }
+    public string DatabaseConnectionStringExpression { get; set; }
 
-        public string DatabaseTablePrefixExpression { get; set; }
+    public string DatabaseTablePrefixExpression { get; set; }
 
-        public string DatabaseSchemaExpression { get; set; }
+    public string DatabaseSchemaExpression { get; set; }
 
-        public string RecipeNameExpression { get; set; }
-    }
+    public string RecipeNameExpression { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/TenantTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/TenantTaskViewModel.cs
index 5739ab95050..4ed0da4bbf4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/TenantTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/ViewModels/TenantTaskViewModel.cs
@@ -1,19 +1,18 @@
 using OrchardCore.Tenants.Workflows.Activities;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Tenants.Workflows.ViewModels
+namespace OrchardCore.Tenants.Workflows.ViewModels;
+
+public class TenantTaskViewModel<T> : ActivityViewModel<T> where T : TenantTask
 {
-    public class TenantTaskViewModel<T> : ActivityViewModel<T> where T : TenantTask
-    {
-        public string TenantNameExpression { get; set; }
+    public string TenantNameExpression { get; set; }
 
-        public TenantTaskViewModel()
-        {
-        }
+    public TenantTaskViewModel()
+    {
+    }
 
-        public TenantTaskViewModel(T activity)
-        {
-            Activity = activity;
-        }
+    public TenantTaskViewModel(T activity)
+    {
+        Activity = activity;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Themes/AdminMenu.cs
index 5733634c028..4bc516651ab 100644
--- a/src/OrchardCore.Modules/OrchardCore.Themes/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Themes/AdminMenu.cs
@@ -2,35 +2,34 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Themes
+namespace OrchardCore.Themes;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    internal readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
-                    .AddClass("themes").Id("themes")
-                    .Add(S["Themes"], S["Themes"].PrefixPosition(), themes => themes
-                        .Action("Index", "Admin", "OrchardCore.Themes")
-                        .Permission(Permissions.ApplyTheme)
-                        .LocalNav()
-                    )
-                );
+        builder
+            .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design
+                .AddClass("themes").Id("themes")
+                .Add(S["Themes"], S["Themes"].PrefixPosition(), themes => themes
+                    .Action("Index", "Admin", "OrchardCore.Themes")
+                    .Permission(Permissions.ApplyTheme)
+                    .LocalNav()
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/CacheContextProviders/ThemeCacheContextProvider.cs b/src/OrchardCore.Modules/OrchardCore.Themes/CacheContextProviders/ThemeCacheContextProvider.cs
index 34491d046da..83b371476b0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Themes/CacheContextProviders/ThemeCacheContextProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Themes/CacheContextProviders/ThemeCacheContextProvider.cs
@@ -2,23 +2,22 @@
 using System.Threading.Tasks;
 using OrchardCore.DisplayManagement.Theming;
 
-namespace OrchardCore.Environment.Cache.CacheContextProviders
+namespace OrchardCore.Environment.Cache.CacheContextProviders;
+
+public class ThemeCacheContextProvider : ICacheContextProvider
 {
-    public class ThemeCacheContextProvider : ICacheContextProvider
-    {
-        private readonly IThemeManager _themeManager;
+    private readonly IThemeManager _themeManager;
 
-        public ThemeCacheContextProvider(IThemeManager themeManager)
-        {
-            _themeManager = themeManager;
-        }
+    public ThemeCacheContextProvider(IThemeManager themeManager)
+    {
+        _themeManager = themeManager;
+    }
 
-        public async Task PopulateContextEntriesAsync(IEnumerable<string> contexts, List<CacheContextEntry> entries)
-        {
-            // Always vary by theme
+    public async Task PopulateContextEntriesAsync(IEnumerable<string> contexts, List<CacheContextEntry> entries)
+    {
+        // Always vary by theme
 
-            var theme = await _themeManager.GetThemeAsync();
-            entries.Add(new CacheContextEntry("theme", theme.Id));
-        }
+        var theme = await _themeManager.GetThemeAsync();
+        entries.Add(new CacheContextEntry("theme", theme.Id));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Themes/Controllers/AdminController.cs
index 1862947547f..337954d875d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Themes/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Themes/Controllers/AdminController.cs
@@ -14,226 +14,225 @@
 using OrchardCore.Themes.Models;
 using OrchardCore.Themes.Services;
 
-namespace OrchardCore.Themes.Controllers
+namespace OrchardCore.Themes.Controllers;
+
+[Admin("Themes/{action}/{id?}", "Themes.{action}")]
+public class AdminController : Controller
 {
-    [Admin("Themes/{action}/{id?}", "Themes.{action}")]
-    public class AdminController : Controller
+    private readonly ISiteThemeService _siteThemeService;
+    private readonly IAdminThemeService _adminThemeService;
+    private readonly IShellFeaturesManager _shellFeaturesManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly INotifier _notifier;
+    protected readonly IHtmlLocalizer H;
+
+    public AdminController(
+        ISiteThemeService siteThemeService,
+        IAdminThemeService adminThemeService,
+        IHtmlLocalizer<AdminController> localizer,
+        IShellFeaturesManager shellFeaturesManager,
+        IAuthorizationService authorizationService,
+        INotifier notifier)
     {
-        private readonly ISiteThemeService _siteThemeService;
-        private readonly IAdminThemeService _adminThemeService;
-        private readonly IShellFeaturesManager _shellFeaturesManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly INotifier _notifier;
-        protected readonly IHtmlLocalizer H;
-
-        public AdminController(
-            ISiteThemeService siteThemeService,
-            IAdminThemeService adminThemeService,
-            IHtmlLocalizer<AdminController> localizer,
-            IShellFeaturesManager shellFeaturesManager,
-            IAuthorizationService authorizationService,
-            INotifier notifier)
-        {
-            _siteThemeService = siteThemeService;
-            _adminThemeService = adminThemeService;
-            _shellFeaturesManager = shellFeaturesManager;
-            _authorizationService = authorizationService;
-            _notifier = notifier;
+        _siteThemeService = siteThemeService;
+        _adminThemeService = adminThemeService;
+        _shellFeaturesManager = shellFeaturesManager;
+        _authorizationService = authorizationService;
+        _notifier = notifier;
 
-            H = localizer;
-        }
+        H = localizer;
+    }
 
-        [Admin("Themes", "Themes.Index")]
-        public async Task<ActionResult> Index()
-        {
-            var installThemes = await _authorizationService.AuthorizeAsync(User, StandardPermissions.SiteOwner); // only site owners
+    [Admin("Themes", "Themes.Index")]
+    public async Task<ActionResult> Index()
+    {
+        var installThemes = await _authorizationService.AuthorizeAsync(User, StandardPermissions.SiteOwner); // only site owners
 
-            if (!installThemes)
-            {
-                return Forbid();
-            }
+        if (!installThemes)
+        {
+            return Forbid();
+        }
 
-            var currentSiteThemeExtensionInfo = await _siteThemeService.GetSiteThemeAsync();
-            var currentAdminThemeExtensionInfo = await _adminThemeService.GetAdminThemeAsync();
-            var currentAdminTheme = currentAdminThemeExtensionInfo != null ? new ThemeEntry(currentAdminThemeExtensionInfo) : default;
-            var currentSiteTheme = currentSiteThemeExtensionInfo != null ? new ThemeEntry(currentSiteThemeExtensionInfo) : default;
-            var enabledFeatures = await _shellFeaturesManager.GetEnabledFeaturesAsync();
+        var currentSiteThemeExtensionInfo = await _siteThemeService.GetSiteThemeAsync();
+        var currentAdminThemeExtensionInfo = await _adminThemeService.GetAdminThemeAsync();
+        var currentAdminTheme = currentAdminThemeExtensionInfo != null ? new ThemeEntry(currentAdminThemeExtensionInfo) : default;
+        var currentSiteTheme = currentSiteThemeExtensionInfo != null ? new ThemeEntry(currentSiteThemeExtensionInfo) : default;
+        var enabledFeatures = await _shellFeaturesManager.GetEnabledFeaturesAsync();
 
-            var themes = (await _shellFeaturesManager.GetAvailableFeaturesAsync())
-                .Where(f =>
+        var themes = (await _shellFeaturesManager.GetAvailableFeaturesAsync())
+            .Where(f =>
+            {
+                if (f.IsAlwaysEnabled || f.EnabledByDependencyOnly || !f.IsTheme())
                 {
-                    if (f.IsAlwaysEnabled || f.EnabledByDependencyOnly || !f.IsTheme())
-                    {
-                        return false;
-                    }
-
-                    var tags = f.Extension.Manifest.Tags.ToArray();
-                    var isHidden = tags.Any(t => string.Equals(t, "hidden", StringComparison.OrdinalIgnoreCase));
-                    if (isHidden)
-                    {
-                        return false;
-                    }
-
-                    return true;
-                })
-                .Select(f =>
+                    return false;
+                }
+
+                var tags = f.Extension.Manifest.Tags.ToArray();
+                var isHidden = tags.Any(t => string.Equals(t, "hidden", StringComparison.OrdinalIgnoreCase));
+                if (isHidden)
                 {
-                    var isAdmin = IsAdminTheme(f.Extension.Manifest);
-                    var themeId = isAdmin ? currentAdminTheme?.Extension.Id : currentSiteTheme?.Extension.Id;
-                    var isCurrent = f.Id == themeId;
-                    var isEnabled = enabledFeatures.Any(e => e.Id == f.Id);
-                    var themeEntry = new ThemeEntry(f.Extension)
-                    {
-                        Enabled = isEnabled,
-                        CanUninstall = installThemes,
-                        IsAdmin = isAdmin,
-                        IsCurrent = isCurrent
-                    };
-
-                    return themeEntry;
-                })
-                .OrderByDescending(t => t.IsCurrent);
-
-            var model = new SelectThemesViewModel
+                    return false;
+                }
+
+                return true;
+            })
+            .Select(f =>
             {
-                CurrentSiteTheme = currentSiteTheme,
-                CurrentAdminTheme = currentAdminTheme,
-                Themes = themes
-            };
+                var isAdmin = IsAdminTheme(f.Extension.Manifest);
+                var themeId = isAdmin ? currentAdminTheme?.Extension.Id : currentSiteTheme?.Extension.Id;
+                var isCurrent = f.Id == themeId;
+                var isEnabled = enabledFeatures.Any(e => e.Id == f.Id);
+                var themeEntry = new ThemeEntry(f.Extension)
+                {
+                    Enabled = isEnabled,
+                    CanUninstall = installThemes,
+                    IsAdmin = isAdmin,
+                    IsCurrent = isCurrent
+                };
+
+                return themeEntry;
+            })
+            .OrderByDescending(t => t.IsCurrent);
+
+        var model = new SelectThemesViewModel
+        {
+            CurrentSiteTheme = currentSiteTheme,
+            CurrentAdminTheme = currentAdminTheme,
+            Themes = themes
+        };
+
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost]
+    public async Task<ActionResult> SetCurrentTheme(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ApplyTheme))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<ActionResult> SetCurrentTheme(string id)
+        if (string.IsNullOrEmpty(id))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ApplyTheme))
-            {
-                return Forbid();
-            }
+            // Don't use any theme on the front-end
+        }
+        else
+        {
+            var feature = (await _shellFeaturesManager.GetAvailableFeaturesAsync())
+                .FirstOrDefault(f => f.Id == id && !f.IsAlwaysEnabled && !f.EnabledByDependencyOnly && f.IsTheme());
 
-            if (string.IsNullOrEmpty(id))
+            if (feature == null)
             {
-                // Don't use any theme on the front-end
+                return NotFound();
             }
             else
             {
-                var feature = (await _shellFeaturesManager.GetAvailableFeaturesAsync())
-                    .FirstOrDefault(f => f.Id == id && !f.IsAlwaysEnabled && !f.EnabledByDependencyOnly && f.IsTheme());
+                var isAdmin = IsAdminTheme(feature.Extension.Manifest);
 
-                if (feature == null)
+                if (isAdmin)
                 {
-                    return NotFound();
+                    await _adminThemeService.SetAdminThemeAsync(id);
                 }
                 else
                 {
-                    var isAdmin = IsAdminTheme(feature.Extension.Manifest);
-
-                    if (isAdmin)
-                    {
-                        await _adminThemeService.SetAdminThemeAsync(id);
-                    }
-                    else
-                    {
-                        await _siteThemeService.SetSiteThemeAsync(id);
-                    }
-
-                    // Enable the feature lastly to avoid accessing a disposed IMemoryCache (due to the current shell being disposed after updating).
-                    var enabledFeatures = await _shellFeaturesManager.GetEnabledFeaturesAsync();
-                    var isEnabled = enabledFeatures.Any(x => x.Extension.Id == feature.Id);
-
-                    if (!isEnabled)
-                    {
-                        await _shellFeaturesManager.EnableFeaturesAsync(new[] { feature }, force: true);
-                        await _notifier.SuccessAsync(H["{0} was enabled", feature.Name ?? feature.Id]);
-                    }
-
-                    await _notifier.SuccessAsync(H["{0} was set as the default {1} theme", feature.Name ?? feature.Id, isAdmin ? "Admin" : "Site"]);
+                    await _siteThemeService.SetSiteThemeAsync(id);
+                }
+
+                // Enable the feature lastly to avoid accessing a disposed IMemoryCache (due to the current shell being disposed after updating).
+                var enabledFeatures = await _shellFeaturesManager.GetEnabledFeaturesAsync();
+                var isEnabled = enabledFeatures.Any(x => x.Extension.Id == feature.Id);
+
+                if (!isEnabled)
+                {
+                    await _shellFeaturesManager.EnableFeaturesAsync(new[] { feature }, force: true);
+                    await _notifier.SuccessAsync(H["{0} was enabled", feature.Name ?? feature.Id]);
                 }
-            }
 
-            return RedirectToAction(nameof(Index));
+                await _notifier.SuccessAsync(H["{0} was set as the default {1} theme", feature.Name ?? feature.Id, isAdmin ? "Admin" : "Site"]);
+            }
         }
 
-        [HttpPost]
-        public async Task<ActionResult> ResetSiteTheme()
+        return RedirectToAction(nameof(Index));
+    }
+
+    [HttpPost]
+    public async Task<ActionResult> ResetSiteTheme()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ApplyTheme))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ApplyTheme))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            await _siteThemeService.SetSiteThemeAsync("");
+        await _siteThemeService.SetSiteThemeAsync("");
 
-            await _notifier.SuccessAsync(H["The Site theme was reset."]);
+        await _notifier.SuccessAsync(H["The Site theme was reset."]);
 
-            return RedirectToAction(nameof(Index));
-        }
+        return RedirectToAction(nameof(Index));
+    }
 
-        [HttpPost]
-        public async Task<ActionResult> ResetAdminTheme()
+    [HttpPost]
+    public async Task<ActionResult> ResetAdminTheme()
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ApplyTheme))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ApplyTheme))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            await _adminThemeService.SetAdminThemeAsync("");
+        await _adminThemeService.SetAdminThemeAsync("");
 
-            await _notifier.SuccessAsync(H["The Admin theme was reset."]);
+        await _notifier.SuccessAsync(H["The Admin theme was reset."]);
 
-            return RedirectToAction(nameof(Index));
-        }
+        return RedirectToAction(nameof(Index));
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> Disable(string id)
+    [HttpPost]
+    public async Task<IActionResult> Disable(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ApplyTheme))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ApplyTheme))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var feature = (await _shellFeaturesManager.GetAvailableFeaturesAsync())
-                .FirstOrDefault(f => f.Id == id && !f.IsAlwaysEnabled && !f.EnabledByDependencyOnly && f.IsTheme());
+        var feature = (await _shellFeaturesManager.GetAvailableFeaturesAsync())
+            .FirstOrDefault(f => f.Id == id && !f.IsAlwaysEnabled && !f.EnabledByDependencyOnly && f.IsTheme());
 
-            if (feature == null)
-            {
-                return NotFound();
-            }
+        if (feature == null)
+        {
+            return NotFound();
+        }
 
-            await _shellFeaturesManager.DisableFeaturesAsync(new[] { feature }, force: true);
+        await _shellFeaturesManager.DisableFeaturesAsync(new[] { feature }, force: true);
 
-            await _notifier.SuccessAsync(H["{0} was disabled.", feature.Name ?? feature.Id]);
+        await _notifier.SuccessAsync(H["{0} was disabled.", feature.Name ?? feature.Id]);
 
-            return RedirectToAction(nameof(Index));
-        }
+        return RedirectToAction(nameof(Index));
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> Enable(string id)
+    [HttpPost]
+    public async Task<IActionResult> Enable(string id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ApplyTheme))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ApplyTheme))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var feature = (await _shellFeaturesManager.GetAvailableFeaturesAsync())
-                .FirstOrDefault(f => f.Id == id && !f.IsAlwaysEnabled && !f.EnabledByDependencyOnly && f.IsTheme());
+        var feature = (await _shellFeaturesManager.GetAvailableFeaturesAsync())
+            .FirstOrDefault(f => f.Id == id && !f.IsAlwaysEnabled && !f.EnabledByDependencyOnly && f.IsTheme());
 
-            if (feature == null)
-            {
-                return NotFound();
-            }
+        if (feature == null)
+        {
+            return NotFound();
+        }
 
-            await _shellFeaturesManager.EnableFeaturesAsync(new[] { feature }, force: true);
+        await _shellFeaturesManager.EnableFeaturesAsync(new[] { feature }, force: true);
 
-            await _notifier.SuccessAsync(H["{0} was enabled.", feature.Name ?? feature.Id]);
+        await _notifier.SuccessAsync(H["{0} was enabled.", feature.Name ?? feature.Id]);
 
-            return RedirectToAction(nameof(Index));
-        }
+        return RedirectToAction(nameof(Index));
+    }
 
-        private static bool IsAdminTheme(IManifestInfo manifest)
-        {
-            return manifest.Tags.Any(x => string.Equals(x, ManifestConstants.AdminTag, StringComparison.OrdinalIgnoreCase));
-        }
+    private static bool IsAdminTheme(IManifestInfo manifest)
+    {
+        return manifest.Tags.Any(x => string.Equals(x, ManifestConstants.AdminTag, StringComparison.OrdinalIgnoreCase));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Deployment/ThemesDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Themes/Deployment/ThemesDeploymentSource.cs
index 7a4ffc13d64..ecadff3ee0e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Themes/Deployment/ThemesDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Themes/Deployment/ThemesDeploymentSource.cs
@@ -5,34 +5,33 @@
 using OrchardCore.Themes.Recipes;
 using OrchardCore.Themes.Services;
 
-namespace OrchardCore.Themes.Deployment
+namespace OrchardCore.Themes.Deployment;
+
+public class ThemesDeploymentSource : IDeploymentSource
 {
-    public class ThemesDeploymentSource : IDeploymentSource
+    private readonly ISiteThemeService _siteThemeService;
+    private readonly IAdminThemeService _adminThemeService;
+
+    public ThemesDeploymentSource(ISiteThemeService siteThemeService, IAdminThemeService adminThemeService)
+    {
+        _siteThemeService = siteThemeService;
+        _adminThemeService = adminThemeService;
+    }
+
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
     {
-        private readonly ISiteThemeService _siteThemeService;
-        private readonly IAdminThemeService _adminThemeService;
+        var themesStep = step as ThemesDeploymentStep;
 
-        public ThemesDeploymentSource(ISiteThemeService siteThemeService, IAdminThemeService adminThemeService)
+        if (themesStep == null)
         {
-            _siteThemeService = siteThemeService;
-            _adminThemeService = adminThemeService;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        result.Steps.Add(new JsonObject
         {
-            var themesStep = step as ThemesDeploymentStep;
-
-            if (themesStep == null)
-            {
-                return;
-            }
-
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "Themes",
-                [nameof(ThemeStepModel.Site)] = await _siteThemeService.GetSiteThemeNameAsync(),
-                [nameof(ThemeStepModel.Admin)] = await _adminThemeService.GetAdminThemeNameAsync(),
-            });
-        }
+            ["name"] = "Themes",
+            [nameof(ThemeStepModel.Site)] = await _siteThemeService.GetSiteThemeNameAsync(),
+            [nameof(ThemeStepModel.Admin)] = await _adminThemeService.GetAdminThemeNameAsync(),
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Deployment/ThemesDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Themes/Deployment/ThemesDeploymentStep.cs
index a47bb8d92af..25dbc7d33a3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Themes/Deployment/ThemesDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Themes/Deployment/ThemesDeploymentStep.cs
@@ -1,15 +1,14 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Themes.Deployment
+namespace OrchardCore.Themes.Deployment;
+
+/// <summary>
+/// Adds the currently selected admin theme and site theme to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class ThemesDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds the currently selected admin theme and site theme to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class ThemesDeploymentStep : DeploymentStep
+    public ThemesDeploymentStep()
     {
-        public ThemesDeploymentStep()
-        {
-            Name = "Themes";
-        }
+        Name = "Themes";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Deployment/ThemesDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Themes/Deployment/ThemesDeploymentStepDriver.cs
index e3577759182..3922fbeacdb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Themes/Deployment/ThemesDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Themes/Deployment/ThemesDeploymentStepDriver.cs
@@ -3,21 +3,20 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Themes.Deployment
+namespace OrchardCore.Themes.Deployment;
+
+public sealed class ThemesDeploymentStepDriver : DisplayDriver<DeploymentStep, ThemesDeploymentStep>
 {
-    public sealed class ThemesDeploymentStepDriver : DisplayDriver<DeploymentStep, ThemesDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(ThemesDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(ThemesDeploymentStep step, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                    View("ThemesDeploymentStep_Summary", step).Location("Summary", "Content"),
-                    View("ThemesDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return CombineAsync(
+                View("ThemesDeploymentStep_Summary", step).Location("Summary", "Content"),
+                View("ThemesDeploymentStep_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(ThemesDeploymentStep step, BuildEditorContext context)
-        {
-            return View("ThemesDeploymentStep_Edit", step).Location("Content");
-        }
+    public override IDisplayResult Edit(ThemesDeploymentStep step, BuildEditorContext context)
+    {
+        return View("ThemesDeploymentStep_Edit", step).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Models/SelectThemesViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Themes/Models/SelectThemesViewModel.cs
index 4fdc4b585c2..d06f0196718 100644
--- a/src/OrchardCore.Modules/OrchardCore.Themes/Models/SelectThemesViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Themes/Models/SelectThemesViewModel.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Themes.Models
+namespace OrchardCore.Themes.Models;
+
+public class SelectThemesViewModel
 {
-    public class SelectThemesViewModel
-    {
-        public ThemeEntry CurrentSiteTheme { get; set; }
-        public ThemeEntry CurrentAdminTheme { get; set; }
-        public IEnumerable<ThemeEntry> Themes { get; set; }
-    }
+    public ThemeEntry CurrentSiteTheme { get; set; }
+    public ThemeEntry CurrentAdminTheme { get; set; }
+    public IEnumerable<ThemeEntry> Themes { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Models/ThemeEntry.cs b/src/OrchardCore.Modules/OrchardCore.Themes/Models/ThemeEntry.cs
index 5f0c50520da..a520f51a901 100644
--- a/src/OrchardCore.Modules/OrchardCore.Themes/Models/ThemeEntry.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Themes/Models/ThemeEntry.cs
@@ -1,78 +1,77 @@
 using System.Collections.Generic;
 using OrchardCore.Environment.Extensions;
 
-namespace OrchardCore.Themes.Models
+namespace OrchardCore.Themes.Models;
+
+/// <summary>
+/// Represents a theme.
+/// </summary>
+public class ThemeEntry
 {
     /// <summary>
-    /// Represents a theme.
+    /// Default constructor.
     /// </summary>
-    public class ThemeEntry
+    public ThemeEntry()
     {
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        public ThemeEntry()
-        {
-            Notifications = [];
-        }
+        Notifications = [];
+    }
 
-        /// <summary>
-        /// Instantiates a theme based on an extension info.
-        /// </summary>
-        /// <param name="extensionInfo">The extension info.</param>
-        public ThemeEntry(IExtensionInfo extensionInfo)
-        {
-            Extension = extensionInfo;
-        }
+    /// <summary>
+    /// Instantiates a theme based on an extension info.
+    /// </summary>
+    /// <param name="extensionInfo">The extension info.</param>
+    public ThemeEntry(IExtensionInfo extensionInfo)
+    {
+        Extension = extensionInfo;
+    }
 
-        /// <summary>
-        /// The theme's extension info.
-        /// </summary>
-        public IExtensionInfo Extension { get; set; }
+    /// <summary>
+    /// The theme's extension info.
+    /// </summary>
+    public IExtensionInfo Extension { get; set; }
 
-        /// <summary>
-        /// Boolean value indicating whether the theme is enabled.
-        /// </summary>
-        public bool Enabled { get; set; }
+    /// <summary>
+    /// Boolean value indicating whether the theme is enabled.
+    /// </summary>
+    public bool Enabled { get; set; }
 
-        /// <summary>
-        /// Boolean value indicating whether the theme needs a data update / migration.
-        /// </summary>
-        public bool NeedsUpdate { get; set; }
+    /// <summary>
+    /// Boolean value indicating whether the theme needs a data update / migration.
+    /// </summary>
+    public bool NeedsUpdate { get; set; }
 
-        /// <summary>
-        /// Boolean value indicating if the module needs a version update.
-        /// </summary>
-        public bool NeedsVersionUpdate { get; set; }
+    /// <summary>
+    /// Boolean value indicating if the module needs a version update.
+    /// </summary>
+    public bool NeedsVersionUpdate { get; set; }
 
-        /// <summary>
-        /// Boolean value indicating if the feature was recently installed.
-        /// </summary>
-        public bool IsRecentlyInstalled { get; set; }
+    /// <summary>
+    /// Boolean value indicating if the feature was recently installed.
+    /// </summary>
+    public bool IsRecentlyInstalled { get; set; }
 
-        /// <summary>
-        /// Boolean value indicating if the theme can be uninstalled.
-        /// </summary>
-        public bool CanUninstall { get; set; }
+    /// <summary>
+    /// Boolean value indicating if the theme can be uninstalled.
+    /// </summary>
+    public bool CanUninstall { get; set; }
 
-        /// <summary>
-        /// List of theme notifications.
-        /// </summary>
-        public List<string> Notifications { get; set; }
+    /// <summary>
+    /// List of theme notifications.
+    /// </summary>
+    public List<string> Notifications { get; set; }
 
-        /// <summary>
-        /// The theme's name.
-        /// </summary>
-        public string Name { get { return Extension.Manifest.Name; } }
+    /// <summary>
+    /// The theme's name.
+    /// </summary>
+    public string Name { get { return Extension.Manifest.Name; } }
 
-        /// <summary>
-        /// Boolean value indicating whether this is an admin theme.
-        /// </summary>
-        public bool IsAdmin { get; set; }
+    /// <summary>
+    /// Boolean value indicating whether this is an admin theme.
+    /// </summary>
+    public bool IsAdmin { get; set; }
 
-        /// <summary>
-        /// Boolean value indicating whether this is the current theme.
-        /// </summary>
-        public bool IsCurrent { get; set; }
-    }
+    /// <summary>
+    /// Boolean value indicating whether this is the current theme.
+    /// </summary>
+    public bool IsCurrent { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Recipes/ThemesStep.cs b/src/OrchardCore.Modules/OrchardCore.Themes/Recipes/ThemesStep.cs
index 81c2bd6e71f..a003ba39c6b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Themes/Recipes/ThemesStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Themes/Recipes/ThemesStep.cs
@@ -6,48 +6,47 @@
 using OrchardCore.Recipes.Services;
 using OrchardCore.Themes.Services;
 
-namespace OrchardCore.Themes.Recipes
+namespace OrchardCore.Themes.Recipes;
+
+/// <summary>
+/// This recipe step defines the site and admin current themes.
+/// </summary>
+public sealed class ThemesStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step defines the site and admin current themes.
-    /// </summary>
-    public sealed class ThemesStep : IRecipeStepHandler
+    private readonly ISiteThemeService _siteThemeService;
+    private readonly IAdminThemeService _adminThemeService;
+
+    public ThemesStep(
+        ISiteThemeService siteThemeService,
+        IAdminThemeService adminThemeService)
     {
-        private readonly ISiteThemeService _siteThemeService;
-        private readonly IAdminThemeService _adminThemeService;
+        _adminThemeService = adminThemeService;
+        _siteThemeService = siteThemeService;
+    }
 
-        public ThemesStep(
-            ISiteThemeService siteThemeService,
-            IAdminThemeService adminThemeService)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "Themes", StringComparison.OrdinalIgnoreCase))
         {
-            _adminThemeService = adminThemeService;
-            _siteThemeService = siteThemeService;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        var model = context.Step.ToObject<ThemeStepModel>();
+
+        if (!string.IsNullOrEmpty(model.Site))
         {
-            if (!string.Equals(context.Name, "Themes", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            var model = context.Step.ToObject<ThemeStepModel>();
-
-            if (!string.IsNullOrEmpty(model.Site))
-            {
-                await _siteThemeService.SetSiteThemeAsync(model.Site);
-            }
-
-            if (!string.IsNullOrEmpty(model.Admin))
-            {
-                await _adminThemeService.SetAdminThemeAsync(model.Admin);
-            }
+            await _siteThemeService.SetSiteThemeAsync(model.Site);
         }
-    }
 
-    public sealed class ThemeStepModel
-    {
-        public string Site { get; set; }
-        public string Admin { get; set; }
+        if (!string.IsNullOrEmpty(model.Admin))
+        {
+            await _adminThemeService.SetAdminThemeAsync(model.Admin);
+        }
     }
 }
+
+public sealed class ThemeStepModel
+{
+    public string Site { get; set; }
+    public string Admin { get; set; }
+}
diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Services/ISiteThemeService.cs b/src/OrchardCore.Modules/OrchardCore.Themes/Services/ISiteThemeService.cs
index f08f85b63da..17d93ba902c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Themes/Services/ISiteThemeService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Themes/Services/ISiteThemeService.cs
@@ -1,14 +1,13 @@
 using System.Threading.Tasks;
 using OrchardCore.Environment.Extensions;
 
-namespace OrchardCore.Themes.Services
+namespace OrchardCore.Themes.Services;
+
+public interface ISiteThemeService
 {
-    public interface ISiteThemeService
-    {
-        Task<IExtensionInfo> GetSiteThemeAsync();
+    Task<IExtensionInfo> GetSiteThemeAsync();
 
-        Task SetSiteThemeAsync(string themeName);
+    Task SetSiteThemeAsync(string themeName);
 
-        Task<string> GetSiteThemeNameAsync();
-    }
+    Task<string> GetSiteThemeNameAsync();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Services/IThemeService.cs b/src/OrchardCore.Modules/OrchardCore.Themes/Services/IThemeService.cs
index fb4a0956d7c..7011150b522 100644
--- a/src/OrchardCore.Modules/OrchardCore.Themes/Services/IThemeService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Themes/Services/IThemeService.cs
@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Themes.Services
+namespace OrchardCore.Themes.Services;
+
+public interface IThemeService
 {
-    public interface IThemeService
-    {
-        Task DisableThemeFeaturesAsync(string themeName);
-        Task EnableThemeFeaturesAsync(string themeName);
-    }
+    Task DisableThemeFeaturesAsync(string themeName);
+    Task EnableThemeFeaturesAsync(string themeName);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Services/SiteThemeSelector.cs b/src/OrchardCore.Modules/OrchardCore.Themes/Services/SiteThemeSelector.cs
index 4a6a6eb86c0..4ed8bc4b421 100644
--- a/src/OrchardCore.Modules/OrchardCore.Themes/Services/SiteThemeSelector.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Themes/Services/SiteThemeSelector.cs
@@ -1,35 +1,34 @@
 using System.Threading.Tasks;
 using OrchardCore.DisplayManagement.Theming;
 
-namespace OrchardCore.Themes.Services
+namespace OrchardCore.Themes.Services;
+
+/// <summary>
+/// Provides the theme defined in the site configuration for the current scope (request).
+/// The same <see cref="ThemeSelectorResult"/> is returned if called multiple times
+/// during the same scope.
+/// </summary>
+public class SiteThemeSelector : IThemeSelector
 {
-    /// <summary>
-    /// Provides the theme defined in the site configuration for the current scope (request).
-    /// The same <see cref="ThemeSelectorResult"/> is returned if called multiple times
-    /// during the same scope.
-    /// </summary>
-    public class SiteThemeSelector : IThemeSelector
+    private readonly ISiteThemeService _siteThemeService;
+
+    public SiteThemeSelector(ISiteThemeService siteThemeService)
     {
-        private readonly ISiteThemeService _siteThemeService;
+        _siteThemeService = siteThemeService;
+    }
 
-        public SiteThemeSelector(ISiteThemeService siteThemeService)
+    public async Task<ThemeSelectorResult> GetThemeAsync()
+    {
+        var currentThemeName = await _siteThemeService.GetSiteThemeNameAsync();
+        if (string.IsNullOrEmpty(currentThemeName))
         {
-            _siteThemeService = siteThemeService;
+            return null;
         }
 
-        public async Task<ThemeSelectorResult> GetThemeAsync()
+        return new ThemeSelectorResult
         {
-            var currentThemeName = await _siteThemeService.GetSiteThemeNameAsync();
-            if (string.IsNullOrEmpty(currentThemeName))
-            {
-                return null;
-            }
-
-            return new ThemeSelectorResult
-            {
-                Priority = 0,
-                ThemeName = currentThemeName
-            };
-        }
+            Priority = 0,
+            ThemeName = currentThemeName
+        };
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Services/SiteThemeService.cs b/src/OrchardCore.Modules/OrchardCore.Themes/Services/SiteThemeService.cs
index 483a81d9ee2..265e309924c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Themes/Services/SiteThemeService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Themes/Services/SiteThemeService.cs
@@ -2,44 +2,43 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Themes.Services
+namespace OrchardCore.Themes.Services;
+
+public class SiteThemeService : ISiteThemeService
 {
-    public class SiteThemeService : ISiteThemeService
+    private readonly ISiteService _siteService;
+    private readonly IExtensionManager _extensionManager;
+
+    public SiteThemeService(
+        ISiteService siteService,
+        IExtensionManager extensionManager)
     {
-        private readonly ISiteService _siteService;
-        private readonly IExtensionManager _extensionManager;
+        _siteService = siteService;
+        _extensionManager = extensionManager;
+    }
 
-        public SiteThemeService(
-            ISiteService siteService,
-            IExtensionManager extensionManager)
+    public async Task<IExtensionInfo> GetSiteThemeAsync()
+    {
+        var currentThemeName = await GetSiteThemeNameAsync();
+        if (string.IsNullOrEmpty(currentThemeName))
         {
-            _siteService = siteService;
-            _extensionManager = extensionManager;
+            return null;
         }
 
-        public async Task<IExtensionInfo> GetSiteThemeAsync()
-        {
-            var currentThemeName = await GetSiteThemeNameAsync();
-            if (string.IsNullOrEmpty(currentThemeName))
-            {
-                return null;
-            }
-
-            return _extensionManager.GetExtension(currentThemeName);
-        }
+        return _extensionManager.GetExtension(currentThemeName);
+    }
 
-        public async Task SetSiteThemeAsync(string themeName)
-        {
-            var site = await _siteService.LoadSiteSettingsAsync();
-            site.Properties["CurrentThemeName"] = themeName;
-            await _siteService.UpdateSiteSettingsAsync(site);
-        }
+    public async Task SetSiteThemeAsync(string themeName)
+    {
+        var site = await _siteService.LoadSiteSettingsAsync();
+        site.Properties["CurrentThemeName"] = themeName;
+        await _siteService.UpdateSiteSettingsAsync(site);
+    }
 
-        public async Task<string> GetSiteThemeNameAsync()
-        {
-            var site = await _siteService.GetSiteSettingsAsync();
+    public async Task<string> GetSiteThemeNameAsync()
+    {
+        var site = await _siteService.GetSiteSettingsAsync();
 
-            return (string)site.Properties["CurrentThemeName"];
-        }
+        return (string)site.Properties["CurrentThemeName"];
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Services/ThemeService.cs b/src/OrchardCore.Modules/OrchardCore.Themes/Services/ThemeService.cs
index 72a59eab844..789da083697 100644
--- a/src/OrchardCore.Modules/OrchardCore.Themes/Services/ThemeService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Themes/Services/ThemeService.cs
@@ -8,138 +8,137 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Environment.Shell;
 
-namespace OrchardCore.Themes.Services
+namespace OrchardCore.Themes.Services;
+
+public class ThemeService : IThemeService
 {
-    public class ThemeService : IThemeService
+    private readonly IExtensionManager _extensionManager;
+    private readonly IShellFeaturesManager _shellFeaturesManager;
+    private readonly INotifier _notifier;
+    private readonly ISiteThemeService _siteThemeService;
+    protected readonly IHtmlLocalizer H;
+
+    public ThemeService(
+        IExtensionManager extensionManager,
+        IShellFeaturesManager shellFeaturesManager,
+        ISiteThemeService siteThemeService,
+        IHtmlLocalizer<ThemeService> htmlLocalizer,
+        INotifier notifier)
     {
-        private readonly IExtensionManager _extensionManager;
-        private readonly IShellFeaturesManager _shellFeaturesManager;
-        private readonly INotifier _notifier;
-        private readonly ISiteThemeService _siteThemeService;
-        protected readonly IHtmlLocalizer H;
-
-        public ThemeService(
-            IExtensionManager extensionManager,
-            IShellFeaturesManager shellFeaturesManager,
-            ISiteThemeService siteThemeService,
-            IHtmlLocalizer<ThemeService> htmlLocalizer,
-            INotifier notifier)
-        {
-            _extensionManager = extensionManager;
-            _shellFeaturesManager = shellFeaturesManager;
-            _siteThemeService = siteThemeService;
+        _extensionManager = extensionManager;
+        _shellFeaturesManager = shellFeaturesManager;
+        _siteThemeService = siteThemeService;
 
-            _notifier = notifier;
-            H = htmlLocalizer;
-        }
+        _notifier = notifier;
+        H = htmlLocalizer;
+    }
 
-        public async Task DisableThemeFeaturesAsync(string themeName)
+    public async Task DisableThemeFeaturesAsync(string themeName)
+    {
+        var themes = new Queue<string>();
+        while (themeName != null)
         {
-            var themes = new Queue<string>();
-            while (themeName != null)
-            {
-                if (themes.Contains(themeName))
-                    throw new InvalidOperationException(H["The theme \"{0}\" is already in the stack of themes that need features disabled.", themeName].ToString());
-                var theme = _extensionManager.GetExtension(themeName);
-                if (theme == null)
-                    break;
-                themes.Enqueue(themeName);
-
-                themeName = !string.IsNullOrWhiteSpace(theme.Manifest.Name)
-                    ? theme.Manifest.Name
-                    : null;
-            }
-
-            var currentTheme = await _siteThemeService.GetSiteThemeNameAsync();
-
-            while (themes.Count > 0)
-            {
-                var themeId = themes.Dequeue();
-
-                // Not disabling base theme if it's the current theme.
-                if (themeId != currentTheme)
-                {
-                    await DisableFeaturesAsync(new[] { themeId }, true);
-                }
-            }
+            if (themes.Contains(themeName))
+                throw new InvalidOperationException(H["The theme \"{0}\" is already in the stack of themes that need features disabled.", themeName].ToString());
+            var theme = _extensionManager.GetExtension(themeName);
+            if (theme == null)
+                break;
+            themes.Enqueue(themeName);
+
+            themeName = !string.IsNullOrWhiteSpace(theme.Manifest.Name)
+                ? theme.Manifest.Name
+                : null;
         }
 
-        public async Task EnableThemeFeaturesAsync(string themeName)
+        var currentTheme = await _siteThemeService.GetSiteThemeNameAsync();
+
+        while (themes.Count > 0)
         {
-            var themes = new Stack<string>();
-            while (themeName != null)
-            {
-                if (themes.Contains(themeName))
-                    throw new InvalidOperationException(H["The theme \"{0}\" is already in the stack of themes that need features enabled.", themeName].ToString());
-                themes.Push(themeName);
-
-                // TODO: MWP: probably follow on issue: should this be recursive? maybe with a depth limit? i.e. base3->base2->base1 ...
-                var extensionInfo = _extensionManager.GetExtension(themeName);
-                var theme = new ThemeExtensionInfo(extensionInfo);
-                // Along similar lines as with ModuleAttribute, internal safety checks handled within the attribute itself
-                themeName = theme.BaseTheme;
-            }
+            var themeId = themes.Dequeue();
 
-            while (themes.Count > 0)
+            // Not disabling base theme if it's the current theme.
+            if (themeId != currentTheme)
             {
-                var themeId = themes.Pop();
-
-                await EnableFeaturesAsync(new[] { themeId }, true);
+                await DisableFeaturesAsync(new[] { themeId }, true);
             }
         }
+    }
 
-        /// <summary>
-        /// Enables a list of features.
-        /// </summary>
-        /// <param name="featureIds">The IDs for the features to be enabled.</param>
-        public Task EnableFeaturesAsync(IEnumerable<string> featureIds)
+    public async Task EnableThemeFeaturesAsync(string themeName)
+    {
+        var themes = new Stack<string>();
+        while (themeName != null)
         {
-            return EnableFeaturesAsync(featureIds, false);
+            if (themes.Contains(themeName))
+                throw new InvalidOperationException(H["The theme \"{0}\" is already in the stack of themes that need features enabled.", themeName].ToString());
+            themes.Push(themeName);
+
+            // TODO: MWP: probably follow on issue: should this be recursive? maybe with a depth limit? i.e. base3->base2->base1 ...
+            var extensionInfo = _extensionManager.GetExtension(themeName);
+            var theme = new ThemeExtensionInfo(extensionInfo);
+            // Along similar lines as with ModuleAttribute, internal safety checks handled within the attribute itself
+            themeName = theme.BaseTheme;
         }
 
-        /// <summary>
-        /// Enables a list of features.
-        /// </summary>
-        /// <param name="featureIds">The IDs for the features to be enabled.</param>
-        /// <param name="force">Boolean parameter indicating if the feature should enable it's dependencies if required or fail otherwise.</param>
-        public async Task EnableFeaturesAsync(IEnumerable<string> featureIds, bool force)
+        while (themes.Count > 0)
         {
-            var featuresToEnable = _extensionManager
-                .GetFeatures()
-                .Where(x => featureIds.Contains(x.Id));
+            var themeId = themes.Pop();
 
-            var enabledFeatures = await _shellFeaturesManager.EnableFeaturesAsync(featuresToEnable, force);
-            foreach (var enabledFeature in enabledFeatures)
-            {
-                await _notifier.SuccessAsync(H["{0} was enabled.", enabledFeature.Name]);
-            }
+            await EnableFeaturesAsync(new[] { themeId }, true);
         }
+    }
 
-        /// <summary>
-        /// Disables a list of features.
-        /// </summary>
-        /// <param name="featureIds">The IDs for the features to be disabled.</param>
-        public Task DisableFeaturesAsync(IEnumerable<string> featureIds)
+    /// <summary>
+    /// Enables a list of features.
+    /// </summary>
+    /// <param name="featureIds">The IDs for the features to be enabled.</param>
+    public Task EnableFeaturesAsync(IEnumerable<string> featureIds)
+    {
+        return EnableFeaturesAsync(featureIds, false);
+    }
+
+    /// <summary>
+    /// Enables a list of features.
+    /// </summary>
+    /// <param name="featureIds">The IDs for the features to be enabled.</param>
+    /// <param name="force">Boolean parameter indicating if the feature should enable it's dependencies if required or fail otherwise.</param>
+    public async Task EnableFeaturesAsync(IEnumerable<string> featureIds, bool force)
+    {
+        var featuresToEnable = _extensionManager
+            .GetFeatures()
+            .Where(x => featureIds.Contains(x.Id));
+
+        var enabledFeatures = await _shellFeaturesManager.EnableFeaturesAsync(featuresToEnable, force);
+        foreach (var enabledFeature in enabledFeatures)
         {
-            return DisableFeaturesAsync(featureIds, false);
+            await _notifier.SuccessAsync(H["{0} was enabled.", enabledFeature.Name]);
         }
+    }
 
-        /// <summary>
-        /// Disables a list of features.
-        /// </summary>
-        /// <param name="featureIds">The IDs for the features to be disabled.</param>
-        /// <param name="force">Boolean parameter indicating if the feature should disable the features which depend on it if required or fail otherwise.</param>
-        public async Task DisableFeaturesAsync(IEnumerable<string> featureIds, bool force)
-        {
-            var featuresToDisable = _extensionManager
-                .GetFeatures()
-                .Where(x => featureIds.Contains(x.Id));
+    /// <summary>
+    /// Disables a list of features.
+    /// </summary>
+    /// <param name="featureIds">The IDs for the features to be disabled.</param>
+    public Task DisableFeaturesAsync(IEnumerable<string> featureIds)
+    {
+        return DisableFeaturesAsync(featureIds, false);
+    }
 
-            var features = await _shellFeaturesManager.DisableFeaturesAsync(featuresToDisable, force);
-            foreach (var feature in features)
-            {
-                await _notifier.SuccessAsync(H["{0} was disabled.", feature.Name]);
-            }
+    /// <summary>
+    /// Disables a list of features.
+    /// </summary>
+    /// <param name="featureIds">The IDs for the features to be disabled.</param>
+    /// <param name="force">Boolean parameter indicating if the feature should disable the features which depend on it if required or fail otherwise.</param>
+    public async Task DisableFeaturesAsync(IEnumerable<string> featureIds, bool force)
+    {
+        var featuresToDisable = _extensionManager
+            .GetFeatures()
+            .Where(x => featureIds.Contains(x.Id));
+
+        var features = await _shellFeaturesManager.DisableFeaturesAsync(featuresToDisable, force);
+        foreach (var feature in features)
+        {
+            await _notifier.SuccessAsync(H["{0} was disabled.", feature.Name]);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Themes/Startup.cs
index 66191ca9f50..43261d2422c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Themes/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Themes/Startup.cs
@@ -15,26 +15,25 @@
 using OrchardCore.Themes.Recipes;
 using OrchardCore.Themes.Services;
 
-namespace OrchardCore.Themes
+namespace OrchardCore.Themes;
+
+/// <summary>
+/// These services are registered on the tenant service collection.
+/// </summary>
+public sealed class Startup : StartupBase
 {
-    /// <summary>
-    /// These services are registered on the tenant service collection.
-    /// </summary>
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
-            services.AddRecipeExecutionStep<ThemesStep>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<IThemeSelector, SiteThemeSelector>();
-            services.AddScoped<ISiteThemeService, SiteThemeService>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IThemeService, ThemeService>();
-            services.AddScoped<ThemeTogglerService>();
-            services.AddDeployment<ThemesDeploymentSource, ThemesDeploymentStep, ThemesDeploymentStepDriver>();
-            services.AddScoped<IDisplayDriver<Navbar>, ToggleThemeNavbarDisplayDriver>();
-            services.AddScoped<IDisplayDriver<ThemeEntry>, ThemeEntryDisplayDriver>();
-        }
+        services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
+        services.AddRecipeExecutionStep<ThemesStep>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<IThemeSelector, SiteThemeSelector>();
+        services.AddScoped<ISiteThemeService, SiteThemeService>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IThemeService, ThemeService>();
+        services.AddScoped<ThemeTogglerService>();
+        services.AddDeployment<ThemesDeploymentSource, ThemesDeploymentStep, ThemesDeploymentStepDriver>();
+        services.AddScoped<IDisplayDriver<Navbar>, ToggleThemeNavbarDisplayDriver>();
+        services.AddScoped<IDisplayDriver<ThemeEntry>, ThemeEntryDisplayDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/ViewModels/SelectThemesViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Themes/ViewModels/SelectThemesViewModel.cs
index ec3579c0d16..f39ecf5bc9a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Themes/ViewModels/SelectThemesViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Themes/ViewModels/SelectThemesViewModel.cs
@@ -1,12 +1,11 @@
 using System.Collections.Generic;
 using OrchardCore.Themes.Models;
 
-namespace OrchardCore.Themes.ViewModels
+namespace OrchardCore.Themes.ViewModels;
+
+public class SelectThemesViewModel
 {
-    public class SelectThemesViewModel
-    {
-        public string SiteThemeName { get; set; }
-        public string AdminThemeName { get; set; }
-        public IEnumerable<ThemeEntry> Themes { get; set; }
-    }
+    public string SiteThemeName { get; set; }
+    public string AdminThemeName { get; set; }
+    public IEnumerable<ThemeEntry> Themes { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Title/Drivers/TitlePartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Title/Drivers/TitlePartDisplayDriver.cs
index c193484fd33..230e23f7c45 100644
--- a/src/OrchardCore.Modules/OrchardCore.Title/Drivers/TitlePartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Title/Drivers/TitlePartDisplayDriver.cs
@@ -8,61 +8,60 @@
 using OrchardCore.Title.Models;
 using OrchardCore.Title.ViewModels;
 
-namespace OrchardCore.Title.Drivers
+namespace OrchardCore.Title.Drivers;
+
+public sealed class TitlePartDisplayDriver : ContentPartDisplayDriver<TitlePart>
 {
-    public sealed class TitlePartDisplayDriver : ContentPartDisplayDriver<TitlePart>
+    internal readonly IStringLocalizer S;
+
+    public TitlePartDisplayDriver(IStringLocalizer<TitlePartDisplayDriver> localizer)
+    {
+        S = localizer;
+    }
+
+    public override IDisplayResult Display(TitlePart titlePart, BuildPartDisplayContext context)
     {
-        internal readonly IStringLocalizer S;
+        var settings = context.TypePartDefinition.GetSettings<TitlePartSettings>();
 
-        public TitlePartDisplayDriver(IStringLocalizer<TitlePartDisplayDriver> localizer)
+        if (!settings.RenderTitle || string.IsNullOrWhiteSpace(titlePart.Title))
         {
-            S = localizer;
+            return null;
         }
 
-        public override IDisplayResult Display(TitlePart titlePart, BuildPartDisplayContext context)
+        return Initialize<TitlePartViewModel>(GetDisplayShapeType(context), model =>
         {
-            var settings = context.TypePartDefinition.GetSettings<TitlePartSettings>();
+            model.Title = titlePart.ContentItem.DisplayText;
+            model.TitlePart = titlePart;
+            model.ContentItem = titlePart.ContentItem;
+        }).Location("Detail", "Header")
+        .Location("Summary", "Header");
+    }
 
-            if (!settings.RenderTitle || string.IsNullOrWhiteSpace(titlePart.Title))
-            {
-                return null;
-            }
+    public override IDisplayResult Edit(TitlePart titlePart, BuildPartEditorContext context)
+    {
+        return Initialize<TitlePartViewModel>(GetEditorShapeType(context), model =>
+        {
+            model.Title = titlePart.ContentItem.DisplayText;
+            model.TitlePart = titlePart;
+            model.ContentItem = titlePart.ContentItem;
+            model.Settings = context.TypePartDefinition.GetSettings<TitlePartSettings>();
+        });
+    }
 
-            return Initialize<TitlePartViewModel>(GetDisplayShapeType(context), model =>
-            {
-                model.Title = titlePart.ContentItem.DisplayText;
-                model.TitlePart = titlePart;
-                model.ContentItem = titlePart.ContentItem;
-            }).Location("Detail", "Header")
-            .Location("Summary", "Header");
-        }
+    public override async Task<IDisplayResult> UpdateAsync(TitlePart model, UpdatePartEditorContext context)
+    {
+        await context.Updater.TryUpdateModelAsync(model, Prefix, t => t.Title);
+        var settings = context.TypePartDefinition.GetSettings<TitlePartSettings>();
 
-        public override IDisplayResult Edit(TitlePart titlePart, BuildPartEditorContext context)
+        if (settings.Options == TitlePartOptions.EditableRequired && string.IsNullOrWhiteSpace(model.Title))
         {
-            return Initialize<TitlePartViewModel>(GetEditorShapeType(context), model =>
-            {
-                model.Title = titlePart.ContentItem.DisplayText;
-                model.TitlePart = titlePart;
-                model.ContentItem = titlePart.ContentItem;
-                model.Settings = context.TypePartDefinition.GetSettings<TitlePartSettings>();
-            });
+            context.Updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
         }
-
-        public override async Task<IDisplayResult> UpdateAsync(TitlePart model, UpdatePartEditorContext context)
+        else
         {
-            await context.Updater.TryUpdateModelAsync(model, Prefix, t => t.Title);
-            var settings = context.TypePartDefinition.GetSettings<TitlePartSettings>();
-
-            if (settings.Options == TitlePartOptions.EditableRequired && string.IsNullOrWhiteSpace(model.Title))
-            {
-                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Title), S["A value is required for Title."]);
-            }
-            else
-            {
-                model.ContentItem.DisplayText = model.Title;
-            }
-
-            return Edit(model, context);
+            model.ContentItem.DisplayText = model.Title;
         }
+
+        return Edit(model, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Title/Handlers/TitlePartHandler.cs b/src/OrchardCore.Modules/OrchardCore.Title/Handlers/TitlePartHandler.cs
index 9f1fb26cd3e..9d2cfcd6765 100644
--- a/src/OrchardCore.Modules/OrchardCore.Title/Handlers/TitlePartHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Title/Handlers/TitlePartHandler.cs
@@ -12,100 +12,99 @@
 using OrchardCore.Title.Models;
 using OrchardCore.Title.ViewModels;
 
-namespace OrchardCore.Title.Handlers
+namespace OrchardCore.Title.Handlers;
+
+public class TitlePartHandler : ContentPartHandler<TitlePart>
 {
-    public class TitlePartHandler : ContentPartHandler<TitlePart>
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    protected readonly IStringLocalizer S;
+    private readonly HashSet<ContentItem> _contentItems = [];
+
+    public TitlePartHandler(
+        ILiquidTemplateManager liquidTemplateManager,
+        IContentDefinitionManager contentDefinitionManager,
+        IStringLocalizer<TitlePartHandler> stringLocalizer)
     {
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        protected readonly IStringLocalizer S;
-        private readonly HashSet<ContentItem> _contentItems = [];
-
-        public TitlePartHandler(
-            ILiquidTemplateManager liquidTemplateManager,
-            IContentDefinitionManager contentDefinitionManager,
-            IStringLocalizer<TitlePartHandler> stringLocalizer)
-        {
-            _liquidTemplateManager = liquidTemplateManager;
-            _contentDefinitionManager = contentDefinitionManager;
-            S = stringLocalizer;
-        }
+        _liquidTemplateManager = liquidTemplateManager;
+        _contentDefinitionManager = contentDefinitionManager;
+        S = stringLocalizer;
+    }
 
-        public override Task UpdatedAsync(UpdateContentContext context, TitlePart part)
+    public override Task UpdatedAsync(UpdateContentContext context, TitlePart part)
+    {
+        return SetTitleAsync(part);
+    }
+
+    public override Task CreatedAsync(CreateContentContext context, TitlePart part)
+    {
+        return SetTitleAsync(part);
+    }
+
+    protected override Task ValidatingAsync(ValidateContentPartContext context, TitlePart part)
+    {
+        var settings = context.ContentTypePartDefinition.GetSettings<TitlePartSettings>();
+
+        if (settings.Options == TitlePartOptions.EditableRequired && string.IsNullOrEmpty(part.Title))
         {
-            return SetTitleAsync(part);
+            context.Fail(S["A value is required for Title."], nameof(part.Title));
         }
 
-        public override Task CreatedAsync(CreateContentContext context, TitlePart part)
+        return Task.CompletedTask;
+    }
+
+    private async Task SetTitleAsync(TitlePart part)
+    {
+        if (!_contentItems.Add(part.ContentItem))
         {
-            return SetTitleAsync(part);
+            // At this point we know that the contentItem was already processed. No need to process it again.
+
+            return;
         }
 
-        protected override Task ValidatingAsync(ValidateContentPartContext context, TitlePart part)
-        {
-            var settings = context.ContentTypePartDefinition.GetSettings<TitlePartSettings>();
+        var settings = await GetSettingsAsync(part);
 
-            if (settings.Options == TitlePartOptions.EditableRequired && string.IsNullOrEmpty(part.Title))
+        // Do not compute the title if the user can modify it.
+        if (settings.Options == TitlePartOptions.Editable || settings.Options == TitlePartOptions.EditableRequired)
+        {
+            if (string.IsNullOrWhiteSpace(part.ContentItem.DisplayText))
             {
-                context.Fail(S["A value is required for Title."], nameof(part.Title));
+                // UpdatedAsync event is called from non-UI request like API, we update the DisplayText if it is not already set.
+                // When the displayText is not set, we set it to the value of title.
+                part.ContentItem.DisplayText = part.Title;
             }
 
-            return Task.CompletedTask;
+            return;
         }
 
-        private async Task SetTitleAsync(TitlePart part)
+        if (!string.IsNullOrEmpty(settings.Pattern))
         {
-            if (!_contentItems.Add(part.ContentItem))
+            var model = new TitlePartViewModel()
             {
-                // At this point we know that the contentItem was already processed. No need to process it again.
-
-                return;
-            }
-
-            var settings = await GetSettingsAsync(part);
+                Title = part.Title,
+                TitlePart = part,
+                ContentItem = part.ContentItem,
+            };
 
-            // Do not compute the title if the user can modify it.
-            if (settings.Options == TitlePartOptions.Editable || settings.Options == TitlePartOptions.EditableRequired)
-            {
-                if (string.IsNullOrWhiteSpace(part.ContentItem.DisplayText))
+            var title = await _liquidTemplateManager.RenderStringAsync(settings.Pattern, NullEncoder.Default, model,
+                new Dictionary<string, FluidValue>()
                 {
-                    // UpdatedAsync event is called from non-UI request like API, we update the DisplayText if it is not already set.
-                    // When the displayText is not set, we set it to the value of title.
-                    part.ContentItem.DisplayText = part.Title;
-                }
+                    ["ContentItem"] = new ObjectValue(model.ContentItem)
+                });
 
-                return;
-            }
+            title = title.Replace("\r", string.Empty).Replace("\n", string.Empty);
 
-            if (!string.IsNullOrEmpty(settings.Pattern))
-            {
-                var model = new TitlePartViewModel()
-                {
-                    Title = part.Title,
-                    TitlePart = part,
-                    ContentItem = part.ContentItem,
-                };
-
-                var title = await _liquidTemplateManager.RenderStringAsync(settings.Pattern, NullEncoder.Default, model,
-                    new Dictionary<string, FluidValue>()
-                    {
-                        ["ContentItem"] = new ObjectValue(model.ContentItem)
-                    });
-
-                title = title.Replace("\r", string.Empty).Replace("\n", string.Empty);
-
-                part.Title = title;
-                part.ContentItem.DisplayText = title;
-                part.Apply();
-            }
+            part.Title = title;
+            part.ContentItem.DisplayText = title;
+            part.Apply();
         }
+    }
 
-        private async Task<TitlePartSettings> GetSettingsAsync(TitlePart part)
-        {
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(part.ContentItem.ContentType);
-            var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, nameof(TitlePart), StringComparison.Ordinal));
+    private async Task<TitlePartSettings> GetSettingsAsync(TitlePart part)
+    {
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(part.ContentItem.ContentType);
+        var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => string.Equals(x.PartDefinition.Name, nameof(TitlePart), StringComparison.Ordinal));
 
-            return contentTypePartDefinition.GetSettings<TitlePartSettings>();
-        }
+        return contentTypePartDefinition.GetSettings<TitlePartSettings>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Title/Indexing/TitlePartIndexHandler.cs b/src/OrchardCore.Modules/OrchardCore.Title/Indexing/TitlePartIndexHandler.cs
index c3f968cb35b..d846d4d4f8a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Title/Indexing/TitlePartIndexHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Title/Indexing/TitlePartIndexHandler.cs
@@ -2,20 +2,19 @@
 using OrchardCore.Indexing;
 using OrchardCore.Title.Models;
 
-namespace OrchardCore.Title.Indexing
+namespace OrchardCore.Title.Indexing;
+
+public class TitlePartIndexHandler : ContentPartIndexHandler<TitlePart>
 {
-    public class TitlePartIndexHandler : ContentPartIndexHandler<TitlePart>
+    public override Task BuildIndexAsync(TitlePart part, BuildPartIndexContext context)
     {
-        public override Task BuildIndexAsync(TitlePart part, BuildPartIndexContext context)
-        {
-            var options = context.Settings.ToOptions();
-
-            foreach (var key in context.Keys)
-            {
-                context.DocumentIndex.Set(key, part.Title, options);
-            }
+        var options = context.Settings.ToOptions();
 
-            return Task.CompletedTask;
+        foreach (var key in context.Keys)
+        {
+            context.DocumentIndex.Set(key, part.Title, options);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Title/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Title/Migrations.cs
index f4d6e5df84c..05ae902a563 100644
--- a/src/OrchardCore.Modules/OrchardCore.Title/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Title/Migrations.cs
@@ -10,101 +10,100 @@
 using OrchardCore.Data.Migration;
 using YesSql;
 
-namespace OrchardCore.Title
+namespace OrchardCore.Title;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ISession _session;
+    private readonly ILogger _logger;
+
+    public Migrations(
+        IContentDefinitionManager contentDefinitionManager,
+        ISession session,
+        ILogger<Migrations> logger)
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly ISession _session;
-        private readonly ILogger _logger;
-
-        public Migrations(
-            IContentDefinitionManager contentDefinitionManager,
-            ISession session,
-            ILogger<Migrations> logger)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _session = session;
-            _logger = logger;
-        }
+        _contentDefinitionManager = contentDefinitionManager;
+        _session = session;
+        _logger = logger;
+    }
 
-        public async Task<int> CreateAsync()
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync("TitlePart", builder => builder
-                .Attachable()
-                .WithDescription("Provides a Title for your content item.")
-                .WithDefaultPosition("0")
-                );
-
-            // Shortcut other migration steps on new content definition schemas.
-            return 2;
-        }
+    public async Task<int> CreateAsync()
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync("TitlePart", builder => builder
+            .Attachable()
+            .WithDescription("Provides a Title for your content item.")
+            .WithDefaultPosition("0")
+            );
+
+        // Shortcut other migration steps on new content definition schemas.
+        return 2;
+    }
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom1()
-        {
-            // We are patching all content item versions by moving the Title to DisplayText
-            // This step doesn't need to be executed for a brand new site
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom1()
+    {
+        // We are patching all content item versions by moving the Title to DisplayText
+        // This step doesn't need to be executed for a brand new site
 
-            var lastDocumentId = 0L;
+        var lastDocumentId = 0L;
 
-            for (; ; )
-            {
-                var contentItemVersions = await _session.Query<ContentItem, ContentItemIndex>(x => x.DocumentId > lastDocumentId).Take(10).ListAsync();
+        for (; ; )
+        {
+            var contentItemVersions = await _session.Query<ContentItem, ContentItemIndex>(x => x.DocumentId > lastDocumentId).Take(10).ListAsync();
 
-                if (!contentItemVersions.Any())
-                {
-                    // No more content item version to process
-                    break;
-                }
+            if (!contentItemVersions.Any())
+            {
+                // No more content item version to process
+                break;
+            }
 
-                foreach (var contentItemVersion in contentItemVersions)
+            foreach (var contentItemVersion in contentItemVersions)
+            {
+                if (string.IsNullOrEmpty(contentItemVersion.DisplayText)
+                    && UpdateTitle((JsonObject)contentItemVersion.Content))
                 {
-                    if (string.IsNullOrEmpty(contentItemVersion.DisplayText)
-                        && UpdateTitle((JsonObject)contentItemVersion.Content))
-                    {
-                        await _session.SaveAsync(contentItemVersion);
-                        _logger.LogInformation("A content item version's Title was upgraded: {ContentItemVersionId}", contentItemVersion.ContentItemVersionId);
-                    }
-
-                    lastDocumentId = contentItemVersion.Id;
+                    await _session.SaveAsync(contentItemVersion);
+                    _logger.LogInformation("A content item version's Title was upgraded: {ContentItemVersionId}", contentItemVersion.ContentItemVersionId);
                 }
 
-                await _session.SaveChangesAsync();
+                lastDocumentId = contentItemVersion.Id;
             }
 
-            static bool UpdateTitle(JsonNode content)
+            await _session.SaveChangesAsync();
+        }
+
+        static bool UpdateTitle(JsonNode content)
+        {
+            var changed = false;
+
+            if (content.GetValueKind() == JsonValueKind.Object)
             {
-                var changed = false;
+                var title = content["TitlePart"]?["Title"]?.Value<string>();
 
-                if (content.GetValueKind() == JsonValueKind.Object)
+                if (!string.IsNullOrWhiteSpace(title))
                 {
-                    var title = content["TitlePart"]?["Title"]?.Value<string>();
-
-                    if (!string.IsNullOrWhiteSpace(title))
-                    {
-                        content["DisplayText"] = title;
-                        changed = true;
-                    }
-
-                    foreach (var node in content.AsObject())
-                    {
-                        changed = UpdateTitle(node.Value) || changed;
-                    }
+                    content["DisplayText"] = title;
+                    changed = true;
                 }
-                else if (content.GetValueKind() == JsonValueKind.Array)
-                {
 
-                    foreach (var node in content.AsArray())
-                    {
-                        changed = UpdateTitle(node) || changed;
-                    }
+                foreach (var node in content.AsObject())
+                {
+                    changed = UpdateTitle(node.Value) || changed;
                 }
+            }
+            else if (content.GetValueKind() == JsonValueKind.Array)
+            {
 
-                return changed;
+                foreach (var node in content.AsArray())
+                {
+                    changed = UpdateTitle(node) || changed;
+                }
             }
 
-            return 2;
+            return changed;
         }
+
+        return 2;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Title/Models/TitlePart.cs b/src/OrchardCore.Modules/OrchardCore.Title/Models/TitlePart.cs
index 6554bfd32ab..982e37e2eec 100644
--- a/src/OrchardCore.Modules/OrchardCore.Title/Models/TitlePart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Title/Models/TitlePart.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Title.Models
+namespace OrchardCore.Title.Models;
+
+public class TitlePart : ContentPart
 {
-    public class TitlePart : ContentPart
-    {
-        public string Title { get; set; }
-    }
+    public string Title { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Title/Models/TitlePartSettings.cs b/src/OrchardCore.Modules/OrchardCore.Title/Models/TitlePartSettings.cs
index bc218142d76..94d58d04a6c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Title/Models/TitlePartSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Title/Models/TitlePartSettings.cs
@@ -1,32 +1,31 @@
 using System.ComponentModel;
 
-namespace OrchardCore.Title.Models
+namespace OrchardCore.Title.Models;
+
+public enum TitlePartOptions
 {
-    public enum TitlePartOptions
-    {
-        Editable,
-        GeneratedDisabled,
-        GeneratedHidden,
-        EditableRequired
-    }
+    Editable,
+    GeneratedDisabled,
+    GeneratedHidden,
+    EditableRequired
+}
 
-    public class TitlePartSettings
-    {
-        /// <summary>
-        /// Gets or sets whether a user can define a custom title.
-        /// </summary>
-        [DefaultValue(TitlePartOptions.Editable)]
-        public TitlePartOptions Options { get; set; } = TitlePartOptions.Editable;
+public class TitlePartSettings
+{
+    /// <summary>
+    /// Gets or sets whether a user can define a custom title.
+    /// </summary>
+    [DefaultValue(TitlePartOptions.Editable)]
+    public TitlePartOptions Options { get; set; } = TitlePartOptions.Editable;
 
-        /// <summary>
-        /// The pattern used to build the Title.
-        /// </summary>
-        public string Pattern { get; set; }
+    /// <summary>
+    /// The pattern used to build the Title.
+    /// </summary>
+    public string Pattern { get; set; }
 
-        /// <summary>
-        /// Gets or sets whether to render the title in display views.
-        /// </summary>
-        [DefaultValue(true)]
-        public bool RenderTitle { get; set; } = true;
-    }
+    /// <summary>
+    /// Gets or sets whether to render the title in display views.
+    /// </summary>
+    [DefaultValue(true)]
+    public bool RenderTitle { get; set; } = true;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Title/RemotePublishing/RemotePublishingStartup.cs b/src/OrchardCore.Modules/OrchardCore.Title/RemotePublishing/RemotePublishingStartup.cs
index 1288459efbf..6995a1055c7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Title/RemotePublishing/RemotePublishingStartup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Title/RemotePublishing/RemotePublishingStartup.cs
@@ -2,14 +2,13 @@
 using OrchardCore.MetaWeblog;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Title.RemotePublishing
+namespace OrchardCore.Title.RemotePublishing;
+
+[RequireFeatures("OrchardCore.RemotePublishing")]
+public sealed class RemotePublishingStartup : StartupBase
 {
-    [RequireFeatures("OrchardCore.RemotePublishing")]
-    public sealed class RemotePublishingStartup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IMetaWeblogDriver, TitleMetaWeblogDriver>();
-        }
+        services.AddScoped<IMetaWeblogDriver, TitleMetaWeblogDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Title/RemotePublishing/TitleMetaWeblogDriver.cs b/src/OrchardCore.Modules/OrchardCore.Title/RemotePublishing/TitleMetaWeblogDriver.cs
index b09d2054a3a..f6187feb2d1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Title/RemotePublishing/TitleMetaWeblogDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Title/RemotePublishing/TitleMetaWeblogDriver.cs
@@ -5,31 +5,30 @@
 using OrchardCore.XmlRpc;
 using OrchardCore.XmlRpc.Models;
 
-namespace OrchardCore.Title.RemotePublishing
+namespace OrchardCore.Title.RemotePublishing;
+
+public sealed class TitleMetaWeblogDriver : MetaWeblogDriver
 {
-    public sealed class TitleMetaWeblogDriver : MetaWeblogDriver
+    private readonly HtmlEncoder _encoder;
+
+    public TitleMetaWeblogDriver(HtmlEncoder encoder)
     {
-        private readonly HtmlEncoder _encoder;
+        _encoder = encoder;
+    }
 
-        public TitleMetaWeblogDriver(HtmlEncoder encoder)
+    public override void BuildPost(XRpcStruct rpcStruct, XmlRpcContext context, ContentItem contentItem)
+    {
+        var titlePart = contentItem.As<TitlePart>();
+        if (titlePart == null)
         {
-            _encoder = encoder;
+            return;
         }
 
-        public override void BuildPost(XRpcStruct rpcStruct, XmlRpcContext context, ContentItem contentItem)
-        {
-            var titlePart = contentItem.As<TitlePart>();
-            if (titlePart == null)
-            {
-                return;
-            }
-
-            rpcStruct.Set("title", _encoder.Encode(titlePart.Title));
-        }
+        rpcStruct.Set("title", _encoder.Encode(titlePart.Title));
+    }
 
-        public override void EditPost(XRpcStruct rpcStruct, ContentItem contentItem)
-        {
-            contentItem.DisplayText = rpcStruct.Optional<string>("title");
-        }
+    public override void EditPost(XRpcStruct rpcStruct, ContentItem contentItem)
+    {
+        contentItem.DisplayText = rpcStruct.Optional<string>("title");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Title/Settings/TitlePartSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Title/Settings/TitlePartSettingsDisplayDriver.cs
index 4257d5c3168..ac346fced09 100644
--- a/src/OrchardCore.Modules/OrchardCore.Title/Settings/TitlePartSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Title/Settings/TitlePartSettingsDisplayDriver.cs
@@ -8,52 +8,51 @@
 using OrchardCore.Title.Models;
 using OrchardCore.Title.ViewModels;
 
-namespace OrchardCore.Title.Settings
+namespace OrchardCore.Title.Settings;
+
+public sealed class TitlePartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<TitlePart>
 {
-    public sealed class TitlePartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<TitlePart>
-    {
-        private readonly ILiquidTemplateManager _templateManager;
+    private readonly ILiquidTemplateManager _templateManager;
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public TitlePartSettingsDisplayDriver(ILiquidTemplateManager templateManager, IStringLocalizer<TitlePartSettingsDisplayDriver> localizer)
+    public TitlePartSettingsDisplayDriver(ILiquidTemplateManager templateManager, IStringLocalizer<TitlePartSettingsDisplayDriver> localizer)
+    {
+        _templateManager = templateManager;
+        S = localizer;
+    }
+
+    public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    {
+        return Initialize<TitlePartSettingsViewModel>("TitlePartSettings_Edit", model =>
         {
-            _templateManager = templateManager;
-            S = localizer;
-        }
+            var settings = contentTypePartDefinition.GetSettings<TitlePartSettings>();
 
-        public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+            model.Options = settings.Options;
+            model.Pattern = settings.Pattern;
+            model.RenderTitle = settings.RenderTitle;
+            model.TitlePartSettings = settings;
+        }).Location("Content");
+    }
+
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    {
+        var model = new TitlePartSettingsViewModel();
+
+        await context.Updater.TryUpdateModelAsync(model, Prefix,
+            m => m.Pattern,
+            m => m.Options,
+            m => m.RenderTitle);
+
+        if (!string.IsNullOrEmpty(model.Pattern) && !_templateManager.Validate(model.Pattern, out var errors))
         {
-            return Initialize<TitlePartSettingsViewModel>("TitlePartSettings_Edit", model =>
-            {
-                var settings = contentTypePartDefinition.GetSettings<TitlePartSettings>();
-
-                model.Options = settings.Options;
-                model.Pattern = settings.Pattern;
-                model.RenderTitle = settings.RenderTitle;
-                model.TitlePartSettings = settings;
-            }).Location("Content");
+            context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
         }
-
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+        else
         {
-            var model = new TitlePartSettingsViewModel();
-
-            await context.Updater.TryUpdateModelAsync(model, Prefix,
-                m => m.Pattern,
-                m => m.Options,
-                m => m.RenderTitle);
-
-            if (!string.IsNullOrEmpty(model.Pattern) && !_templateManager.Validate(model.Pattern, out var errors))
-            {
-                context.Updater.ModelState.AddModelError(nameof(model.Pattern), S["Pattern doesn't contain a valid Liquid expression. Details: {0}", string.Join(" ", errors)]);
-            }
-            else
-            {
-                context.Builder.WithSettings(new TitlePartSettings { Pattern = model.Pattern, Options = model.Options, RenderTitle = model.RenderTitle });
-            }
-
-            return Edit(contentTypePartDefinition, context);
+            context.Builder.WithSettings(new TitlePartSettings { Pattern = model.Pattern, Options = model.Options, RenderTitle = model.RenderTitle });
         }
+
+        return Edit(contentTypePartDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Title/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Title/Startup.cs
index 540a3f92024..d7e9512d440 100644
--- a/src/OrchardCore.Modules/OrchardCore.Title/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Title/Startup.cs
@@ -13,27 +13,26 @@
 using OrchardCore.Title.Settings;
 using OrchardCore.Title.ViewModels;
 
-namespace OrchardCore.Title
+namespace OrchardCore.Title;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<TitlePartViewModel>();
-                o.MemberAccessStrategy.Register<TitlePartSettingsViewModel>();
-            });
+            o.MemberAccessStrategy.Register<TitlePartViewModel>();
+            o.MemberAccessStrategy.Register<TitlePartSettingsViewModel>();
+        });
 
-            // Title Part
-            services.AddContentPart<TitlePart>()
-                .UseDisplayDriver<TitlePartDisplayDriver>()
-                .AddHandler<TitlePartHandler>();
+        // Title Part
+        services.AddContentPart<TitlePart>()
+            .UseDisplayDriver<TitlePartDisplayDriver>()
+            .AddHandler<TitlePartHandler>();
 
-            services.AddScoped<IContentPartIndexHandler, TitlePartIndexHandler>();
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, TitlePartSettingsDisplayDriver>();
+        services.AddScoped<IContentPartIndexHandler, TitlePartIndexHandler>();
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, TitlePartSettingsDisplayDriver>();
 
-            services.AddDataMigration<Migrations>();
-        }
+        services.AddDataMigration<Migrations>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Title/ViewModels/TitlePartSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Title/ViewModels/TitlePartSettingsViewModel.cs
index 0a8a2c3bcc5..cc163d0ab4b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Title/ViewModels/TitlePartSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Title/ViewModels/TitlePartSettingsViewModel.cs
@@ -1,15 +1,14 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.Title.Models;
 
-namespace OrchardCore.Title.ViewModels
+namespace OrchardCore.Title.ViewModels;
+
+public class TitlePartSettingsViewModel
 {
-    public class TitlePartSettingsViewModel
-    {
-        public TitlePartOptions Options { get; set; }
-        public string Pattern { get; set; }
-        public bool RenderTitle { get; set; }
+    public TitlePartOptions Options { get; set; }
+    public string Pattern { get; set; }
+    public bool RenderTitle { get; set; }
 
-        [BindNever]
-        public TitlePartSettings TitlePartSettings { get; set; }
-    }
+    [BindNever]
+    public TitlePartSettings TitlePartSettings { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Title/ViewModels/TitlePartViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Title/ViewModels/TitlePartViewModel.cs
index c345339ffac..c53a7b7f08a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Title/ViewModels/TitlePartViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Title/ViewModels/TitlePartViewModel.cs
@@ -2,19 +2,18 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Title.Models;
 
-namespace OrchardCore.Title.ViewModels
+namespace OrchardCore.Title.ViewModels;
+
+public class TitlePartViewModel
 {
-    public class TitlePartViewModel
-    {
-        public string Title { get; set; }
+    public string Title { get; set; }
 
-        [BindNever]
-        public ContentItem ContentItem { get; set; }
+    [BindNever]
+    public ContentItem ContentItem { get; set; }
 
-        [BindNever]
-        public TitlePart TitlePart { get; set; }
+    [BindNever]
+    public TitlePart TitlePart { get; set; }
 
-        [BindNever]
-        public TitlePartSettings Settings { get; set; }
-    }
+    [BindNever]
+    public TitlePartSettings Settings { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs
index 268478ffde7..1b192e2ed93 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs
@@ -3,81 +3,80 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Twitter
+namespace OrchardCore.Twitter;
+
+public sealed class AdminMenuSignin : INavigationProvider
 {
-    public sealed class AdminMenuSignin : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", TwitterConstants.Features.Signin },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", TwitterConstants.Features.Signin },
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenuSignin(IStringLocalizer<AdminMenuSignin> localizer)
-        {
-            S = localizer;
-        }
+    public AdminMenuSignin(IStringLocalizer<AdminMenuSignin> localizer)
+    {
+        S = localizer;
+    }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Security"], security => security
-                    .Add(S["Authentication"], authentication => authentication
-                    .Add(S["Sign in with X"], S["Sign in with X"].PrefixPosition(), x => x
-                        .AddClass("x")
-                        .Id("x")
-                        .Action("Index", "Admin", _routeValues)
-                        .Permission(Permissions.ManageTwitterSignin)
-                        .LocalNav())
-                    )
-                );
-
             return Task.CompletedTask;
         }
+
+        builder
+            .Add(S["Security"], security => security
+                .Add(S["Authentication"], authentication => authentication
+                .Add(S["Sign in with X"], S["Sign in with X"].PrefixPosition(), x => x
+                    .AddClass("x")
+                    .Id("x")
+                    .Action("Index", "Admin", _routeValues)
+                    .Permission(Permissions.ManageTwitterSignin)
+                    .LocalNav())
+                )
+            );
+
+        return Task.CompletedTask;
     }
+}
 
-    public sealed class AdminMenu : INavigationProvider
+public sealed class AdminMenu : INavigationProvider
+{
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", TwitterConstants.Features.Twitter },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", TwitterConstants.Features.Twitter },
+    };
 
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
-        {
-            S = localizer;
-        }
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["Settings"], settings => settings
-                        .Add(S["X"], S["X"].PrefixPosition(), twitter => twitter
-                            .AddClass("x").Id("x")
-                            .Action("Index", "Admin", _routeValues)
-                            .Permission(Permissions.ManageTwitter)
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["Settings"], settings => settings
+                    .Add(S["X"], S["X"].PrefixPosition(), twitter => twitter
+                        .AddClass("x").Id("x")
+                        .Action("Index", "Admin", _routeValues)
+                        .Permission(Permissions.ManageTwitter)
+                        .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Drivers/TwitterSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Drivers/TwitterSettingsDisplayDriver.cs
index dfc58644f0d..d0e81503004 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Drivers/TwitterSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Drivers/TwitterSettingsDisplayDriver.cs
@@ -12,111 +12,110 @@
 using OrchardCore.Twitter.Settings;
 using OrchardCore.Twitter.ViewModels;
 
-namespace OrchardCore.Twitter.Drivers
+namespace OrchardCore.Twitter.Drivers;
+
+public sealed class TwitterSettingsDisplayDriver : SiteDisplayDriver<TwitterSettings>
 {
-    public sealed class TwitterSettingsDisplayDriver : SiteDisplayDriver<TwitterSettings>
+    private readonly IShellReleaseManager _shellReleaseManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IDataProtectionProvider _dataProtectionProvider;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly ILogger _logger;
+
+    public TwitterSettingsDisplayDriver(
+        IShellReleaseManager shellReleaseManager,
+        IAuthorizationService authorizationService,
+        IDataProtectionProvider dataProtectionProvider,
+        IHttpContextAccessor httpContextAccessor,
+        ILogger<TwitterSettingsDisplayDriver> logger)
     {
-        private readonly IShellReleaseManager _shellReleaseManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IDataProtectionProvider _dataProtectionProvider;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly ILogger _logger;
+        _shellReleaseManager = shellReleaseManager;
+        _authorizationService = authorizationService;
+        _dataProtectionProvider = dataProtectionProvider;
+        _httpContextAccessor = httpContextAccessor;
+        _logger = logger;
+    }
 
-        public TwitterSettingsDisplayDriver(
-            IShellReleaseManager shellReleaseManager,
-            IAuthorizationService authorizationService,
-            IDataProtectionProvider dataProtectionProvider,
-            IHttpContextAccessor httpContextAccessor,
-            ILogger<TwitterSettingsDisplayDriver> logger)
-        {
-            _shellReleaseManager = shellReleaseManager;
-            _authorizationService = authorizationService;
-            _dataProtectionProvider = dataProtectionProvider;
-            _httpContextAccessor = httpContextAccessor;
-            _logger = logger;
-        }
+    protected override string SettingsGroupId
+        => TwitterConstants.Features.Twitter;
 
-        protected override string SettingsGroupId
-            => TwitterConstants.Features.Twitter;
+    public override async Task<IDisplayResult> EditAsync(ISite site, TwitterSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-        public override async Task<IDisplayResult> EditAsync(ISite site, TwitterSettings settings, BuildEditorContext context)
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageTwitterSignin))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageTwitterSignin))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            return Initialize<TwitterSettingsViewModel>("TwitterSettings_Edit", model =>
+        return Initialize<TwitterSettingsViewModel>("TwitterSettings_Edit", model =>
+        {
+            model.APIKey = settings.ConsumerKey;
+            if (!string.IsNullOrWhiteSpace(settings.ConsumerSecret))
             {
-                model.APIKey = settings.ConsumerKey;
-                if (!string.IsNullOrWhiteSpace(settings.ConsumerSecret))
+                try
                 {
-                    try
-                    {
-                        var protector = _dataProtectionProvider.CreateProtector(TwitterConstants.Features.Twitter);
-                        model.APISecretKey = protector.Unprotect(settings.ConsumerSecret);
-                    }
-                    catch (CryptographicException)
-                    {
-                        _logger.LogError("The API secret key could not be decrypted. It may have been encrypted using a different key.");
-                        model.APISecretKey = string.Empty;
-                        model.HasDecryptionError = true;
-                    }
+                    var protector = _dataProtectionProvider.CreateProtector(TwitterConstants.Features.Twitter);
+                    model.APISecretKey = protector.Unprotect(settings.ConsumerSecret);
                 }
-                else
+                catch (CryptographicException)
                 {
+                    _logger.LogError("The API secret key could not be decrypted. It may have been encrypted using a different key.");
                     model.APISecretKey = string.Empty;
+                    model.HasDecryptionError = true;
                 }
-                model.AccessToken = settings.AccessToken;
-                if (!string.IsNullOrWhiteSpace(settings.AccessTokenSecret))
+            }
+            else
+            {
+                model.APISecretKey = string.Empty;
+            }
+            model.AccessToken = settings.AccessToken;
+            if (!string.IsNullOrWhiteSpace(settings.AccessTokenSecret))
+            {
+                try
                 {
-                    try
-                    {
-                        var protector = _dataProtectionProvider.CreateProtector(TwitterConstants.Features.Twitter);
-                        model.AccessTokenSecret = protector.Unprotect(settings.AccessTokenSecret);
-                    }
-                    catch (CryptographicException)
-                    {
-                        _logger.LogError("The access token secret could not be decrypted. It may have been encrypted using a different key.");
-                        model.AccessTokenSecret = string.Empty;
-                        model.HasDecryptionError = true;
-                    }
+                    var protector = _dataProtectionProvider.CreateProtector(TwitterConstants.Features.Twitter);
+                    model.AccessTokenSecret = protector.Unprotect(settings.AccessTokenSecret);
                 }
-                else
+                catch (CryptographicException)
                 {
+                    _logger.LogError("The access token secret could not be decrypted. It may have been encrypted using a different key.");
                     model.AccessTokenSecret = string.Empty;
+                    model.HasDecryptionError = true;
                 }
-            }).Location("Content:5")
-            .OnGroup(SettingsGroupId);
-        }
-
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, TwitterSettings settings, UpdateEditorContext context)
-        {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageTwitter))
+            }
+            else
             {
-                return null;
+                model.AccessTokenSecret = string.Empty;
             }
+        }).Location("Content:5")
+        .OnGroup(SettingsGroupId);
+    }
 
-            var model = new TwitterSettingsViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
-
-            settings.ConsumerKey = model.APIKey;
-            settings.AccessToken = model.AccessToken;
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, TwitterSettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageTwitter))
+        {
+            return null;
+        }
 
-            if (context.Updater.ModelState.IsValid)
-            {
-                var protector = _dataProtectionProvider.CreateProtector(TwitterConstants.Features.Twitter);
+        var model = new TwitterSettingsViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-                settings.ConsumerSecret = protector.Protect(model.APISecretKey);
-                settings.AccessTokenSecret = protector.Protect(model.AccessTokenSecret);
-            }
+        settings.ConsumerKey = model.APIKey;
+        settings.AccessToken = model.AccessToken;
 
-            _shellReleaseManager.RequestRelease();
+        if (context.Updater.ModelState.IsValid)
+        {
+            var protector = _dataProtectionProvider.CreateProtector(TwitterConstants.Features.Twitter);
 
-            return await EditAsync(site, settings, context);
+            settings.ConsumerSecret = protector.Protect(model.APISecretKey);
+            settings.AccessTokenSecret = protector.Protect(model.AccessTokenSecret);
         }
+
+        _shellReleaseManager.RequestRelease();
+
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Extensions/OrchardCoreBuilderExtensions.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Extensions/OrchardCoreBuilderExtensions.cs
index 724df26bfed..50809845894 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Extensions/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Extensions/OrchardCoreBuilderExtensions.cs
@@ -2,26 +2,25 @@
 using OrchardCore.Environment.Shell.Configuration;
 using OrchardCore.Twitter.Settings;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class OrchardCoreBuilderExtensions
 {
-    public static class OrchardCoreBuilderExtensions
+    public static OrchardCoreBuilder ConfigureTwitterSettings(this OrchardCoreBuilder builder)
     {
-        public static OrchardCoreBuilder ConfigureTwitterSettings(this OrchardCoreBuilder builder)
+        builder.ConfigureServices((tenantServices, serviceProvider) =>
         {
-            builder.ConfigureServices((tenantServices, serviceProvider) =>
-            {
-                var configuration = serviceProvider.GetRequiredService<IShellConfiguration>();
-                var configurationSection = configuration.GetSection("OrchardCore_X");
+            var configuration = serviceProvider.GetRequiredService<IShellConfiguration>();
+            var configurationSection = configuration.GetSection("OrchardCore_X");
 
-                if (configurationSection.Value is null)
-                {
-                    configurationSection = configuration.GetSection("OrchardCore_Twitter");
-                }
+            if (configurationSection.Value is null)
+            {
+                configurationSection = configuration.GetSection("OrchardCore_Twitter");
+            }
 
-                tenantServices.PostConfigure<TwitterSettings>(settings => configurationSection.Bind(settings));
-            });
+            tenantServices.PostConfigure<TwitterSettings>(settings => configurationSection.Bind(settings));
+        });
 
-            return builder;
-        }
+        return builder;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Recipes/TwitterSettingsStep.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Recipes/TwitterSettingsStep.cs
index eeb094c07b4..9706aaa2a81 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Recipes/TwitterSettingsStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Recipes/TwitterSettingsStep.cs
@@ -6,44 +6,43 @@
 using OrchardCore.Twitter.Services;
 using OrchardCore.Twitter.Settings;
 
-namespace OrchardCore.Twitter.Recipes
+namespace OrchardCore.Twitter.Recipes;
+
+/// <summary>
+/// This recipe step sets Microsoft Account settings.
+/// </summary>
+public sealed class TwitterSettingsStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step sets Microsoft Account settings.
-    /// </summary>
-    public sealed class TwitterSettingsStep : IRecipeStepHandler
+    private readonly ITwitterSettingsService _twitterService;
+
+    public TwitterSettingsStep(ITwitterSettingsService twitterService)
     {
-        private readonly ITwitterSettingsService _twitterService;
+        _twitterService = twitterService;
+    }
 
-        public TwitterSettingsStep(ITwitterSettingsService twitterService)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, nameof(TwitterSettings), StringComparison.OrdinalIgnoreCase))
         {
-            _twitterService = twitterService;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, nameof(TwitterSettings), StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            var model = context.Step.ToObject<TwitterSettingsStepModel>();
-            var settings = await _twitterService.LoadSettingsAsync();
+        var model = context.Step.ToObject<TwitterSettingsStepModel>();
+        var settings = await _twitterService.LoadSettingsAsync();
 
-            settings.ConsumerKey = model.ConsumerKey;
-            settings.ConsumerSecret = model.ConsumerSecret;
-            settings.AccessToken = model.AccessToken;
-            settings.AccessTokenSecret = model.AccessTokenSecret;
+        settings.ConsumerKey = model.ConsumerKey;
+        settings.ConsumerSecret = model.ConsumerSecret;
+        settings.AccessToken = model.AccessToken;
+        settings.AccessTokenSecret = model.AccessTokenSecret;
 
-            await _twitterService.UpdateSettingsAsync(settings);
-        }
+        await _twitterService.UpdateSettingsAsync(settings);
     }
+}
 
-    public sealed class TwitterSettingsStepModel
-    {
-        public string ConsumerKey { get; set; }
-        public string ConsumerSecret { get; set; }
-        public string AccessToken { get; set; }
-        public string AccessTokenSecret { get; set; }
-    }
+public sealed class TwitterSettingsStepModel
+{
+    public string ConsumerKey { get; set; }
+    public string ConsumerSecret { get; set; }
+    public string AccessToken { get; set; }
+    public string AccessTokenSecret { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Services/ITwitterSettingsService.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Services/ITwitterSettingsService.cs
index 65ba9ad5ae4..b96a3d6e07a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Services/ITwitterSettingsService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Services/ITwitterSettingsService.cs
@@ -3,13 +3,12 @@
 using System.Threading.Tasks;
 using OrchardCore.Twitter.Settings;
 
-namespace OrchardCore.Twitter.Services
+namespace OrchardCore.Twitter.Services;
+
+public interface ITwitterSettingsService
 {
-    public interface ITwitterSettingsService
-    {
-        Task<TwitterSettings> GetSettingsAsync();
-        Task<TwitterSettings> LoadSettingsAsync();
-        Task UpdateSettingsAsync(TwitterSettings settings);
-        IEnumerable<ValidationResult> ValidateSettings(TwitterSettings settings);
-    }
+    Task<TwitterSettings> GetSettingsAsync();
+    Task<TwitterSettings> LoadSettingsAsync();
+    Task UpdateSettingsAsync(TwitterSettings settings);
+    IEnumerable<ValidationResult> ValidateSettings(TwitterSettings settings);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Services/TwitterClient.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Services/TwitterClient.cs
index be84bc5fad1..175b337d423 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Services/TwitterClient.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Services/TwitterClient.cs
@@ -5,56 +5,55 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
-namespace OrchardCore.Twitter.Services
+namespace OrchardCore.Twitter.Services;
+
+public class TwitterClient
 {
-    public class TwitterClient
-    {
-        private readonly HttpClient _client;
-        private readonly ILogger _logger;
+    private readonly HttpClient _client;
+    private readonly ILogger _logger;
 
-        public TwitterClient(HttpClient client, ILogger<TwitterClient> logger)
-        {
-            _client = client;
-            _client.BaseAddress = new Uri("https://api.twitter.com");
-            _client.DefaultRequestHeaders.Accept.Clear();
-            _client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-            _logger = logger;
-        }
+    public TwitterClient(HttpClient client, ILogger<TwitterClient> logger)
+    {
+        _client = client;
+        _client.BaseAddress = new Uri("https://api.twitter.com");
+        _client.DefaultRequestHeaders.Accept.Clear();
+        _client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+        _logger = logger;
+    }
 
-        public async Task<HttpResponseMessage> UpdateStatus(string status, params string[] optionalParameters)
+    public async Task<HttpResponseMessage> UpdateStatus(string status, params string[] optionalParameters)
+    {
+        try
         {
-            try
+            var parameters = new Dictionary<string, string>
             {
-                var parameters = new Dictionary<string, string>
-                {
-                    { "status", status }
-                };
+                { "status", status }
+            };
 
-                if (optionalParameters is not null)
+            if (optionalParameters is not null)
+            {
+                for (var i = 0; i < optionalParameters.Length; i++)
                 {
-                    for (var i = 0; i < optionalParameters.Length; i++)
+                    var optionalParameter = optionalParameters[i];
+                    var parts = optionalParameter.Split('=', 2);
+                    if (parts.Length != 2)
                     {
-                        var optionalParameter = optionalParameters[i];
-                        var parts = optionalParameter.Split('=', 2);
-                        if (parts.Length != 2)
-                        {
-                            _logger.LogWarning("Parameter {Parameter} ignored, has wrong format", optionalParameter);
-                            continue;
-                        }
-                        parameters.Add(parts[0], parts[1]);
+                        _logger.LogWarning("Parameter {Parameter} ignored, has wrong format", optionalParameter);
+                        continue;
                     }
+                    parameters.Add(parts[0], parts[1]);
                 }
-
-                var content = new FormUrlEncodedContent(parameters);
-                var uri = new Uri("/1.1/statuses/update.json", UriKind.Relative);
-                var response = await _client.PostAsync(uri, content);
-                return response;
-            }
-            catch (HttpRequestException ex)
-            {
-                _logger.LogError(ex, "An error occurred connecting to Twitter API");
-                throw;
             }
+
+            var content = new FormUrlEncodedContent(parameters);
+            var uri = new Uri("/1.1/statuses/update.json", UriKind.Relative);
+            var response = await _client.PostAsync(uri, content);
+            return response;
+        }
+        catch (HttpRequestException ex)
+        {
+            _logger.LogError(ex, "An error occurred connecting to Twitter API");
+            throw;
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Services/TwitterClientMessageHandler.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Services/TwitterClientMessageHandler.cs
index 88af336f70c..fb9cfbc9cf1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Services/TwitterClientMessageHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Services/TwitterClientMessageHandler.cs
@@ -12,108 +12,107 @@
 using OrchardCore.Modules;
 using OrchardCore.Twitter.Settings;
 
-namespace OrchardCore.Twitter.Services
+namespace OrchardCore.Twitter.Services;
+
+public class TwitterClientMessageHandler : DelegatingHandler
 {
-    public class TwitterClientMessageHandler : DelegatingHandler
+    private readonly TwitterSettings _twitterSettings;
+    private readonly IDataProtectionProvider _dataProtectionProvider;
+    private readonly IClock _clock;
+
+    public TwitterClientMessageHandler(
+        IClock clock,
+        IOptions<TwitterSettings> twitterSettings,
+        IDataProtectionProvider dataProtectionProvider)
     {
-        private readonly TwitterSettings _twitterSettings;
-        private readonly IDataProtectionProvider _dataProtectionProvider;
-        private readonly IClock _clock;
-
-        public TwitterClientMessageHandler(
-            IClock clock,
-            IOptions<TwitterSettings> twitterSettings,
-            IDataProtectionProvider dataProtectionProvider)
-        {
-            _twitterSettings = twitterSettings.Value;
-            _dataProtectionProvider = dataProtectionProvider;
-            _clock = clock;
-        }
+        _twitterSettings = twitterSettings.Value;
+        _dataProtectionProvider = dataProtectionProvider;
+        _clock = clock;
+    }
 
-        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-        {
-            await ConfigureOAuthAsync(request);
-            return await base.SendAsync(request, cancellationToken);
-        }
+    protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+    {
+        await ConfigureOAuthAsync(request);
+        return await base.SendAsync(request, cancellationToken);
+    }
+
+    public virtual string GetNonce()
+    {
+        return Convert.ToBase64String(Encoding.ASCII.GetBytes(_clock.UtcNow.Ticks.ToString()));
+    }
+
+    public async Task ConfigureOAuthAsync(HttpRequestMessage request)
+    {
+        var protrector = _dataProtectionProvider.CreateProtector(TwitterConstants.Features.Twitter);
+        var queryString = request.RequestUri.Query;
 
-        public virtual string GetNonce()
+        if (!string.IsNullOrWhiteSpace(_twitterSettings.ConsumerSecret))
         {
-            return Convert.ToBase64String(Encoding.ASCII.GetBytes(_clock.UtcNow.Ticks.ToString()));
+            _twitterSettings.ConsumerSecret = protrector.Unprotect(_twitterSettings.ConsumerSecret);
         }
 
-        public async Task ConfigureOAuthAsync(HttpRequestMessage request)
+        if (!string.IsNullOrWhiteSpace(_twitterSettings.AccessTokenSecret))
         {
-            var protrector = _dataProtectionProvider.CreateProtector(TwitterConstants.Features.Twitter);
-            var queryString = request.RequestUri.Query;
+            _twitterSettings.AccessTokenSecret = protrector.Unprotect(_twitterSettings.AccessTokenSecret);
+        }
 
-            if (!string.IsNullOrWhiteSpace(_twitterSettings.ConsumerSecret))
-            {
-                _twitterSettings.ConsumerSecret = protrector.Unprotect(_twitterSettings.ConsumerSecret);
-            }
+        var nonce = GetNonce();
+        var timeStamp = Convert.ToInt64((_clock.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc)).TotalSeconds).ToString();
 
-            if (!string.IsNullOrWhiteSpace(_twitterSettings.AccessTokenSecret))
+        var sortedParameters = new SortedDictionary<string, string>
+        {
+            { Uri.EscapeDataString("oauth_consumer_key"), Uri.EscapeDataString(_twitterSettings.ConsumerKey) },
+            { Uri.EscapeDataString("oauth_nonce"), Uri.EscapeDataString(nonce) },
+            { Uri.EscapeDataString("oauth_signature_method"), Uri.EscapeDataString("HMAC-SHA1") },
+            { Uri.EscapeDataString("oauth_timestamp"), Uri.EscapeDataString(timeStamp) },
+            { Uri.EscapeDataString("oauth_token"), Uri.EscapeDataString(_twitterSettings.AccessToken) },
+            { Uri.EscapeDataString("oauth_version"), Uri.EscapeDataString("1.0") },
+        };
+
+        if (!string.IsNullOrEmpty(request.RequestUri.Query))
+        {
+            foreach (var item in request.RequestUri.Query.Split('&'))
             {
-                _twitterSettings.AccessTokenSecret = protrector.Unprotect(_twitterSettings.AccessTokenSecret);
+                var parts = item.Split('=');
+                var key = Uri.EscapeDataString(parts[0]);
+                var value = Uri.EscapeDataString(parts[1]);
+                sortedParameters.Add(key, value);
             }
+        }
 
-            var nonce = GetNonce();
-            var timeStamp = Convert.ToInt64((_clock.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc)).TotalSeconds).ToString();
+        var contentString = await request.Content.ReadAsStringAsync();
 
-            var sortedParameters = new SortedDictionary<string, string>
-            {
-                { Uri.EscapeDataString("oauth_consumer_key"), Uri.EscapeDataString(_twitterSettings.ConsumerKey) },
-                { Uri.EscapeDataString("oauth_nonce"), Uri.EscapeDataString(nonce) },
-                { Uri.EscapeDataString("oauth_signature_method"), Uri.EscapeDataString("HMAC-SHA1") },
-                { Uri.EscapeDataString("oauth_timestamp"), Uri.EscapeDataString(timeStamp) },
-                { Uri.EscapeDataString("oauth_token"), Uri.EscapeDataString(_twitterSettings.AccessToken) },
-                { Uri.EscapeDataString("oauth_version"), Uri.EscapeDataString("1.0") },
-            };
-
-            if (!string.IsNullOrEmpty(request.RequestUri.Query))
+        if (!string.IsNullOrEmpty(contentString))
+        {
+            foreach (var item in contentString.Split('&'))
             {
-                foreach (var item in request.RequestUri.Query.Split('&'))
-                {
-                    var parts = item.Split('=');
-                    var key = Uri.EscapeDataString(parts[0]);
-                    var value = Uri.EscapeDataString(parts[1]);
-                    sortedParameters.Add(key, value);
-                }
-            }
-
-            var contentString = await request.Content.ReadAsStringAsync();
+                var parts = item.Split('=');
 
-            if (!string.IsNullOrEmpty(contentString))
-            {
-                foreach (var item in contentString.Split('&'))
-                {
-                    var parts = item.Split('=');
-
-                    var key = Uri.EscapeDataString(WebUtility.UrlDecode(parts[0]));
-                    var value = Uri.EscapeDataString(WebUtility.UrlDecode(parts[1]));
-                    sortedParameters.Add(key, value);
-                }
+                var key = Uri.EscapeDataString(WebUtility.UrlDecode(parts[0]));
+                var value = Uri.EscapeDataString(WebUtility.UrlDecode(parts[1]));
+                sortedParameters.Add(key, value);
             }
+        }
 
-            var baseString = string.Concat(request.Method.Method.ToUpperInvariant(), "&",
-                Uri.EscapeDataString(request.RequestUri.AbsoluteUri.ToString()), "&",
-                Uri.EscapeDataString(string.Join("&", sortedParameters.Select(c => string.Format("{0}={1}", c.Key, c.Value)))));
+        var baseString = string.Concat(request.Method.Method.ToUpperInvariant(), "&",
+            Uri.EscapeDataString(request.RequestUri.AbsoluteUri.ToString()), "&",
+            Uri.EscapeDataString(string.Join("&", sortedParameters.Select(c => string.Format("{0}={1}", c.Key, c.Value)))));
 
-            var secret = string.Concat(_twitterSettings.ConsumerSecret, "&", _twitterSettings.AccessTokenSecret);
+        var secret = string.Concat(_twitterSettings.ConsumerSecret, "&", _twitterSettings.AccessTokenSecret);
 
 #pragma warning disable CA5350 // Do not use weak cryptographic hashing algorithm
-            var signature = Convert.ToBase64String(HMACSHA1.HashData(key: Encoding.UTF8.GetBytes(secret), source: Encoding.UTF8.GetBytes(baseString)));
+        var signature = Convert.ToBase64String(HMACSHA1.HashData(key: Encoding.UTF8.GetBytes(secret), source: Encoding.UTF8.GetBytes(baseString)));
 #pragma warning restore CA5350
 
-            var sb = new StringBuilder();
-            sb.Append("oauth_consumer_key=\"").Append(Uri.EscapeDataString(_twitterSettings.ConsumerKey)).Append("\", ");
-            sb.Append("oauth_nonce=\"").Append(Uri.EscapeDataString(nonce)).Append("\", ");
-            sb.Append("oauth_signature=\"").Append(Uri.EscapeDataString(signature)).Append("\", ");
-            sb.Append($"oauth_signature_method=\"HMAC-SHA1\", ");
-            sb.Append("oauth_timestamp=\"").Append(Uri.EscapeDataString(timeStamp)).Append("\", ");
-            sb.Append("oauth_token=\"").Append(Uri.EscapeDataString(_twitterSettings.AccessToken)).Append("\", ");
-            sb.Append("oauth_version=\"").Append(Uri.EscapeDataString("1.0")).Append('"');
+        var sb = new StringBuilder();
+        sb.Append("oauth_consumer_key=\"").Append(Uri.EscapeDataString(_twitterSettings.ConsumerKey)).Append("\", ");
+        sb.Append("oauth_nonce=\"").Append(Uri.EscapeDataString(nonce)).Append("\", ");
+        sb.Append("oauth_signature=\"").Append(Uri.EscapeDataString(signature)).Append("\", ");
+        sb.Append($"oauth_signature_method=\"HMAC-SHA1\", ");
+        sb.Append("oauth_timestamp=\"").Append(Uri.EscapeDataString(timeStamp)).Append("\", ");
+        sb.Append("oauth_token=\"").Append(Uri.EscapeDataString(_twitterSettings.AccessToken)).Append("\", ");
+        sb.Append("oauth_version=\"").Append(Uri.EscapeDataString("1.0")).Append('"');
 
-            request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("OAuth", sb.ToString());
-        }
+        request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("OAuth", sb.ToString());
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Services/TwitterSettingsService.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Services/TwitterSettingsService.cs
index 003314aa84d..34ff1ef9b31 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Services/TwitterSettingsService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Services/TwitterSettingsService.cs
@@ -7,69 +7,68 @@
 using OrchardCore.Settings;
 using OrchardCore.Twitter.Settings;
 
-namespace OrchardCore.Twitter.Services
+namespace OrchardCore.Twitter.Services;
+
+public class TwitterSettingsService : ITwitterSettingsService
 {
-    public class TwitterSettingsService : ITwitterSettingsService
+    private readonly ISiteService _siteService;
+    protected readonly IStringLocalizer S;
+
+    public TwitterSettingsService(
+        ISiteService siteService,
+        IStringLocalizer<TwitterSettingsService> stringLocalizer)
     {
-        private readonly ISiteService _siteService;
-        protected readonly IStringLocalizer S;
+        _siteService = siteService;
+        S = stringLocalizer;
+    }
 
-        public TwitterSettingsService(
-            ISiteService siteService,
-            IStringLocalizer<TwitterSettingsService> stringLocalizer)
-        {
-            _siteService = siteService;
-            S = stringLocalizer;
-        }
+    public Task<TwitterSettings> GetSettingsAsync()
+        => _siteService.GetSettingsAsync<TwitterSettings>();
 
-        public Task<TwitterSettings> GetSettingsAsync()
-            => _siteService.GetSettingsAsync<TwitterSettings>();
+    public async Task<TwitterSettings> LoadSettingsAsync()
+    {
+        var container = await _siteService.LoadSiteSettingsAsync();
+        return container.As<TwitterSettings>();
+    }
 
-        public async Task<TwitterSettings> LoadSettingsAsync()
-        {
-            var container = await _siteService.LoadSiteSettingsAsync();
-            return container.As<TwitterSettings>();
-        }
+    public async Task UpdateSettingsAsync(TwitterSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-        public async Task UpdateSettingsAsync(TwitterSettings settings)
+        var container = await _siteService.LoadSiteSettingsAsync();
+        container.Alter<TwitterSettings>(aspect =>
         {
-            ArgumentNullException.ThrowIfNull(settings);
+            aspect.ConsumerKey = settings.ConsumerKey;
+            aspect.ConsumerSecret = settings.ConsumerSecret;
+            aspect.AccessToken = settings.AccessToken;
+            aspect.AccessTokenSecret = settings.AccessTokenSecret;
+        });
 
-            var container = await _siteService.LoadSiteSettingsAsync();
-            container.Alter<TwitterSettings>(aspect =>
-            {
-                aspect.ConsumerKey = settings.ConsumerKey;
-                aspect.ConsumerSecret = settings.ConsumerSecret;
-                aspect.AccessToken = settings.AccessToken;
-                aspect.AccessTokenSecret = settings.AccessTokenSecret;
-            });
+        await _siteService.UpdateSiteSettingsAsync(container);
+    }
 
-            await _siteService.UpdateSiteSettingsAsync(container);
-        }
+    public IEnumerable<ValidationResult> ValidateSettings(TwitterSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-        public IEnumerable<ValidationResult> ValidateSettings(TwitterSettings settings)
+        if (string.IsNullOrWhiteSpace(settings.ConsumerKey))
         {
-            ArgumentNullException.ThrowIfNull(settings);
-
-            if (string.IsNullOrWhiteSpace(settings.ConsumerKey))
-            {
-                yield return new ValidationResult(S["ConsumerKey is required"], new string[] { nameof(settings.ConsumerKey) });
-            }
+            yield return new ValidationResult(S["ConsumerKey is required"], new string[] { nameof(settings.ConsumerKey) });
+        }
 
-            if (string.IsNullOrWhiteSpace(settings.ConsumerSecret))
-            {
-                yield return new ValidationResult(S["ConsumerSecret is required"], new string[] { nameof(settings.ConsumerSecret) });
-            }
+        if (string.IsNullOrWhiteSpace(settings.ConsumerSecret))
+        {
+            yield return new ValidationResult(S["ConsumerSecret is required"], new string[] { nameof(settings.ConsumerSecret) });
+        }
 
-            if (string.IsNullOrWhiteSpace(settings.AccessToken))
-            {
-                yield return new ValidationResult(S["Access Token is required"], new string[] { nameof(settings.AccessToken) });
-            }
+        if (string.IsNullOrWhiteSpace(settings.AccessToken))
+        {
+            yield return new ValidationResult(S["Access Token is required"], new string[] { nameof(settings.AccessToken) });
+        }
 
-            if (string.IsNullOrWhiteSpace(settings.AccessTokenSecret))
-            {
-                yield return new ValidationResult(S["Access Token Secret is required"], new string[] { nameof(settings.AccessTokenSecret) });
-            }
+        if (string.IsNullOrWhiteSpace(settings.AccessTokenSecret))
+        {
+            yield return new ValidationResult(S["Access Token Secret is required"], new string[] { nameof(settings.AccessTokenSecret) });
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Settings/TwitterSettings.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Settings/TwitterSettings.cs
index 30aee3499f6..9c525e7ed3e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Settings/TwitterSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Settings/TwitterSettings.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.Twitter.Settings
+namespace OrchardCore.Twitter.Settings;
+
+public class TwitterSettings
 {
-    public class TwitterSettings
-    {
-        public string ConsumerKey { get; set; }
-        public string ConsumerSecret { get; set; }
-        public string AccessToken { get; set; }
-        public string AccessTokenSecret { get; set; }
-    }
+    public string ConsumerKey { get; set; }
+    public string ConsumerSecret { get; set; }
+    public string AccessToken { get; set; }
+    public string AccessTokenSecret { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Configuration/TwitterOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Configuration/TwitterOptionsConfiguration.cs
index bb6fe1f0a4c..ddedec3c1da 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Configuration/TwitterOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Configuration/TwitterOptionsConfiguration.cs
@@ -15,116 +15,115 @@
 using OrchardCore.Twitter.Signin.Services;
 using OrchardCore.Twitter.Signin.Settings;
 
-namespace OrchardCore.Twitter.Signin.Configuration
+namespace OrchardCore.Twitter.Signin.Configuration;
+
+public class TwitterOptionsConfiguration :
+    IConfigureOptions<AuthenticationOptions>,
+    IConfigureNamedOptions<TwitterOptions>
 {
-    public class TwitterOptionsConfiguration :
-        IConfigureOptions<AuthenticationOptions>,
-        IConfigureNamedOptions<TwitterOptions>
+    private readonly ITwitterSettingsService _twitterService;
+    private readonly ITwitterSigninService _twitterSigninService;
+    private readonly IDataProtectionProvider _dataProtectionProvider;
+    private readonly ShellSettings _shellSettings;
+    private readonly string _tenantPrefix;
+    private readonly ILogger _logger;
+
+    public TwitterOptionsConfiguration(
+        ITwitterSettingsService twitterService,
+        ITwitterSigninService twitterSigninService,
+        IDataProtectionProvider dataProtectionProvider,
+        IHttpContextAccessor httpContextAccessor,
+        ShellSettings shellSettings,
+        ILogger<TwitterOptionsConfiguration> logger)
     {
-        private readonly ITwitterSettingsService _twitterService;
-        private readonly ITwitterSigninService _twitterSigninService;
-        private readonly IDataProtectionProvider _dataProtectionProvider;
-        private readonly ShellSettings _shellSettings;
-        private readonly string _tenantPrefix;
-        private readonly ILogger _logger;
-
-        public TwitterOptionsConfiguration(
-            ITwitterSettingsService twitterService,
-            ITwitterSigninService twitterSigninService,
-            IDataProtectionProvider dataProtectionProvider,
-            IHttpContextAccessor httpContextAccessor,
-            ShellSettings shellSettings,
-            ILogger<TwitterOptionsConfiguration> logger)
+        _twitterService = twitterService;
+        _twitterSigninService = twitterSigninService;
+        _dataProtectionProvider = dataProtectionProvider;
+        _shellSettings = shellSettings;
+
+        var pathBase = httpContextAccessor.HttpContext?.Request.PathBase ?? PathString.Empty;
+        if (!pathBase.HasValue)
         {
-            _twitterService = twitterService;
-            _twitterSigninService = twitterSigninService;
-            _dataProtectionProvider = dataProtectionProvider;
-            _shellSettings = shellSettings;
+            pathBase = "/";
+        }
 
-            var pathBase = httpContextAccessor.HttpContext?.Request.PathBase ?? PathString.Empty;
-            if (!pathBase.HasValue)
-            {
-                pathBase = "/";
-            }
+        _tenantPrefix = pathBase;
+        _logger = logger;
+    }
 
-            _tenantPrefix = pathBase;
-            _logger = logger;
+    public void Configure(AuthenticationOptions options)
+    {
+        var settings = GetSettingsAsync().GetAwaiter().GetResult();
+        if (settings == null)
+        {
+            return;
         }
 
-        public void Configure(AuthenticationOptions options)
+        if (string.IsNullOrWhiteSpace(settings.Item1.ConsumerKey) ||
+            string.IsNullOrWhiteSpace(settings.Item1.ConsumerSecret))
         {
-            var settings = GetSettingsAsync().GetAwaiter().GetResult();
-            if (settings == null)
-            {
-                return;
-            }
+            _logger.LogWarning("The Twitter login provider is enabled but not configured.");
 
-            if (string.IsNullOrWhiteSpace(settings.Item1.ConsumerKey) ||
-                string.IsNullOrWhiteSpace(settings.Item1.ConsumerSecret))
-            {
-                _logger.LogWarning("The Twitter login provider is enabled but not configured.");
-
-                return;
-            }
-
-            options.AddScheme(TwitterDefaults.AuthenticationScheme, builder =>
-            {
-                builder.DisplayName = "Twitter";
-                builder.HandlerType = typeof(TwitterHandler);
-            });
+            return;
         }
 
-        public void Configure(string name, TwitterOptions options)
+        options.AddScheme(TwitterDefaults.AuthenticationScheme, builder =>
         {
-            if (!string.Equals(name, TwitterDefaults.AuthenticationScheme, StringComparison.Ordinal))
-            {
-                return;
-            }
+            builder.DisplayName = "Twitter";
+            builder.HandlerType = typeof(TwitterHandler);
+        });
+    }
 
-            var settings = GetSettingsAsync().GetAwaiter().GetResult();
-            if (settings is null)
-            {
-                return;
-            }
+    public void Configure(string name, TwitterOptions options)
+    {
+        if (!string.Equals(name, TwitterDefaults.AuthenticationScheme, StringComparison.Ordinal))
+        {
+            return;
+        }
 
-            options.ConsumerKey = settings.Item1.ConsumerKey;
-            try
-            {
-                options.ConsumerSecret = _dataProtectionProvider.CreateProtector(TwitterConstants.Features.Twitter).Unprotect(settings.Item1.ConsumerSecret);
-            }
-            catch
-            {
-                _logger.LogError("The Twitter Consumer Secret could not be decrypted. It may have been encrypted using a different key.");
-            }
+        var settings = GetSettingsAsync().GetAwaiter().GetResult();
+        if (settings is null)
+        {
+            return;
+        }
 
-            if (settings.Item2.CallbackPath.HasValue)
-            {
-                options.CallbackPath = settings.Item2.CallbackPath;
-            }
+        options.ConsumerKey = settings.Item1.ConsumerKey;
+        try
+        {
+            options.ConsumerSecret = _dataProtectionProvider.CreateProtector(TwitterConstants.Features.Twitter).Unprotect(settings.Item1.ConsumerSecret);
+        }
+        catch
+        {
+            _logger.LogError("The Twitter Consumer Secret could not be decrypted. It may have been encrypted using a different key.");
+        }
 
-            options.RetrieveUserDetails = true;
-            options.SignInScheme = "Identity.External";
-            options.StateCookie.Path = _tenantPrefix;
-            options.SaveTokens = settings.Item2.SaveTokens;
+        if (settings.Item2.CallbackPath.HasValue)
+        {
+            options.CallbackPath = settings.Item2.CallbackPath;
         }
 
-        public void Configure(TwitterOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
+        options.RetrieveUserDetails = true;
+        options.SignInScheme = "Identity.External";
+        options.StateCookie.Path = _tenantPrefix;
+        options.SaveTokens = settings.Item2.SaveTokens;
+    }
+
+    public void Configure(TwitterOptions options) => Debug.Fail("This infrastructure method shouldn't be called.");
 
-        private async Task<Tuple<TwitterSettings, TwitterSigninSettings>> GetSettingsAsync()
+    private async Task<Tuple<TwitterSettings, TwitterSigninSettings>> GetSettingsAsync()
+    {
+        var settings = await _twitterService.GetSettingsAsync();
+        if ((_twitterService.ValidateSettings(settings)).Any(result => result != ValidationResult.Success))
         {
-            var settings = await _twitterService.GetSettingsAsync();
-            if ((_twitterService.ValidateSettings(settings)).Any(result => result != ValidationResult.Success))
+            if (_shellSettings.IsRunning())
             {
-                if (_shellSettings.IsRunning())
-                {
-                    _logger.LogWarning("Integration with Twitter is not correctly configured.");
-                }
-
-                return null;
+                _logger.LogWarning("Integration with Twitter is not correctly configured.");
             }
 
-            var signInSettings = await _twitterSigninService.GetSettingsAsync();
-            return new Tuple<TwitterSettings, TwitterSigninSettings>(settings, signInSettings);
+            return null;
         }
+
+        var signInSettings = await _twitterSigninService.GetSettingsAsync();
+        return new Tuple<TwitterSettings, TwitterSigninSettings>(settings, signInSettings);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Drivers/TwitterSigninSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Drivers/TwitterSigninSettingsDisplayDriver.cs
index 8d5820ffb0d..01e657fc270 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Drivers/TwitterSigninSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Drivers/TwitterSigninSettingsDisplayDriver.cs
@@ -9,62 +9,61 @@
 using OrchardCore.Twitter.Signin.Settings;
 using OrchardCore.Twitter.Signin.ViewModels;
 
-namespace OrchardCore.Twitter.Signin.Drivers
+namespace OrchardCore.Twitter.Signin.Drivers;
+
+public sealed class TwitterSigninSettingsDisplayDriver : SiteDisplayDriver<TwitterSigninSettings>
 {
-    public sealed class TwitterSigninSettingsDisplayDriver : SiteDisplayDriver<TwitterSigninSettings>
+    private readonly IShellReleaseManager _shellReleaseManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+
+    public TwitterSigninSettingsDisplayDriver(
+        IShellReleaseManager shellReleaseManager,
+        IAuthorizationService authorizationService,
+        IHttpContextAccessor httpContextAccessor)
     {
-        private readonly IShellReleaseManager _shellReleaseManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
+        _shellReleaseManager = shellReleaseManager;
+        _authorizationService = authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+    }
+
+    protected override string SettingsGroupId
+        => TwitterConstants.Features.Signin;
 
-        public TwitterSigninSettingsDisplayDriver(
-            IShellReleaseManager shellReleaseManager,
-            IAuthorizationService authorizationService,
-            IHttpContextAccessor httpContextAccessor)
+    public override async Task<IDisplayResult> EditAsync(ISite site, TwitterSigninSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageTwitterSignin))
         {
-            _shellReleaseManager = shellReleaseManager;
-            _authorizationService = authorizationService;
-            _httpContextAccessor = httpContextAccessor;
+            return null;
         }
 
-        protected override string SettingsGroupId
-            => TwitterConstants.Features.Signin;
-
-        public override async Task<IDisplayResult> EditAsync(ISite site, TwitterSigninSettings settings, BuildEditorContext context)
+        return Initialize<TwitterSigninSettingsViewModel>("TwitterSigninSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageTwitterSignin))
+            if (settings.CallbackPath.HasValue)
             {
-                return null;
+                model.CallbackPath = settings.CallbackPath;
             }
-
-            return Initialize<TwitterSigninSettingsViewModel>("TwitterSigninSettings_Edit", model =>
-            {
-                if (settings.CallbackPath.HasValue)
-                {
-                    model.CallbackPath = settings.CallbackPath;
-                }
-                model.SaveTokens = settings.SaveTokens;
-            }).Location("Content:5")
-            .OnGroup(SettingsGroupId);
-        }
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, TwitterSigninSettings settings, UpdateEditorContext context)
+            model.SaveTokens = settings.SaveTokens;
+        }).Location("Content:5")
+        .OnGroup(SettingsGroupId);
+    }
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, TwitterSigninSettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+        if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageTwitterSignin))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-            if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageTwitterSignin))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var model = new TwitterSigninSettingsViewModel();
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        var model = new TwitterSigninSettingsViewModel();
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            settings.CallbackPath = model.CallbackPath;
-            settings.SaveTokens = model.SaveTokens;
+        settings.CallbackPath = model.CallbackPath;
+        settings.SaveTokens = model.SaveTokens;
 
-            _shellReleaseManager.RequestRelease();
+        _shellReleaseManager.RequestRelease();
 
-            return await EditAsync(site, settings, context);
-        }
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Services/ITwitterSigninService.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Services/ITwitterSigninService.cs
index b6975d00312..bf104dfa4c9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Services/ITwitterSigninService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Services/ITwitterSigninService.cs
@@ -1,12 +1,11 @@
 using System.Threading.Tasks;
 using OrchardCore.Twitter.Signin.Settings;
 
-namespace OrchardCore.Twitter.Signin.Services
+namespace OrchardCore.Twitter.Signin.Services;
+
+public interface ITwitterSigninService
 {
-    public interface ITwitterSigninService
-    {
-        Task<TwitterSigninSettings> GetSettingsAsync();
-        Task<TwitterSigninSettings> LoadSettingsAsync();
-        Task UpdateSettingsAsync(TwitterSigninSettings settings);
-    }
+    Task<TwitterSigninSettings> GetSettingsAsync();
+    Task<TwitterSigninSettings> LoadSettingsAsync();
+    Task UpdateSettingsAsync(TwitterSigninSettings settings);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Services/TwitterSigninService.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Services/TwitterSigninService.cs
index b4ac905f01b..9485fc9221b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Services/TwitterSigninService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Services/TwitterSigninService.cs
@@ -4,38 +4,37 @@
 using OrchardCore.Settings;
 using OrchardCore.Twitter.Signin.Settings;
 
-namespace OrchardCore.Twitter.Signin.Services
+namespace OrchardCore.Twitter.Signin.Services;
+
+public class TwitterSigninService : ITwitterSigninService
 {
-    public class TwitterSigninService : ITwitterSigninService
+    private readonly ISiteService _siteService;
+
+    public TwitterSigninService(
+        ISiteService siteService)
     {
-        private readonly ISiteService _siteService;
+        _siteService = siteService;
+    }
 
-        public TwitterSigninService(
-            ISiteService siteService)
-        {
-            _siteService = siteService;
-        }
+    public Task<TwitterSigninSettings> GetSettingsAsync()
+        => _siteService.GetSettingsAsync<TwitterSigninSettings>();
 
-        public Task<TwitterSigninSettings> GetSettingsAsync()
-            => _siteService.GetSettingsAsync<TwitterSigninSettings>();
+    public async Task<TwitterSigninSettings> LoadSettingsAsync()
+    {
+        var container = await _siteService.LoadSiteSettingsAsync();
+        return container.As<TwitterSigninSettings>();
+    }
 
-        public async Task<TwitterSigninSettings> LoadSettingsAsync()
-        {
-            var container = await _siteService.LoadSiteSettingsAsync();
-            return container.As<TwitterSigninSettings>();
-        }
+    public async Task UpdateSettingsAsync(TwitterSigninSettings settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-        public async Task UpdateSettingsAsync(TwitterSigninSettings settings)
+        var container = await _siteService.LoadSiteSettingsAsync();
+        container.Alter<TwitterSigninSettings>(aspect =>
         {
-            ArgumentNullException.ThrowIfNull(settings);
-
-            var container = await _siteService.LoadSiteSettingsAsync();
-            container.Alter<TwitterSigninSettings>(aspect =>
-            {
-                aspect.CallbackPath = settings.CallbackPath;
-            });
+            aspect.CallbackPath = settings.CallbackPath;
+        });
 
-            await _siteService.UpdateSiteSettingsAsync(container);
-        }
+        await _siteService.UpdateSiteSettingsAsync(container);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Settings/TwitterSigninSettings.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Settings/TwitterSigninSettings.cs
index 4b690e4e788..c0dd239a30e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Settings/TwitterSigninSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Settings/TwitterSigninSettings.cs
@@ -1,11 +1,10 @@
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Twitter.Signin.Settings
+namespace OrchardCore.Twitter.Signin.Settings;
+
+public class TwitterSigninSettings
 {
-    public class TwitterSigninSettings
-    {
-        public PathString CallbackPath { get; set; }
+    public PathString CallbackPath { get; set; }
 
-        public bool SaveTokens { get; set; }
-    }
+    public bool SaveTokens { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/ViewModels/TwitterSigninSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/ViewModels/TwitterSigninSettingsViewModel.cs
index 582c494eedf..d3fbafaca1d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/ViewModels/TwitterSigninSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/ViewModels/TwitterSigninSettingsViewModel.cs
@@ -1,12 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Twitter.Signin.ViewModels
+namespace OrchardCore.Twitter.Signin.ViewModels;
+
+public class TwitterSigninSettingsViewModel
 {
-    public class TwitterSigninSettingsViewModel
-    {
-        [RegularExpression(@"\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]", ErrorMessage = "Invalid path")]
-        public string CallbackPath { get; set; }
+    [RegularExpression(@"\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]", ErrorMessage = "Invalid path")]
+    public string CallbackPath { get; set; }
 
-        public bool SaveTokens { get; set; }
-    }
+    public bool SaveTokens { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs
index 9a10e5eb247..8bb17d0ff62 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs
@@ -23,66 +23,65 @@
 using OrchardCore.Twitter.Signin.Services;
 using Polly;
 
-namespace OrchardCore.Twitter
+namespace OrchardCore.Twitter;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IPermissionProvider, Permissions>();
-        }
+        services.AddScoped<IPermissionProvider, Permissions>();
     }
+}
 
-    [Feature(TwitterConstants.Features.Twitter)]
-    public sealed class TwitterStartup : StartupBase
+[Feature(TwitterConstants.Features.Twitter)]
+public sealed class TwitterStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IDisplayDriver<ISite>, TwitterSettingsDisplayDriver>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddSingleton<ITwitterSettingsService, TwitterSettingsService>();
+        services.AddScoped<IDisplayDriver<ISite>, TwitterSettingsDisplayDriver>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddSingleton<ITwitterSettingsService, TwitterSettingsService>();
 
-            services.AddRecipeExecutionStep<TwitterSettingsStep>();
+        services.AddRecipeExecutionStep<TwitterSettingsStep>();
 
-            services.AddTransient<TwitterClientMessageHandler>();
-            services.AddTransient<IConfigureOptions<TwitterSettings>, TwitterSettingsConfiguration>();
+        services.AddTransient<TwitterClientMessageHandler>();
+        services.AddTransient<IConfigureOptions<TwitterSettings>, TwitterSettingsConfiguration>();
 
-            services.AddHttpClient<TwitterClient>()
-                .AddHttpMessageHandler<TwitterClientMessageHandler>()
-                .AddResilienceHandler("oc-handler", builder => builder
-                    .AddRetry(new HttpRetryStrategyOptions
+        services.AddHttpClient<TwitterClient>()
+            .AddHttpMessageHandler<TwitterClientMessageHandler>()
+            .AddResilienceHandler("oc-handler", builder => builder
+                .AddRetry(new HttpRetryStrategyOptions
+                {
+                    Name = "oc-retry",
+                    MaxRetryAttempts = 3,
+                    OnRetry = attempt =>
                     {
-                        Name = "oc-retry",
-                        MaxRetryAttempts = 3,
-                        OnRetry = attempt =>
-                        {
-                            attempt.RetryDelay.Add(TimeSpan.FromSeconds(0.5 * attempt.AttemptNumber));
+                        attempt.RetryDelay.Add(TimeSpan.FromSeconds(0.5 * attempt.AttemptNumber));
 
-                            return ValueTask.CompletedTask;
-                        }
-                    })
-                );
-            services.AddDataMigration<TwitterMigrations>();
-        }
+                        return ValueTask.CompletedTask;
+                    }
+                })
+            );
+        services.AddDataMigration<TwitterMigrations>();
     }
+}
 
-    [Feature(TwitterConstants.Features.Signin)]
-    public sealed class TwitterSigninStartup : StartupBase
+[Feature(TwitterConstants.Features.Signin)]
+public sealed class TwitterSigninStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.AddScoped<INavigationProvider, AdminMenuSignin>();
+        services.AddSingleton<ITwitterSigninService, TwitterSigninService>();
+        services.AddScoped<IDisplayDriver<ISite>, TwitterSigninSettingsDisplayDriver>();
+        // Register the options initializers required by the Twitter Handler.
+        services.TryAddEnumerable(new[]
         {
-            services.AddScoped<INavigationProvider, AdminMenuSignin>();
-            services.AddSingleton<ITwitterSigninService, TwitterSigninService>();
-            services.AddScoped<IDisplayDriver<ISite>, TwitterSigninSettingsDisplayDriver>();
-            // Register the options initializers required by the Twitter Handler.
-            services.TryAddEnumerable(new[]
-            {
-                // Orchard-specific initializers:
-                ServiceDescriptor.Transient<IConfigureOptions<AuthenticationOptions>, TwitterOptionsConfiguration>(),
-                ServiceDescriptor.Transient<IConfigureOptions<TwitterOptions>, TwitterOptionsConfiguration>(),
-                // Built-in initializers:
-                ServiceDescriptor.Transient<IPostConfigureOptions<TwitterOptions>, TwitterPostConfigureOptions>()
-            });
-        }
+            // Orchard-specific initializers:
+            ServiceDescriptor.Transient<IConfigureOptions<AuthenticationOptions>, TwitterOptionsConfiguration>(),
+            ServiceDescriptor.Transient<IConfigureOptions<TwitterOptions>, TwitterOptionsConfiguration>(),
+            // Built-in initializers:
+            ServiceDescriptor.Transient<IPostConfigureOptions<TwitterOptions>, TwitterPostConfigureOptions>()
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/TwitterConstants.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/TwitterConstants.cs
index 10d50cc6f33..a3789b30a04 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/TwitterConstants.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/TwitterConstants.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.Twitter
+namespace OrchardCore.Twitter;
+
+public static class TwitterConstants
 {
-    public static class TwitterConstants
+    public static class Features
     {
-        public static class Features
-        {
-            public const string Twitter = "OrchardCore.Twitter";
-            public const string Signin = "OrchardCore.Twitter.Signin";
-        }
+        public const string Twitter = "OrchardCore.Twitter";
+        public const string Signin = "OrchardCore.Twitter.Signin";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/ViewModels/TwitterSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/ViewModels/TwitterSettingsViewModel.cs
index c8a047b68a2..98edf36443b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/ViewModels/TwitterSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/ViewModels/TwitterSettingsViewModel.cs
@@ -1,21 +1,20 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Twitter.ViewModels
+namespace OrchardCore.Twitter.ViewModels;
+
+public class TwitterSettingsViewModel
 {
-    public class TwitterSettingsViewModel
-    {
-        [Required(AllowEmptyStrings = false, ErrorMessage = "API key is required")]
-        public string APIKey { get; set; }
+    [Required(AllowEmptyStrings = false, ErrorMessage = "API key is required")]
+    public string APIKey { get; set; }
 
-        [Required(AllowEmptyStrings = false, ErrorMessage = "API secret key is required")]
-        public string APISecretKey { get; set; }
+    [Required(AllowEmptyStrings = false, ErrorMessage = "API secret key is required")]
+    public string APISecretKey { get; set; }
 
-        [Required(AllowEmptyStrings = false, ErrorMessage = "Access token is required")]
-        public string AccessToken { get; set; }
+    [Required(AllowEmptyStrings = false, ErrorMessage = "Access token is required")]
+    public string AccessToken { get; set; }
 
-        [Required(AllowEmptyStrings = false, ErrorMessage = "Access token secret is required")]
-        public string AccessTokenSecret { get; set; }
+    [Required(AllowEmptyStrings = false, ErrorMessage = "Access token secret is required")]
+    public string AccessTokenSecret { get; set; }
 
-        public bool HasDecryptionError { get; set; }
-    }
+    public bool HasDecryptionError { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateXStatusTask.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateXStatusTask.cs
index b0ad9ce66d4..ea6a21222cc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateXStatusTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateXStatusTask.cs
@@ -7,58 +7,57 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Twitter.Workflows.Activities
+namespace OrchardCore.Twitter.Workflows.Activities;
+
+public class UpdateXStatusTask : TaskActivity<UpdateXStatusTask>
 {
-    public class UpdateXStatusTask : TaskActivity<UpdateXStatusTask>
+    private readonly TwitterClient _twitterClient;
+    private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
+    protected readonly IStringLocalizer S;
+
+    public UpdateXStatusTask(
+        TwitterClient twitterClient,
+        IWorkflowExpressionEvaluator expressionEvaluator,
+        IStringLocalizer<UpdateXStatusTask> localizer
+        )
     {
-        private readonly TwitterClient _twitterClient;
-        private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
-        protected readonly IStringLocalizer S;
-
-        public UpdateXStatusTask(
-            TwitterClient twitterClient,
-            IWorkflowExpressionEvaluator expressionEvaluator,
-            IStringLocalizer<UpdateXStatusTask> localizer
-            )
-        {
-            _twitterClient = twitterClient;
-            _expressionEvaluator = expressionEvaluator;
-            S = localizer;
-        }
-
-        public override LocalizedString DisplayText => S["Update X Status Task"];
+        _twitterClient = twitterClient;
+        _expressionEvaluator = expressionEvaluator;
+        S = localizer;
+    }
 
-        // The category to which this activity belongs. The activity picker groups activities by this category.
-        public override LocalizedString Category => S["Social"];
+    public override LocalizedString DisplayText => S["Update X Status Task"];
 
-        // The message to display.
-        public WorkflowExpression<string> StatusTemplate
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
+    // The category to which this activity belongs. The activity picker groups activities by this category.
+    public override LocalizedString Category => S["Social"];
 
-        // Returns the possible outcomes of this activity.
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"], S["Failed"]);
-        }
+    // The message to display.
+    public WorkflowExpression<string> StatusTemplate
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        // This is the heart of the activity and actually performs the work to be done.
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            // The twitter client encodes the status using FormUrlEncodedContent
-            var status = await _expressionEvaluator.EvaluateAsync(StatusTemplate, workflowContext, null);
+    // Returns the possible outcomes of this activity.
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"], S["Failed"]);
+    }
 
-            var result = await _twitterClient.UpdateStatus(status);
-            workflowContext.Properties.Add("TwitterResponse", await result.Content.ReadAsStringAsync());
+    // This is the heart of the activity and actually performs the work to be done.
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        // The twitter client encodes the status using FormUrlEncodedContent
+        var status = await _expressionEvaluator.EvaluateAsync(StatusTemplate, workflowContext, null);
 
-            if (!result.IsSuccessStatusCode)
-            {
-                return Outcomes("Failed");
-            }
+        var result = await _twitterClient.UpdateStatus(status);
+        workflowContext.Properties.Add("TwitterResponse", await result.Content.ReadAsStringAsync());
 
-            return Outcomes("Done");
+        if (!result.IsSuccessStatusCode)
+        {
+            return Outcomes("Failed");
         }
+
+        return Outcomes("Done");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Drivers/UpdateTwitterStatusTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Drivers/UpdateTwitterStatusTaskDisplayDriver.cs
index 580e4935b8e..248afa82260 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Drivers/UpdateTwitterStatusTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Drivers/UpdateTwitterStatusTaskDisplayDriver.cs
@@ -3,18 +3,17 @@
 using OrchardCore.Workflows.Display;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Twitter.Workflows.Drivers
+namespace OrchardCore.Twitter.Workflows.Drivers;
+
+public sealed class UpdateTwitterStatusTaskDisplayDriver : ActivityDisplayDriver<UpdateXStatusTask, UpdateTwitterStatusTaskViewModel>
 {
-    public sealed class UpdateTwitterStatusTaskDisplayDriver : ActivityDisplayDriver<UpdateXStatusTask, UpdateTwitterStatusTaskViewModel>
+    protected override void EditActivity(UpdateXStatusTask activity, UpdateTwitterStatusTaskViewModel model)
     {
-        protected override void EditActivity(UpdateXStatusTask activity, UpdateTwitterStatusTaskViewModel model)
-        {
-            model.StatusTemplate = activity.StatusTemplate.Expression;
-        }
+        model.StatusTemplate = activity.StatusTemplate.Expression;
+    }
 
-        protected override void UpdateActivity(UpdateTwitterStatusTaskViewModel model, UpdateXStatusTask activity)
-        {
-            activity.StatusTemplate = new WorkflowExpression<string>(model.StatusTemplate);
-        }
+    protected override void UpdateActivity(UpdateTwitterStatusTaskViewModel model, UpdateXStatusTask activity)
+    {
+        activity.StatusTemplate = new WorkflowExpression<string>(model.StatusTemplate);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
index fa9c997e854..84df846e6b5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
@@ -6,14 +6,13 @@
 using OrchardCore.Twitter.Workflows.Drivers;
 using OrchardCore.Workflows.Helpers;
 
-namespace OrchardCore.Twitter.Workflows
+namespace OrchardCore.Twitter.Workflows;
+
+[RequireFeatures("OrchardCore.Workflows")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Workflows")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddActivity<UpdateXStatusTask, UpdateTwitterStatusTaskDisplayDriver>();
-        }
+        services.AddActivity<UpdateXStatusTask, UpdateTwitterStatusTaskDisplayDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/ViewModels/UpdateTwitterStatusTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/ViewModels/UpdateTwitterStatusTaskViewModel.cs
index 621017e866a..4d2f5538f40 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/ViewModels/UpdateTwitterStatusTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/ViewModels/UpdateTwitterStatusTaskViewModel.cs
@@ -1,10 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Twitter.Workflows.ViewModels
+namespace OrchardCore.Twitter.Workflows.ViewModels;
+
+public class UpdateTwitterStatusTaskViewModel
 {
-    public class UpdateTwitterStatusTaskViewModel
-    {
-        [Required]
-        public string StatusTemplate { get; set; }
-    }
+    [Required]
+    public string StatusTemplate { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs
index 621f2befa7e..f8df85f6641 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs
@@ -5,163 +5,162 @@
 using OrchardCore.Users.Drivers;
 using OrchardCore.Users.Models;
 
-namespace OrchardCore.Users
+namespace OrchardCore.Users;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", LoginSettingsDisplayDriver.GroupId },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", LoginSettingsDisplayDriver.GroupId },
+    };
+
+    internal readonly IStringLocalizer S;
 
-        internal readonly IStringLocalizer S;
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
-                    .AddClass("security")
-                    .Id("security")
-                    .Add(S["Users"], S["Users"].PrefixPosition(), users => users
-                        .AddClass("users")
-                        .Id("users")
-                        .Action("Index", "Admin", UserConstants.Features.Users)
-                        .Permission(CommonPermissions.ListUsers)
-                        .Resource(new User())
+        builder
+            .Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security
+                .AddClass("security")
+                .Id("security")
+                .Add(S["Users"], S["Users"].PrefixPosition(), users => users
+                    .AddClass("users")
+                    .Id("users")
+                    .Action("Index", "Admin", UserConstants.Features.Users)
+                    .Permission(CommonPermissions.ListUsers)
+                    .Resource(new User())
+                    .LocalNav()
+                )
+                .Add(S["Settings"], settings => settings
+                    .Add(S["User Login"], S["User Login"].PrefixPosition(), login => login
+                        .Permission(CommonPermissions.ManageUsers)
+                        .Action("Index", "Admin", _routeValues)
                         .LocalNav()
                     )
-                    .Add(S["Settings"], settings => settings
-                        .Add(S["User Login"], S["User Login"].PrefixPosition(), login => login
-                            .Permission(CommonPermissions.ManageUsers)
-                            .Action("Index", "Admin", _routeValues)
-                            .LocalNav()
-                        )
-                    )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
+}
 
-    public sealed class ChangeEmailAdminMenu : INavigationProvider
+public sealed class ChangeEmailAdminMenu : INavigationProvider
+{
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", ChangeEmailSettingsDisplayDriver.GroupId },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", ChangeEmailSettingsDisplayDriver.GroupId },
+    };
+
+    internal readonly IStringLocalizer S;
 
-        internal readonly IStringLocalizer S;
+    public ChangeEmailAdminMenu(IStringLocalizer<ChangeEmailAdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public ChangeEmailAdminMenu(IStringLocalizer<ChangeEmailAdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Security"], security => security
-                    .Add(S["Settings"], settings => settings
-                        .Add(S["User Change email"], S["User Change email"].PrefixPosition(), email => email
-                            .Permission(CommonPermissions.ManageUsers)
-                            .Action("Index", "Admin", _routeValues)
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Security"], security => security
+                .Add(S["Settings"], settings => settings
+                    .Add(S["User Change email"], S["User Change email"].PrefixPosition(), email => email
+                        .Permission(CommonPermissions.ManageUsers)
+                        .Action("Index", "Admin", _routeValues)
+                        .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
+}
 
-    public sealed class RegistrationAdminMenu : INavigationProvider
+public sealed class RegistrationAdminMenu : INavigationProvider
+{
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", RegistrationSettingsDisplayDriver.GroupId },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", RegistrationSettingsDisplayDriver.GroupId },
+    };
+
+    internal readonly IStringLocalizer S;
 
-        internal readonly IStringLocalizer S;
+    public RegistrationAdminMenu(IStringLocalizer<RegistrationAdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public RegistrationAdminMenu(IStringLocalizer<RegistrationAdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Security"], security => security
-                    .Add(S["Settings"], settings => settings
-                        .Add(S["User Registration"], S["User Registration"].PrefixPosition(), registration => registration
-                            .Permission(CommonPermissions.ManageUsers)
-                            .Action("Index", "Admin", _routeValues)
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Security"], security => security
+                .Add(S["Settings"], settings => settings
+                    .Add(S["User Registration"], S["User Registration"].PrefixPosition(), registration => registration
+                        .Permission(CommonPermissions.ManageUsers)
+                        .Action("Index", "Admin", _routeValues)
+                        .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
+}
 
-    public sealed class ResetPasswordAdminMenu : INavigationProvider
+public sealed class ResetPasswordAdminMenu : INavigationProvider
+{
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private static readonly RouteValueDictionary _routeValues = new()
-        {
-            { "area", "OrchardCore.Settings" },
-            { "groupId", ResetPasswordSettingsDisplayDriver.GroupId },
-        };
+        { "area", "OrchardCore.Settings" },
+        { "groupId", ResetPasswordSettingsDisplayDriver.GroupId },
+    };
+
+    internal readonly IStringLocalizer S;
 
-        internal readonly IStringLocalizer S;
+    public ResetPasswordAdminMenu(IStringLocalizer<ResetPasswordAdminMenu> localizer)
+    {
+        S = localizer;
+    }
 
-        public ResetPasswordAdminMenu(IStringLocalizer<ResetPasswordAdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Security"], security => security
-                    .Add(S["Settings"], settings => settings
-                        .Add(S["User Reset password"], S["User Reset password"].PrefixPosition(), password => password
-                            .Permission(CommonPermissions.ManageUsers)
-                            .Action("Index", "Admin", _routeValues)
-                            .LocalNav()
-                        )
+        builder
+            .Add(S["Security"], security => security
+                .Add(S["Settings"], settings => settings
+                    .Add(S["User Reset password"], S["User Reset password"].PrefixPosition(), password => password
+                        .Permission(CommonPermissions.ManageUsers)
+                        .Action("Index", "Admin", _routeValues)
+                        .LocalNav()
                     )
-                );
+                )
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Drivers/AuditTrailUserEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Drivers/AuditTrailUserEventDisplayDriver.cs
index 7ae25dfea4d..eb26adccf4c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Drivers/AuditTrailUserEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Drivers/AuditTrailUserEventDisplayDriver.cs
@@ -6,24 +6,23 @@
 using OrchardCore.Users.AuditTrail.Models;
 using OrchardCore.Users.AuditTrail.ViewModels;
 
-namespace OrchardCore.Users.AuditTrail.Drivers
+namespace OrchardCore.Users.AuditTrail.Drivers;
+
+public sealed class AuditTrailUserEventDisplayDriver : AuditTrailEventSectionDisplayDriver<AuditTrailUserEvent>
 {
-    public sealed class AuditTrailUserEventDisplayDriver : AuditTrailEventSectionDisplayDriver<AuditTrailUserEvent>
+    public override Task<IDisplayResult> DisplayAsync(AuditTrailEvent auditTrailEvent, AuditTrailUserEvent userEvent, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(AuditTrailEvent auditTrailEvent, AuditTrailUserEvent userEvent, BuildDisplayContext context)
-        {
-            return Task.FromResult<IDisplayResult>(
-                Initialize<AuditTrailUserEventDetailViewModel>("AuditTrailUserEventDetail_DetailAdmin", m => BuildViewModel(m, auditTrailEvent, userEvent))
-                    .Location("DetailAdmin", "Content:10")
-            );
-        }
+        return Task.FromResult<IDisplayResult>(
+            Initialize<AuditTrailUserEventDetailViewModel>("AuditTrailUserEventDetail_DetailAdmin", m => BuildViewModel(m, auditTrailEvent, userEvent))
+                .Location("DetailAdmin", "Content:10")
+        );
+    }
 
-        private static void BuildViewModel(AuditTrailUserEventViewModel m, AuditTrailEvent auditTrailEvent, AuditTrailUserEvent userEvent)
-        {
-            m.AuditTrailEvent = auditTrailEvent;
-            m.Name = userEvent.Name;
-            m.UserId = userEvent.UserId;
-            m.UserName = userEvent.UserName;
-        }
+    private static void BuildViewModel(AuditTrailUserEventViewModel m, AuditTrailEvent auditTrailEvent, AuditTrailUserEvent userEvent)
+    {
+        m.AuditTrailEvent = auditTrailEvent;
+        m.Name = userEvent.Name;
+        m.UserId = userEvent.UserId;
+        m.UserName = userEvent.UserName;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Handlers/UserEventHandler.cs b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Handlers/UserEventHandler.cs
index eda8d4ab415..7481ac474ea 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Handlers/UserEventHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Handlers/UserEventHandler.cs
@@ -11,110 +11,109 @@
 using OrchardCore.Users.Events;
 using OrchardCore.Users.Handlers;
 
-namespace OrchardCore.Users.AuditTrail.Handlers
+namespace OrchardCore.Users.AuditTrail.Handlers;
+
+public class UserEventHandler : ILoginFormEvent, IUserEventHandler
 {
-    public class UserEventHandler : ILoginFormEvent, IUserEventHandler
+    private readonly IAuditTrailManager _auditTrailManager;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IServiceProvider _serviceProvider;
+    private UserManager<IUser> _userManager;
+
+    public UserEventHandler(
+        IAuditTrailManager auditTrailManager,
+        IHttpContextAccessor httpContextAccessor,
+        IServiceProvider serviceProvider)
     {
-        private readonly IAuditTrailManager _auditTrailManager;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IServiceProvider _serviceProvider;
-        private UserManager<IUser> _userManager;
-
-        public UserEventHandler(
-            IAuditTrailManager auditTrailManager,
-            IHttpContextAccessor httpContextAccessor,
-            IServiceProvider serviceProvider)
-        {
-            _auditTrailManager = auditTrailManager;
-            _httpContextAccessor = httpContextAccessor;
-            _serviceProvider = serviceProvider;
-        }
-
-        public Task LoggedInAsync(IUser user)
-            => RecordAuditTrailEventAsync(UserAuditTrailEventConfiguration.LoggedIn, user);
+        _auditTrailManager = auditTrailManager;
+        _httpContextAccessor = httpContextAccessor;
+        _serviceProvider = serviceProvider;
+    }
 
-        public Task LoggingInFailedAsync(IUser user)
-            => RecordAuditTrailEventAsync(UserAuditTrailEventConfiguration.LogInFailed, user);
+    public Task LoggedInAsync(IUser user)
+        => RecordAuditTrailEventAsync(UserAuditTrailEventConfiguration.LoggedIn, user);
 
-        public Task LoggingInFailedAsync(string userName)
-            => _auditTrailManager.RecordEventAsync(
-                    new AuditTrailContext<AuditTrailUserEvent>
-                    (
-                        name: UserAuditTrailEventConfiguration.LogInFailed,
-                        category: UserAuditTrailEventConfiguration.User,
-                        correlationId: string.Empty,
-                        userId: string.Empty,
-                        userName: userName,
-                        new AuditTrailUserEvent
-                        {
-                            UserId = string.Empty,
-                            UserName = userName
-                        }
-                    ));
+    public Task LoggingInFailedAsync(IUser user)
+        => RecordAuditTrailEventAsync(UserAuditTrailEventConfiguration.LogInFailed, user);
 
-        public Task IsLockedOutAsync(IUser user)
-            => RecordAuditTrailEventAsync(UserAuditTrailEventConfiguration.LogInFailed, user);
+    public Task LoggingInFailedAsync(string userName)
+        => _auditTrailManager.RecordEventAsync(
+                new AuditTrailContext<AuditTrailUserEvent>
+                (
+                    name: UserAuditTrailEventConfiguration.LogInFailed,
+                    category: UserAuditTrailEventConfiguration.User,
+                    correlationId: string.Empty,
+                    userId: string.Empty,
+                    userName: userName,
+                    new AuditTrailUserEvent
+                    {
+                        UserId = string.Empty,
+                        UserName = userName
+                    }
+                ));
 
-        public Task DisabledAsync(UserContext context)
-            => RecordAuditTrailEventAsync(UserAuditTrailEventConfiguration.Disabled, context.User, _httpContextAccessor.HttpContext.User?.FindFirstValue(ClaimTypes.NameIdentifier), _httpContextAccessor.HttpContext.User?.Identity?.Name);
+    public Task IsLockedOutAsync(IUser user)
+        => RecordAuditTrailEventAsync(UserAuditTrailEventConfiguration.LogInFailed, user);
 
-        public Task EnabledAsync(UserContext context)
-             => RecordAuditTrailEventAsync(UserAuditTrailEventConfiguration.Enabled, context.User, _httpContextAccessor.HttpContext.User?.FindFirstValue(ClaimTypes.NameIdentifier), _httpContextAccessor.HttpContext.User?.Identity?.Name);
+    public Task DisabledAsync(UserContext context)
+        => RecordAuditTrailEventAsync(UserAuditTrailEventConfiguration.Disabled, context.User, _httpContextAccessor.HttpContext.User?.FindFirstValue(ClaimTypes.NameIdentifier), _httpContextAccessor.HttpContext.User?.Identity?.Name);
 
-        public Task CreatedAsync(UserCreateContext context)
-             => RecordAuditTrailEventAsync(UserAuditTrailEventConfiguration.Created, context.User, _httpContextAccessor.HttpContext.User?.FindFirstValue(ClaimTypes.NameIdentifier), _httpContextAccessor.HttpContext.User?.Identity?.Name);
+    public Task EnabledAsync(UserContext context)
+         => RecordAuditTrailEventAsync(UserAuditTrailEventConfiguration.Enabled, context.User, _httpContextAccessor.HttpContext.User?.FindFirstValue(ClaimTypes.NameIdentifier), _httpContextAccessor.HttpContext.User?.Identity?.Name);
 
-        public Task UpdatedAsync(UserUpdateContext context)
-             => RecordAuditTrailEventAsync(UserAuditTrailEventConfiguration.Updated, context.User, _httpContextAccessor.HttpContext.User?.FindFirstValue(ClaimTypes.NameIdentifier), _httpContextAccessor.HttpContext.User?.Identity?.Name);
+    public Task CreatedAsync(UserCreateContext context)
+         => RecordAuditTrailEventAsync(UserAuditTrailEventConfiguration.Created, context.User, _httpContextAccessor.HttpContext.User?.FindFirstValue(ClaimTypes.NameIdentifier), _httpContextAccessor.HttpContext.User?.Identity?.Name);
 
-        public Task DeletedAsync(UserDeleteContext context)
-             => RecordAuditTrailEventAsync(UserAuditTrailEventConfiguration.Deleted, context.User, _httpContextAccessor.HttpContext.User?.FindFirstValue(ClaimTypes.NameIdentifier), _httpContextAccessor.HttpContext.User?.Identity?.Name);
+    public Task UpdatedAsync(UserUpdateContext context)
+         => RecordAuditTrailEventAsync(UserAuditTrailEventConfiguration.Updated, context.User, _httpContextAccessor.HttpContext.User?.FindFirstValue(ClaimTypes.NameIdentifier), _httpContextAccessor.HttpContext.User?.Identity?.Name);
 
-        #region Unused user events
+    public Task DeletedAsync(UserDeleteContext context)
+         => RecordAuditTrailEventAsync(UserAuditTrailEventConfiguration.Deleted, context.User, _httpContextAccessor.HttpContext.User?.FindFirstValue(ClaimTypes.NameIdentifier), _httpContextAccessor.HttpContext.User?.Identity?.Name);
 
-        public Task CreatingAsync(UserCreateContext context) => Task.CompletedTask;
-        public Task UpdatingAsync(UserUpdateContext context) => Task.CompletedTask;
-        public Task DeletingAsync(UserDeleteContext context) => Task.CompletedTask;
+    #region Unused user events
 
-        #endregion
+    public Task CreatingAsync(UserCreateContext context) => Task.CompletedTask;
+    public Task UpdatingAsync(UserUpdateContext context) => Task.CompletedTask;
+    public Task DeletingAsync(UserDeleteContext context) => Task.CompletedTask;
 
-        #region Unused login events
+    #endregion
 
-        public Task LoggingInAsync(string userName, Action<string, string> reportError) => Task.CompletedTask;
+    #region Unused login events
 
-        #endregion
+    public Task LoggingInAsync(string userName, Action<string, string> reportError) => Task.CompletedTask;
 
-        private async Task RecordAuditTrailEventAsync(string name, IUser user, string userIdActual = "", string userNameActual = "")
-        {
-            var userName = user.UserName;
-            _userManager ??= _serviceProvider.GetRequiredService<UserManager<IUser>>();
+    #endregion
 
-            var userId = await _userManager.GetUserIdAsync(user);
+    private async Task RecordAuditTrailEventAsync(string name, IUser user, string userIdActual = "", string userNameActual = "")
+    {
+        var userName = user.UserName;
+        _userManager ??= _serviceProvider.GetRequiredService<UserManager<IUser>>();
 
-            if (string.IsNullOrEmpty(userIdActual))
-            {
-                userIdActual = userId;
-            }
+        var userId = await _userManager.GetUserIdAsync(user);
 
-            if (string.IsNullOrEmpty(userNameActual))
-            {
-                userNameActual = userName;
-            }
+        if (string.IsNullOrEmpty(userIdActual))
+        {
+            userIdActual = userId;
+        }
 
-            await _auditTrailManager.RecordEventAsync(
-                new AuditTrailContext<AuditTrailUserEvent>
-                (
-                    name: name,
-                    category: UserAuditTrailEventConfiguration.User,
-                    correlationId: userId,
-                    userId: userIdActual,
-                    userName: userNameActual,
-                    new AuditTrailUserEvent
-                    {
-                        UserId = userId,
-                        UserName = userName
-                    }
-                ));
+        if (string.IsNullOrEmpty(userNameActual))
+        {
+            userNameActual = userName;
         }
+
+        await _auditTrailManager.RecordEventAsync(
+            new AuditTrailContext<AuditTrailUserEvent>
+            (
+                name: name,
+                category: UserAuditTrailEventConfiguration.User,
+                correlationId: userId,
+                userId: userIdActual,
+                userName: userNameActual,
+                new AuditTrailUserEvent
+                {
+                    UserId = userId,
+                    UserName = userName
+                }
+            ));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Models/AuditTrailUserEvent.cs b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Models/AuditTrailUserEvent.cs
index 61817029dcf..3c5bce942a8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Models/AuditTrailUserEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Models/AuditTrailUserEvent.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.Users.AuditTrail.Models
+namespace OrchardCore.Users.AuditTrail.Models;
+
+public class AuditTrailUserEvent
 {
-    public class AuditTrailUserEvent
-    {
-        // TODO a future version should also record the User state, enabling diff against users
-        public string Name { get; set; } = "User";
-        public string UserName { get; set; }
-        public string UserId { get; set; }
-    }
+    // TODO a future version should also record the User state, enabling diff against users
+    public string Name { get; set; } = "User";
+    public string UserName { get; set; }
+    public string UserId { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Registration/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Registration/Startup.cs
index 6309a3e0307..972502f6c64 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Registration/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Registration/Startup.cs
@@ -4,15 +4,14 @@
 using OrchardCore.Modules;
 using OrchardCore.Users.Events;
 
-namespace OrchardCore.Users.AuditTrail.Registration
+namespace OrchardCore.Users.AuditTrail.Registration;
+
+[RequireFeatures("OrchardCore.Users.AuditTrail", UserConstants.Features.UserRegistration)]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Users.AuditTrail", UserConstants.Features.UserRegistration)]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IRegistrationFormEvents, UserRegistrationEventHandler>();
-            services.AddTransient<IConfigureOptions<AuditTrailOptions>, UserRegistrationAuditTrailEventConfiguration>();
-        }
+        services.AddScoped<IRegistrationFormEvents, UserRegistrationEventHandler>();
+        services.AddTransient<IConfigureOptions<AuditTrailOptions>, UserRegistrationAuditTrailEventConfiguration>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Registration/UserRegistrationAuditTrailEventConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Registration/UserRegistrationAuditTrailEventConfiguration.cs
index c7149b1aa73..15262398c6d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Registration/UserRegistrationAuditTrailEventConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Registration/UserRegistrationAuditTrailEventConfiguration.cs
@@ -1,17 +1,16 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.AuditTrail.Services.Models;
 
-namespace OrchardCore.Users.AuditTrail.Registration
+namespace OrchardCore.Users.AuditTrail.Registration;
+
+public sealed class UserRegistrationAuditTrailEventConfiguration : IConfigureOptions<AuditTrailOptions>
 {
-    public sealed class UserRegistrationAuditTrailEventConfiguration : IConfigureOptions<AuditTrailOptions>
-    {
-        public const string User = nameof(User);
-        public const string Registered = nameof(Registered);
+    public const string User = nameof(User);
+    public const string Registered = nameof(Registered);
 
-        public void Configure(AuditTrailOptions options)
-        {
-            options.For<UserRegistrationAuditTrailEventConfiguration>(User, S => S["User"])
-                .WithEvent(Registered, S => S["Registered"], S => S["A user was successfully registered."], true);
-        }
+    public void Configure(AuditTrailOptions options)
+    {
+        options.For<UserRegistrationAuditTrailEventConfiguration>(User, S => S["User"])
+            .WithEvent(Registered, S => S["Registered"], S => S["A user was successfully registered."], true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Registration/UserRegistrationEventHandler.cs b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Registration/UserRegistrationEventHandler.cs
index a091dc94102..8494b06ba0e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Registration/UserRegistrationEventHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Registration/UserRegistrationEventHandler.cs
@@ -7,52 +7,51 @@
 using OrchardCore.Users.AuditTrail.Models;
 using OrchardCore.Users.Events;
 
-namespace OrchardCore.Users.AuditTrail.Registration
+namespace OrchardCore.Users.AuditTrail.Registration;
+
+public class UserRegistrationEventHandler : IRegistrationFormEvents
 {
-    public class UserRegistrationEventHandler : IRegistrationFormEvents
+    private readonly IAuditTrailManager _auditTrailManager;
+    private readonly IServiceProvider _serviceProvider;
+    private UserManager<IUser> _userManager;
+
+    public UserRegistrationEventHandler(
+        IAuditTrailManager auditTrailManager,
+        IServiceProvider serviceProvider)
+    {
+        _auditTrailManager = auditTrailManager;
+        _serviceProvider = serviceProvider;
+    }
+
+    public Task RegisteredAsync(IUser user) =>
+        RecordAuditTrailEventAsync(UserRegistrationAuditTrailEventConfiguration.Registered, user);
+
+    #region Unused events
+
+    public Task RegistrationValidationAsync(Action<string, string> reportError) => Task.CompletedTask;
+
+    #endregion
+
+    private async Task RecordAuditTrailEventAsync(string name, IUser user)
     {
-        private readonly IAuditTrailManager _auditTrailManager;
-        private readonly IServiceProvider _serviceProvider;
-        private UserManager<IUser> _userManager;
-
-        public UserRegistrationEventHandler(
-            IAuditTrailManager auditTrailManager,
-            IServiceProvider serviceProvider)
-        {
-            _auditTrailManager = auditTrailManager;
-            _serviceProvider = serviceProvider;
-        }
-
-        public Task RegisteredAsync(IUser user) =>
-            RecordAuditTrailEventAsync(UserRegistrationAuditTrailEventConfiguration.Registered, user);
-
-        #region Unused events
-
-        public Task RegistrationValidationAsync(Action<string, string> reportError) => Task.CompletedTask;
-
-        #endregion
-
-        private async Task RecordAuditTrailEventAsync(string name, IUser user)
-        {
-            var userName = user.UserName;
-            _userManager ??= _serviceProvider.GetRequiredService<UserManager<IUser>>();
-
-            var userId = await _userManager.GetUserIdAsync(user);
-
-            await _auditTrailManager.RecordEventAsync(
-                new AuditTrailContext<AuditTrailUserEvent>
-                (
-                    name,
-                    UserRegistrationAuditTrailEventConfiguration.User,
-                    userId,
-                    userId,
-                    userName,
-                    new AuditTrailUserEvent
-                    {
-                        UserId = userId,
-                        UserName = userName
-                    }
-                ));
-        }
+        var userName = user.UserName;
+        _userManager ??= _serviceProvider.GetRequiredService<UserManager<IUser>>();
+
+        var userId = await _userManager.GetUserIdAsync(user);
+
+        await _auditTrailManager.RecordEventAsync(
+            new AuditTrailContext<AuditTrailUserEvent>
+            (
+                name,
+                UserRegistrationAuditTrailEventConfiguration.User,
+                userId,
+                userId,
+                userName,
+                new AuditTrailUserEvent
+                {
+                    UserId = userId,
+                    UserName = userName
+                }
+            ));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ResetPassword/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ResetPassword/Startup.cs
index 2dc8bfeaf48..bc51fe837c2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ResetPassword/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ResetPassword/Startup.cs
@@ -4,15 +4,14 @@
 using OrchardCore.Modules;
 using OrchardCore.Users.Events;
 
-namespace OrchardCore.Users.AuditTrail.ResetPassword
+namespace OrchardCore.Users.AuditTrail.ResetPassword;
+
+[RequireFeatures("OrchardCore.Users.AuditTrail", UserConstants.Features.ResetPassword)]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Users.AuditTrail", UserConstants.Features.ResetPassword)]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IPasswordRecoveryFormEvents, UserResetPasswordEventHandler>();
-            services.AddTransient<IConfigureOptions<AuditTrailOptions>, UserResetPasswordAuditTrailEventConfiguration>();
-        }
+        services.AddScoped<IPasswordRecoveryFormEvents, UserResetPasswordEventHandler>();
+        services.AddTransient<IConfigureOptions<AuditTrailOptions>, UserResetPasswordAuditTrailEventConfiguration>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ResetPassword/UserResetPasswordAuditTrailEventConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ResetPassword/UserResetPasswordAuditTrailEventConfiguration.cs
index 28b7f6c348e..b9621927196 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ResetPassword/UserResetPasswordAuditTrailEventConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ResetPassword/UserResetPasswordAuditTrailEventConfiguration.cs
@@ -1,19 +1,18 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.AuditTrail.Services.Models;
 
-namespace OrchardCore.Users.AuditTrail.ResetPassword
+namespace OrchardCore.Users.AuditTrail.ResetPassword;
+
+public sealed class UserResetPasswordAuditTrailEventConfiguration : IConfigureOptions<AuditTrailOptions>
 {
-    public sealed class UserResetPasswordAuditTrailEventConfiguration : IConfigureOptions<AuditTrailOptions>
-    {
-        public const string User = nameof(User);
-        public const string PasswordReset = nameof(PasswordReset);
-        public const string PasswordRecovered = nameof(PasswordRecovered);
+    public const string User = nameof(User);
+    public const string PasswordReset = nameof(PasswordReset);
+    public const string PasswordRecovered = nameof(PasswordRecovered);
 
-        public void Configure(AuditTrailOptions options)
-        {
-            options.For<UserResetPasswordAuditTrailEventConfiguration>(User, S => S["User"])
-                .WithEvent(PasswordReset, S => S["Password reset"], S => S["A user successfully reset the password."], true)
-                .WithEvent(PasswordRecovered, S => S["Password recovered"], S => S["A user successfully recovered the password."], true);
-        }
+    public void Configure(AuditTrailOptions options)
+    {
+        options.For<UserResetPasswordAuditTrailEventConfiguration>(User, S => S["User"])
+            .WithEvent(PasswordReset, S => S["Password reset"], S => S["A user successfully reset the password."], true)
+            .WithEvent(PasswordRecovered, S => S["Password recovered"], S => S["A user successfully recovered the password."], true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ResetPassword/UserResetPasswordEventHandler.cs b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ResetPassword/UserResetPasswordEventHandler.cs
index 2d6c234a677..59622eafe07 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ResetPassword/UserResetPasswordEventHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ResetPassword/UserResetPasswordEventHandler.cs
@@ -7,56 +7,55 @@
 using OrchardCore.Users.AuditTrail.Models;
 using OrchardCore.Users.Events;
 
-namespace OrchardCore.Users.AuditTrail.ResetPassword
+namespace OrchardCore.Users.AuditTrail.ResetPassword;
+
+public class UserResetPasswordEventHandler : IPasswordRecoveryFormEvents
 {
-    public class UserResetPasswordEventHandler : IPasswordRecoveryFormEvents
+    private readonly IAuditTrailManager _auditTrailManager;
+    private readonly IServiceProvider _serviceProvider;
+    private UserManager<IUser> _userManager;
+
+    public UserResetPasswordEventHandler(
+        IAuditTrailManager auditTrailManager,
+        IServiceProvider serviceProvider)
+    {
+        _auditTrailManager = auditTrailManager;
+        _serviceProvider = serviceProvider;
+    }
+
+    public Task PasswordRecoveredAsync(PasswordRecoveryContext context)
+        => RecordAuditTrailEventAsync(UserResetPasswordAuditTrailEventConfiguration.PasswordRecovered, context.User);
+
+    public Task PasswordResetAsync(PasswordRecoveryContext context)
+        => RecordAuditTrailEventAsync(UserResetPasswordAuditTrailEventConfiguration.PasswordReset, context.User);
+
+    #region Unused events
+
+    public Task RecoveringPasswordAsync(Action<string, string> reportError) => Task.CompletedTask;
+
+    public Task ResettingPasswordAsync(Action<string, string> reportError) => Task.CompletedTask;
+
+    #endregion
+    private async Task RecordAuditTrailEventAsync(string name, IUser user)
     {
-        private readonly IAuditTrailManager _auditTrailManager;
-        private readonly IServiceProvider _serviceProvider;
-        private UserManager<IUser> _userManager;
-
-        public UserResetPasswordEventHandler(
-            IAuditTrailManager auditTrailManager,
-            IServiceProvider serviceProvider)
-        {
-            _auditTrailManager = auditTrailManager;
-            _serviceProvider = serviceProvider;
-        }
-
-        public Task PasswordRecoveredAsync(PasswordRecoveryContext context)
-            => RecordAuditTrailEventAsync(UserResetPasswordAuditTrailEventConfiguration.PasswordRecovered, context.User);
-
-        public Task PasswordResetAsync(PasswordRecoveryContext context)
-            => RecordAuditTrailEventAsync(UserResetPasswordAuditTrailEventConfiguration.PasswordReset, context.User);
-
-        #region Unused events
-
-        public Task RecoveringPasswordAsync(Action<string, string> reportError) => Task.CompletedTask;
-
-        public Task ResettingPasswordAsync(Action<string, string> reportError) => Task.CompletedTask;
-
-        #endregion
-        private async Task RecordAuditTrailEventAsync(string name, IUser user)
-        {
-            var userName = user.UserName;
-            _userManager ??= _serviceProvider.GetRequiredService<UserManager<IUser>>();
-
-            var userId = await _userManager.GetUserIdAsync(user);
-
-            await _auditTrailManager.RecordEventAsync(
-                new AuditTrailContext<AuditTrailUserEvent>
-                (
-                    name,
-                    UserResetPasswordAuditTrailEventConfiguration.User,
-                    userId,
-                    userId,
-                    userName,
-                    new AuditTrailUserEvent
-                    {
-                        UserId = userId,
-                        UserName = userName
-                    }
-                ));
-        }
+        var userName = user.UserName;
+        _userManager ??= _serviceProvider.GetRequiredService<UserManager<IUser>>();
+
+        var userId = await _userManager.GetUserIdAsync(user);
+
+        await _auditTrailManager.RecordEventAsync(
+            new AuditTrailContext<AuditTrailUserEvent>
+            (
+                name,
+                UserResetPasswordAuditTrailEventConfiguration.User,
+                userId,
+                userId,
+                userName,
+                new AuditTrailUserEvent
+                {
+                    UserId = userId,
+                    UserName = userName
+                }
+            ));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Services/UserAuditTrailEventConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Services/UserAuditTrailEventConfiguration.cs
index 7c89d74d202..248d07c8bb7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Services/UserAuditTrailEventConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Services/UserAuditTrailEventConfiguration.cs
@@ -1,32 +1,31 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.AuditTrail.Services.Models;
 
-namespace OrchardCore.Users.AuditTrail.Services
+namespace OrchardCore.Users.AuditTrail.Services;
+
+public sealed class UserAuditTrailEventConfiguration : IConfigureOptions<AuditTrailOptions>
 {
-    public sealed class UserAuditTrailEventConfiguration : IConfigureOptions<AuditTrailOptions>
-    {
-        public const string User = nameof(User);
-        public const string Registered = nameof(Registered);
-        public const string LoggedIn = nameof(LoggedIn);
-        public const string LogInFailed = nameof(LogInFailed);
-        public const string LogInIsLockedOut = nameof(LogInIsLockedOut);
-        public const string Enabled = nameof(Enabled);
-        public const string Disabled = nameof(Disabled);
-        public const string Created = nameof(Created);
-        public const string Updated = nameof(Updated);
-        public const string Deleted = nameof(Deleted);
+    public const string User = nameof(User);
+    public const string Registered = nameof(Registered);
+    public const string LoggedIn = nameof(LoggedIn);
+    public const string LogInFailed = nameof(LogInFailed);
+    public const string LogInIsLockedOut = nameof(LogInIsLockedOut);
+    public const string Enabled = nameof(Enabled);
+    public const string Disabled = nameof(Disabled);
+    public const string Created = nameof(Created);
+    public const string Updated = nameof(Updated);
+    public const string Deleted = nameof(Deleted);
 
-        public void Configure(AuditTrailOptions options)
-        {
-            options.For<UserAuditTrailEventConfiguration>(User, S => S["User"])
-                .WithEvent(LoggedIn, S => S["Logged in"], S => S["A user was successfully logged in."], true)
-                .WithEvent(LogInFailed, S => S["Login failed"], S => S["An attempt to login failed."], false) // Intentionally not enabled by default.
-                .WithEvent(LogInIsLockedOut, S => S["Login account locked"], S => S["An attempt to login failed because the user is locked out."], true)
-                .WithEvent(Enabled, S => S["Enabled"], S => S["A user was enabled."], true)
-                .WithEvent(Disabled, S => S["Disabled"], S => S["A user was disabled."], true)
-                .WithEvent(Created, S => S["Created"], S => S["A user was created."], true)
-                .WithEvent(Updated, S => S["Updated"], S => S["A user was updated."], true)
-                .WithEvent(Deleted, S => S["Deleted"], S => S["A user was deleted."], true);
-        }
+    public void Configure(AuditTrailOptions options)
+    {
+        options.For<UserAuditTrailEventConfiguration>(User, S => S["User"])
+            .WithEvent(LoggedIn, S => S["Logged in"], S => S["A user was successfully logged in."], true)
+            .WithEvent(LogInFailed, S => S["Login failed"], S => S["An attempt to login failed."], false) // Intentionally not enabled by default.
+            .WithEvent(LogInIsLockedOut, S => S["Login account locked"], S => S["An attempt to login failed because the user is locked out."], true)
+            .WithEvent(Enabled, S => S["Enabled"], S => S["A user was enabled."], true)
+            .WithEvent(Disabled, S => S["Disabled"], S => S["A user was disabled."], true)
+            .WithEvent(Created, S => S["Created"], S => S["A user was created."], true)
+            .WithEvent(Updated, S => S["Updated"], S => S["A user was updated."], true)
+            .WithEvent(Deleted, S => S["Deleted"], S => S["A user was deleted."], true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Startup.cs
index 15334193849..4f3188868f0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Startup.cs
@@ -10,20 +10,19 @@
 using OrchardCore.Users.Events;
 using OrchardCore.Users.Handlers;
 
-namespace OrchardCore.Users.AuditTrail
+namespace OrchardCore.Users.AuditTrail;
+
+[Feature("OrchardCore.Users.AuditTrail")]
+public sealed class Startup : StartupBase
 {
-    [Feature("OrchardCore.Users.AuditTrail")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddTransient<IConfigureOptions<AuditTrailOptions>, UserAuditTrailEventConfiguration>();
+        services.AddTransient<IConfigureOptions<AuditTrailOptions>, UserAuditTrailEventConfiguration>();
 
-            services.AddScoped<UserEventHandler, UserEventHandler>()
-                .AddScoped<IUserEventHandler>(sp => sp.GetRequiredService<UserEventHandler>())
-                .AddScoped<ILoginFormEvent>(sp => sp.GetRequiredService<UserEventHandler>());
+        services.AddScoped<UserEventHandler, UserEventHandler>()
+            .AddScoped<IUserEventHandler>(sp => sp.GetRequiredService<UserEventHandler>())
+            .AddScoped<ILoginFormEvent>(sp => sp.GetRequiredService<UserEventHandler>());
 
-            services.AddScoped<IDisplayDriver<AuditTrailEvent>, AuditTrailUserEventDisplayDriver>();
-        }
+        services.AddScoped<IDisplayDriver<AuditTrailEvent>, AuditTrailUserEventDisplayDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ViewModels/AuditTrailUserEventDetailViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ViewModels/AuditTrailUserEventDetailViewModel.cs
index 570dbe04658..b3e19981406 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ViewModels/AuditTrailUserEventDetailViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ViewModels/AuditTrailUserEventDetailViewModel.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Users.AuditTrail.ViewModels
+namespace OrchardCore.Users.AuditTrail.ViewModels;
+
+public class AuditTrailUserEventDetailViewModel : AuditTrailUserEventViewModel
 {
-    public class AuditTrailUserEventDetailViewModel : AuditTrailUserEventViewModel
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ViewModels/AuditTrailUserEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ViewModels/AuditTrailUserEventViewModel.cs
index 9629749dbdd..0bdc2171dd7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ViewModels/AuditTrailUserEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/ViewModels/AuditTrailUserEventViewModel.cs
@@ -2,18 +2,17 @@
 using OrchardCore.AuditTrail.Models;
 using OrchardCore.Users.AuditTrail.Models;
 
-namespace OrchardCore.Users.AuditTrail.ViewModels
+namespace OrchardCore.Users.AuditTrail.ViewModels;
+
+public class AuditTrailUserEventViewModel
 {
-    public class AuditTrailUserEventViewModel
-    {
-        public string Name { get; set; }
-        public string UserName { get; set; }
-        public string UserId { get; set; }
+    public string Name { get; set; }
+    public string UserName { get; set; }
+    public string UserId { get; set; }
 
-        [BindNever]
-        public AuditTrailUserEvent UserEvent { get; set; }
+    [BindNever]
+    public AuditTrailUserEvent UserEvent { get; set; }
 
-        [BindNever]
-        public AuditTrailEvent AuditTrailEvent { get; set; }
-    }
+    [BindNever]
+    public AuditTrailEvent AuditTrailEvent { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/CacheTicketStoreStartup.cs b/src/OrchardCore.Modules/OrchardCore.Users/CacheTicketStoreStartup.cs
index 5483a0c5c86..4903d7605d9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/CacheTicketStoreStartup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/CacheTicketStoreStartup.cs
@@ -1,14 +1,13 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Users.Authentication
+namespace OrchardCore.Users.Authentication;
+
+[Feature("OrchardCore.Users.Authentication.CacheTicketStore")]
+public sealed class CacheTicketStoreStartup : StartupBase
 {
-    [Feature("OrchardCore.Users.Authentication.CacheTicketStore")]
-    public sealed class CacheTicketStoreStartup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.ConfigureOptions<CookieAuthenticationOptionsConfigure>();
-        }
+        services.ConfigureOptions<CookieAuthenticationOptionsConfigure>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Commands/UserCommands.cs b/src/OrchardCore.Modules/OrchardCore.Users/Commands/UserCommands.cs
index c86dfd638dd..f6945eac9e9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Commands/UserCommands.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Commands/UserCommands.cs
@@ -6,53 +6,52 @@
 using OrchardCore.Users.Models;
 using OrchardCore.Users.Services;
 
-namespace OrchardCore.Users.Commands
+namespace OrchardCore.Users.Commands;
+
+public class UserCommands : DefaultCommandHandler
 {
-    public class UserCommands : DefaultCommandHandler
-    {
-        private readonly IUserService _userService;
+    private readonly IUserService _userService;
 
-        public UserCommands(
-            IUserService userService,
-            IStringLocalizer<UserCommands> localizer) : base(localizer)
-        {
-            _userService = userService;
-        }
+    public UserCommands(
+        IUserService userService,
+        IStringLocalizer<UserCommands> localizer) : base(localizer)
+    {
+        _userService = userService;
+    }
 
-        [OrchardSwitch]
-        public string UserName { get; set; }
+    [OrchardSwitch]
+    public string UserName { get; set; }
 
-        [OrchardSwitch]
-        public string Password { get; set; }
+    [OrchardSwitch]
+    public string Password { get; set; }
 
-        [OrchardSwitch]
-        public string Email { get; set; }
+    [OrchardSwitch]
+    public string Email { get; set; }
 
-        [OrchardSwitch]
-        public string PhoneNumber { get; set; }
+    [OrchardSwitch]
+    public string PhoneNumber { get; set; }
 
-        [OrchardSwitch]
-        public string Roles { get; set; }
+    [OrchardSwitch]
+    public string Roles { get; set; }
 
-        [CommandName("createUser")]
-        [CommandHelp("createUser /UserName:<username> /Password:<password> /Email:<email> /PhoneNumber:<phonenumber> /Roles:{rolename,rolename,...}\r\n\t" + "Creates a new User")]
-        [OrchardSwitches("UserName,Password,Email,PhoneNumber,Roles")]
-        public async Task CreateUserAsync()
-        {
-            var roleNames = (Roles ?? "").Split(',', StringSplitOptions.RemoveEmptyEntries).ToArray();
+    [CommandName("createUser")]
+    [CommandHelp("createUser /UserName:<username> /Password:<password> /Email:<email> /PhoneNumber:<phonenumber> /Roles:{rolename,rolename,...}\r\n\t" + "Creates a new User")]
+    [OrchardSwitches("UserName,Password,Email,PhoneNumber,Roles")]
+    public async Task CreateUserAsync()
+    {
+        var roleNames = (Roles ?? "").Split(',', StringSplitOptions.RemoveEmptyEntries).ToArray();
 
-            var valid = true;
+        var valid = true;
 
-            await _userService.CreateUserAsync(new User { UserName = UserName, Email = Email, PhoneNumber = PhoneNumber, RoleNames = roleNames, EmailConfirmed = true }, Password, (key, message) =>
-            {
-                valid = false;
-                Context.Output.WriteLine(message);
-            });
+        await _userService.CreateUserAsync(new User { UserName = UserName, Email = Email, PhoneNumber = PhoneNumber, RoleNames = roleNames, EmailConfirmed = true }, Password, (key, message) =>
+        {
+            valid = false;
+            Context.Output.WriteLine(message);
+        });
 
-            if (valid)
-            {
-                Context.Output.WriteLine(S["User created successfully"]);
-            }
+        if (valid)
+        {
+            Context.Output.WriteLine(S["User created successfully"]);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs b/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs
index 6dcf4adf19d..3d5eb15f5be 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs
@@ -31,937 +31,936 @@
 using YesSql.Services;
 using SignInResult = Microsoft.AspNetCore.Identity.SignInResult;
 
-namespace OrchardCore.Users.Controllers
+namespace OrchardCore.Users.Controllers;
+
+[Authorize]
+public class AccountController : AccountBaseController
 {
-    [Authorize]
-    public class AccountController : AccountBaseController
+    public const string DefaultExternalLoginProtector = "DefaultExternalLogin";
+
+    private readonly IUserService _userService;
+    private readonly SignInManager<IUser> _signInManager;
+    private readonly UserManager<IUser> _userManager;
+    private readonly ILogger _logger;
+    private readonly ISiteService _siteService;
+    private readonly IEnumerable<ILoginFormEvent> _accountEvents;
+    private readonly IDataProtectionProvider _dataProtectionProvider;
+    private readonly IShellFeaturesManager _shellFeaturesManager;
+    private readonly IDisplayManager<LoginForm> _loginFormDisplayManager;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly INotifier _notifier;
+    private readonly IClock _clock;
+    private readonly IDistributedCache _distributedCache;
+    private readonly IEnumerable<IExternalLoginEventHandler> _externalLoginHandlers;
+    private readonly IdentityOptions _identityOptions;
+
+    private static readonly JsonMergeSettings _jsonMergeSettings = new()
     {
-        public const string DefaultExternalLoginProtector = "DefaultExternalLogin";
-
-        private readonly IUserService _userService;
-        private readonly SignInManager<IUser> _signInManager;
-        private readonly UserManager<IUser> _userManager;
-        private readonly ILogger _logger;
-        private readonly ISiteService _siteService;
-        private readonly IEnumerable<ILoginFormEvent> _accountEvents;
-        private readonly IDataProtectionProvider _dataProtectionProvider;
-        private readonly IShellFeaturesManager _shellFeaturesManager;
-        private readonly IDisplayManager<LoginForm> _loginFormDisplayManager;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly INotifier _notifier;
-        private readonly IClock _clock;
-        private readonly IDistributedCache _distributedCache;
-        private readonly IEnumerable<IExternalLoginEventHandler> _externalLoginHandlers;
-        private readonly IdentityOptions _identityOptions;
-
-        private static readonly JsonMergeSettings _jsonMergeSettings = new()
-        {
-            MergeArrayHandling = MergeArrayHandling.Replace,
-            MergeNullValueHandling = MergeNullValueHandling.Merge
-        };
+        MergeArrayHandling = MergeArrayHandling.Replace,
+        MergeNullValueHandling = MergeNullValueHandling.Merge
+    };
+
+    protected readonly IHtmlLocalizer H;
+    protected readonly IStringLocalizer S;
+
+    public AccountController(
+        IUserService userService,
+        SignInManager<IUser> signInManager,
+        UserManager<IUser> userManager,
+        ILogger<AccountController> logger,
+        ISiteService siteService,
+        IHtmlLocalizer<AccountController> htmlLocalizer,
+        IStringLocalizer<AccountController> stringLocalizer,
+        IEnumerable<ILoginFormEvent> accountEvents,
+        INotifier notifier,
+        IClock clock,
+        IDistributedCache distributedCache,
+        IDataProtectionProvider dataProtectionProvider,
+        IShellFeaturesManager shellFeaturesManager,
+        IDisplayManager<LoginForm> loginFormDisplayManager,
+        IUpdateModelAccessor updateModelAccessor,
+        IEnumerable<IExternalLoginEventHandler> externalLoginHandlers,
+        IOptions<IdentityOptions> identityOptions)
+    {
+        _signInManager = signInManager;
+        _userManager = userManager;
+        _userService = userService;
+        _logger = logger;
+        _siteService = siteService;
+        _accountEvents = accountEvents;
+        _notifier = notifier;
+        _clock = clock;
+        _distributedCache = distributedCache;
+        _dataProtectionProvider = dataProtectionProvider;
+        _shellFeaturesManager = shellFeaturesManager;
+        _loginFormDisplayManager = loginFormDisplayManager;
+        _updateModelAccessor = updateModelAccessor;
+        _externalLoginHandlers = externalLoginHandlers;
+        _identityOptions = identityOptions.Value;
+
+        H = htmlLocalizer;
+        S = stringLocalizer;
+    }
 
-        protected readonly IHtmlLocalizer H;
-        protected readonly IStringLocalizer S;
-
-        public AccountController(
-            IUserService userService,
-            SignInManager<IUser> signInManager,
-            UserManager<IUser> userManager,
-            ILogger<AccountController> logger,
-            ISiteService siteService,
-            IHtmlLocalizer<AccountController> htmlLocalizer,
-            IStringLocalizer<AccountController> stringLocalizer,
-            IEnumerable<ILoginFormEvent> accountEvents,
-            INotifier notifier,
-            IClock clock,
-            IDistributedCache distributedCache,
-            IDataProtectionProvider dataProtectionProvider,
-            IShellFeaturesManager shellFeaturesManager,
-            IDisplayManager<LoginForm> loginFormDisplayManager,
-            IUpdateModelAccessor updateModelAccessor,
-            IEnumerable<IExternalLoginEventHandler> externalLoginHandlers,
-            IOptions<IdentityOptions> identityOptions)
-        {
-            _signInManager = signInManager;
-            _userManager = userManager;
-            _userService = userService;
-            _logger = logger;
-            _siteService = siteService;
-            _accountEvents = accountEvents;
-            _notifier = notifier;
-            _clock = clock;
-            _distributedCache = distributedCache;
-            _dataProtectionProvider = dataProtectionProvider;
-            _shellFeaturesManager = shellFeaturesManager;
-            _loginFormDisplayManager = loginFormDisplayManager;
-            _updateModelAccessor = updateModelAccessor;
-            _externalLoginHandlers = externalLoginHandlers;
-            _identityOptions = identityOptions.Value;
-
-            H = htmlLocalizer;
-            S = stringLocalizer;
-        }
-
-        [HttpGet]
-        [AllowAnonymous]
-        public async Task<IActionResult> Login(string returnUrl = null)
-        {
-            if (HttpContext.User?.Identity?.IsAuthenticated ?? false)
-            {
-                returnUrl = null;
-            }
+    [HttpGet]
+    [AllowAnonymous]
+    public async Task<IActionResult> Login(string returnUrl = null)
+    {
+        if (HttpContext.User?.Identity?.IsAuthenticated ?? false)
+        {
+            returnUrl = null;
+        }
 
-            // Clear the existing external cookie to ensure a clean login process.
-            await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
+        // Clear the existing external cookie to ensure a clean login process.
+        await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
 
-            var loginSettings = await _siteService.GetSettingsAsync<LoginSettings>();
-            if (loginSettings.UseExternalProviderIfOnlyOneDefined)
+        var loginSettings = await _siteService.GetSettingsAsync<LoginSettings>();
+        if (loginSettings.UseExternalProviderIfOnlyOneDefined)
+        {
+            var schemes = await _signInManager.GetExternalAuthenticationSchemesAsync();
+            if (schemes.Count() == 1)
             {
-                var schemes = await _signInManager.GetExternalAuthenticationSchemesAsync();
-                if (schemes.Count() == 1)
-                {
-                    var dataProtector = _dataProtectionProvider.CreateProtector(DefaultExternalLoginProtector)
-                                            .ToTimeLimitedDataProtector();
+                var dataProtector = _dataProtectionProvider.CreateProtector(DefaultExternalLoginProtector)
+                                        .ToTimeLimitedDataProtector();
 
-                    var token = Guid.NewGuid();
-                    var expiration = new TimeSpan(0, 0, 5);
-                    var protectedToken = dataProtector.Protect(token.ToString(), _clock.UtcNow.Add(expiration));
-                    await _distributedCache.SetAsync(token.ToString(), token.ToByteArray(), new DistributedCacheEntryOptions() { AbsoluteExpirationRelativeToNow = expiration });
+                var token = Guid.NewGuid();
+                var expiration = new TimeSpan(0, 0, 5);
+                var protectedToken = dataProtector.Protect(token.ToString(), _clock.UtcNow.Add(expiration));
+                await _distributedCache.SetAsync(token.ToString(), token.ToByteArray(), new DistributedCacheEntryOptions() { AbsoluteExpirationRelativeToNow = expiration });
 
-                    return RedirectToAction(nameof(DefaultExternalLogin), new { protectedToken, returnUrl });
-                }
+                return RedirectToAction(nameof(DefaultExternalLogin), new { protectedToken, returnUrl });
             }
+        }
 
-            var formShape = await _loginFormDisplayManager.BuildEditorAsync(_updateModelAccessor.ModelUpdater, false);
+        var formShape = await _loginFormDisplayManager.BuildEditorAsync(_updateModelAccessor.ModelUpdater, false);
 
-            CopyTempDataErrorsToModelState();
+        CopyTempDataErrorsToModelState();
 
-            ViewData["ReturnUrl"] = returnUrl;
+        ViewData["ReturnUrl"] = returnUrl;
 
-            return View(formShape);
-        }
+        return View(formShape);
+    }
 
-        [HttpGet]
-        [AllowAnonymous]
-        public async Task<IActionResult> DefaultExternalLogin(string protectedToken, string returnUrl = null)
+    [HttpGet]
+    [AllowAnonymous]
+    public async Task<IActionResult> DefaultExternalLogin(string protectedToken, string returnUrl = null)
+    {
+        var loginSettings = await _siteService.GetSettingsAsync<LoginSettings>();
+        if (loginSettings.UseExternalProviderIfOnlyOneDefined)
         {
-            var loginSettings = await _siteService.GetSettingsAsync<LoginSettings>();
-            if (loginSettings.UseExternalProviderIfOnlyOneDefined)
+            var schemes = await _signInManager.GetExternalAuthenticationSchemesAsync();
+            if (schemes.Count() == 1)
             {
-                var schemes = await _signInManager.GetExternalAuthenticationSchemesAsync();
-                if (schemes.Count() == 1)
-                {
-                    var dataProtector = _dataProtectionProvider.CreateProtector(DefaultExternalLoginProtector)
-                        .ToTimeLimitedDataProtector();
+                var dataProtector = _dataProtectionProvider.CreateProtector(DefaultExternalLoginProtector)
+                    .ToTimeLimitedDataProtector();
 
-                    try
+                try
+                {
+                    if (Guid.TryParse(dataProtector.Unprotect(protectedToken), out var token))
                     {
-                        if (Guid.TryParse(dataProtector.Unprotect(protectedToken), out var token))
+                        var tokenBytes = await _distributedCache.GetAsync(token.ToString());
+                        var cacheToken = new Guid(tokenBytes);
+                        if (token.Equals(cacheToken))
                         {
-                            var tokenBytes = await _distributedCache.GetAsync(token.ToString());
-                            var cacheToken = new Guid(tokenBytes);
-                            if (token.Equals(cacheToken))
-                            {
-                                return ExternalLogin(schemes.First().Name, returnUrl);
-                            }
+                            return ExternalLogin(schemes.First().Name, returnUrl);
                         }
                     }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "An error occurred while validating {defaultExternalLogin} token", DefaultExternalLoginProtector);
-                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "An error occurred while validating {defaultExternalLogin} token", DefaultExternalLoginProtector);
                 }
             }
-
-            return RedirectToAction(nameof(Login));
         }
 
-        [HttpPost]
-        [AllowAnonymous]
-        [ValidateAntiForgeryToken]
-        [ActionName(nameof(Login))]
-        public async Task<IActionResult> LoginPOST(string returnUrl = null)
-        {
-            ViewData["ReturnUrl"] = returnUrl;
+        return RedirectToAction(nameof(Login));
+    }
 
-            var model = new LoginForm();
+    [HttpPost]
+    [AllowAnonymous]
+    [ValidateAntiForgeryToken]
+    [ActionName(nameof(Login))]
+    public async Task<IActionResult> LoginPOST(string returnUrl = null)
+    {
+        ViewData["ReturnUrl"] = returnUrl;
 
-            var formShape = await _loginFormDisplayManager.UpdateEditorAsync(model, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
+        var model = new LoginForm();
 
-            var disableLocalLogin = (await _siteService.GetSettingsAsync<LoginSettings>()).DisableLocalLogin;
+        var formShape = await _loginFormDisplayManager.UpdateEditorAsync(model, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
 
-            if (disableLocalLogin)
-            {
-                ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
-            }
-            else
-            {
-                await _accountEvents.InvokeAsync((e, model, modelState) => e.LoggingInAsync(model.UserName, (key, message) => modelState.AddModelError(key, message)), model, ModelState, _logger);
+        var disableLocalLogin = (await _siteService.GetSettingsAsync<LoginSettings>()).DisableLocalLogin;
+
+        if (disableLocalLogin)
+        {
+            ModelState.AddModelError(string.Empty, S["Local login is disabled."]);
+        }
+        else
+        {
+            await _accountEvents.InvokeAsync((e, model, modelState) => e.LoggingInAsync(model.UserName, (key, message) => modelState.AddModelError(key, message)), model, ModelState, _logger);
 
-                if (ModelState.IsValid)
+            if (ModelState.IsValid)
+            {
+                var user = await _userService.GetUserAsync(model.UserName);
+                if (user != null)
                 {
-                    var user = await _userService.GetUserAsync(model.UserName);
-                    if (user != null)
+                    var result = await _signInManager.CheckPasswordSignInAsync(user, model.Password, lockoutOnFailure: true);
+                    if (result.Succeeded)
                     {
-                        var result = await _signInManager.CheckPasswordSignInAsync(user, model.Password, lockoutOnFailure: true);
-                        if (result.Succeeded)
+                        if (!await AddConfirmEmailErrorAsync(user) && !AddUserEnabledError(user))
                         {
-                            if (!await AddConfirmEmailErrorAsync(user) && !AddUserEnabledError(user))
-                            {
-                                result = await _signInManager.PasswordSignInAsync(user, model.Password, model.RememberMe, lockoutOnFailure: true);
+                            result = await _signInManager.PasswordSignInAsync(user, model.Password, model.RememberMe, lockoutOnFailure: true);
 
-                                if (result.Succeeded)
-                                {
-                                    _logger.LogInformation(1, "User logged in.");
-                                    await _accountEvents.InvokeAsync((e, user) => e.LoggedInAsync(user), user, _logger);
+                            if (result.Succeeded)
+                            {
+                                _logger.LogInformation(1, "User logged in.");
+                                await _accountEvents.InvokeAsync((e, user) => e.LoggedInAsync(user), user, _logger);
 
-                                    return await LoggedInActionResultAsync(user, returnUrl);
-                                }
+                                return await LoggedInActionResultAsync(user, returnUrl);
                             }
                         }
+                    }
 
-                        if (result.RequiresTwoFactor)
-                        {
-                            return RedirectToAction(nameof(TwoFactorAuthenticationController.LoginWithTwoFactorAuthentication),
-                                typeof(TwoFactorAuthenticationController).ControllerName(),
-                                new
-                                {
-                                    returnUrl,
-                                    model.RememberMe
-                                });
-                        }
-
-                        if (result.IsLockedOut)
-                        {
-                            ModelState.AddModelError(string.Empty, S["The account is locked out"]);
-                            await _accountEvents.InvokeAsync((e, user) => e.IsLockedOutAsync(user), user, _logger);
+                    if (result.RequiresTwoFactor)
+                    {
+                        return RedirectToAction(nameof(TwoFactorAuthenticationController.LoginWithTwoFactorAuthentication),
+                            typeof(TwoFactorAuthenticationController).ControllerName(),
+                            new
+                            {
+                                returnUrl,
+                                model.RememberMe
+                            });
+                    }
 
-                            return View();
-                        }
+                    if (result.IsLockedOut)
+                    {
+                        ModelState.AddModelError(string.Empty, S["The account is locked out"]);
+                        await _accountEvents.InvokeAsync((e, user) => e.IsLockedOutAsync(user), user, _logger);
 
-                        // Login failed with a known user.
-                        await _accountEvents.InvokeAsync((e, user) => e.LoggingInFailedAsync(user), user, _logger);
+                        return View();
                     }
 
-                    ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+                    // Login failed with a known user.
+                    await _accountEvents.InvokeAsync((e, user) => e.LoggingInFailedAsync(user), user, _logger);
                 }
 
-                // Login failed unknown user.
-                await _accountEvents.InvokeAsync((e, model) => e.LoggingInFailedAsync(model.UserName), model, _logger);
+                ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
             }
 
-            // If we got this far, something failed, redisplay form.
-            return View(formShape);
+            // Login failed unknown user.
+            await _accountEvents.InvokeAsync((e, model) => e.LoggingInFailedAsync(model.UserName), model, _logger);
         }
 
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<IActionResult> LogOff(string returnUrl = null)
-        {
-            await _signInManager.SignOutAsync();
-            _logger.LogInformation(4, "User logged out.");
+        // If we got this far, something failed, redisplay form.
+        return View(formShape);
+    }
 
-            return RedirectToLocal(returnUrl);
-        }
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> LogOff(string returnUrl = null)
+    {
+        await _signInManager.SignOutAsync();
+        _logger.LogInformation(4, "User logged out.");
 
-        [HttpGet]
-        public IActionResult ChangePassword(string returnUrl = null)
-        {
-            ViewData["ReturnUrl"] = returnUrl;
+        return RedirectToLocal(returnUrl);
+    }
 
-            return View();
-        }
+    [HttpGet]
+    public IActionResult ChangePassword(string returnUrl = null)
+    {
+        ViewData["ReturnUrl"] = returnUrl;
 
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<IActionResult> ChangePassword(ChangePasswordViewModel model, string returnUrl = null)
+        return View();
+    }
+
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> ChangePassword(ChangePasswordViewModel model, string returnUrl = null)
+    {
+        if (TryValidateModel(model) && ModelState.IsValid)
         {
-            if (TryValidateModel(model) && ModelState.IsValid)
+            var user = await _userService.GetAuthenticatedUserAsync(User);
+            if (await _userService.ChangePasswordAsync(user, model.CurrentPassword, model.Password, (key, message) => ModelState.AddModelError(key, message)))
             {
-                var user = await _userService.GetAuthenticatedUserAsync(User);
-                if (await _userService.ChangePasswordAsync(user, model.CurrentPassword, model.Password, (key, message) => ModelState.AddModelError(key, message)))
+                if (Url.IsLocalUrl(returnUrl))
                 {
-                    if (Url.IsLocalUrl(returnUrl))
-                    {
-                        await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
-
-                        return this.Redirect(returnUrl, true);
-                    }
+                    await _notifier.SuccessAsync(H["Your password has been changed successfully."]);
 
-                    return Redirect(Url.Action(nameof(ChangePasswordConfirmation)));
+                    return this.Redirect(returnUrl, true);
                 }
-            }
 
-            return View(model);
+                return Redirect(Url.Action(nameof(ChangePasswordConfirmation)));
+            }
         }
 
-        [HttpGet]
-        public IActionResult ChangePasswordConfirmation()
-            => View();
+        return View(model);
+    }
 
-        [HttpPost]
-        [AllowAnonymous]
-        [ValidateAntiForgeryToken]
-        public IActionResult ExternalLogin(string provider, string returnUrl = null)
-        {
-            // Request a redirect to the external login provider.
-            var redirectUrl = Url.Action(nameof(ExternalLoginCallback), new { returnUrl });
-            var properties = _signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
+    [HttpGet]
+    public IActionResult ChangePasswordConfirmation()
+        => View();
 
-            return Challenge(properties, provider);
-        }
+    [HttpPost]
+    [AllowAnonymous]
+    [ValidateAntiForgeryToken]
+    public IActionResult ExternalLogin(string provider, string returnUrl = null)
+    {
+        // Request a redirect to the external login provider.
+        var redirectUrl = Url.Action(nameof(ExternalLoginCallback), new { returnUrl });
+        var properties = _signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
 
-        private async Task<SignInResult> ExternalLoginSignInAsync(IUser user, ExternalLoginInfo info)
-        {
-            var externalClaims = info.Principal.GetSerializableClaims();
-            var userRoles = await _userManager.GetRolesAsync(user);
-            var userInfo = user as User;
+        return Challenge(properties, provider);
+    }
 
-            var context = new UpdateUserContext(user, info.LoginProvider, externalClaims, userInfo.Properties)
-            {
-                UserClaims = userInfo.UserClaims,
-                UserRoles = userRoles,
-            };
-            foreach (var item in _externalLoginHandlers)
+    private async Task<SignInResult> ExternalLoginSignInAsync(IUser user, ExternalLoginInfo info)
+    {
+        var externalClaims = info.Principal.GetSerializableClaims();
+        var userRoles = await _userManager.GetRolesAsync(user);
+        var userInfo = user as User;
+
+        var context = new UpdateUserContext(user, info.LoginProvider, externalClaims, userInfo.Properties)
+        {
+            UserClaims = userInfo.UserClaims,
+            UserRoles = userRoles,
+        };
+        foreach (var item in _externalLoginHandlers)
+        {
+            try
             {
-                try
-                {
-                    await item.UpdateUserAsync(context);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "{ExternalLoginHandler}.UpdateUserAsync threw an exception", item.GetType());
-                }
+                await item.UpdateUserAsync(context);
             }
-
-            if (await UpdateUserPropertiesAsync(_userManager, userInfo, context))
+            catch (Exception ex)
             {
-                await _userManager.UpdateAsync(user);
+                _logger.LogError(ex, "{ExternalLoginHandler}.UpdateUserAsync threw an exception", item.GetType());
             }
+        }
 
-            var result = await _signInManager.ExternalLoginSignInAsync(info.LoginProvider, info.ProviderKey, isPersistent: false, bypassTwoFactor: true);
+        if (await UpdateUserPropertiesAsync(_userManager, userInfo, context))
+        {
+            await _userManager.UpdateAsync(user);
+        }
 
-            if (result.Succeeded)
-            {
-                await _accountEvents.InvokeAsync((e, user) => e.LoggedInAsync(user), user, _logger);
+        var result = await _signInManager.ExternalLoginSignInAsync(info.LoginProvider, info.ProviderKey, isPersistent: false, bypassTwoFactor: true);
 
-                var identityResult = await _signInManager.UpdateExternalAuthenticationTokensAsync(info);
-                if (!identityResult.Succeeded)
-                {
-                    _logger.LogError("Error updating the external authentication tokens.");
-                }
-            }
-            else
+        if (result.Succeeded)
+        {
+            await _accountEvents.InvokeAsync((e, user) => e.LoggedInAsync(user), user, _logger);
+
+            var identityResult = await _signInManager.UpdateExternalAuthenticationTokensAsync(info);
+            if (!identityResult.Succeeded)
             {
-                await _accountEvents.InvokeAsync((e, user) => e.LoggingInFailedAsync(user), user, _logger);
+                _logger.LogError("Error updating the external authentication tokens.");
             }
-
-            return result;
         }
+        else
+        {
+            await _accountEvents.InvokeAsync((e, user) => e.LoggingInFailedAsync(user), user, _logger);
+        }
+
+        return result;
+    }
 
-        [HttpGet]
-        [AllowAnonymous]
-        public async Task<IActionResult> ExternalLoginCallback(string returnUrl = null, string remoteError = null)
+    [HttpGet]
+    [AllowAnonymous]
+    public async Task<IActionResult> ExternalLoginCallback(string returnUrl = null, string remoteError = null)
+    {
+        if (remoteError != null)
         {
-            if (remoteError != null)
-            {
-                _logger.LogError("Error from external provider: {Error}", remoteError);
-                ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+            _logger.LogError("Error from external provider: {Error}", remoteError);
+            ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
 
-                return RedirectToLogin(returnUrl);
-            }
+            return RedirectToLogin(returnUrl);
+        }
 
-            var info = await _signInManager.GetExternalLoginInfoAsync();
-            if (info == null)
-            {
-                _logger.LogError("Could not get external login info.");
-                ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
+        var info = await _signInManager.GetExternalLoginInfoAsync();
+        if (info == null)
+        {
+            _logger.LogError("Could not get external login info.");
+            ModelState.AddModelError(string.Empty, S["An error occurred in external provider."]);
 
-                return RedirectToLogin(returnUrl);
-            }
+            return RedirectToLogin(returnUrl);
+        }
 
-            var registrationSettings = await _siteService.GetSettingsAsync<RegistrationSettings>();
-            var iUser = await _userManager.FindByLoginAsync(info.LoginProvider, info.ProviderKey);
+        var registrationSettings = await _siteService.GetSettingsAsync<RegistrationSettings>();
+        var iUser = await _userManager.FindByLoginAsync(info.LoginProvider, info.ProviderKey);
 
-            CopyTempDataErrorsToModelState();
+        CopyTempDataErrorsToModelState();
 
-            if (iUser != null)
+        if (iUser != null)
+        {
+            if (!await AddConfirmEmailErrorAsync(iUser) && !AddUserEnabledError(iUser))
             {
-                if (!await AddConfirmEmailErrorAsync(iUser) && !AddUserEnabledError(iUser))
-                {
-                    await _accountEvents.InvokeAsync((e, user, modelState) => e.LoggingInAsync(user.UserName, (key, message) => modelState.AddModelError(key, message)), iUser, ModelState, _logger);
+                await _accountEvents.InvokeAsync((e, user, modelState) => e.LoggingInAsync(user.UserName, (key, message) => modelState.AddModelError(key, message)), iUser, ModelState, _logger);
 
-                    var signInResult = await ExternalLoginSignInAsync(iUser, info);
-                    if (signInResult.Succeeded)
-                    {
-                        return await LoggedInActionResultAsync(iUser, returnUrl, info);
-                    }
-                    else
-                    {
-                        ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
-                    }
+                var signInResult = await ExternalLoginSignInAsync(iUser, info);
+                if (signInResult.Succeeded)
+                {
+                    return await LoggedInActionResultAsync(iUser, returnUrl, info);
                 }
-            }
-            else
-            {
-                var email = info.GetEmail();
-
-                if (_identityOptions.User.RequireUniqueEmail && !string.IsNullOrWhiteSpace(email))
+                else
                 {
-                    iUser = await _userManager.FindByEmailAsync(email);
+                    ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
                 }
+            }
+        }
+        else
+        {
+            var email = info.GetEmail();
+
+            if (_identityOptions.User.RequireUniqueEmail && !string.IsNullOrWhiteSpace(email))
+            {
+                iUser = await _userManager.FindByEmailAsync(email);
+            }
 
-                ViewData["ReturnUrl"] = returnUrl;
-                ViewData["LoginProvider"] = info.LoginProvider;
+            ViewData["ReturnUrl"] = returnUrl;
+            ViewData["LoginProvider"] = info.LoginProvider;
 
-                if (iUser != null)
+            if (iUser != null)
+            {
+                if (iUser is User userToLink && registrationSettings.UsersMustValidateEmail && !userToLink.EmailConfirmed)
                 {
-                    if (iUser is User userToLink && registrationSettings.UsersMustValidateEmail && !userToLink.EmailConfirmed)
-                    {
-                        return RedirectToAction(nameof(EmailConfirmationController.ConfirmEmailSent),
-                            new
-                            {
-                                Area = UserConstants.Features.Users,
-                                Controller = typeof(EmailConfirmationController).ControllerName(),
-                                ReturnUrl = returnUrl,
-                            });
-                    }
+                    return RedirectToAction(nameof(EmailConfirmationController.ConfirmEmailSent),
+                        new
+                        {
+                            Area = UserConstants.Features.Users,
+                            Controller = typeof(EmailConfirmationController).ControllerName(),
+                            ReturnUrl = returnUrl,
+                        });
+                }
 
-                    // Link external login to an existing user
-                    ViewData["UserName"] = iUser.UserName;
+                // Link external login to an existing user
+                ViewData["UserName"] = iUser.UserName;
 
-                    return View(nameof(LinkExternalLogin));
-                }
+                return View(nameof(LinkExternalLogin));
+            }
 
-                // No user could be matched, check if a new user can register.
-                if (registrationSettings.UsersCanRegister == UserRegistrationType.NoRegistration)
+            // No user could be matched, check if a new user can register.
+            if (registrationSettings.UsersCanRegister == UserRegistrationType.NoRegistration)
+            {
+                var message = S["Site does not allow user registration."];
+                _logger.LogWarning("Site does not allow user registration.");
+                ModelState.AddModelError(string.Empty, message);
+            }
+            else
+            {
+                var externalLoginViewModel = new RegisterExternalLoginViewModel
                 {
-                    var message = S["Site does not allow user registration."];
-                    _logger.LogWarning("Site does not allow user registration.");
-                    ModelState.AddModelError(string.Empty, message);
-                }
-                else
+                    NoPassword = registrationSettings.NoPasswordForExternalUsers,
+                    NoEmail = registrationSettings.NoEmailForExternalUsers,
+                    NoUsername = registrationSettings.NoUsernameForExternalUsers,
+
+                    // If registrationSettings.NoUsernameForExternalUsers is true, this username will not be used
+                    UserName = await GenerateUsernameAsync(info),
+                    Email = info.GetEmail(),
+                };
+
+                // The user doesn't exist and no information required, we can create the account locally
+                // instead of redirecting to the ExternalLogin.
+                var noInformationRequired = externalLoginViewModel.NoPassword
+                    && externalLoginViewModel.NoEmail
+                    && externalLoginViewModel.NoUsername;
+
+                if (noInformationRequired)
                 {
-                    var externalLoginViewModel = new RegisterExternalLoginViewModel
+                    iUser = await this.RegisterUser(new RegisterUserForm()
                     {
-                        NoPassword = registrationSettings.NoPasswordForExternalUsers,
-                        NoEmail = registrationSettings.NoEmailForExternalUsers,
-                        NoUsername = registrationSettings.NoUsernameForExternalUsers,
-
-                        // If registrationSettings.NoUsernameForExternalUsers is true, this username will not be used
-                        UserName = await GenerateUsernameAsync(info),
-                        Email = info.GetEmail(),
-                    };
-
-                    // The user doesn't exist and no information required, we can create the account locally
-                    // instead of redirecting to the ExternalLogin.
-                    var noInformationRequired = externalLoginViewModel.NoPassword
-                        && externalLoginViewModel.NoEmail
-                        && externalLoginViewModel.NoUsername;
-
-                    if (noInformationRequired)
+                        UserName = externalLoginViewModel.UserName,
+                        Email = externalLoginViewModel.Email,
+                        Password = null,
+                    }, S["Confirm your account"], _logger);
+
+                    // If the registration was successful we can link the external provider and redirect the user.
+                    if (iUser != null)
                     {
-                        iUser = await this.RegisterUser(new RegisterUserForm()
+                        var identityResult = await _signInManager.UserManager.AddLoginAsync(iUser, new UserLoginInfo(info.LoginProvider, info.ProviderKey, info.ProviderDisplayName));
+                        if (identityResult.Succeeded)
                         {
-                            UserName = externalLoginViewModel.UserName,
-                            Email = externalLoginViewModel.Email,
-                            Password = null,
-                        }, S["Confirm your account"], _logger);
+                            _logger.LogInformation(3, "User account linked to {LoginProvider} provider.", info.LoginProvider);
 
-                        // If the registration was successful we can link the external provider and redirect the user.
-                        if (iUser != null)
-                        {
-                            var identityResult = await _signInManager.UserManager.AddLoginAsync(iUser, new UserLoginInfo(info.LoginProvider, info.ProviderKey, info.ProviderDisplayName));
-                            if (identityResult.Succeeded)
+                            // The login info must be linked before we consider a redirect, or the login info is lost.
+                            if (iUser is User user)
                             {
-                                _logger.LogInformation(3, "User account linked to {LoginProvider} provider.", info.LoginProvider);
-
-                                // The login info must be linked before we consider a redirect, or the login info is lost.
-                                if (iUser is User user)
+                                if (registrationSettings.UsersMustValidateEmail && !user.EmailConfirmed)
                                 {
-                                    if (registrationSettings.UsersMustValidateEmail && !user.EmailConfirmed)
-                                    {
-                                        return RedirectToAction(nameof(EmailConfirmationController.ConfirmEmailSent),
-                                            new
-                                            {
-                                                Area = UserConstants.Features.Users,
-                                                Controller = typeof(EmailConfirmationController).ControllerName(),
-                                                ReturnUrl = returnUrl,
-                                            });
-                                    }
-
-                                    if (registrationSettings.UsersAreModerated && !user.IsEnabled)
-                                    {
-                                        return RedirectToAction(nameof(RegistrationController.RegistrationPending),
-                                            new
-                                            {
-                                                Area = UserConstants.Features.Users,
-                                                Controller = typeof(RegistrationController).ControllerName(),
-                                                ReturnUrl = returnUrl,
-                                            });
-                                    }
+                                    return RedirectToAction(nameof(EmailConfirmationController.ConfirmEmailSent),
+                                        new
+                                        {
+                                            Area = UserConstants.Features.Users,
+                                            Controller = typeof(EmailConfirmationController).ControllerName(),
+                                            ReturnUrl = returnUrl,
+                                        });
                                 }
 
-                                // We have created/linked to the local user, so we must verify the login.
-                                // If it does not succeed, the user is not allowed to login
-                                var signInResult = await ExternalLoginSignInAsync(iUser, info);
-                                if (signInResult.Succeeded)
+                                if (registrationSettings.UsersAreModerated && !user.IsEnabled)
                                 {
-                                    return await LoggedInActionResultAsync(iUser, returnUrl, info);
+                                    return RedirectToAction(nameof(RegistrationController.RegistrationPending),
+                                        new
+                                        {
+                                            Area = UserConstants.Features.Users,
+                                            Controller = typeof(RegistrationController).ControllerName(),
+                                            ReturnUrl = returnUrl,
+                                        });
                                 }
+                            }
 
-                                ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
-
-                                return RedirectToLogin(returnUrl);
+                            // We have created/linked to the local user, so we must verify the login.
+                            // If it does not succeed, the user is not allowed to login
+                            var signInResult = await ExternalLoginSignInAsync(iUser, info);
+                            if (signInResult.Succeeded)
+                            {
+                                return await LoggedInActionResultAsync(iUser, returnUrl, info);
                             }
 
-                            AddIdentityErrors(identityResult);
+                            ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+
+                            return RedirectToLogin(returnUrl);
                         }
-                    }
 
-                    return View(nameof(RegisterExternalLogin), externalLoginViewModel);
+                        AddIdentityErrors(identityResult);
+                    }
                 }
-            }
 
-            return RedirectToLogin(returnUrl);
+                return View(nameof(RegisterExternalLogin), externalLoginViewModel);
+            }
         }
 
-        [HttpPost]
-        [AllowAnonymous]
-        [ValidateAntiForgeryToken]
-        public async Task<IActionResult> RegisterExternalLogin(RegisterExternalLoginViewModel model, string returnUrl = null)
+        return RedirectToLogin(returnUrl);
+    }
+
+    [HttpPost]
+    [AllowAnonymous]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> RegisterExternalLogin(RegisterExternalLoginViewModel model, string returnUrl = null)
+    {
+        var info = await _signInManager.GetExternalLoginInfoAsync();
+
+        if (info == null)
         {
-            var info = await _signInManager.GetExternalLoginInfoAsync();
+            _logger.LogWarning("Error loading external login info.");
 
-            if (info == null)
-            {
-                _logger.LogWarning("Error loading external login info.");
+            return NotFound();
+        }
 
-                return NotFound();
-            }
+        var settings = await _siteService.GetSettingsAsync<RegistrationSettings>();
 
-            var settings = await _siteService.GetSettingsAsync<RegistrationSettings>();
+        if (settings.UsersCanRegister == UserRegistrationType.NoRegistration)
+        {
+            _logger.LogWarning("Site does not allow user registration.");
 
-            if (settings.UsersCanRegister == UserRegistrationType.NoRegistration)
-            {
-                _logger.LogWarning("Site does not allow user registration.");
+            return NotFound();
+        }
 
-                return NotFound();
-            }
+        ViewData["ReturnUrl"] = returnUrl;
+        ViewData["LoginProvider"] = info.LoginProvider;
 
-            ViewData["ReturnUrl"] = returnUrl;
-            ViewData["LoginProvider"] = info.LoginProvider;
+        model.NoPassword = settings.NoPasswordForExternalUsers;
+        model.NoEmail = settings.NoEmailForExternalUsers;
+        model.NoUsername = settings.NoUsernameForExternalUsers;
 
-            model.NoPassword = settings.NoPasswordForExternalUsers;
-            model.NoEmail = settings.NoEmailForExternalUsers;
-            model.NoUsername = settings.NoUsernameForExternalUsers;
+        ModelState.Clear();
 
-            ModelState.Clear();
+        if (model.NoEmail && string.IsNullOrWhiteSpace(model.Email))
+        {
+            model.Email = info.Principal.FindFirstValue(ClaimTypes.Email) ?? info.Principal.FindFirstValue("email");
+        }
 
-            if (model.NoEmail && string.IsNullOrWhiteSpace(model.Email))
-            {
-                model.Email = info.Principal.FindFirstValue(ClaimTypes.Email) ?? info.Principal.FindFirstValue("email");
-            }
+        if (model.NoUsername && string.IsNullOrWhiteSpace(model.UserName))
+        {
+            model.UserName = await GenerateUsernameAsync(info);
+        }
 
-            if (model.NoUsername && string.IsNullOrWhiteSpace(model.UserName))
-            {
-                model.UserName = await GenerateUsernameAsync(info);
-            }
+        if (model.NoPassword)
+        {
+            model.Password = null;
+            model.ConfirmPassword = null;
+        }
+
+        if (TryValidateModel(model) && ModelState.IsValid)
+        {
+            var iUser = await this.RegisterUser(
+                new RegisterUserForm()
+                {
+                    UserName = model.UserName,
+                    Email = model.Email,
+                    Password = model.Password,
+                }, S["Confirm your account"], _logger);
 
-            if (model.NoPassword)
+            if (iUser is null)
             {
-                model.Password = null;
-                model.ConfirmPassword = null;
+                ModelState.AddModelError(string.Empty, "Registration Failed.");
             }
-
-            if (TryValidateModel(model) && ModelState.IsValid)
+            else
             {
-                var iUser = await this.RegisterUser(
-                    new RegisterUserForm()
-                    {
-                        UserName = model.UserName,
-                        Email = model.Email,
-                        Password = model.Password,
-                    }, S["Confirm your account"], _logger);
-
-                if (iUser is null)
-                {
-                    ModelState.AddModelError(string.Empty, "Registration Failed.");
-                }
-                else
+                var identityResult = await _signInManager.UserManager.AddLoginAsync(iUser, new UserLoginInfo(info.LoginProvider, info.ProviderKey, info.ProviderDisplayName));
+                if (identityResult.Succeeded)
                 {
-                    var identityResult = await _signInManager.UserManager.AddLoginAsync(iUser, new UserLoginInfo(info.LoginProvider, info.ProviderKey, info.ProviderDisplayName));
-                    if (identityResult.Succeeded)
-                    {
-                        _logger.LogInformation(3, "User account linked to {provider} provider.", info.LoginProvider);
+                    _logger.LogInformation(3, "User account linked to {provider} provider.", info.LoginProvider);
 
-                        // The login info must be linked before we consider a redirect, or the login info is lost.
-                        if (iUser is User user)
+                    // The login info must be linked before we consider a redirect, or the login info is lost.
+                    if (iUser is User user)
+                    {
+                        if (settings.UsersMustValidateEmail && !user.EmailConfirmed)
                         {
-                            if (settings.UsersMustValidateEmail && !user.EmailConfirmed)
-                            {
-                                return RedirectToAction(nameof(EmailConfirmationController.ConfirmEmailSent),
-                                    new
-                                    {
-                                        Area = UserConstants.Features.Users,
-                                        Controller = typeof(EmailConfirmationController).ControllerName(),
-                                        ReturnUrl = returnUrl,
-                                    });
-                            }
-
-                            if (settings.UsersAreModerated && !user.IsEnabled)
-                            {
-                                return RedirectToAction(nameof(RegistrationController.RegistrationPending),
-                                    new
-                                    {
-                                        Area = UserConstants.Features.Users,
-                                        Controller = typeof(RegistrationController).ControllerName(),
-                                        ReturnUrl = returnUrl,
-                                    });
-                            }
+                            return RedirectToAction(nameof(EmailConfirmationController.ConfirmEmailSent),
+                                new
+                                {
+                                    Area = UserConstants.Features.Users,
+                                    Controller = typeof(EmailConfirmationController).ControllerName(),
+                                    ReturnUrl = returnUrl,
+                                });
                         }
 
-                        // we have created/linked to the local user, so we must verify the login. If it does not succeed,
-                        // the user is not allowed to login
-                        var signInResult = await ExternalLoginSignInAsync(iUser, info);
-                        if (signInResult.Succeeded)
+                        if (settings.UsersAreModerated && !user.IsEnabled)
                         {
-                            return await LoggedInActionResultAsync(iUser, returnUrl, info);
+                            return RedirectToAction(nameof(RegistrationController.RegistrationPending),
+                                new
+                                {
+                                    Area = UserConstants.Features.Users,
+                                    Controller = typeof(RegistrationController).ControllerName(),
+                                    ReturnUrl = returnUrl,
+                                });
                         }
                     }
-                    AddIdentityErrors(identityResult);
+
+                    // we have created/linked to the local user, so we must verify the login. If it does not succeed,
+                    // the user is not allowed to login
+                    var signInResult = await ExternalLoginSignInAsync(iUser, info);
+                    if (signInResult.Succeeded)
+                    {
+                        return await LoggedInActionResultAsync(iUser, returnUrl, info);
+                    }
                 }
+                AddIdentityErrors(identityResult);
             }
-
-            return View(nameof(RegisterExternalLogin), model);
         }
 
-        [HttpPost]
-        [AllowAnonymous]
-        [ValidateAntiForgeryToken]
-        public async Task<IActionResult> LinkExternalLogin(LinkExternalLoginViewModel model, string returnUrl = null)
+        return View(nameof(RegisterExternalLogin), model);
+    }
+
+    [HttpPost]
+    [AllowAnonymous]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> LinkExternalLogin(LinkExternalLoginViewModel model, string returnUrl = null)
+    {
+        var info = await _signInManager.GetExternalLoginInfoAsync();
+
+        if (info == null)
         {
-            var info = await _signInManager.GetExternalLoginInfoAsync();
+            _logger.LogWarning("Error loading external login info.");
 
-            if (info == null)
-            {
-                _logger.LogWarning("Error loading external login info.");
+            return NotFound();
+        }
 
-                return NotFound();
-            }
+        var user = await _userManager.FindByEmailAsync(info.GetEmail());
 
-            var user = await _userManager.FindByEmailAsync(info.GetEmail());
+        if (user == null)
+        {
+            _logger.LogWarning("Suspicious login detected from external provider. {provider} with key [{providerKey}] for {identity}",
+                info.LoginProvider, info.ProviderKey, info.Principal?.Identity?.Name);
 
-            if (user == null)
-            {
-                _logger.LogWarning("Suspicious login detected from external provider. {provider} with key [{providerKey}] for {identity}",
-                    info.LoginProvider, info.ProviderKey, info.Principal?.Identity?.Name);
+            return RedirectToAction(nameof(Login));
+        }
 
-                return RedirectToAction(nameof(Login));
-            }
+        if (ModelState.IsValid)
+        {
+            await _accountEvents.InvokeAsync((e, model, modelState) => e.LoggingInAsync(user.UserName, (key, message) => modelState.AddModelError(key, message)), model, ModelState, _logger);
 
-            if (ModelState.IsValid)
+            var signInResult = await _signInManager.CheckPasswordSignInAsync(user, model.Password, false);
+            if (!signInResult.Succeeded)
             {
-                await _accountEvents.InvokeAsync((e, model, modelState) => e.LoggingInAsync(user.UserName, (key, message) => modelState.AddModelError(key, message)), model, ModelState, _logger);
-
-                var signInResult = await _signInManager.CheckPasswordSignInAsync(user, model.Password, false);
-                if (!signInResult.Succeeded)
-                {
-                    user = null;
-                    ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
-                }
-                else
+                user = null;
+                ModelState.AddModelError(string.Empty, S["Invalid login attempt."]);
+            }
+            else
+            {
+                var identityResult = await _signInManager.UserManager.AddLoginAsync(user, new UserLoginInfo(info.LoginProvider, info.ProviderKey, info.ProviderDisplayName));
+                if (identityResult.Succeeded)
                 {
-                    var identityResult = await _signInManager.UserManager.AddLoginAsync(user, new UserLoginInfo(info.LoginProvider, info.ProviderKey, info.ProviderDisplayName));
-                    if (identityResult.Succeeded)
+                    _logger.LogInformation(3, "User account linked to {provider} provider.", info.LoginProvider);
+                    // we have created/linked to the local user, so we must verify the login. If it does not succeed,
+                    // the user is not allowed to login
+                    if ((await ExternalLoginSignInAsync(user, info)).Succeeded)
                     {
-                        _logger.LogInformation(3, "User account linked to {provider} provider.", info.LoginProvider);
-                        // we have created/linked to the local user, so we must verify the login. If it does not succeed,
-                        // the user is not allowed to login
-                        if ((await ExternalLoginSignInAsync(user, info)).Succeeded)
-                        {
-                            return await LoggedInActionResultAsync(user, returnUrl, info);
-                        }
+                        return await LoggedInActionResultAsync(user, returnUrl, info);
                     }
-                    AddIdentityErrors(identityResult);
                 }
+                AddIdentityErrors(identityResult);
             }
+        }
 
-            CopyModelStateErrorsToTempData(null);
+        CopyModelStateErrorsToTempData(null);
 
-            return RedirectToAction(nameof(Login));
-        }
+        return RedirectToAction(nameof(Login));
+    }
 
-        [HttpGet]
-        public async Task<IActionResult> ExternalLogins()
+    [HttpGet]
+    public async Task<IActionResult> ExternalLogins()
+    {
+        var user = await _userManager.GetUserAsync(User);
+        if (user == null)
         {
-            var user = await _userManager.GetUserAsync(User);
-            if (user == null)
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var model = new ExternalLoginsViewModel { CurrentLogins = await _userManager.GetLoginsAsync(user) };
-            model.OtherLogins = (await _signInManager.GetExternalAuthenticationSchemesAsync())
-                .Where(auth => model.CurrentLogins.All(ul => auth.Name != ul.LoginProvider))
-                .ToList();
-            model.ShowRemoveButton = await _userManager.HasPasswordAsync(user) || model.CurrentLogins.Count > 1;
-            // model.StatusMessage = StatusMessage;
+        var model = new ExternalLoginsViewModel { CurrentLogins = await _userManager.GetLoginsAsync(user) };
+        model.OtherLogins = (await _signInManager.GetExternalAuthenticationSchemesAsync())
+            .Where(auth => model.CurrentLogins.All(ul => auth.Name != ul.LoginProvider))
+            .ToList();
+        model.ShowRemoveButton = await _userManager.HasPasswordAsync(user) || model.CurrentLogins.Count > 1;
+        // model.StatusMessage = StatusMessage;
 
-            CopyTempDataErrorsToModelState();
+        CopyTempDataErrorsToModelState();
 
-            return View(model);
-        }
+        return View(model);
+    }
 
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<IActionResult> LinkLogin(string provider)
-        {
-            // Clear the existing external cookie to ensure a clean login process.
-            await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> LinkLogin(string provider)
+    {
+        // Clear the existing external cookie to ensure a clean login process.
+        await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
+
+        // Request a redirect to the external login provider to link a login for the current user.
+        var redirectUrl = Url.Action(nameof(LinkLoginCallback));
+        var properties = _signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl, _userManager.GetUserId(User));
 
-            // Request a redirect to the external login provider to link a login for the current user.
-            var redirectUrl = Url.Action(nameof(LinkLoginCallback));
-            var properties = _signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl, _userManager.GetUserId(User));
+        return new ChallengeResult(provider, properties);
+    }
 
-            return new ChallengeResult(provider, properties);
+    [HttpGet]
+    public async Task<IActionResult> LinkLoginCallback()
+    {
+        var user = await _userManager.GetUserAsync(User);
+        if (user == null)
+        {
+            _logger.LogError("Unable to load user with ID '{UserId}'.", _userManager.GetUserId(User));
+
+            return RedirectToAction(nameof(Login));
         }
 
-        [HttpGet]
-        public async Task<IActionResult> LinkLoginCallback()
+        var info = await _signInManager.GetExternalLoginInfoAsync();
+        if (info == null)
         {
-            var user = await _userManager.GetUserAsync(User);
-            if (user == null)
-            {
-                _logger.LogError("Unable to load user with ID '{UserId}'.", _userManager.GetUserId(User));
+            _logger.LogError("Unexpected error occurred loading external login info for user '{UserName}'.", user.UserName);
 
-                return RedirectToAction(nameof(Login));
-            }
+            return RedirectToAction(nameof(Login));
+        }
 
-            var info = await _signInManager.GetExternalLoginInfoAsync();
-            if (info == null)
-            {
-                _logger.LogError("Unexpected error occurred loading external login info for user '{UserName}'.", user.UserName);
+        var result = await _userManager.AddLoginAsync(user, new UserLoginInfo(info.LoginProvider, info.ProviderKey, info.ProviderDisplayName));
+        if (!result.Succeeded)
+        {
+            _logger.LogError("Unexpected error occurred adding external login info for user '{UserName}'.", user.UserName);
 
-                return RedirectToAction(nameof(Login));
-            }
+            return RedirectToAction(nameof(Login));
+        }
 
-            var result = await _userManager.AddLoginAsync(user, new UserLoginInfo(info.LoginProvider, info.ProviderKey, info.ProviderDisplayName));
-            if (!result.Succeeded)
-            {
-                _logger.LogError("Unexpected error occurred adding external login info for user '{UserName}'.", user.UserName);
+        // Clear the existing external cookie to ensure a clean login process.
+        await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
+        // Perform External Login SignIn.
+        await ExternalLoginSignInAsync(user, info);
+        // StatusMessage = "The external login was added.";
 
-                return RedirectToAction(nameof(Login));
-            }
+        return RedirectToAction(nameof(ExternalLogins));
+    }
 
-            // Clear the existing external cookie to ensure a clean login process.
-            await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
-            // Perform External Login SignIn.
-            await ExternalLoginSignInAsync(user, info);
-            // StatusMessage = "The external login was added.";
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> RemoveLogin(RemoveLoginViewModel model)
+    {
+        var user = await _userManager.GetUserAsync(User);
+        if (user == null || user is not User u)
+        {
+            _logger.LogError("Unable to load user with ID '{UserId}'.", _userManager.GetUserId(User));
 
-            return RedirectToAction(nameof(ExternalLogins));
+            return RedirectToAction(nameof(Login));
         }
 
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<IActionResult> RemoveLogin(RemoveLoginViewModel model)
+        var result = await _userManager.RemoveLoginAsync(user, model.LoginProvider, model.ProviderKey);
+        if (!result.Succeeded)
         {
-            var user = await _userManager.GetUserAsync(User);
-            if (user == null || user is not User u)
-            {
-                _logger.LogError("Unable to load user with ID '{UserId}'.", _userManager.GetUserId(User));
+            _logger.LogError("Unexpected error occurred removing external login info for user '{UserName}'.", user.UserName);
 
-                return RedirectToAction(nameof(Login));
-            }
+            return RedirectToAction(nameof(Login));
+        }
 
-            var result = await _userManager.RemoveLoginAsync(user, model.LoginProvider, model.ProviderKey);
-            if (!result.Succeeded)
+        // Remove External Authentication Tokens.
+        foreach (var item in u.UserTokens.Where(c => c.LoginProvider == model.LoginProvider).ToList())
+        {
+            if (!(await _userManager.RemoveAuthenticationTokenAsync(user, model.LoginProvider, item.Name)).Succeeded)
             {
-                _logger.LogError("Unexpected error occurred removing external login info for user '{UserName}'.", user.UserName);
-
-                return RedirectToAction(nameof(Login));
+                _logger.LogError("Could not remove '{TokenName}' token while unlinking '{LoginProvider}' provider from user '{UserName}'.", item.Name, model.LoginProvider, user.UserName);
             }
+        }
 
-            // Remove External Authentication Tokens.
-            foreach (var item in u.UserTokens.Where(c => c.LoginProvider == model.LoginProvider).ToList())
-            {
-                if (!(await _userManager.RemoveAuthenticationTokenAsync(user, model.LoginProvider, item.Name)).Succeeded)
-                {
-                    _logger.LogError("Could not remove '{TokenName}' token while unlinking '{LoginProvider}' provider from user '{UserName}'.", item.Name, model.LoginProvider, user.UserName);
-                }
-            }
+        await _signInManager.SignInAsync(user, isPersistent: false);
+        // StatusMessage = "The external login was removed.";
+        return RedirectToAction(nameof(ExternalLogins));
+    }
 
-            await _signInManager.SignInAsync(user, isPersistent: false);
-            // StatusMessage = "The external login was removed.";
-            return RedirectToAction(nameof(ExternalLogins));
-        }
+    public static async Task<bool> UpdateUserPropertiesAsync(UserManager<IUser> userManager, User user, UpdateUserContext context)
+    {
+        await userManager.AddToRolesAsync(user, context.RolesToAdd.Distinct());
+        await userManager.RemoveFromRolesAsync(user, context.RolesToRemove.Distinct());
 
-        public static async Task<bool> UpdateUserPropertiesAsync(UserManager<IUser> userManager, User user, UpdateUserContext context)
+        var userNeedUpdate = false;
+        if (context.PropertiesToUpdate != null)
         {
-            await userManager.AddToRolesAsync(user, context.RolesToAdd.Distinct());
-            await userManager.RemoveFromRolesAsync(user, context.RolesToRemove.Distinct());
-
-            var userNeedUpdate = false;
-            if (context.PropertiesToUpdate != null)
-            {
-                var currentProperties = user.Properties.DeepClone();
-                user.Properties.Merge(context.PropertiesToUpdate, _jsonMergeSettings);
-                userNeedUpdate = !JsonNode.DeepEquals(currentProperties, user.Properties);
-            }
+            var currentProperties = user.Properties.DeepClone();
+            user.Properties.Merge(context.PropertiesToUpdate, _jsonMergeSettings);
+            userNeedUpdate = !JsonNode.DeepEquals(currentProperties, user.Properties);
+        }
 
-            var currentClaims = user.UserClaims
-                .Where(x => !string.IsNullOrEmpty(x.ClaimType))
-                .DistinctBy(x => new { x.ClaimType, x.ClaimValue })
-                .ToList();
+        var currentClaims = user.UserClaims
+            .Where(x => !string.IsNullOrEmpty(x.ClaimType))
+            .DistinctBy(x => new { x.ClaimType, x.ClaimValue })
+            .ToList();
 
-            var claimsChanged = false;
-            if (context.ClaimsToRemove?.Count > 0)
+        var claimsChanged = false;
+        if (context.ClaimsToRemove?.Count > 0)
+        {
+            var claimsToRemove = context.ClaimsToRemove.ToHashSet();
+            foreach (var item in claimsToRemove)
             {
-                var claimsToRemove = context.ClaimsToRemove.ToHashSet();
-                foreach (var item in claimsToRemove)
+                var exists = currentClaims.FirstOrDefault(claim => claim.ClaimType == item.ClaimType && claim.ClaimValue == item.ClaimValue);
+                if (exists is not null)
                 {
-                    var exists = currentClaims.FirstOrDefault(claim => claim.ClaimType == item.ClaimType && claim.ClaimValue == item.ClaimValue);
-                    if (exists is not null)
-                    {
-                        currentClaims.Remove(exists);
-                        claimsChanged = true;
-                    }
+                    currentClaims.Remove(exists);
+                    claimsChanged = true;
                 }
             }
+        }
 
-            if (context.ClaimsToUpdate?.Count > 0)
+        if (context.ClaimsToUpdate?.Count > 0)
+        {
+            foreach (var item in context.ClaimsToUpdate)
             {
-                foreach (var item in context.ClaimsToUpdate)
+                var existing = currentClaims.FirstOrDefault(claim => claim.ClaimType == item.ClaimType && claim.ClaimValue == item.ClaimValue);
+                if (existing is null)
                 {
-                    var existing = currentClaims.FirstOrDefault(claim => claim.ClaimType == item.ClaimType && claim.ClaimValue == item.ClaimValue);
-                    if (existing is null)
-                    {
-                        currentClaims.Add(item);
-                        claimsChanged = true;
-                    }
+                    currentClaims.Add(item);
+                    claimsChanged = true;
                 }
             }
-
-            if (claimsChanged)
-            {
-                user.UserClaims = currentClaims;
-                userNeedUpdate = true;
-            }
-
-            return userNeedUpdate;
         }
 
-        private async Task<string> GenerateUsernameAsync(ExternalLoginInfo info)
+        if (claimsChanged)
         {
-            var ret = string.Concat("u", IdGenerator.GenerateId());
-            var externalClaims = info?.Principal.GetSerializableClaims();
-            var userNames = new Dictionary<Type, string>();
+            user.UserClaims = currentClaims;
+            userNeedUpdate = true;
+        }
+
+        return userNeedUpdate;
+    }
+
+    private async Task<string> GenerateUsernameAsync(ExternalLoginInfo info)
+    {
+        var ret = string.Concat("u", IdGenerator.GenerateId());
+        var externalClaims = info?.Principal.GetSerializableClaims();
+        var userNames = new Dictionary<Type, string>();
 
-            foreach (var item in _externalLoginHandlers)
+        foreach (var item in _externalLoginHandlers)
+        {
+            try
             {
-                try
+                var userName = await item.GenerateUserName(info.LoginProvider, externalClaims.ToArray());
+                if (!string.IsNullOrWhiteSpace(userName))
                 {
-                    var userName = await item.GenerateUserName(info.LoginProvider, externalClaims.ToArray());
-                    if (!string.IsNullOrWhiteSpace(userName))
+                    // Set the return value to the username generated by the first IExternalLoginHandler.
+                    if (userNames.Count == 0)
                     {
-                        // Set the return value to the username generated by the first IExternalLoginHandler.
-                        if (userNames.Count == 0)
-                        {
-                            ret = userName;
-                        }
-                        userNames.Add(item.GetType(), userName);
+                        ret = userName;
                     }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "{externalLoginHandler} - IExternalLoginHandler.GenerateUserName threw an exception", item.GetType());
+                    userNames.Add(item.GetType(), userName);
                 }
             }
-
-            if (userNames.Count > 1)
+            catch (Exception ex)
             {
-                _logger.LogWarning("More than one IExternalLoginHandler generated username. Used first one registered, {externalLoginHandler}", userNames.FirstOrDefault().Key);
+                _logger.LogError(ex, "{externalLoginHandler} - IExternalLoginHandler.GenerateUserName threw an exception", item.GetType());
             }
-
-            return ret;
         }
 
-        private RedirectToActionResult RedirectToLogin(string returnUrl)
+        if (userNames.Count > 1)
         {
-            CopyModelStateErrorsToTempData();
-
-            return RedirectToAction(nameof(Login), new { returnUrl });
+            _logger.LogWarning("More than one IExternalLoginHandler generated username. Used first one registered, {externalLoginHandler}", userNames.FirstOrDefault().Key);
         }
 
-        private void CopyModelStateErrorsToTempData(string key = "")
-        {
-            var iix = 0;
+        return ret;
+    }
 
-            foreach (var state in ModelState)
-            {
-                if (key != null && state.Key != key)
-                {
-                    continue;
-                }
+    private RedirectToActionResult RedirectToLogin(string returnUrl)
+    {
+        CopyModelStateErrorsToTempData();
 
-                foreach (var item in state.Value.Errors)
-                {
-                    TempData[$"error_{iix++}"] = item.ErrorMessage;
-                }
-            }
-        }
+        return RedirectToAction(nameof(Login), new { returnUrl });
+    }
+
+    private void CopyModelStateErrorsToTempData(string key = "")
+    {
+        var iix = 0;
 
-        private void CopyTempDataErrorsToModelState()
+        foreach (var state in ModelState)
         {
-            foreach (var errorMessage in TempData.Where(x => x.Key.StartsWith("error")).Select(x => x.Value.ToString()))
+            if (key != null && state.Key != key)
             {
-                ModelState.AddModelError(string.Empty, errorMessage);
+                continue;
             }
-        }
 
-        private bool AddUserEnabledError(IUser user)
-        {
-            if (user is not User localUser || !localUser.IsEnabled)
+            foreach (var item in state.Value.Errors)
             {
-                ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
-
-                return true;
+                TempData[$"error_{iix++}"] = item.ErrorMessage;
             }
+        }
+    }
 
-            return false;
+    private void CopyTempDataErrorsToModelState()
+    {
+        foreach (var errorMessage in TempData.Where(x => x.Key.StartsWith("error")).Select(x => x.Value.ToString()))
+        {
+            ModelState.AddModelError(string.Empty, errorMessage);
         }
+    }
 
-        private async Task<bool> AddConfirmEmailErrorAsync(IUser user)
+    private bool AddUserEnabledError(IUser user)
+    {
+        if (user is not User localUser || !localUser.IsEnabled)
         {
-            var registrationFeatureIsAvailable = (await _shellFeaturesManager.GetAvailableFeaturesAsync())
-                .Any(feature => feature.Id == UserConstants.Features.UserRegistration);
+            ModelState.AddModelError(string.Empty, S["The specified user is not allowed to sign in."]);
 
-            if (!registrationFeatureIsAvailable)
-            {
-                return false;
-            }
+            return true;
+        }
 
-            var registrationSettings = await _siteService.GetSettingsAsync<RegistrationSettings>();
-            if (registrationSettings.UsersMustValidateEmail)
-            {
-                // Require that the users have a confirmed email before they can log on.
-                if (!await _userManager.IsEmailConfirmedAsync(user))
-                {
-                    ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
-                    return true;
-                }
-            }
+        return false;
+    }
+
+    private async Task<bool> AddConfirmEmailErrorAsync(IUser user)
+    {
+        var registrationFeatureIsAvailable = (await _shellFeaturesManager.GetAvailableFeaturesAsync())
+            .Any(feature => feature.Id == UserConstants.Features.UserRegistration);
 
+        if (!registrationFeatureIsAvailable)
+        {
             return false;
         }
 
-        private void AddIdentityErrors(IdentityResult result)
+        var registrationSettings = await _siteService.GetSettingsAsync<RegistrationSettings>();
+        if (registrationSettings.UsersMustValidateEmail)
         {
-            foreach (var error in result.Errors)
+            // Require that the users have a confirmed email before they can log on.
+            if (!await _userManager.IsEmailConfirmedAsync(user))
             {
-                ModelState.AddModelError(string.Empty, error.Description);
+                ModelState.AddModelError(string.Empty, S["You must confirm your email."]);
+                return true;
             }
         }
+
+        return false;
+    }
+
+    private void AddIdentityErrors(IdentityResult result)
+    {
+        foreach (var error in result.Errors)
+        {
+            ModelState.AddModelError(string.Empty, error.Description);
+        }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AdminController.cs
index 7cf771b6af6..b4b90263e16 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AdminController.cs
@@ -27,541 +27,540 @@
 using YesSql.Filters.Query;
 using YesSql.Services;
 
-namespace OrchardCore.Users.Controllers
+namespace OrchardCore.Users.Controllers;
+
+[Admin("Users/{action}/{id?}", "Users{action}")]
+public class AdminController : Controller
 {
-    [Admin("Users/{action}/{id?}", "Users{action}")]
-    public class AdminController : Controller
+    private readonly UserManager<IUser> _userManager;
+    private readonly IDisplayManager<UserIndexOptions> _userOptionsDisplayManager;
+    private readonly SignInManager<IUser> _signInManager;
+    private readonly ISession _session;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly PagerOptions _pagerOptions;
+    private readonly IDisplayManager<User> _userDisplayManager;
+    private readonly INotifier _notifier;
+    private readonly IUserService _userService;
+    private readonly IRoleService _roleService;
+    private readonly IUsersAdminListQueryService _usersAdminListQueryService;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly ILogger _logger;
+
+    protected readonly IHtmlLocalizer H;
+    protected readonly IStringLocalizer S;
+
+    public AdminController(
+        IDisplayManager<User> userDisplayManager,
+        IDisplayManager<UserIndexOptions> userOptionsDisplayManager,
+        SignInManager<IUser> signInManager,
+        IAuthorizationService authorizationService,
+        ISession session,
+        UserManager<IUser> userManager,
+        IUserService userService,
+        IRoleService roleService,
+        IUsersAdminListQueryService usersAdminListQueryService,
+        INotifier notifier,
+        IOptions<PagerOptions> pagerOptions,
+        IShapeFactory shapeFactory,
+        ILogger<AdminController> logger,
+        IHtmlLocalizer<AdminController> htmlLocalizer,
+        IStringLocalizer<AdminController> stringLocalizer,
+        IUpdateModelAccessor updateModelAccessor)
     {
-        private readonly UserManager<IUser> _userManager;
-        private readonly IDisplayManager<UserIndexOptions> _userOptionsDisplayManager;
-        private readonly SignInManager<IUser> _signInManager;
-        private readonly ISession _session;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly PagerOptions _pagerOptions;
-        private readonly IDisplayManager<User> _userDisplayManager;
-        private readonly INotifier _notifier;
-        private readonly IUserService _userService;
-        private readonly IRoleService _roleService;
-        private readonly IUsersAdminListQueryService _usersAdminListQueryService;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly ILogger _logger;
-
-        protected readonly IHtmlLocalizer H;
-        protected readonly IStringLocalizer S;
-
-        public AdminController(
-            IDisplayManager<User> userDisplayManager,
-            IDisplayManager<UserIndexOptions> userOptionsDisplayManager,
-            SignInManager<IUser> signInManager,
-            IAuthorizationService authorizationService,
-            ISession session,
-            UserManager<IUser> userManager,
-            IUserService userService,
-            IRoleService roleService,
-            IUsersAdminListQueryService usersAdminListQueryService,
-            INotifier notifier,
-            IOptions<PagerOptions> pagerOptions,
-            IShapeFactory shapeFactory,
-            ILogger<AdminController> logger,
-            IHtmlLocalizer<AdminController> htmlLocalizer,
-            IStringLocalizer<AdminController> stringLocalizer,
-            IUpdateModelAccessor updateModelAccessor)
-        {
-            _userDisplayManager = userDisplayManager;
-            _userOptionsDisplayManager = userOptionsDisplayManager;
-            _signInManager = signInManager;
-            _authorizationService = authorizationService;
-            _session = session;
-            _userManager = userManager;
-            _notifier = notifier;
-            _pagerOptions = pagerOptions.Value;
-            _userService = userService;
-            _roleService = roleService;
-            _usersAdminListQueryService = usersAdminListQueryService;
-            _updateModelAccessor = updateModelAccessor;
-            _shapeFactory = shapeFactory;
-            _logger = logger;
-            H = htmlLocalizer;
-            S = stringLocalizer;
-        }
-
-        public async Task<ActionResult> Index([ModelBinder(BinderType = typeof(UserFilterEngineModelBinder), Name = "q")] QueryFilterResult<User> queryFilterResult, PagerParameters pagerParameters)
-        {
-            // Check a dummy user account to see if the current user has permission to view users.
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ListUsers, new User()))
-            {
-                return Forbid();
-            }
+        _userDisplayManager = userDisplayManager;
+        _userOptionsDisplayManager = userOptionsDisplayManager;
+        _signInManager = signInManager;
+        _authorizationService = authorizationService;
+        _session = session;
+        _userManager = userManager;
+        _notifier = notifier;
+        _pagerOptions = pagerOptions.Value;
+        _userService = userService;
+        _roleService = roleService;
+        _usersAdminListQueryService = usersAdminListQueryService;
+        _updateModelAccessor = updateModelAccessor;
+        _shapeFactory = shapeFactory;
+        _logger = logger;
+        H = htmlLocalizer;
+        S = stringLocalizer;
+    }
 
-            var options = new UserIndexOptions
-            {
-                // Populate route values to maintain previous route data when generating page links
-                // await _userOptionsDisplayManager.UpdateEditorAsync(options, _updateModelAccessor.ModelUpdater, false);
-                FilterResult = queryFilterResult
-            };
-            options.FilterResult.MapTo(options);
+    public async Task<ActionResult> Index([ModelBinder(BinderType = typeof(UserFilterEngineModelBinder), Name = "q")] QueryFilterResult<User> queryFilterResult, PagerParameters pagerParameters)
+    {
+        // Check a dummy user account to see if the current user has permission to view users.
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ListUsers, new User()))
+        {
+            return Forbid();
+        }
 
-            // With the options populated we filter the query, allowing the filters to alter the options.
-            var users = await _usersAdminListQueryService.QueryAsync(options, _updateModelAccessor.ModelUpdater);
+        var options = new UserIndexOptions
+        {
+            // Populate route values to maintain previous route data when generating page links
+            // await _userOptionsDisplayManager.UpdateEditorAsync(options, _updateModelAccessor.ModelUpdater, false);
+            FilterResult = queryFilterResult
+        };
+        options.FilterResult.MapTo(options);
 
-            // The search text is provided back to the UI.
-            options.SearchText = options.FilterResult.ToString();
-            options.OriginalSearchText = options.SearchText;
+        // With the options populated we filter the query, allowing the filters to alter the options.
+        var users = await _usersAdminListQueryService.QueryAsync(options, _updateModelAccessor.ModelUpdater);
 
-            // Populate route values to maintain previous route data when generating page links.
-            options.RouteValues.TryAdd("q", options.FilterResult.ToString());
+        // The search text is provided back to the UI.
+        options.SearchText = options.FilterResult.ToString();
+        options.OriginalSearchText = options.SearchText;
 
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+        // Populate route values to maintain previous route data when generating page links.
+        options.RouteValues.TryAdd("q", options.FilterResult.ToString());
 
-            var count = await users.CountAsync();
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
 
-            var results = await users
-                .Skip(pager.GetStartIndex())
-                .Take(pager.PageSize)
-                .ListAsync();
+        var count = await users.CountAsync();
 
-            var pagerShape = await _shapeFactory.PagerAsync(pager, count, options.RouteValues);
+        var results = await users
+            .Skip(pager.GetStartIndex())
+            .Take(pager.PageSize)
+            .ListAsync();
 
-            var userEntries = new List<UserEntry>();
+        var pagerShape = await _shapeFactory.PagerAsync(pager, count, options.RouteValues);
 
-            foreach (var user in results)
-            {
-                userEntries.Add(new UserEntry
-                {
-                    UserId = user.UserId,
-                    Shape = await _userDisplayManager.BuildDisplayAsync(user, updater: _updateModelAccessor.ModelUpdater, displayType: "SummaryAdmin")
-                });
-            }
+        var userEntries = new List<UserEntry>();
 
-            options.UserFilters =
-            [
-                new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
-                new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
-                new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
-                // new SelectListItem() { Text = S["Approved"], Value = nameof(UsersFilter.Approved) },
-                // new SelectListItem() { Text = S["Email pending"], Value = nameof(UsersFilter.EmailPending) },
-                // new SelectListItem() { Text = S["Pending"], Value = nameof(UsersFilter.Pending) }
-            ];
-
-            options.UserSorts =
-            [
-                new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
-                new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
-                // new SelectListItem() { Text = S["Created date"], Value = nameof(UsersOrder.CreatedUtc) },
-                // new SelectListItem() { Text = S["Last Login date"], Value = nameof(UsersOrder.LastLoginUtc) }
-            ];
-
-            options.UsersBulkAction =
-            [
-                new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
-                new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
-                new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
-                new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
-            ];
-
-            var roleNames = new List<string>();
-
-            foreach (var roleName in await _roleService.GetRoleNamesAsync())
+        foreach (var user in results)
+        {
+            userEntries.Add(new UserEntry
             {
-                var permission = CommonPermissions.CreateListUsersInRolePermission(roleName);
-
-                if (!await _authorizationService.AuthorizeAsync(User, permission))
-                {
-                    continue;
-                }
+                UserId = user.UserId,
+                Shape = await _userDisplayManager.BuildDisplayAsync(user, updater: _updateModelAccessor.ModelUpdater, displayType: "SummaryAdmin")
+            });
+        }
 
-                roleNames.Add(roleName);
-            }
+        options.UserFilters =
+        [
+            new SelectListItem() { Text = S["All Users"], Value = nameof(UsersFilter.All), Selected = (options.Filter == UsersFilter.All) },
+            new SelectListItem() { Text = S["Enabled Users"], Value = nameof(UsersFilter.Enabled), Selected = (options.Filter == UsersFilter.Enabled) },
+            new SelectListItem() { Text = S["Disabled Users"], Value = nameof(UsersFilter.Disabled), Selected = (options.Filter == UsersFilter.Disabled) }
+            // new SelectListItem() { Text = S["Approved"], Value = nameof(UsersFilter.Approved) },
+            // new SelectListItem() { Text = S["Email pending"], Value = nameof(UsersFilter.EmailPending) },
+            // new SelectListItem() { Text = S["Pending"], Value = nameof(UsersFilter.Pending) }
+        ];
+
+        options.UserSorts =
+        [
+            new SelectListItem() { Text = S["Name"], Value = nameof(UsersOrder.Name), Selected = (options.Order == UsersOrder.Name) },
+            new SelectListItem() { Text = S["Email"], Value = nameof(UsersOrder.Email), Selected = (options.Order == UsersOrder.Email) },
+            // new SelectListItem() { Text = S["Created date"], Value = nameof(UsersOrder.CreatedUtc) },
+            // new SelectListItem() { Text = S["Last Login date"], Value = nameof(UsersOrder.LastLoginUtc) }
+        ];
+
+        options.UsersBulkAction =
+        [
+            new SelectListItem() { Text = S["Approve"], Value = nameof(UsersBulkAction.Approve) },
+            new SelectListItem() { Text = S["Enable"], Value = nameof(UsersBulkAction.Enable) },
+            new SelectListItem() { Text = S["Disable"], Value = nameof(UsersBulkAction.Disable) },
+            new SelectListItem() { Text = S["Delete"], Value = nameof(UsersBulkAction.Delete) }
+        ];
+
+        var roleNames = new List<string>();
+
+        foreach (var roleName in await _roleService.GetRoleNamesAsync())
+        {
+            var permission = CommonPermissions.CreateListUsersInRolePermission(roleName);
 
-            options.UserRoleFilters =
-            [
-                new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
-                new SelectListItem() { Text = S["Authenticated (no roles)"], Value = OrchardCoreConstants.Roles.Authenticated, Selected = string.Equals(options.SelectedRole, OrchardCoreConstants.Roles.Authenticated, StringComparison.OrdinalIgnoreCase) },
-                // TODO Candidate for dynamic localization.
-                .. roleNames.Select(roleName =>
-                    new SelectListItem
-                    {
-                        Text = roleName,
-                        Value = roleName.Contains(' ') ? $"\"{roleName}\"" : roleName,
-                        Selected = string.Equals(options.SelectedRole?.Trim('"'), roleName, StringComparison.OrdinalIgnoreCase)
-                    }),
-            ];
-
-            // Populate options pager summary values.
-            var startIndex = (pager.Page - 1) * pager.PageSize + 1;
-            options.StartIndex = startIndex;
-            options.EndIndex = startIndex + userEntries.Count - 1;
-            options.UsersCount = userEntries.Count;
-            options.TotalItemCount = count;
-
-            var header = await _userOptionsDisplayManager.BuildEditorAsync(options, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
-
-            var shapeViewModel = await _shapeFactory.CreateAsync<UsersIndexViewModel>("UsersAdminList", viewModel =>
+            if (!await _authorizationService.AuthorizeAsync(User, permission))
             {
-                viewModel.Users = userEntries;
-                viewModel.Pager = pagerShape;
-                viewModel.Options = options;
-                viewModel.Header = header;
-            });
+                continue;
+            }
 
-            return View(shapeViewModel);
+            roleNames.Add(roleName);
         }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.Filter")]
-        public async Task<ActionResult> IndexFilterPOST(UserIndexOptions options)
+        options.UserRoleFilters =
+        [
+            new SelectListItem() { Text = S["Any role"], Value = string.Empty, Selected = options.SelectedRole == string.Empty },
+            new SelectListItem() { Text = S["Authenticated (no roles)"], Value = OrchardCoreConstants.Roles.Authenticated, Selected = string.Equals(options.SelectedRole, OrchardCoreConstants.Roles.Authenticated, StringComparison.OrdinalIgnoreCase) },
+            // TODO Candidate for dynamic localization.
+            .. roleNames.Select(roleName =>
+                new SelectListItem
+                {
+                    Text = roleName,
+                    Value = roleName.Contains(' ') ? $"\"{roleName}\"" : roleName,
+                    Selected = string.Equals(options.SelectedRole?.Trim('"'), roleName, StringComparison.OrdinalIgnoreCase)
+                }),
+        ];
+
+        // Populate options pager summary values.
+        var startIndex = (pager.Page - 1) * pager.PageSize + 1;
+        options.StartIndex = startIndex;
+        options.EndIndex = startIndex + userEntries.Count - 1;
+        options.UsersCount = userEntries.Count;
+        options.TotalItemCount = count;
+
+        var header = await _userOptionsDisplayManager.BuildEditorAsync(options, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
+
+        var shapeViewModel = await _shapeFactory.CreateAsync<UsersIndexViewModel>("UsersAdminList", viewModel =>
         {
-            // When the user has typed something into the search input no further evaluation of the form post is required.
-            if (!string.Equals(options.SearchText, options.OriginalSearchText, StringComparison.OrdinalIgnoreCase))
-            {
-                return RedirectToAction(nameof(Index), new RouteValueDictionary { { "q", options.SearchText } });
-            }
+            viewModel.Users = userEntries;
+            viewModel.Pager = pagerShape;
+            viewModel.Options = options;
+            viewModel.Header = header;
+        });
 
-            // Evaluate the values provided in the form post and map them to the filter result and route values.
-            await _userOptionsDisplayManager.UpdateEditorAsync(options, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
+        return View(shapeViewModel);
+    }
 
-            // The route value must always be added after the editors have updated the models.
-            options.RouteValues.TryAdd("q", options.FilterResult.ToString());
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.Filter")]
+    public async Task<ActionResult> IndexFilterPOST(UserIndexOptions options)
+    {
+        // When the user has typed something into the search input no further evaluation of the form post is required.
+        if (!string.Equals(options.SearchText, options.OriginalSearchText, StringComparison.OrdinalIgnoreCase))
+        {
+            return RedirectToAction(nameof(Index), new RouteValueDictionary { { "q", options.SearchText } });
+        }
 
-            return RedirectToAction(nameof(Index), options.RouteValues);
+        // Evaluate the values provided in the form post and map them to the filter result and route values.
+        await _userOptionsDisplayManager.UpdateEditorAsync(options, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
+
+        // The route value must always be added after the editors have updated the models.
+        options.RouteValues.TryAdd("q", options.FilterResult.ToString());
+
+        return RedirectToAction(nameof(Index), options.RouteValues);
+    }
+
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<ActionResult> IndexPOST(UserIndexOptions options, IEnumerable<string> itemIds)
+    {
+        // Check a dummy user account to see if the current user has permission to manage it.
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ListUsers, new User()))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<ActionResult> IndexPOST(UserIndexOptions options, IEnumerable<string> itemIds)
+        if (itemIds != null && itemIds.Any())
         {
-            // Check a dummy user account to see if the current user has permission to manage it.
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ListUsers, new User()))
-            {
-                return Forbid();
-            }
+            var checkedUsers = await _session.Query<User, UserIndex>().Where(x => x.UserId.IsIn(itemIds)).ListAsync();
 
-            if (itemIds != null && itemIds.Any())
+            // Bulk actions require the ManageUsers permission on all the checked users.
+            // To prevent html injection we authorize each user before performing any operations.
+            foreach (var user in checkedUsers)
             {
-                var checkedUsers = await _session.Query<User, UserIndex>().Where(x => x.UserId.IsIn(itemIds)).ListAsync();
+                var canEditUser = await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditUsers, user);
+                var isSameUser = user.UserId == User.FindFirstValue(ClaimTypes.NameIdentifier);
 
-                // Bulk actions require the ManageUsers permission on all the checked users.
-                // To prevent html injection we authorize each user before performing any operations.
-                foreach (var user in checkedUsers)
+                switch (options.BulkAction)
                 {
-                    var canEditUser = await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditUsers, user);
-                    var isSameUser = user.UserId == User.FindFirstValue(ClaimTypes.NameIdentifier);
-
-                    switch (options.BulkAction)
-                    {
-                        case UsersBulkAction.None: break;
-                        case UsersBulkAction.Approve:
-                            if (canEditUser && !await _userManager.IsEmailConfirmedAsync(user))
-                            {
-                                var token = await _userManager.GenerateEmailConfirmationTokenAsync(user);
-                                await _userManager.ConfirmEmailAsync(user, token);
-                                await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
-                            }
-                            break;
-                        case UsersBulkAction.Delete:
-                            if (!isSameUser && await _authorizationService.AuthorizeAsync(User, CommonPermissions.DeleteUsers, user))
-                            {
-                                await _userManager.DeleteAsync(user);
-                                await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
-                            }
-                            break;
-                        case UsersBulkAction.Disable:
-                            if (!isSameUser && canEditUser)
-                            {
-                                user.IsEnabled = false;
-                                await _userManager.UpdateAsync(user);
-                                await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
-                            }
-                            break;
-                        case UsersBulkAction.Enable:
-                            if (!isSameUser && canEditUser)
-                            {
-                                user.IsEnabled = true;
-                                await _userManager.UpdateAsync(user);
-                                await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
-                            }
-                            break;
-                        default:
-                            throw new ArgumentOutOfRangeException(options.BulkAction.ToString(), "Invalid bulk options.");
-                    }
+                    case UsersBulkAction.None: break;
+                    case UsersBulkAction.Approve:
+                        if (canEditUser && !await _userManager.IsEmailConfirmedAsync(user))
+                        {
+                            var token = await _userManager.GenerateEmailConfirmationTokenAsync(user);
+                            await _userManager.ConfirmEmailAsync(user, token);
+                            await _notifier.SuccessAsync(H["User {0} successfully approved.", user.UserName]);
+                        }
+                        break;
+                    case UsersBulkAction.Delete:
+                        if (!isSameUser && await _authorizationService.AuthorizeAsync(User, CommonPermissions.DeleteUsers, user))
+                        {
+                            await _userManager.DeleteAsync(user);
+                            await _notifier.SuccessAsync(H["User {0} successfully deleted.", user.UserName]);
+                        }
+                        break;
+                    case UsersBulkAction.Disable:
+                        if (!isSameUser && canEditUser)
+                        {
+                            user.IsEnabled = false;
+                            await _userManager.UpdateAsync(user);
+                            await _notifier.SuccessAsync(H["User {0} successfully disabled.", user.UserName]);
+                        }
+                        break;
+                    case UsersBulkAction.Enable:
+                        if (!isSameUser && canEditUser)
+                        {
+                            user.IsEnabled = true;
+                            await _userManager.UpdateAsync(user);
+                            await _notifier.SuccessAsync(H["User {0} successfully enabled.", user.UserName]);
+                        }
+                        break;
+                    default:
+                        throw new ArgumentOutOfRangeException(options.BulkAction.ToString(), "Invalid bulk options.");
                 }
             }
-
-            return RedirectToAction(nameof(Index));
         }
 
-        public async Task<IActionResult> Create()
+        return RedirectToAction(nameof(Index));
+    }
+
+    public async Task<IActionResult> Create()
+    {
+        var user = new User();
+
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditUsers, user))
         {
-            var user = new User();
+            return Forbid();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditUsers, user))
-            {
-                return Forbid();
-            }
+        var shape = await _userDisplayManager.BuildEditorAsync(user, updater: _updateModelAccessor.ModelUpdater, isNew: true, string.Empty, string.Empty);
 
-            var shape = await _userDisplayManager.BuildEditorAsync(user, updater: _updateModelAccessor.ModelUpdater, isNew: true, string.Empty, string.Empty);
+        return View(shape);
+    }
 
-            return View(shape);
+    [HttpPost]
+    [ActionName(nameof(Create))]
+    public async Task<IActionResult> CreatePost([Bind(Prefix = "User.Password")] string password)
+    {
+        var user = new User();
+
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditUsers, user))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        [ActionName(nameof(Create))]
-        public async Task<IActionResult> CreatePost([Bind(Prefix = "User.Password")] string password)
+        var shape = await _userDisplayManager.UpdateEditorAsync(user, updater: _updateModelAccessor.ModelUpdater, isNew: true, string.Empty, string.Empty);
+
+        if (!ModelState.IsValid)
         {
-            var user = new User();
+            return View(shape);
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditUsers, user))
-            {
-                return Forbid();
-            }
+        await _userService.CreateUserAsync(user, password, ModelState.AddModelError);
 
-            var shape = await _userDisplayManager.UpdateEditorAsync(user, updater: _updateModelAccessor.ModelUpdater, isNew: true, string.Empty, string.Empty);
+        if (!ModelState.IsValid)
+        {
+            return View(shape);
+        }
 
-            if (!ModelState.IsValid)
-            {
-                return View(shape);
-            }
+        await _notifier.SuccessAsync(H["User created successfully."]);
 
-            await _userService.CreateUserAsync(user, password, ModelState.AddModelError);
+        return RedirectToAction(nameof(Index));
+    }
 
-            if (!ModelState.IsValid)
+    public async Task<IActionResult> Edit(string id, string returnUrl)
+    {
+        // When no id is provided we assume the user is trying to edit their own profile.
+        var editingOwnUser = false;
+        if (string.IsNullOrEmpty(id))
+        {
+            id = User.FindFirstValue(ClaimTypes.NameIdentifier);
+            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditOwnUser))
             {
-                return View(shape);
+                return Forbid();
             }
+            editingOwnUser = true;
+        }
 
-            await _notifier.SuccessAsync(H["User created successfully."]);
-
-            return RedirectToAction(nameof(Index));
+        if (await _userManager.FindByIdAsync(id) is not User user)
+        {
+            return NotFound();
         }
 
-        public async Task<IActionResult> Edit(string id, string returnUrl)
+        if (!editingOwnUser && !await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditUsers, user))
         {
-            // When no id is provided we assume the user is trying to edit their own profile.
-            var editingOwnUser = false;
-            if (string.IsNullOrEmpty(id))
-            {
-                id = User.FindFirstValue(ClaimTypes.NameIdentifier);
-                if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditOwnUser))
-                {
-                    return Forbid();
-                }
-                editingOwnUser = true;
-            }
+            return Forbid();
+        }
 
-            if (await _userManager.FindByIdAsync(id) is not User user)
-            {
-                return NotFound();
-            }
+        var shape = await _userDisplayManager.BuildEditorAsync(user, updater: _updateModelAccessor.ModelUpdater, isNew: false, string.Empty, string.Empty);
 
-            if (!editingOwnUser && !await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditUsers, user))
+        ViewData["ReturnUrl"] = returnUrl;
+
+        return View(shape);
+    }
+
+    [HttpPost]
+    [ActionName(nameof(Edit))]
+    public async Task<IActionResult> EditPost(string id, string returnUrl)
+    {
+        // When no id is provided we assume the user is trying to edit their own profile.
+        var editingOwnUser = false;
+        if (string.IsNullOrEmpty(id))
+        {
+            editingOwnUser = true;
+            id = User.FindFirstValue(ClaimTypes.NameIdentifier);
+            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditOwnUser))
             {
                 return Forbid();
             }
-
-            var shape = await _userDisplayManager.BuildEditorAsync(user, updater: _updateModelAccessor.ModelUpdater, isNew: false, string.Empty, string.Empty);
-
-            ViewData["ReturnUrl"] = returnUrl;
-
-            return View(shape);
         }
 
-        [HttpPost]
-        [ActionName(nameof(Edit))]
-        public async Task<IActionResult> EditPost(string id, string returnUrl)
+        if (await _userManager.FindByIdAsync(id) is not User user)
         {
-            // When no id is provided we assume the user is trying to edit their own profile.
-            var editingOwnUser = false;
-            if (string.IsNullOrEmpty(id))
-            {
-                editingOwnUser = true;
-                id = User.FindFirstValue(ClaimTypes.NameIdentifier);
-                if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditOwnUser))
-                {
-                    return Forbid();
-                }
-            }
+            return NotFound();
+        }
 
-            if (await _userManager.FindByIdAsync(id) is not User user)
-            {
-                return NotFound();
-            }
+        if (!editingOwnUser && !await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditUsers, user))
+        {
+            return Forbid();
+        }
 
-            if (!editingOwnUser && !await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditUsers, user))
-            {
-                return Forbid();
-            }
+        var shape = await _userDisplayManager.UpdateEditorAsync(user, updater: _updateModelAccessor.ModelUpdater, isNew: false, string.Empty, string.Empty);
 
-            var shape = await _userDisplayManager.UpdateEditorAsync(user, updater: _updateModelAccessor.ModelUpdater, isNew: false, string.Empty, string.Empty);
+        if (!ModelState.IsValid)
+        {
+            return View(shape);
+        }
 
-            if (!ModelState.IsValid)
-            {
-                return View(shape);
-            }
+        var result = await _userManager.UpdateAsync(user);
 
-            var result = await _userManager.UpdateAsync(user);
+        foreach (var error in result.Errors)
+        {
+            ModelState.AddModelError(string.Empty, error.Description);
+        }
 
-            foreach (var error in result.Errors)
-            {
-                ModelState.AddModelError(string.Empty, error.Description);
-            }
+        if (!ModelState.IsValid)
+        {
+            return View(shape);
+        }
 
-            if (!ModelState.IsValid)
-            {
-                return View(shape);
-            }
+        if (User.FindFirstValue(ClaimTypes.NameIdentifier) == user.UserId)
+        {
+            await _signInManager.RefreshSignInAsync(user);
+        }
 
-            if (User.FindFirstValue(ClaimTypes.NameIdentifier) == user.UserId)
-            {
-                await _signInManager.RefreshSignInAsync(user);
-            }
+        await _notifier.SuccessAsync(H["User updated successfully."]);
 
-            await _notifier.SuccessAsync(H["User updated successfully."]);
+        if (!string.IsNullOrEmpty(returnUrl))
+        {
+            return this.LocalRedirect(returnUrl, true);
+        }
 
-            if (!string.IsNullOrEmpty(returnUrl))
-            {
-                return this.LocalRedirect(returnUrl, true);
-            }
+        if (editingOwnUser)
+        {
+            return RedirectToAction(nameof(Edit));
+        }
 
-            if (editingOwnUser)
-            {
-                return RedirectToAction(nameof(Edit));
-            }
+        return RedirectToAction(nameof(Index));
+    }
 
-            return RedirectToAction(nameof(Index));
+    public async Task<IActionResult> Display(string id)
+    {
+        if (await _userManager.FindByIdAsync(id) is not User user)
+        {
+            return NotFound();
         }
 
-        public async Task<IActionResult> Display(string id)
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ViewUsers, user))
         {
-            if (await _userManager.FindByIdAsync(id) is not User user)
-            {
-                return NotFound();
-            }
+            return Forbid();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.ViewUsers, user))
-            {
-                return Forbid();
-            }
+        var model = await _userDisplayManager.BuildDisplayAsync(user, _updateModelAccessor.ModelUpdater, "DetailAdmin");
 
-            var model = await _userDisplayManager.BuildDisplayAsync(user, _updateModelAccessor.ModelUpdater, "DetailAdmin");
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost]
+    public async Task<IActionResult> Delete(string id)
+    {
+        if (await _userManager.FindByIdAsync(id) is not User user)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(string id)
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.DeleteUsers, user))
         {
-            if (await _userManager.FindByIdAsync(id) is not User user)
-            {
-                return NotFound();
-            }
+            return Forbid();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.DeleteUsers, user))
-            {
-                return Forbid();
-            }
+        var result = await _userManager.DeleteAsync(user);
+
+        if (result.Succeeded)
+        {
+            await _notifier.SuccessAsync(H["User deleted successfully."]);
+        }
+        else
+        {
+            await _session.CancelAsync();
 
-            var result = await _userManager.DeleteAsync(user);
+            await _notifier.ErrorAsync(H["Could not delete the user."]);
 
-            if (result.Succeeded)
+            foreach (var error in result.Errors)
             {
-                await _notifier.SuccessAsync(H["User deleted successfully."]);
+                await _notifier.ErrorAsync(H[error.Description]);
             }
-            else
-            {
-                await _session.CancelAsync();
-
-                await _notifier.ErrorAsync(H["Could not delete the user."]);
+        }
 
-                foreach (var error in result.Errors)
-                {
-                    await _notifier.ErrorAsync(H[error.Description]);
-                }
-            }
+        return RedirectToAction(nameof(Index));
+    }
 
-            return RedirectToAction(nameof(Index));
+    public async Task<IActionResult> EditPassword(string id)
+    {
+        if (await _userManager.FindByIdAsync(id) is not User user)
+        {
+            return NotFound();
         }
 
-        public async Task<IActionResult> EditPassword(string id)
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditUsers, user))
         {
-            if (await _userManager.FindByIdAsync(id) is not User user)
-            {
-                return NotFound();
-            }
+            return Forbid();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditUsers, user))
-            {
-                return Forbid();
-            }
+        var model = new ResetPasswordViewModel { UsernameOrEmail = user.UserName };
 
-            var model = new ResetPasswordViewModel { UsernameOrEmail = user.UserName };
+        return View(model);
+    }
 
-            return View(model);
+    [HttpPost]
+    public async Task<IActionResult> EditPassword(ResetPasswordViewModel model)
+    {
+        if (await _userService.GetUserAsync(model.UsernameOrEmail) is not User user)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> EditPassword(ResetPasswordViewModel model)
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditUsers, user))
         {
-            if (await _userService.GetUserAsync(model.UsernameOrEmail) is not User user)
-            {
-                return NotFound();
-            }
+            return Forbid();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditUsers, user))
-            {
-                return Forbid();
-            }
+        if (ModelState.IsValid)
+        {
+            var token = await _userManager.GeneratePasswordResetTokenAsync(user);
 
-            if (ModelState.IsValid)
+            if (await _userService.ResetPasswordAsync(model.UsernameOrEmail, token, model.NewPassword, ModelState.AddModelError))
             {
-                var token = await _userManager.GeneratePasswordResetTokenAsync(user);
-
-                if (await _userService.ResetPasswordAsync(model.UsernameOrEmail, token, model.NewPassword, ModelState.AddModelError))
-                {
-                    await _notifier.SuccessAsync(H["Password updated correctly."]);
+                await _notifier.SuccessAsync(H["Password updated correctly."]);
 
-                    return RedirectToAction(nameof(Index));
-                }
+                return RedirectToAction(nameof(Index));
             }
-
-            return View(model);
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Unlock(string id)
+        return View(model);
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Unlock(string id)
+    {
+        if (await _userManager.FindByIdAsync(id) is not User user)
         {
-            if (await _userManager.FindByIdAsync(id) is not User user)
-            {
-                return NotFound();
-            }
+            return NotFound();
+        }
 
-            if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditUsers, user))
-            {
-                return Forbid();
-            }
+        if (!await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditUsers, user))
+        {
+            return Forbid();
+        }
 
-            await _userManager.ResetAccessFailedCountAsync(user);
-            var result = await _userManager.SetLockoutEndDateAsync(user, null);
+        await _userManager.ResetAccessFailedCountAsync(user);
+        var result = await _userManager.SetLockoutEndDateAsync(user, null);
 
-            if (result.Succeeded)
-            {
-                await _notifier.SuccessAsync(H["User unlocked successfully."]);
-            }
-            else
-            {
-                await _session.CancelAsync();
+        if (result.Succeeded)
+        {
+            await _notifier.SuccessAsync(H["User unlocked successfully."]);
+        }
+        else
+        {
+            await _session.CancelAsync();
 
-                await _notifier.ErrorAsync(H["Could not unlock the user."]);
+            await _notifier.ErrorAsync(H["Could not unlock the user."]);
 
-                foreach (var error in result.Errors)
-                {
+            foreach (var error in result.Errors)
+            {
 #pragma warning disable CA2254 // Template should be a static expression
-                    _logger.LogWarning(error.Description);
+                _logger.LogWarning(error.Description);
 #pragma warning restore CA2254 // Template should be a static expression
-                }
             }
-
-            return RedirectToAction(nameof(Index));
         }
+
+        return RedirectToAction(nameof(Index));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Controllers/ChangeEmailController.cs b/src/OrchardCore.Modules/OrchardCore.Users/Controllers/ChangeEmailController.cs
index 9a07da48e68..e36286f854b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Controllers/ChangeEmailController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Controllers/ChangeEmailController.cs
@@ -10,92 +10,91 @@
 using OrchardCore.Users.Services;
 using OrchardCore.Users.ViewModels;
 
-namespace OrchardCore.Users.Controllers
+namespace OrchardCore.Users.Controllers;
+
+[Feature("OrchardCore.Users.ChangeEmail")]
+public class ChangeEmailController : Controller
 {
-    [Feature("OrchardCore.Users.ChangeEmail")]
-    public class ChangeEmailController : Controller
+    private readonly IUserService _userService;
+    private readonly UserManager<IUser> _userManager;
+    private readonly ISiteService _siteService;
+    protected readonly IStringLocalizer S;
+
+    public ChangeEmailController(
+        IUserService userService,
+        UserManager<IUser> userManager,
+        ISiteService siteService,
+        IStringLocalizer<ChangeEmailController> stringLocalizer)
     {
-        private readonly IUserService _userService;
-        private readonly UserManager<IUser> _userManager;
-        private readonly ISiteService _siteService;
-        protected readonly IStringLocalizer S;
+        _userService = userService;
+        _userManager = userManager;
+        _siteService = siteService;
 
-        public ChangeEmailController(
-            IUserService userService,
-            UserManager<IUser> userManager,
-            ISiteService siteService,
-            IStringLocalizer<ChangeEmailController> stringLocalizer)
-        {
-            _userService = userService;
-            _userManager = userManager;
-            _siteService = siteService;
+        S = stringLocalizer;
+    }
 
-            S = stringLocalizer;
+    [HttpGet]
+    [Authorize]
+    public async Task<IActionResult> Index()
+    {
+        if (!(await _siteService.GetSettingsAsync<ChangeEmailSettings>()).AllowChangeEmail)
+        {
+            return NotFound();
         }
 
-        [HttpGet]
-        [Authorize]
-        public async Task<IActionResult> Index()
-        {
-            if (!(await _siteService.GetSettingsAsync<ChangeEmailSettings>()).AllowChangeEmail)
-            {
-                return NotFound();
-            }
+        var user = await _userService.GetAuthenticatedUserAsync(User);
 
-            var user = await _userService.GetAuthenticatedUserAsync(User);
+        return View(new ChangeEmailViewModel() { Email = ((User)user).Email });
+    }
 
-            return View(new ChangeEmailViewModel() { Email = ((User)user).Email });
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> Index(ChangeEmailViewModel model)
+    {
+        if (!(await _siteService.GetSettingsAsync<ChangeEmailSettings>()).AllowChangeEmail)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Index(ChangeEmailViewModel model)
+        if (ModelState.IsValid)
         {
-            if (!(await _siteService.GetSettingsAsync<ChangeEmailSettings>()).AllowChangeEmail)
+            var user = await _userService.GetAuthenticatedUserAsync(User);
+            var userWithEmail = await _userManager.FindByEmailAsync(model.Email);
+
+            if (((User)user).Email.Equals(model.Email, StringComparison.OrdinalIgnoreCase))
             {
-                return NotFound();
+                ModelState.AddModelError("Email", S["This email is already your current one."]);
             }
-
-            if (ModelState.IsValid)
+            else if (userWithEmail != null && user.UserName != userWithEmail.UserName)
             {
-                var user = await _userService.GetAuthenticatedUserAsync(User);
-                var userWithEmail = await _userManager.FindByEmailAsync(model.Email);
-
-                if (((User)user).Email.Equals(model.Email, StringComparison.OrdinalIgnoreCase))
-                {
-                    ModelState.AddModelError("Email", S["This email is already your current one."]);
-                }
-                else if (userWithEmail != null && user.UserName != userWithEmail.UserName)
-                {
-                    ModelState.AddModelError("Email", S["A user with the same email already exists."]);
-                }
-                else
+                ModelState.AddModelError("Email", S["A user with the same email already exists."]);
+            }
+            else
+            {
+                if (await _userService.ChangeEmailAsync(user, model.Email,
+                    (key, message) => ModelState.AddModelError(key, message)))
                 {
-                    if (await _userService.ChangeEmailAsync(user, model.Email,
-                        (key, message) => ModelState.AddModelError(key, message)))
-                    {
-                        return RedirectToLocal(Url.Action("ChangeEmailConfirmation", "ChangeEmail"));
-                    }
+                    return RedirectToLocal(Url.Action("ChangeEmailConfirmation", "ChangeEmail"));
                 }
             }
-
-            return View(model);
         }
 
-        [HttpGet]
-        public IActionResult ChangeEmailConfirmation()
-        {
-            return View();
-        }
+        return View(model);
+    }
 
-        private RedirectResult RedirectToLocal(string returnUrl)
-        {
-            if (Url.IsLocalUrl(returnUrl))
-            {
-                return Redirect(returnUrl);
-            }
+    [HttpGet]
+    public IActionResult ChangeEmailConfirmation()
+    {
+        return View();
+    }
 
-            return Redirect("~/");
+    private RedirectResult RedirectToLocal(string returnUrl)
+    {
+        if (Url.IsLocalUrl(returnUrl))
+        {
+            return Redirect(returnUrl);
         }
+
+        return Redirect("~/");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Controllers/RegistrationController.cs b/src/OrchardCore.Modules/OrchardCore.Users/Controllers/RegistrationController.cs
index cdfb02789c1..8035c35ee6e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Controllers/RegistrationController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Controllers/RegistrationController.cs
@@ -14,116 +14,115 @@
 using OrchardCore.Settings;
 using OrchardCore.Users.Models;
 
-namespace OrchardCore.Users.Controllers
+namespace OrchardCore.Users.Controllers;
+
+[Feature(UserConstants.Features.UserRegistration)]
+public class RegistrationController : Controller
 {
-    [Feature(UserConstants.Features.UserRegistration)]
-    public class RegistrationController : Controller
+    private readonly UserManager<IUser> _userManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly ISiteService _siteService;
+    private readonly INotifier _notifier;
+    private readonly ILogger _logger;
+    private readonly IDisplayManager<RegisterUserForm> _registerUserDisplayManager;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public RegistrationController(
+        UserManager<IUser> userManager,
+        IAuthorizationService authorizationService,
+        ISiteService siteService,
+        INotifier notifier,
+        ILogger<RegistrationController> logger,
+        IDisplayManager<RegisterUserForm> registerUserDisplayManager,
+        IUpdateModelAccessor updateModelAccessor,
+        IHtmlLocalizer<RegistrationController> htmlLocalizer,
+        IStringLocalizer<RegistrationController> stringLocalizer)
+    {
+        _userManager = userManager;
+        _authorizationService = authorizationService;
+        _siteService = siteService;
+        _notifier = notifier;
+        _logger = logger;
+        _registerUserDisplayManager = registerUserDisplayManager;
+        _updateModelAccessor = updateModelAccessor;
+        H = htmlLocalizer;
+        S = stringLocalizer;
+    }
+
+    [AllowAnonymous]
+    public async Task<IActionResult> Register(string returnUrl = null)
     {
-        private readonly UserManager<IUser> _userManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly ISiteService _siteService;
-        private readonly INotifier _notifier;
-        private readonly ILogger _logger;
-        private readonly IDisplayManager<RegisterUserForm> _registerUserDisplayManager;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public RegistrationController(
-            UserManager<IUser> userManager,
-            IAuthorizationService authorizationService,
-            ISiteService siteService,
-            INotifier notifier,
-            ILogger<RegistrationController> logger,
-            IDisplayManager<RegisterUserForm> registerUserDisplayManager,
-            IUpdateModelAccessor updateModelAccessor,
-            IHtmlLocalizer<RegistrationController> htmlLocalizer,
-            IStringLocalizer<RegistrationController> stringLocalizer)
+        var settings = await _siteService.GetSettingsAsync<RegistrationSettings>();
+        if (settings.UsersCanRegister != UserRegistrationType.AllowRegistration)
         {
-            _userManager = userManager;
-            _authorizationService = authorizationService;
-            _siteService = siteService;
-            _notifier = notifier;
-            _logger = logger;
-            _registerUserDisplayManager = registerUserDisplayManager;
-            _updateModelAccessor = updateModelAccessor;
-            H = htmlLocalizer;
-            S = stringLocalizer;
+            return NotFound();
         }
 
-        [AllowAnonymous]
-        public async Task<IActionResult> Register(string returnUrl = null)
-        {
-            var settings = await _siteService.GetSettingsAsync<RegistrationSettings>();
-            if (settings.UsersCanRegister != UserRegistrationType.AllowRegistration)
-            {
-                return NotFound();
-            }
+        var shape = await _registerUserDisplayManager.BuildEditorAsync(_updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
 
-            var shape = await _registerUserDisplayManager.BuildEditorAsync(_updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
+        ViewData["ReturnUrl"] = returnUrl;
 
-            ViewData["ReturnUrl"] = returnUrl;
+        return View(shape);
+    }
 
-            return View(shape);
-        }
+    [HttpPost]
+    [AllowAnonymous]
+    [ValidateAntiForgeryToken]
+    [ActionName(nameof(Register))]
+    public async Task<IActionResult> RegisterPOST(string returnUrl = null)
+    {
+        var settings = await _siteService.GetSettingsAsync<RegistrationSettings>();
 
-        [HttpPost]
-        [AllowAnonymous]
-        [ValidateAntiForgeryToken]
-        [ActionName(nameof(Register))]
-        public async Task<IActionResult> RegisterPOST(string returnUrl = null)
+        if (settings.UsersCanRegister != UserRegistrationType.AllowRegistration)
         {
-            var settings = await _siteService.GetSettingsAsync<RegistrationSettings>();
+            return NotFound();
+        }
 
-            if (settings.UsersCanRegister != UserRegistrationType.AllowRegistration)
-            {
-                return NotFound();
-            }
+        var model = new RegisterUserForm();
 
-            var model = new RegisterUserForm();
+        var shape = await _registerUserDisplayManager.UpdateEditorAsync(model, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
 
-            var shape = await _registerUserDisplayManager.UpdateEditorAsync(model, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
+        ViewData["ReturnUrl"] = returnUrl;
 
-            ViewData["ReturnUrl"] = returnUrl;
+        if (ModelState.IsValid)
+        {
+            var iUser = await this.RegisterUser(model, S["Confirm your account"], _logger);
 
-            if (ModelState.IsValid)
+            // If we get a user, redirect to returnUrl
+            if (iUser is User user)
             {
-                var iUser = await this.RegisterUser(model, S["Confirm your account"], _logger);
-
-                // If we get a user, redirect to returnUrl
-                if (iUser is User user)
+                if (settings.UsersMustValidateEmail && !user.EmailConfirmed)
                 {
-                    if (settings.UsersMustValidateEmail && !user.EmailConfirmed)
-                    {
-                        return RedirectToAction(nameof(EmailConfirmationController.ConfirmEmailSent), typeof(EmailConfirmationController).ControllerName(), new { ReturnUrl = returnUrl });
-                    }
-
-                    if (settings.UsersAreModerated && !user.IsEnabled)
-                    {
-                        return RedirectToAction(nameof(RegistrationPending), new { ReturnUrl = returnUrl });
-                    }
+                    return RedirectToAction(nameof(EmailConfirmationController.ConfirmEmailSent), typeof(EmailConfirmationController).ControllerName(), new { ReturnUrl = returnUrl });
+                }
 
-                    return RedirectToLocal(returnUrl.ToUriComponents());
+                if (settings.UsersAreModerated && !user.IsEnabled)
+                {
+                    return RedirectToAction(nameof(RegistrationPending), new { ReturnUrl = returnUrl });
                 }
-            }
 
-            // If we got this far, something failed. Let's redisplay form.
-            return View(shape);
+                return RedirectToLocal(returnUrl.ToUriComponents());
+            }
         }
 
-        [AllowAnonymous]
-        public IActionResult RegistrationPending(string returnUrl = null)
-            => View(new { ReturnUrl = returnUrl });
+        // If we got this far, something failed. Let's redisplay form.
+        return View(shape);
+    }
 
-        private RedirectResult RedirectToLocal(string returnUrl)
-        {
-            if (Url.IsLocalUrl(returnUrl))
-            {
-                return Redirect(returnUrl);
-            }
+    [AllowAnonymous]
+    public IActionResult RegistrationPending(string returnUrl = null)
+        => View(new { ReturnUrl = returnUrl });
 
-            return Redirect("~/");
+    private RedirectResult RedirectToLocal(string returnUrl)
+    {
+        if (Url.IsLocalUrl(returnUrl))
+        {
+            return Redirect(returnUrl);
         }
+
+        return Redirect("~/");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Controllers/ResetPasswordController.cs b/src/OrchardCore.Modules/OrchardCore.Users/Controllers/ResetPasswordController.cs
index b4c8c8d5ef7..d082917325f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Controllers/ResetPasswordController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Controllers/ResetPasswordController.cs
@@ -19,180 +19,179 @@
 using OrchardCore.Users.Services;
 using OrchardCore.Users.ViewModels;
 
-namespace OrchardCore.Users.Controllers
+namespace OrchardCore.Users.Controllers;
+
+[Feature(UserConstants.Features.ResetPassword)]
+public class ResetPasswordController : Controller
 {
-    [Feature(UserConstants.Features.ResetPassword)]
-    public class ResetPasswordController : Controller
+    private static readonly string _controllerName = typeof(ResetPasswordController).ControllerName();
+
+    private readonly IUserService _userService;
+    private readonly UserManager<IUser> _userManager;
+    private readonly ISiteService _siteService;
+    private readonly IEnumerable<IPasswordRecoveryFormEvents> _passwordRecoveryFormEvents;
+    private readonly ILogger _logger;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly IDisplayManager<ForgotPasswordForm> _forgotPasswordDisplayManager;
+    private readonly IDisplayManager<ResetPasswordForm> _resetPasswordDisplayManager;
+    private readonly IShellFeaturesManager _shellFeaturesManager;
+
+    protected readonly IStringLocalizer S;
+
+    public ResetPasswordController(
+        IUserService userService,
+        UserManager<IUser> userManager,
+        ISiteService siteService,
+        ILogger<ResetPasswordController> logger,
+        IUpdateModelAccessor updateModelAccessor,
+        IDisplayManager<ForgotPasswordForm> forgotPasswordDisplayManager,
+        IDisplayManager<ResetPasswordForm> resetPasswordDisplayManager,
+        IShellFeaturesManager shellFeaturesManager,
+        IEnumerable<IPasswordRecoveryFormEvents> passwordRecoveryFormEvents,
+        IStringLocalizer<ResetPasswordController> stringLocalizer)
+    {
+        _userService = userService;
+        _userManager = userManager;
+        _siteService = siteService;
+        _logger = logger;
+        _updateModelAccessor = updateModelAccessor;
+        _forgotPasswordDisplayManager = forgotPasswordDisplayManager;
+        _resetPasswordDisplayManager = resetPasswordDisplayManager;
+        _shellFeaturesManager = shellFeaturesManager;
+        _passwordRecoveryFormEvents = passwordRecoveryFormEvents;
+        S = stringLocalizer;
+    }
+
+    [AllowAnonymous]
+    public async Task<IActionResult> ForgotPassword()
     {
-        private static readonly string _controllerName = typeof(ResetPasswordController).ControllerName();
-
-        private readonly IUserService _userService;
-        private readonly UserManager<IUser> _userManager;
-        private readonly ISiteService _siteService;
-        private readonly IEnumerable<IPasswordRecoveryFormEvents> _passwordRecoveryFormEvents;
-        private readonly ILogger _logger;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly IDisplayManager<ForgotPasswordForm> _forgotPasswordDisplayManager;
-        private readonly IDisplayManager<ResetPasswordForm> _resetPasswordDisplayManager;
-        private readonly IShellFeaturesManager _shellFeaturesManager;
-
-        protected readonly IStringLocalizer S;
-
-        public ResetPasswordController(
-            IUserService userService,
-            UserManager<IUser> userManager,
-            ISiteService siteService,
-            ILogger<ResetPasswordController> logger,
-            IUpdateModelAccessor updateModelAccessor,
-            IDisplayManager<ForgotPasswordForm> forgotPasswordDisplayManager,
-            IDisplayManager<ResetPasswordForm> resetPasswordDisplayManager,
-            IShellFeaturesManager shellFeaturesManager,
-            IEnumerable<IPasswordRecoveryFormEvents> passwordRecoveryFormEvents,
-            IStringLocalizer<ResetPasswordController> stringLocalizer)
+        if (!(await _siteService.GetSettingsAsync<ResetPasswordSettings>()).AllowResetPassword)
         {
-            _userService = userService;
-            _userManager = userManager;
-            _siteService = siteService;
-            _logger = logger;
-            _updateModelAccessor = updateModelAccessor;
-            _forgotPasswordDisplayManager = forgotPasswordDisplayManager;
-            _resetPasswordDisplayManager = resetPasswordDisplayManager;
-            _shellFeaturesManager = shellFeaturesManager;
-            _passwordRecoveryFormEvents = passwordRecoveryFormEvents;
-            S = stringLocalizer;
+            return NotFound();
         }
 
-        [AllowAnonymous]
-        public async Task<IActionResult> ForgotPassword()
-        {
-            if (!(await _siteService.GetSettingsAsync<ResetPasswordSettings>()).AllowResetPassword)
-            {
-                return NotFound();
-            }
+        var formShape = await _forgotPasswordDisplayManager.BuildEditorAsync(_updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
 
-            var formShape = await _forgotPasswordDisplayManager.BuildEditorAsync(_updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
+        return View(formShape);
+    }
 
-            return View(formShape);
+    [HttpPost]
+    [AllowAnonymous]
+    [ActionName(nameof(ForgotPassword))]
+    public async Task<IActionResult> ForgotPasswordPOST()
+    {
+        if (!(await _siteService.GetSettingsAsync<ResetPasswordSettings>()).AllowResetPassword)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        [AllowAnonymous]
-        [ActionName(nameof(ForgotPassword))]
-        public async Task<IActionResult> ForgotPasswordPOST()
+        var model = new ForgotPasswordForm();
+
+        var formShape = await _forgotPasswordDisplayManager.UpdateEditorAsync(model, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
+
+        await _passwordRecoveryFormEvents.InvokeAsync((e, modelState) => e.RecoveringPasswordAsync((key, message) => modelState.AddModelError(key, message)), ModelState, _logger);
+
+        if (ModelState.IsValid)
         {
-            if (!(await _siteService.GetSettingsAsync<ResetPasswordSettings>()).AllowResetPassword)
+            var user = await _userService.GetForgotPasswordUserAsync(model.UsernameOrEmail) as User;
+            if (user == null || await MustValidateEmailAsync(user))
             {
-                return NotFound();
+                // returns to confirmation page anyway: we don't want to let scrapers know if a username or an email exist
+                return RedirectToAction(nameof(ForgotPasswordConfirmation));
             }
 
-            var model = new ForgotPasswordForm();
-
-            var formShape = await _forgotPasswordDisplayManager.UpdateEditorAsync(model, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
-
-            await _passwordRecoveryFormEvents.InvokeAsync((e, modelState) => e.RecoveringPasswordAsync((key, message) => modelState.AddModelError(key, message)), ModelState, _logger);
+            user.ResetToken = Convert.ToBase64String(Encoding.UTF8.GetBytes(user.ResetToken));
+            var resetPasswordUrl = Url.Action(nameof(ResetPassword), _controllerName, new { code = user.ResetToken }, HttpContext.Request.Scheme);
 
-            if (ModelState.IsValid)
+            // send email with callback link
+            await this.SendEmailAsync(user.Email, S["Reset your password"], new LostPasswordViewModel()
             {
-                var user = await _userService.GetForgotPasswordUserAsync(model.UsernameOrEmail) as User;
-                if (user == null || await MustValidateEmailAsync(user))
-                {
-                    // returns to confirmation page anyway: we don't want to let scrapers know if a username or an email exist
-                    return RedirectToAction(nameof(ForgotPasswordConfirmation));
-                }
+                User = user,
+                LostPasswordUrl = resetPasswordUrl
+            });
 
-                user.ResetToken = Convert.ToBase64String(Encoding.UTF8.GetBytes(user.ResetToken));
-                var resetPasswordUrl = Url.Action(nameof(ResetPassword), _controllerName, new { code = user.ResetToken }, HttpContext.Request.Scheme);
+            var context = new PasswordRecoveryContext(user);
 
-                // send email with callback link
-                await this.SendEmailAsync(user.Email, S["Reset your password"], new LostPasswordViewModel()
-                {
-                    User = user,
-                    LostPasswordUrl = resetPasswordUrl
-                });
+            await _passwordRecoveryFormEvents.InvokeAsync((handler, context) => handler.PasswordRecoveredAsync(context), context, _logger);
 
-                var context = new PasswordRecoveryContext(user);
-
-                await _passwordRecoveryFormEvents.InvokeAsync((handler, context) => handler.PasswordRecoveredAsync(context), context, _logger);
+            return RedirectToAction(nameof(ForgotPasswordConfirmation));
+        }
 
-                return RedirectToAction(nameof(ForgotPasswordConfirmation));
-            }
+        // If we got this far, something failed, redisplay form
+        return View(formShape);
+    }
 
-            // If we got this far, something failed, redisplay form
-            return View(formShape);
-        }
+    [AllowAnonymous]
+    public IActionResult ForgotPasswordConfirmation()
+    {
+        return View();
+    }
 
-        [AllowAnonymous]
-        public IActionResult ForgotPasswordConfirmation()
+    [AllowAnonymous]
+    public async Task<IActionResult> ResetPassword(string code = null)
+    {
+        if (!(await _siteService.GetSettingsAsync<ResetPasswordSettings>()).AllowResetPassword)
         {
-            return View();
+            return NotFound();
         }
 
-        [AllowAnonymous]
-        public async Task<IActionResult> ResetPassword(string code = null)
+        if (string.IsNullOrWhiteSpace(code))
         {
-            if (!(await _siteService.GetSettingsAsync<ResetPasswordSettings>()).AllowResetPassword)
-            {
-                return NotFound();
-            }
+            return RedirectToAction(nameof(ForgotPassword));
+        }
 
-            if (string.IsNullOrWhiteSpace(code))
-            {
-                return RedirectToAction(nameof(ForgotPassword));
-            }
+        var model = new ResetPasswordForm { ResetToken = code };
+        var shape = await _resetPasswordDisplayManager.BuildEditorAsync(model, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
 
-            var model = new ResetPasswordForm { ResetToken = code };
-            var shape = await _resetPasswordDisplayManager.BuildEditorAsync(model, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
+        return View(shape);
+    }
 
-            return View(shape);
+    [HttpPost]
+    [AllowAnonymous]
+    [ValidateAntiForgeryToken]
+    [ActionName(nameof(ResetPassword))]
+    public async Task<IActionResult> ResetPasswordPOST()
+    {
+        if (!(await _siteService.GetSettingsAsync<ResetPasswordSettings>()).AllowResetPassword)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        [AllowAnonymous]
-        [ValidateAntiForgeryToken]
-        [ActionName(nameof(ResetPassword))]
-        public async Task<IActionResult> ResetPasswordPOST()
-        {
-            if (!(await _siteService.GetSettingsAsync<ResetPasswordSettings>()).AllowResetPassword)
-            {
-                return NotFound();
-            }
+        var model = new ResetPasswordForm();
+        var shape = await _resetPasswordDisplayManager.UpdateEditorAsync(model, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
 
-            var model = new ResetPasswordForm();
-            var shape = await _resetPasswordDisplayManager.UpdateEditorAsync(model, _updateModelAccessor.ModelUpdater, false, string.Empty, string.Empty);
+        await _passwordRecoveryFormEvents.InvokeAsync((e, modelState) => e.ResettingPasswordAsync((key, message) => modelState.AddModelError(key, message)), ModelState, _logger);
 
-            await _passwordRecoveryFormEvents.InvokeAsync((e, modelState) => e.ResettingPasswordAsync((key, message) => modelState.AddModelError(key, message)), ModelState, _logger);
+        if (ModelState.IsValid)
+        {
+            var token = Encoding.UTF8.GetString(Convert.FromBase64String(model.ResetToken));
 
-            if (ModelState.IsValid)
+            if (await _userService.ResetPasswordAsync(model.UsernameOrEmail, token, model.NewPassword, ModelState.AddModelError))
             {
-                var token = Encoding.UTF8.GetString(Convert.FromBase64String(model.ResetToken));
-
-                if (await _userService.ResetPasswordAsync(model.UsernameOrEmail, token, model.NewPassword, ModelState.AddModelError))
-                {
-                    return RedirectToAction(nameof(ResetPasswordConfirmation));
-                }
+                return RedirectToAction(nameof(ResetPasswordConfirmation));
             }
-
-            return View(shape);
         }
 
-        [AllowAnonymous]
-        public IActionResult ResetPasswordConfirmation()
-        {
-            return View();
-        }
+        return View(shape);
+    }
 
-        private async Task<bool> MustValidateEmailAsync(User user)
-        {
-            var registrationFeatureIsAvailable = (await _shellFeaturesManager.GetAvailableFeaturesAsync())
-                           .Any(feature => feature.Id == UserConstants.Features.UserRegistration);
+    [AllowAnonymous]
+    public IActionResult ResetPasswordConfirmation()
+    {
+        return View();
+    }
 
-            if (!registrationFeatureIsAvailable)
-            {
-                return false;
-            }
+    private async Task<bool> MustValidateEmailAsync(User user)
+    {
+        var registrationFeatureIsAvailable = (await _shellFeaturesManager.GetAvailableFeaturesAsync())
+                       .Any(feature => feature.Id == UserConstants.Features.UserRegistration);
 
-            return (await _siteService.GetSettingsAsync<RegistrationSettings>()).UsersMustValidateEmail
-                && !await _userManager.IsEmailConfirmedAsync(user);
+        if (!registrationFeatureIsAvailable)
+        {
+            return false;
         }
+
+        return (await _siteService.GetSettingsAsync<RegistrationSettings>()).UsersMustValidateEmail
+            && !await _userManager.IsEmailConfirmedAsync(user);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/CookieAuthenticationOptionsConfigure.cs b/src/OrchardCore.Modules/OrchardCore.Users/CookieAuthenticationOptionsConfigure.cs
index 631ae649eb0..392590b7168 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/CookieAuthenticationOptionsConfigure.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/CookieAuthenticationOptionsConfigure.cs
@@ -1,38 +1,37 @@
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Users.Authentication
+namespace OrchardCore.Users.Authentication;
+
+public sealed class CookieAuthenticationOptionsConfigure : IConfigureNamedOptions<CookieAuthenticationOptions>
 {
-    public sealed class CookieAuthenticationOptionsConfigure : IConfigureNamedOptions<CookieAuthenticationOptions>
-    {
-        private readonly IDistributedCache _distributedCache;
-        private readonly IDataProtectionProvider _dataProtectionProvider;
-        private readonly ILogger<CacheTicketStore> _logger;
+    private readonly IDistributedCache _distributedCache;
+    private readonly IDataProtectionProvider _dataProtectionProvider;
+    private readonly ILogger<CacheTicketStore> _logger;
 
-        public CookieAuthenticationOptionsConfigure(
-            IDistributedCache distributedCache,
-            IDataProtectionProvider dataProtectionProvider,
-            ILogger<CacheTicketStore> logger)
-        {
-            _distributedCache = distributedCache;
-            _dataProtectionProvider = dataProtectionProvider;
-            _logger = logger;
-        }
+    public CookieAuthenticationOptionsConfigure(
+        IDistributedCache distributedCache,
+        IDataProtectionProvider dataProtectionProvider,
+        ILogger<CacheTicketStore> logger)
+    {
+        _distributedCache = distributedCache;
+        _dataProtectionProvider = dataProtectionProvider;
+        _logger = logger;
+    }
 
-        public void Configure(string name, CookieAuthenticationOptions options)
+    public void Configure(string name, CookieAuthenticationOptions options)
+    {
+        if (name == IdentityConstants.ApplicationScheme)
         {
-            if (name == IdentityConstants.ApplicationScheme)
-            {
-                options.SessionStore = new CacheTicketStore(_distributedCache, _dataProtectionProvider, _logger);
-            }
+            options.SessionStore = new CacheTicketStore(_distributedCache, _dataProtectionProvider, _logger);
         }
+    }
 
-        public void Configure(CookieAuthenticationOptions options)
-        {
-        }
+    public void Configure(CookieAuthenticationOptions options)
+    {
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Deployment/CustomUserSettingsDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Deployment/CustomUserSettingsDeploymentStepDriver.cs
index 8b80bffe860..b5445e6e9d5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Deployment/CustomUserSettingsDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Deployment/CustomUserSettingsDeploymentStepDriver.cs
@@ -6,45 +6,44 @@
 using OrchardCore.Users.Services;
 using OrchardCore.Users.ViewModels;
 
-namespace OrchardCore.Users.Deployment
+namespace OrchardCore.Users.Deployment;
+
+public sealed class CustomUserSettingsDeploymentStepDriver : DisplayDriver<DeploymentStep, CustomUserSettingsDeploymentStep>
 {
-    public sealed class CustomUserSettingsDeploymentStepDriver : DisplayDriver<DeploymentStep, CustomUserSettingsDeploymentStep>
+    private readonly CustomUserSettingsService _customUserSettingsService;
+
+    public CustomUserSettingsDeploymentStepDriver(CustomUserSettingsService customUserSettingsService)
     {
-        private readonly CustomUserSettingsService _customUserSettingsService;
+        _customUserSettingsService = customUserSettingsService;
+    }
 
-        public CustomUserSettingsDeploymentStepDriver(CustomUserSettingsService customUserSettingsService)
-        {
-            _customUserSettingsService = customUserSettingsService;
-        }
+    public override Task<IDisplayResult> DisplayAsync(CustomUserSettingsDeploymentStep step, BuildDisplayContext context)
+    {
+        return CombineAsync(
+                View("CustomUserSettingsDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("CustomUserSettingsDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content"));
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(CustomUserSettingsDeploymentStep step, BuildDisplayContext context)
+    public override IDisplayResult Edit(CustomUserSettingsDeploymentStep step, BuildEditorContext context)
+    {
+        return Initialize<CustomUserSettingsDeploymentStepViewModel>("CustomUserSettingsDeploymentStep_Fields_Edit", async model =>
         {
-            return CombineAsync(
-                    View("CustomUserSettingsDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("CustomUserSettingsDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content"));
-        }
+            model.IncludeAll = step.IncludeAll;
+            model.SettingsTypeNames = step.SettingsTypeNames;
+            model.AllSettingsTypeNames = (await _customUserSettingsService.GetAllSettingsTypeNamesAsync()).ToArray();
+        }).Location("Content");
+    }
 
-        public override IDisplayResult Edit(CustomUserSettingsDeploymentStep step, BuildEditorContext context)
-        {
-            return Initialize<CustomUserSettingsDeploymentStepViewModel>("CustomUserSettingsDeploymentStep_Fields_Edit", async model =>
-            {
-                model.IncludeAll = step.IncludeAll;
-                model.SettingsTypeNames = step.SettingsTypeNames;
-                model.AllSettingsTypeNames = (await _customUserSettingsService.GetAllSettingsTypeNamesAsync()).ToArray();
-            }).Location("Content");
-        }
+    public override async Task<IDisplayResult> UpdateAsync(CustomUserSettingsDeploymentStep step, UpdateEditorContext context)
+    {
+        step.SettingsTypeNames = [];
+        await context.Updater.TryUpdateModelAsync(step, Prefix);
 
-        public override async Task<IDisplayResult> UpdateAsync(CustomUserSettingsDeploymentStep step, UpdateEditorContext context)
+        if (step.IncludeAll)
         {
             step.SettingsTypeNames = [];
-            await context.Updater.TryUpdateModelAsync(step, Prefix);
-
-            if (step.IncludeAll)
-            {
-                step.SettingsTypeNames = [];
-            }
-
-            return Edit(step, context);
         }
+
+        return Edit(step, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/ChangeEmailSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/ChangeEmailSettingsDisplayDriver.cs
index 10104316308..f92155b247b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/ChangeEmailSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/ChangeEmailSettingsDisplayDriver.cs
@@ -7,54 +7,53 @@
 using OrchardCore.Settings;
 using OrchardCore.Users.Models;
 
-namespace OrchardCore.Users.Drivers
+namespace OrchardCore.Users.Drivers;
+
+public sealed class ChangeEmailSettingsDisplayDriver : SiteDisplayDriver<ChangeEmailSettings>
 {
-    public sealed class ChangeEmailSettingsDisplayDriver : SiteDisplayDriver<ChangeEmailSettings>
-    {
-        public const string GroupId = "userChangeEmail";
+    public const string GroupId = "userChangeEmail";
 
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
 
-        public ChangeEmailSettingsDisplayDriver(
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-        }
+    public ChangeEmailSettingsDisplayDriver(
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService)
+    {
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
+
+    protected override string SettingsGroupId
+        => GroupId;
 
-        protected override string SettingsGroupId
-            => GroupId;
+    public override async Task<IDisplayResult> EditAsync(ISite site, ChangeEmailSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-        public override async Task<IDisplayResult> EditAsync(ISite site, ChangeEmailSettings settings, BuildEditorContext context)
+        if (!await _authorizationService.AuthorizeAsync(user, CommonPermissions.ManageUsers))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, CommonPermissions.ManageUsers))
-            {
-                return null;
-            }
-
-            return Initialize<ChangeEmailSettings>("ChangeEmailSettings_Edit", model =>
-            {
-                model.AllowChangeEmail = settings.AllowChangeEmail;
-            }).Location("Content:5")
-            .OnGroup(SettingsGroupId);
+            return null;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, ChangeEmailSettings section, UpdateEditorContext context)
+        return Initialize<ChangeEmailSettings>("ChangeEmailSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, CommonPermissions.ManageUsers))
-            {
-                return null;
-            }
+            model.AllowChangeEmail = settings.AllowChangeEmail;
+        }).Location("Content:5")
+        .OnGroup(SettingsGroupId);
+    }
 
-            await context.Updater.TryUpdateModelAsync(section, Prefix);
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, ChangeEmailSettings section, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-            return await EditAsync(site, section, context);
+        if (!await _authorizationService.AuthorizeAsync(user, CommonPermissions.ManageUsers))
+        {
+            return null;
         }
+
+        await context.Updater.TryUpdateModelAsync(section, Prefix);
+
+        return await EditAsync(site, section, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/CustomUserSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/CustomUserSettingsDisplayDriver.cs
index e045a0891dd..582e65109ce 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/CustomUserSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/CustomUserSettingsDisplayDriver.cs
@@ -14,102 +14,101 @@
 using OrchardCore.Users.Models;
 using OrchardCore.Users.ViewModels;
 
-namespace OrchardCore.Users.Drivers
+namespace OrchardCore.Users.Drivers;
+
+public sealed class CustomUserSettingsDisplayDriver : DisplayDriver<User>
 {
-    public sealed class CustomUserSettingsDisplayDriver : DisplayDriver<User>
+    private readonly IContentItemDisplayManager _contentItemDisplayManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentManager _contentManager;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+
+    public CustomUserSettingsDisplayDriver(
+        IContentItemDisplayManager contentItemDisplayManager,
+        IContentDefinitionManager contentDefinitionManager,
+        IContentManager contentManager,
+        IAuthorizationService authorizationService,
+        IHttpContextAccessor httpContextAccessor)
+    {
+        _contentItemDisplayManager = contentItemDisplayManager;
+        _contentDefinitionManager = contentDefinitionManager;
+        _contentManager = contentManager;
+        _authorizationService = authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+    }
+
+    public override async Task<IDisplayResult> EditAsync(User user, BuildEditorContext context)
     {
-        private readonly IContentItemDisplayManager _contentItemDisplayManager;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IContentManager _contentManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-
-        public CustomUserSettingsDisplayDriver(
-            IContentItemDisplayManager contentItemDisplayManager,
-            IContentDefinitionManager contentDefinitionManager,
-            IContentManager contentManager,
-            IAuthorizationService authorizationService,
-            IHttpContextAccessor httpContextAccessor)
+        var contentTypeDefinitions = await GetContentTypeDefinitionsAsync();
+        if (!contentTypeDefinitions.Any())
         {
-            _contentItemDisplayManager = contentItemDisplayManager;
-            _contentDefinitionManager = contentDefinitionManager;
-            _contentManager = contentManager;
-            _authorizationService = authorizationService;
-            _httpContextAccessor = httpContextAccessor;
+            return null;
         }
 
-        public override async Task<IDisplayResult> EditAsync(User user, BuildEditorContext context)
-        {
-            var contentTypeDefinitions = await GetContentTypeDefinitionsAsync();
-            if (!contentTypeDefinitions.Any())
-            {
-                return null;
-            }
+        var results = new List<IDisplayResult>();
+        var userClaim = _httpContextAccessor.HttpContext.User;
 
-            var results = new List<IDisplayResult>();
-            var userClaim = _httpContextAccessor.HttpContext.User;
+        foreach (var contentTypeDefinition in contentTypeDefinitions)
+        {
+            results.Add(Initialize<CustomUserSettingsEditViewModel>("CustomUserSettings", async model =>
+                {
+                    var isNew = false;
+                    var contentItem = await GetUserSettingsAsync(user, contentTypeDefinition, () => isNew = true);
+                    model.Editor = await _contentItemDisplayManager.BuildEditorAsync(contentItem, context.Updater, isNew, context.GroupId, Prefix);
+                })
+                .Location($"Content:10#{contentTypeDefinition.DisplayName}")
+                .Differentiator($"CustomUserSettings-{contentTypeDefinition.Name}")
+                .RenderWhen(() => _authorizationService.AuthorizeAsync(userClaim, CustomUserSettingsPermissions.CreatePermissionForType(contentTypeDefinition))));
+        }
 
-            foreach (var contentTypeDefinition in contentTypeDefinitions)
-            {
-                results.Add(Initialize<CustomUserSettingsEditViewModel>("CustomUserSettings", async model =>
-                    {
-                        var isNew = false;
-                        var contentItem = await GetUserSettingsAsync(user, contentTypeDefinition, () => isNew = true);
-                        model.Editor = await _contentItemDisplayManager.BuildEditorAsync(contentItem, context.Updater, isNew, context.GroupId, Prefix);
-                    })
-                    .Location($"Content:10#{contentTypeDefinition.DisplayName}")
-                    .Differentiator($"CustomUserSettings-{contentTypeDefinition.Name}")
-                    .RenderWhen(() => _authorizationService.AuthorizeAsync(userClaim, CustomUserSettingsPermissions.CreatePermissionForType(contentTypeDefinition))));
-            }
+        return Combine(results);
+    }
 
-            return Combine(results);
-        }
+    public override async Task<IDisplayResult> UpdateAsync(User user, UpdateEditorContext context)
+    {
+        var userClaim = _httpContextAccessor.HttpContext.User;
+        var contentTypeDefinitions = await GetContentTypeDefinitionsAsync();
 
-        public override async Task<IDisplayResult> UpdateAsync(User user, UpdateEditorContext context)
+        foreach (var contentTypeDefinition in contentTypeDefinitions)
         {
-            var userClaim = _httpContextAccessor.HttpContext.User;
-            var contentTypeDefinitions = await GetContentTypeDefinitionsAsync();
-
-            foreach (var contentTypeDefinition in contentTypeDefinitions)
+            if (!await _authorizationService.AuthorizeAsync(userClaim, CustomUserSettingsPermissions.CreatePermissionForType(contentTypeDefinition)))
             {
-                if (!await _authorizationService.AuthorizeAsync(userClaim, CustomUserSettingsPermissions.CreatePermissionForType(contentTypeDefinition)))
-                {
-                    continue;
-                }
-
-                var isNew = false;
-                var contentItem = await GetUserSettingsAsync(user, contentTypeDefinition, () => isNew = true);
-                await _contentItemDisplayManager.UpdateEditorAsync(contentItem, context.Updater, isNew, context.GroupId, Prefix);
-                user.Properties[contentTypeDefinition.Name] = JObject.FromObject(contentItem);
+                continue;
             }
 
-            return await EditAsync(user, context);
+            var isNew = false;
+            var contentItem = await GetUserSettingsAsync(user, contentTypeDefinition, () => isNew = true);
+            await _contentItemDisplayManager.UpdateEditorAsync(contentItem, context.Updater, isNew, context.GroupId, Prefix);
+            user.Properties[contentTypeDefinition.Name] = JObject.FromObject(contentItem);
         }
 
-        private async Task<IEnumerable<ContentTypeDefinition>> GetContentTypeDefinitionsAsync()
-            => (await _contentDefinitionManager.ListTypeDefinitionsAsync())
-                .Where(x => x.GetStereotype() == "CustomUserSettings");
+        return await EditAsync(user, context);
+    }
 
-        private async Task<ContentItem> GetUserSettingsAsync(User user, ContentTypeDefinition settingsType, Action isNew = null)
-        {
-            JsonNode property;
-            ContentItem contentItem;
+    private async Task<IEnumerable<ContentTypeDefinition>> GetContentTypeDefinitionsAsync()
+        => (await _contentDefinitionManager.ListTypeDefinitionsAsync())
+            .Where(x => x.GetStereotype() == "CustomUserSettings");
 
-            if (user.Properties.TryGetPropertyValue(settingsType.Name, out property))
-            {
-                var existing = property.ToObject<ContentItem>();
+    private async Task<ContentItem> GetUserSettingsAsync(User user, ContentTypeDefinition settingsType, Action isNew = null)
+    {
+        JsonNode property;
+        ContentItem contentItem;
 
-                // Create a new item to take into account the current type definition.
-                contentItem = await _contentManager.NewAsync(existing.ContentType);
-                contentItem.Merge(existing);
-            }
-            else
-            {
-                contentItem = await _contentManager.NewAsync(settingsType.Name);
-                isNew?.Invoke();
-            }
+        if (user.Properties.TryGetPropertyValue(settingsType.Name, out property))
+        {
+            var existing = property.ToObject<ContentItem>();
 
-            return contentItem;
+            // Create a new item to take into account the current type definition.
+            contentItem = await _contentManager.NewAsync(existing.ContentType);
+            contentItem.Merge(existing);
         }
+        else
+        {
+            contentItem = await _contentManager.NewAsync(settingsType.Name);
+            isNew?.Invoke();
+        }
+
+        return contentItem;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/LoginSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/LoginSettingsDisplayDriver.cs
index 2c4ecece6f4..48a122ba8d0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/LoginSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/LoginSettingsDisplayDriver.cs
@@ -7,53 +7,52 @@
 using OrchardCore.Settings;
 using OrchardCore.Users.Models;
 
-namespace OrchardCore.Users.Drivers
+namespace OrchardCore.Users.Drivers;
+
+public sealed class LoginSettingsDisplayDriver : SiteDisplayDriver<LoginSettings>
 {
-    public sealed class LoginSettingsDisplayDriver : SiteDisplayDriver<LoginSettings>
-    {
-        public const string GroupId = "userLogin";
+    public const string GroupId = "userLogin";
 
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
 
-        public LoginSettingsDisplayDriver(
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-        }
+    public LoginSettingsDisplayDriver(
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService)
+    {
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
 
-        protected override string SettingsGroupId
-            => GroupId;
+    protected override string SettingsGroupId
+        => GroupId;
 
-        public override IDisplayResult Edit(ISite site, LoginSettings settings, BuildEditorContext context)
+    public override IDisplayResult Edit(ISite site, LoginSettings settings, BuildEditorContext context)
+    {
+        return Initialize<LoginSettings>("LoginSettings_Edit", model =>
         {
-            return Initialize<LoginSettings>("LoginSettings_Edit", model =>
-            {
-                model.UseSiteTheme = settings.UseSiteTheme;
-                model.UseExternalProviderIfOnlyOneDefined = settings.UseExternalProviderIfOnlyOneDefined;
-                model.DisableLocalLogin = settings.DisableLocalLogin;
-                model.UseScriptToSyncRoles = settings.UseScriptToSyncRoles;
-                model.SyncRolesScript = settings.SyncRolesScript;
-                model.AllowChangingEmail = settings.AllowChangingEmail;
-                model.AllowChangingUsername = settings.AllowChangingUsername;
-                model.AllowChangingPhoneNumber = settings.AllowChangingPhoneNumber;
-            }).Location("Content:5#General")
-            .RenderWhen(() => _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.ManageUsers))
-            .OnGroup(SettingsGroupId);
-        }
+            model.UseSiteTheme = settings.UseSiteTheme;
+            model.UseExternalProviderIfOnlyOneDefined = settings.UseExternalProviderIfOnlyOneDefined;
+            model.DisableLocalLogin = settings.DisableLocalLogin;
+            model.UseScriptToSyncRoles = settings.UseScriptToSyncRoles;
+            model.SyncRolesScript = settings.SyncRolesScript;
+            model.AllowChangingEmail = settings.AllowChangingEmail;
+            model.AllowChangingUsername = settings.AllowChangingUsername;
+            model.AllowChangingPhoneNumber = settings.AllowChangingPhoneNumber;
+        }).Location("Content:5#General")
+        .RenderWhen(() => _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.ManageUsers))
+        .OnGroup(SettingsGroupId);
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, LoginSettings section, UpdateEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, LoginSettings section, UpdateEditorContext context)
+    {
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User, CommonPermissions.ManageUsers))
         {
-            if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User, CommonPermissions.ManageUsers))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            await context.Updater.TryUpdateModelAsync(section, Prefix);
+        await context.Updater.TryUpdateModelAsync(section, Prefix);
 
-            return await EditAsync(site, section, context);
-        }
+        return await EditAsync(site, section, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/RegistrationSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/RegistrationSettingsDisplayDriver.cs
index 0b318c1e900..442bb05fc61 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/RegistrationSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/RegistrationSettingsDisplayDriver.cs
@@ -7,62 +7,61 @@
 using OrchardCore.Settings;
 using OrchardCore.Users.Models;
 
-namespace OrchardCore.Users.Drivers
+namespace OrchardCore.Users.Drivers;
+
+public sealed class RegistrationSettingsDisplayDriver : SiteDisplayDriver<RegistrationSettings>
 {
-    public sealed class RegistrationSettingsDisplayDriver : SiteDisplayDriver<RegistrationSettings>
+    public const string GroupId = "userRegistration";
+
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+
+    public RegistrationSettingsDisplayDriver(
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService)
     {
-        public const string GroupId = "userRegistration";
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
 
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+    protected override string SettingsGroupId
+        => GroupId;
 
-        public RegistrationSettingsDisplayDriver(
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService)
+    public override async Task<IDisplayResult> EditAsync(ISite site, RegistrationSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
+
+        if (!await _authorizationService.AuthorizeAsync(user, CommonPermissions.ManageUsers))
         {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
+            return null;
         }
 
-        protected override string SettingsGroupId
-            => GroupId;
-
-        public override async Task<IDisplayResult> EditAsync(ISite site, RegistrationSettings settings, BuildEditorContext context)
+        return Initialize<RegistrationSettings>("RegistrationSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, CommonPermissions.ManageUsers))
-            {
-                return null;
-            }
+            model.UsersCanRegister = settings.UsersCanRegister;
+            model.UsersMustValidateEmail = settings.UsersMustValidateEmail;
+            model.UsersAreModerated = settings.UsersAreModerated;
+            model.UseSiteTheme = settings.UseSiteTheme;
+            model.NoPasswordForExternalUsers = settings.NoPasswordForExternalUsers;
+            model.NoUsernameForExternalUsers = settings.NoUsernameForExternalUsers;
+            model.NoEmailForExternalUsers = settings.NoEmailForExternalUsers;
+            model.UseScriptToGenerateUsername = settings.UseScriptToGenerateUsername;
+            model.GenerateUsernameScript = settings.GenerateUsernameScript;
+        }).Location("Content:5")
+        .OnGroup(SettingsGroupId);
+    }
 
-            return Initialize<RegistrationSettings>("RegistrationSettings_Edit", model =>
-            {
-                model.UsersCanRegister = settings.UsersCanRegister;
-                model.UsersMustValidateEmail = settings.UsersMustValidateEmail;
-                model.UsersAreModerated = settings.UsersAreModerated;
-                model.UseSiteTheme = settings.UseSiteTheme;
-                model.NoPasswordForExternalUsers = settings.NoPasswordForExternalUsers;
-                model.NoUsernameForExternalUsers = settings.NoUsernameForExternalUsers;
-                model.NoEmailForExternalUsers = settings.NoEmailForExternalUsers;
-                model.UseScriptToGenerateUsername = settings.UseScriptToGenerateUsername;
-                model.GenerateUsernameScript = settings.GenerateUsernameScript;
-            }).Location("Content:5")
-            .OnGroup(SettingsGroupId);
-        }
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, RegistrationSettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, RegistrationSettings settings, UpdateEditorContext context)
+        if (!await _authorizationService.AuthorizeAsync(user, CommonPermissions.ManageUsers))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, CommonPermissions.ManageUsers))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            await context.Updater.TryUpdateModelAsync(settings, Prefix);
+        await context.Updater.TryUpdateModelAsync(settings, Prefix);
 
-            return await EditAsync(site, settings, context);
-        }
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/ResetPasswordSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/ResetPasswordSettingsDisplayDriver.cs
index 495b7a6245f..b14047280fe 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/ResetPasswordSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/ResetPasswordSettingsDisplayDriver.cs
@@ -7,55 +7,54 @@
 using OrchardCore.Settings;
 using OrchardCore.Users.Models;
 
-namespace OrchardCore.Users.Drivers
+namespace OrchardCore.Users.Drivers;
+
+public sealed class ResetPasswordSettingsDisplayDriver : SiteDisplayDriver<ResetPasswordSettings>
 {
-    public sealed class ResetPasswordSettingsDisplayDriver : SiteDisplayDriver<ResetPasswordSettings>
-    {
-        public const string GroupId = "userResetPassword";
+    public const string GroupId = "userResetPassword";
 
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
 
-        public ResetPasswordSettingsDisplayDriver(
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-        }
+    public ResetPasswordSettingsDisplayDriver(
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService)
+    {
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+    }
+
+    protected override string SettingsGroupId
+        => GroupId;
 
-        protected override string SettingsGroupId
-            => GroupId;
+    public override async Task<IDisplayResult> EditAsync(ISite site, ResetPasswordSettings settings, BuildEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-        public override async Task<IDisplayResult> EditAsync(ISite site, ResetPasswordSettings settings, BuildEditorContext context)
+        if (!await _authorizationService.AuthorizeAsync(user, CommonPermissions.ManageUsers))
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, CommonPermissions.ManageUsers))
-            {
-                return null;
-            }
-
-            return Initialize<ResetPasswordSettings>("ResetPasswordSettings_Edit", model =>
-            {
-                model.AllowResetPassword = settings.AllowResetPassword;
-                model.UseSiteTheme = settings.UseSiteTheme;
-            }).Location("Content:5")
-            .OnGroup(SettingsGroupId);
+            return null;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(ISite site, ResetPasswordSettings settings, UpdateEditorContext context)
+        return Initialize<ResetPasswordSettings>("ResetPasswordSettings_Edit", model =>
         {
-            var user = _httpContextAccessor.HttpContext?.User;
-
-            if (!await _authorizationService.AuthorizeAsync(user, CommonPermissions.ManageUsers))
-            {
-                return null;
-            }
+            model.AllowResetPassword = settings.AllowResetPassword;
+            model.UseSiteTheme = settings.UseSiteTheme;
+        }).Location("Content:5")
+        .OnGroup(SettingsGroupId);
+    }
 
-            await context.Updater.TryUpdateModelAsync(settings, Prefix);
+    public override async Task<IDisplayResult> UpdateAsync(ISite site, ResetPasswordSettings settings, UpdateEditorContext context)
+    {
+        var user = _httpContextAccessor.HttpContext?.User;
 
-            return await EditAsync(site, settings, context);
+        if (!await _authorizationService.AuthorizeAsync(user, CommonPermissions.ManageUsers))
+        {
+            return null;
         }
+
+        await context.Updater.TryUpdateModelAsync(settings, Prefix);
+
+        return await EditAsync(site, settings, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserButtonsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserButtonsDisplayDriver.cs
index 94955929428..34db06d6c38 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserButtonsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserButtonsDisplayDriver.cs
@@ -2,13 +2,12 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Users.Models;
 
-namespace OrchardCore.Users.Drivers
+namespace OrchardCore.Users.Drivers;
+
+public sealed class UserButtonsDisplayDriver : DisplayDriver<User>
 {
-    public sealed class UserButtonsDisplayDriver : DisplayDriver<User>
+    public override IDisplayResult Edit(User model, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(User model, BuildEditorContext context)
-        {
-            return Dynamic("UserSaveButtons_Edit").Location("Actions");
-        }
+        return Dynamic("UserSaveButtons_Edit").Location("Actions");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserDisplayDriver.cs
index b25f9784702..932da2f991a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserDisplayDriver.cs
@@ -17,144 +17,143 @@
 using OrchardCore.Users.Models;
 using OrchardCore.Users.ViewModels;
 
-namespace OrchardCore.Users.Drivers
+namespace OrchardCore.Users.Drivers;
+
+public sealed class UserDisplayDriver : DisplayDriver<User>
 {
-    public sealed class UserDisplayDriver : DisplayDriver<User>
+    private readonly UserManager<IUser> _userManager;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly INotifier _notifier;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IEnumerable<IUserEventHandler> _userEventHandlers;
+    private readonly ILogger _logger;
+
+    internal readonly IHtmlLocalizer H;
+    internal readonly IStringLocalizer S;
+
+    public UserDisplayDriver(
+        UserManager<IUser> userManager,
+        IHttpContextAccessor httpContextAccessor,
+        INotifier notifier,
+        ILogger<UserDisplayDriver> logger,
+        IEnumerable<IUserEventHandler> userEventHandlers,
+        IAuthorizationService authorizationService,
+        IHtmlLocalizer<UserDisplayDriver> htmlLocalizer,
+        IStringLocalizer<UserDisplayDriver> stringLocalizer)
     {
-        private readonly UserManager<IUser> _userManager;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly INotifier _notifier;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IEnumerable<IUserEventHandler> _userEventHandlers;
-        private readonly ILogger _logger;
-
-        internal readonly IHtmlLocalizer H;
-        internal readonly IStringLocalizer S;
-
-        public UserDisplayDriver(
-            UserManager<IUser> userManager,
-            IHttpContextAccessor httpContextAccessor,
-            INotifier notifier,
-            ILogger<UserDisplayDriver> logger,
-            IEnumerable<IUserEventHandler> userEventHandlers,
-            IAuthorizationService authorizationService,
-            IHtmlLocalizer<UserDisplayDriver> htmlLocalizer,
-            IStringLocalizer<UserDisplayDriver> stringLocalizer)
-        {
-            _userManager = userManager;
-            _httpContextAccessor = httpContextAccessor;
-            _notifier = notifier;
-            _authorizationService = authorizationService;
-            _logger = logger;
-            _userEventHandlers = userEventHandlers;
-            H = htmlLocalizer;
-            S = stringLocalizer;
-        }
+        _userManager = userManager;
+        _httpContextAccessor = httpContextAccessor;
+        _notifier = notifier;
+        _authorizationService = authorizationService;
+        _logger = logger;
+        _userEventHandlers = userEventHandlers;
+        H = htmlLocalizer;
+        S = stringLocalizer;
+    }
+
+    public override Task<IDisplayResult> DisplayAsync(User user, BuildDisplayContext context)
+    {
+        return CombineAsync(
+            Initialize<SummaryAdminUserViewModel>("UserFields", model => model.User = user).Location("SummaryAdmin", "Header:1"),
+            Initialize<SummaryAdminUserViewModel>("UserInfo", model => model.User = user).Location("DetailAdmin", "Content:5"),
+            Initialize<SummaryAdminUserViewModel>("UserButtons", model => model.User = user).Location("SummaryAdmin", "Actions:1")
+        );
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(User user, BuildDisplayContext context)
+    public override async Task<IDisplayResult> EditAsync(User user, BuildEditorContext context)
+    {
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.EditUsers, user))
         {
-            return CombineAsync(
-                Initialize<SummaryAdminUserViewModel>("UserFields", model => model.User = user).Location("SummaryAdmin", "Header:1"),
-                Initialize<SummaryAdminUserViewModel>("UserInfo", model => model.User = user).Location("DetailAdmin", "Content:5"),
-                Initialize<SummaryAdminUserViewModel>("UserButtons", model => model.User = user).Location("SummaryAdmin", "Actions:1")
-            );
+            return null;
         }
 
-        public override async Task<IDisplayResult> EditAsync(User user, BuildEditorContext context)
+        return Initialize<EditUserViewModel>("UserFields_Edit", model =>
         {
-            if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.EditUsers, user))
-            {
-                return null;
-            }
-
-            return Initialize<EditUserViewModel>("UserFields_Edit", model =>
-            {
-                model.EmailConfirmed = user.EmailConfirmed;
-                model.IsEnabled = user.IsEnabled;
-                model.IsNewRequest = context.IsNew;
-                // The current user cannot disable themselves, nor can a user without permission to manage this user disable them.
-                model.IsEditingDisabled = IsCurrentUser(user);
-            })
-           .Location("Content:1.5");
-        }
+            model.EmailConfirmed = user.EmailConfirmed;
+            model.IsEnabled = user.IsEnabled;
+            model.IsNewRequest = context.IsNew;
+            // The current user cannot disable themselves, nor can a user without permission to manage this user disable them.
+            model.IsEditingDisabled = IsCurrentUser(user);
+        })
+       .Location("Content:1.5");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(User user, UpdateEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(User user, UpdateEditorContext context)
+    {
+        // To prevent html injection when updating the user must meet all authorization requirements.
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.EditUsers, user))
         {
-            // To prevent html injection when updating the user must meet all authorization requirements.
-            if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.EditUsers, user))
-            {
-                // When the user is only editing their profile never update this part of the user.
-                return await EditAsync(user, context);
-            }
+            // When the user is only editing their profile never update this part of the user.
+            return await EditAsync(user, context);
+        }
 
-            var model = new EditUserViewModel();
+        var model = new EditUserViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            if (context.IsNew)
+        if (context.IsNew)
+        {
+            if (string.IsNullOrWhiteSpace(model.Password))
             {
-                if (string.IsNullOrWhiteSpace(model.Password))
-                {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(model.Password), S["A password is required"]);
-                }
-
-                if (model.Password != model.PasswordConfirmation)
-                {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(model.Password), S["The password and the password confirmation fields must match."]);
-                }
+                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Password), S["A password is required"]);
             }
 
-            if (!context.Updater.ModelState.IsValid)
+            if (model.Password != model.PasswordConfirmation)
             {
-                return await EditAsync(user, context);
+                context.Updater.ModelState.AddModelError(Prefix, nameof(model.Password), S["The password and the password confirmation fields must match."]);
             }
+        }
+
+        if (!context.Updater.ModelState.IsValid)
+        {
+            return await EditAsync(user, context);
+        }
+
+        var isEditingDisabled = IsCurrentUser(user);
 
-            var isEditingDisabled = IsCurrentUser(user);
+        if (!isEditingDisabled && !model.IsEnabled && user.IsEnabled)
+        {
+            var enabledUsersOfAdminRole = (await _userManager.GetUsersInRoleAsync(OrchardCoreConstants.Roles.Administrator))
+                .Cast<User>()
+                .Where(user => user.IsEnabled)
+                .ToList();
 
-            if (!isEditingDisabled && !model.IsEnabled && user.IsEnabled)
+            if (enabledUsersOfAdminRole.Count == 1 && user.UserId == enabledUsersOfAdminRole.First().UserId)
             {
-                var enabledUsersOfAdminRole = (await _userManager.GetUsersInRoleAsync(OrchardCoreConstants.Roles.Administrator))
-                    .Cast<User>()
-                    .Where(user => user.IsEnabled)
-                    .ToList();
-
-                if (enabledUsersOfAdminRole.Count == 1 && user.UserId == enabledUsersOfAdminRole.First().UserId)
-                {
-                    await _notifier.WarningAsync(H["Cannot disable the only enabled administrator."]);
-                }
-                else
-                {
-                    user.IsEnabled = model.IsEnabled;
-                    var userContext = new UserContext(user);
-                    // TODO This handler should be invoked through the create or update methods.
-                    // otherwise it will not be invoked when a workflow, or other operation, changes this value.
-                    await _userEventHandlers.InvokeAsync((handler, context) => handler.DisabledAsync(userContext), userContext, _logger);
-                }
+                await _notifier.WarningAsync(H["Cannot disable the only enabled administrator."]);
             }
-            else if (!isEditingDisabled && model.IsEnabled && !user.IsEnabled)
+            else
             {
                 user.IsEnabled = model.IsEnabled;
                 var userContext = new UserContext(user);
                 // TODO This handler should be invoked through the create or update methods.
                 // otherwise it will not be invoked when a workflow, or other operation, changes this value.
-                await _userEventHandlers.InvokeAsync((handler, context) => handler.EnabledAsync(userContext), userContext, _logger);
+                await _userEventHandlers.InvokeAsync((handler, context) => handler.DisabledAsync(userContext), userContext, _logger);
             }
+        }
+        else if (!isEditingDisabled && model.IsEnabled && !user.IsEnabled)
+        {
+            user.IsEnabled = model.IsEnabled;
+            var userContext = new UserContext(user);
+            // TODO This handler should be invoked through the create or update methods.
+            // otherwise it will not be invoked when a workflow, or other operation, changes this value.
+            await _userEventHandlers.InvokeAsync((handler, context) => handler.EnabledAsync(userContext), userContext, _logger);
+        }
 
-            if (context.Updater.ModelState.IsValid)
+        if (context.Updater.ModelState.IsValid)
+        {
+            if (model.EmailConfirmed && !await _userManager.IsEmailConfirmedAsync(user))
             {
-                if (model.EmailConfirmed && !await _userManager.IsEmailConfirmedAsync(user))
-                {
-                    var token = await _userManager.GenerateEmailConfirmationTokenAsync(user);
-                    await _userManager.ConfirmEmailAsync(user, token);
-                }
+                var token = await _userManager.GenerateEmailConfirmationTokenAsync(user);
+                await _userManager.ConfirmEmailAsync(user, token);
             }
-
-            return await EditAsync(user, context);
         }
 
-        private bool IsCurrentUser(User user)
-        {
-            return _httpContextAccessor.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier) == user.UserId;
-        }
+        return await EditAsync(user, context);
+    }
+
+    private bool IsCurrentUser(User user)
+    {
+        return _httpContextAccessor.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier) == user.UserId;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserInformationDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserInformationDisplayDriver.cs
index 5c611c26c50..fa8a8fa58e7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserInformationDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserInformationDisplayDriver.cs
@@ -11,147 +11,146 @@
 using OrchardCore.Users.Models;
 using OrchardCore.Users.ViewModels;
 
-namespace OrchardCore.Users.Drivers
+namespace OrchardCore.Users.Drivers;
+
+public sealed class UserInformationDisplayDriver : DisplayDriver<User>
 {
-    public sealed class UserInformationDisplayDriver : DisplayDriver<User>
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IPhoneFormatValidator _phoneFormatValidator;
+    private readonly ISiteService _siteService;
+
+    internal readonly IStringLocalizer S;
+
+    public UserInformationDisplayDriver(
+        IHttpContextAccessor httpContextAccessor,
+        IAuthorizationService authorizationService,
+        IPhoneFormatValidator phoneFormatValidator,
+        IStringLocalizer<UserInformationDisplayDriver> stringLocalizer,
+        ISiteService siteService)
+    {
+        _httpContextAccessor = httpContextAccessor;
+        _authorizationService = authorizationService;
+        _phoneFormatValidator = phoneFormatValidator;
+        S = stringLocalizer;
+        _siteService = siteService;
+    }
+
+    public override async Task<IDisplayResult> EditAsync(User user, BuildEditorContext context)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IPhoneFormatValidator _phoneFormatValidator;
-        private readonly ISiteService _siteService;
-
-        internal readonly IStringLocalizer S;
-
-        public UserInformationDisplayDriver(
-            IHttpContextAccessor httpContextAccessor,
-            IAuthorizationService authorizationService,
-            IPhoneFormatValidator phoneFormatValidator,
-            IStringLocalizer<UserInformationDisplayDriver> stringLocalizer,
-            ISiteService siteService)
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.EditUsers, user))
         {
-            _httpContextAccessor = httpContextAccessor;
-            _authorizationService = authorizationService;
-            _phoneFormatValidator = phoneFormatValidator;
-            S = stringLocalizer;
-            _siteService = siteService;
+            return null;
         }
 
-        public override async Task<IDisplayResult> EditAsync(User user, BuildEditorContext context)
-        {
-            if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.EditUsers, user))
+        var settings = await _siteService.GetSettingsAsync<LoginSettings>();
+        var canEditUserInfo = await CanEditUserInfoAsync(user);
+        return Combine(
+            Initialize<EditUserNameViewModel>("UserName_Edit", model =>
             {
-                return null;
-            }
+                model.UserName = user.UserName;
 
-            var settings = await _siteService.GetSettingsAsync<LoginSettings>();
-            var canEditUserInfo = await CanEditUserInfoAsync(user);
-            return Combine(
-                Initialize<EditUserNameViewModel>("UserName_Edit", model =>
-                {
-                    model.UserName = user.UserName;
+                model.AllowEditing = context.IsNew || (settings.AllowChangingUsername && canEditUserInfo);
 
-                    model.AllowEditing = context.IsNew || (settings.AllowChangingUsername && canEditUserInfo);
+            }).Location("Content:1"),
 
-                }).Location("Content:1"),
+            Initialize<EditUserEmailViewModel>("UserEmail_Edit", model =>
+            {
+                model.Email = user.Email;
 
-                Initialize<EditUserEmailViewModel>("UserEmail_Edit", model =>
-                {
-                    model.Email = user.Email;
+                model.AllowEditing = context.IsNew || (settings.AllowChangingEmail && canEditUserInfo);
 
-                    model.AllowEditing = context.IsNew || (settings.AllowChangingEmail && canEditUserInfo);
+            }).Location("Content:1.3"),
 
-                }).Location("Content:1.3"),
+            Initialize<EditUserPhoneNumberViewModel>("UserPhoneNumber_Edit", model =>
+            {
+                model.PhoneNumber = user.PhoneNumber;
+                model.PhoneNumberConfirmed = user.PhoneNumberConfirmed;
 
-                Initialize<EditUserPhoneNumberViewModel>("UserPhoneNumber_Edit", model =>
-                {
-                    model.PhoneNumber = user.PhoneNumber;
-                    model.PhoneNumberConfirmed = user.PhoneNumberConfirmed;
+                model.AllowEditing = context.IsNew || (settings.AllowChangingPhoneNumber && canEditUserInfo);
 
-                    model.AllowEditing = context.IsNew || (settings.AllowChangingPhoneNumber && canEditUserInfo);
+            }).Location("Content:1.3")
+        );
+    }
 
-                }).Location("Content:1.3")
-            );
+    public override async Task<IDisplayResult> UpdateAsync(User user, UpdateEditorContext context)
+    {
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.EditUsers, user))
+        {
+            return null;
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(User user, UpdateEditorContext context)
-        {
-            if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.EditUsers, user))
-            {
-                return null;
-            }
+        var userNameModel = new EditUserNameViewModel();
+        var emailModel = new EditUserEmailViewModel();
+        var phoneNumberModel = new EditUserPhoneNumberViewModel();
 
-            var userNameModel = new EditUserNameViewModel();
-            var emailModel = new EditUserEmailViewModel();
-            var phoneNumberModel = new EditUserPhoneNumberViewModel();
+        // Do not use the user manager to set these values, or validate them here, as they will validate at the incorrect time.
+        // After this driver runs the IUserService.UpdateAsync or IUserService.CreateAsync method will
+        // validate the user and provide the correct error messages based on the entire user objects values.
 
-            // Do not use the user manager to set these values, or validate them here, as they will validate at the incorrect time.
-            // After this driver runs the IUserService.UpdateAsync or IUserService.CreateAsync method will
-            // validate the user and provide the correct error messages based on the entire user objects values.
+        // Custom properties should still be validated in the driver.
 
-            // Custom properties should still be validated in the driver.
+        if (context.IsNew)
+        {
+            await context.Updater.TryUpdateModelAsync(userNameModel, Prefix);
 
-            if (context.IsNew)
-            {
-                await context.Updater.TryUpdateModelAsync(userNameModel, Prefix);
+            user.UserName = userNameModel.UserName;
 
-                user.UserName = userNameModel.UserName;
+            await context.Updater.TryUpdateModelAsync(emailModel, Prefix);
 
-                await context.Updater.TryUpdateModelAsync(emailModel, Prefix);
+            user.Email = emailModel.Email;
 
-                user.Email = emailModel.Email;
+            await context.Updater.TryUpdateModelAsync(phoneNumberModel, Prefix);
 
-                await context.Updater.TryUpdateModelAsync(phoneNumberModel, Prefix);
+            if (!string.IsNullOrEmpty(phoneNumberModel.PhoneNumber) && !_phoneFormatValidator.IsValid(phoneNumberModel.PhoneNumber))
+            {
+                context.Updater.ModelState.AddModelError(Prefix, nameof(phoneNumberModel.PhoneNumber), S["Please provide a valid phone number."]);
+            }
+            else
+            {
+                user.PhoneNumber = phoneNumberModel.PhoneNumber;
+            }
+        }
+        else
+        {
+            var settings = await _siteService.GetSettingsAsync<LoginSettings>();
 
-                if (!string.IsNullOrEmpty(phoneNumberModel.PhoneNumber) && !_phoneFormatValidator.IsValid(phoneNumberModel.PhoneNumber))
+            if (await CanEditUserInfoAsync(user))
+            {
+                if (settings.AllowChangingUsername && await context.Updater.TryUpdateModelAsync(userNameModel, Prefix))
                 {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(phoneNumberModel.PhoneNumber), S["Please provide a valid phone number."]);
+                    user.UserName = userNameModel.UserName;
                 }
-                else
+
+                if (settings.AllowChangingEmail && await context.Updater.TryUpdateModelAsync(emailModel, Prefix))
                 {
-                    user.PhoneNumber = phoneNumberModel.PhoneNumber;
+                    user.Email = emailModel.Email;
                 }
-            }
-            else
-            {
-                var settings = await _siteService.GetSettingsAsync<LoginSettings>();
 
-                if (await CanEditUserInfoAsync(user))
+                if (settings.AllowChangingPhoneNumber && await context.Updater.TryUpdateModelAsync(phoneNumberModel, Prefix))
                 {
-                    if (settings.AllowChangingUsername && await context.Updater.TryUpdateModelAsync(userNameModel, Prefix))
+                    if (!string.IsNullOrEmpty(phoneNumberModel.PhoneNumber) && !_phoneFormatValidator.IsValid(phoneNumberModel.PhoneNumber))
                     {
-                        user.UserName = userNameModel.UserName;
+                        context.Updater.ModelState.AddModelError(Prefix, nameof(phoneNumberModel.PhoneNumber), S["Please provide a valid phone number."]);
                     }
-
-                    if (settings.AllowChangingEmail && await context.Updater.TryUpdateModelAsync(emailModel, Prefix))
+                    else
                     {
-                        user.Email = emailModel.Email;
-                    }
-
-                    if (settings.AllowChangingPhoneNumber && await context.Updater.TryUpdateModelAsync(phoneNumberModel, Prefix))
-                    {
-                        if (!string.IsNullOrEmpty(phoneNumberModel.PhoneNumber) && !_phoneFormatValidator.IsValid(phoneNumberModel.PhoneNumber))
-                        {
-                            context.Updater.ModelState.AddModelError(Prefix, nameof(phoneNumberModel.PhoneNumber), S["Please provide a valid phone number."]);
-                        }
-                        else
-                        {
-                            user.PhoneNumber = phoneNumberModel.PhoneNumber;
-                        }
+                        user.PhoneNumber = phoneNumberModel.PhoneNumber;
                     }
                 }
             }
-
-            return await EditAsync(user, context);
         }
 
-        private async Task<bool> CanEditUserInfoAsync(User user)
-        {
-            return !IsCurrentUser(user) || await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.EditOwnUser);
-        }
+        return await EditAsync(user, context);
+    }
 
-        private bool IsCurrentUser(User user)
-        {
-            return _httpContextAccessor.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier) == user.UserId;
-        }
+    private async Task<bool> CanEditUserInfoAsync(User user)
+    {
+        return !IsCurrentUser(user) || await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.EditOwnUser);
+    }
+
+    private bool IsCurrentUser(User user)
+    {
+        return _httpContextAccessor.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier) == user.UserId;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserOptionsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserOptionsDisplayDriver.cs
index fa49a005e59..0c0b330b9a6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserOptionsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserOptionsDisplayDriver.cs
@@ -3,66 +3,65 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Users.ViewModels;
 
-namespace OrchardCore.Users.Drivers
+namespace OrchardCore.Users.Drivers;
+
+public sealed class UserOptionsDisplayDriver : DisplayDriver<UserIndexOptions>
 {
-    public sealed class UserOptionsDisplayDriver : DisplayDriver<UserIndexOptions>
+    // Maintain the Options prefix for compatibility with binding.
+    protected override void BuildPrefix(UserIndexOptions options, string htmlFieldPrefix)
     {
-        // Maintain the Options prefix for compatibility with binding.
-        protected override void BuildPrefix(UserIndexOptions options, string htmlFieldPrefix)
-        {
-            Prefix = "Options";
-        }
+        Prefix = "Options";
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(UserIndexOptions model, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                Initialize<UserIndexOptions>("UsersAdminListBulkActions", m => BuildUserOptionsViewModel(m, model)).Location("BulkActions", "Content:10"),
-                View("UsersAdminFilters_Thumbnail__Name", model).Location("Thumbnail", "Content:10"),
-                View("UsersAdminFilters_Thumbnail__Email", model).Location("Thumbnail", "Content:20"),
-                View("UsersAdminFilters_Thumbnail__Status", model).Location("Thumbnail", "Content:30"),
-                View("UsersAdminFilters_Thumbnail__Role", model).Location("Thumbnail", "Content:40"),
-                View("UsersAdminFilters_Thumbnail__Sort", model).Location("Thumbnail", "Content:50")
-            );
-        }
+    public override Task<IDisplayResult> DisplayAsync(UserIndexOptions model, BuildDisplayContext context)
+    {
+        return CombineAsync(
+            Initialize<UserIndexOptions>("UsersAdminListBulkActions", m => BuildUserOptionsViewModel(m, model)).Location("BulkActions", "Content:10"),
+            View("UsersAdminFilters_Thumbnail__Name", model).Location("Thumbnail", "Content:10"),
+            View("UsersAdminFilters_Thumbnail__Email", model).Location("Thumbnail", "Content:20"),
+            View("UsersAdminFilters_Thumbnail__Status", model).Location("Thumbnail", "Content:30"),
+            View("UsersAdminFilters_Thumbnail__Role", model).Location("Thumbnail", "Content:40"),
+            View("UsersAdminFilters_Thumbnail__Sort", model).Location("Thumbnail", "Content:50")
+        );
+    }
 
-        public override Task<IDisplayResult> EditAsync(UserIndexOptions model, BuildEditorContext context)
-        {
-            // Map the filter result to a model so the ui can reflect current selections.
-            model.FilterResult.MapTo(model);
+    public override Task<IDisplayResult> EditAsync(UserIndexOptions model, BuildEditorContext context)
+    {
+        // Map the filter result to a model so the ui can reflect current selections.
+        model.FilterResult.MapTo(model);
 
-            return CombineAsync(
-                Initialize<UserIndexOptions>("UsersAdminListSearch", m => BuildUserOptionsViewModel(m, model)).Location("Search:10"),
-                Initialize<UserIndexOptions>("UsersAdminListCreate", m => BuildUserOptionsViewModel(m, model)).Location("Create:10"),
-                Initialize<UserIndexOptions>("UsersAdminListSummary", m => BuildUserOptionsViewModel(m, model)).Location("Summary:10"),
-                Initialize<UserIndexOptions>("UsersAdminListFilters", m => BuildUserOptionsViewModel(m, model)).Location("Actions:10.1"),
-                Initialize<UserIndexOptions>("UsersAdminList_Fields_BulkActions", m => BuildUserOptionsViewModel(m, model)).Location("Actions:10.1")
-            );
-        }
+        return CombineAsync(
+            Initialize<UserIndexOptions>("UsersAdminListSearch", m => BuildUserOptionsViewModel(m, model)).Location("Search:10"),
+            Initialize<UserIndexOptions>("UsersAdminListCreate", m => BuildUserOptionsViewModel(m, model)).Location("Create:10"),
+            Initialize<UserIndexOptions>("UsersAdminListSummary", m => BuildUserOptionsViewModel(m, model)).Location("Summary:10"),
+            Initialize<UserIndexOptions>("UsersAdminListFilters", m => BuildUserOptionsViewModel(m, model)).Location("Actions:10.1"),
+            Initialize<UserIndexOptions>("UsersAdminList_Fields_BulkActions", m => BuildUserOptionsViewModel(m, model)).Location("Actions:10.1")
+        );
+    }
 
-        public override Task<IDisplayResult> UpdateAsync(UserIndexOptions model, UpdateEditorContext context)
-        {
-            // Map the incoming values from a form post to the filter result.
-            model.FilterResult.MapFrom(model);
+    public override Task<IDisplayResult> UpdateAsync(UserIndexOptions model, UpdateEditorContext context)
+    {
+        // Map the incoming values from a form post to the filter result.
+        model.FilterResult.MapFrom(model);
 
-            return EditAsync(model, context);
-        }
+        return EditAsync(model, context);
+    }
 
-        private static void BuildUserOptionsViewModel(UserIndexOptions m, UserIndexOptions model)
-        {
-            m.SearchText = model.SearchText;
-            m.OriginalSearchText = model.OriginalSearchText;
-            m.Order = model.Order;
-            m.Filter = model.Filter;
-            m.BulkAction = model.BulkAction;
-            m.UserSorts = model.UserSorts;
-            m.UserFilters = model.UserFilters;
-            m.UsersBulkAction = model.UsersBulkAction;
-            m.UserRoleFilters = model.UserRoleFilters;
-            m.StartIndex = model.StartIndex;
-            m.EndIndex = model.EndIndex;
-            m.UsersCount = model.UsersCount;
-            m.TotalItemCount = model.TotalItemCount;
-            m.FilterResult = model.FilterResult;
-        }
+    private static void BuildUserOptionsViewModel(UserIndexOptions m, UserIndexOptions model)
+    {
+        m.SearchText = model.SearchText;
+        m.OriginalSearchText = model.OriginalSearchText;
+        m.Order = model.Order;
+        m.Filter = model.Filter;
+        m.BulkAction = model.BulkAction;
+        m.UserSorts = model.UserSorts;
+        m.UserFilters = model.UserFilters;
+        m.UsersBulkAction = model.UsersBulkAction;
+        m.UserRoleFilters = model.UserRoleFilters;
+        m.StartIndex = model.StartIndex;
+        m.EndIndex = model.EndIndex;
+        m.UsersCount = model.UsersCount;
+        m.TotalItemCount = model.TotalItemCount;
+        m.FilterResult = model.FilterResult;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserRoleDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserRoleDisplayDriver.cs
index b8861122372..aa4130abec4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserRoleDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Drivers/UserRoleDisplayDriver.cs
@@ -15,183 +15,182 @@
 using OrchardCore.Users.Models;
 using OrchardCore.Users.ViewModels;
 
-namespace OrchardCore.Users.Drivers
+namespace OrchardCore.Users.Drivers;
+
+public sealed class UserRoleDisplayDriver : DisplayDriver<User>
 {
-    public sealed class UserRoleDisplayDriver : DisplayDriver<User>
+    private readonly UserManager<IUser> _userManager;
+    private readonly IRoleService _roleService;
+    private readonly IUserRoleStore<IUser> _userRoleStore;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly INotifier _notifier;
+    private readonly IAuthorizationService _authorizationService;
+
+    internal readonly IHtmlLocalizer H;
+
+    public UserRoleDisplayDriver(
+        UserManager<IUser> userManager,
+        IRoleService roleService,
+        IUserRoleStore<IUser> userRoleStore,
+        IHttpContextAccessor httpContextAccessor,
+        INotifier notifier,
+        IAuthorizationService authorizationService,
+        IHtmlLocalizer<UserRoleDisplayDriver> htmlLocalizer)
     {
-        private readonly UserManager<IUser> _userManager;
-        private readonly IRoleService _roleService;
-        private readonly IUserRoleStore<IUser> _userRoleStore;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly INotifier _notifier;
-        private readonly IAuthorizationService _authorizationService;
-
-        internal readonly IHtmlLocalizer H;
-
-        public UserRoleDisplayDriver(
-            UserManager<IUser> userManager,
-            IRoleService roleService,
-            IUserRoleStore<IUser> userRoleStore,
-            IHttpContextAccessor httpContextAccessor,
-            INotifier notifier,
-            IAuthorizationService authorizationService,
-            IHtmlLocalizer<UserRoleDisplayDriver> htmlLocalizer)
-        {
-            _userManager = userManager;
-            _roleService = roleService;
-            _userRoleStore = userRoleStore;
-            _httpContextAccessor = httpContextAccessor;
-            _notifier = notifier;
-            _authorizationService = authorizationService;
-            H = htmlLocalizer;
-        }
+        _userManager = userManager;
+        _roleService = roleService;
+        _userRoleStore = userRoleStore;
+        _httpContextAccessor = httpContextAccessor;
+        _notifier = notifier;
+        _authorizationService = authorizationService;
+        H = htmlLocalizer;
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(User user, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                Initialize<SummaryAdminUserViewModel>("UserRolesMeta", model => model.User = user)
-                    .Location("SummaryAdmin", "Description"),
+    public override Task<IDisplayResult> DisplayAsync(User user, BuildDisplayContext context)
+    {
+        return CombineAsync(
+            Initialize<SummaryAdminUserViewModel>("UserRolesMeta", model => model.User = user)
+                .Location("SummaryAdmin", "Description"),
 
-                Initialize<SummaryAdminUserViewModel>("UserRoles", model => model.User = user)
-                    .Location("DetailAdmin", "Content:10")
-            );
-        }
+            Initialize<SummaryAdminUserViewModel>("UserRoles", model => model.User = user)
+                .Location("DetailAdmin", "Content:10")
+        );
+    }
 
-        public override IDisplayResult Edit(User user, BuildEditorContext context)
+    public override IDisplayResult Edit(User user, BuildEditorContext context)
+    {
+        // This view is always rendered, however there will be no editable roles if the user does not have permission to edit them.
+        return Initialize<EditUserRoleViewModel>("UserRoleFields_Edit", async model =>
         {
-            // This view is always rendered, however there will be no editable roles if the user does not have permission to edit them.
-            return Initialize<EditUserRoleViewModel>("UserRoleFields_Edit", async model =>
+            // The current user can only view their roles if they have assign role, to prevent listing roles when managing their own profile.
+            if (_httpContextAccessor.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier) == user.UserId
+                && !await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.AssignRoleToUsers))
             {
-                // The current user can only view their roles if they have assign role, to prevent listing roles when managing their own profile.
-                if (_httpContextAccessor.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier) == user.UserId
-                    && !await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.AssignRoleToUsers))
-                {
-                    return;
-                }
+                return;
+            }
 
-                var roles = await GetRoleAsync();
+            var roles = await GetRoleAsync();
 
-                // When a user is in a role that the current user cannot manage the role is shown but selection is disabled.
-                var authorizedRoleNames = await GetAccessibleRoleNamesAsync(roles);
-                var userRoleNames = await _userRoleStore.GetRolesAsync(user, default);
+            // When a user is in a role that the current user cannot manage the role is shown but selection is disabled.
+            var authorizedRoleNames = await GetAccessibleRoleNamesAsync(roles);
+            var userRoleNames = await _userRoleStore.GetRolesAsync(user, default);
 
-                var roleEntries = new List<RoleEntry>();
-                foreach (var roleName in authorizedRoleNames)
+            var roleEntries = new List<RoleEntry>();
+            foreach (var roleName in authorizedRoleNames)
+            {
+                var roleEntry = new RoleEntry
                 {
-                    var roleEntry = new RoleEntry
-                    {
-                        Role = roleName,
-                        IsSelected = userRoleNames.Contains(roleName, StringComparer.OrdinalIgnoreCase),
-                    };
+                    Role = roleName,
+                    IsSelected = userRoleNames.Contains(roleName, StringComparer.OrdinalIgnoreCase),
+                };
 
-                    roleEntries.Add(roleEntry);
-                }
+                roleEntries.Add(roleEntry);
+            }
 
-                model.Roles = roleEntries.ToArray();
-            })
-            .Location("Content:1.10")
-            .RenderWhen(() => _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.EditUsers, user));
-        }
+            model.Roles = roleEntries.ToArray();
+        })
+        .Location("Content:1.10")
+        .RenderWhen(() => _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.EditUsers, user));
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(User user, UpdateEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(User user, UpdateEditorContext context)
+    {
+        // The current user cannot alter their own roles. This prevents them removing access to the site for themselves.
+        if (_httpContextAccessor.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier) == user.UserId
+            && !await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, StandardPermissions.SiteOwner))
         {
-            // The current user cannot alter their own roles. This prevents them removing access to the site for themselves.
-            if (_httpContextAccessor.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier) == user.UserId
-                && !await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, StandardPermissions.SiteOwner))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var model = new EditUserRoleViewModel();
+        var model = new EditUserRoleViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            var roles = await GetRoleAsync();
-            // Authorize each role in the model to prevent html injection.
-            var accessibleRoleNames = await GetAccessibleRoleNamesAsync(roles);
-            var currentUserRoleNames = await _userRoleStore.GetRolesAsync(user, default);
+        var roles = await GetRoleAsync();
+        // Authorize each role in the model to prevent html injection.
+        var accessibleRoleNames = await GetAccessibleRoleNamesAsync(roles);
+        var currentUserRoleNames = await _userRoleStore.GetRolesAsync(user, default);
 
-            var selectedRoleNames = model.Roles.Where(x => x.IsSelected).Select(x => x.Role);
-            var selectedRoles = roles.Where(x => selectedRoleNames.Contains(x.RoleName, StringComparer.OrdinalIgnoreCase));
-            var accessibleAndSelectedRoleNames = await GetAccessibleRoleNamesAsync(selectedRoles);
+        var selectedRoleNames = model.Roles.Where(x => x.IsSelected).Select(x => x.Role);
+        var selectedRoles = roles.Where(x => selectedRoleNames.Contains(x.RoleName, StringComparer.OrdinalIgnoreCase));
+        var accessibleAndSelectedRoleNames = await GetAccessibleRoleNamesAsync(selectedRoles);
 
-            if (context.IsNew)
+        if (context.IsNew)
+        {
+            // Only add authorized new roles.
+            foreach (var role in accessibleAndSelectedRoleNames)
             {
-                // Only add authorized new roles.
-                foreach (var role in accessibleAndSelectedRoleNames)
-                {
-                    await _userRoleStore.AddToRoleAsync(user, _userManager.NormalizeName(role), default);
-                }
+                await _userRoleStore.AddToRoleAsync(user, _userManager.NormalizeName(role), default);
             }
-            else
+        }
+        else
+        {
+            // Remove roles in two steps to prevent an iteration on a modified collection.
+            var rolesToRemove = new List<string>();
+            foreach (var role in currentUserRoleNames)
             {
-                // Remove roles in two steps to prevent an iteration on a modified collection.
-                var rolesToRemove = new List<string>();
-                foreach (var role in currentUserRoleNames)
+                // When the user has permission to manage the role and it is no longer selected the role can be removed.
+                if (accessibleRoleNames.Contains(role, StringComparer.OrdinalIgnoreCase)
+                    && !accessibleAndSelectedRoleNames.Contains(role, StringComparer.OrdinalIgnoreCase))
                 {
-                    // When the user has permission to manage the role and it is no longer selected the role can be removed.
-                    if (accessibleRoleNames.Contains(role, StringComparer.OrdinalIgnoreCase)
-                        && !accessibleAndSelectedRoleNames.Contains(role, StringComparer.OrdinalIgnoreCase))
-                    {
-                        rolesToRemove.Add(role);
-                    }
+                    rolesToRemove.Add(role);
                 }
+            }
 
-                foreach (var role in rolesToRemove)
+            foreach (var role in rolesToRemove)
+            {
+                if (string.Equals(role, OrchardCoreConstants.Roles.Administrator, StringComparison.OrdinalIgnoreCase))
                 {
-                    if (string.Equals(role, OrchardCoreConstants.Roles.Administrator, StringComparison.OrdinalIgnoreCase))
+                    var enabledUsersOfAdminRole = (await _userManager.GetUsersInRoleAsync(OrchardCoreConstants.Roles.Administrator))
+                        .Cast<User>()
+                        .Where(user => user.IsEnabled)
+                        .ToList();
+
+                    // Make sure we always have at least one enabled administrator account.
+                    if (enabledUsersOfAdminRole.Count == 1 && user.UserId == enabledUsersOfAdminRole.First().UserId)
                     {
-                        var enabledUsersOfAdminRole = (await _userManager.GetUsersInRoleAsync(OrchardCoreConstants.Roles.Administrator))
-                            .Cast<User>()
-                            .Where(user => user.IsEnabled)
-                            .ToList();
-
-                        // Make sure we always have at least one enabled administrator account.
-                        if (enabledUsersOfAdminRole.Count == 1 && user.UserId == enabledUsersOfAdminRole.First().UserId)
-                        {
-                            await _notifier.WarningAsync(H[$"Cannot remove {OrchardCoreConstants.Roles.Administrator} role from the only enabled administrator."]);
-
-                            continue;
-                        }
-                    }
+                        await _notifier.WarningAsync(H[$"Cannot remove {OrchardCoreConstants.Roles.Administrator} role from the only enabled administrator."]);
 
-                    await _userRoleStore.RemoveFromRoleAsync(user, _userManager.NormalizeName(role), default);
+                        continue;
+                    }
                 }
 
-                // Add new roles.
-                foreach (var role in accessibleAndSelectedRoleNames)
+                await _userRoleStore.RemoveFromRoleAsync(user, _userManager.NormalizeName(role), default);
+            }
+
+            // Add new roles.
+            foreach (var role in accessibleAndSelectedRoleNames)
+            {
+                var normalizedName = _userManager.NormalizeName(role);
+                if (!await _userRoleStore.IsInRoleAsync(user, normalizedName, default))
                 {
-                    var normalizedName = _userManager.NormalizeName(role);
-                    if (!await _userRoleStore.IsInRoleAsync(user, normalizedName, default))
-                    {
-                        await _userRoleStore.AddToRoleAsync(user, normalizedName, default);
-                    }
+                    await _userRoleStore.AddToRoleAsync(user, normalizedName, default);
                 }
             }
-
-            return Edit(user, context);
         }
 
-        private async Task<IEnumerable<IRole>> GetRoleAsync()
-        {
-            var roles = await _roleService.GetRolesAsync();
+        return Edit(user, context);
+    }
 
-            return roles.Where(role => !RoleHelper.SystemRoleNames.Contains(role.RoleName));
-        }
+    private async Task<IEnumerable<IRole>> GetRoleAsync()
+    {
+        var roles = await _roleService.GetRolesAsync();
 
-        private async Task<IEnumerable<string>> GetAccessibleRoleNamesAsync(IEnumerable<IRole> roles)
-        {
-            var authorizedRoleNames = new List<string>();
+        return roles.Where(role => !RoleHelper.SystemRoleNames.Contains(role.RoleName));
+    }
 
-            foreach (var role in roles)
+    private async Task<IEnumerable<string>> GetAccessibleRoleNamesAsync(IEnumerable<IRole> roles)
+    {
+        var authorizedRoleNames = new List<string>();
+
+        foreach (var role in roles)
+        {
+            if (await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.AssignRoleToUsers, role))
             {
-                if (await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, CommonPermissions.AssignRoleToUsers, role))
-                {
-                    authorizedRoleNames.Add(role.RoleName);
-                }
+                authorizedRoleNames.Add(role.RoleName);
             }
-
-            return authorizedRoleNames;
         }
+
+        return authorizedRoleNames;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Extensions/ControllerExtensions.cs b/src/OrchardCore.Modules/OrchardCore.Users/Extensions/ControllerExtensions.cs
index 39fc1983a0c..9c036df0c6f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Extensions/ControllerExtensions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Extensions/ControllerExtensions.cs
@@ -18,113 +18,112 @@
 using OrchardCore.Users.Services;
 using OrchardCore.Users.ViewModels;
 
-namespace OrchardCore.Users.Controllers
+namespace OrchardCore.Users.Controllers;
+
+internal static class ControllerExtensions
 {
-    internal static class ControllerExtensions
+    internal static async Task<bool> SendEmailAsync(this Controller controller, string email, string subject, IShape model)
     {
-        internal static async Task<bool> SendEmailAsync(this Controller controller, string email, string subject, IShape model)
+        var emailService = controller.HttpContext.RequestServices.GetRequiredService<IEmailService>();
+        var displayHelper = controller.HttpContext.RequestServices.GetRequiredService<IDisplayHelper>();
+        var htmlEncoder = controller.HttpContext.RequestServices.GetRequiredService<HtmlEncoder>();
+        var body = string.Empty;
+
+        using (var sw = new StringWriter())
         {
-            var emailService = controller.HttpContext.RequestServices.GetRequiredService<IEmailService>();
-            var displayHelper = controller.HttpContext.RequestServices.GetRequiredService<IDisplayHelper>();
-            var htmlEncoder = controller.HttpContext.RequestServices.GetRequiredService<HtmlEncoder>();
-            var body = string.Empty;
+            var htmlContent = await displayHelper.ShapeExecuteAsync(model);
+            htmlContent.WriteTo(sw, htmlEncoder);
+            body = sw.ToString();
+        }
 
-            using (var sw = new StringWriter())
-            {
-                var htmlContent = await displayHelper.ShapeExecuteAsync(model);
-                htmlContent.WriteTo(sw, htmlEncoder);
-                body = sw.ToString();
-            }
+        var result = await emailService.SendAsync(email, subject, body);
 
-            var result = await emailService.SendAsync(email, subject, body);
+        return result.Succeeded;
+    }
 
-            return result.Succeeded;
-        }
+    /// <summary>
+    /// Returns the created user, otherwise returns null.
+    /// </summary>
+    /// <param name="controller"></param>
+    /// <param name="model"></param>
+    /// <param name="confirmationEmailSubject"></param>
+    /// <param name="logger"></param>
+    /// <returns></returns>
+    internal static async Task<IUser> RegisterUser(this Controller controller, RegisterUserForm model, string confirmationEmailSubject, ILogger logger)
+    {
+        var shellFeaturesManager = controller.ControllerContext.HttpContext.RequestServices.GetRequiredService<IShellFeaturesManager>();
 
-        /// <summary>
-        /// Returns the created user, otherwise returns null.
-        /// </summary>
-        /// <param name="controller"></param>
-        /// <param name="model"></param>
-        /// <param name="confirmationEmailSubject"></param>
-        /// <param name="logger"></param>
-        /// <returns></returns>
-        internal static async Task<IUser> RegisterUser(this Controller controller, RegisterUserForm model, string confirmationEmailSubject, ILogger logger)
+        var registrationFeatureIsAvailable = (await shellFeaturesManager.GetAvailableFeaturesAsync())
+           .Any(feature => feature.Id == UserConstants.Features.UserRegistration);
+
+        if (!registrationFeatureIsAvailable)
         {
-            var shellFeaturesManager = controller.ControllerContext.HttpContext.RequestServices.GetRequiredService<IShellFeaturesManager>();
+            return null;
+        }
 
-            var registrationFeatureIsAvailable = (await shellFeaturesManager.GetAvailableFeaturesAsync())
-               .Any(feature => feature.Id == UserConstants.Features.UserRegistration);
+        var settings = await controller.ControllerContext.HttpContext.RequestServices.GetRequiredService<ISiteService>().GetSettingsAsync<RegistrationSettings>();
 
-            if (!registrationFeatureIsAvailable)
-            {
-                return null;
-            }
+        if (settings.UsersCanRegister != UserRegistrationType.NoRegistration)
+        {
+            var registrationEvents = controller.ControllerContext.HttpContext.RequestServices.GetServices<IRegistrationFormEvents>();
 
-            var settings = await controller.ControllerContext.HttpContext.RequestServices.GetRequiredService<ISiteService>().GetSettingsAsync<RegistrationSettings>();
+            await registrationEvents.InvokeAsync((e, modelState) => e.RegistrationValidationAsync((key, message) => modelState.AddModelError(key, message)), controller.ModelState, logger);
 
-            if (settings.UsersCanRegister != UserRegistrationType.NoRegistration)
+            if (controller.ModelState.IsValid)
             {
-                var registrationEvents = controller.ControllerContext.HttpContext.RequestServices.GetServices<IRegistrationFormEvents>();
-
-                await registrationEvents.InvokeAsync((e, modelState) => e.RegistrationValidationAsync((key, message) => modelState.AddModelError(key, message)), controller.ModelState, logger);
+                var userService = controller.ControllerContext.HttpContext.RequestServices.GetRequiredService<IUserService>();
 
-                if (controller.ModelState.IsValid)
+                var user = await userService.CreateUserAsync(new User
                 {
-                    var userService = controller.ControllerContext.HttpContext.RequestServices.GetRequiredService<IUserService>();
+                    UserName = model.UserName,
+                    Email = model.Email,
+                    EmailConfirmed = !settings.UsersMustValidateEmail,
+                    IsEnabled = !settings.UsersAreModerated,
+                }, model.Password, controller.ModelState.AddModelError) as User;
 
-                    var user = await userService.CreateUserAsync(new User
+                if (user != null && controller.ModelState.IsValid)
+                {
+                    if (settings.UsersMustValidateEmail && !user.EmailConfirmed)
                     {
-                        UserName = model.UserName,
-                        Email = model.Email,
-                        EmailConfirmed = !settings.UsersMustValidateEmail,
-                        IsEnabled = !settings.UsersAreModerated,
-                    }, model.Password, controller.ModelState.AddModelError) as User;
-
-                    if (user != null && controller.ModelState.IsValid)
+                        // For more information on how to enable account confirmation and password reset please visit http://go.microsoft.com/fwlink/?LinkID=532713
+                        // Send an email with this link
+                        await controller.SendEmailConfirmationTokenAsync(user, confirmationEmailSubject);
+                    }
+                    else if (!(settings.UsersAreModerated && !user.IsEnabled))
                     {
-                        if (settings.UsersMustValidateEmail && !user.EmailConfirmed)
-                        {
-                            // For more information on how to enable account confirmation and password reset please visit http://go.microsoft.com/fwlink/?LinkID=532713
-                            // Send an email with this link
-                            await controller.SendEmailConfirmationTokenAsync(user, confirmationEmailSubject);
-                        }
-                        else if (!(settings.UsersAreModerated && !user.IsEnabled))
-                        {
-                            var signInManager = controller.ControllerContext.HttpContext.RequestServices.GetRequiredService<SignInManager<IUser>>();
-
-                            await signInManager.SignInAsync(user, isPersistent: false);
-                        }
-                        logger.LogInformation(3, "User created a new account with password.");
-                        await registrationEvents.InvokeAsync((e, user) => e.RegisteredAsync(user), user, logger);
-
-                        return user;
+                        var signInManager = controller.ControllerContext.HttpContext.RequestServices.GetRequiredService<SignInManager<IUser>>();
+
+                        await signInManager.SignInAsync(user, isPersistent: false);
                     }
+                    logger.LogInformation(3, "User created a new account with password.");
+                    await registrationEvents.InvokeAsync((e, user) => e.RegisteredAsync(user), user, logger);
+
+                    return user;
                 }
             }
-
-            return null;
         }
 
-        internal static async Task<string> SendEmailConfirmationTokenAsync(this Controller controller, User user, string subject)
-        {
-            var userManager = controller.ControllerContext.HttpContext.RequestServices.GetRequiredService<UserManager<IUser>>();
-            var code = await userManager.GenerateEmailConfirmationTokenAsync(user);
-            var callbackUrl = controller.Url.Action(nameof(EmailConfirmationController.ConfirmEmail), typeof(EmailConfirmationController).ControllerName(),
-                new
-                {
-                    userId = user.UserId,
-                    code,
-                },
-                protocol: controller.HttpContext.Request.Scheme);
+        return null;
+    }
 
-            await SendEmailAsync(controller, user.Email, subject, new ConfirmEmailViewModel()
+    internal static async Task<string> SendEmailConfirmationTokenAsync(this Controller controller, User user, string subject)
+    {
+        var userManager = controller.ControllerContext.HttpContext.RequestServices.GetRequiredService<UserManager<IUser>>();
+        var code = await userManager.GenerateEmailConfirmationTokenAsync(user);
+        var callbackUrl = controller.Url.Action(nameof(EmailConfirmationController.ConfirmEmail), typeof(EmailConfirmationController).ControllerName(),
+            new
             {
-                User = user,
-                ConfirmEmailUrl = callbackUrl,
-            });
+                userId = user.UserId,
+                code,
+            },
+            protocol: controller.HttpContext.Request.Scheme);
 
-            return callbackUrl;
-        }
+        await SendEmailAsync(controller, user.Email, subject, new ConfirmEmailViewModel()
+        {
+            User = user,
+            ConfirmEmailUrl = callbackUrl,
+        });
+
+        return callbackUrl;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Handlers/ScriptExternalLoginEventHandler.cs b/src/OrchardCore.Modules/OrchardCore.Users/Handlers/ScriptExternalLoginEventHandler.cs
index c8d4567f2e8..68c026b6a12 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Handlers/ScriptExternalLoginEventHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Handlers/ScriptExternalLoginEventHandler.cs
@@ -9,101 +9,100 @@
 using OrchardCore.Settings;
 using OrchardCore.Users.Models;
 
-namespace OrchardCore.Users.Handlers
+namespace OrchardCore.Users.Handlers;
+
+public class ScriptExternalLoginEventHandler : IExternalLoginEventHandler
 {
-    public class ScriptExternalLoginEventHandler : IExternalLoginEventHandler
+    private readonly ILogger _logger;
+    private readonly IScriptingManager _scriptingManager;
+    private readonly ISiteService _siteService;
+    private static readonly JsonMergeSettings _jsonMergeSettings = new JsonMergeSettings
     {
-        private readonly ILogger _logger;
-        private readonly IScriptingManager _scriptingManager;
-        private readonly ISiteService _siteService;
-        private static readonly JsonMergeSettings _jsonMergeSettings = new JsonMergeSettings
-        {
-            MergeArrayHandling = MergeArrayHandling.Union,
-            MergeNullValueHandling = MergeNullValueHandling.Merge
-        };
-
-        public ScriptExternalLoginEventHandler(
-            ISiteService siteService,
-            IScriptingManager scriptingManager,
-            ILogger<ScriptExternalLoginEventHandler> logger
-        )
-        {
-            _siteService = siteService;
-            _scriptingManager = scriptingManager;
-            _logger = logger;
-        }
+        MergeArrayHandling = MergeArrayHandling.Union,
+        MergeNullValueHandling = MergeNullValueHandling.Merge
+    };
 
-        public async Task<string> GenerateUserName(string provider, IEnumerable<SerializableClaim> claims)
-        {
-            var registrationSettings = await _siteService.GetSettingsAsync<RegistrationSettings>();
+    public ScriptExternalLoginEventHandler(
+        ISiteService siteService,
+        IScriptingManager scriptingManager,
+        ILogger<ScriptExternalLoginEventHandler> logger
+    )
+    {
+        _siteService = siteService;
+        _scriptingManager = scriptingManager;
+        _logger = logger;
+    }
+
+    public async Task<string> GenerateUserName(string provider, IEnumerable<SerializableClaim> claims)
+    {
+        var registrationSettings = await _siteService.GetSettingsAsync<RegistrationSettings>();
 
-            if (registrationSettings.UseScriptToGenerateUsername)
+        if (registrationSettings.UseScriptToGenerateUsername)
+        {
+            var context = new
             {
-                var context = new
-                {
-                    userName = string.Empty,
-                    loginProvider = provider,
-                    externalClaims = claims
-                };
+                userName = string.Empty,
+                loginProvider = provider,
+                externalClaims = claims
+            };
 
-                var script = $"js: function generateUsername(context) {{\n{registrationSettings.GenerateUsernameScript}\n}}\nvar context = {JConvert.SerializeObject(context, JOptions.CamelCase)};\ngenerateUsername(context);\nreturn context;";
+            var script = $"js: function generateUsername(context) {{\n{registrationSettings.GenerateUsernameScript}\n}}\nvar context = {JConvert.SerializeObject(context, JOptions.CamelCase)};\ngenerateUsername(context);\nreturn context;";
 
-                dynamic evaluationResult = _scriptingManager.Evaluate(script, null, null, null);
+            dynamic evaluationResult = _scriptingManager.Evaluate(script, null, null, null);
 
-                if (evaluationResult is IDictionary<string, object> data && data.TryGetValue("userName", out var userNameObj))
-                {
-                    return (string)userNameObj;
-                }
+            if (evaluationResult is IDictionary<string, object> data && data.TryGetValue("userName", out var userNameObj))
+            {
+                return (string)userNameObj;
             }
-
-            return string.Empty;
         }
 
-        public async Task UpdateUserAsync(UpdateUserContext context)
-        {
-            var loginSettings = await _siteService.GetSettingsAsync<LoginSettings>();
+        return string.Empty;
+    }
+
+    public async Task UpdateUserAsync(UpdateUserContext context)
+    {
+        var loginSettings = await _siteService.GetSettingsAsync<LoginSettings>();
 
-            UpdateUserInternal(context, loginSettings);
+        UpdateUserInternal(context, loginSettings);
+    }
+
+    public void UpdateUserInternal(UpdateUserContext context, LoginSettings loginSettings)
+    {
+        if (!loginSettings.UseScriptToSyncRoles)
+        {
+            return;
         }
 
-        public void UpdateUserInternal(UpdateUserContext context, LoginSettings loginSettings)
+        var script = $"js: function syncRoles(context) {{\n{loginSettings.SyncRolesScript}\n}}\nvar context={JConvert.SerializeObject(context, JOptions.CamelCase)};\nsyncRoles(context);\nreturn context;";
+        dynamic evaluationResult = _scriptingManager.Evaluate(script, null, null, null);
+        context.RolesToAdd.AddRange((evaluationResult.rolesToAdd as object[]).Select(i => i.ToString()));
+        context.RolesToRemove.AddRange((evaluationResult.rolesToRemove as object[]).Select(i => i.ToString()));
+
+        if (evaluationResult is IDictionary<string, object> data)
         {
-            if (!loginSettings.UseScriptToSyncRoles)
+            if (data.TryGetValue("claimsToUpdate", out var claimsToUpdateObj))
             {
-                return;
+                var claimsToUpdate = JArray.FromObject(claimsToUpdateObj).Deserialize<List<UserClaim>>(JOptions.CamelCase);
+                context.ClaimsToUpdate.AddRange(claimsToUpdate);
             }
 
-            var script = $"js: function syncRoles(context) {{\n{loginSettings.SyncRolesScript}\n}}\nvar context={JConvert.SerializeObject(context, JOptions.CamelCase)};\nsyncRoles(context);\nreturn context;";
-            dynamic evaluationResult = _scriptingManager.Evaluate(script, null, null, null);
-            context.RolesToAdd.AddRange((evaluationResult.rolesToAdd as object[]).Select(i => i.ToString()));
-            context.RolesToRemove.AddRange((evaluationResult.rolesToRemove as object[]).Select(i => i.ToString()));
-
-            if (evaluationResult is IDictionary<string, object> data)
+            if (data.TryGetValue("claimsToRemove", out var claimsToRemoveObj))
             {
-                if (data.TryGetValue("claimsToUpdate", out var claimsToUpdateObj))
-                {
-                    var claimsToUpdate = JArray.FromObject(claimsToUpdateObj).Deserialize<List<UserClaim>>(JOptions.CamelCase);
-                    context.ClaimsToUpdate.AddRange(claimsToUpdate);
-                }
+                var claimsToRemove = JArray.FromObject(claimsToRemoveObj).Deserialize<List<UserClaim>>(JOptions.CamelCase);
+                context.ClaimsToRemove.AddRange(claimsToRemove);
+            }
 
-                if (data.TryGetValue("claimsToRemove", out var claimsToRemoveObj))
+            if (data.TryGetValue("propertiesToUpdate", out var propertiesToUpdateObj))
+            {
+                var result = JObject.FromObject(propertiesToUpdateObj);
+                if (context.PropertiesToUpdate is not null)
                 {
-                    var claimsToRemove = JArray.FromObject(claimsToRemoveObj).Deserialize<List<UserClaim>>(JOptions.CamelCase);
-                    context.ClaimsToRemove.AddRange(claimsToRemove);
+                    // Perhaps other provider will fill some values. we should keep exists value.
+                    context.PropertiesToUpdate.Merge(result, _jsonMergeSettings);
                 }
-
-                if (data.TryGetValue("propertiesToUpdate", out var propertiesToUpdateObj))
+                else
                 {
-                    var result = JObject.FromObject(propertiesToUpdateObj);
-                    if (context.PropertiesToUpdate is not null)
-                    {
-                        // Perhaps other provider will fill some values. we should keep exists value.
-                        context.PropertiesToUpdate.Merge(result, _jsonMergeSettings);
-                    }
-                    else
-                    {
-                        context.PropertiesToUpdate = result;
-                    }
+                    context.PropertiesToUpdate = result;
                 }
             }
         }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Liquid/HasPermissionFilter.cs b/src/OrchardCore.Modules/OrchardCore.Users/Liquid/HasPermissionFilter.cs
index 7f22f0f001a..1cd0ff8186d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Liquid/HasPermissionFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Liquid/HasPermissionFilter.cs
@@ -6,38 +6,37 @@
 using OrchardCore.Liquid;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Users.Liquid
+namespace OrchardCore.Users.Liquid;
+
+public class HasPermissionFilter : ILiquidFilter
 {
-    public class HasPermissionFilter : ILiquidFilter
-    {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public HasPermissionFilter(IAuthorizationService authorizationService, IHttpContextAccessor httpContextAccessor)
-        {
-            _authorizationService = authorizationService;
-            _httpContextAccessor = httpContextAccessor;
-        }
+    public HasPermissionFilter(IAuthorizationService authorizationService, IHttpContextAccessor httpContextAccessor)
+    {
+        _authorizationService = authorizationService;
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        if (input.ToObjectValue() is LiquidUserAccessor)
         {
-            if (input.ToObjectValue() is LiquidUserAccessor)
+            var user = _httpContextAccessor.HttpContext?.User;
+            if (user != null)
             {
-                var user = _httpContextAccessor.HttpContext?.User;
-                if (user != null)
-                {
-                    var permissionName = arguments["permission"].Or(arguments.At(0)).ToStringValue();
-                    var resource = arguments["resource"].Or(arguments.At(1)).ToObjectValue();
+                var permissionName = arguments["permission"].Or(arguments.At(0)).ToStringValue();
+                var resource = arguments["resource"].Or(arguments.At(1)).ToObjectValue();
 
-                    if (!string.IsNullOrEmpty(permissionName) &&
-                        await _authorizationService.AuthorizeAsync(user, new Permission(permissionName), resource))
-                    {
-                        return BooleanValue.True;
-                    }
+                if (!string.IsNullOrEmpty(permissionName) &&
+                    await _authorizationService.AuthorizeAsync(user, new Permission(permissionName), resource))
+                {
+                    return BooleanValue.True;
                 }
             }
-
-            return BooleanValue.False;
         }
+
+        return BooleanValue.False;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Liquid/IsInRoleFilter.cs b/src/OrchardCore.Modules/OrchardCore.Users/Liquid/IsInRoleFilter.cs
index 223a21c328f..9c4f9d6689c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Liquid/IsInRoleFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Liquid/IsInRoleFilter.cs
@@ -8,37 +8,36 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Users.Liquid
+namespace OrchardCore.Users.Liquid;
+
+public class IsInRoleFilter : ILiquidFilter
 {
-    public class IsInRoleFilter : ILiquidFilter
-    {
-        private readonly IdentityOptions _identityOptions;
-        private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IdentityOptions _identityOptions;
+    private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public IsInRoleFilter(IOptions<IdentityOptions> identityOptions, IHttpContextAccessor httpContextAccessor)
-        {
-            _identityOptions = identityOptions.Value;
-            _httpContextAccessor = httpContextAccessor;
-        }
+    public IsInRoleFilter(IOptions<IdentityOptions> identityOptions, IHttpContextAccessor httpContextAccessor)
+    {
+        _identityOptions = identityOptions.Value;
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        if (input.ToObjectValue() is LiquidUserAccessor)
         {
-            if (input.ToObjectValue() is LiquidUserAccessor)
+            var user = _httpContextAccessor.HttpContext?.User;
+            if (user != null)
             {
-                var user = _httpContextAccessor.HttpContext?.User;
-                if (user != null)
-                {
-                    var claimName = arguments["name"].Or(arguments.At(0)).ToStringValue();
-                    var roleClaimType = _identityOptions.ClaimsIdentity.RoleClaimType;
+                var claimName = arguments["name"].Or(arguments.At(0)).ToStringValue();
+                var roleClaimType = _identityOptions.ClaimsIdentity.RoleClaimType;
 
-                    if (user.Claims.Any(claim => claim.Type == roleClaimType && claim.Value.Equals(claimName, StringComparison.OrdinalIgnoreCase)))
-                    {
-                        return new ValueTask<FluidValue>(BooleanValue.True);
-                    }
+                if (user.Claims.Any(claim => claim.Type == roleClaimType && claim.Value.Equals(claimName, StringComparison.OrdinalIgnoreCase)))
+                {
+                    return new ValueTask<FluidValue>(BooleanValue.True);
                 }
             }
-
-            return new ValueTask<FluidValue>(BooleanValue.False);
         }
+
+        return new ValueTask<FluidValue>(BooleanValue.False);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Liquid/LiquidUserAccessor.cs b/src/OrchardCore.Modules/OrchardCore.Users/Liquid/LiquidUserAccessor.cs
index abb09ca36f9..1f1a93c9fc6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Liquid/LiquidUserAccessor.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Liquid/LiquidUserAccessor.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Liquid
+namespace OrchardCore.Liquid;
+
+/// <summary>
+/// This is a placeholder class that allows modules to extend the `User` property in the current Liquid scope.
+/// </summary>
+public class LiquidUserAccessor
 {
-    /// <summary>
-    /// This is a placeholder class that allows modules to extend the `User` property in the current Liquid scope.
-    /// </summary>
-    public class LiquidUserAccessor
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Liquid/UserEmailFilter.cs b/src/OrchardCore.Modules/OrchardCore.Users/Liquid/UserEmailFilter.cs
index 68c7253f548..e04acfdfd25 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Liquid/UserEmailFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Liquid/UserEmailFilter.cs
@@ -6,45 +6,44 @@
 using Microsoft.AspNetCore.Identity;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Users.Liquid
+namespace OrchardCore.Users.Liquid;
+
+public class UserEmailFilter : ILiquidFilter
 {
-    public class UserEmailFilter : ILiquidFilter
-    {
-        private readonly UserManager<IUser> _userManager;
-        private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly UserManager<IUser> _userManager;
+    private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public UserEmailFilter(UserManager<IUser> userManager, IHttpContextAccessor httpContextAccessor)
-        {
-            _userManager = userManager;
-            _httpContextAccessor = httpContextAccessor;
-        }
+    public UserEmailFilter(UserManager<IUser> userManager, IHttpContextAccessor httpContextAccessor)
+    {
+        _userManager = userManager;
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments args, LiquidTemplateContext ctx)
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments args, LiquidTemplateContext ctx)
+    {
+        var value = input.ToObjectValue();
+        if (value is LiquidUserAccessor)
         {
-            var value = input.ToObjectValue();
-            if (value is LiquidUserAccessor)
+            var claimsPrincipal = _httpContextAccessor.HttpContext?.User;
+            if (claimsPrincipal != null)
             {
-                var claimsPrincipal = _httpContextAccessor.HttpContext?.User;
-                if (claimsPrincipal != null)
+                // Todo: Use 'IdentityOptions.ClaimsIdentity.EmailClaimType' that will be supported in a future version.
+                // Currently the 'DefaultUserClaimsPrincipalFactory' also uses an hardcoded "email" for the claim type.
+                var email = claimsPrincipal.FindFirstValue("email") ?? claimsPrincipal.FindFirstValue(ClaimTypes.Email);
+                if (email != null)
                 {
-                    // Todo: Use 'IdentityOptions.ClaimsIdentity.EmailClaimType' that will be supported in a future version.
-                    // Currently the 'DefaultUserClaimsPrincipalFactory' also uses an hardcoded "email" for the claim type.
-                    var email = claimsPrincipal.FindFirstValue("email") ?? claimsPrincipal.FindFirstValue(ClaimTypes.Email);
-                    if (email != null)
-                    {
-                        return FluidValue.Create(email, ctx.Options);
-                    }
-
-                    return NilValue.Instance;
+                    return FluidValue.Create(email, ctx.Options);
                 }
-            }
 
-            if (value is IUser user)
-            {
-                return FluidValue.Create(await _userManager.GetEmailAsync(user), ctx.Options);
+                return NilValue.Instance;
             }
+        }
 
-            return NilValue.Instance;
+        if (value is IUser user)
+        {
+            return FluidValue.Create(await _userManager.GetEmailAsync(user), ctx.Options);
         }
+
+        return NilValue.Instance;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Liquid/UserFilters.cs b/src/OrchardCore.Modules/OrchardCore.Users/Liquid/UserFilters.cs
index 3a6e1cc41da..628f2de64fd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Liquid/UserFilters.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Liquid/UserFilters.cs
@@ -6,50 +6,49 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Users.Liquid
+namespace OrchardCore.Users.Liquid;
+
+public static class UserFilters
 {
-    public static class UserFilters
+    public static ValueTask<FluidValue> HasClaim(FluidValue input, FilterArguments arguments, TemplateContext ctx)
     {
-        public static ValueTask<FluidValue> HasClaim(FluidValue input, FilterArguments arguments, TemplateContext ctx)
+        if (input.ToObjectValue() is LiquidUserAccessor)
         {
-            if (input.ToObjectValue() is LiquidUserAccessor)
+            var httpContextAccessor = ((LiquidTemplateContext)ctx).Services.GetRequiredService<IHttpContextAccessor>();
+
+            var user = httpContextAccessor.HttpContext?.User;
+            if (user != null)
             {
-                var httpContextAccessor = ((LiquidTemplateContext)ctx).Services.GetRequiredService<IHttpContextAccessor>();
+                var claimType = arguments["type"].Or(arguments.At(0)).ToStringValue();
+                var claimName = arguments["name"].Or(arguments.At(1)).ToStringValue();
 
-                var user = httpContextAccessor.HttpContext?.User;
-                if (user != null)
+                if (user.HasClaim(claimType, claimName))
                 {
-                    var claimType = arguments["type"].Or(arguments.At(0)).ToStringValue();
-                    var claimName = arguments["name"].Or(arguments.At(1)).ToStringValue();
-
-                    if (user.HasClaim(claimType, claimName))
-                    {
-                        return new ValueTask<FluidValue>(BooleanValue.True);
-                    }
+                    return new ValueTask<FluidValue>(BooleanValue.True);
                 }
             }
-
-            return new ValueTask<FluidValue>(BooleanValue.False);
         }
 
-        public static ValueTask<FluidValue> UserId(FluidValue input, FilterArguments _, TemplateContext ctx)
+        return new ValueTask<FluidValue>(BooleanValue.False);
+    }
+
+    public static ValueTask<FluidValue> UserId(FluidValue input, FilterArguments _, TemplateContext ctx)
+    {
+        if (input.ToObjectValue() is LiquidUserAccessor)
         {
-            if (input.ToObjectValue() is LiquidUserAccessor)
-            {
-                var httpContextAccessor = ((LiquidTemplateContext)ctx).Services.GetRequiredService<IHttpContextAccessor>();
+            var httpContextAccessor = ((LiquidTemplateContext)ctx).Services.GetRequiredService<IHttpContextAccessor>();
 
-                var user = httpContextAccessor.HttpContext?.User;
-                if (user != null)
+            var user = httpContextAccessor.HttpContext?.User;
+            if (user != null)
+            {
+                var userId = user.FindFirstValue(ClaimTypes.NameIdentifier);
+                if (userId != null)
                 {
-                    var userId = user.FindFirstValue(ClaimTypes.NameIdentifier);
-                    if (userId != null)
-                    {
-                        return new ValueTask<FluidValue>(FluidValue.Create(userId, ctx.Options));
-                    }
+                    return new ValueTask<FluidValue>(FluidValue.Create(userId, ctx.Options));
                 }
             }
-
-            return new ValueTask<FluidValue>(NilValue.Instance);
         }
+
+        return new ValueTask<FluidValue>(NilValue.Instance);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Liquid/UsersByIdFilter.cs b/src/OrchardCore.Modules/OrchardCore.Users/Liquid/UsersByIdFilter.cs
index f8447d7f6e2..436608f0890 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Liquid/UsersByIdFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Liquid/UsersByIdFilter.cs
@@ -9,58 +9,57 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.Users.Liquid
+namespace OrchardCore.Users.Liquid;
+
+public class UsersByIdFilter : ILiquidFilter
 {
-    public class UsersByIdFilter : ILiquidFilter
-    {
-        private readonly ISession _session;
+    private readonly ISession _session;
 
-        public UsersByIdFilter(ISession session)
-        {
-            _session = session;
-        }
+    public UsersByIdFilter(ISession session)
+    {
+        _session = session;
+    }
 
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        if (input.Type == FluidValues.Dictionary)
         {
-            if (input.Type == FluidValues.Dictionary)
+            if (input.ToObjectValue() is IFluidIndexable values)
             {
-                if (input.ToObjectValue() is IFluidIndexable values)
-                {
-                    var items = new Dictionary<long, string>();
+                var items = new Dictionary<long, string>();
 
-                    foreach (var key in values.Keys)
+                foreach (var key in values.Keys)
+                {
+                    if (long.TryParse(key, out var id) && values.TryGetValue(key, out var value))
                     {
-                        if (long.TryParse(key, out var id) && values.TryGetValue(key, out var value))
-                        {
-                            items.Add(id, value.ToStringValue());
-                        }
+                        items.Add(id, value.ToStringValue());
                     }
+                }
 
-                    var cachedUsers = await _session.GetAsync<User>(items.Keys.ToArray());
-
-                    var cachedUserIds = cachedUsers.Select(x => x.UserId).ToHashSet();
+                var cachedUsers = await _session.GetAsync<User>(items.Keys.ToArray());
 
-                    var missingUserIds = items.Values.Where(userId => !cachedUserIds.Contains(userId)).ToList();
+                var cachedUserIds = cachedUsers.Select(x => x.UserId).ToHashSet();
 
-                    var missingUsers = await _session.Query<User, UserIndex>(x => x.UserId.IsIn(missingUserIds)).ListAsync();
+                var missingUserIds = items.Values.Where(userId => !cachedUserIds.Contains(userId)).ToList();
 
-                    return FluidValue.Create(missingUsers.Concat(cachedUsers).ToList(), ctx.Options);
-                }
+                var missingUsers = await _session.Query<User, UserIndex>(x => x.UserId.IsIn(missingUserIds)).ListAsync();
 
-                return NilValue.Empty;
+                return FluidValue.Create(missingUsers.Concat(cachedUsers).ToList(), ctx.Options);
             }
 
-            if (input.Type == FluidValues.Array)
-            {
-                // List of user ids
-                var userIds = input.Enumerate(ctx).Select(x => x.ToStringValue()).ToArray();
-
-                return FluidValue.Create(await _session.Query<User, UserIndex>(x => x.UserId.IsIn(userIds)).ListAsync(), ctx.Options);
-            }
+            return NilValue.Empty;
+        }
 
-            var userId = input.ToStringValue();
+        if (input.Type == FluidValues.Array)
+        {
+            // List of user ids
+            var userIds = input.Enumerate(ctx).Select(x => x.ToStringValue()).ToArray();
 
-            return FluidValue.Create(await _session.Query<User, UserIndex>(x => x.UserId == userId).FirstOrDefaultAsync(), ctx.Options);
+            return FluidValue.Create(await _session.Query<User, UserIndex>(x => x.UserId.IsIn(userIds)).ListAsync(), ctx.Options);
         }
+
+        var userId = input.ToStringValue();
+
+        return FluidValue.Create(await _session.Query<User, UserIndex>(x => x.UserId == userId).FirstOrDefaultAsync(), ctx.Options);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Localization/UserLocalizationConstants.cs b/src/OrchardCore.Modules/OrchardCore.Users/Localization/UserLocalizationConstants.cs
index 611c89cabf7..a8453b605b4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Localization/UserLocalizationConstants.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Localization/UserLocalizationConstants.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Users.Localization
+namespace OrchardCore.Users.Localization;
+
+public static class UserLocalizationConstants
 {
-    public static class UserLocalizationConstants
-    {
-        public const string Invariant = "invariant";
-    }
+    public const string Invariant = "invariant";
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Users/Migrations.cs
index 512057a8af0..86bf1ecf7e5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Migrations.cs
@@ -11,282 +11,281 @@
 using YesSql;
 using YesSql.Sql;
 
-namespace OrchardCore.Users
+namespace OrchardCore.Users;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
+    public async Task<int> CreateAsync()
     {
-        public async Task<int> CreateAsync()
-        {
-            await SchemaBuilder.CreateMapIndexTableAsync<UserIndex>(table => table
-                .Column<string>("NormalizedUserName") // TODO These should have defaults. on SQL Server they will fall at 255. Exceptions are currently thrown if you go over that.
-                .Column<string>("NormalizedEmail")
-                .Column<bool>("IsEnabled", c => c.NotNull().WithDefault(true))
-                .Column<bool>("IsLockoutEnabled", c => c.NotNull().WithDefault(false))
-                .Column<DateTime?>("LockoutEndUtc", c => c.Nullable())
-                .Column<int>("AccessFailedCount", c => c.NotNull().WithDefault(0))
-                .Column<string>("UserId")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<UserIndex>(table => table
-                .CreateIndex("IDX_UserIndex_DocumentId",
-                    "DocumentId",
-                    "UserId",
-                    "NormalizedUserName",
-                    "NormalizedEmail",
-                    "IsEnabled"
-                    )
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<UserIndex>(table => table
-                .CreateIndex("IDX_UserIndex_Lockout",
-                    "DocumentId",
-                    "IsLockoutEnabled",
-                    "LockoutEndUtc",
-                    "AccessFailedCount"
-                    )
-            );
-
-            await SchemaBuilder.CreateReduceIndexTableAsync<UserByRoleNameIndex>(table => table
-               .Column<string>("RoleName")
-               .Column<int>("Count")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<UserByRoleNameIndex>(table => table
-                .CreateIndex("IDX_UserByRoleNameIndex_RoleName",
-                    "RoleName")
-            );
-
-            await SchemaBuilder.CreateMapIndexTableAsync<UserByLoginInfoIndex>(table => table
-                .Column<string>("LoginProvider")
-                .Column<string>("ProviderKey"));
-
-            await SchemaBuilder.AlterIndexTableAsync<UserByLoginInfoIndex>(table => table
-                .CreateIndex("IDX_UserByLoginInfoIndex_DocumentId",
-                    "DocumentId",
-                    "LoginProvider",
-                    "ProviderKey")
-            );
-
-            await SchemaBuilder.CreateMapIndexTableAsync<UserByClaimIndex>(table => table
-               .Column<string>("ClaimType")
-               .Column<string>("ClaimValue"),
-                null);
-
-            await SchemaBuilder.AlterIndexTableAsync<UserByClaimIndex>(table => table
-                .CreateIndex("IDX_UserByClaimIndex_DocumentId",
-                    "DocumentId",
-                    "ClaimType",
-                    "ClaimValue")
-            );
-
-            // Shortcut other migration steps on new content definition schemas.
-            return 13;
-        }
-
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom1Async()
-        {
-            await SchemaBuilder.CreateMapIndexTableAsync<UserByLoginInfoIndex>(table => table
-                .Column<string>("LoginProvider")
-                .Column<string>("ProviderKey"));
+        await SchemaBuilder.CreateMapIndexTableAsync<UserIndex>(table => table
+            .Column<string>("NormalizedUserName") // TODO These should have defaults. on SQL Server they will fall at 255. Exceptions are currently thrown if you go over that.
+            .Column<string>("NormalizedEmail")
+            .Column<bool>("IsEnabled", c => c.NotNull().WithDefault(true))
+            .Column<bool>("IsLockoutEnabled", c => c.NotNull().WithDefault(false))
+            .Column<DateTime?>("LockoutEndUtc", c => c.Nullable())
+            .Column<int>("AccessFailedCount", c => c.NotNull().WithDefault(0))
+            .Column<string>("UserId")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<UserIndex>(table => table
+            .CreateIndex("IDX_UserIndex_DocumentId",
+                "DocumentId",
+                "UserId",
+                "NormalizedUserName",
+                "NormalizedEmail",
+                "IsEnabled"
+                )
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<UserIndex>(table => table
+            .CreateIndex("IDX_UserIndex_Lockout",
+                "DocumentId",
+                "IsLockoutEnabled",
+                "LockoutEndUtc",
+                "AccessFailedCount"
+                )
+        );
+
+        await SchemaBuilder.CreateReduceIndexTableAsync<UserByRoleNameIndex>(table => table
+           .Column<string>("RoleName")
+           .Column<int>("Count")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<UserByRoleNameIndex>(table => table
+            .CreateIndex("IDX_UserByRoleNameIndex_RoleName",
+                "RoleName")
+        );
+
+        await SchemaBuilder.CreateMapIndexTableAsync<UserByLoginInfoIndex>(table => table
+            .Column<string>("LoginProvider")
+            .Column<string>("ProviderKey"));
+
+        await SchemaBuilder.AlterIndexTableAsync<UserByLoginInfoIndex>(table => table
+            .CreateIndex("IDX_UserByLoginInfoIndex_DocumentId",
+                "DocumentId",
+                "LoginProvider",
+                "ProviderKey")
+        );
+
+        await SchemaBuilder.CreateMapIndexTableAsync<UserByClaimIndex>(table => table
+           .Column<string>("ClaimType")
+           .Column<string>("ClaimValue"),
+            null);
+
+        await SchemaBuilder.AlterIndexTableAsync<UserByClaimIndex>(table => table
+            .CreateIndex("IDX_UserByClaimIndex_DocumentId",
+                "DocumentId",
+                "ClaimType",
+                "ClaimValue")
+        );
+
+        // Shortcut other migration steps on new content definition schemas.
+        return 13;
+    }
 
-            return 2;
-        }
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom1Async()
+    {
+        await SchemaBuilder.CreateMapIndexTableAsync<UserByLoginInfoIndex>(table => table
+            .Column<string>("LoginProvider")
+            .Column<string>("ProviderKey"));
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom2Async()
-        {
-            await SchemaBuilder.CreateMapIndexTableAsync<UserByClaimIndex>(table => table
-               .Column<string>("ClaimType")
-               .Column<string>("ClaimValue"),
-                null);
+        return 2;
+    }
 
-            return 3;
-        }
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom2Async()
+    {
+        await SchemaBuilder.CreateMapIndexTableAsync<UserByClaimIndex>(table => table
+           .Column<string>("ClaimType")
+           .Column<string>("ClaimValue"),
+            null);
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom3Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<UserIndex>(table => table
-                .AddColumn<bool>("IsEnabled", c => c.NotNull().WithDefault(true)));
+        return 3;
+    }
 
-            return 4;
-        }
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom3Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<UserIndex>(table => table
+            .AddColumn<bool>("IsEnabled", c => c.NotNull().WithDefault(true)));
 
-        // UserId database migration.
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom4Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<UserIndex>(table => table
-                .AddColumn<string>("UserId"));
+        return 4;
+    }
 
-            return 5;
-        }
+    // UserId database migration.
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom4Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<UserIndex>(table => table
+            .AddColumn<string>("UserId"));
+
+        return 5;
+    }
 
-        // UserId column is added. This initializes the UserId property to the UserName for existing users.
-        // The UserName property rather than the NormalizedUserName is used as the ContentItem.Owner property matches the UserName.
-        // New users will be created with a generated Id.
-        // This code can be removed in a later version.
+    // UserId column is added. This initializes the UserId property to the UserName for existing users.
+    // The UserName property rather than the NormalizedUserName is used as the ContentItem.Owner property matches the UserName.
+    // New users will be created with a generated Id.
+    // This code can be removed in a later version.
 #pragma warning disable CA1822 // Mark members as static
-        public int UpdateFrom5()
+    public int UpdateFrom5()
 #pragma warning restore CA1822 // Mark members as static
+    {
+        // Defer this until after the subsequent migrations have succeeded as the schema has changed.
+        ShellScope.AddDeferredTask(async scope =>
         {
-            // Defer this until after the subsequent migrations have succeeded as the schema has changed.
-            ShellScope.AddDeferredTask(async scope =>
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
+            var users = await session.Query<User>().ListAsync();
+            foreach (var user in users)
             {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
-                var users = await session.Query<User>().ListAsync();
-                foreach (var user in users)
-                {
-                    user.UserId = user.UserName;
-                    await session.SaveAsync(user);
-                }
-            });
-
-            return 6;
-        }
-
-        // This buggy migration has been removed.
-        // This code can be removed in a later version.
+                user.UserId = user.UserName;
+                await session.SaveAsync(user);
+            }
+        });
+
+        return 6;
+    }
+
+    // This buggy migration has been removed.
+    // This code can be removed in a later version.
 #pragma warning disable CA1822 // Mark members as static
-        public int UpdateFrom6()
+    public int UpdateFrom6()
 #pragma warning restore CA1822 // Mark members as static
-        {
-            return 7;
-        }
+    {
+        return 7;
+    }
 
-        // Migrate any user names replacing '@' with '+' as user names can no longer be an email address.
-        // This code can be removed in a later version.
+    // Migrate any user names replacing '@' with '+' as user names can no longer be an email address.
+    // This code can be removed in a later version.
 #pragma warning disable CA1822 // Mark members as static
-        public int UpdateFrom7()
+    public int UpdateFrom7()
 #pragma warning restore CA1822 // Mark members as static
+    {
+        // Defer this until after the subsequent migrations have succeeded as the schema has changed.
+        ShellScope.AddDeferredTask(async scope =>
         {
-            // Defer this until after the subsequent migrations have succeeded as the schema has changed.
-            ShellScope.AddDeferredTask(async scope =>
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
+            var users = await session.Query<User, UserIndex>(u => u.NormalizedUserName.Contains('@')).ListAsync();
+            foreach (var user in users)
             {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
-                var users = await session.Query<User, UserIndex>(u => u.NormalizedUserName.Contains('@')).ListAsync();
-                foreach (var user in users)
-                {
-                    user.UserName = user.UserName.Replace('@', '+');
-                    user.NormalizedUserName = user.NormalizedUserName.Replace('@', '+');
-                    await session.SaveAsync(user);
-                }
-            });
-
-            return 8;
-        }
-
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom8Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<UserIndex>(table => table
-                .CreateIndex("IDX_UserIndex_DocumentId",
-                    "DocumentId",
-                    "UserId",
-                    "NormalizedUserName",
-                    "NormalizedEmail",
-                    "IsEnabled")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<UserByLoginInfoIndex>(table => table
-                .CreateIndex("IDX_UserByLoginInfoIndex_DocumentId",
-                    "DocumentId",
-                    "LoginProvider",
-                    "ProviderKey")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<UserByClaimIndex>(table => table
-                .CreateIndex("IDX_UserByClaimIndex_DocumentId",
-                    "DocumentId",
-                    "ClaimType",
-                    "ClaimValue")
-            );
-
-            return 9;
-        }
-
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom9Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<UserByRoleNameIndex>(table => table
-                .CreateIndex("IDX_UserByRoleNameIndex_RoleName",
-                    "RoleName")
-            );
+                user.UserName = user.UserName.Replace('@', '+');
+                user.NormalizedUserName = user.NormalizedUserName.Replace('@', '+');
+                await session.SaveAsync(user);
+            }
+        });
 
-            return 10;
-        }
+        return 8;
+    }
 
-        public async Task<int> UpdateFrom10Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<UserIndex>(table => table
-                .AddColumn<bool>("IsLockoutEnabled", c => c.NotNull().WithDefault(false)));
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom8Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<UserIndex>(table => table
+            .CreateIndex("IDX_UserIndex_DocumentId",
+                "DocumentId",
+                "UserId",
+                "NormalizedUserName",
+                "NormalizedEmail",
+                "IsEnabled")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<UserByLoginInfoIndex>(table => table
+            .CreateIndex("IDX_UserByLoginInfoIndex_DocumentId",
+                "DocumentId",
+                "LoginProvider",
+                "ProviderKey")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<UserByClaimIndex>(table => table
+            .CreateIndex("IDX_UserByClaimIndex_DocumentId",
+                "DocumentId",
+                "ClaimType",
+                "ClaimValue")
+        );
+
+        return 9;
+    }
 
-            await SchemaBuilder.AlterIndexTableAsync<UserIndex>(table => table
-                .AddColumn<DateTime?>("LockoutEndUtc", c => c.Nullable()));
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom9Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<UserByRoleNameIndex>(table => table
+            .CreateIndex("IDX_UserByRoleNameIndex_RoleName",
+                "RoleName")
+        );
 
-            await SchemaBuilder.AlterIndexTableAsync<UserIndex>(table => table
-                .AddColumn<int>("AccessFailedCount", c => c.NotNull().WithDefault(0)));
+        return 10;
+    }
 
-            return 11;
-        }
+    public async Task<int> UpdateFrom10Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<UserIndex>(table => table
+            .AddColumn<bool>("IsLockoutEnabled", c => c.NotNull().WithDefault(false)));
 
-        public async Task<int> UpdateFrom11Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<UserIndex>(table => table
-                .CreateIndex("IDX_UserIndex_Lockout",
-                    "DocumentId",
-                    "IsLockoutEnabled",
-                    "LockoutEndUtc",
-                    "AccessFailedCount"
-                    )
-            );
-
-            return 12;
-        }
+        await SchemaBuilder.AlterIndexTableAsync<UserIndex>(table => table
+            .AddColumn<DateTime?>("LockoutEndUtc", c => c.Nullable()));
+
+        await SchemaBuilder.AlterIndexTableAsync<UserIndex>(table => table
+            .AddColumn<int>("AccessFailedCount", c => c.NotNull().WithDefault(0)));
+
+        return 11;
+    }
+
+    public async Task<int> UpdateFrom11Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<UserIndex>(table => table
+            .CreateIndex("IDX_UserIndex_Lockout",
+                "DocumentId",
+                "IsLockoutEnabled",
+                "LockoutEndUtc",
+                "AccessFailedCount"
+                )
+        );
+
+        return 12;
+    }
 
 #pragma warning disable CA1822 // Mark members as static
-        public int UpdateFrom12()
+    public int UpdateFrom12()
 #pragma warning restore CA1822 // Mark members as static
+    {
+        ShellScope.AddDeferredTask(async scope =>
         {
-            ShellScope.AddDeferredTask(async scope =>
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
+            var dbConnectionAccessor = scope.ServiceProvider.GetService<IDbConnectionAccessor>();
+            var logger = scope.ServiceProvider.GetService<ILogger<Migrations>>();
+            var tablePrefix = session.Store.Configuration.TablePrefix;
+            var documentTableName = session.Store.Configuration.TableNameConvention.GetDocumentTable();
+            var table = $"{session.Store.Configuration.TablePrefix}{documentTableName}";
+
+            logger.LogDebug("Updating User Settings");
+
+            await using var connection = dbConnectionAccessor.CreateConnection();
+            await connection.OpenAsync();
+            await using var transaction = await connection.BeginTransactionAsync(session.Store.Configuration.IsolationLevel);
+            var dialect = session.Store.Configuration.SqlDialect;
+
+            try
             {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
-                var dbConnectionAccessor = scope.ServiceProvider.GetService<IDbConnectionAccessor>();
-                var logger = scope.ServiceProvider.GetService<ILogger<Migrations>>();
-                var tablePrefix = session.Store.Configuration.TablePrefix;
-                var documentTableName = session.Store.Configuration.TableNameConvention.GetDocumentTable();
-                var table = $"{session.Store.Configuration.TablePrefix}{documentTableName}";
-
-                logger.LogDebug("Updating User Settings");
-
-                await using var connection = dbConnectionAccessor.CreateConnection();
-                await connection.OpenAsync();
-                await using var transaction = await connection.BeginTransactionAsync(session.Store.Configuration.IsolationLevel);
-                var dialect = session.Store.Configuration.SqlDialect;
-
-                try
-                {
-                    var quotedTableName = dialect.QuoteForTableName(table, session.Store.Configuration.Schema);
-                    var quotedContentColumnName = dialect.QuoteForColumnName("Content");
-                    var quotedTypeColumnName = dialect.QuoteForColumnName("Type");
-
-                    var updateCmd = $"UPDATE {quotedTableName} SET {quotedContentColumnName} = REPLACE({quotedContentColumnName}, 'OrchardCore.Users.Models.LoginSettings, OrchardCore.Users', 'OrchardCore.Users.Models.LoginSettings, OrchardCore.Users.Core') WHERE {quotedTypeColumnName} = 'OrchardCore.Deployment.DeploymentPlan, OrchardCore.Deployment.Abstractions'";
-
-                    await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
-
-                    await transaction.CommitAsync();
-                }
-                catch (Exception e)
-                {
-                    await transaction.RollbackAsync();
-                    logger.LogError(e, "An error occurred while updating User Settings");
-
-                    throw;
-                }
-            });
-
-            return 13;
-        }
+                var quotedTableName = dialect.QuoteForTableName(table, session.Store.Configuration.Schema);
+                var quotedContentColumnName = dialect.QuoteForColumnName("Content");
+                var quotedTypeColumnName = dialect.QuoteForColumnName("Type");
+
+                var updateCmd = $"UPDATE {quotedTableName} SET {quotedContentColumnName} = REPLACE({quotedContentColumnName}, 'OrchardCore.Users.Models.LoginSettings, OrchardCore.Users', 'OrchardCore.Users.Models.LoginSettings, OrchardCore.Users.Core') WHERE {quotedTypeColumnName} = 'OrchardCore.Deployment.DeploymentPlan, OrchardCore.Deployment.Abstractions'";
+
+                await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
+
+                await transaction.CommitAsync();
+            }
+            catch (Exception e)
+            {
+                await transaction.RollbackAsync();
+                logger.LogError(e, "An error occurred while updating User Settings");
+
+                throw;
+            }
+        });
+
+        return 13;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Models/ChangeEmailSettings.cs b/src/OrchardCore.Modules/OrchardCore.Users/Models/ChangeEmailSettings.cs
index f7fd3348bfe..95ed992412f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Models/ChangeEmailSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Models/ChangeEmailSettings.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Users.Models
+namespace OrchardCore.Users.Models;
+
+public class ChangeEmailSettings
 {
-    public class ChangeEmailSettings
-    {
-        public bool AllowChangeEmail { get; set; }
-    }
+    public bool AllowChangeEmail { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Models/RegistrationSettings.cs b/src/OrchardCore.Modules/OrchardCore.Users/Models/RegistrationSettings.cs
index f31c63894ec..38a1e843147 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Models/RegistrationSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Models/RegistrationSettings.cs
@@ -1,15 +1,14 @@
-namespace OrchardCore.Users.Models
+namespace OrchardCore.Users.Models;
+
+public class RegistrationSettings
 {
-    public class RegistrationSettings
-    {
-        public UserRegistrationType UsersCanRegister { get; set; }
-        public bool UsersMustValidateEmail { get; set; }
-        public bool UsersAreModerated { get; set; }
-        public bool UseSiteTheme { get; set; }
-        public bool NoPasswordForExternalUsers { get; set; }
-        public bool NoUsernameForExternalUsers { get; set; }
-        public bool NoEmailForExternalUsers { get; set; }
-        public bool UseScriptToGenerateUsername { get; set; }
-        public string GenerateUsernameScript { get; set; }
-    }
+    public UserRegistrationType UsersCanRegister { get; set; }
+    public bool UsersMustValidateEmail { get; set; }
+    public bool UsersAreModerated { get; set; }
+    public bool UseSiteTheme { get; set; }
+    public bool NoPasswordForExternalUsers { get; set; }
+    public bool NoUsernameForExternalUsers { get; set; }
+    public bool NoEmailForExternalUsers { get; set; }
+    public bool UseScriptToGenerateUsername { get; set; }
+    public string GenerateUsernameScript { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Models/ResetPasswordSettings.cs b/src/OrchardCore.Modules/OrchardCore.Users/Models/ResetPasswordSettings.cs
index 1d130a6677a..bb567659436 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Models/ResetPasswordSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Models/ResetPasswordSettings.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Users.Models
+namespace OrchardCore.Users.Models;
+
+public class ResetPasswordSettings
 {
-    public class ResetPasswordSettings
-    {
-        public bool AllowResetPassword { get; set; }
-        public bool UseSiteTheme { get; set; }
-    }
+    public bool AllowResetPassword { get; set; }
+    public bool UseSiteTheme { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Models/UserRegistrationType.cs b/src/OrchardCore.Modules/OrchardCore.Users/Models/UserRegistrationType.cs
index 72a11aa571c..5e0596069a9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Models/UserRegistrationType.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Models/UserRegistrationType.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Users.Models
+namespace OrchardCore.Users.Models;
+
+public enum UserRegistrationType
 {
-    public enum UserRegistrationType
-    {
-        NoRegistration = 0,
-        AllowRegistration = 1,
-        AllowOnlyExternalUsers = 2
-    }
+    NoRegistration = 0,
+    AllowRegistration = 1,
+    AllowOnlyExternalUsers = 2
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Services/AuthenticatorAppProviderTwoFactorOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Users/Services/AuthenticatorAppProviderTwoFactorOptionsConfiguration.cs
index a1e38510333..d4b2c31c491 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Services/AuthenticatorAppProviderTwoFactorOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Services/AuthenticatorAppProviderTwoFactorOptionsConfiguration.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;
 using OrchardCore.Users.Models;
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Services/DefaultUserIdGenerator.cs b/src/OrchardCore.Modules/OrchardCore.Users/Services/DefaultUserIdGenerator.cs
index f0d5329d59d..0f458c624ec 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Services/DefaultUserIdGenerator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Services/DefaultUserIdGenerator.cs
@@ -1,19 +1,18 @@
 using OrchardCore.Entities;
 
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+public class DefaultUserIdGenerator : IUserIdGenerator
 {
-    public class DefaultUserIdGenerator : IUserIdGenerator
-    {
-        private readonly IIdGenerator _generator;
+    private readonly IIdGenerator _generator;
 
-        public DefaultUserIdGenerator(IIdGenerator generator)
-        {
-            _generator = generator;
-        }
+    public DefaultUserIdGenerator(IIdGenerator generator)
+    {
+        _generator = generator;
+    }
 
-        public string GenerateUniqueId(IUser user)
-        {
-            return _generator.GenerateUniqueId();
-        }
+    public string GenerateUniqueId(IUser user)
+    {
+        return _generator.GenerateUniqueId();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Services/DefaultUsersAdminListFilterParser.cs b/src/OrchardCore.Modules/OrchardCore.Users/Services/DefaultUsersAdminListFilterParser.cs
index f18fee3b7f8..3b17cca0ce7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Services/DefaultUsersAdminListFilterParser.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Services/DefaultUsersAdminListFilterParser.cs
@@ -1,18 +1,17 @@
 using OrchardCore.Users.Models;
 using YesSql.Filters.Query;
 
-namespace OrchardCore.Users.Services
-{
-    public class DefaultUsersAdminListFilterParser : IUsersAdminListFilterParser
-    {
-        private readonly IQueryParser<User> _parser;
+namespace OrchardCore.Users.Services;
 
-        public DefaultUsersAdminListFilterParser(IQueryParser<User> parser)
-        {
-            _parser = parser;
-        }
+public class DefaultUsersAdminListFilterParser : IUsersAdminListFilterParser
+{
+    private readonly IQueryParser<User> _parser;
 
-        public QueryFilterResult<User> Parse(string text)
-            => _parser.Parse(text);
+    public DefaultUsersAdminListFilterParser(IQueryParser<User> parser)
+    {
+        _parser = parser;
     }
+
+    public QueryFilterResult<User> Parse(string text)
+        => _parser.Parse(text);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Services/DefaultUsersAdminListFilterProvider.cs b/src/OrchardCore.Modules/OrchardCore.Users/Services/DefaultUsersAdminListFilterProvider.cs
index 05f3ead7488..3d65a02f6e2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Services/DefaultUsersAdminListFilterProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Services/DefaultUsersAdminListFilterProvider.cs
@@ -9,146 +9,145 @@
 using YesSql.Filters.Query;
 using YesSql.Services;
 
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+public class DefaultUsersAdminListFilterProvider : IUsersAdminListFilterProvider
 {
-    public class DefaultUsersAdminListFilterProvider : IUsersAdminListFilterProvider
+    public void Build(QueryEngineBuilder<User> builder)
     {
-        public void Build(QueryEngineBuilder<User> builder)
-        {
-            builder
-                .WithNamedTerm("status", builder => builder
-                    .OneCondition((val, query) =>
+        builder
+            .WithNamedTerm("status", builder => builder
+                .OneCondition((val, query) =>
+                {
+                    if (Enum.TryParse<UsersFilter>(val, true, out var usersStatus))
                     {
-                        if (Enum.TryParse<UsersFilter>(val, true, out var usersStatus))
+                        switch (usersStatus)
                         {
-                            switch (usersStatus)
-                            {
-                                case UsersFilter.Enabled:
-                                    query.With<UserIndex>(u => u.IsEnabled);
-                                    break;
-                                case UsersFilter.Disabled:
-                                    query.With<UserIndex>(u => !u.IsEnabled);
-                                    break;
-                            }
+                            case UsersFilter.Enabled:
+                                query.With<UserIndex>(u => u.IsEnabled);
+                                break;
+                            case UsersFilter.Disabled:
+                                query.With<UserIndex>(u => !u.IsEnabled);
+                                break;
                         }
+                    }
 
-                        return query;
-                    })
-                    .MapTo<UserIndexOptions>((val, model) =>
+                    return query;
+                })
+                .MapTo<UserIndexOptions>((val, model) =>
+                {
+                    if (Enum.TryParse<UsersFilter>(val, true, out var usersFilter))
                     {
-                        if (Enum.TryParse<UsersFilter>(val, true, out var usersFilter))
-                        {
-                            model.Filter = usersFilter;
-                        }
-                    })
-                    .MapFrom<UserIndexOptions>((model) =>
+                        model.Filter = usersFilter;
+                    }
+                })
+                .MapFrom<UserIndexOptions>((model) =>
+                {
+                    return model.Filter switch
                     {
-                        return model.Filter switch
+                        UsersFilter.Enabled => (true, model.Filter.ToString()),
+                        UsersFilter.Disabled => (true, model.Filter.ToString()),
+                        _ => (false, string.Empty)
+                    };
+                })
+            )
+            .WithNamedTerm("sort", builder => builder
+                .OneCondition((val, query) =>
+                {
+                    if (Enum.TryParse<UsersOrder>(val, true, out var usersOrder))
+                    {
+                        switch (usersOrder)
                         {
-                            UsersFilter.Enabled => (true, model.Filter.ToString()),
-                            UsersFilter.Disabled => (true, model.Filter.ToString()),
-                            _ => (false, string.Empty)
+                            case UsersOrder.Name:
+                                query.With<UserIndex>().OrderBy(u => u.NormalizedUserName);
+                                break;
+                            case UsersOrder.Email:
+                                query.With<UserIndex>().OrderBy(u => u.NormalizedEmail);
+                                break;
                         };
-                    })
-                )
-                .WithNamedTerm("sort", builder => builder
-                    .OneCondition((val, query) =>
+                    }
+                    else
                     {
-                        if (Enum.TryParse<UsersOrder>(val, true, out var usersOrder))
-                        {
-                            switch (usersOrder)
-                            {
-                                case UsersOrder.Name:
-                                    query.With<UserIndex>().OrderBy(u => u.NormalizedUserName);
-                                    break;
-                                case UsersOrder.Email:
-                                    query.With<UserIndex>().OrderBy(u => u.NormalizedEmail);
-                                    break;
-                            };
-                        }
-                        else
-                        {
-                            query.With<UserIndex>().OrderBy(u => u.NormalizedUserName);
-                        }
+                        query.With<UserIndex>().OrderBy(u => u.NormalizedUserName);
+                    }
 
-                        return query;
-                    })
-                    .MapTo<UserIndexOptions>((val, model) =>
+                    return query;
+                })
+                .MapTo<UserIndexOptions>((val, model) =>
+                {
+                    if (Enum.TryParse<UsersOrder>(val, true, out var order))
                     {
-                        if (Enum.TryParse<UsersOrder>(val, true, out var order))
-                        {
-                            model.Order = order;
-                        }
-                    })
-                    .MapFrom<UserIndexOptions>((model) =>
+                        model.Order = order;
+                    }
+                })
+                .MapFrom<UserIndexOptions>((model) =>
+                {
+                    if (model.Order != UsersOrder.Name)
                     {
-                        if (model.Order != UsersOrder.Name)
-                        {
-                            return (true, model.Order.ToString());
-                        }
+                        return (true, model.Order.ToString());
+                    }
 
-                        return (false, string.Empty);
-                    })
-                    .AlwaysRun()
-                )
-                .WithNamedTerm("role", builder => builder
-                    .OneCondition((val, query, ctx) =>
+                    return (false, string.Empty);
+                })
+                .AlwaysRun()
+            )
+            .WithNamedTerm("role", builder => builder
+                .OneCondition((val, query, ctx) =>
+                {
+                    var context = (UserQueryContext)ctx;
+                    var userManager = context.ServiceProvider.GetRequiredService<UserManager<IUser>>();
+                    var normalizedRoleName = userManager.NormalizeName(val);
+                    query.With<UserByRoleNameIndex>(x => x.RoleName == normalizedRoleName);
+
+                    return new ValueTask<IQuery<User>>(query);
+                })
+                .MapTo<UserIndexOptions>((val, model) => model.SelectedRole = val)
+                .MapFrom<UserIndexOptions>((model) => (!string.IsNullOrEmpty(model.SelectedRole), model.SelectedRole))
+            )
+            .WithDefaultTerm(UsersAdminListFilterOptions.DefaultTermName, builder => builder
+                .ManyCondition(
+                    (val, query, ctx) =>
                     {
                         var context = (UserQueryContext)ctx;
                         var userManager = context.ServiceProvider.GetRequiredService<UserManager<IUser>>();
-                        var normalizedRoleName = userManager.NormalizeName(val);
-                        query.With<UserByRoleNameIndex>(x => x.RoleName == normalizedRoleName);
+                        var normalizedUserName = userManager.NormalizeName(val);
+                        query.With<UserIndex>(x => x.NormalizedUserName.Contains(normalizedUserName));
 
                         return new ValueTask<IQuery<User>>(query);
-                    })
-                    .MapTo<UserIndexOptions>((val, model) => model.SelectedRole = val)
-                    .MapFrom<UserIndexOptions>((model) => (!string.IsNullOrEmpty(model.SelectedRole), model.SelectedRole))
-                )
-                .WithDefaultTerm(UsersAdminListFilterOptions.DefaultTermName, builder => builder
-                    .ManyCondition(
-                        (val, query, ctx) =>
-                        {
-                            var context = (UserQueryContext)ctx;
-                            var userManager = context.ServiceProvider.GetRequiredService<UserManager<IUser>>();
-                            var normalizedUserName = userManager.NormalizeName(val);
-                            query.With<UserIndex>(x => x.NormalizedUserName.Contains(normalizedUserName));
-
-                            return new ValueTask<IQuery<User>>(query);
-                        },
-                        (val, query, ctx) =>
-                        {
-                            var context = (UserQueryContext)ctx;
-                            var userManager = context.ServiceProvider.GetRequiredService<UserManager<IUser>>();
-                            var normalizedUserName = userManager.NormalizeName(val);
-                            query.With<UserIndex>(x => x.NormalizedUserName.NotContains(normalizedUserName));
+                    },
+                    (val, query, ctx) =>
+                    {
+                        var context = (UserQueryContext)ctx;
+                        var userManager = context.ServiceProvider.GetRequiredService<UserManager<IUser>>();
+                        var normalizedUserName = userManager.NormalizeName(val);
+                        query.With<UserIndex>(x => x.NormalizedUserName.NotContains(normalizedUserName));
 
-                            return new ValueTask<IQuery<User>>(query);
-                        }
-                    )
+                        return new ValueTask<IQuery<User>>(query);
+                    }
                 )
-                .WithNamedTerm("email", builder => builder
-                    .ManyCondition(
-                        (val, query, ctx) =>
-                        {
-                            var context = (UserQueryContext)ctx;
-                            var userManager = context.ServiceProvider.GetRequiredService<UserManager<IUser>>();
-                            var normalizedEmail = userManager.NormalizeEmail(val);
-                            query.With<UserIndex>(x => x.NormalizedEmail.Contains(normalizedEmail));
+            )
+            .WithNamedTerm("email", builder => builder
+                .ManyCondition(
+                    (val, query, ctx) =>
+                    {
+                        var context = (UserQueryContext)ctx;
+                        var userManager = context.ServiceProvider.GetRequiredService<UserManager<IUser>>();
+                        var normalizedEmail = userManager.NormalizeEmail(val);
+                        query.With<UserIndex>(x => x.NormalizedEmail.Contains(normalizedEmail));
 
-                            return new ValueTask<IQuery<User>>(query);
-                        },
-                        (val, query, ctx) =>
-                        {
-                            var context = (UserQueryContext)ctx;
-                            var userManager = context.ServiceProvider.GetRequiredService<UserManager<IUser>>();
-                            var normalizedEmail = userManager.NormalizeEmail(val);
-                            query.With<UserIndex>(x => x.NormalizedEmail.NotContains(normalizedEmail));
+                        return new ValueTask<IQuery<User>>(query);
+                    },
+                    (val, query, ctx) =>
+                    {
+                        var context = (UserQueryContext)ctx;
+                        var userManager = context.ServiceProvider.GetRequiredService<UserManager<IUser>>();
+                        var normalizedEmail = userManager.NormalizeEmail(val);
+                        query.With<UserIndex>(x => x.NormalizedEmail.NotContains(normalizedEmail));
 
-                            return new ValueTask<IQuery<User>>(query);
-                        }
-                    )
-                );
+                        return new ValueTask<IQuery<User>>(query);
+                    }
+                )
+            );
 
-        }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Services/EmailClaimsProvider.cs b/src/OrchardCore.Modules/OrchardCore.Users/Services/EmailClaimsProvider.cs
index 09da912098d..23835fb06c6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Services/EmailClaimsProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Services/EmailClaimsProvider.cs
@@ -3,35 +3,34 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
 
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+public class EmailClaimsProvider : IUserClaimsProvider
 {
-    public class EmailClaimsProvider : IUserClaimsProvider
-    {
-        private readonly UserManager<IUser> _userManager;
+    private readonly UserManager<IUser> _userManager;
 
-        public EmailClaimsProvider(UserManager<IUser> userManager)
-        {
-            _userManager = userManager;
-        }
+    public EmailClaimsProvider(UserManager<IUser> userManager)
+    {
+        _userManager = userManager;
+    }
 
-        public async Task GenerateAsync(IUser user, ClaimsIdentity claims)
-        {
-            ArgumentNullException.ThrowIfNull(user);
+    public async Task GenerateAsync(IUser user, ClaimsIdentity claims)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            ArgumentNullException.ThrowIfNull(claims);
+        ArgumentNullException.ThrowIfNull(claims);
 
-            // Todo: In a future version the base implementation will generate the email claim if the user store is an 'IUserEmailStore',
-            // so we will not have to add it here, and everywhere we are using the hardcoded "email" claim type, we will have to use the
-            // new 'IdentityOptions.ClaimsIdentity.EmailClaimType' or at least its default value which is 'ClaimTypes.Email'.
+        // Todo: In a future version the base implementation will generate the email claim if the user store is an 'IUserEmailStore',
+        // so we will not have to add it here, and everywhere we are using the hardcoded "email" claim type, we will have to use the
+        // new 'IdentityOptions.ClaimsIdentity.EmailClaimType' or at least its default value which is 'ClaimTypes.Email'.
 
-            var email = await _userManager.GetEmailAsync(user);
-            if (!string.IsNullOrEmpty(email))
-            {
-                claims.AddClaim(new Claim("email", email));
+        var email = await _userManager.GetEmailAsync(user);
+        if (!string.IsNullOrEmpty(email))
+        {
+            claims.AddClaim(new Claim("email", email));
 
-                var confirmed = await _userManager.IsEmailConfirmedAsync(user);
-                claims.AddClaim(new Claim("email_verified", confirmed ? bool.TrueString : bool.FalseString, ClaimValueTypes.Boolean));
-            }
+            var confirmed = await _userManager.IsEmailConfirmedAsync(user);
+            claims.AddClaim(new Claim("email_verified", confirmed ? bool.TrueString : bool.FalseString, ClaimValueTypes.Boolean));
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Services/MembershipService.cs b/src/OrchardCore.Modules/OrchardCore.Users/Services/MembershipService.cs
index 45400e671f0..8fb9e87aa33 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Services/MembershipService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Services/MembershipService.cs
@@ -3,43 +3,42 @@
 using Microsoft.AspNetCore.Identity;
 using OrchardCore.Users.Models;
 
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+public class MembershipService : IMembershipService
 {
-    public class MembershipService : IMembershipService
+    private readonly UserManager<IUser> _userManager;
+    private readonly IUserClaimsPrincipalFactory<IUser> _claimsPrincipalFactory;
+
+    public MembershipService(
+        IUserClaimsPrincipalFactory<IUser> claimsPrincipalFactory,
+        UserManager<IUser> userManager)
     {
-        private readonly UserManager<IUser> _userManager;
-        private readonly IUserClaimsPrincipalFactory<IUser> _claimsPrincipalFactory;
+        _claimsPrincipalFactory = claimsPrincipalFactory;
+        _userManager = userManager;
+    }
 
-        public MembershipService(
-            IUserClaimsPrincipalFactory<IUser> claimsPrincipalFactory,
-            UserManager<IUser> userManager)
-        {
-            _claimsPrincipalFactory = claimsPrincipalFactory;
-            _userManager = userManager;
-        }
+    public async Task<bool> CheckPasswordAsync(string userName, string password)
+    {
+        var user = await _userManager.FindByNameAsync(userName);
 
-        public async Task<bool> CheckPasswordAsync(string userName, string password)
+        if (user == null)
         {
-            var user = await _userManager.FindByNameAsync(userName);
-
-            if (user == null)
-            {
-                return false;
-            }
-
-            return await _userManager.CheckPasswordAsync(user, password);
+            return false;
         }
 
-        public async Task<IUser> GetUserAsync(string userName)
-        {
-            var user = await _userManager.FindByNameAsync(userName);
+        return await _userManager.CheckPasswordAsync(user, password);
+    }
 
-            return user;
-        }
+    public async Task<IUser> GetUserAsync(string userName)
+    {
+        var user = await _userManager.FindByNameAsync(userName);
 
-        public Task<ClaimsPrincipal> CreateClaimsPrincipal(IUser user)
-        {
-            return _claimsPrincipalFactory.CreateAsync(user as User);
-        }
+        return user;
+    }
+
+    public Task<ClaimsPrincipal> CreateClaimsPrincipal(IUser user)
+    {
+        return _claimsPrincipalFactory.CreateAsync(user as User);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Services/RecipeEnvironmentSuperUserProvider.cs b/src/OrchardCore.Modules/OrchardCore.Users/Services/RecipeEnvironmentSuperUserProvider.cs
index f247b50a062..6813c0ebbfd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Services/RecipeEnvironmentSuperUserProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Services/RecipeEnvironmentSuperUserProvider.cs
@@ -6,51 +6,50 @@
 using OrchardCore.Recipes.Services;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+public class RecipeEnvironmentSuperUserProvider : IRecipeEnvironmentProvider
 {
-    public class RecipeEnvironmentSuperUserProvider : IRecipeEnvironmentProvider
-    {
-        private readonly ISiteService _siteService;
-        private readonly IServiceProvider _serviceProvider;
-        private IUserService _userService;
-        private readonly ILogger _logger;
+    private readonly ISiteService _siteService;
+    private readonly IServiceProvider _serviceProvider;
+    private IUserService _userService;
+    private readonly ILogger _logger;
 
-        public RecipeEnvironmentSuperUserProvider(
-            ISiteService siteService,
-            IServiceProvider serviceProvider,
-            ILogger<RecipeEnvironmentSuperUserProvider> logger)
-        {
-            _siteService = siteService;
-            _serviceProvider = serviceProvider;
-            _logger = logger;
-        }
+    public RecipeEnvironmentSuperUserProvider(
+        ISiteService siteService,
+        IServiceProvider serviceProvider,
+        ILogger<RecipeEnvironmentSuperUserProvider> logger)
+    {
+        _siteService = siteService;
+        _serviceProvider = serviceProvider;
+        _logger = logger;
+    }
 
-        public int Order => 0;
+    public int Order => 0;
 
-        public async Task PopulateEnvironmentAsync(IDictionary<string, object> environment)
+    public async Task PopulateEnvironmentAsync(IDictionary<string, object> environment)
+    {
+        var siteSettings = await _siteService.GetSiteSettingsAsync();
+        if (!string.IsNullOrEmpty(siteSettings.SuperUser))
         {
-            var siteSettings = await _siteService.GetSiteSettingsAsync();
-            if (!string.IsNullOrEmpty(siteSettings.SuperUser))
+            try
             {
-                try
-                {
-                    // 'IUserService' has many dependencies including options configurations code, particularly with 'OpenId',
-                    // so, because this 'IRecipeEnvironmentProvider' may be injected by an `IDataMigration` even if there is no
-                    // migration to do, 'IUserService' is lazily resolved, so that it is not injected on each shell activation.
-                    _userService ??= _serviceProvider.GetRequiredService<IUserService>();
+                // 'IUserService' has many dependencies including options configurations code, particularly with 'OpenId',
+                // so, because this 'IRecipeEnvironmentProvider' may be injected by an `IDataMigration` even if there is no
+                // migration to do, 'IUserService' is lazily resolved, so that it is not injected on each shell activation.
+                _userService ??= _serviceProvider.GetRequiredService<IUserService>();
 
-                    var superUser = await _userService.GetUserByUniqueIdAsync(siteSettings.SuperUser);
-                    if (superUser != null)
-                    {
-                        environment["AdminUserId"] = siteSettings.SuperUser;
-                        environment["AdminUsername"] = superUser.UserName;
-                    }
-                }
-                catch
+                var superUser = await _userService.GetUserByUniqueIdAsync(siteSettings.SuperUser);
+                if (superUser != null)
                 {
-                    _logger.LogWarning("Could not lookup the admin user, user migrations may not have run yet.");
+                    environment["AdminUserId"] = siteSettings.SuperUser;
+                    environment["AdminUsername"] = superUser.UserName;
                 }
             }
+            catch
+            {
+                _logger.LogWarning("Could not lookup the admin user, user migrations may not have run yet.");
+            }
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Services/SetupEventHandler.cs b/src/OrchardCore.Modules/OrchardCore.Users/Services/SetupEventHandler.cs
index 43b1cf724e8..c8e50791d66 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Services/SetupEventHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Services/SetupEventHandler.cs
@@ -4,36 +4,35 @@
 using OrchardCore.Setup.Services;
 using OrchardCore.Users.Models;
 
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+/// <summary>
+/// During setup, creates the admin user account.
+/// </summary>
+public class SetupEventHandler : ISetupEventHandler
 {
-    /// <summary>
-    /// During setup, creates the admin user account.
-    /// </summary>
-    public class SetupEventHandler : ISetupEventHandler
-    {
-        private readonly IUserService _userService;
+    private readonly IUserService _userService;
 
-        public SetupEventHandler(IUserService userService)
-        {
-            _userService = userService;
-        }
+    public SetupEventHandler(IUserService userService)
+    {
+        _userService = userService;
+    }
 
-        public Task SetupAsync(SetupContext context)
+    public Task SetupAsync(SetupContext context)
+    {
+        var user = new User
         {
-            var user = new User
-            {
-                UserName = context.Properties.TryGetValue(SetupConstants.AdminUsername, out var adminUserName) ? adminUserName?.ToString() : string.Empty,
-                UserId = context.Properties.TryGetValue(SetupConstants.AdminUserId, out var adminUserId) ? adminUserId?.ToString() : string.Empty,
-                Email = context.Properties.TryGetValue(SetupConstants.AdminEmail, out var adminEmail) ? adminEmail?.ToString() : string.Empty,
-                EmailConfirmed = true
-            };
+            UserName = context.Properties.TryGetValue(SetupConstants.AdminUsername, out var adminUserName) ? adminUserName?.ToString() : string.Empty,
+            UserId = context.Properties.TryGetValue(SetupConstants.AdminUserId, out var adminUserId) ? adminUserId?.ToString() : string.Empty,
+            Email = context.Properties.TryGetValue(SetupConstants.AdminEmail, out var adminEmail) ? adminEmail?.ToString() : string.Empty,
+            EmailConfirmed = true
+        };
 
-            user.RoleNames.Add(OrchardCoreConstants.Roles.Administrator);
+        user.RoleNames.Add(OrchardCoreConstants.Roles.Administrator);
 
-            return _userService.CreateUserAsync(user, context.Properties[SetupConstants.AdminPassword]?.ToString(), (key, message) =>
-            {
-                context.Errors[key] = message;
-            });
-        }
+        return _userService.CreateUserAsync(user, context.Properties[SetupConstants.AdminPassword]?.ToString(), (key, message) =>
+        {
+            context.Errors[key] = message;
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Services/UserRoleRemovedEventHandler.cs b/src/OrchardCore.Modules/OrchardCore.Users/Services/UserRoleRemovedEventHandler.cs
index 071c0b17139..beca47d10c7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Services/UserRoleRemovedEventHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Services/UserRoleRemovedEventHandler.cs
@@ -2,25 +2,24 @@
 using Microsoft.AspNetCore.Identity;
 using OrchardCore.Security;
 
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+public class UserRoleRemovedEventHandler : IRoleRemovedEventHandler
 {
-    public class UserRoleRemovedEventHandler : IRoleRemovedEventHandler
+    private readonly UserManager<IUser> _userManager;
+
+    public UserRoleRemovedEventHandler(UserManager<IUser> userManager)
     {
-        private readonly UserManager<IUser> _userManager;
+        _userManager = userManager;
+    }
 
-        public UserRoleRemovedEventHandler(UserManager<IUser> userManager)
-        {
-            _userManager = userManager;
-        }
+    public async Task RoleRemovedAsync(string roleName)
+    {
+        var users = await _userManager.GetUsersInRoleAsync(roleName);
 
-        public async Task RoleRemovedAsync(string roleName)
+        foreach (var user in users)
         {
-            var users = await _userManager.GetUsersInRoleAsync(roleName);
-
-            foreach (var user in users)
-            {
-                await _userManager.RemoveFromRoleAsync(user, roleName);
-            }
+            await _userManager.RemoveFromRoleAsync(user, roleName);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Services/UsersThemeSelector.cs b/src/OrchardCore.Modules/OrchardCore.Users/Services/UsersThemeSelector.cs
index 84a99e555a4..f4c942c8da7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Services/UsersThemeSelector.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Services/UsersThemeSelector.cs
@@ -6,90 +6,89 @@
 using OrchardCore.Settings;
 using OrchardCore.Users.Models;
 
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+/// <summary>
+/// Provides the theme defined in the site configuration for the current scope (request).
+/// This selector provides AdminTheme as default or fallback for Account for Registration,
+/// ResetPassword, TwoFactorAuthentication, SmsAuthenticator and AuthenticatorApp
+/// controllers based on SiteSettings.
+/// The same <see cref="ThemeSelectorResult"/> is returned if called multiple times
+/// during the same scope.
+/// </summary>
+public class UsersThemeSelector : IThemeSelector
 {
-    /// <summary>
-    /// Provides the theme defined in the site configuration for the current scope (request).
-    /// This selector provides AdminTheme as default or fallback for Account for Registration,
-    /// ResetPassword, TwoFactorAuthentication, SmsAuthenticator and AuthenticatorApp
-    /// controllers based on SiteSettings.
-    /// The same <see cref="ThemeSelectorResult"/> is returned if called multiple times
-    /// during the same scope.
-    /// </summary>
-    public class UsersThemeSelector : IThemeSelector
+    private readonly ISiteService _siteService;
+    private readonly IAdminThemeService _adminThemeService;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+
+    public UsersThemeSelector(
+        ISiteService siteService,
+        IAdminThemeService adminThemeService,
+        IHttpContextAccessor httpContextAccessor)
     {
-        private readonly ISiteService _siteService;
-        private readonly IAdminThemeService _adminThemeService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
+        _siteService = siteService;
+        _adminThemeService = adminThemeService;
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        public UsersThemeSelector(
-            ISiteService siteService,
-            IAdminThemeService adminThemeService,
-            IHttpContextAccessor httpContextAccessor)
-        {
-            _siteService = siteService;
-            _adminThemeService = adminThemeService;
-            _httpContextAccessor = httpContextAccessor;
-        }
+    public async Task<ThemeSelectorResult> GetThemeAsync()
+    {
+        var routeValues = _httpContextAccessor.HttpContext.Request.RouteValues;
 
-        public async Task<ThemeSelectorResult> GetThemeAsync()
+        if (routeValues["area"]?.ToString() == UserConstants.Features.Users)
         {
-            var routeValues = _httpContextAccessor.HttpContext.Request.RouteValues;
+            bool useSiteTheme;
 
-            if (routeValues["area"]?.ToString() == UserConstants.Features.Users)
+            switch (routeValues["controller"]?.ToString())
             {
-                bool useSiteTheme;
-
-                switch (routeValues["controller"]?.ToString())
-                {
-                    case "Account":
-                        useSiteTheme = (await _siteService.GetSettingsAsync<LoginSettings>()).UseSiteTheme;
-                        break;
-                    case "TwoFactorAuthentication":
+                case "Account":
+                    useSiteTheme = (await _siteService.GetSettingsAsync<LoginSettings>()).UseSiteTheme;
+                    break;
+                case "TwoFactorAuthentication":
+                    {
+                        if (routeValues["action"] != null
+                           && routeValues["action"].ToString().StartsWith("LoginWith", StringComparison.OrdinalIgnoreCase)
+                           && (await _siteService.GetSettingsAsync<LoginSettings>()).UseSiteTheme)
                         {
-                            if (routeValues["action"] != null
-                               && routeValues["action"].ToString().StartsWith("LoginWith", StringComparison.OrdinalIgnoreCase)
-                               && (await _siteService.GetSettingsAsync<LoginSettings>()).UseSiteTheme)
-                            {
-                                useSiteTheme = true;
-                            }
-                            else
-                            {
-                                useSiteTheme = (await _siteService.GetSettingsAsync<TwoFactorLoginSettings>()).UseSiteTheme;
-                            }
+                            useSiteTheme = true;
                         }
-                        break;
-                    case "SmsAuthenticator":
-                    case "AuthenticatorApp":
+                        else
                         {
                             useSiteTheme = (await _siteService.GetSettingsAsync<TwoFactorLoginSettings>()).UseSiteTheme;
                         }
-                        break;
-                    case "Registration":
-                        useSiteTheme = (await _siteService.GetSettingsAsync<RegistrationSettings>()).UseSiteTheme;
-                        break;
-                    case "ResetPassword":
-                        useSiteTheme = (await _siteService.GetSettingsAsync<ResetPasswordSettings>()).UseSiteTheme;
-                        break;
-                    default:
-                        return null;
-                }
-
-                var adminThemeName = await _adminThemeService.GetAdminThemeNameAsync();
-
-                if (string.IsNullOrEmpty(adminThemeName))
-                {
+                    }
+                    break;
+                case "SmsAuthenticator":
+                case "AuthenticatorApp":
+                    {
+                        useSiteTheme = (await _siteService.GetSettingsAsync<TwoFactorLoginSettings>()).UseSiteTheme;
+                    }
+                    break;
+                case "Registration":
+                    useSiteTheme = (await _siteService.GetSettingsAsync<RegistrationSettings>()).UseSiteTheme;
+                    break;
+                case "ResetPassword":
+                    useSiteTheme = (await _siteService.GetSettingsAsync<ResetPasswordSettings>()).UseSiteTheme;
+                    break;
+                default:
                     return null;
-                }
+            }
+
+            var adminThemeName = await _adminThemeService.GetAdminThemeNameAsync();
 
-                return new ThemeSelectorResult
-                {
-                    Priority = useSiteTheme ? -100 : 100,
-                    ThemeName = adminThemeName
-                };
+            if (string.IsNullOrEmpty(adminThemeName))
+            {
+                return null;
             }
 
-            return null;
+            return new ThemeSelectorResult
+            {
+                Priority = useSiteTheme ? -100 : 100,
+                ThemeName = adminThemeName
+            };
         }
+
+        return null;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Users/Startup.cs
index ca96fc1ecf4..8ceede4c535 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Startup.cs
@@ -52,519 +52,518 @@
 using OrchardCore.Users.ViewModels;
 using YesSql.Filters.Query;
 
-namespace OrchardCore.Users
-{
-    public sealed class Startup : StartupBase
-    {
-        private static readonly string _accountControllerName = typeof(AccountController).ControllerName();
-        private static readonly string _emailConfirmationControllerName = typeof(EmailConfirmationController).ControllerName();
-
-
-        private readonly string _tenantName;
-        private UserOptions _userOptions;
-
-        public Startup(ShellSettings shellSettings)
-        {
-            _tenantName = shellSettings.Name;
-        }
-
-        public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            _userOptions ??= serviceProvider.GetRequiredService<IOptions<UserOptions>>().Value;
-
-            routes.MapAreaControllerRoute(
-                name: "Login",
-                areaName: UserConstants.Features.Users,
-                pattern: _userOptions.LoginPath,
-                defaults: new
-                {
-                    controller = _accountControllerName,
-                    action = nameof(AccountController.Login),
-                }
-            );
+namespace OrchardCore.Users;
 
-            routes.MapAreaControllerRoute(
-                name: "ChangePassword",
-                areaName: UserConstants.Features.Users,
-                pattern: _userOptions.ChangePasswordUrl,
-                defaults: new
-                {
-                    controller = _accountControllerName,
-                    action = nameof(AccountController.ChangePassword),
-                }
-            );
+public sealed class Startup : StartupBase
+{
+    private static readonly string _accountControllerName = typeof(AccountController).ControllerName();
+    private static readonly string _emailConfirmationControllerName = typeof(EmailConfirmationController).ControllerName();
 
-            routes.MapAreaControllerRoute(
-                name: "ChangePasswordConfirmation",
-                areaName: UserConstants.Features.Users,
-                pattern: _userOptions.ChangePasswordConfirmationUrl,
-                defaults: new
-                {
-                    controller = _accountControllerName,
-                    action = nameof(AccountController.ChangePasswordConfirmation),
-                }
-            );
 
-            routes.MapAreaControllerRoute(
-                name: "UsersLogOff",
-                areaName: UserConstants.Features.Users,
-                pattern: _userOptions.LogoffPath,
-                defaults: new
-                {
-                    controller = _accountControllerName,
-                    action = nameof(AccountController.LogOff),
-                }
-            );
+    private readonly string _tenantName;
+    private UserOptions _userOptions;
 
-            routes.MapAreaControllerRoute(
-                name: "ExternalLogins",
-                areaName: UserConstants.Features.Users,
-                pattern: _userOptions.ExternalLoginsUrl,
-                defaults: new
-                {
-                    controller = _accountControllerName,
-                    action = nameof(AccountController.ExternalLogins),
-                }
-            );
+    public Startup(ShellSettings shellSettings)
+    {
+        _tenantName = shellSettings.Name;
+    }
 
-            routes.MapAreaControllerRoute(
-                name: "ConfirmEmail",
-                areaName: UserConstants.Features.Users,
-                pattern: "ConfirmEmail",
-                defaults: new
-                {
-                    controller = _emailConfirmationControllerName,
-                    action = nameof(EmailConfirmationController.ConfirmEmail),
-                }
-            );
+    public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        _userOptions ??= serviceProvider.GetRequiredService<IOptions<UserOptions>>().Value;
 
-            routes.MapAreaControllerRoute(
-                name: "ConfirmEmailSent",
-                areaName: UserConstants.Features.Users,
-                pattern: "ConfirmEmailSent",
-                defaults: new
-                {
-                    controller = _emailConfirmationControllerName,
-                    action = nameof(EmailConfirmationController.ConfirmEmailSent),
-                }
-            );
+        routes.MapAreaControllerRoute(
+            name: "Login",
+            areaName: UserConstants.Features.Users,
+            pattern: _userOptions.LoginPath,
+            defaults: new
+            {
+                controller = _accountControllerName,
+                action = nameof(AccountController.Login),
+            }
+        );
+
+        routes.MapAreaControllerRoute(
+            name: "ChangePassword",
+            areaName: UserConstants.Features.Users,
+            pattern: _userOptions.ChangePasswordUrl,
+            defaults: new
+            {
+                controller = _accountControllerName,
+                action = nameof(AccountController.ChangePassword),
+            }
+        );
+
+        routes.MapAreaControllerRoute(
+            name: "ChangePasswordConfirmation",
+            areaName: UserConstants.Features.Users,
+            pattern: _userOptions.ChangePasswordConfirmationUrl,
+            defaults: new
+            {
+                controller = _accountControllerName,
+                action = nameof(AccountController.ChangePasswordConfirmation),
+            }
+        );
+
+        routes.MapAreaControllerRoute(
+            name: "UsersLogOff",
+            areaName: UserConstants.Features.Users,
+            pattern: _userOptions.LogoffPath,
+            defaults: new
+            {
+                controller = _accountControllerName,
+                action = nameof(AccountController.LogOff),
+            }
+        );
+
+        routes.MapAreaControllerRoute(
+            name: "ExternalLogins",
+            areaName: UserConstants.Features.Users,
+            pattern: _userOptions.ExternalLoginsUrl,
+            defaults: new
+            {
+                controller = _accountControllerName,
+                action = nameof(AccountController.ExternalLogins),
+            }
+        );
+
+        routes.MapAreaControllerRoute(
+            name: "ConfirmEmail",
+            areaName: UserConstants.Features.Users,
+            pattern: "ConfirmEmail",
+            defaults: new
+            {
+                controller = _emailConfirmationControllerName,
+                action = nameof(EmailConfirmationController.ConfirmEmail),
+            }
+        );
+
+        routes.MapAreaControllerRoute(
+            name: "ConfirmEmailSent",
+            areaName: UserConstants.Features.Users,
+            pattern: "ConfirmEmailSent",
+            defaults: new
+            {
+                controller = _emailConfirmationControllerName,
+                action = nameof(EmailConfirmationController.ConfirmEmailSent),
+            }
+        );
 
-            builder.UseAuthorization();
-        }
+        builder.UseAuthorization();
+    }
 
-        public override void ConfigureServices(IServiceCollection services)
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.Configure<UserOptions>(userOptions =>
         {
-            services.Configure<UserOptions>(userOptions =>
-            {
-                var configuration = ShellScope.Services.GetRequiredService<IShellConfiguration>();
-                configuration.GetSection("OrchardCore_Users").Bind(userOptions);
-            });
+            var configuration = ShellScope.Services.GetRequiredService<IShellConfiguration>();
+            configuration.GetSection("OrchardCore_Users").Bind(userOptions);
+        });
 
-            // Add ILookupNormalizer as Singleton because it is needed by UserIndexProvider
-            services.TryAddSingleton<ILookupNormalizer, UpperInvariantLookupNormalizer>();
+        // Add ILookupNormalizer as Singleton because it is needed by UserIndexProvider
+        services.TryAddSingleton<ILookupNormalizer, UpperInvariantLookupNormalizer>();
 
-            // Add the default token providers used to generate tokens for an admin to change user's password.
-            services.AddIdentity<IUser, IRole>()
-                .AddTokenProvider<DataProtectorTokenProvider<IUser>>(TokenOptions.DefaultProvider);
+        // Add the default token providers used to generate tokens for an admin to change user's password.
+        services.AddIdentity<IUser, IRole>()
+            .AddTokenProvider<DataProtectorTokenProvider<IUser>>(TokenOptions.DefaultProvider);
 
-            // Configure token provider for email confirmation.
-            services.AddTransient<IConfigureOptions<IdentityOptions>, EmailConfirmationIdentityOptionsConfigurations>()
-                .AddTransient<EmailConfirmationTokenProvider>()
-                .AddOptions<EmailConfirmationTokenProviderOptions>();
+        // Configure token provider for email confirmation.
+        services.AddTransient<IConfigureOptions<IdentityOptions>, EmailConfirmationIdentityOptionsConfigurations>()
+            .AddTransient<EmailConfirmationTokenProvider>()
+            .AddOptions<EmailConfirmationTokenProviderOptions>();
 
-            services.AddTransient<IConfigureOptions<IdentityOptions>, IdentityOptionsConfigurations>();
-            services.AddPhoneFormatValidator();
-            // Configure the authentication options to use the application cookie scheme as the default sign-out handler.
-            // This is required for security modules like the OpenID module (that uses SignOutAsync()) to work correctly.
-            services.AddAuthentication(options => options.DefaultSignOutScheme = IdentityConstants.ApplicationScheme);
+        services.AddTransient<IConfigureOptions<IdentityOptions>, IdentityOptionsConfigurations>();
+        services.AddPhoneFormatValidator();
+        // Configure the authentication options to use the application cookie scheme as the default sign-out handler.
+        // This is required for security modules like the OpenID module (that uses SignOutAsync()) to work correctly.
+        services.AddAuthentication(options => options.DefaultSignOutScheme = IdentityConstants.ApplicationScheme);
 
-            services.AddUsers();
+        services.AddUsers();
 
-            services.ConfigureApplicationCookie(options =>
-            {
-                var userOptions = ShellScope.Services.GetRequiredService<IOptions<UserOptions>>();
+        services.ConfigureApplicationCookie(options =>
+        {
+            var userOptions = ShellScope.Services.GetRequiredService<IOptions<UserOptions>>();
 
-                options.Cookie.Name = "orchauth_" + HttpUtility.UrlEncode(_tenantName);
+            options.Cookie.Name = "orchauth_" + HttpUtility.UrlEncode(_tenantName);
 
-                // Don't set the cookie builder 'Path' so that it uses the 'IAuthenticationFeature' value
-                // set by the pipeline and coming from the request 'PathBase' which already ends with the
-                // tenant prefix but may also start by a path related e.g to a virtual folder.
+            // Don't set the cookie builder 'Path' so that it uses the 'IAuthenticationFeature' value
+            // set by the pipeline and coming from the request 'PathBase' which already ends with the
+            // tenant prefix but may also start by a path related e.g to a virtual folder.
 
-                options.LoginPath = "/" + userOptions.Value.LoginPath;
-                options.LogoutPath = "/" + userOptions.Value.LogoffPath;
-                options.AccessDeniedPath = "/Error/403";
-            });
-            services.AddTransient<IPostConfigureOptions<SecurityStampValidatorOptions>, ConfigureSecurityStampOptions>();
-            services.AddDataMigration<Migrations>();
+            options.LoginPath = "/" + userOptions.Value.LoginPath;
+            options.LogoutPath = "/" + userOptions.Value.LogoffPath;
+            options.AccessDeniedPath = "/Error/403";
+        });
+        services.AddTransient<IPostConfigureOptions<SecurityStampValidatorOptions>, ConfigureSecurityStampOptions>();
+        services.AddDataMigration<Migrations>();
 
-            services.AddScoped<IUserClaimsProvider, EmailClaimsProvider>();
-            services.AddSingleton<IUserIdGenerator, DefaultUserIdGenerator>();
+        services.AddScoped<IUserClaimsProvider, EmailClaimsProvider>();
+        services.AddSingleton<IUserIdGenerator, DefaultUserIdGenerator>();
 
-            services.AddScoped<IMembershipService, MembershipService>();
-            services.AddScoped<ISetupEventHandler, SetupEventHandler>();
-            services.AddScoped<ICommandHandler, UserCommands>();
-            services.AddScoped<IExternalLoginEventHandler, ScriptExternalLoginEventHandler>();
+        services.AddScoped<IMembershipService, MembershipService>();
+        services.AddScoped<ISetupEventHandler, SetupEventHandler>();
+        services.AddScoped<ICommandHandler, UserCommands>();
+        services.AddScoped<IExternalLoginEventHandler, ScriptExternalLoginEventHandler>();
 
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
 
-            services.AddScoped<IDisplayDriver<ISite>, LoginSettingsDisplayDriver>();
+        services.AddScoped<IDisplayDriver<ISite>, LoginSettingsDisplayDriver>();
 
-            services.AddScoped<IDisplayDriver<User>, UserDisplayDriver>();
-            services.AddScoped<IDisplayDriver<User>, UserInformationDisplayDriver>();
-            services.AddScoped<IDisplayDriver<User>, UserButtonsDisplayDriver>();
+        services.AddScoped<IDisplayDriver<User>, UserDisplayDriver>();
+        services.AddScoped<IDisplayDriver<User>, UserInformationDisplayDriver>();
+        services.AddScoped<IDisplayDriver<User>, UserButtonsDisplayDriver>();
 
-            services.AddScoped<IThemeSelector, UsersThemeSelector>();
+        services.AddScoped<IThemeSelector, UsersThemeSelector>();
 
-            services.AddScoped<IRecipeEnvironmentProvider, RecipeEnvironmentSuperUserProvider>();
+        services.AddScoped<IRecipeEnvironmentProvider, RecipeEnvironmentSuperUserProvider>();
 
-            services.AddScoped<IUsersAdminListQueryService, DefaultUsersAdminListQueryService>();
+        services.AddScoped<IUsersAdminListQueryService, DefaultUsersAdminListQueryService>();
 
-            services.AddScoped<IDisplayDriver<UserIndexOptions>, UserOptionsDisplayDriver>();
+        services.AddScoped<IDisplayDriver<UserIndexOptions>, UserOptionsDisplayDriver>();
 
-            services.AddSingleton<IUsersAdminListFilterParser>(sp =>
+        services.AddSingleton<IUsersAdminListFilterParser>(sp =>
+        {
+            var filterProviders = sp.GetServices<IUsersAdminListFilterProvider>();
+            var builder = new QueryEngineBuilder<User>();
+            foreach (var provider in filterProviders)
             {
-                var filterProviders = sp.GetServices<IUsersAdminListFilterProvider>();
-                var builder = new QueryEngineBuilder<User>();
-                foreach (var provider in filterProviders)
-                {
-                    provider.Build(builder);
-                }
+                provider.Build(builder);
+            }
 
-                var parser = builder.Build();
+            var parser = builder.Build();
 
-                return new DefaultUsersAdminListFilterParser(parser);
-            });
+            return new DefaultUsersAdminListFilterParser(parser);
+        });
 
-            services.AddTransient<IUsersAdminListFilterProvider, DefaultUsersAdminListFilterProvider>();
-            services.AddTransient<IConfigureOptions<ResourceManagementOptions>, UserOptionsConfiguration>();
-            services.AddScoped<IDisplayDriver<Navbar>, UserMenuNavbarDisplayDriver>();
-            services.AddScoped<IDisplayDriver<UserMenu>, UserMenuDisplayDriver>();
-            services.AddScoped<IShapeTableProvider, UserMenuShapeTableProvider>();
+        services.AddTransient<IUsersAdminListFilterProvider, DefaultUsersAdminListFilterProvider>();
+        services.AddTransient<IConfigureOptions<ResourceManagementOptions>, UserOptionsConfiguration>();
+        services.AddScoped<IDisplayDriver<Navbar>, UserMenuNavbarDisplayDriver>();
+        services.AddScoped<IDisplayDriver<UserMenu>, UserMenuDisplayDriver>();
+        services.AddScoped<IShapeTableProvider, UserMenuShapeTableProvider>();
 
-            services.AddRecipeExecutionStep<UsersStep>();
+        services.AddRecipeExecutionStep<UsersStep>();
 
-            services.AddScoped<CustomUserSettingsService>();
-            services.AddRecipeExecutionStep<CustomUserSettingsStep>();
-            services.AddScoped<IDisplayDriver<LoginForm>, LoginFormDisplayDriver>();
-        }
+        services.AddScoped<CustomUserSettingsService>();
+        services.AddRecipeExecutionStep<CustomUserSettingsStep>();
+        services.AddScoped<IDisplayDriver<LoginForm>, LoginFormDisplayDriver>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Roles")]
-    public sealed class RolesStartup : StartupBase
+[RequireFeatures("OrchardCore.Roles")]
+public sealed class RolesStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IRoleRemovedEventHandler, UserRoleRemovedEventHandler>();
-            services.AddIndexProvider<UserByRoleNameIndexProvider>();
-            services.AddScoped<IDisplayDriver<User>, UserRoleDisplayDriver>();
-            services.AddScoped<IAuthorizationHandler, RoleAuthorizationHandler>();
-            services.AddScoped<IPermissionProvider, UserRolePermissions>();
-            services.AddSingleton<IUsersAdminListFilterProvider, RolesAdminListFilterProvider>();
-        }
+        services.AddScoped<IRoleRemovedEventHandler, UserRoleRemovedEventHandler>();
+        services.AddIndexProvider<UserByRoleNameIndexProvider>();
+        services.AddScoped<IDisplayDriver<User>, UserRoleDisplayDriver>();
+        services.AddScoped<IAuthorizationHandler, RoleAuthorizationHandler>();
+        services.AddScoped<IPermissionProvider, UserRolePermissions>();
+        services.AddSingleton<IUsersAdminListFilterProvider, RolesAdminListFilterProvider>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Liquid")]
-    public sealed class LiquidStartup : StartupBase
+[RequireFeatures("OrchardCore.Liquid")]
+public sealed class LiquidStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.Filters.AddFilter("has_claim", UserFilters.HasClaim);
-                o.Filters.AddFilter("user_id", UserFilters.UserId);
+            o.Filters.AddFilter("has_claim", UserFilters.HasClaim);
+            o.Filters.AddFilter("user_id", UserFilters.UserId);
 
-                o.MemberAccessStrategy.Register<ClaimsPrincipal>();
-                o.MemberAccessStrategy.Register<ClaimsIdentity>();
+            o.MemberAccessStrategy.Register<ClaimsPrincipal>();
+            o.MemberAccessStrategy.Register<ClaimsIdentity>();
 
-                o.Scope.SetValue("User", new ObjectValue(new LiquidUserAccessor()));
-                o.MemberAccessStrategy.Register<LiquidUserAccessor, FluidValue>((obj, name, ctx) =>
-                {
-                    var user = ((LiquidTemplateContext)ctx).Services.GetRequiredService<IHttpContextAccessor>().HttpContext?.User;
-                    if (user != null)
-                    {
-                        return name switch
-                        {
-                            nameof(ClaimsPrincipal.Identity) => new ObjectValue(user.Identity),
-                            _ => NilValue.Instance
-                        };
-                    }
-
-                    return NilValue.Instance;
-                });
-
-                o.MemberAccessStrategy.Register<User, FluidValue>((user, name, context) =>
+            o.Scope.SetValue("User", new ObjectValue(new LiquidUserAccessor()));
+            o.MemberAccessStrategy.Register<LiquidUserAccessor, FluidValue>((obj, name, ctx) =>
+            {
+                var user = ((LiquidTemplateContext)ctx).Services.GetRequiredService<IHttpContextAccessor>().HttpContext?.User;
+                if (user != null)
                 {
                     return name switch
                     {
-                        nameof(User.UserId) => new StringValue(user.UserId),
-                        nameof(User.UserName) => new StringValue(user.UserName),
-                        nameof(User.NormalizedUserName) => new StringValue(user.NormalizedUserName),
-                        nameof(User.Email) => new StringValue(user.Email),
-                        nameof(User.NormalizedEmail) => new StringValue(user.NormalizedEmail),
-                        nameof(User.EmailConfirmed) => user.EmailConfirmed ? BooleanValue.True : BooleanValue.False,
-                        nameof(User.IsEnabled) => user.IsEnabled ? BooleanValue.True : BooleanValue.False,
-                        nameof(User.RoleNames) => new ArrayValue(user.RoleNames.Select(x => new StringValue(x)).ToArray()),
-                        nameof(User.Properties) => new ObjectValue(user.Properties),
+                        nameof(ClaimsPrincipal.Identity) => new ObjectValue(user.Identity),
                         _ => NilValue.Instance
                     };
-                });
-            })
-           .AddLiquidFilter<UsersByIdFilter>("users_by_id")
-           .AddLiquidFilter<HasPermissionFilter>("has_permission")
-           .AddLiquidFilter<IsInRoleFilter>("is_in_role")
-           .AddLiquidFilter<UserEmailFilter>("user_email");
-        }
-    }
-
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class LoginDeploymentStartup : StartupBase
-    {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
-        }
-    }
-
-    [Feature("OrchardCore.Users.ChangeEmail")]
-    public sealed class ChangeEmailStartup : StartupBase
-    {
-        private const string ChangeEmailPath = "ChangeEmail";
-        private const string ChangeEmailConfirmationPath = "ChangeEmailConfirmation";
-        private const string ChangeEmailControllerName = "ChangeEmail";
-
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            routes.MapAreaControllerRoute(
-                name: "ChangeEmail",
-                areaName: UserConstants.Features.Users,
-                pattern: ChangeEmailPath,
-                defaults: new
-                {
-                    controller = ChangeEmailControllerName,
-                    action = nameof(ChangeEmailController.Index),
                 }
-            );
 
-            routes.MapAreaControllerRoute(
-                name: "ChangeEmailConfirmation",
-                areaName: UserConstants.Features.Users,
-                pattern: ChangeEmailConfirmationPath,
-                defaults: new
-                {
-                    controller = ChangeEmailControllerName,
-                    action = nameof(ChangeEmailController.ChangeEmailConfirmation),
-                }
-            );
-        }
-
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddTransient<IConfigureOptions<IdentityOptions>, ChangeEmailIdentityOptionsConfigurations>()
-                .AddTransient<ChangeEmailTokenProvider>()
-                .AddOptions<ChangeEmailTokenProviderOptions>();
+                return NilValue.Instance;
+            });
 
-            services.Configure<TemplateOptions>(o =>
+            o.MemberAccessStrategy.Register<User, FluidValue>((user, name, context) =>
             {
-                o.MemberAccessStrategy.Register<ChangeEmailViewModel>();
+                return name switch
+                {
+                    nameof(User.UserId) => new StringValue(user.UserId),
+                    nameof(User.UserName) => new StringValue(user.UserName),
+                    nameof(User.NormalizedUserName) => new StringValue(user.NormalizedUserName),
+                    nameof(User.Email) => new StringValue(user.Email),
+                    nameof(User.NormalizedEmail) => new StringValue(user.NormalizedEmail),
+                    nameof(User.EmailConfirmed) => user.EmailConfirmed ? BooleanValue.True : BooleanValue.False,
+                    nameof(User.IsEnabled) => user.IsEnabled ? BooleanValue.True : BooleanValue.False,
+                    nameof(User.RoleNames) => new ArrayValue(user.RoleNames.Select(x => new StringValue(x)).ToArray()),
+                    nameof(User.Properties) => new ObjectValue(user.Properties),
+                    _ => NilValue.Instance
+                };
             });
+        })
+       .AddLiquidFilter<UsersByIdFilter>("users_by_id")
+       .AddLiquidFilter<HasPermissionFilter>("has_permission")
+       .AddLiquidFilter<IsInRoleFilter>("is_in_role")
+       .AddLiquidFilter<UserEmailFilter>("user_email");
+    }
+}
 
-            services.AddScoped<INavigationProvider, ChangeEmailAdminMenu>();
-            services.AddScoped<IDisplayDriver<ISite>, ChangeEmailSettingsDisplayDriver>();
-            services.AddScoped<IDisplayDriver<UserMenu>, ChangeEmailUserMenuDisplayDriver>();
-        }
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class LoginDeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddSiteSettingsPropertyDeploymentStep<LoginSettings, LoginDeploymentStartup>(S => S["Login settings"], S => S["Exports the Login settings."]);
     }
+}
+
+[Feature("OrchardCore.Users.ChangeEmail")]
+public sealed class ChangeEmailStartup : StartupBase
+{
+    private const string ChangeEmailPath = "ChangeEmail";
+    private const string ChangeEmailConfirmationPath = "ChangeEmailConfirmation";
+    private const string ChangeEmailControllerName = "ChangeEmail";
 
-    [Feature("OrchardCore.Users.ChangeEmail")]
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class ChangeEmailDeploymentStartup : StartupBase
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
-        }
+        routes.MapAreaControllerRoute(
+            name: "ChangeEmail",
+            areaName: UserConstants.Features.Users,
+            pattern: ChangeEmailPath,
+            defaults: new
+            {
+                controller = ChangeEmailControllerName,
+                action = nameof(ChangeEmailController.Index),
+            }
+        );
+
+        routes.MapAreaControllerRoute(
+            name: "ChangeEmailConfirmation",
+            areaName: UserConstants.Features.Users,
+            pattern: ChangeEmailConfirmationPath,
+            defaults: new
+            {
+                controller = ChangeEmailControllerName,
+                action = nameof(ChangeEmailController.ChangeEmailConfirmation),
+            }
+        );
     }
 
-    [Feature(UserConstants.Features.UserRegistration)]
-    public sealed class RegistrationStartup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        private const string RegisterPath = nameof(RegistrationController.Register);
-        private const string ConfirmEmailSent = nameof(EmailConfirmationController.ConfirmEmailSent);
-        private const string RegistrationPending = nameof(RegistrationController.RegistrationPending);
-        private const string RegistrationControllerName = "Registration";
+        services.AddTransient<IConfigureOptions<IdentityOptions>, ChangeEmailIdentityOptionsConfigurations>()
+            .AddTransient<ChangeEmailTokenProvider>()
+            .AddOptions<ChangeEmailTokenProviderOptions>();
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+        services.Configure<TemplateOptions>(o =>
         {
-            routes.MapAreaControllerRoute(
-                name: RegisterPath,
-                areaName: UserConstants.Features.Users,
-                pattern: RegisterPath,
-                defaults: new
-                {
-                    controller = RegistrationControllerName,
-                    action = RegisterPath,
-                }
-            );
+            o.MemberAccessStrategy.Register<ChangeEmailViewModel>();
+        });
 
-            routes.MapAreaControllerRoute(
-                name: ConfirmEmailSent,
-                areaName: UserConstants.Features.Users,
-                pattern: ConfirmEmailSent,
-                defaults: new
-                {
-                    controller = RegistrationControllerName,
-                    action = ConfirmEmailSent,
-                }
-            );
+        services.AddScoped<INavigationProvider, ChangeEmailAdminMenu>();
+        services.AddScoped<IDisplayDriver<ISite>, ChangeEmailSettingsDisplayDriver>();
+        services.AddScoped<IDisplayDriver<UserMenu>, ChangeEmailUserMenuDisplayDriver>();
+    }
+}
 
-            routes.MapAreaControllerRoute(
-                name: RegistrationPending,
-                areaName: UserConstants.Features.Users,
-                pattern: RegistrationPending,
-                defaults: new
-                {
-                    controller = RegistrationControllerName,
-                    action = RegistrationPending,
-                }
-            );
-        }
+[Feature("OrchardCore.Users.ChangeEmail")]
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class ChangeEmailDeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddSiteSettingsPropertyDeploymentStep<ChangeEmailDeploymentStartup, ChangeEmailDeploymentStartup>(S => S["Change Email settings"], S => S["Exports the Change Email settings."]);
+    }
+}
 
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<ConfirmEmailViewModel>();
-            });
+[Feature(UserConstants.Features.UserRegistration)]
+public sealed class RegistrationStartup : StartupBase
+{
+    private const string RegisterPath = nameof(RegistrationController.Register);
+    private const string ConfirmEmailSent = nameof(EmailConfirmationController.ConfirmEmailSent);
+    private const string RegistrationPending = nameof(RegistrationController.RegistrationPending);
+    private const string RegistrationControllerName = "Registration";
 
-            services.AddScoped<INavigationProvider, RegistrationAdminMenu>();
-            services.AddScoped<IDisplayDriver<ISite>, RegistrationSettingsDisplayDriver>();
-            services.AddScoped<IDisplayDriver<LoginForm>, RegisterUserLoginFormDisplayDriver>();
-            services.AddScoped<IDisplayDriver<RegisterUserForm>, RegisterUserFormDisplayDriver>();
-        }
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        routes.MapAreaControllerRoute(
+            name: RegisterPath,
+            areaName: UserConstants.Features.Users,
+            pattern: RegisterPath,
+            defaults: new
+            {
+                controller = RegistrationControllerName,
+                action = RegisterPath,
+            }
+        );
+
+        routes.MapAreaControllerRoute(
+            name: ConfirmEmailSent,
+            areaName: UserConstants.Features.Users,
+            pattern: ConfirmEmailSent,
+            defaults: new
+            {
+                controller = RegistrationControllerName,
+                action = ConfirmEmailSent,
+            }
+        );
+
+        routes.MapAreaControllerRoute(
+            name: RegistrationPending,
+            areaName: UserConstants.Features.Users,
+            pattern: RegistrationPending,
+            defaults: new
+            {
+                controller = RegistrationControllerName,
+                action = RegistrationPending,
+            }
+        );
     }
 
-    [Feature(UserConstants.Features.UserRegistration)]
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class RegistrationDeploymentStartup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
-        }
+            o.MemberAccessStrategy.Register<ConfirmEmailViewModel>();
+        });
+
+        services.AddScoped<INavigationProvider, RegistrationAdminMenu>();
+        services.AddScoped<IDisplayDriver<ISite>, RegistrationSettingsDisplayDriver>();
+        services.AddScoped<IDisplayDriver<LoginForm>, RegisterUserLoginFormDisplayDriver>();
+        services.AddScoped<IDisplayDriver<RegisterUserForm>, RegisterUserFormDisplayDriver>();
+    }
+}
+
+[Feature(UserConstants.Features.UserRegistration)]
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class RegistrationDeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddSiteSettingsPropertyDeploymentStep<RegistrationSettings, RegistrationDeploymentStartup>(S => S["Registration settings"], S => S["Exports the Registration settings."]);
     }
+}
 
-    [Feature(UserConstants.Features.ResetPassword)]
-    public sealed class ResetPasswordStartup : StartupBase
+[Feature(UserConstants.Features.ResetPassword)]
+public sealed class ResetPasswordStartup : StartupBase
+{
+    private const string ForgotPasswordPath = "ForgotPassword";
+    private const string ForgotPasswordConfirmationPath = "ForgotPasswordConfirmation";
+    private const string ResetPasswordPath = "ResetPassword";
+    private const string ResetPasswordConfirmationPath = "ResetPasswordConfirmation";
+    private const string ResetPasswordControllerName = "ResetPassword";
+
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
     {
-        private const string ForgotPasswordPath = "ForgotPassword";
-        private const string ForgotPasswordConfirmationPath = "ForgotPasswordConfirmation";
-        private const string ResetPasswordPath = "ResetPassword";
-        private const string ResetPasswordConfirmationPath = "ResetPasswordConfirmation";
-        private const string ResetPasswordControllerName = "ResetPassword";
+        routes.MapAreaControllerRoute(
+            name: "ForgotPassword",
+            areaName: UserConstants.Features.Users,
+            pattern: ForgotPasswordPath,
+            defaults: new
+            {
+                controller = ResetPasswordControllerName,
+                action = nameof(ResetPasswordController.ForgotPassword),
+            }
+        );
+        routes.MapAreaControllerRoute(
+            name: "ForgotPasswordConfirmation",
+            areaName: UserConstants.Features.Users,
+            pattern: ForgotPasswordConfirmationPath,
+            defaults: new
+            {
+                controller = ResetPasswordControllerName,
+                action = nameof(ResetPasswordController.ForgotPasswordConfirmation),
+            }
+        );
+        routes.MapAreaControllerRoute(
+            name: "ResetPassword",
+            areaName: UserConstants.Features.Users,
+            pattern: ResetPasswordPath,
+            defaults: new
+            {
+                controller = ResetPasswordControllerName,
+                action = nameof(ResetPasswordController.ResetPassword),
+            }
+        );
+        routes.MapAreaControllerRoute(
+            name: "ResetPasswordConfirmation",
+            areaName: UserConstants.Features.Users,
+            pattern: ResetPasswordConfirmationPath,
+            defaults: new
+            {
+                controller = ResetPasswordControllerName,
+                action = nameof(ResetPasswordController.ResetPasswordConfirmation),
+            }
+        );
+    }
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            routes.MapAreaControllerRoute(
-                name: "ForgotPassword",
-                areaName: UserConstants.Features.Users,
-                pattern: ForgotPasswordPath,
-                defaults: new
-                {
-                    controller = ResetPasswordControllerName,
-                    action = nameof(ResetPasswordController.ForgotPassword),
-                }
-            );
-            routes.MapAreaControllerRoute(
-                name: "ForgotPasswordConfirmation",
-                areaName: UserConstants.Features.Users,
-                pattern: ForgotPasswordConfirmationPath,
-                defaults: new
-                {
-                    controller = ResetPasswordControllerName,
-                    action = nameof(ResetPasswordController.ForgotPasswordConfirmation),
-                }
-            );
-            routes.MapAreaControllerRoute(
-                name: "ResetPassword",
-                areaName: UserConstants.Features.Users,
-                pattern: ResetPasswordPath,
-                defaults: new
-                {
-                    controller = ResetPasswordControllerName,
-                    action = nameof(ResetPasswordController.ResetPassword),
-                }
-            );
-            routes.MapAreaControllerRoute(
-                name: "ResetPasswordConfirmation",
-                areaName: UserConstants.Features.Users,
-                pattern: ResetPasswordConfirmationPath,
-                defaults: new
-                {
-                    controller = ResetPasswordControllerName,
-                    action = nameof(ResetPasswordController.ResetPasswordConfirmation),
-                }
-            );
-        }
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddTransient<IConfigureOptions<IdentityOptions>, PasswordResetIdentityOptionsConfigurations>()
+            .AddTransient<PasswordResetTokenProvider>()
+            .AddOptions<PasswordResetTokenProviderOptions>();
 
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.AddTransient<IConfigureOptions<IdentityOptions>, PasswordResetIdentityOptionsConfigurations>()
-                .AddTransient<PasswordResetTokenProvider>()
-                .AddOptions<PasswordResetTokenProviderOptions>();
+            o.MemberAccessStrategy.Register<LostPasswordViewModel>();
+        });
 
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<LostPasswordViewModel>();
-            });
+        services.AddScoped<INavigationProvider, ResetPasswordAdminMenu>();
+        services.AddScoped<IDisplayDriver<ISite>, ResetPasswordSettingsDisplayDriver>();
+        services.AddScoped<IDisplayDriver<ResetPasswordForm>, ResetPasswordFormDisplayDriver>();
 
-            services.AddScoped<INavigationProvider, ResetPasswordAdminMenu>();
-            services.AddScoped<IDisplayDriver<ISite>, ResetPasswordSettingsDisplayDriver>();
-            services.AddScoped<IDisplayDriver<ResetPasswordForm>, ResetPasswordFormDisplayDriver>();
-
-            services.AddScoped<IDisplayDriver<LoginForm>, ForgotPasswordLoginFormDisplayDriver>();
-            services.AddScoped<IDisplayDriver<ForgotPasswordForm>, ForgotPasswordFormDisplayDriver>();
-        }
+        services.AddScoped<IDisplayDriver<LoginForm>, ForgotPasswordLoginFormDisplayDriver>();
+        services.AddScoped<IDisplayDriver<ForgotPasswordForm>, ForgotPasswordFormDisplayDriver>();
     }
+}
 
-    [Feature(UserConstants.Features.ResetPassword)]
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class ResetPasswordDeploymentStartup : StartupBase
+[Feature(UserConstants.Features.ResetPassword)]
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class ResetPasswordDeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
-        }
+        services.AddSiteSettingsPropertyDeploymentStep<ResetPasswordSettings, ResetPasswordDeploymentStartup>(S => S["Reset Password settings"], S => S["Exports the Reset Password settings."]);
     }
+}
 
-    [Feature("OrchardCore.Users.CustomUserSettings")]
-    public sealed class CustomUserSettingsStartup : StartupBase
+[Feature("OrchardCore.Users.CustomUserSettings")]
+public sealed class CustomUserSettingsStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IDisplayDriver<User>, CustomUserSettingsDisplayDriver>();
-            services.AddScoped<IPermissionProvider, CustomUserSettingsPermissions>();
-            services.AddDeployment<CustomUserSettingsDeploymentSource, CustomUserSettingsDeploymentStep, CustomUserSettingsDeploymentStepDriver>();
-            services.AddScoped<IStereotypesProvider, CustomUserSettingsStereotypesProvider>();
+        services.AddScoped<IDisplayDriver<User>, CustomUserSettingsDisplayDriver>();
+        services.AddScoped<IPermissionProvider, CustomUserSettingsPermissions>();
+        services.AddDeployment<CustomUserSettingsDeploymentSource, CustomUserSettingsDeploymentStep, CustomUserSettingsDeploymentStepDriver>();
+        services.AddScoped<IStereotypesProvider, CustomUserSettingsStereotypesProvider>();
 
-            services.Configure<ContentTypeDefinitionOptions>(options =>
+        services.Configure<ContentTypeDefinitionOptions>(options =>
+        {
+            options.Stereotypes.TryAdd("CustomUserSettings", new ContentTypeDefinitionDriverOptions
             {
-                options.Stereotypes.TryAdd("CustomUserSettings", new ContentTypeDefinitionDriverOptions
-                {
-                    ShowCreatable = false,
-                    ShowListable = false,
-                    ShowDraftable = false,
-                    ShowVersionable = false,
-                });
+                ShowCreatable = false,
+                ShowListable = false,
+                ShowDraftable = false,
+                ShowVersionable = false,
             });
-        }
+        });
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class UserDeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class UserDeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<AllUsersDeploymentSource, AllUsersDeploymentStep, AllUsersDeploymentStepDriver>();
-        }
+        services.AddDeployment<AllUsersDeploymentSource, AllUsersDeploymentStep, AllUsersDeploymentStepDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/Drivers/UserTimeZoneDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/Drivers/UserTimeZoneDisplayDriver.cs
index 0d3bb7034b0..217ecbb2d95 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/Drivers/UserTimeZoneDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/Drivers/UserTimeZoneDisplayDriver.cs
@@ -7,36 +7,35 @@
 using OrchardCore.Users.TimeZone.Services;
 using OrchardCore.Users.TimeZone.ViewModels;
 
-namespace OrchardCore.Users.TimeZone.Drivers
+namespace OrchardCore.Users.TimeZone.Drivers;
+
+public sealed class UserTimeZoneDisplayDriver : SectionDisplayDriver<User, UserTimeZone>
 {
-    public sealed class UserTimeZoneDisplayDriver : SectionDisplayDriver<User, UserTimeZone>
-    {
-        private readonly UserTimeZoneService _userTimeZoneService;
+    private readonly UserTimeZoneService _userTimeZoneService;
 
-        public UserTimeZoneDisplayDriver(UserTimeZoneService userTimeZoneService)
-        {
-            _userTimeZoneService = userTimeZoneService;
-        }
+    public UserTimeZoneDisplayDriver(UserTimeZoneService userTimeZoneService)
+    {
+        _userTimeZoneService = userTimeZoneService;
+    }
 
-        public override IDisplayResult Edit(User user, UserTimeZone userTimeZone, BuildEditorContext context)
+    public override IDisplayResult Edit(User user, UserTimeZone userTimeZone, BuildEditorContext context)
+    {
+        return Initialize<UserTimeZoneViewModel>("UserTimeZone_Edit", model =>
         {
-            return Initialize<UserTimeZoneViewModel>("UserTimeZone_Edit", model =>
-            {
-                model.TimeZoneId = userTimeZone.TimeZoneId;
-            }).Location("Content:2");
-        }
+            model.TimeZoneId = userTimeZone.TimeZoneId;
+        }).Location("Content:2");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(User user, UserTimeZone userTimeZone, UpdateEditorContext context)
-        {
-            var model = new UserTimeZoneViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(User user, UserTimeZone userTimeZone, UpdateEditorContext context)
+    {
+        var model = new UserTimeZoneViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
-            userTimeZone.TimeZoneId = model.TimeZoneId;
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
+        userTimeZone.TimeZoneId = model.TimeZoneId;
 
-            // Remove the cache entry, don't update it, as the form might still fail validation for other reasons.
-            await _userTimeZoneService.UpdateUserTimeZoneAsync(user);
+        // Remove the cache entry, don't update it, as the form might still fail validation for other reasons.
+        await _userTimeZoneService.UpdateUserTimeZoneAsync(user);
 
-            return await EditAsync(user, userTimeZone, context);
-        }
+        return await EditAsync(user, userTimeZone, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/Models/UserTimeZone.cs b/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/Models/UserTimeZone.cs
index 541cc1a9414..9e094fc8ebf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/Models/UserTimeZone.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/Models/UserTimeZone.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Users.TimeZone.Models
+namespace OrchardCore.Users.TimeZone.Models;
+
+public class UserTimeZone
 {
-    public class UserTimeZone
-    {
-        public string TimeZoneId { get; set; }
-    }
+    public string TimeZoneId { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/Startup.cs
index 763f87f1bc7..7796b62ad20 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/Startup.cs
@@ -5,16 +5,15 @@
 using OrchardCore.Users.TimeZone.Drivers;
 using OrchardCore.Users.TimeZone.Services;
 
-namespace OrchardCore.Users.TimeZone
+namespace OrchardCore.Users.TimeZone;
+
+[Feature("OrchardCore.Users.TimeZone")]
+public sealed class Startup : StartupBase
 {
-    [Feature("OrchardCore.Users.TimeZone")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<ITimeZoneSelector, UserTimeZoneSelector>();
-            services.AddSingleton<UserTimeZoneService>();
-            services.AddScoped<IDisplayDriver<User>, UserTimeZoneDisplayDriver>();
-        }
+        services.AddScoped<ITimeZoneSelector, UserTimeZoneSelector>();
+        services.AddSingleton<UserTimeZoneService>();
+        services.AddScoped<IDisplayDriver<User>, UserTimeZoneDisplayDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/ViewModel/UserTimeZoneViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/ViewModel/UserTimeZoneViewModel.cs
index 40cfea11adb..2c7f252f786 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/ViewModel/UserTimeZoneViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/ViewModel/UserTimeZoneViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Users.TimeZone.ViewModels
+namespace OrchardCore.Users.TimeZone.ViewModels;
+
+public class UserTimeZoneViewModel
 {
-    public class UserTimeZoneViewModel
-    {
-        public string TimeZoneId { get; set; }
-    }
+    public string TimeZoneId { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/UserOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Users/UserOptionsConfiguration.cs
index f5ec3483484..24adcf17b73 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/UserOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/UserOptionsConfiguration.cs
@@ -1,30 +1,29 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Users
+namespace OrchardCore.Users;
+
+public sealed class UserOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
 {
-    public sealed class UserOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
-    {
-        private static readonly ResourceManifest _manifest;
+    private static readonly ResourceManifest _manifest;
 
-        static UserOptionsConfiguration()
-        {
-            _manifest = new ResourceManifest();
+    static UserOptionsConfiguration()
+    {
+        _manifest = new ResourceManifest();
 
-            _manifest
-                .DefineScript("password-generator")
-                .SetUrl("~/OrchardCore.Users/Scripts/password-generator.min.js", "~/OrchardCore.Users/Scripts/password-generator.js")
-                .SetVersion("1.0.0");
+        _manifest
+            .DefineScript("password-generator")
+            .SetUrl("~/OrchardCore.Users/Scripts/password-generator.min.js", "~/OrchardCore.Users/Scripts/password-generator.js")
+            .SetVersion("1.0.0");
 
-            _manifest
-                .DefineScript("qrcode")
-                .SetUrl("~/OrchardCore.Users/Scripts/qrcode.min.js", "~/OrchardCore.Users/Scripts/qrcode.js")
-                .SetVersion("1.0.0");
-        }
+        _manifest
+            .DefineScript("qrcode")
+            .SetUrl("~/OrchardCore.Users/Scripts/qrcode.min.js", "~/OrchardCore.Users/Scripts/qrcode.js")
+            .SetVersion("1.0.0");
+    }
 
-        public void Configure(ResourceManagementOptions options)
-        {
-            options.ResourceManifests.Add(_manifest);
-        }
+    public void Configure(ResourceManagementOptions options)
+    {
+        options.ResourceManifests.Add(_manifest);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ChangeEmailViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ChangeEmailViewModel.cs
index e0ef7157b25..38550b6ffb4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ChangeEmailViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ChangeEmailViewModel.cs
@@ -1,11 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Users.ViewModels
+namespace OrchardCore.Users.ViewModels;
+
+public class ChangeEmailViewModel
 {
-    public class ChangeEmailViewModel
-    {
-        [Required(ErrorMessage = "Email is required.")]
-        [Email.EmailAddress(ErrorMessage = "Invalid Email.")]
-        public string Email { get; set; }
-    }
+    [Required(ErrorMessage = "Email is required.")]
+    [Email.EmailAddress(ErrorMessage = "Invalid Email.")]
+    public string Email { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ChangePasswordViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ChangePasswordViewModel.cs
index 717e3ec5d46..cc6d6053799 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ChangePasswordViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ChangePasswordViewModel.cs
@@ -1,19 +1,18 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Users.ViewModels
+namespace OrchardCore.Users.ViewModels;
+
+public class ChangePasswordViewModel
 {
-    public class ChangePasswordViewModel
-    {
-        [Required(ErrorMessage = "Current password is required.")]
-        [DataType(DataType.Password)]
-        public string CurrentPassword { get; set; }
+    [Required(ErrorMessage = "Current password is required.")]
+    [DataType(DataType.Password)]
+    public string CurrentPassword { get; set; }
 
-        [Required(ErrorMessage = "Password is required.")]
-        [DataType(DataType.Password)]
-        public string Password { get; set; }
+    [Required(ErrorMessage = "Password is required.")]
+    [DataType(DataType.Password)]
+    public string Password { get; set; }
 
-        [Compare(nameof(Password), ErrorMessage = "The new password and confirmation password do not match.")]
-        [DataType(DataType.Password)]
-        public string PasswordConfirmation { get; set; }
-    }
+    [Compare(nameof(Password), ErrorMessage = "The new password and confirmation password do not match.")]
+    [DataType(DataType.Password)]
+    public string PasswordConfirmation { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ConfirmEmailViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ConfirmEmailViewModel.cs
index 26ab1eb46dd..be0824fcba1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ConfirmEmailViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ConfirmEmailViewModel.cs
@@ -1,15 +1,14 @@
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Users.ViewModels
+namespace OrchardCore.Users.ViewModels;
+
+public class ConfirmEmailViewModel : ShapeViewModel
 {
-    public class ConfirmEmailViewModel : ShapeViewModel
+    public ConfirmEmailViewModel()
+         : base("TemplateUserConfirmEmail")
     {
-        public ConfirmEmailViewModel()
-             : base("TemplateUserConfirmEmail")
-        {
-        }
-
-        public IUser User { get; set; }
-        public string ConfirmEmailUrl { get; set; }
     }
+
+    public IUser User { get; set; }
+    public string ConfirmEmailUrl { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/EditUserRoleViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/EditUserRoleViewModel.cs
index babcf71f3f7..af74f05a65d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/EditUserRoleViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/EditUserRoleViewModel.cs
@@ -1,14 +1,13 @@
-namespace OrchardCore.Users.ViewModels
+namespace OrchardCore.Users.ViewModels;
+
+public class EditUserRoleViewModel
 {
-    public class EditUserRoleViewModel
-    {
-        public RoleEntry[] Roles { get; set; } = [];
-    }
+    public RoleEntry[] Roles { get; set; } = [];
+}
 
-    public class RoleEntry
-    {
-        public string Role { get; set; }
+public class RoleEntry
+{
+    public string Role { get; set; }
 
-        public bool IsSelected { get; set; }
-    }
+    public bool IsSelected { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/EditUserViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/EditUserViewModel.cs
index a5701b3300b..6fce784c8c9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/EditUserViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/EditUserViewModel.cs
@@ -1,25 +1,24 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Users.ViewModels
+namespace OrchardCore.Users.ViewModels;
+
+public class EditUserViewModel
 {
-    public class EditUserViewModel
-    {
-        public bool EmailConfirmed { get; set; }
+    public bool EmailConfirmed { get; set; }
 
-        public bool IsEnabled { get; set; }
+    public bool IsEnabled { get; set; }
 
-        public string Password { get; set; }
+    public string Password { get; set; }
 
-        public string PasswordConfirmation { get; set; }
+    public string PasswordConfirmation { get; set; }
 
-        /// <summary>
-        /// When a user only has rights to view they cannot update this model.
-        /// </summary>
-        [BindNever]
-        public bool IsEditingDisabled { get; set; }
+    /// <summary>
+    /// When a user only has rights to view they cannot update this model.
+    /// </summary>
+    [BindNever]
+    public bool IsEditingDisabled { get; set; }
 
-        [BindNever]
-        public bool IsNewRequest { get; set; }
+    [BindNever]
+    public bool IsNewRequest { get; set; }
 
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ExternalLoginsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ExternalLoginsViewModel.cs
index 4682b82059d..9eeb16a6a74 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ExternalLoginsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ExternalLoginsViewModel.cs
@@ -2,16 +2,15 @@
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Identity;
 
-namespace OrchardCore.Users.ViewModels
+namespace OrchardCore.Users.ViewModels;
+
+public class ExternalLoginsViewModel
 {
-    public class ExternalLoginsViewModel
-    {
-        public IList<UserLoginInfo> CurrentLogins { get; set; }
+    public IList<UserLoginInfo> CurrentLogins { get; set; }
 
-        public IList<AuthenticationScheme> OtherLogins { get; set; }
+    public IList<AuthenticationScheme> OtherLogins { get; set; }
 
-        public bool ShowRemoveButton { get; set; }
+    public bool ShowRemoveButton { get; set; }
 
-        public string StatusMessage { get; set; }
-    }
+    public string StatusMessage { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ForgotPasswordViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ForgotPasswordViewModel.cs
index 0bb15c54d1a..e1ec5dc2b41 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ForgotPasswordViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ForgotPasswordViewModel.cs
@@ -1,15 +1,14 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Users.ViewModels
+namespace OrchardCore.Users.ViewModels;
+
+public class ForgotPasswordViewModel
 {
-    public class ForgotPasswordViewModel
-    {
-        [Obsolete("Email property is no longer used and will be removed in future releases. Instead use UsernameOrEmail.")]
-        [Email.EmailAddress(ErrorMessage = "Invalid Email.")]
-        public string Email { get; set; }
+    [Obsolete("Email property is no longer used and will be removed in future releases. Instead use UsernameOrEmail.")]
+    [Email.EmailAddress(ErrorMessage = "Invalid Email.")]
+    public string Email { get; set; }
 
-        [Required(ErrorMessage = "Username or email address is required.")]
-        public string UsernameOrEmail { get; set; }
-    }
+    [Required(ErrorMessage = "Username or email address is required.")]
+    public string UsernameOrEmail { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/LinkExternalLoginViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/LinkExternalLoginViewModel.cs
index 381f0e1283e..5586639af86 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/LinkExternalLoginViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/LinkExternalLoginViewModel.cs
@@ -1,11 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Users.ViewModels
+namespace OrchardCore.Users.ViewModels;
+
+public class LinkExternalLoginViewModel
 {
-    public class LinkExternalLoginViewModel
-    {
-        [DataType(DataType.Password)]
-        [Required(ErrorMessage = "Password is required.")]
-        public string Password { get; set; }
-    }
+    [DataType(DataType.Password)]
+    [Required(ErrorMessage = "Password is required.")]
+    public string Password { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/LoginViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/LoginViewModel.cs
index 8072e815cac..607ccad7dc2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/LoginViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/LoginViewModel.cs
@@ -1,17 +1,16 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Users.ViewModels
+namespace OrchardCore.Users.ViewModels;
+
+public class LoginViewModel
 {
-    public class LoginViewModel
-    {
-        [Required(ErrorMessage = "Username is required.")]
-        [Display(Name = "Username")]
-        public string UserName { get; set; }
+    [Required(ErrorMessage = "Username is required.")]
+    [Display(Name = "Username")]
+    public string UserName { get; set; }
 
-        [Required(ErrorMessage = "Password is required.")]
-        [DataType(DataType.Password)]
-        public string Password { get; set; }
+    [Required(ErrorMessage = "Password is required.")]
+    [DataType(DataType.Password)]
+    public string Password { get; set; }
 
-        public bool RememberMe { get; set; }
-    }
+    public bool RememberMe { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/LostPasswordViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/LostPasswordViewModel.cs
index 132a746689e..7ce16ff25ca 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/LostPasswordViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/LostPasswordViewModel.cs
@@ -1,16 +1,15 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Users.Models;
 
-namespace OrchardCore.Users.ViewModels
+namespace OrchardCore.Users.ViewModels;
+
+public class LostPasswordViewModel : ShapeViewModel
 {
-    public class LostPasswordViewModel : ShapeViewModel
+    public LostPasswordViewModel()
+        : base("TemplateUserLostPassword")
     {
-        public LostPasswordViewModel()
-            : base("TemplateUserLostPassword")
-        {
-        }
-
-        public User User { get; set; }
-        public string LostPasswordUrl { get; set; }
     }
+
+    public User User { get; set; }
+    public string LostPasswordUrl { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/RegisterExternalLoginViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/RegisterExternalLoginViewModel.cs
index a4c7ae3cb32..76d3d77c561 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/RegisterExternalLoginViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/RegisterExternalLoginViewModel.cs
@@ -4,62 +4,61 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Email;
 
-namespace OrchardCore.Users.ViewModels
+namespace OrchardCore.Users.ViewModels;
+
+public class RegisterExternalLoginViewModel : IValidatableObject
 {
-    public class RegisterExternalLoginViewModel : IValidatableObject
-    {
-        public bool NoUsername { get; set; }
+    public bool NoUsername { get; set; }
 
-        public bool NoEmail { get; set; }
+    public bool NoEmail { get; set; }
 
-        public bool NoPassword { get; set; }
+    public bool NoPassword { get; set; }
 
-        public string UserName { get; set; }
+    public string UserName { get; set; }
 
-        public string Email { get; set; }
+    public string Email { get; set; }
 
-        [DataType(DataType.Password)]
-        public string Password { get; set; }
+    [DataType(DataType.Password)]
+    public string Password { get; set; }
 
-        [DataType(DataType.Password)]
-        public string ConfirmPassword { get; set; }
+    [DataType(DataType.Password)]
+    public string ConfirmPassword { get; set; }
 
-        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
-        {
-            var emailAddressValidator = validationContext.GetService<IEmailAddressValidator>();
-            var S = validationContext.GetService<IStringLocalizer<RegisterExternalLoginViewModel>>();
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        var emailAddressValidator = validationContext.GetService<IEmailAddressValidator>();
+        var S = validationContext.GetService<IStringLocalizer<RegisterExternalLoginViewModel>>();
 
-            if (string.IsNullOrWhiteSpace(Email))
-            {
-                if (!NoEmail)
-                {
-                    yield return new ValidationResult(S["Email is required!"], ["Email"]);
-                }
-            }
-            else if (!emailAddressValidator.Validate(Email))
+        if (string.IsNullOrWhiteSpace(Email))
+        {
+            if (!NoEmail)
             {
-                yield return new ValidationResult(S["Invalid Email."], ["Email"]);
+                yield return new ValidationResult(S["Email is required!"], ["Email"]);
             }
+        }
+        else if (!emailAddressValidator.Validate(Email))
+        {
+            yield return new ValidationResult(S["Invalid Email."], ["Email"]);
+        }
 
-            if (string.IsNullOrWhiteSpace(UserName) && !NoUsername)
-            {
-                yield return new ValidationResult(S["Username is required!"], ["UserName"]);
-            }
+        if (string.IsNullOrWhiteSpace(UserName) && !NoUsername)
+        {
+            yield return new ValidationResult(S["Username is required!"], ["UserName"]);
+        }
 
-            if (string.IsNullOrWhiteSpace(Password) && !NoPassword)
-            {
-                yield return new ValidationResult(S["Password is required!"], ["Password"]);
-            }
+        if (string.IsNullOrWhiteSpace(Password) && !NoPassword)
+        {
+            yield return new ValidationResult(S["Password is required!"], ["Password"]);
+        }
 
-            if (Password != ConfirmPassword)
-            {
-                yield return new ValidationResult(S["Confirm Password do not match"], ["ConfirmPassword"]);
-            }
+        if (Password != ConfirmPassword)
+        {
+            yield return new ValidationResult(S["Confirm Password do not match"], ["ConfirmPassword"]);
+        }
 
-            if (Password != null && (Password.Length < 6 || Password.Length > 100))
-            {
-                yield return new ValidationResult(string.Format(S["Password must be between {0} and {1} characters"], 6, 100), ["Password"]);
-            }
+        if (Password != null && (Password.Length < 6 || Password.Length > 100))
+        {
+            yield return new ValidationResult(string.Format(S["Password must be between {0} and {1} characters"], 6, 100), ["Password"]);
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/RegisterViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/RegisterViewModel.cs
index e6360abaadb..ea61e91f3ed 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/RegisterViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/RegisterViewModel.cs
@@ -1,22 +1,21 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Users.ViewModels
+namespace OrchardCore.Users.ViewModels;
+
+public class RegisterViewModel
 {
-    public class RegisterViewModel
-    {
-        [Required(ErrorMessage = "Username is required.")]
-        public string UserName { get; set; }
+    [Required(ErrorMessage = "Username is required.")]
+    public string UserName { get; set; }
 
-        [Required(ErrorMessage = "Email is required.")]
-        [Email.EmailAddress(ErrorMessage = "Invalid Email.")]
-        public string Email { get; set; }
+    [Required(ErrorMessage = "Email is required.")]
+    [Email.EmailAddress(ErrorMessage = "Invalid Email.")]
+    public string Email { get; set; }
 
-        [DataType(DataType.Password)]
-        [Required(ErrorMessage = "Password is required.")]
-        public string Password { get; set; }
+    [DataType(DataType.Password)]
+    [Required(ErrorMessage = "Password is required.")]
+    public string Password { get; set; }
 
-        [DataType(DataType.Password)]
-        [Compare(nameof(Password), ErrorMessage = "The new password and confirmation password do not match.")]
-        public string ConfirmPassword { get; set; }
-    }
+    [DataType(DataType.Password)]
+    [Compare(nameof(Password), ErrorMessage = "The new password and confirmation password do not match.")]
+    public string ConfirmPassword { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/RemoveLoginViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/RemoveLoginViewModel.cs
index db19ca1ab95..c1c2ab3562e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/RemoveLoginViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/RemoveLoginViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Users.ViewModels
+namespace OrchardCore.Users.ViewModels;
+
+public class RemoveLoginViewModel
 {
-    public class RemoveLoginViewModel
-    {
-        public string LoginProvider { get; set; }
-        public string ProviderKey { get; set; }
-    }
+    public string LoginProvider { get; set; }
+    public string ProviderKey { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ResetPasswordViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ResetPasswordViewModel.cs
index 4c81b332c3e..f8ccad8f13d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ResetPasswordViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/ResetPasswordViewModel.cs
@@ -1,25 +1,24 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Users.ViewModels
+namespace OrchardCore.Users.ViewModels;
+
+public class ResetPasswordViewModel
 {
-    public class ResetPasswordViewModel
-    {
-        [Obsolete("Email property is no longer used and will be removed in future releases. Instead use UsernameOrEmail.")]
-        [Email.EmailAddress(ErrorMessage = "Invalid Email.")]
-        public string Email { get; set; }
+    [Obsolete("Email property is no longer used and will be removed in future releases. Instead use UsernameOrEmail.")]
+    [Email.EmailAddress(ErrorMessage = "Invalid Email.")]
+    public string Email { get; set; }
 
-        [Required(ErrorMessage = "Username or email address is required.")]
-        public string UsernameOrEmail { get; set; }
+    [Required(ErrorMessage = "Username or email address is required.")]
+    public string UsernameOrEmail { get; set; }
 
-        [Required(ErrorMessage = "New password is required.")]
-        [DataType(DataType.Password)]
-        public string NewPassword { get; set; }
+    [Required(ErrorMessage = "New password is required.")]
+    [DataType(DataType.Password)]
+    public string NewPassword { get; set; }
 
-        [DataType(DataType.Password)]
-        [Compare(nameof(NewPassword), ErrorMessage = "The new password and confirmation password do not match.")]
-        public string PasswordConfirmation { get; set; }
+    [DataType(DataType.Password)]
+    [Compare(nameof(NewPassword), ErrorMessage = "The new password and confirmation password do not match.")]
+    public string PasswordConfirmation { get; set; }
 
-        public string ResetToken { get; set; }
-    }
+    public string ResetToken { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/SummaryAdminUserViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/SummaryAdminUserViewModel.cs
index 1ebc6ee2f66..8567aee0411 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/SummaryAdminUserViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/SummaryAdminUserViewModel.cs
@@ -1,9 +1,8 @@
 using OrchardCore.Users.Models;
 
-namespace OrchardCore.Users.ViewModels
+namespace OrchardCore.Users.ViewModels;
+
+public class SummaryAdminUserViewModel
 {
-    public class SummaryAdminUserViewModel
-    {
-        public User User { get; set; }
-    }
+    public User User { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/UsersIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/UsersIndexViewModel.cs
index 88b770e50c5..38fb88e17cc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/UsersIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/ViewModels/UsersIndexViewModel.cs
@@ -1,18 +1,17 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Users.ViewModels
+namespace OrchardCore.Users.ViewModels;
+
+public class UsersIndexViewModel
 {
-    public class UsersIndexViewModel
-    {
-        public IList<UserEntry> Users { get; set; }
-        public UserIndexOptions Options { get; set; } = new UserIndexOptions();
-        public dynamic Pager { get; set; }
-        public dynamic Header { get; set; }
-    }
+    public IList<UserEntry> Users { get; set; }
+    public UserIndexOptions Options { get; set; } = new UserIndexOptions();
+    public dynamic Pager { get; set; }
+    public dynamic Header { get; set; }
+}
 
-    public class UserEntry
-    {
-        public dynamic Shape { get; set; }
-        public string UserId { get; set; }
-    }
+public class UserEntry
+{
+    public dynamic Shape { get; set; }
+    public string UserId { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/AssignUserRoleTask.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/AssignUserRoleTask.cs
index ff0fa28221d..9c8443cfa11 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/AssignUserRoleTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/AssignUserRoleTask.cs
@@ -9,68 +9,67 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Users.Workflows.Activities
-{
-    public class AssignUserRoleTask : TaskActivity<AssignUserRoleTask>
-    {
-        private readonly UserManager<IUser> _userManager;
-        private readonly IUserService _userService;
-        private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
-        protected readonly IStringLocalizer S;
+namespace OrchardCore.Users.Workflows.Activities;
 
-        public AssignUserRoleTask(
-            UserManager<IUser> userManager,
-            IUserService userService,
-            IWorkflowExpressionEvaluator expressionEvaluator,
-            IStringLocalizer<AssignUserRoleTask> localizer)
-        {
-            _userManager = userManager;
-            _userService = userService;
-            _expressionEvaluator = expressionEvaluator;
-            S = localizer;
-        }
+public class AssignUserRoleTask : TaskActivity<AssignUserRoleTask>
+{
+    private readonly UserManager<IUser> _userManager;
+    private readonly IUserService _userService;
+    private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
+    protected readonly IStringLocalizer S;
 
-        public override LocalizedString DisplayText => S["Assign User Role Task"];
+    public AssignUserRoleTask(
+        UserManager<IUser> userManager,
+        IUserService userService,
+        IWorkflowExpressionEvaluator expressionEvaluator,
+        IStringLocalizer<AssignUserRoleTask> localizer)
+    {
+        _userManager = userManager;
+        _userService = userService;
+        _expressionEvaluator = expressionEvaluator;
+        S = localizer;
+    }
 
-        public override LocalizedString Category => S["User"];
+    public override LocalizedString DisplayText => S["Assign User Role Task"];
 
-        public WorkflowExpression<string> UserName
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
+    public override LocalizedString Category => S["User"];
 
-        public WorkflowExpression<string> RoleName
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
+    public WorkflowExpression<string> UserName
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"], S["Failed"]);
-        }
+    public WorkflowExpression<string> RoleName
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var userName = await _expressionEvaluator.EvaluateAsync(UserName, workflowContext, null);
-            var roleName = await _expressionEvaluator.EvaluateAsync(RoleName, workflowContext, null);
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"], S["Failed"]);
+    }
 
-            var user = (User)await _userService.GetUserAsync(userName);
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var userName = await _expressionEvaluator.EvaluateAsync(UserName, workflowContext, null);
+        var roleName = await _expressionEvaluator.EvaluateAsync(RoleName, workflowContext, null);
 
-            if (user != null)
-            {
-                if (!user.RoleNames.Contains(roleName))
-                {
-                    await _userManager.AddToRoleAsync(user, roleName);
-                }
+        var user = (User)await _userService.GetUserAsync(userName);
 
-                return Outcomes("Done");
-            }
-            else
+        if (user != null)
+        {
+            if (!user.RoleNames.Contains(roleName))
             {
-                return Outcomes("Failed");
+                await _userManager.AddToRoleAsync(user, roleName);
             }
+
+            return Outcomes("Done");
+        }
+        else
+        {
+            return Outcomes("Failed");
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/RegisterUserTask.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/RegisterUserTask.cs
index 16328fc361f..b06be2aef82 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/RegisterUserTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/RegisterUserTask.cs
@@ -14,149 +14,148 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Users.Workflows.Activities
+namespace OrchardCore.Users.Workflows.Activities;
+
+public class RegisterUserTask : TaskActivity<RegisterUserTask>
 {
-    public class RegisterUserTask : TaskActivity<RegisterUserTask>
+    private readonly IUserService _userService;
+    private readonly UserManager<IUser> _userManager;
+    private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
+    private readonly LinkGenerator _linkGenerator;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IEmailService _emailService;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly HtmlEncoder _htmlEncoder;
+
+    protected readonly IStringLocalizer S;
+
+    public RegisterUserTask(
+        IUserService userService,
+        UserManager<IUser> userManager,
+        IWorkflowExpressionEvaluator expressionEvaluator,
+        LinkGenerator linkGenerator,
+        IHttpContextAccessor httpContextAccessor,
+        IEmailService emailService,
+        IUpdateModelAccessor updateModelAccessor,
+        IStringLocalizer<RegisterUserTask> localizer,
+        HtmlEncoder htmlEncoder)
     {
-        private readonly IUserService _userService;
-        private readonly UserManager<IUser> _userManager;
-        private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
-        private readonly LinkGenerator _linkGenerator;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IEmailService _emailService;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly HtmlEncoder _htmlEncoder;
-
-        protected readonly IStringLocalizer S;
-
-        public RegisterUserTask(
-            IUserService userService,
-            UserManager<IUser> userManager,
-            IWorkflowExpressionEvaluator expressionEvaluator,
-            LinkGenerator linkGenerator,
-            IHttpContextAccessor httpContextAccessor,
-            IEmailService emailService,
-            IUpdateModelAccessor updateModelAccessor,
-            IStringLocalizer<RegisterUserTask> localizer,
-            HtmlEncoder htmlEncoder)
-        {
-            _userService = userService;
-            _userManager = userManager;
-            _expressionEvaluator = expressionEvaluator;
-            _linkGenerator = linkGenerator;
-            _httpContextAccessor = httpContextAccessor;
-            _emailService = emailService;
-            _updateModelAccessor = updateModelAccessor;
-            S = localizer;
-            _htmlEncoder = htmlEncoder;
-        }
+        _userService = userService;
+        _userManager = userManager;
+        _expressionEvaluator = expressionEvaluator;
+        _linkGenerator = linkGenerator;
+        _httpContextAccessor = httpContextAccessor;
+        _emailService = emailService;
+        _updateModelAccessor = updateModelAccessor;
+        S = localizer;
+        _htmlEncoder = htmlEncoder;
+    }
 
-        public override LocalizedString DisplayText => S["Register User Task"];
+    public override LocalizedString DisplayText => S["Register User Task"];
 
-        // The category to which this activity belongs. The activity picker groups activities by this category.
-        public override LocalizedString Category => S["User"];
+    // The category to which this activity belongs. The activity picker groups activities by this category.
+    public override LocalizedString Category => S["User"];
 
-        // The message to display.
-        public bool SendConfirmationEmail
-        {
-            get => GetProperty(() => true);
-            set => SetProperty(value);
-        }
+    // The message to display.
+    public bool SendConfirmationEmail
+    {
+        get => GetProperty(() => true);
+        set => SetProperty(value);
+    }
 
-        public WorkflowExpression<string> ConfirmationEmailSubject
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
+    public WorkflowExpression<string> ConfirmationEmailSubject
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        // The message to display.
-        public WorkflowExpression<string> ConfirmationEmailTemplate
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
-        public bool RequireModeration
-        {
-            get => GetProperty(() => false);
-            set => SetProperty(value);
-        }
+    // The message to display.
+    public WorkflowExpression<string> ConfirmationEmailTemplate
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+    public bool RequireModeration
+    {
+        get => GetProperty(() => false);
+        set => SetProperty(value);
+    }
 
-        // Returns the possible outcomes of this activity.
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    // Returns the possible outcomes of this activity.
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
+    }
+
+    // This is the heart of the activity and actually performs the work to be done.
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var isValid = false;
+        IFormCollection form = null;
+        string email = null;
+        if (_httpContextAccessor.HttpContext != null)
         {
-            return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
+            form = _httpContextAccessor.HttpContext.Request.Form;
+            email = form["Email"];
+            isValid = !string.IsNullOrWhiteSpace(email);
         }
+        var outcome = isValid ? "Valid" : "Invalid";
 
-        // This is the heart of the activity and actually performs the work to be done.
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        if (isValid)
         {
-            var isValid = false;
-            IFormCollection form = null;
-            string email = null;
-            if (_httpContextAccessor.HttpContext != null)
+            var userName = form["UserName"];
+            if (string.IsNullOrWhiteSpace(userName))
             {
-                form = _httpContextAccessor.HttpContext.Request.Form;
-                email = form["Email"];
-                isValid = !string.IsNullOrWhiteSpace(email);
+                userName = email.Replace('@', '+');
             }
-            var outcome = isValid ? "Valid" : "Invalid";
 
-            if (isValid)
+            var errors = new Dictionary<string, string>();
+            var user = (User)await _userService.CreateUserAsync(new User() { UserName = userName, Email = email, IsEnabled = !RequireModeration }, null, (key, message) => errors.Add(key, message));
+            if (errors.Count > 0)
             {
-                var userName = form["UserName"];
-                if (string.IsNullOrWhiteSpace(userName))
-                {
-                    userName = email.Replace('@', '+');
-                }
-
-                var errors = new Dictionary<string, string>();
-                var user = (User)await _userService.CreateUserAsync(new User() { UserName = userName, Email = email, IsEnabled = !RequireModeration }, null, (key, message) => errors.Add(key, message));
-                if (errors.Count > 0)
+                var updater = _updateModelAccessor.ModelUpdater;
+                if (updater != null)
                 {
-                    var updater = _updateModelAccessor.ModelUpdater;
-                    if (updater != null)
+                    foreach (var item in errors)
                     {
-                        foreach (var item in errors)
-                        {
-                            updater.ModelState.TryAddModelError(item.Key, S[item.Value]);
-                        }
+                        updater.ModelState.TryAddModelError(item.Key, S[item.Value]);
                     }
-                    outcome = "Invalid";
                 }
-                else if (SendConfirmationEmail)
-                {
-                    var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
+                outcome = "Invalid";
+            }
+            else if (SendConfirmationEmail)
+            {
+                var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
 
-                    var uri = _linkGenerator.GetUriByAction(_httpContextAccessor.HttpContext, "ConfirmEmail",
-                        "Registration", new { area = UserConstants.Features.Users, userId = user.UserId, code });
+                var uri = _linkGenerator.GetUriByAction(_httpContextAccessor.HttpContext, "ConfirmEmail",
+                    "Registration", new { area = UserConstants.Features.Users, userId = user.UserId, code });
 
-                    workflowContext.Properties["EmailConfirmationUrl"] = uri;
+                workflowContext.Properties["EmailConfirmationUrl"] = uri;
 
-                    var subject = await _expressionEvaluator.EvaluateAsync(ConfirmationEmailSubject, workflowContext, null);
+                var subject = await _expressionEvaluator.EvaluateAsync(ConfirmationEmailSubject, workflowContext, null);
 
-                    var body = await _expressionEvaluator.EvaluateAsync(ConfirmationEmailTemplate, workflowContext, _htmlEncoder);
+                var body = await _expressionEvaluator.EvaluateAsync(ConfirmationEmailTemplate, workflowContext, _htmlEncoder);
 
-                    var result = await _emailService.SendAsync(email, subject, body);
+                var result = await _emailService.SendAsync(email, subject, body);
 
-                    if (!result.Succeeded)
+                if (!result.Succeeded)
+                {
+                    var updater = _updateModelAccessor.ModelUpdater;
+                    if (updater != null)
                     {
-                        var updater = _updateModelAccessor.ModelUpdater;
-                        if (updater != null)
+                        foreach (var error in result.Errors)
                         {
-                            foreach (var error in result.Errors)
+                            foreach (var errorMessage in error.Value)
                             {
-                                foreach (var errorMessage in error.Value)
-                                {
-                                    updater.ModelState.TryAddModelError(error.Key, errorMessage);
-                                }
+                                updater.ModelState.TryAddModelError(error.Key, errorMessage);
                             }
                         }
-                        outcome = "Invalid";
                     }
+                    outcome = "Invalid";
                 }
             }
-
-            return Outcomes("Done", outcome);
         }
+
+        return Outcomes("Done", outcome);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserActivity.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserActivity.cs
index 10018382e8b..c46706f4ab9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserActivity.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserActivity.cs
@@ -7,42 +7,41 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Users.Workflows.Activities
+namespace OrchardCore.Users.Workflows.Activities;
+
+public abstract class UserActivity : Activity
 {
-    public abstract class UserActivity : Activity
+    protected readonly IStringLocalizer S;
+
+    protected UserActivity(IUserService userService, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer localizer)
+    {
+        UserService = userService;
+        ScriptEvaluator = scriptEvaluator;
+        S = localizer;
+    }
+
+    protected IUserService UserService { get; }
+
+    protected IWorkflowScriptEvaluator ScriptEvaluator { get; }
+
+    public override LocalizedString Category => S["User"];
+
+    /// <summary>
+    /// An expression that evaluates to an <see cref="User"/> item.
+    /// </summary>
+    public WorkflowExpression<User> User
+    {
+        get => GetProperty(() => new WorkflowExpression<User>());
+        set => SetProperty(value);
+    }
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"]);
+    }
+
+    public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
     {
-        protected readonly IStringLocalizer S;
-
-        protected UserActivity(IUserService userService, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer localizer)
-        {
-            UserService = userService;
-            ScriptEvaluator = scriptEvaluator;
-            S = localizer;
-        }
-
-        protected IUserService UserService { get; }
-
-        protected IWorkflowScriptEvaluator ScriptEvaluator { get; }
-
-        public override LocalizedString Category => S["User"];
-
-        /// <summary>
-        /// An expression that evaluates to an <see cref="User"/> item.
-        /// </summary>
-        public WorkflowExpression<User> User
-        {
-            get => GetProperty(() => new WorkflowExpression<User>());
-            set => SetProperty(value);
-        }
-
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"]);
-        }
-
-        public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes("Done");
-        }
+        return Outcomes("Done");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserCreatedEvent.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserCreatedEvent.cs
index a9210add2b9..4057cdce791 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserCreatedEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserCreatedEvent.cs
@@ -2,16 +2,15 @@
 using OrchardCore.Users.Services;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Users.Workflows.Activities
+namespace OrchardCore.Users.Workflows.Activities;
+
+public class UserCreatedEvent : UserEvent
 {
-    public class UserCreatedEvent : UserEvent
+    public UserCreatedEvent(IUserService userService, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<UserCreatedEvent> localizer) : base(userService, scriptEvaluator, localizer)
     {
-        public UserCreatedEvent(IUserService userService, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<UserCreatedEvent> localizer) : base(userService, scriptEvaluator, localizer)
-        {
-        }
+    }
 
-        public override string Name => nameof(UserCreatedEvent);
+    public override string Name => nameof(UserCreatedEvent);
 
-        public override LocalizedString DisplayText => S["User Created Event"];
-    }
+    public override LocalizedString DisplayText => S["User Created Event"];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserDeletedEvent.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserDeletedEvent.cs
index 0e7e45ea691..3c1476d41cd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserDeletedEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserDeletedEvent.cs
@@ -2,16 +2,15 @@
 using OrchardCore.Users.Services;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Users.Workflows.Activities
+namespace OrchardCore.Users.Workflows.Activities;
+
+public class UserDeletedEvent : UserEvent
 {
-    public class UserDeletedEvent : UserEvent
+    public UserDeletedEvent(IUserService userService, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<UserDeletedEvent> localizer) : base(userService, scriptEvaluator, localizer)
     {
-        public UserDeletedEvent(IUserService userService, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<UserDeletedEvent> localizer) : base(userService, scriptEvaluator, localizer)
-        {
-        }
+    }
 
-        public override string Name => nameof(UserDeletedEvent);
+    public override string Name => nameof(UserDeletedEvent);
 
-        public override LocalizedString DisplayText => S["User Deleted Event"];
-    }
+    public override LocalizedString DisplayText => S["User Deleted Event"];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserDisabledEvent.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserDisabledEvent.cs
index c46a9712baa..a0c0cb35311 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserDisabledEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserDisabledEvent.cs
@@ -2,16 +2,15 @@
 using OrchardCore.Users.Services;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Users.Workflows.Activities
+namespace OrchardCore.Users.Workflows.Activities;
+
+public class UserDisabledEvent : UserEvent
 {
-    public class UserDisabledEvent : UserEvent
+    public UserDisabledEvent(IUserService userService, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<UserDisabledEvent> localizer) : base(userService, scriptEvaluator, localizer)
     {
-        public UserDisabledEvent(IUserService userService, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<UserDisabledEvent> localizer) : base(userService, scriptEvaluator, localizer)
-        {
-        }
+    }
 
-        public override string Name => nameof(UserDisabledEvent);
+    public override string Name => nameof(UserDisabledEvent);
 
-        public override LocalizedString DisplayText => S["User Disabled Event"];
-    }
+    public override LocalizedString DisplayText => S["User Disabled Event"];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserEnabledEvent.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserEnabledEvent.cs
index 695d869459c..197bcd58518 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserEnabledEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserEnabledEvent.cs
@@ -2,16 +2,15 @@
 using OrchardCore.Users.Services;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Users.Workflows.Activities
+namespace OrchardCore.Users.Workflows.Activities;
+
+public class UserEnabledEvent : UserEvent
 {
-    public class UserEnabledEvent : UserEvent
+    public UserEnabledEvent(IUserService userService, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<UserEnabledEvent> localizer) : base(userService, scriptEvaluator, localizer)
     {
-        public UserEnabledEvent(IUserService userService, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<UserEnabledEvent> localizer) : base(userService, scriptEvaluator, localizer)
-        {
-        }
+    }
 
-        public override string Name => nameof(UserEnabledEvent);
+    public override string Name => nameof(UserEnabledEvent);
 
-        public override LocalizedString DisplayText => S["User Enabled Event"];
-    }
+    public override LocalizedString DisplayText => S["User Enabled Event"];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserEvent.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserEvent.cs
index 87ee9952da7..bbf500ebc39 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserEvent.cs
@@ -4,22 +4,21 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Users.Workflows.Activities
+namespace OrchardCore.Users.Workflows.Activities;
+
+public abstract class UserEvent : UserActivity, IEvent
 {
-    public abstract class UserEvent : UserActivity, IEvent
+    public UserEvent(IUserService userService, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer localizer) : base(userService, scriptEvaluator, localizer)
     {
-        public UserEvent(IUserService userService, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer localizer) : base(userService, scriptEvaluator, localizer)
-        {
-        }
+    }
 
-        public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Halt();
-        }
+    public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Halt();
+    }
 
-        public override ActivityExecutionResult Resume(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes("Done");
-        }
+    public override ActivityExecutionResult Resume(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes("Done");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserLoggedInEvent.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserLoggedInEvent.cs
index 9079a39a4e1..5a929f37905 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserLoggedInEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserLoggedInEvent.cs
@@ -2,16 +2,15 @@
 using OrchardCore.Users.Services;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Users.Workflows.Activities
+namespace OrchardCore.Users.Workflows.Activities;
+
+public class UserLoggedInEvent : UserEvent
 {
-    public class UserLoggedInEvent : UserEvent
+    public UserLoggedInEvent(IUserService userService, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<UserLoggedInEvent> localizer) : base(userService, scriptEvaluator, localizer)
     {
-        public UserLoggedInEvent(IUserService userService, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<UserLoggedInEvent> localizer) : base(userService, scriptEvaluator, localizer)
-        {
-        }
+    }
 
-        public override string Name => nameof(UserLoggedInEvent);
+    public override string Name => nameof(UserLoggedInEvent);
 
-        public override LocalizedString DisplayText => S["User Loggedin Event"];
-    }
+    public override LocalizedString DisplayText => S["User Loggedin Event"];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserUpdatedEvent.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserUpdatedEvent.cs
index 304f966a6ec..8e8bde0a187 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserUpdatedEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/UserUpdatedEvent.cs
@@ -2,16 +2,15 @@
 using OrchardCore.Users.Services;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Users.Workflows.Activities
+namespace OrchardCore.Users.Workflows.Activities;
+
+public class UserUpdatedEvent : UserEvent
 {
-    public class UserUpdatedEvent : UserEvent
+    public UserUpdatedEvent(IUserService userService, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<UserUpdatedEvent> localizer) : base(userService, scriptEvaluator, localizer)
     {
-        public UserUpdatedEvent(IUserService userService, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<UserUpdatedEvent> localizer) : base(userService, scriptEvaluator, localizer)
-        {
-        }
+    }
 
-        public override string Name => nameof(UserUpdatedEvent);
+    public override string Name => nameof(UserUpdatedEvent);
 
-        public override LocalizedString DisplayText => S["User Updated Event"];
-    }
+    public override LocalizedString DisplayText => S["User Updated Event"];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/ValidateUserTask.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/ValidateUserTask.cs
index 2566b5eda0d..0e4eaeacda1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/ValidateUserTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Activities/ValidateUserTask.cs
@@ -8,75 +8,74 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Users.Workflows.Activities
+namespace OrchardCore.Users.Workflows.Activities;
+
+public class ValidateUserTask : TaskActivity<ValidateUserTask>
 {
-    public class ValidateUserTask : TaskActivity<ValidateUserTask>
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly string _roleClaimType;
+    protected readonly IStringLocalizer S;
+
+    public ValidateUserTask(IHttpContextAccessor httpContextAccessor, IOptions<IdentityOptions> optionsAccessor, IStringLocalizer<ValidateUserTask> localizer)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly string _roleClaimType;
-        protected readonly IStringLocalizer S;
+        _httpContextAccessor = httpContextAccessor;
+        _roleClaimType = optionsAccessor.Value.ClaimsIdentity.RoleClaimType;
+        S = localizer;
+    }
 
-        public ValidateUserTask(IHttpContextAccessor httpContextAccessor, IOptions<IdentityOptions> optionsAccessor, IStringLocalizer<ValidateUserTask> localizer)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _roleClaimType = optionsAccessor.Value.ClaimsIdentity.RoleClaimType;
-            S = localizer;
-        }
+    public override LocalizedString Category => S["User"];
 
-        public override LocalizedString Category => S["User"];
+    public bool SetUserName
+    {
+        get => GetProperty(() => true);
+        set => SetProperty(value);
+    }
 
-        public bool SetUserName
-        {
-            get => GetProperty(() => true);
-            set => SetProperty(value);
-        }
+    public IEnumerable<string> Roles
+    {
+        get => GetProperty(() => new List<string>());
+        set => SetProperty(value);
+    }
 
-        public IEnumerable<string> Roles
-        {
-            get => GetProperty(() => new List<string>());
-            set => SetProperty(value);
-        }
+    public override LocalizedString DisplayText => S["Validate User Task"];
 
-        public override LocalizedString DisplayText => S["Validate User Task"];
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
+    }
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Anonymous"], S["Authenticated"], S["InRole"]);
-        }
+    public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var user = _httpContextAccessor.HttpContext.User;
+        var isAuthenticated = user?.Identity?.IsAuthenticated;
 
-        public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        if (isAuthenticated == true)
         {
-            var user = _httpContextAccessor.HttpContext.User;
-            var isAuthenticated = user?.Identity?.IsAuthenticated;
+            if (SetUserName)
+            {
+                workflowContext.Properties["UserName"] = user.Identity.Name;
+            }
 
-            if (isAuthenticated == true)
+            if (Roles.Any())
             {
-                if (SetUserName)
-                {
-                    workflowContext.Properties["UserName"] = user.Identity.Name;
-                }
+                var userRoleNames = user
+                    .FindAll(c => c.Type == _roleClaimType)
+                    .Select(c => c.Value)
+                    .ToList();
 
-                if (Roles.Any())
+                foreach (var role in Roles)
                 {
-                    var userRoleNames = user
-                        .FindAll(c => c.Type == _roleClaimType)
-                        .Select(c => c.Value)
-                        .ToList();
-
-                    foreach (var role in Roles)
+                    if (userRoleNames.Contains(role))
                     {
-                        if (userRoleNames.Contains(role))
-                        {
-                            workflowContext.LastResult = userRoleNames;
-                            return Outcomes("InRole");
-                        }
+                        workflowContext.LastResult = userRoleNames;
+                        return Outcomes("InRole");
                     }
                 }
-
-                return Outcomes(OrchardCoreConstants.Roles.Authenticated);
             }
 
-            return Outcomes(OrchardCoreConstants.Roles.Anonymous);
+            return Outcomes(OrchardCoreConstants.Roles.Authenticated);
         }
+
+        return Outcomes(OrchardCoreConstants.Roles.Anonymous);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/AssignUserRoleTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/AssignUserRoleTaskDisplayDriver.cs
index 6651e0009a9..f8856232c28 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/AssignUserRoleTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/AssignUserRoleTaskDisplayDriver.cs
@@ -3,20 +3,19 @@
 using OrchardCore.Workflows.Display;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Users.Workflows.Drivers
+namespace OrchardCore.Users.Workflows.Drivers;
+
+public sealed class AssignUserRoleTaskDisplayDriver : ActivityDisplayDriver<AssignUserRoleTask, AssignUserRoleTaskViewModel>
 {
-    public sealed class AssignUserRoleTaskDisplayDriver : ActivityDisplayDriver<AssignUserRoleTask, AssignUserRoleTaskViewModel>
+    protected override void EditActivity(AssignUserRoleTask activity, AssignUserRoleTaskViewModel model)
     {
-        protected override void EditActivity(AssignUserRoleTask activity, AssignUserRoleTaskViewModel model)
-        {
-            model.UserName = activity.UserName.Expression;
-            model.RoleName = activity.RoleName.Expression;
-        }
+        model.UserName = activity.UserName.Expression;
+        model.RoleName = activity.RoleName.Expression;
+    }
 
-        protected override void UpdateActivity(AssignUserRoleTaskViewModel model, AssignUserRoleTask activity)
-        {
-            activity.UserName = new WorkflowExpression<string>(model.UserName);
-            activity.RoleName = new WorkflowExpression<string>(model.RoleName);
-        }
+    protected override void UpdateActivity(AssignUserRoleTaskViewModel model, AssignUserRoleTask activity)
+    {
+        activity.UserName = new WorkflowExpression<string>(model.UserName);
+        activity.RoleName = new WorkflowExpression<string>(model.RoleName);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/RegisterUserTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/RegisterUserTaskDisplayDriver.cs
index 934441a414e..0e74d074a28 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/RegisterUserTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/RegisterUserTaskDisplayDriver.cs
@@ -8,49 +8,48 @@
 using OrchardCore.Workflows.Display;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Users.Workflows.Drivers
+namespace OrchardCore.Users.Workflows.Drivers;
+
+public sealed class RegisterUserTaskDisplayDriver : ActivityDisplayDriver<RegisterUserTask, RegisterUserTaskViewModel>
 {
-    public sealed class RegisterUserTaskDisplayDriver : ActivityDisplayDriver<RegisterUserTask, RegisterUserTaskViewModel>
-    {
-        internal readonly IStringLocalizer S;
+    internal readonly IStringLocalizer S;
 
-        public RegisterUserTaskDisplayDriver(IStringLocalizer<RegisterUserTaskDisplayDriver> localizer)
-        {
-            S = localizer;
-        }
+    public RegisterUserTaskDisplayDriver(IStringLocalizer<RegisterUserTaskDisplayDriver> localizer)
+    {
+        S = localizer;
+    }
 
-        protected override void EditActivity(RegisterUserTask activity, RegisterUserTaskViewModel model)
-        {
-            model.SendConfirmationEmail = activity.SendConfirmationEmail;
-            model.ConfirmationEmailSubject = activity.ConfirmationEmailSubject.Expression;
-            model.ConfirmationEmailTemplate = activity.ConfirmationEmailTemplate.Expression;
-            model.RequireModeration = activity.RequireModeration;
-        }
+    protected override void EditActivity(RegisterUserTask activity, RegisterUserTaskViewModel model)
+    {
+        model.SendConfirmationEmail = activity.SendConfirmationEmail;
+        model.ConfirmationEmailSubject = activity.ConfirmationEmailSubject.Expression;
+        model.ConfirmationEmailTemplate = activity.ConfirmationEmailTemplate.Expression;
+        model.RequireModeration = activity.RequireModeration;
+    }
 
-        public async override Task<IDisplayResult> UpdateAsync(RegisterUserTask model, UpdateEditorContext context)
-        {
-            var viewModel = new RegisterUserTaskViewModel();
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
+    public async override Task<IDisplayResult> UpdateAsync(RegisterUserTask model, UpdateEditorContext context)
+    {
+        var viewModel = new RegisterUserTaskViewModel();
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
 
-            model.SendConfirmationEmail = viewModel.SendConfirmationEmail;
-            model.RequireModeration = viewModel.RequireModeration;
-            model.ConfirmationEmailSubject = new WorkflowExpression<string>(viewModel.ConfirmationEmailSubject);
-            model.ConfirmationEmailTemplate = new WorkflowExpression<string>(viewModel.ConfirmationEmailTemplate);
+        model.SendConfirmationEmail = viewModel.SendConfirmationEmail;
+        model.RequireModeration = viewModel.RequireModeration;
+        model.ConfirmationEmailSubject = new WorkflowExpression<string>(viewModel.ConfirmationEmailSubject);
+        model.ConfirmationEmailTemplate = new WorkflowExpression<string>(viewModel.ConfirmationEmailTemplate);
 
-            if (model.SendConfirmationEmail)
+        if (model.SendConfirmationEmail)
+        {
+            if (string.IsNullOrWhiteSpace(viewModel.ConfirmationEmailSubject))
             {
-                if (string.IsNullOrWhiteSpace(viewModel.ConfirmationEmailSubject))
-                {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
-                }
-
-                if (string.IsNullOrWhiteSpace(viewModel.ConfirmationEmailTemplate))
-                {
-                    context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
-                }
+                context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailSubject), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailSubject)]);
             }
 
-            return Edit(model, context);
+            if (string.IsNullOrWhiteSpace(viewModel.ConfirmationEmailTemplate))
+            {
+                context.Updater.ModelState.AddModelError(Prefix, nameof(viewModel.ConfirmationEmailTemplate), S["A value is required for {0}.", nameof(viewModel.ConfirmationEmailTemplate)]);
+            }
         }
+
+        return Edit(model, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserCreatedEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserCreatedEventDisplayDriver.cs
index 2bc00b4d453..2c33c3207e0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserCreatedEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserCreatedEventDisplayDriver.cs
@@ -5,24 +5,23 @@
 using OrchardCore.Users.Workflows.ViewModels;
 using OrchardCore.Workflows.Display;
 
-namespace OrchardCore.Users.Workflows.Drivers
+namespace OrchardCore.Users.Workflows.Drivers;
+
+public sealed class UserCreatedEventDisplayDriver : ActivityDisplayDriver<UserCreatedEvent, UserCreatedEventViewModel>
 {
-    public sealed class UserCreatedEventDisplayDriver : ActivityDisplayDriver<UserCreatedEvent, UserCreatedEventViewModel>
+    public override Task<IDisplayResult> DisplayAsync(UserCreatedEvent activity, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(UserCreatedEvent activity, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                Shape("UserCreatedEvent_Fields_Thumbnail", new UserCreatedEventViewModel(activity)).Location("Thumbnail", "Content"),
-                Factory("UserCreatedEvent_Fields_Design", ctx =>
+        return CombineAsync(
+            Shape("UserCreatedEvent_Fields_Thumbnail", new UserCreatedEventViewModel(activity)).Location("Thumbnail", "Content"),
+            Factory("UserCreatedEvent_Fields_Design", ctx =>
+            {
+                var shape = new UserCreatedEventViewModel
                 {
-                    var shape = new UserCreatedEventViewModel
-                    {
-                        Activity = activity,
-                    };
+                    Activity = activity,
+                };
 
-                    return shape;
-                }).Location("Design", "Content")
-            );
-        }
+                return shape;
+            }).Location("Design", "Content")
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserDeletedEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserDeletedEventDisplayDriver.cs
index f9de1915415..a10a8560910 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserDeletedEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserDeletedEventDisplayDriver.cs
@@ -5,24 +5,23 @@
 using OrchardCore.Users.Workflows.ViewModels;
 using OrchardCore.Workflows.Display;
 
-namespace OrchardCore.Users.Workflows.Drivers
+namespace OrchardCore.Users.Workflows.Drivers;
+
+public sealed class UserDeletedEventDisplayDriver : ActivityDisplayDriver<UserDeletedEvent, UserDeletedEventViewModel>
 {
-    public sealed class UserDeletedEventDisplayDriver : ActivityDisplayDriver<UserDeletedEvent, UserDeletedEventViewModel>
+    public override Task<IDisplayResult> DisplayAsync(UserDeletedEvent activity, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(UserDeletedEvent activity, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                Shape("UserDeletedEvent_Fields_Thumbnail", new UserDeletedEventViewModel(activity)).Location("Thumbnail", "Content"),
-                Factory("UserDeletedEvent_Fields_Design", ctx =>
+        return CombineAsync(
+            Shape("UserDeletedEvent_Fields_Thumbnail", new UserDeletedEventViewModel(activity)).Location("Thumbnail", "Content"),
+            Factory("UserDeletedEvent_Fields_Design", ctx =>
+            {
+                var shape = new UserDeletedEventViewModel
                 {
-                    var shape = new UserDeletedEventViewModel
-                    {
-                        Activity = activity,
-                    };
+                    Activity = activity,
+                };
 
-                    return shape;
-                }).Location("Design", "Content")
-            );
-        }
+                return shape;
+            }).Location("Design", "Content")
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserDisabledEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserDisabledEventDisplayDriver.cs
index 4080f8c95f2..ad65dc5eeb3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserDisabledEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserDisabledEventDisplayDriver.cs
@@ -5,24 +5,23 @@
 using OrchardCore.Users.Workflows.ViewModels;
 using OrchardCore.Workflows.Display;
 
-namespace OrchardCore.Users.Workflows.Drivers
+namespace OrchardCore.Users.Workflows.Drivers;
+
+public sealed class UserDisabledEventDisplayDriver : ActivityDisplayDriver<UserDisabledEvent, UserDisabledEventViewModel>
 {
-    public sealed class UserDisabledEventDisplayDriver : ActivityDisplayDriver<UserDisabledEvent, UserDisabledEventViewModel>
+    public override Task<IDisplayResult> DisplayAsync(UserDisabledEvent activity, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(UserDisabledEvent activity, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                Shape("UserDisabledEvent_Fields_Thumbnail", new UserDisabledEventViewModel(activity)).Location("Thumbnail", "Content"),
-                Factory("UserDisabledEvent_Fields_Design", ctx =>
+        return CombineAsync(
+            Shape("UserDisabledEvent_Fields_Thumbnail", new UserDisabledEventViewModel(activity)).Location("Thumbnail", "Content"),
+            Factory("UserDisabledEvent_Fields_Design", ctx =>
+            {
+                var shape = new UserDisabledEventViewModel
                 {
-                    var shape = new UserDisabledEventViewModel
-                    {
-                        Activity = activity,
-                    };
+                    Activity = activity,
+                };
 
-                    return shape;
-                }).Location("Design", "Content")
-            );
-        }
+                return shape;
+            }).Location("Design", "Content")
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserEnabledEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserEnabledEventDisplayDriver.cs
index f19e3e7b3a1..bed0ba87659 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserEnabledEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserEnabledEventDisplayDriver.cs
@@ -5,24 +5,23 @@
 using OrchardCore.Users.Workflows.ViewModels;
 using OrchardCore.Workflows.Display;
 
-namespace OrchardCore.Users.Workflows.Drivers
+namespace OrchardCore.Users.Workflows.Drivers;
+
+public sealed class UserEnabledEventDisplayDriver : ActivityDisplayDriver<UserEnabledEvent, UserEnabledEventViewModel>
 {
-    public sealed class UserEnabledEventDisplayDriver : ActivityDisplayDriver<UserEnabledEvent, UserEnabledEventViewModel>
+    public override Task<IDisplayResult> DisplayAsync(UserEnabledEvent activity, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(UserEnabledEvent activity, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                Shape("UserEnabledEvent_Fields_Thumbnail", new UserEnabledEventViewModel(activity)).Location("Thumbnail", "Content"),
-                Factory("UserEnabledEvent_Fields_Design", ctx =>
+        return CombineAsync(
+            Shape("UserEnabledEvent_Fields_Thumbnail", new UserEnabledEventViewModel(activity)).Location("Thumbnail", "Content"),
+            Factory("UserEnabledEvent_Fields_Design", ctx =>
+            {
+                var shape = new UserEnabledEventViewModel
                 {
-                    var shape = new UserEnabledEventViewModel
-                    {
-                        Activity = activity,
-                    };
+                    Activity = activity,
+                };
 
-                    return shape;
-                }).Location("Design", "Content")
-            );
-        }
+                return shape;
+            }).Location("Design", "Content")
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserLoggedInEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserLoggedInEventDisplayDriver.cs
index c62b91f3fb4..1bad185cda6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserLoggedInEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserLoggedInEventDisplayDriver.cs
@@ -5,24 +5,23 @@
 using OrchardCore.Users.Workflows.ViewModels;
 using OrchardCore.Workflows.Display;
 
-namespace OrchardCore.Users.Workflows.Drivers
+namespace OrchardCore.Users.Workflows.Drivers;
+
+public sealed class UserLoggedInEventDisplayDriver : ActivityDisplayDriver<UserLoggedInEvent, UserLoggedInEventViewModel>
 {
-    public sealed class UserLoggedInEventDisplayDriver : ActivityDisplayDriver<UserLoggedInEvent, UserLoggedInEventViewModel>
+    public override Task<IDisplayResult> DisplayAsync(UserLoggedInEvent activity, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(UserLoggedInEvent activity, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                Shape("UserLoggedInEvent_Fields_Thumbnail", new UserLoggedInEventViewModel(activity)).Location("Thumbnail", "Content"),
-                Factory("UserLoggedInEvent_Fields_Design", ctx =>
+        return CombineAsync(
+            Shape("UserLoggedInEvent_Fields_Thumbnail", new UserLoggedInEventViewModel(activity)).Location("Thumbnail", "Content"),
+            Factory("UserLoggedInEvent_Fields_Design", ctx =>
+            {
+                var shape = new UserLoggedInEventViewModel
                 {
-                    var shape = new UserLoggedInEventViewModel
-                    {
-                        Activity = activity,
-                    };
+                    Activity = activity,
+                };
 
-                    return shape;
-                }).Location("Design", "Content")
-            );
-        }
+                return shape;
+            }).Location("Design", "Content")
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserUpdatedEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserUpdatedEventDisplayDriver.cs
index 8335b840b70..8b74e75a1f0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserUpdatedEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/UserUpdatedEventDisplayDriver.cs
@@ -5,24 +5,23 @@
 using OrchardCore.Users.Workflows.ViewModels;
 using OrchardCore.Workflows.Display;
 
-namespace OrchardCore.Users.Workflows.Drivers
+namespace OrchardCore.Users.Workflows.Drivers;
+
+public sealed class UserUpdatedEventDisplayDriver : ActivityDisplayDriver<UserUpdatedEvent, UserUpdatedEventViewModel>
 {
-    public sealed class UserUpdatedEventDisplayDriver : ActivityDisplayDriver<UserUpdatedEvent, UserUpdatedEventViewModel>
+    public override Task<IDisplayResult> DisplayAsync(UserUpdatedEvent activity, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(UserUpdatedEvent activity, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                Shape("UserUpdatedEvent_Fields_Thumbnail", new UserUpdatedEventViewModel(activity)).Location("Thumbnail", "Content"),
-                Factory("UserUpdatedEvent_Fields_Design", ctx =>
+        return CombineAsync(
+            Shape("UserUpdatedEvent_Fields_Thumbnail", new UserUpdatedEventViewModel(activity)).Location("Thumbnail", "Content"),
+            Factory("UserUpdatedEvent_Fields_Design", ctx =>
+            {
+                var shape = new UserUpdatedEventViewModel
                 {
-                    var shape = new UserUpdatedEventViewModel
-                    {
-                        Activity = activity,
-                    };
+                    Activity = activity,
+                };
 
-                    return shape;
-                }).Location("Design", "Content")
-            );
-        }
+                return shape;
+            }).Location("Design", "Content")
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/ValidateUserTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/ValidateUserTaskDisplayDriver.cs
index ab3a3f57072..47e090b1219 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/ValidateUserTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Drivers/ValidateUserTaskDisplayDriver.cs
@@ -2,20 +2,19 @@
 using OrchardCore.Users.Workflows.ViewModels;
 using OrchardCore.Workflows.Display;
 
-namespace OrchardCore.Users.Workflows.Drivers
+namespace OrchardCore.Users.Workflows.Drivers;
+
+public sealed class ValidateUserTaskDisplayDriver : ActivityDisplayDriver<ValidateUserTask, ValidateUserTaskViewModel>
 {
-    public sealed class ValidateUserTaskDisplayDriver : ActivityDisplayDriver<ValidateUserTask, ValidateUserTaskViewModel>
+    protected override void EditActivity(ValidateUserTask activity, ValidateUserTaskViewModel model)
     {
-        protected override void EditActivity(ValidateUserTask activity, ValidateUserTaskViewModel model)
-        {
-            model.Roles = activity.Roles;
-            model.SetUserName = activity.SetUserName;
-        }
+        model.Roles = activity.Roles;
+        model.SetUserName = activity.SetUserName;
+    }
 
-        protected override void UpdateActivity(ValidateUserTaskViewModel model, ValidateUserTask activity)
-        {
-            activity.Roles = model.Roles;
-            activity.SetUserName = model.SetUserName;
-        }
+    protected override void UpdateActivity(ValidateUserTaskViewModel model, ValidateUserTask activity)
+    {
+        activity.Roles = model.Roles;
+        activity.SetUserName = model.SetUserName;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Handlers/UserEventHandler.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Handlers/UserEventHandler.cs
index 1f5adc6cdc6..bd7523e6889 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Handlers/UserEventHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Handlers/UserEventHandler.cs
@@ -6,48 +6,47 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Users.Workflows.Handlers
+namespace OrchardCore.Users.Workflows.Handlers;
+
+public class UserEventHandler : UserEventHandlerBase
 {
-    public class UserEventHandler : UserEventHandlerBase
+    private readonly IWorkflowManager _workflowManager;
+
+    public UserEventHandler(IWorkflowManager workflowManager)
+    {
+        _workflowManager = workflowManager;
+    }
+
+    public override Task CreatedAsync(UserCreateContext context)
+    {
+        return TriggerWorkflowEventAsync(nameof(UserCreatedEvent), (User)context.User);
+    }
+
+    public override Task DeletedAsync(UserDeleteContext context)
+    {
+        return TriggerWorkflowEventAsync(nameof(UserDeletedEvent), (User)context.User);
+    }
+
+    public override Task DisabledAsync(UserContext context)
+    {
+        return TriggerWorkflowEventAsync(nameof(UserDisabledEvent), (User)context.User);
+    }
+
+    public override Task EnabledAsync(UserContext context)
+    {
+        return TriggerWorkflowEventAsync(nameof(UserEnabledEvent), (User)context.User);
+    }
+
+    public override Task UpdatedAsync(UserUpdateContext context)
+    {
+        return TriggerWorkflowEventAsync(nameof(UserUpdatedEvent), (User)context.User);
+    }
+
+    private Task<IEnumerable<WorkflowExecutionContext>> TriggerWorkflowEventAsync(string name, User user)
     {
-        private readonly IWorkflowManager _workflowManager;
-
-        public UserEventHandler(IWorkflowManager workflowManager)
-        {
-            _workflowManager = workflowManager;
-        }
-
-        public override Task CreatedAsync(UserCreateContext context)
-        {
-            return TriggerWorkflowEventAsync(nameof(UserCreatedEvent), (User)context.User);
-        }
-
-        public override Task DeletedAsync(UserDeleteContext context)
-        {
-            return TriggerWorkflowEventAsync(nameof(UserDeletedEvent), (User)context.User);
-        }
-
-        public override Task DisabledAsync(UserContext context)
-        {
-            return TriggerWorkflowEventAsync(nameof(UserDisabledEvent), (User)context.User);
-        }
-
-        public override Task EnabledAsync(UserContext context)
-        {
-            return TriggerWorkflowEventAsync(nameof(UserEnabledEvent), (User)context.User);
-        }
-
-        public override Task UpdatedAsync(UserUpdateContext context)
-        {
-            return TriggerWorkflowEventAsync(nameof(UserUpdatedEvent), (User)context.User);
-        }
-
-        private Task<IEnumerable<WorkflowExecutionContext>> TriggerWorkflowEventAsync(string name, User user)
-        {
-            return _workflowManager.TriggerEventAsync(name,
-                input: new { User = user },
-                correlationId: user.UserId
-            );
-        }
+        return _workflowManager.TriggerEventAsync(name,
+            input: new { User = user },
+            correlationId: user.UserId
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Startup.cs
index 0f502ea2983..3bdb33ae626 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/Startup.cs
@@ -6,31 +6,30 @@
 using OrchardCore.Users.Workflows.Handlers;
 using OrchardCore.Workflows.Helpers;
 
-namespace OrchardCore.Users.Workflows
+namespace OrchardCore.Users.Workflows;
+
+[RequireFeatures("OrchardCore.Workflows")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Workflows")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddActivity<UserCreatedEvent, UserCreatedEventDisplayDriver>();
-            services.AddActivity<UserDeletedEvent, UserDeletedEventDisplayDriver>();
-            services.AddActivity<UserEnabledEvent, UserEnabledEventDisplayDriver>();
-            services.AddActivity<UserDisabledEvent, UserDisabledEventDisplayDriver>();
-            services.AddActivity<UserUpdatedEvent, UserUpdatedEventDisplayDriver>();
-            services.AddActivity<UserLoggedInEvent, UserLoggedInEventDisplayDriver>();
-            services.AddScoped<IUserEventHandler, UserEventHandler>();
-            services.AddActivity<AssignUserRoleTask, AssignUserRoleTaskDisplayDriver>();
-            services.AddActivity<ValidateUserTask, ValidateUserTaskDisplayDriver>();
-        }
+        services.AddActivity<UserCreatedEvent, UserCreatedEventDisplayDriver>();
+        services.AddActivity<UserDeletedEvent, UserDeletedEventDisplayDriver>();
+        services.AddActivity<UserEnabledEvent, UserEnabledEventDisplayDriver>();
+        services.AddActivity<UserDisabledEvent, UserDisabledEventDisplayDriver>();
+        services.AddActivity<UserUpdatedEvent, UserUpdatedEventDisplayDriver>();
+        services.AddActivity<UserLoggedInEvent, UserLoggedInEventDisplayDriver>();
+        services.AddScoped<IUserEventHandler, UserEventHandler>();
+        services.AddActivity<AssignUserRoleTask, AssignUserRoleTaskDisplayDriver>();
+        services.AddActivity<ValidateUserTask, ValidateUserTaskDisplayDriver>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Workflows", "OrchardCore.Email")]
-    public sealed class EmailWorkflowStartup : StartupBase
+[RequireFeatures("OrchardCore.Workflows", "OrchardCore.Email")]
+public sealed class EmailWorkflowStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddActivity<RegisterUserTask, RegisterUserTaskDisplayDriver>();
-        }
+        services.AddActivity<RegisterUserTask, RegisterUserTaskDisplayDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/AssignUserRoleTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/AssignUserRoleTaskViewModel.cs
index 461ad68fe67..23c26b50ead 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/AssignUserRoleTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/AssignUserRoleTaskViewModel.cs
@@ -1,13 +1,12 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Users.Workflows.ViewModels
+namespace OrchardCore.Users.Workflows.ViewModels;
+
+public class AssignUserRoleTaskViewModel
 {
-    public class AssignUserRoleTaskViewModel
-    {
-        [Required]
-        public string UserName { get; set; }
+    [Required]
+    public string UserName { get; set; }
 
-        [Required]
-        public string RoleName { get; set; }
-    }
+    [Required]
+    public string RoleName { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/RegisterUserTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/RegisterUserTaskViewModel.cs
index 23d36916995..02feed37a53 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/RegisterUserTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/RegisterUserTaskViewModel.cs
@@ -1,13 +1,12 @@
-namespace OrchardCore.Users.Workflows.ViewModels
+namespace OrchardCore.Users.Workflows.ViewModels;
+
+public class RegisterUserTaskViewModel
 {
-    public class RegisterUserTaskViewModel
-    {
-        public bool SendConfirmationEmail { get; set; }
+    public bool SendConfirmationEmail { get; set; }
 
-        public string ConfirmationEmailSubject { get; set; }
+    public string ConfirmationEmailSubject { get; set; }
 
-        public string ConfirmationEmailTemplate { get; set; }
+    public string ConfirmationEmailTemplate { get; set; }
 
-        public bool RequireModeration { get; set; }
-    }
+    public bool RequireModeration { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserCreatedEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserCreatedEventViewModel.cs
index 1855a7fcea3..6796d4d71f2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserCreatedEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserCreatedEventViewModel.cs
@@ -1,16 +1,15 @@
 using OrchardCore.Users.Workflows.Activities;
 
-namespace OrchardCore.Users.Workflows.ViewModels
+namespace OrchardCore.Users.Workflows.ViewModels;
+
+public class UserCreatedEventViewModel : UserEventViewModel<UserCreatedEvent>
 {
-    public class UserCreatedEventViewModel : UserEventViewModel<UserCreatedEvent>
+    public UserCreatedEventViewModel()
     {
-        public UserCreatedEventViewModel()
-        {
-        }
+    }
 
-        public UserCreatedEventViewModel(UserCreatedEvent activity)
-        {
-            Activity = activity;
-        }
+    public UserCreatedEventViewModel(UserCreatedEvent activity)
+    {
+        Activity = activity;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserDeletedEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserDeletedEventViewModel.cs
index 423cba9a38b..0b991c0b214 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserDeletedEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserDeletedEventViewModel.cs
@@ -1,16 +1,15 @@
 using OrchardCore.Users.Workflows.Activities;
 
-namespace OrchardCore.Users.Workflows.ViewModels
+namespace OrchardCore.Users.Workflows.ViewModels;
+
+public class UserDeletedEventViewModel : UserEventViewModel<UserDeletedEvent>
 {
-    public class UserDeletedEventViewModel : UserEventViewModel<UserDeletedEvent>
+    public UserDeletedEventViewModel()
     {
-        public UserDeletedEventViewModel()
-        {
-        }
+    }
 
-        public UserDeletedEventViewModel(UserDeletedEvent activity)
-        {
-            Activity = activity;
-        }
+    public UserDeletedEventViewModel(UserDeletedEvent activity)
+    {
+        Activity = activity;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserDisabledEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserDisabledEventViewModel.cs
index a29f2138dd4..bf6482bfa00 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserDisabledEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserDisabledEventViewModel.cs
@@ -1,16 +1,15 @@
 using OrchardCore.Users.Workflows.Activities;
 
-namespace OrchardCore.Users.Workflows.ViewModels
+namespace OrchardCore.Users.Workflows.ViewModels;
+
+public class UserDisabledEventViewModel : UserEventViewModel<UserDisabledEvent>
 {
-    public class UserDisabledEventViewModel : UserEventViewModel<UserDisabledEvent>
+    public UserDisabledEventViewModel()
     {
-        public UserDisabledEventViewModel()
-        {
-        }
+    }
 
-        public UserDisabledEventViewModel(UserDisabledEvent activity)
-        {
-            Activity = activity;
-        }
+    public UserDisabledEventViewModel(UserDisabledEvent activity)
+    {
+        Activity = activity;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserEnabledEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserEnabledEventViewModel.cs
index c427fdca2fb..d293ff93e41 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserEnabledEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserEnabledEventViewModel.cs
@@ -1,16 +1,15 @@
 using OrchardCore.Users.Workflows.Activities;
 
-namespace OrchardCore.Users.Workflows.ViewModels
+namespace OrchardCore.Users.Workflows.ViewModels;
+
+public class UserEnabledEventViewModel : UserEventViewModel<UserEnabledEvent>
 {
-    public class UserEnabledEventViewModel : UserEventViewModel<UserEnabledEvent>
+    public UserEnabledEventViewModel()
     {
-        public UserEnabledEventViewModel()
-        {
-        }
+    }
 
-        public UserEnabledEventViewModel(UserEnabledEvent activity)
-        {
-            Activity = activity;
-        }
+    public UserEnabledEventViewModel(UserEnabledEvent activity)
+    {
+        Activity = activity;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserEventViewModel.cs
index bb9e8193f8e..f6d6f59efff 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserEventViewModel.cs
@@ -1,17 +1,16 @@
 using OrchardCore.Users.Workflows.Activities;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Users.Workflows.ViewModels
+namespace OrchardCore.Users.Workflows.ViewModels;
+
+public class UserEventViewModel<T> : ActivityViewModel<T> where T : UserEvent
 {
-    public class UserEventViewModel<T> : ActivityViewModel<T> where T : UserEvent
+    public UserEventViewModel()
     {
-        public UserEventViewModel()
-        {
-        }
+    }
 
-        public UserEventViewModel(T activity)
-        {
-            Activity = activity;
-        }
+    public UserEventViewModel(T activity)
+    {
+        Activity = activity;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserLoggedInEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserLoggedInEventViewModel.cs
index 8fbdee9aff8..31c52eb479d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserLoggedInEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserLoggedInEventViewModel.cs
@@ -1,16 +1,15 @@
 using OrchardCore.Users.Workflows.Activities;
 
-namespace OrchardCore.Users.Workflows.ViewModels
+namespace OrchardCore.Users.Workflows.ViewModels;
+
+public class UserLoggedInEventViewModel : UserEventViewModel<UserLoggedInEvent>
 {
-    public class UserLoggedInEventViewModel : UserEventViewModel<UserLoggedInEvent>
+    public UserLoggedInEventViewModel()
     {
-        public UserLoggedInEventViewModel()
-        {
-        }
+    }
 
-        public UserLoggedInEventViewModel(UserLoggedInEvent activity)
-        {
-            Activity = activity;
-        }
+    public UserLoggedInEventViewModel(UserLoggedInEvent activity)
+    {
+        Activity = activity;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserUpdatedEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserUpdatedEventViewModel.cs
index 3ef3005a35c..55e703a5612 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserUpdatedEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/UserUpdatedEventViewModel.cs
@@ -1,16 +1,15 @@
 using OrchardCore.Users.Workflows.Activities;
 
-namespace OrchardCore.Users.Workflows.ViewModels
+namespace OrchardCore.Users.Workflows.ViewModels;
+
+public class UserUpdatedEventViewModel : UserEventViewModel<UserUpdatedEvent>
 {
-    public class UserUpdatedEventViewModel : UserEventViewModel<UserUpdatedEvent>
+    public UserUpdatedEventViewModel()
     {
-        public UserUpdatedEventViewModel()
-        {
-        }
+    }
 
-        public UserUpdatedEventViewModel(UserUpdatedEvent activity)
-        {
-            Activity = activity;
-        }
+    public UserUpdatedEventViewModel(UserUpdatedEvent activity)
+    {
+        Activity = activity;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/ValidateUserTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/ValidateUserTaskViewModel.cs
index d7fc2364ad8..7e871594332 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/ValidateUserTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Workflows/ViewModels/ValidateUserTaskViewModel.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Users.Workflows.ViewModels
+namespace OrchardCore.Users.Workflows.ViewModels;
+
+public class ValidateUserTaskViewModel
 {
-    public class ValidateUserTaskViewModel
-    {
-        public bool SetUserName { get; set; }
+    public bool SetUserName { get; set; }
 
-        public IEnumerable<string> Roles { get; set; }
-    }
+    public IEnumerable<string> Roles { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/ContentCardShapes.cs b/src/OrchardCore.Modules/OrchardCore.Widgets/ContentCardShapes.cs
index d3b09a8b3b9..b94164ea301 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/ContentCardShapes.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/ContentCardShapes.cs
@@ -3,146 +3,145 @@
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.Descriptors;
 
-namespace OrchardCore.Widgets
+namespace OrchardCore.Widgets;
+
+public class ContentCardShapes : ShapeTableProvider
 {
-    public class ContentCardShapes : ShapeTableProvider
-    {
-        // Card Shape
-        private const string ContentCardEdit = "ContentCard_Edit";
+    // Card Shape
+    private const string ContentCardEdit = "ContentCard_Edit";
 
-        // Frame shape
-        private const string ContentCardFrame = "ContentCard_Frame";
+    // Frame shape
+    private const string ContentCardFrame = "ContentCard_Frame";
 
-        // Card Editor Fields
-        private const string ContentCardFieldsEdit = "ContentCard_Fields_Edit";
+    // Card Editor Fields
+    private const string ContentCardFieldsEdit = "ContentCard_Fields_Edit";
 
-        public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
-        {
-            builder.Describe(ContentCardEdit)
-                .OnDisplaying(context =>
+    public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
+    {
+        builder.Describe(ContentCardEdit)
+            .OnDisplaying(context =>
+            {
+                // Defines Edit Alternates for the Content Item being edited.
+                var contentCardEditor = context.Shape;
+                var collectionType = contentCardEditor.GetProperty<string>("CollectionShapeType");
+                var contentType = contentCardEditor.GetProperty<string>("ContentTypeValue");
+                var parentContentType = contentCardEditor.GetProperty<string>("ParentContentType");
+                var namedPart = contentCardEditor.GetProperty<string>("CollectionPartName");
+                if (contentCardEditor.TryGetProperty<bool>("BuildEditor", out var buildEditor) && buildEditor)
                 {
-                    // Defines Edit Alternates for the Content Item being edited.
-                    var contentCardEditor = context.Shape;
-                    var collectionType = contentCardEditor.GetProperty<string>("CollectionShapeType");
-                    var contentType = contentCardEditor.GetProperty<string>("ContentTypeValue");
-                    var parentContentType = contentCardEditor.GetProperty<string>("ParentContentType");
-                    var namedPart = contentCardEditor.GetProperty<string>("CollectionPartName");
-                    if (contentCardEditor.TryGetProperty<bool>("BuildEditor", out var buildEditor) && buildEditor)
-                    {
-                        // Define edit card shape per collection type
-                        // ContentCard_Edit__[CollectionType]
-                        // e.g. ContentCard_Edit__FlowPart, ContentCard_Edit__BagPart, ContentCard_Edit__WidgetsListPart
-                        contentCardEditor.Metadata.Alternates.Add($"{ContentCardEdit}__{collectionType}");
-
-                        // Define edit card shape per content type
-                        // ContentCard_Edit__[ContentType] e.g. ContentCard_Edit__Paragraph, ContentCard_Edit__Form, ContentCard_Edit__Input
-                        contentCardEditor.Metadata.Alternates.Add($"{ContentCardEdit}__{contentType}");
-
-                        // Define edit card shape per content type per collection type
-                        // ContentCard_Edit__[CollectionType]__[ContentType]
-                        // e.g. ContentCard_Edit__FlowPart__Paragraph, ContentCard_Edit__BagPart__Form, ContentCard_Edit__FlowPart__Input
-                        contentCardEditor.Metadata.Alternates.Add($"{ContentCardEdit}__{collectionType}__{contentType}");
-
-                        // If we have Parent Content Type,
-                        if (!string.IsNullOrWhiteSpace(parentContentType))
-                        {
-                            // Define edit card shape for all child  in collection per parent content type
-                            // ContentCard_Edit__[ParentContentType]__[CollectionType]
-                            // e.g. ContentCard_Edit__Page__FlowPart, ContentCard_Edit__Form__FlowPart, ContentCard_Edit__Services__BagPart
-                            contentCardEditor.Metadata.Alternates.Add($"{ContentCardEdit}__{parentContentType}__{collectionType}");
-
-                            // Define edit card shape for selected child  with specific type per parent content type
-                            // ContentCard_Edit__[ParentContentType]__[ContentType]
-                            // e.g. ContentCard_Edit__Page__Form, ContentCard_Edit__Form__Label, ContentCard_Edit__LandingPage__Service
-                            contentCardEditor.Metadata.Alternates.Add($"{ContentCardEdit}__{parentContentType}__{contentType}");
-
-                            // Define edit card shape for selected child  with specific type per parent content type for given collection
-                            // ContentCard_Edit__[ParentContentType]__[CollectionType]__[ContentType] e.g. ContentCard_Edit__LandingPage__FlowPart__Service,
-                            // ContentCard_Edit__LandingPage__BagPart__Service, ContentCard_Edit__Form__FlowPart__Label
-                            contentCardEditor.Metadata.Alternates.Add($"{ContentCardEdit}__{parentContentType}__{collectionType}__{contentType}");
-
-                            if (!string.IsNullOrWhiteSpace(namedPart) && !(namedPart.Equals(collectionType, StringComparison.Ordinal)))
-                            {
-                                // Define edit card shape for selected child  with specific type and partname per parent content type
-                                // ContentCard_Edit__[ParentContentType]__[PartName]
-                                // e.g. ContentCard_Edit__Grid__LeftColumn, ContentCard_Edit__LandingPage__Services
-                                contentCardEditor.Metadata.Alternates.Add($"{ContentCardEdit}__{parentContentType}__{namedPart}");
-
-                                // Define edit card shape for selected child  with specific type and partname per parent content type
-                                // ContentCard_Edit__[ContentType]__[ContentType]
-                                // e.g. ContentCard_Edit__Grid__LeftColumn__Client, ContentCard_Edit__LandingPage__Services__Service
-                                contentCardEditor.Metadata.Alternates.Add($"{ContentCardEdit}__{parentContentType}__{namedPart}__{contentType}");
-                            }
-                        }
-                    }
-                });
+                    // Define edit card shape per collection type
+                    // ContentCard_Edit__[CollectionType]
+                    // e.g. ContentCard_Edit__FlowPart, ContentCard_Edit__BagPart, ContentCard_Edit__WidgetsListPart
+                    contentCardEditor.Metadata.Alternates.Add($"{ContentCardEdit}__{collectionType}");
 
-            builder.Describe(ContentCardFrame)
-                .OnDisplaying(context =>
-                {
-                    // Alternates for Outer Frame of ContentCard
-                    dynamic contentCardFrame = context.Shape;
-                    string collectionType = contentCardFrame.ChildContent.CollectionShapeType;
-                    var contentType = contentCardFrame.ChildContent.ContentTypeValue as string;
-                    string parentContentType = contentCardFrame.ChildContent.ParentContentType;
-                    string namedPart = contentCardFrame.ChildContent.CollectionPartName;
-
-                    // Define Frame card shape per collection type
-                    // ContentCard_Frame__[CollectionType]
-                    // e.g. ContentCard_Frame__FlowPart, ContentCard_Frame__BagPart, ContentCard_Frame__WidgetsListPart
-                    contentCardFrame.Metadata.Alternates.Add($"{ContentCardFrame}__{collectionType}");
-
-                    // Define Frame card shape per content type
-                    // ContentCard_Frame__[ContentType]
-                    // e.g. ContentCard_Frame__Paragraph, ContentCard_Frame__Form, ContentCard_Frame__Input
-                    contentCardFrame.Metadata.Alternates.Add($"{ContentCardFrame}__{contentType}");
-
-                    // Define Frame card shape per content type per collection type
-                    // ContentCard_Frame__[CollectionType]__[ContentType]
-                    // e.g. ContentCard_Frame__FlowPart__Paragraph, ContentCard_Frame__BagPart__Form, ContentCard_Frame__FlowPart__Input
-                    contentCardFrame.Metadata.Alternates.Add($"{ContentCardFrame}__{collectionType}__{contentType}");
+                    // Define edit card shape per content type
+                    // ContentCard_Edit__[ContentType] e.g. ContentCard_Edit__Paragraph, ContentCard_Edit__Form, ContentCard_Edit__Input
+                    contentCardEditor.Metadata.Alternates.Add($"{ContentCardEdit}__{contentType}");
+
+                    // Define edit card shape per content type per collection type
+                    // ContentCard_Edit__[CollectionType]__[ContentType]
+                    // e.g. ContentCard_Edit__FlowPart__Paragraph, ContentCard_Edit__BagPart__Form, ContentCard_Edit__FlowPart__Input
+                    contentCardEditor.Metadata.Alternates.Add($"{ContentCardEdit}__{collectionType}__{contentType}");
 
+                    // If we have Parent Content Type,
                     if (!string.IsNullOrWhiteSpace(parentContentType))
                     {
-                        // Define frame card shape for children per parent content type for given collection
-                        // ContentCard_Frame__[ParentContentType]__[CollectionType]
-                        // e.g. ContentCard_Frame__Page__FlowPart, ContentCard_Frame__LandingPage__BagPart, ContentCard_Frame__Form__FlowPart
-                        contentCardFrame.Metadata.Alternates.Add($"{ContentCardFrame}__{parentContentType}__{collectionType}");
-
-                        // Define frame card shape for child with specific type per parent content type
-                        // ContentCard_Frame__[ParentContentType]__[ContentType]
-                        // e.g. ContentCard_Frame__Page__Form, ContentCard_Frame__Form__Label
-                        contentCardFrame.Metadata.Alternates.Add($"{ContentCardFrame}__{parentContentType}__{contentType}");
-
-                        // Define edit frame shape for selected child  with specific type per parent content type for given collection
-                        // ContentCard_Frame__[ParentContentType]__[CollectionType]__[ContentType]
-                        // e.g. ContentCard_Frame__Page__FlowPart__Container, ContentCard_Frame__LandingPage__BagPart__Service, ContentCard_Frame__Form__FlowPart__Label
-                        contentCardFrame.Metadata.Alternates.Add($"{ContentCardFrame}__{parentContentType}__{collectionType}__{contentType}");
-
-                        if (!string.IsNullOrWhiteSpace(namedPart) && !namedPart.Equals(collectionType, StringComparison.Ordinal))
+                        // Define edit card shape for all child  in collection per parent content type
+                        // ContentCard_Edit__[ParentContentType]__[CollectionType]
+                        // e.g. ContentCard_Edit__Page__FlowPart, ContentCard_Edit__Form__FlowPart, ContentCard_Edit__Services__BagPart
+                        contentCardEditor.Metadata.Alternates.Add($"{ContentCardEdit}__{parentContentType}__{collectionType}");
+
+                        // Define edit card shape for selected child  with specific type per parent content type
+                        // ContentCard_Edit__[ParentContentType]__[ContentType]
+                        // e.g. ContentCard_Edit__Page__Form, ContentCard_Edit__Form__Label, ContentCard_Edit__LandingPage__Service
+                        contentCardEditor.Metadata.Alternates.Add($"{ContentCardEdit}__{parentContentType}__{contentType}");
+
+                        // Define edit card shape for selected child  with specific type per parent content type for given collection
+                        // ContentCard_Edit__[ParentContentType]__[CollectionType]__[ContentType] e.g. ContentCard_Edit__LandingPage__FlowPart__Service,
+                        // ContentCard_Edit__LandingPage__BagPart__Service, ContentCard_Edit__Form__FlowPart__Label
+                        contentCardEditor.Metadata.Alternates.Add($"{ContentCardEdit}__{parentContentType}__{collectionType}__{contentType}");
+
+                        if (!string.IsNullOrWhiteSpace(namedPart) && !(namedPart.Equals(collectionType, StringComparison.Ordinal)))
                         {
-                            // Define frame card shape for child  with specific partname and parent content type
-                            // ContentCard_Frame__[ParentContentType]__[PartName]
-                            // e.g. ContentCard_Frame__Grid__LeftColumn, ContentCard_Frame__LandingPage__Services
-                            contentCardFrame.Metadata.Alternates.Add($"{ContentCardFrame}__{parentContentType}__{namedPart}");
-
-                            // Define edit card shape for selected child with specific type per parent content type
-                            // ContentCard_Frame__[ParentContentType]__[NamedPart]__[ContentType]
-                            // e.g. ContentCard_Frame__Grid__LeftColumn__Client, ContentCard_Frame__LandingPage__Clients__Client
-                            contentCardFrame.Metadata.Alternates.Add($"{ContentCardFrame}__{parentContentType}__{namedPart}__{contentType}");
+                            // Define edit card shape for selected child  with specific type and partname per parent content type
+                            // ContentCard_Edit__[ParentContentType]__[PartName]
+                            // e.g. ContentCard_Edit__Grid__LeftColumn, ContentCard_Edit__LandingPage__Services
+                            contentCardEditor.Metadata.Alternates.Add($"{ContentCardEdit}__{parentContentType}__{namedPart}");
+
+                            // Define edit card shape for selected child  with specific type and partname per parent content type
+                            // ContentCard_Edit__[ContentType]__[ContentType]
+                            // e.g. ContentCard_Edit__Grid__LeftColumn__Client, ContentCard_Edit__LandingPage__Services__Service
+                            contentCardEditor.Metadata.Alternates.Add($"{ContentCardEdit}__{parentContentType}__{namedPart}__{contentType}");
                         }
                     }
-                });
-
-            builder.Describe(ContentCardFieldsEdit)
-               .OnDisplaying(context =>
-               {
-                   var contentCardEditorFields = context.Shape;
-                   var collectionType = contentCardEditorFields.GetProperty<IShape>("CardShape").GetProperty<string>("CollectionShapeType");
-                   contentCardEditorFields.Metadata.Alternates.Add($"{collectionType}_Fields_Edit");
-               });
-
-            return ValueTask.CompletedTask;
-        }
+                }
+            });
+
+        builder.Describe(ContentCardFrame)
+            .OnDisplaying(context =>
+            {
+                // Alternates for Outer Frame of ContentCard
+                dynamic contentCardFrame = context.Shape;
+                string collectionType = contentCardFrame.ChildContent.CollectionShapeType;
+                var contentType = contentCardFrame.ChildContent.ContentTypeValue as string;
+                string parentContentType = contentCardFrame.ChildContent.ParentContentType;
+                string namedPart = contentCardFrame.ChildContent.CollectionPartName;
+
+                // Define Frame card shape per collection type
+                // ContentCard_Frame__[CollectionType]
+                // e.g. ContentCard_Frame__FlowPart, ContentCard_Frame__BagPart, ContentCard_Frame__WidgetsListPart
+                contentCardFrame.Metadata.Alternates.Add($"{ContentCardFrame}__{collectionType}");
+
+                // Define Frame card shape per content type
+                // ContentCard_Frame__[ContentType]
+                // e.g. ContentCard_Frame__Paragraph, ContentCard_Frame__Form, ContentCard_Frame__Input
+                contentCardFrame.Metadata.Alternates.Add($"{ContentCardFrame}__{contentType}");
+
+                // Define Frame card shape per content type per collection type
+                // ContentCard_Frame__[CollectionType]__[ContentType]
+                // e.g. ContentCard_Frame__FlowPart__Paragraph, ContentCard_Frame__BagPart__Form, ContentCard_Frame__FlowPart__Input
+                contentCardFrame.Metadata.Alternates.Add($"{ContentCardFrame}__{collectionType}__{contentType}");
+
+                if (!string.IsNullOrWhiteSpace(parentContentType))
+                {
+                    // Define frame card shape for children per parent content type for given collection
+                    // ContentCard_Frame__[ParentContentType]__[CollectionType]
+                    // e.g. ContentCard_Frame__Page__FlowPart, ContentCard_Frame__LandingPage__BagPart, ContentCard_Frame__Form__FlowPart
+                    contentCardFrame.Metadata.Alternates.Add($"{ContentCardFrame}__{parentContentType}__{collectionType}");
+
+                    // Define frame card shape for child with specific type per parent content type
+                    // ContentCard_Frame__[ParentContentType]__[ContentType]
+                    // e.g. ContentCard_Frame__Page__Form, ContentCard_Frame__Form__Label
+                    contentCardFrame.Metadata.Alternates.Add($"{ContentCardFrame}__{parentContentType}__{contentType}");
+
+                    // Define edit frame shape for selected child  with specific type per parent content type for given collection
+                    // ContentCard_Frame__[ParentContentType]__[CollectionType]__[ContentType]
+                    // e.g. ContentCard_Frame__Page__FlowPart__Container, ContentCard_Frame__LandingPage__BagPart__Service, ContentCard_Frame__Form__FlowPart__Label
+                    contentCardFrame.Metadata.Alternates.Add($"{ContentCardFrame}__{parentContentType}__{collectionType}__{contentType}");
+
+                    if (!string.IsNullOrWhiteSpace(namedPart) && !namedPart.Equals(collectionType, StringComparison.Ordinal))
+                    {
+                        // Define frame card shape for child  with specific partname and parent content type
+                        // ContentCard_Frame__[ParentContentType]__[PartName]
+                        // e.g. ContentCard_Frame__Grid__LeftColumn, ContentCard_Frame__LandingPage__Services
+                        contentCardFrame.Metadata.Alternates.Add($"{ContentCardFrame}__{parentContentType}__{namedPart}");
+
+                        // Define edit card shape for selected child with specific type per parent content type
+                        // ContentCard_Frame__[ParentContentType]__[NamedPart]__[ContentType]
+                        // e.g. ContentCard_Frame__Grid__LeftColumn__Client, ContentCard_Frame__LandingPage__Clients__Client
+                        contentCardFrame.Metadata.Alternates.Add($"{ContentCardFrame}__{parentContentType}__{namedPart}__{contentType}");
+                    }
+                }
+            });
+
+        builder.Describe(ContentCardFieldsEdit)
+           .OnDisplaying(context =>
+           {
+               var contentCardEditorFields = context.Shape;
+               var collectionType = contentCardEditorFields.GetProperty<IShape>("CardShape").GetProperty<string>("CollectionShapeType");
+               contentCardEditorFields.Metadata.Alternates.Add($"{collectionType}_Fields_Edit");
+           });
+
+        return ValueTask.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Widgets/Controllers/AdminController.cs
index aa616ab6d58..139f550a22d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/Controllers/AdminController.cs
@@ -8,80 +8,79 @@
 using OrchardCore.Widgets.Models;
 using OrchardCore.Widgets.ViewModels;
 
-namespace OrchardCore.Widgets.Controllers
+namespace OrchardCore.Widgets.Controllers;
+
+[Admin("Widgets/{action}/{id?}", "Widgets.{action}")]
+public class AdminController : Controller
 {
-    [Admin("Widgets/{action}/{id?}", "Widgets.{action}")]
-    public class AdminController : Controller
+    private readonly IContentManager _contentManager;
+    private readonly IContentItemDisplayManager _contentItemDisplayManager;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+
+    public AdminController(
+        IContentManager contentManager,
+        IContentItemDisplayManager contentItemDisplayManager,
+        IShapeFactory shapeFactory,
+        IUpdateModelAccessor updateModelAccessor)
     {
-        private readonly IContentManager _contentManager;
-        private readonly IContentItemDisplayManager _contentItemDisplayManager;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
+        _contentItemDisplayManager = contentItemDisplayManager;
+        _contentManager = contentManager;
+        _shapeFactory = shapeFactory;
+        _updateModelAccessor = updateModelAccessor;
+    }
 
-        public AdminController(
-            IContentManager contentManager,
-            IContentItemDisplayManager contentItemDisplayManager,
-            IShapeFactory shapeFactory,
-            IUpdateModelAccessor updateModelAccessor)
+    public async Task<IActionResult> BuildEditor(string id, string prefix, string prefixesName, string contentTypesName, string contentItemsName, string zonesName, string zone, string targetId, string parentContentType, string partName)
+    {
+        if (string.IsNullOrWhiteSpace(id))
         {
-            _contentItemDisplayManager = contentItemDisplayManager;
-            _contentManager = contentManager;
-            _shapeFactory = shapeFactory;
-            _updateModelAccessor = updateModelAccessor;
+            return NotFound();
         }
 
-        public async Task<IActionResult> BuildEditor(string id, string prefix, string prefixesName, string contentTypesName, string contentItemsName, string zonesName, string zone, string targetId, string parentContentType, string partName)
-        {
-            if (string.IsNullOrWhiteSpace(id))
-            {
-                return NotFound();
-            }
-
-            var contentItem = await _contentManager.NewAsync(id);
+        var contentItem = await _contentManager.NewAsync(id);
 
-            contentItem.Weld(new WidgetMetadata());
+        contentItem.Weld(new WidgetMetadata());
 
-            var cardCollectionType = nameof(WidgetsListPart);
+        var cardCollectionType = nameof(WidgetsListPart);
 
-            // Create a Card Shape
-            dynamic contentCard = await _shapeFactory.New.ContentCard(
-                // Updater is the controller for AJAX Requests
-                Updater: _updateModelAccessor.ModelUpdater,
-                // Shape Specific
-                CollectionShapeType: cardCollectionType,
-                ContentItem: contentItem,
-                BuildEditor: true,
-                ParentContentType: parentContentType,
-                CollectionPartName: partName,
-                // WidgetListPart Specific
-                ZoneValue: zone,
-                // Card Specific Properties
-                TargetId: targetId,
-                Inline: true,
-                CanMove: true,
-                CanDelete: true,
-                // Input hidden
-                // Prefixes
-                PrefixValue: prefix,
-                PrefixesId: prefixesName.Replace('.', '_'),
-                PrefixesName: prefixesName,
-                // ContentTypes
-                ContentTypesId: contentTypesName.Replace('.', '_'),
-                ContentTypesName: contentTypesName,
-                // ContentItems
-                ContentItemsId: contentItemsName.Replace('.', '_'),
-                ContentItemsName: contentItemsName,
-                // Zones
-                ZonesId: zonesName.Replace('.', '_'),
-                ZonesName: zonesName
-            );
+        // Create a Card Shape
+        dynamic contentCard = await _shapeFactory.New.ContentCard(
+            // Updater is the controller for AJAX Requests
+            Updater: _updateModelAccessor.ModelUpdater,
+            // Shape Specific
+            CollectionShapeType: cardCollectionType,
+            ContentItem: contentItem,
+            BuildEditor: true,
+            ParentContentType: parentContentType,
+            CollectionPartName: partName,
+            // WidgetListPart Specific
+            ZoneValue: zone,
+            // Card Specific Properties
+            TargetId: targetId,
+            Inline: true,
+            CanMove: true,
+            CanDelete: true,
+            // Input hidden
+            // Prefixes
+            PrefixValue: prefix,
+            PrefixesId: prefixesName.Replace('.', '_'),
+            PrefixesName: prefixesName,
+            // ContentTypes
+            ContentTypesId: contentTypesName.Replace('.', '_'),
+            ContentTypesName: contentTypesName,
+            // ContentItems
+            ContentItemsId: contentItemsName.Replace('.', '_'),
+            ContentItemsName: contentItemsName,
+            // Zones
+            ZonesId: zonesName.Replace('.', '_'),
+            ZonesName: zonesName
+        );
 
-            var model = new BuildEditorViewModel
-            {
-                EditorShape = contentCard
-            };
+        var model = new BuildEditorViewModel
+        {
+            EditorShape = contentCard
+        };
 
-            return View("Display", model);
-        }
+        return View("Display", model);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Drivers/WidgetsListPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Widgets/Drivers/WidgetsListPartDisplayDriver.cs
index 25c3f31cc3c..6afab82ce8e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/Drivers/WidgetsListPartDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/Drivers/WidgetsListPartDisplayDriver.cs
@@ -14,124 +14,123 @@
 using OrchardCore.Widgets.Settings;
 using OrchardCore.Widgets.ViewModels;
 
-namespace OrchardCore.Widgets.Drivers
+namespace OrchardCore.Widgets.Drivers;
+
+public sealed class WidgetsListPartDisplayDriver : ContentPartDisplayDriver<WidgetsListPart>
 {
-    public sealed class WidgetsListPartDisplayDriver : ContentPartDisplayDriver<WidgetsListPart>
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentManager _contentManager;
+    private readonly IServiceProvider _serviceProvider;
+
+    public WidgetsListPartDisplayDriver(
+        IContentManager contentManager,
+        IContentDefinitionManager contentDefinitionManager,
+        IServiceProvider serviceProvider
+        )
     {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IContentManager _contentManager;
-        private readonly IServiceProvider _serviceProvider;
-
-        public WidgetsListPartDisplayDriver(
-            IContentManager contentManager,
-            IContentDefinitionManager contentDefinitionManager,
-            IServiceProvider serviceProvider
-            )
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _contentManager = contentManager;
-            _serviceProvider = serviceProvider;
-        }
+        _contentDefinitionManager = contentDefinitionManager;
+        _contentManager = contentManager;
+        _serviceProvider = serviceProvider;
+    }
 
-        public override async Task<IDisplayResult> DisplayAsync(WidgetsListPart part, BuildPartDisplayContext context)
+    public override async Task<IDisplayResult> DisplayAsync(WidgetsListPart part, BuildPartDisplayContext context)
+    {
+        if (context.DisplayType != "Detail" || part.Widgets.Count == 0)
         {
-            if (context.DisplayType != "Detail" || part.Widgets.Count == 0)
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var layout = context.Layout;
-            var layoutZones = layout.Zones;
+        var layout = context.Layout;
+        var layoutZones = layout.Zones;
 
-            var contentItemDisplayManager = _serviceProvider.GetRequiredService<IContentItemDisplayManager>();
+        var contentItemDisplayManager = _serviceProvider.GetRequiredService<IContentItemDisplayManager>();
 
-            foreach (var zone in part.Widgets.Keys)
+        foreach (var zone in part.Widgets.Keys)
+        {
+            foreach (var widget in part.Widgets[zone])
             {
-                foreach (var widget in part.Widgets[zone])
-                {
-                    var layerMetadata = widget.As<WidgetMetadata>();
+                var layerMetadata = widget.As<WidgetMetadata>();
 
-                    if (layerMetadata != null)
-                    {
-                        var widgetContent = await contentItemDisplayManager.BuildDisplayAsync(widget, context.Updater);
+                if (layerMetadata != null)
+                {
+                    var widgetContent = await contentItemDisplayManager.BuildDisplayAsync(widget, context.Updater);
 
-                        widgetContent.Classes.Add("widget");
-                        widgetContent.Classes.Add("widget-" + widget.ContentItem.ContentType.HtmlClassify());
+                    widgetContent.Classes.Add("widget");
+                    widgetContent.Classes.Add("widget-" + widget.ContentItem.ContentType.HtmlClassify());
 
-                        var contentZone = layoutZones[zone];
-                        await contentZone.AddAsync(widgetContent, "");
-                    }
+                    var contentZone = layoutZones[zone];
+                    await contentZone.AddAsync(widgetContent, "");
                 }
             }
-
-            return null;
         }
 
-        public override IDisplayResult Edit(WidgetsListPart widgetPart, BuildPartEditorContext context)
+        return null;
+    }
+
+    public override IDisplayResult Edit(WidgetsListPart widgetPart, BuildPartEditorContext context)
+    {
+        return Initialize<WidgetsListPartEditViewModel>(GetEditorShapeType(context), async m =>
         {
-            return Initialize<WidgetsListPartEditViewModel>(GetEditorShapeType(context), async m =>
-            {
-                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(widgetPart.ContentItem.ContentType);
-                var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(p => p.PartDefinition.Name == nameof(WidgetsListPart));
-                var settings = contentTypePartDefinition.GetSettings<WidgetsListPartSettings>();
+            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(widgetPart.ContentItem.ContentType);
+            var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(p => p.PartDefinition.Name == nameof(WidgetsListPart));
+            var settings = contentTypePartDefinition.GetSettings<WidgetsListPartSettings>();
 
-                m.AvailableZones = settings.Zones;
+            m.AvailableZones = settings.Zones;
 
-                m.WidgetsListPart = widgetPart;
-                m.Updater = context.Updater;
-            });
-        }
+            m.WidgetsListPart = widgetPart;
+            m.Updater = context.Updater;
+        });
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(WidgetsListPart part, UpdatePartEditorContext context)
-        {
-            var contentItemDisplayManager = _serviceProvider.GetRequiredService<IContentItemDisplayManager>();
+    public override async Task<IDisplayResult> UpdateAsync(WidgetsListPart part, UpdatePartEditorContext context)
+    {
+        var contentItemDisplayManager = _serviceProvider.GetRequiredService<IContentItemDisplayManager>();
 
-            var model = new WidgetsListPartEditViewModel { WidgetsListPart = part };
+        var model = new WidgetsListPartEditViewModel { WidgetsListPart = part };
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix);
+        await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-            var zonedContentItems = new Dictionary<string, List<ContentItem>>();
+        var zonedContentItems = new Dictionary<string, List<ContentItem>>();
 
-            // Remove any content or the zones would be merged and not be cleared.
-            part.Content.Remove("Widgets");
+        // Remove any content or the zones would be merged and not be cleared.
+        part.Content.Remove("Widgets");
+
+        for (var i = 0; i < model.Prefixes.Length; i++)
+        {
+            var contentType = model.ContentTypes[i];
+            var zone = model.Zones[i];
+            var prefix = model.Prefixes[i];
 
-            for (var i = 0; i < model.Prefixes.Length; i++)
+            var contentItem = await _contentManager.NewAsync(contentType);
+            if (part.Widgets.TryGetValue(zone, out var widgets))
             {
-                var contentType = model.ContentTypes[i];
-                var zone = model.Zones[i];
-                var prefix = model.Prefixes[i];
+                var existingContentItem = widgets.FirstOrDefault(x => string.Equals(x.ContentItemId, model.ContentItems[i], StringComparison.OrdinalIgnoreCase));
 
-                var contentItem = await _contentManager.NewAsync(contentType);
-                if (part.Widgets.TryGetValue(zone, out var widgets))
+                // When the content item already exists merge its elements to reverse nested content item ids.
+                // All of the data for these merged items is then replaced by the model values on update, while a nested content item id is maintained.
+                // This prevents nested items which rely on the content item id, i.e. the media attached field, losing their reference point.
+                if (existingContentItem != null)
                 {
-                    var existingContentItem = widgets.FirstOrDefault(x => string.Equals(x.ContentItemId, model.ContentItems[i], StringComparison.OrdinalIgnoreCase));
-
-                    // When the content item already exists merge its elements to reverse nested content item ids.
-                    // All of the data for these merged items is then replaced by the model values on update, while a nested content item id is maintained.
-                    // This prevents nested items which rely on the content item id, i.e. the media attached field, losing their reference point.
-                    if (existingContentItem != null)
-                    {
-                        contentItem.ContentItemId = model.ContentItems[i];
-                        contentItem.Merge(existingContentItem);
-                    }
+                    contentItem.ContentItemId = model.ContentItems[i];
+                    contentItem.Merge(existingContentItem);
                 }
+            }
 
-                contentItem.Weld(new WidgetMetadata());
-
-                var widgetModel = await contentItemDisplayManager.UpdateEditorAsync(contentItem, context.Updater, context.IsNew, htmlFieldPrefix: prefix);
+            contentItem.Weld(new WidgetMetadata());
 
-                if (!zonedContentItems.TryGetValue(zone, out var value))
-                {
-                    value = [];
-                    zonedContentItems.Add(zone, value);
-                }
+            var widgetModel = await contentItemDisplayManager.UpdateEditorAsync(contentItem, context.Updater, context.IsNew, htmlFieldPrefix: prefix);
 
-                value.Add(contentItem);
+            if (!zonedContentItems.TryGetValue(zone, out var value))
+            {
+                value = [];
+                zonedContentItems.Add(zone, value);
             }
 
-            part.Widgets = zonedContentItems;
-
-            return Edit(part, context);
+            value.Add(contentItem);
         }
+
+        part.Widgets = zonedContentItems;
+
+        return Edit(part, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Widgets/Migrations.cs
index f44d16577a7..a302e1f6f95 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/Migrations.cs
@@ -3,25 +3,24 @@
 using OrchardCore.ContentManagement.Metadata.Settings;
 using OrchardCore.Data.Migration;
 
-namespace OrchardCore.Widgets
+namespace OrchardCore.Widgets;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        public Migrations(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public Migrations(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public async Task<int> CreateAsync()
-        {
-            await _contentDefinitionManager.AlterPartDefinitionAsync("WidgetsListPart", builder => builder
-                .Attachable()
-                .WithDescription("Provides a way to add widgets to Layout zones for your content item.")
-                );
+    public async Task<int> CreateAsync()
+    {
+        await _contentDefinitionManager.AlterPartDefinitionAsync("WidgetsListPart", builder => builder
+            .Attachable()
+            .WithDescription("Provides a way to add widgets to Layout zones for your content item.")
+            );
 
-            return 1;
-        }
+        return 1;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Models/WidgetMetadata.cs b/src/OrchardCore.Modules/OrchardCore.Widgets/Models/WidgetMetadata.cs
index 50c59c1ed1e..d00792d1bc9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/Models/WidgetMetadata.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/Models/WidgetMetadata.cs
@@ -1,10 +1,9 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Widgets.Models
+namespace OrchardCore.Widgets.Models;
+
+public class WidgetMetadata : ContentPart
 {
-    public class WidgetMetadata : ContentPart
-    {
-        public bool RenderTitle { get; set; }
-        public string Position { get; set; }
-    }
+    public bool RenderTitle { get; set; }
+    public string Position { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Models/WidgetsListPart.cs b/src/OrchardCore.Modules/OrchardCore.Widgets/Models/WidgetsListPart.cs
index b2dd7eae79c..9a746f39781 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/Models/WidgetsListPart.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/Models/WidgetsListPart.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Widgets.Models
+namespace OrchardCore.Widgets.Models;
+
+// A content item with this part can have widget instances.
+public class WidgetsListPart : ContentPart
 {
-    // A content item with this part can have widget instances.
-    public class WidgetsListPart : ContentPart
-    {
-        public Dictionary<string, List<ContentItem>> Widgets { get; set; } = [];
-    }
+    public Dictionary<string, List<ContentItem>> Widgets { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Settings/WidgetsListPartSettings.cs b/src/OrchardCore.Modules/OrchardCore.Widgets/Settings/WidgetsListPartSettings.cs
index deb0f9d427b..c4fcd339b30 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/Settings/WidgetsListPartSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/Settings/WidgetsListPartSettings.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Widgets.Settings
+namespace OrchardCore.Widgets.Settings;
+
+public class WidgetsListPartSettings
 {
-    public class WidgetsListPartSettings
-    {
-        public string[] Zones { get; set; } = [];
-    }
+    public string[] Zones { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Settings/WidgetsListPartSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Widgets/Settings/WidgetsListPartSettingsDisplayDriver.cs
index 55241e0dd51..0001f3f4e8c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/Settings/WidgetsListPartSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/Settings/WidgetsListPartSettingsDisplayDriver.cs
@@ -6,32 +6,31 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Widgets.Models;
 
-namespace OrchardCore.Widgets.Settings
+namespace OrchardCore.Widgets.Settings;
+
+public sealed class WidgetsListPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<WidgetsListPart>
 {
-    public sealed class WidgetsListPartSettingsDisplayDriver : ContentTypePartDefinitionDisplayDriver<WidgetsListPart>
-    {
-        private static readonly char[] _separator = [',', ' '];
+    private static readonly char[] _separator = [',', ' '];
 
-        public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    public override IDisplayResult Edit(ContentTypePartDefinition contentTypePartDefinition, BuildEditorContext context)
+    {
+        return Initialize<WidgetsListPartSettingsViewModel>("WidgetsPartSettings_Edit", model =>
         {
-            return Initialize<WidgetsListPartSettingsViewModel>("WidgetsPartSettings_Edit", model =>
-            {
-                var settings = contentTypePartDefinition.GetSettings<WidgetsListPartSettings>();
+            var settings = contentTypePartDefinition.GetSettings<WidgetsListPartSettings>();
 
-                model.Zones = string.Join(", ", settings.Zones);
-                model.WidgetsListPartSettings = settings;
-            }).Location("Content");
-        }
+            model.Zones = string.Join(", ", settings.Zones);
+            model.WidgetsListPartSettings = settings;
+        }).Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
-        {
-            var model = new WidgetsListPartSettingsViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(ContentTypePartDefinition contentTypePartDefinition, UpdateTypePartEditorContext context)
+    {
+        var model = new WidgetsListPartSettingsViewModel();
 
-            await context.Updater.TryUpdateModelAsync(model, Prefix, m => m.Zones);
+        await context.Updater.TryUpdateModelAsync(model, Prefix, m => m.Zones);
 
-            context.Builder.WithSettings(new WidgetsListPartSettings { Zones = (model.Zones ?? string.Empty).Split(_separator, StringSplitOptions.RemoveEmptyEntries) });
+        context.Builder.WithSettings(new WidgetsListPartSettings { Zones = (model.Zones ?? string.Empty).Split(_separator, StringSplitOptions.RemoveEmptyEntries) });
 
-            return Edit(contentTypePartDefinition, context);
-        }
+        return Edit(contentTypePartDefinition, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Settings/WidgetsListPartSettingsViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Widgets/Settings/WidgetsListPartSettingsViewModel.cs
index 3962d5203d1..b2fad008e4d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/Settings/WidgetsListPartSettingsViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/Settings/WidgetsListPartSettingsViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Widgets.Settings
+namespace OrchardCore.Widgets.Settings;
+
+public class WidgetsListPartSettingsViewModel
 {
-    public class WidgetsListPartSettingsViewModel
-    {
-        public string Zones { get; set; }
-        public WidgetsListPartSettings WidgetsListPartSettings { get; set; }
-    }
+    public string Zones { get; set; }
+    public WidgetsListPartSettings WidgetsListPartSettings { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Widgets/Startup.cs
index f5ff5890c9b..4371b25fe66 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/Startup.cs
@@ -12,24 +12,23 @@
 using OrchardCore.Widgets.Services;
 using OrchardCore.Widgets.Settings;
 
-namespace OrchardCore.Widgets
+namespace OrchardCore.Widgets;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            // Add Widget Card Shapes
-            services.AddScoped<IShapeTableProvider, ContentCardShapes>();
-            // Widgets List Part
-            services.AddContentPart<WidgetsListPart>()
-                .UseDisplayDriver<WidgetsListPartDisplayDriver>();
+        // Add Widget Card Shapes
+        services.AddScoped<IShapeTableProvider, ContentCardShapes>();
+        // Widgets List Part
+        services.AddContentPart<WidgetsListPart>()
+            .UseDisplayDriver<WidgetsListPartDisplayDriver>();
 
-            services.AddScoped<IStereotypesProvider, WidgetStereotypesProvider>();
+        services.AddScoped<IStereotypesProvider, WidgetStereotypesProvider>();
 
-            services.AddScoped<IContentTypePartDefinitionDisplayDriver, WidgetsListPartSettingsDisplayDriver>();
-            services.AddContentPart<WidgetMetadata>();
-            services.AddDataMigration<Migrations>();
-            services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
-        }
+        services.AddScoped<IContentTypePartDefinitionDisplayDriver, WidgetsListPartSettingsDisplayDriver>();
+        services.AddContentPart<WidgetMetadata>();
+        services.AddDataMigration<Migrations>();
+        services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/ViewModels/BuildEditorViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Widgets/ViewModels/BuildEditorViewModel.cs
index 991bd10f037..65b858a9fe7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/ViewModels/BuildEditorViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/ViewModels/BuildEditorViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Widgets.ViewModels
+namespace OrchardCore.Widgets.ViewModels;
+
+public class BuildEditorViewModel
 {
-    public class BuildEditorViewModel
-    {
-        public dynamic EditorShape { get; set; }
-    }
+    public dynamic EditorShape { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/ViewModels/WidgetsListPartEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Widgets/ViewModels/WidgetsListPartEditViewModel.cs
index 872c18f8a61..ea665f9e7fe 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/ViewModels/WidgetsListPartEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/ViewModels/WidgetsListPartEditViewModel.cs
@@ -3,21 +3,20 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.Widgets.Models;
 
-namespace OrchardCore.Widgets.ViewModels
+namespace OrchardCore.Widgets.ViewModels;
+
+public class WidgetsListPartEditViewModel
 {
-    public class WidgetsListPartEditViewModel
-    {
-        public string[] AvailableZones { get; set; } = [];
+    public string[] AvailableZones { get; set; } = [];
 
-        public string[] Zones { get; set; } = [];
-        public string[] Prefixes { get; set; } = [];
-        public string[] ContentTypes { get; set; } = [];
-        public string[] ContentItems { get; set; } = [];
+    public string[] Zones { get; set; } = [];
+    public string[] Prefixes { get; set; } = [];
+    public string[] ContentTypes { get; set; } = [];
+    public string[] ContentItems { get; set; } = [];
 
-        public WidgetsListPart WidgetsListPart { get; set; }
+    public WidgetsListPart WidgetsListPart { get; set; }
 
-        [IgnoreDataMember]
-        [BindNever]
-        public IUpdateModel Updater { get; set; }
-    }
+    [IgnoreDataMember]
+    [BindNever]
+    public IUpdateModel Updater { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/CommitTransactionTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/CommitTransactionTask.cs
index 3630c278dc2..1b00b151021 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/CommitTransactionTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/CommitTransactionTask.cs
@@ -6,42 +6,41 @@
 using OrchardCore.Workflows.Models;
 using YesSql;
 
-namespace OrchardCore.Workflows.Activities
+namespace OrchardCore.Workflows.Activities;
+
+public class CommitTransactionTask : TaskActivity<CommitTransactionTask>
 {
-    public class CommitTransactionTask : TaskActivity<CommitTransactionTask>
+    private readonly ISession _session;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    protected readonly IStringLocalizer S;
+
+    public CommitTransactionTask(
+        ISession session,
+        IUpdateModelAccessor updateModelAccessor,
+        IStringLocalizer<CommitTransactionTask> localizer)
     {
-        private readonly ISession _session;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        protected readonly IStringLocalizer S;
-
-        public CommitTransactionTask(
-            ISession session,
-            IUpdateModelAccessor updateModelAccessor,
-            IStringLocalizer<CommitTransactionTask> localizer)
-        {
-            _session = session;
-            _updateModelAccessor = updateModelAccessor;
-            S = localizer;
-        }
+        _session = session;
+        _updateModelAccessor = updateModelAccessor;
+        S = localizer;
+    }
 
-        public override LocalizedString DisplayText => S["Commit Transaction Task"];
+    public override LocalizedString DisplayText => S["Commit Transaction Task"];
 
-        public override LocalizedString Category => S["Session"];
+    public override LocalizedString Category => S["Session"];
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
-        }
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"], S["Valid"], S["Invalid"]);
+    }
 
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        if (!_updateModelAccessor.ModelUpdater.ModelState.IsValid)
         {
-            if (!_updateModelAccessor.ModelUpdater.ModelState.IsValid)
-            {
-                return Outcomes("Done", "Invalid");
-            }
-
-            await _session.SaveChangesAsync();
-            return Outcomes("Done", "Valid");
+            return Outcomes("Done", "Invalid");
         }
+
+        await _session.SaveChangesAsync();
+        return Outcomes("Done", "Valid");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/CorrelateTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/CorrelateTask.cs
index ee441e8d6e7..7a91087c5ae 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/CorrelateTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/CorrelateTask.cs
@@ -6,57 +6,57 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Activities
+namespace OrchardCore.Workflows.Activities;
+
+public class CorrelateTask : TaskActivity<CorrelateTask>
 {
-    public class CorrelateTask : TaskActivity<CorrelateTask>
-    {
-        private readonly IWorkflowScriptEvaluator _scriptEvaluator;
-        private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
+    private readonly IWorkflowScriptEvaluator _scriptEvaluator;
+    private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
 
-        protected readonly IStringLocalizer S;
+    protected readonly IStringLocalizer S;
 
-        public CorrelateTask(
-            IWorkflowScriptEvaluator scriptEvaluator,
-            IWorkflowExpressionEvaluator expressionEvaluator,
-            IStringLocalizer<CorrelateTask> stringLocalizer)
-        {
-            _scriptEvaluator = scriptEvaluator;
-            _expressionEvaluator = expressionEvaluator;
-            S = stringLocalizer;
-        }
+    public CorrelateTask(
+        IWorkflowScriptEvaluator scriptEvaluator,
+        IWorkflowExpressionEvaluator expressionEvaluator,
+        IStringLocalizer<CorrelateTask> stringLocalizer)
+    {
+        _scriptEvaluator = scriptEvaluator;
+        _expressionEvaluator = expressionEvaluator;
+        S = stringLocalizer;
+    }
 
-        public override LocalizedString DisplayText => S["Correlate Task"];
+    public override LocalizedString DisplayText => S["Correlate Task"];
 
-        public override LocalizedString Category => S["Primitives"];
+    public override LocalizedString Category => S["Primitives"];
 
-        public WorkflowExpression<string> Value
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
+    public WorkflowExpression<string> Value
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        public WorkflowScriptSyntax Syntax
-        {
-            get => GetProperty(() => WorkflowScriptSyntax.JavaScript);
-            set => SetProperty(value);
-        }
+    public WorkflowScriptSyntax Syntax
+    {
+        get => GetProperty(() => WorkflowScriptSyntax.JavaScript);
+        set => SetProperty(value);
+    }
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"]);
-        }
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"]);
+    }
 
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var value = Syntax switch
         {
-            var value = Syntax switch {
-                WorkflowScriptSyntax.Liquid => await _expressionEvaluator.EvaluateAsync(Value, workflowContext, null),
-                WorkflowScriptSyntax.JavaScript => await _scriptEvaluator.EvaluateAsync(Value, workflowContext, null),
-                _ => throw new NotSupportedException($"The syntax {Syntax} isn't supported for CorrelateTask.")
-            };
+            WorkflowScriptSyntax.Liquid => await _expressionEvaluator.EvaluateAsync(Value, workflowContext, null),
+            WorkflowScriptSyntax.JavaScript => await _scriptEvaluator.EvaluateAsync(Value, workflowContext, null),
+            _ => throw new NotSupportedException($"The syntax {Syntax} isn't supported for CorrelateTask.")
+        };
 
-            workflowContext.CorrelationId = value?.Trim();
+        workflowContext.CorrelationId = value?.Trim();
 
-            return Outcomes("Done");
-        }
+        return Outcomes("Done");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForEachTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForEachTask.cs
index db4b9466ea7..c0a4d2c3e5f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForEachTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForEachTask.cs
@@ -6,84 +6,83 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Activities
+namespace OrchardCore.Workflows.Activities;
+
+public class ForEachTask : TaskActivity<ForEachTask>
 {
-    public class ForEachTask : TaskActivity<ForEachTask>
+    private readonly IWorkflowScriptEvaluator _scriptEvaluator;
+    protected readonly IStringLocalizer S;
+
+    public ForEachTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<ForEachTask> localizer)
     {
-        private readonly IWorkflowScriptEvaluator _scriptEvaluator;
-        protected readonly IStringLocalizer S;
+        _scriptEvaluator = scriptEvaluator;
+        S = localizer;
+    }
 
-        public ForEachTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<ForEachTask> localizer)
-        {
-            _scriptEvaluator = scriptEvaluator;
-            S = localizer;
-        }
+    public override LocalizedString DisplayText => S["For Each Task"];
 
-        public override LocalizedString DisplayText => S["For Each Task"];
+    public override LocalizedString Category => S["Control Flow"];
 
-        public override LocalizedString Category => S["Control Flow"];
+    /// <summary>
+    /// An expression evaluating to an enumerable object to iterate over.
+    /// </summary>
+    public WorkflowExpression<IEnumerable<object>> Enumerable
+    {
+        get => GetProperty(() => new WorkflowExpression<IEnumerable<object>>());
+        set => SetProperty(value);
+    }
 
-        /// <summary>
-        /// An expression evaluating to an enumerable object to iterate over.
-        /// </summary>
-        public WorkflowExpression<IEnumerable<object>> Enumerable
-        {
-            get => GetProperty(() => new WorkflowExpression<IEnumerable<object>>());
-            set => SetProperty(value);
-        }
+    /// <summary>
+    /// The current iteration value.
+    /// </summary>
+    public string LoopVariableName
+    {
+        get => GetProperty(() => "x");
+        set => SetProperty(value);
+    }
 
-        /// <summary>
-        /// The current iteration value.
-        /// </summary>
-        public string LoopVariableName
-        {
-            get => GetProperty(() => "x");
-            set => SetProperty(value);
-        }
+    /// <summary>
+    /// The current iteration value.
+    /// </summary>
+    public object Current
+    {
+        get => GetProperty<object>();
+        set => SetProperty(value);
+    }
 
-        /// <summary>
-        /// The current iteration value.
-        /// </summary>
-        public object Current
-        {
-            get => GetProperty<object>();
-            set => SetProperty(value);
-        }
+    /// <summary>
+    /// The current number of iterations executed.
+    /// </summary>
+    public int Index
+    {
+        get => GetProperty(() => 0);
+        set => SetProperty(value);
+    }
 
-        /// <summary>
-        /// The current number of iterations executed.
-        /// </summary>
-        public int Index
-        {
-            get => GetProperty(() => 0);
-            set => SetProperty(value);
-        }
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Iterate"], S["Done"]);
+    }
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Iterate"], S["Done"]);
-        }
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var items = (await _scriptEvaluator.EvaluateAsync(Enumerable, workflowContext)).ToList();
+        var count = items.Count;
 
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        if (Index < count)
         {
-            var items = (await _scriptEvaluator.EvaluateAsync(Enumerable, workflowContext)).ToList();
-            var count = items.Count;
+            var current = Current = items[Index];
 
-            if (Index < count)
-            {
-                var current = Current = items[Index];
-
-                // TODO: Implement nested scopes. See https://github.com/OrchardCMS/OrchardCore/projects/4#card-6992776
-                workflowContext.Properties[LoopVariableName] = current;
-                workflowContext.LastResult = current;
-                Index++;
-                return Outcomes("Iterate");
-            }
-            else
-            {
-                Index = 0;
-                return Outcomes("Done");
-            }
+            // TODO: Implement nested scopes. See https://github.com/OrchardCMS/OrchardCore/projects/4#card-6992776
+            workflowContext.Properties[LoopVariableName] = current;
+            workflowContext.LastResult = current;
+            Index++;
+            return Outcomes("Iterate");
+        }
+        else
+        {
+            Index = 0;
+            return Outcomes("Done");
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForLoopTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForLoopTask.cs
index fe4bb7d5e24..7867f2fd2b8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForLoopTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForLoopTask.cs
@@ -5,107 +5,106 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Activities
+namespace OrchardCore.Workflows.Activities;
+
+public class ForLoopTask : TaskActivity<ForLoopTask>
 {
-    public class ForLoopTask : TaskActivity<ForLoopTask>
+    private readonly IWorkflowScriptEvaluator _scriptEvaluator;
+    protected readonly IStringLocalizer S;
+
+    public ForLoopTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<ForLoopTask> localizer)
     {
-        private readonly IWorkflowScriptEvaluator _scriptEvaluator;
-        protected readonly IStringLocalizer S;
+        _scriptEvaluator = scriptEvaluator;
+        S = localizer;
+    }
 
-        public ForLoopTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<ForLoopTask> localizer)
-        {
-            _scriptEvaluator = scriptEvaluator;
-            S = localizer;
-        }
+    public override LocalizedString DisplayText => S["For Loop Task"];
 
-        public override LocalizedString DisplayText => S["For Loop Task"];
+    public override LocalizedString Category => S["Control Flow"];
 
-        public override LocalizedString Category => S["Control Flow"];
+    /// <summary>
+    /// An expression evaluating to the start value.
+    /// </summary>
+    public WorkflowExpression<double> From
+    {
+        get => GetProperty(() => new WorkflowExpression<double>("0"));
+        set => SetProperty(value);
+    }
 
-        /// <summary>
-        /// An expression evaluating to the start value.
-        /// </summary>
-        public WorkflowExpression<double> From
-        {
-            get => GetProperty(() => new WorkflowExpression<double>("0"));
-            set => SetProperty(value);
-        }
+    /// <summary>
+    /// An expression evaluating to the end value.
+    /// </summary>
+    public WorkflowExpression<double> To
+    {
+        get => GetProperty(() => new WorkflowExpression<double>("10"));
+        set => SetProperty(value);
+    }
 
-        /// <summary>
-        /// An expression evaluating to the end value.
-        /// </summary>
-        public WorkflowExpression<double> To
+    /// <summary>
+    /// An expression evaluating to the end value.
+    /// </summary>
+    public WorkflowExpression<double> Step
+    {
+        get => GetProperty(() => new WorkflowExpression<double>("1"));
+        set => SetProperty(value);
+    }
+
+    /// <summary>
+    /// The property name to store the current iteration number in.
+    /// </summary>
+    public string LoopVariableName
+    {
+        get => GetProperty(() => "x");
+        set => SetProperty(value);
+    }
+
+    /// <summary>
+    /// The current index of the iteration.
+    /// </summary>
+    public double Index
+    {
+        get => GetProperty(() => 0);
+        set => SetProperty(value);
+    }
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Iterate"], S["Done"]);
+    }
+
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        if (!double.TryParse(From.Expression, out var from))
         {
-            get => GetProperty(() => new WorkflowExpression<double>("10"));
-            set => SetProperty(value);
+            from = await _scriptEvaluator.EvaluateAsync(From, workflowContext);
         }
 
-        /// <summary>
-        /// An expression evaluating to the end value.
-        /// </summary>
-        public WorkflowExpression<double> Step
+        if (!double.TryParse(To.Expression, out var to))
         {
-            get => GetProperty(() => new WorkflowExpression<double>("1"));
-            set => SetProperty(value);
+            to = await _scriptEvaluator.EvaluateAsync(To, workflowContext);
         }
 
-        /// <summary>
-        /// The property name to store the current iteration number in.
-        /// </summary>
-        public string LoopVariableName
+        if (!double.TryParse(Step.Expression, out var step))
         {
-            get => GetProperty(() => "x");
-            set => SetProperty(value);
+            step = await _scriptEvaluator.EvaluateAsync(Step, workflowContext);
         }
 
-        /// <summary>
-        /// The current index of the iteration.
-        /// </summary>
-        public double Index
+        if (Index < from)
         {
-            get => GetProperty(() => 0);
-            set => SetProperty(value);
+            Index = from;
         }
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        if (Index < to)
         {
-            return Outcomes(S["Iterate"], S["Done"]);
+            workflowContext.LastResult = Index;
+            workflowContext.Properties[LoopVariableName] = Index;
+            Index += step;
+            return Outcomes("Iterate");
         }
-
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        else
         {
-            if (!double.TryParse(From.Expression, out var from))
-            {
-                from = await _scriptEvaluator.EvaluateAsync(From, workflowContext);
-            }
-
-            if (!double.TryParse(To.Expression, out var to))
-            {
-                to = await _scriptEvaluator.EvaluateAsync(To, workflowContext);
-            }
-
-            if (!double.TryParse(Step.Expression, out var step))
-            {
-                step = await _scriptEvaluator.EvaluateAsync(Step, workflowContext);
-            }
-
-            if (Index < from)
-            {
-                Index = from;
-            }
-
-            if (Index < to)
-            {
-                workflowContext.LastResult = Index;
-                workflowContext.Properties[LoopVariableName] = Index;
-                Index += step;
-                return Outcomes("Iterate");
-            }
-            else
-            {
-                Index = from;
-                return Outcomes("Done");
-            }
+            Index = from;
+            return Outcomes("Done");
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForkTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForkTask.cs
index 9d0e7fafc27..e396d916c98 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForkTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ForkTask.cs
@@ -4,35 +4,34 @@
 using OrchardCore.Workflows.Abstractions.Models;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Activities
+namespace OrchardCore.Workflows.Activities;
+
+public class ForkTask : TaskActivity<ForkTask>
 {
-    public class ForkTask : TaskActivity<ForkTask>
-    {
-        protected readonly IStringLocalizer S;
+    protected readonly IStringLocalizer S;
 
-        public ForkTask(IStringLocalizer<ForkTask> localizer)
-        {
-            S = localizer;
-        }
+    public ForkTask(IStringLocalizer<ForkTask> localizer)
+    {
+        S = localizer;
+    }
 
-        public override LocalizedString DisplayText => S["Fork Task"];
+    public override LocalizedString DisplayText => S["Fork Task"];
 
-        public override LocalizedString Category => S["Control Flow"];
+    public override LocalizedString Category => S["Control Flow"];
 
-        public IList<string> Forks
-        {
-            get => GetProperty(() => new List<string>());
-            set => SetProperty(value);
-        }
+    public IList<string> Forks
+    {
+        get => GetProperty(() => new List<string>());
+        set => SetProperty(value);
+    }
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Forks.Select(x => Outcome(S[x]));
-        }
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Forks.Select(x => Outcome(S[x]));
+    }
 
-        public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(Forks);
-        }
+    public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(Forks);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/IfElseTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/IfElseTask.cs
index 3753b773879..fb81f17ea92 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/IfElseTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/IfElseTask.cs
@@ -5,41 +5,40 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Activities
+namespace OrchardCore.Workflows.Activities;
+
+public class IfElseTask : TaskActivity<IfElseTask>
 {
-    public class IfElseTask : TaskActivity<IfElseTask>
+    private readonly IWorkflowScriptEvaluator _scriptEvaluator;
+    protected readonly IStringLocalizer S;
+
+    public IfElseTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<IfElseTask> localizer)
+    {
+        _scriptEvaluator = scriptEvaluator;
+        S = localizer;
+    }
+
+    public override LocalizedString DisplayText => S["If Else Task"];
+
+    public override LocalizedString Category => S["Control Flow"];
+
+    /// <summary>
+    /// A script evaluating to either true or false.
+    /// </summary>
+    public WorkflowExpression<bool> Condition
+    {
+        get => GetProperty(() => new WorkflowExpression<bool>());
+        set => SetProperty(value);
+    }
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["True"], S["False"]);
+    }
+
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
     {
-        private readonly IWorkflowScriptEvaluator _scriptEvaluator;
-        protected readonly IStringLocalizer S;
-
-        public IfElseTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<IfElseTask> localizer)
-        {
-            _scriptEvaluator = scriptEvaluator;
-            S = localizer;
-        }
-
-        public override LocalizedString DisplayText => S["If Else Task"];
-
-        public override LocalizedString Category => S["Control Flow"];
-
-        /// <summary>
-        /// A script evaluating to either true or false.
-        /// </summary>
-        public WorkflowExpression<bool> Condition
-        {
-            get => GetProperty(() => new WorkflowExpression<bool>());
-            set => SetProperty(value);
-        }
-
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["True"], S["False"]);
-        }
-
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var result = await _scriptEvaluator.EvaluateAsync(Condition, workflowContext);
-            return Outcomes(result ? "True" : "False");
-        }
+        var result = await _scriptEvaluator.EvaluateAsync(Condition, workflowContext);
+        return Outcomes(result ? "True" : "False");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/JoinTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/JoinTask.cs
index 9c4d6be0f98..e457ecef0e4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/JoinTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/JoinTask.cs
@@ -5,109 +5,108 @@
 using OrchardCore.Workflows.Abstractions.Models;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Activities
+namespace OrchardCore.Workflows.Activities;
+
+public class JoinTask : TaskActivity<JoinTask>
 {
-    public class JoinTask : TaskActivity<JoinTask>
+    protected readonly IStringLocalizer S;
+
+    public enum JoinMode
     {
-        protected readonly IStringLocalizer S;
+        WaitAll,
+        WaitAny
+    }
 
-        public enum JoinMode
-        {
-            WaitAll,
-            WaitAny
-        }
+    public JoinTask(IStringLocalizer<JoinTask> localizer)
+    {
+        S = localizer;
+    }
 
-        public JoinTask(IStringLocalizer<JoinTask> localizer)
-        {
-            S = localizer;
-        }
+    public override LocalizedString DisplayText => S["Join Task"];
 
-        public override LocalizedString DisplayText => S["Join Task"];
+    public override LocalizedString Category => S["Control Flow"];
 
-        public override LocalizedString Category => S["Control Flow"];
+    public JoinMode Mode
+    {
+        get => GetProperty(() => JoinMode.WaitAll);
+        set => SetProperty(value);
+    }
 
-        public JoinMode Mode
-        {
-            get => GetProperty(() => JoinMode.WaitAll);
-            set => SetProperty(value);
-        }
+    private IList<string> Branches
+    {
+        get => GetProperty(() => new List<string>());
+        set => SetProperty(value);
+    }
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Joined"]);
+    }
+
+    public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var branches = Branches;
+        var inboundTransitions = workflowContext.GetInboundTransitions(activityContext.ActivityRecord.ActivityId);
+        var done = false;
 
-        private IList<string> Branches
+        switch (Mode)
         {
-            get => GetProperty(() => new List<string>());
-            set => SetProperty(value);
+            case JoinMode.WaitAll:
+                done = inboundTransitions.All(x => branches.Contains(GetTransitionKey(x)));
+                break;
+            case JoinMode.WaitAny:
+                done = inboundTransitions.Any(x => branches.Contains(GetTransitionKey(x)));
+
+                if (done)
+                {
+                    // Remove any inbound blocking activities.
+                    var ancestorActivityIds = workflowContext.GetInboundActivityPath(activityContext.ActivityRecord.ActivityId).ToList();
+                    var blockingActivities = workflowContext.Workflow.BlockingActivities.Where(x => ancestorActivityIds.Contains(x.ActivityId)).ToList();
+
+                    foreach (var blockingActivity in blockingActivities)
+                    {
+                        workflowContext.Workflow.BlockingActivities.Remove(blockingActivity);
+                    }
+                }
+                break;
         }
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        if (done)
         {
-            return Outcomes(S["Joined"]);
+            return Outcomes("Joined");
         }
 
-        public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var branches = Branches;
-            var inboundTransitions = workflowContext.GetInboundTransitions(activityContext.ActivityRecord.ActivityId);
-            var done = false;
-
-            switch (Mode)
-            {
-                case JoinMode.WaitAll:
-                    done = inboundTransitions.All(x => branches.Contains(GetTransitionKey(x)));
-                    break;
-                case JoinMode.WaitAny:
-                    done = inboundTransitions.Any(x => branches.Contains(GetTransitionKey(x)));
-
-                    if (done)
-                    {
-                        // Remove any inbound blocking activities.
-                        var ancestorActivityIds = workflowContext.GetInboundActivityPath(activityContext.ActivityRecord.ActivityId).ToList();
-                        var blockingActivities = workflowContext.Workflow.BlockingActivities.Where(x => ancestorActivityIds.Contains(x.ActivityId)).ToList();
-
-                        foreach (var blockingActivity in blockingActivities)
-                        {
-                            workflowContext.Workflow.BlockingActivities.Remove(blockingActivity);
-                        }
-                    }
-                    break;
-            }
+        return Noop();
+    }
+    public override Task OnActivityExecutedAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        // Get outbound transitions of the executing activity.
+        var outboundTransitions = workflowContext.GetOutboundTransitions(activityContext.ActivityRecord.ActivityId);
 
-            if (done)
-            {
-                return Outcomes("Joined");
-            }
+        // Get any transition that is pointing to this activity.
+        var inboundTransitionsQuery =
+            from transition in outboundTransitions
+            let destinationActivity = workflowContext.GetActivity(transition.DestinationActivityId)
+            where destinationActivity.Activity.Name == Name
+            select transition;
 
-            return Noop();
-        }
-        public override Task OnActivityExecutedAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        var inboundTransitions = inboundTransitionsQuery.ToList();
+
+        foreach (var inboundTransition in inboundTransitions)
         {
-            // Get outbound transitions of the executing activity.
-            var outboundTransitions = workflowContext.GetOutboundTransitions(activityContext.ActivityRecord.ActivityId);
-
-            // Get any transition that is pointing to this activity.
-            var inboundTransitionsQuery =
-                from transition in outboundTransitions
-                let destinationActivity = workflowContext.GetActivity(transition.DestinationActivityId)
-                where destinationActivity.Activity.Name == Name
-                select transition;
-
-            var inboundTransitions = inboundTransitionsQuery.ToList();
-
-            foreach (var inboundTransition in inboundTransitions)
-            {
-                var mergeActivity = (JoinTask)workflowContext.GetActivity(inboundTransition.DestinationActivityId).Activity;
-                var branches = mergeActivity.Branches;
-                mergeActivity.Branches = branches.Union(new[] { GetTransitionKey(inboundTransition) }).Distinct().ToList();
-            }
-
-            return Task.CompletedTask;
+            var mergeActivity = (JoinTask)workflowContext.GetActivity(inboundTransition.DestinationActivityId).Activity;
+            var branches = mergeActivity.Branches;
+            mergeActivity.Branches = branches.Union(new[] { GetTransitionKey(inboundTransition) }).Distinct().ToList();
         }
 
-        private static string GetTransitionKey(Transition transition)
-        {
-            var sourceActivityId = transition.SourceActivityId;
-            var sourceOutcomeName = transition.SourceOutcomeName;
+        return Task.CompletedTask;
+    }
 
-            return $"@{sourceActivityId}_{sourceOutcomeName}";
-        }
+    private static string GetTransitionKey(Transition transition)
+    {
+        var sourceActivityId = transition.SourceActivityId;
+        var sourceOutcomeName = transition.SourceOutcomeName;
+
+        return $"@{sourceActivityId}_{sourceOutcomeName}";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/LogTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/LogTask.cs
index e81041f9fbd..2cadd596178 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/LogTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/LogTask.cs
@@ -6,49 +6,48 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Activities
+namespace OrchardCore.Workflows.Activities;
+
+public class LogTask : TaskActivity<LogTask>
 {
-    public class LogTask : TaskActivity<LogTask>
+    private readonly ILogger _logger;
+    private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
+    protected readonly IStringLocalizer S;
+
+    public LogTask(ILogger<LogTask> logger, IWorkflowExpressionEvaluator expressionEvaluator, IStringLocalizer<LogTask> localizer)
     {
-        private readonly ILogger _logger;
-        private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
-        protected readonly IStringLocalizer S;
-
-        public LogTask(ILogger<LogTask> logger, IWorkflowExpressionEvaluator expressionEvaluator, IStringLocalizer<LogTask> localizer)
-        {
-            _logger = logger;
-            _expressionEvaluator = expressionEvaluator;
-            S = localizer;
-        }
-
-        public override LocalizedString DisplayText => S["Log Task"];
-
-        public override LocalizedString Category => S["Primitives"];
-
-        public LogLevel LogLevel
-        {
-            get => GetProperty(() => LogLevel.Information);
-            set => SetProperty(value);
-        }
-
-        public WorkflowExpression<string> Text
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
-
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"]);
-        }
-
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var text = await _expressionEvaluator.EvaluateAsync(Text, workflowContext, null);
-            var logLevel = LogLevel;
-
-            _logger.Log(logLevel, 0, text, null, (state, error) => state.ToString());
-            return Outcomes("Done");
-        }
+        _logger = logger;
+        _expressionEvaluator = expressionEvaluator;
+        S = localizer;
+    }
+
+    public override LocalizedString DisplayText => S["Log Task"];
+
+    public override LocalizedString Category => S["Primitives"];
+
+    public LogLevel LogLevel
+    {
+        get => GetProperty(() => LogLevel.Information);
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<string> Text
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"]);
+    }
+
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var text = await _expressionEvaluator.EvaluateAsync(Text, workflowContext, null);
+        var logLevel = LogLevel;
+
+        _logger.Log(logLevel, 0, text, null, (state, error) => state.ToString());
+        return Outcomes("Done");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/MissingActivity.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/MissingActivity.cs
index 4d4155afadf..7ee080ea159 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/MissingActivity.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/MissingActivity.cs
@@ -4,40 +4,39 @@
 using OrchardCore.Workflows.Abstractions.Models;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Activities
+namespace OrchardCore.Workflows.Activities;
+
+/// <summary>
+/// A replacement for when a referenced activity could not be found. This is a system-level activity that is not registered with WorkflowOptions.
+/// </summary>
+public class MissingActivity : Activity
 {
-    /// <summary>
-    /// A replacement for when a referenced activity could not be found. This is a system-level activity that is not registered with WorkflowOptions.
-    /// </summary>
-    public class MissingActivity : Activity
-    {
-        private readonly ILogger _logger;
-        protected readonly IStringLocalizer S;
+    private readonly ILogger _logger;
+    protected readonly IStringLocalizer S;
 
-        public MissingActivity(IStringLocalizer<MissingActivity> localizer, ILogger<MissingActivity> logger, ActivityRecord missingActivityRecord)
-        {
-            S = localizer;
-            _logger = logger;
-            MissingActivityRecord = missingActivityRecord;
-        }
+    public MissingActivity(IStringLocalizer<MissingActivity> localizer, ILogger<MissingActivity> logger, ActivityRecord missingActivityRecord)
+    {
+        S = localizer;
+        _logger = logger;
+        MissingActivityRecord = missingActivityRecord;
+    }
 
-        public override string Name => nameof(MissingActivity);
+    public override string Name => nameof(MissingActivity);
 
-        public override LocalizedString DisplayText => S["Missing Activity"];
+    public override LocalizedString DisplayText => S["Missing Activity"];
 
-        public override LocalizedString Category => S["Exceptions"];
+    public override LocalizedString Category => S["Exceptions"];
 
-        public ActivityRecord MissingActivityRecord { get; }
+    public ActivityRecord MissingActivityRecord { get; }
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            yield break;
-        }
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        yield break;
+    }
 
-        public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            _logger.LogWarning("Activity '{ActivityName}' is no longer available. This can happen if the feature providing the activity is no longer enabled. Either enable the feature, or remove this activity from workflow definition with ID {WorkflowTypeId}", MissingActivityRecord.Name, workflowContext.WorkflowType.Id);
-            return Noop();
-        }
+    public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        _logger.LogWarning("Activity '{ActivityName}' is no longer available. This can happen if the feature providing the activity is no longer enabled. Either enable the feature, or remove this activity from workflow definition with ID {WorkflowTypeId}", MissingActivityRecord.Name, workflowContext.WorkflowType.Id);
+        return Noop();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/NotifyTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/NotifyTask.cs
index dfa40247cc9..28a0804f473 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/NotifyTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/NotifyTask.cs
@@ -8,56 +8,55 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Activities
+namespace OrchardCore.Workflows.Activities;
+
+public class NotifyTask : TaskActivity<NotifyTask>
 {
-    public class NotifyTask : TaskActivity<NotifyTask>
+    private readonly INotifier _notifier;
+    private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
+    protected readonly IStringLocalizer S;
+    private readonly HtmlEncoder _htmlEncoder;
+
+    public NotifyTask(
+        INotifier notifier,
+        IWorkflowExpressionEvaluator expressionEvaluator,
+        IStringLocalizer<NotifyTask> localizer,
+        HtmlEncoder htmlEncoder)
+    {
+        _notifier = notifier;
+        _expressionEvaluator = expressionEvaluator;
+        S = localizer;
+        _htmlEncoder = htmlEncoder;
+    }
+
+    public override LocalizedString DisplayText => S["Notify Task"];
+
+    public override LocalizedString Category => S["UI"];
+
+    public NotifyType NotificationType
+    {
+        get => GetProperty<NotifyType>();
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<string> Message
     {
-        private readonly INotifier _notifier;
-        private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
-        protected readonly IStringLocalizer S;
-        private readonly HtmlEncoder _htmlEncoder;
-
-        public NotifyTask(
-            INotifier notifier,
-            IWorkflowExpressionEvaluator expressionEvaluator,
-            IStringLocalizer<NotifyTask> localizer,
-            HtmlEncoder htmlEncoder)
-        {
-            _notifier = notifier;
-            _expressionEvaluator = expressionEvaluator;
-            S = localizer;
-            _htmlEncoder = htmlEncoder;
-        }
-
-        public override LocalizedString DisplayText => S["Notify Task"];
-
-        public override LocalizedString Category => S["UI"];
-
-        public NotifyType NotificationType
-        {
-            get => GetProperty<NotifyType>();
-            set => SetProperty(value);
-        }
-
-        public WorkflowExpression<string> Message
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
-
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"]);
-        }
-
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var message = await _expressionEvaluator.EvaluateAsync(Message, workflowContext, _htmlEncoder);
-
-            // The notification message can contain HTML by design
-            await _notifier.AddAsync(NotificationType, new LocalizedHtmlString(nameof(NotifyTask), message));
-
-            return Outcomes("Done");
-        }
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"]);
+    }
+
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var message = await _expressionEvaluator.EvaluateAsync(Message, workflowContext, _htmlEncoder);
+
+        // The notification message can contain HTML by design
+        await _notifier.AddAsync(NotificationType, new LocalizedHtmlString(nameof(NotifyTask), message));
+
+        return Outcomes("Done");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ScriptTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ScriptTask.cs
index 5acf66f7358..13c5291cbfd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ScriptTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/ScriptTask.cs
@@ -7,49 +7,48 @@
 using OrchardCore.Workflows.Scripting;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Activities
+namespace OrchardCore.Workflows.Activities;
+
+public class ScriptTask : TaskActivity<ScriptTask>
 {
-    public class ScriptTask : TaskActivity<ScriptTask>
+    private readonly IWorkflowScriptEvaluator _scriptEvaluator;
+    protected readonly IStringLocalizer S;
+
+    public ScriptTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<ScriptTask> localizer)
     {
-        private readonly IWorkflowScriptEvaluator _scriptEvaluator;
-        protected readonly IStringLocalizer S;
-
-        public ScriptTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<ScriptTask> localizer)
-        {
-            _scriptEvaluator = scriptEvaluator;
-            S = localizer;
-        }
-
-        public override LocalizedString DisplayText => S["Script Task"];
-
-        public override LocalizedString Category => S["Control Flow"];
-
-        public IList<string> AvailableOutcomes
-        {
-            get => GetProperty(() => new List<string> { "Done" });
-            set => SetProperty(value);
-        }
-
-        /// <summary>
-        /// The script can call any available functions, including setOutcome().
-        /// </summary>
-        public WorkflowExpression<object> Script
-        {
-            get => GetProperty(() => new WorkflowExpression<object>("setOutcome('Done');"));
-            set => SetProperty(value);
-        }
-
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(AvailableOutcomes.Select(x => S[x]).ToArray());
-        }
-
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var outcomes = new List<string>();
-            workflowContext.LastResult = await _scriptEvaluator.EvaluateAsync(Script, workflowContext, new OutcomeMethodProvider(outcomes));
-
-            return Outcomes(outcomes);
-        }
+        _scriptEvaluator = scriptEvaluator;
+        S = localizer;
+    }
+
+    public override LocalizedString DisplayText => S["Script Task"];
+
+    public override LocalizedString Category => S["Control Flow"];
+
+    public IList<string> AvailableOutcomes
+    {
+        get => GetProperty(() => new List<string> { "Done" });
+        set => SetProperty(value);
+    }
+
+    /// <summary>
+    /// The script can call any available functions, including setOutcome().
+    /// </summary>
+    public WorkflowExpression<object> Script
+    {
+        get => GetProperty(() => new WorkflowExpression<object>("setOutcome('Done');"));
+        set => SetProperty(value);
+    }
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(AvailableOutcomes.Select(x => S[x]).ToArray());
+    }
+
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var outcomes = new List<string>();
+        workflowContext.LastResult = await _scriptEvaluator.EvaluateAsync(Script, workflowContext, new OutcomeMethodProvider(outcomes));
+
+        return Outcomes(outcomes);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/SetOutputTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/SetOutputTask.cs
index 5954993e175..210ae50a191 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/SetOutputTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/SetOutputTask.cs
@@ -5,46 +5,45 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Activities
+namespace OrchardCore.Workflows.Activities;
+
+public class SetOutputTask : TaskActivity<SetOutputTask>
 {
-    public class SetOutputTask : TaskActivity<SetOutputTask>
+    private readonly IWorkflowScriptEvaluator _scriptEvaluator;
+    protected readonly IStringLocalizer S;
+
+    public SetOutputTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<SetOutputTask> localizer)
     {
-        private readonly IWorkflowScriptEvaluator _scriptEvaluator;
-        protected readonly IStringLocalizer S;
-
-        public SetOutputTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<SetOutputTask> localizer)
-        {
-            _scriptEvaluator = scriptEvaluator;
-            S = localizer;
-        }
-
-        public override LocalizedString DisplayText => S["Set Output Task"];
-
-        public override LocalizedString Category => S["Primitives"];
-
-        public string OutputName
-        {
-            get => GetProperty<string>();
-            set => SetProperty(value);
-        }
-
-        public WorkflowExpression<object> Value
-        {
-            get => GetProperty(() => new WorkflowExpression<object>());
-            set => SetProperty(value);
-        }
-
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"]);
-        }
-
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var value = await _scriptEvaluator.EvaluateAsync(Value, workflowContext);
-            workflowContext.Output[OutputName] = value;
-
-            return Outcomes("Done");
-        }
+        _scriptEvaluator = scriptEvaluator;
+        S = localizer;
+    }
+
+    public override LocalizedString DisplayText => S["Set Output Task"];
+
+    public override LocalizedString Category => S["Primitives"];
+
+    public string OutputName
+    {
+        get => GetProperty<string>();
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<object> Value
+    {
+        get => GetProperty(() => new WorkflowExpression<object>());
+        set => SetProperty(value);
+    }
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"]);
+    }
+
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var value = await _scriptEvaluator.EvaluateAsync(Value, workflowContext);
+        workflowContext.Output[OutputName] = value;
+
+        return Outcomes("Done");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/SetPropertyTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/SetPropertyTask.cs
index 43930af32ce..268c4dd7612 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/SetPropertyTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/SetPropertyTask.cs
@@ -5,46 +5,45 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Activities
+namespace OrchardCore.Workflows.Activities;
+
+public class SetPropertyTask : TaskActivity<SetPropertyTask>
 {
-    public class SetPropertyTask : TaskActivity<SetPropertyTask>
+    private readonly IWorkflowScriptEvaluator _scriptEvaluator;
+    protected readonly IStringLocalizer S;
+
+    public SetPropertyTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<SetPropertyTask> localizer)
     {
-        private readonly IWorkflowScriptEvaluator _scriptEvaluator;
-        protected readonly IStringLocalizer S;
-
-        public SetPropertyTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<SetPropertyTask> localizer)
-        {
-            _scriptEvaluator = scriptEvaluator;
-            S = localizer;
-        }
-
-        public override LocalizedString DisplayText => S["Set Property Task"];
-
-        public override LocalizedString Category => S["Primitives"];
-
-        public string PropertyName
-        {
-            get => GetProperty<string>();
-            set => SetProperty(value);
-        }
-
-        public WorkflowExpression<object> Value
-        {
-            get => GetProperty(() => new WorkflowExpression<object>());
-            set => SetProperty(value);
-        }
-
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"]);
-        }
-
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var value = await _scriptEvaluator.EvaluateAsync(Value, workflowContext);
-            workflowContext.Properties[PropertyName] = value;
-
-            return Outcomes("Done");
-        }
+        _scriptEvaluator = scriptEvaluator;
+        S = localizer;
+    }
+
+    public override LocalizedString DisplayText => S["Set Property Task"];
+
+    public override LocalizedString Category => S["Primitives"];
+
+    public string PropertyName
+    {
+        get => GetProperty<string>();
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<object> Value
+    {
+        get => GetProperty(() => new WorkflowExpression<object>());
+        set => SetProperty(value);
+    }
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"]);
+    }
+
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var value = await _scriptEvaluator.EvaluateAsync(Value, workflowContext);
+        workflowContext.Properties[PropertyName] = value;
+
+        return Outcomes("Done");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/WhileLoopTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/WhileLoopTask.cs
index 9230445f758..9534e24b4ea 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/WhileLoopTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Activities/WhileLoopTask.cs
@@ -5,41 +5,40 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Activities
+namespace OrchardCore.Workflows.Activities;
+
+public class WhileLoopTask : TaskActivity<WhileLoopTask>
 {
-    public class WhileLoopTask : TaskActivity<WhileLoopTask>
+    private readonly IWorkflowScriptEvaluator _scriptEvaluator;
+    protected readonly IStringLocalizer S;
+
+    public WhileLoopTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<WhileLoopTask> localizer)
+    {
+        _scriptEvaluator = scriptEvaluator;
+        S = localizer;
+    }
+
+    public override LocalizedString DisplayText => S["While Loop Task"];
+
+    public override LocalizedString Category => S["Control Flow"];
+
+    /// <summary>
+    /// An expression evaluating to true or false.
+    /// </summary>
+    public WorkflowExpression<bool> Condition
+    {
+        get => GetProperty(() => new WorkflowExpression<bool>());
+        set => SetProperty(value);
+    }
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Iterate"], S["Done"]);
+    }
+
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
     {
-        private readonly IWorkflowScriptEvaluator _scriptEvaluator;
-        protected readonly IStringLocalizer S;
-
-        public WhileLoopTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<WhileLoopTask> localizer)
-        {
-            _scriptEvaluator = scriptEvaluator;
-            S = localizer;
-        }
-
-        public override LocalizedString DisplayText => S["While Loop Task"];
-
-        public override LocalizedString Category => S["Control Flow"];
-
-        /// <summary>
-        /// An expression evaluating to true or false.
-        /// </summary>
-        public WorkflowExpression<bool> Condition
-        {
-            get => GetProperty(() => new WorkflowExpression<bool>());
-            set => SetProperty(value);
-        }
-
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Iterate"], S["Done"]);
-        }
-
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var loop = await _scriptEvaluator.EvaluateAsync(Condition, workflowContext);
-            return Outcomes(loop ? "Iterate" : "Done");
-        }
+        var loop = await _scriptEvaluator.EvaluateAsync(Condition, workflowContext);
+        return Outcomes(loop ? "Iterate" : "Done");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/AdminMenu.cs
index a378e7977ad..f3e539bfe50 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/AdminMenu.cs
@@ -2,34 +2,33 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Workflows
+namespace OrchardCore.Workflows;
+
+public sealed class AdminMenu : INavigationProvider
 {
-    public sealed class AdminMenu : INavigationProvider
+    internal readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> localizer)
     {
-        internal readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        public AdminMenu(IStringLocalizer<AdminMenu> localizer)
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
         {
-            S = localizer;
+            return Task.CompletedTask;
         }
 
-        public Task BuildNavigationAsync(string name, NavigationBuilder builder)
-        {
-            if (!NavigationHelper.IsAdminMenu(name))
-            {
-                return Task.CompletedTask;
-            }
-
-            builder
-                .Add(S["Workflows"], NavigationConstants.AdminMenuWorkflowsPosition, workflow => workflow
-                    .AddClass("workflows")
-                    .Id("workflows")
-                    .Action("Index", "WorkflowType", "OrchardCore.Workflows")
-                    .Permission(Permissions.ManageWorkflows)
-                    .LocalNav()
-                );
+        builder
+            .Add(S["Workflows"], NavigationConstants.AdminMenuWorkflowsPosition, workflow => workflow
+                .AddClass("workflows")
+                .Id("workflows")
+                .Action("Index", "WorkflowType", "OrchardCore.Workflows")
+                .Permission(Permissions.ManageWorkflows)
+                .LocalNav()
+            );
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/ActivityController.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/ActivityController.cs
index 7624fe8362c..ce0b263246c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/ActivityController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/ActivityController.cs
@@ -11,167 +11,166 @@
 using OrchardCore.Workflows.ViewModels;
 using YesSql;
 
-namespace OrchardCore.Workflows.Controllers
+namespace OrchardCore.Workflows.Controllers;
+
+[Admin]
+public class ActivityController : Controller
 {
-    [Admin]
-    public class ActivityController : Controller
+    private readonly ISession _session;
+    private readonly IActivityLibrary _activityLibrary;
+    private readonly IWorkflowManager _workflowManager;
+    private readonly IActivityIdGenerator _activityIdGenerator;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IActivityDisplayManager _activityDisplayManager;
+    private readonly INotifier _notifier;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    protected readonly IHtmlLocalizer H;
+
+    public ActivityController
+    (
+        ISession session,
+        IActivityLibrary activityLibrary,
+        IWorkflowManager workflowManager,
+        IActivityIdGenerator activityIdGenerator,
+        IAuthorizationService authorizationService,
+        IActivityDisplayManager activityDisplayManager,
+        INotifier notifier,
+        IHtmlLocalizer<ActivityController> h,
+        IUpdateModelAccessor updateModelAccessor)
+    {
+        _session = session;
+        _activityLibrary = activityLibrary;
+        _workflowManager = workflowManager;
+        _activityIdGenerator = activityIdGenerator;
+        _authorizationService = authorizationService;
+        _activityDisplayManager = activityDisplayManager;
+        _notifier = notifier;
+        _updateModelAccessor = updateModelAccessor;
+        H = h;
+    }
+
+    [Admin("Workflows/Types/{workflowTypeId}/Activity/{activityName}/Add", "AddActivity")]
+    public async Task<IActionResult> Create(string activityName, long workflowTypeId, string returnUrl)
     {
-        private readonly ISession _session;
-        private readonly IActivityLibrary _activityLibrary;
-        private readonly IWorkflowManager _workflowManager;
-        private readonly IActivityIdGenerator _activityIdGenerator;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IActivityDisplayManager _activityDisplayManager;
-        private readonly INotifier _notifier;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        protected readonly IHtmlLocalizer H;
-
-        public ActivityController
-        (
-            ISession session,
-            IActivityLibrary activityLibrary,
-            IWorkflowManager workflowManager,
-            IActivityIdGenerator activityIdGenerator,
-            IAuthorizationService authorizationService,
-            IActivityDisplayManager activityDisplayManager,
-            INotifier notifier,
-            IHtmlLocalizer<ActivityController> h,
-            IUpdateModelAccessor updateModelAccessor)
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
         {
-            _session = session;
-            _activityLibrary = activityLibrary;
-            _workflowManager = workflowManager;
-            _activityIdGenerator = activityIdGenerator;
-            _authorizationService = authorizationService;
-            _activityDisplayManager = activityDisplayManager;
-            _notifier = notifier;
-            _updateModelAccessor = updateModelAccessor;
-            H = h;
+            return Forbid();
         }
 
-        [Admin("Workflows/Types/{workflowTypeId}/Activity/{activityName}/Add", "AddActivity")]
-        public async Task<IActionResult> Create(string activityName, long workflowTypeId, string returnUrl)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
-            {
-                return Forbid();
-            }
+        var activity = _activityLibrary.InstantiateActivity(activityName);
+        var activityId = _activityIdGenerator.GenerateUniqueId(new ActivityRecord());
+        var activityEditor = await _activityDisplayManager.BuildEditorAsync(activity, _updateModelAccessor.ModelUpdater, isNew: true, "", "");
 
-            var activity = _activityLibrary.InstantiateActivity(activityName);
-            var activityId = _activityIdGenerator.GenerateUniqueId(new ActivityRecord());
-            var activityEditor = await _activityDisplayManager.BuildEditorAsync(activity, _updateModelAccessor.ModelUpdater, isNew: true, "", "");
+        activityEditor.Metadata.Type = "Activity_Edit";
 
-            activityEditor.Metadata.Type = "Activity_Edit";
+        var viewModel = new ActivityEditViewModel
+        {
+            Activity = activity,
+            ActivityId = activityId,
+            ActivityEditor = activityEditor,
+            WorkflowTypeId = workflowTypeId,
+            ReturnUrl = returnUrl,
+        };
+
+        if (!activity.HasEditor)
+        {
+            // No editor to show; short-circuit to the "POST" action.
+            return await Create(activityName, viewModel);
+        }
+
+        return View(viewModel);
+    }
 
-            var viewModel = new ActivityEditViewModel
-            {
-                Activity = activity,
-                ActivityId = activityId,
-                ActivityEditor = activityEditor,
-                WorkflowTypeId = workflowTypeId,
-                ReturnUrl = returnUrl,
-            };
-
-            if (!activity.HasEditor)
-            {
-                // No editor to show; short-circuit to the "POST" action.
-                return await Create(activityName, viewModel);
-            }
-
-            return View(viewModel);
+    [HttpPost]
+    public async Task<IActionResult> Create(string activityName, ActivityEditViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Create(string activityName, ActivityEditViewModel model)
+        var workflowType = await _session.GetAsync<WorkflowType>(model.WorkflowTypeId);
+        var activity = _activityLibrary.InstantiateActivity(activityName);
+        var activityEditor = await _activityDisplayManager.UpdateEditorAsync(activity, _updateModelAccessor.ModelUpdater, isNew: true, "", "");
+
+        if (!ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
-            {
-                return Forbid();
-            }
-
-            var workflowType = await _session.GetAsync<WorkflowType>(model.WorkflowTypeId);
-            var activity = _activityLibrary.InstantiateActivity(activityName);
-            var activityEditor = await _activityDisplayManager.UpdateEditorAsync(activity, _updateModelAccessor.ModelUpdater, isNew: true, "", "");
-
-            if (!ModelState.IsValid)
-            {
-                activityEditor.Metadata.Type = "Activity_Edit";
-                model.Activity = activity;
-                model.ActivityEditor = activityEditor;
-                return View(model);
-            }
-
-            var activityRecord = new ActivityRecord
-            {
-                ActivityId = model.ActivityId,
-                Name = activity.Name,
-                Properties = activity.Properties,
-            };
-            workflowType.Activities.Add(activityRecord);
-
-            await _session.SaveAsync(workflowType);
-            await _notifier.SuccessAsync(H["Activity added successfully."]);
-
-            return Url.IsLocalUrl(model.ReturnUrl) ? (IActionResult)this.Redirect(model.ReturnUrl, true) : RedirectToAction(nameof(Edit), "WorkflowType", new { id = model.WorkflowTypeId });
+            activityEditor.Metadata.Type = "Activity_Edit";
+            model.Activity = activity;
+            model.ActivityEditor = activityEditor;
+            return View(model);
         }
 
-        [Admin("Workflows/Types/{workflowTypeId}/Activity/{activityId}/Edit", "EditActivity")]
-        public async Task<IActionResult> Edit(long workflowTypeId, string activityId, string returnUrl)
+        var activityRecord = new ActivityRecord
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
-            {
-                return Forbid();
-            }
+            ActivityId = model.ActivityId,
+            Name = activity.Name,
+            Properties = activity.Properties,
+        };
+        workflowType.Activities.Add(activityRecord);
 
-            var workflowType = await _session.GetAsync<WorkflowType>(workflowTypeId);
-            var activityRecord = workflowType.Activities.Single(x => x.ActivityId == activityId);
-            var activityContext = await _workflowManager.CreateActivityExecutionContextAsync(activityRecord, activityRecord.Properties);
-            var activityEditor = await _activityDisplayManager.BuildEditorAsync(activityContext.Activity, _updateModelAccessor.ModelUpdater, isNew: false, "", "");
+        await _session.SaveAsync(workflowType);
+        await _notifier.SuccessAsync(H["Activity added successfully."]);
 
-            activityEditor.Metadata.Type = "Activity_Edit";
-
-            var viewModel = new ActivityEditViewModel
-            {
-                Activity = activityContext.Activity,
-                ActivityId = activityId,
-                ActivityEditor = activityEditor,
-                WorkflowTypeId = workflowTypeId,
-                ReturnUrl = returnUrl,
-            };
+        return Url.IsLocalUrl(model.ReturnUrl) ? (IActionResult)this.Redirect(model.ReturnUrl, true) : RedirectToAction(nameof(Edit), "WorkflowType", new { id = model.WorkflowTypeId });
+    }
 
-            return View("EditActivity", viewModel);
+    [Admin("Workflows/Types/{workflowTypeId}/Activity/{activityId}/Edit", "EditActivity")]
+    public async Task<IActionResult> Edit(long workflowTypeId, string activityId, string returnUrl)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Edit(ActivityEditViewModel model)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
-            {
-                return Forbid();
-            }
+        var workflowType = await _session.GetAsync<WorkflowType>(workflowTypeId);
+        var activityRecord = workflowType.Activities.Single(x => x.ActivityId == activityId);
+        var activityContext = await _workflowManager.CreateActivityExecutionContextAsync(activityRecord, activityRecord.Properties);
+        var activityEditor = await _activityDisplayManager.BuildEditorAsync(activityContext.Activity, _updateModelAccessor.ModelUpdater, isNew: false, "", "");
 
-            var workflowType = await _session.GetAsync<WorkflowType>(model.WorkflowTypeId);
-            var activityRecord = workflowType.Activities.Single(x => x.ActivityId == model.ActivityId);
-            var activityContext = await _workflowManager.CreateActivityExecutionContextAsync(activityRecord, activityRecord.Properties);
-            var activityEditor = await _activityDisplayManager.UpdateEditorAsync(activityContext.Activity, _updateModelAccessor.ModelUpdater, isNew: false, "", "");
+        activityEditor.Metadata.Type = "Activity_Edit";
 
-            if (!ModelState.IsValid)
-            {
-                activityEditor.Metadata.Type = "Activity_Edit";
-                model.Activity = activityContext.Activity;
-                model.ActivityEditor = activityEditor;
+        var viewModel = new ActivityEditViewModel
+        {
+            Activity = activityContext.Activity,
+            ActivityId = activityId,
+            ActivityEditor = activityEditor,
+            WorkflowTypeId = workflowTypeId,
+            ReturnUrl = returnUrl,
+        };
+
+        return View("EditActivity", viewModel);
+    }
 
-                return View("EditActivity", model);
-            }
+    [HttpPost]
+    public async Task<IActionResult> Edit(ActivityEditViewModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
+        {
+            return Forbid();
+        }
 
-            activityRecord.Properties = activityContext.Activity.Properties;
+        var workflowType = await _session.GetAsync<WorkflowType>(model.WorkflowTypeId);
+        var activityRecord = workflowType.Activities.Single(x => x.ActivityId == model.ActivityId);
+        var activityContext = await _workflowManager.CreateActivityExecutionContextAsync(activityRecord, activityRecord.Properties);
+        var activityEditor = await _activityDisplayManager.UpdateEditorAsync(activityContext.Activity, _updateModelAccessor.ModelUpdater, isNew: false, "", "");
 
-            await _session.SaveAsync(workflowType);
-            await _notifier.SuccessAsync(H["Activity updated successfully."]);
+        if (!ModelState.IsValid)
+        {
+            activityEditor.Metadata.Type = "Activity_Edit";
+            model.Activity = activityContext.Activity;
+            model.ActivityEditor = activityEditor;
 
-            return Url.IsLocalUrl(model.ReturnUrl)
-                ? (IActionResult)this.Redirect(model.ReturnUrl, true)
-                : RedirectToAction(nameof(Edit), "WorkflowType", new { id = model.WorkflowTypeId });
+            return View("EditActivity", model);
         }
+
+        activityRecord.Properties = activityContext.Activity.Properties;
+
+        await _session.SaveAsync(workflowType);
+        await _notifier.SuccessAsync(H["Activity updated successfully."]);
+
+        return Url.IsLocalUrl(model.ReturnUrl)
+            ? (IActionResult)this.Redirect(model.ReturnUrl, true)
+            : RedirectToAction(nameof(Edit), "WorkflowType", new { id = model.WorkflowTypeId });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/WorkflowController.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/WorkflowController.cs
index 71409532e9b..4a605c10ea2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/WorkflowController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/WorkflowController.cs
@@ -26,320 +26,319 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.Workflows.Controllers
+namespace OrchardCore.Workflows.Controllers;
+
+[Admin]
+public class WorkflowController : Controller
 {
-    [Admin]
-    public class WorkflowController : Controller
+    private readonly PagerOptions _pagerOptions;
+    private readonly ISession _session;
+    private readonly IWorkflowManager _workflowManager;
+    private readonly IWorkflowTypeStore _workflowTypeStore;
+    private readonly IWorkflowStore _workflowStore;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IActivityDisplayManager _activityDisplayManager;
+    private readonly INotifier _notifier;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly IDistributedLock _distributedLock;
+
+    protected readonly IHtmlLocalizer H;
+    protected readonly IStringLocalizer S;
+
+    public WorkflowController(
+        IOptions<PagerOptions> pagerOptions,
+        ISession session,
+        IWorkflowManager workflowManager,
+        IWorkflowTypeStore workflowTypeStore,
+        IWorkflowStore workflowStore,
+        IAuthorizationService authorizationService,
+        IActivityDisplayManager activityDisplayManager,
+        IShapeFactory shapeFactory,
+        INotifier notifier,
+        IHtmlLocalizer<WorkflowController> htmlLocalizer,
+        IDistributedLock distributedLock,
+        IStringLocalizer<WorkflowController> stringLocalizer,
+        IUpdateModelAccessor updateModelAccessor)
     {
-        private readonly PagerOptions _pagerOptions;
-        private readonly ISession _session;
-        private readonly IWorkflowManager _workflowManager;
-        private readonly IWorkflowTypeStore _workflowTypeStore;
-        private readonly IWorkflowStore _workflowStore;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IActivityDisplayManager _activityDisplayManager;
-        private readonly INotifier _notifier;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly IDistributedLock _distributedLock;
-
-        protected readonly IHtmlLocalizer H;
-        protected readonly IStringLocalizer S;
-
-        public WorkflowController(
-            IOptions<PagerOptions> pagerOptions,
-            ISession session,
-            IWorkflowManager workflowManager,
-            IWorkflowTypeStore workflowTypeStore,
-            IWorkflowStore workflowStore,
-            IAuthorizationService authorizationService,
-            IActivityDisplayManager activityDisplayManager,
-            IShapeFactory shapeFactory,
-            INotifier notifier,
-            IHtmlLocalizer<WorkflowController> htmlLocalizer,
-            IDistributedLock distributedLock,
-            IStringLocalizer<WorkflowController> stringLocalizer,
-            IUpdateModelAccessor updateModelAccessor)
+        _pagerOptions = pagerOptions.Value;
+        _session = session;
+        _workflowManager = workflowManager;
+        _workflowTypeStore = workflowTypeStore;
+        _workflowStore = workflowStore;
+        _authorizationService = authorizationService;
+        _activityDisplayManager = activityDisplayManager;
+        _notifier = notifier;
+        _updateModelAccessor = updateModelAccessor;
+        _shapeFactory = shapeFactory;
+        H = htmlLocalizer;
+        _distributedLock = distributedLock;
+        S = stringLocalizer;
+    }
+
+    [Admin("Workflows/Types/{workflowTypeId}/Instances/{action}", "Workflows")]
+    public async Task<IActionResult> Index(long workflowTypeId, WorkflowIndexViewModel model, PagerParameters pagerParameters, string returnUrl = null)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
         {
-            _pagerOptions = pagerOptions.Value;
-            _session = session;
-            _workflowManager = workflowManager;
-            _workflowTypeStore = workflowTypeStore;
-            _workflowStore = workflowStore;
-            _authorizationService = authorizationService;
-            _activityDisplayManager = activityDisplayManager;
-            _notifier = notifier;
-            _updateModelAccessor = updateModelAccessor;
-            _shapeFactory = shapeFactory;
-            H = htmlLocalizer;
-            _distributedLock = distributedLock;
-            S = stringLocalizer;
+            return Forbid();
         }
 
-        [Admin("Workflows/Types/{workflowTypeId}/Instances/{action}", "Workflows")]
-        public async Task<IActionResult> Index(long workflowTypeId, WorkflowIndexViewModel model, PagerParameters pagerParameters, string returnUrl = null)
+        if (!Url.IsLocalUrl(returnUrl))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
-            {
-                return Forbid();
-            }
-
-            if (!Url.IsLocalUrl(returnUrl))
-            {
-                returnUrl = Url.Action(nameof(WorkflowTypeController.Index), typeof(WorkflowTypeController).ControllerName());
-            }
-
-            var workflowType = await _workflowTypeStore.GetAsync(workflowTypeId);
+            returnUrl = Url.Action(nameof(WorkflowTypeController.Index), typeof(WorkflowTypeController).ControllerName());
+        }
 
-            var query = _session.QueryIndex<WorkflowIndex>()
-                .Where(x => x.WorkflowTypeId == workflowType.WorkflowTypeId);
+        var workflowType = await _workflowTypeStore.GetAsync(workflowTypeId);
 
-            query = model.Options.Filter switch
-            {
-                WorkflowFilter.Finished => query.Where(x => x.WorkflowStatus == (int)WorkflowStatus.Finished),
-                WorkflowFilter.Faulted => query.Where(x => x.WorkflowStatus == (int)WorkflowStatus.Faulted),
-                _ => query,
-            };
+        var query = _session.QueryIndex<WorkflowIndex>()
+            .Where(x => x.WorkflowTypeId == workflowType.WorkflowTypeId);
 
-            query = model.Options.OrderBy switch
-            {
-                WorkflowOrder.Created => query.OrderBy(x => x.CreatedUtc),
-                _ => query.OrderByDescending(x => x.CreatedUtc),
-            };
+        query = model.Options.Filter switch
+        {
+            WorkflowFilter.Finished => query.Where(x => x.WorkflowStatus == (int)WorkflowStatus.Finished),
+            WorkflowFilter.Faulted => query.Where(x => x.WorkflowStatus == (int)WorkflowStatus.Faulted),
+            _ => query,
+        };
 
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
+        query = model.Options.OrderBy switch
+        {
+            WorkflowOrder.Created => query.OrderBy(x => x.CreatedUtc),
+            _ => query.OrderByDescending(x => x.CreatedUtc),
+        };
 
-            var routeData = new RouteData();
-            routeData.Values.Add("Filter", model.Options.Filter);
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
 
-            var pagerShape = await _shapeFactory.PagerAsync(pager, await query.CountAsync(), routeData);
+        var routeData = new RouteData();
+        routeData.Values.Add("Filter", model.Options.Filter);
 
-            var pageOfItems = await query.Skip(pager.GetStartIndex()).Take(pager.PageSize).ListAsync();
+        var pagerShape = await _shapeFactory.PagerAsync(pager, await query.CountAsync(), routeData);
 
-            var workflowIds = pageOfItems.Select(item => item.WorkflowId);
-            var workflowsQuery = _session.Query<Workflow, WorkflowIndex>(item => item.WorkflowId.IsIn(workflowIds));
+        var pageOfItems = await query.Skip(pager.GetStartIndex()).Take(pager.PageSize).ListAsync();
 
-            workflowsQuery = model.Options.OrderBy switch
-            {
-                WorkflowOrder.Created => workflowsQuery.OrderBy(i => i.CreatedUtc),
-                _ => workflowsQuery.OrderByDescending(i => i.CreatedUtc),
-            };
+        var workflowIds = pageOfItems.Select(item => item.WorkflowId);
+        var workflowsQuery = _session.Query<Workflow, WorkflowIndex>(item => item.WorkflowId.IsIn(workflowIds));
 
-            var workflows = await workflowsQuery.ListAsync();
+        workflowsQuery = model.Options.OrderBy switch
+        {
+            WorkflowOrder.Created => workflowsQuery.OrderBy(i => i.CreatedUtc),
+            _ => workflowsQuery.OrderByDescending(i => i.CreatedUtc),
+        };
 
-            var viewModel = new WorkflowIndexViewModel
-            {
-                WorkflowType = workflowType,
-                Workflows = workflows.Select(x => new WorkflowEntry { Workflow = x, Id = x.Id }).ToList(),
-                Options = model.Options,
-                Pager = pagerShape,
-                ReturnUrl = returnUrl,
-            };
-
-            model.Options.WorkflowsSorts =
-            [
-                new SelectListItem(S["Recently created"], nameof(WorkflowOrder.CreatedDesc)),
-                new SelectListItem(S["Least recently created"], nameof(WorkflowOrder.Created)),
-            ];
-
-            model.Options.WorkflowsStatuses =
-            [
-                new SelectListItem(S["All"], nameof(WorkflowFilter.All)),
-                new SelectListItem(S["Faulted"], nameof(WorkflowFilter.Faulted)),
-                new SelectListItem(S["Finished"], nameof(WorkflowFilter.Finished)),
-            ];
-
-            viewModel.Options.WorkflowsBulkAction =
-            [
-                new SelectListItem(S["Delete"], nameof(WorkflowBulkAction.Delete)),
-            ];
-
-            return View(viewModel);
-        }
+        var workflows = await workflowsQuery.ListAsync();
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.Filter")]
-        public ActionResult IndexFilterPOST(WorkflowIndexViewModel model)
-            => RedirectToAction(nameof(Index), new RouteValueDictionary
-            {
-                { "Options.Filter", model.Options.Filter },
-                { "Options.OrderBy", model.Options.OrderBy },
-            });
+        var viewModel = new WorkflowIndexViewModel
+        {
+            WorkflowType = workflowType,
+            Workflows = workflows.Select(x => new WorkflowEntry { Workflow = x, Id = x.Id }).ToList(),
+            Options = model.Options,
+            Pager = pagerShape,
+            ReturnUrl = returnUrl,
+        };
+
+        model.Options.WorkflowsSorts =
+        [
+            new SelectListItem(S["Recently created"], nameof(WorkflowOrder.CreatedDesc)),
+            new SelectListItem(S["Least recently created"], nameof(WorkflowOrder.Created)),
+        ];
+
+        model.Options.WorkflowsStatuses =
+        [
+            new SelectListItem(S["All"], nameof(WorkflowFilter.All)),
+            new SelectListItem(S["Faulted"], nameof(WorkflowFilter.Faulted)),
+            new SelectListItem(S["Finished"], nameof(WorkflowFilter.Finished)),
+        ];
+
+        viewModel.Options.WorkflowsBulkAction =
+        [
+            new SelectListItem(S["Delete"], nameof(WorkflowBulkAction.Delete)),
+        ];
+
+        return View(viewModel);
+    }
 
-        public async Task<IActionResult> Details(long id)
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.Filter")]
+    public ActionResult IndexFilterPOST(WorkflowIndexViewModel model)
+        => RedirectToAction(nameof(Index), new RouteValueDictionary
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
-            {
-                return Forbid();
-            }
+            { "Options.Filter", model.Options.Filter },
+            { "Options.OrderBy", model.Options.OrderBy },
+        });
 
-            var workflow = await _workflowStore.GetAsync(id);
+    public async Task<IActionResult> Details(long id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
+        {
+            return Forbid();
+        }
 
-            if (workflow == null)
-            {
-                return NotFound();
-            }
+        var workflow = await _workflowStore.GetAsync(id);
 
-            var workflowType = await _workflowTypeStore.GetAsync(workflow.WorkflowTypeId);
-            var blockingActivities = workflow.BlockingActivities.ToDictionary(x => x.ActivityId);
-            var workflowContext = await _workflowManager.CreateWorkflowExecutionContextAsync(workflowType, workflow);
-            var activityContexts = await Task.WhenAll(workflowType.Activities.Select(x => _workflowManager.CreateActivityExecutionContextAsync(x, x.Properties)));
+        if (workflow == null)
+        {
+            return NotFound();
+        }
 
-            var activityDesignShapes = new List<dynamic>();
+        var workflowType = await _workflowTypeStore.GetAsync(workflow.WorkflowTypeId);
+        var blockingActivities = workflow.BlockingActivities.ToDictionary(x => x.ActivityId);
+        var workflowContext = await _workflowManager.CreateWorkflowExecutionContextAsync(workflowType, workflow);
+        var activityContexts = await Task.WhenAll(workflowType.Activities.Select(x => _workflowManager.CreateActivityExecutionContextAsync(x, x.Properties)));
 
-            foreach (var activityContext in activityContexts)
-            {
-                activityDesignShapes.Add(await BuildActivityDisplayAsync(activityContext, workflowType.Id, blockingActivities.ContainsKey(activityContext.ActivityRecord.ActivityId), "Design"));
-            }
+        var activityDesignShapes = new List<dynamic>();
 
-            var activitiesDataQuery = activityContexts.Select(x => new
-            {
-                Id = x.ActivityRecord.ActivityId,
-                x.ActivityRecord.X,
-                x.ActivityRecord.Y,
-                x.ActivityRecord.Name,
-                x.ActivityRecord.IsStart,
-                IsEvent = x.Activity.IsEvent(),
-                IsBlocking = workflow.BlockingActivities.Any(a => a.ActivityId == x.ActivityRecord.ActivityId),
-                Outcomes = x.Activity.GetPossibleOutcomes(workflowContext, x).ToArray(),
-            });
-            var workflowTypeData = new
-            {
-                workflowType.Id,
-                workflowType.Name,
-                workflowType.IsEnabled,
-                Activities = activitiesDataQuery.ToArray(),
-                workflowType.Transitions,
-            };
-
-            var viewModel = new WorkflowViewModel
-            {
-                Workflow = workflow,
-                WorkflowType = workflowType,
-                WorkflowTypeJson = JConvert.SerializeObject(workflowTypeData, JOptions.CamelCase),
-                WorkflowJson = JConvert.SerializeObject(workflow, JOptions.CamelCaseIndented),
-                ActivityDesignShapes = activityDesignShapes,
-            };
-
-            return View(viewModel);
+        foreach (var activityContext in activityContexts)
+        {
+            activityDesignShapes.Add(await BuildActivityDisplayAsync(activityContext, workflowType.Id, blockingActivities.ContainsKey(activityContext.ActivityRecord.ActivityId), "Design"));
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(long id)
+        var activitiesDataQuery = activityContexts.Select(x => new
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
-            {
-                return Forbid();
-            }
+            Id = x.ActivityRecord.ActivityId,
+            x.ActivityRecord.X,
+            x.ActivityRecord.Y,
+            x.ActivityRecord.Name,
+            x.ActivityRecord.IsStart,
+            IsEvent = x.Activity.IsEvent(),
+            IsBlocking = workflow.BlockingActivities.Any(a => a.ActivityId == x.ActivityRecord.ActivityId),
+            Outcomes = x.Activity.GetPossibleOutcomes(workflowContext, x).ToArray(),
+        });
+        var workflowTypeData = new
+        {
+            workflowType.Id,
+            workflowType.Name,
+            workflowType.IsEnabled,
+            Activities = activitiesDataQuery.ToArray(),
+            workflowType.Transitions,
+        };
+
+        var viewModel = new WorkflowViewModel
+        {
+            Workflow = workflow,
+            WorkflowType = workflowType,
+            WorkflowTypeJson = JConvert.SerializeObject(workflowTypeData, JOptions.CamelCase),
+            WorkflowJson = JConvert.SerializeObject(workflow, JOptions.CamelCaseIndented),
+            ActivityDesignShapes = activityDesignShapes,
+        };
+
+        return View(viewModel);
+    }
 
-            var workflow = await _workflowStore.GetAsync(id);
+    [HttpPost]
+    public async Task<IActionResult> Delete(long id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
+        {
+            return Forbid();
+        }
 
-            if (workflow == null)
-            {
-                return NotFound();
-            }
+        var workflow = await _workflowStore.GetAsync(id);
 
-            var workflowType = await _workflowTypeStore.GetAsync(workflow.WorkflowTypeId);
-            await _workflowStore.DeleteAsync(workflow);
-            await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
-            return RedirectToAction(nameof(Index), new { workflowTypeId = workflowType.Id });
+        if (workflow == null)
+        {
+            return NotFound();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Restart(long id)
+        var workflowType = await _workflowTypeStore.GetAsync(workflow.WorkflowTypeId);
+        await _workflowStore.DeleteAsync(workflow);
+        await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", id]);
+        return RedirectToAction(nameof(Index), new { workflowTypeId = workflowType.Id });
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Restart(long id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            var workflow = await _workflowStore.GetAsync(id);
+        var workflow = await _workflowStore.GetAsync(id);
 
-            if (workflow == null)
-            {
-                return NotFound();
-            }
+        if (workflow == null)
+        {
+            return NotFound();
+        }
 
-            var workflowType = await _workflowTypeStore.GetAsync(workflow.WorkflowTypeId);
+        var workflowType = await _workflowTypeStore.GetAsync(workflow.WorkflowTypeId);
 
-            if (workflowType == null)
-            {
-                return NotFound();
-            }
+        if (workflowType == null)
+        {
+            return NotFound();
+        }
+
+        // If a singleton, try to acquire a lock per workflow type.
+        (var locker, var locked) = await _distributedLock.TryAcquireWorkflowTypeLockAsync(workflowType);
+        if (!locked)
+        {
+            await _notifier.ErrorAsync(H["Another instance is already running.", id]);
+        }
+        else
+        {
+            await using var acquiredLock = locker;
 
-            // If a singleton, try to acquire a lock per workflow type.
-            (var locker, var locked) = await _distributedLock.TryAcquireWorkflowTypeLockAsync(workflowType);
-            if (!locked)
+            // Check if this is a workflow singleton and there's already an halted instance on any activity.
+            if (workflowType.IsSingleton && await _workflowStore.HasHaltedInstanceAsync(workflowType.WorkflowTypeId))
             {
                 await _notifier.ErrorAsync(H["Another instance is already running.", id]);
             }
             else
             {
-                await using var acquiredLock = locker;
-
-                // Check if this is a workflow singleton and there's already an halted instance on any activity.
-                if (workflowType.IsSingleton && await _workflowStore.HasHaltedInstanceAsync(workflowType.WorkflowTypeId))
-                {
-                    await _notifier.ErrorAsync(H["Another instance is already running.", id]);
-                }
-                else
-                {
-                    await _workflowManager.RestartWorkflowAsync(workflow, workflowType);
-
-                    await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
-                }
-            }
+                await _workflowManager.RestartWorkflowAsync(workflow, workflowType);
 
-            return RedirectToAction(nameof(Index), new { workflowTypeId = workflowType.Id });
+                await _notifier.SuccessAsync(H["Workflow {0} has been restarted.", id]);
+            }
         }
 
-        [HttpPost]
-        [ActionName(nameof(Index))]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<IActionResult> BulkEdit(long workflowTypeId, WorkflowIndexOptions options, PagerParameters pagerParameters, IEnumerable<long> itemIds)
+        return RedirectToAction(nameof(Index), new { workflowTypeId = workflowType.Id });
+    }
+
+    [HttpPost]
+    [ActionName(nameof(Index))]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<IActionResult> BulkEdit(long workflowTypeId, WorkflowIndexOptions options, PagerParameters pagerParameters, IEnumerable<long> itemIds)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
-            {
-                return Forbid();
-            }
+            return Forbid();
+        }
 
-            if (itemIds?.Count() > 0)
+        if (itemIds?.Count() > 0)
+        {
+            var checkedEntries = await _session.Query<Workflow, WorkflowIndex>().Where(x => x.DocumentId.IsIn(itemIds)).ListAsync();
+            switch (options.BulkAction)
             {
-                var checkedEntries = await _session.Query<Workflow, WorkflowIndex>().Where(x => x.DocumentId.IsIn(itemIds)).ListAsync();
-                switch (options.BulkAction)
-                {
-                    case WorkflowBulkAction.None:
-                        break;
-                    case WorkflowBulkAction.Delete:
-                        foreach (var entry in checkedEntries)
+                case WorkflowBulkAction.None:
+                    break;
+                case WorkflowBulkAction.Delete:
+                    foreach (var entry in checkedEntries)
+                    {
+                        var workflow = await _workflowStore.GetAsync(entry.Id);
+
+                        if (workflow != null)
                         {
-                            var workflow = await _workflowStore.GetAsync(entry.Id);
-
-                            if (workflow != null)
-                            {
-                                await _workflowStore.DeleteAsync(workflow);
-                                await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
-                            }
+                            await _workflowStore.DeleteAsync(workflow);
+                            await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflow.Id]);
                         }
-                        break;
+                    }
+                    break;
 
-                    default:
-                        return BadRequest();
-                }
+                default:
+                    return BadRequest();
             }
-            return RedirectToAction(nameof(Index), new { workflowTypeId, pagenum = pagerParameters.Page, pagesize = pagerParameters.PageSize });
         }
+        return RedirectToAction(nameof(Index), new { workflowTypeId, pagenum = pagerParameters.Page, pagesize = pagerParameters.PageSize });
+    }
 
-        private async Task<dynamic> BuildActivityDisplayAsync(ActivityContext activityContext, long workflowTypeId, bool isBlocking, string displayType)
-        {
-            var activityShape = await _activityDisplayManager.BuildDisplayAsync(activityContext.Activity, _updateModelAccessor.ModelUpdater, displayType);
-            activityShape.Metadata.Type = $"Activity_{displayType}ReadOnly";
-            activityShape.Properties["Activity"] = activityContext.Activity;
-            activityShape.Properties["ActivityRecord"] = activityContext.ActivityRecord;
-            activityShape.Properties["WorkflowTypeId"] = workflowTypeId;
-            activityShape.Properties["IsBlocking"] = isBlocking;
-
-            return activityShape;
-        }
+    private async Task<dynamic> BuildActivityDisplayAsync(ActivityContext activityContext, long workflowTypeId, bool isBlocking, string displayType)
+    {
+        var activityShape = await _activityDisplayManager.BuildDisplayAsync(activityContext.Activity, _updateModelAccessor.ModelUpdater, displayType);
+        activityShape.Metadata.Type = $"Activity_{displayType}ReadOnly";
+        activityShape.Properties["Activity"] = activityContext.Activity;
+        activityShape.Properties["ActivityRecord"] = activityContext.ActivityRecord;
+        activityShape.Properties["WorkflowTypeId"] = workflowTypeId;
+        activityShape.Properties["IsBlocking"] = isBlocking;
+
+        return activityShape;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/WorkflowTypeController.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/WorkflowTypeController.cs
index c2ed70ae565..904920ab05b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/WorkflowTypeController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/WorkflowTypeController.cs
@@ -34,554 +34,553 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.Workflows.Controllers
+namespace OrchardCore.Workflows.Controllers;
+
+[Admin("Workflows/Types/{action}/{id?}", "WorkflowTypes{action}")]
+public class WorkflowTypeController : Controller
 {
-    [Admin("Workflows/Types/{action}/{id?}", "WorkflowTypes{action}")]
-    public class WorkflowTypeController : Controller
+    private readonly PagerOptions _pagerOptions;
+    private readonly ISession _session;
+    private readonly IActivityLibrary _activityLibrary;
+    private readonly IWorkflowManager _workflowManager;
+    private readonly IWorkflowTypeStore _workflowTypeStore;
+    private readonly IWorkflowTypeIdGenerator _workflowTypeIdGenerator;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IActivityDisplayManager _activityDisplayManager;
+    private readonly INotifier _notifier;
+    private readonly IUpdateModelAccessor _updateModelAccessor;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly JsonSerializerOptions _documentJsonSerializerOptions;
+
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public WorkflowTypeController
+    (
+        IOptions<PagerOptions> pagerOptions,
+        ISession session,
+        IActivityLibrary activityLibrary,
+        IWorkflowManager workflowManager,
+        IWorkflowTypeStore workflowTypeStore,
+        IWorkflowTypeIdGenerator workflowTypeIdGenerator,
+        IAuthorizationService authorizationService,
+        IActivityDisplayManager activityDisplayManager,
+        IShapeFactory shapeFactory,
+        INotifier notifier,
+        IStringLocalizer<WorkflowTypeController> stringLocalizer,
+        IHtmlLocalizer<WorkflowTypeController> htmlLocalizer,
+        IUpdateModelAccessor updateModelAccessor,
+        IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions)
     {
-        private readonly PagerOptions _pagerOptions;
-        private readonly ISession _session;
-        private readonly IActivityLibrary _activityLibrary;
-        private readonly IWorkflowManager _workflowManager;
-        private readonly IWorkflowTypeStore _workflowTypeStore;
-        private readonly IWorkflowTypeIdGenerator _workflowTypeIdGenerator;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IActivityDisplayManager _activityDisplayManager;
-        private readonly INotifier _notifier;
-        private readonly IUpdateModelAccessor _updateModelAccessor;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly JsonSerializerOptions _documentJsonSerializerOptions;
-
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public WorkflowTypeController
-        (
-            IOptions<PagerOptions> pagerOptions,
-            ISession session,
-            IActivityLibrary activityLibrary,
-            IWorkflowManager workflowManager,
-            IWorkflowTypeStore workflowTypeStore,
-            IWorkflowTypeIdGenerator workflowTypeIdGenerator,
-            IAuthorizationService authorizationService,
-            IActivityDisplayManager activityDisplayManager,
-            IShapeFactory shapeFactory,
-            INotifier notifier,
-            IStringLocalizer<WorkflowTypeController> stringLocalizer,
-            IHtmlLocalizer<WorkflowTypeController> htmlLocalizer,
-            IUpdateModelAccessor updateModelAccessor,
-            IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions)
-        {
-            _pagerOptions = pagerOptions.Value;
-            _session = session;
-            _activityLibrary = activityLibrary;
-            _workflowManager = workflowManager;
-            _workflowTypeStore = workflowTypeStore;
-            _workflowTypeIdGenerator = workflowTypeIdGenerator;
-            _authorizationService = authorizationService;
-            _activityDisplayManager = activityDisplayManager;
-            _notifier = notifier;
-            _updateModelAccessor = updateModelAccessor;
-            _shapeFactory = shapeFactory;
-            S = stringLocalizer;
-            H = htmlLocalizer;
-            _documentJsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
-        }
+        _pagerOptions = pagerOptions.Value;
+        _session = session;
+        _activityLibrary = activityLibrary;
+        _workflowManager = workflowManager;
+        _workflowTypeStore = workflowTypeStore;
+        _workflowTypeIdGenerator = workflowTypeIdGenerator;
+        _authorizationService = authorizationService;
+        _activityDisplayManager = activityDisplayManager;
+        _notifier = notifier;
+        _updateModelAccessor = updateModelAccessor;
+        _shapeFactory = shapeFactory;
+        S = stringLocalizer;
+        H = htmlLocalizer;
+        _documentJsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
+    }
 
-        [Admin("Workflows/Types", "WorkflowTypes")]
-        public async Task<IActionResult> Index(WorkflowTypeIndexOptions options, PagerParameters pagerParameters)
+    [Admin("Workflows/Types", "WorkflowTypes")]
+    public async Task<IActionResult> Index(WorkflowTypeIndexOptions options, PagerParameters pagerParameters)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
-            {
-                return Forbid();
-            }
-
-            var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
-
-            options ??= new WorkflowTypeIndexOptions();
-
-            var query = _session.Query<WorkflowType, WorkflowTypeIndex>();
+            return Forbid();
+        }
 
-            if (!string.IsNullOrWhiteSpace(options.Search))
-            {
-                query = query.Where(x => x.Name.Contains(options.Search));
-            }
+        var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
 
-            switch (options.Order)
-            {
-                case WorkflowTypeOrder.Name:
-                    query = query.OrderBy(u => u.Name);
-                    break;
-            }
+        options ??= new WorkflowTypeIndexOptions();
 
-            var count = await query.CountAsync();
-
-            var workflowTypes = await query
-                .Skip(pager.GetStartIndex())
-                .Take(pager.PageSize)
-                .ListAsync();
-
-            var dialect = _session.Store.Configuration.SqlDialect;
-            var sqlBuilder = dialect.CreateBuilder(_session.Store.Configuration.TablePrefix);
-            sqlBuilder.Select();
-            sqlBuilder.Distinct();
-            sqlBuilder.Selector(nameof(WorkflowIndex), nameof(WorkflowIndex.WorkflowTypeId), _session.Store.Configuration.Schema);
-            sqlBuilder.Table(nameof(WorkflowIndex), alias: null, _session.Store.Configuration.Schema);
-
-            // Use existing session connection. Do not use 'using' or dispose the connection.
-            var connection = await _session.CreateConnectionAsync();
-            var workflowTypeIdsWithInstances = (await connection.QueryAsync<string>(sqlBuilder.ToSqlString(), param: null, _session.CurrentTransaction)).ToList();
-
-            // Maintain previous route data when generating page links.
-            var routeData = new RouteData();
-            routeData.Values.Add("Options.Filter", options.Filter);
-            routeData.Values.Add("Options.Order", options.Order);
-            if (!string.IsNullOrEmpty(options.Search))
-            {
-                routeData.Values.TryAdd("Options.Search", options.Search);
-            }
+        var query = _session.Query<WorkflowType, WorkflowTypeIndex>();
 
-            var pagerShape = await _shapeFactory.PagerAsync(pager, count, routeData);
-            var model = new WorkflowTypeIndexViewModel
-            {
-                WorkflowTypes = workflowTypes
-                    .Select(x => new WorkflowTypeEntry
-                    {
-                        WorkflowType = x,
-                        Id = x.Id,
-                        HasInstances = workflowTypeIdsWithInstances.Contains(x.WorkflowTypeId),
-                        Name = x.Name,
-                    })
-                    .ToList(),
-                Options = options,
-                Pager = pagerShape,
-            };
-
-            model.Options.WorkflowTypesBulkAction =
-            [
-                new SelectListItem(S["Delete"], nameof(WorkflowTypeBulkAction.Delete)),
-            ];
-
-            return View(model);
+        if (!string.IsNullOrWhiteSpace(options.Search))
+        {
+            query = query.Where(x => x.Name.Contains(options.Search));
         }
 
-        [HttpPost, ActionName(nameof(Index))]
-        [FormValueRequired("submit.Filter")]
-        public ActionResult IndexFilterPOST(WorkflowTypeIndexViewModel model)
-            => RedirectToAction(nameof(Index), new RouteValueDictionary
-            {
-                { "Options.Search", model.Options.Search },
-            });
-
-        [HttpPost]
-        [ActionName(nameof(Index))]
-        [FormValueRequired("submit.BulkAction")]
-        public async Task<IActionResult> BulkEdit(WorkflowTypeIndexOptions options, IEnumerable<long> itemIds)
+        switch (options.Order)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
-            {
-                return Forbid();
-            }
-
-            if (itemIds?.Count() > 0)
-            {
-                var checkedEntries = await _session.Query<WorkflowType, WorkflowTypeIndex>()
-                    .Where(x => x.DocumentId.IsIn(itemIds)).ListAsync();
-                switch (options.BulkAction)
-                {
-                    case WorkflowTypeBulkAction.None:
-                        break;
-                    case WorkflowTypeBulkAction.Export:
-                        return await ExportWorkflows(itemIds.ToArray());
-
-                    case WorkflowTypeBulkAction.Delete:
-                        foreach (var entry in checkedEntries)
-                        {
-                            var workflowType = await _workflowTypeStore.GetAsync(entry.Id);
-
-                            if (workflowType != null)
-                            {
-                                await _workflowTypeStore.DeleteAsync(workflowType);
-                                await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
-                            }
-                        }
-                        break;
-
-                    default:
-                        return BadRequest();
-                }
-            }
+            case WorkflowTypeOrder.Name:
+                query = query.OrderBy(u => u.Name);
+                break;
+        }
 
-            return RedirectToAction(nameof(Index));
+        var count = await query.CountAsync();
+
+        var workflowTypes = await query
+            .Skip(pager.GetStartIndex())
+            .Take(pager.PageSize)
+            .ListAsync();
+
+        var dialect = _session.Store.Configuration.SqlDialect;
+        var sqlBuilder = dialect.CreateBuilder(_session.Store.Configuration.TablePrefix);
+        sqlBuilder.Select();
+        sqlBuilder.Distinct();
+        sqlBuilder.Selector(nameof(WorkflowIndex), nameof(WorkflowIndex.WorkflowTypeId), _session.Store.Configuration.Schema);
+        sqlBuilder.Table(nameof(WorkflowIndex), alias: null, _session.Store.Configuration.Schema);
+
+        // Use existing session connection. Do not use 'using' or dispose the connection.
+        var connection = await _session.CreateConnectionAsync();
+        var workflowTypeIdsWithInstances = (await connection.QueryAsync<string>(sqlBuilder.ToSqlString(), param: null, _session.CurrentTransaction)).ToList();
+
+        // Maintain previous route data when generating page links.
+        var routeData = new RouteData();
+        routeData.Values.Add("Options.Filter", options.Filter);
+        routeData.Values.Add("Options.Order", options.Order);
+        if (!string.IsNullOrEmpty(options.Search))
+        {
+            routeData.Values.TryAdd("Options.Search", options.Search);
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Export(int id)
+        var pagerShape = await _shapeFactory.PagerAsync(pager, count, routeData);
+        var model = new WorkflowTypeIndexViewModel
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
-            {
-                return Forbid();
-            }
+            WorkflowTypes = workflowTypes
+                .Select(x => new WorkflowTypeEntry
+                {
+                    WorkflowType = x,
+                    Id = x.Id,
+                    HasInstances = workflowTypeIdsWithInstances.Contains(x.WorkflowTypeId),
+                    Name = x.Name,
+                })
+                .ToList(),
+            Options = options,
+            Pager = pagerShape,
+        };
 
-            return await ExportWorkflows(id);
-        }
+        model.Options.WorkflowTypesBulkAction =
+        [
+            new SelectListItem(S["Delete"], nameof(WorkflowTypeBulkAction.Delete)),
+        ];
 
-        public async Task<IActionResult> EditProperties(int? id, string returnUrl = null)
+        return View(model);
+    }
 
+    [HttpPost, ActionName(nameof(Index))]
+    [FormValueRequired("submit.Filter")]
+    public ActionResult IndexFilterPOST(WorkflowTypeIndexViewModel model)
+        => RedirectToAction(nameof(Index), new RouteValueDictionary
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
-            {
-                return Forbid();
-            }
-
-            if (id == null)
-            {
-                return View(new WorkflowTypePropertiesViewModel
-                {
-                    IsEnabled = true,
-                    ReturnUrl = returnUrl,
-                });
-            }
-            else
-            {
-                var workflowType = await _session.GetAsync<WorkflowType>(id.Value);
+            { "Options.Search", model.Options.Search },
+        });
 
-                return View(new WorkflowTypePropertiesViewModel
-                {
-                    Id = workflowType.Id,
-                    Name = workflowType.Name,
-                    IsEnabled = workflowType.IsEnabled,
-                    IsSingleton = workflowType.IsSingleton,
-                    LockTimeout = workflowType.LockTimeout,
-                    LockExpiration = workflowType.LockExpiration,
-                    DeleteFinishedWorkflows = workflowType.DeleteFinishedWorkflows,
-                    ReturnUrl = returnUrl,
-                });
-            }
+    [HttpPost]
+    [ActionName(nameof(Index))]
+    [FormValueRequired("submit.BulkAction")]
+    public async Task<IActionResult> BulkEdit(WorkflowTypeIndexOptions options, IEnumerable<long> itemIds)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
+        {
+            return Forbid();
         }
 
-        [HttpPost]
-        public async Task<IActionResult> EditProperties(WorkflowTypePropertiesViewModel viewModel, long? id)
+        if (itemIds?.Count() > 0)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
+            var checkedEntries = await _session.Query<WorkflowType, WorkflowTypeIndex>()
+                .Where(x => x.DocumentId.IsIn(itemIds)).ListAsync();
+            switch (options.BulkAction)
             {
-                return Forbid();
-            }
+                case WorkflowTypeBulkAction.None:
+                    break;
+                case WorkflowTypeBulkAction.Export:
+                    return await ExportWorkflows(itemIds.ToArray());
 
-            if (!ModelState.IsValid)
-            {
-                return View(viewModel);
-            }
+                case WorkflowTypeBulkAction.Delete:
+                    foreach (var entry in checkedEntries)
+                    {
+                        var workflowType = await _workflowTypeStore.GetAsync(entry.Id);
 
-            var isNew = id == null;
-            var workflowType = default(WorkflowType);
+                        if (workflowType != null)
+                        {
+                            await _workflowTypeStore.DeleteAsync(workflowType);
+                            await _notifier.SuccessAsync(H["Workflow {0} has been deleted.", workflowType.Name]);
+                        }
+                    }
+                    break;
 
-            if (isNew)
-            {
-                workflowType = new WorkflowType();
-                workflowType.WorkflowTypeId = _workflowTypeIdGenerator.GenerateUniqueId(workflowType);
+                default:
+                    return BadRequest();
             }
-            else
-            {
-                workflowType = await _session.GetAsync<WorkflowType>(id.Value);
+        }
 
-                if (workflowType == null)
-                {
-                    return NotFound();
-                }
-            }
+        return RedirectToAction(nameof(Index));
+    }
 
-            workflowType.Name = viewModel.Name?.Trim();
-            workflowType.IsEnabled = viewModel.IsEnabled;
-            workflowType.IsSingleton = viewModel.IsSingleton;
-            workflowType.LockTimeout = viewModel.LockTimeout;
-            workflowType.LockExpiration = viewModel.LockExpiration;
-            workflowType.DeleteFinishedWorkflows = viewModel.DeleteFinishedWorkflows;
+    [HttpPost]
+    public async Task<IActionResult> Export(int id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
+        {
+            return Forbid();
+        }
 
-            await _workflowTypeStore.SaveAsync(workflowType);
+        return await ExportWorkflows(id);
+    }
 
-            return isNew
-                ? RedirectToAction(nameof(Edit), new
-                {
-                    workflowType.Id,
-                })
-                : Url.IsLocalUrl(viewModel.ReturnUrl)
-                    ? (IActionResult)this.Redirect(viewModel.ReturnUrl, true)
-                    : RedirectToAction(nameof(Index));
-        }
+    public async Task<IActionResult> EditProperties(int? id, string returnUrl = null)
 
-        public async Task<IActionResult> Duplicate(long id, string returnUrl = null)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
-            {
-                return Forbid();
-            }
-
-            var workflowType = await _session.GetAsync<WorkflowType>(id);
+            return Forbid();
+        }
 
-            if (workflowType == null)
+        if (id == null)
+        {
+            return View(new WorkflowTypePropertiesViewModel
             {
-                return NotFound();
-            }
+                IsEnabled = true,
+                ReturnUrl = returnUrl,
+            });
+        }
+        else
+        {
+            var workflowType = await _session.GetAsync<WorkflowType>(id.Value);
 
             return View(new WorkflowTypePropertiesViewModel
             {
-                Id = id,
+                Id = workflowType.Id,
+                Name = workflowType.Name,
+                IsEnabled = workflowType.IsEnabled,
                 IsSingleton = workflowType.IsSingleton,
                 LockTimeout = workflowType.LockTimeout,
                 LockExpiration = workflowType.LockExpiration,
-                Name = "Copy-" + workflowType.Name,
-                IsEnabled = workflowType.IsEnabled,
+                DeleteFinishedWorkflows = workflowType.DeleteFinishedWorkflows,
                 ReturnUrl = returnUrl,
             });
         }
+    }
 
-        [HttpPost]
-        public async Task<IActionResult> Duplicate(WorkflowTypePropertiesViewModel viewModel, long id)
+    [HttpPost]
+    public async Task<IActionResult> EditProperties(WorkflowTypePropertiesViewModel viewModel, long? id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
-            {
-                return Forbid();
-            }
-
-            if (!ModelState.IsValid)
-            {
-                return View(viewModel);
-            }
-
-            var existingWorkflowType = await _session.GetAsync<WorkflowType>(id);
-            var workflowType = new WorkflowType();
-            workflowType.WorkflowTypeId = _workflowTypeIdGenerator.GenerateUniqueId(workflowType);
+            return Forbid();
+        }
 
-            workflowType.Name = viewModel.Name?.Trim();
-            workflowType.IsEnabled = viewModel.IsEnabled;
-            workflowType.IsSingleton = viewModel.IsSingleton;
-            workflowType.LockTimeout = viewModel.LockTimeout;
-            workflowType.LockExpiration = viewModel.LockExpiration;
-            workflowType.DeleteFinishedWorkflows = viewModel.DeleteFinishedWorkflows;
-            workflowType.Activities = existingWorkflowType.Activities;
-            workflowType.Transitions = existingWorkflowType.Transitions;
+        if (!ModelState.IsValid)
+        {
+            return View(viewModel);
+        }
 
-            await _workflowTypeStore.SaveAsync(workflowType);
+        var isNew = id == null;
+        var workflowType = default(WorkflowType);
 
-            return RedirectToAction(nameof(Edit), new
-            {
-                workflowType.Id,
-            });
+        if (isNew)
+        {
+            workflowType = new WorkflowType();
+            workflowType.WorkflowTypeId = _workflowTypeIdGenerator.GenerateUniqueId(workflowType);
         }
-
-        public async Task<IActionResult> Edit(long id, string localId)
+        else
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
-            {
-                return Forbid();
-            }
-
-            var newLocalId = string.IsNullOrWhiteSpace(localId) ? Guid.NewGuid().ToString() : localId;
-            var availableActivities = _activityLibrary.ListActivities();
-            var workflowType = await _session.GetAsync<WorkflowType>(id);
+            workflowType = await _session.GetAsync<WorkflowType>(id.Value);
 
             if (workflowType == null)
             {
                 return NotFound();
             }
+        }
 
-            var workflow = _workflowManager.NewWorkflow(workflowType);
-            var workflowContext = await _workflowManager.CreateWorkflowExecutionContextAsync(workflowType, workflow);
-            var activityContexts = await Task.WhenAll(workflowType.Activities.Select(x =>
-                _workflowManager.CreateActivityExecutionContextAsync(x, x.Properties)));
-            var workflowCount = await _session
-                .QueryIndex<WorkflowIndex>(x => x.WorkflowTypeId == workflowType.WorkflowTypeId).CountAsync();
+        workflowType.Name = viewModel.Name?.Trim();
+        workflowType.IsEnabled = viewModel.IsEnabled;
+        workflowType.IsSingleton = viewModel.IsSingleton;
+        workflowType.LockTimeout = viewModel.LockTimeout;
+        workflowType.LockExpiration = viewModel.LockExpiration;
+        workflowType.DeleteFinishedWorkflows = viewModel.DeleteFinishedWorkflows;
 
-            var activityThumbnailShapes = new List<dynamic>();
-            var index = 0;
+        await _workflowTypeStore.SaveAsync(workflowType);
 
-            foreach (var activity in availableActivities)
+        return isNew
+            ? RedirectToAction(nameof(Edit), new
             {
-                activityThumbnailShapes.Add(await BuildActivityDisplay(activity, index++, id, newLocalId, "Thumbnail"));
-            }
+                workflowType.Id,
+            })
+            : Url.IsLocalUrl(viewModel.ReturnUrl)
+                ? (IActionResult)this.Redirect(viewModel.ReturnUrl, true)
+                : RedirectToAction(nameof(Index));
+    }
 
-            var activityDesignShapes = new List<dynamic>();
-            index = 0;
+    public async Task<IActionResult> Duplicate(long id, string returnUrl = null)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
+        {
+            return Forbid();
+        }
 
-            foreach (var activityContext in activityContexts)
-            {
-                activityDesignShapes.Add(await BuildActivityDisplay(activityContext, index++, id, newLocalId, "Design"));
-            }
+        var workflowType = await _session.GetAsync<WorkflowType>(id);
 
-            var activitiesDataQuery = activityContexts.Select(x => new
-            {
-                Id = x.ActivityRecord.ActivityId,
-                x.ActivityRecord.X,
-                x.ActivityRecord.Y,
-                x.ActivityRecord.Name,
-                x.ActivityRecord.IsStart,
-                IsEvent = x.Activity.IsEvent(),
-                Outcomes = x.Activity.GetPossibleOutcomes(workflowContext, x).ToArray(),
-            });
+        if (workflowType == null)
+        {
+            return NotFound();
+        }
 
-            var workflowTypeData = new
-            {
-                workflowType.Id,
-                workflowType.Name,
-                workflowType.IsEnabled,
-                Activities = activitiesDataQuery.ToArray(),
-                workflowType.Transitions,
-            };
+        return View(new WorkflowTypePropertiesViewModel
+        {
+            Id = id,
+            IsSingleton = workflowType.IsSingleton,
+            LockTimeout = workflowType.LockTimeout,
+            LockExpiration = workflowType.LockExpiration,
+            Name = "Copy-" + workflowType.Name,
+            IsEnabled = workflowType.IsEnabled,
+            ReturnUrl = returnUrl,
+        });
+    }
 
-            var viewModel = new WorkflowTypeViewModel
-            {
-                WorkflowType = workflowType,
-                WorkflowTypeJson = JConvert.SerializeObject(workflowTypeData, JOptions.CamelCase),
-                ActivityThumbnailShapes = activityThumbnailShapes,
-                ActivityDesignShapes = activityDesignShapes,
-                ActivityCategories = _activityLibrary.ListCategories().ToList(),
-                LocalId = newLocalId,
-                LoadLocalState = !string.IsNullOrWhiteSpace(localId),
-                WorkflowCount = workflowCount,
-            };
+    [HttpPost]
+    public async Task<IActionResult> Duplicate(WorkflowTypePropertiesViewModel viewModel, long id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
+        {
+            return Forbid();
+        }
 
+        if (!ModelState.IsValid)
+        {
             return View(viewModel);
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Edit(WorkflowTypeUpdateModel model)
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
-            {
-                return Forbid();
-            }
+        var existingWorkflowType = await _session.GetAsync<WorkflowType>(id);
+        var workflowType = new WorkflowType();
+        workflowType.WorkflowTypeId = _workflowTypeIdGenerator.GenerateUniqueId(workflowType);
 
-            var workflowType = await _workflowTypeStore.GetAsync(model.Id);
-            var state = JObject.Parse(model.State);
-            var currentActivities = workflowType.Activities.ToDictionary(x => x.ActivityId);
-            var activities = state["activities"] as JsonArray;
+        workflowType.Name = viewModel.Name?.Trim();
+        workflowType.IsEnabled = viewModel.IsEnabled;
+        workflowType.IsSingleton = viewModel.IsSingleton;
+        workflowType.LockTimeout = viewModel.LockTimeout;
+        workflowType.LockExpiration = viewModel.LockExpiration;
+        workflowType.DeleteFinishedWorkflows = viewModel.DeleteFinishedWorkflows;
+        workflowType.Activities = existingWorkflowType.Activities;
+        workflowType.Transitions = existingWorkflowType.Transitions;
 
-            var postedActivities = JArray.FromObject(activities).ToDictionary(x => x["id"]?.ToString());
-            var removedActivityIdsQuery =
-                from activityId in currentActivities.Keys
-                where !postedActivities.ContainsKey(activityId)
-                select activityId;
-            var removedActivityIds = removedActivityIdsQuery.ToList();
+        await _workflowTypeStore.SaveAsync(workflowType);
 
-            // Remove any orphans (activities deleted on the client).
-            foreach (var activityId in removedActivityIds)
-            {
-                var activityToRemove = currentActivities[activityId];
-                workflowType.Activities.Remove(activityToRemove);
-                currentActivities.Remove(activityId);
-            }
+        return RedirectToAction(nameof(Edit), new
+        {
+            workflowType.Id,
+        });
+    }
 
-            // Update activities.
-            foreach (var activityState in activities)
-            {
-                var activity = currentActivities[activityState["id"].ToString()];
-                activity.X = (int)Math.Round(Convert.ToDecimal(activityState["x"].ToString(), CultureInfo.InvariantCulture), 0);
-                activity.Y = (int)Math.Round(Convert.ToDecimal(activityState["y"].ToString(), CultureInfo.InvariantCulture), 0);
-                activity.IsStart = Convert.ToBoolean(activityState["isStart"].ToString());
-            }
+    public async Task<IActionResult> Edit(long id, string localId)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
+        {
+            return Forbid();
+        }
 
-            // Update transitions.
-            workflowType.Transitions.Clear();
+        var newLocalId = string.IsNullOrWhiteSpace(localId) ? Guid.NewGuid().ToString() : localId;
+        var availableActivities = _activityLibrary.ListActivities();
+        var workflowType = await _session.GetAsync<WorkflowType>(id);
 
-            var transitions = state["transitions"] as JsonArray;
+        if (workflowType == null)
+        {
+            return NotFound();
+        }
 
-            foreach (var transitionState in transitions)
-            {
-                workflowType.Transitions.Add(new Transition
-                {
-                    SourceActivityId = transitionState["sourceActivityId"]?.ToString(),
-                    DestinationActivityId = transitionState["destinationActivityId"]?.ToString(),
-                    SourceOutcomeName = transitionState["sourceOutcomeName"]?.ToString(),
-                });
-            }
+        var workflow = _workflowManager.NewWorkflow(workflowType);
+        var workflowContext = await _workflowManager.CreateWorkflowExecutionContextAsync(workflowType, workflow);
+        var activityContexts = await Task.WhenAll(workflowType.Activities.Select(x =>
+            _workflowManager.CreateActivityExecutionContextAsync(x, x.Properties)));
+        var workflowCount = await _session
+            .QueryIndex<WorkflowIndex>(x => x.WorkflowTypeId == workflowType.WorkflowTypeId).CountAsync();
 
-            await _workflowTypeStore.SaveAsync(workflowType);
-            await _notifier.SuccessAsync(H["Workflow has been saved."]);
+        var activityThumbnailShapes = new List<dynamic>();
+        var index = 0;
 
-            return RedirectToAction(nameof(Edit), new
-            {
-                id = model.Id,
-            });
+        foreach (var activity in availableActivities)
+        {
+            activityThumbnailShapes.Add(await BuildActivityDisplay(activity, index++, id, newLocalId, "Thumbnail"));
         }
 
-        [HttpPost]
-        public async Task<IActionResult> Delete(long id)
+        var activityDesignShapes = new List<dynamic>();
+        index = 0;
+
+        foreach (var activityContext in activityContexts)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
-            {
-                return Forbid();
-            }
+            activityDesignShapes.Add(await BuildActivityDisplay(activityContext, index++, id, newLocalId, "Design"));
+        }
 
-            var workflowType = await _workflowTypeStore.GetAsync(id);
+        var activitiesDataQuery = activityContexts.Select(x => new
+        {
+            Id = x.ActivityRecord.ActivityId,
+            x.ActivityRecord.X,
+            x.ActivityRecord.Y,
+            x.ActivityRecord.Name,
+            x.ActivityRecord.IsStart,
+            IsEvent = x.Activity.IsEvent(),
+            Outcomes = x.Activity.GetPossibleOutcomes(workflowContext, x).ToArray(),
+        });
+
+        var workflowTypeData = new
+        {
+            workflowType.Id,
+            workflowType.Name,
+            workflowType.IsEnabled,
+            Activities = activitiesDataQuery.ToArray(),
+            workflowType.Transitions,
+        };
+
+        var viewModel = new WorkflowTypeViewModel
+        {
+            WorkflowType = workflowType,
+            WorkflowTypeJson = JConvert.SerializeObject(workflowTypeData, JOptions.CamelCase),
+            ActivityThumbnailShapes = activityThumbnailShapes,
+            ActivityDesignShapes = activityDesignShapes,
+            ActivityCategories = _activityLibrary.ListCategories().ToList(),
+            LocalId = newLocalId,
+            LoadLocalState = !string.IsNullOrWhiteSpace(localId),
+            WorkflowCount = workflowCount,
+        };
+
+        return View(viewModel);
+    }
 
-            if (workflowType == null)
-            {
-                return NotFound();
-            }
+    [HttpPost]
+    public async Task<IActionResult> Edit(WorkflowTypeUpdateModel model)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
+        {
+            return Forbid();
+        }
 
-            await _workflowTypeStore.DeleteAsync(workflowType);
-            await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
+        var workflowType = await _workflowTypeStore.GetAsync(model.Id);
+        var state = JObject.Parse(model.State);
+        var currentActivities = workflowType.Activities.ToDictionary(x => x.ActivityId);
+        var activities = state["activities"] as JsonArray;
 
-            return RedirectToAction(nameof(Index));
-        }
+        var postedActivities = JArray.FromObject(activities).ToDictionary(x => x["id"]?.ToString());
+        var removedActivityIdsQuery =
+            from activityId in currentActivities.Keys
+            where !postedActivities.ContainsKey(activityId)
+            select activityId;
+        var removedActivityIds = removedActivityIdsQuery.ToList();
 
-        private async Task<dynamic> BuildActivityDisplay(IActivity activity, int index, long workflowTypeId,
-            string localId, string displayType)
+        // Remove any orphans (activities deleted on the client).
+        foreach (var activityId in removedActivityIds)
         {
-            var activityShape = await _activityDisplayManager.BuildDisplayAsync(activity, _updateModelAccessor.ModelUpdater, displayType);
-            activityShape.Metadata.Type = $"Activity_{displayType}";
-            activityShape.Properties["Activity"] = activity;
-            activityShape.Properties["WorkflowTypeId"] = workflowTypeId;
-            activityShape.Properties["Index"] = index;
-            activityShape.Properties["ReturnUrl"] = Url.Action(nameof(Edit), new
-            {
-                id = workflowTypeId,
-                localId,
-            });
+            var activityToRemove = currentActivities[activityId];
+            workflowType.Activities.Remove(activityToRemove);
+            currentActivities.Remove(activityId);
+        }
 
-            return activityShape;
+        // Update activities.
+        foreach (var activityState in activities)
+        {
+            var activity = currentActivities[activityState["id"].ToString()];
+            activity.X = (int)Math.Round(Convert.ToDecimal(activityState["x"].ToString(), CultureInfo.InvariantCulture), 0);
+            activity.Y = (int)Math.Round(Convert.ToDecimal(activityState["y"].ToString(), CultureInfo.InvariantCulture), 0);
+            activity.IsStart = Convert.ToBoolean(activityState["isStart"].ToString());
         }
 
-        private async Task<dynamic> BuildActivityDisplay(ActivityContext activityContext, int index, long workflowTypeId,
-            string localId, string displayType)
+        // Update transitions.
+        workflowType.Transitions.Clear();
+
+        var transitions = state["transitions"] as JsonArray;
+
+        foreach (var transitionState in transitions)
         {
-            var activityShape = await _activityDisplayManager.BuildDisplayAsync(activityContext.Activity, _updateModelAccessor.ModelUpdater, displayType);
-            activityShape.Metadata.Type = $"Activity_{displayType}";
-            activityShape.Properties["Activity"] = activityContext.Activity;
-            activityShape.Properties["ActivityRecord"] = activityContext.ActivityRecord;
-            activityShape.Properties["WorkflowTypeId"] = workflowTypeId;
-            activityShape.Properties["Index"] = index;
-            activityShape.Properties["ReturnUrl"] = Url.Action(nameof(Edit), new
+            workflowType.Transitions.Add(new Transition
             {
-                id = workflowTypeId,
-                localId,
+                SourceActivityId = transitionState["sourceActivityId"]?.ToString(),
+                DestinationActivityId = transitionState["destinationActivityId"]?.ToString(),
+                SourceOutcomeName = transitionState["sourceOutcomeName"]?.ToString(),
             });
+        }
+
+        await _workflowTypeStore.SaveAsync(workflowType);
+        await _notifier.SuccessAsync(H["Workflow has been saved."]);
 
-            return activityShape;
+        return RedirectToAction(nameof(Edit), new
+        {
+            id = model.Id,
+        });
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Delete(long id)
+    {
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
+        {
+            return Forbid();
         }
 
-        private async Task<IActionResult> ExportWorkflows(params long[] itemIds)
+        var workflowType = await _workflowTypeStore.GetAsync(id);
+
+        if (workflowType == null)
         {
-            using var fileBuilder = new TemporaryFileBuilder();
-            var archiveFileName = fileBuilder.Folder + ".zip";
-            var recipeDescriptor = new RecipeDescriptor();
-            var deploymentPlanResult = new DeploymentPlanResult(fileBuilder, recipeDescriptor);
-            var workflowTypes = await _workflowTypeStore.GetAsync(itemIds);
+            return NotFound();
+        }
 
-            AllWorkflowTypeDeploymentSource.ProcessWorkflowType(deploymentPlanResult, workflowTypes, _documentJsonSerializerOptions);
+        await _workflowTypeStore.DeleteAsync(workflowType);
+        await _notifier.SuccessAsync(H["Workflow {0} deleted", workflowType.Name]);
 
-            await deploymentPlanResult.FinalizeAsync();
-            ZipFile.CreateFromDirectory(fileBuilder.Folder, archiveFileName);
+        return RedirectToAction(nameof(Index));
+    }
 
-            var packageName = itemIds.Length == 1
-                ? workflowTypes.FirstOrDefault().Name
-                : S["Workflow Types"];
+    private async Task<dynamic> BuildActivityDisplay(IActivity activity, int index, long workflowTypeId,
+        string localId, string displayType)
+    {
+        var activityShape = await _activityDisplayManager.BuildDisplayAsync(activity, _updateModelAccessor.ModelUpdater, displayType);
+        activityShape.Metadata.Type = $"Activity_{displayType}";
+        activityShape.Properties["Activity"] = activity;
+        activityShape.Properties["WorkflowTypeId"] = workflowTypeId;
+        activityShape.Properties["Index"] = index;
+        activityShape.Properties["ReturnUrl"] = Url.Action(nameof(Edit), new
+        {
+            id = workflowTypeId,
+            localId,
+        });
 
-            return new PhysicalFileResult(archiveFileName, "application/zip")
-            {
-                FileDownloadName = packageName + ".zip",
-            };
-        }
+        return activityShape;
+    }
+
+    private async Task<dynamic> BuildActivityDisplay(ActivityContext activityContext, int index, long workflowTypeId,
+        string localId, string displayType)
+    {
+        var activityShape = await _activityDisplayManager.BuildDisplayAsync(activityContext.Activity, _updateModelAccessor.ModelUpdater, displayType);
+        activityShape.Metadata.Type = $"Activity_{displayType}";
+        activityShape.Properties["Activity"] = activityContext.Activity;
+        activityShape.Properties["ActivityRecord"] = activityContext.ActivityRecord;
+        activityShape.Properties["WorkflowTypeId"] = workflowTypeId;
+        activityShape.Properties["Index"] = index;
+        activityShape.Properties["ReturnUrl"] = Url.Action(nameof(Edit), new
+        {
+            id = workflowTypeId,
+            localId,
+        });
+
+        return activityShape;
+    }
+
+    private async Task<IActionResult> ExportWorkflows(params long[] itemIds)
+    {
+        using var fileBuilder = new TemporaryFileBuilder();
+        var archiveFileName = fileBuilder.Folder + ".zip";
+        var recipeDescriptor = new RecipeDescriptor();
+        var deploymentPlanResult = new DeploymentPlanResult(fileBuilder, recipeDescriptor);
+        var workflowTypes = await _workflowTypeStore.GetAsync(itemIds);
+
+        AllWorkflowTypeDeploymentSource.ProcessWorkflowType(deploymentPlanResult, workflowTypes, _documentJsonSerializerOptions);
+
+        await deploymentPlanResult.FinalizeAsync();
+        ZipFile.CreateFromDirectory(fileBuilder.Folder, archiveFileName);
+
+        var packageName = itemIds.Length == 1
+            ? workflowTypes.FirstOrDefault().Name
+            : S["Workflow Types"];
+
+        return new PhysicalFileResult(archiveFileName, "application/zip")
+        {
+            FileDownloadName = packageName + ".zip",
+        };
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Deployment/AllWorkflowTypeDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Deployment/AllWorkflowTypeDeploymentSource.cs
index 312fd277090..aee6362d1cd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Deployment/AllWorkflowTypeDeploymentSource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Deployment/AllWorkflowTypeDeploymentSource.cs
@@ -8,49 +8,48 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Deployment
+namespace OrchardCore.Workflows.Deployment;
+
+public class AllWorkflowTypeDeploymentSource : IDeploymentSource
 {
-    public class AllWorkflowTypeDeploymentSource : IDeploymentSource
+    private readonly IWorkflowTypeStore _workflowTypeStore;
+    private readonly JsonSerializerOptions _jsonSerializerOptions;
+
+    public AllWorkflowTypeDeploymentSource(
+        IWorkflowTypeStore workflowTypeStore,
+        IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions)
     {
-        private readonly IWorkflowTypeStore _workflowTypeStore;
-        private readonly JsonSerializerOptions _jsonSerializerOptions;
+        _workflowTypeStore = workflowTypeStore;
+        _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
+    }
 
-        public AllWorkflowTypeDeploymentSource(
-            IWorkflowTypeStore workflowTypeStore,
-            IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        if (step is not AllWorkflowTypeDeploymentStep)
         {
-            _workflowTypeStore = workflowTypeStore;
-            _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+        ProcessWorkflowType(result, await _workflowTypeStore.ListAsync(), _jsonSerializerOptions);
+    }
+
+    public static void ProcessWorkflowType(DeploymentPlanResult result, IEnumerable<WorkflowType> workflowTypes, JsonSerializerOptions jsonSerializerOptions)
+    {
+        var data = new JsonArray();
+
+        foreach (var workflowType in workflowTypes)
         {
-            if (step is not AllWorkflowTypeDeploymentStep)
-            {
-                return;
-            }
+            var objectData = JObject.FromObject(workflowType, jsonSerializerOptions);
 
-            ProcessWorkflowType(result, await _workflowTypeStore.ListAsync(), _jsonSerializerOptions);
+            // Don't serialize the Id as it could be interpreted as an updated object when added back to YesSql
+            objectData.Remove(nameof(workflowType.Id));
+            data.Add(objectData);
         }
 
-        public static void ProcessWorkflowType(DeploymentPlanResult result, IEnumerable<WorkflowType> workflowTypes, JsonSerializerOptions jsonSerializerOptions)
+        result.Steps.Add(new JsonObject
         {
-            var data = new JsonArray();
-            
-            foreach (var workflowType in workflowTypes)
-            {
-                var objectData = JObject.FromObject(workflowType, jsonSerializerOptions);
-
-                // Don't serialize the Id as it could be interpreted as an updated object when added back to YesSql
-                objectData.Remove(nameof(workflowType.Id));
-                data.Add(objectData);
-            }
-
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "WorkflowType",
-                ["data"] = data,
-            });
-        }
+            ["name"] = "WorkflowType",
+            ["data"] = data,
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Deployment/AllWorkflowTypeDeploymentStep.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Deployment/AllWorkflowTypeDeploymentStep.cs
index f204dbe66a9..99b07b46bb2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Deployment/AllWorkflowTypeDeploymentStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Deployment/AllWorkflowTypeDeploymentStep.cs
@@ -1,12 +1,11 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Workflows.Deployment
+namespace OrchardCore.Workflows.Deployment;
+
+public class AllWorkflowTypeDeploymentStep : DeploymentStep
 {
-    public class AllWorkflowTypeDeploymentStep : DeploymentStep
+    public AllWorkflowTypeDeploymentStep()
     {
-        public AllWorkflowTypeDeploymentStep()
-        {
-            Name = "AllWorkflowType";
-        }
+        Name = "AllWorkflowType";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Deployment/AllWorkflowTypeDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Deployment/AllWorkflowTypeDeploymentStepDriver.cs
index c08f770a224..8c649d4ac4f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Deployment/AllWorkflowTypeDeploymentStepDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Deployment/AllWorkflowTypeDeploymentStepDriver.cs
@@ -3,22 +3,21 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Workflows.Deployment
+namespace OrchardCore.Workflows.Deployment;
+
+public sealed class AllWorkflowTypeDeploymentStepDriver : DisplayDriver<DeploymentStep, AllWorkflowTypeDeploymentStep>
 {
-    public sealed class AllWorkflowTypeDeploymentStepDriver : DisplayDriver<DeploymentStep, AllWorkflowTypeDeploymentStep>
+    public override Task<IDisplayResult> DisplayAsync(AllWorkflowTypeDeploymentStep step, BuildDisplayContext context)
     {
-        public override Task<IDisplayResult> DisplayAsync(AllWorkflowTypeDeploymentStep step, BuildDisplayContext context)
-        {
-            return
-                CombineAsync(
-                    View("AllWorkflowTypeDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
-                    View("AllWorkflowTypeDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
-                );
-        }
+        return
+            CombineAsync(
+                View("AllWorkflowTypeDeploymentStep_Fields_Summary", step).Location("Summary", "Content"),
+                View("AllWorkflowTypeDeploymentStep_Fields_Thumbnail", step).Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(AllWorkflowTypeDeploymentStep step, BuildEditorContext context)
-        {
-            return View("AllWorkflowTypeDeploymentStep_Fields_Edit", step).Location("Content");
-        }
+    public override IDisplayResult Edit(AllWorkflowTypeDeploymentStep step, BuildEditorContext context)
+    {
+        return View("AllWorkflowTypeDeploymentStep_Fields_Edit", step).Location("Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ActivityMetadataDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ActivityMetadataDisplayDriver.cs
index 51a3ffc25d7..ecd636464f7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ActivityMetadataDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ActivityMetadataDisplayDriver.cs
@@ -6,27 +6,26 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Workflows.Drivers
+namespace OrchardCore.Workflows.Drivers;
+
+public sealed class ActivityMetadataDisplayDriver : SectionDisplayDriver<IActivity, ActivityMetadata>
 {
-    public sealed class ActivityMetadataDisplayDriver : SectionDisplayDriver<IActivity, ActivityMetadata>
+    public override IDisplayResult Edit(IActivity activity, ActivityMetadata section, BuildEditorContext context)
     {
-        public override IDisplayResult Edit(IActivity activity, ActivityMetadata section, BuildEditorContext context)
+        return Initialize<ActivityMetadataEditViewModel>("ActivityMetadata_Edit", viewModel =>
         {
-            return Initialize<ActivityMetadataEditViewModel>("ActivityMetadata_Edit", viewModel =>
-            {
-                viewModel.Title = section.Title;
-            }).Location("Content:before");
-        }
+            viewModel.Title = section.Title;
+        }).Location("Content:before");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(IActivity activity, ActivityMetadata section, UpdateEditorContext context)
-        {
-            var viewModel = new ActivityMetadataEditViewModel();
+    public override async Task<IDisplayResult> UpdateAsync(IActivity activity, ActivityMetadata section, UpdateEditorContext context)
+    {
+        var viewModel = new ActivityMetadataEditViewModel();
 
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
 
-            section.Title = viewModel.Title?.Trim();
+        section.Title = viewModel.Title?.Trim();
 
-            return await EditAsync(activity, section, context);
-        }
+        return await EditAsync(activity, section, context);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/CommitTransactionTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/CommitTransactionTaskDisplayDriver.cs
index f9887ce9383..311eac1c130 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/CommitTransactionTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/CommitTransactionTaskDisplayDriver.cs
@@ -2,16 +2,15 @@
 using OrchardCore.Workflows.Display;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Workflows.Drivers
+namespace OrchardCore.Workflows.Drivers;
+
+public sealed class CommitTransactionTaskDisplayDriver : ActivityDisplayDriver<CommitTransactionTask, CommitTransactionTaskViewModel>
 {
-    public sealed class CommitTransactionTaskDisplayDriver : ActivityDisplayDriver<CommitTransactionTask, CommitTransactionTaskViewModel>
+    protected override void EditActivity(CommitTransactionTask activity, CommitTransactionTaskViewModel model)
     {
-        protected override void EditActivity(CommitTransactionTask activity, CommitTransactionTaskViewModel model)
-        {
-        }
+    }
 
-        protected override void UpdateActivity(CommitTransactionTaskViewModel model, CommitTransactionTask activity)
-        {
-        }
+    protected override void UpdateActivity(CommitTransactionTaskViewModel model, CommitTransactionTask activity)
+    {
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/CorrelateTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/CorrelateTaskDisplayDriver.cs
index 840e863a95b..ae589a6cdf7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/CorrelateTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/CorrelateTaskDisplayDriver.cs
@@ -3,20 +3,19 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Workflows.Drivers
+namespace OrchardCore.Workflows.Drivers;
+
+public sealed class CorrelateTaskDisplayDriver : ActivityDisplayDriver<CorrelateTask, CorrelateTaskViewModel>
 {
-    public sealed class CorrelateTaskDisplayDriver : ActivityDisplayDriver<CorrelateTask, CorrelateTaskViewModel>
+    protected override void EditActivity(CorrelateTask activity, CorrelateTaskViewModel model)
     {
-        protected override void EditActivity(CorrelateTask activity, CorrelateTaskViewModel model)
-        {
-            model.Value = activity.Value.Expression;
-            model.Syntax = activity.Syntax;
-        }
+        model.Value = activity.Value.Expression;
+        model.Syntax = activity.Syntax;
+    }
 
-        protected override void UpdateActivity(CorrelateTaskViewModel model, CorrelateTask activity)
-        {
-            activity.Value = new WorkflowExpression<string>(model.Value);
-            activity.Syntax = model.Syntax;
-        }
+    protected override void UpdateActivity(CorrelateTaskViewModel model, CorrelateTask activity)
+    {
+        activity.Value = new WorkflowExpression<string>(model.Value);
+        activity.Syntax = model.Syntax;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ForEachTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ForEachTaskDisplayDriver.cs
index d0e43a256a1..61af49af542 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ForEachTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ForEachTaskDisplayDriver.cs
@@ -4,20 +4,19 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Workflows.Drivers
+namespace OrchardCore.Workflows.Drivers;
+
+public sealed class ForEachTaskDisplayDriver : ActivityDisplayDriver<ForEachTask, ForEachTaskViewModel>
 {
-    public sealed class ForEachTaskDisplayDriver : ActivityDisplayDriver<ForEachTask, ForEachTaskViewModel>
+    protected override void EditActivity(ForEachTask activity, ForEachTaskViewModel model)
     {
-        protected override void EditActivity(ForEachTask activity, ForEachTaskViewModel model)
-        {
-            model.EnumerableExpression = activity.Enumerable.Expression;
-            model.LoopVariableName = activity.LoopVariableName;
-        }
+        model.EnumerableExpression = activity.Enumerable.Expression;
+        model.LoopVariableName = activity.LoopVariableName;
+    }
 
-        protected override void UpdateActivity(ForEachTaskViewModel model, ForEachTask activity)
-        {
-            activity.LoopVariableName = model.LoopVariableName;
-            activity.Enumerable = new WorkflowExpression<IEnumerable<object>>(model.EnumerableExpression);
-        }
+    protected override void UpdateActivity(ForEachTaskViewModel model, ForEachTask activity)
+    {
+        activity.LoopVariableName = model.LoopVariableName;
+        activity.Enumerable = new WorkflowExpression<IEnumerable<object>>(model.EnumerableExpression);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ForLoopTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ForLoopTaskDisplayDriver.cs
index d092780dbfa..ee2876f9631 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ForLoopTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ForLoopTaskDisplayDriver.cs
@@ -3,24 +3,23 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Workflows.Drivers
+namespace OrchardCore.Workflows.Drivers;
+
+public sealed class ForLoopTaskDisplayDriver : ActivityDisplayDriver<ForLoopTask, ForLoopTaskViewModel>
 {
-    public sealed class ForLoopTaskDisplayDriver : ActivityDisplayDriver<ForLoopTask, ForLoopTaskViewModel>
+    protected override void EditActivity(ForLoopTask activity, ForLoopTaskViewModel model)
     {
-        protected override void EditActivity(ForLoopTask activity, ForLoopTaskViewModel model)
-        {
-            model.FromExpression = activity.From.Expression;
-            model.ToExpression = activity.To.Expression;
-            model.LoopVariableName = activity.LoopVariableName;
-            model.StepExpression = activity.Step.Expression;
-        }
+        model.FromExpression = activity.From.Expression;
+        model.ToExpression = activity.To.Expression;
+        model.LoopVariableName = activity.LoopVariableName;
+        model.StepExpression = activity.Step.Expression;
+    }
 
-        protected override void UpdateActivity(ForLoopTaskViewModel model, ForLoopTask activity)
-        {
-            activity.From = new WorkflowExpression<double>(model.FromExpression);
-            activity.To = new WorkflowExpression<double>(model.ToExpression);
-            activity.Step = new WorkflowExpression<double>(model.StepExpression);
-            activity.LoopVariableName = model.LoopVariableName;
-        }
+    protected override void UpdateActivity(ForLoopTaskViewModel model, ForLoopTask activity)
+    {
+        activity.From = new WorkflowExpression<double>(model.FromExpression);
+        activity.To = new WorkflowExpression<double>(model.ToExpression);
+        activity.Step = new WorkflowExpression<double>(model.StepExpression);
+        activity.LoopVariableName = model.LoopVariableName;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ForkTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ForkTaskDisplayDriver.cs
index 47a18ca6cfb..fcd3b63d616 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ForkTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ForkTaskDisplayDriver.cs
@@ -4,18 +4,17 @@
 using OrchardCore.Workflows.Display;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Workflows.Drivers
+namespace OrchardCore.Workflows.Drivers;
+
+public sealed class ForkTaskDisplayDriver : ActivityDisplayDriver<ForkTask, ForkTaskViewModel>
 {
-    public sealed class ForkTaskDisplayDriver : ActivityDisplayDriver<ForkTask, ForkTaskViewModel>
+    protected override void EditActivity(ForkTask activity, ForkTaskViewModel model)
     {
-        protected override void EditActivity(ForkTask activity, ForkTaskViewModel model)
-        {
-            model.Forks = string.Join(", ", activity.Forks);
-        }
+        model.Forks = string.Join(", ", activity.Forks);
+    }
 
-        protected override void UpdateActivity(ForkTaskViewModel model, ForkTask activity)
-        {
-            activity.Forks = model.Forks.Split(',', StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()).ToList();
-        }
+    protected override void UpdateActivity(ForkTaskViewModel model, ForkTask activity)
+    {
+        activity.Forks = model.Forks.Split(',', StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()).ToList();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/IfElseTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/IfElseTaskDisplayDriver.cs
index 9c437b11dbc..af37770fe30 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/IfElseTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/IfElseTaskDisplayDriver.cs
@@ -3,18 +3,17 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Workflows.Drivers
+namespace OrchardCore.Workflows.Drivers;
+
+public sealed class IfElseTaskDisplayDriver : ActivityDisplayDriver<IfElseTask, IfElseTaskViewModel>
 {
-    public sealed class IfElseTaskDisplayDriver : ActivityDisplayDriver<IfElseTask, IfElseTaskViewModel>
+    protected override void EditActivity(IfElseTask activity, IfElseTaskViewModel model)
     {
-        protected override void EditActivity(IfElseTask activity, IfElseTaskViewModel model)
-        {
-            model.ConditionExpression = activity.Condition.Expression;
-        }
+        model.ConditionExpression = activity.Condition.Expression;
+    }
 
-        protected override void UpdateActivity(IfElseTaskViewModel model, IfElseTask activity)
-        {
-            activity.Condition = new WorkflowExpression<bool>(model.ConditionExpression);
-        }
+    protected override void UpdateActivity(IfElseTaskViewModel model, IfElseTask activity)
+    {
+        activity.Condition = new WorkflowExpression<bool>(model.ConditionExpression);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/JoinTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/JoinTaskDisplayDriver.cs
index a4e40d9a319..3934f13a6b9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/JoinTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/JoinTaskDisplayDriver.cs
@@ -2,18 +2,17 @@
 using OrchardCore.Workflows.Display;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Workflows.Drivers
+namespace OrchardCore.Workflows.Drivers;
+
+public sealed class JoinTaskDisplayDriver : ActivityDisplayDriver<JoinTask, JoinTaskViewModel>
 {
-    public sealed class JoinTaskDisplayDriver : ActivityDisplayDriver<JoinTask, JoinTaskViewModel>
+    protected override void EditActivity(JoinTask activity, JoinTaskViewModel model)
     {
-        protected override void EditActivity(JoinTask activity, JoinTaskViewModel model)
-        {
-            model.Mode = activity.Mode;
-        }
+        model.Mode = activity.Mode;
+    }
 
-        protected override void UpdateActivity(JoinTaskViewModel model, JoinTask activity)
-        {
-            activity.Mode = model.Mode;
-        }
+    protected override void UpdateActivity(JoinTaskViewModel model, JoinTask activity)
+    {
+        activity.Mode = model.Mode;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/LogTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/LogTaskDisplayDriver.cs
index 640d16fd7e5..363f69f3853 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/LogTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/LogTaskDisplayDriver.cs
@@ -3,20 +3,19 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Workflows.Drivers
+namespace OrchardCore.Workflows.Drivers;
+
+public sealed class LogTaskDisplayDriver : ActivityDisplayDriver<LogTask, LogTaskViewModel>
 {
-    public sealed class LogTaskDisplayDriver : ActivityDisplayDriver<LogTask, LogTaskViewModel>
+    protected override void EditActivity(LogTask activity, LogTaskViewModel model)
     {
-        protected override void EditActivity(LogTask activity, LogTaskViewModel model)
-        {
-            model.LogLevel = activity.LogLevel;
-            model.Text = activity.Text.Expression;
-        }
+        model.LogLevel = activity.LogLevel;
+        model.Text = activity.Text.Expression;
+    }
 
-        protected override void UpdateActivity(LogTaskViewModel model, LogTask activity)
-        {
-            activity.LogLevel = model.LogLevel;
-            activity.Text = new WorkflowExpression<string>(model.Text);
-        }
+    protected override void UpdateActivity(LogTaskViewModel model, LogTask activity)
+    {
+        activity.LogLevel = model.LogLevel;
+        activity.Text = new WorkflowExpression<string>(model.Text);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/MissingActivityDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/MissingActivityDisplayDriver.cs
index 66bc1e10fed..c5cf78e17e2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/MissingActivityDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/MissingActivityDisplayDriver.cs
@@ -3,14 +3,13 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.Display;
 
-namespace OrchardCore.Workflows.Drivers
+namespace OrchardCore.Workflows.Drivers;
+
+public sealed class MissingActivityDisplayDriver : ActivityDisplayDriver<MissingActivity>
 {
-    public sealed class MissingActivityDisplayDriver : ActivityDisplayDriver<MissingActivity>
+    public override IDisplayResult Display(MissingActivity activity, BuildDisplayContext context)
     {
-        public override IDisplayResult Display(MissingActivity activity, BuildDisplayContext context)
-        {
-            return View($"MissingActivity_Fields_Design", activity)
-                .Location("Design", "Content");
-        }
+        return View($"MissingActivity_Fields_Design", activity)
+            .Location("Design", "Content");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/NotifyTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/NotifyTaskDisplayDriver.cs
index 708af1d6ca8..9a96ef9c6f2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/NotifyTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/NotifyTaskDisplayDriver.cs
@@ -3,20 +3,19 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Workflows.Drivers
+namespace OrchardCore.Workflows.Drivers;
+
+public sealed class NotifyTaskDisplayDriver : ActivityDisplayDriver<NotifyTask, NotifyTaskViewModel>
 {
-    public sealed class NotifyTaskDisplayDriver : ActivityDisplayDriver<NotifyTask, NotifyTaskViewModel>
+    protected override void EditActivity(NotifyTask activity, NotifyTaskViewModel model)
     {
-        protected override void EditActivity(NotifyTask activity, NotifyTaskViewModel model)
-        {
-            model.NotificationType = activity.NotificationType;
-            model.Message = activity.Message.Expression;
-        }
+        model.NotificationType = activity.NotificationType;
+        model.Message = activity.Message.Expression;
+    }
 
-        protected override void UpdateActivity(NotifyTaskViewModel model, NotifyTask activity)
-        {
-            activity.NotificationType = model.NotificationType;
-            activity.Message = new WorkflowExpression<string>(model.Message);
-        }
+    protected override void UpdateActivity(NotifyTaskViewModel model, NotifyTask activity)
+    {
+        activity.NotificationType = model.NotificationType;
+        activity.Message = new WorkflowExpression<string>(model.Message);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ScriptTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ScriptTaskDisplayDriver.cs
index 5545ba75d87..3229b7e6508 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ScriptTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/ScriptTaskDisplayDriver.cs
@@ -5,20 +5,19 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Workflows.Drivers
+namespace OrchardCore.Workflows.Drivers;
+
+public sealed class ScriptTaskDisplayDriver : ActivityDisplayDriver<ScriptTask, ScriptTaskViewModel>
 {
-    public sealed class ScriptTaskDisplayDriver : ActivityDisplayDriver<ScriptTask, ScriptTaskViewModel>
+    protected override void EditActivity(ScriptTask source, ScriptTaskViewModel model)
     {
-        protected override void EditActivity(ScriptTask source, ScriptTaskViewModel model)
-        {
-            model.AvailableOutcomes = string.Join(", ", source.AvailableOutcomes);
-            model.Script = source.Script.Expression;
-        }
+        model.AvailableOutcomes = string.Join(", ", source.AvailableOutcomes);
+        model.Script = source.Script.Expression;
+    }
 
-        protected override void UpdateActivity(ScriptTaskViewModel model, ScriptTask activity)
-        {
-            activity.AvailableOutcomes = model.AvailableOutcomes.Split(',', StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()).ToList();
-            activity.Script = new WorkflowExpression<object>(model.Script);
-        }
+    protected override void UpdateActivity(ScriptTaskViewModel model, ScriptTask activity)
+    {
+        activity.AvailableOutcomes = model.AvailableOutcomes.Split(',', StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()).ToList();
+        activity.Script = new WorkflowExpression<object>(model.Script);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/SetOutputTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/SetOutputTaskDisplayDriver.cs
index fccb4e2fbe3..eba7fb8a336 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/SetOutputTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/SetOutputTaskDisplayDriver.cs
@@ -3,20 +3,19 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Workflows.Drivers
+namespace OrchardCore.Workflows.Drivers;
+
+public sealed class SetOutputTaskDisplayDriver : ActivityDisplayDriver<SetOutputTask, SetOutputTaskViewModel>
 {
-    public sealed class SetOutputTaskDisplayDriver : ActivityDisplayDriver<SetOutputTask, SetOutputTaskViewModel>
+    protected override void EditActivity(SetOutputTask source, SetOutputTaskViewModel model)
     {
-        protected override void EditActivity(SetOutputTask source, SetOutputTaskViewModel model)
-        {
-            model.OutputName = source.OutputName;
-            model.Value = source.Value.Expression;
-        }
+        model.OutputName = source.OutputName;
+        model.Value = source.Value.Expression;
+    }
 
-        protected override void UpdateActivity(SetOutputTaskViewModel model, SetOutputTask activity)
-        {
-            activity.OutputName = model.OutputName.Trim();
-            activity.Value = new WorkflowExpression<object>(model.Value);
-        }
+    protected override void UpdateActivity(SetOutputTaskViewModel model, SetOutputTask activity)
+    {
+        activity.OutputName = model.OutputName.Trim();
+        activity.Value = new WorkflowExpression<object>(model.Value);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/SetVariableTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/SetVariableTaskDisplayDriver.cs
index 999abf7ec97..9326f9c289d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/SetVariableTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/SetVariableTaskDisplayDriver.cs
@@ -3,20 +3,19 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Workflows.Drivers
+namespace OrchardCore.Workflows.Drivers;
+
+public sealed class SetVariableTaskDisplayDriver : ActivityDisplayDriver<SetPropertyTask, SetPropertyTaskViewModel>
 {
-    public sealed class SetVariableTaskDisplayDriver : ActivityDisplayDriver<SetPropertyTask, SetPropertyTaskViewModel>
+    protected override void EditActivity(SetPropertyTask source, SetPropertyTaskViewModel model)
     {
-        protected override void EditActivity(SetPropertyTask source, SetPropertyTaskViewModel model)
-        {
-            model.PropertyName = source.PropertyName;
-            model.Value = source.Value.Expression;
-        }
+        model.PropertyName = source.PropertyName;
+        model.Value = source.Value.Expression;
+    }
 
-        protected override void UpdateActivity(SetPropertyTaskViewModel model, SetPropertyTask activity)
-        {
-            activity.PropertyName = model.PropertyName.Trim();
-            activity.Value = new WorkflowExpression<object>(model.Value);
-        }
+    protected override void UpdateActivity(SetPropertyTaskViewModel model, SetPropertyTask activity)
+    {
+        activity.PropertyName = model.PropertyName.Trim();
+        activity.Value = new WorkflowExpression<object>(model.Value);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/WhileLoopTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/WhileLoopTaskDisplayDriver.cs
index ad254bc8d3d..1fb8e672a05 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/WhileLoopTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/WhileLoopTaskDisplayDriver.cs
@@ -3,18 +3,17 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Workflows.Drivers
+namespace OrchardCore.Workflows.Drivers;
+
+public sealed class WhileLoopTaskDisplayDriver : ActivityDisplayDriver<WhileLoopTask, WhileLoopTaskViewModel>
 {
-    public sealed class WhileLoopTaskDisplayDriver : ActivityDisplayDriver<WhileLoopTask, WhileLoopTaskViewModel>
+    protected override void EditActivity(WhileLoopTask source, WhileLoopTaskViewModel model)
     {
-        protected override void EditActivity(WhileLoopTask source, WhileLoopTaskViewModel model)
-        {
-            model.ConditionExpression = source.Condition.Expression;
-        }
+        model.ConditionExpression = source.Condition.Expression;
+    }
 
-        protected override void UpdateActivity(WhileLoopTaskViewModel model, WhileLoopTask activity)
-        {
-            activity.Condition = new WorkflowExpression<bool>(model.ConditionExpression.Trim());
-        }
+    protected override void UpdateActivity(WhileLoopTaskViewModel model, WhileLoopTask activity)
+    {
+        activity.Condition = new WorkflowExpression<bool>(model.ConditionExpression.Trim());
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/WorkflowFaultEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/WorkflowFaultEventDisplayDriver.cs
index f2ea8b2e7dc..0209858b1e0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/WorkflowFaultEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Drivers/WorkflowFaultEventDisplayDriver.cs
@@ -3,18 +3,17 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Workflows.Drivers
+namespace OrchardCore.Workflows.Drivers;
+
+public sealed class WorkflowFaultEventDisplayDriver : ActivityDisplayDriver<WorkflowFaultEvent, WorkflowFaultViewModel>
 {
-    public sealed class WorkflowFaultEventDisplayDriver : ActivityDisplayDriver<WorkflowFaultEvent, WorkflowFaultViewModel>
+    protected override void EditActivity(WorkflowFaultEvent activity, WorkflowFaultViewModel model)
     {
-        protected override void EditActivity(WorkflowFaultEvent activity, WorkflowFaultViewModel model)
-        {
-            model.ErrorFilter = activity.ErrorFilter.Expression;
-        }
+        model.ErrorFilter = activity.ErrorFilter.Expression;
+    }
 
-        protected override void UpdateActivity(WorkflowFaultViewModel model, WorkflowFaultEvent activity)
-        {
-            activity.ErrorFilter = new WorkflowExpression<bool>(model.ErrorFilter);
-        }
+    protected override void UpdateActivity(WorkflowFaultViewModel model, WorkflowFaultEvent activity)
+    {
+        activity.ErrorFilter = new WorkflowExpression<bool>(model.ErrorFilter);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Events/WorkflowFaultEvent.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Events/WorkflowFaultEvent.cs
index 3278d98b4cc..9ad3bdbbd40 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Events/WorkflowFaultEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Events/WorkflowFaultEvent.cs
@@ -6,57 +6,57 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Events
+namespace OrchardCore.Workflows.Events;
+
+public class WorkflowFaultEvent : EventActivity
 {
-    public class WorkflowFaultEvent : EventActivity
+    protected readonly IStringLocalizer<WorkflowFaultEvent> S;
+    private readonly IWorkflowScriptEvaluator _scriptEvaluator;
+
+    public WorkflowFaultEvent(
+        IStringLocalizer<WorkflowFaultEvent> stringLocalizer,
+        IWorkflowScriptEvaluator scriptEvaluator)
     {
-        protected readonly IStringLocalizer<WorkflowFaultEvent> S;
-        private readonly IWorkflowScriptEvaluator _scriptEvaluator;
+        S = stringLocalizer;
+        _scriptEvaluator = scriptEvaluator;
+    }
 
-        public WorkflowFaultEvent(
-            IStringLocalizer<WorkflowFaultEvent> stringLocalizer,
-            IWorkflowScriptEvaluator scriptEvaluator)
-        {
-            S = stringLocalizer;
-            _scriptEvaluator = scriptEvaluator;
-        }
+    public override string Name => nameof(WorkflowFaultEvent);
+    public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
+    public override LocalizedString Category => S["Background"];
 
-        public override string Name => nameof(WorkflowFaultEvent);
-        public override LocalizedString DisplayText => S["Catch Workflow Fault Event"];
-        public override LocalizedString Category => S["Background"];
+    public WorkflowExpression<bool> ErrorFilter
+    {
+        get => GetProperty(() => new WorkflowExpression<bool>(GetDefaultValue()));
+        set => SetProperty(value);
+    }
 
-        public WorkflowExpression<bool> ErrorFilter
-        {
-            get => GetProperty(() => new WorkflowExpression<bool>(GetDefaultValue()));
-            set => SetProperty(value);
-        }
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"]);
+    }
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"]);
-        }
+    public override ActivityExecutionResult Resume(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes("Done");
+    }
 
-        public override ActivityExecutionResult Resume(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes("Done");
-        }
+    public override async Task<bool> CanExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var faultModel = workflowContext.Input[WorkflowFaultModel.WorkflowFaultInputKey] as WorkflowFaultModel;
 
-        public override async Task<bool> CanExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        // Avoid endless loops.
+        if (faultModel == null || faultModel.WorkflowName == workflowContext.WorkflowType.Name)
         {
-            var faultModel = workflowContext.Input[WorkflowFaultModel.WorkflowFaultInputKey] as WorkflowFaultModel;
-
-            // Avoid endless loops.
-            if (faultModel == null || faultModel.WorkflowName == workflowContext.WorkflowType.Name)
-            {
-                return false;
-            }
-
-            return await _scriptEvaluator.EvaluateAsync(ErrorFilter, workflowContext);
+            return false;
         }
 
-        private static string GetDefaultValue()
-        {
-            var sample = $@"//sample code
+        return await _scriptEvaluator.EvaluateAsync(ErrorFilter, workflowContext);
+    }
+
+    private static string GetDefaultValue()
+    {
+        var sample = $@"//sample code
 var errorInfo= input('{WorkflowFaultModel.WorkflowFaultInputKey}');
 // This is where you define the workflow to intercept or specify the exception information
 var result=  errorInfo.{nameof(WorkflowFaultModel.WorkflowName)}== 'WorkflowName' ||
@@ -72,7 +72,6 @@ private static string GetDefaultValue()
 // and a new workflow instance will be created.
 return result;";
 
-            return sample;
-        }
+        return sample;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Expressions/LiquidWorkflowExpressionEvaluator.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Expressions/LiquidWorkflowExpressionEvaluator.cs
index 44112b3bedb..ec3f7211e4c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Expressions/LiquidWorkflowExpressionEvaluator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Expressions/LiquidWorkflowExpressionEvaluator.cs
@@ -11,53 +11,52 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Expressions
+namespace OrchardCore.Workflows.Expressions;
+
+public class LiquidWorkflowExpressionEvaluator : IWorkflowExpressionEvaluator
 {
-    public class LiquidWorkflowExpressionEvaluator : IWorkflowExpressionEvaluator
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly IEnumerable<IWorkflowExecutionContextHandler> _workflowContextHandlers;
+    private readonly ILogger _logger;
+    private readonly TemplateOptions _templateOptions;
+
+    public LiquidWorkflowExpressionEvaluator(
+        ILiquidTemplateManager liquidTemplateManager,
+        IEnumerable<IWorkflowExecutionContextHandler> workflowContextHandlers,
+        ILogger<LiquidWorkflowExpressionEvaluator> logger,
+        IOptions<TemplateOptions> templateOptions
+    )
     {
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly IEnumerable<IWorkflowExecutionContextHandler> _workflowContextHandlers;
-        private readonly ILogger _logger;
-        private readonly TemplateOptions _templateOptions;
-
-        public LiquidWorkflowExpressionEvaluator(
-            ILiquidTemplateManager liquidTemplateManager,
-            IEnumerable<IWorkflowExecutionContextHandler> workflowContextHandlers,
-            ILogger<LiquidWorkflowExpressionEvaluator> logger,
-            IOptions<TemplateOptions> templateOptions
-        )
-        {
-            _liquidTemplateManager = liquidTemplateManager;
-            _workflowContextHandlers = workflowContextHandlers;
-            _logger = logger;
-            _templateOptions = templateOptions.Value;
-        }
+        _liquidTemplateManager = liquidTemplateManager;
+        _workflowContextHandlers = workflowContextHandlers;
+        _logger = logger;
+        _templateOptions = templateOptions.Value;
+    }
 
-        public async Task<T> EvaluateAsync<T>(WorkflowExpression<T> expression, WorkflowExecutionContext workflowContext, TextEncoder encoder)
-        {
-            var templateContext = new TemplateContext(_templateOptions);
-            var expressionContext = new WorkflowExecutionExpressionContext(templateContext, workflowContext);
+    public async Task<T> EvaluateAsync<T>(WorkflowExpression<T> expression, WorkflowExecutionContext workflowContext, TextEncoder encoder)
+    {
+        var templateContext = new TemplateContext(_templateOptions);
+        var expressionContext = new WorkflowExecutionExpressionContext(templateContext, workflowContext);
 
-            await _workflowContextHandlers.InvokeAsync((h, expressionContext) => h.EvaluatingExpressionAsync(expressionContext), expressionContext, _logger);
+        await _workflowContextHandlers.InvokeAsync((h, expressionContext) => h.EvaluatingExpressionAsync(expressionContext), expressionContext, _logger);
 
-            // Set WorkflowContext as a local scope property.
-            var result = await _liquidTemplateManager.RenderStringAsync(
-                expression.Expression,
-                encoder ?? NullEncoder.Default,
-                new Dictionary<string, FluidValue>() { ["Workflow"] = new ObjectValue(workflowContext) }
-                );
+        // Set WorkflowContext as a local scope property.
+        var result = await _liquidTemplateManager.RenderStringAsync(
+            expression.Expression,
+            encoder ?? NullEncoder.Default,
+            new Dictionary<string, FluidValue>() { ["Workflow"] = new ObjectValue(workflowContext) }
+            );
 
-            return string.IsNullOrWhiteSpace(result) ? default : (T)Convert.ChangeType(result, typeof(T));
-        }
+        return string.IsNullOrWhiteSpace(result) ? default : (T)Convert.ChangeType(result, typeof(T));
+    }
 
-        public static Task<FluidValue> ToFluidValue(IDictionary<string, object> dictionary, string key, TemplateContext context)
+    public static Task<FluidValue> ToFluidValue(IDictionary<string, object> dictionary, string key, TemplateContext context)
+    {
+        if (!dictionary.TryGetValue(key, out var value))
         {
-            if (!dictionary.TryGetValue(key, out var value))
-            {
-                return Task.FromResult<FluidValue>(NilValue.Instance);
-            }
-
-            return Task.FromResult(FluidValue.Create(value, context.Options));
+            return Task.FromResult<FluidValue>(NilValue.Instance);
         }
+
+        return Task.FromResult(FluidValue.Create(value, context.Options));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Handlers/DefaultWorkflowExecutionContextHandler.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Handlers/DefaultWorkflowExecutionContextHandler.cs
index 8e63ec2d52d..615ed473abe 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Handlers/DefaultWorkflowExecutionContextHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Handlers/DefaultWorkflowExecutionContextHandler.cs
@@ -3,14 +3,13 @@
 using OrchardCore.Workflows.Scripting;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.WorkflowContextProviders
+namespace OrchardCore.Workflows.WorkflowContextProviders;
+
+public class DefaultWorkflowExecutionContextHandler : WorkflowExecutionContextHandlerBase
 {
-    public class DefaultWorkflowExecutionContextHandler : WorkflowExecutionContextHandlerBase
+    public override Task EvaluatingScriptAsync(WorkflowExecutionScriptContext context)
     {
-        public override Task EvaluatingScriptAsync(WorkflowExecutionScriptContext context)
-        {
-            context.ScopedMethodProviders.Add(new WorkflowMethodsProvider(context.WorkflowContext));
-            return Task.CompletedTask;
-        }
+        context.ScopedMethodProviders.Add(new WorkflowMethodsProvider(context.WorkflowContext));
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Handlers/DefaultWorkflowFaultHandler.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Handlers/DefaultWorkflowFaultHandler.cs
index 51f939aca45..89b453745ed 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Handlers/DefaultWorkflowFaultHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Handlers/DefaultWorkflowFaultHandler.cs
@@ -5,36 +5,35 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Handlers
+namespace OrchardCore.Workflows.Handlers;
+
+public class DefaultWorkflowFaultHandler : IWorkflowFaultHandler
 {
-    public class DefaultWorkflowFaultHandler : IWorkflowFaultHandler
+    public async Task OnWorkflowFaultAsync(
+        IWorkflowManager workflowManager,
+        WorkflowExecutionContext workflowContext,
+        ActivityContext activityContext,
+        Exception exception)
     {
-        public async Task OnWorkflowFaultAsync(
-            IWorkflowManager workflowManager,
-            WorkflowExecutionContext workflowContext,
-            ActivityContext activityContext,
-            Exception exception)
+        var name = nameof(WorkflowFaultEvent);
+        var faultContext = new WorkflowFaultModel()
         {
-            var name = nameof(WorkflowFaultEvent);
-            var faultContext = new WorkflowFaultModel()
-            {
-                WorkflowId = workflowContext.Workflow.WorkflowId,
-                WorkflowName = workflowContext.WorkflowType.Name,
-                ExecutedActivityCount = workflowContext.ExecutedActivities.Count,
-                FaultMessage = workflowContext.Workflow.FaultMessage,
-                ActivityId = activityContext.ActivityRecord.ActivityId,
-                ActivityTypeName = activityContext.Activity.Name,
-                ActivityDisplayName = activityContext.ActivityRecord.Properties["ActivityMetadata"]?["Title"]?.ToString(),
-                ExceptionDetails = exception?.ToString(),
-                ErrorMessage = exception.Message,
-            };
+            WorkflowId = workflowContext.Workflow.WorkflowId,
+            WorkflowName = workflowContext.WorkflowType.Name,
+            ExecutedActivityCount = workflowContext.ExecutedActivities.Count,
+            FaultMessage = workflowContext.Workflow.FaultMessage,
+            ActivityId = activityContext.ActivityRecord.ActivityId,
+            ActivityTypeName = activityContext.Activity.Name,
+            ActivityDisplayName = activityContext.ActivityRecord.Properties["ActivityMetadata"]?["Title"]?.ToString(),
+            ExceptionDetails = exception?.ToString(),
+            ErrorMessage = exception.Message,
+        };
 
-            var input = new Dictionary<string, object>
-            {
-                { WorkflowFaultModel.WorkflowFaultInputKey, faultContext },
-            };
+        var input = new Dictionary<string, object>
+        {
+            { WorkflowFaultModel.WorkflowFaultInputKey, faultContext },
+        };
 
-            await workflowManager.TriggerEventAsync(name, input);
-        }
+        await workflowManager.TriggerEventAsync(name, input);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRedirectTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRedirectTask.cs
index 6852ff62e73..b8fdb51481b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRedirectTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRedirectTask.cs
@@ -9,54 +9,53 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Http.Activities
+namespace OrchardCore.Workflows.Http.Activities;
+
+public class HttpRedirectTask : TaskActivity<HttpRedirectTask>
 {
-    public class HttpRedirectTask : TaskActivity<HttpRedirectTask>
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
+    protected readonly IStringLocalizer S;
+
+    public HttpRedirectTask(
+        IStringLocalizer<HttpRedirectTask> localizer,
+        IHttpContextAccessor httpContextAccessor,
+        IWorkflowExpressionEvaluator expressionEvaluator
+    )
+    {
+        S = localizer;
+        _httpContextAccessor = httpContextAccessor;
+        _expressionEvaluator = expressionEvaluator;
+    }
+
+    public override LocalizedString DisplayText => S["Http Redirect Task"];
+
+    public override LocalizedString Category => S["HTTP"];
+
+    public WorkflowExpression<string> Location
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public bool Permanent
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
-        protected readonly IStringLocalizer S;
-
-        public HttpRedirectTask(
-            IStringLocalizer<HttpRedirectTask> localizer,
-            IHttpContextAccessor httpContextAccessor,
-            IWorkflowExpressionEvaluator expressionEvaluator
-        )
-        {
-            S = localizer;
-            _httpContextAccessor = httpContextAccessor;
-            _expressionEvaluator = expressionEvaluator;
-        }
-
-        public override LocalizedString DisplayText => S["Http Redirect Task"];
-
-        public override LocalizedString Category => S["HTTP"];
-
-        public WorkflowExpression<string> Location
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
-
-        public bool Permanent
-        {
-            get => GetProperty(() => false);
-            set => SetProperty(value);
-        }
-
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"]);
-        }
-
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var location = await _expressionEvaluator.EvaluateAsync(Location, workflowContext, NullEncoder.Default);
-
-            _httpContextAccessor.HttpContext.Response.Redirect(location.ToUriComponents(), Permanent);
-            _httpContextAccessor.HttpContext.Items[WorkflowHttpResult.Instance] = WorkflowHttpResult.Instance;
-
-            return Outcomes("Done");
-        }
+        get => GetProperty(() => false);
+        set => SetProperty(value);
+    }
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"]);
+    }
+
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var location = await _expressionEvaluator.EvaluateAsync(Location, workflowContext, NullEncoder.Default);
+
+        _httpContextAccessor.HttpContext.Response.Redirect(location.ToUriComponents(), Permanent);
+        _httpContextAccessor.HttpContext.Items[WorkflowHttpResult.Instance] = WorkflowHttpResult.Instance;
+
+        return Outcomes("Done");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRequestEvent.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRequestEvent.cs
index a1fdcec43cf..d5204e1f30a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRequestEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRequestEvent.cs
@@ -7,101 +7,100 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Http.Activities
+namespace OrchardCore.Workflows.Http.Activities;
+
+public class HttpRequestEvent : EventActivity
 {
-    public class HttpRequestEvent : EventActivity
-    {
-        public static string EventName => nameof(HttpRequestEvent);
+    public static string EventName => nameof(HttpRequestEvent);
 
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        protected readonly IStringLocalizer S;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    protected readonly IStringLocalizer S;
 
-        public HttpRequestEvent(
-            IStringLocalizer<HttpRequestEvent> localizer,
-            IHttpContextAccessor httpContextAccessor
-        )
-        {
-            S = localizer;
-            _httpContextAccessor = httpContextAccessor;
-        }
+    public HttpRequestEvent(
+        IStringLocalizer<HttpRequestEvent> localizer,
+        IHttpContextAccessor httpContextAccessor
+    )
+    {
+        S = localizer;
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        public override string Name => EventName;
-        public override LocalizedString DisplayText => S["Http Request Event"];
-        public override LocalizedString Category => S["HTTP"];
+    public override string Name => EventName;
+    public override LocalizedString DisplayText => S["Http Request Event"];
+    public override LocalizedString Category => S["HTTP"];
 
-        public string HttpMethod
-        {
-            get => GetProperty<string>();
-            set => SetProperty(value);
-        }
+    public string HttpMethod
+    {
+        get => GetProperty<string>();
+        set => SetProperty(value);
+    }
 
-        public string Url
-        {
-            get => GetProperty<string>();
-            set => SetProperty(value);
-        }
+    public string Url
+    {
+        get => GetProperty<string>();
+        set => SetProperty(value);
+    }
 
-        public bool ValidateAntiforgeryToken
-        {
-            get => GetProperty(() => true);
-            set => SetProperty(value);
-        }
+    public bool ValidateAntiforgeryToken
+    {
+        get => GetProperty(() => true);
+        set => SetProperty(value);
+    }
 
-        public int TokenLifeSpan
-        {
-            get => GetProperty(() => 0);
-            set => SetProperty(value);
-        }
+    public int TokenLifeSpan
+    {
+        get => GetProperty(() => 0);
+        set => SetProperty(value);
+    }
 
-        public string FormLocationKey
-        {
-            get => GetProperty(() => string.Empty);
-            set => SetProperty(value ?? string.Empty);
-        }
+    public string FormLocationKey
+    {
+        get => GetProperty(() => string.Empty);
+        set => SetProperty(value ?? string.Empty);
+    }
 
-        public override bool CanExecute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var httpContext = _httpContextAccessor.HttpContext;
-            var httpRequest = httpContext.Request;
-            var isMatch = string.Equals(HttpMethod, httpRequest.Method, StringComparison.OrdinalIgnoreCase);
+    public override bool CanExecute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var httpContext = _httpContextAccessor.HttpContext;
+        var httpRequest = httpContext.Request;
+        var isMatch = string.Equals(HttpMethod, httpRequest.Method, StringComparison.OrdinalIgnoreCase);
 
-            return isMatch;
-        }
+        return isMatch;
+    }
 
-        public override Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    public override Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        if (_httpContextAccessor.HttpContext.Request.HasFormContentType
+        && _httpContextAccessor.HttpContext.Request.Form.TryGetValue(WorkflowConstants.FormLocationKeyInputName, out var value)
+        && !string.IsNullOrWhiteSpace(value))
         {
-            if (_httpContextAccessor.HttpContext.Request.HasFormContentType
-            && _httpContextAccessor.HttpContext.Request.Form.TryGetValue(WorkflowConstants.FormLocationKeyInputName, out var value)
-            && !string.IsNullOrWhiteSpace(value))
+            if (!workflowContext.Output.TryGetValue(WorkflowConstants.HttpFormLocationOutputKeyName, out var obj)
+                || obj is not Dictionary<string, string> formLocation)
             {
-                if (!workflowContext.Output.TryGetValue(WorkflowConstants.HttpFormLocationOutputKeyName, out var obj)
-                    || obj is not Dictionary<string, string> formLocation)
-                {
-                    formLocation = [];
-                }
-
-                formLocation[FormLocationKey] = GetLocationUrl(value);
-
-                workflowContext.Output[WorkflowConstants.HttpFormLocationOutputKeyName] = formLocation;
+                formLocation = [];
             }
 
-            return Task.FromResult(Outcomes("Done"));
+            formLocation[FormLocationKey] = GetLocationUrl(value);
+
+            workflowContext.Output[WorkflowConstants.HttpFormLocationOutputKeyName] = formLocation;
         }
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-            => Outcomes(S["Done"]);
+        return Task.FromResult(Outcomes("Done"));
+    }
 
-        public override ActivityExecutionResult Resume(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-            => Outcomes("Done");
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        => Outcomes(S["Done"]);
 
-        private static string GetLocationUrl(string value)
-        {
-            if (value.StartsWith('/'))
-            {
-                return "~" + value;
-            }
+    public override ActivityExecutionResult Resume(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        => Outcomes("Done");
 
-            return value;
+    private static string GetLocationUrl(string value)
+    {
+        if (value.StartsWith('/'))
+        {
+            return "~" + value;
         }
+
+        return value;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRequestFilterEvent.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRequestFilterEvent.cs
index ad94c60a612..863399db461 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRequestFilterEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRequestFilterEvent.cs
@@ -8,103 +8,102 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Http.Activities
+namespace OrchardCore.Workflows.Http.Activities;
+
+public class HttpRequestFilterEvent : EventActivity
 {
-    public class HttpRequestFilterEvent : EventActivity
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    protected readonly IStringLocalizer S;
+
+    public static string EventName => nameof(HttpRequestFilterEvent);
+
+    public HttpRequestFilterEvent(IStringLocalizer<HttpRequestFilterEvent> localizer, IHttpContextAccessor httpContextAccessor)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        protected readonly IStringLocalizer S;
+        S = localizer;
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        public static string EventName => nameof(HttpRequestFilterEvent);
+    public override string Name => EventName;
+    public override LocalizedString DisplayText => S["Http Request Filter Event"];
 
-        public HttpRequestFilterEvent(IStringLocalizer<HttpRequestFilterEvent> localizer, IHttpContextAccessor httpContextAccessor)
-        {
-            S = localizer;
-            _httpContextAccessor = httpContextAccessor;
-        }
+    public override LocalizedString Category => S["HTTP"];
 
-        public override string Name => EventName;
-        public override LocalizedString DisplayText => S["Http Request Filter Event"];
+    public string HttpMethod
+    {
+        get => GetProperty<string>();
+        set => SetProperty(value);
+    }
 
-        public override LocalizedString Category => S["HTTP"];
+    public string ControllerName
+    {
+        get => (string)RouteValues["controller"];
+        set => SetRouteValue("controller", value);
+    }
 
-        public string HttpMethod
-        {
-            get => GetProperty<string>();
-            set => SetProperty(value);
-        }
+    public string ActionName
+    {
+        get => (string)RouteValues["action"];
+        set => SetRouteValue("action", value);
+    }
 
-        public string ControllerName
-        {
-            get => (string)RouteValues["controller"];
-            set => SetRouteValue("controller", value);
-        }
+    public string AreaName
+    {
+        get => (string)RouteValues["area"];
+        set => SetRouteValue("area", value);
+    }
 
-        public string ActionName
-        {
-            get => (string)RouteValues["action"];
-            set => SetRouteValue("action", value);
-        }
+    public RouteValueDictionary RouteValues
+    {
+        get => GetProperty(() => new RouteValueDictionary());
+        set => SetProperty(value);
+    }
 
-        public string AreaName
-        {
-            get => (string)RouteValues["area"];
-            set => SetRouteValue("area", value);
-        }
+    public override bool CanExecute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var httpContext = _httpContextAccessor.HttpContext;
+        var httpRequest = httpContext.Request;
+        var isHttpMethodMatch = string.Equals(HttpMethod, httpRequest.Method, StringComparison.OrdinalIgnoreCase);
 
-        public RouteValueDictionary RouteValues
+        if (!isHttpMethodMatch)
         {
-            get => GetProperty(() => new RouteValueDictionary());
-            set => SetProperty(value);
+            return false;
         }
 
-        public override bool CanExecute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var httpContext = _httpContextAccessor.HttpContext;
-            var httpRequest = httpContext.Request;
-            var isHttpMethodMatch = string.Equals(HttpMethod, httpRequest.Method, StringComparison.OrdinalIgnoreCase);
-
-            if (!isHttpMethodMatch)
-            {
-                return false;
-            }
-
-            var routeValues = RouteValues;
-            var currentRouteValues = httpContext.Request.RouteValues;
-            var isRouteMatch = RouteMatches(routeValues, currentRouteValues);
-
-            if (!isRouteMatch)
-            {
-                return false;
-            }
+        var routeValues = RouteValues;
+        var currentRouteValues = httpContext.Request.RouteValues;
+        var isRouteMatch = RouteMatches(routeValues, currentRouteValues);
 
-            return true;
-        }
-
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        if (!isRouteMatch)
         {
-            return Outcomes(S["Matched"]);
+            return false;
         }
 
-        public override ActivityExecutionResult Resume(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes("Matched");
-        }
+        return true;
+    }
 
-        private void SetRouteValue<T>(string name, T value)
-        {
-            var routeValues = RouteValues;
-            routeValues[name] = value;
-            RouteValues = routeValues;
-        }
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Matched"]);
+    }
+
+    public override ActivityExecutionResult Resume(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes("Matched");
+    }
 
-        private static bool RouteMatches(RouteValueDictionary a, RouteValueDictionary b)
+    private void SetRouteValue<T>(string name, T value)
+    {
+        var routeValues = RouteValues;
+        routeValues[name] = value;
+        RouteValues = routeValues;
+    }
+
+    private static bool RouteMatches(RouteValueDictionary a, RouteValueDictionary b)
+    {
+        return a.All(x =>
         {
-            return a.All(x =>
-            {
-                var valueA = x.Value?.ToString();
-                return b.ContainsKey(x.Key) && string.Equals(valueA, b[x.Key]?.ToString(), StringComparison.OrdinalIgnoreCase);
-            });
-        }
+            var valueA = x.Value?.ToString();
+            return b.ContainsKey(x.Key) && string.Equals(valueA, b[x.Key]?.ToString(), StringComparison.OrdinalIgnoreCase);
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRequestTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRequestTask.cs
index 8c52a8793cc..61f9489264b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRequestTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpRequestTask.cs
@@ -12,217 +12,216 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Http.Activities
+namespace OrchardCore.Workflows.Http.Activities;
+
+public class HttpRequestTask : TaskActivity<HttpRequestTask>
 {
-    public class HttpRequestTask : TaskActivity<HttpRequestTask>
+    private static readonly string[] _separator = ["\r\n", "\n", "\r"];
+
+    private static readonly Dictionary<int, string> _httpStatusCodeDictionary = new()
     {
-        private static readonly string[] _separator = ["\r\n", "\n", "\r"];
+        { 100, "Continue" },
+        { 101, "Switching Protocols" },
+        { 102, "Processing" },
+        { 200, "OK" },
+        { 201, "Created" },
+        { 202, "Accepted" },
+        { 203, "Non-authoritative Information" },
+        { 204, "No Content" },
+        { 205, "Reset Content" },
+        { 206, "Partial Content" },
+        { 207, "Multi-Status" },
+        { 208, "Already Reported" },
+        { 226, "IM Used" },
+        { 300, "Multiple Choices" },
+        { 301, "Moved Permanently" },
+        { 302, "Found" },
+        { 303, "See Other" },
+        { 304, "Not Modified" },
+        { 305, "Use Proxy" },
+        { 307, "Temporary Redirect" },
+        { 308, "Permanent Redirect" },
+        { 400, "Bad Request" },
+        { 401, "Unauthorized" },
+        { 402, "Payment Required" },
+        { 403, "Forbidden" },
+        { 404, "Not Found" },
+        { 405, "Method Not Allowed" },
+        { 406, "Not Acceptable" },
+        { 407, "Proxy Authentication Required" },
+        { 408, "Request Timeout" },
+        { 409, "Conflict" },
+        { 410, "Gone" },
+        { 411, "Length Required" },
+        { 412, "Precondition Failed" },
+        { 413, "Payload Too Large" },
+        { 414, "Request-URI Too Long" },
+        { 415, "Unsupported Media Type" },
+        { 416, "Requested Range Not Satisfiable" },
+        { 417, "Expectation Failed" },
+        { 418, "I'm a teapot" },
+        { 421, "Misdirected Request" },
+        { 422, "Unprocessable Entity" },
+        { 423, "Locked" },
+        { 424, "Failed Dependency" },
+        { 426, "Upgrade Required" },
+        { 428, "Precondition Required" },
+        { 429, "Too Many Requests" },
+        { 431, "Request Header Fields Too Large" },
+        { 444, "Connection Closed Without Response" },
+        { 451, "Unavailable For Legal Reasons" },
+        { 499, "Client Closed Request" },
+        { 500, "Internal Server Error" },
+        { 501, "Not Implemented" },
+        { 502, "Bad Gateway" },
+        { 503, "Service Unavailable" },
+        { 504, "Gateway Timeout" },
+        { 505, "HTTP Version Not Supported" },
+        { 506, "Variant Also Negotiates" },
+        { 507, "Insufficient Storage" },
+        { 508, "Loop Detected" },
+        { 510, "Not Extended" },
+        { 511, "Network Authentication Required" },
+        { 599, "Network Connect Timeout Error" }
+    };
+
+    private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
+    private readonly IHttpClientFactory _httpClientFactory;
+    private readonly UrlEncoder _urlEncoder;
+
+    protected readonly IStringLocalizer S;
+
+    public HttpRequestTask(
+        IWorkflowExpressionEvaluator expressionEvaluator,
+        UrlEncoder urlEncoder,
+        IHttpClientFactory httpClientFactory,
+        IStringLocalizer<HttpRequestTask> localizer
+    )
+    {
+        _expressionEvaluator = expressionEvaluator;
+        _urlEncoder = urlEncoder;
+        _httpClientFactory = httpClientFactory;
+        S = localizer;
+    }
 
-        private static readonly Dictionary<int, string> _httpStatusCodeDictionary = new()
-        {
-            { 100, "Continue" },
-            { 101, "Switching Protocols" },
-            { 102, "Processing" },
-            { 200, "OK" },
-            { 201, "Created" },
-            { 202, "Accepted" },
-            { 203, "Non-authoritative Information" },
-            { 204, "No Content" },
-            { 205, "Reset Content" },
-            { 206, "Partial Content" },
-            { 207, "Multi-Status" },
-            { 208, "Already Reported" },
-            { 226, "IM Used" },
-            { 300, "Multiple Choices" },
-            { 301, "Moved Permanently" },
-            { 302, "Found" },
-            { 303, "See Other" },
-            { 304, "Not Modified" },
-            { 305, "Use Proxy" },
-            { 307, "Temporary Redirect" },
-            { 308, "Permanent Redirect" },
-            { 400, "Bad Request" },
-            { 401, "Unauthorized" },
-            { 402, "Payment Required" },
-            { 403, "Forbidden" },
-            { 404, "Not Found" },
-            { 405, "Method Not Allowed" },
-            { 406, "Not Acceptable" },
-            { 407, "Proxy Authentication Required" },
-            { 408, "Request Timeout" },
-            { 409, "Conflict" },
-            { 410, "Gone" },
-            { 411, "Length Required" },
-            { 412, "Precondition Failed" },
-            { 413, "Payload Too Large" },
-            { 414, "Request-URI Too Long" },
-            { 415, "Unsupported Media Type" },
-            { 416, "Requested Range Not Satisfiable" },
-            { 417, "Expectation Failed" },
-            { 418, "I'm a teapot" },
-            { 421, "Misdirected Request" },
-            { 422, "Unprocessable Entity" },
-            { 423, "Locked" },
-            { 424, "Failed Dependency" },
-            { 426, "Upgrade Required" },
-            { 428, "Precondition Required" },
-            { 429, "Too Many Requests" },
-            { 431, "Request Header Fields Too Large" },
-            { 444, "Connection Closed Without Response" },
-            { 451, "Unavailable For Legal Reasons" },
-            { 499, "Client Closed Request" },
-            { 500, "Internal Server Error" },
-            { 501, "Not Implemented" },
-            { 502, "Bad Gateway" },
-            { 503, "Service Unavailable" },
-            { 504, "Gateway Timeout" },
-            { 505, "HTTP Version Not Supported" },
-            { 506, "Variant Also Negotiates" },
-            { 507, "Insufficient Storage" },
-            { 508, "Loop Detected" },
-            { 510, "Not Extended" },
-            { 511, "Network Authentication Required" },
-            { 599, "Network Connect Timeout Error" }
-        };
+    public override LocalizedString DisplayText => S["Http Request Task"];
 
-        private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
-        private readonly IHttpClientFactory _httpClientFactory;
-        private readonly UrlEncoder _urlEncoder;
+    public override LocalizedString Category => S["HTTP"];
 
-        protected readonly IStringLocalizer S;
+    public WorkflowExpression<string> Url
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        public HttpRequestTask(
-            IWorkflowExpressionEvaluator expressionEvaluator,
-            UrlEncoder urlEncoder,
-            IHttpClientFactory httpClientFactory,
-            IStringLocalizer<HttpRequestTask> localizer
-        )
-        {
-            _expressionEvaluator = expressionEvaluator;
-            _urlEncoder = urlEncoder;
-            _httpClientFactory = httpClientFactory;
-            S = localizer;
-        }
+    public string HttpMethod
+    {
+        get => GetProperty(() => HttpMethods.Get);
+        set => SetProperty(value);
+    }
 
-        public override LocalizedString DisplayText => S["Http Request Task"];
+    public WorkflowExpression<string> Headers
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        public override LocalizedString Category => S["HTTP"];
+    public WorkflowExpression<string> Body
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        public WorkflowExpression<string> Url
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
+    public WorkflowExpression<string> ContentType
+    {
+        get => GetProperty(() => new WorkflowExpression<string>("application/json"));
+        set => SetProperty(value);
+    }
 
-        public string HttpMethod
-        {
-            get => GetProperty(() => HttpMethods.Get);
-            set => SetProperty(value);
-        }
+    public string HttpResponseCodes
+    {
+        get => GetProperty(() => "200");
+        set => SetProperty(value);
+    }
 
-        public WorkflowExpression<string> Headers
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var outcomes = !string.IsNullOrWhiteSpace(HttpResponseCodes)
+            ? HttpResponseCodes.Split(',', StringSplitOptions.RemoveEmptyEntries).Select(x =>
+            {
+                var status = int.Parse(x.Trim());
 
-        public WorkflowExpression<string> Body
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
+                var description = _httpStatusCodeDictionary.TryGetValue(status, out var text)
+                    ? $"{status} {text}"
+                    : status.ToString()
+                    ;
 
-        public WorkflowExpression<string> ContentType
-        {
-            get => GetProperty(() => new WorkflowExpression<string>("application/json"));
-            set => SetProperty(value);
-        }
+                return new Outcome(status.ToString(), new LocalizedString(description, description));
+            }).ToList()
+            : [];
+        outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
 
-        public string HttpResponseCodes
-        {
-            get => GetProperty(() => "200");
-            set => SetProperty(value);
-        }
+        return outcomes;
+    }
+
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var headersText = await _expressionEvaluator.EvaluateAsync(Headers, workflowContext, _urlEncoder);
+        var headers = ParseHeaders(headersText);
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        var httpMethod = HttpMethod;
+        var url = await _expressionEvaluator.EvaluateAsync(Url, workflowContext, _urlEncoder);
+        var request = new HttpRequestMessage(new HttpMethod(httpMethod), url);
+        foreach (var header in headers)
         {
-            var outcomes = !string.IsNullOrWhiteSpace(HttpResponseCodes)
-                ? HttpResponseCodes.Split(',', StringSplitOptions.RemoveEmptyEntries).Select(x =>
-                {
-                    var status = int.Parse(x.Trim());
-
-                    var description = _httpStatusCodeDictionary.TryGetValue(status, out var text)
-                        ? $"{status} {text}"
-                        : status.ToString()
-                        ;
-
-                    return new Outcome(status.ToString(), new LocalizedString(description, description));
-                }).ToList()
-                : [];
-            outcomes.Add(new Outcome("UnhandledHttpStatus", S["Unhandled Http Status"]));
-
-            return outcomes;
+            request.Headers.TryAddWithoutValidation(header.Key, header.Value);
         }
 
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        if (HttpMethods.IsPatch(httpMethod) || HttpMethods.IsPost(httpMethod) || HttpMethods.IsPut(httpMethod))
         {
-            var headersText = await _expressionEvaluator.EvaluateAsync(Headers, workflowContext, _urlEncoder);
-            var headers = ParseHeaders(headersText);
-
-            var httpMethod = HttpMethod;
-            var url = await _expressionEvaluator.EvaluateAsync(Url, workflowContext, _urlEncoder);
-            var request = new HttpRequestMessage(new HttpMethod(httpMethod), url);
-            foreach (var header in headers)
-            {
-                request.Headers.TryAddWithoutValidation(header.Key, header.Value);
-            }
+            var body = await _expressionEvaluator.EvaluateAsync(Body, workflowContext, null);
+            var contentType = await _expressionEvaluator.EvaluateAsync(ContentType, workflowContext, _urlEncoder);
+            request.Content = new StringContent(body, Encoding.UTF8, contentType);
+        }
 
-            if (HttpMethods.IsPatch(httpMethod) || HttpMethods.IsPost(httpMethod) || HttpMethods.IsPut(httpMethod))
-            {
-                var body = await _expressionEvaluator.EvaluateAsync(Body, workflowContext, null);
-                var contentType = await _expressionEvaluator.EvaluateAsync(ContentType, workflowContext, _urlEncoder);
-                request.Content = new StringContent(body, Encoding.UTF8, contentType);
-            }
+        var httpClient = _httpClientFactory.CreateClient();
 
-            var httpClient = _httpClientFactory.CreateClient();
+        var response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseContentRead);
 
-            var response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseContentRead);
+        var responseCodes = ParseResponseCodes(HttpResponseCodes);
 
-            var responseCodes = ParseResponseCodes(HttpResponseCodes);
+        var outcome = responseCodes.FirstOrDefault(x => x == (int)response.StatusCode);
 
-            var outcome = responseCodes.FirstOrDefault(x => x == (int)response.StatusCode);
+        workflowContext.LastResult = new
+        {
+            Body = await response.Content.ReadAsStringAsync(),
+            Headers = response.Headers.ToDictionary(x => x.Key),
+            response.StatusCode,
+            response.ReasonPhrase,
+            response.IsSuccessStatusCode
+        };
 
-            workflowContext.LastResult = new
-            {
-                Body = await response.Content.ReadAsStringAsync(),
-                Headers = response.Headers.ToDictionary(x => x.Key),
-                response.StatusCode,
-                response.ReasonPhrase,
-                response.IsSuccessStatusCode
-            };
-
-            return Outcomes(outcome != 0 ? outcome.ToString() : "UnhandledHttpStatus");
-        }
+        return Outcomes(outcome != 0 ? outcome.ToString() : "UnhandledHttpStatus");
+    }
 
-        private static IEnumerable<KeyValuePair<string, string>> ParseHeaders(string text)
+    private static IEnumerable<KeyValuePair<string, string>> ParseHeaders(string text)
+    {
+        if (string.IsNullOrWhiteSpace(text))
         {
-            if (string.IsNullOrWhiteSpace(text))
-            {
-                return [];
-            }
-
-            return
-                from header in text.Split(_separator, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim())
-                let pair = header.Split(':', 2)
-                where pair.Length == 2
-                select new KeyValuePair<string, string>(pair[0], pair[1]);
+            return [];
         }
 
-        private static IEnumerable<int> ParseResponseCodes(string text)
-        {
-            return
-                from code in text.Split(',', StringSplitOptions.RemoveEmptyEntries)
-                select int.Parse(code);
-        }
+        return
+            from header in text.Split(_separator, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim())
+            let pair = header.Split(':', 2)
+            where pair.Length == 2
+            select new KeyValuePair<string, string>(pair[0], pair[1]);
+    }
+
+    private static IEnumerable<int> ParseResponseCodes(string text)
+    {
+        return
+            from code in text.Split(',', StringSplitOptions.RemoveEmptyEntries)
+            select int.Parse(code);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpResponseTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpResponseTask.cs
index 272dcbd8aee..ced1e77e876 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpResponseTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/HttpResponseTask.cs
@@ -11,104 +11,103 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Http.Activities
+namespace OrchardCore.Workflows.Http.Activities;
+
+public class HttpResponseTask : TaskActivity<HttpResponseTask>
 {
-    public class HttpResponseTask : TaskActivity<HttpResponseTask>
+    private static readonly string[] _separator = ["\r\n", "\n", "\r"];
+
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
+    protected readonly IStringLocalizer S;
+    private readonly UrlEncoder _urlEncoder;
+
+    public HttpResponseTask(
+        IStringLocalizer<HttpResponseTask> localizer,
+        IHttpContextAccessor httpContextAccessor,
+        IWorkflowExpressionEvaluator expressionEvaluator,
+        UrlEncoder urlEncoder
+    )
     {
-        private static readonly string[] _separator = ["\r\n", "\n", "\r"];
-
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
-        protected readonly IStringLocalizer S;
-        private readonly UrlEncoder _urlEncoder;
-
-        public HttpResponseTask(
-            IStringLocalizer<HttpResponseTask> localizer,
-            IHttpContextAccessor httpContextAccessor,
-            IWorkflowExpressionEvaluator expressionEvaluator,
-            UrlEncoder urlEncoder
-        )
-        {
-            S = localizer;
-            _httpContextAccessor = httpContextAccessor;
-            _expressionEvaluator = expressionEvaluator;
-            _urlEncoder = urlEncoder;
-        }
+        S = localizer;
+        _httpContextAccessor = httpContextAccessor;
+        _expressionEvaluator = expressionEvaluator;
+        _urlEncoder = urlEncoder;
+    }
 
-        public override LocalizedString DisplayText => S["Http Response Task"];
+    public override LocalizedString DisplayText => S["Http Response Task"];
 
-        public override LocalizedString Category => S["HTTP"];
+    public override LocalizedString Category => S["HTTP"];
 
-        public WorkflowExpression<string> Content
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
+    public WorkflowExpression<string> Content
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
 
-        public int HttpStatusCode
-        {
-            get => GetProperty(() => 200);
-            set => SetProperty(value);
-        }
+    public int HttpStatusCode
+    {
+        get => GetProperty(() => 200);
+        set => SetProperty(value);
+    }
 
-        public WorkflowExpression<string> Headers
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
+    public WorkflowExpression<string> Headers
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<string> ContentType
+    {
+        get => GetProperty(() => new WorkflowExpression<string>("application/json"));
+        set => SetProperty(value);
+    }
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"]);
+    }
 
-        public WorkflowExpression<string> ContentType
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var headersString = await _expressionEvaluator.EvaluateAsync(Headers, workflowContext, _urlEncoder);
+        var content = await _expressionEvaluator.EvaluateAsync(Content, workflowContext, null);
+        var contentType = await _expressionEvaluator.EvaluateAsync(ContentType, workflowContext, _urlEncoder);
+        var headers = ParseHeaders(headersString);
+        var response = _httpContextAccessor.HttpContext.Response;
+
+        response.StatusCode = HttpStatusCode;
+
+        foreach (var header in headers)
         {
-            get => GetProperty(() => new WorkflowExpression<string>("application/json"));
-            set => SetProperty(value);
+            response.Headers.Append(header.Key, header.Value);
         }
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        if (!string.IsNullOrWhiteSpace(contentType))
         {
-            return Outcomes(S["Done"]);
+            response.ContentType = contentType;
         }
 
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        if (!string.IsNullOrWhiteSpace(content))
         {
-            var headersString = await _expressionEvaluator.EvaluateAsync(Headers, workflowContext, _urlEncoder);
-            var content = await _expressionEvaluator.EvaluateAsync(Content, workflowContext, null);
-            var contentType = await _expressionEvaluator.EvaluateAsync(ContentType, workflowContext, _urlEncoder);
-            var headers = ParseHeaders(headersString);
-            var response = _httpContextAccessor.HttpContext.Response;
-
-            response.StatusCode = HttpStatusCode;
-
-            foreach (var header in headers)
-            {
-                response.Headers.Append(header.Key, header.Value);
-            }
-
-            if (!string.IsNullOrWhiteSpace(contentType))
-            {
-                response.ContentType = contentType;
-            }
-
-            if (!string.IsNullOrWhiteSpace(content))
-            {
-                await response.WriteAsync(content);
-            }
-
-            _httpContextAccessor.HttpContext.Items[WorkflowHttpResult.Instance] = WorkflowHttpResult.Instance;
-            return Outcomes("Done");
+            await response.WriteAsync(content);
         }
 
-        private static IEnumerable<KeyValuePair<string, StringValues>> ParseHeaders(string text)
+        _httpContextAccessor.HttpContext.Items[WorkflowHttpResult.Instance] = WorkflowHttpResult.Instance;
+        return Outcomes("Done");
+    }
+
+    private static IEnumerable<KeyValuePair<string, StringValues>> ParseHeaders(string text)
+    {
+        if (string.IsNullOrWhiteSpace(text))
         {
-            if (string.IsNullOrWhiteSpace(text))
-            {
-                return [];
-            }
-
-            return
-                from header in text.Split(_separator, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim())
-                let pair = header.Split(':')
-                where pair.Length == 2
-                select new KeyValuePair<string, StringValues>(pair[0], pair[1]);
+            return [];
         }
+
+        return
+            from header in text.Split(_separator, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim())
+            let pair = header.Split(':')
+            where pair.Length == 2
+            select new KeyValuePair<string, StringValues>(pair[0], pair[1]);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/SignalEvent.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/SignalEvent.cs
index deab1f2696b..e71b3da3c09 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/SignalEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Activities/SignalEvent.cs
@@ -8,44 +8,43 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Http.Activities
+namespace OrchardCore.Workflows.Http.Activities;
+
+public class SignalEvent : EventActivity
 {
-    public class SignalEvent : EventActivity
+    public static string EventName => nameof(SignalEvent);
+    private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
+    protected readonly IStringLocalizer S;
+
+    public SignalEvent(IWorkflowExpressionEvaluator expressionEvaluator, IStringLocalizer<SignalEvent> localizer)
+    {
+        _expressionEvaluator = expressionEvaluator;
+        S = localizer;
+    }
+
+    public override string Name => EventName;
+    public override LocalizedString DisplayText => S["Signal Event"];
+    public override LocalizedString Category => S["HTTP"];
+
+    public WorkflowExpression<string> SignalName
+    {
+        get => GetProperty(() => new WorkflowExpression<string>());
+        set => SetProperty(value);
+    }
+
+    public override async Task<bool> CanExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var signalName = await _expressionEvaluator.EvaluateAsync(SignalName, workflowContext, null);
+        return string.Equals(workflowContext.Input.GetValue<string>("Signal"), signalName, StringComparison.OrdinalIgnoreCase);
+    }
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"]);
+    }
+
+    public override ActivityExecutionResult Resume(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
     {
-        public static string EventName => nameof(SignalEvent);
-        private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
-        protected readonly IStringLocalizer S;
-
-        public SignalEvent(IWorkflowExpressionEvaluator expressionEvaluator, IStringLocalizer<SignalEvent> localizer)
-        {
-            _expressionEvaluator = expressionEvaluator;
-            S = localizer;
-        }
-
-        public override string Name => EventName;
-        public override LocalizedString DisplayText => S["Signal Event"];
-        public override LocalizedString Category => S["HTTP"];
-
-        public WorkflowExpression<string> SignalName
-        {
-            get => GetProperty(() => new WorkflowExpression<string>());
-            set => SetProperty(value);
-        }
-
-        public override async Task<bool> CanExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var signalName = await _expressionEvaluator.EvaluateAsync(SignalName, workflowContext, null);
-            return string.Equals(workflowContext.Input.GetValue<string>("Signal"), signalName, StringComparison.OrdinalIgnoreCase);
-        }
-
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"]);
-        }
-
-        public override ActivityExecutionResult Resume(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes("Done");
-        }
+        return Outcomes("Done");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Controllers/HttpWorkflowController.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Controllers/HttpWorkflowController.cs
index b0810114202..93ae5f7e535 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Controllers/HttpWorkflowController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Controllers/HttpWorkflowController.cs
@@ -13,275 +13,274 @@
 using OrchardCore.Workflows.Http.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Http.Controllers
+namespace OrchardCore.Workflows.Http.Controllers;
+
+public class HttpWorkflowController : Controller
 {
-    public class HttpWorkflowController : Controller
+    private readonly IAuthorizationService _authorizationService;
+    private readonly IWorkflowManager _workflowManager;
+    private readonly IWorkflowTypeStore _workflowTypeStore;
+    private readonly IWorkflowStore _workflowStore;
+    private readonly IActivityLibrary _activityLibrary;
+    private readonly ISecurityTokenService _securityTokenService;
+    private readonly IAntiforgery _antiforgery;
+    private readonly IDistributedLock _distributedLock;
+    private readonly ILogger _logger;
+    public const int NoExpiryTokenLifespan = 36500;
+
+    public HttpWorkflowController(
+        IAuthorizationService authorizationService,
+        IWorkflowManager workflowManager,
+        IWorkflowTypeStore workflowTypeStore,
+        IWorkflowStore workflowStore,
+        IActivityLibrary activityLibrary,
+        ISecurityTokenService securityTokenService,
+        IAntiforgery antiforgery,
+        IDistributedLock distributedLock,
+        ILogger<HttpWorkflowController> logger
+    )
+    {
+        _authorizationService = authorizationService;
+        _workflowManager = workflowManager;
+        _workflowTypeStore = workflowTypeStore;
+        _workflowStore = workflowStore;
+        _activityLibrary = activityLibrary;
+        _securityTokenService = securityTokenService;
+        _antiforgery = antiforgery;
+        _distributedLock = distributedLock;
+        _logger = logger;
+    }
+
+    [HttpPost]
+    [Admin]
+    public async Task<IActionResult> GenerateUrl(long workflowTypeId, string activityId, int tokenLifeSpan)
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IWorkflowManager _workflowManager;
-        private readonly IWorkflowTypeStore _workflowTypeStore;
-        private readonly IWorkflowStore _workflowStore;
-        private readonly IActivityLibrary _activityLibrary;
-        private readonly ISecurityTokenService _securityTokenService;
-        private readonly IAntiforgery _antiforgery;
-        private readonly IDistributedLock _distributedLock;
-        private readonly ILogger _logger;
-        public const int NoExpiryTokenLifespan = 36500;
-
-        public HttpWorkflowController(
-            IAuthorizationService authorizationService,
-            IWorkflowManager workflowManager,
-            IWorkflowTypeStore workflowTypeStore,
-            IWorkflowStore workflowStore,
-            IActivityLibrary activityLibrary,
-            ISecurityTokenService securityTokenService,
-            IAntiforgery antiforgery,
-            IDistributedLock distributedLock,
-            ILogger<HttpWorkflowController> logger
-        )
+        if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
         {
-            _authorizationService = authorizationService;
-            _workflowManager = workflowManager;
-            _workflowTypeStore = workflowTypeStore;
-            _workflowStore = workflowStore;
-            _activityLibrary = activityLibrary;
-            _securityTokenService = securityTokenService;
-            _antiforgery = antiforgery;
-            _distributedLock = distributedLock;
-            _logger = logger;
+            return Forbid();
         }
 
-        [HttpPost]
-        [Admin]
-        public async Task<IActionResult> GenerateUrl(long workflowTypeId, string activityId, int tokenLifeSpan)
+        var workflowType = await _workflowTypeStore.GetAsync(workflowTypeId);
+
+        if (workflowType == null)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageWorkflows))
-            {
-                return Forbid();
-            }
+            return NotFound();
+        }
+
+        var token = _securityTokenService.CreateToken(new WorkflowPayload(workflowType.WorkflowTypeId, activityId), TimeSpan.FromDays(tokenLifeSpan == 0 ? NoExpiryTokenLifespan : tokenLifeSpan));
+        var url = Url.Action("Invoke", "HttpWorkflow", new { token });
+
+        return Ok(url);
+    }
+
+    [IgnoreAntiforgeryToken]
+    [HttpGet, HttpPost, HttpPut, HttpPatch]
+    public async Task<IActionResult> Invoke(string token)
+    {
+        if (!_securityTokenService.TryDecryptToken<WorkflowPayload>(token, out var payload))
+        {
+            _logger.LogWarning("Invalid SAS token provided");
+            return NotFound();
+        }
 
-            var workflowType = await _workflowTypeStore.GetAsync(workflowTypeId);
+        // Get the workflow type.
+        var workflowType = await _workflowTypeStore.GetAsync(payload.WorkflowId);
 
-            if (workflowType == null)
+        if (workflowType == null)
+        {
+            if (_logger.IsEnabled(LogLevel.Warning))
             {
-                return NotFound();
+                _logger.LogWarning("The provided workflow with ID '{WorkflowTypeId}' could not be found.", payload.WorkflowId);
             }
 
-            var token = _securityTokenService.CreateToken(new WorkflowPayload(workflowType.WorkflowTypeId, activityId), TimeSpan.FromDays(tokenLifeSpan == 0 ? NoExpiryTokenLifespan : tokenLifeSpan));
-            var url = Url.Action("Invoke", "HttpWorkflow", new { token });
-
-            return Ok(url);
+            return NotFound();
         }
 
-        [IgnoreAntiforgeryToken]
-        [HttpGet, HttpPost, HttpPut, HttpPatch]
-        public async Task<IActionResult> Invoke(string token)
+        if (!workflowType.IsEnabled)
         {
-            if (!_securityTokenService.TryDecryptToken<WorkflowPayload>(token, out var payload))
+            if (_logger.IsEnabled(LogLevel.Warning))
             {
-                _logger.LogWarning("Invalid SAS token provided");
-                return NotFound();
+                _logger.LogWarning("The provided workflow with ID '{WorkflowTypeId}' is not enabled.", payload.WorkflowId);
             }
 
-            // Get the workflow type.
-            var workflowType = await _workflowTypeStore.GetAsync(payload.WorkflowId);
+            return NotFound();
+        }
 
-            if (workflowType == null)
-            {
-                if (_logger.IsEnabled(LogLevel.Warning))
-                {
-                    _logger.LogWarning("The provided workflow with ID '{WorkflowTypeId}' could not be found.", payload.WorkflowId);
-                }
+        // Get the activity record using the activity ID provided by the token.
+        var startActivity = workflowType.Activities.FirstOrDefault(x => x.ActivityId == payload.ActivityId);
 
-                return NotFound();
+        if (startActivity == null)
+        {
+            if (_logger.IsEnabled(LogLevel.Warning))
+            {
+                _logger.LogWarning("The provided activity with ID '{ActivityId}' could not be found.", payload.ActivityId);
             }
 
-            if (!workflowType.IsEnabled)
-            {
-                if (_logger.IsEnabled(LogLevel.Warning))
-                {
-                    _logger.LogWarning("The provided workflow with ID '{WorkflowTypeId}' is not enabled.", payload.WorkflowId);
-                }
+            return NotFound();
+        }
 
-                return NotFound();
+        // Instantiate and bind an actual HttpRequestEvent object to check its settings.
+        var httpRequestActivity = _activityLibrary.InstantiateActivity<HttpRequestEvent>(startActivity);
+
+        if (httpRequestActivity == null)
+        {
+            if (_logger.IsEnabled(LogLevel.Warning))
+            {
+                _logger.LogWarning("Activity with name '{ActivityName}' could not be found.", startActivity.Name);
             }
 
-            // Get the activity record using the activity ID provided by the token.
-            var startActivity = workflowType.Activities.FirstOrDefault(x => x.ActivityId == payload.ActivityId);
+            return NotFound();
+        }
+
+        // Check if the HttpRequestEvent is configured to perform antiforgery token validation. If so, perform the validation.
+        if (httpRequestActivity.ValidateAntiforgeryToken && (!await _antiforgery.IsRequestValidAsync(HttpContext)))
+        {
+            _logger.LogWarning("Antiforgery token validation failed.");
+            return BadRequest();
+        }
 
-            if (startActivity == null)
+        // If the activity is a start activity, start a new workflow.
+        if (startActivity.IsStart)
+        {
+            // If a singleton, try to acquire a lock per workflow type.
+            (var locker, var locked) = await _distributedLock.TryAcquireWorkflowTypeLockAsync(workflowType);
+            if (locked)
             {
-                if (_logger.IsEnabled(LogLevel.Warning))
+                await using var acquiredLock = locker;
+
+                // Check if this is not a workflow singleton or there's not already an halted instance on any activity.
+                if (!workflowType.IsSingleton || !await _workflowStore.HasHaltedInstanceAsync(workflowType.WorkflowTypeId))
                 {
-                    _logger.LogWarning("The provided activity with ID '{ActivityId}' could not be found.", payload.ActivityId);
-                }
+                    if (_logger.IsEnabled(LogLevel.Debug))
+                    {
+                        _logger.LogDebug("Invoking new workflow of type '{WorkflowTypeId}' with start activity '{ActivityId}'", workflowType.WorkflowTypeId, startActivity.ActivityId);
+                    }
 
-                return NotFound();
+                    await _workflowManager.StartWorkflowAsync(workflowType, startActivity);
+                }
             }
+        }
+        else
+        {
+            // Otherwise, we need to resume all halted workflows on this activity.
+            var workflows = await _workflowStore.ListAsync(workflowType.WorkflowTypeId, new[] { startActivity.ActivityId });
 
-            // Instantiate and bind an actual HttpRequestEvent object to check its settings.
-            var httpRequestActivity = _activityLibrary.InstantiateActivity<HttpRequestEvent>(startActivity);
-
-            if (httpRequestActivity == null)
+            if (!workflows.Any())
             {
                 if (_logger.IsEnabled(LogLevel.Warning))
                 {
-                    _logger.LogWarning("Activity with name '{ActivityName}' could not be found.", startActivity.Name);
+                    _logger.LogWarning("No workflow found that is blocked on activity '{ActivityId}'", startActivity.ActivityId);
                 }
 
                 return NotFound();
             }
 
-            // Check if the HttpRequestEvent is configured to perform antiforgery token validation. If so, perform the validation.
-            if (httpRequestActivity.ValidateAntiforgeryToken && (!await _antiforgery.IsRequestValidAsync(HttpContext)))
+            foreach (var workflow in workflows)
             {
-                _logger.LogWarning("Antiforgery token validation failed.");
-                return BadRequest();
-            }
+                var blockingActivity = workflow.BlockingActivities.FirstOrDefault(x => x.ActivityId == startActivity.ActivityId);
 
-            // If the activity is a start activity, start a new workflow.
-            if (startActivity.IsStart)
-            {
-                // If a singleton, try to acquire a lock per workflow type.
-                (var locker, var locked) = await _distributedLock.TryAcquireWorkflowTypeLockAsync(workflowType);
-                if (locked)
+                if (blockingActivity != null)
                 {
-                    await using var acquiredLock = locker;
-
-                    // Check if this is not a workflow singleton or there's not already an halted instance on any activity.
-                    if (!workflowType.IsSingleton || !await _workflowStore.HasHaltedInstanceAsync(workflowType.WorkflowTypeId))
+                    if (_logger.IsEnabled(LogLevel.Debug))
                     {
-                        if (_logger.IsEnabled(LogLevel.Debug))
-                        {
-                            _logger.LogDebug("Invoking new workflow of type '{WorkflowTypeId}' with start activity '{ActivityId}'", workflowType.WorkflowTypeId, startActivity.ActivityId);
-                        }
-
-                        await _workflowManager.StartWorkflowAsync(workflowType, startActivity);
+                        _logger.LogDebug("Resuming workflow with ID '{WorkflowId}' on activity '{ActivityId}'", workflow.WorkflowId, blockingActivity.ActivityId);
                     }
-                }
-            }
-            else
-            {
-                // Otherwise, we need to resume all halted workflows on this activity.
-                var workflows = await _workflowStore.ListAsync(workflowType.WorkflowTypeId, new[] { startActivity.ActivityId });
 
-                if (!workflows.Any())
-                {
-                    if (_logger.IsEnabled(LogLevel.Warning))
+                    // If atomic, try to acquire a lock per workflow instance.
+                    (var locker, var locked) = await _distributedLock.TryAcquireWorkflowLockAsync(workflow);
+                    if (!locked)
                     {
-                        _logger.LogWarning("No workflow found that is blocked on activity '{ActivityId}'", startActivity.ActivityId);
+                        continue;
                     }
 
-                    return NotFound();
-                }
+                    await using var acquiredLock = locker;
 
-                foreach (var workflow in workflows)
-                {
-                    var blockingActivity = workflow.BlockingActivities.FirstOrDefault(x => x.ActivityId == startActivity.ActivityId);
+                    // If atomic, check if the workflow still exists.
+                    var haltedWorkflow = workflow.IsAtomic ? await _workflowStore.GetAsync(workflow.WorkflowId) : workflow;
+                    if (haltedWorkflow == null)
+                    {
+                        continue;
+                    }
 
+                    // And if it is still halted on this activity.
+                    blockingActivity = haltedWorkflow.BlockingActivities.FirstOrDefault(x => x.ActivityId == startActivity.ActivityId);
                     if (blockingActivity != null)
                     {
-                        if (_logger.IsEnabled(LogLevel.Debug))
-                        {
-                            _logger.LogDebug("Resuming workflow with ID '{WorkflowId}' on activity '{ActivityId}'", workflow.WorkflowId, blockingActivity.ActivityId);
-                        }
-
-                        // If atomic, try to acquire a lock per workflow instance.
-                        (var locker, var locked) = await _distributedLock.TryAcquireWorkflowLockAsync(workflow);
-                        if (!locked)
-                        {
-                            continue;
-                        }
-
-                        await using var acquiredLock = locker;
-
-                        // If atomic, check if the workflow still exists.
-                        var haltedWorkflow = workflow.IsAtomic ? await _workflowStore.GetAsync(workflow.WorkflowId) : workflow;
-                        if (haltedWorkflow == null)
-                        {
-                            continue;
-                        }
-
-                        // And if it is still halted on this activity.
-                        blockingActivity = haltedWorkflow.BlockingActivities.FirstOrDefault(x => x.ActivityId == startActivity.ActivityId);
-                        if (blockingActivity != null)
-                        {
-                            await _workflowManager.ResumeWorkflowAsync(haltedWorkflow, blockingActivity);
-                        }
+                        await _workflowManager.ResumeWorkflowAsync(haltedWorkflow, blockingActivity);
                     }
                 }
             }
+        }
+
+        return GetWorkflowActionResult();
+    }
 
-            return GetWorkflowActionResult();
+    [HttpGet]
+    public async Task<IActionResult> Trigger(string token)
+    {
+        if (!_securityTokenService.TryDecryptToken<SignalPayload>(token, out var payload))
+        {
+            _logger.LogWarning("Invalid SAS token provided");
+            return NotFound();
         }
 
-        [HttpGet]
-        public async Task<IActionResult> Trigger(string token)
+        var input = new Dictionary<string, object> { { "Signal", payload.SignalName } };
+
+        // If a specific workflow was provided, then resume that workflow.
+        if (!string.IsNullOrWhiteSpace(payload.WorkflowId))
         {
-            if (!_securityTokenService.TryDecryptToken<SignalPayload>(token, out var payload))
+            var workflow = await _workflowStore.GetAsync(payload.WorkflowId);
+            var signalActivities = workflow?.BlockingActivities.Where(x => x.Name == SignalEvent.EventName).ToList();
+
+            if (signalActivities == null)
             {
-                _logger.LogWarning("Invalid SAS token provided");
                 return NotFound();
             }
 
-            var input = new Dictionary<string, object> { { "Signal", payload.SignalName } };
-
-            // If a specific workflow was provided, then resume that workflow.
-            if (!string.IsNullOrWhiteSpace(payload.WorkflowId))
+            // If atomic, try to acquire a lock per workflow instance.
+            (var locker, var locked) = await _distributedLock.TryAcquireWorkflowLockAsync(workflow);
+            if (locked)
             {
-                var workflow = await _workflowStore.GetAsync(payload.WorkflowId);
-                var signalActivities = workflow?.BlockingActivities.Where(x => x.Name == SignalEvent.EventName).ToList();
-
-                if (signalActivities == null)
-                {
-                    return NotFound();
-                }
+                await using var acquiredLock = locker;
 
-                // If atomic, try to acquire a lock per workflow instance.
-                (var locker, var locked) = await _distributedLock.TryAcquireWorkflowLockAsync(workflow);
-                if (locked)
+                // Check if the workflow still exists (without checking if it is correlated).
+                workflow = workflow.IsAtomic ? await _workflowStore.GetAsync(workflow.WorkflowId) : workflow;
+                if (workflow != null)
                 {
-                    await using var acquiredLock = locker;
-
-                    // Check if the workflow still exists (without checking if it is correlated).
-                    workflow = workflow.IsAtomic ? await _workflowStore.GetAsync(workflow.WorkflowId) : workflow;
-                    if (workflow != null)
+                    // The workflow could be blocking on multiple Signal activities, but only the activity with the provided signal name
+                    // will be executed as SignalEvent checks for the provided "Signal" input.
+                    signalActivities = workflow.BlockingActivities.Where(x => x.Name == SignalEvent.EventName).ToList();
+                    foreach (var signalActivity in signalActivities)
                     {
-                        // The workflow could be blocking on multiple Signal activities, but only the activity with the provided signal name
-                        // will be executed as SignalEvent checks for the provided "Signal" input.
-                        signalActivities = workflow.BlockingActivities.Where(x => x.Name == SignalEvent.EventName).ToList();
-                        foreach (var signalActivity in signalActivities)
-                        {
-                            await _workflowManager.ResumeWorkflowAsync(workflow, signalActivity, input);
-                        }
+                        await _workflowManager.ResumeWorkflowAsync(workflow, signalActivity, input);
                     }
                 }
             }
-            else
-            {
-                // Resume all workflows with the specified correlation ID and start workflows with SignalEvent as their start activity.
-                await _workflowManager.TriggerEventAsync(SignalEvent.EventName, input, payload.CorrelationId);
-            }
-
-            return GetWorkflowActionResult();
         }
-
-        /// <summary>
-        /// Returns the appropriate action result depending on whether the status code has already been set by a workflow.
-        /// </summary>
-        private IActionResult GetWorkflowActionResult()
+        else
         {
-            if (HttpContext.Items.ContainsKey(WorkflowHttpResult.Instance))
-            {
-                return new EmptyResult();
-            }
+            // Resume all workflows with the specified correlation ID and start workflows with SignalEvent as their start activity.
+            await _workflowManager.TriggerEventAsync(SignalEvent.EventName, input, payload.CorrelationId);
+        }
 
-            if (HttpContext.Items.TryGetValue(WorkflowConstants.FormOriginatedLocationItemsKey, out var value))
-            {
-                return Redirect(value.ToString().ToUriComponents());
-            }
+        return GetWorkflowActionResult();
+    }
 
-            return Accepted();
+    /// <summary>
+    /// Returns the appropriate action result depending on whether the status code has already been set by a workflow.
+    /// </summary>
+    private IActionResult GetWorkflowActionResult()
+    {
+        if (HttpContext.Items.ContainsKey(WorkflowHttpResult.Instance))
+        {
+            return new EmptyResult();
         }
+
+        if (HttpContext.Items.TryGetValue(WorkflowConstants.FormOriginatedLocationItemsKey, out var value))
+        {
+            return Redirect(value.ToString().ToUriComponents());
+        }
+
+        return Accepted();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpRedirectTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpRedirectTaskDisplayDriver.cs
index 714786890d0..9f07f88697c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpRedirectTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpRedirectTaskDisplayDriver.cs
@@ -3,20 +3,19 @@
 using OrchardCore.Workflows.Http.ViewModels;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Http.Drivers
+namespace OrchardCore.Workflows.Http.Drivers;
+
+public sealed class HttpRedirectTaskDisplayDriver : ActivityDisplayDriver<HttpRedirectTask, HttpRedirectTaskViewModel>
 {
-    public sealed class HttpRedirectTaskDisplayDriver : ActivityDisplayDriver<HttpRedirectTask, HttpRedirectTaskViewModel>
+    protected override void EditActivity(HttpRedirectTask activity, HttpRedirectTaskViewModel model)
     {
-        protected override void EditActivity(HttpRedirectTask activity, HttpRedirectTaskViewModel model)
-        {
-            model.Location = activity.Location.Expression;
-            model.Permanent = activity.Permanent;
-        }
+        model.Location = activity.Location.Expression;
+        model.Permanent = activity.Permanent;
+    }
 
-        protected override void UpdateActivity(HttpRedirectTaskViewModel model, HttpRedirectTask activity)
-        {
-            activity.Location = new WorkflowExpression<string>(model.Location?.Trim());
-            activity.Permanent = model.Permanent;
-        }
+    protected override void UpdateActivity(HttpRedirectTaskViewModel model, HttpRedirectTask activity)
+    {
+        activity.Location = new WorkflowExpression<string>(model.Location?.Trim());
+        activity.Permanent = model.Permanent;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpRequestEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpRequestEventDisplayDriver.cs
index 3f41d69384f..a2e77fc69c5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpRequestEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpRequestEventDisplayDriver.cs
@@ -2,26 +2,25 @@
 using OrchardCore.Workflows.Http.Activities;
 using OrchardCore.Workflows.Http.ViewModels;
 
-namespace OrchardCore.Workflows.Http.Drivers
+namespace OrchardCore.Workflows.Http.Drivers;
+
+public sealed class HttpRequestEventDisplayDriver : ActivityDisplayDriver<HttpRequestEvent, HttpRequestEventViewModel>
 {
-    public sealed class HttpRequestEventDisplayDriver : ActivityDisplayDriver<HttpRequestEvent, HttpRequestEventViewModel>
+    protected override void EditActivity(HttpRequestEvent activity, HttpRequestEventViewModel model)
     {
-        protected override void EditActivity(HttpRequestEvent activity, HttpRequestEventViewModel model)
-        {
-            model.HttpMethod = activity.HttpMethod;
-            model.Url = activity.Url;
-            model.ValidateAntiforgeryToken = activity.ValidateAntiforgeryToken;
-            model.TokenLifeSpan = activity.TokenLifeSpan;
-            model.FormLocationKey = activity.FormLocationKey;
-        }
+        model.HttpMethod = activity.HttpMethod;
+        model.Url = activity.Url;
+        model.ValidateAntiforgeryToken = activity.ValidateAntiforgeryToken;
+        model.TokenLifeSpan = activity.TokenLifeSpan;
+        model.FormLocationKey = activity.FormLocationKey;
+    }
 
-        protected override void UpdateActivity(HttpRequestEventViewModel model, HttpRequestEvent activity)
-        {
-            activity.HttpMethod = model.HttpMethod?.Trim();
-            activity.Url = model.Url?.Trim();
-            activity.ValidateAntiforgeryToken = model.ValidateAntiforgeryToken;
-            activity.TokenLifeSpan = model.TokenLifeSpan;
-            activity.FormLocationKey = model.FormLocationKey?.Trim();
-        }
+    protected override void UpdateActivity(HttpRequestEventViewModel model, HttpRequestEvent activity)
+    {
+        activity.HttpMethod = model.HttpMethod?.Trim();
+        activity.Url = model.Url?.Trim();
+        activity.ValidateAntiforgeryToken = model.ValidateAntiforgeryToken;
+        activity.TokenLifeSpan = model.TokenLifeSpan;
+        activity.FormLocationKey = model.FormLocationKey?.Trim();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpRequestFilterEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpRequestFilterEventDisplayDriver.cs
index 7b63ac126c1..8917d5f20a9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpRequestFilterEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpRequestFilterEventDisplayDriver.cs
@@ -2,29 +2,28 @@
 using OrchardCore.Workflows.Http.Activities;
 using OrchardCore.Workflows.Http.ViewModels;
 
-namespace OrchardCore.Workflows.Http.Drivers
+namespace OrchardCore.Workflows.Http.Drivers;
+
+public sealed class HttpRequestFilterEventDisplayDriver : ActivityDisplayDriver<HttpRequestFilterEvent, HttpRequestFilterEventViewModel>
 {
-    public sealed class HttpRequestFilterEventDisplayDriver : ActivityDisplayDriver<HttpRequestFilterEvent, HttpRequestFilterEventViewModel>
+    protected override void EditActivity(HttpRequestFilterEvent activity, HttpRequestFilterEventViewModel model)
     {
-        protected override void EditActivity(HttpRequestFilterEvent activity, HttpRequestFilterEventViewModel model)
-        {
-            model.HttpMethod = activity.HttpMethod;
-            model.ControllerName = activity.ControllerName;
-            model.ActionName = activity.ActionName;
-            model.AreaName = activity.AreaName;
-        }
+        model.HttpMethod = activity.HttpMethod;
+        model.ControllerName = activity.ControllerName;
+        model.ActionName = activity.ActionName;
+        model.AreaName = activity.AreaName;
+    }
 
-        protected override void UpdateActivity(HttpRequestFilterEventViewModel model, HttpRequestFilterEvent activity)
-        {
-            activity.HttpMethod = model.HttpMethod?.Trim();
-            activity.ControllerName = NullIfEmpty(model.ControllerName);
-            activity.ActionName = NullIfEmpty(model.ActionName);
-            activity.AreaName = NullIfEmpty(model.AreaName);
-        }
+    protected override void UpdateActivity(HttpRequestFilterEventViewModel model, HttpRequestFilterEvent activity)
+    {
+        activity.HttpMethod = model.HttpMethod?.Trim();
+        activity.ControllerName = NullIfEmpty(model.ControllerName);
+        activity.ActionName = NullIfEmpty(model.ActionName);
+        activity.AreaName = NullIfEmpty(model.AreaName);
+    }
 
-        private static string NullIfEmpty(string s)
-        {
-            return string.IsNullOrWhiteSpace(s) ? null : s.Trim();
-        }
+    private static string NullIfEmpty(string s)
+    {
+        return string.IsNullOrWhiteSpace(s) ? null : s.Trim();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpRequestTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpRequestTaskDisplayDriver.cs
index 14c5377b840..dd49d82b626 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpRequestTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpRequestTaskDisplayDriver.cs
@@ -3,28 +3,27 @@
 using OrchardCore.Workflows.Http.ViewModels;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Http.Drivers
+namespace OrchardCore.Workflows.Http.Drivers;
+
+public sealed class HttpRequestTaskDisplayDriver : ActivityDisplayDriver<HttpRequestTask, HttpRequestTaskViewModel>
 {
-    public sealed class HttpRequestTaskDisplayDriver : ActivityDisplayDriver<HttpRequestTask, HttpRequestTaskViewModel>
+    protected override void EditActivity(HttpRequestTask activity, HttpRequestTaskViewModel model)
     {
-        protected override void EditActivity(HttpRequestTask activity, HttpRequestTaskViewModel model)
-        {
-            model.Url = activity.Url.Expression;
-            model.HttpMethod = activity.HttpMethod;
-            model.Body = activity.Body.Expression;
-            model.ContentType = activity.ContentType.Expression;
-            model.Headers = activity.Headers.Expression;
-            model.HttpResponseCodes = activity.HttpResponseCodes;
-        }
+        model.Url = activity.Url.Expression;
+        model.HttpMethod = activity.HttpMethod;
+        model.Body = activity.Body.Expression;
+        model.ContentType = activity.ContentType.Expression;
+        model.Headers = activity.Headers.Expression;
+        model.HttpResponseCodes = activity.HttpResponseCodes;
+    }
 
-        protected override void UpdateActivity(HttpRequestTaskViewModel model, HttpRequestTask activity)
-        {
-            activity.Url = new WorkflowExpression<string>(model.Url?.Trim());
-            activity.HttpMethod = model.HttpMethod;
-            activity.Body = new WorkflowExpression<string>(model.Body);
-            activity.ContentType = new WorkflowExpression<string>(model.ContentType?.Trim());
-            activity.Headers = new WorkflowExpression<string>(model.Headers?.Trim());
-            activity.HttpResponseCodes = model.HttpResponseCodes;
-        }
+    protected override void UpdateActivity(HttpRequestTaskViewModel model, HttpRequestTask activity)
+    {
+        activity.Url = new WorkflowExpression<string>(model.Url?.Trim());
+        activity.HttpMethod = model.HttpMethod;
+        activity.Body = new WorkflowExpression<string>(model.Body);
+        activity.ContentType = new WorkflowExpression<string>(model.ContentType?.Trim());
+        activity.Headers = new WorkflowExpression<string>(model.Headers?.Trim());
+        activity.HttpResponseCodes = model.HttpResponseCodes;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpResponseTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpResponseTaskDisplayDriver.cs
index 2ed71315f5d..195d1c082dd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpResponseTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/HttpResponseTaskDisplayDriver.cs
@@ -3,24 +3,23 @@
 using OrchardCore.Workflows.Http.ViewModels;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Http.Drivers
+namespace OrchardCore.Workflows.Http.Drivers;
+
+public sealed class HttpResponseTaskDisplayDriver : ActivityDisplayDriver<HttpResponseTask, HttpResponseTaskViewModel>
 {
-    public sealed class HttpResponseTaskDisplayDriver : ActivityDisplayDriver<HttpResponseTask, HttpResponseTaskViewModel>
+    protected override void EditActivity(HttpResponseTask activity, HttpResponseTaskViewModel model)
     {
-        protected override void EditActivity(HttpResponseTask activity, HttpResponseTaskViewModel model)
-        {
-            model.HttpStatusCode = activity.HttpStatusCode;
-            model.Content = activity.Content.Expression;
-            model.ContentType = activity.ContentType.Expression;
-            model.Headers = activity.Headers.Expression;
-        }
+        model.HttpStatusCode = activity.HttpStatusCode;
+        model.Content = activity.Content.Expression;
+        model.ContentType = activity.ContentType.Expression;
+        model.Headers = activity.Headers.Expression;
+    }
 
-        protected override void UpdateActivity(HttpResponseTaskViewModel model, HttpResponseTask activity)
-        {
-            activity.HttpStatusCode = model.HttpStatusCode;
-            activity.Content = new WorkflowExpression<string>(model.Content);
-            activity.ContentType = new WorkflowExpression<string>(model.ContentType?.Trim());
-            activity.Headers = new WorkflowExpression<string>(model.Headers?.Trim());
-        }
+    protected override void UpdateActivity(HttpResponseTaskViewModel model, HttpResponseTask activity)
+    {
+        activity.HttpStatusCode = model.HttpStatusCode;
+        activity.Content = new WorkflowExpression<string>(model.Content);
+        activity.ContentType = new WorkflowExpression<string>(model.ContentType?.Trim());
+        activity.Headers = new WorkflowExpression<string>(model.Headers?.Trim());
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/SignalEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/SignalEventDisplayDriver.cs
index 38fc24e47b0..21ecbf502e5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/SignalEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Drivers/SignalEventDisplayDriver.cs
@@ -3,18 +3,17 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Workflows.Http.Drivers
+namespace OrchardCore.Workflows.Http.Drivers;
+
+public sealed class SignalEventDisplayDriver : ActivityDisplayDriver<SignalEvent, SignalEventViewModel>
 {
-    public sealed class SignalEventDisplayDriver : ActivityDisplayDriver<SignalEvent, SignalEventViewModel>
+    protected override void EditActivity(SignalEvent activity, SignalEventViewModel model)
     {
-        protected override void EditActivity(SignalEvent activity, SignalEventViewModel model)
-        {
-            model.SignalNameExpression = activity.SignalName.Expression;
-        }
+        model.SignalNameExpression = activity.SignalName.Expression;
+    }
 
-        protected override void UpdateActivity(SignalEventViewModel model, SignalEvent activity)
-        {
-            activity.SignalName = new WorkflowExpression<string>(model.SignalNameExpression);
-        }
+    protected override void UpdateActivity(SignalEventViewModel model, SignalEvent activity)
+    {
+        activity.SignalName = new WorkflowExpression<string>(model.SignalNameExpression);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Filters/WorkflowActionFilter.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Filters/WorkflowActionFilter.cs
index b9fc462a77c..23d0db6fdba 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Filters/WorkflowActionFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Filters/WorkflowActionFilter.cs
@@ -6,90 +6,57 @@
 using OrchardCore.Workflows.Http.Services;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Http.Filters
+namespace OrchardCore.Workflows.Http.Filters;
+
+internal sealed class WorkflowActionFilter : IAsyncActionFilter
 {
-    internal sealed class WorkflowActionFilter : IAsyncActionFilter
+    private readonly IWorkflowManager _workflowManager;
+    private readonly IWorkflowTypeRouteEntries _workflowTypeRouteEntries;
+    private readonly IWorkflowInstanceRouteEntries _workflowRouteEntries;
+    private readonly IWorkflowTypeStore _workflowTypeStore;
+    private readonly IWorkflowStore _workflowStore;
+    private readonly IDistributedLock _distributedLock;
+
+    public WorkflowActionFilter(
+        IWorkflowManager workflowManager,
+        IWorkflowTypeRouteEntries workflowTypeRouteEntries,
+        IWorkflowInstanceRouteEntries workflowRouteEntries,
+        IWorkflowTypeStore workflowTypeStore,
+        IWorkflowStore workflowStore,
+        IDistributedLock distributedLock
+    )
     {
-        private readonly IWorkflowManager _workflowManager;
-        private readonly IWorkflowTypeRouteEntries _workflowTypeRouteEntries;
-        private readonly IWorkflowInstanceRouteEntries _workflowRouteEntries;
-        private readonly IWorkflowTypeStore _workflowTypeStore;
-        private readonly IWorkflowStore _workflowStore;
-        private readonly IDistributedLock _distributedLock;
-
-        public WorkflowActionFilter(
-            IWorkflowManager workflowManager,
-            IWorkflowTypeRouteEntries workflowTypeRouteEntries,
-            IWorkflowInstanceRouteEntries workflowRouteEntries,
-            IWorkflowTypeStore workflowTypeStore,
-            IWorkflowStore workflowStore,
-            IDistributedLock distributedLock
-        )
-        {
-            _workflowManager = workflowManager;
-            _workflowTypeRouteEntries = workflowTypeRouteEntries;
-            _workflowRouteEntries = workflowRouteEntries;
-            _workflowTypeStore = workflowTypeStore;
-            _workflowStore = workflowStore;
-            _distributedLock = distributedLock;
-        }
+        _workflowManager = workflowManager;
+        _workflowTypeRouteEntries = workflowTypeRouteEntries;
+        _workflowRouteEntries = workflowRouteEntries;
+        _workflowTypeStore = workflowTypeStore;
+        _workflowStore = workflowStore;
+        _distributedLock = distributedLock;
+    }
 
-        public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+    public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+    {
+        var httpMethod = context.HttpContext.Request.Method;
+        var routeValues = context.RouteData.Values;
+        var workflowTypeEntries = await _workflowTypeRouteEntries.GetWorkflowRouteEntriesAsync(httpMethod, routeValues);
+        var workflowEntries = await _workflowRouteEntries.GetWorkflowRouteEntriesAsync(httpMethod, routeValues);
+
+        if (workflowTypeEntries.Any())
         {
-            var httpMethod = context.HttpContext.Request.Method;
-            var routeValues = context.RouteData.Values;
-            var workflowTypeEntries = await _workflowTypeRouteEntries.GetWorkflowRouteEntriesAsync(httpMethod, routeValues);
-            var workflowEntries = await _workflowRouteEntries.GetWorkflowRouteEntriesAsync(httpMethod, routeValues);
+            var workflowTypeIds = workflowTypeEntries.Select(x => long.Parse(x.WorkflowId)).ToList();
+            var workflowTypes = (await _workflowTypeStore.GetAsync(workflowTypeIds)).ToDictionary(x => x.Id);
+            var correlationId = routeValues.GetValue<string>("correlationid");
 
-            if (workflowTypeEntries.Any())
+            foreach (var entry in workflowTypeEntries)
             {
-                var workflowTypeIds = workflowTypeEntries.Select(x => long.Parse(x.WorkflowId)).ToList();
-                var workflowTypes = (await _workflowTypeStore.GetAsync(workflowTypeIds)).ToDictionary(x => x.Id);
-                var correlationId = routeValues.GetValue<string>("correlationid");
-
-                foreach (var entry in workflowTypeEntries)
+                if (workflowTypes.TryGetValue(long.Parse(entry.WorkflowId), out var workflowType))
                 {
-                    if (workflowTypes.TryGetValue(long.Parse(entry.WorkflowId), out var workflowType))
-                    {
-                        var activity = workflowType.Activities.Single(x => x.ActivityId == entry.ActivityId);
+                    var activity = workflowType.Activities.Single(x => x.ActivityId == entry.ActivityId);
 
-                        if (activity.IsStart)
-                        {
-                            // If a singleton, try to acquire a lock per workflow type.
-                            (var locker, var locked) = await _distributedLock.TryAcquireWorkflowTypeLockAsync(workflowType);
-                            if (!locked)
-                            {
-                                continue;
-                            }
-
-                            await using var acquiredLock = locker;
-
-                            // Check if this is a workflow singleton and there's already an halted instance on any activity.
-                            if (workflowType.IsSingleton && await _workflowStore.HasHaltedInstanceAsync(workflowType.WorkflowTypeId))
-                            {
-                                continue;
-                            }
-
-                            await _workflowManager.StartWorkflowAsync(workflowType, activity, null, correlationId);
-                        }
-                    }
-                }
-            }
-
-            if (workflowEntries.Any())
-            {
-                var workflowIds = workflowEntries.Select(x => x.WorkflowId).ToList();
-                var workflows = (await _workflowStore.GetAsync(workflowIds)).ToDictionary(x => x.WorkflowId);
-                var correlationId = routeValues.GetValue<string>("correlationid");
-
-                foreach (var entry in workflowEntries)
-                {
-                    if (workflows.TryGetValue(entry.WorkflowId, out var workflow) &&
-                        (string.IsNullOrWhiteSpace(correlationId) ||
-                        workflow.CorrelationId == correlationId))
+                    if (activity.IsStart)
                     {
-                        // If atomic, try to acquire a lock per workflow instance.
-                        (var locker, var locked) = await _distributedLock.TryAcquireWorkflowLockAsync(workflow);
+                        // If a singleton, try to acquire a lock per workflow type.
+                        (var locker, var locked) = await _distributedLock.TryAcquireWorkflowTypeLockAsync(workflowType);
                         if (!locked)
                         {
                             continue;
@@ -97,24 +64,56 @@ public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionE
 
                         await using var acquiredLock = locker;
 
-                        // If atomic, check if the workflow still exists and is still correlated.
-                        var haltedWorkflow = workflow.IsAtomic ? await _workflowStore.GetAsync(workflow.Id) : workflow;
-                        if (haltedWorkflow == null || (!string.IsNullOrWhiteSpace(correlationId) && haltedWorkflow.CorrelationId != correlationId))
+                        // Check if this is a workflow singleton and there's already an halted instance on any activity.
+                        if (workflowType.IsSingleton && await _workflowStore.HasHaltedInstanceAsync(workflowType.WorkflowTypeId))
                         {
                             continue;
                         }
 
-                        // And if it is still halted on this activity.
-                        var blockingActivity = haltedWorkflow.BlockingActivities.SingleOrDefault(x => x.ActivityId == entry.ActivityId);
-                        if (blockingActivity != null)
-                        {
-                            await _workflowManager.ResumeWorkflowAsync(haltedWorkflow, blockingActivity);
-                        }
+                        await _workflowManager.StartWorkflowAsync(workflowType, activity, null, correlationId);
                     }
                 }
             }
+        }
+
+        if (workflowEntries.Any())
+        {
+            var workflowIds = workflowEntries.Select(x => x.WorkflowId).ToList();
+            var workflows = (await _workflowStore.GetAsync(workflowIds)).ToDictionary(x => x.WorkflowId);
+            var correlationId = routeValues.GetValue<string>("correlationid");
+
+            foreach (var entry in workflowEntries)
+            {
+                if (workflows.TryGetValue(entry.WorkflowId, out var workflow) &&
+                    (string.IsNullOrWhiteSpace(correlationId) ||
+                    workflow.CorrelationId == correlationId))
+                {
+                    // If atomic, try to acquire a lock per workflow instance.
+                    (var locker, var locked) = await _distributedLock.TryAcquireWorkflowLockAsync(workflow);
+                    if (!locked)
+                    {
+                        continue;
+                    }
 
-            await next();
+                    await using var acquiredLock = locker;
+
+                    // If atomic, check if the workflow still exists and is still correlated.
+                    var haltedWorkflow = workflow.IsAtomic ? await _workflowStore.GetAsync(workflow.Id) : workflow;
+                    if (haltedWorkflow == null || (!string.IsNullOrWhiteSpace(correlationId) && haltedWorkflow.CorrelationId != correlationId))
+                    {
+                        continue;
+                    }
+
+                    // And if it is still halted on this activity.
+                    var blockingActivity = haltedWorkflow.BlockingActivities.SingleOrDefault(x => x.ActivityId == entry.ActivityId);
+                    if (blockingActivity != null)
+                    {
+                        await _workflowManager.ResumeWorkflowAsync(haltedWorkflow, blockingActivity);
+                    }
+                }
+            }
         }
+
+        await next();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Handlers/SignalWorkflowExecutionContextHandler.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Handlers/SignalWorkflowExecutionContextHandler.cs
index eca455ae73d..70401cf257e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Handlers/SignalWorkflowExecutionContextHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Handlers/SignalWorkflowExecutionContextHandler.cs
@@ -3,21 +3,20 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Http.WorkflowContextProviders
+namespace OrchardCore.Workflows.Http.WorkflowContextProviders;
+
+public class SignalWorkflowExecutionContextHandler : WorkflowExecutionContextHandlerBase
 {
-    public class SignalWorkflowExecutionContextHandler : WorkflowExecutionContextHandlerBase
-    {
-        private readonly ISecurityTokenService _securityTokenService;
+    private readonly ISecurityTokenService _securityTokenService;
 
-        public SignalWorkflowExecutionContextHandler(ISecurityTokenService securityTokenService)
-        {
-            _securityTokenService = securityTokenService;
-        }
+    public SignalWorkflowExecutionContextHandler(ISecurityTokenService securityTokenService)
+    {
+        _securityTokenService = securityTokenService;
+    }
 
-        public override Task EvaluatingScriptAsync(WorkflowExecutionScriptContext context)
-        {
-            context.ScopedMethodProviders.Add(new SignalMethodProvider(context.WorkflowContext, _securityTokenService));
-            return Task.CompletedTask;
-        }
+    public override Task EvaluatingScriptAsync(WorkflowExecutionScriptContext context)
+    {
+        context.ScopedMethodProviders.Add(new SignalMethodProvider(context.WorkflowContext, _securityTokenService));
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Handlers/WorkflowRoutesHandler.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Handlers/WorkflowRoutesHandler.cs
index eeb6e1f09af..d50f9fc1f77 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Handlers/WorkflowRoutesHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Handlers/WorkflowRoutesHandler.cs
@@ -3,47 +3,46 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Http.Handlers
+namespace OrchardCore.Workflows.Http.Handlers;
+
+internal sealed class WorkflowRoutesHandler : WorkflowHandlerBase
 {
-    internal sealed class WorkflowRoutesHandler : WorkflowHandlerBase
+    private readonly IWorkflowInstanceRouteEntries _workflowRouteEntries;
+    private readonly IWorkflowTypeStore _workflowTypeStore;
+    private readonly IActivityLibrary _activityLibrary;
+
+    public WorkflowRoutesHandler(
+        IWorkflowInstanceRouteEntries workflowRouteEntries,
+        IWorkflowTypeStore workflowTypeStore,
+        IActivityLibrary activityLibrary
+    )
+    {
+        _workflowRouteEntries = workflowRouteEntries;
+        _workflowTypeStore = workflowTypeStore;
+        _activityLibrary = activityLibrary;
+    }
+
+    public override Task CreatedAsync(WorkflowCreatedContext context)
+    {
+        return UpdateRouteEntriesAsync(context);
+    }
+
+    public override Task UpdatedAsync(WorkflowUpdatedContext context)
     {
-        private readonly IWorkflowInstanceRouteEntries _workflowRouteEntries;
-        private readonly IWorkflowTypeStore _workflowTypeStore;
-        private readonly IActivityLibrary _activityLibrary;
-
-        public WorkflowRoutesHandler(
-            IWorkflowInstanceRouteEntries workflowRouteEntries,
-            IWorkflowTypeStore workflowTypeStore,
-            IActivityLibrary activityLibrary
-        )
-        {
-            _workflowRouteEntries = workflowRouteEntries;
-            _workflowTypeStore = workflowTypeStore;
-            _activityLibrary = activityLibrary;
-        }
-
-        public override Task CreatedAsync(WorkflowCreatedContext context)
-        {
-            return UpdateRouteEntriesAsync(context);
-        }
-
-        public override Task UpdatedAsync(WorkflowUpdatedContext context)
-        {
-            return UpdateRouteEntriesAsync(context);
-        }
-
-        public override Task DeletedAsync(WorkflowDeletedContext context)
-        {
-            return _workflowRouteEntries.RemoveEntriesAsync(context.Workflow.WorkflowId);
-        }
-
-        private async Task UpdateRouteEntriesAsync(WorkflowContext context)
-        {
-            var workflow = context.Workflow;
-            var workflowType = await _workflowTypeStore.GetAsync(workflow.WorkflowTypeId);
-            var entries = WorkflowInstanceRouteEntries.GetWorkflowRoutesEntries(workflowType, context.Workflow, _activityLibrary);
-
-            await _workflowRouteEntries.AddEntriesAsync(entries);
-        }
+        return UpdateRouteEntriesAsync(context);
+    }
+
+    public override Task DeletedAsync(WorkflowDeletedContext context)
+    {
+        return _workflowRouteEntries.RemoveEntriesAsync(context.Workflow.WorkflowId);
+    }
+
+    private async Task UpdateRouteEntriesAsync(WorkflowContext context)
+    {
+        var workflow = context.Workflow;
+        var workflowType = await _workflowTypeStore.GetAsync(workflow.WorkflowTypeId);
+        var entries = WorkflowInstanceRouteEntries.GetWorkflowRoutesEntries(workflowType, context.Workflow, _activityLibrary);
+
+        await _workflowRouteEntries.AddEntriesAsync(entries);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Handlers/WorkflowTypeRoutesHandler.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Handlers/WorkflowTypeRoutesHandler.cs
index c7f61e91cb1..0b827bc090e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Handlers/WorkflowTypeRoutesHandler.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Handlers/WorkflowTypeRoutesHandler.cs
@@ -3,38 +3,37 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Http.Handlers
+namespace OrchardCore.Workflows.Http.Handlers;
+
+internal sealed class WorkflowTypeRoutesHandler : WorkflowTypeHandlerBase
 {
-    internal sealed class WorkflowTypeRoutesHandler : WorkflowTypeHandlerBase
-    {
-        private readonly IWorkflowTypeRouteEntries _workflowRouteEntries;
-        private readonly IActivityLibrary _activityLibrary;
+    private readonly IWorkflowTypeRouteEntries _workflowRouteEntries;
+    private readonly IActivityLibrary _activityLibrary;
 
-        public WorkflowTypeRoutesHandler(IWorkflowTypeRouteEntries workflowRouteEntries, IActivityLibrary activityLibrary)
-        {
-            _workflowRouteEntries = workflowRouteEntries;
-            _activityLibrary = activityLibrary;
-        }
+    public WorkflowTypeRoutesHandler(IWorkflowTypeRouteEntries workflowRouteEntries, IActivityLibrary activityLibrary)
+    {
+        _workflowRouteEntries = workflowRouteEntries;
+        _activityLibrary = activityLibrary;
+    }
 
-        public override Task CreatedAsync(WorkflowTypeCreatedContext context)
-        {
-            return UpdateRouteEntriesAsync(context);
-        }
+    public override Task CreatedAsync(WorkflowTypeCreatedContext context)
+    {
+        return UpdateRouteEntriesAsync(context);
+    }
 
-        public override Task UpdatedAsync(WorkflowTypeUpdatedContext context)
-        {
-            return UpdateRouteEntriesAsync(context);
-        }
+    public override Task UpdatedAsync(WorkflowTypeUpdatedContext context)
+    {
+        return UpdateRouteEntriesAsync(context);
+    }
 
-        public override Task DeletedAsync(WorkflowTypeDeletedContext context)
-        {
-            return _workflowRouteEntries.RemoveEntriesAsync(context.WorkflowType.Id.ToString());
-        }
+    public override Task DeletedAsync(WorkflowTypeDeletedContext context)
+    {
+        return _workflowRouteEntries.RemoveEntriesAsync(context.WorkflowType.Id.ToString());
+    }
 
-        private Task UpdateRouteEntriesAsync(WorkflowTypeContext context)
-        {
-            var entries = WorkflowTypeRouteEntries.GetWorkflowTypeRoutesEntries(context.WorkflowType, _activityLibrary);
-            return _workflowRouteEntries.AddEntriesAsync(entries);
-        }
+    private Task UpdateRouteEntriesAsync(WorkflowTypeContext context)
+    {
+        var entries = WorkflowTypeRouteEntries.GetWorkflowTypeRoutesEntries(context.WorkflowType, _activityLibrary);
+        return _workflowRouteEntries.AddEntriesAsync(entries);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Liquid/SignalUrlFilter.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Liquid/SignalUrlFilter.cs
index 9d44159b13f..376b14e23e6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Liquid/SignalUrlFilter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Liquid/SignalUrlFilter.cs
@@ -9,40 +9,39 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Http.Liquid
+namespace OrchardCore.Workflows.Http.Liquid;
+
+public class SignalUrlFilter : ILiquidFilter
 {
-    public class SignalUrlFilter : ILiquidFilter
-    {
-        private readonly IUrlHelperFactory _urlHelperFactory;
-        private readonly ISecurityTokenService _securityTokenService;
+    private readonly IUrlHelperFactory _urlHelperFactory;
+    private readonly ISecurityTokenService _securityTokenService;
 
-        public SignalUrlFilter(IUrlHelperFactory urlHelperFactory, ISecurityTokenService securityTokenService)
-        {
-            _urlHelperFactory = urlHelperFactory;
-            _securityTokenService = securityTokenService;
-        }
+    public SignalUrlFilter(IUrlHelperFactory urlHelperFactory, ISecurityTokenService securityTokenService)
+    {
+        _urlHelperFactory = urlHelperFactory;
+        _securityTokenService = securityTokenService;
+    }
 
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
-        {
-            var urlHelper = _urlHelperFactory.GetUrlHelper(ctx.ViewContext);
+    public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        var urlHelper = _urlHelperFactory.GetUrlHelper(ctx.ViewContext);
 
-            var workflowContextValue = ctx.GetValue("Workflow");
+        var workflowContextValue = ctx.GetValue("Workflow");
 
-            if (workflowContextValue.IsNil())
-            {
-                throw new ArgumentException("WorkflowExecutionContext missing while invoking 'signal_url'");
-            }
+        if (workflowContextValue.IsNil())
+        {
+            throw new ArgumentException("WorkflowExecutionContext missing while invoking 'signal_url'");
+        }
 
-            var workflowContext = (WorkflowExecutionContext)workflowContextValue.ToObjectValue();
-            var signalName = input.ToStringValue();
-            var payload = string.IsNullOrWhiteSpace(workflowContext.CorrelationId)
-                ? SignalPayload.ForWorkflow(signalName, workflowContext.WorkflowId)
-                : SignalPayload.ForCorrelation(signalName, workflowContext.CorrelationId);
+        var workflowContext = (WorkflowExecutionContext)workflowContextValue.ToObjectValue();
+        var signalName = input.ToStringValue();
+        var payload = string.IsNullOrWhiteSpace(workflowContext.CorrelationId)
+            ? SignalPayload.ForWorkflow(signalName, workflowContext.WorkflowId)
+            : SignalPayload.ForCorrelation(signalName, workflowContext.CorrelationId);
 
-            var token = _securityTokenService.CreateToken(payload, TimeSpan.FromDays(7));
-            var urlValue = new StringValue(urlHelper.Action("Trigger", "HttpWorkflow", new { area = "OrchardCore.Workflows", token }));
+        var token = _securityTokenService.CreateToken(payload, TimeSpan.FromDays(7));
+        var urlValue = new StringValue(urlHelper.Action("Trigger", "HttpWorkflow", new { area = "OrchardCore.Workflows", token }));
 
-            return new ValueTask<FluidValue>(urlValue);
-        }
+        return new ValueTask<FluidValue>(urlValue);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/SignalPayload.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/SignalPayload.cs
index f7fa2615ec6..ef0fe6f1a47 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/SignalPayload.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/SignalPayload.cs
@@ -1,26 +1,25 @@
-namespace OrchardCore.Workflows.Http.Models
+namespace OrchardCore.Workflows.Http.Models;
+
+public class SignalPayload
 {
-    public class SignalPayload
+    public static SignalPayload ForWorkflow(string signalName, string workflowId)
     {
-        public static SignalPayload ForWorkflow(string signalName, string workflowId)
-        {
-            return new SignalPayload(signalName, workflowId, null);
-        }
-
-        public static SignalPayload ForCorrelation(string signalName, string correlationId)
-        {
-            return new SignalPayload(signalName, null, correlationId);
-        }
+        return new SignalPayload(signalName, workflowId, null);
+    }
 
-        public SignalPayload(string signalName, string workflowId, string correlationId)
-        {
-            WorkflowId = workflowId;
-            CorrelationId = correlationId;
-            SignalName = signalName;
-        }
+    public static SignalPayload ForCorrelation(string signalName, string correlationId)
+    {
+        return new SignalPayload(signalName, null, correlationId);
+    }
 
-        public string WorkflowId { get; private set; }
-        public string CorrelationId { get; private set; }
-        public string SignalName { get; private set; }
+    public SignalPayload(string signalName, string workflowId, string correlationId)
+    {
+        WorkflowId = workflowId;
+        CorrelationId = correlationId;
+        SignalName = signalName;
     }
+
+    public string WorkflowId { get; private set; }
+    public string CorrelationId { get; private set; }
+    public string SignalName { get; private set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/WorkflowPayload.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/WorkflowPayload.cs
index 4afe97ed2f1..283a5eccfbf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/WorkflowPayload.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/WorkflowPayload.cs
@@ -1,14 +1,13 @@
-namespace OrchardCore.Workflows.Http.Models
+namespace OrchardCore.Workflows.Http.Models;
+
+public class WorkflowPayload
 {
-    public class WorkflowPayload
+    public WorkflowPayload(string workflowId, string activityId)
     {
-        public WorkflowPayload(string workflowId, string activityId)
-        {
-            WorkflowId = workflowId;
-            ActivityId = activityId;
-        }
-
-        public string WorkflowId { get; private set; }
-        public string ActivityId { get; private set; }
+        WorkflowId = workflowId;
+        ActivityId = activityId;
     }
+
+    public string WorkflowId { get; private set; }
+    public string ActivityId { get; private set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/WorkflowRouteDocument.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/WorkflowRouteDocument.cs
index 50cb6391c0d..ea5741f7e7a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/WorkflowRouteDocument.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/WorkflowRouteDocument.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.Workflows.Http.Models
+namespace OrchardCore.Workflows.Http.Models;
+
+public class WorkflowRouteDocument : Document
 {
-    public class WorkflowRouteDocument : Document
-    {
-        public Dictionary<string, IList<WorkflowRoutesEntry>> Entries { get; set; } = [];
-    }
+    public Dictionary<string, IList<WorkflowRoutesEntry>> Entries { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/WorkflowRoutesEntry.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/WorkflowRoutesEntry.cs
index c2d31c265f2..270b7719a0b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/WorkflowRoutesEntry.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/WorkflowRoutesEntry.cs
@@ -1,17 +1,16 @@
 using Microsoft.AspNetCore.Routing;
 using OrchardCore.Workflows.Helpers;
 
-namespace OrchardCore.Workflows.Http.Models
+namespace OrchardCore.Workflows.Http.Models;
+
+public class WorkflowRoutesEntry
 {
-    public class WorkflowRoutesEntry
-    {
-        public string WorkflowId { get; set; }
-        public string ActivityId { get; set; }
-        public string HttpMethod { get; set; }
-        public RouteValueDictionary RouteValues { get; set; } = [];
+    public string WorkflowId { get; set; }
+    public string ActivityId { get; set; }
+    public string HttpMethod { get; set; }
+    public RouteValueDictionary RouteValues { get; set; } = [];
 
-        public string ControllerName => RouteValues.GetValue<string>("controller");
-        public string ActionName => RouteValues.GetValue<string>("action");
-        public string AreaName => RouteValues.GetValue<string>("area");
-    }
+    public string ControllerName => RouteValues.GetValue<string>("controller");
+    public string ActionName => RouteValues.GetValue<string>("action");
+    public string AreaName => RouteValues.GetValue<string>("area");
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/WorkflowTypeRouteDocument.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/WorkflowTypeRouteDocument.cs
index d4c7c1bb638..7af1e7119c5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/WorkflowTypeRouteDocument.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Models/WorkflowTypeRouteDocument.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Workflows.Http.Models
+namespace OrchardCore.Workflows.Http.Models;
+
+public class WorkflowTypeRouteDocument : WorkflowRouteDocument
 {
-    public class WorkflowTypeRouteDocument : WorkflowRouteDocument
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Scripting/HttpMethodsProvider.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Scripting/HttpMethodsProvider.cs
index 8cfb0b4a3d0..a50d2d01711 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Scripting/HttpMethodsProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Scripting/HttpMethodsProvider.cs
@@ -13,230 +13,230 @@
 using OrchardCore.Mvc.Core.Utilities;
 using OrchardCore.Scripting;
 
-namespace OrchardCore.Workflows.Http.Scripting
+namespace OrchardCore.Workflows.Http.Scripting;
+
+// TODO: Consider moving this to a more common package so that it's available without a dependency on Workflows.
+public class HttpMethodsProvider : IGlobalMethodProvider
 {
-    // TODO: Consider moving this to a more common package so that it's available without a dependency on Workflows.
-    public class HttpMethodsProvider : IGlobalMethodProvider
+    private readonly GlobalMethod _httpContextMethod;
+    private readonly GlobalMethod _queryStringMethod;
+    private readonly GlobalMethod _responseWriteMethod;
+    private readonly GlobalMethod _absoluteUrlMethod;
+    private readonly GlobalMethod _readBodyMethod;
+    private readonly GlobalMethod _requestFormMethod;
+    private readonly GlobalMethod _queryStringAsJsonMethod;
+    private readonly GlobalMethod _requestFormAsJsonMethod;
+    private readonly GlobalMethod _deserializeRequestDataMethod;
+
+    public HttpMethodsProvider(IHttpContextAccessor httpContextAccessor)
     {
-        private readonly GlobalMethod _httpContextMethod;
-        private readonly GlobalMethod _queryStringMethod;
-        private readonly GlobalMethod _responseWriteMethod;
-        private readonly GlobalMethod _absoluteUrlMethod;
-        private readonly GlobalMethod _readBodyMethod;
-        private readonly GlobalMethod _requestFormMethod;
-        private readonly GlobalMethod _queryStringAsJsonMethod;
-        private readonly GlobalMethod _requestFormAsJsonMethod;
-        private readonly GlobalMethod _deserializeRequestDataMethod;
-
-        public HttpMethodsProvider(IHttpContextAccessor httpContextAccessor)
+        _httpContextMethod = new GlobalMethod
         {
-            _httpContextMethod = new GlobalMethod
-            {
-                Name = "httpContext",
-                Method = serviceProvider => (Func<HttpContext>)(() => httpContextAccessor.HttpContext),
-            };
+            Name = "httpContext",
+            Method = serviceProvider => (Func<HttpContext>)(() => httpContextAccessor.HttpContext),
+        };
 
-            _queryStringMethod = new GlobalMethod
+        _queryStringMethod = new GlobalMethod
+        {
+            Name = "queryString",
+            Method = serviceProvider => (Func<string, object>)(name =>
             {
-                Name = "queryString",
-                Method = serviceProvider => (Func<string, object>)(name =>
+                if (name == null)
+                {
+                    return httpContextAccessor.HttpContext.Request.QueryString.ToString();
+                }
+                object result;
+                if (httpContextAccessor.HttpContext.Request.Query.TryGetValue(name, out var values))
                 {
-                    if (name == null)
+                    if (values.Count == 0)
                     {
-                        return httpContextAccessor.HttpContext.Request.QueryString.ToString();
+                        result = null;
                     }
-                    object result;
-                    if (httpContextAccessor.HttpContext.Request.Query.TryGetValue(name, out var values))
+                    else if (values.Count == 1)
                     {
-                        if (values.Count == 0)
-                        {
-                            result = null;
-                        }
-                        else if (values.Count == 1)
-                        {
-                            result = values[0];
-                        }
-                        else
-                        {
-                            result = values.ToArray();
-                        }
+                        result = values[0];
                     }
                     else
                     {
-                        result = null;
+                        result = values.ToArray();
                     }
-                    return result;
-                }),
-            };
+                }
+                else
+                {
+                    result = null;
+                }
+                return result;
+            }),
+        };
 
-            _responseWriteMethod = new GlobalMethod
+        _responseWriteMethod = new GlobalMethod
+        {
+            Name = "responseWrite",
+            Method = serviceProvider => (Action<string>)(text =>
             {
-                Name = "responseWrite",
-                Method = serviceProvider => (Action<string>)(text => {
-                    httpContextAccessor.HttpContext.Items[WorkflowHttpResult.Instance] = WorkflowHttpResult.Instance;
-                    httpContextAccessor.HttpContext.Response.WriteAsync(text).GetAwaiter().GetResult();
-                })
-            };
-
-            _absoluteUrlMethod = new GlobalMethod
+                httpContextAccessor.HttpContext.Items[WorkflowHttpResult.Instance] = WorkflowHttpResult.Instance;
+                httpContextAccessor.HttpContext.Response.WriteAsync(text).GetAwaiter().GetResult();
+            })
+        };
+
+        _absoluteUrlMethod = new GlobalMethod
+        {
+            Name = "absoluteUrl",
+            Method = serviceProvider => (Func<string, string>)(relativePath =>
             {
-                Name = "absoluteUrl",
-                Method = serviceProvider => (Func<string, string>)(relativePath =>
-                {
-                    var urlHelperFactory = serviceProvider.GetRequiredService<IUrlHelperFactory>();
-                    var urlHelper = urlHelperFactory.GetUrlHelper(new ActionContext(httpContextAccessor.HttpContext, new RouteData(), new ActionDescriptor()));
-                    return urlHelper.ToAbsoluteUrl(relativePath);
-                }),
-            };
+                var urlHelperFactory = serviceProvider.GetRequiredService<IUrlHelperFactory>();
+                var urlHelper = urlHelperFactory.GetUrlHelper(new ActionContext(httpContextAccessor.HttpContext, new RouteData(), new ActionDescriptor()));
+                return urlHelper.ToAbsoluteUrl(relativePath);
+            }),
+        };
 
-            _readBodyMethod = new GlobalMethod
+        _readBodyMethod = new GlobalMethod
+        {
+            Name = "readBody",
+            Method = serviceProvider => (Func<string>)(() =>
             {
-                Name = "readBody",
-                Method = serviceProvider => (Func<string>)(() =>
-                {
-                    using var sr = new StreamReader(httpContextAccessor.HttpContext.Request.Body);
+                using var sr = new StreamReader(httpContextAccessor.HttpContext.Request.Body);
 
-                    // Async read of the request body is mandatory.
-                    return sr.ReadToEndAsync().GetAwaiter().GetResult();
-                }),
-            };
+                // Async read of the request body is mandatory.
+                return sr.ReadToEndAsync().GetAwaiter().GetResult();
+            }),
+        };
 
-            _requestFormMethod = new GlobalMethod
+        _requestFormMethod = new GlobalMethod
+        {
+            Name = "requestForm",
+            Method = serviceProvider => (Func<string, object>)(field =>
             {
-                Name = "requestForm",
-                Method = serviceProvider => (Func<string, object>)(field =>
+                object result;
+                if (httpContextAccessor.HttpContext.Request.Form.TryGetValue(field, out var values))
                 {
-                    object result;
-                    if (httpContextAccessor.HttpContext.Request.Form.TryGetValue(field, out var values))
+                    if (values.Count == 0)
                     {
-                        if (values.Count == 0)
-                        {
-                            result = null;
-                        }
-                        else if (values.Count == 1)
-                        {
-                            result = values[0];
-                        }
-                        else
-                        {
-                            result = values.ToArray();
-                        }
+                        result = null;
+                    }
+                    else if (values.Count == 1)
+                    {
+                        result = values[0];
                     }
                     else
                     {
-                        result = null;
+                        result = values.ToArray();
                     }
-                    return result;
-                }),
-            };
+                }
+                else
+                {
+                    result = null;
+                }
+                return result;
+            }),
+        };
+
+        // This should be deprecated
+        _queryStringAsJsonMethod = new GlobalMethod
+        {
+            Name = "queryStringAsJson",
+            Method = serviceProvider => _deserializeRequestDataMethod.Method.Invoke(serviceProvider),
+        };
 
-            // This should be deprecated
-            _queryStringAsJsonMethod = new GlobalMethod
-            {
-                Name = "queryStringAsJson",
-                Method = serviceProvider => _deserializeRequestDataMethod.Method.Invoke(serviceProvider),
-            };
+        // This should be deprecated
+        _requestFormAsJsonMethod = new GlobalMethod
+        {
+            Name = "requestFormAsJson",
+            Method = serviceProvider => _deserializeRequestDataMethod.Method.Invoke(serviceProvider),
+        };
 
-            // This should be deprecated
-            _requestFormAsJsonMethod = new GlobalMethod
+        _deserializeRequestDataMethod = new GlobalMethod
+        {
+            Name = "deserializeRequestData",
+            Method = serviceProvider => (Func<Dictionary<string, object>>)(() =>
             {
-                Name = "requestFormAsJson",
-                Method = serviceProvider => _deserializeRequestDataMethod.Method.Invoke(serviceProvider),
-            };
+                Dictionary<string, object> result = null;
 
-            _deserializeRequestDataMethod = new GlobalMethod
-            {
-                Name = "deserializeRequestData",
-                Method = serviceProvider => (Func<Dictionary<string, object>>)(() =>
+                if (httpContextAccessor.HttpContext != null)
                 {
-                    Dictionary<string, object> result = null;
-
-                    if (httpContextAccessor.HttpContext != null)
+                    var method = httpContextAccessor.HttpContext.Request.Method;
+                    if (method.Equals("POST", StringComparison.OrdinalIgnoreCase) || method.Equals("PUT", StringComparison.OrdinalIgnoreCase) || method.Equals("PATCH", StringComparison.OrdinalIgnoreCase))
                     {
-                        var method = httpContextAccessor.HttpContext.Request.Method;
-                        if (method.Equals("POST", StringComparison.OrdinalIgnoreCase) || method.Equals("PUT", StringComparison.OrdinalIgnoreCase) || method.Equals("PATCH", StringComparison.OrdinalIgnoreCase))
+                        if (httpContextAccessor.HttpContext.Request.HasFormContentType)
                         {
-                            if (httpContextAccessor.HttpContext.Request.HasFormContentType)
+                            var formData = httpContextAccessor.HttpContext.Request.Form;
+
+                            // If we can parse first request form element key as JSON then we throw
+                            if (isValidJSON(formData.First().Key.ToString()))
+                            {
+                                throw new Exception("Invalid form data passed in the request. The data passed was JSON while it should be form data.");
+                            }
+
+                            try
                             {
-                                var formData = httpContextAccessor.HttpContext.Request.Form;
-
-                                // If we can parse first request form element key as JSON then we throw
-                                if (isValidJSON(formData.First().Key.ToString()))
-                                {
-                                    throw new Exception("Invalid form data passed in the request. The data passed was JSON while it should be form data.");
-                                }
-
-                                try
-                                {
-                                    result = formData.ToDictionary(x => x.Key, x => (object)x.Value);
-                                }
-                                catch
-                                {
-                                    throw new Exception("Invalid form data passed in the request.");
-                                }
+                                result = formData.ToDictionary(x => x.Key, x => (object)x.Value);
                             }
-                            else if (httpContextAccessor.HttpContext.Request.HasJsonContentType())
+                            catch
                             {
-                                string json;
-                                using (var sr = new StreamReader(httpContextAccessor.HttpContext.Request.Body))
-                                {
-                                    // Async read of the request body is mandatory.
-                                    json = sr.ReadToEndAsync().GetAwaiter().GetResult();
-                                }
-
-                                try
-                                {
-                                    result = JConvert.DeserializeObject<Dictionary<string, object>>(json);
-                                }
-                                catch
-                                {
-                                    throw new Exception("Invalid JSON passed in the request.");
-                                }
+                                throw new Exception("Invalid form data passed in the request.");
                             }
                         }
-                        else if (httpContextAccessor.HttpContext.Request.Method.Equals("GET", StringComparison.OrdinalIgnoreCase))
+                        else if (httpContextAccessor.HttpContext.Request.HasJsonContentType())
                         {
-                            var queryData = httpContextAccessor.HttpContext.Request.Query;
+                            string json;
+                            using (var sr = new StreamReader(httpContextAccessor.HttpContext.Request.Body))
+                            {
+                                // Async read of the request body is mandatory.
+                                json = sr.ReadToEndAsync().GetAwaiter().GetResult();
+                            }
 
                             try
                             {
-                                result = queryData.ToDictionary(x => x.Key, x => (object)x.Value);
-
-                                // We never need to keep the Workflow token
-                                result.Remove("token");
+                                result = JConvert.DeserializeObject<Dictionary<string, object>>(json);
                             }
                             catch
                             {
-                                throw new Exception("Invalid query string data passed in the request.");
+                                throw new Exception("Invalid JSON passed in the request.");
                             }
                         }
-                        else
+                    }
+                    else if (httpContextAccessor.HttpContext.Request.Method.Equals("GET", StringComparison.OrdinalIgnoreCase))
+                    {
+                        var queryData = httpContextAccessor.HttpContext.Request.Query;
+
+                        try
+                        {
+                            result = queryData.ToDictionary(x => x.Key, x => (object)x.Value);
+
+                            // We never need to keep the Workflow token
+                            result.Remove("token");
+                        }
+                        catch
                         {
-                            throw new Exception("The request method is not supported");
+                            throw new Exception("Invalid query string data passed in the request.");
                         }
                     }
+                    else
+                    {
+                        throw new Exception("The request method is not supported");
+                    }
+                }
 
-                    return result;
-                }),
-            };
-        }
+                return result;
+            }),
+        };
+    }
 
-        private static bool isValidJSON(string json)
+    private static bool isValidJSON(string json)
+    {
+        try
         {
-            try
-            {
-                var token = JObject.Parse(json);
-                return true;
-            }
-            catch
-            {
-                return false;
-            }
+            var token = JObject.Parse(json);
+            return true;
         }
-
-        public IEnumerable<GlobalMethod> GetMethods()
+        catch
         {
-            return new[] { _httpContextMethod, _queryStringMethod, _responseWriteMethod, _absoluteUrlMethod, _readBodyMethod, _requestFormMethod, _queryStringAsJsonMethod, _requestFormAsJsonMethod, _deserializeRequestDataMethod };
+            return false;
         }
     }
+
+    public IEnumerable<GlobalMethod> GetMethods()
+    {
+        return new[] { _httpContextMethod, _queryStringMethod, _responseWriteMethod, _absoluteUrlMethod, _readBodyMethod, _requestFormMethod, _queryStringAsJsonMethod, _requestFormAsJsonMethod, _deserializeRequestDataMethod };
+    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Scripting/SignalMethodProvider.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Scripting/SignalMethodProvider.cs
index 4c4312c5046..b55607e3921 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Scripting/SignalMethodProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Scripting/SignalMethodProvider.cs
@@ -9,63 +9,62 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Http.Scripting
+namespace OrchardCore.Workflows.Http.Scripting;
+
+public class SignalMethodProvider : IGlobalMethodProvider
 {
-    public class SignalMethodProvider : IGlobalMethodProvider
-    {
-        private readonly GlobalMethod _signalUrlMethod;
+    private readonly GlobalMethod _signalUrlMethod;
 
-        public SignalMethodProvider(WorkflowExecutionContext workflowContext, ISecurityTokenService securityTokenService)
+    public SignalMethodProvider(WorkflowExecutionContext workflowContext, ISecurityTokenService securityTokenService)
+    {
+        _signalUrlMethod = new GlobalMethod
         {
-            _signalUrlMethod = new GlobalMethod
+            Name = "signalUrl",
+            Method = serviceProvider => (Func<string, string>)((signal) =>
             {
-                Name = "signalUrl",
-                Method = serviceProvider => (Func<string, string>)((signal) =>
-                {
-                    var payload = !string.IsNullOrWhiteSpace(workflowContext.CorrelationId) ? SignalPayload.ForCorrelation(signal, workflowContext.CorrelationId) : SignalPayload.ForWorkflow(signal, workflowContext.WorkflowId);
-                    var token = securityTokenService.CreateToken(payload, TimeSpan.FromDays(7));
-                    var httpContextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
-                    var linkGenerator = serviceProvider.GetRequiredService<LinkGenerator>();
+                var payload = !string.IsNullOrWhiteSpace(workflowContext.CorrelationId) ? SignalPayload.ForCorrelation(signal, workflowContext.CorrelationId) : SignalPayload.ForWorkflow(signal, workflowContext.WorkflowId);
+                var token = securityTokenService.CreateToken(payload, TimeSpan.FromDays(7));
+                var httpContextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
+                var linkGenerator = serviceProvider.GetRequiredService<LinkGenerator>();
 
-                    return linkGenerator.GetPathByAction(httpContextAccessor.HttpContext, "Trigger", "HttpWorkflow", new { area = "OrchardCore.Workflows", token });
-                }),
-            };
-        }
-
-        public IEnumerable<GlobalMethod> GetMethods()
-        {
-            return new[] { _signalUrlMethod };
-        }
+                return linkGenerator.GetPathByAction(httpContextAccessor.HttpContext, "Trigger", "HttpWorkflow", new { area = "OrchardCore.Workflows", token });
+            }),
+        };
     }
 
-    public class TokenMethodProvider : IGlobalMethodProvider
+    public IEnumerable<GlobalMethod> GetMethods()
     {
-        private readonly GlobalMethod _createWorkflowToken;
+        return new[] { _signalUrlMethod };
+    }
+}
 
-        public TokenMethodProvider()
+public class TokenMethodProvider : IGlobalMethodProvider
+{
+    private readonly GlobalMethod _createWorkflowToken;
+
+    public TokenMethodProvider()
+    {
+        _createWorkflowToken = new GlobalMethod
         {
-            _createWorkflowToken = new GlobalMethod
+            Name = "createWorkflowToken",
+            Method = serviceProvider => (Func<string, string, int, string>)((workflowTypeId, activityId, days) =>
             {
-                Name = "createWorkflowToken",
-                Method = serviceProvider => (Func<string, string, int, string>)((workflowTypeId, activityId, days) =>
-                {
-                    var securityTokenService = serviceProvider.GetRequiredService<ISecurityTokenService>();
+                var securityTokenService = serviceProvider.GetRequiredService<ISecurityTokenService>();
 
-                    var payload = new WorkflowPayload(workflowTypeId, activityId);
+                var payload = new WorkflowPayload(workflowTypeId, activityId);
 
-                    if (days == 0)
-                    {
-                        days = HttpWorkflowController.NoExpiryTokenLifespan;
-                    }
+                if (days == 0)
+                {
+                    days = HttpWorkflowController.NoExpiryTokenLifespan;
+                }
 
-                    return securityTokenService.CreateToken(payload, TimeSpan.FromDays(days));
-                })
-            };
-        }
+                return securityTokenService.CreateToken(payload, TimeSpan.FromDays(days));
+            })
+        };
+    }
 
-        public IEnumerable<GlobalMethod> GetMethods()
-        {
-            return new[] { _createWorkflowToken };
-        }
+    public IEnumerable<GlobalMethod> GetMethods()
+    {
+        return new[] { _createWorkflowToken };
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/IWorkflowInstanceRouteEntries.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/IWorkflowInstanceRouteEntries.cs
index 340891794ad..6002a8f58ce 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/IWorkflowInstanceRouteEntries.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/IWorkflowInstanceRouteEntries.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Workflows.Http.Services
+namespace OrchardCore.Workflows.Http.Services;
+
+internal interface IWorkflowInstanceRouteEntries : IWorkflowRouteEntries
 {
-    internal interface IWorkflowInstanceRouteEntries : IWorkflowRouteEntries
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/IWorkflowRouteEntries.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/IWorkflowRouteEntries.cs
index 168fb8cc0a2..a508a2dd7ef 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/IWorkflowRouteEntries.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/IWorkflowRouteEntries.cs
@@ -3,12 +3,11 @@
 using Microsoft.AspNetCore.Routing;
 using OrchardCore.Workflows.Http.Models;
 
-namespace OrchardCore.Workflows.Http.Services
+namespace OrchardCore.Workflows.Http.Services;
+
+internal interface IWorkflowRouteEntries
 {
-    internal interface IWorkflowRouteEntries
-    {
-        Task<IEnumerable<WorkflowRoutesEntry>> GetWorkflowRouteEntriesAsync(string httpMethod, RouteValueDictionary routeValues);
-        Task AddEntriesAsync(IEnumerable<WorkflowRoutesEntry> entries);
-        Task RemoveEntriesAsync(string workflowId);
-    }
+    Task<IEnumerable<WorkflowRoutesEntry>> GetWorkflowRouteEntriesAsync(string httpMethod, RouteValueDictionary routeValues);
+    Task AddEntriesAsync(IEnumerable<WorkflowRoutesEntry> entries);
+    Task RemoveEntriesAsync(string workflowId);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/IWorkflowTypeRouteEntries.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/IWorkflowTypeRouteEntries.cs
index 3bc9be03043..c97d108a7df 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/IWorkflowTypeRouteEntries.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/IWorkflowTypeRouteEntries.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Workflows.Http.Services
+namespace OrchardCore.Workflows.Http.Services;
+
+internal interface IWorkflowTypeRouteEntries : IWorkflowRouteEntries
 {
-    internal interface IWorkflowTypeRouteEntries : IWorkflowRouteEntries
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/WorkflowInstanceRouteEntries.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/WorkflowInstanceRouteEntries.cs
index a2d37e651f2..90eb023aed3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/WorkflowInstanceRouteEntries.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/WorkflowInstanceRouteEntries.cs
@@ -9,68 +9,67 @@
 using OrchardCore.Workflows.Services;
 using YesSql;
 
-namespace OrchardCore.Workflows.Http.Services
+namespace OrchardCore.Workflows.Http.Services;
+
+internal sealed class WorkflowInstanceRouteEntries : WorkflowRouteEntries<WorkflowRouteDocument>, IWorkflowInstanceRouteEntries
 {
-    internal sealed class WorkflowInstanceRouteEntries : WorkflowRouteEntries<WorkflowRouteDocument>, IWorkflowInstanceRouteEntries
+    public WorkflowInstanceRouteEntries(IVolatileDocumentManager<WorkflowRouteDocument> documentManager) : base(documentManager) { }
+
+    protected override async Task<WorkflowRouteDocument> CreateDocumentAsync()
     {
-        public WorkflowInstanceRouteEntries(IVolatileDocumentManager<WorkflowRouteDocument> documentManager) : base(documentManager) { }
+        var workflowTypeDictionary = (await Session.Query<WorkflowType, WorkflowTypeIndex>().ListAsync()).ToDictionary(x => x.WorkflowTypeId);
 
-        protected override async Task<WorkflowRouteDocument> CreateDocumentAsync()
-        {
-            var workflowTypeDictionary = (await Session.Query<WorkflowType, WorkflowTypeIndex>().ListAsync()).ToDictionary(x => x.WorkflowTypeId);
+        var skip = 0;
+        var pageSize = 50;
+        var document = new WorkflowRouteDocument();
 
-            var skip = 0;
-            var pageSize = 50;
-            var document = new WorkflowRouteDocument();
+        while (true)
+        {
+            var pendingWorkflows = await Session
+                .Query<Workflow, WorkflowBlockingActivitiesIndex>(index =>
+                    index.ActivityName == HttpRequestFilterEvent.EventName)
+                .Skip(skip)
+                .Take(pageSize)
+                .ListAsync();
 
-            while (true)
+            if (!pendingWorkflows.Any())
             {
-                var pendingWorkflows = await Session
-                    .Query<Workflow, WorkflowBlockingActivitiesIndex>(index =>
-                        index.ActivityName == HttpRequestFilterEvent.EventName)
-                    .Skip(skip)
-                    .Take(pageSize)
-                    .ListAsync();
-
-                if (!pendingWorkflows.Any())
-                {
-                    break;
-                }
-
-                var workflowRouteEntries =
-                    from workflow in pendingWorkflows
-                    from entry in GetWorkflowRoutesEntries(workflowTypeDictionary[workflow.WorkflowTypeId], workflow, ActivityLibrary)
-                    select entry;
+                break;
+            }
 
-                AddEntries(document, workflowRouteEntries);
+            var workflowRouteEntries =
+                from workflow in pendingWorkflows
+                from entry in GetWorkflowRoutesEntries(workflowTypeDictionary[workflow.WorkflowTypeId], workflow, ActivityLibrary)
+                select entry;
 
-                if (pendingWorkflows.Count() < pageSize)
-                {
-                    break;
-                }
+            AddEntries(document, workflowRouteEntries);
 
-                skip += pageSize;
+            if (pendingWorkflows.Count() < pageSize)
+            {
+                break;
             }
 
-            return document;
+            skip += pageSize;
         }
 
-        internal static IEnumerable<WorkflowRoutesEntry> GetWorkflowRoutesEntries(WorkflowType workflowType, Workflow workflow, IActivityLibrary activityLibrary)
+        return document;
+    }
+
+    internal static IEnumerable<WorkflowRoutesEntry> GetWorkflowRoutesEntries(WorkflowType workflowType, Workflow workflow, IActivityLibrary activityLibrary)
+    {
+        var awaitingActivityIds = workflow.BlockingActivities.Select(x => x.ActivityId).ToDictionary(x => x);
+        return workflowType.Activities.Where(x => x.Name == HttpRequestFilterEvent.EventName && awaitingActivityIds.ContainsKey(x.ActivityId)).Select(x =>
         {
-            var awaitingActivityIds = workflow.BlockingActivities.Select(x => x.ActivityId).ToDictionary(x => x);
-            return workflowType.Activities.Where(x => x.Name == HttpRequestFilterEvent.EventName && awaitingActivityIds.ContainsKey(x.ActivityId)).Select(x =>
+            var activity = activityLibrary.InstantiateActivity<HttpRequestFilterEvent>(x);
+            var entry = new WorkflowRoutesEntry
             {
-                var activity = activityLibrary.InstantiateActivity<HttpRequestFilterEvent>(x);
-                var entry = new WorkflowRoutesEntry
-                {
-                    WorkflowId = workflow.WorkflowId,
-                    ActivityId = x.ActivityId,
-                    HttpMethod = activity.HttpMethod,
-                    RouteValues = activity.RouteValues,
-                };
+                WorkflowId = workflow.WorkflowId,
+                ActivityId = x.ActivityId,
+                HttpMethod = activity.HttpMethod,
+                RouteValues = activity.RouteValues,
+            };
 
-                return entry;
-            });
-        }
+            return entry;
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/WorkflowRouteEntriesOfT.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/WorkflowRouteEntriesOfT.cs
index 87eab3f38f6..5dd1f9cc9df 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/WorkflowRouteEntriesOfT.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/WorkflowRouteEntriesOfT.cs
@@ -10,75 +10,74 @@
 using OrchardCore.Workflows.Services;
 using YesSql;
 
-namespace OrchardCore.Workflows.Http.Services
+namespace OrchardCore.Workflows.Http.Services;
+
+internal class WorkflowRouteEntries<TWorkflowRouteDocument> : IWorkflowRouteEntries where TWorkflowRouteDocument : WorkflowRouteDocument, new()
 {
-    internal class WorkflowRouteEntries<TWorkflowRouteDocument> : IWorkflowRouteEntries where TWorkflowRouteDocument : WorkflowRouteDocument, new()
-    {
-        private readonly IVolatileDocumentManager<TWorkflowRouteDocument> _documentManager;
+    private readonly IVolatileDocumentManager<TWorkflowRouteDocument> _documentManager;
 
-        public WorkflowRouteEntries(IVolatileDocumentManager<TWorkflowRouteDocument> documentManager)
-        {
-            _documentManager = documentManager;
-        }
+    public WorkflowRouteEntries(IVolatileDocumentManager<TWorkflowRouteDocument> documentManager)
+    {
+        _documentManager = documentManager;
+    }
 
-        public async Task<IEnumerable<WorkflowRoutesEntry>> GetWorkflowRouteEntriesAsync(string httpMethod, RouteValueDictionary routeValues)
-        {
-            var document = await GetDocumentAsync();
-            return GetWorkflowRoutesEntries(document, httpMethod, routeValues);
-        }
+    public async Task<IEnumerable<WorkflowRoutesEntry>> GetWorkflowRouteEntriesAsync(string httpMethod, RouteValueDictionary routeValues)
+    {
+        var document = await GetDocumentAsync();
+        return GetWorkflowRoutesEntries(document, httpMethod, routeValues);
+    }
 
-        public async Task AddEntriesAsync(IEnumerable<WorkflowRoutesEntry> entries)
-        {
-            var document = await LoadDocumentAsync();
-            AddEntries(document, entries);
-            await _documentManager.UpdateAsync(document);
-        }
+    public async Task AddEntriesAsync(IEnumerable<WorkflowRoutesEntry> entries)
+    {
+        var document = await LoadDocumentAsync();
+        AddEntries(document, entries);
+        await _documentManager.UpdateAsync(document);
+    }
 
-        public async Task RemoveEntriesAsync(string workflowId)
-        {
-            var document = await LoadDocumentAsync();
-            RemoveEntries(document, workflowId);
-            await _documentManager.UpdateAsync(document);
-        }
+    public async Task RemoveEntriesAsync(string workflowId)
+    {
+        var document = await LoadDocumentAsync();
+        RemoveEntries(document, workflowId);
+        await _documentManager.UpdateAsync(document);
+    }
 
-        protected virtual IEnumerable<WorkflowRoutesEntry> GetWorkflowRoutesEntries(WorkflowRouteDocument document, string httpMethod, RouteValueDictionary routeValues)
-        {
-            var controllerName = routeValues.GetValue<string>("controller");
-            var actionName = routeValues.GetValue<string>("action");
-            var areaName = routeValues.GetValue<string>("area");
+    protected virtual IEnumerable<WorkflowRoutesEntry> GetWorkflowRoutesEntries(WorkflowRouteDocument document, string httpMethod, RouteValueDictionary routeValues)
+    {
+        var controllerName = routeValues.GetValue<string>("controller");
+        var actionName = routeValues.GetValue<string>("action");
+        var areaName = routeValues.GetValue<string>("area");
 
-            return document.Entries.Values.SelectMany(x => x).Where(x =>
-                x.HttpMethod == httpMethod &&
-                (x.ControllerName == controllerName || string.IsNullOrWhiteSpace(x.ControllerName)) &&
-                (x.ActionName == actionName || string.IsNullOrWhiteSpace(x.ActionName)) &&
-                (x.AreaName == areaName || string.IsNullOrWhiteSpace(x.AreaName)))
-                .ToArray();
-        }
+        return document.Entries.Values.SelectMany(x => x).Where(x =>
+            x.HttpMethod == httpMethod &&
+            (x.ControllerName == controllerName || string.IsNullOrWhiteSpace(x.ControllerName)) &&
+            (x.ActionName == actionName || string.IsNullOrWhiteSpace(x.ActionName)) &&
+            (x.AreaName == areaName || string.IsNullOrWhiteSpace(x.AreaName)))
+            .ToArray();
+    }
 
-        public static void AddEntries(TWorkflowRouteDocument document, IEnumerable<WorkflowRoutesEntry> entries)
+    public static void AddEntries(TWorkflowRouteDocument document, IEnumerable<WorkflowRoutesEntry> entries)
+    {
+        foreach (var group in entries.GroupBy(x => x.WorkflowId))
         {
-            foreach (var group in entries.GroupBy(x => x.WorkflowId))
-            {
-                document.Entries[group.Key] = group.ToList();
-            }
+            document.Entries[group.Key] = group.ToList();
         }
+    }
 
-        public static void RemoveEntries(TWorkflowRouteDocument document, string workflowId) => document.Entries.Remove(workflowId);
+    public static void RemoveEntries(TWorkflowRouteDocument document, string workflowId) => document.Entries.Remove(workflowId);
 
-        /// <summary>
-        /// Loads the workflow route document for updating and that should not be cached.
-        /// </summary>
-        private Task<TWorkflowRouteDocument> LoadDocumentAsync() => _documentManager.GetOrCreateMutableAsync(CreateDocumentAsync);
+    /// <summary>
+    /// Loads the workflow route document for updating and that should not be cached.
+    /// </summary>
+    private Task<TWorkflowRouteDocument> LoadDocumentAsync() => _documentManager.GetOrCreateMutableAsync(CreateDocumentAsync);
 
-        /// <summary>
-        /// Gets the workflow route document for sharing and that should not be updated.
-        /// </summary>
-        private Task<TWorkflowRouteDocument> GetDocumentAsync() => _documentManager.GetOrCreateImmutableAsync(CreateDocumentAsync);
+    /// <summary>
+    /// Gets the workflow route document for sharing and that should not be updated.
+    /// </summary>
+    private Task<TWorkflowRouteDocument> GetDocumentAsync() => _documentManager.GetOrCreateImmutableAsync(CreateDocumentAsync);
 
-        protected virtual Task<TWorkflowRouteDocument> CreateDocumentAsync() => Task.FromResult(new TWorkflowRouteDocument());
+    protected virtual Task<TWorkflowRouteDocument> CreateDocumentAsync() => Task.FromResult(new TWorkflowRouteDocument());
 
-        protected static ISession Session => ShellScope.Services.GetRequiredService<ISession>();
+    protected static ISession Session => ShellScope.Services.GetRequiredService<ISession>();
 
-        protected static IActivityLibrary ActivityLibrary => ShellScope.Services.GetRequiredService<IActivityLibrary>();
-    }
+    protected static IActivityLibrary ActivityLibrary => ShellScope.Services.GetRequiredService<IActivityLibrary>();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/WorkflowTypeRouteEntries.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/WorkflowTypeRouteEntries.cs
index 5fb35a557d4..a3a300b4273 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/WorkflowTypeRouteEntries.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Services/WorkflowTypeRouteEntries.cs
@@ -9,42 +9,41 @@
 using OrchardCore.Workflows.Services;
 using YesSql;
 
-namespace OrchardCore.Workflows.Http.Services
+namespace OrchardCore.Workflows.Http.Services;
+
+internal sealed class WorkflowTypeRouteEntries : WorkflowRouteEntries<WorkflowTypeRouteDocument>, IWorkflowTypeRouteEntries
 {
-    internal sealed class WorkflowTypeRouteEntries : WorkflowRouteEntries<WorkflowTypeRouteDocument>, IWorkflowTypeRouteEntries
-    {
-        public WorkflowTypeRouteEntries(IVolatileDocumentManager<WorkflowTypeRouteDocument> documentManager) : base(documentManager) { }
+    public WorkflowTypeRouteEntries(IVolatileDocumentManager<WorkflowTypeRouteDocument> documentManager) : base(documentManager) { }
 
-        protected override async Task<WorkflowTypeRouteDocument> CreateDocumentAsync()
-        {
-            var workflowTypeDictionary = (await Session.Query<WorkflowType, WorkflowTypeIndex>().ListAsync()).ToDictionary(x => x.WorkflowTypeId);
+    protected override async Task<WorkflowTypeRouteDocument> CreateDocumentAsync()
+    {
+        var workflowTypeDictionary = (await Session.Query<WorkflowType, WorkflowTypeIndex>().ListAsync()).ToDictionary(x => x.WorkflowTypeId);
 
-            var workflowTypeRouteEntries =
-                from workflowType in workflowTypeDictionary.Values
-                from entry in GetWorkflowTypeRoutesEntries(workflowType, ActivityLibrary)
-                select entry;
+        var workflowTypeRouteEntries =
+            from workflowType in workflowTypeDictionary.Values
+            from entry in GetWorkflowTypeRoutesEntries(workflowType, ActivityLibrary)
+            select entry;
 
-            var document = new WorkflowTypeRouteDocument();
-            AddEntries(document, workflowTypeRouteEntries);
+        var document = new WorkflowTypeRouteDocument();
+        AddEntries(document, workflowTypeRouteEntries);
 
-            return document;
-        }
+        return document;
+    }
 
-        internal static IEnumerable<WorkflowRoutesEntry> GetWorkflowTypeRoutesEntries(WorkflowType workflowType, IActivityLibrary activityLibrary)
+    internal static IEnumerable<WorkflowRoutesEntry> GetWorkflowTypeRoutesEntries(WorkflowType workflowType, IActivityLibrary activityLibrary)
+    {
+        return workflowType.Activities.Where(x => x.IsStart && x.Name == HttpRequestFilterEvent.EventName).Select(x =>
         {
-            return workflowType.Activities.Where(x => x.IsStart && x.Name == HttpRequestFilterEvent.EventName).Select(x =>
+            var activity = activityLibrary.InstantiateActivity<HttpRequestFilterEvent>(x);
+            var entry = new WorkflowRoutesEntry
             {
-                var activity = activityLibrary.InstantiateActivity<HttpRequestFilterEvent>(x);
-                var entry = new WorkflowRoutesEntry
-                {
-                    WorkflowId = workflowType.Id.ToString(),
-                    ActivityId = x.ActivityId,
-                    HttpMethod = activity.HttpMethod,
-                    RouteValues = activity.RouteValues
-                };
-
-                return entry;
-            });
-        }
+                WorkflowId = workflowType.Id.ToString(),
+                ActivityId = x.ActivityId,
+                HttpMethod = activity.HttpMethod,
+                RouteValues = activity.RouteValues
+            };
+
+            return entry;
+        });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Startup.cs
index fb2e2fb5bf0..5c54afc535f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Startup.cs
@@ -17,55 +17,54 @@
 using OrchardCore.Workflows.Http.WorkflowContextProviders;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Http
+namespace OrchardCore.Workflows.Http;
+
+[Feature("OrchardCore.Workflows.Http")]
+public sealed class Startup : StartupBase
 {
-    [Feature("OrchardCore.Workflows.Http")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<MvcOptions>(o =>
         {
-            services.Configure<MvcOptions>(o =>
-            {
-                o.Filters.Add<WorkflowActionFilter>();
-            });
+            o.Filters.Add<WorkflowActionFilter>();
+        });
 
-            services.AddHttpClient();
+        services.AddHttpClient();
 
-            services.AddLiquidFilter<SignalUrlFilter>("signal_url");
+        services.AddLiquidFilter<SignalUrlFilter>("signal_url");
 
-            services.AddScoped<IWorkflowTypeEventHandler, WorkflowTypeRoutesHandler>();
-            services.AddScoped<IWorkflowHandler, WorkflowRoutesHandler>();
+        services.AddScoped<IWorkflowTypeEventHandler, WorkflowTypeRoutesHandler>();
+        services.AddScoped<IWorkflowHandler, WorkflowRoutesHandler>();
 
-            services.AddSingleton<IWorkflowTypeRouteEntries, WorkflowTypeRouteEntries>();
-            services.AddSingleton<IWorkflowInstanceRouteEntries, WorkflowInstanceRouteEntries>();
-            services.AddSingleton<IGlobalMethodProvider, HttpMethodsProvider>();
-            services.AddScoped<IWorkflowExecutionContextHandler, SignalWorkflowExecutionContextHandler>();
+        services.AddSingleton<IWorkflowTypeRouteEntries, WorkflowTypeRouteEntries>();
+        services.AddSingleton<IWorkflowInstanceRouteEntries, WorkflowInstanceRouteEntries>();
+        services.AddSingleton<IGlobalMethodProvider, HttpMethodsProvider>();
+        services.AddScoped<IWorkflowExecutionContextHandler, SignalWorkflowExecutionContextHandler>();
 
-            services.AddActivity<HttpRequestEvent, HttpRequestEventDisplayDriver>();
-            services.AddActivity<HttpRequestFilterEvent, HttpRequestFilterEventDisplayDriver>();
-            services.AddActivity<HttpRedirectTask, HttpRedirectTaskDisplayDriver>();
-            services.AddActivity<HttpRequestTask, HttpRequestTaskDisplayDriver>();
-            services.AddActivity<HttpResponseTask, HttpResponseTaskDisplayDriver>();
-            services.AddActivity<SignalEvent, SignalEventDisplayDriver>();
+        services.AddActivity<HttpRequestEvent, HttpRequestEventDisplayDriver>();
+        services.AddActivity<HttpRequestFilterEvent, HttpRequestFilterEventDisplayDriver>();
+        services.AddActivity<HttpRedirectTask, HttpRedirectTaskDisplayDriver>();
+        services.AddActivity<HttpRequestTask, HttpRequestTaskDisplayDriver>();
+        services.AddActivity<HttpResponseTask, HttpResponseTaskDisplayDriver>();
+        services.AddActivity<SignalEvent, SignalEventDisplayDriver>();
 
-            services.AddSingleton<IGlobalMethodProvider, TokenMethodProvider>();
-        }
+        services.AddSingleton<IGlobalMethodProvider, TokenMethodProvider>();
+    }
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            routes.MapAreaControllerRoute(
-                name: "HttpWorkflow",
-                areaName: "OrchardCore.Workflows",
-                pattern: "workflows/{action}",
-                defaults: new { controller = "HttpWorkflow" }
-            );
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        routes.MapAreaControllerRoute(
+            name: "HttpWorkflow",
+            areaName: "OrchardCore.Workflows",
+            pattern: "workflows/{action}",
+            defaults: new { controller = "HttpWorkflow" }
+        );
 
-            routes.MapAreaControllerRoute(
-                name: "InvokeWorkflow",
-                areaName: "OrchardCore.Workflows",
-                pattern: "workflows/invoke/{token}",
-                defaults: new { controller = "HttpWorkflow", action = "Invoke" }
-            );
-        }
+        routes.MapAreaControllerRoute(
+            name: "InvokeWorkflow",
+            areaName: "OrchardCore.Workflows",
+            pattern: "workflows/invoke/{token}",
+            defaults: new { controller = "HttpWorkflow", action = "Invoke" }
+        );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpRedirectTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpRedirectTaskViewModel.cs
index c0a6a982d15..e8a47c884c4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpRedirectTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpRedirectTaskViewModel.cs
@@ -1,12 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Workflows.Http.ViewModels
+namespace OrchardCore.Workflows.Http.ViewModels;
+
+public class HttpRedirectTaskViewModel
 {
-    public class HttpRedirectTaskViewModel
-    {
-        [Required]
-        public string Location { get; set; }
+    [Required]
+    public string Location { get; set; }
 
-        public bool Permanent { get; set; }
-    }
+    public bool Permanent { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpRequestEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpRequestEventViewModel.cs
index 50a637e2bf3..512ce0fc517 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpRequestEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpRequestEventViewModel.cs
@@ -2,31 +2,30 @@
 using System.Linq;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.Workflows.Http.ViewModels
+namespace OrchardCore.Workflows.Http.ViewModels;
+
+public class HttpRequestEventViewModel
 {
-    public class HttpRequestEventViewModel
-    {
-        private static readonly IEnumerable<string> _availableHttpMethods = new[]
-            {
-                "GET",
-                "POST",
-                "PUT",
-                "PATCH",
-                "DELETE",
-                "OPTIONS"
-            };
+    private static readonly IEnumerable<string> _availableHttpMethods = new[]
+        {
+            "GET",
+            "POST",
+            "PUT",
+            "PATCH",
+            "DELETE",
+            "OPTIONS"
+        };
 
-        public string HttpMethod { get; set; }
+    public string HttpMethod { get; set; }
 
-        public string Url { get; set; }
+    public string Url { get; set; }
 
-        public bool ValidateAntiforgeryToken { get; set; }
+    public bool ValidateAntiforgeryToken { get; set; }
 
-        public int TokenLifeSpan { get; set; }
+    public int TokenLifeSpan { get; set; }
 
-        public string FormLocationKey { get; set; }
+    public string FormLocationKey { get; set; }
 
-        public static IList<SelectListItem> GetAvailableHttpMethods()
-            => _availableHttpMethods.Select(x => new SelectListItem { Text = x, Value = x }).ToList();
-    }
+    public static IList<SelectListItem> GetAvailableHttpMethods()
+        => _availableHttpMethods.Select(x => new SelectListItem { Text = x, Value = x }).ToList();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpRequestFilterEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpRequestFilterEventViewModel.cs
index c9244f818dc..9d712d084fc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpRequestFilterEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpRequestFilterEventViewModel.cs
@@ -2,17 +2,16 @@
 using System.Linq;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.Workflows.Http.ViewModels
+namespace OrchardCore.Workflows.Http.ViewModels;
+
+public class HttpRequestFilterEventViewModel
 {
-    public class HttpRequestFilterEventViewModel
-    {
-        public string HttpMethod { get; set; }
-        public string ControllerName { get; set; }
-        public string ActionName { get; set; }
-        public string AreaName { get; set; }
-        // TODO: Add support for arbitrary route values.
+    public string HttpMethod { get; set; }
+    public string ControllerName { get; set; }
+    public string ActionName { get; set; }
+    public string AreaName { get; set; }
+    // TODO: Add support for arbitrary route values.
 
-        private readonly IList<string> _availableHttpMethods = new[] { "GET", "POST", "PUT", "DELETE", "OPTIONS" };
-        public IList<SelectListItem> AvailableHttpMethods => _availableHttpMethods.Select(x => new SelectListItem { Text = x, Value = x }).ToList();
-    }
+    private readonly IList<string> _availableHttpMethods = new[] { "GET", "POST", "PUT", "DELETE", "OPTIONS" };
+    public IList<SelectListItem> AvailableHttpMethods => _availableHttpMethods.Select(x => new SelectListItem { Text = x, Value = x }).ToList();
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpRequestTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpRequestTaskViewModel.cs
index dad566c5d4c..13477b28b2d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpRequestTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpRequestTaskViewModel.cs
@@ -1,18 +1,17 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Workflows.Http.ViewModels
+namespace OrchardCore.Workflows.Http.ViewModels;
+
+public class HttpRequestTaskViewModel
 {
-    public class HttpRequestTaskViewModel
-    {
-        [Required]
-        public string Url { get; set; }
+    [Required]
+    public string Url { get; set; }
 
-        [Required]
-        public string HttpMethod { get; set; }
+    [Required]
+    public string HttpMethod { get; set; }
 
-        public string Headers { get; set; }
-        public string Body { get; set; }
-        public string ContentType { get; set; }
-        public string HttpResponseCodes { get; set; }
-    }
+    public string Headers { get; set; }
+    public string Body { get; set; }
+    public string ContentType { get; set; }
+    public string HttpResponseCodes { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpResponseTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpResponseTaskViewModel.cs
index 1171453fde0..963df4482ce 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpResponseTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/ViewModels/HttpResponseTaskViewModel.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.Workflows.Http.ViewModels
+namespace OrchardCore.Workflows.Http.ViewModels;
+
+public class HttpResponseTaskViewModel
 {
-    public class HttpResponseTaskViewModel
-    {
-        public int HttpStatusCode { get; set; }
-        public string Headers { get; set; }
-        public string Content { get; set; }
-        public string ContentType { get; set; }
-    }
+    public int HttpStatusCode { get; set; }
+    public string Headers { get; set; }
+    public string Content { get; set; }
+    public string ContentType { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Indexes/WorkflowIndexProvider.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Indexes/WorkflowIndexProvider.cs
index 1ddc23dd5aa..5f6221950b5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Indexes/WorkflowIndexProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Indexes/WorkflowIndexProvider.cs
@@ -3,55 +3,54 @@
 using OrchardCore.Workflows.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.Workflows.Indexes
+namespace OrchardCore.Workflows.Indexes;
+
+public class WorkflowIndex : MapIndex
 {
-    public class WorkflowIndex : MapIndex
-    {
-        public long DocumentId { get; set; }
-        public string WorkflowTypeId { get; set; }
-        public string WorkflowId { get; set; }
-        public int WorkflowStatus { get; set; }
-        public DateTime CreatedUtc { get; set; }
-    }
+    public long DocumentId { get; set; }
+    public string WorkflowTypeId { get; set; }
+    public string WorkflowId { get; set; }
+    public int WorkflowStatus { get; set; }
+    public DateTime CreatedUtc { get; set; }
+}
 
-    public class WorkflowBlockingActivitiesIndex : MapIndex
-    {
-        public string ActivityId { get; set; }
-        public string ActivityName { get; set; }
-        public bool ActivityIsStart { get; set; }
-        public string WorkflowTypeId { get; set; }
-        public string WorkflowId { get; set; }
-        public string WorkflowCorrelationId { get; set; }
-    }
+public class WorkflowBlockingActivitiesIndex : MapIndex
+{
+    public string ActivityId { get; set; }
+    public string ActivityName { get; set; }
+    public bool ActivityIsStart { get; set; }
+    public string WorkflowTypeId { get; set; }
+    public string WorkflowId { get; set; }
+    public string WorkflowCorrelationId { get; set; }
+}
 
-    public class WorkflowIndexProvider : IndexProvider<Workflow>
+public class WorkflowIndexProvider : IndexProvider<Workflow>
+{
+    public override void Describe(DescribeContext<Workflow> context)
     {
-        public override void Describe(DescribeContext<Workflow> context)
-        {
-            context.For<WorkflowIndex>()
-                .Map(workflow =>
-                    new WorkflowIndex
-                    {
-                        WorkflowTypeId = workflow.WorkflowTypeId,
-                        WorkflowId = workflow.WorkflowId,
-                        CreatedUtc = workflow.CreatedUtc,
-                        WorkflowStatus = (int)workflow.Status
-                    }
-                );
+        context.For<WorkflowIndex>()
+            .Map(workflow =>
+                new WorkflowIndex
+                {
+                    WorkflowTypeId = workflow.WorkflowTypeId,
+                    WorkflowId = workflow.WorkflowId,
+                    CreatedUtc = workflow.CreatedUtc,
+                    WorkflowStatus = (int)workflow.Status
+                }
+            );
 
-            context.For<WorkflowBlockingActivitiesIndex>()
-                .Map(workflow =>
-                    workflow.BlockingActivities.Select(x =>
-                    new WorkflowBlockingActivitiesIndex
-                    {
-                        ActivityId = x.ActivityId,
-                        ActivityName = x.Name,
-                        ActivityIsStart = x.IsStart,
-                        WorkflowTypeId = workflow.WorkflowTypeId,
-                        WorkflowId = workflow.WorkflowId,
-                        WorkflowCorrelationId = workflow.CorrelationId ?? ""
-                    })
-                );
-        }
+        context.For<WorkflowBlockingActivitiesIndex>()
+            .Map(workflow =>
+                workflow.BlockingActivities.Select(x =>
+                new WorkflowBlockingActivitiesIndex
+                {
+                    ActivityId = x.ActivityId,
+                    ActivityName = x.Name,
+                    ActivityIsStart = x.IsStart,
+                    WorkflowTypeId = workflow.WorkflowTypeId,
+                    WorkflowId = workflow.WorkflowId,
+                    WorkflowCorrelationId = workflow.CorrelationId ?? ""
+                })
+            );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Indexes/WorkflowTypeIndexProvider.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Indexes/WorkflowTypeIndexProvider.cs
index 4b5554061d8..dca6626d5e2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Indexes/WorkflowTypeIndexProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Indexes/WorkflowTypeIndexProvider.cs
@@ -2,53 +2,52 @@
 using OrchardCore.Workflows.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.Workflows.Indexes
+namespace OrchardCore.Workflows.Indexes;
+
+public class WorkflowTypeIndex : MapIndex
 {
-    public class WorkflowTypeIndex : MapIndex
-    {
-        public long DocumentId { get; set; }
-        public string WorkflowTypeId { get; set; }
-        public string Name { get; set; }
-        public bool IsEnabled { get; set; }
-        public bool HasStart { get; set; }
-    }
+    public long DocumentId { get; set; }
+    public string WorkflowTypeId { get; set; }
+    public string Name { get; set; }
+    public bool IsEnabled { get; set; }
+    public bool HasStart { get; set; }
+}
 
-    public class WorkflowTypeStartActivitiesIndex : MapIndex
-    {
-        public string WorkflowTypeId { get; set; }
-        public string Name { get; set; }
-        public bool IsEnabled { get; set; }
-        public string StartActivityId { get; set; }
-        public string StartActivityName { get; set; }
-    }
+public class WorkflowTypeStartActivitiesIndex : MapIndex
+{
+    public string WorkflowTypeId { get; set; }
+    public string Name { get; set; }
+    public bool IsEnabled { get; set; }
+    public string StartActivityId { get; set; }
+    public string StartActivityName { get; set; }
+}
 
-    public class WorkflowTypeIndexProvider : IndexProvider<WorkflowType>
+public class WorkflowTypeIndexProvider : IndexProvider<WorkflowType>
+{
+    public override void Describe(DescribeContext<WorkflowType> context)
     {
-        public override void Describe(DescribeContext<WorkflowType> context)
-        {
-            context.For<WorkflowTypeIndex>()
-                .Map(workflowType =>
-                        new WorkflowTypeIndex
-                        {
-                            WorkflowTypeId = workflowType.WorkflowTypeId,
-                            Name = workflowType.Name,
-                            IsEnabled = workflowType.IsEnabled,
-                            HasStart = workflowType.Activities.Any(x => x.IsStart)
-                        }
-                );
+        context.For<WorkflowTypeIndex>()
+            .Map(workflowType =>
+                    new WorkflowTypeIndex
+                    {
+                        WorkflowTypeId = workflowType.WorkflowTypeId,
+                        Name = workflowType.Name,
+                        IsEnabled = workflowType.IsEnabled,
+                        HasStart = workflowType.Activities.Any(x => x.IsStart)
+                    }
+            );
 
-            context.For<WorkflowTypeStartActivitiesIndex>()
-                .Map(workflowType =>
-                    workflowType.Activities.Where(x => x.IsStart).Select(x =>
-                        new WorkflowTypeStartActivitiesIndex
-                        {
-                            WorkflowTypeId = workflowType.WorkflowTypeId,
-                            Name = workflowType.Name,
-                            IsEnabled = workflowType.IsEnabled,
-                            StartActivityId = x.ActivityId,
-                            StartActivityName = x.Name
-                        })
-                );
-        }
+        context.For<WorkflowTypeStartActivitiesIndex>()
+            .Map(workflowType =>
+                workflowType.Activities.Where(x => x.IsStart).Select(x =>
+                    new WorkflowTypeStartActivitiesIndex
+                    {
+                        WorkflowTypeId = workflowType.WorkflowTypeId,
+                        Name = workflowType.Name,
+                        IsEnabled = workflowType.IsEnabled,
+                        StartActivityId = x.ActivityId,
+                        StartActivityName = x.Name
+                    })
+            );
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Migrations.cs
index 0a7375150e3..ffb6ab01156 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Migrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Migrations.cs
@@ -4,148 +4,147 @@
 using OrchardCore.Workflows.Indexes;
 using YesSql.Sql;
 
-namespace OrchardCore.Workflows
+namespace OrchardCore.Workflows;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
+    public async Task<int> CreateAsync()
     {
-        public async Task<int> CreateAsync()
-        {
-            await SchemaBuilder.CreateMapIndexTableAsync<WorkflowTypeIndex>(table => table
-                .Column<string>("WorkflowTypeId", c => c.WithLength(26))
-                .Column<string>("Name")
-                .Column<bool>("IsEnabled")
-                .Column<bool>("HasStart")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<WorkflowTypeIndex>(table => table
-                .CreateIndex("IDX_WorkflowTypeIndex_DocumentId",
-                    "DocumentId",
-                    "WorkflowTypeId",
-                    "Name",
-                    "IsEnabled",
-                    "HasStart")
-            );
-
-            await SchemaBuilder.CreateMapIndexTableAsync<WorkflowTypeStartActivitiesIndex>(table => table
-                .Column<string>("WorkflowTypeId")
-                .Column<string>("Name")
-                .Column<bool>("IsEnabled")
-                .Column<string>("StartActivityId")
-                .Column<string>("StartActivityName")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<WorkflowTypeStartActivitiesIndex>(table => table
-                .CreateIndex("IDX_WorkflowTypeStartActivitiesIndex_DocumentId",
-                    "DocumentId",
-                    "WorkflowTypeId",
-                    "StartActivityId",
-                    "StartActivityName",
-                    "IsEnabled")
-            );
-
-            await SchemaBuilder.CreateMapIndexTableAsync<WorkflowIndex>(table => table
-                .Column<string>("WorkflowTypeId", c => c.WithLength(26))
-                .Column<string>("WorkflowId", c => c.WithLength(26))
-                .Column<string>("WorkflowStatus", c => c.WithLength(26))
-                .Column<DateTime>("CreatedUtc")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<WorkflowIndex>(table => table
-                .CreateIndex("IDX_WorkflowIndex_DocumentId",
-                    "DocumentId",
-                    "WorkflowTypeId",
-                    "WorkflowId",
-                    "WorkflowStatus",
-                    "CreatedUtc")
-            );
-
-            await SchemaBuilder.CreateMapIndexTableAsync<WorkflowBlockingActivitiesIndex>(table => table
-                .Column<string>("ActivityId")
-                .Column<string>("ActivityName")
-                .Column<bool>("ActivityIsStart")
-                .Column<string>("WorkflowTypeId")
-                .Column<string>("WorkflowId")
-                .Column<string>("WorkflowCorrelationId")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<WorkflowBlockingActivitiesIndex>(table => table
-                .CreateIndex("IDX_WFBlockingActivities_DocumentId_ActivityId",
-                    "DocumentId",
-                    "ActivityId",
-                    "WorkflowTypeId",
-                    "WorkflowId")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<WorkflowBlockingActivitiesIndex>(table => table
-                .CreateIndex("IDX_WFBlockingActivities_DocumentId_ActivityName",
-                    "DocumentId",
-                    "ActivityName",
-                    "WorkflowTypeId",
-                    "WorkflowCorrelationId")
-            );
-
-            // Shortcut other migration steps on new content definition schemas.
-            return 3;
-        }
-
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom1Async()
+        await SchemaBuilder.CreateMapIndexTableAsync<WorkflowTypeIndex>(table => table
+            .Column<string>("WorkflowTypeId", c => c.WithLength(26))
+            .Column<string>("Name")
+            .Column<bool>("IsEnabled")
+            .Column<bool>("HasStart")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<WorkflowTypeIndex>(table => table
+            .CreateIndex("IDX_WorkflowTypeIndex_DocumentId",
+                "DocumentId",
+                "WorkflowTypeId",
+                "Name",
+                "IsEnabled",
+                "HasStart")
+        );
+
+        await SchemaBuilder.CreateMapIndexTableAsync<WorkflowTypeStartActivitiesIndex>(table => table
+            .Column<string>("WorkflowTypeId")
+            .Column<string>("Name")
+            .Column<bool>("IsEnabled")
+            .Column<string>("StartActivityId")
+            .Column<string>("StartActivityName")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<WorkflowTypeStartActivitiesIndex>(table => table
+            .CreateIndex("IDX_WorkflowTypeStartActivitiesIndex_DocumentId",
+                "DocumentId",
+                "WorkflowTypeId",
+                "StartActivityId",
+                "StartActivityName",
+                "IsEnabled")
+        );
+
+        await SchemaBuilder.CreateMapIndexTableAsync<WorkflowIndex>(table => table
+            .Column<string>("WorkflowTypeId", c => c.WithLength(26))
+            .Column<string>("WorkflowId", c => c.WithLength(26))
+            .Column<string>("WorkflowStatus", c => c.WithLength(26))
+            .Column<DateTime>("CreatedUtc")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<WorkflowIndex>(table => table
+            .CreateIndex("IDX_WorkflowIndex_DocumentId",
+                "DocumentId",
+                "WorkflowTypeId",
+                "WorkflowId",
+                "WorkflowStatus",
+                "CreatedUtc")
+        );
+
+        await SchemaBuilder.CreateMapIndexTableAsync<WorkflowBlockingActivitiesIndex>(table => table
+            .Column<string>("ActivityId")
+            .Column<string>("ActivityName")
+            .Column<bool>("ActivityIsStart")
+            .Column<string>("WorkflowTypeId")
+            .Column<string>("WorkflowId")
+            .Column<string>("WorkflowCorrelationId")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<WorkflowBlockingActivitiesIndex>(table => table
+            .CreateIndex("IDX_WFBlockingActivities_DocumentId_ActivityId",
+                "DocumentId",
+                "ActivityId",
+                "WorkflowTypeId",
+                "WorkflowId")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<WorkflowBlockingActivitiesIndex>(table => table
+            .CreateIndex("IDX_WFBlockingActivities_DocumentId_ActivityName",
+                "DocumentId",
+                "ActivityName",
+                "WorkflowTypeId",
+                "WorkflowCorrelationId")
+        );
+
+        // Shortcut other migration steps on new content definition schemas.
+        return 3;
+    }
+
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom1Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<WorkflowIndex>(table =>
         {
-            await SchemaBuilder.AlterIndexTableAsync<WorkflowIndex>(table =>
-            {
-                table.AddColumn<string>("WorkflowStatus");
-            });
+            table.AddColumn<string>("WorkflowStatus");
+        });
 
-            return 2;
-        }
+        return 2;
+    }
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom2Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<WorkflowTypeIndex>(table => table
-                .CreateIndex("IDX_WorkflowTypeIndex_DocumentId",
-                    "DocumentId",
-                    "WorkflowTypeId",
-                    "Name",
-                    "IsEnabled",
-                    "HasStart")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<WorkflowTypeStartActivitiesIndex>(table => table
-                .CreateIndex("IDX_WorkflowTypeStartActivitiesIndex_DocumentId",
-                    "DocumentId",
-                    "WorkflowTypeId",
-                    "StartActivityId",
-                    "StartActivityName",
-                    "IsEnabled")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<WorkflowIndex>(table => table
-                .CreateIndex("IDX_WorkflowIndex_DocumentId",
-                    "DocumentId",
-                    "WorkflowTypeId",
-                    "WorkflowId",
-                    "WorkflowStatus",
-                    "CreatedUtc")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<WorkflowBlockingActivitiesIndex>(table => table
-                .CreateIndex("IDX_WFBlockingActivities_DocumentId_ActivityId",
-                    "DocumentId",
-                    "ActivityId",
-                    "WorkflowTypeId",
-                    "WorkflowId")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<WorkflowBlockingActivitiesIndex>(table => table
-                .CreateIndex("IDX_WFBlockingActivities_DocumentId_ActivityName",
-                    "DocumentId",
-                    "ActivityName",
-                    "WorkflowTypeId",
-                    "WorkflowCorrelationId")
-            );
-
-            return 3;
-        }
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom2Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<WorkflowTypeIndex>(table => table
+            .CreateIndex("IDX_WorkflowTypeIndex_DocumentId",
+                "DocumentId",
+                "WorkflowTypeId",
+                "Name",
+                "IsEnabled",
+                "HasStart")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<WorkflowTypeStartActivitiesIndex>(table => table
+            .CreateIndex("IDX_WorkflowTypeStartActivitiesIndex_DocumentId",
+                "DocumentId",
+                "WorkflowTypeId",
+                "StartActivityId",
+                "StartActivityName",
+                "IsEnabled")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<WorkflowIndex>(table => table
+            .CreateIndex("IDX_WorkflowIndex_DocumentId",
+                "DocumentId",
+                "WorkflowTypeId",
+                "WorkflowId",
+                "WorkflowStatus",
+                "CreatedUtc")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<WorkflowBlockingActivitiesIndex>(table => table
+            .CreateIndex("IDX_WFBlockingActivities_DocumentId_ActivityId",
+                "DocumentId",
+                "ActivityId",
+                "WorkflowTypeId",
+                "WorkflowId")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<WorkflowBlockingActivitiesIndex>(table => table
+            .CreateIndex("IDX_WFBlockingActivities_DocumentId_ActivityName",
+                "DocumentId",
+                "ActivityName",
+                "WorkflowTypeId",
+                "WorkflowCorrelationId")
+        );
+
+        return 3;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Permissions.cs
index e01132cad64..e28cf0f60eb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Permissions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Permissions.cs
@@ -8,7 +8,7 @@ public sealed class Permissions : IPermissionProvider
 {
     public static readonly Permission ManageWorkflows = new("ManageWorkflows", "Manage workflows", isSecurityCritical: true);
     public static readonly Permission ExecuteWorkflows = new("ExecuteWorkflows", "Execute workflows", isSecurityCritical: true);
-    public static readonly Permission ManageWorkflowSettings = new("ManageWorkflowSettings", "Manage workflow settings", [ManageWorkflows] );
+    public static readonly Permission ManageWorkflowSettings = new("ManageWorkflowSettings", "Manage workflow settings", [ManageWorkflows]);
 
     private readonly IEnumerable<Permission> _allPermissions =
     [
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Recipes/WorkflowTypeStep.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Recipes/WorkflowTypeStep.cs
index b4386a07b73..0dfd100bc40 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Recipes/WorkflowTypeStep.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Recipes/WorkflowTypeStep.cs
@@ -16,95 +16,94 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Recipes
+namespace OrchardCore.Workflows.Recipes;
+
+public sealed class WorkflowTypeStep : IRecipeStepHandler
 {
-    public sealed class WorkflowTypeStep : IRecipeStepHandler
+    private readonly IWorkflowTypeStore _workflowTypeStore;
+    private readonly ISecurityTokenService _securityTokenService;
+    private readonly IActionContextAccessor _actionContextAccessor;
+    private readonly IUrlHelperFactory _urlHelperFactory;
+    private readonly JsonSerializerOptions _jsonSerializerOptions;
+
+    public WorkflowTypeStep(IWorkflowTypeStore workflowTypeStore,
+        ISecurityTokenService securityTokenService,
+        IActionContextAccessor actionContextAccessor,
+        IUrlHelperFactory urlHelperFactory,
+        IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions)
+    {
+        _workflowTypeStore = workflowTypeStore;
+        _securityTokenService = securityTokenService;
+        _actionContextAccessor = actionContextAccessor;
+        _urlHelperFactory = urlHelperFactory;
+        _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
+    }
+
+    public async Task ExecuteAsync(RecipeExecutionContext context)
     {
-        private readonly IWorkflowTypeStore _workflowTypeStore;
-        private readonly ISecurityTokenService _securityTokenService;
-        private readonly IActionContextAccessor _actionContextAccessor;
-        private readonly IUrlHelperFactory _urlHelperFactory;
-        private readonly JsonSerializerOptions _jsonSerializerOptions;
-
-        public WorkflowTypeStep(IWorkflowTypeStore workflowTypeStore,
-            ISecurityTokenService securityTokenService,
-            IActionContextAccessor actionContextAccessor,
-            IUrlHelperFactory urlHelperFactory,
-            IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions)
+        if (!string.Equals(context.Name, "WorkflowType", StringComparison.OrdinalIgnoreCase))
         {
-            _workflowTypeStore = workflowTypeStore;
-            _securityTokenService = securityTokenService;
-            _actionContextAccessor = actionContextAccessor;
-            _urlHelperFactory = urlHelperFactory;
-            _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        var model = context.Step.ToObject<WorkflowStepModel>();
+        var urlHelper = GetUrlHelper();
+
+        foreach (var token in model.Data.Cast<JsonObject>())
         {
-            if (!string.Equals(context.Name, "WorkflowType", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
+            var workflow = token.ToObject<WorkflowType>(_jsonSerializerOptions);
 
-            var model = context.Step.ToObject<WorkflowStepModel>();
-            var urlHelper = GetUrlHelper();
+            var existing = await _workflowTypeStore.GetAsync(workflow.WorkflowTypeId);
 
-            foreach (var token in model.Data.Cast<JsonObject>())
+            if (existing is null)
             {
-                var workflow = token.ToObject<WorkflowType>(_jsonSerializerOptions);
+                workflow.Id = 0;
 
-                var existing = await _workflowTypeStore.GetAsync(workflow.WorkflowTypeId);
-
-                if (existing is null)
+                if (urlHelper is not null)
                 {
-                    workflow.Id = 0;
-
-                    if (urlHelper is not null)
+                    foreach (var activity in workflow.Activities.Where(a => a.Name == nameof(HttpRequestEvent)))
                     {
-                        foreach (var activity in workflow.Activities.Where(a => a.Name == nameof(HttpRequestEvent)))
+                        if (!activity.Properties.TryGetPropertyValue("TokenLifeSpan", out var tokenLifeSpan))
                         {
-                            if (!activity.Properties.TryGetPropertyValue("TokenLifeSpan", out var tokenLifeSpan))
-                            {
-                                continue;
-                            }
-
-                            activity.Properties["Url"] = ReGenerateHttpRequestEventUrl(urlHelper, workflow, activity, tokenLifeSpan.ToObject<int>());
+                            continue;
                         }
+
+                        activity.Properties["Url"] = ReGenerateHttpRequestEventUrl(urlHelper, workflow, activity, tokenLifeSpan.ToObject<int>());
                     }
                 }
-                else
-                {
-                    await _workflowTypeStore.DeleteAsync(existing);
-                }
-
-                await _workflowTypeStore.SaveAsync(workflow);
             }
-        }
-
-        private IUrlHelper _urlHelper;
-
-        private IUrlHelper GetUrlHelper()
-        {
-            // When 'UrlHelper' is instantiated outside a controller's action (e.g., in a BackgroundTask), the ActionContext is null.
-            if (_urlHelper is null && _actionContextAccessor.ActionContext is not null)
+            else
             {
-                _urlHelper = _urlHelperFactory.GetUrlHelper(_actionContextAccessor.ActionContext);
+                await _workflowTypeStore.DeleteAsync(existing);
             }
 
-            return _urlHelper;
+            await _workflowTypeStore.SaveAsync(workflow);
         }
+    }
 
-        private string ReGenerateHttpRequestEventUrl(IUrlHelper urlHelper, WorkflowType workflow, ActivityRecord activity, int tokenLifeSpan)
-        {
-            var token = _securityTokenService.CreateToken(new WorkflowPayload(workflow.WorkflowTypeId, activity.ActivityId),
-                TimeSpan.FromDays(tokenLifeSpan == 0 ? HttpWorkflowController.NoExpiryTokenLifespan : tokenLifeSpan));
+    private IUrlHelper _urlHelper;
 
-            return urlHelper.Action("Invoke", "HttpWorkflow", new { token });
+    private IUrlHelper GetUrlHelper()
+    {
+        // When 'UrlHelper' is instantiated outside a controller's action (e.g., in a BackgroundTask), the ActionContext is null.
+        if (_urlHelper is null && _actionContextAccessor.ActionContext is not null)
+        {
+            _urlHelper = _urlHelperFactory.GetUrlHelper(_actionContextAccessor.ActionContext);
         }
+
+        return _urlHelper;
     }
 
-    public sealed class WorkflowStepModel
+    private string ReGenerateHttpRequestEventUrl(IUrlHelper urlHelper, WorkflowType workflow, ActivityRecord activity, int tokenLifeSpan)
     {
-        public JsonArray Data { get; set; }
+        var token = _securityTokenService.CreateToken(new WorkflowPayload(workflow.WorkflowTypeId, activity.ActivityId),
+            TimeSpan.FromDays(tokenLifeSpan == 0 ? HttpWorkflowController.NoExpiryTokenLifespan : tokenLifeSpan));
+
+        return urlHelper.Action("Invoke", "HttpWorkflow", new { token });
     }
 }
+
+public sealed class WorkflowStepModel
+{
+    public JsonArray Data { get; set; }
+}
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ResourceManagementOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ResourceManagementOptionsConfiguration.cs
index bd49b6189a8..f1429df8e73 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ResourceManagementOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ResourceManagementOptionsConfiguration.cs
@@ -1,35 +1,34 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Workflows
+namespace OrchardCore.Workflows;
+
+public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
 {
-    public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
-    {
-        private static readonly ResourceManifest _manifest;
+    private static readonly ResourceManifest _manifest;
 
-        static ResourceManagementOptionsConfiguration()
-        {
-            _manifest = new ResourceManifest();
+    static ResourceManagementOptionsConfiguration()
+    {
+        _manifest = new ResourceManifest();
 
-            _manifest
-                .DefineScript("jsplumb")
-                .SetDependencies("jQuery")
-                .SetUrl("~/OrchardCore.Workflows/Scripts/jsplumb.min.js", "~/OrchardCore.Workflows/Scripts/jsplumb.js")
-                .SetCdn("https://cdnjs.cloudflare.com/ajax/libs/jsPlumb/2.15.5/js/jsplumb.min.js", "https://cdnjs.cloudflare.com/ajax/libs/jsPlumb/2.15.5/js/jsplumb.js")
-                .SetCdnIntegrity("sha384-vJ4MOlEjImsRl4La5sTXZ1UBtJ8uOOqxl2+0gdjRB7oVF6AvTVZ3woqYbTJb7vaf", "sha384-6qcVETlKUuSEc/QpsceL6BNiyEMBFSPE/uyfdRUvEfao8/K9lynY+r8nd/mwLGGh")
-                .SetVersion("2.15.5");
+        _manifest
+            .DefineScript("jsplumb")
+            .SetDependencies("jQuery")
+            .SetUrl("~/OrchardCore.Workflows/Scripts/jsplumb.min.js", "~/OrchardCore.Workflows/Scripts/jsplumb.js")
+            .SetCdn("https://cdnjs.cloudflare.com/ajax/libs/jsPlumb/2.15.5/js/jsplumb.min.js", "https://cdnjs.cloudflare.com/ajax/libs/jsPlumb/2.15.5/js/jsplumb.js")
+            .SetCdnIntegrity("sha384-vJ4MOlEjImsRl4La5sTXZ1UBtJ8uOOqxl2+0gdjRB7oVF6AvTVZ3woqYbTJb7vaf", "sha384-6qcVETlKUuSEc/QpsceL6BNiyEMBFSPE/uyfdRUvEfao8/K9lynY+r8nd/mwLGGh")
+            .SetVersion("2.15.5");
 
-            _manifest
-                .DefineStyle("jsplumbtoolkit-defaults")
-                .SetUrl("~/OrchardCore.Workflows/Styles/jsplumbtoolkit-defaults.min.css", "~/OrchardCore.Workflows/Styles/jsplumbtoolkit-defaults.css")
-                .SetCdn("https://cdnjs.cloudflare.com/ajax/libs/jsPlumb/2.15.5/css/jsplumbtoolkit-defaults.min.css", "https://cdnjs.cloudflare.com/ajax/libs/jsPlumb/2.15.5/css/jsplumbtoolkit-defaults.css")
-                .SetCdnIntegrity("sha384-4TTNOHwtAFYbq+UTSu/7Fj0xnqOabg7FYr9DkNtEKnmIx/YaACNiwhd2XZfO0A/u", "sha384-Q0wOomiqdBpz2z6/yYA8b3gc8A9t7z7QjD14d1WABvXVHbRYBu/IGOv3SOR57anB")
-                .SetVersion("2.15.5");
-        }
+        _manifest
+            .DefineStyle("jsplumbtoolkit-defaults")
+            .SetUrl("~/OrchardCore.Workflows/Styles/jsplumbtoolkit-defaults.min.css", "~/OrchardCore.Workflows/Styles/jsplumbtoolkit-defaults.css")
+            .SetCdn("https://cdnjs.cloudflare.com/ajax/libs/jsPlumb/2.15.5/css/jsplumbtoolkit-defaults.min.css", "https://cdnjs.cloudflare.com/ajax/libs/jsPlumb/2.15.5/css/jsplumbtoolkit-defaults.css")
+            .SetCdnIntegrity("sha384-4TTNOHwtAFYbq+UTSu/7Fj0xnqOabg7FYr9DkNtEKnmIx/YaACNiwhd2XZfO0A/u", "sha384-Q0wOomiqdBpz2z6/yYA8b3gc8A9t7z7QjD14d1WABvXVHbRYBu/IGOv3SOR57anB")
+            .SetVersion("2.15.5");
+    }
 
-        public void Configure(ResourceManagementOptions options)
-        {
-            options.ResourceManifests.Add(_manifest);
-        }
+    public void Configure(ResourceManagementOptions options)
+    {
+        options.ResourceManifests.Add(_manifest);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Scripting/JavaScriptWorkflowScriptEvaluator.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Scripting/JavaScriptWorkflowScriptEvaluator.cs
index 33007e06beb..368f4ff0a8a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Scripting/JavaScriptWorkflowScriptEvaluator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Scripting/JavaScriptWorkflowScriptEvaluator.cs
@@ -7,40 +7,39 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Evaluators
+namespace OrchardCore.Workflows.Evaluators;
+
+public class JavaScriptWorkflowScriptEvaluator : IWorkflowScriptEvaluator
 {
-    public class JavaScriptWorkflowScriptEvaluator : IWorkflowScriptEvaluator
+    private readonly IScriptingManager _scriptingManager;
+    private readonly IEnumerable<IWorkflowExecutionContextHandler> _workflowContextHandlers;
+    private readonly ILogger _logger;
+
+    public JavaScriptWorkflowScriptEvaluator(
+        IScriptingManager scriptingManager,
+        IEnumerable<IWorkflowExecutionContextHandler> workflowContextHandlers,
+        ILogger<JavaScriptWorkflowScriptEvaluator> logger
+    )
     {
-        private readonly IScriptingManager _scriptingManager;
-        private readonly IEnumerable<IWorkflowExecutionContextHandler> _workflowContextHandlers;
-        private readonly ILogger _logger;
+        _scriptingManager = scriptingManager;
+        _workflowContextHandlers = workflowContextHandlers;
+        _logger = logger;
+    }
 
-        public JavaScriptWorkflowScriptEvaluator(
-            IScriptingManager scriptingManager,
-            IEnumerable<IWorkflowExecutionContextHandler> workflowContextHandlers,
-            ILogger<JavaScriptWorkflowScriptEvaluator> logger
-        )
+    public async Task<T> EvaluateAsync<T>(WorkflowExpression<T> expression, WorkflowExecutionContext workflowContext, params IGlobalMethodProvider[] scopedMethodProviders)
+    {
+        if (string.IsNullOrWhiteSpace(expression.Expression))
         {
-            _scriptingManager = scriptingManager;
-            _workflowContextHandlers = workflowContextHandlers;
-            _logger = logger;
+            return default;
         }
 
-        public async Task<T> EvaluateAsync<T>(WorkflowExpression<T> expression, WorkflowExecutionContext workflowContext, params IGlobalMethodProvider[] scopedMethodProviders)
-        {
-            if (string.IsNullOrWhiteSpace(expression.Expression))
-            {
-                return default;
-            }
-
-            var workflowType = workflowContext.WorkflowType;
-            var directive = $"js:{expression}";
-            var expressionContext = new WorkflowExecutionScriptContext(workflowContext);
+        var workflowType = workflowContext.WorkflowType;
+        var directive = $"js:{expression}";
+        var expressionContext = new WorkflowExecutionScriptContext(workflowContext);
 
-            await _workflowContextHandlers.InvokeAsync((h, expressionContext) => h.EvaluatingScriptAsync(expressionContext), expressionContext, _logger);
+        await _workflowContextHandlers.InvokeAsync((h, expressionContext) => h.EvaluatingScriptAsync(expressionContext), expressionContext, _logger);
 
-            var methodProviders = scopedMethodProviders.Concat(expressionContext.ScopedMethodProviders);
-            return (T)_scriptingManager.Evaluate(directive, null, null, methodProviders);
-        }
+        var methodProviders = scopedMethodProviders.Concat(expressionContext.ScopedMethodProviders);
+        return (T)_scriptingManager.Evaluate(directive, null, null, methodProviders);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Scripting/OutcomeMethodProvider.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Scripting/OutcomeMethodProvider.cs
index f5f74bf7f99..733656c8022 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Scripting/OutcomeMethodProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Scripting/OutcomeMethodProvider.cs
@@ -2,24 +2,23 @@
 using System.Collections.Generic;
 using OrchardCore.Scripting;
 
-namespace OrchardCore.Workflows.Scripting
+namespace OrchardCore.Workflows.Scripting;
+
+public class OutcomeMethodProvider : IGlobalMethodProvider
 {
-    public class OutcomeMethodProvider : IGlobalMethodProvider
-    {
-        private readonly GlobalMethod _setOutcomeMethod;
+    private readonly GlobalMethod _setOutcomeMethod;
 
-        public OutcomeMethodProvider(IList<string> outcomes)
+    public OutcomeMethodProvider(IList<string> outcomes)
+    {
+        _setOutcomeMethod = new GlobalMethod
         {
-            _setOutcomeMethod = new GlobalMethod
-            {
-                Name = "setOutcome",
-                Method = serviceProvider => (Action<string>)(name => outcomes.Add(name)),
-            };
-        }
+            Name = "setOutcome",
+            Method = serviceProvider => (Action<string>)(name => outcomes.Add(name)),
+        };
+    }
 
-        public IEnumerable<GlobalMethod> GetMethods()
-        {
-            return new[] { _setOutcomeMethod };
-        }
+    public IEnumerable<GlobalMethod> GetMethods()
+    {
+        return new[] { _setOutcomeMethod };
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Scripting/WorkflowMethodsProvider.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Scripting/WorkflowMethodsProvider.cs
index c9aa4e90b20..0285d0cc75d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Scripting/WorkflowMethodsProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Scripting/WorkflowMethodsProvider.cs
@@ -3,81 +3,80 @@
 using OrchardCore.Scripting;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Scripting
+namespace OrchardCore.Workflows.Scripting;
+
+public class WorkflowMethodsProvider : IGlobalMethodProvider
 {
-    public class WorkflowMethodsProvider : IGlobalMethodProvider
-    {
-        private readonly GlobalMethod _workflowMethod;
-        private readonly GlobalMethod _workflowIdMethod;
-        private readonly GlobalMethod _inputMethod;
-        private readonly GlobalMethod _outputMethod;
-        private readonly GlobalMethod _propertyMethod;
-        private readonly GlobalMethod _setPropertyMethod;
-        private readonly GlobalMethod _resultMethod;
-        private readonly GlobalMethod _correlationIdMethod;
-        private readonly GlobalMethod _setCorrelationIdMethod;
+    private readonly GlobalMethod _workflowMethod;
+    private readonly GlobalMethod _workflowIdMethod;
+    private readonly GlobalMethod _inputMethod;
+    private readonly GlobalMethod _outputMethod;
+    private readonly GlobalMethod _propertyMethod;
+    private readonly GlobalMethod _setPropertyMethod;
+    private readonly GlobalMethod _resultMethod;
+    private readonly GlobalMethod _correlationIdMethod;
+    private readonly GlobalMethod _setCorrelationIdMethod;
 
-        public WorkflowMethodsProvider(WorkflowExecutionContext workflowContext)
+    public WorkflowMethodsProvider(WorkflowExecutionContext workflowContext)
+    {
+        _workflowMethod = new GlobalMethod
         {
-            _workflowMethod = new GlobalMethod
-            {
-                Name = "workflow",
-                Method = serviceProvider => (Func<object>)(() => workflowContext),
-            };
+            Name = "workflow",
+            Method = serviceProvider => (Func<object>)(() => workflowContext),
+        };
 
-            _workflowIdMethod = new GlobalMethod
-            {
-                Name = "workflowId",
-                Method = serviceProvider => () => workflowContext.Workflow.WorkflowId,
-            };
+        _workflowIdMethod = new GlobalMethod
+        {
+            Name = "workflowId",
+            Method = serviceProvider => () => workflowContext.Workflow.WorkflowId,
+        };
 
-            _inputMethod = new GlobalMethod
-            {
-                Name = "input",
-                Method = serviceProvider => (Func<string, object>)((name) => workflowContext.Input.TryGetValue(name, out var value) ? value : null),
-            };
+        _inputMethod = new GlobalMethod
+        {
+            Name = "input",
+            Method = serviceProvider => (Func<string, object>)((name) => workflowContext.Input.TryGetValue(name, out var value) ? value : null),
+        };
 
-            _outputMethod = new GlobalMethod
-            {
-                Name = "output",
-                Method = serviceProvider => (Action<string, object>)((name, value) => workflowContext.Output[name] = value),
-            };
+        _outputMethod = new GlobalMethod
+        {
+            Name = "output",
+            Method = serviceProvider => (Action<string, object>)((name, value) => workflowContext.Output[name] = value),
+        };
 
-            _propertyMethod = new GlobalMethod
-            {
-                Name = "property",
-                Method = serviceProvider => (Func<string, object>)((name) => workflowContext.Properties.TryGetValue(name, out var prop) ? prop : null),
-            };
+        _propertyMethod = new GlobalMethod
+        {
+            Name = "property",
+            Method = serviceProvider => (Func<string, object>)((name) => workflowContext.Properties.TryGetValue(name, out var prop) ? prop : null),
+        };
 
-            _setPropertyMethod = new GlobalMethod
-            {
-                Name = "setProperty",
-                Method = serviceProvider => (Action<string, object>)((name, value) => workflowContext.Properties[name] = value),
-            };
+        _setPropertyMethod = new GlobalMethod
+        {
+            Name = "setProperty",
+            Method = serviceProvider => (Action<string, object>)((name, value) => workflowContext.Properties[name] = value),
+        };
 
-            _resultMethod = new GlobalMethod
-            {
-                Name = "lastResult",
-                Method = serviceProvider => () => workflowContext.LastResult,
-            };
+        _resultMethod = new GlobalMethod
+        {
+            Name = "lastResult",
+            Method = serviceProvider => () => workflowContext.LastResult,
+        };
 
-            _correlationIdMethod = new GlobalMethod
-            {
-                Name = "correlationId",
-                Method = serviceProvider => () => workflowContext.Workflow.CorrelationId,
-            };
+        _correlationIdMethod = new GlobalMethod
+        {
+            Name = "correlationId",
+            Method = serviceProvider => () => workflowContext.Workflow.CorrelationId,
+        };
 
-            _setCorrelationIdMethod = new GlobalMethod
-            {
-                Name = "setCorrelationId",
-                Method = serviceProvider => ((string correlationId) => workflowContext.CorrelationId = correlationId),
-            };
+        _setCorrelationIdMethod = new GlobalMethod
+        {
+            Name = "setCorrelationId",
+            Method = serviceProvider => ((string correlationId) => workflowContext.CorrelationId = correlationId),
+        };
 
-        }
+    }
 
-        public IEnumerable<GlobalMethod> GetMethods()
-        {
-            return [_workflowMethod, _workflowIdMethod, _inputMethod, _outputMethod, _propertyMethod, _resultMethod, _correlationIdMethod, _setPropertyMethod, _setCorrelationIdMethod];
-        }
+    public IEnumerable<GlobalMethod> GetMethods()
+    {
+        return [_workflowMethod, _workflowIdMethod, _inputMethod, _outputMethod, _propertyMethod, _resultMethod, _correlationIdMethod, _setPropertyMethod, _setCorrelationIdMethod];
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/ActivityDisplayManager.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/ActivityDisplayManager.cs
index 0202d3749c6..f68578fc3f8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/ActivityDisplayManager.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/ActivityDisplayManager.cs
@@ -13,39 +13,38 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.Options;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public class ActivityDisplayManager : IActivityDisplayManager
 {
-    public class ActivityDisplayManager : IActivityDisplayManager
+    private readonly DisplayManager<IActivity> _displayManager;
+    public ActivityDisplayManager(
+        IOptions<WorkflowOptions> workflowOptions,
+        IServiceProvider serviceProvider,
+        IShapeFactory shapeFactory,
+        IEnumerable<IShapePlacementProvider> placementProviders,
+        IEnumerable<IDisplayDriver<IActivity>> displayDrivers,
+        ILogger<DisplayManager<IActivity>> displayManagerLogger,
+        ILayoutAccessor layoutAccessor)
     {
-        private readonly DisplayManager<IActivity> _displayManager;
-        public ActivityDisplayManager(
-            IOptions<WorkflowOptions> workflowOptions,
-            IServiceProvider serviceProvider,
-            IShapeFactory shapeFactory,
-            IEnumerable<IShapePlacementProvider> placementProviders,
-            IEnumerable<IDisplayDriver<IActivity>> displayDrivers,
-            ILogger<DisplayManager<IActivity>> displayManagerLogger,
-            ILayoutAccessor layoutAccessor)
-        {
-            var drivers = workflowOptions.Value.ActivityDisplayDriverTypes
-                .Select(x => serviceProvider.CreateInstance<IDisplayDriver<IActivity>>(x))
-                .Concat(displayDrivers);
-            _displayManager = new DisplayManager<IActivity>(drivers, shapeFactory, placementProviders, displayManagerLogger, layoutAccessor);
-        }
+        var drivers = workflowOptions.Value.ActivityDisplayDriverTypes
+            .Select(x => serviceProvider.CreateInstance<IDisplayDriver<IActivity>>(x))
+            .Concat(displayDrivers);
+        _displayManager = new DisplayManager<IActivity>(drivers, shapeFactory, placementProviders, displayManagerLogger, layoutAccessor);
+    }
 
-        public Task<IShape> BuildDisplayAsync(IActivity model, IUpdateModel updater, string displayType = "", string groupId = "")
-        {
-            return _displayManager.BuildDisplayAsync(model, updater, displayType, groupId);
-        }
+    public Task<IShape> BuildDisplayAsync(IActivity model, IUpdateModel updater, string displayType = "", string groupId = "")
+    {
+        return _displayManager.BuildDisplayAsync(model, updater, displayType, groupId);
+    }
 
-        public Task<IShape> BuildEditorAsync(IActivity model, IUpdateModel updater, bool isNew, string groupId = "", string htmlPrefix = "")
-        {
-            return _displayManager.BuildEditorAsync(model, updater, isNew, groupId, htmlPrefix);
-        }
+    public Task<IShape> BuildEditorAsync(IActivity model, IUpdateModel updater, bool isNew, string groupId = "", string htmlPrefix = "")
+    {
+        return _displayManager.BuildEditorAsync(model, updater, isNew, groupId, htmlPrefix);
+    }
 
-        public Task<IShape> UpdateEditorAsync(IActivity model, IUpdateModel updater, bool isNew, string groupId = "", string htmlPrefix = "")
-        {
-            return _displayManager.UpdateEditorAsync(model, updater, isNew, groupId, htmlPrefix);
-        }
+    public Task<IShape> UpdateEditorAsync(IActivity model, IUpdateModel updater, bool isNew, string groupId = "", string htmlPrefix = "")
+    {
+        return _displayManager.UpdateEditorAsync(model, updater, isNew, groupId, htmlPrefix);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/ActivityIdGenerator.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/ActivityIdGenerator.cs
index 1084e66fb03..4c4efd736f0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/ActivityIdGenerator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/ActivityIdGenerator.cs
@@ -1,20 +1,19 @@
 using OrchardCore.Entities;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public class ActivityIdGenerator : IActivityIdGenerator
 {
-    public class ActivityIdGenerator : IActivityIdGenerator
-    {
-        private readonly IIdGenerator _idGenerator;
+    private readonly IIdGenerator _idGenerator;
 
-        public ActivityIdGenerator(IIdGenerator idGenerator)
-        {
-            _idGenerator = idGenerator;
-        }
+    public ActivityIdGenerator(IIdGenerator idGenerator)
+    {
+        _idGenerator = idGenerator;
+    }
 
-        public string GenerateUniqueId(ActivityRecord activityRecord)
-        {
-            return _idGenerator.GenerateUniqueId();
-        }
+    public string GenerateUniqueId(ActivityRecord activityRecord)
+    {
+        return _idGenerator.GenerateUniqueId();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/ActivityLibrary.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/ActivityLibrary.cs
index 793cf0c25bb..e29f770f239 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/ActivityLibrary.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/ActivityLibrary.cs
@@ -8,66 +8,65 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.Options;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public class ActivityLibrary : IActivityLibrary
 {
-    public class ActivityLibrary : IActivityLibrary
+    private readonly Lazy<IDictionary<string, IActivity>> _activityDictionary;
+    private readonly Lazy<IList<LocalizedString>> _activityCategories;
+    private readonly IServiceProvider _serviceProvider;
+    private readonly ILogger _logger;
+
+    public ActivityLibrary(IOptions<WorkflowOptions> workflowOptions, IServiceProvider serviceProvider, ILogger<ActivityLibrary> logger)
     {
-        private readonly Lazy<IDictionary<string, IActivity>> _activityDictionary;
-        private readonly Lazy<IList<LocalizedString>> _activityCategories;
-        private readonly IServiceProvider _serviceProvider;
-        private readonly ILogger _logger;
+        _activityDictionary = new Lazy<IDictionary<string, IActivity>>(() => workflowOptions.Value.ActivityTypes.Where(x => !x.IsAbstract).Select(x => serviceProvider.CreateInstance<IActivity>(x)).OrderBy(x => x.Name).ToDictionary(x => x.Name));
+        _activityCategories = new Lazy<IList<LocalizedString>>(() => _activityDictionary.Value.Values.OrderBy(x => x.Category.Value).Select(x => x.Category).Distinct(new LocalizedStringComparer()).ToList());
+        _serviceProvider = serviceProvider;
+        _logger = logger;
+    }
 
-        public ActivityLibrary(IOptions<WorkflowOptions> workflowOptions, IServiceProvider serviceProvider, ILogger<ActivityLibrary> logger)
-        {
-            _activityDictionary = new Lazy<IDictionary<string, IActivity>>(() => workflowOptions.Value.ActivityTypes.Where(x => !x.IsAbstract).Select(x => serviceProvider.CreateInstance<IActivity>(x)).OrderBy(x => x.Name).ToDictionary(x => x.Name));
-            _activityCategories = new Lazy<IList<LocalizedString>>(() => _activityDictionary.Value.Values.OrderBy(x => x.Category.Value).Select(x => x.Category).Distinct(new LocalizedStringComparer()).ToList());
-            _serviceProvider = serviceProvider;
-            _logger = logger;
-        }
+    private IDictionary<string, IActivity> ActivityDictionary => _activityDictionary.Value;
+    private IList<LocalizedString> ActivityCategories => _activityCategories.Value;
 
-        private IDictionary<string, IActivity> ActivityDictionary => _activityDictionary.Value;
-        private IList<LocalizedString> ActivityCategories => _activityCategories.Value;
+    public IEnumerable<IActivity> ListActivities()
+    {
+        return ActivityDictionary.Values;
+    }
 
-        public IEnumerable<IActivity> ListActivities()
-        {
-            return ActivityDictionary.Values;
-        }
+    public IEnumerable<LocalizedString> ListCategories()
+    {
+        return ActivityCategories;
+    }
 
-        public IEnumerable<LocalizedString> ListCategories()
-        {
-            return ActivityCategories;
-        }
+    public IActivity GetActivityByName(string name)
+    {
+        return ActivityDictionary.TryGetValue(name, out var activity) ? activity : null;
+    }
 
-        public IActivity GetActivityByName(string name)
-        {
-            return ActivityDictionary.TryGetValue(name, out var activity) ? activity : null;
-        }
+    public IActivity InstantiateActivity(string name)
+    {
+        var activityType = GetActivityByName(name)?.GetType();
 
-        public IActivity InstantiateActivity(string name)
+        if (activityType == null)
         {
-            var activityType = GetActivityByName(name)?.GetType();
-
-            if (activityType == null)
-            {
-                _logger.LogWarning("Requested activity '{ActivityName}' does not exist in the library. This could indicate a changed name or a missing feature.", name);
-                return null;
-            }
-
-            return InstantiateActivity(activityType);
+            _logger.LogWarning("Requested activity '{ActivityName}' does not exist in the library. This could indicate a changed name or a missing feature.", name);
+            return null;
         }
 
-        public IEnumerable<IActivity> InstantiateActivities(IEnumerable<string> activityNames)
-        {
-            var activityNameList = activityNames.ToList();
-            foreach (var activitySample in ActivityDictionary.Values.Where(x => activityNameList.Contains(x.Name)))
-            {
-                yield return InstantiateActivity(activitySample.GetType());
-            }
-        }
+        return InstantiateActivity(activityType);
+    }
 
-        private IActivity InstantiateActivity(Type activityType)
+    public IEnumerable<IActivity> InstantiateActivities(IEnumerable<string> activityNames)
+    {
+        var activityNameList = activityNames.ToList();
+        foreach (var activitySample in ActivityDictionary.Values.Where(x => activityNameList.Contains(x.Name)))
         {
-            return _serviceProvider.CreateInstance<IActivity>(activityType);
+            yield return InstantiateActivity(activitySample.GetType());
         }
     }
+
+    private IActivity InstantiateActivity(Type activityType)
+    {
+        return _serviceProvider.CreateInstance<IActivity>(activityType);
+    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/LocalizedStringComparer.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/LocalizedStringComparer.cs
index afdcc74f027..644cc585772 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/LocalizedStringComparer.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/LocalizedStringComparer.cs
@@ -2,18 +2,17 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public class LocalizedStringComparer : IEqualityComparer<LocalizedString>
 {
-    public class LocalizedStringComparer : IEqualityComparer<LocalizedString>
+    public bool Equals(LocalizedString x, LocalizedString y)
     {
-        public bool Equals(LocalizedString x, LocalizedString y)
-        {
-            return x.Name.Equals(y.Name, StringComparison.Ordinal);
-        }
+        return x.Name.Equals(y.Name, StringComparison.Ordinal);
+    }
 
-        public int GetHashCode(LocalizedString obj)
-        {
-            return obj.Name.GetHashCode();
-        }
+    public int GetHashCode(LocalizedString obj)
+    {
+        return obj.Name.GetHashCode();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/Resolver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/Resolver.cs
index b3696c878f5..96eff42edde 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/Resolver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/Resolver.cs
@@ -1,22 +1,21 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+/// <summary>
+/// Temporary replacement for Func until we add proper DI support using DryIoc or Autofac.
+/// </summary>
+public class Resolver<T>
 {
-    /// <summary>
-    /// Temporary replacement for Func until we add proper DI support using DryIoc or Autofac.
-    /// </summary>
-    public class Resolver<T>
+    private readonly IServiceProvider _serviceProvider;
+    public Resolver(IServiceProvider serviceProvider)
     {
-        private readonly IServiceProvider _serviceProvider;
-        public Resolver(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
+        _serviceProvider = serviceProvider;
+    }
 
-        public T Resolve()
-        {
-            return _serviceProvider.GetService<T>();
-        }
+    public T Resolve()
+    {
+        return _serviceProvider.GetService<T>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/SecurityTokenService.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/SecurityTokenService.cs
index fd43daea115..89dc951a434 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/SecurityTokenService.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/SecurityTokenService.cs
@@ -3,47 +3,46 @@
 using Microsoft.AspNetCore.DataProtection;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public class SecurityTokenService : ISecurityTokenService
 {
-    public class SecurityTokenService : ISecurityTokenService
+    private readonly ITimeLimitedDataProtector _dataProtector;
+    private readonly IClock _clock;
+
+    public SecurityTokenService(
+        IDataProtectionProvider dataProtectionProvider,
+        IClock clock)
     {
-        private readonly ITimeLimitedDataProtector _dataProtector;
-        private readonly IClock _clock;
+        _dataProtector = dataProtectionProvider.CreateProtector("Tokens").ToTimeLimitedDataProtector();
+        _clock = clock;
+    }
 
-        public SecurityTokenService(
-            IDataProtectionProvider dataProtectionProvider,
-            IClock clock)
-        {
-            _dataProtector = dataProtectionProvider.CreateProtector("Tokens").ToTimeLimitedDataProtector();
-            _clock = clock;
-        }
+    public string CreateToken<T>(T payload, TimeSpan lifetime)
+    {
+        var json = JConvert.SerializeObject(payload);
 
-        public string CreateToken<T>(T payload, TimeSpan lifetime)
-        {
-            var json = JConvert.SerializeObject(payload);
+        return _dataProtector.Protect(json, _clock.UtcNow.Add(lifetime));
+    }
 
-            return _dataProtector.Protect(json, _clock.UtcNow.Add(lifetime));
-        }
+    public bool TryDecryptToken<T>(string token, out T payload)
+    {
+        payload = default;
 
-        public bool TryDecryptToken<T>(string token, out T payload)
+        try
         {
-            payload = default;
-
-            try
-            {
-                var json = _dataProtector.Unprotect(token, out var expiration);
+            var json = _dataProtector.Unprotect(token, out var expiration);
 
-                if (_clock.UtcNow < expiration.ToUniversalTime())
-                {
-                    payload = JConvert.DeserializeObject<T>(json);
-                    return true;
-                }
-            }
-            catch
+            if (_clock.UtcNow < expiration.ToUniversalTime())
             {
+                payload = JConvert.DeserializeObject<T>(json);
+                return true;
             }
-
-            return false;
         }
+        catch
+        {
+        }
+
+        return false;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowIdGenerator.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowIdGenerator.cs
index 6597ab70995..992dd554859 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowIdGenerator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowIdGenerator.cs
@@ -1,20 +1,19 @@
 using OrchardCore.Entities;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public class WorkflowIdGenerator : IWorkflowIdGenerator
 {
-    public class WorkflowIdGenerator : IWorkflowIdGenerator
-    {
-        private readonly IIdGenerator _idGenerator;
+    private readonly IIdGenerator _idGenerator;
 
-        public WorkflowIdGenerator(IIdGenerator idGenerator)
-        {
-            _idGenerator = idGenerator;
-        }
+    public WorkflowIdGenerator(IIdGenerator idGenerator)
+    {
+        _idGenerator = idGenerator;
+    }
 
-        public string GenerateUniqueId(Workflow workflow)
-        {
-            return _idGenerator.GenerateUniqueId();
-        }
+    public string GenerateUniqueId(Workflow workflow)
+    {
+        return _idGenerator.GenerateUniqueId();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowManager.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowManager.cs
index 73d40586421..fe58a2d1fbb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowManager.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowManager.cs
@@ -15,601 +15,600 @@
 using OrchardCore.Workflows.Helpers;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public class WorkflowManager : IWorkflowManager
 {
-    public class WorkflowManager : IWorkflowManager
+    // The maximum recursion depth is used to limit the number of Workflow (of any type) that a given
+    // Workflow execution can trigger (directly or transitively) without reaching a blocking activity.
+    private const int MaxRecursionDepth = 100;
+
+    private readonly IActivityLibrary _activityLibrary;
+    private readonly IWorkflowTypeStore _workflowTypeStore;
+    private readonly IWorkflowStore _workflowStore;
+    private readonly IWorkflowIdGenerator _workflowIdGenerator;
+    private readonly Resolver<IEnumerable<IWorkflowValueSerializer>> _workflowValueSerializers;
+    private readonly IWorkflowFaultHandler _workflowFaultHandler;
+    private readonly IDistributedLock _distributedLock;
+    private readonly ILogger _logger;
+    private readonly ILogger<MissingActivity> _missingActivityLogger;
+    private readonly IStringLocalizer<MissingActivity> _missingActivityLocalizer;
+    private readonly JsonSerializerOptions _jsonSerializerOptions;
+    private readonly IClock _clock;
+
+    private readonly Dictionary<string, int> _recursions = [];
+    private int _currentRecursionDepth;
+
+    public WorkflowManager
+    (
+        IActivityLibrary activityLibrary,
+        IWorkflowTypeStore workflowTypeRepository,
+        IWorkflowStore workflowRepository,
+        IWorkflowIdGenerator workflowIdGenerator,
+        Resolver<IEnumerable<IWorkflowValueSerializer>> workflowValueSerializers,
+        IWorkflowFaultHandler workflowFaultHandler,
+        IDistributedLock distributedLock,
+        ILogger<WorkflowManager> logger,
+        ILogger<MissingActivity> missingActivityLogger,
+        IStringLocalizer<MissingActivity> missingActivityLocalizer,
+        IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions,
+        IClock clock)
     {
-        // The maximum recursion depth is used to limit the number of Workflow (of any type) that a given
-        // Workflow execution can trigger (directly or transitively) without reaching a blocking activity.
-        private const int MaxRecursionDepth = 100;
-
-        private readonly IActivityLibrary _activityLibrary;
-        private readonly IWorkflowTypeStore _workflowTypeStore;
-        private readonly IWorkflowStore _workflowStore;
-        private readonly IWorkflowIdGenerator _workflowIdGenerator;
-        private readonly Resolver<IEnumerable<IWorkflowValueSerializer>> _workflowValueSerializers;
-        private readonly IWorkflowFaultHandler _workflowFaultHandler;
-        private readonly IDistributedLock _distributedLock;
-        private readonly ILogger _logger;
-        private readonly ILogger<MissingActivity> _missingActivityLogger;
-        private readonly IStringLocalizer<MissingActivity> _missingActivityLocalizer;
-        private readonly JsonSerializerOptions _jsonSerializerOptions;
-        private readonly IClock _clock;
-
-        private readonly Dictionary<string, int> _recursions = [];
-        private int _currentRecursionDepth;
-
-        public WorkflowManager
-        (
-            IActivityLibrary activityLibrary,
-            IWorkflowTypeStore workflowTypeRepository,
-            IWorkflowStore workflowRepository,
-            IWorkflowIdGenerator workflowIdGenerator,
-            Resolver<IEnumerable<IWorkflowValueSerializer>> workflowValueSerializers,
-            IWorkflowFaultHandler workflowFaultHandler,
-            IDistributedLock distributedLock,
-            ILogger<WorkflowManager> logger,
-            ILogger<MissingActivity> missingActivityLogger,
-            IStringLocalizer<MissingActivity> missingActivityLocalizer,
-            IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions,
-            IClock clock)
-        {
-            _activityLibrary = activityLibrary;
-            _workflowTypeStore = workflowTypeRepository;
-            _workflowStore = workflowRepository;
-            _workflowIdGenerator = workflowIdGenerator;
-            _workflowValueSerializers = workflowValueSerializers;
-            _workflowFaultHandler = workflowFaultHandler;
-            _distributedLock = distributedLock;
-            _logger = logger;
-            _missingActivityLogger = missingActivityLogger;
-            _missingActivityLocalizer = missingActivityLocalizer;
-            _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
-            _clock = clock;
-        }
+        _activityLibrary = activityLibrary;
+        _workflowTypeStore = workflowTypeRepository;
+        _workflowStore = workflowRepository;
+        _workflowIdGenerator = workflowIdGenerator;
+        _workflowValueSerializers = workflowValueSerializers;
+        _workflowFaultHandler = workflowFaultHandler;
+        _distributedLock = distributedLock;
+        _logger = logger;
+        _missingActivityLogger = missingActivityLogger;
+        _missingActivityLocalizer = missingActivityLocalizer;
+        _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
+        _clock = clock;
+    }
 
-        public Workflow NewWorkflow(WorkflowType workflowType, string correlationId = null)
-        {
-            ArgumentNullException.ThrowIfNull(workflowType);
+    public Workflow NewWorkflow(WorkflowType workflowType, string correlationId = null)
+    {
+        ArgumentNullException.ThrowIfNull(workflowType);
 
-            var workflow = new Workflow
+        var workflow = new Workflow
+        {
+            WorkflowTypeId = workflowType.WorkflowTypeId,
+            Status = WorkflowStatus.Idle,
+            State = JObject.FromObject(new WorkflowState
             {
-                WorkflowTypeId = workflowType.WorkflowTypeId,
-                Status = WorkflowStatus.Idle,
-                State = JObject.FromObject(new WorkflowState
-                {
-                    ActivityStates = workflowType.Activities.ToDictionary(x => x.ActivityId, x => x.Properties)
-                }, _jsonSerializerOptions),
-                CorrelationId = correlationId,
-                LockTimeout = workflowType.LockTimeout,
-                LockExpiration = workflowType.LockExpiration,
-                CreatedUtc = _clock.UtcNow
-            };
-
-            workflow.WorkflowId = _workflowIdGenerator.GenerateUniqueId(workflow);
-            return workflow;
-        }
+                ActivityStates = workflowType.Activities.ToDictionary(x => x.ActivityId, x => x.Properties)
+            }, _jsonSerializerOptions),
+            CorrelationId = correlationId,
+            LockTimeout = workflowType.LockTimeout,
+            LockExpiration = workflowType.LockExpiration,
+            CreatedUtc = _clock.UtcNow
+        };
+
+        workflow.WorkflowId = _workflowIdGenerator.GenerateUniqueId(workflow);
+        return workflow;
+    }
 
-        public async Task<WorkflowExecutionContext> CreateWorkflowExecutionContextAsync(WorkflowType workflowType, Workflow workflow, IDictionary<string, object> input = null)
-        {
-            ArgumentNullException.ThrowIfNull(workflowType);
+    public async Task<WorkflowExecutionContext> CreateWorkflowExecutionContextAsync(WorkflowType workflowType, Workflow workflow, IDictionary<string, object> input = null)
+    {
+        ArgumentNullException.ThrowIfNull(workflowType);
 
-            ArgumentNullException.ThrowIfNull(workflow);
+        ArgumentNullException.ThrowIfNull(workflow);
 
-            var state = workflow.State.ToObject<WorkflowState>(_jsonSerializerOptions);
-            var activityQuery = await Task.WhenAll(workflowType.Activities.Select(x =>
+        var state = workflow.State.ToObject<WorkflowState>(_jsonSerializerOptions);
+        var activityQuery = await Task.WhenAll(workflowType.Activities.Select(x =>
+        {
+            if (!state.ActivityStates.TryGetValue(x.ActivityId, out var activityState))
             {
-                if (!state.ActivityStates.TryGetValue(x.ActivityId, out var activityState))
-                {
-                    activityState = [];
-                }
+                activityState = [];
+            }
+
+            return CreateActivityExecutionContextAsync(x, activityState);
+        }));
+
+        var mergedInput = (await DeserializeAsync(state.Input)).Merge(input ?? new Dictionary<string, object>());
+        var properties = await DeserializeAsync(state.Properties);
+        var output = await DeserializeAsync(state.Output);
+        var lastResult = await DeserializeAsync(state.LastResult);
+        var executedActivities = state.ExecutedActivities;
 
-                return CreateActivityExecutionContextAsync(x, activityState);
-            }));
+        return new WorkflowExecutionContext(workflowType, workflow, mergedInput, output, properties, executedActivities, lastResult, activityQuery);
+    }
+
+    public Task<ActivityContext> CreateActivityExecutionContextAsync(ActivityRecord activityRecord, JsonObject properties)
+    {
+        ArgumentNullException.ThrowIfNull(activityRecord);
 
-            var mergedInput = (await DeserializeAsync(state.Input)).Merge(input ?? new Dictionary<string, object>());
-            var properties = await DeserializeAsync(state.Properties);
-            var output = await DeserializeAsync(state.Output);
-            var lastResult = await DeserializeAsync(state.LastResult);
-            var executedActivities = state.ExecutedActivities;
+        var activity = _activityLibrary.InstantiateActivity<IActivity>(activityRecord.Name, properties);
 
-            return new WorkflowExecutionContext(workflowType, workflow, mergedInput, output, properties, executedActivities, lastResult, activityQuery);
+        if (activity == null)
+        {
+            _logger.LogWarning("Requested activity '{ActivityName}' does not exist in the library. This could indicate a changed name or a missing feature. Replacing it with MissingActivity.", activityRecord.Name);
+            activity = new MissingActivity(_missingActivityLocalizer, _missingActivityLogger, activityRecord);
         }
 
-        public Task<ActivityContext> CreateActivityExecutionContextAsync(ActivityRecord activityRecord, JsonObject properties)
+        var context = new ActivityContext
         {
-            ArgumentNullException.ThrowIfNull(activityRecord);
+            ActivityRecord = activityRecord,
+            Activity = activity
+        };
+
+        return Task.FromResult(context);
+    }
 
-            var activity = _activityLibrary.InstantiateActivity<IActivity>(activityRecord.Name, properties);
+    public async Task<IEnumerable<WorkflowExecutionContext>> TriggerEventAsync(string name, IDictionary<string, object> input = null, string correlationId = null, bool isExclusive = false, bool isAlwaysCorrelated = false)
+    {
+        var activity = _activityLibrary.GetActivityByName(name);
+        if (activity == null)
+        {
+            _logger.LogError("Activity '{ActivityName}' was not found", name);
+            return Array.Empty<WorkflowExecutionContext>();
+        }
 
-            if (activity == null)
+        var triggerdWorkflows = new List<WorkflowExecutionContext>();
+
+        // Resume workflow instances halted on this kind of activity for the specified target.
+        var haltedWorkflows = await _workflowStore.ListByActivityNameAsync(name, correlationId, isAlwaysCorrelated);
+        foreach (var workflow in haltedWorkflows)
+        {
+            // Don't allow scope recursion per workflow instance id.
+            if (_recursions.TryGetValue(workflow.WorkflowId, out var count) && count > 0)
             {
-                _logger.LogWarning("Requested activity '{ActivityName}' does not exist in the library. This could indicate a changed name or a missing feature. Replacing it with MissingActivity.", activityRecord.Name);
-                activity = new MissingActivity(_missingActivityLocalizer, _missingActivityLogger, activityRecord);
+                if (_logger.IsEnabled(LogLevel.Debug))
+                {
+                    _logger.LogDebug("Don't allow scope recursion per workflow instance id: '{Workflow}'.", workflow.WorkflowId);
+                }
+
+                continue;
             }
 
-            var context = new ActivityContext
+            // If atomic, try to acquire a lock per workflow instance.
+            (var locker, var locked) = await _distributedLock.TryAcquireWorkflowLockAsync(workflow);
+            if (!locked)
             {
-                ActivityRecord = activityRecord,
-                Activity = activity
-            };
+                continue;
+            }
 
-            return Task.FromResult(context);
-        }
+            await using var acquiredLock = locker;
 
-        public async Task<IEnumerable<WorkflowExecutionContext>> TriggerEventAsync(string name, IDictionary<string, object> input = null, string correlationId = null, bool isExclusive = false, bool isAlwaysCorrelated = false)
-        {
-            var activity = _activityLibrary.GetActivityByName(name);
-            if (activity == null)
+            // If atomic, check if the workflow still exists and is still correlated.
+            var haltedWorkflow = workflow.IsAtomic ? await _workflowStore.GetAsync(workflow.Id) : workflow;
+            if (haltedWorkflow == null || (!isAlwaysCorrelated && haltedWorkflow.CorrelationId != (correlationId ?? "")))
             {
-                _logger.LogError("Activity '{ActivityName}' was not found", name);
-                return Array.Empty<WorkflowExecutionContext>();
+                continue;
             }
 
-            var triggerdWorkflows = new List<WorkflowExecutionContext>();
-
-            // Resume workflow instances halted on this kind of activity for the specified target.
-            var haltedWorkflows = await _workflowStore.ListByActivityNameAsync(name, correlationId, isAlwaysCorrelated);
-            foreach (var workflow in haltedWorkflows)
+            // Check the max recursion depth of workflow executions.
+            if (_currentRecursionDepth > MaxRecursionDepth)
             {
-                // Don't allow scope recursion per workflow instance id.
-                if (_recursions.TryGetValue(workflow.WorkflowId, out var count) && count > 0)
-                {
-                    if (_logger.IsEnabled(LogLevel.Debug))
-                    {
-                        _logger.LogDebug("Don't allow scope recursion per workflow instance id: '{Workflow}'.", workflow.WorkflowId);
-                    }
+                _logger.LogError("The max recursion depth of 'Workflow' executions has been reached.");
+                break;
+            }
 
-                    continue;
-                }
+            var blockingActivities = haltedWorkflow.BlockingActivities.Where(x => x.Name == name).ToArray();
+            foreach (var blockingActivity in blockingActivities)
+            {
+                var context = await ResumeWorkflowAsync(haltedWorkflow, blockingActivity, input);
+                triggerdWorkflows.Add(context);
+            }
+        }
 
-                // If atomic, try to acquire a lock per workflow instance.
-                (var locker, var locked) = await _distributedLock.TryAcquireWorkflowLockAsync(workflow);
-                if (!locked)
+        // Start new workflows whose types have a corresponding starting activity.
+        var workflowTypesToStart = await _workflowTypeStore.GetByStartActivityAsync(name);
+        foreach (var workflowType in workflowTypesToStart)
+        {
+            // Don't allow scope recursion per workflow type id.
+            if (_recursions.TryGetValue(workflowType.WorkflowTypeId, out var count) && count > 0)
+            {
+                if (_logger.IsEnabled(LogLevel.Debug))
                 {
-                    continue;
+                    _logger.LogDebug("Don't allow scope recursion per workflow type: '{WorkflowType}'.", workflowType.Name);
                 }
 
-                await using var acquiredLock = locker;
+                continue;
+            }
 
-                // If atomic, check if the workflow still exists and is still correlated.
-                var haltedWorkflow = workflow.IsAtomic ? await _workflowStore.GetAsync(workflow.Id) : workflow;
-                if (haltedWorkflow == null || (!isAlwaysCorrelated && haltedWorkflow.CorrelationId != (correlationId ?? "")))
-                {
-                    continue;
-                }
+            // If a singleton or the event is exclusive, try to acquire a lock per workflow type.
+            (var locker, var locked) = await _distributedLock.TryAcquireWorkflowTypeLockAsync(workflowType, isExclusive);
+            if (!locked)
+            {
+                continue;
+            }
 
-                // Check the max recursion depth of workflow executions.
-                if (_currentRecursionDepth > MaxRecursionDepth)
-                {
-                    _logger.LogError("The max recursion depth of 'Workflow' executions has been reached.");
-                    break;
-                }
+            await using var acquiredLock = locker;
 
-                var blockingActivities = haltedWorkflow.BlockingActivities.Where(x => x.Name == name).ToArray();
-                foreach (var blockingActivity in blockingActivities)
-                {
-                    var context = await ResumeWorkflowAsync(haltedWorkflow, blockingActivity, input);
-                    triggerdWorkflows.Add(context);
-                }
+            // Check if this is a workflow singleton and there's already an halted instance on any activity.
+            if (workflowType.IsSingleton && await _workflowStore.HasHaltedInstanceAsync(workflowType.WorkflowTypeId))
+            {
+                continue;
             }
 
-            // Start new workflows whose types have a corresponding starting activity.
-            var workflowTypesToStart = await _workflowTypeStore.GetByStartActivityAsync(name);
-            foreach (var workflowType in workflowTypesToStart)
+            // Check if the event is exclusive and there's already a correlated instance halted on a starting activity of this type.
+            if (isExclusive && (await _workflowStore.ListAsync(workflowType.WorkflowTypeId, name, correlationId, isAlwaysCorrelated))
+                .Any(x => x.BlockingActivities.Any(x => x.Name == name && x.IsStart)))
             {
-                // Don't allow scope recursion per workflow type id.
-                if (_recursions.TryGetValue(workflowType.WorkflowTypeId, out var count) && count > 0)
-                {
-                    if (_logger.IsEnabled(LogLevel.Debug))
-                    {
-                        _logger.LogDebug("Don't allow scope recursion per workflow type: '{WorkflowType}'.", workflowType.Name);
-                    }
+                continue;
+            }
 
-                    continue;
-                }
+            // Check the max recursion depth of workflow executions.
+            if (_currentRecursionDepth > MaxRecursionDepth)
+            {
+                _logger.LogError("The max recursion depth of 'Workflow' executions has been reached.");
+                break;
+            }
 
-                // If a singleton or the event is exclusive, try to acquire a lock per workflow type.
-                (var locker, var locked) = await _distributedLock.TryAcquireWorkflowTypeLockAsync(workflowType, isExclusive);
-                if (!locked)
-                {
-                    continue;
-                }
+            var startActivity = workflowType.Activities.First(x => x.IsStart && x.Name == name);
+            var context = await StartWorkflowAsync(workflowType, startActivity, input, correlationId);
+            triggerdWorkflows.Add(context);
+        }
+        return triggerdWorkflows;
+    }
 
-                await using var acquiredLock = locker;
+    public async Task<WorkflowExecutionContext> ResumeWorkflowAsync(Workflow workflow, BlockingActivity awaitingActivity, IDictionary<string, object> input = null)
+    {
+        ArgumentNullException.ThrowIfNull(workflow);
 
-                // Check if this is a workflow singleton and there's already an halted instance on any activity.
-                if (workflowType.IsSingleton && await _workflowStore.HasHaltedInstanceAsync(workflowType.WorkflowTypeId))
-                {
-                    continue;
-                }
+        ArgumentNullException.ThrowIfNull(awaitingActivity);
 
-                // Check if the event is exclusive and there's already a correlated instance halted on a starting activity of this type.
-                if (isExclusive && (await _workflowStore.ListAsync(workflowType.WorkflowTypeId, name, correlationId, isAlwaysCorrelated))
-                    .Any(x => x.BlockingActivities.Any(x => x.Name == name && x.IsStart)))
-                {
-                    continue;
-                }
+        var workflowType = await _workflowTypeStore.GetAsync(workflow.WorkflowTypeId);
+        var activityRecord = workflowType.Activities.SingleOrDefault(x => x.ActivityId == awaitingActivity.ActivityId);
+        var workflowContext = await CreateWorkflowExecutionContextAsync(workflowType, workflow, input);
 
-                // Check the max recursion depth of workflow executions.
-                if (_currentRecursionDepth > MaxRecursionDepth)
-                {
-                    _logger.LogError("The max recursion depth of 'Workflow' executions has been reached.");
-                    break;
-                }
+        workflowContext.Status = WorkflowStatus.Resuming;
 
-                var startActivity = workflowType.Activities.First(x => x.IsStart && x.Name == name);
-                var context = await StartWorkflowAsync(workflowType, startActivity, input, correlationId);
-                triggerdWorkflows.Add(context);
-            }
-            return triggerdWorkflows;
+        // Signal every activity that the workflow is about to be resumed.
+        var cancellationToken = new CancellationToken();
+
+        await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnInputReceivedAsync(workflowContext, input));
+        await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnWorkflowResumingAsync(workflowContext, cancellationToken));
+
+        if (cancellationToken.IsCancellationRequested)
+        {
+            // Workflow is aborted.
+            workflowContext.Status = WorkflowStatus.Aborted;
+
+            return workflowContext;
         }
 
-        public async Task<WorkflowExecutionContext> ResumeWorkflowAsync(Workflow workflow, BlockingActivity awaitingActivity, IDictionary<string, object> input = null)
+        // Check if the current activity can execute.
+        var activityContext = workflowContext.GetActivity(activityRecord.ActivityId);
+        if (!await activityContext.Activity.CanExecuteAsync(workflowContext, activityContext))
         {
-            ArgumentNullException.ThrowIfNull(workflow);
+            workflowContext.Status = WorkflowStatus.Halted;
 
-            ArgumentNullException.ThrowIfNull(awaitingActivity);
+            return workflowContext;
+        }
 
-            var workflowType = await _workflowTypeStore.GetAsync(workflow.WorkflowTypeId);
-            var activityRecord = workflowType.Activities.SingleOrDefault(x => x.ActivityId == awaitingActivity.ActivityId);
-            var workflowContext = await CreateWorkflowExecutionContextAsync(workflowType, workflow, input);
+        // Signal every activity that the workflow is resumed.
+        await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnWorkflowResumedAsync(workflowContext));
 
-            workflowContext.Status = WorkflowStatus.Resuming;
+        // Remove the blocking activity.
+        workflowContext.Workflow.BlockingActivities.Remove(awaitingActivity);
 
-            // Signal every activity that the workflow is about to be resumed.
-            var cancellationToken = new CancellationToken();
+        // Resume the workflow at the specified blocking activity.
+        await ExecuteWorkflowAsync(workflowContext, activityRecord);
 
-            await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnInputReceivedAsync(workflowContext, input));
-            await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnWorkflowResumingAsync(workflowContext, cancellationToken));
+        if (workflowContext.Status == WorkflowStatus.Finished && workflowType.DeleteFinishedWorkflows)
+        {
+            await _workflowStore.DeleteAsync(workflowContext.Workflow);
+        }
+        else
+        {
+            await PersistAsync(workflowContext);
+        }
 
-            if (cancellationToken.IsCancellationRequested)
-            {
-                // Workflow is aborted.
-                workflowContext.Status = WorkflowStatus.Aborted;
+        return workflowContext;
+    }
 
-                return workflowContext;
-            }
+    public async Task<WorkflowExecutionContext> RestartWorkflowAsync(WorkflowType workflowType, IDictionary<string, object> input = null, string correlationId = null)
+    {
+        ArgumentNullException.ThrowIfNull(workflowType);
 
-            // Check if the current activity can execute.
-            var activityContext = workflowContext.GetActivity(activityRecord.ActivityId);
-            if (!await activityContext.Activity.CanExecuteAsync(workflowContext, activityContext))
-            {
-                workflowContext.Status = WorkflowStatus.Halted;
+        var startActivity = workflowType.Activities?.FirstOrDefault(x => x.IsStart)
+            ?? throw new InvalidOperationException($"Workflow with ID {workflowType.Id} does not have a start activity.");
 
-                return workflowContext;
-            }
+        // Create a new workflow instance.
+        var workflow = NewWorkflow(workflowType, correlationId);
 
-            // Signal every activity that the workflow is resumed.
-            await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnWorkflowResumedAsync(workflowContext));
+        // Create a workflow context.
+        var workflowContext = await CreateWorkflowExecutionContextAsync(workflowType, workflow, input);
+        workflowContext.Status = WorkflowStatus.Starting;
 
-            // Remove the blocking activity.
-            workflowContext.Workflow.BlockingActivities.Remove(awaitingActivity);
+        // Signal every activity that the workflow is about to start.
+        // This should be called prior OnInputReceivedAsync.
+        var cancellationToken = new CancellationToken();
+        await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnWorkflowRestartingAsync(workflowContext, cancellationToken));
 
-            // Resume the workflow at the specified blocking activity.
-            await ExecuteWorkflowAsync(workflowContext, activityRecord);
+        // Signal every activity about available input.
+        await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnInputReceivedAsync(workflowContext, input));
 
-            if (workflowContext.Status == WorkflowStatus.Finished && workflowType.DeleteFinishedWorkflows)
-            {
-                await _workflowStore.DeleteAsync(workflowContext.Workflow);
-            }
-            else
-            {
-                await PersistAsync(workflowContext);
-            }
+        if (cancellationToken.IsCancellationRequested)
+        {
+            // Workflow is aborted.
+            workflowContext.Status = WorkflowStatus.Aborted;
 
             return workflowContext;
         }
 
-        public async Task<WorkflowExecutionContext> RestartWorkflowAsync(WorkflowType workflowType, IDictionary<string, object> input = null, string correlationId = null)
+        // Check if the current activity can execute.
+        var activityContext = workflowContext.GetActivity(startActivity.ActivityId);
+        if (!await activityContext.Activity.CanExecuteAsync(workflowContext, activityContext))
         {
-            ArgumentNullException.ThrowIfNull(workflowType);
+            workflowContext.Status = WorkflowStatus.Idle;
 
-            var startActivity = workflowType.Activities?.FirstOrDefault(x => x.IsStart)
-                ?? throw new InvalidOperationException($"Workflow with ID {workflowType.Id} does not have a start activity.");
+            return workflowContext;
+        }
 
-            // Create a new workflow instance.
-            var workflow = NewWorkflow(workflowType, correlationId);
+        // Signal every activity that the workflow has started.
+        await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnWorkflowRestartedAsync(workflowContext));
 
-            // Create a workflow context.
-            var workflowContext = await CreateWorkflowExecutionContextAsync(workflowType, workflow, input);
-            workflowContext.Status = WorkflowStatus.Starting;
+        // Execute the activity.
+        await ExecuteWorkflowAsync(workflowContext, startActivity);
 
-            // Signal every activity that the workflow is about to start.
-            // This should be called prior OnInputReceivedAsync.
-            var cancellationToken = new CancellationToken();
-            await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnWorkflowRestartingAsync(workflowContext, cancellationToken));
+        if (workflowContext.Status != WorkflowStatus.Finished || !workflowType.DeleteFinishedWorkflows)
+        {
+            // Serialize state.
+            await PersistAsync(workflowContext);
+        }
 
-            // Signal every activity about available input.
-            await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnInputReceivedAsync(workflowContext, input));
+        return workflowContext;
+    }
 
-            if (cancellationToken.IsCancellationRequested)
-            {
-                // Workflow is aborted.
-                workflowContext.Status = WorkflowStatus.Aborted;
+    public async Task<WorkflowExecutionContext> StartWorkflowAsync(WorkflowType workflowType, ActivityRecord startActivity = null, IDictionary<string, object> input = null, string correlationId = null)
+    {
+        ArgumentNullException.ThrowIfNull(workflowType);
 
-                return workflowContext;
-            }
+        startActivity ??= workflowType.Activities?.FirstOrDefault(x => x.IsStart)
+            ?? throw new InvalidOperationException($"Workflow with ID {workflowType.Id} does not have a start activity.");
 
-            // Check if the current activity can execute.
-            var activityContext = workflowContext.GetActivity(startActivity.ActivityId);
-            if (!await activityContext.Activity.CanExecuteAsync(workflowContext, activityContext))
-            {
-                workflowContext.Status = WorkflowStatus.Idle;
+        // Create a new workflow instance.
+        var workflow = NewWorkflow(workflowType, correlationId);
 
-                return workflowContext;
-            }
+        // Create a workflow context.
+        var workflowContext = await CreateWorkflowExecutionContextAsync(workflowType, workflow, input);
+        workflowContext.Status = WorkflowStatus.Starting;
 
-            // Signal every activity that the workflow has started.
-            await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnWorkflowRestartedAsync(workflowContext));
+        // Signal every activity about available input.
+        await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnInputReceivedAsync(workflowContext, input));
 
-            // Execute the activity.
-            await ExecuteWorkflowAsync(workflowContext, startActivity);
+        // Signal every activity that the workflow is about to start.
+        var cancellationToken = new CancellationToken();
+        await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnWorkflowStartingAsync(workflowContext, cancellationToken));
 
-            if (workflowContext.Status != WorkflowStatus.Finished || !workflowType.DeleteFinishedWorkflows)
-            {
-                // Serialize state.
-                await PersistAsync(workflowContext);
-            }
+        if (cancellationToken.IsCancellationRequested)
+        {
+            // Workflow is aborted.
+            workflowContext.Status = WorkflowStatus.Aborted;
 
             return workflowContext;
         }
 
-        public async Task<WorkflowExecutionContext> StartWorkflowAsync(WorkflowType workflowType, ActivityRecord startActivity = null, IDictionary<string, object> input = null, string correlationId = null)
+        // Check if the current activity can execute.
+        var activityContext = workflowContext.GetActivity(startActivity.ActivityId);
+        if (!await activityContext.Activity.CanExecuteAsync(workflowContext, activityContext))
         {
-            ArgumentNullException.ThrowIfNull(workflowType);
+            workflowContext.Status = WorkflowStatus.Idle;
 
-            startActivity ??= workflowType.Activities?.FirstOrDefault(x => x.IsStart)
-                ?? throw new InvalidOperationException($"Workflow with ID {workflowType.Id} does not have a start activity.");
+            return workflowContext;
+        }
 
-            // Create a new workflow instance.
-            var workflow = NewWorkflow(workflowType, correlationId);
+        // Signal every activity that the workflow has started.
+        await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnWorkflowStartedAsync(workflowContext));
 
-            // Create a workflow context.
-            var workflowContext = await CreateWorkflowExecutionContextAsync(workflowType, workflow, input);
-            workflowContext.Status = WorkflowStatus.Starting;
+        // Execute the activity.
+        await ExecuteWorkflowAsync(workflowContext, startActivity);
 
-            // Signal every activity about available input.
-            await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnInputReceivedAsync(workflowContext, input));
+        if (workflowContext.Status != WorkflowStatus.Finished || !workflowType.DeleteFinishedWorkflows)
+        {
+            // Serialize state.
+            await PersistAsync(workflowContext);
+        }
 
-            // Signal every activity that the workflow is about to start.
-            var cancellationToken = new CancellationToken();
-            await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnWorkflowStartingAsync(workflowContext, cancellationToken));
+        return workflowContext;
+    }
 
-            if (cancellationToken.IsCancellationRequested)
-            {
-                // Workflow is aborted.
-                workflowContext.Status = WorkflowStatus.Aborted;
+    public async Task<IEnumerable<ActivityRecord>> ExecuteWorkflowAsync(WorkflowExecutionContext workflowContext, ActivityRecord activity)
+    {
+        // Prevent scope recursion per workflow.
+        IncrementRecursion(workflowContext.Workflow);
 
-                return workflowContext;
-            }
+        var workflowType = workflowContext.WorkflowType;
+        var scheduled = new Stack<ActivityRecord>();
+        var blocking = new List<ActivityRecord>();
+        var isResuming = workflowContext.Status == WorkflowStatus.Resuming;
+        var isFirstPass = true;
 
-            // Check if the current activity can execute.
-            var activityContext = workflowContext.GetActivity(startActivity.ActivityId);
-            if (!await activityContext.Activity.CanExecuteAsync(workflowContext, activityContext))
-            {
-                workflowContext.Status = WorkflowStatus.Idle;
+        workflowContext.Status = WorkflowStatus.Executing;
+        scheduled.Push(activity);
 
-                return workflowContext;
-            }
+        while (scheduled.Count > 0)
+        {
+            activity = scheduled.Pop();
 
-            // Signal every activity that the workflow has started.
-            await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnWorkflowStartedAsync(workflowContext));
+            var activityContext = workflowContext.GetActivity(activity.ActivityId);
 
-            // Execute the activity.
-            await ExecuteWorkflowAsync(workflowContext, startActivity);
+            // Signal every activity that the activity is about to be executed.
+            var cancellationToken = new CancellationToken();
+            await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnActivityExecutingAsync(workflowContext, activityContext, cancellationToken));
 
-            if (workflowContext.Status != WorkflowStatus.Finished || !workflowType.DeleteFinishedWorkflows)
+            if (cancellationToken.IsCancellationRequested)
             {
-                // Serialize state.
-                await PersistAsync(workflowContext);
+                // Activity is aborted.
+                workflowContext.Status = WorkflowStatus.Aborted;
+                break;
             }
 
-            return workflowContext;
-        }
+            var outcomes = Enumerable.Empty<string>();
 
-        public async Task<IEnumerable<ActivityRecord>> ExecuteWorkflowAsync(WorkflowExecutionContext workflowContext, ActivityRecord activity)
-        {
-            // Prevent scope recursion per workflow.
-            IncrementRecursion(workflowContext.Workflow);
-
-            var workflowType = workflowContext.WorkflowType;
-            var scheduled = new Stack<ActivityRecord>();
-            var blocking = new List<ActivityRecord>();
-            var isResuming = workflowContext.Status == WorkflowStatus.Resuming;
-            var isFirstPass = true;
-
-            workflowContext.Status = WorkflowStatus.Executing;
-            scheduled.Push(activity);
-
-            while (scheduled.Count > 0)
+            try
             {
-                activity = scheduled.Pop();
+                ActivityExecutionResult result;
 
-                var activityContext = workflowContext.GetActivity(activity.ActivityId);
-
-                // Signal every activity that the activity is about to be executed.
-                var cancellationToken = new CancellationToken();
-                await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnActivityExecutingAsync(workflowContext, activityContext, cancellationToken));
-
-                if (cancellationToken.IsCancellationRequested)
+                if (!isResuming)
                 {
-                    // Activity is aborted.
-                    workflowContext.Status = WorkflowStatus.Aborted;
-                    break;
+                    // Execute the current activity.
+                    result = await activityContext.Activity.ExecuteAsync(workflowContext, activityContext);
                 }
-
-                var outcomes = Enumerable.Empty<string>();
-
-                try
+                else
                 {
-                    ActivityExecutionResult result;
+                    // Resume the current activity.
+                    result = await activityContext.Activity.ResumeAsync(workflowContext, activityContext);
+                    isResuming = false;
+                }
 
-                    if (!isResuming)
-                    {
-                        // Execute the current activity.
-                        result = await activityContext.Activity.ExecuteAsync(workflowContext, activityContext);
-                    }
-                    else
+                if (result.IsHalted)
+                {
+                    if (isFirstPass)
                     {
-                        // Resume the current activity.
+                        // Resume immediately when this is the first pass.
                         result = await activityContext.Activity.ResumeAsync(workflowContext, activityContext);
-                        isResuming = false;
-                    }
+                        isFirstPass = false;
+                        outcomes = result.Outcomes;
 
-                    if (result.IsHalted)
-                    {
-                        if (isFirstPass)
-                        {
-                            // Resume immediately when this is the first pass.
-                            result = await activityContext.Activity.ResumeAsync(workflowContext, activityContext);
-                            isFirstPass = false;
-                            outcomes = result.Outcomes;
-
-                            if (result.IsHalted)
-                            {
-                                // Block on this activity.
-                                blocking.Add(activity);
-                            }
-                        }
-                        else
+                        if (result.IsHalted)
                         {
                             // Block on this activity.
                             blocking.Add(activity);
-
-                            continue;
                         }
                     }
                     else
                     {
-                        outcomes = result.Outcomes;
+                        // Block on this activity.
+                        blocking.Add(activity);
+
+                        continue;
                     }
                 }
-                catch (Exception ex)
+                else
                 {
-                    _logger.LogError(ex, "An unhandled error occurred while executing an activity. Workflow ID: '{WorkflowTypeId}'. Activity: '{ActivityId}', '{ActivityName}'. Putting the workflow in the faulted state.", workflowType.Id, activityContext.ActivityRecord.ActivityId, activityContext.ActivityRecord.Name);
-                    workflowContext.Fault(ex, activityContext);
+                    outcomes = result.Outcomes;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "An unhandled error occurred while executing an activity. Workflow ID: '{WorkflowTypeId}'. Activity: '{ActivityId}', '{ActivityName}'. Putting the workflow in the faulted state.", workflowType.Id, activityContext.ActivityRecord.ActivityId, activityContext.ActivityRecord.Name);
+                workflowContext.Fault(ex, activityContext);
 
-                    // Decrement the workflow scope recursion count.
-                    DecrementRecursion(workflowContext.Workflow);
+                // Decrement the workflow scope recursion count.
+                DecrementRecursion(workflowContext.Workflow);
 
-                    await _workflowFaultHandler.OnWorkflowFaultAsync(this, workflowContext, activityContext, ex);
+                await _workflowFaultHandler.OnWorkflowFaultAsync(this, workflowContext, activityContext, ex);
 
-                    return blocking.Distinct();
-                }
+                return blocking.Distinct();
+            }
 
-                // Signal every activity that the activity is executed.
-                await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnActivityExecutedAsync(workflowContext, activityContext));
+            // Signal every activity that the activity is executed.
+            await InvokeActivitiesAsync(workflowContext, x => x.Activity.OnActivityExecutedAsync(workflowContext, activityContext));
 
-                foreach (var outcome in outcomes)
+            foreach (var outcome in outcomes)
+            {
+                // Look for next activity in the graph.
+                var transition = workflowType.Transitions.FirstOrDefault(x => x.SourceActivityId == activity.ActivityId && x.SourceOutcomeName == outcome);
+
+                if (transition != null)
                 {
-                    // Look for next activity in the graph.
-                    var transition = workflowType.Transitions.FirstOrDefault(x => x.SourceActivityId == activity.ActivityId && x.SourceOutcomeName == outcome);
+                    var destinationActivity = workflowContext.WorkflowType.Activities.SingleOrDefault(x => x.ActivityId == transition.DestinationActivityId);
 
-                    if (transition != null)
+                    // Check that the activity doesn't point to itself.
+                    if (destinationActivity != activity)
                     {
-                        var destinationActivity = workflowContext.WorkflowType.Activities.SingleOrDefault(x => x.ActivityId == transition.DestinationActivityId);
-
-                        // Check that the activity doesn't point to itself.
-                        if (destinationActivity != activity)
-                        {
-                            scheduled.Push(destinationActivity);
-                        }
+                        scheduled.Push(destinationActivity);
                     }
                 }
-
-                isFirstPass = false;
             }
 
-            // Apply Distinct() as two paths could block on the same activity.
-            var blockingActivities = blocking.Distinct().ToList();
+            isFirstPass = false;
+        }
+
+        // Apply Distinct() as two paths could block on the same activity.
+        var blockingActivities = blocking.Distinct().ToList();
 
-            workflowContext.Status = blockingActivities.Count > 0 || workflowContext.Workflow.BlockingActivities.Count > 0 ? WorkflowStatus.Halted : WorkflowStatus.Finished;
+        workflowContext.Status = blockingActivities.Count > 0 || workflowContext.Workflow.BlockingActivities.Count > 0 ? WorkflowStatus.Halted : WorkflowStatus.Finished;
 
-            foreach (var blockingActivity in blockingActivities)
+        foreach (var blockingActivity in blockingActivities)
+        {
+            // Workflows containing event activities could end up being blocked on the same activity.
+            if (!workflowContext.Workflow.BlockingActivities.Any(x => x.ActivityId == blockingActivity.ActivityId))
             {
-                // Workflows containing event activities could end up being blocked on the same activity.
-                if (!workflowContext.Workflow.BlockingActivities.Any(x => x.ActivityId == blockingActivity.ActivityId))
-                {
-                    workflowContext.Workflow.BlockingActivities.Add(BlockingActivity.FromActivity(blockingActivity));
-                }
+                workflowContext.Workflow.BlockingActivities.Add(BlockingActivity.FromActivity(blockingActivity));
             }
+        }
 
-            // Decrement the workflow scope recursion.
-            DecrementRecursion(workflowContext.Workflow);
+        // Decrement the workflow scope recursion.
+        DecrementRecursion(workflowContext.Workflow);
 
-            return blockingActivities;
-        }
+        return blockingActivities;
+    }
 
-        private void IncrementRecursion(Workflow workflow)
-        {
-            _recursions[workflow.WorkflowId] = _recursions.TryGetValue(workflow.WorkflowId, out var count) ? ++count : 1;
-            _recursions[workflow.WorkflowTypeId] = _recursions.TryGetValue(workflow.WorkflowTypeId, out count) ? ++count : 1;
-            _currentRecursionDepth++;
-        }
+    private void IncrementRecursion(Workflow workflow)
+    {
+        _recursions[workflow.WorkflowId] = _recursions.TryGetValue(workflow.WorkflowId, out var count) ? ++count : 1;
+        _recursions[workflow.WorkflowTypeId] = _recursions.TryGetValue(workflow.WorkflowTypeId, out count) ? ++count : 1;
+        _currentRecursionDepth++;
+    }
 
-        private void DecrementRecursion(Workflow workflow)
-        {
-            _recursions[workflow.WorkflowId]--;
-            _recursions[workflow.WorkflowTypeId]--;
-            _currentRecursionDepth--;
-        }
+    private void DecrementRecursion(Workflow workflow)
+    {
+        _recursions[workflow.WorkflowId]--;
+        _recursions[workflow.WorkflowTypeId]--;
+        _currentRecursionDepth--;
+    }
 
-        private async Task PersistAsync(WorkflowExecutionContext workflowContext)
-        {
-            var state = workflowContext.Workflow.State.ToObject<WorkflowState>(_jsonSerializerOptions);
+    private async Task PersistAsync(WorkflowExecutionContext workflowContext)
+    {
+        var state = workflowContext.Workflow.State.ToObject<WorkflowState>(_jsonSerializerOptions);
 
-            state.Input = await SerializeAsync(workflowContext.Input);
-            state.Output = await SerializeAsync(workflowContext.Output);
-            state.Properties = await SerializeAsync(workflowContext.Properties);
-            state.LastResult = await SerializeAsync(workflowContext.LastResult);
-            state.ExecutedActivities = workflowContext.ExecutedActivities.ToList();
-            state.ActivityStates = workflowContext.Activities.ToDictionary(x => x.Key, x => x.Value.Activity.Properties);
+        state.Input = await SerializeAsync(workflowContext.Input);
+        state.Output = await SerializeAsync(workflowContext.Output);
+        state.Properties = await SerializeAsync(workflowContext.Properties);
+        state.LastResult = await SerializeAsync(workflowContext.LastResult);
+        state.ExecutedActivities = workflowContext.ExecutedActivities.ToList();
+        state.ActivityStates = workflowContext.Activities.ToDictionary(x => x.Key, x => x.Value.Activity.Properties);
 
-            workflowContext.Workflow.State = JObject.FromObject(state, _jsonSerializerOptions);
-            await _workflowStore.SaveAsync(workflowContext.Workflow);
-        }
+        workflowContext.Workflow.State = JObject.FromObject(state, _jsonSerializerOptions);
+        await _workflowStore.SaveAsync(workflowContext.Workflow);
+    }
 
-        /// <summary>
-        /// Executes a specific action on all the activities of a workflow.
-        /// </summary>
-        private Task InvokeActivitiesAsync(WorkflowExecutionContext workflowContext, Func<ActivityContext, Task> action)
-        {
-            return workflowContext.Activities.Values.InvokeAsync(action, _logger);
-        }
+    /// <summary>
+    /// Executes a specific action on all the activities of a workflow.
+    /// </summary>
+    private Task InvokeActivitiesAsync(WorkflowExecutionContext workflowContext, Func<ActivityContext, Task> action)
+    {
+        return workflowContext.Activities.Values.InvokeAsync(action, _logger);
+    }
 
-        private async Task<IDictionary<string, object>> SerializeAsync(IDictionary<string, object> dictionary)
+    private async Task<IDictionary<string, object>> SerializeAsync(IDictionary<string, object> dictionary)
+    {
+        var copy = new Dictionary<string, object>(dictionary.Count);
+        foreach (var item in dictionary)
         {
-            var copy = new Dictionary<string, object>(dictionary.Count);
-            foreach (var item in dictionary)
-            {
-                copy[item.Key] = await SerializeAsync(item.Value);
-            }
-            return copy;
+            copy[item.Key] = await SerializeAsync(item.Value);
         }
+        return copy;
+    }
 
-        private async Task<IDictionary<string, object>> DeserializeAsync(IDictionary<string, object> dictionary)
+    private async Task<IDictionary<string, object>> DeserializeAsync(IDictionary<string, object> dictionary)
+    {
+        var copy = new Dictionary<string, object>(dictionary.Count);
+        foreach (var item in dictionary)
         {
-            var copy = new Dictionary<string, object>(dictionary.Count);
-            foreach (var item in dictionary)
-            {
-                copy[item.Key] = await DeserializeAsync(item.Value);
-            }
-            return copy;
+            copy[item.Key] = await DeserializeAsync(item.Value);
         }
+        return copy;
+    }
 
-        private async Task<object> SerializeAsync(object value)
-        {
-            var context = new SerializeWorkflowValueContext(value);
-            await _workflowValueSerializers.Resolve().InvokeAsync((s, context) => s.SerializeValueAsync(context), context, _logger);
-            return context.Output;
-        }
+    private async Task<object> SerializeAsync(object value)
+    {
+        var context = new SerializeWorkflowValueContext(value);
+        await _workflowValueSerializers.Resolve().InvokeAsync((s, context) => s.SerializeValueAsync(context), context, _logger);
+        return context.Output;
+    }
 
-        private async Task<object> DeserializeAsync(object value)
-        {
-            var context = new SerializeWorkflowValueContext(value);
-            await _workflowValueSerializers.Resolve().InvokeAsync((s, context) => s.DeserializeValueAsync(context), context, _logger);
-            return context.Output;
-        }
+    private async Task<object> DeserializeAsync(object value)
+    {
+        var context = new SerializeWorkflowValueContext(value);
+        await _workflowValueSerializers.Resolve().InvokeAsync((s, context) => s.DeserializeValueAsync(context), context, _logger);
+        return context.Output;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowStore.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowStore.cs
index 66f4db11964..0c9fa7346fd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowStore.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowStore.cs
@@ -8,151 +8,150 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public class WorkflowStore : IWorkflowStore
 {
-    public class WorkflowStore : IWorkflowStore
+    private readonly ISession _session;
+    private readonly IEnumerable<IWorkflowHandler> _handlers;
+    private readonly ILogger _logger;
+
+    public WorkflowStore(ISession session, IEnumerable<IWorkflowHandler> handlers, ILogger<WorkflowStore> logger)
     {
-        private readonly ISession _session;
-        private readonly IEnumerable<IWorkflowHandler> _handlers;
-        private readonly ILogger _logger;
+        _handlers = handlers;
+        _session = session;
+        _logger = logger;
+    }
 
-        public WorkflowStore(ISession session, IEnumerable<IWorkflowHandler> handlers, ILogger<WorkflowStore> logger)
-        {
-            _handlers = handlers;
-            _session = session;
-            _logger = logger;
-        }
+    public Task<int> CountAsync(string workflowTypeId = null)
+    {
+        return FilterByWorkflowTypeId(_session.Query<Workflow, WorkflowIndex>(), workflowTypeId).CountAsync();
+    }
 
-        public Task<int> CountAsync(string workflowTypeId = null)
+    public async Task<bool> HasHaltedInstanceAsync(string workflowTypeId)
+    {
+        return (await _session.Query<Workflow, WorkflowBlockingActivitiesIndex>(x => x.WorkflowTypeId == workflowTypeId).FirstOrDefaultAsync()) != null;
+    }
+
+    public Task<IEnumerable<Workflow>> ListAsync(string workflowTypeId = null, int? skip = null, int? take = null)
+    {
+        var query = (IQuery<Workflow>)FilterByWorkflowTypeId(_session.Query<Workflow, WorkflowIndex>(), workflowTypeId)
+            .OrderByDescending(x => x.CreatedUtc);
+
+        if (skip != null)
         {
-            return FilterByWorkflowTypeId(_session.Query<Workflow, WorkflowIndex>(), workflowTypeId).CountAsync();
+            query = query.Skip(skip.Value);
         }
 
-        public async Task<bool> HasHaltedInstanceAsync(string workflowTypeId)
+        if (take != null)
         {
-            return (await _session.Query<Workflow, WorkflowBlockingActivitiesIndex>(x => x.WorkflowTypeId == workflowTypeId).FirstOrDefaultAsync()) != null;
+            query = query.Take(take.Value);
         }
 
-        public Task<IEnumerable<Workflow>> ListAsync(string workflowTypeId = null, int? skip = null, int? take = null)
-        {
-            var query = (IQuery<Workflow>)FilterByWorkflowTypeId(_session.Query<Workflow, WorkflowIndex>(), workflowTypeId)
-                .OrderByDescending(x => x.CreatedUtc);
+        return query.ListAsync();
+    }
 
-            if (skip != null)
-            {
-                query = query.Skip(skip.Value);
-            }
+    public Task<IEnumerable<Workflow>> ListAsync(IEnumerable<string> workflowTypeIds)
+    {
+        return _session.Query<Workflow, WorkflowIndex>(x => x.WorkflowTypeId.IsIn(workflowTypeIds)).ListAsync();
+    }
 
-            if (take != null)
-            {
-                query = query.Take(take.Value);
-            }
+    public Task<Workflow> GetAsync(long id)
+    {
+        return _session.GetAsync<Workflow>(id);
+    }
 
-            return query.ListAsync();
-        }
+    public Task<Workflow> GetAsync(string workflowId)
+    {
+        return _session.Query<Workflow, WorkflowBlockingActivitiesIndex>(x => x.WorkflowId == workflowId).FirstOrDefaultAsync();
+    }
 
-        public Task<IEnumerable<Workflow>> ListAsync(IEnumerable<string> workflowTypeIds)
-        {
-            return _session.Query<Workflow, WorkflowIndex>(x => x.WorkflowTypeId.IsIn(workflowTypeIds)).ListAsync();
-        }
+    public Task<IEnumerable<Workflow>> GetAsync(IEnumerable<string> workflowIds)
+    {
+        return _session.Query<Workflow, WorkflowBlockingActivitiesIndex>(x => x.WorkflowId.IsIn(workflowIds)).ListAsync();
+    }
 
-        public Task<Workflow> GetAsync(long id)
-        {
-            return _session.GetAsync<Workflow>(id);
-        }
+    public Task<IEnumerable<Workflow>> GetAsync(IEnumerable<long> ids)
+    {
+        return _session.GetAsync<Workflow>(ids.ToArray());
+    }
 
-        public Task<Workflow> GetAsync(string workflowId)
-        {
-            return _session.Query<Workflow, WorkflowBlockingActivitiesIndex>(x => x.WorkflowId == workflowId).FirstOrDefaultAsync();
-        }
+    public Task<IEnumerable<Workflow>> ListAsync(string workflowTypeId, IEnumerable<string> blockingActivityIds)
+    {
+        return _session
+            .Query<Workflow, WorkflowBlockingActivitiesIndex>(index =>
+                index.WorkflowTypeId == workflowTypeId &&
+                index.ActivityId.IsIn(blockingActivityIds))
+            .ListAsync();
+    }
+
+    public Task<IEnumerable<Workflow>> ListAsync(string workflowTypeId, string activityName, string correlationId = null, bool isAlwaysCorrelated = false)
+    {
+        var query = _session.Query<Workflow, WorkflowBlockingActivitiesIndex>();
 
-        public Task<IEnumerable<Workflow>> GetAsync(IEnumerable<string> workflowIds)
+        if (isAlwaysCorrelated)
         {
-            return _session.Query<Workflow, WorkflowBlockingActivitiesIndex>(x => x.WorkflowId.IsIn(workflowIds)).ListAsync();
+            query = query.Where(index => index.WorkflowTypeId == workflowTypeId && index.ActivityName == activityName);
         }
-
-        public Task<IEnumerable<Workflow>> GetAsync(IEnumerable<long> ids)
+        else
         {
-            return _session.GetAsync<Workflow>(ids.ToArray());
+            query = query.Where(index => index.WorkflowTypeId == workflowTypeId && index.ActivityName == activityName && index.WorkflowCorrelationId == (correlationId ?? ""));
         }
 
-        public Task<IEnumerable<Workflow>> ListAsync(string workflowTypeId, IEnumerable<string> blockingActivityIds)
+        return query.ListAsync();
+    }
+
+    public Task<IEnumerable<Workflow>> ListByActivityNameAsync(string activityName, string correlationId = null, bool isAlwaysCorrelated = false)
+    {
+        var query = _session.Query<Workflow, WorkflowBlockingActivitiesIndex>();
+
+        if (isAlwaysCorrelated)
         {
-            return _session
-                .Query<Workflow, WorkflowBlockingActivitiesIndex>(index =>
-                    index.WorkflowTypeId == workflowTypeId &&
-                    index.ActivityId.IsIn(blockingActivityIds))
-                .ListAsync();
+            query = query.Where(index => index.ActivityName == activityName);
         }
-
-        public Task<IEnumerable<Workflow>> ListAsync(string workflowTypeId, string activityName, string correlationId = null, bool isAlwaysCorrelated = false)
+        else
         {
-            var query = _session.Query<Workflow, WorkflowBlockingActivitiesIndex>();
-
-            if (isAlwaysCorrelated)
-            {
-                query = query.Where(index => index.WorkflowTypeId == workflowTypeId && index.ActivityName == activityName);
-            }
-            else
-            {
-                query = query.Where(index => index.WorkflowTypeId == workflowTypeId && index.ActivityName == activityName && index.WorkflowCorrelationId == (correlationId ?? ""));
-            }
-
-            return query.ListAsync();
+            query = query.Where(index => index.ActivityName == activityName && index.WorkflowCorrelationId == (correlationId ?? ""));
         }
 
-        public Task<IEnumerable<Workflow>> ListByActivityNameAsync(string activityName, string correlationId = null, bool isAlwaysCorrelated = false)
+        return query.ListAsync();
+    }
+
+    public async Task SaveAsync(Workflow workflow)
+    {
+        var isNew = workflow.Id == 0;
+        await _session.SaveAsync(workflow);
+
+        if (isNew)
         {
-            var query = _session.Query<Workflow, WorkflowBlockingActivitiesIndex>();
-
-            if (isAlwaysCorrelated)
-            {
-                query = query.Where(index => index.ActivityName == activityName);
-            }
-            else
-            {
-                query = query.Where(index => index.ActivityName == activityName && index.WorkflowCorrelationId == (correlationId ?? ""));
-            }
-
-            return query.ListAsync();
+            var context = new WorkflowCreatedContext(workflow);
+            await _handlers.InvokeAsync((handler, context) => handler.CreatedAsync(context), context, _logger);
         }
-
-        public async Task SaveAsync(Workflow workflow)
+        else
         {
-            var isNew = workflow.Id == 0;
-            await _session.SaveAsync(workflow);
-
-            if (isNew)
-            {
-                var context = new WorkflowCreatedContext(workflow);
-                await _handlers.InvokeAsync((handler, context) => handler.CreatedAsync(context), context, _logger);
-            }
-            else
-            {
-                var context = new WorkflowUpdatedContext(workflow);
-                await _handlers.InvokeAsync((handler, context) => handler.UpdatedAsync(context), context, _logger);
-            }
-
-            // Allow an atomic workflow to get up to date data.
-            await _session.FlushAsync();
+            var context = new WorkflowUpdatedContext(workflow);
+            await _handlers.InvokeAsync((handler, context) => handler.UpdatedAsync(context), context, _logger);
         }
 
-        public Task DeleteAsync(Workflow workflow)
-        {
-            _session.Delete(workflow);
+        // Allow an atomic workflow to get up to date data.
+        await _session.FlushAsync();
+    }
 
-            var context = new WorkflowDeletedContext(workflow);
-            return _handlers.InvokeAsync((handler, context) => handler.DeletedAsync(context), context, _logger);
-        }
+    public Task DeleteAsync(Workflow workflow)
+    {
+        _session.Delete(workflow);
 
-        private static IQuery<Workflow, WorkflowIndex> FilterByWorkflowTypeId(IQuery<Workflow, WorkflowIndex> query, string workflowTypeId)
-        {
-            if (workflowTypeId != null)
-            {
-                query = query.Where(x => x.WorkflowTypeId == workflowTypeId);
-            }
+        var context = new WorkflowDeletedContext(workflow);
+        return _handlers.InvokeAsync((handler, context) => handler.DeletedAsync(context), context, _logger);
+    }
 
-            return query;
+    private static IQuery<Workflow, WorkflowIndex> FilterByWorkflowTypeId(IQuery<Workflow, WorkflowIndex> query, string workflowTypeId)
+    {
+        if (workflowTypeId != null)
+        {
+            query = query.Where(x => x.WorkflowTypeId == workflowTypeId);
         }
+
+        return query;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowTypeIdGenerator.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowTypeIdGenerator.cs
index 829a41e0881..d470365f400 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowTypeIdGenerator.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowTypeIdGenerator.cs
@@ -1,20 +1,19 @@
 using OrchardCore.Entities;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public class WorkflowTypeIdGenerator : IWorkflowTypeIdGenerator
 {
-    public class WorkflowTypeIdGenerator : IWorkflowTypeIdGenerator
-    {
-        private readonly IIdGenerator _idGenerator;
+    private readonly IIdGenerator _idGenerator;
 
-        public WorkflowTypeIdGenerator(IIdGenerator idGenerator)
-        {
-            _idGenerator = idGenerator;
-        }
+    public WorkflowTypeIdGenerator(IIdGenerator idGenerator)
+    {
+        _idGenerator = idGenerator;
+    }
 
-        public string GenerateUniqueId(WorkflowType workflowType)
-        {
-            return _idGenerator.GenerateUniqueId();
-        }
+    public string GenerateUniqueId(WorkflowType workflowType)
+    {
+        return _idGenerator.GenerateUniqueId();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowTypeStore.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowTypeStore.cs
index 8f3ec49bd12..3953a3e51b2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowTypeStore.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Services/WorkflowTypeStore.cs
@@ -7,81 +7,80 @@
 using OrchardCore.Workflows.Models;
 using YesSql;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public class WorkflowTypeStore : IWorkflowTypeStore
 {
-    public class WorkflowTypeStore : IWorkflowTypeStore
+    private readonly ISession _session;
+    private readonly IEnumerable<IWorkflowTypeEventHandler> _handlers;
+    private readonly ILogger _logger;
+
+    public WorkflowTypeStore(ISession session, IEnumerable<IWorkflowTypeEventHandler> handlers, ILogger<WorkflowTypeStore> logger)
     {
-        private readonly ISession _session;
-        private readonly IEnumerable<IWorkflowTypeEventHandler> _handlers;
-        private readonly ILogger _logger;
+        _session = session;
+        _handlers = handlers;
+        _logger = logger;
+    }
 
-        public WorkflowTypeStore(ISession session, IEnumerable<IWorkflowTypeEventHandler> handlers, ILogger<WorkflowTypeStore> logger)
-        {
-            _session = session;
-            _handlers = handlers;
-            _logger = logger;
-        }
+    public Task<WorkflowType> GetAsync(long id)
+    {
+        return _session.GetAsync<WorkflowType>(id);
+    }
 
-        public Task<WorkflowType> GetAsync(long id)
-        {
-            return _session.GetAsync<WorkflowType>(id);
-        }
+    public Task<IEnumerable<WorkflowType>> GetAsync(IEnumerable<long> ids)
+    {
+        return _session.GetAsync<WorkflowType>(ids.ToArray());
+    }
 
-        public Task<IEnumerable<WorkflowType>> GetAsync(IEnumerable<long> ids)
-        {
-            return _session.GetAsync<WorkflowType>(ids.ToArray());
-        }
+    public Task<WorkflowType> GetAsync(string workflowTypeId)
+    {
+        return _session.Query<WorkflowType, WorkflowTypeIndex>(x => x.WorkflowTypeId == workflowTypeId).FirstOrDefaultAsync();
+    }
 
-        public Task<WorkflowType> GetAsync(string workflowTypeId)
-        {
-            return _session.Query<WorkflowType, WorkflowTypeIndex>(x => x.WorkflowTypeId == workflowTypeId).FirstOrDefaultAsync();
-        }
+    public Task<IEnumerable<WorkflowType>> ListAsync()
+    {
+        return _session.Query<WorkflowType, WorkflowTypeIndex>().ListAsync();
+    }
 
-        public Task<IEnumerable<WorkflowType>> ListAsync()
-        {
-            return _session.Query<WorkflowType, WorkflowTypeIndex>().ListAsync();
-        }
+    public Task<IEnumerable<WorkflowType>> GetByStartActivityAsync(string activityName)
+    {
+        return _session
+            .Query<WorkflowType, WorkflowTypeStartActivitiesIndex>(index =>
+                index.StartActivityName == activityName &&
+                index.IsEnabled)
+            .ListAsync();
+    }
 
-        public Task<IEnumerable<WorkflowType>> GetByStartActivityAsync(string activityName)
-        {
-            return _session
-                .Query<WorkflowType, WorkflowTypeStartActivitiesIndex>(index =>
-                    index.StartActivityName == activityName &&
-                    index.IsEnabled)
-                .ListAsync();
-        }
+    public async Task SaveAsync(WorkflowType workflowType)
+    {
+        var isNew = workflowType.Id == 0;
+        await _session.SaveAsync(workflowType);
 
-        public async Task SaveAsync(WorkflowType workflowType)
+        if (isNew)
         {
-            var isNew = workflowType.Id == 0;
-            await _session.SaveAsync(workflowType);
-
-            if (isNew)
-            {
-                var context = new WorkflowTypeCreatedContext(workflowType);
-                await _handlers.InvokeAsync((handler, context) => handler.CreatedAsync(context), context, _logger);
-            }
-            else
-            {
-                var context = new WorkflowTypeUpdatedContext(workflowType);
-                await _handlers.InvokeAsync((handler, context) => handler.UpdatedAsync(context), context, _logger);
-            }
+            var context = new WorkflowTypeCreatedContext(workflowType);
+            await _handlers.InvokeAsync((handler, context) => handler.CreatedAsync(context), context, _logger);
         }
-
-        public async Task DeleteAsync(WorkflowType workflowType)
+        else
         {
-            // Delete workflows first.
-            var workflows = await _session.Query<Workflow, WorkflowIndex>(x => x.WorkflowTypeId == workflowType.WorkflowTypeId).ListAsync();
+            var context = new WorkflowTypeUpdatedContext(workflowType);
+            await _handlers.InvokeAsync((handler, context) => handler.UpdatedAsync(context), context, _logger);
+        }
+    }
 
-            foreach (var workflow in workflows)
-            {
-                _session.Delete(workflow);
-            }
+    public async Task DeleteAsync(WorkflowType workflowType)
+    {
+        // Delete workflows first.
+        var workflows = await _session.Query<Workflow, WorkflowIndex>(x => x.WorkflowTypeId == workflowType.WorkflowTypeId).ListAsync();
 
-            // Then delete the workflow type.
-            _session.Delete(workflowType);
-            var context = new WorkflowTypeDeletedContext(workflowType);
-            await _handlers.InvokeAsync((handler, context) => handler.DeletedAsync(context), context, _logger);
+        foreach (var workflow in workflows)
+        {
+            _session.Delete(workflow);
         }
+
+        // Then delete the workflow type.
+        _session.Delete(workflowType);
+        var context = new WorkflowTypeDeletedContext(workflowType);
+        await _handlers.InvokeAsync((handler, context) => handler.DeletedAsync(context), context, _logger);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Startup.cs
index bb2b85fd102..e7b9d772071 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Startup.cs
@@ -25,77 +25,76 @@
 using OrchardCore.Workflows.Services;
 using OrchardCore.Workflows.WorkflowContextProviders;
 
-namespace OrchardCore.Workflows
+namespace OrchardCore.Workflows;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<WorkflowExecutionContext>();
-                o.MemberAccessStrategy.Register<WorkflowExecutionContext, LiquidPropertyAccessor>("Input", (obj, context) => new LiquidPropertyAccessor((LiquidTemplateContext)context, (name, context) => LiquidWorkflowExpressionEvaluator.ToFluidValue(obj.Input, name, context)));
-                o.MemberAccessStrategy.Register<WorkflowExecutionContext, LiquidPropertyAccessor>("Output", (obj, context) => new LiquidPropertyAccessor((LiquidTemplateContext)context, (name, context) => LiquidWorkflowExpressionEvaluator.ToFluidValue(obj.Output, name, context)));
-                o.MemberAccessStrategy.Register<WorkflowExecutionContext, LiquidPropertyAccessor>("Properties", (obj, context) => new LiquidPropertyAccessor((LiquidTemplateContext)context, (name, context) => LiquidWorkflowExpressionEvaluator.ToFluidValue(obj.Properties, name, context)));
-            });
+            o.MemberAccessStrategy.Register<WorkflowExecutionContext>();
+            o.MemberAccessStrategy.Register<WorkflowExecutionContext, LiquidPropertyAccessor>("Input", (obj, context) => new LiquidPropertyAccessor((LiquidTemplateContext)context, (name, context) => LiquidWorkflowExpressionEvaluator.ToFluidValue(obj.Input, name, context)));
+            o.MemberAccessStrategy.Register<WorkflowExecutionContext, LiquidPropertyAccessor>("Output", (obj, context) => new LiquidPropertyAccessor((LiquidTemplateContext)context, (name, context) => LiquidWorkflowExpressionEvaluator.ToFluidValue(obj.Output, name, context)));
+            o.MemberAccessStrategy.Register<WorkflowExecutionContext, LiquidPropertyAccessor>("Properties", (obj, context) => new LiquidPropertyAccessor((LiquidTemplateContext)context, (name, context) => LiquidWorkflowExpressionEvaluator.ToFluidValue(obj.Properties, name, context)));
+        });
 
-            services.AddSingleton<IWorkflowTypeIdGenerator, WorkflowTypeIdGenerator>();
-            services.AddSingleton<IWorkflowIdGenerator, WorkflowIdGenerator>();
-            services.AddSingleton<IActivityIdGenerator, ActivityIdGenerator>();
+        services.AddSingleton<IWorkflowTypeIdGenerator, WorkflowTypeIdGenerator>();
+        services.AddSingleton<IWorkflowIdGenerator, WorkflowIdGenerator>();
+        services.AddSingleton<IActivityIdGenerator, ActivityIdGenerator>();
 
-            services.AddScoped(typeof(Resolver<>));
-            services.AddSingleton<ISecurityTokenService, SecurityTokenService>();
-            services.AddScoped<IActivityLibrary, ActivityLibrary>();
-            services.AddScoped<IWorkflowTypeStore, WorkflowTypeStore>();
-            services.AddScoped<IWorkflowStore, WorkflowStore>();
-            services.AddScoped<IWorkflowManager, WorkflowManager>();
-            services.AddScoped<IActivityDisplayManager, ActivityDisplayManager>();
-            services.AddDataMigration<Migrations>();
-            services.AddScoped<INavigationProvider, AdminMenu>();
-            services.AddScoped<IPermissionProvider, Permissions>();
-            services.AddScoped<IDisplayDriver<IActivity>, MissingActivityDisplayDriver>();
-            services.AddIndexProvider<WorkflowTypeIndexProvider>();
-            services.AddIndexProvider<WorkflowIndexProvider>();
-            services.AddScoped<IWorkflowExecutionContextHandler, DefaultWorkflowExecutionContextHandler>();
-            services.AddScoped<IWorkflowExpressionEvaluator, LiquidWorkflowExpressionEvaluator>();
-            services.AddScoped<IWorkflowScriptEvaluator, JavaScriptWorkflowScriptEvaluator>();
+        services.AddScoped(typeof(Resolver<>));
+        services.AddSingleton<ISecurityTokenService, SecurityTokenService>();
+        services.AddScoped<IActivityLibrary, ActivityLibrary>();
+        services.AddScoped<IWorkflowTypeStore, WorkflowTypeStore>();
+        services.AddScoped<IWorkflowStore, WorkflowStore>();
+        services.AddScoped<IWorkflowManager, WorkflowManager>();
+        services.AddScoped<IActivityDisplayManager, ActivityDisplayManager>();
+        services.AddDataMigration<Migrations>();
+        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<IDisplayDriver<IActivity>, MissingActivityDisplayDriver>();
+        services.AddIndexProvider<WorkflowTypeIndexProvider>();
+        services.AddIndexProvider<WorkflowIndexProvider>();
+        services.AddScoped<IWorkflowExecutionContextHandler, DefaultWorkflowExecutionContextHandler>();
+        services.AddScoped<IWorkflowExpressionEvaluator, LiquidWorkflowExpressionEvaluator>();
+        services.AddScoped<IWorkflowScriptEvaluator, JavaScriptWorkflowScriptEvaluator>();
 
-            services.AddScoped<IWorkflowFaultHandler, DefaultWorkflowFaultHandler>();
-            services.AddActivity<WorkflowFaultEvent, WorkflowFaultEventDisplayDriver>();
-            services.AddActivity<Activity, ActivityMetadataDisplayDriver>();
-            services.AddActivity<NotifyTask, NotifyTaskDisplayDriver>();
-            services.AddActivity<SetPropertyTask, SetVariableTaskDisplayDriver>();
-            services.AddActivity<SetOutputTask, SetOutputTaskDisplayDriver>();
-            services.AddActivity<CorrelateTask, CorrelateTaskDisplayDriver>();
-            services.AddActivity<ForkTask, ForkTaskDisplayDriver>();
-            services.AddActivity<JoinTask, JoinTaskDisplayDriver>();
-            services.AddActivity<ForLoopTask, ForLoopTaskDisplayDriver>();
-            services.AddActivity<ForEachTask, ForEachTaskDisplayDriver>();
-            services.AddActivity<WhileLoopTask, WhileLoopTaskDisplayDriver>();
-            services.AddActivity<IfElseTask, IfElseTaskDisplayDriver>();
-            services.AddActivity<ScriptTask, ScriptTaskDisplayDriver>();
-            services.AddActivity<LogTask, LogTaskDisplayDriver>();
+        services.AddScoped<IWorkflowFaultHandler, DefaultWorkflowFaultHandler>();
+        services.AddActivity<WorkflowFaultEvent, WorkflowFaultEventDisplayDriver>();
+        services.AddActivity<Activity, ActivityMetadataDisplayDriver>();
+        services.AddActivity<NotifyTask, NotifyTaskDisplayDriver>();
+        services.AddActivity<SetPropertyTask, SetVariableTaskDisplayDriver>();
+        services.AddActivity<SetOutputTask, SetOutputTaskDisplayDriver>();
+        services.AddActivity<CorrelateTask, CorrelateTaskDisplayDriver>();
+        services.AddActivity<ForkTask, ForkTaskDisplayDriver>();
+        services.AddActivity<JoinTask, JoinTaskDisplayDriver>();
+        services.AddActivity<ForLoopTask, ForLoopTaskDisplayDriver>();
+        services.AddActivity<ForEachTask, ForEachTaskDisplayDriver>();
+        services.AddActivity<WhileLoopTask, WhileLoopTaskDisplayDriver>();
+        services.AddActivity<IfElseTask, IfElseTaskDisplayDriver>();
+        services.AddActivity<ScriptTask, ScriptTaskDisplayDriver>();
+        services.AddActivity<LogTask, LogTaskDisplayDriver>();
 
-            services.AddRecipeExecutionStep<WorkflowTypeStep>();
-            services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
-        }
+        services.AddRecipeExecutionStep<WorkflowTypeStep>();
+        services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
     }
+}
 
-    [RequireFeatures("OrchardCore.Deployment")]
-    public sealed class DeploymentStartup : StartupBase
+[RequireFeatures("OrchardCore.Deployment")]
+public sealed class DeploymentStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDeployment<AllWorkflowTypeDeploymentSource, AllWorkflowTypeDeploymentStep, AllWorkflowTypeDeploymentStepDriver>();
-        }
+        services.AddDeployment<AllWorkflowTypeDeploymentSource, AllWorkflowTypeDeploymentStep, AllWorkflowTypeDeploymentStepDriver>();
     }
+}
 
-    [Feature("OrchardCore.Workflows.Session")]
-    public sealed class SessionStartup : StartupBase
+[Feature("OrchardCore.Workflows.Session")]
+public sealed class SessionStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddActivity<CommitTransactionTask, CommitTransactionTaskDisplayDriver>();
-        }
+        services.AddActivity<CommitTransactionTask, CommitTransactionTaskDisplayDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/Startup.cs
index e00c35caadb..6b9241088eb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/Startup.cs
@@ -3,15 +3,14 @@
 using OrchardCore.Modules;
 using OrchardCore.Workflows.Helpers;
 
-namespace OrchardCore.Workflows.Timers
+namespace OrchardCore.Workflows.Timers;
+
+[Feature("OrchardCore.Workflows.Timers")]
+public sealed class Startup : StartupBase
 {
-    [Feature("OrchardCore.Workflows.Timers")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddActivity<TimerEvent, TimerEventDisplayDriver>();
-            services.AddSingleton<IBackgroundTask, TimerBackgroundTask>();
-        }
+        services.AddActivity<TimerEvent, TimerEventDisplayDriver>();
+        services.AddSingleton<IBackgroundTask, TimerBackgroundTask>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/TimerBackgroundTask.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/TimerBackgroundTask.cs
index 38874ec22f5..b01a8fa0a75 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/TimerBackgroundTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/TimerBackgroundTask.cs
@@ -5,18 +5,17 @@
 using OrchardCore.BackgroundTasks;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.Timers
+namespace OrchardCore.Workflows.Timers;
+
+[BackgroundTask(
+    Title = "Timed Workflow Starter",
+    Schedule = "* * * * *",
+    Description = "Triggers timed workflow events.")]
+public sealed class TimerBackgroundTask : IBackgroundTask
 {
-    [BackgroundTask(
-        Title = "Timed Workflow Starter",
-        Schedule = "* * * * *",
-        Description = "Triggers timed workflow events.")]
-    public sealed class TimerBackgroundTask : IBackgroundTask
+    public Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken)
     {
-        public Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken)
-        {
-            var workflowManager = serviceProvider.GetRequiredService<IWorkflowManager>();
-            return workflowManager.TriggerEventAsync(TimerEvent.EventName, null, null, isExclusive: true, isAlwaysCorrelated: true);
-        }
+        var workflowManager = serviceProvider.GetRequiredService<IWorkflowManager>();
+        return workflowManager.TriggerEventAsync(TimerEvent.EventName, null, null, isExclusive: true, isAlwaysCorrelated: true);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/TimerEvent.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/TimerEvent.cs
index 9f917468e92..515e940e0c2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/TimerEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/TimerEvent.cs
@@ -7,66 +7,65 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Timers
+namespace OrchardCore.Workflows.Timers;
+
+public class TimerEvent : EventActivity
 {
-    public class TimerEvent : EventActivity
+    public static string EventName => nameof(TimerEvent);
+    private readonly IClock _clock;
+    protected readonly IStringLocalizer S;
+
+    public TimerEvent(IClock clock, IStringLocalizer<TimerEvent> localizer)
     {
-        public static string EventName => nameof(TimerEvent);
-        private readonly IClock _clock;
-        protected readonly IStringLocalizer S;
+        _clock = clock;
+        S = localizer;
+    }
 
-        public TimerEvent(IClock clock, IStringLocalizer<TimerEvent> localizer)
-        {
-            _clock = clock;
-            S = localizer;
-        }
+    public override string Name => EventName;
 
-        public override string Name => EventName;
+    public override LocalizedString DisplayText => S["Timer Event"];
 
-        public override LocalizedString DisplayText => S["Timer Event"];
+    public override LocalizedString Category => S["Background"];
 
-        public override LocalizedString Category => S["Background"];
+    public string CronExpression
+    {
+        get => GetProperty(() => "*/5 * * * *");
+        set => SetProperty(value);
+    }
 
-        public string CronExpression
-        {
-            get => GetProperty(() => "*/5 * * * *");
-            set => SetProperty(value);
-        }
+    private DateTime? StartedUtc
+    {
+        get => GetProperty<DateTime?>();
+        set => SetProperty(value);
+    }
 
-        private DateTime? StartedUtc
-        {
-            get => GetProperty<DateTime?>();
-            set => SetProperty(value);
-        }
+    public override bool CanExecute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return StartedUtc == null || IsExpired();
+    }
 
-        public override bool CanExecute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return StartedUtc == null || IsExpired();
-        }
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"]);
+    }
 
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    public override ActivityExecutionResult Resume(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        if (IsExpired())
         {
-            return Outcomes(S["Done"]);
+            workflowContext.LastResult = "TimerEvent";
+            return Outcomes("Done");
         }
 
-        public override ActivityExecutionResult Resume(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            if (IsExpired())
-            {
-                workflowContext.LastResult = "TimerEvent";
-                return Outcomes("Done");
-            }
-
-            return Halt();
-        }
+        return Halt();
+    }
 
-        private bool IsExpired()
-        {
-            StartedUtc ??= _clock.UtcNow;
-            var schedule = CrontabSchedule.Parse(CronExpression);
-            var whenUtc = schedule.GetNextOccurrence(StartedUtc.Value);
+    private bool IsExpired()
+    {
+        StartedUtc ??= _clock.UtcNow;
+        var schedule = CrontabSchedule.Parse(CronExpression);
+        var whenUtc = schedule.GetNextOccurrence(StartedUtc.Value);
 
-            return _clock.UtcNow >= whenUtc;
-        }
+        return _clock.UtcNow >= whenUtc;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/TimerEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/TimerEventDisplayDriver.cs
index f52d1123bc5..0e30cc00ff1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/TimerEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/TimerEventDisplayDriver.cs
@@ -1,17 +1,16 @@
 using OrchardCore.Workflows.Display;
 
-namespace OrchardCore.Workflows.Timers
+namespace OrchardCore.Workflows.Timers;
+
+public sealed class TimerEventDisplayDriver : ActivityDisplayDriver<TimerEvent, TimerEventViewModel>
 {
-    public sealed class TimerEventDisplayDriver : ActivityDisplayDriver<TimerEvent, TimerEventViewModel>
+    protected override void EditActivity(TimerEvent source, TimerEventViewModel model)
     {
-        protected override void EditActivity(TimerEvent source, TimerEventViewModel model)
-        {
-            model.CronExpression = source.CronExpression;
-        }
+        model.CronExpression = source.CronExpression;
+    }
 
-        protected override void UpdateActivity(TimerEventViewModel model, TimerEvent target)
-        {
-            target.CronExpression = model.CronExpression.Trim();
-        }
+    protected override void UpdateActivity(TimerEventViewModel model, TimerEvent target)
+    {
+        target.CronExpression = model.CronExpression.Trim();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/TimerEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/TimerEventViewModel.cs
index e125bcf2011..fc39695fb95 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/TimerEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Timers/TimerEventViewModel.cs
@@ -1,10 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Workflows.Timers
+namespace OrchardCore.Workflows.Timers;
+
+public class TimerEventViewModel
 {
-    public class TimerEventViewModel
-    {
-        [Required]
-        public string CronExpression { get; set; }
-    }
+    [Required]
+    public string CronExpression { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Activities/UserTaskEvent.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Activities/UserTaskEvent.cs
index b4ad882e524..d790eb63caa 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Activities/UserTaskEvent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Activities/UserTaskEvent.cs
@@ -6,53 +6,52 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.UserTasks.Activities
+namespace OrchardCore.Workflows.UserTasks.Activities;
+
+public class UserTaskEvent : EventActivity
 {
-    public class UserTaskEvent : EventActivity
+    protected readonly IStringLocalizer S;
+
+    public UserTaskEvent(IStringLocalizer<UserTaskEvent> localizer)
+    {
+        S = localizer;
+    }
+
+    public override string Name => nameof(UserTaskEvent);
+    public override LocalizedString DisplayText => S["User Task Event"];
+    public override LocalizedString Category => S["Content"];
+
+    public IList<string> Actions
+    {
+        get => GetProperty(() => new List<string>());
+        set => SetProperty(value);
+    }
+
+    public IList<string> Roles
+    {
+        get => GetProperty(() => new List<string>());
+        set => SetProperty(value);
+    }
+
+    public override bool CanExecute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var action = GetProvidedAction(workflowContext);
+        return Actions.Contains(action);
+    }
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Actions.Select(x => Outcome(S[x]));
+    }
+
+    public override ActivityExecutionResult Resume(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var action = GetProvidedAction(workflowContext);
+        return Outcomes(action);
+    }
+
+    private static string GetProvidedAction(WorkflowExecutionContext workflowContext)
     {
-        protected readonly IStringLocalizer S;
-
-        public UserTaskEvent(IStringLocalizer<UserTaskEvent> localizer)
-        {
-            S = localizer;
-        }
-
-        public override string Name => nameof(UserTaskEvent);
-        public override LocalizedString DisplayText => S["User Task Event"];
-        public override LocalizedString Category => S["Content"];
-
-        public IList<string> Actions
-        {
-            get => GetProperty(() => new List<string>());
-            set => SetProperty(value);
-        }
-
-        public IList<string> Roles
-        {
-            get => GetProperty(() => new List<string>());
-            set => SetProperty(value);
-        }
-
-        public override bool CanExecute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var action = GetProvidedAction(workflowContext);
-            return Actions.Contains(action);
-        }
-
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Actions.Select(x => Outcome(S[x]));
-        }
-
-        public override ActivityExecutionResult Resume(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var action = GetProvidedAction(workflowContext);
-            return Outcomes(action);
-        }
-
-        private static string GetProvidedAction(WorkflowExecutionContext workflowContext)
-        {
-            return (string)workflowContext.Input[ContentEventConstants.UserActionInputKey];
-        }
+        return (string)workflowContext.Input[ContentEventConstants.UserActionInputKey];
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Drivers/UserTaskEventContentDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Drivers/UserTaskEventContentDriver.cs
index 934c66cbbc2..d6af9da25c2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Drivers/UserTaskEventContentDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Drivers/UserTaskEventContentDriver.cs
@@ -20,118 +20,117 @@
 using OrchardCore.Workflows.UserTasks.Activities;
 using OrchardCore.Workflows.UserTasks.ViewModels;
 
-namespace OrchardCore.Workflows.UserTasks.Drivers
+namespace OrchardCore.Workflows.UserTasks.Drivers;
+
+public sealed class UserTaskEventContentDriver : ContentDisplayDriver
 {
-    public sealed class UserTaskEventContentDriver : ContentDisplayDriver
+    private readonly IWorkflowStore _workflowStore;
+    private readonly IActivityLibrary _activityLibrary;
+    private readonly IWorkflowManager _workflowManager;
+    private readonly INotifier _notifier;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly JsonSerializerOptions _jsonSerializerOptions;
+
+    internal readonly IHtmlLocalizer H;
+
+    public UserTaskEventContentDriver(
+        IWorkflowStore workflowStore,
+        IActivityLibrary activityLibrary,
+        IWorkflowManager workflowManager,
+        INotifier notifier,
+        IHtmlLocalizer<UserTaskEventContentDriver> localizer,
+        IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions,
+        IHttpContextAccessor httpContextAccessor)
     {
-        private readonly IWorkflowStore _workflowStore;
-        private readonly IActivityLibrary _activityLibrary;
-        private readonly IWorkflowManager _workflowManager;
-        private readonly INotifier _notifier;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly JsonSerializerOptions _jsonSerializerOptions;
-
-        internal readonly IHtmlLocalizer H;
-
-        public UserTaskEventContentDriver(
-            IWorkflowStore workflowStore,
-            IActivityLibrary activityLibrary,
-            IWorkflowManager workflowManager,
-            INotifier notifier,
-            IHtmlLocalizer<UserTaskEventContentDriver> localizer,
-            IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions,
-            IHttpContextAccessor httpContextAccessor)
-        {
-            _workflowStore = workflowStore;
-            _activityLibrary = activityLibrary;
-            _workflowManager = workflowManager;
-            _notifier = notifier;
-            _httpContextAccessor = httpContextAccessor;
-            _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
-
-            H = localizer;
-        }
+        _workflowStore = workflowStore;
+        _activityLibrary = activityLibrary;
+        _workflowManager = workflowManager;
+        _notifier = notifier;
+        _httpContextAccessor = httpContextAccessor;
+        _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
+
+        H = localizer;
+    }
 
-        public override Task<IDisplayResult> EditAsync(ContentItem contentItem, BuildEditorContext context)
+    public override Task<IDisplayResult> EditAsync(ContentItem contentItem, BuildEditorContext context)
+    {
+        var results = new List<IDisplayResult>
         {
-            var results = new List<IDisplayResult>
-            {
-                Initialize<UserTaskEventContentViewModel>("Content_UserTaskButton", async model => {
-                    var actions = await GetUserTaskActionsAsync(contentItem.ContentItemId);
-                    model.Actions = actions;
-                }).Location("Actions:30"),
-            };
+            Initialize<UserTaskEventContentViewModel>("Content_UserTaskButton", async model => {
+                var actions = await GetUserTaskActionsAsync(contentItem.ContentItemId);
+                model.Actions = actions;
+            }).Location("Actions:30"),
+        };
 
-            return CombineAsync(results);
-        }
+        return CombineAsync(results);
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(ContentItem model, UpdateEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(ContentItem model, UpdateEditorContext context)
+    {
+        var httpContext = _httpContextAccessor.HttpContext;
+        var action = (string)httpContext.Request.Form["submit.Save"] ?? httpContext.Request.Form["submit.Publish"];
+        if (action?.StartsWith("user-task.", StringComparison.Ordinal) == true)
         {
-            var httpContext = _httpContextAccessor.HttpContext;
-            var action = (string)httpContext.Request.Form["submit.Save"] ?? httpContext.Request.Form["submit.Publish"];
-            if (action?.StartsWith("user-task.", StringComparison.Ordinal) == true)
-            {
-                action = action["user-task.".Length..];
+            action = action["user-task.".Length..];
 
-                var availableActions = await GetUserTaskActionsAsync(model.ContentItemId);
+            var availableActions = await GetUserTaskActionsAsync(model.ContentItemId);
 
-                if (!availableActions.Contains(action))
+            if (!availableActions.Contains(action))
+            {
+                await _notifier.ErrorAsync(H["Not authorized to trigger '{0}'.", action]);
+            }
+            else
+            {
+                var contentEvent = new ContentEventContext()
                 {
-                    await _notifier.ErrorAsync(H["Not authorized to trigger '{0}'.", action]);
-                }
-                else
+                    Name = nameof(UserTaskEvent),
+                    ContentType = model.ContentType,
+                    ContentItemId = model.ContentItemId,
+                    ContentItemVersionId = model.ContentItemVersionId,
+                };
+
+                var input = new Dictionary<string, object>
                 {
-                    var contentEvent = new ContentEventContext()
-                    {
-                        Name = nameof(UserTaskEvent),
-                        ContentType = model.ContentType,
-                        ContentItemId = model.ContentItemId,
-                        ContentItemVersionId = model.ContentItemVersionId,
-                    };
-
-                    var input = new Dictionary<string, object>
-                    {
-                        { ContentEventConstants.UserActionInputKey, action },
-                        { ContentEventConstants.ContentItemInputKey, model },
-                        { ContentEventConstants.ContentEventInputKey, contentEvent },
-                    };
-
-                    await _workflowManager.TriggerEventAsync(nameof(UserTaskEvent), input, correlationId: model.ContentItemId);
-                }
-            }
+                    { ContentEventConstants.UserActionInputKey, action },
+                    { ContentEventConstants.ContentItemInputKey, model },
+                    { ContentEventConstants.ContentEventInputKey, contentEvent },
+                };
 
-            return await EditAsync(model, context);
+                await _workflowManager.TriggerEventAsync(nameof(UserTaskEvent), input, correlationId: model.ContentItemId);
+            }
         }
 
-        private async Task<IList<string>> GetUserTaskActionsAsync(string contentItemId)
-        {
-            var workflows = await _workflowStore.ListByActivityNameAsync(nameof(UserTaskEvent), contentItemId);
-            var user = _httpContextAccessor.HttpContext.User;
-            var userRoles = user.Claims.Where(x => x.Type == ClaimTypes.Role).Select(x => x.Value).ToList();
-            var actionsQuery =
-                from workflow in workflows
-                let workflowState = workflow.State.ToObject<WorkflowState>(_jsonSerializerOptions)
-                from blockingActivity in workflow.BlockingActivities
-                where blockingActivity.Name == nameof(UserTaskEvent)
-                from action in GetUserTaskActions(workflowState, blockingActivity.ActivityId, userRoles)
-                select action;
-
-            return actionsQuery.Distinct().ToList();
-        }
+        return await EditAsync(model, context);
+    }
 
-        private IEnumerable<string> GetUserTaskActions(WorkflowState workflowState, string activityId, IEnumerable<string> userRoles)
+    private async Task<IList<string>> GetUserTaskActionsAsync(string contentItemId)
+    {
+        var workflows = await _workflowStore.ListByActivityNameAsync(nameof(UserTaskEvent), contentItemId);
+        var user = _httpContextAccessor.HttpContext.User;
+        var userRoles = user.Claims.Where(x => x.Type == ClaimTypes.Role).Select(x => x.Value).ToList();
+        var actionsQuery =
+            from workflow in workflows
+            let workflowState = workflow.State.ToObject<WorkflowState>(_jsonSerializerOptions)
+            from blockingActivity in workflow.BlockingActivities
+            where blockingActivity.Name == nameof(UserTaskEvent)
+            from action in GetUserTaskActions(workflowState, blockingActivity.ActivityId, userRoles)
+            select action;
+
+        return actionsQuery.Distinct().ToList();
+    }
+
+    private IEnumerable<string> GetUserTaskActions(WorkflowState workflowState, string activityId, IEnumerable<string> userRoles)
+    {
+        if (workflowState.ActivityStates.TryGetValue(activityId, out var activityState))
         {
-            if (workflowState.ActivityStates.TryGetValue(activityId, out var activityState))
-            {
-                var activity = _activityLibrary.InstantiateActivity<UserTaskEvent>(nameof(UserTaskEvent), activityState);
+            var activity = _activityLibrary.InstantiateActivity<UserTaskEvent>(nameof(UserTaskEvent), activityState);
 
-                if (activity.Roles.Count > 0 && !userRoles.Any(activity.Roles.Contains))
-                    yield break;
+            if (activity.Roles.Count > 0 && !userRoles.Any(activity.Roles.Contains))
+                yield break;
 
-                foreach (var action in activity.Actions)
-                {
-                    yield return action;
-                }
+            foreach (var action in activity.Actions)
+            {
+                yield return action;
             }
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Drivers/UserTaskEventDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Drivers/UserTaskEventDisplayDriver.cs
index 13c18315f02..ce959568284 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Drivers/UserTaskEventDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Drivers/UserTaskEventDisplayDriver.cs
@@ -4,20 +4,19 @@
 using OrchardCore.Workflows.UserTasks.Activities;
 using OrchardCore.Workflows.UserTasks.ViewModels;
 
-namespace OrchardCore.Workflows.UserTasks.Drivers
+namespace OrchardCore.Workflows.UserTasks.Drivers;
+
+public sealed class UserTaskEventDisplayDriver : ActivityDisplayDriver<UserTaskEvent, UserTaskEventViewModel>
 {
-    public sealed class UserTaskEventDisplayDriver : ActivityDisplayDriver<UserTaskEvent, UserTaskEventViewModel>
+    protected override void EditActivity(UserTaskEvent activity, UserTaskEventViewModel model)
     {
-        protected override void EditActivity(UserTaskEvent activity, UserTaskEventViewModel model)
-        {
-            model.Actions = string.Join(", ", activity.Actions);
-            model.Roles = activity.Roles;
-        }
+        model.Actions = string.Join(", ", activity.Actions);
+        model.Roles = activity.Roles;
+    }
 
-        protected override void UpdateActivity(UserTaskEventViewModel model, UserTaskEvent activity)
-        {
-            activity.Actions = model.Actions.Split(',', StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()).ToList();
-            activity.Roles = model.Roles;
-        }
+    protected override void UpdateActivity(UserTaskEventViewModel model, UserTaskEvent activity)
+    {
+        activity.Actions = model.Actions.Split(',', StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()).ToList();
+        activity.Roles = model.Roles;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Startup.cs
index 2fa674d2f55..ced130538ba 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/Startup.cs
@@ -5,15 +5,14 @@
 using OrchardCore.Workflows.UserTasks.Activities;
 using OrchardCore.Workflows.UserTasks.Drivers;
 
-namespace OrchardCore.Workflows.UserTasks
+namespace OrchardCore.Workflows.UserTasks;
+
+[RequireFeatures("OrchardCore.Workflows", "OrchardCore.Contents", "OrchardCore.Roles")]
+public sealed class Startup : StartupBase
 {
-    [RequireFeatures("OrchardCore.Workflows", "OrchardCore.Contents", "OrchardCore.Roles")]
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IContentDisplayDriver, UserTaskEventContentDriver>();
-            services.AddActivity<UserTaskEvent, UserTaskEventDisplayDriver>();
-        }
+        services.AddScoped<IContentDisplayDriver, UserTaskEventContentDriver>();
+        services.AddActivity<UserTaskEvent, UserTaskEventDisplayDriver>();
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/ViewModels/UserTaskEventContentViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/ViewModels/UserTaskEventContentViewModel.cs
index 5b465f74f33..db446d15fad 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/ViewModels/UserTaskEventContentViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/ViewModels/UserTaskEventContentViewModel.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Workflows.UserTasks.ViewModels
+namespace OrchardCore.Workflows.UserTasks.ViewModels;
+
+public class UserTaskEventContentViewModel
 {
-    public class UserTaskEventContentViewModel
-    {
-        public IList<string> Actions { get; set; }
-    }
+    public IList<string> Actions { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/ViewModels/UserTaskEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/ViewModels/UserTaskEventViewModel.cs
index 5fe53657f41..04ace1efe33 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/ViewModels/UserTaskEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/UserTasks/ViewModels/UserTaskEventViewModel.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Workflows.UserTasks.ViewModels
+namespace OrchardCore.Workflows.UserTasks.ViewModels;
+
+public class UserTaskEventViewModel
 {
-    public class UserTaskEventViewModel
-    {
-        public string Actions { get; set; }
-        public IList<string> Roles { get; set; } = [];
-    }
+    public string Actions { get; set; }
+    public IList<string> Roles { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewComponents/SelectWorkflowTypeViewComponent.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewComponents/SelectWorkflowTypeViewComponent.cs
index 8e3171b173e..fb422c3ea15 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewComponents/SelectWorkflowTypeViewComponent.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewComponents/SelectWorkflowTypeViewComponent.cs
@@ -3,28 +3,27 @@
 using OrchardCore.Workflows.Services;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Workflows.ViewComponents
+namespace OrchardCore.Workflows.ViewComponents;
+
+public class SelectWorkflowTypeViewComponent : ViewComponent
 {
-    public class SelectWorkflowTypeViewComponent : ViewComponent
+    private readonly IWorkflowTypeStore _contentDefinitionManager;
+
+    public SelectWorkflowTypeViewComponent(IWorkflowTypeStore contentDefinitionManager)
     {
-        private readonly IWorkflowTypeStore _contentDefinitionManager;
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public SelectWorkflowTypeViewComponent(IWorkflowTypeStore contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public async Task<IViewComponentResult> InvokeAsync(string selectedWorkflowTypeId, string htmlName)
+    {
+        var selections = await WorkflowTypeSelection.BuildAsync(_contentDefinitionManager, selectedWorkflowTypeId);
 
-        public async Task<IViewComponentResult> InvokeAsync(string selectedWorkflowTypeId, string htmlName)
+        var model = new SelectWorkflowTypeViewModel
         {
-            var selections = await WorkflowTypeSelection.BuildAsync(_contentDefinitionManager, selectedWorkflowTypeId);
-
-            var model = new SelectWorkflowTypeViewModel
-            {
-                HtmlName = htmlName,
-                WorkflowTypeSelections = selections
-            };
+            HtmlName = htmlName,
+            WorkflowTypeSelections = selections
+        };
 
-            return View(model);
-        }
+        return View(model);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ActivityEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ActivityEditViewModel.cs
index 96c9b0189fd..3852af008e1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ActivityEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ActivityEditViewModel.cs
@@ -1,13 +1,12 @@
 using OrchardCore.Workflows.Activities;
 
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class ActivityEditViewModel
 {
-    public class ActivityEditViewModel
-    {
-        public dynamic ActivityEditor { get; set; }
-        public IActivity Activity { get; set; }
-        public string ActivityId { get; set; }
-        public long WorkflowTypeId { get; set; }
-        public string ReturnUrl { get; set; }
-    }
+    public dynamic ActivityEditor { get; set; }
+    public IActivity Activity { get; set; }
+    public string ActivityId { get; set; }
+    public long WorkflowTypeId { get; set; }
+    public string ReturnUrl { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ActivityMetadataEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ActivityMetadataEditViewModel.cs
index f810c606af8..be7cde44c73 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ActivityMetadataEditViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ActivityMetadataEditViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class ActivityMetadataEditViewModel
 {
-    public class ActivityMetadataEditViewModel
-    {
-        public string Title { get; set; }
-    }
+    public string Title { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/CommitTransactionTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/CommitTransactionTaskViewModel.cs
index e1d99a253f2..0b8bfb7c9c7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/CommitTransactionTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/CommitTransactionTaskViewModel.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class CommitTransactionTaskViewModel
 {
-    public class CommitTransactionTaskViewModel
-    {
-    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/CorrelateTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/CorrelateTaskViewModel.cs
index 8a9b2b843c8..26cc168cbe0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/CorrelateTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/CorrelateTaskViewModel.cs
@@ -1,11 +1,10 @@
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class CorrelateTaskViewModel
 {
-    public class CorrelateTaskViewModel
-    {
-        public string Value { get; set; }
+    public string Value { get; set; }
 
-        public WorkflowScriptSyntax Syntax { get; set; }
-    }
+    public WorkflowScriptSyntax Syntax { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ForEachTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ForEachTaskViewModel.cs
index 53f7106b004..b03d6aca695 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ForEachTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ForEachTaskViewModel.cs
@@ -1,13 +1,12 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class ForEachTaskViewModel
 {
-    public class ForEachTaskViewModel
-    {
-        [Required]
-        public string EnumerableExpression { get; set; }
+    [Required]
+    public string EnumerableExpression { get; set; }
 
-        [Required]
-        public string LoopVariableName { get; set; }
-    }
+    [Required]
+    public string LoopVariableName { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ForLoopTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ForLoopTaskViewModel.cs
index 05bbaf602c2..905d3fda6b4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ForLoopTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ForLoopTaskViewModel.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class ForLoopTaskViewModel
 {
-    public class ForLoopTaskViewModel
-    {
-        public string FromExpression { get; set; }
-        public string ToExpression { get; set; }
-        public string StepExpression { get; set; }
-        public string LoopVariableName { get; set; }
-    }
+    public string FromExpression { get; set; }
+    public string ToExpression { get; set; }
+    public string StepExpression { get; set; }
+    public string LoopVariableName { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ForkTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ForkTaskViewModel.cs
index df4e33cdfd3..2c8de9d87a5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ForkTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ForkTaskViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class ForkTaskViewModel
 {
-    public class ForkTaskViewModel
-    {
-        public string Forks { get; set; }
-    }
+    public string Forks { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/IfElseTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/IfElseTaskViewModel.cs
index 3ed6fd6ec46..ef6d792c89c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/IfElseTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/IfElseTaskViewModel.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class IfElseTaskViewModel
 {
-    public class IfElseTaskViewModel
-    {
-        public string ConditionExpression { get; set; }
-    }
+    public string ConditionExpression { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/JoinTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/JoinTaskViewModel.cs
index e56dcaed1fa..ddf2e1e7756 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/JoinTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/JoinTaskViewModel.cs
@@ -1,9 +1,8 @@
 using OrchardCore.Workflows.Activities;
 
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class JoinTaskViewModel
 {
-    public class JoinTaskViewModel
-    {
-        public JoinTask.JoinMode Mode { get; set; }
-    }
+    public JoinTask.JoinMode Mode { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/LogTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/LogTaskViewModel.cs
index a6849176ac1..7c4bd07ebc7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/LogTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/LogTaskViewModel.cs
@@ -1,13 +1,12 @@
 using System.ComponentModel.DataAnnotations;
 using Microsoft.Extensions.Logging;
 
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class LogTaskViewModel
 {
-    public class LogTaskViewModel
-    {
-        public LogLevel LogLevel { get; set; }
+    public LogLevel LogLevel { get; set; }
 
-        [Required]
-        public string Text { get; set; }
-    }
+    [Required]
+    public string Text { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/NotifyTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/NotifyTaskViewModel.cs
index 6d5a0f6a7e2..f5124c0d85f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/NotifyTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/NotifyTaskViewModel.cs
@@ -1,13 +1,12 @@
 using System.ComponentModel.DataAnnotations;
 using OrchardCore.DisplayManagement.Notify;
 
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class NotifyTaskViewModel
 {
-    public class NotifyTaskViewModel
-    {
-        public NotifyType NotificationType { get; set; }
+    public NotifyType NotificationType { get; set; }
 
-        [Required]
-        public string Message { get; set; }
-    }
+    [Required]
+    public string Message { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ScriptTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ScriptTaskViewModel.cs
index 804c0fd482b..5a98582a43f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ScriptTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/ScriptTaskViewModel.cs
@@ -1,13 +1,12 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class ScriptTaskViewModel
 {
-    public class ScriptTaskViewModel
-    {
-        [Required]
-        public string AvailableOutcomes { get; set; }
+    [Required]
+    public string AvailableOutcomes { get; set; }
 
-        [Required]
-        public string Script { get; set; }
-    }
+    [Required]
+    public string Script { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/SelectWorkflowTypeViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/SelectWorkflowTypeViewModel.cs
index e02bf19c92d..ace3d99044d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/SelectWorkflowTypeViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/SelectWorkflowTypeViewModel.cs
@@ -4,32 +4,31 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class SelectWorkflowTypeViewModel
 {
-    public class SelectWorkflowTypeViewModel
-    {
-        public string HtmlName { get; set; }
-        public IList<WorkflowTypeSelection> WorkflowTypeSelections { get; set; }
-    }
+    public string HtmlName { get; set; }
+    public IList<WorkflowTypeSelection> WorkflowTypeSelections { get; set; }
+}
 
-    public class WorkflowTypeSelection
-    {
-        public bool IsSelected { get; set; }
-        public WorkflowType WorkflowType { get; set; }
+public class WorkflowTypeSelection
+{
+    public bool IsSelected { get; set; }
+    public WorkflowType WorkflowType { get; set; }
 
-        public static async Task<IList<WorkflowTypeSelection>> BuildAsync(IWorkflowTypeStore workflowTypeStore, string selectedWorkflowTypeId)
-        {
-            var workflowTypes = await workflowTypeStore.ListAsync();
-            var selections = workflowTypes
-                .Select(x => new WorkflowTypeSelection
-                {
-                    IsSelected = x.WorkflowTypeId == selectedWorkflowTypeId,
-                    WorkflowType = x
-                })
-                .OrderBy(x => x.WorkflowType.Name)
-                .ToList();
+    public static async Task<IList<WorkflowTypeSelection>> BuildAsync(IWorkflowTypeStore workflowTypeStore, string selectedWorkflowTypeId)
+    {
+        var workflowTypes = await workflowTypeStore.ListAsync();
+        var selections = workflowTypes
+            .Select(x => new WorkflowTypeSelection
+            {
+                IsSelected = x.WorkflowTypeId == selectedWorkflowTypeId,
+                WorkflowType = x
+            })
+            .OrderBy(x => x.WorkflowType.Name)
+            .ToList();
 
-            return selections;
-        }
+        return selections;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/SetOutputTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/SetOutputTaskViewModel.cs
index b376bb45d8d..f1545bc43c2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/SetOutputTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/SetOutputTaskViewModel.cs
@@ -1,12 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class SetOutputTaskViewModel
 {
-    public class SetOutputTaskViewModel
-    {
-        [Required]
-        public string OutputName { get; set; }
+    [Required]
+    public string OutputName { get; set; }
 
-        public string Value { get; set; }
-    }
+    public string Value { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/SetPropertyTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/SetPropertyTaskViewModel.cs
index c15e39e3cbd..8834eb3c876 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/SetPropertyTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/SetPropertyTaskViewModel.cs
@@ -1,12 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class SetPropertyTaskViewModel
 {
-    public class SetPropertyTaskViewModel
-    {
-        [Required]
-        public string PropertyName { get; set; }
+    [Required]
+    public string PropertyName { get; set; }
 
-        public string Value { get; set; }
-    }
+    public string Value { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/SignalEventViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/SignalEventViewModel.cs
index 5d60c3b169f..59d81546523 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/SignalEventViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/SignalEventViewModel.cs
@@ -1,10 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class SignalEventViewModel
 {
-    public class SignalEventViewModel
-    {
-        [Required]
-        public string SignalNameExpression { get; set; }
-    }
+    [Required]
+    public string SignalNameExpression { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WhileLoopTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WhileLoopTaskViewModel.cs
index 1ed58ae3942..76cfb907cb6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WhileLoopTaskViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WhileLoopTaskViewModel.cs
@@ -1,10 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class WhileLoopTaskViewModel
 {
-    public class WhileLoopTaskViewModel
-    {
-        [Required]
-        public string ConditionExpression { get; set; }
-    }
+    [Required]
+    public string ConditionExpression { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowFaultViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowFaultViewModel.cs
index c633bf5b2f3..64bcaf3d281 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowFaultViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowFaultViewModel.cs
@@ -1,10 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class WorkflowFaultViewModel
 {
-    public class WorkflowFaultViewModel
-    {
-        [Required]
-        public string ErrorFilter { get; set; }
-    }
+    [Required]
+    public string ErrorFilter { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowIndexViewModel.cs
index 1783c747501..7f48b3f9da5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowIndexViewModel.cs
@@ -3,67 +3,66 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class WorkflowIndexViewModel
 {
-    public class WorkflowIndexViewModel
+    public WorkflowIndexViewModel()
     {
-        public WorkflowIndexViewModel()
-        {
-            Options = new WorkflowIndexOptions();
-        }
-
-        public WorkflowType WorkflowType { get; set; }
-        public IList<WorkflowEntry> Workflows { get; set; }
-        public WorkflowIndexOptions Options { get; set; }
-        public dynamic Pager { get; set; }
-        public string ReturnUrl { get; set; }
+        Options = new WorkflowIndexOptions();
     }
 
-    public class WorkflowIndexOptions
+    public WorkflowType WorkflowType { get; set; }
+    public IList<WorkflowEntry> Workflows { get; set; }
+    public WorkflowIndexOptions Options { get; set; }
+    public dynamic Pager { get; set; }
+    public string ReturnUrl { get; set; }
+}
+
+public class WorkflowIndexOptions
+{
+    public WorkflowIndexOptions()
     {
-        public WorkflowIndexOptions()
-        {
-            Filter = WorkflowFilter.All;
-        }
+        Filter = WorkflowFilter.All;
+    }
 
-        public WorkflowBulkAction BulkAction { get; set; }
-        public WorkflowFilter Filter { get; set; }
+    public WorkflowBulkAction BulkAction { get; set; }
+    public WorkflowFilter Filter { get; set; }
 
-        public WorkflowOrder OrderBy { get; set; }
+    public WorkflowOrder OrderBy { get; set; }
 
-        [BindNever]
-        public List<SelectListItem> WorkflowsSorts { get; set; }
+    [BindNever]
+    public List<SelectListItem> WorkflowsSorts { get; set; }
 
-        [BindNever]
-        public List<SelectListItem> WorkflowsStatuses { get; set; }
+    [BindNever]
+    public List<SelectListItem> WorkflowsStatuses { get; set; }
 
-        [BindNever]
-        public List<SelectListItem> WorkflowsBulkAction { get; set; }
-    }
+    [BindNever]
+    public List<SelectListItem> WorkflowsBulkAction { get; set; }
+}
 
-    public class WorkflowEntry
-    {
-        public Workflow Workflow { get; set; }
-        public long Id { get; set; }
-        public bool IsChecked { get; set; }
-    }
+public class WorkflowEntry
+{
+    public Workflow Workflow { get; set; }
+    public long Id { get; set; }
+    public bool IsChecked { get; set; }
+}
 
-    public enum WorkflowFilter
-    {
-        All,
-        Finished,
-        Faulted
-    }
+public enum WorkflowFilter
+{
+    All,
+    Finished,
+    Faulted
+}
 
-    public enum WorkflowOrder
-    {
-        CreatedDesc,
-        Created
-    }
+public enum WorkflowOrder
+{
+    CreatedDesc,
+    Created
+}
 
-    public enum WorkflowBulkAction
-    {
-        None,
-        Delete
-    }
+public enum WorkflowBulkAction
+{
+    None,
+    Delete
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowTypeIndexViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowTypeIndexViewModel.cs
index 5255e82ed04..459f4d97b1c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowTypeIndexViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowTypeIndexViewModel.cs
@@ -3,50 +3,49 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class WorkflowTypeIndexViewModel
+{
+    public IList<WorkflowTypeEntry> WorkflowTypes { get; set; }
+    public WorkflowTypeIndexOptions Options { get; set; }
+    public dynamic Pager { get; set; }
+}
+
+public class WorkflowTypeEntry
+{
+    public WorkflowType WorkflowType { get; set; }
+    public bool IsChecked { get; set; }
+    public long Id { get; set; }
+    public string Name { get; set; }
+    public bool HasInstances { get; set; }
+}
+
+public class WorkflowTypeIndexOptions
+{
+    public string Search { get; set; }
+    public WorkflowTypeBulkAction BulkAction { get; set; }
+    public WorkflowTypeOrder Order { get; set; }
+    public WorkflowTypeFilter Filter { get; set; }
+
+    [BindNever]
+    public List<SelectListItem> WorkflowTypesBulkAction { get; set; }
+}
+
+public enum WorkflowTypeOrder
+{
+    Name,
+    Creation
+}
+
+public enum WorkflowTypeFilter
+{
+    All
+}
+
+public enum WorkflowTypeBulkAction
 {
-    public class WorkflowTypeIndexViewModel
-    {
-        public IList<WorkflowTypeEntry> WorkflowTypes { get; set; }
-        public WorkflowTypeIndexOptions Options { get; set; }
-        public dynamic Pager { get; set; }
-    }
-
-    public class WorkflowTypeEntry
-    {
-        public WorkflowType WorkflowType { get; set; }
-        public bool IsChecked { get; set; }
-        public long Id { get; set; }
-        public string Name { get; set; }
-        public bool HasInstances { get; set; }
-    }
-
-    public class WorkflowTypeIndexOptions
-    {
-        public string Search { get; set; }
-        public WorkflowTypeBulkAction BulkAction { get; set; }
-        public WorkflowTypeOrder Order { get; set; }
-        public WorkflowTypeFilter Filter { get; set; }
-
-        [BindNever]
-        public List<SelectListItem> WorkflowTypesBulkAction { get; set; }
-    }
-
-    public enum WorkflowTypeOrder
-    {
-        Name,
-        Creation
-    }
-
-    public enum WorkflowTypeFilter
-    {
-        All
-    }
-
-    public enum WorkflowTypeBulkAction
-    {
-        None,
-        Export,
-        Delete
-    }
+    None,
+    Export,
+    Delete
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowTypePropertiesViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowTypePropertiesViewModel.cs
index fe9f99ea8b3..9dfe1e39539 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowTypePropertiesViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowTypePropertiesViewModel.cs
@@ -1,19 +1,18 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class WorkflowTypePropertiesViewModel
 {
-    public class WorkflowTypePropertiesViewModel
-    {
-        public long Id { get; set; }
+    public long Id { get; set; }
 
-        [Required]
-        public string Name { get; set; }
+    [Required]
+    public string Name { get; set; }
 
-        public bool IsEnabled { get; set; }
-        public bool IsSingleton { get; set; }
-        public int LockTimeout { get; set; }
-        public int LockExpiration { get; set; }
-        public bool DeleteFinishedWorkflows { get; set; }
-        public string ReturnUrl { get; set; }
-    }
+    public bool IsEnabled { get; set; }
+    public bool IsSingleton { get; set; }
+    public int LockTimeout { get; set; }
+    public int LockExpiration { get; set; }
+    public bool DeleteFinishedWorkflows { get; set; }
+    public string ReturnUrl { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowTypeUpdateModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowTypeUpdateModel.cs
index e671433c37a..eb632c753c5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowTypeUpdateModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowTypeUpdateModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class WorkflowTypeUpdateModel
 {
-    public class WorkflowTypeUpdateModel
-    {
-        public long Id { get; set; }
-        public string State { get; set; }
-    }
+    public long Id { get; set; }
+    public string State { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowTypeViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowTypeViewModel.cs
index ab2bf6bb6fc..ff678a924a6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowTypeViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowTypeViewModel.cs
@@ -2,18 +2,17 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class WorkflowTypeViewModel
 {
-    public class WorkflowTypeViewModel
-    {
-        public WorkflowType WorkflowType { get; set; }
-        public IList<dynamic> ActivityThumbnailShapes { get; set; }
-        public IList<dynamic> ActivityDesignShapes { get; set; }
-        public IList<LocalizedString> ActivityCategories { get; set; }
-        public string WorkflowTypeJson { get; set; }
-        public string State { get; set; }
-        public string LocalId { get; set; }
-        public bool LoadLocalState { get; set; }
-        public int WorkflowCount { get; set; }
-    }
+    public WorkflowType WorkflowType { get; set; }
+    public IList<dynamic> ActivityThumbnailShapes { get; set; }
+    public IList<dynamic> ActivityDesignShapes { get; set; }
+    public IList<LocalizedString> ActivityCategories { get; set; }
+    public string WorkflowTypeJson { get; set; }
+    public string State { get; set; }
+    public string LocalId { get; set; }
+    public bool LoadLocalState { get; set; }
+    public int WorkflowCount { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowViewModel.cs
index 7dd27c3a519..6c9e8694b4d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowViewModel.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/ViewModels/WorkflowViewModel.cs
@@ -1,14 +1,13 @@
 using System.Collections.Generic;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class WorkflowViewModel
 {
-    public class WorkflowViewModel
-    {
-        public Workflow Workflow { get; set; }
-        public WorkflowType WorkflowType { get; set; }
-        public IList<dynamic> ActivityDesignShapes { get; set; }
-        public string WorkflowTypeJson { get; set; }
-        public string WorkflowJson { get; set; }
-    }
+    public Workflow Workflow { get; set; }
+    public WorkflowType WorkflowType { get; set; }
+    public IList<dynamic> ActivityDesignShapes { get; set; }
+    public string WorkflowTypeJson { get; set; }
+    public string WorkflowJson { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/WorkflowPruning/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/WorkflowPruning/AdminMenu.cs
index 6277c25141d..f6c38bd4415 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/WorkflowPruning/AdminMenu.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/WorkflowPruning/AdminMenu.cs
@@ -32,7 +32,7 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
         builder.Add(S["Configuration"], configuration => configuration
             .Add(S["Settings"], settings => settings
                 .Add(S["Workflow Pruning"], S["Workflow Pruning"], pruning => pruning
-                    .Action("Index","Admin", _routeValues)
+                    .Action("Index", "Admin", _routeValues)
                     .Permission(Permissions.ManageWorkflowSettings)
                     .LocalNav()
                 )
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/WorkflowPruning/Drivers/WorkflowPruningDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/WorkflowPruning/Drivers/WorkflowPruningDisplayDriver.cs
index c99c70ababb..71fc7cc0da5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/WorkflowPruning/Drivers/WorkflowPruningDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/WorkflowPruning/Drivers/WorkflowPruningDisplayDriver.cs
@@ -27,7 +27,7 @@ IHttpContextAccessor httpContextAccessor
         _httpContextAccessor = httpContextAccessor;
     }
 
-    protected override string SettingsGroupId 
+    protected override string SettingsGroupId
         => GroupId;
 
     public override IDisplayResult Edit(ISite site, WorkflowPruningSettings settings, BuildEditorContext context)
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/WorkflowPruning/Models/WorkflowPruningSettings.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/WorkflowPruning/Models/WorkflowPruningSettings.cs
index a9cd2490e34..b7dc16e5be4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/WorkflowPruning/Models/WorkflowPruningSettings.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/WorkflowPruning/Models/WorkflowPruningSettings.cs
@@ -11,6 +11,6 @@ public class WorkflowPruningSettings : Entity
     public DateTime? LastRunUtc { get; set; }
 
     public bool Disabled { get; set; }
-    
+
     public WorkflowStatus[] Statuses { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.XmlRpc/Controllers/HomeController.cs b/src/OrchardCore.Modules/OrchardCore.XmlRpc/Controllers/HomeController.cs
index aabd4a54c67..1620fd21a3b 100644
--- a/src/OrchardCore.Modules/OrchardCore.XmlRpc/Controllers/HomeController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.XmlRpc/Controllers/HomeController.cs
@@ -9,84 +9,83 @@
 using OrchardCore.XmlRpc.Models;
 using OrchardCore.XmlRpc.Services;
 
-namespace OrchardCore.XmlRpc.Controllers
+namespace OrchardCore.XmlRpc.Controllers;
+
+public class HomeController : Controller
 {
-    public class HomeController : Controller
+    private readonly IXmlRpcWriter _writer;
+    private readonly IEnumerable<IXmlRpcHandler> _xmlRpcHandlers;
+    private readonly ILogger _logger;
+
+    public HomeController(
+        IXmlRpcWriter writer,
+        IEnumerable<IXmlRpcHandler> xmlRpcHandlers,
+        ILogger<HomeController> logger)
     {
-        private readonly IXmlRpcWriter _writer;
-        private readonly IEnumerable<IXmlRpcHandler> _xmlRpcHandlers;
-        private readonly ILogger _logger;
+        _writer = writer;
+        _xmlRpcHandlers = xmlRpcHandlers;
+        _logger = logger;
+    }
 
-        public HomeController(
-            IXmlRpcWriter writer,
-            IEnumerable<IXmlRpcHandler> xmlRpcHandlers,
-            ILogger<HomeController> logger)
+    [HttpPost, ActionName("Index")]
+    [IgnoreAntiforgeryToken]
+    public async Task<IActionResult> ServiceEndpoint([ModelBinder(BinderType = typeof(MethodCallModelBinder))] XRpcMethodCall methodCall)
+    {
+        if (_logger.IsEnabled(LogLevel.Debug))
         {
-            _writer = writer;
-            _xmlRpcHandlers = xmlRpcHandlers;
-            _logger = logger;
+            _logger.LogDebug("XmlRpc method '{XmlRpcMethodName}' invoked", methodCall.MethodName);
         }
 
-        [HttpPost, ActionName("Index")]
-        [IgnoreAntiforgeryToken]
-        public async Task<IActionResult> ServiceEndpoint([ModelBinder(BinderType = typeof(MethodCallModelBinder))] XRpcMethodCall methodCall)
-        {
-            if (_logger.IsEnabled(LogLevel.Debug))
-            {
-                _logger.LogDebug("XmlRpc method '{XmlRpcMethodName}' invoked", methodCall.MethodName);
-            }
-
-            var methodResponse = await DispatchAsync(methodCall);
+        var methodResponse = await DispatchAsync(methodCall);
 
-            if (methodResponse == null)
-            {
-                return StatusCode(500, "TODO: xmlrpc fault");
-            }
-
-            var settings = new XmlWriterSettings
-            {
-                Encoding = Encoding.UTF8,
-                OmitXmlDeclaration = false,
-                Indent = true
-            };
+        if (methodResponse == null)
+        {
+            return StatusCode(500, "TODO: xmlrpc fault");
+        }
 
-            // Save to an intermediate MemoryStream to preserve the encoding declaration.
-            using var stream = new MemoryStream();
-            using (var w = XmlWriter.Create(stream, settings))
-            {
-                var result = _writer.MapMethodResponse(methodResponse);
-                result.Save(w);
-            }
+        var settings = new XmlWriterSettings
+        {
+            Encoding = Encoding.UTF8,
+            OmitXmlDeclaration = false,
+            Indent = true
+        };
 
-            var content = Encoding.UTF8.GetString(stream.ToArray());
-            return Content(content, "text/xml");
+        // Save to an intermediate MemoryStream to preserve the encoding declaration.
+        using var stream = new MemoryStream();
+        using (var w = XmlWriter.Create(stream, settings))
+        {
+            var result = _writer.MapMethodResponse(methodResponse);
+            result.Save(w);
         }
 
-        private async Task<XRpcMethodResponse> DispatchAsync(XRpcMethodCall request)
+        var content = Encoding.UTF8.GetString(stream.ToArray());
+        return Content(content, "text/xml");
+    }
+
+    private async Task<XRpcMethodResponse> DispatchAsync(XRpcMethodCall request)
+    {
+        var context = new XmlRpcContext
         {
-            var context = new XmlRpcContext
-            {
-                Url = Url,
-                ControllerContext = ControllerContext,
-                HttpContext = HttpContext,
-                RpcMethodCall = request
-            };
+            Url = Url,
+            ControllerContext = ControllerContext,
+            HttpContext = HttpContext,
+            RpcMethodCall = request
+        };
 
-            try
-            {
-                foreach (var handler in _xmlRpcHandlers)
-                {
-                    await handler.ProcessAsync(context);
-                }
-            }
-            catch (Exception e)
+        try
+        {
+            foreach (var handler in _xmlRpcHandlers)
             {
-                // If a core exception is raised, report the error message, otherwise signal a 500.
-                context.RpcMethodResponse ??= new XRpcMethodResponse();
-                context.RpcMethodResponse.Fault = new XRpcFault(0, e.Message);
+                await handler.ProcessAsync(context);
             }
-
-            return context.RpcMethodResponse;
         }
+        catch (Exception e)
+        {
+            // If a core exception is raised, report the error message, otherwise signal a 500.
+            context.RpcMethodResponse ??= new XRpcMethodResponse();
+            context.RpcMethodResponse.Fault = new XRpcFault(0, e.Message);
+        }
+
+        return context.RpcMethodResponse;
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.XmlRpc/Controllers/MetaWeblogController.cs b/src/OrchardCore.Modules/OrchardCore.XmlRpc/Controllers/MetaWeblogController.cs
index 3fdb9d7ba30..75909aa659a 100644
--- a/src/OrchardCore.Modules/OrchardCore.XmlRpc/Controllers/MetaWeblogController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.XmlRpc/Controllers/MetaWeblogController.cs
@@ -4,52 +4,51 @@
 using Microsoft.Extensions.Logging;
 using OrchardCore.Modules;
 
-namespace OrchardCore.XmlRpc.Controllers
+namespace OrchardCore.XmlRpc.Controllers;
+
+[Feature("OrchardCore.RemotePublishing")]
+public class MetaWeblogController : Controller
 {
-    [Feature("OrchardCore.RemotePublishing")]
-    public class MetaWeblogController : Controller
-    {
-        private const string ManifestUri = "http://schemas.microsoft.com/wlw/manifest/weblog";
+    private const string ManifestUri = "http://schemas.microsoft.com/wlw/manifest/weblog";
+
+    private readonly IEnumerable<IXmlRpcHandler> _xmlRpcHandlers;
+    private readonly ILogger _logger;
 
-        private readonly IEnumerable<IXmlRpcHandler> _xmlRpcHandlers;
-        private readonly ILogger _logger;
+    public MetaWeblogController(
+        IEnumerable<IXmlRpcHandler> xmlRpcHandlers,
+        ILogger<MetaWeblogController> logger)
+    {
+        _xmlRpcHandlers = xmlRpcHandlers;
+        _logger = logger;
+    }
 
-        public MetaWeblogController(
-            IEnumerable<IXmlRpcHandler> xmlRpcHandlers,
-            ILogger<MetaWeblogController> logger)
+    [ResponseCache(Duration = 0, NoStore = true)]
+    public ActionResult Manifest()
+    {
+        if (_logger.IsEnabled(LogLevel.Debug))
         {
-            _xmlRpcHandlers = xmlRpcHandlers;
-            _logger = logger;
+            _logger.LogDebug("Manifest requested");
         }
 
-        [ResponseCache(Duration = 0, NoStore = true)]
-        public ActionResult Manifest()
+        var options = new XElement(
+            XName.Get("options", ManifestUri),
+            new XElement(XName.Get("supportsAutoUpdate", ManifestUri), "Yes"),
+            new XElement(XName.Get("clientType", ManifestUri), "MetaWeblog"),
+            new XElement(XName.Get("supportsKeywords", ManifestUri), "No"),
+            new XElement(XName.Get("supportsCategories", ManifestUri), "No"),
+            new XElement(XName.Get("supportsFileUpload", ManifestUri), "No"),
+            new XElement(XName.Get("supportsCustomDate", ManifestUri), "No"));
+
+        foreach (var handler in _xmlRpcHandlers)
         {
-            if (_logger.IsEnabled(LogLevel.Debug))
-            {
-                _logger.LogDebug("Manifest requested");
-            }
-
-            var options = new XElement(
-                XName.Get("options", ManifestUri),
-                new XElement(XName.Get("supportsAutoUpdate", ManifestUri), "Yes"),
-                new XElement(XName.Get("clientType", ManifestUri), "MetaWeblog"),
-                new XElement(XName.Get("supportsKeywords", ManifestUri), "No"),
-                new XElement(XName.Get("supportsCategories", ManifestUri), "No"),
-                new XElement(XName.Get("supportsFileUpload", ManifestUri), "No"),
-                new XElement(XName.Get("supportsCustomDate", ManifestUri), "No"));
-
-            foreach (var handler in _xmlRpcHandlers)
-            {
-                handler.SetCapabilities(options);
-            }
-
-            var doc = new XDocument(
-                        new XElement(
-                            XName.Get("manifest", ManifestUri),
-                            options));
-
-            return Content(doc.ToString(), "text/xml");
+            handler.SetCapabilities(options);
         }
+
+        var doc = new XDocument(
+                    new XElement(
+                        XName.Get("manifest", ManifestUri),
+                        options));
+
+        return Content(doc.ToString(), "text/xml");
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.XmlRpc/MethodCallModelBinder.cs b/src/OrchardCore.Modules/OrchardCore.XmlRpc/MethodCallModelBinder.cs
index 58ba8dd129b..6bd1fb9d3ef 100644
--- a/src/OrchardCore.Modules/OrchardCore.XmlRpc/MethodCallModelBinder.cs
+++ b/src/OrchardCore.Modules/OrchardCore.XmlRpc/MethodCallModelBinder.cs
@@ -8,28 +8,27 @@
 using OrchardCore.XmlRpc.Models;
 using OrchardCore.XmlRpc.Services;
 
-namespace OrchardCore.XmlRpc
+namespace OrchardCore.XmlRpc;
+
+public class MethodCallModelBinder : IModelBinder
 {
-    public class MethodCallModelBinder : IModelBinder
+    public async Task BindModelAsync(ModelBindingContext bindingContext)
     {
-        public async Task BindModelAsync(ModelBindingContext bindingContext)
-        {
-            ArgumentNullException.ThrowIfNull(bindingContext);
+        ArgumentNullException.ThrowIfNull(bindingContext);
 
-            if (bindingContext.ModelType == typeof(XRpcMethodCall))
+        if (bindingContext.ModelType == typeof(XRpcMethodCall))
+        {
+            var mapper = bindingContext.HttpContext.RequestServices.GetRequiredService<IXmlRpcReader>();
+            var bodyTextContent = string.Empty;
+            // For some reasons we can't use XElement.LoadAsync. This method fails on big request body. I tested this with a picture with 2 MB of size.
+            // This code is maybe bad. Because if someone send a very big XML to this endpoint the server will die a out of memory exception.
+            using (var reader = new StreamReader(bindingContext.HttpContext.Request.Body, Encoding.UTF8, true, 1024, true))
             {
-                var mapper = bindingContext.HttpContext.RequestServices.GetRequiredService<IXmlRpcReader>();
-                var bodyTextContent = string.Empty;
-                // For some reasons we can't use XElement.LoadAsync. This method fails on big request body. I tested this with a picture with 2 MB of size.
-                // This code is maybe bad. Because if someone send a very big XML to this endpoint the server will die a out of memory exception.
-                using (var reader = new StreamReader(bindingContext.HttpContext.Request.Body, Encoding.UTF8, true, 1024, true))
-                {
-                    bodyTextContent = await reader.ReadToEndAsync();
-                }
-                var element = XElement.Parse(bodyTextContent);
-
-                bindingContext.Result = ModelBindingResult.Success(mapper.MapToMethodCall(element));
+                bodyTextContent = await reader.ReadToEndAsync();
             }
+            var element = XElement.Parse(bodyTextContent);
+
+            bindingContext.Result = ModelBindingResult.Success(mapper.MapToMethodCall(element));
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.XmlRpc/Services/XmlRpcReader.cs b/src/OrchardCore.Modules/OrchardCore.XmlRpc/Services/XmlRpcReader.cs
index 9403c0d8b34..91449dadf5e 100644
--- a/src/OrchardCore.Modules/OrchardCore.XmlRpc/Services/XmlRpcReader.cs
+++ b/src/OrchardCore.Modules/OrchardCore.XmlRpc/Services/XmlRpcReader.cs
@@ -5,135 +5,134 @@
 using System.Xml.Linq;
 using OrchardCore.XmlRpc.Models;
 
-namespace OrchardCore.XmlRpc.Services
+namespace OrchardCore.XmlRpc.Services;
+
+/// <summary>
+/// Abstraction to read XML and convert it to rpc entities.
+/// </summary>
+public class XmlRpcReader : IXmlRpcReader
 {
     /// <summary>
-    /// Abstraction to read XML and convert it to rpc entities.
+    /// Provides the mapping function based on a type name.
     /// </summary>
-    public class XmlRpcReader : IXmlRpcReader
-    {
-        /// <summary>
-        /// Provides the mapping function based on a type name.
-        /// </summary>
-        private readonly Dictionary<string, Func<XElement, XRpcData>> _dispatch;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="XmlRpcReader"/> class.
-        /// </summary>
-        public XmlRpcReader()
-        {
-            _dispatch = new Dictionary<string, Func<XElement, XRpcData>>
-                {
-                    { "i4", x => new XRpcData<int> { Value = (int)x } },
-                    { "int", x => new XRpcData<int> { Value = (int)x } },
-                    { "boolean", x => new XRpcData<bool> { Value = (string)x == "1" } },
-                    { "string", x => new XRpcData<string> { Value = (string)x } },
-                    { "double", x => new XRpcData<double> { Value = (double)x } },
-                    { "dateTime.iso8601", x => {
-                            DateTime parsedDateTime;
-
-                            // try parsing a "normal" datetime string then try what live writer gives us
-                            if (!DateTime.TryParse(x.Value, out parsedDateTime)
-                                && !DateTime.TryParseExact(x.Value, "yyyyMMddTHH:mm:ss", DateTimeFormatInfo.CurrentInfo, DateTimeStyles.None, out parsedDateTime)) {
-                                parsedDateTime = DateTime.Now;
-                            }
-
-                            return new XRpcData<DateTime> { Value = parsedDateTime };
-                        } },
-                    { "base64", x => new XRpcData<byte[]> { Value = Convert.FromBase64String((string)x) } },
-                    { "struct", x => XRpcData.For(MapToStruct(x)) },
-                    { "array", x => XRpcData.For(MapToArray(x)) },
-                };
-        }
+    private readonly Dictionary<string, Func<XElement, XRpcData>> _dispatch;
 
-        /// <summary>
-        /// Maps an XML element to a rpc method call.
-        /// </summary>
-        /// <param name="source">The XML element to be mapped.</param>
-        /// <returns>The rpc method call.</returns>
-        public XRpcMethodCall MapToMethodCall(XElement source)
-        {
-            return new XRpcMethodCall
+    /// <summary>
+    /// Initializes a new instance of the <see cref="XmlRpcReader"/> class.
+    /// </summary>
+    public XmlRpcReader()
+    {
+        _dispatch = new Dictionary<string, Func<XElement, XRpcData>>
             {
-                MethodName = (string)source.Element("methodName"),
-                Params = source.Elements("params").Elements("param").Select(MapToData).ToList()
+                { "i4", x => new XRpcData<int> { Value = (int)x } },
+                { "int", x => new XRpcData<int> { Value = (int)x } },
+                { "boolean", x => new XRpcData<bool> { Value = (string)x == "1" } },
+                { "string", x => new XRpcData<string> { Value = (string)x } },
+                { "double", x => new XRpcData<double> { Value = (double)x } },
+                { "dateTime.iso8601", x => {
+                        DateTime parsedDateTime;
+
+                        // try parsing a "normal" datetime string then try what live writer gives us
+                        if (!DateTime.TryParse(x.Value, out parsedDateTime)
+                            && !DateTime.TryParseExact(x.Value, "yyyyMMddTHH:mm:ss", DateTimeFormatInfo.CurrentInfo, DateTimeStyles.None, out parsedDateTime)) {
+                            parsedDateTime = DateTime.Now;
+                        }
+
+                        return new XRpcData<DateTime> { Value = parsedDateTime };
+                    } },
+                { "base64", x => new XRpcData<byte[]> { Value = Convert.FromBase64String((string)x) } },
+                { "struct", x => XRpcData.For(MapToStruct(x)) },
+                { "array", x => XRpcData.For(MapToArray(x)) },
             };
-        }
+    }
 
-        /// <summary>
-        /// Maps an XML element to rpc data.
-        /// </summary>
-        /// <param name="source">The XML element to be mapped.</param>
-        /// <returns>The rpc data.</returns>
-        public XRpcData MapToData(XElement source)
+    /// <summary>
+    /// Maps an XML element to a rpc method call.
+    /// </summary>
+    /// <param name="source">The XML element to be mapped.</param>
+    /// <returns>The rpc method call.</returns>
+    public XRpcMethodCall MapToMethodCall(XElement source)
+    {
+        return new XRpcMethodCall
         {
-            var value = source.Element("value");
-            if (value == null)
-            {
-                return new XRpcData();
-            }
+            MethodName = (string)source.Element("methodName"),
+            Params = source.Elements("params").Elements("param").Select(MapToData).ToList()
+        };
+    }
 
-            var element = value.Elements().SingleOrDefault();
+    /// <summary>
+    /// Maps an XML element to rpc data.
+    /// </summary>
+    /// <param name="source">The XML element to be mapped.</param>
+    /// <returns>The rpc data.</returns>
+    public XRpcData MapToData(XElement source)
+    {
+        var value = source.Element("value");
+        if (value == null)
+        {
+            return new XRpcData();
+        }
 
-            Func<XElement, XRpcData> dispatch;
-            if (_dispatch.TryGetValue(element.Name.LocalName, out dispatch) == false)
-            {
-                throw new InvalidOperationException("Unknown XmlRpc value type " + element.Name.LocalName);
-            }
+        var element = value.Elements().SingleOrDefault();
 
-            return dispatch(element);
+        Func<XElement, XRpcData> dispatch;
+        if (_dispatch.TryGetValue(element.Name.LocalName, out dispatch) == false)
+        {
+            throw new InvalidOperationException("Unknown XmlRpc value type " + element.Name.LocalName);
         }
 
-        /// <summary>
-        /// Maps an XML element to a rpc struct.
-        /// </summary>
-        /// <param name="source">The XML element to be mapped.</param>
-        /// <returns>The rpc struct.</returns>
-        public XRpcStruct MapToStruct(XElement source)
-        {
-            var result = new XRpcStruct();
-            foreach (var member in source.Elements("member"))
-            {
-                result.Members.Add(
-                    (string)member.Element("name"),
-                    MapValue(member.Element("value")));
-            }
+        return dispatch(element);
+    }
 
-            return result;
+    /// <summary>
+    /// Maps an XML element to a rpc struct.
+    /// </summary>
+    /// <param name="source">The XML element to be mapped.</param>
+    /// <returns>The rpc struct.</returns>
+    public XRpcStruct MapToStruct(XElement source)
+    {
+        var result = new XRpcStruct();
+        foreach (var member in source.Elements("member"))
+        {
+            result.Members.Add(
+                (string)member.Element("name"),
+                MapValue(member.Element("value")));
         }
 
-        /// <summary>
-        /// Maps an XML element to a rpc array.
-        /// </summary>
-        /// <param name="source">The XML element to be mapped.</param>
-        /// <returns>The rpc array.</returns>
-        public XRpcArray MapToArray(XElement source)
-        {
-            var result = new XRpcArray();
-            foreach (var value in source.Elements("data").Elements("value"))
-            {
-                result.Data.Add(MapValue(value));
-            }
+        return result;
+    }
 
-            return result;
+    /// <summary>
+    /// Maps an XML element to a rpc array.
+    /// </summary>
+    /// <param name="source">The XML element to be mapped.</param>
+    /// <returns>The rpc array.</returns>
+    public XRpcArray MapToArray(XElement source)
+    {
+        var result = new XRpcArray();
+        foreach (var value in source.Elements("data").Elements("value"))
+        {
+            result.Data.Add(MapValue(value));
         }
 
-        /// <summary>
-        /// Maps an XML container to rpc data.
-        /// </summary>
-        /// <param name="source">The XML container to be mapped.</param>
-        /// <returns>The rpc data.</returns>
-        private XRpcData MapValue(XContainer source)
-        {
-            var element = source.Elements().SingleOrDefault();
+        return result;
+    }
 
-            Func<XElement, XRpcData> dispatch;
-            if (_dispatch.TryGetValue(element.Name.LocalName, out dispatch) == false)
-            {
-                throw new InvalidOperationException("Unknown XmlRpc value type " + element.Name.LocalName);
-            }
+    /// <summary>
+    /// Maps an XML container to rpc data.
+    /// </summary>
+    /// <param name="source">The XML container to be mapped.</param>
+    /// <returns>The rpc data.</returns>
+    private XRpcData MapValue(XContainer source)
+    {
+        var element = source.Elements().SingleOrDefault();
 
-            return dispatch(element);
+        Func<XElement, XRpcData> dispatch;
+        if (_dispatch.TryGetValue(element.Name.LocalName, out dispatch) == false)
+        {
+            throw new InvalidOperationException("Unknown XmlRpc value type " + element.Name.LocalName);
         }
+
+        return dispatch(element);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.XmlRpc/Services/XmlRpcWriter.cs b/src/OrchardCore.Modules/OrchardCore.XmlRpc/Services/XmlRpcWriter.cs
index 9e7c5c85871..1c4bff3667a 100644
--- a/src/OrchardCore.Modules/OrchardCore.XmlRpc/Services/XmlRpcWriter.cs
+++ b/src/OrchardCore.Modules/OrchardCore.XmlRpc/Services/XmlRpcWriter.cs
@@ -5,118 +5,117 @@
 using System.Xml.Linq;
 using OrchardCore.XmlRpc.Models;
 
-namespace OrchardCore.XmlRpc.Services
+namespace OrchardCore.XmlRpc.Services;
+
+/// <summary>
+/// Abstraction to write XML based on rpc entities.
+/// </summary>
+public class XmlRpcWriter : IXmlRpcWriter
 {
     /// <summary>
-    /// Abstraction to write XML based on rpc entities.
+    /// Provides the mapping function based on a type.
     /// </summary>
-    public class XmlRpcWriter : IXmlRpcWriter
+    private readonly Dictionary<Type, Func<XRpcData, XElement>> _dispatch;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="XmlRpcWriter"/> class.
+    /// </summary>
+    public XmlRpcWriter()
     {
-        /// <summary>
-        /// Provides the mapping function based on a type.
-        /// </summary>
-        private readonly Dictionary<Type, Func<XRpcData, XElement>> _dispatch;
+        _dispatch = new Dictionary<Type, Func<XRpcData, XElement>>
+            {
+                { typeof(int), p => new XElement("int", (int)p.Value) },
+                { typeof(bool), p => new XElement("boolean", (bool)p.Value ? "1" : "0") },
+                { typeof(string), p => new XElement("string", p.Value) },
+                { typeof(double), p => new XElement("double", (double)p.Value) },
+                { typeof(DateTime), p => new XElement("dateTime.iso8601", ((DateTime)p.Value).ToString("yyyyMMddTHH:mm:ssZ", CultureInfo.InvariantCulture)) },
+                { typeof(DateTime?), p => new XElement("dateTime.iso8601", ((DateTime?)p.Value).Value.ToString("yyyyMMddTHH:mm:ssZ", CultureInfo.InvariantCulture)) },
+                { typeof(DateTimeOffset), p => new XElement("dateTime.iso8601", ((DateTimeOffset)p.Value).ToString("yyyyMMddTHH:mm:ssZ", CultureInfo.InvariantCulture)) },
+                { typeof(DateTimeOffset?), p => new XElement("dateTime.iso8601", ((DateTimeOffset?)p.Value).Value.ToString("yyyyMMddTHH:mm:ssZ", CultureInfo.InvariantCulture)) },
+                { typeof(byte[]), p => new XElement("base64", Convert.ToBase64String((byte[])p.Value)) },
+                { typeof(XRpcStruct), p => MapStruct((XRpcStruct)p.Value) },
+                { typeof(XRpcArray), p => MapArray((XRpcArray)p.Value) },
+            };
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="XmlRpcWriter"/> class.
-        /// </summary>
-        public XmlRpcWriter()
-        {
-            _dispatch = new Dictionary<Type, Func<XRpcData, XElement>>
-                {
-                    { typeof(int), p => new XElement("int", (int)p.Value) },
-                    { typeof(bool), p => new XElement("boolean", (bool)p.Value ? "1" : "0") },
-                    { typeof(string), p => new XElement("string", p.Value) },
-                    { typeof(double), p => new XElement("double", (double)p.Value) },
-                    { typeof(DateTime), p => new XElement("dateTime.iso8601", ((DateTime)p.Value).ToString("yyyyMMddTHH:mm:ssZ", CultureInfo.InvariantCulture)) },
-                    { typeof(DateTime?), p => new XElement("dateTime.iso8601", ((DateTime?)p.Value).Value.ToString("yyyyMMddTHH:mm:ssZ", CultureInfo.InvariantCulture)) },
-                    { typeof(DateTimeOffset), p => new XElement("dateTime.iso8601", ((DateTimeOffset)p.Value).ToString("yyyyMMddTHH:mm:ssZ", CultureInfo.InvariantCulture)) },
-                    { typeof(DateTimeOffset?), p => new XElement("dateTime.iso8601", ((DateTimeOffset?)p.Value).Value.ToString("yyyyMMddTHH:mm:ssZ", CultureInfo.InvariantCulture)) },
-                    { typeof(byte[]), p => new XElement("base64", Convert.ToBase64String((byte[])p.Value)) },
-                    { typeof(XRpcStruct), p => MapStruct((XRpcStruct)p.Value) },
-                    { typeof(XRpcArray), p => MapArray((XRpcArray)p.Value) },
-                };
-        }
+    /// <summary>
+    /// Maps a method response to XML.
+    /// </summary>
+    /// <param name="rpcMethodResponse">The method response to be mapped.</param>
+    /// <returns>The XML element.</returns>
+    public XElement MapMethodResponse(XRpcMethodResponse rpcMethodResponse)
+    {
+        ArgumentNullException.ThrowIfNull(rpcMethodResponse);
 
-        /// <summary>
-        /// Maps a method response to XML.
-        /// </summary>
-        /// <param name="rpcMethodResponse">The method response to be mapped.</param>
-        /// <returns>The XML element.</returns>
-        public XElement MapMethodResponse(XRpcMethodResponse rpcMethodResponse)
+        // return a valid fault as per http://xmlrpc.scripting.com/spec.html
+        if (rpcMethodResponse.Fault != null)
         {
-            ArgumentNullException.ThrowIfNull(rpcMethodResponse);
-
-            // return a valid fault as per http://xmlrpc.scripting.com/spec.html
-            if (rpcMethodResponse.Fault != null)
-            {
-                var members = new XRpcStruct();
-                members.Set("faultCode", rpcMethodResponse.Fault.Code);
-                members.Set("faultString", rpcMethodResponse.Fault.Message);
-
-                return new XElement("methodResponse",
-                    new XElement("fault",
-                        new XElement("value", MapStruct(members))
-                    )
-                );
-            }
+            var members = new XRpcStruct();
+            members.Set("faultCode", rpcMethodResponse.Fault.Code);
+            members.Set("faultString", rpcMethodResponse.Fault.Message);
 
             return new XElement("methodResponse",
-                new XElement("params",
-                    rpcMethodResponse.Params.Select(
-                        p => new XElement("param", MapValue(p)))));
+                new XElement("fault",
+                    new XElement("value", MapStruct(members))
+                )
+            );
         }
 
-        /// <summary>
-        /// Maps rpc data to XML.
-        /// </summary>
-        /// <param name="rpcData">The rpc data.</param>
-        /// <returns>The XML element.</returns>
-        public XElement MapData(XRpcData rpcData)
-        {
-            ArgumentNullException.ThrowIfNull(rpcData);
+        return new XElement("methodResponse",
+            new XElement("params",
+                rpcMethodResponse.Params.Select(
+                    p => new XElement("param", MapValue(p)))));
+    }
 
-            return new XElement("param", MapValue(rpcData));
-        }
+    /// <summary>
+    /// Maps rpc data to XML.
+    /// </summary>
+    /// <param name="rpcData">The rpc data.</param>
+    /// <returns>The XML element.</returns>
+    public XElement MapData(XRpcData rpcData)
+    {
+        ArgumentNullException.ThrowIfNull(rpcData);
 
-        /// <summary>
-        /// Maps a rpc struct to XML.
-        /// </summary>
-        /// <param name="rpcStruct">The rpc struct.</param>
-        /// <returns>The XML element.</returns>
-        public XElement MapStruct(XRpcStruct rpcStruct)
-        {
-            return new XElement(
-                "struct",
-                rpcStruct.Members.Select(
-                    kv => new XElement(
-                              "member",
-                              new XElement("name", kv.Key),
-                              MapValue(kv.Value))));
-        }
+        return new XElement("param", MapValue(rpcData));
+    }
 
-        /// <summary>
-        /// Maps a rpc array to XML.
-        /// </summary>
-        /// <param name="rpcArray">The rpc array.</param>
-        /// <returns>The XML element.</returns>
-        public XElement MapArray(XRpcArray rpcArray)
-        {
-            return new XElement(
-                "array",
-                new XElement(
-                    "data",
-                    rpcArray.Data.Select(MapValue)));
-        }
+    /// <summary>
+    /// Maps a rpc struct to XML.
+    /// </summary>
+    /// <param name="rpcStruct">The rpc struct.</param>
+    /// <returns>The XML element.</returns>
+    public XElement MapStruct(XRpcStruct rpcStruct)
+    {
+        return new XElement(
+            "struct",
+            rpcStruct.Members.Select(
+                kv => new XElement(
+                          "member",
+                          new XElement("name", kv.Key),
+                          MapValue(kv.Value))));
+    }
 
-        /// <summary>
-        /// Maps rpc data to XML.
-        /// </summary>
-        /// <param name="rpcData">The rpc data.</param>
-        /// <returns>The XML element.</returns>
-        private XElement MapValue(XRpcData rpcData)
-        {
-            return new XElement("value", _dispatch[rpcData.Type](rpcData));
-        }
+    /// <summary>
+    /// Maps a rpc array to XML.
+    /// </summary>
+    /// <param name="rpcArray">The rpc array.</param>
+    /// <returns>The XML element.</returns>
+    public XElement MapArray(XRpcArray rpcArray)
+    {
+        return new XElement(
+            "array",
+            new XElement(
+                "data",
+                rpcArray.Data.Select(MapValue)));
+    }
+
+    /// <summary>
+    /// Maps rpc data to XML.
+    /// </summary>
+    /// <param name="rpcData">The rpc data.</param>
+    /// <returns>The XML element.</returns>
+    private XElement MapValue(XRpcData rpcData)
+    {
+        return new XElement("value", _dispatch[rpcData.Type](rpcData));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.XmlRpc/Startup.cs b/src/OrchardCore.Modules/OrchardCore.XmlRpc/Startup.cs
index 094f2a5ce8e..00dff307c9b 100644
--- a/src/OrchardCore.Modules/OrchardCore.XmlRpc/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.XmlRpc/Startup.cs
@@ -5,38 +5,37 @@
 using OrchardCore.Modules;
 using OrchardCore.XmlRpc.Services;
 
-namespace OrchardCore.XmlRpc
+namespace OrchardCore.XmlRpc;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddScoped<IXmlRpcReader, XmlRpcReader>();
-            services.AddScoped<IXmlRpcWriter, XmlRpcWriter>();
-        }
+        services.AddScoped<IXmlRpcReader, XmlRpcReader>();
+        services.AddScoped<IXmlRpcWriter, XmlRpcWriter>();
+    }
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            routes.MapAreaControllerRoute(
-                name: "XmlRpc",
-                areaName: "OrchardCore.XmlRpc",
-                pattern: "xmlrpc",
-                defaults: new { controller = "Home", action = "Index" }
-            );
-        }
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        routes.MapAreaControllerRoute(
+            name: "XmlRpc",
+            areaName: "OrchardCore.XmlRpc",
+            pattern: "xmlrpc",
+            defaults: new { controller = "Home", action = "Index" }
+        );
     }
+}
 
-    [Feature("OrchardCore.RemotePublishing")]
-    public sealed class MetaWeblogStartup : StartupBase
+[Feature("OrchardCore.RemotePublishing")]
+public sealed class MetaWeblogStartup : StartupBase
+{
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
     {
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            routes.MapAreaControllerRoute(
-                name: "MetaWeblog",
-                areaName: "OrchardCore.XmlRpc",
-                pattern: "xmlrpc/metaweblog",
-                defaults: new { controller = "MetaWeblog", action = "Manifest" }
-            );
-        }
+        routes.MapAreaControllerRoute(
+            name: "MetaWeblog",
+            areaName: "OrchardCore.XmlRpc",
+            pattern: "xmlrpc/metaweblog",
+            defaults: new { controller = "MetaWeblog", action = "Manifest" }
+        );
     }
 }
diff --git a/src/OrchardCore.Themes/TheAdmin/ResourceManagementOptionsConfiguration.cs b/src/OrchardCore.Themes/TheAdmin/ResourceManagementOptionsConfiguration.cs
index 3472e01ada3..103d378e0b1 100644
--- a/src/OrchardCore.Themes/TheAdmin/ResourceManagementOptionsConfiguration.cs
+++ b/src/OrchardCore.Themes/TheAdmin/ResourceManagementOptionsConfiguration.cs
@@ -1,37 +1,36 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Themes.TheAdmin
+namespace OrchardCore.Themes.TheAdmin;
+
+public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
 {
-    public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
-    {
-        private static readonly ResourceManifest _manifest;
+    private static readonly ResourceManifest _manifest;
 
-        static ResourceManagementOptionsConfiguration()
-        {
-            _manifest = new ResourceManifest();
+    static ResourceManagementOptionsConfiguration()
+    {
+        _manifest = new ResourceManifest();
 
-            _manifest
-                .DefineScript("admin")
-                .SetDependencies("bootstrap", "admin-main", "theme-manager", "jQuery", "Sortable")
-                .SetUrl("~/TheAdmin/js/TheAdmin.min.js", "~/TheAdmin/js/TheAdmin.js")
-                .SetVersion("1.0.0");
+        _manifest
+            .DefineScript("admin")
+            .SetDependencies("bootstrap", "admin-main", "theme-manager", "jQuery", "Sortable")
+            .SetUrl("~/TheAdmin/js/TheAdmin.min.js", "~/TheAdmin/js/TheAdmin.js")
+            .SetVersion("1.0.0");
 
-            _manifest
-                .DefineScript("admin-main")
-                .SetUrl("~/TheAdmin/js/TheAdmin-main.min.js", "~/TheAdmin/js/TheAdmin-main.js")
-                .SetDependencies("theme-head", "js-cookie")
-                .SetVersion("1.0.0");
+        _manifest
+            .DefineScript("admin-main")
+            .SetUrl("~/TheAdmin/js/TheAdmin-main.min.js", "~/TheAdmin/js/TheAdmin-main.js")
+            .SetDependencies("theme-head", "js-cookie")
+            .SetVersion("1.0.0");
 
-            _manifest
-                .DefineStyle("admin")
-                .SetUrl("~/TheAdmin/css/TheAdmin.min.css", "~/TheAdmin/css/TheAdmin.css")
-                .SetVersion("1.0.0");
-        }
+        _manifest
+            .DefineStyle("admin")
+            .SetUrl("~/TheAdmin/css/TheAdmin.min.css", "~/TheAdmin/css/TheAdmin.css")
+            .SetVersion("1.0.0");
+    }
 
-        public void Configure(ResourceManagementOptions options)
-        {
-            options.ResourceManifests.Add(_manifest);
-        }
+    public void Configure(ResourceManagementOptions options)
+    {
+        options.ResourceManifests.Add(_manifest);
     }
 }
diff --git a/src/OrchardCore.Themes/TheAdmin/Startup.cs b/src/OrchardCore.Themes/TheAdmin/Startup.cs
index e42219a9736..d67a64302d1 100644
--- a/src/OrchardCore.Themes/TheAdmin/Startup.cs
+++ b/src/OrchardCore.Themes/TheAdmin/Startup.cs
@@ -5,21 +5,20 @@
 using OrchardCore.Modules;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Themes.TheAdmin
+namespace OrchardCore.Themes.TheAdmin;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
-    {
-        private readonly IShellConfiguration _configuration;
+    private readonly IShellConfiguration _configuration;
 
-        public Startup(IShellConfiguration configuration)
-        {
-            _configuration = configuration;
-        }
+    public Startup(IShellConfiguration configuration)
+    {
+        _configuration = configuration;
+    }
 
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
-            services.Configure<TheAdminThemeOptions>(_configuration.GetSection("TheAdminTheme:StyleSettings"));
-        }
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
+        services.Configure<TheAdminThemeOptions>(_configuration.GetSection("TheAdminTheme:StyleSettings"));
     }
 }
diff --git a/src/OrchardCore.Themes/TheAgencyTheme/ResourceManagementOptionsConfiguration.cs b/src/OrchardCore.Themes/TheAgencyTheme/ResourceManagementOptionsConfiguration.cs
index b64f39b6845..8bab31f3d47 100644
--- a/src/OrchardCore.Themes/TheAgencyTheme/ResourceManagementOptionsConfiguration.cs
+++ b/src/OrchardCore.Themes/TheAgencyTheme/ResourceManagementOptionsConfiguration.cs
@@ -1,42 +1,41 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Themes.TheAgencyTheme
+namespace OrchardCore.Themes.TheAgencyTheme;
+
+public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
 {
-    public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
+    private static readonly ResourceManifest _manifest;
+
+    static ResourceManagementOptionsConfiguration()
+    {
+        _manifest = new ResourceManifest();
+
+        _manifest
+            .DefineScript("TheAgencyTheme-bootstrap-bundle")
+            .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js", "https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.js")
+            .SetCdnIntegrity("sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p", "sha384-8fq7CZc5BnER+jVlJI2Jafpbn4A9320TKhNJfYP33nneHep7sUg/OD30x7fK09pS")
+            .SetVersion("5.1.3");
+
+        _manifest
+            .DefineScript("TheAgencyTheme")
+            .SetUrl("~/TheAgencyTheme/js/scripts.min.js", "~/TheAgencyTheme/js/scripts.js")
+            .SetVersion("7.0.10");
+
+        _manifest
+            .DefineStyle("TheAgencyTheme")
+            .SetUrl("~/TheAgencyTheme/css/styles.min.css", "~/TheAgencyTheme/css/styles.css")
+            .SetVersion("7.0.10");
+
+        _manifest
+            .DefineStyle("TheAgencyTheme-bootstrap-oc")
+            .SetDependencies("TheAgencyTheme")
+            .SetUrl("~/TheAgencyTheme/css/bootstrap-oc.min.css", "~/TheAgencyTheme/css/bootstrap-oc.css")
+            .SetVersion("1.0.0");
+    }
+
+    public void Configure(ResourceManagementOptions options)
     {
-        private static readonly ResourceManifest _manifest;
-
-        static ResourceManagementOptionsConfiguration()
-        {
-            _manifest = new ResourceManifest();
-
-            _manifest
-                .DefineScript("TheAgencyTheme-bootstrap-bundle")
-                .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js", "https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.js")
-                .SetCdnIntegrity("sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p", "sha384-8fq7CZc5BnER+jVlJI2Jafpbn4A9320TKhNJfYP33nneHep7sUg/OD30x7fK09pS")
-                .SetVersion("5.1.3");
-
-            _manifest
-                .DefineScript("TheAgencyTheme")
-                .SetUrl("~/TheAgencyTheme/js/scripts.min.js", "~/TheAgencyTheme/js/scripts.js")
-                .SetVersion("7.0.10");
-
-            _manifest
-                .DefineStyle("TheAgencyTheme")
-                .SetUrl("~/TheAgencyTheme/css/styles.min.css", "~/TheAgencyTheme/css/styles.css")
-                .SetVersion("7.0.10");
-
-            _manifest
-                .DefineStyle("TheAgencyTheme-bootstrap-oc")
-                .SetDependencies("TheAgencyTheme")
-                .SetUrl("~/TheAgencyTheme/css/bootstrap-oc.min.css", "~/TheAgencyTheme/css/bootstrap-oc.css")
-                .SetVersion("1.0.0");
-        }
-
-        public void Configure(ResourceManagementOptions options)
-        {
-            options.ResourceManifests.Add(_manifest);
-        }
+        options.ResourceManifests.Add(_manifest);
     }
 }
diff --git a/src/OrchardCore.Themes/TheAgencyTheme/Startup.cs b/src/OrchardCore.Themes/TheAgencyTheme/Startup.cs
index 6f18d201c8b..f034941fd98 100644
--- a/src/OrchardCore.Themes/TheAgencyTheme/Startup.cs
+++ b/src/OrchardCore.Themes/TheAgencyTheme/Startup.cs
@@ -3,13 +3,12 @@
 using OrchardCore.Modules;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Themes.TheAgencyTheme
+namespace OrchardCore.Themes.TheAgencyTheme;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection serviceCollection)
     {
-        public override void ConfigureServices(IServiceCollection serviceCollection)
-        {
-            serviceCollection.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
-        }
+        serviceCollection.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
     }
 }
diff --git a/src/OrchardCore.Themes/TheBlogTheme/ResourceManagementOptionsConfiguration.cs b/src/OrchardCore.Themes/TheBlogTheme/ResourceManagementOptionsConfiguration.cs
index 6b2df240349..e959c9094d7 100644
--- a/src/OrchardCore.Themes/TheBlogTheme/ResourceManagementOptionsConfiguration.cs
+++ b/src/OrchardCore.Themes/TheBlogTheme/ResourceManagementOptionsConfiguration.cs
@@ -1,42 +1,41 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Themes.TheBlogTheme
+namespace OrchardCore.Themes.TheBlogTheme;
+
+public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
 {
-    public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
+    private static readonly ResourceManifest _manifest;
+
+    static ResourceManagementOptionsConfiguration()
+    {
+        _manifest = new ResourceManifest();
+
+        _manifest
+            .DefineScript("TheBlogTheme-bootstrap-bundle")
+            .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js", "https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.js")
+            .SetCdnIntegrity("sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p", "sha384-8fq7CZc5BnER+jVlJI2Jafpbn4A9320TKhNJfYP33nneHep7sUg/OD30x7fK09pS")
+            .SetVersion("5.1.3");
+
+        _manifest
+            .DefineStyle("TheBlogTheme-bootstrap-oc")
+            .SetUrl("~/TheBlogTheme/css/bootstrap-oc.min.css", "~/TheBlogTheme/css/bootstrap-oc.css")
+            .SetVersion("1.0.0");
+
+        _manifest
+            .DefineScript("TheBlogTheme")
+            .SetDependencies("TheBlogTheme-bootstrap-bundle")
+            .SetUrl("~/TheBlogTheme/js/scripts.min.js", "~/TheBlogTheme/js/scripts.js")
+            .SetVersion("6.0.7");
+
+        _manifest
+            .DefineStyle("TheBlogTheme")
+            .SetUrl("~/TheBlogTheme/css/styles.min.css", "~/TheBlogTheme/css/styles.css")
+            .SetVersion("6.0.7");
+    }
+
+    public void Configure(ResourceManagementOptions options)
     {
-        private static readonly ResourceManifest _manifest;
-
-        static ResourceManagementOptionsConfiguration()
-        {
-            _manifest = new ResourceManifest();
-
-            _manifest
-                .DefineScript("TheBlogTheme-bootstrap-bundle")
-                .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js", "https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.js")
-                .SetCdnIntegrity("sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p", "sha384-8fq7CZc5BnER+jVlJI2Jafpbn4A9320TKhNJfYP33nneHep7sUg/OD30x7fK09pS")
-                .SetVersion("5.1.3");
-
-            _manifest
-                .DefineStyle("TheBlogTheme-bootstrap-oc")
-                .SetUrl("~/TheBlogTheme/css/bootstrap-oc.min.css", "~/TheBlogTheme/css/bootstrap-oc.css")
-                .SetVersion("1.0.0");
-
-            _manifest
-                .DefineScript("TheBlogTheme")
-                .SetDependencies("TheBlogTheme-bootstrap-bundle")
-                .SetUrl("~/TheBlogTheme/js/scripts.min.js", "~/TheBlogTheme/js/scripts.js")
-                .SetVersion("6.0.7");
-
-            _manifest
-                .DefineStyle("TheBlogTheme")
-                .SetUrl("~/TheBlogTheme/css/styles.min.css", "~/TheBlogTheme/css/styles.css")
-                .SetVersion("6.0.7");
-        }
-
-        public void Configure(ResourceManagementOptions options)
-        {
-            options.ResourceManifests.Add(_manifest);
-        }
+        options.ResourceManifests.Add(_manifest);
     }
 }
diff --git a/src/OrchardCore.Themes/TheBlogTheme/Startup.cs b/src/OrchardCore.Themes/TheBlogTheme/Startup.cs
index 054b07e13a6..91e9d807933 100644
--- a/src/OrchardCore.Themes/TheBlogTheme/Startup.cs
+++ b/src/OrchardCore.Themes/TheBlogTheme/Startup.cs
@@ -3,13 +3,12 @@
 using OrchardCore.Modules;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Themes.TheBlogTheme
+namespace OrchardCore.Themes.TheBlogTheme;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection serviceCollection)
     {
-        public override void ConfigureServices(IServiceCollection serviceCollection)
-        {
-            serviceCollection.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
-        }
+        serviceCollection.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
     }
 }
diff --git a/src/OrchardCore.Themes/TheComingSoonTheme/ResourceManagementOptionsConfiguration.cs b/src/OrchardCore.Themes/TheComingSoonTheme/ResourceManagementOptionsConfiguration.cs
index e169f0369ed..f83a9b1ca89 100644
--- a/src/OrchardCore.Themes/TheComingSoonTheme/ResourceManagementOptionsConfiguration.cs
+++ b/src/OrchardCore.Themes/TheComingSoonTheme/ResourceManagementOptionsConfiguration.cs
@@ -1,41 +1,40 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Themes.TheComingSoonTheme
+namespace OrchardCore.Themes.TheComingSoonTheme;
+
+public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
 {
-    public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
+    private static readonly ResourceManifest _manifest;
+
+    static ResourceManagementOptionsConfiguration()
+    {
+        _manifest = new ResourceManifest();
+
+        _manifest
+            .DefineScript("TheComingSoonTheme-bootstrap-bundle")
+            .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js", "https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.js")
+            .SetCdnIntegrity("sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p", "sha384-8fq7CZc5BnER+jVlJI2Jafpbn4A9320TKhNJfYP33nneHep7sUg/OD30x7fK09pS")
+            .SetVersion("5.1.3");
+
+        _manifest
+            .DefineScript("coming-soon")
+            .SetUrl("~/TheComingSoonTheme/js/scripts.min.js", "TheComingSoonTheme/js/scripts.js")
+            .SetVersion("6.0.5");
+
+        _manifest
+            .DefineStyle("coming-soon")
+            .SetUrl("~/TheComingSoonTheme/css/styles.min.css", "TheComingSoonTheme/css/styles.css")
+            .SetVersion("6.0.5");
+
+        _manifest
+            .DefineStyle("TheComingSoonTheme-bootstrap-oc")
+            .SetUrl("~/TheComingSoonTheme/css/bootstrap-oc.min.css", "~/TheComingSoonTheme/css/bootstrap-oc.css")
+            .SetVersion("1.0.0");
+    }
+
+    public void Configure(ResourceManagementOptions options)
     {
-        private static readonly ResourceManifest _manifest;
-
-        static ResourceManagementOptionsConfiguration()
-        {
-            _manifest = new ResourceManifest();
-
-            _manifest
-                .DefineScript("TheComingSoonTheme-bootstrap-bundle")
-                .SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js", "https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.js")
-                .SetCdnIntegrity("sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p", "sha384-8fq7CZc5BnER+jVlJI2Jafpbn4A9320TKhNJfYP33nneHep7sUg/OD30x7fK09pS")
-                .SetVersion("5.1.3");
-
-            _manifest
-                .DefineScript("coming-soon")
-                .SetUrl("~/TheComingSoonTheme/js/scripts.min.js", "TheComingSoonTheme/js/scripts.js")
-                .SetVersion("6.0.5");
-
-            _manifest
-                .DefineStyle("coming-soon")
-                .SetUrl("~/TheComingSoonTheme/css/styles.min.css", "TheComingSoonTheme/css/styles.css")
-                .SetVersion("6.0.5");
-
-            _manifest
-                .DefineStyle("TheComingSoonTheme-bootstrap-oc")
-                .SetUrl("~/TheComingSoonTheme/css/bootstrap-oc.min.css", "~/TheComingSoonTheme/css/bootstrap-oc.css")
-                .SetVersion("1.0.0");
-        }
-
-        public void Configure(ResourceManagementOptions options)
-        {
-            options.ResourceManifests.Add(_manifest);
-        }
+        options.ResourceManifests.Add(_manifest);
     }
 }
diff --git a/src/OrchardCore.Themes/TheComingSoonTheme/Startup.cs b/src/OrchardCore.Themes/TheComingSoonTheme/Startup.cs
index 44d26fae91e..38c8fa49f81 100644
--- a/src/OrchardCore.Themes/TheComingSoonTheme/Startup.cs
+++ b/src/OrchardCore.Themes/TheComingSoonTheme/Startup.cs
@@ -3,13 +3,12 @@
 using OrchardCore.Modules;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Themes.TheComingSoonTheme
+namespace OrchardCore.Themes.TheComingSoonTheme;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection serviceCollection)
     {
-        public override void ConfigureServices(IServiceCollection serviceCollection)
-        {
-            serviceCollection.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
-        }
+        serviceCollection.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
     }
 }
diff --git a/src/OrchardCore.Themes/TheTheme/Controllers/HomeController.cs b/src/OrchardCore.Themes/TheTheme/Controllers/HomeController.cs
index d9cb59844f1..4a994c7c472 100644
--- a/src/OrchardCore.Themes/TheTheme/Controllers/HomeController.cs
+++ b/src/OrchardCore.Themes/TheTheme/Controllers/HomeController.cs
@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace OrchardCore.TheTheme.Controllers
+namespace OrchardCore.TheTheme.Controllers;
+
+public class HomeController : Controller
 {
-    public class HomeController : Controller
+    public IActionResult Index()
     {
-        public IActionResult Index()
-        {
-            return View();
-        }
+        return View();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/BackgroundJobs/HttpBackgroundJob.cs b/src/OrchardCore/OrchardCore.Abstractions/BackgroundJobs/HttpBackgroundJob.cs
index 33e00ac1ea9..a90c5eac4e6 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/BackgroundJobs/HttpBackgroundJob.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/BackgroundJobs/HttpBackgroundJob.cs
@@ -63,7 +63,7 @@ public static Task ExecuteAfterEndOfRequestAsync(string jobName, Func<ShellScope
             httpContextAccessor.HttpContext = shellContext.CreateHttpContext();
             // Restore the current user.
             httpContextAccessor.HttpContext.User = userPrincipal;
-            
+
             // Here the 'IActionContextAccessor.ActionContext' need to be cleared, this 'AsyncLocal'
             // field is not cleared by 'AspnetCore' and still references the previous 'HttpContext'.
             var actionContextAccessor = scope.ServiceProvider.GetService<IActionContextAccessor>();
diff --git a/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskAttribute.cs b/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskAttribute.cs
index 903a3a53f22..da5cc237dff 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskAttribute.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskAttribute.cs
@@ -1,46 +1,45 @@
 using System;
 
-namespace OrchardCore.BackgroundTasks
+namespace OrchardCore.BackgroundTasks;
+
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+public sealed class BackgroundTaskAttribute : Attribute
 {
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
-    public sealed class BackgroundTaskAttribute : Attribute
-    {
-        /// <summary>
-        /// The display name of this background task.
-        /// </summary>
-        public string Title { get; set; }
-
-        /// <summary>
-        /// Whether this background task is enabled or not.
-        /// </summary>
-        public bool Enable { get; set; } = true;
-
-        /// <summary>
-        /// The background task schedule as a cron expression.
-        /// </summary>
-        public string Schedule { get; set; } = "*/5 * * * *";
-
-        /// <summary>
-        /// The description of this background task.
-        /// </summary>
-        public string Description { get; set; } = string.Empty;
-
-        /// <summary>
-        /// The timeout in milliseconds to acquire a lock before executing the task atomically.
-        /// There is no locking if equal to zero or if there is no registered distributed lock.
-        /// </summary>
-        public int LockTimeout { get; set; }
-
-        /// <summary>
-        /// The expiration in milliseconds of the lock acquired before executing the task atomically.
-        /// There is no locking if equal to zero or if there is no registered distributed lock.
-        /// </summary>
-        public int LockExpiration { get; set; }
-
-        /// <summary>
-        /// Whether or not the pipeline should be built to configure endpoints
-        /// and then executed to allow route urls generation in the background.
-        /// </summary>
-        public bool UsePipeline { get; set; }
-    }
+    /// <summary>
+    /// The display name of this background task.
+    /// </summary>
+    public string Title { get; set; }
+
+    /// <summary>
+    /// Whether this background task is enabled or not.
+    /// </summary>
+    public bool Enable { get; set; } = true;
+
+    /// <summary>
+    /// The background task schedule as a cron expression.
+    /// </summary>
+    public string Schedule { get; set; } = "*/5 * * * *";
+
+    /// <summary>
+    /// The description of this background task.
+    /// </summary>
+    public string Description { get; set; } = string.Empty;
+
+    /// <summary>
+    /// The timeout in milliseconds to acquire a lock before executing the task atomically.
+    /// There is no locking if equal to zero or if there is no registered distributed lock.
+    /// </summary>
+    public int LockTimeout { get; set; }
+
+    /// <summary>
+    /// The expiration in milliseconds of the lock acquired before executing the task atomically.
+    /// There is no locking if equal to zero or if there is no registered distributed lock.
+    /// </summary>
+    public int LockExpiration { get; set; }
+
+    /// <summary>
+    /// Whether or not the pipeline should be built to configure endpoints
+    /// and then executed to allow route urls generation in the background.
+    /// </summary>
+    public bool UsePipeline { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskEventContext.cs b/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskEventContext.cs
index 9473cb5da35..d45b5826b9f 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskEventContext.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskEventContext.cs
@@ -1,21 +1,20 @@
 using System;
 using OrchardCore.Environment.Shell.Scope;
 
-namespace OrchardCore.BackgroundTasks
+namespace OrchardCore.BackgroundTasks;
+
+public class BackgroundTaskEventContext
 {
-    public class BackgroundTaskEventContext
+    public BackgroundTaskEventContext(string name, ShellScope scope)
     {
-        public BackgroundTaskEventContext(string name, ShellScope scope)
-        {
-            Name = name;
-            Tenant = scope.ShellContext.Settings.Name;
-            Services = scope.ServiceProvider;
-        }
-
-        public string Name { get; }
-        public string Tenant { get; }
-        public IServiceProvider Services { get; }
-        public Exception Exception { get; set; }
-        public bool HasException => Exception != null;
+        Name = name;
+        Tenant = scope.ShellContext.Settings.Name;
+        Services = scope.ServiceProvider;
     }
+
+    public string Name { get; }
+    public string Tenant { get; }
+    public IServiceProvider Services { get; }
+    public Exception Exception { get; set; }
+    public bool HasException => Exception != null;
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskExtensions.cs
index 18ccbca6b90..00462b3f70f 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskExtensions.cs
@@ -2,40 +2,39 @@
 using System.Linq;
 using System.Reflection;
 
-namespace OrchardCore.BackgroundTasks
+namespace OrchardCore.BackgroundTasks;
+
+public static class BackgroundTaskExtensions
 {
-    public static class BackgroundTaskExtensions
+    public static BackgroundTaskSettings GetDefaultSettings(this IBackgroundTask task)
     {
-        public static BackgroundTaskSettings GetDefaultSettings(this IBackgroundTask task)
-        {
-            var technicalName = task.GetTaskName();
+        var technicalName = task.GetTaskName();
 
-            var attribute = task.GetType().GetCustomAttribute<BackgroundTaskAttribute>();
-            if (attribute != null)
-            {
-                return new BackgroundTaskSettings
-                {
-                    Name = technicalName,
-                    Title = !string.IsNullOrWhiteSpace(attribute.Title) ? attribute.Title : technicalName,
-                    Enable = attribute.Enable,
-                    Schedule = attribute.Schedule,
-                    Description = attribute.Description,
-                    LockTimeout = attribute.LockTimeout,
-                    LockExpiration = attribute.LockExpiration,
-                    UsePipeline = attribute.UsePipeline,
-                };
-            }
-
-            return new BackgroundTaskSettings()
+        var attribute = task.GetType().GetCustomAttribute<BackgroundTaskAttribute>();
+        if (attribute != null)
+        {
+            return new BackgroundTaskSettings
             {
                 Name = technicalName,
-                Title = technicalName,
+                Title = !string.IsNullOrWhiteSpace(attribute.Title) ? attribute.Title : technicalName,
+                Enable = attribute.Enable,
+                Schedule = attribute.Schedule,
+                Description = attribute.Description,
+                LockTimeout = attribute.LockTimeout,
+                LockExpiration = attribute.LockExpiration,
+                UsePipeline = attribute.UsePipeline,
             };
         }
 
-        public static IBackgroundTask GetTaskByName(this IEnumerable<IBackgroundTask> tasks, string name)
-            => tasks.LastOrDefault(task => task.GetTaskName() == name);
-
-        public static string GetTaskName(this IBackgroundTask task) => task.GetType().FullName;
+        return new BackgroundTaskSettings()
+        {
+            Name = technicalName,
+            Title = technicalName,
+        };
     }
+
+    public static IBackgroundTask GetTaskByName(this IEnumerable<IBackgroundTask> tasks, string name)
+        => tasks.LastOrDefault(task => task.GetTaskName() == name);
+
+    public static string GetTaskName(this IBackgroundTask task) => task.GetType().FullName;
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskSettings.cs b/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskSettings.cs
index b3fe84a54a1..918ee7b9200 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskSettings.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskSettings.cs
@@ -1,54 +1,53 @@
-namespace OrchardCore.BackgroundTasks
+namespace OrchardCore.BackgroundTasks;
+
+public class BackgroundTaskSettings
 {
-    public class BackgroundTaskSettings
-    {
-        /// <summary>
-        /// The name of this background task.
-        /// </summary>
-        public string Name { get; set; } = string.Empty;
-
-        /// <summary>
-        /// The display name of this background task.
-        /// </summary>
-        public string Title { get; set; }
-
-        /// <summary>
-        /// Whether this background task is enabled or not.
-        /// </summary>
-        public bool Enable { get; set; } = true;
-
-        /// <summary>
-        /// The background task schedule as a cron expression.
-        /// </summary>
-        public string Schedule { get; set; } = "* * * * *";
-
-        /// <summary>
-        /// The description of this background task.
-        /// </summary>
-        public string Description { get; set; } = string.Empty;
-
-        /// <summary>
-        /// The timeout in milliseconds to acquire a lock before executing the task atomically.
-        /// There is no locking if equal to zero or if there is no registered distributed lock.
-        /// </summary>
-        public int LockTimeout { get; set; }
-
-        /// <summary>
-        /// The expiration in milliseconds of the lock acquired before executing the task atomically.
-        /// There is no locking if equal to zero or if there is no registered distributed lock.
-        /// </summary>
-        public int LockExpiration { get; set; }
-
-        /// <summary>
-        /// Whether or not the pipeline should be built to configure endpoints
-        /// and then executed to allow route urls generation in the background.
-        /// </summary>
-        public bool UsePipeline { get; set; }
-
-        /// <summary>
-        /// Whether this background task is atomic or not, it is atomic if both
-        /// the lock timeout and the lock expiration time are greater than zero.
-        /// </summary>
-        public bool IsAtomic => LockTimeout > 0 && LockExpiration > 0;
-    }
+    /// <summary>
+    /// The name of this background task.
+    /// </summary>
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>
+    /// The display name of this background task.
+    /// </summary>
+    public string Title { get; set; }
+
+    /// <summary>
+    /// Whether this background task is enabled or not.
+    /// </summary>
+    public bool Enable { get; set; } = true;
+
+    /// <summary>
+    /// The background task schedule as a cron expression.
+    /// </summary>
+    public string Schedule { get; set; } = "* * * * *";
+
+    /// <summary>
+    /// The description of this background task.
+    /// </summary>
+    public string Description { get; set; } = string.Empty;
+
+    /// <summary>
+    /// The timeout in milliseconds to acquire a lock before executing the task atomically.
+    /// There is no locking if equal to zero or if there is no registered distributed lock.
+    /// </summary>
+    public int LockTimeout { get; set; }
+
+    /// <summary>
+    /// The expiration in milliseconds of the lock acquired before executing the task atomically.
+    /// There is no locking if equal to zero or if there is no registered distributed lock.
+    /// </summary>
+    public int LockExpiration { get; set; }
+
+    /// <summary>
+    /// Whether or not the pipeline should be built to configure endpoints
+    /// and then executed to allow route urls generation in the background.
+    /// </summary>
+    public bool UsePipeline { get; set; }
+
+    /// <summary>
+    /// Whether this background task is atomic or not, it is atomic if both
+    /// the lock timeout and the lock expiration time are greater than zero.
+    /// </summary>
+    public bool IsAtomic => LockTimeout > 0 && LockExpiration > 0;
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskState.cs b/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskState.cs
index f4320d449b6..8a93c16ba37 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskState.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/BackgroundTaskState.cs
@@ -1,10 +1,9 @@
 using System;
 
-namespace OrchardCore.BackgroundTasks
+namespace OrchardCore.BackgroundTasks;
+
+public class BackgroundTaskState
 {
-    public class BackgroundTaskState
-    {
-        public string Name { get; set; }
-        public DateTime LastStartTime { get; set; }
-    }
+    public string Name { get; set; }
+    public DateTime LastStartTime { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/DistributedLockExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/DistributedLockExtensions.cs
index aea9083cb65..2ac9fd32c6c 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/DistributedLockExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/DistributedLockExtensions.cs
@@ -3,24 +3,23 @@
 using OrchardCore.Locking;
 using OrchardCore.Locking.Distributed;
 
-namespace OrchardCore.BackgroundTasks
+namespace OrchardCore.BackgroundTasks;
+
+public static class DistributedLockExtensions
 {
-    public static class DistributedLockExtensions
+    /// <summary>
+    /// Tries to acquire a lock on the background task if it is atomic and if the lock service is not a local lock, otherwise returns true with a null locker.
+    /// </summary>
+    public static Task<(ILocker locker, bool locked)> TryAcquireBackgroundTaskLockAsync(this IDistributedLock distributedLock, BackgroundTaskSettings settings)
     {
-        /// <summary>
-        /// Tries to acquire a lock on the background task if it is atomic and if the lock service is not a local lock, otherwise returns true with a null locker.
-        /// </summary>
-        public static Task<(ILocker locker, bool locked)> TryAcquireBackgroundTaskLockAsync(this IDistributedLock distributedLock, BackgroundTaskSettings settings)
+        if (distributedLock is ILocalLock || !settings.IsAtomic)
         {
-            if (distributedLock is ILocalLock || !settings.IsAtomic)
-            {
-                return Task.FromResult<(ILocker, bool)>((null, true));
-            }
-
-            return distributedLock.TryAcquireLockAsync(
-                settings.Name + "_LOCK",
-                TimeSpan.FromMilliseconds(settings.LockTimeout),
-                TimeSpan.FromMilliseconds(settings.LockExpiration));
+            return Task.FromResult<(ILocker, bool)>((null, true));
         }
+
+        return distributedLock.TryAcquireLockAsync(
+            settings.Name + "_LOCK",
+            TimeSpan.FromMilliseconds(settings.LockTimeout),
+            TimeSpan.FromMilliseconds(settings.LockExpiration));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/IBackgroundTask.cs b/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/IBackgroundTask.cs
index 0ea7bd14898..7287892fe5b 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/IBackgroundTask.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/IBackgroundTask.cs
@@ -2,10 +2,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace OrchardCore.BackgroundTasks
+namespace OrchardCore.BackgroundTasks;
+
+public interface IBackgroundTask
 {
-    public interface IBackgroundTask
-    {
-        Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken);
-    }
+    Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/IBackgroundTaskEventHandler.cs b/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/IBackgroundTaskEventHandler.cs
index 58eb787590d..82262e6f530 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/IBackgroundTaskEventHandler.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/IBackgroundTaskEventHandler.cs
@@ -1,22 +1,21 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace OrchardCore.BackgroundTasks
+namespace OrchardCore.BackgroundTasks;
+
+/// <summary>
+/// Provides methods that get called around the execution of any <see cref="IBackgroundTask"/>.
+/// Implement this interface to hook into background task execution.
+/// </summary>
+public interface IBackgroundTaskEventHandler
 {
     /// <summary>
-    /// Provides methods that get called around the execution of any <see cref="IBackgroundTask"/>.
-    /// Implement this interface to hook into background task execution.
+    /// This method get called just before the execution of any <see cref="IBackgroundTask"/>.
     /// </summary>
-    public interface IBackgroundTaskEventHandler
-    {
-        /// <summary>
-        /// This method get called just before the execution of any <see cref="IBackgroundTask"/>.
-        /// </summary>
-        Task ExecutingAsync(BackgroundTaskEventContext context, CancellationToken cancellationToken);
+    Task ExecutingAsync(BackgroundTaskEventContext context, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// This method get called just after the execution of any <see cref="IBackgroundTask"/>.
-        /// </summary>
-        Task ExecutedAsync(BackgroundTaskEventContext context, CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// This method get called just after the execution of any <see cref="IBackgroundTask"/>.
+    /// </summary>
+    Task ExecutedAsync(BackgroundTaskEventContext context, CancellationToken cancellationToken);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/IBackgroundTaskSettingsProvider.cs b/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/IBackgroundTaskSettingsProvider.cs
index de177457152..49adcc0a8ac 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/IBackgroundTaskSettingsProvider.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/BackgroundTasks/IBackgroundTaskSettingsProvider.cs
@@ -1,11 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Primitives;
 
-namespace OrchardCore.BackgroundTasks
+namespace OrchardCore.BackgroundTasks;
+
+public interface IBackgroundTaskSettingsProvider
 {
-    public interface IBackgroundTaskSettingsProvider
-    {
-        IChangeToken ChangeToken { get; }
-        Task<BackgroundTaskSettings> GetSettingsAsync(IBackgroundTask task);
-    }
+    IChangeToken ChangeToken { get; }
+    Task<BackgroundTaskSettings> GetSettingsAsync(IBackgroundTask task);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Caching/Distributed/IMessageBus.cs b/src/OrchardCore/OrchardCore.Abstractions/Caching/Distributed/IMessageBus.cs
index 11ac12426b1..a80921df51e 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Caching/Distributed/IMessageBus.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Caching/Distributed/IMessageBus.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Caching.Distributed
+namespace OrchardCore.Caching.Distributed;
+
+public interface IMessageBus
 {
-    public interface IMessageBus
-    {
-        Task SubscribeAsync(string channel, Action<string, string> handler);
-        Task PublishAsync(string channel, string message);
-    }
+    Task SubscribeAsync(string channel, Action<string, string> handler);
+    Task PublishAsync(string channel, string message);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Caching/ISignal.cs b/src/OrchardCore/OrchardCore.Abstractions/Caching/ISignal.cs
index 38e675567bb..d608b31b748 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Caching/ISignal.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Caching/ISignal.cs
@@ -3,22 +3,21 @@
 using OrchardCore.Environment.Shell.Scope;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Environment.Cache
+namespace OrchardCore.Environment.Cache;
+
+public interface ISignal : IModularTenantEvents
 {
-    public interface ISignal : IModularTenantEvents
-    {
-        IChangeToken GetToken(string key);
-        Task SignalTokenAsync(string key);
-    }
+    IChangeToken GetToken(string key);
+    Task SignalTokenAsync(string key);
+}
 
-    public static class SignalExtensions
+public static class SignalExtensions
+{
+    /// <summary>
+    /// Adds a Signal (if not already present) to be sent at the end of the shell scope.
+    /// </summary>
+    public static void DeferredSignalToken(this ISignal _, string key)
     {
-        /// <summary>
-        /// Adds a Signal (if not already present) to be sent at the end of the shell scope.
-        /// </summary>
-        public static void DeferredSignalToken(this ISignal _, string key)
-        {
-            ShellScope.AddDeferredSignal(key);
-        }
+        ShellScope.AddDeferredSignal(key);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Extensions/ExtensionEntry.cs b/src/OrchardCore/OrchardCore.Abstractions/Extensions/ExtensionEntry.cs
index 354726cbe2d..f39e1719353 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Extensions/ExtensionEntry.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Extensions/ExtensionEntry.cs
@@ -2,13 +2,12 @@
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace OrchardCore.Environment.Extensions
+namespace OrchardCore.Environment.Extensions;
+
+public class ExtensionEntry
 {
-    public class ExtensionEntry
-    {
-        public IExtensionInfo ExtensionInfo { get; set; }
-        public Assembly Assembly { get; set; }
-        public IEnumerable<Type> ExportedTypes { get; set; }
-        public bool IsError { get; set; }
-    }
+    public IExtensionInfo ExtensionInfo { get; set; }
+    public Assembly Assembly { get; set; }
+    public IEnumerable<Type> ExportedTypes { get; set; }
+    public bool IsError { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Extensions/ExtensionsEnvironmentExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/Extensions/ExtensionsEnvironmentExtensions.cs
index 6a38a11bb9b..55c3ad8787c 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Extensions/ExtensionsEnvironmentExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Extensions/ExtensionsEnvironmentExtensions.cs
@@ -2,17 +2,16 @@
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
 
-namespace OrchardCore.Environment.Extensions
+namespace OrchardCore.Environment.Extensions;
+
+public static class ExtensionsEnvironmentExtensions
 {
-    public static class ExtensionsEnvironmentExtensions
+    public static IFileInfo GetExtensionFileInfo(
+        this IHostEnvironment environment,
+        IExtensionInfo extensionInfo,
+        string subPath)
     {
-        public static IFileInfo GetExtensionFileInfo(
-            this IHostEnvironment environment,
-            IExtensionInfo extensionInfo,
-            string subPath)
-        {
-            return environment.ContentRootFileProvider.GetFileInfo(
-                Path.Combine(extensionInfo.SubPath, subPath));
-        }
+        return environment.ContentRootFileProvider.GetFileInfo(
+            Path.Combine(extensionInfo.SubPath, subPath));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/IFeatureBuilderEvents.cs b/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/IFeatureBuilderEvents.cs
index f4f78142016..131a9fd23cb 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/IFeatureBuilderEvents.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/IFeatureBuilderEvents.cs
@@ -1,36 +1,35 @@
-namespace OrchardCore.Environment.Extensions.Features
+namespace OrchardCore.Environment.Extensions.Features;
+
+public interface IFeatureBuilderEvents
 {
-    public interface IFeatureBuilderEvents
-    {
-        void Building(FeatureBuildingContext context);
+    void Building(FeatureBuildingContext context);
 
-        void Built(IFeatureInfo featureInfo);
-    }
+    void Built(IFeatureInfo featureInfo);
+}
 
-    public class FeatureBuildingContext
-    {
-        public IManifestInfo ManifestInfo { get; set; }
-        public IExtensionInfo ExtensionInfo { get; set; }
+public class FeatureBuildingContext
+{
+    public IManifestInfo ManifestInfo { get; set; }
+    public IExtensionInfo ExtensionInfo { get; set; }
 
-        public string FeatureId { get; set; }
-        public string FeatureName { get; set; }
-        public int Priority { get; set; }
-        public string Category { get; set; }
-        public string Description { get; set; }
-        public string[] FeatureDependencyIds { get; set; }
-        public bool DefaultTenantOnly { get; set; }
-        public bool IsAlwaysEnabled { get; set; }
-        public bool EnabledByDependencyOnly { get; set; }
-    }
+    public string FeatureId { get; set; }
+    public string FeatureName { get; set; }
+    public int Priority { get; set; }
+    public string Category { get; set; }
+    public string Description { get; set; }
+    public string[] FeatureDependencyIds { get; set; }
+    public bool DefaultTenantOnly { get; set; }
+    public bool IsAlwaysEnabled { get; set; }
+    public bool EnabledByDependencyOnly { get; set; }
+}
 
-    public abstract class FeatureBuilderEvents : IFeatureBuilderEvents
+public abstract class FeatureBuilderEvents : IFeatureBuilderEvents
+{
+    public virtual void Building(FeatureBuildingContext context)
     {
-        public virtual void Building(FeatureBuildingContext context)
-        {
-        }
+    }
 
-        public virtual void Built(IFeatureInfo featureInfo)
-        {
-        }
+    public virtual void Built(IFeatureInfo featureInfo)
+    {
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/IFeatureHash.cs b/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/IFeatureHash.cs
index 2c71fbda279..68dbfb0e123 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/IFeatureHash.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/IFeatureHash.cs
@@ -1,31 +1,30 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Environment.Extensions.Features
+namespace OrchardCore.Environment.Extensions.Features;
+
+/// <summary>
+/// An implementation of this interface provide efficient access to the state
+/// of the enabled feature in order to provide hashes used for caching.
+/// Because its state should be cached, the instance should not have any state
+/// thus is declared as transient.
+/// </summary>
+public interface IFeatureHash
 {
     /// <summary>
-    /// An implementation of this interface provide efficient access to the state
-    /// of the enabled feature in order to provide hashes used for caching.
-    /// Because its state should be cached, the instance should not have any state
-    /// thus is declared as transient.
+    /// Returns a serial number representing the list of available features for the current tenant.
     /// </summary>
-    public interface IFeatureHash
-    {
-        /// <summary>
-        /// Returns a serial number representing the list of available features for the current tenant.
-        /// </summary>
-        /// <returns>
-        /// An <see cref="int"/> value that changes every time the list of features changes.
-        /// The implementation is efficient in order to be called frequently.
-        /// </returns>
-        Task<int> GetFeatureHashAsync();
+    /// <returns>
+    /// An <see cref="int"/> value that changes every time the list of features changes.
+    /// The implementation is efficient in order to be called frequently.
+    /// </returns>
+    Task<int> GetFeatureHashAsync();
 
-        /// <summary>
-        /// Returns a serial number representing the list of available features for the current tenant.
-        /// </summary>
-        /// <returns>
-        /// A <see cref="int"/> value that changes every time a specific feature is enabled.
-        /// The implementation is efficient in order to be called frequently.
-        /// </returns>
-        Task<int> GetFeatureHashAsync(string featureId);
-    }
+    /// <summary>
+    /// Returns a serial number representing the list of available features for the current tenant.
+    /// </summary>
+    /// <returns>
+    /// A <see cref="int"/> value that changes every time a specific feature is enabled.
+    /// The implementation is efficient in order to be called frequently.
+    /// </returns>
+    Task<int> GetFeatureHashAsync(string featureId);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/IFeatureInfo.cs b/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/IFeatureInfo.cs
index 8ad05df8b9a..aa4fdbbcff1 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/IFeatureInfo.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/IFeatureInfo.cs
@@ -1,16 +1,15 @@
-namespace OrchardCore.Environment.Extensions.Features
+namespace OrchardCore.Environment.Extensions.Features;
+
+public interface IFeatureInfo
 {
-    public interface IFeatureInfo
-    {
-        string Id { get; }
-        string Name { get; }
-        int Priority { get; }
-        string Category { get; }
-        string Description { get; }
-        bool DefaultTenantOnly { get; }
-        IExtensionInfo Extension { get; }
-        string[] Dependencies { get; }
-        bool IsAlwaysEnabled { get; }
-        bool EnabledByDependencyOnly { get; }
-    }
+    string Id { get; }
+    string Name { get; }
+    int Priority { get; }
+    string Category { get; }
+    string Description { get; }
+    bool DefaultTenantOnly { get; }
+    IExtensionInfo Extension { get; }
+    string[] Dependencies { get; }
+    bool IsAlwaysEnabled { get; }
+    bool EnabledByDependencyOnly { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/IFeaturesProvider.cs b/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/IFeaturesProvider.cs
index 4db3f7b6ced..f1e21968958 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/IFeaturesProvider.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/IFeaturesProvider.cs
@@ -1,20 +1,19 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Environment.Extensions.Features
+namespace OrchardCore.Environment.Extensions.Features;
+
+/// <summary>
+/// Provides opportunities to work with the Module Feature set.
+/// </summary>
+public interface IFeaturesProvider
 {
     /// <summary>
-    /// Provides opportunities to work with the Module Feature set.
+    /// Returns the Features corresponding with the Extension, Manifest, etc.
     /// </summary>
-    public interface IFeaturesProvider
-    {
-        /// <summary>
-        /// Returns the Features corresponding with the Extension, Manifest, etc.
-        /// </summary>
-        /// <param name="extensionInfo"></param>
-        /// <param name="manifestInfo"></param>
-        /// <returns></returns>
-        IEnumerable<IFeatureInfo> GetFeatures(
-            IExtensionInfo extensionInfo,
-            IManifestInfo manifestInfo);
-    }
+    /// <param name="extensionInfo"></param>
+    /// <param name="manifestInfo"></param>
+    /// <returns></returns>
+    IEnumerable<IFeatureInfo> GetFeatures(
+        IExtensionInfo extensionInfo,
+        IManifestInfo manifestInfo);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/ITypeFeatureProvider.cs b/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/ITypeFeatureProvider.cs
index 850de1357f1..d9abb1c2e56 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/ITypeFeatureProvider.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Extensions/Features/ITypeFeatureProvider.cs
@@ -2,45 +2,44 @@
 using System.Collections.Generic;
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.Environment.Extensions
+namespace OrchardCore.Environment.Extensions;
+
+/// <summary>
+/// An implementation of this service is able to provide the <see cref="IFeatureInfo"/> that
+/// any services was harvested from.
+/// </summary>
+public interface ITypeFeatureProvider
 {
     /// <summary>
-    /// An implementation of this service is able to provide the <see cref="IFeatureInfo"/> that
-    /// any services was harvested from.
+    /// Gets the extension for the specified dependent type.
     /// </summary>
-    public interface ITypeFeatureProvider
-    {
-        /// <summary>
-        /// Gets the extension for the specified dependent type.
-        /// </summary>
-        IExtensionInfo GetExtensionForDependency(Type dependency);
+    IExtensionInfo GetExtensionForDependency(Type dependency);
 
-        /// <summary>
-        /// Gets the first feature for the specified dependent type.
-        /// </summary>
-        /// <remarks>
-        /// If a type has been registered for more than one feature,
-        /// <see cref="GetFeatureForDependency"/> returns the first feature that has
-        /// the same ID as the parent extension.
-        /// Use this method when you only need one feature of a module, such
-        /// as when applying migrations for the entire module as opposed to
-        /// functionality of individual features.
-        /// </remarks>
-        IFeatureInfo GetFeatureForDependency(Type dependency);
+    /// <summary>
+    /// Gets the first feature for the specified dependent type.
+    /// </summary>
+    /// <remarks>
+    /// If a type has been registered for more than one feature,
+    /// <see cref="GetFeatureForDependency"/> returns the first feature that has
+    /// the same ID as the parent extension.
+    /// Use this method when you only need one feature of a module, such
+    /// as when applying migrations for the entire module as opposed to
+    /// functionality of individual features.
+    /// </remarks>
+    IFeatureInfo GetFeatureForDependency(Type dependency);
 
-        /// <summary>
-        /// Gets all features for the specified dependent type.
-        /// </summary>
-        IEnumerable<IFeatureInfo> GetFeaturesForDependency(Type dependency);
+    /// <summary>
+    /// Gets all features for the specified dependent type.
+    /// </summary>
+    IEnumerable<IFeatureInfo> GetFeaturesForDependency(Type dependency);
 
-        /// <summary>
-        /// Gets all dependent types for the specified feature.
-        /// </summary>
-        IEnumerable<Type> GetTypesForFeature(IFeatureInfo feature);
+    /// <summary>
+    /// Gets all dependent types for the specified feature.
+    /// </summary>
+    IEnumerable<Type> GetTypesForFeature(IFeatureInfo feature);
 
-        /// <summary>
-        /// Adds a type to the specified feature.
-        /// </summary>
-        void TryAdd(Type type, IFeatureInfo feature);
-    }
+    /// <summary>
+    /// Adds a type to the specified feature.
+    /// </summary>
+    void TryAdd(Type type, IFeatureInfo feature);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Extensions/IExtensionDependencyStrategy.cs b/src/OrchardCore/OrchardCore.Abstractions/Extensions/IExtensionDependencyStrategy.cs
index 3d45f427f00..ba2b552447b 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Extensions/IExtensionDependencyStrategy.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Extensions/IExtensionDependencyStrategy.cs
@@ -1,9 +1,8 @@
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.Environment.Extensions
+namespace OrchardCore.Environment.Extensions;
+
+public interface IExtensionDependencyStrategy
 {
-    public interface IExtensionDependencyStrategy
-    {
-        bool HasDependency(IFeatureInfo observer, IFeatureInfo subject);
-    }
+    bool HasDependency(IFeatureInfo observer, IFeatureInfo subject);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Extensions/IExtensionInfo.cs b/src/OrchardCore/OrchardCore.Abstractions/Extensions/IExtensionInfo.cs
index 82ecc27296d..2fc53bbedc5 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Extensions/IExtensionInfo.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Extensions/IExtensionInfo.cs
@@ -1,33 +1,32 @@
 using System.Collections.Generic;
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.Environment.Extensions
+namespace OrchardCore.Environment.Extensions;
+
+public interface IExtensionInfo
 {
-    public interface IExtensionInfo
-    {
-        /// <summary>
-        /// The id of the extension.
-        /// </summary>
-        string Id { get; }
+    /// <summary>
+    /// The id of the extension.
+    /// </summary>
+    string Id { get; }
 
-        /// <summary>
-        /// The path to the extension.
-        /// </summary>
-        string SubPath { get; }
+    /// <summary>
+    /// The path to the extension.
+    /// </summary>
+    string SubPath { get; }
 
-        /// <summary>
-        /// The manifest info of the extension.
-        /// </summary>
-        IManifestInfo Manifest { get; }
+    /// <summary>
+    /// The manifest info of the extension.
+    /// </summary>
+    IManifestInfo Manifest { get; }
 
-        /// <summary>
-        /// List of features in extension.
-        /// </summary>
-        IEnumerable<IFeatureInfo> Features { get; }
+    /// <summary>
+    /// List of features in extension.
+    /// </summary>
+    IEnumerable<IFeatureInfo> Features { get; }
 
-        /// <summary>
-        /// Whether this extension info exists.
-        /// </summary>
-        bool Exists { get; }
-    }
+    /// <summary>
+    /// Whether this extension info exists.
+    /// </summary>
+    bool Exists { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Extensions/IExtensionManager.cs b/src/OrchardCore/OrchardCore.Abstractions/Extensions/IExtensionManager.cs
index c34fb79ef04..56f748af4fa 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Extensions/IExtensionManager.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Extensions/IExtensionManager.cs
@@ -2,19 +2,18 @@
 using System.Threading.Tasks;
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.Environment.Extensions
+namespace OrchardCore.Environment.Extensions;
+
+public interface IExtensionManager
 {
-    public interface IExtensionManager
-    {
-        IExtensionInfo GetExtension(string extensionId);
-        IEnumerable<IExtensionInfo> GetExtensions();
-        Task<ExtensionEntry> LoadExtensionAsync(IExtensionInfo extensionInfo);
+    IExtensionInfo GetExtension(string extensionId);
+    IEnumerable<IExtensionInfo> GetExtensions();
+    Task<ExtensionEntry> LoadExtensionAsync(IExtensionInfo extensionInfo);
 
-        IEnumerable<IFeatureInfo> GetFeatures();
-        IEnumerable<IFeatureInfo> GetFeatures(string[] featureIdsToLoad);
-        IEnumerable<IFeatureInfo> GetFeatureDependencies(string featureId);
-        IEnumerable<IFeatureInfo> GetDependentFeatures(string featureId);
-        Task<IEnumerable<IFeatureInfo>> LoadFeaturesAsync();
-        Task<IEnumerable<IFeatureInfo>> LoadFeaturesAsync(string[] featureIdsToLoad);
-    }
+    IEnumerable<IFeatureInfo> GetFeatures();
+    IEnumerable<IFeatureInfo> GetFeatures(string[] featureIdsToLoad);
+    IEnumerable<IFeatureInfo> GetFeatureDependencies(string featureId);
+    IEnumerable<IFeatureInfo> GetDependentFeatures(string featureId);
+    Task<IEnumerable<IFeatureInfo>> LoadFeaturesAsync();
+    Task<IEnumerable<IFeatureInfo>> LoadFeaturesAsync(string[] featureIdsToLoad);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Extensions/IExtensionPriorityStrategy.cs b/src/OrchardCore/OrchardCore.Abstractions/Extensions/IExtensionPriorityStrategy.cs
index 43b534b19c9..00d2703f31f 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Extensions/IExtensionPriorityStrategy.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Extensions/IExtensionPriorityStrategy.cs
@@ -1,9 +1,8 @@
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.Environment.Extensions
+namespace OrchardCore.Environment.Extensions;
+
+public interface IExtensionPriorityStrategy
 {
-    public interface IExtensionPriorityStrategy
-    {
-        int GetPriority(IFeatureInfo feature);
-    }
+    int GetPriority(IFeatureInfo feature);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Extensions/Manifests/IManifestInfo.cs b/src/OrchardCore/OrchardCore.Abstractions/Extensions/Manifests/IManifestInfo.cs
index d5419a210f9..c99d6ecaf8c 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Extensions/Manifests/IManifestInfo.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Extensions/Manifests/IManifestInfo.cs
@@ -1,18 +1,17 @@
 using System.Collections.Generic;
 using OrchardCore.Modules.Manifest;
 
-namespace OrchardCore.Environment.Extensions
+namespace OrchardCore.Environment.Extensions;
+
+public interface IManifestInfo
 {
-    public interface IManifestInfo
-    {
-        bool Exists { get; }
-        string Name { get; }
-        string Description { get; }
-        string Type { get; }
-        string Author { get; }
-        string Website { get; }
-        string Version { get; }
-        IEnumerable<string> Tags { get; }
-        ModuleAttribute ModuleInfo { get; }
-    }
+    bool Exists { get; }
+    string Name { get; }
+    string Description { get; }
+    string Type { get; }
+    string Author { get; }
+    string Website { get; }
+    string Version { get; }
+    IEnumerable<string> Tags { get; }
+    ModuleAttribute ModuleInfo { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Extensions/Manifests/NotFoundManifestInfo.cs b/src/OrchardCore/OrchardCore.Abstractions/Extensions/Manifests/NotFoundManifestInfo.cs
index d08771819f1..c1204083bfd 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Extensions/Manifests/NotFoundManifestInfo.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Extensions/Manifests/NotFoundManifestInfo.cs
@@ -1,18 +1,17 @@
 using System.Collections.Generic;
 using OrchardCore.Modules.Manifest;
 
-namespace OrchardCore.Environment.Extensions.Manifests
+namespace OrchardCore.Environment.Extensions.Manifests;
+
+public class NotFoundManifestInfo : IManifestInfo
 {
-    public class NotFoundManifestInfo : IManifestInfo
-    {
-        public bool Exists => false;
-        public string Name => null;
-        public string Description => null;
-        public string Type => null;
-        public string Author => null;
-        public string Website => null;
-        public string Version => null;
-        public IEnumerable<string> Tags => [];
-        public ModuleAttribute ModuleInfo => null;
-    }
+    public bool Exists => false;
+    public string Name => null;
+    public string Description => null;
+    public string Type => null;
+    public string Author => null;
+    public string Website => null;
+    public string Version => null;
+    public IEnumerable<string> Tags => [];
+    public ModuleAttribute ModuleInfo => null;
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Extensions/NotFoundExtensionInfo.cs b/src/OrchardCore/OrchardCore.Abstractions/Extensions/NotFoundExtensionInfo.cs
index b8158cb5d5a..d0ecd9b5df4 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Extensions/NotFoundExtensionInfo.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Extensions/NotFoundExtensionInfo.cs
@@ -3,22 +3,21 @@
 using OrchardCore.Environment.Extensions.Manifests;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Environment.Extensions
+namespace OrchardCore.Environment.Extensions;
+
+public class NotFoundExtensionInfo : IExtensionInfo
 {
-    public class NotFoundExtensionInfo : IExtensionInfo
+    public NotFoundExtensionInfo(string extensionId)
     {
-        public NotFoundExtensionInfo(string extensionId)
-        {
-            Id = extensionId;
-            SubPath = Application.ModulesRoot + extensionId;
-            Manifest = new NotFoundManifestInfo();
-            Features = [];
-        }
-
-        public string Id { get; }
-        public string SubPath { get; }
-        public IManifestInfo Manifest { get; }
-        public IEnumerable<IFeatureInfo> Features { get; }
-        public bool Exists => false;
+        Id = extensionId;
+        SubPath = Application.ModulesRoot + extensionId;
+        Manifest = new NotFoundManifestInfo();
+        Features = [];
     }
+
+    public string Id { get; }
+    public string SubPath { get; }
+    public IManifestInfo Manifest { get; }
+    public IEnumerable<IFeatureInfo> Features { get; }
+    public bool Exists => false;
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Extensions/Utility/DependencyOrdering.cs b/src/OrchardCore/OrchardCore.Abstractions/Extensions/Utility/DependencyOrdering.cs
index 056b085b691..dab555c8e2a 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Extensions/Utility/DependencyOrdering.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Extensions/Utility/DependencyOrdering.cs
@@ -2,95 +2,94 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OrchardCore.Environment.Extensions.Utility
+namespace OrchardCore.Environment.Extensions.Utility;
+
+public static class DependencyOrdering
 {
-    public static class DependencyOrdering
+    private sealed class Node<T>
+    {
+        public T Item { get; set; }
+        public bool Used { get; set; }
+    }
+
+    /// <summary>
+    /// Linearizes a dependency graph so that items are positioned after their dependencies.
+    /// This by using a function which determines if an item has a direct dependency on another.
+    /// Then, items are moved up whenever it is possible without breaking the dependency graph.
+    /// This by using a function which gives for each item a priority used as an order value.
+    /// </summary>
+    public static IEnumerable<T> OrderByDependenciesAndPriorities<T>(this IEnumerable<T> items, Func<T, T, bool> hasDependency, Func<T, int> getPriority)
     {
-        private sealed class Node<T>
+        var nodes = items.Select(i => new Node<T> { Item = i }).ToArray();
+
+        var result = new List<T>();
+        foreach (var node in nodes)
         {
-            public T Item { get; set; }
-            public bool Used { get; set; }
+            Add(node, result, nodes, hasDependency);
         }
 
-        /// <summary>
-        /// Linearizes a dependency graph so that items are positioned after their dependencies.
-        /// This by using a function which determines if an item has a direct dependency on another.
-        /// Then, items are moved up whenever it is possible without breaking the dependency graph.
-        /// This by using a function which gives for each item a priority used as an order value.
-        /// </summary>
-        public static IEnumerable<T> OrderByDependenciesAndPriorities<T>(this IEnumerable<T> items, Func<T, T, bool> hasDependency, Func<T, int> getPriority)
+        for (var index = 1; index < result.Count; index++)
         {
-            var nodes = items.Select(i => new Node<T> { Item = i }).ToArray();
+            MoveUp(result, index, LowestIndex(result, index, hasDependency, getPriority));
+        }
 
-            var result = new List<T>();
-            foreach (var node in nodes)
-            {
-                Add(node, result, nodes, hasDependency);
-            }
+        return result;
+    }
 
-            for (var index = 1; index < result.Count; index++)
-            {
-                MoveUp(result, index, LowestIndex(result, index, hasDependency, getPriority));
-            }
+    private static void Add<T>(Node<T> node, ICollection<T> list, IEnumerable<Node<T>> nodes, Func<T, T, bool> hasDependency)
+    {
+        if (node.Used)
+            return;
 
-            return result;
-        }
+        node.Used = true;
 
-        private static void Add<T>(Node<T> node, ICollection<T> list, IEnumerable<Node<T>> nodes, Func<T, T, bool> hasDependency)
+        foreach (var dependency in nodes.Where(n => hasDependency(node.Item, n.Item)))
         {
-            if (node.Used)
-                return;
-
-            node.Used = true;
+            Add(dependency, list, nodes, hasDependency);
+        }
 
-            foreach (var dependency in nodes.Where(n => hasDependency(node.Item, n.Item)))
-            {
-                Add(dependency, list, nodes, hasDependency);
-            }
+        list.Add(node.Item);
+    }
 
-            list.Add(node.Item);
-        }
+    private static int LowestIndex<T>(List<T> list, int index, Func<T, T, bool> hasDependency, Func<T, int> getPriority)
+    {
+        double priority = getPriority(list[index]);
 
-        private static int LowestIndex<T>(List<T> list, int index, Func<T, T, bool> hasDependency, Func<T, int> getPriority)
+        var lowestIndex = index;
+        for (var i = index - 1; i >= 0; i--)
         {
-            double priority = getPriority(list[index]);
+            if (hasDependency(list[index], list[i]))
+            {
+                return lowestIndex;
+            }
 
-            var lowestIndex = index;
-            for (var i = index - 1; i >= 0; i--)
+            double currentPriority = getPriority(list[i]);
+            if (currentPriority > priority)
             {
-                if (hasDependency(list[index], list[i]))
-                {
-                    return lowestIndex;
-                }
-
-                double currentPriority = getPriority(list[i]);
-                if (currentPriority > priority)
-                {
-                    lowestIndex = i;
-                }
+                lowestIndex = i;
             }
+        }
+
+        return lowestIndex;
+    }
 
-            return lowestIndex;
+    private static void MoveUp<T>(List<T> list, int index, int lowerIndex)
+    {
+        if (index < lowerIndex)
+        {
+            throw new ArgumentException($"Should be higher or equal to '{nameof(lowerIndex)}'.", nameof(index));
         }
 
-        private static void MoveUp<T>(List<T> list, int index, int lowerIndex)
+        if (index != lowerIndex)
         {
-            if (index < lowerIndex)
-            {
-                throw new ArgumentException($"Should be higher or equal to '{nameof(lowerIndex)}'.", nameof(index));
-            }
+            var temp = list[index];
 
-            if (index != lowerIndex)
+            for (; index > lowerIndex; index--)
             {
-                var temp = list[index];
-
-                for (; index > lowerIndex; index--)
-                {
-                    list[index] = list[index - 1];
-                }
-
-                list[lowerIndex] = temp;
+                list[index] = list[index - 1];
             }
+
+            list[lowerIndex] = temp;
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/IOrchardHelper.cs b/src/OrchardCore/OrchardCore.Abstractions/IOrchardHelper.cs
index 48d406bc6f2..f700f9314f5 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/IOrchardHelper.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/IOrchardHelper.cs
@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore
+namespace OrchardCore;
+
+public interface IOrchardHelper
 {
-    public interface IOrchardHelper
-    {
-        HttpContext HttpContext { get; }
-    }
+    HttpContext HttpContext { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/IdGenerator.cs b/src/OrchardCore/OrchardCore.Abstractions/IdGenerator.cs
index 0c15928ad66..3d0be0246d0 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/IdGenerator.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/IdGenerator.cs
@@ -1,53 +1,52 @@
 using System;
 
-namespace OrchardCore
+namespace OrchardCore;
+
+public static class IdGenerator
 {
-    public static class IdGenerator
+    // Some confusing chars are ignored: http://www.crockford.com/wrmg/base32.html
+    private static readonly char[] _encode32Chars = "0123456789abcdefghjkmnpqrstvwxyz".ToCharArray();
+
+    public static string GenerateId()
     {
-        // Some confusing chars are ignored: http://www.crockford.com/wrmg/base32.html
-        private static readonly char[] _encode32Chars = "0123456789abcdefghjkmnpqrstvwxyz".ToCharArray();
+        var guid = Guid.NewGuid().ToByteArray();
 
-        public static string GenerateId()
+        return string.Create(26, guid, (buffer, guid) =>
         {
-            var guid = Guid.NewGuid().ToByteArray();
-
-            return string.Create(26, guid, (buffer, guid) =>
-            {
-                var hs = BitConverter.ToInt64(guid, 0);
-                var ls = BitConverter.ToInt64(guid, 8);
+            var hs = BitConverter.ToInt64(guid, 0);
+            var ls = BitConverter.ToInt64(guid, 8);
 
-                // Using a local copy prevents additional bound checks by the JIT.
-                var encode32Chars = _encode32Chars;
+            // Using a local copy prevents additional bound checks by the JIT.
+            var encode32Chars = _encode32Chars;
 
-                // A char array allows a long as the indexer, so without any cast.
-                buffer[0] = encode32Chars[(hs >> 60) & 31];
-                buffer[1] = encode32Chars[(hs >> 55) & 31];
-                buffer[2] = encode32Chars[(hs >> 50) & 31];
-                buffer[3] = encode32Chars[(hs >> 45) & 31];
-                buffer[4] = encode32Chars[(hs >> 40) & 31];
-                buffer[5] = encode32Chars[(hs >> 35) & 31];
-                buffer[6] = encode32Chars[(hs >> 30) & 31];
-                buffer[7] = encode32Chars[(hs >> 25) & 31];
-                buffer[8] = encode32Chars[(hs >> 20) & 31];
-                buffer[9] = encode32Chars[(hs >> 15) & 31];
-                buffer[10] = encode32Chars[(hs >> 10) & 31];
-                buffer[11] = encode32Chars[(hs >> 5) & 31];
-                buffer[12] = encode32Chars[hs & 31];
+            // A char array allows a long as the indexer, so without any cast.
+            buffer[0] = encode32Chars[(hs >> 60) & 31];
+            buffer[1] = encode32Chars[(hs >> 55) & 31];
+            buffer[2] = encode32Chars[(hs >> 50) & 31];
+            buffer[3] = encode32Chars[(hs >> 45) & 31];
+            buffer[4] = encode32Chars[(hs >> 40) & 31];
+            buffer[5] = encode32Chars[(hs >> 35) & 31];
+            buffer[6] = encode32Chars[(hs >> 30) & 31];
+            buffer[7] = encode32Chars[(hs >> 25) & 31];
+            buffer[8] = encode32Chars[(hs >> 20) & 31];
+            buffer[9] = encode32Chars[(hs >> 15) & 31];
+            buffer[10] = encode32Chars[(hs >> 10) & 31];
+            buffer[11] = encode32Chars[(hs >> 5) & 31];
+            buffer[12] = encode32Chars[hs & 31];
 
-                buffer[13] = encode32Chars[(ls >> 60) & 31];
-                buffer[14] = encode32Chars[(ls >> 55) & 31];
-                buffer[15] = encode32Chars[(ls >> 50) & 31];
-                buffer[16] = encode32Chars[(ls >> 45) & 31];
-                buffer[17] = encode32Chars[(ls >> 40) & 31];
-                buffer[18] = encode32Chars[(ls >> 35) & 31];
-                buffer[19] = encode32Chars[(ls >> 30) & 31];
-                buffer[20] = encode32Chars[(ls >> 25) & 31];
-                buffer[21] = encode32Chars[(ls >> 20) & 31];
-                buffer[22] = encode32Chars[(ls >> 15) & 31];
-                buffer[23] = encode32Chars[(ls >> 10) & 31];
-                buffer[24] = encode32Chars[(ls >> 5) & 31];
-                buffer[25] = encode32Chars[ls & 31];
-            });
-        }
+            buffer[13] = encode32Chars[(ls >> 60) & 31];
+            buffer[14] = encode32Chars[(ls >> 55) & 31];
+            buffer[15] = encode32Chars[(ls >> 50) & 31];
+            buffer[16] = encode32Chars[(ls >> 45) & 31];
+            buffer[17] = encode32Chars[(ls >> 40) & 31];
+            buffer[18] = encode32Chars[(ls >> 35) & 31];
+            buffer[19] = encode32Chars[(ls >> 30) & 31];
+            buffer[20] = encode32Chars[(ls >> 25) & 31];
+            buffer[21] = encode32Chars[(ls >> 20) & 31];
+            buffer[22] = encode32Chars[(ls >> 15) & 31];
+            buffer[23] = encode32Chars[(ls >> 10) & 31];
+            buffer[24] = encode32Chars[(ls >> 5) & 31];
+            buffer[25] = encode32Chars[ls & 31];
+        });
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Json/Nodes/JNode.cs b/src/OrchardCore/OrchardCore.Abstractions/Json/Nodes/JNode.cs
index 008d1d92d57..949d704eb31 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Json/Nodes/JNode.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Json/Nodes/JNode.cs
@@ -1,10 +1,10 @@
-using Json.Path;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.Json.Settings;
 using System.Threading;
 using System.Threading.Tasks;
+using Json.Path;
 
 #nullable enable
 
@@ -187,7 +187,7 @@ jsonNode is JsonObject jsonObject && jsonObject.Count > 0 ||
         ArgumentNullException.ThrowIfNull(path);
 
         path = path.Trim();
-        if (string.IsNullOrEmpty(path)) 
+        if (string.IsNullOrEmpty(path))
         {
             return jsonNode;
         }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Localization/CalendarName.cs b/src/OrchardCore/OrchardCore.Abstractions/Localization/CalendarName.cs
index b167d7db714..ba86e442074 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Localization/CalendarName.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Localization/CalendarName.cs
@@ -1,16 +1,15 @@
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents an enum for calendar names.
+/// </summary>
+public enum CalendarName
 {
-    /// <summary>
-    /// Represents an enum for calendar names.
-    /// </summary>
-    public enum CalendarName
-    {
-        Hebrew,
-        Hijri,
-        Gregorian,
-        Julian,
-        Persian,
-        UmAlQura,
-        Unknown
-    }
+    Hebrew,
+    Hijri,
+    Gregorian,
+    Julian,
+    Persian,
+    UmAlQura,
+    Unknown
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Localization/CalendarSelectorResult.cs b/src/OrchardCore/OrchardCore.Abstractions/Localization/CalendarSelectorResult.cs
index f42a2edda8c..d28a971810c 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Localization/CalendarSelectorResult.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Localization/CalendarSelectorResult.cs
@@ -1,21 +1,20 @@
 using System;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents a result for the selected calendar.
+/// </summary>
+public class CalendarSelectorResult
 {
     /// <summary>
-    /// Represents a result for the selected calendar.
+    /// Gets or sets the priority.
     /// </summary>
-    public class CalendarSelectorResult
-    {
-        /// <summary>
-        /// Gets or sets the priority.
-        /// </summary>
-        public int Priority { get; set; }
+    public int Priority { get; set; }
 
-        /// <summary>
-        /// Gets or sets a calendar name.
-        /// </summary>
-        public Func<Task<CalendarName>> CalendarName { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets a calendar name.
+    /// </summary>
+    public Func<Task<CalendarName>> CalendarName { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Localization/CultureScope.cs b/src/OrchardCore/OrchardCore.Abstractions/Localization/CultureScope.cs
index 10f5def0c77..e848996bf51 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Localization/CultureScope.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Localization/CultureScope.cs
@@ -1,85 +1,84 @@
 using System;
 using System.Globalization;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents a scope that you can change the current culture within.
+/// </summary>
+/// <remarks>
+/// The scope disallow the current culture depends on local computer settings by default.
+/// For more information refer to https://github.com/OrchardCMS/OrchardCore/issues/11228.
+/// </remarks>
+public sealed class CultureScope : IDisposable
 {
-    /// <summary>
-    /// Represents a scope that you can change the current culture within.
-    /// </summary>
-    /// <remarks>
-    /// The scope disallow the current culture depends on local computer settings by default.
-    /// For more information refer to https://github.com/OrchardCMS/OrchardCore/issues/11228.
-    /// </remarks>
-    public sealed class CultureScope : IDisposable
-    {
-        private readonly CultureInfo _originalCulture;
-        private readonly CultureInfo _originalUICulture;
+    private readonly CultureInfo _originalCulture;
+    private readonly CultureInfo _originalUICulture;
 
-        private CultureScope(string culture, string uiCulture, bool ignoreSystemSettings)
-        {
-            var useUserOverride = !ignoreSystemSettings;
-            Culture = new CultureInfo(culture, useUserOverride);
-            UICulture = new CultureInfo(uiCulture, useUserOverride);
-            _originalCulture = CultureInfo.CurrentCulture;
-            _originalUICulture = CultureInfo.CurrentUICulture;
+    private CultureScope(string culture, string uiCulture, bool ignoreSystemSettings)
+    {
+        var useUserOverride = !ignoreSystemSettings;
+        Culture = new CultureInfo(culture, useUserOverride);
+        UICulture = new CultureInfo(uiCulture, useUserOverride);
+        _originalCulture = CultureInfo.CurrentCulture;
+        _originalUICulture = CultureInfo.CurrentUICulture;
 
-            SetCultures(Culture, UICulture);
-        }
+        SetCultures(Culture, UICulture);
+    }
 
-        /// <summary>
-        /// Gets the current culture.
-        /// </summary>
-        public CultureInfo Culture { get; }
+    /// <summary>
+    /// Gets the current culture.
+    /// </summary>
+    public CultureInfo Culture { get; }
 
-        /// <summary>
-        /// Get the current UI culture.
-        /// </summary>
-        public CultureInfo UICulture { get; }
+    /// <summary>
+    /// Get the current UI culture.
+    /// </summary>
+    public CultureInfo UICulture { get; }
 
-        /// <summary>
-        /// Creates a scope with a given culture.
-        /// </summary>
-        /// <param name="culture">The culture that will be used within the scope.</param>
-        /// <param name="ignoreSystemSettings">Whether to ignore the system culture settings or not. Defaults to <c>false</c>.</param>
-        public static CultureScope Create(string culture, bool ignoreSystemSettings = false)
-            => Create(culture, culture, ignoreSystemSettings);
+    /// <summary>
+    /// Creates a scope with a given culture.
+    /// </summary>
+    /// <param name="culture">The culture that will be used within the scope.</param>
+    /// <param name="ignoreSystemSettings">Whether to ignore the system culture settings or not. Defaults to <c>false</c>.</param>
+    public static CultureScope Create(string culture, bool ignoreSystemSettings = false)
+        => Create(culture, culture, ignoreSystemSettings);
 
-        /// <summary>
-        /// Creates a scope with a given culture.
-        /// </summary>
-        /// <param name="culture">The culture that will be used within the scope.</param>
-        /// <param name="uiCulture">The UI culture that will be used within the scope.</param>
-        /// <param name="ignoreSystemSettings">Whether to ignore the system culture settings or not. Defaults to <c>false</c>.</param>
-        public static CultureScope Create(string culture, string uiCulture, bool ignoreSystemSettings = false)
-            => new(culture, uiCulture, ignoreSystemSettings);
+    /// <summary>
+    /// Creates a scope with a given culture.
+    /// </summary>
+    /// <param name="culture">The culture that will be used within the scope.</param>
+    /// <param name="uiCulture">The UI culture that will be used within the scope.</param>
+    /// <param name="ignoreSystemSettings">Whether to ignore the system culture settings or not. Defaults to <c>false</c>.</param>
+    public static CultureScope Create(string culture, string uiCulture, bool ignoreSystemSettings = false)
+        => new(culture, uiCulture, ignoreSystemSettings);
 
-        /// <summary>
-        /// Creates a scope with a given culture.
-        /// </summary>
-        /// <param name="culture">The culture that will be used within the scope.</param>
-        /// <param name="ignoreSystemSettings">Whether to ignore the system culture settings or not. Defaults to <c>false</c>.</param>
-        public static CultureScope Create(CultureInfo culture, bool ignoreSystemSettings = false)
-            => Create(culture, culture, ignoreSystemSettings);
+    /// <summary>
+    /// Creates a scope with a given culture.
+    /// </summary>
+    /// <param name="culture">The culture that will be used within the scope.</param>
+    /// <param name="ignoreSystemSettings">Whether to ignore the system culture settings or not. Defaults to <c>false</c>.</param>
+    public static CultureScope Create(CultureInfo culture, bool ignoreSystemSettings = false)
+        => Create(culture, culture, ignoreSystemSettings);
 
-        /// <summary>
-        /// Creates a scope with a given culture.
-        /// </summary>
-        /// <param name="culture">The culture that will be used within the scope.</param>
-        /// <param name="uiCulture">The UI culture that will be used within the scope.</param>
-        /// <param name="ignoreSystemSettings">Whether to ignore the system culture settings or not. Defaults to <c>false</c>.</param>
-        public static CultureScope Create(CultureInfo culture, CultureInfo uiCulture, bool ignoreSystemSettings = false)
-            => new(culture.Name, uiCulture.Name, ignoreSystemSettings);
+    /// <summary>
+    /// Creates a scope with a given culture.
+    /// </summary>
+    /// <param name="culture">The culture that will be used within the scope.</param>
+    /// <param name="uiCulture">The UI culture that will be used within the scope.</param>
+    /// <param name="ignoreSystemSettings">Whether to ignore the system culture settings or not. Defaults to <c>false</c>.</param>
+    public static CultureScope Create(CultureInfo culture, CultureInfo uiCulture, bool ignoreSystemSettings = false)
+        => new(culture.Name, uiCulture.Name, ignoreSystemSettings);
 
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            SetCultures(_originalCulture, _originalUICulture);
-        }
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        SetCultures(_originalCulture, _originalUICulture);
+    }
 
-        private static void SetCultures(CultureInfo culture, CultureInfo uiCulture)
-        {
-            CultureInfo.CurrentCulture = culture;
-            CultureInfo.CurrentUICulture = uiCulture;
-        }
+    private static void SetCultures(CultureInfo culture, CultureInfo uiCulture)
+    {
+        CultureInfo.CurrentCulture = culture;
+        CultureInfo.CurrentUICulture = uiCulture;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Localization/ICalendarManager.cs b/src/OrchardCore/OrchardCore.Abstractions/Localization/ICalendarManager.cs
index 202ff3008b6..878361ebb55 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Localization/ICalendarManager.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Localization/ICalendarManager.cs
@@ -1,16 +1,15 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents a contract for manage calendars.
+/// </summary>
+public interface ICalendarManager
 {
     /// <summary>
-    /// Represents a contract for manage calendars.
+    /// Gets the current calendar.
     /// </summary>
-    public interface ICalendarManager
-    {
-        /// <summary>
-        /// Gets the current calendar.
-        /// </summary>
-        /// <returns>The current calendar name.</returns>
-        Task<CalendarName> GetCurrentCalendar();
-    }
+    /// <returns>The current calendar name.</returns>
+    Task<CalendarName> GetCurrentCalendar();
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Localization/ICalendarSelector.cs b/src/OrchardCore/OrchardCore.Abstractions/Localization/ICalendarSelector.cs
index 297840f425e..4374db3eddf 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Localization/ICalendarSelector.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Localization/ICalendarSelector.cs
@@ -1,16 +1,15 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents a contract for selection a calendar.
+/// </summary>
+public interface ICalendarSelector
 {
     /// <summary>
-    /// Represents a contract for selection a calendar.
+    /// Gets a calendar.
     /// </summary>
-    public interface ICalendarSelector
-    {
-        /// <summary>
-        /// Gets a calendar.
-        /// </summary>
-        /// <returns>The selected calendar.</returns>
-        Task<CalendarSelectorResult> GetCalendarAsync();
-    }
+    /// <returns>The selected calendar.</returns>
+    Task<CalendarSelectorResult> GetCalendarAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Localization/ILocalizationService.cs b/src/OrchardCore/OrchardCore.Abstractions/Localization/ILocalizationService.cs
index 912296edbff..901bd9c20b7 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Localization/ILocalizationService.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Localization/ILocalizationService.cs
@@ -2,39 +2,38 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents a contract for a localization service.
+/// </summary>
+public interface ILocalizationService
 {
+    private static readonly CultureInfo[] _cultureAliases =
+    [
+        CultureInfo.GetCultureInfo("zh-CN"),
+        CultureInfo.GetCultureInfo("zh-TW")
+    ];
+
     /// <summary>
-    /// Represents a contract for a localization service.
+    /// Returns the default culture of the site.
     /// </summary>
-    public interface ILocalizationService
-    {
-        private static readonly CultureInfo[] _cultureAliases =
-        [
-            CultureInfo.GetCultureInfo("zh-CN"),
-            CultureInfo.GetCultureInfo("zh-TW")
-        ];
+    Task<string> GetDefaultCultureAsync();
 
-        /// <summary>
-        /// Returns the default culture of the site.
-        /// </summary>
-        Task<string> GetDefaultCultureAsync();
-
-        /// <summary>
-        /// Returns all the supported cultures of the site. It also contains the default culture.
-        /// </summary>
-        Task<string[]> GetSupportedCulturesAsync();
+    /// <summary>
+    /// Returns all the supported cultures of the site. It also contains the default culture.
+    /// </summary>
+    Task<string[]> GetSupportedCulturesAsync();
 
-        /// <summary>
-        /// Gets all cultures recognized by .NET, including culture aliases.
-        /// </summary>
-        static CultureInfo[] GetAllCulturesAndAliases()
-        {
-            var cultures = CultureInfo.GetCultures(CultureTypes.AllCultures)
-                .Union(_cultureAliases)
-                .OrderBy(c => c.Name);
+    /// <summary>
+    /// Gets all cultures recognized by .NET, including culture aliases.
+    /// </summary>
+    static CultureInfo[] GetAllCulturesAndAliases()
+    {
+        var cultures = CultureInfo.GetCultures(CultureTypes.AllCultures)
+            .Union(_cultureAliases)
+            .OrderBy(c => c.Name);
 
-            return cultures.ToArray();
-        }
+        return cultures.ToArray();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Locking/Distributed/IDistributedLock.cs b/src/OrchardCore/OrchardCore.Abstractions/Locking/Distributed/IDistributedLock.cs
index ea1cd729713..81d7232aeb7 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Locking/Distributed/IDistributedLock.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Locking/Distributed/IDistributedLock.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Locking.Distributed
+namespace OrchardCore.Locking.Distributed;
+
+public interface IDistributedLock : ILock
 {
-    public interface IDistributedLock : ILock
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Locking/ILocalLock.cs b/src/OrchardCore/OrchardCore.Abstractions/Locking/ILocalLock.cs
index 544baa956c0..e6bcc33a925 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Locking/ILocalLock.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Locking/ILocalLock.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Locking
+namespace OrchardCore.Locking;
+
+public interface ILocalLock : ILock
 {
-    public interface ILocalLock : ILock
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Locking/ILock.cs b/src/OrchardCore/OrchardCore.Abstractions/Locking/ILock.cs
index d083e9a8fc3..ac1c446ec96 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Locking/ILock.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Locking/ILock.cs
@@ -1,25 +1,24 @@
 using System;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Locking
+namespace OrchardCore.Locking;
+
+public interface ILock
 {
-    public interface ILock
-    {
-        /// <summary>
-        /// Waits indefinitely until acquiring a named lock with a given expiration for the current tenant.
-        /// After 'expiration' the lock is auto released, a null value is equivalent to 'TimeSpan.MaxValue'.
-        /// </summary>
-        Task<ILocker> AcquireLockAsync(string key, TimeSpan? expiration = null);
+    /// <summary>
+    /// Waits indefinitely until acquiring a named lock with a given expiration for the current tenant.
+    /// After 'expiration' the lock is auto released, a null value is equivalent to 'TimeSpan.MaxValue'.
+    /// </summary>
+    Task<ILocker> AcquireLockAsync(string key, TimeSpan? expiration = null);
 
-        /// <summary>
-        /// Tries to acquire a named lock in a given timeout with a given expiration for the current tenant.
-        /// After 'expiration' the lock is auto released, a null value is equivalent to 'TimeSpan.MaxValue'.
-        /// </summary>
-        Task<(ILocker locker, bool locked)> TryAcquireLockAsync(string key, TimeSpan timeout, TimeSpan? expiration = null);
+    /// <summary>
+    /// Tries to acquire a named lock in a given timeout with a given expiration for the current tenant.
+    /// After 'expiration' the lock is auto released, a null value is equivalent to 'TimeSpan.MaxValue'.
+    /// </summary>
+    Task<(ILocker locker, bool locked)> TryAcquireLockAsync(string key, TimeSpan timeout, TimeSpan? expiration = null);
 
-        /// <summary>
-        /// Whether a named lock is already acquired.
-        /// </summary>
-        Task<bool> IsLockAcquiredAsync(string key);
-    }
+    /// <summary>
+    /// Whether a named lock is already acquired.
+    /// </summary>
+    Task<bool> IsLockAcquiredAsync(string key);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Locking/ILocker.cs b/src/OrchardCore/OrchardCore.Abstractions/Locking/ILocker.cs
index 7d3efbc406c..4bf92fd1045 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Locking/ILocker.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Locking/ILocker.cs
@@ -1,8 +1,7 @@
 using System;
 
-namespace OrchardCore.Locking
+namespace OrchardCore.Locking;
+
+public interface ILocker : IDisposable, IAsyncDisposable
 {
-    public interface ILocker : IDisposable, IAsyncDisposable
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Application.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Application.cs
index 6d3f6237f65..c628b868843 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Application.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Application.cs
@@ -3,55 +3,54 @@
 using System.Reflection;
 using Microsoft.Extensions.Hosting;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+public class Application
 {
-    public class Application
-    {
-        private readonly Dictionary<string, Module> _modulesByName;
-        private readonly List<Module> _modules;
+    private readonly Dictionary<string, Module> _modulesByName;
+    private readonly List<Module> _modules;
 
-        public const string ModulesPath = "Areas";
-        public const string ModulesRoot = ModulesPath + "/";
+    public const string ModulesPath = "Areas";
+    public const string ModulesRoot = ModulesPath + "/";
 
-        public const string ModuleName = "Application Main Feature";
-        public const string ModuleDescription = "Provides components defined at the application level.";
-        public static readonly string ModulePriority = int.MinValue.ToString();
-        public const string ModuleCategory = "Application";
+    public const string ModuleName = "Application Main Feature";
+    public const string ModuleDescription = "Provides components defined at the application level.";
+    public static readonly string ModulePriority = int.MinValue.ToString();
+    public const string ModuleCategory = "Application";
 
-        public const string DefaultFeatureId = "Application.Default";
-        public const string DefaultFeatureName = "Application Default Feature";
-        public const string DefaultFeatureDescription = "Adds a default feature to the application's module.";
+    public const string DefaultFeatureId = "Application.Default";
+    public const string DefaultFeatureName = "Application Default Feature";
+    public const string DefaultFeatureDescription = "Adds a default feature to the application's module.";
 
-        public Application(IHostEnvironment environment, IEnumerable<Module> modules)
-        {
-            Name = environment.ApplicationName;
-            Path = environment.ContentRootPath;
-            Root = Path + '/';
-            ModulePath = ModulesRoot + Name;
-            ModuleRoot = ModulePath + '/';
+    public Application(IHostEnvironment environment, IEnumerable<Module> modules)
+    {
+        Name = environment.ApplicationName;
+        Path = environment.ContentRootPath;
+        Root = Path + '/';
+        ModulePath = ModulesRoot + Name;
+        ModuleRoot = ModulePath + '/';
 
-            Assembly = Assembly.Load(new AssemblyName(Name));
+        Assembly = Assembly.Load(new AssemblyName(Name));
 
-            _modules = new List<Module>(modules);
-            _modulesByName = _modules.ToDictionary(m => m.Name, m => m);
-        }
+        _modules = new List<Module>(modules);
+        _modulesByName = _modules.ToDictionary(m => m.Name, m => m);
+    }
 
-        public string Name { get; }
-        public string Path { get; }
-        public string Root { get; }
-        public string ModulePath { get; }
-        public string ModuleRoot { get; }
-        public Assembly Assembly { get; }
-        public IEnumerable<Module> Modules => _modules;
+    public string Name { get; }
+    public string Path { get; }
+    public string Root { get; }
+    public string ModulePath { get; }
+    public string ModuleRoot { get; }
+    public Assembly Assembly { get; }
+    public IEnumerable<Module> Modules => _modules;
 
-        public Module GetModule(string name)
+    public Module GetModule(string name)
+    {
+        if (!_modulesByName.TryGetValue(name, out var module))
         {
-            if (!_modulesByName.TryGetValue(name, out var module))
-            {
-                return new Module(string.Empty);
-            }
-
-            return module;
+            return new Module(string.Empty);
         }
+
+        return module;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/AssemblyAttributeModuleNamesProvider.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/AssemblyAttributeModuleNamesProvider.cs
index 8fdd1170f42..3b74384378d 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/AssemblyAttributeModuleNamesProvider.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/AssemblyAttributeModuleNamesProvider.cs
@@ -4,21 +4,20 @@
 using Microsoft.Extensions.Hosting;
 using OrchardCore.Modules.Manifest;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+public class AssemblyAttributeModuleNamesProvider : IModuleNamesProvider
 {
-    public class AssemblyAttributeModuleNamesProvider : IModuleNamesProvider
-    {
-        private readonly List<string> _moduleNames;
+    private readonly List<string> _moduleNames;
 
-        public AssemblyAttributeModuleNamesProvider(IHostEnvironment hostingEnvironment)
-        {
-            var assembly = Assembly.Load(new AssemblyName(hostingEnvironment.ApplicationName));
-            _moduleNames = assembly.GetCustomAttributes<ModuleNameAttribute>().Select(m => m.Name).ToList();
-        }
+    public AssemblyAttributeModuleNamesProvider(IHostEnvironment hostingEnvironment)
+    {
+        var assembly = Assembly.Load(new AssemblyName(hostingEnvironment.ApplicationName));
+        _moduleNames = assembly.GetCustomAttributes<ModuleNameAttribute>().Select(m => m.Name).ToList();
+    }
 
-        public IEnumerable<string> GetModuleNames()
-        {
-            return _moduleNames;
-        }
+    public IEnumerable<string> GetModuleNames()
+    {
+        return _moduleNames;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Asset.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Asset.cs
index bc2bdff89aa..34ab4773b06 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Asset.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Asset.cs
@@ -1,25 +1,24 @@
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+public class Asset
 {
-    public class Asset
+    public Asset(string asset)
     {
-        public Asset(string asset)
-        {
-            asset = asset.Replace('\\', '/');
-            var index = asset.IndexOf('|');
+        asset = asset.Replace('\\', '/');
+        var index = asset.IndexOf('|');
 
-            if (index == -1)
-            {
-                ModuleAssetPath = string.Empty;
-                ProjectAssetPath = string.Empty;
-            }
-            else
-            {
-                ModuleAssetPath = asset[..index];
-                ProjectAssetPath = asset[(index + 1)..];
-            }
+        if (index == -1)
+        {
+            ModuleAssetPath = string.Empty;
+            ProjectAssetPath = string.Empty;
+        }
+        else
+        {
+            ModuleAssetPath = asset[..index];
+            ProjectAssetPath = asset[(index + 1)..];
         }
-
-        public string ModuleAssetPath { get; }
-        public string ProjectAssetPath { get; }
     }
+
+    public string ModuleAssetPath { get; }
+    public string ProjectAssetPath { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/BackgroundServiceOptions.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/BackgroundServiceOptions.cs
index 30536da6f04..b35e82bc631 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/BackgroundServiceOptions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/BackgroundServiceOptions.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+public class BackgroundServiceOptions
 {
-    public class BackgroundServiceOptions
-    {
-        public bool ShellWarmup { get; set; }
-    }
+    public bool ShellWarmup { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Builder/OrchardCoreBuilder.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Builder/OrchardCoreBuilder.cs
index 58d79ea341c..4e329c14a99 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Builder/OrchardCoreBuilder.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Builder/OrchardCoreBuilder.cs
@@ -7,153 +7,152 @@
 using OrchardCore.Environment.Shell.Descriptor.Models;
 using OrchardCore.Modules;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public class OrchardCoreBuilder
 {
-    public class OrchardCoreBuilder
+    private Dictionary<int, StartupActions> _actions { get; } = [];
+
+    public OrchardCoreBuilder(IServiceCollection services)
     {
-        private Dictionary<int, StartupActions> _actions { get; } = [];
+        ApplicationServices = services;
+    }
 
-        public OrchardCoreBuilder(IServiceCollection services)
-        {
-            ApplicationServices = services;
-        }
+    public IServiceCollection ApplicationServices { get; }
 
-        public IServiceCollection ApplicationServices { get; }
+    public OrchardCoreBuilder RegisterStartup<T>() where T : class, IStartup
+    {
+        ApplicationServices.AddTransient<IStartup, T>();
+        return this;
+    }
 
-        public OrchardCoreBuilder RegisterStartup<T>() where T : class, IStartup
+    /// <summary>
+    /// This method gets called for each tenant. Use this method to add services to the container.
+    /// For more information on how to configure your application, visit http://go.microsoft.com/fwlink/?LinkID=398940.
+    /// </summary>
+    /// <param name="configure">The action to execute when configuring the services for a tenant.</param>
+    /// <param name="order">The order of the action to execute. Lower values will be executed first.</param>
+    public OrchardCoreBuilder ConfigureServices(Action<IServiceCollection, IServiceProvider> configure, int order = 0)
+    {
+        if (!_actions.TryGetValue(order, out var actions))
         {
-            ApplicationServices.AddTransient<IStartup, T>();
-            return this;
-        }
+            actions = _actions[order] = new StartupActions(order);
 
-        /// <summary>
-        /// This method gets called for each tenant. Use this method to add services to the container.
-        /// For more information on how to configure your application, visit http://go.microsoft.com/fwlink/?LinkID=398940.
-        /// </summary>
-        /// <param name="configure">The action to execute when configuring the services for a tenant.</param>
-        /// <param name="order">The order of the action to execute. Lower values will be executed first.</param>
-        public OrchardCoreBuilder ConfigureServices(Action<IServiceCollection, IServiceProvider> configure, int order = 0)
-        {
-            if (!_actions.TryGetValue(order, out var actions))
-            {
-                actions = _actions[order] = new StartupActions(order);
+            ApplicationServices.AddTransient<IStartup>(sp => new StartupActionsStartup(
+                sp.GetRequiredService<IServiceProvider>(), actions, order));
+        }
 
-                ApplicationServices.AddTransient<IStartup>(sp => new StartupActionsStartup(
-                    sp.GetRequiredService<IServiceProvider>(), actions, order));
-            }
+        actions.ConfigureServicesActions.Add(configure);
 
-            actions.ConfigureServicesActions.Add(configure);
+        return this;
+    }
 
-            return this;
-        }
+    /// <summary>
+    /// This method gets called for each tenant. Use this method to add services to the container.
+    /// For more information on how to configure your application, visit http://go.microsoft.com/fwlink/?LinkID=398940.
+    /// </summary>
+    /// <param name="configure">The action to execute when configuring the services for a tenant.</param>
+    /// <param name="order">The order of the action to execute. Lower values will be executed first.</param>
+    public OrchardCoreBuilder ConfigureServices(Action<IServiceCollection> configure, int order = 0)
+    {
+        return ConfigureServices((s, sp) => configure(s), order);
+    }
 
-        /// <summary>
-        /// This method gets called for each tenant. Use this method to add services to the container.
-        /// For more information on how to configure your application, visit http://go.microsoft.com/fwlink/?LinkID=398940.
-        /// </summary>
-        /// <param name="configure">The action to execute when configuring the services for a tenant.</param>
-        /// <param name="order">The order of the action to execute. Lower values will be executed first.</param>
-        public OrchardCoreBuilder ConfigureServices(Action<IServiceCollection> configure, int order = 0)
+    /// <summary>
+    /// This method gets called for each tenant. Use this method to configure the request's pipeline.
+    /// </summary>
+    /// <param name="configure">The action to execute when configuring the request's pipeline for a tenant.</param>
+    /// <param name="order">The order of the action to execute. Lower values will be executed first.</param>
+    public OrchardCoreBuilder Configure(Action<IApplicationBuilder, IEndpointRouteBuilder, IServiceProvider> configure, int order = 0)
+    {
+        if (!_actions.TryGetValue(order, out var actions))
         {
-            return ConfigureServices((s, sp) => configure(s), order);
+            actions = _actions[order] = new StartupActions(order);
+
+            ApplicationServices.AddTransient<IStartup>(sp => new StartupActionsStartup(
+                sp.GetRequiredService<IServiceProvider>(), actions, order));
         }
 
-        /// <summary>
-        /// This method gets called for each tenant. Use this method to configure the request's pipeline.
-        /// </summary>
-        /// <param name="configure">The action to execute when configuring the request's pipeline for a tenant.</param>
-        /// <param name="order">The order of the action to execute. Lower values will be executed first.</param>
-        public OrchardCoreBuilder Configure(Action<IApplicationBuilder, IEndpointRouteBuilder, IServiceProvider> configure, int order = 0)
-        {
-            if (!_actions.TryGetValue(order, out var actions))
-            {
-                actions = _actions[order] = new StartupActions(order);
+        actions.ConfigureActions.Add(configure);
 
-                ApplicationServices.AddTransient<IStartup>(sp => new StartupActionsStartup(
-                    sp.GetRequiredService<IServiceProvider>(), actions, order));
-            }
+        return this;
+    }
 
-            actions.ConfigureActions.Add(configure);
+    /// <summary>
+    /// This method gets called for each tenant. Use this method to configure the request's pipeline.
+    /// </summary>
+    /// <param name="configure">The action to execute when configuring the request's pipeline for a tenant.</param>
+    /// <param name="order">The order of the action to execute. Lower values will be executed first.</param>
+    public OrchardCoreBuilder Configure(Action<IApplicationBuilder, IEndpointRouteBuilder> configure, int order = 0)
+    {
+        return Configure((app, routes, sp) => configure(app, routes), order);
+    }
 
-            return this;
-        }
+    /// <summary>
+    /// This method gets called for each tenant. Use this method to configure the request's pipeline.
+    /// </summary>
+    /// <param name="configure">The action to execute when configuring the request's pipeline for a tenant.</param>
+    /// <param name="order">The order of the action to execute. Lower values will be executed first.</param>
+    public OrchardCoreBuilder Configure(Action<IApplicationBuilder> configure, int order = 0)
+    {
+        return Configure((app, routes, sp) => configure(app), order);
+    }
 
-        /// <summary>
-        /// This method gets called for each tenant. Use this method to configure the request's pipeline.
-        /// </summary>
-        /// <param name="configure">The action to execute when configuring the request's pipeline for a tenant.</param>
-        /// <param name="order">The order of the action to execute. Lower values will be executed first.</param>
-        public OrchardCoreBuilder Configure(Action<IApplicationBuilder, IEndpointRouteBuilder> configure, int order = 0)
+    /// <summary>
+    /// This async action gets called for each tenant. Use this method to configure the tenant pipeline.
+    /// </summary>
+    /// <param name="configureAsync">The async action to execute when configuring the request's pipeline for a tenant.</param>
+    /// <param name="order">The order of the action to execute. Lower values will be executed first.</param>
+    public OrchardCoreBuilder Configure(Func<IApplicationBuilder, IEndpointRouteBuilder, IServiceProvider, ValueTask> configureAsync, int order = 0)
+    {
+        if (!_actions.TryGetValue(order, out var actions))
         {
-            return Configure((app, routes, sp) => configure(app, routes), order);
-        }
+            actions = _actions[order] = new StartupActions(order);
 
-        /// <summary>
-        /// This method gets called for each tenant. Use this method to configure the request's pipeline.
-        /// </summary>
-        /// <param name="configure">The action to execute when configuring the request's pipeline for a tenant.</param>
-        /// <param name="order">The order of the action to execute. Lower values will be executed first.</param>
-        public OrchardCoreBuilder Configure(Action<IApplicationBuilder> configure, int order = 0)
-        {
-            return Configure((app, routes, sp) => configure(app), order);
+            ApplicationServices.AddTransient<IStartup>(sp => new StartupActionsStartup(
+                sp.GetRequiredService<IServiceProvider>(), actions, order));
         }
 
-        /// <summary>
-        /// This async action gets called for each tenant. Use this method to configure the tenant pipeline.
-        /// </summary>
-        /// <param name="configureAsync">The async action to execute when configuring the request's pipeline for a tenant.</param>
-        /// <param name="order">The order of the action to execute. Lower values will be executed first.</param>
-        public OrchardCoreBuilder Configure(Func<IApplicationBuilder, IEndpointRouteBuilder, IServiceProvider, ValueTask> configureAsync, int order = 0)
-        {
-            if (!_actions.TryGetValue(order, out var actions))
-            {
-                actions = _actions[order] = new StartupActions(order);
-
-                ApplicationServices.AddTransient<IStartup>(sp => new StartupActionsStartup(
-                    sp.GetRequiredService<IServiceProvider>(), actions, order));
-            }
-
-            actions.AsyncConfigureActions.Add(configureAsync);
+        actions.AsyncConfigureActions.Add(configureAsync);
 
-            return this;
-        }
+        return this;
+    }
 
-        /// <summary>
-        /// This async action gets called for each tenant. Use this method to configure the tenant pipeline.
-        /// </summary>
-        /// <param name="configureAsync">The async action to execute when configuring the request's pipeline for a tenant.</param>
-        /// <param name="order">The order of the action to execute. Lower values will be executed first.</param>
-        public OrchardCoreBuilder Configure(Func<IApplicationBuilder, IEndpointRouteBuilder, ValueTask> configureAsync, int order = 0)
-        {
-            return Configure((app, routes, sp) => configureAsync(app, routes), order);
-        }
+    /// <summary>
+    /// This async action gets called for each tenant. Use this method to configure the tenant pipeline.
+    /// </summary>
+    /// <param name="configureAsync">The async action to execute when configuring the request's pipeline for a tenant.</param>
+    /// <param name="order">The order of the action to execute. Lower values will be executed first.</param>
+    public OrchardCoreBuilder Configure(Func<IApplicationBuilder, IEndpointRouteBuilder, ValueTask> configureAsync, int order = 0)
+    {
+        return Configure((app, routes, sp) => configureAsync(app, routes), order);
+    }
 
-        /// <summary>
-        /// This async action gets called for each tenant. Use this method to configure the tenant pipeline.
-        /// </summary>
-        /// <param name="configureAsync">The async action to execute when configuring the request's pipeline for a tenant.</param>
-        /// <param name="order">The order of the action to execute. Lower values will be executed first.</param>
-        public OrchardCoreBuilder Configure(Func<IApplicationBuilder, ValueTask> configureAsync, int order = 0)
-        {
-            return Configure((app, routes, sp) => configureAsync(app), order);
-        }
+    /// <summary>
+    /// This async action gets called for each tenant. Use this method to configure the tenant pipeline.
+    /// </summary>
+    /// <param name="configureAsync">The async action to execute when configuring the request's pipeline for a tenant.</param>
+    /// <param name="order">The order of the action to execute. Lower values will be executed first.</param>
+    public OrchardCoreBuilder Configure(Func<IApplicationBuilder, ValueTask> configureAsync, int order = 0)
+    {
+        return Configure((app, routes, sp) => configureAsync(app), order);
+    }
 
-        public OrchardCoreBuilder EnableFeature(string id)
+    public OrchardCoreBuilder EnableFeature(string id)
+    {
+        return ConfigureServices(services =>
         {
-            return ConfigureServices(services =>
+            for (var index = 0; index < services.Count; index++)
             {
-                for (var index = 0; index < services.Count; index++)
+                var service = services[index];
+                if (service.GetImplementationInstance() is ShellFeature feature &&
+                    string.Equals(feature.Id, id, StringComparison.OrdinalIgnoreCase))
                 {
-                    var service = services[index];
-                    if (service.GetImplementationInstance() is ShellFeature feature &&
-                        string.Equals(feature.Id, id, StringComparison.OrdinalIgnoreCase))
-                    {
-                        return;
-                    }
+                    return;
                 }
+            }
 
-                services.AddSingleton(new ShellFeature(id, alwaysEnabled: true));
-            });
-        }
+            services.AddSingleton(new ShellFeature(id, alwaysEnabled: true));
+        });
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Builder/StartupActions.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Builder/StartupActions.cs
index 580d2fe3097..b1beec2ef1f 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Builder/StartupActions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Builder/StartupActions.cs
@@ -4,21 +4,20 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Routing;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+internal sealed class StartupActions
 {
-    internal sealed class StartupActions
+    public StartupActions(int order)
     {
-        public StartupActions(int order)
-        {
-            Order = order;
-        }
+        Order = order;
+    }
 
-        public int Order { get; }
+    public int Order { get; }
 
-        public ICollection<Action<IServiceCollection, IServiceProvider>> ConfigureServicesActions { get; } = [];
+    public ICollection<Action<IServiceCollection, IServiceProvider>> ConfigureServicesActions { get; } = [];
 
-        public ICollection<Action<IApplicationBuilder, IEndpointRouteBuilder, IServiceProvider>> ConfigureActions { get; } = [];
+    public ICollection<Action<IApplicationBuilder, IEndpointRouteBuilder, IServiceProvider>> ConfigureActions { get; } = [];
 
-        public ICollection<Func<IApplicationBuilder, IEndpointRouteBuilder, IServiceProvider, ValueTask>> AsyncConfigureActions { get; } = [];
-    }
+    public ICollection<Func<IApplicationBuilder, IEndpointRouteBuilder, IServiceProvider, ValueTask>> AsyncConfigureActions { get; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Builder/StartupActionsStartup.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Builder/StartupActionsStartup.cs
index 9c571616a58..658aa52d479 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Builder/StartupActionsStartup.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Builder/StartupActionsStartup.cs
@@ -4,52 +4,51 @@
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+/// <summary>
+/// Represents a fake Startup class that is composed of Configure and ConfigureServices lambdas.
+/// </summary>
+internal sealed class StartupActionsStartup : StartupBase
 {
-    /// <summary>
-    /// Represents a fake Startup class that is composed of Configure and ConfigureServices lambdas.
-    /// </summary>
-    internal sealed class StartupActionsStartup : StartupBase
-    {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly StartupActions _actions;
+    private readonly IServiceProvider _serviceProvider;
+    private readonly StartupActions _actions;
 
-        public StartupActionsStartup(IServiceProvider serviceProvider, StartupActions actions, int order)
-        {
-            _serviceProvider = serviceProvider;
-            _actions = actions;
-            Order = order;
-        }
+    public StartupActionsStartup(IServiceProvider serviceProvider, StartupActions actions, int order)
+    {
+        _serviceProvider = serviceProvider;
+        _actions = actions;
+        Order = order;
+    }
 
-        public override int Order { get; }
+    public override int Order { get; }
 
-        public override void ConfigureServices(IServiceCollection services)
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        foreach (var configureServices in _actions.ConfigureServicesActions)
         {
-            foreach (var configureServices in _actions.ConfigureServicesActions)
-            {
-                configureServices?.Invoke(services, _serviceProvider);
-            }
+            configureServices?.Invoke(services, _serviceProvider);
         }
+    }
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        foreach (var configure in _actions.ConfigureActions)
         {
-            foreach (var configure in _actions.ConfigureActions)
-            {
-                configure?.Invoke(app, routes, serviceProvider);
-            }
+            configure?.Invoke(app, routes, serviceProvider);
         }
+    }
 
-        public override async ValueTask ConfigureAsync(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    public override async ValueTask ConfigureAsync(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        foreach (var asyncConfigure in _actions.AsyncConfigureActions)
         {
-            foreach (var asyncConfigure in _actions.AsyncConfigureActions)
+            if (asyncConfigure is null)
             {
-                if (asyncConfigure is null)
-                {
-                    continue;
-                }
-
-                await asyncConfigure(app, routes, serviceProvider);
+                continue;
             }
+
+            await asyncConfigure(app, routes, serviceProvider);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Exceptions/ExceptionExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Exceptions/ExceptionExtensions.cs
index 2ccbf4f59bb..0459881d869 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Exceptions/ExceptionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Exceptions/ExceptionExtensions.cs
@@ -3,26 +3,25 @@
 using System.Runtime.InteropServices;
 using System.Security;
 
-namespace OrchardCore.Modules
-{
-    public static class ExceptionExtensions
-    {
-        // As defined in https://github.com/dotnet/runtime/blob/main/src/libraries/Common/src/System/HResults.cs
+namespace OrchardCore.Modules;
 
-        internal const int ERROR_SHARING_VIOLATION = unchecked((int)0x80070020);
-        internal const int ERROR_LOCK_VIOLATION = unchecked((int)0x80070021);
+public static class ExceptionExtensions
+{
+    // As defined in https://github.com/dotnet/runtime/blob/main/src/libraries/Common/src/System/HResults.cs
 
-        public static bool IsFatal(this Exception ex)
-        {
-            return
-                ex is OutOfMemoryException ||
-                ex is SecurityException ||
-                ex is SEHException;
-        }
+    internal const int ERROR_SHARING_VIOLATION = unchecked((int)0x80070020);
+    internal const int ERROR_LOCK_VIOLATION = unchecked((int)0x80070021);
 
-        public static bool IsFileSharingViolation(this Exception ex) =>
-            ex is IOException &&
-            (ex.HResult == ERROR_SHARING_VIOLATION ||
-            ex.HResult == ERROR_LOCK_VIOLATION);
+    public static bool IsFatal(this Exception ex)
+    {
+        return
+            ex is OutOfMemoryException ||
+            ex is SecurityException ||
+            ex is SEHException;
     }
+
+    public static bool IsFileSharingViolation(this Exception ex) =>
+        ex is IOException &&
+        (ex.HResult == ERROR_SHARING_VIOLATION ||
+        ex.HResult == ERROR_LOCK_VIOLATION);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Extensions/InvokeExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Extensions/InvokeExtensions.cs
index eea7d4df0ed..d4319c85844 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Extensions/InvokeExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Extensions/InvokeExtensions.cs
@@ -3,292 +3,291 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+public static class InvokeExtensions
 {
-    public static class InvokeExtensions
+    /// <summary>
+    /// Safely invoke methods by catching non fatal exceptions and logging them.
+    /// </summary>
+    public static void Invoke<TEvents>(this IEnumerable<TEvents> events, Action<TEvents> dispatch, ILogger logger)
     {
-        /// <summary>
-        /// Safely invoke methods by catching non fatal exceptions and logging them.
-        /// </summary>
-        public static void Invoke<TEvents>(this IEnumerable<TEvents> events, Action<TEvents> dispatch, ILogger logger)
+        foreach (var sink in events)
         {
-            foreach (var sink in events)
+            try
             {
-                try
-                {
-                    dispatch(sink);
-                }
-                catch (Exception ex)
-                {
-                    HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
-                }
+                dispatch(sink);
             }
-        }
-
-        /// <summary>
-        /// Safely invoke methods by catching non fatal exceptions and logging them.
-        /// </summary>
-        public static void Invoke<TEvents, T1>(this IEnumerable<TEvents> events, Action<TEvents, T1> dispatch, T1 arg1, ILogger logger)
-        {
-            foreach (var sink in events)
+            catch (Exception ex)
             {
-                try
-                {
-                    dispatch(sink, arg1);
-                }
-                catch (Exception ex)
-                {
-                    HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
-                }
+                HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
             }
         }
+    }
 
-        public static IEnumerable<TResult> Invoke<TEvents, TResult>(this IEnumerable<TEvents> events, Func<TEvents, TResult> dispatch, ILogger logger)
+    /// <summary>
+    /// Safely invoke methods by catching non fatal exceptions and logging them.
+    /// </summary>
+    public static void Invoke<TEvents, T1>(this IEnumerable<TEvents> events, Action<TEvents, T1> dispatch, T1 arg1, ILogger logger)
+    {
+        foreach (var sink in events)
         {
-            var results = new List<TResult>();
-
-            foreach (var sink in events)
+            try
             {
-                try
-                {
-                    var result = dispatch(sink);
-                    results.Add(result);
-                }
-                catch (Exception ex)
-                {
-                    HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
-                }
+                dispatch(sink, arg1);
+            }
+            catch (Exception ex)
+            {
+                HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
             }
-
-            return results;
         }
+    }
 
-        public static IEnumerable<TResult> Invoke<TEvents, T1, TResult>(this IEnumerable<TEvents> events, Func<TEvents, T1, TResult> dispatch, T1 arg1, ILogger logger)
-        {
-            var results = new List<TResult>();
+    public static IEnumerable<TResult> Invoke<TEvents, TResult>(this IEnumerable<TEvents> events, Func<TEvents, TResult> dispatch, ILogger logger)
+    {
+        var results = new List<TResult>();
 
-            foreach (var sink in events)
+        foreach (var sink in events)
+        {
+            try
             {
-                try
-                {
-                    var result = dispatch(sink, arg1);
-                    results.Add(result);
-                }
-                catch (Exception ex)
-                {
-                    HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
-                }
+                var result = dispatch(sink);
+                results.Add(result);
+            }
+            catch (Exception ex)
+            {
+                HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
             }
-
-            return results;
         }
 
-        public static IEnumerable<TResult> Invoke<TEvents, TResult>(this IEnumerable<TEvents> events, Func<TEvents, IEnumerable<TResult>> dispatch, ILogger logger)
-        {
-            var results = new List<TResult>();
+        return results;
+    }
 
-            foreach (var sink in events)
+    public static IEnumerable<TResult> Invoke<TEvents, T1, TResult>(this IEnumerable<TEvents> events, Func<TEvents, T1, TResult> dispatch, T1 arg1, ILogger logger)
+    {
+        var results = new List<TResult>();
+
+        foreach (var sink in events)
+        {
+            try
             {
-                try
-                {
-                    var result = dispatch(sink);
-                    results.AddRange(result);
-                }
-                catch (Exception ex)
-                {
-                    HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
-                }
+                var result = dispatch(sink, arg1);
+                results.Add(result);
+            }
+            catch (Exception ex)
+            {
+                HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
             }
-
-            return results;
         }
 
-        /// <summary>
-        /// Safely invoke methods by catching non fatal exceptions and logging them.
-        /// </summary>
-        public static async Task InvokeAsync<TEvents>(this IEnumerable<TEvents> events, Func<TEvents, Task> dispatch, ILogger logger)
+        return results;
+    }
+
+    public static IEnumerable<TResult> Invoke<TEvents, TResult>(this IEnumerable<TEvents> events, Func<TEvents, IEnumerable<TResult>> dispatch, ILogger logger)
+    {
+        var results = new List<TResult>();
+
+        foreach (var sink in events)
         {
-            foreach (var sink in events)
+            try
+            {
+                var result = dispatch(sink);
+                results.AddRange(result);
+            }
+            catch (Exception ex)
             {
-                try
-                {
-                    await dispatch(sink);
-                }
-                catch (Exception ex)
-                {
-                    HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
-                }
+                HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
             }
         }
 
-        /// <summary>
-        /// Safely invoke methods by catching non fatal exceptions and logging them.
-        /// </summary>
-        public static async Task InvokeAsync<TEvents, T1>(this IEnumerable<TEvents> events, Func<TEvents, T1, Task> dispatch, T1 arg1, ILogger logger)
+        return results;
+    }
+
+    /// <summary>
+    /// Safely invoke methods by catching non fatal exceptions and logging them.
+    /// </summary>
+    public static async Task InvokeAsync<TEvents>(this IEnumerable<TEvents> events, Func<TEvents, Task> dispatch, ILogger logger)
+    {
+        foreach (var sink in events)
         {
-            foreach (var sink in events)
+            try
+            {
+                await dispatch(sink);
+            }
+            catch (Exception ex)
             {
-                try
-                {
-                    await dispatch(sink, arg1);
-                }
-                catch (Exception ex)
-                {
-                    HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
-                }
+                HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
             }
         }
+    }
 
-        /// <summary>
-        /// Safely invoke methods by catching non fatal exceptions and logging them.
-        /// </summary>
-        public static async Task InvokeAsync<TEvents, T1, T2>(this IEnumerable<TEvents> events, Func<TEvents, T1, T2, Task> dispatch, T1 arg1, T2 arg2, ILogger logger)
+    /// <summary>
+    /// Safely invoke methods by catching non fatal exceptions and logging them.
+    /// </summary>
+    public static async Task InvokeAsync<TEvents, T1>(this IEnumerable<TEvents> events, Func<TEvents, T1, Task> dispatch, T1 arg1, ILogger logger)
+    {
+        foreach (var sink in events)
         {
-            foreach (var sink in events)
+            try
             {
-                try
-                {
-                    await dispatch(sink, arg1, arg2);
-                }
-                catch (Exception ex)
-                {
-                    HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
-                }
+                await dispatch(sink, arg1);
+            }
+            catch (Exception ex)
+            {
+                HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
             }
         }
+    }
 
-        /// <summary>
-        /// Safely invoke methods by catching non fatal exceptions and logging them.
-        /// </summary>
-        public static async Task InvokeAsync<TEvents, T1, T2, T3>(this IEnumerable<TEvents> events, Func<TEvents, T1, T2, T3, Task> dispatch, T1 arg1, T2 arg2, T3 arg3, ILogger logger)
+    /// <summary>
+    /// Safely invoke methods by catching non fatal exceptions and logging them.
+    /// </summary>
+    public static async Task InvokeAsync<TEvents, T1, T2>(this IEnumerable<TEvents> events, Func<TEvents, T1, T2, Task> dispatch, T1 arg1, T2 arg2, ILogger logger)
+    {
+        foreach (var sink in events)
         {
-            foreach (var sink in events)
+            try
+            {
+                await dispatch(sink, arg1, arg2);
+            }
+            catch (Exception ex)
             {
-                try
-                {
-                    await dispatch(sink, arg1, arg2, arg3);
-                }
-                catch (Exception ex)
-                {
-                    HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
-                }
+                HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
             }
         }
+    }
 
-        /// <summary>
-        /// Safely invoke methods by catching non fatal exceptions and logging them.
-        /// </summary>
-        public static async Task InvokeAsync<TEvents, T1, T2, T3, T4>(this IEnumerable<TEvents> events, Func<TEvents, T1, T2, T3, T4, Task> dispatch, T1 arg1, T2 arg2, T3 arg3, T4 arg4, ILogger logger)
+    /// <summary>
+    /// Safely invoke methods by catching non fatal exceptions and logging them.
+    /// </summary>
+    public static async Task InvokeAsync<TEvents, T1, T2, T3>(this IEnumerable<TEvents> events, Func<TEvents, T1, T2, T3, Task> dispatch, T1 arg1, T2 arg2, T3 arg3, ILogger logger)
+    {
+        foreach (var sink in events)
         {
-            foreach (var sink in events)
+            try
+            {
+                await dispatch(sink, arg1, arg2, arg3);
+            }
+            catch (Exception ex)
             {
-                try
-                {
-                    await dispatch(sink, arg1, arg2, arg3, arg4);
-                }
-                catch (Exception ex)
-                {
-                    HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
-                }
+                HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
             }
         }
+    }
 
-        /// <summary>
-        /// Safely invoke methods by catching non fatal exceptions and logging them.
-        /// </summary>
-        public static async Task InvokeAsync<TEvents, T1, T2, T3, T4, T5>(this IEnumerable<TEvents> events, Func<TEvents, T1, T2, T3, T4, T5, Task> dispatch, T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, ILogger logger)
+    /// <summary>
+    /// Safely invoke methods by catching non fatal exceptions and logging them.
+    /// </summary>
+    public static async Task InvokeAsync<TEvents, T1, T2, T3, T4>(this IEnumerable<TEvents> events, Func<TEvents, T1, T2, T3, T4, Task> dispatch, T1 arg1, T2 arg2, T3 arg3, T4 arg4, ILogger logger)
+    {
+        foreach (var sink in events)
         {
-            foreach (var sink in events)
+            try
             {
-                try
-                {
-                    await dispatch(sink, arg1, arg2, arg3, arg4, arg5);
-                }
-                catch (Exception ex)
-                {
-                    HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
-                }
+                await dispatch(sink, arg1, arg2, arg3, arg4);
+            }
+            catch (Exception ex)
+            {
+                HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
             }
         }
+    }
 
-        public static async Task<IEnumerable<TResult>> InvokeAsync<TEvents, TResult>(this IEnumerable<TEvents> events, Func<TEvents, Task<TResult>> dispatch, ILogger logger)
+    /// <summary>
+    /// Safely invoke methods by catching non fatal exceptions and logging them.
+    /// </summary>
+    public static async Task InvokeAsync<TEvents, T1, T2, T3, T4, T5>(this IEnumerable<TEvents> events, Func<TEvents, T1, T2, T3, T4, T5, Task> dispatch, T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, ILogger logger)
+    {
+        foreach (var sink in events)
         {
-            var results = new List<TResult>();
-
-            foreach (var sink in events)
+            try
             {
-                try
-                {
-                    var result = await dispatch(sink);
-                    results.Add(result);
-                }
-                catch (Exception ex)
-                {
-                    HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
-                }
+                await dispatch(sink, arg1, arg2, arg3, arg4, arg5);
+            }
+            catch (Exception ex)
+            {
+                HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
             }
-
-            return results;
         }
+    }
 
-        public static async Task<IEnumerable<TResult>> InvokeAsync<TEvents, T1, TResult>(this IEnumerable<TEvents> events, Func<TEvents, T1, Task<TResult>> dispatch, T1 arg1, ILogger logger)
-        {
-            var results = new List<TResult>();
+    public static async Task<IEnumerable<TResult>> InvokeAsync<TEvents, TResult>(this IEnumerable<TEvents> events, Func<TEvents, Task<TResult>> dispatch, ILogger logger)
+    {
+        var results = new List<TResult>();
 
-            foreach (var sink in events)
+        foreach (var sink in events)
+        {
+            try
             {
-                try
-                {
-                    var result = await dispatch(sink, arg1);
-                    results.Add(result);
-                }
-                catch (Exception ex)
-                {
-                    HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
-                }
+                var result = await dispatch(sink);
+                results.Add(result);
+            }
+            catch (Exception ex)
+            {
+                HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
             }
-
-            return results;
         }
 
-        public static async Task<IEnumerable<TResult>> InvokeAsync<TEvents, TResult>(this IEnumerable<TEvents> events, Func<TEvents, Task<IEnumerable<TResult>>> dispatch, ILogger logger)
-        {
-            var results = new List<TResult>();
+        return results;
+    }
+
+    public static async Task<IEnumerable<TResult>> InvokeAsync<TEvents, T1, TResult>(this IEnumerable<TEvents> events, Func<TEvents, T1, Task<TResult>> dispatch, T1 arg1, ILogger logger)
+    {
+        var results = new List<TResult>();
 
-            foreach (var sink in events)
+        foreach (var sink in events)
+        {
+            try
             {
-                try
-                {
-                    var result = await dispatch(sink);
-                    results.AddRange(result);
-                }
-                catch (Exception ex)
-                {
-                    HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
-                }
+                var result = await dispatch(sink, arg1);
+                results.Add(result);
+            }
+            catch (Exception ex)
+            {
+                HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
             }
-
-            return results;
         }
 
-        public static void HandleException(Exception ex, ILogger logger, string sourceType, string method)
+        return results;
+    }
+
+    public static async Task<IEnumerable<TResult>> InvokeAsync<TEvents, TResult>(this IEnumerable<TEvents> events, Func<TEvents, Task<IEnumerable<TResult>>> dispatch, ILogger logger)
+    {
+        var results = new List<TResult>();
+
+        foreach (var sink in events)
         {
-            if (IsLogged(ex))
+            try
             {
-                logger.LogError(ex, "{Type} thrown from {Method} by {Exception}",
-                    sourceType,
-                    method,
-                    ex.GetType().Name);
+                var result = await dispatch(sink);
+                results.AddRange(result);
             }
-
-            if (ex.IsFatal())
+            catch (Exception ex)
             {
-                throw ex;
+                HandleException(ex, logger, typeof(TEvents).Name, sink.GetType().FullName);
             }
         }
-        private static bool IsLogged(Exception ex)
+
+        return results;
+    }
+
+    public static void HandleException(Exception ex, ILogger logger, string sourceType, string method)
+    {
+        if (IsLogged(ex))
+        {
+            logger.LogError(ex, "{Type} thrown from {Method} by {Exception}",
+                sourceType,
+                method,
+                ex.GetType().Name);
+        }
+
+        if (ex.IsFatal())
         {
-            return !ex.IsFatal();
+            throw ex;
         }
     }
+    private static bool IsLogged(Exception ex)
+    {
+        return !ex.IsFatal();
+    }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Extensions/StringExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Extensions/StringExtensions.cs
index 86088bed6f1..21466032633 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Extensions/StringExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Extensions/StringExtensions.cs
@@ -3,25 +3,24 @@
 
 #nullable enable
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+public static class StringExtensions
 {
-    public static class StringExtensions
+    public static byte[] ToByteArray(this string hex)
     {
-        public static byte[] ToByteArray(this string hex)
-        {
-            return Enumerable.Range(0, hex.Length).
-                Where(x => 0 == x % 2).
-                Select(x => Convert.ToByte(hex.Substring(x, 2), 16)).
-                ToArray();
-        }
+        return Enumerable.Range(0, hex.Length).
+            Where(x => 0 == x % 2).
+            Select(x => Convert.ToByte(hex.Substring(x, 2), 16)).
+            ToArray();
+    }
 
-        public static bool EqualsOrdinalIgnoreCase(this string? a, string? b)
-            => string.Equals(a, b, StringComparison.OrdinalIgnoreCase);
+    public static bool EqualsOrdinalIgnoreCase(this string? a, string? b)
+        => string.Equals(a, b, StringComparison.OrdinalIgnoreCase);
 
-        public static bool StartsWithOrdinalIgnoreCase(this string? a, string? b) =>
-            a is not null && b is not null && a.StartsWith(b, StringComparison.OrdinalIgnoreCase);
+    public static bool StartsWithOrdinalIgnoreCase(this string? a, string? b) =>
+        a is not null && b is not null && a.StartsWith(b, StringComparison.OrdinalIgnoreCase);
 
-        public static bool EndsWithOrdinalIgnoreCase(this string? a, string? b) =>
-            a is not null && b is not null && a.EndsWith(b, StringComparison.OrdinalIgnoreCase);
-    }
+    public static bool EndsWithOrdinalIgnoreCase(this string? a, string? b) =>
+        a is not null && b is not null && a.EndsWith(b, StringComparison.OrdinalIgnoreCase);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/FeatureAttribute.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/FeatureAttribute.cs
index 434cb387347..1f2316d7434 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/FeatureAttribute.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/FeatureAttribute.cs
@@ -1,23 +1,22 @@
 using System;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+/// <summary>
+/// An attribute that can associate a service or component with
+/// a specific feature by its name. This component will only
+/// be used if the feature is enabled.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+public class FeatureAttribute : Attribute
 {
-    /// <summary>
-    /// An attribute that can associate a service or component with
-    /// a specific feature by its name. This component will only
-    /// be used if the feature is enabled.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
-    public class FeatureAttribute : Attribute
+    public FeatureAttribute(string featureName)
     {
-        public FeatureAttribute(string featureName)
-        {
-            FeatureName = featureName;
-        }
-
-        /// <summary>
-        /// The name of the feature to assign the component to.
-        /// </summary>
-        public string FeatureName { get; set; }
+        FeatureName = featureName;
     }
+
+    /// <summary>
+    /// The name of the feature to assign the component to.
+    /// </summary>
+    public string FeatureName { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/EmbeddedDirectoryContents.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/EmbeddedDirectoryContents.cs
index 3a67ae8ee7e..1d54aa5c829 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/EmbeddedDirectoryContents.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/EmbeddedDirectoryContents.cs
@@ -4,32 +4,31 @@
 using System.Linq;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.Modules.FileProviders
+namespace OrchardCore.Modules.FileProviders;
+
+public class EmbeddedDirectoryContents : IDirectoryContents
 {
-    public class EmbeddedDirectoryContents : IDirectoryContents
-    {
-        private readonly IList<IFileInfo> _entries;
+    private readonly IList<IFileInfo> _entries;
 
-        public EmbeddedDirectoryContents(IEnumerable<IFileInfo> entries)
-        {
-            ArgumentNullException.ThrowIfNull(entries);
+    public EmbeddedDirectoryContents(IEnumerable<IFileInfo> entries)
+    {
+        ArgumentNullException.ThrowIfNull(entries);
 
-            _entries = entries.ToList();
-        }
+        _entries = entries.ToList();
+    }
 
-        public bool Exists
-        {
-            get { return _entries.Any(); }
-        }
+    public bool Exists
+    {
+        get { return _entries.Any(); }
+    }
 
-        public IEnumerator<IFileInfo> GetEnumerator()
-        {
-            return _entries.GetEnumerator();
-        }
+    public IEnumerator<IFileInfo> GetEnumerator()
+    {
+        return _entries.GetEnumerator();
+    }
 
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return _entries.GetEnumerator();
-        }
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return _entries.GetEnumerator();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/EmbeddedDirectoryInfo.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/EmbeddedDirectoryInfo.cs
index c6e913c9df5..ac313fa3022 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/EmbeddedDirectoryInfo.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/EmbeddedDirectoryInfo.cs
@@ -2,58 +2,57 @@
 using System.IO;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.Modules.FileProviders
+namespace OrchardCore.Modules.FileProviders;
+
+/// <summary>
+/// Represents a directory on a physical filesystem.
+/// </summary>
+public class EmbeddedDirectoryInfo : IFileInfo
 {
     /// <summary>
-    /// Represents a directory on a physical filesystem.
+    /// Initializes an instance of <see cref="EmbeddedDirectoryInfo"/>.
+    /// </summary>
+    /// <param name="name">The directory.</param>
+    public EmbeddedDirectoryInfo(string name)
+    {
+        Name = name;
+    }
+
+    /// <summary>
+    /// Always true.
+    /// </summary>
+    public bool Exists => true;
+
+    /// <summary>
+    /// Always equals -1.
+    /// </summary>
+    public long Length => -1;
+
+    /// <summary>
+    /// Always null.
+    /// </summary>
+    public string PhysicalPath => null;
+
+    /// <inheritdoc />
+    public string Name { get; }
+
+    /// <summary>
+    /// The time when the directory was last written to.
+    /// </summary>
+    public DateTimeOffset LastModified => DateTimeOffset.MinValue;
+
+    /// <summary>
+    /// Always true.
+    /// </summary>
+    public bool IsDirectory => true;
+
+    /// <summary>
+    /// Always throws an exception because read streams are not support on directories.
     /// </summary>
-    public class EmbeddedDirectoryInfo : IFileInfo
+    /// <exception cref="InvalidOperationException">Always thrown.</exception>
+    /// <returns>Never returns.</returns>
+    public Stream CreateReadStream()
     {
-        /// <summary>
-        /// Initializes an instance of <see cref="EmbeddedDirectoryInfo"/>.
-        /// </summary>
-        /// <param name="name">The directory.</param>
-        public EmbeddedDirectoryInfo(string name)
-        {
-            Name = name;
-        }
-
-        /// <summary>
-        /// Always true.
-        /// </summary>
-        public bool Exists => true;
-
-        /// <summary>
-        /// Always equals -1.
-        /// </summary>
-        public long Length => -1;
-
-        /// <summary>
-        /// Always null.
-        /// </summary>
-        public string PhysicalPath => null;
-
-        /// <inheritdoc />
-        public string Name { get; }
-
-        /// <summary>
-        /// The time when the directory was last written to.
-        /// </summary>
-        public DateTimeOffset LastModified => DateTimeOffset.MinValue;
-
-        /// <summary>
-        /// Always true.
-        /// </summary>
-        public bool IsDirectory => true;
-
-        /// <summary>
-        /// Always throws an exception because read streams are not support on directories.
-        /// </summary>
-        /// <exception cref="InvalidOperationException">Always thrown.</exception>
-        /// <returns>Never returns.</returns>
-        public Stream CreateReadStream()
-        {
-            throw new InvalidOperationException("Cannot create a stream for a directory.");
-        }
+        throw new InvalidOperationException("Cannot create a stream for a directory.");
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/FileInfoExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/FileInfoExtensions.cs
index 8e3c9826b0c..a2060fee7e6 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/FileInfoExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/FileInfoExtensions.cs
@@ -3,30 +3,29 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.Modules.FileProviders
+namespace OrchardCore.Modules.FileProviders;
+
+public static class FileInfoExtensions
 {
-    public static class FileInfoExtensions
+    public static IEnumerable<string> ReadAllLines(this IFileInfo fileInfo)
+        => ReadAllLinesAsync(fileInfo).GetAwaiter().GetResult();
+
+    public static async Task<IEnumerable<string>> ReadAllLinesAsync(this IFileInfo fileInfo)
     {
-        public static IEnumerable<string> ReadAllLines(this IFileInfo fileInfo)
-            => ReadAllLinesAsync(fileInfo).GetAwaiter().GetResult();
+        var lines = new List<string>();
 
-        public static async Task<IEnumerable<string>> ReadAllLinesAsync(this IFileInfo fileInfo)
+        if (fileInfo?.Exists ?? false)
         {
-            var lines = new List<string>();
+            await using var reader = fileInfo.CreateReadStream();
+            using var sr = new StreamReader(reader);
 
-            if (fileInfo?.Exists ?? false)
+            string line;
+            while ((line = await sr.ReadLineAsync()) != null)
             {
-                await using var reader = fileInfo.CreateReadStream();
-                using var sr = new StreamReader(reader);
-
-                string line;
-                while ((line = await sr.ReadLineAsync()) != null)
-                {
-                    lines.Add(line);
-                }
+                lines.Add(line);
             }
-
-            return lines;
         }
+
+        return lines;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/IStaticFileProvider.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/IStaticFileProvider.cs
index 7d7f6e254a1..3b1389dcb88 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/IStaticFileProvider.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/IStaticFileProvider.cs
@@ -1,12 +1,11 @@
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.Modules.FileProviders
+namespace OrchardCore.Modules.FileProviders;
+
+/// <summary>
+/// This custom <see cref="IFileProvider"/> implementation provides Di registration identification
+/// for IStaticFileProviders that should be served via UseStaticFiles.
+/// </summary>
+public interface IStaticFileProvider : IFileProvider
 {
-    /// <summary>
-    /// This custom <see cref="IFileProvider"/> implementation provides Di registration identification
-    /// for IStaticFileProviders that should be served via UseStaticFiles.
-    /// </summary>
-    public interface IStaticFileProvider : IFileProvider
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/IVirtualPathBaseProvider.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/IVirtualPathBaseProvider.cs
index d95065f7602..2c9e7371829 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/IVirtualPathBaseProvider.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/IVirtualPathBaseProvider.cs
@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Modules.FileProviders
+namespace OrchardCore.Modules.FileProviders;
+
+public interface IVirtualPathBaseProvider
 {
-    public interface IVirtualPathBaseProvider
-    {
-        PathString VirtualPathBase { get; }
-    }
+    PathString VirtualPathBase { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/NormalizedPaths.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/NormalizedPaths.cs
index 61aea12344b..fc9a6e84ca5 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/NormalizedPaths.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/FileProviders/NormalizedPaths.cs
@@ -2,47 +2,46 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OrchardCore.Modules.FileProviders
+namespace OrchardCore.Modules.FileProviders;
+
+public static class NormalizedPaths
 {
-    public static class NormalizedPaths
+    /// <summary>
+    /// Use a collection of file paths to resolve files and subfolders directly under a given folder.
+    /// Paths need to be normalized by using '/' for the directory separator and with no leading '/'.
+    /// </summary>
+    public static void ResolveFolderContents(string folder, IEnumerable<string> normalizedPaths,
+        out IEnumerable<string> filePaths, out IEnumerable<string> folderPaths)
     {
-        /// <summary>
-        /// Use a collection of file paths to resolve files and subfolders directly under a given folder.
-        /// Paths need to be normalized by using '/' for the directory separator and with no leading '/'.
-        /// </summary>
-        public static void ResolveFolderContents(string folder, IEnumerable<string> normalizedPaths,
-            out IEnumerable<string> filePaths, out IEnumerable<string> folderPaths)
+        var files = new HashSet<string>(StringComparer.Ordinal);
+        var folders = new HashSet<string>(StringComparer.Ordinal);
+
+        // Ensure a trailing slash.
+        if (folder[^1] != '/')
+        {
+            folder += '/';
+        }
+
+        foreach (var path in normalizedPaths.Where(a => a.StartsWith(folder, StringComparison.Ordinal)))
         {
-            var files = new HashSet<string>(StringComparer.Ordinal);
-            var folders = new HashSet<string>(StringComparer.Ordinal);
+            // Resolve the subpath relative to the folder.
+            var subPath = path[folder.Length..];
+            var index = subPath.IndexOf('/');
 
-            // Ensure a trailing slash.
-            if (folder[^1] != '/')
+            // If no more slash.
+            if (index == -1)
             {
-                folder += '/';
+                // It's a file.
+                files.Add(path);
             }
-
-            foreach (var path in normalizedPaths.Where(a => a.StartsWith(folder, StringComparison.Ordinal)))
+            else
             {
-                // Resolve the subpath relative to the folder.
-                var subPath = path[folder.Length..];
-                var index = subPath.IndexOf('/');
-
-                // If no more slash.
-                if (index == -1)
-                {
-                    // It's a file.
-                    files.Add(path);
-                }
-                else
-                {
-                    // Otherwise add the 1st subfolder path.
-                    folders.Add(subPath[..index]);
-                }
+                // Otherwise add the 1st subfolder path.
+                folders.Add(subPath[..index]);
             }
-
-            filePaths = files;
-            folderPaths = folders;
         }
+
+        filePaths = files;
+        folderPaths = folders;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/IAsyncStartup.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/IAsyncStartup.cs
index 24519cea75e..b1ef7c690e3 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/IAsyncStartup.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/IAsyncStartup.cs
@@ -3,19 +3,18 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Routing;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+/// <summary>
+/// An implementation of this interface allows to configure asynchronously the tenant pipeline.
+/// </summary>
+public interface IAsyncStartup
 {
     /// <summary>
-    /// An implementation of this interface allows to configure asynchronously the tenant pipeline.
+    /// This method gets called by the runtime. Use this method to configure the tenant pipeline.
     /// </summary>
-    public interface IAsyncStartup
-    {
-        /// <summary>
-        /// This method gets called by the runtime. Use this method to configure the tenant pipeline.
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="routes"></param>
-        /// <param name="serviceProvider"></param>
-        ValueTask ConfigureAsync(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider);
-    }
+    /// <param name="builder"></param>
+    /// <param name="routes"></param>
+    /// <param name="serviceProvider"></param>
+    ValueTask ConfigureAsync(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/IModularTenantEvents.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/IModularTenantEvents.cs
index 7db9acf5d7a..085391a8694 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/IModularTenantEvents.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/IModularTenantEvents.cs
@@ -1,39 +1,38 @@
 using System.Threading.Tasks;
 using OrchardCore.Environment.Shell.Removing;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+public interface IModularTenantEvents
+{
+    Task ActivatingAsync();
+    Task ActivatedAsync();
+    Task TerminatingAsync();
+    Task TerminatedAsync();
+    Task RemovingAsync(ShellRemovingContext context);
+}
+
+public class ModularTenantEvents : IModularTenantEvents
 {
-    public interface IModularTenantEvents
+    public virtual Task ActivatedAsync()
     {
-        Task ActivatingAsync();
-        Task ActivatedAsync();
-        Task TerminatingAsync();
-        Task TerminatedAsync();
-        Task RemovingAsync(ShellRemovingContext context);
+        return Task.CompletedTask;
     }
 
-    public class ModularTenantEvents : IModularTenantEvents
+    public virtual Task ActivatingAsync()
     {
-        public virtual Task ActivatedAsync()
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task ActivatingAsync()
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task TerminatedAsync()
-        {
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
+    }
 
-        public virtual Task TerminatingAsync()
-        {
-            return Task.CompletedTask;
-        }
+    public virtual Task TerminatedAsync()
+    {
+        return Task.CompletedTask;
+    }
 
-        public virtual Task RemovingAsync(ShellRemovingContext context) => Task.CompletedTask;
+    public virtual Task TerminatingAsync()
+    {
+        return Task.CompletedTask;
     }
+
+    public virtual Task RemovingAsync(ShellRemovingContext context) => Task.CompletedTask;
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/IModuleNamesProvider.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/IModuleNamesProvider.cs
index 0e882f36b9b..3466141f3cb 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/IModuleNamesProvider.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/IModuleNamesProvider.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+public interface IModuleNamesProvider
 {
-    public interface IModuleNamesProvider
-    {
-        IEnumerable<string> GetModuleNames();
-    }
+    IEnumerable<string> GetModuleNames();
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/IModuleStaticFileProvider.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/IModuleStaticFileProvider.cs
index 5ef2150150f..30a262734ca 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/IModuleStaticFileProvider.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/IModuleStaticFileProvider.cs
@@ -1,13 +1,12 @@
 using Microsoft.Extensions.FileProviders;
 using OrchardCore.Modules.FileProviders;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+/// <summary>
+/// This custom <see cref="IFileProvider"/> implementation provides Di registration identification
+/// for IStaticFileProviders that should be served via UseStaticFiles.
+/// </summary>
+public interface IModuleStaticFileProvider : IStaticFileProvider
 {
-    /// <summary>
-    /// This custom <see cref="IFileProvider"/> implementation provides Di registration identification
-    /// for IStaticFileProviders that should be served via UseStaticFiles.
-    /// </summary>
-    public interface IModuleStaticFileProvider : IStaticFileProvider
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/IStartup.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/IStartup.cs
index c2a96df291c..272328100d2 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/IStartup.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/IStartup.cs
@@ -3,37 +3,36 @@
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+/// <summary>
+/// An implementation of this interface is used to initialize the services and HTTP request
+/// pipeline of a module.
+/// </summary>
+public interface IStartup
 {
     /// <summary>
-    /// An implementation of this interface is used to initialize the services and HTTP request
-    /// pipeline of a module.
+    /// Get the value to use to order startups to configure services. The default is 0.
     /// </summary>
-    public interface IStartup
-    {
-        /// <summary>
-        /// Get the value to use to order startups to configure services. The default is 0.
-        /// </summary>
-        int Order { get; }
+    int Order { get; }
 
-        /// <summary>
-        /// Get the value to use to order startups to build the pipeline. The default is the 'Order' property.
-        /// </summary>
-        int ConfigureOrder { get; }
+    /// <summary>
+    /// Get the value to use to order startups to build the pipeline. The default is the 'Order' property.
+    /// </summary>
+    int ConfigureOrder { get; }
 
-        /// <summary>
-        /// This method gets called by the runtime. Use this method to add services to the container.
-        /// For more information on how to configure your application, visit http://go.microsoft.com/fwlink/?LinkID=398940.
-        /// </summary>
-        /// <param name="services">The collection of service descriptors.</param>
-        void ConfigureServices(IServiceCollection services);
+    /// <summary>
+    /// This method gets called by the runtime. Use this method to add services to the container.
+    /// For more information on how to configure your application, visit http://go.microsoft.com/fwlink/?LinkID=398940.
+    /// </summary>
+    /// <param name="services">The collection of service descriptors.</param>
+    void ConfigureServices(IServiceCollection services);
 
-        /// <summary>
-        /// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="routes"></param>
-        /// <param name="serviceProvider"></param>
-        void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider);
-    }
+    /// <summary>
+    /// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+    /// </summary>
+    /// <param name="builder"></param>
+    /// <param name="routes"></param>
+    /// <param name="serviceProvider"></param>
+    void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/FeatureAttribute.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/FeatureAttribute.cs
index 4da9d96c12e..d47e123b849 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/FeatureAttribute.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/FeatureAttribute.cs
@@ -2,344 +2,343 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OrchardCore.Modules.Manifest
-{
-    using static StringSplitOptions;
+namespace OrchardCore.Modules.Manifest;
 
-    /// <summary>
-    /// Defines a Feature in a Module, can be used multiple times.
-    /// If at least one Feature is defined, the Module default feature is ignored.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
-    public class FeatureAttribute : Attribute
-    {
-        protected internal const string DefaultName = "";
+using static StringSplitOptions;
 
-        protected internal const string DefaultDescription = "";
+/// <summary>
+/// Defines a Feature in a Module, can be used multiple times.
+/// If at least one Feature is defined, the Module default feature is ignored.
+/// </summary>
+[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
+public class FeatureAttribute : Attribute
+{
+    protected internal const string DefaultName = "";
 
-        protected internal const string Uncategorized = nameof(Uncategorized);
+    protected internal const string DefaultDescription = "";
 
-        protected internal const string DefaultCategory = "";
+    protected internal const string Uncategorized = nameof(Uncategorized);
 
-        protected internal const string DefaultFeatureDependencies = "";
+    protected internal const string DefaultCategory = "";
 
-        protected internal const bool DefaultDefaultTenantOnly = false;
+    protected internal const string DefaultFeatureDependencies = "";
 
-        protected internal const bool DefaultAlwaysEnabled = false;
+    protected internal const bool DefaultDefaultTenantOnly = false;
 
-        /// <summary>
-        /// Default parameterless ctor.
-        /// </summary>
-        /// <remarks>Cannot route to <c>this(...)</c> in any form here due to restrictions on the Id property setter.</remarks>
-        public FeatureAttribute()
-        {
-            // Defaults are defaults, caller may initialize the properties themselves.
-        }
+    protected internal const bool DefaultAlwaysEnabled = false;
 
-        /// <summary>
-        /// Constructs an instance of the attribute with some default values.
-        /// </summary>
-        /// <param name="id">An identifier overriding the Name.</param>
-        /// <param name="description">A simple feature description.</param>
-        /// <param name="featureDependencies">Zero or more delimited feature dependencies,
-        /// corresponding to each of the feature <see cref="Name"/> properties.</param>
-        /// <param name="defaultTenant">Whether considered default tenant only.</param>
-        /// <param name="alwaysEnabled">Whether feature is always enabled.</param>
-        /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        public FeatureAttribute(
-            string id,
-            string description,
-            string featureDependencies,
-            object defaultTenant,
-            object alwaysEnabled,
-            object enabledByDependencyOnly
-        ) : this(
-            id,
-            default,
-            default,
-            default,
-            description,
-            featureDependencies,
-            defaultTenant,
-            alwaysEnabled,
-            enabledByDependencyOnly
-        )
-        {
-        }
+    /// <summary>
+    /// Default parameterless ctor.
+    /// </summary>
+    /// <remarks>Cannot route to <c>this(...)</c> in any form here due to restrictions on the Id property setter.</remarks>
+    public FeatureAttribute()
+    {
+        // Defaults are defaults, caller may initialize the properties themselves.
+    }
 
-        /// <summary>
-        /// Constructs an instance of the attribute with some default values.
-        /// </summary>
-        /// <param name="id">An identifier overriding the Name.</param>
-        /// <param name="name">The feature name, defaults to <see cref="Id"/> when null or
-        /// blank.</param>
-        /// <param name="description">A simple feature description.</param>
-        /// <param name="featureDependencies">Zero or more delimited feature dependencies,
-        /// corresponding to each of the feature <see cref="Name"/> properties.</param>
-        /// <param name="defaultTenant">Whether considered default tenant only.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        /// <param name="alwaysEnabled">Whether feature is always enabled.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        public FeatureAttribute(
-            string id,
-            string name,
-            string description,
-            string featureDependencies,
-            object defaultTenant,
-            object alwaysEnabled,
-            object enabledByDependencyOnly
-        ) : this(
-            id,
-            name,
-            default,
-            default,
-            description,
-            featureDependencies,
-            defaultTenant,
-            alwaysEnabled,
-            enabledByDependencyOnly
-        )
-        {
-        }
+    /// <summary>
+    /// Constructs an instance of the attribute with some default values.
+    /// </summary>
+    /// <param name="id">An identifier overriding the Name.</param>
+    /// <param name="description">A simple feature description.</param>
+    /// <param name="featureDependencies">Zero or more delimited feature dependencies,
+    /// corresponding to each of the feature <see cref="Name"/> properties.</param>
+    /// <param name="defaultTenant">Whether considered default tenant only.</param>
+    /// <param name="alwaysEnabled">Whether feature is always enabled.</param>
+    /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    public FeatureAttribute(
+        string id,
+        string description,
+        string featureDependencies,
+        object defaultTenant,
+        object alwaysEnabled,
+        object enabledByDependencyOnly
+    ) : this(
+        id,
+        default,
+        default,
+        default,
+        description,
+        featureDependencies,
+        defaultTenant,
+        alwaysEnabled,
+        enabledByDependencyOnly
+    )
+    {
+    }
 
-        /// <summary>
-        /// Constructs an instance of the attribute with some default values.
-        /// </summary>
-        /// <param name="id">An identifier overriding the Name.</param>
-        /// <param name="name">The feature name, defaults to <see cref="Id"/> when null or
-        /// blank.</param>
-        /// <param name="category">A simple feature category.</param>
-        /// <param name="priority">The priority of the Feature.</param>
-        /// <param name="description">A simple feature description.</param>
-        /// <param name="featureDependencies">Zero or more delimited feature dependencies,
-        /// corresponding to each of the feature <see cref="Name"/> properties.</param>
-        /// <param name="defaultTenant">Whether considered default tenant only.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        /// <param name="alwaysEnabled">Whether feature is always enabled.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        public FeatureAttribute(
-            string id,
-            string name,
-            string category,
-            string priority,
-            string description,
-            string featureDependencies,
-            object defaultTenant,
-            object alwaysEnabled,
-            object enabledByDependencyOnly
-        )
-        {
-            Id = id;
-            Name = name;
-            Category = category ?? DefaultCategory;
-            Priority = priority ?? string.Empty;
-            Description = description ?? DefaultDescription;
-            DelimitedDependencies = featureDependencies ?? DefaultFeatureDependencies;
-
-            // https://docs.microsoft.com/en-us/dotnet/api/system.convert.toboolean
-            static bool ToBoolean(object value) => Convert.ToBoolean(value);
-
-            DefaultTenantOnly = ToBoolean(defaultTenant);
-            IsAlwaysEnabled = ToBoolean(alwaysEnabled);
-            EnabledByDependencyOnly = ToBoolean(enabledByDependencyOnly);
-        }
+    /// <summary>
+    /// Constructs an instance of the attribute with some default values.
+    /// </summary>
+    /// <param name="id">An identifier overriding the Name.</param>
+    /// <param name="name">The feature name, defaults to <see cref="Id"/> when null or
+    /// blank.</param>
+    /// <param name="description">A simple feature description.</param>
+    /// <param name="featureDependencies">Zero or more delimited feature dependencies,
+    /// corresponding to each of the feature <see cref="Name"/> properties.</param>
+    /// <param name="defaultTenant">Whether considered default tenant only.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    /// <param name="alwaysEnabled">Whether feature is always enabled.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    public FeatureAttribute(
+        string id,
+        string name,
+        string description,
+        string featureDependencies,
+        object defaultTenant,
+        object alwaysEnabled,
+        object enabledByDependencyOnly
+    ) : this(
+        id,
+        name,
+        default,
+        default,
+        description,
+        featureDependencies,
+        defaultTenant,
+        alwaysEnabled,
+        enabledByDependencyOnly
+    )
+    {
+    }
+
+    /// <summary>
+    /// Constructs an instance of the attribute with some default values.
+    /// </summary>
+    /// <param name="id">An identifier overriding the Name.</param>
+    /// <param name="name">The feature name, defaults to <see cref="Id"/> when null or
+    /// blank.</param>
+    /// <param name="category">A simple feature category.</param>
+    /// <param name="priority">The priority of the Feature.</param>
+    /// <param name="description">A simple feature description.</param>
+    /// <param name="featureDependencies">Zero or more delimited feature dependencies,
+    /// corresponding to each of the feature <see cref="Name"/> properties.</param>
+    /// <param name="defaultTenant">Whether considered default tenant only.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    /// <param name="alwaysEnabled">Whether feature is always enabled.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    public FeatureAttribute(
+        string id,
+        string name,
+        string category,
+        string priority,
+        string description,
+        string featureDependencies,
+        object defaultTenant,
+        object alwaysEnabled,
+        object enabledByDependencyOnly
+    )
+    {
+        Id = id;
+        Name = name;
+        Category = category ?? DefaultCategory;
+        Priority = priority ?? string.Empty;
+        Description = description ?? DefaultDescription;
+        DelimitedDependencies = featureDependencies ?? DefaultFeatureDependencies;
+
+        // https://docs.microsoft.com/en-us/dotnet/api/system.convert.toboolean
+        static bool ToBoolean(object value) => Convert.ToBoolean(value);
+
+        DefaultTenantOnly = ToBoolean(defaultTenant);
+        IsAlwaysEnabled = ToBoolean(alwaysEnabled);
+        EnabledByDependencyOnly = ToBoolean(enabledByDependencyOnly);
+    }
 
-        /// <summary>
-        /// Whether the feature exists based on the <see cref="Id"/>.
-        /// </summary>
-        public virtual bool Exists => !string.IsNullOrEmpty(Id);
+    /// <summary>
+    /// Whether the feature exists based on the <see cref="Id"/>.
+    /// </summary>
+    public virtual bool Exists => !string.IsNullOrEmpty(Id);
 
-        private string _id;
+    private string _id;
 
-        /// <summary>
-        /// Gets or sets the feature identifier. Identifier is required.
-        /// </summary>
-        public virtual string Id
+    /// <summary>
+    /// Gets or sets the feature identifier. Identifier is required.
+    /// </summary>
+    public virtual string Id
+    {
+        get => _id;
+        set
         {
-            get => _id;
-            set
+            // Guards setting Id with strictly invalid values.
+            if (string.IsNullOrEmpty(value))
             {
-                // Guards setting Id with strictly invalid values.
-                if (string.IsNullOrEmpty(value))
+                throw new InvalidOperationException($"When '{nameof(Id)}' has been provided it should not be null or empty.")
                 {
-                    throw new InvalidOperationException($"When '{nameof(Id)}' has been provided it should not be null or empty.")
-                    {
-                        Data = { { nameof(value), value } }
-                    };
-                }
-
-                _id = value;
+                    Data = { { nameof(value), value } }
+                };
             }
-        }
 
-        private string _name;
-
-        /// <summary>
-        /// Returns the <see cref="string"/> <paramref name="s"/> as is, or <c>null</c> when that
-        /// or <see cref="string.Empty"/>.
-        /// </summary>
-        /// <param name="s">The string value to consider.</param>
-        /// <returns>The <paramref name="s"/> value as is, or Null when either that or Empty.</returns>
-        /// <see cref="string.IsNullOrEmpty(string?)"/>
-        internal static string StringOrNull(string s) => string.IsNullOrEmpty(s) ? null : s;
-
-        /// <summary>
-        /// Gets or sets the human readable or canonical feature name. <see cref="Id"/> will be
-        /// returned when not provided or blank.
-        /// </summary>
-        public virtual string Name
-        {
-            get => StringOrNull(_name) ?? Id;
-            set => _name = value;
+            _id = value;
         }
+    }
 
-        /// <summary>
-        /// Yields return of the <paramref name="values"/>.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="values"></param>
-        /// <returns></returns>
-        protected static IEnumerable<T> GetValues<T>(params T[] values)
-        {
-            foreach (var value in values)
-            {
-                yield return value;
-            }
-        }
+    private string _name;
 
-        /// <summary>
-        /// Gets or sets a brief summary of what the feature does.
-        /// </summary>
-        public virtual string Description { get; set; } = DefaultDescription;
-
-        /// <summary>
-        /// Describes the first or default Feature starting with This instance,
-        /// which defines a <see cref="Description"/>.
-        /// </summary>
-        /// <param name="additionalFeatures">Additional Features to consider in the aggregate.</param>
-        /// <returns>The first or default Description with optional back stop features.</returns>
-        internal virtual string Describe(params FeatureAttribute[] additionalFeatures)
-        {
-            static bool IsNotNullOrEmpty(string s) => !string.IsNullOrEmpty(s);
-            var firstOrDefaultResult = GetValues(this).Concat(additionalFeatures)
-                .Select(feature => feature.Description)
-                .FirstOrDefault(IsNotNullOrEmpty);
-            return firstOrDefaultResult ?? DefaultDescription;
-        }
+    /// <summary>
+    /// Returns the <see cref="string"/> <paramref name="s"/> as is, or <c>null</c> when that
+    /// or <see cref="string.Empty"/>.
+    /// </summary>
+    /// <param name="s">The string value to consider.</param>
+    /// <returns>The <paramref name="s"/> value as is, or Null when either that or Empty.</returns>
+    /// <see cref="string.IsNullOrEmpty(string?)"/>
+    internal static string StringOrNull(string s) => string.IsNullOrEmpty(s) ? null : s;
+
+    /// <summary>
+    /// Gets or sets the human readable or canonical feature name. <see cref="Id"/> will be
+    /// returned when not provided or blank.
+    /// </summary>
+    public virtual string Name
+    {
+        get => StringOrNull(_name) ?? Id;
+        set => _name = value;
+    }
 
-        /// <summary>
-        /// <see cref="TrimEntries"/> | <see cref="RemoveEmptyEntries"/>, trim the entries, and
-        /// remove the empty ones.
-        /// </summary>
-        internal protected const StringSplitOptions DefaultSplitOptions = TrimEntries | RemoveEmptyEntries;
-
-        /// <summary>
-        /// Gets the default known ListDelims supporting <see cref="Dependencies"/> splits, etc.
-        /// Semi-colon (&apos;;&apos;) delimiters are most common, expected from a <em>CSPROJ</em>
-        /// perspective. Also common are comma (&apos;,&apos;) and space (&apos; &apos;)
-        /// delimiters.
-        /// </summary>
-        /// <see cref="string.Split(char[], StringSplitOptions)"/>
-        internal protected static char[] ListDelims { get; } = GetValues(';', ',', ' ').ToArray();
-
-        /// <summary>
-        /// Set-only <see cref="Dependencies"/> property.
-        /// </summary>
-        private string DelimitedDependencies
+    /// <summary>
+    /// Yields return of the <paramref name="values"/>.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="values"></param>
+    /// <returns></returns>
+    protected static IEnumerable<T> GetValues<T>(params T[] values)
+    {
+        foreach (var value in values)
         {
-            set => Dependencies = (value ?? DefaultFeatureDependencies).Trim().Split(ListDelims, DefaultSplitOptions);
+            yield return value;
         }
+    }
 
-        private string[] _dependencies = GetValues<string>().ToArray();
+    /// <summary>
+    /// Gets or sets a brief summary of what the feature does.
+    /// </summary>
+    public virtual string Description { get; set; } = DefaultDescription;
 
-        /// <summary>
-        /// Gets or sets an array of Feature Dependencies. Used to arrange drivers, handlers
-        /// invoked during startup and so forth.
-        /// </summary>
-        public virtual string[] Dependencies
-        {
-            get => _dependencies;
-            set => _dependencies = (value ?? GetValues<string>()).Select(_ => _.Trim()).ToArray();
-        }
+    /// <summary>
+    /// Describes the first or default Feature starting with This instance,
+    /// which defines a <see cref="Description"/>.
+    /// </summary>
+    /// <param name="additionalFeatures">Additional Features to consider in the aggregate.</param>
+    /// <returns>The first or default Description with optional back stop features.</returns>
+    internal virtual string Describe(params FeatureAttribute[] additionalFeatures)
+    {
+        static bool IsNotNullOrEmpty(string s) => !string.IsNullOrEmpty(s);
+        var firstOrDefaultResult = GetValues(this).Concat(additionalFeatures)
+            .Select(feature => feature.Description)
+            .FirstOrDefault(IsNotNullOrEmpty);
+        return firstOrDefaultResult ?? DefaultDescription;
+    }
 
-        protected internal const int DefaultPriority = 0;
-
-        /// <summary>
-        /// Gets or sets the feature priority without breaking the <see cref="Dependencies"/>
-        /// order. The higher is the priority, the later the drivers / handlers are invoked.
-        /// </summary>
-        /// <remarks>The default value is aligned with <see cref="DefaultPriority"/>, consistent
-        /// with the baseline, however, could be nullified, which would in turn favor the parent
-        /// <see cref="ModuleAttribute"/>.</remarks>
-        public virtual string Priority { get; set; } = $"{DefaultPriority}";
-
-        /// <summary>
-        /// Gets the <see cref="Priority"/>, parsed and ready to go for Internal use. May yield
-        /// <c>null</c> when failing to <see cref="int.TryParse(string, out int)"/>.
-        /// </summary>
-        internal virtual int? InternalPriority => int.TryParse(Priority, out var result) ? result : null;
-
-        /// <summary>
-        /// Prioritizes the Features starting with This one, concatenating
-        /// <paramref name="additionalFeatures"/>, and lifting the <see cref="InternalPriority"/>
-        /// from there. We prefer the first non Null Priority, default
-        /// <see cref="DefaultPriority"/>.
-        /// </summary>
-        /// <param name="additionalFeatures"></param>
-        /// <returns></returns>
-        internal virtual int Prioritize(params FeatureAttribute[] additionalFeatures)
-        {
-            var firstPriority = GetValues(this).Concat(additionalFeatures)
-                .Select(feature => feature.InternalPriority)
-                .FirstOrDefault(priority => priority.HasValue);
-            return firstPriority ?? DefaultPriority;
-        }
+    /// <summary>
+    /// <see cref="TrimEntries"/> | <see cref="RemoveEmptyEntries"/>, trim the entries, and
+    /// remove the empty ones.
+    /// </summary>
+    internal protected const StringSplitOptions DefaultSplitOptions = TrimEntries | RemoveEmptyEntries;
 
-        private string _category = DefaultCategory;
+    /// <summary>
+    /// Gets the default known ListDelims supporting <see cref="Dependencies"/> splits, etc.
+    /// Semi-colon (&apos;;&apos;) delimiters are most common, expected from a <em>CSPROJ</em>
+    /// perspective. Also common are comma (&apos;,&apos;) and space (&apos; &apos;)
+    /// delimiters.
+    /// </summary>
+    /// <see cref="string.Split(char[], StringSplitOptions)"/>
+    internal protected static char[] ListDelims { get; } = GetValues(';', ',', ' ').ToArray();
 
-        /// <summary>
-        /// Gets or sets the Category for use with the Module.
-        /// </summary>
-        public virtual string Category
-        {
-            get => _category;
-            set => _category = (value ?? DefaultCategory).Trim();
-        }
+    /// <summary>
+    /// Set-only <see cref="Dependencies"/> property.
+    /// </summary>
+    private string DelimitedDependencies
+    {
+        set => Dependencies = (value ?? DefaultFeatureDependencies).Trim().Split(ListDelims, DefaultSplitOptions);
+    }
 
-        /// <summary>
-        /// Categorizes This <see cref="Category"/> using <paramref name="additionalFeatures"/> as
-        /// back stops, presents the <see cref="Category"/> that is not Null nor Empty, or returns
-        /// <see cref="DefaultCategory"/> by default.
-        /// </summary>
-        /// <param name="additionalFeatures">Additional Feature instances to use as potential back stops.</param>
-        /// <returns>The Category normalized across This instance and optional Module.</returns>
-        internal virtual string Categorize(params FeatureAttribute[] additionalFeatures)
-        {
-            static bool IsNotNullOrEmpty(string s) => !string.IsNullOrEmpty(s);
-            var categories = GetValues(this).Concat(additionalFeatures).Select(feature => feature.Category);
-            var category = categories.FirstOrDefault(IsNotNullOrEmpty);
-            // TODO: MWP: 'Uncategorized'? or is empty acceptable here?
-            return category ?? Uncategorized;
-        }
+    private string[] _dependencies = GetValues<string>().ToArray();
 
-        /// <summary>
-        /// Set to <c>true</c> to only allow the <em>Default tenant to enable or disable</em> the feature.
-        /// </summary>
-        public virtual bool DefaultTenantOnly { get; set; }
+    /// <summary>
+    /// Gets or sets an array of Feature Dependencies. Used to arrange drivers, handlers
+    /// invoked during startup and so forth.
+    /// </summary>
+    public virtual string[] Dependencies
+    {
+        get => _dependencies;
+        set => _dependencies = (value ?? GetValues<string>()).Select(_ => _.Trim()).ToArray();
+    }
 
-        /// <summary>
-        /// Once enabled, check whether the feature cannot be disabled. Defaults to <c>false</c>.
-        /// </summary>
-        public virtual bool IsAlwaysEnabled { get; set; }
+    protected internal const int DefaultPriority = 0;
 
-        /// <summary>
-        /// Set to <c>true</c> to make the feature available by dependency only.
-        /// </summary>
-        public virtual bool EnabledByDependencyOnly { get; set; }
+    /// <summary>
+    /// Gets or sets the feature priority without breaking the <see cref="Dependencies"/>
+    /// order. The higher is the priority, the later the drivers / handlers are invoked.
+    /// </summary>
+    /// <remarks>The default value is aligned with <see cref="DefaultPriority"/>, consistent
+    /// with the baseline, however, could be nullified, which would in turn favor the parent
+    /// <see cref="ModuleAttribute"/>.</remarks>
+    public virtual string Priority { get; set; } = $"{DefaultPriority}";
+
+    /// <summary>
+    /// Gets the <see cref="Priority"/>, parsed and ready to go for Internal use. May yield
+    /// <c>null</c> when failing to <see cref="int.TryParse(string, out int)"/>.
+    /// </summary>
+    internal virtual int? InternalPriority => int.TryParse(Priority, out var result) ? result : null;
+
+    /// <summary>
+    /// Prioritizes the Features starting with This one, concatenating
+    /// <paramref name="additionalFeatures"/>, and lifting the <see cref="InternalPriority"/>
+    /// from there. We prefer the first non Null Priority, default
+    /// <see cref="DefaultPriority"/>.
+    /// </summary>
+    /// <param name="additionalFeatures"></param>
+    /// <returns></returns>
+    internal virtual int Prioritize(params FeatureAttribute[] additionalFeatures)
+    {
+        var firstPriority = GetValues(this).Concat(additionalFeatures)
+            .Select(feature => feature.InternalPriority)
+            .FirstOrDefault(priority => priority.HasValue);
+        return firstPriority ?? DefaultPriority;
     }
+
+    private string _category = DefaultCategory;
+
+    /// <summary>
+    /// Gets or sets the Category for use with the Module.
+    /// </summary>
+    public virtual string Category
+    {
+        get => _category;
+        set => _category = (value ?? DefaultCategory).Trim();
+    }
+
+    /// <summary>
+    /// Categorizes This <see cref="Category"/> using <paramref name="additionalFeatures"/> as
+    /// back stops, presents the <see cref="Category"/> that is not Null nor Empty, or returns
+    /// <see cref="DefaultCategory"/> by default.
+    /// </summary>
+    /// <param name="additionalFeatures">Additional Feature instances to use as potential back stops.</param>
+    /// <returns>The Category normalized across This instance and optional Module.</returns>
+    internal virtual string Categorize(params FeatureAttribute[] additionalFeatures)
+    {
+        static bool IsNotNullOrEmpty(string s) => !string.IsNullOrEmpty(s);
+        var categories = GetValues(this).Concat(additionalFeatures).Select(feature => feature.Category);
+        var category = categories.FirstOrDefault(IsNotNullOrEmpty);
+        // TODO: MWP: 'Uncategorized'? or is empty acceptable here?
+        return category ?? Uncategorized;
+    }
+
+    /// <summary>
+    /// Set to <c>true</c> to only allow the <em>Default tenant to enable or disable</em> the feature.
+    /// </summary>
+    public virtual bool DefaultTenantOnly { get; set; }
+
+    /// <summary>
+    /// Once enabled, check whether the feature cannot be disabled. Defaults to <c>false</c>.
+    /// </summary>
+    public virtual bool IsAlwaysEnabled { get; set; }
+
+    /// <summary>
+    /// Set to <c>true</c> to make the feature available by dependency only.
+    /// </summary>
+    public virtual bool EnabledByDependencyOnly { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ModuleAssetAttribute.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ModuleAssetAttribute.cs
index e22cfebb600..00774321998 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ModuleAssetAttribute.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ModuleAssetAttribute.cs
@@ -1,21 +1,20 @@
 using System;
 
-namespace OrchardCore.Modules.Manifest
+namespace OrchardCore.Modules.Manifest;
+
+/// <summary>
+/// Maps a module asset to its project location while in debug mode, auto generated on building.
+/// </summary>
+[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
+public class ModuleAssetAttribute : Attribute
 {
-    /// <summary>
-    /// Maps a module asset to its project location while in debug mode, auto generated on building.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
-    public class ModuleAssetAttribute : Attribute
+    public ModuleAssetAttribute(string asset)
     {
-        public ModuleAssetAttribute(string asset)
-        {
-            Asset = asset ?? string.Empty;
-        }
-
-        /// <Summary>
-        /// A module asset in the form of '{ModuleAssetPath}|{ProjectAssetPath}'.
-        /// </Summary>
-        public string Asset { get; }
+        Asset = asset ?? string.Empty;
     }
+
+    /// <Summary>
+    /// A module asset in the form of '{ModuleAssetPath}|{ProjectAssetPath}'.
+    /// </Summary>
+    public string Asset { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ModuleAttribute.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ModuleAttribute.cs
index 79ef52a3d1a..3c94811920c 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ModuleAttribute.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ModuleAttribute.cs
@@ -2,347 +2,346 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OrchardCore.Modules.Manifest
-{
-    /// <summary>
-    /// Defines a Module which is composed of features. If the Module has only one default
-    /// feature, it may be defined there.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false, Inherited = false)]
-    public class ModuleAttribute : FeatureAttribute
-    {
-        internal const string DefaultAuthor = "";
+namespace OrchardCore.Modules.Manifest;
 
-        internal const string DefaultWebsiteUrl = "";
+/// <summary>
+/// Defines a Module which is composed of features. If the Module has only one default
+/// feature, it may be defined there.
+/// </summary>
+[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false, Inherited = false)]
+public class ModuleAttribute : FeatureAttribute
+{
+    internal const string DefaultAuthor = "";
 
-        internal const string DefaultVersionZero = "0.0";
+    internal const string DefaultWebsiteUrl = "";
 
-        internal const string DefaultTags = "";
+    internal const string DefaultVersionZero = "0.0";
 
-        /// <summary>
-        /// Default parameterless ctor.
-        /// </summary>
-        public ModuleAttribute() : base()
-        {
-        }
+    internal const string DefaultTags = "";
 
-        /// <summary>
-        /// Ctor allowing <paramref name="author"/>, as well as defaults for
-        /// <paramref name="websiteUrl"/>, <paramref name="semVer"/>, and <paramref name="tags"/>.
-        /// </summary>
-        /// <param name="id">The identifier for the Module.</param>
-        /// <param name="description">A simple feature description.</param>
-        /// <param name="author">The module author name.</param>
-        /// <param name="semVer">Semantic Version string.</param>
-        /// <param name="websiteUrl">The module website URL.</param>
-        /// <param name="featureDependencies">Zero or more delimited feature dependencies,
-        /// corresponding to each of the feature <see cref="FeatureAttribute.Name"/>
-        /// properties.</param>
-        /// <param name="tags">Tags associated with the Module.</param>
-        /// <param name="defaultTenant">Whether considered default tenant only.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        /// <param name="alwaysEnabled">Whether feature is always enabled.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        /// <see cref="!:https://semver.org">Semantic Versioning.</see>
-        /// <remarks>At least <paramref name="author" /> expected herein to differentiate with
-        /// parameterless ctor.</remarks>
-        /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        public ModuleAttribute(
-            string id,
-            string description,
-            string author,
-            string semVer,
-            string websiteUrl,
-            string featureDependencies,
-            string tags,
-            object defaultTenant,
-            object alwaysEnabled,
-            object enabledByDependencyOnly
-        ) : this(
-            id,
-            default,
-            default,
-            default,
-            description,
-            author,
-            semVer,
-            websiteUrl,
-            featureDependencies,
-            tags,
-            defaultTenant,
-            alwaysEnabled,
-            enabledByDependencyOnly
-        )
-        {
-        }
+    /// <summary>
+    /// Default parameterless ctor.
+    /// </summary>
+    public ModuleAttribute() : base()
+    {
+    }
 
-        /// <summary>
-        /// Ctor allowing <paramref name="author"/>, as well as defaults for
-        /// <paramref name="websiteUrl"/>, <paramref name="semVer"/>, and <paramref name="tags"/>.
-        /// </summary>
-        /// <param name="id">The identifier for the Module.</param>
-        /// <param name="name">The feature name, defaults to <see cref="FeatureAttribute.Id"/>
-        /// when null or blank.</param>
-        /// <param name="description">A simple feature description.</param>
-        /// <param name="author">The module author name.</param>
-        /// <param name="semVer">Semantic Version string.</param>
-        /// <param name="websiteUrl">The module website URL.</param>
-        /// <param name="featureDependencies">Zero or more delimited feature dependencies,
-        /// corresponding to each of the feature <see cref="FeatureAttribute.Name"/>
-        /// properties.</param>
-        /// <param name="tags">Tags associated with the Module.</param>
-        /// <param name="defaultTenant">Whether considered default tenant only.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        /// <param name="alwaysEnabled">Whether feature is always enabled.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        /// <see cref="!:https://semver.org">Semantic Versioning.</see>
-        /// <remarks>At least <paramref name="author" /> expected herein to differentiate with
-        /// parameterless ctor.</remarks>
-        /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        public ModuleAttribute(
-            string id,
-            string name,
-            string description,
-            string author,
-            string semVer,
-            string websiteUrl,
-            string featureDependencies,
-            string tags,
-            object defaultTenant,
-            object alwaysEnabled,
-            object enabledByDependencyOnly
-        ) : this(
-            id,
-            name,
-            default,
-            default,
-            description,
-            author,
-            semVer,
-            websiteUrl,
-            featureDependencies,
-            tags,
-            defaultTenant,
-            alwaysEnabled,
-            enabledByDependencyOnly
-        )
-        {
-        }
+    /// <summary>
+    /// Ctor allowing <paramref name="author"/>, as well as defaults for
+    /// <paramref name="websiteUrl"/>, <paramref name="semVer"/>, and <paramref name="tags"/>.
+    /// </summary>
+    /// <param name="id">The identifier for the Module.</param>
+    /// <param name="description">A simple feature description.</param>
+    /// <param name="author">The module author name.</param>
+    /// <param name="semVer">Semantic Version string.</param>
+    /// <param name="websiteUrl">The module website URL.</param>
+    /// <param name="featureDependencies">Zero or more delimited feature dependencies,
+    /// corresponding to each of the feature <see cref="FeatureAttribute.Name"/>
+    /// properties.</param>
+    /// <param name="tags">Tags associated with the Module.</param>
+    /// <param name="defaultTenant">Whether considered default tenant only.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    /// <param name="alwaysEnabled">Whether feature is always enabled.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    /// <see cref="!:https://semver.org">Semantic Versioning.</see>
+    /// <remarks>At least <paramref name="author" /> expected herein to differentiate with
+    /// parameterless ctor.</remarks>
+    /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    public ModuleAttribute(
+        string id,
+        string description,
+        string author,
+        string semVer,
+        string websiteUrl,
+        string featureDependencies,
+        string tags,
+        object defaultTenant,
+        object alwaysEnabled,
+        object enabledByDependencyOnly
+    ) : this(
+        id,
+        default,
+        default,
+        default,
+        description,
+        author,
+        semVer,
+        websiteUrl,
+        featureDependencies,
+        tags,
+        defaultTenant,
+        alwaysEnabled,
+        enabledByDependencyOnly
+    )
+    {
+    }
 
-        /// <summary>
-        /// Ctor allowing <paramref name="author"/>, as well as defaults for
-        /// <paramref name="websiteUrl"/>, <paramref name="semVer"/>, and <paramref name="tags"/>.
-        /// </summary>
-        /// <param name="id">The identifier for the Module.</param>
-        /// <param name="name">The feature name, defaults to <see cref="FeatureAttribute.Id"/>
-        /// when null or blank.</param>
-        /// <param name="category">A simple feature category.</param>
-        /// <param name="priority">Priority for the Module.</param>
-        /// <param name="description">A simple feature description.</param>
-        /// <param name="author">The module author name.</param>
-        /// <param name="semVer">Semantic Version string.</param>
-        /// <param name="featureDependencies">Zero or more delimited feature dependencies,
-        /// corresponding to each of the feature <see cref="FeatureAttribute.Name"/>
-        /// properties.</param>
-        /// <param name="websiteUrl">The module website URL.</param>
-        /// <param name="tags">Tags associated with the Module.</param>
-        /// <param name="defaultTenant">Whether considered default tenant only.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        /// <param name="alwaysEnabled">Whether feature is always enabled.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        /// <see cref="!:https://semver.org">Semantic Versioning.</see>
-        /// <remarks>At least <paramref name="author" /> expected herein to differentiate with
-        /// parameterless ctor.</remarks>
-        /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        public ModuleAttribute(
-            string id,
-            string name,
-            string category,
-            string priority,
-            string description,
-            string author,
-            string semVer,
-            string websiteUrl,
-            string featureDependencies,
-            string tags,
-            object defaultTenant,
-            object alwaysEnabled,
-            object enabledByDependencyOnly
-        ) : base(
-            id,
-            name,
-            category,
-            priority,
-            description,
-            featureDependencies,
-            defaultTenant,
-            alwaysEnabled,
-            enabledByDependencyOnly
-        )
-        {
-            Author = author;
-            Website = websiteUrl;
-            Version = semVer;
-            DelimitedTags = tags;
-        }
+    /// <summary>
+    /// Ctor allowing <paramref name="author"/>, as well as defaults for
+    /// <paramref name="websiteUrl"/>, <paramref name="semVer"/>, and <paramref name="tags"/>.
+    /// </summary>
+    /// <param name="id">The identifier for the Module.</param>
+    /// <param name="name">The feature name, defaults to <see cref="FeatureAttribute.Id"/>
+    /// when null or blank.</param>
+    /// <param name="description">A simple feature description.</param>
+    /// <param name="author">The module author name.</param>
+    /// <param name="semVer">Semantic Version string.</param>
+    /// <param name="websiteUrl">The module website URL.</param>
+    /// <param name="featureDependencies">Zero or more delimited feature dependencies,
+    /// corresponding to each of the feature <see cref="FeatureAttribute.Name"/>
+    /// properties.</param>
+    /// <param name="tags">Tags associated with the Module.</param>
+    /// <param name="defaultTenant">Whether considered default tenant only.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    /// <param name="alwaysEnabled">Whether feature is always enabled.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    /// <see cref="!:https://semver.org">Semantic Versioning.</see>
+    /// <remarks>At least <paramref name="author" /> expected herein to differentiate with
+    /// parameterless ctor.</remarks>
+    /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    public ModuleAttribute(
+        string id,
+        string name,
+        string description,
+        string author,
+        string semVer,
+        string websiteUrl,
+        string featureDependencies,
+        string tags,
+        object defaultTenant,
+        object alwaysEnabled,
+        object enabledByDependencyOnly
+    ) : this(
+        id,
+        name,
+        default,
+        default,
+        description,
+        author,
+        semVer,
+        websiteUrl,
+        featureDependencies,
+        tags,
+        defaultTenant,
+        alwaysEnabled,
+        enabledByDependencyOnly
+    )
+    {
+    }
 
-        /// <summary>
-        /// Ctor allowing <paramref name="author"/>, as well as defaults for
-        /// <paramref name="websiteUrl"/>, <paramref name="semVer"/>, and <paramref name="tags"/>.
-        /// </summary>
-        /// <param name="id">The identifier for the Module.</param>
-        /// <param name="name">The feature name, defaults to <see cref="FeatureAttribute.Id"/>
-        /// when null or blank.</param>
-        /// <param name="type">User provided type of the Module.</param>
-        /// <param name="category">A simple feature category.</param>
-        /// <param name="priority">Priority for the Module.</param>
-        /// <param name="description">A simple feature description.</param>
-        /// <param name="author">The module author name.</param>
-        /// <param name="semVer">Semantic Version string.</param>
-        /// <param name="featureDependencies">Zero or more delimited feature dependencies,
-        /// corresponding to each of the feature <see cref="FeatureAttribute.Name"/>
-        /// properties.</param>
-        /// <param name="websiteUrl">The module website URL.</param>
-        /// <param name="tags">Tags associated with the Module.</param>
-        /// <param name="defaultTenant">Whether considered default tenant only.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        /// <param name="alwaysEnabled">Whether feature is always enabled.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        /// <see cref="!:https://semver.org">Semantic Versioning.</see>
-        /// <remarks>At least <paramref name="author" /> expected herein to differentiate with
-        /// parameterless ctor.</remarks>
-        /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        public ModuleAttribute(
-            string id,
-            string name,
-            string type,
-            string category,
-            string priority,
-            string description,
-            string author,
-            string semVer,
-            string websiteUrl,
-            string featureDependencies,
-            string tags,
-            object defaultTenant,
-            object alwaysEnabled,
-            object enabledByDependencyOnly
-        ) : this(
-            id,
-            name,
-            category,
-            priority,
-            description,
-            author,
-            semVer,
-            websiteUrl,
-            featureDependencies,
-            tags,
-            defaultTenant,
-            alwaysEnabled,
-            enabledByDependencyOnly
-        )
-        {
-            type = (type ?? string.Empty).Trim();
-            _type = string.IsNullOrEmpty(type) ? null : type;
-        }
+    /// <summary>
+    /// Ctor allowing <paramref name="author"/>, as well as defaults for
+    /// <paramref name="websiteUrl"/>, <paramref name="semVer"/>, and <paramref name="tags"/>.
+    /// </summary>
+    /// <param name="id">The identifier for the Module.</param>
+    /// <param name="name">The feature name, defaults to <see cref="FeatureAttribute.Id"/>
+    /// when null or blank.</param>
+    /// <param name="category">A simple feature category.</param>
+    /// <param name="priority">Priority for the Module.</param>
+    /// <param name="description">A simple feature description.</param>
+    /// <param name="author">The module author name.</param>
+    /// <param name="semVer">Semantic Version string.</param>
+    /// <param name="featureDependencies">Zero or more delimited feature dependencies,
+    /// corresponding to each of the feature <see cref="FeatureAttribute.Name"/>
+    /// properties.</param>
+    /// <param name="websiteUrl">The module website URL.</param>
+    /// <param name="tags">Tags associated with the Module.</param>
+    /// <param name="defaultTenant">Whether considered default tenant only.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    /// <param name="alwaysEnabled">Whether feature is always enabled.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    /// <see cref="!:https://semver.org">Semantic Versioning.</see>
+    /// <remarks>At least <paramref name="author" /> expected herein to differentiate with
+    /// parameterless ctor.</remarks>
+    /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    public ModuleAttribute(
+        string id,
+        string name,
+        string category,
+        string priority,
+        string description,
+        string author,
+        string semVer,
+        string websiteUrl,
+        string featureDependencies,
+        string tags,
+        object defaultTenant,
+        object alwaysEnabled,
+        object enabledByDependencyOnly
+    ) : base(
+        id,
+        name,
+        category,
+        priority,
+        description,
+        featureDependencies,
+        defaultTenant,
+        alwaysEnabled,
+        enabledByDependencyOnly
+    )
+    {
+        Author = author;
+        Website = websiteUrl;
+        Version = semVer;
+        DelimitedTags = tags;
+    }
 
-        /// <summary>
-        /// Returns the <see cref="System.Reflection.MemberInfo.Name"/> less the
-        /// <see cref="Attribute"/> suffix when present.
-        /// </summary>
-        /// <param name="attributeType"></param>
-        /// <returns></returns>
-        protected internal static string GetAttributePrefix(Type attributeType)
-        {
-            const string attributeSuffix = nameof(Attribute);
+    /// <summary>
+    /// Ctor allowing <paramref name="author"/>, as well as defaults for
+    /// <paramref name="websiteUrl"/>, <paramref name="semVer"/>, and <paramref name="tags"/>.
+    /// </summary>
+    /// <param name="id">The identifier for the Module.</param>
+    /// <param name="name">The feature name, defaults to <see cref="FeatureAttribute.Id"/>
+    /// when null or blank.</param>
+    /// <param name="type">User provided type of the Module.</param>
+    /// <param name="category">A simple feature category.</param>
+    /// <param name="priority">Priority for the Module.</param>
+    /// <param name="description">A simple feature description.</param>
+    /// <param name="author">The module author name.</param>
+    /// <param name="semVer">Semantic Version string.</param>
+    /// <param name="featureDependencies">Zero or more delimited feature dependencies,
+    /// corresponding to each of the feature <see cref="FeatureAttribute.Name"/>
+    /// properties.</param>
+    /// <param name="websiteUrl">The module website URL.</param>
+    /// <param name="tags">Tags associated with the Module.</param>
+    /// <param name="defaultTenant">Whether considered default tenant only.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    /// <param name="alwaysEnabled">Whether feature is always enabled.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    /// <see cref="!:https://semver.org">Semantic Versioning.</see>
+    /// <remarks>At least <paramref name="author" /> expected herein to differentiate with
+    /// parameterless ctor.</remarks>
+    /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    public ModuleAttribute(
+        string id,
+        string name,
+        string type,
+        string category,
+        string priority,
+        string description,
+        string author,
+        string semVer,
+        string websiteUrl,
+        string featureDependencies,
+        string tags,
+        object defaultTenant,
+        object alwaysEnabled,
+        object enabledByDependencyOnly
+    ) : this(
+        id,
+        name,
+        category,
+        priority,
+        description,
+        author,
+        semVer,
+        websiteUrl,
+        featureDependencies,
+        tags,
+        defaultTenant,
+        alwaysEnabled,
+        enabledByDependencyOnly
+    )
+    {
+        type = (type ?? string.Empty).Trim();
+        _type = string.IsNullOrEmpty(type) ? null : type;
+    }
 
-            // Drops the 'Attribute' suffix from the conventional abbreviation, or leaves it alone
-            static string GetTypeNamePrefix(string typeName) =>
-                typeName.EndsWith(attributeSuffix)
-                ? typeName[..^attributeSuffix.Length]
-                : typeName
-                ;
+    /// <summary>
+    /// Returns the <see cref="System.Reflection.MemberInfo.Name"/> less the
+    /// <see cref="Attribute"/> suffix when present.
+    /// </summary>
+    /// <param name="attributeType"></param>
+    /// <returns></returns>
+    protected internal static string GetAttributePrefix(Type attributeType)
+    {
+        const string attributeSuffix = nameof(Attribute);
 
-            return GetTypeNamePrefix(attributeType.Name);
-        }
+        // Drops the 'Attribute' suffix from the conventional abbreviation, or leaves it alone
+        static string GetTypeNamePrefix(string typeName) =>
+            typeName.EndsWith(attributeSuffix)
+            ? typeName[..^attributeSuffix.Length]
+            : typeName
+            ;
 
-        private string _type;
+        return GetTypeNamePrefix(attributeType.Name);
+    }
 
-        /// <summary>
-        /// Gets or sets the Type. Allows authors to identify the attribute by a logical,
-        /// human-readable Type. Defaults to the abbreviated <see cref="Attribute"/> class name,
-        /// sans suffix.
-        /// </summary>
-        public virtual string Type
-        {
-            get => _type ??= GetAttributePrefix(GetType());
-            protected internal set => _type = value?.Trim();
-        }
+    private string _type;
 
-        private string _author = DefaultAuthor;
+    /// <summary>
+    /// Gets or sets the Type. Allows authors to identify the attribute by a logical,
+    /// human-readable Type. Defaults to the abbreviated <see cref="Attribute"/> class name,
+    /// sans suffix.
+    /// </summary>
+    public virtual string Type
+    {
+        get => _type ??= GetAttributePrefix(GetType());
+        protected internal set => _type = value?.Trim();
+    }
 
-        /// <summary>
-        /// Gets or sets the name of the developer.
-        /// </summary>
-        /// <see cref="DefaultAuthor" />
-        public virtual string Author
-        {
-            get => _author;
-            set => _author = (value ?? DefaultAuthor).Trim();
-        }
+    private string _author = DefaultAuthor;
 
-        private string _website = DefaultWebsiteUrl;
+    /// <summary>
+    /// Gets or sets the name of the developer.
+    /// </summary>
+    /// <see cref="DefaultAuthor" />
+    public virtual string Author
+    {
+        get => _author;
+        set => _author = (value ?? DefaultAuthor).Trim();
+    }
 
-        /// <summary>
-        /// Gets or sets the URL for the website of the developer.
-        /// </summary>
-        /// <see cref="DefaultWebsiteUrl" />
-        public virtual string Website
-        {
-            get => _website;
-            set => _website = (value ?? DefaultWebsiteUrl).Trim();
-        }
+    private string _website = DefaultWebsiteUrl;
 
-        private string _version = DefaultVersionZero;
+    /// <summary>
+    /// Gets or sets the URL for the website of the developer.
+    /// </summary>
+    /// <see cref="DefaultWebsiteUrl" />
+    public virtual string Website
+    {
+        get => _website;
+        set => _website = (value ?? DefaultWebsiteUrl).Trim();
+    }
 
-        /// <summary>
-        /// Gets or sets the Semantic Version string.
-        /// </summary>
-        /// <see cref="!:https://semver.org">Semantic Versioning.</see>
-        /// <see cref="DefaultVersionZero" />
-        public virtual string Version
-        {
-            get => _version;
-            set => _version = (value ?? DefaultVersionZero).Trim();
-        }
+    private string _version = DefaultVersionZero;
 
-        /// <summary>
-        /// Set-only <see cref="Tags"/> property.
-        /// </summary>
-        private string DelimitedTags
-        {
-            set => Tags = (value ?? DefaultTags).Trim().Split(ListDelims, DefaultSplitOptions);
-        }
+    /// <summary>
+    /// Gets or sets the Semantic Version string.
+    /// </summary>
+    /// <see cref="!:https://semver.org">Semantic Versioning.</see>
+    /// <see cref="DefaultVersionZero" />
+    public virtual string Version
+    {
+        get => _version;
+        set => _version = (value ?? DefaultVersionZero).Trim();
+    }
 
-        private string[] _tags = GetValues<string>().ToArray();
+    /// <summary>
+    /// Set-only <see cref="Tags"/> property.
+    /// </summary>
+    private string DelimitedTags
+    {
+        set => Tags = (value ?? DefaultTags).Trim().Split(ListDelims, DefaultSplitOptions);
+    }
 
-        /// <summary>
-        /// Gets or sets an array of enumerated Tags.
-        /// </summary>
-        public virtual string[] Tags
-        {
-            get => _tags;
-            set => _tags = (value ?? GetValues<string>()).Select(_ => _.Trim()).ToArray();
-        }
+    private string[] _tags = GetValues<string>().ToArray();
 
-        /// <summary>
-        /// Gets a list of Features attributes associated with the Module.
-        /// </summary>
-        public virtual List<FeatureAttribute> Features { get; } = GetValues<FeatureAttribute>().ToList();
+    /// <summary>
+    /// Gets or sets an array of enumerated Tags.
+    /// </summary>
+    public virtual string[] Tags
+    {
+        get => _tags;
+        set => _tags = (value ?? GetValues<string>()).Select(_ => _.Trim()).ToArray();
     }
+
+    /// <summary>
+    /// Gets a list of Features attributes associated with the Module.
+    /// </summary>
+    public virtual List<FeatureAttribute> Features { get; } = GetValues<FeatureAttribute>().ToList();
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ModuleMarkerAttribute.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ModuleMarkerAttribute.cs
index bcbac3e58e8..7ed4d5fbc0b 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ModuleMarkerAttribute.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ModuleMarkerAttribute.cs
@@ -1,25 +1,24 @@
 using System;
 
-namespace OrchardCore.Modules.Manifest
+namespace OrchardCore.Modules.Manifest;
+
+/// <summary>
+/// Marks an assembly as a module of a given type, auto generated on building.
+/// </summary>
+[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false, Inherited = false)]
+public class ModuleMarkerAttribute : ModuleAttribute
 {
     /// <summary>
-    /// Marks an assembly as a module of a given type, auto generated on building.
+    /// Constructs the attribute given <paramref name="id"/> and <paramref name="type"/>.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false, Inherited = false)]
-    public class ModuleMarkerAttribute : ModuleAttribute
+    /// <param name="id">The identifier for the Module.</param>
+    /// <param name="type">Allows authors to specify a module specific Type.</param>
+    public ModuleMarkerAttribute(
+        string id,
+        string type
+    )
     {
-        /// <summary>
-        /// Constructs the attribute given <paramref name="id"/> and <paramref name="type"/>.
-        /// </summary>
-        /// <param name="id">The identifier for the Module.</param>
-        /// <param name="type">Allows authors to specify a module specific Type.</param>
-        public ModuleMarkerAttribute(
-            string id,
-            string type
-        )
-        {
-            Id = id;
-            Type = type;
-        }
+        Id = id;
+        Type = type;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ModuleNameAttribute.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ModuleNameAttribute.cs
index 5323a49f369..cfc4bc582df 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ModuleNameAttribute.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ModuleNameAttribute.cs
@@ -1,21 +1,20 @@
 using System;
 
-namespace OrchardCore.Modules.Manifest
+namespace OrchardCore.Modules.Manifest;
+
+/// <summary>
+/// Enlists the package or project name of a referenced module, auto generated on building.
+/// </summary>
+[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
+public class ModuleNameAttribute : Attribute
 {
-    /// <summary>
-    /// Enlists the package or project name of a referenced module, auto generated on building.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
-    public class ModuleNameAttribute : Attribute
+    public ModuleNameAttribute(string name)
     {
-        public ModuleNameAttribute(string name)
-        {
-            Name = name ?? string.Empty;
-        }
-
-        /// <Summary>
-        /// The package or project name of the referenced module.
-        /// </Summary>
-        public string Name { get; }
+        Name = name ?? string.Empty;
     }
+
+    /// <Summary>
+    /// The package or project name of the referenced module.
+    /// </Summary>
+    public string Name { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Model/ITimeZone.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Model/ITimeZone.cs
index 5401cef150c..11192349e0b 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Model/ITimeZone.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Model/ITimeZone.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+/// <summary>
+/// Represents a time zone.
+/// </summary>
+public interface ITimeZone
 {
-    /// <summary>
-    /// Represents a time zone.
-    /// </summary>
-    public interface ITimeZone
-    {
-        string TimeZoneId { get; set; }
-    }
+    string TimeZoneId { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/ModularApplicationContext.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/ModularApplicationContext.cs
index e4af891e4c8..7302ee30f24 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/ModularApplicationContext.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/ModularApplicationContext.cs
@@ -4,59 +4,58 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+public class ModularApplicationContext : IApplicationContext
 {
-    public class ModularApplicationContext : IApplicationContext
-    {
-        private readonly IHostEnvironment _environment;
-        private readonly IEnumerable<IModuleNamesProvider> _moduleNamesProviders;
-        private Application _application;
-        private static readonly object _initLock = new();
+    private readonly IHostEnvironment _environment;
+    private readonly IEnumerable<IModuleNamesProvider> _moduleNamesProviders;
+    private Application _application;
+    private static readonly object _initLock = new();
 
-        public ModularApplicationContext(IHostEnvironment environment, IEnumerable<IModuleNamesProvider> moduleNamesProviders)
-        {
-            _environment = environment;
-            _moduleNamesProviders = moduleNamesProviders;
-        }
+    public ModularApplicationContext(IHostEnvironment environment, IEnumerable<IModuleNamesProvider> moduleNamesProviders)
+    {
+        _environment = environment;
+        _moduleNamesProviders = moduleNamesProviders;
+    }
 
-        public Application Application
+    public Application Application
+    {
+        get
         {
-            get
-            {
-                EnsureInitialized();
-                return _application;
-            }
+            EnsureInitialized();
+            return _application;
         }
+    }
 
-        private void EnsureInitialized()
+    private void EnsureInitialized()
+    {
+        if (_application == null)
         {
-            if (_application == null)
+            lock (_initLock)
             {
-                lock (_initLock)
-                {
-                    _application ??= new Application(_environment, GetModules());
-                }
+                _application ??= new Application(_environment, GetModules());
             }
         }
+    }
 
-        private ConcurrentBag<Module> GetModules()
+    private ConcurrentBag<Module> GetModules()
+    {
+        var modules = new ConcurrentBag<Module>
         {
-            var modules = new ConcurrentBag<Module>
-            {
-                new(_environment.ApplicationName, true),
-            };
+            new(_environment.ApplicationName, true),
+        };
 
-            var names = _moduleNamesProviders
-                .SelectMany(p => p.GetModuleNames())
-                .Where(n => n != _environment.ApplicationName)
-                .Distinct();
+        var names = _moduleNamesProviders
+            .SelectMany(p => p.GetModuleNames())
+            .Where(n => n != _environment.ApplicationName)
+            .Distinct();
 
-            Parallel.ForEach(names, new ParallelOptions { MaxDegreeOfParallelism = 8 }, (name) =>
-            {
-                modules.Add(new Module(name, false));
-            });
+        Parallel.ForEach(names, new ParallelOptions { MaxDegreeOfParallelism = 8 }, (name) =>
+        {
+            modules.Add(new Module(name, false));
+        });
 
-            return modules;
-        }
+        return modules;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Module.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Module.cs
index 9064da4e837..e012486abdb 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Module.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Module.cs
@@ -6,158 +6,157 @@
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.FileProviders.Embedded;
 
-namespace OrchardCore.Modules
-{
-    using Manifest;
+namespace OrchardCore.Modules;
+
+using Manifest;
 
-    public class Module
+public class Module
+{
+    public const string WebRootPath = "wwwroot";
+    public const string WebRoot = WebRootPath + "/";
+
+    private readonly string _baseNamespace;
+    private readonly DateTimeOffset _lastModified;
+    private readonly Dictionary<string, IFileInfo> _fileInfos = [];
+
+    // TODO: MWP: trace back to usage, etc...
+    // TODO: MWP: perhaps we filter up front so we are not discovering all this during ctor...
+    // TODO: MWP: 'that' being the Module Context, etc...
+    /// <summary>
+    /// Constructs an instance of the Module.
+    /// </summary>
+    /// <param name="assemblyName">The assembly name to use when loading itself.</param>
+    /// <param name="isApplication">Whether the Module may be considered to be the &quot;Application&quot;.</param>
+    public Module(string assemblyName, bool isApplication = false)
     {
-        public const string WebRootPath = "wwwroot";
-        public const string WebRoot = WebRootPath + "/";
-
-        private readonly string _baseNamespace;
-        private readonly DateTimeOffset _lastModified;
-        private readonly Dictionary<string, IFileInfo> _fileInfos = [];
-
-        // TODO: MWP: trace back to usage, etc...
-        // TODO: MWP: perhaps we filter up front so we are not discovering all this during ctor...
-        // TODO: MWP: 'that' being the Module Context, etc...
-        /// <summary>
-        /// Constructs an instance of the Module.
-        /// </summary>
-        /// <param name="assemblyName">The assembly name to use when loading itself.</param>
-        /// <param name="isApplication">Whether the Module may be considered to be the &quot;Application&quot;.</param>
-        public Module(string assemblyName, bool isApplication = false)
+        if (!string.IsNullOrWhiteSpace(assemblyName))
         {
-            if (!string.IsNullOrWhiteSpace(assemblyName))
-            {
-                Assembly = Assembly.Load(new AssemblyName(assemblyName));
+            Assembly = Assembly.Load(new AssemblyName(assemblyName));
 
-                Assets = Assembly.GetCustomAttributes<ModuleAssetAttribute>()
-                    .Select(a => new Asset(a.Asset)).ToArray();
+            Assets = Assembly.GetCustomAttributes<ModuleAssetAttribute>()
+                .Select(a => new Asset(a.Asset)).ToArray();
 
-                AssetPaths = Assets.Select(a => a.ModuleAssetPath).ToArray();
+            AssetPaths = Assets.Select(a => a.ModuleAssetPath).ToArray();
 
-                // TODO: MWP: so we are 'aware' multiple instances are popping up, then...
-                var moduleInfos = Assembly.GetCustomAttributes<ModuleAttribute>();
+            // TODO: MWP: so we are 'aware' multiple instances are popping up, then...
+            var moduleInfos = Assembly.GetCustomAttributes<ModuleAttribute>();
 
-                ModuleInfo =
-                    moduleInfos.FirstOrDefault(f => f is not ModuleMarkerAttribute)
-                    ?? moduleInfos.FirstOrDefault(f => f is ModuleMarkerAttribute)
-                    // This is better use the default parameterless ctor and assign the property.
-                    ?? new ModuleAttribute() { Name = assemblyName };
+            ModuleInfo =
+                moduleInfos.FirstOrDefault(f => f is not ModuleMarkerAttribute)
+                ?? moduleInfos.FirstOrDefault(f => f is ModuleMarkerAttribute)
+                // This is better use the default parameterless ctor and assign the property.
+                ?? new ModuleAttribute() { Name = assemblyName };
 
-                var features = Assembly.GetCustomAttributes<Manifest.FeatureAttribute>()
-                    .Where(f => f is not ModuleAttribute).ToList();
+            var features = Assembly.GetCustomAttributes<Manifest.FeatureAttribute>()
+                .Where(f => f is not ModuleAttribute).ToList();
 
-                if (isApplication)
-                {
-                    ModuleInfo.Name = Application.ModuleName;
-                    ModuleInfo.Description = Application.ModuleDescription;
-                    ModuleInfo.Priority = Application.ModulePriority;
-                    ModuleInfo.Category = Application.ModuleCategory;
-                    ModuleInfo.DefaultTenantOnly = true;
-
-                    // Adds the application primary feature.
-                    features.Insert(0, new Manifest.FeatureAttribute(
-                        assemblyName,
-                        Application.ModuleName,
-                        Application.ModuleCategory,
-                        Application.ModulePriority,
-                        Application.ModuleDescription,
-                        null,
-                        true,
-                        default,
-                        default
-                    ));
-
-                    // Adds the application default feature.
-                    features.Insert(1, new Manifest.FeatureAttribute(
-                        Application.DefaultFeatureId,
-                        Application.DefaultFeatureName,
-                        Application.ModuleCategory,
-                        Application.ModulePriority,
-                        Application.DefaultFeatureDescription,
-                        null,
-                        true,
-                        default,
-                        default
-                    ));
-                }
+            if (isApplication)
+            {
+                ModuleInfo.Name = Application.ModuleName;
+                ModuleInfo.Description = Application.ModuleDescription;
+                ModuleInfo.Priority = Application.ModulePriority;
+                ModuleInfo.Category = Application.ModuleCategory;
+                ModuleInfo.DefaultTenantOnly = true;
+
+                // Adds the application primary feature.
+                features.Insert(0, new Manifest.FeatureAttribute(
+                    assemblyName,
+                    Application.ModuleName,
+                    Application.ModuleCategory,
+                    Application.ModulePriority,
+                    Application.ModuleDescription,
+                    null,
+                    true,
+                    default,
+                    default
+                ));
+
+                // Adds the application default feature.
+                features.Insert(1, new Manifest.FeatureAttribute(
+                    Application.DefaultFeatureId,
+                    Application.DefaultFeatureName,
+                    Application.ModuleCategory,
+                    Application.ModulePriority,
+                    Application.DefaultFeatureDescription,
+                    null,
+                    true,
+                    default,
+                    default
+                ));
+            }
+
+            ModuleInfo.Features.AddRange(features);
 
-                ModuleInfo.Features.AddRange(features);
+            // The 'ModuleInfo.Id' allows a module project to change its 'AssemblyName'
+            // without to update the code. If not provided, the assembly name is used.
 
-                // The 'ModuleInfo.Id' allows a module project to change its 'AssemblyName'
-                // without to update the code. If not provided, the assembly name is used.
+            var logicalName = ModuleInfo.Id ?? assemblyName;
 
-                var logicalName = ModuleInfo.Id ?? assemblyName;
+            Name = ModuleInfo.Id = logicalName;
+            SubPath = Application.ModulesRoot + Name;
+            Root = SubPath + '/';
+        }
+        else
+        {
+            Name = Root = SubPath = string.Empty;
+            Assets = [];
+            AssetPaths = [];
+            ModuleInfo = new ModuleAttribute();
+        }
 
-                Name = ModuleInfo.Id = logicalName;
-                SubPath = Application.ModulesRoot + Name;
-                Root = SubPath + '/';
+        _baseNamespace = Name + '.';
+        _lastModified = DateTimeOffset.UtcNow;
+
+        if (!string.IsNullOrEmpty(Assembly?.Location))
+        {
+            try
+            {
+                _lastModified = File.GetLastWriteTimeUtc(Assembly.Location);
             }
-            else
+            catch (PathTooLongException)
             {
-                Name = Root = SubPath = string.Empty;
-                Assets = [];
-                AssetPaths = [];
-                ModuleInfo = new ModuleAttribute();
             }
-
-            _baseNamespace = Name + '.';
-            _lastModified = DateTimeOffset.UtcNow;
-
-            if (!string.IsNullOrEmpty(Assembly?.Location))
+            catch (UnauthorizedAccessException)
             {
-                try
-                {
-                    _lastModified = File.GetLastWriteTimeUtc(Assembly.Location);
-                }
-                catch (PathTooLongException)
-                {
-                }
-                catch (UnauthorizedAccessException)
-                {
-                }
             }
         }
+    }
 
-        public string Name { get; }
-        public string Root { get; }
-        public string SubPath { get; }
-        public Assembly Assembly { get; }
-        public IEnumerable<Asset> Assets { get; }
-        public IEnumerable<string> AssetPaths { get; }
-        public ModuleAttribute ModuleInfo { get; }
+    public string Name { get; }
+    public string Root { get; }
+    public string SubPath { get; }
+    public Assembly Assembly { get; }
+    public IEnumerable<Asset> Assets { get; }
+    public IEnumerable<string> AssetPaths { get; }
+    public ModuleAttribute ModuleInfo { get; }
 
-        public IFileInfo GetFileInfo(string subpath)
+    public IFileInfo GetFileInfo(string subpath)
+    {
+        if (!_fileInfos.TryGetValue(subpath, out var fileInfo))
         {
-            if (!_fileInfos.TryGetValue(subpath, out var fileInfo))
+            if (!AssetPaths.Contains(Root + subpath))
             {
-                if (!AssetPaths.Contains(Root + subpath))
-                {
-                    return new NotFoundFileInfo(subpath);
-                }
+                return new NotFoundFileInfo(subpath);
+            }
 
-                lock (_fileInfos)
+            lock (_fileInfos)
+            {
+                if (!_fileInfos.TryGetValue(subpath, out fileInfo))
                 {
-                    if (!_fileInfos.TryGetValue(subpath, out fileInfo))
-                    {
-                        var resourcePath = _baseNamespace + subpath.Replace('/', '>');
-                        var fileName = Path.GetFileName(subpath);
-
-                        if (Assembly.GetManifestResourceInfo(resourcePath) == null)
-                        {
-                            return new NotFoundFileInfo(fileName);
-                        }
+                    var resourcePath = _baseNamespace + subpath.Replace('/', '>');
+                    var fileName = Path.GetFileName(subpath);
 
-                        _fileInfos[subpath] = fileInfo = new EmbeddedResourceFileInfo(
-                            Assembly, resourcePath, fileName, _lastModified);
+                    if (Assembly.GetManifestResourceInfo(resourcePath) == null)
+                    {
+                        return new NotFoundFileInfo(fileName);
                     }
+
+                    _fileInfos[subpath] = fileInfo = new EmbeddedResourceFileInfo(
+                        Assembly, resourcePath, fileName, _lastModified);
                 }
             }
-
-            return fileInfo;
         }
+
+        return fileInfo;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/ModuleCompositeStaticFileProvider.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/ModuleCompositeStaticFileProvider.cs
index 7bfb358df8b..e4d11b7a9c5 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/ModuleCompositeStaticFileProvider.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/ModuleCompositeStaticFileProvider.cs
@@ -2,19 +2,18 @@
 using Microsoft.Extensions.FileProviders;
 using OrchardCore.Modules.FileProviders;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+/// <summary>
+/// This custom <see cref="IFileProvider"/> implementation provides Di registration identification
+/// for IStaticFileProviders that should be served via UseStaticFiles.
+/// </summary>
+public class ModuleCompositeStaticFileProvider : CompositeFileProvider, IModuleStaticFileProvider
 {
-    /// <summary>
-    /// This custom <see cref="IFileProvider"/> implementation provides Di registration identification
-    /// for IStaticFileProviders that should be served via UseStaticFiles.
-    /// </summary>
-    public class ModuleCompositeStaticFileProvider : CompositeFileProvider, IModuleStaticFileProvider
+    public ModuleCompositeStaticFileProvider(params IStaticFileProvider[] fileProviders) : base(fileProviders)
+    {
+    }
+    public ModuleCompositeStaticFileProvider(IEnumerable<IStaticFileProvider> fileProviders) : base(fileProviders)
     {
-        public ModuleCompositeStaticFileProvider(params IStaticFileProvider[] fileProviders) : base(fileProviders)
-        {
-        }
-        public ModuleCompositeStaticFileProvider(IEnumerable<IStaticFileProvider> fileProviders) : base(fileProviders)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/ModuleEmbeddedFileProvider.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/ModuleEmbeddedFileProvider.cs
index 7f481b9c235..1deaf6b63eb 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/ModuleEmbeddedFileProvider.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/ModuleEmbeddedFileProvider.cs
@@ -7,107 +7,106 @@
 using Microsoft.Extensions.Primitives;
 using OrchardCore.Modules.FileProviders;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+/// <summary>
+/// This custom <see cref="IFileProvider"/> implementation provides the file contents
+/// of embedded files in Module assemblies.
+/// </summary>
+public class ModuleEmbeddedFileProvider : IFileProvider
 {
-    /// <summary>
-    /// This custom <see cref="IFileProvider"/> implementation provides the file contents
-    /// of embedded files in Module assemblies.
-    /// </summary>
-    public class ModuleEmbeddedFileProvider : IFileProvider
-    {
-        private readonly IApplicationContext _applicationContext;
+    private readonly IApplicationContext _applicationContext;
 
-        public ModuleEmbeddedFileProvider(IApplicationContext applicationContext) => _applicationContext = applicationContext;
+    public ModuleEmbeddedFileProvider(IApplicationContext applicationContext) => _applicationContext = applicationContext;
 
-        private Application Application => _applicationContext.Application;
+    private Application Application => _applicationContext.Application;
 
-        public IDirectoryContents GetDirectoryContents(string subpath)
+    public IDirectoryContents GetDirectoryContents(string subpath)
+    {
+        if (subpath == null)
         {
-            if (subpath == null)
-            {
-                return NotFoundDirectoryContents.Singleton;
-            }
+            return NotFoundDirectoryContents.Singleton;
+        }
 
-            var folder = NormalizePath(subpath);
+        var folder = NormalizePath(subpath);
 
-            var entries = new List<IFileInfo>();
+        var entries = new List<IFileInfo>();
 
-            // Under the root.
-            if (folder == "")
-            {
-                // Add the virtual folder "Areas" containing all modules.
-                entries.Add(new EmbeddedDirectoryInfo(Application.ModulesPath));
-            }
-            // Under "Areas".
-            else if (folder == Application.ModulesPath)
-            {
-                // Add virtual folders for all modules by using their assembly names (module ids).
-                entries.AddRange(Application.Modules.Select(m => new EmbeddedDirectoryInfo(m.Name)));
-            }
-            // Under "Areas/{ModuleId}" or "Areas/{ModuleId}/**".
-            else if (folder.StartsWith(Application.ModulesRoot, StringComparison.Ordinal))
-            {
-                // Skip "Areas/" from the folder path.
-                var path = folder[Application.ModulesRoot.Length..];
-                var index = path.IndexOf('/');
-
-                // Resolve the module id and get all its asset paths.
-                var name = index == -1 ? path : path[..index];
-                var paths = Application.GetModule(name).AssetPaths;
+        // Under the root.
+        if (folder == "")
+        {
+            // Add the virtual folder "Areas" containing all modules.
+            entries.Add(new EmbeddedDirectoryInfo(Application.ModulesPath));
+        }
+        // Under "Areas".
+        else if (folder == Application.ModulesPath)
+        {
+            // Add virtual folders for all modules by using their assembly names (module ids).
+            entries.AddRange(Application.Modules.Select(m => new EmbeddedDirectoryInfo(m.Name)));
+        }
+        // Under "Areas/{ModuleId}" or "Areas/{ModuleId}/**".
+        else if (folder.StartsWith(Application.ModulesRoot, StringComparison.Ordinal))
+        {
+            // Skip "Areas/" from the folder path.
+            var path = folder[Application.ModulesRoot.Length..];
+            var index = path.IndexOf('/');
 
-                // Resolve all files and folders directly under this given folder.
-                NormalizedPaths.ResolveFolderContents(folder, paths, out var files, out var folders);
+            // Resolve the module id and get all its asset paths.
+            var name = index == -1 ? path : path[..index];
+            var paths = Application.GetModule(name).AssetPaths;
 
-                // And add them to the directory contents.
-                entries.AddRange(files.Select(p => GetFileInfo(p)));
-                entries.AddRange(folders.Select(n => new EmbeddedDirectoryInfo(n)));
-            }
+            // Resolve all files and folders directly under this given folder.
+            NormalizedPaths.ResolveFolderContents(folder, paths, out var files, out var folders);
 
-            return new EmbeddedDirectoryContents(entries);
+            // And add them to the directory contents.
+            entries.AddRange(files.Select(p => GetFileInfo(p)));
+            entries.AddRange(folders.Select(n => new EmbeddedDirectoryInfo(n)));
         }
 
-        public IFileInfo GetFileInfo(string subpath)
-        {
-            if (subpath == null)
-            {
-                return new NotFoundFileInfo(subpath);
-            }
+        return new EmbeddedDirectoryContents(entries);
+    }
 
-            var path = NormalizePath(subpath);
+    public IFileInfo GetFileInfo(string subpath)
+    {
+        if (subpath == null)
+        {
+            return new NotFoundFileInfo(subpath);
+        }
 
-            // "Areas/**/*.*".
-            if (path.StartsWith(Application.ModulesRoot, StringComparison.Ordinal))
-            {
-                // Skip the "Areas/" root.
-                path = path[Application.ModulesRoot.Length..];
-                var index = path.IndexOf('/');
+        var path = NormalizePath(subpath);
 
-                // "{ModuleId}/**/*.*".
-                if (index != -1)
-                {
-                    // Resolve the module id.
-                    var module = path[..index];
+        // "Areas/**/*.*".
+        if (path.StartsWith(Application.ModulesRoot, StringComparison.Ordinal))
+        {
+            // Skip the "Areas/" root.
+            path = path[Application.ModulesRoot.Length..];
+            var index = path.IndexOf('/');
 
-                    // Skip the module id to resolve the subpath.
-                    var fileSubPath = path[(index + 1)..];
+            // "{ModuleId}/**/*.*".
+            if (index != -1)
+            {
+                // Resolve the module id.
+                var module = path[..index];
 
-                    // If it is the app's module.
-                    if (module == Application.Name)
-                    {
-                        // Serve the file from the physical application root folder.
-                        return new PhysicalFileInfo(new FileInfo(Application.Root + fileSubPath));
-                    }
+                // Skip the module id to resolve the subpath.
+                var fileSubPath = path[(index + 1)..];
 
-                    // Get the embedded file info from the module assembly.
-                    return Application.GetModule(module).GetFileInfo(fileSubPath);
+                // If it is the app's module.
+                if (module == Application.Name)
+                {
+                    // Serve the file from the physical application root folder.
+                    return new PhysicalFileInfo(new FileInfo(Application.Root + fileSubPath));
                 }
-            }
 
-            return new NotFoundFileInfo(subpath);
+                // Get the embedded file info from the module assembly.
+                return Application.GetModule(module).GetFileInfo(fileSubPath);
+            }
         }
 
-        public IChangeToken Watch(string filter) => NullChangeToken.Singleton;
-
-        private static string NormalizePath(string path) => path.Replace('\\', '/').Trim('/').Replace("//", "/");
+        return new NotFoundFileInfo(subpath);
     }
+
+    public IChangeToken Watch(string filter) => NullChangeToken.Singleton;
+
+    private static string NormalizePath(string path) => path.Replace('\\', '/').Trim('/').Replace("//", "/");
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/ModuleEmbeddedStaticFileProvider.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/ModuleEmbeddedStaticFileProvider.cs
index 7d726f41f10..6b0ccd7da12 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/ModuleEmbeddedStaticFileProvider.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/ModuleEmbeddedStaticFileProvider.cs
@@ -4,66 +4,65 @@
 using Microsoft.Extensions.FileProviders.Physical;
 using Microsoft.Extensions.Primitives;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+/// <summary>
+/// This custom <see cref="IFileProvider"/> implementation provides the file contents
+/// of embedded files in Module assemblies whose path is under a Module 'wwwroot' folder.
+/// </summary>
+public class ModuleEmbeddedStaticFileProvider : IModuleStaticFileProvider
 {
-    /// <summary>
-    /// This custom <see cref="IFileProvider"/> implementation provides the file contents
-    /// of embedded files in Module assemblies whose path is under a Module 'wwwroot' folder.
-    /// </summary>
-    public class ModuleEmbeddedStaticFileProvider : IModuleStaticFileProvider
-    {
-        private readonly IApplicationContext _applicationContext;
+    private readonly IApplicationContext _applicationContext;
+
+    public ModuleEmbeddedStaticFileProvider(IApplicationContext applicationContext) => _applicationContext = applicationContext;
 
-        public ModuleEmbeddedStaticFileProvider(IApplicationContext applicationContext) => _applicationContext = applicationContext;
+    public IDirectoryContents GetDirectoryContents(string subpath)
+    {
+        return NotFoundDirectoryContents.Singleton;
+    }
 
-        public IDirectoryContents GetDirectoryContents(string subpath)
+    public IFileInfo GetFileInfo(string subpath)
+    {
+        if (subpath == null)
         {
-            return NotFoundDirectoryContents.Singleton;
+            return new NotFoundFileInfo(subpath);
         }
 
-        public IFileInfo GetFileInfo(string subpath)
-        {
-            if (subpath == null)
-            {
-                return new NotFoundFileInfo(subpath);
-            }
+        var path = NormalizePath(subpath);
 
-            var path = NormalizePath(subpath);
+        var index = path.IndexOf('/');
 
-            var index = path.IndexOf('/');
+        // "{ModuleId}/**/*.*".
+        if (index != -1)
+        {
+            var application = _applicationContext.Application;
 
-            // "{ModuleId}/**/*.*".
-            if (index != -1)
-            {
-                var application = _applicationContext.Application;
+            // Resolve the module id.
+            var module = path[..index];
 
-                // Resolve the module id.
-                var module = path[..index];
+            // Check if it is an existing module.
+            if (application.Modules.Any(m => m.Name == module))
+            {
+                // Resolve the embedded file subpath: "wwwroot/**/*.*"
+                var fileSubPath = Module.WebRoot + path[(index + 1)..];
 
-                // Check if it is an existing module.
-                if (application.Modules.Any(m => m.Name == module))
+                if (module != application.Name)
                 {
-                    // Resolve the embedded file subpath: "wwwroot/**/*.*"
-                    var fileSubPath = Module.WebRoot + path[(index + 1)..];
-
-                    if (module != application.Name)
-                    {
-                        // Get the embedded file info from the module assembly.
-                        return application.GetModule(module).GetFileInfo(fileSubPath);
-                    }
-
-                    // Application static files can be still requested in a regular way "/**/*.*".
-                    // Here, it's done through the Application's module "{ApplicationName}/**/*.*".
-                    // But we still serve them from the same physical files "{WebRootPath}/**/*.*".
-                    return new PhysicalFileInfo(new FileInfo(application.Root + fileSubPath));
+                    // Get the embedded file info from the module assembly.
+                    return application.GetModule(module).GetFileInfo(fileSubPath);
                 }
-            }
 
-            return new NotFoundFileInfo(subpath);
+                // Application static files can be still requested in a regular way "/**/*.*".
+                // Here, it's done through the Application's module "{ApplicationName}/**/*.*".
+                // But we still serve them from the same physical files "{WebRootPath}/**/*.*".
+                return new PhysicalFileInfo(new FileInfo(application.Root + fileSubPath));
+            }
         }
 
-        public IChangeToken Watch(string filter) => NullChangeToken.Singleton;
-
-        private static string NormalizePath(string path) => path.Replace('\\', '/').Trim('/').Replace("//", "/");
+        return new NotFoundFileInfo(subpath);
     }
+
+    public IChangeToken Watch(string filter) => NullChangeToken.Singleton;
+
+    private static string NormalizePath(string path) => path.Replace('\\', '/').Trim('/').Replace("//", "/");
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/ModuleProjectStaticFileProvider.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/ModuleProjectStaticFileProvider.cs
index 6d8aea13989..481dab9b0b2 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/ModuleProjectStaticFileProvider.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/ModuleProjectStaticFileProvider.cs
@@ -6,133 +6,132 @@
 using Microsoft.Extensions.FileProviders.Physical;
 using Microsoft.Extensions.Primitives;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+/// <summary>
+/// This custom <see cref="IFileProvider"/> implementation provides the file contents of files
+/// whose path is under a Module Project 'wwwroot' folder, and while in a development environment.
+/// </summary>
+public class ModuleProjectStaticFileProvider : IModuleStaticFileProvider
 {
-    /// <summary>
-    /// This custom <see cref="IFileProvider"/> implementation provides the file contents of files
-    /// whose path is under a Module Project 'wwwroot' folder, and while in a development environment.
-    /// </summary>
-    public class ModuleProjectStaticFileProvider : IModuleStaticFileProvider
+    private static Dictionary<string, string> _roots;
+    private static readonly object _synLock = new();
+
+    public ModuleProjectStaticFileProvider(IApplicationContext applicationContext)
     {
-        private static Dictionary<string, string> _roots;
-        private static readonly object _synLock = new();
+        if (_roots != null)
+        {
+            return;
+        }
 
-        public ModuleProjectStaticFileProvider(IApplicationContext applicationContext)
+        lock (_synLock)
         {
-            if (_roots != null)
+            if (_roots == null)
             {
-                return;
-            }
+                var application = applicationContext.Application;
 
-            lock (_synLock)
-            {
-                if (_roots == null)
+                var roots = new Dictionary<string, string>();
+
+                // Resolve all module projects "wwwroot".
+                foreach (var module in application.Modules)
                 {
-                    var application = applicationContext.Application;
+                    // If the module and the application assemblies are not at the same location,
+                    // this means that the module is referenced as a package, not as a project in dev.
+                    if (module.Assembly == null || Path.GetDirectoryName(module.Assembly.Location)
+                        != Path.GetDirectoryName(application.Assembly.Location))
+                    {
+                        continue;
+                    }
 
-                    var roots = new Dictionary<string, string>();
+                    // Get the 1st module asset under "Areas/{ModuleId}/wwwroot/".
+                    var asset = module.Assets.FirstOrDefault(a => a.ModuleAssetPath
+                        .StartsWith(module.Root + Module.WebRoot, StringComparison.Ordinal));
 
-                    // Resolve all module projects "wwwroot".
-                    foreach (var module in application.Modules)
+                    if (asset != null)
                     {
-                        // If the module and the application assemblies are not at the same location,
-                        // this means that the module is referenced as a package, not as a project in dev.
-                        if (module.Assembly == null || Path.GetDirectoryName(module.Assembly.Location)
-                            != Path.GetDirectoryName(application.Assembly.Location))
-                        {
-                            continue;
-                        }
-
-                        // Get the 1st module asset under "Areas/{ModuleId}/wwwroot/".
-                        var asset = module.Assets.FirstOrDefault(a => a.ModuleAssetPath
-                            .StartsWith(module.Root + Module.WebRoot, StringComparison.Ordinal));
-
-                        if (asset != null)
-                        {
-                            // Resolve "{ModuleProjectDirectory}wwwroot/" from the project asset.
-                            var index = asset.ProjectAssetPath.IndexOf('/' + Module.WebRoot, StringComparison.Ordinal);
-
-                            // Add the module project "wwwroot" folder.
-                            roots[module.Name] = asset.ProjectAssetPath[..(index + Module.WebRoot.Length + 1)];
-                        }
-                    }
+                        // Resolve "{ModuleProjectDirectory}wwwroot/" from the project asset.
+                        var index = asset.ProjectAssetPath.IndexOf('/' + Module.WebRoot, StringComparison.Ordinal);
 
-                    _roots = roots;
+                        // Add the module project "wwwroot" folder.
+                        roots[module.Name] = asset.ProjectAssetPath[..(index + Module.WebRoot.Length + 1)];
+                    }
                 }
+
+                _roots = roots;
             }
         }
+    }
+
+    public IDirectoryContents GetDirectoryContents(string subpath)
+    {
+        return NotFoundDirectoryContents.Singleton;
+    }
 
-        public IDirectoryContents GetDirectoryContents(string subpath)
+    public IFileInfo GetFileInfo(string subpath)
+    {
+        if (subpath == null)
         {
-            return NotFoundDirectoryContents.Singleton;
+            return new NotFoundFileInfo(subpath);
         }
 
-        public IFileInfo GetFileInfo(string subpath)
-        {
-            if (subpath == null)
-            {
-                return new NotFoundFileInfo(subpath);
-            }
+        var path = NormalizePath(subpath);
+        var index = path.IndexOf('/');
 
-            var path = NormalizePath(subpath);
-            var index = path.IndexOf('/');
+        // "{ModuleId}/**/*.*".
+        if (index != -1)
+        {
+            // Resolve the module id.
+            var module = path[..index];
 
-            // "{ModuleId}/**/*.*".
-            if (index != -1)
+            // Get the module project "wwwroot" folder.
+            if (_roots.TryGetValue(module, out var root))
             {
-                // Resolve the module id.
-                var module = path[..index];
+                // Resolve "{ModuleProjectDirectory}wwwroot/**/*.*"
+                var filePath = root + path[(module.Length + 1)..];
 
-                // Get the module project "wwwroot" folder.
-                if (_roots.TryGetValue(module, out var root))
+                if (File.Exists(filePath))
                 {
-                    // Resolve "{ModuleProjectDirectory}wwwroot/**/*.*"
-                    var filePath = root + path[(module.Length + 1)..];
-
-                    if (File.Exists(filePath))
-                    {
-                        // Serve the file from the physical file system.
-                        return new PhysicalFileInfo(new FileInfo(filePath));
-                    }
+                    // Serve the file from the physical file system.
+                    return new PhysicalFileInfo(new FileInfo(filePath));
                 }
             }
-
-            return new NotFoundFileInfo(subpath);
         }
 
-        public IChangeToken Watch(string filter)
+        return new NotFoundFileInfo(subpath);
+    }
+
+    public IChangeToken Watch(string filter)
+    {
+        if (filter == null)
         {
-            if (filter == null)
-            {
-                return NullChangeToken.Singleton;
-            }
+            return NullChangeToken.Singleton;
+        }
 
-            var path = NormalizePath(filter);
-            var index = path.IndexOf('/');
+        var path = NormalizePath(filter);
+        var index = path.IndexOf('/');
 
-            // "{ModuleId}/**/*.*".
-            if (index != -1)
+        // "{ModuleId}/**/*.*".
+        if (index != -1)
+        {
+            // Resolve the module id.
+            var module = path[..index];
+
+            // Get the module project "wwwroot" folder.
+            if (_roots.TryGetValue(module, out var root))
             {
-                // Resolve the module id.
-                var module = path[..index];
+                // Resolve "{ModuleProjectDirectory}wwwroot/**/*.*"
+                var filePath = root + path[(module.Length + 1)..];
 
-                // Get the module project "wwwroot" folder.
-                if (_roots.TryGetValue(module, out var root))
+                if (File.Exists(filePath))
                 {
-                    // Resolve "{ModuleProjectDirectory}wwwroot/**/*.*"
-                    var filePath = root + path[(module.Length + 1)..];
-
-                    if (File.Exists(filePath))
-                    {
-                        // Watch the file from the physical file system.
-                        return new PollingFileChangeToken(new FileInfo(filePath));
-                    }
+                    // Watch the file from the physical file system.
+                    return new PollingFileChangeToken(new FileInfo(filePath));
                 }
             }
-
-            return NullChangeToken.Singleton;
         }
 
-        private static string NormalizePath(string path) => path.Replace('\\', '/').Trim('/').Replace("//", "/");
+        return NullChangeToken.Singleton;
     }
+
+    private static string NormalizePath(string path) => path.Replace('\\', '/').Trim('/').Replace("//", "/");
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonConfigurationExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonConfigurationExtensions.cs
index 1fd5fce5483..b02207ee338 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonConfigurationExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonConfigurationExtensions.cs
@@ -8,104 +8,103 @@
 
 #nullable enable
 
-namespace Microsoft.Extensions.Configuration
+namespace Microsoft.Extensions.Configuration;
+
+/// <summary>
+/// Extension methods for adding <see cref="JsonConfigurationProvider"/>.
+/// </summary>
+public static class TenantJsonConfigurationExtensions
 {
     /// <summary>
-    /// Extension methods for adding <see cref="JsonConfigurationProvider"/>.
+    /// Adds the JSON configuration provider at <paramref name="path"/> to <paramref name="builder"/>.
     /// </summary>
-    public static class TenantJsonConfigurationExtensions
+    /// <param name="builder">The <see cref="IConfigurationBuilder"/> to add to.</param>
+    /// <param name="path">Path relative to the base path stored in
+    /// <see cref="IConfigurationBuilder.Properties"/> of <paramref name="builder"/>.</param>
+    /// <returns>The <see cref="IConfigurationBuilder"/>.</returns>
+    public static IConfigurationBuilder AddTenantJsonFile(this IConfigurationBuilder builder, string path)
     {
-        /// <summary>
-        /// Adds the JSON configuration provider at <paramref name="path"/> to <paramref name="builder"/>.
-        /// </summary>
-        /// <param name="builder">The <see cref="IConfigurationBuilder"/> to add to.</param>
-        /// <param name="path">Path relative to the base path stored in
-        /// <see cref="IConfigurationBuilder.Properties"/> of <paramref name="builder"/>.</param>
-        /// <returns>The <see cref="IConfigurationBuilder"/>.</returns>
-        public static IConfigurationBuilder AddTenantJsonFile(this IConfigurationBuilder builder, string path)
-        {
-            return AddTenantJsonFile(builder, provider: null, path: path, optional: false, reloadOnChange: false);
-        }
+        return AddTenantJsonFile(builder, provider: null, path: path, optional: false, reloadOnChange: false);
+    }
 
-        /// <summary>
-        /// Adds the JSON configuration provider at <paramref name="path"/> to <paramref name="builder"/>.
-        /// </summary>
-        /// <param name="builder">The <see cref="IConfigurationBuilder"/> to add to.</param>
-        /// <param name="path">Path relative to the base path stored in
-        /// <see cref="IConfigurationBuilder.Properties"/> of <paramref name="builder"/>.</param>
-        /// <param name="optional">Whether the file is optional.</param>
-        /// <returns>The <see cref="IConfigurationBuilder"/>.</returns>
-        public static IConfigurationBuilder AddTenantJsonFile(this IConfigurationBuilder builder, string path, bool optional)
-        {
-            return AddTenantJsonFile(builder, provider: null, path: path, optional: optional, reloadOnChange: false);
-        }
+    /// <summary>
+    /// Adds the JSON configuration provider at <paramref name="path"/> to <paramref name="builder"/>.
+    /// </summary>
+    /// <param name="builder">The <see cref="IConfigurationBuilder"/> to add to.</param>
+    /// <param name="path">Path relative to the base path stored in
+    /// <see cref="IConfigurationBuilder.Properties"/> of <paramref name="builder"/>.</param>
+    /// <param name="optional">Whether the file is optional.</param>
+    /// <returns>The <see cref="IConfigurationBuilder"/>.</returns>
+    public static IConfigurationBuilder AddTenantJsonFile(this IConfigurationBuilder builder, string path, bool optional)
+    {
+        return AddTenantJsonFile(builder, provider: null, path: path, optional: optional, reloadOnChange: false);
+    }
+
+    /// <summary>
+    /// Adds the JSON configuration provider at <paramref name="path"/> to <paramref name="builder"/>.
+    /// </summary>
+    /// <param name="builder">The <see cref="IConfigurationBuilder"/> to add to.</param>
+    /// <param name="path">Path relative to the base path stored in
+    /// <see cref="IConfigurationBuilder.Properties"/> of <paramref name="builder"/>.</param>
+    /// <param name="optional">Whether the file is optional.</param>
+    /// <param name="reloadOnChange">Whether the configuration should be reloaded if the file changes.</param>
+    /// <returns>The <see cref="IConfigurationBuilder"/>.</returns>
+    public static IConfigurationBuilder AddTenantJsonFile(this IConfigurationBuilder builder, string path, bool optional, bool reloadOnChange)
+    {
+        return AddTenantJsonFile(builder, provider: null, path: path, optional: optional, reloadOnChange: reloadOnChange);
+    }
 
-        /// <summary>
-        /// Adds the JSON configuration provider at <paramref name="path"/> to <paramref name="builder"/>.
-        /// </summary>
-        /// <param name="builder">The <see cref="IConfigurationBuilder"/> to add to.</param>
-        /// <param name="path">Path relative to the base path stored in
-        /// <see cref="IConfigurationBuilder.Properties"/> of <paramref name="builder"/>.</param>
-        /// <param name="optional">Whether the file is optional.</param>
-        /// <param name="reloadOnChange">Whether the configuration should be reloaded if the file changes.</param>
-        /// <returns>The <see cref="IConfigurationBuilder"/>.</returns>
-        public static IConfigurationBuilder AddTenantJsonFile(this IConfigurationBuilder builder, string path, bool optional, bool reloadOnChange)
+    /// <summary>
+    /// Adds a JSON configuration source to <paramref name="builder"/>.
+    /// </summary>
+    /// <param name="builder">The <see cref="IConfigurationBuilder"/> to add to.</param>
+    /// <param name="provider">The <see cref="IFileProvider"/> to use to access the file.</param>
+    /// <param name="path">Path relative to the base path stored in
+    /// <see cref="IConfigurationBuilder.Properties"/> of <paramref name="builder"/>.</param>
+    /// <param name="optional">Whether the file is optional.</param>
+    /// <param name="reloadOnChange">Whether the configuration should be reloaded if the file changes.</param>
+    /// <returns>The <see cref="IConfigurationBuilder"/>.</returns>
+    public static IConfigurationBuilder AddTenantJsonFile(this IConfigurationBuilder builder, IFileProvider? provider, string path, bool optional, bool reloadOnChange)
+    {
+        // ThrowHelper.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(builder);
+
+        if (string.IsNullOrEmpty(path))
         {
-            return AddTenantJsonFile(builder, provider: null, path: path, optional: optional, reloadOnChange: reloadOnChange);
+            // throw new ArgumentException(SR.Error_InvalidFilePath, nameof(path));
+            throw new ArgumentException("File path must be a non-empty string.", nameof(path));
         }
 
-        /// <summary>
-        /// Adds a JSON configuration source to <paramref name="builder"/>.
-        /// </summary>
-        /// <param name="builder">The <see cref="IConfigurationBuilder"/> to add to.</param>
-        /// <param name="provider">The <see cref="IFileProvider"/> to use to access the file.</param>
-        /// <param name="path">Path relative to the base path stored in
-        /// <see cref="IConfigurationBuilder.Properties"/> of <paramref name="builder"/>.</param>
-        /// <param name="optional">Whether the file is optional.</param>
-        /// <param name="reloadOnChange">Whether the configuration should be reloaded if the file changes.</param>
-        /// <returns>The <see cref="IConfigurationBuilder"/>.</returns>
-        public static IConfigurationBuilder AddTenantJsonFile(this IConfigurationBuilder builder, IFileProvider? provider, string path, bool optional, bool reloadOnChange)
+        return builder.AddTenantJsonFile(s =>
         {
-            // ThrowHelper.ThrowIfNull(builder);
-            ArgumentNullException.ThrowIfNull(builder);
-
-            if (string.IsNullOrEmpty(path))
-            {
-                // throw new ArgumentException(SR.Error_InvalidFilePath, nameof(path));
-                throw new ArgumentException("File path must be a non-empty string.", nameof(path));
-            }
-
-            return builder.AddTenantJsonFile(s =>
-            {
-                s.FileProvider = provider;
-                s.Path = path;
-                s.Optional = optional;
-                s.ReloadOnChange = reloadOnChange;
-                s.ResolveFileProvider();
-            });
-        }
+            s.FileProvider = provider;
+            s.Path = path;
+            s.Optional = optional;
+            s.ReloadOnChange = reloadOnChange;
+            s.ResolveFileProvider();
+        });
+    }
 
-        /// <summary>
-        /// Adds a JSON configuration source to <paramref name="builder"/>.
-        /// </summary>
-        /// <param name="builder">The <see cref="IConfigurationBuilder"/> to add to.</param>
-        /// <param name="configureSource">Configures the source.</param>
-        /// <returns>The <see cref="IConfigurationBuilder"/>.</returns>
-        public static IConfigurationBuilder AddTenantJsonFile(this IConfigurationBuilder builder, Action<TenantJsonConfigurationSource>? configureSource)
-            => builder.Add(configureSource);
+    /// <summary>
+    /// Adds a JSON configuration source to <paramref name="builder"/>.
+    /// </summary>
+    /// <param name="builder">The <see cref="IConfigurationBuilder"/> to add to.</param>
+    /// <param name="configureSource">Configures the source.</param>
+    /// <returns>The <see cref="IConfigurationBuilder"/>.</returns>
+    public static IConfigurationBuilder AddTenantJsonFile(this IConfigurationBuilder builder, Action<TenantJsonConfigurationSource>? configureSource)
+        => builder.Add(configureSource);
 
-        /// <summary>
-        /// Adds a JSON configuration source to <paramref name="builder"/>.
-        /// </summary>
-        /// <param name="builder">The <see cref="IConfigurationBuilder"/> to add to.</param>
-        /// <param name="stream">The <see cref="Stream"/> to read the json configuration data from.</param>
-        /// <returns>The <see cref="IConfigurationBuilder"/>.</returns>
-        public static IConfigurationBuilder AddTenantJsonStream(this IConfigurationBuilder builder, Stream stream)
-        {
-            // ThrowHelper.ThrowIfNull(builder);
-            ArgumentNullException.ThrowIfNull(builder);
+    /// <summary>
+    /// Adds a JSON configuration source to <paramref name="builder"/>.
+    /// </summary>
+    /// <param name="builder">The <see cref="IConfigurationBuilder"/> to add to.</param>
+    /// <param name="stream">The <see cref="Stream"/> to read the json configuration data from.</param>
+    /// <returns>The <see cref="IConfigurationBuilder"/>.</returns>
+    public static IConfigurationBuilder AddTenantJsonStream(this IConfigurationBuilder builder, Stream stream)
+    {
+        // ThrowHelper.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(builder);
 
-            return builder.Add<TenantJsonStreamConfigurationSource>(s => s.Stream = stream);
-        }
+        return builder.Add<TenantJsonStreamConfigurationSource>(s => s.Stream = stream);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonConfigurationProvider.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonConfigurationProvider.cs
index fa5c5fd7b54..8bd7d52729f 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonConfigurationProvider.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonConfigurationProvider.cs
@@ -1,23 +1,22 @@
 using System.IO;
 using OrchardCore.Environment.Shell.Configuration.Internal;
 
-namespace Microsoft.Extensions.Configuration.Json
+namespace Microsoft.Extensions.Configuration.Json;
+
+/// <summary>
+/// A JSON file based <see cref="FileConfigurationProvider"/>.
+/// </summary>
+public class TenantJsonConfigurationProvider : FileConfigurationProvider
 {
     /// <summary>
-    /// A JSON file based <see cref="FileConfigurationProvider"/>.
+    /// Initializes a new instance with the specified source.
     /// </summary>
-    public class TenantJsonConfigurationProvider : FileConfigurationProvider
-    {
-        /// <summary>
-        /// Initializes a new instance with the specified source.
-        /// </summary>
-        /// <param name="source">The source settings.</param>
-        public TenantJsonConfigurationProvider(TenantJsonConfigurationSource source) : base(source) { }
+    /// <param name="source">The source settings.</param>
+    public TenantJsonConfigurationProvider(TenantJsonConfigurationSource source) : base(source) { }
 
-        /// <summary>
-        /// Loads the JSON data from a stream.
-        /// </summary>
-        /// <param name="stream">The stream to read.</param>
-        public override void Load(Stream stream) => Data = JsonConfigurationParser.Parse(stream);
-    }
+    /// <summary>
+    /// Loads the JSON data from a stream.
+    /// </summary>
+    /// <param name="stream">The stream to read.</param>
+    public override void Load(Stream stream) => Data = JsonConfigurationParser.Parse(stream);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonConfigurationSource.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonConfigurationSource.cs
index 36279cc2303..ffb919b2294 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonConfigurationSource.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonConfigurationSource.cs
@@ -1,22 +1,21 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace Microsoft.Extensions.Configuration.Json
+namespace Microsoft.Extensions.Configuration.Json;
+
+/// <summary>
+/// Represents a JSON file as an <see cref="IConfigurationSource"/>.
+/// </summary>
+public class TenantJsonConfigurationSource : FileConfigurationSource
 {
     /// <summary>
-    /// Represents a JSON file as an <see cref="IConfigurationSource"/>.
+    /// Builds the <see cref="TenantJsonConfigurationProvider"/> for this source.
     /// </summary>
-    public class TenantJsonConfigurationSource : FileConfigurationSource
+    /// <param name="builder">The <see cref="IConfigurationBuilder"/>.</param>
+    /// <returns>A <see cref="TenantJsonConfigurationProvider"/>.</returns>
+    public override IConfigurationProvider Build(IConfigurationBuilder builder)
     {
-        /// <summary>
-        /// Builds the <see cref="TenantJsonConfigurationProvider"/> for this source.
-        /// </summary>
-        /// <param name="builder">The <see cref="IConfigurationBuilder"/>.</param>
-        /// <returns>A <see cref="TenantJsonConfigurationProvider"/>.</returns>
-        public override IConfigurationProvider Build(IConfigurationBuilder builder)
-        {
-            EnsureDefaults(builder);
-            return new TenantJsonConfigurationProvider(this);
-        }
+        EnsureDefaults(builder);
+        return new TenantJsonConfigurationProvider(this);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonStreamConfigurationProvider.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonStreamConfigurationProvider.cs
index 41d6a3280c6..3c640099c97 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonStreamConfigurationProvider.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonStreamConfigurationProvider.cs
@@ -4,26 +4,25 @@
 using System.IO;
 using OrchardCore.Environment.Shell.Configuration.Internal;
 
-namespace Microsoft.Extensions.Configuration.Json
+namespace Microsoft.Extensions.Configuration.Json;
+
+/// <summary>
+/// Loads configuration key/values from a json stream into a provider.
+/// </summary>
+public class TenantJsonStreamConfigurationProvider : StreamConfigurationProvider
 {
     /// <summary>
-    /// Loads configuration key/values from a json stream into a provider.
+    /// Constructor.
     /// </summary>
-    public class TenantJsonStreamConfigurationProvider : StreamConfigurationProvider
-    {
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <param name="source">The <see cref="TenantJsonStreamConfigurationSource"/>.</param>
-        public TenantJsonStreamConfigurationProvider(TenantJsonStreamConfigurationSource source) : base(source) { }
+    /// <param name="source">The <see cref="TenantJsonStreamConfigurationSource"/>.</param>
+    public TenantJsonStreamConfigurationProvider(TenantJsonStreamConfigurationSource source) : base(source) { }
 
-        /// <summary>
-        /// Loads json configuration key/values from a stream into a provider.
-        /// </summary>
-        /// <param name="stream">The json <see cref="Stream"/> to load configuration data from.</param>
-        public override void Load(Stream stream)
-        {
-            Data = JsonConfigurationParser.Parse(stream);
-        }
+    /// <summary>
+    /// Loads json configuration key/values from a stream into a provider.
+    /// </summary>
+    /// <param name="stream">The json <see cref="Stream"/> to load configuration data from.</param>
+    public override void Load(Stream stream)
+    {
+        Data = JsonConfigurationParser.Parse(stream);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonStreamConfigurationSource.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonStreamConfigurationSource.cs
index be5d67d5c6a..da64b391f02 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonStreamConfigurationSource.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonStreamConfigurationSource.cs
@@ -1,19 +1,18 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace Microsoft.Extensions.Configuration.Json
+namespace Microsoft.Extensions.Configuration.Json;
+
+/// <summary>
+/// Represents a JSON file as an <see cref="IConfigurationSource"/>.
+/// </summary>
+public class TenantJsonStreamConfigurationSource : StreamConfigurationSource
 {
     /// <summary>
-    /// Represents a JSON file as an <see cref="IConfigurationSource"/>.
+    /// Builds the <see cref="TenantJsonStreamConfigurationProvider"/> for this source.
     /// </summary>
-    public class TenantJsonStreamConfigurationSource : StreamConfigurationSource
-    {
-        /// <summary>
-        /// Builds the <see cref="TenantJsonStreamConfigurationProvider"/> for this source.
-        /// </summary>
-        /// <param name="builder">The <see cref="IConfigurationBuilder"/>.</param>
-        /// <returns>An <see cref="TenantJsonStreamConfigurationProvider"/>.</returns>
-        public override IConfigurationProvider Build(IConfigurationBuilder builder)
-            => new TenantJsonStreamConfigurationProvider(this);
-    }
+    /// <param name="builder">The <see cref="IConfigurationBuilder"/>.</param>
+    /// <returns>An <see cref="TenantJsonStreamConfigurationProvider"/>.</returns>
+    public override IConfigurationProvider Build(IConfigurationBuilder builder)
+        => new TenantJsonStreamConfigurationProvider(this);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/RequireFeaturesAttribute.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/RequireFeaturesAttribute.cs
index 3c892e05b1c..bc9544f7964 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/RequireFeaturesAttribute.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/RequireFeaturesAttribute.cs
@@ -3,37 +3,36 @@
 using System.Linq;
 using System.Reflection;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+/// <summary>
+/// When used on a class, it will include the service only
+/// if the specific features are enabled.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+public class RequireFeaturesAttribute : Attribute
 {
-    /// <summary>
-    /// When used on a class, it will include the service only
-    /// if the specific features are enabled.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
-    public class RequireFeaturesAttribute : Attribute
+    public RequireFeaturesAttribute(string featureName)
     {
-        public RequireFeaturesAttribute(string featureName)
-        {
-            RequiredFeatureNames = new string[] { featureName };
-        }
+        RequiredFeatureNames = new string[] { featureName };
+    }
 
-        public RequireFeaturesAttribute(string featureName, params string[] otherFeatureNames)
+    public RequireFeaturesAttribute(string featureName, params string[] otherFeatureNames)
+    {
+        RequiredFeatureNames = new List<string>(otherFeatureNames)
         {
-            RequiredFeatureNames = new List<string>(otherFeatureNames)
-            {
-                featureName
-            };
-        }
+            featureName
+        };
+    }
 
-        /// <summary>
-        /// The names of the required features.
-        /// </summary>
-        public IList<string> RequiredFeatureNames { get; }
+    /// <summary>
+    /// The names of the required features.
+    /// </summary>
+    public IList<string> RequiredFeatureNames { get; }
 
-        public static IList<string> GetRequiredFeatureNamesForType(Type type)
-        {
-            var attribute = type.GetCustomAttributes<RequireFeaturesAttribute>(false).FirstOrDefault();
-            return attribute?.RequiredFeatureNames ?? Array.Empty<string>();
-        }
+    public static IList<string> GetRequiredFeatureNamesForType(Type type)
+    {
+        var attribute = type.GetCustomAttributes<RequireFeaturesAttribute>(false).FirstOrDefault();
+        return attribute?.RequiredFeatureNames ?? Array.Empty<string>();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/ClockExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/ClockExtensions.cs
index e3b07de78e0..c0c6aa7b223 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/ClockExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/ClockExtensions.cs
@@ -1,42 +1,41 @@
 using System;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+public static class ClockExtensions
 {
-    public static class ClockExtensions
+    /// <summary>
+    /// Converts a <see cref="DateTime" /> to the specified <see cref="ITimeZone" /> instance.
+    /// </summary>
+    public static DateTimeOffset ConvertToTimeZone(this IClock clock, DateTime dateTime, ITimeZone timeZone)
     {
-        /// <summary>
-        /// Converts a <see cref="DateTime" /> to the specified <see cref="ITimeZone" /> instance.
-        /// </summary>
-        public static DateTimeOffset ConvertToTimeZone(this IClock clock, DateTime dateTime, ITimeZone timeZone)
+        var dateTimeUtc = dateTime.Kind switch
         {
-            var dateTimeUtc = dateTime.Kind switch
-            {
-                DateTimeKind.Utc => dateTime,
-                DateTimeKind.Local => dateTime.ToUniversalTime(),
+            DateTimeKind.Utc => dateTime,
+            DateTimeKind.Local => dateTime.ToUniversalTime(),
 
-                // 'DateTimeKind.Unspecified'.
-                _ => DateTime.SpecifyKind(dateTime, DateTimeKind.Utc),
-            };
+            // 'DateTimeKind.Unspecified'.
+            _ => DateTime.SpecifyKind(dateTime, DateTimeKind.Utc),
+        };
 
-            return clock.ConvertToTimeZone(new DateTimeOffset(dateTimeUtc), timeZone);
-        }
+        return clock.ConvertToTimeZone(new DateTimeOffset(dateTimeUtc), timeZone);
+    }
 
-        /// <summary>
-        /// Converts a <see cref="DateTime" /> to the specified <see cref="ITimeZone" /> instance.
-        /// </summary>
-        public static Task<DateTimeOffset> ConvertToLocalAsync(this ILocalClock localClock, DateTime dateTime)
+    /// <summary>
+    /// Converts a <see cref="DateTime" /> to the specified <see cref="ITimeZone" /> instance.
+    /// </summary>
+    public static Task<DateTimeOffset> ConvertToLocalAsync(this ILocalClock localClock, DateTime dateTime)
+    {
+        var dateTimeUtc = dateTime.Kind switch
         {
-            var dateTimeUtc = dateTime.Kind switch
-            {
-                DateTimeKind.Utc => dateTime,
-                DateTimeKind.Local => dateTime.ToUniversalTime(),
+            DateTimeKind.Utc => dateTime,
+            DateTimeKind.Local => dateTime.ToUniversalTime(),
 
-                // 'DateTimeKind.Unspecified'.
-                _ => DateTime.SpecifyKind(dateTime, DateTimeKind.Utc),
-            };
+            // 'DateTimeKind.Unspecified'.
+            _ => DateTime.SpecifyKind(dateTime, DateTimeKind.Utc),
+        };
 
-            return localClock.ConvertToLocalAsync(new DateTimeOffset(dateTimeUtc));
-        }
+        return localClock.ConvertToLocalAsync(new DateTimeOffset(dateTimeUtc));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/IClock.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/IClock.cs
index d500bf38441..f26dcc0407d 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/IClock.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/IClock.cs
@@ -1,41 +1,40 @@
 using System;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+/// <summary>
+/// Provides the current UTC <see cref="DateTime"/>, and timezone related methods.
+/// This service should be used whenever the current date and time are needed, instead of <seealso cref="DateTime"/> directly.
+/// If local date time and timezones are needed use <see cref="ILocalClock" /> instead.
+/// </summary>
+public interface IClock
 {
     /// <summary>
-    /// Provides the current UTC <see cref="DateTime"/>, and timezone related methods.
-    /// This service should be used whenever the current date and time are needed, instead of <seealso cref="DateTime"/> directly.
-    /// If local date time and timezones are needed use <see cref="ILocalClock" /> instead.
+    /// Gets the current <see cref="DateTime"/> of the system, expressed in UTC.
     /// </summary>
-    public interface IClock
-    {
-        /// <summary>
-        /// Gets the current <see cref="DateTime"/> of the system, expressed in UTC.
-        /// </summary>
-        /// <remarks>
-        /// A <see cref="DateTime"/> as this property is usually used to store the current date time in UTC and a <see cref="DateTimeOffset" />
-        /// would affect usability.
-        /// </remarks>
-        DateTime UtcNow { get; }
+    /// <remarks>
+    /// A <see cref="DateTime"/> as this property is usually used to store the current date time in UTC and a <see cref="DateTimeOffset" />
+    /// would affect usability.
+    /// </remarks>
+    DateTime UtcNow { get; }
 
-        /// <summary>
-        /// Returns the list of all available <see cref="ITimeZone" />.
-        /// </summary>
-        ITimeZone[] GetTimeZones();
+    /// <summary>
+    /// Returns the list of all available <see cref="ITimeZone" />.
+    /// </summary>
+    ITimeZone[] GetTimeZones();
 
-        /// <summary>
-        /// Returns a <see cref="ITimeZone" /> from a time zone id or the local system's one if not found.
-        /// </summary>
-        ITimeZone GetTimeZone(string timeZoneId);
+    /// <summary>
+    /// Returns a <see cref="ITimeZone" /> from a time zone id or the local system's one if not found.
+    /// </summary>
+    ITimeZone GetTimeZone(string timeZoneId);
 
-        /// <summary>
-        /// Returns a default <see cref="ITimeZone" /> for the system.
-        /// </summary>
-        ITimeZone GetSystemTimeZone();
+    /// <summary>
+    /// Returns a default <see cref="ITimeZone" /> for the system.
+    /// </summary>
+    ITimeZone GetSystemTimeZone();
 
-        /// <summary>
-        /// Converts a <see cref="DateTimeOffset" /> to the specified <see cref="ITimeZone" /> instance.
-        /// </summary>
-        DateTimeOffset ConvertToTimeZone(DateTimeOffset dateTimeOffset, ITimeZone timeZone);
-    }
+    /// <summary>
+    /// Converts a <see cref="DateTimeOffset" /> to the specified <see cref="ITimeZone" /> instance.
+    /// </summary>
+    DateTimeOffset ConvertToTimeZone(DateTimeOffset dateTimeOffset, ITimeZone timeZone);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/ILocalClock.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/ILocalClock.cs
index 08b61e3341e..0558175681e 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/ILocalClock.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/ILocalClock.cs
@@ -1,31 +1,30 @@
 using System;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+/// <summary>
+/// Provides local values of the current time and time zone.
+/// </summary>
+public interface ILocalClock
 {
     /// <summary>
-    /// Provides local values of the current time and time zone.
+    /// Gets the time for the local time zone.
     /// </summary>
-    public interface ILocalClock
-    {
-        /// <summary>
-        /// Gets the time for the local time zone.
-        /// </summary>
-        Task<DateTimeOffset> LocalNowAsync { get; }
+    Task<DateTimeOffset> LocalNowAsync { get; }
 
-        /// <summary>
-        /// Returns the local time zone.
-        /// </summary>
-        Task<ITimeZone> GetLocalTimeZoneAsync();
+    /// <summary>
+    /// Returns the local time zone.
+    /// </summary>
+    Task<ITimeZone> GetLocalTimeZoneAsync();
 
-        /// <summary>
-        /// Converts a <see cref="DateTimeOffset" /> to the specified <see cref="ITimeZone" /> instance.
-        /// </summary>
-        Task<DateTimeOffset> ConvertToLocalAsync(DateTimeOffset dateTimeOffset);
+    /// <summary>
+    /// Converts a <see cref="DateTimeOffset" /> to the specified <see cref="ITimeZone" /> instance.
+    /// </summary>
+    Task<DateTimeOffset> ConvertToLocalAsync(DateTimeOffset dateTimeOffset);
 
-        /// <summary>
-        /// Converts a <see cref="DateTime" /> representing a local time to the UTC value.
-        /// </summary>
-        Task<DateTime> ConvertToUtcAsync(DateTime dateTime);
-    }
+    /// <summary>
+    /// Converts a <see cref="DateTime" /> representing a local time to the UTC value.
+    /// </summary>
+    Task<DateTime> ConvertToUtcAsync(DateTime dateTime);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/ISlugService.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/ISlugService.cs
index 77a2cc9f30d..21b9c8f0b56 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/ISlugService.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/ISlugService.cs
@@ -1,21 +1,20 @@
-namespace OrchardCore.Modules.Services
+namespace OrchardCore.Modules.Services;
+
+public interface ISlugService
 {
-    public interface ISlugService
-    {
-        /// <summary>
-        /// Transforms specified text to the form suitable for URL slugs.
-        /// </summary>
-        /// <param name="text">The text to transform.</param>
-        /// <returns>The slug created from the input text.</returns>
-        string Slugify(string text);
+    /// <summary>
+    /// Transforms specified text to the form suitable for URL slugs.
+    /// </summary>
+    /// <param name="text">The text to transform.</param>
+    /// <returns>The slug created from the input text.</returns>
+    string Slugify(string text);
 
-        /// <summary>
-        /// Transforms specified text to a custom form generally not suitable for URL slugs.
-        /// Allows you to use a specified separator char.
-        /// </summary>
-        /// <param name="text">The text to transform.</param>
-        /// <param name="separator">The separator char.</param>
-        /// <returns>The slug created from the input text.</returns>
-        string Slugify(string text, char separator);
-    }
+    /// <summary>
+    /// Transforms specified text to a custom form generally not suitable for URL slugs.
+    /// Allows you to use a specified separator char.
+    /// </summary>
+    /// <param name="text">The text to transform.</param>
+    /// <param name="separator">The separator char.</param>
+    /// <returns>The slug created from the input text.</returns>
+    string Slugify(string text, char separator);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/ITimeZoneSelector.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/ITimeZoneSelector.cs
index fe5116024de..021baf762ac 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/ITimeZoneSelector.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/ITimeZoneSelector.cs
@@ -1,12 +1,11 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+/// <summary>
+/// Provides the timezone for the current request.
+/// </summary>
+public interface ITimeZoneSelector
 {
-    /// <summary>
-    /// Provides the timezone for the current request.
-    /// </summary>
-    public interface ITimeZoneSelector
-    {
-        Task<TimeZoneSelectorResult> GetTimeZoneAsync();
-    }
+    Task<TimeZoneSelectorResult> GetTimeZoneAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/TimeZoneSelectorResult.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/TimeZoneSelectorResult.cs
index b712c6a8b44..d6ecf8dc64e 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/TimeZoneSelectorResult.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Services/TimeZoneSelectorResult.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+public class TimeZoneSelectorResult
 {
-    public class TimeZoneSelectorResult
-    {
-        public int Priority { get; set; }
-        public Func<Task<string>> TimeZoneId { get; set; }
-    }
+    public int Priority { get; set; }
+    public Func<Task<string>> TimeZoneId { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/ShellRequestPipeline.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/ShellRequestPipeline.cs
index dbadf6ac420..870ada261de 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/ShellRequestPipeline.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/ShellRequestPipeline.cs
@@ -2,11 +2,10 @@
 using Microsoft.AspNetCore.Http;
 using OrchardCore.Environment.Shell.Builders;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+public class ShellRequestPipeline : IShellPipeline
 {
-    public class ShellRequestPipeline : IShellPipeline
-    {
-        public RequestDelegate Next { get; set; }
-        public Task Invoke(object context) => Next(context as HttpContext);
-    }
+    public RequestDelegate Next { get; set; }
+    public Task Invoke(object context) => Next(context as HttpContext);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/StartupBase.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/StartupBase.cs
index ace6acf4f6b..71d0d774d16 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/StartupBase.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/StartupBase.cs
@@ -4,27 +4,26 @@
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace OrchardCore.Modules
-{
-    public abstract class StartupBase : IStartup, IAsyncStartup
-    {
-        /// <inheritdoc />
-        public virtual int Order { get; } = OrchardCoreConstants.ConfigureOrder.Default;
+namespace OrchardCore.Modules;
 
-        /// <inheritdoc />
-        public virtual int ConfigureOrder => Order;
+public abstract class StartupBase : IStartup, IAsyncStartup
+{
+    /// <inheritdoc />
+    public virtual int Order { get; } = OrchardCoreConstants.ConfigureOrder.Default;
 
-        /// <inheritdoc />
-        public virtual void ConfigureServices(IServiceCollection services)
-        {
-        }
+    /// <inheritdoc />
+    public virtual int ConfigureOrder => Order;
 
-        /// <inheritdoc />
-        public virtual void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-        }
+    /// <inheritdoc />
+    public virtual void ConfigureServices(IServiceCollection services)
+    {
+    }
 
-        /// <inheritdoc />
-        public virtual ValueTask ConfigureAsync(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider) => default;
+    /// <inheritdoc />
+    public virtual void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
     }
+
+    /// <inheritdoc />
+    public virtual ValueTask ConfigureAsync(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider) => default;
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Routing/FormValueRequiredAttribute.cs b/src/OrchardCore/OrchardCore.Abstractions/Routing/FormValueRequiredAttribute.cs
index 1fa2af3ca94..657d5b0c326 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Routing/FormValueRequiredAttribute.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Routing/FormValueRequiredAttribute.cs
@@ -1,15 +1,14 @@
 using System;
 
-namespace OrchardCore.Routing
+namespace OrchardCore.Routing;
+
+[AttributeUsage(AttributeTargets.Method)]
+public class FormValueRequiredAttribute : Attribute
 {
-    [AttributeUsage(AttributeTargets.Method)]
-    public class FormValueRequiredAttribute : Attribute
+    public FormValueRequiredAttribute(string formKey)
     {
-        public FormValueRequiredAttribute(string formKey)
-        {
-            FormKey = formKey;
-        }
-
-        public string FormKey { get; }
+        FormKey = formKey;
     }
+
+    public string FormKey { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Routing/FormValueRequiredMatcherPolicy.cs b/src/OrchardCore/OrchardCore.Abstractions/Routing/FormValueRequiredMatcherPolicy.cs
index ffd06c52705..ef86c6d5d70 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Routing/FormValueRequiredMatcherPolicy.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Routing/FormValueRequiredMatcherPolicy.cs
@@ -5,74 +5,73 @@
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Routing.Matching;
 
-namespace OrchardCore.Routing
+namespace OrchardCore.Routing;
+
+public class FormValueRequiredMatcherPolicy : MatcherPolicy, IEndpointSelectorPolicy, IEndpointComparerPolicy
 {
-    public class FormValueRequiredMatcherPolicy : MatcherPolicy, IEndpointSelectorPolicy, IEndpointComparerPolicy
+    public FormValueRequiredMatcherPolicy()
     {
-        public FormValueRequiredMatcherPolicy()
-        {
-        }
+    }
 
-        public override int Order => int.MinValue + 100;
+    public override int Order => int.MinValue + 100;
 
-        public bool AppliesToEndpoints(IReadOnlyList<Endpoint> endpoints)
+    public bool AppliesToEndpoints(IReadOnlyList<Endpoint> endpoints)
+    {
+        for (var i = 0; i < endpoints.Count; i++)
         {
-            for (var i = 0; i < endpoints.Count; i++)
-            {
-                var action = endpoints[i].Metadata.GetMetadata<ActionDescriptor>();
+            var action = endpoints[i].Metadata.GetMetadata<ActionDescriptor>();
 
-                if (action != null)
+            if (action != null)
+            {
+                for (var n = 0; n < action.EndpointMetadata.Count; n++)
                 {
-                    for (var n = 0; n < action.EndpointMetadata.Count; n++)
+                    if (action.EndpointMetadata[n] is FormValueRequiredAttribute)
                     {
-                        if (action.EndpointMetadata[n] is FormValueRequiredAttribute)
-                        {
-                            return true;
-                        }
+                        return true;
                     }
                 }
             }
+        }
 
-            return false;
+        return false;
+    }
+
+    public Task ApplyAsync(HttpContext httpContext, CandidateSet candidates)
+    {
+        if (!HttpMethods.IsPost(httpContext.Request.Method))
+        {
+            return Task.CompletedTask;
         }
 
-        public Task ApplyAsync(HttpContext httpContext, CandidateSet candidates)
+        for (var i = 0; i < candidates.Count; i++)
         {
-            if (!HttpMethods.IsPost(httpContext.Request.Method))
+            if (!candidates.IsValidCandidate(i))
             {
-                return Task.CompletedTask;
+                continue;
             }
 
-            for (var i = 0; i < candidates.Count; i++)
-            {
-                if (!candidates.IsValidCandidate(i))
-                {
-                    continue;
-                }
-
-                var required = candidates[i].Endpoint.Metadata.GetMetadata<FormValueRequiredAttribute>();
+            var required = candidates[i].Endpoint.Metadata.GetMetadata<FormValueRequiredAttribute>();
 
-                if (required == null)
-                {
-                    continue;
-                }
-
-                var value = httpContext.Request.Form[required.FormKey];
-
-                candidates.SetValidity(i, !string.IsNullOrEmpty(value));
+            if (required == null)
+            {
+                continue;
             }
 
-            return Task.CompletedTask;
+            var value = httpContext.Request.Form[required.FormKey];
+
+            candidates.SetValidity(i, !string.IsNullOrEmpty(value));
         }
 
-        public IComparer<Endpoint> Comparer => new FormValueRequiredEndpointComparer();
+        return Task.CompletedTask;
+    }
+
+    public IComparer<Endpoint> Comparer => new FormValueRequiredEndpointComparer();
 
-        private sealed class FormValueRequiredEndpointComparer : EndpointMetadataComparer<FormValueRequiredAttribute>
+    private sealed class FormValueRequiredEndpointComparer : EndpointMetadataComparer<FormValueRequiredAttribute>
+    {
+        protected override int CompareMetadata(FormValueRequiredAttribute x, FormValueRequiredAttribute y)
         {
-            protected override int CompareMetadata(FormValueRequiredAttribute x, FormValueRequiredAttribute y)
-            {
-                return base.CompareMetadata(x, y);
-            }
+            return base.CompareMetadata(x, y);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Routing/IShellRouteValuesAddressScheme.cs b/src/OrchardCore/OrchardCore.Abstractions/Routing/IShellRouteValuesAddressScheme.cs
index 882de26f2a0..b0aaa5ad760 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Routing/IShellRouteValuesAddressScheme.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Routing/IShellRouteValuesAddressScheme.cs
@@ -1,11 +1,10 @@
 using Microsoft.AspNetCore.Routing;
 
-namespace OrchardCore.Routing
+namespace OrchardCore.Routing;
+
+/// <summary>
+/// Marker interface to retrieve tenant 'RouteValuesAddress' schemes used for link generation.
+/// </summary>
+public interface IShellRouteValuesAddressScheme : IEndpointAddressScheme<RouteValuesAddress>
 {
-    /// <summary>
-    /// Marker interface to retrieve tenant 'RouteValuesAddress' schemes used for link generation.
-    /// </summary>
-    public interface IShellRouteValuesAddressScheme : IEndpointAddressScheme<RouteValuesAddress>
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Routing/PathStringExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/Routing/PathStringExtensions.cs
index 6b2c0f19acf..29fbed0aec7 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Routing/PathStringExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Routing/PathStringExtensions.cs
@@ -1,48 +1,47 @@
 using System;
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Routing
+namespace OrchardCore.Routing;
+
+public static class PathStringExtensions
 {
-    public static class PathStringExtensions
+    public static bool StartsWithNormalizedSegments(this PathString path, PathString other)
     {
-        public static bool StartsWithNormalizedSegments(this PathString path, PathString other)
+        if (other.HasValue && other.Value.EndsWith('/'))
         {
-            if (other.HasValue && other.Value.EndsWith('/'))
-            {
-                return path.StartsWithSegments(other.Value[..^1]);
-            }
-
-            return path.StartsWithSegments(other);
+            return path.StartsWithSegments(other.Value[..^1]);
         }
 
-        public static bool StartsWithNormalizedSegments(this PathString path, PathString other, StringComparison comparisonType)
-        {
-            if (other.HasValue && other.Value.EndsWith('/'))
-            {
-                return path.StartsWithSegments(other.Value[..^1], comparisonType);
-            }
+        return path.StartsWithSegments(other);
+    }
 
-            return path.StartsWithSegments(other, comparisonType);
+    public static bool StartsWithNormalizedSegments(this PathString path, PathString other, StringComparison comparisonType)
+    {
+        if (other.HasValue && other.Value.EndsWith('/'))
+        {
+            return path.StartsWithSegments(other.Value[..^1], comparisonType);
         }
 
-        public static bool StartsWithNormalizedSegments(this PathString path, PathString other, out PathString remaining)
-        {
-            if (other.HasValue && other.Value.EndsWith('/'))
-            {
-                return path.StartsWithSegments(other.Value[..^1], out remaining);
-            }
+        return path.StartsWithSegments(other, comparisonType);
+    }
 
-            return path.StartsWithSegments(other, out remaining);
+    public static bool StartsWithNormalizedSegments(this PathString path, PathString other, out PathString remaining)
+    {
+        if (other.HasValue && other.Value.EndsWith('/'))
+        {
+            return path.StartsWithSegments(other.Value[..^1], out remaining);
         }
 
-        public static bool StartsWithNormalizedSegments(this PathString path, PathString other, StringComparison comparisonType, out PathString remaining)
-        {
-            if (other.HasValue && other.Value.EndsWith('/'))
-            {
-                return path.StartsWithSegments(other.Value[..^1], comparisonType, out remaining);
-            }
+        return path.StartsWithSegments(other, out remaining);
+    }
 
-            return path.StartsWithSegments(other, comparisonType, out remaining);
+    public static bool StartsWithNormalizedSegments(this PathString path, PathString other, StringComparison comparisonType, out PathString remaining)
+    {
+        if (other.HasValue && other.Value.EndsWith('/'))
+        {
+            return path.StartsWithSegments(other.Value[..^1], comparisonType, out remaining);
         }
+
+        return path.StartsWithSegments(other, comparisonType, out remaining);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Routing/ShellRouteValuesAddressScheme.cs b/src/OrchardCore/OrchardCore.Abstractions/Routing/ShellRouteValuesAddressScheme.cs
index 55e657cc13a..169f410563d 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Routing/ShellRouteValuesAddressScheme.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Routing/ShellRouteValuesAddressScheme.cs
@@ -5,56 +5,55 @@
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace OrchardCore.Routing
+namespace OrchardCore.Routing;
+
+/// <summary>
+/// Allows a tenant to add its own 'RouteValuesAddress' schemes used for link generation.
+/// </summary>
+public sealed class ShellRouteValuesAddressScheme : IEndpointAddressScheme<RouteValuesAddress>
 {
-    /// <summary>
-    /// Allows a tenant to add its own 'RouteValuesAddress' schemes used for link generation.
-    /// </summary>
-    public sealed class ShellRouteValuesAddressScheme : IEndpointAddressScheme<RouteValuesAddress>
-    {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IEnumerable<IShellRouteValuesAddressScheme> _schemes;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IEnumerable<IShellRouteValuesAddressScheme> _schemes;
 
-        private bool _defaultSchemeInitialized;
-        private IEndpointAddressScheme<RouteValuesAddress> _defaultScheme;
+    private bool _defaultSchemeInitialized;
+    private IEndpointAddressScheme<RouteValuesAddress> _defaultScheme;
 
-        public ShellRouteValuesAddressScheme(IHttpContextAccessor httpContextAccessor, IEnumerable<IShellRouteValuesAddressScheme> schemes)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _schemes = schemes;
-        }
+    public ShellRouteValuesAddressScheme(IHttpContextAccessor httpContextAccessor, IEnumerable<IShellRouteValuesAddressScheme> schemes)
+    {
+        _httpContextAccessor = httpContextAccessor;
+        _schemes = schemes;
+    }
+
+    public IEnumerable<Endpoint> FindEndpoints(RouteValuesAddress address)
+    {
+        ArgumentNullException.ThrowIfNull(address);
 
-        public IEnumerable<Endpoint> FindEndpoints(RouteValuesAddress address)
+        // Run custom tenant schemes.
+        foreach (var scheme in _schemes)
         {
-            ArgumentNullException.ThrowIfNull(address);
+            var endpoints = scheme.FindEndpoints(address);
 
-            // Run custom tenant schemes.
-            foreach (var scheme in _schemes)
+            if (endpoints.Any())
             {
-                var endpoints = scheme.FindEndpoints(address);
-
-                if (endpoints.Any())
-                {
-                    return endpoints;
-                }
+                return endpoints;
             }
+        }
 
-            if (!_defaultSchemeInitialized)
+        if (!_defaultSchemeInitialized)
+        {
+            lock (this)
             {
-                lock (this)
-                {
-                    // Try once to get and cache the default scheme but not me.
-                    _defaultScheme = _httpContextAccessor.HttpContext?.RequestServices
-                        .GetServices<IEndpointAddressScheme<RouteValuesAddress>>()
-                        .Where(scheme => scheme.GetType() != GetType())
-                        .LastOrDefault();
-
-                    _defaultSchemeInitialized = true;
-                }
-            }
+                // Try once to get and cache the default scheme but not me.
+                _defaultScheme = _httpContextAccessor.HttpContext?.RequestServices
+                    .GetServices<IEndpointAddressScheme<RouteValuesAddress>>()
+                    .Where(scheme => scheme.GetType() != GetType())
+                    .LastOrDefault();
 
-            // Fallback to the default 'RouteValuesAddress' scheme.
-            return _defaultScheme?.FindEndpoints(address) ?? [];
+                _defaultSchemeInitialized = true;
+            }
         }
+
+        // Fallback to the default 'RouteValuesAddress' scheme.
+        return _defaultScheme?.FindEndpoints(address) ?? [];
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Setup/SetupConstants.cs b/src/OrchardCore/OrchardCore.Abstractions/Setup/SetupConstants.cs
index 3b84dfda5ec..98bca024b48 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Setup/SetupConstants.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Setup/SetupConstants.cs
@@ -1,18 +1,17 @@
-namespace OrchardCore.Abstractions.Setup
+namespace OrchardCore.Abstractions.Setup;
+
+public static class SetupConstants
 {
-    public static class SetupConstants
-    {
-        public const string SiteName = "SiteName";
-        public const string AdminUsername = "AdminUsername";
-        public const string AdminUserId = "AdminUserId";
-        public const string AdminEmail = "AdminEmail";
-        public const string AdminPassword = "AdminPassword";
-        public const string DatabaseProvider = "DatabaseProvider";
-        public const string DatabaseConnectionString = "DatabaseConnectionString";
-        public const string DatabaseTablePrefix = "DatabaseTablePrefix";
-        public const string DatabaseName = "DatabaseName";
-        public const string DatabaseSchema = "DatabaseSchema";
-        public const string SiteTimeZone = "SiteTimeZone";
-        public const string FeatureProfile = "FeatureProfile";
-    }
+    public const string SiteName = "SiteName";
+    public const string AdminUsername = "AdminUsername";
+    public const string AdminUserId = "AdminUserId";
+    public const string AdminEmail = "AdminEmail";
+    public const string AdminPassword = "AdminPassword";
+    public const string DatabaseProvider = "DatabaseProvider";
+    public const string DatabaseConnectionString = "DatabaseConnectionString";
+    public const string DatabaseTablePrefix = "DatabaseTablePrefix";
+    public const string DatabaseName = "DatabaseName";
+    public const string DatabaseSchema = "DatabaseSchema";
+    public const string SiteTimeZone = "SiteTimeZone";
+    public const string FeatureProfile = "FeatureProfile";
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Extensions/ClonedSingletonDescriptor.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Extensions/ClonedSingletonDescriptor.cs
index 3df5058b2e3..bb116b79cf3 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Extensions/ClonedSingletonDescriptor.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Extensions/ClonedSingletonDescriptor.cs
@@ -3,34 +3,33 @@
 
 #nullable enable
 
-namespace OrchardCore.Environment.Shell.Builders
+namespace OrchardCore.Environment.Shell.Builders;
+
+public class ClonedSingletonDescriptor : ServiceDescriptor
 {
-    public class ClonedSingletonDescriptor : ServiceDescriptor
+    public ClonedSingletonDescriptor(ServiceDescriptor parent, object implementationInstance)
+        : base(parent.ServiceType, implementationInstance)
     {
-        public ClonedSingletonDescriptor(ServiceDescriptor parent, object implementationInstance)
-            : base(parent.ServiceType, implementationInstance)
-        {
-            Parent = parent;
-        }
-
-        public ClonedSingletonDescriptor(ServiceDescriptor parent, object? serviceKey, object implementationInstance)
-            : base(parent.ServiceType, serviceKey, implementationInstance)
-        {
-            Parent = parent;
-        }
+        Parent = parent;
+    }
 
-        public ClonedSingletonDescriptor(ServiceDescriptor parent, Func<IServiceProvider, object> implementationFactory)
-            : base(parent.ServiceType, implementationFactory, ServiceLifetime.Singleton)
-        {
-            Parent = parent;
-        }
+    public ClonedSingletonDescriptor(ServiceDescriptor parent, object? serviceKey, object implementationInstance)
+        : base(parent.ServiceType, serviceKey, implementationInstance)
+    {
+        Parent = parent;
+    }
 
-        public ClonedSingletonDescriptor(ServiceDescriptor parent, object? serviceKey, Func<IServiceProvider, object?, object> implementationFactory)
-            : base(parent.ServiceType, serviceKey, implementationFactory, ServiceLifetime.Singleton)
-        {
-            Parent = parent;
-        }
+    public ClonedSingletonDescriptor(ServiceDescriptor parent, Func<IServiceProvider, object> implementationFactory)
+        : base(parent.ServiceType, implementationFactory, ServiceLifetime.Singleton)
+    {
+        Parent = parent;
+    }
 
-        public ServiceDescriptor Parent { get; }
+    public ClonedSingletonDescriptor(ServiceDescriptor parent, object? serviceKey, Func<IServiceProvider, object?, object> implementationFactory)
+        : base(parent.ServiceType, serviceKey, implementationFactory, ServiceLifetime.Singleton)
+    {
+        Parent = parent;
     }
+
+    public ServiceDescriptor Parent { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Extensions/ServiceDescriptorExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Extensions/ServiceDescriptorExtensions.cs
index 0ccaa55b924..b24d988dc71 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Extensions/ServiceDescriptorExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Extensions/ServiceDescriptorExtensions.cs
@@ -3,74 +3,73 @@
 
 #nullable enable
 
-namespace OrchardCore.Environment.Shell.Builders
+namespace OrchardCore.Environment.Shell.Builders;
+
+public static class ServiceDescriptorExtensions
 {
-    public static class ServiceDescriptorExtensions
+    public static Type? GetImplementationType(this ServiceDescriptor descriptor)
     {
-        public static Type? GetImplementationType(this ServiceDescriptor descriptor)
+        if (descriptor is ClonedSingletonDescriptor cloned)
         {
-            if (descriptor is ClonedSingletonDescriptor cloned)
-            {
-                // Use the parent descriptor as it was before being cloned.
-                return cloned.Parent.GetImplementationType();
-            }
-
-            if (descriptor.TryGetImplementationTypeInternal(out var implementationType))
-            {
-                return implementationType;
-            }
-
-            if (descriptor.TryGetImplementationInstance(out var implementationInstance))
-            {
-                return implementationInstance?.GetType();
-            }
-
-            if (descriptor.TryGetImplementationFactory(out var implementationFactory))
-            {
-                return implementationFactory?.GetType().GenericTypeArguments[1];
-            }
-
-            return null;
+            // Use the parent descriptor as it was before being cloned.
+            return cloned.Parent.GetImplementationType();
         }
 
-        public static object? GetImplementationInstance(this ServiceDescriptor serviceDescriptor) => serviceDescriptor.IsKeyedService
-            ? serviceDescriptor.KeyedImplementationInstance
-            : serviceDescriptor.ImplementationInstance;
-
-        public static object? GetImplementationFactory(this ServiceDescriptor serviceDescriptor) => serviceDescriptor.IsKeyedService
-            ? serviceDescriptor.KeyedImplementationFactory
-            : serviceDescriptor.ImplementationFactory;
-
-        public static bool TryGetImplementationType(this ServiceDescriptor serviceDescriptor, out Type? type)
+        if (descriptor.TryGetImplementationTypeInternal(out var implementationType))
         {
-            type = serviceDescriptor.GetImplementationType();
-
-            return type is not null;
+            return implementationType;
         }
 
-        public static bool TryGetImplementationInstance(this ServiceDescriptor serviceDescriptor, out object? instance)
+        if (descriptor.TryGetImplementationInstance(out var implementationInstance))
         {
-            instance = serviceDescriptor.GetImplementationInstance();
-
-            return instance is not null;
+            return implementationInstance?.GetType();
         }
 
-        public static bool TryGetImplementationFactory(this ServiceDescriptor serviceDescriptor, out object? factory)
+        if (descriptor.TryGetImplementationFactory(out var implementationFactory))
         {
-            factory = serviceDescriptor.GetImplementationFactory();
-
-            return factory is not null;
+            return implementationFactory?.GetType().GenericTypeArguments[1];
         }
 
-        internal static Type? GetImplementationTypeInternal(this ServiceDescriptor serviceDescriptor) => serviceDescriptor.IsKeyedService
-            ? serviceDescriptor.KeyedImplementationType
-            : serviceDescriptor.ImplementationType;
+        return null;
+    }
 
-        internal static bool TryGetImplementationTypeInternal(this ServiceDescriptor serviceDescriptor, out Type? type)
-        {
-            type = serviceDescriptor.GetImplementationTypeInternal();
+    public static object? GetImplementationInstance(this ServiceDescriptor serviceDescriptor) => serviceDescriptor.IsKeyedService
+        ? serviceDescriptor.KeyedImplementationInstance
+        : serviceDescriptor.ImplementationInstance;
 
-            return type is not null;
-        }
+    public static object? GetImplementationFactory(this ServiceDescriptor serviceDescriptor) => serviceDescriptor.IsKeyedService
+        ? serviceDescriptor.KeyedImplementationFactory
+        : serviceDescriptor.ImplementationFactory;
+
+    public static bool TryGetImplementationType(this ServiceDescriptor serviceDescriptor, out Type? type)
+    {
+        type = serviceDescriptor.GetImplementationType();
+
+        return type is not null;
+    }
+
+    public static bool TryGetImplementationInstance(this ServiceDescriptor serviceDescriptor, out object? instance)
+    {
+        instance = serviceDescriptor.GetImplementationInstance();
+
+        return instance is not null;
+    }
+
+    public static bool TryGetImplementationFactory(this ServiceDescriptor serviceDescriptor, out object? factory)
+    {
+        factory = serviceDescriptor.GetImplementationFactory();
+
+        return factory is not null;
+    }
+
+    internal static Type? GetImplementationTypeInternal(this ServiceDescriptor serviceDescriptor) => serviceDescriptor.IsKeyedService
+        ? serviceDescriptor.KeyedImplementationType
+        : serviceDescriptor.ImplementationType;
+
+    internal static bool TryGetImplementationTypeInternal(this ServiceDescriptor serviceDescriptor, out Type? type)
+    {
+        type = serviceDescriptor.GetImplementationTypeInternal();
+
+        return type is not null;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Extensions/ServiceProviderExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Extensions/ServiceProviderExtensions.cs
index e4e22aee29b..3a0f1956952 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Extensions/ServiceProviderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Extensions/ServiceProviderExtensions.cs
@@ -3,38 +3,37 @@
 
 #nullable enable
 
-namespace OrchardCore.Environment.Shell.Builders
+namespace OrchardCore.Environment.Shell.Builders;
+
+public static class ServiceProviderExtensions
 {
-    public static class ServiceProviderExtensions
+    /// <summary>
+    /// Instantiates a new object of the specified type, but with support for constructor injection.
+    /// </summary>
+    public static TResult CreateInstance<TResult>(this IServiceProvider provider) where TResult : class
     {
-        /// <summary>
-        /// Instantiates a new object of the specified type, but with support for constructor injection.
-        /// </summary>
-        public static TResult CreateInstance<TResult>(this IServiceProvider provider) where TResult : class
-        {
-            return CreateInstance<TResult>(provider, typeof(TResult));
-        }
+        return CreateInstance<TResult>(provider, typeof(TResult));
+    }
 
-        /// <summary>
-        /// Instantiates a new object of the specified type, but with support for constructor injection.
-        /// </summary>
-        public static TResult CreateInstance<TResult>(this IServiceProvider provider, Type type) where TResult : class
-        {
-            return (TResult)ActivatorUtilities.CreateInstance(provider, type);
-        }
+    /// <summary>
+    /// Instantiates a new object of the specified type, but with support for constructor injection.
+    /// </summary>
+    public static TResult CreateInstance<TResult>(this IServiceProvider provider, Type type) where TResult : class
+    {
+        return (TResult)ActivatorUtilities.CreateInstance(provider, type);
+    }
 
-        /// <summary>
-        /// Gets the service object of the specified type with the specified key.
-        /// </summary>
-        public static object? GetKeyedService(this IServiceProvider provider, Type serviceType, object? serviceKey)
+    /// <summary>
+    /// Gets the service object of the specified type with the specified key.
+    /// </summary>
+    public static object? GetKeyedService(this IServiceProvider provider, Type serviceType, object? serviceKey)
+    {
+        ArgumentNullException.ThrowIfNull(provider);
+        if (provider is IKeyedServiceProvider keyedServiceProvider)
         {
-            ArgumentNullException.ThrowIfNull(provider);
-            if (provider is IKeyedServiceProvider keyedServiceProvider)
-            {
-                return keyedServiceProvider.GetKeyedService(serviceType, serviceKey);
-            }
-
-            throw new InvalidOperationException("This service provider doesn't support keyed services.");
+            return keyedServiceProvider.GetKeyedService(serviceType, serviceKey);
         }
+
+        throw new InvalidOperationException("This service provider doesn't support keyed services.");
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/ICompositionStrategy.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/ICompositionStrategy.cs
index b201d275ebd..3680f82b820 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/ICompositionStrategy.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/ICompositionStrategy.cs
@@ -2,17 +2,16 @@
 using OrchardCore.Environment.Shell.Builders.Models;
 using OrchardCore.Environment.Shell.Descriptor.Models;
 
-namespace OrchardCore.Environment.Shell.Builders
+namespace OrchardCore.Environment.Shell.Builders;
+
+/// <summary>
+/// Service at the host level to transform the cacheable descriptor into the loadable blueprint.
+/// </summary>
+public interface ICompositionStrategy
 {
     /// <summary>
-    /// Service at the host level to transform the cacheable descriptor into the loadable blueprint.
+    /// Using information from the IExtensionManager, transforms and populates all of the
+    /// blueprint model the shell builders will need to correctly initialize a tenant IoC container.
     /// </summary>
-    public interface ICompositionStrategy
-    {
-        /// <summary>
-        /// Using information from the IExtensionManager, transforms and populates all of the
-        /// blueprint model the shell builders will need to correctly initialize a tenant IoC container.
-        /// </summary>
-        Task<ShellBlueprint> ComposeAsync(ShellSettings settings, ShellDescriptor descriptor);
-    }
+    Task<ShellBlueprint> ComposeAsync(ShellSettings settings, ShellDescriptor descriptor);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/IShellContainerFactory.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/IShellContainerFactory.cs
index f95a5fefc7c..10a4c5153d4 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/IShellContainerFactory.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/IShellContainerFactory.cs
@@ -2,10 +2,9 @@
 using System.Threading.Tasks;
 using OrchardCore.Environment.Shell.Builders.Models;
 
-namespace OrchardCore.Environment.Shell.Builders
+namespace OrchardCore.Environment.Shell.Builders;
+
+public interface IShellContainerFactory
 {
-    public interface IShellContainerFactory
-    {
-        Task<IServiceProvider> CreateContainerAsync(ShellSettings settings, ShellBlueprint blueprint);
-    }
+    Task<IServiceProvider> CreateContainerAsync(ShellSettings settings, ShellBlueprint blueprint);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/IShellContextFactory.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/IShellContextFactory.cs
index cc44d9abc71..af6b50b53de 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/IShellContextFactory.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/IShellContextFactory.cs
@@ -1,29 +1,28 @@
 using System.Threading.Tasks;
 using OrchardCore.Environment.Shell.Descriptor.Models;
 
-namespace OrchardCore.Environment.Shell.Builders
+namespace OrchardCore.Environment.Shell.Builders;
+
+/// <summary>
+/// High-level coordinator that exercises other component capabilities to
+/// build all of the artifacts for a running shell given a tenant settings.
+/// </summary>
+public interface IShellContextFactory
 {
     /// <summary>
-    /// High-level coordinator that exercises other component capabilities to
-    /// build all of the artifacts for a running shell given a tenant settings.
+    /// Builds a shell context given a specific tenant settings structure.
     /// </summary>
-    public interface IShellContextFactory
-    {
-        /// <summary>
-        /// Builds a shell context given a specific tenant settings structure.
-        /// </summary>
-        Task<ShellContext> CreateShellContextAsync(ShellSettings settings);
+    Task<ShellContext> CreateShellContextAsync(ShellSettings settings);
 
-        /// <summary>
-        /// Builds a shell context for an uninitialized Orchard instance. Needed
-        /// to display setup user interface.
-        /// </summary>
-        Task<ShellContext> CreateSetupContextAsync(ShellSettings settings);
+    /// <summary>
+    /// Builds a shell context for an uninitialized Orchard instance. Needed
+    /// to display setup user interface.
+    /// </summary>
+    Task<ShellContext> CreateSetupContextAsync(ShellSettings settings);
 
-        /// <summary>
-        /// Builds a shell context given a specific description of features and parameters.
-        /// Shell's actual current descriptor has no effect. Does not use or update descriptor cache.
-        /// </summary>
-        Task<ShellContext> CreateDescribedContextAsync(ShellSettings settings, ShellDescriptor shellDescriptor);
-    }
+    /// <summary>
+    /// Builds a shell context given a specific description of features and parameters.
+    /// Shell's actual current descriptor has no effect. Does not use or update descriptor cache.
+    /// </summary>
+    Task<ShellContext> CreateDescribedContextAsync(ShellSettings settings, ShellDescriptor shellDescriptor);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/IShellPipeline.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/IShellPipeline.cs
index 05d49ccd641..4b592a33d88 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/IShellPipeline.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/IShellPipeline.cs
@@ -1,12 +1,11 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Environment.Shell.Builders
+namespace OrchardCore.Environment.Shell.Builders;
+
+public interface IShellPipeline
 {
-    public interface IShellPipeline
-    {
-        /// <summary>
-        /// Executes this shell pipeline.
-        /// </summary>
-        Task Invoke(object context);
-    }
+    /// <summary>
+    /// Executes this shell pipeline.
+    /// </summary>
+    Task Invoke(object context);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Models/ShellBlueprint.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Models/ShellBlueprint.cs
index 35d19b59b09..acc50d2e650 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Models/ShellBlueprint.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Models/ShellBlueprint.cs
@@ -3,18 +3,17 @@
 using OrchardCore.Environment.Extensions.Features;
 using OrchardCore.Environment.Shell.Descriptor.Models;
 
-namespace OrchardCore.Environment.Shell.Builders.Models
+namespace OrchardCore.Environment.Shell.Builders.Models;
+
+/// <summary>
+/// Contains the information necessary to initialize an IoC container
+/// for a particular tenant. This model is created by the ICompositionStrategy
+/// and is passed into the IShellContainerFactory.
+/// </summary>
+public class ShellBlueprint
 {
-    /// <summary>
-    /// Contains the information necessary to initialize an IoC container
-    /// for a particular tenant. This model is created by the ICompositionStrategy
-    /// and is passed into the IShellContainerFactory.
-    /// </summary>
-    public class ShellBlueprint
-    {
-        public ShellSettings Settings { get; set; }
-        public ShellDescriptor Descriptor { get; set; }
+    public ShellSettings Settings { get; set; }
+    public ShellDescriptor Descriptor { get; set; }
 
-        public IDictionary<Type, IEnumerable<IFeatureInfo>> Dependencies { get; set; }
-    }
+    public IDictionary<Type, IEnumerable<IFeatureInfo>> Dependencies { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/ShellContext.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/ShellContext.cs
index 57369606cef..d88fcadf6ec 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/ShellContext.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/ShellContext.cs
@@ -5,308 +5,307 @@
 using OrchardCore.Environment.Shell.Builders.Models;
 using OrchardCore.Environment.Shell.Scope;
 
-namespace OrchardCore.Environment.Shell.Builders
+namespace OrchardCore.Environment.Shell.Builders;
+
+/// <summary>
+/// Represents the state of a tenant.
+/// </summary>
+public class ShellContext : IDisposable, IAsyncDisposable
 {
+    private List<WeakReference<ShellContext>> _dependents;
+    private readonly SemaphoreSlim _semaphore = new(1);
+    private bool _disposed;
+
+    internal volatile int _refCount;
+    internal volatile int _terminated;
+    internal bool _released;
+
     /// <summary>
-    /// Represents the state of a tenant.
+    /// Initializes a new <see cref="ShellContext"/>.
     /// </summary>
-    public class ShellContext : IDisposable, IAsyncDisposable
-    {
-        private List<WeakReference<ShellContext>> _dependents;
-        private readonly SemaphoreSlim _semaphore = new(1);
-        private bool _disposed;
+    public ShellContext() => UtcTicks = DateTime.UtcNow.Ticks;
 
-        internal volatile int _refCount;
-        internal volatile int _terminated;
-        internal bool _released;
+    /// <summary>
+    /// The creation date and time of this shell context in ticks.
+    /// </summary>
+    public long UtcTicks { get; }
 
-        /// <summary>
-        /// Initializes a new <see cref="ShellContext"/>.
-        /// </summary>
-        public ShellContext() => UtcTicks = DateTime.UtcNow.Ticks;
+    /// <summary>
+    /// The <see cref="ShellSettings"/> holding the tenant settings and configuration.
+    /// </summary>
+    public ShellSettings Settings { get; set; }
 
-        /// <summary>
-        /// The creation date and time of this shell context in ticks.
-        /// </summary>
-        public long UtcTicks { get; }
+    /// <summary>
+    /// The <see cref="ShellBlueprint"/> describing the tenant container.
+    /// </summary>
+    public ShellBlueprint Blueprint { get; set; }
 
-        /// <summary>
-        /// The <see cref="ShellSettings"/> holding the tenant settings and configuration.
-        /// </summary>
-        public ShellSettings Settings { get; set; }
+    /// <summary>
+    /// The <see cref="IServiceProvider"/> of the tenant container.
+    /// </summary>
+    public IServiceProvider ServiceProvider { get; set; }
 
-        /// <summary>
-        /// The <see cref="ShellBlueprint"/> describing the tenant container.
-        /// </summary>
-        public ShellBlueprint Blueprint { get; set; }
+    /// <summary>
+    /// Whether the shell is activated or not.
+    /// </summary>
+    public bool IsActivated { get; set; }
 
-        /// <summary>
-        /// The <see cref="IServiceProvider"/> of the tenant container.
-        /// </summary>
-        public IServiceProvider ServiceProvider { get; set; }
+    /// <summary>
+    /// The Pipeline built for this shell.
+    /// </summary>
+    public IShellPipeline Pipeline { get; set; }
 
+    /// <summary>
+    /// PlaceHolder class used for shell lazy initialization.
+    /// </summary>
+    public class PlaceHolder : ShellContext
+    {
         /// <summary>
-        /// Whether the shell is activated or not.
+        /// Initializes a placeHolder used for shell lazy initialization.
         /// </summary>
-        public bool IsActivated { get; set; }
+        public PlaceHolder()
+        {
+            _released = true;
+        }
 
         /// <summary>
-        /// The Pipeline built for this shell.
+        /// Whether or not the tenant has been pre-created on first loading.
         /// </summary>
-        public IShellPipeline Pipeline { get; set; }
+        public bool PreCreated { get; init; }
+    }
 
-        /// <summary>
-        /// PlaceHolder class used for shell lazy initialization.
-        /// </summary>
-        public class PlaceHolder : ShellContext
+    /// <summary>
+    /// Creates a <see cref="ShellScope"/> on this shell context.
+    /// </summary>
+    public async Task<ShellScope> CreateScopeAsync()
+    {
+        // Don't create a shell scope on a released shell.
+        if (_released)
         {
-            /// <summary>
-            /// Initializes a placeHolder used for shell lazy initialization.
-            /// </summary>
-            public PlaceHolder()
-            {
-                _released = true;
-            }
-
-            /// <summary>
-            /// Whether or not the tenant has been pre-created on first loading.
-            /// </summary>
-            public bool PreCreated { get; init; }
+            return null;
         }
 
-        /// <summary>
-        /// Creates a <see cref="ShellScope"/> on this shell context.
-        /// </summary>
-        public async Task<ShellScope> CreateScopeAsync()
+        var scope = new ShellScope(this);
+
+        // Don't start using a new scope on a released shell.
+        if (_released)
         {
-            // Don't create a shell scope on a released shell.
-            if (_released)
-            {
-                return null;
-            }
+            // But let this scope manage the shell state as usual.
+            await scope.TerminateShellAsync();
+            return null;
+        }
 
-            var scope = new ShellScope(this);
+        return scope;
+    }
 
-            // Don't start using a new scope on a released shell.
-            if (_released)
-            {
-                // But let this scope manage the shell state as usual.
-                await scope.TerminateShellAsync();
-                return null;
-            }
+    /// <summary>
+    /// Whether the <see cref="ShellContext"/> instance is not yet built or has been released,
+    /// for instance when a tenant has changed.
+    /// </summary>
+    public bool Released => _released;
 
-            return scope;
-        }
+    /// <summary>
+    /// Returns the number of active scopes on this tenant.
+    /// </summary>
+    public int ActiveScopes => _refCount;
 
-        /// <summary>
-        /// Whether the <see cref="ShellContext"/> instance is not yet built or has been released,
-        /// for instance when a tenant has changed.
-        /// </summary>
-        public bool Released => _released;
+    /// <summary>
+    /// Whether or not this instance uses shared <see cref="Settings"/> that should not be disposed.
+    /// </summary>
+    public bool SharedSettings { get; internal set; }
 
-        /// <summary>
-        /// Returns the number of active scopes on this tenant.
-        /// </summary>
-        public int ActiveScopes => _refCount;
+    /// <summary>
+    /// Marks the <see cref="ShellContext"/> as released and then a candidate to be disposed.
+    /// </summary>
+    public Task ReleaseAsync() => ReleaseInternalAsync();
 
-        /// <summary>
-        /// Whether or not this instance uses shared <see cref="Settings"/> that should not be disposed.
-        /// </summary>
-        public bool SharedSettings { get; internal set; }
+    internal Task ReleaseFromLastScopeAsync() => ReleaseInternalAsync(ReleaseMode.FromLastScope);
 
-        /// <summary>
-        /// Marks the <see cref="ShellContext"/> as released and then a candidate to be disposed.
-        /// </summary>
-        public Task ReleaseAsync() => ReleaseInternalAsync();
+    internal Task ReleaseFromDependencyAsync() => ReleaseInternalAsync(ReleaseMode.FromDependency);
 
-        internal Task ReleaseFromLastScopeAsync() => ReleaseInternalAsync(ReleaseMode.FromLastScope);
+    internal async Task ReleaseInternalAsync(ReleaseMode mode = ReleaseMode.Normal)
+    {
+        // A 'PlaceHolder' is always released.
+        if (this is PlaceHolder)
+        {
+            // But still try to dispose the settings.
+            await DisposeAsync();
+            return;
+        }
 
-        internal Task ReleaseFromDependencyAsync() => ReleaseInternalAsync(ReleaseMode.FromDependency);
+        if (_released)
+        {
+            // Prevent infinite loops with circular dependencies
+            return;
+        }
 
-        internal async Task ReleaseInternalAsync(ReleaseMode mode = ReleaseMode.Normal)
+        // A disabled shell still in use will be released by its last scope, as checked at the host level.
+        if (mode == ReleaseMode.FromDependency && Settings.IsDisabled() && _refCount != 0)
         {
-            // A 'PlaceHolder' is always released.
-            if (this is PlaceHolder)
-            {
-                // But still try to dispose the settings.
-                await DisposeAsync();
-                return;
-            }
+            return;
+        }
 
-            if (_released)
-            {
-                // Prevent infinite loops with circular dependencies
-                return;
-            }
+        // When a tenant has changed its shell context is replaced with a new one, so that new requests can't use it anymore.
+        // However, some uncompleted requests may still try to use or resolve services from child shell scopes. In that case,
+        // this is the last shell scope (when the shell reference count reaches zero) that disposes its parent shell context.
 
-            // A disabled shell still in use will be released by its last scope, as checked at the host level.
-            if (mode == ReleaseMode.FromDependency && Settings.IsDisabled() && _refCount != 0)
+        ShellScope scope = null;
+        await _semaphore.WaitAsync();
+        try
+        {
+            if (_released)
             {
                 return;
             }
 
-            // When a tenant has changed its shell context is replaced with a new one, so that new requests can't use it anymore.
-            // However, some uncompleted requests may still try to use or resolve services from child shell scopes. In that case,
-            // this is the last shell scope (when the shell reference count reaches zero) that disposes its parent shell context.
-
-            ShellScope scope = null;
-            await _semaphore.WaitAsync();
-            try
+            if (_dependents is not null)
             {
-                if (_released)
-                {
-                    return;
-                }
-
-                if (_dependents is not null)
+                foreach (var dependent in _dependents)
                 {
-                    foreach (var dependent in _dependents)
+                    if (dependent.TryGetTarget(out var shellContext))
                     {
-                        if (dependent.TryGetTarget(out var shellContext))
-                        {
-                            await shellContext.ReleaseFromDependencyAsync();
-                        }
+                        await shellContext.ReleaseFromDependencyAsync();
                     }
                 }
-
-                if (mode != ReleaseMode.FromLastScope && ServiceProvider is not null)
-                {
-                    // Before marking the shell as released, we create a new scope that will manage the shell state,
-                    // so that we always use the same shell scope logic to check if the reference counter reached 0.
-                    scope = new ShellScope(this);
-                }
-
-                _released = true;
-            }
-            finally
-            {
-                _semaphore.Release();
             }
 
-            if (mode == ReleaseMode.FromLastScope)
+            if (mode != ReleaseMode.FromLastScope && ServiceProvider is not null)
             {
-                return;
-            }
-
-            if (scope is not null)
-            {
-                // Use this scope to manage the shell state as usual.
-                await scope.TerminateShellAsync();
-                return;
+                // Before marking the shell as released, we create a new scope that will manage the shell state,
+                // so that we always use the same shell scope logic to check if the reference counter reached 0.
+                scope = new ShellScope(this);
             }
 
-            await DisposeAsync();
+            _released = true;
         }
-
-        internal enum ReleaseMode
+        finally
         {
-            Normal,
-            FromLastScope,
-            FromDependency
+            _semaphore.Release();
         }
 
-        /// <summary>
-        /// Registers the specified shellContext as dependent such that it is also released when the current shell context is released.
-        /// </summary>
-        public async Task AddDependentShellAsync(ShellContext shellContext)
+        if (mode == ReleaseMode.FromLastScope)
         {
-            // If the dependent is released, nothing to do.
-            if (shellContext.Released)
-            {
-                return;
-            }
+            return;
+        }
 
-            // If the dependency is already released.
-            if (_released)
-            {
-                // The dependent is released immediately.
-                await shellContext.ReleaseInternalAsync();
-                return;
-            }
+        if (scope is not null)
+        {
+            // Use this scope to manage the shell state as usual.
+            await scope.TerminateShellAsync();
+            return;
+        }
 
-            await _semaphore.WaitAsync();
-            try
-            {
-                _dependents ??= [];
+        await DisposeAsync();
+    }
 
-                // Remove any previous instance that represents the same tenant in case it has been released or reloaded.
-                _dependents.RemoveAll(wref => !wref.TryGetTarget(out var shell) || shell.Settings.Name == shellContext.Settings.Name);
+    internal enum ReleaseMode
+    {
+        Normal,
+        FromLastScope,
+        FromDependency
+    }
 
-                _dependents.Add(new WeakReference<ShellContext>(shellContext));
-            }
-            finally
-            {
-                _semaphore.Release();
-            }
+    /// <summary>
+    /// Registers the specified shellContext as dependent such that it is also released when the current shell context is released.
+    /// </summary>
+    public async Task AddDependentShellAsync(ShellContext shellContext)
+    {
+        // If the dependent is released, nothing to do.
+        if (shellContext.Released)
+        {
+            return;
         }
 
-        public void Dispose()
+        // If the dependency is already released.
+        if (_released)
         {
-            Close();
-            GC.SuppressFinalize(this);
+            // The dependent is released immediately.
+            await shellContext.ReleaseInternalAsync();
+            return;
         }
 
-        public async ValueTask DisposeAsync()
+        await _semaphore.WaitAsync();
+        try
         {
-            await CloseAsync();
-            GC.SuppressFinalize(this);
-        }
+            _dependents ??= [];
+
+            // Remove any previous instance that represents the same tenant in case it has been released or reloaded.
+            _dependents.RemoveAll(wref => !wref.TryGetTarget(out var shell) || shell.Settings.Name == shellContext.Settings.Name);
 
-        private void Close()
+            _dependents.Add(new WeakReference<ShellContext>(shellContext));
+        }
+        finally
         {
-            if (_disposed)
-            {
-                return;
-            }
+            _semaphore.Release();
+        }
+    }
 
-            _disposed = true;
+    public void Dispose()
+    {
+        Close();
+        GC.SuppressFinalize(this);
+    }
 
-            if (ServiceProvider is IDisposable disposable)
-            {
-                disposable.Dispose();
-            }
+    public async ValueTask DisposeAsync()
+    {
+        await CloseAsync();
+        GC.SuppressFinalize(this);
+    }
 
-            Terminate();
+    private void Close()
+    {
+        if (_disposed)
+        {
+            return;
         }
 
-        private async ValueTask CloseAsync()
-        {
-            if (_disposed)
-            {
-                return;
-            }
+        _disposed = true;
 
-            _disposed = true;
+        if (ServiceProvider is IDisposable disposable)
+        {
+            disposable.Dispose();
+        }
 
-            if (ServiceProvider is IAsyncDisposable asyncDisposable)
-            {
-                await asyncDisposable.DisposeAsync();
-            }
-            else if (ServiceProvider is IDisposable disposable)
-            {
-                disposable.Dispose();
-            }
+        Terminate();
+    }
 
-            Terminate();
+    private async ValueTask CloseAsync()
+    {
+        if (_disposed)
+        {
+            return;
         }
 
-        private void Terminate()
+        _disposed = true;
+
+        if (ServiceProvider is IAsyncDisposable asyncDisposable)
+        {
+            await asyncDisposable.DisposeAsync();
+        }
+        else if (ServiceProvider is IDisposable disposable)
         {
-            ServiceProvider = null;
-            IsActivated = false;
-            Blueprint = null;
-            Pipeline = null;
+            disposable.Dispose();
+        }
 
-            _semaphore?.Dispose();
+        Terminate();
+    }
 
-            if (SharedSettings)
-            {
-                return;
-            }
+    private void Terminate()
+    {
+        ServiceProvider = null;
+        IsActivated = false;
+        Blueprint = null;
+        Pipeline = null;
+
+        _semaphore?.Dispose();
 
-            Settings?.Dispose();
+        if (SharedSettings)
+        {
+            return;
         }
 
-        ~ShellContext() => Close();
+        Settings?.Dispose();
     }
+
+    ~ShellContext() => Close();
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/ShellContextExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/ShellContextExtensions.cs
index e998affffd1..a16865f800d 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/ShellContextExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/ShellContextExtensions.cs
@@ -5,59 +5,58 @@
 using OrchardCore.Locking;
 using OrchardCore.Locking.Distributed;
 
-namespace OrchardCore.Environment.Shell.Builders
+namespace OrchardCore.Environment.Shell.Builders;
+
+public static class ShellContextExtensions
 {
-    public static class ShellContextExtensions
+    /// <summary>
+    /// Tries to acquire a lock for shell activation, a local lock if it is initializing, otherwise a distributed lock.
+    /// </summary>
+    public static Task<(ILocker locker, bool locked)> TryAcquireShellActivateLockAsync(this ShellContext shellContext)
     {
-        /// <summary>
-        /// Tries to acquire a lock for shell activation, a local lock if it is initializing, otherwise a distributed lock.
-        /// </summary>
-        public static Task<(ILocker locker, bool locked)> TryAcquireShellActivateLockAsync(this ShellContext shellContext)
-        {
-            // If the shell is initializing, force the usage of a local lock.
-            var lockService = shellContext.Settings.IsInitializing()
-                ? (ILock)shellContext.ServiceProvider.GetRequiredService<ILocalLock>()
-                : shellContext.ServiceProvider.GetRequiredService<IDistributedLock>();
+        // If the shell is initializing, force the usage of a local lock.
+        var lockService = shellContext.Settings.IsInitializing()
+            ? (ILock)shellContext.ServiceProvider.GetRequiredService<ILocalLock>()
+            : shellContext.ServiceProvider.GetRequiredService<IDistributedLock>();
 
-            TimeSpan timeout, expiration;
-            if (lockService is ILocalLock)
-            {
-                // If it is a local lock, don't use any timeout and expiration.
-                timeout = expiration = TimeSpan.MaxValue;
-            }
-            else
-            {
-                // If it is a distributed lock, use the configured timeout and expiration.
-                var options = shellContext.ServiceProvider.GetRequiredService<IOptions<ShellContextOptions>>();
-                timeout = TimeSpan.FromMilliseconds(options.Value.ShellActivateLockTimeout);
-                expiration = TimeSpan.FromMilliseconds(options.Value.ShellActivateLockExpiration);
-            }
-
-            return lockService.TryAcquireLockAsync("SHELL_ACTIVATE_LOCK", timeout, expiration);
+        TimeSpan timeout, expiration;
+        if (lockService is ILocalLock)
+        {
+            // If it is a local lock, don't use any timeout and expiration.
+            timeout = expiration = TimeSpan.MaxValue;
         }
-
-        /// <summary>
-        /// Tries to acquire a lock for shell removing.
-        /// </summary>
-        public static Task<(ILocker locker, bool locked)> TryAcquireShellRemovingLockAsync(this ShellContext shellContext)
+        else
         {
-            TimeSpan timeout, expiration;
+            // If it is a distributed lock, use the configured timeout and expiration.
+            var options = shellContext.ServiceProvider.GetRequiredService<IOptions<ShellContextOptions>>();
+            timeout = TimeSpan.FromMilliseconds(options.Value.ShellActivateLockTimeout);
+            expiration = TimeSpan.FromMilliseconds(options.Value.ShellActivateLockExpiration);
+        }
 
-            var lockService = shellContext.ServiceProvider.GetRequiredService<IDistributedLock>();
-            if (lockService is ILocalLock)
-            {
-                // If it is a local lock, don't use any timeout and expiration.
-                timeout = expiration = TimeSpan.MaxValue;
-            }
-            else
-            {
-                // If it is a distributed lock, use the configured timeout and expiration.
-                var options = shellContext.ServiceProvider.GetRequiredService<IOptions<ShellContextOptions>>();
-                timeout = TimeSpan.FromMilliseconds(options.Value.ShellRemovingLockTimeout);
-                expiration = TimeSpan.FromMilliseconds(options.Value.ShellRemovingLockExpiration);
-            }
+        return lockService.TryAcquireLockAsync("SHELL_ACTIVATE_LOCK", timeout, expiration);
+    }
 
-            return lockService.TryAcquireLockAsync("SHELL_REMOVING_LOCK", timeout, expiration);
+    /// <summary>
+    /// Tries to acquire a lock for shell removing.
+    /// </summary>
+    public static Task<(ILocker locker, bool locked)> TryAcquireShellRemovingLockAsync(this ShellContext shellContext)
+    {
+        TimeSpan timeout, expiration;
+
+        var lockService = shellContext.ServiceProvider.GetRequiredService<IDistributedLock>();
+        if (lockService is ILocalLock)
+        {
+            // If it is a local lock, don't use any timeout and expiration.
+            timeout = expiration = TimeSpan.MaxValue;
         }
+        else
+        {
+            // If it is a distributed lock, use the configured timeout and expiration.
+            var options = shellContext.ServiceProvider.GetRequiredService<IOptions<ShellContextOptions>>();
+            timeout = TimeSpan.FromMilliseconds(options.Value.ShellRemovingLockTimeout);
+            expiration = TimeSpan.FromMilliseconds(options.Value.ShellRemovingLockExpiration);
+        }
+
+        return lockService.TryAcquireLockAsync("SHELL_REMOVING_LOCK", timeout, expiration);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/ShellContextOptions.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/ShellContextOptions.cs
index 7620c7adb68..213c0dcfd84 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/ShellContextOptions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/ShellContextOptions.cs
@@ -1,31 +1,30 @@
-namespace OrchardCore.Environment.Shell.Builders
+namespace OrchardCore.Environment.Shell.Builders;
+
+public class ShellContextOptions
 {
-    public class ShellContextOptions
-    {
-        /// <summary>
-        /// The timeout in milliseconds to acquire a distributed lock before activating a given shell.
-        /// Note: Only used if the current distributed lock implementation is not a local lock.
-        /// </summary>
-        public int ShellActivateLockTimeout { get; set; }
+    /// <summary>
+    /// The timeout in milliseconds to acquire a distributed lock before activating a given shell.
+    /// Note: Only used if the current distributed lock implementation is not a local lock.
+    /// </summary>
+    public int ShellActivateLockTimeout { get; set; }
 
-        /// <summary>
-        /// The expiration in milliseconds of the distributed lock acquired before activating a shell.
-        /// Note: Only used if the current distributed lock implementation is not a local lock.
-        /// </summary>
-        public int ShellActivateLockExpiration { get; set; }
+    /// <summary>
+    /// The expiration in milliseconds of the distributed lock acquired before activating a shell.
+    /// Note: Only used if the current distributed lock implementation is not a local lock.
+    /// </summary>
+    public int ShellActivateLockExpiration { get; set; }
 
-        /// <summary>
-        /// The timeout in milliseconds to acquire a distributed lock before removing a given shell.
-        /// A low value is recommended because only one instance is intended to drop a given tenant.
-        /// This also prevents other instances from waiting too long in their tenant syncing loop.
-        /// Note: Only used if the current distributed lock implementation is not a local lock.
-        /// </summary>
-        public int ShellRemovingLockTimeout { get; set; }
+    /// <summary>
+    /// The timeout in milliseconds to acquire a distributed lock before removing a given shell.
+    /// A low value is recommended because only one instance is intended to drop a given tenant.
+    /// This also prevents other instances from waiting too long in their tenant syncing loop.
+    /// Note: Only used if the current distributed lock implementation is not a local lock.
+    /// </summary>
+    public int ShellRemovingLockTimeout { get; set; }
 
-        /// <summary>
-        /// The expiration in milliseconds of the distributed lock acquired before removing a shell.
-        /// Note: Only used if the current distributed lock implementation is not a local lock.
-        /// </summary>
-        public int ShellRemovingLockExpiration { get; set; }
-    }
+    /// <summary>
+    /// The expiration in milliseconds of the distributed lock acquired before removing a shell.
+    /// Note: Only used if the current distributed lock implementation is not a local lock.
+    /// </summary>
+    public int ShellRemovingLockExpiration { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/ConfigurationSectionExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/ConfigurationSectionExtensions.cs
index 9fb377d1079..184e4435957 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/ConfigurationSectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/ConfigurationSectionExtensions.cs
@@ -3,62 +3,61 @@
 using System.Text.Json.Nodes;
 using Microsoft.Extensions.Configuration;
 
-namespace OrchardCore.Environment.Shell.Configuration
+namespace OrchardCore.Environment.Shell.Configuration;
+
+public static class ConfigurationSectionExtensions
 {
-    public static class ConfigurationSectionExtensions
+    /// <summary>
+    /// A helper method that gets a configuration section using the new format (using single underscore) while being backward compatible with the dot-notation.
+    /// Not to be used by new code - new code should always use a single underscore when naming configuration keys that require separating segments.
+    /// Examples:
+    /// Good: "OrchardCore_Media_Azure".
+    /// Bad: "OrchardCore.Media.Azure".
+    /// See https://github.com/OrchardCMS/OrchardCore/issues/3766.
+    /// </summary>
+    public static IConfigurationSection GetSectionCompat(this IConfiguration configuration, string key)
     {
-        /// <summary>
-        /// A helper method that gets a configuration section using the new format (using single underscore) while being backward compatible with the dot-notation.
-        /// Not to be used by new code - new code should always use a single underscore when naming configuration keys that require separating segments.
-        /// Examples:
-        /// Good: "OrchardCore_Media_Azure".
-        /// Bad: "OrchardCore.Media.Azure".
-        /// See https://github.com/OrchardCMS/OrchardCore/issues/3766.
-        /// </summary>
-        public static IConfigurationSection GetSectionCompat(this IConfiguration configuration, string key)
-        {
-            var section = configuration.GetSection(key);
+        var section = configuration.GetSection(key);
 
-            return section.Exists()
-                ? section
-                : key.Contains('_')
-                    ? configuration.GetSection(key.Replace('_', '.'))
-                    : section;
-        }
+        return section.Exists()
+            ? section
+            : key.Contains('_')
+                ? configuration.GetSection(key.Replace('_', '.'))
+                : section;
+    }
 
-        public static JsonNode AsJsonNode(this IConfiguration configuration)
+    public static JsonNode AsJsonNode(this IConfiguration configuration)
+    {
+        if (configuration is IConfigurationSection configurationSection && configurationSection.Value != null)
         {
-            if (configuration is IConfigurationSection configurationSection && configurationSection.Value != null)
-            {
-                return JsonValue.Create(configurationSection.Value);
-            }
-
-            var children = configuration.GetChildren().ToList();
-
-            if (children.Count == 0)
-            {
-                return null;
-            }
+            return JsonValue.Create(configurationSection.Value);
+        }
 
-            if (children[0].Key == "0")
-            {
-                var array = new JsonArray();
+        var children = configuration.GetChildren().ToList();
 
-                foreach (var child in children)
-                {
-                    array.Add(child.AsJsonNode());
-                }
+        if (children.Count == 0)
+        {
+            return null;
+        }
 
-                return array;
-            }
+        if (children[0].Key == "0")
+        {
+            var array = new JsonArray();
 
-            var result = new JsonObject();
             foreach (var child in children)
             {
-                result.TryAdd(child.Key, child.AsJsonNode());
+                array.Add(child.AsJsonNode());
             }
 
-            return result;
+            return array;
         }
+
+        var result = new JsonObject();
+        foreach (var child in children)
+        {
+            result.TryAdd(child.Key, child.AsJsonNode());
+        }
+
+        return result;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/IShellConfiguration.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/IShellConfiguration.cs
index 7de9e393065..6614dd414a3 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/IShellConfiguration.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/IShellConfiguration.cs
@@ -1,8 +1,7 @@
 using Microsoft.Extensions.Configuration;
 
-namespace OrchardCore.Environment.Shell.Configuration
+namespace OrchardCore.Environment.Shell.Configuration;
+
+public interface IShellConfiguration : IConfiguration
 {
-    public interface IShellConfiguration : IConfiguration
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/IShellConfigurationSources.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/IShellConfigurationSources.cs
index 0a6ec67185d..d201a586795 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/IShellConfigurationSources.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/IShellConfigurationSources.cs
@@ -2,21 +2,20 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Configuration;
 
-namespace OrchardCore.Environment.Shell.Configuration
+namespace OrchardCore.Environment.Shell.Configuration;
+
+public interface IShellConfigurationSources
 {
-    public interface IShellConfigurationSources
-    {
-        Task AddSourcesAsync(string tenant, IConfigurationBuilder builder);
-        Task SaveAsync(string tenant, IDictionary<string, string> data);
-        Task RemoveAsync(string tenant);
-    }
+    Task AddSourcesAsync(string tenant, IConfigurationBuilder builder);
+    Task SaveAsync(string tenant, IDictionary<string, string> data);
+    Task RemoveAsync(string tenant);
+}
 
-    public static class ShellConfigurationSourcesExtensions
+public static class ShellConfigurationSourcesExtensions
+{
+    public static async Task<IConfigurationBuilder> AddSourcesAsync(this IConfigurationBuilder builder, string tenant, IShellConfigurationSources sources)
     {
-        public static async Task<IConfigurationBuilder> AddSourcesAsync(this IConfigurationBuilder builder, string tenant, IShellConfigurationSources sources)
-        {
-            await sources.AddSourcesAsync(tenant, builder);
-            return builder;
-        }
+        await sources.AddSourcesAsync(tenant, builder);
+        return builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/IShellsConfigurationSources.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/IShellsConfigurationSources.cs
index 36f7cc7f450..c67e1c85c82 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/IShellsConfigurationSources.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/IShellsConfigurationSources.cs
@@ -1,19 +1,18 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Configuration;
 
-namespace OrchardCore.Environment.Shell.Configuration
+namespace OrchardCore.Environment.Shell.Configuration;
+
+public interface IShellsConfigurationSources
 {
-    public interface IShellsConfigurationSources
-    {
-        Task AddSourcesAsync(IConfigurationBuilder builder);
-    }
+    Task AddSourcesAsync(IConfigurationBuilder builder);
+}
 
-    public static class ShellsConfigurationSourcesExtensions
+public static class ShellsConfigurationSourcesExtensions
+{
+    public static async Task<IConfigurationBuilder> AddSourcesAsync(this IConfigurationBuilder builder, IShellsConfigurationSources sources)
     {
-        public static async Task<IConfigurationBuilder> AddSourcesAsync(this IConfigurationBuilder builder, IShellsConfigurationSources sources)
-        {
-            await sources.AddSourcesAsync(builder);
-            return builder;
-        }
+        await sources.AddSourcesAsync(builder);
+        return builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/IShellsSettingsSources.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/IShellsSettingsSources.cs
index 5b951f4c2f9..af73a578300 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/IShellsSettingsSources.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/IShellsSettingsSources.cs
@@ -2,28 +2,27 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Configuration;
 
-namespace OrchardCore.Environment.Shell.Configuration
+namespace OrchardCore.Environment.Shell.Configuration;
+
+public interface IShellsSettingsSources
 {
-    public interface IShellsSettingsSources
+    Task AddSourcesAsync(IConfigurationBuilder builder);
+    Task AddSourcesAsync(string tenant, IConfigurationBuilder builder);
+    Task SaveAsync(string tenant, IDictionary<string, string> data);
+    Task RemoveAsync(string tenant);
+}
+
+public static class ShellsSettingsSourcesExtensions
+{
+    public static async Task<IConfigurationBuilder> AddSourcesAsync(this IConfigurationBuilder builder, IShellsSettingsSources sources)
     {
-        Task AddSourcesAsync(IConfigurationBuilder builder);
-        Task AddSourcesAsync(string tenant, IConfigurationBuilder builder);
-        Task SaveAsync(string tenant, IDictionary<string, string> data);
-        Task RemoveAsync(string tenant);
+        await sources.AddSourcesAsync(builder);
+        return builder;
     }
 
-    public static class ShellsSettingsSourcesExtensions
+    public static async Task<IConfigurationBuilder> AddSourcesAsync(this IConfigurationBuilder builder, string tenant, IShellsSettingsSources sources)
     {
-        public static async Task<IConfigurationBuilder> AddSourcesAsync(this IConfigurationBuilder builder, IShellsSettingsSources sources)
-        {
-            await sources.AddSourcesAsync(builder);
-            return builder;
-        }
-
-        public static async Task<IConfigurationBuilder> AddSourcesAsync(this IConfigurationBuilder builder, string tenant, IShellsSettingsSources sources)
-        {
-            await sources.AddSourcesAsync(tenant, builder);
-            return builder;
-        }
+        await sources.AddSourcesAsync(tenant, builder);
+        return builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/Internal/ConfigurationExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/Internal/ConfigurationExtensions.cs
index 8b268d731f3..4c037a50655 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/Internal/ConfigurationExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/Internal/ConfigurationExtensions.cs
@@ -92,7 +92,7 @@ public static Task<IDictionary<string, string>> ToConfigurationDataAsync(this Js
     {
         if (jConfiguration is null)
         {
-            return Task.FromResult< IDictionary<string, string>>(new Dictionary<string, string>());
+            return Task.FromResult<IDictionary<string, string>>(new Dictionary<string, string>());
         }
 
         var configurationString = jConfiguration.ToJsonString(JOptions.Default);
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/Internal/UpdatableDataProvider.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/Internal/UpdatableDataProvider.cs
index a98b3cc1056..26351936e7e 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/Internal/UpdatableDataProvider.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/Internal/UpdatableDataProvider.cs
@@ -7,53 +7,52 @@
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Primitives;
 
-namespace OrchardCore.Environment.Shell.Configuration.Internal
+namespace OrchardCore.Environment.Shell.Configuration.Internal;
+
+internal class UpdatableDataProvider : IConfigurationProvider, IConfigurationSource, IEnumerable<KeyValuePair<string, string>>
 {
-    internal class UpdatableDataProvider : IConfigurationProvider, IConfigurationSource, IEnumerable<KeyValuePair<string, string>>
-    {
-        public UpdatableDataProvider() => Data = new(StringComparer.OrdinalIgnoreCase);
+    public UpdatableDataProvider() => Data = new(StringComparer.OrdinalIgnoreCase);
 
-        public UpdatableDataProvider(IEnumerable<KeyValuePair<string, string>> initialData)
-        {
-            initialData ??= [];
-            Data = new(initialData, StringComparer.OrdinalIgnoreCase);
-        }
+    public UpdatableDataProvider(IEnumerable<KeyValuePair<string, string>> initialData)
+    {
+        initialData ??= [];
+        Data = new(initialData, StringComparer.OrdinalIgnoreCase);
+    }
 
-        protected ConcurrentDictionary<string, string> Data { get; set; }
+    protected ConcurrentDictionary<string, string> Data { get; set; }
 
-        public IEnumerator<KeyValuePair<string, string>> GetEnumerator() => Data.GetEnumerator();
+    public IEnumerator<KeyValuePair<string, string>> GetEnumerator() => Data.GetEnumerator();
 
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
-        public virtual bool TryGet(string key, out string value) => Data.TryGetValue(key, out value);
+    public virtual bool TryGet(string key, out string value) => Data.TryGetValue(key, out value);
 
-        public virtual void Set(string key, string value) => Data[key] = value;
+    public virtual void Set(string key, string value) => Data[key] = value;
 
-        public virtual void Load()
-        {
-        }
+    public virtual void Load()
+    {
+    }
 
-        public virtual IEnumerable<string> GetChildKeys(IEnumerable<string> earlierKeys, string parentPath)
-        {
-            var prefix = parentPath == null ? string.Empty : parentPath + ConfigurationPath.KeyDelimiter;
+    public virtual IEnumerable<string> GetChildKeys(IEnumerable<string> earlierKeys, string parentPath)
+    {
+        var prefix = parentPath == null ? string.Empty : parentPath + ConfigurationPath.KeyDelimiter;
 
-            return Data
-                .Where(kv => kv.Key.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
-                .Select(kv => Segment(kv.Key, prefix.Length))
-                .Concat(earlierKeys)
-                .OrderBy(k => k, ConfigurationKeyComparer.Instance);
-        }
+        return Data
+            .Where(kv => kv.Key.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
+            .Select(kv => Segment(kv.Key, prefix.Length))
+            .Concat(earlierKeys)
+            .OrderBy(k => k, ConfigurationKeyComparer.Instance);
+    }
 
-        private static string Segment(string key, int prefixLength)
-        {
-            var indexOf = key.IndexOf(ConfigurationPath.KeyDelimiter, prefixLength, StringComparison.OrdinalIgnoreCase);
-            return indexOf < 0 ? key[prefixLength..] : key[prefixLength..indexOf];
-        }
+    private static string Segment(string key, int prefixLength)
+    {
+        var indexOf = key.IndexOf(ConfigurationPath.KeyDelimiter, prefixLength, StringComparison.OrdinalIgnoreCase);
+        return indexOf < 0 ? key[prefixLength..] : key[prefixLength..indexOf];
+    }
 
-        public IChangeToken GetReloadToken() => NullChangeToken.Singleton;
+    public IChangeToken GetReloadToken() => NullChangeToken.Singleton;
 
-        public override string ToString() => $"{GetType().Name}";
+    public override string ToString() => $"{GetType().Name}";
 
-        public IConfigurationProvider Build(IConfigurationBuilder builder) => this;
-    }
+    public IConfigurationProvider Build(IConfigurationBuilder builder) => this;
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/ShellConfiguration.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/ShellConfiguration.cs
index 1d3767f76be..094d3b9daa7 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/ShellConfiguration.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Configuration/ShellConfiguration.cs
@@ -7,160 +7,159 @@
 using Microsoft.Extensions.Primitives;
 using OrchardCore.Environment.Shell.Configuration.Internal;
 
-namespace OrchardCore.Environment.Shell.Configuration
+namespace OrchardCore.Environment.Shell.Configuration;
+
+/// <summary>
+/// Holds the tenant <see cref="IConfiguration"/> which is lazily built
+/// from the application configuration 'appsettings.json', the 'App_Data/appsettings.json'
+/// file and then the 'App_Data/Sites/{tenant}/appsettings.json' file.
+/// </summary>
+public class ShellConfiguration : IShellConfiguration
 {
-    /// <summary>
-    /// Holds the tenant <see cref="IConfiguration"/> which is lazily built
-    /// from the application configuration 'appsettings.json', the 'App_Data/appsettings.json'
-    /// file and then the 'App_Data/Sites/{tenant}/appsettings.json' file.
-    /// </summary>
-    public class ShellConfiguration : IShellConfiguration
+    private IConfigurationRoot _configuration;
+    private UpdatableDataProvider _updatableData;
+
+    private readonly string _name;
+    private readonly Func<string, Action<IConfigurationBuilder>, Task<IConfigurationRoot>> _factoryAsync;
+    private readonly SemaphoreSlim _semaphore = new(1);
+    private bool _released;
+
+    public ShellConfiguration()
+    {
+    }
+
+    public ShellConfiguration(IConfiguration configuration)
     {
-        private IConfigurationRoot _configuration;
-        private UpdatableDataProvider _updatableData;
+        _updatableData = new UpdatableDataProvider();
 
-        private readonly string _name;
-        private readonly Func<string, Action<IConfigurationBuilder>, Task<IConfigurationRoot>> _factoryAsync;
-        private readonly SemaphoreSlim _semaphore = new(1);
-        private bool _released;
+        _configuration = new ConfigurationBuilder()
+            .AddConfiguration(configuration)
+            .Add(_updatableData)
+            .Build();
+    }
 
-        public ShellConfiguration()
-        {
-        }
+    public ShellConfiguration(IConfigurationBuilder builder)
+    {
+        _updatableData = new UpdatableDataProvider();
+        _configuration = builder.Add(_updatableData).Build();
+    }
+
+    public ShellConfiguration(string name, Func<string, Action<IConfigurationBuilder>, Task<IConfigurationRoot>> factoryAsync)
+    {
+        _name = name;
+        _factoryAsync = factoryAsync;
+    }
+
+    public ShellConfiguration(ShellConfiguration configuration) : this(null, configuration)
+    {
+    }
+
+    public ShellConfiguration(string name, ShellConfiguration configuration)
+    {
+        _name = name;
 
-        public ShellConfiguration(IConfiguration configuration)
+        if (configuration._configuration is not null)
         {
-            _updatableData = new UpdatableDataProvider();
+            _updatableData = new UpdatableDataProvider(configuration._updatableData.ToArray());
 
             _configuration = new ConfigurationBuilder()
-                .AddConfiguration(configuration)
+                .AddConfiguration(configuration._configuration, shouldDisposeConfiguration: true)
                 .Add(_updatableData)
                 .Build();
-        }
 
-        public ShellConfiguration(IConfigurationBuilder builder)
-        {
-            _updatableData = new UpdatableDataProvider();
-            _configuration = builder.Add(_updatableData).Build();
+            return;
         }
 
-        public ShellConfiguration(string name, Func<string, Action<IConfigurationBuilder>, Task<IConfigurationRoot>> factoryAsync)
+        if (name is null)
         {
-            _name = name;
-            _factoryAsync = factoryAsync;
+            return;
         }
 
-        public ShellConfiguration(ShellConfiguration configuration) : this(null, configuration)
-        {
-        }
+        _factoryAsync = configuration._factoryAsync;
+    }
 
-        public ShellConfiguration(string name, ShellConfiguration configuration)
+    private void EnsureConfiguration()
+    {
+        if (_configuration is not null)
         {
-            _name = name;
-
-            if (configuration._configuration is not null)
-            {
-                _updatableData = new UpdatableDataProvider(configuration._updatableData.ToArray());
-
-                _configuration = new ConfigurationBuilder()
-                    .AddConfiguration(configuration._configuration, shouldDisposeConfiguration: true)
-                    .Add(_updatableData)
-                    .Build();
-
-                return;
-            }
-
-            if (name is null)
-            {
-                return;
-            }
-
-            _factoryAsync = configuration._factoryAsync;
+            return;
         }
 
-        private void EnsureConfiguration()
-        {
-            if (_configuration is not null)
-            {
-                return;
-            }
+        EnsureConfigurationAsync().GetAwaiter().GetResult();
+    }
 
-            EnsureConfigurationAsync().GetAwaiter().GetResult();
+    internal async Task EnsureConfigurationAsync()
+    {
+        if (_configuration is not null)
+        {
+            return;
         }
 
-        internal async Task EnsureConfigurationAsync()
+        await _semaphore.WaitAsync();
+        try
         {
             if (_configuration is not null)
             {
                 return;
             }
 
-            await _semaphore.WaitAsync();
-            try
-            {
-                if (_configuration is not null)
-                {
-                    return;
-                }
-
-                _updatableData = new UpdatableDataProvider();
+            _updatableData = new UpdatableDataProvider();
 
-                _configuration = _factoryAsync is not null
-                    ? await _factoryAsync(_name, builder => builder.Add(_updatableData))
-                    : new ConfigurationBuilder().Add(_updatableData).Build();
-            }
-            finally
-            {
-                _semaphore.Release();
-            }
+            _configuration = _factoryAsync is not null
+                ? await _factoryAsync(_name, builder => builder.Add(_updatableData))
+                : new ConfigurationBuilder().Add(_updatableData).Build();
         }
+        finally
+        {
+            _semaphore.Release();
+        }
+    }
 
-        /// <summary>
-        /// The tenant configuration lazily built <see cref="IConfiguration"/>.
-        /// </summary>
-        private IConfiguration Configuration
+    /// <summary>
+    /// The tenant configuration lazily built <see cref="IConfiguration"/>.
+    /// </summary>
+    private IConfiguration Configuration
+    {
+        get
         {
-            get
-            {
-                EnsureConfiguration();
-                return _configuration;
-            }
+            EnsureConfiguration();
+            return _configuration;
         }
+    }
 
-        public string this[string key]
+    public string this[string key]
+    {
+        get
         {
-            get
-            {
-                var value = Configuration[key];
+            var value = Configuration[key];
 
-                return value ?? (key.Contains('_')
-                    ? Configuration[key.Replace('_', '.')]
-                    : null);
-            }
-            set
-            {
-                EnsureConfiguration();
-                _updatableData.Set(key, value);
-            }
+            return value ?? (key.Contains('_')
+                ? Configuration[key.Replace('_', '.')]
+                : null);
         }
+        set
+        {
+            EnsureConfiguration();
+            _updatableData.Set(key, value);
+        }
+    }
 
-        public IConfigurationSection GetSection(string key) => Configuration.GetSectionCompat(key);
+    public IConfigurationSection GetSection(string key) => Configuration.GetSectionCompat(key);
 
-        public IEnumerable<IConfigurationSection> GetChildren() => Configuration.GetChildren();
+    public IEnumerable<IConfigurationSection> GetChildren() => Configuration.GetChildren();
 
-        public IChangeToken GetReloadToken() => Configuration.GetReloadToken();
+    public IChangeToken GetReloadToken() => Configuration.GetReloadToken();
 
-        public void Release()
+    public void Release()
+    {
+        if (_released)
         {
-            if (_released)
-            {
-                return;
-            }
+            return;
+        }
 
-            _released = true;
+        _released = true;
 
-            (_configuration as IDisposable)?.Dispose();
-            _semaphore?.Dispose();
-        }
+        (_configuration as IDisposable)?.Dispose();
+        _semaphore?.Dispose();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Descriptor/IShellDescriptorManager.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Descriptor/IShellDescriptorManager.cs
index 47036ea8d9d..8b50b14b71f 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Descriptor/IShellDescriptorManager.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Descriptor/IShellDescriptorManager.cs
@@ -2,25 +2,24 @@
 using System.Threading.Tasks;
 using OrchardCore.Environment.Shell.Descriptor.Models;
 
-namespace OrchardCore.Environment.Shell.Descriptor
+namespace OrchardCore.Environment.Shell.Descriptor;
+
+/// <summary>
+/// Service resolved out of the shell container. Primarily used by host.
+/// </summary>
+public interface IShellDescriptorManager
 {
     /// <summary>
-    /// Service resolved out of the shell container. Primarily used by host.
+    /// Uses shell-specific database or other resources to return
+    /// the current "correct" configuration. The host will use this information
+    /// to reinitialize the shell.
     /// </summary>
-    public interface IShellDescriptorManager
-    {
-        /// <summary>
-        /// Uses shell-specific database or other resources to return
-        /// the current "correct" configuration. The host will use this information
-        /// to reinitialize the shell.
-        /// </summary>
-        Task<ShellDescriptor> GetShellDescriptorAsync();
+    Task<ShellDescriptor> GetShellDescriptorAsync();
 
-        /// <summary>
-        /// Alters databased information to match information passed as arguments.
-        /// Prior SerialNumber used for optimistic concurrency, and an exception
-        /// should be thrown if the number in storage doesn't match what's provided.
-        /// </summary>
-        Task UpdateShellDescriptorAsync(int priorSerialNumber, IEnumerable<ShellFeature> enabledFeatures);
-    }
+    /// <summary>
+    /// Alters databased information to match information passed as arguments.
+    /// Prior SerialNumber used for optimistic concurrency, and an exception
+    /// should be thrown if the number in storage doesn't match what's provided.
+    /// </summary>
+    Task UpdateShellDescriptorAsync(int priorSerialNumber, IEnumerable<ShellFeature> enabledFeatures);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Descriptor/Models/ShellDescriptor.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Descriptor/Models/ShellDescriptor.cs
index 3335c1312bf..6d557388c32 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Descriptor/Models/ShellDescriptor.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Descriptor/Models/ShellDescriptor.cs
@@ -1,27 +1,26 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Environment.Shell.Descriptor.Models
+namespace OrchardCore.Environment.Shell.Descriptor.Models;
+
+/// <summary>
+/// Contains a snapshot of a tenant's enabled features.
+/// The information is drawn out of the shell via IShellDescriptorManager
+/// and is passed to the ICompositionStrategy to build the ShellBlueprint.
+/// </summary>
+public class ShellDescriptor
 {
     /// <summary>
-    /// Contains a snapshot of a tenant's enabled features.
-    /// The information is drawn out of the shell via IShellDescriptorManager
-    /// and is passed to the ICompositionStrategy to build the ShellBlueprint.
+    /// Gets or sets the version number of the shell descriptor.
     /// </summary>
-    public class ShellDescriptor
-    {
-        /// <summary>
-        /// Gets or sets the version number of the shell descriptor.
-        /// </summary>
-        public int SerialNumber { get; set; }
+    public int SerialNumber { get; set; }
 
-        /// <summary>
-        /// Gets or sets the list of features in the shell.
-        /// </summary>
-        public IList<ShellFeature> Features { get; set; } = [];
+    /// <summary>
+    /// Gets or sets the list of features in the shell.
+    /// </summary>
+    public IList<ShellFeature> Features { get; set; } = [];
 
-        /// <summary>
-        /// Gets or sets the list of installed features in the shell.
-        /// </summary>
-        public IList<InstalledShellFeature> Installed { get; set; } = [];
-    }
+    /// <summary>
+    /// Gets or sets the list of installed features in the shell.
+    /// </summary>
+    public IList<InstalledShellFeature> Installed { get; set; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Descriptor/Models/ShellFeature.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Descriptor/Models/ShellFeature.cs
index 6d150b78c62..a95368855e7 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Descriptor/Models/ShellFeature.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Descriptor/Models/ShellFeature.cs
@@ -1,43 +1,42 @@
 using System;
 using System.Text.Json.Serialization;
 
-namespace OrchardCore.Environment.Shell.Descriptor.Models
+namespace OrchardCore.Environment.Shell.Descriptor.Models;
+
+public class ShellFeature : IEquatable<ShellFeature>
 {
-    public class ShellFeature : IEquatable<ShellFeature>
+    public ShellFeature()
     {
-        public ShellFeature()
-        {
-        }
+    }
 
-        public ShellFeature(string id, bool alwaysEnabled = false)
-        {
-            Id = id;
-            AlwaysEnabled = alwaysEnabled;
-        }
+    public ShellFeature(string id, bool alwaysEnabled = false)
+    {
+        Id = id;
+        AlwaysEnabled = alwaysEnabled;
+    }
 
-        public string Id { get; set; }
+    public string Id { get; set; }
 
-        [JsonIgnore]
-        public bool AlwaysEnabled { get; set; }
+    [JsonIgnore]
+    public bool AlwaysEnabled { get; set; }
 
-        public bool Equals(ShellFeature other)
+    public bool Equals(ShellFeature other)
+    {
+        if (other == null)
         {
-            if (other == null)
-            {
-                return false;
-            }
-
-            return Id == other.Id;
+            return false;
         }
 
-        public override bool Equals(object obj)
-        {
-            return Equals(obj as ShellFeature);
-        }
+        return Id == other.Id;
+    }
 
-        public override int GetHashCode()
-        {
-            return Id.GetHashCode();
-        }
+    public override bool Equals(object obj)
+    {
+        return Equals(obj as ShellFeature);
+    }
+
+    public override int GetHashCode()
+    {
+        return Id.GetHashCode();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Distributed/DistributedShellMarkerService.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Distributed/DistributedShellMarkerService.cs
index c8ef2a467cb..e31980b3d9c 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Distributed/DistributedShellMarkerService.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Distributed/DistributedShellMarkerService.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Environment.Shell.Distributed
+namespace OrchardCore.Environment.Shell.Distributed;
+
+public class DistributedShellMarkerService
 {
-    public class DistributedShellMarkerService
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Events/IShellEvents.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Events/IShellEvents.cs
index 2367b7d5fcd..128c27ab108 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Events/IShellEvents.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Events/IShellEvents.cs
@@ -1,25 +1,24 @@
-namespace OrchardCore.Environment.Shell.Events
+namespace OrchardCore.Environment.Shell.Events;
+
+public interface IShellEvents
 {
-    public interface IShellEvents
-    {
-        /// <summary>
-        /// The <see cref="ShellsEvent"/> delegate that will get called before loading all shells.
-        /// </summary>
-        ShellsEvent LoadingAsync { get; set; }
+    /// <summary>
+    /// The <see cref="ShellsEvent"/> delegate that will get called before loading all shells.
+    /// </summary>
+    ShellsEvent LoadingAsync { get; set; }
 
-        /// <summary>
-        /// The <see cref="ShellEvent"/> delegate that will get called before releasing a given shell.
-        /// </summary>
-        ShellEvent ReleasingAsync { get; set; }
+    /// <summary>
+    /// The <see cref="ShellEvent"/> delegate that will get called before releasing a given shell.
+    /// </summary>
+    ShellEvent ReleasingAsync { get; set; }
 
-        /// <summary>
-        /// The <see cref="ShellEvent"/> delegate that will get called before reloading a given shell.
-        /// </summary>
-        ShellEvent ReloadingAsync { get; set; }
+    /// <summary>
+    /// The <see cref="ShellEvent"/> delegate that will get called before reloading a given shell.
+    /// </summary>
+    ShellEvent ReloadingAsync { get; set; }
 
-        /// <summary>
-        /// The <see cref="ShellEvent"/> delegate that will get called before removing a given shell.
-        /// </summary>
-        ShellEvent RemovingAsync { get; set; }
-    }
+    /// <summary>
+    /// The <see cref="ShellEvent"/> delegate that will get called before removing a given shell.
+    /// </summary>
+    ShellEvent RemovingAsync { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Events/ShellEvent.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Events/ShellEvent.cs
index 77f1218c997..9be7693619f 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Events/ShellEvent.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Events/ShellEvent.cs
@@ -1,9 +1,8 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Environment.Shell.Events
-{
-    /// <summary>
-    /// The type of the delegate that will get called before releasing or reloading a given shell.
-    /// </summary>
-    public delegate Task ShellEvent(string name);
-}
+namespace OrchardCore.Environment.Shell.Events;
+
+/// <summary>
+/// The type of the delegate that will get called before releasing or reloading a given shell.
+/// </summary>
+public delegate Task ShellEvent(string name);
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Events/ShellsEvent.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Events/ShellsEvent.cs
index c82861a0e86..2e66c76bbfa 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Events/ShellsEvent.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Events/ShellsEvent.cs
@@ -1,9 +1,8 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Environment.Shell.Events
-{
-    /// <summary>
-    /// The type of the delegate that will get called before loading all shells.
-    /// </summary>
-    public delegate Task ShellsEvent();
-}
+namespace OrchardCore.Environment.Shell.Events;
+
+/// <summary>
+/// The type of the delegate that will get called before loading all shells.
+/// </summary>
+public delegate Task ShellsEvent();
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Extensions/ShellFeaturesManagerExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Extensions/ShellFeaturesManagerExtensions.cs
index b2274655ad7..17dd6488c32 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Extensions/ShellFeaturesManagerExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Extensions/ShellFeaturesManagerExtensions.cs
@@ -4,61 +4,60 @@
 using System.Threading.Tasks;
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+public static class ShellFeaturesManagerExtensions
 {
-    public static class ShellFeaturesManagerExtensions
+    public static Task<IEnumerable<IFeatureInfo>> EnableFeaturesAsync(this IShellFeaturesManager shellFeaturesManager,
+        IEnumerable<IFeatureInfo> features)
     {
-        public static Task<IEnumerable<IFeatureInfo>> EnableFeaturesAsync(this IShellFeaturesManager shellFeaturesManager,
-            IEnumerable<IFeatureInfo> features)
-        {
-            return shellFeaturesManager.EnableFeaturesAsync(features, false);
-        }
+        return shellFeaturesManager.EnableFeaturesAsync(features, false);
+    }
 
-        public static async Task<IEnumerable<IFeatureInfo>> EnableFeaturesAsync(this IShellFeaturesManager shellFeaturesManager,
-            IEnumerable<IFeatureInfo> features, bool force)
-        {
-            var (_, featuresToEnable) = await shellFeaturesManager.UpdateFeaturesAsync([], features, force);
+    public static async Task<IEnumerable<IFeatureInfo>> EnableFeaturesAsync(this IShellFeaturesManager shellFeaturesManager,
+        IEnumerable<IFeatureInfo> features, bool force)
+    {
+        var (_, featuresToEnable) = await shellFeaturesManager.UpdateFeaturesAsync([], features, force);
 
-            return featuresToEnable;
-        }
+        return featuresToEnable;
+    }
 
-        public static async Task EnableFeaturesAsync(this IShellFeaturesManager shellFeaturesManager, params string[] featureIds)
-        {
-            ArgumentNullException.ThrowIfNull(featureIds);
+    public static async Task EnableFeaturesAsync(this IShellFeaturesManager shellFeaturesManager, params string[] featureIds)
+    {
+        ArgumentNullException.ThrowIfNull(featureIds);
 
-            if (featureIds.Length == 0) 
-            {
-                return;
-            }
+        if (featureIds.Length == 0)
+        {
+            return;
+        }
 
-            var availableFeatures = await shellFeaturesManager.GetAvailableFeaturesAsync();
+        var availableFeatures = await shellFeaturesManager.GetAvailableFeaturesAsync();
 
-            var featuresToEnable = availableFeatures.Where(feature => featureIds.Contains(feature.Id));
+        var featuresToEnable = availableFeatures.Where(feature => featureIds.Contains(feature.Id));
 
-            await shellFeaturesManager.EnableFeaturesAsync(featuresToEnable, force: false);
-        }
+        await shellFeaturesManager.EnableFeaturesAsync(featuresToEnable, force: false);
+    }
 
-        public static Task<IEnumerable<IFeatureInfo>> DisableFeaturesAsync(this IShellFeaturesManager shellFeaturesManager,
-            IEnumerable<IFeatureInfo> features)
-        {
-            return shellFeaturesManager.DisableFeaturesAsync(features, false);
-        }
+    public static Task<IEnumerable<IFeatureInfo>> DisableFeaturesAsync(this IShellFeaturesManager shellFeaturesManager,
+        IEnumerable<IFeatureInfo> features)
+    {
+        return shellFeaturesManager.DisableFeaturesAsync(features, false);
+    }
 
-        public static async Task<IEnumerable<IFeatureInfo>> DisableFeaturesAsync(this IShellFeaturesManager shellFeaturesManager,
-            IEnumerable<IFeatureInfo> features, bool force)
-        {
-            var (featuresToDisable, _) = await shellFeaturesManager.UpdateFeaturesAsync(features, [], force);
+    public static async Task<IEnumerable<IFeatureInfo>> DisableFeaturesAsync(this IShellFeaturesManager shellFeaturesManager,
+        IEnumerable<IFeatureInfo> features, bool force)
+    {
+        var (featuresToDisable, _) = await shellFeaturesManager.UpdateFeaturesAsync(features, [], force);
 
-            return featuresToDisable;
-        }
+        return featuresToDisable;
+    }
 
-        public static async Task<bool> IsFeatureEnabledAsync(this IShellFeaturesManager shellFeaturesManager, string featureId)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(featureId);
+    public static async Task<bool> IsFeatureEnabledAsync(this IShellFeaturesManager shellFeaturesManager, string featureId)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(featureId);
 
-            var enabledFeatures = await shellFeaturesManager.GetEnabledFeaturesAsync();
+        var enabledFeatures = await shellFeaturesManager.GetEnabledFeaturesAsync();
 
-            return enabledFeatures.Any(feature => feature.Id == featureId);
-        }
+        return enabledFeatures.Any(feature => feature.Id == featureId);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Extensions/ShellHostExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Extensions/ShellHostExtensions.cs
index 2409ae223c2..36b4ca66b2f 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Extensions/ShellHostExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Extensions/ShellHostExtensions.cs
@@ -2,76 +2,75 @@
 using System.Threading.Tasks;
 using OrchardCore.Environment.Shell.Scope;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+public static class ShellHostExtensions
 {
-    public static class ShellHostExtensions
+    /// <summary>
+    /// Tries to create a standalone service scope that can be used to resolve local services.
+    /// </summary>
+    public static async Task<(ShellScope scope, bool success)> TryGetScopeAsync(this IShellHost shellHost, string tenant)
     {
-        /// <summary>
-        /// Tries to create a standalone service scope that can be used to resolve local services.
-        /// </summary>
-        public static async Task<(ShellScope scope, bool success)> TryGetScopeAsync(this IShellHost shellHost, string tenant)
+        try
         {
-            try
-            {
-                return (await shellHost.GetScopeAsync(shellHost.GetSettings(tenant)), true);
-            }
-            catch
-            {
-                return (null, false);
-            }
+            return (await shellHost.GetScopeAsync(shellHost.GetSettings(tenant)), true);
         }
-
-        /// <summary>
-        /// Creates a standalone service scope that can be used to resolve local services.
-        /// </summary>
-        public static Task<ShellScope> GetScopeAsync(this IShellHost shellHost, string tenant)
+        catch
         {
-            return shellHost.GetScopeAsync(shellHost.GetSettings(tenant));
+            return (null, false);
         }
+    }
 
-        /// <summary>
-        /// Reloads all shell settings and releases all shells so that new ones will be
-        /// built for subsequent requests, while existing requests get flushed.
-        /// </summary>
-        public async static Task ReloadAllShellContextsAsync(this IShellHost shellHost)
+    /// <summary>
+    /// Creates a standalone service scope that can be used to resolve local services.
+    /// </summary>
+    public static Task<ShellScope> GetScopeAsync(this IShellHost shellHost, string tenant)
+    {
+        return shellHost.GetScopeAsync(shellHost.GetSettings(tenant));
+    }
+
+    /// <summary>
+    /// Reloads all shell settings and releases all shells so that new ones will be
+    /// built for subsequent requests, while existing requests get flushed.
+    /// </summary>
+    public async static Task ReloadAllShellContextsAsync(this IShellHost shellHost)
+    {
+        foreach (var settings in shellHost.GetAllSettings())
         {
-            foreach (var settings in shellHost.GetAllSettings())
-            {
-                await shellHost.ReloadShellContextAsync(settings);
-            }
+            await shellHost.ReloadShellContextAsync(settings);
         }
+    }
 
-        /// <summary>
-        /// Releases all shells so that new ones will be built for subsequent requests.
-        /// Note: Can be used to free up resources after a given period of inactivity.
-        /// </summary>
-        public async static Task ReleaseAllShellContextsAsync(this IShellHost shellHost)
+    /// <summary>
+    /// Releases all shells so that new ones will be built for subsequent requests.
+    /// Note: Can be used to free up resources after a given period of inactivity.
+    /// </summary>
+    public async static Task ReleaseAllShellContextsAsync(this IShellHost shellHost)
+    {
+        foreach (var settings in shellHost.GetAllSettings())
         {
-            foreach (var settings in shellHost.GetAllSettings())
-            {
-                await shellHost.ReleaseShellContextAsync(settings);
-            }
+            await shellHost.ReleaseShellContextAsync(settings);
         }
+    }
 
-        /// <summary>
-        /// Retrieves the shell settings associated with the specified tenant.
-        /// </summary>
-        public static ShellSettings GetSettings(this IShellHost shellHost, string tenant)
+    /// <summary>
+    /// Retrieves the shell settings associated with the specified tenant.
+    /// </summary>
+    public static ShellSettings GetSettings(this IShellHost shellHost, string tenant)
+    {
+        if (!shellHost.TryGetSettings(tenant, out var settings))
         {
-            if (!shellHost.TryGetSettings(tenant, out var settings))
-            {
-                throw new ArgumentException("The specified tenant name is not valid.", nameof(tenant));
-            }
-
-            return settings;
+            throw new ArgumentException("The specified tenant name is not valid.", nameof(tenant));
         }
 
-        /// <summary>
-        /// Whether or not a given tenant is in use in at least one active scope.
-        /// </summary>
-        public static bool IsShellActive(this IShellHost shellHost, ShellSettings settings) =>
-            settings is { Name: not null } &&
-            shellHost.TryGetShellContext(settings.Name, out var context) &&
-            context.IsActive();
+        return settings;
     }
+
+    /// <summary>
+    /// Whether or not a given tenant is in use in at least one active scope.
+    /// </summary>
+    public static bool IsShellActive(this IShellHost shellHost, ShellSettings settings) =>
+        settings is { Name: not null } &&
+        shellHost.TryGetShellContext(settings.Name, out var context) &&
+        context.IsActive();
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/IFeatureProfilesService.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/IFeatureProfilesService.cs
index 23d1af8adad..6c157a63294 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/IFeatureProfilesService.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/IFeatureProfilesService.cs
@@ -2,10 +2,9 @@
 using System.Threading.Tasks;
 using OrchardCore.Environment.Shell.Models;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+public interface IFeatureProfilesService
 {
-    public interface IFeatureProfilesService
-    {
-        Task<IDictionary<string, FeatureProfile>> GetFeatureProfilesAsync();
-    }
+    Task<IDictionary<string, FeatureProfile>> GetFeatureProfilesAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/IFeatureValidationProvider.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/IFeatureValidationProvider.cs
index 1c1f824c799..5e65c75eeb1 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/IFeatureValidationProvider.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/IFeatureValidationProvider.cs
@@ -1,12 +1,11 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+/// <summary>
+/// Provides validation for whether features are allowed to be disabled on a per tenant basis.
+/// </summary>
+public interface IFeatureValidationProvider
 {
-    /// <summary>
-    /// Provides validation for whether features are allowed to be disabled on a per tenant basis.
-    /// </summary>
-    public interface IFeatureValidationProvider
-    {
-        ValueTask<bool> IsFeatureValidAsync(string id);
-    }
+    ValueTask<bool> IsFeatureValidAsync(string id);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/IRunningShellTable.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/IRunningShellTable.cs
index 419bab0b904..25b91c78e98 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/IRunningShellTable.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/IRunningShellTable.cs
@@ -1,11 +1,10 @@
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+public interface IRunningShellTable
 {
-    public interface IRunningShellTable
-    {
-        void Add(ShellSettings settings);
-        void Remove(ShellSettings settings);
-        ShellSettings Match(HostString host, PathString path, bool fallbackToDefault = true);
-    }
+    void Add(ShellSettings settings);
+    void Remove(ShellSettings settings);
+    ShellSettings Match(HostString host, PathString path, bool fallbackToDefault = true);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellDescriptorFeaturesManager.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellDescriptorFeaturesManager.cs
index b898f2e3376..f6d51e7cd11 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellDescriptorFeaturesManager.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellDescriptorFeaturesManager.cs
@@ -3,13 +3,12 @@
 using OrchardCore.Environment.Extensions.Features;
 using OrchardCore.Environment.Shell.Descriptor.Models;
 
-namespace OrchardCore.Environment.Shell
-{
-    public delegate void FeatureDependencyNotificationHandler(string messageFormat, IFeatureInfo feature, IEnumerable<IFeatureInfo> features);
+namespace OrchardCore.Environment.Shell;
+
+public delegate void FeatureDependencyNotificationHandler(string messageFormat, IFeatureInfo feature, IEnumerable<IFeatureInfo> features);
 
-    public interface IShellDescriptorFeaturesManager
-    {
-        Task<(IEnumerable<IFeatureInfo>, IEnumerable<IFeatureInfo>)> UpdateFeaturesAsync(ShellDescriptor shellDescriptor,
-            IEnumerable<IFeatureInfo> featuresToDisable, IEnumerable<IFeatureInfo> featuresToEnable, bool force);
-    }
+public interface IShellDescriptorFeaturesManager
+{
+    Task<(IEnumerable<IFeatureInfo>, IEnumerable<IFeatureInfo>)> UpdateFeaturesAsync(ShellDescriptor shellDescriptor,
+        IEnumerable<IFeatureInfo> featuresToDisable, IEnumerable<IFeatureInfo> featuresToEnable, bool force);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellDescriptorManagerEventHandler.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellDescriptorManagerEventHandler.cs
index 52486215e60..3ed156722ef 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellDescriptorManagerEventHandler.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellDescriptorManagerEventHandler.cs
@@ -1,16 +1,15 @@
 using System.Threading.Tasks;
 using OrchardCore.Environment.Shell.Descriptor.Models;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+/// <summary>
+/// Represent an event handler for shell descriptor.
+/// </summary>
+public interface IShellDescriptorManagerEventHandler
 {
     /// <summary>
-    /// Represent an event handler for shell descriptor.
+    /// Triggered whenever a shell descriptor has changed.
     /// </summary>
-    public interface IShellDescriptorManagerEventHandler
-    {
-        /// <summary>
-        /// Triggered whenever a shell descriptor has changed.
-        /// </summary>
-        Task ChangedAsync(ShellDescriptor descriptor, ShellSettings settings);
-    }
+    Task ChangedAsync(ShellDescriptor descriptor, ShellSettings settings);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellFeaturesManager.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellFeaturesManager.cs
index 9ff6e9a52a9..05ed183956d 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellFeaturesManager.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellFeaturesManager.cs
@@ -3,16 +3,15 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+public interface IShellFeaturesManager
 {
-    public interface IShellFeaturesManager
-    {
-        Task<IEnumerable<IFeatureInfo>> GetAvailableFeaturesAsync();
-        Task<IEnumerable<IFeatureInfo>> GetEnabledFeaturesAsync();
-        Task<IEnumerable<IFeatureInfo>> GetAlwaysEnabledFeaturesAsync();
-        Task<IEnumerable<IFeatureInfo>> GetDisabledFeaturesAsync();
-        Task<(IEnumerable<IFeatureInfo>, IEnumerable<IFeatureInfo>)> UpdateFeaturesAsync(
-            IEnumerable<IFeatureInfo> featuresToDisable, IEnumerable<IFeatureInfo> featuresToEnable, bool force);
-        Task<IEnumerable<IExtensionInfo>> GetEnabledExtensionsAsync();
-    }
+    Task<IEnumerable<IFeatureInfo>> GetAvailableFeaturesAsync();
+    Task<IEnumerable<IFeatureInfo>> GetEnabledFeaturesAsync();
+    Task<IEnumerable<IFeatureInfo>> GetAlwaysEnabledFeaturesAsync();
+    Task<IEnumerable<IFeatureInfo>> GetDisabledFeaturesAsync();
+    Task<(IEnumerable<IFeatureInfo>, IEnumerable<IFeatureInfo>)> UpdateFeaturesAsync(
+        IEnumerable<IFeatureInfo> featuresToDisable, IEnumerable<IFeatureInfo> featuresToEnable, bool force);
+    Task<IEnumerable<IExtensionInfo>> GetEnabledExtensionsAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellHost.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellHost.cs
index 64fa94dab02..76a73f4b29d 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellHost.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellHost.cs
@@ -4,78 +4,77 @@
 using OrchardCore.Environment.Shell.Events;
 using OrchardCore.Environment.Shell.Scope;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+public interface IShellHost : IShellEvents, IShellDescriptorManagerEventHandler
 {
-    public interface IShellHost : IShellEvents, IShellDescriptorManagerEventHandler
-    {
-        /// <summary>
-        /// Ensures that all the <see cref="ShellContext"/> are pre-created and available to process requests.
-        /// </summary>
-        Task InitializeAsync();
+    /// <summary>
+    /// Ensures that all the <see cref="ShellContext"/> are pre-created and available to process requests.
+    /// </summary>
+    Task InitializeAsync();
 
-        /// <summary>
-        /// Returns an existing <see cref="ShellContext"/> or creates a new one if necessary.
-        /// </summary>
-        Task<ShellContext> GetOrCreateShellContextAsync(ShellSettings settings);
+    /// <summary>
+    /// Returns an existing <see cref="ShellContext"/> or creates a new one if necessary.
+    /// </summary>
+    Task<ShellContext> GetOrCreateShellContextAsync(ShellSettings settings);
 
-        /// <summary>
-        /// Creates a standalone service scope that can be used to resolve local services.
-        /// </summary>
-        Task<ShellScope> GetScopeAsync(ShellSettings settings);
+    /// <summary>
+    /// Creates a standalone service scope that can be used to resolve local services.
+    /// </summary>
+    Task<ShellScope> GetScopeAsync(ShellSettings settings);
 
-        /// <summary>
-        /// Updates an existing shell configuration and then reloads the shell.
-        /// </summary>
-        Task UpdateShellSettingsAsync(ShellSettings settings);
+    /// <summary>
+    /// Updates an existing shell configuration and then reloads the shell.
+    /// </summary>
+    Task UpdateShellSettingsAsync(ShellSettings settings);
 
-        /// <summary>
-        /// Reloads the settings and releases the shell so that a new one will be
-        /// built for subsequent requests, while existing requests get flushed.
-        /// </summary>
-        /// <param name="settings">The <see cref="ShellSettings"/> to reload.</param>
-        /// <param name="eventSource">Whether the related <see cref="ShellEvent"/> is invoked.</param>
-        Task ReloadShellContextAsync(ShellSettings settings, bool eventSource = true);
+    /// <summary>
+    /// Reloads the settings and releases the shell so that a new one will be
+    /// built for subsequent requests, while existing requests get flushed.
+    /// </summary>
+    /// <param name="settings">The <see cref="ShellSettings"/> to reload.</param>
+    /// <param name="eventSource">Whether the related <see cref="ShellEvent"/> is invoked.</param>
+    Task ReloadShellContextAsync(ShellSettings settings, bool eventSource = true);
 
-        /// <summary>
-        /// Releases a shell so that a new one will be built for subsequent requests.
-        /// Note: Can be used to free up resources after a given time of inactivity.
-        /// </summary>
-        /// <param name="settings">The <see cref="ShellSettings"/> to reload.</param>
-        /// <param name="eventSource">Whether the related <see cref="ShellEvent"/> is invoked.</param>
-        Task ReleaseShellContextAsync(ShellSettings settings, bool eventSource = true);
+    /// <summary>
+    /// Releases a shell so that a new one will be built for subsequent requests.
+    /// Note: Can be used to free up resources after a given time of inactivity.
+    /// </summary>
+    /// <param name="settings">The <see cref="ShellSettings"/> to reload.</param>
+    /// <param name="eventSource">Whether the related <see cref="ShellEvent"/> is invoked.</param>
+    Task ReleaseShellContextAsync(ShellSettings settings, bool eventSource = true);
 
-        /// <summary>
-        /// Lists all available <see cref="ShellContext"/> instances.
-        /// A shell might have been released or not yet built, if so 'shell.Released' is true and
-        /// 'shell.CreateScopeAsync()' return null, but you can still use 'GetScopeAsync(shell.Settings)'.
-        /// </summary>
-        IEnumerable<ShellContext> ListShellContexts();
+    /// <summary>
+    /// Lists all available <see cref="ShellContext"/> instances.
+    /// A shell might have been released or not yet built, if so 'shell.Released' is true and
+    /// 'shell.CreateScopeAsync()' return null, but you can still use 'GetScopeAsync(shell.Settings)'.
+    /// </summary>
+    IEnumerable<ShellContext> ListShellContexts();
 
-        /// <summary>
-        /// Tries to retrieve the shell context associated with the specified tenant.
-        /// The shell may have been temporarily removed while releasing or reloading.
-        /// </summary>
-        bool TryGetShellContext(string name, out ShellContext shellContext);
+    /// <summary>
+    /// Tries to retrieve the shell context associated with the specified tenant.
+    /// The shell may have been temporarily removed while releasing or reloading.
+    /// </summary>
+    bool TryGetShellContext(string name, out ShellContext shellContext);
 
-        /// <summary>
-        /// Tries to retrieve the shell settings associated with the specified tenant.
-        /// </summary>
-        bool TryGetSettings(string name, out ShellSettings settings);
+    /// <summary>
+    /// Tries to retrieve the shell settings associated with the specified tenant.
+    /// </summary>
+    bool TryGetSettings(string name, out ShellSettings settings);
 
-        /// <summary>
-        /// Retrieves all shell settings.
-        /// </summary>
-        IEnumerable<ShellSettings> GetAllSettings();
+    /// <summary>
+    /// Retrieves all shell settings.
+    /// </summary>
+    IEnumerable<ShellSettings> GetAllSettings();
 
-        /// <summary>
-        /// Removes a shell context and its settings from memory and from the storage.
-        /// </summary>
-        Task RemoveShellSettingsAsync(ShellSettings settings);
+    /// <summary>
+    /// Removes a shell context and its settings from memory and from the storage.
+    /// </summary>
+    Task RemoveShellSettingsAsync(ShellSettings settings);
 
-        /// <summary>
-        /// Removes a shell context and its settings but only from memory, used for syncing
-        /// when the settings has been already removed from the storage by another instance.
-        /// </summary>
-        Task RemoveShellContextAsync(ShellSettings settings, bool eventSource = true);
-    }
+    /// <summary>
+    /// Removes a shell context and its settings but only from memory, used for syncing
+    /// when the settings has been already removed from the storage by another instance.
+    /// </summary>
+    Task RemoveShellContextAsync(ShellSettings settings, bool eventSource = true);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellSettingsManager.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellSettingsManager.cs
index 33b15fc4492..2aef0a64323 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellSettingsManager.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/IShellSettingsManager.cs
@@ -1,43 +1,42 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+public interface IShellSettingsManager
 {
-    public interface IShellSettingsManager
-    {
-        /// <summary>
-        /// Creates a default shell settings based on the configuration.
-        /// </summary>
-        ShellSettings CreateDefaultSettings();
+    /// <summary>
+    /// Creates a default shell settings based on the configuration.
+    /// </summary>
+    ShellSettings CreateDefaultSettings();
 
-        /// <summary>
-        /// Retrieves all shell settings stored.
-        /// </summary>
-        /// <returns>All shell settings.</returns>
-        Task<IEnumerable<ShellSettings>> LoadSettingsAsync();
+    /// <summary>
+    /// Retrieves all shell settings stored.
+    /// </summary>
+    /// <returns>All shell settings.</returns>
+    Task<IEnumerable<ShellSettings>> LoadSettingsAsync();
 
-        /// <summary>
-        /// Retrieves all shell settings names.
-        /// </summary>
-        /// <returns>All shell settings names.</returns>
-        Task<IEnumerable<string>> LoadSettingsNamesAsync();
+    /// <summary>
+    /// Retrieves all shell settings names.
+    /// </summary>
+    /// <returns>All shell settings names.</returns>
+    Task<IEnumerable<string>> LoadSettingsNamesAsync();
 
-        /// <summary>
-        /// Retrieves the settings of a given tenant.
-        /// </summary>
-        /// <returns>The shell settings.</returns>
-        Task<ShellSettings> LoadSettingsAsync(string tenant);
+    /// <summary>
+    /// Retrieves the settings of a given tenant.
+    /// </summary>
+    /// <returns>The shell settings.</returns>
+    Task<ShellSettings> LoadSettingsAsync(string tenant);
 
-        /// <summary>
-        /// Persists shell settings to the storage.
-        /// </summary>
-        /// <param name="settings">The shell settings to store.</param>
-        Task SaveSettingsAsync(ShellSettings settings);
+    /// <summary>
+    /// Persists shell settings to the storage.
+    /// </summary>
+    /// <param name="settings">The shell settings to store.</param>
+    Task SaveSettingsAsync(ShellSettings settings);
 
-        /// <summary>
-        /// Removes shell settings from the storage.
-        /// </summary>
-        /// <param name="settings">The shell settings to remove.</param>
-        Task RemoveSettingsAsync(ShellSettings settings);
-    }
+    /// <summary>
+    /// Removes shell settings from the storage.
+    /// </summary>
+    /// <param name="settings">The shell settings to remove.</param>
+    Task RemoveSettingsAsync(ShellSettings settings);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Models/FeatureProfile.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Models/FeatureProfile.cs
index a7c7a8e0261..fb49973f647 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Models/FeatureProfile.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Models/FeatureProfile.cs
@@ -1,23 +1,22 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.Environment.Shell.Models
+namespace OrchardCore.Environment.Shell.Models;
+
+public class FeatureProfile
 {
-    public class FeatureProfile
-    {
-        public string Id { get; set; }
+    public string Id { get; set; }
 
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        public List<FeatureRule> FeatureRules { get; set; } = [];
-    }
+    public List<FeatureRule> FeatureRules { get; set; } = [];
+}
 
-    public class FeatureRule
-    {
-        [Required]
-        public string Rule { get; set; }
+public class FeatureRule
+{
+    [Required]
+    public string Rule { get; set; }
 
-        [Required]
-        public string Expression { get; set; }
-    }
+    [Required]
+    public string Expression { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Models/FeatureProfilesRuleOptions.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Models/FeatureProfilesRuleOptions.cs
index a8ca2d9cf30..0faeb07f401 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Models/FeatureProfilesRuleOptions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Models/FeatureProfilesRuleOptions.cs
@@ -1,13 +1,12 @@
 using System;
 using System.Collections.Generic;
 
-namespace OrchardCore.Environment.Shell.Models
+namespace OrchardCore.Environment.Shell.Models;
+
+/// <summary>
+/// Provides options for validating features through profiles.
+/// </summary>
+public class FeatureProfilesRuleOptions
 {
-    /// <summary>
-    /// Provides options for validating features through profiles.
-    /// </summary>
-    public class FeatureProfilesRuleOptions
-    {
-        public Dictionary<string, Func<string, string, (bool isMatch, bool isAllowed)>> Rules = new(StringComparer.OrdinalIgnoreCase);
-    }
+    public Dictionary<string, Func<string, string, (bool isMatch, bool isAllowed)>> Rules = new(StringComparer.OrdinalIgnoreCase);
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Models/TenantState.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Models/TenantState.cs
index f1eaa3b036f..932c83ede9f 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Models/TenantState.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Models/TenantState.cs
@@ -1,33 +1,32 @@
-namespace OrchardCore.Environment.Shell.Models
+namespace OrchardCore.Environment.Shell.Models;
+
+/// <summary>
+/// The different states of a Tenant.
+/// </summary>
+public enum TenantState
 {
     /// <summary>
-    /// The different states of a Tenant.
+    /// The tenant is not yet initialized.
     /// </summary>
-    public enum TenantState
-    {
-        /// <summary>
-        /// The tenant is not yet initialized.
-        /// </summary>
-        Uninitialized,
+    Uninitialized,
 
-        /// <summary>
-        /// The tenant is being initialized.
-        /// </summary>
-        Initializing,
+    /// <summary>
+    /// The tenant is being initialized.
+    /// </summary>
+    Initializing,
 
-        /// <summary>
-        /// The tenant is initialized and running.
-        /// </summary>
-        Running,
+    /// <summary>
+    /// The tenant is initialized and running.
+    /// </summary>
+    Running,
 
-        /// <summary>
-        /// The tenant is initialized and disabled.
-        /// </summary>
-        Disabled,
+    /// <summary>
+    /// The tenant is initialized and disabled.
+    /// </summary>
+    Disabled,
 
-        /// <summary>
-        /// The tenant settings are invalid.
-        /// </summary>
-        Invalid
-    }
+    /// <summary>
+    /// The tenant settings are invalid.
+    /// </summary>
+    Invalid
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Scope/ShellScope.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Scope/ShellScope.cs
index 1455015082a..fbb2bd2262d 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Scope/ShellScope.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Scope/ShellScope.cs
@@ -9,626 +9,625 @@
 using OrchardCore.Environment.Shell.Builders;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Environment.Shell.Scope
+namespace OrchardCore.Environment.Shell.Scope;
+
+/// <summary>
+/// Custom 'IServiceScope' managing the shell state and the execution flow.
+/// </summary>
+public sealed class ShellScope : IServiceScope, IAsyncDisposable
 {
+    private static readonly AsyncLocal<ShellScopeHolder> _current = new();
+
+    private readonly AsyncServiceScope _serviceScope;
+    private Dictionary<object, object> _items;
+    private List<Func<ShellScope, Task>> _beforeDispose;
+    private HashSet<string> _deferredSignals;
+    private List<Func<ShellScope, Task>> _deferredTasks;
+    private List<Func<ShellScope, Exception, Task>> _exceptionHandlers;
+
+    private bool _serviceScopeOnly;
+    private bool _shellTerminated;
+    private bool _terminated;
+    private bool _disposed;
+
     /// <summary>
-    /// Custom 'IServiceScope' managing the shell state and the execution flow.
+    /// Initializes a <see cref="ShellScope"/> from a given parent <see cref="Builders.ShellContext"/>.
     /// </summary>
-    public sealed class ShellScope : IServiceScope, IAsyncDisposable
+    public ShellScope(ShellContext shellContext)
     {
-        private static readonly AsyncLocal<ShellScopeHolder> _current = new();
-
-        private readonly AsyncServiceScope _serviceScope;
-        private Dictionary<object, object> _items;
-        private List<Func<ShellScope, Task>> _beforeDispose;
-        private HashSet<string> _deferredSignals;
-        private List<Func<ShellScope, Task>> _deferredTasks;
-        private List<Func<ShellScope, Exception, Task>> _exceptionHandlers;
-
-        private bool _serviceScopeOnly;
-        private bool _shellTerminated;
-        private bool _terminated;
-        private bool _disposed;
-
-        /// <summary>
-        /// Initializes a <see cref="ShellScope"/> from a given parent <see cref="Builders.ShellContext"/>.
-        /// </summary>
-        public ShellScope(ShellContext shellContext)
-        {
-            // Prevent the context from being disposed until the end of the scope.
-            Interlocked.Increment(ref shellContext._refCount);
-            ShellContext = shellContext;
+        // Prevent the context from being disposed until the end of the scope.
+        Interlocked.Increment(ref shellContext._refCount);
+        ShellContext = shellContext;
 
-            // The service provider is null if we try to create
-            // a scope on a disabled shell or already disposed.
-            if (shellContext.ServiceProvider is null)
-            {
-                // Keep the counter clean before failing.
-                Interlocked.Decrement(ref shellContext._refCount);
-
-                throw new InvalidOperationException(
-                    $"Can't resolve a scope on tenant '{shellContext.Settings.Name}' as it is disabled or disposed");
-            }
+        // The service provider is null if we try to create
+        // a scope on a disabled shell or already disposed.
+        if (shellContext.ServiceProvider is null)
+        {
+            // Keep the counter clean before failing.
+            Interlocked.Decrement(ref shellContext._refCount);
 
-            _serviceScope = shellContext.ServiceProvider.CreateAsyncScope();
-            ServiceProvider = _serviceScope.ServiceProvider;
+            throw new InvalidOperationException(
+                $"Can't resolve a scope on tenant '{shellContext.Settings.Name}' as it is disabled or disposed");
         }
 
-        /// <summary>
-        /// The parent 'ShellContext' of this shell scope.
-        /// </summary>
-        public ShellContext ShellContext { get; }
-
-        /// <summary>
-        /// The 'IServiceProvider' of this shell scope.
-        /// </summary>
-        public IServiceProvider ServiceProvider { get; }
-
-        /// <summary>
-        /// Retrieve the parent 'ShellContext' of the current shell scope.
-        /// </summary>
-        public static ShellContext Context => Current?.ShellContext;
-
-        /// <summary>
-        /// Retrieve the 'IServiceProvider' of the current shell scope.
-        /// </summary>
-        public static IServiceProvider Services => Current?.ServiceProvider;
-
-        /// <summary>
-        /// Retrieve the current shell scope from the async flow.
-        /// </summary>
-        public static ShellScope Current => _current.Value?.Scope;
-
-        /// <summary>
-        /// Sets a shared item to the current shell scope.
-        /// </summary>
-        public static void Set(object key, object value)
-        {
-            var current = Current;
+        _serviceScope = shellContext.ServiceProvider.CreateAsyncScope();
+        ServiceProvider = _serviceScope.ServiceProvider;
+    }
 
-            if (current != null)
-            {
-                current._items ??= [];
+    /// <summary>
+    /// The parent 'ShellContext' of this shell scope.
+    /// </summary>
+    public ShellContext ShellContext { get; }
 
-                current._items[key] = value;
-            }
-        }
+    /// <summary>
+    /// The 'IServiceProvider' of this shell scope.
+    /// </summary>
+    public IServiceProvider ServiceProvider { get; }
 
-        /// <summary>
-        /// Gets a shared item from the current shell scope.
-        /// </summary>
-        public static object Get(object key)
-        {
-            var current = Current;
+    /// <summary>
+    /// Retrieve the parent 'ShellContext' of the current shell scope.
+    /// </summary>
+    public static ShellContext Context => Current?.ShellContext;
 
-            if (current == null)
-            {
-                return null;
-            }
+    /// <summary>
+    /// Retrieve the 'IServiceProvider' of the current shell scope.
+    /// </summary>
+    public static IServiceProvider Services => Current?.ServiceProvider;
 
-            current._items ??= [];
+    /// <summary>
+    /// Retrieve the current shell scope from the async flow.
+    /// </summary>
+    public static ShellScope Current => _current.Value?.Scope;
 
-            return current._items.TryGetValue(key, out var value) ? value : null;
-        }
+    /// <summary>
+    /// Sets a shared item to the current shell scope.
+    /// </summary>
+    public static void Set(object key, object value)
+    {
+        var current = Current;
 
-        /// <summary>
-        /// Gets a shared item of a given type from the current shell scope.
-        /// </summary>
-        public static T Get<T>(object key)
+        if (current != null)
         {
-            var current = Current;
-
-            if (current == null)
-            {
-                return default;
-            }
-
             current._items ??= [];
 
-            return current._items.TryGetValue(key, out var value) ? value is T item ? item : default : default;
+            current._items[key] = value;
         }
+    }
 
-        /// <summary>
-        /// Gets (or creates) a shared item of a given type from the current shell scope.
-        /// </summary>
-        public static T GetOrCreate<T>(object key, Func<T> factory)
-        {
-            var current = Current;
+    /// <summary>
+    /// Gets a shared item from the current shell scope.
+    /// </summary>
+    public static object Get(object key)
+    {
+        var current = Current;
 
-            if (current == null)
-            {
-                return factory();
-            }
+        if (current == null)
+        {
+            return null;
+        }
 
-            current._items ??= [];
+        current._items ??= [];
 
+        return current._items.TryGetValue(key, out var value) ? value : null;
+    }
 
-            if (!current._items.TryGetValue(key, out var value) || value is not T item)
-            {
-                current._items[key] = item = factory();
-            }
+    /// <summary>
+    /// Gets a shared item of a given type from the current shell scope.
+    /// </summary>
+    public static T Get<T>(object key)
+    {
+        var current = Current;
 
-            return item;
+        if (current == null)
+        {
+            return default;
         }
 
-        /// <summary>
-        /// Gets (or creates) a shared item of a given type from the current shell scope.
-        /// </summary>
-        public static T GetOrCreate<T>(object key) where T : class, new()
-        {
-            var current = Current;
+        current._items ??= [];
 
-            if (current == null)
-            {
-                return new T();
-            }
+        return current._items.TryGetValue(key, out var value) ? value is T item ? item : default : default;
+    }
 
-            current._items ??= [];
+    /// <summary>
+    /// Gets (or creates) a shared item of a given type from the current shell scope.
+    /// </summary>
+    public static T GetOrCreate<T>(object key, Func<T> factory)
+    {
+        var current = Current;
 
+        if (current == null)
+        {
+            return factory();
+        }
 
-            if (!current._items.TryGetValue(key, out var value) || value is not T item)
-            {
-                current._items[key] = item = new T();
-            }
+        current._items ??= [];
 
-            return item;
-        }
 
-        /// <summary>
-        /// Sets a shared feature to the current shell scope.
-        /// </summary>
-        public static void SetFeature<T>(T value) => Set(typeof(T), value);
-
-        /// <summary>
-        /// Gets a shared feature from the current shell scope.
-        /// </summary>
-        public static T GetFeature<T>() => Get<T>(typeof(T));
-
-        /// <summary>
-        /// Gets (or creates) a shared feature from the current shell scope.
-        /// </summary>
-        public static T GetOrCreateFeature<T>(Func<T> factory) => GetOrCreate(typeof(T), factory);
-
-        /// <summary>
-        /// Gets (or creates) a shared feature from the current shell scope.
-        /// </summary>
-        public static T GetOrCreateFeature<T>() where T : class, new() => GetOrCreate<T>(typeof(T));
-
-        /// <summary>
-        /// Creates a child scope from the current one.
-        /// </summary>
-        public static Task<ShellScope> CreateChildScopeAsync()
+        if (!current._items.TryGetValue(key, out var value) || value is not T item)
         {
-            var shellHost = Services.GetRequiredService<IShellHost>();
-            return shellHost.GetScopeAsync(Context.Settings);
+            current._items[key] = item = factory();
         }
 
-        /// <summary>
-        /// Creates a child scope from the current one.
-        /// </summary>
-        public static Task<ShellScope> CreateChildScopeAsync(ShellSettings settings)
-        {
-            var shellHost = Services.GetRequiredService<IShellHost>();
-            return shellHost.GetScopeAsync(settings);
-        }
+        return item;
+    }
 
-        /// <summary>
-        /// Creates a child scope from the current one.
-        /// </summary>
-        public static Task<ShellScope> CreateChildScopeAsync(string tenant)
-        {
-            var shellHost = Services.GetRequiredService<IShellHost>();
-            return shellHost.GetScopeAsync(tenant);
-        }
+    /// <summary>
+    /// Gets (or creates) a shared item of a given type from the current shell scope.
+    /// </summary>
+    public static T GetOrCreate<T>(object key) where T : class, new()
+    {
+        var current = Current;
 
-        /// <summary>
-        /// Execute a delegate using a child scope created from the current one.
-        /// </summary>
-        public static async Task UsingChildScopeAsync(Func<ShellScope, Task> execute, bool activateShell = true)
+        if (current == null)
         {
-            await (await CreateChildScopeAsync()).UsingAsync(execute, activateShell);
+            return new T();
         }
 
-        /// <summary>
-        /// Execute a delegate using a child scope created from the current one.
-        /// </summary>
-        public static async Task UsingChildScopeAsync(ShellSettings settings, Func<ShellScope, Task> execute, bool activateShell = true)
-        {
-            await (await CreateChildScopeAsync(settings)).UsingAsync(execute, activateShell);
-        }
+        current._items ??= [];
+
 
-        /// <summary>
-        /// Execute a delegate using a child scope created from the current one.
-        /// </summary>
-        public static async Task UsingChildScopeAsync(string tenant, Func<ShellScope, Task> execute, bool activateShell = true)
+        if (!current._items.TryGetValue(key, out var value) || value is not T item)
         {
-            await (await CreateChildScopeAsync(tenant)).UsingAsync(execute, activateShell);
+            current._items[key] = item = new T();
         }
 
-        /// <summary>
-        /// Start holding this shell scope along the async flow.
-        /// </summary>
-        public void StartAsyncFlow()
-        // Use an object indirection to hold the current scope in the 'AsyncLocal',
-        // so that it can be cleared in all execution contexts when it is cleared.
-            => _current.Value = new ShellScopeHolder { Scope = this };
-
-        /// <summary>
-        /// Executes a delegate using this shell scope in an isolated async flow,
-        /// but only as a service scope without managing the shell state and
-        /// without invoking any tenant event.
-        /// </summary>
-        public Task UsingServiceScopeAsync(Func<ShellScope, Task> execute)
+        return item;
+    }
+
+    /// <summary>
+    /// Sets a shared feature to the current shell scope.
+    /// </summary>
+    public static void SetFeature<T>(T value) => Set(typeof(T), value);
+
+    /// <summary>
+    /// Gets a shared feature from the current shell scope.
+    /// </summary>
+    public static T GetFeature<T>() => Get<T>(typeof(T));
+
+    /// <summary>
+    /// Gets (or creates) a shared feature from the current shell scope.
+    /// </summary>
+    public static T GetOrCreateFeature<T>(Func<T> factory) => GetOrCreate(typeof(T), factory);
+
+    /// <summary>
+    /// Gets (or creates) a shared feature from the current shell scope.
+    /// </summary>
+    public static T GetOrCreateFeature<T>() where T : class, new() => GetOrCreate<T>(typeof(T));
+
+    /// <summary>
+    /// Creates a child scope from the current one.
+    /// </summary>
+    public static Task<ShellScope> CreateChildScopeAsync()
+    {
+        var shellHost = Services.GetRequiredService<IShellHost>();
+        return shellHost.GetScopeAsync(Context.Settings);
+    }
+
+    /// <summary>
+    /// Creates a child scope from the current one.
+    /// </summary>
+    public static Task<ShellScope> CreateChildScopeAsync(ShellSettings settings)
+    {
+        var shellHost = Services.GetRequiredService<IShellHost>();
+        return shellHost.GetScopeAsync(settings);
+    }
+
+    /// <summary>
+    /// Creates a child scope from the current one.
+    /// </summary>
+    public static Task<ShellScope> CreateChildScopeAsync(string tenant)
+    {
+        var shellHost = Services.GetRequiredService<IShellHost>();
+        return shellHost.GetScopeAsync(tenant);
+    }
+
+    /// <summary>
+    /// Execute a delegate using a child scope created from the current one.
+    /// </summary>
+    public static async Task UsingChildScopeAsync(Func<ShellScope, Task> execute, bool activateShell = true)
+    {
+        await (await CreateChildScopeAsync()).UsingAsync(execute, activateShell);
+    }
+
+    /// <summary>
+    /// Execute a delegate using a child scope created from the current one.
+    /// </summary>
+    public static async Task UsingChildScopeAsync(ShellSettings settings, Func<ShellScope, Task> execute, bool activateShell = true)
+    {
+        await (await CreateChildScopeAsync(settings)).UsingAsync(execute, activateShell);
+    }
+
+    /// <summary>
+    /// Execute a delegate using a child scope created from the current one.
+    /// </summary>
+    public static async Task UsingChildScopeAsync(string tenant, Func<ShellScope, Task> execute, bool activateShell = true)
+    {
+        await (await CreateChildScopeAsync(tenant)).UsingAsync(execute, activateShell);
+    }
+
+    /// <summary>
+    /// Start holding this shell scope along the async flow.
+    /// </summary>
+    public void StartAsyncFlow()
+    // Use an object indirection to hold the current scope in the 'AsyncLocal',
+    // so that it can be cleared in all execution contexts when it is cleared.
+        => _current.Value = new ShellScopeHolder { Scope = this };
+
+    /// <summary>
+    /// Executes a delegate using this shell scope in an isolated async flow,
+    /// but only as a service scope without managing the shell state and
+    /// without invoking any tenant event.
+    /// </summary>
+    public Task UsingServiceScopeAsync(Func<ShellScope, Task> execute)
+    {
+        _serviceScopeOnly = true;
+        return UsingAsync(execute);
+    }
+
+    /// <summary>
+    /// Executes a delegate using this shell scope in an isolated async flow,
+    /// while managing the shell state and invoking tenant events.
+    /// </summary>
+    public async Task UsingAsync(Func<ShellScope, Task> execute, bool activateShell = true)
+    {
+        if (Current == this)
         {
-            _serviceScopeOnly = true;
-            return UsingAsync(execute);
+            await execute(Current);
+            return;
         }
 
-        /// <summary>
-        /// Executes a delegate using this shell scope in an isolated async flow,
-        /// while managing the shell state and invoking tenant events.
-        /// </summary>
-        public async Task UsingAsync(Func<ShellScope, Task> execute, bool activateShell = true)
+        await using (this)
         {
-            if (Current == this)
-            {
-                await execute(Current);
-                return;
-            }
-
-            await using (this)
+            StartAsyncFlow();
+            try
             {
-                StartAsyncFlow();
                 try
                 {
-                    try
+                    if (activateShell)
                     {
-                        if (activateShell)
-                        {
-                            await ActivateShellInternalAsync();
-                        }
-
-                        await execute(this);
+                        await ActivateShellInternalAsync();
                     }
-                    finally
-                    {
-                        await TerminateShellInternalAsync();
-                    }
-                }
-                catch (Exception e)
-                {
-                    await HandleExceptionAsync(e);
-                    throw;
+
+                    await execute(this);
                 }
                 finally
                 {
-                    await BeforeDisposeAsync();
+                    await TerminateShellInternalAsync();
                 }
             }
-        }
-
-        /// <summary>
-        /// Terminates a shell using this shell scope.
-        /// </summary>
-        internal async Task TerminateShellAsync()
-        {
-            await using (this)
+            catch (Exception e)
+            {
+                await HandleExceptionAsync(e);
+                throw;
+            }
+            finally
             {
-                StartAsyncFlow();
-                await TerminateShellInternalAsync();
                 await BeforeDisposeAsync();
             }
         }
+    }
+
+    /// <summary>
+    /// Terminates a shell using this shell scope.
+    /// </summary>
+    internal async Task TerminateShellAsync()
+    {
+        await using (this)
+        {
+            StartAsyncFlow();
+            await TerminateShellInternalAsync();
+            await BeforeDisposeAsync();
+        }
+    }
+
+    /// <summary>
+    /// Activate the shell, if not yet done, by calling the related tenant event handlers.
+    /// </summary>
+    internal async Task ActivateShellInternalAsync()
+    {
+        if (ShellContext.IsActivated)
+        {
+            return;
+        }
 
-        /// <summary>
-        /// Activate the shell, if not yet done, by calling the related tenant event handlers.
-        /// </summary>
-        internal async Task ActivateShellInternalAsync()
+        if (_serviceScopeOnly)
         {
+            return;
+        }
+
+        // Try to acquire a lock before using a new scope, so that a next process gets the last committed data.
+        (var locker, var locked) = await ShellContext.TryAcquireShellActivateLockAsync();
+        if (!locked)
+        {
+            // The retry logic increases the delay between 2 attempts (max of 10s), so if there are too
+            // many concurrent requests, one may experience a timeout while waiting before a new retry.
             if (ShellContext.IsActivated)
             {
+                // Don't throw if the shell is activated.
                 return;
             }
 
-            if (_serviceScopeOnly)
-            {
-                return;
-            }
+            throw new TimeoutException($"Failed to acquire a lock before activating the tenant: {ShellContext.Settings.Name}");
+        }
+
+        await using var acquiredLock = locker;
 
-            // Try to acquire a lock before using a new scope, so that a next process gets the last committed data.
-            (var locker, var locked) = await ShellContext.TryAcquireShellActivateLockAsync();
-            if (!locked)
+        // The tenant gets activated here.
+        if (!ShellContext.IsActivated)
+        {
+            await new ShellScope(ShellContext).UsingAsync(async scope =>
             {
-                // The retry logic increases the delay between 2 attempts (max of 10s), so if there are too
-                // many concurrent requests, one may experience a timeout while waiting before a new retry.
-                if (ShellContext.IsActivated)
+                var tenantEvents = scope.ServiceProvider.GetServices<IModularTenantEvents>();
+                foreach (var tenantEvent in tenantEvents)
                 {
-                    // Don't throw if the shell is activated.
-                    return;
+                    await tenantEvent.ActivatingAsync();
                 }
 
-                throw new TimeoutException($"Failed to acquire a lock before activating the tenant: {ShellContext.Settings.Name}");
-            }
+                foreach (var tenantEvent in tenantEvents.Reverse())
+                {
+                    await tenantEvent.ActivatedAsync();
+                }
+            }, activateShell: false);
+
+            ShellContext.IsActivated = true;
+        }
+    }
 
-            await using var acquiredLock = locker;
+    /// <summary>
+    /// Registers a delegate to be invoked when 'BeforeDisposeAsync()' is called on this scope.
+    /// </summary>
+    /// <param name="callback">The delegate to be invoked before disposal. This delegate takes a <see cref="ShellScope"/> parameter and returns a <see cref="Task"/>.</param>
+    /// <param name="last">A boolean value indicating whether the delegate should be invoked last. 
+    /// If true, the delegate is added to the end of the invocation list; otherwise, it is added to the beginning.</param>
+    internal void BeforeDispose(Func<ShellScope, Task> callback, bool last)
+    {
+        var list = _beforeDispose ??= [];
 
-            // The tenant gets activated here.
-            if (!ShellContext.IsActivated)
-            {
-                await new ShellScope(ShellContext).UsingAsync(async scope =>
-                {
-                    var tenantEvents = scope.ServiceProvider.GetServices<IModularTenantEvents>();
-                    foreach (var tenantEvent in tenantEvents)
-                    {
-                        await tenantEvent.ActivatingAsync();
-                    }
+        if (last)
+        {
+            list.Add(callback);
+        }
+        else
+        {
+            list.Insert(0, callback);
+        }
+    }
 
-                    foreach (var tenantEvent in tenantEvents.Reverse())
-                    {
-                        await tenantEvent.ActivatedAsync();
-                    }
-                }, activateShell: false);
+    /// <summary>
+    /// Adds a Signal (if not already present) to be sent just after 'BeforeDisposeAsync()'.
+    /// </summary>
+    internal void DeferredSignal(string key) => (_deferredSignals ??= []).Add(key);
 
-                ShellContext.IsActivated = true;
-            }
+    /// <summary>
+    /// Adds a Task to be executed in a new scope after 'BeforeDisposeAsync()'.
+    /// </summary>
+    internal void DeferredTask(Func<ShellScope, Task> task) => (_deferredTasks ??= []).Add(task);
+
+    /// <summary>
+    /// Adds an handler to be invoked if an exception is thrown while executing in this shell scope.
+    /// </summary>
+    internal void ExceptionHandler(Func<ShellScope, Exception, Task> callback) => (_exceptionHandlers ??= []).Add(callback);
+
+    /// <summary>
+    /// Registers a delegate to be invoked before the current shell scope will be disposed.
+    /// </summary>
+    public static void RegisterBeforeDispose(Func<ShellScope, Task> callback, bool last = false) => Current?.BeforeDispose(callback, last);
+
+    /// <summary>
+    /// Adds a Signal (if not already present) to be sent just before the current shell scope will be disposed.
+    /// </summary>
+    public static void AddDeferredSignal(string key) => Current?.DeferredSignal(key);
+
+    /// <summary>
+    /// Adds a Task to be executed in a new scope once the current shell scope has been disposed.
+    /// </summary>
+    public static void AddDeferredTask(Func<ShellScope, Task> task) => Current?.DeferredTask(task);
+
+    /// <summary>
+    /// Adds an handler to be invoked if an exception is thrown while executing in this shell scope.
+    /// </summary>
+    public static void AddExceptionHandler(Func<ShellScope, Exception, Task> handler) => Current?.ExceptionHandler(handler);
+
+    /// <summary>
+    /// Invokes the registered delegates that should be executed if an exception is thrown while executing in this shell scope.
+    /// </summary>
+    public async Task HandleExceptionAsync(Exception e)
+    {
+        if (_exceptionHandlers == null)
+        {
+            return;
         }
 
-        /// <summary>
-        /// Registers a delegate to be invoked when 'BeforeDisposeAsync()' is called on this scope.
-        /// </summary>
-        /// <param name="callback">The delegate to be invoked before disposal. This delegate takes a <see cref="ShellScope"/> parameter and returns a <see cref="Task"/>.</param>
-        /// <param name="last">A boolean value indicating whether the delegate should be invoked last. 
-        /// If true, the delegate is added to the end of the invocation list; otherwise, it is added to the beginning.</param>
-        internal void BeforeDispose(Func<ShellScope, Task> callback, bool last)
+        foreach (var callback in _exceptionHandlers)
         {
-            var list = _beforeDispose ??= [];
+            await callback(this, e);
+        }
+    }
 
-            if (last)
-            {
-                list.Add(callback);
-            }
-            else
+    /// <summary>
+    /// Invokes the registered delegates that should be executed before disposing this shell scope,
+    /// triggers the deferred signals and executes the deferred tasks in their own isolated scope.
+    /// </summary>
+    internal async Task BeforeDisposeAsync()
+    {
+        if (_beforeDispose != null)
+        {
+            foreach (var callback in _beforeDispose)
             {
-                list.Insert(0, callback);
+                await callback(this);
             }
         }
 
-        /// <summary>
-        /// Adds a Signal (if not already present) to be sent just after 'BeforeDisposeAsync()'.
-        /// </summary>
-        internal void DeferredSignal(string key) => (_deferredSignals ??= []).Add(key);
-
-        /// <summary>
-        /// Adds a Task to be executed in a new scope after 'BeforeDisposeAsync()'.
-        /// </summary>
-        internal void DeferredTask(Func<ShellScope, Task> task) => (_deferredTasks ??= []).Add(task);
-
-        /// <summary>
-        /// Adds an handler to be invoked if an exception is thrown while executing in this shell scope.
-        /// </summary>
-        internal void ExceptionHandler(Func<ShellScope, Exception, Task> callback) => (_exceptionHandlers ??= []).Add(callback);
-
-        /// <summary>
-        /// Registers a delegate to be invoked before the current shell scope will be disposed.
-        /// </summary>
-        public static void RegisterBeforeDispose(Func<ShellScope, Task> callback, bool last = false) => Current?.BeforeDispose(callback, last);
-
-        /// <summary>
-        /// Adds a Signal (if not already present) to be sent just before the current shell scope will be disposed.
-        /// </summary>
-        public static void AddDeferredSignal(string key) => Current?.DeferredSignal(key);
-
-        /// <summary>
-        /// Adds a Task to be executed in a new scope once the current shell scope has been disposed.
-        /// </summary>
-        public static void AddDeferredTask(Func<ShellScope, Task> task) => Current?.DeferredTask(task);
-
-        /// <summary>
-        /// Adds an handler to be invoked if an exception is thrown while executing in this shell scope.
-        /// </summary>
-        public static void AddExceptionHandler(Func<ShellScope, Exception, Task> handler) => Current?.ExceptionHandler(handler);
-
-        /// <summary>
-        /// Invokes the registered delegates that should be executed if an exception is thrown while executing in this shell scope.
-        /// </summary>
-        public async Task HandleExceptionAsync(Exception e)
+        if (_serviceScopeOnly)
         {
-            if (_exceptionHandlers == null)
-            {
-                return;
-            }
+            return;
+        }
 
-            foreach (var callback in _exceptionHandlers)
+        if (_deferredSignals?.Count > 0)
+        {
+            var signal = ShellContext.ServiceProvider.GetRequiredService<ISignal>();
+            foreach (var key in _deferredSignals)
             {
-                await callback(this, e);
+                await signal.SignalTokenAsync(key);
             }
         }
 
-        /// <summary>
-        /// Invokes the registered delegates that should be executed before disposing this shell scope,
-        /// triggers the deferred signals and executes the deferred tasks in their own isolated scope.
-        /// </summary>
-        internal async Task BeforeDisposeAsync()
+        if (_deferredTasks?.Count > 0)
         {
-            if (_beforeDispose != null)
+            var shellHost = ShellContext.ServiceProvider.GetRequiredService<IShellHost>();
+
+            foreach (var task in _deferredTasks)
             {
-                foreach (var callback in _beforeDispose)
+                // Create a new scope (maybe based on a new shell) for each task.
+                ShellScope scope;
+                try
                 {
-                    await callback(this);
+                    // May fail if a shell was released before being disabled.
+                    scope = await shellHost.GetScopeAsync(ShellContext.Settings);
                 }
-            }
-
-            if (_serviceScopeOnly)
-            {
-                return;
-            }
-
-            if (_deferredSignals?.Count > 0)
-            {
-                var signal = ShellContext.ServiceProvider.GetRequiredService<ISignal>();
-                foreach (var key in _deferredSignals)
+                catch
                 {
-                    await signal.SignalTokenAsync(key);
+                    // Fallback to a scope based on the current shell that is not yet disposed.
+                    scope = new ShellScope(ShellContext);
                 }
-            }
 
-            if (_deferredTasks?.Count > 0)
-            {
-                var shellHost = ShellContext.ServiceProvider.GetRequiredService<IShellHost>();
-
-                foreach (var task in _deferredTasks)
+                // Use 'UsingAsync()' in place of 'UsingServiceScopeAsync()' to allow a deferred task to
+                // trigger another one, but still prevent the shell to be activated in a deferred task.
+                await scope.UsingAsync(async scope =>
                 {
-                    // Create a new scope (maybe based on a new shell) for each task.
-                    ShellScope scope;
+                    var logger = scope.ServiceProvider.GetService<ILogger<ShellScope>>();
+
                     try
                     {
-                        // May fail if a shell was released before being disabled.
-                        scope = await shellHost.GetScopeAsync(ShellContext.Settings);
+                        await task(scope);
                     }
-                    catch
+                    catch (Exception e)
                     {
-                        // Fallback to a scope based on the current shell that is not yet disposed.
-                        scope = new ShellScope(ShellContext);
-                    }
+                        logger?.LogError(e,
+                            "Error while processing deferred task '{TaskName}' on tenant '{TenantName}'.",
+                            task.GetType().FullName, ShellContext.Settings.Name);
 
-                    // Use 'UsingAsync()' in place of 'UsingServiceScopeAsync()' to allow a deferred task to
-                    // trigger another one, but still prevent the shell to be activated in a deferred task.
-                    await scope.UsingAsync(async scope =>
-                    {
-                        var logger = scope.ServiceProvider.GetService<ILogger<ShellScope>>();
-
-                        try
-                        {
-                            await task(scope);
-                        }
-                        catch (Exception e)
-                        {
-                            logger?.LogError(e,
-                                "Error while processing deferred task '{TaskName}' on tenant '{TenantName}'.",
-                                task.GetType().FullName, ShellContext.Settings.Name);
-
-                            await scope.HandleExceptionAsync(e);
-                        }
-                    },
-                    activateShell: false);
-                }
+                        await scope.HandleExceptionAsync(e);
+                    }
+                },
+                activateShell: false);
             }
         }
+    }
 
-        /// <summary>
-        /// Terminates the shell, if released and in its last scope, by calling the related event handlers,
-        /// and specifies if the shell context should be disposed consequently to this scope being disposed.
-        /// </summary>
-        internal async Task TerminateShellInternalAsync()
+    /// <summary>
+    /// Terminates the shell, if released and in its last scope, by calling the related event handlers,
+    /// and specifies if the shell context should be disposed consequently to this scope being disposed.
+    /// </summary>
+    internal async Task TerminateShellInternalAsync()
+    {
+        if (_serviceScopeOnly)
         {
-            if (_serviceScopeOnly)
-            {
-                return;
-            }
+            return;
+        }
 
-            _terminated = true;
+        _terminated = true;
 
-            // If the shell context is released and in its last shell scope, according to the ref counter value,
-            // the terminate event handlers are called, and the shell will be disposed at the end of this scope.
+        // If the shell context is released and in its last shell scope, according to the ref counter value,
+        // the terminate event handlers are called, and the shell will be disposed at the end of this scope.
 
-            // Check if the decremented value of the ref counter reached 0.
-            if (Interlocked.Decrement(ref ShellContext._refCount) == 0)
+        // Check if the decremented value of the ref counter reached 0.
+        if (Interlocked.Decrement(ref ShellContext._refCount) == 0)
+        {
+            // A disabled shell still in use is released by its last scope.
+            if (ShellContext.Settings.IsDisabled())
             {
-                // A disabled shell still in use is released by its last scope.
-                if (ShellContext.Settings.IsDisabled())
-                {
-                    await ShellContext.ReleaseFromLastScopeAsync();
-                }
-
-                if (!ShellContext._released)
-                {
-                    return;
-                }
-
-                // If released after the counter reached 0, a new last scope may have been created.
-                if (Interlocked.CompareExchange(ref ShellContext._refCount, 0, 0) != 0)
-                {
-                    return;
-                }
-
-                // If a new last scope reached this point, ensure that the shell is terminated once.
-                if (Interlocked.Exchange(ref ShellContext._terminated, 1) == 1)
-                {
-                    return;
-                }
-
-                _shellTerminated = true;
-
-                var tenantEvents = _serviceScope.ServiceProvider.GetServices<IModularTenantEvents>();
-                foreach (var tenantEvent in tenantEvents)
-                {
-                    await tenantEvent.TerminatingAsync();
-                }
+                await ShellContext.ReleaseFromLastScopeAsync();
+            }
 
-                foreach (var tenantEvent in tenantEvents.Reverse())
-                {
-                    await tenantEvent.TerminatedAsync();
-                }
+            if (!ShellContext._released)
+            {
+                return;
             }
-        }
 
-        public void Dispose()
-        {
-            if (_disposed)
+            // If released after the counter reached 0, a new last scope may have been created.
+            if (Interlocked.CompareExchange(ref ShellContext._refCount, 0, 0) != 0)
             {
                 return;
             }
 
-            _disposed = true;
+            // If a new last scope reached this point, ensure that the shell is terminated once.
+            if (Interlocked.Exchange(ref ShellContext._terminated, 1) == 1)
+            {
+                return;
+            }
 
-            _serviceScope.Dispose();
+            _shellTerminated = true;
 
-            if (_shellTerminated)
+            var tenantEvents = _serviceScope.ServiceProvider.GetServices<IModularTenantEvents>();
+            foreach (var tenantEvent in tenantEvents)
             {
-                ShellContext.Dispose();
+                await tenantEvent.TerminatingAsync();
             }
 
-            Terminate();
+            foreach (var tenantEvent in tenantEvents.Reverse())
+            {
+                await tenantEvent.TerminatedAsync();
+            }
         }
+    }
 
-        public async ValueTask DisposeAsync()
+    public void Dispose()
+    {
+        if (_disposed)
         {
-            if (_disposed)
-            {
-                return;
-            }
+            return;
+        }
 
-            _disposed = true;
+        _disposed = true;
 
-            await _serviceScope.DisposeAsync();
+        _serviceScope.Dispose();
 
-            if (_shellTerminated)
-            {
-                await ShellContext.DisposeAsync();
-            }
+        if (_shellTerminated)
+        {
+            ShellContext.Dispose();
+        }
+
+        Terminate();
+    }
 
-            Terminate();
+    public async ValueTask DisposeAsync()
+    {
+        if (_disposed)
+        {
+            return;
         }
 
-        private void Terminate()
+        _disposed = true;
+
+        await _serviceScope.DisposeAsync();
+
+        if (_shellTerminated)
         {
-            if (!_terminated)
-            {
-                // Keep the counter clean if not yet decremented.
-                Interlocked.Decrement(ref ShellContext._refCount);
-            }
+            await ShellContext.DisposeAsync();
+        }
 
-            var holder = _current.Value;
-            if (holder is not null)
-            {
-                // Clear the current scope that may be trapped in some execution contexts.
-                holder.Scope = null;
-            }
+        Terminate();
+    }
+
+    private void Terminate()
+    {
+        if (!_terminated)
+        {
+            // Keep the counter clean if not yet decremented.
+            Interlocked.Decrement(ref ShellContext._refCount);
         }
 
-        private sealed class ShellScopeHolder
+        var holder = _current.Value;
+        if (holder is not null)
         {
-            public ShellScope Scope;
+            // Clear the current scope that may be trapped in some execution contexts.
+            holder.Scope = null;
         }
     }
+
+    private sealed class ShellScopeHolder
+    {
+        public ShellScope Scope;
+    }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Scope/ShellScopeExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Scope/ShellScopeExtensions.cs
index a2625ebb192..05c1f35e253 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Scope/ShellScopeExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Scope/ShellScopeExtensions.cs
@@ -1,97 +1,96 @@
 using System;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Environment.Shell.Scope
+namespace OrchardCore.Environment.Shell.Scope;
+
+public static class ShellScopeExtensions
 {
-    public static class ShellScopeExtensions
+    /// <summary>
+    /// Registers a delegate task to be invoked before this shell scope will be disposed.
+    /// </summary>
+    /// <param name="scope">The <see cref="ShellScope"/> instance on which to register the delegate.</param>
+    /// <param name="callback">The delegate task to be invoked before disposal. This delegate takes a <see cref="ShellScope"/> parameter and returns a <see cref="Task"/>.</param>
+    /// <param name="last">A boolean value indicating whether the delegate should be invoked last. 
+    /// If true, the delegate is added to the end of the invocation list; otherwise, it is added to the beginning. The default value is false.</param>
+    /// <returns>The <see cref="ShellScope"/> instance for chaining further calls.</returns>
+    public static ShellScope RegisterBeforeDispose(this ShellScope scope, Func<ShellScope, Task> callback, bool last = false)
     {
-        /// <summary>
-        /// Registers a delegate task to be invoked before this shell scope will be disposed.
-        /// </summary>
-        /// <param name="scope">The <see cref="ShellScope"/> instance on which to register the delegate.</param>
-        /// <param name="callback">The delegate task to be invoked before disposal. This delegate takes a <see cref="ShellScope"/> parameter and returns a <see cref="Task"/>.</param>
-        /// <param name="last">A boolean value indicating whether the delegate should be invoked last. 
-        /// If true, the delegate is added to the end of the invocation list; otherwise, it is added to the beginning. The default value is false.</param>
-        /// <returns>The <see cref="ShellScope"/> instance for chaining further calls.</returns>
-        public static ShellScope RegisterBeforeDispose(this ShellScope scope, Func<ShellScope, Task> callback, bool last = false)
-        {
-            scope?.BeforeDispose(callback, last);
+        scope?.BeforeDispose(callback, last);
 
-            return scope;
-        }
+        return scope;
+    }
 
-        /// <summary>
-        /// Registers a delegate action to be invoked before this shell scope will be disposed.
-        /// </summary>
-        /// <param name="scope">The <see cref="ShellScope"/> instance on which to register the delegate.</param>
-        /// <param name="callback">The delegate action to be invoked before disposal. This delegate takes a <see cref="ShellScope"/> parameter.</param>
-        /// <param name="last">A boolean value indicating whether the delegate should be invoked last. 
-        /// If true, the delegate is added to the end of the invocation list; otherwise, it is added to the beginning. The default value is false.</param>
-        /// <returns>The <see cref="ShellScope"/> instance for chaining further calls.</returns>
-        public static ShellScope RegisterBeforeDispose(this ShellScope scope, Action<ShellScope> callback, bool last = false)
+    /// <summary>
+    /// Registers a delegate action to be invoked before this shell scope will be disposed.
+    /// </summary>
+    /// <param name="scope">The <see cref="ShellScope"/> instance on which to register the delegate.</param>
+    /// <param name="callback">The delegate action to be invoked before disposal. This delegate takes a <see cref="ShellScope"/> parameter.</param>
+    /// <param name="last">A boolean value indicating whether the delegate should be invoked last. 
+    /// If true, the delegate is added to the end of the invocation list; otherwise, it is added to the beginning. The default value is false.</param>
+    /// <returns>The <see cref="ShellScope"/> instance for chaining further calls.</returns>
+    public static ShellScope RegisterBeforeDispose(this ShellScope scope, Action<ShellScope> callback, bool last = false)
+    {
+        scope?.BeforeDispose(scope =>
         {
-            scope?.BeforeDispose(scope =>
-            {
-                callback(scope);
-                return Task.CompletedTask;
-            }, last);
+            callback(scope);
+            return Task.CompletedTask;
+        }, last);
 
-            return scope;
-        }
+        return scope;
+    }
 
-        /// <summary>
-        /// Adds a Signal (if not already present) to be sent just before this shell scope will be disposed.
-        /// </summary>
-        public static ShellScope AddDeferredSignal(this ShellScope scope, string key)
-        {
-            scope?.DeferredSignal(key);
-            return scope;
-        }
+    /// <summary>
+    /// Adds a Signal (if not already present) to be sent just before this shell scope will be disposed.
+    /// </summary>
+    public static ShellScope AddDeferredSignal(this ShellScope scope, string key)
+    {
+        scope?.DeferredSignal(key);
+        return scope;
+    }
 
-        /// <summary>
-        /// Adds a Task to be executed in a new scope once this shell scope has been disposed.
-        /// </summary>
-        public static ShellScope AddDeferredTask(this ShellScope scope, Func<ShellScope, Task> task)
-        {
-            scope?.DeferredTask(task);
-            return scope;
-        }
+    /// <summary>
+    /// Adds a Task to be executed in a new scope once this shell scope has been disposed.
+    /// </summary>
+    public static ShellScope AddDeferredTask(this ShellScope scope, Func<ShellScope, Task> task)
+    {
+        scope?.DeferredTask(task);
+        return scope;
+    }
 
-        /// <summary>
-        /// Adds an Action to be executed in a new scope once this shell scope has been disposed.
-        /// </summary>
-        public static ShellScope AddDeferredTask(this ShellScope scope, Action<ShellScope> callback)
+    /// <summary>
+    /// Adds an Action to be executed in a new scope once this shell scope has been disposed.
+    /// </summary>
+    public static ShellScope AddDeferredTask(this ShellScope scope, Action<ShellScope> callback)
+    {
+        scope?.DeferredTask(scope =>
         {
-            scope?.DeferredTask(scope =>
-            {
-                callback(scope);
-                return Task.CompletedTask;
-            });
+            callback(scope);
+            return Task.CompletedTask;
+        });
 
-            return scope;
-        }
+        return scope;
+    }
 
-        /// <summary>
-        /// Adds an handler task to be invoked if an exception is thrown while executing in this shell scope.
-        /// </summary>
-        public static ShellScope AddExceptionHandler(this ShellScope scope, Func<ShellScope, Exception, Task> handler)
-        {
-            scope?.ExceptionHandler(handler);
-            return scope;
-        }
+    /// <summary>
+    /// Adds an handler task to be invoked if an exception is thrown while executing in this shell scope.
+    /// </summary>
+    public static ShellScope AddExceptionHandler(this ShellScope scope, Func<ShellScope, Exception, Task> handler)
+    {
+        scope?.ExceptionHandler(handler);
+        return scope;
+    }
 
-        /// <summary>
-        /// Adds an handler action to be invoked if an exception is thrown while executing in this shell scope.
-        /// </summary>
-        public static ShellScope AddExceptionHandler(this ShellScope scope, Action<ShellScope, Exception> handler)
+    /// <summary>
+    /// Adds an handler action to be invoked if an exception is thrown while executing in this shell scope.
+    /// </summary>
+    public static ShellScope AddExceptionHandler(this ShellScope scope, Action<ShellScope, Exception> handler)
+    {
+        scope?.ExceptionHandler((scope, e) =>
         {
-            scope?.ExceptionHandler((scope, e) =>
-            {
-                handler(scope, e);
-                return Task.CompletedTask;
-            });
+            handler(scope, e);
+            return Task.CompletedTask;
+        });
 
-            return scope;
-        }
+        return scope;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/ShellContextFeature.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/ShellContextFeature.cs
index a0428e731d0..ae127f49989 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/ShellContextFeature.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/ShellContextFeature.cs
@@ -1,26 +1,25 @@
 using Microsoft.AspNetCore.Http;
 using OrchardCore.Environment.Shell.Builders;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+/// <summary>
+/// Used to capture the shell context and original path infos.
+/// </summary>
+public class ShellContextFeature
 {
     /// <summary>
-    /// Used to capture the shell context and original path infos.
+    /// The current shell context.
     /// </summary>
-    public class ShellContextFeature
-    {
-        /// <summary>
-        /// The current shell context.
-        /// </summary>
-        public ShellContext ShellContext { get; set; }
+    public ShellContext ShellContext { get; set; }
 
-        /// <summary>
-        /// The original path base.
-        /// </summary>
-        public PathString OriginalPathBase { get; set; }
+    /// <summary>
+    /// The original path base.
+    /// </summary>
+    public PathString OriginalPathBase { get; set; }
 
-        /// <summary>
-        /// The original path.
-        /// </summary>
-        public PathString OriginalPath { get; set; }
-    }
+    /// <summary>
+    /// The original path.
+    /// </summary>
+    public PathString OriginalPath { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/ShellHostReloadException.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/ShellHostReloadException.cs
index 1fc807594a9..460c1be11d3 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/ShellHostReloadException.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/ShellHostReloadException.cs
@@ -1,19 +1,18 @@
 using System;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+/// <summary>
+/// The <see cref="Exception"/> that is thrown if <see cref="IShellHost.ReloadShellContextAsync(ShellSettings, bool)"/> fails.
+/// </summary>
+public class ShellHostReloadException : Exception
 {
     /// <summary>
-    /// The <see cref="Exception"/> that is thrown if <see cref="IShellHost.ReloadShellContextAsync(ShellSettings, bool)"/> fails.
+    /// Creates a new instance of <see cref="ShellHostReloadException"/> with the specified
+    /// exception message.
     /// </summary>
-    public class ShellHostReloadException : Exception
+    /// <param name="message">The message that describes the error.</param>
+    public ShellHostReloadException(string message) : base(message)
     {
-        /// <summary>
-        /// Creates a new instance of <see cref="ShellHostReloadException"/> with the specified
-        /// exception message.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        public ShellHostReloadException(string message) : base(message)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/ShellOptions.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/ShellOptions.cs
index c7a7622df6f..82885467f71 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/ShellOptions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/ShellOptions.cs
@@ -1,15 +1,14 @@
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+public class ShellOptions
 {
-    public class ShellOptions
-    {
-        /// <summary>
-        /// The root container.
-        /// </summary>
-        public string ShellsApplicationDataPath { get; set; }
+    /// <summary>
+    /// The root container.
+    /// </summary>
+    public string ShellsApplicationDataPath { get; set; }
 
-        /// <summary>
-        /// The container for shells.
-        /// </summary>
-        public string ShellsContainerName { get; set; }
-    }
+    /// <summary>
+    /// The container for shells.
+    /// </summary>
+    public string ShellsContainerName { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/ShellSettings.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/ShellSettings.cs
index dd225764565..e9a45cbc8ba 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Shell/ShellSettings.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/ShellSettings.cs
@@ -5,179 +5,178 @@
 using OrchardCore.Environment.Shell.Configuration;
 using OrchardCore.Environment.Shell.Models;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+/// <summary>
+/// The minimalistic set of settings fields and the configuration of a given tenant, all data can be first provided
+/// by regular configuration sources, then by default settings of all tenants are stored in 'App_Data/tenants.json',
+/// while each tenant configuration is stored in the related site folder 'App_Data/Sites/{tenant}/appsettings.json'.
+/// </summary>
+public class ShellSettings : IDisposable
 {
     /// <summary>
-    /// The minimalistic set of settings fields and the configuration of a given tenant, all data can be first provided
-    /// by regular configuration sources, then by default settings of all tenants are stored in 'App_Data/tenants.json',
-    /// while each tenant configuration is stored in the related site folder 'App_Data/Sites/{tenant}/appsettings.json'.
+    /// The name of the 'Default' tenant.
     /// </summary>
-    public class ShellSettings : IDisposable
+    public const string DefaultShellName = "Default";
+
+    /// <summary>
+    /// The 'RequestUrlHost' string separators allowing to provide multiple hosts.
+    /// </summary>
+    public static readonly char[] HostSeparators = [',', ' '];
+
+    private readonly ShellConfiguration _settings;
+    private readonly ShellConfiguration _configuration;
+    internal volatile int _shellCreating;
+
+    private string _requestUrlPrefix;
+    private string _versionId;
+    private string _tenantId;
+    private string _requestUrlHost;
+    private string[] _requestUrlHosts;
+    private TenantState? _state;
+
+    /// <summary>
+    /// Initializes a new <see cref="ShellSettings"/>.
+    /// </summary>
+    public ShellSettings()
     {
-        /// <summary>
-        /// The name of the 'Default' tenant.
-        /// </summary>
-        public const string DefaultShellName = "Default";
-
-        /// <summary>
-        /// The 'RequestUrlHost' string separators allowing to provide multiple hosts.
-        /// </summary>
-        public static readonly char[] HostSeparators = [',', ' '];
-
-        private readonly ShellConfiguration _settings;
-        private readonly ShellConfiguration _configuration;
-        internal volatile int _shellCreating;
-
-        private string _requestUrlPrefix;
-        private string _versionId;
-        private string _tenantId;
-        private string _requestUrlHost;
-        private string[] _requestUrlHosts;
-        private TenantState? _state;
-
-        /// <summary>
-        /// Initializes a new <see cref="ShellSettings"/>.
-        /// </summary>
-        public ShellSettings()
-        {
-            _settings = new ShellConfiguration();
-            _configuration = new ShellConfiguration();
-        }
+        _settings = new ShellConfiguration();
+        _configuration = new ShellConfiguration();
+    }
 
-        /// <summary>
-        /// Initializes a new <see cref="ShellSettings"/> from an existing one
-        /// and from an existing <see cref="Configuration.ShellConfiguration"/>.
-        /// </summary>
-        public ShellSettings(ShellConfiguration settings, ShellConfiguration configuration)
-        {
-            _settings = settings;
-            _configuration = configuration;
-        }
+    /// <summary>
+    /// Initializes a new <see cref="ShellSettings"/> from an existing one
+    /// and from an existing <see cref="Configuration.ShellConfiguration"/>.
+    /// </summary>
+    public ShellSettings(ShellConfiguration settings, ShellConfiguration configuration)
+    {
+        _settings = settings;
+        _configuration = configuration;
+    }
 
-        /// <summary>
-        /// Initializes a new <see cref="ShellSettings"/> from an existing one.
-        /// </summary>
-        public ShellSettings(ShellSettings settings)
-        {
-            _settings = new ShellConfiguration(settings._settings);
-            _configuration = new ShellConfiguration(settings.Name, settings._configuration);
-            Name = settings.Name;
-        }
+    /// <summary>
+    /// Initializes a new <see cref="ShellSettings"/> from an existing one.
+    /// </summary>
+    public ShellSettings(ShellSettings settings)
+    {
+        _settings = new ShellConfiguration(settings._settings);
+        _configuration = new ShellConfiguration(settings.Name, settings._configuration);
+        Name = settings.Name;
+    }
 
-        /// <summary>
-        /// The tenant name.
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Whether this instance has been disposed or not.
-        /// </summary>
-        [JsonIgnore]
-        public bool Disposed { get; private set; }
-
-        /// <summary>
-        /// Whether this instance is disposable or not.
-        /// </summary>
-        [JsonIgnore]
-        public bool Disposable { get; internal set; }
-
-        /// <summary>
-        /// The tenant version identifier.
-        /// </summary>
-        public string VersionId
-        {
-            get => _versionId ??= _settings["VersionId"];
-            set
-            {
-                _settings["TenantId"] ??= _settings["VersionId"] ?? value;
-                _versionId = _settings["VersionId"] = value;
-            }
-        }
+    /// <summary>
+    /// The tenant name.
+    /// </summary>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// The tenant identifier.
-        /// </summary>
-        public string TenantId => _tenantId ??= _settings["TenantId"] ?? _settings["VersionId"];
+    /// <summary>
+    /// Whether this instance has been disposed or not.
+    /// </summary>
+    [JsonIgnore]
+    public bool Disposed { get; private set; }
 
-        /// <summary>
-        /// The tenant request url host, multiple separated hosts may be provided.
-        /// </summary>
-        public string RequestUrlHost
-        {
-            get => _requestUrlHost ??= _settings["RequestUrlHost"] ?? string.Empty;
-            set => _requestUrlHost = _settings["RequestUrlHost"] = value;
-        }
+    /// <summary>
+    /// Whether this instance is disposable or not.
+    /// </summary>
+    [JsonIgnore]
+    public bool Disposable { get; internal set; }
 
-        /// <summary>
-        /// The tenant request url host(s).
-        /// </summary>
-        [JsonIgnore]
-        public string[] RequestUrlHosts => _requestUrlHosts ??= _settings["RequestUrlHost"]
-            ?.Split(HostSeparators, StringSplitOptions.RemoveEmptyEntries)
-            ?? [];
-
-        /// <summary>
-        /// The tenant request url prefix.
-        /// </summary>
-        public string RequestUrlPrefix
+    /// <summary>
+    /// The tenant version identifier.
+    /// </summary>
+    public string VersionId
+    {
+        get => _versionId ??= _settings["VersionId"];
+        set
         {
-            get => _requestUrlPrefix ??= _settings["RequestUrlPrefix"]?.Trim(' ', '/') ?? string.Empty;
-            set => _requestUrlPrefix = _settings["RequestUrlPrefix"] = value;
+            _settings["TenantId"] ??= _settings["VersionId"] ?? value;
+            _versionId = _settings["VersionId"] = value;
         }
+    }
 
-        /// <summary>
-        /// The tenant state.
-        /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
-        public TenantState State
-        {
-            get => _state ??= _settings.GetValue<TenantState>("State");
-            set => _state = Enum.Parse<TenantState>(_settings["State"] = value.ToString());
-        }
+    /// <summary>
+    /// The tenant identifier.
+    /// </summary>
+    public string TenantId => _tenantId ??= _settings["TenantId"] ?? _settings["VersionId"];
 
-        /// <summary>
-        /// The tenant configuration.
-        /// </summary>
-        [JsonIgnore]
-        public IShellConfiguration ShellConfiguration => _configuration;
+    /// <summary>
+    /// The tenant request url host, multiple separated hosts may be provided.
+    /// </summary>
+    public string RequestUrlHost
+    {
+        get => _requestUrlHost ??= _settings["RequestUrlHost"] ?? string.Empty;
+        set => _requestUrlHost = _settings["RequestUrlHost"] = value;
+    }
 
-        [JsonIgnore]
-        public string this[string key]
-        {
-            get => _configuration[key];
-            set => _configuration[key] = value;
-        }
+    /// <summary>
+    /// The tenant request url host(s).
+    /// </summary>
+    [JsonIgnore]
+    public string[] RequestUrlHosts => _requestUrlHosts ??= _settings["RequestUrlHost"]
+        ?.Split(HostSeparators, StringSplitOptions.RemoveEmptyEntries)
+        ?? [];
 
-        /// <summary>
-        /// Ensures that the tenant configuration is initialized.
-        /// </summary>
-        public Task EnsureConfigurationAsync() => _configuration.EnsureConfigurationAsync();
+    /// <summary>
+    /// The tenant request url prefix.
+    /// </summary>
+    public string RequestUrlPrefix
+    {
+        get => _requestUrlPrefix ??= _settings["RequestUrlPrefix"]?.Trim(' ', '/') ?? string.Empty;
+        set => _requestUrlPrefix = _settings["RequestUrlPrefix"] = value;
+    }
 
-        public void Dispose()
-        {
-            // Disposable on reloading or if never registered.
-            if (!Disposable || _shellCreating > 0)
-            {
-                return;
-            }
-
-            Close();
-            GC.SuppressFinalize(this);
-        }
+    /// <summary>
+    /// The tenant state.
+    /// </summary>
+    [JsonConverter(typeof(JsonStringEnumConverter))]
+    public TenantState State
+    {
+        get => _state ??= _settings.GetValue<TenantState>("State");
+        set => _state = Enum.Parse<TenantState>(_settings["State"] = value.ToString());
+    }
+
+    /// <summary>
+    /// The tenant configuration.
+    /// </summary>
+    [JsonIgnore]
+    public IShellConfiguration ShellConfiguration => _configuration;
+
+    [JsonIgnore]
+    public string this[string key]
+    {
+        get => _configuration[key];
+        set => _configuration[key] = value;
+    }
+
+    /// <summary>
+    /// Ensures that the tenant configuration is initialized.
+    /// </summary>
+    public Task EnsureConfigurationAsync() => _configuration.EnsureConfigurationAsync();
 
-        private void Close()
+    public void Dispose()
+    {
+        // Disposable on reloading or if never registered.
+        if (!Disposable || _shellCreating > 0)
         {
-            if (Disposed)
-            {
-                return;
-            }
+            return;
+        }
 
-            Disposed = true;
+        Close();
+        GC.SuppressFinalize(this);
+    }
 
-            _settings?.Release();
-            _configuration?.Release();
+    private void Close()
+    {
+        if (Disposed)
+        {
+            return;
         }
 
-        ~ShellSettings() => Close();
+        Disposed = true;
+
+        _settings?.Release();
+        _configuration?.Release();
     }
+
+    ~ShellSettings() => Close();
 }
diff --git a/src/OrchardCore/OrchardCore.Abstractions/StringUriExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/StringUriExtensions.cs
index 95eb393281f..613a1f67d44 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/StringUriExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Abstractions/StringUriExtensions.cs
@@ -1,42 +1,41 @@
 using System.Linq;
 
-namespace System
+namespace System;
+
+public static class StringUriExtensions
 {
-    public static class StringUriExtensions
+    public static string ToUriComponents(this string url, UriFormat uriFormat = UriFormat.UriEscaped)
     {
-        public static string ToUriComponents(this string url, UriFormat uriFormat = UriFormat.UriEscaped)
+        if (string.IsNullOrEmpty(url))
         {
-            if (string.IsNullOrEmpty(url))
-            {
-                return url;
-            }
+            return url;
+        }
 
-            var uri = new Uri(url, UriKind.RelativeOrAbsolute);
+        var uri = new Uri(url, UriKind.RelativeOrAbsolute);
 
-            return uri.GetComponents(UriComponents.SerializationInfoString, uriFormat);
-        }
+        return uri.GetComponents(UriComponents.SerializationInfoString, uriFormat);
+    }
 
-        public static string ToSnakeCase(this string str)
-        {
-            return string.Concat(str.Select((x, i) => i > 0 && char.IsUpper(x) ? "_" + x.ToString() : x.ToString())).ToLower();
-        }
+    public static string ToSnakeCase(this string str)
+    {
+        return string.Concat(str.Select((x, i) => i > 0 && char.IsUpper(x) ? "_" + x.ToString() : x.ToString())).ToLower();
+    }
 
-        public static string RemoveQueryString(this string url, out string queryString)
+    public static string RemoveQueryString(this string url, out string queryString)
+    {
+        if (url != null)
         {
-            if (url != null)
+            var queryIndex = url.IndexOf('?');
+            if (queryIndex >= 0)
             {
-                var queryIndex = url.IndexOf('?');
-                if (queryIndex >= 0)
-                {
-                    queryString = url[queryIndex..];
+                queryString = url[queryIndex..];
 
-                    return url[..queryIndex];
-                }
+                return url[..queryIndex];
             }
+        }
 
-            queryString = null;
+        queryString = null;
 
-            return url;
-        }
+        return url;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Admin.Abstractions/AdminAttribute.cs b/src/OrchardCore/OrchardCore.Admin.Abstractions/AdminAttribute.cs
index 4cdee6c6332..f29073213af 100644
--- a/src/OrchardCore/OrchardCore.Admin.Abstractions/AdminAttribute.cs
+++ b/src/OrchardCore/OrchardCore.Admin.Abstractions/AdminAttribute.cs
@@ -5,58 +5,57 @@
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Mvc.Filters;
 
-namespace OrchardCore.Admin
+namespace OrchardCore.Admin;
+
+/// <summary>
+/// When applied to an action or a controller or a page model, intercepts any request to check whether it applies to the admin site.
+/// If so it marks the request as such and ensures the user has the right to access it.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+public class AdminAttribute : Attribute, IAsyncResourceFilter
 {
     /// <summary>
-    /// When applied to an action or a controller or a page model, intercepts any request to check whether it applies to the admin site.
-    /// If so it marks the request as such and ensures the user has the right to access it.
+    /// This may be used if the route name should be just the controller and action names stuck together. For
+    /// example <c>~/Admin/AdminMenu/List</c> gets the route name <c>AdminMenuList</c>.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
-    public class AdminAttribute : Attribute, IAsyncResourceFilter
+    public const string NameFromControllerAndAction = "{controller}{action}";
+
+    /// <summary>
+    /// Gets or sets the pattern which should be used as the path after the admin suffix. This is similar to the
+    /// <see cref="RouteAttribute.Template"/>. When applying to a controller with multiple actions, the template
+    /// should include the <c>{action}</c> expression. When applied to both the action and the controller, the
+    /// action's template takes precedence. If it's <see langword="null"/> or empty for both, the fallback value
+    /// is <c>{area}/{controller}/{action}/{id?}</c>.
+    /// </summary>
+    public string Template { get; set; }
+
+    /// <summary>
+    /// Gets or sets the name used when mapping the admin route. You can use <c>{area}</c>, <c>{controller}</c>,
+    /// <c>{action}</c> in the string, which will be substituted. For performance reasons, these values are exact
+    /// and shouldn't contain spaces. If empty when <see cref="Template"/> is used, the fallback is <see
+    /// cref="ControllerActionDescriptor.DisplayName"/>.
+    /// </summary>
+    public string RouteName { get; set; }
+
+    public AdminAttribute(string template = null, string routeName = null)
     {
-        /// <summary>
-        /// This may be used if the route name should be just the controller and action names stuck together. For
-        /// example <c>~/Admin/AdminMenu/List</c> gets the route name <c>AdminMenuList</c>.
-        /// </summary>
-        public const string NameFromControllerAndAction = "{controller}{action}";
-
-        /// <summary>
-        /// Gets or sets the pattern which should be used as the path after the admin suffix. This is similar to the
-        /// <see cref="RouteAttribute.Template"/>. When applying to a controller with multiple actions, the template
-        /// should include the <c>{action}</c> expression. When applied to both the action and the controller, the
-        /// action's template takes precedence. If it's <see langword="null"/> or empty for both, the fallback value
-        /// is <c>{area}/{controller}/{action}/{id?}</c>.
-        /// </summary>
-        public string Template { get; set; }
-
-        /// <summary>
-        /// Gets or sets the name used when mapping the admin route. You can use <c>{area}</c>, <c>{controller}</c>,
-        /// <c>{action}</c> in the string, which will be substituted. For performance reasons, these values are exact
-        /// and shouldn't contain spaces. If empty when <see cref="Template"/> is used, the fallback is <see
-        /// cref="ControllerActionDescriptor.DisplayName"/>.
-        /// </summary>
-        public string RouteName { get; set; }
-
-        public AdminAttribute(string template = null, string routeName = null)
-        {
-            Template = template;
-            RouteName = routeName;
-        }
-
-        public Task OnResourceExecutionAsync(ResourceExecutingContext context, ResourceExecutionDelegate next)
-        {
-            Apply(context.HttpContext);
-
-            return next();
-        }
-
-        public static void Apply(HttpContext context)
-        {
-            // The value isn't important, it's just a marker object
-            context.Items[typeof(AdminAttribute)] = null;
-        }
-
-        public static bool IsApplied(HttpContext context)
-            => context.Items.ContainsKey(typeof(AdminAttribute));
+        Template = template;
+        RouteName = routeName;
     }
+
+    public Task OnResourceExecutionAsync(ResourceExecutingContext context, ResourceExecutionDelegate next)
+    {
+        Apply(context.HttpContext);
+
+        return next();
+    }
+
+    public static void Apply(HttpContext context)
+    {
+        // The value isn't important, it's just a marker object
+        context.Items[typeof(AdminAttribute)] = null;
+    }
+
+    public static bool IsApplied(HttpContext context)
+        => context.Items.ContainsKey(typeof(AdminAttribute));
 }
diff --git a/src/OrchardCore/OrchardCore.Admin.Abstractions/AdminOptions.cs b/src/OrchardCore/OrchardCore.Admin.Abstractions/AdminOptions.cs
index fc40da1da3a..d55c23834ac 100644
--- a/src/OrchardCore/OrchardCore.Admin.Abstractions/AdminOptions.cs
+++ b/src/OrchardCore/OrchardCore.Admin.Abstractions/AdminOptions.cs
@@ -1,13 +1,12 @@
-namespace OrchardCore.Admin
+namespace OrchardCore.Admin;
+
+public class AdminOptions
 {
-    public class AdminOptions
-    {
-        private string _adminUrlPrefix = "Admin";
+    private string _adminUrlPrefix = "Admin";
 
-        public string AdminUrlPrefix
-        {
-            get => _adminUrlPrefix;
-            set => _adminUrlPrefix = value.Trim(' ', '/');
-        }
+    public string AdminUrlPrefix
+    {
+        get => _adminUrlPrefix;
+        set => _adminUrlPrefix = value.Trim(' ', '/');
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Admin.Abstractions/Constants.cs b/src/OrchardCore/OrchardCore.Admin.Abstractions/Constants.cs
index 06a7bb5827f..3cf6f1751a4 100644
--- a/src/OrchardCore/OrchardCore.Admin.Abstractions/Constants.cs
+++ b/src/OrchardCore/OrchardCore.Admin.Abstractions/Constants.cs
@@ -1,8 +1,7 @@
 
-namespace OrchardCore.Admin
+namespace OrchardCore.Admin;
+
+public static class Constants
 {
-    public static class Constants
-    {
-        public const string DocsUrl = "https://docs.orchardcore.net/en/latest/";
-    }
+    public const string DocsUrl = "https://docs.orchardcore.net/en/latest/";
 }
diff --git a/src/OrchardCore/OrchardCore.Admin.Abstractions/IAdminThemeService.cs b/src/OrchardCore/OrchardCore.Admin.Abstractions/IAdminThemeService.cs
index e3299984a34..60d149cfb56 100644
--- a/src/OrchardCore/OrchardCore.Admin.Abstractions/IAdminThemeService.cs
+++ b/src/OrchardCore/OrchardCore.Admin.Abstractions/IAdminThemeService.cs
@@ -1,12 +1,11 @@
 using System.Threading.Tasks;
 using OrchardCore.Environment.Extensions;
 
-namespace OrchardCore.Admin
+namespace OrchardCore.Admin;
+
+public interface IAdminThemeService
 {
-    public interface IAdminThemeService
-    {
-        Task<IExtensionInfo> GetAdminThemeAsync();
-        Task SetAdminThemeAsync(string themeName);
-        Task<string> GetAdminThemeNameAsync();
-    }
+    Task<IExtensionInfo> GetAdminThemeAsync();
+    Task SetAdminThemeAsync(string themeName);
+    Task<string> GetAdminThemeNameAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Models/AdminMenu.cs b/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Models/AdminMenu.cs
index 28d030dcc1f..1002c6ccc0d 100644
--- a/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Models/AdminMenu.cs
+++ b/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Models/AdminMenu.cs
@@ -1,69 +1,68 @@
 using System;
 using System.Collections.Generic;
 
-namespace OrchardCore.AdminMenu.Models
+namespace OrchardCore.AdminMenu.Models;
+
+public class AdminMenu
 {
-    public class AdminMenu
-    {
-        public string Id { get; set; } = Guid.NewGuid().ToString("n");
-        public string Name { get; set; }
-        public bool Enabled { get; set; } = true;
-        public List<AdminNode> MenuItems { get; init; } = [];
+    public string Id { get; set; } = Guid.NewGuid().ToString("n");
+    public string Name { get; set; }
+    public bool Enabled { get; set; } = true;
+    public List<AdminNode> MenuItems { get; init; } = [];
 
-        public AdminNode GetMenuItemById(string id)
+    public AdminNode GetMenuItemById(string id)
+    {
+        foreach (var menuItem in MenuItems)
         {
-            foreach (var menuItem in MenuItems)
+            var found = menuItem.GetMenuItemById(id);
+            if (found != null)
             {
-                var found = menuItem.GetMenuItemById(id);
-                if (found != null)
-                {
-                    return found;
-                }
+                return found;
             }
+        }
+
+        // not found
+        return null;
+    }
 
-            // not found
-            return null;
+    public bool RemoveMenuItem(AdminNode itemToRemove)
+    {
+        if (MenuItems.Remove(itemToRemove)) // todo: avoid this check by having a single TreeNode as a property of the content tree preset.
+        {
+            return true; // success
         }
 
-        public bool RemoveMenuItem(AdminNode itemToRemove)
+        foreach (var firstLevelMenuItem in MenuItems)
         {
-            if (MenuItems.Remove(itemToRemove)) // todo: avoid this check by having a single TreeNode as a property of the content tree preset.
+            if (firstLevelMenuItem.RemoveMenuItem(itemToRemove))
             {
                 return true; // success
             }
+        }
 
-            foreach (var firstLevelMenuItem in MenuItems)
-            {
-                if (firstLevelMenuItem.RemoveMenuItem(itemToRemove))
-                {
-                    return true; // success
-                }
-            }
+        return false; // failure
+    }
 
-            return false; // failure
-        }
+    public bool InsertMenuItemAt(AdminNode menuItemToInsert, AdminNode destinationMenuItem, int position)
+    {
+        ArgumentNullException.ThrowIfNull(menuItemToInsert);
 
-        public bool InsertMenuItemAt(AdminNode menuItemToInsert, AdminNode destinationMenuItem, int position)
+        // insert the node at the destination node
+        if (destinationMenuItem == null)
         {
-            ArgumentNullException.ThrowIfNull(menuItemToInsert);
-
-            // insert the node at the destination node
-            if (destinationMenuItem == null)
-            {
-                MenuItems.Insert(position, menuItemToInsert);
-                return true; // success
-            }
-            else
+            MenuItems.Insert(position, menuItemToInsert);
+            return true; // success
+        }
+        else
+        {
+            foreach (var firstLevelMenuItem in MenuItems)
             {
-                foreach (var firstLevelMenuItem in MenuItems)
+                if (firstLevelMenuItem.InsertMenuItem(menuItemToInsert, destinationMenuItem, position))
                 {
-                    if (firstLevelMenuItem.InsertMenuItem(menuItemToInsert, destinationMenuItem, position))
-                    {
-                        return true; // success
-                    }
+                    return true; // success
                 }
             }
-            return false; // failure
         }
+        return false; // failure
     }
 }
diff --git a/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Models/AdminNode.cs b/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Models/AdminNode.cs
index 640bbb98798..58d8de39245 100644
--- a/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Models/AdminNode.cs
+++ b/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Models/AdminNode.cs
@@ -2,85 +2,84 @@
 using System.Collections.Generic;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.AdminMenu.Models
+namespace OrchardCore.AdminMenu.Models;
+
+public class AdminNode : MenuItem
 {
-    public class AdminNode : MenuItem
+    public string UniqueId { get; set; } = Guid.NewGuid().ToString("n");
+    public bool Enabled { get; set; } = true;
+
+    public AdminNode GetMenuItemById(string id)
     {
-        public string UniqueId { get; set; } = Guid.NewGuid().ToString("n");
-        public bool Enabled { get; set; } = true;
+        var tempStack = new Stack<AdminNode>(new AdminNode[] { this });
 
-        public AdminNode GetMenuItemById(string id)
+        while (tempStack.Count > 0)
         {
-            var tempStack = new Stack<AdminNode>(new AdminNode[] { this });
-
-            while (tempStack.Count > 0)
+            // Evaluate first node.
+            var item = tempStack.Pop();
+            if (item.UniqueId.Equals(id, StringComparison.OrdinalIgnoreCase))
             {
-                // Evaluate first node.
-                var item = tempStack.Pop();
-                if (item.UniqueId.Equals(id, StringComparison.OrdinalIgnoreCase))
-                {
-                    return item;
-                }
-
-                // Not that one, continue with the rest.
-                foreach (var i in item.Items)
-                {
-                    tempStack.Push((AdminNode)i);
-                }
+                return item;
             }
 
-            // Not found.
-            return null;
+            // Not that one, continue with the rest.
+            foreach (var i in item.Items)
+            {
+                tempStack.Push((AdminNode)i);
+            }
         }
 
-        // Return boolean so that caller can check for success.
-        public bool RemoveMenuItem(AdminNode nodeToRemove)
-        {
-            var tempStack = new Stack<AdminNode>(new AdminNode[] { this });
+        // Not found.
+        return null;
+    }
 
-            while (tempStack.Count > 0)
-            {
-                // Evaluate first.
-                var item = tempStack.Pop();
-                if (item.Items.Contains(nodeToRemove))
-                {
-                    item.Items.Remove(nodeToRemove);
-                    return true; // Success.
-                }
+    // Return boolean so that caller can check for success.
+    public bool RemoveMenuItem(AdminNode nodeToRemove)
+    {
+        var tempStack = new Stack<AdminNode>(new AdminNode[] { this });
 
-                // Not that one, continue.
-                foreach (var i in item.Items)
-                {
-                    tempStack.Push((AdminNode)i);
-                }
+        while (tempStack.Count > 0)
+        {
+            // Evaluate first.
+            var item = tempStack.Pop();
+            if (item.Items.Contains(nodeToRemove))
+            {
+                item.Items.Remove(nodeToRemove);
+                return true; // Success.
             }
 
-            // Failure.
-            return false;
+            // Not that one, continue.
+            foreach (var i in item.Items)
+            {
+                tempStack.Push((AdminNode)i);
+            }
         }
 
-        public bool InsertMenuItem(AdminNode nodeToInsert, MenuItem destinationNode, int position)
+        // Failure.
+        return false;
+    }
+
+    public bool InsertMenuItem(AdminNode nodeToInsert, MenuItem destinationNode, int position)
+    {
+        var tempStack = new Stack<AdminNode>(new AdminNode[] { this });
+        while (tempStack.Count > 0)
         {
-            var tempStack = new Stack<AdminNode>(new AdminNode[] { this });
-            while (tempStack.Count > 0)
+            // Evaluate first.
+            var node = tempStack.Pop();
+            if (node.Equals(destinationNode))
             {
-                // Evaluate first.
-                var node = tempStack.Pop();
-                if (node.Equals(destinationNode))
-                {
-                    node.Items.Insert(position, nodeToInsert);
-                    return true; // Success.
-                }
-
-                // Not that one, continue.
-                foreach (var n in node.Items)
-                {
-                    tempStack.Push((AdminNode)n);
-                }
+                node.Items.Insert(position, nodeToInsert);
+                return true; // Success.
             }
 
-            // Failure.
-            return false;
+            // Not that one, continue.
+            foreach (var n in node.Items)
+            {
+                tempStack.Push((AdminNode)n);
+            }
         }
+
+        // Failure.
+        return false;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Services/IAdminMenuPermissionService.cs b/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Services/IAdminMenuPermissionService.cs
index 9a1d3f7e876..573e8b39a5a 100644
--- a/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Services/IAdminMenuPermissionService.cs
+++ b/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Services/IAdminMenuPermissionService.cs
@@ -2,10 +2,9 @@
 using System.Threading.Tasks;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.AdminMenu.Services
+namespace OrchardCore.AdminMenu.Services;
+
+public interface IAdminMenuPermissionService
 {
-    public interface IAdminMenuPermissionService
-    {
-        Task<IEnumerable<Permission>> GetPermissionsAsync();
-    }
+    Task<IEnumerable<Permission>> GetPermissionsAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Services/IAdminNodeNavigationBuilder.cs b/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Services/IAdminNodeNavigationBuilder.cs
index d736ae288ac..078a660c3f9 100644
--- a/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Services/IAdminNodeNavigationBuilder.cs
+++ b/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Services/IAdminNodeNavigationBuilder.cs
@@ -2,14 +2,13 @@
 using System.Threading.Tasks;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.AdminMenu.Services
+namespace OrchardCore.AdminMenu.Services;
+
+public interface IAdminNodeNavigationBuilder
 {
-    public interface IAdminNodeNavigationBuilder
-    {
-        // This Name will be used to determine if the node passed has to be handled.
-        // The builder will handle only the nodes whose type name equals this name.
-        string Name { get; }
+    // This Name will be used to determine if the node passed has to be handled.
+    // The builder will handle only the nodes whose type name equals this name.
+    string Name { get; }
 
-        Task BuildNavigationAsync(MenuItem treeNode, NavigationBuilder builder, IEnumerable<IAdminNodeNavigationBuilder> treeNodeBuilders);
-    }
+    Task BuildNavigationAsync(MenuItem treeNode, NavigationBuilder builder, IEnumerable<IAdminNodeNavigationBuilder> treeNodeBuilders);
 }
diff --git a/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Services/IAdminNodeProviderFactory.cs b/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Services/IAdminNodeProviderFactory.cs
index 720c3936d43..4e408fbba0a 100644
--- a/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Services/IAdminNodeProviderFactory.cs
+++ b/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Services/IAdminNodeProviderFactory.cs
@@ -1,22 +1,21 @@
 using OrchardCore.AdminMenu.Models;
 
-namespace OrchardCore.AdminMenu.Services
+namespace OrchardCore.AdminMenu.Services;
+
+public interface IAdminNodeProviderFactory
 {
-    public interface IAdminNodeProviderFactory
-    {
-        string Name { get; }
-        AdminNode Create();
-    }
+    string Name { get; }
+    AdminNode Create();
+}
 
-    public class AdminNodeProviderFactory<TAdminNode> : IAdminNodeProviderFactory where TAdminNode : AdminNode, new()
-    {
-        private static readonly string _typeName = typeof(TAdminNode).Name;
+public class AdminNodeProviderFactory<TAdminNode> : IAdminNodeProviderFactory where TAdminNode : AdminNode, new()
+{
+    private static readonly string _typeName = typeof(TAdminNode).Name;
 
-        public string Name => _typeName;
+    public string Name => _typeName;
 
-        public AdminNode Create()
-        {
-            return new TAdminNode();
-        }
+    public AdminNode Create()
+    {
+        return new TAdminNode();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Extensions/FieldBuilderResolverExtensions.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Extensions/FieldBuilderResolverExtensions.cs
index d3c507b26da..8696005b2b6 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Extensions/FieldBuilderResolverExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Extensions/FieldBuilderResolverExtensions.cs
@@ -4,13 +4,12 @@
 using GraphQL.Builders;
 using OrchardCore.Apis.GraphQL.Resolvers;
 
-namespace OrchardCore.Apis.GraphQL
+namespace OrchardCore.Apis.GraphQL;
+
+public static class FieldBuilderResolverExtensions
 {
-    public static class FieldBuilderResolverExtensions
+    public static FieldBuilder<TSourceType, TReturnType> ResolveLockedAsync<TSourceType, TReturnType>(this FieldBuilder<TSourceType, TReturnType> builder, Func<IResolveFieldContext<TSourceType>, ValueTask<TReturnType>> resolve)
     {
-        public static FieldBuilder<TSourceType, TReturnType> ResolveLockedAsync<TSourceType, TReturnType>(this FieldBuilder<TSourceType, TReturnType> builder, Func<IResolveFieldContext<TSourceType>, ValueTask<TReturnType>> resolve)
-        {
-            return builder.Resolve(new LockedAsyncFieldResolver<TSourceType, TReturnType>(resolve));
-        }
+        return builder.Resolve(new LockedAsyncFieldResolver<TSourceType, TReturnType>(resolve));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Extensions/PermissionsExtensions.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Extensions/PermissionsExtensions.cs
index b8d169a6a9d..64edfccce8b 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Extensions/PermissionsExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Extensions/PermissionsExtensions.cs
@@ -3,41 +3,40 @@
 using GraphQL.Types;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Apis.GraphQL
+namespace OrchardCore.Apis.GraphQL;
+
+public static class PermissionsExtensions
 {
-    public static class PermissionsExtensions
-    {
-        private const string MetaDataKey = "Permissions";
+    private const string MetaDataKey = "Permissions";
 
-        public static void RequirePermission(this IProvideMetadata type, Permission permission, object resource = null)
+    public static void RequirePermission(this IProvideMetadata type, Permission permission, object resource = null)
+    {
+        lock (type)
         {
-            lock (type)
-            {
-                var permissions = type.GetMetadata<List<GraphQLPermissionContext>>(MetaDataKey);
-
-                if (permissions == null)
-                {
-                    type.Metadata[MetaDataKey] = permissions = [];
-                }
+            var permissions = type.GetMetadata<List<GraphQLPermissionContext>>(MetaDataKey);
 
-                permissions.Add(new GraphQLPermissionContext(permission, resource));
+            if (permissions == null)
+            {
+                type.Metadata[MetaDataKey] = permissions = [];
             }
-        }
 
-        public static FieldBuilder<TSourceType, TReturnType> RequirePermission<TSourceType, TReturnType>(this FieldBuilder<TSourceType, TReturnType> builder, Permission permission, object resource = null)
-        {
-            builder.FieldType.RequirePermission(permission, resource);
-            return builder;
+            permissions.Add(new GraphQLPermissionContext(permission, resource));
         }
+    }
 
-        public static IEnumerable<GraphQLPermissionContext> GetPermissions(this IProvideMetadata type)
-        {
-            return type?.GetMetadata<List<GraphQLPermissionContext>>(MetaDataKey) ?? [];
-        }
+    public static FieldBuilder<TSourceType, TReturnType> RequirePermission<TSourceType, TReturnType>(this FieldBuilder<TSourceType, TReturnType> builder, Permission permission, object resource = null)
+    {
+        builder.FieldType.RequirePermission(permission, resource);
+        return builder;
+    }
 
-        public static bool HasPermissions(this IProvideMetadata type)
-        {
-            return type != null && type.HasMetadata(MetaDataKey);
-        }
+    public static IEnumerable<GraphQLPermissionContext> GetPermissions(this IProvideMetadata type)
+    {
+        return type?.GetMetadata<List<GraphQLPermissionContext>>(MetaDataKey) ?? [];
+    }
+
+    public static bool HasPermissions(this IProvideMetadata type)
+    {
+        return type != null && type.HasMetadata(MetaDataKey);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Extensions/ResolveFieldContextExtensions.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Extensions/ResolveFieldContextExtensions.cs
index fe9d1645590..d2619bf076e 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Extensions/ResolveFieldContextExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Extensions/ResolveFieldContextExtensions.cs
@@ -7,71 +7,70 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Apis.GraphQL
+namespace OrchardCore.Apis.GraphQL;
+
+public static class ResolveFieldContextExtensions
 {
-    public static class ResolveFieldContextExtensions
+    public static bool HasPopulatedArgument(this IResolveFieldContext source, string argumentName)
     {
-        public static bool HasPopulatedArgument(this IResolveFieldContext source, string argumentName)
+        if (source.Arguments?.ContainsKey(argumentName) ?? false)
         {
-            if (source.Arguments?.ContainsKey(argumentName) ?? false)
-            {
-                return !string.IsNullOrEmpty(source.Arguments[argumentName].Value?.ToString());
-            };
+            return !string.IsNullOrEmpty(source.Arguments[argumentName].Value?.ToString());
+        };
 
-            return false;
-        }
+        return false;
+    }
 
-        public static bool HasPopulatedArgument<TSource>(this IResolveFieldContext<TSource> source, string argumentName)
+    public static bool HasPopulatedArgument<TSource>(this IResolveFieldContext<TSource> source, string argumentName)
+    {
+        if (source.Arguments?.ContainsKey(argumentName) ?? false)
         {
-            if (source.Arguments?.ContainsKey(argumentName) ?? false)
-            {
-                return !string.IsNullOrEmpty(source.Arguments[argumentName].Value?.ToString());
-            };
+            return !string.IsNullOrEmpty(source.Arguments[argumentName].Value?.ToString());
+        };
 
-            return false;
-        }
+        return false;
+    }
+
+    public static FieldBuilder<TArgumentGraphType, TArgumentType> PagingArguments<TArgumentGraphType, TArgumentType>(this FieldBuilder<TArgumentGraphType, TArgumentType> field)
+    {
+        return field
+            .Argument<IntGraphType>("first", "the first n elements")
+            .Argument<IntGraphType>("last", "the last n elements")
+            .Argument<IntGraphType>("skip", "the number of elements to skip");
+    }
 
-        public static FieldBuilder<TArgumentGraphType, TArgumentType> PagingArguments<TArgumentGraphType, TArgumentType>(this FieldBuilder<TArgumentGraphType, TArgumentType> field)
+    public static IEnumerable<TSource> Page<T, TSource>(this IResolveFieldContext<T> context, IEnumerable<TSource> source)
+    {
+        if (source is null)
         {
-            return field
-                .Argument<IntGraphType>("first", "the first n elements")
-                .Argument<IntGraphType>("last", "the last n elements")
-                .Argument<IntGraphType>("skip", "the number of elements to skip");
+            return Array.Empty<TSource>();
         }
+        var skip = context.GetArgument<int>("skip");
+        var first = context.GetArgument<int>("first");
+        var last = context.GetArgument<int>("last");
 
-        public static IEnumerable<TSource> Page<T, TSource>(this IResolveFieldContext<T> context, IEnumerable<TSource> source)
+        if (last == 0 && first == 0)
         {
-            if (source is null)
-            {
-                return Array.Empty<TSource>();
-            }
-            var skip = context.GetArgument<int>("skip");
-            var first = context.GetArgument<int>("first");
-            var last = context.GetArgument<int>("last");
+            first = context.RequestServices.GetService<IOptions<GraphQLSettings>>().Value.DefaultNumberOfResults;
+        }
 
-            if (last == 0 && first == 0)
+        if (last > 0)
+        {
+            source = source.Skip(Math.Max(0, source.Count() - last));
+        }
+        else
+        {
+            if (skip > 0)
             {
-                first = context.RequestServices.GetService<IOptions<GraphQLSettings>>().Value.DefaultNumberOfResults;
+                source = source.Skip(skip);
             }
 
-            if (last > 0)
+            if (first > 0)
             {
-                source = source.Skip(Math.Max(0, source.Count() - last));
+                source = source.Take(first);
             }
-            else
-            {
-                if (skip > 0)
-                {
-                    source = source.Skip(skip);
-                }
-
-                if (first > 0)
-                {
-                    source = source.Take(first);
-                }
-            }
-
-            return source;
         }
+
+        return source;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/GraphQLFieldNameAttribute.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/GraphQLFieldNameAttribute.cs
index 50d943473e2..4f90a8ed17a 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/GraphQLFieldNameAttribute.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/GraphQLFieldNameAttribute.cs
@@ -1,17 +1,16 @@
 using System;
 
-namespace OrchardCore.Apis.GraphQL
+namespace OrchardCore.Apis.GraphQL;
+
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+public class GraphQLFieldNameAttribute : Attribute
 {
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
-    public class GraphQLFieldNameAttribute : Attribute
+    public GraphQLFieldNameAttribute(string field, string mapped)
     {
-        public GraphQLFieldNameAttribute(string field, string mapped)
-        {
-            Field = field;
-            Mapped = mapped;
-        }
-
-        public string Field { get; }
-        public string Mapped { get; }
+        Field = field;
+        Mapped = mapped;
     }
+
+    public string Field { get; }
+    public string Mapped { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/GraphQLPermissionContext.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/GraphQLPermissionContext.cs
index 685d656cfd5..f94e1e46907 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/GraphQLPermissionContext.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/GraphQLPermissionContext.cs
@@ -1,16 +1,15 @@
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Apis.GraphQL
+namespace OrchardCore.Apis.GraphQL;
+
+public class GraphQLPermissionContext
 {
-    public class GraphQLPermissionContext
-    {
-        public Permission Permission { get; set; }
-        public object Resource { get; set; }
+    public Permission Permission { get; set; }
+    public object Resource { get; set; }
 
-        public GraphQLPermissionContext(Permission permission, object resource = null)
-        {
-            Permission = permission;
-            Resource = resource;
-        }
+    public GraphQLPermissionContext(Permission permission, object resource = null)
+    {
+        Permission = permission;
+        Resource = resource;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/GraphQLSettings.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/GraphQLSettings.cs
index cb12ee31f17..a5c23f35480 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/GraphQLSettings.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/GraphQLSettings.cs
@@ -2,27 +2,26 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Apis.GraphQL
+namespace OrchardCore.Apis.GraphQL;
+
+public class GraphQLSettings
 {
-    public class GraphQLSettings
-    {
-        public PathString Path { get; set; } = "/api/graphql";
-        public Func<HttpContext, IDictionary<string, object>> BuildUserContext { get; set; }
+    public PathString Path { get; set; } = "/api/graphql";
+    public Func<HttpContext, IDictionary<string, object>> BuildUserContext { get; set; }
 
-        public bool ExposeExceptions { get; set; }
+    public bool ExposeExceptions { get; set; }
 
-        public int? MaxDepth { get; set; }
-        public int? MaxComplexity { get; set; }
-        public double? FieldImpact { get; set; }
-        public int DefaultNumberOfResults { get; set; }
-        public int MaxNumberOfResults { get; set; }
-        public MaxNumberOfResultsValidationMode MaxNumberOfResultsValidationMode { get; set; }
-    }
+    public int? MaxDepth { get; set; }
+    public int? MaxComplexity { get; set; }
+    public double? FieldImpact { get; set; }
+    public int DefaultNumberOfResults { get; set; }
+    public int MaxNumberOfResults { get; set; }
+    public MaxNumberOfResultsValidationMode MaxNumberOfResultsValidationMode { get; set; }
+}
 
-    public enum MaxNumberOfResultsValidationMode
-    {
-        Default,
-        Enabled,
-        Disabled
-    }
+public enum MaxNumberOfResultsValidationMode
+{
+    Default,
+    Enabled,
+    Disabled
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/GraphQLUserContext.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/GraphQLUserContext.cs
index 1b6703cf3c2..629f004c625 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/GraphQLUserContext.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/GraphQLUserContext.cs
@@ -2,11 +2,10 @@
 using System.Security.Claims;
 using System.Threading;
 
-namespace OrchardCore.Apis.GraphQL
+namespace OrchardCore.Apis.GraphQL;
+
+public class GraphQLUserContext : Dictionary<string, object>
 {
-    public class GraphQLUserContext : Dictionary<string, object>
-    {
-        public ClaimsPrincipal User { get; set; }
-        public SemaphoreSlim ExecutionContextLock { get; } = new SemaphoreSlim(1, 1);
-    }
+    public ClaimsPrincipal User { get; set; }
+    public SemaphoreSlim ExecutionContextLock { get; } = new SemaphoreSlim(1, 1);
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/ISchemaBuilder.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/ISchemaBuilder.cs
index cc1813d904b..788f855d750 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/ISchemaBuilder.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/ISchemaBuilder.cs
@@ -1,23 +1,22 @@
 using System.Threading.Tasks;
 using GraphQL.Types;
 
-namespace OrchardCore.Apis.GraphQL
+namespace OrchardCore.Apis.GraphQL;
+
+/// <summary>
+/// Implementations of this interface can participate in building the <see cref="ISchema"/> instance that is used for GraphQL requests.
+/// </summary>
+public interface ISchemaBuilder
 {
     /// <summary>
-    /// Implementations of this interface can participate in building the <see cref="ISchema"/> instance that is used for GraphQL requests.
+    /// Updates <paramref name="schema"/>.
     /// </summary>
-    public interface ISchemaBuilder
-    {
-        /// <summary>
-        /// Updates <paramref name="schema"/>.
-        /// </summary>
-        /// <param name="schema">The <see cref="ISchema"/> instance to update.</param>
-        Task BuildAsync(ISchema schema);
+    /// <param name="schema">The <see cref="ISchema"/> instance to update.</param>
+    Task BuildAsync(ISchema schema);
 
-        /// <summary>
-        /// Returns an unique identifier that is updated when the data that is used in the <see cref="ISchema"/> instance
-        /// has changed, or an empty string if it has no dependencies, null being a valid value not yet updated.
-        /// </summary>
-        Task<string> GetIdentifierAsync();
-    }
+    /// <summary>
+    /// Returns an unique identifier that is updated when the data that is used in the <see cref="ISchema"/> instance
+    /// has changed, or an empty string if it has no dependencies, null being a valid value not yet updated.
+    /// </summary>
+    Task<string> GetIdentifierAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/ISchemaFactory.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/ISchemaFactory.cs
index 4b7db02f4ee..5f9b85e6ef3 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/ISchemaFactory.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/ISchemaFactory.cs
@@ -1,14 +1,13 @@
 using System.Threading.Tasks;
 using GraphQL.Types;
 
-namespace OrchardCore.Apis.GraphQL
+namespace OrchardCore.Apis.GraphQL;
+
+/// <summary>
+/// Represents a service that provides the <see cref="ISchema"/> instance that is used in a GraphQL request.
+/// The result should be cached and reused when possible.
+/// </summary>
+public interface ISchemaFactory
 {
-    /// <summary>
-    /// Represents a service that provides the <see cref="ISchema"/> instance that is used in a GraphQL request.
-    /// The result should be cached and reused when possible.
-    /// </summary>
-    public interface ISchemaFactory
-    {
-        Task<ISchema> GetSchemaAsync();
-    }
+    Task<ISchema> GetSchemaAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Queries/INamedQueryProvider.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Queries/INamedQueryProvider.cs
index d19b398373f..9555da16e36 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Queries/INamedQueryProvider.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Queries/INamedQueryProvider.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Apis.GraphQL.Queries
+namespace OrchardCore.Apis.GraphQL.Queries;
+
+public interface INamedQueryProvider
 {
-    public interface INamedQueryProvider
-    {
-        IDictionary<string, string> Resolve();
-    }
+    IDictionary<string, string> Resolve();
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Queries/Types/TimeSpanGraphType.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Queries/Types/TimeSpanGraphType.cs
index fbe1721c48f..fafba081708 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Queries/Types/TimeSpanGraphType.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Queries/Types/TimeSpanGraphType.cs
@@ -3,51 +3,50 @@
 using GraphQL.Types;
 using GraphQLParser.AST;
 
-namespace OrchardCore.Apis.GraphQL.Queries.Types
+namespace OrchardCore.Apis.GraphQL.Queries.Types;
+
+public class TimeSpanGraphType : ScalarGraphType
 {
-    public class TimeSpanGraphType : ScalarGraphType
+    public TimeSpanGraphType()
     {
-        public TimeSpanGraphType()
-        {
-            Name = "TimeSpan";
-            Description = "Represents a time interval.";
-        }
+        Name = "TimeSpan";
+        Description = "Represents a time interval.";
+    }
 
-        public override object Serialize(object value)
-        {
-            return value?.ToString();
-        }
+    public override object Serialize(object value)
+    {
+        return value?.ToString();
+    }
 
-        public override object ParseValue(object value)
-        {
-            var timespan = value?.ToString().StripQuotes();
-            return string.IsNullOrWhiteSpace(timespan)
-                ? null
-                : (TimeSpan?)TimeSpan.Parse(timespan, CultureInfo.CurrentCulture);
-        }
+    public override object ParseValue(object value)
+    {
+        var timespan = value?.ToString().StripQuotes();
+        return string.IsNullOrWhiteSpace(timespan)
+            ? null
+            : (TimeSpan?)TimeSpan.Parse(timespan, CultureInfo.CurrentCulture);
+    }
 
-        public override object ParseLiteral(GraphQLValue value)
+    public override object ParseLiteral(GraphQLValue value)
+    {
+        var str = value as GraphQLStringValue;
+        if (str != null)
         {
-            var str = value as GraphQLStringValue;
-            if (str != null)
-            {
-                return ParseValue(str.Value);
-            }
-
-            return null;
+            return ParseValue(str.Value);
         }
+
+        return null;
     }
+}
 
-    public static class ScalarGraphTypeExtensions
+public static class ScalarGraphTypeExtensions
+{
+    public static string StripQuotes(this string value)
     {
-        public static string StripQuotes(this string value)
+        if (!string.IsNullOrEmpty(value) && value.Length > 2 && value.StartsWith('\"') && value.EndsWith('\"'))
         {
-            if (!string.IsNullOrEmpty(value) && value.Length > 2 && value.StartsWith('\"') && value.EndsWith('\"'))
-            {
-                return value[1..^1];
-            }
-
-            return value;
+            return value[1..^1];
         }
+
+        return value;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Queries/WhereInputObjectGraphType.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Queries/WhereInputObjectGraphType.cs
index 076fb63c34c..0fa8c29d190 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Queries/WhereInputObjectGraphType.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Queries/WhereInputObjectGraphType.cs
@@ -3,129 +3,128 @@
 using GraphQL.Types;
 using OrchardCore.Apis.GraphQL.Queries.Types;
 
-namespace OrchardCore.Apis.GraphQL.Queries
+namespace OrchardCore.Apis.GraphQL.Queries;
+
+public interface IFilterInputObjectGraphType : IInputObjectGraphType
 {
-    public interface IFilterInputObjectGraphType : IInputObjectGraphType
-    {
-        void AddScalarFilterFields<TGraphType>(string fieldName, string description);
+    void AddScalarFilterFields<TGraphType>(string fieldName, string description);
 
-        void AddScalarFilterFields(Type graphType, string fieldName, string description);
-    }
+    void AddScalarFilterFields(Type graphType, string fieldName, string description);
+}
 
-    public class WhereInputObjectGraphType : WhereInputObjectGraphType<object>, IFilterInputObjectGraphType
+public class WhereInputObjectGraphType : WhereInputObjectGraphType<object>, IFilterInputObjectGraphType
+{
+}
+
+public class WhereInputObjectGraphType<TSourceType> : InputObjectGraphType<TSourceType>, IFilterInputObjectGraphType
+{
+    // arguments of typed input graph types return typed object, without additional input fields (_in, _contains,..)
+    // so we return dictionary as it was before.
+    public override object ParseDictionary(IDictionary<string, object> value)
     {
+        return value;
     }
 
-    public class WhereInputObjectGraphType<TSourceType> : InputObjectGraphType<TSourceType>, IFilterInputObjectGraphType
+    // Applies to all types.
+    public static readonly Dictionary<string, string> EqualityOperators = new()
     {
-        // arguments of typed input graph types return typed object, without additional input fields (_in, _contains,..)
-        // so we return dictionary as it was before.
-        public override object ParseDictionary(IDictionary<string, object> value)
-        {
-            return value;
-        }
+        { "", "is equal to" },
+        { "_not", "is not equal to" },
+    };
 
-        // Applies to all types.
-        public static readonly Dictionary<string, string> EqualityOperators = new()
-        {
-            { "", "is equal to" },
-            { "_not", "is not equal to" },
-        };
+    // Applies to all types.
+    public static readonly Dictionary<string, string> MultiValueComparisonOperators = new()
+    {
+        { "_in", "is in collection" },
+        { "_not_in", "is not in collection" },
+    };
 
-        // Applies to all types.
-        public static readonly Dictionary<string, string> MultiValueComparisonOperators = new()
-        {
-            { "_in", "is in collection" },
-            { "_not_in", "is not in collection" },
-        };
+    // Applies to non strings.
+    public static readonly Dictionary<string, string> NonStringValueComparisonOperators = new()
+    {
+        { "_gt", "is greater than" },
+        { "_gte", "is greater than or equal" },
+        { "_lt", "is less than" },
+        { "_lte", "is less than or equal" },
+    };
+
+    // Applies to strings.
+    public static readonly Dictionary<string, string> StringComparisonOperators = new()
+    {
+        {"_contains", "contains the string"},
+        {"_not_contains", "does not contain the string"},
+        {"_starts_with", "starts with the string"},
+        {"_not_starts_with", "does not start with the string"},
+        {"_ends_with", "ends with the string"},
+        {"_not_ends_with", "does not end with the string"},
+    };
+
+    public virtual void AddScalarFilterFields<TGraphType>(string fieldName, string description)
+    {
+        AddScalarFilterFields(typeof(TGraphType), fieldName, description);
+    }
 
-        // Applies to non strings.
-        public static readonly Dictionary<string, string> NonStringValueComparisonOperators = new()
-        {
-            { "_gt", "is greater than" },
-            { "_gte", "is greater than or equal" },
-            { "_lt", "is less than" },
-            { "_lte", "is less than or equal" },
-        };
-
-        // Applies to strings.
-        public static readonly Dictionary<string, string> StringComparisonOperators = new()
-        {
-            {"_contains", "contains the string"},
-            {"_not_contains", "does not contain the string"},
-            {"_starts_with", "starts with the string"},
-            {"_not_starts_with", "does not start with the string"},
-            {"_ends_with", "ends with the string"},
-            {"_not_ends_with", "does not end with the string"},
-        };
-
-        public virtual void AddScalarFilterFields<TGraphType>(string fieldName, string description)
+    public virtual void AddScalarFilterFields(Type graphType, string fieldName, string description)
+    {
+        if (!typeof(ScalarGraphType).IsAssignableFrom(graphType) &&
+            !typeof(IInputObjectGraphType).IsAssignableFrom(graphType))
         {
-            AddScalarFilterFields(typeof(TGraphType), fieldName, description);
+            return;
         }
 
-        public virtual void AddScalarFilterFields(Type graphType, string fieldName, string description)
-        {
-            if (!typeof(ScalarGraphType).IsAssignableFrom(graphType) &&
-                !typeof(IInputObjectGraphType).IsAssignableFrom(graphType))
-            {
-                return;
-            }
-
-            AddEqualityFilters(graphType, fieldName, description);
-
-            if (graphType == typeof(StringGraphType))
-            {
-                AddMultiValueFilters(graphType, fieldName, description);
-                AddStringFilters(graphType, fieldName, description);
-            }
-            else if (graphType == typeof(DateTimeGraphType) ||
-                graphType == typeof(DateGraphType) ||
-                graphType == typeof(DateOnlyGraphType) ||
-                graphType == typeof(TimeSpanGraphType) ||
-                graphType == typeof(DecimalGraphType) ||
-                graphType == typeof(IntGraphType) ||
-                graphType == typeof(LongGraphType) ||
-                graphType == typeof(FloatGraphType) ||
-                graphType == typeof(BigIntGraphType))
-            {
-                AddMultiValueFilters(graphType, fieldName, description);
-                AddNonStringFilters(graphType, fieldName, description);
-            }
-        }
+        AddEqualityFilters(graphType, fieldName, description);
 
-        private void AddEqualityFilters(Type graphType, string fieldName, string description)
+        if (graphType == typeof(StringGraphType))
         {
-            AddFilterFields(graphType, EqualityOperators, fieldName, description);
+            AddMultiValueFilters(graphType, fieldName, description);
+            AddStringFilters(graphType, fieldName, description);
         }
-
-        private void AddStringFilters(Type graphType, string fieldName, string description)
+        else if (graphType == typeof(DateTimeGraphType) ||
+            graphType == typeof(DateGraphType) ||
+            graphType == typeof(DateOnlyGraphType) ||
+            graphType == typeof(TimeSpanGraphType) ||
+            graphType == typeof(DecimalGraphType) ||
+            graphType == typeof(IntGraphType) ||
+            graphType == typeof(LongGraphType) ||
+            graphType == typeof(FloatGraphType) ||
+            graphType == typeof(BigIntGraphType))
         {
-            AddFilterFields(graphType, StringComparisonOperators, fieldName, description);
+            AddMultiValueFilters(graphType, fieldName, description);
+            AddNonStringFilters(graphType, fieldName, description);
         }
+    }
 
-        private void AddNonStringFilters(Type graphType, string fieldName, string description)
-        {
-            AddFilterFields(graphType, NonStringValueComparisonOperators, fieldName, description);
-        }
+    private void AddEqualityFilters(Type graphType, string fieldName, string description)
+    {
+        AddFilterFields(graphType, EqualityOperators, fieldName, description);
+    }
 
-        private void AddMultiValueFilters(Type graphType, string fieldName, string description)
-        {
-            var wrappedType = typeof(ListGraphType<>).MakeGenericType(graphType);
-            AddFilterFields(wrappedType, MultiValueComparisonOperators, fieldName, description);
-        }
+    private void AddStringFilters(Type graphType, string fieldName, string description)
+    {
+        AddFilterFields(graphType, StringComparisonOperators, fieldName, description);
+    }
 
-        private void AddFilterFields(Type graphType, IDictionary<string, string> filters, string fieldName, string description)
+    private void AddNonStringFilters(Type graphType, string fieldName, string description)
+    {
+        AddFilterFields(graphType, NonStringValueComparisonOperators, fieldName, description);
+    }
+
+    private void AddMultiValueFilters(Type graphType, string fieldName, string description)
+    {
+        var wrappedType = typeof(ListGraphType<>).MakeGenericType(graphType);
+        AddFilterFields(wrappedType, MultiValueComparisonOperators, fieldName, description);
+    }
+
+    private void AddFilterFields(Type graphType, IDictionary<string, string> filters, string fieldName, string description)
+    {
+        foreach (var filter in filters)
         {
-            foreach (var filter in filters)
+            AddField(new FieldType
             {
-                AddField(new FieldType
-                {
-                    Name = fieldName + filter.Key,
-                    Description = $"{description} {filter.Value}",
-                    Type = graphType
-                });
-            }
+                Name = fieldName + filter.Key,
+                Description = $"{description} {filter.Value}",
+                Type = graphType
+            });
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Resolvers/LockedAsyncFieldResolver.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Resolvers/LockedAsyncFieldResolver.cs
index 69ad5cbc625..933f9b2aafd 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Resolvers/LockedAsyncFieldResolver.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Resolvers/LockedAsyncFieldResolver.cs
@@ -3,50 +3,49 @@
 using GraphQL;
 using GraphQL.Resolvers;
 
-namespace OrchardCore.Apis.GraphQL.Resolvers
+namespace OrchardCore.Apis.GraphQL.Resolvers;
+
+public class LockedAsyncFieldResolver<TReturnType> : FuncFieldResolver<TReturnType>
 {
-    public class LockedAsyncFieldResolver<TReturnType> : FuncFieldResolver<TReturnType>
+    public LockedAsyncFieldResolver(Func<IResolveFieldContext, ValueTask<TReturnType>> resolver) : base(resolver)
     {
-        public LockedAsyncFieldResolver(Func<IResolveFieldContext, ValueTask<TReturnType>> resolver) : base(resolver)
-        {
 
-        }
+    }
 
-        public new async ValueTask<object> ResolveAsync(IResolveFieldContext context)
+    public new async ValueTask<object> ResolveAsync(IResolveFieldContext context)
+    {
+        var graphContext = (GraphQLUserContext)context.UserContext;
+        await graphContext.ExecutionContextLock.WaitAsync();
+
+        try
+        {
+            return await base.ResolveAsync(context);
+        }
+        finally
         {
-            var graphContext = (GraphQLUserContext)context.UserContext;
-            await graphContext.ExecutionContextLock.WaitAsync();
-
-            try
-            {
-                return await base.ResolveAsync(context);
-            }
-            finally
-            {
-                graphContext.ExecutionContextLock.Release();
-            }
+            graphContext.ExecutionContextLock.Release();
         }
     }
+}
 
-    public class LockedAsyncFieldResolver<TSourceType, TReturnType> : FuncFieldResolver<TSourceType, TReturnType>
+public class LockedAsyncFieldResolver<TSourceType, TReturnType> : FuncFieldResolver<TSourceType, TReturnType>
+{
+    public LockedAsyncFieldResolver(Func<IResolveFieldContext<TSourceType>, ValueTask<TReturnType>> resolver) : base(resolver)
     {
-        public LockedAsyncFieldResolver(Func<IResolveFieldContext<TSourceType>, ValueTask<TReturnType>> resolver) : base(resolver)
+    }
+
+    public new async Task<object> ResolveAsync(IResolveFieldContext context)
+    {
+        var graphContext = (GraphQLUserContext)context.UserContext;
+        await graphContext.ExecutionContextLock.WaitAsync();
+
+        try
         {
+            return await base.ResolveAsync(context);
         }
-
-        public new async Task<object> ResolveAsync(IResolveFieldContext context)
+        finally
         {
-            var graphContext = (GraphQLUserContext)context.UserContext;
-            await graphContext.ExecutionContextLock.WaitAsync();
-
-            try
-            {
-                return await base.ResolveAsync(context);
-            }
-            finally
-            {
-                graphContext.ExecutionContextLock.Release();
-            }
+            graphContext.ExecutionContextLock.Release();
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/ContentPartBuilder.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/ContentPartBuilder.cs
index 0e67629dc3f..995edadb847 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/ContentPartBuilder.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/ContentPartBuilder.cs
@@ -2,57 +2,56 @@
 using System.Linq;
 using System.Text;
 
-namespace OrchardCore.Apis.GraphQL.Client
+namespace OrchardCore.Apis.GraphQL.Client;
+
+public class ContentPartBuilder
 {
-    public class ContentPartBuilder
+    private readonly string _contentPartName;
+    private readonly Dictionary<string, string> _keysWithValues = [];
+    private readonly List<string> _keys = [];
+
+    public ContentPartBuilder(string contentPartName)
     {
-        private readonly string _contentPartName;
-        private readonly Dictionary<string, string> _keysWithValues = [];
-        private readonly List<string> _keys = [];
+        _contentPartName = contentPartName;
+    }
 
-        public ContentPartBuilder(string contentPartName)
-        {
-            _contentPartName = contentPartName;
-        }
+    public ContentPartBuilder AddField(string name, string value)
+    {
+        _keysWithValues.Add(name.ToGraphQLStringFormat(), value);
 
-        public ContentPartBuilder AddField(string name, string value)
-        {
-            _keysWithValues.Add(name.ToGraphQLStringFormat(), value);
+        return this;
+    }
 
-            return this;
-        }
+    public ContentPartBuilder AddField(string name)
+    {
+        _keys.Add(name);
 
-        public ContentPartBuilder AddField(string name)
-        {
-            _keys.Add(name);
+        return this;
+    }
 
-            return this;
-        }
+    internal string Build()
+    {
+        var sb = new StringBuilder();
+        sb.Append(_contentPartName).Append(": {{ ");
 
-        internal string Build()
+        for (var i = 0; i < _keysWithValues.Count; i++)
         {
-            var sb = new StringBuilder();
-            sb.Append(_contentPartName).Append(": {{ ");
+            var item = _keysWithValues.ElementAt(i);
+            sb.Append(item.Key).Append(": \"").Append(item.Value).Append('"');
 
-            for (var i = 0; i < _keysWithValues.Count; i++)
+            if (i < (_keysWithValues.Count - 1))
             {
-                var item = _keysWithValues.ElementAt(i);
-                sb.Append(item.Key).Append(": \"").Append(item.Value).Append('"');
-
-                if (i < (_keysWithValues.Count - 1))
-                {
-                    sb.Append(' ');
-                }
+                sb.Append(' ');
             }
+        }
 
-            foreach (var item in _keys)
-            {
-                sb.Append(item).Append(' ');
-            }
+        foreach (var item in _keys)
+        {
+            sb.Append(item).Append(' ');
+        }
 
-            sb.Append(" }");
+        sb.Append(" }");
 
-            return sb.ToString();
-        }
+        return sb.ToString();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/ContentResource.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/ContentResource.cs
index c9da9fbd99d..00f62088f4b 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/ContentResource.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/ContentResource.cs
@@ -4,70 +4,69 @@
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Apis.GraphQL.Client
+namespace OrchardCore.Apis.GraphQL.Client;
+
+public class ContentResource
 {
-    public class ContentResource
+    private readonly HttpClient _client;
+
+    public ContentResource(HttpClient client)
     {
-        private readonly HttpClient _client;
+        _client = client;
+    }
 
-        public ContentResource(HttpClient client)
-        {
-            _client = client;
-        }
+    public async Task<JsonObject> Query(string contentType, Action<ContentTypeQueryResourceBuilder> builder)
+    {
+        var contentTypeBuilder = new ContentTypeQueryResourceBuilder(contentType);
+        builder(contentTypeBuilder);
 
-        public async Task<JsonObject> Query(string contentType, Action<ContentTypeQueryResourceBuilder> builder)
+        var requestJson = new JsonObject
         {
-            var contentTypeBuilder = new ContentTypeQueryResourceBuilder(contentType);
-            builder(contentTypeBuilder);
-
-            var requestJson = new JsonObject
-            {
-                ["query"] = @"query { " + contentTypeBuilder.Build() + " }",
-            };
-
-            var response = await _client
-                .PostJsonAsync("api/graphql", requestJson.ToJsonString(JOptions.Default));
+            ["query"] = @"query { " + contentTypeBuilder.Build() + " }",
+        };
 
-            if (!response.IsSuccessStatusCode && response.StatusCode != System.Net.HttpStatusCode.Unauthorized)
-            {
-                throw new Exception(response.StatusCode.ToString() + " " + await response.Content.ReadAsStringAsync());
-            }
+        var response = await _client
+            .PostJsonAsync("api/graphql", requestJson.ToJsonString(JOptions.Default));
 
-            return JObject.Parse(await response.Content.ReadAsStringAsync());
+        if (!response.IsSuccessStatusCode && response.StatusCode != System.Net.HttpStatusCode.Unauthorized)
+        {
+            throw new Exception(response.StatusCode.ToString() + " " + await response.Content.ReadAsStringAsync());
         }
 
-        public async Task<JsonObject> Query(string body)
-        {
-            var requestJson = new JsonObject
-            {
-                ["query"] = @"query { " + body + " }",
-            };
+        return JObject.Parse(await response.Content.ReadAsStringAsync());
+    }
 
-            var response = await _client.PostJsonAsync("api/graphql", requestJson.ToJsonString(JOptions.Default));
+    public async Task<JsonObject> Query(string body)
+    {
+        var requestJson = new JsonObject
+        {
+            ["query"] = @"query { " + body + " }",
+        };
 
-            if (!response.IsSuccessStatusCode)
-            {
-                throw new Exception(response.StatusCode.ToString() + " " + await response.Content.ReadAsStringAsync());
-            }
+        var response = await _client.PostJsonAsync("api/graphql", requestJson.ToJsonString(JOptions.Default));
 
-            return JObject.Parse(await response.Content.ReadAsStringAsync());
+        if (!response.IsSuccessStatusCode)
+        {
+            throw new Exception(response.StatusCode.ToString() + " " + await response.Content.ReadAsStringAsync());
         }
 
-        public async Task<JsonObject> NamedQueryExecute(string name)
-        {
-            var requestJson = new JsonObject
-            {
-                ["namedquery"] = name,
-            };
+        return JObject.Parse(await response.Content.ReadAsStringAsync());
+    }
 
-            var response = await _client.PostJsonAsync("api/graphql", requestJson.ToJsonString(JOptions.Default));
+    public async Task<JsonObject> NamedQueryExecute(string name)
+    {
+        var requestJson = new JsonObject
+        {
+            ["namedquery"] = name,
+        };
 
-            if (!response.IsSuccessStatusCode)
-            {
-                throw new Exception(response.StatusCode.ToString() + " " + await response.Content.ReadAsStringAsync());
-            }
+        var response = await _client.PostJsonAsync("api/graphql", requestJson.ToJsonString(JOptions.Default));
 
-            return JObject.Parse(await response.Content.ReadAsStringAsync());
+        if (!response.IsSuccessStatusCode)
+        {
+            throw new Exception(response.StatusCode.ToString() + " " + await response.Content.ReadAsStringAsync());
         }
+
+        return JObject.Parse(await response.Content.ReadAsStringAsync());
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/ContentTypeCreateResourceBuilder.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/ContentTypeCreateResourceBuilder.cs
index 9f9b981f580..f29704e10e7 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/ContentTypeCreateResourceBuilder.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/ContentTypeCreateResourceBuilder.cs
@@ -1,66 +1,65 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace OrchardCore.Apis.GraphQL.Client
+namespace OrchardCore.Apis.GraphQL.Client;
+
+public class ContentTypeCreateResourceBuilder
 {
-    public class ContentTypeCreateResourceBuilder
+    private readonly Dictionary<string, object> _values = [];
+    private readonly List<ContentPartBuilder> _contentPartBuilders = [];
+
+    private string ContentType { get; set; }
+
+    public ContentTypeCreateResourceBuilder(string contentType)
     {
-        private readonly Dictionary<string, object> _values = [];
-        private readonly List<ContentPartBuilder> _contentPartBuilders = [];
+        ContentType = contentType;
+    }
 
-        private string ContentType { get; set; }
+    public ContentPartBuilder WithContentPart(string contentPartName)
+    {
+        var builder = new ContentPartBuilder(contentPartName.ToGraphQLStringFormat());
+        _contentPartBuilders.Add(builder);
+        return builder;
+    }
 
-        public ContentTypeCreateResourceBuilder(string contentType)
-        {
-            ContentType = contentType;
-        }
+    public ContentTypeCreateResourceBuilder WithField(string key, object value)
+    {
+        _values.Add(key, value);
 
-        public ContentPartBuilder WithContentPart(string contentPartName)
-        {
-            var builder = new ContentPartBuilder(contentPartName.ToGraphQLStringFormat());
-            _contentPartBuilders.Add(builder);
-            return builder;
-        }
+        return this;
+    }
 
-        public ContentTypeCreateResourceBuilder WithField(string key, object value)
-        {
-            _values.Add(key, value);
+    internal string Build()
+    {
+        var sbo = new StringBuilder();
 
-            return this;
-        }
+        sbo.Append(ContentType.ToGraphQLStringFormat()).AppendLine(": {");
 
-        internal string Build()
+        foreach (var value in _values)
         {
-            var sbo = new StringBuilder();
-
-            sbo.Append(ContentType.ToGraphQLStringFormat()).AppendLine(": {");
+            var key = value.Key;
 
-            foreach (var value in _values)
+            if (value.Value is string)
             {
-                var key = value.Key;
-
-                if (value.Value is string)
-                {
-                    sbo.Append(key).Append(": \"").Append(value.Value).Append('"').AppendLine();
-                }
-                else if (value.Value is bool)
-                {
-                    sbo.Append(key).Append(": ").Append(((bool)value.Value).ToString().ToLowerInvariant()).AppendLine();
-                }
-                else
-                {
-                    sbo.Append(key).Append(": ").Append(value.Value).AppendLine();
-                }
+                sbo.Append(key).Append(": \"").Append(value.Value).Append('"').AppendLine();
             }
-
-            for (var i = 0; i < _contentPartBuilders.Count; i++)
+            else if (value.Value is bool)
             {
-                sbo.Append(_contentPartBuilders[i].Build()).AppendLine((i == (_contentPartBuilders.Count - 1)) ? string.Empty : ",");
+                sbo.Append(key).Append(": ").Append(((bool)value.Value).ToString().ToLowerInvariant()).AppendLine();
             }
+            else
+            {
+                sbo.Append(key).Append(": ").Append(value.Value).AppendLine();
+            }
+        }
 
-            sbo.Append('}').AppendLine();
-
-            return sbo.ToString();
+        for (var i = 0; i < _contentPartBuilders.Count; i++)
+        {
+            sbo.Append(_contentPartBuilders[i].Build()).AppendLine((i == (_contentPartBuilders.Count - 1)) ? string.Empty : ",");
         }
+
+        sbo.Append('}').AppendLine();
+
+        return sbo.ToString();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/ContentTypeQueryResourceBuilder.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/ContentTypeQueryResourceBuilder.cs
index f289a172d6d..8c368be4cf5 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/ContentTypeQueryResourceBuilder.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/ContentTypeQueryResourceBuilder.cs
@@ -3,189 +3,188 @@
 using System.Linq;
 using System.Text;
 
-namespace OrchardCore.Apis.GraphQL.Client
+namespace OrchardCore.Apis.GraphQL.Client;
+
+public class ContentTypeQueryResourceBuilder
 {
-    public class ContentTypeQueryResourceBuilder
+    private readonly string _contentType;
+    private readonly List<string> _keys = [];
+    private readonly Dictionary<string, object> _queries = [];
+    private readonly List<ContentTypeQueryResourceBuilder> _nested = [];
+
+    public ContentTypeQueryResourceBuilder(string contentType)
     {
-        private readonly string _contentType;
-        private readonly List<string> _keys = [];
-        private readonly Dictionary<string, object> _queries = [];
-        private readonly List<ContentTypeQueryResourceBuilder> _nested = [];
+        _contentType = contentType.ToGraphQLStringFormat();
+    }
 
-        public ContentTypeQueryResourceBuilder(string contentType)
-        {
-            _contentType = contentType.ToGraphQLStringFormat();
-        }
+    public ContentTypeQueryResourceBuilder WithField(string name)
+    {
+        _keys.Add(name.ToGraphQLStringFormat());
 
-        public ContentTypeQueryResourceBuilder WithField(string name)
-        {
-            _keys.Add(name.ToGraphQLStringFormat());
+        return this;
+    }
 
-            return this;
-        }
+    public ContentTypeQueryResourceBuilder WithNestedField(string fieldName)
+    {
+        var builder = new ContentTypeQueryResourceBuilder(fieldName);
+        _nested.Add(builder);
+        return builder;
+    }
 
-        public ContentTypeQueryResourceBuilder WithNestedField(string fieldName)
+    public ContentTypeQueryResourceBuilder WithQueryArgument(string argument, string value)
+    {
+        if (_queries.ContainsKey(argument))
         {
-            var builder = new ContentTypeQueryResourceBuilder(fieldName);
-            _nested.Add(builder);
-            return builder;
+            throw new Exception($"Argument already exists: {argument}");
         }
-
-        public ContentTypeQueryResourceBuilder WithQueryArgument(string argument, string value)
+        else
         {
-            if (_queries.ContainsKey(argument))
-            {
-                throw new Exception($"Argument already exists: {argument}");
-            }
-            else
-            {
-                _queries.Add(argument, value);
-            }
-
-            return this;
+            _queries.Add(argument, value);
         }
 
-        public ContentTypeQueryResourceBuilder WithQueryStringArgument(string argument, string value)
+        return this;
+    }
+
+    public ContentTypeQueryResourceBuilder WithQueryStringArgument(string argument, string value)
+    {
+        return WithQueryArgument(argument, $"\"{value}\"");
+    }
+
+    public ContentTypeQueryResourceBuilder WithQueryArgument(string argument, string fieldName, string fieldValue)
+    {
+        // Top-level argument exists
+        if (_queries.TryGetValue(argument, out var queryValues) && queryValues is string)
         {
-            return WithQueryArgument(argument, $"\"{value}\"");
+            throw new Exception($"Argument already exists: {argument}");
         }
-
-        public ContentTypeQueryResourceBuilder WithQueryArgument(string argument, string fieldName, string fieldValue)
+        // Field-level argument exists
+        else if (queryValues is IDictionary<string, string>)
         {
-            // Top-level argument exists
-            if (_queries.TryGetValue(argument, out var queryValues) && queryValues is string)
-            {
-                throw new Exception($"Argument already exists: {argument}");
-            }
-            // Field-level argument exists
-            else if (queryValues is IDictionary<string, string>)
-            {
-                ((IDictionary<string, string>)queryValues)
-                    .Add(fieldName.ToGraphQLStringFormat(), fieldValue);
-            }
-            else
+            ((IDictionary<string, string>)queryValues)
+                .Add(fieldName.ToGraphQLStringFormat(), fieldValue);
+        }
+        else
+        {
+            _queries.Add(argument, new Dictionary<string, string>()
             {
-                _queries.Add(argument, new Dictionary<string, string>()
-                {
-                    { fieldName.ToGraphQLStringFormat(),  fieldValue }
-                });
-            }
-
-            return this;
+                { fieldName.ToGraphQLStringFormat(),  fieldValue }
+            });
         }
 
-        public ContentTypeQueryResourceBuilder WithQueryStringArgument(string argument, string fieldName, string fieldValue)
+        return this;
+    }
+
+    public ContentTypeQueryResourceBuilder WithQueryStringArgument(string argument, string fieldName, string fieldValue)
+    {
+        return WithQueryArgument(argument, fieldName, $"\"{fieldValue}\"");
+    }
+
+    public ContentTypeQueryResourceBuilder WithNestedQueryArgument(string argument, string fieldName, string fieldValue)
+    {
+        // Top-level argument exists
+        if (_queries.TryGetValue(argument, out var queryValues) && queryValues is string)
         {
-            return WithQueryArgument(argument, fieldName, $"\"{fieldValue}\"");
+            throw new Exception($"Argument already exists: {argument}");
         }
-
-        public ContentTypeQueryResourceBuilder WithNestedQueryArgument(string argument, string fieldName, string fieldValue)
+        // Field-level argument exists
+        else if (queryValues is IDictionary<string, string>)
         {
-            // Top-level argument exists
-            if (_queries.TryGetValue(argument, out var queryValues) && queryValues is string)
-            {
-                throw new Exception($"Argument already exists: {argument}");
-            }
-            // Field-level argument exists
-            else if (queryValues is IDictionary<string, string>)
-            {
-                ((IDictionary<string, string>)queryValues)
-                    .Add(fieldName.ToGraphQLStringFormat(), $"{{ {fieldValue} }}");
-            }
-            else
+            ((IDictionary<string, string>)queryValues)
+                .Add(fieldName.ToGraphQLStringFormat(), $"{{ {fieldValue} }}");
+        }
+        else
+        {
+            _queries.Add(argument, new Dictionary<string, string>()
             {
-                _queries.Add(argument, new Dictionary<string, string>()
-                {
-                    { fieldName.ToGraphQLStringFormat(),  $"{{ {fieldValue} }}" }
-                });
-            }
-
-            return this;
+                { fieldName.ToGraphQLStringFormat(),  $"{{ {fieldValue} }}" }
+            });
         }
 
-        public string Build()
+        return this;
+    }
+
+    public string Build()
+    {
+        var sb = new StringBuilder(_contentType);
+
+        if (_queries.Count > 0)
         {
-            var sb = new StringBuilder(_contentType);
+            sb.Append('(');
 
-            if (_queries.Count > 0)
+            for (var i = 0; i < _queries.Count; i++)
             {
-                sb.Append('(');
+                var query = _queries.ElementAt(i);
 
-                for (var i = 0; i < _queries.Count; i++)
+                if (i > 0)
                 {
-                    var query = _queries.ElementAt(i);
+                    sb.Append(' ');
+                }
 
-                    if (i > 0)
-                    {
-                        sb.Append(' ');
-                    }
+                // Top-level argument
+                if (query.Value is string)
+                {
+                    sb.Append(query.Key).Append(": ").Append(query.Value);
+                }
+                // Field-level argument
+                else
+                {
+                    sb.Append(query.Key).Append(":{");
 
-                    // Top-level argument
-                    if (query.Value is string)
-                    {
-                        sb.Append(query.Key).Append(": ").Append(query.Value);
-                    }
-                    // Field-level argument
-                    else
+                    var fieldValuePair = (IDictionary<string, string>)query.Value;
+                    for (var c = 0; c < fieldValuePair.Count; c++)
                     {
-                        sb.Append(query.Key).Append(":{");
+                        var item = fieldValuePair.ElementAt(c);
 
-                        var fieldValuePair = (IDictionary<string, string>)query.Value;
-                        for (var c = 0; c < fieldValuePair.Count; c++)
-                        {
-                            var item = fieldValuePair.ElementAt(c);
-
-                            sb.Append(item.Key).Append(": ").Append(item.Value);
-
-                            if (c < (fieldValuePair.Count - 1))
-                            {
-                                sb.Append(", ");
-                            }
-                            else
-                            {
-                                sb.Append('}');
-                            }
-                        }
+                        sb.Append(item.Key).Append(": ").Append(item.Value);
 
-                        if (i < (_queries.Count - 1))
+                        if (c < (fieldValuePair.Count - 1))
                         {
                             sb.Append(", ");
                         }
+                        else
+                        {
+                            sb.Append('}');
+                        }
                     }
-                }
 
-                sb.Append(')');
+                    if (i < (_queries.Count - 1))
+                    {
+                        sb.Append(", ");
+                    }
+                }
             }
 
-            var hasFields = _keys.Count > 0 || _nested.Count > 0;
+            sb.Append(')');
+        }
+
+        var hasFields = _keys.Count > 0 || _nested.Count > 0;
 
-            sb.Append(hasFields ? " { " : " {");
+        sb.Append(hasFields ? " { " : " {");
 
-            sb.AppendJoin(' ', _keys);
+        sb.AppendJoin(' ', _keys);
 
-            if (_nested.Count > 0)
+        if (_nested.Count > 0)
+        {
+            if (_keys.Count > 0)
             {
-                if (_keys.Count > 0)
-                {
-                    sb.Append(' ');
-                }
+                sb.Append(' ');
+            }
 
-                var first = true;
+            var first = true;
 
-                foreach (var item in _nested)
+            foreach (var item in _nested)
+            {
+                if (!first)
                 {
-                    if (!first)
-                    {
-                        sb.Append(' ');
-                    }
-
-                    sb.Append(item.Build());
-                    first = false;
+                    sb.Append(' ');
                 }
-            }
 
-            sb.Append(hasFields ? " }" : "}");
-            return sb.ToString().TrimStart();
+                sb.Append(item.Build());
+                first = false;
+            }
         }
+
+        sb.Append(hasFields ? " }" : "}");
+        return sb.ToString().TrimStart();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/Extensions/HttpContentExtensions.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/Extensions/HttpContentExtensions.cs
index 8ca74596593..b3bd6bab4ab 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/Extensions/HttpContentExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/Extensions/HttpContentExtensions.cs
@@ -3,17 +3,16 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Apis.GraphQL.Client
+namespace OrchardCore.Apis.GraphQL.Client;
+
+internal static class HttpContentExtensions
 {
-    internal static class HttpContentExtensions
+    public static async Task<T> ReadAsAsync<T>(this HttpContent content)
     {
-        public static async Task<T> ReadAsAsync<T>(this HttpContent content)
-        {
-            using var data = await content.ReadAsStreamAsync();
-            return await data.ReadAsAsync<T>();
-        }
-
-        public static ValueTask<T> ReadAsAsync<T>(this Stream stream) =>
-            JsonSerializer.DeserializeAsync<T>(stream, JOptions.Default);
+        using var data = await content.ReadAsStreamAsync();
+        return await data.ReadAsAsync<T>();
     }
+
+    public static ValueTask<T> ReadAsAsync<T>(this Stream stream) =>
+        JsonSerializer.DeserializeAsync<T>(stream, JOptions.Default);
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/Extensions/HttpRequestExtensions.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/Extensions/HttpRequestExtensions.cs
index 91edc714e58..c3d3c0709c8 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/Extensions/HttpRequestExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/Extensions/HttpRequestExtensions.cs
@@ -5,197 +5,196 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Apis.GraphQL.Client
+namespace OrchardCore.Apis.GraphQL.Client;
+
+/// <summary>
+/// The http request extensions.
+/// </summary>
+internal static class HttpRequestExtensions
 {
     /// <summary>
-    /// The http request extensions.
+    /// The patch as json async.
     /// </summary>
-    internal static class HttpRequestExtensions
+    /// <param name="client">
+    /// The client.
+    /// </param>
+    /// <param name="requestUri">
+    /// The request uri.
+    /// </param>
+    /// <param name="value">
+    /// The value.
+    /// </param>
+    /// <param name="options">
+    /// The formatter.
+    /// </param>
+    /// <typeparam name="T">
+    /// </typeparam>
+    /// <returns>
+    /// The <see cref="Task"/>.
+    /// </returns>
+    public static Task<HttpResponseMessage> PatchAsJsonAsync<T>(
+        this HttpClient client,
+        string requestUri,
+        T value,
+        JsonSerializerOptions options = null)
     {
-        /// <summary>
-        /// The patch as json async.
-        /// </summary>
-        /// <param name="client">
-        /// The client.
-        /// </param>
-        /// <param name="requestUri">
-        /// The request uri.
-        /// </param>
-        /// <param name="value">
-        /// The value.
-        /// </param>
-        /// <param name="options">
-        /// The formatter.
-        /// </param>
-        /// <typeparam name="T">
-        /// </typeparam>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        public static Task<HttpResponseMessage> PatchAsJsonAsync<T>(
-            this HttpClient client,
-            string requestUri,
-            T value,
-            JsonSerializerOptions options = null)
-        {
-            var content = new StringContent(
-                JConvert.SerializeObject(value, options),
-                Encoding.UTF8,
-                "application/json");
-
-            return PatchAsync(client, requestUri, content);
-        }
-
-        /// <summary>
-        /// The patch async.
-        /// </summary>
-        /// <param name="client">
-        /// The client.
-        /// </param>
-        /// <param name="requestUri">
-        /// The request uri.
-        /// </param>
-        /// <param name="content">
-        /// The content.
-        /// </param>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        public static Task<HttpResponseMessage> PatchAsync(
-            this HttpClient client,
-            string requestUri,
-            HttpContent content)
-        {
-            var request = new HttpRequestMessage
-            {
-                Method = new HttpMethod("PATCH"),
-                RequestUri = new Uri(client.BaseAddress + requestUri),
-                Content = content
-            };
-
-            request.Headers.ExpectContinue = false;
-            return client.SendAsync(request);
-        }
-
-        /// <summary>
-        /// The put as json async.
-        /// </summary>
-        /// <param name="client">
-        /// The client.
-        /// </param>
-        /// <param name="requestUri">
-        /// The request uri.
-        /// </param>
-        /// <param name="value">
-        /// The value.
-        /// </param>
-        /// <param name="options">
-        /// The formatter.
-        /// </param>
-        /// <typeparam name="T">
-        /// </typeparam>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        public static Task<HttpResponseMessage> PutAsJsonAsync<T>(
-            this HttpClient client,
-            string requestUri,
-            T value,
-            JsonSerializerOptions options = null)
+        var content = new StringContent(
+            JConvert.SerializeObject(value, options),
+            Encoding.UTF8,
+            "application/json");
+
+        return PatchAsync(client, requestUri, content);
+    }
+
+    /// <summary>
+    /// The patch async.
+    /// </summary>
+    /// <param name="client">
+    /// The client.
+    /// </param>
+    /// <param name="requestUri">
+    /// The request uri.
+    /// </param>
+    /// <param name="content">
+    /// The content.
+    /// </param>
+    /// <returns>
+    /// The <see cref="Task"/>.
+    /// </returns>
+    public static Task<HttpResponseMessage> PatchAsync(
+        this HttpClient client,
+        string requestUri,
+        HttpContent content)
+    {
+        var request = new HttpRequestMessage
         {
-            var content = new StringContent(
-                JConvert.SerializeObject(value, options),
-                Encoding.UTF8,
-                "application/json");
-
-            return client.PutAsync(requestUri, content);
-        }
-
-        /// <summary>
-        /// PostAsJsonAsync.
-        /// </summary>
-        /// <param name="client">
-        /// The client.
-        /// </param>
-        /// <param name="requestUri">
-        /// The request uri.
-        /// </param>
-        /// <param name="value">
-        /// The value.
-        /// </param>
-        /// <param name="options">
-        /// The formatter.
-        /// </param>
-        /// <typeparam name="T">
-        /// </typeparam>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        public static Task<HttpResponseMessage> PostAsJsonAsync<T>(
-            this HttpClient client,
-            string requestUri,
-            T value,
-            JsonSerializerOptions options = null)
+            Method = new HttpMethod("PATCH"),
+            RequestUri = new Uri(client.BaseAddress + requestUri),
+            Content = content
+        };
+
+        request.Headers.ExpectContinue = false;
+        return client.SendAsync(request);
+    }
+
+    /// <summary>
+    /// The put as json async.
+    /// </summary>
+    /// <param name="client">
+    /// The client.
+    /// </param>
+    /// <param name="requestUri">
+    /// The request uri.
+    /// </param>
+    /// <param name="value">
+    /// The value.
+    /// </param>
+    /// <param name="options">
+    /// The formatter.
+    /// </param>
+    /// <typeparam name="T">
+    /// </typeparam>
+    /// <returns>
+    /// The <see cref="Task"/>.
+    /// </returns>
+    public static Task<HttpResponseMessage> PutAsJsonAsync<T>(
+        this HttpClient client,
+        string requestUri,
+        T value,
+        JsonSerializerOptions options = null)
+    {
+        var content = new StringContent(
+            JConvert.SerializeObject(value, options),
+            Encoding.UTF8,
+            "application/json");
+
+        return client.PutAsync(requestUri, content);
+    }
+
+    /// <summary>
+    /// PostAsJsonAsync.
+    /// </summary>
+    /// <param name="client">
+    /// The client.
+    /// </param>
+    /// <param name="requestUri">
+    /// The request uri.
+    /// </param>
+    /// <param name="value">
+    /// The value.
+    /// </param>
+    /// <param name="options">
+    /// The formatter.
+    /// </param>
+    /// <typeparam name="T">
+    /// </typeparam>
+    /// <returns>
+    /// The <see cref="Task"/>.
+    /// </returns>
+    public static Task<HttpResponseMessage> PostAsJsonAsync<T>(
+        this HttpClient client,
+        string requestUri,
+        T value,
+        JsonSerializerOptions options = null)
+    {
+        var content = new StringContent(
+            JConvert.SerializeObject(value, options),
+            Encoding.UTF8,
+            "application/json");
+
+        var request = new HttpRequestMessage(HttpMethod.Post, requestUri)
         {
-            var content = new StringContent(
-                JConvert.SerializeObject(value, options),
-                Encoding.UTF8,
-                "application/json");
-
-            var request = new HttpRequestMessage(HttpMethod.Post, requestUri)
-            {
-                Content = content,
-            };
-
-            request.Headers
-                .Accept
-                .Add(new MediaTypeWithQualityHeaderValue("application/json"));
-
-            return client.SendAsync(request);
-        }
-
-        public static Task<HttpResponseMessage> PostJsonAsync(
-            this HttpClient client,
-            string requestUri,
-            string json)
+            Content = content,
+        };
+
+        request.Headers
+            .Accept
+            .Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+        return client.SendAsync(request);
+    }
+
+    public static Task<HttpResponseMessage> PostJsonAsync(
+        this HttpClient client,
+        string requestUri,
+        string json)
+    {
+        var content = new StringContent(
+            json,
+            Encoding.UTF8,
+            "application/json");
+
+        var request = new HttpRequestMessage(HttpMethod.Post, requestUri)
         {
-            var content = new StringContent(
-                json,
-                Encoding.UTF8,
-                "application/json");
-
-            var request = new HttpRequestMessage(HttpMethod.Post, requestUri)
-            {
-                Content = content,
-            };
-
-            request.Headers
-                .Accept
-                .Add(new MediaTypeWithQualityHeaderValue("application/json"));
-
-            return client.SendAsync(request);
-        }
-
-        public static Task<HttpResponseMessage> PostJsonApiAsync(
-            this HttpClient client,
-            string requestUri,
-            string json)
+            Content = content,
+        };
+
+        request.Headers
+            .Accept
+            .Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+        return client.SendAsync(request);
+    }
+
+    public static Task<HttpResponseMessage> PostJsonApiAsync(
+        this HttpClient client,
+        string requestUri,
+        string json)
+    {
+        var content = new StringContent(
+            json,
+            Encoding.UTF8,
+            "application/vnd.api+json");
+
+        var request = new HttpRequestMessage(HttpMethod.Post, requestUri)
         {
-            var content = new StringContent(
-                json,
-                Encoding.UTF8,
-                "application/vnd.api+json");
-
-            var request = new HttpRequestMessage(HttpMethod.Post, requestUri)
-            {
-                Content = content,
-            };
-
-            request.Headers
-                .Accept
-                .Add(new MediaTypeWithQualityHeaderValue("application/vnd.api+json"));
-
-            return client.SendAsync(request);
-        }
+            Content = content,
+        };
+
+        request.Headers
+            .Accept
+            .Add(new MediaTypeWithQualityHeaderValue("application/vnd.api+json"));
+
+        return client.SendAsync(request);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/OrchardGraphQLClient.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/OrchardGraphQLClient.cs
index f021bdede5f..4ab61d2a492 100644
--- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/OrchardGraphQLClient.cs
+++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Client/OrchardGraphQLClient.cs
@@ -1,13 +1,12 @@
 using System.Net.Http;
 
-namespace OrchardCore.Apis.GraphQL.Client
+namespace OrchardCore.Apis.GraphQL.Client;
+
+public class OrchardGraphQLClient
 {
-    public class OrchardGraphQLClient
-    {
-        public OrchardGraphQLClient(HttpClient client) => Client = client;
+    public OrchardGraphQLClient(HttpClient client) => Client = client;
 
-        public ContentResource Content => new(Client);
+    public ContentResource Content => new(Client);
 
-        public HttpClient Client { get; }
-    }
+    public HttpClient Client { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Application.Cms.Core.Targets/ServiceExtensions.cs b/src/OrchardCore/OrchardCore.Application.Cms.Core.Targets/ServiceExtensions.cs
index 3d570d6d85f..0c5bf4a5774 100644
--- a/src/OrchardCore/OrchardCore.Application.Cms.Core.Targets/ServiceExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Application.Cms.Core.Targets/ServiceExtensions.cs
@@ -1,64 +1,63 @@
 using System;
 using OrchardCore.ResourceManagement.TagHelpers;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class ServiceExtensions
 {
-    public static class ServiceExtensions
+    /// <summary>
+    /// Adds Orchard CMS services to the application.
+    /// </summary>
+    public static OrchardCoreBuilder AddOrchardCms(this IServiceCollection services)
     {
-        /// <summary>
-        /// Adds Orchard CMS services to the application.
-        /// </summary>
-        public static OrchardCoreBuilder AddOrchardCms(this IServiceCollection services)
-        {
-            ArgumentNullException.ThrowIfNull(services);
+        ArgumentNullException.ThrowIfNull(services);
 
-            var builder = services.AddOrchardCore()
+        var builder = services.AddOrchardCore()
 
-                .AddCommands()
+            .AddCommands()
 
-                .AddSecurity()
-                .AddMvc()
-                .AddIdGeneration()
-                .AddEmailAddressValidator()
-                .AddHtmlSanitizer()
-                .AddSetupFeatures("OrchardCore.Setup")
+            .AddSecurity()
+            .AddMvc()
+            .AddIdGeneration()
+            .AddEmailAddressValidator()
+            .AddHtmlSanitizer()
+            .AddSetupFeatures("OrchardCore.Setup")
 
-                .AddDataAccess()
-                .AddDataStorage()
-                .AddBackgroundService()
-                .AddScripting()
+            .AddDataAccess()
+            .AddDataStorage()
+            .AddBackgroundService()
+            .AddScripting()
 
-                .AddTheming()
-                .AddLiquidViews()
-                .AddCaching();
+            .AddTheming()
+            .AddLiquidViews()
+            .AddCaching();
 
-            // OrchardCoreBuilder is not available in OrchardCore.ResourceManagement as it has to
-            // remain independent from OrchardCore.
-            builder.ConfigureServices(s =>
-            {
-                s.AddResourceManagement();
+        // OrchardCoreBuilder is not available in OrchardCore.ResourceManagement as it has to
+        // remain independent from OrchardCore.
+        builder.ConfigureServices(s =>
+        {
+            s.AddResourceManagement();
 
-                s.AddTagHelpers<LinkTagHelper>();
-                s.AddTagHelpers<MetaTagHelper>();
-                s.AddTagHelpers<ResourcesTagHelper>();
-                s.AddTagHelpers<ScriptTagHelper>();
-                s.AddTagHelpers<StyleTagHelper>();
-            });
+            s.AddTagHelpers<LinkTagHelper>();
+            s.AddTagHelpers<MetaTagHelper>();
+            s.AddTagHelpers<ResourcesTagHelper>();
+            s.AddTagHelpers<ScriptTagHelper>();
+            s.AddTagHelpers<StyleTagHelper>();
+        });
 
-            return builder;
-        }
+        return builder;
+    }
 
-        /// <summary>
-        /// Adds Orchard CMS services to the application and let the app change the
-        /// default tenant behavior and set of features through a configure action.
-        /// </summary>
-        public static IServiceCollection AddOrchardCms(this IServiceCollection services, Action<OrchardCoreBuilder> configure)
-        {
-            var builder = services.AddOrchardCms();
+    /// <summary>
+    /// Adds Orchard CMS services to the application and let the app change the
+    /// default tenant behavior and set of features through a configure action.
+    /// </summary>
+    public static IServiceCollection AddOrchardCms(this IServiceCollection services, Action<OrchardCoreBuilder> configure)
+    {
+        var builder = services.AddOrchardCms();
 
-            configure?.Invoke(builder);
+        configure?.Invoke(builder);
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Drivers/AuditTrailEventSectionDisplayDriver.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Drivers/AuditTrailEventSectionDisplayDriver.cs
index 78d67b58b78..8e91cd086e1 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Drivers/AuditTrailEventSectionDisplayDriver.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Drivers/AuditTrailEventSectionDisplayDriver.cs
@@ -1,18 +1,17 @@
 using OrchardCore.AuditTrail.Models;
 using OrchardCore.DisplayManagement.Entities;
 
-namespace OrchardCore.AuditTrail.Drivers
+namespace OrchardCore.AuditTrail.Drivers;
+
+/// <summary>
+/// A concrete implementation of this class will be able to take part in the rendering of an <see cref="AuditTrailEvent"/>
+/// shape instance for a specific section of the <see cref="AuditTrailEvent"/>. A section represents a property of an entity instance
+/// where the name of the property is the type of the section.
+/// </summary>
+/// <typeparam name="TSection">The type of the section this driver handles.</typeparam>
+public abstract class AuditTrailEventSectionDisplayDriver<TSection> : SectionDisplayDriver<AuditTrailEvent, TSection>
+    where TSection : new()
 {
-    /// <summary>
-    /// A concrete implementation of this class will be able to take part in the rendering of an <see cref="AuditTrailEvent"/>
-    /// shape instance for a specific section of the <see cref="AuditTrailEvent"/>. A section represents a property of an entity instance
-    /// where the name of the property is the type of the section.
-    /// </summary>
-    /// <typeparam name="TSection">The type of the section this driver handles.</typeparam>
-    public abstract class AuditTrailEventSectionDisplayDriver<TSection> : SectionDisplayDriver<AuditTrailEvent, TSection>
-        where TSection : new()
-    {
-        public override bool CanHandleModel(AuditTrailEvent auditTrailEvent)
-            => auditTrailEvent.Properties.ContainsKey(PropertyName);
-    }
+    public override bool CanHandleModel(AuditTrailEvent auditTrailEvent)
+        => auditTrailEvent.Properties.ContainsKey(PropertyName);
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Indexes/AuditTrailEventIndex.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Indexes/AuditTrailEventIndex.cs
index a6790b5e931..b4446a5d5ee 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Indexes/AuditTrailEventIndex.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Indexes/AuditTrailEventIndex.cs
@@ -1,19 +1,18 @@
 using System;
 using YesSql.Indexes;
 
-namespace OrchardCore.AuditTrail.Indexes
+namespace OrchardCore.AuditTrail.Indexes;
+
+/// <summary>
+/// Used to index the generic Audit Trail Events.
+/// </summary>
+public class AuditTrailEventIndex : MapIndex
 {
-    /// <summary>
-    /// Used to index the generic Audit Trail Events.
-    /// </summary>
-    public class AuditTrailEventIndex : MapIndex
-    {
-        public string EventId { get; set; }
-        public string Category { get; set; }
-        public string Name { get; set; }
-        public string CorrelationId { get; set; }
-        public string UserId { get; set; }
-        public string NormalizedUserName { get; set; }
-        public DateTime CreatedUtc { get; set; }
-    }
+    public string EventId { get; set; }
+    public string Category { get; set; }
+    public string Name { get; set; }
+    public string CorrelationId { get; set; }
+    public string UserId { get; set; }
+    public string NormalizedUserName { get; set; }
+    public DateTime CreatedUtc { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Models/AuditTrailEvent.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Models/AuditTrailEvent.cs
index 2532699726f..b6a97a543d1 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Models/AuditTrailEvent.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Models/AuditTrailEvent.cs
@@ -1,58 +1,57 @@
 using System;
 using OrchardCore.Entities;
 
-namespace OrchardCore.AuditTrail.Models
+namespace OrchardCore.AuditTrail.Models;
+
+public class AuditTrailEvent : Entity
 {
-    public class AuditTrailEvent : Entity
-    {
-        /// <summary>
-        /// The name of the collection that is used for this type.
-        /// </summary>
-        public const string Collection = "Audit";
-
-        /// <summary>
-        /// The ID of the event.
-        /// </summary>
-        public string EventId { get; set; }
-
-        /// <summary>
-        /// The event name.
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// The category the event belongs to.
-        /// </summary>
-        public string Category { get; set; }
-
-        /// <summary>
-        /// The correlation id used to associate an event to e.g. a content item.
-        /// </summary>
-        public string CorrelationId { get; set; }
-
-        /// <summary>
-        /// The user id of the user who caused the event to occur.
-        /// </summary>
-        public string UserId { get; set; }
-
-        /// <summary>
-        /// The user name of the user who caused the event to occur.
-        /// </summary>
-        public string UserName { get; set; }
-
-        /// <summary>
-        /// The normalized user name of the user who caused the event to occur.
-        /// </summary>
-        public string NormalizedUserName { get; set; }
-
-        /// <summary>
-        /// The IP address of the user who caused the event to occur.
-        /// </summary>
-        public string ClientIpAddress { get; set; }
-
-        /// <summary>
-        /// The date and time when the event occurred.
-        /// </summary>
-        public DateTime CreatedUtc { get; set; }
-    }
+    /// <summary>
+    /// The name of the collection that is used for this type.
+    /// </summary>
+    public const string Collection = "Audit";
+
+    /// <summary>
+    /// The ID of the event.
+    /// </summary>
+    public string EventId { get; set; }
+
+    /// <summary>
+    /// The event name.
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// The category the event belongs to.
+    /// </summary>
+    public string Category { get; set; }
+
+    /// <summary>
+    /// The correlation id used to associate an event to e.g. a content item.
+    /// </summary>
+    public string CorrelationId { get; set; }
+
+    /// <summary>
+    /// The user id of the user who caused the event to occur.
+    /// </summary>
+    public string UserId { get; set; }
+
+    /// <summary>
+    /// The user name of the user who caused the event to occur.
+    /// </summary>
+    public string UserName { get; set; }
+
+    /// <summary>
+    /// The normalized user name of the user who caused the event to occur.
+    /// </summary>
+    public string NormalizedUserName { get; set; }
+
+    /// <summary>
+    /// The IP address of the user who caused the event to occur.
+    /// </summary>
+    public string ClientIpAddress { get; set; }
+
+    /// <summary>
+    /// The date and time when the event occurred.
+    /// </summary>
+    public DateTime CreatedUtc { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/AuditTrailEventHandlerBase.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/AuditTrailEventHandlerBase.cs
index 0be2a11df6b..57e847da265 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/AuditTrailEventHandlerBase.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/AuditTrailEventHandlerBase.cs
@@ -2,11 +2,10 @@
 using OrchardCore.AuditTrail.Models;
 using OrchardCore.AuditTrail.Services.Models;
 
-namespace OrchardCore.AuditTrail.Services
+namespace OrchardCore.AuditTrail.Services;
+
+public class AuditTrailEventHandlerBase : IAuditTrailEventHandler
 {
-    public class AuditTrailEventHandlerBase : IAuditTrailEventHandler
-    {
-        public virtual Task CreateAsync(AuditTrailCreateContext context) => Task.CompletedTask;
-        public virtual Task AlterAsync(AuditTrailCreateContext context, AuditTrailEvent auditTrailEvent) => Task.CompletedTask;
-    }
+    public virtual Task CreateAsync(AuditTrailCreateContext context) => Task.CompletedTask;
+    public virtual Task AlterAsync(AuditTrailCreateContext context, AuditTrailEvent auditTrailEvent) => Task.CompletedTask;
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/AuditTrailFilterEngineModelBinder.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/AuditTrailFilterEngineModelBinder.cs
index c910193e644..5bc36ddc1b5 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/AuditTrailFilterEngineModelBinder.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/AuditTrailFilterEngineModelBinder.cs
@@ -2,41 +2,40 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.AuditTrail.Services
+namespace OrchardCore.AuditTrail.Services;
+
+public class AuditTrailFilterEngineModelBinder : IModelBinder
 {
-    public class AuditTrailFilterEngineModelBinder : IModelBinder
-    {
-        private readonly IAuditTrailAdminListFilterParser _parser;
+    private readonly IAuditTrailAdminListFilterParser _parser;
 
-        public AuditTrailFilterEngineModelBinder(IAuditTrailAdminListFilterParser parser)
-        {
-            _parser = parser;
-        }
+    public AuditTrailFilterEngineModelBinder(IAuditTrailAdminListFilterParser parser)
+    {
+        _parser = parser;
+    }
 
-        public Task BindModelAsync(ModelBindingContext bindingContext)
-        {
-            ArgumentNullException.ThrowIfNull(bindingContext);
+    public Task BindModelAsync(ModelBindingContext bindingContext)
+    {
+        ArgumentNullException.ThrowIfNull(bindingContext);
 
-            var modelName = bindingContext.ModelName;
+        var modelName = bindingContext.ModelName;
 
-            // Try to fetch the value of the argument by name q=
-            var valueProviderResult = bindingContext.ValueProvider.GetValue(modelName);
+        // Try to fetch the value of the argument by name q=
+        var valueProviderResult = bindingContext.ValueProvider.GetValue(modelName);
 
-            if (valueProviderResult == ValueProviderResult.None)
-            {
-                bindingContext.Result = ModelBindingResult.Success(_parser.Parse(string.Empty));
+        if (valueProviderResult == ValueProviderResult.None)
+        {
+            bindingContext.Result = ModelBindingResult.Success(_parser.Parse(string.Empty));
 
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            bindingContext.ModelState.SetModelValue(modelName, valueProviderResult);
+        bindingContext.ModelState.SetModelValue(modelName, valueProviderResult);
 
-            var value = valueProviderResult.FirstValue;
+        var value = valueProviderResult.FirstValue;
 
-            // When value is null or empty the parser returns an empty result.
-            bindingContext.Result = ModelBindingResult.Success(_parser.Parse(value));
+        // When value is null or empty the parser returns an empty result.
+        bindingContext.Result = ModelBindingResult.Success(_parser.Parse(value));
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/AuditTrailQueryContext.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/AuditTrailQueryContext.cs
index a0e8390c7c8..e3f9ed87ef9 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/AuditTrailQueryContext.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/AuditTrailQueryContext.cs
@@ -3,15 +3,14 @@
 using YesSql;
 using YesSql.Filters.Query.Services;
 
-namespace OrchardCore.AuditTrail.Services
+namespace OrchardCore.AuditTrail.Services;
+
+public class AuditTrailQueryContext : QueryExecutionContext<AuditTrailEvent>
 {
-    public class AuditTrailQueryContext : QueryExecutionContext<AuditTrailEvent>
+    public AuditTrailQueryContext(IServiceProvider serviceProvider, IQuery<AuditTrailEvent> query) : base(query)
     {
-        public AuditTrailQueryContext(IServiceProvider serviceProvider, IQuery<AuditTrailEvent> query) : base(query)
-        {
-            ServiceProvider = serviceProvider;
-        }
-
-        public IServiceProvider ServiceProvider { get; }
+        ServiceProvider = serviceProvider;
     }
+
+    public IServiceProvider ServiceProvider { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailAdminListFilterParser.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailAdminListFilterParser.cs
index dafc708dd09..9c3d4744a43 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailAdminListFilterParser.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailAdminListFilterParser.cs
@@ -1,9 +1,8 @@
 using OrchardCore.AuditTrail.Models;
 using YesSql.Filters.Query;
 
-namespace OrchardCore.AuditTrail.Services
+namespace OrchardCore.AuditTrail.Services;
+
+public interface IAuditTrailAdminListFilterParser : IQueryParser<AuditTrailEvent>
 {
-    public interface IAuditTrailAdminListFilterParser : IQueryParser<AuditTrailEvent>
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailAdminListFilterProvider.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailAdminListFilterProvider.cs
index d2710837536..32a6e49eac6 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailAdminListFilterProvider.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailAdminListFilterProvider.cs
@@ -1,10 +1,9 @@
 using OrchardCore.AuditTrail.Models;
 using YesSql.Filters.Query;
 
-namespace OrchardCore.AuditTrail.Services
+namespace OrchardCore.AuditTrail.Services;
+
+public interface IAuditTrailAdminListFilterProvider
 {
-    public interface IAuditTrailAdminListFilterProvider
-    {
-        void Build(QueryEngineBuilder<AuditTrailEvent> builder);
-    }
+    void Build(QueryEngineBuilder<AuditTrailEvent> builder);
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailAdminListQueryService.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailAdminListQueryService.cs
index f4928f4cc8e..a238a92b8aa 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailAdminListQueryService.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailAdminListQueryService.cs
@@ -2,16 +2,15 @@
 using OrchardCore.AuditTrail.Services.Models;
 using OrchardCore.AuditTrail.ViewModels;
 
-namespace OrchardCore.AuditTrail.Services
+namespace OrchardCore.AuditTrail.Services;
+
+public interface IAuditTrailAdminListQueryService
 {
-    public interface IAuditTrailAdminListQueryService
-    {
-        /// <summary>
-        /// Queries a page of audit trail events.
-        /// </summary>
-        /// <param name="page">The page number to get events from.</param>
-        /// <param name="pageSize">The number of events to get.</param>
-        /// <param name="options">The filter options.</param>
-        Task<AuditTrailEventQueryResult> QueryAsync(int page, int pageSize, AuditTrailIndexOptions options);
-    }
+    /// <summary>
+    /// Queries a page of audit trail events.
+    /// </summary>
+    /// <param name="page">The page number to get events from.</param>
+    /// <param name="pageSize">The number of events to get.</param>
+    /// <param name="options">The filter options.</param>
+    Task<AuditTrailEventQueryResult> QueryAsync(int page, int pageSize, AuditTrailIndexOptions options);
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailEventHandler.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailEventHandler.cs
index b5e0ced5ad4..2ec51c73358 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailEventHandler.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailEventHandler.cs
@@ -2,21 +2,20 @@
 using OrchardCore.AuditTrail.Models;
 using OrchardCore.AuditTrail.Services.Models;
 
-namespace OrchardCore.AuditTrail.Services
+namespace OrchardCore.AuditTrail.Services;
+
+/// <summary>
+/// Describes an event handler participating in Audit Trail management.
+/// </summary>
+public interface IAuditTrailEventHandler
 {
     /// <summary>
-    /// Describes an event handler participating in Audit Trail management.
+    /// Modifies the context when creating an Audit Trail event.
     /// </summary>
-    public interface IAuditTrailEventHandler
-    {
-        /// <summary>
-        /// Modifies the context when creating an Audit Trail event.
-        /// </summary>
-        Task CreateAsync(AuditTrailCreateContext context);
+    Task CreateAsync(AuditTrailCreateContext context);
 
-        /// <summary>
-        /// Alters an Audit Trail event after it has been built and before saving it.
-        /// </summary>
-        Task AlterAsync(AuditTrailCreateContext context, AuditTrailEvent auditTrailEvent);
-    }
+    /// <summary>
+    /// Alters an Audit Trail event after it has been built and before saving it.
+    /// </summary>
+    Task AlterAsync(AuditTrailCreateContext context, AuditTrailEvent auditTrailEvent);
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailIdGenerator.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailIdGenerator.cs
index e8b9ce1e554..2acddc5bab1 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailIdGenerator.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailIdGenerator.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.AuditTrail.Services
+namespace OrchardCore.AuditTrail.Services;
+
+public interface IAuditTrailIdGenerator
 {
-    public interface IAuditTrailIdGenerator
-    {
-        string GenerateUniqueId();
-    }
+    string GenerateUniqueId();
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailManager.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailManager.cs
index ed7f5e8d03c..bbb4520c6c0 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailManager.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/IAuditTrailManager.cs
@@ -4,50 +4,49 @@
 using OrchardCore.AuditTrail.Models;
 using OrchardCore.AuditTrail.Services.Models;
 
-namespace OrchardCore.AuditTrail.Services
+namespace OrchardCore.AuditTrail.Services;
+
+/// <summary>
+/// Describes a service managing audit trail events.
+/// </summary>
+public interface IAuditTrailManager
 {
     /// <summary>
-    /// Describes a service managing audit trail events.
+    /// Records an audit trail event.
     /// </summary>
-    public interface IAuditTrailManager
-    {
-        /// <summary>
-        /// Records an audit trail event.
-        /// </summary>
-        /// <param name="context">The <see cref="AuditTrailContext{TEvent}"/> used to create a new event.</param>
-        Task RecordEventAsync<TEvent>(AuditTrailContext<TEvent> context) where TEvent : class, new();
+    /// <param name="context">The <see cref="AuditTrailContext{TEvent}"/> used to create a new event.</param>
+    Task RecordEventAsync<TEvent>(AuditTrailContext<TEvent> context) where TEvent : class, new();
 
-        /// <summary>
-        /// Gets a single audit trail event by ID.
-        /// </summary>
-        /// <param name="eventId">The event ID.</param>
-        /// <returns>The <see cref="AuditTrailEvent"/>.</returns>
-        Task<AuditTrailEvent> GetEventAsync(string eventId);
+    /// <summary>
+    /// Gets a single audit trail event by ID.
+    /// </summary>
+    /// <param name="eventId">The event ID.</param>
+    /// <returns>The <see cref="AuditTrailEvent"/>.</returns>
+    Task<AuditTrailEvent> GetEventAsync(string eventId);
 
-        /// <summary>
-        /// Trims the audit trail by deleting all events older than the specified retention period.
-        /// </summary>
-        /// <returns>The number of the deleted events.</returns>
-        Task<int> TrimEventsAsync(TimeSpan retentionPeriod);
+    /// <summary>
+    /// Trims the audit trail by deleting all events older than the specified retention period.
+    /// </summary>
+    /// <returns>The number of the deleted events.</returns>
+    Task<int> TrimEventsAsync(TimeSpan retentionPeriod);
 
-        /// <summary>
-        /// Describes a single audit trail event.
-        /// </summary>
-        /// <param name="auditTrailEvent">The <see cref="AuditTrailEvent"/> to describe.</param>
-        /// <returns>The <see cref="AuditTrailEventDescriptor"/>.</returns>
-        AuditTrailEventDescriptor DescribeEvent(AuditTrailEvent auditTrailEvent);
+    /// <summary>
+    /// Describes a single audit trail event.
+    /// </summary>
+    /// <param name="auditTrailEvent">The <see cref="AuditTrailEvent"/> to describe.</param>
+    /// <returns>The <see cref="AuditTrailEventDescriptor"/>.</returns>
+    AuditTrailEventDescriptor DescribeEvent(AuditTrailEvent auditTrailEvent);
 
-        /// <summary>
-        /// Describes all audit trail event categories.
-        /// </summary>
-        /// <returns>The list of <see cref="AuditTrailCategoryDescriptor"/>.</returns>
-        IEnumerable<AuditTrailCategoryDescriptor> DescribeCategories();
+    /// <summary>
+    /// Describes all audit trail event categories.
+    /// </summary>
+    /// <returns>The list of <see cref="AuditTrailCategoryDescriptor"/>.</returns>
+    IEnumerable<AuditTrailCategoryDescriptor> DescribeCategories();
 
-        /// <summary>
-        /// Describes a single audit trail event category.
-        /// </summary>
-        /// <param name="name">The category name.</param>
-        /// <returns>The <see cref="AuditTrailCategoryDescriptor"/>.</returns>
-        AuditTrailCategoryDescriptor DescribeCategory(string name);
-    }
+    /// <summary>
+    /// Describes a single audit trail event category.
+    /// </summary>
+    /// <param name="name">The category name.</param>
+    /// <returns>The <see cref="AuditTrailCategoryDescriptor"/>.</returns>
+    AuditTrailCategoryDescriptor DescribeCategory(string name);
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailAdminListOption.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailAdminListOption.cs
index 2f63e6bf8ad..42c67936f8a 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailAdminListOption.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailAdminListOption.cs
@@ -6,28 +6,27 @@
 using YesSql;
 using YesSql.Filters.Query.Services;
 
-namespace OrchardCore.AuditTrail.Services.Models
+namespace OrchardCore.AuditTrail.Services.Models;
+
+public class AuditTrailAdminListOption
 {
-    public class AuditTrailAdminListOption
+    public AuditTrailAdminListOption(
+        string value,
+        Func<string, IQuery<AuditTrailEvent>, QueryExecutionContext<AuditTrailEvent>, ValueTask<IQuery<AuditTrailEvent>>> query,
+        Func<IServiceProvider, AuditTrailAdminListOption, AuditTrailIndexOptions, SelectListItem> selectListItem,
+        bool isDefault)
     {
-        public AuditTrailAdminListOption(
-            string value,
-            Func<string, IQuery<AuditTrailEvent>, QueryExecutionContext<AuditTrailEvent>, ValueTask<IQuery<AuditTrailEvent>>> query,
-            Func<IServiceProvider, AuditTrailAdminListOption, AuditTrailIndexOptions, SelectListItem> selectListItem,
-            bool isDefault)
-        {
-            ArgumentNullException.ThrowIfNull(value);
-            ArgumentNullException.ThrowIfNull(query);
-
-            Value = value;
-            Query = query;
-            SelectListItem = selectListItem;
-            IsDefault = isDefault;
-        }
+        ArgumentNullException.ThrowIfNull(value);
+        ArgumentNullException.ThrowIfNull(query);
 
-        public string Value { get; }
-        public Func<string, IQuery<AuditTrailEvent>, QueryExecutionContext<AuditTrailEvent>, ValueTask<IQuery<AuditTrailEvent>>> Query { get; }
-        public Func<IServiceProvider, AuditTrailAdminListOption, AuditTrailIndexOptions, SelectListItem> SelectListItem { get; }
-        public bool IsDefault { get; }
+        Value = value;
+        Query = query;
+        SelectListItem = selectListItem;
+        IsDefault = isDefault;
     }
+
+    public string Value { get; }
+    public Func<string, IQuery<AuditTrailEvent>, QueryExecutionContext<AuditTrailEvent>, ValueTask<IQuery<AuditTrailEvent>>> Query { get; }
+    public Func<IServiceProvider, AuditTrailAdminListOption, AuditTrailIndexOptions, SelectListItem> SelectListItem { get; }
+    public bool IsDefault { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailAdminListOptionBuilder.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailAdminListOptionBuilder.cs
index 5a1b50fe6ef..6667b6de0c5 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailAdminListOptionBuilder.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailAdminListOptionBuilder.cs
@@ -7,70 +7,69 @@
 using YesSql;
 using YesSql.Filters.Query.Services;
 
-namespace OrchardCore.AuditTrail.Services.Models
+namespace OrchardCore.AuditTrail.Services.Models;
+
+public class AuditTrailAdminListOptionBuilder
 {
-    public class AuditTrailAdminListOptionBuilder
-    {
-        private readonly string _value;
-        private bool _default;
-        private Func<string, IQuery<AuditTrailEvent>, QueryExecutionContext<AuditTrailEvent>, ValueTask<IQuery<AuditTrailEvent>>> _query;
-        private Func<IServiceProvider, AuditTrailAdminListOption, AuditTrailIndexOptions, SelectListItem> _selectListItem;
+    private readonly string _value;
+    private bool _default;
+    private Func<string, IQuery<AuditTrailEvent>, QueryExecutionContext<AuditTrailEvent>, ValueTask<IQuery<AuditTrailEvent>>> _query;
+    private Func<IServiceProvider, AuditTrailAdminListOption, AuditTrailIndexOptions, SelectListItem> _selectListItem;
 
-        public AuditTrailAdminListOptionBuilder(string value)
-        {
-            _value = value;
-        }
+    public AuditTrailAdminListOptionBuilder(string value)
+    {
+        _value = value;
+    }
 
-        /// <summary>
-        /// Specifies the query that will be invoked when this option is selected.
-        /// </summary>
-        public AuditTrailAdminListOptionBuilder WithQuery(Func<string, IQuery<AuditTrailEvent>, IQuery<AuditTrailEvent>> query)
-        {
-            _query = (q, val, ctx) => new ValueTask<IQuery<AuditTrailEvent>>(query(q, val));
+    /// <summary>
+    /// Specifies the query that will be invoked when this option is selected.
+    /// </summary>
+    public AuditTrailAdminListOptionBuilder WithQuery(Func<string, IQuery<AuditTrailEvent>, IQuery<AuditTrailEvent>> query)
+    {
+        _query = (q, val, ctx) => new ValueTask<IQuery<AuditTrailEvent>>(query(q, val));
 
-            return this;
-        }
+        return this;
+    }
 
-        /// <summary>
-        /// Specifies the query that will be invoked when this option is selected.
-        /// </summary>
+    /// <summary>
+    /// Specifies the query that will be invoked when this option is selected.
+    /// </summary>
 
-        public AuditTrailAdminListOptionBuilder WithQuery(Func<string, IQuery<AuditTrailEvent>, QueryExecutionContext<AuditTrailEvent>, ValueTask<IQuery<AuditTrailEvent>>> query)
-        {
-            _query = query;
+    public AuditTrailAdminListOptionBuilder WithQuery(Func<string, IQuery<AuditTrailEvent>, QueryExecutionContext<AuditTrailEvent>, ValueTask<IQuery<AuditTrailEvent>>> query)
+    {
+        _query = query;
 
-            return this;
-        }
+        return this;
+    }
 
-        /// <summary>
-        /// Optionally adds a select list item to the option.
-        /// </summary>
-        public AuditTrailAdminListOptionBuilder WithSelectListItem<TLocalizer>(Func<IStringLocalizer, AuditTrailAdminListOption, AuditTrailIndexOptions, SelectListItem> selectListItem) where TLocalizer : class
+    /// <summary>
+    /// Optionally adds a select list item to the option.
+    /// </summary>
+    public AuditTrailAdminListOptionBuilder WithSelectListItem<TLocalizer>(Func<IStringLocalizer, AuditTrailAdminListOption, AuditTrailIndexOptions, SelectListItem> selectListItem) where TLocalizer : class
+    {
+        _selectListItem = (sp, opt, model) =>
         {
-            _selectListItem = (sp, opt, model) =>
-            {
-                var stringLocalizer = (IStringLocalizer)sp.GetService(typeof(IStringLocalizer<>).MakeGenericType(typeof(TLocalizer)));
-                return selectListItem(stringLocalizer, opt, model);
-            };
+            var stringLocalizer = (IStringLocalizer)sp.GetService(typeof(IStringLocalizer<>).MakeGenericType(typeof(TLocalizer)));
+            return selectListItem(stringLocalizer, opt, model);
+        };
 
-            return this;
-        }
+        return this;
+    }
 
-        /// <summary>
-        /// Sets this query option as the default which will be applied when no option has been selected.
-        /// </summary>
-        public AuditTrailAdminListOptionBuilder AsDefault()
-        {
-            _default = true;
+    /// <summary>
+    /// Sets this query option as the default which will be applied when no option has been selected.
+    /// </summary>
+    public AuditTrailAdminListOptionBuilder AsDefault()
+    {
+        _default = true;
 
-            return this;
-        }
+        return this;
+    }
 
-        internal AuditTrailAdminListOption Build()
-        {
-            var option = new AuditTrailAdminListOption(_value, _query, _selectListItem, _default);
+    internal AuditTrailAdminListOption Build()
+    {
+        var option = new AuditTrailAdminListOption(_value, _query, _selectListItem, _default);
 
-            return option;
-        }
+        return option;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailAdminListOptions.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailAdminListOptions.cs
index f51497c78b4..f66acb44c42 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailAdminListOptions.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailAdminListOptions.cs
@@ -3,46 +3,45 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OrchardCore.AuditTrail.Services.Models
+namespace OrchardCore.AuditTrail.Services.Models;
+
+public class AuditTrailAdminListOptions
 {
-    public class AuditTrailAdminListOptions
-    {
-        internal Dictionary<string, AuditTrailAdminListOptionBuilder> SortOptionBuilders { get; set; } = [];
+    internal Dictionary<string, AuditTrailAdminListOptionBuilder> SortOptionBuilders { get; set; } = [];
 
-        private FrozenDictionary<string, AuditTrailAdminListOption> _sortOptions;
+    private FrozenDictionary<string, AuditTrailAdminListOption> _sortOptions;
 
-        public IReadOnlyDictionary<string, AuditTrailAdminListOption> SortOptions
-            => _sortOptions ??= BuildSortOptions();
+    public IReadOnlyDictionary<string, AuditTrailAdminListOption> SortOptions
+        => _sortOptions ??= BuildSortOptions();
 
-        private AuditTrailAdminListOption _defaultSortOption;
-        public AuditTrailAdminListOption DefaultSortOption
-            => _defaultSortOption ??= SortOptions.Values.FirstOrDefault(x => x.IsDefault);
+    private AuditTrailAdminListOption _defaultSortOption;
+    public AuditTrailAdminListOption DefaultSortOption
+        => _defaultSortOption ??= SortOptions.Values.FirstOrDefault(x => x.IsDefault);
 
-        private FrozenDictionary<string, AuditTrailAdminListOption> BuildSortOptions()
-        {
-            var sortOptions = SortOptionBuilders.ToFrozenDictionary(k => k.Key, v => v.Value.Build());
-            SortOptionBuilders = null;
+    private FrozenDictionary<string, AuditTrailAdminListOption> BuildSortOptions()
+    {
+        var sortOptions = SortOptionBuilders.ToFrozenDictionary(k => k.Key, v => v.Value.Build());
+        SortOptionBuilders = null;
 
-            return sortOptions;
-        }
+        return sortOptions;
     }
+}
 
-    public static class AuditTrailAdminListOptionsExtensions
+public static class AuditTrailAdminListOptionsExtensions
+{
+    public static AuditTrailAdminListOptions ForSort(this AuditTrailAdminListOptions options, string value, Action<AuditTrailAdminListOptionBuilder> builder)
     {
-        public static AuditTrailAdminListOptions ForSort(this AuditTrailAdminListOptions options, string value, Action<AuditTrailAdminListOptionBuilder> builder)
+        ArgumentNullException.ThrowIfNull(builder);
+        if (!options.SortOptionBuilders.TryGetValue(value, out var auditTrailAdminListOptionBuilder))
         {
-            ArgumentNullException.ThrowIfNull(builder);
-            if (!options.SortOptionBuilders.TryGetValue(value, out var auditTrailAdminListOptionBuilder))
-            {
-                auditTrailAdminListOptionBuilder = new AuditTrailAdminListOptionBuilder(value);
-                options.SortOptionBuilders[value] = auditTrailAdminListOptionBuilder;
-            }
-            builder(auditTrailAdminListOptionBuilder);
-
-            return options;
+            auditTrailAdminListOptionBuilder = new AuditTrailAdminListOptionBuilder(value);
+            options.SortOptionBuilders[value] = auditTrailAdminListOptionBuilder;
         }
+        builder(auditTrailAdminListOptionBuilder);
 
-        public static bool RemoveSort(this AuditTrailAdminListOptions options, string value)
-            => options.SortOptionBuilders.Remove(value);
+        return options;
     }
+
+    public static bool RemoveSort(this AuditTrailAdminListOptions options, string value)
+        => options.SortOptionBuilders.Remove(value);
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailCategoryDescriptor.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailCategoryDescriptor.cs
index ca2dced161e..190909cfd72 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailCategoryDescriptor.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailCategoryDescriptor.cs
@@ -2,32 +2,31 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.AuditTrail.Services.Models
+namespace OrchardCore.AuditTrail.Services.Models;
+
+public class AuditTrailCategoryDescriptor
 {
-    public class AuditTrailCategoryDescriptor
+    public AuditTrailCategoryDescriptor(
+        string name,
+        Func<IServiceProvider, LocalizedString> localizedName,
+        IReadOnlyDictionary<string, AuditTrailEventDescriptor> events)
     {
-        public AuditTrailCategoryDescriptor(
-            string name,
-            Func<IServiceProvider, LocalizedString> localizedName,
-            IReadOnlyDictionary<string, AuditTrailEventDescriptor> events)
-        {
-            Name = name;
-            LocalizedName = localizedName;
-            Events = events;
-        }
+        Name = name;
+        LocalizedName = localizedName;
+        Events = events;
+    }
 
-        public string Name { get; }
-        public Func<IServiceProvider, LocalizedString> LocalizedName { get; }
-        public IReadOnlyDictionary<string, AuditTrailEventDescriptor> Events { get; }
+    public string Name { get; }
+    public Func<IServiceProvider, LocalizedString> LocalizedName { get; }
+    public IReadOnlyDictionary<string, AuditTrailEventDescriptor> Events { get; }
 
-        private static readonly IReadOnlyDictionary<string, AuditTrailEventDescriptor> _empty =
-            new Dictionary<string, AuditTrailEventDescriptor>();
+    private static readonly IReadOnlyDictionary<string, AuditTrailEventDescriptor> _empty =
+        new Dictionary<string, AuditTrailEventDescriptor>();
 
-        public static AuditTrailCategoryDescriptor Default(string name) =>
-            new(
-                name,
-                (sp) => new LocalizedString(name, name),
-                _empty
-            );
-    }
+    public static AuditTrailCategoryDescriptor Default(string name) =>
+        new(
+            name,
+            (sp) => new LocalizedString(name, name),
+            _empty
+        );
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailCategoryDescriptorBuilder.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailCategoryDescriptorBuilder.cs
index ee9dc4b6918..b2c072a5bef 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailCategoryDescriptorBuilder.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailCategoryDescriptorBuilder.cs
@@ -2,60 +2,59 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.AuditTrail.Services.Models
+namespace OrchardCore.AuditTrail.Services.Models;
+
+public class AuditTrailCategoryDescriptorBuilder<TLocalizer> : AuditTrailCategoryDescriptorBuilder where TLocalizer : class
 {
-    public class AuditTrailCategoryDescriptorBuilder<TLocalizer> : AuditTrailCategoryDescriptorBuilder where TLocalizer : class
+    public AuditTrailCategoryDescriptorBuilder(
+        string categoryName,
+        Func<IStringLocalizer, LocalizedString> localizedName
+        ) : base(categoryName, typeof(IStringLocalizer<>).MakeGenericType(typeof(TLocalizer)), localizedName)
     {
-        public AuditTrailCategoryDescriptorBuilder(
-            string categoryName,
-            Func<IStringLocalizer, LocalizedString> localizedName
-            ) : base(categoryName, typeof(IStringLocalizer<>).MakeGenericType(typeof(TLocalizer)), localizedName)
-        {
-        }
     }
+}
+
+public class AuditTrailCategoryDescriptorBuilder
+{
+    private readonly string _categoryName;
 
-    public class AuditTrailCategoryDescriptorBuilder
+    private readonly Type _localizerType;
+    private readonly Func<IServiceProvider, LocalizedString> _localizedCategoryName;
+    private readonly Dictionary<string, AuditTrailEventDescriptor> _events = [];
+
+    public AuditTrailCategoryDescriptorBuilder(string categoryName, Type localizerType, Func<IStringLocalizer, LocalizedString> localizedName)
     {
-        private readonly string _categoryName;
-
-        private readonly Type _localizerType;
-        private readonly Func<IServiceProvider, LocalizedString> _localizedCategoryName;
-        private readonly Dictionary<string, AuditTrailEventDescriptor> _events = [];
-
-        public AuditTrailCategoryDescriptorBuilder(string categoryName, Type localizerType, Func<IStringLocalizer, LocalizedString> localizedName)
-        {
-            _categoryName = categoryName;
-            _localizerType = localizerType;
-            _localizedCategoryName = (sp) => localizedName((IStringLocalizer)sp.GetService(_localizerType));
-        }
-
-        public AuditTrailCategoryDescriptorBuilder WithEvent(
-            string name,
-            Func<IStringLocalizer, LocalizedString> localizedName,
-            Func<IStringLocalizer, LocalizedString> description,
-            bool enableByDefault = false,
-            bool isMandatory = false)
-        {
-            _events[name] = new AuditTrailEventDescriptor(
-                name,
-                _categoryName,
-                (sp) => localizedName((IStringLocalizer)sp.GetService(_localizerType)),
-                _localizedCategoryName,
-                (sp) => description((IStringLocalizer)sp.GetService(_localizerType)),
-                enableByDefault,
-                isMandatory
-            );
-
-            return this;
-        }
-
-        public AuditTrailCategoryDescriptorBuilder RemoveEvent(string name)
-        {
-            _events.Remove(name);
-
-            return this;
-        }
-
-        internal AuditTrailCategoryDescriptor Build() => new(_categoryName, _localizedCategoryName, _events);
+        _categoryName = categoryName;
+        _localizerType = localizerType;
+        _localizedCategoryName = (sp) => localizedName((IStringLocalizer)sp.GetService(_localizerType));
     }
+
+    public AuditTrailCategoryDescriptorBuilder WithEvent(
+        string name,
+        Func<IStringLocalizer, LocalizedString> localizedName,
+        Func<IStringLocalizer, LocalizedString> description,
+        bool enableByDefault = false,
+        bool isMandatory = false)
+    {
+        _events[name] = new AuditTrailEventDescriptor(
+            name,
+            _categoryName,
+            (sp) => localizedName((IStringLocalizer)sp.GetService(_localizerType)),
+            _localizedCategoryName,
+            (sp) => description((IStringLocalizer)sp.GetService(_localizerType)),
+            enableByDefault,
+            isMandatory
+        );
+
+        return this;
+    }
+
+    public AuditTrailCategoryDescriptorBuilder RemoveEvent(string name)
+    {
+        _events.Remove(name);
+
+        return this;
+    }
+
+    internal AuditTrailCategoryDescriptor Build() => new(_categoryName, _localizedCategoryName, _events);
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailContext.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailContext.cs
index 1e66152ad75..d12ea61ccd6 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailContext.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailContext.cs
@@ -1,42 +1,41 @@
-namespace OrchardCore.AuditTrail.Services.Models
+namespace OrchardCore.AuditTrail.Services.Models;
+
+public abstract class AuditTrailContext
 {
-    public abstract class AuditTrailContext
+    public AuditTrailContext(
+        string name,
+        string category,
+        string correlationId,
+        string userId,
+        string userName)
     {
-        public AuditTrailContext(
-            string name,
-            string category,
-            string correlationId,
-            string userId,
-            string userName)
-        {
-            Name = name;
-            Category = category;
-            CorrelationId = correlationId;
-            UserId = userId;
-            UserName = userName;
-        }
-
-        public string Name { get; set; }
-        public string Category { get; set; }
-        public string CorrelationId { get; set; }
-        public string UserId { get; set; }
-        public string UserName { get; set; }
+        Name = name;
+        Category = category;
+        CorrelationId = correlationId;
+        UserId = userId;
+        UserName = userName;
     }
 
-    public class AuditTrailContext<TEvent> : AuditTrailContext where TEvent : class, new()
-    {
-        public AuditTrailContext(
-            string name,
-            string category,
-            string correlationId,
-            string userId,
-            string userName,
-            TEvent auditTrailEventItem)
-            : base(name, category, correlationId, userId, userName)
-        {
-            AuditTrailEventItem = auditTrailEventItem;
-        }
+    public string Name { get; set; }
+    public string Category { get; set; }
+    public string CorrelationId { get; set; }
+    public string UserId { get; set; }
+    public string UserName { get; set; }
+}
 
-        public TEvent AuditTrailEventItem { get; }
+public class AuditTrailContext<TEvent> : AuditTrailContext where TEvent : class, new()
+{
+    public AuditTrailContext(
+        string name,
+        string category,
+        string correlationId,
+        string userId,
+        string userName,
+        TEvent auditTrailEventItem)
+        : base(name, category, correlationId, userId, userName)
+    {
+        AuditTrailEventItem = auditTrailEventItem;
     }
+
+    public TEvent AuditTrailEventItem { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailCreateContext.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailCreateContext.cs
index 791a2e233d6..d1b1d811dc9 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailCreateContext.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailCreateContext.cs
@@ -1,35 +1,34 @@
 using System;
 
-namespace OrchardCore.AuditTrail.Services.Models
+namespace OrchardCore.AuditTrail.Services.Models;
+
+public abstract class AuditTrailCreateContext : AuditTrailContext
 {
-    public abstract class AuditTrailCreateContext : AuditTrailContext
-    {
-        public AuditTrailCreateContext(
-            string name,
-            string category,
-            string correlationId,
-            string userId,
-            string userName)
-            : base(name, category, correlationId, userId, userName) { }
+    public AuditTrailCreateContext(
+        string name,
+        string category,
+        string correlationId,
+        string userId,
+        string userName)
+        : base(name, category, correlationId, userId, userName) { }
 
-        public string ClientIpAddress { get; set; }
-        public DateTime? CreatedUtc { get; set; }
-    }
+    public string ClientIpAddress { get; set; }
+    public DateTime? CreatedUtc { get; set; }
+}
 
-    public class AuditTrailCreateContext<TEvent> : AuditTrailCreateContext where TEvent : class, new()
+public class AuditTrailCreateContext<TEvent> : AuditTrailCreateContext where TEvent : class, new()
+{
+    public AuditTrailCreateContext(
+        string name,
+        string category,
+        string correlationId,
+        string userId,
+        string userName,
+        TEvent auditTrailEventItem)
+    : base(name, category, correlationId, userId, userName)
     {
-        public AuditTrailCreateContext(
-            string name,
-            string category,
-            string correlationId,
-            string userId,
-            string userName,
-            TEvent auditTrailEventItem)
-        : base(name, category, correlationId, userId, userName)
-        {
-            AuditTrailEventItem = auditTrailEventItem;
-        }
-
-        public TEvent AuditTrailEventItem { get; set; }
+        AuditTrailEventItem = auditTrailEventItem;
     }
+
+    public TEvent AuditTrailEventItem { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailEventDescriptor.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailEventDescriptor.cs
index 06620fdc319..ba242d4042a 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailEventDescriptor.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailEventDescriptor.cs
@@ -2,36 +2,35 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.AuditTrail.Models;
 
-namespace OrchardCore.AuditTrail.Services.Models
+namespace OrchardCore.AuditTrail.Services.Models;
+
+public class AuditTrailEventDescriptor
 {
-    public class AuditTrailEventDescriptor
+    public AuditTrailEventDescriptor(string name, string category, Func<IServiceProvider, LocalizedString> localizedName, Func<IServiceProvider, LocalizedString> localizedCategory, Func<IServiceProvider, LocalizedString> description, bool isEnabledByDefault = false, bool isMandatory = false)
     {
-        public AuditTrailEventDescriptor(string name, string category, Func<IServiceProvider, LocalizedString> localizedName, Func<IServiceProvider, LocalizedString> localizedCategory, Func<IServiceProvider, LocalizedString> description, bool isEnabledByDefault = false, bool isMandatory = false)
-        {
-            Name = name;
-            Category = category;
-            LocalizedName = localizedName;
-            LocalizedCategory = localizedCategory;
-            Description = description;
-            IsEnabledByDefault = isEnabledByDefault;
-            IsMandatory = isMandatory;
-        }
+        Name = name;
+        Category = category;
+        LocalizedName = localizedName;
+        LocalizedCategory = localizedCategory;
+        Description = description;
+        IsEnabledByDefault = isEnabledByDefault;
+        IsMandatory = isMandatory;
+    }
 
-        public string Name { get; }
-        public string Category { get; }
-        public Func<IServiceProvider, LocalizedString> LocalizedName { get; }
-        public Func<IServiceProvider, LocalizedString> LocalizedCategory { get; }
-        public Func<IServiceProvider, LocalizedString> Description { get; }
-        public bool IsEnabledByDefault { get; }
-        public bool IsMandatory { get; }
+    public string Name { get; }
+    public string Category { get; }
+    public Func<IServiceProvider, LocalizedString> LocalizedName { get; }
+    public Func<IServiceProvider, LocalizedString> LocalizedCategory { get; }
+    public Func<IServiceProvider, LocalizedString> Description { get; }
+    public bool IsEnabledByDefault { get; }
+    public bool IsMandatory { get; }
 
-        public static AuditTrailEventDescriptor Default(AuditTrailEvent auditTrailEvent) =>
-            new(
-                auditTrailEvent.Name,
-                auditTrailEvent.Category,
-                (sp) => new LocalizedString(auditTrailEvent.Name, auditTrailEvent.Name),
-                (sp) => new LocalizedString(auditTrailEvent.Category, auditTrailEvent.Category),
-                (sp) => new LocalizedString(auditTrailEvent.Name, auditTrailEvent.Name)
-            );
-    }
+    public static AuditTrailEventDescriptor Default(AuditTrailEvent auditTrailEvent) =>
+        new(
+            auditTrailEvent.Name,
+            auditTrailEvent.Category,
+            (sp) => new LocalizedString(auditTrailEvent.Name, auditTrailEvent.Name),
+            (sp) => new LocalizedString(auditTrailEvent.Category, auditTrailEvent.Category),
+            (sp) => new LocalizedString(auditTrailEvent.Name, auditTrailEvent.Name)
+        );
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailEventQueryResult.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailEventQueryResult.cs
index 3f63a32c351..6f8b9a59ed8 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailEventQueryResult.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailEventQueryResult.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 using OrchardCore.AuditTrail.Models;
 
-namespace OrchardCore.AuditTrail.Services.Models
+namespace OrchardCore.AuditTrail.Services.Models;
+
+public class AuditTrailEventQueryResult
 {
-    public class AuditTrailEventQueryResult
-    {
-        public IEnumerable<AuditTrailEvent> Events { get; set; }
-        public int TotalCount { get; set; }
-    }
+    public IEnumerable<AuditTrailEvent> Events { get; set; }
+    public int TotalCount { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailOptions.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailOptions.cs
index a33b9f83735..5ff97233560 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailOptions.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailOptions.cs
@@ -3,39 +3,38 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.AuditTrail.Services.Models
+namespace OrchardCore.AuditTrail.Services.Models;
+
+public class AuditTrailOptions
 {
-    public class AuditTrailOptions
-    {
-        internal Dictionary<string, AuditTrailCategoryDescriptorBuilder> CategoryDescriptorBuilders { get; set; } = [];
+    internal Dictionary<string, AuditTrailCategoryDescriptorBuilder> CategoryDescriptorBuilders { get; set; } = [];
 
-        private FrozenDictionary<string, AuditTrailCategoryDescriptor> _categoryDescriptors;
-        public IReadOnlyDictionary<string, AuditTrailCategoryDescriptor> CategoryDescriptors
-            => _categoryDescriptors ??= BuildCategoryDescriptors();
+    private FrozenDictionary<string, AuditTrailCategoryDescriptor> _categoryDescriptors;
+    public IReadOnlyDictionary<string, AuditTrailCategoryDescriptor> CategoryDescriptors
+        => _categoryDescriptors ??= BuildCategoryDescriptors();
 
-        private FrozenDictionary<string, AuditTrailCategoryDescriptor> BuildCategoryDescriptors()
-        {
-            var categoryDescriptors = CategoryDescriptorBuilders.ToFrozenDictionary(k => k.Key, v => v.Value.Build());
-            CategoryDescriptorBuilders = null;
+    private FrozenDictionary<string, AuditTrailCategoryDescriptor> BuildCategoryDescriptors()
+    {
+        var categoryDescriptors = CategoryDescriptorBuilders.ToFrozenDictionary(k => k.Key, v => v.Value.Build());
+        CategoryDescriptorBuilders = null;
 
-            return categoryDescriptors;
-        }
+        return categoryDescriptors;
     }
+}
 
-    public static class AuditTrailOptionsExtensions
+public static class AuditTrailOptionsExtensions
+{
+    public static AuditTrailCategoryDescriptorBuilder For<TLocalizer>(this AuditTrailOptions options, string categoryName, Func<IStringLocalizer, LocalizedString> localizedName) where TLocalizer : class
     {
-        public static AuditTrailCategoryDescriptorBuilder For<TLocalizer>(this AuditTrailOptions options, string categoryName, Func<IStringLocalizer, LocalizedString> localizedName) where TLocalizer : class
+        if (!options.CategoryDescriptorBuilders.TryGetValue(categoryName, out var auditTrailCategoryDescriptorBuilder))
         {
-            if (!options.CategoryDescriptorBuilders.TryGetValue(categoryName, out var auditTrailCategoryDescriptorBuilder))
-            {
-                auditTrailCategoryDescriptorBuilder = new AuditTrailCategoryDescriptorBuilder<TLocalizer>(categoryName, localizedName);
-                options.CategoryDescriptorBuilders[categoryName] = auditTrailCategoryDescriptorBuilder;
-            }
-
-            return auditTrailCategoryDescriptorBuilder;
+            auditTrailCategoryDescriptorBuilder = new AuditTrailCategoryDescriptorBuilder<TLocalizer>(categoryName, localizedName);
+            options.CategoryDescriptorBuilders[categoryName] = auditTrailCategoryDescriptorBuilder;
         }
 
-        public static bool Remove(this AuditTrailOptions options, string categoryName)
-            => options.CategoryDescriptorBuilders.Remove(categoryName);
+        return auditTrailCategoryDescriptorBuilder;
     }
+
+    public static bool Remove(this AuditTrailOptions options, string categoryName)
+        => options.CategoryDescriptorBuilders.Remove(categoryName);
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Settings/AuditTrailSettingsGroup.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Settings/AuditTrailSettingsGroup.cs
index b5d89ee815e..fe2c791ad93 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Settings/AuditTrailSettingsGroup.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/Settings/AuditTrailSettingsGroup.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.AuditTrail.Settings
+namespace OrchardCore.AuditTrail.Settings;
+
+public class AuditTrailSettingsGroup
 {
-    public class AuditTrailSettingsGroup
-    {
-        public const string Id = "AuditTrail";
-    }
+    public const string Id = "AuditTrail";
 }
diff --git a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/ViewModels/AuditTrailIndexOptions.cs b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/ViewModels/AuditTrailIndexOptions.cs
index da9a926766d..f96aa577ae3 100644
--- a/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/ViewModels/AuditTrailIndexOptions.cs
+++ b/src/OrchardCore/OrchardCore.AuditTrail.Abstractions/ViewModels/AuditTrailIndexOptions.cs
@@ -7,51 +7,50 @@
 using OrchardCore.AuditTrail.Services;
 using YesSql.Filters.Query;
 
-namespace OrchardCore.AuditTrail.ViewModels
+namespace OrchardCore.AuditTrail.ViewModels;
+
+public class AuditTrailIndexOptions
 {
-    public class AuditTrailIndexOptions
-    {
-        public string SearchText { get; set; }
-        public string OriginalSearchText { get; set; }
-        public string Category { get; set; }
-
-        /// <summary>
-        /// Event is a supported UI filter if a <see cref="CorrelationId"/> is provided from the route.
-        /// </summary>
-        public string Event { get; set; }
-        public string UserName { get; set; }
-        public string CorrelationId { get; set; }
-
-        /// <summary>
-        /// Marks a <see cref="CorrelationId"/> as provided from the route, rather than a filter.
-        /// </summary>
-        public bool CorrelationIdFromRoute { get; set; }
-        public string Date { get; set; }
-        public string Sort { get; set; }
-        public int StartIndex { get; set; }
-        public int EndIndex { get; set; }
-        public int EventsCount { get; set; }
-        public int TotalItemCount { get; set; }
-
-        [ModelBinder(BinderType = typeof(AuditTrailFilterEngineModelBinder), Name = nameof(SearchText))]
-        public QueryFilterResult<AuditTrailEvent> FilterResult { get; set; }
-
-        [BindNever]
-        public RouteValueDictionary RouteValues { get; set; } = [];
-
-        [BindNever]
-        public List<SelectListItem> Categories { get; set; } = [];
-
-        /// <summary>
-        /// Events for the current category when a <see cref="CorrelationId"/> is set from the route.
-        /// </summary>
-        [BindNever]
-        public List<SelectListItem> Events { get; set; } = [];
-
-        [BindNever]
-        public List<SelectListItem> AuditTrailSorts { get; set; } = [];
-
-        [BindNever]
-        public List<SelectListItem> AuditTrailDates { get; set; } = [];
-    }
+    public string SearchText { get; set; }
+    public string OriginalSearchText { get; set; }
+    public string Category { get; set; }
+
+    /// <summary>
+    /// Event is a supported UI filter if a <see cref="CorrelationId"/> is provided from the route.
+    /// </summary>
+    public string Event { get; set; }
+    public string UserName { get; set; }
+    public string CorrelationId { get; set; }
+
+    /// <summary>
+    /// Marks a <see cref="CorrelationId"/> as provided from the route, rather than a filter.
+    /// </summary>
+    public bool CorrelationIdFromRoute { get; set; }
+    public string Date { get; set; }
+    public string Sort { get; set; }
+    public int StartIndex { get; set; }
+    public int EndIndex { get; set; }
+    public int EventsCount { get; set; }
+    public int TotalItemCount { get; set; }
+
+    [ModelBinder(BinderType = typeof(AuditTrailFilterEngineModelBinder), Name = nameof(SearchText))]
+    public QueryFilterResult<AuditTrailEvent> FilterResult { get; set; }
+
+    [BindNever]
+    public RouteValueDictionary RouteValues { get; set; } = [];
+
+    [BindNever]
+    public List<SelectListItem> Categories { get; set; } = [];
+
+    /// <summary>
+    /// Events for the current category when a <see cref="CorrelationId"/> is set from the route.
+    /// </summary>
+    [BindNever]
+    public List<SelectListItem> Events { get; set; } = [];
+
+    [BindNever]
+    public List<SelectListItem> AuditTrailSorts { get; set; } = [];
+
+    [BindNever]
+    public List<SelectListItem> AuditTrailDates { get; set; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.Autoroute.Core/Indexes/AutoroutePartIndex.cs b/src/OrchardCore/OrchardCore.Autoroute.Core/Indexes/AutoroutePartIndex.cs
index 312777fc509..55581ebd721 100644
--- a/src/OrchardCore/OrchardCore.Autoroute.Core/Indexes/AutoroutePartIndex.cs
+++ b/src/OrchardCore/OrchardCore.Autoroute.Core/Indexes/AutoroutePartIndex.cs
@@ -12,186 +12,185 @@
 using OrchardCore.Data;
 using YesSql.Indexes;
 
-namespace OrchardCore.Autoroute.Core.Indexes
+namespace OrchardCore.Autoroute.Core.Indexes;
+
+public class AutoroutePartIndex : MapIndex
+{
+    /// <summary>
+    /// The id of the document.
+    /// </summary>
+    public long DocumentId { get; set; }
+
+    /// <summary>
+    /// The container content item id.
+    /// </summary>
+    public string ContentItemId { get; set; }
+
+    /// <summary>
+    /// Route path.
+    /// </summary>
+    public string Path { get; set; }
+
+    /// <summary>
+    /// Whether this content item is published.
+    /// </summary>
+    public bool Published { get; set; }
+
+    /// <summary>
+    /// Whether this content item is latest.
+    /// </summary>
+    public bool Latest { get; set; }
+
+    /// <summary>
+    /// Only used if content item is contained in a container.
+    /// </summary>
+    public string ContainedContentItemId { get; set; }
+
+    /// <summary>
+    /// Only used if the content item is contained in a container.
+    /// </summary>
+    public string JsonPath { get; set; }
+}
+
+public class AutoroutePartIndexProvider : ContentHandlerBase, IIndexProvider, IScopedIndexProvider
 {
-    public class AutoroutePartIndex : MapIndex
+    private readonly IServiceProvider _serviceProvider;
+    private readonly HashSet<ContentItem> _itemRemoved = [];
+    private readonly HashSet<string> _partRemoved = [];
+    private IContentDefinitionManager _contentDefinitionManager;
+    private IContentManager _contentManager;
+
+    public AutoroutePartIndexProvider(IServiceProvider serviceProvider)
     {
-        /// <summary>
-        /// The id of the document.
-        /// </summary>
-        public long DocumentId { get; set; }
-
-        /// <summary>
-        /// The container content item id.
-        /// </summary>
-        public string ContentItemId { get; set; }
-
-        /// <summary>
-        /// Route path.
-        /// </summary>
-        public string Path { get; set; }
-
-        /// <summary>
-        /// Whether this content item is published.
-        /// </summary>
-        public bool Published { get; set; }
-
-        /// <summary>
-        /// Whether this content item is latest.
-        /// </summary>
-        public bool Latest { get; set; }
-
-        /// <summary>
-        /// Only used if content item is contained in a container.
-        /// </summary>
-        public string ContainedContentItemId { get; set; }
-
-        /// <summary>
-        /// Only used if the content item is contained in a container.
-        /// </summary>
-        public string JsonPath { get; set; }
+        _serviceProvider = serviceProvider;
     }
 
-    public class AutoroutePartIndexProvider : ContentHandlerBase, IIndexProvider, IScopedIndexProvider
+    public override Task RemovedAsync(RemoveContentContext context)
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly HashSet<ContentItem> _itemRemoved = [];
-        private readonly HashSet<string> _partRemoved = [];
-        private IContentDefinitionManager _contentDefinitionManager;
-        private IContentManager _contentManager;
-
-        public AutoroutePartIndexProvider(IServiceProvider serviceProvider)
+        if (context.NoActiveVersionLeft)
         {
-            _serviceProvider = serviceProvider;
-        }
+            var part = context.ContentItem.As<AutoroutePart>();
 
-        public override Task RemovedAsync(RemoveContentContext context)
-        {
-            if (context.NoActiveVersionLeft)
+            if (part != null)
             {
-                var part = context.ContentItem.As<AutoroutePart>();
-
-                if (part != null)
-                {
-                    _itemRemoved.Add(context.ContentItem);
-                }
+                _itemRemoved.Add(context.ContentItem);
             }
-
-            return Task.CompletedTask;
         }
 
-        public override async Task PublishedAsync(PublishContentContext context)
+        return Task.CompletedTask;
+    }
+
+    public override async Task PublishedAsync(PublishContentContext context)
+    {
+        var part = context.ContentItem.As<AutoroutePart>();
+
+        // Validate that the content definition contains this part, this prevents indexing parts
+        // that have been removed from the type definition, but are still present in the elements.            
+        if (part != null)
         {
-            var part = context.ContentItem.As<AutoroutePart>();
+            // Lazy initialization because of ISession cyclic dependency.
+            _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-            // Validate that the content definition contains this part, this prevents indexing parts
-            // that have been removed from the type definition, but are still present in the elements.            
-            if (part != null)
+            // Search for this part.
+            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
+            if (contentTypeDefinition != null && !contentTypeDefinition.Parts.Any(ctd => ctd.Name == nameof(AutoroutePart)))
             {
-                // Lazy initialization because of ISession cyclic dependency.
-                _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
+                context.ContentItem.Remove<AutoroutePart>();
+                _partRemoved.Add(context.ContentItem.ContentItemId);
 
-                // Search for this part.
-                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
-                if (contentTypeDefinition != null && !contentTypeDefinition.Parts.Any(ctd => ctd.Name == nameof(AutoroutePart)))
-                {
-                    context.ContentItem.Remove<AutoroutePart>();
-                    _partRemoved.Add(context.ContentItem.ContentItemId);
-
-                    // When the part has been removed enlist an update for after the session has been committed.
-                    var autorouteEntries = _serviceProvider.GetRequiredService<IAutorouteEntries>();
-                    await autorouteEntries.UpdateEntriesAsync();
-                }
+                // When the part has been removed enlist an update for after the session has been committed.
+                var autorouteEntries = _serviceProvider.GetRequiredService<IAutorouteEntries>();
+                await autorouteEntries.UpdateEntriesAsync();
             }
         }
+    }
 
-        public string CollectionName { get; set; }
-        public Type ForType() => typeof(ContentItem);
-        public void Describe(IDescriptor context) => Describe((DescribeContext<ContentItem>)context);
+    public string CollectionName { get; set; }
+    public Type ForType() => typeof(ContentItem);
+    public void Describe(IDescriptor context) => Describe((DescribeContext<ContentItem>)context);
 
-        public void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<AutoroutePartIndex>()
-                .When(contentItem => contentItem.Has<AutoroutePart>() || _partRemoved.Contains(contentItem.ContentItemId))
-                .Map(async contentItem =>
+    public void Describe(DescribeContext<ContentItem> context)
+    {
+        context.For<AutoroutePartIndex>()
+            .When(contentItem => contentItem.Has<AutoroutePart>() || _partRemoved.Contains(contentItem.ContentItemId))
+            .Map(async contentItem =>
+            {
+                // If the content item was removed, a record is still added.
+                var itemRemoved = _itemRemoved.Contains(contentItem);
+                if (!contentItem.Published && !contentItem.Latest && !itemRemoved)
                 {
-                    // If the content item was removed, a record is still added.
-                    var itemRemoved = _itemRemoved.Contains(contentItem);
-                    if (!contentItem.Published && !contentItem.Latest && !itemRemoved)
-                    {
-                        return null;
-                    }
+                    return null;
+                }
 
-                    // If the part was removed from the type definition, a record is still added.
-                    var partRemoved = _partRemoved.Contains(contentItem.ContentItemId);
+                // If the part was removed from the type definition, a record is still added.
+                var partRemoved = _partRemoved.Contains(contentItem.ContentItemId);
 
-                    var part = contentItem.As<AutoroutePart>();
-                    if (!partRemoved && string.IsNullOrEmpty(part?.Path))
-                    {
-                        return null;
-                    }
+                var part = contentItem.As<AutoroutePart>();
+                if (!partRemoved && string.IsNullOrEmpty(part?.Path))
+                {
+                    return null;
+                }
 
-                    var results = new List<AutoroutePartIndex>
-                    {
-                        // If the part is disabled or was removed, a record is still added but with a null path.
-                        new() {
-                            ContentItemId = contentItem.ContentItemId,
-                            Path = !partRemoved && !part.Disabled ? part.Path : null,
-                            Published = contentItem.Published,
-                            Latest = contentItem.Latest
-                        }
-                    };
-
-                    if (partRemoved || !part.RouteContainedItems || part.Disabled || itemRemoved)
-                    {
-                        return results;
+                var results = new List<AutoroutePartIndex>
+                {
+                    // If the part is disabled or was removed, a record is still added but with a null path.
+                    new() {
+                        ContentItemId = contentItem.ContentItemId,
+                        Path = !partRemoved && !part.Disabled ? part.Path : null,
+                        Published = contentItem.Published,
+                        Latest = contentItem.Latest
                     }
+                };
 
-                    _contentManager ??= _serviceProvider.GetRequiredService<IContentManager>();
+                if (partRemoved || !part.RouteContainedItems || part.Disabled || itemRemoved)
+                {
+                    return results;
+                }
 
-                    var containedContentItemsAspect = await _contentManager.PopulateAspectAsync<ContainedContentItemsAspect>(contentItem);
+                _contentManager ??= _serviceProvider.GetRequiredService<IContentManager>();
 
-                    await PopulateContainedContentItemIndexesAsync(results, contentItem, containedContentItemsAspect, (JsonObject)contentItem.Content, part.Path);
+                var containedContentItemsAspect = await _contentManager.PopulateAspectAsync<ContainedContentItemsAspect>(contentItem);
 
-                    return results;
-                });
-        }
+                await PopulateContainedContentItemIndexesAsync(results, contentItem, containedContentItemsAspect, (JsonObject)contentItem.Content, part.Path);
 
-        private async Task PopulateContainedContentItemIndexesAsync(List<AutoroutePartIndex> results, ContentItem containerContentItem, ContainedContentItemsAspect containedContentItemsAspect, JsonObject content, string basePath)
+                return results;
+            });
+    }
+
+    private async Task PopulateContainedContentItemIndexesAsync(List<AutoroutePartIndex> results, ContentItem containerContentItem, ContainedContentItemsAspect containedContentItemsAspect, JsonObject content, string basePath)
+    {
+        foreach (var accessor in containedContentItemsAspect.Accessors)
         {
-            foreach (var accessor in containedContentItemsAspect.Accessors)
+            var items = accessor.Invoke(content);
+
+            foreach (var jItem in items.Cast<JsonObject>())
             {
-                var items = accessor.Invoke(content);
+                var contentItem = jItem.ToObject<ContentItem>();
+                var handlerAspect = await _contentManager.PopulateAspectAsync<RouteHandlerAspect>(contentItem);
 
-                foreach (var jItem in items.Cast<JsonObject>())
+                if (!handlerAspect.Disabled)
                 {
-                    var contentItem = jItem.ToObject<ContentItem>();
-                    var handlerAspect = await _contentManager.PopulateAspectAsync<RouteHandlerAspect>(contentItem);
-
-                    if (!handlerAspect.Disabled)
+                    var path = handlerAspect.Path;
+                    if (!handlerAspect.Absolute)
                     {
-                        var path = handlerAspect.Path;
-                        if (!handlerAspect.Absolute)
-                        {
-                            path = (basePath.EndsWith('/') ? basePath : basePath + '/') + handlerAspect.Path.TrimStart('/');
-                        }
-
-                        results.Add(new AutoroutePartIndex
-                        {
-                            ContentItemId = containerContentItem.ContentItemId,
-                            Path = path,
-                            Published = containerContentItem.Published,
-                            Latest = containerContentItem.Latest,
-                            ContainedContentItemId = contentItem.ContentItemId,
-                            JsonPath = jItem.GetNormalizedPath(),
-                        });
+                        path = (basePath.EndsWith('/') ? basePath : basePath + '/') + handlerAspect.Path.TrimStart('/');
                     }
 
-                    var itemBasePath = (basePath.EndsWith('/') ? basePath : basePath + '/') + handlerAspect.Path.TrimStart('/');
-                    var childrenAspect = await _contentManager.PopulateAspectAsync<ContainedContentItemsAspect>(contentItem);
-
-                    await PopulateContainedContentItemIndexesAsync(results, containerContentItem, childrenAspect, jItem, itemBasePath);
+                    results.Add(new AutoroutePartIndex
+                    {
+                        ContentItemId = containerContentItem.ContentItemId,
+                        Path = path,
+                        Published = containerContentItem.Published,
+                        Latest = containerContentItem.Latest,
+                        ContainedContentItemId = contentItem.ContentItemId,
+                        JsonPath = jItem.GetNormalizedPath(),
+                    });
                 }
+
+                var itemBasePath = (basePath.EndsWith('/') ? basePath : basePath + '/') + handlerAspect.Path.TrimStart('/');
+                var childrenAspect = await _contentManager.PopulateAspectAsync<ContainedContentItemsAspect>(contentItem);
+
+                await PopulateContainedContentItemIndexesAsync(results, containerContentItem, childrenAspect, jItem, itemBasePath);
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore.Autoroute.Core/Model/AutoroutePart.cs b/src/OrchardCore/OrchardCore.Autoroute.Core/Model/AutoroutePart.cs
index 1ae3dadea00..6162a737294 100644
--- a/src/OrchardCore/OrchardCore.Autoroute.Core/Model/AutoroutePart.cs
+++ b/src/OrchardCore/OrchardCore.Autoroute.Core/Model/AutoroutePart.cs
@@ -1,34 +1,33 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Autoroute.Models
+namespace OrchardCore.Autoroute.Models;
+
+public class AutoroutePart : ContentPart
 {
-    public class AutoroutePart : ContentPart
-    {
-        public const int MaxPathLength = 1024;
-
-        public static readonly char[] InvalidCharactersForPath = ":?#[]@!$&'()*+,.;=<>\\|%".ToCharArray();
-
-        public string Path { get; set; }
-
-        /// <summary>
-        /// Whether to make the content item the homepage once it's published.
-        /// </summary>
-        public bool SetHomepage { get; set; }
-
-        /// <summary>
-        /// Whether to disable autoroute generation for this content item.
-        /// When disabled the path is no longer validated, or generated.
-        /// </summary>
-        public bool Disabled { get; set; }
-
-        /// <summary>
-        /// Whether to route content items contained within the content item.
-        /// </summary>
-        public bool RouteContainedItems { get; set; }
-
-        /// <summary>
-        /// When this content item is contained within another is the route relative to the container route.
-        /// </summary>
-        public bool Absolute { get; set; }
-    }
+    public const int MaxPathLength = 1024;
+
+    public static readonly char[] InvalidCharactersForPath = ":?#[]@!$&'()*+,.;=<>\\|%".ToCharArray();
+
+    public string Path { get; set; }
+
+    /// <summary>
+    /// Whether to make the content item the homepage once it's published.
+    /// </summary>
+    public bool SetHomepage { get; set; }
+
+    /// <summary>
+    /// Whether to disable autoroute generation for this content item.
+    /// When disabled the path is no longer validated, or generated.
+    /// </summary>
+    public bool Disabled { get; set; }
+
+    /// <summary>
+    /// Whether to route content items contained within the content item.
+    /// </summary>
+    public bool RouteContainedItems { get; set; }
+
+    /// <summary>
+    /// When this content item is contained within another is the route relative to the container route.
+    /// </summary>
+    public bool Absolute { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Autoroute.Core/Model/AutorouteStateDocument.cs b/src/OrchardCore/OrchardCore.Autoroute.Core/Model/AutorouteStateDocument.cs
index ba203f276c8..c15e892835e 100644
--- a/src/OrchardCore/OrchardCore.Autoroute.Core/Model/AutorouteStateDocument.cs
+++ b/src/OrchardCore/OrchardCore.Autoroute.Core/Model/AutorouteStateDocument.cs
@@ -1,8 +1,7 @@
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.Autoroute.Core.Model
+namespace OrchardCore.Autoroute.Core.Model;
+
+public class AutorouteStateDocument : Document
 {
-    public class AutorouteStateDocument : Document
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Autoroute.Core/Services/AutorouteEntries.cs b/src/OrchardCore/OrchardCore.Autoroute.Core/Services/AutorouteEntries.cs
index 34224cec280..40d046c4d1f 100644
--- a/src/OrchardCore/OrchardCore.Autoroute.Core/Services/AutorouteEntries.cs
+++ b/src/OrchardCore/OrchardCore.Autoroute.Core/Services/AutorouteEntries.cs
@@ -12,234 +12,233 @@
 using OrchardCore.Environment.Shell.Scope;
 using YesSql;
 
-namespace OrchardCore.Autoroute.Core.Services
+namespace OrchardCore.Autoroute.Core.Services;
+
+public class AutorouteEntries : IAutorouteEntries
 {
-    public class AutorouteEntries : IAutorouteEntries
+    private readonly IVolatileDocumentManager<AutorouteStateDocument> _autorouteStateManager;
+
+    private ImmutableDictionary<string, AutorouteEntry> _paths = ImmutableDictionary<string, AutorouteEntry>.Empty;
+    private ImmutableDictionary<string, AutorouteEntry> _contentItemIds = ImmutableDictionary<string, AutorouteEntry>.Empty;
+    private readonly SemaphoreSlim _semaphore = new(1);
+
+    private long _lastIndexId;
+    private string _stateIdentifier;
+    private bool _initialized;
+
+    public AutorouteEntries(IVolatileDocumentManager<AutorouteStateDocument> autorouteStateManager)
     {
-        private readonly IVolatileDocumentManager<AutorouteStateDocument> _autorouteStateManager;
+        _autorouteStateManager = autorouteStateManager;
+        _contentItemIds = _contentItemIds.WithComparers(StringComparer.OrdinalIgnoreCase);
+    }
 
-        private ImmutableDictionary<string, AutorouteEntry> _paths = ImmutableDictionary<string, AutorouteEntry>.Empty;
-        private ImmutableDictionary<string, AutorouteEntry> _contentItemIds = ImmutableDictionary<string, AutorouteEntry>.Empty;
-        private readonly SemaphoreSlim _semaphore = new(1);
+    public async Task<(bool, AutorouteEntry)> TryGetEntryByPathAsync(string path)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(path);
 
-        private long _lastIndexId;
-        private string _stateIdentifier;
-        private bool _initialized;
+        await EnsureInitializedAsync();
 
-        public AutorouteEntries(IVolatileDocumentManager<AutorouteStateDocument> autorouteStateManager)
+        if (_contentItemIds.TryGetValue(path.TrimEnd('/'), out var entry))
         {
-            _autorouteStateManager = autorouteStateManager;
-            _contentItemIds = _contentItemIds.WithComparers(StringComparer.OrdinalIgnoreCase);
+            return (true, entry);
         }
 
-        public async Task<(bool, AutorouteEntry)> TryGetEntryByPathAsync(string path)
+        return (false, entry);
+    }
+
+    public async Task<(bool, AutorouteEntry)> TryGetEntryByContentItemIdAsync(string contentItemId)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(contentItemId);
+
+        await EnsureInitializedAsync();
+
+        if (_paths.TryGetValue(contentItemId, out var entry))
         {
-            ArgumentException.ThrowIfNullOrEmpty(path);
+            return (true, entry);
+        }
+
+        return (false, entry);
+    }
 
-            await EnsureInitializedAsync();
+    public async Task UpdateEntriesAsync()
+    {
+        await EnsureInitializedAsync();
+
+        // Update the cache with a new state and then refresh entries as it would be done on a next request.
+        await _autorouteStateManager.UpdateAsync(new AutorouteStateDocument(), afterUpdateAsync: RefreshEntriesAsync);
+    }
 
-            if (_contentItemIds.TryGetValue(path.TrimEnd('/'), out var entry))
+    private async Task EnsureInitializedAsync()
+    {
+        if (!_initialized)
+        {
+            await InitializeEntriesAsync();
+        }
+        else
+        {
+            var state = await _autorouteStateManager.GetOrCreateImmutableAsync();
+            if (_stateIdentifier != state.Identifier)
             {
-                return (true, entry);
+                await RefreshEntriesAsync(state);
             }
-
-            return (false, entry);
         }
+    }
 
-        public async Task<(bool, AutorouteEntry)> TryGetEntryByContentItemIdAsync(string contentItemId)
+    protected void AddEntries(IEnumerable<AutorouteEntry> entries)
+    {
+        // Evict all entries related to a container item from autoroute entries.
+        // This is necessary to account for deletions, disabling of an item, or disabling routing of contained items.
+        ILookup<string, AutorouteEntry> entriesByContainer = null;
+        foreach (var entry in entries.Where(x => string.IsNullOrEmpty(x.ContainedContentItemId)))
         {
-            ArgumentException.ThrowIfNullOrEmpty(contentItemId);
-
-            await EnsureInitializedAsync();
+            entriesByContainer ??= _paths.Values
+                .Where(x => !string.IsNullOrEmpty(x.ContainedContentItemId))
+                .ToLookup(x => x.ContentItemId);
 
-            if (_paths.TryGetValue(contentItemId, out var entry))
+            if (!entriesByContainer.Contains(entry.ContentItemId))
             {
-                return (true, entry);
+                continue;
             }
 
-            return (false, entry);
+            var entriesToRemove = entriesByContainer[entry.ContentItemId];
+
+            _paths = _paths.RemoveRange(entriesToRemove.Select(x => x.ContainedContentItemId));
+            _contentItemIds = _contentItemIds.RemoveRange(entriesToRemove.Select(x => x.Path));
         }
 
-        public async Task UpdateEntriesAsync()
+        foreach (var entry in entries)
         {
-            await EnsureInitializedAsync();
+            if (_paths.TryGetValue(entry.ContentItemId, out var previousContainerEntry) &&
+                string.IsNullOrEmpty(entry.ContainedContentItemId))
+            {
+                _contentItemIds = _contentItemIds.Remove(previousContainerEntry.Path);
+            }
 
-            // Update the cache with a new state and then refresh entries as it would be done on a next request.
-            await _autorouteStateManager.UpdateAsync(new AutorouteStateDocument(), afterUpdateAsync: RefreshEntriesAsync);
-        }
+            if (!string.IsNullOrEmpty(entry.ContainedContentItemId) &&
+                _paths.TryGetValue(entry.ContainedContentItemId, out var previousContainedEntry))
+            {
+                _contentItemIds = _contentItemIds.Remove(previousContainedEntry.Path);
+            }
 
-        private async Task EnsureInitializedAsync()
-        {
-            if (!_initialized)
+            _contentItemIds = _contentItemIds.SetItem(entry.Path, entry);
+
+            if (!string.IsNullOrEmpty(entry.ContainedContentItemId))
             {
-                await InitializeEntriesAsync();
+                _paths = _paths.SetItem(entry.ContainedContentItemId, entry);
             }
             else
             {
-                var state = await _autorouteStateManager.GetOrCreateImmutableAsync();
-                if (_stateIdentifier != state.Identifier)
-                {
-                    await RefreshEntriesAsync(state);
-                }
+                _paths = _paths.SetItem(entry.ContentItemId, entry);
             }
         }
+    }
 
-        protected void AddEntries(IEnumerable<AutorouteEntry> entries)
+    protected void RemoveEntries(IEnumerable<AutorouteEntry> entries)
+    {
+        foreach (var entry in entries)
         {
             // Evict all entries related to a container item from autoroute entries.
-            // This is necessary to account for deletions, disabling of an item, or disabling routing of contained items.
-            ILookup<string, AutorouteEntry> entriesByContainer = null;
-            foreach (var entry in entries.Where(x => string.IsNullOrEmpty(x.ContainedContentItemId)))
-            {
-                entriesByContainer ??= _paths.Values
-                    .Where(x => !string.IsNullOrEmpty(x.ContainedContentItemId))
-                    .ToLookup(x => x.ContentItemId);
-
-                if (!entriesByContainer.Contains(entry.ContentItemId))
-                {
-                    continue;
-                }
-
-                var entriesToRemove = entriesByContainer[entry.ContentItemId];
-
-                _paths = _paths.RemoveRange(entriesToRemove.Select(x => x.ContainedContentItemId));
-                _contentItemIds = _contentItemIds.RemoveRange(entriesToRemove.Select(x => x.Path));
-            }
-
-            foreach (var entry in entries)
-            {
-                if (_paths.TryGetValue(entry.ContentItemId, out var previousContainerEntry) &&
-                    string.IsNullOrEmpty(entry.ContainedContentItemId))
-                {
-                    _contentItemIds = _contentItemIds.Remove(previousContainerEntry.Path);
-                }
+            var entriesToRemove = _paths.Values.Where(x => x.ContentItemId == entry.ContentItemId &&
+                !string.IsNullOrEmpty(x.ContainedContentItemId));
 
-                if (!string.IsNullOrEmpty(entry.ContainedContentItemId) &&
-                    _paths.TryGetValue(entry.ContainedContentItemId, out var previousContainedEntry))
-                {
-                    _contentItemIds = _contentItemIds.Remove(previousContainedEntry.Path);
-                }
+            _paths = _paths.RemoveRange(entriesToRemove.Select(x => x.ContainedContentItemId));
+            _contentItemIds = _contentItemIds.RemoveRange(entriesToRemove.Select(x => x.Path));
 
-                _contentItemIds = _contentItemIds.SetItem(entry.Path, entry);
+            _paths = _paths.Remove(entry.ContentItemId);
+            _contentItemIds = _contentItemIds.Remove(entry.Path);
+        }
+    }
 
-                if (!string.IsNullOrEmpty(entry.ContainedContentItemId))
-                {
-                    _paths = _paths.SetItem(entry.ContainedContentItemId, entry);
-                }
-                else
-                {
-                    _paths = _paths.SetItem(entry.ContentItemId, entry);
-                }
-            }
+    private async Task RefreshEntriesAsync(AutorouteStateDocument state)
+    {
+        if (_stateIdentifier == state.Identifier)
+        {
+            return;
         }
 
-        protected void RemoveEntries(IEnumerable<AutorouteEntry> entries)
+        await _semaphore.WaitAsync();
+        try
         {
-            foreach (var entry in entries)
+            if (_stateIdentifier != state.Identifier)
             {
-                // Evict all entries related to a container item from autoroute entries.
-                var entriesToRemove = _paths.Values.Where(x => x.ContentItemId == entry.ContentItemId &&
-                    !string.IsNullOrEmpty(x.ContainedContentItemId));
+                var indexes = await Session
+                    .QueryIndex<AutoroutePartIndex>(i => i.Id > _lastIndexId)
+                    .OrderBy(i => i.Id)
+                    .ListAsync();
+
+                // A draft is indexed to check for conflicts, and to remove an entry, but only if an item is unpublished,
+                // so only if the entry 'DocumentId' matches, this because when a draft is saved more than once, the index
+                // is not updated for the published version that may be already scanned, so the entry may not be re-added.
+
+                var entriesToRemove = indexes
+                    .Where(i => !i.Published || i.Path == null)
+                    .SelectMany(i => _paths.Values.Where(e =>
+                        // The item was removed.
+                        ((!i.Published && !i.Latest) ||
+                        // The part was disabled or removed.
+                        (i.Path == null && i.Published) ||
+                        // The item was unpublished.
+                        (!i.Published && e.DocumentId == i.DocumentId)) &&
+                        (e.ContentItemId == i.ContentItemId ||
+                        e.ContainedContentItemId == i.ContentItemId)));
+
+                var entriesToAdd = indexes
+                    .Where(i => i.Published && i.Path != null)
+                    .Select(i => new AutorouteEntry(i.ContentItemId, i.Path, i.ContainedContentItemId, i.JsonPath)
+                    {
+                        DocumentId = i.DocumentId
+                    });
 
-                _paths = _paths.RemoveRange(entriesToRemove.Select(x => x.ContainedContentItemId));
-                _contentItemIds = _contentItemIds.RemoveRange(entriesToRemove.Select(x => x.Path));
+                RemoveEntries(entriesToRemove);
+                AddEntries(entriesToAdd);
 
-                _paths = _paths.Remove(entry.ContentItemId);
-                _contentItemIds = _contentItemIds.Remove(entry.Path);
+                _lastIndexId = indexes.LastOrDefault()?.Id ?? 0;
+                _stateIdentifier = state.Identifier;
             }
         }
-
-        private async Task RefreshEntriesAsync(AutorouteStateDocument state)
+        finally
         {
-            if (_stateIdentifier == state.Identifier)
-            {
-                return;
-            }
-
-            await _semaphore.WaitAsync();
-            try
-            {
-                if (_stateIdentifier != state.Identifier)
-                {
-                    var indexes = await Session
-                        .QueryIndex<AutoroutePartIndex>(i => i.Id > _lastIndexId)
-                        .OrderBy(i => i.Id)
-                        .ListAsync();
-
-                    // A draft is indexed to check for conflicts, and to remove an entry, but only if an item is unpublished,
-                    // so only if the entry 'DocumentId' matches, this because when a draft is saved more than once, the index
-                    // is not updated for the published version that may be already scanned, so the entry may not be re-added.
-
-                    var entriesToRemove = indexes
-                        .Where(i => !i.Published || i.Path == null)
-                        .SelectMany(i => _paths.Values.Where(e =>
-                            // The item was removed.
-                            ((!i.Published && !i.Latest) ||
-                            // The part was disabled or removed.
-                            (i.Path == null && i.Published) ||
-                            // The item was unpublished.
-                            (!i.Published && e.DocumentId == i.DocumentId)) &&
-                            (e.ContentItemId == i.ContentItemId ||
-                            e.ContainedContentItemId == i.ContentItemId)));
-
-                    var entriesToAdd = indexes
-                        .Where(i => i.Published && i.Path != null)
-                        .Select(i => new AutorouteEntry(i.ContentItemId, i.Path, i.ContainedContentItemId, i.JsonPath)
-                        {
-                            DocumentId = i.DocumentId
-                        });
-
-                    RemoveEntries(entriesToRemove);
-                    AddEntries(entriesToAdd);
-
-                    _lastIndexId = indexes.LastOrDefault()?.Id ?? 0;
-                    _stateIdentifier = state.Identifier;
-                }
-            }
-            finally
-            {
-                _semaphore.Release();
-            }
+            _semaphore.Release();
         }
+    }
 
-        protected virtual async Task InitializeEntriesAsync()
+    protected virtual async Task InitializeEntriesAsync()
+    {
+        if (_initialized)
         {
-            if (_initialized)
-            {
-                return;
-            }
+            return;
+        }
 
-            await _semaphore.WaitAsync();
-            try
+        await _semaphore.WaitAsync();
+        try
+        {
+            if (!_initialized)
             {
-                if (!_initialized)
-                {
-                    var state = await _autorouteStateManager.GetOrCreateImmutableAsync();
+                var state = await _autorouteStateManager.GetOrCreateImmutableAsync();
 
-                    var indexes = await Session
-                        .QueryIndex<AutoroutePartIndex>(i => i.Published && i.Path != null)
-                        .OrderBy(i => i.Id)
-                        .ListAsync();
+                var indexes = await Session
+                    .QueryIndex<AutoroutePartIndex>(i => i.Published && i.Path != null)
+                    .OrderBy(i => i.Id)
+                    .ListAsync();
 
-                    var entries = indexes.Select(i => new AutorouteEntry(i.ContentItemId, i.Path, i.ContainedContentItemId, i.JsonPath)
-                    {
-                        DocumentId = i.DocumentId
-                    });
+                var entries = indexes.Select(i => new AutorouteEntry(i.ContentItemId, i.Path, i.ContainedContentItemId, i.JsonPath)
+                {
+                    DocumentId = i.DocumentId
+                });
 
-                    AddEntries(entries);
+                AddEntries(entries);
 
-                    _lastIndexId = indexes.LastOrDefault()?.Id ?? 0;
-                    _stateIdentifier = state.Identifier;
+                _lastIndexId = indexes.LastOrDefault()?.Id ?? 0;
+                _stateIdentifier = state.Identifier;
 
-                    _initialized = true;
-                }
-            }
-            finally
-            {
-                _semaphore.Release();
+                _initialized = true;
             }
         }
-
-        private static ISession Session => ShellScope.Services.GetRequiredService<ISession>();
+        finally
+        {
+            _semaphore.Release();
+        }
     }
+
+    private static ISession Session => ShellScope.Services.GetRequiredService<ISession>();
 }
diff --git a/src/OrchardCore/OrchardCore.Autoroute.Core/Services/AutorouteHandleProvider.cs b/src/OrchardCore/OrchardCore.Autoroute.Core/Services/AutorouteHandleProvider.cs
index ec9c5034d45..19307172ed9 100644
--- a/src/OrchardCore/OrchardCore.Autoroute.Core/Services/AutorouteHandleProvider.cs
+++ b/src/OrchardCore/OrchardCore.Autoroute.Core/Services/AutorouteHandleProvider.cs
@@ -3,38 +3,37 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Routing;
 
-namespace OrchardCore.Autoroute.Core.Services
+namespace OrchardCore.Autoroute.Core.Services;
+
+public class AutorouteHandleProvider : IContentHandleProvider
 {
-    public class AutorouteHandleProvider : IContentHandleProvider
-    {
-        private readonly IAutorouteEntries _autorouteEntries;
+    private readonly IAutorouteEntries _autorouteEntries;
 
-        public AutorouteHandleProvider(IAutorouteEntries autorouteEntries) => _autorouteEntries = autorouteEntries;
+    public AutorouteHandleProvider(IAutorouteEntries autorouteEntries) => _autorouteEntries = autorouteEntries;
 
-        public int Order => 10;
+    public int Order => 10;
 
-        public async Task<string> GetContentItemIdAsync(string handle)
+    public async Task<string> GetContentItemIdAsync(string handle)
+    {
+        if (handle.StartsWith(AutorouteConstants.SlugPrefix, StringComparison.OrdinalIgnoreCase))
         {
-            if (handle.StartsWith(AutorouteConstants.SlugPrefix, StringComparison.OrdinalIgnoreCase))
-            {
-                handle = handle[5..];
+            handle = handle[5..];
 
-                if (!handle.StartsWith('/'))
-                {
-                    handle = "/" + handle;
-                }
+            if (!handle.StartsWith('/'))
+            {
+                handle = "/" + handle;
+            }
 
-                (var found, var entry) = await _autorouteEntries.TryGetEntryByPathAsync(handle);
+            (var found, var entry) = await _autorouteEntries.TryGetEntryByPathAsync(handle);
 
-                if (found)
-                {
-                    // TODO this requires more work, and interface changes to support contained content items.
-                    // as it will require returning the id and jsonPath.
-                    return entry.ContentItemId;
-                }
+            if (found)
+            {
+                // TODO this requires more work, and interface changes to support contained content items.
+                // as it will require returning the id and jsonPath.
+                return entry.ContentItemId;
             }
-
-            return null;
         }
+
+        return null;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Configuration.KeyVault/Extensions/AzureKeyVaultConfigurationExtension.cs b/src/OrchardCore/OrchardCore.Configuration.KeyVault/Extensions/AzureKeyVaultConfigurationExtension.cs
index 1ffd074169e..1b957493073 100644
--- a/src/OrchardCore/OrchardCore.Configuration.KeyVault/Extensions/AzureKeyVaultConfigurationExtension.cs
+++ b/src/OrchardCore/OrchardCore.Configuration.KeyVault/Extensions/AzureKeyVaultConfigurationExtension.cs
@@ -7,92 +7,91 @@
 using Microsoft.Extensions.Hosting;
 using OrchardCore.Configuration.KeyVault.Services;
 
-namespace OrchardCore.Configuration.KeyVault.Extensions
+namespace OrchardCore.Configuration.KeyVault.Extensions;
+
+public static class AzureKeyVaultConfigurationExtension
 {
-    public static class AzureKeyVaultConfigurationExtension
+    /// <summary>
+    /// Adds Azure Key Vault as a Configuration Source.
+    /// </summary>
+    /// <param name="builder">The host builder to configure.</param>
+    /// <param name="tokenCredential">The token credential to use for authentication.</param>
+    /// <returns>The host builder.</returns>
+    public static IHostBuilder AddOrchardCoreAzureKeyVault(this IHostBuilder builder, TokenCredential tokenCredential = null)
     {
-        /// <summary>
-        /// Adds Azure Key Vault as a Configuration Source.
-        /// </summary>
-        /// <param name="builder">The host builder to configure.</param>
-        /// <param name="tokenCredential">The token credential to use for authentication.</param>
-        /// <returns>The host builder.</returns>
-        public static IHostBuilder AddOrchardCoreAzureKeyVault(this IHostBuilder builder, TokenCredential tokenCredential = null)
+        ArgumentNullException.ThrowIfNull(builder);
+
+        builder.ConfigureAppConfiguration((context, builder) =>
         {
-            ArgumentNullException.ThrowIfNull(builder);
+            // Here 'builder' is a config manager being a builder and also an 'IConfigurationRoot'
+            // if get from the 'context', allowing to get values from the providers already added
+            // without having to build a configuration on the fly that would need to be disposed.
+            AddOrchardCoreAzureKeyVault(builder, context.Configuration, tokenCredential);
+        });
 
-            builder.ConfigureAppConfiguration((context, builder) =>
-            {
-                // Here 'builder' is a config manager being a builder and also an 'IConfigurationRoot'
-                // if get from the 'context', allowing to get values from the providers already added
-                // without having to build a configuration on the fly that would need to be disposed.
-                AddOrchardCoreAzureKeyVault(builder, context.Configuration, tokenCredential);
-            });
+        return builder;
+    }
 
-            return builder;
-        }
+    /// <summary>
+    /// Adds Azure Key Vault as a Configuration Source.
+    /// </summary>
+    public static IWebHostBuilder AddOrchardCoreAzureKeyVault(this IWebHostBuilder builder, TokenCredential tokenCredential = null)
+    {
+        ArgumentNullException.ThrowIfNull(builder);
 
-        /// <summary>
-        /// Adds Azure Key Vault as a Configuration Source.
-        /// </summary>
-        public static IWebHostBuilder AddOrchardCoreAzureKeyVault(this IWebHostBuilder builder, TokenCredential tokenCredential = null)
+        builder.ConfigureAppConfiguration((context, builder) =>
         {
-            ArgumentNullException.ThrowIfNull(builder);
+            // Here 'builder' is a config manager being a builder and also an 'IConfigurationRoot'
+            // if get from the 'context', allowing to get values from the providers already added
+            // without having to build a configuration on the fly that would need to be disposed.
+            AddOrchardCoreAzureKeyVault(builder, context.Configuration, tokenCredential);
+        });
 
-            builder.ConfigureAppConfiguration((context, builder) =>
-            {
-                // Here 'builder' is a config manager being a builder and also an 'IConfigurationRoot'
-                // if get from the 'context', allowing to get values from the providers already added
-                // without having to build a configuration on the fly that would need to be disposed.
-                AddOrchardCoreAzureKeyVault(builder, context.Configuration, tokenCredential);
-            });
+        return builder;
+    }
 
-            return builder;
-        }
+    /// <summary>
+    /// Adds Azure Key Vault as a Configuration Source.
+    /// </summary>
+    public static ConfigurationManager AddOrchardCoreAzureKeyVault(
+        this ConfigurationManager manager, TokenCredential tokenCredential = null)
+    {
+        ArgumentNullException.ThrowIfNull(manager);
 
-        /// <summary>
-        /// Adds Azure Key Vault as a Configuration Source.
-        /// </summary>
-        public static ConfigurationManager AddOrchardCoreAzureKeyVault(
-            this ConfigurationManager manager, TokenCredential tokenCredential = null)
-        {
-            ArgumentNullException.ThrowIfNull(manager);
+        // The 'ConfigurationManager' is a builder and also an 'IConfigurationRoot' allowing to
+        // get values from the providers already added without having to build a configuration.
+        AddOrchardCoreAzureKeyVault(manager, manager, tokenCredential);
+
+        return manager;
+    }
 
-            // The 'ConfigurationManager' is a builder and also an 'IConfigurationRoot' allowing to
-            // get values from the providers already added without having to build a configuration.
-            AddOrchardCoreAzureKeyVault(manager, manager, tokenCredential);
+    private static void AddOrchardCoreAzureKeyVault(
+        this IConfigurationBuilder builder, IConfiguration configuration, TokenCredential tokenCredential)
+    {
+        var keyVaultName = configuration["OrchardCore:OrchardCore_KeyVault_Azure:KeyVaultName"];
 
-            return manager;
+        if (string.IsNullOrEmpty(keyVaultName))
+        {
+            throw new Exception("The 'KeyVaultName' property is no configured. Please configure it by specifying the 'OrchardCore:OrchardCore_KeyVault_Azure:KeyVaultName' settings key.");
         }
 
-        private static void AddOrchardCoreAzureKeyVault(
-            this IConfigurationBuilder builder, IConfiguration configuration, TokenCredential tokenCredential)
+        if (!Uri.TryCreate($"https://{keyVaultName}.vault.azure.net", UriKind.Absolute, out var keyVaultEndpointUri))
         {
-            var keyVaultName = configuration["OrchardCore:OrchardCore_KeyVault_Azure:KeyVaultName"];
-
-            if (string.IsNullOrEmpty(keyVaultName))
-            {
-                throw new Exception("The 'KeyVaultName' property is no configured. Please configure it by specifying the 'OrchardCore:OrchardCore_KeyVault_Azure:KeyVaultName' settings key.");
-            }
-
-            if (!Uri.TryCreate($"https://{keyVaultName}.vault.azure.net", UriKind.Absolute, out var keyVaultEndpointUri))
-            {
-                throw new Exception("Invalid value used for 'KeyVaultName' property. Please provide a valid key-vault name using the 'OrchardCore:OrchardCore_KeyVault_Azure:KeyVaultName' settings key.");
-            }
+            throw new Exception("Invalid value used for 'KeyVaultName' property. Please provide a valid key-vault name using the 'OrchardCore:OrchardCore_KeyVault_Azure:KeyVaultName' settings key.");
+        }
 
-            var configOptions = new AzureKeyVaultConfigurationOptions()
-            {
-                Manager = new AzureKeyVaultSecretManager(),
-            };
+        var configOptions = new AzureKeyVaultConfigurationOptions()
+        {
+            Manager = new AzureKeyVaultSecretManager(),
+        };
 
-            if (double.TryParse(configuration["OrchardCore:OrchardCore_KeyVault_Azure:ReloadInterval"], out var interval))
-            {
-                configOptions.ReloadInterval = TimeSpan.FromSeconds(interval);
-            }
+        if (double.TryParse(configuration["OrchardCore:OrchardCore_KeyVault_Azure:ReloadInterval"], out var interval))
+        {
+            configOptions.ReloadInterval = TimeSpan.FromSeconds(interval);
+        }
 
-            tokenCredential ??= new DefaultAzureCredential(includeInteractiveCredentials: true);
+        tokenCredential ??= new DefaultAzureCredential(includeInteractiveCredentials: true);
 
-            builder.AddAzureKeyVault(keyVaultEndpointUri, tokenCredential, configOptions);
-        }
+        builder.AddAzureKeyVault(keyVaultEndpointUri, tokenCredential, configOptions);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Configuration.KeyVault/Services/AzureKeyVaultSecretManager.cs b/src/OrchardCore/OrchardCore.Configuration.KeyVault/Services/AzureKeyVaultSecretManager.cs
index 790e4f7d905..75e819f652a 100644
--- a/src/OrchardCore/OrchardCore.Configuration.KeyVault/Services/AzureKeyVaultSecretManager.cs
+++ b/src/OrchardCore/OrchardCore.Configuration.KeyVault/Services/AzureKeyVaultSecretManager.cs
@@ -1,11 +1,10 @@
 using Azure.Extensions.AspNetCore.Configuration.Secrets;
 using Azure.Security.KeyVault.Secrets;
 
-namespace OrchardCore.Configuration.KeyVault.Services
+namespace OrchardCore.Configuration.KeyVault.Services;
+
+public class AzureKeyVaultSecretManager : KeyVaultSecretManager
 {
-    public class AzureKeyVaultSecretManager : KeyVaultSecretManager
-    {
-        public override string GetKey(KeyVaultSecret secret) =>
-            secret.Name.Replace("---", "_").Replace("--", ":");
-    }
+    public override string GetKey(KeyVaultSecret secret) =>
+        secret.Name.Replace("---", "_").Replace("--", ":");
 }
diff --git a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/CultureAspect.cs b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/CultureAspect.cs
index 62be850c263..078ba28219c 100644
--- a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/CultureAspect.cs
+++ b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/CultureAspect.cs
@@ -1,17 +1,16 @@
 using System.Globalization;
 
-namespace OrchardCore.ContentLocalization
+namespace OrchardCore.ContentLocalization;
+
+/// <summary>
+/// Represents a culture metadata for the content item.
+/// </summary>
+public class CultureAspect
 {
     /// <summary>
-    /// Represents a culture metadata for the content item.
+    /// Gets or sets the culture.
     /// </summary>
-    public class CultureAspect
-    {
-        /// <summary>
-        /// Gets or sets the culture.
-        /// </summary>
-        public CultureInfo Culture { get; set; } = CultureInfo.CurrentUICulture;
+    public CultureInfo Culture { get; set; } = CultureInfo.CurrentUICulture;
 
-        public bool HasCulture { get; set; }
-    }
+    public bool HasCulture { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/ContentLocalizationHandlerBase.cs b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/ContentLocalizationHandlerBase.cs
index caf6b5f510a..323020da6d5 100644
--- a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/ContentLocalizationHandlerBase.cs
+++ b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/ContentLocalizationHandlerBase.cs
@@ -1,16 +1,15 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.ContentLocalization.Handlers
+namespace OrchardCore.ContentLocalization.Handlers;
+
+public class ContentLocalizationHandlerBase : IContentLocalizationHandler
 {
-    public class ContentLocalizationHandlerBase : IContentLocalizationHandler
+    public virtual Task LocalizedAsync(LocalizationContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+    public virtual Task LocalizingAsync(LocalizationContentContext context)
     {
-        public virtual Task LocalizedAsync(LocalizationContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-        public virtual Task LocalizingAsync(LocalizationContentContext context)
-        {
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/ContentLocalizationPartHandlerBase.cs b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/ContentLocalizationPartHandlerBase.cs
index 49e8dbca735..c1051e9bb01 100644
--- a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/ContentLocalizationPartHandlerBase.cs
+++ b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/ContentLocalizationPartHandlerBase.cs
@@ -1,26 +1,25 @@
 using System.Threading.Tasks;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.ContentLocalization.Handlers
+namespace OrchardCore.ContentLocalization.Handlers;
+
+public abstract class ContentLocalizationPartHandlerBase<TPart> : IContentLocalizationPartHandler where TPart : ContentPart, new()
 {
-    public abstract class ContentLocalizationPartHandlerBase<TPart> : IContentLocalizationPartHandler where TPart : ContentPart, new()
+    async Task IContentLocalizationPartHandler.LocalizingAsync(LocalizationContentContext context, ContentPart part)
     {
-        async Task IContentLocalizationPartHandler.LocalizingAsync(LocalizationContentContext context, ContentPart part)
+        if (part is TPart tpart)
         {
-            if (part is TPart tpart)
-            {
-                await LocalizingAsync(context, tpart);
-            }
+            await LocalizingAsync(context, tpart);
         }
+    }
 
-        async Task IContentLocalizationPartHandler.LocalizedAsync(LocalizationContentContext context, ContentPart part)
+    async Task IContentLocalizationPartHandler.LocalizedAsync(LocalizationContentContext context, ContentPart part)
+    {
+        if (part is TPart tpart)
         {
-            if (part is TPart tpart)
-            {
-                await LocalizedAsync(context, tpart);
-            }
+            await LocalizedAsync(context, tpart);
         }
-        public virtual Task LocalizingAsync(LocalizationContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task LocalizedAsync(LocalizationContentContext context, TPart part) => Task.CompletedTask;
     }
+    public virtual Task LocalizingAsync(LocalizationContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task LocalizedAsync(LocalizationContentContext context, TPart part) => Task.CompletedTask;
 }
diff --git a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/IContentLocalizationHandler.cs b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/IContentLocalizationHandler.cs
index 3e897a950a2..2b797941a41 100644
--- a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/IContentLocalizationHandler.cs
+++ b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/IContentLocalizationHandler.cs
@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.ContentLocalization.Handlers
+namespace OrchardCore.ContentLocalization.Handlers;
+
+public interface IContentLocalizationHandler
 {
-    public interface IContentLocalizationHandler
-    {
-        Task LocalizingAsync(LocalizationContentContext context);
-        Task LocalizedAsync(LocalizationContentContext context);
-    }
+    Task LocalizingAsync(LocalizationContentContext context);
+    Task LocalizedAsync(LocalizationContentContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/IContentLocalizationPartHandler.cs b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/IContentLocalizationPartHandler.cs
index cb11502ac77..c4181e59524 100644
--- a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/IContentLocalizationPartHandler.cs
+++ b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/IContentLocalizationPartHandler.cs
@@ -1,11 +1,10 @@
 using System.Threading.Tasks;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.ContentLocalization.Handlers
+namespace OrchardCore.ContentLocalization.Handlers;
+
+public interface IContentLocalizationPartHandler
 {
-    public interface IContentLocalizationPartHandler
-    {
-        Task LocalizingAsync(LocalizationContentContext context, ContentPart part);
-        Task LocalizedAsync(LocalizationContentContext context, ContentPart part);
-    }
+    Task LocalizingAsync(LocalizationContentContext context, ContentPart part);
+    Task LocalizedAsync(LocalizationContentContext context, ContentPart part);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/LocalizationContentContext.cs b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/LocalizationContentContext.cs
index 6f80904f9e8..aaadaf969ce 100644
--- a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/LocalizationContentContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Handlers/LocalizationContentContext.cs
@@ -1,19 +1,18 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Handlers;
 
-namespace OrchardCore.ContentLocalization.Handlers
+namespace OrchardCore.ContentLocalization.Handlers;
+
+public class LocalizationContentContext : ContentContextBase
 {
-    public class LocalizationContentContext : ContentContextBase
+    public ContentItem Original { get; set; }
+    public string LocalizationSet { get; set; }
+    public string Culture { get; set; }
+    public LocalizationContentContext(ContentItem contentItem, ContentItem original, string localizationSet, string culture)
+        : base(contentItem)
     {
-        public ContentItem Original { get; set; }
-        public string LocalizationSet { get; set; }
-        public string Culture { get; set; }
-        public LocalizationContentContext(ContentItem contentItem, ContentItem original, string localizationSet, string culture)
-            : base(contentItem)
-        {
-            Original = original;
-            LocalizationSet = localizationSet;
-            Culture = culture;
-        }
+        Original = original;
+        LocalizationSet = localizationSet;
+        Culture = culture;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/IContentLocalizationManager.cs b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/IContentLocalizationManager.cs
index bb266492ad3..f2eab95975c 100644
--- a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/IContentLocalizationManager.cs
+++ b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/IContentLocalizationManager.cs
@@ -2,55 +2,54 @@
 using System.Threading.Tasks;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.ContentLocalization
+namespace OrchardCore.ContentLocalization;
+
+public interface IContentLocalizationManager
 {
-    public interface IContentLocalizationManager
-    {
-        /// <summary>
-        /// Get the list of items for the localizationSet.
-        /// </summary>
-        /// <returns>List of all items matching a localizationSet.</returns>
-        Task<IEnumerable<ContentItem>> GetItemsForSetAsync(string localizationSet);
+    /// <summary>
+    /// Get the list of items for the localizationSet.
+    /// </summary>
+    /// <returns>List of all items matching a localizationSet.</returns>
+    Task<IEnumerable<ContentItem>> GetItemsForSetAsync(string localizationSet);
 
-        /// <summary>
-        /// Get the content item that matches the localizationSet / culture combination.
-        /// </summary>
-        /// <returns>ContentItem or null if not found.</returns>
-        Task<ContentItem> GetContentItemAsync(string localizationSet, string culture);
+    /// <summary>
+    /// Get the content item that matches the localizationSet / culture combination.
+    /// </summary>
+    /// <returns>ContentItem or null if not found.</returns>
+    Task<ContentItem> GetContentItemAsync(string localizationSet, string culture);
 
-        /// <summary>
-        /// Localizes the content item to the target culture.
-        /// This method will clone the ContentItem of the default locale
-        /// and set the culture of the LocalizationPart to the targetCulture.
-        /// </summary>
-        /// <returns>The localized content item.</returns>
-        Task<ContentItem> LocalizeAsync(ContentItem content, string targetCulture);
+    /// <summary>
+    /// Localizes the content item to the target culture.
+    /// This method will clone the ContentItem of the default locale
+    /// and set the culture of the LocalizationPart to the targetCulture.
+    /// </summary>
+    /// <returns>The localized content item.</returns>
+    Task<ContentItem> LocalizeAsync(ContentItem content, string targetCulture);
 
-        /// <summary>
-        /// Deduplicate the list of contentItems to only keep a single contentItem per LocalizationSet.
-        /// Each ContentItem is chosen with the following rules:
-        /// - ContentItemId of the current culture for the set
-        /// - OR ContentItemId of the default culture for the set
-        /// - OR First ContentItemId found in the set.
-        /// </summary>
-        /// <returns>Cleaned list of ContentItem.</returns>
-        Task<IDictionary<string, ContentItem>> DeduplicateContentItemsAsync(IEnumerable<ContentItem> contentItems);
+    /// <summary>
+    /// Deduplicate the list of contentItems to only keep a single contentItem per LocalizationSet.
+    /// Each ContentItem is chosen with the following rules:
+    /// - ContentItemId of the current culture for the set
+    /// - OR ContentItemId of the default culture for the set
+    /// - OR First ContentItemId found in the set.
+    /// </summary>
+    /// <returns>Cleaned list of ContentItem.</returns>
+    Task<IDictionary<string, ContentItem>> DeduplicateContentItemsAsync(IEnumerable<ContentItem> contentItems);
 
-        /// <summary>
-        /// Gets a list of ContentItemId for the LocalizationSet based on some rules
-        /// Order of elements is kept.
-        /// </summary>
-        /// <returns>
-        /// List of contentItemId, each chosen with the following rules:
-        /// - ContentItemId of the current culture for the set
-        /// - OR ContentItemId of the default culture for the set
-        /// - OR First ContentItemId found in the set.
-        /// </returns>
-        Task<IDictionary<string, string>> GetFirstItemIdForSetsAsync(IEnumerable<string> localizationSets);
-        /// <summary>
-        /// Get the ContenItems that match the culture and localizationSet.
-        /// A single ContentItem is returned per set if it exists.
-        /// </summary>
-        Task<IEnumerable<ContentItem>> GetItemsForSetsAsync(IEnumerable<string> localizationSets, string culture);
-    }
+    /// <summary>
+    /// Gets a list of ContentItemId for the LocalizationSet based on some rules
+    /// Order of elements is kept.
+    /// </summary>
+    /// <returns>
+    /// List of contentItemId, each chosen with the following rules:
+    /// - ContentItemId of the current culture for the set
+    /// - OR ContentItemId of the default culture for the set
+    /// - OR First ContentItemId found in the set.
+    /// </returns>
+    Task<IDictionary<string, string>> GetFirstItemIdForSetsAsync(IEnumerable<string> localizationSets);
+    /// <summary>
+    /// Get the ContenItems that match the culture and localizationSet.
+    /// A single ContentItem is returned per set if it exists.
+    /// </summary>
+    Task<IEnumerable<ContentItem>> GetItemsForSetsAsync(IEnumerable<string> localizationSets, string culture);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/ILocalizable.cs b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/ILocalizable.cs
index 97fd9e0091a..e0ea51ec667 100644
--- a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/ILocalizable.cs
+++ b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/ILocalizable.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.ContentLocalization
+namespace OrchardCore.ContentLocalization;
+
+public interface ILocalizable
 {
-    public interface ILocalizable
-    {
-        string LocalizationSet { get; }
-        string Culture { get; }
-    }
+    string LocalizationSet { get; }
+    string Culture { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Models/LocalizationEntry.cs b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Models/LocalizationEntry.cs
index e053b4689de..d91d371cd97 100644
--- a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Models/LocalizationEntry.cs
+++ b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Models/LocalizationEntry.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.ContentLocalization.Models
+namespace OrchardCore.ContentLocalization.Models;
+
+public class LocalizationEntry
 {
-    public class LocalizationEntry
-    {
-        public long DocumentId;
-        public string ContentItemId;
-        public string LocalizationSet;
-        public string Culture;
-    }
+    public long DocumentId;
+    public string ContentItemId;
+    public string LocalizationSet;
+    public string Culture;
 }
diff --git a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Models/LocalizationPart.cs b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Models/LocalizationPart.cs
index 4511d4a1159..08362fdc3f6 100644
--- a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Models/LocalizationPart.cs
+++ b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Models/LocalizationPart.cs
@@ -1,10 +1,9 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.ContentLocalization.Models
+namespace OrchardCore.ContentLocalization.Models;
+
+public class LocalizationPart : ContentPart, ILocalizable
 {
-    public class LocalizationPart : ContentPart, ILocalizable
-    {
-        public string LocalizationSet { get; set; }
-        public string Culture { get; set; }
-    }
+    public string LocalizationSet { get; set; }
+    public string Culture { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Records/LocalizedContentItemIndex.cs b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Records/LocalizedContentItemIndex.cs
index 9adaa9adc3e..bc0c93bb093 100644
--- a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Records/LocalizedContentItemIndex.cs
+++ b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Records/LocalizedContentItemIndex.cs
@@ -10,101 +10,100 @@
 using OrchardCore.Data;
 using YesSql.Indexes;
 
-namespace OrchardCore.ContentLocalization.Records
+namespace OrchardCore.ContentLocalization.Records;
+
+public class LocalizedContentItemIndex : MapIndex
+{
+    public long DocumentId { get; set; }
+    public string ContentItemId { get; set; }
+    public string LocalizationSet { get; set; }
+    public string Culture { get; set; }
+    public bool Published { get; set; }
+    public bool Latest { get; set; }
+}
+
+public class LocalizedContentItemIndexProvider : ContentHandlerBase, IIndexProvider, IScopedIndexProvider
 {
-    public class LocalizedContentItemIndex : MapIndex
+    private readonly IServiceProvider _serviceProvider;
+    private readonly HashSet<ContentItem> _itemRemoved = [];
+    private readonly HashSet<string> _partRemoved = [];
+    private IContentDefinitionManager _contentDefinitionManager;
+
+    public LocalizedContentItemIndexProvider(IServiceProvider serviceProvider)
     {
-        public long DocumentId { get; set; }
-        public string ContentItemId { get; set; }
-        public string LocalizationSet { get; set; }
-        public string Culture { get; set; }
-        public bool Published { get; set; }
-        public bool Latest { get; set; }
+        _serviceProvider = serviceProvider;
     }
 
-    public class LocalizedContentItemIndexProvider : ContentHandlerBase, IIndexProvider, IScopedIndexProvider
+    public override Task RemovedAsync(RemoveContentContext context)
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly HashSet<ContentItem> _itemRemoved = [];
-        private readonly HashSet<string> _partRemoved = [];
-        private IContentDefinitionManager _contentDefinitionManager;
-
-        public LocalizedContentItemIndexProvider(IServiceProvider serviceProvider)
+        if (context.NoActiveVersionLeft)
         {
-            _serviceProvider = serviceProvider;
-        }
+            var part = context.ContentItem.As<LocalizationPart>();
 
-        public override Task RemovedAsync(RemoveContentContext context)
-        {
-            if (context.NoActiveVersionLeft)
+            if (part != null)
             {
-                var part = context.ContentItem.As<LocalizationPart>();
-
-                if (part != null)
-                {
-                    _itemRemoved.Add(context.ContentItem);
-                }
+                _itemRemoved.Add(context.ContentItem);
             }
-
-            return Task.CompletedTask;
         }
 
-        public override async Task PublishedAsync(PublishContentContext context)
+        return Task.CompletedTask;
+    }
+
+    public override async Task PublishedAsync(PublishContentContext context)
+    {
+        var part = context.ContentItem.As<LocalizationPart>();
+
+        // Validate that the content definition contains this part, this prevents indexing parts
+        // that have been removed from the type definition, but are still present in the elements.            
+        if (part != null)
         {
-            var part = context.ContentItem.As<LocalizationPart>();
+            // Lazy initialization because of ISession cyclic dependency.
+            _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
 
-            // Validate that the content definition contains this part, this prevents indexing parts
-            // that have been removed from the type definition, but are still present in the elements.            
-            if (part != null)
+            // Search for this part.
+            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
+            if (!contentTypeDefinition.Parts.Any(ctd => ctd.Name == nameof(LocalizationPart)))
             {
-                // Lazy initialization because of ISession cyclic dependency.
-                _contentDefinitionManager ??= _serviceProvider.GetRequiredService<IContentDefinitionManager>();
-
-                // Search for this part.
-                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
-                if (!contentTypeDefinition.Parts.Any(ctd => ctd.Name == nameof(LocalizationPart)))
-                {
-                    context.ContentItem.Remove<LocalizationPart>();
-                    _partRemoved.Add(context.ContentItem.ContentItemId);
-                }
+                context.ContentItem.Remove<LocalizationPart>();
+                _partRemoved.Add(context.ContentItem.ContentItemId);
             }
         }
+    }
 
-        public string CollectionName { get; set; }
-        public Type ForType() => typeof(ContentItem);
-        public void Describe(IDescriptor context) => Describe((DescribeContext<ContentItem>)context);
+    public string CollectionName { get; set; }
+    public Type ForType() => typeof(ContentItem);
+    public void Describe(IDescriptor context) => Describe((DescribeContext<ContentItem>)context);
 
-        public void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<LocalizedContentItemIndex>()
-                .When(contentItem => contentItem.Has<LocalizationPart>() || _partRemoved.Contains(contentItem.ContentItemId))
-                .Map(contentItem =>
+    public void Describe(DescribeContext<ContentItem> context)
+    {
+        context.For<LocalizedContentItemIndex>()
+            .When(contentItem => contentItem.Has<LocalizationPart>() || _partRemoved.Contains(contentItem.ContentItemId))
+            .Map(contentItem =>
+            {
+                // If the content item was removed, a record is still added.
+                if (!contentItem.Published && !contentItem.Latest && !_itemRemoved.Contains(contentItem))
                 {
-                    // If the content item was removed, a record is still added.
-                    if (!contentItem.Published && !contentItem.Latest && !_itemRemoved.Contains(contentItem))
-                    {
-                        return null;
-                    }
+                    return null;
+                }
 
-                    // If the part was removed from the type definition, a record is still added.
-                    var partRemoved = _partRemoved.Contains(contentItem.ContentItemId);
+                // If the part was removed from the type definition, a record is still added.
+                var partRemoved = _partRemoved.Contains(contentItem.ContentItemId);
 
-                    var part = contentItem.As<LocalizationPart>();
-                    if (!partRemoved && (part == null || string.IsNullOrEmpty(part.LocalizationSet) || part.Culture == null))
-                    {
-                        return null;
-                    }
+                var part = contentItem.As<LocalizationPart>();
+                if (!partRemoved && (part == null || string.IsNullOrEmpty(part.LocalizationSet) || part.Culture == null))
+                {
+                    return null;
+                }
 
-                    // If the part was removed, a record is still added but with a null Culture.
-                    return new LocalizedContentItemIndex
-                    {
-                        Culture = !partRemoved ? part.Culture.ToLowerInvariant() : null,
-                        LocalizationSet = !partRemoved ? part.LocalizationSet : null,
-                        ContentItemId = contentItem.ContentItemId,
-                        Published = contentItem.Published,
-                        Latest = contentItem.Latest
-                    };
-                });
-        }
+                // If the part was removed, a record is still added but with a null Culture.
+                return new LocalizedContentItemIndex
+                {
+                    Culture = !partRemoved ? part.Culture.ToLowerInvariant() : null,
+                    LocalizationSet = !partRemoved ? part.LocalizationSet : null,
+                    ContentItemId = contentItem.ContentItemId,
+                    Published = contentItem.Published,
+                    Latest = contentItem.Latest
+                };
+            });
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentDefinitionManagerExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentDefinitionManagerExtensions.cs
index 9165edd331b..396e97cb590 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentDefinitionManagerExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentDefinitionManagerExtensions.cs
@@ -6,126 +6,125 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.ContentManagement.Utilities;
 
-namespace OrchardCore.ContentManagement.Metadata
+namespace OrchardCore.ContentManagement.Metadata;
+
+public static class ContentDefinitionManagerExtensions
 {
-    public static class ContentDefinitionManagerExtensions
+    public static async Task AlterTypeDefinitionAsync(this IContentDefinitionManager manager, string name, Func<ContentTypeDefinitionBuilder, Task> alterationAsync)
     {
-        public static async Task AlterTypeDefinitionAsync(this IContentDefinitionManager manager, string name, Func<ContentTypeDefinitionBuilder, Task> alterationAsync)
-        {
-            var typeDefinition = (await manager.LoadTypeDefinitionAsync(name)) ?? new ContentTypeDefinition(name, name.CamelFriendly());
-            var builder = new ContentTypeDefinitionBuilder(typeDefinition);
-            await alterationAsync(builder);
-            await manager.StoreTypeDefinitionAsync(builder.Build());
-        }
+        var typeDefinition = (await manager.LoadTypeDefinitionAsync(name)) ?? new ContentTypeDefinition(name, name.CamelFriendly());
+        var builder = new ContentTypeDefinitionBuilder(typeDefinition);
+        await alterationAsync(builder);
+        await manager.StoreTypeDefinitionAsync(builder.Build());
+    }
 
-        public static async Task AlterTypeDefinitionAsync(this IContentDefinitionManager manager, string name, Action<ContentTypeDefinitionBuilder> alteration)
-        {
-            var typeDefinition = (await manager.LoadTypeDefinitionAsync(name)) ?? new ContentTypeDefinition(name, name.CamelFriendly());
-            var builder = new ContentTypeDefinitionBuilder(typeDefinition);
-            alteration(builder);
-            await manager.StoreTypeDefinitionAsync(builder.Build());
-        }
+    public static async Task AlterTypeDefinitionAsync(this IContentDefinitionManager manager, string name, Action<ContentTypeDefinitionBuilder> alteration)
+    {
+        var typeDefinition = (await manager.LoadTypeDefinitionAsync(name)) ?? new ContentTypeDefinition(name, name.CamelFriendly());
+        var builder = new ContentTypeDefinitionBuilder(typeDefinition);
+        alteration(builder);
+        await manager.StoreTypeDefinitionAsync(builder.Build());
+    }
 
-        public static async Task AlterPartDefinitionAsync(this IContentDefinitionManager manager, string name, Func<ContentPartDefinitionBuilder, Task> alterationAsync)
-        {
-            var partDefinition = (await manager.LoadPartDefinitionAsync(name)) ?? new ContentPartDefinition(name);
-            var builder = new ContentPartDefinitionBuilder(partDefinition);
-            await alterationAsync(builder);
-            await manager.StorePartDefinitionAsync(builder.Build());
-        }
+    public static async Task AlterPartDefinitionAsync(this IContentDefinitionManager manager, string name, Func<ContentPartDefinitionBuilder, Task> alterationAsync)
+    {
+        var partDefinition = (await manager.LoadPartDefinitionAsync(name)) ?? new ContentPartDefinition(name);
+        var builder = new ContentPartDefinitionBuilder(partDefinition);
+        await alterationAsync(builder);
+        await manager.StorePartDefinitionAsync(builder.Build());
+    }
 
-        public static async Task AlterPartDefinitionAsync(this IContentDefinitionManager manager, string name, Action<ContentPartDefinitionBuilder> alteration)
-        {
-            var partDefinition = (await manager.LoadPartDefinitionAsync(name)) ?? new ContentPartDefinition(name);
-            var builder = new ContentPartDefinitionBuilder(partDefinition);
-            alteration(builder);
-            await manager.StorePartDefinitionAsync(builder.Build());
-        }
+    public static async Task AlterPartDefinitionAsync(this IContentDefinitionManager manager, string name, Action<ContentPartDefinitionBuilder> alteration)
+    {
+        var partDefinition = (await manager.LoadPartDefinitionAsync(name)) ?? new ContentPartDefinition(name);
+        var builder = new ContentPartDefinitionBuilder(partDefinition);
+        alteration(builder);
+        await manager.StorePartDefinitionAsync(builder.Build());
+    }
 
-        /// <summary>
-        /// Migrate existing ContentPart settings to WithSettings<typeparamref name="TSettings"/>
-        /// This method will be removed in a future release.
-        /// </summary>
-        /// <typeparam name="TPart"></typeparam>
-        /// <typeparam name="TSettings"></typeparam>
-        /// <param name="manager"></param>
-        public static async Task MigratePartSettingsAsync<TPart, TSettings>(this IContentDefinitionManager manager)
-            where TPart : ContentPart where TSettings : class
-        {
-            var contentTypes = await manager.LoadTypeDefinitionsAsync();
+    /// <summary>
+    /// Migrate existing ContentPart settings to WithSettings<typeparamref name="TSettings"/>
+    /// This method will be removed in a future release.
+    /// </summary>
+    /// <typeparam name="TPart"></typeparam>
+    /// <typeparam name="TSettings"></typeparam>
+    /// <param name="manager"></param>
+    public static async Task MigratePartSettingsAsync<TPart, TSettings>(this IContentDefinitionManager manager)
+        where TPart : ContentPart where TSettings : class
+    {
+        var contentTypes = await manager.LoadTypeDefinitionsAsync();
 
-            foreach (var contentType in contentTypes)
+        foreach (var contentType in contentTypes)
+        {
+            var partDefinition = contentType.Parts.FirstOrDefault(x => x.PartDefinition.Name == typeof(TPart).Name);
+            if (partDefinition != null)
             {
-                var partDefinition = contentType.Parts.FirstOrDefault(x => x.PartDefinition.Name == typeof(TPart).Name);
-                if (partDefinition != null)
-                {
-                    var existingSettings = partDefinition.Settings.ToObject<TSettings>();
+                var existingSettings = partDefinition.Settings.ToObject<TSettings>();
 
-                    // Remove existing properties from JObject
-                    var properties = typeof(TSettings).GetProperties();
-                    foreach (var property in properties)
-                    {
-                        partDefinition.Settings.Remove(property.Name);
-                    }
+                // Remove existing properties from JObject
+                var properties = typeof(TSettings).GetProperties();
+                foreach (var property in properties)
+                {
+                    partDefinition.Settings.Remove(property.Name);
+                }
 
-                    // Apply existing settings to type definition WithSettings<T>
-                    await manager.AlterTypeDefinitionAsync(contentType.Name, typeBuilder =>
+                // Apply existing settings to type definition WithSettings<T>
+                await manager.AlterTypeDefinitionAsync(contentType.Name, typeBuilder =>
+                {
+                    typeBuilder.WithPart(partDefinition.Name, partBuilder =>
                     {
-                        typeBuilder.WithPart(partDefinition.Name, partBuilder =>
-                        {
-                            partBuilder.WithSettings(existingSettings);
-                        });
-
-                        return Task.CompletedTask;
+                        partBuilder.WithSettings(existingSettings);
                     });
-                }
+
+                    return Task.CompletedTask;
+                });
             }
         }
+    }
 
-        /// <summary>
-        /// Migrate existing ContentField settings to WithSettings<typeparamref name="TSettings"/>
-        /// This method will be removed in a future release.
-        /// </summary>
-        /// <typeparam name="TField"></typeparam>
-        /// <typeparam name="TSettings"></typeparam>
-        /// <param name="manager"></param>
-        public static async Task MigrateFieldSettingsAsync<TField, TSettings>(this IContentDefinitionManager manager)
-            where TField : ContentField where TSettings : class
-        {
-            var partDefinitions = await manager.LoadPartDefinitionsAsync();
+    /// <summary>
+    /// Migrate existing ContentField settings to WithSettings<typeparamref name="TSettings"/>
+    /// This method will be removed in a future release.
+    /// </summary>
+    /// <typeparam name="TField"></typeparam>
+    /// <typeparam name="TSettings"></typeparam>
+    /// <param name="manager"></param>
+    public static async Task MigrateFieldSettingsAsync<TField, TSettings>(this IContentDefinitionManager manager)
+        where TField : ContentField where TSettings : class
+    {
+        var partDefinitions = await manager.LoadPartDefinitionsAsync();
 
-            foreach (var partDefinition in partDefinitions)
+        foreach (var partDefinition in partDefinitions)
+        {
+            await manager.AlterPartDefinitionAsync(partDefinition.Name, partBuilder =>
             {
-                await manager.AlterPartDefinitionAsync(partDefinition.Name, partBuilder =>
+                foreach (var fieldDefinition in partDefinition.Fields.Where(x => x.FieldDefinition.Name == typeof(TField).Name))
                 {
-                    foreach (var fieldDefinition in partDefinition.Fields.Where(x => x.FieldDefinition.Name == typeof(TField).Name))
-                    {
-                        var existingFieldSettings = fieldDefinition.Settings.ToObject<TSettings>();
+                    var existingFieldSettings = fieldDefinition.Settings.ToObject<TSettings>();
 
-                        // Do this before creating builder, so settings are removed from the builder settings object.
-                        // Remove existing properties from JObject
-                        var fieldSettingsProperties = existingFieldSettings.GetType().GetProperties();
-                        var hasSetting = false;
-                        foreach (var property in fieldSettingsProperties)
+                    // Do this before creating builder, so settings are removed from the builder settings object.
+                    // Remove existing properties from JObject
+                    var fieldSettingsProperties = existingFieldSettings.GetType().GetProperties();
+                    var hasSetting = false;
+                    foreach (var property in fieldSettingsProperties)
+                    {
+                        if (fieldDefinition.Settings.ContainsKey(property.Name))
                         {
-                            if (fieldDefinition.Settings.ContainsKey(property.Name))
-                            {
-                                hasSetting = true;
-                                fieldDefinition.Settings.Remove(property.Name);
-                            }
+                            hasSetting = true;
+                            fieldDefinition.Settings.Remove(property.Name);
                         }
+                    }
 
-                        // Only include settings if the definition already has at least one of these settings.
-                        if (hasSetting)
+                    // Only include settings if the definition already has at least one of these settings.
+                    if (hasSetting)
+                    {
+                        partBuilder.WithField(fieldDefinition.Name, fieldBuilder =>
                         {
-                            partBuilder.WithField(fieldDefinition.Name, fieldBuilder =>
-                            {
-                                fieldBuilder.WithSettings(existingFieldSettings);
-                            });
-                        }
+                            fieldBuilder.WithSettings(existingFieldSettings);
+                        });
                     }
-                });
-            }
+                }
+            });
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentExtensions.cs
index 15a6dc8c9b7..d417a3605b8 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentExtensions.cs
@@ -5,314 +5,313 @@
 using System.Text.Json.Settings;
 using System.Threading.Tasks;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public static class ContentExtensions
 {
-    public static class ContentExtensions
+    public const string WeldedPartSettingsName = "@WeldedPartSettings";
+
+    /// <summary>
+    /// These settings instruct merge to replace current value, even for null values.
+    /// </summary>
+    private static readonly JsonMergeSettings _jsonMergeSettings = new()
     {
-        public const string WeldedPartSettingsName = "@WeldedPartSettings";
+        MergeArrayHandling = MergeArrayHandling.Replace,
+        MergeNullValueHandling = MergeNullValueHandling.Merge
+    };
+
+    /// <summary>
+    /// Gets a content element by its name.
+    /// </summary>
+    /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
+    /// <param name="name">The name of the content element.</param>
+    /// <typeparam name="TElement">The expected type of the content element.</typeparam>
+    /// <returns>The content element instance or. <code>null</code> if it doesn't exist.</returns>
+    public static TElement Get<TElement>(this ContentElement contentElement, string name) where TElement : ContentElement
+    {
+        var result = contentElement.Get(typeof(TElement), name);
 
-        /// <summary>
-        /// These settings instruct merge to replace current value, even for null values.
-        /// </summary>
-        private static readonly JsonMergeSettings _jsonMergeSettings = new()
-        {
-            MergeArrayHandling = MergeArrayHandling.Replace,
-            MergeNullValueHandling = MergeNullValueHandling.Merge
-        };
-
-        /// <summary>
-        /// Gets a content element by its name.
-        /// </summary>
-        /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
-        /// <param name="name">The name of the content element.</param>
-        /// <typeparam name="TElement">The expected type of the content element.</typeparam>
-        /// <returns>The content element instance or. <code>null</code> if it doesn't exist.</returns>
-        public static TElement Get<TElement>(this ContentElement contentElement, string name) where TElement : ContentElement
+        if (result == null)
         {
-            var result = contentElement.Get(typeof(TElement), name);
+            return null;
+        }
 
-            if (result == null)
-            {
-                return null;
-            }
+        if (result is TElement te)
+        {
+            return te;
+        }
 
-            if (result is TElement te)
-            {
-                return te;
-            }
+        throw new InvalidCastException($"Failed casting content to '{typeof(TElement).Name}', check you have registered your content part with AddContentPart?");
+    }
 
-            throw new InvalidCastException($"Failed casting content to '{typeof(TElement).Name}', check you have registered your content part with AddContentPart?");
-        }
+    /// <summary>
+    /// Gets whether a content element has a specific element attached.
+    /// </summary>
+    /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
+    /// <typeparam name="TElement">The expected type of the content element.</typeparam>
+    public static bool Has<TElement>(this ContentElement contentElement) where TElement : ContentElement
+    {
+        return contentElement.Has(typeof(TElement).Name);
+    }
 
-        /// <summary>
-        /// Gets whether a content element has a specific element attached.
-        /// </summary>
-        /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
-        /// <typeparam name="TElement">The expected type of the content element.</typeparam>
-        public static bool Has<TElement>(this ContentElement contentElement) where TElement : ContentElement
+    /// <summary>
+    /// Gets a content element by its name.
+    /// </summary>
+    /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
+    /// <param name="contentElementType">The expected type of the content element.</param>
+    /// <param name="name">The name of the content element.</param>
+    /// <returns>The content element instance or. <code>null</code> if it doesn't exist.</returns>
+    public static ContentElement Get(this ContentElement contentElement, Type contentElementType, string name)
+    {
+        if (contentElement.Elements.TryGetValue(name, out var element) &&
+            element.GetType().IsAssignableTo(contentElementType))
         {
-            return contentElement.Has(typeof(TElement).Name);
+            return element;
         }
 
-        /// <summary>
-        /// Gets a content element by its name.
-        /// </summary>
-        /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
-        /// <param name="contentElementType">The expected type of the content element.</param>
-        /// <param name="name">The name of the content element.</param>
-        /// <returns>The content element instance or. <code>null</code> if it doesn't exist.</returns>
-        public static ContentElement Get(this ContentElement contentElement, Type contentElementType, string name)
+        var elementData = contentElement.Data[name] as JsonObject;
+
+        if (elementData is null)
         {
-            if (contentElement.Elements.TryGetValue(name, out var element) &&
-                element.GetType().IsAssignableTo(contentElementType))
-            {
-                return element;
-            }
+            return null;
+        }
 
-            var elementData = contentElement.Data[name] as JsonObject;
+        var result = (ContentElement)elementData.Deserialize(contentElementType, JOptions.Default);
 
-            if (elementData is null)
-            {
-                return null;
-            }
+        result.Data = elementData;
+        result.ContentItem = contentElement.ContentItem;
 
-            var result = (ContentElement)elementData.Deserialize(contentElementType, JOptions.Default);
+        contentElement.Elements[name] = result;
 
-            result.Data = elementData;
-            result.ContentItem = contentElement.ContentItem;
+        return result;
+    }
 
-            contentElement.Elements[name] = result;
+    /// <summary>
+    /// Removes a content element by its name.
+    /// </summary>
+    /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
+    /// <param name="name">The name of the content element.</param>
+    /// <returns><see langword="True"/> is successfully found and removed; otherwise. <see langword="False"/> This method returns false if the name is not found.</returns>
+    public static bool Remove(this ContentElement contentElement, string name)
+    {
+        contentElement.Elements.Remove(name);
+        return contentElement.Data.Remove(name);
+    }
 
-            return result;
-        }
+    /// <summary>
+    /// Gets a content element by its name or create a new one.
+    /// </summary>
+    /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
+    /// <param name="name">The name of the content element.</param>
+    /// <typeparam name="TElement">The expected type of the content element.</typeparam>
+    /// <returns>The content element instance or a new one if it doesn't exist.</returns>
+    public static TElement GetOrCreate<TElement>(this ContentElement contentElement, string name) where TElement : ContentElement, new()
+    {
+        var existing = contentElement.Get<TElement>(name);
 
-        /// <summary>
-        /// Removes a content element by its name.
-        /// </summary>
-        /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
-        /// <param name="name">The name of the content element.</param>
-        /// <returns><see langword="True"/> is successfully found and removed; otherwise. <see langword="False"/> This method returns false if the name is not found.</returns>
-        public static bool Remove(this ContentElement contentElement, string name)
+        if (existing == null)
         {
-            contentElement.Elements.Remove(name);
-            return contentElement.Data.Remove(name);
+            var newElement = new TElement
+            {
+                ContentItem = contentElement.ContentItem,
+            };
+
+            contentElement.Data[name] = newElement.Data;
+            contentElement.Elements[name] = newElement;
+            return newElement;
         }
 
-        /// <summary>
-        /// Gets a content element by its name or create a new one.
-        /// </summary>
-        /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
-        /// <param name="name">The name of the content element.</param>
-        /// <typeparam name="TElement">The expected type of the content element.</typeparam>
-        /// <returns>The content element instance or a new one if it doesn't exist.</returns>
-        public static TElement GetOrCreate<TElement>(this ContentElement contentElement, string name) where TElement : ContentElement, new()
-        {
-            var existing = contentElement.Get<TElement>(name);
+        return existing;
+    }
 
-            if (existing == null)
-            {
-                var newElement = new TElement
-                {
-                    ContentItem = contentElement.ContentItem,
-                };
-
-                contentElement.Data[name] = newElement.Data;
-                contentElement.Elements[name] = newElement;
-                return newElement;
-            }
+    /// <summary>
+    /// Adds a content element by name.
+    /// </summary>
+    /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
+    /// <param name="name">The name of the content element.</param>
+    /// <param name="element">The element to add to the <see cref="ContentItem"/>.</param>
+    /// <returns>The current <see cref="ContentItem"/> instance.</returns>
+    public static ContentElement Weld(this ContentElement contentElement, string name, ContentElement element)
+    {
+        if (!contentElement.Data.ContainsKey(name))
+        {
+            element.Data = JObject.FromObject(element);
+            element.ContentItem = contentElement.ContentItem;
 
-            return existing;
+            contentElement.Data[name] = element.Data;
+            contentElement.Elements[name] = element;
         }
 
-        /// <summary>
-        /// Adds a content element by name.
-        /// </summary>
-        /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
-        /// <param name="name">The name of the content element.</param>
-        /// <param name="element">The element to add to the <see cref="ContentItem"/>.</param>
-        /// <returns>The current <see cref="ContentItem"/> instance.</returns>
-        public static ContentElement Weld(this ContentElement contentElement, string name, ContentElement element)
-        {
-            if (!contentElement.Data.ContainsKey(name))
-            {
-                element.Data = JObject.FromObject(element);
-                element.ContentItem = contentElement.ContentItem;
+        return contentElement;
+    }
 
-                contentElement.Data[name] = element.Data;
-                contentElement.Elements[name] = element;
-            }
+    /// <summary>
+    /// Welds a new part to the content item. If a part of the same type is already welded nothing is done.
+    /// This part can be not defined in Content Definitions.
+    /// </summary>
+    /// <typeparam name="TElement">The type of the part to be welded.</typeparam>
+    public static ContentElement Weld<TElement>(this ContentElement contentElement, object settings = null) where TElement : ContentElement, new()
+    {
+        var elementName = typeof(TElement).Name;
 
-            return contentElement;
+        var elementData = contentElement.Data[elementName] as JsonObject;
+        if (elementData == null)
+        {
+            // build and weld the part
+            var part = new TElement();
+            contentElement.Weld(elementName, part);
         }
 
-        /// <summary>
-        /// Welds a new part to the content item. If a part of the same type is already welded nothing is done.
-        /// This part can be not defined in Content Definitions.
-        /// </summary>
-        /// <typeparam name="TElement">The type of the part to be welded.</typeparam>
-        public static ContentElement Weld<TElement>(this ContentElement contentElement, object settings = null) where TElement : ContentElement, new()
+        JsonNode result;
+        if (!contentElement.Data.TryGetPropertyValue(WeldedPartSettingsName, out result))
         {
-            var elementName = typeof(TElement).Name;
-
-            var elementData = contentElement.Data[elementName] as JsonObject;
-            if (elementData == null)
-            {
-                // build and weld the part
-                var part = new TElement();
-                contentElement.Weld(elementName, part);
-            }
+            contentElement.Data[WeldedPartSettingsName] = result = new JsonObject();
+        }
 
-            JsonNode result;
-            if (!contentElement.Data.TryGetPropertyValue(WeldedPartSettingsName, out result))
-            {
-                contentElement.Data[WeldedPartSettingsName] = result = new JsonObject();
-            }
+        var weldedPartSettings = result.AsObject();
 
-            var weldedPartSettings = result.AsObject();
+        weldedPartSettings[elementName] = settings is not null
+            ? JObject.FromObject(settings)
+            : [];
 
-            weldedPartSettings[elementName] = settings is not null
-                ? JObject.FromObject(settings)
-                : [];
+        return contentElement;
+    }
 
-            return contentElement;
+    /// <summary>
+    /// Updates the content element with the specified name.
+    /// </summary>
+    /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
+    /// <param name="name">The name of the element to update.</param>
+    /// <param name="element">The content element instance to update.</param>
+    /// <returns>The current <see cref="ContentItem"/> instance.</returns>
+    public static ContentElement Apply(this ContentElement contentElement, string name, ContentElement element)
+    {
+        var elementData = contentElement.Data[name] as JsonObject;
+        if (elementData is not null)
+        {
+            elementData.Merge(JObject.FromObject(element), _jsonMergeSettings);
         }
-
-        /// <summary>
-        /// Updates the content element with the specified name.
-        /// </summary>
-        /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
-        /// <param name="name">The name of the element to update.</param>
-        /// <param name="element">The content element instance to update.</param>
-        /// <returns>The current <see cref="ContentItem"/> instance.</returns>
-        public static ContentElement Apply(this ContentElement contentElement, string name, ContentElement element)
+        else
         {
-            var elementData = contentElement.Data[name] as JsonObject;
-            if (elementData is not null)
-            {
-                elementData.Merge(JObject.FromObject(element), _jsonMergeSettings);
-            }
-            else
-            {
-                elementData = JObject.FromObject(element);
-                contentElement.Data[name] = elementData;
-            }
-
-            element.Data = elementData;
-            element.ContentItem = contentElement.ContentItem;
+            elementData = JObject.FromObject(element);
+            contentElement.Data[name] = elementData;
+        }
 
-            // Replace the existing content element with the new one
-            contentElement.Elements[name] = element;
+        element.Data = elementData;
+        element.ContentItem = contentElement.ContentItem;
 
-            if (element is ContentField)
-            {
-                contentElement.ContentItem?.Elements.Clear();
-            }
+        // Replace the existing content element with the new one
+        contentElement.Elements[name] = element;
 
-            return contentElement;
+        if (element is ContentField)
+        {
+            contentElement.ContentItem?.Elements.Clear();
         }
 
-        /// <summary>
-        /// Updates the whole content.
-        /// </summary>
-        /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
-        /// <param name="element">The content element instance to update.</param>
-        /// <returns>The current <see cref="ContentItem"/> instance.</returns>
-        public static ContentElement Apply(this ContentElement contentElement, ContentElement element)
-        {
-            if (contentElement.Data is not null)
-            {
-                contentElement.Data.Merge(JObject.FromObject(element.Data), _jsonMergeSettings);
-            }
-            else
-            {
-                contentElement.Data = JObject.FromObject(element.Data);
-            }
+        return contentElement;
+    }
 
-            contentElement.Elements.Clear();
-            return contentElement;
+    /// <summary>
+    /// Updates the whole content.
+    /// </summary>
+    /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
+    /// <param name="element">The content element instance to update.</param>
+    /// <returns>The current <see cref="ContentItem"/> instance.</returns>
+    public static ContentElement Apply(this ContentElement contentElement, ContentElement element)
+    {
+        if (contentElement.Data is not null)
+        {
+            contentElement.Data.Merge(JObject.FromObject(element.Data), _jsonMergeSettings);
         }
-
-        /// <summary>
-        /// Modifies a new or existing content element by name.
-        /// </summary>
-        /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
-        /// <param name="name">The name of the content element to update.</param>
-        /// <param name="action">An action to apply on the content element.</param>
-        /// <typeparam name="TElement">The type of the part to be altered.</typeparam>
-        /// <returns>The current <see cref="ContentElement"/> instance.</returns>
-        public static ContentElement Alter<TElement>(this ContentElement contentElement, string name, Action<TElement> action) where TElement : ContentElement, new()
+        else
         {
-            var element = contentElement.GetOrCreate<TElement>(name);
-            action(element);
-            contentElement.Apply(name, element);
-
-            return contentElement;
+            contentElement.Data = JObject.FromObject(element.Data);
         }
 
-        /// <summary>
-        /// Modifies a new or existing content element by name.
-        /// </summary>
-        /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
-        /// <param name="name">The name of the content element to update.</param>
-        /// <param name="action">An action to apply on the content element.</param>
-        /// <typeparam name="TElement">The type of the part to be altered.</typeparam>
-        /// <returns>The current <see cref="ContentElement"/> instance.</returns>
-        public static async Task<ContentElement> AlterAsync<TElement>(this ContentElement contentElement, string name, Func<TElement, Task> action) where TElement : ContentElement, new()
-        {
-            var element = contentElement.GetOrCreate<TElement>(name);
+        contentElement.Elements.Clear();
+        return contentElement;
+    }
 
-            await action(element);
+    /// <summary>
+    /// Modifies a new or existing content element by name.
+    /// </summary>
+    /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
+    /// <param name="name">The name of the content element to update.</param>
+    /// <param name="action">An action to apply on the content element.</param>
+    /// <typeparam name="TElement">The type of the part to be altered.</typeparam>
+    /// <returns>The current <see cref="ContentElement"/> instance.</returns>
+    public static ContentElement Alter<TElement>(this ContentElement contentElement, string name, Action<TElement> action) where TElement : ContentElement, new()
+    {
+        var element = contentElement.GetOrCreate<TElement>(name);
+        action(element);
+        contentElement.Apply(name, element);
 
-            contentElement.Apply(name, element);
+        return contentElement;
+    }
 
-            return contentElement;
-        }
+    /// <summary>
+    /// Modifies a new or existing content element by name.
+    /// </summary>
+    /// <param name="contentElement">The <see cref="ContentElement"/>.</param>
+    /// <param name="name">The name of the content element to update.</param>
+    /// <param name="action">An action to apply on the content element.</param>
+    /// <typeparam name="TElement">The type of the part to be altered.</typeparam>
+    /// <returns>The current <see cref="ContentElement"/> instance.</returns>
+    public static async Task<ContentElement> AlterAsync<TElement>(this ContentElement contentElement, string name, Func<TElement, Task> action) where TElement : ContentElement, new()
+    {
+        var element = contentElement.GetOrCreate<TElement>(name);
 
-        /// <summary>
-        /// Updates the content item data.
-        /// </summary>
-        /// <returns>The current <see cref="ContentPart"/> instance.</returns>
-        public static ContentPart Apply(this ContentPart contentPart)
-        {
-            contentPart.ContentItem.Apply(contentPart.GetType().Name, contentPart);
-            return contentPart;
-        }
+        await action(element);
 
-        /// <summary>
-        /// Whether the content element is published or not.
-        /// </summary>
-        /// <param name="content">The content to check.</param>
-        /// <returns><c>True</c> if the content is published, <c>False</c> otherwise.</returns>
-        public static bool IsPublished(this IContent content)
-        {
-            return content.ContentItem != null && content.ContentItem.Published;
-        }
+        contentElement.Apply(name, element);
 
-        /// <summary>
-        /// Whether the content element has a draft or not.
-        /// </summary>
-        /// <param name="content">The content to check.</param>
-        /// <returns><c>True</c> if the content has a draft, <c>False</c> otherwise.</returns>
-        public static bool HasDraft(this IContent content)
-        {
-            return content.ContentItem != null && (!content.ContentItem.Published || !content.ContentItem.Latest);
-        }
+        return contentElement;
+    }
 
-        /// <summary>
-        /// Gets all content elements of a specific type.
-        /// </summary>
-        /// <typeparam name="TElement">The expected type of the content elements.</typeparam>
-        /// <returns>The content element instances or empty sequence if no entries exist.</returns>
-        public static IEnumerable<TElement> OfType<TElement>(this ContentElement contentElement) where TElement : ContentElement
+    /// <summary>
+    /// Updates the content item data.
+    /// </summary>
+    /// <returns>The current <see cref="ContentPart"/> instance.</returns>
+    public static ContentPart Apply(this ContentPart contentPart)
+    {
+        contentPart.ContentItem.Apply(contentPart.GetType().Name, contentPart);
+        return contentPart;
+    }
+
+    /// <summary>
+    /// Whether the content element is published or not.
+    /// </summary>
+    /// <param name="content">The content to check.</param>
+    /// <returns><c>True</c> if the content is published, <c>False</c> otherwise.</returns>
+    public static bool IsPublished(this IContent content)
+    {
+        return content.ContentItem != null && content.ContentItem.Published;
+    }
+
+    /// <summary>
+    /// Whether the content element has a draft or not.
+    /// </summary>
+    /// <param name="content">The content to check.</param>
+    /// <returns><c>True</c> if the content has a draft, <c>False</c> otherwise.</returns>
+    public static bool HasDraft(this IContent content)
+    {
+        return content.ContentItem != null && (!content.ContentItem.Published || !content.ContentItem.Latest);
+    }
+
+    /// <summary>
+    /// Gets all content elements of a specific type.
+    /// </summary>
+    /// <typeparam name="TElement">The expected type of the content elements.</typeparam>
+    /// <returns>The content element instances or empty sequence if no entries exist.</returns>
+    public static IEnumerable<TElement> OfType<TElement>(this ContentElement contentElement) where TElement : ContentElement
+    {
+        foreach (var part in contentElement.Elements)
         {
-            foreach (var part in contentElement.Elements)
-            {
-                var result = part.Value as TElement;
+            var result = part.Value as TElement;
 
-                if (result != null)
-                {
-                    yield return result;
-                }
+            if (result != null)
+            {
+                yield return result;
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentField.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentField.cs
index d3649cc5ab3..09e2910f2e2 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentField.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentField.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public class ContentField : ContentElement
 {
-    public class ContentField : ContentElement
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentFieldOption.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentFieldOption.cs
index ec56027bd1c..be58ea86ad2 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentFieldOption.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentFieldOption.cs
@@ -1,26 +1,25 @@
 using System;
 using System.Collections.Generic;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public class ContentFieldOption : ContentFieldOptionBase
 {
-    public class ContentFieldOption : ContentFieldOptionBase
-    {
-        private readonly List<Type> _handlers = [];
+    private readonly List<Type> _handlers = [];
 
-        public ContentFieldOption(Type contentFieldType) : base(contentFieldType)
-        {
-        }
+    public ContentFieldOption(Type contentFieldType) : base(contentFieldType)
+    {
+    }
 
-        public IReadOnlyList<Type> Handlers => _handlers;
+    public IReadOnlyList<Type> Handlers => _handlers;
 
-        internal void AddHandler(Type type)
-        {
-            _handlers.Add(type);
-        }
+    internal void AddHandler(Type type)
+    {
+        _handlers.Add(type);
+    }
 
-        internal void RemoveHandler(Type type)
-        {
-            _handlers.Remove(type);
-        }
+    internal void RemoveHandler(Type type)
+    {
+        _handlers.Remove(type);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentFieldOptionBase.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentFieldOptionBase.cs
index c36a9c93809..13b001c7c7f 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentFieldOptionBase.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentFieldOptionBase.cs
@@ -1,16 +1,15 @@
 using System;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public abstract class ContentFieldOptionBase
 {
-    public abstract class ContentFieldOptionBase
+    public ContentFieldOptionBase(Type contentFieldType)
     {
-        public ContentFieldOptionBase(Type contentFieldType)
-        {
-            ArgumentNullException.ThrowIfNull(contentFieldType);
-
-            Type = contentFieldType;
-        }
+        ArgumentNullException.ThrowIfNull(contentFieldType);
 
-        public Type Type { get; }
+        Type = contentFieldType;
     }
+
+    public Type Type { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentFieldOptionBuilder.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentFieldOptionBuilder.cs
index 565f9bc6d04..ce0f7abbbe8 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentFieldOptionBuilder.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentFieldOptionBuilder.cs
@@ -1,17 +1,16 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public class ContentFieldOptionBuilder
 {
-    public class ContentFieldOptionBuilder
+    public ContentFieldOptionBuilder(IServiceCollection services, Type contentFieldType)
     {
-        public ContentFieldOptionBuilder(IServiceCollection services, Type contentFieldType)
-        {
-            Services = services;
-            ContentFieldType = contentFieldType;
-        }
-
-        public IServiceCollection Services { get; }
-        public Type ContentFieldType { get; }
+        Services = services;
+        ContentFieldType = contentFieldType;
     }
+
+    public IServiceCollection Services { get; }
+    public Type ContentFieldType { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItem.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItem.cs
index 506eddc402b..6fd84522f36 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItem.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItem.cs
@@ -1,82 +1,81 @@
 using System;
 using System.Text.Json.Serialization;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+/// <summary>
+/// Represents a content item version.
+/// </summary>
+[JsonConverter(typeof(ContentItemConverter))]
+public class ContentItem : ContentElement
 {
-    /// <summary>
-    /// Represents a content item version.
-    /// </summary>
-    [JsonConverter(typeof(ContentItemConverter))]
-    public class ContentItem : ContentElement
+    public ContentItem() : base()
     {
-        public ContentItem() : base()
-        {
-            ContentItem = this;
-        }
+        ContentItem = this;
+    }
 
-        /// <summary>
-        /// The primary key in the database.
-        /// </summary>
-        public long Id { get; set; }
+    /// <summary>
+    /// The primary key in the database.
+    /// </summary>
+    public long Id { get; set; }
 
-        /// <summary>
-        /// The logical identifier of the content item across versions.
-        /// </summary>
-        public string ContentItemId { get; set; }
+    /// <summary>
+    /// The logical identifier of the content item across versions.
+    /// </summary>
+    public string ContentItemId { get; set; }
 
-        /// <summary>
-        /// The logical identifier of the versioned content item.
-        /// </summary>
-        public string ContentItemVersionId { get; set; }
+    /// <summary>
+    /// The logical identifier of the versioned content item.
+    /// </summary>
+    public string ContentItemVersionId { get; set; }
 
-        /// <summary>
-        /// The content type of the content item.
-        /// </summary>
-        public string ContentType { get; set; }
+    /// <summary>
+    /// The content type of the content item.
+    /// </summary>
+    public string ContentType { get; set; }
 
-        /// <summary>
-        /// Whether the version is published or not.
-        /// </summary>
-        public bool Published { get; set; }
+    /// <summary>
+    /// Whether the version is published or not.
+    /// </summary>
+    public bool Published { get; set; }
 
-        /// <summary>
-        /// Whether the version is the latest version of the content item.
-        /// </summary>
-        public bool Latest { get; set; }
+    /// <summary>
+    /// Whether the version is the latest version of the content item.
+    /// </summary>
+    public bool Latest { get; set; }
 
-        /// <summary>
-        /// When the content item version has been updated.
-        /// </summary>
-        public DateTime? ModifiedUtc { get; set; }
+    /// <summary>
+    /// When the content item version has been updated.
+    /// </summary>
+    public DateTime? ModifiedUtc { get; set; }
 
-        /// <summary>
-        /// When the content item has been published.
-        /// </summary>
-        public DateTime? PublishedUtc { get; set; }
+    /// <summary>
+    /// When the content item has been published.
+    /// </summary>
+    public DateTime? PublishedUtc { get; set; }
 
-        /// <summary>
-        /// When the content item has been created or first published.
-        /// </summary>
-        public DateTime? CreatedUtc { get; set; }
+    /// <summary>
+    /// When the content item has been created or first published.
+    /// </summary>
+    public DateTime? CreatedUtc { get; set; }
 
-        /// <summary>
-        /// The user id of the user who first created this content item version.
-        /// </summary>
-        public string Owner { get; set; }
+    /// <summary>
+    /// The user id of the user who first created this content item version.
+    /// </summary>
+    public string Owner { get; set; }
 
-        /// <summary>
-        /// The name of the user who last modified this content item version.
-        /// </summary>
-        public string Author { get; set; }
+    /// <summary>
+    /// The name of the user who last modified this content item version.
+    /// </summary>
+    public string Author { get; set; }
 
-        /// <summary>
-        /// The text representing this content item.
-        /// </summary>
-        public string DisplayText { get; set; }
+    /// <summary>
+    /// The text representing this content item.
+    /// </summary>
+    public string DisplayText { get; set; }
 
-        public override string ToString()
-        {
-            return string.IsNullOrWhiteSpace(DisplayText) ? $"{ContentType} ({ContentItemId})" : DisplayText;
-        }
+    public override string ToString()
+    {
+        return string.IsNullOrWhiteSpace(DisplayText) ? $"{ContentType} ({ContentItemId})" : DisplayText;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemConverter.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemConverter.cs
index 7e26f0bea82..ccd66460800 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemConverter.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemConverter.cs
@@ -3,106 +3,105 @@
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public class ContentItemConverter : JsonConverter<ContentItem>
 {
-    public class ContentItemConverter : JsonConverter<ContentItem>
+    public override void Write(Utf8JsonWriter writer, ContentItem value, JsonSerializerOptions options)
     {
-        public override void Write(Utf8JsonWriter writer, ContentItem value, JsonSerializerOptions options)
+        var o = new JsonObject()
         {
-            var o = new JsonObject()
-            {
-                // Write all well-known properties.
-                [nameof(ContentItem.ContentItemId)] = value.ContentItemId,
-                [nameof(ContentItem.ContentItemVersionId)] = value.ContentItemVersionId,
-                [nameof(ContentItem.ContentType)] = value.ContentType,
-                [nameof(ContentItem.DisplayText)] = value.DisplayText,
-                [nameof(ContentItem.Latest)] = value.Latest,
-                [nameof(ContentItem.Published)] = value.Published,
-                [nameof(ContentItem.ModifiedUtc)] = value.ModifiedUtc,
-                [nameof(ContentItem.PublishedUtc)] = value.PublishedUtc,
-                [nameof(ContentItem.CreatedUtc)] = value.CreatedUtc,
-                [nameof(ContentItem.Owner)] = value.Owner,
-                [nameof(ContentItem.Author)] = value.Author,
-            };
+            // Write all well-known properties.
+            [nameof(ContentItem.ContentItemId)] = value.ContentItemId,
+            [nameof(ContentItem.ContentItemVersionId)] = value.ContentItemVersionId,
+            [nameof(ContentItem.ContentType)] = value.ContentType,
+            [nameof(ContentItem.DisplayText)] = value.DisplayText,
+            [nameof(ContentItem.Latest)] = value.Latest,
+            [nameof(ContentItem.Published)] = value.Published,
+            [nameof(ContentItem.ModifiedUtc)] = value.ModifiedUtc,
+            [nameof(ContentItem.PublishedUtc)] = value.PublishedUtc,
+            [nameof(ContentItem.CreatedUtc)] = value.CreatedUtc,
+            [nameof(ContentItem.Owner)] = value.Owner,
+            [nameof(ContentItem.Author)] = value.Author,
+        };
 
-            // Write all custom content properties.
-            o.Merge(value.Data);
+        // Write all custom content properties.
+        o.Merge(value.Data);
 
-            o.WriteTo(writer);
-        }
+        o.WriteTo(writer);
+    }
 
-        public override ContentItem Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    public override ContentItem Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        var contentItem = new ContentItem();
+        while (reader.Read())
         {
-            var contentItem = new ContentItem();
-            while (reader.Read())
+            if (reader.TokenType == JsonTokenType.EndObject)
             {
-                if (reader.TokenType == JsonTokenType.EndObject)
-                {
-                    break;
-                }
+                break;
+            }
 
-                if (reader.TokenType != JsonTokenType.PropertyName)
-                {
-                    continue;
-                }
+            if (reader.TokenType != JsonTokenType.PropertyName)
+            {
+                continue;
+            }
 
-                var propertyName = reader.GetString();
+            var propertyName = reader.GetString();
 
-                reader.Read();
+            reader.Read();
 
-                switch (propertyName)
-                {
-                    case nameof(ContentItem.ContentItemId):
-                        contentItem.ContentItemId = reader.TokenType == JsonTokenType.String ? reader.GetString() : null;
-                        break;
-                    case nameof(ContentItem.ContentItemVersionId):
-                        contentItem.ContentItemVersionId = reader.TokenType == JsonTokenType.String ? reader.GetString() : null;
-                        break;
-                    case nameof(ContentItem.ContentType):
-                        contentItem.ContentType = reader.TokenType == JsonTokenType.String ? reader.GetString() : null;
-                        break;
-                    case nameof(ContentItem.DisplayText):
-                        contentItem.DisplayText = reader.TokenType == JsonTokenType.String ? reader.GetString() : null;
-                        break;
-                    case nameof(ContentItem.Latest):
-                        contentItem.Latest = (reader.TokenType == JsonTokenType.True ||
-                            reader.TokenType == JsonTokenType.False) && reader.GetBoolean();
-                        break;
-                    case nameof(ContentItem.Published):
-                        contentItem.Published = (reader.TokenType == JsonTokenType.True ||
-                            reader.TokenType == JsonTokenType.False) && reader.GetBoolean();
-                        break;
-                    case nameof(ContentItem.PublishedUtc):
-                        contentItem.PublishedUtc = reader.TokenType != JsonTokenType.Null &&
-                            reader.TryGetDateTime(out var date) ? date : null;
-                        break;
-                    case nameof(ContentItem.ModifiedUtc):
-                        contentItem.ModifiedUtc = reader.TokenType != JsonTokenType.Null &&
-                            reader.TryGetDateTime(out date) ? date : null;
-                        break;
-                    case nameof(ContentItem.CreatedUtc):
-                        contentItem.CreatedUtc = reader.TokenType != JsonTokenType.Null &&
-                            reader.TryGetDateTime(out date) ? date : null;
-                        break;
-                    case nameof(ContentItem.Author):
-                        contentItem.Author = reader.TokenType == JsonTokenType.String ? reader.GetString() : null;
-                        break;
-                    case nameof(ContentItem.Owner):
-                        contentItem.Owner = reader.TokenType == JsonTokenType.String ? reader.GetString() : null;
-                        break;
-                    default:
-                        if (reader.TokenType == JsonTokenType.StartObject ||
-                            reader.TokenType == JsonTokenType.StartArray)
-                        {
-                            var property = JNode.Load(ref reader);
-                            contentItem.Data[propertyName] = property;
-                        }
+            switch (propertyName)
+            {
+                case nameof(ContentItem.ContentItemId):
+                    contentItem.ContentItemId = reader.TokenType == JsonTokenType.String ? reader.GetString() : null;
+                    break;
+                case nameof(ContentItem.ContentItemVersionId):
+                    contentItem.ContentItemVersionId = reader.TokenType == JsonTokenType.String ? reader.GetString() : null;
+                    break;
+                case nameof(ContentItem.ContentType):
+                    contentItem.ContentType = reader.TokenType == JsonTokenType.String ? reader.GetString() : null;
+                    break;
+                case nameof(ContentItem.DisplayText):
+                    contentItem.DisplayText = reader.TokenType == JsonTokenType.String ? reader.GetString() : null;
+                    break;
+                case nameof(ContentItem.Latest):
+                    contentItem.Latest = (reader.TokenType == JsonTokenType.True ||
+                        reader.TokenType == JsonTokenType.False) && reader.GetBoolean();
+                    break;
+                case nameof(ContentItem.Published):
+                    contentItem.Published = (reader.TokenType == JsonTokenType.True ||
+                        reader.TokenType == JsonTokenType.False) && reader.GetBoolean();
+                    break;
+                case nameof(ContentItem.PublishedUtc):
+                    contentItem.PublishedUtc = reader.TokenType != JsonTokenType.Null &&
+                        reader.TryGetDateTime(out var date) ? date : null;
+                    break;
+                case nameof(ContentItem.ModifiedUtc):
+                    contentItem.ModifiedUtc = reader.TokenType != JsonTokenType.Null &&
+                        reader.TryGetDateTime(out date) ? date : null;
+                    break;
+                case nameof(ContentItem.CreatedUtc):
+                    contentItem.CreatedUtc = reader.TokenType != JsonTokenType.Null &&
+                        reader.TryGetDateTime(out date) ? date : null;
+                    break;
+                case nameof(ContentItem.Author):
+                    contentItem.Author = reader.TokenType == JsonTokenType.String ? reader.GetString() : null;
+                    break;
+                case nameof(ContentItem.Owner):
+                    contentItem.Owner = reader.TokenType == JsonTokenType.String ? reader.GetString() : null;
+                    break;
+                default:
+                    if (reader.TokenType == JsonTokenType.StartObject ||
+                        reader.TokenType == JsonTokenType.StartArray)
+                    {
+                        var property = JNode.Load(ref reader);
+                        contentItem.Data[propertyName] = property;
+                    }
 
-                        break;
-                }
+                    break;
             }
-
-            return contentItem;
         }
+
+        return contentItem;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemExtensions.cs
index d0ce29c42d2..9a55126d196 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemExtensions.cs
@@ -3,232 +3,231 @@
 using System.Text.Json.Settings;
 using System.Threading.Tasks;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public static class ContentItemExtensions
 {
-    public static class ContentItemExtensions
+    /// <summary>
+    /// Tries to get a content part by its type.
+    /// </summary>
+    /// <typeparam name="TPart">The type of the content part.</typeparam>
+    /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
+    /// <param name="part">The <see cref="ContentPart"/> if one existed.</param>
+    /// <returns>true if a part found, otherwise false.</returns>
+    public static bool TryGet<TPart>(this ContentItem contentItem, out TPart part) where TPart : ContentPart
+        => contentItem.TryGet(typeof(TPart).Name, out part);
+
+    /// <summary>
+    /// Tries to get a content part by its type.
+    /// </summary>
+    /// <typeparam name="TPart">The type of the content part.</typeparam>
+    /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
+    /// <param name="name">The name of the content part.</param>
+    /// <param name="part">The <see cref="ContentPart"/> if one existed.</param>
+    /// <returns>true if a part found, otherwise false.</returns>
+    public static bool TryGet<TPart>(this ContentItem contentItem, string name, out TPart part) where TPart : ContentPart
+    {
+        ArgumentException.ThrowIfNullOrEmpty(name);
+
+        try
+        {
+            part = contentItem.Get<TPart>(name);
+        }
+        catch
+        {
+            part = null;
+        }
+
+        return part != null;
+    }
+
+    /// <summary>
+    /// Tries to get a content part by its type.
+    /// </summary>
+    /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
+    /// <param name="contentElementType">The type of the content part.</param>
+    /// <param name="name">The name of the content part.</param>
+    /// <param name="part">The <see cref="ContentPart"/> if one existed.</param>
+    /// <returns>true if a part found, otherwise false.</returns>
+    public static bool TryGet(this ContentItem contentItem, Type contentElementType, string name, out ContentElement part)
+    {
+        try
+        {
+            part = contentItem.Get(contentElementType, name);
+        }
+        catch
+        {
+            part = null;
+        }
+
+        return part != null;
+    }
+
+    /// <summary>
+    /// Gets a content part by its type.
+    /// </summary>
+    /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
+    /// <typeparam name="TPart">The type of the content part.</typeparam>
+    /// <returns>The content part or. <code>null</code> if it doesn't exist.</returns>
+    public static TPart As<TPart>(this ContentItem contentItem) where TPart : ContentPart
+        => contentItem.Get<TPart>(typeof(TPart).Name);
+
+    /// <summary>
+    /// Gets a content part by its type or create a new one.
+    /// </summary>
+    /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
+    /// <typeparam name="TPart">The type of the content part.</typeparam>
+    /// <returns>The content part instance or a new one if it doesn't exist.</returns>
+    public static TPart GetOrCreate<TPart>(this ContentItem contentItem) where TPart : ContentPart, new()
+        => contentItem.GetOrCreate<TPart>(typeof(TPart).Name);
+
+    /// <summary>
+    /// Removes a content part by its type.
+    /// </summary>
+    /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
+    /// <typeparam name="TPart">The type of the content part.</typeparam>
+    public static void Remove<TPart>(this ContentItem contentItem) where TPart : ContentPart, new()
+        => contentItem.Remove(typeof(TPart).Name);
+
+    /// <summary>
+    /// Adds a content part by its type.
+    /// </summary>
+    /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
+    /// <param name="part">The content part to weld.</param>
+    /// <typeparam name="TPart">The type of the content part.</typeparam>
+    /// <returns>The current <see cref="ContentItem"/> instance.</returns>
+    public static ContentItem Weld<TPart>(this ContentItem contentItem, TPart part) where TPart : ContentPart
+    {
+        contentItem.Weld(typeof(TPart).Name, part);
+
+        return contentItem;
+    }
+
+    /// <summary>
+    /// Updates the content part with the specified type.
+    /// </summary>
+    /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
+    /// <param name="part">The content part to update.</param>
+    /// <typeparam name="TPart">The type of the content part.</typeparam>
+    /// <returns>The current <see cref="ContentItem"/> instance.</returns>
+    public static ContentItem Apply<TPart>(this ContentItem contentItem, TPart part) where TPart : ContentPart
+    {
+        contentItem.Apply(typeof(TPart).Name, part);
+
+        return contentItem;
+    }
+
+    /// <summary>
+    /// Modifies a new or existing content part by name.
+    /// </summary>
+    /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
+    /// <param name="action">An action to apply on the content part.</param>
+    /// <typeparam name="TPart">The type of the content part.</typeparam>
+    /// <returns>The current <see cref="ContentPart"/> instance.</returns>
+    public static ContentItem Alter<TPart>(this ContentItem contentItem, Action<TPart> action) where TPart : ContentPart, new()
+    {
+        var part = contentItem.GetOrCreate<TPart>();
+        action(part);
+        contentItem.Apply(part);
+
+        return contentItem;
+    }
+
+    /// <summary>
+    /// Modifies a new or existing content part by name.
+    /// </summary>
+    /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
+    /// <param name="action">An action to apply on the content part.</param>
+    /// <typeparam name="TPart">The type of the content part.</typeparam>
+    /// <returns>The current <see cref="ContentItem"/> instance.</returns>
+    public static async Task<ContentItem> AlterAsync<TPart>(this ContentItem contentItem, Func<TPart, Task> action) where TPart : ContentPart, new()
+    {
+        var part = contentItem.GetOrCreate<TPart>();
+        await action(part);
+        contentItem.Apply(part);
+
+        return contentItem;
+    }
+
+    /// <summary>
+    /// Merges properties to the contents of a content item.
+    /// </summary>
+    /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
+    /// <param name="properties">The object to merge.</param>
+    /// <param name="settings">The <see cref="JsonMergeSettings"/> to use.</param>
+    /// <returns>The current <see cref="ContentItem"/> instance.</returns>
+    public static ContentItem Merge(this ContentItem contentItem, object properties, JsonMergeSettings settings = null)
     {
-        /// <summary>
-        /// Tries to get a content part by its type.
-        /// </summary>
-        /// <typeparam name="TPart">The type of the content part.</typeparam>
-        /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
-        /// <param name="part">The <see cref="ContentPart"/> if one existed.</param>
-        /// <returns>true if a part found, otherwise false.</returns>
-        public static bool TryGet<TPart>(this ContentItem contentItem, out TPart part) where TPart : ContentPart
-            => contentItem.TryGet(typeof(TPart).Name, out part);
-
-        /// <summary>
-        /// Tries to get a content part by its type.
-        /// </summary>
-        /// <typeparam name="TPart">The type of the content part.</typeparam>
-        /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
-        /// <param name="name">The name of the content part.</param>
-        /// <param name="part">The <see cref="ContentPart"/> if one existed.</param>
-        /// <returns>true if a part found, otherwise false.</returns>
-        public static bool TryGet<TPart>(this ContentItem contentItem, string name, out TPart part) where TPart : ContentPart
+        var props = JObject.FromObject(properties);
+
+        var originalDocumentId = contentItem.Id;
+        contentItem.Data.Merge(props, settings);
+        contentItem.Elements.Clear();
+
+        // Return to original value or it will be interpreted as a different object by YesSql.
+        contentItem.Id = originalDocumentId;
+
+        // After merging content here we need to remove all the well known properties from the Data jObject
+        // or these properties will take precedence over the properties on the C# object when and if they are mutated.
+        if (props.ContainsKey(nameof(contentItem.DisplayText)))
         {
-            ArgumentException.ThrowIfNullOrEmpty(name);
-
-            try
-            {
-                part = contentItem.Get<TPart>(name);
-            }
-            catch
-            {
-                part = null;
-            }
-
-            return part != null;
+            contentItem.DisplayText = props[nameof(contentItem.DisplayText)]?.ToString();
+            contentItem.Data.Remove(nameof(contentItem.DisplayText));
         }
 
-        /// <summary>
-        /// Tries to get a content part by its type.
-        /// </summary>
-        /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
-        /// <param name="contentElementType">The type of the content part.</param>
-        /// <param name="name">The name of the content part.</param>
-        /// <param name="part">The <see cref="ContentPart"/> if one existed.</param>
-        /// <returns>true if a part found, otherwise false.</returns>
-        public static bool TryGet(this ContentItem contentItem, Type contentElementType, string name, out ContentElement part)
+        if (props.ContainsKey(nameof(contentItem.Owner)))
         {
-            try
-            {
-                part = contentItem.Get(contentElementType, name);
-            }
-            catch
-            {
-                part = null;
-            }
-
-            return part != null;
+            contentItem.Owner = props[nameof(contentItem.Owner)]?.ToString();
+            contentItem.Data.Remove(nameof(contentItem.Owner));
         }
 
-        /// <summary>
-        /// Gets a content part by its type.
-        /// </summary>
-        /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
-        /// <typeparam name="TPart">The type of the content part.</typeparam>
-        /// <returns>The content part or. <code>null</code> if it doesn't exist.</returns>
-        public static TPart As<TPart>(this ContentItem contentItem) where TPart : ContentPart
-            => contentItem.Get<TPart>(typeof(TPart).Name);
-
-        /// <summary>
-        /// Gets a content part by its type or create a new one.
-        /// </summary>
-        /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
-        /// <typeparam name="TPart">The type of the content part.</typeparam>
-        /// <returns>The content part instance or a new one if it doesn't exist.</returns>
-        public static TPart GetOrCreate<TPart>(this ContentItem contentItem) where TPart : ContentPart, new()
-            => contentItem.GetOrCreate<TPart>(typeof(TPart).Name);
-
-        /// <summary>
-        /// Removes a content part by its type.
-        /// </summary>
-        /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
-        /// <typeparam name="TPart">The type of the content part.</typeparam>
-        public static void Remove<TPart>(this ContentItem contentItem) where TPart : ContentPart, new()
-            => contentItem.Remove(typeof(TPart).Name);
-
-        /// <summary>
-        /// Adds a content part by its type.
-        /// </summary>
-        /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
-        /// <param name="part">The content part to weld.</param>
-        /// <typeparam name="TPart">The type of the content part.</typeparam>
-        /// <returns>The current <see cref="ContentItem"/> instance.</returns>
-        public static ContentItem Weld<TPart>(this ContentItem contentItem, TPart part) where TPart : ContentPart
+        if (props.ContainsKey(nameof(contentItem.Author)))
         {
-            contentItem.Weld(typeof(TPart).Name, part);
+            contentItem.Author = props[nameof(contentItem.Author)]?.ToString();
+            contentItem.Data.Remove(nameof(contentItem.Author));
+        }
 
-            return contentItem;
+        // Do not set these properties on the content item as they are the responsibility of the content manager.
+        if (props.ContainsKey(nameof(contentItem.Published)))
+        {
+            contentItem.Data.Remove(nameof(contentItem.Published));
         }
 
-        /// <summary>
-        /// Updates the content part with the specified type.
-        /// </summary>
-        /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
-        /// <param name="part">The content part to update.</param>
-        /// <typeparam name="TPart">The type of the content part.</typeparam>
-        /// <returns>The current <see cref="ContentItem"/> instance.</returns>
-        public static ContentItem Apply<TPart>(this ContentItem contentItem, TPart part) where TPart : ContentPart
+        if (props.ContainsKey(nameof(contentItem.Latest)))
         {
-            contentItem.Apply(typeof(TPart).Name, part);
+            contentItem.Data.Remove(nameof(contentItem.Latest));
+        }
 
-            return contentItem;
+        if (props.ContainsKey(nameof(contentItem.CreatedUtc)))
+        {
+            contentItem.Data.Remove(nameof(contentItem.CreatedUtc));
         }
 
-        /// <summary>
-        /// Modifies a new or existing content part by name.
-        /// </summary>
-        /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
-        /// <param name="action">An action to apply on the content part.</param>
-        /// <typeparam name="TPart">The type of the content part.</typeparam>
-        /// <returns>The current <see cref="ContentPart"/> instance.</returns>
-        public static ContentItem Alter<TPart>(this ContentItem contentItem, Action<TPart> action) where TPart : ContentPart, new()
+        if (props.ContainsKey(nameof(contentItem.ModifiedUtc)))
         {
-            var part = contentItem.GetOrCreate<TPart>();
-            action(part);
-            contentItem.Apply(part);
+            contentItem.Data.Remove(nameof(contentItem.ModifiedUtc));
+        }
 
-            return contentItem;
+        if (props.ContainsKey(nameof(contentItem.PublishedUtc)))
+        {
+            contentItem.Data.Remove(nameof(contentItem.PublishedUtc));
         }
 
-        /// <summary>
-        /// Modifies a new or existing content part by name.
-        /// </summary>
-        /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
-        /// <param name="action">An action to apply on the content part.</param>
-        /// <typeparam name="TPart">The type of the content part.</typeparam>
-        /// <returns>The current <see cref="ContentItem"/> instance.</returns>
-        public static async Task<ContentItem> AlterAsync<TPart>(this ContentItem contentItem, Func<TPart, Task> action) where TPart : ContentPart, new()
+        if (props.ContainsKey(nameof(contentItem.ContentItemId)))
         {
-            var part = contentItem.GetOrCreate<TPart>();
-            await action(part);
-            contentItem.Apply(part);
+            contentItem.Data.Remove(nameof(contentItem.ContentItemId));
+        }
 
-            return contentItem;
+        if (props.ContainsKey(nameof(contentItem.ContentItemVersionId)))
+        {
+            contentItem.Data.Remove(nameof(contentItem.ContentItemVersionId));
         }
 
-        /// <summary>
-        /// Merges properties to the contents of a content item.
-        /// </summary>
-        /// <param name="contentItem">The <see cref="ContentItem"/>.</param>
-        /// <param name="properties">The object to merge.</param>
-        /// <param name="settings">The <see cref="JsonMergeSettings"/> to use.</param>
-        /// <returns>The current <see cref="ContentItem"/> instance.</returns>
-        public static ContentItem Merge(this ContentItem contentItem, object properties, JsonMergeSettings settings = null)
+        if (props.ContainsKey(nameof(contentItem.ContentType)))
         {
-            var props = JObject.FromObject(properties);
-
-            var originalDocumentId = contentItem.Id;
-            contentItem.Data.Merge(props, settings);
-            contentItem.Elements.Clear();
-
-            // Return to original value or it will be interpreted as a different object by YesSql.
-            contentItem.Id = originalDocumentId;
-
-            // After merging content here we need to remove all the well known properties from the Data jObject
-            // or these properties will take precedence over the properties on the C# object when and if they are mutated.
-            if (props.ContainsKey(nameof(contentItem.DisplayText)))
-            {
-                contentItem.DisplayText = props[nameof(contentItem.DisplayText)]?.ToString();
-                contentItem.Data.Remove(nameof(contentItem.DisplayText));
-            }
-
-            if (props.ContainsKey(nameof(contentItem.Owner)))
-            {
-                contentItem.Owner = props[nameof(contentItem.Owner)]?.ToString();
-                contentItem.Data.Remove(nameof(contentItem.Owner));
-            }
-
-            if (props.ContainsKey(nameof(contentItem.Author)))
-            {
-                contentItem.Author = props[nameof(contentItem.Author)]?.ToString();
-                contentItem.Data.Remove(nameof(contentItem.Author));
-            }
-
-            // Do not set these properties on the content item as they are the responsibility of the content manager.
-            if (props.ContainsKey(nameof(contentItem.Published)))
-            {
-                contentItem.Data.Remove(nameof(contentItem.Published));
-            }
-
-            if (props.ContainsKey(nameof(contentItem.Latest)))
-            {
-                contentItem.Data.Remove(nameof(contentItem.Latest));
-            }
-
-            if (props.ContainsKey(nameof(contentItem.CreatedUtc)))
-            {
-                contentItem.Data.Remove(nameof(contentItem.CreatedUtc));
-            }
-
-            if (props.ContainsKey(nameof(contentItem.ModifiedUtc)))
-            {
-                contentItem.Data.Remove(nameof(contentItem.ModifiedUtc));
-            }
-
-            if (props.ContainsKey(nameof(contentItem.PublishedUtc)))
-            {
-                contentItem.Data.Remove(nameof(contentItem.PublishedUtc));
-            }
-
-            if (props.ContainsKey(nameof(contentItem.ContentItemId)))
-            {
-                contentItem.Data.Remove(nameof(contentItem.ContentItemId));
-            }
-
-            if (props.ContainsKey(nameof(contentItem.ContentItemVersionId)))
-            {
-                contentItem.Data.Remove(nameof(contentItem.ContentItemVersionId));
-            }
-
-            if (props.ContainsKey(nameof(contentItem.ContentType)))
-            {
-                contentItem.Data.Remove(nameof(contentItem.ContentType));
-            }
-
-            return contentItem;
+            contentItem.Data.Remove(nameof(contentItem.ContentType));
         }
+
+        return contentItem;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemMetadata.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemMetadata.cs
index 9559023c140..76b30166c5c 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemMetadata.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemMetadata.cs
@@ -1,17 +1,16 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Routing;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public class ContentItemMetadata
 {
-    public class ContentItemMetadata
-    {
-        public RouteValueDictionary DisplayRouteValues { get; set; }
-        public RouteValueDictionary EditorRouteValues { get; set; }
-        public RouteValueDictionary CreateRouteValues { get; set; }
-        public RouteValueDictionary RemoveRouteValues { get; set; }
-        public RouteValueDictionary AdminRouteValues { get; set; }
+    public RouteValueDictionary DisplayRouteValues { get; set; }
+    public RouteValueDictionary EditorRouteValues { get; set; }
+    public RouteValueDictionary CreateRouteValues { get; set; }
+    public RouteValueDictionary RemoveRouteValues { get; set; }
+    public RouteValueDictionary AdminRouteValues { get; set; }
 
-        public readonly IList<GroupInfo> DisplayGroupInfo = [];
-        public readonly IList<GroupInfo> EditorGroupInfo = [];
-    }
+    public readonly IList<GroupInfo> DisplayGroupInfo = [];
+    public readonly IList<GroupInfo> EditorGroupInfo = [];
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentOptions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentOptions.cs
index 51f9b653949..a04de5b5570 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentOptions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentOptions.cs
@@ -3,83 +3,82 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+/// <summary>
+/// Provides a way to register code based content parts and fields.
+/// </summary>
+public class ContentOptions
 {
-    /// <summary>
-    /// Provides a way to register code based content parts and fields.
-    /// </summary>
-    public class ContentOptions
-    {
-        private readonly List<ContentPartOption> _contentParts = [];
-        private readonly List<ContentFieldOption> _contentFields = [];
+    private readonly List<ContentPartOption> _contentParts = [];
+    private readonly List<ContentFieldOption> _contentFields = [];
+
+    private IReadOnlyDictionary<string, ContentPartOption> _contentPartOptionsLookup;
+    public IReadOnlyDictionary<string, ContentPartOption> ContentPartOptionsLookup
+        => _contentPartOptionsLookup ??= ContentPartOptions.ToFrozenDictionary(k => k.Type.Name);
 
-        private IReadOnlyDictionary<string, ContentPartOption> _contentPartOptionsLookup;
-        public IReadOnlyDictionary<string, ContentPartOption> ContentPartOptionsLookup
-            => _contentPartOptionsLookup ??= ContentPartOptions.ToFrozenDictionary(k => k.Type.Name);
+    private IReadOnlyDictionary<string, ContentFieldOption> _contentFieldOptionsLookup;
+    public IReadOnlyDictionary<string, ContentFieldOption> ContentFieldOptionsLookup
+        => _contentFieldOptionsLookup ??= ContentFieldOptions.ToFrozenDictionary(k => k.Type.Name);
 
-        private IReadOnlyDictionary<string, ContentFieldOption> _contentFieldOptionsLookup;
-        public IReadOnlyDictionary<string, ContentFieldOption> ContentFieldOptionsLookup
-            => _contentFieldOptionsLookup ??= ContentFieldOptions.ToFrozenDictionary(k => k.Type.Name);
+    public IReadOnlyList<ContentPartOption> ContentPartOptions => _contentParts;
+    public IReadOnlyList<ContentFieldOption> ContentFieldOptions => _contentFields;
 
-        public IReadOnlyList<ContentPartOption> ContentPartOptions => _contentParts;
-        public IReadOnlyList<ContentFieldOption> ContentFieldOptions => _contentFields;
+    internal void AddPartHandler(Type contentPartType, Type handlerType)
+    {
+        var option = GetOrAddContentPart(contentPartType);
+        option.AddHandler(handlerType);
+    }
 
-        internal void AddPartHandler(Type contentPartType, Type handlerType)
+    internal void RemovePartHandler(Type contentPartType, Type handlerType)
+    {
+        var option = GetOrAddContentPart(contentPartType);
+        option.RemoveHandler(handlerType);
+    }
+
+    internal ContentPartOption GetOrAddContentPart(Type contentPartType)
+    {
+        if (!contentPartType.IsSubclassOf(typeof(ContentPart)))
         {
-            var option = GetOrAddContentPart(contentPartType);
-            option.AddHandler(handlerType);
+            throw new ArgumentException("The type must inherit from " + nameof(ContentPart));
         }
 
-        internal void RemovePartHandler(Type contentPartType, Type handlerType)
+        var option = _contentParts.FirstOrDefault(x => x.Type == contentPartType);
+        if (option == null)
         {
-            var option = GetOrAddContentPart(contentPartType);
-            option.RemoveHandler(handlerType);
+            option = new ContentPartOption(contentPartType);
+            _contentParts.Add(option);
         }
 
-        internal ContentPartOption GetOrAddContentPart(Type contentPartType)
-        {
-            if (!contentPartType.IsSubclassOf(typeof(ContentPart)))
-            {
-                throw new ArgumentException("The type must inherit from " + nameof(ContentPart));
-            }
+        return option;
+    }
 
-            var option = _contentParts.FirstOrDefault(x => x.Type == contentPartType);
-            if (option == null)
-            {
-                option = new ContentPartOption(contentPartType);
-                _contentParts.Add(option);
-            }
+    internal void AddFieldHandler(Type contentFieldType, Type handlerType)
+    {
+        var option = GetOrAddContentField(contentFieldType);
+        option.AddHandler(handlerType);
+    }
 
-            return option;
-        }
+    internal void RemoveFieldHandler(Type contentFieldType, Type handlerType)
+    {
+        var option = GetOrAddContentField(contentFieldType);
+        option.RemoveHandler(handlerType);
+    }
 
-        internal void AddFieldHandler(Type contentFieldType, Type handlerType)
+    internal ContentFieldOption GetOrAddContentField(Type contentFieldType)
+    {
+        if (!contentFieldType.IsSubclassOf(typeof(ContentField)))
         {
-            var option = GetOrAddContentField(contentFieldType);
-            option.AddHandler(handlerType);
+            throw new ArgumentException("The type must inherit from " + nameof(ContentField));
         }
 
-        internal void RemoveFieldHandler(Type contentFieldType, Type handlerType)
+        var option = _contentFields.FirstOrDefault(x => x.Type == contentFieldType);
+        if (option == null)
         {
-            var option = GetOrAddContentField(contentFieldType);
-            option.RemoveHandler(handlerType);
+            option = new ContentFieldOption(contentFieldType);
+            _contentFields.Add(option);
         }
 
-        internal ContentFieldOption GetOrAddContentField(Type contentFieldType)
-        {
-            if (!contentFieldType.IsSubclassOf(typeof(ContentField)))
-            {
-                throw new ArgumentException("The type must inherit from " + nameof(ContentField));
-            }
-
-            var option = _contentFields.FirstOrDefault(x => x.Type == contentFieldType);
-            if (option == null)
-            {
-                option = new ContentFieldOption(contentFieldType);
-                _contentFields.Add(option);
-            }
-
-            return option;
-        }
+        return option;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentPart.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentPart.cs
index a862a17539c..2138b964a9a 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentPart.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentPart.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public class ContentPart : ContentElement
 {
-    public class ContentPart : ContentElement
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentPartOption.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentPartOption.cs
index 7f3f79e5b7e..fc2e80487c1 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentPartOption.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentPartOption.cs
@@ -1,26 +1,25 @@
 using System;
 using System.Collections.Generic;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public class ContentPartOption : ContentPartOptionBase
 {
-    public class ContentPartOption : ContentPartOptionBase
-    {
-        private readonly List<Type> _handlers = [];
+    private readonly List<Type> _handlers = [];
 
-        public ContentPartOption(Type contentPartType) : base(contentPartType)
-        {
-        }
+    public ContentPartOption(Type contentPartType) : base(contentPartType)
+    {
+    }
 
-        public IReadOnlyList<Type> Handlers => _handlers;
+    public IReadOnlyList<Type> Handlers => _handlers;
 
-        internal void AddHandler(Type type)
-        {
-            _handlers.Add(type);
-        }
+    internal void AddHandler(Type type)
+    {
+        _handlers.Add(type);
+    }
 
-        internal void RemoveHandler(Type type)
-        {
-            _handlers.Remove(type);
-        }
+    internal void RemoveHandler(Type type)
+    {
+        _handlers.Remove(type);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentPartOptionBase.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentPartOptionBase.cs
index 9c6e9aaced7..9554c64504e 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentPartOptionBase.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentPartOptionBase.cs
@@ -1,16 +1,15 @@
 using System;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public abstract class ContentPartOptionBase
 {
-    public abstract class ContentPartOptionBase
+    public ContentPartOptionBase(Type contentPartType)
     {
-        public ContentPartOptionBase(Type contentPartType)
-        {
-            ArgumentNullException.ThrowIfNull(contentPartType);
-
-            Type = contentPartType;
-        }
+        ArgumentNullException.ThrowIfNull(contentPartType);
 
-        public Type Type { get; }
+        Type = contentPartType;
     }
+
+    public Type Type { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentPartOptionBuilder.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentPartOptionBuilder.cs
index d16a185dade..b3b3b2a4c2c 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentPartOptionBuilder.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentPartOptionBuilder.cs
@@ -1,17 +1,16 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public class ContentPartOptionBuilder
 {
-    public class ContentPartOptionBuilder
+    public ContentPartOptionBuilder(IServiceCollection services, Type contentPartType)
     {
-        public ContentPartOptionBuilder(IServiceCollection services, Type contentPartType)
-        {
-            Services = services;
-            ContentPartType = contentPartType;
-        }
-
-        public IServiceCollection Services { get; }
-        public Type ContentPartType { get; }
+        Services = services;
+        ContentPartType = contentPartType;
     }
+
+    public IServiceCollection Services { get; }
+    public Type ContentPartType { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentQueryExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentQueryExtensions.cs
index 587606b7f96..e875fe51c05 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentQueryExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentQueryExtensions.cs
@@ -2,42 +2,41 @@
 using System.Threading.Tasks;
 using YesSql;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+/// <summary>
+/// Allows to execute an <see cref="IQuery{ContentItem}"/> to return matching <see cref="ContentItem"/>s
+/// but after having invoked the load events on them by using the <see cref="IContentManager"/>.
+/// </summary>
+public static class ContentQueryExtensions
 {
     /// <summary>
-    /// Allows to execute an <see cref="IQuery{ContentItem}"/> to return matching <see cref="ContentItem"/>s
-    /// but after having invoked the load events on them by using the <see cref="IContentManager"/>.
+    /// Executes this <see cref="IQuery{ContentItem}"/> to return the first matching <see cref="ContentItem"/>
+    /// but after having invoked the load events on it by using the <see cref="IContentManager"/>.
     /// </summary>
-    public static class ContentQueryExtensions
+    public static async Task<ContentItem> FirstOrDefaultAsync(this IQuery<ContentItem> query, IContentManager contentManager)
     {
-        /// <summary>
-        /// Executes this <see cref="IQuery{ContentItem}"/> to return the first matching <see cref="ContentItem"/>
-        /// but after having invoked the load events on it by using the <see cref="IContentManager"/>.
-        /// </summary>
-        public static async Task<ContentItem> FirstOrDefaultAsync(this IQuery<ContentItem> query, IContentManager contentManager)
-        {
-            var contentItem = await query.FirstOrDefaultAsync();
-
-            if (contentItem == null)
-            {
-                return null;
-            }
+        var contentItem = await query.FirstOrDefaultAsync();
 
-            return await contentManager.LoadAsync(contentItem);
+        if (contentItem == null)
+        {
+            return null;
         }
 
-        /// <summary>
-        /// Executes this <see cref="IQuery{ContentItem}"/> to return all matching <see cref="ContentItem"/>s
-        /// but after having invoked the load events on them by using the <see cref="IContentManager"/>.
-        /// </summary>
-        public static async Task<IEnumerable<ContentItem>> ListAsync(this IQuery<ContentItem> query, IContentManager contentManager)
-            => await contentManager.LoadAsync(await query.ListAsync());
-
-        /// <summary>
-        /// Executes this <see cref="IQuery{ContentItem}"/> to return all matching <see cref="ContentItem"/>s
-        /// but after having invoked the load events on them by using the <see cref="IContentManager"/>.
-        /// </summary>
-        public static IAsyncEnumerable<ContentItem> ToAsyncEnumerable(this IQuery<ContentItem> query, IContentManager contentManager)
-            => contentManager.LoadAsync(query.ToAsyncEnumerable());
+        return await contentManager.LoadAsync(contentItem);
     }
+
+    /// <summary>
+    /// Executes this <see cref="IQuery{ContentItem}"/> to return all matching <see cref="ContentItem"/>s
+    /// but after having invoked the load events on them by using the <see cref="IContentManager"/>.
+    /// </summary>
+    public static async Task<IEnumerable<ContentItem>> ListAsync(this IQuery<ContentItem> query, IContentManager contentManager)
+        => await contentManager.LoadAsync(await query.ListAsync());
+
+    /// <summary>
+    /// Executes this <see cref="IQuery{ContentItem}"/> to return all matching <see cref="ContentItem"/>s
+    /// but after having invoked the load events on them by using the <see cref="IContentManager"/>.
+    /// </summary>
+    public static IAsyncEnumerable<ContentItem> ToAsyncEnumerable(this IQuery<ContentItem> query, IContentManager contentManager)
+        => contentManager.LoadAsync(query.ToAsyncEnumerable());
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentQueryOfTIndexExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentQueryOfTIndexExtensions.cs
index 7cfb5323e4e..61d9b9e8b2e 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentQueryOfTIndexExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentQueryOfTIndexExtensions.cs
@@ -3,45 +3,44 @@
 using YesSql;
 using YesSql.Indexes;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+/// <summary>
+/// Allows to execute an <see cref="IQuery{ContentItem, TIndex}"/> to return matching <see cref="ContentItem"/>s
+/// but after having invoked the load events on them by using the <see cref="IContentManager"/>.
+/// </summary>
+public static class ContentQueryOfTIndexExtensions
 {
     /// <summary>
-    /// Allows to execute an <see cref="IQuery{ContentItem, TIndex}"/> to return matching <see cref="ContentItem"/>s
-    /// but after having invoked the load events on them by using the <see cref="IContentManager"/>.
+    /// Executes this <see cref="IQuery{ContentItem}"/> to return the first matching <see cref="ContentItem"/>
+    /// but after having invoked the load events on it by using the <see cref="IContentManager"/>.
     /// </summary>
-    public static class ContentQueryOfTIndexExtensions
+    public static async Task<ContentItem> FirstOrDefaultAsync<TIndex>(this IQuery<ContentItem, TIndex> query, IContentManager contentManager)
+        where TIndex : class, IIndex
     {
-        /// <summary>
-        /// Executes this <see cref="IQuery{ContentItem}"/> to return the first matching <see cref="ContentItem"/>
-        /// but after having invoked the load events on it by using the <see cref="IContentManager"/>.
-        /// </summary>
-        public static async Task<ContentItem> FirstOrDefaultAsync<TIndex>(this IQuery<ContentItem, TIndex> query, IContentManager contentManager)
-            where TIndex : class, IIndex
-        {
-            var contentItem = await query.FirstOrDefaultAsync();
-
-            if (contentItem == null)
-            {
-                return null;
-            }
+        var contentItem = await query.FirstOrDefaultAsync();
 
-            return await contentManager.LoadAsync(contentItem);
+        if (contentItem == null)
+        {
+            return null;
         }
 
-        /// <summary>
-        /// Executes this <see cref="IQuery{ContentItem, TIndex}"/> to return all matching <see cref="ContentItem"/>s
-        /// but after having invoked the load events on them by using the <see cref="IContentManager"/>.
-        /// </summary>
-        public static async Task<IEnumerable<ContentItem>> ListAsync<TIndex>(this IQuery<ContentItem, TIndex> query, IContentManager contentManager)
-            where TIndex : class, IIndex
-            => await contentManager.LoadAsync(await query.ListAsync());
-
-        /// <summary>
-        /// Executes this <see cref="IQuery{ContentItem, TIndex}"/> to return all matching <see cref="ContentItem"/>s
-        /// but after having invoked the load events on them by using the <see cref="IContentManager"/>.
-        /// </summary>
-        public static IAsyncEnumerable<ContentItem> ToAsyncEnumerable<TIndex>(this IQuery<ContentItem, TIndex> query, IContentManager contentManager)
-            where TIndex : class, IIndex
-            => contentManager.LoadAsync(query.ToAsyncEnumerable());
+        return await contentManager.LoadAsync(contentItem);
     }
+
+    /// <summary>
+    /// Executes this <see cref="IQuery{ContentItem, TIndex}"/> to return all matching <see cref="ContentItem"/>s
+    /// but after having invoked the load events on them by using the <see cref="IContentManager"/>.
+    /// </summary>
+    public static async Task<IEnumerable<ContentItem>> ListAsync<TIndex>(this IQuery<ContentItem, TIndex> query, IContentManager contentManager)
+        where TIndex : class, IIndex
+        => await contentManager.LoadAsync(await query.ListAsync());
+
+    /// <summary>
+    /// Executes this <see cref="IQuery{ContentItem, TIndex}"/> to return all matching <see cref="ContentItem"/>s
+    /// but after having invoked the load events on them by using the <see cref="IContentManager"/>.
+    /// </summary>
+    public static IAsyncEnumerable<ContentItem> ToAsyncEnumerable<TIndex>(this IQuery<ContentItem, TIndex> query, IContentManager contentManager)
+        where TIndex : class, IIndex
+        => contentManager.LoadAsync(query.ToAsyncEnumerable());
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/GroupInfo.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/GroupInfo.cs
index 7f8dc210925..9b3538579a8 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/GroupInfo.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/GroupInfo.cs
@@ -1,22 +1,21 @@
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+/// <summary>
+/// Describes a group and its position relative to other groups.
+/// It's used in <see cref="ContentItemMetadata"/> to describe the potential
+/// groups that a content item can be displayed in.
+/// </summary>
+public class GroupInfo
 {
-    /// <summary>
-    /// Describes a group and its position relative to other groups.
-    /// It's used in <see cref="ContentItemMetadata"/> to describe the potential
-    /// groups that a content item can be displayed in.
-    /// </summary>
-    public class GroupInfo
+    public GroupInfo(LocalizedString name)
     {
-        public GroupInfo(LocalizedString name)
-        {
-            Id = name.Name;
-            Name = name;
-        }
-
-        public string Id { get; set; }
-        public LocalizedString Name { get; set; }
-        public string Position { get; set; }
+        Id = name.Name;
+        Name = name;
     }
+
+    public string Id { get; set; }
+    public LocalizedString Name { get; set; }
+    public string Position { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ActivatedContentContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ActivatedContentContext.cs
index bf5f7805a54..dd209046b69 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ActivatedContentContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ActivatedContentContext.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class ActivatedContentContext : ContentContextBase
 {
-    public class ActivatedContentContext : ContentContextBase
+    public ActivatedContentContext(ContentItem contentItem) : base(contentItem)
     {
-        public ActivatedContentContext(ContentItem contentItem) : base(contentItem)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ActivatingContentContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ActivatingContentContext.cs
index cf9a6f8219a..f24cb1ce0ce 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ActivatingContentContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ActivatingContentContext.cs
@@ -1,14 +1,13 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class ActivatingContentContext : ContentContextBase
 {
-    public class ActivatingContentContext : ContentContextBase
+    public ActivatingContentContext(ContentItem contentItem) : base(contentItem)
     {
-        public ActivatingContentContext(ContentItem contentItem) : base(contentItem)
-        {
-        }
-
-        public string ContentType { get; set; }
-        public ContentTypeDefinition Definition { get; set; }
     }
+
+    public string ContentType { get; set; }
+    public ContentTypeDefinition Definition { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/CloneContentContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/CloneContentContext.cs
index be1aa5d4a46..a18caf3dcf8 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/CloneContentContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/CloneContentContext.cs
@@ -1,13 +1,12 @@
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class CloneContentContext : ContentContextBase
 {
-    public class CloneContentContext : ContentContextBase
-    {
-        public ContentItem CloneContentItem { get; set; }
+    public ContentItem CloneContentItem { get; set; }
 
-        public CloneContentContext(ContentItem contentItem, ContentItem cloneContentItem)
-            : base(contentItem)
-        {
-            CloneContentItem = cloneContentItem;
-        }
+    public CloneContentContext(ContentItem contentItem, ContentItem cloneContentItem)
+        : base(contentItem)
+    {
+        CloneContentItem = cloneContentItem;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentContextBase.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentContextBase.cs
index 4ecc8b19151..aba7e3b502a 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentContextBase.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentContextBase.cs
@@ -1,12 +1,11 @@
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class ContentContextBase
 {
-    public class ContentContextBase
+    protected ContentContextBase(ContentItem contentItem)
     {
-        protected ContentContextBase(ContentItem contentItem)
-        {
-            ContentItem = contentItem;
-        }
-
-        public ContentItem ContentItem { get; private set; }
+        ContentItem = contentItem;
     }
+
+    public ContentItem ContentItem { get; private set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentFieldContextBase.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentFieldContextBase.cs
index 884941112b9..0b40e87f600 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentFieldContextBase.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentFieldContextBase.cs
@@ -1,18 +1,17 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class ContentFieldContextBase
 {
-    public class ContentFieldContextBase
+    protected ContentFieldContextBase(ContentItem contentItem)
     {
-        protected ContentFieldContextBase(ContentItem contentItem)
-        {
-            ContentItem = contentItem;
-        }
+        ContentItem = contentItem;
+    }
 
-        public ContentItem ContentItem { get; private set; }
+    public ContentItem ContentItem { get; private set; }
 
-        public ContentPartFieldDefinition ContentPartFieldDefinition { get; set; }
+    public ContentPartFieldDefinition ContentPartFieldDefinition { get; set; }
 
-        public string PartName { get; set; }
-    }
+    public string PartName { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentHandlerBase.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentHandlerBase.cs
index 73a468bec4f..179182ccc3a 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentHandlerBase.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentHandlerBase.cs
@@ -1,150 +1,149 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public abstract class ContentHandlerBase : IContentHandler
 {
-    public abstract class ContentHandlerBase : IContentHandler
-    {
-        public virtual Task ActivatingAsync(ActivatingContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task ActivatedAsync(ActivatedContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task InitializingAsync(InitializingContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task InitializedAsync(InitializingContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task CreatingAsync(CreateContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-        public virtual Task CreatedAsync(CreateContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task ImportingAsync(ImportContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task ImportedAsync(ImportContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task LoadingAsync(LoadContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task LoadedAsync(LoadContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task UpdatingAsync(UpdateContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task UpdatedAsync(UpdateContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task ValidatingAsync(ValidateContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task ValidatedAsync(ValidateContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task RestoringAsync(RestoreContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task RestoredAsync(RestoreContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task VersioningAsync(VersionContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task VersionedAsync(VersionContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task DraftSavingAsync(SaveDraftContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task DraftSavedAsync(SaveDraftContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task PublishingAsync(PublishContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task PublishedAsync(PublishContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task UnpublishingAsync(PublishContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task UnpublishedAsync(PublishContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task RemovingAsync(RemoveContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task RemovedAsync(RemoveContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task CloningAsync(CloneContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-        public virtual Task ClonedAsync(CloneContentContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task GetContentItemAspectAsync(ContentItemAspectContext context)
-        {
-            return Task.CompletedTask;
-        }
+    public virtual Task ActivatingAsync(ActivatingContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task ActivatedAsync(ActivatedContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task InitializingAsync(InitializingContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task InitializedAsync(InitializingContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task CreatingAsync(CreateContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+    public virtual Task CreatedAsync(CreateContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task ImportingAsync(ImportContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task ImportedAsync(ImportContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task LoadingAsync(LoadContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task LoadedAsync(LoadContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task UpdatingAsync(UpdateContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task UpdatedAsync(UpdateContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task ValidatingAsync(ValidateContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task ValidatedAsync(ValidateContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task RestoringAsync(RestoreContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task RestoredAsync(RestoreContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task VersioningAsync(VersionContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task VersionedAsync(VersionContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task DraftSavingAsync(SaveDraftContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task DraftSavedAsync(SaveDraftContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task PublishingAsync(PublishContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task PublishedAsync(PublishContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task UnpublishingAsync(PublishContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task UnpublishedAsync(PublishContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task RemovingAsync(RemoveContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task RemovedAsync(RemoveContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task CloningAsync(CloneContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+    public virtual Task ClonedAsync(CloneContentContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task GetContentItemAspectAsync(ContentItemAspectContext context)
+    {
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentItemAspectContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentItemAspectContext.cs
index 2ac802a6000..42ec364b480 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentItemAspectContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentItemAspectContext.cs
@@ -1,26 +1,25 @@
 using System;
 using System.Threading.Tasks;
 
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class ContentItemAspectContext
 {
-    public class ContentItemAspectContext
+    public ContentItem ContentItem { get; set; }
+    public object Aspect { get; set; }
+
+    /// <summary>
+    /// Provides a value for a specific aspect type.
+    /// </summary>
+    public async Task<ContentItemAspectContext> ForAsync<TAspect>(Func<TAspect, Task> action) where TAspect : class
     {
-        public ContentItem ContentItem { get; set; }
-        public object Aspect { get; set; }
+        var aspect = Aspect as TAspect;
 
-        /// <summary>
-        /// Provides a value for a specific aspect type.
-        /// </summary>
-        public async Task<ContentItemAspectContext> ForAsync<TAspect>(Func<TAspect, Task> action) where TAspect : class
+        if (aspect != null)
         {
-            var aspect = Aspect as TAspect;
-
-            if (aspect != null)
-            {
-                await action(aspect);
-            }
-
-            return this;
+            await action(aspect);
         }
+
+        return this;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentItemMetadataContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentItemMetadataContext.cs
index be02d8ed348..337d336b021 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentItemMetadataContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentItemMetadataContext.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class ContentItemMetadataContext
 {
-    public class ContentItemMetadataContext
-    {
-        public ContentItem ContentItem { get; set; }
-        public ContentItemMetadata Metadata { get; set; }
-    }
+    public ContentItem ContentItem { get; set; }
+    public ContentItemMetadata Metadata { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentPartHandler.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentPartHandler.cs
index 34f14333ace..6cb82fb0783 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentPartHandler.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentPartHandler.cs
@@ -1,246 +1,245 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public abstract class ContentPartHandler<TPart> : IContentPartHandler where TPart : ContentPart, new()
 {
-    public abstract class ContentPartHandler<TPart> : IContentPartHandler where TPart : ContentPart, new()
+    Task IContentPartHandler.ActivatedAsync(ActivatedContentContext context, ContentPart part)
     {
-        Task IContentPartHandler.ActivatedAsync(ActivatedContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? ActivatedAsync(context, tpart)
-                : Task.CompletedTask;
-        }
+        return part is TPart tpart
+            ? ActivatedAsync(context, tpart)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.ActivatingAsync(ActivatingContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? ActivatingAsync(context, tpart)
-                : Task.CompletedTask;
-        }
+    Task IContentPartHandler.ActivatingAsync(ActivatingContentContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? ActivatingAsync(context, tpart)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.InitializingAsync(InitializingContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? InitializingAsync(context, tpart)
-                : Task.CompletedTask;
-        }
+    Task IContentPartHandler.InitializingAsync(InitializingContentContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? InitializingAsync(context, tpart)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.InitializedAsync(InitializingContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? InitializedAsync(context, tpart)
-                : Task.CompletedTask;
-        }
+    Task IContentPartHandler.InitializedAsync(InitializingContentContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? InitializedAsync(context, tpart)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.CreatingAsync(CreateContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? CreatingAsync(context, tpart)
-                : Task.CompletedTask;
-        }
+    Task IContentPartHandler.CreatingAsync(CreateContentContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? CreatingAsync(context, tpart)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.CreatedAsync(CreateContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? CreatedAsync(context, tpart)
-                : Task.CompletedTask;
-        }
+    Task IContentPartHandler.CreatedAsync(CreateContentContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? CreatedAsync(context, tpart)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.LoadingAsync(LoadContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? LoadingAsync(context, tpart)
-                : Task.CompletedTask;
-        }
+    Task IContentPartHandler.LoadingAsync(LoadContentContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? LoadingAsync(context, tpart)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.LoadedAsync(LoadContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? LoadedAsync(context, tpart)
-                : Task.CompletedTask;
-        }
+    Task IContentPartHandler.LoadedAsync(LoadContentContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? LoadedAsync(context, tpart)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.ImportingAsync(ImportContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? ImportingAsync(context, tpart)
-                : Task.CompletedTask;
-        }
+    Task IContentPartHandler.ImportingAsync(ImportContentContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? ImportingAsync(context, tpart)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.ImportedAsync(ImportContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? ImportedAsync(context, tpart)
-                : Task.CompletedTask;
-        }
-        Task IContentPartHandler.UpdatingAsync(UpdateContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? UpdatingAsync(context, tpart)
-                : Task.CompletedTask;
-        }
+    Task IContentPartHandler.ImportedAsync(ImportContentContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? ImportedAsync(context, tpart)
+            : Task.CompletedTask;
+    }
+    Task IContentPartHandler.UpdatingAsync(UpdateContentContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? UpdatingAsync(context, tpart)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.UpdatedAsync(UpdateContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? UpdatedAsync(context, tpart)
-                : Task.CompletedTask;
-        }
+    Task IContentPartHandler.UpdatedAsync(UpdateContentContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? UpdatedAsync(context, tpart)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.ValidatingAsync(ValidateContentContext context, ContentPart part)
+    Task IContentPartHandler.ValidatingAsync(ValidateContentContext context, ContentPart part)
+    {
+        if (part is TPart tpart)
         {
-            if (part is TPart tpart)
+            if (context is ValidateContentPartContext partContext)
             {
-                if (context is ValidateContentPartContext partContext)
-                {
-                    return ValidatingAsync(partContext, tpart);
-                }
-
-                return ValidatingAsync(context, tpart);
+                return ValidatingAsync(partContext, tpart);
             }
 
-            return Task.CompletedTask;
+            return ValidatingAsync(context, tpart);
         }
 
-        Task IContentPartHandler.ValidatedAsync(ValidateContentContext context, ContentPart part)
+        return Task.CompletedTask;
+    }
+
+    Task IContentPartHandler.ValidatedAsync(ValidateContentContext context, ContentPart part)
+    {
+        if (part is TPart tpart)
         {
-            if (part is TPart tpart)
+            if (context is ValidateContentPartContext partContext)
             {
-                if (context is ValidateContentPartContext partContext)
-                {
-                    return ValidatedAsync(partContext, tpart);
-                }
-
-                return ValidatedAsync(context, tpart);
+                return ValidatedAsync(partContext, tpart);
             }
 
-            return Task.CompletedTask;
+            return ValidatedAsync(context, tpart);
         }
 
-        Task IContentPartHandler.VersioningAsync(VersionContentContext context, ContentPart existing, ContentPart building)
-        {
-            return existing is TPart texisting && building is TPart tbuilding
-                ? VersioningAsync(context, texisting, tbuilding)
-                : Task.CompletedTask;
-        }
+        return Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.VersionedAsync(VersionContentContext context, ContentPart existing, ContentPart building)
-        {
-            return existing is TPart texisting && building is TPart tbuilding
-                ? VersionedAsync(context, texisting, tbuilding)
-                : Task.CompletedTask;
-        }
+    Task IContentPartHandler.VersioningAsync(VersionContentContext context, ContentPart existing, ContentPart building)
+    {
+        return existing is TPart texisting && building is TPart tbuilding
+            ? VersioningAsync(context, texisting, tbuilding)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.DraftSavingAsync(SaveDraftContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? DraftSavingAsync(context, tpart)
-                : Task.CompletedTask;
-        }
+    Task IContentPartHandler.VersionedAsync(VersionContentContext context, ContentPart existing, ContentPart building)
+    {
+        return existing is TPart texisting && building is TPart tbuilding
+            ? VersionedAsync(context, texisting, tbuilding)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.DraftSavedAsync(SaveDraftContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? DraftSavedAsync(context, tpart)
-                : Task.CompletedTask;
-        }
+    Task IContentPartHandler.DraftSavingAsync(SaveDraftContentContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? DraftSavingAsync(context, tpart)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.PublishingAsync(PublishContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? PublishingAsync(context, tpart)
-                : Task.CompletedTask;
-        }
+    Task IContentPartHandler.DraftSavedAsync(SaveDraftContentContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? DraftSavedAsync(context, tpart)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.PublishedAsync(PublishContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? PublishedAsync(context, tpart)
-                : Task.CompletedTask;
-        }
+    Task IContentPartHandler.PublishingAsync(PublishContentContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? PublishingAsync(context, tpart)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.UnpublishingAsync(PublishContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? UnpublishingAsync(context, tpart)
-                : Task.CompletedTask;
-        }
+    Task IContentPartHandler.PublishedAsync(PublishContentContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? PublishedAsync(context, tpart)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.UnpublishedAsync(PublishContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? UnpublishedAsync(context, tpart)
-                : Task.CompletedTask;
-        }
+    Task IContentPartHandler.UnpublishingAsync(PublishContentContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? UnpublishingAsync(context, tpart)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.RemovingAsync(RemoveContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? RemovingAsync(context, tpart)
-                : Task.CompletedTask;
-        }
+    Task IContentPartHandler.UnpublishedAsync(PublishContentContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? UnpublishedAsync(context, tpart)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.RemovedAsync(RemoveContentContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? RemovedAsync(context, tpart)
-                : Task.CompletedTask;
-        }
+    Task IContentPartHandler.RemovingAsync(RemoveContentContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? RemovingAsync(context, tpart)
+            : Task.CompletedTask;
+    }
 
-        Task IContentPartHandler.GetContentItemAspectAsync(ContentItemAspectContext context, ContentPart part)
-        {
-            return part is TPart tpart
-                ? GetContentItemAspectAsync(context, tpart)
-                : Task.CompletedTask;
-        }
-        async Task IContentPartHandler.CloningAsync(CloneContentContext context, ContentPart part)
+    Task IContentPartHandler.RemovedAsync(RemoveContentContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? RemovedAsync(context, tpart)
+            : Task.CompletedTask;
+    }
+
+    Task IContentPartHandler.GetContentItemAspectAsync(ContentItemAspectContext context, ContentPart part)
+    {
+        return part is TPart tpart
+            ? GetContentItemAspectAsync(context, tpart)
+            : Task.CompletedTask;
+    }
+    async Task IContentPartHandler.CloningAsync(CloneContentContext context, ContentPart part)
+    {
+        if (part is TPart tpart)
         {
-            if (part is TPart tpart)
-            {
-                await CloningAsync(context, tpart);
-            }
+            await CloningAsync(context, tpart);
         }
+    }
 
-        async Task IContentPartHandler.ClonedAsync(CloneContentContext context, ContentPart part)
+    async Task IContentPartHandler.ClonedAsync(CloneContentContext context, ContentPart part)
+    {
+        if (part is TPart tpart)
         {
-            if (part is TPart tpart)
-            {
-                await ClonedAsync(context, tpart);
-            }
+            await ClonedAsync(context, tpart);
         }
-
-        public virtual Task ActivatedAsync(ActivatedContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task ActivatingAsync(ActivatingContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task InitializingAsync(InitializingContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task InitializedAsync(InitializingContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task CreatingAsync(CreateContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task CreatedAsync(CreateContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task LoadingAsync(LoadContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task LoadedAsync(LoadContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task ImportingAsync(ImportContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task ImportedAsync(ImportContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task UpdatingAsync(UpdateContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task UpdatedAsync(UpdateContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task ValidatingAsync(ValidateContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task ValidatedAsync(ValidateContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task VersioningAsync(VersionContentContext context, TPart existing, TPart building) => Task.CompletedTask;
-        public virtual Task VersionedAsync(VersionContentContext context, TPart existing, TPart building) => Task.CompletedTask;
-        public virtual Task DraftSavingAsync(SaveDraftContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task DraftSavedAsync(SaveDraftContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task PublishingAsync(PublishContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task PublishedAsync(PublishContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task UnpublishingAsync(PublishContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task UnpublishedAsync(PublishContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task RemovingAsync(RemoveContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task RemovedAsync(RemoveContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task GetContentItemAspectAsync(ContentItemAspectContext context, TPart part) => Task.CompletedTask;
-        public virtual Task CloningAsync(CloneContentContext context, TPart part) => Task.CompletedTask;
-        public virtual Task ClonedAsync(CloneContentContext context, TPart part) => Task.CompletedTask;
-
-        protected virtual Task ValidatingAsync(ValidateContentPartContext context, TPart part)
-            => ValidatingAsync(context as ValidateContentContext, part);
-
-        protected virtual Task ValidatedAsync(ValidateContentPartContext context, TPart part)
-            => ValidatedAsync(context as ValidateContentContext, part);
     }
+
+    public virtual Task ActivatedAsync(ActivatedContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task ActivatingAsync(ActivatingContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task InitializingAsync(InitializingContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task InitializedAsync(InitializingContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task CreatingAsync(CreateContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task CreatedAsync(CreateContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task LoadingAsync(LoadContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task LoadedAsync(LoadContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task ImportingAsync(ImportContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task ImportedAsync(ImportContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task UpdatingAsync(UpdateContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task UpdatedAsync(UpdateContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task ValidatingAsync(ValidateContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task ValidatedAsync(ValidateContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task VersioningAsync(VersionContentContext context, TPart existing, TPart building) => Task.CompletedTask;
+    public virtual Task VersionedAsync(VersionContentContext context, TPart existing, TPart building) => Task.CompletedTask;
+    public virtual Task DraftSavingAsync(SaveDraftContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task DraftSavedAsync(SaveDraftContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task PublishingAsync(PublishContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task PublishedAsync(PublishContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task UnpublishingAsync(PublishContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task UnpublishedAsync(PublishContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task RemovingAsync(RemoveContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task RemovedAsync(RemoveContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task GetContentItemAspectAsync(ContentItemAspectContext context, TPart part) => Task.CompletedTask;
+    public virtual Task CloningAsync(CloneContentContext context, TPart part) => Task.CompletedTask;
+    public virtual Task ClonedAsync(CloneContentContext context, TPart part) => Task.CompletedTask;
+
+    protected virtual Task ValidatingAsync(ValidateContentPartContext context, TPart part)
+        => ValidatingAsync(context as ValidateContentContext, part);
+
+    protected virtual Task ValidatedAsync(ValidateContentPartContext context, TPart part)
+        => ValidatedAsync(context as ValidateContentContext, part);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentValidateResult.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentValidateResult.cs
index 59d25091d87..dc61408f232 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentValidateResult.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ContentValidateResult.cs
@@ -1,24 +1,23 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.ContentManagement.Handlers
-{
-    public class ContentValidateResult
-    {
-        private readonly List<ValidationResult> _errors = [];
+namespace OrchardCore.ContentManagement.Handlers;
 
-        public IReadOnlyList<ValidationResult> Errors => _errors;
+public class ContentValidateResult
+{
+    private readonly List<ValidationResult> _errors = [];
 
-        /// <summary>
-        /// Success may be altered by a handler during the validated async event.
-        /// </summary>
-        public bool Succeeded { get; set; } = true;
+    public IReadOnlyList<ValidationResult> Errors => _errors;
 
-        public void Fail(ValidationResult error)
-        {
-            Succeeded = false;
-            _errors.Add(error);
-        }
+    /// <summary>
+    /// Success may be altered by a handler during the validated async event.
+    /// </summary>
+    public bool Succeeded { get; set; } = true;
 
+    public void Fail(ValidationResult error)
+    {
+        Succeeded = false;
+        _errors.Add(error);
     }
+
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/CreateContentContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/CreateContentContext.cs
index e3996726111..1567d394b42 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/CreateContentContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/CreateContentContext.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class CreateContentContext : ContentContextBase
 {
-    public class CreateContentContext : ContentContextBase
+    public CreateContentContext(ContentItem contentItem) : base(contentItem)
     {
-        public CreateContentContext(ContentItem contentItem) : base(contentItem)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentFieldHandler.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentFieldHandler.cs
index a82335775b2..3dd087f7024 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentFieldHandler.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentFieldHandler.cs
@@ -1,38 +1,37 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+/// <summary>
+/// An implementation of this class is called for all the fields of a content item.
+/// </summary>
+public interface IContentFieldHandler
 {
-    /// <summary>
-    /// An implementation of this class is called for all the fields of a content item.
-    /// </summary>
-    public interface IContentFieldHandler
-    {
-        Task ActivatedAsync(ActivatedContentFieldContext context, ContentField field);
-        Task ActivatingAsync(ActivatingContentFieldContext context, ContentField field);
-        Task InitializingAsync(InitializingContentFieldContext context, ContentField field);
-        Task InitializedAsync(InitializingContentFieldContext context, ContentField field);
-        Task CreatingAsync(CreateContentFieldContext context, ContentField field);
-        Task CreatedAsync(CreateContentFieldContext context, ContentField field);
-        Task LoadingAsync(LoadContentFieldContext context, ContentField field);
-        Task LoadedAsync(LoadContentFieldContext context, ContentField field);
-        Task ImportingAsync(ImportContentFieldContext context, ContentField field);
-        Task ImportedAsync(ImportContentFieldContext context, ContentField field);
-        Task UpdatingAsync(UpdateContentFieldContext context, ContentField field);
-        Task UpdatedAsync(UpdateContentFieldContext context, ContentField field);
-        Task ValidatingAsync(ValidateContentFieldContext context, ContentField field);
-        Task ValidatedAsync(ValidateContentFieldContext context, ContentField field);
-        Task VersioningAsync(VersionContentFieldContext context, ContentField existing, ContentField building);
-        Task VersionedAsync(VersionContentFieldContext context, ContentField existing, ContentField building);
-        Task DraftSavingAsync(SaveDraftContentFieldContext context, ContentField field);
-        Task DraftSavedAsync(SaveDraftContentFieldContext context, ContentField field);
-        Task PublishingAsync(PublishContentFieldContext context, ContentField field);
-        Task PublishedAsync(PublishContentFieldContext context, ContentField field);
-        Task UnpublishingAsync(PublishContentFieldContext context, ContentField field);
-        Task UnpublishedAsync(PublishContentFieldContext context, ContentField field);
-        Task RemovingAsync(RemoveContentFieldContext context, ContentField field);
-        Task RemovedAsync(RemoveContentFieldContext context, ContentField field);
-        Task GetContentItemAspectAsync(ContentItemAspectContext context, ContentField field);
-        Task CloningAsync(CloneContentFieldContext context, ContentField field);
-        Task ClonedAsync(CloneContentFieldContext context, ContentField field);
-    }
+    Task ActivatedAsync(ActivatedContentFieldContext context, ContentField field);
+    Task ActivatingAsync(ActivatingContentFieldContext context, ContentField field);
+    Task InitializingAsync(InitializingContentFieldContext context, ContentField field);
+    Task InitializedAsync(InitializingContentFieldContext context, ContentField field);
+    Task CreatingAsync(CreateContentFieldContext context, ContentField field);
+    Task CreatedAsync(CreateContentFieldContext context, ContentField field);
+    Task LoadingAsync(LoadContentFieldContext context, ContentField field);
+    Task LoadedAsync(LoadContentFieldContext context, ContentField field);
+    Task ImportingAsync(ImportContentFieldContext context, ContentField field);
+    Task ImportedAsync(ImportContentFieldContext context, ContentField field);
+    Task UpdatingAsync(UpdateContentFieldContext context, ContentField field);
+    Task UpdatedAsync(UpdateContentFieldContext context, ContentField field);
+    Task ValidatingAsync(ValidateContentFieldContext context, ContentField field);
+    Task ValidatedAsync(ValidateContentFieldContext context, ContentField field);
+    Task VersioningAsync(VersionContentFieldContext context, ContentField existing, ContentField building);
+    Task VersionedAsync(VersionContentFieldContext context, ContentField existing, ContentField building);
+    Task DraftSavingAsync(SaveDraftContentFieldContext context, ContentField field);
+    Task DraftSavedAsync(SaveDraftContentFieldContext context, ContentField field);
+    Task PublishingAsync(PublishContentFieldContext context, ContentField field);
+    Task PublishedAsync(PublishContentFieldContext context, ContentField field);
+    Task UnpublishingAsync(PublishContentFieldContext context, ContentField field);
+    Task UnpublishedAsync(PublishContentFieldContext context, ContentField field);
+    Task RemovingAsync(RemoveContentFieldContext context, ContentField field);
+    Task RemovedAsync(RemoveContentFieldContext context, ContentField field);
+    Task GetContentItemAspectAsync(ContentItemAspectContext context, ContentField field);
+    Task CloningAsync(CloneContentFieldContext context, ContentField field);
+    Task ClonedAsync(CloneContentFieldContext context, ContentField field);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentFieldHandlerResolver.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentFieldHandlerResolver.cs
index 2d5b68da87d..ee0942d425c 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentFieldHandlerResolver.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentFieldHandlerResolver.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public interface IContentFieldHandlerResolver
 {
-    public interface IContentFieldHandlerResolver
-    {
-        IList<IContentFieldHandler> GetHandlers(string fieldName);
-    }
+    IList<IContentFieldHandler> GetHandlers(string fieldName);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentHandler.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentHandler.cs
index e5354410963..9c8921b04eb 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentHandler.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentHandler.cs
@@ -1,37 +1,36 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public interface IContentHandler
 {
-    public interface IContentHandler
-    {
-        Task ActivatingAsync(ActivatingContentContext context);
-        Task ActivatedAsync(ActivatedContentContext context);
-        Task InitializingAsync(InitializingContentContext context);
-        Task InitializedAsync(InitializingContentContext context);
-        Task CreatingAsync(CreateContentContext context);
-        Task CreatedAsync(CreateContentContext context);
-        Task LoadingAsync(LoadContentContext context);
-        Task LoadedAsync(LoadContentContext context);
-        Task ImportingAsync(ImportContentContext context);
-        Task ImportedAsync(ImportContentContext context);
-        Task UpdatingAsync(UpdateContentContext context);
-        Task UpdatedAsync(UpdateContentContext context);
-        Task ValidatingAsync(ValidateContentContext context);
-        Task ValidatedAsync(ValidateContentContext context);
-        Task RestoringAsync(RestoreContentContext context);
-        Task RestoredAsync(RestoreContentContext context);
-        Task VersioningAsync(VersionContentContext context);
-        Task VersionedAsync(VersionContentContext context);
-        Task DraftSavingAsync(SaveDraftContentContext context);
-        Task DraftSavedAsync(SaveDraftContentContext context);
-        Task PublishingAsync(PublishContentContext context);
-        Task PublishedAsync(PublishContentContext context);
-        Task UnpublishingAsync(PublishContentContext context);
-        Task UnpublishedAsync(PublishContentContext context);
-        Task RemovingAsync(RemoveContentContext context);
-        Task RemovedAsync(RemoveContentContext context);
-        Task GetContentItemAspectAsync(ContentItemAspectContext context);
-        Task CloningAsync(CloneContentContext context);
-        Task ClonedAsync(CloneContentContext context);
-    }
+    Task ActivatingAsync(ActivatingContentContext context);
+    Task ActivatedAsync(ActivatedContentContext context);
+    Task InitializingAsync(InitializingContentContext context);
+    Task InitializedAsync(InitializingContentContext context);
+    Task CreatingAsync(CreateContentContext context);
+    Task CreatedAsync(CreateContentContext context);
+    Task LoadingAsync(LoadContentContext context);
+    Task LoadedAsync(LoadContentContext context);
+    Task ImportingAsync(ImportContentContext context);
+    Task ImportedAsync(ImportContentContext context);
+    Task UpdatingAsync(UpdateContentContext context);
+    Task UpdatedAsync(UpdateContentContext context);
+    Task ValidatingAsync(ValidateContentContext context);
+    Task ValidatedAsync(ValidateContentContext context);
+    Task RestoringAsync(RestoreContentContext context);
+    Task RestoredAsync(RestoreContentContext context);
+    Task VersioningAsync(VersionContentContext context);
+    Task VersionedAsync(VersionContentContext context);
+    Task DraftSavingAsync(SaveDraftContentContext context);
+    Task DraftSavedAsync(SaveDraftContentContext context);
+    Task PublishingAsync(PublishContentContext context);
+    Task PublishedAsync(PublishContentContext context);
+    Task UnpublishingAsync(PublishContentContext context);
+    Task UnpublishedAsync(PublishContentContext context);
+    Task RemovingAsync(RemoveContentContext context);
+    Task RemovedAsync(RemoveContentContext context);
+    Task GetContentItemAspectAsync(ContentItemAspectContext context);
+    Task CloningAsync(CloneContentContext context);
+    Task ClonedAsync(CloneContentContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentPartHandler.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentPartHandler.cs
index 4a899a54da0..9da48a79363 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentPartHandler.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentPartHandler.cs
@@ -1,38 +1,37 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+/// <summary>
+/// An implementation of this class is called for all the parts of a content item.
+/// </summary>
+public interface IContentPartHandler
 {
-    /// <summary>
-    /// An implementation of this class is called for all the parts of a content item.
-    /// </summary>
-    public interface IContentPartHandler
-    {
-        Task ActivatedAsync(ActivatedContentContext context, ContentPart part);
-        Task ActivatingAsync(ActivatingContentContext context, ContentPart part);
-        Task InitializingAsync(InitializingContentContext context, ContentPart part);
-        Task InitializedAsync(InitializingContentContext context, ContentPart part);
-        Task CreatingAsync(CreateContentContext context, ContentPart part);
-        Task CreatedAsync(CreateContentContext context, ContentPart part);
-        Task LoadingAsync(LoadContentContext context, ContentPart part);
-        Task LoadedAsync(LoadContentContext context, ContentPart part);
-        Task ImportingAsync(ImportContentContext context, ContentPart part);
-        Task ImportedAsync(ImportContentContext context, ContentPart part);
-        Task UpdatingAsync(UpdateContentContext context, ContentPart part);
-        Task UpdatedAsync(UpdateContentContext context, ContentPart part);
-        Task ValidatingAsync(ValidateContentContext context, ContentPart part);
-        Task ValidatedAsync(ValidateContentContext context, ContentPart part);
-        Task VersioningAsync(VersionContentContext context, ContentPart existing, ContentPart building);
-        Task VersionedAsync(VersionContentContext context, ContentPart existing, ContentPart building);
-        Task DraftSavingAsync(SaveDraftContentContext context, ContentPart part);
-        Task DraftSavedAsync(SaveDraftContentContext context, ContentPart part);
-        Task PublishingAsync(PublishContentContext context, ContentPart part);
-        Task PublishedAsync(PublishContentContext context, ContentPart part);
-        Task UnpublishingAsync(PublishContentContext context, ContentPart part);
-        Task UnpublishedAsync(PublishContentContext context, ContentPart part);
-        Task RemovingAsync(RemoveContentContext context, ContentPart part);
-        Task RemovedAsync(RemoveContentContext context, ContentPart part);
-        Task GetContentItemAspectAsync(ContentItemAspectContext context, ContentPart part);
-        Task CloningAsync(CloneContentContext context, ContentPart part);
-        Task ClonedAsync(CloneContentContext context, ContentPart part);
-    }
+    Task ActivatedAsync(ActivatedContentContext context, ContentPart part);
+    Task ActivatingAsync(ActivatingContentContext context, ContentPart part);
+    Task InitializingAsync(InitializingContentContext context, ContentPart part);
+    Task InitializedAsync(InitializingContentContext context, ContentPart part);
+    Task CreatingAsync(CreateContentContext context, ContentPart part);
+    Task CreatedAsync(CreateContentContext context, ContentPart part);
+    Task LoadingAsync(LoadContentContext context, ContentPart part);
+    Task LoadedAsync(LoadContentContext context, ContentPart part);
+    Task ImportingAsync(ImportContentContext context, ContentPart part);
+    Task ImportedAsync(ImportContentContext context, ContentPart part);
+    Task UpdatingAsync(UpdateContentContext context, ContentPart part);
+    Task UpdatedAsync(UpdateContentContext context, ContentPart part);
+    Task ValidatingAsync(ValidateContentContext context, ContentPart part);
+    Task ValidatedAsync(ValidateContentContext context, ContentPart part);
+    Task VersioningAsync(VersionContentContext context, ContentPart existing, ContentPart building);
+    Task VersionedAsync(VersionContentContext context, ContentPart existing, ContentPart building);
+    Task DraftSavingAsync(SaveDraftContentContext context, ContentPart part);
+    Task DraftSavedAsync(SaveDraftContentContext context, ContentPart part);
+    Task PublishingAsync(PublishContentContext context, ContentPart part);
+    Task PublishedAsync(PublishContentContext context, ContentPart part);
+    Task UnpublishingAsync(PublishContentContext context, ContentPart part);
+    Task UnpublishedAsync(PublishContentContext context, ContentPart part);
+    Task RemovingAsync(RemoveContentContext context, ContentPart part);
+    Task RemovedAsync(RemoveContentContext context, ContentPart part);
+    Task GetContentItemAspectAsync(ContentItemAspectContext context, ContentPart part);
+    Task CloningAsync(CloneContentContext context, ContentPart part);
+    Task ClonedAsync(CloneContentContext context, ContentPart part);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentPartHandlerResolver.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentPartHandlerResolver.cs
index a462c60583a..16a3937ab04 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentPartHandlerResolver.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/IContentPartHandlerResolver.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public interface IContentPartHandlerResolver
 {
-    public interface IContentPartHandlerResolver
-    {
-        IList<IContentPartHandler> GetHandlers(string partName);
-    }
+    IList<IContentPartHandler> GetHandlers(string partName);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ImportContentContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ImportContentContext.cs
index a3f72406510..abb1b6f11eb 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ImportContentContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ImportContentContext.cs
@@ -1,15 +1,14 @@
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class ImportContentContext : ContentContextBase
 {
-    public class ImportContentContext : ContentContextBase
-    {
-        /// <summary>
-        /// When importing an item may exist in the database.
-        /// </summary>
-        public ContentItem OriginalContentItem { get; set; }
+    /// <summary>
+    /// When importing an item may exist in the database.
+    /// </summary>
+    public ContentItem OriginalContentItem { get; set; }
 
-        public ImportContentContext(ContentItem contentItem, ContentItem originalContentItem = null) : base(contentItem)
-        {
-            OriginalContentItem = originalContentItem;
-        }
+    public ImportContentContext(ContentItem contentItem, ContentItem originalContentItem = null) : base(contentItem)
+    {
+        OriginalContentItem = originalContentItem;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/InitializingContentContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/InitializingContentContext.cs
index bece48c4305..a81664da2d0 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/InitializingContentContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/InitializingContentContext.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class InitializingContentContext : ContentContextBase
 {
-    public class InitializingContentContext : ContentContextBase
+    public InitializingContentContext(ContentItem contentItem) : base(contentItem)
     {
-        public InitializingContentContext(ContentItem contentItem) : base(contentItem)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/LoadContentContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/LoadContentContext.cs
index f9147e3570c..cf36eaa9a44 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/LoadContentContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/LoadContentContext.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class LoadContentContext : ContentContextBase
 {
-    public class LoadContentContext : ContentContextBase
+    public LoadContentContext(ContentItem contentItem) : base(contentItem)
     {
-        public LoadContentContext(ContentItem contentItem) : base(contentItem)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/PublishContentContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/PublishContentContext.cs
index 88a94aa3630..72b5843d37f 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/PublishContentContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/PublishContentContext.cs
@@ -1,16 +1,15 @@
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class PublishContentContext : ContentContextBase
 {
-    public class PublishContentContext : ContentContextBase
+    public PublishContentContext(ContentItem contentItem, ContentItem previousContentItem) : base(contentItem)
     {
-        public PublishContentContext(ContentItem contentItem, ContentItem previousContentItem) : base(contentItem)
-        {
-            PublishingItem = contentItem;
-            PreviousItem = previousContentItem;
-        }
+        PublishingItem = contentItem;
+        PreviousItem = previousContentItem;
+    }
 
-        public ContentItem PublishingItem { get; set; }
-        public ContentItem PreviousItem { get; set; }
+    public ContentItem PublishingItem { get; set; }
+    public ContentItem PreviousItem { get; set; }
 
-        public bool Cancel { get; set; }
-    }
+    public bool Cancel { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/RemoveContentContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/RemoveContentContext.cs
index 6acd327047c..80753c6f6c0 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/RemoveContentContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/RemoveContentContext.cs
@@ -1,12 +1,11 @@
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class RemoveContentContext : ContentContextBase
 {
-    public class RemoveContentContext : ContentContextBase
+    public RemoveContentContext(ContentItem contentItem, bool noActiveVersionLeft = false) : base(contentItem)
     {
-        public RemoveContentContext(ContentItem contentItem, bool noActiveVersionLeft = false) : base(contentItem)
-        {
-            NoActiveVersionLeft = noActiveVersionLeft;
-        }
-
-        public bool NoActiveVersionLeft { get; }
+        NoActiveVersionLeft = noActiveVersionLeft;
     }
+
+    public bool NoActiveVersionLeft { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/RestoreContentContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/RestoreContentContext.cs
index d92f3e0b4ab..5e1c2084ea0 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/RestoreContentContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/RestoreContentContext.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class RestoreContentContext : ContentContextBase
 {
-    public class RestoreContentContext : ContentContextBase
+    public RestoreContentContext(ContentItem contentItem) : base(contentItem)
     {
-        public RestoreContentContext(ContentItem contentItem) : base(contentItem)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/SaveDraftContentContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/SaveDraftContentContext.cs
index a77a1f3505d..76ffe8bc7eb 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/SaveDraftContentContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/SaveDraftContentContext.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class SaveDraftContentContext : ContentContextBase
 {
-    public class SaveDraftContentContext : ContentContextBase
+    public SaveDraftContentContext(ContentItem contentItem) : base(contentItem)
     {
-        public SaveDraftContentContext(ContentItem contentItem) : base(contentItem)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/UpdateContentContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/UpdateContentContext.cs
index 597e9935bec..735266b8e7b 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/UpdateContentContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/UpdateContentContext.cs
@@ -1,12 +1,11 @@
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class UpdateContentContext : ContentContextBase
 {
-    public class UpdateContentContext : ContentContextBase
+    public UpdateContentContext(ContentItem contentItem) : base(contentItem)
     {
-        public UpdateContentContext(ContentItem contentItem) : base(contentItem)
-        {
-            UpdatingItem = contentItem;
-        }
-
-        public ContentItem UpdatingItem { get; set; }
+        UpdatingItem = contentItem;
     }
+
+    public ContentItem UpdatingItem { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ValidateContentContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ValidateContentContext.cs
index bbd08e9aec5..2a402ac821a 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ValidateContentContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/ValidateContentContext.cs
@@ -1,33 +1,32 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class ValidateContentContext : ContentContextBase
 {
-    public class ValidateContentContext : ContentContextBase
+    public ValidateContentContext(ContentItem contentItem) : base(contentItem)
     {
-        public ValidateContentContext(ContentItem contentItem) : base(contentItem)
-        {
-        }
+    }
 
-        public ContentValidateResult ContentValidateResult { get; } = new ContentValidateResult();
+    public ContentValidateResult ContentValidateResult { get; } = new ContentValidateResult();
+}
+
+public static class ValidateContentContextExtensions
+{
+    public static void Fail(this ValidateContentContext context, ValidationResult error)
+    {
+        context.ContentValidateResult.Fail(error);
     }
 
-    public static class ValidateContentContextExtensions
+    public static void Fail(this ValidateContentContext context, string errorMessage, params string[] memberNames)
     {
-        public static void Fail(this ValidateContentContext context, ValidationResult error)
+        if (memberNames != null && memberNames.Length > 0)
         {
-            context.ContentValidateResult.Fail(error);
+            context.ContentValidateResult.Fail(new ValidationResult(errorMessage, memberNames));
         }
-
-        public static void Fail(this ValidateContentContext context, string errorMessage, params string[] memberNames)
+        else
         {
-            if (memberNames != null && memberNames.Length > 0)
-            {
-                context.ContentValidateResult.Fail(new ValidationResult(errorMessage, memberNames));
-            }
-            else
-            {
-                context.ContentValidateResult.Fail(new ValidationResult(errorMessage));
-            }
+            context.ContentValidateResult.Fail(new ValidationResult(errorMessage));
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/VersionContentContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/VersionContentContext.cs
index 7bffba77f01..6de33022b70 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/VersionContentContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Handlers/VersionContentContext.cs
@@ -1,12 +1,11 @@
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class VersionContentContext : ContentContextBase
 {
-    public class VersionContentContext : ContentContextBase
+    public VersionContentContext(ContentItem contentItem, ContentItem buildingContentItem) : base(contentItem)
     {
-        public VersionContentContext(ContentItem contentItem, ContentItem buildingContentItem) : base(contentItem)
-        {
-            BuildingContentItem = buildingContentItem;
-        }
-
-        public ContentItem BuildingContentItem { get; }
+        BuildingContentItem = buildingContentItem;
     }
+
+    public ContentItem BuildingContentItem { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContent.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContent.cs
index e5d21c62b00..25f4e01fb5a 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContent.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContent.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public interface IContent
 {
-    public interface IContent
-    {
-        ContentItem ContentItem { get; }
-    }
+    ContentItem ContentItem { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentDefinitionStore.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentDefinitionStore.cs
index f091541117a..38ed3aeb68a 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentDefinitionStore.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentDefinitionStore.cs
@@ -1,23 +1,22 @@
 using System.Threading.Tasks;
 using OrchardCore.ContentManagement.Metadata.Records;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public interface IContentDefinitionStore
 {
-    public interface IContentDefinitionStore
-    {
-        /// <summary>
-        /// Loads the content definition from the store for updating and that should not be cached.
-        /// </summary>
-        Task<ContentDefinitionRecord> LoadContentDefinitionAsync();
+    /// <summary>
+    /// Loads the content definition from the store for updating and that should not be cached.
+    /// </summary>
+    Task<ContentDefinitionRecord> LoadContentDefinitionAsync();
 
-        /// <summary>
-        /// Gets the content definition from the cache for sharing and that should not be updated.
-        /// </summary>
-        Task<ContentDefinitionRecord> GetContentDefinitionAsync();
+    /// <summary>
+    /// Gets the content definition from the cache for sharing and that should not be updated.
+    /// </summary>
+    Task<ContentDefinitionRecord> GetContentDefinitionAsync();
 
-        /// <summary>
-        /// Updates the store with the provided content definition and then updates the cache.
-        /// </summary>
-        Task SaveContentDefinitionAsync(ContentDefinitionRecord contentDefinitionRecord);
-    }
+    /// <summary>
+    /// Updates the store with the provided content definition and then updates the cache.
+    /// </summary>
+    Task SaveContentDefinitionAsync(ContentDefinitionRecord contentDefinitionRecord);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentHandleManager.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentHandleManager.cs
index fdf701420e2..7cfdc239ae6 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentHandleManager.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentHandleManager.cs
@@ -1,9 +1,8 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public interface IContentHandleManager
 {
-    public interface IContentHandleManager
-    {
-        Task<string> GetContentItemIdAsync(string handle);
-    }
+    Task<string> GetContentItemIdAsync(string handle);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentHandleProvider.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentHandleProvider.cs
index 1769d71c273..91ddb8bc582 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentHandleProvider.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentHandleProvider.cs
@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public interface IContentHandleProvider
 {
-    public interface IContentHandleProvider
-    {
-        int Order { get; }
-        Task<string> GetContentItemIdAsync(string handle);
-    }
+    int Order { get; }
+    Task<string> GetContentItemIdAsync(string handle);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentItemIdGenerator.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentItemIdGenerator.cs
index 3ece3132020..c76e2450072 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentItemIdGenerator.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentItemIdGenerator.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public interface IContentItemIdGenerator
 {
-    public interface IContentItemIdGenerator
-    {
-        string GenerateUniqueId(ContentItem contentItem);
-    }
+    string GenerateUniqueId(ContentItem contentItem);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentManager.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentManager.cs
index a91a2fb50be..1a67108b6b1 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentManager.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentManager.cs
@@ -2,137 +2,136 @@
 using System.Threading.Tasks;
 using OrchardCore.ContentManagement.Handlers;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+/// <summary>
+/// Content management functionality to deal with Orchard content items and their parts.
+/// </summary>
+public interface IContentManager
 {
     /// <summary>
-    /// Content management functionality to deal with Orchard content items and their parts.
-    /// </summary>
-    public interface IContentManager
-    {
-        /// <summary>
-        /// Creates a new content item with the specified type.
-        /// </summary>
-        /// <remarks>
-        /// The content item is not yet persisted!.
-        /// </remarks>
-        /// <param name="contentType">The name of the content type.</param>
-        Task<ContentItem> NewAsync(string contentType);
-
-        /// <summary>
-        /// Updates a content item without creating a new version.
-        /// </summary>
-        /// <param name="contentItem">The existing content item with updated data.</param>
-        Task UpdateAsync(ContentItem contentItem);
-
-        /// <summary>
-        /// Creates (persists) a new content item with the specified version.
-        /// </summary>
-        /// <param name="contentItem">The content instance filled with all necessary data.</param>
-        /// <param name="options">The version to create the item with.</param>
-        Task CreateAsync(ContentItem contentItem, VersionOptions options = null);
-
-        /// <summary>
-        /// Creates (puts) a new content item and manages removing and updating existing published or draft items.
-        /// </summary>
-        /// <param name="contentItem"></param>
-        /// <returns>The validation <see cref="ContentValidateResult"/> result.</returns>
-        Task<ContentValidateResult> CreateContentItemVersionAsync(ContentItem contentItem);
-
-        /// <summary>
-        /// Updates (patches) a content item version.
-        /// </summary>
-        /// <param name="updatingVersion"></param>
-        /// <param name="updatedVersion"></param>
-        /// <returns>The validation <see cref="ContentValidateResult"/> result.</returns>
-        Task<ContentValidateResult> UpdateContentItemVersionAsync(ContentItem updatingVersion, ContentItem updatedVersion);
-
-        /// <summary>
-        /// Imports content items.
-        /// </summary>
-        /// <param name="contentItems"></param>
-        Task ImportAsync(IEnumerable<ContentItem> contentItems);
-
-        /// <summary>
-        /// Validates a content item.
-        /// </summary>
-        /// <param name="contentItem"></param>
-        /// <returns>The validation <see cref="ContentValidateResult"/> result.</returns>
-        Task<ContentValidateResult> ValidateAsync(ContentItem contentItem);
-
-        /// <summary>
-        /// Restores a content item.
-        /// </summary>
-        /// <param name="contentItem"></param>
-        /// <returns>The validation <see cref="ContentValidateResult"/> result.</returns>
-        Task<ContentValidateResult> RestoreAsync(ContentItem contentItem);
-
-        /// <summary>
-        /// Gets the content item with the specified id and version.
-        /// </summary>
-        /// <param name="contentItemId">The id of the content item to load.</param>
-        /// <param name="options">The version option.</param>
-        Task<ContentItem> GetAsync(string contentItemId, VersionOptions options = null);
-
-        /// <summary>
-        /// Gets the published content items with the specified ids.
-        /// </summary>
-        /// <param name="contentItemIds">The content item ids to load.</param>
-        /// <param name="options">The version option.</param>
-        /// <remarks>
-        /// This method will always issue a database query.
-        /// This means that it should be used only to get a list of content items that have not been loaded.
-        /// </remarks>
-        Task<IEnumerable<ContentItem>> GetAsync(IEnumerable<string> contentItemIds, VersionOptions options = null);
-
-        /// <summary>
-        /// Gets the content item with the specified version id.
-        /// </summary>
-        /// <param name="contentItemVersionId">The content item version id.</param>
-        Task<ContentItem> GetVersionAsync(string contentItemVersionId);
-
-        /// <summary>
-        /// Gets all versions of the given content item id.
-        /// </summary>
-        /// <param name="contentItemId">The content item id.</param>
-        Task<IEnumerable<ContentItem>> GetAllVersionsAsync(string contentItemId);
-
-        /// <summary>
-        /// Triggers the Load events for a content item that was queried directly from the database.
-        /// </summary>
-        /// <param name="contentItem">The content item. </param>
-        Task<ContentItem> LoadAsync(ContentItem contentItem);
-
-        /// <summary>
-        /// Removes <see cref="ContentItem.Latest"/> and <see cref="ContentItem.Published"/> flags
-        /// from a content item, making it invisible from the system. It doesn't physically delete
-        /// the content item.
-        /// </summary>
-        /// <param name="contentItem"></param>
-        Task RemoveAsync(ContentItem contentItem);
-
-        /// <summary>
-        /// Deletes the draft version of a content item.
-        /// </summary>
-        /// <param name="contentItem"></param>
-        Task DiscardDraftAsync(ContentItem contentItem);
-
-        /// <summary>
-        /// Saves the content item if it is a draft version.
-        /// </summary>
-        /// <param name="contentItem"></param>
-        Task SaveDraftAsync(ContentItem contentItem);
-
-        Task PublishAsync(ContentItem contentItem);
-
-        Task UnpublishAsync(ContentItem contentItem);
-
-        Task<TAspect> PopulateAspectAsync<TAspect>(IContent content, TAspect aspect);
-
-        /// <summary>
-        /// Makes a clone of the content item.
-        /// </summary>
-        /// <param name="contentItem">The content item to clone.</param>
-        /// <returns>Clone of the item.</returns>
-        Task<ContentItem> CloneAsync(ContentItem contentItem);
-    }
+    /// Creates a new content item with the specified type.
+    /// </summary>
+    /// <remarks>
+    /// The content item is not yet persisted!.
+    /// </remarks>
+    /// <param name="contentType">The name of the content type.</param>
+    Task<ContentItem> NewAsync(string contentType);
+
+    /// <summary>
+    /// Updates a content item without creating a new version.
+    /// </summary>
+    /// <param name="contentItem">The existing content item with updated data.</param>
+    Task UpdateAsync(ContentItem contentItem);
+
+    /// <summary>
+    /// Creates (persists) a new content item with the specified version.
+    /// </summary>
+    /// <param name="contentItem">The content instance filled with all necessary data.</param>
+    /// <param name="options">The version to create the item with.</param>
+    Task CreateAsync(ContentItem contentItem, VersionOptions options = null);
+
+    /// <summary>
+    /// Creates (puts) a new content item and manages removing and updating existing published or draft items.
+    /// </summary>
+    /// <param name="contentItem"></param>
+    /// <returns>The validation <see cref="ContentValidateResult"/> result.</returns>
+    Task<ContentValidateResult> CreateContentItemVersionAsync(ContentItem contentItem);
+
+    /// <summary>
+    /// Updates (patches) a content item version.
+    /// </summary>
+    /// <param name="updatingVersion"></param>
+    /// <param name="updatedVersion"></param>
+    /// <returns>The validation <see cref="ContentValidateResult"/> result.</returns>
+    Task<ContentValidateResult> UpdateContentItemVersionAsync(ContentItem updatingVersion, ContentItem updatedVersion);
+
+    /// <summary>
+    /// Imports content items.
+    /// </summary>
+    /// <param name="contentItems"></param>
+    Task ImportAsync(IEnumerable<ContentItem> contentItems);
+
+    /// <summary>
+    /// Validates a content item.
+    /// </summary>
+    /// <param name="contentItem"></param>
+    /// <returns>The validation <see cref="ContentValidateResult"/> result.</returns>
+    Task<ContentValidateResult> ValidateAsync(ContentItem contentItem);
+
+    /// <summary>
+    /// Restores a content item.
+    /// </summary>
+    /// <param name="contentItem"></param>
+    /// <returns>The validation <see cref="ContentValidateResult"/> result.</returns>
+    Task<ContentValidateResult> RestoreAsync(ContentItem contentItem);
+
+    /// <summary>
+    /// Gets the content item with the specified id and version.
+    /// </summary>
+    /// <param name="contentItemId">The id of the content item to load.</param>
+    /// <param name="options">The version option.</param>
+    Task<ContentItem> GetAsync(string contentItemId, VersionOptions options = null);
+
+    /// <summary>
+    /// Gets the published content items with the specified ids.
+    /// </summary>
+    /// <param name="contentItemIds">The content item ids to load.</param>
+    /// <param name="options">The version option.</param>
+    /// <remarks>
+    /// This method will always issue a database query.
+    /// This means that it should be used only to get a list of content items that have not been loaded.
+    /// </remarks>
+    Task<IEnumerable<ContentItem>> GetAsync(IEnumerable<string> contentItemIds, VersionOptions options = null);
+
+    /// <summary>
+    /// Gets the content item with the specified version id.
+    /// </summary>
+    /// <param name="contentItemVersionId">The content item version id.</param>
+    Task<ContentItem> GetVersionAsync(string contentItemVersionId);
+
+    /// <summary>
+    /// Gets all versions of the given content item id.
+    /// </summary>
+    /// <param name="contentItemId">The content item id.</param>
+    Task<IEnumerable<ContentItem>> GetAllVersionsAsync(string contentItemId);
+
+    /// <summary>
+    /// Triggers the Load events for a content item that was queried directly from the database.
+    /// </summary>
+    /// <param name="contentItem">The content item. </param>
+    Task<ContentItem> LoadAsync(ContentItem contentItem);
+
+    /// <summary>
+    /// Removes <see cref="ContentItem.Latest"/> and <see cref="ContentItem.Published"/> flags
+    /// from a content item, making it invisible from the system. It doesn't physically delete
+    /// the content item.
+    /// </summary>
+    /// <param name="contentItem"></param>
+    Task RemoveAsync(ContentItem contentItem);
+
+    /// <summary>
+    /// Deletes the draft version of a content item.
+    /// </summary>
+    /// <param name="contentItem"></param>
+    Task DiscardDraftAsync(ContentItem contentItem);
+
+    /// <summary>
+    /// Saves the content item if it is a draft version.
+    /// </summary>
+    /// <param name="contentItem"></param>
+    Task SaveDraftAsync(ContentItem contentItem);
+
+    Task PublishAsync(ContentItem contentItem);
+
+    Task UnpublishAsync(ContentItem contentItem);
+
+    Task<TAspect> PopulateAspectAsync<TAspect>(IContent content, TAspect aspect);
+
+    /// <summary>
+    /// Makes a clone of the content item.
+    /// </summary>
+    /// <param name="contentItem">The content item to clone.</param>
+    /// <returns>Clone of the item.</returns>
+    Task<ContentItem> CloneAsync(ContentItem contentItem);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentManagerSession.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentManagerSession.cs
index 8002e4ba7b7..c559e405fcc 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentManagerSession.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentManagerSession.cs
@@ -1,13 +1,12 @@
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public interface IContentManagerSession
 {
-    public interface IContentManagerSession
-    {
-        void Store(ContentItem item);
+    void Store(ContentItem item);
 
-        bool RecallVersionId(long id, out ContentItem item);
+    bool RecallVersionId(long id, out ContentItem item);
 
-        bool RecallPublishedItemId(string id, out ContentItem item);
+    bool RecallPublishedItemId(string id, out ContentItem item);
 
-        void Clear();
-    }
+    void Clear();
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentPickerResultProvider.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentPickerResultProvider.cs
index 8c121079e59..3ba2ddcca03 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentPickerResultProvider.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IContentPickerResultProvider.cs
@@ -2,26 +2,25 @@
 using System.Threading.Tasks;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public interface IContentPickerResultProvider
 {
-    public interface IContentPickerResultProvider
-    {
-        string Name { get; }
-        Task<IEnumerable<ContentPickerResult>> Search(ContentPickerSearchContext searchContext);
-    }
+    string Name { get; }
+    Task<IEnumerable<ContentPickerResult>> Search(ContentPickerSearchContext searchContext);
+}
 
-    public class ContentPickerSearchContext
-    {
-        public string Query { get; set; }
-        public bool DisplayAllContentTypes { get; set; }
-        public IEnumerable<string> ContentTypes { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+public class ContentPickerSearchContext
+{
+    public string Query { get; set; }
+    public bool DisplayAllContentTypes { get; set; }
+    public IEnumerable<string> ContentTypes { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
+}
 
-    public class ContentPickerResult
-    {
-        public string DisplayText { get; set; }
-        public string ContentItemId { get; set; }
-        public bool HasPublished { get; set; }
-    }
+public class ContentPickerResult
+{
+    public string DisplayText { get; set; }
+    public string ContentItemId { get; set; }
+    public bool HasPublished { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ITypeActivatorFactory.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ITypeActivatorFactory.cs
index 38d7ebda010..660b9b88827 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ITypeActivatorFactory.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ITypeActivatorFactory.cs
@@ -1,28 +1,27 @@
 using System;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+/// <summary>
+/// Represents a service that can provide an <see cref="ITypeActivator{TInstance}"/> instance.
+/// </summary>
+public interface ITypeActivatorFactory<TInstance>
+{
+    ITypeActivator<TInstance> GetTypeActivator(string partName);
+}
+
+/// <summary>
+/// Represents the type information for a content element.
+/// </summary>
+public interface ITypeActivator<TInstance>
 {
     /// <summary>
-    /// Represents a service that can provide an <see cref="ITypeActivator{TInstance}"/> instance.
+    /// The <see cref="Type"/> of the content element represented by the activator.
     /// </summary>
-    public interface ITypeActivatorFactory<TInstance>
-    {
-        ITypeActivator<TInstance> GetTypeActivator(string partName);
-    }
+    Type Type { get; }
 
     /// <summary>
-    /// Represents the type information for a content element.
+    /// Creates an instance of the content element type represented by the activator.
     /// </summary>
-    public interface ITypeActivator<TInstance>
-    {
-        /// <summary>
-        /// The <see cref="Type"/> of the content element represented by the activator.
-        /// </summary>
-        Type Type { get; }
-
-        /// <summary>
-        /// Creates an instance of the content element type represented by the activator.
-        /// </summary>
-        TInstance CreateInstance();
-    }
+    TInstance CreateInstance();
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IUserPickerResultProvider.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IUserPickerResultProvider.cs
index d91494941c2..c1114a67860 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IUserPickerResultProvider.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/IUserPickerResultProvider.cs
@@ -2,26 +2,25 @@
 using System.Threading.Tasks;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public interface IUserPickerResultProvider
 {
-    public interface IUserPickerResultProvider
-    {
-        string Name { get; }
-        Task<IEnumerable<UserPickerResult>> Search(UserPickerSearchContext searchContext);
-    }
+    string Name { get; }
+    Task<IEnumerable<UserPickerResult>> Search(UserPickerSearchContext searchContext);
+}
 
-    public class UserPickerSearchContext
-    {
-        public string Query { get; set; }
-        public bool DisplayAllUsers { get; set; }
-        public IEnumerable<string> Roles { get; set; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; set; }
-    }
+public class UserPickerSearchContext
+{
+    public string Query { get; set; }
+    public bool DisplayAllUsers { get; set; }
+    public IEnumerable<string> Roles { get; set; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
+}
 
-    public class UserPickerResult
-    {
-        public string DisplayText { get; set; }
-        public string UserId { get; set; }
-        public bool IsEnabled { get; set; }
-    }
+public class UserPickerResult
+{
+    public string DisplayText { get; set; }
+    public string UserId { get; set; }
+    public bool IsEnabled { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentBuilderSettings.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentBuilderSettings.cs
index 9ba0085316a..b3ae97d4534 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentBuilderSettings.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentBuilderSettings.cs
@@ -2,28 +2,27 @@
 using System.Text.Json.Serialization;
 using System.Text.Json.Settings;
 
-namespace OrchardCore.ContentManagement.Metadata.Builders
+namespace OrchardCore.ContentManagement.Metadata.Builders;
+
+public static class ContentBuilderSettings
 {
-    public static class ContentBuilderSettings
+    /// <summary>
+    /// Replace current value, even for null values, union arrays.
+    /// </summary>
+    public static readonly JsonMergeSettings JsonMergeSettings = new()
     {
-        /// <summary>
-        /// Replace current value, even for null values, union arrays.
-        /// </summary>
-        public static readonly JsonMergeSettings JsonMergeSettings = new()
-        {
-            MergeArrayHandling = MergeArrayHandling.Union,
-            MergeNullValueHandling = MergeNullValueHandling.Merge,
-        };
+        MergeArrayHandling = MergeArrayHandling.Union,
+        MergeNullValueHandling = MergeNullValueHandling.Merge,
+    };
 
-        /// <summary>
-        /// A Json serializer that ignores properties which have their default values.
-        /// To be able to have a default value : use [DefaultValue(true)] on a class property for example.
-        /// </summary>
-        public static readonly JsonSerializerOptions IgnoreDefaultValuesSerializer = new()
-        {
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-            ReferenceHandler = ReferenceHandler.IgnoreCycles,
-            PropertyNameCaseInsensitive = true,
-        };
-    }
+    /// <summary>
+    /// A Json serializer that ignores properties which have their default values.
+    /// To be able to have a default value : use [DefaultValue(true)] on a class property for example.
+    /// </summary>
+    public static readonly JsonSerializerOptions IgnoreDefaultValuesSerializer = new()
+    {
+        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+        ReferenceHandler = ReferenceHandler.IgnoreCycles,
+        PropertyNameCaseInsensitive = true,
+    };
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentPartDefinitionBuilder.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentPartDefinitionBuilder.cs
index 1ed455df97f..c186f668879 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentPartDefinitionBuilder.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentPartDefinitionBuilder.cs
@@ -7,260 +7,259 @@
 using OrchardCore.ContentManagement.Metadata.Settings;
 using OrchardCore.ContentManagement.Utilities;
 
-namespace OrchardCore.ContentManagement.Metadata.Builders
+namespace OrchardCore.ContentManagement.Metadata.Builders;
+
+public class ContentPartDefinitionBuilder
 {
-    public class ContentPartDefinitionBuilder
+    private readonly ContentPartDefinition _part;
+    private readonly List<ContentPartFieldDefinition> _fields;
+    private readonly JsonObject _settings;
+
+    public ContentPartDefinition Current { get; private set; }
+
+    public ContentPartDefinitionBuilder()
+        : this(new ContentPartDefinition(null))
     {
-        private readonly ContentPartDefinition _part;
-        private readonly List<ContentPartFieldDefinition> _fields;
-        private readonly JsonObject _settings;
+    }
 
-        public ContentPartDefinition Current { get; private set; }
+    public ContentPartDefinitionBuilder(ContentPartDefinition existing)
+    {
+        _part = existing;
 
-        public ContentPartDefinitionBuilder()
-            : this(new ContentPartDefinition(null))
+        if (existing == null)
         {
+            _fields = [];
+            _settings = [];
         }
-
-        public ContentPartDefinitionBuilder(ContentPartDefinition existing)
+        else
         {
-            _part = existing;
-
-            if (existing == null)
-            {
-                _fields = [];
-                _settings = [];
-            }
-            else
-            {
-                Name = existing.Name;
-                _fields = existing.Fields.ToList();
-                _settings = existing.Settings.Clone();
-            }
+            Name = existing.Name;
+            _fields = existing.Fields.ToList();
+            _settings = existing.Settings.Clone();
         }
+    }
 
-        public string Name { get; private set; }
+    public string Name { get; private set; }
 
-        public ContentPartDefinition Build()
+    public ContentPartDefinition Build()
+    {
+        if (!char.IsLetter(Name[0]))
         {
-            if (!char.IsLetter(Name[0]))
-            {
-                throw new ArgumentException("Content part name must start with a letter", "name");
-            }
-            if (!string.Equals(Name, Name.ToSafeName(), StringComparison.OrdinalIgnoreCase))
-            {
-                throw new ArgumentException("Content part name contains invalid characters", "name");
-            }
-            if (Name.IsReservedContentName())
-            {
-                throw new ArgumentException("Content part name is reserved for internal use", "name");
-            }
-
-            return new ContentPartDefinition(Name, _fields, _settings);
+            throw new ArgumentException("Content part name must start with a letter", "name");
         }
-
-        public ContentPartDefinitionBuilder Named(string name)
+        if (!string.Equals(Name, Name.ToSafeName(), StringComparison.OrdinalIgnoreCase))
         {
-            Name = name;
-
-            return this;
+            throw new ArgumentException("Content part name contains invalid characters", "name");
         }
-
-        public ContentPartDefinitionBuilder RemoveField(string fieldName)
+        if (Name.IsReservedContentName())
         {
-            var existingField = _fields.SingleOrDefault(x => string.Equals(x.Name, fieldName, StringComparison.OrdinalIgnoreCase));
-            if (existingField != null)
-            {
-                _fields.Remove(existingField);
-            }
-
-            return this;
+            throw new ArgumentException("Content part name is reserved for internal use", "name");
         }
 
-        public ContentPartDefinitionBuilder MergeSettings(JsonObject settings)
-        {
-            _settings.Merge(settings, ContentBuilderSettings.JsonMergeSettings);
-
-            return this;
-        }
+        return new ContentPartDefinition(Name, _fields, _settings);
+    }
 
-        public ContentPartDefinitionBuilder MergeSettings<T>(Action<T> setting) where T : class, new()
-        {
-            var existingJObject = _settings[typeof(T).Name] as JsonObject;
-            // If existing settings do not exist, create.
-            if (existingJObject == null)
-            {
-                existingJObject = JObject.FromObject(new T(), ContentBuilderSettings.IgnoreDefaultValuesSerializer);
-                _settings[typeof(T).Name] = existingJObject;
-            }
+    public ContentPartDefinitionBuilder Named(string name)
+    {
+        Name = name;
 
-            var settingsToMerge = existingJObject.ToObject<T>();
-            setting(settingsToMerge);
-            _settings[typeof(T).Name] = JObject.FromObject(settingsToMerge, ContentBuilderSettings.IgnoreDefaultValuesSerializer);
+        return this;
+    }
 
-            return this;
+    public ContentPartDefinitionBuilder RemoveField(string fieldName)
+    {
+        var existingField = _fields.SingleOrDefault(x => string.Equals(x.Name, fieldName, StringComparison.OrdinalIgnoreCase));
+        if (existingField != null)
+        {
+            _fields.Remove(existingField);
         }
 
-        public ContentPartDefinitionBuilder WithSettings<T>(T settings)
-        {
-            ArgumentNullException.ThrowIfNull(settings, nameof(settings));
+        return this;
+    }
 
-            var jObject = JObject.FromObject(settings, ContentBuilderSettings.IgnoreDefaultValuesSerializer);
-            _settings[typeof(T).Name] = jObject;
+    public ContentPartDefinitionBuilder MergeSettings(JsonObject settings)
+    {
+        _settings.Merge(settings, ContentBuilderSettings.JsonMergeSettings);
 
-            return this;
+        return this;
+    }
+
+    public ContentPartDefinitionBuilder MergeSettings<T>(Action<T> setting) where T : class, new()
+    {
+        var existingJObject = _settings[typeof(T).Name] as JsonObject;
+        // If existing settings do not exist, create.
+        if (existingJObject == null)
+        {
+            existingJObject = JObject.FromObject(new T(), ContentBuilderSettings.IgnoreDefaultValuesSerializer);
+            _settings[typeof(T).Name] = existingJObject;
         }
 
-        public ContentPartDefinitionBuilder WithField(string fieldName)
-            => WithField(fieldName, configuration => { });
+        var settingsToMerge = existingJObject.ToObject<T>();
+        setting(settingsToMerge);
+        _settings[typeof(T).Name] = JObject.FromObject(settingsToMerge, ContentBuilderSettings.IgnoreDefaultValuesSerializer);
 
-        public ContentPartDefinitionBuilder WithField(string fieldName, Action<ContentPartFieldDefinitionBuilder> configuration)
-        {
-            ArgumentException.ThrowIfNullOrWhiteSpace(fieldName, nameof(fieldName));
+        return this;
+    }
 
-            var existingField = _fields.FirstOrDefault(x => string.Equals(x.Name, fieldName, StringComparison.OrdinalIgnoreCase));
-            if (existingField != null)
-            {
-                var toRemove = _fields.Where(x => x.Name == fieldName).ToArray();
-                foreach (var remove in toRemove)
-                {
-                    _fields.Remove(remove);
-                }
-            }
-            else
-            {
-                existingField = new ContentPartFieldDefinition(null, fieldName, []);
-            }
+    public ContentPartDefinitionBuilder WithSettings<T>(T settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings, nameof(settings));
 
-            var configurer = new FieldConfigurerImpl(existingField, _part);
+        var jObject = JObject.FromObject(settings, ContentBuilderSettings.IgnoreDefaultValuesSerializer);
+        _settings[typeof(T).Name] = jObject;
 
-            configuration(configurer);
+        return this;
+    }
 
-            var fieldDefinition = configurer.Build();
+    public ContentPartDefinitionBuilder WithField(string fieldName)
+        => WithField(fieldName, configuration => { });
 
-            var settings = fieldDefinition.GetSettings<ContentPartFieldSettings>();
+    public ContentPartDefinitionBuilder WithField(string fieldName, Action<ContentPartFieldDefinitionBuilder> configuration)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(fieldName, nameof(fieldName));
 
-            if (string.IsNullOrEmpty(settings.DisplayName))
+        var existingField = _fields.FirstOrDefault(x => string.Equals(x.Name, fieldName, StringComparison.OrdinalIgnoreCase));
+        if (existingField != null)
+        {
+            var toRemove = _fields.Where(x => x.Name == fieldName).ToArray();
+            foreach (var remove in toRemove)
             {
-                // If there is no display name, let's use the field name by default.
-                settings.DisplayName = fieldName;
-                fieldDefinition.Settings.Remove(nameof(ContentPartFieldSettings));
-                fieldDefinition.Settings.Add(nameof(ContentPartFieldSettings), JNode.FromObject(settings));
+                _fields.Remove(remove);
             }
+        }
+        else
+        {
+            existingField = new ContentPartFieldDefinition(null, fieldName, []);
+        }
 
-            _fields.Add(fieldDefinition);
+        var configurer = new FieldConfigurerImpl(existingField, _part);
 
-            return this;
+        configuration(configurer);
+
+        var fieldDefinition = configurer.Build();
+
+        var settings = fieldDefinition.GetSettings<ContentPartFieldSettings>();
+
+        if (string.IsNullOrEmpty(settings.DisplayName))
+        {
+            // If there is no display name, let's use the field name by default.
+            settings.DisplayName = fieldName;
+            fieldDefinition.Settings.Remove(nameof(ContentPartFieldSettings));
+            fieldDefinition.Settings.Add(nameof(ContentPartFieldSettings), JNode.FromObject(settings));
         }
 
-        public ContentPartDefinitionBuilder WithField<TField>(string fieldName)
-            => WithField(fieldName, configuration => configuration.OfType(typeof(TField).Name));
+        _fields.Add(fieldDefinition);
 
-        public ContentPartDefinitionBuilder WithField<TField>(string fieldName, Action<ContentPartFieldDefinitionBuilder> configuration)
-            => WithField(fieldName, field =>
-            {
-                configuration(field);
+        return this;
+    }
 
-                field.OfType(typeof(TField).Name);
-            });
+    public ContentPartDefinitionBuilder WithField<TField>(string fieldName)
+        => WithField(fieldName, configuration => configuration.OfType(typeof(TField).Name));
 
-        public Task<ContentPartDefinitionBuilder> WithFieldAsync<TField>(string fieldName, Func<ContentPartFieldDefinitionBuilder, Task> configuration)
-            => WithFieldAsync(fieldName, async field =>
-            {
-                await configuration(field);
+    public ContentPartDefinitionBuilder WithField<TField>(string fieldName, Action<ContentPartFieldDefinitionBuilder> configuration)
+        => WithField(fieldName, field =>
+        {
+            configuration(field);
 
-                field.OfType(typeof(TField).Name);
-            });
+            field.OfType(typeof(TField).Name);
+        });
 
-        public async Task<ContentPartDefinitionBuilder> WithFieldAsync(string fieldName, Func<ContentPartFieldDefinitionBuilder, Task> configurationAsync)
+    public Task<ContentPartDefinitionBuilder> WithFieldAsync<TField>(string fieldName, Func<ContentPartFieldDefinitionBuilder, Task> configuration)
+        => WithFieldAsync(fieldName, async field =>
         {
-            ArgumentException.ThrowIfNullOrWhiteSpace(fieldName, nameof(fieldName));
+            await configuration(field);
 
-            var existingField = _fields.FirstOrDefault(x => string.Equals(x.Name, fieldName, StringComparison.OrdinalIgnoreCase));
+            field.OfType(typeof(TField).Name);
+        });
 
-            if (existingField != null)
-            {
-                var toRemove = _fields.Where(x => x.Name == fieldName).ToArray();
-                foreach (var remove in toRemove)
-                {
-                    _fields.Remove(remove);
-                }
-            }
-            else
+    public async Task<ContentPartDefinitionBuilder> WithFieldAsync(string fieldName, Func<ContentPartFieldDefinitionBuilder, Task> configurationAsync)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(fieldName, nameof(fieldName));
+
+        var existingField = _fields.FirstOrDefault(x => string.Equals(x.Name, fieldName, StringComparison.OrdinalIgnoreCase));
+
+        if (existingField != null)
+        {
+            var toRemove = _fields.Where(x => x.Name == fieldName).ToArray();
+            foreach (var remove in toRemove)
             {
-                existingField = new ContentPartFieldDefinition(null, fieldName, []);
+                _fields.Remove(remove);
             }
+        }
+        else
+        {
+            existingField = new ContentPartFieldDefinition(null, fieldName, []);
+        }
 
-            var configurer = new FieldConfigurerImpl(existingField, _part);
+        var configurer = new FieldConfigurerImpl(existingField, _part);
 
-            await configurationAsync(configurer);
+        await configurationAsync(configurer);
 
-            var fieldDefinition = configurer.Build();
+        var fieldDefinition = configurer.Build();
 
-            var settings = fieldDefinition.GetSettings<ContentPartFieldSettings>();
+        var settings = fieldDefinition.GetSettings<ContentPartFieldSettings>();
 
-            if (string.IsNullOrEmpty(settings.DisplayName))
-            {
-                // If there is no display name, let's use the field name by default.
-                settings.DisplayName = fieldName;
-                fieldDefinition.Settings.Remove(nameof(ContentPartFieldSettings));
-                fieldDefinition.Settings.Add(nameof(ContentPartFieldSettings), JNode.FromObject(settings));
-            }
+        if (string.IsNullOrEmpty(settings.DisplayName))
+        {
+            // If there is no display name, let's use the field name by default.
+            settings.DisplayName = fieldName;
+            fieldDefinition.Settings.Remove(nameof(ContentPartFieldSettings));
+            fieldDefinition.Settings.Add(nameof(ContentPartFieldSettings), JNode.FromObject(settings));
+        }
 
-            _fields.Add(fieldDefinition);
+        _fields.Add(fieldDefinition);
 
-            return this;
-        }
+        return this;
+    }
+
+    private sealed class FieldConfigurerImpl : ContentPartFieldDefinitionBuilder
+    {
+        private ContentFieldDefinition _fieldDefinition;
+        private readonly ContentPartDefinition _partDefinition;
+        private readonly string _fieldName;
 
-        private sealed class FieldConfigurerImpl : ContentPartFieldDefinitionBuilder
+        public FieldConfigurerImpl(ContentPartFieldDefinition field, ContentPartDefinition part)
+            : base(field)
         {
-            private ContentFieldDefinition _fieldDefinition;
-            private readonly ContentPartDefinition _partDefinition;
-            private readonly string _fieldName;
+            _fieldDefinition = field.FieldDefinition;
+            _fieldName = field.Name;
+            _partDefinition = part;
+        }
 
-            public FieldConfigurerImpl(ContentPartFieldDefinition field, ContentPartDefinition part)
-                : base(field)
+        public override ContentPartFieldDefinition Build()
+        {
+            if (!char.IsLetter(_fieldName[0]))
             {
-                _fieldDefinition = field.FieldDefinition;
-                _fieldName = field.Name;
-                _partDefinition = part;
+                throw new ArgumentException("Content field name must start with a letter", "name");
             }
-
-            public override ContentPartFieldDefinition Build()
+            if (!string.Equals(_fieldName, _fieldName.ToSafeName(), StringComparison.OrdinalIgnoreCase))
             {
-                if (!char.IsLetter(_fieldName[0]))
-                {
-                    throw new ArgumentException("Content field name must start with a letter", "name");
-                }
-                if (!string.Equals(_fieldName, _fieldName.ToSafeName(), StringComparison.OrdinalIgnoreCase))
-                {
-                    throw new ArgumentException("Content field name contains invalid characters", "name");
-                }
-
-                return new ContentPartFieldDefinition(_fieldDefinition, _fieldName, _settings);
+                throw new ArgumentException("Content field name contains invalid characters", "name");
             }
 
-            public override string Name
-                => _fieldName;
+            return new ContentPartFieldDefinition(_fieldDefinition, _fieldName, _settings);
+        }
 
-            public override string FieldType
-                => _fieldDefinition.Name;
+        public override string Name
+            => _fieldName;
 
+        public override string FieldType
+            => _fieldDefinition.Name;
 
-            public override string PartName
-                => _partDefinition.Name;
 
-            public override ContentPartFieldDefinitionBuilder OfType(ContentFieldDefinition fieldDefinition)
-            {
-                _fieldDefinition = fieldDefinition;
-                return this;
-            }
+        public override string PartName
+            => _partDefinition.Name;
 
-            public override ContentPartFieldDefinitionBuilder OfType(string fieldType)
-            {
-                _fieldDefinition = new ContentFieldDefinition(fieldType);
-                return this;
-            }
+        public override ContentPartFieldDefinitionBuilder OfType(ContentFieldDefinition fieldDefinition)
+        {
+            _fieldDefinition = fieldDefinition;
+            return this;
+        }
+
+        public override ContentPartFieldDefinitionBuilder OfType(string fieldType)
+        {
+            _fieldDefinition = new ContentFieldDefinition(fieldType);
+            return this;
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentPartFieldDefinitionBuilder.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentPartFieldDefinitionBuilder.cs
index b1b9aad7b1b..0f586ef37eb 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentPartFieldDefinitionBuilder.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentPartFieldDefinitionBuilder.cs
@@ -2,67 +2,66 @@
 using System.Text.Json.Nodes;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentManagement.Metadata.Builders
+namespace OrchardCore.ContentManagement.Metadata.Builders;
+
+public abstract class ContentPartFieldDefinitionBuilder
 {
-    public abstract class ContentPartFieldDefinitionBuilder
-    {
-        protected readonly JsonObject _settings;
+    protected readonly JsonObject _settings;
 
-        public ContentPartFieldDefinition Current { get; private set; }
-        public abstract string Name { get; }
-        public abstract string FieldType { get; }
-        public abstract string PartName { get; }
+    public ContentPartFieldDefinition Current { get; private set; }
+    public abstract string Name { get; }
+    public abstract string FieldType { get; }
+    public abstract string PartName { get; }
 
-        protected ContentPartFieldDefinitionBuilder(ContentPartFieldDefinition field)
-        {
-            Current = field;
+    protected ContentPartFieldDefinitionBuilder(ContentPartFieldDefinition field)
+    {
+        Current = field;
 
-            _settings = field.Settings.Clone();
-        }
+        _settings = field.Settings.Clone();
+    }
 
-        public ContentPartFieldDefinitionBuilder MergeSettings(JsonObject settings)
-        {
-            _settings.Merge(settings, ContentBuilderSettings.JsonMergeSettings);
-            return this;
-        }
+    public ContentPartFieldDefinitionBuilder MergeSettings(JsonObject settings)
+    {
+        _settings.Merge(settings, ContentBuilderSettings.JsonMergeSettings);
+        return this;
+    }
 
-        public ContentPartFieldDefinitionBuilder MergeSettings<T>(Action<T> setting) where T : class, new()
+    public ContentPartFieldDefinitionBuilder MergeSettings<T>(Action<T> setting) where T : class, new()
+    {
+        var existingJObject = _settings[typeof(T).Name] as JsonObject;
+        // If existing settings do not exist, create.
+        if (existingJObject == null)
         {
-            var existingJObject = _settings[typeof(T).Name] as JsonObject;
-            // If existing settings do not exist, create.
-            if (existingJObject == null)
-            {
-                existingJObject = ToJsonObject(new T());
-                _settings[typeof(T).Name] = existingJObject;
-            }
-
-            var settingsToMerge = existingJObject.ToObject<T>();
-            setting(settingsToMerge);
-            _settings[typeof(T).Name] = ToJsonObject(settingsToMerge);
-            return this;
+            existingJObject = ToJsonObject(new T());
+            _settings[typeof(T).Name] = existingJObject;
         }
 
-        public ContentPartFieldDefinitionBuilder WithSettings<T>(T settings)
-        {
-            ArgumentNullException.ThrowIfNull(settings);
-
-            _settings[typeof(T).Name] = ToJsonObject(settings);
+        var settingsToMerge = existingJObject.ToObject<T>();
+        setting(settingsToMerge);
+        _settings[typeof(T).Name] = ToJsonObject(settingsToMerge);
+        return this;
+    }
 
-            return this;
-        }
+    public ContentPartFieldDefinitionBuilder WithSettings<T>(T settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-        public ContentPartFieldDefinitionBuilder WithSettings<T>() where T : class, new()
-        {
-            _settings[typeof(T).Name] = ToJsonObject(new T());
+        _settings[typeof(T).Name] = ToJsonObject(settings);
 
-            return this;
-        }
+        return this;
+    }
 
-        public abstract ContentPartFieldDefinitionBuilder OfType(ContentFieldDefinition fieldDefinition);
-        public abstract ContentPartFieldDefinitionBuilder OfType(string fieldType);
-        public abstract ContentPartFieldDefinition Build();
+    public ContentPartFieldDefinitionBuilder WithSettings<T>() where T : class, new()
+    {
+        _settings[typeof(T).Name] = ToJsonObject(new T());
 
-        private static JsonObject ToJsonObject(object obj)
-            => JObject.FromObject(obj, ContentBuilderSettings.IgnoreDefaultValuesSerializer);
+        return this;
     }
+
+    public abstract ContentPartFieldDefinitionBuilder OfType(ContentFieldDefinition fieldDefinition);
+    public abstract ContentPartFieldDefinitionBuilder OfType(string fieldType);
+    public abstract ContentPartFieldDefinition Build();
+
+    private static JsonObject ToJsonObject(object obj)
+        => JObject.FromObject(obj, ContentBuilderSettings.IgnoreDefaultValuesSerializer);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentTypeDefinitionBuilder.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentTypeDefinitionBuilder.cs
index bb76ac8cda7..bc1aacf379e 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentTypeDefinitionBuilder.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentTypeDefinitionBuilder.cs
@@ -6,220 +6,219 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.ContentManagement.Utilities;
 
-namespace OrchardCore.ContentManagement.Metadata.Builders
+namespace OrchardCore.ContentManagement.Metadata.Builders;
+
+public class ContentTypeDefinitionBuilder
 {
-    public class ContentTypeDefinitionBuilder
+    private string _name;
+    private string _displayName;
+    private readonly List<ContentTypePartDefinition> _parts;
+    private readonly JsonObject _settings;
+
+    public ContentTypeDefinition Current { get; }
+
+    public ContentTypeDefinitionBuilder()
+        : this(new ContentTypeDefinition(null, null))
     {
-        private string _name;
-        private string _displayName;
-        private readonly List<ContentTypePartDefinition> _parts;
-        private readonly JsonObject _settings;
+    }
 
-        public ContentTypeDefinition Current { get; }
+    public ContentTypeDefinitionBuilder(ContentTypeDefinition existing)
+    {
+        Current = existing;
 
-        public ContentTypeDefinitionBuilder()
-            : this(new ContentTypeDefinition(null, null))
+        if (existing == null)
         {
+            _parts = [];
+            _settings = [];
         }
-
-        public ContentTypeDefinitionBuilder(ContentTypeDefinition existing)
+        else
         {
-            Current = existing;
-
-            if (existing == null)
-            {
-                _parts = [];
-                _settings = [];
-            }
-            else
-            {
-                _name = existing.Name;
-                _displayName = existing.DisplayName;
-                _parts = existing.Parts.ToList();
-                _settings = existing.Settings.Clone();
-            }
+            _name = existing.Name;
+            _displayName = existing.DisplayName;
+            _parts = existing.Parts.ToList();
+            _settings = existing.Settings.Clone();
         }
+    }
 
-        public ContentTypeDefinition Build()
+    public ContentTypeDefinition Build()
+    {
+        if (!char.IsLetter(_name[0]))
         {
-            if (!char.IsLetter(_name[0]))
-            {
-                throw new ArgumentException("Content type name must start with a letter", "name");
-            }
-            if (!string.Equals(_name, _name.ToSafeName(), StringComparison.OrdinalIgnoreCase))
-            {
-                throw new ArgumentException("Content type name contains invalid characters", "name");
-            }
-            if (_name.IsReservedContentName())
-            {
-                throw new ArgumentException("Content type name is reserved for internal use", "name");
-            }
-
-            return new ContentTypeDefinition(_name, _displayName, _parts, _settings);
+            throw new ArgumentException("Content type name must start with a letter", "name");
         }
-
-        public ContentTypeDefinitionBuilder Named(string name)
+        if (!string.Equals(_name, _name.ToSafeName(), StringComparison.OrdinalIgnoreCase))
         {
-            _name = name;
-            return this;
+            throw new ArgumentException("Content type name contains invalid characters", "name");
         }
-
-        public ContentTypeDefinitionBuilder DisplayedAs(string displayName)
+        if (_name.IsReservedContentName())
         {
-            _displayName = displayName;
-            return this;
+            throw new ArgumentException("Content type name is reserved for internal use", "name");
         }
 
-        public ContentTypeDefinitionBuilder MergeSettings(JsonObject settings)
-        {
-            _settings.Merge(settings, ContentBuilderSettings.JsonMergeSettings);
-            return this;
-        }
+        return new ContentTypeDefinition(_name, _displayName, _parts, _settings);
+    }
 
-        public ContentTypeDefinitionBuilder MergeSettings<T>(Action<T> setting) where T : class, new()
-        {
-            var existingJObject = _settings[typeof(T).Name] as JsonObject;
-            // If existing settings do not exist, create.
-            if (existingJObject == null)
-            {
-                existingJObject = JObject.FromObject(new T(), ContentBuilderSettings.IgnoreDefaultValuesSerializer);
-                _settings[typeof(T).Name] = existingJObject;
-            }
+    public ContentTypeDefinitionBuilder Named(string name)
+    {
+        _name = name;
+        return this;
+    }
 
-            var settingsToMerge = existingJObject.ToObject<T>();
-            setting(settingsToMerge);
-            _settings[typeof(T).Name] = JObject.FromObject(settingsToMerge, ContentBuilderSettings.IgnoreDefaultValuesSerializer);
-            return this;
-        }
+    public ContentTypeDefinitionBuilder DisplayedAs(string displayName)
+    {
+        _displayName = displayName;
+        return this;
+    }
 
-        public ContentTypeDefinitionBuilder WithSettings<T>(T settings)
+    public ContentTypeDefinitionBuilder MergeSettings(JsonObject settings)
+    {
+        _settings.Merge(settings, ContentBuilderSettings.JsonMergeSettings);
+        return this;
+    }
+
+    public ContentTypeDefinitionBuilder MergeSettings<T>(Action<T> setting) where T : class, new()
+    {
+        var existingJObject = _settings[typeof(T).Name] as JsonObject;
+        // If existing settings do not exist, create.
+        if (existingJObject == null)
         {
-            ArgumentNullException.ThrowIfNull(settings);
+            existingJObject = JObject.FromObject(new T(), ContentBuilderSettings.IgnoreDefaultValuesSerializer);
+            _settings[typeof(T).Name] = existingJObject;
+        }
 
-            var jObject = JObject.FromObject(settings, ContentBuilderSettings.IgnoreDefaultValuesSerializer);
-            _settings[typeof(T).Name] = jObject;
+        var settingsToMerge = existingJObject.ToObject<T>();
+        setting(settingsToMerge);
+        _settings[typeof(T).Name] = JObject.FromObject(settingsToMerge, ContentBuilderSettings.IgnoreDefaultValuesSerializer);
+        return this;
+    }
 
-            return this;
-        }
+    public ContentTypeDefinitionBuilder WithSettings<T>(T settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
+
+        var jObject = JObject.FromObject(settings, ContentBuilderSettings.IgnoreDefaultValuesSerializer);
+        _settings[typeof(T).Name] = jObject;
 
-        public ContentTypeDefinitionBuilder RemovePart<TPart>()
-            where TPart : ContentPart
-            => RemovePart(typeof(TPart).Name);
+        return this;
+    }
+
+    public ContentTypeDefinitionBuilder RemovePart<TPart>()
+        where TPart : ContentPart
+        => RemovePart(typeof(TPart).Name);
 
-        public ContentTypeDefinitionBuilder RemovePart(string partName)
+    public ContentTypeDefinitionBuilder RemovePart(string partName)
+    {
+        var existingPart = _parts.SingleOrDefault(x => string.Equals(x.Name, partName, StringComparison.OrdinalIgnoreCase));
+        if (existingPart != null)
         {
-            var existingPart = _parts.SingleOrDefault(x => string.Equals(x.Name, partName, StringComparison.OrdinalIgnoreCase));
-            if (existingPart != null)
-            {
-                _parts.Remove(existingPart);
-            }
-            return this;
+            _parts.Remove(existingPart);
         }
+        return this;
+    }
 
-        public ContentTypeDefinitionBuilder WithPart(string partName)
-            => WithPart(partName, configuration => { });
+    public ContentTypeDefinitionBuilder WithPart(string partName)
+        => WithPart(partName, configuration => { });
 
-        public ContentTypeDefinitionBuilder WithPart(string name, string partName)
-            => WithPart(name, new ContentPartDefinition(partName), configuration => { });
+    public ContentTypeDefinitionBuilder WithPart(string name, string partName)
+        => WithPart(name, new ContentPartDefinition(partName), configuration => { });
 
-        public ContentTypeDefinitionBuilder WithPart(string partName, Action<ContentTypePartDefinitionBuilder> configuration)
-            => WithPart(partName, new ContentPartDefinition(partName), configuration);
+    public ContentTypeDefinitionBuilder WithPart(string partName, Action<ContentTypePartDefinitionBuilder> configuration)
+        => WithPart(partName, new ContentPartDefinition(partName), configuration);
 
-        public ContentTypeDefinitionBuilder WithPart(string name, ContentPartDefinition partDefinition, Action<ContentTypePartDefinitionBuilder> configuration)
+    public ContentTypeDefinitionBuilder WithPart(string name, ContentPartDefinition partDefinition, Action<ContentTypePartDefinitionBuilder> configuration)
+    {
+        var existingPart = _parts.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.OrdinalIgnoreCase));
+        if (existingPart != null)
         {
-            var existingPart = _parts.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.OrdinalIgnoreCase));
-            if (existingPart != null)
-            {
-                _parts.Remove(existingPart);
-            }
-            else
+            _parts.Remove(existingPart);
+        }
+        else
+        {
+            existingPart = new ContentTypePartDefinition(name, partDefinition, [])
             {
-                existingPart = new ContentTypePartDefinition(name, partDefinition, [])
-                {
-                    ContentTypeDefinition = Current,
-                };
-            }
-
-            var configurer = new PartConfigurerImpl(existingPart);
-            configuration(configurer);
-            _parts.Add(configurer.Build());
-            return this;
+                ContentTypeDefinition = Current,
+            };
         }
 
-        public ContentTypeDefinitionBuilder WithPart(string name, string partName, Action<ContentTypePartDefinitionBuilder> configuration)
-            => WithPart(name, new ContentPartDefinition(partName), configuration);
+        var configurer = new PartConfigurerImpl(existingPart);
+        configuration(configurer);
+        _parts.Add(configurer.Build());
+        return this;
+    }
 
-        public ContentTypeDefinitionBuilder WithPart<TPart>() where TPart : ContentPart
-            => WithPart(typeof(TPart).Name, configuration => { });
+    public ContentTypeDefinitionBuilder WithPart(string name, string partName, Action<ContentTypePartDefinitionBuilder> configuration)
+        => WithPart(name, new ContentPartDefinition(partName), configuration);
 
-        public ContentTypeDefinitionBuilder WithPart<TPart>(string name) where TPart : ContentPart
-            => WithPart(name, new ContentPartDefinition(typeof(TPart).Name), configuration => { });
+    public ContentTypeDefinitionBuilder WithPart<TPart>() where TPart : ContentPart
+        => WithPart(typeof(TPart).Name, configuration => { });
 
-        public ContentTypeDefinitionBuilder WithPart<TPart>(string name, Action<ContentTypePartDefinitionBuilder> configuration) where TPart : ContentPart
-            => WithPart(name, new ContentPartDefinition(typeof(TPart).Name), configuration);
+    public ContentTypeDefinitionBuilder WithPart<TPart>(string name) where TPart : ContentPart
+        => WithPart(name, new ContentPartDefinition(typeof(TPart).Name), configuration => { });
 
-        public ContentTypeDefinitionBuilder WithPart<TPart>(Action<ContentTypePartDefinitionBuilder> configuration) where TPart : ContentPart
-            => WithPart(typeof(TPart).Name, configuration);
+    public ContentTypeDefinitionBuilder WithPart<TPart>(string name, Action<ContentTypePartDefinitionBuilder> configuration) where TPart : ContentPart
+        => WithPart(name, new ContentPartDefinition(typeof(TPart).Name), configuration);
 
-        public Task<ContentTypeDefinitionBuilder> WithPartAsync(string name, string partName, Func<ContentTypePartDefinitionBuilder, Task> configurationAsync)
-            => WithPartAsync(name, new ContentPartDefinition(partName), configurationAsync);
+    public ContentTypeDefinitionBuilder WithPart<TPart>(Action<ContentTypePartDefinitionBuilder> configuration) where TPart : ContentPart
+        => WithPart(typeof(TPart).Name, configuration);
 
-        public Task<ContentTypeDefinitionBuilder> WithPartAsync(string partName, Func<ContentTypePartDefinitionBuilder, Task> configurationAsync)
-            => WithPartAsync(partName, new ContentPartDefinition(partName), configurationAsync);
+    public Task<ContentTypeDefinitionBuilder> WithPartAsync(string name, string partName, Func<ContentTypePartDefinitionBuilder, Task> configurationAsync)
+        => WithPartAsync(name, new ContentPartDefinition(partName), configurationAsync);
 
-        public async Task<ContentTypeDefinitionBuilder> WithPartAsync(string name, ContentPartDefinition partDefinition, Func<ContentTypePartDefinitionBuilder, Task> configurationAsync)
-        {
-            var existingPart = _parts.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.OrdinalIgnoreCase));
+    public Task<ContentTypeDefinitionBuilder> WithPartAsync(string partName, Func<ContentTypePartDefinitionBuilder, Task> configurationAsync)
+        => WithPartAsync(partName, new ContentPartDefinition(partName), configurationAsync);
 
-            if (existingPart != null)
-            {
-                _parts.Remove(existingPart);
-            }
-            else
+    public async Task<ContentTypeDefinitionBuilder> WithPartAsync(string name, ContentPartDefinition partDefinition, Func<ContentTypePartDefinitionBuilder, Task> configurationAsync)
+    {
+        var existingPart = _parts.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.OrdinalIgnoreCase));
+
+        if (existingPart != null)
+        {
+            _parts.Remove(existingPart);
+        }
+        else
+        {
+            existingPart = new ContentTypePartDefinition(name, partDefinition, [])
             {
-                existingPart = new ContentTypePartDefinition(name, partDefinition, [])
-                {
-                    ContentTypeDefinition = Current,
-                };
-            }
+                ContentTypeDefinition = Current,
+            };
+        }
 
-            var configurer = new PartConfigurerImpl(existingPart);
+        var configurer = new PartConfigurerImpl(existingPart);
 
-            await configurationAsync(configurer);
+        await configurationAsync(configurer);
 
-            _parts.Add(configurer.Build());
+        _parts.Add(configurer.Build());
 
-            return this;
-        }
+        return this;
+    }
+
+    private sealed class PartConfigurerImpl : ContentTypePartDefinitionBuilder
+    {
+        private readonly ContentPartDefinition _partDefinition;
 
-        private sealed class PartConfigurerImpl : ContentTypePartDefinitionBuilder
+        public PartConfigurerImpl(ContentTypePartDefinition part)
+            : base(part)
         {
-            private readonly ContentPartDefinition _partDefinition;
+            Current = part;
+            _partDefinition = part.PartDefinition;
+        }
 
-            public PartConfigurerImpl(ContentTypePartDefinition part)
-                : base(part)
+        public override ContentTypePartDefinition Build()
+        {
+            if (!char.IsLetter(Current.Name[0]))
             {
-                Current = part;
-                _partDefinition = part.PartDefinition;
+                throw new ArgumentException("Content part name must start with a letter", "name");
             }
 
-            public override ContentTypePartDefinition Build()
+            if (!string.Equals(Current.Name, Current.Name.ToSafeName(), StringComparison.OrdinalIgnoreCase))
             {
-                if (!char.IsLetter(Current.Name[0]))
-                {
-                    throw new ArgumentException("Content part name must start with a letter", "name");
-                }
-
-                if (!string.Equals(Current.Name, Current.Name.ToSafeName(), StringComparison.OrdinalIgnoreCase))
-                {
-                    throw new ArgumentException("Content part name contains invalid characters", "name");
-                }
-
-                return new ContentTypePartDefinition(Current.Name, _partDefinition, _settings)
-                {
-                    ContentTypeDefinition = Current.ContentTypeDefinition,
-                };
+                throw new ArgumentException("Content part name contains invalid characters", "name");
             }
+
+            return new ContentTypePartDefinition(Current.Name, _partDefinition, _settings)
+            {
+                ContentTypeDefinition = Current.ContentTypeDefinition,
+            };
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentTypePartDefinitionBuilder.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentTypePartDefinitionBuilder.cs
index 08419716d8f..19ea89ff91c 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentTypePartDefinitionBuilder.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Builders/ContentTypePartDefinitionBuilder.cs
@@ -2,59 +2,58 @@
 using System.Text.Json.Nodes;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentManagement.Metadata.Builders
+namespace OrchardCore.ContentManagement.Metadata.Builders;
+
+public abstract class ContentTypePartDefinitionBuilder
 {
-    public abstract class ContentTypePartDefinitionBuilder
-    {
-        protected readonly JsonObject _settings;
+    protected readonly JsonObject _settings;
 
-        public ContentTypePartDefinition Current { get; protected set; }
-        public string Name { get; private set; }
-        public string PartName { get; private set; }
-        public string TypeName { get; private set; }
+    public ContentTypePartDefinition Current { get; protected set; }
+    public string Name { get; private set; }
+    public string PartName { get; private set; }
+    public string TypeName { get; private set; }
 
-        protected ContentTypePartDefinitionBuilder(ContentTypePartDefinition part)
-        {
-            Current = part;
-            Name = part.Name;
-            PartName = part.PartDefinition.Name;
-            TypeName = part.ContentTypeDefinition != null ? part.ContentTypeDefinition.Name : default;
-            _settings = part.Settings.Clone();
-        }
+    protected ContentTypePartDefinitionBuilder(ContentTypePartDefinition part)
+    {
+        Current = part;
+        Name = part.Name;
+        PartName = part.PartDefinition.Name;
+        TypeName = part.ContentTypeDefinition != null ? part.ContentTypeDefinition.Name : default;
+        _settings = part.Settings.Clone();
+    }
 
-        public ContentTypePartDefinitionBuilder WithSettings<T>(T settings)
-        {
-            ArgumentNullException.ThrowIfNull(settings);
+    public ContentTypePartDefinitionBuilder WithSettings<T>(T settings)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
 
-            var jObject = JObject.FromObject(settings, ContentBuilderSettings.IgnoreDefaultValuesSerializer);
-            _settings[typeof(T).Name] = jObject;
+        var jObject = JObject.FromObject(settings, ContentBuilderSettings.IgnoreDefaultValuesSerializer);
+        _settings[typeof(T).Name] = jObject;
 
-            return this;
-        }
+        return this;
+    }
 
-        public ContentTypePartDefinitionBuilder MergeSettings(JsonObject settings)
-        {
-            _settings.Merge(settings, ContentBuilderSettings.JsonMergeSettings);
-            return this;
-        }
+    public ContentTypePartDefinitionBuilder MergeSettings(JsonObject settings)
+    {
+        _settings.Merge(settings, ContentBuilderSettings.JsonMergeSettings);
+        return this;
+    }
+
+    public ContentTypePartDefinitionBuilder MergeSettings<T>(Action<T> setting) where T : class, new()
+    {
+        var existingJObject = _settings[typeof(T).Name] as JsonObject;
 
-        public ContentTypePartDefinitionBuilder MergeSettings<T>(Action<T> setting) where T : class, new()
+        // If existing settings do not exist, create.
+        if (existingJObject == null)
         {
-            var existingJObject = _settings[typeof(T).Name] as JsonObject;
-
-            // If existing settings do not exist, create.
-            if (existingJObject == null)
-            {
-                existingJObject = JObject.FromObject(new T(), ContentBuilderSettings.IgnoreDefaultValuesSerializer);
-                _settings[typeof(T).Name] = existingJObject;
-            }
-
-            var settingsToMerge = existingJObject.ToObject<T>();
-            setting(settingsToMerge);
-            _settings[typeof(T).Name] = JObject.FromObject(settingsToMerge, ContentBuilderSettings.IgnoreDefaultValuesSerializer);
-            return this;
+            existingJObject = JObject.FromObject(new T(), ContentBuilderSettings.IgnoreDefaultValuesSerializer);
+            _settings[typeof(T).Name] = existingJObject;
         }
 
-        public abstract ContentTypePartDefinition Build();
+        var settingsToMerge = existingJObject.ToObject<T>();
+        setting(settingsToMerge);
+        _settings[typeof(T).Name] = JObject.FromObject(settingsToMerge, ContentBuilderSettings.IgnoreDefaultValuesSerializer);
+        return this;
     }
+
+    public abstract ContentTypePartDefinition Build();
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentDefinition.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentDefinition.cs
index 4474af4c02b..9f6169f40b1 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentDefinition.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentDefinition.cs
@@ -2,51 +2,50 @@
 using System.Collections.Generic;
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.ContentManagement.Metadata.Models
+namespace OrchardCore.ContentManagement.Metadata.Models;
+
+public abstract class ContentDefinition
 {
-    public abstract class ContentDefinition
-    {
-        public string Name { get; protected set; }
+    public string Name { get; protected set; }
 
-        private Dictionary<Type, object> _namedSettings = [];
+    private Dictionary<Type, object> _namedSettings = [];
 
-        /// <summary>
-        /// Do not access this property directly. Migrate to use GetSettings and PopulateSettings.
-        /// </summary>
-        public JsonObject Settings { get; protected set; }
+    /// <summary>
+    /// Do not access this property directly. Migrate to use GetSettings and PopulateSettings.
+    /// </summary>
+    public JsonObject Settings { get; protected set; }
 
-        public T GetSettings<T>() where T : new()
+    public T GetSettings<T>() where T : new()
+    {
+        if (Settings == null)
         {
-            if (Settings == null)
-            {
-                return new T();
-            }
+            return new T();
+        }
 
-            var namedSettings = _namedSettings;
+        var namedSettings = _namedSettings;
 
-            if (!namedSettings.TryGetValue(typeof(T), out var result))
+        if (!namedSettings.TryGetValue(typeof(T), out var result))
+        {
+            var typeName = typeof(T).Name;
+
+            JsonNode value;
+            if (Settings.TryGetPropertyValue(typeName, out value))
+            {
+                result = value.ToObject<T>();
+            }
+            else
             {
-                var typeName = typeof(T).Name;
-
-                JsonNode value;
-                if (Settings.TryGetPropertyValue(typeName, out value))
-                {
-                    result = value.ToObject<T>();
-                }
-                else
-                {
-                    result = new T();
-                }
-
-                namedSettings = new Dictionary<Type, object>(_namedSettings)
-                {
-                    [typeof(T)] = result,
-                };
-
-                _namedSettings = namedSettings;
+                result = new T();
             }
 
-            return (T)result;
+            namedSettings = new Dictionary<Type, object>(_namedSettings)
+            {
+                [typeof(T)] = result,
+            };
+
+            _namedSettings = namedSettings;
         }
+
+        return (T)result;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentFieldDefinition.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentFieldDefinition.cs
index 24518b43d28..30acc0d62b6 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentFieldDefinition.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentFieldDefinition.cs
@@ -1,12 +1,11 @@
-namespace OrchardCore.ContentManagement.Metadata.Models
+namespace OrchardCore.ContentManagement.Metadata.Models;
+
+public class ContentFieldDefinition
 {
-    public class ContentFieldDefinition
+    public ContentFieldDefinition(string name)
     {
-        public ContentFieldDefinition(string name)
-        {
-            Name = name;
-        }
-
-        public string Name { get; private set; }
+        Name = name;
     }
+
+    public string Name { get; private set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentPartDefinition.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentPartDefinition.cs
index 6ebbb1da04f..1a438d4420d 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentPartDefinition.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentPartDefinition.cs
@@ -2,29 +2,28 @@
 using System.Linq;
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.ContentManagement.Metadata.Models
+namespace OrchardCore.ContentManagement.Metadata.Models;
+
+public class ContentPartDefinition : ContentDefinition
 {
-    public class ContentPartDefinition : ContentDefinition
+    public ContentPartDefinition(string name)
     {
-        public ContentPartDefinition(string name)
-        {
-            Name = name;
-            Fields = [];
-            Settings = [];
-        }
+        Name = name;
+        Fields = [];
+        Settings = [];
+    }
 
-        public ContentPartDefinition(string name, IEnumerable<ContentPartFieldDefinition> fields, JsonObject settings)
-        {
-            Name = name;
-            Fields = fields.ToList();
-            Settings = settings.Clone();
+    public ContentPartDefinition(string name, IEnumerable<ContentPartFieldDefinition> fields, JsonObject settings)
+    {
+        Name = name;
+        Fields = fields.ToList();
+        Settings = settings.Clone();
 
-            foreach (var field in Fields)
-            {
-                field.PartDefinition = this;
-            }
+        foreach (var field in Fields)
+        {
+            field.PartDefinition = this;
         }
-
-        public IEnumerable<ContentPartFieldDefinition> Fields { get; private set; }
     }
+
+    public IEnumerable<ContentPartFieldDefinition> Fields { get; private set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentPartFieldDefinition.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentPartFieldDefinition.cs
index e0b164df690..fcd491ab600 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentPartFieldDefinition.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentPartFieldDefinition.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.ContentManagement.Metadata.Models
+namespace OrchardCore.ContentManagement.Metadata.Models;
+
+public class ContentPartFieldDefinition : ContentDefinition
 {
-    public class ContentPartFieldDefinition : ContentDefinition
+    public ContentPartFieldDefinition(ContentFieldDefinition contentFieldDefinition, string name, JsonObject settings)
     {
-        public ContentPartFieldDefinition(ContentFieldDefinition contentFieldDefinition, string name, JsonObject settings)
-        {
-            Name = name;
-            FieldDefinition = contentFieldDefinition;
-            Settings = settings;
-        }
-
-        public ContentFieldDefinition FieldDefinition { get; private set; }
-        public ContentPartDefinition PartDefinition { get; set; }
-        public ContentTypePartDefinition ContentTypePartDefinition { get; set; }
+        Name = name;
+        FieldDefinition = contentFieldDefinition;
+        Settings = settings;
     }
+
+    public ContentFieldDefinition FieldDefinition { get; private set; }
+    public ContentPartDefinition PartDefinition { get; set; }
+    public ContentTypePartDefinition ContentTypePartDefinition { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentPartFieldDefinitionExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentPartFieldDefinitionExtensions.cs
index efeced01a83..2fa05d5fe93 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentPartFieldDefinitionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentPartFieldDefinitionExtensions.cs
@@ -1,10 +1,9 @@
 using OrchardCore.ContentManagement.Metadata.Settings;
 
-namespace OrchardCore.ContentManagement.Metadata.Models
+namespace OrchardCore.ContentManagement.Metadata.Models;
+
+public static class ContentPartFieldDefinitionExtensions
 {
-    public static class ContentPartFieldDefinitionExtensions
-    {
-        public static bool IsNamedPart(this ContentPartFieldDefinition fieldDefinition)
-            => fieldDefinition.PartDefinition.IsReusable() && fieldDefinition.ContentTypePartDefinition.Name != fieldDefinition.PartDefinition.Name;
-    }
+    public static bool IsNamedPart(this ContentPartFieldDefinition fieldDefinition)
+        => fieldDefinition.PartDefinition.IsReusable() && fieldDefinition.ContentTypePartDefinition.Name != fieldDefinition.PartDefinition.Name;
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentPartFieldSettingsExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentPartFieldSettingsExtensions.cs
index d5927d03a06..2c00d992ada 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentPartFieldSettingsExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentPartFieldSettingsExtensions.cs
@@ -1,34 +1,33 @@
 using OrchardCore.ContentManagement.Metadata.Settings;
 
-namespace OrchardCore.ContentManagement.Metadata.Models
+namespace OrchardCore.ContentManagement.Metadata.Models;
+
+public static class ContentPartFieldSettingsExtensions
 {
-    public static class ContentPartFieldSettingsExtensions
+    public static string DisplayName(this ContentPartFieldDefinition partField)
     {
-        public static string DisplayName(this ContentPartFieldDefinition partField)
-        {
-            var displayName = partField.GetSettings<ContentPartFieldSettings>().DisplayName;
-
-            if (string.IsNullOrEmpty(displayName))
-            {
-                displayName = partField.FieldDefinition?.Name;
-            }
-
-            return displayName;
-        }
+        var displayName = partField.GetSettings<ContentPartFieldSettings>().DisplayName;
 
-        public static string Description(this ContentPartFieldDefinition partField)
+        if (string.IsNullOrEmpty(displayName))
         {
-            return partField.GetSettings<ContentPartFieldSettings>().Description;
+            displayName = partField.FieldDefinition?.Name;
         }
 
-        public static string Editor(this ContentPartFieldDefinition partField)
-        {
-            return partField.GetSettings<ContentPartFieldSettings>().Editor;
-        }
+        return displayName;
+    }
 
-        public static string DisplayMode(this ContentPartFieldDefinition partField)
-        {
-            return partField.GetSettings<ContentPartFieldSettings>().DisplayMode;
-        }
+    public static string Description(this ContentPartFieldDefinition partField)
+    {
+        return partField.GetSettings<ContentPartFieldSettings>().Description;
+    }
+
+    public static string Editor(this ContentPartFieldDefinition partField)
+    {
+        return partField.GetSettings<ContentPartFieldSettings>().Editor;
+    }
+
+    public static string DisplayMode(this ContentPartFieldDefinition partField)
+    {
+        return partField.GetSettings<ContentPartFieldSettings>().DisplayMode;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentTypeDefinition.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentTypeDefinition.cs
index de5a2023b66..0f89bf46f44 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentTypeDefinition.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentTypeDefinition.cs
@@ -3,46 +3,45 @@
 using System.Linq;
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.ContentManagement.Metadata.Models
+namespace OrchardCore.ContentManagement.Metadata.Models;
+
+public class ContentTypeDefinition : ContentDefinition
 {
-    public class ContentTypeDefinition : ContentDefinition
+    public ContentTypeDefinition(string name, string displayName, IEnumerable<ContentTypePartDefinition> parts, JsonObject settings)
     {
-        public ContentTypeDefinition(string name, string displayName, IEnumerable<ContentTypePartDefinition> parts, JsonObject settings)
-        {
-            Name = name;
-            DisplayName = displayName;
-            Parts = parts.ToList();
-            Settings = settings.Clone();
-
-            foreach (var part in Parts)
-            {
-                part.ContentTypeDefinition = this;
-            }
-        }
+        Name = name;
+        DisplayName = displayName;
+        Parts = parts.ToList();
+        Settings = settings.Clone();
 
-        public ContentTypeDefinition(string name, string displayName)
+        foreach (var part in Parts)
         {
-            Name = name;
-            DisplayName = displayName;
-            Parts = [];
-            Settings = [];
+            part.ContentTypeDefinition = this;
         }
+    }
 
-        [Required, StringLength(1024)]
-        public string DisplayName { get; private set; }
+    public ContentTypeDefinition(string name, string displayName)
+    {
+        Name = name;
+        DisplayName = displayName;
+        Parts = [];
+        Settings = [];
+    }
 
-        public IEnumerable<ContentTypePartDefinition> Parts { get; private set; }
+    [Required, StringLength(1024)]
+    public string DisplayName { get; private set; }
 
-        /// <summary>
-        /// Returns the <see cref="DisplayName"/> value of the type if defined,
-        /// or the <see cref="ContentDefinition.Name"/> otherwise.
-        /// </summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            return string.IsNullOrEmpty(DisplayName)
-                ? Name
-                : DisplayName;
-        }
+    public IEnumerable<ContentTypePartDefinition> Parts { get; private set; }
+
+    /// <summary>
+    /// Returns the <see cref="DisplayName"/> value of the type if defined,
+    /// or the <see cref="ContentDefinition.Name"/> otherwise.
+    /// </summary>
+    /// <returns></returns>
+    public override string ToString()
+    {
+        return string.IsNullOrEmpty(DisplayName)
+            ? Name
+            : DisplayName;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentTypePartDefinition.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentTypePartDefinition.cs
index 6b31e22a382..96db333a2ff 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentTypePartDefinition.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentTypePartDefinition.cs
@@ -1,22 +1,21 @@
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.ContentManagement.Metadata.Models
+namespace OrchardCore.ContentManagement.Metadata.Models;
+
+public class ContentTypePartDefinition : ContentDefinition
 {
-    public class ContentTypePartDefinition : ContentDefinition
+    public ContentTypePartDefinition(string name, ContentPartDefinition contentPartDefinition, JsonObject settings)
     {
-        public ContentTypePartDefinition(string name, ContentPartDefinition contentPartDefinition, JsonObject settings)
-        {
-            Name = name;
-            PartDefinition = contentPartDefinition;
-            Settings = settings;
+        Name = name;
+        PartDefinition = contentPartDefinition;
+        Settings = settings;
 
-            foreach (var field in PartDefinition.Fields)
-            {
-                field.ContentTypePartDefinition = this;
-            }
+        foreach (var field in PartDefinition.Fields)
+        {
+            field.ContentTypePartDefinition = this;
         }
-
-        public ContentPartDefinition PartDefinition { get; private set; }
-        public ContentTypeDefinition ContentTypeDefinition { get; set; }
     }
+
+    public ContentPartDefinition PartDefinition { get; private set; }
+    public ContentTypeDefinition ContentTypeDefinition { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentTypePartExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentTypePartExtensions.cs
index c85dd3c0467..66a56555403 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentTypePartExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Models/ContentTypePartExtensions.cs
@@ -1,53 +1,52 @@
 using OrchardCore.ContentManagement.Metadata.Settings;
 
-namespace OrchardCore.ContentManagement.Metadata.Models
+namespace OrchardCore.ContentManagement.Metadata.Models;
+
+public static class ContentTypePartExtensions
 {
-    public static class ContentTypePartExtensions
+    public static string DisplayName(this ContentTypePartDefinition typePart)
     {
-        public static string DisplayName(this ContentTypePartDefinition typePart)
-        {
-            var displayName = typePart.GetSettings<ContentTypePartSettings>().DisplayName;
+        var displayName = typePart.GetSettings<ContentTypePartSettings>().DisplayName;
 
-            if (string.IsNullOrEmpty(displayName))
+        if (string.IsNullOrEmpty(displayName))
+        {
+            // ContentType creates a same named ContentPart. As DisplayName is not stored in ContentPart,
+            // fetching it from the parent ContentType
+            if (typePart.PartDefinition.Name == typePart.ContentTypeDefinition.Name)
             {
-                // ContentType creates a same named ContentPart. As DisplayName is not stored in ContentPart,
-                // fetching it from the parent ContentType
-                if (typePart.PartDefinition.Name == typePart.ContentTypeDefinition.Name)
-                {
-                    displayName = typePart.ContentTypeDefinition.DisplayName;
-                }
-                else
-                {
-                    displayName = typePart.PartDefinition.DisplayName();
-                }
+                displayName = typePart.ContentTypeDefinition.DisplayName;
             }
-
-            return displayName;
-        }
-
-        public static string Description(this ContentTypePartDefinition typePart)
-        {
-            var description = typePart.GetSettings<ContentTypePartSettings>().Description;
-
-            if (string.IsNullOrEmpty(description))
+            else
             {
-                description = typePart.PartDefinition.Description();
+                displayName = typePart.PartDefinition.DisplayName();
             }
-
-            return description;
         }
 
-        public static string Editor(this ContentTypePartDefinition typePart)
-        {
-            return typePart.GetSettings<ContentTypePartSettings>().Editor;
-        }
+        return displayName;
+    }
+
+    public static string Description(this ContentTypePartDefinition typePart)
+    {
+        var description = typePart.GetSettings<ContentTypePartSettings>().Description;
 
-        public static string DisplayMode(this ContentTypePartDefinition typePart)
+        if (string.IsNullOrEmpty(description))
         {
-            return typePart.GetSettings<ContentTypePartSettings>().DisplayMode;
+            description = typePart.PartDefinition.Description();
         }
 
-        public static bool IsNamedPart(this ContentTypePartDefinition typePart)
-            => typePart.PartDefinition.IsReusable() && typePart.Name != typePart.PartDefinition.Name;
+        return description;
+    }
+
+    public static string Editor(this ContentTypePartDefinition typePart)
+    {
+        return typePart.GetSettings<ContentTypePartSettings>().Editor;
     }
+
+    public static string DisplayMode(this ContentTypePartDefinition typePart)
+    {
+        return typePart.GetSettings<ContentTypePartSettings>().DisplayMode;
+    }
+
+    public static bool IsNamedPart(this ContentTypePartDefinition typePart)
+        => typePart.PartDefinition.IsReusable() && typePart.Name != typePart.PartDefinition.Name;
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentDefinitionRecord.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentDefinitionRecord.cs
index 43748f24a2d..b9af20aeb92 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentDefinitionRecord.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentDefinitionRecord.cs
@@ -1,18 +1,17 @@
 using System.Collections.Generic;
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.ContentManagement.Metadata.Records
+namespace OrchardCore.ContentManagement.Metadata.Records;
+
+[FileDocumentStore(FileName = "ContentDefinition")]
+public class ContentDefinitionRecord : Document
 {
-    [FileDocumentStore(FileName = "ContentDefinition")]
-    public class ContentDefinitionRecord : Document
+    public ContentDefinitionRecord()
     {
-        public ContentDefinitionRecord()
-        {
-            ContentTypeDefinitionRecords = [];
-            ContentPartDefinitionRecords = [];
-        }
-
-        public IList<ContentTypeDefinitionRecord> ContentTypeDefinitionRecords { get; set; }
-        public IList<ContentPartDefinitionRecord> ContentPartDefinitionRecords { get; set; }
+        ContentTypeDefinitionRecords = [];
+        ContentPartDefinitionRecords = [];
     }
+
+    public IList<ContentTypeDefinitionRecord> ContentTypeDefinitionRecords { get; set; }
+    public IList<ContentPartDefinitionRecord> ContentPartDefinitionRecords { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentFieldDefinitionRecord.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentFieldDefinitionRecord.cs
index 9b7a766af82..0ce2a915bfc 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentFieldDefinitionRecord.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentFieldDefinitionRecord.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.ContentManagement.Metadata.Records
+namespace OrchardCore.ContentManagement.Metadata.Records;
+
+/// <summary>
+/// Represents a field name.
+/// </summary>
+public class ContentFieldDefinitionRecord
 {
-    /// <summary>
-    /// Represents a field name.
-    /// </summary>
-    public class ContentFieldDefinitionRecord
-    {
-        public string Name { get; set; }
-    }
+    public string Name { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentPartDefinitionRecord.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentPartDefinitionRecord.cs
index 6f969fc3d3a..02807389eae 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentPartDefinitionRecord.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentPartDefinitionRecord.cs
@@ -1,24 +1,23 @@
 using System.Collections.Generic;
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.ContentManagement.Metadata.Records
+namespace OrchardCore.ContentManagement.Metadata.Records;
+
+public class ContentPartDefinitionRecord
 {
-    public class ContentPartDefinitionRecord
+    public ContentPartDefinitionRecord()
     {
-        public ContentPartDefinitionRecord()
-        {
-            ContentPartFieldDefinitionRecords = [];
-            Settings = [];
-        }
+        ContentPartFieldDefinitionRecords = [];
+        Settings = [];
+    }
 
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the settings of a part, like description, or any property that a module would attach
-        /// to a part.
-        /// </summary>
-        public JsonObject Settings { get; set; }
+    /// <summary>
+    /// Gets or sets the settings of a part, like description, or any property that a module would attach
+    /// to a part.
+    /// </summary>
+    public JsonObject Settings { get; set; }
 
-        public IList<ContentPartFieldDefinitionRecord> ContentPartFieldDefinitionRecords { get; set; }
-    }
+    public IList<ContentPartFieldDefinitionRecord> ContentPartFieldDefinitionRecords { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentPartFieldDefinitionRecord.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentPartFieldDefinitionRecord.cs
index 24cda685430..ca4ad49eac3 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentPartFieldDefinitionRecord.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentPartFieldDefinitionRecord.cs
@@ -1,25 +1,24 @@
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.ContentManagement.Metadata.Records
+namespace OrchardCore.ContentManagement.Metadata.Records;
+
+/// <summary>
+/// Represents a field and its settings in a part.
+/// </summary>
+public class ContentPartFieldDefinitionRecord
 {
     /// <summary>
-    /// Represents a field and its settings in a part.
+    /// Gets or sets the field name, e.g. BooleanField.
     /// </summary>
-    public class ContentPartFieldDefinitionRecord
-    {
-        /// <summary>
-        /// Gets or sets the field name, e.g. BooleanField.
-        /// </summary>
-        public string FieldName { get; set; }
+    public string FieldName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the name of the field, e.g. Age.
-        /// </summary>
-        public string Name { get; set; }
+    /// <summary>
+    /// Gets or sets the name of the field, e.g. Age.
+    /// </summary>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the settings of the field for this part.
-        /// </summary>
-        public JsonObject Settings { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the settings of the field for this part.
+    /// </summary>
+    public JsonObject Settings { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentTypeDefinitionRecord.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentTypeDefinitionRecord.cs
index 392565864c8..75cff0328ab 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentTypeDefinitionRecord.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentTypeDefinitionRecord.cs
@@ -1,21 +1,20 @@
 using System.Collections.Generic;
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.ContentManagement.Metadata.Records
+namespace OrchardCore.ContentManagement.Metadata.Records;
+
+public class ContentTypeDefinitionRecord
 {
-    public class ContentTypeDefinitionRecord
+    public ContentTypeDefinitionRecord()
     {
-        public ContentTypeDefinitionRecord()
-        {
-            ContentTypePartDefinitionRecords = [];
-        }
+        ContentTypePartDefinitionRecords = [];
+    }
 
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        public string DisplayName { get; set; }
+    public string DisplayName { get; set; }
 
-        public JsonObject Settings { get; set; }
+    public JsonObject Settings { get; set; }
 
-        public IList<ContentTypePartDefinitionRecord> ContentTypePartDefinitionRecords { get; set; }
-    }
+    public IList<ContentTypePartDefinitionRecord> ContentTypePartDefinitionRecords { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentTypePartDefinitionRecord.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentTypePartDefinitionRecord.cs
index 7c2c344b919..598f5a931d5 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentTypePartDefinitionRecord.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Records/ContentTypePartDefinitionRecord.cs
@@ -1,25 +1,24 @@
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.ContentManagement.Metadata.Records
+namespace OrchardCore.ContentManagement.Metadata.Records;
+
+/// <summary>
+/// Represents a part and its settings in a type.
+/// </summary>
+public class ContentTypePartDefinitionRecord
 {
     /// <summary>
-    /// Represents a part and its settings in a type.
+    /// Gets or sets the part name.
     /// </summary>
-    public class ContentTypePartDefinitionRecord
-    {
-        /// <summary>
-        /// Gets or sets the part name.
-        /// </summary>
-        public string PartName { get; set; }
+    public string PartName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the name of the part.
-        /// </summary>
-        public string Name { get; set; }
+    /// <summary>
+    /// Gets or sets the name of the part.
+    /// </summary>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the settings of the part for this type.
-        /// </summary>
-        public JsonObject Settings { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the settings of the part for this type.
+    /// </summary>
+    public JsonObject Settings { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentPartFieldSettings.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentPartFieldSettings.cs
index ece1f6d2fb0..351d0be8116 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentPartFieldSettings.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentPartFieldSettings.cs
@@ -1,30 +1,29 @@
-namespace OrchardCore.ContentManagement.Metadata.Settings
+namespace OrchardCore.ContentManagement.Metadata.Settings;
+
+public class ContentPartFieldSettings
 {
-    public class ContentPartFieldSettings
-    {
-        /// <summary>
-        /// Gets or sets the displayed name of the part field.
-        /// </summary>
-        public string DisplayName { get; set; }
+    /// <summary>
+    /// Gets or sets the displayed name of the part field.
+    /// </summary>
+    public string DisplayName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the description of the part field.
-        /// </summary>
-        public string Description { get; set; }
+    /// <summary>
+    /// Gets or sets the description of the part field.
+    /// </summary>
+    public string Description { get; set; }
 
-        /// <summary>
-        /// Gets or sets the editor of the part field.
-        /// </summary>
-        public string Editor { get; set; }
+    /// <summary>
+    /// Gets or sets the editor of the part field.
+    /// </summary>
+    public string Editor { get; set; }
 
-        /// <summary>
-        /// Gets or sets the display mode of the part field.
-        /// </summary>
-        public string DisplayMode { get; set; }
+    /// <summary>
+    /// Gets or sets the display mode of the part field.
+    /// </summary>
+    public string DisplayMode { get; set; }
 
-        /// <summary>
-        /// Gets or sets the position of the part field in the editor.
-        /// </summary>
-        public string Position { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the position of the part field in the editor.
+    /// </summary>
+    public string Position { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentPartFieldSettingsExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentPartFieldSettingsExtensions.cs
index 6bdd9017623..1e835a34328 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentPartFieldSettingsExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentPartFieldSettingsExtensions.cs
@@ -1,32 +1,31 @@
 using OrchardCore.ContentManagement.Metadata.Builders;
 
-namespace OrchardCore.ContentManagement.Metadata.Settings
+namespace OrchardCore.ContentManagement.Metadata.Settings;
+
+public static class ContentPartFieldSettingsExtensions
 {
-    public static class ContentPartFieldSettingsExtensions
+    public static ContentPartFieldDefinitionBuilder WithDisplayName(this ContentPartFieldDefinitionBuilder builder, string displayName)
     {
-        public static ContentPartFieldDefinitionBuilder WithDisplayName(this ContentPartFieldDefinitionBuilder builder, string displayName)
-        {
-            return builder.MergeSettings<ContentPartFieldSettings>(x => x.DisplayName = displayName);
-        }
+        return builder.MergeSettings<ContentPartFieldSettings>(x => x.DisplayName = displayName);
+    }
 
-        public static ContentPartFieldDefinitionBuilder WithDescription(this ContentPartFieldDefinitionBuilder builder, string description)
-        {
-            return builder.MergeSettings<ContentPartFieldSettings>(x => x.Description = description);
-        }
+    public static ContentPartFieldDefinitionBuilder WithDescription(this ContentPartFieldDefinitionBuilder builder, string description)
+    {
+        return builder.MergeSettings<ContentPartFieldSettings>(x => x.Description = description);
+    }
 
-        public static ContentPartFieldDefinitionBuilder WithEditor(this ContentPartFieldDefinitionBuilder builder, string editor)
-        {
-            return builder.MergeSettings<ContentPartFieldSettings>(x => x.Editor = editor);
-        }
+    public static ContentPartFieldDefinitionBuilder WithEditor(this ContentPartFieldDefinitionBuilder builder, string editor)
+    {
+        return builder.MergeSettings<ContentPartFieldSettings>(x => x.Editor = editor);
+    }
 
-        public static ContentPartFieldDefinitionBuilder WithDisplayMode(this ContentPartFieldDefinitionBuilder builder, string displayMode)
-        {
-            return builder.MergeSettings<ContentPartFieldSettings>(x => x.DisplayMode = displayMode);
-        }
+    public static ContentPartFieldDefinitionBuilder WithDisplayMode(this ContentPartFieldDefinitionBuilder builder, string displayMode)
+    {
+        return builder.MergeSettings<ContentPartFieldSettings>(x => x.DisplayMode = displayMode);
+    }
 
-        public static ContentPartFieldDefinitionBuilder WithPosition(this ContentPartFieldDefinitionBuilder builder, string position)
-        {
-            return builder.MergeSettings<ContentPartFieldSettings>(x => x.Position = position);
-        }
+    public static ContentPartFieldDefinitionBuilder WithPosition(this ContentPartFieldDefinitionBuilder builder, string position)
+    {
+        return builder.MergeSettings<ContentPartFieldSettings>(x => x.Position = position);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentPartSettings.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentPartSettings.cs
index 594fa22d391..bca210ce2ff 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentPartSettings.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentPartSettings.cs
@@ -1,30 +1,29 @@
-namespace OrchardCore.ContentManagement.Metadata.Settings
+namespace OrchardCore.ContentManagement.Metadata.Settings;
+
+public class ContentPartSettings
 {
-    public class ContentPartSettings
-    {
-        /// <summary>
-        /// Gets or sets whether this part can be manually attached to a content type.
-        /// </summary>
-        public bool Attachable { get; set; }
+    /// <summary>
+    /// Gets or sets whether this part can be manually attached to a content type.
+    /// </summary>
+    public bool Attachable { get; set; }
 
-        /// <summary>
-        /// Gets or sets whether the part can be attached multiple times to a content type.
-        /// </summary>
-        public bool Reusable { get; set; }
+    /// <summary>
+    /// Gets or sets whether the part can be attached multiple times to a content type.
+    /// </summary>
+    public bool Reusable { get; set; }
 
-        /// <summary>
-        /// Gets or sets the displayed name of the part.
-        /// </summary>
-        public string DisplayName { get; set; }
+    /// <summary>
+    /// Gets or sets the displayed name of the part.
+    /// </summary>
+    public string DisplayName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the description of the part.
-        /// </summary>
-        public string Description { get; set; }
+    /// <summary>
+    /// Gets or sets the description of the part.
+    /// </summary>
+    public string Description { get; set; }
 
-        /// <summary>
-        /// Gets or sets the default position of the part when attached to a type.
-        /// </summary>
-        public string DefaultPosition { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the default position of the part when attached to a type.
+    /// </summary>
+    public string DefaultPosition { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentPartSettingsExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentPartSettingsExtensions.cs
index 67b44ec535a..46bd01e3935 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentPartSettingsExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentPartSettingsExtensions.cs
@@ -3,65 +3,64 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.ContentManagement.Utilities;
 
-namespace OrchardCore.ContentManagement.Metadata.Settings
+namespace OrchardCore.ContentManagement.Metadata.Settings;
+
+public static class ContentPartSettingsExtensions
 {
-    public static class ContentPartSettingsExtensions
+    public static ContentPartDefinitionBuilder Attachable(this ContentPartDefinitionBuilder builder, bool attachable = true)
     {
-        public static ContentPartDefinitionBuilder Attachable(this ContentPartDefinitionBuilder builder, bool attachable = true)
-        {
-            return builder.MergeSettings<ContentPartSettings>(x => x.Attachable = attachable);
-        }
-
-        public static bool IsAttachable(this ContentPartDefinition part)
-        {
-            return part.GetSettings<ContentPartSettings>().Attachable;
-        }
+        return builder.MergeSettings<ContentPartSettings>(x => x.Attachable = attachable);
+    }
 
-        public static ContentPartDefinitionBuilder Reusable(this ContentPartDefinitionBuilder builder, bool reusable = true)
-        {
-            return builder.MergeSettings<ContentPartSettings>(x => x.Reusable = reusable);
-        }
+    public static bool IsAttachable(this ContentPartDefinition part)
+    {
+        return part.GetSettings<ContentPartSettings>().Attachable;
+    }
 
-        public static bool IsReusable(this ContentPartDefinition part)
-        {
-            return part.GetSettings<ContentPartSettings>().Reusable;
-        }
+    public static ContentPartDefinitionBuilder Reusable(this ContentPartDefinitionBuilder builder, bool reusable = true)
+    {
+        return builder.MergeSettings<ContentPartSettings>(x => x.Reusable = reusable);
+    }
 
-        public static ContentPartDefinitionBuilder WithDescription(this ContentPartDefinitionBuilder builder, string description)
-        {
-            return builder.MergeSettings<ContentPartSettings>(x => x.Description = description);
-        }
+    public static bool IsReusable(this ContentPartDefinition part)
+    {
+        return part.GetSettings<ContentPartSettings>().Reusable;
+    }
 
-        public static ContentPartDefinitionBuilder WithDisplayName(this ContentPartDefinitionBuilder builder, string description)
-        {
-            return builder.MergeSettings<ContentPartSettings>(x => x.DisplayName = description);
-        }
+    public static ContentPartDefinitionBuilder WithDescription(this ContentPartDefinitionBuilder builder, string description)
+    {
+        return builder.MergeSettings<ContentPartSettings>(x => x.Description = description);
+    }
 
-        public static ContentPartDefinitionBuilder WithDefaultPosition(this ContentPartDefinitionBuilder builder, string position)
-        {
-            return builder.MergeSettings<ContentPartSettings>(x => x.DefaultPosition = position);
-        }
+    public static ContentPartDefinitionBuilder WithDisplayName(this ContentPartDefinitionBuilder builder, string description)
+    {
+        return builder.MergeSettings<ContentPartSettings>(x => x.DisplayName = description);
+    }
 
-        public static string DefaultPosition(this ContentPartDefinition part)
-        {
-            return part.GetSettings<ContentPartSettings>().DefaultPosition;
-        }
+    public static ContentPartDefinitionBuilder WithDefaultPosition(this ContentPartDefinitionBuilder builder, string position)
+    {
+        return builder.MergeSettings<ContentPartSettings>(x => x.DefaultPosition = position);
+    }
 
-        public static string Description(this ContentPartDefinition part)
-        {
-            return part.GetSettings<ContentPartSettings>().Description;
-        }
+    public static string DefaultPosition(this ContentPartDefinition part)
+    {
+        return part.GetSettings<ContentPartSettings>().DefaultPosition;
+    }
 
-        public static string DisplayName(this ContentPartDefinition part)
-        {
-            var displayName = part.GetSettings<ContentPartSettings>().DisplayName;
+    public static string Description(this ContentPartDefinition part)
+    {
+        return part.GetSettings<ContentPartSettings>().Description;
+    }
 
-            if (string.IsNullOrEmpty(displayName))
-            {
-                displayName = part.Name.TrimEnd("Part");
-            }
+    public static string DisplayName(this ContentPartDefinition part)
+    {
+        var displayName = part.GetSettings<ContentPartSettings>().DisplayName;
 
-            return displayName;
+        if (string.IsNullOrEmpty(displayName))
+        {
+            displayName = part.Name.TrimEnd("Part");
         }
+
+        return displayName;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentTypePartSettings.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentTypePartSettings.cs
index a759ebc1c68..207897a597a 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentTypePartSettings.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentTypePartSettings.cs
@@ -1,30 +1,29 @@
-namespace OrchardCore.ContentManagement.Metadata.Settings
+namespace OrchardCore.ContentManagement.Metadata.Settings;
+
+public class ContentTypePartSettings
 {
-    public class ContentTypePartSettings
-    {
-        /// <summary>
-        /// Gets or sets the displayed name of the type part.
-        /// </summary>
-        public string DisplayName { get; set; }
+    /// <summary>
+    /// Gets or sets the displayed name of the type part.
+    /// </summary>
+    public string DisplayName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the description name of the type part.
-        /// </summary>
-        public string Description { get; set; }
+    /// <summary>
+    /// Gets or sets the description name of the type part.
+    /// </summary>
+    public string Description { get; set; }
 
-        /// <summary>
-        /// Gets or sets the position of the type part in the editor.
-        /// </summary>
-        public string Position { get; set; }
+    /// <summary>
+    /// Gets or sets the position of the type part in the editor.
+    /// </summary>
+    public string Position { get; set; }
 
-        /// <summary>
-        /// Gets or sets the display mode of the type part.
-        /// </summary>
-        public string DisplayMode { get; set; }
+    /// <summary>
+    /// Gets or sets the display mode of the type part.
+    /// </summary>
+    public string DisplayMode { get; set; }
 
-        /// <summary>
-        /// Gets or sets the editor of the type part.
-        /// </summary>
-        public string Editor { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the editor of the type part.
+    /// </summary>
+    public string Editor { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentTypePartSettingsExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentTypePartSettingsExtensions.cs
index 1d0e25d19fe..9d4625a8e21 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentTypePartSettingsExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentTypePartSettingsExtensions.cs
@@ -1,32 +1,31 @@
 using OrchardCore.ContentManagement.Metadata.Builders;
 
-namespace OrchardCore.ContentManagement.Metadata.Settings
+namespace OrchardCore.ContentManagement.Metadata.Settings;
+
+public static class ContentTypePartSettingsExtensions
 {
-    public static class ContentTypePartSettingsExtensions
+    public static ContentTypePartDefinitionBuilder WithDisplayName(this ContentTypePartDefinitionBuilder builder, string displayName)
     {
-        public static ContentTypePartDefinitionBuilder WithDisplayName(this ContentTypePartDefinitionBuilder builder, string displayName)
-        {
-            return builder.MergeSettings<ContentTypePartSettings>(x => x.DisplayName = displayName);
-        }
+        return builder.MergeSettings<ContentTypePartSettings>(x => x.DisplayName = displayName);
+    }
 
-        public static ContentTypePartDefinitionBuilder WithDescription(this ContentTypePartDefinitionBuilder builder, string description)
-        {
-            return builder.MergeSettings<ContentTypePartSettings>(x => x.Description = description);
-        }
+    public static ContentTypePartDefinitionBuilder WithDescription(this ContentTypePartDefinitionBuilder builder, string description)
+    {
+        return builder.MergeSettings<ContentTypePartSettings>(x => x.Description = description);
+    }
 
-        public static ContentTypePartDefinitionBuilder WithPosition(this ContentTypePartDefinitionBuilder builder, string position)
-        {
-            return builder.MergeSettings<ContentTypePartSettings>(x => x.Position = position);
-        }
+    public static ContentTypePartDefinitionBuilder WithPosition(this ContentTypePartDefinitionBuilder builder, string position)
+    {
+        return builder.MergeSettings<ContentTypePartSettings>(x => x.Position = position);
+    }
 
-        public static ContentTypePartDefinitionBuilder WithDisplayMode(this ContentTypePartDefinitionBuilder builder, string displayMode)
-        {
-            return builder.MergeSettings<ContentTypePartSettings>(x => x.DisplayMode = displayMode);
-        }
+    public static ContentTypePartDefinitionBuilder WithDisplayMode(this ContentTypePartDefinitionBuilder builder, string displayMode)
+    {
+        return builder.MergeSettings<ContentTypePartSettings>(x => x.DisplayMode = displayMode);
+    }
 
-        public static ContentTypePartDefinitionBuilder WithEditor(this ContentTypePartDefinitionBuilder builder, string editor)
-        {
-            return builder.MergeSettings<ContentTypePartSettings>(x => x.Editor = editor);
-        }
+    public static ContentTypePartDefinitionBuilder WithEditor(this ContentTypePartDefinitionBuilder builder, string editor)
+    {
+        return builder.MergeSettings<ContentTypePartSettings>(x => x.Editor = editor);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentTypeSettings.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentTypeSettings.cs
index 29d42fd7527..2c6d4fc371e 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentTypeSettings.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentTypeSettings.cs
@@ -1,40 +1,39 @@
-namespace OrchardCore.ContentManagement.Metadata.Settings
+namespace OrchardCore.ContentManagement.Metadata.Settings;
+
+public class ContentTypeSettings
 {
-    public class ContentTypeSettings
-    {
-        /// <summary>
-        /// Used to determine if an instance of this content type can be created through the UI.
-        /// </summary>
-        public bool Creatable { get; set; }
+    /// <summary>
+    /// Used to determine if an instance of this content type can be created through the UI.
+    /// </summary>
+    public bool Creatable { get; set; }
 
-        /// <summary>
-        /// Used to determine if an instance of this content type can be listed in the contents page.
-        /// </summary>
-        public bool Listable { get; set; }
+    /// <summary>
+    /// Used to determine if an instance of this content type can be listed in the contents page.
+    /// </summary>
+    public bool Listable { get; set; }
 
-        /// <summary>
-        /// Used to determine if this content type supports draft versions.
-        /// </summary>
-        public bool Draftable { get; set; }
+    /// <summary>
+    /// Used to determine if this content type supports draft versions.
+    /// </summary>
+    public bool Draftable { get; set; }
 
-        /// <summary>
-        /// Used to determine if this content type supports versioning.
-        /// </summary>
-        public bool Versionable { get; set; }
+    /// <summary>
+    /// Used to determine if this content type supports versioning.
+    /// </summary>
+    public bool Versionable { get; set; }
 
-        /// <summary>
-        /// Defines the stereotype of the type.
-        /// </summary>
-        public string Stereotype { get; set; }
+    /// <summary>
+    /// Defines the stereotype of the type.
+    /// </summary>
+    public string Stereotype { get; set; }
 
-        /// <summary>
-        /// Used to determine if this content type supports custom permissions.
-        /// </summary>
-        public bool Securable { get; set; }
+    /// <summary>
+    /// Used to determine if this content type supports custom permissions.
+    /// </summary>
+    public bool Securable { get; set; }
 
-        /// <summary>
-        /// Gets or sets the description name of this content type.
-        /// </summary>
-        public string Description { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the description name of this content type.
+    /// </summary>
+    public string Description { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentTypeSettingsExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentTypeSettingsExtensions.cs
index 5082617918b..c8c9b9ef8ce 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentTypeSettingsExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/ContentTypeSettingsExtensions.cs
@@ -1,42 +1,41 @@
 using OrchardCore.ContentManagement.Metadata.Builders;
 
-namespace OrchardCore.ContentManagement.Metadata.Settings
+namespace OrchardCore.ContentManagement.Metadata.Settings;
+
+public static class ContentTypeSettingsExtensions
 {
-    public static class ContentTypeSettingsExtensions
+    public static ContentTypeDefinitionBuilder Creatable(this ContentTypeDefinitionBuilder builder, bool creatable = true)
+    {
+        return builder.MergeSettings<ContentTypeSettings>(x => x.Creatable = creatable);
+    }
+
+    public static ContentTypeDefinitionBuilder Listable(this ContentTypeDefinitionBuilder builder, bool listable = true)
+    {
+        return builder.MergeSettings<ContentTypeSettings>(x => x.Listable = listable);
+    }
+
+    public static ContentTypeDefinitionBuilder Draftable(this ContentTypeDefinitionBuilder builder, bool draftable = true)
+    {
+        return builder.MergeSettings<ContentTypeSettings>(x => x.Draftable = draftable);
+    }
+
+    public static ContentTypeDefinitionBuilder Versionable(this ContentTypeDefinitionBuilder builder, bool versionable = true)
+    {
+        return builder.MergeSettings<ContentTypeSettings>(x => x.Versionable = versionable);
+    }
+
+    public static ContentTypeDefinitionBuilder Securable(this ContentTypeDefinitionBuilder builder, bool securable = true)
+    {
+        return builder.MergeSettings<ContentTypeSettings>(x => x.Securable = securable);
+    }
+
+    public static ContentTypeDefinitionBuilder Stereotype(this ContentTypeDefinitionBuilder builder, string stereotype)
+    {
+        return builder.MergeSettings<ContentTypeSettings>(x => x.Stereotype = stereotype);
+    }
+
+    public static ContentTypeDefinitionBuilder WithDescription(this ContentTypeDefinitionBuilder builder, string description)
     {
-        public static ContentTypeDefinitionBuilder Creatable(this ContentTypeDefinitionBuilder builder, bool creatable = true)
-        {
-            return builder.MergeSettings<ContentTypeSettings>(x => x.Creatable = creatable);
-        }
-
-        public static ContentTypeDefinitionBuilder Listable(this ContentTypeDefinitionBuilder builder, bool listable = true)
-        {
-            return builder.MergeSettings<ContentTypeSettings>(x => x.Listable = listable);
-        }
-
-        public static ContentTypeDefinitionBuilder Draftable(this ContentTypeDefinitionBuilder builder, bool draftable = true)
-        {
-            return builder.MergeSettings<ContentTypeSettings>(x => x.Draftable = draftable);
-        }
-
-        public static ContentTypeDefinitionBuilder Versionable(this ContentTypeDefinitionBuilder builder, bool versionable = true)
-        {
-            return builder.MergeSettings<ContentTypeSettings>(x => x.Versionable = versionable);
-        }
-
-        public static ContentTypeDefinitionBuilder Securable(this ContentTypeDefinitionBuilder builder, bool securable = true)
-        {
-            return builder.MergeSettings<ContentTypeSettings>(x => x.Securable = securable);
-        }
-
-        public static ContentTypeDefinitionBuilder Stereotype(this ContentTypeDefinitionBuilder builder, string stereotype)
-        {
-            return builder.MergeSettings<ContentTypeSettings>(x => x.Stereotype = stereotype);
-        }
-
-        public static ContentTypeDefinitionBuilder WithDescription(this ContentTypeDefinitionBuilder builder, string description)
-        {
-            return builder.MergeSettings<ContentTypeSettings>(x => x.Description = description);
-        }
+        return builder.MergeSettings<ContentTypeSettings>(x => x.Description = description);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Models/BodyAspect.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Models/BodyAspect.cs
index 43f3ea8ce97..e08e5bcd5df 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Models/BodyAspect.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Models/BodyAspect.cs
@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.Html;
 
-namespace OrchardCore.ContentManagement.Models
+namespace OrchardCore.ContentManagement.Models;
+
+public class BodyAspect
 {
-    public class BodyAspect
-    {
-        public IHtmlContent Body { get; set; }
-    }
+    public IHtmlContent Body { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Models/FullTextAspect.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Models/FullTextAspect.cs
index e77c1b3177b..055eaab2f3f 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Models/FullTextAspect.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Models/FullTextAspect.cs
@@ -1,12 +1,11 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.ContentManagement.Models
+namespace OrchardCore.ContentManagement.Models;
+
+public class FullTextAspect
 {
-    public class FullTextAspect
-    {
-        /// <summary>
-        /// Gets the list of all string segments the aspect is made of.
-        /// </summary>
-        public List<string> Segments { get; } = [];
-    }
+    /// <summary>
+    /// Gets the list of all string segments the aspect is made of.
+    /// </summary>
+    public List<string> Segments { get; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/PreviewAspect.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/PreviewAspect.cs
index 2c322aeec35..022fe22d2bf 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/PreviewAspect.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/PreviewAspect.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public class PreviewAspect
 {
-    public class PreviewAspect
-    {
-        public string PreviewUrl { get; set; }
-    }
+    public string PreviewUrl { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/AutorouteEntry.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/AutorouteEntry.cs
index 76d4f4042a5..cf298c7b22f 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/AutorouteEntry.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/AutorouteEntry.cs
@@ -1,42 +1,41 @@
-namespace OrchardCore.ContentManagement.Routing
+namespace OrchardCore.ContentManagement.Routing;
+
+public class AutorouteEntry
 {
-    public class AutorouteEntry
+    public AutorouteEntry(string contentItemId, string path, string containedContentItemId = null, string jsonPath = null)
     {
-        public AutorouteEntry(string contentItemId, string path, string containedContentItemId = null, string jsonPath = null)
-        {
-            ContentItemId = contentItemId;
-
-            // Normalize path.
-            Path = "/" + path.Trim('/');
-
-            ContainedContentItemId = containedContentItemId;
-            JsonPath = jsonPath;
-        }
-
-        /// <summary>
-        /// The id of the document.
-        /// </summary>
-        public long DocumentId;
-
-        /// <summary>
-        /// The id of the content item.
-        /// </summary>
-        public string ContentItemId;
-
-        /// <summary>
-        /// The path of the entry.
-        /// </summary>
-        public string Path;
-
-        /// <summary>
-        /// The id of an item contained within the document.
-        /// May be null.
-        /// </summary>
-        public string ContainedContentItemId;
-
-        /// <summary>
-        /// The json path of an item contained within the document.
-        /// </summary>
-        public string JsonPath;
+        ContentItemId = contentItemId;
+
+        // Normalize path.
+        Path = "/" + path.Trim('/');
+
+        ContainedContentItemId = containedContentItemId;
+        JsonPath = jsonPath;
     }
+
+    /// <summary>
+    /// The id of the document.
+    /// </summary>
+    public long DocumentId;
+
+    /// <summary>
+    /// The id of the content item.
+    /// </summary>
+    public string ContentItemId;
+
+    /// <summary>
+    /// The path of the entry.
+    /// </summary>
+    public string Path;
+
+    /// <summary>
+    /// The id of an item contained within the document.
+    /// May be null.
+    /// </summary>
+    public string ContainedContentItemId;
+
+    /// <summary>
+    /// The json path of an item contained within the document.
+    /// </summary>
+    public string JsonPath;
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/AutorouteOptions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/AutorouteOptions.cs
index a8359200702..8dd81a69ecf 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/AutorouteOptions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/AutorouteOptions.cs
@@ -1,14 +1,13 @@
 using Microsoft.AspNetCore.Routing;
 
-namespace OrchardCore.ContentManagement.Routing
+namespace OrchardCore.ContentManagement.Routing;
+
+public class AutorouteOptions
 {
-    public class AutorouteOptions
-    {
-        public RouteValueDictionary GlobalRouteValues { get; set; } = [];
-        public string ContentItemIdKey { get; set; } = "";
+    public RouteValueDictionary GlobalRouteValues { get; set; } = [];
+    public string ContentItemIdKey { get; set; } = "";
 
-        // The contained content item key is only used for route generation and should be removed after generation.
-        public string ContainedContentItemIdKey { get; set; } = "";
-        public string JsonPathKey { get; set; } = "";
-    }
+    // The contained content item key is only used for route generation and should be removed after generation.
+    public string ContainedContentItemIdKey { get; set; } = "";
+    public string JsonPathKey { get; set; } = "";
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/ContainedContentItemsAspect.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/ContainedContentItemsAspect.cs
index 4462d1f2be1..08377fdc58e 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/ContainedContentItemsAspect.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/ContainedContentItemsAspect.cs
@@ -2,13 +2,12 @@
 using System.Collections.Generic;
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.ContentManagement.Routing
+namespace OrchardCore.ContentManagement.Routing;
+
+public class ContainedContentItemsAspect
 {
-    public class ContainedContentItemsAspect
-    {
-        /// <summary>
-        /// Json accessors to provide a list of contained content items.
-        /// </summary>
-        public IList<Func<JsonObject, JsonArray>> Accessors { get; set; } = [];
-    }
+    /// <summary>
+    /// Json accessors to provide a list of contained content items.
+    /// </summary>
+    public IList<Func<JsonObject, JsonArray>> Accessors { get; set; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/IAutorouteEntries.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/IAutorouteEntries.cs
index d36f0226e9f..a5382ea514a 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/IAutorouteEntries.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/IAutorouteEntries.cs
@@ -1,11 +1,10 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.ContentManagement.Routing
+namespace OrchardCore.ContentManagement.Routing;
+
+public interface IAutorouteEntries
 {
-    public interface IAutorouteEntries
-    {
-        Task<(bool, AutorouteEntry)> TryGetEntryByPathAsync(string path);
-        Task<(bool, AutorouteEntry)> TryGetEntryByContentItemIdAsync(string contentItemId);
-        Task UpdateEntriesAsync();
-    }
+    Task<(bool, AutorouteEntry)> TryGetEntryByPathAsync(string path);
+    Task<(bool, AutorouteEntry)> TryGetEntryByContentItemIdAsync(string contentItemId);
+    Task UpdateEntriesAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/RouteHandlerAspect.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/RouteHandlerAspect.cs
index 184fa00228c..881eb98f9c2 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/RouteHandlerAspect.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Routing/RouteHandlerAspect.cs
@@ -1,20 +1,19 @@
-namespace OrchardCore.ContentManagement.Routing
+namespace OrchardCore.ContentManagement.Routing;
+
+public class RouteHandlerAspect
 {
-    public class RouteHandlerAspect
-    {
-        /// <summary>
-        /// Route path.
-        /// </summary>
-        public string Path { get; set; }
+    /// <summary>
+    /// Route path.
+    /// </summary>
+    public string Path { get; set; }
 
-        /// <summary>
-        /// Whether route is absolute to the parent content item route.
-        /// </summary>
-        public bool Absolute { get; set; }
+    /// <summary>
+    /// Whether route is absolute to the parent content item route.
+    /// </summary>
+    public bool Absolute { get; set; }
 
-        /// <summary>
-        /// Whether this contained content item can be routed to.
-        /// </summary>
-        public bool Disabled { get; set; }
-    }
+    /// <summary>
+    /// Whether this contained content item can be routed to.
+    /// </summary>
+    public bool Disabled { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ServiceCollectionExtensions.cs
index bd7b7f3fdc5..9ed33a44e3c 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ServiceCollectionExtensions.cs
@@ -3,144 +3,143 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using OrchardCore.ContentManagement.Handlers;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    /// <summary>
+    /// Registers a content part type. This method may be called multiple times safely,
+    /// to reconfigure an existing part.
+    /// </summary>
+    public static ContentPartOptionBuilder AddContentPart<TContentPart>(this IServiceCollection services)
+        where TContentPart : ContentPart
     {
-        /// <summary>
-        /// Registers a content part type. This method may be called multiple times safely,
-        /// to reconfigure an existing part.
-        /// </summary>
-        public static ContentPartOptionBuilder AddContentPart<TContentPart>(this IServiceCollection services)
-            where TContentPart : ContentPart
-        {
-            return services.AddContentPart(typeof(TContentPart));
-        }
-
-        /// <summary>
-        /// Registers a content part type. This method may be called multiple times safely,
-        /// to reconfigure an existing part.
-        /// </summary>
-        public static ContentPartOptionBuilder AddContentPart(this IServiceCollection services, Type contentPartType)
-        {
-            services.Configure<ContentOptions>(o => o.GetOrAddContentPart(contentPartType));
-            return new ContentPartOptionBuilder(services, contentPartType);
-        }
-
-        /// <summary>
-        /// Registers a content field type. This method may be called multiple times safely,
-        /// to reconfigure an existing field.
-        /// </summary>
-        public static ContentFieldOptionBuilder AddContentField<TContentField>(this IServiceCollection services)
-            where TContentField : ContentField
-        {
-            return services.AddContentField(typeof(TContentField));
-        }
-
-        /// <summary>
-        /// Registers a content field type. This method may be called multiple times safely,
-        /// to reconfigure an existing field.
-        /// </summary>
-        public static ContentFieldOptionBuilder AddContentField(this IServiceCollection services, Type contentFieldType)
-        {
-            services.Configure<ContentOptions>(o => o.GetOrAddContentField(contentFieldType));
-            return new ContentFieldOptionBuilder(services, contentFieldType);
-        }
-
-        /// <summary>
-        /// Register a handler for use with a content part.
-        /// </summary>
-        /// <typeparam name="TContentPartHandler"></typeparam>
-        public static ContentPartOptionBuilder AddHandler<TContentPartHandler>(this ContentPartOptionBuilder builder)
-            where TContentPartHandler : class, IContentPartHandler
-        {
-            return builder.AddHandler(typeof(TContentPartHandler));
-        }
+        return services.AddContentPart(typeof(TContentPart));
+    }
 
-        /// <summary>
-        /// Register a handler for use with a content part.
-        /// </summary>
-        public static ContentPartOptionBuilder AddHandler(this ContentPartOptionBuilder builder, Type handlerType)
-        {
-            builder.Services.TryAddScoped(handlerType);
-            builder.Services.Configure<ContentOptions>(o =>
-            {
-                o.AddPartHandler(builder.ContentPartType, handlerType);
-            });
-
-            return builder;
-        }
-
-        /// <summary>
-        /// Remove a handler registration from a content part.
-        /// </summary>
-        /// <typeparam name="TContentPartHandler"></typeparam>
-        public static ContentPartOptionBuilder RemoveHandler<TContentPartHandler>(this ContentPartOptionBuilder builder)
-            where TContentPartHandler : class, IContentPartHandler
-        {
-            return builder.RemoveHandler(typeof(TContentPartHandler));
-        }
+    /// <summary>
+    /// Registers a content part type. This method may be called multiple times safely,
+    /// to reconfigure an existing part.
+    /// </summary>
+    public static ContentPartOptionBuilder AddContentPart(this IServiceCollection services, Type contentPartType)
+    {
+        services.Configure<ContentOptions>(o => o.GetOrAddContentPart(contentPartType));
+        return new ContentPartOptionBuilder(services, contentPartType);
+    }
 
-        /// <summary>
-        /// Remove a handler registration from a content part.
-        /// </summary>
-        public static ContentPartOptionBuilder RemoveHandler(this ContentPartOptionBuilder builder, Type handlerType)
-        {
-            builder.Services.RemoveAll(handlerType);
-            builder.Services.Configure<ContentOptions>(o =>
-            {
-                o.RemovePartHandler(builder.ContentPartType, handlerType);
-            });
-
-            return builder;
-        }
-
-        /// <summary>
-        /// Register a handler for use with a content field.
-        /// </summary>
-        /// <typeparam name="TContentFieldHandler"></typeparam>
-        public static ContentFieldOptionBuilder AddHandler<TContentFieldHandler>(this ContentFieldOptionBuilder builder)
-            where TContentFieldHandler : class, IContentFieldHandler
+    /// <summary>
+    /// Registers a content field type. This method may be called multiple times safely,
+    /// to reconfigure an existing field.
+    /// </summary>
+    public static ContentFieldOptionBuilder AddContentField<TContentField>(this IServiceCollection services)
+        where TContentField : ContentField
+    {
+        return services.AddContentField(typeof(TContentField));
+    }
+
+    /// <summary>
+    /// Registers a content field type. This method may be called multiple times safely,
+    /// to reconfigure an existing field.
+    /// </summary>
+    public static ContentFieldOptionBuilder AddContentField(this IServiceCollection services, Type contentFieldType)
+    {
+        services.Configure<ContentOptions>(o => o.GetOrAddContentField(contentFieldType));
+        return new ContentFieldOptionBuilder(services, contentFieldType);
+    }
+
+    /// <summary>
+    /// Register a handler for use with a content part.
+    /// </summary>
+    /// <typeparam name="TContentPartHandler"></typeparam>
+    public static ContentPartOptionBuilder AddHandler<TContentPartHandler>(this ContentPartOptionBuilder builder)
+        where TContentPartHandler : class, IContentPartHandler
+    {
+        return builder.AddHandler(typeof(TContentPartHandler));
+    }
+
+    /// <summary>
+    /// Register a handler for use with a content part.
+    /// </summary>
+    public static ContentPartOptionBuilder AddHandler(this ContentPartOptionBuilder builder, Type handlerType)
+    {
+        builder.Services.TryAddScoped(handlerType);
+        builder.Services.Configure<ContentOptions>(o =>
         {
-            return builder.AddHandler(typeof(TContentFieldHandler));
-        }
+            o.AddPartHandler(builder.ContentPartType, handlerType);
+        });
+
+        return builder;
+    }
+
+    /// <summary>
+    /// Remove a handler registration from a content part.
+    /// </summary>
+    /// <typeparam name="TContentPartHandler"></typeparam>
+    public static ContentPartOptionBuilder RemoveHandler<TContentPartHandler>(this ContentPartOptionBuilder builder)
+        where TContentPartHandler : class, IContentPartHandler
+    {
+        return builder.RemoveHandler(typeof(TContentPartHandler));
+    }
 
-        /// <summary>
-        /// Register a handler for use with a content field.
-        /// </summary>
-        public static ContentFieldOptionBuilder AddHandler(this ContentFieldOptionBuilder builder, Type handlerType)
+    /// <summary>
+    /// Remove a handler registration from a content part.
+    /// </summary>
+    public static ContentPartOptionBuilder RemoveHandler(this ContentPartOptionBuilder builder, Type handlerType)
+    {
+        builder.Services.RemoveAll(handlerType);
+        builder.Services.Configure<ContentOptions>(o =>
         {
-            builder.Services.TryAddScoped(handlerType);
-            builder.Services.Configure<ContentOptions>(o =>
-            {
-                o.AddFieldHandler(builder.ContentFieldType, handlerType);
-            });
-
-            return builder;
-        }
-
-        /// <summary>
-        /// Remove a handler registration from a content field.
-        /// </summary>
-        /// <typeparam name="TContentFieldHandler"></typeparam>
-        public static ContentFieldOptionBuilder RemoveHandler<TContentFieldHandler>(this ContentFieldOptionBuilder builder)
-            where TContentFieldHandler : class, IContentFieldHandler
+            o.RemovePartHandler(builder.ContentPartType, handlerType);
+        });
+
+        return builder;
+    }
+
+    /// <summary>
+    /// Register a handler for use with a content field.
+    /// </summary>
+    /// <typeparam name="TContentFieldHandler"></typeparam>
+    public static ContentFieldOptionBuilder AddHandler<TContentFieldHandler>(this ContentFieldOptionBuilder builder)
+        where TContentFieldHandler : class, IContentFieldHandler
+    {
+        return builder.AddHandler(typeof(TContentFieldHandler));
+    }
+
+    /// <summary>
+    /// Register a handler for use with a content field.
+    /// </summary>
+    public static ContentFieldOptionBuilder AddHandler(this ContentFieldOptionBuilder builder, Type handlerType)
+    {
+        builder.Services.TryAddScoped(handlerType);
+        builder.Services.Configure<ContentOptions>(o =>
         {
-            return builder.RemoveHandler(typeof(TContentFieldHandler));
-        }
+            o.AddFieldHandler(builder.ContentFieldType, handlerType);
+        });
+
+        return builder;
+    }
 
-        /// <summary>
-        /// Remove a handler registration from a content field.
-        /// </summary>
-        public static ContentFieldOptionBuilder RemoveHandler(this ContentFieldOptionBuilder builder, Type handlerType)
+    /// <summary>
+    /// Remove a handler registration from a content field.
+    /// </summary>
+    /// <typeparam name="TContentFieldHandler"></typeparam>
+    public static ContentFieldOptionBuilder RemoveHandler<TContentFieldHandler>(this ContentFieldOptionBuilder builder)
+        where TContentFieldHandler : class, IContentFieldHandler
+    {
+        return builder.RemoveHandler(typeof(TContentFieldHandler));
+    }
+
+    /// <summary>
+    /// Remove a handler registration from a content field.
+    /// </summary>
+    public static ContentFieldOptionBuilder RemoveHandler(this ContentFieldOptionBuilder builder, Type handlerType)
+    {
+        builder.Services.RemoveAll(handlerType);
+        builder.Services.Configure<ContentOptions>(o =>
         {
-            builder.Services.RemoveAll(handlerType);
-            builder.Services.Configure<ContentOptions>(o =>
-            {
-                o.RemoveFieldHandler(builder.ContentFieldType, handlerType);
-            });
-
-            return builder;
-        }
+            o.RemoveFieldHandler(builder.ContentFieldType, handlerType);
+        });
+
+        return builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Utilities/StringExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Utilities/StringExtensions.cs
index 78d5f453c7b..2fd37ec8de2 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Utilities/StringExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Utilities/StringExtensions.cs
@@ -7,370 +7,369 @@
 using Cysharp.Text;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.ContentManagement.Utilities
+namespace OrchardCore.ContentManagement.Utilities;
+
+public static class StringExtensions
 {
-    public static class StringExtensions
-    {
-        private static readonly char[] _validSegmentChars = "/?#[]@\"^{}|`<>\t\r\n\f ".ToCharArray();
+    private static readonly char[] _validSegmentChars = "/?#[]@\"^{}|`<>\t\r\n\f ".ToCharArray();
 
-        private static readonly HashSet<string> _reservedNames = new(StringComparer.OrdinalIgnoreCase)
+    private static readonly HashSet<string> _reservedNames = new(StringComparer.OrdinalIgnoreCase)
+    {
+        nameof(ContentItem.Id),
+        nameof(ContentItem.ContentItemId),
+        nameof(ContentItem.ContentItemVersionId),
+        nameof(ContentItem.ContentType),
+        nameof(ContentItem.Published),
+        nameof(ContentItem.Latest),
+        nameof(ContentItem.ModifiedUtc),
+        nameof(ContentItem.PublishedUtc),
+        nameof(ContentItem.CreatedUtc),
+        nameof(ContentItem.Owner),
+        nameof(ContentItem.Author),
+        nameof(ContentItem.DisplayText),
+    };
+
+    public static string CamelFriendly(this string camel)
+    {
+        // optimize common cases
+        if (string.IsNullOrWhiteSpace(camel))
         {
-            nameof(ContentItem.Id),
-            nameof(ContentItem.ContentItemId),
-            nameof(ContentItem.ContentItemVersionId),
-            nameof(ContentItem.ContentType),
-            nameof(ContentItem.Published),
-            nameof(ContentItem.Latest),
-            nameof(ContentItem.ModifiedUtc),
-            nameof(ContentItem.PublishedUtc),
-            nameof(ContentItem.CreatedUtc),
-            nameof(ContentItem.Owner),
-            nameof(ContentItem.Author),
-            nameof(ContentItem.DisplayText),
-        };
-
-        public static string CamelFriendly(this string camel)
+            return "";
+        }
+
+        using var sb = ZString.CreateStringBuilder();
+        for (var i = 0; i < camel.Length; ++i)
         {
-            // optimize common cases
-            if (string.IsNullOrWhiteSpace(camel))
+            var c = camel[i];
+            if (i != 0 && char.IsUpper(c))
             {
-                return "";
+                sb.Append(' ');
             }
+            sb.Append(c);
+        }
 
-            using var sb = ZString.CreateStringBuilder();
-            for (var i = 0; i < camel.Length; ++i)
-            {
-                var c = camel[i];
-                if (i != 0 && char.IsUpper(c))
-                {
-                    sb.Append(' ');
-                }
-                sb.Append(c);
-            }
+        return sb.ToString();
+    }
 
-            return sb.ToString();
+    public static string Ellipsize(this string text, int characterCount) => text.Ellipsize(characterCount, "\u00A0\u2026");
+
+    public static string Ellipsize(this string text, int characterCount, string ellipsis, bool wordBoundary = false)
+    {
+        if (string.IsNullOrWhiteSpace(text))
+        {
+            return string.Empty;
         }
 
-        public static string Ellipsize(this string text, int characterCount) => text.Ellipsize(characterCount, "\u00A0\u2026");
+        if (characterCount < 0 || text.Length <= characterCount)
+        {
+            return text;
+        }
 
-        public static string Ellipsize(this string text, int characterCount, string ellipsis, bool wordBoundary = false)
+        // search beginning of word
+        var backup = characterCount;
+        while (characterCount > 0 && char.IsLetter(text[characterCount - 1]))
         {
-            if (string.IsNullOrWhiteSpace(text))
-            {
-                return string.Empty;
-            }
+            characterCount--;
+        }
 
-            if (characterCount < 0 || text.Length <= characterCount)
-            {
-                return text;
-            }
+        // search previous word
+        while (characterCount > 0 && char.IsWhiteSpace(text[characterCount - 1]))
+        {
+            characterCount--;
+        }
 
-            // search beginning of word
-            var backup = characterCount;
-            while (characterCount > 0 && char.IsLetter(text[characterCount - 1]))
-            {
-                characterCount--;
-            }
+        // if it was the last word, recover it, unless boundary is requested
+        if (characterCount == 0 && !wordBoundary)
+        {
+            characterCount = backup;
+        }
 
-            // search previous word
-            while (characterCount > 0 && char.IsWhiteSpace(text[characterCount - 1]))
-            {
-                characterCount--;
-            }
+        var trimmed = text[..characterCount];
 
-            // if it was the last word, recover it, unless boundary is requested
-            if (characterCount == 0 && !wordBoundary)
-            {
-                characterCount = backup;
-            }
+        return trimmed + ellipsis;
+    }
 
-            var trimmed = text[..characterCount];
+    public static LocalizedString OrDefault(this string text, LocalizedString defaultValue)
+        => string.IsNullOrEmpty(text)
+            ? defaultValue
+            : new LocalizedString(null, text);
 
-            return trimmed + ellipsis;
+    public static string RemoveTags(this string html, bool htmlDecode = false)
+    {
+        if (string.IsNullOrEmpty(html))
+        {
+            return string.Empty;
         }
 
-        public static LocalizedString OrDefault(this string text, LocalizedString defaultValue)
-            => string.IsNullOrEmpty(text)
-                ? defaultValue
-                : new LocalizedString(null, text);
+        var result = new char[html.Length];
 
-        public static string RemoveTags(this string html, bool htmlDecode = false)
+        var cursor = 0;
+        var inside = false;
+        for (var i = 0; i < html.Length; i++)
         {
-            if (string.IsNullOrEmpty(html))
-            {
-                return string.Empty;
-            }
-
-            var result = new char[html.Length];
+            var current = html[i];
 
-            var cursor = 0;
-            var inside = false;
-            for (var i = 0; i < html.Length; i++)
+            switch (current)
             {
-                var current = html[i];
-
-                switch (current)
-                {
-                    case '<':
-                        inside = true;
-                        continue;
-                    case '>':
-                        inside = false;
-                        continue;
-                }
-
-                if (!inside)
-                {
-                    result[cursor++] = current;
-                }
+                case '<':
+                    inside = true;
+                    continue;
+                case '>':
+                    inside = false;
+                    continue;
             }
 
-            var stringResult = new string(result, 0, cursor);
-
-            if (htmlDecode)
+            if (!inside)
             {
-                stringResult = WebUtility.HtmlDecode(stringResult);
+                result[cursor++] = current;
             }
-
-            return stringResult;
         }
 
-        // not accounting for only \r (e.g. Apple OS 9 carriage return only new lines)
-        public static string ReplaceNewLinesWith(this string text, string replacement)
-            => string.IsNullOrWhiteSpace(text)
-                ? string.Empty
-                : text.Replace("\r\n", "\r\r")
-                    .Replace("\n", string.Format(replacement, "\r\n"))
-                    .Replace("\r\r", string.Format(replacement, "\r\n"));
+        var stringResult = new string(result, 0, cursor);
 
-        public static bool IsValidUrlSegment(this string segment)
+        if (htmlDecode)
         {
-            // valid isegment from rfc3987 - http://tools.ietf.org/html/rfc3987#page-8
-            // the relevant bits:
-            // isegment    = *ipchar
-            // ipchar      = iunreserved / pct-encoded / sub-delims / ":" / "@"
-            // iunreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" / ucschar
-            // pct-encoded = "%" HEXDIG HEXDIG
-            // sub-delims  = "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
-            // ucschar     = %xA0-D7FF / %xF900-FDCF / %xFDF0-FFEF / %x10000-1FFFD / %x20000-2FFFD / %x30000-3FFFD / %x40000-4FFFD / %x50000-5FFFD / %x60000-6FFFD / %x70000-7FFFD / %x80000-8FFFD / %x90000-9FFFD / %xA0000-AFFFD / %xB0000-BFFFD / %xC0000-CFFFD / %xD0000-DFFFD / %xE1000-EFFFD
-            //
-            // rough blacklist regex == m/^[^/?#[]@"^{}|\s`<>]+$/ (leaving off % to keep the regex simple)
-
-            return !segment.Any(_validSegmentChars);
+            stringResult = WebUtility.HtmlDecode(stringResult);
         }
 
-        /// <summary>
-        /// Generates a valid technical name.
-        /// </summary>
-        /// <remarks>
-        /// Uses a white list set of chars.
-        /// </remarks>
-        public static string ToSafeName(this string name)
-        {
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                return string.Empty;
-            }
+        return stringResult;
+    }
 
-            name = RemoveDiacritics(name);
+    // not accounting for only \r (e.g. Apple OS 9 carriage return only new lines)
+    public static string ReplaceNewLinesWith(this string text, string replacement)
+        => string.IsNullOrWhiteSpace(text)
+            ? string.Empty
+            : text.Replace("\r\n", "\r\r")
+                .Replace("\n", string.Format(replacement, "\r\n"))
+                .Replace("\r\r", string.Format(replacement, "\r\n"));
 
-            name = name.Strip(c => !char.IsLetter(c) && !char.IsDigit(c)).Trim();
+    public static bool IsValidUrlSegment(this string segment)
+    {
+        // valid isegment from rfc3987 - http://tools.ietf.org/html/rfc3987#page-8
+        // the relevant bits:
+        // isegment    = *ipchar
+        // ipchar      = iunreserved / pct-encoded / sub-delims / ":" / "@"
+        // iunreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" / ucschar
+        // pct-encoded = "%" HEXDIG HEXDIG
+        // sub-delims  = "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
+        // ucschar     = %xA0-D7FF / %xF900-FDCF / %xFDF0-FFEF / %x10000-1FFFD / %x20000-2FFFD / %x30000-3FFFD / %x40000-4FFFD / %x50000-5FFFD / %x60000-6FFFD / %x70000-7FFFD / %x80000-8FFFD / %x90000-9FFFD / %xA0000-AFFFD / %xB0000-BFFFD / %xC0000-CFFFD / %xD0000-DFFFD / %xE1000-EFFFD
+        //
+        // rough blacklist regex == m/^[^/?#[]@"^{}|\s`<>]+$/ (leaving off % to keep the regex simple)
+
+        return !segment.Any(_validSegmentChars);
+    }
 
-            // don't allow non A-Z chars as first letter, as they are not allowed in prefixes
-            while (name.Length > 0 && !char.IsLetter(name[0]))
-            {
-                name = name[1..];
-            }
+    /// <summary>
+    /// Generates a valid technical name.
+    /// </summary>
+    /// <remarks>
+    /// Uses a white list set of chars.
+    /// </remarks>
+    public static string ToSafeName(this string name)
+    {
+        if (string.IsNullOrWhiteSpace(name))
+        {
+            return string.Empty;
+        }
 
-            if (name.Length > 128)
-            {
-                name = name[..128];
-            }
+        name = RemoveDiacritics(name);
 
-            return name;
-        }
+        name = name.Strip(c => !char.IsLetter(c) && !char.IsDigit(c)).Trim();
 
-        [Obsolete("Use Char.IsLetter() instead.")]
-        public static bool IsLetter(this char c)
+        // don't allow non A-Z chars as first letter, as they are not allowed in prefixes
+        while (name.Length > 0 && !char.IsLetter(name[0]))
         {
-            return ('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z');
+            name = name[1..];
         }
 
-        [Obsolete("Use Char.IsWhiteSpace() instead.")]
-        public static bool IsSpace(this char c)
+        if (name.Length > 128)
         {
-            return c == '\r' || c == '\n' || c == '\t' || c == '\f' || c == ' ';
+            name = name[..128];
         }
 
-        public static bool IsReservedContentName(this string name) => _reservedNames.Contains(name);
+        return name;
+    }
 
-        public static string RemoveDiacritics(this string name)
-        {
-            var stFormD = name.Normalize(NormalizationForm.FormD);
-            var sb = new StringBuilder();
+    [Obsolete("Use Char.IsLetter() instead.")]
+    public static bool IsLetter(this char c)
+    {
+        return ('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z');
+    }
 
-            foreach (var t in stFormD)
-            {
-                var uc = CharUnicodeInfo.GetUnicodeCategory(t);
-                if (uc != UnicodeCategory.NonSpacingMark)
-                {
-                    sb.Append(t);
-                }
-            }
+    [Obsolete("Use Char.IsWhiteSpace() instead.")]
+    public static bool IsSpace(this char c)
+    {
+        return c == '\r' || c == '\n' || c == '\t' || c == '\f' || c == ' ';
+    }
 
-            return sb.ToString().Normalize(NormalizationForm.FormC);
-        }
+    public static bool IsReservedContentName(this string name) => _reservedNames.Contains(name);
+
+    public static string RemoveDiacritics(this string name)
+    {
+        var stFormD = name.Normalize(NormalizationForm.FormD);
+        var sb = new StringBuilder();
 
-        public static string Strip(this string source, params char[] stripped)
+        foreach (var t in stFormD)
         {
-            if (stripped == null || stripped.Length == 0 || string.IsNullOrEmpty(source))
+            var uc = CharUnicodeInfo.GetUnicodeCategory(t);
+            if (uc != UnicodeCategory.NonSpacingMark)
             {
-                return source;
+                sb.Append(t);
             }
+        }
 
-            var result = new char[source.Length];
+        return sb.ToString().Normalize(NormalizationForm.FormC);
+    }
+
+    public static string Strip(this string source, params char[] stripped)
+    {
+        if (stripped == null || stripped.Length == 0 || string.IsNullOrEmpty(source))
+        {
+            return source;
+        }
+
+        var result = new char[source.Length];
 
-            var cursor = 0;
-            for (var i = 0; i < source.Length; i++)
+        var cursor = 0;
+        for (var i = 0; i < source.Length; i++)
+        {
+            var current = source[i];
+            if (Array.IndexOf(stripped, current) < 0)
             {
-                var current = source[i];
-                if (Array.IndexOf(stripped, current) < 0)
-                {
-                    result[cursor++] = current;
-                }
+                result[cursor++] = current;
             }
-
-            return new string(result, 0, cursor);
         }
 
-        public static string Strip(this string source, Func<char, bool> predicate)
-        {
-            var result = new char[source.Length];
+        return new string(result, 0, cursor);
+    }
+
+    public static string Strip(this string source, Func<char, bool> predicate)
+    {
+        var result = new char[source.Length];
 
-            var cursor = 0;
-            for (var i = 0; i < source.Length; i++)
+        var cursor = 0;
+        for (var i = 0; i < source.Length; i++)
+        {
+            var current = source[i];
+            if (!predicate(current))
             {
-                var current = source[i];
-                if (!predicate(current))
-                {
-                    result[cursor++] = current;
-                }
+                result[cursor++] = current;
             }
+        }
+
+        return new string(result, 0, cursor);
+    }
 
-            return new string(result, 0, cursor);
+    public static bool Any(this string source, params char[] chars)
+    {
+        if (string.IsNullOrEmpty(source) || chars == null || chars.Length == 0)
+        {
+            return false;
         }
 
-        public static bool Any(this string source, params char[] chars)
+        for (var i = 0; i < source.Length; i++)
         {
-            if (string.IsNullOrEmpty(source) || chars == null || chars.Length == 0)
+            var current = source[i];
+            if (Array.IndexOf(chars, current) >= 0)
             {
-                return false;
+                return true;
             }
+        }
 
-            for (var i = 0; i < source.Length; i++)
-            {
-                var current = source[i];
-                if (Array.IndexOf(chars, current) >= 0)
-                {
-                    return true;
-                }
-            }
+        return false;
+    }
 
+    public static bool All(this string source, params char[] chars)
+    {
+        if (string.IsNullOrEmpty(source) || chars == null || chars.Length == 0)
+        {
             return false;
         }
 
-        public static bool All(this string source, params char[] chars)
+        for (var i = 0; i < source.Length; i++)
         {
-            if (string.IsNullOrEmpty(source) || chars == null || chars.Length == 0)
+            var current = source[i];
+            if (Array.IndexOf(chars, current) < 0)
             {
                 return false;
             }
+        }
 
-            for (var i = 0; i < source.Length; i++)
-            {
-                var current = source[i];
-                if (Array.IndexOf(chars, current) < 0)
-                {
-                    return false;
-                }
-            }
+        return true;
+    }
 
-            return true;
+    public static string Translate(this string subject, char[] from, char[] to)
+    {
+        if (string.IsNullOrEmpty(subject))
+        {
+            return subject;
         }
 
-        public static string Translate(this string subject, char[] from, char[] to)
+        ArgumentNullException.ThrowIfNull(from);
+
+        ArgumentNullException.ThrowIfNull(to);
+
+        if (from.Length != to.Length)
         {
-            if (string.IsNullOrEmpty(subject))
-            {
-                return subject;
-            }
+            throw new ArgumentNullException(nameof(from), "Parameters must have the same length");
+        }
 
-            ArgumentNullException.ThrowIfNull(from);
+        var map = new Dictionary<char, char>(from.Length);
+        for (var i = 0; i < from.Length; i++)
+        {
+            map[from[i]] = to[i];
+        }
 
-            ArgumentNullException.ThrowIfNull(to);
+        var result = new char[subject.Length];
 
-            if (from.Length != to.Length)
+        for (var i = 0; i < subject.Length; i++)
+        {
+            var current = subject[i];
+            if (map.TryGetValue(current, out var value))
             {
-                throw new ArgumentNullException(nameof(from), "Parameters must have the same length");
+                result[i] = value;
             }
-
-            var map = new Dictionary<char, char>(from.Length);
-            for (var i = 0; i < from.Length; i++)
+            else
             {
-                map[from[i]] = to[i];
+                result[i] = current;
             }
+        }
 
-            var result = new char[subject.Length];
+        return new string(result);
+    }
 
-            for (var i = 0; i < subject.Length; i++)
-            {
-                var current = subject[i];
-                if (map.TryGetValue(current, out var value))
-                {
-                    result[i] = value;
-                }
-                else
-                {
-                    result[i] = current;
-                }
-            }
+    public static string ReplaceAll(this string original, IDictionary<string, string> replacements)
+    {
+        var pattern = $"{string.Join("|", replacements.Keys)}";
 
-            return new string(result);
-        }
+        return Regex.Replace(original, pattern, match => replacements[match.Value]);
+    }
 
-        public static string ReplaceAll(this string original, IDictionary<string, string> replacements)
+    public static string TrimEnd(this string value, string trim = "")
+    {
+        if (value == null)
         {
-            var pattern = $"{string.Join("|", replacements.Keys)}";
-
-            return Regex.Replace(original, pattern, match => replacements[match.Value]);
+            return null;
         }
 
-        public static string TrimEnd(this string value, string trim = "")
-        {
-            if (value == null)
-            {
-                return null;
-            }
+        return value.EndsWith(trim, StringComparison.Ordinal)
+            ? value[..^trim.Length]
+            : value;
+    }
 
-            return value.EndsWith(trim, StringComparison.Ordinal)
-                ? value[..^trim.Length]
-                : value;
+    public static string ReplaceLastOccurrence(this string source, string searchedValue, string replacedValue)
+    {
+        if (searchedValue is null || replacedValue is null)
+        {
+            return source;
         }
 
-        public static string ReplaceLastOccurrence(this string source, string searchedValue, string replacedValue)
+        var lastIndex = source.LastIndexOf(searchedValue, StringComparison.Ordinal);
+        if (lastIndex == -1)
         {
-            if (searchedValue is null || replacedValue is null)
-            {
-                return source;
-            }
-
-            var lastIndex = source.LastIndexOf(searchedValue, StringComparison.Ordinal);
-            if (lastIndex == -1)
-            {
-                return source;
-            }
-
-            return source.Remove(lastIndex, searchedValue.Length).Insert(lastIndex, replacedValue);
+            return source;
         }
+
+        return source.Remove(lastIndex, searchedValue.Length).Insert(lastIndex, replacedValue);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Workflows/ContentEventConstants.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Workflows/ContentEventConstants.cs
index 11fae12a8a6..86b424cfb21 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Workflows/ContentEventConstants.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Workflows/ContentEventConstants.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.ContentManagement.Workflows
+namespace OrchardCore.ContentManagement.Workflows;
+
+public static class ContentEventConstants
 {
-    public static class ContentEventConstants
-    {
-        public const string ContentItemInputKey = "ContentItem";
-        public const string ContentEventInputKey = "ContentEvent";
-        public const string UserActionInputKey = "UserAction";
-    }
+    public const string ContentItemInputKey = "ContentItem";
+    public const string ContentEventInputKey = "ContentEvent";
+    public const string UserActionInputKey = "UserAction";
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Workflows/ContentEventContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Workflows/ContentEventContext.cs
index e59cad75fd7..f216b7b2b9a 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Workflows/ContentEventContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Workflows/ContentEventContext.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.ContentManagement.Workflows
+namespace OrchardCore.ContentManagement.Workflows;
+
+public class ContentEventContext
 {
-    public class ContentEventContext
-    {
-        public string Name { get; set; }
-        public string ContentType { get; set; }
-        public string ContentItemId { get; set; }
-        public string ContentItemVersionId { get; set; }
-        public bool IsStart { get; set; }
-    }
+    public string Name { get; set; }
+    public string ContentType { get; set; }
+    public string ContentItemId { get; set; }
+    public string ContentItemVersionId { get; set; }
+    public bool IsStart { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentDisplayOptions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentDisplayOptions.cs
index dea08412dbd..1b359d1a025 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentDisplayOptions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentDisplayOptions.cs
@@ -3,120 +3,119 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OrchardCore.ContentManagement.Display.ContentDisplay
+namespace OrchardCore.ContentManagement.Display.ContentDisplay;
+
+public class ContentDisplayOptions
 {
-    public class ContentDisplayOptions
-    {
-        private readonly List<ContentPartDisplayOption> _contentParts = [];
-        private readonly List<ContentFieldDisplayOption> _contentFields = [];
+    private readonly List<ContentPartDisplayOption> _contentParts = [];
+    private readonly List<ContentFieldDisplayOption> _contentFields = [];
 
-        private FrozenDictionary<string, ContentPartDisplayOption> _contentPartOptions;
-        private FrozenDictionary<string, ContentFieldDisplayOption> _contentFieldOptions;
+    private FrozenDictionary<string, ContentPartDisplayOption> _contentPartOptions;
+    private FrozenDictionary<string, ContentFieldDisplayOption> _contentFieldOptions;
 
-        public IReadOnlyDictionary<string, ContentPartDisplayOption> ContentPartOptions
-            => _contentPartOptions ??= _contentParts.ToFrozenDictionary(k => k.Type.Name);
+    public IReadOnlyDictionary<string, ContentPartDisplayOption> ContentPartOptions
+        => _contentPartOptions ??= _contentParts.ToFrozenDictionary(k => k.Type.Name);
 
-        public IReadOnlyDictionary<string, ContentFieldDisplayOption> ContentFieldOptions
-            => _contentFieldOptions ??= _contentFields.ToFrozenDictionary(k => k.Type.Name);
+    public IReadOnlyDictionary<string, ContentFieldDisplayOption> ContentFieldOptions
+        => _contentFieldOptions ??= _contentFields.ToFrozenDictionary(k => k.Type.Name);
 
-        internal void ForContentPartDisplayMode(Type contentPartType, Type displayDriverType, Func<string, bool> predicate)
+    internal void ForContentPartDisplayMode(Type contentPartType, Type displayDriverType, Func<string, bool> predicate)
+    {
+        if (!typeof(IContentPartDisplayDriver).IsAssignableFrom(displayDriverType))
         {
-            if (!typeof(IContentPartDisplayDriver).IsAssignableFrom(displayDriverType))
-            {
-                throw new ArgumentException("The type must implement " + nameof(IContentPartDisplayDriver));
-            }
-
-            var option = GetOrAddContentPartDisplayOption(contentPartType);
-            option.ForDisplayMode(displayDriverType, predicate);
+            throw new ArgumentException("The type must implement " + nameof(IContentPartDisplayDriver));
         }
 
-        internal void ForContentPartEditor(Type contentPartType, Type editorDriverType, Func<string, bool> predicate)
-        {
-            if (!typeof(IContentPartDisplayDriver).IsAssignableFrom(editorDriverType))
-            {
-                throw new ArgumentException("The type must implement " + nameof(IContentPartDisplayDriver));
-            }
+        var option = GetOrAddContentPartDisplayOption(contentPartType);
+        option.ForDisplayMode(displayDriverType, predicate);
+    }
 
-            var option = GetOrAddContentPartDisplayOption(contentPartType);
-            option.ForEditor(editorDriverType, predicate);
+    internal void ForContentPartEditor(Type contentPartType, Type editorDriverType, Func<string, bool> predicate)
+    {
+        if (!typeof(IContentPartDisplayDriver).IsAssignableFrom(editorDriverType))
+        {
+            throw new ArgumentException("The type must implement " + nameof(IContentPartDisplayDriver));
         }
 
-        internal void RemoveContentPartDisplayDriver(Type contentPartType, Type driverType)
-        {
-            if (!typeof(IContentPartDisplayDriver).IsAssignableFrom(driverType))
-            {
-                throw new ArgumentException("The type must implement " + nameof(IContentPartDisplayDriver));
-            }
+        var option = GetOrAddContentPartDisplayOption(contentPartType);
+        option.ForEditor(editorDriverType, predicate);
+    }
 
-            var option = GetOrAddContentPartDisplayOption(contentPartType);
-            option.RemoveDisplayDriver(driverType);
+    internal void RemoveContentPartDisplayDriver(Type contentPartType, Type driverType)
+    {
+        if (!typeof(IContentPartDisplayDriver).IsAssignableFrom(driverType))
+        {
+            throw new ArgumentException("The type must implement " + nameof(IContentPartDisplayDriver));
         }
 
-        private ContentPartDisplayOption GetOrAddContentPartDisplayOption(Type contentPartType)
+        var option = GetOrAddContentPartDisplayOption(contentPartType);
+        option.RemoveDisplayDriver(driverType);
+    }
+
+    private ContentPartDisplayOption GetOrAddContentPartDisplayOption(Type contentPartType)
+    {
+        if (!contentPartType.IsSubclassOf(typeof(ContentPart)))
         {
-            if (!contentPartType.IsSubclassOf(typeof(ContentPart)))
-            {
-                throw new ArgumentException("The type must inherit from " + nameof(ContentPart));
-            }
-
-            var option = _contentParts.FirstOrDefault(x => x.Type == contentPartType);
-            if (option == null)
-            {
-                option = new ContentPartDisplayOption(contentPartType);
-                _contentParts.Add(option);
-            }
-
-            return option;
+            throw new ArgumentException("The type must inherit from " + nameof(ContentPart));
         }
 
-        internal void ForContentFieldDisplayMode(Type contentFieldType, Type displayModeDriverType, Func<string, bool> predicate)
+        var option = _contentParts.FirstOrDefault(x => x.Type == contentPartType);
+        if (option == null)
         {
-            if (!typeof(IContentFieldDisplayDriver).IsAssignableFrom(displayModeDriverType))
-            {
-                throw new ArgumentException("The type must implement " + nameof(IContentFieldDisplayDriver));
-            }
-
-            var option = GetOrAddContentFieldDisplayOption(contentFieldType);
-            option.ForDisplayMode(displayModeDriverType, predicate);
+            option = new ContentPartDisplayOption(contentPartType);
+            _contentParts.Add(option);
         }
 
-        internal void ForContentFieldEditor(Type contentFieldType, Type editorDriverType, Func<string, bool> predicate)
+        return option;
+    }
+
+    internal void ForContentFieldDisplayMode(Type contentFieldType, Type displayModeDriverType, Func<string, bool> predicate)
+    {
+        if (!typeof(IContentFieldDisplayDriver).IsAssignableFrom(displayModeDriverType))
         {
-            if (!typeof(IContentFieldDisplayDriver).IsAssignableFrom(editorDriverType))
-            {
-                throw new ArgumentException("The type must implement " + nameof(IContentFieldDisplayDriver));
-            }
+            throw new ArgumentException("The type must implement " + nameof(IContentFieldDisplayDriver));
+        }
+
+        var option = GetOrAddContentFieldDisplayOption(contentFieldType);
+        option.ForDisplayMode(displayModeDriverType, predicate);
+    }
 
-            var option = GetOrAddContentFieldDisplayOption(contentFieldType);
-            option.ForEditor(editorDriverType, predicate);
+    internal void ForContentFieldEditor(Type contentFieldType, Type editorDriverType, Func<string, bool> predicate)
+    {
+        if (!typeof(IContentFieldDisplayDriver).IsAssignableFrom(editorDriverType))
+        {
+            throw new ArgumentException("The type must implement " + nameof(IContentFieldDisplayDriver));
         }
 
-        internal void RemoveContentFieldDisplayDriver(Type contentPartType, Type driverType)
+        var option = GetOrAddContentFieldDisplayOption(contentFieldType);
+        option.ForEditor(editorDriverType, predicate);
+    }
+
+    internal void RemoveContentFieldDisplayDriver(Type contentPartType, Type driverType)
+    {
+        if (!typeof(IContentFieldDisplayDriver).IsAssignableFrom(driverType))
         {
-            if (!typeof(IContentFieldDisplayDriver).IsAssignableFrom(driverType))
-            {
-                throw new ArgumentException("The type must implement " + nameof(IContentFieldDisplayDriver));
-            }
+            throw new ArgumentException("The type must implement " + nameof(IContentFieldDisplayDriver));
+        }
+
+        var option = GetOrAddContentFieldDisplayOption(contentPartType);
+        option.RemoveDisplayDriver(driverType);
+    }
 
-            var option = GetOrAddContentFieldDisplayOption(contentPartType);
-            option.RemoveDisplayDriver(driverType);
+    private ContentFieldDisplayOption GetOrAddContentFieldDisplayOption(Type contentFieldType)
+    {
+        if (!contentFieldType.IsSubclassOf(typeof(ContentField)))
+        {
+            throw new ArgumentException("The type must inherit from " + nameof(ContentField));
         }
 
-        private ContentFieldDisplayOption GetOrAddContentFieldDisplayOption(Type contentFieldType)
+        var option = _contentFields.FirstOrDefault(x => x.Type == contentFieldType);
+        if (option == null)
         {
-            if (!contentFieldType.IsSubclassOf(typeof(ContentField)))
-            {
-                throw new ArgumentException("The type must inherit from " + nameof(ContentField));
-            }
-
-            var option = _contentFields.FirstOrDefault(x => x.Type == contentFieldType);
-            if (option == null)
-            {
-                option = new ContentFieldDisplayOption(contentFieldType);
-                _contentFields.Add(option);
-            }
-
-            return option;
+            option = new ContentFieldDisplayOption(contentFieldType);
+            _contentFields.Add(option);
         }
+
+        return option;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldDisplayDriver.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldDisplayDriver.cs
index f1e94c1352e..80c0b042daa 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldDisplayDriver.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldDisplayDriver.cs
@@ -7,302 +7,301 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentManagement.Display.ContentDisplay
+namespace OrchardCore.ContentManagement.Display.ContentDisplay;
+
+public abstract class ContentFieldDisplayDriver<TField> : DisplayDriverBase, IContentFieldDisplayDriver where TField : ContentField, new()
 {
-    public abstract class ContentFieldDisplayDriver<TField> : DisplayDriverBase, IContentFieldDisplayDriver where TField : ContentField, new()
+    private const string DisplayToken = "_Display";
+    private const string DisplaySeparator = "_Display__";
+
+    private ContentTypePartDefinition _typePartDefinition;
+    private ContentPartFieldDefinition _partFieldDefinition;
+
+    public override ShapeResult Factory(string shapeType, Func<IBuildShapeContext, ValueTask<IShape>> shapeBuilder, Func<IShape, Task> initializeAsync)
     {
-        private const string DisplayToken = "_Display";
-        private const string DisplaySeparator = "_Display__";
+        // e.g., HtmlBodyPart.Summary, HtmlBodyPart-BlogPost, BagPart-LandingPage-Services
+        // context.Shape is the ContentItem shape, we need to alter the part shape
 
-        private ContentTypePartDefinition _typePartDefinition;
-        private ContentPartFieldDefinition _partFieldDefinition;
+        var result = base.Factory(shapeType, shapeBuilder, initializeAsync).Prefix(Prefix);
 
-        public override ShapeResult Factory(string shapeType, Func<IBuildShapeContext, ValueTask<IShape>> shapeBuilder, Func<IShape, Task> initializeAsync)
+        if (_typePartDefinition != null && _partFieldDefinition != null)
         {
-            // e.g., HtmlBodyPart.Summary, HtmlBodyPart-BlogPost, BagPart-LandingPage-Services
-            // context.Shape is the ContentItem shape, we need to alter the part shape
+            var partType = _typePartDefinition.PartDefinition.Name;
+            var partName = _typePartDefinition.Name;
+            var fieldType = _partFieldDefinition.FieldDefinition.Name;
+            var fieldName = _partFieldDefinition.Name;
+            var contentType = _typePartDefinition.ContentTypeDefinition.Name;
+            var displayMode = _partFieldDefinition.DisplayMode();
+            var hasDisplayMode = !string.IsNullOrEmpty(displayMode);
+
+            if (GetEditorShapeType(_partFieldDefinition) == shapeType)
+            {
+                // HtmlBodyPart-Description, Services-Description
+                result.Differentiator($"{partName}-{fieldName}");
 
-            var result = base.Factory(shapeType, shapeBuilder, initializeAsync).Prefix(Prefix);
+                // We do not need to add alternates on edit as they are handled with field editor types so return before adding alternates
+                return result;
+            }
 
-            if (_typePartDefinition != null && _partFieldDefinition != null)
+            // If the shape type and the field type only differ by the display mode
+            if (hasDisplayMode && shapeType == fieldType + DisplaySeparator + displayMode)
             {
-                var partType = _typePartDefinition.PartDefinition.Name;
-                var partName = _typePartDefinition.Name;
-                var fieldType = _partFieldDefinition.FieldDefinition.Name;
-                var fieldName = _partFieldDefinition.Name;
-                var contentType = _typePartDefinition.ContentTypeDefinition.Name;
-                var displayMode = _partFieldDefinition.DisplayMode();
-                var hasDisplayMode = !string.IsNullOrEmpty(displayMode);
-
-                if (GetEditorShapeType(_partFieldDefinition) == shapeType)
-                {
-                    // HtmlBodyPart-Description, Services-Description
-                    result.Differentiator($"{partName}-{fieldName}");
+                // Preserve the shape name regardless its differentiator
+                result.Name($"{partName}-{fieldName}");
+            }
 
-                    // We do not need to add alternates on edit as they are handled with field editor types so return before adding alternates
-                    return result;
-                }
+            if (fieldType == shapeType)
+            {
+                // HtmlBodyPart-Description, Services-Description
+                result.Differentiator($"{partName}-{fieldName}");
+            }
+            else
+            {
+                // HtmlBodyPart-Description-TextField, Services-Description-TextField
+                result.Differentiator($"{partName}-{fieldName}-{shapeType}");
+            }
 
-                // If the shape type and the field type only differ by the display mode
-                if (hasDisplayMode && shapeType == fieldType + DisplaySeparator + displayMode)
-                {
-                    // Preserve the shape name regardless its differentiator
-                    result.Name($"{partName}-{fieldName}");
-                }
+            result.Displaying(ctx =>
+            {
+                var displayTypes = new[] { string.Empty, "_" + ctx.Shape.Metadata.DisplayType };
 
-                if (fieldType == shapeType)
-                {
-                    // HtmlBodyPart-Description, Services-Description
-                    result.Differentiator($"{partName}-{fieldName}");
-                }
-                else
-                {
-                    // HtmlBodyPart-Description-TextField, Services-Description-TextField
-                    result.Differentiator($"{partName}-{fieldName}-{shapeType}");
-                }
+                // [ShapeType]_[DisplayType], e.g. TextField.Summary
+                ctx.Shape.Metadata.Alternates.Add($"{shapeType}_{ctx.Shape.Metadata.DisplayType}");
 
-                result.Displaying(ctx =>
+                // When the shape type is the same as the field, we can ignore one of them in the alternate name
+                // For instance TextField returns a unique TextField shape type.
+                if (shapeType == fieldType)
                 {
-                    var displayTypes = new[] { string.Empty, "_" + ctx.Shape.Metadata.DisplayType };
-
-                    // [ShapeType]_[DisplayType], e.g. TextField.Summary
-                    ctx.Shape.Metadata.Alternates.Add($"{shapeType}_{ctx.Shape.Metadata.DisplayType}");
-
-                    // When the shape type is the same as the field, we can ignore one of them in the alternate name
-                    // For instance TextField returns a unique TextField shape type.
-                    if (shapeType == fieldType)
+                    foreach (var displayType in displayTypes)
                     {
-                        foreach (var displayType in displayTypes)
-                        {
-                            // [PartType]__[FieldName], e.g. HtmlBodyPart-Description
-                            ctx.Shape.Metadata.Alternates.Add($"{partType}{displayType}__{fieldName}");
+                        // [PartType]__[FieldName], e.g. HtmlBodyPart-Description
+                        ctx.Shape.Metadata.Alternates.Add($"{partType}{displayType}__{fieldName}");
 
-                            // [ContentType]__[FieldType], e.g. Blog-TextField, LandingPage-TextField
-                            ctx.Shape.Metadata.Alternates.Add($"{contentType}{displayType}__{fieldType}");
+                        // [ContentType]__[FieldType], e.g. Blog-TextField, LandingPage-TextField
+                        ctx.Shape.Metadata.Alternates.Add($"{contentType}{displayType}__{fieldType}");
 
-                            // [ContentType]__[PartName]__[FieldName], e.g. Blog-HtmlBodyPart-Description, LandingPage-Services-Description
-                            ctx.Shape.Metadata.Alternates.Add($"{contentType}{displayType}__{partType}__{fieldName}");
-                        }
+                        // [ContentType]__[PartName]__[FieldName], e.g. Blog-HtmlBodyPart-Description, LandingPage-Services-Description
+                        ctx.Shape.Metadata.Alternates.Add($"{contentType}{displayType}__{partType}__{fieldName}");
                     }
-                    else
+                }
+                else
+                {
+                    if (hasDisplayMode)
                     {
-                        if (hasDisplayMode)
-                        {
-                            // [FieldType]_[DisplayType]__[DisplayMode]_Display, e.g. TextField-Header.Display.Summary
-                            ctx.Shape.Metadata.Alternates.Add($"{fieldType}_{ctx.Shape.Metadata.DisplayType}__{displayMode}{DisplayToken}");
-                        }
+                        // [FieldType]_[DisplayType]__[DisplayMode]_Display, e.g. TextField-Header.Display.Summary
+                        ctx.Shape.Metadata.Alternates.Add($"{fieldType}_{ctx.Shape.Metadata.DisplayType}__{displayMode}{DisplayToken}");
+                    }
+
+                    for (var i = 0; i < displayTypes.Length; i++)
+                    {
+                        var displayType = displayTypes[i];
 
-                        for (var i = 0; i < displayTypes.Length; i++)
+                        if (hasDisplayMode)
                         {
-                            var displayType = displayTypes[i];
+                            shapeType = $"{fieldType}__{displayMode}";
 
-                            if (hasDisplayMode)
+                            if (displayType == string.Empty)
+                            {
+                                displayType = DisplayToken;
+                            }
+                            else
                             {
-                                shapeType = $"{fieldType}__{displayMode}";
-
-                                if (displayType == string.Empty)
-                                {
-                                    displayType = DisplayToken;
-                                }
-                                else
-                                {
-                                    shapeType += DisplayToken;
-                                }
+                                shapeType += DisplayToken;
                             }
+                        }
 
-                            // [FieldType]__[ShapeType], e.g. TextField-TextFieldSummary
-                            ctx.Shape.Metadata.Alternates.Add($"{fieldType}{displayType}__{shapeType}");
+                        // [FieldType]__[ShapeType], e.g. TextField-TextFieldSummary
+                        ctx.Shape.Metadata.Alternates.Add($"{fieldType}{displayType}__{shapeType}");
 
-                            // [PartType]__[FieldName]__[ShapeType], e.g. HtmlBodyPart-Description-TextFieldSummary
-                            ctx.Shape.Metadata.Alternates.Add($"{partType}{displayType}__{fieldName}__{shapeType}");
+                        // [PartType]__[FieldName]__[ShapeType], e.g. HtmlBodyPart-Description-TextFieldSummary
+                        ctx.Shape.Metadata.Alternates.Add($"{partType}{displayType}__{fieldName}__{shapeType}");
 
-                            // [ContentType]__[FieldType]__[ShapeType], e.g. Blog-TextField-TextFieldSummary, LandingPage-TextField-TextFieldSummary
-                            ctx.Shape.Metadata.Alternates.Add($"{contentType}{displayType}__{fieldType}__{shapeType}");
+                        // [ContentType]__[FieldType]__[ShapeType], e.g. Blog-TextField-TextFieldSummary, LandingPage-TextField-TextFieldSummary
+                        ctx.Shape.Metadata.Alternates.Add($"{contentType}{displayType}__{fieldType}__{shapeType}");
 
-                            // [ContentType]__[PartName]__[FieldName]__[ShapeType], e.g. Blog-HtmlBodyPart-Description-TextFieldSummary, LandingPage-Services-Description-TextFieldSummary
-                            ctx.Shape.Metadata.Alternates.Add($"{contentType}{displayType}__{partName}__{fieldName}__{shapeType}");
-                        }
+                        // [ContentType]__[PartName]__[FieldName]__[ShapeType], e.g. Blog-HtmlBodyPart-Description-TextFieldSummary, LandingPage-Services-Description-TextFieldSummary
+                        ctx.Shape.Metadata.Alternates.Add($"{contentType}{displayType}__{partName}__{fieldName}__{shapeType}");
                     }
-                });
-            }
-
-            return result;
+                }
+            });
         }
 
-        Task<IDisplayResult> IContentFieldDisplayDriver.BuildDisplayAsync(ContentPart contentPart, ContentPartFieldDefinition partFieldDefinition, ContentTypePartDefinition typePartDefinition, BuildDisplayContext context)
-        {
-            if (!string.Equals(typeof(TField).Name, partFieldDefinition.FieldDefinition.Name, StringComparison.Ordinal) &&
-               !string.Equals(nameof(ContentField), partFieldDefinition.FieldDefinition.Name, StringComparison.Ordinal))
-            {
-                return Task.FromResult(default(IDisplayResult));
-            }
-
-            var field = contentPart.Get<TField>(partFieldDefinition.Name);
-            if (field != null)
-            {
-                BuildPrefix(typePartDefinition, partFieldDefinition, context.HtmlFieldPrefix);
-
-                var fieldDisplayContext = new BuildFieldDisplayContext(contentPart, typePartDefinition, partFieldDefinition, context);
-
-                _typePartDefinition = typePartDefinition;
-                _partFieldDefinition = partFieldDefinition;
-
-                var result = DisplayAsync(field, fieldDisplayContext);
-
-                _typePartDefinition = null;
-                _partFieldDefinition = null;
-
-                return result;
-            }
+        return result;
+    }
 
+    Task<IDisplayResult> IContentFieldDisplayDriver.BuildDisplayAsync(ContentPart contentPart, ContentPartFieldDefinition partFieldDefinition, ContentTypePartDefinition typePartDefinition, BuildDisplayContext context)
+    {
+        if (!string.Equals(typeof(TField).Name, partFieldDefinition.FieldDefinition.Name, StringComparison.Ordinal) &&
+           !string.Equals(nameof(ContentField), partFieldDefinition.FieldDefinition.Name, StringComparison.Ordinal))
+        {
             return Task.FromResult(default(IDisplayResult));
         }
 
-        Task<IDisplayResult> IContentFieldDisplayDriver.BuildEditorAsync(ContentPart contentPart, ContentPartFieldDefinition partFieldDefinition, ContentTypePartDefinition typePartDefinition, BuildEditorContext context)
+        var field = contentPart.Get<TField>(partFieldDefinition.Name);
+        if (field != null)
         {
-            if (!string.Equals(typeof(TField).Name, partFieldDefinition.FieldDefinition.Name, StringComparison.Ordinal) &&
-                !string.Equals(nameof(ContentField), partFieldDefinition.FieldDefinition.Name, StringComparison.Ordinal))
-            {
-                return Task.FromResult(default(IDisplayResult));
-            }
-
-            var field = contentPart.GetOrCreate<TField>(partFieldDefinition.Name);
+            BuildPrefix(typePartDefinition, partFieldDefinition, context.HtmlFieldPrefix);
 
-            if (field != null)
-            {
-                BuildPrefix(typePartDefinition, partFieldDefinition, context.HtmlFieldPrefix);
+            var fieldDisplayContext = new BuildFieldDisplayContext(contentPart, typePartDefinition, partFieldDefinition, context);
 
-                var fieldEditorContext = new BuildFieldEditorContext(contentPart, typePartDefinition, partFieldDefinition, context);
+            _typePartDefinition = typePartDefinition;
+            _partFieldDefinition = partFieldDefinition;
 
-                _typePartDefinition = typePartDefinition;
-                _partFieldDefinition = partFieldDefinition;
+            var result = DisplayAsync(field, fieldDisplayContext);
 
-                var result = EditAsync(field, fieldEditorContext);
+            _typePartDefinition = null;
+            _partFieldDefinition = null;
 
-                _typePartDefinition = null;
-                _partFieldDefinition = null;
+            return result;
+        }
 
-                return result;
-            }
+        return Task.FromResult(default(IDisplayResult));
+    }
 
+    Task<IDisplayResult> IContentFieldDisplayDriver.BuildEditorAsync(ContentPart contentPart, ContentPartFieldDefinition partFieldDefinition, ContentTypePartDefinition typePartDefinition, BuildEditorContext context)
+    {
+        if (!string.Equals(typeof(TField).Name, partFieldDefinition.FieldDefinition.Name, StringComparison.Ordinal) &&
+            !string.Equals(nameof(ContentField), partFieldDefinition.FieldDefinition.Name, StringComparison.Ordinal))
+        {
             return Task.FromResult(default(IDisplayResult));
         }
 
-        async Task<IDisplayResult> IContentFieldDisplayDriver.UpdateEditorAsync(ContentPart contentPart, ContentPartFieldDefinition partFieldDefinition, ContentTypePartDefinition typePartDefinition, UpdateEditorContext context)
-        {
-            if (!string.Equals(typeof(TField).Name, partFieldDefinition.FieldDefinition.Name, StringComparison.Ordinal) &&
-                !string.Equals(nameof(ContentField), partFieldDefinition.FieldDefinition.Name, StringComparison.Ordinal))
-            {
-                return null;
-            }
-
-            var field = contentPart.GetOrCreate<TField>(partFieldDefinition.Name);
+        var field = contentPart.GetOrCreate<TField>(partFieldDefinition.Name);
 
+        if (field != null)
+        {
             BuildPrefix(typePartDefinition, partFieldDefinition, context.HtmlFieldPrefix);
 
-            var updateFieldEditorContext = new UpdateFieldEditorContext(contentPart, typePartDefinition, partFieldDefinition, context);
+            var fieldEditorContext = new BuildFieldEditorContext(contentPart, typePartDefinition, partFieldDefinition, context);
 
             _typePartDefinition = typePartDefinition;
             _partFieldDefinition = partFieldDefinition;
 
-            var result = await UpdateAsync(field, updateFieldEditorContext);
+            var result = EditAsync(field, fieldEditorContext);
 
             _typePartDefinition = null;
             _partFieldDefinition = null;
 
-            if (result == null)
-            {
-                return null;
-            }
-
-            contentPart.Apply(partFieldDefinition.Name, field);
-
             return result;
         }
 
-        public virtual Task<IDisplayResult> DisplayAsync(TField field, BuildFieldDisplayContext fieldDisplayContext)
-        {
-            return Task.FromResult(Display(field, fieldDisplayContext));
-        }
+        return Task.FromResult(default(IDisplayResult));
+    }
 
-        public virtual IDisplayResult Display(TField field, BuildFieldDisplayContext fieldDisplayContext)
+    async Task<IDisplayResult> IContentFieldDisplayDriver.UpdateEditorAsync(ContentPart contentPart, ContentPartFieldDefinition partFieldDefinition, ContentTypePartDefinition typePartDefinition, UpdateEditorContext context)
+    {
+        if (!string.Equals(typeof(TField).Name, partFieldDefinition.FieldDefinition.Name, StringComparison.Ordinal) &&
+            !string.Equals(nameof(ContentField), partFieldDefinition.FieldDefinition.Name, StringComparison.Ordinal))
         {
             return null;
         }
 
-        public virtual Task<IDisplayResult> EditAsync(TField field, BuildFieldEditorContext context)
-        {
-            return Task.FromResult(Edit(field, context));
-        }
+        var field = contentPart.GetOrCreate<TField>(partFieldDefinition.Name);
+
+        BuildPrefix(typePartDefinition, partFieldDefinition, context.HtmlFieldPrefix);
+
+        var updateFieldEditorContext = new UpdateFieldEditorContext(contentPart, typePartDefinition, partFieldDefinition, context);
 
-        public virtual IDisplayResult Edit(TField field, BuildFieldEditorContext context)
+        _typePartDefinition = typePartDefinition;
+        _partFieldDefinition = partFieldDefinition;
+
+        var result = await UpdateAsync(field, updateFieldEditorContext);
+
+        _typePartDefinition = null;
+        _partFieldDefinition = null;
+
+        if (result == null)
         {
             return null;
         }
 
-        public virtual Task<IDisplayResult> UpdateAsync(TField field, UpdateFieldEditorContext context)
-        {
+        contentPart.Apply(partFieldDefinition.Name, field);
+
+        return result;
+    }
+
+    public virtual Task<IDisplayResult> DisplayAsync(TField field, BuildFieldDisplayContext fieldDisplayContext)
+    {
+        return Task.FromResult(Display(field, fieldDisplayContext));
+    }
+
+    public virtual IDisplayResult Display(TField field, BuildFieldDisplayContext fieldDisplayContext)
+    {
+        return null;
+    }
+
+    public virtual Task<IDisplayResult> EditAsync(TField field, BuildFieldEditorContext context)
+    {
+        return Task.FromResult(Edit(field, context));
+    }
+
+    public virtual IDisplayResult Edit(TField field, BuildFieldEditorContext context)
+    {
+        return null;
+    }
+
+    public virtual Task<IDisplayResult> UpdateAsync(TField field, UpdateFieldEditorContext context)
+    {
 #pragma warning disable CS0618 // Type or member is obsolete
-            return UpdateAsync(field, context.Updater, context);
+        return UpdateAsync(field, context.Updater, context);
 #pragma warning restore CS0618 // Type or member is obsolete
-        }
+    }
 
-        [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the UpdateAsync(TField field, UpdateFieldEditorContext context) method.")]
-        public virtual Task<IDisplayResult> UpdateAsync(TField field, IUpdateModel updater, UpdateFieldEditorContext context)
-        {
-            return Task.FromResult(Update(field, updater, context));
-        }
+    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the UpdateAsync(TField field, UpdateFieldEditorContext context) method.")]
+    public virtual Task<IDisplayResult> UpdateAsync(TField field, IUpdateModel updater, UpdateFieldEditorContext context)
+    {
+        return Task.FromResult(Update(field, updater, context));
+    }
 
-        [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the UpdateAsync(TField field, UpdateFieldEditorContext context) method.")]
-        public virtual IDisplayResult Update(TField field, IUpdateModel updater, UpdateFieldEditorContext context)
-        {
-            return null;
-        }
+    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the UpdateAsync(TField field, UpdateFieldEditorContext context) method.")]
+    public virtual IDisplayResult Update(TField field, IUpdateModel updater, UpdateFieldEditorContext context)
+    {
+        return null;
+    }
 
-        protected string GetEditorShapeType(string shapeType, ContentPartFieldDefinition partFieldDefinition)
-        {
-            var editor = partFieldDefinition.Editor();
-            return !string.IsNullOrEmpty(editor)
-                ? shapeType + "__" + editor
-                : shapeType;
-        }
+    protected string GetEditorShapeType(string shapeType, ContentPartFieldDefinition partFieldDefinition)
+    {
+        var editor = partFieldDefinition.Editor();
+        return !string.IsNullOrEmpty(editor)
+            ? shapeType + "__" + editor
+            : shapeType;
+    }
 
-        protected string GetEditorShapeType(string shapeType, BuildFieldEditorContext context)
-        {
-            return GetEditorShapeType(shapeType, context.PartFieldDefinition);
-        }
+    protected string GetEditorShapeType(string shapeType, BuildFieldEditorContext context)
+    {
+        return GetEditorShapeType(shapeType, context.PartFieldDefinition);
+    }
 
-        protected string GetEditorShapeType(ContentPartFieldDefinition partFieldDefinition)
-        {
-            return GetEditorShapeType(typeof(TField).Name + "_Edit", partFieldDefinition);
-        }
+    protected string GetEditorShapeType(ContentPartFieldDefinition partFieldDefinition)
+    {
+        return GetEditorShapeType(typeof(TField).Name + "_Edit", partFieldDefinition);
+    }
 
-        protected string GetEditorShapeType(BuildFieldEditorContext context)
-        {
-            return GetEditorShapeType(context.PartFieldDefinition);
-        }
+    protected string GetEditorShapeType(BuildFieldEditorContext context)
+    {
+        return GetEditorShapeType(context.PartFieldDefinition);
+    }
 
-        protected string GetDisplayShapeType(string shapeType, BuildFieldDisplayContext context)
-        {
-            var displayMode = context.PartFieldDefinition.DisplayMode();
-            return !string.IsNullOrEmpty(displayMode)
-                ? shapeType + DisplaySeparator + displayMode
-                : shapeType;
-        }
+    protected string GetDisplayShapeType(string shapeType, BuildFieldDisplayContext context)
+    {
+        var displayMode = context.PartFieldDefinition.DisplayMode();
+        return !string.IsNullOrEmpty(displayMode)
+            ? shapeType + DisplaySeparator + displayMode
+            : shapeType;
+    }
 
-        protected string GetDisplayShapeType(BuildFieldDisplayContext context)
-        {
-            return GetDisplayShapeType(typeof(TField).Name, context);
-        }
+    protected string GetDisplayShapeType(BuildFieldDisplayContext context)
+    {
+        return GetDisplayShapeType(typeof(TField).Name, context);
+    }
 
-        private void BuildPrefix(ContentTypePartDefinition typePartDefinition, ContentPartFieldDefinition partFieldDefinition, string htmlFieldPrefix)
-        {
-            Prefix = typePartDefinition.Name + "." + partFieldDefinition.Name;
+    private void BuildPrefix(ContentTypePartDefinition typePartDefinition, ContentPartFieldDefinition partFieldDefinition, string htmlFieldPrefix)
+    {
+        Prefix = typePartDefinition.Name + "." + partFieldDefinition.Name;
 
-            if (!string.IsNullOrEmpty(htmlFieldPrefix))
-            {
-                Prefix = htmlFieldPrefix + "." + Prefix;
-            }
+        if (!string.IsNullOrEmpty(htmlFieldPrefix))
+        {
+            Prefix = htmlFieldPrefix + "." + Prefix;
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldDisplayDriverOption.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldDisplayDriverOption.cs
index ee8ec47fae4..a3f072752b0 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldDisplayDriverOption.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldDisplayDriverOption.cs
@@ -1,28 +1,27 @@
 using System;
 
-namespace OrchardCore.ContentManagement.Display.ContentDisplay
+namespace OrchardCore.ContentManagement.Display.ContentDisplay;
+
+public class ContentFieldDisplayDriverOption
 {
-    public class ContentFieldDisplayDriverOption
+    public ContentFieldDisplayDriverOption(Type displayDriverType)
     {
-        public ContentFieldDisplayDriverOption(Type displayDriverType)
-        {
-            DisplayDriverType = displayDriverType;
-        }
+        DisplayDriverType = displayDriverType;
+    }
 
-        public Type DisplayDriverType { get; }
+    public Type DisplayDriverType { get; }
 
-        public Func<string, bool> DisplayMode { get; private set; }
+    public Func<string, bool> DisplayMode { get; private set; }
 
-        public Func<string, bool> Editor { get; private set; }
+    public Func<string, bool> Editor { get; private set; }
 
-        internal void SetDisplayMode(Func<string, bool> displayMode)
-        {
-            DisplayMode = displayMode;
-        }
+    internal void SetDisplayMode(Func<string, bool> displayMode)
+    {
+        DisplayMode = displayMode;
+    }
 
-        internal void SetEditor(Func<string, bool> editor)
-        {
-            Editor = editor;
-        }
+    internal void SetEditor(Func<string, bool> editor)
+    {
+        Editor = editor;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldDisplayDriverResolver.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldDisplayDriverResolver.cs
index cc2481bda9f..2289478944c 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldDisplayDriverResolver.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldDisplayDriverResolver.cs
@@ -3,56 +3,55 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.ContentManagement.Display.ContentDisplay
+namespace OrchardCore.ContentManagement.Display.ContentDisplay;
+
+public class ContentFieldDisplayDriverResolver : IContentFieldDisplayDriverResolver
 {
-    public class ContentFieldDisplayDriverResolver : IContentFieldDisplayDriverResolver
+    private readonly IServiceProvider _serviceProvider;
+    private readonly ContentDisplayOptions _contentDisplayOptions;
+
+    public ContentFieldDisplayDriverResolver(
+        IServiceProvider serviceProvider,
+        IOptions<ContentDisplayOptions> contentDisplayOptions
+        )
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly ContentDisplayOptions _contentDisplayOptions;
+        _serviceProvider = serviceProvider;
+        _contentDisplayOptions = contentDisplayOptions.Value;
+    }
 
-        public ContentFieldDisplayDriverResolver(
-            IServiceProvider serviceProvider,
-            IOptions<ContentDisplayOptions> contentDisplayOptions
-            )
-        {
-            _serviceProvider = serviceProvider;
-            _contentDisplayOptions = contentDisplayOptions.Value;
-        }
+    public IList<IContentFieldDisplayDriver> GetDisplayModeDrivers(string fieldName, string displayMode)
+    {
+        var services = new List<IContentFieldDisplayDriver>();
 
-        public IList<IContentFieldDisplayDriver> GetDisplayModeDrivers(string fieldName, string displayMode)
+        if (_contentDisplayOptions.ContentFieldOptions.TryGetValue(fieldName, out var contentFieldDisplayOption))
         {
-            var services = new List<IContentFieldDisplayDriver>();
-
-            if (_contentDisplayOptions.ContentFieldOptions.TryGetValue(fieldName, out var contentFieldDisplayOption))
+            foreach (var displayModeDriverOption in contentFieldDisplayOption.DisplayModeDrivers)
             {
-                foreach (var displayModeDriverOption in contentFieldDisplayOption.DisplayModeDrivers)
+                if (displayModeDriverOption.DisplayMode.Invoke(displayMode))
                 {
-                    if (displayModeDriverOption.DisplayMode.Invoke(displayMode))
-                    {
-                        services.Add((IContentFieldDisplayDriver)_serviceProvider.GetRequiredService(displayModeDriverOption.DisplayDriverType));
-                    }
+                    services.Add((IContentFieldDisplayDriver)_serviceProvider.GetRequiredService(displayModeDriverOption.DisplayDriverType));
                 }
             }
-
-            return services;
         }
 
-        public IList<IContentFieldDisplayDriver> GetEditorDrivers(string fieldName, string editor)
-        {
-            var services = new List<IContentFieldDisplayDriver>();
+        return services;
+    }
+
+    public IList<IContentFieldDisplayDriver> GetEditorDrivers(string fieldName, string editor)
+    {
+        var services = new List<IContentFieldDisplayDriver>();
 
-            if (_contentDisplayOptions.ContentFieldOptions.TryGetValue(fieldName, out var contentFieldDisplayOption))
+        if (_contentDisplayOptions.ContentFieldOptions.TryGetValue(fieldName, out var contentFieldDisplayOption))
+        {
+            foreach (var editorDriverOption in contentFieldDisplayOption.EditorDrivers)
             {
-                foreach (var editorDriverOption in contentFieldDisplayOption.EditorDrivers)
+                if (editorDriverOption.Editor.Invoke(editor))
                 {
-                    if (editorDriverOption.Editor.Invoke(editor))
-                    {
-                        services.Add((IContentFieldDisplayDriver)_serviceProvider.GetRequiredService(editorDriverOption.DisplayDriverType));
-                    }
+                    services.Add((IContentFieldDisplayDriver)_serviceProvider.GetRequiredService(editorDriverOption.DisplayDriverType));
                 }
             }
-
-            return services;
         }
+
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldDisplayOption.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldDisplayOption.cs
index 25107b3b47d..9f5b869ced0 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldDisplayOption.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldDisplayOption.cs
@@ -2,56 +2,55 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OrchardCore.ContentManagement.Display.ContentDisplay
+namespace OrchardCore.ContentManagement.Display.ContentDisplay;
+
+public class ContentFieldDisplayOption : ContentFieldOptionBase
 {
-    public class ContentFieldDisplayOption : ContentFieldOptionBase
-    {
-        private readonly List<ContentFieldDisplayDriverOption> _fieldDisplayDrivers = [];
+    private readonly List<ContentFieldDisplayDriverOption> _fieldDisplayDrivers = [];
 
-        public ContentFieldDisplayOption(Type contentFieldType) : base(contentFieldType)
-        {
-        }
+    public ContentFieldDisplayOption(Type contentFieldType) : base(contentFieldType)
+    {
+    }
 
-        private List<ContentFieldDisplayDriverOption> _displayModeDrivers;
-        public IReadOnlyList<ContentFieldDisplayDriverOption> DisplayModeDrivers => _displayModeDrivers ??= _fieldDisplayDrivers.Where(d => d.DisplayMode != null).ToList();
+    private List<ContentFieldDisplayDriverOption> _displayModeDrivers;
+    public IReadOnlyList<ContentFieldDisplayDriverOption> DisplayModeDrivers => _displayModeDrivers ??= _fieldDisplayDrivers.Where(d => d.DisplayMode != null).ToList();
 
-        private List<ContentFieldDisplayDriverOption> _editorDrivers;
-        public IReadOnlyList<ContentFieldDisplayDriverOption> EditorDrivers => _editorDrivers ??= _fieldDisplayDrivers.Where(d => d.Editor != null).ToList();
+    private List<ContentFieldDisplayDriverOption> _editorDrivers;
+    public IReadOnlyList<ContentFieldDisplayDriverOption> EditorDrivers => _editorDrivers ??= _fieldDisplayDrivers.Where(d => d.Editor != null).ToList();
 
-        internal void ForDisplayMode(Type displayDriverType, Func<string, bool> predicate)
-        {
-            var option = GetOrAddContentFieldDisplayDriverOption(displayDriverType);
+    internal void ForDisplayMode(Type displayDriverType, Func<string, bool> predicate)
+    {
+        var option = GetOrAddContentFieldDisplayDriverOption(displayDriverType);
 
-            option.SetDisplayMode(predicate);
-        }
+        option.SetDisplayMode(predicate);
+    }
 
-        internal void ForEditor(Type displayDriverType, Func<string, bool> predicate)
-        {
-            var option = GetOrAddContentFieldDisplayDriverOption(displayDriverType);
+    internal void ForEditor(Type displayDriverType, Func<string, bool> predicate)
+    {
+        var option = GetOrAddContentFieldDisplayDriverOption(displayDriverType);
 
-            option.SetEditor(predicate);
-        }
+        option.SetEditor(predicate);
+    }
 
-        internal void RemoveDisplayDriver(Type displayDriverType)
+    internal void RemoveDisplayDriver(Type displayDriverType)
+    {
+        var displayDriverOption = _fieldDisplayDrivers.FirstOrDefault(d => d.DisplayDriverType == displayDriverType);
+        if (displayDriverOption != null)
         {
-            var displayDriverOption = _fieldDisplayDrivers.FirstOrDefault(d => d.DisplayDriverType == displayDriverType);
-            if (displayDriverOption != null)
-            {
-                _fieldDisplayDrivers.Remove(displayDriverOption);
-            }
+            _fieldDisplayDrivers.Remove(displayDriverOption);
         }
+    }
 
-        private ContentFieldDisplayDriverOption GetOrAddContentFieldDisplayDriverOption(Type displayDriverType)
-        {
-            var option = _fieldDisplayDrivers.FirstOrDefault(o => o.DisplayDriverType == displayDriverType);
-
-            if (option == null)
-            {
-                option = new ContentFieldDisplayDriverOption(displayDriverType);
-                _fieldDisplayDrivers.Add(option);
-            }
+    private ContentFieldDisplayDriverOption GetOrAddContentFieldDisplayDriverOption(Type displayDriverType)
+    {
+        var option = _fieldDisplayDrivers.FirstOrDefault(o => o.DisplayDriverType == displayDriverType);
 
-            return option;
+        if (option == null)
+        {
+            option = new ContentFieldDisplayDriverOption(displayDriverType);
+            _fieldDisplayDrivers.Add(option);
         }
+
+        return option;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldServiceCollectionExtensions.cs
index a1af053895c..4ce5dd354c4 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldServiceCollectionExtensions.cs
@@ -2,159 +2,158 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace OrchardCore.ContentManagement.Display.ContentDisplay
+namespace OrchardCore.ContentManagement.Display.ContentDisplay;
+
+public static class ContentFieldServiceCollectionExtensions
 {
-    public static class ContentFieldServiceCollectionExtensions
+    /// <summary>
+    /// Register a display driver for use with a content field and all display modes and editors.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentFieldOptionBuilder UseDisplayDriver<TContentFieldDisplayDriver>(this ContentFieldOptionBuilder builder)
+        where TContentFieldDisplayDriver : class, IContentFieldDisplayDriver
     {
-        /// <summary>
-        /// Register a display driver for use with a content field and all display modes and editors.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentFieldOptionBuilder UseDisplayDriver<TContentFieldDisplayDriver>(this ContentFieldOptionBuilder builder)
-            where TContentFieldDisplayDriver : class, IContentFieldDisplayDriver
-        {
-            return builder.UseDisplayDriver(typeof(TContentFieldDisplayDriver));
-        }
-
-        /// <summary>
-        /// Register a display driver for use with a content field and all display modes and editors.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentFieldOptionBuilder UseDisplayDriver(this ContentFieldOptionBuilder builder, Type fieldDisplayDriverType)
-        {
-            return builder.ForDisplayMode(fieldDisplayDriverType)
-                .ForEditor(fieldDisplayDriverType);
-        }
-
-        /// <summary>
-        /// Register a display driver for use with a content field and all display modes and editors.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentFieldOptionBuilder UseDisplayDriver<TContentFieldDisplayDriver>(this ContentFieldOptionBuilder builder, Func<string, bool> predicate)
-            where TContentFieldDisplayDriver : class, IContentFieldDisplayDriver
-        {
-            return builder.ForDisplayMode<TContentFieldDisplayDriver>(predicate)
-                .ForEditor<TContentFieldDisplayDriver>(predicate);
-        }
-
-        /// <summary>
-        /// Removes a display driver from all editors and display modes.
-        /// </summary>
-        public static ContentFieldOptionBuilder RemoveDisplayDriver<TContentFieldDisplayDriver>(this ContentFieldOptionBuilder builder)
-            where TContentFieldDisplayDriver : class, IContentFieldDisplayDriver
-        {
-            return builder.RemoveDisplayDriver(typeof(TContentFieldDisplayDriver));
-        }
+        return builder.UseDisplayDriver(typeof(TContentFieldDisplayDriver));
+    }
 
-        /// <summary>
-        /// Removes a display driver from all editors and display modes.
-        /// </summary>
-        public static ContentFieldOptionBuilder RemoveDisplayDriver(this ContentFieldOptionBuilder builder, Type fieldDisplayDriverType)
-        {
-            builder.Services.Configure<ContentDisplayOptions>(o =>
-            {
-                o.RemoveContentFieldDisplayDriver(builder.ContentFieldType, fieldDisplayDriverType);
-            });
-
-            builder.Services.RemoveAll(fieldDisplayDriverType);
-
-            return builder;
-        }
-
-        /// <summary>
-        /// Registers a display driver for use with all display modes.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentFieldOptionBuilder ForDisplayMode<TContentFieldDisplayDriver>(this ContentFieldOptionBuilder builder)
-            where TContentFieldDisplayDriver : class, IContentFieldDisplayDriver
-        {
-            return builder.ForDisplayMode(typeof(TContentFieldDisplayDriver));
-        }
+    /// <summary>
+    /// Register a display driver for use with a content field and all display modes and editors.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentFieldOptionBuilder UseDisplayDriver(this ContentFieldOptionBuilder builder, Type fieldDisplayDriverType)
+    {
+        return builder.ForDisplayMode(fieldDisplayDriverType)
+            .ForEditor(fieldDisplayDriverType);
+    }
 
-        public static ContentFieldOptionBuilder ForDisplayMode(this ContentFieldOptionBuilder builder, Type fieldDisplayDriverType)
-        {
-            return builder.ForDisplayMode(fieldDisplayDriverType, d => true);
-        }
-
-        /// <summary>
-        /// Registers a display driver for use with a specific display mode.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentFieldOptionBuilder ForDisplayMode<TContentFieldDisplayDriver>(this ContentFieldOptionBuilder builder, Func<string, bool> predicate)
-            where TContentFieldDisplayDriver : class, IContentFieldDisplayDriver
-        {
-            return builder.ForDisplayMode(typeof(TContentFieldDisplayDriver), predicate);
-        }
-
-        /// <summary>
-        /// Registers a display driver for use with a specific display mode.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentFieldOptionBuilder ForDisplayMode(this ContentFieldOptionBuilder builder, Type fieldDisplayDriverType, Func<string, bool> predicate)
-        {
-            builder.Services.Configure<ContentDisplayOptions>(o =>
-            {
-                o.ForContentFieldDisplayMode(builder.ContentFieldType, fieldDisplayDriverType, predicate);
-            });
-
-            builder.Services.TryAddScoped(fieldDisplayDriverType);
-
-            return builder;
-        }
-
-        /// <summary>
-        /// Registers a display driver for use with all editors.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentFieldOptionBuilder ForEditor<TContentFieldDisplayDriver>(this ContentFieldOptionBuilder builder)
-            where TContentFieldDisplayDriver : class, IContentFieldDisplayDriver
-        {
-            return builder.ForEditor(typeof(TContentFieldDisplayDriver));
-        }
-
-        /// <summary>
-        /// Registers a display driver for use with a specific editor.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentFieldOptionBuilder ForEditor(this ContentFieldOptionBuilder builder, Type fieldDisplayDriverType)
+    /// <summary>
+    /// Register a display driver for use with a content field and all display modes and editors.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentFieldOptionBuilder UseDisplayDriver<TContentFieldDisplayDriver>(this ContentFieldOptionBuilder builder, Func<string, bool> predicate)
+        where TContentFieldDisplayDriver : class, IContentFieldDisplayDriver
+    {
+        return builder.ForDisplayMode<TContentFieldDisplayDriver>(predicate)
+            .ForEditor<TContentFieldDisplayDriver>(predicate);
+    }
+
+    /// <summary>
+    /// Removes a display driver from all editors and display modes.
+    /// </summary>
+    public static ContentFieldOptionBuilder RemoveDisplayDriver<TContentFieldDisplayDriver>(this ContentFieldOptionBuilder builder)
+        where TContentFieldDisplayDriver : class, IContentFieldDisplayDriver
+    {
+        return builder.RemoveDisplayDriver(typeof(TContentFieldDisplayDriver));
+    }
+
+    /// <summary>
+    /// Removes a display driver from all editors and display modes.
+    /// </summary>
+    public static ContentFieldOptionBuilder RemoveDisplayDriver(this ContentFieldOptionBuilder builder, Type fieldDisplayDriverType)
+    {
+        builder.Services.Configure<ContentDisplayOptions>(o =>
         {
-            return builder.ForEditor(fieldDisplayDriverType, d => true);
-        }
-
-        /// <summary>
-        /// Registers a display driver for use with a specific editor.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentFieldOptionBuilder ForEditor<TContentFieldDisplayDriver>(this ContentFieldOptionBuilder builder, Func<string, bool> predicate)
-            where TContentFieldDisplayDriver : class, IContentFieldDisplayDriver
+            o.RemoveContentFieldDisplayDriver(builder.ContentFieldType, fieldDisplayDriverType);
+        });
+
+        builder.Services.RemoveAll(fieldDisplayDriverType);
+
+        return builder;
+    }
+
+    /// <summary>
+    /// Registers a display driver for use with all display modes.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentFieldOptionBuilder ForDisplayMode<TContentFieldDisplayDriver>(this ContentFieldOptionBuilder builder)
+        where TContentFieldDisplayDriver : class, IContentFieldDisplayDriver
+    {
+        return builder.ForDisplayMode(typeof(TContentFieldDisplayDriver));
+    }
+
+    public static ContentFieldOptionBuilder ForDisplayMode(this ContentFieldOptionBuilder builder, Type fieldDisplayDriverType)
+    {
+        return builder.ForDisplayMode(fieldDisplayDriverType, d => true);
+    }
+
+    /// <summary>
+    /// Registers a display driver for use with a specific display mode.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentFieldOptionBuilder ForDisplayMode<TContentFieldDisplayDriver>(this ContentFieldOptionBuilder builder, Func<string, bool> predicate)
+        where TContentFieldDisplayDriver : class, IContentFieldDisplayDriver
+    {
+        return builder.ForDisplayMode(typeof(TContentFieldDisplayDriver), predicate);
+    }
+
+    /// <summary>
+    /// Registers a display driver for use with a specific display mode.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentFieldOptionBuilder ForDisplayMode(this ContentFieldOptionBuilder builder, Type fieldDisplayDriverType, Func<string, bool> predicate)
+    {
+        builder.Services.Configure<ContentDisplayOptions>(o =>
         {
-            return builder.ForEditor(typeof(TContentFieldDisplayDriver), predicate);
-        }
-
-        /// <summary>
-        /// Registers a display driver for use with a specific editor.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentFieldOptionBuilder ForEditor(this ContentFieldOptionBuilder builder, Type fieldDisplayDriverType, Func<string, bool> predicate)
+            o.ForContentFieldDisplayMode(builder.ContentFieldType, fieldDisplayDriverType, predicate);
+        });
+
+        builder.Services.TryAddScoped(fieldDisplayDriverType);
+
+        return builder;
+    }
+
+    /// <summary>
+    /// Registers a display driver for use with all editors.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentFieldOptionBuilder ForEditor<TContentFieldDisplayDriver>(this ContentFieldOptionBuilder builder)
+        where TContentFieldDisplayDriver : class, IContentFieldDisplayDriver
+    {
+        return builder.ForEditor(typeof(TContentFieldDisplayDriver));
+    }
+
+    /// <summary>
+    /// Registers a display driver for use with a specific editor.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentFieldOptionBuilder ForEditor(this ContentFieldOptionBuilder builder, Type fieldDisplayDriverType)
+    {
+        return builder.ForEditor(fieldDisplayDriverType, d => true);
+    }
+
+    /// <summary>
+    /// Registers a display driver for use with a specific editor.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentFieldOptionBuilder ForEditor<TContentFieldDisplayDriver>(this ContentFieldOptionBuilder builder, Func<string, bool> predicate)
+        where TContentFieldDisplayDriver : class, IContentFieldDisplayDriver
+    {
+        return builder.ForEditor(typeof(TContentFieldDisplayDriver), predicate);
+    }
+
+    /// <summary>
+    /// Registers a display driver for use with a specific editor.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentFieldOptionBuilder ForEditor(this ContentFieldOptionBuilder builder, Type fieldDisplayDriverType, Func<string, bool> predicate)
+    {
+        builder.Services.Configure<ContentDisplayOptions>(o =>
         {
-            builder.Services.Configure<ContentDisplayOptions>(o =>
-            {
-                o.ForContentFieldEditor(builder.ContentFieldType, fieldDisplayDriverType, predicate);
-            });
+            o.ForContentFieldEditor(builder.ContentFieldType, fieldDisplayDriverType, predicate);
+        });
 
-            builder.Services.TryAddScoped(fieldDisplayDriverType);
+        builder.Services.TryAddScoped(fieldDisplayDriverType);
 
-            return builder;
-        }
+        return builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentItemDisplayCoordinator.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentItemDisplayCoordinator.cs
index 9b252670d82..f2292e00481 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentItemDisplayCoordinator.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentItemDisplayCoordinator.cs
@@ -12,50 +12,82 @@
 using OrchardCore.DisplayManagement.Zones;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentManagement.Display
+namespace OrchardCore.ContentManagement.Display;
+
+/// <summary>
+/// Provides a concrete implementation of a display handler coordinating part, field and content item drivers.
+/// </summary>
+public class ContentItemDisplayCoordinator : IContentDisplayHandler
 {
-    /// <summary>
-    /// Provides a concrete implementation of a display handler coordinating part, field and content item drivers.
-    /// </summary>
-    public class ContentItemDisplayCoordinator : IContentDisplayHandler
+    private readonly IContentPartDisplayDriverResolver _contentPartDisplayDriverResolver;
+    private readonly IContentFieldDisplayDriverResolver _contentFieldDisplayDriverResolver;
+    private readonly IEnumerable<IContentDisplayDriver> _displayDrivers;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ITypeActivatorFactory<ContentPart> _contentPartFactory;
+    private readonly ILogger _logger;
+
+    public ContentItemDisplayCoordinator(
+        IContentPartDisplayDriverResolver contentPartDisplayDriverResolver,
+        IContentFieldDisplayDriverResolver contentFieldDisplayDriverResolver,
+        IContentDefinitionManager contentDefinitionManager,
+        IEnumerable<IContentDisplayDriver> displayDrivers,
+        ITypeActivatorFactory<ContentPart> contentPartFactory,
+        ILogger<ContentItemDisplayCoordinator> logger)
     {
-        private readonly IContentPartDisplayDriverResolver _contentPartDisplayDriverResolver;
-        private readonly IContentFieldDisplayDriverResolver _contentFieldDisplayDriverResolver;
-        private readonly IEnumerable<IContentDisplayDriver> _displayDrivers;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly ITypeActivatorFactory<ContentPart> _contentPartFactory;
-        private readonly ILogger _logger;
-
-        public ContentItemDisplayCoordinator(
-            IContentPartDisplayDriverResolver contentPartDisplayDriverResolver,
-            IContentFieldDisplayDriverResolver contentFieldDisplayDriverResolver,
-            IContentDefinitionManager contentDefinitionManager,
-            IEnumerable<IContentDisplayDriver> displayDrivers,
-            ITypeActivatorFactory<ContentPart> contentPartFactory,
-            ILogger<ContentItemDisplayCoordinator> logger)
+        _contentPartDisplayDriverResolver = contentPartDisplayDriverResolver;
+        _contentFieldDisplayDriverResolver = contentFieldDisplayDriverResolver;
+        _contentPartFactory = contentPartFactory;
+        _contentDefinitionManager = contentDefinitionManager;
+        _displayDrivers = displayDrivers;
+        _logger = logger;
+    }
+
+    public async Task BuildDisplayAsync(ContentItem contentItem, BuildDisplayContext context)
+    {
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+
+        if (contentTypeDefinition == null)
         {
-            _contentPartDisplayDriverResolver = contentPartDisplayDriverResolver;
-            _contentFieldDisplayDriverResolver = contentFieldDisplayDriverResolver;
-            _contentPartFactory = contentPartFactory;
-            _contentDefinitionManager = contentDefinitionManager;
-            _displayDrivers = displayDrivers;
-            _logger = logger;
+            return;
         }
 
-        public async Task BuildDisplayAsync(ContentItem contentItem, BuildDisplayContext context)
+        foreach (var displayDriver in _displayDrivers)
         {
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+            try
+            {
+                var result = await displayDriver.BuildDisplayAsync(contentItem, context);
+                if (result != null)
+                {
+                    await result.ApplyAsync(context);
+                }
+            }
+            catch (Exception ex)
+            {
+                InvokeExtensions.HandleException(ex, _logger, displayDriver.GetType().Name, nameof(BuildDisplayAsync));
+            }
+        }
+
+        var hasStereotype = contentTypeDefinition.TryGetStereotype(out var stereotype);
 
-            if (contentTypeDefinition == null)
+        foreach (var contentTypePartDefinition in contentTypeDefinition.Parts)
+        {
+            var partName = contentTypePartDefinition.Name;
+            var partTypeName = contentTypePartDefinition.PartDefinition.Name;
+            var partActivator = _contentPartFactory.GetTypeActivator(partTypeName);
+            var part = contentItem.Get(partActivator.Type, partName) as ContentPart;
+
+            if (part == null)
             {
-                return;
+                continue;
             }
 
-            foreach (var displayDriver in _displayDrivers)
+            var contentType = contentTypePartDefinition.ContentTypeDefinition.Name;
+            var partDisplayDrivers = _contentPartDisplayDriverResolver.GetDisplayModeDrivers(partTypeName, contentTypePartDefinition.DisplayMode());
+            foreach (var partDisplayDriver in partDisplayDrivers)
             {
                 try
                 {
-                    var result = await displayDriver.BuildDisplayAsync(contentItem, context);
+                    var result = await partDisplayDriver.BuildDisplayAsync(part, contentTypePartDefinition, context);
                     if (result != null)
                     {
                         await result.ApplyAsync(context);
@@ -63,344 +95,311 @@ public async Task BuildDisplayAsync(ContentItem contentItem, BuildDisplayContext
                 }
                 catch (Exception ex)
                 {
-                    InvokeExtensions.HandleException(ex, _logger, displayDriver.GetType().Name, nameof(BuildDisplayAsync));
+                    InvokeExtensions.HandleException(ex, _logger, partDisplayDrivers.GetType().Name, nameof(BuildDisplayAsync));
                 }
             }
+            var tempContext = context;
 
-            var hasStereotype = contentTypeDefinition.TryGetStereotype(out var stereotype);
+            // Create a custom ContentPart shape that will hold the fields for dynamic content part (not implicit parts)
+            // This allows its fields to be grouped and templated
 
-            foreach (var contentTypePartDefinition in contentTypeDefinition.Parts)
+            if (part.GetType() == typeof(ContentPart) && partTypeName != contentTypePartDefinition.ContentTypeDefinition.Name)
             {
-                var partName = contentTypePartDefinition.Name;
-                var partTypeName = contentTypePartDefinition.PartDefinition.Name;
-                var partActivator = _contentPartFactory.GetTypeActivator(partTypeName);
-                var part = contentItem.Get(partActivator.Type, partName) as ContentPart;
-
-                if (part == null)
+                var shapeType = context.DisplayType != "Detail" ? "ContentPart_" + context.DisplayType : "ContentPart";
+
+                var shapeResult = new ShapeResult(shapeType, ctx => ctx.ShapeFactory.CreateAsync(shapeType, () => new ValueTask<IShape>(new ZoneHolding(() => ctx.ShapeFactory.CreateAsync("Zone")))));
+                shapeResult.Differentiator(partName);
+                shapeResult.Name(partName);
+                shapeResult.Location("Content");
+                shapeResult.OnGroup(context.GroupId);
+                shapeResult.Displaying(ctx =>
                 {
-                    continue;
-                }
+                    var displayTypes = new[] { string.Empty, "_" + ctx.Shape.Metadata.DisplayType };
 
-                var contentType = contentTypePartDefinition.ContentTypeDefinition.Name;
-                var partDisplayDrivers = _contentPartDisplayDriverResolver.GetDisplayModeDrivers(partTypeName, contentTypePartDefinition.DisplayMode());
-                foreach (var partDisplayDriver in partDisplayDrivers)
-                {
-                    try
+                    foreach (var displayType in displayTypes)
                     {
-                        var result = await partDisplayDriver.BuildDisplayAsync(part, contentTypePartDefinition, context);
-                        if (result != null)
+                        // eg. ServicePart,  ServicePart.Summary
+                        ctx.Shape.Metadata.Alternates.Add($"{partTypeName}{displayType}");
+
+                        // [ContentType]_[DisplayType]__[PartType]
+                        // e.g. LandingPage-ServicePart, LandingPage-ServicePart.Summary
+                        ctx.Shape.Metadata.Alternates.Add($"{contentType}{displayType}__{partTypeName}");
+
+                        if (hasStereotype)
                         {
-                            await result.ApplyAsync(context);
+                            // [Stereotype]_[DisplayType]__[PartType],
+                            // e.g. Widget-ServicePart
+                            ctx.Shape.Metadata.Alternates.Add($"{stereotype}{displayType}__{partTypeName}");
                         }
                     }
-                    catch (Exception ex)
+
+                    if (partTypeName == partName)
                     {
-                        InvokeExtensions.HandleException(ex, _logger, partDisplayDrivers.GetType().Name, nameof(BuildDisplayAsync));
+                        return;
                     }
-                }
-                var tempContext = context;
-
-                // Create a custom ContentPart shape that will hold the fields for dynamic content part (not implicit parts)
-                // This allows its fields to be grouped and templated
 
-                if (part.GetType() == typeof(ContentPart) && partTypeName != contentTypePartDefinition.ContentTypeDefinition.Name)
-                {
-                    var shapeType = context.DisplayType != "Detail" ? "ContentPart_" + context.DisplayType : "ContentPart";
-
-                    var shapeResult = new ShapeResult(shapeType, ctx => ctx.ShapeFactory.CreateAsync(shapeType, () => new ValueTask<IShape>(new ZoneHolding(() => ctx.ShapeFactory.CreateAsync("Zone")))));
-                    shapeResult.Differentiator(partName);
-                    shapeResult.Name(partName);
-                    shapeResult.Location("Content");
-                    shapeResult.OnGroup(context.GroupId);
-                    shapeResult.Displaying(ctx =>
+                    foreach (var displayType in displayTypes)
                     {
-                        var displayTypes = new[] { string.Empty, "_" + ctx.Shape.Metadata.DisplayType };
-
-                        foreach (var displayType in displayTypes)
-                        {
-                            // eg. ServicePart,  ServicePart.Summary
-                            ctx.Shape.Metadata.Alternates.Add($"{partTypeName}{displayType}");
-
-                            // [ContentType]_[DisplayType]__[PartType]
-                            // e.g. LandingPage-ServicePart, LandingPage-ServicePart.Summary
-                            ctx.Shape.Metadata.Alternates.Add($"{contentType}{displayType}__{partTypeName}");
-
-                            if (hasStereotype)
-                            {
-                                // [Stereotype]_[DisplayType]__[PartType],
-                                // e.g. Widget-ServicePart
-                                ctx.Shape.Metadata.Alternates.Add($"{stereotype}{displayType}__{partTypeName}");
-                            }
-                        }
-
-                        if (partTypeName == partName)
-                        {
-                            return;
-                        }
+                        // [ContentType]_[DisplayType]__[PartName]
+                        // e.g. Employee-Address1, Employee-Address2
+                        ctx.Shape.Metadata.Alternates.Add($"{contentType}{displayType}__{partName}");
 
-                        foreach (var displayType in displayTypes)
+                        if (hasStereotype)
                         {
-                            // [ContentType]_[DisplayType]__[PartName]
-                            // e.g. Employee-Address1, Employee-Address2
-                            ctx.Shape.Metadata.Alternates.Add($"{contentType}{displayType}__{partName}");
-
-                            if (hasStereotype)
-                            {
-                                // [Stereotype]_[DisplayType]__[PartType]__[PartName]
-                                // e.g. Widget-Services
-                                ctx.Shape.Metadata.Alternates.Add($"{stereotype}{displayType}__{partTypeName}__{partName}");
-                            }
+                            // [Stereotype]_[DisplayType]__[PartType]__[PartName]
+                            // e.g. Widget-Services
+                            ctx.Shape.Metadata.Alternates.Add($"{stereotype}{displayType}__{partTypeName}__{partName}");
                         }
-                    });
+                    }
+                });
 
-                    await shapeResult.ApplyAsync(context);
+                await shapeResult.ApplyAsync(context);
 
-                    var contentPartShape = shapeResult.Shape;
+                var contentPartShape = shapeResult.Shape;
 
-                    // Make the ContentPart property available on the shape
-                    contentPartShape.Properties[partTypeName] = part.Content;
-                    contentPartShape.Properties["ContentItem"] = part.ContentItem;
+                // Make the ContentPart property available on the shape
+                contentPartShape.Properties[partTypeName] = part.Content;
+                contentPartShape.Properties["ContentItem"] = part.ContentItem;
 
-                    context = new BuildDisplayContext(shapeResult.Shape, context.DisplayType, context.GroupId, context.ShapeFactory, context.Layout, context.Updater)
-                    {
-                        // With a new display context we have the default FindPlacementDelegate that returns null, so we reuse the delegate from the temp context.
-                        FindPlacement = tempContext.FindPlacement,
-                    };
-                }
+                context = new BuildDisplayContext(shapeResult.Shape, context.DisplayType, context.GroupId, context.ShapeFactory, context.Layout, context.Updater)
+                {
+                    // With a new display context we have the default FindPlacementDelegate that returns null, so we reuse the delegate from the temp context.
+                    FindPlacement = tempContext.FindPlacement,
+                };
+            }
 
-                foreach (var contentPartFieldDefinition in contentTypePartDefinition.PartDefinition.Fields)
+            foreach (var contentPartFieldDefinition in contentTypePartDefinition.PartDefinition.Fields)
+            {
+                var fieldDisplayDrivers = _contentFieldDisplayDriverResolver.GetDisplayModeDrivers(contentPartFieldDefinition.FieldDefinition.Name, contentPartFieldDefinition.DisplayMode());
+                foreach (var fieldDisplayDriver in fieldDisplayDrivers)
                 {
-                    var fieldDisplayDrivers = _contentFieldDisplayDriverResolver.GetDisplayModeDrivers(contentPartFieldDefinition.FieldDefinition.Name, contentPartFieldDefinition.DisplayMode());
-                    foreach (var fieldDisplayDriver in fieldDisplayDrivers)
+                    try
                     {
-                        try
-                        {
-                            var result = await fieldDisplayDriver.BuildDisplayAsync(part, contentPartFieldDefinition, contentTypePartDefinition, context);
-                            if (result != null)
-                            {
-                                await result.ApplyAsync(context);
-                            }
-                        }
-                        catch (Exception ex)
+                        var result = await fieldDisplayDriver.BuildDisplayAsync(part, contentPartFieldDefinition, contentTypePartDefinition, context);
+                        if (result != null)
                         {
-                            InvokeExtensions.HandleException(ex, _logger, fieldDisplayDriver.GetType().Name, nameof(BuildDisplayAsync));
+                            await result.ApplyAsync(context);
                         }
                     }
+                    catch (Exception ex)
+                    {
+                        InvokeExtensions.HandleException(ex, _logger, fieldDisplayDriver.GetType().Name, nameof(BuildDisplayAsync));
+                    }
                 }
-
-                context = tempContext;
             }
+
+            context = tempContext;
         }
+    }
 
-        public async Task BuildEditorAsync(ContentItem contentItem, BuildEditorContext context)
+    public async Task BuildEditorAsync(ContentItem contentItem, BuildEditorContext context)
+    {
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+        if (contentTypeDefinition == null)
         {
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
-            if (contentTypeDefinition == null)
-            {
-                return;
-            }
+            return;
+        }
 
-            var contentShape = context.Shape as IZoneHolding;
-            var partsShape = await context.ShapeFactory.CreateAsync("ContentZone",
-                Arguments.From(new
-                {
-                    Identifier = contentItem.ContentItemId
-                }));
+        var contentShape = context.Shape as IZoneHolding;
+        var partsShape = await context.ShapeFactory.CreateAsync("ContentZone",
+            Arguments.From(new
+            {
+                Identifier = contentItem.ContentItemId
+            }));
 
-            contentShape.Zones["Parts"] = partsShape;
+        contentShape.Zones["Parts"] = partsShape;
 
-            foreach (var displayDriver in _displayDrivers)
+        foreach (var displayDriver in _displayDrivers)
+        {
+            try
             {
-                try
-                {
-                    var result = await displayDriver.BuildEditorAsync(contentItem, context);
-                    if (result != null)
-                    {
-                        await result.ApplyAsync(context);
-                    }
-                }
-                catch (Exception ex)
+                var result = await displayDriver.BuildEditorAsync(contentItem, context);
+                if (result != null)
                 {
-                    InvokeExtensions.HandleException(ex, _logger, displayDriver.GetType().Name, nameof(BuildEditorAsync));
+                    await result.ApplyAsync(context);
                 }
             }
+            catch (Exception ex)
+            {
+                InvokeExtensions.HandleException(ex, _logger, displayDriver.GetType().Name, nameof(BuildEditorAsync));
+            }
+        }
 
-            foreach (var typePartDefinition in contentTypeDefinition.Parts)
+        foreach (var typePartDefinition in contentTypeDefinition.Parts)
+        {
+            var partTypeName = typePartDefinition.PartDefinition.Name;
+            var partName = typePartDefinition.Name;
+            var contentType = typePartDefinition.ContentTypeDefinition.Name;
+            var activator = _contentPartFactory.GetTypeActivator(partTypeName);
+            var part = (ContentPart)contentItem.Get(activator.Type, partName) ?? activator.CreateInstance();
+            var partPosition = typePartDefinition.GetSettings<ContentTypePartSettings>().Position ?? "before";
+            part.ContentItem = contentItem;
+
+            // Create a custom shape to render all the part shapes into it
+            var typePartShapeResult = CreateShapeResult(context.GroupId, partTypeName, contentType, typePartDefinition, partPosition);
+
+            await typePartShapeResult.ApplyAsync(context);
+            var typePartShape = typePartShapeResult.Shape;
+
+            if (typePartShape == null)
             {
-                var partTypeName = typePartDefinition.PartDefinition.Name;
-                var partName = typePartDefinition.Name;
-                var contentType = typePartDefinition.ContentTypeDefinition.Name;
-                var activator = _contentPartFactory.GetTypeActivator(partTypeName);
-                var part = (ContentPart)contentItem.Get(activator.Type, partName) ?? activator.CreateInstance();
-                var partPosition = typePartDefinition.GetSettings<ContentTypePartSettings>().Position ?? "before";
-                part.ContentItem = contentItem;
+                // Part is explicitly noop in placement then stop rendering execution
+                continue;
+            }
 
-                // Create a custom shape to render all the part shapes into it
-                var typePartShapeResult = CreateShapeResult(context.GroupId, partTypeName, contentType, typePartDefinition, partPosition);
+            typePartShape.Properties["ContentPart"] = part;
+            typePartShape.Properties["ContentTypePartDefinition"] = typePartDefinition;
+            partsShape.Properties[partName] = typePartShape;
 
-                await typePartShapeResult.ApplyAsync(context);
-                var typePartShape = typePartShapeResult.Shape;
+            context.DefaultZone = $"Parts.{partName}";
+            context.DefaultPosition = partPosition;
 
-                if (typePartShape == null)
+            var partDisplayDrivers = _contentPartDisplayDriverResolver.GetEditorDrivers(partTypeName, typePartDefinition.Editor());
+            await partDisplayDrivers.InvokeAsync(async (driver, part, typePartDefinition, context) =>
+            {
+                var result = await driver.BuildEditorAsync(part, typePartDefinition, context);
+                if (result != null)
                 {
-                    // Part is explicitly noop in placement then stop rendering execution
-                    continue;
+                    await result.ApplyAsync(context);
                 }
+            }, part, typePartDefinition, context, _logger);
 
-                typePartShape.Properties["ContentPart"] = part;
-                typePartShape.Properties["ContentTypePartDefinition"] = typePartDefinition;
-                partsShape.Properties[partName] = typePartShape;
-
-                context.DefaultZone = $"Parts.{partName}";
-                context.DefaultPosition = partPosition;
+            foreach (var partFieldDefinition in typePartDefinition.PartDefinition.Fields)
+            {
+                var fieldName = partFieldDefinition.Name;
+                var fieldPosition = partFieldDefinition.GetSettings<ContentPartFieldSettings>().Position ?? "before";
 
-                var partDisplayDrivers = _contentPartDisplayDriverResolver.GetEditorDrivers(partTypeName, typePartDefinition.Editor());
-                await partDisplayDrivers.InvokeAsync(async (driver, part, typePartDefinition, context) =>
+                context.DefaultZone = $"Parts.{partName}:{fieldPosition}";
+                var fieldDisplayDrivers = _contentFieldDisplayDriverResolver.GetEditorDrivers(partFieldDefinition.FieldDefinition.Name, partFieldDefinition.Editor());
+                await fieldDisplayDrivers.InvokeAsync(async (driver, part, partFieldDefinition, typePartDefinition, context) =>
                 {
-                    var result = await driver.BuildEditorAsync(part, typePartDefinition, context);
+                    var result = await driver.BuildEditorAsync(part, partFieldDefinition, typePartDefinition, context);
                     if (result != null)
                     {
                         await result.ApplyAsync(context);
                     }
-                }, part, typePartDefinition, context, _logger);
-
-                foreach (var partFieldDefinition in typePartDefinition.PartDefinition.Fields)
-                {
-                    var fieldName = partFieldDefinition.Name;
-                    var fieldPosition = partFieldDefinition.GetSettings<ContentPartFieldSettings>().Position ?? "before";
-
-                    context.DefaultZone = $"Parts.{partName}:{fieldPosition}";
-                    var fieldDisplayDrivers = _contentFieldDisplayDriverResolver.GetEditorDrivers(partFieldDefinition.FieldDefinition.Name, partFieldDefinition.Editor());
-                    await fieldDisplayDrivers.InvokeAsync(async (driver, part, partFieldDefinition, typePartDefinition, context) =>
-                    {
-                        var result = await driver.BuildEditorAsync(part, partFieldDefinition, typePartDefinition, context);
-                        if (result != null)
-                        {
-                            await result.ApplyAsync(context);
-                        }
-                    }, part, partFieldDefinition, typePartDefinition, context, _logger);
-                }
+                }, part, partFieldDefinition, typePartDefinition, context, _logger);
             }
         }
+    }
 
-        public async Task UpdateEditorAsync(ContentItem contentItem, UpdateEditorContext context)
-        {
-            var contentTypeDefinition = await _contentDefinitionManager.LoadTypeDefinitionAsync(contentItem.ContentType);
-            if (contentTypeDefinition == null)
-                return;
+    public async Task UpdateEditorAsync(ContentItem contentItem, UpdateEditorContext context)
+    {
+        var contentTypeDefinition = await _contentDefinitionManager.LoadTypeDefinitionAsync(contentItem.ContentType);
+        if (contentTypeDefinition == null)
+            return;
 
-            var contentShape = context.Shape as IZoneHolding;
-            var partsShape = await context.ShapeFactory.CreateAsync("ContentZone",
-                Arguments.From(new
-                {
-                    Identifier = contentItem.ContentItemId
-                }));
+        var contentShape = context.Shape as IZoneHolding;
+        var partsShape = await context.ShapeFactory.CreateAsync("ContentZone",
+            Arguments.From(new
+            {
+                Identifier = contentItem.ContentItemId
+            }));
 
-            contentShape.Zones["Parts"] = partsShape;
+        contentShape.Zones["Parts"] = partsShape;
 
-            foreach (var displayDriver in _displayDrivers)
+        foreach (var displayDriver in _displayDrivers)
+        {
+            try
             {
-                try
-                {
-                    var result = await displayDriver.UpdateEditorAsync(contentItem, context);
-                    if (result != null)
-                    {
-                        await result.ApplyAsync(context);
-                    }
-                }
-                catch (Exception ex)
+                var result = await displayDriver.UpdateEditorAsync(contentItem, context);
+                if (result != null)
                 {
-                    InvokeExtensions.HandleException(ex, _logger, displayDriver.GetType().Name, nameof(UpdateEditorAsync));
+                    await result.ApplyAsync(context);
                 }
             }
-
-            foreach (var typePartDefinition in contentTypeDefinition.Parts)
+            catch (Exception ex)
             {
-                var partTypeName = typePartDefinition.PartDefinition.Name;
-                var partName = typePartDefinition.Name;
-                var contentType = typePartDefinition.ContentTypeDefinition.Name;
-                var activator = _contentPartFactory.GetTypeActivator(partTypeName);
-                var part = (ContentPart)contentItem.Get(activator.Type, partName) ?? activator.CreateInstance();
-                var partPosition = typePartDefinition.GetSettings<ContentTypePartSettings>().Position ?? "before";
-                part.ContentItem = contentItem;
+                InvokeExtensions.HandleException(ex, _logger, displayDriver.GetType().Name, nameof(UpdateEditorAsync));
+            }
+        }
 
-                // Create a custom shape to render all the part shapes into it
-                var typePartShapeResult = CreateShapeResult(context.GroupId, partTypeName, contentType, typePartDefinition, partPosition);
+        foreach (var typePartDefinition in contentTypeDefinition.Parts)
+        {
+            var partTypeName = typePartDefinition.PartDefinition.Name;
+            var partName = typePartDefinition.Name;
+            var contentType = typePartDefinition.ContentTypeDefinition.Name;
+            var activator = _contentPartFactory.GetTypeActivator(partTypeName);
+            var part = (ContentPart)contentItem.Get(activator.Type, partName) ?? activator.CreateInstance();
+            var partPosition = typePartDefinition.GetSettings<ContentTypePartSettings>().Position ?? "before";
+            part.ContentItem = contentItem;
 
-                await typePartShapeResult.ApplyAsync(context);
-                var typePartShape = typePartShapeResult.Shape;
+            // Create a custom shape to render all the part shapes into it
+            var typePartShapeResult = CreateShapeResult(context.GroupId, partTypeName, contentType, typePartDefinition, partPosition);
 
-                if (typePartShape == null)
+            await typePartShapeResult.ApplyAsync(context);
+            var typePartShape = typePartShapeResult.Shape;
+
+            if (typePartShape == null)
+            {
+                // Part is explicitly hidden in placement then stop rendering it
+                continue;
+            }
+
+            typePartShape.Properties["ContentPart"] = part;
+            typePartShape.Properties["ContentTypePartDefinition"] = typePartDefinition;
+            partsShape.Properties[partName] = typePartShape;
+
+            context.DefaultZone = $"Parts.{partName}:{partPosition}";
+            var partDisplayDrivers = _contentPartDisplayDriverResolver.GetEditorDrivers(partTypeName, typePartDefinition.Editor());
+            await partDisplayDrivers.InvokeAsync(async (driver, part, typePartDefinition, context) =>
+            {
+                var result = await driver.UpdateEditorAsync(part, typePartDefinition, context);
+                if (result != null)
                 {
-                    // Part is explicitly hidden in placement then stop rendering it
-                    continue;
+                    await result.ApplyAsync(context);
                 }
+            }, part, typePartDefinition, context, _logger);
 
-                typePartShape.Properties["ContentPart"] = part;
-                typePartShape.Properties["ContentTypePartDefinition"] = typePartDefinition;
-                partsShape.Properties[partName] = typePartShape;
+            foreach (var partFieldDefinition in typePartDefinition.PartDefinition.Fields)
+            {
+                var fieldName = partFieldDefinition.Name;
+                var fieldPosition = partFieldDefinition.GetSettings<ContentPartFieldSettings>().Position ?? "before";
 
-                context.DefaultZone = $"Parts.{partName}:{partPosition}";
-                var partDisplayDrivers = _contentPartDisplayDriverResolver.GetEditorDrivers(partTypeName, typePartDefinition.Editor());
-                await partDisplayDrivers.InvokeAsync(async (driver, part, typePartDefinition, context) =>
+                context.DefaultZone = $"Parts.{partName}:{fieldPosition}";
+                var fieldDisplayDrivers = _contentFieldDisplayDriverResolver.GetEditorDrivers(partFieldDefinition.FieldDefinition.Name, partFieldDefinition.Editor());
+                await fieldDisplayDrivers.InvokeAsync(async (driver, part, partFieldDefinition, typePartDefinition, context) =>
                 {
-                    var result = await driver.UpdateEditorAsync(part, typePartDefinition, context);
+                    var result = await driver.UpdateEditorAsync(part, partFieldDefinition, typePartDefinition, context);
                     if (result != null)
                     {
                         await result.ApplyAsync(context);
                     }
-                }, part, typePartDefinition, context, _logger);
-
-                foreach (var partFieldDefinition in typePartDefinition.PartDefinition.Fields)
-                {
-                    var fieldName = partFieldDefinition.Name;
-                    var fieldPosition = partFieldDefinition.GetSettings<ContentPartFieldSettings>().Position ?? "before";
-
-                    context.DefaultZone = $"Parts.{partName}:{fieldPosition}";
-                    var fieldDisplayDrivers = _contentFieldDisplayDriverResolver.GetEditorDrivers(partFieldDefinition.FieldDefinition.Name, partFieldDefinition.Editor());
-                    await fieldDisplayDrivers.InvokeAsync(async (driver, part, partFieldDefinition, typePartDefinition, context) =>
-                    {
-                        var result = await driver.UpdateEditorAsync(part, partFieldDefinition, typePartDefinition, context);
-                        if (result != null)
-                        {
-                            await result.ApplyAsync(context);
-                        }
-                    }, part, partFieldDefinition, typePartDefinition, context, _logger);
-                }
+                }, part, partFieldDefinition, typePartDefinition, context, _logger);
             }
         }
+    }
 
-        private static ShapeResult CreateShapeResult(string groupId, string partTypeName, string contentType, ContentTypePartDefinition typePartDefinition, string partPosition)
+    private static ShapeResult CreateShapeResult(string groupId, string partTypeName, string contentType, ContentTypePartDefinition typePartDefinition, string partPosition)
+    {
+        var shapeType = "ContentPart_Edit";
+        var partName = typePartDefinition.Name;
+
+        var typePartShapeResult = new ShapeResult(shapeType, ctx => ctx.ShapeFactory.CreateAsync(shapeType));
+        typePartShapeResult.Differentiator($"{contentType}-{partName}");
+        typePartShapeResult.Name(partName);
+        typePartShapeResult.Location($"Parts:{partPosition}");
+        typePartShapeResult.OnGroup(groupId);
+        typePartShapeResult.Displaying(ctx =>
         {
-            var shapeType = "ContentPart_Edit";
-            var partName = typePartDefinition.Name;
-
-            var typePartShapeResult = new ShapeResult(shapeType, ctx => ctx.ShapeFactory.CreateAsync(shapeType));
-            typePartShapeResult.Differentiator($"{contentType}-{partName}");
-            typePartShapeResult.Name(partName);
-            typePartShapeResult.Location($"Parts:{partPosition}");
-            typePartShapeResult.OnGroup(groupId);
-            typePartShapeResult.Displaying(ctx =>
-            {
-                // ContentPart_Edit__[PartType]
-                // eg ContentPart-ServicePart.Edit
-                ctx.Shape.Metadata.Alternates.Add($"{shapeType}__{partTypeName}");
+            // ContentPart_Edit__[PartType]
+            // eg ContentPart-ServicePart.Edit
+            ctx.Shape.Metadata.Alternates.Add($"{shapeType}__{partTypeName}");
 
-                // ContentPart_Edit__[ContentType]__[PartType]
-                // e.g. ContentPart-LandingPage-ServicePart.Edit
-                ctx.Shape.Metadata.Alternates.Add($"{shapeType}__{contentType}__{partTypeName}");
+            // ContentPart_Edit__[ContentType]__[PartType]
+            // e.g. ContentPart-LandingPage-ServicePart.Edit
+            ctx.Shape.Metadata.Alternates.Add($"{shapeType}__{contentType}__{partTypeName}");
 
-                var isNamedPart = typePartDefinition.PartDefinition.IsReusable() && partName != partTypeName;
+            var isNamedPart = typePartDefinition.PartDefinition.IsReusable() && partName != partTypeName;
 
-                if (isNamedPart)
-                {
-                    // ContentPart_Edit__[ContentType]__[PartName]
-                    // e.g. ContentPart-LandingPage-BillingService.Edit ContentPart-LandingPage-HelplineService.Edit
-                    ctx.Shape.Metadata.Alternates.Add($"{shapeType}__{contentType}__{partName}");
-                }
-            });
+            if (isNamedPart)
+            {
+                // ContentPart_Edit__[ContentType]__[PartName]
+                // e.g. ContentPart-LandingPage-BillingService.Edit ContentPart-LandingPage-HelplineService.Edit
+                ctx.Shape.Metadata.Alternates.Add($"{shapeType}__{contentType}__{partName}");
+            }
+        });
 
-            return typePartShapeResult;
-        }
+        return typePartShapeResult;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartDisplayDriverOption.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartDisplayDriverOption.cs
index 4dd12c7e671..d71092d18e1 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartDisplayDriverOption.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartDisplayDriverOption.cs
@@ -1,28 +1,27 @@
 using System;
 
-namespace OrchardCore.ContentManagement.Display.ContentDisplay
+namespace OrchardCore.ContentManagement.Display.ContentDisplay;
+
+public class ContentPartDisplayDriverOption
 {
-    public class ContentPartDisplayDriverOption
+    public ContentPartDisplayDriverOption(Type displayDriverType)
     {
-        public ContentPartDisplayDriverOption(Type displayDriverType)
-        {
-            DisplayDriverType = displayDriverType;
-        }
+        DisplayDriverType = displayDriverType;
+    }
 
-        public Type DisplayDriverType { get; }
+    public Type DisplayDriverType { get; }
 
-        public Func<string, bool> DisplayMode { get; private set; }
+    public Func<string, bool> DisplayMode { get; private set; }
 
-        public Func<string, bool> Editor { get; private set; }
+    public Func<string, bool> Editor { get; private set; }
 
-        internal void SetDisplayMode(Func<string, bool> displayMode)
-        {
-            DisplayMode = displayMode;
-        }
+    internal void SetDisplayMode(Func<string, bool> displayMode)
+    {
+        DisplayMode = displayMode;
+    }
 
-        internal void SetEditor(Func<string, bool> editor)
-        {
-            Editor = editor;
-        }
+    internal void SetEditor(Func<string, bool> editor)
+    {
+        Editor = editor;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartDisplayDriverResolver.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartDisplayDriverResolver.cs
index 773309c3f61..3052a188837 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartDisplayDriverResolver.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartDisplayDriverResolver.cs
@@ -3,55 +3,54 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.ContentManagement.Display.ContentDisplay
+namespace OrchardCore.ContentManagement.Display.ContentDisplay;
+
+public class ContentPartDisplayDriverResolver : IContentPartDisplayDriverResolver
 {
-    public class ContentPartDisplayDriverResolver : IContentPartDisplayDriverResolver
+    private readonly IServiceProvider _serviceProvider;
+    private readonly ContentDisplayOptions _contentDisplayOptions;
+    public ContentPartDisplayDriverResolver(
+        IServiceProvider serviceProvider,
+        IOptions<ContentDisplayOptions> contentDisplayOptions
+        )
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly ContentDisplayOptions _contentDisplayOptions;
-        public ContentPartDisplayDriverResolver(
-            IServiceProvider serviceProvider,
-            IOptions<ContentDisplayOptions> contentDisplayOptions
-            )
-        {
-            _serviceProvider = serviceProvider;
-            _contentDisplayOptions = contentDisplayOptions.Value;
-        }
+        _serviceProvider = serviceProvider;
+        _contentDisplayOptions = contentDisplayOptions.Value;
+    }
 
-        public IList<IContentPartDisplayDriver> GetDisplayModeDrivers(string partName, string displayMode)
-        {
-            var services = new List<IContentPartDisplayDriver>();
+    public IList<IContentPartDisplayDriver> GetDisplayModeDrivers(string partName, string displayMode)
+    {
+        var services = new List<IContentPartDisplayDriver>();
 
-            if (_contentDisplayOptions.ContentPartOptions.TryGetValue(partName, out var contentPartDisplayOption))
+        if (_contentDisplayOptions.ContentPartOptions.TryGetValue(partName, out var contentPartDisplayOption))
+        {
+            foreach (var displayDriverOption in contentPartDisplayOption.DisplayDrivers)
             {
-                foreach (var displayDriverOption in contentPartDisplayOption.DisplayDrivers)
+                if (displayDriverOption.DisplayMode.Invoke(displayMode))
                 {
-                    if (displayDriverOption.DisplayMode.Invoke(displayMode))
-                    {
-                        services.Add((IContentPartDisplayDriver)_serviceProvider.GetRequiredService(displayDriverOption.DisplayDriverType));
-                    }
+                    services.Add((IContentPartDisplayDriver)_serviceProvider.GetRequiredService(displayDriverOption.DisplayDriverType));
                 }
             }
-
-            return services;
         }
 
-        public IList<IContentPartDisplayDriver> GetEditorDrivers(string partName, string editor)
-        {
-            var services = new List<IContentPartDisplayDriver>();
+        return services;
+    }
+
+    public IList<IContentPartDisplayDriver> GetEditorDrivers(string partName, string editor)
+    {
+        var services = new List<IContentPartDisplayDriver>();
 
-            if (_contentDisplayOptions.ContentPartOptions.TryGetValue(partName, out var contentPartDisplayOption))
+        if (_contentDisplayOptions.ContentPartOptions.TryGetValue(partName, out var contentPartDisplayOption))
+        {
+            foreach (var editorDriverOption in contentPartDisplayOption.EditorDrivers)
             {
-                foreach (var editorDriverOption in contentPartDisplayOption.EditorDrivers)
+                if (editorDriverOption.Editor.Invoke(editor))
                 {
-                    if (editorDriverOption.Editor.Invoke(editor))
-                    {
-                        services.Add((IContentPartDisplayDriver)_serviceProvider.GetRequiredService(editorDriverOption.DisplayDriverType));
-                    }
+                    services.Add((IContentPartDisplayDriver)_serviceProvider.GetRequiredService(editorDriverOption.DisplayDriverType));
                 }
             }
-
-            return services;
         }
+
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartDisplayDriverTPart.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartDisplayDriverTPart.cs
index 26db8564e9e..e9be971474b 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartDisplayDriverTPart.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartDisplayDriverTPart.cs
@@ -8,362 +8,361 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentManagement.Display.ContentDisplay
+namespace OrchardCore.ContentManagement.Display.ContentDisplay;
+
+/// <summary>
+/// Any concrete implementation of this class can provide shapes for any content item which has a specific Part.
+/// </summary>
+/// <typeparam name="TPart"></typeparam>
+public abstract class ContentPartDisplayDriver<TPart> : DisplayDriverBase, IContentPartDisplayDriver where TPart : ContentPart, new()
 {
-    /// <summary>
-    /// Any concrete implementation of this class can provide shapes for any content item which has a specific Part.
-    /// </summary>
-    /// <typeparam name="TPart"></typeparam>
-    public abstract class ContentPartDisplayDriver<TPart> : DisplayDriverBase, IContentPartDisplayDriver where TPart : ContentPart, new()
+    private const string DisplayToken = "_Display";
+    private const string DisplaySeparator = "_Display__";
+
+    private ContentTypePartDefinition _typePartDefinition;
+
+    public override ShapeResult Factory(string shapeType, Func<IBuildShapeContext, ValueTask<IShape>> shapeBuilder, Func<IShape, Task> initializeAsync)
     {
-        private const string DisplayToken = "_Display";
-        private const string DisplaySeparator = "_Display__";
+        // e.g., HtmlBodyPart.Summary, HtmlBodyPart-BlogPost, BagPart-LandingPage-Services
+        // context.Shape is the ContentItem shape, we need to alter the part shape
 
-        private ContentTypePartDefinition _typePartDefinition;
+        var result = base.Factory(shapeType, shapeBuilder, initializeAsync).Prefix(Prefix);
 
-        public override ShapeResult Factory(string shapeType, Func<IBuildShapeContext, ValueTask<IShape>> shapeBuilder, Func<IShape, Task> initializeAsync)
+        if (_typePartDefinition != null)
         {
-            // e.g., HtmlBodyPart.Summary, HtmlBodyPart-BlogPost, BagPart-LandingPage-Services
-            // context.Shape is the ContentItem shape, we need to alter the part shape
+            // The stereotype is used when not displaying for a specific content type. We don't use [Stereotype] and [ContentType] at
+            // the same time in an alternate because a content type is always of one stereotype.
+
+            var partName = _typePartDefinition.Name;
+            var partType = _typePartDefinition.PartDefinition.Name;
+            var contentType = _typePartDefinition.ContentTypeDefinition.Name;
+            var editorPartType = GetEditorShapeType(_typePartDefinition);
+            var displayMode = _typePartDefinition.DisplayMode();
+            var hasDisplayMode = !string.IsNullOrEmpty(displayMode);
+            var isDisplayModeShapeType = shapeType == partType + DisplaySeparator + displayMode;
+            var stereotype = _typePartDefinition.ContentTypeDefinition.GetStereotype() ?? string.Empty;
+
+            // If the shape type and the field type only differ by the display mode
+            if (hasDisplayMode && isDisplayModeShapeType)
+            {
+                // Preserve the shape name regardless its differentiator
+                result.Name(partName);
+            }
 
-            var result = base.Factory(shapeType, shapeBuilder, initializeAsync).Prefix(Prefix);
+            if (partType == shapeType || editorPartType == shapeType || isDisplayModeShapeType)
+            {
+                // HtmlBodyPart, Services
+                result.Differentiator(partName);
+            }
+            else
+            {
+                // ListPart-ListPartFeed
+                result.Differentiator($"{partName}-{shapeType}");
+            }
 
-            if (_typePartDefinition != null)
+            result.Displaying(ctx =>
             {
-                // The stereotype is used when not displaying for a specific content type. We don't use [Stereotype] and [ContentType] at
-                // the same time in an alternate because a content type is always of one stereotype.
-
-                var partName = _typePartDefinition.Name;
-                var partType = _typePartDefinition.PartDefinition.Name;
-                var contentType = _typePartDefinition.ContentTypeDefinition.Name;
-                var editorPartType = GetEditorShapeType(_typePartDefinition);
-                var displayMode = _typePartDefinition.DisplayMode();
-                var hasDisplayMode = !string.IsNullOrEmpty(displayMode);
-                var isDisplayModeShapeType = shapeType == partType + DisplaySeparator + displayMode;
-                var stereotype = _typePartDefinition.ContentTypeDefinition.GetStereotype() ?? string.Empty;
-
-                // If the shape type and the field type only differ by the display mode
-                if (hasDisplayMode && isDisplayModeShapeType)
-                {
-                    // Preserve the shape name regardless its differentiator
-                    result.Name(partName);
-                }
+                string[] displayTypes;
 
-                if (partType == shapeType || editorPartType == shapeType || isDisplayModeShapeType)
+                if (editorPartType == shapeType)
                 {
-                    // HtmlBodyPart, Services
-                    result.Differentiator(partName);
+                    displayTypes = ["_" + ctx.Shape.Metadata.DisplayType];
                 }
                 else
                 {
-                    // ListPart-ListPartFeed
-                    result.Differentiator($"{partName}-{shapeType}");
-                }
-
-                result.Displaying(ctx =>
-                {
-                    string[] displayTypes;
+                    displayTypes = ["", "_" + ctx.Shape.Metadata.DisplayType];
 
-                    if (editorPartType == shapeType)
+                    if (!isDisplayModeShapeType)
                     {
-                        displayTypes = ["_" + ctx.Shape.Metadata.DisplayType];
+                        // Do not add  Display type suffix to display mode shapes since display modes are already existing custom shapes.
+                        // [ShapeType]_[DisplayType], e.g. HtmlBodyPart.Summary, BagPart.Summary, ListPartFeed.Summary
+                        ctx.Shape.Metadata.Alternates.Add($"{shapeType}_{ctx.Shape.Metadata.DisplayType}");
                     }
-                    else
+                }
+
+                if (shapeType == partType || shapeType == editorPartType)
+                {
+                    foreach (var displayType in displayTypes)
                     {
-                        displayTypes = ["", "_" + ctx.Shape.Metadata.DisplayType];
+                        // [ContentType]_[DisplayType]__[PartType], e.g. Blog-HtmlBodyPart, LandingPage-BagPart
+                        ctx.Shape.Metadata.Alternates.Add($"{contentType}{displayType}__{partType}");
 
-                        if (!isDisplayModeShapeType)
+                        if (!string.IsNullOrEmpty(stereotype))
                         {
-                            // Do not add  Display type suffix to display mode shapes since display modes are already existing custom shapes.
-                            // [ShapeType]_[DisplayType], e.g. HtmlBodyPart.Summary, BagPart.Summary, ListPartFeed.Summary
-                            ctx.Shape.Metadata.Alternates.Add($"{shapeType}_{ctx.Shape.Metadata.DisplayType}");
+                            // [Stereotype]__[DisplayType]__[PartType], e.g. Widget-ContentsMetadata
+                            ctx.Shape.Metadata.Alternates.Add($"{stereotype}{displayType}__{partType}");
                         }
                     }
 
-                    if (shapeType == partType || shapeType == editorPartType)
+                    if (partType != partName)
                     {
                         foreach (var displayType in displayTypes)
                         {
-                            // [ContentType]_[DisplayType]__[PartType], e.g. Blog-HtmlBodyPart, LandingPage-BagPart
-                            ctx.Shape.Metadata.Alternates.Add($"{contentType}{displayType}__{partType}");
+                            // [ContentType]_[DisplayType]__[PartName], e.g. LandingPage-Services
+                            ctx.Shape.Metadata.Alternates.Add($"{contentType}{displayType}__{partName}");
 
                             if (!string.IsNullOrEmpty(stereotype))
                             {
-                                // [Stereotype]__[DisplayType]__[PartType], e.g. Widget-ContentsMetadata
-                                ctx.Shape.Metadata.Alternates.Add($"{stereotype}{displayType}__{partType}");
-                            }
-                        }
-
-                        if (partType != partName)
-                        {
-                            foreach (var displayType in displayTypes)
-                            {
-                                // [ContentType]_[DisplayType]__[PartName], e.g. LandingPage-Services
-                                ctx.Shape.Metadata.Alternates.Add($"{contentType}{displayType}__{partName}");
-
-                                if (!string.IsNullOrEmpty(stereotype))
-                                {
-                                    // [Stereotype]_[DisplayType]__[PartType]__[PartName], e.g. Widget-ServicePart-Services
-                                    ctx.Shape.Metadata.Alternates.Add($"{stereotype}{displayType}__{partType}__{partName}");
-                                }
+                                // [Stereotype]_[DisplayType]__[PartType]__[PartName], e.g. Widget-ServicePart-Services
+                                ctx.Shape.Metadata.Alternates.Add($"{stereotype}{displayType}__{partType}__{partName}");
                             }
                         }
                     }
-                    else
+                }
+                else
+                {
+                    if (hasDisplayMode)
                     {
-                        if (hasDisplayMode)
-                        {
-                            // [PartType]_[DisplayType]__[DisplayMode]_Display, e.g. HtmlBodyPart-MyDisplayMode.Display.Summary
-                            ctx.Shape.Metadata.Alternates.Add($"{partType}_{ctx.Shape.Metadata.DisplayType}__{displayMode}{DisplayToken}");
-                        }
+                        // [PartType]_[DisplayType]__[DisplayMode]_Display, e.g. HtmlBodyPart-MyDisplayMode.Display.Summary
+                        ctx.Shape.Metadata.Alternates.Add($"{partType}_{ctx.Shape.Metadata.DisplayType}__{displayMode}{DisplayToken}");
+                    }
 
-                        var lastAlternatesOfNamedPart = new List<string>();
+                    var lastAlternatesOfNamedPart = new List<string>();
 
-                        foreach (var displayType in displayTypes)
-                        {
-                            var shapeTypeSuffix = shapeType;
-                            var displayTypeDisplayToken = displayType;
+                    foreach (var displayType in displayTypes)
+                    {
+                        var shapeTypeSuffix = shapeType;
+                        var displayTypeDisplayToken = displayType;
 
-                            if (hasDisplayMode)
+                        if (hasDisplayMode)
+                        {
+                            if (isDisplayModeShapeType)
                             {
-                                if (isDisplayModeShapeType)
-                                {
-                                    // In case of display mode, update shape type to only include DisplayMode and DisplayToken
-                                    shapeTypeSuffix = displayMode;
-                                }
-                                else
-                                {
-                                    shapeTypeSuffix = $"{shapeTypeSuffix}__{displayMode}";
-                                }
-
-                                if (displayType == "")
-                                {
-                                    displayTypeDisplayToken = DisplayToken;
-                                }
-                                else
-                                {
-                                    shapeTypeSuffix = $"{shapeTypeSuffix}{DisplayToken}";
-                                }
+                                // In case of display mode, update shape type to only include DisplayMode and DisplayToken
+                                shapeTypeSuffix = displayMode;
                             }
-
-                            // [ContentType]_[DisplayType]__[PartType]__[ShapeType], e.g. Blog-ListPart-ListPartFeed
-                            ctx.Shape.Metadata.Alternates.Add($"{contentType}{displayTypeDisplayToken}__{partType}__{shapeTypeSuffix}");
-
-                            if (!string.IsNullOrEmpty(stereotype))
+                            else
                             {
-                                // [Stereotype]_[DisplayType]__[PartType]__[ShapeType], e.g. Blog-ListPart-ListPartFeed
-                                ctx.Shape.Metadata.Alternates.Add($"{stereotype}{displayTypeDisplayToken}__{partType}__{shapeTypeSuffix}");
+                                shapeTypeSuffix = $"{shapeTypeSuffix}__{displayMode}";
                             }
 
-                            if (partType != partName)
+                            if (displayType == "")
+                            {
+                                displayTypeDisplayToken = DisplayToken;
+                            }
+                            else
                             {
-                                // [ContentType]_[DisplayType]__[PartName]__[ShapeType], e.g. LandingPage-Services-BagPartSummary
-                                lastAlternatesOfNamedPart.Add($"{contentType}{displayTypeDisplayToken}__{partName}__{shapeTypeSuffix}");
-
-                                if (!string.IsNullOrEmpty(stereotype))
-                                {
-                                    // [Stereotype]_[DisplayType]__[PartType]__[PartName]__[ShapeType], e.g. Widget-ServicePart-Services-BagPartSummary
-                                    lastAlternatesOfNamedPart.Add($"{stereotype}{displayTypeDisplayToken}__{partType}__{partName}__{shapeTypeSuffix}");
-                                }
+                                shapeTypeSuffix = $"{shapeTypeSuffix}{DisplayToken}";
                             }
                         }
 
-                        ctx.Shape.Metadata.Alternates.AddRange(lastAlternatesOfNamedPart);
+                        // [ContentType]_[DisplayType]__[PartType]__[ShapeType], e.g. Blog-ListPart-ListPartFeed
+                        ctx.Shape.Metadata.Alternates.Add($"{contentType}{displayTypeDisplayToken}__{partType}__{shapeTypeSuffix}");
+
+                        if (!string.IsNullOrEmpty(stereotype))
+                        {
+                            // [Stereotype]_[DisplayType]__[PartType]__[ShapeType], e.g. Blog-ListPart-ListPartFeed
+                            ctx.Shape.Metadata.Alternates.Add($"{stereotype}{displayTypeDisplayToken}__{partType}__{shapeTypeSuffix}");
+                        }
+
+                        if (partType != partName)
+                        {
+                            // [ContentType]_[DisplayType]__[PartName]__[ShapeType], e.g. LandingPage-Services-BagPartSummary
+                            lastAlternatesOfNamedPart.Add($"{contentType}{displayTypeDisplayToken}__{partName}__{shapeTypeSuffix}");
+
+                            if (!string.IsNullOrEmpty(stereotype))
+                            {
+                                // [Stereotype]_[DisplayType]__[PartType]__[PartName]__[ShapeType], e.g. Widget-ServicePart-Services-BagPartSummary
+                                lastAlternatesOfNamedPart.Add($"{stereotype}{displayTypeDisplayToken}__{partType}__{partName}__{shapeTypeSuffix}");
+                            }
+                        }
                     }
-                });
-            }
 
-            return result;
+                    ctx.Shape.Metadata.Alternates.AddRange(lastAlternatesOfNamedPart);
+                }
+            });
         }
 
-        async Task<IDisplayResult> IContentPartDisplayDriver.BuildDisplayAsync(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, BuildDisplayContext context)
+        return result;
+    }
+
+    async Task<IDisplayResult> IContentPartDisplayDriver.BuildDisplayAsync(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, BuildDisplayContext context)
+    {
+        var part = contentPart as TPart;
+
+        if (part == null)
         {
-            var part = contentPart as TPart;
+            return null;
+        }
 
-            if (part == null)
-            {
-                return null;
-            }
+        using (BuildPrefix(typePartDefinition, context.HtmlFieldPrefix))
+        {
+            _typePartDefinition = typePartDefinition;
 
-            using (BuildPrefix(typePartDefinition, context.HtmlFieldPrefix))
-            {
-                _typePartDefinition = typePartDefinition;
+            var buildDisplayContext = new BuildPartDisplayContext(typePartDefinition, context);
 
-                var buildDisplayContext = new BuildPartDisplayContext(typePartDefinition, context);
+            var result = await DisplayAsync(part, buildDisplayContext);
 
-                var result = await DisplayAsync(part, buildDisplayContext);
+            _typePartDefinition = null;
 
-                _typePartDefinition = null;
+            return result;
+        }
+    }
 
-                return result;
-            }
+    async Task<IDisplayResult> IContentPartDisplayDriver.BuildEditorAsync(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, BuildEditorContext context)
+    {
+        var part = contentPart as TPart;
+
+        if (part == null)
+        {
+            return null;
         }
 
-        async Task<IDisplayResult> IContentPartDisplayDriver.BuildEditorAsync(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, BuildEditorContext context)
+        using (BuildPrefix(typePartDefinition, context.HtmlFieldPrefix))
         {
-            var part = contentPart as TPart;
+            _typePartDefinition = typePartDefinition;
 
-            if (part == null)
-            {
-                return null;
-            }
+            var buildEditorContext = new BuildPartEditorContext(typePartDefinition, context);
 
-            using (BuildPrefix(typePartDefinition, context.HtmlFieldPrefix))
-            {
-                _typePartDefinition = typePartDefinition;
+            var result = await EditAsync(part, buildEditorContext);
 
-                var buildEditorContext = new BuildPartEditorContext(typePartDefinition, context);
+            _typePartDefinition = null;
 
-                var result = await EditAsync(part, buildEditorContext);
+            return result;
+        }
+    }
 
-                _typePartDefinition = null;
+    async Task<IDisplayResult> IContentPartDisplayDriver.UpdateEditorAsync(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, UpdateEditorContext context)
+    {
+        var part = contentPart as TPart;
 
-                return result;
-            }
+        if (part == null)
+        {
+            return null;
         }
 
-        async Task<IDisplayResult> IContentPartDisplayDriver.UpdateEditorAsync(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, UpdateEditorContext context)
+        using (BuildPrefix(typePartDefinition, context.HtmlFieldPrefix))
         {
-            var part = contentPart as TPart;
+            var updateEditorContext = new UpdatePartEditorContext(typePartDefinition, context);
 
-            if (part == null)
-            {
-                return null;
-            }
-
-            using (BuildPrefix(typePartDefinition, context.HtmlFieldPrefix))
-            {
-                var updateEditorContext = new UpdatePartEditorContext(typePartDefinition, context);
-
-                _typePartDefinition = typePartDefinition;
+            _typePartDefinition = typePartDefinition;
 
-                var result = await UpdateAsync(part, updateEditorContext);
+            var result = await UpdateAsync(part, updateEditorContext);
 
-                part.ContentItem.Apply(typePartDefinition.Name, part);
+            part.ContentItem.Apply(typePartDefinition.Name, part);
 
-                _typePartDefinition = null;
+            _typePartDefinition = null;
 
-                return result;
-            }
+            return result;
         }
+    }
 
-        public virtual Task<IDisplayResult> DisplayAsync(TPart part, BuildPartDisplayContext context)
-        {
-            return Task.FromResult(Display(part, context));
-        }
+    public virtual Task<IDisplayResult> DisplayAsync(TPart part, BuildPartDisplayContext context)
+    {
+        return Task.FromResult(Display(part, context));
+    }
 
-        public virtual IDisplayResult Display(TPart part, BuildPartDisplayContext context)
-        {
+    public virtual IDisplayResult Display(TPart part, BuildPartDisplayContext context)
+    {
 #pragma warning disable CS0618 // Type or member is obsolete
-            return Display(part);
+        return Display(part);
 #pragma warning restore CS0618 // Type or member is obsolete
-        }
+    }
 
-        [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the DisplayAsync(TPart part, BuildPartDisplayContext context) or Display(TPart part, BuildPartDisplayContext context) method.")]
-        public virtual IDisplayResult Display(TPart part)
-        {
-            return null;
-        }
+    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the DisplayAsync(TPart part, BuildPartDisplayContext context) or Display(TPart part, BuildPartDisplayContext context) method.")]
+    public virtual IDisplayResult Display(TPart part)
+    {
+        return null;
+    }
 
-        public virtual Task<IDisplayResult> EditAsync(TPart part, BuildPartEditorContext context)
-        {
-            return Task.FromResult(Edit(part, context));
-        }
+    public virtual Task<IDisplayResult> EditAsync(TPart part, BuildPartEditorContext context)
+    {
+        return Task.FromResult(Edit(part, context));
+    }
 
-        public virtual IDisplayResult Edit(TPart part, BuildPartEditorContext context)
-        {
+    public virtual IDisplayResult Edit(TPart part, BuildPartEditorContext context)
+    {
 #pragma warning disable CS0618 // Type or member is obsolete
-            return Edit(part);
+        return Edit(part);
 #pragma warning restore CS0618 // Type or member is obsolete
-        }
+    }
 
-        [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the EditAsync(TPart part, BuildPartEditorContext context) or Edit(TPart part, BuildPartEditorContext context) method.")]
-        public virtual IDisplayResult Edit(TPart part)
-        {
-            return null;
-        }
+    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the EditAsync(TPart part, BuildPartEditorContext context) or Edit(TPart part, BuildPartEditorContext context) method.")]
+    public virtual IDisplayResult Edit(TPart part)
+    {
+        return null;
+    }
 
-        public virtual Task<IDisplayResult> UpdateAsync(TPart part, UpdatePartEditorContext context)
-        {
+    public virtual Task<IDisplayResult> UpdateAsync(TPart part, UpdatePartEditorContext context)
+    {
 #pragma warning disable CS0618 // Type or member is obsolete
-            return UpdateAsync(part, context.Updater);
+        return UpdateAsync(part, context.Updater);
 #pragma warning restore CS0618 // Type or member is obsolete
-        }
+    }
 
-        [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the UpdateAsync(TPart part, UpdatePartEditorContext context) method.")]
-        public virtual Task<IDisplayResult> UpdateAsync(TPart part, IUpdateModel updater)
-        {
-            return Task.FromResult<IDisplayResult>(null);
-        }
+    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the UpdateAsync(TPart part, UpdatePartEditorContext context) method.")]
+    public virtual Task<IDisplayResult> UpdateAsync(TPart part, IUpdateModel updater)
+    {
+        return Task.FromResult<IDisplayResult>(null);
+    }
 
-        protected string GetEditorShapeType(string shapeType, ContentTypePartDefinition typePartDefinition)
-        {
-            var editor = typePartDefinition.Editor();
-            return !string.IsNullOrEmpty(editor)
-                ? shapeType + "__" + editor
-                : shapeType;
-        }
+    protected string GetEditorShapeType(string shapeType, ContentTypePartDefinition typePartDefinition)
+    {
+        var editor = typePartDefinition.Editor();
+        return !string.IsNullOrEmpty(editor)
+            ? shapeType + "__" + editor
+            : shapeType;
+    }
 
-        protected string GetEditorShapeType(string shapeType, BuildPartEditorContext context)
-        {
-            return GetEditorShapeType(shapeType, context.TypePartDefinition);
-        }
+    protected string GetEditorShapeType(string shapeType, BuildPartEditorContext context)
+    {
+        return GetEditorShapeType(shapeType, context.TypePartDefinition);
+    }
 
-        protected string GetEditorShapeType(ContentTypePartDefinition typePartDefinition)
-        {
-            return GetEditorShapeType(typeof(TPart).Name + "_Edit", typePartDefinition);
-        }
+    protected string GetEditorShapeType(ContentTypePartDefinition typePartDefinition)
+    {
+        return GetEditorShapeType(typeof(TPart).Name + "_Edit", typePartDefinition);
+    }
 
-        protected string GetEditorShapeType(BuildPartEditorContext context)
-        {
-            return GetEditorShapeType(context.TypePartDefinition);
-        }
+    protected string GetEditorShapeType(BuildPartEditorContext context)
+    {
+        return GetEditorShapeType(context.TypePartDefinition);
+    }
 
-        protected string GetDisplayShapeType(string shapeType, BuildPartDisplayContext context)
-        {
-            var displayMode = context.TypePartDefinition.DisplayMode();
-            return !string.IsNullOrEmpty(displayMode)
-                ? shapeType + DisplaySeparator + displayMode
-                : shapeType;
-        }
+    protected string GetDisplayShapeType(string shapeType, BuildPartDisplayContext context)
+    {
+        var displayMode = context.TypePartDefinition.DisplayMode();
+        return !string.IsNullOrEmpty(displayMode)
+            ? shapeType + DisplaySeparator + displayMode
+            : shapeType;
+    }
 
-        protected string GetDisplayShapeType(BuildPartDisplayContext context)
-        {
-            return GetDisplayShapeType(typeof(TPart).Name, context);
-        }
+    protected string GetDisplayShapeType(BuildPartDisplayContext context)
+    {
+        return GetDisplayShapeType(typeof(TPart).Name, context);
+    }
+
+    private TempPrefix BuildPrefix(ContentTypePartDefinition typePartDefinition, string htmlFieldPrefix)
+    {
+        var tempPrefix = new TempPrefix(this, Prefix);
 
-        private TempPrefix BuildPrefix(ContentTypePartDefinition typePartDefinition, string htmlFieldPrefix)
+        Prefix = typePartDefinition.Name;
+
+        if (!string.IsNullOrEmpty(htmlFieldPrefix))
         {
-            var tempPrefix = new TempPrefix(this, Prefix);
+            Prefix = htmlFieldPrefix + "." + Prefix;
+        }
 
-            Prefix = typePartDefinition.Name;
+        return tempPrefix;
+    }
 
-            if (!string.IsNullOrEmpty(htmlFieldPrefix))
-            {
-                Prefix = htmlFieldPrefix + "." + Prefix;
-            }
+    /// <summary>
+    /// Restores the previous prefix automatically.
+    /// </summary>
+    private sealed class TempPrefix : IDisposable
+    {
+        private readonly ContentPartDisplayDriver<TPart> _driver;
+        private readonly string _originalPrefix;
 
-            return tempPrefix;
+        public TempPrefix(ContentPartDisplayDriver<TPart> driver, string originalPrefix)
+        {
+            _driver = driver;
+            _originalPrefix = originalPrefix;
         }
 
-        /// <summary>
-        /// Restores the previous prefix automatically.
-        /// </summary>
-        private sealed class TempPrefix : IDisposable
+        public void Dispose()
         {
-            private readonly ContentPartDisplayDriver<TPart> _driver;
-            private readonly string _originalPrefix;
-
-            public TempPrefix(ContentPartDisplayDriver<TPart> driver, string originalPrefix)
-            {
-                _driver = driver;
-                _originalPrefix = originalPrefix;
-            }
-
-            public void Dispose()
-            {
-                _driver.Prefix = _originalPrefix;
-            }
+            _driver.Prefix = _originalPrefix;
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartDisplayOption.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartDisplayOption.cs
index b244045022e..28c002a85d8 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartDisplayOption.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartDisplayOption.cs
@@ -2,59 +2,58 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OrchardCore.ContentManagement.Display.ContentDisplay
+namespace OrchardCore.ContentManagement.Display.ContentDisplay;
+
+public class ContentPartDisplayOption : ContentPartOptionBase
 {
-    public class ContentPartDisplayOption : ContentPartOptionBase
-    {
-        private readonly List<ContentPartDisplayDriverOption> _partDisplayDrivers = [];
+    private readonly List<ContentPartDisplayDriverOption> _partDisplayDrivers = [];
 
-        public ContentPartDisplayOption(Type contentPartType) : base(contentPartType)
-        {
-        }
+    public ContentPartDisplayOption(Type contentPartType) : base(contentPartType)
+    {
+    }
 
-        private IReadOnlyList<ContentPartDisplayDriverOption> _displayDrivers;
-        private IReadOnlyList<ContentPartDisplayDriverOption> _editorDrivers;
+    private IReadOnlyList<ContentPartDisplayDriverOption> _displayDrivers;
+    private IReadOnlyList<ContentPartDisplayDriverOption> _editorDrivers;
 
-        public IReadOnlyList<ContentPartDisplayDriverOption> DisplayDrivers
-            => _displayDrivers ??= _partDisplayDrivers.Where(d => d.DisplayMode != null).ToList();
+    public IReadOnlyList<ContentPartDisplayDriverOption> DisplayDrivers
+        => _displayDrivers ??= _partDisplayDrivers.Where(d => d.DisplayMode != null).ToList();
 
-        public IReadOnlyList<ContentPartDisplayDriverOption> EditorDrivers
-            => _editorDrivers ??= _partDisplayDrivers.Where(d => d.Editor != null).ToList();
+    public IReadOnlyList<ContentPartDisplayDriverOption> EditorDrivers
+        => _editorDrivers ??= _partDisplayDrivers.Where(d => d.Editor != null).ToList();
 
-        internal void ForDisplayMode(Type displayDriverType, Func<string, bool> predicate)
-        {
-            var option = GetOrAddContentPartDisplayDriverOption(displayDriverType);
+    internal void ForDisplayMode(Type displayDriverType, Func<string, bool> predicate)
+    {
+        var option = GetOrAddContentPartDisplayDriverOption(displayDriverType);
 
-            option.SetDisplayMode(predicate);
-        }
+        option.SetDisplayMode(predicate);
+    }
 
-        internal void ForEditor(Type displayDriverType, Func<string, bool> predicate)
-        {
-            var option = GetOrAddContentPartDisplayDriverOption(displayDriverType);
+    internal void ForEditor(Type displayDriverType, Func<string, bool> predicate)
+    {
+        var option = GetOrAddContentPartDisplayDriverOption(displayDriverType);
 
-            option.SetEditor(predicate);
-        }
+        option.SetEditor(predicate);
+    }
 
-        internal void RemoveDisplayDriver(Type displayDriverType)
+    internal void RemoveDisplayDriver(Type displayDriverType)
+    {
+        var displayDriverOption = _partDisplayDrivers.FirstOrDefault(d => d.DisplayDriverType == displayDriverType);
+        if (displayDriverOption != null)
         {
-            var displayDriverOption = _partDisplayDrivers.FirstOrDefault(d => d.DisplayDriverType == displayDriverType);
-            if (displayDriverOption != null)
-            {
-                _partDisplayDrivers.Remove(displayDriverOption);
-            }
+            _partDisplayDrivers.Remove(displayDriverOption);
         }
+    }
 
-        private ContentPartDisplayDriverOption GetOrAddContentPartDisplayDriverOption(Type displayDriverType)
-        {
-            var option = _partDisplayDrivers.FirstOrDefault(o => o.DisplayDriverType == displayDriverType);
-
-            if (option == null)
-            {
-                option = new ContentPartDisplayDriverOption(displayDriverType);
-                _partDisplayDrivers.Add(option);
-            }
+    private ContentPartDisplayDriverOption GetOrAddContentPartDisplayDriverOption(Type displayDriverType)
+    {
+        var option = _partDisplayDrivers.FirstOrDefault(o => o.DisplayDriverType == displayDriverType);
 
-            return option;
+        if (option == null)
+        {
+            option = new ContentPartDisplayDriverOption(displayDriverType);
+            _partDisplayDrivers.Add(option);
         }
+
+        return option;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartServiceCollectionExtensions.cs
index 3ad879bdaaa..843377c9b8a 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartServiceCollectionExtensions.cs
@@ -2,152 +2,151 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace OrchardCore.ContentManagement.Display.ContentDisplay
+namespace OrchardCore.ContentManagement.Display.ContentDisplay;
+
+public static class ContentPartServiceCollectionExtensions
 {
-    public static class ContentPartServiceCollectionExtensions
+    /// <summary>
+    /// Register a display driver for use with a content part and all display modes and editors.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentPartOptionBuilder UseDisplayDriver<TContentPartDisplayDriver>(this ContentPartOptionBuilder builder)
+        where TContentPartDisplayDriver : class, IContentPartDisplayDriver
     {
-        /// <summary>
-        /// Register a display driver for use with a content part and all display modes and editors.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentPartOptionBuilder UseDisplayDriver<TContentPartDisplayDriver>(this ContentPartOptionBuilder builder)
-            where TContentPartDisplayDriver : class, IContentPartDisplayDriver
-        {
-            return builder.UseDisplayDriver(typeof(TContentPartDisplayDriver));
-        }
-
-        /// <summary>
-        /// Register a display driver for use with a content part and all display modes and editors.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentPartOptionBuilder UseDisplayDriver(this ContentPartOptionBuilder builder, Type partDisplayDriverType)
-        {
-            return builder.ForDisplayMode(partDisplayDriverType)
-                .ForEditor(partDisplayDriverType);
-        }
-
-        /// <summary>
-        /// Removes a display driver from all display modes and editors.
-        /// </summary>
-        public static ContentPartOptionBuilder RemoveDisplayDriver<TContentPartDisplayDriver>(this ContentPartOptionBuilder builder)
-            where TContentPartDisplayDriver : class, IContentPartDisplayDriver
-        {
-            return builder.RemoveDisplayDriver(typeof(TContentPartDisplayDriver));
-        }
+        return builder.UseDisplayDriver(typeof(TContentPartDisplayDriver));
+    }
 
-        /// <summary>
-        /// Removes a display driver from all display modes and editors.
-        /// </summary>
-        public static ContentPartOptionBuilder RemoveDisplayDriver(this ContentPartOptionBuilder builder, Type partDisplayDriverType)
-        {
-            builder.Services.Configure<ContentDisplayOptions>(o =>
-            {
-                o.RemoveContentPartDisplayDriver(builder.ContentPartType, partDisplayDriverType);
-            });
-
-            builder.Services.RemoveAll(partDisplayDriverType);
-
-            return builder;
-        }
-
-        /// <summary>
-        /// Registers a display driver for use with all display modes.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentPartOptionBuilder ForDisplayMode<TContentPartDisplayDriver>(this ContentPartOptionBuilder builder)
-            where TContentPartDisplayDriver : class, IContentPartDisplayDriver
-        {
-            return builder.ForDisplayMode(typeof(TContentPartDisplayDriver));
-        }
-
-        /// <summary>
-        /// Registers a display driver for use with a specific display mode.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentPartOptionBuilder ForDisplayMode(this ContentPartOptionBuilder builder, Type partDisplayDriverType)
-        {
-            return builder.ForDisplayMode(partDisplayDriverType, d => true);
-        }
-
-        /// <summary>
-        /// Registers a display driver for use with a specific display mode.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentPartOptionBuilder ForDisplayMode<TContentPartDisplayDriver>(this ContentPartOptionBuilder builder, Func<string, bool> predicate)
-            where TContentPartDisplayDriver : class, IContentPartDisplayDriver
-        {
-            return builder.ForDisplayMode(typeof(TContentPartDisplayDriver), predicate);
-        }
-
-        /// <summary>
-        /// Registers a display driver for use with a specific display mode.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentPartOptionBuilder ForDisplayMode(this ContentPartOptionBuilder builder, Type partDisplayDriverType, Func<string, bool> predicate)
-        {
-            builder.Services.Configure<ContentDisplayOptions>(o =>
-            {
-                o.ForContentPartDisplayMode(builder.ContentPartType, partDisplayDriverType, predicate);
-            });
-
-            builder.Services.TryAddScoped(partDisplayDriverType);
-
-            return builder;
-        }
-
-        /// <summary>
-        /// Registers a display driver for use with all editors.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentPartOptionBuilder ForEditor<TContentPartDisplayDriver>(this ContentPartOptionBuilder builder)
-            where TContentPartDisplayDriver : class, IContentPartDisplayDriver
-        {
-            return builder.ForEditor(typeof(TContentPartDisplayDriver));
-        }
-
-        /// <summary>
-        /// Registers a display driver for use with a specific editor.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentPartOptionBuilder ForEditor(this ContentPartOptionBuilder builder, Type partDisplayDriverType)
+    /// <summary>
+    /// Register a display driver for use with a content part and all display modes and editors.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentPartOptionBuilder UseDisplayDriver(this ContentPartOptionBuilder builder, Type partDisplayDriverType)
+    {
+        return builder.ForDisplayMode(partDisplayDriverType)
+            .ForEditor(partDisplayDriverType);
+    }
+
+    /// <summary>
+    /// Removes a display driver from all display modes and editors.
+    /// </summary>
+    public static ContentPartOptionBuilder RemoveDisplayDriver<TContentPartDisplayDriver>(this ContentPartOptionBuilder builder)
+        where TContentPartDisplayDriver : class, IContentPartDisplayDriver
+    {
+        return builder.RemoveDisplayDriver(typeof(TContentPartDisplayDriver));
+    }
+
+    /// <summary>
+    /// Removes a display driver from all display modes and editors.
+    /// </summary>
+    public static ContentPartOptionBuilder RemoveDisplayDriver(this ContentPartOptionBuilder builder, Type partDisplayDriverType)
+    {
+        builder.Services.Configure<ContentDisplayOptions>(o =>
         {
-            return builder.ForEditor(partDisplayDriverType, d => true);
-        }
-
-        /// <summary>
-        /// Registers a display driver for use with a specific editor.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentPartOptionBuilder ForEditor<TContentPartDisplayDriver>(this ContentPartOptionBuilder builder, Func<string, bool> predicate)
-            where TContentPartDisplayDriver : class, IContentPartDisplayDriver
+            o.RemoveContentPartDisplayDriver(builder.ContentPartType, partDisplayDriverType);
+        });
+
+        builder.Services.RemoveAll(partDisplayDriverType);
+
+        return builder;
+    }
+
+    /// <summary>
+    /// Registers a display driver for use with all display modes.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentPartOptionBuilder ForDisplayMode<TContentPartDisplayDriver>(this ContentPartOptionBuilder builder)
+        where TContentPartDisplayDriver : class, IContentPartDisplayDriver
+    {
+        return builder.ForDisplayMode(typeof(TContentPartDisplayDriver));
+    }
+
+    /// <summary>
+    /// Registers a display driver for use with a specific display mode.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentPartOptionBuilder ForDisplayMode(this ContentPartOptionBuilder builder, Type partDisplayDriverType)
+    {
+        return builder.ForDisplayMode(partDisplayDriverType, d => true);
+    }
+
+    /// <summary>
+    /// Registers a display driver for use with a specific display mode.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentPartOptionBuilder ForDisplayMode<TContentPartDisplayDriver>(this ContentPartOptionBuilder builder, Func<string, bool> predicate)
+        where TContentPartDisplayDriver : class, IContentPartDisplayDriver
+    {
+        return builder.ForDisplayMode(typeof(TContentPartDisplayDriver), predicate);
+    }
+
+    /// <summary>
+    /// Registers a display driver for use with a specific display mode.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentPartOptionBuilder ForDisplayMode(this ContentPartOptionBuilder builder, Type partDisplayDriverType, Func<string, bool> predicate)
+    {
+        builder.Services.Configure<ContentDisplayOptions>(o =>
         {
-            return builder.ForEditor(typeof(TContentPartDisplayDriver), predicate);
-        }
-
-        /// <summary>
-        /// Registers a display driver for use with a specific editor.
-        /// This method will override previous registrations for the driver type,
-        /// and can be called multiple times safely, to reconfigure an existing driver.
-        /// </summary>
-        public static ContentPartOptionBuilder ForEditor(this ContentPartOptionBuilder builder, Type partDisplayDriverType, Func<string, bool> predicate)
+            o.ForContentPartDisplayMode(builder.ContentPartType, partDisplayDriverType, predicate);
+        });
+
+        builder.Services.TryAddScoped(partDisplayDriverType);
+
+        return builder;
+    }
+
+    /// <summary>
+    /// Registers a display driver for use with all editors.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentPartOptionBuilder ForEditor<TContentPartDisplayDriver>(this ContentPartOptionBuilder builder)
+        where TContentPartDisplayDriver : class, IContentPartDisplayDriver
+    {
+        return builder.ForEditor(typeof(TContentPartDisplayDriver));
+    }
+
+    /// <summary>
+    /// Registers a display driver for use with a specific editor.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentPartOptionBuilder ForEditor(this ContentPartOptionBuilder builder, Type partDisplayDriverType)
+    {
+        return builder.ForEditor(partDisplayDriverType, d => true);
+    }
+
+    /// <summary>
+    /// Registers a display driver for use with a specific editor.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentPartOptionBuilder ForEditor<TContentPartDisplayDriver>(this ContentPartOptionBuilder builder, Func<string, bool> predicate)
+        where TContentPartDisplayDriver : class, IContentPartDisplayDriver
+    {
+        return builder.ForEditor(typeof(TContentPartDisplayDriver), predicate);
+    }
+
+    /// <summary>
+    /// Registers a display driver for use with a specific editor.
+    /// This method will override previous registrations for the driver type,
+    /// and can be called multiple times safely, to reconfigure an existing driver.
+    /// </summary>
+    public static ContentPartOptionBuilder ForEditor(this ContentPartOptionBuilder builder, Type partDisplayDriverType, Func<string, bool> predicate)
+    {
+        builder.Services.Configure<ContentDisplayOptions>(o =>
         {
-            builder.Services.Configure<ContentDisplayOptions>(o =>
-            {
-                o.ForContentPartEditor(builder.ContentPartType, partDisplayDriverType, predicate);
-            });
+            o.ForContentPartEditor(builder.ContentPartType, partDisplayDriverType, predicate);
+        });
 
-            builder.Services.TryAddScoped(partDisplayDriverType);
+        builder.Services.TryAddScoped(partDisplayDriverType);
 
-            return builder;
-        }
+        return builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentDisplayDriver.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentDisplayDriver.cs
index c75b71071bc..43f5250eed2 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentDisplayDriver.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentDisplayDriver.cs
@@ -1,8 +1,7 @@
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.ContentManagement.Display.ContentDisplay
+namespace OrchardCore.ContentManagement.Display.ContentDisplay;
+
+public interface IContentDisplayDriver : IDisplayDriver<ContentItem, BuildDisplayContext, BuildEditorContext, UpdateEditorContext>
 {
-    public interface IContentDisplayDriver : IDisplayDriver<ContentItem, BuildDisplayContext, BuildEditorContext, UpdateEditorContext>
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentDisplayHandler.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentDisplayHandler.cs
index 32e302a513d..f15b40cdfdd 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentDisplayHandler.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentDisplayHandler.cs
@@ -1,16 +1,15 @@
 using System.Threading.Tasks;
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.ContentManagement.Display.ContentDisplay
+namespace OrchardCore.ContentManagement.Display.ContentDisplay;
+
+/// <summary>
+/// An implementation of <see cref="IContentDisplayHandler"/> is able to take part in the rendering of
+/// a <see cref="ContentItem"/> instance.
+/// </summary>
+public interface IContentDisplayHandler
 {
-    /// <summary>
-    /// An implementation of <see cref="IContentDisplayHandler"/> is able to take part in the rendering of
-    /// a <see cref="ContentItem"/> instance.
-    /// </summary>
-    public interface IContentDisplayHandler
-    {
-        Task BuildDisplayAsync(ContentItem contentItem, BuildDisplayContext context);
-        Task BuildEditorAsync(ContentItem contentItem, BuildEditorContext context);
-        Task UpdateEditorAsync(ContentItem contentItem, UpdateEditorContext context);
-    }
+    Task BuildDisplayAsync(ContentItem contentItem, BuildDisplayContext context);
+    Task BuildEditorAsync(ContentItem contentItem, BuildEditorContext context);
+    Task UpdateEditorAsync(ContentItem contentItem, UpdateEditorContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentFieldDisplayDriver.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentFieldDisplayDriver.cs
index ea15576350e..b046bb9bfcd 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentFieldDisplayDriver.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentFieldDisplayDriver.cs
@@ -3,12 +3,11 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentManagement.Display.ContentDisplay
+namespace OrchardCore.ContentManagement.Display.ContentDisplay;
+
+public interface IContentFieldDisplayDriver
 {
-    public interface IContentFieldDisplayDriver
-    {
-        Task<IDisplayResult> BuildDisplayAsync(ContentPart contentPart, ContentPartFieldDefinition partFieldDefinition, ContentTypePartDefinition typePartDefinition, BuildDisplayContext context);
-        Task<IDisplayResult> BuildEditorAsync(ContentPart contentPart, ContentPartFieldDefinition partFieldDefinition, ContentTypePartDefinition typePartDefinition, BuildEditorContext context);
-        Task<IDisplayResult> UpdateEditorAsync(ContentPart contentPart, ContentPartFieldDefinition partFieldDefinition, ContentTypePartDefinition typePartDefinition, UpdateEditorContext context);
-    }
+    Task<IDisplayResult> BuildDisplayAsync(ContentPart contentPart, ContentPartFieldDefinition partFieldDefinition, ContentTypePartDefinition typePartDefinition, BuildDisplayContext context);
+    Task<IDisplayResult> BuildEditorAsync(ContentPart contentPart, ContentPartFieldDefinition partFieldDefinition, ContentTypePartDefinition typePartDefinition, BuildEditorContext context);
+    Task<IDisplayResult> UpdateEditorAsync(ContentPart contentPart, ContentPartFieldDefinition partFieldDefinition, ContentTypePartDefinition typePartDefinition, UpdateEditorContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentFieldDisplayDriverResolver.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentFieldDisplayDriverResolver.cs
index 4138ece0ebe..c5944c6af6a 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentFieldDisplayDriverResolver.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentFieldDisplayDriverResolver.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.ContentManagement.Display.ContentDisplay
+namespace OrchardCore.ContentManagement.Display.ContentDisplay;
+
+public interface IContentFieldDisplayDriverResolver
 {
-    public interface IContentFieldDisplayDriverResolver
-    {
-        IList<IContentFieldDisplayDriver> GetDisplayModeDrivers(string fieldName, string displayMode);
-        IList<IContentFieldDisplayDriver> GetEditorDrivers(string fieldName, string editor);
-    }
+    IList<IContentFieldDisplayDriver> GetDisplayModeDrivers(string fieldName, string displayMode);
+    IList<IContentFieldDisplayDriver> GetEditorDrivers(string fieldName, string editor);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentPartDisplayDriver.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentPartDisplayDriver.cs
index fddaf9f0934..e235da158e3 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentPartDisplayDriver.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentPartDisplayDriver.cs
@@ -3,12 +3,11 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentManagement.Display.ContentDisplay
+namespace OrchardCore.ContentManagement.Display.ContentDisplay;
+
+public interface IContentPartDisplayDriver
 {
-    public interface IContentPartDisplayDriver
-    {
-        Task<IDisplayResult> BuildDisplayAsync(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, BuildDisplayContext context);
-        Task<IDisplayResult> BuildEditorAsync(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, BuildEditorContext context);
-        Task<IDisplayResult> UpdateEditorAsync(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, UpdateEditorContext context);
-    }
+    Task<IDisplayResult> BuildDisplayAsync(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, BuildDisplayContext context);
+    Task<IDisplayResult> BuildEditorAsync(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, BuildEditorContext context);
+    Task<IDisplayResult> UpdateEditorAsync(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, UpdateEditorContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentPartDisplayDriverResolver.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentPartDisplayDriverResolver.cs
index 04e3d7c4e41..93aa4ab23ff 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentPartDisplayDriverResolver.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentDisplay/IContentPartDisplayDriverResolver.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.ContentManagement.Display.ContentDisplay
+namespace OrchardCore.ContentManagement.Display.ContentDisplay;
+
+public interface IContentPartDisplayDriverResolver
 {
-    public interface IContentPartDisplayDriverResolver
-    {
-        IList<IContentPartDisplayDriver> GetDisplayModeDrivers(string partName, string displayMode);
-        IList<IContentPartDisplayDriver> GetEditorDrivers(string partName, string editor);
-    }
+    IList<IContentPartDisplayDriver> GetDisplayModeDrivers(string partName, string displayMode);
+    IList<IContentPartDisplayDriver> GetEditorDrivers(string partName, string editor);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentItemDisplayManager.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentItemDisplayManager.cs
index 81f378cd29b..4ce4cafecb8 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentItemDisplayManager.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ContentItemDisplayManager.cs
@@ -14,208 +14,207 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentManagement.Display
+namespace OrchardCore.ContentManagement.Display;
+
+/// <summary>
+/// The default implementation of <see cref="IContentItemDisplayManager"/>. It is used to render
+/// <see cref="ContentItem"/> objects by leveraging any <see cref="IContentDisplayHandler"/>
+/// implementation. The resulting shapes are targeting the stereotype of the content item
+/// to display.
+/// </summary>
+public class ContentItemDisplayManager : BaseDisplayManager, IContentItemDisplayManager
 {
-    /// <summary>
-    /// The default implementation of <see cref="IContentItemDisplayManager"/>. It is used to render
-    /// <see cref="ContentItem"/> objects by leveraging any <see cref="IContentDisplayHandler"/>
-    /// implementation. The resulting shapes are targeting the stereotype of the content item
-    /// to display.
-    /// </summary>
-    public class ContentItemDisplayManager : BaseDisplayManager, IContentItemDisplayManager
+    private readonly IEnumerable<IContentHandler> _contentHandlers;
+    private readonly IEnumerable<IContentDisplayHandler> _handlers;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly ILayoutAccessor _layoutAccessor;
+    private readonly ILogger _logger;
+
+    public ContentItemDisplayManager(
+        IEnumerable<IContentDisplayHandler> handlers,
+        IEnumerable<IContentHandler> contentHandlers,
+        IContentDefinitionManager contentDefinitionManager,
+        IShapeFactory shapeFactory,
+        IEnumerable<IShapePlacementProvider> placementProviders,
+        ILogger<ContentItemDisplayManager> logger,
+        ILayoutAccessor layoutAccessor
+        ) : base(shapeFactory, placementProviders)
     {
-        private readonly IEnumerable<IContentHandler> _contentHandlers;
-        private readonly IEnumerable<IContentDisplayHandler> _handlers;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly ILayoutAccessor _layoutAccessor;
-        private readonly ILogger _logger;
-
-        public ContentItemDisplayManager(
-            IEnumerable<IContentDisplayHandler> handlers,
-            IEnumerable<IContentHandler> contentHandlers,
-            IContentDefinitionManager contentDefinitionManager,
-            IShapeFactory shapeFactory,
-            IEnumerable<IShapePlacementProvider> placementProviders,
-            ILogger<ContentItemDisplayManager> logger,
-            ILayoutAccessor layoutAccessor
-            ) : base(shapeFactory, placementProviders)
+        _handlers = handlers;
+        _contentHandlers = contentHandlers;
+        _contentDefinitionManager = contentDefinitionManager;
+        _shapeFactory = shapeFactory;
+        _layoutAccessor = layoutAccessor;
+        _logger = logger;
+    }
+
+    public async Task<IShape> BuildDisplayAsync(ContentItem contentItem, IUpdateModel updater, string displayType, string groupId)
+    {
+        ArgumentNullException.ThrowIfNull(contentItem);
+
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType)
+            ?? throw new NullReferenceException($"Content Type {contentItem.ContentType} does not exist.");
+
+        var actualDisplayType = string.IsNullOrEmpty(displayType) ? "Detail" : displayType;
+        var hasStereotype = contentTypeDefinition.TryGetStereotype(out var stereotype);
+
+        var actualShapeType = "Content";
+
+        if (hasStereotype)
         {
-            _handlers = handlers;
-            _contentHandlers = contentHandlers;
-            _contentDefinitionManager = contentDefinitionManager;
-            _shapeFactory = shapeFactory;
-            _layoutAccessor = layoutAccessor;
-            _logger = logger;
+            actualShapeType = contentTypeDefinition.GetStereotype();
         }
 
-        public async Task<IShape> BuildDisplayAsync(ContentItem contentItem, IUpdateModel updater, string displayType, string groupId)
+        // [DisplayType] is only added for the ones different than Detail
+        if (actualDisplayType != "Detail")
         {
-            ArgumentNullException.ThrowIfNull(contentItem);
-
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType)
-                ?? throw new NullReferenceException($"Content Type {contentItem.ContentType} does not exist.");
+            actualShapeType = actualShapeType + "_" + actualDisplayType;
+        }
 
-            var actualDisplayType = string.IsNullOrEmpty(displayType) ? "Detail" : displayType;
-            var hasStereotype = contentTypeDefinition.TryGetStereotype(out var stereotype);
+        var itemShape = await CreateContentShapeAsync(actualShapeType);
+        itemShape.Properties["ContentItem"] = contentItem;
+        itemShape.Properties["Stereotype"] = stereotype;
 
-            var actualShapeType = "Content";
+        var metadata = itemShape.Metadata;
+        metadata.DisplayType = actualDisplayType;
 
-            if (hasStereotype)
+        if (hasStereotype)
+        {
+            if (actualDisplayType != "Detail")
             {
-                actualShapeType = contentTypeDefinition.GetStereotype();
-            }
+                // Add fallback/default alternate Stereotype_[DisplayType] e.g. Content.Summary
+                metadata.Alternates.Add($"Stereotype_{actualDisplayType}");
 
-            // [DisplayType] is only added for the ones different than Detail
-            if (actualDisplayType != "Detail")
+                // [Stereotype]_[DisplayType] e.g. Menu.Summary
+                metadata.Alternates.Add($"{stereotype}_{actualDisplayType}");
+            }
+            else
             {
-                actualShapeType = actualShapeType + "_" + actualDisplayType;
+                // Add fallback/default alternate i.e. Content 
+                metadata.Alternates.Add("Stereotype");
+
+                // Add alternate to make the type [Stereotype] e.g. Menu
+                metadata.Alternates.Add(stereotype);
             }
+        }
 
-            var itemShape = await CreateContentShapeAsync(actualShapeType);
-            itemShape.Properties["ContentItem"] = contentItem;
-            itemShape.Properties["Stereotype"] = stereotype;
+        // Add alternate for [Stereotype]_[DisplayType]__[ContentType] e.g. Content-BlogPost.Summary
+        metadata.Alternates.Add($"{actualShapeType}__{contentItem.ContentType}");
 
-            var metadata = itemShape.Metadata;
-            metadata.DisplayType = actualDisplayType;
+        var context = new BuildDisplayContext(
+            itemShape,
+            actualDisplayType,
+            groupId,
+            _shapeFactory,
+            await _layoutAccessor.GetLayoutAsync(),
+            new ModelStateWrapperUpdater(updater)
+        );
 
-            if (hasStereotype)
-            {
-                if (actualDisplayType != "Detail")
-                {
-                    // Add fallback/default alternate Stereotype_[DisplayType] e.g. Content.Summary
-                    metadata.Alternates.Add($"Stereotype_{actualDisplayType}");
-
-                    // [Stereotype]_[DisplayType] e.g. Menu.Summary
-                    metadata.Alternates.Add($"{stereotype}_{actualDisplayType}");
-                }
-                else
-                {
-                    // Add fallback/default alternate i.e. Content 
-                    metadata.Alternates.Add("Stereotype");
-
-                    // Add alternate to make the type [Stereotype] e.g. Menu
-                    metadata.Alternates.Add(stereotype);
-                }
-            }
+        await BindPlacementAsync(context);
 
-            // Add alternate for [Stereotype]_[DisplayType]__[ContentType] e.g. Content-BlogPost.Summary
-            metadata.Alternates.Add($"{actualShapeType}__{contentItem.ContentType}");
+        await _handlers.InvokeAsync((handler, contentItem, context) => handler.BuildDisplayAsync(contentItem, context), contentItem, context, _logger);
 
-            var context = new BuildDisplayContext(
-                itemShape,
-                actualDisplayType,
-                groupId,
-                _shapeFactory,
-                await _layoutAccessor.GetLayoutAsync(),
-                new ModelStateWrapperUpdater(updater)
-            );
+        return context.Shape;
+    }
 
-            await BindPlacementAsync(context);
+    public async Task<IShape> BuildEditorAsync(ContentItem contentItem, IUpdateModel updater, bool isNew, string groupId, string htmlFieldPrefix)
+    {
+        ArgumentNullException.ThrowIfNull(contentItem);
 
-            await _handlers.InvokeAsync((handler, contentItem, context) => handler.BuildDisplayAsync(contentItem, context), contentItem, context, _logger);
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType)
+            ?? throw new NullReferenceException($"Content Type {contentItem.ContentType} does not exist.");
 
-            return context.Shape;
-        }
+        var hasStereotype = contentTypeDefinition.TryGetStereotype(out var stereotype);
+        var actualShapeType = "Content_Edit";
 
-        public async Task<IShape> BuildEditorAsync(ContentItem contentItem, IUpdateModel updater, bool isNew, string groupId, string htmlFieldPrefix)
+        if (hasStereotype)
         {
-            ArgumentNullException.ThrowIfNull(contentItem);
+            actualShapeType = stereotype + "_Edit";
+        }
 
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType)
-                ?? throw new NullReferenceException($"Content Type {contentItem.ContentType} does not exist.");
+        var itemShape = await CreateContentShapeAsync(actualShapeType);
+        itemShape.Properties["ContentItem"] = contentItem;
+        itemShape.Properties["Stereotype"] = stereotype;
 
-            var hasStereotype = contentTypeDefinition.TryGetStereotype(out var stereotype);
-            var actualShapeType = "Content_Edit";
+        if (hasStereotype)
+        {
+            // Add fallback/default alternate for Stereotype_Edit e.g. Stereotype.Edit
+            itemShape.Metadata.Alternates.Add("Stereotype_Edit");
 
-            if (hasStereotype)
-            {
-                actualShapeType = stereotype + "_Edit";
-            }
+            // add [Stereotype]_Edit e.g. Menu.Edit
+            itemShape.Metadata.Alternates.Add(actualShapeType);
+        }
 
-            var itemShape = await CreateContentShapeAsync(actualShapeType);
-            itemShape.Properties["ContentItem"] = contentItem;
-            itemShape.Properties["Stereotype"] = stereotype;
+        // Add an alternate for [Stereotype]_Edit__[ContentType] e.g. Content-Menu.Edit
+        itemShape.Metadata.Alternates.Add(actualShapeType + "__" + contentItem.ContentType);
 
-            if (hasStereotype)
-            {
-                // Add fallback/default alternate for Stereotype_Edit e.g. Stereotype.Edit
-                itemShape.Metadata.Alternates.Add("Stereotype_Edit");
+        var context = new BuildEditorContext(
+            itemShape,
+            groupId,
+            isNew,
+            htmlFieldPrefix,
+            _shapeFactory,
+            await _layoutAccessor.GetLayoutAsync(),
+            new ModelStateWrapperUpdater(updater)
+        );
 
-                // add [Stereotype]_Edit e.g. Menu.Edit
-                itemShape.Metadata.Alternates.Add(actualShapeType);
-            }
+        await BindPlacementAsync(context);
 
-            // Add an alternate for [Stereotype]_Edit__[ContentType] e.g. Content-Menu.Edit
-            itemShape.Metadata.Alternates.Add(actualShapeType + "__" + contentItem.ContentType);
+        await _handlers.InvokeAsync((handler, contentItem, context) => handler.BuildEditorAsync(contentItem, context), contentItem, context, _logger);
 
-            var context = new BuildEditorContext(
-                itemShape,
-                groupId,
-                isNew,
-                htmlFieldPrefix,
-                _shapeFactory,
-                await _layoutAccessor.GetLayoutAsync(),
-                new ModelStateWrapperUpdater(updater)
-            );
+        return context.Shape;
+    }
 
-            await BindPlacementAsync(context);
+    public async Task<IShape> UpdateEditorAsync(ContentItem contentItem, IUpdateModel updater, bool isNew, string groupId, string htmlFieldPrefix)
+    {
+        ArgumentNullException.ThrowIfNull(contentItem);
 
-            await _handlers.InvokeAsync((handler, contentItem, context) => handler.BuildEditorAsync(contentItem, context), contentItem, context, _logger);
+        var contentTypeDefinition = await _contentDefinitionManager.LoadTypeDefinitionAsync(contentItem.ContentType)
+            ?? throw new NullReferenceException($"Content Type {contentItem.ContentType} does not exist.");
 
-            return context.Shape;
-        }
+        var hasStereotype = contentTypeDefinition.TryGetStereotype(out var stereotype);
+        var actualShapeType = "Content_Edit";
 
-        public async Task<IShape> UpdateEditorAsync(ContentItem contentItem, IUpdateModel updater, bool isNew, string groupId, string htmlFieldPrefix)
+        if (hasStereotype)
         {
-            ArgumentNullException.ThrowIfNull(contentItem);
-
-            var contentTypeDefinition = await _contentDefinitionManager.LoadTypeDefinitionAsync(contentItem.ContentType)
-                ?? throw new NullReferenceException($"Content Type {contentItem.ContentType} does not exist.");
-
-            var hasStereotype = contentTypeDefinition.TryGetStereotype(out var stereotype);
-            var actualShapeType = "Content_Edit";
-
-            if (hasStereotype)
-            {
-                actualShapeType = stereotype + "_Edit";
-            }
+            actualShapeType = stereotype + "_Edit";
+        }
 
-            var itemShape = await CreateContentShapeAsync(actualShapeType);
-            itemShape.Properties["ContentItem"] = contentItem;
-            itemShape.Properties["Stereotype"] = stereotype;
+        var itemShape = await CreateContentShapeAsync(actualShapeType);
+        itemShape.Properties["ContentItem"] = contentItem;
+        itemShape.Properties["Stereotype"] = stereotype;
 
-            if (hasStereotype)
-            {
-                // Add fallback/default alternate for Stereotype_Edit e.g. Stereotype.Edit
-                itemShape.Metadata.Alternates.Add("Stereotype_Edit");
+        if (hasStereotype)
+        {
+            // Add fallback/default alternate for Stereotype_Edit e.g. Stereotype.Edit
+            itemShape.Metadata.Alternates.Add("Stereotype_Edit");
 
-                // add [Stereotype]_Edit e.g. Menu.Edit
-                itemShape.Metadata.Alternates.Add(actualShapeType);
-            }
+            // add [Stereotype]_Edit e.g. Menu.Edit
+            itemShape.Metadata.Alternates.Add(actualShapeType);
+        }
 
-            // Add an alternate for [Stereotype]_Edit__[ContentType] e.g. Content-Menu.Edit
-            itemShape.Metadata.Alternates.Add(actualShapeType + "__" + contentItem.ContentType);
+        // Add an alternate for [Stereotype]_Edit__[ContentType] e.g. Content-Menu.Edit
+        itemShape.Metadata.Alternates.Add(actualShapeType + "__" + contentItem.ContentType);
 
-            var context = new UpdateEditorContext(
-                itemShape,
-                groupId,
-                isNew,
-                htmlFieldPrefix,
-                _shapeFactory,
-                await _layoutAccessor.GetLayoutAsync(),
-                new ModelStateWrapperUpdater(updater)
-            );
+        var context = new UpdateEditorContext(
+            itemShape,
+            groupId,
+            isNew,
+            htmlFieldPrefix,
+            _shapeFactory,
+            await _layoutAccessor.GetLayoutAsync(),
+            new ModelStateWrapperUpdater(updater)
+        );
 
-            await BindPlacementAsync(context);
+        await BindPlacementAsync(context);
 
-            var updateContentContext = new UpdateContentContext(contentItem);
+        var updateContentContext = new UpdateContentContext(contentItem);
 
-            await _contentHandlers.InvokeAsync((handler, updateContentContext) => handler.UpdatingAsync(updateContentContext), updateContentContext, _logger);
-            await _handlers.InvokeAsync((handler, contentItem, context) => handler.UpdateEditorAsync(contentItem, context), contentItem, context, _logger);
-            await _contentHandlers.Reverse().InvokeAsync((handler, updateContentContext) => handler.UpdatedAsync(updateContentContext), updateContentContext, _logger);
+        await _contentHandlers.InvokeAsync((handler, updateContentContext) => handler.UpdatingAsync(updateContentContext), updateContentContext, _logger);
+        await _handlers.InvokeAsync((handler, contentItem, context) => handler.UpdateEditorAsync(contentItem, context), contentItem, context, _logger);
+        await _contentHandlers.Reverse().InvokeAsync((handler, updateContentContext) => handler.UpdatedAsync(updateContentContext), updateContentContext, _logger);
 
-            return context.Shape;
-        }
+        return context.Shape;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/IContentItemDisplayManager.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/IContentItemDisplayManager.cs
index bc1af1a7240..bcd33c3694c 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/IContentItemDisplayManager.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/IContentItemDisplayManager.cs
@@ -2,16 +2,15 @@
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.ModelBinding;
 
-namespace OrchardCore.ContentManagement.Display
+namespace OrchardCore.ContentManagement.Display;
+
+/// <summary>
+/// Describes services responsible for displaying a content item. The result dynamic objects
+/// are the Shape to render a <see cref="ContentItem"/>.
+/// </summary>
+public interface IContentItemDisplayManager
 {
-    /// <summary>
-    /// Describes services responsible for displaying a content item. The result dynamic objects
-    /// are the Shape to render a <see cref="ContentItem"/>.
-    /// </summary>
-    public interface IContentItemDisplayManager
-    {
-        Task<IShape> BuildDisplayAsync(ContentItem content, IUpdateModel updater, string displayType = "", string groupId = "");
-        Task<IShape> BuildEditorAsync(ContentItem content, IUpdateModel updater, bool isNew, string groupId = "", string htmlFieldPrefix = "");
-        Task<IShape> UpdateEditorAsync(ContentItem content, IUpdateModel updater, bool isNew, string groupId = "", string htmlFieldPrefix = "");
-    }
+    Task<IShape> BuildDisplayAsync(ContentItem content, IUpdateModel updater, string displayType = "", string groupId = "");
+    Task<IShape> BuildEditorAsync(ContentItem content, IUpdateModel updater, bool isNew, string groupId = "", string htmlFieldPrefix = "");
+    Task<IShape> UpdateEditorAsync(ContentItem content, IUpdateModel updater, bool isNew, string groupId = "", string htmlFieldPrefix = "");
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/Liquid/ConsoleLogFilter.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/Liquid/ConsoleLogFilter.cs
index 6bbf410661c..279cb2281fc 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/Liquid/ConsoleLogFilter.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/Liquid/ConsoleLogFilter.cs
@@ -8,61 +8,60 @@
 using OrchardCore.DisplayManagement;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.ContentManagement.Display.Liquid
+namespace OrchardCore.ContentManagement.Display.Liquid;
+
+public class ConsoleLogFilter : ILiquidFilter
 {
-    public class ConsoleLogFilter : ILiquidFilter
+    private readonly IHostEnvironment _hostEnvironment;
+
+    public ConsoleLogFilter(IHostEnvironment hostEnvironment)
     {
-        private readonly IHostEnvironment _hostEnvironment;
+        _hostEnvironment = hostEnvironment;
+    }
 
-        public ConsoleLogFilter(IHostEnvironment hostEnvironment)
-        {
-            _hostEnvironment = hostEnvironment;
-        }
+    public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
+    {
+        var content = input.ToObjectValue();
 
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
+        if (content == null || _hostEnvironment.IsProduction())
         {
-            var content = input.ToObjectValue();
-
-            if (content == null || _hostEnvironment.IsProduction())
-            {
-                return NilValue.Instance;
-            }
+            return NilValue.Instance;
+        }
 
-            using var sb = ZString.CreateStringBuilder();
-            sb.Append("<script>console.log(");
+        using var sb = ZString.CreateStringBuilder();
+        sb.Append("<script>console.log(");
 
-            if (content is string stringContent)
-            {
-                sb.Append("\"");
-                sb.Append(stringContent);
-                sb.Append("\"");
-            }
-            else if (content is JsonNode jTokenContent)
-            {
-                sb.Append(jTokenContent.ToString());
-            }
-            else if (content is ContentItem contentItem)
-            {
-                sb.Append(OrchardRazorHelperExtensions.ConvertContentItem(contentItem).ToString());
-            }
-            else if (content is ContentPart contentPart)
-            {
-                sb.Append(OrchardRazorHelperExtensions.ConvertContentPart(contentPart).ToString());
-            }
-            else if (content is IShape shape)
-            {
-                sb.Append(shape.ShapeToJson().ToString());
-            }
-            else
-            {
-                sb.Append((await MiscFilters.Json(input, arguments, context)).ToStringValue());
-            }
+        if (content is string stringContent)
+        {
+            sb.Append("\"");
+            sb.Append(stringContent);
+            sb.Append("\"");
+        }
+        else if (content is JsonNode jTokenContent)
+        {
+            sb.Append(jTokenContent.ToString());
+        }
+        else if (content is ContentItem contentItem)
+        {
+            sb.Append(OrchardRazorHelperExtensions.ConvertContentItem(contentItem).ToString());
+        }
+        else if (content is ContentPart contentPart)
+        {
+            sb.Append(OrchardRazorHelperExtensions.ConvertContentPart(contentPart).ToString());
+        }
+        else if (content is IShape shape)
+        {
+            sb.Append(shape.ShapeToJson().ToString());
+        }
+        else
+        {
+            sb.Append((await MiscFilters.Json(input, arguments, context)).ToStringValue());
+        }
 
-            sb.Append(")</script>");
+        sb.Append(")</script>");
 
-            var result = new StringValue(sb.ToString(), false);
+        var result = new StringValue(sb.ToString(), false);
 
-            return result;
-        }
+        return result;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/BuildFieldDisplayContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/BuildFieldDisplayContext.cs
index f5e8ea58c36..3d42051ae59 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/BuildFieldDisplayContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/BuildFieldDisplayContext.cs
@@ -1,20 +1,19 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.ContentManagement.Display.Models
+namespace OrchardCore.ContentManagement.Display.Models;
+
+public class BuildFieldDisplayContext : BuildDisplayContext
 {
-    public class BuildFieldDisplayContext : BuildDisplayContext
+    public BuildFieldDisplayContext(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, ContentPartFieldDefinition partFieldDefinition, BuildDisplayContext context)
+        : base(context.Shape, context.DisplayType, context.GroupId, context.ShapeFactory, context.Layout, context.Updater)
     {
-        public BuildFieldDisplayContext(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, ContentPartFieldDefinition partFieldDefinition, BuildDisplayContext context)
-            : base(context.Shape, context.DisplayType, context.GroupId, context.ShapeFactory, context.Layout, context.Updater)
-        {
-            ContentPart = contentPart;
-            TypePartDefinition = typePartDefinition;
-            PartFieldDefinition = partFieldDefinition;
-        }
-
-        public ContentPart ContentPart { get; }
-        public ContentTypePartDefinition TypePartDefinition { get; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; }
+        ContentPart = contentPart;
+        TypePartDefinition = typePartDefinition;
+        PartFieldDefinition = partFieldDefinition;
     }
+
+    public ContentPart ContentPart { get; }
+    public ContentTypePartDefinition TypePartDefinition { get; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/BuildFieldEditorContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/BuildFieldEditorContext.cs
index 02766bd7ee6..a53b513c035 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/BuildFieldEditorContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/BuildFieldEditorContext.cs
@@ -1,20 +1,19 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.ContentManagement.Display.Models
+namespace OrchardCore.ContentManagement.Display.Models;
+
+public class BuildFieldEditorContext : BuildEditorContext
 {
-    public class BuildFieldEditorContext : BuildEditorContext
+    public BuildFieldEditorContext(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
+        : base(context.Shape, context.GroupId, context.IsNew, "", context.ShapeFactory, context.Layout, context.Updater)
     {
-        public BuildFieldEditorContext(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, ContentPartFieldDefinition partFieldDefinition, BuildEditorContext context)
-            : base(context.Shape, context.GroupId, context.IsNew, "", context.ShapeFactory, context.Layout, context.Updater)
-        {
-            ContentPart = contentPart;
-            TypePartDefinition = typePartDefinition;
-            PartFieldDefinition = partFieldDefinition;
-        }
-
-        public ContentPart ContentPart { get; }
-        public ContentTypePartDefinition TypePartDefinition { get; }
-        public ContentPartFieldDefinition PartFieldDefinition { get; }
+        ContentPart = contentPart;
+        TypePartDefinition = typePartDefinition;
+        PartFieldDefinition = partFieldDefinition;
     }
+
+    public ContentPart ContentPart { get; }
+    public ContentTypePartDefinition TypePartDefinition { get; }
+    public ContentPartFieldDefinition PartFieldDefinition { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/BuildPartDisplayContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/BuildPartDisplayContext.cs
index d3ea3180f47..bf51455fab5 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/BuildPartDisplayContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/BuildPartDisplayContext.cs
@@ -1,16 +1,15 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.ContentManagement.Display.Models
+namespace OrchardCore.ContentManagement.Display.Models;
+
+public class BuildPartDisplayContext : BuildDisplayContext
 {
-    public class BuildPartDisplayContext : BuildDisplayContext
+    public BuildPartDisplayContext(ContentTypePartDefinition typePartDefinition, BuildDisplayContext context)
+        : base(context.Shape, context.DisplayType, context.GroupId, context.ShapeFactory, context.Layout, context.Updater)
     {
-        public BuildPartDisplayContext(ContentTypePartDefinition typePartDefinition, BuildDisplayContext context)
-            : base(context.Shape, context.DisplayType, context.GroupId, context.ShapeFactory, context.Layout, context.Updater)
-        {
-            TypePartDefinition = typePartDefinition;
-        }
-
-        public ContentTypePartDefinition TypePartDefinition { get; }
+        TypePartDefinition = typePartDefinition;
     }
+
+    public ContentTypePartDefinition TypePartDefinition { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/BuildPartEditorContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/BuildPartEditorContext.cs
index 7c1c838cc3b..dcc597498bb 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/BuildPartEditorContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/BuildPartEditorContext.cs
@@ -1,17 +1,16 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.ContentManagement.Display.Models
+namespace OrchardCore.ContentManagement.Display.Models;
+
+public class BuildPartEditorContext : BuildEditorContext
 {
-    public class BuildPartEditorContext : BuildEditorContext
+    public BuildPartEditorContext(ContentTypePartDefinition typePartDefinition, BuildEditorContext context)
+        : base(context.Shape, context.GroupId, context.IsNew, "", context.ShapeFactory, context.Layout, context.Updater)
     {
-        public BuildPartEditorContext(ContentTypePartDefinition typePartDefinition, BuildEditorContext context)
-            : base(context.Shape, context.GroupId, context.IsNew, "", context.ShapeFactory, context.Layout, context.Updater)
-        {
-            TypePartDefinition = typePartDefinition;
-        }
-
-        public ContentTypePartDefinition TypePartDefinition { get; }
-        public string PartLocation { get; set; }
+        TypePartDefinition = typePartDefinition;
     }
+
+    public ContentTypePartDefinition TypePartDefinition { get; }
+    public string PartLocation { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/UpdateFieldEditorContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/UpdateFieldEditorContext.cs
index d7d5f166b3e..027d3da909b 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/UpdateFieldEditorContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/UpdateFieldEditorContext.cs
@@ -1,13 +1,12 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.ContentManagement.Display.Models
+namespace OrchardCore.ContentManagement.Display.Models;
+
+public class UpdateFieldEditorContext : BuildFieldEditorContext
 {
-    public class UpdateFieldEditorContext : BuildFieldEditorContext
+    public UpdateFieldEditorContext(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, ContentPartFieldDefinition partFieldDefinition, UpdateEditorContext context)
+        : base(contentPart, typePartDefinition, partFieldDefinition, context)
     {
-        public UpdateFieldEditorContext(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, ContentPartFieldDefinition partFieldDefinition, UpdateEditorContext context)
-            : base(contentPart, typePartDefinition, partFieldDefinition, context)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/UpdatePartEditorContext.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/UpdatePartEditorContext.cs
index 7c5d098881b..0374a4825b7 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/UpdatePartEditorContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/Models/UpdatePartEditorContext.cs
@@ -1,15 +1,14 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.ContentManagement.Display.Models
-{
-    public class UpdatePartEditorContext : BuildPartEditorContext
-    {
+namespace OrchardCore.ContentManagement.Display.Models;
 
-        public UpdatePartEditorContext(ContentTypePartDefinition typePartDefinition, UpdateEditorContext context)
-            : base(typePartDefinition, context)
-        {
-        }
+public class UpdatePartEditorContext : BuildPartEditorContext
+{
 
+    public UpdatePartEditorContext(ContentTypePartDefinition typePartDefinition, UpdateEditorContext context)
+        : base(typePartDefinition, context)
+    {
     }
+
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/Placement/ContentPartPlacementNodeFilterProvider.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/Placement/ContentPartPlacementNodeFilterProvider.cs
index 05a10be0cc1..d0b08e8e9cc 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/Placement/ContentPartPlacementNodeFilterProvider.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/Placement/ContentPartPlacementNodeFilterProvider.cs
@@ -7,97 +7,96 @@
 using OrchardCore.DisplayManagement.Descriptors.ShapePlacementStrategy;
 using OrchardCore.DisplayManagement.Shapes;
 
-namespace OrchardCore.ContentManagement.Display.Placement
+namespace OrchardCore.ContentManagement.Display.Placement;
+
+public class ContentPartPlacementNodeFilterProvider : ContentPlacementParseFilterProviderBase, IPlacementNodeFilterProvider
 {
-    public class ContentPartPlacementNodeFilterProvider : ContentPlacementParseFilterProviderBase, IPlacementNodeFilterProvider
-    {
-        public string Key { get { return "contentPart"; } }
+    public string Key { get { return "contentPart"; } }
 
-        public bool IsMatch(ShapePlacementContext context, object expression)
+    public bool IsMatch(ShapePlacementContext context, object expression)
+    {
+        var contentItem = GetContent(context);
+        if (contentItem is null)
         {
-            var contentItem = GetContent(context);
-            if (contentItem is null)
-            {
-                return false;
-            }
+            return false;
+        }
 
-            var jsonNode = JNode.FromObject(expression);
-            if (jsonNode is JsonArray jsonArray)
-            {
-                return jsonArray.Any(p => contentItem.Has(p.Value<string>()));
-            }
-            else
-            {
-                return contentItem.Has(jsonNode.Value<string>());
-            }
+        var jsonNode = JNode.FromObject(expression);
+        if (jsonNode is JsonArray jsonArray)
+        {
+            return jsonArray.Any(p => contentItem.Has(p.Value<string>()));
+        }
+        else
+        {
+            return contentItem.Has(jsonNode.Value<string>());
         }
     }
+}
 
-    public class ContentTypePlacementNodeFilterProvider : ContentPlacementParseFilterProviderBase, IPlacementNodeFilterProvider
-    {
-        public string Key { get { return "contentType"; } }
+public class ContentTypePlacementNodeFilterProvider : ContentPlacementParseFilterProviderBase, IPlacementNodeFilterProvider
+{
+    public string Key { get { return "contentType"; } }
 
-        public bool IsMatch(ShapePlacementContext context, object expression)
+    public bool IsMatch(ShapePlacementContext context, object expression)
+    {
+        var contentItem = GetContent(context);
+        if (contentItem is null)
         {
-            var contentItem = GetContent(context);
-            if (contentItem is null)
-            {
-                return false;
-            }
+            return false;
+        }
 
-            IEnumerable<string> contentTypes;
+        IEnumerable<string> contentTypes;
 
-            var jsonNode = JNode.FromObject(expression);
-            if (jsonNode is JsonArray jsonArray)
-            {
-                contentTypes = jsonArray.Values<string>();
-            }
-            else
-            {
-                contentTypes = new string[] { jsonNode.Value<string>() };
-            }
+        var jsonNode = JNode.FromObject(expression);
+        if (jsonNode is JsonArray jsonArray)
+        {
+            contentTypes = jsonArray.Values<string>();
+        }
+        else
+        {
+            contentTypes = new string[] { jsonNode.Value<string>() };
+        }
 
-            return contentTypes.Any(ct =>
+        return contentTypes.Any(ct =>
+        {
+            if (ct.EndsWith('*'))
             {
-                if (ct.EndsWith('*'))
-                {
-                    var prefix = ct[..^1];
+                var prefix = ct[..^1];
 
-                    return (contentItem.ContentType ?? "").StartsWith(prefix, StringComparison.OrdinalIgnoreCase) || (GetStereotype(context) ?? "").StartsWith(prefix, StringComparison.OrdinalIgnoreCase);
-                }
+                return (contentItem.ContentType ?? "").StartsWith(prefix, StringComparison.OrdinalIgnoreCase) || (GetStereotype(context) ?? "").StartsWith(prefix, StringComparison.OrdinalIgnoreCase);
+            }
 
-                return contentItem.ContentType == ct || GetStereotype(context) == ct;
-            });
-        }
+            return contentItem.ContentType == ct || GetStereotype(context) == ct;
+        });
+    }
 
-        private static string GetStereotype(ShapePlacementContext context)
-        {
-            var shape = context.ZoneShape as Shape;
-            object stereotypeVal = null;
-            shape?.Properties?.TryGetValue("Stereotype", out stereotypeVal);
-            return stereotypeVal?.ToString();
-        }
+    private static string GetStereotype(ShapePlacementContext context)
+    {
+        var shape = context.ZoneShape as Shape;
+        object stereotypeVal = null;
+        shape?.Properties?.TryGetValue("Stereotype", out stereotypeVal);
+        return stereotypeVal?.ToString();
     }
+}
 
-    public class ContentPlacementParseFilterProviderBase
+public class ContentPlacementParseFilterProviderBase
+{
+    protected static bool HasContent(ShapePlacementContext context)
     {
-        protected static bool HasContent(ShapePlacementContext context)
-        {
-            var shape = context.ZoneShape as Shape;
-            return shape != null && shape.TryGetProperty("ContentItem", out object contentItem) && contentItem != null;
-        }
+        var shape = context.ZoneShape as Shape;
+        return shape != null && shape.TryGetProperty("ContentItem", out object contentItem) && contentItem != null;
+    }
 
-        protected static ContentItem GetContent(ShapePlacementContext context)
+    protected static ContentItem GetContent(ShapePlacementContext context)
+    {
+        if (!HasContent(context))
         {
-            if (!HasContent(context))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var shape = context.ZoneShape as Shape;
-            shape.TryGetProperty("ContentItem", out ContentItem contentItem);
+        var shape = context.ZoneShape as Shape;
+        shape.TryGetProperty("ContentItem", out ContentItem contentItem);
 
-            return contentItem;
-        }
+        return contentItem;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ServiceCollectionExtensions.cs
index ca06b4fc6a9..d57edf53eda 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ServiceCollectionExtensions.cs
@@ -8,32 +8,31 @@
 using OrchardCore.DisplayManagement.Descriptors.ShapePlacementStrategy;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.ContentManagement.Display
+namespace OrchardCore.ContentManagement.Display;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    public static IServiceCollection AddContentManagementDisplay(this IServiceCollection services)
     {
-        public static IServiceCollection AddContentManagementDisplay(this IServiceCollection services)
+        services.Configure<TemplateOptions>(o =>
         {
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<ContentItemViewModel>();
-                o.MemberAccessStrategy.Register<ContentPartViewModel>();
-            });
+            o.MemberAccessStrategy.Register<ContentItemViewModel>();
+            o.MemberAccessStrategy.Register<ContentPartViewModel>();
+        });
 
-            services.TryAddTransient<IContentItemDisplayManager, ContentItemDisplayManager>();
-            services.TryAddEnumerable(new ServiceDescriptor(typeof(IContentDisplayHandler), typeof(ContentItemDisplayCoordinator), ServiceLifetime.Scoped));
+        services.TryAddTransient<IContentItemDisplayManager, ContentItemDisplayManager>();
+        services.TryAddEnumerable(new ServiceDescriptor(typeof(IContentDisplayHandler), typeof(ContentItemDisplayCoordinator), ServiceLifetime.Scoped));
 
-            services.AddScoped<IPlacementNodeFilterProvider, ContentTypePlacementNodeFilterProvider>();
-            services.AddScoped<IPlacementNodeFilterProvider, ContentPartPlacementNodeFilterProvider>();
+        services.AddScoped<IPlacementNodeFilterProvider, ContentTypePlacementNodeFilterProvider>();
+        services.AddScoped<IPlacementNodeFilterProvider, ContentPartPlacementNodeFilterProvider>();
 
-            services.AddScoped<IContentPartDisplayDriverResolver, ContentPartDisplayDriverResolver>();
-            services.AddScoped<IContentFieldDisplayDriverResolver, ContentFieldDisplayDriverResolver>();
+        services.AddScoped<IContentPartDisplayDriverResolver, ContentPartDisplayDriverResolver>();
+        services.AddScoped<IContentFieldDisplayDriverResolver, ContentFieldDisplayDriverResolver>();
 
-            services.AddOptions<ContentDisplayOptions>();
+        services.AddOptions<ContentDisplayOptions>();
 
-            services.AddLiquidFilter<ConsoleLogFilter>("console_log");
+        services.AddLiquidFilter<ConsoleLogFilter>("console_log");
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ViewModels/ContentItemViewModel.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ViewModels/ContentItemViewModel.cs
index 2f15d4e1214..6cee2f4322b 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ViewModels/ContentItemViewModel.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ViewModels/ContentItemViewModel.cs
@@ -1,18 +1,17 @@
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentManagement.Display.ViewModels
+namespace OrchardCore.ContentManagement.Display.ViewModels;
+
+public class ContentItemViewModel : ShapeViewModel
 {
-    public class ContentItemViewModel : ShapeViewModel
+    public ContentItemViewModel()
     {
-        public ContentItemViewModel()
-        {
-        }
-
-        public ContentItemViewModel(ContentItem contentItem)
-        {
-            ContentItem = contentItem;
-        }
+    }
 
-        public ContentItem ContentItem { get; set; }
+    public ContentItemViewModel(ContentItem contentItem)
+    {
+        ContentItem = contentItem;
     }
+
+    public ContentItem ContentItem { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ViewModels/ContentPartViewModel.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/ViewModels/ContentPartViewModel.cs
index 28c3ae87856..eb3ce967111 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ViewModels/ContentPartViewModel.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/ViewModels/ContentPartViewModel.cs
@@ -1,18 +1,17 @@
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.ContentManagement.Display.ViewModels
+namespace OrchardCore.ContentManagement.Display.ViewModels;
+
+public class ContentPartViewModel : ShapeViewModel
 {
-    public class ContentPartViewModel : ShapeViewModel
+    public ContentPartViewModel()
     {
-        public ContentPartViewModel()
-        {
-        }
-
-        public ContentPartViewModel(ContentPart contentPart)
-        {
-            ContentPart = contentPart;
-        }
+    }
 
-        public ContentPart ContentPart { get; set; }
+    public ContentPartViewModel(ContentPart contentPart)
+    {
+        ContentPart = contentPart;
     }
+
+    public ContentPart ContentPart { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Extensions/DataLoaderExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Extensions/DataLoaderExtensions.cs
index 965f18f91c0..f47b1094301 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Extensions/DataLoaderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Extensions/DataLoaderExtensions.cs
@@ -8,27 +8,26 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.ContentManagement.GraphQL
+namespace OrchardCore.ContentManagement.GraphQL;
+
+public static class DataLoaderExtensions
 {
-    public static class DataLoaderExtensions
+    public static IDataLoader<string, IEnumerable<ContentItem>> GetOrAddPublishedContentItemByIdDataLoader<T>(this IResolveFieldContext<T> context)
     {
-        public static IDataLoader<string, IEnumerable<ContentItem>> GetOrAddPublishedContentItemByIdDataLoader<T>(this IResolveFieldContext<T> context)
-        {
-            var accessor = context.RequestServices.GetRequiredService<IDataLoaderContextAccessor>();
-            var session = context.RequestServices.GetService<ISession>();
+        var accessor = context.RequestServices.GetRequiredService<IDataLoaderContextAccessor>();
+        var session = context.RequestServices.GetService<ISession>();
 
-            return accessor.Context.GetOrAddCollectionBatchLoader<string, ContentItem>("GetPublishedContentItemsById", ci => LoadPublishedContentItemsAsync(ci, session));
-        }
+        return accessor.Context.GetOrAddCollectionBatchLoader<string, ContentItem>("GetPublishedContentItemsById", ci => LoadPublishedContentItemsAsync(ci, session));
+    }
 
-        public static async Task<ILookup<string, ContentItem>> LoadPublishedContentItemsAsync(IEnumerable<string> contentItemIds, ISession session)
+    public static async Task<ILookup<string, ContentItem>> LoadPublishedContentItemsAsync(IEnumerable<string> contentItemIds, ISession session)
+    {
+        if (contentItemIds is null || !contentItemIds.Any())
         {
-            if (contentItemIds is null || !contentItemIds.Any())
-            {
-                return default;
-            }
-
-            var contentItemsLoaded = await session.Query<ContentItem, ContentItemIndex>(y => y.ContentItemId.IsIn(contentItemIds) && y.Published).ListAsync();
-            return contentItemsLoaded.ToLookup(k => k.ContentItemId, v => v);
+            return default;
         }
+
+        var contentItemsLoaded = await session.Query<ContentItem, ContentItemIndex>(y => y.ContentItemId.IsIn(contentItemIds) && y.Published).ListAsync();
+        return contentItemsLoaded.ToLookup(k => k.ContentItemId, v => v);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Extensions/StringExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Extensions/StringExtensions.cs
index 68e9e9908ca..f9b93aead1d 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Extensions/StringExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Extensions/StringExtensions.cs
@@ -2,13 +2,12 @@
 using GraphQL;
 using OrchardCore.ContentManagement.Utilities;
 
-namespace OrchardCore.ContentManagement.GraphQL
+namespace OrchardCore.ContentManagement.GraphQL;
+
+public static class StringExtensions
 {
-    public static class StringExtensions
+    public static string ToFieldName(this string name)
     {
-        public static string ToFieldName(this string name)
-        {
-            return name.TrimEnd("Part").ToCamelCase();
-        }
+        return name.TrimEnd("Part").ToCamelCase();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Options/GraphQLContentOptions.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Options/GraphQLContentOptions.cs
index bd494b4073a..5fb31e11355 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Options/GraphQLContentOptions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Options/GraphQLContentOptions.cs
@@ -6,233 +6,232 @@
 using OrchardCore.ContentManagement.GraphQL.Settings;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentManagement.GraphQL.Options
+namespace OrchardCore.ContentManagement.GraphQL.Options;
+
+public class GraphQLContentOptions
 {
-    public class GraphQLContentOptions
-    {
-        public IEnumerable<GraphQLContentTypeOption> ContentTypeOptions { get; set; } = [];
+    public IEnumerable<GraphQLContentTypeOption> ContentTypeOptions { get; set; } = [];
 
-        public IEnumerable<GraphQLContentPartOption> PartOptions { get; set; } = [];
+    public IEnumerable<GraphQLContentPartOption> PartOptions { get; set; } = [];
 
-        public IEnumerable<GraphQLField> HiddenFields { get; set; } = [];
+    public IEnumerable<GraphQLField> HiddenFields { get; set; } = [];
 
-        /// <summary>
-        /// By default, only content types without stereotypes are included.
-        /// This option enables you to explicitly add additional stereotypes for discovery.
-        /// </summary>
-        public HashSet<string> DiscoverableSterotypes { get; } = new(StringComparer.OrdinalIgnoreCase);
+    /// <summary>
+    /// By default, only content types without stereotypes are included.
+    /// This option enables you to explicitly add additional stereotypes for discovery.
+    /// </summary>
+    public HashSet<string> DiscoverableSterotypes { get; } = new(StringComparer.OrdinalIgnoreCase);
 
-        public GraphQLContentOptions ConfigureContentType(string contentType, Action<GraphQLContentTypeOption> action)
-        {
-            var option = new GraphQLContentTypeOption(contentType);
+    public GraphQLContentOptions ConfigureContentType(string contentType, Action<GraphQLContentTypeOption> action)
+    {
+        var option = new GraphQLContentTypeOption(contentType);
 
-            action(option);
+        action(option);
 
-            ContentTypeOptions = ContentTypeOptions.Union([option]);
+        ContentTypeOptions = ContentTypeOptions.Union([option]);
 
-            return this;
-        }
+        return this;
+    }
 
-        public GraphQLContentOptions ConfigurePart<TContentPart>(Action<GraphQLContentPartOption> action)
-            where TContentPart : ContentPart
-        {
-            var option = new GraphQLContentPartOption<TContentPart>();
+    public GraphQLContentOptions ConfigurePart<TContentPart>(Action<GraphQLContentPartOption> action)
+        where TContentPart : ContentPart
+    {
+        var option = new GraphQLContentPartOption<TContentPart>();
 
-            action(option);
+        action(option);
 
-            PartOptions = PartOptions.Union([option]);
+        PartOptions = PartOptions.Union([option]);
 
-            return this;
-        }
+        return this;
+    }
 
-        public GraphQLContentOptions ConfigurePart(string partName, Action<GraphQLContentPartOption> action)
-        {
-            var option = new GraphQLContentPartOption(partName);
+    public GraphQLContentOptions ConfigurePart(string partName, Action<GraphQLContentPartOption> action)
+    {
+        var option = new GraphQLContentPartOption(partName);
 
-            action(option);
+        action(option);
 
-            PartOptions = PartOptions.Union([option]);
+        PartOptions = PartOptions.Union([option]);
 
-            return this;
-        }
+        return this;
+    }
 
-        public GraphQLContentOptions IgnoreField<TGraphType>(string fieldName) where TGraphType : IObjectGraphType
-        {
-            HiddenFields = HiddenFields.Union([new GraphQLField<TGraphType>(fieldName)]);
+    public GraphQLContentOptions IgnoreField<TGraphType>(string fieldName) where TGraphType : IObjectGraphType
+    {
+        HiddenFields = HiddenFields.Union([new GraphQLField<TGraphType>(fieldName)]);
 
-            return this;
-        }
+        return this;
+    }
 
-        public GraphQLContentOptions IgnoreField(Type fieldType, string fieldName)
-        {
-            HiddenFields = HiddenFields.Union([new GraphQLField(fieldType, fieldName)]);
+    public GraphQLContentOptions IgnoreField(Type fieldType, string fieldName)
+    {
+        HiddenFields = HiddenFields.Union([new GraphQLField(fieldType, fieldName)]);
+
+        return this;
+    }
 
-            return this;
+    /// <summary>
+    /// Collapsing works at a hierarchy
+    ///
+    /// If the Content Type is marked at collapsed, then all parts are collapsed.
+    /// If the Content Type is not marked collapsed, then it falls down to the content type under it.
+    /// If the Content Part at a top level is marked collapsed, then it will trump above.
+    /// </summary>
+    /// <param name="definition"></param>
+    /// <returns></returns>
+    internal bool ShouldCollapse(ContentTypePartDefinition definition)
+    {
+        if (IsCollapsedByDefault(definition))
+        {
+            return true;
         }
 
-        /// <summary>
-        /// Collapsing works at a hierarchy
-        ///
-        /// If the Content Type is marked at collapsed, then all parts are collapsed.
-        /// If the Content Type is not marked collapsed, then it falls down to the content type under it.
-        /// If the Content Part at a top level is marked collapsed, then it will trump above.
-        /// </summary>
-        /// <param name="definition"></param>
-        /// <returns></returns>
-        internal bool ShouldCollapse(ContentTypePartDefinition definition)
+        var settings = definition.GetSettings<GraphQLContentTypePartSettings>();
+
+        if (settings.Collapse)
         {
-            if (IsCollapsedByDefault(definition))
-            {
-                return true;
-            }
+            return true;
+        }
 
-            var settings = definition.GetSettings<GraphQLContentTypePartSettings>();
+        return false;
+    }
 
-            if (settings.Collapse)
-            {
-                return true;
-            }
+    public bool IsCollapsedByDefault(ContentTypePartDefinition definition)
+    {
+        var contentType = definition.ContentTypeDefinition.Name;
+        var partName = definition.PartDefinition.Name;
 
-            return false;
+        if (contentType == partName)
+        {
+            return true;
         }
 
-        public bool IsCollapsedByDefault(ContentTypePartDefinition definition)
-        {
-            var contentType = definition.ContentTypeDefinition.Name;
-            var partName = definition.PartDefinition.Name;
+        var contentTypeOption = ContentTypeOptions.FirstOrDefault(ctp => ctp.ContentType == contentType);
 
-            if (contentType == partName)
+        if (contentTypeOption != null)
+        {
+            if (contentTypeOption.Collapse)
             {
                 return true;
             }
 
-            var contentTypeOption = ContentTypeOptions.FirstOrDefault(ctp => ctp.ContentType == contentType);
-
-            if (contentTypeOption != null)
-            {
-                if (contentTypeOption.Collapse)
-                {
-                    return true;
-                }
-
-                var contentTypePartOption = contentTypeOption.PartOptions.FirstOrDefault(p => p.Name == partName);
-
-                if (contentTypePartOption != null)
-                {
-                    if (contentTypePartOption.Collapse)
-                    {
-                        return true;
-                    }
-                }
-            }
-
-            var contentPartOption = PartOptions.FirstOrDefault(p => p.Name == partName);
+            var contentTypePartOption = contentTypeOption.PartOptions.FirstOrDefault(p => p.Name == partName);
 
-            if (contentPartOption != null)
+            if (contentTypePartOption != null)
             {
-                if (contentPartOption.Collapse)
+                if (contentTypePartOption.Collapse)
                 {
                     return true;
                 }
             }
-
-            return false;
         }
 
-        internal bool ShouldSkip(ContentTypePartDefinition definition)
+        var contentPartOption = PartOptions.FirstOrDefault(p => p.Name == partName);
+
+        if (contentPartOption != null)
         {
-            if (IsHiddenByDefault(definition))
+            if (contentPartOption.Collapse)
             {
                 return true;
             }
+        }
 
-            var settings = definition.GetSettings<GraphQLContentTypePartSettings>();
-
-            if (settings.Hidden)
-            {
-                return true;
-            }
+        return false;
+    }
 
-            return false;
+    internal bool ShouldSkip(ContentTypePartDefinition definition)
+    {
+        if (IsHiddenByDefault(definition))
+        {
+            return true;
         }
 
-        public bool IsHiddenByDefault(string contentType)
+        var settings = definition.GetSettings<GraphQLContentTypePartSettings>();
+
+        if (settings.Hidden)
         {
-            ArgumentException.ThrowIfNullOrEmpty(contentType);
+            return true;
+        }
 
-            var contentTypeOption = ContentTypeOptions.FirstOrDefault(ctp => ctp.ContentType == contentType);
+        return false;
+    }
 
-            return contentTypeOption?.Hidden ?? false;
-        }
+    public bool IsHiddenByDefault(string contentType)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(contentType);
 
-        public bool ShouldHide(ContentTypeDefinition definition)
-        {
-            ArgumentNullException.ThrowIfNull(definition);
+        var contentTypeOption = ContentTypeOptions.FirstOrDefault(ctp => ctp.ContentType == contentType);
 
-            var settings = definition.GetSettings<GraphQLContentTypeSettings>();
+        return contentTypeOption?.Hidden ?? false;
+    }
 
-            if (settings.Hidden)
-            {
-                return true;
-            }
+    public bool ShouldHide(ContentTypeDefinition definition)
+    {
+        ArgumentNullException.ThrowIfNull(definition);
 
-            return IsHiddenByDefault(definition.Name);
-        }
+        var settings = definition.GetSettings<GraphQLContentTypeSettings>();
 
-        internal bool ShouldSkip(Type fieldType, string fieldName)
+        if (settings.Hidden)
         {
-            return HiddenFields
-                .Any(x => x.FieldType == fieldType && x.FieldName.Equals(fieldName, StringComparison.OrdinalIgnoreCase));
+            return true;
         }
 
-        public bool IsHiddenByDefault(ContentTypePartDefinition definition)
-        {
-            var contentType = definition.ContentTypeDefinition.Name;
-            var partName = definition.PartDefinition.Name;
+        return IsHiddenByDefault(definition.Name);
+    }
 
-            var contentTypeOption = ContentTypeOptions.FirstOrDefault(ctp => ctp.ContentType == contentType);
+    internal bool ShouldSkip(Type fieldType, string fieldName)
+    {
+        return HiddenFields
+            .Any(x => x.FieldType == fieldType && x.FieldName.Equals(fieldName, StringComparison.OrdinalIgnoreCase));
+    }
 
-            if (contentTypeOption != null)
-            {
-                if (contentTypeOption.Hidden)
-                {
-                    return true;
-                }
+    public bool IsHiddenByDefault(ContentTypePartDefinition definition)
+    {
+        var contentType = definition.ContentTypeDefinition.Name;
+        var partName = definition.PartDefinition.Name;
 
-                var contentTypePartOption = contentTypeOption.PartOptions.FirstOrDefault(p => p.Name == partName);
+        var contentTypeOption = ContentTypeOptions.FirstOrDefault(ctp => ctp.ContentType == contentType);
 
-                if (contentTypePartOption != null)
-                {
-                    if (contentTypePartOption.Hidden)
-                    {
-                        return true;
-                    }
-                }
+        if (contentTypeOption != null)
+        {
+            if (contentTypeOption.Hidden)
+            {
+                return true;
             }
 
-            var contentPartOption = PartOptions.FirstOrDefault(p => p.Name == partName);
+            var contentTypePartOption = contentTypeOption.PartOptions.FirstOrDefault(p => p.Name == partName);
 
-            if (contentPartOption != null)
+            if (contentTypePartOption != null)
             {
-                if (contentPartOption.Hidden)
+                if (contentTypePartOption.Hidden)
                 {
                     return true;
                 }
             }
-
-            return false;
         }
 
-        internal static string GetFieldName(ContentTypePartDefinition definition, string partName, string fieldName)
-        {
-            var settings = definition.GetSettings<GraphQLContentTypePartSettings>();
+        var contentPartOption = PartOptions.FirstOrDefault(p => p.Name == partName);
 
-            if (settings.PreventFieldNameCollision)
+        if (contentPartOption != null)
+        {
+            if (contentPartOption.Hidden)
             {
-                return partName.ToFieldName() + fieldName.ToPascalCase();
+                return true;
             }
+        }
 
-            return fieldName.ToCamelCase();
+        return false;
+    }
+
+    internal static string GetFieldName(ContentTypePartDefinition definition, string partName, string fieldName)
+    {
+        var settings = definition.GetSettings<GraphQLContentTypePartSettings>();
+
+        if (settings.PreventFieldNameCollision)
+        {
+            return partName.ToFieldName() + fieldName.ToPascalCase();
         }
+
+        return fieldName.ToCamelCase();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Options/GraphQLContentPartOption.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Options/GraphQLContentPartOption.cs
index 3f8bece59c0..5b174f46e9b 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Options/GraphQLContentPartOption.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Options/GraphQLContentPartOption.cs
@@ -1,26 +1,25 @@
 using System;
 
-namespace OrchardCore.ContentManagement.GraphQL.Options
+namespace OrchardCore.ContentManagement.GraphQL.Options;
+
+public class GraphQLContentPartOption<TContentPart> : GraphQLContentPartOption where TContentPart : ContentPart
 {
-    public class GraphQLContentPartOption<TContentPart> : GraphQLContentPartOption where TContentPart : ContentPart
+    public GraphQLContentPartOption() : base(typeof(TContentPart).Name)
     {
-        public GraphQLContentPartOption() : base(typeof(TContentPart).Name)
-        {
-        }
     }
+}
 
-    public class GraphQLContentPartOption
+public class GraphQLContentPartOption
+{
+    public GraphQLContentPartOption(string contentPartName)
     {
-        public GraphQLContentPartOption(string contentPartName)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(contentPartName);
+        ArgumentException.ThrowIfNullOrEmpty(contentPartName);
 
-            Name = contentPartName;
-        }
+        Name = contentPartName;
+    }
 
-        public string Name { get; }
+    public string Name { get; }
 
-        public bool Collapse { get; set; }
-        public bool Hidden { get; set; }
-    }
+    public bool Collapse { get; set; }
+    public bool Hidden { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Options/GraphQLContentTypeOption.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Options/GraphQLContentTypeOption.cs
index fb6b36fe0d7..aa838a78efb 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Options/GraphQLContentTypeOption.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Options/GraphQLContentTypeOption.cs
@@ -2,47 +2,46 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OrchardCore.ContentManagement.GraphQL.Options
+namespace OrchardCore.ContentManagement.GraphQL.Options;
+
+public class GraphQLContentTypeOption
 {
-    public class GraphQLContentTypeOption
+    public GraphQLContentTypeOption(string contentType)
     {
-        public GraphQLContentTypeOption(string contentType)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(contentType);
+        ArgumentException.ThrowIfNullOrEmpty(contentType);
 
-            ContentType = contentType;
-        }
+        ContentType = contentType;
+    }
 
-        public string ContentType { get; }
+    public string ContentType { get; }
 
-        public bool Collapse { get; set; }
+    public bool Collapse { get; set; }
 
-        public bool Hidden { get; set; }
+    public bool Hidden { get; set; }
 
-        public IEnumerable<GraphQLContentPartOption> PartOptions { get; set; }
-            = [];
+    public IEnumerable<GraphQLContentPartOption> PartOptions { get; set; }
+        = [];
 
-        public GraphQLContentTypeOption ConfigurePart<TContentPart>(Action<GraphQLContentPartOption> action)
-            where TContentPart : ContentPart
-        {
-            var option = new GraphQLContentPartOption<TContentPart>();
+    public GraphQLContentTypeOption ConfigurePart<TContentPart>(Action<GraphQLContentPartOption> action)
+        where TContentPart : ContentPart
+    {
+        var option = new GraphQLContentPartOption<TContentPart>();
 
-            action(option);
+        action(option);
 
-            PartOptions = PartOptions.Union(new[] { option });
+        PartOptions = PartOptions.Union(new[] { option });
 
-            return this;
-        }
+        return this;
+    }
 
-        public GraphQLContentTypeOption ConfigurePart(string partName, Action<GraphQLContentPartOption> action)
-        {
-            var option = new GraphQLContentPartOption(partName);
+    public GraphQLContentTypeOption ConfigurePart(string partName, Action<GraphQLContentPartOption> action)
+    {
+        var option = new GraphQLContentPartOption(partName);
 
-            action(option);
+        action(option);
 
-            PartOptions = PartOptions.Union(new[] { option });
+        PartOptions = PartOptions.Union(new[] { option });
 
-            return this;
-        }
+        return this;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Options/GraphQLField.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Options/GraphQLField.cs
index 984ab55909f..b6878fee167 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Options/GraphQLField.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Options/GraphQLField.cs
@@ -1,28 +1,27 @@
 using System;
 using GraphQL.Types;
 
-namespace OrchardCore.ContentManagement.GraphQL.Options
+namespace OrchardCore.ContentManagement.GraphQL.Options;
+
+public class GraphQLField<TGraphType> : GraphQLField where TGraphType : IObjectGraphType
 {
-    public class GraphQLField<TGraphType> : GraphQLField where TGraphType : IObjectGraphType
+    public GraphQLField(string fieldName) : base(typeof(TGraphType), fieldName)
     {
-        public GraphQLField(string fieldName) : base(typeof(TGraphType), fieldName)
-        {
-        }
     }
+}
 
-    public class GraphQLField
+public class GraphQLField
+{
+    public GraphQLField(Type fieldType, string fieldName)
     {
-        public GraphQLField(Type fieldType, string fieldName)
-        {
-            ArgumentNullException.ThrowIfNull(fieldType);
-            ArgumentException.ThrowIfNullOrWhiteSpace(fieldName);
+        ArgumentNullException.ThrowIfNull(fieldType);
+        ArgumentException.ThrowIfNullOrWhiteSpace(fieldName);
 
-            FieldName = fieldName;
-            FieldType = fieldType;
-        }
+        FieldName = fieldName;
+        FieldType = fieldType;
+    }
 
-        public string FieldName { get; }
+    public string FieldName { get; }
 
-        public Type FieldType { get; }
-    }
+    public Type FieldType { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/ContentItemQuery.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/ContentItemQuery.cs
index bec5c82c157..a298f6c23d6 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/ContentItemQuery.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/ContentItemQuery.cs
@@ -8,51 +8,50 @@
 using OrchardCore.Apis.GraphQL;
 using OrchardCore.ContentManagement.GraphQL.Queries.Types;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries
+namespace OrchardCore.ContentManagement.GraphQL.Queries;
+
+public class ContentItemQuery : ISchemaBuilder
 {
-    public class ContentItemQuery : ISchemaBuilder
-    {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        protected readonly IStringLocalizer S;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    protected readonly IStringLocalizer S;
 
-        public ContentItemQuery(IHttpContextAccessor httpContextAccessor,
-            IStringLocalizer<ContentItemQuery> localizer)
-        {
-            _httpContextAccessor = httpContextAccessor;
+    public ContentItemQuery(IHttpContextAccessor httpContextAccessor,
+        IStringLocalizer<ContentItemQuery> localizer)
+    {
+        _httpContextAccessor = httpContextAccessor;
 
-            S = localizer;
-        }
+        S = localizer;
+    }
 
-        public Task<string> GetIdentifierAsync() => Task.FromResult(string.Empty);
+    public Task<string> GetIdentifierAsync() => Task.FromResult(string.Empty);
 
-        public Task BuildAsync(ISchema schema)
-        {
-            var field = new FieldType
-            {
-                Name = "ContentItem",
-                Description = S["Content items are instances of content types, just like objects are instances of classes."],
-                Type = typeof(ContentItemInterface),
-                Arguments = new QueryArguments(
-                    new QueryArgument<NonNullGraphType<StringGraphType>>
-                    {
-                        Name = "contentItemId",
-                        Description = S["Content item id"]
-                    }
-                ),
-                Resolver = new FuncFieldResolver<ContentItem>(ResolveAsync)
-            };
-
-            schema.Query.AddField(field);
-
-            return Task.CompletedTask;
-        }
-
-        private async ValueTask<ContentItem> ResolveAsync(IResolveFieldContext context)
+    public Task BuildAsync(ISchema schema)
+    {
+        var field = new FieldType
         {
-            var contentItemId = context.GetArgument<string>("contentItemId");
-            var contentManager = _httpContextAccessor.HttpContext.RequestServices.GetService<IContentManager>();
+            Name = "ContentItem",
+            Description = S["Content items are instances of content types, just like objects are instances of classes."],
+            Type = typeof(ContentItemInterface),
+            Arguments = new QueryArguments(
+                new QueryArgument<NonNullGraphType<StringGraphType>>
+                {
+                    Name = "contentItemId",
+                    Description = S["Content item id"]
+                }
+            ),
+            Resolver = new FuncFieldResolver<ContentItem>(ResolveAsync)
+        };
+
+        schema.Query.AddField(field);
+
+        return Task.CompletedTask;
+    }
+
+    private async ValueTask<ContentItem> ResolveAsync(IResolveFieldContext context)
+    {
+        var contentItemId = context.GetArgument<string>("contentItemId");
+        var contentManager = _httpContextAccessor.HttpContext.RequestServices.GetService<IContentManager>();
 
-            return await contentManager.GetAsync(contentItemId);
-        }
+        return await contentManager.GetAsync(contentItemId);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/ContentItemsFieldType.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/ContentItemsFieldType.cs
index 7ceeacf0c7c..9280144bcac 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/ContentItemsFieldType.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/ContentItemsFieldType.cs
@@ -19,409 +19,408 @@
 using YesSql;
 using Expression = OrchardCore.ContentManagement.GraphQL.Queries.Predicates.Expression;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries
+namespace OrchardCore.ContentManagement.GraphQL.Queries;
+
+/// <summary>
+/// This type is used by <see cref="ContentTypeQuery"/> to represent a query on a content type.
+/// </summary>
+public class ContentItemsFieldType : FieldType
 {
-    /// <summary>
-    /// This type is used by <see cref="ContentTypeQuery"/> to represent a query on a content type.
-    /// </summary>
-    public class ContentItemsFieldType : FieldType
+    private static readonly List<string> _contentItemProperties;
+    private readonly int _defaultNumberOfItems;
+
+    static ContentItemsFieldType()
     {
-        private static readonly List<string> _contentItemProperties;
-        private readonly int _defaultNumberOfItems;
+        _contentItemProperties = [];
 
-        static ContentItemsFieldType()
+        foreach (var property in typeof(ContentItemIndex).GetProperties())
         {
-            _contentItemProperties = [];
-
-            foreach (var property in typeof(ContentItemIndex).GetProperties())
-            {
-                _contentItemProperties.Add(property.Name);
-            }
+            _contentItemProperties.Add(property.Name);
         }
+    }
 
-        public ContentItemsFieldType(string contentItemName, ISchema schema, IOptions<GraphQLContentOptions> optionsAccessor, IOptions<GraphQLSettings> settingsAccessor)
-        {
-            Name = "ContentItems";
+    public ContentItemsFieldType(string contentItemName, ISchema schema, IOptions<GraphQLContentOptions> optionsAccessor, IOptions<GraphQLSettings> settingsAccessor)
+    {
+        Name = "ContentItems";
 
-            Type = typeof(ListGraphType<ContentItemType>);
+        Type = typeof(ListGraphType<ContentItemType>);
 
-            var whereInput = new ContentItemWhereInput(contentItemName, optionsAccessor);
-            var orderByInput = new ContentItemOrderByInput(contentItemName);
+        var whereInput = new ContentItemWhereInput(contentItemName, optionsAccessor);
+        var orderByInput = new ContentItemOrderByInput(contentItemName);
 
-            Arguments = new QueryArguments(
-                new QueryArgument<ContentItemWhereInput> { Name = "where", Description = "filters the content items", ResolvedType = whereInput },
-                new QueryArgument<ContentItemOrderByInput> { Name = "orderBy", Description = "sort order", ResolvedType = orderByInput },
-                new QueryArgument<IntGraphType> { Name = "first", Description = "the first n content items", ResolvedType = new IntGraphType() },
-                new QueryArgument<IntGraphType> { Name = "skip", Description = "the number of content items to skip", ResolvedType = new IntGraphType() },
-                new QueryArgument<PublicationStatusGraphType> { Name = "status", Description = "publication status of the content item", ResolvedType = new PublicationStatusGraphType(), DefaultValue = PublicationStatusEnum.Published }
-            );
+        Arguments = new QueryArguments(
+            new QueryArgument<ContentItemWhereInput> { Name = "where", Description = "filters the content items", ResolvedType = whereInput },
+            new QueryArgument<ContentItemOrderByInput> { Name = "orderBy", Description = "sort order", ResolvedType = orderByInput },
+            new QueryArgument<IntGraphType> { Name = "first", Description = "the first n content items", ResolvedType = new IntGraphType() },
+            new QueryArgument<IntGraphType> { Name = "skip", Description = "the number of content items to skip", ResolvedType = new IntGraphType() },
+            new QueryArgument<PublicationStatusGraphType> { Name = "status", Description = "publication status of the content item", ResolvedType = new PublicationStatusGraphType(), DefaultValue = PublicationStatusEnum.Published }
+        );
 
-            Resolver = new LockedAsyncFieldResolver<IEnumerable<ContentItem>>(ResolveAsync);
+        Resolver = new LockedAsyncFieldResolver<IEnumerable<ContentItem>>(ResolveAsync);
 
-            schema.RegisterType(whereInput);
-            schema.RegisterType(orderByInput);
-            schema.RegisterType<PublicationStatusGraphType>();
+        schema.RegisterType(whereInput);
+        schema.RegisterType(orderByInput);
+        schema.RegisterType<PublicationStatusGraphType>();
 
-            _defaultNumberOfItems = settingsAccessor.Value.DefaultNumberOfResults;
-        }
+        _defaultNumberOfItems = settingsAccessor.Value.DefaultNumberOfResults;
+    }
 
-        private async ValueTask<IEnumerable<ContentItem>> ResolveAsync(IResolveFieldContext context)
+    private async ValueTask<IEnumerable<ContentItem>> ResolveAsync(IResolveFieldContext context)
 
+    {
+        JsonObject where = null;
+        if (context.HasArgument("where"))
         {
-            JsonObject where = null;
-            if (context.HasArgument("where"))
-            {
-                // 'context.Arguments[].Value' is never null in GraphQL.NET 4.
-                where = JObject.FromObject(context.Arguments["where"].Value);
-            }
-
-            var session = context.RequestServices.GetService<ISession>();
+            // 'context.Arguments[].Value' is never null in GraphQL.NET 4.
+            where = JObject.FromObject(context.Arguments["where"].Value);
+        }
 
-            var preQuery = session.Query<ContentItem>();
+        var session = context.RequestServices.GetService<ISession>();
 
-            var filters = context.RequestServices.GetServices<IGraphQLFilter<ContentItem>>();
+        var preQuery = session.Query<ContentItem>();
 
-            foreach (var filter in filters)
-            {
-                preQuery = await filter.PreQueryAsync(preQuery, context);
-            }
+        var filters = context.RequestServices.GetServices<IGraphQLFilter<ContentItem>>();
 
-            var query = preQuery.With<ContentItemIndex>();
+        foreach (var filter in filters)
+        {
+            preQuery = await filter.PreQueryAsync(preQuery, context);
+        }
 
-            query = FilterVersion(query, GetVersionOptions(context));
-            query = FilterContentType(query, context);
-            query = OrderBy(query, context);
+        var query = preQuery.With<ContentItemIndex>();
 
-            var contentItemsQuery = await FilterWhereArgumentsAsync(query, where, context, session);
-            contentItemsQuery = PageQuery(contentItemsQuery, context);
+        query = FilterVersion(query, GetVersionOptions(context));
+        query = FilterContentType(query, context);
+        query = OrderBy(query, context);
 
-            var contentItems = await contentItemsQuery.ListAsync();
+        var contentItemsQuery = await FilterWhereArgumentsAsync(query, where, context, session);
+        contentItemsQuery = PageQuery(contentItemsQuery, context);
 
-            foreach (var filter in filters)
-            {
-                contentItems = await filter.PostQueryAsync(contentItems, context);
-            }
+        var contentItems = await contentItemsQuery.ListAsync();
 
-            return contentItems;
+        foreach (var filter in filters)
+        {
+            contentItems = await filter.PostQueryAsync(contentItems, context);
         }
 
-        private async ValueTask<IQuery<ContentItem>> FilterWhereArgumentsAsync(
-            IQuery<ContentItem, ContentItemIndex> query,
-            JsonObject where,
-            IResolveFieldContext fieldContext,
-            ISession session)
+        return contentItems;
+    }
+
+    private async ValueTask<IQuery<ContentItem>> FilterWhereArgumentsAsync(
+        IQuery<ContentItem, ContentItemIndex> query,
+        JsonObject where,
+        IResolveFieldContext fieldContext,
+        ISession session)
+    {
+        if (where == null)
         {
-            if (where == null)
-            {
-                return query;
-            }
+            return query;
+        }
 
-            var defaultTableAlias = query.GetTypeAlias(typeof(ContentItemIndex));
+        var defaultTableAlias = query.GetTypeAlias(typeof(ContentItemIndex));
 
-            var predicateQuery = new PredicateQuery(
-                configuration: session.Store.Configuration,
-                propertyProviders: fieldContext.RequestServices.GetServices<IIndexPropertyProvider>());
+        var predicateQuery = new PredicateQuery(
+            configuration: session.Store.Configuration,
+            propertyProviders: fieldContext.RequestServices.GetServices<IIndexPropertyProvider>());
 
-            // Create the default table alias.
-            predicateQuery.CreateAlias(string.Empty, nameof(ContentItemIndex));
-            predicateQuery.CreateTableAlias(nameof(ContentItemIndex), defaultTableAlias);
+        // Create the default table alias.
+        predicateQuery.CreateAlias(string.Empty, nameof(ContentItemIndex));
+        predicateQuery.CreateTableAlias(nameof(ContentItemIndex), defaultTableAlias);
 
-            // Add all provided table alias to the current predicate query.
-            var providers = fieldContext.RequestServices.GetServices<IIndexAliasProvider>();
-            var indexes = new Dictionary<string, IndexAlias>(StringComparer.OrdinalIgnoreCase);
-            var indexAliases = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        // Add all provided table alias to the current predicate query.
+        var providers = fieldContext.RequestServices.GetServices<IIndexAliasProvider>();
+        var indexes = new Dictionary<string, IndexAlias>(StringComparer.OrdinalIgnoreCase);
+        var indexAliases = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
-            foreach (var aliasProvider in providers)
+        foreach (var aliasProvider in providers)
+        {
+            foreach (var alias in await aliasProvider.GetAliasesAsync())
             {
-                foreach (var alias in await aliasProvider.GetAliasesAsync())
+                predicateQuery.CreateAlias(alias.Alias, alias.Index);
+                if (indexAliases.TryAdd(alias.Alias, alias.Alias))
                 {
-                    predicateQuery.CreateAlias(alias.Alias, alias.Index);
-                    if (indexAliases.TryAdd(alias.Alias, alias.Alias))
-                    {
-                        indexes.TryAdd(alias.Index, alias);
-                    }
+                    indexes.TryAdd(alias.Index, alias);
                 }
             }
+        }
 
-            var expressions = Expression.Conjunction();
-            BuildWhereExpressions(where, expressions, null, fieldContext, indexAliases);
-            expressions.SearchUsedAlias(predicateQuery);
+        var expressions = Expression.Conjunction();
+        BuildWhereExpressions(where, expressions, null, fieldContext, indexAliases);
+        expressions.SearchUsedAlias(predicateQuery);
 
-            // Add all Indexes that were used in the predicate query.
-            IQuery<ContentItem> contentQuery = query;
-            foreach (var usedAlias in predicateQuery.GetUsedAliases())
+        // Add all Indexes that were used in the predicate query.
+        IQuery<ContentItem> contentQuery = query;
+        foreach (var usedAlias in predicateQuery.GetUsedAliases())
+        {
+            if (indexes.TryGetValue(usedAlias, out var indexAlias))
             {
-                if (indexes.TryGetValue(usedAlias, out var indexAlias))
-                {
-                    contentQuery = contentQuery.With(indexAlias.IndexType);
-                    var tableAlias = query.GetTypeAlias(indexAlias.IndexType);
-                    predicateQuery.CreateTableAlias(indexAlias.Index, tableAlias);
-                }
+                contentQuery = contentQuery.With(indexAlias.IndexType);
+                var tableAlias = query.GetTypeAlias(indexAlias.IndexType);
+                predicateQuery.CreateTableAlias(indexAlias.Index, tableAlias);
             }
+        }
 
-            var whereSqlClause = expressions.ToSqlString(predicateQuery);
+        var whereSqlClause = expressions.ToSqlString(predicateQuery);
 
 
-            query = query.Where(whereSqlClause);
+        query = query.Where(whereSqlClause);
 
-            // Add all parameters that were used in the predicate query.
-            foreach (var parameter in predicateQuery.Parameters)
-            {
-                query = query.WithParameter(parameter.Key, parameter.Value);
-            }
+        // Add all parameters that were used in the predicate query.
+        foreach (var parameter in predicateQuery.Parameters)
+        {
+            query = query.WithParameter(parameter.Key, parameter.Value);
+        }
+
+        return contentQuery;
+    }
+
+    private IQuery<ContentItem> PageQuery(IQuery<ContentItem> contentItemsQuery, IResolveFieldContext context)
+    {
+        var first = context.GetArgument<int>("first");
 
-            return contentQuery;
+        if (first == 0)
+        {
+            first = _defaultNumberOfItems;
         }
 
-        private IQuery<ContentItem> PageQuery(IQuery<ContentItem> contentItemsQuery, IResolveFieldContext context)
+        contentItemsQuery = contentItemsQuery.Take(first);
+
+        if (context.HasPopulatedArgument("skip"))
         {
-            var first = context.GetArgument<int>("first");
+            var skip = context.GetArgument<int>("skip");
 
-            if (first == 0)
-            {
-                first = _defaultNumberOfItems;
-            }
+            contentItemsQuery = contentItemsQuery.Skip(skip);
+        }
 
-            contentItemsQuery = contentItemsQuery.Take(first);
+        return contentItemsQuery;
+    }
 
-            if (context.HasPopulatedArgument("skip"))
-            {
-                var skip = context.GetArgument<int>("skip");
+    private static VersionOptions GetVersionOption(PublicationStatusEnum status)
+    {
+        return status switch
+        {
+            PublicationStatusEnum.Published => VersionOptions.Published,
+            PublicationStatusEnum.Draft => VersionOptions.Draft,
+            PublicationStatusEnum.Latest => VersionOptions.Latest,
+            _ => VersionOptions.Published,
+        };
+    }
 
-                contentItemsQuery = contentItemsQuery.Skip(skip);
-            }
+    private static IQuery<ContentItem, ContentItemIndex> FilterContentType(IQuery<ContentItem, ContentItemIndex> query, IResolveFieldContext context)
+    {
+        ArgumentNullException.ThrowIfNull(context);
 
-            return contentItemsQuery;
-        }
+        var contentType = ((ListGraphType)(context.FieldDefinition).ResolvedType).ResolvedType.Name;
+        return query.Where(q => q.ContentType == contentType);
+    }
 
-        private static VersionOptions GetVersionOption(PublicationStatusEnum status)
+    private static VersionOptions GetVersionOptions(IResolveFieldContext context)
+    {
+        if (context.HasPopulatedArgument("status"))
         {
-            return status switch
-            {
-                PublicationStatusEnum.Published => VersionOptions.Published,
-                PublicationStatusEnum.Draft => VersionOptions.Draft,
-                PublicationStatusEnum.Latest => VersionOptions.Latest,
-                _ => VersionOptions.Published,
-            };
+            return GetVersionOption(context.GetArgument<PublicationStatusEnum>("status"));
         }
 
-        private static IQuery<ContentItem, ContentItemIndex> FilterContentType(IQuery<ContentItem, ContentItemIndex> query, IResolveFieldContext context)
-        {
-            ArgumentNullException.ThrowIfNull(context);
+        return VersionOptions.Published;
+    }
 
-            var contentType = ((ListGraphType)(context.FieldDefinition).ResolvedType).ResolvedType.Name;
-            return query.Where(q => q.ContentType == contentType);
+    private static IQuery<ContentItem, ContentItemIndex> FilterVersion(IQuery<ContentItem, ContentItemIndex> query, VersionOptions versionOption)
+    {
+        if (versionOption.IsPublished)
+        {
+            query = query.Where(q => q.Published == true);
         }
-
-        private static VersionOptions GetVersionOptions(IResolveFieldContext context)
+        else if (versionOption.IsDraft)
         {
-            if (context.HasPopulatedArgument("status"))
-            {
-                return GetVersionOption(context.GetArgument<PublicationStatusEnum>("status"));
-            }
-
-            return VersionOptions.Published;
+            query = query.Where(q => q.Latest == true && q.Published == false);
         }
-
-        private static IQuery<ContentItem, ContentItemIndex> FilterVersion(IQuery<ContentItem, ContentItemIndex> query, VersionOptions versionOption)
+        else if (versionOption.IsLatest)
         {
-            if (versionOption.IsPublished)
-            {
-                query = query.Where(q => q.Published == true);
-            }
-            else if (versionOption.IsDraft)
-            {
-                query = query.Where(q => q.Latest == true && q.Published == false);
-            }
-            else if (versionOption.IsLatest)
-            {
-                query = query.Where(q => q.Latest == true);
-            }
-
-            return query;
+            query = query.Where(q => q.Latest == true);
         }
 
-        private void BuildWhereExpressions(JsonNode where, Junction expressions, string tableAlias, IResolveFieldContext fieldContext, IDictionary<string, string> indexAliases)
+        return query;
+    }
+
+    private void BuildWhereExpressions(JsonNode where, Junction expressions, string tableAlias, IResolveFieldContext fieldContext, IDictionary<string, string> indexAliases)
+    {
+        if (where is JsonArray array)
         {
-            if (where is JsonArray array)
+            foreach (var child in array)
             {
-                foreach (var child in array)
+                if (child is JsonObject whereObject)
                 {
-                    if (child is JsonObject whereObject)
-                    {
-                        BuildExpressionsInternal(whereObject, expressions, tableAlias, fieldContext, indexAliases);
-                    }
+                    BuildExpressionsInternal(whereObject, expressions, tableAlias, fieldContext, indexAliases);
                 }
             }
-            else if (where is JsonObject whereObject)
-            {
-                BuildExpressionsInternal(whereObject, expressions, tableAlias, fieldContext, indexAliases);
-            }
         }
+        else if (where is JsonObject whereObject)
+        {
+            BuildExpressionsInternal(whereObject, expressions, tableAlias, fieldContext, indexAliases);
+        }
+    }
 
-        private void BuildExpressionsInternal(JsonObject where, Junction expressions, string tableAlias, IResolveFieldContext fieldContext, IDictionary<string, string> indexAliases)
+    private void BuildExpressionsInternal(JsonObject where, Junction expressions, string tableAlias, IResolveFieldContext fieldContext, IDictionary<string, string> indexAliases)
+    {
+        foreach (var entry in where)
         {
-            foreach (var entry in where)
+            // New typed arguments return default null values.
+            if (entry.Value.GetValueKind() == JsonValueKind.Undefined || entry.Value.GetValueKind() == JsonValueKind.Null)
             {
-                // New typed arguments return default null values.
-                if (entry.Value.GetValueKind() == JsonValueKind.Undefined || entry.Value.GetValueKind() == JsonValueKind.Null)
-                {
-                    continue;
-                }
+                continue;
+            }
 
-                IPredicate expression = null;
+            IPredicate expression = null;
 
-                var values = entry.Key.Split('_', 2);
+            var values = entry.Key.Split('_', 2);
 
-                // Gets the full path name without the comparison e.g. aliasPart.alias, not aliasPart.alias_contains.
-                var property = values[0];
+            // Gets the full path name without the comparison e.g. aliasPart.alias, not aliasPart.alias_contains.
+            var property = values[0];
+
+            // Figure out table aliases for collapsed parts and ones with the part suffix removed by the dsl.
+            if (tableAlias == null || !tableAlias.EndsWith("Part", StringComparison.OrdinalIgnoreCase))
+            {
+                var whereArgument = fieldContext?.FieldDefinition.Arguments.FirstOrDefault(x => x.Name == "where");
 
-                // Figure out table aliases for collapsed parts and ones with the part suffix removed by the dsl.
-                if (tableAlias == null || !tableAlias.EndsWith("Part", StringComparison.OrdinalIgnoreCase))
+                if (whereArgument != null)
                 {
-                    var whereArgument = fieldContext?.FieldDefinition.Arguments.FirstOrDefault(x => x.Name == "where");
+                    var whereInput = (WhereInputObjectGraphType)whereArgument.ResolvedType;
 
-                    if (whereArgument != null)
+                    foreach (var field in whereInput.Fields.Where(x => x.GetMetadata<string>("PartName") != null))
                     {
-                        var whereInput = (WhereInputObjectGraphType)whereArgument.ResolvedType;
-
-                        foreach (var field in whereInput.Fields.Where(x => x.GetMetadata<string>("PartName") != null))
+                        var partName = field.GetMetadata<string>("PartName");
+                        if ((tableAlias == null && field.GetMetadata<bool>("PartCollapsed") && field.Name.Equals(property, StringComparison.OrdinalIgnoreCase)) ||
+                            (tableAlias != null && partName.ToFieldName().Equals(tableAlias, StringComparison.OrdinalIgnoreCase)))
                         {
-                            var partName = field.GetMetadata<string>("PartName");
-                            if ((tableAlias == null && field.GetMetadata<bool>("PartCollapsed") && field.Name.Equals(property, StringComparison.OrdinalIgnoreCase)) ||
-                                (tableAlias != null && partName.ToFieldName().Equals(tableAlias, StringComparison.OrdinalIgnoreCase)))
-                            {
-                                tableAlias = indexAliases.TryGetValue(partName, out var indexTableAlias) ? indexTableAlias : tableAlias;
-                                break;
-                            }
+                            tableAlias = indexAliases.TryGetValue(partName, out var indexTableAlias) ? indexTableAlias : tableAlias;
+                            break;
                         }
                     }
                 }
+            }
 
-                if (tableAlias != null)
+            if (tableAlias != null)
+            {
+                property = $"{tableAlias}.{property}";
+            }
+
+            if (values.Length == 1)
+            {
+                if (string.Equals(values[0], "or", StringComparison.OrdinalIgnoreCase))
                 {
-                    property = $"{tableAlias}.{property}";
+                    expression = Expression.Disjunction();
+                    BuildWhereExpressions(entry.Value, (Junction)expression, tableAlias, fieldContext, indexAliases);
                 }
-
-                if (values.Length == 1)
+                else if (string.Equals(values[0], "and", StringComparison.OrdinalIgnoreCase))
                 {
-                    if (string.Equals(values[0], "or", StringComparison.OrdinalIgnoreCase))
-                    {
-                        expression = Expression.Disjunction();
-                        BuildWhereExpressions(entry.Value, (Junction)expression, tableAlias, fieldContext, indexAliases);
-                    }
-                    else if (string.Equals(values[0], "and", StringComparison.OrdinalIgnoreCase))
-                    {
-                        expression = Expression.Conjunction();
-                        BuildWhereExpressions(entry.Value, (Junction)expression, tableAlias, fieldContext, indexAliases);
-                    }
-                    else if (string.Equals(values[0], "not", StringComparison.OrdinalIgnoreCase))
-                    {
-                        expression = Expression.Conjunction();
-                        BuildWhereExpressions(entry.Value, (Junction)expression, tableAlias, fieldContext, indexAliases);
-                        expression = Expression.Not(expression);
-                    }
-                    else if (entry.Value.HasValues() && entry.Value.GetValueKind() == JsonValueKind.Object)
-                    {
-                        // Loop through the part's properties, passing the name of the part as the table tableAlias.
-                        // This tableAlias can then be used with the table alias to index mappings to join with the correct table.
-                        BuildWhereExpressions(entry.Value, expressions, values[0], fieldContext, indexAliases);
-                    }
-                    else
-                    {
-                        var propertyValue = entry.Value.ToObject<object>();
-                        expression = Expression.Equal(property, propertyValue);
-                    }
+                    expression = Expression.Conjunction();
+                    BuildWhereExpressions(entry.Value, (Junction)expression, tableAlias, fieldContext, indexAliases);
+                }
+                else if (string.Equals(values[0], "not", StringComparison.OrdinalIgnoreCase))
+                {
+                    expression = Expression.Conjunction();
+                    BuildWhereExpressions(entry.Value, (Junction)expression, tableAlias, fieldContext, indexAliases);
+                    expression = Expression.Not(expression);
+                }
+                else if (entry.Value.HasValues() && entry.Value.GetValueKind() == JsonValueKind.Object)
+                {
+                    // Loop through the part's properties, passing the name of the part as the table tableAlias.
+                    // This tableAlias can then be used with the table alias to index mappings to join with the correct table.
+                    BuildWhereExpressions(entry.Value, expressions, values[0], fieldContext, indexAliases);
                 }
                 else
                 {
-                    var value = entry.Value.ToObject<object>();
-
-                    expression = values[1] switch
-                    {
-                        "not" => Expression.Not(Expression.Equal(property, value)),
-                        "gt" => Expression.GreaterThan(property, value),
-                        "gte" => Expression.GreaterThanOrEqual(property, value),
-                        "lt" => Expression.LessThan(property, value),
-                        "lte" => Expression.LessThanOrEqual(property, value),
-                        "contains" => Expression.Like(property, (string)value, MatchOptions.Contains),
-                        "not_contains" => Expression.Not(Expression.Like(property, (string)value, MatchOptions.Contains)),
-                        "starts_with" => Expression.Like(property, (string)value, MatchOptions.StartsWith),
-                        "not_starts_with" => Expression.Not(Expression.Like(property, (string)value, MatchOptions.StartsWith)),
-                        "ends_with" => Expression.Like(property, (string)value, MatchOptions.EndsWith),
-                        "not_ends_with" => Expression.Not(Expression.Like(property, (string)value, MatchOptions.EndsWith)),
-                        "in" => Expression.In(property, entry.Value.ToObject<object[]>()),
-                        "not_in" => Expression.Not(Expression.In(property, entry.Value.ToObject<object[]>())),
-                        _ => Expression.Equal(property, value),
-                    };
+                    var propertyValue = entry.Value.ToObject<object>();
+                    expression = Expression.Equal(property, propertyValue);
                 }
+            }
+            else
+            {
+                var value = entry.Value.ToObject<object>();
 
-                if (expression != null)
+                expression = values[1] switch
                 {
-                    expressions.Add(expression);
-                }
+                    "not" => Expression.Not(Expression.Equal(property, value)),
+                    "gt" => Expression.GreaterThan(property, value),
+                    "gte" => Expression.GreaterThanOrEqual(property, value),
+                    "lt" => Expression.LessThan(property, value),
+                    "lte" => Expression.LessThanOrEqual(property, value),
+                    "contains" => Expression.Like(property, (string)value, MatchOptions.Contains),
+                    "not_contains" => Expression.Not(Expression.Like(property, (string)value, MatchOptions.Contains)),
+                    "starts_with" => Expression.Like(property, (string)value, MatchOptions.StartsWith),
+                    "not_starts_with" => Expression.Not(Expression.Like(property, (string)value, MatchOptions.StartsWith)),
+                    "ends_with" => Expression.Like(property, (string)value, MatchOptions.EndsWith),
+                    "not_ends_with" => Expression.Not(Expression.Like(property, (string)value, MatchOptions.EndsWith)),
+                    "in" => Expression.In(property, entry.Value.ToObject<object[]>()),
+                    "not_in" => Expression.Not(Expression.In(property, entry.Value.ToObject<object[]>())),
+                    _ => Expression.Equal(property, value),
+                };
+            }
+
+            if (expression != null)
+            {
+                expressions.Add(expression);
             }
         }
+    }
 
-        private static IQuery<ContentItem, ContentItemIndex> OrderBy(IQuery<ContentItem, ContentItemIndex> query,
-            IResolveFieldContext context)
+    private static IQuery<ContentItem, ContentItemIndex> OrderBy(IQuery<ContentItem, ContentItemIndex> query,
+        IResolveFieldContext context)
+    {
+        if (context.HasPopulatedArgument("orderBy"))
         {
-            if (context.HasPopulatedArgument("orderBy"))
+            var orderByArguments = JObject.FromObject(context.Arguments["orderBy"].Value);
+
+            if (orderByArguments != null)
             {
-                var orderByArguments = JObject.FromObject(context.Arguments["orderBy"].Value);
+                var thenBy = false;
 
-                if (orderByArguments != null)
+                foreach (var property in orderByArguments)
                 {
-                    var thenBy = false;
+                    var direction = (OrderByDirection)property.Value.Value<int>();
 
-                    foreach (var property in orderByArguments)
-                    {
-                        var direction = (OrderByDirection)property.Value.Value<int>();
+                    Expression<Func<ContentItemIndex, object>> selector = null;
 
-                        Expression<Func<ContentItemIndex, object>> selector = null;
+                    switch (property.Key)
+                    {
+                        case "contentItemId": selector = x => x.ContentItemId; break;
+                        case "contentItemVersionId": selector = x => x.ContentItemVersionId; break;
+                        case "displayText": selector = x => x.DisplayText; break;
+                        case "published": selector = x => x.Published; break;
+                        case "latest": selector = x => x.Latest; break;
+                        case "createdUtc": selector = x => x.CreatedUtc; break;
+                        case "modifiedUtc": selector = x => x.ModifiedUtc; break;
+                        case "publishedUtc": selector = x => x.PublishedUtc; break;
+                        case "owner": selector = x => x.Owner; break;
+                        case "author": selector = x => x.Author; break;
+                    }
 
-                        switch (property.Key)
+                    if (selector != null)
+                    {
+                        if (!thenBy)
                         {
-                            case "contentItemId": selector = x => x.ContentItemId; break;
-                            case "contentItemVersionId": selector = x => x.ContentItemVersionId; break;
-                            case "displayText": selector = x => x.DisplayText; break;
-                            case "published": selector = x => x.Published; break;
-                            case "latest": selector = x => x.Latest; break;
-                            case "createdUtc": selector = x => x.CreatedUtc; break;
-                            case "modifiedUtc": selector = x => x.ModifiedUtc; break;
-                            case "publishedUtc": selector = x => x.PublishedUtc; break;
-                            case "owner": selector = x => x.Owner; break;
-                            case "author": selector = x => x.Author; break;
+                            query = direction == OrderByDirection.Ascending
+                                    ? query.OrderBy(selector)
+                                    : query.OrderByDescending(selector)
+                                ;
                         }
-
-                        if (selector != null)
+                        else
                         {
-                            if (!thenBy)
-                            {
-                                query = direction == OrderByDirection.Ascending
-                                        ? query.OrderBy(selector)
-                                        : query.OrderByDescending(selector)
-                                    ;
-                            }
-                            else
-                            {
-                                query = direction == OrderByDirection.Ascending
-                                        ? query.ThenBy(selector)
-                                        : query.ThenByDescending(selector)
-                                    ;
-                            }
-
-                            thenBy = true;
+                            query = direction == OrderByDirection.Ascending
+                                    ? query.ThenBy(selector)
+                                    : query.ThenByDescending(selector)
+                                ;
                         }
+
+                        thenBy = true;
                     }
                 }
             }
-            else
-            {
-                query = query.OrderByDescending(x => x.CreatedUtc);
-            }
-
-            return query;
         }
+        else
+        {
+            query = query.OrderByDescending(x => x.CreatedUtc);
+        }
+
+        return query;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/ContentTypeQuery.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/ContentTypeQuery.cs
index 71b508815c0..5d778377cf8 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/ContentTypeQuery.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/ContentTypeQuery.cs
@@ -11,91 +11,90 @@
 using OrchardCore.ContentManagement.Metadata;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries
+namespace OrchardCore.ContentManagement.GraphQL.Queries;
+
+/// <summary>
+/// Registers all Content Types as queries.
+/// </summary>
+public class ContentTypeQuery : ISchemaBuilder
 {
-    /// <summary>
-    /// Registers all Content Types as queries.
-    /// </summary>
-    public class ContentTypeQuery : ISchemaBuilder
-    {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IOptions<GraphQLContentOptions> _contentOptionsAccessor;
-        private readonly IOptions<GraphQLSettings> _settingsAccessor;
-        protected readonly IStringLocalizer S;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IOptions<GraphQLContentOptions> _contentOptionsAccessor;
+    private readonly IOptions<GraphQLSettings> _settingsAccessor;
+    protected readonly IStringLocalizer S;
 
-        public ContentTypeQuery(IHttpContextAccessor httpContextAccessor,
-            IOptions<GraphQLContentOptions> contentOptionsAccessor,
-            IOptions<GraphQLSettings> settingsAccessor,
-            IStringLocalizer<ContentTypeQuery> localizer)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _contentOptionsAccessor = contentOptionsAccessor;
-            _settingsAccessor = settingsAccessor;
-            S = localizer;
-        }
+    public ContentTypeQuery(IHttpContextAccessor httpContextAccessor,
+        IOptions<GraphQLContentOptions> contentOptionsAccessor,
+        IOptions<GraphQLSettings> settingsAccessor,
+        IStringLocalizer<ContentTypeQuery> localizer)
+    {
+        _httpContextAccessor = httpContextAccessor;
+        _contentOptionsAccessor = contentOptionsAccessor;
+        _settingsAccessor = settingsAccessor;
+        S = localizer;
+    }
 
-        public Task<string> GetIdentifierAsync()
-        {
-            var contentDefinitionManager = _httpContextAccessor.HttpContext.RequestServices.GetService<IContentDefinitionManager>();
-            return contentDefinitionManager.GetIdentifierAsync();
-        }
+    public Task<string> GetIdentifierAsync()
+    {
+        var contentDefinitionManager = _httpContextAccessor.HttpContext.RequestServices.GetService<IContentDefinitionManager>();
+        return contentDefinitionManager.GetIdentifierAsync();
+    }
 
-        public async Task BuildAsync(ISchema schema)
-        {
-            var serviceProvider = _httpContextAccessor.HttpContext.RequestServices;
+    public async Task BuildAsync(ISchema schema)
+    {
+        var serviceProvider = _httpContextAccessor.HttpContext.RequestServices;
 
-            var contentDefinitionManager = serviceProvider.GetService<IContentDefinitionManager>();
-            var contentTypeBuilders = serviceProvider.GetServices<IContentTypeBuilder>().ToList();
+        var contentDefinitionManager = serviceProvider.GetService<IContentDefinitionManager>();
+        var contentTypeBuilders = serviceProvider.GetServices<IContentTypeBuilder>().ToList();
 
-            foreach (var typeDefinition in await contentDefinitionManager.ListTypeDefinitionsAsync())
+        foreach (var typeDefinition in await contentDefinitionManager.ListTypeDefinitionsAsync())
+        {
+            if (_contentOptionsAccessor.Value.ShouldHide(typeDefinition))
             {
-                if (_contentOptionsAccessor.Value.ShouldHide(typeDefinition))
-                {
-                    continue;
-                }
-
-                var typeType = new ContentItemType(_contentOptionsAccessor)
-                {
-                    Name = typeDefinition.Name,
-                    Description = S["Represents a {0}.", typeDefinition.DisplayName]
-                };
+                continue;
+            }
 
-                var query = new ContentItemsFieldType(typeDefinition.Name, schema, _contentOptionsAccessor, _settingsAccessor)
-                {
-                    Name = typeDefinition.Name,
-                    Description = S["Represents a {0}.", typeDefinition.DisplayName],
-                    ResolvedType = new ListGraphType(typeType)
-                };
+            var typeType = new ContentItemType(_contentOptionsAccessor)
+            {
+                Name = typeDefinition.Name,
+                Description = S["Represents a {0}.", typeDefinition.DisplayName]
+            };
 
-                query.RequirePermission(CommonPermissions.ExecuteGraphQL);
-                query.RequirePermission(Contents.CommonPermissions.ViewOwnContent, typeDefinition.Name);
+            var query = new ContentItemsFieldType(typeDefinition.Name, schema, _contentOptionsAccessor, _settingsAccessor)
+            {
+                Name = typeDefinition.Name,
+                Description = S["Represents a {0}.", typeDefinition.DisplayName],
+                ResolvedType = new ListGraphType(typeType)
+            };
 
-                foreach (var builder in contentTypeBuilders)
-                {
-                    builder.Build(schema, query, typeDefinition, typeType);
-                }
+            query.RequirePermission(CommonPermissions.ExecuteGraphQL);
+            query.RequirePermission(Contents.CommonPermissions.ViewOwnContent, typeDefinition.Name);
 
-                // Limit queries to standard content types or those content types that are explicitly configured.
-                if (!typeDefinition.TryGetStereotype(out var stereotype) || _contentOptionsAccessor.Value.DiscoverableSterotypes.Contains(stereotype))
-                {
-                    schema.Query.AddField(query);
-                }
-                else
-                {
-                    // Register the content item type explicitly since it won't be discovered from the root 'query' type.
-                    schema.RegisterType(typeType);
-                }
+            foreach (var builder in contentTypeBuilders)
+            {
+                builder.Build(schema, query, typeDefinition, typeType);
+            }
 
-                if (!string.IsNullOrEmpty(stereotype))
-                {
-                    typeType.Metadata["Stereotype"] = stereotype;
-                }
+            // Limit queries to standard content types or those content types that are explicitly configured.
+            if (!typeDefinition.TryGetStereotype(out var stereotype) || _contentOptionsAccessor.Value.DiscoverableSterotypes.Contains(stereotype))
+            {
+                schema.Query.AddField(query);
+            }
+            else
+            {
+                // Register the content item type explicitly since it won't be discovered from the root 'query' type.
+                schema.RegisterType(typeType);
             }
 
-            foreach (var builder in contentTypeBuilders)
+            if (!string.IsNullOrEmpty(stereotype))
             {
-                builder.Clear();
+                typeType.Metadata["Stereotype"] = stereotype;
             }
         }
+
+        foreach (var builder in contentTypeBuilders)
+        {
+            builder.Clear();
+        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/GraphQLFilter.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/GraphQLFilter.cs
index ccd9c1362e0..c3f16a6f009 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/GraphQLFilter.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/GraphQLFilter.cs
@@ -3,18 +3,17 @@
 using GraphQL;
 using YesSql;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries
+namespace OrchardCore.ContentManagement.GraphQL.Queries;
+
+public abstract class GraphQLFilter<TSourceType> : IGraphQLFilter<TSourceType> where TSourceType : class
 {
-    public abstract class GraphQLFilter<TSourceType> : IGraphQLFilter<TSourceType> where TSourceType : class
+    public virtual Task<IQuery<TSourceType>> PreQueryAsync(IQuery<TSourceType> query, IResolveFieldContext context)
     {
-        public virtual Task<IQuery<TSourceType>> PreQueryAsync(IQuery<TSourceType> query, IResolveFieldContext context)
-        {
-            return Task.FromResult(query);
-        }
+        return Task.FromResult(query);
+    }
 
-        public virtual Task<IEnumerable<TSourceType>> PostQueryAsync(IEnumerable<TSourceType> contentItems, IResolveFieldContext context)
-        {
-            return Task.FromResult(contentItems);
-        }
+    public virtual Task<IEnumerable<TSourceType>> PostQueryAsync(IEnumerable<TSourceType> contentItems, IResolveFieldContext context)
+    {
+        return Task.FromResult(contentItems);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IGraphQLFilter.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IGraphQLFilter.cs
index af7a0c5254d..6d83446a0ad 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IGraphQLFilter.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IGraphQLFilter.cs
@@ -3,12 +3,11 @@
 using GraphQL;
 using YesSql;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries
+namespace OrchardCore.ContentManagement.GraphQL.Queries;
+
+public interface IGraphQLFilter<TSourceType> where TSourceType : class
 {
-    public interface IGraphQLFilter<TSourceType> where TSourceType : class
-    {
-        Task<IQuery<TSourceType>> PreQueryAsync(IQuery<TSourceType> query, IResolveFieldContext context);
+    Task<IQuery<TSourceType>> PreQueryAsync(IQuery<TSourceType> query, IResolveFieldContext context);
 
-        Task<IEnumerable<TSourceType>> PostQueryAsync(IEnumerable<TSourceType> contentItems, IResolveFieldContext context);
-    }
+    Task<IEnumerable<TSourceType>> PostQueryAsync(IEnumerable<TSourceType> contentItems, IResolveFieldContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IIndexAliasProvider.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IIndexAliasProvider.cs
index 85479ce7f83..b6b5f185f89 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IIndexAliasProvider.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IIndexAliasProvider.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries
+namespace OrchardCore.ContentManagement.GraphQL.Queries;
+
+public interface IIndexAliasProvider
 {
-    public interface IIndexAliasProvider
-    {
-        ValueTask<IEnumerable<IndexAlias>> GetAliasesAsync();
-    }
+    ValueTask<IEnumerable<IndexAlias>> GetAliasesAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IIndexPropertyProvider.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IIndexPropertyProvider.cs
index 1b8744df0d0..3795ca0cc86 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IIndexPropertyProvider.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IIndexPropertyProvider.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.ContentManagement.GraphQL.Queries
+namespace OrchardCore.ContentManagement.GraphQL.Queries;
+
+public interface IIndexPropertyProvider
 {
-    public interface IIndexPropertyProvider
-    {
-        public string IndexName { get; }
-        public bool TryGetValue(string propertyName, out string indexPropertyName);
-    }
+    public string IndexName { get; }
+    public bool TryGetValue(string propertyName, out string indexPropertyName);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IndexAlias.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IndexAlias.cs
index 838a7cfa82c..8ab237f675c 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IndexAlias.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IndexAlias.cs
@@ -1,14 +1,13 @@
 using System;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries
+namespace OrchardCore.ContentManagement.GraphQL.Queries;
+
+public class IndexAlias
 {
-    public class IndexAlias
-    {
-        public string Alias { get; set; }
+    public string Alias { get; set; }
 
-        public string Index { get; set; }
+    public string Index { get; set; }
 
-        public Type IndexType { get; set; }
-    }
+    public Type IndexType { get; set; }
 }
 
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IndexPropertyProvider.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IndexPropertyProvider.cs
index c2eec78ffc9..224630056d8 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IndexPropertyProvider.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/IndexPropertyProvider.cs
@@ -3,28 +3,27 @@
 using System.Reflection;
 using YesSql.Indexes;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries
+namespace OrchardCore.ContentManagement.GraphQL.Queries;
+
+public class IndexPropertyProvider<T> : IIndexPropertyProvider where T : MapIndex
 {
-    public class IndexPropertyProvider<T> : IIndexPropertyProvider where T : MapIndex
-    {
-        private static readonly Dictionary<string, string> _indexProperties = new(StringComparer.OrdinalIgnoreCase);
-        private static readonly string _indexName;
+    private static readonly Dictionary<string, string> _indexProperties = new(StringComparer.OrdinalIgnoreCase);
+    private static readonly string _indexName;
 
-        static IndexPropertyProvider()
+    static IndexPropertyProvider()
+    {
+        foreach (var property in typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase))
         {
-            foreach (var property in typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase))
-            {
-                _indexProperties[property.Name] = property.Name;
-            }
-
-            _indexName = typeof(T).Name;
+            _indexProperties[property.Name] = property.Name;
         }
 
-        public string IndexName => _indexName;
+        _indexName = typeof(T).Name;
+    }
 
-        public bool TryGetValue(string propertyName, out string indexPropertyName)
-        {
-            return _indexProperties.TryGetValue(propertyName, out indexPropertyName);
-        }
+    public string IndexName => _indexName;
+
+    public bool TryGetValue(string propertyName, out string indexPropertyName)
+    {
+        return _indexProperties.TryGetValue(propertyName, out indexPropertyName);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/AndExpression.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/AndExpression.cs
index c5b10420112..22041f171aa 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/AndExpression.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/AndExpression.cs
@@ -1,23 +1,22 @@
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates;
+
+/// <summary>
+/// An <see cref="LogicalExpression" /> that combines two <see cref="IPredicate" />s
+/// with an <c>and</c> between them.
+/// </summary>
+public class AndExpression : LogicalExpression
 {
     /// <summary>
-    /// An <see cref="LogicalExpression" /> that combines two <see cref="IPredicate" />s
-    /// with an <c>and</c> between them.
+    /// Initializes a new instance of the <see cref="AndExpression" /> class
+    /// that combines two <see cref="IPredicate" />.
     /// </summary>
-    public class AndExpression : LogicalExpression
+    /// <param name="left">The left hand side <see cref="IPredicate" />.</param>
+    /// <param name="right">The right hand side <see cref="IPredicate" />.</param>
+    public AndExpression(IPredicate left, IPredicate right) : base(left, right)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AndExpression" /> class
-        /// that combines two <see cref="IPredicate" />.
-        /// </summary>
-        /// <param name="left">The left hand side <see cref="IPredicate" />.</param>
-        /// <param name="right">The right hand side <see cref="IPredicate" />.</param>
-        public AndExpression(IPredicate left, IPredicate right) : base(left, right)
-        {
-        }
-
-        /// <inheritdoc />
-        /// <value>Returns "<c>and</c>".</value>
-        protected override string Operator => "and";
     }
+
+    /// <inheritdoc />
+    /// <value>Returns "<c>and</c>".</value>
+    protected override string Operator => "and";
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/Conjunction.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/Conjunction.cs
index 15e8211deed..081c5870fc2 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/Conjunction.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/Conjunction.cs
@@ -1,14 +1,13 @@
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates;
+
+/// <summary>
+/// An <see cref="IPredicate" /> that combines together multiple <see cref="IPredicate" />s with an <c>and</c>.
+/// </summary>
+public class Conjunction : Junction
 {
-    /// <summary>
-    /// An <see cref="IPredicate" /> that combines together multiple <see cref="IPredicate" />s with an <c>and</c>.
-    /// </summary>
-    public class Conjunction : Junction
-    {
-        /// <inheritdoc />
-        protected override string Operation => " and ";
+    /// <inheritdoc />
+    protected override string Operation => " and ";
 
-        /// <inheritdoc />
-        protected override string EmptyExpression => "1=1";
-    }
+    /// <inheritdoc />
+    protected override string EmptyExpression => "1=1";
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/Disjunction.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/Disjunction.cs
index 79287c8dfa8..fea1be7427c 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/Disjunction.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/Disjunction.cs
@@ -1,14 +1,13 @@
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates;
+
+/// <summary>
+/// An <see cref="IPredicate" /> that combines together multiple <see cref="IPredicate" />s with an <c>or</c>.
+/// </summary>
+public class Disjunction : Junction
 {
-    /// <summary>
-    /// An <see cref="IPredicate" /> that combines together multiple <see cref="IPredicate" />s with an <c>or</c>.
-    /// </summary>
-    public class Disjunction : Junction
-    {
-        /// <inheritdoc />
-        protected override string Operation => " or ";
+    /// <inheritdoc />
+    protected override string Operation => " or ";
 
-        /// <inheritdoc />
-        protected override string EmptyExpression => "1=0";
-    }
+    /// <inheritdoc />
+    protected override string EmptyExpression => "1=0";
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/Expression.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/Expression.cs
index 23eaa85344c..b78850ad1cd 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/Expression.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/Expression.cs
@@ -1,135 +1,134 @@
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates;
+
+/// <summary>
+/// Represents the built-in <see cref="IPredicate" /> expressions used for building SQL expressions.
+/// </summary>
+/// <seealso cref="IPredicate" />
+public class Expression
 {
+    /// <summary>Constructs a new instance of <see cref="Expression"></see>.</summary>
+    protected Expression()
+    {
+    }
+
     /// <summary>
-    /// Represents the built-in <see cref="IPredicate" /> expressions used for building SQL expressions.
+    /// Apply an "equal" constraint to the named property.
     /// </summary>
-    /// <seealso cref="IPredicate" />
-    public class Expression
+    /// <param name="propertyName">The name of the property.</param>
+    /// <param name="value">The value for the property.</param>
+    public static SimpleExpression Equal(string propertyName, object value)
     {
-        /// <summary>Constructs a new instance of <see cref="Expression"></see>.</summary>
-        protected Expression()
-        {
-        }
-
-        /// <summary>
-        /// Apply an "equal" constraint to the named property.
-        /// </summary>
-        /// <param name="propertyName">The name of the property.</param>
-        /// <param name="value">The value for the property.</param>
-        public static SimpleExpression Equal(string propertyName, object value)
-        {
-            return new SimpleExpression(propertyName, value, " = ");
-        }
+        return new SimpleExpression(propertyName, value, " = ");
+    }
 
-        /// <summary>
-        /// Apply a "like" constraint to the named property.
-        /// </summary>
-        /// <param name="propertyName">The name of the property.</param>
-        /// <param name="value">The value for the property.</param>
-        /// <param name="matchOptions">The match options for the like expression.</param>
-        /// <returns>A <see cref="LikeExpression" />.</returns>
-        public static IPredicate Like(string propertyName, string value, MatchOptions matchOptions)
-        {
-            return new LikeExpression(propertyName, value, matchOptions);
-        }
+    /// <summary>
+    /// Apply a "like" constraint to the named property.
+    /// </summary>
+    /// <param name="propertyName">The name of the property.</param>
+    /// <param name="value">The value for the property.</param>
+    /// <param name="matchOptions">The match options for the like expression.</param>
+    /// <returns>A <see cref="LikeExpression" />.</returns>
+    public static IPredicate Like(string propertyName, string value, MatchOptions matchOptions)
+    {
+        return new LikeExpression(propertyName, value, matchOptions);
+    }
 
-        /// <summary>
-        /// Apply a "greater than" constraint to the named property.
-        /// </summary>
-        /// <param name="propertyName">The name of the property.</param>
-        /// <param name="value">The value for the property.</param>
-        public static SimpleExpression GreaterThan(string propertyName, object value)
-        {
-            return new SimpleExpression(propertyName, value, " > ");
-        }
+    /// <summary>
+    /// Apply a "greater than" constraint to the named property.
+    /// </summary>
+    /// <param name="propertyName">The name of the property.</param>
+    /// <param name="value">The value for the property.</param>
+    public static SimpleExpression GreaterThan(string propertyName, object value)
+    {
+        return new SimpleExpression(propertyName, value, " > ");
+    }
 
-        /// <summary>
-        /// Apply a "greater than or equal" constraint to the named property.
-        /// </summary>
-        /// <param name="propertyName">The name of the property.</param>
-        /// <param name="value">The value for the property.</param>
-        public static SimpleExpression GreaterThanOrEqual(string propertyName, object value)
-        {
-            return new SimpleExpression(propertyName, value, " >= ");
-        }
+    /// <summary>
+    /// Apply a "greater than or equal" constraint to the named property.
+    /// </summary>
+    /// <param name="propertyName">The name of the property.</param>
+    /// <param name="value">The value for the property.</param>
+    public static SimpleExpression GreaterThanOrEqual(string propertyName, object value)
+    {
+        return new SimpleExpression(propertyName, value, " >= ");
+    }
 
-        /// <summary>
-        /// Apply a "less than" constraint to the named property.
-        /// </summary>
-        /// <param name="propertyName">The name of the property.</param>
-        /// <param name="value">The value for the property.</param>
-        public static SimpleExpression LessThan(string propertyName, object value)
-        {
-            return new SimpleExpression(propertyName, value, " < ");
-        }
+    /// <summary>
+    /// Apply a "less than" constraint to the named property.
+    /// </summary>
+    /// <param name="propertyName">The name of the property.</param>
+    /// <param name="value">The value for the property.</param>
+    public static SimpleExpression LessThan(string propertyName, object value)
+    {
+        return new SimpleExpression(propertyName, value, " < ");
+    }
 
-        /// <summary>
-        /// Apply a "less than or equal" constraint to the named property.
-        /// </summary>
-        /// <param name="propertyName">The name of the property.</param>
-        /// <param name="value">The value for the property.</param>
-        public static SimpleExpression LessThanOrEqual(string propertyName, object value)
-        {
-            return new SimpleExpression(propertyName, value, " <= ");
-        }
+    /// <summary>
+    /// Apply a "less than or equal" constraint to the named property.
+    /// </summary>
+    /// <param name="propertyName">The name of the property.</param>
+    /// <param name="value">The value for the property.</param>
+    public static SimpleExpression LessThanOrEqual(string propertyName, object value)
+    {
+        return new SimpleExpression(propertyName, value, " <= ");
+    }
 
-        /// <summary>
-        /// Apply an "in" constraint to the named property.
-        /// </summary>
-        /// <param name="propertyName">The name of the property.</param>
-        /// <param name="values">An array of values.</param>
-        /// <returns>An <see cref="InExpression" />.</returns>
-        public static IPredicate In(string propertyName, object[] values)
-        {
-            return new InExpression(propertyName, values);
-        }
+    /// <summary>
+    /// Apply an "in" constraint to the named property.
+    /// </summary>
+    /// <param name="propertyName">The name of the property.</param>
+    /// <param name="values">An array of values.</param>
+    /// <returns>An <see cref="InExpression" />.</returns>
+    public static IPredicate In(string propertyName, object[] values)
+    {
+        return new InExpression(propertyName, values);
+    }
 
-        /// <summary>
-        /// Return the conjunction of two expressions.
-        /// </summary>
-        /// <param name="left">The left hand side expression.</param>
-        /// <param name="right">The right hand side expression.</param>
-        /// <returns>An <see cref="AndExpression" />.</returns>
-        public static IPredicate And(IPredicate left, IPredicate right)
-        {
-            return new AndExpression(left, right);
-        }
+    /// <summary>
+    /// Return the conjunction of two expressions.
+    /// </summary>
+    /// <param name="left">The left hand side expression.</param>
+    /// <param name="right">The right hand side expression.</param>
+    /// <returns>An <see cref="AndExpression" />.</returns>
+    public static IPredicate And(IPredicate left, IPredicate right)
+    {
+        return new AndExpression(left, right);
+    }
 
-        /// <summary>
-        /// Return the disjunction of two expressions.
-        /// </summary>
-        /// <param name="left">The left hand side expression.</param>
-        /// <param name="right">The right hand side expression.</param>
-        /// <returns>An <see cref="OrExpression" />.</returns>
-        public static IPredicate Or(IPredicate left, IPredicate right)
-        {
-            return new OrExpression(left, right);
-        }
+    /// <summary>
+    /// Return the disjunction of two expressions.
+    /// </summary>
+    /// <param name="left">The left hand side expression.</param>
+    /// <param name="right">The right hand side expression.</param>
+    /// <returns>An <see cref="OrExpression" />.</returns>
+    public static IPredicate Or(IPredicate left, IPredicate right)
+    {
+        return new OrExpression(left, right);
+    }
 
-        /// <summary>
-        /// Return the negation of an expression.
-        /// </summary>
-        /// <param name="expression">The expression to negate.</param>
-        /// <returns>A <see cref="NotExpression" />.</returns>
-        public static IPredicate Not(IPredicate expression)
-        {
-            return new NotExpression(expression);
-        }
+    /// <summary>
+    /// Return the negation of an expression.
+    /// </summary>
+    /// <param name="expression">The expression to negate.</param>
+    /// <returns>A <see cref="NotExpression" />.</returns>
+    public static IPredicate Not(IPredicate expression)
+    {
+        return new NotExpression(expression);
+    }
 
-        /// <summary>
-        /// Group expressions together in a single conjunction (A and B and C...)
-        /// </summary>
-        public static Conjunction Conjunction()
-        {
-            return new Conjunction();
-        }
+    /// <summary>
+    /// Group expressions together in a single conjunction (A and B and C...)
+    /// </summary>
+    public static Conjunction Conjunction()
+    {
+        return new Conjunction();
+    }
 
-        /// <summary>
-        /// Group expressions together in a single disjunction (A or B or C...)
-        /// </summary>
-        public static Disjunction Disjunction()
-        {
-            return new Disjunction();
-        }
+    /// <summary>
+    /// Group expressions together in a single disjunction (A or B or C...)
+    /// </summary>
+    public static Disjunction Disjunction()
+    {
+        return new Disjunction();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/IPredicate.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/IPredicate.cs
index b6f9d2ff8e3..96278d670f4 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/IPredicate.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/IPredicate.cs
@@ -1,13 +1,12 @@
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates;
+
+public interface IPredicate
 {
-    public interface IPredicate
-    {
-        /// <summary>
-        /// Render a sql string for the expression.
-        /// </summary>
-        /// <returns>A string that contains a valid Sql fragment.</returns>
-        string ToSqlString(IPredicateQuery predicateQuery);
+    /// <summary>
+    /// Render a sql string for the expression.
+    /// </summary>
+    /// <returns>A string that contains a valid Sql fragment.</returns>
+    string ToSqlString(IPredicateQuery predicateQuery);
 
-        void SearchUsedAlias(IPredicateQuery predicateQuery);
-    }
+    void SearchUsedAlias(IPredicateQuery predicateQuery);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/IPredicateQuery.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/IPredicateQuery.cs
index facb4fda95f..c454211bda0 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/IPredicateQuery.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/IPredicateQuery.cs
@@ -1,55 +1,54 @@
 using System.Collections.Generic;
 using YesSql;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates;
+
+/// <summary>
+/// Represents a predicate query instance that can build SQL to execute against a database.
+/// </summary>
+public interface IPredicateQuery
 {
+    ISqlDialect Dialect { get; set; }
+
+    IDictionary<string, object> Parameters { get; }
+
+    /// <summary>
+    /// Adds a new query parameter to the current query.
+    /// </summary>
+    /// <param name="value">The value of the query parameter.</param>
+    /// <returns>The name of the new query parameter.</returns>
+    string NewQueryParameter(object value);
+
+    /// <summary>
+    /// Creates an alias for a specified path.
+    /// </summary>
+    /// <param name="path">The path of the property.</param>
+    /// <param name="alias">The alias name.</param>
+    void CreateAlias(string path, string alias);
+
+    /// <summary>
+    /// Creates an actual sql table alias for a specified path.
+    /// </summary>
+    /// <param name="path">The path of the property.</param>
+    /// <param name="tableAlias">The sql table alias name.</param>
+    void CreateTableAlias(string path, string tableAlias);
+
+    /// <summary>
+    /// search used alias for the given property path.
+    /// </summary>
+    /// <param name="propertyPath">The path of the property.</param>
+    void SearchUsedAlias(string propertyPath);
+
+    /// <summary>
+    /// Gets the formatted column name for the given property path.
+    /// </summary>
+    /// <param name="propertyPath">The path of the property.</param>
+    /// <returns>The SQL formatted name of the column.</returns>
+    string GetColumnName(string propertyPath);
+
     /// <summary>
-    /// Represents a predicate query instance that can build SQL to execute against a database.
+    /// Gets all the aliases that were used in the current query.
     /// </summary>
-    public interface IPredicateQuery
-    {
-        ISqlDialect Dialect { get; set; }
-
-        IDictionary<string, object> Parameters { get; }
-
-        /// <summary>
-        /// Adds a new query parameter to the current query.
-        /// </summary>
-        /// <param name="value">The value of the query parameter.</param>
-        /// <returns>The name of the new query parameter.</returns>
-        string NewQueryParameter(object value);
-
-        /// <summary>
-        /// Creates an alias for a specified path.
-        /// </summary>
-        /// <param name="path">The path of the property.</param>
-        /// <param name="alias">The alias name.</param>
-        void CreateAlias(string path, string alias);
-
-        /// <summary>
-        /// Creates an actual sql table alias for a specified path.
-        /// </summary>
-        /// <param name="path">The path of the property.</param>
-        /// <param name="tableAlias">The sql table alias name.</param>
-        void CreateTableAlias(string path, string tableAlias);
-
-        /// <summary>
-        /// search used alias for the given property path.
-        /// </summary>
-        /// <param name="propertyPath">The path of the property.</param>
-        void SearchUsedAlias(string propertyPath);
-
-        /// <summary>
-        /// Gets the formatted column name for the given property path.
-        /// </summary>
-        /// <param name="propertyPath">The path of the property.</param>
-        /// <returns>The SQL formatted name of the column.</returns>
-        string GetColumnName(string propertyPath);
-
-        /// <summary>
-        /// Gets all the aliases that were used in the current query.
-        /// </summary>
-        /// <returns>The collection of alias names.</returns>
-        IEnumerable<string> GetUsedAliases();
-    }
+    /// <returns>The collection of alias names.</returns>
+    IEnumerable<string> GetUsedAliases();
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/InExpression.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/InExpression.cs
index 75013084534..84aa919c42a 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/InExpression.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/InExpression.cs
@@ -1,48 +1,47 @@
 using System.Text;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates;
+
+/// <summary>
+/// An <see cref="IPredicate" /> that constrains the property to a specified list of values.
+/// </summary>
+public class InExpression : IPredicate
 {
-    /// <summary>
-    /// An <see cref="IPredicate" /> that constrains the property to a specified list of values.
-    /// </summary>
-    public class InExpression : IPredicate
-    {
-        private readonly string _propertyName;
+    private readonly string _propertyName;
 
-        public InExpression(string propertyName, object[] values)
-        {
-            _propertyName = propertyName;
-            Values = values;
-        }
+    public InExpression(string propertyName, object[] values)
+    {
+        _propertyName = propertyName;
+        Values = values;
+    }
 
-        public object[] Values { get; protected set; }
+    public object[] Values { get; protected set; }
 
-        public void SearchUsedAlias(IPredicateQuery predicateQuery)
-        {
-            predicateQuery.SearchUsedAlias(_propertyName);
-        }
+    public void SearchUsedAlias(IPredicateQuery predicateQuery)
+    {
+        predicateQuery.SearchUsedAlias(_propertyName);
+    }
 
-        public string ToSqlString(IPredicateQuery predicateQuery)
-        {
-            // 'columnName in ()' is always false
-            if (Values.Length == 0) return "1=0";
+    public string ToSqlString(IPredicateQuery predicateQuery)
+    {
+        // 'columnName in ()' is always false
+        if (Values.Length == 0) return "1=0";
 
-            // Generates:
-            //  columnName in (@p1, @p2, @p3)
+        // Generates:
+        //  columnName in (@p1, @p2, @p3)
 
-            var array = new StringBuilder();
-            for (var i = 0; i < Values.Length; i++)
-            {
-                var parameter = predicateQuery.NewQueryParameter(Values[i]);
+        var array = new StringBuilder();
+        for (var i = 0; i < Values.Length; i++)
+        {
+            var parameter = predicateQuery.NewQueryParameter(Values[i]);
 
-                if (i > 0) array.Append(", ");
-                array.Append(parameter);
-            }
+            if (i > 0) array.Append(", ");
+            array.Append(parameter);
+        }
 
-            var columnName = predicateQuery.GetColumnName(_propertyName);
-            var inClause = predicateQuery.Dialect.InSelectOperator(array.ToString());
+        var columnName = predicateQuery.GetColumnName(_propertyName);
+        var inClause = predicateQuery.Dialect.InSelectOperator(array.ToString());
 
-            return $"{columnName} {inClause}";
-        }
+        return $"{columnName} {inClause}";
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/Junction.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/Junction.cs
index 01d79ad4809..4004758439a 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/Junction.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/Junction.cs
@@ -1,71 +1,70 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates;
+
+/// <summary>
+/// A sequence of logical <see cref="IPredicate" />s combined by some associative
+/// logical operator.
+/// </summary>
+public abstract class Junction : IPredicate
 {
+    private readonly List<IPredicate> _predicates = [];
+
     /// <summary>
-    /// A sequence of logical <see cref="IPredicate" />s combined by some associative
-    /// logical operator.
+    /// Get the Sql operator to put between multiple <see cref="IPredicate" />s.
     /// </summary>
-    public abstract class Junction : IPredicate
-    {
-        private readonly List<IPredicate> _predicates = [];
+    protected abstract string Operation { get; }
 
-        /// <summary>
-        /// Get the Sql operator to put between multiple <see cref="IPredicate" />s.
-        /// </summary>
-        protected abstract string Operation { get; }
-
-        /// <summary>
-        /// The <see cref="string" /> corresponding to an instance with no added sub-criteria.
-        /// </summary>
-        protected abstract string EmptyExpression { get; }
-
-        public void SearchUsedAlias(IPredicateQuery predicateQuery)
-        {
-            if (_predicates.Count == 0) return;
+    /// <summary>
+    /// The <see cref="string" /> corresponding to an instance with no added sub-criteria.
+    /// </summary>
+    protected abstract string EmptyExpression { get; }
 
+    public void SearchUsedAlias(IPredicateQuery predicateQuery)
+    {
+        if (_predicates.Count == 0) return;
 
-            for (var i = 0; i < _predicates.Count; i++)
-            {
-                _predicates[i].SearchUsedAlias(predicateQuery);
-            }
 
+        for (var i = 0; i < _predicates.Count; i++)
+        {
+            _predicates[i].SearchUsedAlias(predicateQuery);
         }
 
-        public string ToSqlString(IPredicateQuery predicateQuery)
-        {
-            if (_predicates.Count == 0) return EmptyExpression;
+    }
 
-            var sqlBuilder = new StringBuilder();
+    public string ToSqlString(IPredicateQuery predicateQuery)
+    {
+        if (_predicates.Count == 0) return EmptyExpression;
 
-            sqlBuilder.Append('(');
+        var sqlBuilder = new StringBuilder();
 
-            for (var i = 0; i < _predicates.Count - 1; i++)
-            {
-                sqlBuilder.Append(_predicates[i].ToSqlString(predicateQuery));
-                sqlBuilder.Append(Operation);
-            }
+        sqlBuilder.Append('(');
 
-            sqlBuilder.Append(_predicates[_predicates.Count - 1].ToSqlString(predicateQuery));
+        for (var i = 0; i < _predicates.Count - 1; i++)
+        {
+            sqlBuilder.Append(_predicates[i].ToSqlString(predicateQuery));
+            sqlBuilder.Append(Operation);
+        }
 
-            sqlBuilder.Append(')');
+        sqlBuilder.Append(_predicates[_predicates.Count - 1].ToSqlString(predicateQuery));
 
-            return sqlBuilder.ToString();
-        }
+        sqlBuilder.Append(')');
 
-        /// <summary>
-        /// Adds an <see cref="IPredicate" /> to the list of <see cref="IPredicate" />s
-        /// to junction together.
-        /// </summary>
-        /// <param name="predicate">The <see cref="IPredicate" /> to add.</param>
-        /// <returns>
-        /// This <see cref="Junction" /> instance.
-        /// </returns>
-        public Junction Add(IPredicate predicate)
-        {
-            _predicates.Add(predicate);
-            return this;
-        }
+        return sqlBuilder.ToString();
+    }
+
+    /// <summary>
+    /// Adds an <see cref="IPredicate" /> to the list of <see cref="IPredicate" />s
+    /// to junction together.
+    /// </summary>
+    /// <param name="predicate">The <see cref="IPredicate" /> to add.</param>
+    /// <returns>
+    /// This <see cref="Junction" /> instance.
+    /// </returns>
+    public Junction Add(IPredicate predicate)
+    {
+        _predicates.Add(predicate);
+        return this;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/LikeExpression.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/LikeExpression.cs
index 1ef8d49b054..4cf7fd92516 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/LikeExpression.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/LikeExpression.cs
@@ -1,35 +1,34 @@
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates;
+
+/// <summary>
+/// An <see cref="IPredicate" /> that represents a "like" constraint.
+/// </summary>
+public class LikeExpression : IPredicate
 {
-    /// <summary>
-    /// An <see cref="IPredicate" /> that represents a "like" constraint.
-    /// </summary>
-    public class LikeExpression : IPredicate
-    {
-        private readonly string _propertyName;
-        private readonly string _value;
+    private readonly string _propertyName;
+    private readonly string _value;
 
-        public LikeExpression(string propertyName, string value, MatchOptions matchOptions)
-            : this(propertyName, matchOptions.ToMatchString(value))
-        {
-        }
+    public LikeExpression(string propertyName, string value, MatchOptions matchOptions)
+        : this(propertyName, matchOptions.ToMatchString(value))
+    {
+    }
 
-        public LikeExpression(string propertyName, string value)
-        {
-            _propertyName = propertyName;
-            _value = value;
-        }
+    public LikeExpression(string propertyName, string value)
+    {
+        _propertyName = propertyName;
+        _value = value;
+    }
 
-        public void SearchUsedAlias(IPredicateQuery predicateQuery)
-        {
-            predicateQuery.SearchUsedAlias(_propertyName);
-        }
+    public void SearchUsedAlias(IPredicateQuery predicateQuery)
+    {
+        predicateQuery.SearchUsedAlias(_propertyName);
+    }
 
-        public string ToSqlString(IPredicateQuery predicateQuery)
-        {
-            var columnName = predicateQuery.GetColumnName(_propertyName);
-            var parameter = predicateQuery.NewQueryParameter(_value);
+    public string ToSqlString(IPredicateQuery predicateQuery)
+    {
+        var columnName = predicateQuery.GetColumnName(_propertyName);
+        var parameter = predicateQuery.NewQueryParameter(_value);
 
-            return $"{columnName} like {parameter}";
-        }
+        return $"{columnName} like {parameter}";
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/LogicalExpression.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/LogicalExpression.cs
index 8e83369ee8a..25c52dd70be 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/LogicalExpression.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/LogicalExpression.cs
@@ -1,50 +1,49 @@
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates;
+
+/// <summary>
+/// An <see cref="IPredicate" /> that combines two <see cref="IPredicate" />s
+/// with a operator (either "<c>and</c>" or "<c>or</c>") between them.
+/// </summary>
+public abstract class LogicalExpression : IPredicate
 {
     /// <summary>
-    /// An <see cref="IPredicate" /> that combines two <see cref="IPredicate" />s
-    /// with a operator (either "<c>and</c>" or "<c>or</c>") between them.
+    /// Initialize a new instance of the <see cref="LogicalExpression" /> class that
+    /// combines two other <see cref="IPredicate" />s.
     /// </summary>
-    public abstract class LogicalExpression : IPredicate
+    /// <param name="left">The left hand side <see cref="IPredicate" />.</param>
+    /// <param name="right">The right hand side <see cref="IPredicate" />.</param>
+    protected LogicalExpression(IPredicate left, IPredicate right)
     {
-        /// <summary>
-        /// Initialize a new instance of the <see cref="LogicalExpression" /> class that
-        /// combines two other <see cref="IPredicate" />s.
-        /// </summary>
-        /// <param name="left">The left hand side <see cref="IPredicate" />.</param>
-        /// <param name="right">The right hand side <see cref="IPredicate" />.</param>
-        protected LogicalExpression(IPredicate left, IPredicate right)
-        {
-            Left = left;
-            Right = right;
-        }
+        Left = left;
+        Right = right;
+    }
 
-        /// <summary>
-        /// Gets the <see cref="IPredicate" /> that will be on the Left Hand Side of the Op.
-        /// </summary>
-        protected IPredicate Left { get; }
+    /// <summary>
+    /// Gets the <see cref="IPredicate" /> that will be on the Left Hand Side of the Op.
+    /// </summary>
+    protected IPredicate Left { get; }
 
-        /// <summary>
-        /// Gets the <see cref="IPredicate" /> that will be on the Right Hand Side of the Op.
-        /// </summary>
-        protected IPredicate Right { get; }
+    /// <summary>
+    /// Gets the <see cref="IPredicate" /> that will be on the Right Hand Side of the Op.
+    /// </summary>
+    protected IPredicate Right { get; }
 
-        /// <summary>
-        /// Get the Sql operator to put between the two <see cref="Expression" />s.
-        /// </summary>
-        protected abstract string Operator { get; }
+    /// <summary>
+    /// Get the Sql operator to put between the two <see cref="Expression" />s.
+    /// </summary>
+    protected abstract string Operator { get; }
 
-        public void SearchUsedAlias(IPredicateQuery predicateQuery)
-        {
-            Left.SearchUsedAlias(predicateQuery);
-            Right.SearchUsedAlias(predicateQuery);
-        }
+    public void SearchUsedAlias(IPredicateQuery predicateQuery)
+    {
+        Left.SearchUsedAlias(predicateQuery);
+        Right.SearchUsedAlias(predicateQuery);
+    }
 
-        public string ToSqlString(IPredicateQuery predicateQuery)
-        {
-            var left = Left.ToSqlString(predicateQuery);
-            var right = Right.ToSqlString(predicateQuery);
+    public string ToSqlString(IPredicateQuery predicateQuery)
+    {
+        var left = Left.ToSqlString(predicateQuery);
+        var right = Right.ToSqlString(predicateQuery);
 
-            return $"({left} {Operator} {right})";
-        }
+        return $"({left} {Operator} {right})";
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/MatchOptions.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/MatchOptions.cs
index 8be687787c0..276d43c286e 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/MatchOptions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/MatchOptions.cs
@@ -1,69 +1,68 @@
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates;
+
+/// <summary>
+/// Represents a strategy for matching strings using the "like" operand.
+/// </summary>
+public abstract class MatchOptions
 {
     /// <summary>
-    /// Represents a strategy for matching strings using the "like" operand.
+    /// Match the start of the string to the pattern.
     /// </summary>
-    public abstract class MatchOptions
-    {
-        /// <summary>
-        /// Match the start of the string to the pattern.
-        /// </summary>
-        public static readonly MatchOptions StartsWith = new StartsWithMatchOptions();
+    public static readonly MatchOptions StartsWith = new StartsWithMatchOptions();
 
-        /// <summary>
-        /// Match the end of the string to the pattern.
-        /// </summary>
-        public static readonly MatchOptions EndsWith = new EndsWithMatchOptions();
+    /// <summary>
+    /// Match the end of the string to the pattern.
+    /// </summary>
+    public static readonly MatchOptions EndsWith = new EndsWithMatchOptions();
 
-        /// <summary>
-        /// Match when the string contains the pattern.
-        /// </summary>
-        public static readonly MatchOptions Contains = new ContainsMatchOptions();
+    /// <summary>
+    /// Match when the string contains the pattern.
+    /// </summary>
+    public static readonly MatchOptions Contains = new ContainsMatchOptions();
 
-        /// <summary>
-        /// Convert the pattern, by appending/prepending "%".
-        /// </summary>
-        /// <param name="pattern">The string to convert to the appropriate match pattern.</param>
-        /// <returns>
-        /// A <see cref="string" /> that contains a "%" in the appropriate place
-        /// for the Match Strategy.
-        /// </returns>
-        public abstract string ToMatchString(string pattern);
+    /// <summary>
+    /// Convert the pattern, by appending/prepending "%".
+    /// </summary>
+    /// <param name="pattern">The string to convert to the appropriate match pattern.</param>
+    /// <returns>
+    /// A <see cref="string" /> that contains a "%" in the appropriate place
+    /// for the Match Strategy.
+    /// </returns>
+    public abstract string ToMatchString(string pattern);
 
-        /// <summary>
-        /// The <see cref="MatchOptions" /> that matches if the string starts with the pattern.
-        /// </summary>
-        private sealed class StartsWithMatchOptions : MatchOptions
+    /// <summary>
+    /// The <see cref="MatchOptions" /> that matches if the string starts with the pattern.
+    /// </summary>
+    private sealed class StartsWithMatchOptions : MatchOptions
+    {
+        /// <inheritdoc />
+        public override string ToMatchString(string pattern)
         {
-            /// <inheritdoc />
-            public override string ToMatchString(string pattern)
-            {
-                return pattern + '%';
-            }
+            return pattern + '%';
         }
+    }
 
-        /// <summary>
-        /// The <see cref="MatchOptions" /> that matches if the string ends with the pattern.
-        /// </summary>
-        private sealed class EndsWithMatchOptions : MatchOptions
+    /// <summary>
+    /// The <see cref="MatchOptions" /> that matches if the string ends with the pattern.
+    /// </summary>
+    private sealed class EndsWithMatchOptions : MatchOptions
+    {
+        /// <inheritdoc />
+        public override string ToMatchString(string pattern)
         {
-            /// <inheritdoc />
-            public override string ToMatchString(string pattern)
-            {
-                return '%' + pattern;
-            }
+            return '%' + pattern;
         }
+    }
 
-        /// <summary>
-        /// The <see cref="MatchOptions" /> that matches if the string contains the pattern.
-        /// </summary>
-        private sealed class ContainsMatchOptions : MatchOptions
+    /// <summary>
+    /// The <see cref="MatchOptions" /> that matches if the string contains the pattern.
+    /// </summary>
+    private sealed class ContainsMatchOptions : MatchOptions
+    {
+        /// <inheritdoc />
+        public override string ToMatchString(string pattern)
         {
-            /// <inheritdoc />
-            public override string ToMatchString(string pattern)
-            {
-                return '%' + pattern + '%';
-            }
+            return '%' + pattern + '%';
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/NotExpression.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/NotExpression.cs
index 4a386d59fa7..5dc52a06d58 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/NotExpression.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/NotExpression.cs
@@ -1,30 +1,29 @@
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates;
+
+/// <summary>
+/// An <see cref="IPredicate" /> that negates another <see cref="IPredicate" />.
+/// </summary>
+public class NotExpression : IPredicate
 {
+    private readonly IPredicate _predicate;
+
     /// <summary>
-    /// An <see cref="IPredicate" /> that negates another <see cref="IPredicate" />.
+    /// Initialize a new instance of the <see cref="NotExpression" /> class for an <see cref="IPredicate" />.
     /// </summary>
-    public class NotExpression : IPredicate
+    /// <param name="predicate">The <see cref="IPredicate" /> to negate.</param>
+    public NotExpression(IPredicate predicate)
     {
-        private readonly IPredicate _predicate;
-
-        /// <summary>
-        /// Initialize a new instance of the <see cref="NotExpression" /> class for an <see cref="IPredicate" />.
-        /// </summary>
-        /// <param name="predicate">The <see cref="IPredicate" /> to negate.</param>
-        public NotExpression(IPredicate predicate)
-        {
-            _predicate = predicate;
-        }
+        _predicate = predicate;
+    }
 
-        public void SearchUsedAlias(IPredicateQuery predicateQuery)
-        {
-            _predicate.SearchUsedAlias(predicateQuery);
-        }
+    public void SearchUsedAlias(IPredicateQuery predicateQuery)
+    {
+        _predicate.SearchUsedAlias(predicateQuery);
+    }
 
-        public string ToSqlString(IPredicateQuery predicateQuery)
-        {
-            var expression = _predicate.ToSqlString(predicateQuery);
-            return $"not ({expression})";
-        }
+    public string ToSqlString(IPredicateQuery predicateQuery)
+    {
+        var expression = _predicate.ToSqlString(predicateQuery);
+        return $"not ({expression})";
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/OrExpression.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/OrExpression.cs
index 95275e2ba48..bcafb3c0434 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/OrExpression.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/OrExpression.cs
@@ -1,23 +1,22 @@
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates;
+
+/// <summary>
+/// An <see cref="IPredicate" /> that combines two <see cref="IPredicate" />s with an
+/// <c>"or"</c> between them.
+/// </summary>
+public class OrExpression : LogicalExpression
 {
     /// <summary>
-    /// An <see cref="IPredicate" /> that combines two <see cref="IPredicate" />s with an
-    /// <c>"or"</c> between them.
+    /// Initialize a new instance of the <see cref="OrExpression" /> class for
+    /// two <see cref="IPredicate" />s.
     /// </summary>
-    public class OrExpression : LogicalExpression
+    /// <param name="left">The left hand side <see cref="IPredicate" />.</param>
+    /// <param name="right">The right hand side <see cref="IPredicate" />.</param>
+    public OrExpression(IPredicate left, IPredicate right) : base(left, right)
     {
-        /// <summary>
-        /// Initialize a new instance of the <see cref="OrExpression" /> class for
-        /// two <see cref="IPredicate" />s.
-        /// </summary>
-        /// <param name="left">The left hand side <see cref="IPredicate" />.</param>
-        /// <param name="right">The right hand side <see cref="IPredicate" />.</param>
-        public OrExpression(IPredicate left, IPredicate right) : base(left, right)
-        {
-        }
-
-        /// <inheritdoc />
-        /// <value>Returns "<c>or</c>".</value>
-        protected override string Operator => "or";
     }
+
+    /// <inheritdoc />
+    /// <value>Returns "<c>or</c>".</value>
+    protected override string Operator => "or";
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/PredicateQuery.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/PredicateQuery.cs
index 0909c25f1e8..3ccf38f6eff 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/PredicateQuery.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/PredicateQuery.cs
@@ -3,149 +3,148 @@
 using System.Linq;
 using YesSql;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates;
+
+public class PredicateQuery : IPredicateQuery
 {
-    public class PredicateQuery : IPredicateQuery
-    {
-        private readonly IConfiguration _configuration;
-        private readonly IEnumerable<IIndexPropertyProvider> _propertyProviders;
+    private readonly IConfiguration _configuration;
+    private readonly IEnumerable<IIndexPropertyProvider> _propertyProviders;
 
-        private readonly HashSet<string> _usedAliases = [];
-        private readonly Dictionary<string, string> _aliases = [];
-        private readonly Dictionary<string, string> _tableAliases = [];
+    private readonly HashSet<string> _usedAliases = [];
+    private readonly Dictionary<string, string> _aliases = [];
+    private readonly Dictionary<string, string> _tableAliases = [];
 
-        public PredicateQuery(
-            IConfiguration configuration,
-            IEnumerable<IIndexPropertyProvider> propertyProviders)
-        {
-            Dialect = configuration.SqlDialect;
-            _configuration = configuration;
-            _propertyProviders = propertyProviders;
-        }
+    public PredicateQuery(
+        IConfiguration configuration,
+        IEnumerable<IIndexPropertyProvider> propertyProviders)
+    {
+        Dialect = configuration.SqlDialect;
+        _configuration = configuration;
+        _propertyProviders = propertyProviders;
+    }
 
-        public ISqlDialect Dialect { get; set; }
+    public ISqlDialect Dialect { get; set; }
 
-        public IDictionary<string, object> Parameters { get; } = new Dictionary<string, object>();
+    public IDictionary<string, object> Parameters { get; } = new Dictionary<string, object>();
 
 
-        public string NewQueryParameter(object value)
-        {
-            var count = Parameters.Count;
-            var parameterName = $"@x{count + 1}";
+    public string NewQueryParameter(object value)
+    {
+        var count = Parameters.Count;
+        var parameterName = $"@x{count + 1}";
 
-            Parameters.Add(parameterName, value);
+        Parameters.Add(parameterName, value);
 
-            return parameterName;
-        }
+        return parameterName;
+    }
 
-        public void CreateAlias(string path, string alias)
-        {
-            ArgumentNullException.ThrowIfNull(path);
+    public void CreateAlias(string path, string alias)
+    {
+        ArgumentNullException.ThrowIfNull(path);
 
-            ArgumentNullException.ThrowIfNull(alias);
+        ArgumentNullException.ThrowIfNull(alias);
 
-            _aliases[path] = alias;
-        }
-        public void CreateTableAlias(string path, string tableAlias)
-        {
-            ArgumentNullException.ThrowIfNull(path);
+        _aliases[path] = alias;
+    }
+    public void CreateTableAlias(string path, string tableAlias)
+    {
+        ArgumentNullException.ThrowIfNull(path);
 
-            ArgumentNullException.ThrowIfNull(tableAlias);
+        ArgumentNullException.ThrowIfNull(tableAlias);
 
-            _tableAliases[path] = tableAlias;
-        }
+        _tableAliases[path] = tableAlias;
+    }
 
 
-        public void SearchUsedAlias(string propertyPath)
+    public void SearchUsedAlias(string propertyPath)
+    {
+        ArgumentNullException.ThrowIfNull(propertyPath);
+
+        // Check if there's an alias for the full path
+        // aliasPart.Alias -> AliasFieldIndex.Alias
+        if (_aliases.TryGetValue(propertyPath, out var alias))
         {
-            ArgumentNullException.ThrowIfNull(propertyPath);
+            _usedAliases.Add(alias);
+            return;
+        }
 
-            // Check if there's an alias for the full path
-            // aliasPart.Alias -> AliasFieldIndex.Alias
-            if (_aliases.TryGetValue(propertyPath, out var alias))
-            {
-                _usedAliases.Add(alias);
-                return;
-            }
+        var values = propertyPath.Split('.', 2);
 
-            var values = propertyPath.Split('.', 2);
+        // if empty prefix, use default (empty alias)
+        var aliasPath = values.Length == 1 ? string.Empty : values[0];
 
-            // if empty prefix, use default (empty alias)
-            var aliasPath = values.Length == 1 ? string.Empty : values[0];
+        // get the actual index from the alias
+        if (_aliases.TryGetValue(aliasPath, out alias))
+        {
+            // get the index property provider fore the alias
+            var propertyProvider = _propertyProviders.FirstOrDefault(x => x.IndexName.Equals(alias, StringComparison.OrdinalIgnoreCase));
 
-            // get the actual index from the alias
-            if (_aliases.TryGetValue(aliasPath, out alias))
+            if (propertyProvider != null)
             {
-                // get the index property provider fore the alias
-                var propertyProvider = _propertyProviders.FirstOrDefault(x => x.IndexName.Equals(alias, StringComparison.OrdinalIgnoreCase));
-
-                if (propertyProvider != null)
-                {
-                    if (propertyProvider.TryGetValue(values.Last(), out var columnName))
-                    {
-                        _usedAliases.Add(alias);
-                        return;
-                    }
-                }
-                else
+                if (propertyProvider.TryGetValue(values.Last(), out var columnName))
                 {
                     _usedAliases.Add(alias);
                     return;
                 }
             }
-
-            // No aliases registered for this path, return the formatted path.
-            return;
+            else
+            {
+                _usedAliases.Add(alias);
+                return;
+            }
         }
 
-        public string GetColumnName(string propertyPath)
+        // No aliases registered for this path, return the formatted path.
+        return;
+    }
+
+    public string GetColumnName(string propertyPath)
+    {
+        ArgumentNullException.ThrowIfNull(propertyPath);
+
+        // Check if there's an alias for the full path
+        // aliasPart.Alias -> AliasFieldIndex.Alias
+        if (_aliases.TryGetValue(propertyPath, out var alias))
         {
-            ArgumentNullException.ThrowIfNull(propertyPath);
+            return Dialect.QuoteForColumnName(alias);
+        }
 
-            // Check if there's an alias for the full path
-            // aliasPart.Alias -> AliasFieldIndex.Alias
-            if (_aliases.TryGetValue(propertyPath, out var alias))
-            {
-                return Dialect.QuoteForColumnName(alias);
-            }
+        var values = propertyPath.Split('.', 2);
 
-            var values = propertyPath.Split('.', 2);
+        // if empty prefix, use default (empty alias)
+        var aliasPath = values.Length == 1 ? string.Empty : values[0];
 
-            // if empty prefix, use default (empty alias)
-            var aliasPath = values.Length == 1 ? string.Empty : values[0];
+        // get the actual index from the alias
+        if (_aliases.TryGetValue(aliasPath, out alias))
+        {
+            var tableAlias = _tableAliases[alias];
+            // get the index property provider fore the alias
+            var propertyProvider = _propertyProviders.FirstOrDefault(x => x.IndexName.Equals(alias, StringComparison.OrdinalIgnoreCase));
 
-            // get the actual index from the alias
-            if (_aliases.TryGetValue(aliasPath, out alias))
+            if (propertyProvider != null)
             {
-                var tableAlias = _tableAliases[alias];
-                // get the index property provider fore the alias
-                var propertyProvider = _propertyProviders.FirstOrDefault(x => x.IndexName.Equals(alias, StringComparison.OrdinalIgnoreCase));
-
-                if (propertyProvider != null)
+                if (propertyProvider.TryGetValue(values.Last(), out var columnName))
                 {
-                    if (propertyProvider.TryGetValue(values.Last(), out var columnName))
-                    {
-                        // Switch the given alias in the path with the mapped alias.
-                        // aliasPart.alias -> AliasPartIndex.Alias
-                        return $"{Dialect.QuoteForAliasName(tableAlias)}.{Dialect.QuoteForColumnName(columnName)}";
-                    }
-                }
-                else
-                {
-                    // no property provider exists; hope sql is case-insensitive (will break postgres; property providers must be supplied for postgres)
                     // Switch the given alias in the path with the mapped alias.
-                    // aliasPart.Alias -> AliasPartIndex.alias
-                    return $"{Dialect.QuoteForAliasName(tableAlias)}.{Dialect.QuoteForColumnName(values.Last())}";
+                    // aliasPart.alias -> AliasPartIndex.Alias
+                    return $"{Dialect.QuoteForAliasName(tableAlias)}.{Dialect.QuoteForColumnName(columnName)}";
                 }
             }
-
-            // No aliases registered for this path, return the formatted path.
-            return Dialect.QuoteForColumnName(propertyPath);
+            else
+            {
+                // no property provider exists; hope sql is case-insensitive (will break postgres; property providers must be supplied for postgres)
+                // Switch the given alias in the path with the mapped alias.
+                // aliasPart.Alias -> AliasPartIndex.alias
+                return $"{Dialect.QuoteForAliasName(tableAlias)}.{Dialect.QuoteForColumnName(values.Last())}";
+            }
         }
 
-        public IEnumerable<string> GetUsedAliases()
-        {
-            return _usedAliases;
-        }
+        // No aliases registered for this path, return the formatted path.
+        return Dialect.QuoteForColumnName(propertyPath);
+    }
+
+    public IEnumerable<string> GetUsedAliases()
+    {
+        return _usedAliases;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/SimpleExpression.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/SimpleExpression.cs
index fb0a6dd06ad..ef3c4fc70e0 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/SimpleExpression.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Predicates/SimpleExpression.cs
@@ -1,49 +1,48 @@
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Predicates;
+
+/// <summary>
+/// The base class for an <see cref="IPredicate" /> that compares a single property
+/// to a value.
+/// </summary>
+public class SimpleExpression : IPredicate
 {
+    private readonly string _propertyName;
+    private readonly object _value;
+
     /// <summary>
-    /// The base class for an <see cref="IPredicate" /> that compares a single property
-    /// to a value.
+    /// Initialize a new instance of the <see cref="SimpleExpression" /> class for a named
+    /// property and its value.
     /// </summary>
-    public class SimpleExpression : IPredicate
+    /// <param name="propertyName">The name of the property.</param>
+    /// <param name="value">The value for the property.</param>
+    /// <param name="operation">The SQL operation.</param>
+    public SimpleExpression(string propertyName, object value, string operation)
     {
-        private readonly string _propertyName;
-        private readonly object _value;
-
-        /// <summary>
-        /// Initialize a new instance of the <see cref="SimpleExpression" /> class for a named
-        /// property and its value.
-        /// </summary>
-        /// <param name="propertyName">The name of the property.</param>
-        /// <param name="value">The value for the property.</param>
-        /// <param name="operation">The SQL operation.</param>
-        public SimpleExpression(string propertyName, object value, string operation)
-        {
-            _propertyName = propertyName;
-            _value = value;
-            Operation = operation;
-        }
+        _propertyName = propertyName;
+        _value = value;
+        Operation = operation;
+    }
 
-        /// <summary>
-        /// Get the Sql operator to use for the specific
-        /// subclass of <see cref="SimpleExpression" />.
-        /// </summary>
-        protected virtual string Operation { get; }
+    /// <summary>
+    /// Get the Sql operator to use for the specific
+    /// subclass of <see cref="SimpleExpression" />.
+    /// </summary>
+    protected virtual string Operation { get; }
 
-        public void SearchUsedAlias(IPredicateQuery predicateQuery)
-        {
-            predicateQuery.SearchUsedAlias(_propertyName);
-        }
+    public void SearchUsedAlias(IPredicateQuery predicateQuery)
+    {
+        predicateQuery.SearchUsedAlias(_propertyName);
+    }
 
-        /// <summary>
-        /// Converts the SimpleExpression to a SQL <see cref="string" />.
-        /// </summary>
-        /// <returns>A string that contains a valid Sql fragment.</returns>
-        public string ToSqlString(IPredicateQuery predicateQuery)
-        {
-            var columnName = predicateQuery.GetColumnName(_propertyName);
-            var parameter = predicateQuery.NewQueryParameter(_value);
+    /// <summary>
+    /// Converts the SimpleExpression to a SQL <see cref="string" />.
+    /// </summary>
+    /// <returns>A string that contains a valid Sql fragment.</returns>
+    public string ToSqlString(IPredicateQuery predicateQuery)
+    {
+        var columnName = predicateQuery.GetColumnName(_propertyName);
+        var parameter = predicateQuery.NewQueryParameter(_value);
 
-            return $"({columnName}{Operation}{parameter})";
-        }
+        return $"({columnName}{Operation}{parameter})";
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/PublicationStatusEnum.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/PublicationStatusEnum.cs
index 05b4aa6c5c1..44755fc24c5 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/PublicationStatusEnum.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/PublicationStatusEnum.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.ContentManagement.GraphQL.Queries
+namespace OrchardCore.ContentManagement.GraphQL.Queries;
+
+public enum PublicationStatusEnum
 {
-    public enum PublicationStatusEnum
-    {
-        Published,
-        Draft,
-        Latest,
-        All,
-    }
+    Published,
+    Draft,
+    Latest,
+    All,
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/ContentItemInterface.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/ContentItemInterface.cs
index 205d540b1dc..1cbd102f448 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/ContentItemInterface.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/ContentItemInterface.cs
@@ -2,39 +2,38 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.ContentManagement.GraphQL.Options;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Types
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Types;
+
+public class ContentItemInterface : InterfaceGraphType<ContentItem>
 {
-    public class ContentItemInterface : InterfaceGraphType<ContentItem>
-    {
-        private readonly GraphQLContentOptions _options;
+    private readonly GraphQLContentOptions _options;
 
-        public ContentItemInterface(IOptions<GraphQLContentOptions> optionsAccessor)
-        {
-            _options = optionsAccessor.Value;
+    public ContentItemInterface(IOptions<GraphQLContentOptions> optionsAccessor)
+    {
+        _options = optionsAccessor.Value;
 
-            Name = "ContentItem";
+        Name = "ContentItem";
 
-            Field(ci => ci.ContentItemId);
-            Field(ci => ci.ContentItemVersionId, nullable: true);
-            Field(ci => ci.ContentType);
-            Field(ci => ci.DisplayText, nullable: true);
-            Field(ci => ci.Published);
-            Field(ci => ci.Latest);
-            Field(ci => ci.ModifiedUtc, nullable: true);
-            Field(ci => ci.PublishedUtc, nullable: true);
-            Field(ci => ci.CreatedUtc, nullable: true);
-            Field(ci => ci.Owner, nullable: true);
-            Field(ci => ci.Author, nullable: true);
-        }
+        Field(ci => ci.ContentItemId);
+        Field(ci => ci.ContentItemVersionId, nullable: true);
+        Field(ci => ci.ContentType);
+        Field(ci => ci.DisplayText, nullable: true);
+        Field(ci => ci.Published);
+        Field(ci => ci.Latest);
+        Field(ci => ci.ModifiedUtc, nullable: true);
+        Field(ci => ci.PublishedUtc, nullable: true);
+        Field(ci => ci.CreatedUtc, nullable: true);
+        Field(ci => ci.Owner, nullable: true);
+        Field(ci => ci.Author, nullable: true);
+    }
 
-        public override FieldType AddField(FieldType fieldType)
+    public override FieldType AddField(FieldType fieldType)
+    {
+        if (!_options.ShouldSkip(typeof(ContentItemType), fieldType.Name))
         {
-            if (!_options.ShouldSkip(typeof(ContentItemType), fieldType.Name))
-            {
-                return base.AddField(fieldType);
-            }
-
-            return null;
+            return base.AddField(fieldType);
         }
+
+        return null;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/ContentItemOrderByInput.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/ContentItemOrderByInput.cs
index 1a8f49f1da9..79326ee323c 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/ContentItemOrderByInput.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/ContentItemOrderByInput.cs
@@ -1,41 +1,40 @@
 using GraphQL.Types;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Types
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Types;
+
+public class ContentItemOrderByInput : InputObjectGraphType
 {
-    public class ContentItemOrderByInput : InputObjectGraphType
+    public ContentItemOrderByInput(string contentItemName)
     {
-        public ContentItemOrderByInput(string contentItemName)
-        {
-            Name = contentItemName + "OrderByInput";
+        Name = contentItemName + "OrderByInput";
 
-            Field<OrderByDirectionGraphType>("contentItemId");
-            Field<OrderByDirectionGraphType>("contentItemVersionId");
-            Field<OrderByDirectionGraphType>("contentType");
-            Field<OrderByDirectionGraphType>("displayText");
-            Field<OrderByDirectionGraphType>("published");
-            Field<OrderByDirectionGraphType>("latest");
-            Field<OrderByDirectionGraphType>("createdUtc");
-            Field<OrderByDirectionGraphType>("modifiedUtc");
-            Field<OrderByDirectionGraphType>("publishedUtc");
-            Field<OrderByDirectionGraphType>("owner");
-            Field<OrderByDirectionGraphType>("author");
-        }
+        Field<OrderByDirectionGraphType>("contentItemId");
+        Field<OrderByDirectionGraphType>("contentItemVersionId");
+        Field<OrderByDirectionGraphType>("contentType");
+        Field<OrderByDirectionGraphType>("displayText");
+        Field<OrderByDirectionGraphType>("published");
+        Field<OrderByDirectionGraphType>("latest");
+        Field<OrderByDirectionGraphType>("createdUtc");
+        Field<OrderByDirectionGraphType>("modifiedUtc");
+        Field<OrderByDirectionGraphType>("publishedUtc");
+        Field<OrderByDirectionGraphType>("owner");
+        Field<OrderByDirectionGraphType>("author");
     }
+}
 
-    public enum OrderByDirection
-    {
-        Ascending,
-        Descending
-    }
+public enum OrderByDirection
+{
+    Ascending,
+    Descending
+}
 
-    public class OrderByDirectionGraphType : EnumerationGraphType
+public class OrderByDirectionGraphType : EnumerationGraphType
+{
+    public OrderByDirectionGraphType()
     {
-        public OrderByDirectionGraphType()
-        {
-            Name = "OrderByDirection";
-            Description = "the order by direction";
-            Add("ASC", OrderByDirection.Ascending, "orders content items in ascending order");
-            Add("DESC", OrderByDirection.Descending, "orders content items in descending order");
-        }
+        Name = "OrderByDirection";
+        Description = "the order by direction";
+        Add("ASC", OrderByDirection.Ascending, "orders content items in ascending order");
+        Add("DESC", OrderByDirection.Descending, "orders content items in descending order");
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/ContentItemType.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/ContentItemType.cs
index c16e5e39b20..ef3b732bb77 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/ContentItemType.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/ContentItemType.cs
@@ -11,70 +11,69 @@
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.ModelBinding;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Types
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Types;
+
+public class ContentItemType : ObjectGraphType<ContentItem>
 {
-    public class ContentItemType : ObjectGraphType<ContentItem>
+    private readonly GraphQLContentOptions _options;
+
+    public ContentItemType(IOptions<GraphQLContentOptions> optionsAccessor)
     {
-        private readonly GraphQLContentOptions _options;
+        _options = optionsAccessor.Value;
 
-        public ContentItemType(IOptions<GraphQLContentOptions> optionsAccessor)
-        {
-            _options = optionsAccessor.Value;
+        Name = "ContentItemType";
 
-            Name = "ContentItemType";
+        Field(ci => ci.ContentItemId).Description("Content item id");
+        Field(ci => ci.ContentItemVersionId, nullable: true).Description("The content item version id");
+        Field(ci => ci.ContentType).Description("Type of content");
+        Field(ci => ci.DisplayText, nullable: true).Description("The display text of the content item");
+        Field(ci => ci.Published).Description("Is the published version");
+        Field(ci => ci.Latest).Description("Is the latest version");
+        Field<DateTimeGraphType>("modifiedUtc").Resolve(ci => ci.Source.ModifiedUtc).Description("The date and time of modification");
+        Field<DateTimeGraphType>("publishedUtc").Resolve(ci => ci.Source.PublishedUtc).Description("The date and time of publication");
+        Field<DateTimeGraphType>("createdUtc").Resolve(ci => ci.Source.CreatedUtc).Description("The date and time of creation");
+        Field(ci => ci.Owner, nullable: true).Description("The owner of the content item");
+        Field(ci => ci.Author).Description("The author of the content item");
 
-            Field(ci => ci.ContentItemId).Description("Content item id");
-            Field(ci => ci.ContentItemVersionId, nullable: true).Description("The content item version id");
-            Field(ci => ci.ContentType).Description("Type of content");
-            Field(ci => ci.DisplayText, nullable: true).Description("The display text of the content item");
-            Field(ci => ci.Published).Description("Is the published version");
-            Field(ci => ci.Latest).Description("Is the latest version");
-            Field<DateTimeGraphType>("modifiedUtc").Resolve(ci => ci.Source.ModifiedUtc).Description("The date and time of modification");
-            Field<DateTimeGraphType>("publishedUtc").Resolve(ci => ci.Source.PublishedUtc).Description("The date and time of publication");
-            Field<DateTimeGraphType>("createdUtc").Resolve(ci => ci.Source.CreatedUtc).Description("The date and time of creation");
-            Field(ci => ci.Owner, nullable: true).Description("The owner of the content item");
-            Field(ci => ci.Author).Description("The author of the content item");
+        Field<StringGraphType, string>("render")
+            .ResolveLockedAsync(RenderShapeAsync);
 
-            Field<StringGraphType, string>("render")
-                .ResolveLockedAsync(RenderShapeAsync);
+        Interface<ContentItemInterface>();
 
-            Interface<ContentItemInterface>();
+        IsTypeOf = IsContentType;
+    }
 
-            IsTypeOf = IsContentType;
-        }
+    private bool IsContentType(object obj)
+    {
+        return obj is ContentItem item && item.ContentType == Name;
+    }
 
-        private bool IsContentType(object obj)
+    public override FieldType AddField(FieldType fieldType)
+    {
+        if (!_options.ShouldSkip(GetType(), fieldType.Name))
         {
-            return obj is ContentItem item && item.ContentType == Name;
+            return base.AddField(fieldType);
         }
 
-        public override FieldType AddField(FieldType fieldType)
-        {
-            if (!_options.ShouldSkip(GetType(), fieldType.Name))
-            {
-                return base.AddField(fieldType);
-            }
-
-            return null;
-        }
+        return null;
+    }
 
-        private static async ValueTask<string> RenderShapeAsync(IResolveFieldContext<ContentItem> context)
-        {
-            var serviceProvider = context.RequestServices;
+    private static async ValueTask<string> RenderShapeAsync(IResolveFieldContext<ContentItem> context)
+    {
+        var serviceProvider = context.RequestServices;
 
-            // Build shape
-            var displayManager = serviceProvider.GetRequiredService<IContentItemDisplayManager>();
-            var updateModelAccessor = serviceProvider.GetRequiredService<IUpdateModelAccessor>();
-            var model = await displayManager.BuildDisplayAsync(context.Source, updateModelAccessor.ModelUpdater);
+        // Build shape
+        var displayManager = serviceProvider.GetRequiredService<IContentItemDisplayManager>();
+        var updateModelAccessor = serviceProvider.GetRequiredService<IUpdateModelAccessor>();
+        var model = await displayManager.BuildDisplayAsync(context.Source, updateModelAccessor.ModelUpdater);
 
-            var displayHelper = serviceProvider.GetRequiredService<IDisplayHelper>();
-            var htmlEncoder = serviceProvider.GetRequiredService<HtmlEncoder>();
+        var displayHelper = serviceProvider.GetRequiredService<IDisplayHelper>();
+        var htmlEncoder = serviceProvider.GetRequiredService<HtmlEncoder>();
 
-            using var sw = new ZStringWriter();
-            var htmlContent = await displayHelper.ShapeExecuteAsync(model);
-            htmlContent.WriteTo(sw, htmlEncoder);
+        using var sw = new ZStringWriter();
+        var htmlContent = await displayHelper.ShapeExecuteAsync(model);
+        htmlContent.WriteTo(sw, htmlEncoder);
 
-            return sw.ToString();
-        }
+        return sw.ToString();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/ContentItemWhereInput.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/ContentItemWhereInput.cs
index 55cd0e6fefc..32564b898fd 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/ContentItemWhereInput.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/ContentItemWhereInput.cs
@@ -5,44 +5,43 @@
 using OrchardCore.Apis.GraphQL.Queries;
 using OrchardCore.ContentManagement.GraphQL.Options;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Types
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Types;
+
+[GraphQLFieldName("Or", "OR")]
+[GraphQLFieldName("And", "AND")]
+[GraphQLFieldName("Not", "NOT")]
+public class ContentItemWhereInput : WhereInputObjectGraphType
 {
-    [GraphQLFieldName("Or", "OR")]
-    [GraphQLFieldName("And", "AND")]
-    [GraphQLFieldName("Not", "NOT")]
-    public class ContentItemWhereInput : WhereInputObjectGraphType
-    {
-        private readonly IOptions<GraphQLContentOptions> _optionsAccessor;
+    private readonly IOptions<GraphQLContentOptions> _optionsAccessor;
 
-        public ContentItemWhereInput(string contentItemName, IOptions<GraphQLContentOptions> optionsAccessor)
-        {
-            _optionsAccessor = optionsAccessor;
+    public ContentItemWhereInput(string contentItemName, IOptions<GraphQLContentOptions> optionsAccessor)
+    {
+        _optionsAccessor = optionsAccessor;
 
-            Name = $"{contentItemName}WhereInput";
+        Name = $"{contentItemName}WhereInput";
 
-            Description = $"the {contentItemName} content item filters";
+        Description = $"the {contentItemName} content item filters";
 
-            AddScalarFilterFields<IdGraphType>("contentItemId", "content item id");
-            AddScalarFilterFields<IdGraphType>("contentItemVersionId", "the content item version id");
-            AddScalarFilterFields<StringGraphType>("displayText", "the display text of the content item");
-            AddScalarFilterFields<DateTimeGraphType>("createdUtc", "the date and time of creation");
-            AddScalarFilterFields<DateTimeGraphType>("modifiedUtc", "the date and time of modification");
-            AddScalarFilterFields<DateTimeGraphType>("publishedUtc", "the date and time of publication");
-            AddScalarFilterFields<StringGraphType>("owner", "the owner of the content item");
-            AddScalarFilterFields<StringGraphType>("author", "the author of the content item");
+        AddScalarFilterFields<IdGraphType>("contentItemId", "content item id");
+        AddScalarFilterFields<IdGraphType>("contentItemVersionId", "the content item version id");
+        AddScalarFilterFields<StringGraphType>("displayText", "the display text of the content item");
+        AddScalarFilterFields<DateTimeGraphType>("createdUtc", "the date and time of creation");
+        AddScalarFilterFields<DateTimeGraphType>("modifiedUtc", "the date and time of modification");
+        AddScalarFilterFields<DateTimeGraphType>("publishedUtc", "the date and time of publication");
+        AddScalarFilterFields<StringGraphType>("owner", "the owner of the content item");
+        AddScalarFilterFields<StringGraphType>("author", "the author of the content item");
 
-            var whereInputType = new ListGraphType(this);
-            Field<ListGraphType<ContentItemWhereInput>>("Or").Description("OR logical operation").Type(whereInputType);
-            Field<ListGraphType<ContentItemWhereInput>>("And").Description("AND logical operation").Type(whereInputType);
-            Field<ListGraphType<ContentItemWhereInput>>("Not").Description("NOT logical operation").Type(whereInputType);
-        }
+        var whereInputType = new ListGraphType(this);
+        Field<ListGraphType<ContentItemWhereInput>>("Or").Description("OR logical operation").Type(whereInputType);
+        Field<ListGraphType<ContentItemWhereInput>>("And").Description("AND logical operation").Type(whereInputType);
+        Field<ListGraphType<ContentItemWhereInput>>("Not").Description("NOT logical operation").Type(whereInputType);
+    }
 
-        public override void AddScalarFilterFields(Type graphType, string fieldName, string description)
+    public override void AddScalarFilterFields(Type graphType, string fieldName, string description)
+    {
+        if (!_optionsAccessor.Value.ShouldSkip(typeof(ContentItemType), fieldName))
         {
-            if (!_optionsAccessor.Value.ShouldSkip(typeof(ContentItemType), fieldName))
-            {
-                base.AddScalarFilterFields(graphType, fieldName, description);
-            }
+            base.AddScalarFilterFields(graphType, fieldName, description);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/DynamicContentTypeBuilder.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/DynamicContentTypeBuilder.cs
index 49b72c65965..d076a3683c1 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/DynamicContentTypeBuilder.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/DynamicContentTypeBuilder.cs
@@ -10,201 +10,200 @@
 using OrchardCore.ContentManagement.GraphQL.Options;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Types
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Types;
+
+public abstract class DynamicContentTypeBuilder : IContentTypeBuilder
 {
-    public abstract class DynamicContentTypeBuilder : IContentTypeBuilder
+    protected readonly IHttpContextAccessor _httpContextAccessor;
+    protected readonly GraphQLContentOptions _contentOptions;
+    protected readonly IStringLocalizer S;
+    private readonly Dictionary<string, FieldType> _dynamicPartFields;
+
+    protected DynamicContentTypeBuilder(IHttpContextAccessor httpContextAccessor,
+        IOptions<GraphQLContentOptions> contentOptionsAccessor,
+        IStringLocalizer<DynamicContentTypeBuilder> localizer)
     {
-        protected readonly IHttpContextAccessor _httpContextAccessor;
-        protected readonly GraphQLContentOptions _contentOptions;
-        protected readonly IStringLocalizer S;
-        private readonly Dictionary<string, FieldType> _dynamicPartFields;
-
-        protected DynamicContentTypeBuilder(IHttpContextAccessor httpContextAccessor,
-            IOptions<GraphQLContentOptions> contentOptionsAccessor,
-            IStringLocalizer<DynamicContentTypeBuilder> localizer)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _contentOptions = contentOptionsAccessor.Value;
-            _dynamicPartFields = [];
+        _httpContextAccessor = httpContextAccessor;
+        _contentOptions = contentOptionsAccessor.Value;
+        _dynamicPartFields = [];
+
+        S = localizer;
+    }
+
+    public abstract void Build(ISchema schema, FieldType contentQuery, ContentTypeDefinition contentTypeDefinition, ContentItemType contentItemType);
 
-            S = localizer;
+    protected void BuildInternal(ISchema schema, ContentTypeDefinition contentTypeDefinition, IComplexGraphType graphType)
+    {
+        if (_contentOptions.ShouldHide(contentTypeDefinition))
+        {
+            return;
         }
 
-        public abstract void Build(ISchema schema, FieldType contentQuery, ContentTypeDefinition contentTypeDefinition, ContentItemType contentItemType);
+        var serviceProvider = _httpContextAccessor.HttpContext.RequestServices;
+        var contentFieldProviders = serviceProvider.GetServices<IContentFieldProvider>().ToList();
 
-        protected void BuildInternal(ISchema schema, ContentTypeDefinition contentTypeDefinition, IComplexGraphType graphType)
+        foreach (var part in contentTypeDefinition.Parts)
         {
-            if (_contentOptions.ShouldHide(contentTypeDefinition))
+            var partName = part.Name;
+
+            // This builder only handles parts with fields.
+            if (!part.PartDefinition.Fields.Any())
             {
-                return;
+                continue;
             }
 
-            var serviceProvider = _httpContextAccessor.HttpContext.RequestServices;
-            var contentFieldProviders = serviceProvider.GetServices<IContentFieldProvider>().ToList();
+            if (_contentOptions.ShouldSkip(part))
+            {
+                continue;
+            }
 
-            foreach (var part in contentTypeDefinition.Parts)
+            if (!part.PartDefinition.Fields.Any(field => contentFieldProviders.Any(fieldProvider => fieldProvider.HasField(schema, field))))
             {
-                var partName = part.Name;
+                continue;
+            }
 
-                // This builder only handles parts with fields.
-                if (!part.PartDefinition.Fields.Any())
+            if (_contentOptions.ShouldCollapse(part))
+            {
+                foreach (var field in part.PartDefinition.Fields)
                 {
-                    continue;
-                }
+                    foreach (var fieldProvider in contentFieldProviders)
+                    {
+                        var customFieldName = GraphQLContentOptions.GetFieldName(part, part.Name, field.Name);
 
-                if (_contentOptions.ShouldSkip(part))
-                {
-                    continue;
-                }
+                        var contentFieldType = fieldProvider.GetField(schema, field, part.Name, customFieldName);
 
-                if (!part.PartDefinition.Fields.Any(field => contentFieldProviders.Any(fieldProvider => fieldProvider.HasField(schema, field))))
-                {
-                    continue;
+                        if (contentFieldType != null)
+                        {
+                            if (_contentOptions.ShouldSkip(contentFieldType.Type, contentFieldType.Name) ||
+                                graphType.HasFieldIgnoreCase(contentFieldType.Name))
+                            {
+                                continue;
+                            }
+
+                            if (graphType is IFilterInputObjectGraphType curInputGraphType)
+                            {
+                                if (fieldProvider.HasFieldIndex(field))
+                                {
+                                    curInputGraphType.AddScalarFilterFields(contentFieldType.Type, contentFieldType.Name, contentFieldType.Description);
+                                }
+                            }
+                            else if (graphType is IObjectGraphType curObjectGraphType)
+                            {
+                                curObjectGraphType.AddField(contentFieldType);
+                            }
+
+                            break;
+                        }
+                    }
                 }
 
-                if (_contentOptions.ShouldCollapse(part))
+                continue;
+            }
+
+            // Check if another builder has already added a field for this part.
+            var partFieldName = partName.ToFieldName();
+            var partFieldType = graphType.GetField(partFieldName);
+
+            if (partFieldType != null)
+            {
+                // Add dynamic content fields to the registered part type.
+                var partContentItemType = schema.AdditionalTypeInstances
+                    .Where(type => type is IObjectGraphType || type is IFilterInputObjectGraphType)
+                    .Where(type => type.GetType() == partFieldType.Type)
+                    .FirstOrDefault() as IComplexGraphType;
+
+                if (partContentItemType != null)
                 {
                     foreach (var field in part.PartDefinition.Fields)
                     {
                         foreach (var fieldProvider in contentFieldProviders)
                         {
-                            var customFieldName = GraphQLContentOptions.GetFieldName(part, part.Name, field.Name);
-
-                            var contentFieldType = fieldProvider.GetField(schema, field, part.Name, customFieldName);
+                            var contentFieldType = fieldProvider.GetField(schema, field, part.Name);
 
                             if (contentFieldType != null)
                             {
                                 if (_contentOptions.ShouldSkip(contentFieldType.Type, contentFieldType.Name) ||
-                                    graphType.HasFieldIgnoreCase(contentFieldType.Name))
+                                    partContentItemType.HasFieldIgnoreCase(contentFieldType.Name))
                                 {
                                     continue;
                                 }
 
-                                if (graphType is IFilterInputObjectGraphType curInputGraphType)
+                                if (partContentItemType is IFilterInputObjectGraphType partInputContentItemType)
                                 {
                                     if (fieldProvider.HasFieldIndex(field))
                                     {
-                                        curInputGraphType.AddScalarFilterFields(contentFieldType.Type, contentFieldType.Name, contentFieldType.Description);
+                                        partInputContentItemType.AddScalarFilterFields(contentFieldType.Type, contentFieldType.Name, contentFieldType.Description);
                                     }
                                 }
-                                else if (graphType is IObjectGraphType curObjectGraphType)
+                                else if (partContentItemType is IObjectGraphType partContentItemObjectType)
                                 {
-                                    curObjectGraphType.AddField(contentFieldType);
+                                    partContentItemObjectType.AddField(contentFieldType);
                                 }
 
                                 break;
                             }
                         }
                     }
-
-                    continue;
                 }
 
-                // Check if another builder has already added a field for this part.
-                var partFieldName = partName.ToFieldName();
-                var partFieldType = graphType.GetField(partFieldName);
+                continue;
+            }
 
-                if (partFieldType != null)
+            if (_dynamicPartFields.TryGetValue(partName, out var fieldType))
+            {
+                if (graphType is IFilterInputObjectGraphType curInputGraphType)
                 {
-                    // Add dynamic content fields to the registered part type.
-                    var partContentItemType = schema.AdditionalTypeInstances
-                        .Where(type => type is IObjectGraphType || type is IFilterInputObjectGraphType)
-                        .Where(type => type.GetType() == partFieldType.Type)
-                        .FirstOrDefault() as IComplexGraphType;
-
-                    if (partContentItemType != null)
-                    {
-                        foreach (var field in part.PartDefinition.Fields)
-                        {
-                            foreach (var fieldProvider in contentFieldProviders)
-                            {
-                                var contentFieldType = fieldProvider.GetField(schema, field, part.Name);
-
-                                if (contentFieldType != null)
-                                {
-                                    if (_contentOptions.ShouldSkip(contentFieldType.Type, contentFieldType.Name) ||
-                                        partContentItemType.HasFieldIgnoreCase(contentFieldType.Name))
-                                    {
-                                        continue;
-                                    }
-
-                                    if (partContentItemType is IFilterInputObjectGraphType partInputContentItemType)
-                                    {
-                                        if (fieldProvider.HasFieldIndex(field))
-                                        {
-                                            partInputContentItemType.AddScalarFilterFields(contentFieldType.Type, contentFieldType.Name, contentFieldType.Description);
-                                        }
-                                    }
-                                    else if (partContentItemType is IObjectGraphType partContentItemObjectType)
-                                    {
-                                        partContentItemObjectType.AddField(contentFieldType);
-                                    }
-
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    continue;
+                    curInputGraphType.AddScalarFilterFields(fieldType.Type, fieldType.Name, fieldType.Description);
                 }
-
-                if (_dynamicPartFields.TryGetValue(partName, out var fieldType))
+                else if (graphType is IObjectGraphType curObjectGraphType)
                 {
-                    if (graphType is IFilterInputObjectGraphType curInputGraphType)
-                    {
-                        curInputGraphType.AddScalarFilterFields(fieldType.Type, fieldType.Name, fieldType.Description);
-                    }
-                    else if (graphType is IObjectGraphType curObjectGraphType)
-                    {
-                        curObjectGraphType.AddField(fieldType);
-                    }
-
-                    continue;
+                    curObjectGraphType.AddField(fieldType);
                 }
 
-                if (graphType is IFilterInputObjectGraphType inputGraphType)
-                {
-                    if (part.PartDefinition.Fields.Any(field => contentFieldProviders.Any(cfp => cfp.HasFieldIndex(field))))
-                    {
-                        var field = new FieldType
-                        {
-                            Name = partFieldName,
-                            Description = S["Represents a {0}.", part.PartDefinition.Name],
-                            Type = typeof(DynamicPartWhereInputGraphType),
-                            ResolvedType = new DynamicPartWhereInputGraphType(part)
-                        };
-
-                        inputGraphType.AddField(field);
-                        _dynamicPartFields[partName] = field;
-                    }
-                }
-                else if (graphType is IObjectGraphType objectGraphType)
+                continue;
+            }
+
+            if (graphType is IFilterInputObjectGraphType inputGraphType)
+            {
+                if (part.PartDefinition.Fields.Any(field => contentFieldProviders.Any(cfp => cfp.HasFieldIndex(field))))
                 {
                     var field = new FieldType
                     {
                         Name = partFieldName,
                         Description = S["Represents a {0}.", part.PartDefinition.Name],
-                        Type = typeof(DynamicPartGraphType),
-                        ResolvedType = new DynamicPartGraphType(part),
-                        Resolver = new FuncFieldResolver<ContentElement, object>(context =>
-                        {
-                            var nameToResolve = partName;
-                            var typeToResolve = context.FieldDefinition.ResolvedType.GetType().BaseType.GetGenericArguments().First();
-
-                            return context.Source.Get(typeToResolve, nameToResolve);
-                        })
+                        Type = typeof(DynamicPartWhereInputGraphType),
+                        ResolvedType = new DynamicPartWhereInputGraphType(part)
                     };
 
-                    objectGraphType.AddField(field);
+                    inputGraphType.AddField(field);
                     _dynamicPartFields[partName] = field;
                 }
             }
-        }
+            else if (graphType is IObjectGraphType objectGraphType)
+            {
+                var field = new FieldType
+                {
+                    Name = partFieldName,
+                    Description = S["Represents a {0}.", part.PartDefinition.Name],
+                    Type = typeof(DynamicPartGraphType),
+                    ResolvedType = new DynamicPartGraphType(part),
+                    Resolver = new FuncFieldResolver<ContentElement, object>(context =>
+                    {
+                        var nameToResolve = partName;
+                        var typeToResolve = context.FieldDefinition.ResolvedType.GetType().BaseType.GetGenericArguments().First();
 
-        public void Clear()
-        {
-            _dynamicPartFields.Clear();
+                        return context.Source.Get(typeToResolve, nameToResolve);
+                    })
+                };
+
+                objectGraphType.AddField(field);
+                _dynamicPartFields[partName] = field;
+            }
         }
     }
+
+    public void Clear()
+    {
+        _dynamicPartFields.Clear();
+    }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/DynamicPartGraphType.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/DynamicPartGraphType.cs
index cbf0eafc39c..d25276c1b50 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/DynamicPartGraphType.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/DynamicPartGraphType.cs
@@ -4,42 +4,41 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Types
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Types;
+
+public sealed class DynamicPartGraphType : ObjectGraphType<ContentPart>
 {
-    public sealed class DynamicPartGraphType : ObjectGraphType<ContentPart>
+    private ContentTypePartDefinition _part;
+
+    public DynamicPartGraphType(ContentTypePartDefinition part)
     {
-        private ContentTypePartDefinition _part;
+        Name = part.Name;
+        _part = part;
+    }
 
-        public DynamicPartGraphType(ContentTypePartDefinition part)
+    public override void Initialize(ISchema schema)
+    {
+        if (schema is IServiceProvider serviceProvider)
         {
-            Name = part.Name;
-            _part = part;
-        }
+            var contentFieldProviders = serviceProvider.GetServices<IContentFieldProvider>().ToList();
 
-        public override void Initialize(ISchema schema)
-        {
-            if (schema is IServiceProvider serviceProvider)
+            foreach (var field in _part.PartDefinition.Fields)
             {
-                var contentFieldProviders = serviceProvider.GetServices<IContentFieldProvider>().ToList();
-
-                foreach (var field in _part.PartDefinition.Fields)
+                foreach (var fieldProvider in contentFieldProviders)
                 {
-                    foreach (var fieldProvider in contentFieldProviders)
+                    var fieldType = fieldProvider.GetField(schema, field, _part.Name);
+                    if (fieldType != null)
                     {
-                        var fieldType = fieldProvider.GetField(schema, field, _part.Name);
-                        if (fieldType != null)
-                        {
-                            AddField(fieldType);
-                            break;
-                        }
+                        AddField(fieldType);
+                        break;
                     }
                 }
             }
+        }
 
-            // Part is not required here anymore, do not keep it alive.
-            _part = null;
+        // Part is not required here anymore, do not keep it alive.
+        _part = null;
 
-            base.Initialize(schema);
-        }
+        base.Initialize(schema);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/IContentFieldProvider.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/IContentFieldProvider.cs
index b48fdfd7c8b..b08c623a566 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/IContentFieldProvider.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/IContentFieldProvider.cs
@@ -2,22 +2,21 @@
 using GraphQL.Types;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Types
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Types;
+
+public interface IContentFieldProvider
 {
-    public interface IContentFieldProvider
-    {
-        FieldType GetField(ISchema schema, ContentPartFieldDefinition field, string namedPartTechnicalName, string customFieldName = null);
+    FieldType GetField(ISchema schema, ContentPartFieldDefinition field, string namedPartTechnicalName, string customFieldName = null);
 
-        bool HasField(ISchema schema, ContentPartFieldDefinition field);
+    bool HasField(ISchema schema, ContentPartFieldDefinition field);
 
-        FieldTypeIndexDescriptor GetFieldIndex(ContentPartFieldDefinition field);
+    FieldTypeIndexDescriptor GetFieldIndex(ContentPartFieldDefinition field);
 
-        bool HasFieldIndex(ContentPartFieldDefinition field);
-    }
+    bool HasFieldIndex(ContentPartFieldDefinition field);
+}
 
-    public sealed class FieldTypeIndexDescriptor
-    {
-        public required string Index { get; set; }
-        public required Type IndexType { get; set; }
-    }
+public sealed class FieldTypeIndexDescriptor
+{
+    public required string Index { get; set; }
+    public required Type IndexType { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/IContentTypeBuilder.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/IContentTypeBuilder.cs
index 332dd71745f..4964df7604e 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/IContentTypeBuilder.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/IContentTypeBuilder.cs
@@ -1,11 +1,10 @@
 using GraphQL.Types;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Types
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Types;
+
+public interface IContentTypeBuilder
 {
-    public interface IContentTypeBuilder
-    {
-        void Build(ISchema schema, FieldType contentQuery, ContentTypeDefinition contentTypeDefinition, ContentItemType contentItemType);
-        void Clear() { }
-    }
+    void Build(ISchema schema, FieldType contentQuery, ContentTypeDefinition contentTypeDefinition, ContentItemType contentItemType);
+    void Clear() { }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/TypedContentTypeBuilder.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/TypedContentTypeBuilder.cs
index 0db71acc602..02569f1789a 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/TypedContentTypeBuilder.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/TypedContentTypeBuilder.cs
@@ -9,139 +9,138 @@
 using OrchardCore.ContentManagement.GraphQL.Options;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentManagement.GraphQL.Queries.Types
+namespace OrchardCore.ContentManagement.GraphQL.Queries.Types;
+
+public class TypedContentTypeBuilder : IContentTypeBuilder
 {
-    public class TypedContentTypeBuilder : IContentTypeBuilder
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly GraphQLContentOptions _contentOptions;
+
+    public TypedContentTypeBuilder(IHttpContextAccessor httpContextAccessor,
+        IOptions<GraphQLContentOptions> contentOptionsAccessor)
+    {
+        _httpContextAccessor = httpContextAccessor;
+        _contentOptions = contentOptionsAccessor.Value;
+    }
+
+    public void Build(ISchema schema, FieldType contentQuery, ContentTypeDefinition contentTypeDefinition, ContentItemType contentItemType)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly GraphQLContentOptions _contentOptions;
+        var serviceProvider = _httpContextAccessor.HttpContext.RequestServices;
+        var typeActivator = serviceProvider.GetService<ITypeActivatorFactory<ContentPart>>();
 
-        public TypedContentTypeBuilder(IHttpContextAccessor httpContextAccessor,
-            IOptions<GraphQLContentOptions> contentOptionsAccessor)
+        if (_contentOptions.ShouldHide(contentTypeDefinition))
         {
-            _httpContextAccessor = httpContextAccessor;
-            _contentOptions = contentOptionsAccessor.Value;
+            return;
         }
 
-        public void Build(ISchema schema, FieldType contentQuery, ContentTypeDefinition contentTypeDefinition, ContentItemType contentItemType)
+        foreach (var part in contentTypeDefinition.Parts)
         {
-            var serviceProvider = _httpContextAccessor.HttpContext.RequestServices;
-            var typeActivator = serviceProvider.GetService<ITypeActivatorFactory<ContentPart>>();
-
-            if (_contentOptions.ShouldHide(contentTypeDefinition))
+            if (_contentOptions.ShouldSkip(part))
             {
-                return;
+                continue;
             }
 
-            foreach (var part in contentTypeDefinition.Parts)
-            {
-                if (_contentOptions.ShouldSkip(part))
-                {
-                    continue;
-                }
-
-                var partName = part.Name;
-                var partFieldName = partName.ToFieldName();
+            var partName = part.Name;
+            var partFieldName = partName.ToFieldName();
 
-                // Check if another builder has already added a field for this part.
-                if (contentItemType.HasField(partFieldName))
-                {
-                    continue;
-                }
+            // Check if another builder has already added a field for this part.
+            if (contentItemType.HasField(partFieldName))
+            {
+                continue;
+            }
 
-                var queryGraphType = schema.AdditionalTypeInstances
-                    .FirstOrDefault(x => x is IObjectGraphType && x.GetType().BaseType.GetGenericArguments().First().Name == part.PartDefinition.Name) as IObjectGraphType;
+            var queryGraphType = schema.AdditionalTypeInstances
+                .FirstOrDefault(x => x is IObjectGraphType && x.GetType().BaseType.GetGenericArguments().First().Name == part.PartDefinition.Name) as IObjectGraphType;
 
-                var collapsePart = _contentOptions.ShouldCollapse(part);
+            var collapsePart = _contentOptions.ShouldCollapse(part);
 
-                if (queryGraphType != null)
+            if (queryGraphType != null)
+            {
+                if (collapsePart)
                 {
-                    if (collapsePart)
+                    foreach (var field in queryGraphType.Fields)
                     {
-                        foreach (var field in queryGraphType.Fields)
+                        if (_contentOptions.ShouldSkip(queryGraphType.GetType(), field.Name) ||
+                            contentItemType.HasFieldIgnoreCase(field.Name))
                         {
-                            if (_contentOptions.ShouldSkip(queryGraphType.GetType(), field.Name) ||
-                                contentItemType.HasFieldIgnoreCase(field.Name))
-                            {
-                                continue;
-                            }
+                            continue;
+                        }
 
-                            var partType = typeActivator.GetTypeActivator(part.PartDefinition.Name).Type;
-                            var rolledUpField = new FieldType
+                        var partType = typeActivator.GetTypeActivator(part.PartDefinition.Name).Type;
+                        var rolledUpField = new FieldType
+                        {
+                            Name = field.Name,
+                            Type = field.Type,
+                            Description = field.Description,
+                            DeprecationReason = field.DeprecationReason,
+                            Arguments = field.Arguments,
+                            Resolver = new FuncFieldResolver<ContentItem, object>(context =>
                             {
-                                Name = field.Name,
-                                Type = field.Type,
-                                Description = field.Description,
-                                DeprecationReason = field.DeprecationReason,
-                                Arguments = field.Arguments,
-                                Resolver = new FuncFieldResolver<ContentItem, object>(context =>
+                                var nameToResolve = partName;
+                                var resolvedPart = context.Source.Get(partType, nameToResolve);
+
+                                return field.Resolver.ResolveAsync(new ResolveFieldContext
                                 {
-                                    var nameToResolve = partName;
-                                    var resolvedPart = context.Source.Get(partType, nameToResolve);
-
-                                    return field.Resolver.ResolveAsync(new ResolveFieldContext
-                                    {
-                                        Arguments = context.Arguments,
-                                        Source = resolvedPart,
-                                        FieldDefinition = field,
-                                        UserContext = context.UserContext,
-                                        RequestServices = context.RequestServices
-                                    });
-                                })
-                            };
-
-                            contentItemType.AddField(rolledUpField);
-                        }
-                    }
-                    else
-                    {
-                        var field = new FieldType
-                        {
-                            Name = partFieldName,
-                            Type = queryGraphType.GetType(),
-                            Description = queryGraphType.Description,
+                                    Arguments = context.Arguments,
+                                    Source = resolvedPart,
+                                    FieldDefinition = field,
+                                    UserContext = context.UserContext,
+                                    RequestServices = context.RequestServices
+                                });
+                            })
                         };
-                        contentItemType.Field(partFieldName, queryGraphType.GetType())
-                                       .Description(queryGraphType.Description)
-                                       .Resolve(context =>
-                                       {
-                                           var nameToResolve = partName;
-                                           var typeToResolve = context.FieldDefinition.ResolvedType.GetType().BaseType.GetGenericArguments().First();
-
-                                           return context.Source.Get(typeToResolve, nameToResolve);
-                                       });
+
+                        contentItemType.AddField(rolledUpField);
                     }
                 }
+                else
+                {
+                    var field = new FieldType
+                    {
+                        Name = partFieldName,
+                        Type = queryGraphType.GetType(),
+                        Description = queryGraphType.Description,
+                    };
+                    contentItemType.Field(partFieldName, queryGraphType.GetType())
+                                   .Description(queryGraphType.Description)
+                                   .Resolve(context =>
+                                   {
+                                       var nameToResolve = partName;
+                                       var typeToResolve = context.FieldDefinition.ResolvedType.GetType().BaseType.GetGenericArguments().First();
+
+                                       return context.Source.Get(typeToResolve, nameToResolve);
+                                   });
+                }
+            }
 
-                var inputGraphTypeResolved = schema.AdditionalTypeInstances
-                    .FirstOrDefault(x => x is IInputObjectGraphType && x.GetType().BaseType.GetGenericArguments().FirstOrDefault()?.Name == part.PartDefinition.Name) as IInputObjectGraphType;
+            var inputGraphTypeResolved = schema.AdditionalTypeInstances
+                .FirstOrDefault(x => x is IInputObjectGraphType && x.GetType().BaseType.GetGenericArguments().FirstOrDefault()?.Name == part.PartDefinition.Name) as IInputObjectGraphType;
 
-                if (inputGraphTypeResolved != null)
+            if (inputGraphTypeResolved != null)
+            {
+                var whereArgument = contentQuery.Arguments.FirstOrDefault(x => x.Name == "where");
+                if (whereArgument == null)
                 {
-                    var whereArgument = contentQuery.Arguments.FirstOrDefault(x => x.Name == "where");
-                    if (whereArgument == null)
-                    {
-                        return;
-                    }
+                    return;
+                }
 
-                    var whereInput = (ContentItemWhereInput)whereArgument.ResolvedType;
+                var whereInput = (ContentItemWhereInput)whereArgument.ResolvedType;
 
-                    if (collapsePart)
+                if (collapsePart)
+                {
+                    foreach (var field in inputGraphTypeResolved.Fields)
                     {
-                        foreach (var field in inputGraphTypeResolved.Fields)
-                        {
-                            whereInput.AddField(field.WithPartCollapsedMetaData().WithPartNameMetaData(partName));
-                        }
+                        whereInput.AddField(field.WithPartCollapsedMetaData().WithPartNameMetaData(partName));
                     }
-                    else
+                }
+                else
+                {
+                    whereInput.AddField(new FieldType
                     {
-                        whereInput.AddField(new FieldType
-                        {
-                            Type = inputGraphTypeResolved.GetType(),
-                            Name = partFieldName,
-                            Description = inputGraphTypeResolved.Description
-                        }.WithPartNameMetaData(partName));
-                    }
+                        Type = inputGraphTypeResolved.GetType(),
+                        Name = partFieldName,
+                        Description = inputGraphTypeResolved.Description
+                    }.WithPartNameMetaData(partName));
                 }
             }
         }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/ServiceCollectionExtensions.cs
index a5d0cbbdbab..b379d9b4e6a 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/ServiceCollectionExtensions.cs
@@ -8,57 +8,56 @@
 using OrchardCore.Security.Permissions;
 using YesSql.Indexes;
 
-namespace OrchardCore.ContentManagement.GraphQL
+namespace OrchardCore.ContentManagement.GraphQL;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    public static IServiceCollection AddContentGraphQL(this IServiceCollection services)
     {
-        public static IServiceCollection AddContentGraphQL(this IServiceCollection services)
-        {
-            services.AddSingleton<ISchemaBuilder, ContentItemQuery>();
-            services.AddSingleton<ISchemaBuilder, ContentTypeQuery>();
-            services.AddTransient<ContentItemInterface>();
+        services.AddSingleton<ISchemaBuilder, ContentItemQuery>();
+        services.AddSingleton<ISchemaBuilder, ContentTypeQuery>();
+        services.AddTransient<ContentItemInterface>();
 
-            services.AddTransient<ContentItemType>();
+        services.AddTransient<ContentItemType>();
 
-            services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddScoped<IPermissionProvider, Permissions>();
 
-            services.AddTransient<DynamicPartGraphType>();
-            services.AddScoped<IContentTypeBuilder, TypedContentTypeBuilder>();
-            services.AddScoped<IContentTypeBuilder, DynamicContentTypeQueryBuilder>();
+        services.AddTransient<DynamicPartGraphType>();
+        services.AddScoped<IContentTypeBuilder, TypedContentTypeBuilder>();
+        services.AddScoped<IContentTypeBuilder, DynamicContentTypeQueryBuilder>();
 
-            services.AddOptions<GraphQLContentOptions>();
-            services.AddGraphQLFilterType<ContentItem, ContentItemFilters>();
-            services.AddWhereInputIndexPropertyProvider<ContentItemIndex>();
+        services.AddOptions<GraphQLContentOptions>();
+        services.AddGraphQLFilterType<ContentItem, ContentItemFilters>();
+        services.AddWhereInputIndexPropertyProvider<ContentItemIndex>();
 
-            return services;
-        }
+        return services;
+    }
 
-        public static IServiceCollection AddContentFieldsInputGraphQL(this IServiceCollection services)
-        {
-            services.AddScoped<IIndexAliasProvider, DynamicContentFieldsIndexAliasProvider>();
-            services.AddScoped<IContentTypeBuilder, DynamicContentTypeWhereInputBuilder>();
-            services.AddScoped<IContentDefinitionEventHandler, DynamicContentFieldsIndexAliasProvider>();
+    public static IServiceCollection AddContentFieldsInputGraphQL(this IServiceCollection services)
+    {
+        services.AddScoped<IIndexAliasProvider, DynamicContentFieldsIndexAliasProvider>();
+        services.AddScoped<IContentTypeBuilder, DynamicContentTypeWhereInputBuilder>();
+        services.AddScoped<IContentDefinitionEventHandler, DynamicContentFieldsIndexAliasProvider>();
 
-            return services;
-        }
+        return services;
+    }
 
-        public static void AddWhereInputIndexPropertyProvider<TIndexType>(this IServiceCollection services)
-            where TIndexType : MapIndex
-        {
-            services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<TIndexType>>();
-        }
+    public static void AddWhereInputIndexPropertyProvider<TIndexType>(this IServiceCollection services)
+        where TIndexType : MapIndex
+    {
+        services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<TIndexType>>();
+    }
 
-        /// <summary>
-        /// Registers a type providing custom filters for content item filters.
-        /// </summary>
-        /// <typeparam name="TObjectTypeToFilter"></typeparam>
-        /// <typeparam name="TFilterType"></typeparam>
-        /// <param name="services"></param>
-        public static void AddGraphQLFilterType<TObjectTypeToFilter, TFilterType>(this IServiceCollection services)
-            where TObjectTypeToFilter : class
-            where TFilterType : GraphQLFilter<TObjectTypeToFilter>
-        {
-            services.AddTransient<IGraphQLFilter<TObjectTypeToFilter>, TFilterType>();
-        }
+    /// <summary>
+    /// Registers a type providing custom filters for content item filters.
+    /// </summary>
+    /// <typeparam name="TObjectTypeToFilter"></typeparam>
+    /// <typeparam name="TFilterType"></typeparam>
+    /// <param name="services"></param>
+    public static void AddGraphQLFilterType<TObjectTypeToFilter, TFilterType>(this IServiceCollection services)
+        where TObjectTypeToFilter : class
+        where TFilterType : GraphQLFilter<TObjectTypeToFilter>
+    {
+        services.AddTransient<IGraphQLFilter<TObjectTypeToFilter>, TFilterType>();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Settings/GraphQLContentTypePartSettings.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Settings/GraphQLContentTypePartSettings.cs
index f27034452ee..4e71562853e 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Settings/GraphQLContentTypePartSettings.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Settings/GraphQLContentTypePartSettings.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.ContentManagement.GraphQL.Settings
+namespace OrchardCore.ContentManagement.GraphQL.Settings;
+
+public class GraphQLContentTypePartSettings
 {
-    public class GraphQLContentTypePartSettings
-    {
-        public bool Collapse { get; set; }
+    public bool Collapse { get; set; }
 
-        public bool Hidden { get; set; }
+    public bool Hidden { get; set; }
 
-        public bool PreventFieldNameCollision { get; set; }
-    }
+    public bool PreventFieldNameCollision { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/Cache/ContentDefinitionCacheContextProvider.cs b/src/OrchardCore/OrchardCore.ContentManagement/Cache/ContentDefinitionCacheContextProvider.cs
index eccbaf6a66f..bb4767cd601 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/Cache/ContentDefinitionCacheContextProvider.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/Cache/ContentDefinitionCacheContextProvider.cs
@@ -5,26 +5,25 @@
 using OrchardCore.ContentManagement.Metadata;
 using OrchardCore.Environment.Cache;
 
-namespace OrchardCore.ContentManagement.Cache
+namespace OrchardCore.ContentManagement.Cache;
+
+public class ContentDefinitionCacheContextProvider : ICacheContextProvider
 {
-    public class ContentDefinitionCacheContextProvider : ICacheContextProvider
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        public ContentDefinitionCacheContextProvider(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public ContentDefinitionCacheContextProvider(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public async Task PopulateContextEntriesAsync(IEnumerable<string> contexts, List<CacheContextEntry> entries)
+    public async Task PopulateContextEntriesAsync(IEnumerable<string> contexts, List<CacheContextEntry> entries)
+    {
+        if (contexts.Any(ctx => string.Equals(ctx, "types", StringComparison.OrdinalIgnoreCase)))
         {
-            if (contexts.Any(ctx => string.Equals(ctx, "types", StringComparison.OrdinalIgnoreCase)))
-            {
-                var identifier = await _contentDefinitionManager.GetIdentifierAsync();
-                entries.Add(new CacheContextEntry("types", identifier));
+            var identifier = await _contentDefinitionManager.GetIdentifierAsync();
+            entries.Add(new CacheContextEntry("types", identifier));
 
-                return;
-            }
+            return;
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/CompiledQueries/PublishedContentItemById.cs b/src/OrchardCore/OrchardCore.ContentManagement/CompiledQueries/PublishedContentItemById.cs
index 5dbbb4bc717..de7048d13a2 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/CompiledQueries/PublishedContentItemById.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/CompiledQueries/PublishedContentItemById.cs
@@ -3,22 +3,21 @@
 using OrchardCore.ContentManagement.Records;
 using YesSql;
 
-namespace OrchardCore.ContentManagement.CompiledQueries
+namespace OrchardCore.ContentManagement.CompiledQueries;
+
+public class PublishedContentItemById : ICompiledQuery<ContentItem>
 {
-    public class PublishedContentItemById : ICompiledQuery<ContentItem>
+    public PublishedContentItemById(string contentItemId)
     {
-        public PublishedContentItemById(string contentItemId)
-        {
-            ContentItemId = contentItemId;
-        }
+        ContentItemId = contentItemId;
+    }
 
-        public string ContentItemId { get; set; }
+    public string ContentItemId { get; set; }
 
-        public Expression<Func<IQuery<ContentItem>, IQuery<ContentItem>>> Query()
-        {
-            return query => query
-                .With<ContentItemIndex>()
-                .Where(x => x.ContentItemId == ContentItemId && x.Published == true);
-        }
+    public Expression<Func<IQuery<ContentItem>, IQuery<ContentItem>>> Query()
+    {
+        return query => query
+            .With<ContentItemIndex>()
+            .Where(x => x.ContentItemId == ContentItemId && x.Published == true);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/ContentDefinitionManager.cs b/src/OrchardCore/OrchardCore.ContentManagement/ContentDefinitionManager.cs
index 96b5ded5d7c..3f9bd86110a 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/ContentDefinitionManager.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/ContentDefinitionManager.cs
@@ -10,395 +10,394 @@
 using OrchardCore.Data.Documents;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public class ContentDefinitionManager : IContentDefinitionManager
 {
-    public class ContentDefinitionManager : IContentDefinitionManager
+    private const string CacheKey = nameof(ContentDefinitionManager);
+
+    private readonly IContentDefinitionStore _contentDefinitionStore;
+    private readonly IMemoryCache _memoryCache;
+
+    private readonly ConcurrentDictionary<string, ContentTypeDefinition> _cachedTypeDefinitions;
+    private readonly ConcurrentDictionary<string, ContentPartDefinition> _cachedPartDefinitions;
+
+    private readonly Dictionary<string, ContentTypeDefinition> _scopedTypeDefinitions = new(StringComparer.OrdinalIgnoreCase);
+    private readonly Dictionary<string, ContentPartDefinition> _scopedPartDefinitions = new(StringComparer.OrdinalIgnoreCase);
+
+    public ContentDefinitionManager(
+        IContentDefinitionStore contentDefinitionStore,
+        IMemoryCache memoryCache)
     {
-        private const string CacheKey = nameof(ContentDefinitionManager);
+        _contentDefinitionStore = contentDefinitionStore;
+        _memoryCache = memoryCache;
 
-        private readonly IContentDefinitionStore _contentDefinitionStore;
-        private readonly IMemoryCache _memoryCache;
+        _cachedTypeDefinitions = _memoryCache.GetOrCreate("TypeDefinitions", entry => new ConcurrentDictionary<string, ContentTypeDefinition>(StringComparer.OrdinalIgnoreCase));
+        _cachedPartDefinitions = _memoryCache.GetOrCreate("PartDefinitions", entry => new ConcurrentDictionary<string, ContentPartDefinition>(StringComparer.OrdinalIgnoreCase));
+    }
 
-        private readonly ConcurrentDictionary<string, ContentTypeDefinition> _cachedTypeDefinitions;
-        private readonly ConcurrentDictionary<string, ContentPartDefinition> _cachedPartDefinitions;
+    public async Task<IEnumerable<ContentTypeDefinition>> LoadTypeDefinitionsAsync()
+    {
+        var document = await _contentDefinitionStore.LoadContentDefinitionAsync();
 
-        private readonly Dictionary<string, ContentTypeDefinition> _scopedTypeDefinitions = new(StringComparer.OrdinalIgnoreCase);
-        private readonly Dictionary<string, ContentPartDefinition> _scopedPartDefinitions = new(StringComparer.OrdinalIgnoreCase);
+        return document.ContentTypeDefinitionRecords.Select(type => LoadTypeDefinition(document, type.Name)).ToList();
+    }
 
-        public ContentDefinitionManager(
-            IContentDefinitionStore contentDefinitionStore,
-            IMemoryCache memoryCache)
-        {
-            _contentDefinitionStore = contentDefinitionStore;
-            _memoryCache = memoryCache;
+    public async Task<IEnumerable<ContentTypeDefinition>> ListTypeDefinitionsAsync()
+    {
+        var document = await _contentDefinitionStore.GetContentDefinitionAsync();
 
-            _cachedTypeDefinitions = _memoryCache.GetOrCreate("TypeDefinitions", entry => new ConcurrentDictionary<string, ContentTypeDefinition>(StringComparer.OrdinalIgnoreCase));
-            _cachedPartDefinitions = _memoryCache.GetOrCreate("PartDefinitions", entry => new ConcurrentDictionary<string, ContentPartDefinition>(StringComparer.OrdinalIgnoreCase));
-        }
+        CheckDocumentIdentifier(document);
 
-        public async Task<IEnumerable<ContentTypeDefinition>> LoadTypeDefinitionsAsync()
-        {
-            var document = await _contentDefinitionStore.LoadContentDefinitionAsync();
+        return document.ContentTypeDefinitionRecords.Select(type => GetTypeDefinition(document, type.Name)).ToList();
+    }
 
-            return document.ContentTypeDefinitionRecords.Select(type => LoadTypeDefinition(document, type.Name)).ToList();
-        }
+    public async Task<IEnumerable<ContentPartDefinition>> LoadPartDefinitionsAsync()
+    {
+        var document = await _contentDefinitionStore.LoadContentDefinitionAsync();
 
-        public async Task<IEnumerable<ContentTypeDefinition>> ListTypeDefinitionsAsync()
-        {
-            var document = await _contentDefinitionStore.GetContentDefinitionAsync();
+        return document.ContentPartDefinitionRecords.Select(part => LoadPartDefinition(document, part.Name)).ToList();
+    }
 
-            CheckDocumentIdentifier(document);
+    public async Task<IEnumerable<ContentPartDefinition>> ListPartDefinitionsAsync()
+    {
+        var document = await _contentDefinitionStore.GetContentDefinitionAsync();
 
-            return document.ContentTypeDefinitionRecords.Select(type => GetTypeDefinition(document, type.Name)).ToList();
-        }
+        CheckDocumentIdentifier(document);
 
-        public async Task<IEnumerable<ContentPartDefinition>> LoadPartDefinitionsAsync()
-        {
-            var document = await _contentDefinitionStore.LoadContentDefinitionAsync();
+        return document.ContentPartDefinitionRecords.Select(part => GetPartDefinition(document, part.Name)).ToList();
+    }
 
-            return document.ContentPartDefinitionRecords.Select(part => LoadPartDefinition(document, part.Name)).ToList();
-        }
+    public async Task<ContentTypeDefinition> LoadTypeDefinitionAsync(string name)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(name);
 
-        public async Task<IEnumerable<ContentPartDefinition>> ListPartDefinitionsAsync()
+        if (_scopedTypeDefinitions.TryGetValue(name, out var typeDefinition))
         {
-            var document = await _contentDefinitionStore.GetContentDefinitionAsync();
+            return typeDefinition;
+        }
 
-            CheckDocumentIdentifier(document);
+        var document = await _contentDefinitionStore.LoadContentDefinitionAsync();
 
-            return document.ContentPartDefinitionRecords.Select(part => GetPartDefinition(document, part.Name)).ToList();
-        }
+        return LoadTypeDefinition(document, name);
+    }
 
-        public async Task<ContentTypeDefinition> LoadTypeDefinitionAsync(string name)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(name);
+    public async Task<ContentTypeDefinition> GetTypeDefinitionAsync(string name)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(name);
 
-            if (_scopedTypeDefinitions.TryGetValue(name, out var typeDefinition))
-            {
-                return typeDefinition;
-            }
+        var document = await _contentDefinitionStore.GetContentDefinitionAsync();
 
-            var document = await _contentDefinitionStore.LoadContentDefinitionAsync();
+        CheckDocumentIdentifier(document);
 
-            return LoadTypeDefinition(document, name);
-        }
+        return GetTypeDefinition(document, name);
+    }
+
+    public async Task<ContentPartDefinition> LoadPartDefinitionAsync(string name)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(name);
 
-        public async Task<ContentTypeDefinition> GetTypeDefinitionAsync(string name)
+        if (_scopedPartDefinitions.TryGetValue(name, out var partDefinition))
         {
-            ArgumentException.ThrowIfNullOrEmpty(name);
+            return partDefinition;
+        }
 
-            var document = await _contentDefinitionStore.GetContentDefinitionAsync();
+        var document = await _contentDefinitionStore.LoadContentDefinitionAsync();
 
-            CheckDocumentIdentifier(document);
+        return LoadPartDefinition(document, name);
+    }
 
-            return GetTypeDefinition(document, name);
-        }
+    public async Task<ContentPartDefinition> GetPartDefinitionAsync(string name)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(name);
 
-        public async Task<ContentPartDefinition> LoadPartDefinitionAsync(string name)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(name);
+        var document = await _contentDefinitionStore.GetContentDefinitionAsync();
 
-            if (_scopedPartDefinitions.TryGetValue(name, out var partDefinition))
-            {
-                return partDefinition;
-            }
+        CheckDocumentIdentifier(document);
 
-            var document = await _contentDefinitionStore.LoadContentDefinitionAsync();
+        return GetPartDefinition(document, name);
+    }
 
-            return LoadPartDefinition(document, name);
-        }
+    public async Task DeleteTypeDefinitionAsync(string name)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(name);
+
+        var document = await _contentDefinitionStore.LoadContentDefinitionAsync();
 
-        public async Task<ContentPartDefinition> GetPartDefinitionAsync(string name)
+        var record = document.ContentTypeDefinitionRecords.FirstOrDefault(record => record.Name.EqualsOrdinalIgnoreCase(name));
+
+        // Deletes the content type record associated.
+        if (record is not null)
         {
-            ArgumentException.ThrowIfNullOrEmpty(name);
+            document.ContentTypeDefinitionRecords.Remove(record);
+            await UpdateContentDefinitionRecordAsync(document);
+        }
+    }
 
-            var document = await _contentDefinitionStore.GetContentDefinitionAsync();
+    public async Task DeletePartDefinitionAsync(string name)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(name);
+
+        var document = await _contentDefinitionStore.LoadContentDefinitionAsync();
 
-            CheckDocumentIdentifier(document);
+        // Remove parts from current types.
+        var typeDefinitions = document.ContentTypeDefinitionRecords
+            .Select(type => LoadTypeDefinition(document, type.Name)).ToList();
 
-            return GetPartDefinition(document, name);
+        var typesWithPart = typeDefinitions
+            .Where(typeDefinition => typeDefinition.Parts
+                .Any(part => part.PartDefinition.Name.EqualsOrdinalIgnoreCase(name)));
+
+        foreach (var typeDefinition in typesWithPart)
+        {
+            await this.AlterTypeDefinitionAsync(typeDefinition.Name, builder => Task.FromResult(builder.RemovePart(name)));
         }
 
-        public async Task DeleteTypeDefinitionAsync(string name)
+        // Delete part.
+        var record = document.ContentPartDefinitionRecords.FirstOrDefault(part => part.Name.EqualsOrdinalIgnoreCase(name));
+        if (record is not null)
         {
-            ArgumentException.ThrowIfNullOrEmpty(name);
+            document.ContentPartDefinitionRecords.Remove(record);
+            await UpdateContentDefinitionRecordAsync(document);
+        }
+    }
 
-            var document = await _contentDefinitionStore.LoadContentDefinitionAsync();
+    public async Task StoreTypeDefinitionAsync(ContentTypeDefinition contentTypeDefinition)
+    {
+        var document = await _contentDefinitionStore.LoadContentDefinitionAsync();
 
-            var record = document.ContentTypeDefinitionRecords.FirstOrDefault(record => record.Name.EqualsOrdinalIgnoreCase(name));
+        Apply(contentTypeDefinition, Acquire(document, contentTypeDefinition));
 
-            // Deletes the content type record associated.
-            if (record is not null)
-            {
-                document.ContentTypeDefinitionRecords.Remove(record);
-                await UpdateContentDefinitionRecordAsync(document);
-            }
-        }
+        await UpdateContentDefinitionRecordAsync(document);
+    }
 
-        public async Task DeletePartDefinitionAsync(string name)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(name);
+    public async Task StorePartDefinitionAsync(ContentPartDefinition contentPartDefinition)
+    {
+        var document = await _contentDefinitionStore.LoadContentDefinitionAsync();
 
-            var document = await _contentDefinitionStore.LoadContentDefinitionAsync();
+        Apply(contentPartDefinition, Acquire(document, contentPartDefinition));
 
-            // Remove parts from current types.
-            var typeDefinitions = document.ContentTypeDefinitionRecords
-                .Select(type => LoadTypeDefinition(document, type.Name)).ToList();
+        await UpdateContentDefinitionRecordAsync(document);
+    }
 
-            var typesWithPart = typeDefinitions
-                .Where(typeDefinition => typeDefinition.Parts
-                    .Any(part => part.PartDefinition.Name.EqualsOrdinalIgnoreCase(name)));
+    public async Task<string> GetIdentifierAsync() => (await _contentDefinitionStore.GetContentDefinitionAsync()).Identifier;
+
+    private ContentTypeDefinition LoadTypeDefinition(ContentDefinitionRecord document, string name) =>
+        !_scopedTypeDefinitions.TryGetValue(name, out var typeDefinition)
+        ? _scopedTypeDefinitions[name] = Build(
+            document.ContentTypeDefinitionRecords.FirstOrDefault(type => type.Name.EqualsOrdinalIgnoreCase(name)),
+            document.ContentPartDefinitionRecords)
+        : typeDefinition;
+
+    private ContentTypeDefinition GetTypeDefinition(ContentDefinitionRecord document, string name) =>
+        _cachedTypeDefinitions.GetOrAdd(name, name => Build(
+            document.ContentTypeDefinitionRecords.FirstOrDefault(type => type.Name.EqualsOrdinalIgnoreCase(name)),
+            document.ContentPartDefinitionRecords));
+
+    private ContentPartDefinition LoadPartDefinition(ContentDefinitionRecord document, string name) =>
+        !_scopedPartDefinitions.TryGetValue(name, out var partDefinition)
+        ? _scopedPartDefinitions[name] = Build(
+            document.ContentPartDefinitionRecords.FirstOrDefault(part => part.Name.EqualsOrdinalIgnoreCase(name)))
+        : partDefinition;
+
+    private ContentPartDefinition GetPartDefinition(ContentDefinitionRecord document, string name) =>
+        _cachedPartDefinitions.GetOrAdd(name, name => Build(
+            document.ContentPartDefinitionRecords.FirstOrDefault(record => record.Name.EqualsOrdinalIgnoreCase(name))));
+
+    private static ContentTypeDefinitionRecord Acquire(
+        ContentDefinitionRecord document,
+        ContentTypeDefinition contentTypeDefinition)
+    {
+        var result = document.ContentTypeDefinitionRecords
+            .FirstOrDefault(type => type.Name.EqualsOrdinalIgnoreCase(contentTypeDefinition.Name));
 
-            foreach (var typeDefinition in typesWithPart)
+        if (result is null)
+        {
+            result = new ContentTypeDefinitionRecord
             {
-                await this.AlterTypeDefinitionAsync(typeDefinition.Name, builder => Task.FromResult(builder.RemovePart(name)));
-            }
+                Name = contentTypeDefinition.Name,
+                DisplayName = contentTypeDefinition.DisplayName,
+            };
 
-            // Delete part.
-            var record = document.ContentPartDefinitionRecords.FirstOrDefault(part => part.Name.EqualsOrdinalIgnoreCase(name));
-            if (record is not null)
-            {
-                document.ContentPartDefinitionRecords.Remove(record);
-                await UpdateContentDefinitionRecordAsync(document);
-            }
+            document.ContentTypeDefinitionRecords.Add(result);
         }
 
-        public async Task StoreTypeDefinitionAsync(ContentTypeDefinition contentTypeDefinition)
-        {
-            var document = await _contentDefinitionStore.LoadContentDefinitionAsync();
-
-            Apply(contentTypeDefinition, Acquire(document, contentTypeDefinition));
+        return result;
+    }
 
-            await UpdateContentDefinitionRecordAsync(document);
-        }
+    private static ContentPartDefinitionRecord Acquire(
+        ContentDefinitionRecord document,
+        ContentPartDefinition contentPartDefinition)
+    {
+        var result = document.ContentPartDefinitionRecords
+            .FirstOrDefault(part => part.Name.EqualsOrdinalIgnoreCase(contentPartDefinition.Name));
 
-        public async Task StorePartDefinitionAsync(ContentPartDefinition contentPartDefinition)
+        if (result is null)
         {
-            var document = await _contentDefinitionStore.LoadContentDefinitionAsync();
-
-            Apply(contentPartDefinition, Acquire(document, contentPartDefinition));
+            result = new ContentPartDefinitionRecord
+            {
+                Name = contentPartDefinition.Name,
+            };
 
-            await UpdateContentDefinitionRecordAsync(document);
+            document.ContentPartDefinitionRecords.Add(result);
         }
 
-        public async Task<string> GetIdentifierAsync() => (await _contentDefinitionStore.GetContentDefinitionAsync()).Identifier;
-
-        private ContentTypeDefinition LoadTypeDefinition(ContentDefinitionRecord document, string name) =>
-            !_scopedTypeDefinitions.TryGetValue(name, out var typeDefinition)
-            ? _scopedTypeDefinitions[name] = Build(
-                document.ContentTypeDefinitionRecords.FirstOrDefault(type => type.Name.EqualsOrdinalIgnoreCase(name)),
-                document.ContentPartDefinitionRecords)
-            : typeDefinition;
-
-        private ContentTypeDefinition GetTypeDefinition(ContentDefinitionRecord document, string name) =>
-            _cachedTypeDefinitions.GetOrAdd(name, name => Build(
-                document.ContentTypeDefinitionRecords.FirstOrDefault(type => type.Name.EqualsOrdinalIgnoreCase(name)),
-                document.ContentPartDefinitionRecords));
-
-        private ContentPartDefinition LoadPartDefinition(ContentDefinitionRecord document, string name) =>
-            !_scopedPartDefinitions.TryGetValue(name, out var partDefinition)
-            ? _scopedPartDefinitions[name] = Build(
-                document.ContentPartDefinitionRecords.FirstOrDefault(part => part.Name.EqualsOrdinalIgnoreCase(name)))
-            : partDefinition;
-
-        private ContentPartDefinition GetPartDefinition(ContentDefinitionRecord document, string name) =>
-            _cachedPartDefinitions.GetOrAdd(name, name => Build(
-                document.ContentPartDefinitionRecords.FirstOrDefault(record => record.Name.EqualsOrdinalIgnoreCase(name))));
-
-        private static ContentTypeDefinitionRecord Acquire(
-            ContentDefinitionRecord document,
-            ContentTypeDefinition contentTypeDefinition)
-        {
-            var result = document.ContentTypeDefinitionRecords
-                .FirstOrDefault(type => type.Name.EqualsOrdinalIgnoreCase(contentTypeDefinition.Name));
+        return result;
+    }
 
-            if (result is null)
-            {
-                result = new ContentTypeDefinitionRecord
-                {
-                    Name = contentTypeDefinition.Name,
-                    DisplayName = contentTypeDefinition.DisplayName,
-                };
+    private static void Apply(ContentTypeDefinition model, ContentTypeDefinitionRecord record)
+    {
+        record.DisplayName = model.DisplayName;
+        record.Settings = model.Settings;
 
-                document.ContentTypeDefinitionRecords.Add(result);
-            }
+        var toRemove = record.ContentTypePartDefinitionRecords
+            .Where(typePartDefinitionRecord => !model.Parts
+                .Any(typePart => typePart.Name.EqualsOrdinalIgnoreCase(typePartDefinitionRecord.Name)))
+            .ToList();
 
-            return result;
+        foreach (var remove in toRemove)
+        {
+            record.ContentTypePartDefinitionRecords.Remove(remove);
         }
 
-        private static ContentPartDefinitionRecord Acquire(
-            ContentDefinitionRecord document,
-            ContentPartDefinition contentPartDefinition)
+        foreach (var part in model.Parts)
         {
-            var result = document.ContentPartDefinitionRecords
-                .FirstOrDefault(part => part.Name.EqualsOrdinalIgnoreCase(contentPartDefinition.Name));
+            var typePartRecord = record.ContentTypePartDefinitionRecords
+                .FirstOrDefault(typePart => typePart.Name.EqualsOrdinalIgnoreCase(part.Name));
 
-            if (result is null)
+            if (typePartRecord is null)
             {
-                result = new ContentPartDefinitionRecord
+                typePartRecord = new ContentTypePartDefinitionRecord
                 {
-                    Name = contentPartDefinition.Name,
+                    PartName = part.PartDefinition.Name,
+                    Name = part.Name,
+                    Settings = part.Settings,
                 };
 
-                document.ContentPartDefinitionRecords.Add(result);
+                record.ContentTypePartDefinitionRecords.Add(typePartRecord);
             }
 
-            return result;
+            Apply(part, typePartRecord);
         }
+    }
 
-        private static void Apply(ContentTypeDefinition model, ContentTypeDefinitionRecord record)
-        {
-            record.DisplayName = model.DisplayName;
-            record.Settings = model.Settings;
-
-            var toRemove = record.ContentTypePartDefinitionRecords
-                .Where(typePartDefinitionRecord => !model.Parts
-                    .Any(typePart => typePart.Name.EqualsOrdinalIgnoreCase(typePartDefinitionRecord.Name)))
-                .ToList();
+    private static void Apply(ContentTypePartDefinition model, ContentTypePartDefinitionRecord record)
+        => record.Settings = model.Settings;
 
-            foreach (var remove in toRemove)
-            {
-                record.ContentTypePartDefinitionRecords.Remove(remove);
-            }
-
-            foreach (var part in model.Parts)
-            {
-                var typePartRecord = record.ContentTypePartDefinitionRecords
-                    .FirstOrDefault(typePart => typePart.Name.EqualsOrdinalIgnoreCase(part.Name));
+    private static void Apply(ContentPartDefinition model, ContentPartDefinitionRecord record)
+    {
+        record.Settings = model.Settings;
 
-                if (typePartRecord is null)
-                {
-                    typePartRecord = new ContentTypePartDefinitionRecord
-                    {
-                        PartName = part.PartDefinition.Name,
-                        Name = part.Name,
-                        Settings = part.Settings,
-                    };
-
-                    record.ContentTypePartDefinitionRecords.Add(typePartRecord);
-                }
+        var toRemove = record.ContentPartFieldDefinitionRecords
+            .Where(partFieldDefinitionRecord => !model.Fields
+                .Any(partField => partField.Name.EqualsOrdinalIgnoreCase(partFieldDefinitionRecord.Name)))
+            .ToList();
 
-                Apply(part, typePartRecord);
-            }
+        foreach (var remove in toRemove)
+        {
+            record.ContentPartFieldDefinitionRecords.Remove(remove);
         }
 
-        private static void Apply(ContentTypePartDefinition model, ContentTypePartDefinitionRecord record)
-            => record.Settings = model.Settings;
-
-        private static void Apply(ContentPartDefinition model, ContentPartDefinitionRecord record)
+        foreach (var field in model.Fields)
         {
-            record.Settings = model.Settings;
-
-            var toRemove = record.ContentPartFieldDefinitionRecords
-                .Where(partFieldDefinitionRecord => !model.Fields
-                    .Any(partField => partField.Name.EqualsOrdinalIgnoreCase(partFieldDefinitionRecord.Name)))
-                .ToList();
+            var partFieldRecord = record.ContentPartFieldDefinitionRecords
+                .FirstOrDefault(partField => partField.Name.EqualsOrdinalIgnoreCase(field.Name));
 
-            foreach (var remove in toRemove)
+            if (partFieldRecord is null)
             {
-                record.ContentPartFieldDefinitionRecords.Remove(remove);
-            }
-
-            foreach (var field in model.Fields)
-            {
-                var partFieldRecord = record.ContentPartFieldDefinitionRecords
-                    .FirstOrDefault(partField => partField.Name.EqualsOrdinalIgnoreCase(field.Name));
-
-                if (partFieldRecord is null)
+                if (field.FieldDefinition is null)
                 {
-                    if (field.FieldDefinition is null)
-                    {
-                        throw new InvalidOperationException(
-                            $"The '{field.Name}' field in '{model.Name}' part was defined without a specified type." +
-                            " Please review the migration and explicitly specify the field type.");
-                    }
-
-                    partFieldRecord = new ContentPartFieldDefinitionRecord
-                    {
-                        FieldName = field.FieldDefinition.Name,
-                        Name = field.Name,
-                    };
-
-                    record.ContentPartFieldDefinitionRecords.Add(partFieldRecord);
+                    throw new InvalidOperationException(
+                        $"The '{field.Name}' field in '{model.Name}' part was defined without a specified type." +
+                        " Please review the migration and explicitly specify the field type.");
                 }
 
-                Apply(field, partFieldRecord);
+                partFieldRecord = new ContentPartFieldDefinitionRecord
+                {
+                    FieldName = field.FieldDefinition.Name,
+                    Name = field.Name,
+                };
+
+                record.ContentPartFieldDefinitionRecords.Add(partFieldRecord);
             }
+
+            Apply(field, partFieldRecord);
         }
+    }
 
-        private static void Apply(ContentPartFieldDefinition model, ContentPartFieldDefinitionRecord record)
-            => record.Settings = model.Settings;
-
-        private static ContentTypeDefinition Build(
-            ContentTypeDefinitionRecord source,
-            IList<ContentPartDefinitionRecord> partDefinitionRecords) =>
-            source is not null
-            ? new ContentTypeDefinition(
-                source.Name,
-                source.DisplayName,
-                source.ContentTypePartDefinitionRecords.Select(typePart => Build(
-                    typePart,
-                    partDefinitionRecords.FirstOrDefault(part => part.Name.EqualsOrdinalIgnoreCase(typePart.PartName)))),
-                source.Settings)
-            : null;
-
-        private static ContentTypePartDefinition Build(
-            ContentTypePartDefinitionRecord source,
-            ContentPartDefinitionRecord partDefinitionRecord) =>
-            source is not null
-            ? new ContentTypePartDefinition(
-                source.Name,
-                Build(partDefinitionRecord) ?? new ContentPartDefinition(source.PartName, [], []),
-                source.Settings)
-            : null;
-
-        private static ContentPartDefinition Build(ContentPartDefinitionRecord source) =>
-            source is not null
-            ? new ContentPartDefinition(
-                source.Name,
-                source.ContentPartFieldDefinitionRecords.Select(Build),
-                source.Settings)
-            : null;
-
-        private static ContentPartFieldDefinition Build(ContentPartFieldDefinitionRecord source) =>
-            source is not null
-            ? new ContentPartFieldDefinition(
-                Build(new ContentFieldDefinitionRecord
-                {
-                    Name = source.FieldName,
-                }),
-                source.Name,
-                source.Settings)
-            : null;
+    private static void Apply(ContentPartFieldDefinition model, ContentPartFieldDefinitionRecord record)
+        => record.Settings = model.Settings;
+
+    private static ContentTypeDefinition Build(
+        ContentTypeDefinitionRecord source,
+        IList<ContentPartDefinitionRecord> partDefinitionRecords) =>
+        source is not null
+        ? new ContentTypeDefinition(
+            source.Name,
+            source.DisplayName,
+            source.ContentTypePartDefinitionRecords.Select(typePart => Build(
+                typePart,
+                partDefinitionRecords.FirstOrDefault(part => part.Name.EqualsOrdinalIgnoreCase(typePart.PartName)))),
+            source.Settings)
+        : null;
+
+    private static ContentTypePartDefinition Build(
+        ContentTypePartDefinitionRecord source,
+        ContentPartDefinitionRecord partDefinitionRecord) =>
+        source is not null
+        ? new ContentTypePartDefinition(
+            source.Name,
+            Build(partDefinitionRecord) ?? new ContentPartDefinition(source.PartName, [], []),
+            source.Settings)
+        : null;
+
+    private static ContentPartDefinition Build(ContentPartDefinitionRecord source) =>
+        source is not null
+        ? new ContentPartDefinition(
+            source.Name,
+            source.ContentPartFieldDefinitionRecords.Select(Build),
+            source.Settings)
+        : null;
+
+    private static ContentPartFieldDefinition Build(ContentPartFieldDefinitionRecord source) =>
+        source is not null
+        ? new ContentPartFieldDefinition(
+            Build(new ContentFieldDefinitionRecord
+            {
+                Name = source.FieldName,
+            }),
+            source.Name,
+            source.Settings)
+        : null;
 
-        private static ContentFieldDefinition Build(ContentFieldDefinitionRecord source)
-            => source is null ? null : new ContentFieldDefinition(source.Name);
+    private static ContentFieldDefinition Build(ContentFieldDefinitionRecord source)
+        => source is null ? null : new ContentFieldDefinition(source.Name);
 
-        private async Task UpdateContentDefinitionRecordAsync(ContentDefinitionRecord document)
-        {
-            await _contentDefinitionStore.SaveContentDefinitionAsync(document);
+    private async Task UpdateContentDefinitionRecordAsync(ContentDefinitionRecord document)
+    {
+        await _contentDefinitionStore.SaveContentDefinitionAsync(document);
 
-            // If multiple updates in the same scope, types and parts may need to be rebuilt.
-            _scopedTypeDefinitions.Clear();
-            _scopedPartDefinitions.Clear();
-        }
+        // If multiple updates in the same scope, types and parts may need to be rebuilt.
+        _scopedTypeDefinitions.Clear();
+        _scopedPartDefinitions.Clear();
+    }
 
-        /// <summary>
-        /// Checks the document identifier and then clears the cached built definitions if it has changed.
-        /// </summary>
-        private void CheckDocumentIdentifier(ContentDefinitionRecord document)
+    /// <summary>
+    /// Checks the document identifier and then clears the cached built definitions if it has changed.
+    /// </summary>
+    private void CheckDocumentIdentifier(ContentDefinitionRecord document)
+    {
+        if (!_memoryCache.TryGetValue<Document>(CacheKey, out var cacheEntry) || cacheEntry.Identifier != document.Identifier)
         {
-            if (!_memoryCache.TryGetValue<Document>(CacheKey, out var cacheEntry) || cacheEntry.Identifier != document.Identifier)
+            cacheEntry = new Document()
             {
-                cacheEntry = new Document()
-                {
-                    Identifier = document.Identifier,
-                };
+                Identifier = document.Identifier,
+            };
 
-                _cachedTypeDefinitions.Clear();
-                _cachedPartDefinitions.Clear();
+            _cachedTypeDefinitions.Clear();
+            _cachedPartDefinitions.Clear();
 
-                _memoryCache.Set(CacheKey, cacheEntry);
-            }
+            _memoryCache.Set(CacheKey, cacheEntry);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/ContentFieldFactory.cs b/src/OrchardCore/OrchardCore.ContentManagement/ContentFieldFactory.cs
index f38bf27dd54..0a3df80b322 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/ContentFieldFactory.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/ContentFieldFactory.cs
@@ -2,40 +2,39 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+/// <summary>
+/// Implements <see cref="ITypeActivatorFactory{ContentField}"/> by resolving all registered <see cref="ContentField"/> types
+/// and memoizing a statically typed <see cref="ITypeActivator{ContentField}"/>.
+/// </summary>
+public class ContentFieldFactory : ITypeActivatorFactory<ContentField>
 {
-    /// <summary>
-    /// Implements <see cref="ITypeActivatorFactory{ContentField}"/> by resolving all registered <see cref="ContentField"/> types
-    /// and memoizing a statically typed <see cref="ITypeActivator{ContentField}"/>.
-    /// </summary>
-    public class ContentFieldFactory : ITypeActivatorFactory<ContentField>
-    {
-        private readonly ITypeActivator<ContentField> _contentFieldActivator = new GenericTypeActivator<ContentField, ContentField>();
+    private readonly ITypeActivator<ContentField> _contentFieldActivator = new GenericTypeActivator<ContentField, ContentField>();
 
-        private readonly Dictionary<string, ITypeActivator<ContentField>> _contentFieldActivators;
+    private readonly Dictionary<string, ITypeActivator<ContentField>> _contentFieldActivators;
 
-        public ContentFieldFactory(IOptions<ContentOptions> contentOptions)
-        {
-            _contentFieldActivators = [];
+    public ContentFieldFactory(IOptions<ContentOptions> contentOptions)
+    {
+        _contentFieldActivators = [];
 
-            // Check content options for configured fields.
-            foreach (var fieldOption in contentOptions.Value.ContentFieldOptions)
-            {
-                var activatorType = typeof(GenericTypeActivator<,>).MakeGenericType(fieldOption.Type, typeof(ContentField));
-                var activator = (ITypeActivator<ContentField>)Activator.CreateInstance(activatorType);
-                _contentFieldActivators.Add(fieldOption.Type.Name, activator);
-            }
+        // Check content options for configured fields.
+        foreach (var fieldOption in contentOptions.Value.ContentFieldOptions)
+        {
+            var activatorType = typeof(GenericTypeActivator<,>).MakeGenericType(fieldOption.Type, typeof(ContentField));
+            var activator = (ITypeActivator<ContentField>)Activator.CreateInstance(activatorType);
+            _contentFieldActivators.Add(fieldOption.Type.Name, activator);
         }
+    }
 
-        /// <inheritdoc />
-        public ITypeActivator<ContentField> GetTypeActivator(string fieldName)
+    /// <inheritdoc />
+    public ITypeActivator<ContentField> GetTypeActivator(string fieldName)
+    {
+        if (_contentFieldActivators.TryGetValue(fieldName, out var activator))
         {
-            if (_contentFieldActivators.TryGetValue(fieldName, out var activator))
-            {
-                return activator;
-            }
-
-            return _contentFieldActivator;
+            return activator;
         }
+
+        return _contentFieldActivator;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/ContentHandleManager.cs b/src/OrchardCore/OrchardCore.ContentManagement/ContentHandleManager.cs
index 24396b9e511..059196d039d 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/ContentHandleManager.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/ContentHandleManager.cs
@@ -2,30 +2,29 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public class ContentHandleManager : IContentHandleManager
 {
-    public class ContentHandleManager : IContentHandleManager
+    private readonly IEnumerable<IContentHandleProvider> _contentHandleProviders;
+
+    public ContentHandleManager(IEnumerable<IContentHandleProvider> contentHandleProviders)
     {
-        private readonly IEnumerable<IContentHandleProvider> _contentHandleProviders;
+        _contentHandleProviders = contentHandleProviders.OrderBy(x => x.Order);
+    }
 
-        public ContentHandleManager(IEnumerable<IContentHandleProvider> contentHandleProviders)
+    public async Task<string> GetContentItemIdAsync(string handle)
+    {
+        foreach (var provider in _contentHandleProviders)
         {
-            _contentHandleProviders = contentHandleProviders.OrderBy(x => x.Order);
-        }
+            var result = await provider.GetContentItemIdAsync(handle);
 
-        public async Task<string> GetContentItemIdAsync(string handle)
-        {
-            foreach (var provider in _contentHandleProviders)
+            if (!string.IsNullOrEmpty(result))
             {
-                var result = await provider.GetContentItemIdAsync(handle);
-
-                if (!string.IsNullOrEmpty(result))
-                {
-                    return result;
-                }
+                return result;
             }
-
-            return null;
         }
+
+        return null;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/ContentPartFactory.cs b/src/OrchardCore/OrchardCore.ContentManagement/ContentPartFactory.cs
index 79f61823e42..52829d4a3f5 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/ContentPartFactory.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/ContentPartFactory.cs
@@ -2,40 +2,39 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+/// <summary>
+/// Implements <see cref="ITypeActivatorFactory{ContentPart}"/> by resolving all registered <see cref="ContentPart"/> types
+/// and memoizing a statically typed <see cref="ITypeActivator{ContentPart}"/>.
+/// </summary>
+public class ContentPartFactory : ITypeActivatorFactory<ContentPart>
 {
-    /// <summary>
-    /// Implements <see cref="ITypeActivatorFactory{ContentPart}"/> by resolving all registered <see cref="ContentPart"/> types
-    /// and memoizing a statically typed <see cref="ITypeActivator{ContentPart}"/>.
-    /// </summary>
-    public class ContentPartFactory : ITypeActivatorFactory<ContentPart>
-    {
-        private readonly ITypeActivator<ContentPart> _contentPartActivator = new GenericTypeActivator<ContentPart, ContentPart>();
+    private readonly ITypeActivator<ContentPart> _contentPartActivator = new GenericTypeActivator<ContentPart, ContentPart>();
 
-        private readonly Dictionary<string, ITypeActivator<ContentPart>> _contentPartActivators;
+    private readonly Dictionary<string, ITypeActivator<ContentPart>> _contentPartActivators;
 
-        public ContentPartFactory(IOptions<ContentOptions> contentOptions)
-        {
-            _contentPartActivators = [];
+    public ContentPartFactory(IOptions<ContentOptions> contentOptions)
+    {
+        _contentPartActivators = [];
 
-            // Check content options for configured parts.
-            foreach (var partOption in contentOptions.Value.ContentPartOptions)
-            {
-                var activatorType = typeof(GenericTypeActivator<,>).MakeGenericType(partOption.Type, typeof(ContentPart));
-                var activator = (ITypeActivator<ContentPart>)Activator.CreateInstance(activatorType);
-                _contentPartActivators.Add(partOption.Type.Name, activator);
-            }
+        // Check content options for configured parts.
+        foreach (var partOption in contentOptions.Value.ContentPartOptions)
+        {
+            var activatorType = typeof(GenericTypeActivator<,>).MakeGenericType(partOption.Type, typeof(ContentPart));
+            var activator = (ITypeActivator<ContentPart>)Activator.CreateInstance(activatorType);
+            _contentPartActivators.Add(partOption.Type.Name, activator);
         }
+    }
 
-        /// <inheritdoc />
-        public ITypeActivator<ContentPart> GetTypeActivator(string partName)
+    /// <inheritdoc />
+    public ITypeActivator<ContentPart> GetTypeActivator(string partName)
+    {
+        if (_contentPartActivators.TryGetValue(partName, out var activator))
         {
-            if (_contentPartActivators.TryGetValue(partName, out var activator))
-            {
-                return activator;
-            }
-
-            return _contentPartActivator;
+            return activator;
         }
+
+        return _contentPartActivator;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/DatabaseContentDefinitionStore.cs b/src/OrchardCore/OrchardCore.ContentManagement/DatabaseContentDefinitionStore.cs
index 0c82f63565a..f9b65345316 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/DatabaseContentDefinitionStore.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/DatabaseContentDefinitionStore.cs
@@ -2,24 +2,23 @@
 using OrchardCore.ContentManagement.Metadata.Records;
 using OrchardCore.Documents;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public class DatabaseContentDefinitionStore : IContentDefinitionStore
 {
-    public class DatabaseContentDefinitionStore : IContentDefinitionStore
-    {
-        private readonly IDocumentManager<ContentDefinitionRecord> _documentManager;
+    private readonly IDocumentManager<ContentDefinitionRecord> _documentManager;
 
-        public DatabaseContentDefinitionStore(IDocumentManager<ContentDefinitionRecord> documentManager)
-        {
-            _documentManager = documentManager;
-        }
+    public DatabaseContentDefinitionStore(IDocumentManager<ContentDefinitionRecord> documentManager)
+    {
+        _documentManager = documentManager;
+    }
 
-        /// <inheritdoc />
-        public Task<ContentDefinitionRecord> LoadContentDefinitionAsync() => _documentManager.GetOrCreateMutableAsync();
+    /// <inheritdoc />
+    public Task<ContentDefinitionRecord> LoadContentDefinitionAsync() => _documentManager.GetOrCreateMutableAsync();
 
-        /// <inheritdoc />
-        public Task<ContentDefinitionRecord> GetContentDefinitionAsync() => _documentManager.GetOrCreateImmutableAsync();
+    /// <inheritdoc />
+    public Task<ContentDefinitionRecord> GetContentDefinitionAsync() => _documentManager.GetOrCreateImmutableAsync();
 
-        /// <inheritdoc />
-        public Task SaveContentDefinitionAsync(ContentDefinitionRecord contentDefinitionRecord) => _documentManager.UpdateAsync(contentDefinitionRecord);
-    }
+    /// <inheritdoc />
+    public Task SaveContentDefinitionAsync(ContentDefinitionRecord contentDefinitionRecord) => _documentManager.UpdateAsync(contentDefinitionRecord);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentItemIdGenerator.cs b/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentItemIdGenerator.cs
index f31923d70fa..0ab195f10f7 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentItemIdGenerator.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentItemIdGenerator.cs
@@ -1,19 +1,18 @@
 using OrchardCore.Entities;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public class DefaultContentItemIdGenerator : IContentItemIdGenerator
 {
-    public class DefaultContentItemIdGenerator : IContentItemIdGenerator
-    {
-        private readonly IIdGenerator _generator;
+    private readonly IIdGenerator _generator;
 
-        public DefaultContentItemIdGenerator(IIdGenerator generator)
-        {
-            _generator = generator;
-        }
+    public DefaultContentItemIdGenerator(IIdGenerator generator)
+    {
+        _generator = generator;
+    }
 
-        public string GenerateUniqueId(ContentItem contentItem)
-        {
-            return _generator.GenerateUniqueId();
-        }
+    public string GenerateUniqueId(ContentItem contentItem)
+    {
+        return _generator.GenerateUniqueId();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentManager.cs b/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentManager.cs
index b5ef54feaf6..bd08b7cebb1 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentManager.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentManager.cs
@@ -16,471 +16,528 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public class DefaultContentManager : IContentManager
 {
-    public class DefaultContentManager : IContentManager
+    private const int _importBatchSize = 500;
+
+    private static readonly JsonMergeSettings _updateJsonMergeSettings = new()
+    {
+        MergeArrayHandling = MergeArrayHandling.Replace,
+    };
+
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ISession _session;
+    private readonly ILogger _logger;
+    private readonly IContentManagerSession _contentManagerSession;
+    private readonly IContentItemIdGenerator _idGenerator;
+    private readonly IClock _clock;
+
+    public DefaultContentManager(
+        IContentDefinitionManager contentDefinitionManager,
+        IContentManagerSession contentManagerSession,
+        IEnumerable<IContentHandler> handlers,
+        ISession session,
+        IContentItemIdGenerator idGenerator,
+        ILogger<DefaultContentManager> logger,
+        IClock clock)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+        Handlers = handlers;
+        _session = session;
+        _idGenerator = idGenerator;
+        _contentManagerSession = contentManagerSession;
+        _logger = logger;
+        _clock = clock;
+    }
+
+    public IEnumerable<IContentHandler> Handlers { get; private set; }
+
+    public IEnumerable<IContentHandler> _reversedHandlers;
+
+    public IEnumerable<IContentHandler> ReversedHandlers
+        => _reversedHandlers ??= Handlers.Reverse().ToArray();
+
+    public async Task<ContentItem> NewAsync(string contentType)
     {
-        private const int _importBatchSize = 500;
+        ArgumentException.ThrowIfNullOrEmpty(contentType);
+
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentType);
+        contentTypeDefinition ??= new ContentTypeDefinitionBuilder().Named(contentType).Build();
 
-        private static readonly JsonMergeSettings _updateJsonMergeSettings = new()
+        // Create a new kernel for the model instance.
+        var context = new ActivatingContentContext(new ContentItem() { ContentType = contentTypeDefinition.Name })
         {
-            MergeArrayHandling = MergeArrayHandling.Replace,
+            ContentType = contentTypeDefinition.Name,
+            Definition = contentTypeDefinition,
         };
 
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly ISession _session;
-        private readonly ILogger _logger;
-        private readonly IContentManagerSession _contentManagerSession;
-        private readonly IContentItemIdGenerator _idGenerator;
-        private readonly IClock _clock;
+        // Invoke handlers to weld aspects onto kernel.
+        await Handlers.InvokeAsync((handler, context) => handler.ActivatingAsync(context), context, _logger);
+
+        var context2 = new ActivatedContentContext(context.ContentItem);
+
+        context2.ContentItem.ContentItemId = _idGenerator.GenerateUniqueId(context2.ContentItem);
+
+        await ReversedHandlers.InvokeAsync((handler, context2) => handler.ActivatedAsync(context2), context2, _logger);
+
+        var context3 = new InitializingContentContext(context2.ContentItem);
+
+        await Handlers.InvokeAsync((handler, context3) => handler.InitializingAsync(context3), context3, _logger);
+        await ReversedHandlers.InvokeAsync((handler, context3) => handler.InitializedAsync(context3), context3, _logger);
+
+        // Composite result is returned.
+        return context3.ContentItem;
+    }
 
-        public DefaultContentManager(
-            IContentDefinitionManager contentDefinitionManager,
-            IContentManagerSession contentManagerSession,
-            IEnumerable<IContentHandler> handlers,
-            ISession session,
-            IContentItemIdGenerator idGenerator,
-            ILogger<DefaultContentManager> logger,
-            IClock clock)
+    public async Task<ContentItem> GetAsync(string contentItemId, VersionOptions options = null)
+    {
+        if (string.IsNullOrEmpty(contentItemId))
         {
-            _contentDefinitionManager = contentDefinitionManager;
-            Handlers = handlers;
-            _session = session;
-            _idGenerator = idGenerator;
-            _contentManagerSession = contentManagerSession;
-            _logger = logger;
-            _clock = clock;
+            return null;
         }
 
-        public IEnumerable<IContentHandler> Handlers { get; private set; }
+        options ??= VersionOptions.Published;
 
-        public IEnumerable<IContentHandler> _reversedHandlers;
+        ContentItem contentItem = null;
+
+        if (options.IsLatest)
+        {
+            contentItem = await _session
+                .Query<ContentItem, ContentItemIndex>()
+                .Where(x => x.ContentItemId == contentItemId && x.Latest == true)
+                .FirstOrDefaultAsync();
+        }
+        else if (options.IsDraft && !options.IsDraftRequired)
+        {
+            contentItem = await _session
+                .Query<ContentItem, ContentItemIndex>()
+                .Where(x =>
+                    x.ContentItemId == contentItemId &&
+                    x.Published == false &&
+                    x.Latest == true)
+                .FirstOrDefaultAsync();
+        }
+        else if (options.IsDraft || options.IsDraftRequired)
+        {
+            // Loaded whatever is the latest as it will be cloned
+            contentItem = await _session
+                .Query<ContentItem, ContentItemIndex>()
+                .Where(x =>
+                    x.ContentItemId == contentItemId &&
+                    x.Latest == true)
+                .FirstOrDefaultAsync();
+        }
+        else if (options.IsPublished)
+        {
+            // If the published version is requested and is already loaded, we can
+            // return it right away.
+            if (_contentManagerSession.RecallPublishedItemId(contentItemId, out contentItem))
+            {
+                return contentItem;
+            }
 
-        public IEnumerable<IContentHandler> ReversedHandlers
-            => _reversedHandlers ??= Handlers.Reverse().ToArray();
+            contentItem = await _session.ExecuteQuery(new PublishedContentItemById(contentItemId)).FirstOrDefaultAsync();
+        }
 
-        public async Task<ContentItem> NewAsync(string contentType)
+        if (contentItem == null)
         {
-            ArgumentException.ThrowIfNullOrEmpty(contentType);
+            return null;
+        }
 
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentType);
-            contentTypeDefinition ??= new ContentTypeDefinitionBuilder().Named(contentType).Build();
+        contentItem = await LoadAsync(contentItem);
 
-            // Create a new kernel for the model instance.
-            var context = new ActivatingContentContext(new ContentItem() { ContentType = contentTypeDefinition.Name })
+        if (options.IsDraftRequired)
+        {
+            // When draft is required and latest is published a new version is added.
+            if (contentItem.Published)
             {
-                ContentType = contentTypeDefinition.Name,
-                Definition = contentTypeDefinition,
-            };
+                // We save the previous version further because this call might do a session query.
+                var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
 
-            // Invoke handlers to weld aspects onto kernel.
-            await Handlers.InvokeAsync((handler, context) => handler.ActivatingAsync(context), context, _logger);
+                // Check if not versionable, meaning we use only one version.
+                if (contentTypeDefinition != null && !contentTypeDefinition.IsVersionable())
+                {
+                    contentItem.Published = false;
+                }
+                else
+                {
+                    // Save the previous version.
+                    await _session.SaveAsync(contentItem, checkConcurrency: true);
 
-            var context2 = new ActivatedContentContext(context.ContentItem);
+                    contentItem = await BuildNewVersionAsync(contentItem);
+                }
+            }
 
-            context2.ContentItem.ContentItemId = _idGenerator.GenerateUniqueId(context2.ContentItem);
+            // Save the new version
+            await _session.SaveAsync(contentItem, checkConcurrency: true);
+        }
 
-            await ReversedHandlers.InvokeAsync((handler, context2) => handler.ActivatedAsync(context2), context2, _logger);
+        return contentItem;
+    }
 
-            var context3 = new InitializingContentContext(context2.ContentItem);
+    public async Task<IEnumerable<ContentItem>> GetAllVersionsAsync(string contentItemId)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(contentItemId);
 
-            await Handlers.InvokeAsync((handler, context3) => handler.InitializingAsync(context3), context3, _logger);
-            await ReversedHandlers.InvokeAsync((handler, context3) => handler.InitializedAsync(context3), context3, _logger);
+        var contentItems = await _session
+                .Query<ContentItem, ContentItemIndex>()
+                .Where(x => x.ContentItemId == contentItemId)
+                .ListAsync();
 
-            // Composite result is returned.
-            return context3.ContentItem;
+        foreach (var contentItem in contentItems)
+        {
+            await LoadAsync(contentItem);
         }
 
-        public async Task<ContentItem> GetAsync(string contentItemId, VersionOptions options = null)
+        return contentItems;
+    }
+
+    public async Task<IEnumerable<ContentItem>> GetAsync(IEnumerable<string> contentItemIds, VersionOptions options = null)
+    {
+        var ids = contentItemIds?
+            .Where(id => id is not null)
+            .Distinct()
+            .ToArray();
+
+        if (ids == null || ids.Length == 0)
         {
-            if (string.IsNullOrEmpty(contentItemId))
-            {
-                return null;
-            }
+            return [];
+        }
 
-            options ??= VersionOptions.Published;
+        options ??= VersionOptions.Published;
 
-            ContentItem contentItem = null;
+        var contentItems = new List<ContentItem>();
 
-            if (options.IsLatest)
-            {
-                contentItem = await _session
-                    .Query<ContentItem, ContentItemIndex>()
-                    .Where(x => x.ContentItemId == contentItemId && x.Latest == true)
-                    .FirstOrDefaultAsync();
-            }
-            else if (options.IsDraft && !options.IsDraftRequired)
-            {
-                contentItem = await _session
-                    .Query<ContentItem, ContentItemIndex>()
-                    .Where(x =>
-                        x.ContentItemId == contentItemId &&
-                        x.Published == false &&
-                        x.Latest == true)
-                    .FirstOrDefaultAsync();
-            }
-            else if (options.IsDraft || options.IsDraftRequired)
-            {
-                // Loaded whatever is the latest as it will be cloned
-                contentItem = await _session
-                    .Query<ContentItem, ContentItemIndex>()
-                    .Where(x =>
-                        x.ContentItemId == contentItemId &&
-                        x.Latest == true)
-                    .FirstOrDefaultAsync();
-            }
-            else if (options.IsPublished)
+        if (options.IsLatest)
+        {
+            contentItems = (await _session
+                .Query<ContentItem, ContentItemIndex>()
+                .Where(x => x.ContentItemId.IsIn(ids) && x.Latest)
+                .ListAsync()
+                ).ToList();
+        }
+        else if (options.IsDraft && !options.IsDraftRequired)
+        {
+            contentItems = (await _session
+                .Query<ContentItem, ContentItemIndex>()
+                .Where(x => x.ContentItemId.IsIn(ids) && !x.Published && x.Latest).ListAsync()
+                ).ToList();
+        }
+        else if (options.IsDraft || options.IsDraftRequired)
+        {
+            // Loaded whatever is the latest as it will be cloned.
+            contentItems = (await _session
+                .Query<ContentItem, ContentItemIndex>()
+                .Where(x => x.ContentItemId.IsIn(ids) && x.Latest)
+                .ListAsync()).ToList();
+        }
+        else if (options.IsPublished)
+        {
+            var missingIds = new List<string>();
+
+            foreach (var id in ids)
             {
-                // If the published version is requested and is already loaded, we can
-                // return it right away.
-                if (_contentManagerSession.RecallPublishedItemId(contentItemId, out contentItem))
+                if (_contentManagerSession.RecallPublishedItemId(id, out var contentItem))
                 {
-                    return contentItem;
+                    contentItems.Add(contentItem);
+                }
+                else
+                {
+                    missingIds.Add(id);
                 }
-
-                contentItem = await _session.ExecuteQuery(new PublishedContentItemById(contentItemId)).FirstOrDefaultAsync();
             }
 
-            if (contentItem == null)
+            if (missingIds.Count > 0)
             {
-                return null;
+                var missingItems = await _session.Query<ContentItem, ContentItemIndex>(x => x.ContentItemId.IsIn(missingIds) && x.Published).ListAsync();
+
+                contentItems.AddRange(missingItems);
             }
+        }
+
+        var needVersions = new List<ContentItem>();
+        var finalItems = new List<ContentItem>();
 
-            contentItem = await LoadAsync(contentItem);
+        foreach (var contentItem in contentItems)
+        {
+            var item = await LoadAsync(contentItem);
 
             if (options.IsDraftRequired)
             {
                 // When draft is required and latest is published a new version is added.
-                if (contentItem.Published)
+                if (item.Published)
                 {
-                    // We save the previous version further because this call might do a session query.
-                    var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+                    var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(item.ContentType);
 
                     // Check if not versionable, meaning we use only one version.
                     if (contentTypeDefinition != null && !contentTypeDefinition.IsVersionable())
                     {
-                        contentItem.Published = false;
+                        item.Published = false;
+
+                        // Save the previous version.
+                        await _session.SaveAsync(item, checkConcurrency: true);
+
+                        finalItems.Add(item);
                     }
                     else
                     {
-                        // Save the previous version.
-                        await _session.SaveAsync(contentItem, checkConcurrency: true);
-
-                        contentItem = await BuildNewVersionAsync(contentItem);
+                        needVersions.Add(item);
                     }
                 }
-
-                // Save the new version
-                await _session.SaveAsync(contentItem, checkConcurrency: true);
             }
-
-            return contentItem;
-        }
-
-        public async Task<IEnumerable<ContentItem>> GetAllVersionsAsync(string contentItemId)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(contentItemId);
-
-            var contentItems = await _session
-                    .Query<ContentItem, ContentItemIndex>()
-                    .Where(x => x.ContentItemId == contentItemId)
-                    .ListAsync();
-
-            foreach (var contentItem in contentItems)
+            else
             {
-                await LoadAsync(contentItem);
+                finalItems.Add(item);
             }
 
-            return contentItems;
+            // We save the previous version further because this call might do a session query.
+            await _session.SaveAsync(item, checkConcurrency: true);
         }
 
-        public async Task<IEnumerable<ContentItem>> GetAsync(IEnumerable<string> contentItemIds, VersionOptions options = null)
+        if (needVersions.Count > 0)
         {
-            var ids = contentItemIds?
-                .Where(id => id is not null)
-                .Distinct()
-                .ToArray();
+            var items = await BuildNewVersionsAsync(needVersions);
 
-            if (ids == null || ids.Length == 0)
+            foreach (var item in items)
             {
-                return [];
-            }
-
-            options ??= VersionOptions.Published;
-
-            var contentItems = new List<ContentItem>();
+                // Save the new version.
+                await _session.SaveAsync(item, checkConcurrency: true);
 
-            if (options.IsLatest)
-            {
-                contentItems = (await _session
-                    .Query<ContentItem, ContentItemIndex>()
-                    .Where(x => x.ContentItemId.IsIn(ids) && x.Latest)
-                    .ListAsync()
-                    ).ToList();
-            }
-            else if (options.IsDraft && !options.IsDraftRequired)
-            {
-                contentItems = (await _session
-                    .Query<ContentItem, ContentItemIndex>()
-                    .Where(x => x.ContentItemId.IsIn(ids) && !x.Published && x.Latest).ListAsync()
-                    ).ToList();
-            }
-            else if (options.IsDraft || options.IsDraftRequired)
-            {
-                // Loaded whatever is the latest as it will be cloned.
-                contentItems = (await _session
-                    .Query<ContentItem, ContentItemIndex>()
-                    .Where(x => x.ContentItemId.IsIn(ids) && x.Latest)
-                    .ListAsync()).ToList();
+                finalItems.Add(item);
             }
-            else if (options.IsPublished)
-            {
-                var missingIds = new List<string>();
-
-                foreach (var id in ids)
-                {
-                    if (_contentManagerSession.RecallPublishedItemId(id, out var contentItem))
-                    {
-                        contentItems.Add(contentItem);
-                    }
-                    else
-                    {
-                        missingIds.Add(id);
-                    }
-                }
+        }
 
-                if (missingIds.Count > 0)
-                {
-                    var missingItems = await _session.Query<ContentItem, ContentItemIndex>(x => x.ContentItemId.IsIn(missingIds) && x.Published).ListAsync();
+        return finalItems;
+    }
 
-                    contentItems.AddRange(missingItems);
-                }
-            }
+    public async Task<ContentItem> LoadAsync(ContentItem contentItem)
+    {
+        ArgumentNullException.ThrowIfNull(contentItem);
 
-            var needVersions = new List<ContentItem>();
-            var finalItems = new List<ContentItem>();
+        if (!_contentManagerSession.RecallVersionId(contentItem.Id, out var loaded))
+        {
+            // store in session prior to loading to avoid some problems with simple circular dependencies
+            _contentManagerSession.Store(contentItem);
 
-            foreach (var contentItem in contentItems)
-            {
-                var item = await LoadAsync(contentItem);
+            // create a context with a new instance to load
+            var context = new LoadContentContext(contentItem);
 
-                if (options.IsDraftRequired)
-                {
-                    // When draft is required and latest is published a new version is added.
-                    if (item.Published)
-                    {
-                        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(item.ContentType);
+            // invoke handlers to acquire state, or at least establish lazy loading callbacks
+            await Handlers.InvokeAsync((handler, context) => handler.LoadingAsync(context), context, _logger);
+            await ReversedHandlers.InvokeAsync((handler, context) => handler.LoadedAsync(context), context, _logger);
 
-                        // Check if not versionable, meaning we use only one version.
-                        if (contentTypeDefinition != null && !contentTypeDefinition.IsVersionable())
-                        {
-                            item.Published = false;
+            loaded = context.ContentItem;
+        }
 
-                            // Save the previous version.
-                            await _session.SaveAsync(item, checkConcurrency: true);
+        return loaded;
+    }
 
-                            finalItems.Add(item);
-                        }
-                        else
-                        {
-                            needVersions.Add(item);
-                        }
-                    }
-                }
-                else
-                {
-                    finalItems.Add(item);
-                }
+    public async Task<ContentItem> GetVersionAsync(string contentItemVersionId)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(contentItemVersionId);
 
-                // We save the previous version further because this call might do a session query.
-                await _session.SaveAsync(item, checkConcurrency: true);
-            }
+        var contentItem = await _session
+            .Query<ContentItem, ContentItemIndex>(x => x.ContentItemVersionId == contentItemVersionId)
+            .FirstOrDefaultAsync();
 
-            if (needVersions.Count > 0)
-            {
-                var items = await BuildNewVersionsAsync(needVersions);
+        if (contentItem == null)
+        {
+            return null;
+        }
 
-                foreach (var item in items)
-                {
-                    // Save the new version.
-                    await _session.SaveAsync(item, checkConcurrency: true);
+        return await LoadAsync(contentItem);
+    }
 
-                    finalItems.Add(item);
-                }
-            }
+    public async Task SaveDraftAsync(ContentItem contentItem)
+    {
+        ArgumentNullException.ThrowIfNull(contentItem);
 
-            return finalItems;
+        if (!contentItem.Latest || contentItem.Published)
+        {
+            return;
         }
 
-        public async Task<ContentItem> LoadAsync(ContentItem contentItem)
-        {
-            ArgumentNullException.ThrowIfNull(contentItem);
+        var context = new SaveDraftContentContext(contentItem);
 
-            if (!_contentManagerSession.RecallVersionId(contentItem.Id, out var loaded))
-            {
-                // store in session prior to loading to avoid some problems with simple circular dependencies
-                _contentManagerSession.Store(contentItem);
+        await Handlers.InvokeAsync((handler, context) => handler.DraftSavingAsync(context), context, _logger);
 
-                // create a context with a new instance to load
-                var context = new LoadContentContext(contentItem);
+        await _session.SaveAsync(contentItem, checkConcurrency: true);
 
-                // invoke handlers to acquire state, or at least establish lazy loading callbacks
-                await Handlers.InvokeAsync((handler, context) => handler.LoadingAsync(context), context, _logger);
-                await ReversedHandlers.InvokeAsync((handler, context) => handler.LoadedAsync(context), context, _logger);
+        await ReversedHandlers.InvokeAsync((handler, context) => handler.DraftSavedAsync(context), context, _logger);
+    }
 
-                loaded = context.ContentItem;
-            }
+    public async Task PublishAsync(ContentItem contentItem)
+    {
+        ArgumentNullException.ThrowIfNull(contentItem);
 
-            return loaded;
+        if (contentItem.Published)
+        {
+            return;
         }
 
-        public async Task<ContentItem> GetVersionAsync(string contentItemVersionId)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(contentItemVersionId);
+        // Create a context for the item and it's previous published record
+        // because of this query the content item will need to be re-enlisted
+        // to be saved.
+        var previous = await _session
+            .Query<ContentItem, ContentItemIndex>(x =>
+                x.ContentItemId == contentItem.ContentItemId && x.Published)
+            .FirstOrDefaultAsync();
 
-            var contentItem = await _session
-                .Query<ContentItem, ContentItemIndex>(x => x.ContentItemVersionId == contentItemVersionId)
-                .FirstOrDefaultAsync();
+        var context = new PublishContentContext(contentItem, previous);
 
-            if (contentItem == null)
-            {
-                return null;
-            }
+        // Invoke handlers to acquire state, or at least establish lazy loading callbacks.
+        await Handlers.InvokeAsync((handler, context) => handler.PublishingAsync(context), context, _logger);
 
-            return await LoadAsync(contentItem);
+        if (context.Cancel)
+        {
+            return;
         }
 
-        public async Task SaveDraftAsync(ContentItem contentItem)
+        if (previous != null)
         {
-            ArgumentNullException.ThrowIfNull(contentItem);
+            await _session.SaveAsync(previous, checkConcurrency: true);
+            previous.Published = false;
+        }
 
-            if (!contentItem.Latest || contentItem.Published)
-            {
-                return;
-            }
+        contentItem.Published = true;
+        await _session.SaveAsync(contentItem, checkConcurrency: true);
+
+        await ReversedHandlers.InvokeAsync((handler, context) => handler.PublishedAsync(context), context, _logger);
+    }
 
-            var context = new SaveDraftContentContext(contentItem);
+    public async Task UnpublishAsync(ContentItem contentItem)
+    {
+        ArgumentNullException.ThrowIfNull(contentItem);
 
-            await Handlers.InvokeAsync((handler, context) => handler.DraftSavingAsync(context), context, _logger);
+        // This method needs to be called using the latest version
+        if (!contentItem.Latest)
+        {
+            throw new InvalidOperationException("Not the latest version.");
+        }
 
-            await _session.SaveAsync(contentItem, checkConcurrency: true);
+        ContentItem publishedItem;
+        if (contentItem.Published)
+        {
+            // The version passed in is the published one
+            publishedItem = contentItem;
+        }
+        else
+        {
+            // Try to locate the published version of this item
+            publishedItem = await GetAsync(contentItem.ContentItemId, VersionOptions.Published);
+        }
 
-            await ReversedHandlers.InvokeAsync((handler, context) => handler.DraftSavedAsync(context), context, _logger);
+        if (publishedItem == null)
+        {
+            // No published version exists. no work to perform.
+            return;
         }
 
-        public async Task PublishAsync(ContentItem contentItem)
+        // Create a context for the item. the publishing version is null in this case
+        // and the previous version is the one active prior to unpublishing. handlers
+        // should take this null check into account
+        var context = new PublishContentContext(contentItem, publishedItem)
         {
-            ArgumentNullException.ThrowIfNull(contentItem);
+            PublishingItem = null
+        };
 
-            if (contentItem.Published)
-            {
-                return;
-            }
+        await Handlers.InvokeAsync((handler, context) => handler.UnpublishingAsync(context), context, _logger);
 
-            // Create a context for the item and it's previous published record
-            // because of this query the content item will need to be re-enlisted
-            // to be saved.
-            var previous = await _session
-                .Query<ContentItem, ContentItemIndex>(x =>
-                    x.ContentItemId == contentItem.ContentItemId && x.Published)
-                .FirstOrDefaultAsync();
+        publishedItem.Published = false;
+        publishedItem.ModifiedUtc = _clock.UtcNow;
+        await _session.SaveAsync(publishedItem, checkConcurrency: true);
 
-            var context = new PublishContentContext(contentItem, previous);
+        await ReversedHandlers.InvokeAsync((handler, context) => handler.UnpublishedAsync(context), context, _logger);
+    }
 
-            // Invoke handlers to acquire state, or at least establish lazy loading callbacks.
-            await Handlers.InvokeAsync((handler, context) => handler.PublishingAsync(context), context, _logger);
+    protected async Task<ContentItem> BuildNewVersionAsync(ContentItem existingContentItem)
+    {
+        ContentItem latestVersion;
 
-            if (context.Cancel)
-            {
-                return;
-            }
+        if (existingContentItem.Latest)
+        {
+            latestVersion = existingContentItem;
+        }
+        else
+        {
+            latestVersion = await _session
+                .Query<ContentItem, ContentItemIndex>(x =>
+                    x.ContentItemId == existingContentItem.ContentItemId &&
+                    x.Latest)
+                .FirstOrDefaultAsync();
 
-            if (previous != null)
+            if (latestVersion != null)
             {
-                await _session.SaveAsync(previous, checkConcurrency: true);
-                previous.Published = false;
+                await _session.SaveAsync(latestVersion);
             }
+        }
 
-            contentItem.Published = true;
-            await _session.SaveAsync(contentItem, checkConcurrency: true);
-
-            await ReversedHandlers.InvokeAsync((handler, context) => handler.PublishedAsync(context), context, _logger);
+        if (latestVersion != null)
+        {
+            latestVersion.Latest = false;
         }
 
-        public async Task UnpublishAsync(ContentItem contentItem)
+        // We are not invoking NewAsync as we are cloning an existing item
+        // This will also prevent the Elements (parts) from being allocated unnecessarily
+        var buildingContentItem = new ContentItem
         {
-            ArgumentNullException.ThrowIfNull(contentItem);
+            ContentType = existingContentItem.ContentType,
+            ContentItemId = existingContentItem.ContentItemId,
+            ContentItemVersionId = _idGenerator.GenerateUniqueId(existingContentItem),
+            DisplayText = existingContentItem.DisplayText,
+            Latest = true,
+            Data = existingContentItem.Data.Clone(),
+        };
 
-            // This method needs to be called using the latest version
-            if (!contentItem.Latest)
-            {
-                throw new InvalidOperationException("Not the latest version.");
-            }
+        var context = new VersionContentContext(existingContentItem, buildingContentItem);
 
-            ContentItem publishedItem;
-            if (contentItem.Published)
-            {
-                // The version passed in is the published one
-                publishedItem = contentItem;
-            }
-            else
-            {
-                // Try to locate the published version of this item
-                publishedItem = await GetAsync(contentItem.ContentItemId, VersionOptions.Published);
-            }
+        await Handlers.InvokeAsync((handler, context) => handler.VersioningAsync(context), context, _logger);
+        await ReversedHandlers.InvokeAsync((handler, context) => handler.VersionedAsync(context), context, _logger);
 
-            if (publishedItem == null)
-            {
-                // No published version exists. no work to perform.
-                return;
-            }
+        return context.BuildingContentItem;
+    }
 
-            // Create a context for the item. the publishing version is null in this case
-            // and the previous version is the one active prior to unpublishing. handlers
-            // should take this null check into account
-            var context = new PublishContentContext(contentItem, publishedItem)
-            {
-                PublishingItem = null
-            };
+    protected async Task<IEnumerable<ContentItem>> BuildNewVersionsAsync(IEnumerable<ContentItem> existingContentItems)
+    {
+        var latestVersions = new List<ContentItem>();
+        var needingLatestVersion = new List<string>();
 
-            await Handlers.InvokeAsync((handler, context) => handler.UnpublishingAsync(context), context, _logger);
+        foreach (var existingContentItem in existingContentItems)
+        {
+            if (existingContentItem.Latest)
+            {
+                latestVersions.Add(existingContentItem);
 
-            publishedItem.Published = false;
-            publishedItem.ModifiedUtc = _clock.UtcNow;
-            await _session.SaveAsync(publishedItem, checkConcurrency: true);
+                continue;
+            }
 
-            await ReversedHandlers.InvokeAsync((handler, context) => handler.UnpublishedAsync(context), context, _logger);
+            needingLatestVersion.Add(existingContentItem.ContentItemId);
         }
 
-        protected async Task<ContentItem> BuildNewVersionAsync(ContentItem existingContentItem)
+        if (needingLatestVersion.Count > 0)
         {
-            ContentItem latestVersion;
+            var foundLatestVersions = await _session
+                .Query<ContentItem, ContentItemIndex>(x =>
+                    x.ContentItemId.IsIn(needingLatestVersion) &&
+                    x.Latest)
+                .ListAsync();
 
-            if (existingContentItem.Latest)
-            {
-                latestVersion = existingContentItem;
-            }
-            else
-            {
-                latestVersion = await _session
-                    .Query<ContentItem, ContentItemIndex>(x =>
-                        x.ContentItemId == existingContentItem.ContentItemId &&
-                        x.Latest)
-                    .FirstOrDefaultAsync();
+            latestVersions.AddRange(foundLatestVersions);
+        }
 
-                if (latestVersion != null)
-                {
-                    await _session.SaveAsync(latestVersion);
-                }
-            }
+        var finalVersions = new List<ContentItem>();
 
-            if (latestVersion != null)
-            {
-                latestVersion.Latest = false;
-            }
+        foreach (var existingContentItem in latestVersions)
+        {
+            existingContentItem.Latest = false;
+
+            // Save previous version.
+            await _session.SaveAsync(existingContentItem);
 
             // We are not invoking NewAsync as we are cloning an existing item
-            // This will also prevent the Elements (parts) from being allocated unnecessarily
+            // This will also prevent the Elements (parts) from being allocated unnecessarily.
             var buildingContentItem = new ContentItem
             {
                 ContentType = existingContentItem.ContentType,
@@ -496,685 +553,627 @@ protected async Task<ContentItem> BuildNewVersionAsync(ContentItem existingConte
             await Handlers.InvokeAsync((handler, context) => handler.VersioningAsync(context), context, _logger);
             await ReversedHandlers.InvokeAsync((handler, context) => handler.VersionedAsync(context), context, _logger);
 
-            return context.BuildingContentItem;
+            finalVersions.Add(context.BuildingContentItem);
         }
 
-        protected async Task<IEnumerable<ContentItem>> BuildNewVersionsAsync(IEnumerable<ContentItem> existingContentItems)
+        return finalVersions;
+    }
+
+    public async Task CreateAsync(ContentItem contentItem, VersionOptions options = null)
+    {
+        if (string.IsNullOrEmpty(contentItem.ContentItemVersionId))
         {
-            var latestVersions = new List<ContentItem>();
-            var needingLatestVersion = new List<string>();
+            contentItem.ContentItemVersionId = _idGenerator.GenerateUniqueId(contentItem);
+            contentItem.Published = true;
+            contentItem.Latest = true;
+        }
 
-            foreach (var existingContentItem in existingContentItems)
-            {
-                if (existingContentItem.Latest)
-                {
-                    latestVersions.Add(existingContentItem);
+        options ??= VersionOptions.Published;
 
-                    continue;
-                }
+        // Draft flag on create is required for explicitly-published content items
+        if (options.IsDraft)
+        {
+            contentItem.Published = false;
+        }
 
-                needingLatestVersion.Add(existingContentItem.ContentItemId);
-            }
+        // Build a context with the initialized instance to create
+        var context = new CreateContentContext(contentItem);
 
-            if (needingLatestVersion.Count > 0)
-            {
-                var foundLatestVersions = await _session
-                    .Query<ContentItem, ContentItemIndex>(x =>
-                        x.ContentItemId.IsIn(needingLatestVersion) &&
-                        x.Latest)
-                    .ListAsync();
+        // invoke handlers to add information to persistent stores
+        await Handlers.InvokeAsync((handler, context) => handler.CreatingAsync(context), context, _logger);
 
-                latestVersions.AddRange(foundLatestVersions);
-            }
+        await _session.SaveAsync(contentItem);
+        _contentManagerSession.Store(contentItem);
 
-            var finalVersions = new List<ContentItem>();
+        await ReversedHandlers.InvokeAsync((handler, context) => handler.CreatedAsync(context), context, _logger);
 
-            foreach (var existingContentItem in latestVersions)
-            {
-                existingContentItem.Latest = false;
+        if (options.IsPublished)
+        {
+            var publishContext = new PublishContentContext(contentItem, null);
 
-                // Save previous version.
-                await _session.SaveAsync(existingContentItem);
+            // invoke handlers to acquire state, or at least establish lazy loading callbacks
+            await Handlers.InvokeAsync((handler, context) => handler.PublishingAsync(context), publishContext, _logger);
 
-                // We are not invoking NewAsync as we are cloning an existing item
-                // This will also prevent the Elements (parts) from being allocated unnecessarily.
-                var buildingContentItem = new ContentItem
-                {
-                    ContentType = existingContentItem.ContentType,
-                    ContentItemId = existingContentItem.ContentItemId,
-                    ContentItemVersionId = _idGenerator.GenerateUniqueId(existingContentItem),
-                    DisplayText = existingContentItem.DisplayText,
-                    Latest = true,
-                    Data = existingContentItem.Data.Clone(),
-                };
+            // invoke handlers to acquire state, or at least establish lazy loading callbacks
+            await ReversedHandlers.InvokeAsync((handler, context) => handler.PublishedAsync(context), publishContext, _logger);
+        }
+    }
+
+    public Task<ContentValidateResult> CreateContentItemVersionAsync(ContentItem contentItem)
+    {
+        return CreateContentItemVersionAsync(contentItem, null);
+    }
+
+    public Task<ContentValidateResult> UpdateContentItemVersionAsync(ContentItem updatingVersion, ContentItem updatedVersion)
+    {
+        return UpdateContentItemVersionAsync(updatingVersion, updatedVersion, null);
+    }
 
-                var context = new VersionContentContext(existingContentItem, buildingContentItem);
+    public async Task ImportAsync(IEnumerable<ContentItem> contentItems)
+    {
+        ArgumentNullException.ThrowIfNull(contentItems);
 
-                await Handlers.InvokeAsync((handler, context) => handler.VersioningAsync(context), context, _logger);
-                await ReversedHandlers.InvokeAsync((handler, context) => handler.VersionedAsync(context), context, _logger);
+        var skip = 0;
 
-                finalVersions.Add(context.BuildingContentItem);
-            }
+        var importedVersionIds = new HashSet<string>();
 
-            return finalVersions;
-        }
+        var batchedContentItems = contentItems.Take(_importBatchSize);
 
-        public async Task CreateAsync(ContentItem contentItem, VersionOptions options = null)
+        while (batchedContentItems.Any())
         {
-            if (string.IsNullOrEmpty(contentItem.ContentItemVersionId))
-            {
-                contentItem.ContentItemVersionId = _idGenerator.GenerateUniqueId(contentItem);
-                contentItem.Published = true;
-                contentItem.Latest = true;
-            }
+            // Preload all the versions for this batch from the database.
+            var versionIds = batchedContentItems
+                 .Where(x => !string.IsNullOrEmpty(x.ContentItemVersionId))
+                 .Select(x => x.ContentItemVersionId);
 
-            options ??= VersionOptions.Published;
+            var itemIds = batchedContentItems
+                .Where(x => !string.IsNullOrEmpty(x.ContentItemId))
+                .Select(x => x.ContentItemId);
 
-            // Draft flag on create is required for explicitly-published content items
-            if (options.IsDraft)
-            {
-                contentItem.Published = false;
-            }
-
-            // Build a context with the initialized instance to create
-            var context = new CreateContentContext(contentItem);
-
-            // invoke handlers to add information to persistent stores
-            await Handlers.InvokeAsync((handler, context) => handler.CreatingAsync(context), context, _logger);
-
-            await _session.SaveAsync(contentItem);
-            _contentManagerSession.Store(contentItem);
+            var existingContentItems = await _session
+                .Query<ContentItem, ContentItemIndex>(x =>
+                    x.ContentItemId.IsIn(itemIds) &&
+                    (x.Latest || x.Published || x.ContentItemVersionId.IsIn(versionIds)))
+                .ListAsync();
 
-            await ReversedHandlers.InvokeAsync((handler, context) => handler.CreatedAsync(context), context, _logger);
+            var versionsToUpdate = existingContentItems.Where(c => versionIds.Any(v => string.Equals(v, c.ContentItemVersionId, StringComparison.OrdinalIgnoreCase)));
+            var versionsThatMaybeEvicted = existingContentItems.Except(versionsToUpdate);
 
-            if (options.IsPublished)
+            foreach (var version in existingContentItems)
             {
-                var publishContext = new PublishContentContext(contentItem, null);
-
-                // invoke handlers to acquire state, or at least establish lazy loading callbacks
-                await Handlers.InvokeAsync((handler, context) => handler.PublishingAsync(context), publishContext, _logger);
-
-                // invoke handlers to acquire state, or at least establish lazy loading callbacks
-                await ReversedHandlers.InvokeAsync((handler, context) => handler.PublishedAsync(context), publishContext, _logger);
+                await LoadAsync(version);
             }
-        }
-
-        public Task<ContentValidateResult> CreateContentItemVersionAsync(ContentItem contentItem)
-        {
-            return CreateContentItemVersionAsync(contentItem, null);
-        }
-
-        public Task<ContentValidateResult> UpdateContentItemVersionAsync(ContentItem updatingVersion, ContentItem updatedVersion)
-        {
-            return UpdateContentItemVersionAsync(updatingVersion, updatedVersion, null);
-        }
-
-        public async Task ImportAsync(IEnumerable<ContentItem> contentItems)
-        {
-            ArgumentNullException.ThrowIfNull(contentItems);
 
-            var skip = 0;
-
-            var importedVersionIds = new HashSet<string>();
-
-            var batchedContentItems = contentItems.Take(_importBatchSize);
-
-            while (batchedContentItems.Any())
+            foreach (var importingItem in batchedContentItems)
             {
-                // Preload all the versions for this batch from the database.
-                var versionIds = batchedContentItems
-                     .Where(x => !string.IsNullOrEmpty(x.ContentItemVersionId))
-                     .Select(x => x.ContentItemVersionId);
-
-                var itemIds = batchedContentItems
-                    .Where(x => !string.IsNullOrEmpty(x.ContentItemId))
-                    .Select(x => x.ContentItemId);
-
-                var existingContentItems = await _session
-                    .Query<ContentItem, ContentItemIndex>(x =>
-                        x.ContentItemId.IsIn(itemIds) &&
-                        (x.Latest || x.Published || x.ContentItemVersionId.IsIn(versionIds)))
-                    .ListAsync();
+                ContentItem originalVersion = null;
+                if (!string.IsNullOrEmpty(importingItem.ContentItemVersionId))
+                {
+                    if (importedVersionIds.Contains(importingItem.ContentItemVersionId))
+                    {
+                        _logger.LogInformation("Duplicate content item version id '{ContentItemVersionId}' skipped", importingItem.ContentItemVersionId);
+                        continue;
+                    }
 
-                var versionsToUpdate = existingContentItems.Where(c => versionIds.Any(v => string.Equals(v, c.ContentItemVersionId, StringComparison.OrdinalIgnoreCase)));
-                var versionsThatMaybeEvicted = existingContentItems.Except(versionsToUpdate);
+                    importedVersionIds.Add(importingItem.ContentItemVersionId);
 
-                foreach (var version in existingContentItems)
-                {
-                    await LoadAsync(version);
+                    originalVersion = versionsToUpdate.FirstOrDefault(x => string.Equals(x.ContentItemVersionId, importingItem.ContentItemVersionId, StringComparison.OrdinalIgnoreCase));
                 }
 
-                foreach (var importingItem in batchedContentItems)
+                if (originalVersion == null)
                 {
-                    ContentItem originalVersion = null;
-                    if (!string.IsNullOrEmpty(importingItem.ContentItemVersionId))
-                    {
-                        if (importedVersionIds.Contains(importingItem.ContentItemVersionId))
-                        {
-                            _logger.LogInformation("Duplicate content item version id '{ContentItemVersionId}' skipped", importingItem.ContentItemVersionId);
-                            continue;
-                        }
+                    // The version does not exist in the current database.
+                    var context = new ImportContentContext(importingItem);
 
-                        importedVersionIds.Add(importingItem.ContentItemVersionId);
+                    await Handlers.InvokeAsync((handler, context) => handler.ImportingAsync(context), context, _logger);
 
-                        originalVersion = versionsToUpdate.FirstOrDefault(x => string.Equals(x.ContentItemVersionId, importingItem.ContentItemVersionId, StringComparison.OrdinalIgnoreCase));
-                    }
-
-                    if (originalVersion == null)
+                    var evictionVersions = versionsThatMaybeEvicted.Where(x => string.Equals(x.ContentItemId, importingItem.ContentItemId, StringComparison.OrdinalIgnoreCase));
+                    var result = await CreateContentItemVersionAsync(importingItem, evictionVersions);
+                    if (!result.Succeeded)
                     {
-                        // The version does not exist in the current database.
-                        var context = new ImportContentContext(importingItem);
-
-                        await Handlers.InvokeAsync((handler, context) => handler.ImportingAsync(context), context, _logger);
-
-                        var evictionVersions = versionsThatMaybeEvicted.Where(x => string.Equals(x.ContentItemId, importingItem.ContentItemId, StringComparison.OrdinalIgnoreCase));
-                        var result = await CreateContentItemVersionAsync(importingItem, evictionVersions);
-                        if (!result.Succeeded)
+                        if (_logger.IsEnabled(LogLevel.Error))
                         {
-                            if (_logger.IsEnabled(LogLevel.Error))
-                            {
-                                _logger.LogError("Error importing content item version id '{ContentItemVersionId}' : '{Errors}'", importingItem?.ContentItemVersionId, string.Join(", ", result.Errors));
-                            }
-
-                            throw new ValidationException(string.Join(", ", result.Errors));
+                            _logger.LogError("Error importing content item version id '{ContentItemVersionId}' : '{Errors}'", importingItem?.ContentItemVersionId, string.Join(", ", result.Errors));
                         }
 
-                        // Imported handlers will only be fired if the validation has been successful.
-                        // Consumers should implement validated handlers to alter the success of that operation.
-                        await ReversedHandlers.InvokeAsync((handler, context) => handler.ImportedAsync(context), context, _logger);
+                        throw new ValidationException(string.Join(", ", result.Errors));
                     }
-                    else
+
+                    // Imported handlers will only be fired if the validation has been successful.
+                    // Consumers should implement validated handlers to alter the success of that operation.
+                    await ReversedHandlers.InvokeAsync((handler, context) => handler.ImportedAsync(context), context, _logger);
+                }
+                else
+                {
+                    // The version exists in the database.
+                    // It is important to only import changed items.
+                    // We compare the two versions and skip importing it if they are the same.
+                    // We do this to prevent unnecessary sql updates, and because UpdateContentItemVersionAsync
+                    // may remove drafts of updated items.
+                    // This is necessary because an imported item maybe set to latest, and published.
+                    // In this case, the draft item in the system, must be removed, or there will be two drafts.
+                    // The draft item should be removed, because it would now be orphaned, as the imported published item
+                    // would be further ahead, on a timeline, between the two.
+
+                    // var jImporting = JObject.FromObject(importingItem);
+                    var jImporting = JObject.FromObject(importingItem);
+
+                    // Removed Published and Latest from consideration when evaluating.
+                    // Otherwise an import of an unchanged (but published) version would overwrite a newer published version.
+                    jImporting.Remove(nameof(ContentItem.Published));
+                    jImporting.Remove(nameof(ContentItem.Latest));
+
+                    // var jOriginal = JObject.FromObject(originalVersion);
+                    var jOriginal = JObject.FromObject(originalVersion);
+
+                    jOriginal.Remove(nameof(ContentItem.Published));
+                    jOriginal.Remove(nameof(ContentItem.Latest));
+
+                    if (JsonNode.DeepEquals(jImporting, jOriginal))
                     {
-                        // The version exists in the database.
-                        // It is important to only import changed items.
-                        // We compare the two versions and skip importing it if they are the same.
-                        // We do this to prevent unnecessary sql updates, and because UpdateContentItemVersionAsync
-                        // may remove drafts of updated items.
-                        // This is necessary because an imported item maybe set to latest, and published.
-                        // In this case, the draft item in the system, must be removed, or there will be two drafts.
-                        // The draft item should be removed, because it would now be orphaned, as the imported published item
-                        // would be further ahead, on a timeline, between the two.
-
-                        // var jImporting = JObject.FromObject(importingItem);
-                        var jImporting = JObject.FromObject(importingItem);
-
-                        // Removed Published and Latest from consideration when evaluating.
-                        // Otherwise an import of an unchanged (but published) version would overwrite a newer published version.
-                        jImporting.Remove(nameof(ContentItem.Published));
-                        jImporting.Remove(nameof(ContentItem.Latest));
-
-                        // var jOriginal = JObject.FromObject(originalVersion);
-                        var jOriginal = JObject.FromObject(originalVersion);
-
-                        jOriginal.Remove(nameof(ContentItem.Published));
-                        jOriginal.Remove(nameof(ContentItem.Latest));
-
-                        if (JsonNode.DeepEquals(jImporting, jOriginal))
-                        {
-                            _logger.LogInformation("Importing '{ContentItemVersionId}' skipped as it is unchanged", importingItem.ContentItemVersionId);
-                            continue;
-                        }
+                        _logger.LogInformation("Importing '{ContentItemVersionId}' skipped as it is unchanged", importingItem.ContentItemVersionId);
+                        continue;
+                    }
 
-                        // Handlers are only fired if the import is going ahead.
-                        var context = new ImportContentContext(importingItem, originalVersion);
+                    // Handlers are only fired if the import is going ahead.
+                    var context = new ImportContentContext(importingItem, originalVersion);
 
-                        await Handlers.InvokeAsync((handler, context) => handler.ImportingAsync(context), context, _logger);
+                    await Handlers.InvokeAsync((handler, context) => handler.ImportingAsync(context), context, _logger);
 
-                        var evictionVersions = versionsThatMaybeEvicted.Where(x => string.Equals(x.ContentItemId, importingItem.ContentItemId, StringComparison.OrdinalIgnoreCase));
-                        var result = await UpdateContentItemVersionAsync(originalVersion, importingItem, evictionVersions);
-                        if (!result.Succeeded)
+                    var evictionVersions = versionsThatMaybeEvicted.Where(x => string.Equals(x.ContentItemId, importingItem.ContentItemId, StringComparison.OrdinalIgnoreCase));
+                    var result = await UpdateContentItemVersionAsync(originalVersion, importingItem, evictionVersions);
+                    if (!result.Succeeded)
+                    {
+                        if (_logger.IsEnabled(LogLevel.Error))
                         {
-                            if (_logger.IsEnabled(LogLevel.Error))
-                            {
-                                _logger.LogError("Error importing content item version id '{ContentItemVersionId}' : '{Errors}'", importingItem.ContentItemVersionId, string.Join(", ", result.Errors));
-                            }
-
-                            throw new ValidationException(string.Join(", ", result.Errors));
+                            _logger.LogError("Error importing content item version id '{ContentItemVersionId}' : '{Errors}'", importingItem.ContentItemVersionId, string.Join(", ", result.Errors));
                         }
 
-                        // Imported handlers will only be fired if the validation has been successful.
-                        // Consumers should implement validated handlers to alter the success of that operation.
-                        await ReversedHandlers.InvokeAsync((handler, context) => handler.ImportedAsync(context), context, _logger);
+                        throw new ValidationException(string.Join(", ", result.Errors));
                     }
-                }
 
-                skip += _importBatchSize;
-                batchedContentItems = contentItems.Skip(skip).Take(_importBatchSize);
+                    // Imported handlers will only be fired if the validation has been successful.
+                    // Consumers should implement validated handlers to alter the success of that operation.
+                    await ReversedHandlers.InvokeAsync((handler, context) => handler.ImportedAsync(context), context, _logger);
+                }
             }
-        }
-
-        public async Task UpdateAsync(ContentItem contentItem)
-        {
-            ArgumentNullException.ThrowIfNull(contentItem);
-
-            var context = new UpdateContentContext(contentItem);
 
-            await Handlers.InvokeAsync((handler, context) => handler.UpdatingAsync(context), context, _logger);
-
-            await _session.SaveAsync(contentItem);
-
-            await ReversedHandlers.InvokeAsync((handler, context) => handler.UpdatedAsync(context), context, _logger);
+            skip += _importBatchSize;
+            batchedContentItems = contentItems.Skip(skip).Take(_importBatchSize);
         }
+    }
 
-        public async Task<ContentValidateResult> ValidateAsync(ContentItem contentItem)
-        {
-            ArgumentNullException.ThrowIfNull(contentItem);
+    public async Task UpdateAsync(ContentItem contentItem)
+    {
+        ArgumentNullException.ThrowIfNull(contentItem);
 
-            var validateContext = new ValidateContentContext(contentItem);
+        var context = new UpdateContentContext(contentItem);
 
-            await Handlers.InvokeAsync((handler, context) => handler.ValidatingAsync(context), validateContext, _logger);
+        await Handlers.InvokeAsync((handler, context) => handler.UpdatingAsync(context), context, _logger);
 
-            await ReversedHandlers.InvokeAsync((handler, context) => handler.ValidatedAsync(context), validateContext, _logger);
+        await _session.SaveAsync(contentItem);
 
-            if (!validateContext.ContentValidateResult.Succeeded)
-            {
-                await _session.CancelAsync();
-            }
+        await ReversedHandlers.InvokeAsync((handler, context) => handler.UpdatedAsync(context), context, _logger);
+    }
 
-            return validateContext.ContentValidateResult;
-        }
+    public async Task<ContentValidateResult> ValidateAsync(ContentItem contentItem)
+    {
+        ArgumentNullException.ThrowIfNull(contentItem);
 
-        public async Task<ContentValidateResult> RestoreAsync(ContentItem contentItem)
-        {
-            ArgumentNullException.ThrowIfNull(contentItem);
+        var validateContext = new ValidateContentContext(contentItem);
 
-            // Prepare record for restore.
-            // So that a new record will be created.
-            contentItem.Id = 0;
-            // So that a new version id will be generated.
-            contentItem.ContentItemVersionId = string.Empty;
-            contentItem.Latest = contentItem.Published = false;
+        await Handlers.InvokeAsync((handler, context) => handler.ValidatingAsync(context), validateContext, _logger);
 
-            var context = new RestoreContentContext(contentItem);
-            await Handlers.InvokeAsync((handler, context) => handler.RestoringAsync(context), context, _logger);
+        await ReversedHandlers.InvokeAsync((handler, context) => handler.ValidatedAsync(context), validateContext, _logger);
 
-            // Invoke save and fire update handlers.
-            await UpdateAsync(contentItem);
+        if (!validateContext.ContentValidateResult.Succeeded)
+        {
+            await _session.CancelAsync();
+        }
 
-            var validationResult = await ValidateAsync(contentItem);
-            if (!validationResult.Succeeded)
-            {
-                // The session is already cancelled.
-                return validationResult;
-            }
+        return validateContext.ContentValidateResult;
+    }
 
-            // Remove an existing draft but keep an existing published version.
-            var latestVersion = await _session.Query<ContentItem, ContentItemIndex>()
-                .Where(index => index.ContentItemId == contentItem.ContentItemId && index.Latest)
-                .FirstOrDefaultAsync();
+    public async Task<ContentValidateResult> RestoreAsync(ContentItem contentItem)
+    {
+        ArgumentNullException.ThrowIfNull(contentItem);
 
-            if (latestVersion != null)
-            {
-                latestVersion.Latest = false;
-                await _session.SaveAsync(latestVersion);
-            }
+        // Prepare record for restore.
+        // So that a new record will be created.
+        contentItem.Id = 0;
+        // So that a new version id will be generated.
+        contentItem.ContentItemVersionId = string.Empty;
+        contentItem.Latest = contentItem.Published = false;
 
-            await CreateAsync(contentItem, VersionOptions.Draft);
+        var context = new RestoreContentContext(contentItem);
+        await Handlers.InvokeAsync((handler, context) => handler.RestoringAsync(context), context, _logger);
 
-            await ReversedHandlers.InvokeAsync((handler, context) => handler.RestoredAsync(context), context, _logger);
+        // Invoke save and fire update handlers.
+        await UpdateAsync(contentItem);
 
+        var validationResult = await ValidateAsync(contentItem);
+        if (!validationResult.Succeeded)
+        {
+            // The session is already cancelled.
             return validationResult;
         }
 
-        public async Task<TAspect> PopulateAspectAsync<TAspect>(IContent content, TAspect aspect)
-        {
-            ArgumentNullException.ThrowIfNull(content);
-            ArgumentNullException.ThrowIfNull(aspect);
+        // Remove an existing draft but keep an existing published version.
+        var latestVersion = await _session.Query<ContentItem, ContentItemIndex>()
+            .Where(index => index.ContentItemId == contentItem.ContentItemId && index.Latest)
+            .FirstOrDefaultAsync();
 
-            var context = new ContentItemAspectContext
-            {
-                ContentItem = content.ContentItem,
-                Aspect = aspect
-            };
+        if (latestVersion != null)
+        {
+            latestVersion.Latest = false;
+            await _session.SaveAsync(latestVersion);
+        }
 
-            await Handlers.InvokeAsync((handler, context) => handler.GetContentItemAspectAsync(context), context, _logger);
+        await CreateAsync(contentItem, VersionOptions.Draft);
 
-            return aspect;
-        }
+        await ReversedHandlers.InvokeAsync((handler, context) => handler.RestoredAsync(context), context, _logger);
 
-        public async Task RemoveAsync(ContentItem contentItem)
-        {
-            ArgumentNullException.ThrowIfNull(contentItem);
+        return validationResult;
+    }
 
-            var activeVersions = await _session.Query<ContentItem, ContentItemIndex>()
-                .Where(x =>
-                    x.ContentItemId == contentItem.ContentItemId &&
-                    (x.Published || x.Latest)).ListAsync();
+    public async Task<TAspect> PopulateAspectAsync<TAspect>(IContent content, TAspect aspect)
+    {
+        ArgumentNullException.ThrowIfNull(content);
+        ArgumentNullException.ThrowIfNull(aspect);
 
-            if (!activeVersions.Any())
-            {
-                return;
-            }
+        var context = new ContentItemAspectContext
+        {
+            ContentItem = content.ContentItem,
+            Aspect = aspect
+        };
 
-            var context = new RemoveContentContext(contentItem, true);
+        await Handlers.InvokeAsync((handler, context) => handler.GetContentItemAspectAsync(context), context, _logger);
 
-            await Handlers.InvokeAsync((handler, context) => handler.RemovingAsync(context), context, _logger);
+        return aspect;
+    }
 
-            foreach (var version in activeVersions)
-            {
-                version.Published = false;
-                version.Latest = false;
-                await _session.SaveAsync(version);
-            }
+    public async Task RemoveAsync(ContentItem contentItem)
+    {
+        ArgumentNullException.ThrowIfNull(contentItem);
 
-            await ReversedHandlers.InvokeAsync((handler, context) => handler.RemovedAsync(context), context, _logger);
-        }
+        var activeVersions = await _session.Query<ContentItem, ContentItemIndex>()
+            .Where(x =>
+                x.ContentItemId == contentItem.ContentItemId &&
+                (x.Published || x.Latest)).ListAsync();
 
-        public async Task DiscardDraftAsync(ContentItem contentItem)
+        if (!activeVersions.Any())
         {
-            ArgumentNullException.ThrowIfNull(contentItem);
-
-            if (contentItem.Published || !contentItem.Latest)
-            {
-                throw new InvalidOperationException("Not a draft version.");
-            }
+            return;
+        }
 
-            var publishedItem = await GetAsync(contentItem.ContentItemId, VersionOptions.Published);
+        var context = new RemoveContentContext(contentItem, true);
 
-            var context = new RemoveContentContext(contentItem, publishedItem == null);
+        await Handlers.InvokeAsync((handler, context) => handler.RemovingAsync(context), context, _logger);
 
-            await Handlers.InvokeAsync((handler, context) => handler.RemovingAsync(context), context, _logger);
+        foreach (var version in activeVersions)
+        {
+            version.Published = false;
+            version.Latest = false;
+            await _session.SaveAsync(version);
+        }
 
-            contentItem.Latest = false;
-            await _session.SaveAsync(contentItem);
+        await ReversedHandlers.InvokeAsync((handler, context) => handler.RemovedAsync(context), context, _logger);
+    }
 
-            await ReversedHandlers.InvokeAsync((handler, context) => handler.RemovedAsync(context), context, _logger);
+    public async Task DiscardDraftAsync(ContentItem contentItem)
+    {
+        ArgumentNullException.ThrowIfNull(contentItem);
 
-            if (publishedItem != null)
-            {
-                publishedItem.Latest = true;
-                await _session.SaveAsync(publishedItem);
-            }
+        if (contentItem.Published || !contentItem.Latest)
+        {
+            throw new InvalidOperationException("Not a draft version.");
         }
 
-        public async Task<ContentItem> CloneAsync(ContentItem contentItem)
-        {
-            ArgumentNullException.ThrowIfNull(contentItem);
+        var publishedItem = await GetAsync(contentItem.ContentItemId, VersionOptions.Published);
 
-            var cloneContentItem = await NewAsync(contentItem.ContentType);
-            cloneContentItem.DisplayText = contentItem.DisplayText;
-            await CreateAsync(cloneContentItem, VersionOptions.Draft);
+        var context = new RemoveContentContext(contentItem, publishedItem == null);
 
-            var context = new CloneContentContext(contentItem, cloneContentItem);
+        await Handlers.InvokeAsync((handler, context) => handler.RemovingAsync(context), context, _logger);
 
-            context.CloneContentItem.Data = contentItem.Data.Clone();
+        contentItem.Latest = false;
+        await _session.SaveAsync(contentItem);
 
-            await Handlers.InvokeAsync((handler, context) => handler.CloningAsync(context), context, _logger);
+        await ReversedHandlers.InvokeAsync((handler, context) => handler.RemovedAsync(context), context, _logger);
 
-            await _session.SaveAsync(context.CloneContentItem);
+        if (publishedItem != null)
+        {
+            publishedItem.Latest = true;
+            await _session.SaveAsync(publishedItem);
+        }
+    }
 
-            await ReversedHandlers.InvokeAsync((handler, context) => handler.ClonedAsync(context), context, _logger);
+    public async Task<ContentItem> CloneAsync(ContentItem contentItem)
+    {
+        ArgumentNullException.ThrowIfNull(contentItem);
 
-            return context.CloneContentItem;
-        }
+        var cloneContentItem = await NewAsync(contentItem.ContentType);
+        cloneContentItem.DisplayText = contentItem.DisplayText;
+        await CreateAsync(cloneContentItem, VersionOptions.Draft);
 
-        private async Task<ContentValidateResult> CreateContentItemVersionAsync(ContentItem contentItem, IEnumerable<ContentItem> evictionVersions = null)
-        {
-            if (string.IsNullOrEmpty(contentItem.ContentItemId))
-            {
-                // NewAsync should be used to create new content items.
-                throw new InvalidOperationException($"The content item is missing a '{nameof(ContentItem.ContentItemId)}'.");
-            }
+        var context = new CloneContentContext(contentItem, cloneContentItem);
 
-            // Initializes the Id as it could be interpreted as an updated object when added back to YesSql
-            contentItem.Id = 0;
+        context.CloneContentItem.Data = contentItem.Data.Clone();
 
-            // Maintain modified and published dates as these will be reset by the Create Handlers
-            var modifiedUtc = contentItem.ModifiedUtc;
-            var publishedUtc = contentItem.PublishedUtc;
-            var owner = contentItem.Owner;
-            var author = contentItem.Author;
+        await Handlers.InvokeAsync((handler, context) => handler.CloningAsync(context), context, _logger);
 
-            if (string.IsNullOrEmpty(contentItem.ContentItemVersionId))
-            {
-                contentItem.ContentItemVersionId = _idGenerator.GenerateUniqueId(contentItem);
-            }
+        await _session.SaveAsync(context.CloneContentItem);
 
-            // Remove previous latest item or they will continue to be listed as latest.
-            // When importing a new draft the existing latest must be set to false. The creating version wins.
-            if (contentItem.Latest && !contentItem.Published)
-            {
-                await RemoveLatestVersionAsync(contentItem, evictionVersions);
-            }
-            else if (contentItem.Published)
-            {
-                // When importing a published item existing drafts and existing published must be removed.
-                // Otherwise an existing draft would become an orphan and if published would overwrite
-                // the imported (which we assume is the version that wins) content.
-                await RemoveVersionsAsync(contentItem, evictionVersions);
-            }
-            // When neither published or latest the operation will create a database record
-            // which will be part of the content item archive.
+        await ReversedHandlers.InvokeAsync((handler, context) => handler.ClonedAsync(context), context, _logger);
 
-            // Invoked create handlers.
-            var context = new CreateContentContext(contentItem);
-            await Handlers.InvokeAsync((handler, context) => handler.CreatingAsync(context), context, _logger);
+        return context.CloneContentItem;
+    }
 
-            // The content item should be placed in the session store so that further calls
-            // to ContentManager.Get by a scoped index provider will resolve the imported item correctly.
-            await _session.SaveAsync(contentItem);
-            _contentManagerSession.Store(contentItem);
+    private async Task<ContentValidateResult> CreateContentItemVersionAsync(ContentItem contentItem, IEnumerable<ContentItem> evictionVersions = null)
+    {
+        if (string.IsNullOrEmpty(contentItem.ContentItemId))
+        {
+            // NewAsync should be used to create new content items.
+            throw new InvalidOperationException($"The content item is missing a '{nameof(ContentItem.ContentItemId)}'.");
+        }
 
-            await ReversedHandlers.InvokeAsync((handler, context) => handler.CreatedAsync(context), context, _logger);
+        // Initializes the Id as it could be interpreted as an updated object when added back to YesSql
+        contentItem.Id = 0;
 
-            await UpdateAsync(contentItem);
+        // Maintain modified and published dates as these will be reset by the Create Handlers
+        var modifiedUtc = contentItem.ModifiedUtc;
+        var publishedUtc = contentItem.PublishedUtc;
+        var owner = contentItem.Owner;
+        var author = contentItem.Author;
 
-            var result = await ValidateAsync(contentItem);
-            if (!result.Succeeded)
-            {
-                return result;
-            }
+        if (string.IsNullOrEmpty(contentItem.ContentItemVersionId))
+        {
+            contentItem.ContentItemVersionId = _idGenerator.GenerateUniqueId(contentItem);
+        }
 
-            if (contentItem.Published)
-            {
-                // Invoke published handlers to add information to persistent stores
-                var publishContext = new PublishContentContext(contentItem, null);
+        // Remove previous latest item or they will continue to be listed as latest.
+        // When importing a new draft the existing latest must be set to false. The creating version wins.
+        if (contentItem.Latest && !contentItem.Published)
+        {
+            await RemoveLatestVersionAsync(contentItem, evictionVersions);
+        }
+        else if (contentItem.Published)
+        {
+            // When importing a published item existing drafts and existing published must be removed.
+            // Otherwise an existing draft would become an orphan and if published would overwrite
+            // the imported (which we assume is the version that wins) content.
+            await RemoveVersionsAsync(contentItem, evictionVersions);
+        }
+        // When neither published or latest the operation will create a database record
+        // which will be part of the content item archive.
 
-                await Handlers.InvokeAsync((handler, context) => handler.PublishingAsync(context), publishContext, _logger);
-                await ReversedHandlers.InvokeAsync((handler, context) => handler.PublishedAsync(context), publishContext, _logger);
-            }
-            else
-            {
-                await SaveDraftAsync(contentItem);
-            }
+        // Invoked create handlers.
+        var context = new CreateContentContext(contentItem);
+        await Handlers.InvokeAsync((handler, context) => handler.CreatingAsync(context), context, _logger);
 
-            // Restore values that may have been altered by handlers.
-            if (modifiedUtc.HasValue)
-            {
-                contentItem.ModifiedUtc = modifiedUtc;
-            }
-            if (publishedUtc.HasValue)
-            {
-                contentItem.PublishedUtc = publishedUtc;
-            }
+        // The content item should be placed in the session store so that further calls
+        // to ContentManager.Get by a scoped index provider will resolve the imported item correctly.
+        await _session.SaveAsync(contentItem);
+        _contentManagerSession.Store(contentItem);
 
-            // There is a risk here that the owner or author does not exist in the importing system.
-            // We check that at least a value has been supplied, if not the owner property and author
-            // property would be left as the user who has run this import.
-            if (!string.IsNullOrEmpty(owner))
-            {
-                contentItem.Owner = owner;
-            }
+        await ReversedHandlers.InvokeAsync((handler, context) => handler.CreatedAsync(context), context, _logger);
 
-            if (!string.IsNullOrEmpty(author))
-            {
-                contentItem.Author = author;
-            }
+        await UpdateAsync(contentItem);
 
+        var result = await ValidateAsync(contentItem);
+        if (!result.Succeeded)
+        {
             return result;
         }
 
-        private async Task<ContentValidateResult> UpdateContentItemVersionAsync(ContentItem updatingVersion, ContentItem updatedVersion, IEnumerable<ContentItem> evictionVersions = null)
+        if (contentItem.Published)
         {
-            // Replaces the id to force the current item to be updated
-            updatingVersion.Id = updatedVersion.Id;
+            // Invoke published handlers to add information to persistent stores
+            var publishContext = new PublishContentContext(contentItem, null);
 
-            var modifiedUtc = updatedVersion.ModifiedUtc;
-            var publishedUtc = updatedVersion.PublishedUtc;
+            await Handlers.InvokeAsync((handler, context) => handler.PublishingAsync(context), publishContext, _logger);
+            await ReversedHandlers.InvokeAsync((handler, context) => handler.PublishedAsync(context), publishContext, _logger);
+        }
+        else
+        {
+            await SaveDraftAsync(contentItem);
+        }
 
-            // Remove previous published or draft items if necessary or they will continue to be listed as published or draft.
-            var discardLatest = false;
-            var removePublished = false;
+        // Restore values that may have been altered by handlers.
+        if (modifiedUtc.HasValue)
+        {
+            contentItem.ModifiedUtc = modifiedUtc;
+        }
+        if (publishedUtc.HasValue)
+        {
+            contentItem.PublishedUtc = publishedUtc;
+        }
 
-            var importingLatest = updatedVersion.Latest;
-            var existingLatest = updatingVersion.Latest;
+        // There is a risk here that the owner or author does not exist in the importing system.
+        // We check that at least a value has been supplied, if not the owner property and author
+        // property would be left as the user who has run this import.
+        if (!string.IsNullOrEmpty(owner))
+        {
+            contentItem.Owner = owner;
+        }
 
-            // If latest values do not match and importing latest is true then we must find and evict the previous latest.
-            if (importingLatest != existingLatest && importingLatest == true)
-            {
-                discardLatest = true;
-            }
+        if (!string.IsNullOrEmpty(author))
+        {
+            contentItem.Author = author;
+        }
 
-            var importingPublished = updatedVersion.Published;
-            var existingPublished = updatingVersion.Published;
+        return result;
+    }
 
-            // If published values do not match and importing published is true then we must find and evict the previous published
-            // This is when the existing content item version is not published, but the importing version is set to published.
-            // For this to occur there must have been a draft made, and the mutation to published is being made on the draft.
-            if (importingPublished != existingPublished && importingPublished == true)
-            {
-                removePublished = true;
-            }
+    private async Task<ContentValidateResult> UpdateContentItemVersionAsync(ContentItem updatingVersion, ContentItem updatedVersion, IEnumerable<ContentItem> evictionVersions = null)
+    {
+        // Replaces the id to force the current item to be updated
+        updatingVersion.Id = updatedVersion.Id;
 
-            if (discardLatest && removePublished)
-            {
-                await RemoveVersionsAsync(updatingVersion, evictionVersions);
-            }
-            else if (discardLatest)
-            {
-                await RemoveLatestVersionAsync(updatingVersion, evictionVersions);
-            }
-            else if (removePublished)
-            {
-                await RemovePublishedVersionAsync(updatingVersion, evictionVersions);
-            }
+        var modifiedUtc = updatedVersion.ModifiedUtc;
+        var publishedUtc = updatedVersion.PublishedUtc;
 
-            updatingVersion.Merge(updatedVersion, _updateJsonMergeSettings);
-            updatingVersion.Latest = importingLatest;
-            updatingVersion.Published = importingPublished;
+        // Remove previous published or draft items if necessary or they will continue to be listed as published or draft.
+        var discardLatest = false;
+        var removePublished = false;
 
-            await UpdateAsync(updatingVersion);
-            var result = await ValidateAsync(updatingVersion);
+        var importingLatest = updatedVersion.Latest;
+        var existingLatest = updatingVersion.Latest;
 
-            // Session is cancelled now so previous updates to versions are cancelled also.
-            if (!result.Succeeded)
-            {
-                return result;
-            }
+        // If latest values do not match and importing latest is true then we must find and evict the previous latest.
+        if (importingLatest != existingLatest && importingLatest == true)
+        {
+            discardLatest = true;
+        }
 
-            if (importingPublished)
-            {
-                // Invoke published handlers to add information to persistent stores
-                var publishContext = new PublishContentContext(updatingVersion, null);
+        var importingPublished = updatedVersion.Published;
+        var existingPublished = updatingVersion.Published;
 
-                await Handlers.InvokeAsync((handler, context) => handler.PublishingAsync(context), publishContext, _logger);
-                await ReversedHandlers.InvokeAsync((handler, context) => handler.PublishedAsync(context), publishContext, _logger);
-            }
-            else
-            {
-                await SaveDraftAsync(updatingVersion);
-            }
+        // If published values do not match and importing published is true then we must find and evict the previous published
+        // This is when the existing content item version is not published, but the importing version is set to published.
+        // For this to occur there must have been a draft made, and the mutation to published is being made on the draft.
+        if (importingPublished != existingPublished && importingPublished == true)
+        {
+            removePublished = true;
+        }
 
-            // Restore values that may have been altered by handlers.
-            if (modifiedUtc.HasValue)
-            {
-                updatingVersion.ModifiedUtc = modifiedUtc;
-            }
+        if (discardLatest && removePublished)
+        {
+            await RemoveVersionsAsync(updatingVersion, evictionVersions);
+        }
+        else if (discardLatest)
+        {
+            await RemoveLatestVersionAsync(updatingVersion, evictionVersions);
+        }
+        else if (removePublished)
+        {
+            await RemovePublishedVersionAsync(updatingVersion, evictionVersions);
+        }
 
-            if (publishedUtc.HasValue)
-            {
-                updatingVersion.PublishedUtc = publishedUtc;
-            }
+        updatingVersion.Merge(updatedVersion, _updateJsonMergeSettings);
+        updatingVersion.Latest = importingLatest;
+        updatingVersion.Published = importingPublished;
 
+        await UpdateAsync(updatingVersion);
+        var result = await ValidateAsync(updatingVersion);
+
+        // Session is cancelled now so previous updates to versions are cancelled also.
+        if (!result.Succeeded)
+        {
             return result;
         }
 
-        private async Task RemoveLatestVersionAsync(ContentItem contentItem, IEnumerable<ContentItem> evictionVersions)
+        if (importingPublished)
         {
-            ContentItem latestVersion;
-            if (evictionVersions == null)
-            {
-                latestVersion = await _session.Query<ContentItem, ContentItemIndex>()
-                    .Where(x => x.ContentItemId == contentItem.ContentItemId && x.Latest)
-                    .FirstOrDefaultAsync();
-            }
-            else
-            {
-                latestVersion = evictionVersions.FirstOrDefault(x => x.Latest);
-            }
+            // Invoke published handlers to add information to persistent stores
+            var publishContext = new PublishContentContext(updatingVersion, null);
 
-            if (latestVersion != null)
-            {
-                var publishedVersion = evictionVersions?.FirstOrDefault(x => x.Published);
+            await Handlers.InvokeAsync((handler, context) => handler.PublishingAsync(context), publishContext, _logger);
+            await ReversedHandlers.InvokeAsync((handler, context) => handler.PublishedAsync(context), publishContext, _logger);
+        }
+        else
+        {
+            await SaveDraftAsync(updatingVersion);
+        }
 
-                var removeContext = new RemoveContentContext(contentItem, publishedVersion == null);
+        // Restore values that may have been altered by handlers.
+        if (modifiedUtc.HasValue)
+        {
+            updatingVersion.ModifiedUtc = modifiedUtc;
+        }
 
-                await Handlers.InvokeAsync((handler, context) => handler.RemovingAsync(context), removeContext, _logger);
+        if (publishedUtc.HasValue)
+        {
+            updatingVersion.PublishedUtc = publishedUtc;
+        }
 
-                latestVersion.Latest = false;
-                await _session.SaveAsync(latestVersion);
+        return result;
+    }
 
-                await ReversedHandlers.InvokeAsync((handler, context) => handler.RemovedAsync(context), removeContext, _logger);
-            }
+    private async Task RemoveLatestVersionAsync(ContentItem contentItem, IEnumerable<ContentItem> evictionVersions)
+    {
+        ContentItem latestVersion;
+        if (evictionVersions == null)
+        {
+            latestVersion = await _session.Query<ContentItem, ContentItemIndex>()
+                .Where(x => x.ContentItemId == contentItem.ContentItemId && x.Latest)
+                .FirstOrDefaultAsync();
+        }
+        else
+        {
+            latestVersion = evictionVersions.FirstOrDefault(x => x.Latest);
         }
 
-        private async Task RemovePublishedVersionAsync(ContentItem contentItem, IEnumerable<ContentItem> evictionVersions)
+        if (latestVersion != null)
         {
-            ContentItem publishedVersion;
-            if (evictionVersions == null)
-            {
-                publishedVersion = await _session.Query<ContentItem, ContentItemIndex>()
-                    .Where(x => x.ContentItemId == contentItem.ContentItemId && x.Published)
-                    .FirstOrDefaultAsync();
-            }
-            else
-            {
-                publishedVersion = evictionVersions.FirstOrDefault(x => x.Published);
-            }
+            var publishedVersion = evictionVersions?.FirstOrDefault(x => x.Published);
 
-            if (publishedVersion != null)
-            {
-                var removeContext = new RemoveContentContext(contentItem, true);
+            var removeContext = new RemoveContentContext(contentItem, publishedVersion == null);
 
-                await Handlers.InvokeAsync((handler, context) => handler.RemovingAsync(context), removeContext, _logger);
+            await Handlers.InvokeAsync((handler, context) => handler.RemovingAsync(context), removeContext, _logger);
 
-                publishedVersion.Published = false;
-                await _session.SaveAsync(publishedVersion);
+            latestVersion.Latest = false;
+            await _session.SaveAsync(latestVersion);
 
-                await ReversedHandlers.InvokeAsync((handler, context) => handler.RemovedAsync(context), removeContext, _logger);
-            }
+            await ReversedHandlers.InvokeAsync((handler, context) => handler.RemovedAsync(context), removeContext, _logger);
         }
+    }
 
-        private async Task RemoveVersionsAsync(ContentItem contentItem, IEnumerable<ContentItem> evictionVersions)
+    private async Task RemovePublishedVersionAsync(ContentItem contentItem, IEnumerable<ContentItem> evictionVersions)
+    {
+        ContentItem publishedVersion;
+        if (evictionVersions == null)
         {
-            IEnumerable<ContentItem> activeVersions;
-            if (evictionVersions == null)
-            {
-                activeVersions = await _session.Query<ContentItem, ContentItemIndex>()
-                    .Where(x =>
-                        x.ContentItemId == contentItem.ContentItemId &&
-                        (x.Published || x.Latest)).ListAsync();
-            }
-            else
-            {
-                activeVersions = evictionVersions.Where(x => x.Latest || x.Published);
-            }
+            publishedVersion = await _session.Query<ContentItem, ContentItemIndex>()
+                .Where(x => x.ContentItemId == contentItem.ContentItemId && x.Published)
+                .FirstOrDefaultAsync();
+        }
+        else
+        {
+            publishedVersion = evictionVersions.FirstOrDefault(x => x.Published);
+        }
 
-            if (activeVersions.Any())
-            {
-                var removeContext = new RemoveContentContext(contentItem, true);
+        if (publishedVersion != null)
+        {
+            var removeContext = new RemoveContentContext(contentItem, true);
 
-                await Handlers.InvokeAsync((handler, context) => handler.RemovingAsync(context), removeContext, _logger);
+            await Handlers.InvokeAsync((handler, context) => handler.RemovingAsync(context), removeContext, _logger);
 
-                foreach (var version in activeVersions)
-                {
-                    version.Published = false;
-                    version.Latest = false;
-                    await _session.SaveAsync(version);
-                }
+            publishedVersion.Published = false;
+            await _session.SaveAsync(publishedVersion);
+
+            await ReversedHandlers.InvokeAsync((handler, context) => handler.RemovedAsync(context), removeContext, _logger);
+        }
+    }
+
+    private async Task RemoveVersionsAsync(ContentItem contentItem, IEnumerable<ContentItem> evictionVersions)
+    {
+        IEnumerable<ContentItem> activeVersions;
+        if (evictionVersions == null)
+        {
+            activeVersions = await _session.Query<ContentItem, ContentItemIndex>()
+                .Where(x =>
+                    x.ContentItemId == contentItem.ContentItemId &&
+                    (x.Published || x.Latest)).ListAsync();
+        }
+        else
+        {
+            activeVersions = evictionVersions.Where(x => x.Latest || x.Published);
+        }
+
+        if (activeVersions.Any())
+        {
+            var removeContext = new RemoveContentContext(contentItem, true);
+
+            await Handlers.InvokeAsync((handler, context) => handler.RemovingAsync(context), removeContext, _logger);
 
-                await ReversedHandlers.InvokeAsync((handler, context) => handler.RemovedAsync(context), removeContext, _logger);
+            foreach (var version in activeVersions)
+            {
+                version.Published = false;
+                version.Latest = false;
+                await _session.SaveAsync(version);
             }
+
+            await ReversedHandlers.InvokeAsync((handler, context) => handler.RemovedAsync(context), removeContext, _logger);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentManagerSession.cs b/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentManagerSession.cs
index 093c90d7688..17882f9c5e5 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentManagerSession.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentManagerSession.cs
@@ -1,58 +1,57 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public class DefaultContentManagerSession : IContentManagerSession
 {
-    public class DefaultContentManagerSession : IContentManagerSession
-    {
-        private readonly Dictionary<long, ContentItem> _itemByVersionId = [];
-        private readonly Dictionary<string, ContentItem> _publishedItemsById = [];
+    private readonly Dictionary<long, ContentItem> _itemByVersionId = [];
+    private readonly Dictionary<string, ContentItem> _publishedItemsById = [];
 
-        private bool _hasItems;
+    private bool _hasItems;
+
+    public void Store(ContentItem item)
+    {
+        _hasItems = true;
 
-        public void Store(ContentItem item)
+        // Don't fail to re-add an item if it is the same instance.
+        if (!_itemByVersionId.TryGetValue(item.Id, out var existing) || existing != item)
         {
-            _hasItems = true;
-
-            // Don't fail to re-add an item if it is the same instance.
-            if (!_itemByVersionId.TryGetValue(item.Id, out var existing) || existing != item)
-            {
-                _itemByVersionId.Add(item.Id, item);
-            }
-
-            // Is it the Published version?
-            if (item.Published)
-            {
-                _publishedItemsById[item.ContentItemId] = item;
-            }
+            _itemByVersionId.Add(item.Id, item);
         }
 
-        public bool RecallVersionId(long id, out ContentItem item)
+        // Is it the Published version?
+        if (item.Published)
         {
-            if (!_hasItems)
-            {
-                item = null;
-                return false;
-            }
-
-            return _itemByVersionId.TryGetValue(id, out item);
+            _publishedItemsById[item.ContentItemId] = item;
         }
+    }
 
-        public bool RecallPublishedItemId(string id, out ContentItem item)
+    public bool RecallVersionId(long id, out ContentItem item)
+    {
+        if (!_hasItems)
         {
-            if (!_hasItems)
-            {
-                item = null;
-                return false;
-            }
-
-            return _publishedItemsById.TryGetValue(id, out item);
+            item = null;
+            return false;
         }
 
-        public void Clear()
+        return _itemByVersionId.TryGetValue(id, out item);
+    }
+
+    public bool RecallPublishedItemId(string id, out ContentItem item)
+    {
+        if (!_hasItems)
         {
-            _itemByVersionId.Clear();
-            _publishedItemsById.Clear();
-            _hasItems = false;
+            item = null;
+            return false;
         }
+
+        return _publishedItemsById.TryGetValue(id, out item);
+    }
+
+    public void Clear()
+    {
+        _itemByVersionId.Clear();
+        _publishedItemsById.Clear();
+        _hasItems = false;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/FileContentDefinitionStore.cs b/src/OrchardCore/OrchardCore.ContentManagement/FileContentDefinitionStore.cs
index 62f23f3b06e..514e799e8a0 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/FileContentDefinitionStore.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/FileContentDefinitionStore.cs
@@ -3,24 +3,23 @@
 using OrchardCore.Data.Documents;
 using OrchardCore.Documents;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public class FileContentDefinitionStore : IContentDefinitionStore
 {
-    public class FileContentDefinitionStore : IContentDefinitionStore
-    {
-        private readonly IDocumentManager<IFileDocumentStore, ContentDefinitionRecord> _documentManager;
+    private readonly IDocumentManager<IFileDocumentStore, ContentDefinitionRecord> _documentManager;
 
-        public FileContentDefinitionStore(IDocumentManager<IFileDocumentStore, ContentDefinitionRecord> documentManager)
-        {
-            _documentManager = documentManager;
-        }
+    public FileContentDefinitionStore(IDocumentManager<IFileDocumentStore, ContentDefinitionRecord> documentManager)
+    {
+        _documentManager = documentManager;
+    }
 
-        /// <inheritdoc />
-        public Task<ContentDefinitionRecord> LoadContentDefinitionAsync() => _documentManager.GetOrCreateMutableAsync();
+    /// <inheritdoc />
+    public Task<ContentDefinitionRecord> LoadContentDefinitionAsync() => _documentManager.GetOrCreateMutableAsync();
 
-        /// <inheritdoc />
-        public Task<ContentDefinitionRecord> GetContentDefinitionAsync() => _documentManager.GetOrCreateImmutableAsync();
+    /// <inheritdoc />
+    public Task<ContentDefinitionRecord> GetContentDefinitionAsync() => _documentManager.GetOrCreateImmutableAsync();
 
-        /// <inheritdoc />
-        public Task SaveContentDefinitionAsync(ContentDefinitionRecord contentDefinitionRecord) => _documentManager.UpdateAsync(contentDefinitionRecord);
-    }
+    /// <inheritdoc />
+    public Task SaveContentDefinitionAsync(ContentDefinitionRecord contentDefinitionRecord) => _documentManager.UpdateAsync(contentDefinitionRecord);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/GenericTypeActivator.cs b/src/OrchardCore/OrchardCore.ContentManagement/GenericTypeActivator.cs
index c66b9051c76..4aab51b9d8e 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/GenericTypeActivator.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/GenericTypeActivator.cs
@@ -1,16 +1,15 @@
 using System;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+internal sealed class GenericTypeActivator<T, TInstance> : ITypeActivator<TInstance> where T : TInstance, new()
 {
-    internal sealed class GenericTypeActivator<T, TInstance> : ITypeActivator<TInstance> where T : TInstance, new()
-    {
-        /// <inheritdoc />
-        public Type Type => typeof(T);
+    /// <inheritdoc />
+    public Type Type => typeof(T);
 
-        /// <inheritdoc />
-        public TInstance CreateInstance()
-        {
-            return new T();
-        }
+    /// <inheritdoc />
+    public TInstance CreateInstance()
+    {
+        return new T();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/Handlers/ContentFieldHandlerResolver.cs b/src/OrchardCore/OrchardCore.ContentManagement/Handlers/ContentFieldHandlerResolver.cs
index 142a097aa9e..f7acf2cc948 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/Handlers/ContentFieldHandlerResolver.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/Handlers/ContentFieldHandlerResolver.cs
@@ -3,35 +3,34 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class ContentFieldHandlerResolver : IContentFieldHandlerResolver
 {
-    public class ContentFieldHandlerResolver : IContentFieldHandlerResolver
+    private readonly IServiceProvider _serviceProvider;
+    private readonly ContentOptions _contentOptions;
+
+    public ContentFieldHandlerResolver(
+        IServiceProvider serviceProvider,
+        IOptions<ContentOptions> contentDisplayOptions
+        )
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly ContentOptions _contentOptions;
+        _serviceProvider = serviceProvider;
+        _contentOptions = contentDisplayOptions.Value;
+    }
 
-        public ContentFieldHandlerResolver(
-            IServiceProvider serviceProvider,
-            IOptions<ContentOptions> contentDisplayOptions
-            )
-        {
-            _serviceProvider = serviceProvider;
-            _contentOptions = contentDisplayOptions.Value;
-        }
+    public IList<IContentFieldHandler> GetHandlers(string fieldName)
+    {
+        var services = new List<IContentFieldHandler>();
 
-        public IList<IContentFieldHandler> GetHandlers(string fieldName)
+        if (_contentOptions.ContentFieldOptionsLookup.TryGetValue(fieldName, out var contentFieldOption))
         {
-            var services = new List<IContentFieldHandler>();
-
-            if (_contentOptions.ContentFieldOptionsLookup.TryGetValue(fieldName, out var contentFieldOption))
+            foreach (var handlerOption in contentFieldOption.Handlers)
             {
-                foreach (var handlerOption in contentFieldOption.Handlers)
-                {
-                    services.Add((IContentFieldHandler)_serviceProvider.GetRequiredService(handlerOption));
-                }
+                services.Add((IContentFieldHandler)_serviceProvider.GetRequiredService(handlerOption));
             }
-
-            return services;
         }
+
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/Handlers/ContentPartHandlerCoordinator.cs b/src/OrchardCore/OrchardCore.ContentManagement/Handlers/ContentPartHandlerCoordinator.cs
index e87d803e331..ec05f903e72 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/Handlers/ContentPartHandlerCoordinator.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/Handlers/ContentPartHandlerCoordinator.cs
@@ -4,520 +4,519 @@
 using OrchardCore.ContentManagement.Metadata;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+/// <summary>
+/// This component coordinates how parts are affecting content items.
+/// </summary>
+public class ContentPartHandlerCoordinator : ContentHandlerBase
 {
-    /// <summary>
-    /// This component coordinates how parts are affecting content items.
-    /// </summary>
-    public class ContentPartHandlerCoordinator : ContentHandlerBase
+    private readonly IContentPartHandlerResolver _contentPartHandlerResolver;
+    private readonly IContentFieldHandlerResolver _contentFieldHandlerResolver;
+    private readonly ITypeActivatorFactory<ContentPart> _contentPartFactory;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ITypeActivatorFactory<ContentField> _contentFieldFactory;
+    private readonly ILogger _logger;
+
+    public ContentPartHandlerCoordinator(
+        IContentPartHandlerResolver contentPartHandlerResolver,
+        IContentFieldHandlerResolver contentFieldHandlerResolver,
+        ITypeActivatorFactory<ContentPart> contentPartFactory,
+        ITypeActivatorFactory<ContentField> contentFieldFactory,
+        IContentDefinitionManager contentDefinitionManager,
+        ILogger<ContentPartHandlerCoordinator> logger)
     {
-        private readonly IContentPartHandlerResolver _contentPartHandlerResolver;
-        private readonly IContentFieldHandlerResolver _contentFieldHandlerResolver;
-        private readonly ITypeActivatorFactory<ContentPart> _contentPartFactory;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly ITypeActivatorFactory<ContentField> _contentFieldFactory;
-        private readonly ILogger _logger;
-
-        public ContentPartHandlerCoordinator(
-            IContentPartHandlerResolver contentPartHandlerResolver,
-            IContentFieldHandlerResolver contentFieldHandlerResolver,
-            ITypeActivatorFactory<ContentPart> contentPartFactory,
-            ITypeActivatorFactory<ContentField> contentFieldFactory,
-            IContentDefinitionManager contentDefinitionManager,
-            ILogger<ContentPartHandlerCoordinator> logger)
-        {
-            _contentPartHandlerResolver = contentPartHandlerResolver;
-            _contentFieldHandlerResolver = contentFieldHandlerResolver;
-            _contentPartFactory = contentPartFactory;
-            _contentFieldFactory = contentFieldFactory;
-            _contentDefinitionManager = contentDefinitionManager;
-            _logger = logger;
-        }
+        _contentPartHandlerResolver = contentPartHandlerResolver;
+        _contentFieldHandlerResolver = contentFieldHandlerResolver;
+        _contentPartFactory = contentPartFactory;
+        _contentFieldFactory = contentFieldFactory;
+        _contentDefinitionManager = contentDefinitionManager;
+        _logger = logger;
+    }
 
-        public override Task ActivatingAsync(ActivatingContentContext context)
-        {
-            // This method is called on New()
-            // Adds all the parts to a content item based on the content type definition.
-            // When a part/field does not exists, we create the part from it's known type or from a generic one
-            var fieldContext = new ActivatingContentFieldContext(context.ContentItem);
-
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.ActivatingAsync(context, part),
-                (handler, context, field) => handler.ActivatingAsync(fieldContext, field),
-                createPartIfNotExists: true,
-                createFieldIfNotExists: true);
-        }
+    public override Task ActivatingAsync(ActivatingContentContext context)
+    {
+        // This method is called on New()
+        // Adds all the parts to a content item based on the content type definition.
+        // When a part/field does not exists, we create the part from it's known type or from a generic one
+        var fieldContext = new ActivatingContentFieldContext(context.ContentItem);
+
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.ActivatingAsync(context, part),
+            (handler, context, field) => handler.ActivatingAsync(fieldContext, field),
+            createPartIfNotExists: true,
+            createFieldIfNotExists: true);
+    }
 
-        public override Task ActivatedAsync(ActivatedContentContext context)
-        {
-            var fieldContext = new ActivatedContentFieldContext(context.ContentItem);
+    public override Task ActivatedAsync(ActivatedContentContext context)
+    {
+        var fieldContext = new ActivatedContentFieldContext(context.ContentItem);
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.ActivatedAsync(context, part),
-                (handler, context, field) => handler.ActivatedAsync(fieldContext, field));
-        }
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.ActivatedAsync(context, part),
+            (handler, context, field) => handler.ActivatedAsync(fieldContext, field));
+    }
 
-        public override Task CreatingAsync(CreateContentContext context)
-        {
-            var fieldContext = new CreateContentFieldContext(context.ContentItem);
+    public override Task CreatingAsync(CreateContentContext context)
+    {
+        var fieldContext = new CreateContentFieldContext(context.ContentItem);
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.CreatingAsync(context, part),
-                (handler, context, field) => handler.CreatingAsync(fieldContext, field));
-        }
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.CreatingAsync(context, part),
+            (handler, context, field) => handler.CreatingAsync(fieldContext, field));
+    }
 
-        public override Task CreatedAsync(CreateContentContext context)
-        {
-            var fieldContext = new CreateContentFieldContext(context.ContentItem);
+    public override Task CreatedAsync(CreateContentContext context)
+    {
+        var fieldContext = new CreateContentFieldContext(context.ContentItem);
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.CreatedAsync(context, part),
-                (handler, context, field) => handler.CreatedAsync(fieldContext, field));
-        }
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.CreatedAsync(context, part),
+            (handler, context, field) => handler.CreatedAsync(fieldContext, field));
+    }
 
-        public override Task ImportingAsync(ImportContentContext context)
-        {
-            var fieldContext = new ImportContentFieldContext(context.ContentItem, context.OriginalContentItem);
+    public override Task ImportingAsync(ImportContentContext context)
+    {
+        var fieldContext = new ImportContentFieldContext(context.ContentItem, context.OriginalContentItem);
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.ImportingAsync(context, part),
-                (handler, context, field) => handler.ImportingAsync(fieldContext, field));
-        }
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.ImportingAsync(context, part),
+            (handler, context, field) => handler.ImportingAsync(fieldContext, field));
+    }
 
-        public override Task ImportedAsync(ImportContentContext context)
-        {
-            var fieldContext = new ImportContentFieldContext(context.ContentItem, context.OriginalContentItem);
+    public override Task ImportedAsync(ImportContentContext context)
+    {
+        var fieldContext = new ImportContentFieldContext(context.ContentItem, context.OriginalContentItem);
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.ImportedAsync(context, part),
-                (handler, context, field) => handler.ImportedAsync(fieldContext, field));
-        }
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.ImportedAsync(context, part),
+            (handler, context, field) => handler.ImportedAsync(fieldContext, field));
+    }
 
-        public override Task InitializingAsync(InitializingContentContext context)
-        {
-            var fieldContext = new InitializingContentFieldContext(context.ContentItem);
+    public override Task InitializingAsync(InitializingContentContext context)
+    {
+        var fieldContext = new InitializingContentFieldContext(context.ContentItem);
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.InitializingAsync(context, part),
-                (handler, context, field) => handler.InitializingAsync(fieldContext, field));
-        }
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.InitializingAsync(context, part),
+            (handler, context, field) => handler.InitializingAsync(fieldContext, field));
+    }
 
-        public override Task InitializedAsync(InitializingContentContext context)
-        {
-            var fieldContext = new InitializingContentFieldContext(context.ContentItem);
+    public override Task InitializedAsync(InitializingContentContext context)
+    {
+        var fieldContext = new InitializingContentFieldContext(context.ContentItem);
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.InitializedAsync(context, part),
-                (handler, context, field) => handler.InitializedAsync(fieldContext, field));
-        }
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.InitializedAsync(context, part),
+            (handler, context, field) => handler.InitializedAsync(fieldContext, field));
+    }
 
-        public override Task LoadingAsync(LoadContentContext context)
-        {
-            // This method is called on Get()
-            // Adds all the missing parts to a content item based on the content type definition.
-            // A part is missing if the content type is changed and an old content item is loaded,
-            // like edited.
-            var fieldContext = new LoadContentFieldContext(context.ContentItem);
-
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.LoadingAsync(context, part),
-                (handler, context, field) => handler.LoadingAsync(fieldContext, field),
-                createPartIfNotExists: true,
-                createFieldIfNotExists: true);
-        }
+    public override Task LoadingAsync(LoadContentContext context)
+    {
+        // This method is called on Get()
+        // Adds all the missing parts to a content item based on the content type definition.
+        // A part is missing if the content type is changed and an old content item is loaded,
+        // like edited.
+        var fieldContext = new LoadContentFieldContext(context.ContentItem);
+
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.LoadingAsync(context, part),
+            (handler, context, field) => handler.LoadingAsync(fieldContext, field),
+            createPartIfNotExists: true,
+            createFieldIfNotExists: true);
+    }
 
-        public override Task LoadedAsync(LoadContentContext context)
-        {
-            var fieldContext = new LoadContentFieldContext(context.ContentItem);
+    public override Task LoadedAsync(LoadContentContext context)
+    {
+        var fieldContext = new LoadContentFieldContext(context.ContentItem);
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.LoadedAsync(context, part),
-                (handler, context, field) => handler.LoadedAsync(fieldContext, field));
-        }
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.LoadedAsync(context, part),
+            (handler, context, field) => handler.LoadedAsync(fieldContext, field));
+    }
 
-        public override Task ValidatingAsync(ValidateContentContext context)
-        {
-            return InvokeHandlers(context,
-                (handler, context, part) => handler.ValidatingAsync(context, part),
-                (handler, context, field) => handler.ValidatingAsync(context, field));
-        }
+    public override Task ValidatingAsync(ValidateContentContext context)
+    {
+        return InvokeHandlers(context,
+            (handler, context, part) => handler.ValidatingAsync(context, part),
+            (handler, context, field) => handler.ValidatingAsync(context, field));
+    }
 
-        public override Task ValidatedAsync(ValidateContentContext context)
-        {
-            return InvokeHandlers(context,
-                (handler, context, part) => handler.ValidatedAsync(context, part),
-                (handler, context, field) => handler.ValidatedAsync(new ValidateContentFieldContext(context.ContentItem), field));
-        }
+    public override Task ValidatedAsync(ValidateContentContext context)
+    {
+        return InvokeHandlers(context,
+            (handler, context, part) => handler.ValidatedAsync(context, part),
+            (handler, context, field) => handler.ValidatedAsync(new ValidateContentFieldContext(context.ContentItem), field));
+    }
 
-        public override Task DraftSavingAsync(SaveDraftContentContext context)
-        {
-            var fieldContext = new SaveDraftContentFieldContext(context.ContentItem);
+    public override Task DraftSavingAsync(SaveDraftContentContext context)
+    {
+        var fieldContext = new SaveDraftContentFieldContext(context.ContentItem);
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.DraftSavingAsync(context, part),
-                (handler, context, field) => handler.DraftSavingAsync(fieldContext, field));
-        }
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.DraftSavingAsync(context, part),
+            (handler, context, field) => handler.DraftSavingAsync(fieldContext, field));
+    }
 
-        public override Task DraftSavedAsync(SaveDraftContentContext context)
-        {
-            var fieldContext = new SaveDraftContentFieldContext(context.ContentItem);
+    public override Task DraftSavedAsync(SaveDraftContentContext context)
+    {
+        var fieldContext = new SaveDraftContentFieldContext(context.ContentItem);
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.DraftSavedAsync(context, part),
-                (handler, context, field) => handler.DraftSavedAsync(fieldContext, field));
-        }
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.DraftSavedAsync(context, part),
+            (handler, context, field) => handler.DraftSavedAsync(fieldContext, field));
+    }
 
-        public override Task PublishingAsync(PublishContentContext context)
-        {
-            var fieldContext = new PublishContentFieldContext(context.ContentItem, context.PreviousItem);
+    public override Task PublishingAsync(PublishContentContext context)
+    {
+        var fieldContext = new PublishContentFieldContext(context.ContentItem, context.PreviousItem);
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.PublishingAsync(context, part),
-                (handler, context, field) => handler.PublishingAsync(fieldContext, field));
-        }
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.PublishingAsync(context, part),
+            (handler, context, field) => handler.PublishingAsync(fieldContext, field));
+    }
 
-        public override Task PublishedAsync(PublishContentContext context)
-        {
-            var fieldContext = new PublishContentFieldContext(context.ContentItem, context.PreviousItem);
+    public override Task PublishedAsync(PublishContentContext context)
+    {
+        var fieldContext = new PublishContentFieldContext(context.ContentItem, context.PreviousItem);
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.PublishedAsync(context, part),
-                (handler, context, field) => handler.PublishedAsync(fieldContext, field));
-        }
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.PublishedAsync(context, part),
+            (handler, context, field) => handler.PublishedAsync(fieldContext, field));
+    }
 
-        public override Task RemovingAsync(RemoveContentContext context)
-        {
-            var fieldContext = new RemoveContentFieldContext(context.ContentItem, context.NoActiveVersionLeft);
+    public override Task RemovingAsync(RemoveContentContext context)
+    {
+        var fieldContext = new RemoveContentFieldContext(context.ContentItem, context.NoActiveVersionLeft);
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.RemovingAsync(context, part),
-                (handler, context, field) => handler.RemovingAsync(fieldContext, field));
-        }
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.RemovingAsync(context, part),
+            (handler, context, field) => handler.RemovingAsync(fieldContext, field));
+    }
 
-        public override Task RemovedAsync(RemoveContentContext context)
-        {
-            var fieldContext = new RemoveContentFieldContext(context.ContentItem, context.NoActiveVersionLeft);
+    public override Task RemovedAsync(RemoveContentContext context)
+    {
+        var fieldContext = new RemoveContentFieldContext(context.ContentItem, context.NoActiveVersionLeft);
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.RemovedAsync(context, part),
-                (handler, context, field) => handler.RemovedAsync(fieldContext, field));
-        }
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.RemovedAsync(context, part),
+            (handler, context, field) => handler.RemovedAsync(fieldContext, field));
+    }
 
-        public override Task UnpublishingAsync(PublishContentContext context)
-        {
-            var fieldContext = new PublishContentFieldContext(context.ContentItem, context.PreviousItem);
+    public override Task UnpublishingAsync(PublishContentContext context)
+    {
+        var fieldContext = new PublishContentFieldContext(context.ContentItem, context.PreviousItem);
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.UnpublishingAsync(context, part),
-                (handler, context, field) => handler.UnpublishingAsync(fieldContext, field));
-        }
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.UnpublishingAsync(context, part),
+            (handler, context, field) => handler.UnpublishingAsync(fieldContext, field));
+    }
 
-        public override Task UnpublishedAsync(PublishContentContext context)
-        {
-            var fieldContext = new PublishContentFieldContext(context.ContentItem, context.PreviousItem);
+    public override Task UnpublishedAsync(PublishContentContext context)
+    {
+        var fieldContext = new PublishContentFieldContext(context.ContentItem, context.PreviousItem);
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.UnpublishedAsync(context, part),
-                (handler, context, field) => handler.UnpublishedAsync(fieldContext, field));
-        }
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.UnpublishedAsync(context, part),
+            (handler, context, field) => handler.UnpublishedAsync(fieldContext, field));
+    }
 
-        public override Task UpdatingAsync(UpdateContentContext context)
-        {
-            var fieldContext = new UpdateContentFieldContext(context.ContentItem);
+    public override Task UpdatingAsync(UpdateContentContext context)
+    {
+        var fieldContext = new UpdateContentFieldContext(context.ContentItem);
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.UpdatingAsync(context, part),
-                (handler, context, field) => handler.UpdatingAsync(fieldContext, field));
-        }
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.UpdatingAsync(context, part),
+            (handler, context, field) => handler.UpdatingAsync(fieldContext, field));
+    }
 
-        public override Task UpdatedAsync(UpdateContentContext context)
-        {
-            var fieldContext = new UpdateContentFieldContext(context.ContentItem);
+    public override Task UpdatedAsync(UpdateContentContext context)
+    {
+        var fieldContext = new UpdateContentFieldContext(context.ContentItem);
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.UpdatedAsync(context, part),
-                (handler, context, field) => handler.UpdatedAsync(fieldContext, field));
-        }
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.UpdatedAsync(context, part),
+            (handler, context, field) => handler.UpdatedAsync(fieldContext, field));
+    }
 
-        public override Task VersioningAsync(VersionContentContext context)
-        {
-            var fieldContext = new VersionContentFieldContext(context.ContentItem, context.BuildingContentItem);
+    public override Task VersioningAsync(VersionContentContext context)
+    {
+        var fieldContext = new VersionContentFieldContext(context.ContentItem, context.BuildingContentItem);
 
-            return InvokeHandlers(context, fieldContext,
-                 (handler, context, existingPart, buildingPart) => handler.VersioningAsync(context, existingPart, buildingPart),
-                 (handler, context, existingField, buildingField) => handler.VersioningAsync(fieldContext, existingField, buildingField));
-        }
+        return InvokeHandlers(context, fieldContext,
+             (handler, context, existingPart, buildingPart) => handler.VersioningAsync(context, existingPart, buildingPart),
+             (handler, context, existingField, buildingField) => handler.VersioningAsync(fieldContext, existingField, buildingField));
+    }
 
-        public override Task VersionedAsync(VersionContentContext context)
-        {
-            var fieldContext = new VersionContentFieldContext(context.ContentItem, context.BuildingContentItem);
+    public override Task VersionedAsync(VersionContentContext context)
+    {
+        var fieldContext = new VersionContentFieldContext(context.ContentItem, context.BuildingContentItem);
 
-            return InvokeHandlers(context, fieldContext,
-                 (handler, context, existingPart, buildingPart) => handler.VersionedAsync(context, existingPart, buildingPart),
-                 (handler, context, existingField, buildingField) => handler.VersionedAsync(fieldContext, existingField, buildingField));
+        return InvokeHandlers(context, fieldContext,
+             (handler, context, existingPart, buildingPart) => handler.VersionedAsync(context, existingPart, buildingPart),
+             (handler, context, existingField, buildingField) => handler.VersionedAsync(fieldContext, existingField, buildingField));
+    }
+
+    public override async Task GetContentItemAspectAsync(ContentItemAspectContext context)
+    {
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
+        if (contentTypeDefinition == null)
+        {
+            return;
         }
 
-        public override async Task GetContentItemAspectAsync(ContentItemAspectContext context)
+        foreach (var typePartDefinition in contentTypeDefinition.Parts)
         {
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
-            if (contentTypeDefinition == null)
+            var partName = typePartDefinition.PartDefinition.Name;
+            var activator = _contentPartFactory.GetTypeActivator(partName);
+            var part = context.ContentItem.Get(activator.Type, typePartDefinition.Name) as ContentPart;
+
+            if (part == null)
             {
-                return;
+                continue;
             }
 
-            foreach (var typePartDefinition in contentTypeDefinition.Parts)
+            var partHandlers = _contentPartHandlerResolver.GetHandlers(partName);
+            await partHandlers.InvokeAsync((handler, context, part) => handler.GetContentItemAspectAsync(context, part), context, part, _logger);
+
+            if (typePartDefinition.PartDefinition?.Fields == null)
             {
-                var partName = typePartDefinition.PartDefinition.Name;
-                var activator = _contentPartFactory.GetTypeActivator(partName);
-                var part = context.ContentItem.Get(activator.Type, typePartDefinition.Name) as ContentPart;
+                continue;
+            }
+
+            foreach (var partFieldDefinition in typePartDefinition.PartDefinition.Fields)
+            {
+                var fieldName = partFieldDefinition.FieldDefinition.Name;
+                var fieldActivator = _contentFieldFactory.GetTypeActivator(fieldName);
+                var field = context.ContentItem.Get(fieldActivator.Type, partFieldDefinition.Name) as ContentField;
 
-                if (part == null)
+                if (field == null)
                 {
                     continue;
                 }
 
-                var partHandlers = _contentPartHandlerResolver.GetHandlers(partName);
-                await partHandlers.InvokeAsync((handler, context, part) => handler.GetContentItemAspectAsync(context, part), context, part, _logger);
+                var fieldHandlers = _contentFieldHandlerResolver.GetHandlers(fieldName);
+                await fieldHandlers.InvokeAsync((handler, context, field) => handler.GetContentItemAspectAsync(context, field), context, field, _logger);
+            }
+        }
+    }
 
-                if (typePartDefinition.PartDefinition?.Fields == null)
-                {
-                    continue;
-                }
+    public override Task ClonedAsync(CloneContentContext context)
+    {
+        var fieldContext = new CloneContentFieldContext(context.ContentItem, context.CloneContentItem);
 
-                foreach (var partFieldDefinition in typePartDefinition.PartDefinition.Fields)
-                {
-                    var fieldName = partFieldDefinition.FieldDefinition.Name;
-                    var fieldActivator = _contentFieldFactory.GetTypeActivator(fieldName);
-                    var field = context.ContentItem.Get(fieldActivator.Type, partFieldDefinition.Name) as ContentField;
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.ClonedAsync(context, part),
+            (handler, context, field) => handler.ClonedAsync(fieldContext, field));
+    }
+    public override Task CloningAsync(CloneContentContext context)
+    {
+        var fieldContext = new CloneContentFieldContext(context.ContentItem, context.CloneContentItem);
 
-                    if (field == null)
-                    {
-                        continue;
-                    }
+        return InvokeHandlers(context, fieldContext,
+            (handler, context, part) => handler.CloningAsync(context, part),
+            (handler, context, field) => handler.CloningAsync(fieldContext, field));
+    }
 
-                    var fieldHandlers = _contentFieldHandlerResolver.GetHandlers(fieldName);
-                    await fieldHandlers.InvokeAsync((handler, context, field) => handler.GetContentItemAspectAsync(context, field), context, field, _logger);
-                }
-            }
+    private async Task InvokeHandlers<TContext, TFieldContext>(
+        TContext context,
+        TFieldContext fieldContext,
+        Func<IContentPartHandler, TContext, ContentPart, Task> partHandlerAction,
+        Func<IContentFieldHandler, TFieldContext, ContentField, Task> fieldHandlerAction,
+        bool createPartIfNotExists = false,
+        bool createFieldIfNotExists = false)
+        where TContext : ContentContextBase
+        where TFieldContext : ContentFieldContextBase
+    {
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
+        if (contentTypeDefinition == null)
+        {
+            return;
         }
 
-        public override Task ClonedAsync(CloneContentContext context)
+        foreach (var typePartDefinition in contentTypeDefinition.Parts)
         {
-            var fieldContext = new CloneContentFieldContext(context.ContentItem, context.CloneContentItem);
+            var partName = typePartDefinition.PartDefinition.Name;
+            var partActivator = _contentPartFactory.GetTypeActivator(partName);
+            var part = context.ContentItem.Get(partActivator.Type, typePartDefinition.Name) as ContentPart;
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.ClonedAsync(context, part),
-                (handler, context, field) => handler.ClonedAsync(fieldContext, field));
-        }
-        public override Task CloningAsync(CloneContentContext context)
-        {
-            var fieldContext = new CloneContentFieldContext(context.ContentItem, context.CloneContentItem);
+            if (part == null && createPartIfNotExists)
+            {
+                part = partActivator.CreateInstance();
+                context.ContentItem.Weld(typePartDefinition.Name, part);
+            }
 
-            return InvokeHandlers(context, fieldContext,
-                (handler, context, part) => handler.CloningAsync(context, part),
-                (handler, context, field) => handler.CloningAsync(fieldContext, field));
-        }
+            if (part == null)
+            {
+                continue;
+            }
 
-        private async Task InvokeHandlers<TContext, TFieldContext>(
-            TContext context,
-            TFieldContext fieldContext,
-            Func<IContentPartHandler, TContext, ContentPart, Task> partHandlerAction,
-            Func<IContentFieldHandler, TFieldContext, ContentField, Task> fieldHandlerAction,
-            bool createPartIfNotExists = false,
-            bool createFieldIfNotExists = false)
-            where TContext : ContentContextBase
-            where TFieldContext : ContentFieldContextBase
-        {
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
-            if (contentTypeDefinition == null)
+            var partHandlers = _contentPartHandlerResolver.GetHandlers(partName);
+            await partHandlers.InvokeAsync(partHandlerAction, context, part, _logger);
+
+            if (typePartDefinition.PartDefinition?.Fields == null)
             {
-                return;
+                continue;
             }
 
-            foreach (var typePartDefinition in contentTypeDefinition.Parts)
+            foreach (var partFieldDefinition in typePartDefinition.PartDefinition.Fields)
             {
-                var partName = typePartDefinition.PartDefinition.Name;
-                var partActivator = _contentPartFactory.GetTypeActivator(partName);
-                var part = context.ContentItem.Get(partActivator.Type, typePartDefinition.Name) as ContentPart;
+                var fieldName = partFieldDefinition.FieldDefinition.Name;
+                var fieldActivator = _contentFieldFactory.GetTypeActivator(fieldName);
 
-                if (part == null && createPartIfNotExists)
-                {
-                    part = partActivator.CreateInstance();
-                    context.ContentItem.Weld(typePartDefinition.Name, part);
-                }
+                // Attempt to get the field from the part.
+                var field = part.Get(fieldActivator.Type, partFieldDefinition.Name) as ContentField;
 
-                if (part == null)
+                if (field == null && createFieldIfNotExists)
                 {
-                    continue;
-                }
+                    field = fieldActivator.CreateInstance();
 
-                var partHandlers = _contentPartHandlerResolver.GetHandlers(partName);
-                await partHandlers.InvokeAsync(partHandlerAction, context, part, _logger);
+                    part.Weld(partFieldDefinition.Name, field);
+                }
 
-                if (typePartDefinition.PartDefinition?.Fields == null)
+                if (field == null)
                 {
                     continue;
                 }
 
-                foreach (var partFieldDefinition in typePartDefinition.PartDefinition.Fields)
-                {
-                    var fieldName = partFieldDefinition.FieldDefinition.Name;
-                    var fieldActivator = _contentFieldFactory.GetTypeActivator(fieldName);
+                fieldContext.ContentPartFieldDefinition = partFieldDefinition;
+                fieldContext.PartName = typePartDefinition.Name ?? partName;
 
-                    // Attempt to get the field from the part.
-                    var field = part.Get(fieldActivator.Type, partFieldDefinition.Name) as ContentField;
+                var fieldHandlers = _contentFieldHandlerResolver.GetHandlers(fieldName);
+                await fieldHandlers.InvokeAsync(fieldHandlerAction, fieldContext, field, _logger);
+            }
+        }
+    }
 
-                    if (field == null && createFieldIfNotExists)
-                    {
-                        field = fieldActivator.CreateInstance();
+    private async Task InvokeHandlers<TContext, TFieldContext>(
+        TContext context,
+        TFieldContext fieldContext,
+        Func<IContentPartHandler, TContext, ContentPart, ContentPart, Task> partHandlerAction,
+        Func<IContentFieldHandler, TFieldContext, ContentField, ContentField, Task> fieldHandlerAction)
+        where TContext : VersionContentContext
+        where TFieldContext : VersionContentFieldContext
 
-                        part.Weld(partFieldDefinition.Name, field);
-                    }
+    {
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
+        if (contentTypeDefinition == null)
+        {
+            return;
+        }
 
-                    if (field == null)
-                    {
-                        continue;
-                    }
+        foreach (var typePartDefinition in contentTypeDefinition.Parts)
+        {
+            var partName = typePartDefinition.PartDefinition.Name;
+            var partActivator = _contentPartFactory.GetTypeActivator(partName);
 
-                    fieldContext.ContentPartFieldDefinition = partFieldDefinition;
-                    fieldContext.PartName = typePartDefinition.Name ?? partName;
+            var buildingPart = (ContentPart)context.BuildingContentItem.Get(partActivator.Type, partName);
+            var existingPart = (ContentPart)context.ContentItem.Get(partActivator.Type, typePartDefinition.Name);
 
-                    var fieldHandlers = _contentFieldHandlerResolver.GetHandlers(fieldName);
-                    await fieldHandlers.InvokeAsync(fieldHandlerAction, fieldContext, field, _logger);
-                }
+            if (buildingPart == null || existingPart == null)
+            {
+                continue;
             }
-        }
 
-        private async Task InvokeHandlers<TContext, TFieldContext>(
-            TContext context,
-            TFieldContext fieldContext,
-            Func<IContentPartHandler, TContext, ContentPart, ContentPart, Task> partHandlerAction,
-            Func<IContentFieldHandler, TFieldContext, ContentField, ContentField, Task> fieldHandlerAction)
-            where TContext : VersionContentContext
-            where TFieldContext : VersionContentFieldContext
+            var partHandlers = _contentPartHandlerResolver.GetHandlers(partName);
 
-        {
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
-            if (contentTypeDefinition == null)
+            await partHandlers.InvokeAsync(partHandlerAction, context, existingPart, buildingPart, _logger);
+
+            if (typePartDefinition.PartDefinition?.Fields == null)
             {
-                return;
+                continue;
             }
 
-            foreach (var typePartDefinition in contentTypeDefinition.Parts)
+            foreach (var partFieldDefinition in typePartDefinition.PartDefinition.Fields)
             {
-                var partName = typePartDefinition.PartDefinition.Name;
-                var partActivator = _contentPartFactory.GetTypeActivator(partName);
+                var fieldName = partFieldDefinition.FieldDefinition.Name;
+                var fieldActivator = _contentFieldFactory.GetTypeActivator(fieldName);
 
-                var buildingPart = (ContentPart)context.BuildingContentItem.Get(partActivator.Type, partName);
-                var existingPart = (ContentPart)context.ContentItem.Get(partActivator.Type, typePartDefinition.Name);
+                var buildingField = (ContentField)buildingPart.Get(fieldActivator.Type, fieldName);
+                var existingField = (ContentField)existingPart.Get(fieldActivator.Type, partFieldDefinition.Name);
 
-                if (buildingPart == null || existingPart == null)
+                if (buildingField == null || existingField == null)
                 {
                     continue;
                 }
 
-                var partHandlers = _contentPartHandlerResolver.GetHandlers(partName);
+                fieldContext.ContentPartFieldDefinition = partFieldDefinition;
+                fieldContext.PartName = typePartDefinition.Name ?? partName;
 
-                await partHandlers.InvokeAsync(partHandlerAction, context, existingPart, buildingPart, _logger);
+                var fieldHandlers = _contentFieldHandlerResolver.GetHandlers(fieldName);
+                await fieldHandlers.InvokeAsync(fieldHandlerAction, fieldContext, existingField, buildingField, _logger);
+            }
+        }
+    }
 
-                if (typePartDefinition.PartDefinition?.Fields == null)
-                {
-                    continue;
-                }
+    private async Task InvokeHandlers<TContext>(
+        TContext context,
+        Func<IContentPartHandler, ValidateContentContext, ContentPart, Task> partHandlerAction,
+        Func<IContentFieldHandler, ValidateContentFieldContext, ContentField, Task> fieldHandlerAction)
+        where TContext : ValidateContentContext
+    {
+        var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
+        if (contentTypeDefinition == null)
+        {
+            return;
+        }
 
-                foreach (var partFieldDefinition in typePartDefinition.PartDefinition.Fields)
-                {
-                    var fieldName = partFieldDefinition.FieldDefinition.Name;
-                    var fieldActivator = _contentFieldFactory.GetTypeActivator(fieldName);
+        foreach (var typePartDefinition in contentTypeDefinition.Parts)
+        {
+            var partName = typePartDefinition.PartDefinition.Name;
+            var partActivator = _contentPartFactory.GetTypeActivator(partName);
+            var part = context.ContentItem.Get(partActivator.Type, typePartDefinition.Name) as ContentPart;
+
+            if (part == null)
+            {
+                continue;
+            }
 
-                    var buildingField = (ContentField)buildingPart.Get(fieldActivator.Type, fieldName);
-                    var existingField = (ContentField)existingPart.Get(fieldActivator.Type, partFieldDefinition.Name);
+            var partHandlers = _contentPartHandlerResolver.GetHandlers(partName);
 
-                    if (buildingField == null || existingField == null)
-                    {
-                        continue;
-                    }
+            var partValidationContext = new ValidateContentPartContext(context.ContentItem)
+            {
+                ContentTypePartDefinition = typePartDefinition,
+            };
 
-                    fieldContext.ContentPartFieldDefinition = partFieldDefinition;
-                    fieldContext.PartName = typePartDefinition.Name ?? partName;
+            await partHandlers.InvokeAsync(partHandlerAction, partValidationContext, part, _logger);
 
-                    var fieldHandlers = _contentFieldHandlerResolver.GetHandlers(fieldName);
-                    await fieldHandlers.InvokeAsync(fieldHandlerAction, fieldContext, existingField, buildingField, _logger);
-                }
+            // Add any part errors to the context errors.
+            foreach (var error in partValidationContext.ContentValidateResult.Errors)
+            {
+                context.ContentValidateResult.Fail(error);
             }
-        }
 
-        private async Task InvokeHandlers<TContext>(
-            TContext context,
-            Func<IContentPartHandler, ValidateContentContext, ContentPart, Task> partHandlerAction,
-            Func<IContentFieldHandler, ValidateContentFieldContext, ContentField, Task> fieldHandlerAction)
-            where TContext : ValidateContentContext
-        {
-            var contentTypeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(context.ContentItem.ContentType);
-            if (contentTypeDefinition == null)
+            if (typePartDefinition.PartDefinition?.Fields == null)
             {
-                return;
+                continue;
             }
 
-            foreach (var typePartDefinition in contentTypeDefinition.Parts)
+            foreach (var partFieldDefinition in typePartDefinition.PartDefinition.Fields)
             {
-                var partName = typePartDefinition.PartDefinition.Name;
-                var partActivator = _contentPartFactory.GetTypeActivator(partName);
-                var part = context.ContentItem.Get(partActivator.Type, typePartDefinition.Name) as ContentPart;
+                var fieldName = partFieldDefinition.FieldDefinition.Name;
+
+                var fieldActivator = _contentFieldFactory.GetTypeActivator(fieldName);
+
+                var field = part.Get(fieldActivator.Type, partFieldDefinition.Name) as ContentField;
 
-                if (part == null)
+                if (field == null)
                 {
                     continue;
                 }
 
-                var partHandlers = _contentPartHandlerResolver.GetHandlers(partName);
-
-                var partValidationContext = new ValidateContentPartContext(context.ContentItem)
+                var validateFieldContentContext = new ValidateContentFieldContext(context.ContentItem)
                 {
-                    ContentTypePartDefinition = typePartDefinition,
+                    ContentPartFieldDefinition = partFieldDefinition,
+                    PartName = typePartDefinition.Name ?? partName
                 };
 
-                await partHandlers.InvokeAsync(partHandlerAction, partValidationContext, part, _logger);
+                var fieldHandlers = _contentFieldHandlerResolver.GetHandlers(fieldName);
+                await fieldHandlers.InvokeAsync(fieldHandlerAction, validateFieldContentContext, field, _logger);
 
-                // Add any part errors to the context errors.
-                foreach (var error in partValidationContext.ContentValidateResult.Errors)
+                // Add any field errors to the context errors.
+                foreach (var error in validateFieldContentContext.ContentValidateResult.Errors)
                 {
                     context.ContentValidateResult.Fail(error);
                 }
-
-                if (typePartDefinition.PartDefinition?.Fields == null)
-                {
-                    continue;
-                }
-
-                foreach (var partFieldDefinition in typePartDefinition.PartDefinition.Fields)
-                {
-                    var fieldName = partFieldDefinition.FieldDefinition.Name;
-
-                    var fieldActivator = _contentFieldFactory.GetTypeActivator(fieldName);
-
-                    var field = part.Get(fieldActivator.Type, partFieldDefinition.Name) as ContentField;
-
-                    if (field == null)
-                    {
-                        continue;
-                    }
-
-                    var validateFieldContentContext = new ValidateContentFieldContext(context.ContentItem)
-                    {
-                        ContentPartFieldDefinition = partFieldDefinition,
-                        PartName = typePartDefinition.Name ?? partName
-                    };
-
-                    var fieldHandlers = _contentFieldHandlerResolver.GetHandlers(fieldName);
-                    await fieldHandlers.InvokeAsync(fieldHandlerAction, validateFieldContentContext, field, _logger);
-
-                    // Add any field errors to the context errors.
-                    foreach (var error in validateFieldContentContext.ContentValidateResult.Errors)
-                    {
-                        context.ContentValidateResult.Fail(error);
-                    }
-                }
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/Handlers/ContentPartHandlerResolver.cs b/src/OrchardCore/OrchardCore.ContentManagement/Handlers/ContentPartHandlerResolver.cs
index 128eb57bda6..a0d964c56eb 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/Handlers/ContentPartHandlerResolver.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/Handlers/ContentPartHandlerResolver.cs
@@ -3,35 +3,34 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class ContentPartHandlerResolver : IContentPartHandlerResolver
 {
-    public class ContentPartHandlerResolver : IContentPartHandlerResolver
+    private readonly IServiceProvider _serviceProvider;
+    private readonly ContentOptions _contentOptions;
+
+    public ContentPartHandlerResolver(
+        IServiceProvider serviceProvider,
+        IOptions<ContentOptions> contentDisplayOptions
+        )
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly ContentOptions _contentOptions;
+        _serviceProvider = serviceProvider;
+        _contentOptions = contentDisplayOptions.Value;
+    }
 
-        public ContentPartHandlerResolver(
-            IServiceProvider serviceProvider,
-            IOptions<ContentOptions> contentDisplayOptions
-            )
-        {
-            _serviceProvider = serviceProvider;
-            _contentOptions = contentDisplayOptions.Value;
-        }
+    public IList<IContentPartHandler> GetHandlers(string partName)
+    {
+        var services = new List<IContentPartHandler>();
 
-        public IList<IContentPartHandler> GetHandlers(string partName)
+        if (_contentOptions.ContentPartOptionsLookup.TryGetValue(partName, out var contentPartOption))
         {
-            var services = new List<IContentPartHandler>();
-
-            if (_contentOptions.ContentPartOptionsLookup.TryGetValue(partName, out var contentPartOption))
+            foreach (var handlerOption in contentPartOption.Handlers)
             {
-                foreach (var handlerOption in contentPartOption.Handlers)
-                {
-                    services.Add((IContentPartHandler)_serviceProvider.GetRequiredService(handlerOption));
-                }
+                services.Add((IContentPartHandler)_serviceProvider.GetRequiredService(handlerOption));
             }
-
-            return services;
         }
+
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/Handlers/UpdateContentsHandler.cs b/src/OrchardCore/OrchardCore.ContentManagement/Handlers/UpdateContentsHandler.cs
index 03115b95878..43269d953cd 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/Handlers/UpdateContentsHandler.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/Handlers/UpdateContentsHandler.cs
@@ -3,85 +3,84 @@
 using Microsoft.AspNetCore.Http;
 using OrchardCore.Modules;
 
-namespace OrchardCore.ContentManagement.Handlers
+namespace OrchardCore.ContentManagement.Handlers;
+
+public class UpdateContentsHandler : ContentHandlerBase
 {
-    public class UpdateContentsHandler : ContentHandlerBase
+    private readonly IClock _clock;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+
+    public UpdateContentsHandler(IClock clock, IHttpContextAccessor httpContextAccessor)
     {
-        private readonly IClock _clock;
-        private readonly IHttpContextAccessor _httpContextAccessor;
+        _clock = clock;
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        public UpdateContentsHandler(IClock clock, IHttpContextAccessor httpContextAccessor)
+    public override Task CreatingAsync(CreateContentContext context)
+    {
+        var utcNow = _clock.UtcNow;
+        if (!context.ContentItem.CreatedUtc.HasValue)
         {
-            _clock = clock;
-            _httpContextAccessor = httpContextAccessor;
+            context.ContentItem.CreatedUtc = utcNow;
         }
 
-        public override Task CreatingAsync(CreateContentContext context)
-        {
-            var utcNow = _clock.UtcNow;
-            if (!context.ContentItem.CreatedUtc.HasValue)
-            {
-                context.ContentItem.CreatedUtc = utcNow;
-            }
-
-            context.ContentItem.ModifiedUtc = utcNow;
-
-            var httpContext = _httpContextAccessor.HttpContext;
-            if (context.ContentItem.Owner == null && (httpContext?.User?.Identity?.IsAuthenticated ?? false))
-            {
-                context.ContentItem.Owner = httpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-                context.ContentItem.Author = httpContext.User.Identity.Name;
-            }
-
-            return Task.CompletedTask;
-        }
+        context.ContentItem.ModifiedUtc = utcNow;
 
-        public override Task UpdatingAsync(UpdateContentContext context)
+        var httpContext = _httpContextAccessor.HttpContext;
+        if (context.ContentItem.Owner == null && (httpContext?.User?.Identity?.IsAuthenticated ?? false))
         {
-            var utcNow = _clock.UtcNow;
-            context.ContentItem.ModifiedUtc = utcNow;
-            var httpContext = _httpContextAccessor.HttpContext;
-            if (httpContext?.User?.Identity?.IsAuthenticated ?? false)
-            {
-                // The value is only modified during update so that another event like
-                // publishing in a Workflow doesn't change it.
-                context.ContentItem.Author = httpContext.User.Identity.Name;
-            }
-
-            return Task.CompletedTask;
+            context.ContentItem.Owner = httpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+            context.ContentItem.Author = httpContext.User.Identity.Name;
         }
 
-        public override Task VersioningAsync(VersionContentContext context)
-        {
-            var utcNow = _clock.UtcNow;
-
-            context.BuildingContentItem.Owner = context.ContentItem.Owner;
-            context.BuildingContentItem.CreatedUtc = context.ContentItem.CreatedUtc ?? utcNow;
-            context.BuildingContentItem.PublishedUtc = context.ContentItem.PublishedUtc;
-            context.BuildingContentItem.ModifiedUtc = utcNow;
+        return Task.CompletedTask;
+    }
 
-            return Task.CompletedTask;
+    public override Task UpdatingAsync(UpdateContentContext context)
+    {
+        var utcNow = _clock.UtcNow;
+        context.ContentItem.ModifiedUtc = utcNow;
+        var httpContext = _httpContextAccessor.HttpContext;
+        if (httpContext?.User?.Identity?.IsAuthenticated ?? false)
+        {
+            // The value is only modified during update so that another event like
+            // publishing in a Workflow doesn't change it.
+            context.ContentItem.Author = httpContext.User.Identity.Name;
         }
 
-        public override Task PublishingAsync(PublishContentContext context)
-        {
-            var utcNow = _clock.UtcNow;
+        return Task.CompletedTask;
+    }
 
-            // The first time the content is published, reassign the CreateUtc value if it has not already been set.
-            if (!context.ContentItem.PublishedUtc.HasValue && !context.ContentItem.CreatedUtc.HasValue)
-            {
-                context.ContentItem.CreatedUtc = utcNow;
-            }
+    public override Task VersioningAsync(VersionContentContext context)
+    {
+        var utcNow = _clock.UtcNow;
 
-            context.ContentItem.PublishedUtc = utcNow;
+        context.BuildingContentItem.Owner = context.ContentItem.Owner;
+        context.BuildingContentItem.CreatedUtc = context.ContentItem.CreatedUtc ?? utcNow;
+        context.BuildingContentItem.PublishedUtc = context.ContentItem.PublishedUtc;
+        context.BuildingContentItem.ModifiedUtc = utcNow;
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
+    }
+
+    public override Task PublishingAsync(PublishContentContext context)
+    {
+        var utcNow = _clock.UtcNow;
 
-        public override Task UnpublishedAsync(PublishContentContext context)
+        // The first time the content is published, reassign the CreateUtc value if it has not already been set.
+        if (!context.ContentItem.PublishedUtc.HasValue && !context.ContentItem.CreatedUtc.HasValue)
         {
-            context.ContentItem.PublishedUtc = null;
-            return Task.CompletedTask;
+            context.ContentItem.CreatedUtc = utcNow;
         }
+
+        context.ContentItem.PublishedUtc = utcNow;
+
+        return Task.CompletedTask;
+    }
+
+    public override Task UnpublishedAsync(PublishContentContext context)
+    {
+        context.ContentItem.PublishedUtc = null;
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/Records/ContentItemIndex.cs b/src/OrchardCore/OrchardCore.ContentManagement/Records/ContentItemIndex.cs
index c16f7c064fc..32369026c48 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/Records/ContentItemIndex.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/Records/ContentItemIndex.cs
@@ -1,75 +1,74 @@
 using System;
 using YesSql.Indexes;
 
-namespace OrchardCore.ContentManagement.Records
+namespace OrchardCore.ContentManagement.Records;
+
+public class ContentItemIndex : MapIndex
 {
-    public class ContentItemIndex : MapIndex
-    {
-        public const int MaxContentTypeSize = 255;
-        public const int MaxContentPartSize = 255;
-        public const int MaxContentFieldSize = 255;
-        public const int MaxOwnerSize = 255;
-        public const int MaxAuthorSize = 255;
-        public const int MaxDisplayTextSize = 255;
+    public const int MaxContentTypeSize = 255;
+    public const int MaxContentPartSize = 255;
+    public const int MaxContentFieldSize = 255;
+    public const int MaxOwnerSize = 255;
+    public const int MaxAuthorSize = 255;
+    public const int MaxDisplayTextSize = 255;
 
-        public long DocumentId { get; set; }
-        public string ContentItemId { get; set; }
-        public string ContentItemVersionId { get; set; }
-        public bool Published { get; set; }
-        public bool Latest { get; set; }
-        public string ContentType { get; set; }
-        public DateTime? ModifiedUtc { get; set; }
-        public DateTime? PublishedUtc { get; set; }
-        public DateTime? CreatedUtc { get; set; }
-        public string Owner { get; set; }
-        public string Author { get; set; }
-        public string DisplayText { get; set; }
-    }
+    public long DocumentId { get; set; }
+    public string ContentItemId { get; set; }
+    public string ContentItemVersionId { get; set; }
+    public bool Published { get; set; }
+    public bool Latest { get; set; }
+    public string ContentType { get; set; }
+    public DateTime? ModifiedUtc { get; set; }
+    public DateTime? PublishedUtc { get; set; }
+    public DateTime? CreatedUtc { get; set; }
+    public string Owner { get; set; }
+    public string Author { get; set; }
+    public string DisplayText { get; set; }
+}
 
-    public class ContentItemIndexProvider : IndexProvider<ContentItem>
+public class ContentItemIndexProvider : IndexProvider<ContentItem>
+{
+    public override void Describe(DescribeContext<ContentItem> context)
     {
-        public override void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<ContentItemIndex>()
-                .Map(contentItem =>
+        context.For<ContentItemIndex>()
+            .Map(contentItem =>
+            {
+                var contentItemIndex = new ContentItemIndex
                 {
-                    var contentItemIndex = new ContentItemIndex
-                    {
-                        Latest = contentItem.Latest,
-                        Published = contentItem.Published,
-                        ContentType = contentItem.ContentType,
-                        ContentItemId = contentItem.ContentItemId,
-                        ContentItemVersionId = contentItem.ContentItemVersionId,
-                        ModifiedUtc = contentItem.ModifiedUtc,
-                        PublishedUtc = contentItem.PublishedUtc,
-                        CreatedUtc = contentItem.CreatedUtc,
-                        Owner = contentItem.Owner,
-                        Author = contentItem.Author,
-                        DisplayText = contentItem.DisplayText
-                    };
+                    Latest = contentItem.Latest,
+                    Published = contentItem.Published,
+                    ContentType = contentItem.ContentType,
+                    ContentItemId = contentItem.ContentItemId,
+                    ContentItemVersionId = contentItem.ContentItemVersionId,
+                    ModifiedUtc = contentItem.ModifiedUtc,
+                    PublishedUtc = contentItem.PublishedUtc,
+                    CreatedUtc = contentItem.CreatedUtc,
+                    Owner = contentItem.Owner,
+                    Author = contentItem.Author,
+                    DisplayText = contentItem.DisplayText
+                };
 
-                    if (contentItemIndex.ContentType?.Length > ContentItemIndex.MaxContentTypeSize)
-                    {
-                        contentItemIndex.ContentType = contentItem.ContentType[..ContentItemIndex.MaxContentTypeSize];
-                    }
+                if (contentItemIndex.ContentType?.Length > ContentItemIndex.MaxContentTypeSize)
+                {
+                    contentItemIndex.ContentType = contentItem.ContentType[..ContentItemIndex.MaxContentTypeSize];
+                }
 
-                    if (contentItemIndex.Owner?.Length > ContentItemIndex.MaxOwnerSize)
-                    {
-                        contentItemIndex.Owner = contentItem.Owner[..ContentItemIndex.MaxOwnerSize];
-                    }
+                if (contentItemIndex.Owner?.Length > ContentItemIndex.MaxOwnerSize)
+                {
+                    contentItemIndex.Owner = contentItem.Owner[..ContentItemIndex.MaxOwnerSize];
+                }
 
-                    if (contentItemIndex.Author?.Length > ContentItemIndex.MaxAuthorSize)
-                    {
-                        contentItemIndex.Author = contentItem.Author[..ContentItemIndex.MaxAuthorSize];
-                    }
+                if (contentItemIndex.Author?.Length > ContentItemIndex.MaxAuthorSize)
+                {
+                    contentItemIndex.Author = contentItem.Author[..ContentItemIndex.MaxAuthorSize];
+                }
 
-                    if (contentItemIndex.DisplayText?.Length > ContentItemIndex.MaxDisplayTextSize)
-                    {
-                        contentItemIndex.DisplayText = contentItem.DisplayText[..ContentItemIndex.MaxDisplayTextSize];
-                    }
+                if (contentItemIndex.DisplayText?.Length > ContentItemIndex.MaxDisplayTextSize)
+                {
+                    contentItemIndex.DisplayText = contentItem.DisplayText[..ContentItemIndex.MaxDisplayTextSize];
+                }
 
-                    return contentItemIndex;
-                });
-        }
+                return contentItemIndex;
+            });
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/Records/Migrations.cs b/src/OrchardCore/OrchardCore.ContentManagement/Records/Migrations.cs
index 2854209c66d..6cb5240e362 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/Records/Migrations.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/Records/Migrations.cs
@@ -6,233 +6,232 @@
 using OrchardCore.Data.Migration;
 using YesSql.Sql;
 
-namespace OrchardCore.ContentManagement.Records
+namespace OrchardCore.ContentManagement.Records;
+
+public sealed class Migrations : DataMigration
 {
-    public sealed class Migrations : DataMigration
-    {
-        private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
 
-        public Migrations(IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-        }
+    public Migrations(IContentDefinitionManager contentDefinitionManager)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+    }
 
-        public async Task<int> CreateAsync()
-        {
-            await SchemaBuilder.CreateMapIndexTableAsync<ContentItemIndex>(table => table
-                .Column<string>("ContentItemId", c => c.WithLength(26))
-                .Column<string>("ContentItemVersionId", c => c.WithLength(26))
-                .Column<bool>("Latest")
-                .Column<bool>("Published")
-                .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
-                .Column<DateTime>("ModifiedUtc", column => column.Nullable())
-                .Column<DateTime>("PublishedUtc", column => column.Nullable())
-                .Column<DateTime>("CreatedUtc", column => column.Nullable())
-                .Column<string>("Owner", column => column.Nullable().WithLength(ContentItemIndex.MaxOwnerSize))
-                .Column<string>("Author", column => column.Nullable().WithLength(ContentItemIndex.MaxAuthorSize))
-                .Column<string>("DisplayText", column => column.Nullable().WithLength(ContentItemIndex.MaxDisplayTextSize))
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
-                .CreateIndex("IDX_ContentItemIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
-                .CreateIndex("IDX_ContentItemIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType",
-                    "CreatedUtc",
-                    "ModifiedUtc",
-                    "PublishedUtc",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
-                .CreateIndex("IDX_ContentItemIndex_DocumentId_Owner",
-                    "DocumentId",
-                    "Owner",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
-                .CreateIndex("IDX_ContentItemIndex_DocumentId_Author",
-                    "DocumentId",
-                    "Author",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
-                .CreateIndex("IDX_ContentItemIndex_DocumentId_DisplayText",
-                    "DocumentId",
-                    "DisplayText",
-                    "Published",
-                    "Latest")
-            );
-
-            // Shortcut other migration steps on new content definition schemas.
-            return 6;
-        }
+    public async Task<int> CreateAsync()
+    {
+        await SchemaBuilder.CreateMapIndexTableAsync<ContentItemIndex>(table => table
+            .Column<string>("ContentItemId", c => c.WithLength(26))
+            .Column<string>("ContentItemVersionId", c => c.WithLength(26))
+            .Column<bool>("Latest")
+            .Column<bool>("Published")
+            .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
+            .Column<DateTime>("ModifiedUtc", column => column.Nullable())
+            .Column<DateTime>("PublishedUtc", column => column.Nullable())
+            .Column<DateTime>("CreatedUtc", column => column.Nullable())
+            .Column<string>("Owner", column => column.Nullable().WithLength(ContentItemIndex.MaxOwnerSize))
+            .Column<string>("Author", column => column.Nullable().WithLength(ContentItemIndex.MaxAuthorSize))
+            .Column<string>("DisplayText", column => column.Nullable().WithLength(ContentItemIndex.MaxDisplayTextSize))
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
+            .CreateIndex("IDX_ContentItemIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
+            .CreateIndex("IDX_ContentItemIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType",
+                "CreatedUtc",
+                "ModifiedUtc",
+                "PublishedUtc",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
+            .CreateIndex("IDX_ContentItemIndex_DocumentId_Owner",
+                "DocumentId",
+                "Owner",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
+            .CreateIndex("IDX_ContentItemIndex_DocumentId_Author",
+                "DocumentId",
+                "Author",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
+            .CreateIndex("IDX_ContentItemIndex_DocumentId_DisplayText",
+                "DocumentId",
+                "DisplayText",
+                "Published",
+                "Latest")
+        );
+
+        // Shortcut other migration steps on new content definition schemas.
+        return 6;
+    }
 
-        public async Task<int> UpdateFrom1Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
-                .AddColumn<string>("ContentItemVersionId", c => c.WithLength(26))
-            );
+    public async Task<int> UpdateFrom1Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
+            .AddColumn<string>("ContentItemVersionId", c => c.WithLength(26))
+        );
 
-            return 2;
-        }
+        return 2;
+    }
 
-        public async Task<int> UpdateFrom2Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
-                .AddColumn<string>("DisplayText", column => column.Nullable().WithLength(ContentItemIndex.MaxDisplayTextSize))
-            );
+    public async Task<int> UpdateFrom2Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
+            .AddColumn<string>("DisplayText", column => column.Nullable().WithLength(ContentItemIndex.MaxDisplayTextSize))
+        );
 
-            return 3;
-        }
+        return 3;
+    }
 
-        // Migrate content type definitions. This only needs to run on old content definition schemas.
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom3Async()
+    // Migrate content type definitions. This only needs to run on old content definition schemas.
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom3Async()
+    {
+        var contentTypeDefinitions = await _contentDefinitionManager.LoadTypeDefinitionsAsync();
+        foreach (var contentTypeDefinition in contentTypeDefinitions)
         {
-            var contentTypeDefinitions = await _contentDefinitionManager.LoadTypeDefinitionsAsync();
-            foreach (var contentTypeDefinition in contentTypeDefinitions)
+            var existingContentTypeSettings = contentTypeDefinition.Settings.ToObject<ContentTypeSettings>();
+
+            // Do this before creating builder, so settings are removed from the builder settings object.
+            // Remove existing properties from JObject
+            var contentTypeSettingsProperties = existingContentTypeSettings.GetType().GetProperties();
+            foreach (var property in contentTypeSettingsProperties)
             {
-                var existingContentTypeSettings = contentTypeDefinition.Settings.ToObject<ContentTypeSettings>();
+                contentTypeDefinition.Settings.Remove(property.Name);
+            }
 
-                // Do this before creating builder, so settings are removed from the builder settings object.
-                // Remove existing properties from JObject
-                var contentTypeSettingsProperties = existingContentTypeSettings.GetType().GetProperties();
-                foreach (var property in contentTypeSettingsProperties)
-                {
-                    contentTypeDefinition.Settings.Remove(property.Name);
-                }
+            await _contentDefinitionManager.AlterTypeDefinitionAsync(contentTypeDefinition.Name, builder =>
+            {
+                builder.WithSettings(existingContentTypeSettings);
 
-                await _contentDefinitionManager.AlterTypeDefinitionAsync(contentTypeDefinition.Name, builder =>
+                foreach (var contentTypePartDefinition in contentTypeDefinition.Parts)
                 {
-                    builder.WithSettings(existingContentTypeSettings);
+                    var existingTypePartSettings = contentTypePartDefinition.Settings.ToObject<ContentTypePartSettings>();
 
-                    foreach (var contentTypePartDefinition in contentTypeDefinition.Parts)
+                    // Remove existing properties from JObject
+                    var contentTypePartSettingsProperties = existingTypePartSettings.GetType().GetProperties();
+                    foreach (var property in contentTypePartSettingsProperties)
                     {
-                        var existingTypePartSettings = contentTypePartDefinition.Settings.ToObject<ContentTypePartSettings>();
-
-                        // Remove existing properties from JObject
-                        var contentTypePartSettingsProperties = existingTypePartSettings.GetType().GetProperties();
-                        foreach (var property in contentTypePartSettingsProperties)
-                        {
-                            contentTypePartDefinition.Settings.Remove(property.Name);
-                        }
-
-                        builder.WithPart(contentTypePartDefinition.Name, contentTypePartDefinition.PartDefinition, partBuilder =>
-                        {
-                            partBuilder.WithSettings(existingTypePartSettings);
-                        });
+                        contentTypePartDefinition.Settings.Remove(property.Name);
                     }
-                });
-            }
 
-            return 4;
+                    builder.WithPart(contentTypePartDefinition.Name, contentTypePartDefinition.PartDefinition, partBuilder =>
+                    {
+                        partBuilder.WithSettings(existingTypePartSettings);
+                    });
+                }
+            });
         }
 
-        // Migration content part definitions.
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom4Async()
+        return 4;
+    }
+
+    // Migration content part definitions.
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom4Async()
+    {
+        var partDefinitions = await _contentDefinitionManager.LoadPartDefinitionsAsync();
+        foreach (var partDefinition in partDefinitions)
         {
-            var partDefinitions = await _contentDefinitionManager.LoadPartDefinitionsAsync();
-            foreach (var partDefinition in partDefinitions)
+            var existingPartSettings = partDefinition.Settings.ToObject<ContentPartSettings>();
+
+            // Do this before creating builder, so settings are removed from the builder settings object.
+            // Remove existing properties from JObject
+            var contentTypeSettingsProperties = existingPartSettings.GetType().GetProperties();
+            foreach (var property in contentTypeSettingsProperties)
             {
-                var existingPartSettings = partDefinition.Settings.ToObject<ContentPartSettings>();
+                partDefinition.Settings.Remove(property.Name);
+            }
 
-                // Do this before creating builder, so settings are removed from the builder settings object.
-                // Remove existing properties from JObject
-                var contentTypeSettingsProperties = existingPartSettings.GetType().GetProperties();
-                foreach (var property in contentTypeSettingsProperties)
+            await _contentDefinitionManager.AlterPartDefinitionAsync(partDefinition.Name, partBuilder =>
+            {
+                partBuilder.WithSettings(existingPartSettings);
+                foreach (var fieldDefinition in partDefinition.Fields)
                 {
-                    partDefinition.Settings.Remove(property.Name);
-                }
+                    var existingFieldSettings = fieldDefinition.Settings.ToObject<ContentPartFieldSettings>();
 
-                await _contentDefinitionManager.AlterPartDefinitionAsync(partDefinition.Name, partBuilder =>
-                {
-                    partBuilder.WithSettings(existingPartSettings);
-                    foreach (var fieldDefinition in partDefinition.Fields)
+                    // Do this before creating builder, so settings are removed from the builder settings object.
+                    // Remove existing properties from JObject
+                    var fieldSettingsProperties = existingFieldSettings.GetType().GetProperties();
+                    foreach (var property in fieldSettingsProperties)
                     {
-                        var existingFieldSettings = fieldDefinition.Settings.ToObject<ContentPartFieldSettings>();
-
-                        // Do this before creating builder, so settings are removed from the builder settings object.
-                        // Remove existing properties from JObject
-                        var fieldSettingsProperties = existingFieldSettings.GetType().GetProperties();
-                        foreach (var property in fieldSettingsProperties)
-                        {
-                            fieldDefinition.Settings.Remove(property.Name);
-                        }
-
-                        partBuilder.WithField(fieldDefinition.Name, fieldBuilder =>
-                        {
-                            fieldBuilder.WithSettings(existingFieldSettings);
-                        });
+                        fieldDefinition.Settings.Remove(property.Name);
                     }
-                });
-            }
 
-            return 5;
+                    partBuilder.WithField(fieldDefinition.Name, fieldBuilder =>
+                    {
+                        fieldBuilder.WithSettings(existingFieldSettings);
+                    });
+                }
+            });
         }
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom5Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
-                .CreateIndex("IDX_ContentItemIndex_DocumentId",
-                    "DocumentId",
-                    "ContentItemId",
-                    "ContentItemVersionId",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
-                .CreateIndex("IDX_ContentItemIndex_DocumentId_ContentType",
-                    "DocumentId",
-                    "ContentType",
-                    "CreatedUtc",
-                    "ModifiedUtc",
-                    "PublishedUtc",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
-                .CreateIndex("IDX_ContentItemIndex_DocumentId_Owner",
-                    "DocumentId",
-                    "Owner",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
-                .CreateIndex("IDX_ContentItemIndex_DocumentId_Author",
-                    "DocumentId",
-                    "Author",
-                    "Published",
-                    "Latest")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
-                .CreateIndex("IDX_ContentItemIndex_DocumentId_DisplayText",
-                    "DocumentId",
-                    "DisplayText",
-                    "Published",
-                    "Latest")
-            );
-
-            return 6;
-        }
+        return 5;
+    }
+
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom5Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
+            .CreateIndex("IDX_ContentItemIndex_DocumentId",
+                "DocumentId",
+                "ContentItemId",
+                "ContentItemVersionId",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
+            .CreateIndex("IDX_ContentItemIndex_DocumentId_ContentType",
+                "DocumentId",
+                "ContentType",
+                "CreatedUtc",
+                "ModifiedUtc",
+                "PublishedUtc",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
+            .CreateIndex("IDX_ContentItemIndex_DocumentId_Owner",
+                "DocumentId",
+                "Owner",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
+            .CreateIndex("IDX_ContentItemIndex_DocumentId_Author",
+                "DocumentId",
+                "Author",
+                "Published",
+                "Latest")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<ContentItemIndex>(table => table
+            .CreateIndex("IDX_ContentItemIndex_DocumentId_DisplayText",
+                "DocumentId",
+                "DisplayText",
+                "Published",
+                "Latest")
+        );
+
+        return 6;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentManagement/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement/ServiceCollectionExtensions.cs
index 353e2efda7e..2fe98175db5 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement/ServiceCollectionExtensions.cs
@@ -8,39 +8,38 @@
 using OrchardCore.Data.Migration;
 using OrchardCore.Environment.Cache;
 
-namespace OrchardCore.ContentManagement
+namespace OrchardCore.ContentManagement;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    public static IServiceCollection AddContentManagement(this IServiceCollection services)
     {
-        public static IServiceCollection AddContentManagement(this IServiceCollection services)
-        {
-            services.AddScoped<ICacheContextProvider, ContentDefinitionCacheContextProvider>();
-            services.TryAddScoped<IContentDefinitionManager, ContentDefinitionManager>();
-            services.TryAddScoped<IContentDefinitionStore, DatabaseContentDefinitionStore>();
-            services.TryAddScoped<IContentManager, DefaultContentManager>();
-            services.TryAddScoped<IContentManagerSession, DefaultContentManagerSession>();
-            services.AddIndexProvider<ContentItemIndexProvider>();
-            services.AddDataMigration<Migrations>();
-            services.AddScoped<IContentHandler, UpdateContentsHandler>();
-            services.AddScoped<IContentHandler, ContentPartHandlerCoordinator>();
-            services.AddSingleton<ITypeActivatorFactory<ContentPart>, ContentPartFactory>();
-            services.AddSingleton<ITypeActivatorFactory<ContentField>, ContentFieldFactory>();
+        services.AddScoped<ICacheContextProvider, ContentDefinitionCacheContextProvider>();
+        services.TryAddScoped<IContentDefinitionManager, ContentDefinitionManager>();
+        services.TryAddScoped<IContentDefinitionStore, DatabaseContentDefinitionStore>();
+        services.TryAddScoped<IContentManager, DefaultContentManager>();
+        services.TryAddScoped<IContentManagerSession, DefaultContentManagerSession>();
+        services.AddIndexProvider<ContentItemIndexProvider>();
+        services.AddDataMigration<Migrations>();
+        services.AddScoped<IContentHandler, UpdateContentsHandler>();
+        services.AddScoped<IContentHandler, ContentPartHandlerCoordinator>();
+        services.AddSingleton<ITypeActivatorFactory<ContentPart>, ContentPartFactory>();
+        services.AddSingleton<ITypeActivatorFactory<ContentField>, ContentFieldFactory>();
 
-            services.AddSingleton<IContentItemIdGenerator, DefaultContentItemIdGenerator>();
-            services.AddScoped<IContentHandleManager, ContentHandleManager>();
+        services.AddSingleton<IContentItemIdGenerator, DefaultContentItemIdGenerator>();
+        services.AddScoped<IContentHandleManager, ContentHandleManager>();
 
-            services.AddOptions<ContentOptions>();
-            services.AddScoped<IContentPartHandlerResolver, ContentPartHandlerResolver>();
-            services.AddScoped<IContentFieldHandlerResolver, ContentFieldHandlerResolver>();
+        services.AddOptions<ContentOptions>();
+        services.AddScoped<IContentPartHandlerResolver, ContentPartHandlerResolver>();
+        services.AddScoped<IContentFieldHandlerResolver, ContentFieldHandlerResolver>();
 
-            return services;
-        }
+        return services;
+    }
 
-        public static IServiceCollection AddFileContentDefinitionStore(this IServiceCollection services)
-        {
-            services.RemoveAll<IContentDefinitionStore>();
-            services.AddScoped<IContentDefinitionStore, FileContentDefinitionStore>();
-            return services;
-        }
+    public static IServiceCollection AddFileContentDefinitionStore(this IServiceCollection services)
+    {
+        services.RemoveAll<IContentDefinitionStore>();
+        services.AddScoped<IContentDefinitionStore, FileContentDefinitionStore>();
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentPreview.Abstractions/ContentPreviewFeature.cs b/src/OrchardCore/OrchardCore.ContentPreview.Abstractions/ContentPreviewFeature.cs
index 90faa192799..1b55af503b0 100644
--- a/src/OrchardCore/OrchardCore.ContentPreview.Abstractions/ContentPreviewFeature.cs
+++ b/src/OrchardCore/OrchardCore.ContentPreview.Abstractions/ContentPreviewFeature.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.ContentPreview
+namespace OrchardCore.ContentPreview;
+
+/// <summary>
+/// Used when a content item is being previewed.
+/// </summary>
+public class ContentPreviewFeature
 {
-    /// <summary>
-    /// Used when a content item is being previewed.
-    /// </summary>
-    public class ContentPreviewFeature
-    {
-        public bool Previewing { get; set; } = true;
-    }
+    public bool Previewing { get; set; } = true;
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/ContentPartDefinitionDisplayDriver.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/ContentPartDefinitionDisplayDriver.cs
index 5e2028680de..ac1c47fff2d 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/ContentPartDefinitionDisplayDriver.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/ContentPartDefinitionDisplayDriver.cs
@@ -1,13 +1,12 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+public abstract class ContentPartDefinitionDisplayDriver : DisplayDriver<ContentPartDefinition, BuildDisplayContext, BuildEditorContext, UpdatePartEditorContext>, IContentPartDefinitionDisplayDriver
 {
-    public abstract class ContentPartDefinitionDisplayDriver : DisplayDriver<ContentPartDefinition, BuildDisplayContext, BuildEditorContext, UpdatePartEditorContext>, IContentPartDefinitionDisplayDriver
+    public override bool CanHandleModel(ContentPartDefinition model)
     {
-        public override bool CanHandleModel(ContentPartDefinition model)
-        {
-            return true;
-        }
+        return true;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/ContentPartFieldDefinitionDisplayDriver.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/ContentPartFieldDefinitionDisplayDriver.cs
index e3ae2f781ed..6805690fc60 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/ContentPartFieldDefinitionDisplayDriver.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/ContentPartFieldDefinitionDisplayDriver.cs
@@ -3,42 +3,41 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+/// <summary>
+/// A concrete implementation of <see cref="ContentPartFieldDefinitionDisplayDriver"/> provides a driver for all field definitions.
+/// </summary>
+public abstract class ContentPartFieldDefinitionDisplayDriver : DisplayDriver<ContentPartFieldDefinition, BuildDisplayContext, BuildEditorContext, UpdatePartFieldEditorContext>, IContentPartFieldDefinitionDisplayDriver
 {
-    /// <summary>
-    /// A concrete implementation of <see cref="ContentPartFieldDefinitionDisplayDriver"/> provides a driver for all field definitions.
-    /// </summary>
-    public abstract class ContentPartFieldDefinitionDisplayDriver : DisplayDriver<ContentPartFieldDefinition, BuildDisplayContext, BuildEditorContext, UpdatePartFieldEditorContext>, IContentPartFieldDefinitionDisplayDriver
+    protected override void BuildPrefix(ContentPartFieldDefinition model, string htmlFieldPrefix)
     {
-        protected override void BuildPrefix(ContentPartFieldDefinition model, string htmlFieldPrefix)
-        {
-            Prefix = $"{model.PartDefinition.Name}.{model.Name}";
+        Prefix = $"{model.PartDefinition.Name}.{model.Name}";
 
-            if (!string.IsNullOrEmpty(htmlFieldPrefix))
-            {
-                Prefix = htmlFieldPrefix + "." + Prefix;
-            }
-
-            // Prefix any driver with a unique name
-            Prefix += "." + GetType().Name;
-        }
-
-        public override bool CanHandleModel(ContentPartFieldDefinition model)
+        if (!string.IsNullOrEmpty(htmlFieldPrefix))
         {
-            // This drivers applies to all fields.
-            return true;
+            Prefix = htmlFieldPrefix + "." + Prefix;
         }
+
+        // Prefix any driver with a unique name
+        Prefix += "." + GetType().Name;
     }
 
-    /// <summary>
-    /// A concrete implementation of <see cref="ContentPartFieldDefinitionDisplayDriver&lt;TField&gt;"/> provides a driver for field definitions
-    /// of the type <c>TField</c>.
-    /// </summary>
-    public abstract class ContentPartFieldDefinitionDisplayDriver<TField> : ContentPartFieldDefinitionDisplayDriver where TField : ContentField
+    public override bool CanHandleModel(ContentPartFieldDefinition model)
     {
-        public override bool CanHandleModel(ContentPartFieldDefinition model)
-        {
-            return string.Equals(typeof(TField).Name, model.FieldDefinition.Name, StringComparison.Ordinal);
-        }
+        // This drivers applies to all fields.
+        return true;
+    }
+}
+
+/// <summary>
+/// A concrete implementation of <see cref="ContentPartFieldDefinitionDisplayDriver&lt;TField&gt;"/> provides a driver for field definitions
+/// of the type <c>TField</c>.
+/// </summary>
+public abstract class ContentPartFieldDefinitionDisplayDriver<TField> : ContentPartFieldDefinitionDisplayDriver where TField : ContentField
+{
+    public override bool CanHandleModel(ContentPartFieldDefinition model)
+    {
+        return string.Equals(typeof(TField).Name, model.FieldDefinition.Name, StringComparison.Ordinal);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/ContentTypeDefinitionDisplayDriver.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/ContentTypeDefinitionDisplayDriver.cs
index e26b67ee225..6e893fa0f2f 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/ContentTypeDefinitionDisplayDriver.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/ContentTypeDefinitionDisplayDriver.cs
@@ -1,13 +1,12 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+public abstract class ContentTypeDefinitionDisplayDriver : DisplayDriver<ContentTypeDefinition, BuildDisplayContext, BuildEditorContext, UpdateTypeEditorContext>, IContentTypeDefinitionDisplayDriver
 {
-    public abstract class ContentTypeDefinitionDisplayDriver : DisplayDriver<ContentTypeDefinition, BuildDisplayContext, BuildEditorContext, UpdateTypeEditorContext>, IContentTypeDefinitionDisplayDriver
+    public override bool CanHandleModel(ContentTypeDefinition model)
     {
-        public override bool CanHandleModel(ContentTypeDefinition model)
-        {
-            return true;
-        }
+        return true;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/ContentTypePartDefinitionDisplayDriver.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/ContentTypePartDefinitionDisplayDriver.cs
index ae760f9e36e..2aa0093ac5a 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/ContentTypePartDefinitionDisplayDriver.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/ContentTypePartDefinitionDisplayDriver.cs
@@ -3,38 +3,37 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+public abstract class ContentTypePartDefinitionDisplayDriver : DisplayDriver<ContentTypePartDefinition, BuildDisplayContext, BuildEditorContext, UpdateTypePartEditorContext>, IContentTypePartDefinitionDisplayDriver
 {
-    public abstract class ContentTypePartDefinitionDisplayDriver : DisplayDriver<ContentTypePartDefinition, BuildDisplayContext, BuildEditorContext, UpdateTypePartEditorContext>, IContentTypePartDefinitionDisplayDriver
+    protected override void BuildPrefix(ContentTypePartDefinition model, string htmlFielPrefix)
     {
-        protected override void BuildPrefix(ContentTypePartDefinition model, string htmlFielPrefix)
-        {
-            Prefix = $"{model.ContentTypeDefinition.Name}.{model.PartDefinition.Name}";
+        Prefix = $"{model.ContentTypeDefinition.Name}.{model.PartDefinition.Name}";
 
-            if (!string.IsNullOrEmpty(htmlFielPrefix))
-            {
-                Prefix = htmlFielPrefix + "." + Prefix;
-            }
-
-            // Prefix any driver with a unique name
-            Prefix += "." + GetType().Name;
-        }
-
-        public override bool CanHandleModel(ContentTypePartDefinition model)
+        if (!string.IsNullOrEmpty(htmlFielPrefix))
         {
-            return true;
+            Prefix = htmlFielPrefix + "." + Prefix;
         }
+
+        // Prefix any driver with a unique name
+        Prefix += "." + GetType().Name;
     }
 
-    /// <summary>
-    /// A concrete implementation of <see cref="ContentTypePartDefinitionDisplayDriver{TPart}"/> provides a driver for part definitions
-    /// of the type <c>TPart</c>.
-    /// </summary>
-    public abstract class ContentTypePartDefinitionDisplayDriver<TPart> : ContentTypePartDefinitionDisplayDriver where TPart : ContentPart
+    public override bool CanHandleModel(ContentTypePartDefinition model)
     {
-        public override bool CanHandleModel(ContentTypePartDefinition model)
-        {
-            return string.Equals(typeof(TPart).Name, model.PartDefinition.Name, StringComparison.Ordinal);
-        }
+        return true;
+    }
+}
+
+/// <summary>
+/// A concrete implementation of <see cref="ContentTypePartDefinitionDisplayDriver{TPart}"/> provides a driver for part definitions
+/// of the type <c>TPart</c>.
+/// </summary>
+public abstract class ContentTypePartDefinitionDisplayDriver<TPart> : ContentTypePartDefinitionDisplayDriver where TPart : ContentPart
+{
+    public override bool CanHandleModel(ContentTypePartDefinition model)
+    {
+        return string.Equals(typeof(TPart).Name, model.PartDefinition.Name, StringComparison.Ordinal);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentDefinitionDisplayHandler.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentDefinitionDisplayHandler.cs
index 736d172b18e..bbf973323a4 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentDefinitionDisplayHandler.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentDefinitionDisplayHandler.cs
@@ -2,20 +2,19 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+public interface IContentDefinitionDisplayHandler
 {
-    public interface IContentDefinitionDisplayHandler
-    {
-        Task BuildTypeEditorAsync(ContentTypeDefinition definition, BuildEditorContext context);
-        Task UpdateTypeEditorAsync(ContentTypeDefinition definition, UpdateTypeEditorContext context);
+    Task BuildTypeEditorAsync(ContentTypeDefinition definition, BuildEditorContext context);
+    Task UpdateTypeEditorAsync(ContentTypeDefinition definition, UpdateTypeEditorContext context);
 
-        Task BuildTypePartEditorAsync(ContentTypePartDefinition definition, BuildEditorContext context);
-        Task UpdateTypePartEditorAsync(ContentTypePartDefinition definition, UpdateTypePartEditorContext context);
+    Task BuildTypePartEditorAsync(ContentTypePartDefinition definition, BuildEditorContext context);
+    Task UpdateTypePartEditorAsync(ContentTypePartDefinition definition, UpdateTypePartEditorContext context);
 
-        Task BuildPartEditorAsync(ContentPartDefinition definition, BuildEditorContext context);
-        Task UpdatePartEditorAsync(ContentPartDefinition definition, UpdatePartEditorContext context);
+    Task BuildPartEditorAsync(ContentPartDefinition definition, BuildEditorContext context);
+    Task UpdatePartEditorAsync(ContentPartDefinition definition, UpdatePartEditorContext context);
 
-        Task BuildPartFieldEditorAsync(ContentPartFieldDefinition definition, BuildEditorContext context);
-        Task UpdatePartFieldEditorAsync(ContentPartFieldDefinition definition, UpdatePartFieldEditorContext context);
-    }
+    Task BuildPartFieldEditorAsync(ContentPartFieldDefinition definition, BuildEditorContext context);
+    Task UpdatePartFieldEditorAsync(ContentPartFieldDefinition definition, UpdatePartFieldEditorContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentDefinitionDisplayManager.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentDefinitionDisplayManager.cs
index 92933e1ed35..418828df45a 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentDefinitionDisplayManager.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentDefinitionDisplayManager.cs
@@ -2,20 +2,19 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement.ModelBinding;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+public interface IContentDefinitionDisplayManager
 {
-    public interface IContentDefinitionDisplayManager
-    {
-        Task<dynamic> BuildTypeEditorAsync(ContentTypeDefinition definition, IUpdateModel updater, string groupId = "");
-        Task<dynamic> UpdateTypeEditorAsync(ContentTypeDefinition definition, IUpdateModel updater, string groupId = "");
+    Task<dynamic> BuildTypeEditorAsync(ContentTypeDefinition definition, IUpdateModel updater, string groupId = "");
+    Task<dynamic> UpdateTypeEditorAsync(ContentTypeDefinition definition, IUpdateModel updater, string groupId = "");
 
-        Task<dynamic> BuildPartEditorAsync(ContentPartDefinition definition, IUpdateModel updater, string groupId = "");
-        Task<dynamic> UpdatePartEditorAsync(ContentPartDefinition definition, IUpdateModel updater, string groupId = "");
+    Task<dynamic> BuildPartEditorAsync(ContentPartDefinition definition, IUpdateModel updater, string groupId = "");
+    Task<dynamic> UpdatePartEditorAsync(ContentPartDefinition definition, IUpdateModel updater, string groupId = "");
 
-        Task<dynamic> BuildTypePartEditorAsync(ContentTypePartDefinition definition, IUpdateModel updater, string groupId = "");
-        Task<dynamic> UpdateTypePartEditorAsync(ContentTypePartDefinition definition, IUpdateModel updater, string groupId = "");
+    Task<dynamic> BuildTypePartEditorAsync(ContentTypePartDefinition definition, IUpdateModel updater, string groupId = "");
+    Task<dynamic> UpdateTypePartEditorAsync(ContentTypePartDefinition definition, IUpdateModel updater, string groupId = "");
 
-        Task<dynamic> BuildPartFieldEditorAsync(ContentPartFieldDefinition definition, IUpdateModel updater, string groupId = "");
-        Task<dynamic> UpdatePartFieldEditorAsync(ContentPartFieldDefinition definition, IUpdateModel updater, string groupId = "");
-    }
+    Task<dynamic> BuildPartFieldEditorAsync(ContentPartFieldDefinition definition, IUpdateModel updater, string groupId = "");
+    Task<dynamic> UpdatePartFieldEditorAsync(ContentPartFieldDefinition definition, IUpdateModel updater, string groupId = "");
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentPartDefinitionDisplayDriver.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentPartDefinitionDisplayDriver.cs
index 6e45f5a4ab7..9aff0792f2c 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentPartDefinitionDisplayDriver.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentPartDefinitionDisplayDriver.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+public interface IContentPartDefinitionDisplayDriver : IDisplayDriver<ContentPartDefinition, BuildDisplayContext, BuildEditorContext, UpdatePartEditorContext>
 {
-    public interface IContentPartDefinitionDisplayDriver : IDisplayDriver<ContentPartDefinition, BuildDisplayContext, BuildEditorContext, UpdatePartEditorContext>
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentPartFieldDefinitionDisplayDriver.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentPartFieldDefinitionDisplayDriver.cs
index 4e9b26b150e..6f9af68fee8 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentPartFieldDefinitionDisplayDriver.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentPartFieldDefinitionDisplayDriver.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+public interface IContentPartFieldDefinitionDisplayDriver : IDisplayDriver<ContentPartFieldDefinition, BuildDisplayContext, BuildEditorContext, UpdatePartFieldEditorContext>
 {
-    public interface IContentPartFieldDefinitionDisplayDriver : IDisplayDriver<ContentPartFieldDefinition, BuildDisplayContext, BuildEditorContext, UpdatePartFieldEditorContext>
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentTypeDefinitionDisplayDriver.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentTypeDefinitionDisplayDriver.cs
index 86c4b5b4e2c..0410ab86bde 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentTypeDefinitionDisplayDriver.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentTypeDefinitionDisplayDriver.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+public interface IContentTypeDefinitionDisplayDriver : IDisplayDriver<ContentTypeDefinition, BuildDisplayContext, BuildEditorContext, UpdateTypeEditorContext>
 {
-    public interface IContentTypeDefinitionDisplayDriver : IDisplayDriver<ContentTypeDefinition, BuildDisplayContext, BuildEditorContext, UpdateTypeEditorContext>
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentTypePartDefinitionDisplayDriver.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentTypePartDefinitionDisplayDriver.cs
index 8b242b5725a..ca2b62af412 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentTypePartDefinitionDisplayDriver.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/IContentTypePartDefinitionDisplayDriver.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+public interface IContentTypePartDefinitionDisplayDriver : IDisplayDriver<ContentTypePartDefinition, BuildDisplayContext, BuildEditorContext, UpdateTypePartEditorContext>
 {
-    public interface IContentTypePartDefinitionDisplayDriver : IDisplayDriver<ContentTypePartDefinition, BuildDisplayContext, BuildEditorContext, UpdateTypePartEditorContext>
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdateContentDefinitionEditorContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdateContentDefinitionEditorContext.cs
index 0e7c21ef5ae..b173ac0def6 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdateContentDefinitionEditorContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdateContentDefinitionEditorContext.cs
@@ -3,23 +3,22 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Zones;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+public class UpdateContentDefinitionEditorContext<TBuilder> : UpdateEditorContext
 {
-    public class UpdateContentDefinitionEditorContext<TBuilder> : UpdateEditorContext
+    public UpdateContentDefinitionEditorContext(
+        TBuilder builder,
+        IShape model,
+        string groupId,
+        bool isNew,
+        IShapeFactory shapeFactory,
+        IZoneHolding layout,
+        IUpdateModel updater)
+        : base(model, groupId, isNew, "", shapeFactory, layout, updater)
     {
-        public UpdateContentDefinitionEditorContext(
-            TBuilder builder,
-            IShape model,
-            string groupId,
-            bool isNew,
-            IShapeFactory shapeFactory,
-            IZoneHolding layout,
-            IUpdateModel updater)
-            : base(model, groupId, isNew, "", shapeFactory, layout, updater)
-        {
-            Builder = builder;
-        }
-
-        public TBuilder Builder { get; private set; }
+        Builder = builder;
     }
+
+    public TBuilder Builder { get; private set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdatePartEditorContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdatePartEditorContext.cs
index b812020e8f4..a0b8c15ffe7 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdatePartEditorContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdatePartEditorContext.cs
@@ -3,20 +3,19 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Zones;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+public class UpdatePartEditorContext : UpdateContentDefinitionEditorContext<ContentPartDefinitionBuilder>
 {
-    public class UpdatePartEditorContext : UpdateContentDefinitionEditorContext<ContentPartDefinitionBuilder>
+    public UpdatePartEditorContext(
+            ContentPartDefinitionBuilder builder,
+            IShape model,
+            string groupId,
+            bool isNew,
+            IShapeFactory shapeFactory,
+            IZoneHolding layout,
+            IUpdateModel updater)
+        : base(builder, model, groupId, isNew, shapeFactory, layout, updater)
     {
-        public UpdatePartEditorContext(
-                ContentPartDefinitionBuilder builder,
-                IShape model,
-                string groupId,
-                bool isNew,
-                IShapeFactory shapeFactory,
-                IZoneHolding layout,
-                IUpdateModel updater)
-            : base(builder, model, groupId, isNew, shapeFactory, layout, updater)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdatePartFieldEditorContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdatePartFieldEditorContext.cs
index 317de394585..774bc2afc92 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdatePartFieldEditorContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdatePartFieldEditorContext.cs
@@ -3,20 +3,19 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Zones;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+public class UpdatePartFieldEditorContext : UpdateContentDefinitionEditorContext<ContentPartFieldDefinitionBuilder>
 {
-    public class UpdatePartFieldEditorContext : UpdateContentDefinitionEditorContext<ContentPartFieldDefinitionBuilder>
+    public UpdatePartFieldEditorContext(
+            ContentPartFieldDefinitionBuilder builder,
+            IShape model,
+            string groupId,
+            bool isNew,
+            IShapeFactory shapeFactory,
+            IZoneHolding layout,
+            IUpdateModel updater)
+        : base(builder, model, groupId, isNew, shapeFactory, layout, updater)
     {
-        public UpdatePartFieldEditorContext(
-                ContentPartFieldDefinitionBuilder builder,
-                IShape model,
-                string groupId,
-                bool isNew,
-                IShapeFactory shapeFactory,
-                IZoneHolding layout,
-                IUpdateModel updater)
-            : base(builder, model, groupId, isNew, shapeFactory, layout, updater)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdateTypeEditorContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdateTypeEditorContext.cs
index c988b7317c9..42b089a5ab9 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdateTypeEditorContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdateTypeEditorContext.cs
@@ -3,20 +3,19 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Zones;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+public class UpdateTypeEditorContext : UpdateContentDefinitionEditorContext<ContentTypeDefinitionBuilder>
 {
-    public class UpdateTypeEditorContext : UpdateContentDefinitionEditorContext<ContentTypeDefinitionBuilder>
+    public UpdateTypeEditorContext(
+            ContentTypeDefinitionBuilder builder,
+            IShape model,
+            string groupId,
+            bool isNew,
+            IShapeFactory shapeFactory,
+            IZoneHolding layout,
+            IUpdateModel updater)
+        : base(builder, model, groupId, isNew, shapeFactory, layout, updater)
     {
-        public UpdateTypeEditorContext(
-                ContentTypeDefinitionBuilder builder,
-                IShape model,
-                string groupId,
-                bool isNew,
-                IShapeFactory shapeFactory,
-                IZoneHolding layout,
-                IUpdateModel updater)
-            : base(builder, model, groupId, isNew, shapeFactory, layout, updater)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdateTypePartEditorContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdateTypePartEditorContext.cs
index 1f9f45e65dd..6125490a4c4 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdateTypePartEditorContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Editors/UpdateTypePartEditorContext.cs
@@ -3,20 +3,19 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Zones;
 
-namespace OrchardCore.ContentTypes.Editors
+namespace OrchardCore.ContentTypes.Editors;
+
+public class UpdateTypePartEditorContext : UpdateContentDefinitionEditorContext<ContentTypePartDefinitionBuilder>
 {
-    public class UpdateTypePartEditorContext : UpdateContentDefinitionEditorContext<ContentTypePartDefinitionBuilder>
+    public UpdateTypePartEditorContext(
+            ContentTypePartDefinitionBuilder builder,
+            IShape model,
+            string groupId,
+            bool isNew,
+            IShapeFactory shapeFactory,
+            IZoneHolding layout,
+            IUpdateModel updater)
+        : base(builder, model, groupId, isNew, shapeFactory, layout, updater)
     {
-        public UpdateTypePartEditorContext(
-                ContentTypePartDefinitionBuilder builder,
-                IShape model,
-                string groupId,
-                bool isNew,
-                IShapeFactory shapeFactory,
-                IZoneHolding layout,
-                IUpdateModel updater)
-            : base(builder, model, groupId, isNew, shapeFactory, layout, updater)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentFieldAttachedContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentFieldAttachedContext.cs
index 210274a8d04..1d65701209f 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentFieldAttachedContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentFieldAttachedContext.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.ContentTypes.Events
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentFieldAttachedContext : ContentPartFieldContext
 {
-    public class ContentFieldAttachedContext : ContentPartFieldContext
-    {
-        public string ContentFieldTypeName { get; set; }
-        public string ContentFieldDisplayName { get; set; }
-    }
+    public string ContentFieldTypeName { get; set; }
+    public string ContentFieldDisplayName { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentFieldDetachedContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentFieldDetachedContext.cs
index 1813b23de9d..6c97c6d9b29 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentFieldDetachedContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentFieldDetachedContext.cs
@@ -1,4 +1,3 @@
-namespace OrchardCore.ContentTypes.Events
-{
-    public class ContentFieldDetachedContext : ContentPartFieldContext { }
-}
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentFieldDetachedContext : ContentPartFieldContext { }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentFieldUpdatedContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentFieldUpdatedContext.cs
index 795547cd5ab..32488208617 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentFieldUpdatedContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentFieldUpdatedContext.cs
@@ -1,4 +1,3 @@
-namespace OrchardCore.ContentTypes.Events
-{
-    public class ContentFieldUpdatedContext : ContentPartFieldContext { }
-}
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentFieldUpdatedContext : ContentPartFieldContext { }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartAttachedContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartAttachedContext.cs
index 7124a257daa..0b922be9a69 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartAttachedContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartAttachedContext.cs
@@ -1,4 +1,3 @@
-namespace OrchardCore.ContentTypes.Events
-{
-    public class ContentPartAttachedContext : ContentTypePartContext { }
-}
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentPartAttachedContext : ContentTypePartContext { }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartContext.cs
index 1c0982355e3..39605b095ae 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartContext.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentTypes.Events
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentPartContext
 {
-    public class ContentPartContext
-    {
-        public ContentPartDefinition ContentPartDefinition { get; set; }
-    }
+    public ContentPartDefinition ContentPartDefinition { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartCreatedContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartCreatedContext.cs
index 2d639c8d69e..55adf3ec7d6 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartCreatedContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartCreatedContext.cs
@@ -1,4 +1,3 @@
-namespace OrchardCore.ContentTypes.Events
-{
-    public class ContentPartCreatedContext : ContentPartContext { }
-}
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentPartCreatedContext : ContentPartContext { }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartDetachedContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartDetachedContext.cs
index e0c8674becc..30d7821c986 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartDetachedContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartDetachedContext.cs
@@ -1,4 +1,3 @@
-namespace OrchardCore.ContentTypes.Events
-{
-    public class ContentPartDetachedContext : ContentTypePartContext { }
-}
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentPartDetachedContext : ContentTypePartContext { }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartFieldContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartFieldContext.cs
index 9261b619451..0810d015623 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartFieldContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartFieldContext.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.ContentTypes.Events
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentPartFieldContext
 {
-    public class ContentPartFieldContext
-    {
-        public string ContentPartName { get; set; }
-        public string ContentFieldName { get; set; }
-    }
+    public string ContentPartName { get; set; }
+    public string ContentFieldName { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartFieldUpdatedContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartFieldUpdatedContext.cs
index c6ac4484125..60de7dd028e 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartFieldUpdatedContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartFieldUpdatedContext.cs
@@ -1,4 +1,3 @@
-namespace OrchardCore.ContentTypes.Events
-{
-    public class ContentPartFieldUpdatedContext : ContentPartFieldContext { }
-}
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentPartFieldUpdatedContext : ContentPartFieldContext { }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartImportedContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartImportedContext.cs
index fddb186c00f..77124f44cd1 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartImportedContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartImportedContext.cs
@@ -1,4 +1,3 @@
-namespace OrchardCore.ContentTypes.Events
-{
-    public class ContentPartImportedContext : ContentPartContext { }
-}
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentPartImportedContext : ContentPartContext { }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartImportingContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartImportingContext.cs
index 987829ba7fb..24cbdceb281 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartImportingContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartImportingContext.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.ContentTypes.Events
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentPartImportingContext : ContentPartContext
 {
-    public class ContentPartImportingContext : ContentPartContext
-    {
-        public string ContentPartName { get; set; }
-    }
+    public string ContentPartName { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartRemovedContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartRemovedContext.cs
index d9b51ff259e..b0fa82c9fb3 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartRemovedContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartRemovedContext.cs
@@ -1,4 +1,3 @@
-namespace OrchardCore.ContentTypes.Events
-{
-    public class ContentPartRemovedContext : ContentPartContext { }
-}
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentPartRemovedContext : ContentPartContext { }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartUpdatedContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartUpdatedContext.cs
index 9e67731700c..67863de720c 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartUpdatedContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentPartUpdatedContext.cs
@@ -1,4 +1,3 @@
-namespace OrchardCore.ContentTypes.Events
-{
-    public class ContentPartUpdatedContext : ContentPartContext { }
-}
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentPartUpdatedContext : ContentPartContext { }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeContext.cs
index ab200ade661..27332e38e81 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeContext.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.ContentTypes.Events
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentTypeContext
 {
-    public class ContentTypeContext
-    {
-        public ContentTypeDefinition ContentTypeDefinition { get; set; }
-    }
+    public ContentTypeDefinition ContentTypeDefinition { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeCreatedContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeCreatedContext.cs
index 9559ef78a98..4d6f896b7ff 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeCreatedContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeCreatedContext.cs
@@ -1,4 +1,3 @@
-namespace OrchardCore.ContentTypes.Events
-{
-    public class ContentTypeCreatedContext : ContentTypeContext { }
-}
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentTypeCreatedContext : ContentTypeContext { }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeImportedContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeImportedContext.cs
index 507b1a392ad..1e45b58ae65 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeImportedContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeImportedContext.cs
@@ -1,4 +1,3 @@
-namespace OrchardCore.ContentTypes.Events
-{
-    public class ContentTypeImportedContext : ContentTypeContext { }
-}
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentTypeImportedContext : ContentTypeContext { }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeImportingContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeImportingContext.cs
index 5bf55738039..a4079dc0956 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeImportingContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeImportingContext.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.ContentTypes.Events
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentTypeImportingContext : ContentTypeContext
 {
-    public class ContentTypeImportingContext : ContentTypeContext
-    {
-        public string ContentTypeName { get; set; }
-    }
+    public string ContentTypeName { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypePartContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypePartContext.cs
index 4fba6e82126..fb84d29cf6f 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypePartContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypePartContext.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.ContentTypes.Events
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentTypePartContext
 {
-    public class ContentTypePartContext
-    {
-        public string ContentTypeName { get; set; }
-        public string ContentPartName { get; set; }
-    }
+    public string ContentTypeName { get; set; }
+    public string ContentPartName { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypePartUpdatedContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypePartUpdatedContext.cs
index 467821f7fcc..2e94fef4875 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypePartUpdatedContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypePartUpdatedContext.cs
@@ -1,4 +1,3 @@
-namespace OrchardCore.ContentTypes.Events
-{
-    public class ContentTypePartUpdatedContext : ContentTypePartContext { }
-}
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentTypePartUpdatedContext : ContentTypePartContext { }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeRemovedContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeRemovedContext.cs
index 8e6104c2bc7..b0dd15e5d7d 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeRemovedContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeRemovedContext.cs
@@ -1,4 +1,3 @@
-namespace OrchardCore.ContentTypes.Events
-{
-    public class ContentTypeRemovedContext : ContentTypeContext { }
-}
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentTypeRemovedContext : ContentTypeContext { }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeUpdatedContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeUpdatedContext.cs
index d9d9c15ca7f..4b498413cab 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeUpdatedContext.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/ContentTypeUpdatedContext.cs
@@ -1,4 +1,3 @@
-namespace OrchardCore.ContentTypes.Events
-{
-    public class ContentTypeUpdatedContext : ContentTypeContext { }
-}
+namespace OrchardCore.ContentTypes.Events;
+
+public class ContentTypeUpdatedContext : ContentTypeContext { }
diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/IContentDefinitionEventHandler.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/IContentDefinitionEventHandler.cs
index 11f3b47e348..b711a15dafd 100644
--- a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/IContentDefinitionEventHandler.cs
+++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/Events/IContentDefinitionEventHandler.cs
@@ -1,23 +1,22 @@
-namespace OrchardCore.ContentTypes.Events
+namespace OrchardCore.ContentTypes.Events;
+
+public interface IContentDefinitionEventHandler
 {
-    public interface IContentDefinitionEventHandler
-    {
-        void ContentTypeCreated(ContentTypeCreatedContext context);
-        void ContentTypeUpdated(ContentTypeUpdatedContext context);
-        void ContentTypeRemoved(ContentTypeRemovedContext context);
-        void ContentTypeImporting(ContentTypeImportingContext context);
-        void ContentTypeImported(ContentTypeImportedContext context);
-        void ContentPartCreated(ContentPartCreatedContext context);
-        void ContentPartUpdated(ContentPartUpdatedContext context);
-        void ContentPartRemoved(ContentPartRemovedContext context);
-        void ContentPartAttached(ContentPartAttachedContext context);
-        void ContentPartDetached(ContentPartDetachedContext context);
-        void ContentPartImporting(ContentPartImportingContext context);
-        void ContentPartImported(ContentPartImportedContext context);
-        void ContentTypePartUpdated(ContentTypePartUpdatedContext context);
-        void ContentFieldAttached(ContentFieldAttachedContext context);
-        void ContentFieldUpdated(ContentFieldUpdatedContext context);
-        void ContentFieldDetached(ContentFieldDetachedContext context);
-        void ContentPartFieldUpdated(ContentPartFieldUpdatedContext context);
-    }
+    void ContentTypeCreated(ContentTypeCreatedContext context);
+    void ContentTypeUpdated(ContentTypeUpdatedContext context);
+    void ContentTypeRemoved(ContentTypeRemovedContext context);
+    void ContentTypeImporting(ContentTypeImportingContext context);
+    void ContentTypeImported(ContentTypeImportedContext context);
+    void ContentPartCreated(ContentPartCreatedContext context);
+    void ContentPartUpdated(ContentPartUpdatedContext context);
+    void ContentPartRemoved(ContentPartRemovedContext context);
+    void ContentPartAttached(ContentPartAttachedContext context);
+    void ContentPartDetached(ContentPartDetachedContext context);
+    void ContentPartImporting(ContentPartImportingContext context);
+    void ContentPartImported(ContentPartImportedContext context);
+    void ContentTypePartUpdated(ContentTypePartUpdatedContext context);
+    void ContentFieldAttached(ContentFieldAttachedContext context);
+    void ContentFieldUpdated(ContentFieldUpdatedContext context);
+    void ContentFieldDetached(ContentFieldDetachedContext context);
+    void ContentPartFieldUpdated(ContentPartFieldUpdatedContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Contents.Core/AuthorizationServiceExtensions.cs b/src/OrchardCore/OrchardCore.Contents.Core/AuthorizationServiceExtensions.cs
index c03789f64c6..efc3c056e08 100644
--- a/src/OrchardCore/OrchardCore.Contents.Core/AuthorizationServiceExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Contents.Core/AuthorizationServiceExtensions.cs
@@ -8,99 +8,98 @@
 using OrchardCore.Contents.Security;
 using OrchardCore.Security.Permissions;
 
-namespace Microsoft.AspNetCore.Authorization
+namespace Microsoft.AspNetCore.Authorization;
+
+public static class AuthorizationServiceExtensions
 {
-    public static class AuthorizationServiceExtensions
+    public static Task<bool> AuthorizeContentTypeAsync(this IAuthorizationService service, ClaimsPrincipal user, Permission requiredPermission, ContentTypeDefinition contentTypeDefinition, string owner = null)
     {
-        public static Task<bool> AuthorizeContentTypeAsync(this IAuthorizationService service, ClaimsPrincipal user, Permission requiredPermission, ContentTypeDefinition contentTypeDefinition, string owner = null)
-        {
-            ArgumentNullException.ThrowIfNull(contentTypeDefinition);
-
-            return service.AuthorizeContentTypeAsync(user, requiredPermission, contentTypeDefinition.Name, owner);
-        }
-
-        public static Task<bool> AuthorizeContentTypeAsync(this IAuthorizationService service, ClaimsPrincipal user, Permission requiredPermission, string contentType, string owner = null)
-        {
-            ArgumentNullException.ThrowIfNull(user);
+        ArgumentNullException.ThrowIfNull(contentTypeDefinition);
 
-            ArgumentNullException.ThrowIfNull(requiredPermission);
+        return service.AuthorizeContentTypeAsync(user, requiredPermission, contentTypeDefinition.Name, owner);
+    }
 
-            if (string.IsNullOrWhiteSpace(contentType))
-            {
-                throw new ArgumentException($"{nameof(contentType)} cannot be empty.");
-            }
+    public static Task<bool> AuthorizeContentTypeAsync(this IAuthorizationService service, ClaimsPrincipal user, Permission requiredPermission, string contentType, string owner = null)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            var item = new ContentItem()
-            {
-                ContentType = contentType,
-                Owner = owner,
-            };
+        ArgumentNullException.ThrowIfNull(requiredPermission);
 
-            return service.AuthorizeAsync(user, requiredPermission, item);
+        if (string.IsNullOrWhiteSpace(contentType))
+        {
+            throw new ArgumentException($"{nameof(contentType)} cannot be empty.");
         }
 
-        /// <summary>
-        /// Evaluate if we have a specific owner variation permission to at least one content type.
-        /// </summary>
-        public static async Task<bool> AuthorizeContentTypeDefinitionsAsync(this IAuthorizationService service, ClaimsPrincipal user, Permission requiredPermission, IEnumerable<ContentTypeDefinition> contentTypeDefinitions, IContentManager contentManager)
+        var item = new ContentItem()
         {
-            ArgumentNullException.ThrowIfNull(user);
-            ArgumentNullException.ThrowIfNull(requiredPermission);
-            ArgumentNullException.ThrowIfNull(contentManager);
+            ContentType = contentType,
+            Owner = owner,
+        };
 
-            var permission = GetOwnerVariation(requiredPermission) ?? requiredPermission;
+        return service.AuthorizeAsync(user, requiredPermission, item);
+    }
 
-            var contentTypePermission = ContentTypePermissionsHelper.ConvertToDynamicPermission(permission);
+    /// <summary>
+    /// Evaluate if we have a specific owner variation permission to at least one content type.
+    /// </summary>
+    public static async Task<bool> AuthorizeContentTypeDefinitionsAsync(this IAuthorizationService service, ClaimsPrincipal user, Permission requiredPermission, IEnumerable<ContentTypeDefinition> contentTypeDefinitions, IContentManager contentManager)
+    {
+        ArgumentNullException.ThrowIfNull(user);
+        ArgumentNullException.ThrowIfNull(requiredPermission);
+        ArgumentNullException.ThrowIfNull(contentManager);
 
-            foreach (var contentTypeDefinition in contentTypeDefinitions)
-            {
-                var dynamicPermission = ContentTypePermissionsHelper.CreateDynamicPermission(contentTypePermission, contentTypeDefinition);
+        var permission = GetOwnerVariation(requiredPermission) ?? requiredPermission;
 
-                var contentItem = await contentManager.NewAsync(contentTypeDefinition.Name);
-                contentItem.Owner = user.FindFirstValue(ClaimTypes.NameIdentifier);
+        var contentTypePermission = ContentTypePermissionsHelper.ConvertToDynamicPermission(permission);
 
-                if (await service.AuthorizeAsync(user, dynamicPermission, contentItem))
-                {
-                    return true;
-                }
-            }
+        foreach (var contentTypeDefinition in contentTypeDefinitions)
+        {
+            var dynamicPermission = ContentTypePermissionsHelper.CreateDynamicPermission(contentTypePermission, contentTypeDefinition);
 
-            return await service.AuthorizeAsync(user, permission);
-        }
+            var contentItem = await contentManager.NewAsync(contentTypeDefinition.Name);
+            contentItem.Owner = user.FindFirstValue(ClaimTypes.NameIdentifier);
 
-        private static Permission GetOwnerVariation(Permission permission)
-        {
-            if (permission.Name == CommonPermissions.PublishContent.Name)
+            if (await service.AuthorizeAsync(user, dynamicPermission, contentItem))
             {
-                return CommonPermissions.PublishOwnContent;
+                return true;
             }
+        }
 
-            if (permission.Name == CommonPermissions.EditContent.Name)
-            {
-                return CommonPermissions.EditOwnContent;
-            }
+        return await service.AuthorizeAsync(user, permission);
+    }
 
-            if (permission.Name == CommonPermissions.DeleteContent.Name)
-            {
-                return CommonPermissions.DeleteOwnContent;
-            }
+    private static Permission GetOwnerVariation(Permission permission)
+    {
+        if (permission.Name == CommonPermissions.PublishContent.Name)
+        {
+            return CommonPermissions.PublishOwnContent;
+        }
 
-            if (permission.Name == CommonPermissions.ViewContent.Name)
-            {
-                return CommonPermissions.ViewOwnContent;
-            }
+        if (permission.Name == CommonPermissions.EditContent.Name)
+        {
+            return CommonPermissions.EditOwnContent;
+        }
 
-            if (permission.Name == CommonPermissions.PreviewContent.Name)
-            {
-                return CommonPermissions.PreviewOwnContent;
-            }
+        if (permission.Name == CommonPermissions.DeleteContent.Name)
+        {
+            return CommonPermissions.DeleteOwnContent;
+        }
 
-            if (permission.Name == CommonPermissions.CloneContent.Name)
-            {
-                return CommonPermissions.CloneOwnContent;
-            }
+        if (permission.Name == CommonPermissions.ViewContent.Name)
+        {
+            return CommonPermissions.ViewOwnContent;
+        }
 
-            return null;
+        if (permission.Name == CommonPermissions.PreviewContent.Name)
+        {
+            return CommonPermissions.PreviewOwnContent;
         }
+
+        if (permission.Name == CommonPermissions.CloneContent.Name)
+        {
+            return CommonPermissions.CloneOwnContent;
+        }
+
+        return null;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Contents.Core/Indexing/IndexingConstants.cs b/src/OrchardCore/OrchardCore.Contents.Core/Indexing/IndexingConstants.cs
index 2a02b8a9185..b6b647f5a28 100644
--- a/src/OrchardCore/OrchardCore.Contents.Core/Indexing/IndexingConstants.cs
+++ b/src/OrchardCore/OrchardCore.Contents.Core/Indexing/IndexingConstants.cs
@@ -1,28 +1,27 @@
-namespace OrchardCore.Contents.Indexing
+namespace OrchardCore.Contents.Indexing;
+
+public static class IndexingConstants
 {
-    public static class IndexingConstants
-    {
-        public const string OwnerKey = "Content.ContentItem.Owner";
-        public const string AuthorKey = "Content.ContentItem.Author";
-        public const string ContentTypeKey = "Content.ContentItem.ContentType";
-        public const string ContentItemIdKey = "ContentItemId";
-        public const string ContentItemVersionIdKey = "ContentItemVersionId";
-        public const string CreatedUtcKey = "Content.ContentItem.CreatedUtc";
-        public const string LatestKey = "Content.ContentItem.Latest";
-        public const string ModifiedUtcKey = "Content.ContentItem.ModifiedUtc";
-        public const string PublishedKey = "Content.ContentItem.Published";
-        public const string PublishedUtcKey = "Content.ContentItem.PublishedUtc";
-        public const string BodyAspectBodyKey = "Content.BodyAspect.Body";
-        public const string DisplayTextKey = "Content.ContentItem.DisplayText";
-        public const string DisplayTextAnalyzedKey = "Content.ContentItem.DisplayText.Analyzed";
-        public const string DisplayTextNormalizedKey = "Content.ContentItem.DisplayText.Normalized";
-        public const string FullTextKey = "Content.ContentItem.FullText";
-        public const string ContainedPartKey = "Content.ContentItem.ContainedPart";
-        public const string KeywordKey = ".keyword";
-        public const string InheritedKey = ".Inherited";
-        public const string IdsKey = ".Ids";
-        public const string OrderKey = ".Order";
-        public const string SourceKey = "_source.";
-        public const string NullValue = "NULL";
-    }
+    public const string OwnerKey = "Content.ContentItem.Owner";
+    public const string AuthorKey = "Content.ContentItem.Author";
+    public const string ContentTypeKey = "Content.ContentItem.ContentType";
+    public const string ContentItemIdKey = "ContentItemId";
+    public const string ContentItemVersionIdKey = "ContentItemVersionId";
+    public const string CreatedUtcKey = "Content.ContentItem.CreatedUtc";
+    public const string LatestKey = "Content.ContentItem.Latest";
+    public const string ModifiedUtcKey = "Content.ContentItem.ModifiedUtc";
+    public const string PublishedKey = "Content.ContentItem.Published";
+    public const string PublishedUtcKey = "Content.ContentItem.PublishedUtc";
+    public const string BodyAspectBodyKey = "Content.BodyAspect.Body";
+    public const string DisplayTextKey = "Content.ContentItem.DisplayText";
+    public const string DisplayTextAnalyzedKey = "Content.ContentItem.DisplayText.Analyzed";
+    public const string DisplayTextNormalizedKey = "Content.ContentItem.DisplayText.Normalized";
+    public const string FullTextKey = "Content.ContentItem.FullText";
+    public const string ContainedPartKey = "Content.ContentItem.ContainedPart";
+    public const string KeywordKey = ".keyword";
+    public const string InheritedKey = ".Inherited";
+    public const string IdsKey = ".Ids";
+    public const string OrderKey = ".Order";
+    public const string SourceKey = "_source.";
+    public const string NullValue = "NULL";
 }
diff --git a/src/OrchardCore/OrchardCore.Contents.Core/Services/ContentItemFilterEngineModelBinder.cs b/src/OrchardCore/OrchardCore.Contents.Core/Services/ContentItemFilterEngineModelBinder.cs
index d942fd06260..94afdd62a5b 100644
--- a/src/OrchardCore/OrchardCore.Contents.Core/Services/ContentItemFilterEngineModelBinder.cs
+++ b/src/OrchardCore/OrchardCore.Contents.Core/Services/ContentItemFilterEngineModelBinder.cs
@@ -2,41 +2,40 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Contents.Services
+namespace OrchardCore.Contents.Services;
+
+public class ContentItemFilterEngineModelBinder : IModelBinder
 {
-    public class ContentItemFilterEngineModelBinder : IModelBinder
-    {
-        private readonly IContentsAdminListFilterParser _parser;
+    private readonly IContentsAdminListFilterParser _parser;
 
-        public ContentItemFilterEngineModelBinder(IContentsAdminListFilterParser parser)
-        {
-            _parser = parser;
-        }
+    public ContentItemFilterEngineModelBinder(IContentsAdminListFilterParser parser)
+    {
+        _parser = parser;
+    }
 
-        public Task BindModelAsync(ModelBindingContext bindingContext)
-        {
-            ArgumentNullException.ThrowIfNull(bindingContext);
+    public Task BindModelAsync(ModelBindingContext bindingContext)
+    {
+        ArgumentNullException.ThrowIfNull(bindingContext);
 
-            var modelName = bindingContext.ModelName;
+        var modelName = bindingContext.ModelName;
 
-            // Try to fetch the value of the argument by name q=
-            var valueProviderResult = bindingContext.ValueProvider.GetValue(modelName);
+        // Try to fetch the value of the argument by name q=
+        var valueProviderResult = bindingContext.ValueProvider.GetValue(modelName);
 
-            if (valueProviderResult == ValueProviderResult.None)
-            {
-                bindingContext.Result = ModelBindingResult.Success(_parser.Parse(string.Empty));
+        if (valueProviderResult == ValueProviderResult.None)
+        {
+            bindingContext.Result = ModelBindingResult.Success(_parser.Parse(string.Empty));
 
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            bindingContext.ModelState.SetModelValue(modelName, valueProviderResult);
+        bindingContext.ModelState.SetModelValue(modelName, valueProviderResult);
 
-            var value = valueProviderResult.FirstValue;
+        var value = valueProviderResult.FirstValue;
 
-            // When value is null or empty the parser returns an empty result.
-            bindingContext.Result = ModelBindingResult.Success(_parser.Parse(value));
+        // When value is null or empty the parser returns an empty result.
+        bindingContext.Result = ModelBindingResult.Success(_parser.Parse(value));
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Contents.Core/Services/ContentQueryContext.cs b/src/OrchardCore/OrchardCore.Contents.Core/Services/ContentQueryContext.cs
index 53c7ae419fd..72fdbf3a8e5 100644
--- a/src/OrchardCore/OrchardCore.Contents.Core/Services/ContentQueryContext.cs
+++ b/src/OrchardCore/OrchardCore.Contents.Core/Services/ContentQueryContext.cs
@@ -3,15 +3,14 @@
 using YesSql;
 using YesSql.Filters.Query.Services;
 
-namespace OrchardCore.Contents.Services
+namespace OrchardCore.Contents.Services;
+
+public class ContentQueryContext : QueryExecutionContext<ContentItem>
 {
-    public class ContentQueryContext : QueryExecutionContext<ContentItem>
+    public ContentQueryContext(IServiceProvider serviceProvider, IQuery<ContentItem> query) : base(query)
     {
-        public ContentQueryContext(IServiceProvider serviceProvider, IQuery<ContentItem> query) : base(query)
-        {
-            ServiceProvider = serviceProvider;
-        }
-
-        public IServiceProvider ServiceProvider { get; }
+        ServiceProvider = serviceProvider;
     }
+
+    public IServiceProvider ServiceProvider { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Contents.Core/Services/IContentsAdminListFilter.cs b/src/OrchardCore/OrchardCore.Contents.Core/Services/IContentsAdminListFilter.cs
index edd6574c48a..2ef9e0f994b 100644
--- a/src/OrchardCore/OrchardCore.Contents.Core/Services/IContentsAdminListFilter.cs
+++ b/src/OrchardCore/OrchardCore.Contents.Core/Services/IContentsAdminListFilter.cs
@@ -4,15 +4,14 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using YesSql;
 
-namespace OrchardCore.Contents.Services
+namespace OrchardCore.Contents.Services;
+
+/// <summary>
+/// Provides custom filters to the content items admin listing.
+/// <see cref="IContentsAdminListFilterProvider"/> is the preferred way to extend the contents list.
+/// This abstraction remains to support backwards compatability, and alternate extension points.
+/// </summary>
+public interface IContentsAdminListFilter
 {
-    /// <summary>
-    /// Provides custom filters to the content items admin listing.
-    /// <see cref="IContentsAdminListFilterProvider"/> is the preferred way to extend the contents list.
-    /// This abstraction remains to support backwards compatability, and alternate extension points.
-    /// </summary>
-    public interface IContentsAdminListFilter
-    {
-        Task FilterAsync(ContentOptionsViewModel model, IQuery<ContentItem> query, IUpdateModel updater);
-    }
+    Task FilterAsync(ContentOptionsViewModel model, IQuery<ContentItem> query, IUpdateModel updater);
 }
diff --git a/src/OrchardCore/OrchardCore.Contents.Core/Services/IContentsAdminListFilterParser.cs b/src/OrchardCore/OrchardCore.Contents.Core/Services/IContentsAdminListFilterParser.cs
index 1de1a1dd431..a0de7fddd7b 100644
--- a/src/OrchardCore/OrchardCore.Contents.Core/Services/IContentsAdminListFilterParser.cs
+++ b/src/OrchardCore/OrchardCore.Contents.Core/Services/IContentsAdminListFilterParser.cs
@@ -1,9 +1,8 @@
 using OrchardCore.ContentManagement;
 using YesSql.Filters.Query;
 
-namespace OrchardCore.Contents.Services
+namespace OrchardCore.Contents.Services;
+
+public interface IContentsAdminListFilterParser : IQueryParser<ContentItem>
 {
-    public interface IContentsAdminListFilterParser : IQueryParser<ContentItem>
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Contents.Core/Services/IContentsAdminListFilterProvider.cs b/src/OrchardCore/OrchardCore.Contents.Core/Services/IContentsAdminListFilterProvider.cs
index c91421f4160..7e153054a53 100644
--- a/src/OrchardCore/OrchardCore.Contents.Core/Services/IContentsAdminListFilterProvider.cs
+++ b/src/OrchardCore/OrchardCore.Contents.Core/Services/IContentsAdminListFilterProvider.cs
@@ -1,13 +1,12 @@
 using OrchardCore.ContentManagement;
 using YesSql.Filters.Query;
 
-namespace OrchardCore.Contents.Services
+namespace OrchardCore.Contents.Services;
+
+/// <summary>
+/// Provides a custom parsing engine rule set for filtering content items in the contents admin list.
+/// </summary>
+public interface IContentsAdminListFilterProvider
 {
-    /// <summary>
-    /// Provides a custom parsing engine rule set for filtering content items in the contents admin list.
-    /// </summary>
-    public interface IContentsAdminListFilterProvider
-    {
-        void Build(QueryEngineBuilder<ContentItem> builder);
-    }
+    void Build(QueryEngineBuilder<ContentItem> builder);
 }
diff --git a/src/OrchardCore/OrchardCore.Contents.Core/Services/IContentsAdminListQueryService.cs b/src/OrchardCore/OrchardCore.Contents.Core/Services/IContentsAdminListQueryService.cs
index 91d3f00ed9d..ec50418fbb0 100644
--- a/src/OrchardCore/OrchardCore.Contents.Core/Services/IContentsAdminListQueryService.cs
+++ b/src/OrchardCore/OrchardCore.Contents.Core/Services/IContentsAdminListQueryService.cs
@@ -4,10 +4,9 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using YesSql;
 
-namespace OrchardCore.Contents.Services
+namespace OrchardCore.Contents.Services;
+
+public interface IContentsAdminListQueryService
 {
-    public interface IContentsAdminListQueryService
-    {
-        Task<IQuery<ContentItem>> QueryAsync(ContentOptionsViewModel model, IUpdateModel updater);
-    }
+    Task<IQuery<ContentItem>> QueryAsync(ContentOptionsViewModel model, IUpdateModel updater);
 }
diff --git a/src/OrchardCore/OrchardCore.Contents.Core/ViewModels/ContentOptionsViewModel.cs b/src/OrchardCore/OrchardCore.Contents.Core/ViewModels/ContentOptionsViewModel.cs
index 5ead6ce5d4d..0db58c256e3 100644
--- a/src/OrchardCore/OrchardCore.Contents.Core/ViewModels/ContentOptionsViewModel.cs
+++ b/src/OrchardCore/OrchardCore.Contents.Core/ViewModels/ContentOptionsViewModel.cs
@@ -7,91 +7,90 @@
 using OrchardCore.Contents.Services;
 using YesSql.Filters.Query;
 
-namespace OrchardCore.Contents.ViewModels
+namespace OrchardCore.Contents.ViewModels;
+
+public class ContentOptionsViewModel
 {
-    public class ContentOptionsViewModel
+    public ContentOptionsViewModel()
     {
-        public ContentOptionsViewModel()
-        {
-            OrderBy = ContentsOrder.Modified;
-            BulkAction = ViewModels.ContentsBulkAction.None;
-            ContentsStatus = ContentsStatus.Latest;
-        }
-        public string SearchText { get; set; }
-        public string OriginalSearchText { get; set; }
+        OrderBy = ContentsOrder.Modified;
+        BulkAction = ViewModels.ContentsBulkAction.None;
+        ContentsStatus = ContentsStatus.Latest;
+    }
+    public string SearchText { get; set; }
+    public string OriginalSearchText { get; set; }
 
-        public string SelectedContentType { get; set; }
+    public string SelectedContentType { get; set; }
 
-        public bool CanCreateSelectedContentType { get; set; }
+    public bool CanCreateSelectedContentType { get; set; }
 
-        public ContentsOrder OrderBy { get; set; }
+    public ContentsOrder OrderBy { get; set; }
 
-        public ContentsStatus ContentsStatus { get; set; }
+    public ContentsStatus ContentsStatus { get; set; }
 
-        public ContentsBulkAction BulkAction { get; set; }
+    public ContentsBulkAction BulkAction { get; set; }
 
-        [ModelBinder(BinderType = typeof(ContentItemFilterEngineModelBinder), Name = nameof(SearchText))]
-        public QueryFilterResult<ContentItem> FilterResult { get; set; }
+    [ModelBinder(BinderType = typeof(ContentItemFilterEngineModelBinder), Name = nameof(SearchText))]
+    public QueryFilterResult<ContentItem> FilterResult { get; set; }
 
-        #region Values to populate
+    #region Values to populate
 
-        [BindNever]
-        public int StartIndex { get; set; }
-        public int EndIndex { get; set; }
+    [BindNever]
+    public int StartIndex { get; set; }
+    public int EndIndex { get; set; }
 
-        [BindNever]
-        public int ContentItemsCount { get; set; }
+    [BindNever]
+    public int ContentItemsCount { get; set; }
 
-        [BindNever]
-        public int TotalItemCount { get; set; }
+    [BindNever]
+    public int TotalItemCount { get; set; }
 
-        [BindNever]
-        public RouteValueDictionary RouteValues { get; set; } = [];
+    [BindNever]
+    public RouteValueDictionary RouteValues { get; set; } = [];
 
-        #endregion
+    #endregion
 
-        #region Lists to populate
+    #region Lists to populate
 
-        [BindNever]
-        public List<SelectListItem> ContentStatuses { get; set; }
+    [BindNever]
+    public List<SelectListItem> ContentStatuses { get; set; }
 
-        [BindNever]
-        public List<SelectListItem> ContentSorts { get; set; }
+    [BindNever]
+    public List<SelectListItem> ContentSorts { get; set; }
 
-        [BindNever]
-        public List<SelectListItem> ContentsBulkAction { get; set; }
+    [BindNever]
+    public List<SelectListItem> ContentsBulkAction { get; set; }
 
-        [BindNever]
-        public List<SelectListItem> ContentTypeOptions { get; set; }
+    [BindNever]
+    public List<SelectListItem> ContentTypeOptions { get; set; }
 
-        [BindNever]
-        public List<SelectListItem> CreatableTypes { get; set; }
+    [BindNever]
+    public List<SelectListItem> CreatableTypes { get; set; }
 
-        #endregion Lists to populate
-    }
+    #endregion Lists to populate
+}
 
-    public enum ContentsOrder
-    {
-        Modified,
-        Published,
-        Created,
-        Title,
-    }
+public enum ContentsOrder
+{
+    Modified,
+    Published,
+    Created,
+    Title,
+}
 
-    public enum ContentsStatus
-    {
-        Draft,
-        Published,
-        AllVersions,
-        Latest,
-        Owner
-    }
+public enum ContentsStatus
+{
+    Draft,
+    Published,
+    AllVersions,
+    Latest,
+    Owner
+}
 
-    public enum ContentsBulkAction
-    {
-        None,
-        PublishNow,
-        Unpublish,
-        Remove
-    }
+public enum ContentsBulkAction
+{
+    None,
+    PublishNow,
+    Unpublish,
+    Remove
 }
diff --git a/src/OrchardCore/OrchardCore.Contents.TagHelpers/ContentItemTagHelper.cs b/src/OrchardCore/OrchardCore.Contents.TagHelpers/ContentItemTagHelper.cs
index d97b86918a2..911feb1b311 100644
--- a/src/OrchardCore/OrchardCore.Contents.TagHelpers/ContentItemTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.Contents.TagHelpers/ContentItemTagHelper.cs
@@ -2,15 +2,14 @@
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.TagHelpers;
 
-namespace OrchardCore.Contents.TagHelpers
+namespace OrchardCore.Contents.TagHelpers;
+
+[HtmlTargetElement("contentitem")]
+public class ContentItemTagHelper : BaseShapeTagHelper
 {
-    [HtmlTargetElement("contentitem")]
-    public class ContentItemTagHelper : BaseShapeTagHelper
+    public ContentItemTagHelper(IShapeFactory shapeFactory, IDisplayHelper displayHelper)
+        : base(shapeFactory, displayHelper)
     {
-        public ContentItemTagHelper(IShapeFactory shapeFactory, IDisplayHelper displayHelper)
-            : base(shapeFactory, displayHelper)
-        {
-            Type = "ContentItem";
-        }
+        Type = "ContentItem";
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Contents.TagHelpers/ContentLinkTagHelper.cs b/src/OrchardCore/OrchardCore.Contents.TagHelpers/ContentLinkTagHelper.cs
index 1483b201653..ebffbc8369d 100644
--- a/src/OrchardCore/OrchardCore.Contents.TagHelpers/ContentLinkTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.Contents.TagHelpers/ContentLinkTagHelper.cs
@@ -9,195 +9,194 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata;
 
-namespace OrchardCore.Contents.TagHelpers
+namespace OrchardCore.Contents.TagHelpers;
+
+[HtmlTargetElement("a", Attributes = ContentLinkAdmin)]
+[HtmlTargetElement("a", Attributes = ContentLinkDisplay)]
+[HtmlTargetElement("a", Attributes = ContentLinkEdit)]
+[HtmlTargetElement("a", Attributes = ContentLinkRemove)]
+[HtmlTargetElement("a", Attributes = ContentLinkCreate)]
+public class ContentLinkTagHelper : TagHelper
 {
-    [HtmlTargetElement("a", Attributes = ContentLinkAdmin)]
-    [HtmlTargetElement("a", Attributes = ContentLinkDisplay)]
-    [HtmlTargetElement("a", Attributes = ContentLinkEdit)]
-    [HtmlTargetElement("a", Attributes = ContentLinkRemove)]
-    [HtmlTargetElement("a", Attributes = ContentLinkCreate)]
-    public class ContentLinkTagHelper : TagHelper
+    private const string ContentLinkAdmin = "admin-for";
+    private const string ContentLinkDisplay = "display-for";
+    private const string ContentLinkEdit = "edit-for";
+    private const string ContentLinkRemove = "remove-for";
+    private const string ContentLinkCreate = "create-for";
+    private const string RoutePrefix = "asp-route-";
+
+    private readonly IContentManager _contentManager;
+    private readonly IUrlHelperFactory _urlHelperFactory;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+
+    public ContentLinkTagHelper(
+        IContentManager contentManager,
+        IUrlHelperFactory urlHelperFactory,
+        IContentDefinitionManager contentDefinitionManager)
     {
-        private const string ContentLinkAdmin = "admin-for";
-        private const string ContentLinkDisplay = "display-for";
-        private const string ContentLinkEdit = "edit-for";
-        private const string ContentLinkRemove = "remove-for";
-        private const string ContentLinkCreate = "create-for";
-        private const string RoutePrefix = "asp-route-";
-
-        private readonly IContentManager _contentManager;
-        private readonly IUrlHelperFactory _urlHelperFactory;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-
-        public ContentLinkTagHelper(
-            IContentManager contentManager,
-            IUrlHelperFactory urlHelperFactory,
-            IContentDefinitionManager contentDefinitionManager)
-        {
-            _contentDefinitionManager = contentDefinitionManager;
-            _urlHelperFactory = urlHelperFactory;
-            _contentManager = contentManager;
-        }
+        _contentDefinitionManager = contentDefinitionManager;
+        _urlHelperFactory = urlHelperFactory;
+        _contentManager = contentManager;
+    }
 
-        [ViewContext]
-        [HtmlAttributeNotBound]
-        public ViewContext ViewContext { get; set; }
-
-        /// <summary>
-        /// Links to the admin page of this content item.
-        /// </summary>
-        [HtmlAttributeName(ContentLinkAdmin)]
-        public ContentItem AdminFor { get; set; }
-
-        /// <summary>
-        /// Links to the display page of this content item.
-        /// </summary>
-        [HtmlAttributeName(ContentLinkDisplay)]
-        public ContentItem DisplayFor { get; set; }
-
-        /// <summary>
-        /// Links to the edition page of this content item.
-        /// </summary>
-        [HtmlAttributeName(ContentLinkEdit)]
-        public ContentItem EditFor { get; set; }
-
-        /// <summary>
-        /// Links to the removal page of this content item.
-        /// </summary>
-        [HtmlAttributeName(ContentLinkRemove)]
-        public ContentItem RemoveFor { get; set; }
-
-        /// <summary>
-        /// Links to the creation page of this content item.
-        /// </summary>
-        [HtmlAttributeName(ContentLinkCreate)]
-        public ContentItem CreateFor { get; set; }
-
-        public override async Task ProcessAsync(TagHelperContext tagHelperContext, TagHelperOutput output)
-        {
-            ContentItemMetadata metadata = null;
-            ContentItem contentItem = null;
+    [ViewContext]
+    [HtmlAttributeNotBound]
+    public ViewContext ViewContext { get; set; }
+
+    /// <summary>
+    /// Links to the admin page of this content item.
+    /// </summary>
+    [HtmlAttributeName(ContentLinkAdmin)]
+    public ContentItem AdminFor { get; set; }
+
+    /// <summary>
+    /// Links to the display page of this content item.
+    /// </summary>
+    [HtmlAttributeName(ContentLinkDisplay)]
+    public ContentItem DisplayFor { get; set; }
+
+    /// <summary>
+    /// Links to the edition page of this content item.
+    /// </summary>
+    [HtmlAttributeName(ContentLinkEdit)]
+    public ContentItem EditFor { get; set; }
+
+    /// <summary>
+    /// Links to the removal page of this content item.
+    /// </summary>
+    [HtmlAttributeName(ContentLinkRemove)]
+    public ContentItem RemoveFor { get; set; }
+
+    /// <summary>
+    /// Links to the creation page of this content item.
+    /// </summary>
+    [HtmlAttributeName(ContentLinkCreate)]
+    public ContentItem CreateFor { get; set; }
+
+    public override async Task ProcessAsync(TagHelperContext tagHelperContext, TagHelperOutput output)
+    {
+        ContentItemMetadata metadata = null;
+        ContentItem contentItem = null;
 
-            var urlHelper = _urlHelperFactory.GetUrlHelper(ViewContext);
+        var urlHelper = _urlHelperFactory.GetUrlHelper(ViewContext);
 
-            if (DisplayFor != null)
-            {
-                contentItem = DisplayFor;
-                var previewAspect = await _contentManager.PopulateAspectAsync<PreviewAspect>(contentItem);
+        if (DisplayFor != null)
+        {
+            contentItem = DisplayFor;
+            var previewAspect = await _contentManager.PopulateAspectAsync<PreviewAspect>(contentItem);
 
-                if (!string.IsNullOrEmpty(previewAspect.PreviewUrl))
+            if (!string.IsNullOrEmpty(previewAspect.PreviewUrl))
+            {
+                var previewUrl = previewAspect.PreviewUrl;
+                if (!previewUrl.StartsWith("~/", StringComparison.OrdinalIgnoreCase))
                 {
-                    var previewUrl = previewAspect.PreviewUrl;
-                    if (!previewUrl.StartsWith("~/", StringComparison.OrdinalIgnoreCase))
+                    if (previewUrl.StartsWith('/'))
                     {
-                        if (previewUrl.StartsWith('/'))
-                        {
-                            previewUrl = '~' + previewUrl;
-                        }
-                        else
-                        {
-                            previewUrl = "~/" + previewUrl;
-                        }
+                        previewUrl = '~' + previewUrl;
+                    }
+                    else
+                    {
+                        previewUrl = "~/" + previewUrl;
                     }
-
-                    output.Attributes.SetAttribute("href", urlHelper.Content(previewUrl));
-                    return;
                 }
 
-                metadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(DisplayFor);
-
-                if (metadata.DisplayRouteValues == null)
-                {
-                    return;
-                }
+                output.Attributes.SetAttribute("href", urlHelper.Content(previewUrl));
+                return;
+            }
 
-                ApplyRouteValues(tagHelperContext, metadata.DisplayRouteValues);
+            metadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(DisplayFor);
 
-                output.Attributes.SetAttribute("href", urlHelper.Action(metadata.DisplayRouteValues["action"].ToString(), metadata.DisplayRouteValues));
-            }
-            else if (EditFor != null)
+            if (metadata.DisplayRouteValues == null)
             {
-                contentItem = EditFor;
-                metadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(EditFor);
+                return;
+            }
 
-                if (metadata.EditorRouteValues == null)
-                {
-                    return;
-                }
+            ApplyRouteValues(tagHelperContext, metadata.DisplayRouteValues);
 
-                ApplyRouteValues(tagHelperContext, metadata.EditorRouteValues);
+            output.Attributes.SetAttribute("href", urlHelper.Action(metadata.DisplayRouteValues["action"].ToString(), metadata.DisplayRouteValues));
+        }
+        else if (EditFor != null)
+        {
+            contentItem = EditFor;
+            metadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(EditFor);
 
-                output.Attributes.SetAttribute("href", urlHelper.Action(metadata.EditorRouteValues["action"].ToString(), metadata.EditorRouteValues));
-            }
-            else if (AdminFor != null)
+            if (metadata.EditorRouteValues == null)
             {
-                contentItem = AdminFor;
-                metadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(AdminFor);
+                return;
+            }
 
-                if (metadata.AdminRouteValues == null)
-                {
-                    return;
-                }
+            ApplyRouteValues(tagHelperContext, metadata.EditorRouteValues);
 
-                ApplyRouteValues(tagHelperContext, metadata.AdminRouteValues);
+            output.Attributes.SetAttribute("href", urlHelper.Action(metadata.EditorRouteValues["action"].ToString(), metadata.EditorRouteValues));
+        }
+        else if (AdminFor != null)
+        {
+            contentItem = AdminFor;
+            metadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(AdminFor);
 
-                output.Attributes.SetAttribute("href", urlHelper.Action(metadata.AdminRouteValues["action"].ToString(), metadata.AdminRouteValues));
-            }
-            else if (RemoveFor != null)
+            if (metadata.AdminRouteValues == null)
             {
-                contentItem = RemoveFor;
-                metadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(RemoveFor);
+                return;
+            }
 
-                if (metadata.RemoveRouteValues == null)
-                {
-                    return;
-                }
+            ApplyRouteValues(tagHelperContext, metadata.AdminRouteValues);
 
-                ApplyRouteValues(tagHelperContext, metadata.RemoveRouteValues);
+            output.Attributes.SetAttribute("href", urlHelper.Action(metadata.AdminRouteValues["action"].ToString(), metadata.AdminRouteValues));
+        }
+        else if (RemoveFor != null)
+        {
+            contentItem = RemoveFor;
+            metadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(RemoveFor);
 
-                output.Attributes.SetAttribute("href", urlHelper.Action(metadata.RemoveRouteValues["action"].ToString(), metadata.RemoveRouteValues));
-            }
-            else if (CreateFor != null)
+            if (metadata.RemoveRouteValues == null)
             {
-                contentItem = CreateFor;
-                metadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(CreateFor);
+                return;
+            }
 
-                if (metadata.CreateRouteValues == null)
-                {
-                    return;
-                }
+            ApplyRouteValues(tagHelperContext, metadata.RemoveRouteValues);
 
-                ApplyRouteValues(tagHelperContext, metadata.CreateRouteValues);
+            output.Attributes.SetAttribute("href", urlHelper.Action(metadata.RemoveRouteValues["action"].ToString(), metadata.RemoveRouteValues));
+        }
+        else if (CreateFor != null)
+        {
+            contentItem = CreateFor;
+            metadata = await _contentManager.PopulateAspectAsync<ContentItemMetadata>(CreateFor);
 
-                output.Attributes.SetAttribute("href", urlHelper.Action(metadata.CreateRouteValues["action"].ToString(), metadata.CreateRouteValues));
+            if (metadata.CreateRouteValues == null)
+            {
+                return;
             }
 
-            // A self closing anchor tag will be rendered using the display text
-            if (output.TagMode == TagMode.SelfClosing && metadata != null)
+            ApplyRouteValues(tagHelperContext, metadata.CreateRouteValues);
+
+            output.Attributes.SetAttribute("href", urlHelper.Action(metadata.CreateRouteValues["action"].ToString(), metadata.CreateRouteValues));
+        }
+
+        // A self closing anchor tag will be rendered using the display text
+        if (output.TagMode == TagMode.SelfClosing && metadata != null)
+        {
+            output.TagMode = TagMode.StartTagAndEndTag;
+            if (!string.IsNullOrEmpty(contentItem.DisplayText))
             {
-                output.TagMode = TagMode.StartTagAndEndTag;
-                if (!string.IsNullOrEmpty(contentItem.DisplayText))
-                {
-                    output.Content.Append(contentItem.DisplayText);
-                }
-                else
-                {
-                    var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
-                    output.Content.Append(typeDefinition.ToString());
-                }
+                output.Content.Append(contentItem.DisplayText);
+            }
+            else
+            {
+                var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
+                output.Content.Append(typeDefinition.ToString());
             }
-
-            return;
         }
 
-        private static void ApplyRouteValues(TagHelperContext tagHelperContext, RouteValueDictionary route)
+        return;
+    }
+
+    private static void ApplyRouteValues(TagHelperContext tagHelperContext, RouteValueDictionary route)
+    {
+        foreach (var attribute in tagHelperContext.AllAttributes)
         {
-            foreach (var attribute in tagHelperContext.AllAttributes)
+            if (attribute.Name.StartsWith(RoutePrefix, StringComparison.OrdinalIgnoreCase))
             {
-                if (attribute.Name.StartsWith(RoutePrefix, StringComparison.OrdinalIgnoreCase))
-                {
-                    route.Add(attribute.Name[RoutePrefix.Length..], attribute.Value);
-                }
+                route.Add(attribute.Name[RoutePrefix.Length..], attribute.Value);
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore.Data.Abstractions/DatabaseProvider.cs b/src/OrchardCore/OrchardCore.Data.Abstractions/DatabaseProvider.cs
index 3d995dafa80..1ae236ac719 100644
--- a/src/OrchardCore/OrchardCore.Data.Abstractions/DatabaseProvider.cs
+++ b/src/OrchardCore/OrchardCore.Data.Abstractions/DatabaseProvider.cs
@@ -1,12 +1,11 @@
-namespace OrchardCore.Data
+namespace OrchardCore.Data;
+
+public class DatabaseProvider
 {
-    public class DatabaseProvider
-    {
-        public string Name { get; set; }
-        public string Value { get; set; }
-        public bool HasConnectionString { get; set; }
-        public bool HasTablePrefix { get; set; }
-        public bool IsDefault { get; set; }
-        public string SampleConnectionString { get; set; }
-    }
+    public string Name { get; set; }
+    public string Value { get; set; }
+    public bool HasConnectionString { get; set; }
+    public bool HasTablePrefix { get; set; }
+    public bool IsDefault { get; set; }
+    public string SampleConnectionString { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/Document.cs b/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/Document.cs
index e24b9a6dd40..3481d848261 100644
--- a/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/Document.cs
+++ b/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/Document.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
 
-namespace OrchardCore.Data.Documents
+namespace OrchardCore.Data.Documents;
+
+public class Document : IDocument
 {
-    public class Document : IDocument
-    {
-        /// <summary>
-        /// The <see cref="IDocument.Identifier"/>.
-        /// </summary>
-        public string Identifier { get; set; }
+    /// <summary>
+    /// The <see cref="IDocument.Identifier"/>.
+    /// </summary>
+    public string Identifier { get; set; }
 
-        /// <summary>
-        /// Whether the document is immutable or not.
-        /// </summary>
-        [JsonIgnore]
-        public bool IsReadOnly { get; set; } = true;
-    }
+    /// <summary>
+    /// Whether the document is immutable or not.
+    /// </summary>
+    [JsonIgnore]
+    public bool IsReadOnly { get; set; } = true;
 }
diff --git a/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/DocumentStoreCommitException.cs b/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/DocumentStoreCommitException.cs
index 49ae8abfcae..c14d0348c7c 100644
--- a/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/DocumentStoreCommitException.cs
+++ b/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/DocumentStoreCommitException.cs
@@ -1,29 +1,28 @@
 using System;
 
-namespace OrchardCore.Data.Documents
+namespace OrchardCore.Data.Documents;
+
+/// <summary>
+/// The <see cref="Exception"/> that is thrown if <see cref="IDocumentStore.CommitAsync"/> fails.
+/// </summary>
+public class DocumentStoreCommitException : Exception
 {
     /// <summary>
-    /// The <see cref="Exception"/> that is thrown if <see cref="IDocumentStore.CommitAsync"/> fails.
+    /// Creates a new instance of <see cref="DocumentStoreCommitException"/> with the specified
+    /// exception message.
     /// </summary>
-    public class DocumentStoreCommitException : Exception
+    /// <param name="message">The message that describes the error.</param>
+    public DocumentStoreCommitException(string message) : base(message)
     {
-        /// <summary>
-        /// Creates a new instance of <see cref="DocumentStoreCommitException"/> with the specified
-        /// exception message.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        public DocumentStoreCommitException(string message) : base(message)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Creates a new instance of <see cref="DocumentStoreCommitException"/> with the specified
-        /// exception message and inner exception.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/>.</param>
-        public DocumentStoreCommitException(string message, Exception innerException) : base(message, innerException)
-        {
-        }
+    /// <summary>
+    /// Creates a new instance of <see cref="DocumentStoreCommitException"/> with the specified
+    /// exception message and inner exception.
+    /// </summary>
+    /// <param name="message">The message that describes the error.</param>
+    /// <param name="innerException">The inner <see cref="Exception"/>.</param>
+    public DocumentStoreCommitException(string message, Exception innerException) : base(message, innerException)
+    {
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/DocumentStoreCommitFailureDelegate.cs b/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/DocumentStoreCommitFailureDelegate.cs
index 84176ed72eb..f7b0aff3a7c 100644
--- a/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/DocumentStoreCommitFailureDelegate.cs
+++ b/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/DocumentStoreCommitFailureDelegate.cs
@@ -1,10 +1,9 @@
 using System;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Data.Documents
-{
-    /// <summary>
-    /// The type of the delegate that will get called after <see cref="IDocumentStore.CommitAsync"/> if it is not successful.
-    /// </summary>
-    public delegate Task DocumentStoreCommitFailureDelegate(Exception exception);
-}
+namespace OrchardCore.Data.Documents;
+
+/// <summary>
+/// The type of the delegate that will get called after <see cref="IDocumentStore.CommitAsync"/> if it is not successful.
+/// </summary>
+public delegate Task DocumentStoreCommitFailureDelegate(Exception exception);
diff --git a/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/DocumentStoreCommitSuccessDelegate.cs b/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/DocumentStoreCommitSuccessDelegate.cs
index b6c1f33bc5b..f3ac3a2afcc 100644
--- a/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/DocumentStoreCommitSuccessDelegate.cs
+++ b/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/DocumentStoreCommitSuccessDelegate.cs
@@ -1,9 +1,8 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Data.Documents
-{
-    /// <summary>
-    /// The type of the delegate that will get called after <see cref="IDocumentStore.CommitAsync"/> if it is successful.
-    /// </summary>
-    public delegate Task DocumentStoreCommitSuccessDelegate();
-}
+namespace OrchardCore.Data.Documents;
+
+/// <summary>
+/// The type of the delegate that will get called after <see cref="IDocumentStore.CommitAsync"/> if it is successful.
+/// </summary>
+public delegate Task DocumentStoreCommitSuccessDelegate();
diff --git a/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/FileDocumentStoreAttribute.cs b/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/FileDocumentStoreAttribute.cs
index bbdfff655ff..4784f88605e 100644
--- a/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/FileDocumentStoreAttribute.cs
+++ b/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/FileDocumentStoreAttribute.cs
@@ -1,10 +1,9 @@
 using System;
 
-namespace OrchardCore.Data.Documents
+namespace OrchardCore.Data.Documents;
+
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+public class FileDocumentStoreAttribute : Attribute
 {
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
-    public class FileDocumentStoreAttribute : Attribute
-    {
-        public string FileName { get; set; }
-    }
+    public string FileName { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/IDocument.cs b/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/IDocument.cs
index 1c8f7da8704..94d81f635d8 100644
--- a/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/IDocument.cs
+++ b/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/IDocument.cs
@@ -1,15 +1,14 @@
-namespace OrchardCore.Data.Documents
+namespace OrchardCore.Data.Documents;
+
+public interface IDocument
 {
-    public interface IDocument
-    {
-        /// <summary>
-        /// The unique identifier of the document.
-        /// </summary>
-        string Identifier { get; set; }
+    /// <summary>
+    /// The unique identifier of the document.
+    /// </summary>
+    string Identifier { get; set; }
 
-        /// <summary>
-        /// Whether the document was loaded for updating.
-        /// </summary>
-        bool IsReadOnly { get; set; }
-    }
+    /// <summary>
+    /// Whether the document was loaded for updating.
+    /// </summary>
+    bool IsReadOnly { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/IDocumentStore.cs b/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/IDocumentStore.cs
index d1168f942aa..8b2683228fa 100644
--- a/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/IDocumentStore.cs
+++ b/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/IDocumentStore.cs
@@ -1,50 +1,49 @@
 using System;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Data.Documents
+namespace OrchardCore.Data.Documents;
+
+/// <summary>
+/// A cacheable, committable and cancellable document store allowing to get documents from a shared cache while being able
+/// to update them to the store at the scope level, and allowing to register delegates that get called after committing.
+/// </summary>
+public interface IDocumentStore
 {
     /// <summary>
-    /// A cacheable, committable and cancellable document store allowing to get documents from a shared cache while being able
-    /// to update them to the store at the scope level, and allowing to register delegates that get called after committing.
+    /// Loads a single document (or create a new one) for updating and that should not be cached.
+    /// For a full isolation, it needs to be used in pair with <see cref="GetOrCreateImmutableAsync{T}"/>.
+    /// </summary>
+    Task<T> GetOrCreateMutableAsync<T>(Func<Task<T>> factoryAsync = null) where T : class, new();
+
+    /// <summary>
+    /// Gets a single document (or create a new one) for caching and that should not be updated,
+    /// and a bool indicating if it can be cached, not if it has been already loaded for update.
+    /// For a full isolation, it needs to be used in pair with <see cref="GetOrCreateMutableAsync{T}"/>.
+    /// </summary>
+    Task<(bool, T)> GetOrCreateImmutableAsync<T>(Func<Task<T>> factoryAsync = null) where T : class, new();
+
+    /// <summary>
+    /// Updates the store with the provided document and then uses the delegate to update the cache.
+    /// </summary>
+    Task UpdateAsync<T>(T document, Func<T, Task> updateCache, bool checkConcurrency = false);
+
+    /// <summary>
+    /// Allows to cancel the current updating before calling <see cref="CommitAsync"/> at the end of the scope.
+    /// </summary>
+    Task CancelAsync();
+
+    /// <summary>
+    /// Registers a <see cref="DocumentStoreCommitSuccessDelegate"/> that will get called after <see cref="CommitAsync"/> if it succeeded.
+    /// </summary>
+    void AfterCommitSuccess<T>(DocumentStoreCommitSuccessDelegate afterCommit);
+
+    /// <summary>
+    /// Registers a <see cref="DocumentStoreCommitFailureDelegate"/> that will get called after <see cref="CommitAsync"/> if it failed.
+    /// </summary>
+    void AfterCommitFailure<T>(DocumentStoreCommitFailureDelegate afterCommit);
+
+    /// <summary>
+    /// Commits the related document store.
     /// </summary>
-    public interface IDocumentStore
-    {
-        /// <summary>
-        /// Loads a single document (or create a new one) for updating and that should not be cached.
-        /// For a full isolation, it needs to be used in pair with <see cref="GetOrCreateImmutableAsync{T}"/>.
-        /// </summary>
-        Task<T> GetOrCreateMutableAsync<T>(Func<Task<T>> factoryAsync = null) where T : class, new();
-
-        /// <summary>
-        /// Gets a single document (or create a new one) for caching and that should not be updated,
-        /// and a bool indicating if it can be cached, not if it has been already loaded for update.
-        /// For a full isolation, it needs to be used in pair with <see cref="GetOrCreateMutableAsync{T}"/>.
-        /// </summary>
-        Task<(bool, T)> GetOrCreateImmutableAsync<T>(Func<Task<T>> factoryAsync = null) where T : class, new();
-
-        /// <summary>
-        /// Updates the store with the provided document and then uses the delegate to update the cache.
-        /// </summary>
-        Task UpdateAsync<T>(T document, Func<T, Task> updateCache, bool checkConcurrency = false);
-
-        /// <summary>
-        /// Allows to cancel the current updating before calling <see cref="CommitAsync"/> at the end of the scope.
-        /// </summary>
-        Task CancelAsync();
-
-        /// <summary>
-        /// Registers a <see cref="DocumentStoreCommitSuccessDelegate"/> that will get called after <see cref="CommitAsync"/> if it succeeded.
-        /// </summary>
-        void AfterCommitSuccess<T>(DocumentStoreCommitSuccessDelegate afterCommit);
-
-        /// <summary>
-        /// Registers a <see cref="DocumentStoreCommitFailureDelegate"/> that will get called after <see cref="CommitAsync"/> if it failed.
-        /// </summary>
-        void AfterCommitFailure<T>(DocumentStoreCommitFailureDelegate afterCommit);
-
-        /// <summary>
-        /// Commits the related document store.
-        /// </summary>
-        Task CommitAsync();
-    }
+    Task CommitAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/IFileDocumentStore.cs b/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/IFileDocumentStore.cs
index e9820312901..3b5e9033560 100644
--- a/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/IFileDocumentStore.cs
+++ b/src/OrchardCore/OrchardCore.Data.Abstractions/Documents/IFileDocumentStore.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.Data.Documents
+namespace OrchardCore.Data.Documents;
+
+/// <summary>
+/// A singleton service using the file system to store document files under the tenant folder, and that is in sync
+/// with the ambient transaction, any file is updated after a successful <see cref="IDocumentStore.CommitAsync"/>.
+/// </summary>
+public interface IFileDocumentStore : IDocumentStore
 {
-    /// <summary>
-    /// A singleton service using the file system to store document files under the tenant folder, and that is in sync
-    /// with the ambient transaction, any file is updated after a successful <see cref="IDocumentStore.CommitAsync"/>.
-    /// </summary>
-    public interface IFileDocumentStore : IDocumentStore
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Data.Abstractions/IDataMigrationManager.cs b/src/OrchardCore/OrchardCore.Data.Abstractions/IDataMigrationManager.cs
index 1082e5661f5..e61c0db5a12 100644
--- a/src/OrchardCore/OrchardCore.Data.Abstractions/IDataMigrationManager.cs
+++ b/src/OrchardCore/OrchardCore.Data.Abstractions/IDataMigrationManager.cs
@@ -2,40 +2,39 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Data.Migration
+namespace OrchardCore.Data.Migration;
+
+/// <summary>
+/// Represents a contract to manage database migrations.
+/// </summary>
+public interface IDataMigrationManager
 {
     /// <summary>
-    /// Represents a contract to manage database migrations.
+    /// Returns the features which have at least one Data Migration class with a corresponding Upgrade method to be called.
     /// </summary>
-    public interface IDataMigrationManager
-    {
-        /// <summary>
-        /// Returns the features which have at least one Data Migration class with a corresponding Upgrade method to be called.
-        /// </summary>
-        Task<IEnumerable<string>> GetFeaturesThatNeedUpdateAsync();
+    Task<IEnumerable<string>> GetFeaturesThatNeedUpdateAsync();
 
-        /// <summary>
-        /// Run all migrations that need to be updated.
-        /// </summary>
-        Task UpdateAllFeaturesAsync();
+    /// <summary>
+    /// Run all migrations that need to be updated.
+    /// </summary>
+    Task UpdateAllFeaturesAsync();
 
-        /// <summary>
-        /// Updates the database to the latest version for the specified feature.
-        /// </summary>
-        /// <param name="feature">The feature to be uninstalled.</param>
-        [Obsolete("This method has been deprecated, please use UpdateAsync(string[] features) instead.")]
-        Task UpdateAsync(string feature) => UpdateAsync([feature]);
+    /// <summary>
+    /// Updates the database to the latest version for the specified feature.
+    /// </summary>
+    /// <param name="feature">The feature to be uninstalled.</param>
+    [Obsolete("This method has been deprecated, please use UpdateAsync(string[] features) instead.")]
+    Task UpdateAsync(string feature) => UpdateAsync([feature]);
 
-        /// <summary>
-        /// Updates the database to the latest version for the specified feature(s).
-        /// </summary>
-        /// <param name="features">The feature(s) to be updated.</param>
-        Task UpdateAsync(params string[] features);
+    /// <summary>
+    /// Updates the database to the latest version for the specified feature(s).
+    /// </summary>
+    /// <param name="features">The feature(s) to be updated.</param>
+    Task UpdateAsync(params string[] features);
 
-        /// <summary>
-        /// Execute a script to delete any information relative to the feature.
-        /// </summary>
-        /// <param name="feature">The feature to be uninstalled.</param>
-        Task Uninstall(string feature);
-    }
+    /// <summary>
+    /// Execute a script to delete any information relative to the feature.
+    /// </summary>
+    /// <param name="feature">The feature to be uninstalled.</param>
+    Task Uninstall(string feature);
 }
diff --git a/src/OrchardCore/OrchardCore.Data.Abstractions/IDbConnectionAccessor.cs b/src/OrchardCore/OrchardCore.Data.Abstractions/IDbConnectionAccessor.cs
index a302ce27d28..7153de80379 100644
--- a/src/OrchardCore/OrchardCore.Data.Abstractions/IDbConnectionAccessor.cs
+++ b/src/OrchardCore/OrchardCore.Data.Abstractions/IDbConnectionAccessor.cs
@@ -1,15 +1,14 @@
 using System.Data.Common;
 
-namespace OrchardCore.Data
+namespace OrchardCore.Data;
+
+/// <summary>
+/// Represents a contract to access the <see cref="DbConnection"/>.
+/// </summary>
+public interface IDbConnectionAccessor
 {
     /// <summary>
-    /// Represents a contract to access the <see cref="DbConnection"/>.
+    /// Creates a database connection.
     /// </summary>
-    public interface IDbConnectionAccessor
-    {
-        /// <summary>
-        /// Creates a database connection.
-        /// </summary>
-        DbConnection CreateConnection();
-    }
+    DbConnection CreateConnection();
 }
diff --git a/src/OrchardCore/OrchardCore.Data.Abstractions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Data.Abstractions/ServiceCollectionExtensions.cs
index a2a290af74a..2d9931fa76c 100644
--- a/src/OrchardCore/OrchardCore.Data.Abstractions/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Data.Abstractions/ServiceCollectionExtensions.cs
@@ -2,43 +2,42 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Environment.Shell.Builders;
 
-namespace OrchardCore.Data
+namespace OrchardCore.Data;
+
+/// <summary>
+/// Provides extension methods for <see cref="IServiceCollection"/> to add YesSQL <see cref="DatabaseProvider"/>s.
+/// </summary>
+public static class ServiceCollectionExtensions
 {
     /// <summary>
-    /// Provides extension methods for <see cref="IServiceCollection"/> to add YesSQL <see cref="DatabaseProvider"/>s.
+    ///
     /// </summary>
-    public static class ServiceCollectionExtensions
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="name">The database provider name.</param>
+    /// <param name="value">The database provider value, i.e. SQL Server, MySQL.</param>
+    /// <param name="hasConnectionString">Whether the database contains a connection string.</param>
+    /// <param name="hasTablePrefix">The table prefix.</param>
+    /// <param name="isDefault">Whether the data provider is the default one.</param>
+    /// <param name="sampleConnectionString">A sample connection string, e.g. Server={Server Name};Database={Database Name};IntegratedSecurity=true.</param>
+    /// <returns></returns>
+    public static IServiceCollection TryAddDataProvider(this IServiceCollection services, string name, string value, bool hasConnectionString, bool hasTablePrefix, bool isDefault, string sampleConnectionString = "")
     {
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="name">The database provider name.</param>
-        /// <param name="value">The database provider value, i.e. SQL Server, MySQL.</param>
-        /// <param name="hasConnectionString">Whether the database contains a connection string.</param>
-        /// <param name="hasTablePrefix">The table prefix.</param>
-        /// <param name="isDefault">Whether the data provider is the default one.</param>
-        /// <param name="sampleConnectionString">A sample connection string, e.g. Server={Server Name};Database={Database Name};IntegratedSecurity=true.</param>
-        /// <returns></returns>
-        public static IServiceCollection TryAddDataProvider(this IServiceCollection services, string name, string value, bool hasConnectionString, bool hasTablePrefix, bool isDefault, string sampleConnectionString = "")
+        for (var i = services.Count - 1; i >= 0; i--)
         {
-            for (var i = services.Count - 1; i >= 0; i--)
+            var entry = services[i];
+            var implementationInstance = entry.GetImplementationInstance();
+            if (implementationInstance is not null)
             {
-                var entry = services[i];
-                var implementationInstance = entry.GetImplementationInstance();
-                if (implementationInstance is not null)
+                var databaseProvider = implementationInstance as DatabaseProvider;
+                if (databaseProvider is not null && string.Equals(databaseProvider.Name, name, StringComparison.OrdinalIgnoreCase))
                 {
-                    var databaseProvider = implementationInstance as DatabaseProvider;
-                    if (databaseProvider is not null && string.Equals(databaseProvider.Name, name, StringComparison.OrdinalIgnoreCase))
-                    {
-                        services.RemoveAt(i);
-                    }
+                    services.RemoveAt(i);
                 }
             }
+        }
 
-            services.AddSingleton(new DatabaseProvider { Name = name, Value = value, HasConnectionString = hasConnectionString, HasTablePrefix = hasTablePrefix, IsDefault = isDefault, SampleConnectionString = sampleConnectionString });
+        services.AddSingleton(new DatabaseProvider { Name = name, Value = value, HasConnectionString = hasConnectionString, HasTablePrefix = hasTablePrefix, IsDefault = isDefault, SampleConnectionString = sampleConnectionString });
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Data.Abstractions/StoreCollectionOptions.cs b/src/OrchardCore/OrchardCore.Data.Abstractions/StoreCollectionOptions.cs
index 5c788a8e096..f4e5ac29e7d 100644
--- a/src/OrchardCore/OrchardCore.Data.Abstractions/StoreCollectionOptions.cs
+++ b/src/OrchardCore/OrchardCore.Data.Abstractions/StoreCollectionOptions.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Data
+namespace OrchardCore.Data;
+
+public class StoreCollectionOptions
 {
-    public class StoreCollectionOptions
-    {
-        public HashSet<string> Collections { get; } = [];
-    }
+    public HashSet<string> Collections { get; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/DataMigration.cs b/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/DataMigration.cs
index dc76a114e72..676035712bd 100644
--- a/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/DataMigration.cs
+++ b/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/DataMigration.cs
@@ -1,28 +1,27 @@
 using YesSql.Sql;
 
-namespace OrchardCore.Data.Migration
+namespace OrchardCore.Data.Migration;
+
+/// <summary>
+/// A <see cref="DataMigration"/> is discovered through method reflection
+/// and runs sequentially from the Create() method through UpdateFromX().
+/// </summary>
+/// <example>
+/// Usage of method implementations:
+/// <code>
+/// public class Migrations : DataMigration
+/// {
+///     public int Create() { return 1; } // or
+///     public Task&lt;int&gt; CreateAsync() { return 1; }
+///     public int UpdateFrom1() { return 2; } // or
+///     public Task&lt;int&gt; UpdateFrom1Async() { return 2; }
+///     public void Uninstall() { } // or
+///     public Task UninstallAsync() { }
+/// }
+/// </code>
+/// </example>
+public abstract class DataMigration : IDataMigration
 {
-    /// <summary>
-    /// A <see cref="DataMigration"/> is discovered through method reflection
-    /// and runs sequentially from the Create() method through UpdateFromX().
-    /// </summary>
-    /// <example>
-    /// Usage of method implementations:
-    /// <code>
-    /// public class Migrations : DataMigration
-    /// {
-    ///     public int Create() { return 1; } // or
-    ///     public Task&lt;int&gt; CreateAsync() { return 1; }
-    ///     public int UpdateFrom1() { return 2; } // or
-    ///     public Task&lt;int&gt; UpdateFrom1Async() { return 2; }
-    ///     public void Uninstall() { } // or
-    ///     public Task UninstallAsync() { }
-    /// }
-    /// </code>
-    /// </example>
-    public abstract class DataMigration : IDataMigration
-    {
-        /// <inheritdocs />
-        public ISchemaBuilder SchemaBuilder { get; set; }
-    }
+    /// <inheritdocs />
+    public ISchemaBuilder SchemaBuilder { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/IDataMigration.cs b/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/IDataMigration.cs
index ca5516d256c..d7e0f0d23f8 100644
--- a/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/IDataMigration.cs
+++ b/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/IDataMigration.cs
@@ -1,17 +1,16 @@
 using OrchardCore.Environment.Extensions;
 using YesSql.Sql;
 
-namespace OrchardCore.Data.Migration
+namespace OrchardCore.Data.Migration;
+
+/// <summary>
+/// Represents a contract for a database migration.
+/// </summary>
+[FeatureTypeDiscovery(SingleFeatureOnly = true, SkipExtension = true)]
+public interface IDataMigration
 {
     /// <summary>
-    /// Represents a contract for a database migration.
+    /// Gets or sets the database schema builder.
     /// </summary>
-    [FeatureTypeDiscovery(SingleFeatureOnly = true, SkipExtension = true)]
-    public interface IDataMigration
-    {
-        /// <summary>
-        /// Gets or sets the database schema builder.
-        /// </summary>
-        ISchemaBuilder SchemaBuilder { get; set; }
-    }
+    ISchemaBuilder SchemaBuilder { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/IScopedIndexProvider.cs b/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/IScopedIndexProvider.cs
index 2bf3e62ed2d..3570e60d5e4 100644
--- a/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/IScopedIndexProvider.cs
+++ b/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/IScopedIndexProvider.cs
@@ -1,13 +1,12 @@
 using YesSql;
 using YesSql.Indexes;
 
-namespace OrchardCore.Data
+namespace OrchardCore.Data;
+
+/// <summary>
+/// Represents a contract that used to denote an <see cref="IIndexProvider"/> that needs to be resolved by the DI and registered
+/// at the <see cref="ISession"/> level.
+/// </summary>
+public interface IScopedIndexProvider : IIndexProvider
 {
-    /// <summary>
-    /// Represents a contract that used to denote an <see cref="IIndexProvider"/> that needs to be resolved by the DI and registered
-    /// at the <see cref="ISession"/> level.
-    /// </summary>
-    public interface IScopedIndexProvider : IIndexProvider
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Data.YesSql/DbConnectionAccessor.cs b/src/OrchardCore/OrchardCore.Data.YesSql/DbConnectionAccessor.cs
index 7be5fc9f98a..1af35fa6f2a 100644
--- a/src/OrchardCore/OrchardCore.Data.YesSql/DbConnectionAccessor.cs
+++ b/src/OrchardCore/OrchardCore.Data.YesSql/DbConnectionAccessor.cs
@@ -2,30 +2,29 @@
 using System.Data.Common;
 using YesSql;
 
-namespace OrchardCore.Data
+namespace OrchardCore.Data;
+
+/// <summary>
+/// Represents an accessor to the database connection.
+/// </summary>
+public class DbConnectionAccessor : IDbConnectionAccessor
 {
+    private readonly IStore _store;
+
     /// <summary>
-    /// Represents an accessor to the database connection.
+    /// Creates a new instance of the <see cref="DbConnectionAccessor"/>.
     /// </summary>
-    public class DbConnectionAccessor : IDbConnectionAccessor
+    /// <param name="store">The <see cref="IStore"/>.</param>
+    public DbConnectionAccessor(IStore store)
     {
-        private readonly IStore _store;
-
-        /// <summary>
-        /// Creates a new instance of the <see cref="DbConnectionAccessor"/>.
-        /// </summary>
-        /// <param name="store">The <see cref="IStore"/>.</param>
-        public DbConnectionAccessor(IStore store)
-        {
-            ArgumentNullException.ThrowIfNull(store);
+        ArgumentNullException.ThrowIfNull(store);
 
-            _store = store;
-        }
+        _store = store;
+    }
 
-        /// <inheritdocs />
-        public DbConnection CreateConnection()
-        {
-            return _store.Configuration.ConnectionFactory.CreateConnection();
-        }
+    /// <inheritdocs />
+    public DbConnection CreateConnection()
+    {
+        return _store.Configuration.ConnectionFactory.CreateConnection();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Data.YesSql/DefaultContentJsonSerializer.cs b/src/OrchardCore/OrchardCore.Data.YesSql/DefaultContentJsonSerializer.cs
index c51fde4bb95..c1e408c4886 100644
--- a/src/OrchardCore/OrchardCore.Data.YesSql/DefaultContentJsonSerializer.cs
+++ b/src/OrchardCore/OrchardCore.Data.YesSql/DefaultContentJsonSerializer.cs
@@ -3,27 +3,26 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Json;
 
-namespace YesSql.Serialization
+namespace YesSql.Serialization;
+
+public class DefaultContentJsonSerializer : IContentSerializer
 {
-    public class DefaultContentJsonSerializer : IContentSerializer
-    {
-        private readonly JsonSerializerOptions _options;
+    private readonly JsonSerializerOptions _options;
 
-        public DefaultContentJsonSerializer(IOptions<DocumentJsonSerializerOptions> options)
-        {
-            _options = options.Value.SerializerOptions;
-        }
+    public DefaultContentJsonSerializer(IOptions<DocumentJsonSerializerOptions> options)
+    {
+        _options = options.Value.SerializerOptions;
+    }
 
-        public DefaultContentJsonSerializer(JsonSerializerOptions options)
-            => _options = options;
+    public DefaultContentJsonSerializer(JsonSerializerOptions options)
+        => _options = options;
 
-        public object Deserialize(string content, Type type)
-            => JsonSerializer.Deserialize(content, type, _options);
+    public object Deserialize(string content, Type type)
+        => JsonSerializer.Deserialize(content, type, _options);
 
-        public dynamic DeserializeDynamic(string content)
-            => JsonSerializer.Deserialize<dynamic>(content, _options);
+    public dynamic DeserializeDynamic(string content)
+        => JsonSerializer.Deserialize<dynamic>(content, _options);
 
-        public string Serialize(object item)
-            => JsonSerializer.Serialize(item, _options);
-    }
+    public string Serialize(object item)
+        => JsonSerializer.Serialize(item, _options);
 }
diff --git a/src/OrchardCore/OrchardCore.Data.YesSql/Documents/DocumentStore.cs b/src/OrchardCore/OrchardCore.Data.YesSql/Documents/DocumentStore.cs
index 2b8282f443c..f8ef98f0cec 100644
--- a/src/OrchardCore/OrchardCore.Data.YesSql/Documents/DocumentStore.cs
+++ b/src/OrchardCore/OrchardCore.Data.YesSql/Documents/DocumentStore.cs
@@ -3,147 +3,146 @@
 using System.Threading.Tasks;
 using YesSql;
 
-namespace OrchardCore.Data.Documents
+namespace OrchardCore.Data.Documents;
+
+/// <summary>
+/// An <see cref="IDocumentStore"/> using the <see cref="ISession"/>.
+/// </summary>
+public class DocumentStore : IDocumentStore
 {
-    /// <summary>
-    /// An <see cref="IDocumentStore"/> using the <see cref="ISession"/>.
-    /// </summary>
-    public class DocumentStore : IDocumentStore
-    {
-        private readonly ISession _session;
+    private readonly ISession _session;
+
+    private readonly Dictionary<Type, object> _loaded = [];
 
-        private readonly Dictionary<Type, object> _loaded = [];
+    private readonly List<Type> _afterCommitsSuccess = [];
+    private readonly List<Type> _afterCommitsFailure = [];
 
-        private readonly List<Type> _afterCommitsSuccess = [];
-        private readonly List<Type> _afterCommitsFailure = [];
+    private DocumentStoreCommitSuccessDelegate _afterCommitSuccess;
+    private DocumentStoreCommitFailureDelegate _afterCommitFailure;
 
-        private DocumentStoreCommitSuccessDelegate _afterCommitSuccess;
-        private DocumentStoreCommitFailureDelegate _afterCommitFailure;
+    private bool _canceled;
 
-        private bool _canceled;
+    public DocumentStore(ISession session)
+    {
+        _session = session;
+    }
 
-        public DocumentStore(ISession session)
+    /// <inheritdoc />
+    public async Task<T> GetOrCreateMutableAsync<T>(Func<Task<T>> factoryAsync = null) where T : class, new()
+    {
+        if (_loaded.TryGetValue(typeof(T), out var loaded))
         {
-            _session = session;
+            return loaded as T;
         }
 
-        /// <inheritdoc />
-        public async Task<T> GetOrCreateMutableAsync<T>(Func<Task<T>> factoryAsync = null) where T : class, new()
-        {
-            if (_loaded.TryGetValue(typeof(T), out var loaded))
-            {
-                return loaded as T;
-            }
+        var document = await _session.Query<T>().FirstOrDefaultAsync()
+            ?? await (factoryAsync?.Invoke() ?? Task.FromResult((T)null))
+            ?? new T();
 
-            var document = await _session.Query<T>().FirstOrDefaultAsync()
-                ?? await (factoryAsync?.Invoke() ?? Task.FromResult((T)null))
-                ?? new T();
+        _loaded[typeof(T)] = document;
 
-            _loaded[typeof(T)] = document;
+        return document;
+    }
 
-            return document;
+    /// <inheritdoc />
+    public async Task<(bool, T)> GetOrCreateImmutableAsync<T>(Func<Task<T>> factoryAsync = null) where T : class, new()
+    {
+        if (_loaded.TryGetValue(typeof(T), out var loaded))
+        {
+            // Return the already loaded document but indicating that it should not be cached.
+            return (false, loaded as T);
         }
 
-        /// <inheritdoc />
-        public async Task<(bool, T)> GetOrCreateImmutableAsync<T>(Func<Task<T>> factoryAsync = null) where T : class, new()
+        var document = await _session.Query<T>().FirstOrDefaultAsync();
+        if (document is not null)
         {
-            if (_loaded.TryGetValue(typeof(T), out var loaded))
-            {
-                // Return the already loaded document but indicating that it should not be cached.
-                return (false, loaded as T);
-            }
+            _session.Detach(document);
+            return (true, document);
+        }
 
-            var document = await _session.Query<T>().FirstOrDefaultAsync();
-            if (document is not null)
-            {
-                _session.Detach(document);
-                return (true, document);
-            }
+        return (true, await (factoryAsync?.Invoke() ?? Task.FromResult((T)null)) ?? new T());
+    }
 
-            return (true, await (factoryAsync?.Invoke() ?? Task.FromResult((T)null)) ?? new T());
-        }
+    /// <inheritdoc />
+    public async Task UpdateAsync<T>(T document, Func<T, Task> updateCache, bool checkConcurrency = false)
+    {
+        await _session.SaveAsync(document, checkConcurrency);
 
-        /// <inheritdoc />
-        public async Task UpdateAsync<T>(T document, Func<T, Task> updateCache, bool checkConcurrency = false)
+        AfterCommitSuccess<T>(() =>
         {
-            await _session.SaveAsync(document, checkConcurrency);
+            return updateCache(document);
+        });
 
-            AfterCommitSuccess<T>(() =>
-            {
-                return updateCache(document);
-            });
+        AfterCommitFailure<T>(exception =>
+        {
+            throw new DocumentStoreCommitException(
+                $"The '{typeof(T).Name}' could not be persisted and cached as it has been changed by another process.",
+                exception);
+        });
+    }
 
-            AfterCommitFailure<T>(exception =>
-            {
-                throw new DocumentStoreCommitException(
-                    $"The '{typeof(T).Name}' could not be persisted and cached as it has been changed by another process.",
-                    exception);
-            });
-        }
+    /// <inheritdoc />
+    public async Task CancelAsync()
+    {
+        _canceled = true;
+        await _session.CancelAsync();
+    }
 
-        /// <inheritdoc />
-        public async Task CancelAsync()
+    /// <inheritdoc />
+    public void AfterCommitSuccess<T>(DocumentStoreCommitSuccessDelegate afterCommitSuccess)
+    {
+        if (!_afterCommitsSuccess.Contains(typeof(T)))
         {
-            _canceled = true;
-            await _session.CancelAsync();
+            _afterCommitsSuccess.Add(typeof(T));
+            _afterCommitSuccess += afterCommitSuccess;
         }
+    }
 
-        /// <inheritdoc />
-        public void AfterCommitSuccess<T>(DocumentStoreCommitSuccessDelegate afterCommitSuccess)
+    /// <inheritdoc />
+    public void AfterCommitFailure<T>(DocumentStoreCommitFailureDelegate afterCommitFailure)
+    {
+        if (!_afterCommitsFailure.Contains(typeof(T)))
         {
-            if (!_afterCommitsSuccess.Contains(typeof(T)))
-            {
-                _afterCommitsSuccess.Add(typeof(T));
-                _afterCommitSuccess += afterCommitSuccess;
-            }
+            _afterCommitsFailure.Add(typeof(T));
+            _afterCommitFailure += afterCommitFailure;
         }
+    }
 
-        /// <inheritdoc />
-        public void AfterCommitFailure<T>(DocumentStoreCommitFailureDelegate afterCommitFailure)
+    /// <inheritdoc />
+    public async Task CommitAsync()
+    {
+        if (_session is null)
         {
-            if (!_afterCommitsFailure.Contains(typeof(T)))
-            {
-                _afterCommitsFailure.Add(typeof(T));
-                _afterCommitFailure += afterCommitFailure;
-            }
+            return;
         }
 
-        /// <inheritdoc />
-        public async Task CommitAsync()
+        try
         {
-            if (_session is null)
-            {
-                return;
-            }
-
-            try
-            {
-                await _session.SaveChangesAsync();
+            await _session.SaveChangesAsync();
 
-                _loaded.Clear();
+            _loaded.Clear();
 
-                if (!_canceled && _afterCommitSuccess is not null)
+            if (!_canceled && _afterCommitSuccess is not null)
+            {
+                foreach (var d in _afterCommitSuccess.GetInvocationList())
                 {
-                    foreach (var d in _afterCommitSuccess.GetInvocationList())
-                    {
-                        await ((DocumentStoreCommitSuccessDelegate)d)();
-                    }
+                    await ((DocumentStoreCommitSuccessDelegate)d)();
                 }
             }
-            catch (ConcurrencyException exception)
+        }
+        catch (ConcurrencyException exception)
+        {
+            if (_afterCommitFailure is not null)
             {
-                if (_afterCommitFailure is not null)
-                {
-                    foreach (var d in _afterCommitFailure.GetInvocationList())
-                    {
-                        await ((DocumentStoreCommitFailureDelegate)d)(exception);
-                    }
-                }
-                else
+                foreach (var d in _afterCommitFailure.GetInvocationList())
                 {
-                    throw;
+                    await ((DocumentStoreCommitFailureDelegate)d)(exception);
                 }
             }
+            else
+            {
+                throw;
+            }
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Data.YesSql/Migration/DataMigrationManager.cs b/src/OrchardCore/OrchardCore.Data.YesSql/Migration/DataMigrationManager.cs
index 70c8b92bcb8..39fd220621e 100644
--- a/src/OrchardCore/OrchardCore.Data.YesSql/Migration/DataMigrationManager.cs
+++ b/src/OrchardCore/OrchardCore.Data.YesSql/Migration/DataMigrationManager.cs
@@ -10,329 +10,328 @@
 using YesSql;
 using YesSql.Sql;
 
-namespace OrchardCore.Data.Migration
+namespace OrchardCore.Data.Migration;
+
+/// <summary>
+/// Represents a class that manages the database migrations.
+/// </summary>
+public class DataMigrationManager : IDataMigrationManager
 {
+    private const string _updateFromPrefix = "UpdateFrom";
+    private const string _asyncSuffix = "Async";
+
+    private readonly IEnumerable<IDataMigration> _dataMigrations;
+    private readonly ISession _session;
+    private readonly IStore _store;
+    private readonly IExtensionManager _extensionManager;
+    private readonly ILogger _logger;
+    private readonly ITypeFeatureProvider _typeFeatureProvider;
+    private readonly List<string> _processedFeatures;
+
+    private DataMigrationRecord _dataMigrationRecord;
+
     /// <summary>
-    /// Represents a class that manages the database migrations.
+    /// Creates a new instance of the <see cref="DataMigrationManager"/>.
     /// </summary>
-    public class DataMigrationManager : IDataMigrationManager
+    /// <param name="typeFeatureProvider">The <see cref="ITypeFeatureProvider"/>.</param>
+    /// <param name="dataMigrations">A list of <see cref="IDataMigration"/>.</param>
+    /// <param name="session">The <see cref="ISession"/>.</param>
+    /// <param name="store">The <see cref="IStore"/>.</param>
+    /// <param name="extensionManager">The <see cref="IExtensionManager"/>.</param>
+    /// <param name="logger">The <see cref="ILogger"/>.</param>
+    public DataMigrationManager(
+        ITypeFeatureProvider typeFeatureProvider,
+        IEnumerable<IDataMigration> dataMigrations,
+        ISession session,
+        IStore store,
+        IExtensionManager extensionManager,
+        ILogger<DataMigrationManager> logger)
     {
-        private const string _updateFromPrefix = "UpdateFrom";
-        private const string _asyncSuffix = "Async";
-
-        private readonly IEnumerable<IDataMigration> _dataMigrations;
-        private readonly ISession _session;
-        private readonly IStore _store;
-        private readonly IExtensionManager _extensionManager;
-        private readonly ILogger _logger;
-        private readonly ITypeFeatureProvider _typeFeatureProvider;
-        private readonly List<string> _processedFeatures;
-
-        private DataMigrationRecord _dataMigrationRecord;
-
-        /// <summary>
-        /// Creates a new instance of the <see cref="DataMigrationManager"/>.
-        /// </summary>
-        /// <param name="typeFeatureProvider">The <see cref="ITypeFeatureProvider"/>.</param>
-        /// <param name="dataMigrations">A list of <see cref="IDataMigration"/>.</param>
-        /// <param name="session">The <see cref="ISession"/>.</param>
-        /// <param name="store">The <see cref="IStore"/>.</param>
-        /// <param name="extensionManager">The <see cref="IExtensionManager"/>.</param>
-        /// <param name="logger">The <see cref="ILogger"/>.</param>
-        public DataMigrationManager(
-            ITypeFeatureProvider typeFeatureProvider,
-            IEnumerable<IDataMigration> dataMigrations,
-            ISession session,
-            IStore store,
-            IExtensionManager extensionManager,
-            ILogger<DataMigrationManager> logger)
-        {
-            _typeFeatureProvider = typeFeatureProvider;
-            _dataMigrations = dataMigrations;
-            _session = session;
-            _store = store;
-            _extensionManager = extensionManager;
-            _logger = logger;
-            _processedFeatures = [];
-        }
+        _typeFeatureProvider = typeFeatureProvider;
+        _dataMigrations = dataMigrations;
+        _session = session;
+        _store = store;
+        _extensionManager = extensionManager;
+        _logger = logger;
+        _processedFeatures = [];
+    }
 
-        /// <inheritdocs />
-        public async Task<DataMigrationRecord> GetDataMigrationRecordAsync()
+    /// <inheritdocs />
+    public async Task<DataMigrationRecord> GetDataMigrationRecordAsync()
+    {
+        if (_dataMigrationRecord == null)
         {
+            _dataMigrationRecord = await _session.Query<DataMigrationRecord>().FirstOrDefaultAsync();
+
             if (_dataMigrationRecord == null)
             {
-                _dataMigrationRecord = await _session.Query<DataMigrationRecord>().FirstOrDefaultAsync();
-
-                if (_dataMigrationRecord == null)
-                {
-                    _dataMigrationRecord = new DataMigrationRecord();
-                    await _session.SaveAsync(_dataMigrationRecord);
-                }
+                _dataMigrationRecord = new DataMigrationRecord();
+                await _session.SaveAsync(_dataMigrationRecord);
             }
-
-            return _dataMigrationRecord;
         }
 
-        public async Task<IEnumerable<string>> GetFeaturesThatNeedUpdateAsync()
-        {
-            var currentVersions = (await GetDataMigrationRecordAsync()).DataMigrations
-                .ToDictionary(r => r.DataMigrationClass);
+        return _dataMigrationRecord;
+    }
 
-            var outOfDateMigrations = _dataMigrations.Where(dataMigration =>
-            {
-                Records.DataMigration record;
-                if (currentVersions.TryGetValue(dataMigration.GetType().FullName, out record) && record.Version.HasValue)
-                {
-                    return CreateUpgradeLookupTable(dataMigration).ContainsKey(record.Version.Value);
-                }
+    public async Task<IEnumerable<string>> GetFeaturesThatNeedUpdateAsync()
+    {
+        var currentVersions = (await GetDataMigrationRecordAsync()).DataMigrations
+            .ToDictionary(r => r.DataMigrationClass);
 
-                return GetMethod(dataMigration, "Create") != null;
-            });
+        var outOfDateMigrations = _dataMigrations.Where(dataMigration =>
+        {
+            Records.DataMigration record;
+            if (currentVersions.TryGetValue(dataMigration.GetType().FullName, out record) && record.Version.HasValue)
+            {
+                return CreateUpgradeLookupTable(dataMigration).ContainsKey(record.Version.Value);
+            }
 
-            return outOfDateMigrations.Select(m => _typeFeatureProvider.GetFeatureForDependency(m.GetType()).Id).ToArray();
-        }
+            return GetMethod(dataMigration, "Create") != null;
+        });
 
-        public async Task Uninstall(string feature)
-        {
-            _logger.LogInformation("Uninstalling feature '{FeatureName}'.", feature);
+        return outOfDateMigrations.Select(m => _typeFeatureProvider.GetFeatureForDependency(m.GetType()).Id).ToArray();
+    }
 
-            var migrations = GetDataMigrations(feature);
+    public async Task Uninstall(string feature)
+    {
+        _logger.LogInformation("Uninstalling feature '{FeatureName}'.", feature);
 
-            // apply update methods to each migration class for the module
-            foreach (var migration in migrations)
-            {
-                // copy the object for the Linq query
-                var tempMigration = migration;
+        var migrations = GetDataMigrations(feature);
 
-                // get current version for this migration
-                var dataMigrationRecord = await GetDataMigrationRecordAsync(tempMigration);
+        // apply update methods to each migration class for the module
+        foreach (var migration in migrations)
+        {
+            // copy the object for the Linq query
+            var tempMigration = migration;
 
-                var uninstallMethod = GetMethod(migration, "Uninstall");
+            // get current version for this migration
+            var dataMigrationRecord = await GetDataMigrationRecordAsync(tempMigration);
 
-                if (uninstallMethod != null)
-                {
-                    await InvokeMethodAsync(uninstallMethod, migration);
-                }
+            var uninstallMethod = GetMethod(migration, "Uninstall");
 
-                if (dataMigrationRecord == null)
-                {
-                    continue;
-                }
+            if (uninstallMethod != null)
+            {
+                await InvokeMethodAsync(uninstallMethod, migration);
+            }
 
-                (await GetDataMigrationRecordAsync()).DataMigrations.Remove(dataMigrationRecord);
+            if (dataMigrationRecord == null)
+            {
+                continue;
             }
+
+            (await GetDataMigrationRecordAsync()).DataMigrations.Remove(dataMigrationRecord);
         }
+    }
 
-        public async Task UpdateAllFeaturesAsync()
-        {
-            var featuresThatNeedUpdate = await GetFeaturesThatNeedUpdateAsync();
+    public async Task UpdateAllFeaturesAsync()
+    {
+        var featuresThatNeedUpdate = await GetFeaturesThatNeedUpdateAsync();
 
-            foreach (var featureId in featuresThatNeedUpdate)
+        foreach (var featureId in featuresThatNeedUpdate)
+        {
+            try
             {
-                try
-                {
-                    await UpdateAsync(featureId);
-                }
-                catch (Exception ex) when (!ex.IsFatal())
-                {
-                    _logger.LogError(ex, "Could not run migrations automatically on '{FeatureName}'", featureId);
-                }
+                await UpdateAsync(featureId);
+            }
+            catch (Exception ex) when (!ex.IsFatal())
+            {
+                _logger.LogError(ex, "Could not run migrations automatically on '{FeatureName}'", featureId);
             }
         }
+    }
 
-        public async Task UpdateAsync(params string[] featureIds)
+    public async Task UpdateAsync(params string[] featureIds)
+    {
+        foreach (var featureId in featureIds)
         {
-            foreach (var featureId in featureIds)
+            if (!_processedFeatures.Contains(featureId))
             {
-                if (!_processedFeatures.Contains(featureId))
-                {
-                    await UpdateAsync(featureId);
-                }
+                await UpdateAsync(featureId);
             }
         }
+    }
 
-        private async Task UpdateAsync(string featureId)
+    private async Task UpdateAsync(string featureId)
+    {
+        if (_processedFeatures.Contains(featureId))
         {
-            if (_processedFeatures.Contains(featureId))
-            {
-                return;
-            }
+            return;
+        }
 
-            _processedFeatures.Add(featureId);
+        _processedFeatures.Add(featureId);
 
-            _logger.LogInformation("Updating feature '{FeatureName}'", featureId);
+        _logger.LogInformation("Updating feature '{FeatureName}'", featureId);
 
-            // proceed with dependent features first, whatever the module it's in
-            var dependencies = _extensionManager
-                .GetFeatureDependencies(featureId)
-                .Where(x => x.Id != featureId)
-                .Select(x => x.Id);
+        // proceed with dependent features first, whatever the module it's in
+        var dependencies = _extensionManager
+            .GetFeatureDependencies(featureId)
+            .Where(x => x.Id != featureId)
+            .Select(x => x.Id);
 
-            foreach (var dependency in dependencies)
-            {
-                await UpdateAsync(dependency);
-            }
+        foreach (var dependency in dependencies)
+        {
+            await UpdateAsync(dependency);
+        }
 
-            var migrations = GetDataMigrations(featureId);
+        var migrations = GetDataMigrations(featureId);
 
-            // apply update methods to each migration class for the module
-            foreach (var migration in migrations)
-            {
-                var schemaBuilder = new SchemaBuilder(_store.Configuration, await _session.BeginTransactionAsync());
-                migration.SchemaBuilder = schemaBuilder;
+        // apply update methods to each migration class for the module
+        foreach (var migration in migrations)
+        {
+            var schemaBuilder = new SchemaBuilder(_store.Configuration, await _session.BeginTransactionAsync());
+            migration.SchemaBuilder = schemaBuilder;
 
-                // Copy the object for the Linq query.
-                var tempMigration = migration;
+            // Copy the object for the Linq query.
+            var tempMigration = migration;
 
-                // Get current version for this migration.
-                var dataMigrationRecord = await GetDataMigrationRecordAsync(tempMigration);
+            // Get current version for this migration.
+            var dataMigrationRecord = await GetDataMigrationRecordAsync(tempMigration);
 
-                var current = 0;
-                if (dataMigrationRecord != null)
-                {
-                    // This can be null if a failed create migration has occurred and the data migration record was saved.
-                    current = dataMigrationRecord.Version ?? current;
-                }
-                else
-                {
-                    dataMigrationRecord = new Records.DataMigration { DataMigrationClass = migration.GetType().FullName };
-                    _dataMigrationRecord.DataMigrations.Add(dataMigrationRecord);
-                }
+            var current = 0;
+            if (dataMigrationRecord != null)
+            {
+                // This can be null if a failed create migration has occurred and the data migration record was saved.
+                current = dataMigrationRecord.Version ?? current;
+            }
+            else
+            {
+                dataMigrationRecord = new Records.DataMigration { DataMigrationClass = migration.GetType().FullName };
+                _dataMigrationRecord.DataMigrations.Add(dataMigrationRecord);
+            }
 
-                try
+            try
+            {
+                // Do we need to call Create or CreateAsync?
+                if (current == 0)
                 {
-                    // Do we need to call Create or CreateAsync?
-                    if (current == 0)
-                    {
-                        // Try to get a Create method.
-                        var createMethod = GetMethod(migration, "Create");
-
-                        if (createMethod == null)
-                        {
-                            _logger.LogWarning("The migration '{name}' for '{FeatureName}' does not contain a proper Create or CreateAsync method.", migration.GetType().FullName, featureId);
-                            continue;
-                        }
-
-                        current = await InvokeMethodAsync(createMethod, migration);
-                    }
-
-                    var lookupTable = CreateUpgradeLookupTable(migration);
+                    // Try to get a Create method.
+                    var createMethod = GetMethod(migration, "Create");
 
-                    while (lookupTable.TryGetValue(current, out var methodInfo))
+                    if (createMethod == null)
                     {
-                        _logger.LogInformation("Applying migration for '{FeatureName}' from version {Version}.", featureId, current);
-
-                        current = await InvokeMethodAsync(methodInfo, migration);
+                        _logger.LogWarning("The migration '{name}' for '{FeatureName}' does not contain a proper Create or CreateAsync method.", migration.GetType().FullName, featureId);
+                        continue;
                     }
 
-                    // If current is 0, it means no upgrade/create method was found or succeeded.
-                    if (current == 0)
-                    {
-                        return;
-                    }
-
-                    dataMigrationRecord.Version = current;
+                    current = await InvokeMethodAsync(createMethod, migration);
                 }
-                catch (Exception ex)
+
+                var lookupTable = CreateUpgradeLookupTable(migration);
+
+                while (lookupTable.TryGetValue(current, out var methodInfo))
                 {
-                    _logger.LogError(ex, "Error while running migration version {Version} for '{FeatureName}'.", current, featureId);
+                    _logger.LogInformation("Applying migration for '{FeatureName}' from version {Version}.", featureId, current);
 
-                    await _session.CancelAsync();
+                    current = await InvokeMethodAsync(methodInfo, migration);
                 }
-                finally
+
+                // If current is 0, it means no upgrade/create method was found or succeeded.
+                if (current == 0)
                 {
-                    // Persist data migrations.
-                    await _session.SaveAsync(_dataMigrationRecord);
+                    return;
                 }
-            }
-        }
 
-        private static async Task<int> InvokeMethodAsync(MethodInfo method, IDataMigration migration)
-        {
-            if (method.ReturnType == typeof(Task<int>))
-            {
-                return await (Task<int>)method.Invoke(migration, []);
+                dataMigrationRecord.Version = current;
             }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error while running migration version {Version} for '{FeatureName}'.", current, featureId);
 
-            if (method.ReturnType == typeof(int))
+                await _session.CancelAsync();
+            }
+            finally
             {
-                return (int)method.Invoke(migration, []);
+                // Persist data migrations.
+                await _session.SaveAsync(_dataMigrationRecord);
             }
-
-            throw new InvalidOperationException("Invalid return type used in a migration method.");
         }
+    }
 
-        private async Task<Records.DataMigration> GetDataMigrationRecordAsync(IDataMigration tempMigration)
+    private static async Task<int> InvokeMethodAsync(MethodInfo method, IDataMigration migration)
+    {
+        if (method.ReturnType == typeof(Task<int>))
         {
-            var dataMigrationRecord = await GetDataMigrationRecordAsync();
-            return dataMigrationRecord
-                .DataMigrations
-                .FirstOrDefault(dm => dm.DataMigrationClass == tempMigration.GetType().FullName);
+            return await (Task<int>)method.Invoke(migration, []);
         }
 
-        /// <summary>
-        /// Returns all the available IDataMigration instances for a specific module, and inject necessary builders.
-        /// </summary>
-        private IDataMigration[] GetDataMigrations(string featureId)
+        if (method.ReturnType == typeof(int))
         {
-            var migrations = _dataMigrations
-                    .Where(dm => _typeFeatureProvider.GetFeatureForDependency(dm.GetType()).Id == featureId)
-                    .ToArray();
-
-            return migrations;
+            return (int)method.Invoke(migration, []);
         }
 
-        /// <summary>
-        /// Create a list of all available Update methods from a data migration class, indexed by the version number.
-        /// </summary>
-        private static Dictionary<int, MethodInfo> CreateUpgradeLookupTable(IDataMigration dataMigration)
-            => dataMigration
-                .GetType()
-                .GetMethods(BindingFlags.Public | BindingFlags.Instance)
-                .Select(GetUpdateFromMethod)
-                .Where(tuple => tuple != null)
-                .ToDictionary(tuple => tuple.Item1, tuple => tuple.Item2);
-
-        private static Tuple<int, MethodInfo> GetUpdateFromMethod(MethodInfo methodInfo)
-        {
-            if (methodInfo.Name.StartsWith(_updateFromPrefix, StringComparison.Ordinal) &&
-                (methodInfo.ReturnType == typeof(int) || methodInfo.ReturnType == typeof(Task<int>)))
-            {
-                var version = methodInfo.Name.EndsWith(_asyncSuffix, StringComparison.Ordinal)
-                    ? methodInfo.Name.Substring(_updateFromPrefix.Length, methodInfo.Name.Length - _updateFromPrefix.Length - _asyncSuffix.Length)
-                    : methodInfo.Name[_updateFromPrefix.Length..];
+        throw new InvalidOperationException("Invalid return type used in a migration method.");
+    }
 
-                if (int.TryParse(version, out var versionValue))
-                {
-                    return new Tuple<int, MethodInfo>(versionValue, methodInfo);
-                }
-            }
+    private async Task<Records.DataMigration> GetDataMigrationRecordAsync(IDataMigration tempMigration)
+    {
+        var dataMigrationRecord = await GetDataMigrationRecordAsync();
+        return dataMigrationRecord
+            .DataMigrations
+            .FirstOrDefault(dm => dm.DataMigrationClass == tempMigration.GetType().FullName);
+    }
 
-            return null;
-        }
+    /// <summary>
+    /// Returns all the available IDataMigration instances for a specific module, and inject necessary builders.
+    /// </summary>
+    private IDataMigration[] GetDataMigrations(string featureId)
+    {
+        var migrations = _dataMigrations
+                .Where(dm => _typeFeatureProvider.GetFeatureForDependency(dm.GetType()).Id == featureId)
+                .ToArray();
 
-        /// <summary>
-        /// Returns the method from a data migration class that matches the given name if found.
-        /// </summary>
-        private static MethodInfo GetMethod(IDataMigration dataMigration, string name)
+        return migrations;
+    }
+
+    /// <summary>
+    /// Create a list of all available Update methods from a data migration class, indexed by the version number.
+    /// </summary>
+    private static Dictionary<int, MethodInfo> CreateUpgradeLookupTable(IDataMigration dataMigration)
+        => dataMigration
+            .GetType()
+            .GetMethods(BindingFlags.Public | BindingFlags.Instance)
+            .Select(GetUpdateFromMethod)
+            .Where(tuple => tuple != null)
+            .ToDictionary(tuple => tuple.Item1, tuple => tuple.Item2);
+
+    private static Tuple<int, MethodInfo> GetUpdateFromMethod(MethodInfo methodInfo)
+    {
+        if (methodInfo.Name.StartsWith(_updateFromPrefix, StringComparison.Ordinal) &&
+            (methodInfo.ReturnType == typeof(int) || methodInfo.ReturnType == typeof(Task<int>)))
         {
-            // First try to find a method that match the given name. (Ex. Create())
-            var methodInfo = dataMigration.GetType().GetMethod(name, BindingFlags.Public | BindingFlags.Instance);
+            var version = methodInfo.Name.EndsWith(_asyncSuffix, StringComparison.Ordinal)
+                ? methodInfo.Name.Substring(_updateFromPrefix.Length, methodInfo.Name.Length - _updateFromPrefix.Length - _asyncSuffix.Length)
+                : methodInfo.Name[_updateFromPrefix.Length..];
 
-            if (methodInfo != null && (methodInfo.ReturnType == typeof(int) || methodInfo.ReturnType == typeof(Task<int>)))
+            if (int.TryParse(version, out var versionValue))
             {
-                return methodInfo;
+                return new Tuple<int, MethodInfo>(versionValue, methodInfo);
             }
+        }
 
-            // At this point, try to find a method that matches the given name and ends with Async. (Ex. CreateAsync())
-            methodInfo = dataMigration.GetType().GetMethod(name + _asyncSuffix, BindingFlags.Public | BindingFlags.Instance);
+        return null;
+    }
 
-            if (methodInfo != null && methodInfo.ReturnType == typeof(Task<int>))
-            {
-                return methodInfo;
-            }
+    /// <summary>
+    /// Returns the method from a data migration class that matches the given name if found.
+    /// </summary>
+    private static MethodInfo GetMethod(IDataMigration dataMigration, string name)
+    {
+        // First try to find a method that match the given name. (Ex. Create())
+        var methodInfo = dataMigration.GetType().GetMethod(name, BindingFlags.Public | BindingFlags.Instance);
 
-            return null;
+        if (methodInfo != null && (methodInfo.ReturnType == typeof(int) || methodInfo.ReturnType == typeof(Task<int>)))
+        {
+            return methodInfo;
         }
+
+        // At this point, try to find a method that matches the given name and ends with Async. (Ex. CreateAsync())
+        methodInfo = dataMigration.GetType().GetMethod(name + _asyncSuffix, BindingFlags.Public | BindingFlags.Instance);
+
+        if (methodInfo != null && methodInfo.ReturnType == typeof(Task<int>))
+        {
+            return methodInfo;
+        }
+
+        return null;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Data.YesSql/Options/SqliteOptions.cs b/src/OrchardCore/OrchardCore.Data.YesSql/Options/SqliteOptions.cs
index 65905973fdc..b1abeb849ef 100644
--- a/src/OrchardCore/OrchardCore.Data.YesSql/Options/SqliteOptions.cs
+++ b/src/OrchardCore/OrchardCore.Data.YesSql/Options/SqliteOptions.cs
@@ -1,19 +1,18 @@
-namespace OrchardCore.Data
+namespace OrchardCore.Data;
+
+/// <summary>
+/// Sqlite-specific configuration for the Orchard Core database. 
+/// See <see href="https://docs.orchardcore.net/en/latest/reference/core/Data/#sqlite" />.
+/// </summary>
+public class SqliteOptions
 {
     /// <summary>
-    /// Sqlite-specific configuration for the Orchard Core database. 
-    /// See <see href="https://docs.orchardcore.net/en/latest/reference/core/Data/#sqlite" />.
+    /// <para>By default in .Net 6, <c>Microsoft.Data.Sqlite</c> pools connections to the database. 
+    /// It achieves this by putting a lock on the database file and leaving connections open to be reused.
+    /// If the lock is preventing tasks like backups, this functionality can be disabled.</para>
+    /// 
+    /// <para>There may be a performance penalty associated with disabling connection pooling.</para>
+    /// <see href="https://docs.microsoft.com/en-us/dotnet/standard/data/sqlite/connection-strings#pooling" />.
     /// </summary>
-    public class SqliteOptions
-    {
-        /// <summary>
-        /// <para>By default in .Net 6, <c>Microsoft.Data.Sqlite</c> pools connections to the database. 
-        /// It achieves this by putting a lock on the database file and leaving connections open to be reused.
-        /// If the lock is preventing tasks like backups, this functionality can be disabled.</para>
-        /// 
-        /// <para>There may be a performance penalty associated with disabling connection pooling.</para>
-        /// <see href="https://docs.microsoft.com/en-us/dotnet/standard/data/sqlite/connection-strings#pooling" />.
-        /// </summary>
-        public bool UseConnectionPooling { get; set; } = true;
-    }
+    public bool UseConnectionPooling { get; set; } = true;
 }
diff --git a/src/OrchardCore/OrchardCore.Data.YesSql/Options/SqliteOptionsConfiguration.cs b/src/OrchardCore/OrchardCore.Data.YesSql/Options/SqliteOptionsConfiguration.cs
index d90f26b4eaa..145d67d5f91 100644
--- a/src/OrchardCore/OrchardCore.Data.YesSql/Options/SqliteOptionsConfiguration.cs
+++ b/src/OrchardCore/OrchardCore.Data.YesSql/Options/SqliteOptionsConfiguration.cs
@@ -2,22 +2,21 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Environment.Shell.Configuration;
 
-namespace OrchardCore.Data
+namespace OrchardCore.Data;
+
+public sealed class SqliteOptionsConfiguration : IConfigureOptions<SqliteOptions>
 {
-    public sealed class SqliteOptionsConfiguration : IConfigureOptions<SqliteOptions>
-    {
-        private readonly IShellConfiguration _shellConfiguration;
+    private readonly IShellConfiguration _shellConfiguration;
 
-        public SqliteOptionsConfiguration(IShellConfiguration shellConfiguration)
-        {
-            _shellConfiguration = shellConfiguration;
-        }
+    public SqliteOptionsConfiguration(IShellConfiguration shellConfiguration)
+    {
+        _shellConfiguration = shellConfiguration;
+    }
 
-        public void Configure(SqliteOptions options)
-        {
-            var section = _shellConfiguration.GetSection("OrchardCore_Data_Sqlite");
+    public void Configure(SqliteOptions options)
+    {
+        var section = _shellConfiguration.GetSection("OrchardCore_Data_Sqlite");
 
-            section.Bind(options);
-        }
+        section.Bind(options);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Data.YesSql/OrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Data.YesSql/OrchardCoreBuilderExtensions.cs
index 2a03aa53609..ee79db4b890 100644
--- a/src/OrchardCore/OrchardCore.Data.YesSql/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Data.YesSql/OrchardCoreBuilderExtensions.cs
@@ -23,202 +23,201 @@
 using YesSql.Provider.SqlServer;
 using YesSql.Serialization;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+/// <summary>
+/// Provides extension methods for <see cref="OrchardCoreBuilder"/> to add database access functionality.
+/// </summary>
+public static class OrchardCoreBuilderExtensions
 {
     /// <summary>
-    /// Provides extension methods for <see cref="OrchardCoreBuilder"/> to add database access functionality.
+    /// Adds host and tenant level data access services.
     /// </summary>
-    public static class OrchardCoreBuilderExtensions
+    /// <param name="builder">The <see cref="OrchardCoreBuilder"/>.</param>
+    public static OrchardCoreBuilder AddDataAccess(this OrchardCoreBuilder builder)
     {
-        /// <summary>
-        /// Adds host and tenant level data access services.
-        /// </summary>
-        /// <param name="builder">The <see cref="OrchardCoreBuilder"/>.</param>
-        public static OrchardCoreBuilder AddDataAccess(this OrchardCoreBuilder builder)
+        builder.ApplicationServices.AddSingleton<IShellRemovingHandler, ShellDbTablesRemovingHandler>();
+
+        builder.ConfigureServices((services, serviceProvider) =>
         {
-            builder.ApplicationServices.AddSingleton<IShellRemovingHandler, ShellDbTablesRemovingHandler>();
+            var configuration = serviceProvider.GetService<IShellConfiguration>();
+
+            services.Configure<YesSqlOptions>(configuration.GetSection("OrchardCore_YesSql"));
+            services.AddScoped<IDbConnectionValidator, DbConnectionValidator>();
+            services.AddScoped<IDataMigrationManager, DataMigrationManager>();
+            services.AddScoped<IModularTenantEvents, AutomaticDataMigrations>();
+
+            services.AddTransient<ITableNameConventionFactory, TableNameConventionFactory>();
+            services.AddTransient<IConfigureOptions<SqliteOptions>, SqliteOptionsConfiguration>();
+
+            // Adding supported databases
+            services.TryAddDataProvider(name: "Sql Server", value: DatabaseProviderValue.SqlConnection, hasConnectionString: true, sampleConnectionString: "Server=localhost;Database=Orchard;User Id=username;Password=password", hasTablePrefix: true, isDefault: false);
+            services.TryAddDataProvider(name: "Sqlite", value: DatabaseProviderValue.Sqlite, hasConnectionString: false, hasTablePrefix: false, isDefault: true);
+            services.TryAddDataProvider(name: "MySql", value: DatabaseProviderValue.MySql, hasConnectionString: true, sampleConnectionString: "Server=localhost;Database=Orchard;Uid=username;Pwd=password", hasTablePrefix: true, isDefault: false);
+            services.TryAddDataProvider(name: "Postgres", value: DatabaseProviderValue.Postgres, hasConnectionString: true, sampleConnectionString: "Server=localhost;Port=5432;Database=Orchard;User Id=username;Password=password", hasTablePrefix: true, isDefault: false);
 
-            builder.ConfigureServices((services, serviceProvider) =>
+            // Configuring data access
+            services.AddSingleton(sp =>
             {
-                var configuration = serviceProvider.GetService<IShellConfiguration>();
+                var shellSettings = sp.GetService<ShellSettings>();
 
-                services.Configure<YesSqlOptions>(configuration.GetSection("OrchardCore_YesSql"));
-                services.AddScoped<IDbConnectionValidator, DbConnectionValidator>();
-                services.AddScoped<IDataMigrationManager, DataMigrationManager>();
-                services.AddScoped<IModularTenantEvents, AutomaticDataMigrations>();
+                // Before the setup, a 'DatabaseProvider' may be configured without a required 'ConnectionString'.
+                if (shellSettings.IsUninitialized() || shellSettings["DatabaseProvider"] is null)
+                {
+                    return null;
+                }
 
-                services.AddTransient<ITableNameConventionFactory, TableNameConventionFactory>();
-                services.AddTransient<IConfigureOptions<SqliteOptions>, SqliteOptionsConfiguration>();
+                var yesSqlOptions = sp.GetService<IOptions<YesSqlOptions>>().Value;
 
-                // Adding supported databases
-                services.TryAddDataProvider(name: "Sql Server", value: DatabaseProviderValue.SqlConnection, hasConnectionString: true, sampleConnectionString: "Server=localhost;Database=Orchard;User Id=username;Password=password", hasTablePrefix: true, isDefault: false);
-                services.TryAddDataProvider(name: "Sqlite", value: DatabaseProviderValue.Sqlite, hasConnectionString: false, hasTablePrefix: false, isDefault: true);
-                services.TryAddDataProvider(name: "MySql", value: DatabaseProviderValue.MySql, hasConnectionString: true, sampleConnectionString: "Server=localhost;Database=Orchard;Uid=username;Pwd=password", hasTablePrefix: true, isDefault: false);
-                services.TryAddDataProvider(name: "Postgres", value: DatabaseProviderValue.Postgres, hasConnectionString: true, sampleConnectionString: "Server=localhost;Port=5432;Database=Orchard;User Id=username;Password=password", hasTablePrefix: true, isDefault: false);
+                var databaseTableOptions = shellSettings.GetDatabaseTableOptions();
+                var storeConfiguration = GetStoreConfiguration(sp, yesSqlOptions, databaseTableOptions);
 
-                // Configuring data access
-                services.AddSingleton(sp =>
+                switch (shellSettings["DatabaseProvider"])
+                {
+                    case DatabaseProviderValue.SqlConnection:
+                        storeConfiguration
+                            .UseSqlServer(shellSettings["ConnectionString"], IsolationLevel.ReadUncommitted, shellSettings["Schema"])
+                            .UseBlockIdGenerator();
+                        break;
+                    case DatabaseProviderValue.Sqlite:
+                        var shellOptions = sp.GetService<IOptions<ShellOptions>>().Value;
+                        var sqliteOptions = sp.GetService<IOptions<SqliteOptions>>().Value;
+
+                        var databaseFolder = SqliteHelper.GetDatabaseFolder(shellOptions, shellSettings.Name);
+                        Directory.CreateDirectory(databaseFolder);
+
+                        // Only allow creating a file DB when a tenant is in the Initializing state
+                        var connectionString = SqliteHelper.GetConnectionString(sqliteOptions, databaseFolder, shellSettings);
+
+                        storeConfiguration
+                            .UseSqLite(connectionString, IsolationLevel.ReadUncommitted)
+                            .UseDefaultIdGenerator();
+                        break;
+                    case DatabaseProviderValue.MySql:
+                        storeConfiguration
+                            .UseMySql(shellSettings["ConnectionString"], IsolationLevel.ReadUncommitted, shellSettings["Schema"])
+                            .UseBlockIdGenerator();
+                        break;
+                    case DatabaseProviderValue.Postgres:
+                        storeConfiguration
+                            .UsePostgreSql(shellSettings["ConnectionString"], IsolationLevel.ReadUncommitted, shellSettings["Schema"])
+                            .UseBlockIdGenerator();
+                        break;
+                    default:
+                        throw new ArgumentException("Unknown database provider: " + shellSettings["DatabaseProvider"]);
+                }
+
+                if (!string.IsNullOrWhiteSpace(shellSettings["TablePrefix"]))
                 {
-                    var shellSettings = sp.GetService<ShellSettings>();
+                    var tablePrefix = shellSettings["TablePrefix"].Trim() + databaseTableOptions.TableNameSeparator;
 
-                    // Before the setup, a 'DatabaseProvider' may be configured without a required 'ConnectionString'.
-                    if (shellSettings.IsUninitialized() || shellSettings["DatabaseProvider"] is null)
-                    {
-                        return null;
-                    }
+                    storeConfiguration.SetTablePrefix(tablePrefix);
+                }
 
-                    var yesSqlOptions = sp.GetService<IOptions<YesSqlOptions>>().Value;
+                var store = StoreFactory.Create(storeConfiguration);
 
-                    var databaseTableOptions = shellSettings.GetDatabaseTableOptions();
-                    var storeConfiguration = GetStoreConfiguration(sp, yesSqlOptions, databaseTableOptions);
+                var indexes = sp.GetServices<IIndexProvider>();
 
-                    switch (shellSettings["DatabaseProvider"])
-                    {
-                        case DatabaseProviderValue.SqlConnection:
-                            storeConfiguration
-                                .UseSqlServer(shellSettings["ConnectionString"], IsolationLevel.ReadUncommitted, shellSettings["Schema"])
-                                .UseBlockIdGenerator();
-                            break;
-                        case DatabaseProviderValue.Sqlite:
-                            var shellOptions = sp.GetService<IOptions<ShellOptions>>().Value;
-                            var sqliteOptions = sp.GetService<IOptions<SqliteOptions>>().Value;
-
-                            var databaseFolder = SqliteHelper.GetDatabaseFolder(shellOptions, shellSettings.Name);
-                            Directory.CreateDirectory(databaseFolder);
-
-                            // Only allow creating a file DB when a tenant is in the Initializing state
-                            var connectionString = SqliteHelper.GetConnectionString(sqliteOptions, databaseFolder, shellSettings);
-
-                            storeConfiguration
-                                .UseSqLite(connectionString, IsolationLevel.ReadUncommitted)
-                                .UseDefaultIdGenerator();
-                            break;
-                        case DatabaseProviderValue.MySql:
-                            storeConfiguration
-                                .UseMySql(shellSettings["ConnectionString"], IsolationLevel.ReadUncommitted, shellSettings["Schema"])
-                                .UseBlockIdGenerator();
-                            break;
-                        case DatabaseProviderValue.Postgres:
-                            storeConfiguration
-                                .UsePostgreSql(shellSettings["ConnectionString"], IsolationLevel.ReadUncommitted, shellSettings["Schema"])
-                                .UseBlockIdGenerator();
-                            break;
-                        default:
-                            throw new ArgumentException("Unknown database provider: " + shellSettings["DatabaseProvider"]);
-                    }
-
-                    if (!string.IsNullOrWhiteSpace(shellSettings["TablePrefix"]))
-                    {
-                        var tablePrefix = shellSettings["TablePrefix"].Trim() + databaseTableOptions.TableNameSeparator;
+                store.RegisterIndexes(indexes);
 
-                        storeConfiguration.SetTablePrefix(tablePrefix);
-                    }
+                return store;
+            });
 
-                    var store = StoreFactory.Create(storeConfiguration);
+            services.Initialize(async sp =>
+            {
+                var store = sp.GetService<IStore>();
+                if (store == null)
+                {
+                    return;
+                }
 
-                    var indexes = sp.GetServices<IIndexProvider>();
+                await store.InitializeAsync();
 
-                    store.RegisterIndexes(indexes);
+                var storeCollectionOptions = sp.GetService<IOptions<StoreCollectionOptions>>().Value;
+                foreach (var collection in storeCollectionOptions.Collections)
+                {
+                    await store.InitializeCollectionAsync(collection);
+                }
+            });
 
-                    return store;
-                });
+            services.AddScoped(sp =>
+            {
+                var store = sp.GetService<IStore>();
 
-                services.Initialize(async sp =>
+                if (store == null)
                 {
-                    var store = sp.GetService<IStore>();
-                    if (store == null)
-                    {
-                        return;
-                    }
+                    return null;
+                }
 
-                    await store.InitializeAsync();
+                var session = store.CreateSession();
 
-                    var storeCollectionOptions = sp.GetService<IOptions<StoreCollectionOptions>>().Value;
-                    foreach (var collection in storeCollectionOptions.Collections)
-                    {
-                        await store.InitializeCollectionAsync(collection);
-                    }
-                });
+                var scopedServices = sp.GetServices<IScopedIndexProvider>();
 
-                services.AddScoped(sp =>
-                {
-                    var store = sp.GetService<IStore>();
+                session.RegisterIndexes(scopedServices.ToArray());
 
-                    if (store == null)
+                ShellScope.Current
+                    .RegisterBeforeDispose(scope =>
+                    {
+                        return scope.ServiceProvider
+                            .GetRequiredService<IDocumentStore>()
+                            .CommitAsync();
+                    })
+                    .AddExceptionHandler((scope, e) =>
                     {
-                        return null;
-                    }
-
-                    var session = store.CreateSession();
-
-                    var scopedServices = sp.GetServices<IScopedIndexProvider>();
-
-                    session.RegisterIndexes(scopedServices.ToArray());
-
-                    ShellScope.Current
-                        .RegisterBeforeDispose(scope =>
-                        {
-                            return scope.ServiceProvider
-                                .GetRequiredService<IDocumentStore>()
-                                .CommitAsync();
-                        })
-                        .AddExceptionHandler((scope, e) =>
-                        {
-                            return scope.ServiceProvider
-                                .GetRequiredService<IDocumentStore>()
-                                .CancelAsync();
-                        });
-
-                    return session;
-                });
-
-                services.AddScoped<IDocumentStore, DocumentStore>();
-                services.AddSingleton<IFileDocumentStore, FileDocumentStore>();
-                services.AddTransient<IDbConnectionAccessor, DbConnectionAccessor>();
+                        return scope.ServiceProvider
+                            .GetRequiredService<IDocumentStore>()
+                            .CancelAsync();
+                    });
+
+                return session;
             });
 
-            return builder;
-        }
+            services.AddScoped<IDocumentStore, DocumentStore>();
+            services.AddSingleton<IFileDocumentStore, FileDocumentStore>();
+            services.AddTransient<IDbConnectionAccessor, DbConnectionAccessor>();
+        });
 
-        private static YesSql.Configuration GetStoreConfiguration(IServiceProvider sp, YesSqlOptions yesSqlOptions, DatabaseTableOptions databaseTableOptions)
-        {
-            var tableNameFactory = sp.GetRequiredService<ITableNameConventionFactory>();
-            var loggerFactory = sp.GetRequiredService<ILoggerFactory>();
+        return builder;
+    }
 
-            var serializerOptions = sp.GetRequiredService<IOptions<DocumentJsonSerializerOptions>>();
+    private static YesSql.Configuration GetStoreConfiguration(IServiceProvider sp, YesSqlOptions yesSqlOptions, DatabaseTableOptions databaseTableOptions)
+    {
+        var tableNameFactory = sp.GetRequiredService<ITableNameConventionFactory>();
+        var loggerFactory = sp.GetRequiredService<ILoggerFactory>();
 
-            var storeConfiguration = new YesSql.Configuration
-            {
-                CommandsPageSize = yesSqlOptions.CommandsPageSize,
-                QueryGatingEnabled = yesSqlOptions.QueryGatingEnabled,
-                EnableThreadSafetyChecks = yesSqlOptions.EnableThreadSafetyChecks,
-                TableNameConvention = tableNameFactory.Create(databaseTableOptions),
-                IdentityColumnSize = Enum.Parse<IdentityColumnSize>(databaseTableOptions.IdentityColumnSize),
-                Logger = loggerFactory.CreateLogger("YesSql"),
-                ContentSerializer = new DefaultContentJsonSerializer(serializerOptions.Value.SerializerOptions),
-            };
-
-            if (yesSqlOptions.IdGenerator != null)
-            {
-                storeConfiguration.IdGenerator = yesSqlOptions.IdGenerator;
-            }
+        var serializerOptions = sp.GetRequiredService<IOptions<DocumentJsonSerializerOptions>>();
 
-            if (yesSqlOptions.IdentifierAccessorFactory != null)
-            {
-                storeConfiguration.IdentifierAccessorFactory = yesSqlOptions.IdentifierAccessorFactory;
-            }
+        var storeConfiguration = new YesSql.Configuration
+        {
+            CommandsPageSize = yesSqlOptions.CommandsPageSize,
+            QueryGatingEnabled = yesSqlOptions.QueryGatingEnabled,
+            EnableThreadSafetyChecks = yesSqlOptions.EnableThreadSafetyChecks,
+            TableNameConvention = tableNameFactory.Create(databaseTableOptions),
+            IdentityColumnSize = Enum.Parse<IdentityColumnSize>(databaseTableOptions.IdentityColumnSize),
+            Logger = loggerFactory.CreateLogger("YesSql"),
+            ContentSerializer = new DefaultContentJsonSerializer(serializerOptions.Value.SerializerOptions),
+        };
+
+        if (yesSqlOptions.IdGenerator != null)
+        {
+            storeConfiguration.IdGenerator = yesSqlOptions.IdGenerator;
+        }
 
-            if (yesSqlOptions.VersionAccessorFactory != null)
-            {
-                storeConfiguration.VersionAccessorFactory = yesSqlOptions.VersionAccessorFactory;
-            }
+        if (yesSqlOptions.IdentifierAccessorFactory != null)
+        {
+            storeConfiguration.IdentifierAccessorFactory = yesSqlOptions.IdentifierAccessorFactory;
+        }
 
-            if (yesSqlOptions.ContentSerializer != null)
-            {
-                storeConfiguration.ContentSerializer = yesSqlOptions.ContentSerializer;
-            }
+        if (yesSqlOptions.VersionAccessorFactory != null)
+        {
+            storeConfiguration.VersionAccessorFactory = yesSqlOptions.VersionAccessorFactory;
+        }
 
-            return storeConfiguration;
+        if (yesSqlOptions.ContentSerializer != null)
+        {
+            storeConfiguration.ContentSerializer = yesSqlOptions.ContentSerializer;
         }
+
+        return storeConfiguration;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Data.YesSql/SqliteHelper.cs b/src/OrchardCore/OrchardCore.Data.YesSql/SqliteHelper.cs
index c29335176cd..8866828e598 100644
--- a/src/OrchardCore/OrchardCore.Data.YesSql/SqliteHelper.cs
+++ b/src/OrchardCore/OrchardCore.Data.YesSql/SqliteHelper.cs
@@ -52,7 +52,8 @@ public static string GetConnectionString(SqliteOptions sqliteOptions, string dat
     public static string GetDatabaseFolder(ShellOptions shellOptions, string shellName) =>
         Path.Combine(shellOptions.ShellsApplicationDataPath, shellOptions.ShellsContainerName, shellName);
 
-    private static SqliteConnectionStringBuilder GetSqliteConnectionStringBuilder(SqliteOptions sqliteOptions, string databaseFolder, string databaseName, SqliteOpenMode sqliteOpenMode){
+    private static SqliteConnectionStringBuilder GetSqliteConnectionStringBuilder(SqliteOptions sqliteOptions, string databaseFolder, string databaseName, SqliteOpenMode sqliteOpenMode)
+    {
         return new SqliteConnectionStringBuilder
         {
             DataSource = string.IsNullOrEmpty(databaseFolder) ? databaseName : Path.Combine(databaseFolder, databaseName),
diff --git a/src/OrchardCore/OrchardCore.Data/Documents/FileDocumentStore.cs b/src/OrchardCore/OrchardCore.Data/Documents/FileDocumentStore.cs
index a37d50e8b6b..5deb022d1a4 100644
--- a/src/OrchardCore/OrchardCore.Data/Documents/FileDocumentStore.cs
+++ b/src/OrchardCore/OrchardCore.Data/Documents/FileDocumentStore.cs
@@ -9,129 +9,128 @@
 using OrchardCore.Environment.Shell;
 using OrchardCore.Environment.Shell.Scope;
 
-namespace OrchardCore.Data.Documents
+namespace OrchardCore.Data.Documents;
+
+/// <summary>
+/// A singleton service using the file system to store document files under the tenant folder, and that is in sync
+/// with the ambient transaction, any file is updated after a successful <see cref="IDocumentStore.CommitAsync"/>.
+/// </summary>
+public class FileDocumentStore : IFileDocumentStore
 {
-    /// <summary>
-    /// A singleton service using the file system to store document files under the tenant folder, and that is in sync
-    /// with the ambient transaction, any file is updated after a successful <see cref="IDocumentStore.CommitAsync"/>.
-    /// </summary>
-    public class FileDocumentStore : IFileDocumentStore
+    private readonly string _tenantPath;
+
+    private readonly SemaphoreSlim _semaphore = new(1);
+
+    public FileDocumentStore(IOptions<ShellOptions> shellOptions, ShellSettings shellSettings)
     {
-        private readonly string _tenantPath;
+        _tenantPath = Path.Combine(
+            shellOptions.Value.ShellsApplicationDataPath,
+            shellOptions.Value.ShellsContainerName,
+            shellSettings.Name) + "/";
 
-        private readonly SemaphoreSlim _semaphore = new(1);
+        Directory.CreateDirectory(_tenantPath);
+    }
 
-        public FileDocumentStore(IOptions<ShellOptions> shellOptions, ShellSettings shellSettings)
+    /// <inheritdoc />
+    public async Task<T> GetOrCreateMutableAsync<T>(Func<Task<T>> factoryAsync = null) where T : class, new()
+    {
+        var loaded = ShellScope.Get<T>(typeof(T));
+        if (loaded != null)
         {
-            _tenantPath = Path.Combine(
-                shellOptions.Value.ShellsApplicationDataPath,
-                shellOptions.Value.ShellsContainerName,
-                shellSettings.Name) + "/";
+            return loaded;
+        }
+
+        var document = await GetDocumentAsync<T>()
+            ?? await (factoryAsync?.Invoke() ?? Task.FromResult((T)null))
+            ?? new T();
 
-            Directory.CreateDirectory(_tenantPath);
+        ShellScope.Set(typeof(T), document);
+
+        return document;
+    }
+
+    /// <inheritdoc />
+    public async Task<(bool, T)> GetOrCreateImmutableAsync<T>(Func<Task<T>> factoryAsync = null) where T : class, new()
+    {
+        var loaded = ShellScope.Get<T>(typeof(T));
+        if (loaded != null)
+        {
+            // Return the already loaded document but indicating that it should not be cached.
+            return (false, loaded);
         }
 
-        /// <inheritdoc />
-        public async Task<T> GetOrCreateMutableAsync<T>(Func<Task<T>> factoryAsync = null) where T : class, new()
+        return (true, await GetDocumentAsync<T>() ?? await (factoryAsync?.Invoke() ?? Task.FromResult((T)null)) ?? new T());
+    }
+
+    /// <inheritdoc />
+    public Task UpdateAsync<T>(T document, Func<T, Task> updateCache, bool checkConcurrency = false)
+    {
+        DocumentStore.AfterCommitSuccess<T>(async () =>
         {
-            var loaded = ShellScope.Get<T>(typeof(T));
-            if (loaded != null)
-            {
-                return loaded;
-            }
+            await SaveDocumentAsync(document);
+            ShellScope.Set(typeof(T), null);
+            await updateCache(document);
+        });
+
+        return Task.CompletedTask;
+    }
 
-            var document = await GetDocumentAsync<T>()
-                ?? await (factoryAsync?.Invoke() ?? Task.FromResult((T)null))
-                ?? new T();
+    public Task CancelAsync() => DocumentStore.CancelAsync();
+    public void AfterCommitSuccess<T>(DocumentStoreCommitSuccessDelegate afterCommitSuccess) => DocumentStore.AfterCommitSuccess<T>(afterCommitSuccess);
+    public void AfterCommitFailure<T>(DocumentStoreCommitFailureDelegate afterCommitFailure) => DocumentStore.AfterCommitFailure<T>(afterCommitFailure);
+    public Task CommitAsync() => throw new NotImplementedException();
 
-            ShellScope.Set(typeof(T), document);
+    private async Task<T> GetDocumentAsync<T>()
+    {
+        var typeName = typeof(T).Name;
 
-            return document;
+        var attribute = typeof(T).GetCustomAttribute<FileDocumentStoreAttribute>();
+        if (attribute != null)
+        {
+            typeName = attribute.FileName ?? typeName;
         }
 
-        /// <inheritdoc />
-        public async Task<(bool, T)> GetOrCreateImmutableAsync<T>(Func<Task<T>> factoryAsync = null) where T : class, new()
+        var filename = _tenantPath + typeName + ".json";
+        if (!File.Exists(filename))
         {
-            var loaded = ShellScope.Get<T>(typeof(T));
-            if (loaded != null)
-            {
-                // Return the already loaded document but indicating that it should not be cached.
-                return (false, loaded);
-            }
-
-            return (true, await GetDocumentAsync<T>() ?? await (factoryAsync?.Invoke() ?? Task.FromResult((T)null)) ?? new T());
+            return default;
         }
 
-        /// <inheritdoc />
-        public Task UpdateAsync<T>(T document, Func<T, Task> updateCache, bool checkConcurrency = false)
+        await _semaphore.WaitAsync();
+        try
+        {
+            using var stream = File.OpenRead(filename);
+            return await JsonSerializer.DeserializeAsync<T>(stream, JOptions.Default);
+        }
+        finally
         {
-            DocumentStore.AfterCommitSuccess<T>(async () =>
-            {
-                await SaveDocumentAsync(document);
-                ShellScope.Set(typeof(T), null);
-                await updateCache(document);
-            });
-
-            return Task.CompletedTask;
+            _semaphore.Release();
         }
+    }
 
-        public Task CancelAsync() => DocumentStore.CancelAsync();
-        public void AfterCommitSuccess<T>(DocumentStoreCommitSuccessDelegate afterCommitSuccess) => DocumentStore.AfterCommitSuccess<T>(afterCommitSuccess);
-        public void AfterCommitFailure<T>(DocumentStoreCommitFailureDelegate afterCommitFailure) => DocumentStore.AfterCommitFailure<T>(afterCommitFailure);
-        public Task CommitAsync() => throw new NotImplementedException();
+    private async Task SaveDocumentAsync<T>(T document)
+    {
+        var typeName = typeof(T).Name;
 
-        private async Task<T> GetDocumentAsync<T>()
+        var attribute = typeof(T).GetCustomAttribute<FileDocumentStoreAttribute>();
+        if (attribute != null)
         {
-            var typeName = typeof(T).Name;
-
-            var attribute = typeof(T).GetCustomAttribute<FileDocumentStoreAttribute>();
-            if (attribute != null)
-            {
-                typeName = attribute.FileName ?? typeName;
-            }
-
-            var filename = _tenantPath + typeName + ".json";
-            if (!File.Exists(filename))
-            {
-                return default;
-            }
-
-            await _semaphore.WaitAsync();
-            try
-            {
-                using var stream = File.OpenRead(filename);
-                return await JsonSerializer.DeserializeAsync<T>(stream, JOptions.Default);
-            }
-            finally
-            {
-                _semaphore.Release();
-            }
+            typeName = attribute.FileName ?? typeName;
         }
 
-        private async Task SaveDocumentAsync<T>(T document)
+        var filename = _tenantPath + typeName + ".json";
+
+        await _semaphore.WaitAsync();
+        try
         {
-            var typeName = typeof(T).Name;
-
-            var attribute = typeof(T).GetCustomAttribute<FileDocumentStoreAttribute>();
-            if (attribute != null)
-            {
-                typeName = attribute.FileName ?? typeName;
-            }
-
-            var filename = _tenantPath + typeName + ".json";
-
-            await _semaphore.WaitAsync();
-            try
-            {
-                using var stream = File.Create(filename);
-                await JsonSerializer.SerializeAsync(stream, document, JOptions.Indented);
-            }
-            finally
-            {
-                _semaphore.Release();
-            }
+            using var stream = File.Create(filename);
+            await JsonSerializer.SerializeAsync(stream, document, JOptions.Indented);
+        }
+        finally
+        {
+            _semaphore.Release();
         }
-
-        private static IDocumentStore DocumentStore => ShellScope.Services.GetRequiredService<IDocumentStore>();
     }
+
+    private static IDocumentStore DocumentStore => ShellScope.Services.GetRequiredService<IDocumentStore>();
 }
diff --git a/src/OrchardCore/OrchardCore.Data/Migration/AutomaticDataMigrations.cs b/src/OrchardCore/OrchardCore.Data/Migration/AutomaticDataMigrations.cs
index cb49d078f80..31493f3aa2f 100644
--- a/src/OrchardCore/OrchardCore.Data/Migration/AutomaticDataMigrations.cs
+++ b/src/OrchardCore/OrchardCore.Data/Migration/AutomaticDataMigrations.cs
@@ -5,45 +5,44 @@
 using OrchardCore.Environment.Shell;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Data.Migration
+namespace OrchardCore.Data.Migration;
+
+/// <summary>
+/// Represents a tenant event that will be registered to OrchardShell.Activated in order to run migrations automatically.
+/// </summary>
+public class AutomaticDataMigrations : ModularTenantEvents
 {
+    private readonly ShellSettings _shellSettings;
+    private readonly ILogger _logger;
+    private readonly IServiceProvider _serviceProvider;
+
     /// <summary>
-    /// Represents a tenant event that will be registered to OrchardShell.Activated in order to run migrations automatically.
+    /// Creates a new instance of the <see cref="AutomaticDataMigrations"/>.
     /// </summary>
-    public class AutomaticDataMigrations : ModularTenantEvents
+    /// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
+    /// <param name="shellSettings">The <see cref="ShellSettings"/>.</param>
+    /// <param name="logger">The <see cref="ILogger"/>.</param>
+    public AutomaticDataMigrations(
+        IServiceProvider serviceProvider,
+        ShellSettings shellSettings,
+        ILogger<AutomaticDataMigrations> logger)
     {
-        private readonly ShellSettings _shellSettings;
-        private readonly ILogger _logger;
-        private readonly IServiceProvider _serviceProvider;
-
-        /// <summary>
-        /// Creates a new instance of the <see cref="AutomaticDataMigrations"/>.
-        /// </summary>
-        /// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
-        /// <param name="shellSettings">The <see cref="ShellSettings"/>.</param>
-        /// <param name="logger">The <see cref="ILogger"/>.</param>
-        public AutomaticDataMigrations(
-            IServiceProvider serviceProvider,
-            ShellSettings shellSettings,
-            ILogger<AutomaticDataMigrations> logger)
-        {
-            _serviceProvider = serviceProvider;
-            _shellSettings = shellSettings;
-            _logger = logger;
-        }
+        _serviceProvider = serviceProvider;
+        _shellSettings = shellSettings;
+        _logger = logger;
+    }
 
-        /// <inheritdocs />
-        public override Task ActivatingAsync()
+    /// <inheritdocs />
+    public override Task ActivatingAsync()
+    {
+        if (!_shellSettings.IsUninitialized())
         {
-            if (!_shellSettings.IsUninitialized())
-            {
-                _logger.LogDebug("Executing data migrations for shell '{Name}'", _shellSettings.Name);
+            _logger.LogDebug("Executing data migrations for shell '{Name}'", _shellSettings.Name);
 
-                var dataMigrationManager = _serviceProvider.GetService<IDataMigrationManager>();
-                return dataMigrationManager.UpdateAllFeaturesAsync();
-            }
-
-            return Task.CompletedTask;
+            var dataMigrationManager = _serviceProvider.GetService<IDataMigrationManager>();
+            return dataMigrationManager.UpdateAllFeaturesAsync();
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Data/Migration/Records/DataMigration.cs b/src/OrchardCore/OrchardCore.Data/Migration/Records/DataMigration.cs
index 459d89ff823..2bad4e9755b 100644
--- a/src/OrchardCore/OrchardCore.Data/Migration/Records/DataMigration.cs
+++ b/src/OrchardCore/OrchardCore.Data/Migration/Records/DataMigration.cs
@@ -1,18 +1,17 @@
-namespace OrchardCore.Data.Migration.Records
+namespace OrchardCore.Data.Migration.Records;
+
+/// <summary>
+/// Represents a database migration.
+/// </summary>
+public class DataMigration
 {
     /// <summary>
-    /// Represents a database migration.
+    /// Gets or sets a class for the database migration.
     /// </summary>
-    public class DataMigration
-    {
-        /// <summary>
-        /// Gets or sets a class for the database migration.
-        /// </summary>
-        public string DataMigrationClass { get; set; }
+    public string DataMigrationClass { get; set; }
 
-        /// <summary>
-        /// Gets or sets the version of the database migration.
-        /// </summary>
-        public int? Version { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the version of the database migration.
+    /// </summary>
+    public int? Version { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Data/Migration/Records/DataMigrationRecord.cs b/src/OrchardCore/OrchardCore.Data/Migration/Records/DataMigrationRecord.cs
index 69a633d4616..008e854ee03 100644
--- a/src/OrchardCore/OrchardCore.Data/Migration/Records/DataMigrationRecord.cs
+++ b/src/OrchardCore/OrchardCore.Data/Migration/Records/DataMigrationRecord.cs
@@ -1,28 +1,27 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Data.Migration.Records
+namespace OrchardCore.Data.Migration.Records;
+
+/// <summary>
+/// Represents a record in the database migration.
+/// </summary>
+public class DataMigrationRecord
 {
     /// <summary>
-    /// Represents a record in the database migration.
+    /// Creates a new instance of the <see cref="DataMigrationRecord"/>.
     /// </summary>
-    public class DataMigrationRecord
+    public DataMigrationRecord()
     {
-        /// <summary>
-        /// Creates a new instance of the <see cref="DataMigrationRecord"/>.
-        /// </summary>
-        public DataMigrationRecord()
-        {
-            DataMigrations = [];
-        }
+        DataMigrations = [];
+    }
 
-        /// <summary>
-        /// Gets or sets the record Id.
-        /// </summary>
-        public long Id { get; set; }
+    /// <summary>
+    /// Gets or sets the record Id.
+    /// </summary>
+    public long Id { get; set; }
 
-        /// <summary>
-        /// Gets or sets the database migrations.
-        /// </summary>
-        public List<DataMigration> DataMigrations { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the database migrations.
+    /// </summary>
+    public List<DataMigration> DataMigrations { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Deployment.Abstractions/DeploymentPlan.cs b/src/OrchardCore/OrchardCore.Deployment.Abstractions/DeploymentPlan.cs
index 0d1af8ab19e..0d6d9176f69 100644
--- a/src/OrchardCore/OrchardCore.Deployment.Abstractions/DeploymentPlan.cs
+++ b/src/OrchardCore/OrchardCore.Deployment.Abstractions/DeploymentPlan.cs
@@ -1,14 +1,13 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Deployment
+namespace OrchardCore.Deployment;
+
+/// <summary>
+/// The state of a deployment plan built by sources.
+/// </summary>
+public class DeploymentPlan
 {
-    /// <summary>
-    /// The state of a deployment plan built by sources.
-    /// </summary>
-    public class DeploymentPlan
-    {
-        public long Id { get; set; }
-        public string Name { get; set; }
-        public List<DeploymentStep> DeploymentSteps { get; init; } = [];
-    }
+    public long Id { get; set; }
+    public string Name { get; set; }
+    public List<DeploymentStep> DeploymentSteps { get; init; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.Deployment.Abstractions/DeploymentPlanResult.cs b/src/OrchardCore/OrchardCore.Deployment.Abstractions/DeploymentPlanResult.cs
index 4758a4f22c6..80abd1f50f5 100644
--- a/src/OrchardCore/OrchardCore.Deployment.Abstractions/DeploymentPlanResult.cs
+++ b/src/OrchardCore/OrchardCore.Deployment.Abstractions/DeploymentPlanResult.cs
@@ -4,40 +4,39 @@
 using System.Threading.Tasks;
 using OrchardCore.Recipes.Models;
 
-namespace OrchardCore.Deployment
+namespace OrchardCore.Deployment;
+
+/// <summary>
+/// The state of a deployment plan built by sources.
+/// </summary>
+public class DeploymentPlanResult
 {
-    /// <summary>
-    /// The state of a deployment plan built by sources.
-    /// </summary>
-    public class DeploymentPlanResult
+    public DeploymentPlanResult(IFileBuilder fileBuilder, RecipeDescriptor recipeDescriptor)
     {
-        public DeploymentPlanResult(IFileBuilder fileBuilder, RecipeDescriptor recipeDescriptor)
-        {
-            FileBuilder = fileBuilder;
-
-            Recipe = new JsonObject
-            {
-                ["name"] = recipeDescriptor.Name ?? string.Empty,
-                ["displayName"] = recipeDescriptor.DisplayName ?? string.Empty,
-                ["description"] = recipeDescriptor.Description ?? string.Empty,
-                ["author"] = recipeDescriptor.Author ?? string.Empty,
-                ["website"] = recipeDescriptor.WebSite ?? string.Empty,
-                ["version"] = recipeDescriptor.Version ?? string.Empty,
-                ["issetuprecipe"] = recipeDescriptor.IsSetupRecipe,
-                ["categories"] = JArray.FromObject(recipeDescriptor.Categories ?? []),
-                ["tags"] = JArray.FromObject(recipeDescriptor.Tags ?? []),
-            };
-        }
+        FileBuilder = fileBuilder;
 
-        public JsonObject Recipe { get; }
-        public IList<JsonObject> Steps { get; init; } = [];
-        public IFileBuilder FileBuilder { get; }
-        public async Task FinalizeAsync()
+        Recipe = new JsonObject
         {
-            Recipe["steps"] = JArray.FromObject(Steps);
+            ["name"] = recipeDescriptor.Name ?? string.Empty,
+            ["displayName"] = recipeDescriptor.DisplayName ?? string.Empty,
+            ["description"] = recipeDescriptor.Description ?? string.Empty,
+            ["author"] = recipeDescriptor.Author ?? string.Empty,
+            ["website"] = recipeDescriptor.WebSite ?? string.Empty,
+            ["version"] = recipeDescriptor.Version ?? string.Empty,
+            ["issetuprecipe"] = recipeDescriptor.IsSetupRecipe,
+            ["categories"] = JArray.FromObject(recipeDescriptor.Categories ?? []),
+            ["tags"] = JArray.FromObject(recipeDescriptor.Tags ?? []),
+        };
+    }
+
+    public JsonObject Recipe { get; }
+    public IList<JsonObject> Steps { get; init; } = [];
+    public IFileBuilder FileBuilder { get; }
+    public async Task FinalizeAsync()
+    {
+        Recipe["steps"] = JArray.FromObject(Steps);
 
-            // Add the recipe steps as its own file content
-            await FileBuilder.SetFileAsync("Recipe.json", Encoding.UTF8.GetBytes(Recipe.ToString()));
-        }
+        // Add the recipe steps as its own file content
+        await FileBuilder.SetFileAsync("Recipe.json", Encoding.UTF8.GetBytes(Recipe.ToString()));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Deployment.Abstractions/DeploymentStep.cs b/src/OrchardCore/OrchardCore.Deployment.Abstractions/DeploymentStep.cs
index 76e754f6a64..9435f51469d 100644
--- a/src/OrchardCore/OrchardCore.Deployment.Abstractions/DeploymentStep.cs
+++ b/src/OrchardCore/OrchardCore.Deployment.Abstractions/DeploymentStep.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Deployment
+namespace OrchardCore.Deployment;
+
+public abstract class DeploymentStep
 {
-    public abstract class DeploymentStep
-    {
-        public string Id { get; set; }
-        public string Name { get; set; }
-    }
+    public string Id { get; set; }
+    public string Name { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Deployment.Abstractions/DeploymentTarget.cs b/src/OrchardCore/OrchardCore.Deployment.Abstractions/DeploymentTarget.cs
index 4d586f28732..b522bbe3e22 100644
--- a/src/OrchardCore/OrchardCore.Deployment.Abstractions/DeploymentTarget.cs
+++ b/src/OrchardCore/OrchardCore.Deployment.Abstractions/DeploymentTarget.cs
@@ -1,19 +1,18 @@
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Deployment
+namespace OrchardCore.Deployment;
+
+public class DeploymentTarget
 {
-    public class DeploymentTarget
+    public DeploymentTarget(LocalizedString name, LocalizedString description, RouteValueDictionary route)
     {
-        public DeploymentTarget(LocalizedString name, LocalizedString description, RouteValueDictionary route)
-        {
-            Name = name;
-            Description = description;
-            Route = route;
-        }
-
-        public LocalizedString Name { get; }
-        public LocalizedString Description { get; }
-        public RouteValueDictionary Route { get; }
+        Name = name;
+        Description = description;
+        Route = route;
     }
+
+    public LocalizedString Name { get; }
+    public LocalizedString Description { get; }
+    public RouteValueDictionary Route { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentPlanService.cs b/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentPlanService.cs
index 8d11a3f1ca2..74404ecba6b 100644
--- a/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentPlanService.cs
+++ b/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentPlanService.cs
@@ -1,15 +1,14 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Deployment
+namespace OrchardCore.Deployment;
+
+public interface IDeploymentPlanService
 {
-    public interface IDeploymentPlanService
-    {
-        Task<bool> DoesUserHavePermissionsAsync();
-        Task<bool> DoesUserHaveExportPermissionAsync();
-        Task<IEnumerable<string>> GetAllDeploymentPlanNamesAsync();
-        Task<IEnumerable<DeploymentPlan>> GetAllDeploymentPlansAsync();
-        Task<IEnumerable<DeploymentPlan>> GetDeploymentPlansAsync(params string[] deploymentPlanNames);
-        Task CreateOrUpdateDeploymentPlansAsync(IEnumerable<DeploymentPlan> deploymentPlans);
-    }
+    Task<bool> DoesUserHavePermissionsAsync();
+    Task<bool> DoesUserHaveExportPermissionAsync();
+    Task<IEnumerable<string>> GetAllDeploymentPlanNamesAsync();
+    Task<IEnumerable<DeploymentPlan>> GetAllDeploymentPlansAsync();
+    Task<IEnumerable<DeploymentPlan>> GetDeploymentPlansAsync(params string[] deploymentPlanNames);
+    Task CreateOrUpdateDeploymentPlansAsync(IEnumerable<DeploymentPlan> deploymentPlans);
 }
diff --git a/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentSource.cs b/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentSource.cs
index cf1678ff261..d1c1eaa027f 100644
--- a/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentSource.cs
+++ b/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentSource.cs
@@ -1,12 +1,11 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Deployment
+namespace OrchardCore.Deployment;
+
+/// <summary>
+/// Interprets steps from a deployment plan to build the result package.
+/// </summary>
+public interface IDeploymentSource
 {
-    /// <summary>
-    /// Interprets steps from a deployment plan to build the result package.
-    /// </summary>
-    public interface IDeploymentSource
-    {
-        Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result);
-    }
+    Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result);
 }
diff --git a/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentStepFactory.cs b/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentStepFactory.cs
index 0b8e20236f7..d2c8876b2ae 100644
--- a/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentStepFactory.cs
+++ b/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentStepFactory.cs
@@ -1,20 +1,19 @@
-namespace OrchardCore.Deployment
+namespace OrchardCore.Deployment;
+
+public interface IDeploymentStepFactory
 {
-    public interface IDeploymentStepFactory
-    {
-        string Name { get; }
-        DeploymentStep Create();
-    }
+    string Name { get; }
+    DeploymentStep Create();
+}
 
-    public class DeploymentStepFactory<TStep> : IDeploymentStepFactory where TStep : DeploymentStep, new()
-    {
-        private static readonly string _typeName = typeof(TStep).Name;
+public class DeploymentStepFactory<TStep> : IDeploymentStepFactory where TStep : DeploymentStep, new()
+{
+    private static readonly string _typeName = typeof(TStep).Name;
 
-        public string Name => _typeName;
+    public string Name => _typeName;
 
-        public DeploymentStep Create()
-        {
-            return new TStep();
-        }
+    public DeploymentStep Create()
+    {
+        return new TStep();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentTargetHandler.cs b/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentTargetHandler.cs
index 5966d060a07..7e64f9e14d9 100644
--- a/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentTargetHandler.cs
+++ b/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentTargetHandler.cs
@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.Deployment
+namespace OrchardCore.Deployment;
+
+public interface IDeploymentTargetHandler
 {
-    public interface IDeploymentTargetHandler
-    {
-        Task ImportFromFileAsync(IFileProvider fileProvider);
-    }
+    Task ImportFromFileAsync(IFileProvider fileProvider);
 }
diff --git a/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentTargetProvider.cs b/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentTargetProvider.cs
index e775dba848f..88356bfcaad 100644
--- a/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentTargetProvider.cs
+++ b/src/OrchardCore/OrchardCore.Deployment.Abstractions/IDeploymentTargetProvider.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Deployment
+namespace OrchardCore.Deployment;
+
+public interface IDeploymentTargetProvider
 {
-    public interface IDeploymentTargetProvider
-    {
-        Task<IEnumerable<DeploymentTarget>> GetDeploymentTargetsAsync();
-    }
+    Task<IEnumerable<DeploymentTarget>> GetDeploymentTargetsAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.Deployment.Abstractions/IFileBuilder.cs b/src/OrchardCore/OrchardCore.Deployment.Abstractions/IFileBuilder.cs
index 7460c9d65dd..822f622e01d 100644
--- a/src/OrchardCore/OrchardCore.Deployment.Abstractions/IFileBuilder.cs
+++ b/src/OrchardCore/OrchardCore.Deployment.Abstractions/IFileBuilder.cs
@@ -1,19 +1,18 @@
 using System.IO;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Deployment
+namespace OrchardCore.Deployment;
+
+public interface IFileBuilder
 {
-    public interface IFileBuilder
-    {
-        Task SetFileAsync(string subpath, Stream stream);
-    }
+    Task SetFileAsync(string subpath, Stream stream);
+}
 
-    public static class IFileBuilderExtensions
+public static class IFileBuilderExtensions
+{
+    public static async Task SetFileAsync(this IFileBuilder fileBuilder, string subpath, byte[] content)
     {
-        public static async Task SetFileAsync(this IFileBuilder fileBuilder, string subpath, byte[] content)
-        {
-            using var stream = new MemoryStream(content);
-            await fileBuilder.SetFileAsync(subpath, stream);
-        }
+        using var stream = new MemoryStream(content);
+        await fileBuilder.SetFileAsync(subpath, stream);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Deployment.Abstractions/Services/IDeploymentManager.cs b/src/OrchardCore/OrchardCore.Deployment.Abstractions/Services/IDeploymentManager.cs
index 517e88e3d6a..8e631b75168 100644
--- a/src/OrchardCore/OrchardCore.Deployment.Abstractions/Services/IDeploymentManager.cs
+++ b/src/OrchardCore/OrchardCore.Deployment.Abstractions/Services/IDeploymentManager.cs
@@ -2,12 +2,11 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.Deployment.Services
+namespace OrchardCore.Deployment.Services;
+
+public interface IDeploymentManager
 {
-    public interface IDeploymentManager
-    {
-        Task ExecuteDeploymentPlanAsync(DeploymentPlan deploymentPlan, DeploymentPlanResult result);
-        Task<IEnumerable<DeploymentTarget>> GetDeploymentTargetsAsync();
-        Task ImportDeploymentPackageAsync(IFileProvider deploymentPackage);
-    }
+    Task ExecuteDeploymentPlanAsync(DeploymentPlan deploymentPlan, DeploymentPlanResult result);
+    Task<IEnumerable<DeploymentTarget>> GetDeploymentTargetsAsync();
+    Task ImportDeploymentPackageAsync(IFileProvider deploymentPackage);
 }
diff --git a/src/OrchardCore/OrchardCore.Deployment.Core/Mvc/DeleteFileResultFilter.cs b/src/OrchardCore/OrchardCore.Deployment.Core/Mvc/DeleteFileResultFilter.cs
index 59e5ccd77b9..3a2bb889243 100644
--- a/src/OrchardCore/OrchardCore.Deployment.Core/Mvc/DeleteFileResultFilter.cs
+++ b/src/OrchardCore/OrchardCore.Deployment.Core/Mvc/DeleteFileResultFilter.cs
@@ -2,25 +2,24 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 
-namespace OrchardCore.Deployment.Core.Mvc
+namespace OrchardCore.Deployment.Core.Mvc;
+
+public class DeleteFileResultFilter : ResultFilterAttribute
 {
-    public class DeleteFileResultFilter : ResultFilterAttribute
+    public override void OnResultExecuted(ResultExecutedContext context)
     {
-        public override void OnResultExecuted(ResultExecutedContext context)
-        {
-            var result = context.Result as PhysicalFileResult;
+        var result = context.Result as PhysicalFileResult;
 
-            if (result == null)
-            {
-                return;
-            }
+        if (result == null)
+        {
+            return;
+        }
 
-            var fileInfo = new FileInfo(result.FileName);
+        var fileInfo = new FileInfo(result.FileName);
 
-            if (fileInfo.Exists)
-            {
-                fileInfo.Delete();
-            }
+        if (fileInfo.Exists)
+        {
+            fileInfo.Delete();
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Deployment.Core/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Deployment.Core/ServiceCollectionExtensions.cs
index 0ecda53e797..33150df0906 100644
--- a/src/OrchardCore/OrchardCore.Deployment.Core/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Deployment.Core/ServiceCollectionExtensions.cs
@@ -2,15 +2,14 @@
 using OrchardCore.Deployment.Core.Services;
 using OrchardCore.Deployment.Services;
 
-namespace OrchardCore.Deployment.Core
+namespace OrchardCore.Deployment.Core;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    public static IServiceCollection AddDeploymentServices(this IServiceCollection services)
     {
-        public static IServiceCollection AddDeploymentServices(this IServiceCollection services)
-        {
-            services.AddScoped<IDeploymentManager, DeploymentManager>();
+        services.AddScoped<IDeploymentManager, DeploymentManager>();
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Deployment.Core/Services/DeploymentManager.cs b/src/OrchardCore/OrchardCore.Deployment.Core/Services/DeploymentManager.cs
index 531ef857494..0155218a9e8 100644
--- a/src/OrchardCore/OrchardCore.Deployment.Core/Services/DeploymentManager.cs
+++ b/src/OrchardCore/OrchardCore.Deployment.Core/Services/DeploymentManager.cs
@@ -3,56 +3,55 @@
 using Microsoft.Extensions.FileProviders;
 using OrchardCore.Deployment.Services;
 
-namespace OrchardCore.Deployment.Core.Services
+namespace OrchardCore.Deployment.Core.Services;
+
+public class DeploymentManager : IDeploymentManager
 {
-    public class DeploymentManager : IDeploymentManager
+    private readonly IEnumerable<IDeploymentSource> _deploymentSources;
+    private readonly IEnumerable<IDeploymentTargetProvider> _deploymentTargetProviders;
+    private readonly IEnumerable<IDeploymentTargetHandler> _deploymentTargetHandlers;
+
+    public DeploymentManager(
+        IEnumerable<IDeploymentSource> deploymentSources,
+        IEnumerable<IDeploymentTargetProvider> deploymentTargetProviders,
+        IEnumerable<IDeploymentTargetHandler> deploymentTargetHandlers)
     {
-        private readonly IEnumerable<IDeploymentSource> _deploymentSources;
-        private readonly IEnumerable<IDeploymentTargetProvider> _deploymentTargetProviders;
-        private readonly IEnumerable<IDeploymentTargetHandler> _deploymentTargetHandlers;
-
-        public DeploymentManager(
-            IEnumerable<IDeploymentSource> deploymentSources,
-            IEnumerable<IDeploymentTargetProvider> deploymentTargetProviders,
-            IEnumerable<IDeploymentTargetHandler> deploymentTargetHandlers)
-        {
-            _deploymentSources = deploymentSources;
-            _deploymentTargetProviders = deploymentTargetProviders;
-            _deploymentTargetHandlers = deploymentTargetHandlers;
-        }
+        _deploymentSources = deploymentSources;
+        _deploymentTargetProviders = deploymentTargetProviders;
+        _deploymentTargetHandlers = deploymentTargetHandlers;
+    }
 
-        public async Task ExecuteDeploymentPlanAsync(DeploymentPlan deploymentPlan, DeploymentPlanResult result)
+    public async Task ExecuteDeploymentPlanAsync(DeploymentPlan deploymentPlan, DeploymentPlanResult result)
+    {
+        foreach (var step in deploymentPlan.DeploymentSteps)
         {
-            foreach (var step in deploymentPlan.DeploymentSteps)
+            foreach (var source in _deploymentSources)
             {
-                foreach (var source in _deploymentSources)
-                {
-                    await source.ProcessDeploymentStepAsync(step, result);
-                }
+                await source.ProcessDeploymentStepAsync(step, result);
             }
-
-            await result.FinalizeAsync();
         }
 
-        public async Task<IEnumerable<DeploymentTarget>> GetDeploymentTargetsAsync()
-        {
-            var tasks = new List<DeploymentTarget>();
+        await result.FinalizeAsync();
+    }
 
-            foreach (var provider in _deploymentTargetProviders)
-            {
-                tasks.AddRange(await provider.GetDeploymentTargetsAsync());
-            }
+    public async Task<IEnumerable<DeploymentTarget>> GetDeploymentTargetsAsync()
+    {
+        var tasks = new List<DeploymentTarget>();
 
-            return tasks;
+        foreach (var provider in _deploymentTargetProviders)
+        {
+            tasks.AddRange(await provider.GetDeploymentTargetsAsync());
         }
 
-        public async Task ImportDeploymentPackageAsync(IFileProvider deploymentPackage)
+        return tasks;
+    }
+
+    public async Task ImportDeploymentPackageAsync(IFileProvider deploymentPackage)
+    {
+        foreach (var deploymentTargetHandler in _deploymentTargetHandlers)
         {
-            foreach (var deploymentTargetHandler in _deploymentTargetHandlers)
-            {
-                // Don't trigger in parallel to avoid potential race conditions in the handlers
-                await deploymentTargetHandler.ImportFromFileAsync(deploymentPackage);
-            }
+            // Don't trigger in parallel to avoid potential race conditions in the handlers
+            await deploymentTargetHandler.ImportFromFileAsync(deploymentPackage);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Deployment.Core/Services/TemporaryFileBuilder.cs b/src/OrchardCore/OrchardCore.Deployment.Core/Services/TemporaryFileBuilder.cs
index 7fbe9936fa5..d0b891465e6 100644
--- a/src/OrchardCore/OrchardCore.Deployment.Core/Services/TemporaryFileBuilder.cs
+++ b/src/OrchardCore/OrchardCore.Deployment.Core/Services/TemporaryFileBuilder.cs
@@ -2,54 +2,53 @@
 using System.IO;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Deployment.Core.Services
+namespace OrchardCore.Deployment.Core.Services;
+
+public sealed class TemporaryFileBuilder : IFileBuilder, IDisposable
 {
-    public sealed class TemporaryFileBuilder : IFileBuilder, IDisposable
-    {
-        private readonly bool _deleteOnDispose;
+    private readonly bool _deleteOnDispose;
 
-        public TemporaryFileBuilder(bool deleteOnDispose = true)
-        {
-            Folder = PathExtensions.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-            _deleteOnDispose = deleteOnDispose;
-        }
+    public TemporaryFileBuilder(bool deleteOnDispose = true)
+    {
+        Folder = PathExtensions.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+        _deleteOnDispose = deleteOnDispose;
+    }
 
-        public string Folder { get; }
+    public string Folder { get; }
 
-        public void Dispose()
+    public void Dispose()
+    {
+        if (_deleteOnDispose)
         {
-            if (_deleteOnDispose)
+            if (Directory.Exists(Folder))
             {
-                if (Directory.Exists(Folder))
-                {
-                    Directory.Delete(Folder, true);
-                }
+                Directory.Delete(Folder, true);
             }
         }
+    }
 
-        public async Task SetFileAsync(string subpath, Stream stream)
+    public async Task SetFileAsync(string subpath, Stream stream)
+    {
+        if (subpath.StartsWith('/'))
         {
-            if (subpath.StartsWith('/'))
-            {
-                throw new InvalidOperationException("A virtual path is required");
-            }
-
-            var fullname = PathExtensions.Combine(Folder, subpath);
-
-            var directory = new FileInfo(fullname).Directory;
+            throw new InvalidOperationException("A virtual path is required");
+        }
 
-            if (!directory.Exists)
-            {
-                directory.Create();
-            }
+        var fullname = PathExtensions.Combine(Folder, subpath);
 
-            using var fs = File.Create(fullname, 4 * 1024, FileOptions.None);
-            await stream.CopyToAsync(fs);
-        }
+        var directory = new FileInfo(fullname).Directory;
 
-        public override string ToString()
+        if (!directory.Exists)
         {
-            return Folder;
+            directory.Create();
         }
+
+        using var fs = File.Create(fullname, 4 * 1024, FileOptions.None);
+        await stream.CopyToAsync(fs);
+    }
+
+    public override string ToString()
+    {
+        return Folder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Abstractions/ModelBinding/IUpdateModel.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Abstractions/ModelBinding/IUpdateModel.cs
index e8bd5fd217c..6addb441754 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Abstractions/ModelBinding/IUpdateModel.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Abstractions/ModelBinding/IUpdateModel.cs
@@ -3,15 +3,14 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.DisplayManagement.ModelBinding
+namespace OrchardCore.DisplayManagement.ModelBinding;
+
+public interface IUpdateModel
 {
-    public interface IUpdateModel
-    {
-        Task<bool> TryUpdateModelAsync<TModel>(TModel model) where TModel : class;
-        Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix) where TModel : class;
-        Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix, params Expression<Func<TModel, object>>[] includeExpressions) where TModel : class;
-        bool TryValidateModel(object model);
-        bool TryValidateModel(object model, string prefix);
-        ModelStateDictionary ModelState { get; }
-    }
+    Task<bool> TryUpdateModelAsync<TModel>(TModel model) where TModel : class;
+    Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix) where TModel : class;
+    Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix, params Expression<Func<TModel, object>>[] includeExpressions) where TModel : class;
+    bool TryValidateModel(object model);
+    bool TryValidateModel(object model, string prefix);
+    ModelStateDictionary ModelState { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Abstractions/ModelBinding/IUpdateModelAccessor.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Abstractions/ModelBinding/IUpdateModelAccessor.cs
index 2adeb7df6ae..81c5dac17d0 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Abstractions/ModelBinding/IUpdateModelAccessor.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Abstractions/ModelBinding/IUpdateModelAccessor.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.DisplayManagement.ModelBinding
+namespace OrchardCore.DisplayManagement.ModelBinding;
+
+public interface IUpdateModelAccessor
 {
-    public interface IUpdateModelAccessor
-    {
-        IUpdateModel ModelUpdater { get; set; }
-    }
+    IUpdateModel ModelUpdater { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Abstractions/ModelBinding/ModelStateDictionaryExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Abstractions/ModelBinding/ModelStateDictionaryExtensions.cs
index 07f6a54f108..b7b1d4ff225 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Abstractions/ModelBinding/ModelStateDictionaryExtensions.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Abstractions/ModelBinding/ModelStateDictionaryExtensions.cs
@@ -3,52 +3,51 @@
 using System.Linq;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Mvc.ModelBinding
+namespace OrchardCore.Mvc.ModelBinding;
+
+public static class ModelStateDictionaryExtensions
 {
-    public static class ModelStateDictionaryExtensions
+    /// <summary>
+    /// Adds the specified error message to the errors collection for the model-state dictionary that is associated with the specified key.
+    /// </summary>
+    /// <param name="modelState">The model state.</param>
+    /// <param name="prefix">The prefix of the key.</param>
+    /// <param name="key">The key.</param>
+    /// <param name="errorMessage">The error message.</param>
+    public static void AddModelError(this ModelStateDictionary modelState, string prefix, string key, string errorMessage)
     {
-        /// <summary>
-        /// Adds the specified error message to the errors collection for the model-state dictionary that is associated with the specified key.
-        /// </summary>
-        /// <param name="modelState">The model state.</param>
-        /// <param name="prefix">The prefix of the key.</param>
-        /// <param name="key">The key.</param>
-        /// <param name="errorMessage">The error message.</param>
-        public static void AddModelError(this ModelStateDictionary modelState, string prefix, string key, string errorMessage)
-        {
-            var fullKey = string.IsNullOrEmpty(prefix) ? key : $"{prefix}.{key}";
-            modelState.AddModelError(fullKey, errorMessage);
-        }
+        var fullKey = string.IsNullOrEmpty(prefix) ? key : $"{prefix}.{key}";
+        modelState.AddModelError(fullKey, errorMessage);
+    }
 
-        /// <summary>
-        /// Adds the specified error message to the errors collection for the model-state dictionary that is associated with the specified key.
-        /// </summary>
-        /// <param name="modelState">The model state.</param>
-        /// <param name="prefix">The prefix of the key.</param>
-        /// <param name="validationResults">The <see cref="ValidationResult"/>.</param>
-        public static void BindValidationResults(this ModelStateDictionary modelState, string prefix, IEnumerable<ValidationResult> validationResults)
+    /// <summary>
+    /// Adds the specified error message to the errors collection for the model-state dictionary that is associated with the specified key.
+    /// </summary>
+    /// <param name="modelState">The model state.</param>
+    /// <param name="prefix">The prefix of the key.</param>
+    /// <param name="validationResults">The <see cref="ValidationResult"/>.</param>
+    public static void BindValidationResults(this ModelStateDictionary modelState, string prefix, IEnumerable<ValidationResult> validationResults)
+    {
+        if (validationResults != null)
         {
-            if (validationResults != null)
+            foreach (var item in validationResults)
             {
-                foreach (var item in validationResults)
-                {
-                    modelState.BindValidationResult(prefix, item);
-                }
+                modelState.BindValidationResult(prefix, item);
             }
         }
+    }
 
-        public static void BindValidationResult(this ModelStateDictionary modelState, string prefix, ValidationResult item)
+    public static void BindValidationResult(this ModelStateDictionary modelState, string prefix, ValidationResult item)
+    {
+        if (!item.MemberNames.Any())
         {
-            if (!item.MemberNames.Any())
-            {
-                modelState.AddModelError(prefix, string.Empty, item.ErrorMessage);
-            }
-            else
+            modelState.AddModelError(prefix, string.Empty, item.ErrorMessage);
+        }
+        else
+        {
+            foreach (var memberName in item.MemberNames)
             {
-                foreach (var memberName in item.MemberNames)
-                {
-                    modelState.AddModelError(prefix, memberName, item.ErrorMessage);
-                }
+                modelState.AddModelError(prefix, memberName, item.ErrorMessage);
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Abstractions/TagHelpers/AssemblyTagHelpersProvider.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Abstractions/TagHelpers/AssemblyTagHelpersProvider.cs
index 0ce3efede02..deb5b9b13a1 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Abstractions/TagHelpers/AssemblyTagHelpersProvider.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Abstractions/TagHelpers/AssemblyTagHelpersProvider.cs
@@ -4,24 +4,23 @@
 using System.Reflection;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.DisplayManagement.TagHelpers
-{
-    public class AssemblyTagHelpersProvider : ITagHelpersProvider
-    {
-        private readonly Assembly _assembly;
+namespace OrchardCore.DisplayManagement.TagHelpers;
 
-        public AssemblyTagHelpersProvider(Assembly assembly)
-        {
-            ArgumentNullException.ThrowIfNull(assembly);
+public class AssemblyTagHelpersProvider : ITagHelpersProvider
+{
+    private readonly Assembly _assembly;
 
-            _assembly = assembly;
-        }
+    public AssemblyTagHelpersProvider(Assembly assembly)
+    {
+        ArgumentNullException.ThrowIfNull(assembly);
 
-        public IEnumerable<Type> GetTypes() => _assembly.ExportedTypes.Where(t => t.IsSubclassOf(typeof(TagHelper)));
+        _assembly = assembly;
     }
 
-    public class TagHelpersProvider<T> : ITagHelpersProvider
-    {
-        public IEnumerable<Type> GetTypes() => new Type[] { typeof(T) };
-    }
+    public IEnumerable<Type> GetTypes() => _assembly.ExportedTypes.Where(t => t.IsSubclassOf(typeof(TagHelper)));
+}
+
+public class TagHelpersProvider<T> : ITagHelpersProvider
+{
+    public IEnumerable<Type> GetTypes() => new Type[] { typeof(T) };
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheDependencyTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheDependencyTag.cs
index 4f3a0d560e2..3e8b5aaefdb 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheDependencyTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheDependencyTag.cs
@@ -7,26 +7,25 @@
 using OrchardCore.Environment.Cache;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DynamicCache.Liquid
+namespace OrchardCore.DynamicCache.Liquid;
+
+public class CacheDependencyTag
 {
-    public class CacheDependencyTag
+    public static async ValueTask<Completion> WriteToAsync(Expression argument, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(Expression argument, TextWriter _1, TextEncoder _2, TemplateContext context)
-        {
-            var services = ((LiquidTemplateContext)context).Services;
+        var services = ((LiquidTemplateContext)context).Services;
 
-            var cacheScopeManager = services.GetService<ICacheScopeManager>();
+        var cacheScopeManager = services.GetService<ICacheScopeManager>();
 
-            if (cacheScopeManager == null)
-            {
-                return Completion.Normal;
-            }
+        if (cacheScopeManager == null)
+        {
+            return Completion.Normal;
+        }
 
-            var dependency = (await argument.EvaluateAsync(context)).ToStringValue();
+        var dependency = (await argument.EvaluateAsync(context)).ToStringValue();
 
-            cacheScopeManager.AddDependencies(dependency);
+        cacheScopeManager.AddDependencies(dependency);
 
-            return Completion.Normal;
-        }
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheExpiresAfterTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheExpiresAfterTag.cs
index 4fa7c4e9333..f9288b33d69 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheExpiresAfterTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheExpiresAfterTag.cs
@@ -9,47 +9,46 @@
 using OrchardCore.Environment.Cache;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DynamicCache.Liquid
+namespace OrchardCore.DynamicCache.Liquid;
+
+public class CacheExpiresAfterTag
 {
-    public class CacheExpiresAfterTag
+    public static async ValueTask<Completion> WriteToAsync(Expression argument, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(Expression argument, TextWriter _1, TextEncoder _2, TemplateContext context)
+        var services = ((LiquidTemplateContext)context).Services;
+
+        var cacheScopeManager = services.GetService<ICacheScopeManager>();
+
+        if (cacheScopeManager == null)
         {
-            var services = ((LiquidTemplateContext)context).Services;
+            return Completion.Normal;
+        }
 
-            var cacheScopeManager = services.GetService<ICacheScopeManager>();
+        TimeSpan value;
+        var input = await argument.EvaluateAsync(context);
 
-            if (cacheScopeManager == null)
+        if (input.Type == FluidValues.String)
+        {
+            var stringValue = input.ToStringValue();
+            if (TimeSpan.TryParse(stringValue, out value))
             {
                 return Completion.Normal;
             }
+        }
+        else
+        {
+            var objectValue = input.ToObjectValue() as TimeSpan?;
 
-            TimeSpan value;
-            var input = await argument.EvaluateAsync(context);
-
-            if (input.Type == FluidValues.String)
+            if (!objectValue.HasValue)
             {
-                var stringValue = input.ToStringValue();
-                if (TimeSpan.TryParse(stringValue, out value))
-                {
-                    return Completion.Normal;
-                }
+                return Completion.Normal;
             }
-            else
-            {
-                var objectValue = input.ToObjectValue() as TimeSpan?;
-
-                if (!objectValue.HasValue)
-                {
-                    return Completion.Normal;
-                }
 
-                value = objectValue.Value;
-            }
+            value = objectValue.Value;
+        }
 
-            cacheScopeManager.WithExpiryAfter(value);
+        cacheScopeManager.WithExpiryAfter(value);
 
-            return Completion.Normal;
-        }
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheExpiresOnTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheExpiresOnTag.cs
index 21d4d9754d6..4c784babd1b 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheExpiresOnTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheExpiresOnTag.cs
@@ -10,54 +10,53 @@
 using OrchardCore.Environment.Cache;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DynamicCache.Liquid
+namespace OrchardCore.DynamicCache.Liquid;
+
+public class CacheExpiresOnTag
 {
-    public class CacheExpiresOnTag
+    public static async ValueTask<Completion> WriteToAsync(Expression argument, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(Expression argument, TextWriter _1, TextEncoder _2, TemplateContext context)
-        {
-            var services = ((LiquidTemplateContext)context).Services;
+        var services = ((LiquidTemplateContext)context).Services;
 
-            var cacheScopeManager = services.GetService<ICacheScopeManager>();
+        var cacheScopeManager = services.GetService<ICacheScopeManager>();
 
-            if (cacheScopeManager == null)
-            {
-                return Completion.Normal;
-            }
+        if (cacheScopeManager == null)
+        {
+            return Completion.Normal;
+        }
 
-            DateTimeOffset value;
-            var input = await argument.EvaluateAsync(context);
-            if (input.Type == FluidValues.String)
+        DateTimeOffset value;
+        var input = await argument.EvaluateAsync(context);
+        if (input.Type == FluidValues.String)
+        {
+            var stringValue = input.ToStringValue();
+            if (!DateTimeOffset.TryParse(stringValue, context.CultureInfo, DateTimeStyles.AssumeUniversal, out value))
             {
-                var stringValue = input.ToStringValue();
-                if (!DateTimeOffset.TryParse(stringValue, context.CultureInfo, DateTimeStyles.AssumeUniversal, out value))
-                {
-                    return Completion.Normal;
-                }
+                return Completion.Normal;
             }
-            else
+        }
+        else
+        {
+            switch (input.ToObjectValue())
             {
-                switch (input.ToObjectValue())
-                {
-                    case DateTime dateTime:
-                        value = dateTime;
-                        break;
-
-                    case DateTimeOffset dateTimeOffset:
-                        value = dateTimeOffset;
-                        break;
-
-                    default:
-                        return Completion.Normal;
-                }
-            }
+                case DateTime dateTime:
+                    value = dateTime;
+                    break;
 
-            if (value != DateTimeOffset.MinValue)
-            {
-                cacheScopeManager.WithExpiryOn(value);
+                case DateTimeOffset dateTimeOffset:
+                    value = dateTimeOffset;
+                    break;
+
+                default:
+                    return Completion.Normal;
             }
+        }
 
-            return Completion.Normal;
+        if (value != DateTimeOffset.MinValue)
+        {
+            cacheScopeManager.WithExpiryOn(value);
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheExpiresSlidingTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheExpiresSlidingTag.cs
index abdfaa21c45..a0e0fe6b2e4 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheExpiresSlidingTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheExpiresSlidingTag.cs
@@ -9,47 +9,46 @@
 using OrchardCore.Environment.Cache;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DynamicCache.Liquid
+namespace OrchardCore.DynamicCache.Liquid;
+
+public class CacheExpiresSlidingTag
 {
-    public class CacheExpiresSlidingTag
+    public static async ValueTask<Completion> WriteToAsync(Expression argument, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(Expression argument, TextWriter _1, TextEncoder _2, TemplateContext context)
+        var services = ((LiquidTemplateContext)context).Services;
+
+        var cacheScopeManager = services.GetService<ICacheScopeManager>();
+
+        if (cacheScopeManager == null)
         {
-            var services = ((LiquidTemplateContext)context).Services;
+            return Completion.Normal;
+        }
 
-            var cacheScopeManager = services.GetService<ICacheScopeManager>();
+        TimeSpan value;
+        var input = await argument.EvaluateAsync(context);
 
-            if (cacheScopeManager == null)
+        if (input.Type == FluidValues.String)
+        {
+            var stringValue = input.ToStringValue();
+            if (!TimeSpan.TryParse(stringValue, out value))
             {
                 return Completion.Normal;
             }
+        }
+        else
+        {
+            var objectValue = input.ToObjectValue() as TimeSpan?;
 
-            TimeSpan value;
-            var input = await argument.EvaluateAsync(context);
-
-            if (input.Type == FluidValues.String)
+            if (!objectValue.HasValue)
             {
-                var stringValue = input.ToStringValue();
-                if (!TimeSpan.TryParse(stringValue, out value))
-                {
-                    return Completion.Normal;
-                }
+                return Completion.Normal;
             }
-            else
-            {
-                var objectValue = input.ToObjectValue() as TimeSpan?;
-
-                if (!objectValue.HasValue)
-                {
-                    return Completion.Normal;
-                }
 
-                value = objectValue.Value;
-            }
+            value = objectValue.Value;
+        }
 
-            cacheScopeManager.WithExpirySliding(value);
+        cacheScopeManager.WithExpirySliding(value);
 
-            return Completion.Normal;
-        }
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheTag.cs
index 149a7b67169..71870ffc287 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheTag.cs
@@ -12,127 +12,126 @@
 using OrchardCore.Environment.Cache;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DynamicCache.Liquid
+namespace OrchardCore.DynamicCache.Liquid;
+
+public class CacheTag
 {
-    public class CacheTag
-    {
-        private static readonly char[] _splitChars = [',', ' '];
+    private static readonly char[] _splitChars = [',', ' '];
 
-        public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> arguments, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, TemplateContext context)
-        {
-            var services = ((LiquidTemplateContext)context).Services;
+    public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> arguments, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, TemplateContext context)
+    {
+        var services = ((LiquidTemplateContext)context).Services;
 
-            var dynamicCache = services.GetService<IDynamicCacheService>();
-            var cacheScopeManager = services.GetService<ICacheScopeManager>();
-            var loggerFactory = services.GetService<ILoggerFactory>();
-            var logger = loggerFactory.CreateLogger<CacheTag>();
-            var cacheOptions = services.GetRequiredService<IOptions<CacheOptions>>().Value;
+        var dynamicCache = services.GetService<IDynamicCacheService>();
+        var cacheScopeManager = services.GetService<ICacheScopeManager>();
+        var loggerFactory = services.GetService<ILoggerFactory>();
+        var logger = loggerFactory.CreateLogger<CacheTag>();
+        var cacheOptions = services.GetRequiredService<IOptions<CacheOptions>>().Value;
 
-            if (dynamicCache == null || cacheScopeManager == null)
-            {
-                logger.LogInformation(@"Liquid cache block entered without an available IDynamicCacheService or ICacheScopeManager.
+        if (dynamicCache == null || cacheScopeManager == null)
+        {
+            logger.LogInformation(@"Liquid cache block entered without an available IDynamicCacheService or ICacheScopeManager.
                                         The contents of the cache block will not be cached.
                                         To enable caching, make sure that a feature that contains an implementation of IDynamicCacheService and ICacheScopeManager is enabled (for example, 'Dynamic Cache').");
 
-                if (statements != null && statements.Count > 0)
-                {
-                    var completion = await statements.RenderStatementsAsync(writer, encoder, context);
+            if (statements != null && statements.Count > 0)
+            {
+                var completion = await statements.RenderStatementsAsync(writer, encoder, context);
 
-                    if (completion != Completion.Normal)
-                    {
-                        return completion;
-                    }
+                if (completion != Completion.Normal)
+                {
+                    return completion;
                 }
-
-                return Completion.Normal;
             }
 
-            var filterArguments = new FilterArguments();
-            foreach (var argument in arguments)
-            {
-                filterArguments.Add(argument.Name, await argument.Expression.EvaluateAsync(context));
-            }
+            return Completion.Normal;
+        }
 
-            var cacheKey = filterArguments.At(0).ToStringValue();
-            var contexts = filterArguments["vary_by"].ToStringValue();
-            var tags = filterArguments["dependencies"].ToStringValue();
-            var durationString = filterArguments["expires_after"].ToStringValue();
-            var slidingDurationString = filterArguments["expires_sliding"].ToStringValue();
+        var filterArguments = new FilterArguments();
+        foreach (var argument in arguments)
+        {
+            filterArguments.Add(argument.Name, await argument.Expression.EvaluateAsync(context));
+        }
 
-            var cacheContext = new CacheContext(cacheKey)
-                .AddContext(contexts.Split(_splitChars, StringSplitOptions.RemoveEmptyEntries))
-                .AddTag(tags.Split(_splitChars, StringSplitOptions.RemoveEmptyEntries));
+        var cacheKey = filterArguments.At(0).ToStringValue();
+        var contexts = filterArguments["vary_by"].ToStringValue();
+        var tags = filterArguments["dependencies"].ToStringValue();
+        var durationString = filterArguments["expires_after"].ToStringValue();
+        var slidingDurationString = filterArguments["expires_sliding"].ToStringValue();
 
-            if (TimeSpan.TryParse(durationString, out var duration))
-            {
-                cacheContext.WithExpiryAfter(duration);
-            }
+        var cacheContext = new CacheContext(cacheKey)
+            .AddContext(contexts.Split(_splitChars, StringSplitOptions.RemoveEmptyEntries))
+            .AddTag(tags.Split(_splitChars, StringSplitOptions.RemoveEmptyEntries));
 
-            if (TimeSpan.TryParse(slidingDurationString, out var slidingDuration))
-            {
-                cacheContext.WithExpirySliding(slidingDuration);
-            }
+        if (TimeSpan.TryParse(durationString, out var duration))
+        {
+            cacheContext.WithExpiryAfter(duration);
+        }
 
-            var cacheResult = await dynamicCache.GetCachedValueAsync(cacheContext);
-            if (cacheResult != null)
-            {
-                await writer.WriteAsync(cacheResult);
+        if (TimeSpan.TryParse(slidingDurationString, out var slidingDuration))
+        {
+            cacheContext.WithExpirySliding(slidingDuration);
+        }
 
-                return Completion.Normal;
-            }
+        var cacheResult = await dynamicCache.GetCachedValueAsync(cacheContext);
+        if (cacheResult != null)
+        {
+            await writer.WriteAsync(cacheResult);
 
-            cacheScopeManager.EnterScope(cacheContext);
+            return Completion.Normal;
+        }
+
+        cacheScopeManager.EnterScope(cacheContext);
 
-            var content = "";
-            try
+        var content = "";
+        try
+        {
+            if (statements != null && statements.Count > 0)
             {
-                if (statements != null && statements.Count > 0)
+                using var sb = StringBuilderPool.GetInstance();
+                using (var render = new StringWriter(sb.Builder))
                 {
-                    using var sb = StringBuilderPool.GetInstance();
-                    using (var render = new StringWriter(sb.Builder))
+                    foreach (var statement in statements)
                     {
-                        foreach (var statement in statements)
-                        {
-                            await statement.WriteToAsync(render, encoder, context);
-                        }
-
-                        await render.FlushAsync();
+                        await statement.WriteToAsync(render, encoder, context);
                     }
 
-                    content = sb.Builder.ToString();
+                    await render.FlushAsync();
                 }
-            }
-            finally
-            {
-                cacheScopeManager.ExitScope();
-            }
 
-            if (cacheOptions.DebugMode)
-            {
-                // No need to optimize this code as it will be used for debugging purpose.
-                var debugContent = new StringWriter();
-                debugContent.WriteLine();
-                debugContent.WriteLine($"<!-- CACHE BLOCK: {cacheContext.CacheId} ({Guid.NewGuid()})");
-                debugContent.WriteLine($"         VARY BY: {string.Join(", ", cacheContext.Contexts)}");
-                debugContent.WriteLine($"    DEPENDENCIES: {string.Join(", ", cacheContext.Tags)}");
-                debugContent.WriteLine($"      EXPIRES ON: {cacheContext.ExpiresOn}");
-                debugContent.WriteLine($"   EXPIRES AFTER: {cacheContext.ExpiresAfter}");
-                debugContent.WriteLine($" EXPIRES SLIDING: {cacheContext.ExpiresSliding}");
-                debugContent.WriteLine("-->");
-
-                debugContent.WriteLine(content);
-
-                debugContent.WriteLine();
-                debugContent.WriteLine($"<!-- END CACHE BLOCK: {cacheContext.CacheId} -->");
-
-                content = debugContent.ToString();
+                content = sb.Builder.ToString();
             }
+        }
+        finally
+        {
+            cacheScopeManager.ExitScope();
+        }
 
-            await dynamicCache.SetCachedValueAsync(cacheContext, content);
+        if (cacheOptions.DebugMode)
+        {
+            // No need to optimize this code as it will be used for debugging purpose.
+            var debugContent = new StringWriter();
+            debugContent.WriteLine();
+            debugContent.WriteLine($"<!-- CACHE BLOCK: {cacheContext.CacheId} ({Guid.NewGuid()})");
+            debugContent.WriteLine($"         VARY BY: {string.Join(", ", cacheContext.Contexts)}");
+            debugContent.WriteLine($"    DEPENDENCIES: {string.Join(", ", cacheContext.Tags)}");
+            debugContent.WriteLine($"      EXPIRES ON: {cacheContext.ExpiresOn}");
+            debugContent.WriteLine($"   EXPIRES AFTER: {cacheContext.ExpiresAfter}");
+            debugContent.WriteLine($" EXPIRES SLIDING: {cacheContext.ExpiresSliding}");
+            debugContent.WriteLine("-->");
+
+            debugContent.WriteLine(content);
+
+            debugContent.WriteLine();
+            debugContent.WriteLine($"<!-- END CACHE BLOCK: {cacheContext.CacheId} -->");
+
+            content = debugContent.ToString();
+        }
 
-            await writer.WriteAsync(content);
+        await dynamicCache.SetCachedValueAsync(cacheContext, content);
 
-            return Completion.Normal;
-        }
+        await writer.WriteAsync(content);
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/AppendVersionFilter.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/AppendVersionFilter.cs
index e38dd06ce36..172f13e408e 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/AppendVersionFilter.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/AppendVersionFilter.cs
@@ -5,26 +5,25 @@
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DisplayManagement.Liquid.Filters
+namespace OrchardCore.DisplayManagement.Liquid.Filters;
+
+public class AppendVersionFilter : ILiquidFilter
 {
-    public class AppendVersionFilter : ILiquidFilter
-    {
-        private readonly IFileVersionProvider _fileVersionProvider;
-        private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IFileVersionProvider _fileVersionProvider;
+    private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public AppendVersionFilter(IFileVersionProvider fileVersionProvider, IHttpContextAccessor httpContextAccessor)
-        {
-            _fileVersionProvider = fileVersionProvider;
-            _httpContextAccessor = httpContextAccessor;
-        }
+    public AppendVersionFilter(IFileVersionProvider fileVersionProvider, IHttpContextAccessor httpContextAccessor)
+    {
+        _fileVersionProvider = fileVersionProvider;
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
-        {
-            var url = input.ToStringValue();
+    public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        var url = input.ToStringValue();
 
-            var imageUrl = _fileVersionProvider.AddFileVersionToPath(_httpContextAccessor.HttpContext.Request.PathBase, url);
+        var imageUrl = _fileVersionProvider.AddFileVersionToPath(_httpContextAccessor.HttpContext.Request.PathBase, url);
 
-            return new ValueTask<FluidValue>(new StringValue(imageUrl ?? url));
-        }
+        return new ValueTask<FluidValue>(new StringValue(imageUrl ?? url));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/LiquidViewFilters.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/LiquidViewFilters.cs
index aa516f9084e..384459da630 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/LiquidViewFilters.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/LiquidViewFilters.cs
@@ -6,51 +6,50 @@
 using Microsoft.AspNetCore.Mvc.Localization;
 using OrchardCore.Mvc.Utilities;
 
-namespace OrchardCore.DisplayManagement.Liquid.Filters
+namespace OrchardCore.DisplayManagement.Liquid.Filters;
+
+public static class LiquidViewFilters
 {
-    public static class LiquidViewFilters
+    public static ValueTask<FluidValue> Localize(FluidValue input, FilterArguments arguments, TemplateContext ctx)
     {
-        public static ValueTask<FluidValue> Localize(FluidValue input, FilterArguments arguments, TemplateContext ctx)
-        {
-            var localizer = ctx.GetValue("ViewLocalizer")?.ToObjectValue() as IViewLocalizer;
-
-            if (localizer == null)
-            {
-                return ThrowArgumentException<ValueTask<FluidValue>>("ViewLocalizer missing while invoking 't'");
-            }
+        var localizer = ctx.GetValue("ViewLocalizer")?.ToObjectValue() as IViewLocalizer;
 
-            var parameters = new object[arguments.Count];
-            for (var i = 0; i < arguments.Count; i++)
-            {
-                parameters[i] = arguments.At(i).ToStringValue();
-            }
-
-            return new ValueTask<FluidValue>(new StringValue(localizer.GetString(input.ToStringValue(), parameters)));
+        if (localizer == null)
+        {
+            return ThrowArgumentException<ValueTask<FluidValue>>("ViewLocalizer missing while invoking 't'");
         }
 
-        public static ValueTask<FluidValue> HtmlClass(FluidValue input, FilterArguments _1, TemplateContext _2)
+        var parameters = new object[arguments.Count];
+        for (var i = 0; i < arguments.Count; i++)
         {
-            return new ValueTask<FluidValue>(new StringValue(input.ToStringValue().HtmlClassify()));
+            parameters[i] = arguments.At(i).ToStringValue();
         }
 
-        public static ValueTask<FluidValue> ShapeProperties(FluidValue input, FilterArguments arguments, TemplateContext ctx)
+        return new ValueTask<FluidValue>(new StringValue(localizer.GetString(input.ToStringValue(), parameters)));
+    }
+
+    public static ValueTask<FluidValue> HtmlClass(FluidValue input, FilterArguments _1, TemplateContext _2)
+    {
+        return new ValueTask<FluidValue>(new StringValue(input.ToStringValue().HtmlClassify()));
+    }
+
+    public static ValueTask<FluidValue> ShapeProperties(FluidValue input, FilterArguments arguments, TemplateContext ctx)
+    {
+        if (input.ToObjectValue() is IShape shape)
         {
-            if (input.ToObjectValue() is IShape shape)
+            foreach (var name in arguments.Names)
             {
-                foreach (var name in arguments.Names)
-                {
-                    shape.Properties[name.ToPascalCaseUnderscore()] = arguments[name].ToObjectValue();
-                }
-                return FluidValue.Create(shape, ctx.Options);
+                shape.Properties[name.ToPascalCaseUnderscore()] = arguments[name].ToObjectValue();
             }
-
-            return NilValue.Instance;
+            return FluidValue.Create(shape, ctx.Options);
         }
 
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static T ThrowArgumentException<T>(string message)
-        {
-            throw new ArgumentException(message);
-        }
+        return NilValue.Instance;
+    }
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private static T ThrowArgumentException<T>(string message)
+    {
+        throw new ArgumentException(message);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/NewShapeFilter.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/NewShapeFilter.cs
index ec57239ed32..3e0bb0561ce 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/NewShapeFilter.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/NewShapeFilter.cs
@@ -5,39 +5,38 @@
 using OrchardCore.Liquid;
 using OrchardCore.Mvc.Utilities;
 
-namespace OrchardCore.DisplayManagement.Liquid.Filters
+namespace OrchardCore.DisplayManagement.Liquid.Filters;
+
+public class NewShapeFilter : ILiquidFilter
 {
-    public class NewShapeFilter : ILiquidFilter
+    private readonly IShapeFactory _shapeFactory;
+
+    public NewShapeFilter(IShapeFactory shapeFactory)
     {
-        private readonly IShapeFactory _shapeFactory;
+        _shapeFactory = shapeFactory;
+    }
 
-        public NewShapeFilter(IShapeFactory shapeFactory)
+    public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        static async ValueTask<FluidValue> Awaited(ValueTask<IShape> task, TemplateOptions options)
         {
-            _shapeFactory = shapeFactory;
+            return FluidValue.Create(await task, options);
         }
 
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+        var type = input.ToStringValue();
+        var properties = new Dictionary<string, object>(arguments.Count);
+
+        foreach (var name in arguments.Names)
         {
-            static async ValueTask<FluidValue> Awaited(ValueTask<IShape> task, TemplateOptions options)
-            {
-                return FluidValue.Create(await task, options);
-            }
-
-            var type = input.ToStringValue();
-            var properties = new Dictionary<string, object>(arguments.Count);
-
-            foreach (var name in arguments.Names)
-            {
-                properties.Add(name.ToPascalCaseUnderscore(), arguments[name].ToObjectValue());
-            }
-
-            var task = _shapeFactory.CreateAsync(type, Arguments.From(properties));
-            if (!task.IsCompletedSuccessfully)
-            {
-                return Awaited(task, ctx.Options);
-            }
-
-            return new ValueTask<FluidValue>(FluidValue.Create(task.Result, ctx.Options));
+            properties.Add(name.ToPascalCaseUnderscore(), arguments[name].ToObjectValue());
         }
+
+        var task = _shapeFactory.CreateAsync(type, Arguments.From(properties));
+        if (!task.IsCompletedSuccessfully)
+        {
+            return Awaited(task, ctx.Options);
+        }
+
+        return new ValueTask<FluidValue>(FluidValue.Create(task.Result, ctx.Options));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/ResourceUrlFilter.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/ResourceUrlFilter.cs
index 0b14801eb87..2c33a93058d 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/ResourceUrlFilter.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/ResourceUrlFilter.cs
@@ -7,43 +7,42 @@
 using OrchardCore.Liquid;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.DisplayManagement.Liquid.Filters
+namespace OrchardCore.DisplayManagement.Liquid.Filters;
+
+/// <summary>
+/// Returns the Cdn Base Url of the specified resource path.
+/// </summary>
+public class ResourceUrlFilter : ILiquidFilter
 {
-    /// <summary>
-    /// Returns the Cdn Base Url of the specified resource path.
-    /// </summary>
-    public class ResourceUrlFilter : ILiquidFilter
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly ResourceManagementOptions _options;
+
+    public ResourceUrlFilter(IHttpContextAccessor httpContextAccessor, IOptions<ResourceManagementOptions> options)
+    {
+        _httpContextAccessor = httpContextAccessor;
+        _options = options.Value;
+    }
+
+    public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly ResourceManagementOptions _options;
+        var resourcePath = input.ToStringValue();
 
-        public ResourceUrlFilter(IHttpContextAccessor httpContextAccessor, IOptions<ResourceManagementOptions> options)
+        if (resourcePath.StartsWith("~/", StringComparison.Ordinal))
         {
-            _httpContextAccessor = httpContextAccessor;
-            _options = options.Value;
+            resourcePath = _httpContextAccessor.HttpContext.Request.PathBase.Add(resourcePath[1..]).Value;
         }
 
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+        // Don't prefix cdn if the path includes a protocol, i.e. is an external url, or is in debug mode.
+        if (!_options.DebugMode && !string.IsNullOrEmpty(_options.CdnBaseUrl) &&
+            // Don't evaluate with Uri.TryCreate as it produces incorrect results on Linux.
+            !resourcePath.StartsWith("https://", StringComparison.OrdinalIgnoreCase) &&
+            !resourcePath.StartsWith("http://", StringComparison.OrdinalIgnoreCase) &&
+            !resourcePath.StartsWith("//", StringComparison.OrdinalIgnoreCase) &&
+            !resourcePath.StartsWith("file://", StringComparison.OrdinalIgnoreCase))
         {
-            var resourcePath = input.ToStringValue();
-
-            if (resourcePath.StartsWith("~/", StringComparison.Ordinal))
-            {
-                resourcePath = _httpContextAccessor.HttpContext.Request.PathBase.Add(resourcePath[1..]).Value;
-            }
-
-            // Don't prefix cdn if the path includes a protocol, i.e. is an external url, or is in debug mode.
-            if (!_options.DebugMode && !string.IsNullOrEmpty(_options.CdnBaseUrl) &&
-                // Don't evaluate with Uri.TryCreate as it produces incorrect results on Linux.
-                !resourcePath.StartsWith("https://", StringComparison.OrdinalIgnoreCase) &&
-                !resourcePath.StartsWith("http://", StringComparison.OrdinalIgnoreCase) &&
-                !resourcePath.StartsWith("//", StringComparison.OrdinalIgnoreCase) &&
-                !resourcePath.StartsWith("file://", StringComparison.OrdinalIgnoreCase))
-            {
-                resourcePath = _options.CdnBaseUrl + resourcePath;
-            }
-
-            return new ValueTask<FluidValue>(new StringValue(resourcePath));
+            resourcePath = _options.CdnBaseUrl + resourcePath;
         }
+
+        return new ValueTask<FluidValue>(new StringValue(resourcePath));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/SanitizeHtmlFilter.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/SanitizeHtmlFilter.cs
index 3fc708a0ddd..4a7f9b5e5e7 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/SanitizeHtmlFilter.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/SanitizeHtmlFilter.cs
@@ -4,23 +4,22 @@
 using OrchardCore.Infrastructure.Html;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DisplayManagement.Liquid.Filters
+namespace OrchardCore.DisplayManagement.Liquid.Filters;
+
+public class SanitizeHtmlFilter : ILiquidFilter
 {
-    public class SanitizeHtmlFilter : ILiquidFilter
-    {
-        private readonly IHtmlSanitizerService _htmlSanitizerService;
+    private readonly IHtmlSanitizerService _htmlSanitizerService;
 
-        public SanitizeHtmlFilter(IHtmlSanitizerService htmlSanitizerService)
-        {
-            _htmlSanitizerService = htmlSanitizerService;
-        }
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
-        {
-            var html = input.ToStringValue();
+    public SanitizeHtmlFilter(IHtmlSanitizerService htmlSanitizerService)
+    {
+        _htmlSanitizerService = htmlSanitizerService;
+    }
+    public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        var html = input.ToStringValue();
 
-            html = _htmlSanitizerService.Sanitize(html);
+        html = _htmlSanitizerService.Sanitize(html);
 
-            return new ValueTask<FluidValue>(new StringValue(html));
-        }
+        return new ValueTask<FluidValue>(new StringValue(html));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/ShapeRenderFilter.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/ShapeRenderFilter.cs
index 8bb8fddcdc1..6352047b15a 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/ShapeRenderFilter.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/ShapeRenderFilter.cs
@@ -4,36 +4,35 @@
 using Microsoft.AspNetCore.Html;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DisplayManagement.Liquid.Filters
+namespace OrchardCore.DisplayManagement.Liquid.Filters;
+
+public class ShapeRenderFilter : ILiquidFilter
 {
-    public class ShapeRenderFilter : ILiquidFilter
+    private readonly IDisplayHelper _displayHelper;
+
+    public ShapeRenderFilter(IDisplayHelper displayHelper)
     {
-        private readonly IDisplayHelper _displayHelper;
+        _displayHelper = displayHelper;
+    }
 
-        public ShapeRenderFilter(IDisplayHelper displayHelper)
+    public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        static async ValueTask<FluidValue> Awaited(Task<IHtmlContent> task)
         {
-            _displayHelper = displayHelper;
+            return new HtmlContentValue(await task);
         }
 
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+        if (input.ToObjectValue() is IShape shape)
         {
-            static async ValueTask<FluidValue> Awaited(Task<IHtmlContent> task)
+            var task = _displayHelper.ShapeExecuteAsync(shape);
+            if (!task.IsCompletedSuccessfully)
             {
-                return new HtmlContentValue(await task);
+                return Awaited(task);
             }
 
-            if (input.ToObjectValue() is IShape shape)
-            {
-                var task = _displayHelper.ShapeExecuteAsync(shape);
-                if (!task.IsCompletedSuccessfully)
-                {
-                    return Awaited(task);
-                }
-
-                return new ValueTask<FluidValue>(new HtmlContentValue(task.Result));
-            }
-
-            return new ValueTask<FluidValue>(new HtmlContentValue(HtmlString.Empty));
+            return new ValueTask<FluidValue>(new HtmlContentValue(task.Result));
         }
+
+        return new ValueTask<FluidValue>(new HtmlContentValue(HtmlString.Empty));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/ShapeStringifyFilter.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/ShapeStringifyFilter.cs
index c15efb2b390..25255f59e06 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/ShapeStringifyFilter.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/ShapeStringifyFilter.cs
@@ -6,40 +6,39 @@
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DisplayManagement.Liquid.Filters
+namespace OrchardCore.DisplayManagement.Liquid.Filters;
+
+public class ShapeStringifyFilter : ILiquidFilter
 {
-    public class ShapeStringifyFilter : ILiquidFilter
+    private readonly IDisplayHelper _displayHelper;
+
+    public ShapeStringifyFilter(IDisplayHelper displayHelper)
     {
-        private readonly IDisplayHelper _displayHelper;
+        _displayHelper = displayHelper;
+    }
 
-        public ShapeStringifyFilter(IDisplayHelper displayHelper)
+    public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+    {
+        static async ValueTask<FluidValue> Awaited(Task<IHtmlContent> task)
         {
-            _displayHelper = displayHelper;
+            using var writer = new ZStringWriter();
+            (await task).WriteTo(writer, NullHtmlEncoder.Default);
+            return new StringValue(writer.ToString(), false);
         }
 
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
+        if (input.ToObjectValue() is IShape shape)
         {
-            static async ValueTask<FluidValue> Awaited(Task<IHtmlContent> task)
+            var task = _displayHelper.ShapeExecuteAsync(shape);
+            if (!task.IsCompletedSuccessfully)
             {
-                using var writer = new ZStringWriter();
-                (await task).WriteTo(writer, NullHtmlEncoder.Default);
-                return new StringValue(writer.ToString(), false);
+                return Awaited(task);
             }
 
-            if (input.ToObjectValue() is IShape shape)
-            {
-                var task = _displayHelper.ShapeExecuteAsync(shape);
-                if (!task.IsCompletedSuccessfully)
-                {
-                    return Awaited(task);
-                }
-
-                using var writer = new ZStringWriter();
-                task.Result.WriteTo(writer, NullHtmlEncoder.Default);
-                return new ValueTask<FluidValue>(new StringValue(writer.ToString(), false));
-            }
-
-            return new ValueTask<FluidValue>(StringValue.Empty);
+            using var writer = new ZStringWriter();
+            task.Result.WriteTo(writer, NullHtmlEncoder.Default);
+            return new ValueTask<FluidValue>(new StringValue(writer.ToString(), false));
         }
+
+        return new ValueTask<FluidValue>(StringValue.Empty);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/HtmlContentValue.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/HtmlContentValue.cs
index 0a1b1c93aaa..2b6372135f9 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/HtmlContentValue.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/HtmlContentValue.cs
@@ -8,97 +8,96 @@
 using Fluid.Values;
 using Microsoft.AspNetCore.Html;
 
-namespace OrchardCore.DisplayManagement.Liquid
+namespace OrchardCore.DisplayManagement.Liquid;
+
+public class HtmlContentValue : FluidValue
 {
-    public class HtmlContentValue : FluidValue
+    private readonly IHtmlContent _value;
+
+    public HtmlContentValue(IHtmlContent value)
     {
-        private readonly IHtmlContent _value;
+        _value = value;
+    }
+
+    public override FluidValues Type
+        => FluidValues.String;
 
-        public HtmlContentValue(IHtmlContent value)
+    public override bool Equals(FluidValue other)
+    {
+        if (other.IsNil())
         {
-            _value = value;
+            return _value == null;
         }
 
-        public override FluidValues Type
-            => FluidValues.String;
-
-        public override bool Equals(FluidValue other)
-        {
-            if (other.IsNil())
-            {
-                return _value == null;
-            }
+        return _value == other;
+    }
 
-            return _value == other;
-        }
+    protected override FluidValue GetIndex(FluidValue index, TemplateContext context)
+    {
+        return NilValue.Instance;
+    }
 
-        protected override FluidValue GetIndex(FluidValue index, TemplateContext context)
-        {
-            return NilValue.Instance;
-        }
+    protected override FluidValue GetValue(string name, TemplateContext context)
+    {
+        return NilValue.Instance;
+    }
 
-        protected override FluidValue GetValue(string name, TemplateContext context)
-        {
-            return NilValue.Instance;
-        }
+    public override bool ToBooleanValue()
+    {
+        return true;
+    }
 
-        public override bool ToBooleanValue()
-        {
-            return true;
-        }
+    public override decimal ToNumberValue()
+    {
+        return 0;
+    }
 
-        public override decimal ToNumberValue()
-        {
-            return 0;
-        }
+    public override string ToStringValue()
+    {
+        return _value.ToString();
+    }
 
-        public override string ToStringValue()
-        {
-            return _value.ToString();
-        }
+    public override ValueTask WriteToAsync(TextWriter writer, TextEncoder encoder, CultureInfo cultureInfo)
+    {
+        _value.WriteTo(writer, (HtmlEncoder)encoder);
 
-        public override ValueTask WriteToAsync(TextWriter writer, TextEncoder encoder, CultureInfo cultureInfo)
-        {
-            _value.WriteTo(writer, (HtmlEncoder)encoder);
+        return ValueTask.CompletedTask;
+    }
 
-            return ValueTask.CompletedTask;
-        }
+    public override object ToObjectValue()
+    {
+        return _value;
+    }
 
-        public override object ToObjectValue()
-        {
-            return _value;
-        }
+    public override bool Contains(FluidValue value)
+    {
+        return false;
+    }
 
-        public override bool Contains(FluidValue value)
-        {
-            return false;
-        }
+    public override IEnumerable<FluidValue> Enumerate(TemplateContext context)
+    {
+        return [];
+    }
 
-        public override IEnumerable<FluidValue> Enumerate(TemplateContext context)
+    public override bool Equals(object other)
+    {
+        // The is operator will return false if null
+        if (other is HtmlContentValue otherValue)
         {
-            return [];
+            return _value.Equals(otherValue._value);
         }
 
-        public override bool Equals(object other)
-        {
-            // The is operator will return false if null
-            if (other is HtmlContentValue otherValue)
-            {
-                return _value.Equals(otherValue._value);
-            }
-
-            return false;
-        }
+        return false;
+    }
 
-        public override int GetHashCode()
-        {
-            return _value.GetHashCode();
-        }
+    public override int GetHashCode()
+    {
+        return _value.GetHashCode();
+    }
 
-        [Obsolete("WriteTo is obsolete, prefer the WriteToAsync method.")]
-        public override void WriteTo(TextWriter writer, TextEncoder encoder, CultureInfo cultureInfo)
-        {
-            _value.WriteTo(writer, (HtmlEncoder)encoder);
-        }
+    [Obsolete("WriteTo is obsolete, prefer the WriteToAsync method.")]
+    public override void WriteTo(TextWriter writer, TextEncoder encoder, CultureInfo cultureInfo)
+    {
+        _value.WriteTo(writer, (HtmlEncoder)encoder);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidCultureAccessor.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidCultureAccessor.cs
index 3c2b8e8da6f..5910f332a0f 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidCultureAccessor.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidCultureAccessor.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Liquid
+namespace OrchardCore.Liquid;
+
+/// <summary>
+/// This is a placeholder class that allows modules to extend the `Culture` property in the current Liquid scope.
+/// </summary>
+public class LiquidCultureAccessor
 {
-    /// <summary>
-    /// This is a placeholder class that allows modules to extend the `Culture` property in the current Liquid scope.
-    /// </summary>
-    public class LiquidCultureAccessor
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidHttpContextAccessor.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidHttpContextAccessor.cs
index 74b65fc9247..6f807418559 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidHttpContextAccessor.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidHttpContextAccessor.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Liquid
+namespace OrchardCore.Liquid;
+
+/// <summary>
+/// This is a placeholder class that allows modules to extend the `HttpContext` property in the current Liquid scope.
+/// </summary>
+public class LiquidHttpContextAccessor
 {
-    /// <summary>
-    /// This is a placeholder class that allows modules to extend the `HttpContext` property in the current Liquid scope.
-    /// </summary>
-    public class LiquidHttpContextAccessor
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidPage.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidPage.cs
index 491a823ef69..8bedb9ea2c2 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidPage.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidPage.cs
@@ -1,9 +1,8 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.DisplayManagement.Liquid
+namespace OrchardCore.DisplayManagement.Liquid;
+
+public class LiquidPage : Razor.RazorPage<dynamic>
 {
-    public class LiquidPage : Razor.RazorPage<dynamic>
-    {
-        public override Task ExecuteAsync() => LiquidViewTemplate.RenderAsync(this);
-    }
+    public override Task ExecuteAsync() => LiquidViewTemplate.RenderAsync(this);
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidRequestAccessor.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidRequestAccessor.cs
index 4bafefb9373..ee6ca96aec3 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidRequestAccessor.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidRequestAccessor.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Liquid
+namespace OrchardCore.Liquid;
+
+/// <summary>
+/// This is a placeholder class that allows modules to extend the `HttpRequest` property in the current Liquid scope.
+/// </summary>
+public class LiquidRequestAccessor
 {
-    /// <summary>
-    /// This is a placeholder class that allows modules to extend the `HttpRequest` property in the current Liquid scope.
-    /// </summary>
-    public class LiquidRequestAccessor
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidShapeTemplateOptionsSetup.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidShapeTemplateOptionsSetup.cs
index 1a9366f55d0..2706624b7cc 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidShapeTemplateOptionsSetup.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidShapeTemplateOptionsSetup.cs
@@ -2,20 +2,19 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy;
 
-namespace OrchardCore.DisplayManagement.Liquid
+namespace OrchardCore.DisplayManagement.Liquid;
+
+public sealed class LiquidShapeTemplateOptionsSetup : IConfigureOptions<ShapeTemplateOptions>
 {
-    public sealed class LiquidShapeTemplateOptionsSetup : IConfigureOptions<ShapeTemplateOptions>
-    {
-        private readonly TemplateOptions _templateOptions;
+    private readonly TemplateOptions _templateOptions;
 
-        public LiquidShapeTemplateOptionsSetup(IOptions<TemplateOptions> templateOptions)
-        {
-            _templateOptions = templateOptions.Value;
-        }
+    public LiquidShapeTemplateOptionsSetup(IOptions<TemplateOptions> templateOptions)
+    {
+        _templateOptions = templateOptions.Value;
+    }
 
-        public void Configure(ShapeTemplateOptions options)
-        {
-            options.FileProviders.Insert(0, _templateOptions.FileProvider);
-        }
+    public void Configure(ShapeTemplateOptions options)
+    {
+        options.FileProviders.Insert(0, _templateOptions.FileProvider);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewExtensionProvider.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewExtensionProvider.cs
index 1a5ee357448..a08e61a692f 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewExtensionProvider.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewExtensionProvider.cs
@@ -1,9 +1,8 @@
 using OrchardCore.DisplayManagement.Razor;
 
-namespace OrchardCore.DisplayManagement.Liquid
+namespace OrchardCore.DisplayManagement.Liquid;
+
+public class LiquidViewExtensionProvider : IRazorViewExtensionProvider
 {
-    public class LiquidViewExtensionProvider : IRazorViewExtensionProvider
-    {
-        public string ViewExtension => LiquidViewTemplate.ViewExtension;
-    }
+    public string ViewExtension => LiquidViewTemplate.ViewExtension;
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewOptions.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewOptions.cs
index 78ac7faba4e..07511018824 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewOptions.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewOptions.cs
@@ -2,22 +2,21 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.DisplayManagement.Liquid
+namespace OrchardCore.DisplayManagement.Liquid;
+
+/// <summary>
+/// Provides programmatic configuration for the <see cref="LiquidViewTemplate"/>.
+/// </summary>
+public class LiquidViewOptions
 {
     /// <summary>
-    /// Provides programmatic configuration for the <see cref="LiquidViewTemplate"/>.
+    /// Gets the sequence of <see cref="IFileProvider" /> instances used by <see cref="LiquidViewTemplate"/> to
+    /// locate Liquid files.
     /// </summary>
-    public class LiquidViewOptions
-    {
-        /// <summary>
-        /// Gets the sequence of <see cref="IFileProvider" /> instances used by <see cref="LiquidViewTemplate"/> to
-        /// locate Liquid files.
-        /// </summary>
-        /// <remarks>
-        /// At startup, this is initialized to include an instance of <see cref="PhysicalFileProvider"/> that is
-        /// rooted at the application root.
-        /// </remarks>
-        public List<IFileProvider> FileProviders { get; } = [];
-        public List<Action<LiquidViewParser>> LiquidViewParserConfiguration { get; } = [];
-    }
+    /// <remarks>
+    /// At startup, this is initialized to include an instance of <see cref="PhysicalFileProvider"/> that is
+    /// rooted at the application root.
+    /// </remarks>
+    public List<IFileProvider> FileProviders { get; } = [];
+    public List<Action<LiquidViewParser>> LiquidViewParserConfiguration { get; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewOptionsSetup.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewOptionsSetup.cs
index 4b42f3b1334..439f370195d 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewOptionsSetup.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewOptionsSetup.cs
@@ -4,42 +4,41 @@
 using OrchardCore.Modules;
 using OrchardCore.Mvc;
 
-namespace OrchardCore.DisplayManagement.Liquid
+namespace OrchardCore.DisplayManagement.Liquid;
+
+public sealed class LiquidViewOptionsSetup : IConfigureOptions<LiquidViewOptions>
 {
-    public sealed class LiquidViewOptionsSetup : IConfigureOptions<LiquidViewOptions>
-    {
-        private readonly IHostEnvironment _hostingEnvironment;
-        private readonly IApplicationContext _applicationContext;
+    private readonly IHostEnvironment _hostingEnvironment;
+    private readonly IApplicationContext _applicationContext;
 
-        /// <summary>
-        /// Initializes a new instance of <see cref="LiquidViewOptions"/>.
-        /// </summary>
-        /// <param name="hostingEnvironment"><see cref="IHostEnvironment"/> for the application.</param>
-        /// <param name="applicationContext"><see cref="IApplicationContext"/> for the application.</param>
-        public LiquidViewOptionsSetup(IHostEnvironment hostingEnvironment, IApplicationContext applicationContext)
-        {
-            ArgumentNullException.ThrowIfNull(hostingEnvironment);
-            ArgumentNullException.ThrowIfNull(applicationContext);
+    /// <summary>
+    /// Initializes a new instance of <see cref="LiquidViewOptions"/>.
+    /// </summary>
+    /// <param name="hostingEnvironment"><see cref="IHostEnvironment"/> for the application.</param>
+    /// <param name="applicationContext"><see cref="IApplicationContext"/> for the application.</param>
+    public LiquidViewOptionsSetup(IHostEnvironment hostingEnvironment, IApplicationContext applicationContext)
+    {
+        ArgumentNullException.ThrowIfNull(hostingEnvironment);
+        ArgumentNullException.ThrowIfNull(applicationContext);
 
-            _hostingEnvironment = hostingEnvironment;
-            _applicationContext = applicationContext;
-        }
+        _hostingEnvironment = hostingEnvironment;
+        _applicationContext = applicationContext;
+    }
 
-        public void Configure(LiquidViewOptions options)
+    public void Configure(LiquidViewOptions options)
+    {
+        if (_hostingEnvironment.ContentRootFileProvider != null)
         {
-            if (_hostingEnvironment.ContentRootFileProvider != null)
-            {
-                options.FileProviders.Add(_hostingEnvironment.ContentRootFileProvider);
+            options.FileProviders.Add(_hostingEnvironment.ContentRootFileProvider);
 
-                // To let the application behave as a module, its views are requested under the virtual
-                // "Areas" folder, but they are still served from the file system by this custom provider.
-                options.FileProviders.Insert(0, new ApplicationViewFileProvider(_applicationContext));
+            // To let the application behave as a module, its views are requested under the virtual
+            // "Areas" folder, but they are still served from the file system by this custom provider.
+            options.FileProviders.Insert(0, new ApplicationViewFileProvider(_applicationContext));
 
-                if (_hostingEnvironment.IsDevelopment())
-                {
-                    // While in development, liquid files are 1st served from their module project locations.
-                    options.FileProviders.Insert(0, new ModuleProjectLiquidFileProvider(_applicationContext));
-                }
+            if (_hostingEnvironment.IsDevelopment())
+            {
+                // While in development, liquid files are 1st served from their module project locations.
+                options.FileProviders.Insert(0, new ModuleProjectLiquidFileProvider(_applicationContext));
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewParser.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewParser.cs
index 23e13e2607b..af7c336529a 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewParser.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewParser.cs
@@ -10,84 +10,83 @@
 using OrchardCore.DynamicCache.Liquid;
 using Parlot.Fluent;
 
-namespace OrchardCore.DisplayManagement.Liquid
+namespace OrchardCore.DisplayManagement.Liquid;
+
+public class LiquidViewParser : FluidParser
 {
-    public class LiquidViewParser : FluidParser
+    public LiquidViewParser(IOptions<LiquidViewOptions> liquidViewOptions)
+        : base(new FluidParserOptions() { AllowFunctions = true })
     {
-        public LiquidViewParser(IOptions<LiquidViewOptions> liquidViewOptions)
-            : base(new FluidParserOptions() { AllowFunctions = true })
-        {
-            RegisterEmptyTag("render_body", RenderBodyTag.WriteToAsync);
-            RegisterParserTag("render_section", ArgumentsList, RenderSectionTag.WriteToAsync);
-            RegisterParserTag("page_title", ArgumentsList, RenderTitleSegmentsTag.WriteToAsync);
-            RegisterEmptyTag("antiforgerytoken", AntiForgeryTokenTag.WriteToAsync);
-            RegisterExpressionTag("layout", LayoutTag.WriteToAsync);
+        RegisterEmptyTag("render_body", RenderBodyTag.WriteToAsync);
+        RegisterParserTag("render_section", ArgumentsList, RenderSectionTag.WriteToAsync);
+        RegisterParserTag("page_title", ArgumentsList, RenderTitleSegmentsTag.WriteToAsync);
+        RegisterEmptyTag("antiforgerytoken", AntiForgeryTokenTag.WriteToAsync);
+        RegisterExpressionTag("layout", LayoutTag.WriteToAsync);
 
-            RegisterExpressionTag("shape_clear_alternates", ClearAlternatesTag.WriteToAsync);
-            RegisterParserTag("shape_add_alternates", Primary.And(Primary), AddAlternatesTag.WriteToAsync);
-            RegisterExpressionTag("shape_clear_wrappers", ClearWrappers.WriteToAsync);
-            RegisterParserTag("shape_add_wrappers", Primary.And(Primary), AddWrappersTag.WriteToAsync);
-            RegisterExpressionTag("shape_clear_classes", ClearClassesTag.WriteToAsync);
-            RegisterParserTag("shape_add_classes", Primary.And(Primary), AddClassesTag.WriteToAsync);
-            RegisterExpressionTag("shape_clear_attributes", ClearAttributesTag.WriteToAsync);
-            RegisterParserTag("shape_add_attributes", Primary.And(ArgumentsList), AddAttributesTag.WriteToAsync);
-            RegisterParserTag("shape_type", Primary.And(Primary), ShapeTypeTag.WriteToAsync);
-            RegisterParserTag("shape_display_type", Primary.And(Primary), ShapeDisplayTypeTag.WriteToAsync);
-            RegisterParserTag("shape_position", Primary.And(Primary), ShapePositionTag.WriteToAsync);
-            RegisterParserTag("shape_cache", Primary.And(ArgumentsList), ShapeCacheTag.WriteToAsync);
-            RegisterParserTag("shape_tab", Primary.And(Primary), ShapeTabTag.WriteToAsync);
-            RegisterParserTag("shape_remove_item", Primary.And(Primary), ShapeRemoveItemTag.WriteToAsync);
-            RegisterParserTag("shape_add_properties", Primary.And(ArgumentsList), ShapeAddPropertyTag.WriteToAsync);
-            RegisterParserTag("shape_remove_property", Primary.And(Primary), ShapeRemovePropertyTag.WriteToAsync);
-            RegisterParserTag("shape_pager", Primary.And(ArgumentsList), ShapePagerTag.WriteToAsync);
+        RegisterExpressionTag("shape_clear_alternates", ClearAlternatesTag.WriteToAsync);
+        RegisterParserTag("shape_add_alternates", Primary.And(Primary), AddAlternatesTag.WriteToAsync);
+        RegisterExpressionTag("shape_clear_wrappers", ClearWrappers.WriteToAsync);
+        RegisterParserTag("shape_add_wrappers", Primary.And(Primary), AddWrappersTag.WriteToAsync);
+        RegisterExpressionTag("shape_clear_classes", ClearClassesTag.WriteToAsync);
+        RegisterParserTag("shape_add_classes", Primary.And(Primary), AddClassesTag.WriteToAsync);
+        RegisterExpressionTag("shape_clear_attributes", ClearAttributesTag.WriteToAsync);
+        RegisterParserTag("shape_add_attributes", Primary.And(ArgumentsList), AddAttributesTag.WriteToAsync);
+        RegisterParserTag("shape_type", Primary.And(Primary), ShapeTypeTag.WriteToAsync);
+        RegisterParserTag("shape_display_type", Primary.And(Primary), ShapeDisplayTypeTag.WriteToAsync);
+        RegisterParserTag("shape_position", Primary.And(Primary), ShapePositionTag.WriteToAsync);
+        RegisterParserTag("shape_cache", Primary.And(ArgumentsList), ShapeCacheTag.WriteToAsync);
+        RegisterParserTag("shape_tab", Primary.And(Primary), ShapeTabTag.WriteToAsync);
+        RegisterParserTag("shape_remove_item", Primary.And(Primary), ShapeRemoveItemTag.WriteToAsync);
+        RegisterParserTag("shape_add_properties", Primary.And(ArgumentsList), ShapeAddPropertyTag.WriteToAsync);
+        RegisterParserTag("shape_remove_property", Primary.And(Primary), ShapeRemovePropertyTag.WriteToAsync);
+        RegisterParserTag("shape_pager", Primary.And(ArgumentsList), ShapePagerTag.WriteToAsync);
 
-            RegisterParserTag("httpcontext_add_items", ArgumentsList, HttpContextAddItemTag.WriteToAsync);
-            RegisterParserTag("httpcontext_remove_items", Primary, HttpContextRemoveItemTag.WriteToAsync);
+        RegisterParserTag("httpcontext_add_items", ArgumentsList, HttpContextAddItemTag.WriteToAsync);
+        RegisterParserTag("httpcontext_remove_items", Primary, HttpContextRemoveItemTag.WriteToAsync);
 
-            RegisterParserTag("helper", ArgumentsList, FluidTagHelper.WriteArgumentsTagHelperAsync);
-            RegisterParserBlock("block", ArgumentsList, FluidTagHelper.WriteArgumentsBlockHelperAsync);
+        RegisterParserTag("helper", ArgumentsList, FluidTagHelper.WriteArgumentsTagHelperAsync);
+        RegisterParserBlock("block", ArgumentsList, FluidTagHelper.WriteArgumentsBlockHelperAsync);
 
-            RegisterParserTag("shape", ArgumentsList, ShapeTag.WriteToAsync);
-            RegisterParserBlock("zone", ArgumentsList, ZoneTag.WriteToAsync);
+        RegisterParserTag("shape", ArgumentsList, ShapeTag.WriteToAsync);
+        RegisterParserBlock("zone", ArgumentsList, ZoneTag.WriteToAsync);
 
-            RegisteredTags["a"] = ArgumentsList.AndSkip(TagEnd).And(Parsers.ZeroOrOne(AnyTagsList.AndSkip(CreateTag("enda")))).Then<Statement>(x => new ParserBlockStatement<IReadOnlyList<FilterArgument>>(x.Item1, x.Item2, DefaultAnchorTag.WriteToAsync));
-            RegisterParserBlock("form", ArgumentsList, (list, statements, writer, encoder, context) => FluidTagHelper.WriteToAsync("form", list, statements, writer, encoder, context));
+        RegisteredTags["a"] = ArgumentsList.AndSkip(TagEnd).And(Parsers.ZeroOrOne(AnyTagsList.AndSkip(CreateTag("enda")))).Then<Statement>(x => new ParserBlockStatement<IReadOnlyList<FilterArgument>>(x.Item1, x.Item2, DefaultAnchorTag.WriteToAsync));
+        RegisterParserBlock("form", ArgumentsList, (list, statements, writer, encoder, context) => FluidTagHelper.WriteToAsync("form", list, statements, writer, encoder, context));
 
-            // Dynamic caching
-            RegisterParserBlock("cache", ArgumentsList, CacheTag.WriteToAsync);
-            RegisterParserTag("cache_dependency", Primary, CacheDependencyTag.WriteToAsync);
-            RegisterParserTag("cache_expires_on", Primary, CacheExpiresOnTag.WriteToAsync);
-            RegisterParserTag("cache_expires_after", Primary, CacheExpiresAfterTag.WriteToAsync);
-            RegisterParserTag("cache_expires_sliding", Primary, CacheExpiresSlidingTag.WriteToAsync);
+        // Dynamic caching
+        RegisterParserBlock("cache", ArgumentsList, CacheTag.WriteToAsync);
+        RegisterParserTag("cache_dependency", Primary, CacheDependencyTag.WriteToAsync);
+        RegisterParserTag("cache_expires_on", Primary, CacheExpiresOnTag.WriteToAsync);
+        RegisterParserTag("cache_expires_after", Primary, CacheExpiresAfterTag.WriteToAsync);
+        RegisterParserTag("cache_expires_sliding", Primary, CacheExpiresSlidingTag.WriteToAsync);
 
-            foreach (var configuration in liquidViewOptions.Value.LiquidViewParserConfiguration)
-            {
-                configuration(this);
-            }
+        foreach (var configuration in liquidViewOptions.Value.LiquidViewParserConfiguration)
+        {
+            configuration(this);
         }
+    }
 
-        public Parser<IReadOnlyList<FilterArgument>> ArgumentsListParser
-            => ArgumentsList;
+    public Parser<IReadOnlyList<FilterArgument>> ArgumentsListParser
+        => ArgumentsList;
 
-        internal sealed class ParserBlockStatement<T> : TagStatement
-        {
-            private readonly Func<T, IReadOnlyList<Statement>, TextWriter, TextEncoder, TemplateContext, ValueTask<Completion>> _render;
+    internal sealed class ParserBlockStatement<T> : TagStatement
+    {
+        private readonly Func<T, IReadOnlyList<Statement>, TextWriter, TextEncoder, TemplateContext, ValueTask<Completion>> _render;
 
-            public ParserBlockStatement(T value, IReadOnlyList<Statement> statements, Func<T, IReadOnlyList<Statement>, TextWriter, TextEncoder, TemplateContext, ValueTask<Completion>> render)
-                : base(statements)
-            {
-                ArgumentNullException.ThrowIfNull(render);
+        public ParserBlockStatement(T value, IReadOnlyList<Statement> statements, Func<T, IReadOnlyList<Statement>, TextWriter, TextEncoder, TemplateContext, ValueTask<Completion>> render)
+            : base(statements)
+        {
+            ArgumentNullException.ThrowIfNull(render);
 
-                Value = value;
-                _render = render;
-            }
+            Value = value;
+            _render = render;
+        }
 
-            public T Value { get; }
+        public T Value { get; }
 
-            public override ValueTask<Completion> WriteToAsync(TextWriter writer, TextEncoder encoder, TemplateContext context)
-            {
-                return _render(Value, Statements, writer, encoder, context);
-            }
+        public override ValueTask<Completion> WriteToAsync(TextWriter writer, TextEncoder encoder, TemplateContext context)
+        {
+            return _render(Value, Statements, writer, encoder, context);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewTemplate.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewTemplate.cs
index 6f5c879180f..ca9501de3a5 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewTemplate.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewTemplate.cs
@@ -27,279 +27,278 @@
 using OrchardCore.Modules;
 using TimeZoneConverter;
 
-namespace OrchardCore.DisplayManagement.Liquid
+namespace OrchardCore.DisplayManagement.Liquid;
+
+public class LiquidViewTemplate
 {
-    public class LiquidViewTemplate
-    {
-        public const string ViewsFolder = "Views";
-        public const string ViewExtension = ".liquid";
-        public static readonly MemoryCache Cache = new(new MemoryCacheOptions());
-        public IFluidTemplate FluidTemplate { get; }
+    public const string ViewsFolder = "Views";
+    public const string ViewExtension = ".liquid";
+    public static readonly MemoryCache Cache = new(new MemoryCacheOptions());
+    public IFluidTemplate FluidTemplate { get; }
 
-        public LiquidViewTemplate(IFluidTemplate fluidTemplate)
-        {
-            FluidTemplate = fluidTemplate;
-        }
+    public LiquidViewTemplate(IFluidTemplate fluidTemplate)
+    {
+        FluidTemplate = fluidTemplate;
+    }
 
-        internal static async Task RenderAsync(RazorPage<dynamic> page)
-        {
-            var services = page.Context.RequestServices;
-            var liquidViewParser = services.GetRequiredService<LiquidViewParser>();
-            var path = Path.ChangeExtension(page.ViewContext.ExecutingFilePath, ViewExtension);
-            var templateOptions = services.GetRequiredService<IOptions<TemplateOptions>>().Value;
+    internal static async Task RenderAsync(RazorPage<dynamic> page)
+    {
+        var services = page.Context.RequestServices;
+        var liquidViewParser = services.GetRequiredService<LiquidViewParser>();
+        var path = Path.ChangeExtension(page.ViewContext.ExecutingFilePath, ViewExtension);
+        var templateOptions = services.GetRequiredService<IOptions<TemplateOptions>>().Value;
 
-            var isDevelopment = services.GetRequiredService<IHostEnvironment>().IsDevelopment();
-            var template = await ParseAsync(liquidViewParser, path, templateOptions.FileProvider, Cache, isDevelopment);
-            var context = new LiquidTemplateContext(services, templateOptions);
-            var htmlEncoder = services.GetRequiredService<HtmlEncoder>();
+        var isDevelopment = services.GetRequiredService<IHostEnvironment>().IsDevelopment();
+        var template = await ParseAsync(liquidViewParser, path, templateOptions.FileProvider, Cache, isDevelopment);
+        var context = new LiquidTemplateContext(services, templateOptions);
+        var htmlEncoder = services.GetRequiredService<HtmlEncoder>();
 
-            try
-            {
-                // Defer the buffer disposing so that a template can be rendered twice.
-                var content = new ViewBufferTextWriterContent(releaseOnWrite: false);
-                ShellScope.Current.RegisterBeforeDispose(scope => content.Dispose());
+        try
+        {
+            // Defer the buffer disposing so that a template can be rendered twice.
+            var content = new ViewBufferTextWriterContent(releaseOnWrite: false);
+            ShellScope.Current.RegisterBeforeDispose(scope => content.Dispose());
 
-                await context.EnterScopeAsync(page.ViewContext, (object)page.Model);
-                await template.FluidTemplate.RenderAsync(content, htmlEncoder, context);
+            await context.EnterScopeAsync(page.ViewContext, (object)page.Model);
+            await template.FluidTemplate.RenderAsync(content, htmlEncoder, context);
 
-                // Use ViewBufferTextWriter.Write(object) from ASP.NET directly since it will use a special code path
-                // for IHtmlContent. This prevent the TextWriter methods from copying the content from our buffer
-                // if we did content.WriteTo(page.Output)
+            // Use ViewBufferTextWriter.Write(object) from ASP.NET directly since it will use a special code path
+            // for IHtmlContent. This prevent the TextWriter methods from copying the content from our buffer
+            // if we did content.WriteTo(page.Output)
 
-                page.Output.Write(content);
-            }
-            finally
-            {
-                context.ReleaseScope();
-            }
+            page.Output.Write(content);
         }
-
-        public static Task<LiquidViewTemplate> ParseAsync(LiquidViewParser parser, string path, IFileProvider fileProvider, IMemoryCache cache, bool isDevelopment)
+        finally
         {
-            return cache.GetOrCreateAsync(path, async entry =>
-            {
-                entry.SetSlidingExpiration(TimeSpan.FromHours(1));
-                var fileInfo = fileProvider.GetFileInfo(path);
-
-                if (isDevelopment)
-                {
-                    entry.ExpirationTokens.Add(fileProvider.Watch(path));
-                }
-
-                await using var stream = fileInfo.CreateReadStream();
-                using var sr = new StreamReader(stream);
-
-                if (parser.TryParse(await sr.ReadToEndAsync(), out var template, out var errors))
-                {
-                    return new LiquidViewTemplate(template);
-                }
-
-                throw new Exception($"Failed to parse liquid file {path}: {string.Join(System.Environment.NewLine, errors)}");
-            });
+            context.ReleaseScope();
         }
     }
 
-    internal sealed class ShapeAccessor : DelegateAccessor<object, object>
+    public static Task<LiquidViewTemplate> ParseAsync(LiquidViewParser parser, string path, IFileProvider fileProvider, IMemoryCache cache, bool isDevelopment)
     {
-        public ShapeAccessor() : base((obj, name, ctx) => _getter(obj, name))
+        return cache.GetOrCreateAsync(path, async entry =>
         {
-        }
+            entry.SetSlidingExpiration(TimeSpan.FromHours(1));
+            var fileInfo = fileProvider.GetFileInfo(path);
 
-        private static Func<object, string, object> _getter => (o, n) =>
-        {
-            if (o is Shape shape)
+            if (isDevelopment)
+            {
+                entry.ExpirationTokens.Add(fileProvider.Watch(path));
+            }
+
+            await using var stream = fileInfo.CreateReadStream();
+            using var sr = new StreamReader(stream);
+
+            if (parser.TryParse(await sr.ReadToEndAsync(), out var template, out var errors))
             {
-                object obj = n switch
-                {
-                    nameof(Shape.Id) => shape.Id,
-                    nameof(Shape.TagName) => shape.TagName,
-                    nameof(Shape.HasItems) => shape.HasItems,
-                    nameof(Shape.Classes) => shape.Classes,
-                    nameof(Shape.Attributes) => shape.Attributes,
-                    nameof(Shape.Metadata) => shape.Metadata,
-                    nameof(Shape.Items) => shape.Items,
-                    nameof(Shape.Properties) => shape.Properties,
-                    _ => null
-                };
-
-                if (obj != null)
-                {
-                    return obj;
-                }
-
-                if (shape.Properties.TryGetValue(n, out obj))
-                {
-                    return obj;
-                }
-
-                // 'MyType-MyField-FieldType_Display__DisplayMode'.
-                var namedShaped = shape.Named(n);
-                if (namedShaped != null)
-                {
-                    return namedShaped;
-                }
-
-                // 'MyNamedPart', 'MyType__MyField' 'MyType-MyField'.
-                return shape.NormalizedNamed(n.Replace("__", "-"));
+                return new LiquidViewTemplate(template);
             }
 
-            return null;
-        };
+            throw new Exception($"Failed to parse liquid file {path}: {string.Join(System.Environment.NewLine, errors)}");
+        });
     }
+}
 
-    public static class LiquidViewTemplateExtensions
+internal sealed class ShapeAccessor : DelegateAccessor<object, object>
+{
+    public ShapeAccessor() : base((obj, name, ctx) => _getter(obj, name))
     {
-        public static async Task<string> RenderAsync(this LiquidViewTemplate template, TextEncoder encoder, LiquidTemplateContext context, object model)
-        {
-            var viewContextAccessor = context.Services.GetRequiredService<ViewContextAccessor>();
-            var viewContext = viewContextAccessor.ViewContext;
-
-            viewContext ??= viewContextAccessor.ViewContext = await GetViewContextAsync(context);
+    }
 
-            try
+    private static Func<object, string, object> _getter => (o, n) =>
+    {
+        if (o is Shape shape)
+        {
+            object obj = n switch
             {
-                await context.EnterScopeAsync(viewContext, model);
-                return await template.FluidTemplate.RenderAsync(context, encoder);
-            }
-            finally
+                nameof(Shape.Id) => shape.Id,
+                nameof(Shape.TagName) => shape.TagName,
+                nameof(Shape.HasItems) => shape.HasItems,
+                nameof(Shape.Classes) => shape.Classes,
+                nameof(Shape.Attributes) => shape.Attributes,
+                nameof(Shape.Metadata) => shape.Metadata,
+                nameof(Shape.Items) => shape.Items,
+                nameof(Shape.Properties) => shape.Properties,
+                _ => null
+            };
+
+            if (obj != null)
             {
-                context.ReleaseScope();
+                return obj;
             }
-        }
 
-        public static async Task RenderAsync(this LiquidViewTemplate template, TextWriter writer, TextEncoder encoder, LiquidTemplateContext context, object model)
-        {
-            var viewContextAccessor = context.Services.GetRequiredService<ViewContextAccessor>();
-            var viewContext = viewContextAccessor.ViewContext;
-
-            viewContext ??= viewContextAccessor.ViewContext = await GetViewContextAsync(context);
-
-            try
+            if (shape.Properties.TryGetValue(n, out obj))
             {
-                await context.EnterScopeAsync(viewContext, model);
-                await template.FluidTemplate.RenderAsync(writer, encoder, context);
+                return obj;
             }
-            finally
+
+            // 'MyType-MyField-FieldType_Display__DisplayMode'.
+            var namedShaped = shape.Named(n);
+            if (namedShaped != null)
             {
-                context.ReleaseScope();
+                return namedShaped;
             }
+
+            // 'MyNamedPart', 'MyType__MyField' 'MyType-MyField'.
+            return shape.NormalizedNamed(n.Replace("__", "-"));
         }
 
-        public static async Task<ViewContext> GetViewContextAsync(LiquidTemplateContext context)
+        return null;
+    };
+}
+
+public static class LiquidViewTemplateExtensions
+{
+    public static async Task<string> RenderAsync(this LiquidViewTemplate template, TextEncoder encoder, LiquidTemplateContext context, object model)
+    {
+        var viewContextAccessor = context.Services.GetRequiredService<ViewContextAccessor>();
+        var viewContext = viewContextAccessor.ViewContext;
+
+        viewContext ??= viewContextAccessor.ViewContext = await GetViewContextAsync(context);
+
+        try
         {
-            var actionContext = context.Services.GetService<IActionContextAccessor>()?.ActionContext;
+            await context.EnterScopeAsync(viewContext, model);
+            return await template.FluidTemplate.RenderAsync(context, encoder);
+        }
+        finally
+        {
+            context.ReleaseScope();
+        }
+    }
 
-            if (actionContext == null)
-            {
-                var httpContext = context.Services.GetRequiredService<IHttpContextAccessor>().HttpContext;
-                actionContext = await GetActionContextAsync(httpContext);
-            }
+    public static async Task RenderAsync(this LiquidViewTemplate template, TextWriter writer, TextEncoder encoder, LiquidTemplateContext context, object model)
+    {
+        var viewContextAccessor = context.Services.GetRequiredService<ViewContextAccessor>();
+        var viewContext = viewContextAccessor.ViewContext;
 
-            return GetViewContext(actionContext);
+        viewContext ??= viewContextAccessor.ViewContext = await GetViewContextAsync(context);
+
+        try
+        {
+            await context.EnterScopeAsync(viewContext, model);
+            await template.FluidTemplate.RenderAsync(writer, encoder, context);
+        }
+        finally
+        {
+            context.ReleaseScope();
         }
+    }
 
-        internal static async Task<ActionContext> GetActionContextAsync(HttpContext httpContext)
+    public static async Task<ViewContext> GetViewContextAsync(LiquidTemplateContext context)
+    {
+        var actionContext = context.Services.GetService<IActionContextAccessor>()?.ActionContext;
+
+        if (actionContext == null)
         {
-            var routeData = new RouteData();
-            routeData.Routers.Add(new RouteCollection());
+            var httpContext = context.Services.GetRequiredService<IHttpContextAccessor>().HttpContext;
+            actionContext = await GetActionContextAsync(httpContext);
+        }
 
-            var actionContext = new ActionContext(httpContext, routeData, new ActionDescriptor());
-            var filters = httpContext.RequestServices.GetServices<IAsyncViewActionFilter>();
+        return GetViewContext(actionContext);
+    }
 
-            foreach (var filter in filters)
-            {
-                await filter.OnActionExecutionAsync(actionContext);
-            }
+    internal static async Task<ActionContext> GetActionContextAsync(HttpContext httpContext)
+    {
+        var routeData = new RouteData();
+        routeData.Routers.Add(new RouteCollection());
 
-            return actionContext;
-        }
+        var actionContext = new ActionContext(httpContext, routeData, new ActionDescriptor());
+        var filters = httpContext.RequestServices.GetServices<IAsyncViewActionFilter>();
 
-        internal static ViewContext GetViewContext(ActionContext actionContext)
+        foreach (var filter in filters)
         {
-            var services = actionContext.HttpContext.RequestServices;
+            await filter.OnActionExecutionAsync(actionContext);
+        }
 
-            var options = services.GetService<IOptions<MvcViewOptions>>();
-            var viewEngine = options.Value.ViewEngines[0];
+        return actionContext;
+    }
 
-            var viewResult = viewEngine.GetView(executingFilePath: null,
-                LiquidViewsFeatureProvider.DefaultRazorViewPath, isMainPage: true);
+    internal static ViewContext GetViewContext(ActionContext actionContext)
+    {
+        var services = actionContext.HttpContext.RequestServices;
 
-            var tempDataProvider = services.GetService<ITempDataProvider>();
+        var options = services.GetService<IOptions<MvcViewOptions>>();
+        var viewEngine = options.Value.ViewEngines[0];
 
-            var viewContext = new ViewContext(
-                actionContext,
-                viewResult.View,
-                new ViewDataDictionary(
-                    metadataProvider: new EmptyModelMetadataProvider(),
-                    modelState: new ModelStateDictionary()),
-                new TempDataDictionary(
-                    actionContext.HttpContext,
-                    tempDataProvider),
-                TextWriter.Null,
-                new HtmlHelperOptions());
+        var viewResult = viewEngine.GetView(executingFilePath: null,
+            LiquidViewsFeatureProvider.DefaultRazorViewPath, isMainPage: true);
 
-            if (viewContext.View is RazorView razorView)
-            {
-                razorView.RazorPage.ViewContext = viewContext;
-            }
+        var tempDataProvider = services.GetService<ITempDataProvider>();
+
+        var viewContext = new ViewContext(
+            actionContext,
+            viewResult.View,
+            new ViewDataDictionary(
+                metadataProvider: new EmptyModelMetadataProvider(),
+                modelState: new ModelStateDictionary()),
+            new TempDataDictionary(
+                actionContext.HttpContext,
+                tempDataProvider),
+            TextWriter.Null,
+            new HtmlHelperOptions());
 
-            return viewContext;
+        if (viewContext.View is RazorView razorView)
+        {
+            razorView.RazorPage.ViewContext = viewContext;
         }
+
+        return viewContext;
     }
+}
 
-    public static class LiquidTemplateContextExtensions
+public static class LiquidTemplateContextExtensions
+{
+    internal static async Task EnterScopeAsync(this LiquidTemplateContext context, ViewContext viewContext, object model)
     {
-        internal static async Task EnterScopeAsync(this LiquidTemplateContext context, ViewContext viewContext, object model)
+        if (!context.IsInitialized)
         {
-            if (!context.IsInitialized)
-            {
-                var localClock = context.Services.GetRequiredService<ILocalClock>();
+            var localClock = context.Services.GetRequiredService<ILocalClock>();
 
-                // Configure Fluid with the time zone to represent local date and times
-                var localTimeZone = await localClock.GetLocalTimeZoneAsync();
+            // Configure Fluid with the time zone to represent local date and times
+            var localTimeZone = await localClock.GetLocalTimeZoneAsync();
 
-                if (TZConvert.TryGetTimeZoneInfo(localTimeZone.TimeZoneId, out var timeZoneInfo))
-                {
-                    context.TimeZone = timeZoneInfo;
-                }
+            if (TZConvert.TryGetTimeZoneInfo(localTimeZone.TimeZoneId, out var timeZoneInfo))
+            {
+                context.TimeZone = timeZoneInfo;
+            }
 
-                // Configure Fluid with the local date and time
-                var now = await localClock.LocalNowAsync;
+            // Configure Fluid with the local date and time
+            var now = await localClock.LocalNowAsync;
 
-                context.Now = () => now;
+            context.Now = () => now;
 
-                context.ViewContext = viewContext;
+            context.ViewContext = viewContext;
 
-                context.CultureInfo = CultureInfo.CurrentUICulture;
+            context.CultureInfo = CultureInfo.CurrentUICulture;
 
-                context.IsInitialized = true;
-            }
+            context.IsInitialized = true;
+        }
 
-            context.EnterChildScope();
+        context.EnterChildScope();
 
-            var viewLocalizer = context.Services.GetRequiredService<IViewLocalizer>();
+        var viewLocalizer = context.Services.GetRequiredService<IViewLocalizer>();
 
-            if (viewLocalizer is IViewContextAware contextable)
-            {
-                contextable.Contextualize(viewContext);
-            }
+        if (viewLocalizer is IViewContextAware contextable)
+        {
+            contextable.Contextualize(viewContext);
+        }
 
-            context.SetValue("ViewLocalizer", new ObjectValue(viewLocalizer));
+        context.SetValue("ViewLocalizer", new ObjectValue(viewLocalizer));
 
-            if (context.GetValue("Model")?.ToObjectValue() == model && model is IShape shape)
-            {
-                if (context.ShapeRecursions++ > LiquidTemplateContext.MaxShapeRecursions)
-                {
-                    throw new InvalidOperationException(
-                        $"The '{shape.Metadata.Type}' shape has been called recursively more than {LiquidTemplateContext.MaxShapeRecursions} times.");
-                }
-            }
-            else
+        if (context.GetValue("Model")?.ToObjectValue() == model && model is IShape shape)
+        {
+            if (context.ShapeRecursions++ > LiquidTemplateContext.MaxShapeRecursions)
             {
-                context.ShapeRecursions = 0;
+                throw new InvalidOperationException(
+                    $"The '{shape.Metadata.Type}' shape has been called recursively more than {LiquidTemplateContext.MaxShapeRecursions} times.");
             }
-
-            context.SetValue("Model", model);
         }
+        else
+        {
+            context.ShapeRecursions = 0;
+        }
+
+        context.SetValue("Model", model);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewsFeatureProvider.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewsFeatureProvider.cs
index 6d2d3e435f0..bfb5e88164f 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewsFeatureProvider.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewsFeatureProvider.cs
@@ -10,58 +10,57 @@
 using OrchardCore.Modules;
 using OrchardCore.Mvc.FileProviders;
 
-namespace OrchardCore.DisplayManagement.Liquid
+namespace OrchardCore.DisplayManagement.Liquid;
+
+public class LiquidViewsFeatureProvider : IApplicationFeatureProvider<ViewsFeature>
 {
-    public class LiquidViewsFeatureProvider : IApplicationFeatureProvider<ViewsFeature>
-    {
-        public const string DefaultLiquidViewName = "DefaultLiquidViewName";
-        public static readonly string DefaultRazorViewPath = '/' + DefaultLiquidViewName + RazorViewEngine.ViewExtension;
-        public static readonly string DefaultLiquidViewPath = '/' + DefaultLiquidViewName + LiquidViewTemplate.ViewExtension;
+    public const string DefaultLiquidViewName = "DefaultLiquidViewName";
+    public static readonly string DefaultRazorViewPath = '/' + DefaultLiquidViewName + RazorViewEngine.ViewExtension;
+    public static readonly string DefaultLiquidViewPath = '/' + DefaultLiquidViewName + LiquidViewTemplate.ViewExtension;
 
-        private static List<string> _sharedPaths;
-        private static readonly object _synLock = new();
+    private static List<string> _sharedPaths;
+    private static readonly object _synLock = new();
 
-        public LiquidViewsFeatureProvider(IOptions<TemplateOptions> templateOptions)
+    public LiquidViewsFeatureProvider(IOptions<TemplateOptions> templateOptions)
+    {
+        if (_sharedPaths != null)
         {
-            if (_sharedPaths != null)
-            {
-                return;
-            }
+            return;
+        }
 
-            lock (_synLock)
+        lock (_synLock)
+        {
+            if (_sharedPaths == null)
             {
-                if (_sharedPaths == null)
-                {
-                    _sharedPaths = [];
+                _sharedPaths = [];
 
-                    var filePaths = templateOptions.Value.FileProvider.GetViewFilePaths(
-                        Application.ModulesPath, [LiquidViewTemplate.ViewExtension],
-                        LiquidViewTemplate.ViewsFolder);
+                var filePaths = templateOptions.Value.FileProvider.GetViewFilePaths(
+                    Application.ModulesPath, [LiquidViewTemplate.ViewExtension],
+                    LiquidViewTemplate.ViewsFolder);
 
-                    _sharedPaths.AddRange(filePaths.Select(p => '/' + p));
-                }
+                _sharedPaths.AddRange(filePaths.Select(p => '/' + p));
             }
         }
+    }
 
-        public void PopulateFeature(IEnumerable<ApplicationPart> parts, ViewsFeature feature)
+    public void PopulateFeature(IEnumerable<ApplicationPart> parts, ViewsFeature feature)
+    {
+        feature.ViewDescriptors.Add(new CompiledViewDescriptor
         {
-            feature.ViewDescriptors.Add(new CompiledViewDescriptor
-            {
-                RelativePath = DefaultRazorViewPath,
-                Item = new TenantRazorCompiledItem(typeof(LiquidPage), DefaultLiquidViewPath)
-            });
+            RelativePath = DefaultRazorViewPath,
+            Item = new TenantRazorCompiledItem(typeof(LiquidPage), DefaultLiquidViewPath)
+        });
 
-            foreach (var path in _sharedPaths)
+        foreach (var path in _sharedPaths)
+        {
+            if (!Path.GetFileName(path).StartsWith('_'))
             {
-                if (!Path.GetFileName(path).StartsWith('_'))
+                var viewPath = Path.ChangeExtension(path, RazorViewEngine.ViewExtension);
+                feature.ViewDescriptors.Add(new CompiledViewDescriptor
                 {
-                    var viewPath = Path.ChangeExtension(path, RazorViewEngine.ViewExtension);
-                    feature.ViewDescriptors.Add(new CompiledViewDescriptor
-                    {
-                        RelativePath = viewPath,
-                        Item = new TenantRazorCompiledItem(typeof(LiquidPage), viewPath)
-                    });
-                }
+                    RelativePath = viewPath,
+                    Item = new TenantRazorCompiledItem(typeof(LiquidPage), viewPath)
+                });
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/ModuleProjectLiquidFileProvider.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/ModuleProjectLiquidFileProvider.cs
index 52793d0d976..47c8ee39c7c 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/ModuleProjectLiquidFileProvider.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/ModuleProjectLiquidFileProvider.cs
@@ -7,95 +7,94 @@
 using Microsoft.Extensions.Primitives;
 using OrchardCore.Modules;
 
-namespace OrchardCore.DisplayManagement.Liquid
+namespace OrchardCore.DisplayManagement.Liquid;
+
+/// <summary>
+/// This custom <see cref="IFileProvider"/> implementation provides the file contents
+/// of Module Project Liquid files while in a development environment.
+/// </summary>
+public class ModuleProjectLiquidFileProvider : IFileProvider
 {
-    /// <summary>
-    /// This custom <see cref="IFileProvider"/> implementation provides the file contents
-    /// of Module Project Liquid files while in a development environment.
-    /// </summary>
-    public class ModuleProjectLiquidFileProvider : IFileProvider
+    private static Dictionary<string, string> _paths;
+    private static readonly object _synLock = new();
+
+    public ModuleProjectLiquidFileProvider(IApplicationContext applicationContext)
     {
-        private static Dictionary<string, string> _paths;
-        private static readonly object _synLock = new();
+        if (_paths != null)
+        {
+            return;
+        }
 
-        public ModuleProjectLiquidFileProvider(IApplicationContext applicationContext)
+        lock (_synLock)
         {
-            if (_paths != null)
+            if (_paths == null)
             {
-                return;
-            }
+                var assets = new List<Asset>();
+                var application = applicationContext.Application;
 
-            lock (_synLock)
-            {
-                if (_paths == null)
+                foreach (var module in application.Modules)
                 {
-                    var assets = new List<Asset>();
-                    var application = applicationContext.Application;
-
-                    foreach (var module in application.Modules)
+                    // If the module and the application assemblies are not at the same location,
+                    // this means that the module is referenced as a package, not as a project in dev.
+                    if (module.Assembly == null || Path.GetDirectoryName(module.Assembly.Location)
+                        != Path.GetDirectoryName(application.Assembly.Location))
                     {
-                        // If the module and the application assemblies are not at the same location,
-                        // this means that the module is referenced as a package, not as a project in dev.
-                        if (module.Assembly == null || Path.GetDirectoryName(module.Assembly.Location)
-                            != Path.GetDirectoryName(application.Assembly.Location))
-                        {
-                            continue;
-                        }
-
-                        // Get module assets which are liquid template files.
-                        assets.AddRange(module.Assets.Where(a => a.ModuleAssetPath
-                            .EndsWith(".liquid", StringComparison.Ordinal)));
+                        continue;
                     }
 
-                    // Init the mapping between module and project asset paths.
-                    _paths = assets.ToDictionary(a => a.ModuleAssetPath, a => a.ProjectAssetPath);
+                    // Get module assets which are liquid template files.
+                    assets.AddRange(module.Assets.Where(a => a.ModuleAssetPath
+                        .EndsWith(".liquid", StringComparison.Ordinal)));
                 }
+
+                // Init the mapping between module and project asset paths.
+                _paths = assets.ToDictionary(a => a.ModuleAssetPath, a => a.ProjectAssetPath);
             }
         }
+    }
 
-        public IDirectoryContents GetDirectoryContents(string subpath)
-        {
-            return NotFoundDirectoryContents.Singleton;
-        }
+    public IDirectoryContents GetDirectoryContents(string subpath)
+    {
+        return NotFoundDirectoryContents.Singleton;
+    }
 
-        public IFileInfo GetFileInfo(string subpath)
+    public IFileInfo GetFileInfo(string subpath)
+    {
+        if (subpath == null)
         {
-            if (subpath == null)
-            {
-                return new NotFoundFileInfo(subpath);
-            }
-
-            var path = NormalizePath(subpath);
-
-            // Map the module asset path to the project asset path.
-            if (_paths.TryGetValue(path, out var projectAssetPath))
-            {
-                // Serve the project asset from the physical file system.
-                return new PhysicalFileInfo(new FileInfo(projectAssetPath));
-            }
-
             return new NotFoundFileInfo(subpath);
         }
 
-        public IChangeToken Watch(string filter)
-        {
-            if (filter == null)
-            {
-                return NullChangeToken.Singleton;
-            }
+        var path = NormalizePath(subpath);
 
-            var path = NormalizePath(filter);
+        // Map the module asset path to the project asset path.
+        if (_paths.TryGetValue(path, out var projectAssetPath))
+        {
+            // Serve the project asset from the physical file system.
+            return new PhysicalFileInfo(new FileInfo(projectAssetPath));
+        }
 
-            // Map the module asset path to the project asset path.
-            if (_paths.TryGetValue(path, out var projectAssetPath))
-            {
-                // Watch the project asset from the physical file system.
-                return new PollingFileChangeToken(new FileInfo(projectAssetPath));
-            }
+        return new NotFoundFileInfo(subpath);
+    }
 
+    public IChangeToken Watch(string filter)
+    {
+        if (filter == null)
+        {
             return NullChangeToken.Singleton;
         }
 
-        private static string NormalizePath(string path) => path.Replace('\\', '/').Trim('/');
+        var path = NormalizePath(filter);
+
+        // Map the module asset path to the project asset path.
+        if (_paths.TryGetValue(path, out var projectAssetPath))
+        {
+            // Watch the project asset from the physical file system.
+            return new PollingFileChangeToken(new FileInfo(projectAssetPath));
+        }
+
+        return NullChangeToken.Singleton;
     }
+
+    private static string NormalizePath(string path) => path.Replace('\\', '/').Trim('/');
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/OrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/OrchardCoreBuilderExtensions.cs
index 0dc4e70dbcb..98693ee9ed1 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/OrchardCoreBuilderExtensions.cs
@@ -21,205 +21,204 @@
 using OrchardCore.Liquid;
 using OrchardCore.Localization;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class OrchardCoreBuilderExtensions
 {
-    public static class OrchardCoreBuilderExtensions
+    /// <summary>
+    /// Adds tenant level services for managing liquid view template files.
+    /// </summary>
+    public static OrchardCoreBuilder AddLiquidViews(this OrchardCoreBuilder builder)
     {
-        /// <summary>
-        /// Adds tenant level services for managing liquid view template files.
-        /// </summary>
-        public static OrchardCoreBuilder AddLiquidViews(this OrchardCoreBuilder builder)
+        builder.ConfigureServices(services =>
         {
-            builder.ConfigureServices(services =>
-            {
-                services.AddSingleton<LiquidViewParser>();
-                services.AddSingleton<IAnchorTag, AnchorTag>();
+            services.AddSingleton<LiquidViewParser>();
+            services.AddSingleton<IAnchorTag, AnchorTag>();
 
-                services.AddTransient<IConfigureOptions<TemplateOptions>, TemplateOptionsFileProviderSetup>();
+            services.AddTransient<IConfigureOptions<TemplateOptions>, TemplateOptionsFileProviderSetup>();
 
-                services.TryAddEnumerable(
-                    ServiceDescriptor.Transient<IConfigureOptions<LiquidViewOptions>,
-                    LiquidViewOptionsSetup>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IConfigureOptions<LiquidViewOptions>,
+                LiquidViewOptionsSetup>());
 
-                services.TryAddEnumerable(
-                    ServiceDescriptor.Transient<IConfigureOptions<ShapeTemplateOptions>,
-                    LiquidShapeTemplateOptionsSetup>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IConfigureOptions<ShapeTemplateOptions>,
+                LiquidShapeTemplateOptionsSetup>());
 
-                services.AddSingleton<IApplicationFeatureProvider<ViewsFeature>, LiquidViewsFeatureProvider>();
-                services.AddScoped<IRazorViewExtensionProvider, LiquidViewExtensionProvider>();
-                services.AddSingleton<LiquidTagHelperFactory>();
+            services.AddSingleton<IApplicationFeatureProvider<ViewsFeature>, LiquidViewsFeatureProvider>();
+            services.AddScoped<IRazorViewExtensionProvider, LiquidViewExtensionProvider>();
+            services.AddSingleton<LiquidTagHelperFactory>();
 
-                services.Configure<TemplateOptions>(o =>
+            services.Configure<TemplateOptions>(o =>
+            {
+                o.ValueConverters.Add(x =>
                 {
-                    o.ValueConverters.Add(x =>
+                    if (x is Shape s)
                     {
-                        if (x is Shape s)
-                        {
-                            return new ObjectValue(s);
-                        }
-                        else if (x is IHtmlContent c)
-                        {
-                            return new HtmlContentValue(c);
-                        }
+                        return new ObjectValue(s);
+                    }
+                    else if (x is IHtmlContent c)
+                    {
+                        return new HtmlContentValue(c);
+                    }
 
-                        return null;
-                    });
+                    return null;
+                });
 
-                    o.MemberAccessStrategy.Register<Shape>("*", new ShapeAccessor());
-                    o.MemberAccessStrategy.Register<ZoneHolding>("*", new ShapeAccessor());
-                    o.MemberAccessStrategy.Register<ShapeMetadata>();
-                    o.MemberAccessStrategy.Register<CultureInfo>();
+                o.MemberAccessStrategy.Register<Shape>("*", new ShapeAccessor());
+                o.MemberAccessStrategy.Register<ZoneHolding>("*", new ShapeAccessor());
+                o.MemberAccessStrategy.Register<ShapeMetadata>();
+                o.MemberAccessStrategy.Register<CultureInfo>();
 
-                    o.Scope.SetValue("Culture", new ObjectValue(new LiquidCultureAccessor()));
-                    o.MemberAccessStrategy.Register<LiquidCultureAccessor, FluidValue>((obj, name, ctx) =>
+                o.Scope.SetValue("Culture", new ObjectValue(new LiquidCultureAccessor()));
+                o.MemberAccessStrategy.Register<LiquidCultureAccessor, FluidValue>((obj, name, ctx) =>
+                {
+                    return name switch
+                    {
+                        nameof(CultureInfo.Name) => new StringValue(CultureInfo.CurrentUICulture.Name),
+                        "Dir" => new StringValue(CultureInfo.CurrentUICulture.GetLanguageDirection()),
+                        nameof(CultureInfo.NativeName) => new StringValue(CultureInfo.CurrentUICulture.NativeName),
+                        nameof(CultureInfo.DisplayName) => new StringValue(CultureInfo.CurrentUICulture.DisplayName),
+                        nameof(CultureInfo.TwoLetterISOLanguageName) => new StringValue(CultureInfo.CurrentUICulture.TwoLetterISOLanguageName),
+                        _ => NilValue.Instance
+                    };
+                });
+
+                o.Scope.SetValue("Environment", new ObjectValue(new LiquidEnvironmentAccessor()));
+                o.MemberAccessStrategy.Register<LiquidEnvironmentAccessor, FluidValue>((obj, name, ctx) =>
+                {
+                    var hostEnvironment = ((LiquidTemplateContext)ctx).Services.GetRequiredService<IHostEnvironment>();
+
+                    if (hostEnvironment != null)
                     {
                         return name switch
                         {
-                            nameof(CultureInfo.Name) => new StringValue(CultureInfo.CurrentUICulture.Name),
-                            "Dir" => new StringValue(CultureInfo.CurrentUICulture.GetLanguageDirection()),
-                            nameof(CultureInfo.NativeName) => new StringValue(CultureInfo.CurrentUICulture.NativeName),
-                            nameof(CultureInfo.DisplayName) => new StringValue(CultureInfo.CurrentUICulture.DisplayName),
-                            nameof(CultureInfo.TwoLetterISOLanguageName) => new StringValue(CultureInfo.CurrentUICulture.TwoLetterISOLanguageName),
+                            "IsDevelopment" => BooleanValue.Create(hostEnvironment.IsDevelopment()),
+                            "IsStaging" => BooleanValue.Create(hostEnvironment.IsStaging()),
+                            "IsProduction" => BooleanValue.Create(hostEnvironment.IsProduction()),
+                            "Name" => StringValue.Create(hostEnvironment.EnvironmentName),
                             _ => NilValue.Instance
                         };
-                    });
+                    }
 
-                    o.Scope.SetValue("Environment", new ObjectValue(new LiquidEnvironmentAccessor()));
-                    o.MemberAccessStrategy.Register<LiquidEnvironmentAccessor, FluidValue>((obj, name, ctx) =>
-                    {
-                        var hostEnvironment = ((LiquidTemplateContext)ctx).Services.GetRequiredService<IHostEnvironment>();
+                    return NilValue.Instance;
+                });
 
-                        if (hostEnvironment != null)
-                        {
-                            return name switch
-                            {
-                                "IsDevelopment" => BooleanValue.Create(hostEnvironment.IsDevelopment()),
-                                "IsStaging" => BooleanValue.Create(hostEnvironment.IsStaging()),
-                                "IsProduction" => BooleanValue.Create(hostEnvironment.IsProduction()),
-                                "Name" => StringValue.Create(hostEnvironment.EnvironmentName),
-                                _ => NilValue.Instance
-                            };
-                        }
-
-                        return NilValue.Instance;
-                    });
-
-                    o.Scope.SetValue("Request", new ObjectValue(new LiquidRequestAccessor()));
-                    o.MemberAccessStrategy.Register<LiquidRequestAccessor, FluidValue>((obj, name, ctx) =>
+                o.Scope.SetValue("Request", new ObjectValue(new LiquidRequestAccessor()));
+                o.MemberAccessStrategy.Register<LiquidRequestAccessor, FluidValue>((obj, name, ctx) =>
+                {
+                    var request = ((LiquidTemplateContext)ctx).Services.GetRequiredService<IHttpContextAccessor>().HttpContext?.Request;
+                    if (request != null)
                     {
-                        var request = ((LiquidTemplateContext)ctx).Services.GetRequiredService<IHttpContextAccessor>().HttpContext?.Request;
-                        if (request != null)
+                        return name switch
                         {
-                            return name switch
-                            {
-                                nameof(HttpRequest.QueryString) => new StringValue(request.QueryString.Value),
-                                nameof(HttpRequest.ContentType) => new StringValue(request.ContentType),
-                                nameof(HttpRequest.ContentLength) => NumberValue.Create(request.ContentLength ?? 0),
-                                nameof(HttpRequest.Cookies) => new ObjectValue(new CookieCollectionWrapper(request.Cookies)),
-                                nameof(HttpRequest.Headers) => new ObjectValue(new HeaderDictionaryWrapper(request.Headers)),
-                                nameof(HttpRequest.Query) => new ObjectValue(new QueryCollection(request.Query.ToDictionary(kv => kv.Key, kv => kv.Value))),
-                                nameof(HttpRequest.Form) => request.HasFormContentType ? (FluidValue)new ObjectValue(request.Form) : NilValue.Instance,
-                                nameof(HttpRequest.Protocol) => new StringValue(request.Protocol),
-                                nameof(HttpRequest.Path) => new StringValue(request.Path.Value),
-                                nameof(HttpRequest.PathBase) => new StringValue(request.PathBase.Value),
-                                nameof(HttpRequest.Host) => new StringValue(request.Host.Value),
-                                nameof(HttpRequest.IsHttps) => BooleanValue.Create(request.IsHttps),
-                                nameof(HttpRequest.Scheme) => new StringValue(request.Scheme),
-                                nameof(HttpRequest.Method) => new StringValue(request.Method),
-                                nameof(HttpRequest.RouteValues) => new ObjectValue(new RouteValueDictionaryWrapper(request.RouteValues)),
-
-                                // Provides correct escaping to reconstruct a request or redirect URI.
-                                "UriHost" => new StringValue(request.Host.ToUriComponent(), encode: false),
-                                "UriPath" => new StringValue(request.Path.ToUriComponent(), encode: false),
-                                "UriPathBase" => new StringValue(request.PathBase.ToUriComponent(), encode: false),
-                                "UriQueryString" => new StringValue(request.QueryString.ToUriComponent(), encode: false),
-
-                                _ => NilValue.Instance
-                            };
-                        }
-
-                        return NilValue.Instance;
-                    });
-
-                    o.Scope.SetValue("HttpContext", new ObjectValue(new LiquidHttpContextAccessor()));
-                    o.MemberAccessStrategy.Register<LiquidHttpContextAccessor, FluidValue>((obj, name, ctx) =>
+                            nameof(HttpRequest.QueryString) => new StringValue(request.QueryString.Value),
+                            nameof(HttpRequest.ContentType) => new StringValue(request.ContentType),
+                            nameof(HttpRequest.ContentLength) => NumberValue.Create(request.ContentLength ?? 0),
+                            nameof(HttpRequest.Cookies) => new ObjectValue(new CookieCollectionWrapper(request.Cookies)),
+                            nameof(HttpRequest.Headers) => new ObjectValue(new HeaderDictionaryWrapper(request.Headers)),
+                            nameof(HttpRequest.Query) => new ObjectValue(new QueryCollection(request.Query.ToDictionary(kv => kv.Key, kv => kv.Value))),
+                            nameof(HttpRequest.Form) => request.HasFormContentType ? (FluidValue)new ObjectValue(request.Form) : NilValue.Instance,
+                            nameof(HttpRequest.Protocol) => new StringValue(request.Protocol),
+                            nameof(HttpRequest.Path) => new StringValue(request.Path.Value),
+                            nameof(HttpRequest.PathBase) => new StringValue(request.PathBase.Value),
+                            nameof(HttpRequest.Host) => new StringValue(request.Host.Value),
+                            nameof(HttpRequest.IsHttps) => BooleanValue.Create(request.IsHttps),
+                            nameof(HttpRequest.Scheme) => new StringValue(request.Scheme),
+                            nameof(HttpRequest.Method) => new StringValue(request.Method),
+                            nameof(HttpRequest.RouteValues) => new ObjectValue(new RouteValueDictionaryWrapper(request.RouteValues)),
+
+                            // Provides correct escaping to reconstruct a request or redirect URI.
+                            "UriHost" => new StringValue(request.Host.ToUriComponent(), encode: false),
+                            "UriPath" => new StringValue(request.Path.ToUriComponent(), encode: false),
+                            "UriPathBase" => new StringValue(request.PathBase.ToUriComponent(), encode: false),
+                            "UriQueryString" => new StringValue(request.QueryString.ToUriComponent(), encode: false),
+
+                            _ => NilValue.Instance
+                        };
+                    }
+
+                    return NilValue.Instance;
+                });
+
+                o.Scope.SetValue("HttpContext", new ObjectValue(new LiquidHttpContextAccessor()));
+                o.MemberAccessStrategy.Register<LiquidHttpContextAccessor, FluidValue>((obj, name, ctx) =>
+                {
+                    var httpContext = ((LiquidTemplateContext)ctx).Services.GetRequiredService<IHttpContextAccessor>().HttpContext;
+                    if (httpContext != null)
                     {
-                        var httpContext = ((LiquidTemplateContext)ctx).Services.GetRequiredService<IHttpContextAccessor>().HttpContext;
-                        if (httpContext != null)
+                        return name switch
                         {
-                            return name switch
-                            {
-                                nameof(HttpContext.Items) => new ObjectValue(new HttpContextItemsWrapper(httpContext.Items)),
-                                _ => NilValue.Instance
-                            };
-                        }
+                            nameof(HttpContext.Items) => new ObjectValue(new HttpContextItemsWrapper(httpContext.Items)),
+                            _ => NilValue.Instance
+                        };
+                    }
 
-                        return NilValue.Instance;
-                    });
+                    return NilValue.Instance;
+                });
 
-                    o.MemberAccessStrategy.Register<FormCollection, FluidValue>((forms, name) =>
+                o.MemberAccessStrategy.Register<FormCollection, FluidValue>((forms, name) =>
+                {
+                    if (name == "Keys")
                     {
-                        if (name == "Keys")
-                        {
-                            return new ArrayValue(forms.Keys.Select(x => new StringValue(x)).ToArray());
-                        }
-
-                        return new ArrayValue(forms[name].Select(x => new StringValue(x)).ToArray());
-                    });
-
-                    o.MemberAccessStrategy.Register<HttpContextItemsWrapper, object>((httpContext, name) => httpContext.Items[name]);
-                    o.MemberAccessStrategy.Register<QueryCollection, string[]>((queries, name) => queries[name].ToArray());
-                    o.MemberAccessStrategy.Register<CookieCollectionWrapper, string>((cookies, name) => cookies.RequestCookieCollection[name]);
-                    o.MemberAccessStrategy.Register<HeaderDictionaryWrapper, string[]>((headers, name) => headers.HeaderDictionary[name].ToArray());
-                    o.MemberAccessStrategy.Register<RouteValueDictionaryWrapper, object>((headers, name) => headers.RouteValueDictionary[name]);
-                })
-                .AddLiquidFilter<AppendVersionFilter>("append_version")
-                .AddLiquidFilter<ResourceUrlFilter>("resource_url")
-                .AddLiquidFilter<SanitizeHtmlFilter>("sanitize_html")
-                .AddLiquidFilter<SupportedCulturesFilter>("supported_cultures");
-            });
-
-            return builder;
-        }
+                        return new ArrayValue(forms.Keys.Select(x => new StringValue(x)).ToArray());
+                    }
+
+                    return new ArrayValue(forms[name].Select(x => new StringValue(x)).ToArray());
+                });
+
+                o.MemberAccessStrategy.Register<HttpContextItemsWrapper, object>((httpContext, name) => httpContext.Items[name]);
+                o.MemberAccessStrategy.Register<QueryCollection, string[]>((queries, name) => queries[name].ToArray());
+                o.MemberAccessStrategy.Register<CookieCollectionWrapper, string>((cookies, name) => cookies.RequestCookieCollection[name]);
+                o.MemberAccessStrategy.Register<HeaderDictionaryWrapper, string[]>((headers, name) => headers.HeaderDictionary[name].ToArray());
+                o.MemberAccessStrategy.Register<RouteValueDictionaryWrapper, object>((headers, name) => headers.RouteValueDictionary[name]);
+            })
+            .AddLiquidFilter<AppendVersionFilter>("append_version")
+            .AddLiquidFilter<ResourceUrlFilter>("resource_url")
+            .AddLiquidFilter<SanitizeHtmlFilter>("sanitize_html")
+            .AddLiquidFilter<SupportedCulturesFilter>("supported_cultures");
+        });
+
+        return builder;
+    }
 
-        private sealed class CookieCollectionWrapper
-        {
-            public readonly IRequestCookieCollection RequestCookieCollection;
+    private sealed class CookieCollectionWrapper
+    {
+        public readonly IRequestCookieCollection RequestCookieCollection;
 
-            public CookieCollectionWrapper(IRequestCookieCollection requestCookieCollection)
-            {
-                RequestCookieCollection = requestCookieCollection;
-            }
+        public CookieCollectionWrapper(IRequestCookieCollection requestCookieCollection)
+        {
+            RequestCookieCollection = requestCookieCollection;
         }
+    }
 
-        private sealed class HeaderDictionaryWrapper
-        {
-            public readonly IHeaderDictionary HeaderDictionary;
+    private sealed class HeaderDictionaryWrapper
+    {
+        public readonly IHeaderDictionary HeaderDictionary;
 
-            public HeaderDictionaryWrapper(IHeaderDictionary headerDictionary)
-            {
-                HeaderDictionary = headerDictionary;
-            }
+        public HeaderDictionaryWrapper(IHeaderDictionary headerDictionary)
+        {
+            HeaderDictionary = headerDictionary;
         }
+    }
 
-        private sealed class HttpContextItemsWrapper
-        {
-            public readonly IDictionary<object, object> Items;
+    private sealed class HttpContextItemsWrapper
+    {
+        public readonly IDictionary<object, object> Items;
 
-            public HttpContextItemsWrapper(IDictionary<object, object> items)
-            {
-                Items = items;
-            }
+        public HttpContextItemsWrapper(IDictionary<object, object> items)
+        {
+            Items = items;
         }
+    }
 
-        private sealed class RouteValueDictionaryWrapper
-        {
-            public readonly IReadOnlyDictionary<string, object> RouteValueDictionary;
+    private sealed class RouteValueDictionaryWrapper
+    {
+        public readonly IReadOnlyDictionary<string, object> RouteValueDictionary;
 
-            public RouteValueDictionaryWrapper(IReadOnlyDictionary<string, object> routeValueDictionary)
-            {
-                RouteValueDictionary = routeValueDictionary;
-            }
+        public RouteValueDictionaryWrapper(IReadOnlyDictionary<string, object> routeValueDictionary)
+        {
+            RouteValueDictionary = routeValueDictionary;
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TagHelpers/LiquidTagHelperActivator.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TagHelpers/LiquidTagHelperActivator.cs
index 6d6864edf52..8fe9a77145c 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TagHelpers/LiquidTagHelperActivator.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TagHelpers/LiquidTagHelperActivator.cs
@@ -12,246 +12,245 @@
 using OrchardCore.Environment.Shell.Scope;
 using OrchardCore.Mvc.Utilities;
 
-namespace OrchardCore.DisplayManagement.Liquid.TagHelpers
+namespace OrchardCore.DisplayManagement.Liquid.TagHelpers;
+
+public class LiquidTagHelperActivator
 {
-    public class LiquidTagHelperActivator
-    {
-        private const string AspPrefix = "asp-";
+    private const string AspPrefix = "asp-";
 
-        public static readonly LiquidTagHelperActivator None = new();
+    public static readonly LiquidTagHelperActivator None = new();
 
-        private readonly Func<ITagHelperFactory, ViewContext, ITagHelper> _activatorByFactory;
-        private readonly Dictionary<string, Action<ITagHelper, ModelExpressionProvider, ViewDataDictionary<object>, string, FluidValue>> _setters =
-            new(StringComparer.OrdinalIgnoreCase);
+    private readonly Func<ITagHelperFactory, ViewContext, ITagHelper> _activatorByFactory;
+    private readonly Dictionary<string, Action<ITagHelper, ModelExpressionProvider, ViewDataDictionary<object>, string, FluidValue>> _setters =
+        new(StringComparer.OrdinalIgnoreCase);
 
-        private readonly Func<ViewContext, ITagHelper> _activatorByService;
-        private readonly Action<object, object> _viewContextSetter;
+    private readonly Func<ViewContext, ITagHelper> _activatorByService;
+    private readonly Action<object, object> _viewContextSetter;
 
-        public LiquidTagHelperActivator()
-        {
-        }
+    public LiquidTagHelperActivator()
+    {
+    }
 
-        public LiquidTagHelperActivator(Type type)
+    public LiquidTagHelperActivator(Type type)
+    {
+        var accessibleProperties = type.GetProperties().Where(p =>
+            (p.GetCustomAttribute<HtmlAttributeNotBoundAttribute>() == null ||
+            p.GetCustomAttribute<ViewContextAttribute>() != null) &&
+            p.GetSetMethod() != null);
+
+        foreach (var property in accessibleProperties)
         {
-            var accessibleProperties = type.GetProperties().Where(p =>
-                (p.GetCustomAttribute<HtmlAttributeNotBoundAttribute>() == null ||
-                p.GetCustomAttribute<ViewContextAttribute>() != null) &&
-                p.GetSetMethod() != null);
+            var setter = MakeFastPropertySetter(type, property);
+            var viewContextAttribute = property.GetCustomAttribute<ViewContextAttribute>();
 
-            foreach (var property in accessibleProperties)
+            if (viewContextAttribute != null && property.PropertyType == typeof(ViewContext))
             {
-                var setter = MakeFastPropertySetter(type, property);
-                var viewContextAttribute = property.GetCustomAttribute<ViewContextAttribute>();
+                _viewContextSetter = (helper, context) => setter(helper, context);
+                continue;
+            }
 
-                if (viewContextAttribute != null && property.PropertyType == typeof(ViewContext))
-                {
-                    _viewContextSetter = (helper, context) => setter(helper, context);
-                    continue;
-                }
+            var allNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { property.Name };
+            var htmlAttribute = property.GetCustomAttribute<HtmlAttributeNameAttribute>();
 
-                var allNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { property.Name };
-                var htmlAttribute = property.GetCustomAttribute<HtmlAttributeNameAttribute>();
+            if (htmlAttribute != null && htmlAttribute.Name != null)
+            {
+                allNames.Add(htmlAttribute.Name.ToPascalCaseDash());
 
-                if (htmlAttribute != null && htmlAttribute.Name != null)
+                if (htmlAttribute.Name.StartsWith(AspPrefix, StringComparison.Ordinal))
                 {
-                    allNames.Add(htmlAttribute.Name.ToPascalCaseDash());
+                    allNames.Add(htmlAttribute.Name[AspPrefix.Length..].ToPascalCaseDash());
+                }
 
-                    if (htmlAttribute.Name.StartsWith(AspPrefix, StringComparison.Ordinal))
-                    {
-                        allNames.Add(htmlAttribute.Name[AspPrefix.Length..].ToPascalCaseDash());
-                    }
+                var dictionaryPrefix = htmlAttribute.DictionaryAttributePrefix;
+                if (dictionaryPrefix != null)
+                {
+                    allNames.Add(dictionaryPrefix.Replace('-', '_'));
 
-                    var dictionaryPrefix = htmlAttribute.DictionaryAttributePrefix;
-                    if (dictionaryPrefix != null)
+                    if (dictionaryPrefix.StartsWith(AspPrefix, StringComparison.Ordinal))
                     {
-                        allNames.Add(dictionaryPrefix.Replace('-', '_'));
-
-                        if (dictionaryPrefix.StartsWith(AspPrefix, StringComparison.Ordinal))
-                        {
-                            allNames.Add(dictionaryPrefix[AspPrefix.Length..].Replace('-', '_'));
-                        }
+                        allNames.Add(dictionaryPrefix[AspPrefix.Length..].Replace('-', '_'));
                     }
                 }
+            }
 
-                var getter = MakeFastPropertyGetter(type, property);
+            var getter = MakeFastPropertyGetter(type, property);
 
-                foreach (var propertyName in allNames)
+            foreach (var propertyName in allNames)
+            {
+                _setters.Add(propertyName, (h, mp, vd, k, v) =>
                 {
-                    _setters.Add(propertyName, (h, mp, vd, k, v) =>
+                    object value = null;
+
+                    if (property.PropertyType.IsEnum)
                     {
-                        object value = null;
-
-                        if (property.PropertyType.IsEnum)
-                        {
-                            value = Enum.Parse(property.PropertyType, v.ToStringValue());
-                        }
-                        else if (property.PropertyType == typeof(string))
-                        {
-                            value = v.ToStringValue();
-                        }
-                        else if (property.PropertyType == typeof(bool))
-                        {
-                            value = Convert.ToBoolean(v.ToStringValue());
-                        }
-                        else if (property.PropertyType == typeof(bool?))
-                        {
-                            value = v.IsNil() ? null : (bool?)Convert.ToBoolean(v.ToStringValue());
-                        }
-                        else if (property.PropertyType == typeof(IDictionary<string, string>))
-                        {
-                            var dictionary = (IDictionary<string, string>)getter(h);
-                            dictionary[k] = v.ToStringValue();
-                            value = dictionary;
-                        }
-                        else if (property.PropertyType == typeof(IDictionary<string, object>))
-                        {
-                            var dictionary = (IDictionary<string, object>)getter(h);
-                            dictionary[k] = v.ToObjectValue();
-                            value = dictionary;
-                        }
-                        else if (property.PropertyType == typeof(ModelExpression))
-                        {
-                            value = mp.CreateModelExpression(vd, v.ToStringValue());
-                        }
-                        else
-                        {
-                            value = v.ToObjectValue();
-                        }
-
-                        setter(h, value);
-                    });
-                }
-            }
+                        value = Enum.Parse(property.PropertyType, v.ToStringValue());
+                    }
+                    else if (property.PropertyType == typeof(string))
+                    {
+                        value = v.ToStringValue();
+                    }
+                    else if (property.PropertyType == typeof(bool))
+                    {
+                        value = Convert.ToBoolean(v.ToStringValue());
+                    }
+                    else if (property.PropertyType == typeof(bool?))
+                    {
+                        value = v.IsNil() ? null : (bool?)Convert.ToBoolean(v.ToStringValue());
+                    }
+                    else if (property.PropertyType == typeof(IDictionary<string, string>))
+                    {
+                        var dictionary = (IDictionary<string, string>)getter(h);
+                        dictionary[k] = v.ToStringValue();
+                        value = dictionary;
+                    }
+                    else if (property.PropertyType == typeof(IDictionary<string, object>))
+                    {
+                        var dictionary = (IDictionary<string, object>)getter(h);
+                        dictionary[k] = v.ToObjectValue();
+                        value = dictionary;
+                    }
+                    else if (property.PropertyType == typeof(ModelExpression))
+                    {
+                        value = mp.CreateModelExpression(vd, v.ToStringValue());
+                    }
+                    else
+                    {
+                        value = v.ToObjectValue();
+                    }
 
-            if (ShellScope.Services.GetService(type) as ITagHelper != null)
-            {
-                _activatorByService = (context) =>
-                {
-                    var helper = ShellScope.Services.GetService(type) as ITagHelper;
-                    _viewContextSetter?.Invoke(helper, context);
-                    return helper;
-                };
+                    setter(h, value);
+                });
             }
-            else
+        }
+
+        if (ShellScope.Services.GetService(type) as ITagHelper != null)
+        {
+            _activatorByService = (context) =>
             {
-                var genericFactory = typeof(ReusableTagHelperFactory<>).MakeGenericType(type);
-                var factoryMethod = genericFactory.GetMethod("CreateTagHelper");
+                var helper = ShellScope.Services.GetService(type) as ITagHelper;
+                _viewContextSetter?.Invoke(helper, context);
+                return helper;
+            };
+        }
+        else
+        {
+            var genericFactory = typeof(ReusableTagHelperFactory<>).MakeGenericType(type);
+            var factoryMethod = genericFactory.GetMethod("CreateTagHelper");
 
-                _activatorByFactory = Delegate.CreateDelegate(typeof(Func<ITagHelperFactory, ViewContext, ITagHelper>),
-                    factoryMethod) as Func<ITagHelperFactory, ViewContext, ITagHelper>;
-            }
+            _activatorByFactory = Delegate.CreateDelegate(typeof(Func<ITagHelperFactory, ViewContext, ITagHelper>),
+                factoryMethod) as Func<ITagHelperFactory, ViewContext, ITagHelper>;
         }
+    }
 
-        public ITagHelper Create(ITagHelperFactory factory, ViewContext context, FilterArguments arguments,
-            out TagHelperAttributeList contextAttributes, out TagHelperAttributeList outputAttributes)
-        {
-            contextAttributes = [];
-            outputAttributes = [];
+    public ITagHelper Create(ITagHelperFactory factory, ViewContext context, FilterArguments arguments,
+        out TagHelperAttributeList contextAttributes, out TagHelperAttributeList outputAttributes)
+    {
+        contextAttributes = [];
+        outputAttributes = [];
 
-            ITagHelper tagHelper;
+        ITagHelper tagHelper;
 
-            if (_activatorByService != null)
-            {
-                tagHelper = _activatorByService(context);
-            }
-            else
-            {
-                tagHelper = _activatorByFactory(factory, context);
-            }
+        if (_activatorByService != null)
+        {
+            tagHelper = _activatorByService(context);
+        }
+        else
+        {
+            tagHelper = _activatorByFactory(factory, context);
+        }
 
-            var expresionProvider = context.HttpContext.RequestServices.GetRequiredService<ModelExpressionProvider>();
+        var expresionProvider = context.HttpContext.RequestServices.GetRequiredService<ModelExpressionProvider>();
 
-            var viewData = context.ViewData as ViewDataDictionary<object>;
-            viewData ??= new ViewDataDictionary<object>(context.ViewData);
+        var viewData = context.ViewData as ViewDataDictionary<object>;
+        viewData ??= new ViewDataDictionary<object>(context.ViewData);
+
+        foreach (var name in arguments.Names)
+        {
+            var propertyName = name.ToPascalCaseUnderscore();
+            var dictionaryName = string.Empty;
+            var dictionaryKey = string.Empty;
 
-            foreach (var name in arguments.Names)
+            if (!_setters.TryGetValue(propertyName, out var setter))
             {
-                var propertyName = name.ToPascalCaseUnderscore();
-                var dictionaryName = string.Empty;
-                var dictionaryKey = string.Empty;
+                var index = name.LastIndexOf('_');
 
-                if (!_setters.TryGetValue(propertyName, out var setter))
+                if (index > -1)
                 {
-                    var index = name.LastIndexOf('_');
+                    dictionaryName = name[..(index + 1)];
+                    dictionaryKey = name[(index + 1)..];
 
-                    if (index > -1)
+                    if (dictionaryName.Length > 0 && dictionaryKey.Length > 0)
                     {
-                        dictionaryName = name[..(index + 1)];
-                        dictionaryKey = name[(index + 1)..];
-
-                        if (dictionaryName.Length > 0 && dictionaryKey.Length > 0)
-                        {
-                            _setters.TryGetValue(dictionaryName, out setter);
-                        }
+                        _setters.TryGetValue(dictionaryName, out setter);
                     }
                 }
+            }
 
-                var found = false;
+            var found = false;
 
-                if (setter != null)
+            if (setter != null)
+            {
+                try
                 {
-                    try
-                    {
-                        setter(tagHelper, expresionProvider, viewData, dictionaryKey, arguments[name]);
-                        found = true;
-                    }
-                    catch (ArgumentException e)
-                    {
-                        throw new ArgumentException("Incorrect value type assigned to a tag.", name, e);
-                    }
+                    setter(tagHelper, expresionProvider, viewData, dictionaryKey, arguments[name]);
+                    found = true;
                 }
-
-                var attribute = new TagHelperAttribute(name.Replace('_', '-'), arguments[name].ToObjectValue());
-
-                contextAttributes.Add(attribute);
-
-                if (!found)
+                catch (ArgumentException e)
                 {
-                    outputAttributes.Add(attribute);
+                    throw new ArgumentException("Incorrect value type assigned to a tag.", name, e);
                 }
             }
 
-            return tagHelper;
-        }
+            var attribute = new TagHelperAttribute(name.Replace('_', '-'), arguments[name].ToObjectValue());
 
-        private sealed class ReusableTagHelperFactory<T> where T : class, ITagHelper
-        {
-            public static ITagHelper CreateTagHelper(ITagHelperFactory tagHelperFactory, ViewContext viewContext)
+            contextAttributes.Add(attribute);
+
+            if (!found)
             {
-                return tagHelperFactory.CreateTagHelper<T>(viewContext);
+                outputAttributes.Add(attribute);
             }
         }
 
-        private static Action<object, object> MakeFastPropertySetter(Type type, PropertyInfo prop)
-        {
-            // Create a delegate TDeclaringType -> { TDeclaringType.Property = TValue; }
-            var setterAsAction = prop.SetMethod.CreateDelegate(typeof(Action<,>).MakeGenericType(type, prop.PropertyType));
-            var setterClosedGenericMethod = _callPropertySetterOpenGenericMethod.MakeGenericMethod(type, prop.PropertyType);
-            var setterDelegate = setterClosedGenericMethod.CreateDelegate<Action<object, object>>(setterAsAction);
+        return tagHelper;
+    }
 
-            return (Action<object, object>)setterDelegate;
+    private sealed class ReusableTagHelperFactory<T> where T : class, ITagHelper
+    {
+        public static ITagHelper CreateTagHelper(ITagHelperFactory tagHelperFactory, ViewContext viewContext)
+        {
+            return tagHelperFactory.CreateTagHelper<T>(viewContext);
         }
+    }
 
-        private static readonly MethodInfo _callPropertySetterOpenGenericMethod =
-            typeof(LiquidTagHelperActivator).GetTypeInfo().GetDeclaredMethod(nameof(CallPropertySetter));
+    private static Action<object, object> MakeFastPropertySetter(Type type, PropertyInfo prop)
+    {
+        // Create a delegate TDeclaringType -> { TDeclaringType.Property = TValue; }
+        var setterAsAction = prop.SetMethod.CreateDelegate(typeof(Action<,>).MakeGenericType(type, prop.PropertyType));
+        var setterClosedGenericMethod = _callPropertySetterOpenGenericMethod.MakeGenericMethod(type, prop.PropertyType);
+        var setterDelegate = setterClosedGenericMethod.CreateDelegate<Action<object, object>>(setterAsAction);
 
-        private static void CallPropertySetter<TDeclaringType, TValue>(Action<TDeclaringType, TValue> setter, object target, object value)
-            => setter((TDeclaringType)target, (TValue)value);
+        return (Action<object, object>)setterDelegate;
+    }
 
-        private static Func<object, object> MakeFastPropertyGetter(Type type, PropertyInfo prop)
-        {
-            // Create a delegate TDeclaringType -> { TDeclaringType.Property = TValue; }
-            var getterAsFunc = prop.GetMethod.CreateDelegate(typeof(Func<,>).MakeGenericType(type, prop.PropertyType));
-            var getterClosedGenericMethod = _callPropertyGetterOpenGenericMethod.MakeGenericMethod(type, prop.PropertyType);
-            var getterDelegate = getterClosedGenericMethod.CreateDelegate<Func<object, object>>(getterAsFunc);
+    private static readonly MethodInfo _callPropertySetterOpenGenericMethod =
+        typeof(LiquidTagHelperActivator).GetTypeInfo().GetDeclaredMethod(nameof(CallPropertySetter));
 
-            return (Func<object, object>)getterDelegate;
-        }
+    private static void CallPropertySetter<TDeclaringType, TValue>(Action<TDeclaringType, TValue> setter, object target, object value)
+        => setter((TDeclaringType)target, (TValue)value);
 
-        private static readonly MethodInfo _callPropertyGetterOpenGenericMethod =
-            typeof(LiquidTagHelperActivator).GetTypeInfo().GetDeclaredMethod(nameof(CallPropertyGetter));
+    private static Func<object, object> MakeFastPropertyGetter(Type type, PropertyInfo prop)
+    {
+        // Create a delegate TDeclaringType -> { TDeclaringType.Property = TValue; }
+        var getterAsFunc = prop.GetMethod.CreateDelegate(typeof(Func<,>).MakeGenericType(type, prop.PropertyType));
+        var getterClosedGenericMethod = _callPropertyGetterOpenGenericMethod.MakeGenericMethod(type, prop.PropertyType);
+        var getterDelegate = getterClosedGenericMethod.CreateDelegate<Func<object, object>>(getterAsFunc);
 
-        private static object CallPropertyGetter<TDeclaringType, TValue>(Func<TDeclaringType, TValue> getter, object target)
-            => getter((TDeclaringType)target);
+        return (Func<object, object>)getterDelegate;
     }
+
+    private static readonly MethodInfo _callPropertyGetterOpenGenericMethod =
+        typeof(LiquidTagHelperActivator).GetTypeInfo().GetDeclaredMethod(nameof(CallPropertyGetter));
+
+    private static object CallPropertyGetter<TDeclaringType, TValue>(Func<TDeclaringType, TValue> getter, object target)
+        => getter((TDeclaringType)target);
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TagHelpers/LiquidTagHelperFactory.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TagHelpers/LiquidTagHelperFactory.cs
index 117e0aa84f2..5887b2a89ec 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TagHelpers/LiquidTagHelperFactory.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TagHelpers/LiquidTagHelperFactory.cs
@@ -11,128 +11,127 @@
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.DisplayManagement.Liquid.TagHelpers
+namespace OrchardCore.DisplayManagement.Liquid.TagHelpers;
+
+/// <summary>
+/// Singleton containing shared state for tag helper tags.
+/// </summary>
+public class LiquidTagHelperFactory
 {
-    /// <summary>
-    /// Singleton containing shared state for tag helper tags.
-    /// </summary>
-    public class LiquidTagHelperFactory
-    {
-        private static readonly ConcurrentDictionary<Type, LiquidTagHelperMatching> _allMatchings = new();
-        private static readonly ConcurrentDictionary<Type, LiquidTagHelperActivator> _allActivators = new();
+    private static readonly ConcurrentDictionary<Type, LiquidTagHelperMatching> _allMatchings = new();
+    private static readonly ConcurrentDictionary<Type, LiquidTagHelperActivator> _allActivators = new();
+
+    private List<LiquidTagHelperMatching> _matchings;
+    private readonly ApplicationPartManager _partManager;
+    private readonly ITagHelperFactory _factory;
 
-        private List<LiquidTagHelperMatching> _matchings;
-        private readonly ApplicationPartManager _partManager;
-        private readonly ITagHelperFactory _factory;
+    public LiquidTagHelperFactory(ApplicationPartManager partManager, ITagHelperFactory factory)
+    {
+        _partManager = partManager;
+        _factory = factory;
+    }
 
-        public LiquidTagHelperFactory(ApplicationPartManager partManager, ITagHelperFactory factory)
+    private void EnsureMatchings()
+    {
+        if (_matchings != null)
         {
-            _partManager = partManager;
-            _factory = factory;
+            return;
         }
 
-        private void EnsureMatchings()
+        lock (this)
         {
-            if (_matchings != null)
+            if (_matchings == null)
             {
-                return;
-            }
+                var feature = new TagHelperFeature();
+                _partManager.PopulateFeature(feature);
 
-            lock (this)
-            {
-                if (_matchings == null)
+                var matchings = new List<LiquidTagHelperMatching>();
+
+                foreach (var tagHelper in feature.TagHelpers)
                 {
-                    var feature = new TagHelperFeature();
-                    _partManager.PopulateFeature(feature);
+                    var matching = _allMatchings.GetOrAdd(tagHelper.AsType(), type =>
+                    {
+                        var descriptorBuilder = TagHelperDescriptorBuilder.Create(
+                            type.FullName, type.Assembly.GetName().Name);
 
-                    var matchings = new List<LiquidTagHelperMatching>();
+                        descriptorBuilder.SetTypeName(type.FullName);
+                        AddTagMatchingRules(type, descriptorBuilder);
+                        var descriptor = descriptorBuilder.Build();
 
-                    foreach (var tagHelper in feature.TagHelpers)
-                    {
-                        var matching = _allMatchings.GetOrAdd(tagHelper.AsType(), type =>
-                        {
-                            var descriptorBuilder = TagHelperDescriptorBuilder.Create(
-                                type.FullName, type.Assembly.GetName().Name);
-
-                            descriptorBuilder.SetTypeName(type.FullName);
-                            AddTagMatchingRules(type, descriptorBuilder);
-                            var descriptor = descriptorBuilder.Build();
-
-                            return new LiquidTagHelperMatching(
-                                descriptor.Name,
-                                descriptor.AssemblyName,
-                                descriptor.TagMatchingRules
-                            );
-                        });
-
-                        matchings.Add(matching);
-                    }
-
-                    _matchings = matchings;
+                        return new LiquidTagHelperMatching(
+                            descriptor.Name,
+                            descriptor.AssemblyName,
+                            descriptor.TagMatchingRules
+                        );
+                    });
+
+                    matchings.Add(matching);
                 }
+
+                _matchings = matchings;
             }
         }
+    }
 
-        public LiquidTagHelperActivator GetActivator(string helper, IEnumerable<string> arguments)
+    public LiquidTagHelperActivator GetActivator(string helper, IEnumerable<string> arguments)
+    {
+        EnsureMatchings();
+        var matching = _matchings.FirstOrDefault(d => d.Match(helper, arguments)) ?? LiquidTagHelperMatching.None;
+
+        if (matching != LiquidTagHelperMatching.None)
         {
-            EnsureMatchings();
-            var matching = _matchings.FirstOrDefault(d => d.Match(helper, arguments)) ?? LiquidTagHelperMatching.None;
+            var tagHelperType = Type.GetType(matching.Name + ", " + matching.AssemblyName);
+            return _allActivators.GetOrAdd(tagHelperType, type => new LiquidTagHelperActivator(type));
+        }
 
-            if (matching != LiquidTagHelperMatching.None)
-            {
-                var tagHelperType = Type.GetType(matching.Name + ", " + matching.AssemblyName);
-                return _allActivators.GetOrAdd(tagHelperType, type => new LiquidTagHelperActivator(type));
-            }
+        return LiquidTagHelperActivator.None;
+    }
 
-            return LiquidTagHelperActivator.None;
-        }
+    public ITagHelper CreateTagHelper(LiquidTagHelperActivator activator, ViewContext context, FilterArguments arguments,
+        out TagHelperAttributeList contextAttributes, out TagHelperAttributeList outputAttributes)
+    {
+        return activator.Create(_factory, context, arguments, out contextAttributes, out outputAttributes);
+    }
 
-        public ITagHelper CreateTagHelper(LiquidTagHelperActivator activator, ViewContext context, FilterArguments arguments,
-            out TagHelperAttributeList contextAttributes, out TagHelperAttributeList outputAttributes)
-        {
-            return activator.Create(_factory, context, arguments, out contextAttributes, out outputAttributes);
-        }
+    private static void AddTagMatchingRules(Type type, TagHelperDescriptorBuilder descriptorBuilder)
+    {
+        var targetElementAttributes = type.GetCustomAttributes<HtmlTargetElementAttribute>();
 
-        private static void AddTagMatchingRules(Type type, TagHelperDescriptorBuilder descriptorBuilder)
+        // If there isn't an attribute specifying the tag name derive it from the name
+        if (!targetElementAttributes.Any())
         {
-            var targetElementAttributes = type.GetCustomAttributes<HtmlTargetElementAttribute>();
+            var name = type.Name;
 
-            // If there isn't an attribute specifying the tag name derive it from the name
-            if (!targetElementAttributes.Any())
+            if (name.EndsWith("TagHelper", StringComparison.OrdinalIgnoreCase))
             {
-                var name = type.Name;
-
-                if (name.EndsWith("TagHelper", StringComparison.OrdinalIgnoreCase))
-                {
-                    name = name[..^"TagHelper".Length];
-                }
+                name = name[..^"TagHelper".Length];
+            }
 
-                descriptorBuilder.TagMatchingRule(ruleBuilder =>
-                {
-                    var htmlCasedName = HtmlConventions.ToHtmlCase(name);
-                    ruleBuilder.TagName = htmlCasedName;
-                });
+            descriptorBuilder.TagMatchingRule(ruleBuilder =>
+            {
+                var htmlCasedName = HtmlConventions.ToHtmlCase(name);
+                ruleBuilder.TagName = htmlCasedName;
+            });
 
-                return;
-            }
+            return;
+        }
 
-            foreach (var targetElementAttribute in targetElementAttributes)
+        foreach (var targetElementAttribute in targetElementAttributes)
+        {
+            descriptorBuilder.TagMatchingRule(ruleBuilder =>
             {
-                descriptorBuilder.TagMatchingRule(ruleBuilder =>
-                {
-                    var tagName = targetElementAttribute.Tag;
-                    ruleBuilder.TagName = tagName;
+                var tagName = targetElementAttribute.Tag;
+                ruleBuilder.TagName = tagName;
 
-                    var parentTag = targetElementAttribute.ParentTag;
-                    ruleBuilder.ParentTag = parentTag;
+                var parentTag = targetElementAttribute.ParentTag;
+                ruleBuilder.ParentTag = parentTag;
 
-                    var tagStructure = targetElementAttribute.TagStructure;
-                    ruleBuilder.TagStructure = (Microsoft.AspNetCore.Razor.Language.TagStructure)tagStructure;
+                var tagStructure = targetElementAttribute.TagStructure;
+                ruleBuilder.TagStructure = (Microsoft.AspNetCore.Razor.Language.TagStructure)tagStructure;
 
-                    var requiredAttributeString = targetElementAttribute.Attributes;
-                    RequiredAttributeParser.AddRequiredAttributes(requiredAttributeString, ruleBuilder);
-                });
-            }
+                var requiredAttributeString = targetElementAttribute.Attributes;
+                RequiredAttributeParser.AddRequiredAttributes(requiredAttributeString, ruleBuilder);
+            });
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TagHelpers/LiquidTagHelperMatching.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TagHelpers/LiquidTagHelperMatching.cs
index 37aabe391ee..b75f8240f03 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TagHelpers/LiquidTagHelperMatching.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TagHelpers/LiquidTagHelperMatching.cs
@@ -3,89 +3,88 @@
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Language;
 
-namespace OrchardCore.DisplayManagement.Liquid.TagHelpers
+namespace OrchardCore.DisplayManagement.Liquid.TagHelpers;
+
+public class LiquidTagHelperMatching
 {
-    public class LiquidTagHelperMatching
+    private const string AspPrefix = "asp-";
+    public readonly static LiquidTagHelperMatching None = new();
+    public readonly TagMatchingRuleDescriptor[] _rules = [];
+
+    public LiquidTagHelperMatching()
     {
-        private const string AspPrefix = "asp-";
-        public readonly static LiquidTagHelperMatching None = new();
-        public readonly TagMatchingRuleDescriptor[] _rules = [];
+    }
 
-        public LiquidTagHelperMatching()
+    public LiquidTagHelperMatching(string name, string assemblyName, IEnumerable<TagMatchingRuleDescriptor> tagMatchingRules)
+    {
+        Name = name;
+        AssemblyName = assemblyName;
+        _rules = tagMatchingRules.ToArray();
+    }
+
+    public string Name { get; } = string.Empty;
+    public string AssemblyName { get; } = string.Empty;
+
+    private static bool Predicate(TagMatchingRuleDescriptor rule, string helper, IEnumerable<string> arguments)
+    {
+        // Does it match the required tag name
+        if (rule.TagName != "*" && !string.Equals(rule.TagName, helper, StringComparison.OrdinalIgnoreCase))
         {
+            return false;
         }
 
-        public LiquidTagHelperMatching(string name, string assemblyName, IEnumerable<TagMatchingRuleDescriptor> tagMatchingRules)
+        // Does it expect any specific attribute?
+        if (!rule.Attributes.Any())
         {
-            Name = name;
-            AssemblyName = assemblyName;
-            _rules = tagMatchingRules.ToArray();
+            return true;
         }
 
-        public string Name { get; } = string.Empty;
-        public string AssemblyName { get; } = string.Empty;
-
-        private static bool Predicate(TagMatchingRuleDescriptor rule, string helper, IEnumerable<string> arguments)
+        // Are all required attributes present?
+        var allRequired = rule.Attributes.All(attr => arguments.Any(name =>
         {
-            // Does it match the required tag name
-            if (rule.TagName != "*" && !string.Equals(rule.TagName, helper, StringComparison.OrdinalIgnoreCase))
+            // Exact match
+            if (string.Equals(name, attr.Name, StringComparison.OrdinalIgnoreCase))
             {
-                return false;
+                return true;
             }
 
-            // Does it expect any specific attribute?
-            if (!rule.Attributes.Any())
+            // Check by replacing all '_' with '-', e.g. asp_src will map to asp-src
+            name = name.Replace('_', '-');
+
+            if (string.Equals(name, attr.Name, StringComparison.OrdinalIgnoreCase))
             {
                 return true;
             }
 
-            // Are all required attributes present?
-            var allRequired = rule.Attributes.All(attr => arguments.Any(name =>
+            if (attr.Name.StartsWith(AspPrefix, StringComparison.Ordinal))
             {
-                // Exact match
-                if (string.Equals(name, attr.Name, StringComparison.OrdinalIgnoreCase))
+                if (name.AsSpan().Equals(attr.Name.AsSpan(AspPrefix.Length), StringComparison.OrdinalIgnoreCase))
                 {
                     return true;
                 }
-
-                // Check by replacing all '_' with '-', e.g. asp_src will map to asp-src
-                name = name.Replace('_', '-');
-
-                if (string.Equals(name, attr.Name, StringComparison.OrdinalIgnoreCase))
-                {
-                    return true;
-                }
-
-                if (attr.Name.StartsWith(AspPrefix, StringComparison.Ordinal))
-                {
-                    if (name.AsSpan().Equals(attr.Name.AsSpan(AspPrefix.Length), StringComparison.OrdinalIgnoreCase))
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
-            }));
-
-            if (allRequired)
-            {
-                return true;
             }
 
             return false;
+        }));
+
+        if (allRequired)
+        {
+            return true;
         }
 
-        public bool Match(string helper, IEnumerable<string> arguments)
+        return false;
+    }
+
+    public bool Match(string helper, IEnumerable<string> arguments)
+    {
+        foreach (var rule in _rules)
         {
-            foreach (var rule in _rules)
+            if (Predicate(rule, helper, arguments))
             {
-                if (Predicate(rule, helper, arguments))
-                {
-                    return true;
-                }
+                return true;
             }
-
-            return false;
         }
+
+        return false;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TagHelpers/RequiredAttributeParser.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TagHelpers/RequiredAttributeParser.cs
index a4051068560..ef896ffb0e4 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TagHelpers/RequiredAttributeParser.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TagHelpers/RequiredAttributeParser.cs
@@ -3,300 +3,299 @@
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Language;
 
-namespace OrchardCore.DisplayManagement.Liquid.TagHelpers
+namespace OrchardCore.DisplayManagement.Liquid.TagHelpers;
+
+// Internal for testing
+internal static class RequiredAttributeParser
 {
-    // Internal for testing
-    internal static class RequiredAttributeParser
+    public static void AddRequiredAttributes(string requiredAttributes, TagMatchingRuleDescriptorBuilder ruleBuilder)
     {
-        public static void AddRequiredAttributes(string requiredAttributes, TagMatchingRuleDescriptorBuilder ruleBuilder)
-        {
-            var requiredAttributeParser = new DefaultRequiredAttributeParser(requiredAttributes);
-            requiredAttributeParser.AddRequiredAttributes(ruleBuilder);
-        }
+        var requiredAttributeParser = new DefaultRequiredAttributeParser(requiredAttributes);
+        requiredAttributeParser.AddRequiredAttributes(ruleBuilder);
+    }
 
-        private sealed class DefaultRequiredAttributeParser
-        {
-            private const char RequiredAttributeWildcardSuffix = '*';
+    private sealed class DefaultRequiredAttributeParser
+    {
+        private const char RequiredAttributeWildcardSuffix = '*';
 
-            private static readonly Dictionary<char, RequiredAttributeDescriptor.ValueComparisonMode> _cssValueComparisons =
-                new()
-                {
-                    { '=', RequiredAttributeDescriptor.ValueComparisonMode.FullMatch },
-                    { '^', RequiredAttributeDescriptor.ValueComparisonMode.PrefixMatch },
-                    { '$', RequiredAttributeDescriptor.ValueComparisonMode.SuffixMatch },
-                };
+        private static readonly Dictionary<char, RequiredAttributeDescriptor.ValueComparisonMode> _cssValueComparisons =
+            new()
+            {
+                { '=', RequiredAttributeDescriptor.ValueComparisonMode.FullMatch },
+                { '^', RequiredAttributeDescriptor.ValueComparisonMode.PrefixMatch },
+                { '$', RequiredAttributeDescriptor.ValueComparisonMode.SuffixMatch },
+            };
 
-            private static readonly char[] _invalidPlainAttributeNameCharacters = [' ', '\t', ',', RequiredAttributeWildcardSuffix];
+        private static readonly char[] _invalidPlainAttributeNameCharacters = [' ', '\t', ',', RequiredAttributeWildcardSuffix];
 
-            private static readonly char[] _invalidCssAttributeNameCharacters = (new[] { ' ', '\t', ',', ']' })
-                .Concat(_cssValueComparisons.Keys)
-                .ToArray();
+        private static readonly char[] _invalidCssAttributeNameCharacters = (new[] { ' ', '\t', ',', ']' })
+            .Concat(_cssValueComparisons.Keys)
+            .ToArray();
 
-            private static readonly char[] _invalidCssQuotelessValueCharacters = [' ', '\t', ']'];
+        private static readonly char[] _invalidCssQuotelessValueCharacters = [' ', '\t', ']'];
 
-            private int _index;
-            private readonly string _requiredAttributes;
+        private int _index;
+        private readonly string _requiredAttributes;
 
-            public DefaultRequiredAttributeParser(string requiredAttributes)
-            {
-                _requiredAttributes = requiredAttributes;
-            }
+        public DefaultRequiredAttributeParser(string requiredAttributes)
+        {
+            _requiredAttributes = requiredAttributes;
+        }
 
-            private char Current => _requiredAttributes[_index];
+        private char Current => _requiredAttributes[_index];
 
-            private bool AtEnd => _index >= _requiredAttributes.Length;
+        private bool AtEnd => _index >= _requiredAttributes.Length;
 
-            public void AddRequiredAttributes(TagMatchingRuleDescriptorBuilder ruleBuilder)
+        public void AddRequiredAttributes(TagMatchingRuleDescriptorBuilder ruleBuilder)
+        {
+            if (string.IsNullOrEmpty(_requiredAttributes))
             {
-                if (string.IsNullOrEmpty(_requiredAttributes))
-                {
-                    return;
-                }
+                return;
+            }
 
-                PassOptionalWhitespace();
+            PassOptionalWhitespace();
 
-                do
+            do
+            {
+                var successfulParse = true;
+                ruleBuilder.Attribute(attributeBuilder =>
                 {
-                    var successfulParse = true;
-                    ruleBuilder.Attribute(attributeBuilder =>
+                    if (At('['))
                     {
-                        if (At('['))
-                        {
-                            if (!TryParseCssSelector(attributeBuilder))
-                            {
-                                successfulParse = false;
-                                return;
-                            }
-                        }
-                        else
+                        if (!TryParseCssSelector(attributeBuilder))
                         {
-                            ParsePlainSelector(attributeBuilder);
+                            successfulParse = false;
+                            return;
                         }
+                    }
+                    else
+                    {
+                        ParsePlainSelector(attributeBuilder);
+                    }
 
-                        PassOptionalWhitespace();
+                    PassOptionalWhitespace();
 
-                        if (At(','))
-                        {
-                            _index++;
+                    if (At(','))
+                    {
+                        _index++;
 
-                            if (!EnsureNotAtEnd(attributeBuilder))
-                            {
-                                successfulParse = false;
-                                return;
-                            }
-                        }
-                        else if (!AtEnd)
+                        if (!EnsureNotAtEnd(attributeBuilder))
                         {
-                            // var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidRequiredAttributeCharacter(Current, _requiredAttributes);
-                            // attributeBuilder.Diagnostics.Add(diagnostic);
                             successfulParse = false;
                             return;
                         }
-
-                        PassOptionalWhitespace();
-                    });
-
-                    if (!successfulParse)
+                    }
+                    else if (!AtEnd)
                     {
-                        break;
+                        // var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidRequiredAttributeCharacter(Current, _requiredAttributes);
+                        // attributeBuilder.Diagnostics.Add(diagnostic);
+                        successfulParse = false;
+                        return;
                     }
-                }
-                while (!AtEnd);
-            }
 
-            private void ParsePlainSelector(RequiredAttributeDescriptorBuilder attributeBuilder)
-            {
-                var nameEndIndex = _requiredAttributes.IndexOfAny(_invalidPlainAttributeNameCharacters, _index);
-                string attributeName;
+                    PassOptionalWhitespace();
+                });
 
-                var nameComparison = RequiredAttributeDescriptor.NameComparisonMode.FullMatch;
-                if (nameEndIndex == -1)
+                if (!successfulParse)
                 {
-                    attributeName = _requiredAttributes[_index..];
-                    _index = _requiredAttributes.Length;
+                    break;
                 }
-                else
-                {
-                    attributeName = _requiredAttributes[_index..nameEndIndex];
-                    _index = nameEndIndex;
-
-                    if (_requiredAttributes[nameEndIndex] == RequiredAttributeWildcardSuffix)
-                    {
-                        nameComparison = RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch;
+            }
+            while (!AtEnd);
+        }
 
-                        // Move past wild card
-                        _index++;
-                    }
-                }
+        private void ParsePlainSelector(RequiredAttributeDescriptorBuilder attributeBuilder)
+        {
+            var nameEndIndex = _requiredAttributes.IndexOfAny(_invalidPlainAttributeNameCharacters, _index);
+            string attributeName;
 
-                attributeBuilder.Name = attributeName;
-                attributeBuilder.NameComparisonMode = nameComparison;
+            var nameComparison = RequiredAttributeDescriptor.NameComparisonMode.FullMatch;
+            if (nameEndIndex == -1)
+            {
+                attributeName = _requiredAttributes[_index..];
+                _index = _requiredAttributes.Length;
             }
-
-            private void ParseCssAttributeName(RequiredAttributeDescriptorBuilder builder)
+            else
             {
-                var nameStartIndex = _index;
-                var nameEndIndex = _requiredAttributes.IndexOfAny(_invalidCssAttributeNameCharacters, _index);
-                nameEndIndex = nameEndIndex == -1 ? _requiredAttributes.Length : nameEndIndex;
+                attributeName = _requiredAttributes[_index..nameEndIndex];
                 _index = nameEndIndex;
 
-                var attributeName = _requiredAttributes[nameStartIndex..nameEndIndex];
+                if (_requiredAttributes[nameEndIndex] == RequiredAttributeWildcardSuffix)
+                {
+                    nameComparison = RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch;
 
-                builder.Name = attributeName;
+                    // Move past wild card
+                    _index++;
+                }
             }
 
-            private bool TryParseCssValueComparison(RequiredAttributeDescriptorBuilder builder, out RequiredAttributeDescriptor.ValueComparisonMode valueComparison)
+            attributeBuilder.Name = attributeName;
+            attributeBuilder.NameComparisonMode = nameComparison;
+        }
+
+        private void ParseCssAttributeName(RequiredAttributeDescriptorBuilder builder)
+        {
+            var nameStartIndex = _index;
+            var nameEndIndex = _requiredAttributes.IndexOfAny(_invalidCssAttributeNameCharacters, _index);
+            nameEndIndex = nameEndIndex == -1 ? _requiredAttributes.Length : nameEndIndex;
+            _index = nameEndIndex;
+
+            var attributeName = _requiredAttributes[nameStartIndex..nameEndIndex];
+
+            builder.Name = attributeName;
+        }
+
+        private bool TryParseCssValueComparison(RequiredAttributeDescriptorBuilder builder, out RequiredAttributeDescriptor.ValueComparisonMode valueComparison)
+        {
+            Debug.Assert(!AtEnd);
+
+            if (_cssValueComparisons.TryGetValue(Current, out valueComparison))
             {
-                Debug.Assert(!AtEnd);
+                var op = Current;
+                _index++;
 
-                if (_cssValueComparisons.TryGetValue(Current, out valueComparison))
+                if (op != '=' && At('='))
                 {
-                    var op = Current;
+                    // Two length operator (ex: ^=). Move past the second piece
                     _index++;
-
-                    if (op != '=' && At('='))
-                    {
-                        // Two length operator (ex: ^=). Move past the second piece
-                        _index++;
-                    }
-                    else if (op != '=') // We're at an incomplete operator (ex: [foo^]
-                    {
-                        // var diagnostic = RazorDiagnosticFactory.CreateTagHelper_PartialRequiredAttributeOperator(op, _requiredAttributes);
-                        // builder.Diagnostics.Add(diagnostic);
-
-                        return false;
-                    }
                 }
-                else if (!At(']'))
+                else if (op != '=') // We're at an incomplete operator (ex: [foo^]
                 {
-                    // var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidRequiredAttributeOperator(Current, _requiredAttributes);
+                    // var diagnostic = RazorDiagnosticFactory.CreateTagHelper_PartialRequiredAttributeOperator(op, _requiredAttributes);
                     // builder.Diagnostics.Add(diagnostic);
 
                     return false;
                 }
-
-                builder.ValueComparisonMode = valueComparison;
-
-                return true;
             }
-
-            private bool TryParseCssValue(RequiredAttributeDescriptorBuilder builder)
+            else if (!At(']'))
             {
-                int valueStart;
-                int valueEnd;
-                if (At('\'') || At('"'))
-                {
-                    var quote = Current;
+                // var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidRequiredAttributeOperator(Current, _requiredAttributes);
+                // builder.Diagnostics.Add(diagnostic);
 
-                    // Move past the quote
-                    _index++;
+                return false;
+            }
 
-                    valueStart = _index;
-                    valueEnd = _requiredAttributes.IndexOf(quote, _index);
-                    if (valueEnd == -1)
-                    {
-                        // var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidRequiredAttributeMismatchedQuotes(quote, _requiredAttributes);
-                        // builder.Diagnostics.Add(diagnostic);
+            builder.ValueComparisonMode = valueComparison;
 
-                        return false;
-                    }
-                    _index = valueEnd + 1;
-                }
-                else
-                {
-                    valueStart = _index;
-                    var valueEndIndex = _requiredAttributes.IndexOfAny(_invalidCssQuotelessValueCharacters, _index);
-                    valueEnd = valueEndIndex == -1 ? _requiredAttributes.Length : valueEndIndex;
-                    _index = valueEnd;
-                }
+            return true;
+        }
 
-                var value = _requiredAttributes[valueStart..valueEnd];
+        private bool TryParseCssValue(RequiredAttributeDescriptorBuilder builder)
+        {
+            int valueStart;
+            int valueEnd;
+            if (At('\'') || At('"'))
+            {
+                var quote = Current;
 
-                builder.Value = value;
+                // Move past the quote
+                _index++;
 
-                return true;
-            }
+                valueStart = _index;
+                valueEnd = _requiredAttributes.IndexOf(quote, _index);
+                if (valueEnd == -1)
+                {
+                    // var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidRequiredAttributeMismatchedQuotes(quote, _requiredAttributes);
+                    // builder.Diagnostics.Add(diagnostic);
 
-            private bool TryParseCssSelector(RequiredAttributeDescriptorBuilder attributeBuilder)
+                    return false;
+                }
+                _index = valueEnd + 1;
+            }
+            else
             {
-                Debug.Assert(At('['));
+                valueStart = _index;
+                var valueEndIndex = _requiredAttributes.IndexOfAny(_invalidCssQuotelessValueCharacters, _index);
+                valueEnd = valueEndIndex == -1 ? _requiredAttributes.Length : valueEndIndex;
+                _index = valueEnd;
+            }
 
-                // Move past '['.
-                _index++;
-                PassOptionalWhitespace();
+            var value = _requiredAttributes[valueStart..valueEnd];
 
-                ParseCssAttributeName(attributeBuilder);
+            builder.Value = value;
 
-                PassOptionalWhitespace();
+            return true;
+        }
 
-                if (!EnsureNotAtEnd(attributeBuilder))
-                {
-                    return false;
-                }
+        private bool TryParseCssSelector(RequiredAttributeDescriptorBuilder attributeBuilder)
+        {
+            Debug.Assert(At('['));
 
-                if (!TryParseCssValueComparison(attributeBuilder, out var valueComparison))
-                {
-                    return false;
-                }
+            // Move past '['.
+            _index++;
+            PassOptionalWhitespace();
 
-                PassOptionalWhitespace();
+            ParseCssAttributeName(attributeBuilder);
 
-                if (!EnsureNotAtEnd(attributeBuilder))
-                {
-                    return false;
-                }
+            PassOptionalWhitespace();
 
-                if (valueComparison != RequiredAttributeDescriptor.ValueComparisonMode.None && !TryParseCssValue(attributeBuilder))
-                {
-                    return false;
-                }
+            if (!EnsureNotAtEnd(attributeBuilder))
+            {
+                return false;
+            }
 
-                PassOptionalWhitespace();
+            if (!TryParseCssValueComparison(attributeBuilder, out var valueComparison))
+            {
+                return false;
+            }
 
-                if (At(']'))
-                {
-                    // Move past the ending bracket.
-                    _index++;
-                    return true;
-                }
-                else if (AtEnd)
-                {
-                    // var diagnostic = RazorDiagnosticFactory.CreateTagHelper_CouldNotFindMatchingEndBrace(_requiredAttributes);
-                    // attributeBuilder.Diagnostics.Add(diagnostic);
-                }
-                else
-                {
-                    // var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidRequiredAttributeCharacter(Current, _requiredAttributes);
-                    // attributeBuilder.Diagnostics.Add(diagnostic);
-                }
+            PassOptionalWhitespace();
 
+            if (!EnsureNotAtEnd(attributeBuilder))
+            {
                 return false;
             }
 
-            private bool EnsureNotAtEnd(RequiredAttributeDescriptorBuilder _)
+            if (valueComparison != RequiredAttributeDescriptor.ValueComparisonMode.None && !TryParseCssValue(attributeBuilder))
             {
-                if (AtEnd)
-                {
-                    // var diagnostic = RazorDiagnosticFactory.CreateTagHelper_CouldNotFindMatchingEndBrace(_requiredAttributes);
-                    // builder.Diagnostics.Add(diagnostic);
+                return false;
+            }
 
-                    return false;
-                }
+            PassOptionalWhitespace();
 
+            if (At(']'))
+            {
+                // Move past the ending bracket.
+                _index++;
                 return true;
             }
+            else if (AtEnd)
+            {
+                // var diagnostic = RazorDiagnosticFactory.CreateTagHelper_CouldNotFindMatchingEndBrace(_requiredAttributes);
+                // attributeBuilder.Diagnostics.Add(diagnostic);
+            }
+            else
+            {
+                // var diagnostic = RazorDiagnosticFactory.CreateTagHelper_InvalidRequiredAttributeCharacter(Current, _requiredAttributes);
+                // attributeBuilder.Diagnostics.Add(diagnostic);
+            }
+
+            return false;
+        }
 
-            private bool At(char c)
+        private bool EnsureNotAtEnd(RequiredAttributeDescriptorBuilder _)
+        {
+            if (AtEnd)
             {
-                return !AtEnd && Current == c;
+                // var diagnostic = RazorDiagnosticFactory.CreateTagHelper_CouldNotFindMatchingEndBrace(_requiredAttributes);
+                // builder.Diagnostics.Add(diagnostic);
+
+                return false;
             }
 
-            private void PassOptionalWhitespace()
+            return true;
+        }
+
+        private bool At(char c)
+        {
+            return !AtEnd && Current == c;
+        }
+
+        private void PassOptionalWhitespace()
+        {
+            while (!AtEnd && (Current == ' ' || Current == '\t'))
             {
-                while (!AtEnd && (Current == ' ' || Current == '\t'))
-                {
-                    _index++;
-                }
+                _index++;
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AddAlternatesTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AddAlternatesTag.cs
index 526387a4fc5..223a7d9f4ef 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AddAlternatesTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AddAlternatesTag.cs
@@ -6,37 +6,36 @@
 using Fluid.Ast;
 using Fluid.Values;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class AddAlternatesTag
 {
-    public class AddAlternatesTag
+    public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, Expression> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, Expression> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
+        var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
+
+        if (objectValue is IShape shape)
         {
-            var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
+            var alternates = await arguments.Item2.EvaluateAsync(context);
 
-            if (objectValue is IShape shape)
+            if (alternates.Type == FluidValues.String)
             {
-                var alternates = await arguments.Item2.EvaluateAsync(context);
+                var values = alternates.ToStringValue().Split(' ', StringSplitOptions.RemoveEmptyEntries);
 
-                if (alternates.Type == FluidValues.String)
+                foreach (var value in values)
                 {
-                    var values = alternates.ToStringValue().Split(' ', StringSplitOptions.RemoveEmptyEntries);
-
-                    foreach (var value in values)
-                    {
-                        shape.Metadata.Alternates.Add(value);
-                    }
+                    shape.Metadata.Alternates.Add(value);
                 }
-                else if (alternates.Type == FluidValues.Array)
+            }
+            else if (alternates.Type == FluidValues.Array)
+            {
+                foreach (var value in alternates.Enumerate(context))
                 {
-                    foreach (var value in alternates.Enumerate(context))
-                    {
-                        shape.Metadata.Alternates.Add(value.ToStringValue());
-                    }
+                    shape.Metadata.Alternates.Add(value.ToStringValue());
                 }
             }
-
-            return Completion.Normal;
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AddAttributesTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AddAttributesTag.cs
index 71cdc977dfd..764e31ea349 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AddAttributesTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AddAttributesTag.cs
@@ -6,25 +6,24 @@
 using Fluid;
 using Fluid.Ast;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class AddAttributesTag
 {
-    public class AddAttributesTag
+    public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, IReadOnlyList<FilterArgument>> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, IReadOnlyList<FilterArgument>> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
+        var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
+
+        if (objectValue is IShape shape)
         {
-            var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
+            var attributes = arguments.Item2;
 
-            if (objectValue is IShape shape)
+            foreach (var attribute in attributes)
             {
-                var attributes = arguments.Item2;
-
-                foreach (var attribute in attributes)
-                {
-                    shape.Attributes[attribute.Name.Replace('_', '-')] = (await attribute.Expression.EvaluateAsync(context)).ToStringValue();
-                }
+                shape.Attributes[attribute.Name.Replace('_', '-')] = (await attribute.Expression.EvaluateAsync(context)).ToStringValue();
             }
-
-            return Completion.Normal;
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AddClassesTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AddClassesTag.cs
index d28eb915efa..12ab0b260be 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AddClassesTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AddClassesTag.cs
@@ -6,37 +6,36 @@
 using Fluid.Ast;
 using Fluid.Values;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class AddClassesTag
 {
-    public class AddClassesTag
+    public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, Expression> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, Expression> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
+        var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
+
+        if (objectValue is IShape shape)
         {
-            var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
+            var classes = await arguments.Item2.EvaluateAsync(context);
 
-            if (objectValue is IShape shape)
+            if (classes.Type == FluidValues.String)
             {
-                var classes = await arguments.Item2.EvaluateAsync(context);
+                var values = classes.ToStringValue().Split(' ', StringSplitOptions.RemoveEmptyEntries);
 
-                if (classes.Type == FluidValues.String)
+                foreach (var value in values)
                 {
-                    var values = classes.ToStringValue().Split(' ', StringSplitOptions.RemoveEmptyEntries);
-
-                    foreach (var value in values)
-                    {
-                        shape.Classes.Add(value);
-                    }
+                    shape.Classes.Add(value);
                 }
-                else if (classes.Type == FluidValues.Array)
+            }
+            else if (classes.Type == FluidValues.Array)
+            {
+                foreach (var value in classes.Enumerate(context))
                 {
-                    foreach (var value in classes.Enumerate(context))
-                    {
-                        shape.Classes.Add(value.ToStringValue());
-                    }
+                    shape.Classes.Add(value.ToStringValue());
                 }
             }
-
-            return Completion.Normal;
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AddWrappersTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AddWrappersTag.cs
index aba42dd2a58..e26d0ec3f9c 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AddWrappersTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AddWrappersTag.cs
@@ -6,37 +6,36 @@
 using Fluid.Ast;
 using Fluid.Values;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class AddWrappersTag
 {
-    public class AddWrappersTag
+    public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, Expression> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, Expression> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
+        var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
+
+        if (objectValue is IShape shape)
         {
-            var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
+            var wrappers = (await arguments.Item2.EvaluateAsync(context));
 
-            if (objectValue is IShape shape)
+            if (wrappers.Type == FluidValues.String)
             {
-                var wrappers = (await arguments.Item2.EvaluateAsync(context));
+                var values = wrappers.ToStringValue().Split(' ', StringSplitOptions.RemoveEmptyEntries);
 
-                if (wrappers.Type == FluidValues.String)
+                foreach (var value in values)
                 {
-                    var values = wrappers.ToStringValue().Split(' ', StringSplitOptions.RemoveEmptyEntries);
-
-                    foreach (var value in values)
-                    {
-                        shape.Metadata.Wrappers.Add(value);
-                    }
+                    shape.Metadata.Wrappers.Add(value);
                 }
-                else if (wrappers.Type == FluidValues.Array)
+            }
+            else if (wrappers.Type == FluidValues.Array)
+            {
+                foreach (var value in wrappers.Enumerate(context))
                 {
-                    foreach (var value in wrappers.Enumerate(context))
-                    {
-                        shape.Metadata.Wrappers.Add(value.ToStringValue());
-                    }
+                    shape.Metadata.Wrappers.Add(value.ToStringValue());
                 }
             }
-
-            return Completion.Normal;
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AnchorTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AnchorTag.cs
index 126213657e2..140924120a6 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AnchorTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AnchorTag.cs
@@ -11,184 +11,183 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class AnchorTag : IAnchorTag
 {
-    public class AnchorTag : IAnchorTag
+    public int Order => 0;
+
+    public bool Match(IReadOnlyList<FilterArgument> argumentsList)
     {
-        public int Order => 0;
+        return true;
+    }
 
-        public bool Match(IReadOnlyList<FilterArgument> argumentsList)
+    public async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, LiquidTemplateContext context)
+    {
+        var services = context.Services;
+        var viewContext = context.ViewContext;
+        var generator = services.GetRequiredService<IHtmlGenerator>();
+
+        string action = null;
+        string controller = null;
+        string area = null;
+        string page = null;
+        string pageHandler = null;
+        string fragment = null;
+        string host = null;
+        string protocol = null;
+        string route = null;
+        string href = null;
+
+        Dictionary<string, string> routeValues = null;
+        Dictionary<string, string> customAttributes = null;
+
+        foreach (var argument in argumentsList)
         {
-            return true;
+            switch (argument.Name)
+            {
+                case "action": action = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "controller": controller = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "area": area = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "page": page = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "page_handler": pageHandler = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "fragment": fragment = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "host": host = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "protocol": protocol = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "route": route = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+
+                case "all_route_data":
+
+                    var allRouteData = (await argument.Expression.EvaluateAsync(context)).ToObjectValue();
+
+                    if (allRouteData is Dictionary<string, string> allRouteValues)
+                    {
+                        routeValues = allRouteValues;
+                    }
+
+                    break;
+
+                case "href": href = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+
+                default:
+
+                    if (argument.Name.StartsWith("route_"))
+                    {
+                        routeValues ??= [];
+                        routeValues[argument.Name[6..]] = (await argument.Expression.EvaluateAsync(context)).ToStringValue();
+                    }
+                    else
+                    {
+                        customAttributes ??= [];
+                        customAttributes[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToStringValue();
+                    }
+
+                    break;
+            }
         }
 
-        public async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, LiquidTemplateContext context)
+        // If "href" is already set, it means the user is attempting to use a normal anchor.
+        if (!string.IsNullOrEmpty(href))
         {
-            var services = context.Services;
-            var viewContext = context.ViewContext;
-            var generator = services.GetRequiredService<IHtmlGenerator>();
-
-            string action = null;
-            string controller = null;
-            string area = null;
-            string page = null;
-            string pageHandler = null;
-            string fragment = null;
-            string host = null;
-            string protocol = null;
-            string route = null;
-            string href = null;
-
-            Dictionary<string, string> routeValues = null;
-            Dictionary<string, string> customAttributes = null;
-
-            foreach (var argument in argumentsList)
+            if (action != null ||
+                controller != null ||
+                area != null ||
+                page != null ||
+                pageHandler != null ||
+                route != null ||
+                protocol != null ||
+                host != null ||
+                fragment != null ||
+                (routeValues != null && routeValues.Count > 0))
             {
-                switch (argument.Name)
-                {
-                    case "action": action = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "controller": controller = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "area": area = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "page": page = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "page_handler": pageHandler = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "fragment": fragment = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "host": host = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "protocol": protocol = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "route": route = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-
-                    case "all_route_data":
-
-                        var allRouteData = (await argument.Expression.EvaluateAsync(context)).ToObjectValue();
-
-                        if (allRouteData is Dictionary<string, string> allRouteValues)
-                        {
-                            routeValues = allRouteValues;
-                        }
-
-                        break;
-
-                    case "href": href = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-
-                    default:
-
-                        if (argument.Name.StartsWith("route_"))
-                        {
-                            routeValues ??= [];
-                            routeValues[argument.Name[6..]] = (await argument.Expression.EvaluateAsync(context)).ToStringValue();
-                        }
-                        else
-                        {
-                            customAttributes ??= [];
-                            customAttributes[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToStringValue();
-                        }
-
-                        break;
-                }
+                // User specified an href and one of the bound attributes; can't determine the href attribute.
+                throw new InvalidOperationException("Cannot override href with other properties");
             }
 
-            // If "href" is already set, it means the user is attempting to use a normal anchor.
-            if (!string.IsNullOrEmpty(href))
-            {
-                if (action != null ||
-                    controller != null ||
-                    area != null ||
-                    page != null ||
-                    pageHandler != null ||
-                    route != null ||
-                    protocol != null ||
-                    host != null ||
-                    fragment != null ||
-                    (routeValues != null && routeValues.Count > 0))
-                {
-                    // User specified an href and one of the bound attributes; can't determine the href attribute.
-                    throw new InvalidOperationException("Cannot override href with other properties");
-                }
-
-                return Completion.Normal;
-            }
+            return Completion.Normal;
+        }
 
-            var routeLink = route != null;
-            var actionLink = controller != null || action != null;
-            var pageLink = page != null || pageHandler != null;
+        var routeLink = route != null;
+        var actionLink = controller != null || action != null;
+        var pageLink = page != null || pageHandler != null;
 
-            if ((routeLink && actionLink) || (routeLink && pageLink) || (actionLink && pageLink))
-            {
-                throw new InvalidOperationException("Format of the link cannot be determined based on the available argument of the a tag");
-            }
+        if ((routeLink && actionLink) || (routeLink && pageLink) || (actionLink && pageLink))
+        {
+            throw new InvalidOperationException("Format of the link cannot be determined based on the available argument of the a tag");
+        }
 
-            RouteValueDictionary localRouteValues = null;
-            if (routeValues != null && routeValues.Count > 0)
-            {
-                localRouteValues = new RouteValueDictionary(routeValues);
-            }
+        RouteValueDictionary localRouteValues = null;
+        if (routeValues != null && routeValues.Count > 0)
+        {
+            localRouteValues = new RouteValueDictionary(routeValues);
+        }
 
-            if (area != null)
-            {
-                // Unconditionally replace any value from asp-route-area.
-                localRouteValues ??= [];
-                localRouteValues["area"] = area;
-            }
+        if (area != null)
+        {
+            // Unconditionally replace any value from asp-route-area.
+            localRouteValues ??= [];
+            localRouteValues["area"] = area;
+        }
 
-            TagBuilder tagBuilder;
-            if (pageLink)
-            {
-                tagBuilder = generator.GeneratePageLink(
-                    viewContext,
-                    linkText: string.Empty,
-                    pageName: page,
-                    pageHandler: pageHandler,
-                    protocol: protocol,
-                    hostname: host,
-                    fragment: fragment,
-                    routeValues: localRouteValues,
-                    htmlAttributes: null);
-            }
-            else if (routeLink)
-            {
-                tagBuilder = generator.GenerateRouteLink(
-                    viewContext,
-                    linkText: string.Empty,
-                    routeName: route,
-                    protocol: protocol,
-                    hostName: host,
-                    fragment: fragment,
-                    routeValues: localRouteValues,
-                    htmlAttributes: null);
-            }
-            else
-            {
-                tagBuilder = generator.GenerateActionLink(
-                   viewContext,
-                   linkText: string.Empty,
-                   actionName: action,
-                   controllerName: controller,
-                   protocol: protocol,
-                   hostname: host,
-                   fragment: fragment,
-                   routeValues: localRouteValues,
-                   htmlAttributes: null);
-            }
+        TagBuilder tagBuilder;
+        if (pageLink)
+        {
+            tagBuilder = generator.GeneratePageLink(
+                viewContext,
+                linkText: string.Empty,
+                pageName: page,
+                pageHandler: pageHandler,
+                protocol: protocol,
+                hostname: host,
+                fragment: fragment,
+                routeValues: localRouteValues,
+                htmlAttributes: null);
+        }
+        else if (routeLink)
+        {
+            tagBuilder = generator.GenerateRouteLink(
+                viewContext,
+                linkText: string.Empty,
+                routeName: route,
+                protocol: protocol,
+                hostName: host,
+                fragment: fragment,
+                routeValues: localRouteValues,
+                htmlAttributes: null);
+        }
+        else
+        {
+            tagBuilder = generator.GenerateActionLink(
+               viewContext,
+               linkText: string.Empty,
+               actionName: action,
+               controllerName: controller,
+               protocol: protocol,
+               hostname: host,
+               fragment: fragment,
+               routeValues: localRouteValues,
+               htmlAttributes: null);
+        }
 
-            foreach (var attribute in customAttributes)
-            {
-                tagBuilder.Attributes[attribute.Key] = attribute.Value;
-            }
+        foreach (var attribute in customAttributes)
+        {
+            tagBuilder.Attributes[attribute.Key] = attribute.Value;
+        }
 
-            tagBuilder.RenderStartTag().WriteTo(writer, (HtmlEncoder)encoder);
+        tagBuilder.RenderStartTag().WriteTo(writer, (HtmlEncoder)encoder);
 
-            if (statements != null && statements.Count > 0)
-            {
-                var completion = await statements.RenderStatementsAsync(writer, encoder, context);
+        if (statements != null && statements.Count > 0)
+        {
+            var completion = await statements.RenderStatementsAsync(writer, encoder, context);
 
-                if (completion != Completion.Normal)
-                {
-                    return completion;
-                }
+            if (completion != Completion.Normal)
+            {
+                return completion;
             }
+        }
 
-            tagBuilder.RenderEndTag().WriteTo(writer, (HtmlEncoder)encoder);
+        tagBuilder.RenderEndTag().WriteTo(writer, (HtmlEncoder)encoder);
 
-            return Completion.Normal;
-        }
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AntiForgeryTokenTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AntiForgeryTokenTag.cs
index bc8a5a63391..0ae7c5148f2 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AntiForgeryTokenTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/AntiForgeryTokenTag.cs
@@ -8,27 +8,26 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class AntiForgeryTokenTag
 {
-    public class AntiForgeryTokenTag
+    public static ValueTask<Completion> WriteToAsync(TextWriter writer, TextEncoder encoder, TemplateContext context)
     {
-        public static ValueTask<Completion> WriteToAsync(TextWriter writer, TextEncoder encoder, TemplateContext context)
-        {
-            var services = ((LiquidTemplateContext)context).Services;
+        var services = ((LiquidTemplateContext)context).Services;
 
-            var antiforgery = services.GetRequiredService<IAntiforgery>();
-            var httpContextAccessor = services.GetRequiredService<IHttpContextAccessor>();
+        var antiforgery = services.GetRequiredService<IAntiforgery>();
+        var httpContextAccessor = services.GetRequiredService<IHttpContextAccessor>();
 
-            var httpContext = httpContextAccessor.HttpContext;
-            var tokenSet = antiforgery.GetAndStoreTokens(httpContext);
+        var httpContext = httpContextAccessor.HttpContext;
+        var tokenSet = antiforgery.GetAndStoreTokens(httpContext);
 
-            writer.Write("<input name=\"");
-            writer.Write(encoder.Encode(tokenSet.FormFieldName));
-            writer.Write("\" type=\"hidden\" value=\"");
-            writer.Write(encoder.Encode(tokenSet.RequestToken));
-            writer.Write("\" />");
+        writer.Write("<input name=\"");
+        writer.Write(encoder.Encode(tokenSet.FormFieldName));
+        writer.Write("\" type=\"hidden\" value=\"");
+        writer.Write(encoder.Encode(tokenSet.RequestToken));
+        writer.Write("\" />");
 
-            return new ValueTask<Completion>(Completion.Normal);
-        }
+        return new ValueTask<Completion>(Completion.Normal);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ClearAlternatesTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ClearAlternatesTag.cs
index 7f2c9af26d9..b874fb362a8 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ClearAlternatesTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ClearAlternatesTag.cs
@@ -4,20 +4,19 @@
 using Fluid;
 using Fluid.Ast;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class ClearAlternatesTag
 {
-    public class ClearAlternatesTag
+    public static async ValueTask<Completion> WriteToAsync(Expression expression, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(Expression expression, TextWriter _1, TextEncoder _2, TemplateContext context)
-        {
-            var objectValue = (await expression.EvaluateAsync(context)).ToObjectValue();
-
-            if (objectValue is IShape shape && shape.Metadata.Alternates.Count > 0)
-            {
-                shape.Metadata.Alternates.Clear();
-            }
+        var objectValue = (await expression.EvaluateAsync(context)).ToObjectValue();
 
-            return Completion.Normal;
+        if (objectValue is IShape shape && shape.Metadata.Alternates.Count > 0)
+        {
+            shape.Metadata.Alternates.Clear();
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ClearAttributesTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ClearAttributesTag.cs
index b4492140eb4..ff2d7d1eac3 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ClearAttributesTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ClearAttributesTag.cs
@@ -4,20 +4,19 @@
 using Fluid;
 using Fluid.Ast;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class ClearAttributesTag
 {
-    public class ClearAttributesTag
+    public static async ValueTask<Completion> WriteToAsync(Expression expression, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(Expression expression, TextWriter _1, TextEncoder _2, TemplateContext context)
-        {
-            var objectValue = (await expression.EvaluateAsync(context)).ToObjectValue();
-
-            if (objectValue is IShape shape && shape.Attributes.Count > 0)
-            {
-                shape.Attributes.Clear();
-            }
+        var objectValue = (await expression.EvaluateAsync(context)).ToObjectValue();
 
-            return Completion.Normal;
+        if (objectValue is IShape shape && shape.Attributes.Count > 0)
+        {
+            shape.Attributes.Clear();
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ClearClassesTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ClearClassesTag.cs
index 2060509dc22..d53a43b3bbe 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ClearClassesTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ClearClassesTag.cs
@@ -4,20 +4,19 @@
 using Fluid;
 using Fluid.Ast;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class ClearClassesTag
 {
-    public class ClearClassesTag
+    public static async ValueTask<Completion> WriteToAsync(Expression expression, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(Expression expression, TextWriter _1, TextEncoder _2, TemplateContext context)
-        {
-            var objectValue = (await expression.EvaluateAsync(context)).ToObjectValue();
-
-            if (objectValue is IShape shape && shape.Classes.Count > 0)
-            {
-                shape.Classes.Clear();
-            }
+        var objectValue = (await expression.EvaluateAsync(context)).ToObjectValue();
 
-            return Completion.Normal;
+        if (objectValue is IShape shape && shape.Classes.Count > 0)
+        {
+            shape.Classes.Clear();
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ClearWrappersTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ClearWrappersTag.cs
index 98f9ec58f95..bc8d00054b0 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ClearWrappersTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ClearWrappersTag.cs
@@ -4,20 +4,19 @@
 using Fluid;
 using Fluid.Ast;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class ClearWrappers
 {
-    public class ClearWrappers
+    public static async ValueTask<Completion> WriteToAsync(Expression expression, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(Expression expression, TextWriter _1, TextEncoder _2, TemplateContext context)
-        {
-            var objectValue = (await expression.EvaluateAsync(context)).ToObjectValue();
-
-            if (objectValue is IShape shape)
-            {
-                shape.Metadata.Wrappers.Clear();
-            }
+        var objectValue = (await expression.EvaluateAsync(context)).ToObjectValue();
 
-            return Completion.Normal;
+        if (objectValue is IShape shape)
+        {
+            shape.Metadata.Wrappers.Clear();
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/DefaultAnchorTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/DefaultAnchorTag.cs
index 6a586036171..f93bb6c3e2a 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/DefaultAnchorTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/DefaultAnchorTag.cs
@@ -8,24 +8,23 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class DefaultAnchorTag
 {
-    public class DefaultAnchorTag
+    public static ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, TemplateContext context)
     {
-        public static ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, TemplateContext context)
-        {
-            var services = ((LiquidTemplateContext)context).Services;
-            var anchorTags = services.GetRequiredService<IEnumerable<IAnchorTag>>();
+        var services = ((LiquidTemplateContext)context).Services;
+        var anchorTags = services.GetRequiredService<IEnumerable<IAnchorTag>>();
 
-            foreach (var anchorTag in anchorTags.OrderBy(x => x.Order))
+        foreach (var anchorTag in anchorTags.OrderBy(x => x.Order))
+        {
+            if (anchorTag.Match(argumentsList))
             {
-                if (anchorTag.Match(argumentsList))
-                {
-                    return anchorTag.WriteToAsync(argumentsList, statements, writer, encoder, (LiquidTemplateContext)context);
-                }
+                return anchorTag.WriteToAsync(argumentsList, statements, writer, encoder, (LiquidTemplateContext)context);
             }
-
-            return new ValueTask<Completion>(Completion.Normal);
         }
+
+        return new ValueTask<Completion>(Completion.Normal);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/FluidTagHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/FluidTagHelper.cs
index 2c6c74d30b8..43541f02d50 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/FluidTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/FluidTagHelper.cs
@@ -10,105 +10,104 @@
 using OrchardCore.DisplayManagement.Liquid.TagHelpers;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public static class FluidTagHelper
 {
-    public static class FluidTagHelper
-    {
-        public static readonly Dictionary<string, string> DefaultArgumentsMapping = [];
-        private static long _uniqueId;
+    public static readonly Dictionary<string, string> DefaultArgumentsMapping = [];
+    private static long _uniqueId;
 
-        public static ValueTask<Completion> WriteArgumentsTagHelperAsync(IReadOnlyList<FilterArgument> arguments, TextWriter writer, TextEncoder encoder, TemplateContext context)
-        {
-            return WriteToAsync(null, arguments, [], writer, encoder, context);
-        }
+    public static ValueTask<Completion> WriteArgumentsTagHelperAsync(IReadOnlyList<FilterArgument> arguments, TextWriter writer, TextEncoder encoder, TemplateContext context)
+    {
+        return WriteToAsync(null, arguments, [], writer, encoder, context);
+    }
 
-        public static ValueTask<Completion> WriteArgumentsBlockHelperAsync(IReadOnlyList<FilterArgument> arguments, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, TemplateContext context)
-        {
-            return WriteToAsync(null, arguments, statements, writer, encoder, context);
-        }
+    public static ValueTask<Completion> WriteArgumentsBlockHelperAsync(IReadOnlyList<FilterArgument> arguments, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, TemplateContext context)
+    {
+        return WriteToAsync(null, arguments, statements, writer, encoder, context);
+    }
 
-        public static async ValueTask<Completion> WriteToAsync(string identifier, IReadOnlyList<FilterArgument> arguments, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, TemplateContext context)
-        {
-            var services = ((LiquidTemplateContext)context).Services;
+    public static async ValueTask<Completion> WriteToAsync(string identifier, IReadOnlyList<FilterArgument> arguments, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, TemplateContext context)
+    {
+        var services = ((LiquidTemplateContext)context).Services;
 
-            var viewContextAccessor = services.GetRequiredService<ViewContextAccessor>();
-            var viewContext = viewContextAccessor.ViewContext;
+        var viewContextAccessor = services.GetRequiredService<ViewContextAccessor>();
+        var viewContext = viewContextAccessor.ViewContext;
 
-            // If no identifier is set, use the first argument as the name of the tag helper
-            // e.g., {% helper "input", for: "Text", class: "form-control" %}
+        // If no identifier is set, use the first argument as the name of the tag helper
+        // e.g., {% helper "input", for: "Text", class: "form-control" %}
 
-            identifier ??= (await arguments[0].Expression.EvaluateAsync(context)).ToStringValue();
+        identifier ??= (await arguments[0].Expression.EvaluateAsync(context)).ToStringValue();
 
-            // These mapping will assign an argument name to the first element in the filter arguments,
-            // such that the tag helper can be matched based on the expected attribute names.
-            if (DefaultArgumentsMapping.TryGetValue(identifier, out var mapping))
+        // These mapping will assign an argument name to the first element in the filter arguments,
+        // such that the tag helper can be matched based on the expected attribute names.
+        if (DefaultArgumentsMapping.TryGetValue(identifier, out var mapping))
+        {
+            var args = new List<FilterArgument>(arguments)
             {
-                var args = new List<FilterArgument>(arguments)
-                {
-                    [0] = new FilterArgument(mapping, arguments[0].Expression)
-                };
+                [0] = new FilterArgument(mapping, arguments[0].Expression)
+            };
 
-                arguments = args;
-            }
+            arguments = args;
+        }
 
-            var filterArguments = new FilterArguments();
-            foreach (var argument in arguments)
-            {
-                filterArguments.Add(argument.Name, await argument.Expression.EvaluateAsync(context));
-            }
+        var filterArguments = new FilterArguments();
+        foreach (var argument in arguments)
+        {
+            filterArguments.Add(argument.Name, await argument.Expression.EvaluateAsync(context));
+        }
 
-            var factory = services.GetRequiredService<LiquidTagHelperFactory>();
-            var activator = factory.GetActivator(identifier, filterArguments.Names);
+        var factory = services.GetRequiredService<LiquidTagHelperFactory>();
+        var activator = factory.GetActivator(identifier, filterArguments.Names);
 
-            if (activator == LiquidTagHelperActivator.None)
-            {
-                return Completion.Normal;
-            }
+        if (activator == LiquidTagHelperActivator.None)
+        {
+            return Completion.Normal;
+        }
 
-            var tagHelper = factory.CreateTagHelper(activator, viewContext,
-                filterArguments, out var contextAttributes, out var outputAttributes);
+        var tagHelper = factory.CreateTagHelper(activator, viewContext,
+            filterArguments, out var contextAttributes, out var outputAttributes);
 
-            ViewBufferTextWriterContent content = null;
+        ViewBufferTextWriterContent content = null;
 
-            if (statements != null && statements.Count > 0)
-            {
-                content = new ViewBufferTextWriterContent();
+        if (statements != null && statements.Count > 0)
+        {
+            content = new ViewBufferTextWriterContent();
 
-                var completion = await statements.RenderStatementsAsync(content, encoder, context);
+            var completion = await statements.RenderStatementsAsync(content, encoder, context);
 
-                if (completion != Completion.Normal)
-                {
-                    return completion;
-                }
+            if (completion != Completion.Normal)
+            {
+                return completion;
             }
+        }
 
-            Interlocked.CompareExchange(ref _uniqueId, long.MaxValue, 0);
-            var id = Interlocked.Increment(ref _uniqueId);
+        Interlocked.CompareExchange(ref _uniqueId, long.MaxValue, 0);
+        var id = Interlocked.Increment(ref _uniqueId);
 
-            var tagHelperContext = new TagHelperContext(contextAttributes, new Dictionary<object, object>(), id.ToString());
+        var tagHelperContext = new TagHelperContext(contextAttributes, new Dictionary<object, object>(), id.ToString());
 
-            TagHelperOutput tagHelperOutput = null;
+        TagHelperOutput tagHelperOutput = null;
 
-            if (content != null)
-            {
-                tagHelperOutput = new TagHelperOutput(
-                    identifier,
-                    outputAttributes, (_, e) => Task.FromResult(new DefaultTagHelperContent().AppendHtml(content))
-                );
-                tagHelperOutput.Content.AppendHtml(content);
-            }
-            else
-            {
-                tagHelperOutput = new TagHelperOutput(
-                    identifier,
-                    outputAttributes, (_, e) => Task.FromResult<TagHelperContent>(new DefaultTagHelperContent())
-                );
-            }
+        if (content != null)
+        {
+            tagHelperOutput = new TagHelperOutput(
+                identifier,
+                outputAttributes, (_, e) => Task.FromResult(new DefaultTagHelperContent().AppendHtml(content))
+            );
+            tagHelperOutput.Content.AppendHtml(content);
+        }
+        else
+        {
+            tagHelperOutput = new TagHelperOutput(
+                identifier,
+                outputAttributes, (_, e) => Task.FromResult<TagHelperContent>(new DefaultTagHelperContent())
+            );
+        }
 
-            await tagHelper.ProcessAsync(tagHelperContext, tagHelperOutput);
-            tagHelperOutput.WriteTo(writer, (HtmlEncoder)encoder);
+        await tagHelper.ProcessAsync(tagHelperContext, tagHelperOutput);
+        tagHelperOutput.WriteTo(writer, (HtmlEncoder)encoder);
 
-            return Completion.Normal;
-        }
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/HttpContextAddItemTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/HttpContextAddItemTag.cs
index 537fcc880a5..4f215ddb903 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/HttpContextAddItemTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/HttpContextAddItemTag.cs
@@ -8,24 +8,23 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class HttpContextAddItemTag
 {
-    public class HttpContextAddItemTag
+    public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> expressions, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> expressions, TextWriter _1, TextEncoder _2, TemplateContext context)
-        {
-            var services = ((LiquidTemplateContext)context).Services;
+        var services = ((LiquidTemplateContext)context).Services;
 
-            var httpContext = services.GetRequiredService<IHttpContextAccessor>()?.HttpContext;
+        var httpContext = services.GetRequiredService<IHttpContextAccessor>()?.HttpContext;
 
-            if (httpContext != null)
+        if (httpContext != null)
+        {
+            foreach (var argument in expressions)
             {
-                foreach (var argument in expressions)
-                {
-                    httpContext.Items[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToObjectValue();
-                }
+                httpContext.Items[argument.Name] = (await argument.Expression.EvaluateAsync(context)).ToObjectValue();
             }
-            return Completion.Normal;
         }
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/HttpContextRemoveItemTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/HttpContextRemoveItemTag.cs
index e60d7282a96..370a421f67c 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/HttpContextRemoveItemTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/HttpContextRemoveItemTag.cs
@@ -7,27 +7,26 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class HttpContextRemoveItemTag
 {
-    public class HttpContextRemoveItemTag
+    public static async ValueTask<Completion> WriteToAsync(Expression argument, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(Expression argument, TextWriter _1, TextEncoder _2, TemplateContext context)
-        {
-            var services = ((LiquidTemplateContext)context).Services;
+        var services = ((LiquidTemplateContext)context).Services;
 
-            var httpContext = services.GetRequiredService<IHttpContextAccessor>()?.HttpContext;
-
-            if (httpContext != null)
-            {
-                var itemKey = (await argument.EvaluateAsync(context)).ToStringValue();
+        var httpContext = services.GetRequiredService<IHttpContextAccessor>()?.HttpContext;
 
-                if (!string.IsNullOrEmpty(itemKey))
-                {
-                    httpContext.Items.Remove(itemKey);
-                }
+        if (httpContext != null)
+        {
+            var itemKey = (await argument.EvaluateAsync(context)).ToStringValue();
 
+            if (!string.IsNullOrEmpty(itemKey))
+            {
+                httpContext.Items.Remove(itemKey);
             }
-            return Completion.Normal;
+
         }
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/IAnchorTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/IAnchorTag.cs
index d30da350ca6..08c3f66046e 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/IAnchorTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/IAnchorTag.cs
@@ -5,14 +5,13 @@
 using Fluid.Ast;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public interface IAnchorTag
 {
-    public interface IAnchorTag
-    {
-        bool Match(IReadOnlyList<FilterArgument> argumentsList);
+    bool Match(IReadOnlyList<FilterArgument> argumentsList);
 
-        ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, LiquidTemplateContext context);
+    ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, IReadOnlyList<Statement> statements, TextWriter writer, TextEncoder encoder, LiquidTemplateContext context);
 
-        int Order { get; }
-    }
+    int Order { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/LayoutTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/LayoutTag.cs
index 71b7cd9a914..8e71c3b3cd4 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/LayoutTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/LayoutTag.cs
@@ -7,23 +7,22 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class LayoutTag
 {
-    public class LayoutTag
+    public static async ValueTask<Completion> WriteToAsync(Expression expression, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(Expression expression, TextWriter _1, TextEncoder _2, TemplateContext context)
-        {
-            var services = ((LiquidTemplateContext)context).Services;
-
-            var viewContextAccessor = services.GetRequiredService<ViewContextAccessor>();
-            var viewContext = viewContextAccessor.ViewContext;
+        var services = ((LiquidTemplateContext)context).Services;
 
-            if (viewContext.View is RazorView razorView && razorView.RazorPage is Razor.IRazorPage razorPage)
-            {
-                razorPage.ViewLayout = (await expression.EvaluateAsync(context)).ToStringValue();
-            }
+        var viewContextAccessor = services.GetRequiredService<ViewContextAccessor>();
+        var viewContext = viewContextAccessor.ViewContext;
 
-            return Completion.Normal;
+        if (viewContext.View is RazorView razorView && razorView.RazorPage is Razor.IRazorPage razorPage)
+        {
+            razorPage.ViewLayout = (await expression.EvaluateAsync(context)).ToStringValue();
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/RenderBodyTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/RenderBodyTag.cs
index ca94fd5ec41..57ebc8a6391 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/RenderBodyTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/RenderBodyTag.cs
@@ -7,21 +7,20 @@
 using OrchardCore.DisplayManagement.Layout;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class RenderBodyTag
 {
-    public class RenderBodyTag
+    public static async ValueTask<Completion> WriteToAsync(TextWriter writer, TextEncoder encoder, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(TextWriter writer, TextEncoder encoder, TemplateContext context)
-        {
-            var services = ((LiquidTemplateContext)context).Services;
+        var services = ((LiquidTemplateContext)context).Services;
 
-            var layout = await services.GetRequiredService<ILayoutAccessor>().GetLayoutAsync();
-            var displayHelper = services.GetRequiredService<IDisplayHelper>();
+        var layout = await services.GetRequiredService<ILayoutAccessor>().GetLayoutAsync();
+        var displayHelper = services.GetRequiredService<IDisplayHelper>();
 
-            var htmlContent = await displayHelper.ShapeExecuteAsync(layout.Zones["Content"]);
+        var htmlContent = await displayHelper.ShapeExecuteAsync(layout.Zones["Content"]);
 
-            htmlContent.WriteTo(writer, (HtmlEncoder)encoder);
-            return Completion.Normal;
-        }
+        htmlContent.WriteTo(writer, (HtmlEncoder)encoder);
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/RenderSectionTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/RenderSectionTag.cs
index 3284e170ad0..5751d5f18f0 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/RenderSectionTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/RenderSectionTag.cs
@@ -9,41 +9,40 @@
 using OrchardCore.DisplayManagement.Layout;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class RenderSectionTag
 {
-    public class RenderSectionTag
+    public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, TextWriter writer, TextEncoder encoder, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, TextWriter writer, TextEncoder encoder, TemplateContext context)
-        {
-            var services = ((LiquidTemplateContext)context).Services;
+        var services = ((LiquidTemplateContext)context).Services;
 
-            var layout = await services.GetRequiredService<ILayoutAccessor>().GetLayoutAsync();
-            var displayHelper = services.GetRequiredService<IDisplayHelper>();
+        var layout = await services.GetRequiredService<ILayoutAccessor>().GetLayoutAsync();
+        var displayHelper = services.GetRequiredService<IDisplayHelper>();
 
-            var arguments = new NamedExpressionList(argumentsList);
+        var arguments = new NamedExpressionList(argumentsList);
 
-            var nameExpression = arguments["name", 0] ?? throw new ArgumentException("render_section tag requires a name argument");
-            var name = (await nameExpression.EvaluateAsync(context)).ToStringValue();
+        var nameExpression = arguments["name", 0] ?? throw new ArgumentException("render_section tag requires a name argument");
+        var name = (await nameExpression.EvaluateAsync(context)).ToStringValue();
 
-            var requiredExpression = arguments["required", 1];
-            var required = requiredExpression != null && (await requiredExpression.EvaluateAsync(context)).ToBooleanValue();
+        var requiredExpression = arguments["required", 1];
+        var required = requiredExpression != null && (await requiredExpression.EvaluateAsync(context)).ToBooleanValue();
 
-            var zone = layout.Zones[name];
+        var zone = layout.Zones[name];
 
-            if (zone.IsNullOrEmpty())
+        if (zone.IsNullOrEmpty())
+        {
+            if (required)
             {
-                if (required)
-                {
-                    throw new InvalidOperationException("Zone not found while invoking 'render_section': " + name);
-                }
-
-                return Completion.Normal;
+                throw new InvalidOperationException("Zone not found while invoking 'render_section': " + name);
             }
 
-            var htmlContent = await displayHelper.ShapeExecuteAsync(zone);
-            htmlContent.WriteTo(writer, (HtmlEncoder)encoder);
-
             return Completion.Normal;
         }
+
+        var htmlContent = await displayHelper.ShapeExecuteAsync(zone);
+        htmlContent.WriteTo(writer, (HtmlEncoder)encoder);
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/RenderTitleSegmentsTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/RenderTitleSegmentsTag.cs
index 1bb33213ef3..8134b6d93f4 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/RenderTitleSegmentsTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/RenderTitleSegmentsTag.cs
@@ -10,30 +10,29 @@
 using OrchardCore.DisplayManagement.Title;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class RenderTitleSegmentsTag
 {
-    public class RenderTitleSegmentsTag
+    public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, TextWriter writer, TextEncoder encoder, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, TextWriter writer, TextEncoder encoder, TemplateContext context)
-        {
-            var services = ((LiquidTemplateContext)context).Services;
+        var services = ((LiquidTemplateContext)context).Services;
 
-            var arguments = new NamedExpressionList(argumentsList);
+        var arguments = new NamedExpressionList(argumentsList);
 
-            var titleBuilder = services.GetRequiredService<IPageTitleBuilder>();
+        var titleBuilder = services.GetRequiredService<IPageTitleBuilder>();
 
-            var segmentExpression = arguments["segment", 0] ?? throw new ArgumentException("page_title tag requires a segment argument");
-            var segment = (await segmentExpression.EvaluateAsync(context)).ToStringValue();
+        var segmentExpression = arguments["segment", 0] ?? throw new ArgumentException("page_title tag requires a segment argument");
+        var segment = (await segmentExpression.EvaluateAsync(context)).ToStringValue();
 
-            var positionExpression = arguments["position", 1];
-            var position = positionExpression == null ? "0" : (await positionExpression.EvaluateAsync(context)).ToStringValue();
+        var positionExpression = arguments["position", 1];
+        var position = positionExpression == null ? "0" : (await positionExpression.EvaluateAsync(context)).ToStringValue();
 
-            var separatorExpression = arguments["separator", 2];
-            var separator = separatorExpression == null ? null : new HtmlString((await separatorExpression.EvaluateAsync(context)).ToStringValue());
+        var separatorExpression = arguments["separator", 2];
+        var separator = separatorExpression == null ? null : new HtmlString((await separatorExpression.EvaluateAsync(context)).ToStringValue());
 
-            titleBuilder.AddSegment(new HtmlString(segment), position);
-            titleBuilder.GenerateTitle(separator).WriteTo(writer, (HtmlEncoder)encoder);
-            return Completion.Normal;
-        }
+        titleBuilder.AddSegment(new HtmlString(segment), position);
+        titleBuilder.GenerateTitle(separator).WriteTo(writer, (HtmlEncoder)encoder);
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeAddPropertyTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeAddPropertyTag.cs
index 032a89f9f2b..441a379b746 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeAddPropertyTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeAddPropertyTag.cs
@@ -7,25 +7,24 @@
 using Fluid.Ast;
 using OrchardCore.Mvc.Utilities;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class ShapeAddPropertyTag
 {
-    public class ShapeAddPropertyTag
+    public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, IReadOnlyList<FilterArgument>> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, IReadOnlyList<FilterArgument>> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
+        var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
+
+        if (objectValue is IShape shape)
         {
-            var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
+            var attributes = arguments.Item2;
 
-            if (objectValue is IShape shape)
+            foreach (var property in attributes)
             {
-                var attributes = arguments.Item2;
-
-                foreach (var property in attributes)
-                {
-                    shape.Properties[property.Name.ToPascalCaseUnderscore()] = (await property.Expression.EvaluateAsync(context)).ToObjectValue();
-                }
+                shape.Properties[property.Name.ToPascalCaseUnderscore()] = (await property.Expression.EvaluateAsync(context)).ToObjectValue();
             }
-
-            return Completion.Normal;
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeCacheTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeCacheTag.cs
index da9583fb4d8..5a44216af24 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeCacheTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeCacheTag.cs
@@ -6,57 +6,56 @@
 using Fluid;
 using Fluid.Ast;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class ShapeCacheTag
 {
-    public class ShapeCacheTag
+    private static readonly char[] _separators = [',', ' '];
+
+    public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, IReadOnlyList<FilterArgument>> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        private static readonly char[] _separators = [',', ' '];
+        var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
 
-        public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, IReadOnlyList<FilterArgument>> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
+        if (objectValue is IShape shape)
         {
-            var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
-
-            if (objectValue is IShape shape)
-            {
-                var expressions = new NamedExpressionList(arguments.Item2);
+            var expressions = new NamedExpressionList(arguments.Item2);
 
-                var metadata = shape.Metadata;
+            var metadata = shape.Metadata;
 
-                if (expressions.HasNamed("cache_id"))
-                {
-                    metadata.Cache((await expressions["cache_id"].EvaluateAsync(context)).ToStringValue());
-                }
+            if (expressions.HasNamed("cache_id"))
+            {
+                metadata.Cache((await expressions["cache_id"].EvaluateAsync(context)).ToStringValue());
+            }
 
-                if (expressions.HasNamed("cache_context"))
-                {
-                    var contexts = (await expressions["cache_context"].EvaluateAsync(context)).ToStringValue().Split(_separators, StringSplitOptions.RemoveEmptyEntries);
-                    metadata.Cache().AddContext(contexts);
-                }
+            if (expressions.HasNamed("cache_context"))
+            {
+                var contexts = (await expressions["cache_context"].EvaluateAsync(context)).ToStringValue().Split(_separators, StringSplitOptions.RemoveEmptyEntries);
+                metadata.Cache().AddContext(contexts);
+            }
 
-                if (expressions.HasNamed("cache_tag"))
-                {
-                    var tags = (await expressions["cache_tag"].EvaluateAsync(context)).ToStringValue().Split(_separators, StringSplitOptions.RemoveEmptyEntries);
-                    metadata.Cache().AddTag(tags);
-                }
+            if (expressions.HasNamed("cache_tag"))
+            {
+                var tags = (await expressions["cache_tag"].EvaluateAsync(context)).ToStringValue().Split(_separators, StringSplitOptions.RemoveEmptyEntries);
+                metadata.Cache().AddTag(tags);
+            }
 
-                if (expressions.HasNamed("cache_fixed_duration"))
+            if (expressions.HasNamed("cache_fixed_duration"))
+            {
+                if (TimeSpan.TryParse((await expressions["cache_fixed_duration"].EvaluateAsync(context)).ToStringValue(), out var timespan))
                 {
-                    if (TimeSpan.TryParse((await expressions["cache_fixed_duration"].EvaluateAsync(context)).ToStringValue(), out var timespan))
-                    {
-                        metadata.Cache().WithExpiryAfter(timespan);
-                    }
+                    metadata.Cache().WithExpiryAfter(timespan);
                 }
+            }
 
-                if (expressions.HasNamed("cache_sliding_duration"))
+            if (expressions.HasNamed("cache_sliding_duration"))
+            {
+                if (TimeSpan.TryParse((await expressions["cache_sliding_duration"].EvaluateAsync(context)).ToStringValue(), out var timespan))
                 {
-                    if (TimeSpan.TryParse((await expressions["cache_sliding_duration"].EvaluateAsync(context)).ToStringValue(), out var timespan))
-                    {
-                        metadata.Cache().WithExpirySliding(timespan);
-                    }
+                    metadata.Cache().WithExpirySliding(timespan);
                 }
             }
-
-            return Completion.Normal;
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeDisplayTypeTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeDisplayTypeTag.cs
index 557e919ffeb..7d8fa737c00 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeDisplayTypeTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeDisplayTypeTag.cs
@@ -5,21 +5,20 @@
 using Fluid;
 using Fluid.Ast;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class ShapeDisplayTypeTag
 {
-    public class ShapeDisplayTypeTag
+    public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, Expression> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, Expression> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
-        {
-            var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
-
-            if (objectValue is IShape shape)
-            {
-                var shapeDisplayType = (await arguments.Item2.EvaluateAsync(context)).ToStringValue();
-                shape.Metadata.DisplayType = shapeDisplayType;
-            }
+        var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
 
-            return Completion.Normal;
+        if (objectValue is IShape shape)
+        {
+            var shapeDisplayType = (await arguments.Item2.EvaluateAsync(context)).ToStringValue();
+            shape.Metadata.DisplayType = shapeDisplayType;
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapePagerTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapePagerTag.cs
index 6bfcd064592..056c0f2f60b 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapePagerTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapePagerTag.cs
@@ -10,119 +10,118 @@
 using OrchardCore.DisplayManagement.Shapes;
 using OrchardCore.Mvc.Utilities;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class ShapePagerTag
 {
-    public class ShapePagerTag
+    private static readonly HashSet<string> _properties =
+    [
+        "Id",
+        "PreviousText",
+        "NextText",
+        "PreviousClass",
+        "NextClass",
+        "TagName",
+        "ItemTagName"
+    ];
+
+    public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, IReadOnlyList<FilterArgument>> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        private static readonly HashSet<string> _properties =
-        [
-            "Id",
-            "PreviousText",
-            "NextText",
-            "PreviousClass",
-            "NextClass",
-            "TagName",
-            "ItemTagName"
-        ];
-
-        public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, IReadOnlyList<FilterArgument>> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
-        {
-            var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue() as dynamic;
+        var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue() as dynamic;
 
-            if (objectValue is Shape shape)
+        if (objectValue is Shape shape)
+        {
+            if (shape.Metadata.Type == "PagerSlim")
             {
-                if (shape.Metadata.Type == "PagerSlim")
+                foreach (var argument in arguments.Item2)
                 {
-                    foreach (var argument in arguments.Item2)
-                    {
-                        var propertyName = argument.Name.ToPascalCaseUnderscore();
+                    var propertyName = argument.Name.ToPascalCaseUnderscore();
 
-                        if (_properties.Contains(propertyName))
-                        {
-                            objectValue[propertyName] = (await argument.Expression.EvaluateAsync(context)).ToStringValue();
-                        }
+                    if (_properties.Contains(propertyName))
+                    {
+                        objectValue[propertyName] = (await argument.Expression.EvaluateAsync(context)).ToStringValue();
                     }
                 }
+            }
 
-                var expressions = new NamedExpressionList(arguments.Item2);
+            var expressions = new NamedExpressionList(arguments.Item2);
 
-                if (shape.Metadata.Type == "PagerSlim" || shape.Metadata.Type == "Pager")
+            if (shape.Metadata.Type == "PagerSlim" || shape.Metadata.Type == "Pager")
+            {
+                if (expressions.HasNamed("item_classes"))
                 {
-                    if (expressions.HasNamed("item_classes"))
+                    var itemClasses = await expressions["item_classes"].EvaluateAsync(context);
+
+                    if (itemClasses.Type == FluidValues.String)
                     {
-                        var itemClasses = await expressions["item_classes"].EvaluateAsync(context);
+                        var values = itemClasses.ToStringValue().Split(' ', StringSplitOptions.RemoveEmptyEntries);
 
-                        if (itemClasses.Type == FluidValues.String)
+                        foreach (var value in values)
                         {
-                            var values = itemClasses.ToStringValue().Split(' ', StringSplitOptions.RemoveEmptyEntries);
-
-                            foreach (var value in values)
-                            {
-                                objectValue.ItemClasses.Add(value);
-                            }
+                            objectValue.ItemClasses.Add(value);
                         }
-                        else if (itemClasses.Type == FluidValues.Array)
+                    }
+                    else if (itemClasses.Type == FluidValues.Array)
+                    {
+                        foreach (var value in itemClasses.Enumerate(context))
                         {
-                            foreach (var value in itemClasses.Enumerate(context))
-                            {
-                                objectValue.ItemClasses.Add(value.ToStringValue());
-                            }
+                            objectValue.ItemClasses.Add(value.ToStringValue());
                         }
                     }
+                }
 
-                    if (expressions.HasNamed("classes"))
+                if (expressions.HasNamed("classes"))
+                {
+                    var classes = await expressions["classes"].EvaluateAsync(context);
+
+                    if (classes.Type == FluidValues.String)
                     {
-                        var classes = await expressions["classes"].EvaluateAsync(context);
+                        var values = classes.ToStringValue().Split(' ', StringSplitOptions.RemoveEmptyEntries);
 
-                        if (classes.Type == FluidValues.String)
+                        foreach (var value in values)
                         {
-                            var values = classes.ToStringValue().Split(' ', StringSplitOptions.RemoveEmptyEntries);
-
-                            foreach (var value in values)
-                            {
-                                objectValue.Classes.Add(value);
-                            }
+                            objectValue.Classes.Add(value);
                         }
-                        else if (classes.Type == FluidValues.Array)
+                    }
+                    else if (classes.Type == FluidValues.Array)
+                    {
+                        foreach (var value in classes.Enumerate(context))
                         {
-                            foreach (var value in classes.Enumerate(context))
-                            {
-                                objectValue.Classes.Add(value.ToStringValue());
-                            }
+                            objectValue.Classes.Add(value.ToStringValue());
                         }
                     }
+                }
 
-                    if (expressions.HasNamed("attributes"))
-                    {
-                        var attributes = await expressions["attributes"].EvaluateAsync(context);
+                if (expressions.HasNamed("attributes"))
+                {
+                    var attributes = await expressions["attributes"].EvaluateAsync(context);
 
-                        if (attributes.Type == FluidValues.String)
+                    if (attributes.Type == FluidValues.String)
+                    {
+                        var values = JConvert.DeserializeObject<Dictionary<string, string>>(attributes.ToStringValue());
+                        foreach (var value in values)
                         {
-                            var values = JConvert.DeserializeObject<Dictionary<string, string>>(attributes.ToStringValue());
-                            foreach (var value in values)
-                            {
-                                objectValue.Attributes.TryAdd(value.Key, value.Value);
-                            }
+                            objectValue.Attributes.TryAdd(value.Key, value.Value);
                         }
                     }
+                }
 
-                    if (expressions.HasNamed("item_attributes"))
-                    {
-                        var itemAttributes = await expressions["item_attributes"].EvaluateAsync(context);
+                if (expressions.HasNamed("item_attributes"))
+                {
+                    var itemAttributes = await expressions["item_attributes"].EvaluateAsync(context);
 
-                        if (itemAttributes.Type == FluidValues.String)
+                    if (itemAttributes.Type == FluidValues.String)
+                    {
+                        var values = JConvert.DeserializeObject<Dictionary<string, string>>(itemAttributes.ToStringValue());
+                        foreach (var value in values)
                         {
-                            var values = JConvert.DeserializeObject<Dictionary<string, string>>(itemAttributes.ToStringValue());
-                            foreach (var value in values)
-                            {
-                                objectValue.ItemAttributes.TryAdd(value.Key, value.Value);
-                            }
+                            objectValue.ItemAttributes.TryAdd(value.Key, value.Value);
                         }
                     }
                 }
             }
-
-            return Completion.Normal;
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapePositionTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapePositionTag.cs
index 1a5c3db03f9..28776ab17d2 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapePositionTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapePositionTag.cs
@@ -5,22 +5,21 @@
 using Fluid;
 using Fluid.Ast;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class ShapePositionTag
 {
-    public class ShapePositionTag
+    public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, Expression> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, Expression> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
-        {
-            var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
-
-            if (objectValue is IShape shape)
-            {
-                var position = (await arguments.Item2.EvaluateAsync(context)).ToStringValue();
-                shape.Metadata.Position = position;
-            }
+        var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
 
-            return Completion.Normal;
+        if (objectValue is IShape shape)
+        {
+            var position = (await arguments.Item2.EvaluateAsync(context)).ToStringValue();
+            shape.Metadata.Position = position;
         }
 
+        return Completion.Normal;
     }
+
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeRemoveItemTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeRemoveItemTag.cs
index eb7e5a93f61..c2545cc0f60 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeRemoveItemTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeRemoveItemTag.cs
@@ -6,21 +6,20 @@
 using Fluid.Ast;
 using OrchardCore.DisplayManagement.Shapes;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class ShapeRemoveItemTag
 {
-    public class ShapeRemoveItemTag
+    public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, Expression> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, Expression> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
-        {
-            var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
-
-            if (objectValue is Shape shape && shape.Items != null)
-            {
-                var shapeName = (await arguments.Item2.EvaluateAsync(context)).ToStringValue();
-                shape.Remove(shapeName);
-            }
+        var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
 
-            return Completion.Normal;
+        if (objectValue is Shape shape && shape.Items != null)
+        {
+            var shapeName = (await arguments.Item2.EvaluateAsync(context)).ToStringValue();
+            shape.Remove(shapeName);
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeRemovePropertyTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeRemovePropertyTag.cs
index 6879aa2210c..264d05105a6 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeRemovePropertyTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeRemovePropertyTag.cs
@@ -6,25 +6,24 @@
 using Fluid.Ast;
 using OrchardCore.Mvc.Utilities;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class ShapeRemovePropertyTag
 {
-    public class ShapeRemovePropertyTag
+    public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, Expression> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, Expression> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
+        var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
+
+        if (objectValue is IShape shape)
         {
-            var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
+            var propName = (await arguments.Item2.EvaluateAsync(context)).ToStringValue();
 
-            if (objectValue is IShape shape)
+            if (!string.IsNullOrEmpty(propName))
             {
-                var propName = (await arguments.Item2.EvaluateAsync(context)).ToStringValue();
-
-                if (!string.IsNullOrEmpty(propName))
-                {
-                    shape.Properties.Remove(propName.ToPascalCaseUnderscore());
-                }
+                shape.Properties.Remove(propName.ToPascalCaseUnderscore());
             }
-
-            return Completion.Normal;
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeTabTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeTabTag.cs
index 386f7d445a6..86df93ba618 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeTabTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeTabTag.cs
@@ -5,21 +5,20 @@
 using Fluid;
 using Fluid.Ast;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class ShapeTabTag
 {
-    public class ShapeTabTag
+    public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, Expression> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, Expression> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
-        {
-            var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
-
-            if (objectValue is IShape shape)
-            {
-                var shapeTab = (await arguments.Item2.EvaluateAsync(context)).ToStringValue();
-                shape.Metadata.Tab = shapeTab;
-            }
+        var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
 
-            return Completion.Normal;
+        if (objectValue is IShape shape)
+        {
+            var shapeTab = (await arguments.Item2.EvaluateAsync(context)).ToStringValue();
+            shape.Metadata.Tab = shapeTab;
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeTag.cs
index 326b546a251..5baefde3ecc 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeTag.cs
@@ -9,110 +9,109 @@
 using OrchardCore.Liquid;
 using OrchardCore.Mvc.Utilities;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class ShapeTag
 {
-    public class ShapeTag
-    {
-        private static readonly char[] _separators = [',', ' '];
+    private static readonly char[] _separators = [',', ' '];
 
-        public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, TextWriter writer, TextEncoder encoder, TemplateContext context)
-        {
-            var services = ((LiquidTemplateContext)context).Services;
-            var shapeFactory = services.GetRequiredService<IShapeFactory>();
-            var displayHelper = services.GetRequiredService<IDisplayHelper>();
+    public static async ValueTask<Completion> WriteToAsync(IReadOnlyList<FilterArgument> argumentsList, TextWriter writer, TextEncoder encoder, TemplateContext context)
+    {
+        var services = ((LiquidTemplateContext)context).Services;
+        var shapeFactory = services.GetRequiredService<IShapeFactory>();
+        var displayHelper = services.GetRequiredService<IDisplayHelper>();
 
-            string cacheId = null;
-            TimeSpan? cacheFixedDuration = null;
-            TimeSpan? cacheSlidingDuration = null;
-            // string cacheDependency = null;
-            string cacheContext = null;
-            string cacheTag = null;
+        string cacheId = null;
+        TimeSpan? cacheFixedDuration = null;
+        TimeSpan? cacheSlidingDuration = null;
+        // string cacheDependency = null;
+        string cacheContext = null;
+        string cacheTag = null;
 
-            string id = null;
-            string alternate = null;
-            string wrapper = null;
-            string type = null;
+        string id = null;
+        string alternate = null;
+        string wrapper = null;
+        string type = null;
 
-            Dictionary<string, object> customAttributes = null;
+        Dictionary<string, object> customAttributes = null;
 
-            foreach (var argument in argumentsList)
+        foreach (var argument in argumentsList)
+        {
+            switch (argument.Name)
             {
-                switch (argument.Name)
-                {
-                    case "cache_id": cacheId = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "cache_id": cacheId = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
 
 #pragma warning disable CA1806 // Do not ignore method results
-                    case "cache_fixed_duration": TimeSpan.TryParse((await argument.Expression.EvaluateAsync(context)).ToStringValue(), out var fd); cacheFixedDuration = fd; break;
-                    case "cache_sliding_duration": TimeSpan.TryParse((await argument.Expression.EvaluateAsync(context)).ToStringValue(), out var sd); cacheSlidingDuration = sd; break;
+                case "cache_fixed_duration": TimeSpan.TryParse((await argument.Expression.EvaluateAsync(context)).ToStringValue(), out var fd); cacheFixedDuration = fd; break;
+                case "cache_sliding_duration": TimeSpan.TryParse((await argument.Expression.EvaluateAsync(context)).ToStringValue(), out var sd); cacheSlidingDuration = sd; break;
 #pragma warning restore CA1806 // Do not ignore method results
 
-                    // case "cache_dependency": cacheDependency = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "cache_context": cacheContext = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "cache_tag": cacheTag = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                // case "cache_dependency": cacheDependency = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "cache_context": cacheContext = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "cache_tag": cacheTag = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
 
-                    case "id": id = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "alternate": alternate = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
-                    case "wrapper": wrapper = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "id": id = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "alternate": alternate = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case "wrapper": wrapper = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
 
-                    case null:
-                    case "type":
-                    case "": type = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
+                case null:
+                case "type":
+                case "": type = (await argument.Expression.EvaluateAsync(context)).ToStringValue(); break;
 
-                    default: (customAttributes ??= [])[argument.Name.ToPascalCaseUnderscore()] = (await argument.Expression.EvaluateAsync(context)).ToObjectValue(); break;
-                }
+                default: (customAttributes ??= [])[argument.Name.ToPascalCaseUnderscore()] = (await argument.Expression.EvaluateAsync(context)).ToObjectValue(); break;
             }
+        }
+
+        var shape = await shapeFactory.CreateAsync<object>(type, customAttributes == null ? Arguments.Empty : Arguments.From(customAttributes));
+
+        if (!string.IsNullOrEmpty(id))
+        {
+            shape.Id = id;
+        }
 
-            var shape = await shapeFactory.CreateAsync<object>(type, customAttributes == null ? Arguments.Empty : Arguments.From(customAttributes));
+        if (!string.IsNullOrEmpty(alternate))
+        {
+            shape.Metadata.Alternates.Add(alternate);
+        }
+
+        if (!string.IsNullOrEmpty(wrapper))
+        {
+            shape.Metadata.Wrappers.Add(wrapper);
+        }
 
-            if (!string.IsNullOrEmpty(id))
+        if (!string.IsNullOrWhiteSpace(cacheId))
+        {
+            var metadata = shape.Metadata;
+
+            metadata.Cache(cacheId);
+
+            if (cacheFixedDuration.HasValue)
             {
-                shape.Id = id;
+                metadata.Cache().WithExpiryAfter(cacheFixedDuration.Value);
             }
 
-            if (!string.IsNullOrEmpty(alternate))
+            if (cacheSlidingDuration.HasValue)
             {
-                shape.Metadata.Alternates.Add(alternate);
+                metadata.Cache().WithExpirySliding(cacheSlidingDuration.Value);
             }
 
-            if (!string.IsNullOrEmpty(wrapper))
+            if (!string.IsNullOrWhiteSpace(cacheContext))
             {
-                shape.Metadata.Wrappers.Add(wrapper);
+                var contexts = cacheContext.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
+                metadata.Cache().AddContext(contexts);
             }
 
-            if (!string.IsNullOrWhiteSpace(cacheId))
+            if (!string.IsNullOrWhiteSpace(cacheTag))
             {
-                var metadata = shape.Metadata;
-
-                metadata.Cache(cacheId);
-
-                if (cacheFixedDuration.HasValue)
-                {
-                    metadata.Cache().WithExpiryAfter(cacheFixedDuration.Value);
-                }
-
-                if (cacheSlidingDuration.HasValue)
-                {
-                    metadata.Cache().WithExpirySliding(cacheSlidingDuration.Value);
-                }
-
-                if (!string.IsNullOrWhiteSpace(cacheContext))
-                {
-                    var contexts = cacheContext.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
-                    metadata.Cache().AddContext(contexts);
-                }
-
-                if (!string.IsNullOrWhiteSpace(cacheTag))
-                {
-                    var tags = cacheTag.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
-                    metadata.Cache().AddTag(tags);
-                }
+                var tags = cacheTag.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
+                metadata.Cache().AddTag(tags);
             }
+        }
 
-            var shapeContent = await displayHelper.ShapeExecuteAsync(shape);
+        var shapeContent = await displayHelper.ShapeExecuteAsync(shape);
 
-            shapeContent.WriteTo(writer, (HtmlEncoder)encoder);
+        shapeContent.WriteTo(writer, (HtmlEncoder)encoder);
 
-            return Completion.Normal;
-        }
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeTypeTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeTypeTag.cs
index 22e3d96fddc..a273a2397e3 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeTypeTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ShapeTypeTag.cs
@@ -5,21 +5,20 @@
 using Fluid;
 using Fluid.Ast;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class ShapeTypeTag
 {
-    public class ShapeTypeTag
+    public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, Expression> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(ValueTuple<Expression, Expression> arguments, TextWriter _1, TextEncoder _2, TemplateContext context)
-        {
-            var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
-
-            if (objectValue is IShape shape)
-            {
-                var shapeType = (await arguments.Item2.EvaluateAsync(context)).ToStringValue();
-                shape.Metadata.Type = shapeType;
-            }
+        var objectValue = (await arguments.Item1.EvaluateAsync(context)).ToObjectValue();
 
-            return Completion.Normal;
+        if (objectValue is IShape shape)
+        {
+            var shapeType = (await arguments.Item2.EvaluateAsync(context)).ToStringValue();
+            shape.Metadata.Type = shapeType;
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ZoneTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ZoneTag.cs
index 6904267a779..842f078d163 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ZoneTag.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Tags/ZoneTag.cs
@@ -10,78 +10,77 @@
 using OrchardCore.DisplayManagement.Shapes;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.DisplayManagement.Liquid.Tags
+namespace OrchardCore.DisplayManagement.Liquid.Tags;
+
+public class ZoneTag
 {
-    public class ZoneTag
+    public static async ValueTask<Completion> WriteToAsync(
+        IReadOnlyList<FilterArgument> argumentsList,
+        IReadOnlyList<Statement> statements,
+        TextWriter writer,
+        TextEncoder encoder,
+        TemplateContext context)
     {
-        public static async ValueTask<Completion> WriteToAsync(
-            IReadOnlyList<FilterArgument> argumentsList,
-            IReadOnlyList<Statement> statements,
-            TextWriter writer,
-            TextEncoder encoder,
-            TemplateContext context)
-        {
-            var services = ((LiquidTemplateContext)context).Services;
-            var layoutAccessor = services.GetRequiredService<ILayoutAccessor>();
-            var logger = services.GetRequiredService<ILogger<ZoneTag>>();
+        var services = ((LiquidTemplateContext)context).Services;
+        var layoutAccessor = services.GetRequiredService<ILayoutAccessor>();
+        var logger = services.GetRequiredService<ILogger<ZoneTag>>();
 
-            string position = null;
-            string name = null;
+        string position = null;
+        string name = null;
 
-            for (var i = 0; i < argumentsList.Count; i++)
+        for (var i = 0; i < argumentsList.Count; i++)
+        {
+            var argument = argumentsList[i];
+            // check common case
+            if (string.IsNullOrEmpty(argument.Name) && argument.Expression is LiteralExpression literalExpression)
             {
-                var argument = argumentsList[i];
-                // check common case
-                if (string.IsNullOrEmpty(argument.Name) && argument.Expression is LiteralExpression literalExpression)
-                {
-                    name = literalExpression.Value.ToStringValue();
-                    continue;
-                }
+                name = literalExpression.Value.ToStringValue();
+                continue;
+            }
 
-                switch (argument.Name)
-                {
-                    case "position":
-                        position = (await argument.Expression.EvaluateAsync(context)).ToStringValue();
-                        break;
+            switch (argument.Name)
+            {
+                case "position":
+                    position = (await argument.Expression.EvaluateAsync(context)).ToStringValue();
+                    break;
 
-                    case null:
-                    case "name":
-                    case "":
-                        name ??= (await argument.Expression.EvaluateAsync(context)).ToStringValue();
-                        break;
-                }
+                case null:
+                case "name":
+                case "":
+                    name ??= (await argument.Expression.EvaluateAsync(context)).ToStringValue();
+                    break;
             }
+        }
 
-            if (statements != null && statements.Count > 0)
-            {
-                var content = new ViewBufferTextWriterContent();
+        if (statements != null && statements.Count > 0)
+        {
+            var content = new ViewBufferTextWriterContent();
 
-                var completion = await statements.RenderStatementsAsync(content, encoder, context);
+            var completion = await statements.RenderStatementsAsync(content, encoder, context);
 
-                if (completion != Completion.Normal)
-                {
-                    return completion;
-                }
+            if (completion != Completion.Normal)
+            {
+                return completion;
+            }
 
-                var layout = await layoutAccessor.GetLayoutAsync();
+            var layout = await layoutAccessor.GetLayoutAsync();
 
-                var zone = layout.Zones[name];
+            var zone = layout.Zones[name];
 
-                if (zone is Shape shape)
-                {
-                    await shape.AddAsync(content, position);
-                }
-                else
-                {
-                    logger.LogWarning(
-                        "Unable to add shape to the zone using the {{% zone %}} Liquid tag because the zone's type " +
-                        "is \"{ActualType}\" instead of the expected {ExpectedType}",
-                        zone.GetType().FullName,
-                        nameof(Shape));
-                }
+            if (zone is Shape shape)
+            {
+                await shape.AddAsync(content, position);
+            }
+            else
+            {
+                logger.LogWarning(
+                    "Unable to add shape to the zone using the {{% zone %}} Liquid tag because the zone's type " +
+                    "is \"{ActualType}\" instead of the expected {ExpectedType}",
+                    zone.GetType().FullName,
+                    nameof(Shape));
             }
-
-            return Completion.Normal;
         }
+
+        return Completion.Normal;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TemplateOptionsFileProviderSetup.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TemplateOptionsFileProviderSetup.cs
index fc9af5e44f4..3df846c2b76 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TemplateOptionsFileProviderSetup.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TemplateOptionsFileProviderSetup.cs
@@ -2,33 +2,32 @@
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.DisplayManagement.Liquid
+namespace OrchardCore.DisplayManagement.Liquid;
+
+public sealed class TemplateOptionsFileProviderSetup : IConfigureOptions<TemplateOptions>
 {
-    public sealed class TemplateOptionsFileProviderSetup : IConfigureOptions<TemplateOptions>
+    private readonly LiquidViewOptions _liquidViewOptions;
+
+    public TemplateOptionsFileProviderSetup(IOptions<LiquidViewOptions> liquidViewOptions)
+    {
+        _liquidViewOptions = liquidViewOptions.Value;
+    }
+
+    public void Configure(TemplateOptions options)
     {
-        private readonly LiquidViewOptions _liquidViewOptions;
+        var fileProviders = _liquidViewOptions.FileProviders;
 
-        public TemplateOptionsFileProviderSetup(IOptions<LiquidViewOptions> liquidViewOptions)
+        if (fileProviders.Count == 0)
         {
-            _liquidViewOptions = liquidViewOptions.Value;
+            options.FileProvider = new NullFileProvider();
         }
-
-        public void Configure(TemplateOptions options)
+        else if (fileProviders.Count == 1)
         {
-            var fileProviders = _liquidViewOptions.FileProviders;
-
-            if (fileProviders.Count == 0)
-            {
-                options.FileProvider = new NullFileProvider();
-            }
-            else if (fileProviders.Count == 1)
-            {
-                options.FileProvider = fileProviders[0];
-            }
-            else
-            {
-                options.FileProvider = new CompositeFileProvider(fileProviders);
-            }
+            options.FileProvider = fileProviders[0];
+        }
+        else
+        {
+            options.FileProvider = new CompositeFileProvider(fileProviders);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/ViewBufferTextWriterContent.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/ViewBufferTextWriterContent.cs
index bf09f3cf458..30286c78b75 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/ViewBufferTextWriterContent.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/ViewBufferTextWriterContent.cs
@@ -7,333 +7,332 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Html;
 
-namespace OrchardCore.DisplayManagement.Liquid
+namespace OrchardCore.DisplayManagement.Liquid;
+
+/// <summary>
+/// An <see cref="IHtmlContent"/> implementation that inherits from <see cref="TextWriter"/> to write to the ASP.NET ViewBufferTextWriter
+/// in an optimal way.
+/// </summary>
+public class ViewBufferTextWriterContent : TextWriter, IHtmlContent
 {
-    /// <summary>
-    /// An <see cref="IHtmlContent"/> implementation that inherits from <see cref="TextWriter"/> to write to the ASP.NET ViewBufferTextWriter
-    /// in an optimal way.
-    /// </summary>
-    public class ViewBufferTextWriterContent : TextWriter, IHtmlContent
-    {
-        private StringBuilder _builder;
-        private StringBuilderPool _pooledBuilder;
-        private List<StringBuilderPool> _previousPooledBuilders;
-        private readonly bool _releaseOnWrite;
+    private StringBuilder _builder;
+    private StringBuilderPool _pooledBuilder;
+    private List<StringBuilderPool> _previousPooledBuilders;
+    private readonly bool _releaseOnWrite;
 
-        public override Encoding Encoding => Encoding.UTF8;
+    public override Encoding Encoding => Encoding.UTF8;
 
-        public ViewBufferTextWriterContent(bool releaseOnWrite = true)
-        {
-            _pooledBuilder = StringBuilderPool.GetInstance();
-            _builder = _pooledBuilder.Builder;
-            _releaseOnWrite = releaseOnWrite;
-        }
+    public ViewBufferTextWriterContent(bool releaseOnWrite = true)
+    {
+        _pooledBuilder = StringBuilderPool.GetInstance();
+        _builder = _pooledBuilder.Builder;
+        _releaseOnWrite = releaseOnWrite;
+    }
 
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            ReleasePooledBuffer();
-        }
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        ReleasePooledBuffer();
+    }
 
-        private void ReleasePooledBuffer()
+    private void ReleasePooledBuffer()
+    {
+        if (_pooledBuilder != null)
         {
-            if (_pooledBuilder != null)
-            {
-                _pooledBuilder.Dispose();
-                _pooledBuilder = null;
-                _builder = null;
+            _pooledBuilder.Dispose();
+            _pooledBuilder = null;
+            _builder = null;
 
-                if (_previousPooledBuilders != null)
+            if (_previousPooledBuilders != null)
+            {
+                foreach (var pooledBuilder in _previousPooledBuilders)
                 {
-                    foreach (var pooledBuilder in _previousPooledBuilders)
-                    {
-                        pooledBuilder.Dispose();
-                    }
-
-                    _previousPooledBuilders.Clear();
-                    _previousPooledBuilders = null;
+                    pooledBuilder.Dispose();
                 }
+
+                _previousPooledBuilders.Clear();
+                _previousPooledBuilders = null;
             }
         }
+    }
 
-        private StringBuilder AllocateBuilder()
-        {
-            _previousPooledBuilders ??= [];
-            _previousPooledBuilders.Add(_pooledBuilder);
+    private StringBuilder AllocateBuilder()
+    {
+        _previousPooledBuilders ??= [];
+        _previousPooledBuilders.Add(_pooledBuilder);
 
-            _pooledBuilder = StringBuilderPool.GetInstance();
-            _builder = _pooledBuilder.Builder;
-            return _builder;
+        _pooledBuilder = StringBuilderPool.GetInstance();
+        _builder = _pooledBuilder.Builder;
+        return _builder;
+    }
+
+    // Invoked when used as TextWriter to intercept what is supposed to be written
+    public override void Write(string value)
+    {
+        if (value == null || value.Length == 0)
+        {
+            return;
         }
 
-        // Invoked when used as TextWriter to intercept what is supposed to be written
-        public override void Write(string value)
+        if (_builder.Length + value.Length <= _builder.Capacity)
         {
-            if (value == null || value.Length == 0)
+            _builder.Append(value);
+        }
+        else
+        {
+            // The string doesn't fit in the buffer, rent more
+            var index = 0;
+            do
             {
-                return;
-            }
+                var sizeToCopy = Math.Min(_builder.Capacity - _builder.Length, value.Length - index);
+                _builder.Append(value.AsSpan(index, sizeToCopy));
 
-            if (_builder.Length + value.Length <= _builder.Capacity)
-            {
-                _builder.Append(value);
-            }
-            else
-            {
-                // The string doesn't fit in the buffer, rent more
-                var index = 0;
-                do
+                if (_builder.Length == _builder.Capacity)
                 {
-                    var sizeToCopy = Math.Min(_builder.Capacity - _builder.Length, value.Length - index);
-                    _builder.Append(value.AsSpan(index, sizeToCopy));
-
-                    if (_builder.Length == _builder.Capacity)
-                    {
-                        AllocateBuilder();
-                    }
+                    AllocateBuilder();
+                }
 
-                    index += sizeToCopy;
-                } while (index < value.Length);
-            }
+                index += sizeToCopy;
+            } while (index < value.Length);
         }
+    }
 
-        public override void Write(char value)
+    public override void Write(char value)
+    {
+        if (_builder.Length >= _builder.Capacity)
         {
-            if (_builder.Length >= _builder.Capacity)
-            {
-                AllocateBuilder();
-            }
+            AllocateBuilder();
+        }
 
-            _builder.Append(value);
+        _builder.Append(value);
+    }
+
+    public override void Write(char[] buffer)
+    {
+        if (buffer == null || buffer.Length == 0)
+        {
+            return;
         }
 
-        public override void Write(char[] buffer)
+        if (_builder.Length + buffer.Length <= _builder.Capacity)
+        {
+            _builder.Append(buffer);
+        }
+        else
         {
-            if (buffer == null || buffer.Length == 0)
+            // The string doesn't fit in the buffer, rent more
+            var index = 0;
+            do
             {
-                return;
-            }
+                var sizeToCopy = Math.Min(_builder.Capacity - _builder.Length, buffer.Length - index);
+                _builder.Append(buffer.AsSpan(index, sizeToCopy));
 
-            if (_builder.Length + buffer.Length <= _builder.Capacity)
-            {
-                _builder.Append(buffer);
-            }
-            else
-            {
-                // The string doesn't fit in the buffer, rent more
-                var index = 0;
-                do
+                if (_builder.Length == _builder.Capacity)
                 {
-                    var sizeToCopy = Math.Min(_builder.Capacity - _builder.Length, buffer.Length - index);
-                    _builder.Append(buffer.AsSpan(index, sizeToCopy));
+                    AllocateBuilder();
+                }
 
-                    if (_builder.Length == _builder.Capacity)
-                    {
-                        AllocateBuilder();
-                    }
+                index += sizeToCopy;
+            } while (index < buffer.Length);
+        }
+    }
 
-                    index += sizeToCopy;
-                } while (index < buffer.Length);
-            }
+    public override void Write(char[] buffer, int offset, int count)
+    {
+        if (buffer == null || buffer.Length == 0 || count == 0)
+        {
+            return;
         }
 
-        public override void Write(char[] buffer, int offset, int count)
+        if (_builder.Length + count <= _builder.Capacity)
         {
-            if (buffer == null || buffer.Length == 0 || count == 0)
+            _builder.Append(buffer, offset, count);
+        }
+        else
+        {
+            // The string doesn't fit in the buffer, rent more
+            var index = 0;
+            do
             {
-                return;
-            }
+                var sizeToCopy = Math.Min(_builder.Capacity - _builder.Length, count - index);
+                _builder.Append(buffer.AsSpan(index + offset, sizeToCopy));
 
-            if (_builder.Length + count <= _builder.Capacity)
-            {
-                _builder.Append(buffer, offset, count);
-            }
-            else
-            {
-                // The string doesn't fit in the buffer, rent more
-                var index = 0;
-                do
+                if (_builder.Length == _builder.Capacity)
                 {
-                    var sizeToCopy = Math.Min(_builder.Capacity - _builder.Length, count - index);
-                    _builder.Append(buffer.AsSpan(index + offset, sizeToCopy));
+                    AllocateBuilder();
+                }
 
-                    if (_builder.Length == _builder.Capacity)
-                    {
-                        AllocateBuilder();
-                    }
+                index += sizeToCopy;
+            } while (index < count);
+        }
+    }
 
-                    index += sizeToCopy;
-                } while (index < count);
-            }
+    public override void Write(ReadOnlySpan<char> buffer)
+    {
+        if (buffer.Length == 0)
+        {
+            return;
         }
 
-        public override void Write(ReadOnlySpan<char> buffer)
+        if (_builder.Length + buffer.Length <= _builder.Capacity)
+        {
+            _builder.Append(buffer);
+        }
+        else
         {
-            if (buffer.Length == 0)
+            // The string doesn't fit in the buffer, rent more
+            var index = 0;
+            do
             {
-                return;
-            }
+                var sizeToCopy = Math.Min(_builder.Capacity - _builder.Length, buffer.Length - index);
+                _builder.Append(buffer.Slice(index, sizeToCopy));
 
-            if (_builder.Length + buffer.Length <= _builder.Capacity)
-            {
-                _builder.Append(buffer);
-            }
-            else
-            {
-                // The string doesn't fit in the buffer, rent more
-                var index = 0;
-                do
+                if (_builder.Length == _builder.Capacity)
                 {
-                    var sizeToCopy = Math.Min(_builder.Capacity - _builder.Length, buffer.Length - index);
-                    _builder.Append(buffer.Slice(index, sizeToCopy));
-
-                    if (_builder.Length == _builder.Capacity)
-                    {
-                        AllocateBuilder();
-                    }
+                    AllocateBuilder();
+                }
 
-                    index += sizeToCopy;
-                } while (index < buffer.Length);
-            }
+                index += sizeToCopy;
+            } while (index < buffer.Length);
         }
+    }
 
-        public override void Write(StringBuilder value)
+    public override void Write(StringBuilder value)
+    {
+        if (value != null)
         {
-            if (value != null)
+            foreach (var chunk in value.GetChunks())
             {
-                foreach (var chunk in value.GetChunks())
+                if (!chunk.IsEmpty)
                 {
-                    if (!chunk.IsEmpty)
-                    {
-                        Write(chunk.Span);
-                    }
+                    Write(chunk.Span);
                 }
             }
         }
+    }
 
-        public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+    public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+    {
+        if (_builder == null)
         {
-            if (_builder == null)
-            {
-                throw new InvalidOperationException("Buffer has already been rendered");
-            }
+            throw new InvalidOperationException("Buffer has already been rendered");
+        }
 
-            if (_previousPooledBuilders != null)
+        if (_previousPooledBuilders != null)
+        {
+            foreach (var pooledBuilder in _previousPooledBuilders)
             {
-                foreach (var pooledBuilder in _previousPooledBuilders)
+                foreach (var chunk in pooledBuilder.Builder.GetChunks())
                 {
-                    foreach (var chunk in pooledBuilder.Builder.GetChunks())
+                    if (!chunk.IsEmpty)
                     {
-                        if (!chunk.IsEmpty)
-                        {
-                            writer.Write(chunk.Span);
-                        }
+                        writer.Write(chunk.Span);
                     }
                 }
             }
+        }
 
-            foreach (var chunk in _builder.GetChunks())
-            {
-                if (!chunk.IsEmpty)
-                {
-                    writer.Write(chunk.Span);
-                }
-            }
-
-            if (_releaseOnWrite)
+        foreach (var chunk in _builder.GetChunks())
+        {
+            if (!chunk.IsEmpty)
             {
-                ReleasePooledBuffer();
+                writer.Write(chunk.Span);
             }
         }
 
-        public override Task FlushAsync()
+        if (_releaseOnWrite)
         {
-            // Override since the base implementation does unnecessary work
-            return Task.CompletedTask;
+            ReleasePooledBuffer();
         }
+    }
 
-        #region Async Methods
+    public override Task FlushAsync()
+    {
+        // Override since the base implementation does unnecessary work
+        return Task.CompletedTask;
+    }
 
-        public override Task WriteAsync(string value)
-        {
-            Write(value);
-            return Task.CompletedTask;
-        }
+    #region Async Methods
 
-        public override Task WriteAsync(char value)
-        {
-            Write(value);
-            return Task.CompletedTask;
-        }
+    public override Task WriteAsync(string value)
+    {
+        Write(value);
+        return Task.CompletedTask;
+    }
 
-        public override Task WriteAsync(char[] buffer, int index, int count)
+    public override Task WriteAsync(char value)
+    {
+        Write(value);
+        return Task.CompletedTask;
+    }
+
+    public override Task WriteAsync(char[] buffer, int index, int count)
+    {
+        Write(buffer, index, count);
+        return Task.CompletedTask;
+    }
+
+    public override Task WriteAsync(ReadOnlyMemory<char> buffer, CancellationToken cancellationToken = default)
+    {
+        if (cancellationToken.IsCancellationRequested)
         {
-            Write(buffer, index, count);
-            return Task.CompletedTask;
+            return Task.FromCanceled(cancellationToken);
         }
 
-        public override Task WriteAsync(ReadOnlyMemory<char> buffer, CancellationToken cancellationToken = default)
-        {
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return Task.FromCanceled(cancellationToken);
-            }
+        Write(buffer.Span);
+        return Task.CompletedTask;
+    }
 
-            Write(buffer.Span);
-            return Task.CompletedTask;
+    public override Task WriteAsync(StringBuilder value, CancellationToken cancellationToken = default)
+    {
+        if (cancellationToken.IsCancellationRequested)
+        {
+            return Task.FromCanceled(cancellationToken);
         }
 
-        public override Task WriteAsync(StringBuilder value, CancellationToken cancellationToken = default)
-        {
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return Task.FromCanceled(cancellationToken);
-            }
+        Write(value);
+        return Task.CompletedTask;
+    }
 
-            Write(value);
-            return Task.CompletedTask;
-        }
+    public override Task WriteLineAsync(char value)
+    {
+        WriteLine(value);
+        return Task.CompletedTask;
+    }
 
-        public override Task WriteLineAsync(char value)
-        {
-            WriteLine(value);
-            return Task.CompletedTask;
-        }
+    public override Task WriteLineAsync(string value)
+    {
+        WriteLine(value);
+        return Task.CompletedTask;
+    }
 
-        public override Task WriteLineAsync(string value)
-        {
-            WriteLine(value);
-            return Task.CompletedTask;
-        }
+    public override Task WriteLineAsync(char[] buffer, int index, int count)
+    {
+        WriteLine(buffer, index, count);
+        return Task.CompletedTask;
+    }
 
-        public override Task WriteLineAsync(char[] buffer, int index, int count)
+    public override Task WriteLineAsync(ReadOnlyMemory<char> buffer, CancellationToken cancellationToken = default)
+    {
+        if (cancellationToken.IsCancellationRequested)
         {
-            WriteLine(buffer, index, count);
-            return Task.CompletedTask;
+            return Task.FromCanceled(cancellationToken);
         }
 
-        public override Task WriteLineAsync(ReadOnlyMemory<char> buffer, CancellationToken cancellationToken = default)
-        {
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return Task.FromCanceled(cancellationToken);
-            }
-
-            WriteLine(buffer);
-            return Task.CompletedTask;
-        }
+        WriteLine(buffer);
+        return Task.CompletedTask;
+    }
 
-        public override Task WriteLineAsync(StringBuilder value, CancellationToken cancellationToken = default)
+    public override Task WriteLineAsync(StringBuilder value, CancellationToken cancellationToken = default)
+    {
+        if (cancellationToken.IsCancellationRequested)
         {
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return Task.FromCanceled(cancellationToken);
-            }
-
-            WriteLine(value);
-            return Task.CompletedTask;
+            return Task.FromCanceled(cancellationToken);
         }
 
-        #endregion
+        WriteLine(value);
+        return Task.CompletedTask;
     }
+
+    #endregion
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Arguments.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Arguments.cs
index 557393c9833..634a1dd2374 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Arguments.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Arguments.cs
@@ -5,220 +5,219 @@
 using System.Linq;
 using System.Reflection;
 
-namespace OrchardCore.DisplayManagement
+namespace OrchardCore.DisplayManagement;
+
+public static class Arguments
 {
-    public static class Arguments
+    private static readonly ConcurrentDictionary<Type, Func<object, NamedEnumerable<object>>> _propertiesAccessors = new();
+
+    public static INamedEnumerable<T> FromT<T>(IEnumerable<T> arguments, IEnumerable<string> names)
+    {
+        return new NamedEnumerable<T>(arguments, names);
+    }
+
+    public static INamedEnumerable<object> From(IEnumerable<object> arguments, IEnumerable<string> names)
+    {
+        return new NamedEnumerable<object>(arguments, names);
+    }
+
+    public static INamedEnumerable<object> From(IDictionary<string, object> dictionary)
     {
-        private static readonly ConcurrentDictionary<Type, Func<object, NamedEnumerable<object>>> _propertiesAccessors = new();
+        return From(dictionary.Values, dictionary.Keys);
+    }
 
-        public static INamedEnumerable<T> FromT<T>(IEnumerable<T> arguments, IEnumerable<string> names)
+    public static INamedEnumerable<string> From(IDictionary<string, string> dictionary)
+    {
+        return new NamedEnumerable<string>(dictionary.Values, dictionary.Keys);
+    }
+
+    public static INamedEnumerable<object> From(object propertyObject)
+    {
+        var propertiesAccessor = _propertiesAccessors.GetOrAdd(propertyObject.GetType(), type =>
         {
-            return new NamedEnumerable<T>(arguments, names);
-        }
+            var properties = type.GetProperties(BindingFlags.Instance | BindingFlags.Public);
+            var names = properties.Select(x => x.Name).ToArray();
 
-        public static INamedEnumerable<object> From(IEnumerable<object> arguments, IEnumerable<string> names)
+            return obj =>
+            {
+                // properties and names are referenced in the closure
+                var values = properties.Select(x => x.GetValue(obj, null)).ToArray();
+                return new NamedEnumerable<object>(values, names);
+            };
+        });
+
+        return propertiesAccessor(propertyObject);
+    }
+
+    private sealed class NamedEnumerable<T> : INamedEnumerable<T>
+    {
+        private readonly List<T> _arguments;
+        private readonly List<string> _names;
+        private readonly T[] _positional;
+        private IDictionary<string, T> _named;
+
+        public NamedEnumerable(IEnumerable<T> arguments, IEnumerable<string> names)
         {
-            return new NamedEnumerable<object>(arguments, names);
+            _arguments = arguments.ToList();
+            _names = names.ToList();
+
+            ArgumentOutOfRangeException.ThrowIfLessThan(_arguments.Count, _names.Count);
+
+            _positional = [];
+
+            if (_arguments.Count != _names.Count)
+            {
+                _positional = _arguments.Take(_arguments.Count - _names.Count).ToArray();
+            }
         }
 
-        public static INamedEnumerable<object> From(IDictionary<string, object> dictionary)
+        IEnumerator IEnumerable.GetEnumerator()
         {
-            return From(dictionary.Values, dictionary.Keys);
+            return _arguments.GetEnumerator();
         }
 
-        public static INamedEnumerable<string> From(IDictionary<string, string> dictionary)
+        IEnumerator<T> IEnumerable<T>.GetEnumerator()
         {
-            return new NamedEnumerable<string>(dictionary.Values, dictionary.Keys);
+            return _arguments.GetEnumerator();
         }
 
-        public static INamedEnumerable<object> From(object propertyObject)
+        IList<T> INamedEnumerable<T>.Positional
         {
-            var propertiesAccessor = _propertiesAccessors.GetOrAdd(propertyObject.GetType(), type =>
-            {
-                var properties = type.GetProperties(BindingFlags.Instance | BindingFlags.Public);
-                var names = properties.Select(x => x.Name).ToArray();
-
-                return obj =>
-                {
-                    // properties and names are referenced in the closure
-                    var values = properties.Select(x => x.GetValue(obj, null)).ToArray();
-                    return new NamedEnumerable<object>(values, names);
-                };
-            });
+            get { return _positional; }
+        }
 
-            return propertiesAccessor(propertyObject);
+        IDictionary<string, T> INamedEnumerable<T>.Named
+        {
+            get { return _named ??= new Named(_arguments, _names); }
         }
 
-        private sealed class NamedEnumerable<T> : INamedEnumerable<T>
+        private sealed class Named : IDictionary<string, T>
         {
-            private readonly List<T> _arguments;
-            private readonly List<string> _names;
-            private readonly T[] _positional;
-            private IDictionary<string, T> _named;
+            private readonly IList<T> _arguments;
+            private readonly IList<string> _names;
+            private IEnumerable<KeyValuePair<string, T>> _enumerable;
 
-            public NamedEnumerable(IEnumerable<T> arguments, IEnumerable<string> names)
+            public Named(IList<T> arguments, IList<string> names)
             {
-                _arguments = arguments.ToList();
-                _names = names.ToList();
-
-                ArgumentOutOfRangeException.ThrowIfLessThan(_arguments.Count, _names.Count);
-
-                _positional = [];
-
-                if (_arguments.Count != _names.Count)
+                if (arguments.Count != names.Count)
+                {
+                    _arguments = arguments.Skip(arguments.Count - names.Count).ToArray();
+                }
+                else
                 {
-                    _positional = _arguments.Take(_arguments.Count - _names.Count).ToArray();
+                    _arguments = arguments;
                 }
+
+                _names = names;
             }
 
-            IEnumerator IEnumerable.GetEnumerator()
+            private IEnumerable<KeyValuePair<string, T>> MakeEnumerable()
             {
-                return _arguments.GetEnumerator();
+                return _enumerable ??= _arguments.Zip(_names, (arg, name) => new KeyValuePair<string, T>(name, arg));
             }
 
-            IEnumerator<T> IEnumerable<T>.GetEnumerator()
+            IEnumerator<KeyValuePair<string, T>> IEnumerable<KeyValuePair<string, T>>.GetEnumerator()
             {
-                return _arguments.GetEnumerator();
+                return MakeEnumerable().GetEnumerator();
             }
 
-            IList<T> INamedEnumerable<T>.Positional
+            IEnumerator IEnumerable.GetEnumerator()
             {
-                get { return _positional; }
+                return MakeEnumerable().GetEnumerator();
             }
 
-            IDictionary<string, T> INamedEnumerable<T>.Named
+            void ICollection<KeyValuePair<string, T>>.Add(KeyValuePair<string, T> item)
             {
-                get { return _named ??= new Named(_arguments, _names); }
+                throw new NotImplementedException();
             }
 
-            private sealed class Named : IDictionary<string, T>
+            void ICollection<KeyValuePair<string, T>>.Clear()
             {
-                private readonly IList<T> _arguments;
-                private readonly IList<string> _names;
-                private IEnumerable<KeyValuePair<string, T>> _enumerable;
-
-                public Named(IList<T> arguments, IList<string> names)
-                {
-                    if (arguments.Count != names.Count)
-                    {
-                        _arguments = arguments.Skip(arguments.Count - names.Count).ToArray();
-                    }
-                    else
-                    {
-                        _arguments = arguments;
-                    }
-
-                    _names = names;
-                }
-
-                private IEnumerable<KeyValuePair<string, T>> MakeEnumerable()
-                {
-                    return _enumerable ??= _arguments.Zip(_names, (arg, name) => new KeyValuePair<string, T>(name, arg));
-                }
-
-                IEnumerator<KeyValuePair<string, T>> IEnumerable<KeyValuePair<string, T>>.GetEnumerator()
-                {
-                    return MakeEnumerable().GetEnumerator();
-                }
-
-                IEnumerator IEnumerable.GetEnumerator()
-                {
-                    return MakeEnumerable().GetEnumerator();
-                }
-
-                void ICollection<KeyValuePair<string, T>>.Add(KeyValuePair<string, T> item)
-                {
-                    throw new NotImplementedException();
-                }
-
-                void ICollection<KeyValuePair<string, T>>.Clear()
-                {
-                    throw new NotImplementedException();
-                }
+                throw new NotImplementedException();
+            }
 
-                bool ICollection<KeyValuePair<string, T>>.Contains(KeyValuePair<string, T> item)
-                {
-                    return MakeEnumerable().Contains(item);
-                }
+            bool ICollection<KeyValuePair<string, T>>.Contains(KeyValuePair<string, T> item)
+            {
+                return MakeEnumerable().Contains(item);
+            }
 
-                void ICollection<KeyValuePair<string, T>>.CopyTo(KeyValuePair<string, T>[] array, int arrayIndex)
-                {
-                    throw new NotImplementedException();
-                }
+            void ICollection<KeyValuePair<string, T>>.CopyTo(KeyValuePair<string, T>[] array, int arrayIndex)
+            {
+                throw new NotImplementedException();
+            }
 
-                bool ICollection<KeyValuePair<string, T>>.Remove(KeyValuePair<string, T> item)
-                {
-                    throw new NotImplementedException();
-                }
+            bool ICollection<KeyValuePair<string, T>>.Remove(KeyValuePair<string, T> item)
+            {
+                throw new NotImplementedException();
+            }
 
-                int ICollection<KeyValuePair<string, T>>.Count
-                {
-                    get { return _names.Count; }
-                }
+            int ICollection<KeyValuePair<string, T>>.Count
+            {
+                get { return _names.Count; }
+            }
 
-                bool ICollection<KeyValuePair<string, T>>.IsReadOnly
-                {
-                    get { return true; }
-                }
+            bool ICollection<KeyValuePair<string, T>>.IsReadOnly
+            {
+                get { return true; }
+            }
 
-                bool IDictionary<string, T>.ContainsKey(string key)
-                {
-                    return _names.Contains(key);
-                }
+            bool IDictionary<string, T>.ContainsKey(string key)
+            {
+                return _names.Contains(key);
+            }
 
-                void IDictionary<string, T>.Add(string key, T value)
-                {
-                    throw new NotImplementedException();
-                }
+            void IDictionary<string, T>.Add(string key, T value)
+            {
+                throw new NotImplementedException();
+            }
 
-                bool IDictionary<string, T>.Remove(string key)
-                {
-                    throw new NotImplementedException();
-                }
+            bool IDictionary<string, T>.Remove(string key)
+            {
+                throw new NotImplementedException();
+            }
 
-                bool IDictionary<string, T>.TryGetValue(string key, out T value)
-                {
-                    var pair = MakeEnumerable().FirstOrDefault(kv => kv.Key == key);
+            bool IDictionary<string, T>.TryGetValue(string key, out T value)
+            {
+                var pair = MakeEnumerable().FirstOrDefault(kv => kv.Key == key);
 
-                    // pair is a value type. in case of key-miss,
-                    // will default to key=(string)null,value=(object)null
+                // pair is a value type. in case of key-miss,
+                // will default to key=(string)null,value=(object)null
 
-                    value = pair.Value;
-                    return pair.Key != null;
-                }
+                value = pair.Value;
+                return pair.Key != null;
+            }
 
-                // TBD
-                T IDictionary<string, T>.this[string key]
+            // TBD
+            T IDictionary<string, T>.this[string key]
+            {
+                get
                 {
-                    get
+                    if (((IDictionary<string, T>)this).TryGetValue(key, out var result))
                     {
-                        if (((IDictionary<string, T>)this).TryGetValue(key, out var result))
-                        {
-                            return result;
-                        }
-                        else
-                        {
-                            return default;
-                        }
+                        return result;
                     }
-                    set { throw new NotImplementedException(); }
-                }
-
-                ICollection<string> IDictionary<string, T>.Keys
-                {
-                    get
+                    else
                     {
-                        return _names;
+                        return default;
                     }
                 }
+                set { throw new NotImplementedException(); }
+            }
 
-                ICollection<T> IDictionary<string, T>.Values
+            ICollection<string> IDictionary<string, T>.Keys
+            {
+                get
                 {
-                    get { return _arguments; }
+                    return _names;
                 }
             }
-        }
 
-        public static readonly INamedEnumerable<object> Empty = From([], []);
+            ICollection<T> IDictionary<string, T>.Values
+            {
+                get { return _arguments; }
+            }
+        }
     }
+
+    public static readonly INamedEnumerable<object> Empty = From([], []);
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/BaseDisplayManager.cs b/src/OrchardCore/OrchardCore.DisplayManagement/BaseDisplayManager.cs
index b9ed6ac1ffd..6e6014baad3 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/BaseDisplayManager.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/BaseDisplayManager.cs
@@ -6,64 +6,63 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Zones;
 
-namespace OrchardCore.DisplayManagement
+namespace OrchardCore.DisplayManagement;
+
+public abstract class BaseDisplayManager
 {
-    public abstract class BaseDisplayManager
+    private readonly IShapeFactory _shapeFactory;
+    private readonly IEnumerable<IShapePlacementProvider> _placementProviders;
+
+    public BaseDisplayManager(
+        IShapeFactory shapeFactory,
+        IEnumerable<IShapePlacementProvider> placementProviders
+        )
     {
-        private readonly IShapeFactory _shapeFactory;
-        private readonly IEnumerable<IShapePlacementProvider> _placementProviders;
+        _shapeFactory = shapeFactory;
+        _placementProviders = placementProviders;
+    }
 
-        public BaseDisplayManager(
-            IShapeFactory shapeFactory,
-            IEnumerable<IShapePlacementProvider> placementProviders
-            )
-        {
-            _shapeFactory = shapeFactory;
-            _placementProviders = placementProviders;
-        }
+    protected async Task BindPlacementAsync(IBuildShapeContext context)
+    {
+        var resolvers = new List<IPlacementInfoResolver>();
 
-        protected async Task BindPlacementAsync(IBuildShapeContext context)
+        foreach (var provider in _placementProviders)
         {
-            var resolvers = new List<IPlacementInfoResolver>();
+            var resolver = await provider.BuildPlacementInfoResolverAsync(context);
 
-            foreach (var provider in _placementProviders)
+            if (resolver != null)
             {
-                var resolver = await provider.BuildPlacementInfoResolverAsync(context);
-
-                if (resolver != null)
-                {
-                    resolvers.Add(resolver);
-                }
+                resolvers.Add(resolver);
             }
-
-            context.FindPlacement = (shapeType, differentiator, displayType, displayContext) => FindPlacementImpl(resolvers, shapeType, differentiator, displayType, context);
         }
 
-        private static PlacementInfo FindPlacementImpl(IList<IPlacementInfoResolver> placementResolvers, string shapeType, string differentiator, string displayType, IBuildShapeContext context)
-        {
-            var delimiterIndex = shapeType.IndexOf("__", StringComparison.Ordinal);
-
-            if (delimiterIndex > 0)
-            {
-                shapeType = shapeType[..delimiterIndex];
-            }
-
-            var placementContext = new ShapePlacementContext(
-                shapeType,
-                displayType,
-                differentiator,
-                context.Shape
-            );
+        context.FindPlacement = (shapeType, differentiator, displayType, displayContext) => FindPlacementImpl(resolvers, shapeType, differentiator, displayType, context);
+    }
 
-            return placementResolvers.Aggregate<IPlacementInfoResolver, PlacementInfo>(null, (prev, resolver) =>
-                PlacementInfoExtensions.Combine(prev, resolver.ResolvePlacement(placementContext))
-            );
-        }
+    private static PlacementInfo FindPlacementImpl(IList<IPlacementInfoResolver> placementResolvers, string shapeType, string differentiator, string displayType, IBuildShapeContext context)
+    {
+        var delimiterIndex = shapeType.IndexOf("__", StringComparison.Ordinal);
 
-        protected ValueTask<IShape> CreateContentShapeAsync(string actualShapeType)
+        if (delimiterIndex > 0)
         {
-            return _shapeFactory.CreateAsync(actualShapeType, () =>
-                new ValueTask<IShape>(new ZoneHolding(() => _shapeFactory.CreateAsync("ContentZone"))));
+            shapeType = shapeType[..delimiterIndex];
         }
+
+        var placementContext = new ShapePlacementContext(
+            shapeType,
+            displayType,
+            differentiator,
+            context.Shape
+        );
+
+        return placementResolvers.Aggregate<IPlacementInfoResolver, PlacementInfo>(null, (prev, resolver) =>
+            PlacementInfoExtensions.Combine(prev, resolver.ResolvePlacement(placementContext))
+        );
+    }
+
+    protected ValueTask<IShape> CreateContentShapeAsync(string actualShapeType)
+    {
+        return _shapeFactory.CreateAsync(actualShapeType, () =>
+            new ValueTask<IShape>(new ZoneHolding(() => _shapeFactory.CreateAsync("ContentZone"))));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/DefaultShapeTableManager.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/DefaultShapeTableManager.cs
index f28294191d5..9a6484dae87 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/DefaultShapeTableManager.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/DefaultShapeTableManager.cs
@@ -13,198 +13,197 @@
 using OrchardCore.Environment.Extensions.Features;
 using OrchardCore.Environment.Shell;
 
-namespace OrchardCore.DisplayManagement.Descriptors
+namespace OrchardCore.DisplayManagement.Descriptors;
+
+/// <summary>
+/// This class needs to use a cache which is a singleton per tenant as it can contain different shapes
+/// for each tenant, even if they share the same theme.
+/// </summary>
+public class DefaultShapeTableManager : IShapeTableManager
 {
-    /// <summary>
-    /// This class needs to use a cache which is a singleton per tenant as it can contain different shapes
-    /// for each tenant, even if they share the same theme.
-    /// </summary>
-    public class DefaultShapeTableManager : IShapeTableManager
-    {
-        private const string DefaultThemeIdKey = "_ShapeTable";
+    private const string DefaultThemeIdKey = "_ShapeTable";
 
-        // FeatureShapeDescriptors are identical across tenants so they can be reused statically. Each shape table will
-        // create a unique list of these per tenant.
-        private static readonly ConcurrentDictionary<string, FeatureShapeDescriptor> _shapeDescriptors = new();
+    // FeatureShapeDescriptors are identical across tenants so they can be reused statically. Each shape table will
+    // create a unique list of these per tenant.
+    private static readonly ConcurrentDictionary<string, FeatureShapeDescriptor> _shapeDescriptors = new();
 
-        private static readonly object _syncLock = new();
+    private static readonly object _syncLock = new();
 
-        // Singleton cache to hold a tenant's theme ShapeTable.
-        private readonly IDictionary<string, ShapeTable> _shapeTableCache;
+    // Singleton cache to hold a tenant's theme ShapeTable.
+    private readonly IDictionary<string, ShapeTable> _shapeTableCache;
 
-        private readonly IServiceProvider _serviceProvider;
-        private readonly ILogger _logger;
-        private readonly SemaphoreSlim _semaphore;
+    private readonly IServiceProvider _serviceProvider;
+    private readonly ILogger _logger;
+    private readonly SemaphoreSlim _semaphore;
+
+    public DefaultShapeTableManager(
+        [FromKeyedServices(nameof(DefaultShapeTableManager))] IDictionary<string, ShapeTable> shapeTableCache,
+        IServiceProvider serviceProvider,
+        ILogger<DefaultShapeTableManager> logger)
+    {
+        _shapeTableCache = shapeTableCache;
+        _serviceProvider = serviceProvider;
+        _semaphore = new SemaphoreSlim(1, 1);
+        _logger = logger;
+    }
 
-        public DefaultShapeTableManager(
-            [FromKeyedServices(nameof(DefaultShapeTableManager))] IDictionary<string, ShapeTable> shapeTableCache,
-            IServiceProvider serviceProvider,
-            ILogger<DefaultShapeTableManager> logger)
+    public async Task<ShapeTable> GetShapeTableAsync(string themeId)
+    {
+        // This method is intentionally not awaited since most calls
+        // are from cache.
+        if (_shapeTableCache.TryGetValue(themeId ?? DefaultThemeIdKey, out var shapeTable))
         {
-            _shapeTableCache = shapeTableCache;
-            _serviceProvider = serviceProvider;
-            _semaphore = new SemaphoreSlim(1, 1);
-            _logger = logger;
+            return shapeTable;
         }
 
-        public async Task<ShapeTable> GetShapeTableAsync(string themeId)
+        await _semaphore.WaitAsync();
+        try
         {
-            // This method is intentionally not awaited since most calls
-            // are from cache.
-            if (_shapeTableCache.TryGetValue(themeId ?? DefaultThemeIdKey, out var shapeTable))
+            if (_shapeTableCache.TryGetValue(themeId ?? DefaultThemeIdKey, out shapeTable))
             {
                 return shapeTable;
             }
 
-            await _semaphore.WaitAsync();
-            try
-            {
-                if (_shapeTableCache.TryGetValue(themeId ?? DefaultThemeIdKey, out shapeTable))
-                {
-                    return shapeTable;
-                }
-
-                return await BuildShapeTableAsync(themeId);
-            }
-            finally
-            {
-                _semaphore.Release();
-            }
+            return await BuildShapeTableAsync(themeId);
         }
-
-        private async Task<ShapeTable> BuildShapeTableAsync(string themeId)
+        finally
         {
-            _logger.LogInformation("Start building shape table for {Theme}", themeId);
-
-            // These services are resolved lazily since they are only required when initializing the shape tables
-            // during the first request. And binding strategies would be expensive to build since this service is called many times
-            // per request.
+            _semaphore.Release();
+        }
+    }
 
-            var hostingEnvironment = _serviceProvider.GetRequiredService<IHostEnvironment>();
-            var bindingStrategies = _serviceProvider.GetRequiredService<IEnumerable<IShapeTableProvider>>();
-            var shellFeaturesManager = _serviceProvider.GetRequiredService<IShellFeaturesManager>();
-            var extensionManager = _serviceProvider.GetRequiredService<IExtensionManager>();
-            var typeFeatureProvider = _serviceProvider.GetRequiredService<ITypeFeatureProvider>();
+    private async Task<ShapeTable> BuildShapeTableAsync(string themeId)
+    {
+        _logger.LogInformation("Start building shape table for {Theme}", themeId);
 
-            HashSet<string> excludedFeatures;
+        // These services are resolved lazily since they are only required when initializing the shape tables
+        // during the first request. And binding strategies would be expensive to build since this service is called many times
+        // per request.
 
-            // Here we don't use a lock for thread safety but for atomicity.
-            lock (_syncLock)
-            {
-                excludedFeatures = new HashSet<string>(_shapeDescriptors.Select(kv => kv.Value.Feature.Id));
-            }
+        var hostingEnvironment = _serviceProvider.GetRequiredService<IHostEnvironment>();
+        var bindingStrategies = _serviceProvider.GetRequiredService<IEnumerable<IShapeTableProvider>>();
+        var shellFeaturesManager = _serviceProvider.GetRequiredService<IShellFeaturesManager>();
+        var extensionManager = _serviceProvider.GetRequiredService<IExtensionManager>();
+        var typeFeatureProvider = _serviceProvider.GetRequiredService<ITypeFeatureProvider>();
 
-            var shapeDescriptors = new Dictionary<string, FeatureShapeDescriptor>();
+        HashSet<string> excludedFeatures;
 
-            foreach (var bindingStrategy in bindingStrategies)
-            {
-                var strategyFeature = typeFeatureProvider.GetFeatureForDependency(bindingStrategy.GetType());
+        // Here we don't use a lock for thread safety but for atomicity.
+        lock (_syncLock)
+        {
+            excludedFeatures = new HashSet<string>(_shapeDescriptors.Select(kv => kv.Value.Feature.Id));
+        }
 
-                var builder = new ShapeTableBuilder(strategyFeature, excludedFeatures);
-                await bindingStrategy.DiscoverAsync(builder);
-                var builtAlterations = builder.BuildAlterations();
+        var shapeDescriptors = new Dictionary<string, FeatureShapeDescriptor>();
 
-                BuildDescriptors(bindingStrategy, builtAlterations, shapeDescriptors);
-            }
+        foreach (var bindingStrategy in bindingStrategies)
+        {
+            var strategyFeature = typeFeatureProvider.GetFeatureForDependency(bindingStrategy.GetType());
 
-            // Here we don't use a lock for thread safety but for atomicity.
-            lock (_syncLock)
-            {
-                foreach (var kv in shapeDescriptors)
-                {
-                    _shapeDescriptors[kv.Key] = kv.Value;
-                }
-            }
+            var builder = new ShapeTableBuilder(strategyFeature, excludedFeatures);
+            await bindingStrategy.DiscoverAsync(builder);
+            var builtAlterations = builder.BuildAlterations();
 
-            var enabledAndOrderedFeatureIds = (await shellFeaturesManager.GetEnabledFeaturesAsync())
-                .Select(f => f.Id)
-                .ToList();
+            BuildDescriptors(bindingStrategy, builtAlterations, shapeDescriptors);
+        }
 
-            // let the application acting as a super theme for shapes rendering.
-            if (enabledAndOrderedFeatureIds.Remove(hostingEnvironment.ApplicationName))
+        // Here we don't use a lock for thread safety but for atomicity.
+        lock (_syncLock)
+        {
+            foreach (var kv in shapeDescriptors)
             {
-                enabledAndOrderedFeatureIds.Add(hostingEnvironment.ApplicationName);
+                _shapeDescriptors[kv.Key] = kv.Value;
             }
+        }
 
-            var descriptors = _shapeDescriptors
-                .Where(sd => enabledAndOrderedFeatureIds.Contains(sd.Value.Feature.Id))
-                .Where(sd => IsModuleOrRequestedTheme(extensionManager, sd.Value.Feature, themeId))
-                .OrderBy(sd => enabledAndOrderedFeatureIds.IndexOf(sd.Value.Feature.Id))
-                .GroupBy(sd => sd.Value.ShapeType, StringComparer.OrdinalIgnoreCase)
-                .Select(group => new ShapeDescriptorIndex
-                (
-                    shapeType: group.Key,
-                    alterationKeys: group.Select(kv => kv.Key),
-                    descriptors: _shapeDescriptors
-                ))
-                .ToList();
+        var enabledAndOrderedFeatureIds = (await shellFeaturesManager.GetEnabledFeaturesAsync())
+            .Select(f => f.Id)
+            .ToList();
 
-            var shapeTable = new ShapeTable
+        // let the application acting as a super theme for shapes rendering.
+        if (enabledAndOrderedFeatureIds.Remove(hostingEnvironment.ApplicationName))
+        {
+            enabledAndOrderedFeatureIds.Add(hostingEnvironment.ApplicationName);
+        }
+
+        var descriptors = _shapeDescriptors
+            .Where(sd => enabledAndOrderedFeatureIds.Contains(sd.Value.Feature.Id))
+            .Where(sd => IsModuleOrRequestedTheme(extensionManager, sd.Value.Feature, themeId))
+            .OrderBy(sd => enabledAndOrderedFeatureIds.IndexOf(sd.Value.Feature.Id))
+            .GroupBy(sd => sd.Value.ShapeType, StringComparer.OrdinalIgnoreCase)
+            .Select(group => new ShapeDescriptorIndex
             (
-                descriptors: descriptors.ToFrozenDictionary(sd => sd.ShapeType, x => (ShapeDescriptor)x, StringComparer.OrdinalIgnoreCase),
-                bindings: descriptors.SelectMany(sd => sd.Bindings).ToFrozenDictionary(kv => kv.Key, kv => kv.Value, StringComparer.OrdinalIgnoreCase)
-            );
+                shapeType: group.Key,
+                alterationKeys: group.Select(kv => kv.Key),
+                descriptors: _shapeDescriptors
+            ))
+            .ToList();
 
-            _logger.LogInformation("Done building shape table for {Theme}", themeId);
+        var shapeTable = new ShapeTable
+        (
+            descriptors: descriptors.ToFrozenDictionary(sd => sd.ShapeType, x => (ShapeDescriptor)x, StringComparer.OrdinalIgnoreCase),
+            bindings: descriptors.SelectMany(sd => sd.Bindings).ToFrozenDictionary(kv => kv.Key, kv => kv.Value, StringComparer.OrdinalIgnoreCase)
+        );
 
-            _shapeTableCache[themeId ?? DefaultThemeIdKey] = shapeTable;
+        _logger.LogInformation("Done building shape table for {Theme}", themeId);
 
-            return shapeTable;
-        }
+        _shapeTableCache[themeId ?? DefaultThemeIdKey] = shapeTable;
+
+        return shapeTable;
+    }
 
-        private static void BuildDescriptors(
-            IShapeTableProvider bindingStrategy,
-            IEnumerable<ShapeAlteration> builtAlterations,
-            Dictionary<string, FeatureShapeDescriptor> shapeDescriptors)
+    private static void BuildDescriptors(
+        IShapeTableProvider bindingStrategy,
+        IEnumerable<ShapeAlteration> builtAlterations,
+        Dictionary<string, FeatureShapeDescriptor> shapeDescriptors)
+    {
+        var alterationSets = builtAlterations.GroupBy(a => a.Feature.Id + a.ShapeType);
+
+        foreach (var alterations in alterationSets)
         {
-            var alterationSets = builtAlterations.GroupBy(a => a.Feature.Id + a.ShapeType);
+            var firstAlteration = alterations.First();
 
-            foreach (var alterations in alterationSets)
-            {
-                var firstAlteration = alterations.First();
+            var key = bindingStrategy.GetType().Name
+                + firstAlteration.Feature.Id
+                + firstAlteration.ShapeType.ToLower();
 
-                var key = bindingStrategy.GetType().Name
-                    + firstAlteration.Feature.Id
-                    + firstAlteration.ShapeType.ToLower();
+            if (!_shapeDescriptors.ContainsKey(key))
+            {
+                var descriptor = new FeatureShapeDescriptor
+                (
+                    firstAlteration.Feature,
+                    firstAlteration.ShapeType
+                );
 
-                if (!_shapeDescriptors.ContainsKey(key))
+                foreach (var alteration in alterations)
                 {
-                    var descriptor = new FeatureShapeDescriptor
-                    (
-                        firstAlteration.Feature,
-                        firstAlteration.ShapeType
-                    );
-
-                    foreach (var alteration in alterations)
-                    {
-                        alteration.Alter(descriptor);
-                    }
-
-                    shapeDescriptors[key] = descriptor;
+                    alteration.Alter(descriptor);
                 }
+
+                shapeDescriptors[key] = descriptor;
             }
         }
+    }
 
-        private static bool IsModuleOrRequestedTheme(IExtensionManager extensionManager, IFeatureInfo feature, string themeId)
+    private static bool IsModuleOrRequestedTheme(IExtensionManager extensionManager, IFeatureInfo feature, string themeId)
+    {
+        if (!feature.IsTheme())
         {
-            if (!feature.IsTheme())
-            {
-                return true;
-            }
+            return true;
+        }
 
-            if (string.IsNullOrEmpty(themeId))
-            {
-                return false;
-            }
+        if (string.IsNullOrEmpty(themeId))
+        {
+            return false;
+        }
 
-            return feature.Id == themeId || IsBaseTheme(feature.Id, themeId);
+        return feature.Id == themeId || IsBaseTheme(feature.Id, themeId);
 
-            bool IsBaseTheme(string themeFeatureId, string themeId)
-            {
-                return extensionManager
-                    .GetFeatureDependencies(themeId)
-                    .Any(f => f.Id == themeFeatureId);
-            }
+        bool IsBaseTheme(string themeFeatureId, string themeId)
+        {
+            return extensionManager
+                .GetFeatureDependencies(themeId)
+                .Any(f => f.Id == themeFeatureId);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/FeatureShapeDescriptor.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/FeatureShapeDescriptor.cs
index fe16550b2a5..f0f775a24fc 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/FeatureShapeDescriptor.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/FeatureShapeDescriptor.cs
@@ -6,161 +6,160 @@
 using OrchardCore.DisplayManagement.Implementation;
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.DisplayManagement.Descriptors
+namespace OrchardCore.DisplayManagement.Descriptors;
+
+public class FeatureShapeDescriptor : ShapeDescriptor
 {
-    public class FeatureShapeDescriptor : ShapeDescriptor
+    public FeatureShapeDescriptor(IFeatureInfo feature, string shapeType)
     {
-        public FeatureShapeDescriptor(IFeatureInfo feature, string shapeType)
-        {
-            Feature = feature;
-            ShapeType = shapeType;
-        }
-
-        public IFeatureInfo Feature { get; private set; }
+        Feature = feature;
+        ShapeType = shapeType;
     }
 
-    public class ShapeDescriptorIndex : ShapeDescriptor
+    public IFeatureInfo Feature { get; private set; }
+}
+
+public class ShapeDescriptorIndex : ShapeDescriptor
+{
+    private readonly List<FeatureShapeDescriptor> _alternationDescriptors = [];
+    private readonly List<string> _wrappers = [];
+    private readonly List<string> _bindingSources = [];
+    private readonly Dictionary<string, ShapeBinding> _bindings = new(StringComparer.OrdinalIgnoreCase);
+    private readonly List<Func<ShapeCreatingContext, Task>> _creatingAsync = [];
+    private readonly List<Func<ShapeCreatedContext, Task>> _createdAsync = [];
+    private readonly List<Func<ShapeDisplayContext, Task>> _displayingAsync = [];
+    private readonly List<Func<ShapeDisplayContext, Task>> _processingAsync = [];
+    private readonly List<Func<ShapeDisplayContext, Task>> _displayedAsync = [];
+
+    public ShapeDescriptorIndex(
+        string shapeType,
+        IEnumerable<string> alterationKeys,
+        ConcurrentDictionary<string, FeatureShapeDescriptor> descriptors)
     {
-        private readonly List<FeatureShapeDescriptor> _alternationDescriptors = [];
-        private readonly List<string> _wrappers = [];
-        private readonly List<string> _bindingSources = [];
-        private readonly Dictionary<string, ShapeBinding> _bindings = new(StringComparer.OrdinalIgnoreCase);
-        private readonly List<Func<ShapeCreatingContext, Task>> _creatingAsync = [];
-        private readonly List<Func<ShapeCreatedContext, Task>> _createdAsync = [];
-        private readonly List<Func<ShapeDisplayContext, Task>> _displayingAsync = [];
-        private readonly List<Func<ShapeDisplayContext, Task>> _processingAsync = [];
-        private readonly List<Func<ShapeDisplayContext, Task>> _displayedAsync = [];
-
-        public ShapeDescriptorIndex(
-            string shapeType,
-            IEnumerable<string> alterationKeys,
-            ConcurrentDictionary<string, FeatureShapeDescriptor> descriptors)
+        ArgumentException.ThrowIfNullOrEmpty(shapeType);
+
+        ShapeType = shapeType;
+
+        // Pre-calculate as much as we can for performance reasons.
+        foreach (var alterationKey in alterationKeys)
         {
-            ArgumentException.ThrowIfNullOrEmpty(shapeType);
+            if (!descriptors.TryGetValue(alterationKey, out var alternationDescriptor))
+            {
+                continue;
+            }
 
-            ShapeType = shapeType;
+            _alternationDescriptors.Add(alternationDescriptor);
+            _wrappers.AddRange(alternationDescriptor.Wrappers);
+            _bindingSources.AddRange(alternationDescriptor.BindingSources);
+            _creatingAsync.AddRange(alternationDescriptor.CreatingAsync);
+            _createdAsync.AddRange(alternationDescriptor.CreatedAsync);
+            _displayingAsync.AddRange(alternationDescriptor.DisplayingAsync);
+            _displayedAsync.AddRange(alternationDescriptor.DisplayedAsync);
+            _processingAsync.AddRange(alternationDescriptor.ProcessingAsync);
 
-            // Pre-calculate as much as we can for performance reasons.
-            foreach (var alterationKey in alterationKeys)
+            foreach (var binding in alternationDescriptor.Bindings)
             {
-                if (!descriptors.TryGetValue(alterationKey, out var alternationDescriptor))
-                {
-                    continue;
-                }
-
-                _alternationDescriptors.Add(alternationDescriptor);
-                _wrappers.AddRange(alternationDescriptor.Wrappers);
-                _bindingSources.AddRange(alternationDescriptor.BindingSources);
-                _creatingAsync.AddRange(alternationDescriptor.CreatingAsync);
-                _createdAsync.AddRange(alternationDescriptor.CreatedAsync);
-                _displayingAsync.AddRange(alternationDescriptor.DisplayingAsync);
-                _displayedAsync.AddRange(alternationDescriptor.DisplayedAsync);
-                _processingAsync.AddRange(alternationDescriptor.ProcessingAsync);
-
-                foreach (var binding in alternationDescriptor.Bindings)
-                {
-                    _bindings[binding.Key] = binding.Value;
-                }
+                _bindings[binding.Key] = binding.Value;
             }
         }
+    }
 
-        /// <summary>
-        /// The BindingSource is informational text about the source of the Binding delegate. Not used except for
-        /// troubleshooting.
-        /// </summary>
-        public override string BindingSource =>
-            Bindings.TryGetValue(ShapeType, out var binding) ? binding.BindingSource : null;
+    /// <summary>
+    /// The BindingSource is informational text about the source of the Binding delegate. Not used except for
+    /// troubleshooting.
+    /// </summary>
+    public override string BindingSource =>
+        Bindings.TryGetValue(ShapeType, out var binding) ? binding.BindingSource : null;
 
-        public override Func<DisplayContext, Task<IHtmlContent>> Binding =>
-            Bindings.TryGetValue(ShapeType, out var binding) ? binding.BindingAsync : null;
+    public override Func<DisplayContext, Task<IHtmlContent>> Binding =>
+        Bindings.TryGetValue(ShapeType, out var binding) ? binding.BindingAsync : null;
 
-        public override IDictionary<string, ShapeBinding> Bindings => _bindings;
+    public override IDictionary<string, ShapeBinding> Bindings => _bindings;
 
-        public override IReadOnlyList<Func<ShapeCreatingContext, Task>> CreatingAsync => _creatingAsync;
+    public override IReadOnlyList<Func<ShapeCreatingContext, Task>> CreatingAsync => _creatingAsync;
 
-        public override IReadOnlyList<Func<ShapeCreatedContext, Task>> CreatedAsync => _createdAsync;
+    public override IReadOnlyList<Func<ShapeCreatedContext, Task>> CreatedAsync => _createdAsync;
 
-        public override IReadOnlyList<Func<ShapeDisplayContext, Task>> DisplayingAsync => _displayingAsync;
+    public override IReadOnlyList<Func<ShapeDisplayContext, Task>> DisplayingAsync => _displayingAsync;
 
-        public override IReadOnlyList<Func<ShapeDisplayContext, Task>> ProcessingAsync => _processingAsync;
+    public override IReadOnlyList<Func<ShapeDisplayContext, Task>> ProcessingAsync => _processingAsync;
 
-        public override IReadOnlyList<Func<ShapeDisplayContext, Task>> DisplayedAsync => _displayedAsync;
+    public override IReadOnlyList<Func<ShapeDisplayContext, Task>> DisplayedAsync => _displayedAsync;
 
-        public override Func<ShapePlacementContext, PlacementInfo> Placement => CalculatePlacement;
+    public override Func<ShapePlacementContext, PlacementInfo> Placement => CalculatePlacement;
 
-        private PlacementInfo CalculatePlacement(ShapePlacementContext ctx)
+    private PlacementInfo CalculatePlacement(ShapePlacementContext ctx)
+    {
+        PlacementInfo info = null;
+        for (var i = _alternationDescriptors.Count - 1; i >= 0; i--)
         {
-            PlacementInfo info = null;
-            for (var i = _alternationDescriptors.Count - 1; i >= 0; i--)
+            var descriptor = _alternationDescriptors[i];
+            info = descriptor.Placement(ctx);
+            if (info != null)
             {
-                var descriptor = _alternationDescriptors[i];
-                info = descriptor.Placement(ctx);
-                if (info != null)
-                {
-                    break;
-                }
+                break;
             }
-
-            return info ?? DefaultPlacementAction(ctx);
         }
 
-        public override IReadOnlyList<string> Wrappers => _wrappers;
+        return info ?? DefaultPlacementAction(ctx);
+    }
+
+    public override IReadOnlyList<string> Wrappers => _wrappers;
 
-        public override IReadOnlyList<string> BindingSources => _bindingSources;
+    public override IReadOnlyList<string> BindingSources => _bindingSources;
+}
+
+public class ShapeDescriptor
+{
+    public ShapeDescriptor()
+    {
+        Placement = DefaultPlacementAction;
     }
 
-    public class ShapeDescriptor
+    protected PlacementInfo DefaultPlacementAction(ShapePlacementContext context)
     {
-        public ShapeDescriptor()
+        // A null default placement means no default placement is specified
+        if (DefaultPlacement == null)
         {
-            Placement = DefaultPlacementAction;
+            return null;
         }
 
-        protected PlacementInfo DefaultPlacementAction(ShapePlacementContext context)
+        return new PlacementInfo
         {
-            // A null default placement means no default placement is specified
-            if (DefaultPlacement == null)
-            {
-                return null;
-            }
-
-            return new PlacementInfo
-            {
-                Location = DefaultPlacement
-            };
-        }
+            Location = DefaultPlacement
+        };
+    }
 
-        public string ShapeType { get; set; }
+    public string ShapeType { get; set; }
 
-        /// <summary>
-        /// The BindingSource is informational text about the source of the Binding delegate. Not used except for
-        /// troubleshooting.
-        /// </summary>
-        public virtual string BindingSource =>
-            Bindings.TryGetValue(ShapeType, out var binding) ? binding.BindingSource : null;
+    /// <summary>
+    /// The BindingSource is informational text about the source of the Binding delegate. Not used except for
+    /// troubleshooting.
+    /// </summary>
+    public virtual string BindingSource =>
+        Bindings.TryGetValue(ShapeType, out var binding) ? binding.BindingSource : null;
 
-        public virtual Func<DisplayContext, Task<IHtmlContent>> Binding =>
-            Bindings[ShapeType].BindingAsync;
+    public virtual Func<DisplayContext, Task<IHtmlContent>> Binding =>
+        Bindings[ShapeType].BindingAsync;
 
-        public virtual IDictionary<string, ShapeBinding> Bindings { get; } = new Dictionary<string, ShapeBinding>(StringComparer.OrdinalIgnoreCase);
+    public virtual IDictionary<string, ShapeBinding> Bindings { get; } = new Dictionary<string, ShapeBinding>(StringComparer.OrdinalIgnoreCase);
 
-        public virtual IReadOnlyList<Func<ShapeCreatingContext, Task>> CreatingAsync { get; set; } = [];
-        public virtual IReadOnlyList<Func<ShapeCreatedContext, Task>> CreatedAsync { get; set; } = [];
-        public virtual IReadOnlyList<Func<ShapeDisplayContext, Task>> DisplayingAsync { get; set; } = [];
-        public virtual IReadOnlyList<Func<ShapeDisplayContext, Task>> ProcessingAsync { get; set; } = [];
-        public virtual IReadOnlyList<Func<ShapeDisplayContext, Task>> DisplayedAsync { get; set; } = [];
+    public virtual IReadOnlyList<Func<ShapeCreatingContext, Task>> CreatingAsync { get; set; } = [];
+    public virtual IReadOnlyList<Func<ShapeCreatedContext, Task>> CreatedAsync { get; set; } = [];
+    public virtual IReadOnlyList<Func<ShapeDisplayContext, Task>> DisplayingAsync { get; set; } = [];
+    public virtual IReadOnlyList<Func<ShapeDisplayContext, Task>> ProcessingAsync { get; set; } = [];
+    public virtual IReadOnlyList<Func<ShapeDisplayContext, Task>> DisplayedAsync { get; set; } = [];
 
-        public virtual Func<ShapePlacementContext, PlacementInfo> Placement { get; set; }
-        public string DefaultPlacement { get; set; }
+    public virtual Func<ShapePlacementContext, PlacementInfo> Placement { get; set; }
+    public string DefaultPlacement { get; set; }
 
-        public virtual IReadOnlyList<string> Wrappers { get; set; } = [];
-        public virtual IReadOnlyList<string> BindingSources { get; set; } = [];
-    }
+    public virtual IReadOnlyList<string> Wrappers { get; set; } = [];
+    public virtual IReadOnlyList<string> BindingSources { get; set; } = [];
+}
 
-    public class ShapeBinding
-    {
-        public string BindingName { get; set; }
-        public string BindingSource { get; set; }
-        public virtual Func<DisplayContext, Task<IHtmlContent>> BindingAsync { get; set; }
-    }
+public class ShapeBinding
+{
+    public string BindingName { get; set; }
+    public string BindingSource { get; set; }
+    public virtual Func<DisplayContext, Task<IHtmlContent>> BindingAsync { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/PlacementInfo.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/PlacementInfo.cs
index 344d3a08778..4cdc3e9e8cd 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/PlacementInfo.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/PlacementInfo.cs
@@ -1,148 +1,147 @@
 using System;
 using OrchardCore.DisplayManagement.Shapes;
 
-namespace OrchardCore.DisplayManagement.Descriptors
+namespace OrchardCore.DisplayManagement.Descriptors;
+
+public class PlacementInfo
 {
-    public class PlacementInfo
+    private static readonly char[] _delimiters = [':', '#', '@', '%', '|'];
+
+    public string Location { get; set; }
+    public string Source { get; set; }
+    public string ShapeType { get; set; }
+    public string DefaultPosition { get; set; }
+    public AlternatesCollection Alternates { get; set; }
+    public AlternatesCollection Wrappers { get; set; }
+
+    public bool IsLayoutZone()
+    {
+        return Location.StartsWith("/", StringComparison.OrdinalIgnoreCase);
+    }
+
+    /// <summary>
+    /// Returns the list of zone names.
+    /// e.g.,. <code>Content.Metadata:1</code> will return 'Content', 'Metadata'.
+    /// </summary>
+    /// <returns></returns>
+    public string[] GetZones()
     {
-        private static readonly char[] _delimiters = [':', '#', '@', '%', '|'];
+        string zones;
+        var location = Location;
+
+        // Strip the Layout marker.
+        if (IsLayoutZone())
+        {
+            location = location[1..];
+        }
+
+        var firstDelimiter = location.IndexOfAny(_delimiters);
+        if (firstDelimiter == -1)
+        {
+            zones = location;
+        }
+        else
+        {
+            zones = location[..firstDelimiter];
+        }
+
+        return zones.Split('.');
+    }
+
+    public string GetPosition()
+    {
+        var contentDelimiter = Location.IndexOf(':');
+        if (contentDelimiter == -1)
+        {
+            return DefaultPosition ?? "";
+        }
 
-        public string Location { get; set; }
-        public string Source { get; set; }
-        public string ShapeType { get; set; }
-        public string DefaultPosition { get; set; }
-        public AlternatesCollection Alternates { get; set; }
-        public AlternatesCollection Wrappers { get; set; }
+        var secondDelimiter = Location.IndexOfAny(_delimiters, contentDelimiter + 1);
+        if (secondDelimiter == -1)
+        {
+            return Location[(contentDelimiter + 1)..];
+        }
+
+        return Location[(contentDelimiter + 1)..secondDelimiter];
+    }
 
-        public bool IsLayoutZone()
+    public string GetTab()
+    {
+        var tabDelimiter = Location.IndexOf('#');
+        if (tabDelimiter == -1)
         {
-            return Location.StartsWith("/", StringComparison.OrdinalIgnoreCase);
+            return "";
         }
 
-        /// <summary>
-        /// Returns the list of zone names.
-        /// e.g.,. <code>Content.Metadata:1</code> will return 'Content', 'Metadata'.
-        /// </summary>
-        /// <returns></returns>
-        public string[] GetZones()
+        var nextDelimiter = Location.IndexOfAny(_delimiters, tabDelimiter + 1);
+        if (nextDelimiter == -1)
         {
-            string zones;
-            var location = Location;
-
-            // Strip the Layout marker.
-            if (IsLayoutZone())
-            {
-                location = location[1..];
-            }
-
-            var firstDelimiter = location.IndexOfAny(_delimiters);
-            if (firstDelimiter == -1)
-            {
-                zones = location;
-            }
-            else
-            {
-                zones = location[..firstDelimiter];
-            }
-
-            return zones.Split('.');
+            return Location[(tabDelimiter + 1)..];
         }
 
-        public string GetPosition()
+        return Location[(tabDelimiter + 1)..nextDelimiter];
+    }
+
+    /// <summary>
+    /// Extracts the group information from a location string, or <c>null</c> if it is not present.
+    /// e.g., Content:12@search.
+    /// </summary>
+    public string GetGroup()
+    {
+        var groupDelimiter = Location.IndexOf('@');
+        if (groupDelimiter == -1)
         {
-            var contentDelimiter = Location.IndexOf(':');
-            if (contentDelimiter == -1)
-            {
-                return DefaultPosition ?? "";
-            }
-
-            var secondDelimiter = Location.IndexOfAny(_delimiters, contentDelimiter + 1);
-            if (secondDelimiter == -1)
-            {
-                return Location[(contentDelimiter + 1)..];
-            }
-
-            return Location[(contentDelimiter + 1)..secondDelimiter];
+            return null;
         }
 
-        public string GetTab()
+        var nextDelimiter = Location.IndexOfAny(_delimiters, groupDelimiter + 1);
+        if (nextDelimiter == -1)
         {
-            var tabDelimiter = Location.IndexOf('#');
-            if (tabDelimiter == -1)
-            {
-                return "";
-            }
-
-            var nextDelimiter = Location.IndexOfAny(_delimiters, tabDelimiter + 1);
-            if (nextDelimiter == -1)
-            {
-                return Location[(tabDelimiter + 1)..];
-            }
-
-            return Location[(tabDelimiter + 1)..nextDelimiter];
+            return Location[(groupDelimiter + 1)..];
         }
 
-        /// <summary>
-        /// Extracts the group information from a location string, or <c>null</c> if it is not present.
-        /// e.g., Content:12@search.
-        /// </summary>
-        public string GetGroup()
+        return Location[(groupDelimiter + 1)..nextDelimiter];
+    }
+
+    /// <summary>
+    /// Extracts the card information from a location string, or <c>null</c> if it is not present.
+    /// e.g., Content:12%search.
+    /// </summary>
+    public string GetCard()
+    {
+        var cardDelimiter = Location.IndexOf('%');
+        if (cardDelimiter == -1)
         {
-            var groupDelimiter = Location.IndexOf('@');
-            if (groupDelimiter == -1)
-            {
-                return null;
-            }
-
-            var nextDelimiter = Location.IndexOfAny(_delimiters, groupDelimiter + 1);
-            if (nextDelimiter == -1)
-            {
-                return Location[(groupDelimiter + 1)..];
-            }
-
-            return Location[(groupDelimiter + 1)..nextDelimiter];
+            return null;
         }
 
-        /// <summary>
-        /// Extracts the card information from a location string, or <c>null</c> if it is not present.
-        /// e.g., Content:12%search.
-        /// </summary>
-        public string GetCard()
+        var nextDelimiter = Location.IndexOfAny(_delimiters, cardDelimiter + 1);
+        if (nextDelimiter == -1)
         {
-            var cardDelimiter = Location.IndexOf('%');
-            if (cardDelimiter == -1)
-            {
-                return null;
-            }
-
-            var nextDelimiter = Location.IndexOfAny(_delimiters, cardDelimiter + 1);
-            if (nextDelimiter == -1)
-            {
-                return Location[(cardDelimiter + 1)..];
-            }
-
-            return Location[(cardDelimiter + 1)..nextDelimiter];
+            return Location[(cardDelimiter + 1)..];
         }
 
-        /// <summary>
-        /// Extracts the column information from a location string, or <c>null</c> if it is not present.
-        /// e.g., Content:12!search.
-        /// </summary>
-        public string GetColumn()
+        return Location[(cardDelimiter + 1)..nextDelimiter];
+    }
+
+    /// <summary>
+    /// Extracts the column information from a location string, or <c>null</c> if it is not present.
+    /// e.g., Content:12!search.
+    /// </summary>
+    public string GetColumn()
+    {
+        var colDelimeter = Location.IndexOf('|');
+        if (colDelimeter == -1)
         {
-            var colDelimeter = Location.IndexOf('|');
-            if (colDelimeter == -1)
-            {
-                return null;
-            }
-
-            var nextDelimiter = Location.IndexOfAny(_delimiters, colDelimeter + 1);
-            if (nextDelimiter == -1)
-            {
-                return Location[(colDelimeter + 1)..];
-            }
-
-            return Location[(colDelimeter + 1)..nextDelimiter];
+            return null;
         }
+
+        var nextDelimiter = Location.IndexOfAny(_delimiters, colDelimeter + 1);
+        if (nextDelimiter == -1)
+        {
+            return Location[(colDelimeter + 1)..];
+        }
+
+        return Location[(colDelimeter + 1)..nextDelimiter];
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/PlacementInfoExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/PlacementInfoExtensions.cs
index bfeaa6e013b..edc857b06f6 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/PlacementInfoExtensions.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/PlacementInfoExtensions.cs
@@ -1,69 +1,68 @@
 using OrchardCore.DisplayManagement.Shapes;
 
-namespace OrchardCore.DisplayManagement.Descriptors
+namespace OrchardCore.DisplayManagement.Descriptors;
+
+public static class PlacementInfoExtensions
 {
-    public static class PlacementInfoExtensions
+    /// <summary>
+    /// Combines two <see cref="PlacementInfo"/>.
+    /// </summary>
+    /// <remarks>
+    /// Second overrides first. First and second can be null.
+    /// </remarks>
+    /// <param name="first">First placement.</param>
+    /// <param name="second">Second placement.</param>
+    /// <returns>Combined <see cref="PlacementInfo"/>.</returns>
+    public static PlacementInfo Combine(this PlacementInfo first, PlacementInfo second)
     {
-        /// <summary>
-        /// Combines two <see cref="PlacementInfo"/>.
-        /// </summary>
-        /// <remarks>
-        /// Second overrides first. First and second can be null.
-        /// </remarks>
-        /// <param name="first">First placement.</param>
-        /// <param name="second">Second placement.</param>
-        /// <returns>Combined <see cref="PlacementInfo"/>.</returns>
-        public static PlacementInfo Combine(this PlacementInfo first, PlacementInfo second)
+        if (first == null)
         {
-            if (first == null)
-            {
-                return second;
-            }
-            else if (second != null)
+            return second;
+        }
+        else if (second != null)
+        {
+            var combined = new PlacementInfo
             {
-                var combined = new PlacementInfo
-                {
-                    Alternates = first.Alternates.Combine(second.Alternates),
-                    Wrappers = first.Wrappers.Combine(second.Wrappers),
+                Alternates = first.Alternates.Combine(second.Alternates),
+                Wrappers = first.Wrappers.Combine(second.Wrappers),
 
-                    ShapeType = string.IsNullOrEmpty(second.ShapeType) ? first.ShapeType : second.ShapeType,
-                    Location = string.IsNullOrEmpty(second.Location) ? first.Location : second.Location,
-                    DefaultPosition = string.IsNullOrEmpty(second.DefaultPosition) ? first.DefaultPosition : second.DefaultPosition,
-                    Source = $"{first.Source},{second.Source}"
-                };
+                ShapeType = string.IsNullOrEmpty(second.ShapeType) ? first.ShapeType : second.ShapeType,
+                Location = string.IsNullOrEmpty(second.Location) ? first.Location : second.Location,
+                DefaultPosition = string.IsNullOrEmpty(second.DefaultPosition) ? first.DefaultPosition : second.DefaultPosition,
+                Source = $"{first.Source},{second.Source}"
+            };
 
-                return combined;
-            }
-
-            return first;
+            return combined;
         }
 
-        /// <summary>
-        /// Combines two <see cref="AlternatesCollection"/>.
-        /// </summary>
-        /// <remarks>
-        /// First and second can be null.
-        /// </remarks>
-        /// <param name="first">First collection.</param>
-        /// <param name="second">Second collection.</param>
-        /// <returns>Combined <see cref="AlternatesCollection"/>.</returns>
-        public static AlternatesCollection Combine(this AlternatesCollection first, AlternatesCollection second)
-        {
-            if (first == null)
-            {
-                return second;
-            }
-            else if (second != null)
-            {
-                var combined = new AlternatesCollection();
+        return first;
+    }
 
-                combined.AddRange(first);
-                combined.AddRange(second);
+    /// <summary>
+    /// Combines two <see cref="AlternatesCollection"/>.
+    /// </summary>
+    /// <remarks>
+    /// First and second can be null.
+    /// </remarks>
+    /// <param name="first">First collection.</param>
+    /// <param name="second">Second collection.</param>
+    /// <returns>Combined <see cref="AlternatesCollection"/>.</returns>
+    public static AlternatesCollection Combine(this AlternatesCollection first, AlternatesCollection second)
+    {
+        if (first == null)
+        {
+            return second;
+        }
+        else if (second != null)
+        {
+            var combined = new AlternatesCollection();
 
-                return combined;
-            }
+            combined.AddRange(first);
+            combined.AddRange(second);
 
-            return first;
+            return combined;
         }
+
+        return first;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeAlteration.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeAlteration.cs
index 47ea0b7d69b..b6e0ff0d108 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeAlteration.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeAlteration.cs
@@ -2,28 +2,27 @@
 using System.Collections.Generic;
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.DisplayManagement.Descriptors
+namespace OrchardCore.DisplayManagement.Descriptors;
+
+public class ShapeAlteration
 {
-    public class ShapeAlteration
-    {
-        private readonly IList<Action<ShapeDescriptor>> _configurations;
+    private readonly IList<Action<ShapeDescriptor>> _configurations;
 
-        public ShapeAlteration(string shapeType, IFeatureInfo feature, IList<Action<ShapeDescriptor>> configurations)
-        {
-            _configurations = configurations;
-            ShapeType = shapeType;
-            Feature = feature;
-        }
+    public ShapeAlteration(string shapeType, IFeatureInfo feature, IList<Action<ShapeDescriptor>> configurations)
+    {
+        _configurations = configurations;
+        ShapeType = shapeType;
+        Feature = feature;
+    }
 
-        public string ShapeType { get; private set; }
-        public IFeatureInfo Feature { get; private set; }
+    public string ShapeType { get; private set; }
+    public IFeatureInfo Feature { get; private set; }
 
-        public void Alter(ShapeDescriptor descriptor)
+    public void Alter(ShapeDescriptor descriptor)
+    {
+        foreach (var configuration in _configurations)
         {
-            foreach (var configuration in _configurations)
-            {
-                configuration(descriptor);
-            }
+            configuration(descriptor);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeAlterationBuilder.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeAlterationBuilder.cs
index 13e7de1f6ed..91264b291a1 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeAlterationBuilder.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeAlterationBuilder.cs
@@ -5,221 +5,220 @@
 using OrchardCore.DisplayManagement.Implementation;
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.DisplayManagement.Descriptors
-{
-    public class ShapeAlterationBuilder
-    {
-        private IFeatureInfo _feature;
-        private readonly string _shapeType;
-        private readonly string _bindingName;
-        private readonly List<Action<ShapeDescriptor>> _configurations = [];
+namespace OrchardCore.DisplayManagement.Descriptors;
 
-        public ShapeAlterationBuilder(IFeatureInfo feature, string shapeType)
-        {
-            _feature = feature;
-            _bindingName = shapeType;
-            var delimiterIndex = shapeType.IndexOf("__", StringComparison.Ordinal);
+public class ShapeAlterationBuilder
+{
+    private IFeatureInfo _feature;
+    private readonly string _shapeType;
+    private readonly string _bindingName;
+    private readonly List<Action<ShapeDescriptor>> _configurations = [];
 
-            if (delimiterIndex < 0)
-            {
-                _shapeType = shapeType;
-            }
-            else
-            {
-                _shapeType = shapeType[..delimiterIndex];
-            }
-        }
+    public ShapeAlterationBuilder(IFeatureInfo feature, string shapeType)
+    {
+        _feature = feature;
+        _bindingName = shapeType;
+        var delimiterIndex = shapeType.IndexOf("__", StringComparison.Ordinal);
 
-        public ShapeAlterationBuilder From(IFeatureInfo feature)
+        if (delimiterIndex < 0)
         {
-            _feature = feature;
-            return this;
+            _shapeType = shapeType;
         }
-
-        public ShapeAlterationBuilder Configure(Action<ShapeDescriptor> action)
+        else
         {
-            _configurations.Add(action);
-            return this;
+            _shapeType = shapeType[..delimiterIndex];
         }
+    }
 
-        public ShapeAlterationBuilder BoundAs(string bindingSource, Func<DisplayContext, Task<IHtmlContent>> bindingDelegate)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(bindingSource);
+    public ShapeAlterationBuilder From(IFeatureInfo feature)
+    {
+        _feature = feature;
+        return this;
+    }
 
-            // Schedule the configuration.
-            return Configure(descriptor =>
-            {
-                var binding = new ShapeBinding
-                {
-                    BindingName = _bindingName,
-                    BindingSource = bindingSource,
-                    BindingAsync = bindingDelegate,
-                };
-
-                // ShapeDescriptor.Bindings is a case insensitive dictionary.
-                descriptor.Bindings[_bindingName] = binding;
-                descriptor.BindingSources = [..descriptor.BindingSources, bindingSource];
-            });
-        }
+    public ShapeAlterationBuilder Configure(Action<ShapeDescriptor> action)
+    {
+        _configurations.Add(action);
+        return this;
+    }
 
-        /// <summary>
-        /// Called when the shape is being created.
-        /// </summary>
-        public ShapeAlterationBuilder OnCreating(Action<ShapeCreatingContext> action)
-        {
-            return OnCreating(ctx =>
-            {
-                action(ctx);
-                return Task.CompletedTask;
-            });
-        }
+    public ShapeAlterationBuilder BoundAs(string bindingSource, Func<DisplayContext, Task<IHtmlContent>> bindingDelegate)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(bindingSource);
 
-        /// <summary>
-        /// Called when the shape is being created.
-        /// </summary>
-        public ShapeAlterationBuilder OnCreating(Func<ShapeCreatingContext, Task> actionAsync)
+        // Schedule the configuration.
+        return Configure(descriptor =>
         {
-            return Configure(descriptor =>
+            var binding = new ShapeBinding
             {
-                descriptor.CreatingAsync = [.. descriptor.CreatingAsync ?? [], actionAsync];
-            });
-        }
+                BindingName = _bindingName,
+                BindingSource = bindingSource,
+                BindingAsync = bindingDelegate,
+            };
+
+            // ShapeDescriptor.Bindings is a case insensitive dictionary.
+            descriptor.Bindings[_bindingName] = binding;
+            descriptor.BindingSources = [.. descriptor.BindingSources, bindingSource];
+        });
+    }
 
-        /// <summary>
-        /// Called when the shape is created.
-        /// </summary>
-        public ShapeAlterationBuilder OnCreated(Action<ShapeCreatedContext> action)
+    /// <summary>
+    /// Called when the shape is being created.
+    /// </summary>
+    public ShapeAlterationBuilder OnCreating(Action<ShapeCreatingContext> action)
+    {
+        return OnCreating(ctx =>
         {
-            return OnCreated(ctx =>
-            {
-                action(ctx);
-                return Task.CompletedTask;
-            });
-        }
+            action(ctx);
+            return Task.CompletedTask;
+        });
+    }
 
-        /// <summary>
-        /// Called when the shape is being created.
-        /// </summary>
-        public ShapeAlterationBuilder OnCreated(Func<ShapeCreatedContext, Task> actionAsync)
+    /// <summary>
+    /// Called when the shape is being created.
+    /// </summary>
+    public ShapeAlterationBuilder OnCreating(Func<ShapeCreatingContext, Task> actionAsync)
+    {
+        return Configure(descriptor =>
         {
-            return Configure(descriptor =>
-            {
-                descriptor.CreatedAsync = [.. descriptor.CreatedAsync ?? [], actionAsync];
-            });
-        }
+            descriptor.CreatingAsync = [.. descriptor.CreatingAsync ?? [], actionAsync];
+        });
+    }
 
-        /// <summary>
-        /// Called whenever the shape is displayed, even if it's content is cached.
-        /// </summary>
-        public ShapeAlterationBuilder OnDisplaying(Action<ShapeDisplayContext> action)
+    /// <summary>
+    /// Called when the shape is created.
+    /// </summary>
+    public ShapeAlterationBuilder OnCreated(Action<ShapeCreatedContext> action)
+    {
+        return OnCreated(ctx =>
         {
-            return OnDisplaying(ctx =>
-            {
-                action(ctx);
-                return Task.CompletedTask;
-            });
-        }
+            action(ctx);
+            return Task.CompletedTask;
+        });
+    }
 
-        /// <summary>
-        /// Called whenever the shape is displayed, even if it's content is cached.
-        /// </summary>
-        public ShapeAlterationBuilder OnDisplaying(Func<ShapeDisplayContext, Task> actionAsync)
+    /// <summary>
+    /// Called when the shape is being created.
+    /// </summary>
+    public ShapeAlterationBuilder OnCreated(Func<ShapeCreatedContext, Task> actionAsync)
+    {
+        return Configure(descriptor =>
         {
-            return Configure(descriptor =>
-            {
-                descriptor.DisplayingAsync = [.. descriptor.DisplayingAsync ?? [], actionAsync];
-            });
-        }
+            descriptor.CreatedAsync = [.. descriptor.CreatedAsync ?? [], actionAsync];
+        });
+    }
 
-        /// <summary>
-        /// Called when the shape is actually rendered and state needs to be loaded.
-        /// </summary>
-        public ShapeAlterationBuilder OnProcessing(Action<ShapeDisplayContext> action)
+    /// <summary>
+    /// Called whenever the shape is displayed, even if it's content is cached.
+    /// </summary>
+    public ShapeAlterationBuilder OnDisplaying(Action<ShapeDisplayContext> action)
+    {
+        return OnDisplaying(ctx =>
         {
-            return OnProcessing(ctx =>
-            {
-                action(ctx);
-                return Task.CompletedTask;
-            });
-        }
+            action(ctx);
+            return Task.CompletedTask;
+        });
+    }
 
-        /// <summary>
-        /// Called when the shape is actually rendered and state needs to be loaded.
-        /// </summary>
-        public ShapeAlterationBuilder OnProcessing(Func<ShapeDisplayContext, Task> actionAsync)
+    /// <summary>
+    /// Called whenever the shape is displayed, even if it's content is cached.
+    /// </summary>
+    public ShapeAlterationBuilder OnDisplaying(Func<ShapeDisplayContext, Task> actionAsync)
+    {
+        return Configure(descriptor =>
         {
-            return Configure(descriptor =>
-            {
-                descriptor.ProcessingAsync = [.. descriptor.ProcessingAsync ?? [], actionAsync];
-            });
-        }
+            descriptor.DisplayingAsync = [.. descriptor.DisplayingAsync ?? [], actionAsync];
+        });
+    }
 
-        /// <summary>
-        /// Called when the shape is done being rendered.
-        /// </summary>
-        public ShapeAlterationBuilder OnDisplayed(Action<ShapeDisplayContext> action)
+    /// <summary>
+    /// Called when the shape is actually rendered and state needs to be loaded.
+    /// </summary>
+    public ShapeAlterationBuilder OnProcessing(Action<ShapeDisplayContext> action)
+    {
+        return OnProcessing(ctx =>
         {
-            return OnDisplayed(ctx =>
-            {
-                action(ctx);
-                return Task.CompletedTask;
-            });
-        }
+            action(ctx);
+            return Task.CompletedTask;
+        });
+    }
 
-        /// <summary>
-        /// Called when the shape is done being rendered.
-        /// </summary>
-        public ShapeAlterationBuilder OnDisplayed(Func<ShapeDisplayContext, Task> actionAsync)
+    /// <summary>
+    /// Called when the shape is actually rendered and state needs to be loaded.
+    /// </summary>
+    public ShapeAlterationBuilder OnProcessing(Func<ShapeDisplayContext, Task> actionAsync)
+    {
+        return Configure(descriptor =>
         {
-            return Configure(descriptor =>
-            {
-                descriptor.DisplayedAsync = [.. descriptor.DisplayedAsync ?? [], actionAsync];
-            });
-        }
+            descriptor.ProcessingAsync = [.. descriptor.ProcessingAsync ?? [], actionAsync];
+        });
+    }
 
-        public ShapeAlterationBuilder Placement(Func<ShapePlacementContext, PlacementInfo> action)
+    /// <summary>
+    /// Called when the shape is done being rendered.
+    /// </summary>
+    public ShapeAlterationBuilder OnDisplayed(Action<ShapeDisplayContext> action)
+    {
+        return OnDisplayed(ctx =>
         {
-            return Configure(descriptor =>
-            {
-                var next = descriptor.Placement;
-                descriptor.Placement = ctx => action(ctx) ?? next(ctx);
-            });
-        }
+            action(ctx);
+            return Task.CompletedTask;
+        });
+    }
 
-        public ShapeAlterationBuilder Placement(Func<ShapePlacementContext, bool> predicate, PlacementInfo location)
+    /// <summary>
+    /// Called when the shape is done being rendered.
+    /// </summary>
+    public ShapeAlterationBuilder OnDisplayed(Func<ShapeDisplayContext, Task> actionAsync)
+    {
+        return Configure(descriptor =>
         {
-            return Configure(descriptor =>
-            {
-                var next = descriptor.Placement;
-                descriptor.Placement = ctx => predicate(ctx) ? location : next(ctx);
-            });
-        }
+            descriptor.DisplayedAsync = [.. descriptor.DisplayedAsync ?? [], actionAsync];
+        });
+    }
 
-        public ShapeAlteration Build()
+    public ShapeAlterationBuilder Placement(Func<ShapePlacementContext, PlacementInfo> action)
+    {
+        return Configure(descriptor =>
         {
-            return new ShapeAlteration(_shapeType, _feature, _configurations.ToArray());
-        }
+            var next = descriptor.Placement;
+            descriptor.Placement = ctx => action(ctx) ?? next(ctx);
+        });
     }
 
-    public class ShapePlacementContext
+    public ShapeAlterationBuilder Placement(Func<ShapePlacementContext, bool> predicate, PlacementInfo location)
     {
-        public ShapePlacementContext(string shapeType, string displayType, string differentiator, IShape zoneShape)
+        return Configure(descriptor =>
         {
-            ShapeType = shapeType;
-            DisplayType = displayType;
-            Differentiator = differentiator;
-            ZoneShape = zoneShape;
-        }
+            var next = descriptor.Placement;
+            descriptor.Placement = ctx => predicate(ctx) ? location : next(ctx);
+        });
+    }
 
-        public IShape ZoneShape { get; set; }
-        public string ShapeType { get; set; }
-        public string DisplayType { get; set; }
-        public string Differentiator { get; set; }
+    public ShapeAlteration Build()
+    {
+        return new ShapeAlteration(_shapeType, _feature, _configurations.ToArray());
+    }
+}
 
-        /// <summary>
-        /// Debug information explaining where the final placement is coming from.
-        /// Used by tooling.
-        /// </summary>
-        public string Source { get; set; }
+public class ShapePlacementContext
+{
+    public ShapePlacementContext(string shapeType, string displayType, string differentiator, IShape zoneShape)
+    {
+        ShapeType = shapeType;
+        DisplayType = displayType;
+        Differentiator = differentiator;
+        ZoneShape = zoneShape;
     }
+
+    public IShape ZoneShape { get; set; }
+    public string ShapeType { get; set; }
+    public string DisplayType { get; set; }
+    public string Differentiator { get; set; }
+
+    /// <summary>
+    /// Debug information explaining where the final placement is coming from.
+    /// Used by tooling.
+    /// </summary>
+    public string Source { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeAttributeStrategy/ShapeAttributeBindingStrategy.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeAttributeStrategy/ShapeAttributeBindingStrategy.cs
index 697a27983a5..2a447a284ad 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeAttributeStrategy/ShapeAttributeBindingStrategy.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeAttributeStrategy/ShapeAttributeBindingStrategy.cs
@@ -14,267 +14,266 @@
 using OrchardCore.DisplayManagement.Implementation;
 using OrchardCore.Environment.Extensions;
 
-namespace OrchardCore.DisplayManagement.Descriptors.ShapeAttributeStrategy
+namespace OrchardCore.DisplayManagement.Descriptors.ShapeAttributeStrategy;
+
+public class ShapeAttributeBindingStrategy : ShapeTableProvider, IShapeTableHarvester
 {
-    public class ShapeAttributeBindingStrategy : ShapeTableProvider, IShapeTableHarvester
+    private readonly ITypeFeatureProvider _typeFeatureProvider;
+    private readonly IEnumerable<IShapeAttributeProvider> _shapeProviders;
+
+    public ShapeAttributeBindingStrategy(
+        ITypeFeatureProvider typeFeatureProvider,
+        IEnumerable<IShapeAttributeProvider> shapeProviders)
     {
-        private readonly ITypeFeatureProvider _typeFeatureProvider;
-        private readonly IEnumerable<IShapeAttributeProvider> _shapeProviders;
+        _typeFeatureProvider = typeFeatureProvider;
+        _shapeProviders = shapeProviders;
+    }
 
-        public ShapeAttributeBindingStrategy(
-            ITypeFeatureProvider typeFeatureProvider,
-            IEnumerable<IShapeAttributeProvider> shapeProviders)
-        {
-            _typeFeatureProvider = typeFeatureProvider;
-            _shapeProviders = shapeProviders;
-        }
+    public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
+    {
+        var shapeAttributeOccurrences = new List<ShapeAttributeOccurrence>();
 
-        public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
+        foreach (var shapeProvider in _shapeProviders)
         {
-            var shapeAttributeOccurrences = new List<ShapeAttributeOccurrence>();
+            var serviceType = shapeProvider.GetType();
 
-            foreach (var shapeProvider in _shapeProviders)
+            foreach (var method in serviceType.GetMethods())
             {
-                var serviceType = shapeProvider.GetType();
-
-                foreach (var method in serviceType.GetMethods())
+                var customAttributes = method.GetCustomAttributes(typeof(ShapeAttribute), false).OfType<ShapeAttribute>();
+                foreach (var customAttribute in customAttributes)
                 {
-                    var customAttributes = method.GetCustomAttributes(typeof(ShapeAttribute), false).OfType<ShapeAttribute>();
-                    foreach (var customAttribute in customAttributes)
-                    {
-                        shapeAttributeOccurrences.Add(new ShapeAttributeOccurrence(customAttribute, method, serviceType));
-                    }
+                    shapeAttributeOccurrences.Add(new ShapeAttributeOccurrence(customAttribute, method, serviceType));
                 }
             }
-
-            foreach (var iter in shapeAttributeOccurrences)
-            {
-                var occurrence = iter;
-                var shapeType = occurrence.ShapeAttribute.ShapeType ?? occurrence.MethodInfo.Name;
-                builder.Describe(shapeType)
-                    .From(_typeFeatureProvider.GetFeatureForDependency(occurrence.ServiceType))
-                    .BoundAs(
-                        occurrence.MethodInfo.DeclaringType.FullName + "::" + occurrence.MethodInfo.Name,
-                        CreateDelegate(occurrence));
-            }
-
-            return ValueTask.CompletedTask;
         }
 
-        [DebuggerStepThrough]
-        private static Func<DisplayContext, Task<IHtmlContent>> CreateDelegate(ShapeAttributeOccurrence attributeOccurrence)
+        foreach (var iter in shapeAttributeOccurrences)
         {
-            var type = attributeOccurrence.ServiceType;
-            var methodInfo = attributeOccurrence.MethodInfo;
-            var parameters = methodInfo.GetParameters();
+            var occurrence = iter;
+            var shapeType = occurrence.ShapeAttribute.ShapeType ?? occurrence.MethodInfo.Name;
+            builder.Describe(shapeType)
+                .From(_typeFeatureProvider.GetFeatureForDependency(occurrence.ServiceType))
+                .BoundAs(
+                    occurrence.MethodInfo.DeclaringType.FullName + "::" + occurrence.MethodInfo.Name,
+                    CreateDelegate(occurrence));
+        }
 
-            // Create an array of lambdas that will generate the value of each parameter. This prevents from having to test each name and type on every invocation.
-            var argumentBuilders = parameters.Select(parameter => BindParameter(parameter)).ToArray();
+        return ValueTask.CompletedTask;
+    }
+
+    [DebuggerStepThrough]
+    private static Func<DisplayContext, Task<IHtmlContent>> CreateDelegate(ShapeAttributeOccurrence attributeOccurrence)
+    {
+        var type = attributeOccurrence.ServiceType;
+        var methodInfo = attributeOccurrence.MethodInfo;
+        var parameters = methodInfo.GetParameters();
 
-            var methodWrapper = CreateMethodWrapper(type, methodInfo);
+        // Create an array of lambdas that will generate the value of each parameter. This prevents from having to test each name and type on every invocation.
+        var argumentBuilders = parameters.Select(parameter => BindParameter(parameter)).ToArray();
 
-            Func<object, DisplayContext, Task<IHtmlContent>> action;
+        var methodWrapper = CreateMethodWrapper(type, methodInfo);
 
-            if (methodInfo.ReturnType == typeof(Task<IHtmlContent>))
+        Func<object, DisplayContext, Task<IHtmlContent>> action;
+
+        if (methodInfo.ReturnType == typeof(Task<IHtmlContent>))
+        {
+            action = (s, d) =>
             {
-                action = (s, d) =>
+                var arguments = new object[argumentBuilders.Length];
+                for (var i = 0; i < arguments.Length; i++)
                 {
-                    var arguments = new object[argumentBuilders.Length];
-                    for (var i = 0; i < arguments.Length; i++)
-                    {
-                        arguments[i] = argumentBuilders[i](d);
-                    }
-
-                    return (Task<IHtmlContent>)methodWrapper(s, arguments);
-                };
-            }
-            else if (attributeOccurrence.MethodInfo.ReturnType == typeof(IHtmlContent))
+                    arguments[i] = argumentBuilders[i](d);
+                }
+
+                return (Task<IHtmlContent>)methodWrapper(s, arguments);
+            };
+        }
+        else if (attributeOccurrence.MethodInfo.ReturnType == typeof(IHtmlContent))
+        {
+            action = (s, d) =>
             {
-                action = (s, d) =>
+                var arguments = new object[argumentBuilders.Length];
+                for (var i = 0; i < arguments.Length; i++)
                 {
-                    var arguments = new object[argumentBuilders.Length];
-                    for (var i = 0; i < arguments.Length; i++)
-                    {
-                        arguments[i] = argumentBuilders[i](d);
-                    }
-
-                    return Task.FromResult((IHtmlContent)methodWrapper(s, arguments));
-                };
-            }
-            else if (attributeOccurrence.MethodInfo.ReturnType != typeof(void))
+                    arguments[i] = argumentBuilders[i](d);
+                }
+
+                return Task.FromResult((IHtmlContent)methodWrapper(s, arguments));
+            };
+        }
+        else if (attributeOccurrence.MethodInfo.ReturnType != typeof(void))
+        {
+            action = (s, d) =>
             {
-                action = (s, d) =>
+                var arguments = new object[argumentBuilders.Length];
+                for (var i = 0; i < arguments.Length; i++)
                 {
-                    var arguments = new object[argumentBuilders.Length];
-                    for (var i = 0; i < arguments.Length; i++)
-                    {
-                        arguments[i] = argumentBuilders[i](d);
-                    }
-
-                    return Task.FromResult(CoerceHtmlContent(methodWrapper(s, arguments)));
-                };
-            }
-            else
-            {
-                action = (s, d) => null;
-            }
+                    arguments[i] = argumentBuilders[i](d);
+                }
 
-            return context =>
-            {
-                var serviceInstance = context.ServiceProvider.GetService(attributeOccurrence.ServiceType);
-                return action(serviceInstance, context);
+                return Task.FromResult(CoerceHtmlContent(methodWrapper(s, arguments)));
             };
         }
+        else
+        {
+            action = (s, d) => null;
+        }
 
-        private static Func<object, object[], object> CreateMethodWrapper(Type type, MethodInfo method)
+        return context =>
         {
-            CreateParamsExpressions(method, out var argsExp, out var paramsExps);
+            var serviceInstance = context.ServiceProvider.GetService(attributeOccurrence.ServiceType);
+            return action(serviceInstance, context);
+        };
+    }
 
-            var targetExp = Expression.Parameter(typeof(object), "target");
-            var castTargetExp = Expression.Convert(targetExp, type);
+    private static Func<object, object[], object> CreateMethodWrapper(Type type, MethodInfo method)
+    {
+        CreateParamsExpressions(method, out var argsExp, out var paramsExps);
 
+        var targetExp = Expression.Parameter(typeof(object), "target");
+        var castTargetExp = Expression.Convert(targetExp, type);
 
-            LambdaExpression lambdaExp;
 
-            if (method.ReturnType != typeof(void))
-            {
-                var resultExp = Expression.Convert(Expression.Call(castTargetExp, method, paramsExps), typeof(object));
-                lambdaExp = Expression.Lambda(resultExp, targetExp, argsExp);
-            }
-            else
-            {
-                var constExp = Expression.Constant(null, typeof(object));
-                var blockExp = Expression.Block(Expression.Call(castTargetExp, method, paramsExps), constExp);
-                lambdaExp = Expression.Lambda(blockExp, targetExp, argsExp);
-            }
+        LambdaExpression lambdaExp;
 
-            var lambda = lambdaExp.Compile();
-            return (Func<object, object[], object>)lambda;
+        if (method.ReturnType != typeof(void))
+        {
+            var resultExp = Expression.Convert(Expression.Call(castTargetExp, method, paramsExps), typeof(object));
+            lambdaExp = Expression.Lambda(resultExp, targetExp, argsExp);
         }
+        else
+        {
+            var constExp = Expression.Constant(null, typeof(object));
+            var blockExp = Expression.Block(Expression.Call(castTargetExp, method, paramsExps), constExp);
+            lambdaExp = Expression.Lambda(blockExp, targetExp, argsExp);
+        }
+
+        var lambda = lambdaExp.Compile();
+        return (Func<object, object[], object>)lambda;
+    }
+
+    private static void CreateParamsExpressions(MethodInfo method, out ParameterExpression argsExp, out Expression[] paramsExps)
+    {
+        var parameters = method.GetParameters().Select(x => x.ParameterType).ToArray();
+
+        argsExp = Expression.Parameter(typeof(object[]), "args");
+        paramsExps = new Expression[parameters.Length];
 
-        private static void CreateParamsExpressions(MethodInfo method, out ParameterExpression argsExp, out Expression[] paramsExps)
+        for (var i = 0; i < parameters.Length; i++)
         {
-            var parameters = method.GetParameters().Select(x => x.ParameterType).ToArray();
+            var constExp = Expression.Constant(i, typeof(int));
+            var argExp = Expression.ArrayIndex(argsExp, constExp);
+            paramsExps[i] = Expression.Convert(argExp, parameters[i]);
+        }
+    }
 
-            argsExp = Expression.Parameter(typeof(object[]), "args");
-            paramsExps = new Expression[parameters.Length];
+    private static IHtmlContent CoerceHtmlContent(object invoke)
+    {
+        if (invoke == null)
+        {
+            return HtmlString.Empty;
+        }
 
-            for (var i = 0; i < parameters.Length; i++)
-            {
-                var constExp = Expression.Constant(i, typeof(int));
-                var argExp = Expression.ArrayIndex(argsExp, constExp);
-                paramsExps[i] = Expression.Convert(argExp, parameters[i]);
-            }
+        if (invoke is IHtmlContent htmlContent)
+        {
+            return htmlContent;
         }
 
-        private static IHtmlContent CoerceHtmlContent(object invoke)
+        return new HtmlString(invoke.ToString());
+    }
+
+    private static Func<DisplayContext, object> BindParameter(ParameterInfo parameter)
+    {
+        if (string.Equals(parameter.Name, "Shape", StringComparison.OrdinalIgnoreCase))
         {
-            if (invoke == null)
-            {
-                return HtmlString.Empty;
-            }
+            return d => d.Value;
+        }
 
-            if (invoke is IHtmlContent htmlContent)
-            {
-                return htmlContent;
-            }
+        if (string.Equals(parameter.Name, "DisplayAsync", StringComparison.OrdinalIgnoreCase))
+        {
+            return d => d.DisplayHelper;
+        }
 
-            return new HtmlString(invoke.ToString());
+        if (string.Equals(parameter.Name, "New", StringComparison.OrdinalIgnoreCase))
+        {
+            return d => d.ServiceProvider.GetService<IShapeFactory>();
         }
 
-        private static Func<DisplayContext, object> BindParameter(ParameterInfo parameter)
+        if (string.Equals(parameter.Name, "ShapeFactory", StringComparison.OrdinalIgnoreCase))
         {
-            if (string.Equals(parameter.Name, "Shape", StringComparison.OrdinalIgnoreCase))
-            {
-                return d => d.Value;
-            }
+            return d => d.ServiceProvider.GetService<IShapeFactory>();
+        }
 
-            if (string.Equals(parameter.Name, "DisplayAsync", StringComparison.OrdinalIgnoreCase))
+        if (string.Equals(parameter.Name, "Html", StringComparison.OrdinalIgnoreCase))
+        {
+            return d =>
             {
-                return d => d.DisplayHelper;
-            }
+                var viewContextAccessor = d.ServiceProvider.GetRequiredService<ViewContextAccessor>();
+                var viewContext = viewContextAccessor.ViewContext;
 
-            if (string.Equals(parameter.Name, "New", StringComparison.OrdinalIgnoreCase))
-            {
-                return d => d.ServiceProvider.GetService<IShapeFactory>();
-            }
+                return MakeHtmlHelper(viewContext, viewContext.ViewData);
+            };
+        }
 
-            if (string.Equals(parameter.Name, "ShapeFactory", StringComparison.OrdinalIgnoreCase))
-            {
-                return d => d.ServiceProvider.GetService<IShapeFactory>();
-            }
+        if (string.Equals(parameter.Name, "DisplayContext", StringComparison.OrdinalIgnoreCase))
+        {
+            return d => d;
+        }
 
-            if (string.Equals(parameter.Name, "Html", StringComparison.OrdinalIgnoreCase))
+        if (string.Equals(parameter.Name, "Url", StringComparison.OrdinalIgnoreCase) && typeof(IUrlHelper).IsAssignableFrom(parameter.ParameterType))
+        {
+            return d =>
             {
-                return d =>
-                {
-                    var viewContextAccessor = d.ServiceProvider.GetRequiredService<ViewContextAccessor>();
-                    var viewContext = viewContextAccessor.ViewContext;
+                var viewContextAccessor = d.ServiceProvider.GetRequiredService<ViewContextAccessor>();
+                var viewContext = viewContextAccessor.ViewContext;
 
-                    return MakeHtmlHelper(viewContext, viewContext.ViewData);
-                };
-            }
+                var urlHelperFactory = d.ServiceProvider.GetService<IUrlHelperFactory>();
+                return urlHelperFactory.GetUrlHelper(viewContext);
+            };
+        }
+
+        // pre-calculate the default value 
+        var defaultValue = parameter.ParameterType.IsValueType ? Activator.CreateInstance(parameter.ParameterType) : null;
 
-            if (string.Equals(parameter.Name, "DisplayContext", StringComparison.OrdinalIgnoreCase))
+        var isDateTimeType =
+            parameter.ParameterType == typeof(DateTime) ||
+            parameter.ParameterType == typeof(DateTime?) ||
+            parameter.ParameterType == typeof(DateTimeOffset) ||
+            parameter.ParameterType == typeof(DateTimeOffset?);
+
+        return d =>
+        {
+            if (!d.Value.Properties.TryGetValue(parameter.Name, out var result) || result == null)
             {
-                return d => d;
+                return defaultValue;
             }
 
-            if (string.Equals(parameter.Name, "Url", StringComparison.OrdinalIgnoreCase) && typeof(IUrlHelper).IsAssignableFrom(parameter.ParameterType))
+            if (parameter.ParameterType.IsAssignableFrom(result.GetType()))
             {
-                return d =>
-                {
-                    var viewContextAccessor = d.ServiceProvider.GetRequiredService<ViewContextAccessor>();
-                    var viewContext = viewContextAccessor.ViewContext;
-
-                    var urlHelperFactory = d.ServiceProvider.GetService<IUrlHelperFactory>();
-                    return urlHelperFactory.GetUrlHelper(viewContext);
-                };
+                return result;
             }
 
-            // pre-calculate the default value 
-            var defaultValue = parameter.ParameterType.IsValueType ? Activator.CreateInstance(parameter.ParameterType) : null;
-
-            var isDateTimeType =
-                parameter.ParameterType == typeof(DateTime) ||
-                parameter.ParameterType == typeof(DateTime?) ||
-                parameter.ParameterType == typeof(DateTimeOffset) ||
-                parameter.ParameterType == typeof(DateTimeOffset?);
-
-            return d =>
+            // Specific implementation for DateTimes
+            if (result.GetType() == typeof(string) && isDateTimeType)
             {
-                if (!d.Value.Properties.TryGetValue(parameter.Name, out var result) || result == null)
-                {
-                    return defaultValue;
-                }
-
-                if (parameter.ParameterType.IsAssignableFrom(result.GetType()))
-                {
-                    return result;
-                }
+                return DateTime.Parse((string)result);
+            }
 
-                // Specific implementation for DateTimes
-                if (result.GetType() == typeof(string) && isDateTimeType)
-                {
-                    return DateTime.Parse((string)result);
-                }
+            return Convert.ChangeType(result, parameter.ParameterType);
+        };
+    }
 
-                return Convert.ChangeType(result, parameter.ParameterType);
-            };
-        }
+    private static IHtmlHelper MakeHtmlHelper(ViewContext viewContext, ViewDataDictionary viewData)
+    {
+        var newHelper = viewContext.HttpContext.RequestServices.GetRequiredService<IHtmlHelper>();
 
-        private static IHtmlHelper MakeHtmlHelper(ViewContext viewContext, ViewDataDictionary viewData)
+        var contextable = newHelper as IViewContextAware;
+        if (contextable != null)
         {
-            var newHelper = viewContext.HttpContext.RequestServices.GetRequiredService<IHtmlHelper>();
-
-            var contextable = newHelper as IViewContextAware;
-            if (contextable != null)
-            {
-                var newViewContext = new ViewContext(viewContext, viewContext.View, viewData, viewContext.Writer);
-                contextable.Contextualize(newViewContext);
-            }
-
-            return newHelper;
+            var newViewContext = new ViewContext(viewContext, viewContext.View, viewData, viewContext.Writer);
+            contextable.Contextualize(newViewContext);
         }
+
+        return newHelper;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeAttributeStrategy/ShapeAttributeOccurrence.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeAttributeStrategy/ShapeAttributeOccurrence.cs
index bdcf5121c19..ec88742b806 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeAttributeStrategy/ShapeAttributeOccurrence.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeAttributeStrategy/ShapeAttributeOccurrence.cs
@@ -1,19 +1,18 @@
 using System;
 using System.Reflection;
 
-namespace OrchardCore.DisplayManagement.Descriptors.ShapeAttributeStrategy
+namespace OrchardCore.DisplayManagement.Descriptors.ShapeAttributeStrategy;
+
+public class ShapeAttributeOccurrence
 {
-    public class ShapeAttributeOccurrence
+    public ShapeAttributeOccurrence(ShapeAttribute shapeAttribute, MethodInfo methodInfo, Type serviceType)
     {
-        public ShapeAttributeOccurrence(ShapeAttribute shapeAttribute, MethodInfo methodInfo, Type serviceType)
-        {
-            ShapeAttribute = shapeAttribute;
-            MethodInfo = methodInfo;
-            ServiceType = serviceType;
-        }
-
-        public ShapeAttribute ShapeAttribute { get; private set; }
-        public MethodInfo MethodInfo { get; private set; }
-        public Type ServiceType { get; private set; }
+        ShapeAttribute = shapeAttribute;
+        MethodInfo = methodInfo;
+        ServiceType = serviceType;
     }
+
+    public ShapeAttribute ShapeAttribute { get; private set; }
+    public MethodInfo MethodInfo { get; private set; }
+    public Type ServiceType { get; private set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapePlacementStrategy/IPlacementNodeFilterProvider.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapePlacementStrategy/IPlacementNodeFilterProvider.cs
index 6e10388aac3..f1712fe25e7 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapePlacementStrategy/IPlacementNodeFilterProvider.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapePlacementStrategy/IPlacementNodeFilterProvider.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.DisplayManagement.Descriptors.ShapePlacementStrategy
+namespace OrchardCore.DisplayManagement.Descriptors.ShapePlacementStrategy;
+
+public interface IPlacementNodeFilterProvider
 {
-    public interface IPlacementNodeFilterProvider
-    {
-        string Key { get; }
-        bool IsMatch(ShapePlacementContext context, object expression);
-    }
+    string Key { get; }
+    bool IsMatch(ShapePlacementContext context, object expression);
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapePlacementStrategy/PathPlacementNodeFilterProvider.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapePlacementStrategy/PathPlacementNodeFilterProvider.cs
index bacaeb4ae5d..598084d0e68 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapePlacementStrategy/PathPlacementNodeFilterProvider.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapePlacementStrategy/PathPlacementNodeFilterProvider.cs
@@ -4,67 +4,66 @@
 using System.Text.Json.Nodes;
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.DisplayManagement.Descriptors.ShapePlacementStrategy
+namespace OrchardCore.DisplayManagement.Descriptors.ShapePlacementStrategy;
+
+public class PathPlacementNodeFilterProvider : IPlacementNodeFilterProvider
 {
-    public class PathPlacementNodeFilterProvider : IPlacementNodeFilterProvider
+    private readonly IHttpContextAccessor _httpContextAccessor;
+
+    public PathPlacementNodeFilterProvider(IHttpContextAccessor httpContextAccessor)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
+        _httpContextAccessor = httpContextAccessor;
+    }
+
+    public string Key { get { return "path"; } }
 
-        public PathPlacementNodeFilterProvider(IHttpContextAccessor httpContextAccessor)
+    public bool IsMatch(ShapePlacementContext context, object expression)
+    {
+        IEnumerable<string> paths;
+
+        var jsonNode = JNode.FromObject(expression);
+        if (jsonNode is JsonArray jsonArray)
+        {
+            paths = jsonArray.Values<string>();
+        }
+        else
         {
-            _httpContextAccessor = httpContextAccessor;
+            paths = new string[] { jsonNode.Value<string>() };
         }
 
-        public string Key { get { return "path"; } }
+        var requestPath = _httpContextAccessor.HttpContext.Request.Path.Value;
 
-        public bool IsMatch(ShapePlacementContext context, object expression)
+        return paths.Any(p =>
         {
-            IEnumerable<string> paths;
+            var normalizedPath = NormalizePath(p);
 
-            var jsonNode = JNode.FromObject(expression);
-            if (jsonNode is JsonArray jsonArray)
-            {
-                paths = jsonArray.Values<string>();
-            }
-            else
+            if (normalizedPath.EndsWith('*'))
             {
-                paths = new string[] { jsonNode.Value<string>() };
+                var prefix = normalizedPath[..^1];
+                return requestPath.StartsWith(prefix, StringComparison.OrdinalIgnoreCase);
             }
 
-            var requestPath = _httpContextAccessor.HttpContext.Request.Path.Value;
-
-            return paths.Any(p =>
-            {
-                var normalizedPath = NormalizePath(p);
-
-                if (normalizedPath.EndsWith('*'))
-                {
-                    var prefix = normalizedPath[..^1];
-                    return requestPath.StartsWith(prefix, StringComparison.OrdinalIgnoreCase);
-                }
+            normalizedPath = AppendTrailingSlash(normalizedPath);
+            requestPath = AppendTrailingSlash(requestPath);
+            return requestPath.Equals(normalizedPath, StringComparison.OrdinalIgnoreCase);
+        });
+    }
 
-                normalizedPath = AppendTrailingSlash(normalizedPath);
-                requestPath = AppendTrailingSlash(requestPath);
-                return requestPath.Equals(normalizedPath, StringComparison.OrdinalIgnoreCase);
-            });
+    private static string NormalizePath(string path)
+    {
+        if (path.StartsWith("~/", StringComparison.Ordinal))
+        {
+            return path[1..];
         }
-
-        private static string NormalizePath(string path)
+        else if (!path.StartsWith('/'))
         {
-            if (path.StartsWith("~/", StringComparison.Ordinal))
-            {
-                return path[1..];
-            }
-            else if (!path.StartsWith('/'))
-            {
-                return "/" + path;
-            }
-            else
-            {
-                return path;
-            }
+            return "/" + path;
+        }
+        else
+        {
+            return path;
         }
-
-        private static string AppendTrailingSlash(string path) => path.EndsWith('/') ? path : path + "/";
     }
+
+    private static string AppendTrailingSlash(string path) => path.EndsWith('/') ? path : path + "/";
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapePlacementStrategy/PlacementFile.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapePlacementStrategy/PlacementFile.cs
index 545ebc35181..b3d4ce9817c 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapePlacementStrategy/PlacementFile.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapePlacementStrategy/PlacementFile.cs
@@ -1,33 +1,32 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace OrchardCore.DisplayManagement.Descriptors.ShapePlacementStrategy
+namespace OrchardCore.DisplayManagement.Descriptors.ShapePlacementStrategy;
+
+public class PlacementFile : Dictionary<string, PlacementNode[]>
 {
-    public class PlacementFile : Dictionary<string, PlacementNode[]>
-    {
-    }
+}
 
-    public class PlacementNode
-    {
-        [JsonPropertyName("place")]
-        public string Location { get; set; }
+public class PlacementNode
+{
+    [JsonPropertyName("place")]
+    public string Location { get; set; }
 
-        [JsonPropertyName("displayType")]
-        public string DisplayType { get; set; }
+    [JsonPropertyName("displayType")]
+    public string DisplayType { get; set; }
 
-        [JsonPropertyName("differentiator")]
-        public string Differentiator { get; set; }
+    [JsonPropertyName("differentiator")]
+    public string Differentiator { get; set; }
 
-        [JsonPropertyName("alternates")]
-        public string[] Alternates { get; set; }
+    [JsonPropertyName("alternates")]
+    public string[] Alternates { get; set; }
 
-        [JsonPropertyName("wrappers")]
-        public string[] Wrappers { get; set; }
+    [JsonPropertyName("wrappers")]
+    public string[] Wrappers { get; set; }
 
-        [JsonPropertyName("shape")]
-        public string ShapeType { get; set; }
+    [JsonPropertyName("shape")]
+    public string ShapeType { get; set; }
 
-        [JsonExtensionData]
-        public IDictionary<string, object> Filters { get; set; } = new Dictionary<string, object>();
-    }
+    [JsonExtensionData]
+    public IDictionary<string, object> Filters { get; set; } = new Dictionary<string, object>();
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapePlacementStrategy/ShapePlacementParsingStrategy.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapePlacementStrategy/ShapePlacementParsingStrategy.cs
index 4871445312f..396dcdb4069 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapePlacementStrategy/ShapePlacementParsingStrategy.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapePlacementStrategy/ShapePlacementParsingStrategy.cs
@@ -9,134 +9,133 @@
 using OrchardCore.Environment.Extensions.Features;
 using OrchardCore.Environment.Shell;
 
-namespace OrchardCore.DisplayManagement.Descriptors.ShapePlacementStrategy
+namespace OrchardCore.DisplayManagement.Descriptors.ShapePlacementStrategy;
+
+/// <summary>
+/// This component discovers and announces the shape alterations implied by the contents of the Placement.json files.
+/// </summary>
+public class ShapePlacementParsingStrategy : ShapeTableProvider, IShapeTableHarvester
 {
-    /// <summary>
-    /// This component discovers and announces the shape alterations implied by the contents of the Placement.json files.
-    /// </summary>
-    public class ShapePlacementParsingStrategy : ShapeTableProvider, IShapeTableHarvester
+    private readonly IHostEnvironment _hostingEnvironment;
+    private readonly IShellFeaturesManager _shellFeaturesManager;
+    private readonly IEnumerable<IPlacementNodeFilterProvider> _placementParseMatchProviders;
+
+    public ShapePlacementParsingStrategy(
+        IHostEnvironment hostingEnvironment,
+        IShellFeaturesManager shellFeaturesManager,
+        IEnumerable<IPlacementNodeFilterProvider> placementParseMatchProviders)
+    {
+        _hostingEnvironment = hostingEnvironment;
+        _shellFeaturesManager = shellFeaturesManager;
+        _placementParseMatchProviders = placementParseMatchProviders;
+    }
+
+    public override async ValueTask DiscoverAsync(ShapeTableBuilder builder)
     {
-        private readonly IHostEnvironment _hostingEnvironment;
-        private readonly IShellFeaturesManager _shellFeaturesManager;
-        private readonly IEnumerable<IPlacementNodeFilterProvider> _placementParseMatchProviders;
-
-        public ShapePlacementParsingStrategy(
-            IHostEnvironment hostingEnvironment,
-            IShellFeaturesManager shellFeaturesManager,
-            IEnumerable<IPlacementNodeFilterProvider> placementParseMatchProviders)
+        var enabledFeatures = (await _shellFeaturesManager.GetEnabledFeaturesAsync())
+            .Where(Feature => !builder.ExcludedFeatureIds.Contains(Feature.Id));
+
+        foreach (var featureDescriptor in enabledFeatures)
         {
-            _hostingEnvironment = hostingEnvironment;
-            _shellFeaturesManager = shellFeaturesManager;
-            _placementParseMatchProviders = placementParseMatchProviders;
+            await ProcessFeatureDescriptorAsync(builder, featureDescriptor);
         }
+    }
 
-        public override async ValueTask DiscoverAsync(ShapeTableBuilder builder)
+    private Task ProcessFeatureDescriptorAsync(ShapeTableBuilder builder, IFeatureInfo featureDescriptor)
+    {
+        // TODO : (ngm) Replace with configuration Provider and read from that.
+        // Dont use JSON Deserializer directly.
+        var virtualFileInfo = _hostingEnvironment
+            .GetExtensionFileInfo(featureDescriptor.Extension, "placement.json");
+
+        if (virtualFileInfo.Exists)
         {
-            var enabledFeatures = (await _shellFeaturesManager.GetEnabledFeaturesAsync())
-                .Where(Feature => !builder.ExcludedFeatureIds.Contains(Feature.Id));
+            using var stream = virtualFileInfo.CreateReadStream();
 
-            foreach (var featureDescriptor in enabledFeatures)
+            var placementFile = JsonSerializer.Deserialize<PlacementFile>(stream, JOptions.Default);
+            if (placementFile is not null)
             {
-                await ProcessFeatureDescriptorAsync(builder, featureDescriptor);
+                ProcessPlacementFile(builder, featureDescriptor, placementFile);
             }
         }
 
-        private Task ProcessFeatureDescriptorAsync(ShapeTableBuilder builder, IFeatureInfo featureDescriptor)
+        return Task.CompletedTask;
+    }
+
+    private void ProcessPlacementFile(ShapeTableBuilder builder, IFeatureInfo featureDescriptor, PlacementFile placementFile)
+    {
+        foreach (var entry in placementFile)
         {
-            // TODO : (ngm) Replace with configuration Provider and read from that.
-            // Dont use JSON Deserializer directly.
-            var virtualFileInfo = _hostingEnvironment
-                .GetExtensionFileInfo(featureDescriptor.Extension, "placement.json");
+            var shapeType = entry.Key;
 
-            if (virtualFileInfo.Exists)
+            foreach (var filter in entry.Value)
             {
-                using var stream = virtualFileInfo.CreateReadStream();
+                var matches = filter.Filters.ToList();
 
-                var placementFile = JsonSerializer.Deserialize<PlacementFile>(stream, JOptions.Default);
-                if (placementFile is not null)
+                Func<ShapePlacementContext, bool> predicate = ctx => CheckFilter(ctx, filter);
+
+                if (matches.Count > 0)
                 {
-                    ProcessPlacementFile(builder, featureDescriptor, placementFile);
+                    predicate = matches.Aggregate(predicate, BuildPredicate);
                 }
-            }
-
-            return Task.CompletedTask;
-        }
-
-        private void ProcessPlacementFile(ShapeTableBuilder builder, IFeatureInfo featureDescriptor, PlacementFile placementFile)
-        {
-            foreach (var entry in placementFile)
-            {
-                var shapeType = entry.Key;
 
-                foreach (var filter in entry.Value)
+                var placement = new PlacementInfo
                 {
-                    var matches = filter.Filters.ToList();
-
-                    Func<ShapePlacementContext, bool> predicate = ctx => CheckFilter(ctx, filter);
-
-                    if (matches.Count > 0)
-                    {
-                        predicate = matches.Aggregate(predicate, BuildPredicate);
-                    }
-
-                    var placement = new PlacementInfo
-                    {
-                        Location = filter.Location,
-                    };
+                    Location = filter.Location,
+                };
 
-                    if (filter.Alternates?.Length > 0)
-                    {
-                        placement.Alternates = new AlternatesCollection(filter.Alternates);
-                    }
+                if (filter.Alternates?.Length > 0)
+                {
+                    placement.Alternates = new AlternatesCollection(filter.Alternates);
+                }
 
-                    if (filter.Wrappers?.Length > 0)
-                    {
-                        placement.Wrappers = new AlternatesCollection(filter.Wrappers);
-                    }
+                if (filter.Wrappers?.Length > 0)
+                {
+                    placement.Wrappers = new AlternatesCollection(filter.Wrappers);
+                }
 
-                    placement.ShapeType = filter.ShapeType;
+                placement.ShapeType = filter.ShapeType;
 
-                    builder.Describe(shapeType)
-                        .From(featureDescriptor)
-                        .Placement(ctx => predicate(ctx), placement);
-                }
+                builder.Describe(shapeType)
+                    .From(featureDescriptor)
+                    .Placement(ctx => predicate(ctx), placement);
             }
         }
+    }
 
-        public static bool CheckFilter(ShapePlacementContext ctx, PlacementNode filter)
+    public static bool CheckFilter(ShapePlacementContext ctx, PlacementNode filter)
+    {
+        if (!string.IsNullOrEmpty(filter.DisplayType) && filter.DisplayType != ctx.DisplayType)
         {
-            if (!string.IsNullOrEmpty(filter.DisplayType) && filter.DisplayType != ctx.DisplayType)
-            {
-                return false;
-            }
-
-            if (!string.IsNullOrEmpty(filter.Differentiator) && filter.Differentiator != ctx.Differentiator)
-            {
-                return false;
-            }
-
-            return true;
+            return false;
         }
 
-        private Func<ShapePlacementContext, bool> BuildPredicate(Func<ShapePlacementContext, bool> predicate,
-              KeyValuePair<string, object> term)
+        if (!string.IsNullOrEmpty(filter.Differentiator) && filter.Differentiator != ctx.Differentiator)
         {
-            return BuildPredicate(predicate, term, _placementParseMatchProviders);
+            return false;
         }
 
-        public static Func<ShapePlacementContext, bool> BuildPredicate(Func<ShapePlacementContext, bool> predicate,
-                KeyValuePair<string, object> term, IEnumerable<IPlacementNodeFilterProvider> placementMatchProviders)
+        return true;
+    }
+
+    private Func<ShapePlacementContext, bool> BuildPredicate(Func<ShapePlacementContext, bool> predicate,
+          KeyValuePair<string, object> term)
+    {
+        return BuildPredicate(predicate, term, _placementParseMatchProviders);
+    }
+
+    public static Func<ShapePlacementContext, bool> BuildPredicate(Func<ShapePlacementContext, bool> predicate,
+            KeyValuePair<string, object> term, IEnumerable<IPlacementNodeFilterProvider> placementMatchProviders)
+    {
+        if (placementMatchProviders != null)
         {
-            if (placementMatchProviders != null)
+            var providersForTerm = placementMatchProviders.Where(x => x.Key.Equals(term.Key, StringComparison.Ordinal));
+            if (providersForTerm.Any())
             {
-                var providersForTerm = placementMatchProviders.Where(x => x.Key.Equals(term.Key, StringComparison.Ordinal));
-                if (providersForTerm.Any())
-                {
-                    var expression = term.Value;
-                    return ctx => providersForTerm.Any(x => x.IsMatch(ctx, expression)) && predicate(ctx);
-                }
+                var expression = term.Value;
+                return ctx => providersForTerm.Any(x => x.IsMatch(ctx, expression)) && predicate(ctx);
             }
-            return predicate;
         }
+        return predicate;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTable.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTable.cs
index e173e2e0b4e..65fe6c73da0 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTable.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTable.cs
@@ -1,16 +1,15 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.DisplayManagement.Descriptors
+namespace OrchardCore.DisplayManagement.Descriptors;
+
+public class ShapeTable
 {
-    public class ShapeTable
+    public ShapeTable(IDictionary<string, ShapeDescriptor> descriptors, IDictionary<string, ShapeBinding> bindings)
     {
-        public ShapeTable(IDictionary<string, ShapeDescriptor> descriptors, IDictionary<string, ShapeBinding> bindings)
-        {
-            Descriptors = descriptors;
-            Bindings = bindings;
-        }
-
-        public IDictionary<string, ShapeDescriptor> Descriptors { get; }
-        public IDictionary<string, ShapeBinding> Bindings { get; }
+        Descriptors = descriptors;
+        Bindings = bindings;
     }
+
+    public IDictionary<string, ShapeDescriptor> Descriptors { get; }
+    public IDictionary<string, ShapeBinding> Bindings { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTableBuilder.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTableBuilder.cs
index 9b5fa2435cc..73dcb0fdc9c 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTableBuilder.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTableBuilder.cs
@@ -2,31 +2,30 @@
 using System.Linq;
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.DisplayManagement.Descriptors
+namespace OrchardCore.DisplayManagement.Descriptors;
+
+public class ShapeTableBuilder
 {
-    public class ShapeTableBuilder
-    {
-        private readonly IList<ShapeAlterationBuilder> _alterationBuilders = [];
-        private readonly IFeatureInfo _feature;
+    private readonly IList<ShapeAlterationBuilder> _alterationBuilders = [];
+    private readonly IFeatureInfo _feature;
 
-        public ShapeTableBuilder(IFeatureInfo feature, IReadOnlyCollection<string> excludedFeatureIds = null)
-        {
-            _feature = feature;
-            ExcludedFeatureIds = excludedFeatureIds ?? new HashSet<string>();
-        }
+    public ShapeTableBuilder(IFeatureInfo feature, IReadOnlyCollection<string> excludedFeatureIds = null)
+    {
+        _feature = feature;
+        ExcludedFeatureIds = excludedFeatureIds ?? new HashSet<string>();
+    }
 
-        public IReadOnlyCollection<string> ExcludedFeatureIds { get; }
+    public IReadOnlyCollection<string> ExcludedFeatureIds { get; }
 
-        public ShapeAlterationBuilder Describe(string shapeType)
-        {
-            var alterationBuilder = new ShapeAlterationBuilder(_feature, shapeType);
-            _alterationBuilders.Add(alterationBuilder);
-            return alterationBuilder;
-        }
+    public ShapeAlterationBuilder Describe(string shapeType)
+    {
+        var alterationBuilder = new ShapeAlterationBuilder(_feature, shapeType);
+        _alterationBuilders.Add(alterationBuilder);
+        return alterationBuilder;
+    }
 
-        public IEnumerable<ShapeAlteration> BuildAlterations()
-        {
-            return _alterationBuilders.Select(b => b.Build());
-        }
+    public IEnumerable<ShapeAlteration> BuildAlterations()
+    {
+        return _alterationBuilders.Select(b => b.Build());
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTablePlacementProvider.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTablePlacementProvider.cs
index eac87145e36..185d5940ff6 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTablePlacementProvider.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTablePlacementProvider.cs
@@ -2,60 +2,59 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Theming;
 
-namespace OrchardCore.DisplayManagement.Descriptors
+namespace OrchardCore.DisplayManagement.Descriptors;
+
+public class ShapeTablePlacementProvider : IShapePlacementProvider
 {
-    public class ShapeTablePlacementProvider : IShapePlacementProvider
+    private readonly IShapeTableManager _shapeTableManager;
+    private readonly IThemeManager _themeManager;
+
+    public ShapeTablePlacementProvider(
+        IShapeTableManager shapeTableManager,
+        IThemeManager themeManager
+        )
+    {
+        _shapeTableManager = shapeTableManager;
+        _themeManager = themeManager;
+    }
+
+    public async Task<IPlacementInfoResolver> BuildPlacementInfoResolverAsync(IBuildShapeContext context)
     {
-        private readonly IShapeTableManager _shapeTableManager;
-        private readonly IThemeManager _themeManager;
+        var theme = await _themeManager.GetThemeAsync();
 
-        public ShapeTablePlacementProvider(
-            IShapeTableManager shapeTableManager,
-            IThemeManager themeManager
-            )
+        // If there is no active theme, do nothing
+        if (theme == null)
         {
-            _shapeTableManager = shapeTableManager;
-            _themeManager = themeManager;
+            return null;
         }
 
-        public async Task<IPlacementInfoResolver> BuildPlacementInfoResolverAsync(IBuildShapeContext context)
-        {
-            var theme = await _themeManager.GetThemeAsync();
+        var shapeTable = await _shapeTableManager.GetShapeTableAsync(theme.Id);
 
-            // If there is no active theme, do nothing
-            if (theme == null)
-            {
-                return null;
-            }
+        return new ShapeTablePlacementResolver(shapeTable);
+    }
 
-            var shapeTable = await _shapeTableManager.GetShapeTableAsync(theme.Id);
+    private sealed class ShapeTablePlacementResolver : IPlacementInfoResolver
+    {
+        private readonly ShapeTable _shapeTable;
 
-            return new ShapeTablePlacementResolver(shapeTable);
+        internal ShapeTablePlacementResolver(ShapeTable shapeTable)
+        {
+            _shapeTable = shapeTable;
         }
 
-        private sealed class ShapeTablePlacementResolver : IPlacementInfoResolver
+        public PlacementInfo ResolvePlacement(ShapePlacementContext placementContext)
         {
-            private readonly ShapeTable _shapeTable;
-
-            internal ShapeTablePlacementResolver(ShapeTable shapeTable)
-            {
-                _shapeTable = shapeTable;
-            }
-
-            public PlacementInfo ResolvePlacement(ShapePlacementContext placementContext)
+            if (_shapeTable.Descriptors.TryGetValue(placementContext.ShapeType, out var descriptor))
             {
-                if (_shapeTable.Descriptors.TryGetValue(placementContext.ShapeType, out var descriptor))
+                var placement = descriptor.Placement(placementContext);
+                if (placement != null)
                 {
-                    var placement = descriptor.Placement(placementContext);
-                    if (placement != null)
-                    {
-                        placement.Source = placementContext.Source;
-                        return placement;
-                    }
+                    placement.Source = placementContext.Source;
+                    return placement;
                 }
-
-                return null;
             }
+
+            return null;
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/BasicShapeTemplateHarvester.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/BasicShapeTemplateHarvester.cs
index 2d254f62ff4..6d12706fa35 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/BasicShapeTemplateHarvester.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/BasicShapeTemplateHarvester.cs
@@ -1,63 +1,62 @@
 using System;
 using System.Collections.Generic;
 
-namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy
+namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy;
+
+public class BasicShapeTemplateHarvester : IShapeTemplateHarvester
 {
-    public class BasicShapeTemplateHarvester : IShapeTemplateHarvester
+    public IEnumerable<string> SubPaths()
     {
-        public IEnumerable<string> SubPaths()
-        {
-            return new[] { "Views", "Views/Items", "Views/Parts", "Views/Fields", "Views/Elements" };
-        }
+        return new[] { "Views", "Views/Items", "Views/Parts", "Views/Fields", "Views/Elements" };
+    }
 
-        public IEnumerable<HarvestShapeHit> HarvestShape(HarvestShapeInfo info)
+    public IEnumerable<HarvestShapeHit> HarvestShape(HarvestShapeInfo info)
+    {
+        var lastDash = info.FileName.LastIndexOf('-');
+        var lastDot = info.FileName.LastIndexOf('.');
+        if (lastDot <= 0 || lastDot < lastDash)
         {
-            var lastDash = info.FileName.LastIndexOf('-');
-            var lastDot = info.FileName.LastIndexOf('.');
-            if (lastDot <= 0 || lastDot < lastDash)
+            yield return new HarvestShapeHit
             {
-                yield return new HarvestShapeHit
-                {
-                    ShapeType = Adjust(info.SubPath, info.FileName, null),
-                };
-            }
-            else
-            {
-                var displayType = info.FileName[(lastDot + 1)..];
-                yield return new HarvestShapeHit
-                {
-                    ShapeType = Adjust(info.SubPath, info.FileName[..lastDot], displayType),
-                    DisplayType = displayType,
-                };
-            }
+                ShapeType = Adjust(info.SubPath, info.FileName, null),
+            };
         }
-
-        private static string Adjust(string subPath, string fileName, string displayType)
+        else
         {
-            var leader = "";
-            if (subPath.StartsWith("Views/", StringComparison.Ordinal) && subPath != "Views/Items")
+            var displayType = info.FileName[(lastDot + 1)..];
+            yield return new HarvestShapeHit
             {
-                leader = string.Concat(subPath.AsSpan("Views/".Length), "_");
-            }
+                ShapeType = Adjust(info.SubPath, info.FileName[..lastDot], displayType),
+                DisplayType = displayType,
+            };
+        }
+    }
 
-            // canonical shape type names must not have - or . to be compatible
-            // with display and shape api calls)))
-            var shapeType = leader + fileName.Replace("--", "__").Replace("-", "__").Replace('.', '_');
+    private static string Adjust(string subPath, string fileName, string displayType)
+    {
+        var leader = "";
+        if (subPath.StartsWith("Views/", StringComparison.Ordinal) && subPath != "Views/Items")
+        {
+            leader = string.Concat(subPath.AsSpan("Views/".Length), "_");
+        }
 
-            if (string.IsNullOrEmpty(displayType))
-            {
-                return shapeType.ToLowerInvariant();
-            }
+        // canonical shape type names must not have - or . to be compatible
+        // with display and shape api calls)))
+        var shapeType = leader + fileName.Replace("--", "__").Replace("-", "__").Replace('.', '_');
 
-            var firstBreakingSeparator = shapeType.IndexOf("__", StringComparison.Ordinal);
-            if (firstBreakingSeparator <= 0)
-            {
-                return (shapeType + "_" + displayType).ToLowerInvariant();
-            }
+        if (string.IsNullOrEmpty(displayType))
+        {
+            return shapeType.ToLowerInvariant();
+        }
 
-            return string.Concat(
-                shapeType.AsSpan(0, firstBreakingSeparator), "_", displayType, shapeType.AsSpan(firstBreakingSeparator))
-                .ToLowerInvariant();
+        var firstBreakingSeparator = shapeType.IndexOf("__", StringComparison.Ordinal);
+        if (firstBreakingSeparator <= 0)
+        {
+            return (shapeType + "_" + displayType).ToLowerInvariant();
         }
+
+        return string.Concat(
+            shapeType.AsSpan(0, firstBreakingSeparator), "_", displayType, shapeType.AsSpan(firstBreakingSeparator))
+            .ToLowerInvariant();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/HarvestShapeHit.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/HarvestShapeHit.cs
index 0e9a3a5b062..412ab93722e 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/HarvestShapeHit.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/HarvestShapeHit.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy
+namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy;
+
+public class HarvestShapeHit
 {
-    public class HarvestShapeHit
-    {
-        public string ShapeType { get; set; }
-        public string DisplayType { get; set; }
-    }
+    public string ShapeType { get; set; }
+    public string DisplayType { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/HarvestShapeInfo.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/HarvestShapeInfo.cs
index fa4ef46f943..2518958eec6 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/HarvestShapeInfo.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/HarvestShapeInfo.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy
+namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy;
+
+public class HarvestShapeInfo
 {
-    public class HarvestShapeInfo
-    {
-        public string SubPath { get; set; }
-        public string FileName { get; set; }
-        public string RelativePath { get; set; }
-        public string Extension { get; set; }
-    }
+    public string SubPath { get; set; }
+    public string FileName { get; set; }
+    public string RelativePath { get; set; }
+    public string Extension { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateFileProviderAccessor.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateFileProviderAccessor.cs
index 0f6291219b6..481b56d49ec 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateFileProviderAccessor.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateFileProviderAccessor.cs
@@ -1,15 +1,14 @@
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy
+namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy;
+
+/// <summary>
+/// Accessor to the <see cref="IFileProvider"/> used by <see cref="ShapeTemplateBindingStrategy"/>.
+/// </summary>
+public interface IShapeTemplateFileProviderAccessor
 {
     /// <summary>
-    /// Accessor to the <see cref="IFileProvider"/> used by <see cref="ShapeTemplateBindingStrategy"/>.
+    /// Gets the <see cref="IFileProvider"/> used to look up Template files.
     /// </summary>
-    public interface IShapeTemplateFileProviderAccessor
-    {
-        /// <summary>
-        /// Gets the <see cref="IFileProvider"/> used to look up Template files.
-        /// </summary>
-        IFileProvider FileProvider { get; }
-    }
+    IFileProvider FileProvider { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateHarvester.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateHarvester.cs
index d4a28f8fa68..99dd6c74c36 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateHarvester.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateHarvester.cs
@@ -1,14 +1,13 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy
+namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy;
+
+/// <summary>
+/// This service determines which paths to examine, and provides
+/// the shape type based on the template file paths discovered.
+/// </summary>
+public interface IShapeTemplateHarvester
 {
-    /// <summary>
-    /// This service determines which paths to examine, and provides
-    /// the shape type based on the template file paths discovered.
-    /// </summary>
-    public interface IShapeTemplateHarvester
-    {
-        IEnumerable<string> SubPaths();
-        IEnumerable<HarvestShapeHit> HarvestShape(HarvestShapeInfo info);
-    }
+    IEnumerable<string> SubPaths();
+    IEnumerable<HarvestShapeHit> HarvestShape(HarvestShapeInfo info);
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateViewEngine.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateViewEngine.cs
index 4d2ba738a45..e5ab60f3a97 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateViewEngine.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateViewEngine.cs
@@ -3,11 +3,10 @@
 using Microsoft.AspNetCore.Html;
 using OrchardCore.DisplayManagement.Implementation;
 
-namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy
+namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy;
+
+public interface IShapeTemplateViewEngine
 {
-    public interface IShapeTemplateViewEngine
-    {
-        IEnumerable<string> TemplateFileExtensions { get; }
-        Task<IHtmlContent> RenderAsync(string relativePath, DisplayContext displayContext);
-    }
+    IEnumerable<string> TemplateFileExtensions { get; }
+    Task<IHtmlContent> RenderAsync(string relativePath, DisplayContext displayContext);
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/ShapeTemplateBindingStrategy.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/ShapeTemplateBindingStrategy.cs
index 1abd79f31a3..dd3de99564d 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/ShapeTemplateBindingStrategy.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/ShapeTemplateBindingStrategy.cs
@@ -11,149 +11,148 @@
 using OrchardCore.Environment.Shell;
 using OrchardCore.Mvc.FileProviders;
 
-namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy
+namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy;
+
+public class ShapeTemplateBindingStrategy : ShapeTableProvider, IShapeTableHarvester
 {
-    public class ShapeTemplateBindingStrategy : ShapeTableProvider, IShapeTableHarvester
+    private readonly IEnumerable<IShapeTemplateHarvester> _harvesters;
+    private readonly IEnumerable<IShapeTemplateViewEngine> _shapeTemplateViewEngines;
+    private readonly IShapeTemplateFileProviderAccessor _fileProviderAccessor;
+    private readonly ILogger _logger;
+    private readonly IShellFeaturesManager _shellFeaturesManager;
+
+    private readonly Dictionary<string, IShapeTemplateViewEngine> _viewEnginesByExtension = new(StringComparer.OrdinalIgnoreCase);
+
+    public ShapeTemplateBindingStrategy(
+        IEnumerable<IShapeTemplateHarvester> harvesters,
+        IShellFeaturesManager shellFeaturesManager,
+        IEnumerable<IShapeTemplateViewEngine> shapeTemplateViewEngines,
+        IShapeTemplateFileProviderAccessor fileProviderAccessor,
+        ILogger<ShapeTemplateBindingStrategy> logger)
     {
-        private readonly IEnumerable<IShapeTemplateHarvester> _harvesters;
-        private readonly IEnumerable<IShapeTemplateViewEngine> _shapeTemplateViewEngines;
-        private readonly IShapeTemplateFileProviderAccessor _fileProviderAccessor;
-        private readonly ILogger _logger;
-        private readonly IShellFeaturesManager _shellFeaturesManager;
-
-        private readonly Dictionary<string, IShapeTemplateViewEngine> _viewEnginesByExtension = new(StringComparer.OrdinalIgnoreCase);
-
-        public ShapeTemplateBindingStrategy(
-            IEnumerable<IShapeTemplateHarvester> harvesters,
-            IShellFeaturesManager shellFeaturesManager,
-            IEnumerable<IShapeTemplateViewEngine> shapeTemplateViewEngines,
-            IShapeTemplateFileProviderAccessor fileProviderAccessor,
-            ILogger<ShapeTemplateBindingStrategy> logger)
-        {
-            _harvesters = harvesters;
-            _shellFeaturesManager = shellFeaturesManager;
-            _shapeTemplateViewEngines = shapeTemplateViewEngines;
-            _fileProviderAccessor = fileProviderAccessor;
-            _logger = logger;
-        }
+        _harvesters = harvesters;
+        _shellFeaturesManager = shellFeaturesManager;
+        _shapeTemplateViewEngines = shapeTemplateViewEngines;
+        _fileProviderAccessor = fileProviderAccessor;
+        _logger = logger;
+    }
 
-        public bool DisableMonitoring { get; set; }
+    public bool DisableMonitoring { get; set; }
 
-        public override async ValueTask DiscoverAsync(ShapeTableBuilder builder)
-        {
-            _logger.LogInformation("Start discovering shapes");
+    public override async ValueTask DiscoverAsync(ShapeTableBuilder builder)
+    {
+        _logger.LogInformation("Start discovering shapes");
 
-            var harvesterInfos = _harvesters
-                .Select(harvester => new
-                {
-                    harvester,
-                    subPaths = harvester.SubPaths()
-                })
-                .ToList();
+        var harvesterInfos = _harvesters
+            .Select(harvester => new
+            {
+                harvester,
+                subPaths = harvester.SubPaths()
+            })
+            .ToList();
 
-            var enabledFeatures = await _shellFeaturesManager.GetEnabledFeaturesAsync();
-            var enabledFeatureIds = enabledFeatures.Select(f => f.Id).ToList();
+        var enabledFeatures = await _shellFeaturesManager.GetEnabledFeaturesAsync();
+        var enabledFeatureIds = enabledFeatures.Select(f => f.Id).ToList();
 
-            // Excludes the extensions whose templates are already associated to an excluded feature that is still enabled.
-            var activeExtensions = Once(enabledFeatures)
-                .Where(e => !e.Features.Any(f => builder.ExcludedFeatureIds.Contains(f.Id) && enabledFeatureIds.Contains(f.Id)))
-                .ToArray();
+        // Excludes the extensions whose templates are already associated to an excluded feature that is still enabled.
+        var activeExtensions = Once(enabledFeatures)
+            .Where(e => !e.Features.Any(f => builder.ExcludedFeatureIds.Contains(f.Id) && enabledFeatureIds.Contains(f.Id)))
+            .ToArray();
 
-            if (_viewEnginesByExtension.Count == 0)
+        if (_viewEnginesByExtension.Count == 0)
+        {
+            foreach (var viewEngine in _shapeTemplateViewEngines)
             {
-                foreach (var viewEngine in _shapeTemplateViewEngines)
+                foreach (var extension in viewEngine.TemplateFileExtensions)
                 {
-                    foreach (var extension in viewEngine.TemplateFileExtensions)
+                    if (!_viewEnginesByExtension.ContainsKey(extension))
                     {
-                        if (!_viewEnginesByExtension.ContainsKey(extension))
-                        {
-                            _viewEnginesByExtension[extension] = viewEngine;
-                        }
+                        _viewEnginesByExtension[extension] = viewEngine;
                     }
                 }
             }
+        }
 
-            var hits = activeExtensions.Select(extensionDescriptor =>
-            {
-                _logger.LogInformation("Start discovering candidate views filenames");
+        var hits = activeExtensions.Select(extensionDescriptor =>
+        {
+            _logger.LogInformation("Start discovering candidate views filenames");
 
-                var pathContexts = harvesterInfos.SelectMany(harvesterInfo => harvesterInfo.subPaths.Select(subPath =>
-                {
-                    var filePaths = _fileProviderAccessor.FileProvider.GetViewFilePaths(
-                        PathExtensions.Combine(extensionDescriptor.SubPath, subPath),
-                        _viewEnginesByExtension.Keys.ToArray(),
-                        inViewsFolder: true, inDepth: false).ToArray();
+            var pathContexts = harvesterInfos.SelectMany(harvesterInfo => harvesterInfo.subPaths.Select(subPath =>
+            {
+                var filePaths = _fileProviderAccessor.FileProvider.GetViewFilePaths(
+                    PathExtensions.Combine(extensionDescriptor.SubPath, subPath),
+                    _viewEnginesByExtension.Keys.ToArray(),
+                    inViewsFolder: true, inDepth: false).ToArray();
 
-                    return new { harvesterInfo.harvester, subPath, filePaths };
-                }))
-                .ToList();
+                return new { harvesterInfo.harvester, subPath, filePaths };
+            }))
+            .ToList();
 
-                _logger.LogInformation("Done discovering candidate views filenames");
+            _logger.LogInformation("Done discovering candidate views filenames");
 
-                var fileContexts = pathContexts.SelectMany(pathContext => _shapeTemplateViewEngines.SelectMany(ve =>
-                {
-                    return pathContext.filePaths.Select(
-                        filePath => new
-                        {
-                            fileName = Path.GetFileNameWithoutExtension(filePath),
-                            relativePath = filePath,
-                            pathContext
-                        });
-                }));
-
-                var shapeContexts = fileContexts.SelectMany(fileContext =>
-                {
-                    var harvestShapeInfo = new HarvestShapeInfo
-                    {
-                        SubPath = fileContext.pathContext.subPath,
-                        FileName = fileContext.fileName,
-                        RelativePath = fileContext.relativePath,
-                        Extension = Path.GetExtension(fileContext.relativePath)
-                    };
-                    var harvestShapeHits = fileContext.pathContext.harvester.HarvestShape(harvestShapeInfo);
-                    return harvestShapeHits.Select(harvestShapeHit => new { harvestShapeInfo, harvestShapeHit, fileContext });
-                });
-
-                return shapeContexts.Select(shapeContext => new { extensionDescriptor, shapeContext }).ToList();
-            }).SelectMany(hits2 => hits2);
-
-            foreach (var iter in hits)
+            var fileContexts = pathContexts.SelectMany(pathContext => _shapeTemplateViewEngines.SelectMany(ve =>
             {
-                var hit = iter;
-
-                // The template files of an active module need to be associated to one of its enabled feature.
-                var feature = hit.extensionDescriptor.Features.First(f => enabledFeatureIds.Contains(f.Id));
+                return pathContext.filePaths.Select(
+                    filePath => new
+                    {
+                        fileName = Path.GetFileNameWithoutExtension(filePath),
+                        relativePath = filePath,
+                        pathContext
+                    });
+            }));
 
-                if (_logger.IsEnabled(LogLevel.Debug))
+            var shapeContexts = fileContexts.SelectMany(fileContext =>
+            {
+                var harvestShapeInfo = new HarvestShapeInfo
                 {
-                    _logger.LogDebug("Binding '{TemplatePath}' as shape '{ShapeType}' for feature '{FeatureName}'",
-                        hit.shapeContext.harvestShapeInfo.RelativePath,
-                        iter.shapeContext.harvestShapeHit.ShapeType,
-                        feature.Id);
-                }
-
-                var viewEngineType = _viewEnginesByExtension[iter.shapeContext.harvestShapeInfo.Extension].GetType();
+                    SubPath = fileContext.pathContext.subPath,
+                    FileName = fileContext.fileName,
+                    RelativePath = fileContext.relativePath,
+                    Extension = Path.GetExtension(fileContext.relativePath)
+                };
+                var harvestShapeHits = fileContext.pathContext.harvester.HarvestShape(harvestShapeInfo);
+                return harvestShapeHits.Select(harvestShapeHit => new { harvestShapeInfo, harvestShapeHit, fileContext });
+            });
+
+            return shapeContexts.Select(shapeContext => new { extensionDescriptor, shapeContext }).ToList();
+        }).SelectMany(hits2 => hits2);
+
+        foreach (var iter in hits)
+        {
+            var hit = iter;
 
-                builder.Describe(iter.shapeContext.harvestShapeHit.ShapeType)
-                    .From(feature)
-                    .BoundAs(
-                        hit.shapeContext.harvestShapeInfo.RelativePath, displayContext =>
-                        {
-                            var viewEngine = displayContext.ServiceProvider
-                                .GetServices<IShapeTemplateViewEngine>()
-                                .FirstOrDefault(e => e.GetType() == viewEngineType);
+            // The template files of an active module need to be associated to one of its enabled feature.
+            var feature = hit.extensionDescriptor.Features.First(f => enabledFeatureIds.Contains(f.Id));
 
-                            return viewEngine.RenderAsync(hit.shapeContext.harvestShapeInfo.RelativePath, displayContext);
-                        });
+            if (_logger.IsEnabled(LogLevel.Debug))
+            {
+                _logger.LogDebug("Binding '{TemplatePath}' as shape '{ShapeType}' for feature '{FeatureName}'",
+                    hit.shapeContext.harvestShapeInfo.RelativePath,
+                    iter.shapeContext.harvestShapeHit.ShapeType,
+                    feature.Id);
             }
 
-            _logger.LogInformation("Done discovering shapes");
-        }
+            var viewEngineType = _viewEnginesByExtension[iter.shapeContext.harvestShapeInfo.Extension].GetType();
 
-        private static IExtensionInfo[] Once(IEnumerable<IFeatureInfo> featureDescriptors)
-        {
-            var once = new ConcurrentDictionary<string, object>();
-            return featureDescriptors.Select(x => x.Extension).Where(ed => once.TryAdd(ed.Id, null)).ToArray();
+            builder.Describe(iter.shapeContext.harvestShapeHit.ShapeType)
+                .From(feature)
+                .BoundAs(
+                    hit.shapeContext.harvestShapeInfo.RelativePath, displayContext =>
+                    {
+                        var viewEngine = displayContext.ServiceProvider
+                            .GetServices<IShapeTemplateViewEngine>()
+                            .FirstOrDefault(e => e.GetType() == viewEngineType);
+
+                        return viewEngine.RenderAsync(hit.shapeContext.harvestShapeInfo.RelativePath, displayContext);
+                    });
         }
+
+        _logger.LogInformation("Done discovering shapes");
+    }
+
+    private static IExtensionInfo[] Once(IEnumerable<IFeatureInfo> featureDescriptors)
+    {
+        var once = new ConcurrentDictionary<string, object>();
+        return featureDescriptors.Select(x => x.Extension).Where(ed => once.TryAdd(ed.Id, null)).ToArray();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/ShapeTemplateFileProviderAccessor.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/ShapeTemplateFileProviderAccessor.cs
index 7d5a9738caa..634a9645c64 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/ShapeTemplateFileProviderAccessor.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/ShapeTemplateFileProviderAccessor.cs
@@ -1,38 +1,37 @@
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy
+namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy;
+
+/// <summary>
+/// Default implementation of <see cref="IShapeTemplateFileProviderAccessor"/>.
+/// </summary>
+public class ShapeTemplateFileProviderAccessor : IShapeTemplateFileProviderAccessor
 {
     /// <summary>
-    /// Default implementation of <see cref="IShapeTemplateFileProviderAccessor"/>.
+    /// Initializes a new instance of <see cref="ShapeTemplateFileProviderAccessor"/>.
     /// </summary>
-    public class ShapeTemplateFileProviderAccessor : IShapeTemplateFileProviderAccessor
+    /// <param name="optionsAccessor">Accessor to <see cref="ShapeTemplateOptions"/>.</param>
+    public ShapeTemplateFileProviderAccessor(IOptions<ShapeTemplateOptions> optionsAccessor)
     {
-        /// <summary>
-        /// Initializes a new instance of <see cref="ShapeTemplateFileProviderAccessor"/>.
-        /// </summary>
-        /// <param name="optionsAccessor">Accessor to <see cref="ShapeTemplateOptions"/>.</param>
-        public ShapeTemplateFileProviderAccessor(IOptions<ShapeTemplateOptions> optionsAccessor)
-        {
-            var fileProviders = optionsAccessor.Value.FileProviders;
+        var fileProviders = optionsAccessor.Value.FileProviders;
 
-            if (fileProviders.Count == 0)
-            {
-                FileProvider = new NullFileProvider();
-            }
-            else if (fileProviders.Count == 1)
-            {
-                FileProvider = fileProviders[0];
-            }
-            else
-            {
-                FileProvider = new CompositeFileProvider(fileProviders);
-            }
+        if (fileProviders.Count == 0)
+        {
+            FileProvider = new NullFileProvider();
+        }
+        else if (fileProviders.Count == 1)
+        {
+            FileProvider = fileProviders[0];
+        }
+        else
+        {
+            FileProvider = new CompositeFileProvider(fileProviders);
         }
-
-        /// <summary>
-        /// Gets the <see cref="IFileProvider"/> used to look up Templates files.
-        /// </summary>
-        public IFileProvider FileProvider { get; }
     }
+
+    /// <summary>
+    /// Gets the <see cref="IFileProvider"/> used to look up Templates files.
+    /// </summary>
+    public IFileProvider FileProvider { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/ShapeTemplateOptions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/ShapeTemplateOptions.cs
index d6587b45698..416e9b95264 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/ShapeTemplateOptions.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/ShapeTemplateOptions.cs
@@ -1,21 +1,20 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy
+namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy;
+
+/// <summary>
+/// Provides programmatic configuration for the <see cref="ShapeTemplateBindingStrategy"/>.
+/// </summary>
+public class ShapeTemplateOptions
 {
     /// <summary>
-    /// Provides programmatic configuration for the <see cref="ShapeTemplateBindingStrategy"/>.
+    /// Gets the sequence of <see cref="IFileProvider" /> instances used by <see cref="ShapeTemplateBindingStrategy"/> to
+    /// locate Fluid files.
     /// </summary>
-    public class ShapeTemplateOptions
-    {
-        /// <summary>
-        /// Gets the sequence of <see cref="IFileProvider" /> instances used by <see cref="ShapeTemplateBindingStrategy"/> to
-        /// locate Fluid files.
-        /// </summary>
-        /// <remarks>
-        /// At startup, this is initialized to include an instance of <see cref="PhysicalFileProvider"/> that is
-        /// rooted at the application root.
-        /// </remarks>
-        public IList<IFileProvider> FileProviders { get; } = [];
-    }
+    /// <remarks>
+    /// At startup, this is initialized to include an instance of <see cref="PhysicalFileProvider"/> that is
+    /// rooted at the application root.
+    /// </remarks>
+    public IList<IFileProvider> FileProviders { get; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/ShapeTemplateOptionsSetup.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/ShapeTemplateOptionsSetup.cs
index aefe5602557..7e597d81766 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/ShapeTemplateOptionsSetup.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Descriptors/ShapeTemplateStrategy/ShapeTemplateOptionsSetup.cs
@@ -4,39 +4,38 @@
 using OrchardCore.Modules;
 using OrchardCore.Mvc;
 
-namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy
+namespace OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy;
+
+/// <summary>
+/// Sets up default options for <see cref="ShapeTemplateOptions"/>.
+/// </summary>
+public sealed class ShapeTemplateOptionsSetup : IConfigureOptions<ShapeTemplateOptions>
 {
+    private readonly IHostEnvironment _hostingEnvironment;
+    private readonly IApplicationContext _applicationContext;
+
     /// <summary>
-    /// Sets up default options for <see cref="ShapeTemplateOptions"/>.
+    /// Initializes a new instance of <see cref="ShapeTemplateOptions"/>.
     /// </summary>
-    public sealed class ShapeTemplateOptionsSetup : IConfigureOptions<ShapeTemplateOptions>
+    /// <param name="hostingEnvironment"><see cref="IHostEnvironment"/> for the application.</param>
+    /// <param name="applicationContext"><see cref="IApplicationContext"/> for the application.</param>
+    public ShapeTemplateOptionsSetup(IHostEnvironment hostingEnvironment, IApplicationContext applicationContext)
     {
-        private readonly IHostEnvironment _hostingEnvironment;
-        private readonly IApplicationContext _applicationContext;
+        ArgumentNullException.ThrowIfNull(hostingEnvironment);
 
-        /// <summary>
-        /// Initializes a new instance of <see cref="ShapeTemplateOptions"/>.
-        /// </summary>
-        /// <param name="hostingEnvironment"><see cref="IHostEnvironment"/> for the application.</param>
-        /// <param name="applicationContext"><see cref="IApplicationContext"/> for the application.</param>
-        public ShapeTemplateOptionsSetup(IHostEnvironment hostingEnvironment, IApplicationContext applicationContext)
-        {
-            ArgumentNullException.ThrowIfNull(hostingEnvironment);
-
-            _hostingEnvironment = hostingEnvironment;
-            _applicationContext = applicationContext;
-        }
+        _hostingEnvironment = hostingEnvironment;
+        _applicationContext = applicationContext;
+    }
 
-        public void Configure(ShapeTemplateOptions options)
+    public void Configure(ShapeTemplateOptions options)
+    {
+        if (_hostingEnvironment.ContentRootFileProvider != null)
         {
-            if (_hostingEnvironment.ContentRootFileProvider != null)
-            {
-                options.FileProviders.Add(_hostingEnvironment.ContentRootFileProvider);
-            }
-
-            // To let the application behave as a module, its views are requested under the virtual
-            // "Areas" folder, but they are still served from the file system by this custom provider.
-            options.FileProviders.Insert(0, new ApplicationViewFileProvider(_applicationContext));
+            options.FileProviders.Add(_hostingEnvironment.ContentRootFileProvider);
         }
+
+        // To let the application behave as a module, its views are requested under the virtual
+        // "Areas" folder, but they are still served from the file system by this custom provider.
+        options.FileProviders.Insert(0, new ApplicationViewFileProvider(_applicationContext));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/DisplayManager.cs b/src/OrchardCore/OrchardCore.DisplayManagement/DisplayManager.cs
index b55a6de8d50..653ed71bdfc 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/DisplayManager.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/DisplayManager.cs
@@ -7,135 +7,134 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.Modules;
 
-namespace OrchardCore.DisplayManagement
+namespace OrchardCore.DisplayManagement;
+
+public class DisplayManager<TModel> : BaseDisplayManager, IDisplayManager<TModel>
 {
-    public class DisplayManager<TModel> : BaseDisplayManager, IDisplayManager<TModel>
+    private readonly IEnumerable<IDisplayDriver<TModel>> _drivers;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly ILayoutAccessor _layoutAccessor;
+    private readonly ILogger _logger;
+
+    public DisplayManager(
+        IEnumerable<IDisplayDriver<TModel>> drivers,
+        IShapeFactory shapeFactory,
+        IEnumerable<IShapePlacementProvider> placementProviders,
+        ILogger<DisplayManager<TModel>> logger,
+        ILayoutAccessor layoutAccessor
+        ) : base(shapeFactory, placementProviders)
     {
-        private readonly IEnumerable<IDisplayDriver<TModel>> _drivers;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly ILayoutAccessor _layoutAccessor;
-        private readonly ILogger _logger;
-
-        public DisplayManager(
-            IEnumerable<IDisplayDriver<TModel>> drivers,
-            IShapeFactory shapeFactory,
-            IEnumerable<IShapePlacementProvider> placementProviders,
-            ILogger<DisplayManager<TModel>> logger,
-            ILayoutAccessor layoutAccessor
-            ) : base(shapeFactory, placementProviders)
-        {
-            _shapeFactory = shapeFactory;
-            _layoutAccessor = layoutAccessor;
-            _drivers = drivers;
-            _logger = logger;
-        }
+        _shapeFactory = shapeFactory;
+        _layoutAccessor = layoutAccessor;
+        _drivers = drivers;
+        _logger = logger;
+    }
 
-        public async Task<IShape> BuildDisplayAsync(TModel model, IUpdateModel updater, string displayType = null, string group = null)
-        {
-            var actualShapeType = typeof(TModel).Name;
+    public async Task<IShape> BuildDisplayAsync(TModel model, IUpdateModel updater, string displayType = null, string group = null)
+    {
+        var actualShapeType = typeof(TModel).Name;
 
-            var actualDisplayType = string.IsNullOrEmpty(displayType) ? "Detail" : displayType;
+        var actualDisplayType = string.IsNullOrEmpty(displayType) ? "Detail" : displayType;
 
-            // _[DisplayType] is only added for the ones different than Detail
-            if (actualDisplayType != "Detail")
-            {
-                actualShapeType = actualShapeType + "_" + actualDisplayType;
-            }
+        // _[DisplayType] is only added for the ones different than Detail
+        if (actualDisplayType != "Detail")
+        {
+            actualShapeType = actualShapeType + "_" + actualDisplayType;
+        }
 
-            var shape = await CreateContentShapeAsync(actualShapeType);
+        var shape = await CreateContentShapeAsync(actualShapeType);
 
-            // This provides a way to default a safe default and customize for each model type
-            shape.Metadata.Alternates.Add($"{actualShapeType}__{model.GetType().Name}");
+        // This provides a way to default a safe default and customize for each model type
+        shape.Metadata.Alternates.Add($"{actualShapeType}__{model.GetType().Name}");
 
-            var context = new BuildDisplayContext(
-                shape,
-                actualDisplayType,
-                group ?? "",
-                _shapeFactory,
-                await _layoutAccessor.GetLayoutAsync(),
-                new ModelStateWrapperUpdater(updater)
-            );
+        var context = new BuildDisplayContext(
+            shape,
+            actualDisplayType,
+            group ?? "",
+            _shapeFactory,
+            await _layoutAccessor.GetLayoutAsync(),
+            new ModelStateWrapperUpdater(updater)
+        );
 
-            await BindPlacementAsync(context);
+        await BindPlacementAsync(context);
 
-            await _drivers.InvokeAsync(async (driver, model, context) =>
+        await _drivers.InvokeAsync(async (driver, model, context) =>
+        {
+            var result = await driver.BuildDisplayAsync(model, context);
+            if (result != null)
             {
-                var result = await driver.BuildDisplayAsync(model, context);
-                if (result != null)
-                {
-                    await result.ApplyAsync(context);
-                }
-            }, model, context, _logger);
-
-            return shape;
-        }
+                await result.ApplyAsync(context);
+            }
+        }, model, context, _logger);
 
-        public async Task<IShape> BuildEditorAsync(TModel model, IUpdateModel updater, bool isNew, string group, string htmlPrefix)
-        {
-            var actualShapeType = typeof(TModel).Name + "_Edit";
+        return shape;
+    }
 
-            var shape = await CreateContentShapeAsync(actualShapeType);
+    public async Task<IShape> BuildEditorAsync(TModel model, IUpdateModel updater, bool isNew, string group, string htmlPrefix)
+    {
+        var actualShapeType = typeof(TModel).Name + "_Edit";
 
-            // This provides a way to default a safe default and customize for each model type
-            shape.Metadata.Alternates.Add($"{model.GetType().Name}_Edit");
-            shape.Metadata.Alternates.Add($"{actualShapeType}__{model.GetType().Name}");
+        var shape = await CreateContentShapeAsync(actualShapeType);
 
-            var context = new BuildEditorContext(
-                shape,
-                group ?? "",
-                isNew,
-                htmlPrefix,
-                _shapeFactory,
-                await _layoutAccessor.GetLayoutAsync(),
-                new ModelStateWrapperUpdater(updater)
-            );
+        // This provides a way to default a safe default and customize for each model type
+        shape.Metadata.Alternates.Add($"{model.GetType().Name}_Edit");
+        shape.Metadata.Alternates.Add($"{actualShapeType}__{model.GetType().Name}");
 
-            await BindPlacementAsync(context);
+        var context = new BuildEditorContext(
+            shape,
+            group ?? "",
+            isNew,
+            htmlPrefix,
+            _shapeFactory,
+            await _layoutAccessor.GetLayoutAsync(),
+            new ModelStateWrapperUpdater(updater)
+        );
 
-            await _drivers.InvokeAsync(async (driver, model, context) =>
-            {
-                var result = await driver.BuildEditorAsync(model, context);
-                if (result != null)
-                {
-                    await result.ApplyAsync(context);
-                }
-            }, model, context, _logger);
-
-            return shape;
-        }
+        await BindPlacementAsync(context);
 
-        public async Task<IShape> UpdateEditorAsync(TModel model, IUpdateModel updater, bool isNew, string group, string htmlPrefix)
+        await _drivers.InvokeAsync(async (driver, model, context) =>
         {
-            var actualShapeType = typeof(TModel).Name + "_Edit";
+            var result = await driver.BuildEditorAsync(model, context);
+            if (result != null)
+            {
+                await result.ApplyAsync(context);
+            }
+        }, model, context, _logger);
+
+        return shape;
+    }
+
+    public async Task<IShape> UpdateEditorAsync(TModel model, IUpdateModel updater, bool isNew, string group, string htmlPrefix)
+    {
+        var actualShapeType = typeof(TModel).Name + "_Edit";
 
-            var shape = await CreateContentShapeAsync(actualShapeType);
+        var shape = await CreateContentShapeAsync(actualShapeType);
 
-            // This provides a way to default a safe default and customize for each model type
-            shape.Metadata.Alternates.Add($"{model.GetType().Name}_Edit");
-            shape.Metadata.Alternates.Add($"{actualShapeType}__{model.GetType().Name}");
+        // This provides a way to default a safe default and customize for each model type
+        shape.Metadata.Alternates.Add($"{model.GetType().Name}_Edit");
+        shape.Metadata.Alternates.Add($"{actualShapeType}__{model.GetType().Name}");
 
-            var context = new UpdateEditorContext(
-                shape,
-                group ?? "",
-                isNew,
-                htmlPrefix,
-                _shapeFactory,
-                await _layoutAccessor.GetLayoutAsync(),
-                new ModelStateWrapperUpdater(updater)
-            );
+        var context = new UpdateEditorContext(
+            shape,
+            group ?? "",
+            isNew,
+            htmlPrefix,
+            _shapeFactory,
+            await _layoutAccessor.GetLayoutAsync(),
+            new ModelStateWrapperUpdater(updater)
+        );
 
-            await BindPlacementAsync(context);
+        await BindPlacementAsync(context);
 
-            await _drivers.InvokeAsync(async (driver, model, context) =>
+        await _drivers.InvokeAsync(async (driver, model, context) =>
+        {
+            var result = await driver.UpdateEditorAsync(model, context);
+            if (result != null)
             {
-                var result = await driver.UpdateEditorAsync(model, context);
-                if (result != null)
-                {
-                    await result.ApplyAsync(context);
-                }
-            }, model, context, _logger);
-
-            return shape;
-        }
+                await result.ApplyAsync(context);
+            }
+        }, model, context, _logger);
+
+        return shape;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Events/ThemeFeatureBuilderEvents.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Events/ThemeFeatureBuilderEvents.cs
index 4eb771e74c3..ac934c400ef 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Events/ThemeFeatureBuilderEvents.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Events/ThemeFeatureBuilderEvents.cs
@@ -5,29 +5,28 @@
 using OrchardCore.Environment.Extensions.Features;
 using OrchardCore.Modules.Manifest;
 
-namespace OrchardCore.DisplayManagement.Events
+namespace OrchardCore.DisplayManagement.Events;
+
+public class ThemeFeatureBuilderEvents : FeatureBuilderEvents
 {
-    public class ThemeFeatureBuilderEvents : FeatureBuilderEvents
+    public override void Building(FeatureBuildingContext context)
     {
-        public override void Building(FeatureBuildingContext context)
+        var moduleInfo = context.ExtensionInfo.Manifest.ModuleInfo;
+
+        if (moduleInfo is ThemeAttribute || (moduleInfo is ModuleMarkerAttribute &&
+            moduleInfo.Type.Equals("Theme", StringComparison.OrdinalIgnoreCase)))
         {
-            var moduleInfo = context.ExtensionInfo.Manifest.ModuleInfo;
+            var extensionInfo = new ThemeExtensionInfo(context.ExtensionInfo);
 
-            if (moduleInfo is ThemeAttribute || (moduleInfo is ModuleMarkerAttribute &&
-                moduleInfo.Type.Equals("Theme", StringComparison.OrdinalIgnoreCase)))
+            if (extensionInfo.HasBaseTheme())
             {
-                var extensionInfo = new ThemeExtensionInfo(context.ExtensionInfo);
-
-                if (extensionInfo.HasBaseTheme())
-                {
-                    context.FeatureDependencyIds = context
-                        .FeatureDependencyIds
-                        .Concat(new[] { extensionInfo.BaseTheme })
-                        .ToArray();
-                }
-
-                context.ExtensionInfo = extensionInfo;
+                context.FeatureDependencyIds = context
+                    .FeatureDependencyIds
+                    .Concat(new[] { extensionInfo.BaseTheme })
+                    .ToArray();
             }
+
+            context.ExtensionInfo = extensionInfo;
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ExtensionInfoExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ExtensionInfoExtensions.cs
index 225ac65aa50..01e078f5b43 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ExtensionInfoExtensions.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ExtensionInfoExtensions.cs
@@ -1,15 +1,14 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.DisplayManagement.Extensions
+namespace OrchardCore.DisplayManagement.Extensions;
+
+public static class ExtensionInfoExtensions
 {
-    public static class ExtensionInfoExtensions
-    {
-        public static bool IsTheme(this IExtensionInfo extensionInfo) =>
-            extensionInfo is IThemeExtensionInfo;
+    public static bool IsTheme(this IExtensionInfo extensionInfo) =>
+        extensionInfo is IThemeExtensionInfo;
 
-        public static bool IsTheme(this IFeatureInfo featureInfo) =>
-            featureInfo.Extension is IThemeExtensionInfo &&
-            featureInfo.Id == featureInfo.Extension.Id;
-    }
+    public static bool IsTheme(this IFeatureInfo featureInfo) =>
+        featureInfo.Extension is IThemeExtensionInfo &&
+        featureInfo.Id == featureInfo.Extension.Id;
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ServiceCollectionExtensions.cs
index 785dfd47b10..b37734fe126 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ServiceCollectionExtensions.cs
@@ -1,26 +1,25 @@
 using System.Reflection;
 using OrchardCore.DisplayManagement.TagHelpers;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    /// <summary>
+    /// Adds tag helper services.
+    /// </summary>
+    public static IServiceCollection AddTagHelpers(this IServiceCollection services, Assembly assembly)
     {
-        /// <summary>
-        /// Adds tag helper services.
-        /// </summary>
-        public static IServiceCollection AddTagHelpers(this IServiceCollection services, Assembly assembly)
-        {
-            return services.AddTransient<ITagHelpersProvider>(sp => new AssemblyTagHelpersProvider(assembly));
-        }
+        return services.AddTransient<ITagHelpersProvider>(sp => new AssemblyTagHelpersProvider(assembly));
+    }
 
-        /// <summary>
-        /// Adds tag helper services.
-        /// </summary>
-        public static IServiceCollection AddTagHelpers<T>(this IServiceCollection services)
-        {
-            return services
-                .AddTransient<ITagHelpersProvider>(sp => new TagHelpersProvider<T>())
-                .AddTransient(typeof(T));
-        }
+    /// <summary>
+    /// Adds tag helper services.
+    /// </summary>
+    public static IServiceCollection AddTagHelpers<T>(this IServiceCollection services)
+    {
+        return services
+            .AddTransient<ITagHelpersProvider>(sp => new TagHelpersProvider<T>())
+            .AddTransient(typeof(T));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ThemeExtensionDependencyStrategy.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ThemeExtensionDependencyStrategy.cs
index 2664085be2d..1c60c36e206 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ThemeExtensionDependencyStrategy.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ThemeExtensionDependencyStrategy.cs
@@ -1,19 +1,18 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.DisplayManagement.Extensions
+namespace OrchardCore.DisplayManagement.Extensions;
+
+public class ThemeExtensionDependencyStrategy : IExtensionDependencyStrategy
 {
-    public class ThemeExtensionDependencyStrategy : IExtensionDependencyStrategy
+    public bool HasDependency(IFeatureInfo observer, IFeatureInfo subject)
     {
-        public bool HasDependency(IFeatureInfo observer, IFeatureInfo subject)
+        if (observer.IsTheme())
         {
-            if (observer.IsTheme())
-            {
-                if (!subject.IsTheme())
-                    return true;
-            }
-
-            return false;
+            if (!subject.IsTheme())
+                return true;
         }
+
+        return false;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ThemeExtensionInfo.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ThemeExtensionInfo.cs
index d2b64f9f215..4cbfa96187d 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ThemeExtensionInfo.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ThemeExtensionInfo.cs
@@ -3,37 +3,36 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.DisplayManagement.Extensions
+namespace OrchardCore.DisplayManagement.Extensions;
+
+public class ThemeExtensionInfo : IThemeExtensionInfo
 {
-    public class ThemeExtensionInfo : IThemeExtensionInfo
+    private readonly IExtensionInfo _extensionInfo;
+
+    public ThemeExtensionInfo(IExtensionInfo extensionInfo)
+    {
+        _extensionInfo = extensionInfo;
+
+        // No need to do any further verification since the attributes themselves handle that on the front end
+        var themeInfo = _extensionInfo.Manifest.ModuleInfo as ThemeAttribute;
+        BaseTheme = themeInfo?.BaseTheme;
+    }
+
+    public string Id => _extensionInfo.Id;
+    public string SubPath => _extensionInfo.SubPath;
+    public IManifestInfo Manifest => _extensionInfo.Manifest;
+    public IEnumerable<IFeatureInfo> Features => _extensionInfo.Features;
+    public bool Exists => _extensionInfo.Exists;
+
+    public string BaseTheme { get; }
+
+    public bool HasBaseTheme()
+    {
+        return !string.IsNullOrWhiteSpace(BaseTheme);
+    }
+
+    public bool IsBaseThemeFeature(string featureId)
     {
-        private readonly IExtensionInfo _extensionInfo;
-
-        public ThemeExtensionInfo(IExtensionInfo extensionInfo)
-        {
-            _extensionInfo = extensionInfo;
-
-            // No need to do any further verification since the attributes themselves handle that on the front end
-            var themeInfo = _extensionInfo.Manifest.ModuleInfo as ThemeAttribute;
-            BaseTheme = themeInfo?.BaseTheme;
-        }
-
-        public string Id => _extensionInfo.Id;
-        public string SubPath => _extensionInfo.SubPath;
-        public IManifestInfo Manifest => _extensionInfo.Manifest;
-        public IEnumerable<IFeatureInfo> Features => _extensionInfo.Features;
-        public bool Exists => _extensionInfo.Exists;
-
-        public string BaseTheme { get; }
-
-        public bool HasBaseTheme()
-        {
-            return !string.IsNullOrWhiteSpace(BaseTheme);
-        }
-
-        public bool IsBaseThemeFeature(string featureId)
-        {
-            return HasBaseTheme() && featureId == BaseTheme;
-        }
+        return HasBaseTheme() && featureId == BaseTheme;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/FileProviders/ContentFileInfo.cs b/src/OrchardCore/OrchardCore.DisplayManagement/FileProviders/ContentFileInfo.cs
index 7d1e79383e2..a1f50be3a26 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/FileProviders/ContentFileInfo.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/FileProviders/ContentFileInfo.cs
@@ -3,39 +3,38 @@
 using System.Text;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.DisplayManagement.FileProviders
+namespace OrchardCore.DisplayManagement.FileProviders;
+
+public class ContentFileInfo : IFileInfo
 {
-    public class ContentFileInfo : IFileInfo
-    {
-        private readonly byte[] _content;
+    private readonly byte[] _content;
 
-        public ContentFileInfo(string name, string content)
-        {
-            Name = name;
-            _content = Encoding.UTF8.GetBytes(content);
-        }
+    public ContentFileInfo(string name, string content)
+    {
+        Name = name;
+        _content = Encoding.UTF8.GetBytes(content);
+    }
 
-        public bool Exists => true;
+    public bool Exists => true;
 
-        public long Length
-        {
-            get { return _content.Length; }
-        }
+    public long Length
+    {
+        get { return _content.Length; }
+    }
 
-        public string PhysicalPath => null;
+    public string PhysicalPath => null;
 
-        public string Name { get; }
+    public string Name { get; }
 
-        public DateTimeOffset LastModified
-        {
-            get { return DateTimeOffset.MinValue; }
-        }
+    public DateTimeOffset LastModified
+    {
+        get { return DateTimeOffset.MinValue; }
+    }
 
-        public bool IsDirectory => false;
+    public bool IsDirectory => false;
 
-        public Stream CreateReadStream()
-        {
-            return new MemoryStream(_content);
-        }
+    public Stream CreateReadStream()
+    {
+        return new MemoryStream(_content);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/FileProviders/DirectoryContents.cs b/src/OrchardCore/OrchardCore.DisplayManagement/FileProviders/DirectoryContents.cs
index ce7977d98e0..0d6508f8417 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/FileProviders/DirectoryContents.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/FileProviders/DirectoryContents.cs
@@ -3,32 +3,31 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.DisplayManagement.FileProviders
+namespace OrchardCore.DisplayManagement.FileProviders;
+
+public class DirectoryContents : IDirectoryContents
 {
-    public class DirectoryContents : IDirectoryContents
-    {
-        private readonly IEnumerable<IFileInfo> _entries;
+    private readonly IEnumerable<IFileInfo> _entries;
 
-        public DirectoryContents(IEnumerable<IFileInfo> entries)
-        {
-            ArgumentNullException.ThrowIfNull(entries);
+    public DirectoryContents(IEnumerable<IFileInfo> entries)
+    {
+        ArgumentNullException.ThrowIfNull(entries);
 
-            _entries = entries;
-        }
+        _entries = entries;
+    }
 
-        public bool Exists
-        {
-            get { return true; }
-        }
+    public bool Exists
+    {
+        get { return true; }
+    }
 
-        public IEnumerator<IFileInfo> GetEnumerator()
-        {
-            return _entries.GetEnumerator();
-        }
+    public IEnumerator<IFileInfo> GetEnumerator()
+    {
+        return _entries.GetEnumerator();
+    }
 
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return _entries.GetEnumerator();
-        }
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return _entries.GetEnumerator();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/BuildDisplayContext.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/BuildDisplayContext.cs
index 9028ca9a92e..aa3909f7070 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/BuildDisplayContext.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/BuildDisplayContext.cs
@@ -1,16 +1,15 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Zones;
 
-namespace OrchardCore.DisplayManagement.Handlers
+namespace OrchardCore.DisplayManagement.Handlers;
+
+public class BuildDisplayContext : BuildShapeContext
 {
-    public class BuildDisplayContext : BuildShapeContext
+    public BuildDisplayContext(IShape shape, string displayType, string groupId, IShapeFactory shapeFactory, IZoneHolding layout, IUpdateModel updater)
+        : base(shape, groupId, shapeFactory, layout, updater)
     {
-        public BuildDisplayContext(IShape shape, string displayType, string groupId, IShapeFactory shapeFactory, IZoneHolding layout, IUpdateModel updater)
-            : base(shape, groupId, shapeFactory, layout, updater)
-        {
-            DisplayType = displayType;
-        }
-
-        public string DisplayType { get; private set; }
+        DisplayType = displayType;
     }
+
+    public string DisplayType { get; private set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/BuildEditorContext.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/BuildEditorContext.cs
index dee8448487d..c04ccebcee4 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/BuildEditorContext.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/BuildEditorContext.cs
@@ -1,17 +1,16 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Zones;
 
-namespace OrchardCore.DisplayManagement.Handlers
+namespace OrchardCore.DisplayManagement.Handlers;
+
+public class BuildEditorContext : BuildShapeContext
 {
-    public class BuildEditorContext : BuildShapeContext
-    {
-        public bool IsNew { get; set; }
+    public bool IsNew { get; set; }
 
-        public BuildEditorContext(IShape shape, string groupId, bool isNew, string htmlFieldPrefix, IShapeFactory shapeFactory, IZoneHolding layout, IUpdateModel updater)
-            : base(shape, groupId, shapeFactory, layout, updater)
-        {
-            HtmlFieldPrefix = htmlFieldPrefix;
-            IsNew = isNew;
-        }
+    public BuildEditorContext(IShape shape, string groupId, bool isNew, string htmlFieldPrefix, IShapeFactory shapeFactory, IZoneHolding layout, IUpdateModel updater)
+        : base(shape, groupId, shapeFactory, layout, updater)
+    {
+        HtmlFieldPrefix = htmlFieldPrefix;
+        IsNew = isNew;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/BuildShapeContext.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/BuildShapeContext.cs
index b06614526d2..beee794b583 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/BuildShapeContext.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/BuildShapeContext.cs
@@ -2,35 +2,34 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Zones;
 
-namespace OrchardCore.DisplayManagement.Handlers
+namespace OrchardCore.DisplayManagement.Handlers;
+
+public abstract class BuildShapeContext : IBuildShapeContext
 {
-    public abstract class BuildShapeContext : IBuildShapeContext
+    protected BuildShapeContext(IShape shape, string groupId, IShapeFactory shapeFactory, IZoneHolding layout, IUpdateModel updater)
     {
-        protected BuildShapeContext(IShape shape, string groupId, IShapeFactory shapeFactory, IZoneHolding layout, IUpdateModel updater)
-        {
-            Shape = shape;
-            ShapeFactory = shapeFactory;
-            GroupId = groupId;
-            HtmlFieldPrefix = string.Empty;
-            Layout = layout;
-            FindPlacement = FindDefaultPlacement;
-            Updater = updater;
-        }
+        Shape = shape;
+        ShapeFactory = shapeFactory;
+        GroupId = groupId;
+        HtmlFieldPrefix = string.Empty;
+        Layout = layout;
+        FindPlacement = FindDefaultPlacement;
+        Updater = updater;
+    }
 
-        public IShape Shape { get; private set; }
-        public IShapeFactory ShapeFactory { get; private set; }
-        public dynamic New => ShapeFactory;
-        public IZoneHolding Layout { get; set; }
-        public string GroupId { get; private set; }
-        public string HtmlFieldPrefix { get; protected set; }
-        public FindPlacementDelegate FindPlacement { get; set; }
-        public IUpdateModel Updater { get; }
-        public string DefaultZone { get; set; }
-        public string DefaultPosition { get; set; }
+    public IShape Shape { get; private set; }
+    public IShapeFactory ShapeFactory { get; private set; }
+    public dynamic New => ShapeFactory;
+    public IZoneHolding Layout { get; set; }
+    public string GroupId { get; private set; }
+    public string HtmlFieldPrefix { get; protected set; }
+    public FindPlacementDelegate FindPlacement { get; set; }
+    public IUpdateModel Updater { get; }
+    public string DefaultZone { get; set; }
+    public string DefaultPosition { get; set; }
 
-        private static PlacementInfo FindDefaultPlacement(string shapeType, string differentiator, string displayType, IBuildShapeContext context)
-        {
-            return null;
-        }
+    private static PlacementInfo FindDefaultPlacement(string shapeType, string differentiator, string displayType, IBuildShapeContext context)
+    {
+        return null;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/DisplayDriver.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/DisplayDriver.cs
index 9493eb3f220..57e56616925 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/DisplayDriver.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/DisplayDriver.cs
@@ -2,180 +2,179 @@
 using System.Threading.Tasks;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.DisplayManagement.Handlers
+namespace OrchardCore.DisplayManagement.Handlers;
+
+public abstract class DisplayDriver<TModel, TDisplayContext, TEditorContext, TUpdateContext> :
+    DisplayDriverBase,
+    IDisplayDriver<TModel, TDisplayContext, TEditorContext, TUpdateContext>
+    where TModel : class
+    where TDisplayContext : BuildDisplayContext
+    where TEditorContext : BuildEditorContext
+    where TUpdateContext : UpdateEditorContext
 {
-    public abstract class DisplayDriver<TModel, TDisplayContext, TEditorContext, TUpdateContext> :
-        DisplayDriverBase,
-        IDisplayDriver<TModel, TDisplayContext, TEditorContext, TUpdateContext>
-        where TModel : class
-        where TDisplayContext : BuildDisplayContext
-        where TEditorContext : BuildEditorContext
-        where TUpdateContext : UpdateEditorContext
-    {
-        protected static readonly string ModelName = typeof(TModel).Name;
+    protected static readonly string ModelName = typeof(TModel).Name;
 
-        /// <summary>
-        /// Returns <see langword="true"/> if the model can be handled by the current driver.
-        /// </summary>
-        public virtual bool CanHandleModel(TModel model)
-            => true;
+    /// <summary>
+    /// Returns <see langword="true"/> if the model can be handled by the current driver.
+    /// </summary>
+    public virtual bool CanHandleModel(TModel model)
+        => true;
 
-        Task<IDisplayResult> IDisplayDriver<TModel, TDisplayContext, TEditorContext, TUpdateContext>.BuildDisplayAsync(TModel model, TDisplayContext context)
+    Task<IDisplayResult> IDisplayDriver<TModel, TDisplayContext, TEditorContext, TUpdateContext>.BuildDisplayAsync(TModel model, TDisplayContext context)
+    {
+        if (!CanHandleModel(model))
         {
-            if (!CanHandleModel(model))
-            {
-                return Task.FromResult<IDisplayResult>(null);
-            }
+            return Task.FromResult<IDisplayResult>(null);
+        }
 
-            BuildPrefix(model, context.HtmlFieldPrefix);
+        BuildPrefix(model, context.HtmlFieldPrefix);
 
-            return DisplayAsync(model, context);
-        }
+        return DisplayAsync(model, context);
+    }
 
-        Task<IDisplayResult> IDisplayDriver<TModel, TDisplayContext, TEditorContext, TUpdateContext>.BuildEditorAsync(TModel model, TEditorContext context)
+    Task<IDisplayResult> IDisplayDriver<TModel, TDisplayContext, TEditorContext, TUpdateContext>.BuildEditorAsync(TModel model, TEditorContext context)
+    {
+        if (!CanHandleModel(model))
         {
-            if (!CanHandleModel(model))
-            {
-                return Task.FromResult<IDisplayResult>(null);
-            }
+            return Task.FromResult<IDisplayResult>(null);
+        }
 
-            BuildPrefix(model, context.HtmlFieldPrefix);
+        BuildPrefix(model, context.HtmlFieldPrefix);
 
-            return EditAsync(model, context);
-        }
+        return EditAsync(model, context);
+    }
 
-        Task<IDisplayResult> IDisplayDriver<TModel, TDisplayContext, TEditorContext, TUpdateContext>.UpdateEditorAsync(TModel model, TUpdateContext context)
+    Task<IDisplayResult> IDisplayDriver<TModel, TDisplayContext, TEditorContext, TUpdateContext>.UpdateEditorAsync(TModel model, TUpdateContext context)
+    {
+        if (!CanHandleModel(model))
         {
-            if (!CanHandleModel(model))
-            {
-                return Task.FromResult<IDisplayResult>(null);
-            }
+            return Task.FromResult<IDisplayResult>(null);
+        }
 
-            BuildPrefix(model, context.HtmlFieldPrefix);
+        BuildPrefix(model, context.HtmlFieldPrefix);
 
-            return UpdateAsync(model, context);
-        }
+        return UpdateAsync(model, context);
+    }
 
-        public virtual Task<IDisplayResult> DisplayAsync(TModel model, TDisplayContext context)
-            => Task.FromResult(Display(model, context));
+    public virtual Task<IDisplayResult> DisplayAsync(TModel model, TDisplayContext context)
+        => Task.FromResult(Display(model, context));
 
-        public virtual IDisplayResult Display(TModel model, TDisplayContext context)
-        {
+    public virtual IDisplayResult Display(TModel model, TDisplayContext context)
+    {
 #pragma warning disable CS0618 // Type or member is obsolete
-            return Display(model);
+        return Display(model);
 #pragma warning restore CS0618 // Type or member is obsolete
-        }
+    }
 
-        [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the DisplayAsync(TModel model, TDisplayContext context) or Display(TModel model, TDisplayContext context) method.")]
-        public virtual IDisplayResult Display(TModel model)
-            => NullShapeResult();
+    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the DisplayAsync(TModel model, TDisplayContext context) or Display(TModel model, TDisplayContext context) method.")]
+    public virtual IDisplayResult Display(TModel model)
+        => NullShapeResult();
 
-        public virtual Task<IDisplayResult> EditAsync(TModel model, TEditorContext context)
-            => Task.FromResult(Edit(model, context));
+    public virtual Task<IDisplayResult> EditAsync(TModel model, TEditorContext context)
+        => Task.FromResult(Edit(model, context));
 
-        public virtual IDisplayResult Edit(TModel model, TEditorContext context)
-        {
+    public virtual IDisplayResult Edit(TModel model, TEditorContext context)
+    {
 #pragma warning disable CS0618 // Type or member is obsolete
-            return Edit(model);
+        return Edit(model);
 #pragma warning restore CS0618 // Type or member is obsolete
-        }
+    }
 
-        [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the EditAsync(TModel model, TEditorContext context) or Edit(TModel model, TEditorContext context) method.")]
-        public virtual IDisplayResult Edit(TModel model)
-            => NullShapeResult();
+    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the EditAsync(TModel model, TEditorContext context) or Edit(TModel model, TEditorContext context) method.")]
+    public virtual IDisplayResult Edit(TModel model)
+        => NullShapeResult();
 
-        protected static IDisplayResult NullShapeResult()
-            => null;
+    protected static IDisplayResult NullShapeResult()
+        => null;
 
-        public virtual Task<IDisplayResult> UpdateAsync(TModel model, TUpdateContext context)
-            => EditAsync(model, context as TEditorContext);
+    public virtual Task<IDisplayResult> UpdateAsync(TModel model, TUpdateContext context)
+        => EditAsync(model, context as TEditorContext);
 
-        protected virtual void BuildPrefix(TModel model, string htmlFieldPrefix)
+    protected virtual void BuildPrefix(TModel model, string htmlFieldPrefix)
+    {
+        if (!string.IsNullOrEmpty(htmlFieldPrefix))
+        {
+            Prefix = $"{htmlFieldPrefix}.{ModelName}";
+        }
+        else
         {
-            if (!string.IsNullOrEmpty(htmlFieldPrefix))
-            {
-                Prefix = $"{htmlFieldPrefix}.{ModelName}";
-            }
-            else
-            {
-                Prefix = ModelName;
-            }
+            Prefix = ModelName;
         }
     }
+}
+
+public abstract class DisplayDriver<TModel> :
+    DisplayDriver<TModel, BuildDisplayContext, BuildEditorContext, UpdateEditorContext>,
+    IDisplayDriver<TModel>
+    where TModel : class
+{
+}
 
-    public abstract class DisplayDriver<TModel> :
-        DisplayDriver<TModel, BuildDisplayContext, BuildEditorContext, UpdateEditorContext>,
-        IDisplayDriver<TModel>
-        where TModel : class
+public abstract class DisplayDriver<TModel, TConcrete, TDisplayContext, TEditorContext, TUpdateContext> :
+    DisplayDriver<TConcrete, TDisplayContext, TEditorContext, TUpdateContext>,
+    IDisplayDriver<TModel, TDisplayContext, TEditorContext, TUpdateContext>
+    where TConcrete : class, TModel
+    where TModel : class
+    where TDisplayContext : BuildDisplayContext
+    where TEditorContext : BuildEditorContext
+    where TUpdateContext : UpdateEditorContext
+{
+    /// <summary>
+    /// Returns <c>true</c> if the model can be handle by the current driver.
+    /// </summary>
+    /// <returns></returns>
+    public virtual bool CanHandleModel(TModel model)
     {
+        return true;
     }
 
-    public abstract class DisplayDriver<TModel, TConcrete, TDisplayContext, TEditorContext, TUpdateContext> :
-        DisplayDriver<TConcrete, TDisplayContext, TEditorContext, TUpdateContext>,
-        IDisplayDriver<TModel, TDisplayContext, TEditorContext, TUpdateContext>
-        where TConcrete : class, TModel
-        where TModel : class
-        where TDisplayContext : BuildDisplayContext
-        where TEditorContext : BuildEditorContext
-        where TUpdateContext : UpdateEditorContext
+    Task<IDisplayResult> IDisplayDriver<TModel, TDisplayContext, TEditorContext, TUpdateContext>.BuildDisplayAsync(TModel model, TDisplayContext context)
     {
-        /// <summary>
-        /// Returns <c>true</c> if the model can be handle by the current driver.
-        /// </summary>
-        /// <returns></returns>
-        public virtual bool CanHandleModel(TModel model)
-        {
-            return true;
-        }
+        var concrete = model as TConcrete;
 
-        Task<IDisplayResult> IDisplayDriver<TModel, TDisplayContext, TEditorContext, TUpdateContext>.BuildDisplayAsync(TModel model, TDisplayContext context)
+        if (concrete == null || !CanHandleModel(concrete))
         {
-            var concrete = model as TConcrete;
+            return Task.FromResult<IDisplayResult>(null);
+        }
 
-            if (concrete == null || !CanHandleModel(concrete))
-            {
-                return Task.FromResult<IDisplayResult>(null);
-            }
+        BuildPrefix(concrete, context.HtmlFieldPrefix);
 
-            BuildPrefix(concrete, context.HtmlFieldPrefix);
+        return DisplayAsync(concrete, context);
+    }
 
-            return DisplayAsync(concrete, context);
-        }
+    Task<IDisplayResult> IDisplayDriver<TModel, TDisplayContext, TEditorContext, TUpdateContext>.BuildEditorAsync(TModel model, TEditorContext context)
+    {
+        var concrete = model as TConcrete;
 
-        Task<IDisplayResult> IDisplayDriver<TModel, TDisplayContext, TEditorContext, TUpdateContext>.BuildEditorAsync(TModel model, TEditorContext context)
+        if (concrete == null || !CanHandleModel(concrete))
         {
-            var concrete = model as TConcrete;
+            return Task.FromResult<IDisplayResult>(null);
+        }
 
-            if (concrete == null || !CanHandleModel(concrete))
-            {
-                return Task.FromResult<IDisplayResult>(null);
-            }
+        BuildPrefix(concrete, context.HtmlFieldPrefix);
 
-            BuildPrefix(concrete, context.HtmlFieldPrefix);
+        return EditAsync(concrete, context);
+    }
 
-            return EditAsync(concrete, context);
-        }
+    Task<IDisplayResult> IDisplayDriver<TModel, TDisplayContext, TEditorContext, TUpdateContext>.UpdateEditorAsync(TModel model, TUpdateContext context)
+    {
+        var concrete = model as TConcrete;
 
-        Task<IDisplayResult> IDisplayDriver<TModel, TDisplayContext, TEditorContext, TUpdateContext>.UpdateEditorAsync(TModel model, TUpdateContext context)
+        if (concrete == null || !CanHandleModel(concrete))
         {
-            var concrete = model as TConcrete;
-
-            if (concrete == null || !CanHandleModel(concrete))
-            {
-                return Task.FromResult<IDisplayResult>(null);
-            }
+            return Task.FromResult<IDisplayResult>(null);
+        }
 
-            BuildPrefix(concrete, context.HtmlFieldPrefix);
+        BuildPrefix(concrete, context.HtmlFieldPrefix);
 
-            return UpdateAsync(concrete, context);
-        }
+        return UpdateAsync(concrete, context);
     }
+}
 
-    public abstract class DisplayDriver<TModel, TConcrete> :
-        DisplayDriver<TModel, TConcrete, BuildDisplayContext, BuildEditorContext, UpdateEditorContext>,
-        IDisplayDriver<TModel>
-        where TConcrete : class, TModel
-        where TModel : class
-    {
-    }
+public abstract class DisplayDriver<TModel, TConcrete> :
+    DisplayDriver<TModel, TConcrete, BuildDisplayContext, BuildEditorContext, UpdateEditorContext>,
+    IDisplayDriver<TModel>
+    where TConcrete : class, TModel
+    where TModel : class
+{
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/DisplayDriverBase.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/DisplayDriverBase.cs
index 316ca06cc9c..b5125c8981f 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/DisplayDriverBase.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/DisplayDriverBase.cs
@@ -3,157 +3,156 @@
 using System.Threading.Tasks;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.DisplayManagement.Handlers
+namespace OrchardCore.DisplayManagement.Handlers;
+
+public class DisplayDriverBase
 {
-    public class DisplayDriverBase
+    protected string Prefix { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Creates a new strongly typed shape and initializes it if it needs to be rendered.
+    /// </summary>
+    public ShapeResult Initialize<TModel>(Action<TModel> initialize) where TModel : class
+    {
+        return Initialize<TModel>(shape =>
+        {
+            initialize(shape);
+            return new ValueTask();
+        });
+    }
+
+    /// <summary>
+    /// Creates a new strongly typed shape and initializes it if it needs to be rendered.
+    /// </summary>
+    public ShapeResult Initialize<TModel>(Func<TModel, ValueTask> initializeAsync) where TModel : class
+    {
+        return Initialize<TModel>(
+            typeof(TModel).Name,
+            shape => initializeAsync(shape)
+            );
+    }
+
+    /// <summary>
+    /// Creates a new strongly typed shape and initializes it if it needs to be rendered.
+    /// </summary>
+    public ShapeResult Initialize<TModel>(string shapeType, Func<TModel, ValueTask> initializeAsync) where TModel : class
+    {
+        return Factory(
+            shapeType,
+            ctx => ctx.ShapeFactory.CreateAsync(shapeType, initializeAsync)
+            );
+    }
+
+    /// <summary>
+    /// Creates a dynamic proxy for the specified model. Properties are copied to the new object.
+    /// </summary>
+    public ShapeResult Copy<TModel>(string shapeType, TModel model) where TModel : class
     {
-        protected string Prefix { get; set; } = string.Empty;
+        return Factory(shapeType, ctx => ctx.ShapeFactory.CreateAsync(shapeType, model));
+    }
 
-        /// <summary>
-        /// Creates a new strongly typed shape and initializes it if it needs to be rendered.
-        /// </summary>
-        public ShapeResult Initialize<TModel>(Action<TModel> initialize) where TModel : class
+    /// <summary>
+    /// Creates a new strongly typed shape and initializes it if it needs to be rendered.
+    /// </summary>
+    public ShapeResult Initialize<TModel>(string shapeType, Action<TModel> initialize) where TModel : class
+    {
+        return Initialize<TModel>(shapeType, shape =>
         {
-            return Initialize<TModel>(shape =>
+            initialize(shape);
+            return new ValueTask();
+        });
+    }
+
+    /// <summary>
+    /// Creates a new loosely typed shape and initializes it if it needs to be rendered.
+    /// </summary>
+    public ShapeResult Dynamic(string shapeType, Func<dynamic, Task> initializeAsync)
+    {
+        return Factory(shapeType,
+            async ctx =>
             {
-                initialize(shape);
-                return new ValueTask();
+                var shape = await ctx.ShapeFactory.CreateAsync(shapeType);
+                await initializeAsync(shape);
+                return shape;
             });
-        }
-
-        /// <summary>
-        /// Creates a new strongly typed shape and initializes it if it needs to be rendered.
-        /// </summary>
-        public ShapeResult Initialize<TModel>(Func<TModel, ValueTask> initializeAsync) where TModel : class
-        {
-            return Initialize<TModel>(
-                typeof(TModel).Name,
-                shape => initializeAsync(shape)
-                );
-        }
-
-        /// <summary>
-        /// Creates a new strongly typed shape and initializes it if it needs to be rendered.
-        /// </summary>
-        public ShapeResult Initialize<TModel>(string shapeType, Func<TModel, ValueTask> initializeAsync) where TModel : class
-        {
-            return Factory(
-                shapeType,
-                ctx => ctx.ShapeFactory.CreateAsync(shapeType, initializeAsync)
-                );
-        }
-
-        /// <summary>
-        /// Creates a dynamic proxy for the specified model. Properties are copied to the new object.
-        /// </summary>
-        public ShapeResult Copy<TModel>(string shapeType, TModel model) where TModel : class
-        {
-            return Factory(shapeType, ctx => ctx.ShapeFactory.CreateAsync(shapeType, model));
-        }
+    }
 
-        /// <summary>
-        /// Creates a new strongly typed shape and initializes it if it needs to be rendered.
-        /// </summary>
-        public ShapeResult Initialize<TModel>(string shapeType, Action<TModel> initialize) where TModel : class
-        {
-            return Initialize<TModel>(shapeType, shape =>
+    /// <summary>
+    /// Creates a new loosely typed shape and initializes it if it needs to be rendered.
+    /// </summary>
+    public ShapeResult Dynamic(string shapeType, Action<dynamic> initialize)
+    {
+        return Factory(shapeType,
+            async ctx =>
             {
+                var shape = await ctx.ShapeFactory.CreateAsync(shapeType);
                 initialize(shape);
-                return new ValueTask();
+                return shape;
             });
-        }
+    }
 
-        /// <summary>
-        /// Creates a new loosely typed shape and initializes it if it needs to be rendered.
-        /// </summary>
-        public ShapeResult Dynamic(string shapeType, Func<dynamic, Task> initializeAsync)
-        {
-            return Factory(shapeType,
-                async ctx =>
-                {
-                    var shape = await ctx.ShapeFactory.CreateAsync(shapeType);
-                    await initializeAsync(shape);
-                    return shape;
-                });
-        }
-
-        /// <summary>
-        /// Creates a new loosely typed shape and initializes it if it needs to be rendered.
-        /// </summary>
-        public ShapeResult Dynamic(string shapeType, Action<dynamic> initialize)
-        {
-            return Factory(shapeType,
-                async ctx =>
-                {
-                    var shape = await ctx.ShapeFactory.CreateAsync(shapeType);
-                    initialize(shape);
-                    return shape;
-                });
-        }
-
-        /// <summary>
-        /// If the shape needs to be rendered, it is created automatically from its type name.
-        /// </summary>
-        public ShapeResult Dynamic(string shapeType)
-        {
-            return Factory(shapeType, ctx => ctx.ShapeFactory.CreateAsync(shapeType));
-        }
+    /// <summary>
+    /// If the shape needs to be rendered, it is created automatically from its type name.
+    /// </summary>
+    public ShapeResult Dynamic(string shapeType)
+    {
+        return Factory(shapeType, ctx => ctx.ShapeFactory.CreateAsync(shapeType));
+    }
 
-        /// <summary>
-        /// Creates a <see cref="ShapeViewModel{TModel}"/> for the specific model.
-        /// </summary>
-        public ShapeResult View<TModel>(string shapeType, TModel model) where TModel : class
-        {
-            return Factory(shapeType, ctx => new ValueTask<IShape>(new ShapeViewModel<TModel>(model)));
-        }
+    /// <summary>
+    /// Creates a <see cref="ShapeViewModel{TModel}"/> for the specific model.
+    /// </summary>
+    public ShapeResult View<TModel>(string shapeType, TModel model) where TModel : class
+    {
+        return Factory(shapeType, ctx => new ValueTask<IShape>(new ShapeViewModel<TModel>(model)));
+    }
 
-        /// <summary>
-        /// If the shape needs to be rendered, it is created automatically from its type name and initialized.
-        /// </summary>
-        public ShapeResult Shape(string shapeType, IShape shape)
-        {
-            return Factory(shapeType, ctx => new ValueTask<IShape>(shape));
-        }
+    /// <summary>
+    /// If the shape needs to be rendered, it is created automatically from its type name and initialized.
+    /// </summary>
+    public ShapeResult Shape(string shapeType, IShape shape)
+    {
+        return Factory(shapeType, ctx => new ValueTask<IShape>(shape));
+    }
 
-        /// <summary>
-        /// Creates a shape lazily.
-        /// </summary>
-        public ShapeResult Factory(string shapeType, Func<IBuildShapeContext, ValueTask<IShape>> shapeBuilder)
-        {
-            return Factory(shapeType, shapeBuilder, null);
-        }
+    /// <summary>
+    /// Creates a shape lazily.
+    /// </summary>
+    public ShapeResult Factory(string shapeType, Func<IBuildShapeContext, ValueTask<IShape>> shapeBuilder)
+    {
+        return Factory(shapeType, shapeBuilder, null);
+    }
 
-        /// <summary>
-        /// Creates a shape lazily.
-        /// </summary>
-        public ShapeResult Factory(string shapeType, Func<IBuildShapeContext, IShape> shapeBuilder)
-        {
-            return Factory(shapeType, ctx => new ValueTask<IShape>(shapeBuilder(ctx)), null);
-        }
-
-        /// <summary>
-        /// If the shape needs to be rendered, it is created by the delegate.
-        /// </summary>
-        /// <remarks>
-        /// This method is ultimately called by all drivers to create a shape. It's made virtual
-        /// so that any concrete driver can use it as a way to alter any returning shape from the drivers.
-        /// </remarks>
-        public virtual ShapeResult Factory(string shapeType, Func<IBuildShapeContext, ValueTask<IShape>> shapeBuilder, Func<IShape, Task> initializeAsync)
-        {
-            return new ShapeResult(shapeType, shapeBuilder, initializeAsync)
-                .Prefix(Prefix);
-        }
+    /// <summary>
+    /// Creates a shape lazily.
+    /// </summary>
+    public ShapeResult Factory(string shapeType, Func<IBuildShapeContext, IShape> shapeBuilder)
+    {
+        return Factory(shapeType, ctx => new ValueTask<IShape>(shapeBuilder(ctx)), null);
+    }
+
+    /// <summary>
+    /// If the shape needs to be rendered, it is created by the delegate.
+    /// </summary>
+    /// <remarks>
+    /// This method is ultimately called by all drivers to create a shape. It's made virtual
+    /// so that any concrete driver can use it as a way to alter any returning shape from the drivers.
+    /// </remarks>
+    public virtual ShapeResult Factory(string shapeType, Func<IBuildShapeContext, ValueTask<IShape>> shapeBuilder, Func<IShape, Task> initializeAsync)
+    {
+        return new ShapeResult(shapeType, shapeBuilder, initializeAsync)
+            .Prefix(Prefix);
+    }
 
-        public static CombinedResult Combine(params IDisplayResult[] results)
-            => new(results);
+    public static CombinedResult Combine(params IDisplayResult[] results)
+        => new(results);
 
-        public static Task<IDisplayResult> CombineAsync(params IDisplayResult[] results)
-            => Task.FromResult<IDisplayResult>(new CombinedResult(results));
+    public static Task<IDisplayResult> CombineAsync(params IDisplayResult[] results)
+        => Task.FromResult<IDisplayResult>(new CombinedResult(results));
 
-        public static CombinedResult Combine(IEnumerable<IDisplayResult> results)
-            => new(results);
+    public static CombinedResult Combine(IEnumerable<IDisplayResult> results)
+        => new(results);
 
-        public static Task<IDisplayResult> CombineAsync(IEnumerable<IDisplayResult> results)
-            => Task.FromResult<IDisplayResult>(new CombinedResult(results));
-    }
+    public static Task<IDisplayResult> CombineAsync(IEnumerable<IDisplayResult> results)
+        => Task.FromResult<IDisplayResult>(new CombinedResult(results));
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/FindPlacementDelegate.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/FindPlacementDelegate.cs
index 1da2d2706ea..ce4df35dedc 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/FindPlacementDelegate.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/FindPlacementDelegate.cs
@@ -1,18 +1,17 @@
 using OrchardCore.DisplayManagement.Descriptors;
 
-namespace OrchardCore.DisplayManagement.Handlers
-{
-    /// <summary>
-    /// A function that provides a <see cref="PlacementInfo"/> instance for a shape.
-    /// </summary>
-    /// <param name="shapeType">The shape type to render.</param>
-    /// <param name="differentiator">
-    /// A discriminator that differentiates this specific shape to the others of the same type.
-    /// For instance multiple field shape smight be displayed in different locations even though
-    /// they are of the same type.
-    /// </param>
-    /// <param name="displayType">The display type the content item owning the shape is rendered with.</param>
-    /// <param name="context">The <see cref="IBuildShapeContext"/> in which the shape is placed.</param>
-    /// <returns>The <see cref="PlacementInfo"/> to use or <see langword="null"/> if this function is not concerned.</returns>
-    public delegate PlacementInfo FindPlacementDelegate(string shapeType, string differentiator, string displayType, IBuildShapeContext context);
-}
+namespace OrchardCore.DisplayManagement.Handlers;
+
+/// <summary>
+/// A function that provides a <see cref="PlacementInfo"/> instance for a shape.
+/// </summary>
+/// <param name="shapeType">The shape type to render.</param>
+/// <param name="differentiator">
+/// A discriminator that differentiates this specific shape to the others of the same type.
+/// For instance multiple field shape smight be displayed in different locations even though
+/// they are of the same type.
+/// </param>
+/// <param name="displayType">The display type the content item owning the shape is rendered with.</param>
+/// <param name="context">The <see cref="IBuildShapeContext"/> in which the shape is placed.</param>
+/// <returns>The <see cref="PlacementInfo"/> to use or <see langword="null"/> if this function is not concerned.</returns>
+public delegate PlacementInfo FindPlacementDelegate(string shapeType, string differentiator, string displayType, IBuildShapeContext context);
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/IBuildShapeContext.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/IBuildShapeContext.cs
index 5ebcb553672..f3eb2e69ef4 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/IBuildShapeContext.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/IBuildShapeContext.cs
@@ -1,18 +1,17 @@
 using OrchardCore.DisplayManagement.Zones;
 
-namespace OrchardCore.DisplayManagement.Handlers
+namespace OrchardCore.DisplayManagement.Handlers;
+
+/// <summary>
+/// Represents a context object that is used to build and place a list of shape representing
+/// something that has to be displayed.
+/// </summary>
+public interface IBuildShapeContext
 {
-    /// <summary>
-    /// Represents a context object that is used to build and place a list of shape representing
-    /// something that has to be displayed.
-    /// </summary>
-    public interface IBuildShapeContext
-    {
-        IShape Shape { get; }
-        IShapeFactory ShapeFactory { get; }
-        dynamic New { get; }
-        IZoneHolding Layout { get; set; }
-        string GroupId { get; }
-        FindPlacementDelegate FindPlacement { get; set; }
-    }
+    IShape Shape { get; }
+    IShapeFactory ShapeFactory { get; }
+    dynamic New { get; }
+    IZoneHolding Layout { get; set; }
+    string GroupId { get; }
+    FindPlacementDelegate FindPlacement { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/IDisplayDriver.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/IDisplayDriver.cs
index 60975004280..c364da51bc2 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/IDisplayDriver.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/IDisplayDriver.cs
@@ -1,19 +1,18 @@
 using System.Threading.Tasks;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.DisplayManagement.Handlers
+namespace OrchardCore.DisplayManagement.Handlers;
+
+public interface IDisplayDriver<in TModel, TDisplayContext, TEditorContext, TUpdateContext>
+    where TDisplayContext : BuildDisplayContext
+    where TEditorContext : BuildEditorContext
+    where TUpdateContext : UpdateEditorContext
 {
-    public interface IDisplayDriver<in TModel, TDisplayContext, TEditorContext, TUpdateContext>
-        where TDisplayContext : BuildDisplayContext
-        where TEditorContext : BuildEditorContext
-        where TUpdateContext : UpdateEditorContext
-    {
-        Task<IDisplayResult> BuildDisplayAsync(TModel model, TDisplayContext context);
-        Task<IDisplayResult> BuildEditorAsync(TModel model, TEditorContext context);
-        Task<IDisplayResult> UpdateEditorAsync(TModel model, TUpdateContext context);
-    }
+    Task<IDisplayResult> BuildDisplayAsync(TModel model, TDisplayContext context);
+    Task<IDisplayResult> BuildEditorAsync(TModel model, TEditorContext context);
+    Task<IDisplayResult> UpdateEditorAsync(TModel model, TUpdateContext context);
+}
 
-    public interface IDisplayDriver<in TModel> : IDisplayDriver<TModel, BuildDisplayContext, BuildEditorContext, UpdateEditorContext>
-    {
-    }
+public interface IDisplayDriver<in TModel> : IDisplayDriver<TModel, BuildDisplayContext, BuildEditorContext, UpdateEditorContext>
+{
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/IDisplayHandler.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/IDisplayHandler.cs
index 1d01070696d..f7cc4aeb9b6 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/IDisplayHandler.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/IDisplayHandler.cs
@@ -1,11 +1,10 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.DisplayManagement.Handlers
+namespace OrchardCore.DisplayManagement.Handlers;
+
+public interface IDisplayHandler<TModel>
 {
-    public interface IDisplayHandler<TModel>
-    {
-        Task BuildDisplayAsync(TModel model, BuildDisplayContext context);
-        Task BuildEditorAsync(TModel model, BuildEditorContext context);
-        Task UpdateEditorAsync(TModel model, UpdateEditorContext context);
-    }
+    Task BuildDisplayAsync(TModel model, BuildDisplayContext context);
+    Task BuildEditorAsync(TModel model, BuildEditorContext context);
+    Task UpdateEditorAsync(TModel model, UpdateEditorContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/UpdateEditorContext.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/UpdateEditorContext.cs
index dbfb0b5ffae..1074f00f070 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/UpdateEditorContext.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/UpdateEditorContext.cs
@@ -1,16 +1,15 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Zones;
 
-namespace OrchardCore.DisplayManagement.Handlers
-{
-    public class UpdateEditorContext : BuildEditorContext
-    {
+namespace OrchardCore.DisplayManagement.Handlers;
 
-        public UpdateEditorContext(IShape model, string groupId, bool isNew, string htmlFieldPrefix, IShapeFactory shapeFactory,
-            IZoneHolding layout, IUpdateModel updater)
-            : base(model, groupId, isNew, htmlFieldPrefix, shapeFactory, layout, updater)
-        {
-        }
+public class UpdateEditorContext : BuildEditorContext
+{
 
+    public UpdateEditorContext(IShape model, string groupId, bool isNew, string htmlFieldPrefix, IShapeFactory shapeFactory,
+        IZoneHolding layout, IUpdateModel updater)
+        : base(model, groupId, isNew, htmlFieldPrefix, shapeFactory, layout, updater)
+    {
     }
+
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Html/HtmlContentString.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Html/HtmlContentString.cs
index e1ba91f3f91..81554c1e096 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Html/HtmlContentString.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Html/HtmlContentString.cs
@@ -5,31 +5,30 @@
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 
-namespace OrchardCore.DisplayManagement.Html
+namespace OrchardCore.DisplayManagement.Html;
+
+/// <summary>
+/// An optimization of <see cref="StringHtmlContent "/> that uses 'writer.Write(encoder.Encode(_value))', in place of using
+/// 'encoder.Encode(writer, _value)' that calls 'writer.Write' on each char if the string has even a single char to encode.
+/// </summary>
+[DebuggerDisplay("{DebuggerToString()}")]
+public class HtmlContentString : IHtmlContent
 {
+    private readonly string _value;
+
     /// <summary>
-    /// An optimization of <see cref="StringHtmlContent "/> that uses 'writer.Write(encoder.Encode(_value))', in place of using
-    /// 'encoder.Encode(writer, _value)' that calls 'writer.Write' on each char if the string has even a single char to encode.
+    /// Creates a new instance of <see cref="HtmlContentString"/>.
     /// </summary>
-    [DebuggerDisplay("{DebuggerToString()}")]
-    public class HtmlContentString : IHtmlContent
-    {
-        private readonly string _value;
+    /// <param name="value"><see cref="string"/> to be HTML encoded when <see cref="WriteTo"/> is called.</param>
+    public HtmlContentString(string value) => _value = value;
 
-        /// <summary>
-        /// Creates a new instance of <see cref="HtmlContentString"/>.
-        /// </summary>
-        /// <param name="value"><see cref="string"/> to be HTML encoded when <see cref="WriteTo"/> is called.</param>
-        public HtmlContentString(string value) => _value = value;
+    /// <inheritdoc />
+    public void WriteTo(TextWriter writer, HtmlEncoder encoder) => writer.Write(encoder.Encode(_value));
 
-        /// <inheritdoc />
-        public void WriteTo(TextWriter writer, HtmlEncoder encoder) => writer.Write(encoder.Encode(_value));
-
-        private string DebuggerToString()
-        {
-            using var writer = new ZStringWriter();
-            WriteTo(writer, HtmlEncoder.Default);
-            return writer.ToString();
-        }
+    private string DebuggerToString()
+    {
+        using var writer = new ZStringWriter();
+        WriteTo(writer, HtmlEncoder.Default);
+        return writer.ToString();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/IAsyncViewActionFilter.cs b/src/OrchardCore/OrchardCore.DisplayManagement/IAsyncViewActionFilter.cs
index 61340a8d5b4..eb0da05dbbc 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/IAsyncViewActionFilter.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/IAsyncViewActionFilter.cs
@@ -2,10 +2,9 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 
-namespace OrchardCore.DisplayManagement
+namespace OrchardCore.DisplayManagement;
+
+public interface IAsyncViewActionFilter : IAsyncActionFilter, IAsyncPageFilter
 {
-    public interface IAsyncViewActionFilter : IAsyncActionFilter, IAsyncPageFilter
-    {
-        Task OnActionExecutionAsync(ActionContext context);
-    }
+    Task OnActionExecutionAsync(ActionContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/IDisplayHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/IDisplayHelper.cs
index 4b689ca2df3..e034a92f0a0 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/IDisplayHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/IDisplayHelper.cs
@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Html;
 
-namespace OrchardCore.DisplayManagement
+namespace OrchardCore.DisplayManagement;
+
+public interface IDisplayHelper
 {
-    public interface IDisplayHelper
-    {
-        Task<IHtmlContent> ShapeExecuteAsync(IShape shape);
-    }
+    Task<IHtmlContent> ShapeExecuteAsync(IShape shape);
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/IDisplayManager.cs b/src/OrchardCore/OrchardCore.DisplayManagement/IDisplayManager.cs
index c78a415ac25..a6bdf9002d8 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/IDisplayManager.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/IDisplayManager.cs
@@ -1,14 +1,13 @@
 using System.Threading.Tasks;
 using OrchardCore.DisplayManagement.ModelBinding;
 
-namespace OrchardCore.DisplayManagement
+namespace OrchardCore.DisplayManagement;
+
+public interface IDisplayManager<TModel>
 {
-    public interface IDisplayManager<TModel>
-    {
-        Task<IShape> BuildDisplayAsync(TModel model, IUpdateModel updater, string displayType = "", string groupId = "");
+    Task<IShape> BuildDisplayAsync(TModel model, IUpdateModel updater, string displayType = "", string groupId = "");
 
-        Task<IShape> BuildEditorAsync(TModel model, IUpdateModel updater, bool isNew, string groupId = "", string htmlPrefix = "");
+    Task<IShape> BuildEditorAsync(TModel model, IUpdateModel updater, bool isNew, string groupId = "", string htmlPrefix = "");
 
-        Task<IShape> UpdateEditorAsync(TModel model, IUpdateModel updater, bool isNew, string groupId = "", string htmlPrefix = "");
-    }
+    Task<IShape> UpdateEditorAsync(TModel model, IUpdateModel updater, bool isNew, string groupId = "", string htmlPrefix = "");
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/INamedEnumerable.cs b/src/OrchardCore/OrchardCore.DisplayManagement/INamedEnumerable.cs
index 7b334ada7f1..1208b0f599b 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/INamedEnumerable.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/INamedEnumerable.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.DisplayManagement
+namespace OrchardCore.DisplayManagement;
+
+public interface INamedEnumerable<T> : IEnumerable<T>
 {
-    public interface INamedEnumerable<T> : IEnumerable<T>
-    {
-        IList<T> Positional { get; }
-        IDictionary<string, T> Named { get; }
-    }
+    IList<T> Positional { get; }
+    IDictionary<string, T> Named { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/IPositioned.cs b/src/OrchardCore/OrchardCore.DisplayManagement/IPositioned.cs
index dcbeae5c815..bdfd3c292ef 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/IPositioned.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/IPositioned.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.DisplayManagement
+namespace OrchardCore.DisplayManagement;
+
+public interface IPositioned
 {
-    public interface IPositioned
-    {
-        string Position { get; set; }
-    }
+    string Position { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/IShape.cs b/src/OrchardCore/OrchardCore.DisplayManagement/IShape.cs
index 0e30e432c1b..6ec1271e3ff 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/IShape.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/IShape.cs
@@ -5,119 +5,118 @@
 using OrchardCore.DisplayManagement.Shapes;
 using OrchardCore.DisplayManagement.Zones;
 
-namespace OrchardCore.DisplayManagement
+namespace OrchardCore.DisplayManagement;
+
+/// <summary>
+/// Interface present on dynamic shapes.
+/// May be used to access attributes in a strongly typed fashion.
+/// Note: Anything on this interface is a reserved word for the purpose of shape properties.
+/// </summary>
+public interface IShape
 {
-    /// <summary>
-    /// Interface present on dynamic shapes.
-    /// May be used to access attributes in a strongly typed fashion.
-    /// Note: Anything on this interface is a reserved word for the purpose of shape properties.
-    /// </summary>
-    public interface IShape
-    {
-        ShapeMetadata Metadata { get; }
-        string Id { get; set; }
-        string TagName { get; set; }
-        IList<string> Classes { get; }
-        IDictionary<string, string> Attributes { get; }
-        IDictionary<string, object> Properties { get; }
-        IReadOnlyList<IPositioned> Items { get; }
-        ValueTask<IShape> AddAsync(object item, string position);
-    }
+    ShapeMetadata Metadata { get; }
+    string Id { get; set; }
+    string TagName { get; set; }
+    IList<string> Classes { get; }
+    IDictionary<string, string> Attributes { get; }
+    IDictionary<string, object> Properties { get; }
+    IReadOnlyList<IPositioned> Items { get; }
+    ValueTask<IShape> AddAsync(object item, string position);
+}
 
-    public static class IShapeExtensions
-    {
-        public static bool IsNullOrEmpty(this IShape shape) => shape == null || shape is ZoneOnDemand;
+public static class IShapeExtensions
+{
+    public static bool IsNullOrEmpty(this IShape shape) => shape == null || shape is ZoneOnDemand;
 
-        public static bool TryGetProperty<T>(this IShape shape, string key, out T value)
+    public static bool TryGetProperty<T>(this IShape shape, string key, out T value)
+    {
+        if (shape.Properties != null && shape.Properties.TryGetValue(key, out var result))
         {
-            if (shape.Properties != null && shape.Properties.TryGetValue(key, out var result))
+            if (result is T t)
             {
-                if (result is T t)
-                {
-                    value = t;
-                    return true;
-                }
+                value = t;
+                return true;
             }
-
-            value = default;
-            return false;
         }
 
-        public static object GetProperty(this IShape shape, string key)
-        {
-            return GetProperty(shape, key, (object)null);
-        }
-
-        public static T GetProperty<T>(this IShape shape, string key)
-        {
-            return GetProperty(shape, key, default(T));
-        }
+        value = default;
+        return false;
+    }
 
-        public static T GetProperty<T>(this IShape shape, string key, T value)
-        {
-            if (shape.Properties != null && shape.Properties.TryGetValue(key, out var result))
-            {
-                if (result is T t)
-                {
-                    return t;
-                }
-            }
+    public static object GetProperty(this IShape shape, string key)
+    {
+        return GetProperty(shape, key, (object)null);
+    }
 
-            return value;
-        }
+    public static T GetProperty<T>(this IShape shape, string key)
+    {
+        return GetProperty(shape, key, default(T));
+    }
 
-        public static async ValueTask<IShape> AddRangeAsync(this IShape shape, IEnumerable<object> items, string position = null)
+    public static T GetProperty<T>(this IShape shape, string key, T value)
+    {
+        if (shape.Properties != null && shape.Properties.TryGetValue(key, out var result))
         {
-            foreach (var item in items)
+            if (result is T t)
             {
-                await shape.AddAsync(item, position);
+                return t;
             }
-
-            return shape;
         }
 
-        public static ValueTask<IShape> AddAsync(this IShape shape, object item)
+        return value;
+    }
+
+    public static async ValueTask<IShape> AddRangeAsync(this IShape shape, IEnumerable<object> items, string position = null)
+    {
+        foreach (var item in items)
         {
-            return shape.AddAsync(item, "");
+            await shape.AddAsync(item, position);
         }
 
-        public static TagBuilder GetTagBuilder(this IShape shape, string defaultTagName = "span")
-        {
-            var tagName = defaultTagName;
+        return shape;
+    }
 
-            // We keep this for backward compatibility.
-            if (shape.TryGetProperty("Tag", out string valueString))
-            {
-                tagName = valueString;
-            }
+    public static ValueTask<IShape> AddAsync(this IShape shape, object item)
+    {
+        return shape.AddAsync(item, "");
+    }
 
-            if (!string.IsNullOrEmpty(shape.TagName))
-            {
-                tagName = shape.TagName;
-            }
+    public static TagBuilder GetTagBuilder(this IShape shape, string defaultTagName = "span")
+    {
+        var tagName = defaultTagName;
 
-            var tagBuilder = new TagBuilder(tagName);
+        // We keep this for backward compatibility.
+        if (shape.TryGetProperty("Tag", out string valueString))
+        {
+            tagName = valueString;
+        }
 
-            if (shape.Attributes?.Count > 0)
-            {
-                tagBuilder.MergeAttributes(shape.Attributes, false);
-            }
+        if (!string.IsNullOrEmpty(shape.TagName))
+        {
+            tagName = shape.TagName;
+        }
 
-            if (shape.Classes?.Count > 0)
-            {
-                // Faster than AddCssClass which will do twice as many concatenations as classes.
-                tagBuilder.Attributes["class"] = string.Join(' ', shape.Classes);
-            }
+        var tagBuilder = new TagBuilder(tagName);
 
-            if (!string.IsNullOrWhiteSpace(shape.Id))
-            {
-                tagBuilder.Attributes["id"] = shape.Id;
-            }
+        if (shape.Attributes?.Count > 0)
+        {
+            tagBuilder.MergeAttributes(shape.Attributes, false);
+        }
 
-            return tagBuilder;
+        if (shape.Classes?.Count > 0)
+        {
+            // Faster than AddCssClass which will do twice as many concatenations as classes.
+            tagBuilder.Attributes["class"] = string.Join(' ', shape.Classes);
         }
 
-        public static JsonObject ShapeToJson(this IShape shape) => new ShapeSerializer(shape).Serialize();
+        if (!string.IsNullOrWhiteSpace(shape.Id))
+        {
+            tagBuilder.Attributes["id"] = shape.Id;
+        }
 
+        return tagBuilder;
     }
+
+    public static JsonObject ShapeToJson(this IShape shape) => new ShapeSerializer(shape).Serialize();
+
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/IShapeBindingResolver.cs b/src/OrchardCore/OrchardCore.DisplayManagement/IShapeBindingResolver.cs
index d25759fe265..54655cc0d55 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/IShapeBindingResolver.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/IShapeBindingResolver.cs
@@ -1,15 +1,14 @@
 using System.Threading.Tasks;
 using OrchardCore.DisplayManagement.Descriptors;
 
-namespace OrchardCore.DisplayManagement
+namespace OrchardCore.DisplayManagement;
+
+/// <summary>
+/// An implementation of this interface is called whenever a shape template
+/// is seeked. it can be used to provide custom dynamic templates, for instance to override
+/// any view engine based ones.
+/// </summary>
+public interface IShapeBindingResolver
 {
-    /// <summary>
-    /// An implementation of this interface is called whenever a shape template
-    /// is seeked. it can be used to provide custom dynamic templates, for instance to override
-    /// any view engine based ones.
-    /// </summary>
-    public interface IShapeBindingResolver
-    {
-        Task<ShapeBinding> GetShapeBindingAsync(string shapeType);
-    }
+    Task<ShapeBinding> GetShapeBindingAsync(string shapeType);
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/IShapeFactory.cs b/src/OrchardCore/OrchardCore.DisplayManagement/IShapeFactory.cs
index 07713386e5e..5cd728305eb 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/IShapeFactory.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/IShapeFactory.cs
@@ -8,158 +8,157 @@
 using OrchardCore.DisplayManagement.Shapes;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.DisplayManagement
+namespace OrchardCore.DisplayManagement;
+
+/// <summary>
+/// Service that creates new instances of dynamic shape objects
+/// This may be used directly, or through the IShapeHelperFactory.
+/// </summary>
+public interface IShapeFactory
 {
+    ValueTask<IShape> CreateAsync(
+        string shapeType,
+        Func<ValueTask<IShape>> shapeFactory,
+        Action<ShapeCreatingContext> creating,
+        Action<ShapeCreatedContext> created);
+
+    dynamic New { get; }
+}
+
+public static class ShapeFactoryExtensions
+{
+    private static readonly ConcurrentDictionary<Type, Type> _proxyTypesCache = [];
+    private static readonly ProxyGenerator _proxyGenerator = new();
+    private static readonly Func<ValueTask<IShape>> _newShape = () => new(new Shape());
+
     /// <summary>
-    /// Service that creates new instances of dynamic shape objects
-    /// This may be used directly, or through the IShapeHelperFactory.
+    /// Creates a new shape by copying the properties of the specific model.
     /// </summary>
-    public interface IShapeFactory
+    /// <param name="factory">The <see cref="IShapeFactory"/>.</param>
+    /// <param name="shapeType">The type of shape to create.</param>
+    /// <param name="model">The model to copy.</param>
+    /// <returns></returns>
+    public static ValueTask<IShape> CreateAsync<TModel>(this IShapeFactory factory, string shapeType, TModel model)
     {
-        ValueTask<IShape> CreateAsync(
-            string shapeType,
-            Func<ValueTask<IShape>> shapeFactory,
-            Action<ShapeCreatingContext> creating,
-            Action<ShapeCreatedContext> created);
-
-        dynamic New { get; }
+        return factory.CreateAsync(shapeType, Arguments.From(model));
     }
 
-    public static class ShapeFactoryExtensions
+    private static IShape CreateShape(Type baseType)
     {
-        private static readonly ConcurrentDictionary<Type, Type> _proxyTypesCache = [];
-        private static readonly ProxyGenerator _proxyGenerator = new();
-        private static readonly Func<ValueTask<IShape>> _newShape = () => new(new Shape());
-
-        /// <summary>
-        /// Creates a new shape by copying the properties of the specific model.
-        /// </summary>
-        /// <param name="factory">The <see cref="IShapeFactory"/>.</param>
-        /// <param name="shapeType">The type of shape to create.</param>
-        /// <param name="model">The model to copy.</param>
-        /// <returns></returns>
-        public static ValueTask<IShape> CreateAsync<TModel>(this IShapeFactory factory, string shapeType, TModel model)
+        var shapeType = baseType;
+
+        // Don't generate a proxy for shape types
+        if (typeof(IShape).IsAssignableFrom(shapeType))
         {
-            return factory.CreateAsync(shapeType, Arguments.From(model));
+            return (IShape)Activator.CreateInstance(baseType);
         }
 
-        private static IShape CreateShape(Type baseType)
+        if (_proxyTypesCache.TryGetValue(baseType, out var proxyType))
         {
-            var shapeType = baseType;
+            var model = new ShapeViewModel();
+            return (IShape)Activator.CreateInstance(proxyType, model, model, Array.Empty<IInterceptor>());
+        }
 
-            // Don't generate a proxy for shape types
-            if (typeof(IShape).IsAssignableFrom(shapeType))
-            {
-                return (IShape)Activator.CreateInstance(baseType);
-            }
+        var options = new ProxyGenerationOptions();
+        options.AddMixinInstance(new ShapeViewModel());
+        var shape = (IShape)_proxyGenerator.CreateClassProxy(baseType, options);
 
-            if (_proxyTypesCache.TryGetValue(baseType, out var proxyType))
-            {
-                var model = new ShapeViewModel();
-                return (IShape)Activator.CreateInstance(proxyType, model, model, Array.Empty<IInterceptor>());
-            }
+        _proxyTypesCache.TryAdd(baseType, shape.GetType());
 
-            var options = new ProxyGenerationOptions();
-            options.AddMixinInstance(new ShapeViewModel());
-            var shape = (IShape)_proxyGenerator.CreateClassProxy(baseType, options);
-
-            _proxyTypesCache.TryAdd(baseType, shape.GetType());
+        return shape;
+    }
 
-            return shape;
-        }
+    public static ValueTask<IShape> CreateAsync(this IShapeFactory factory, string shapeType)
+    {
+        return factory.CreateAsync(shapeType, _newShape);
+    }
 
-        public static ValueTask<IShape> CreateAsync(this IShapeFactory factory, string shapeType)
-        {
-            return factory.CreateAsync(shapeType, _newShape);
-        }
+    public static ValueTask<IShape> CreateAsync(this IShapeFactory factory, string shapeType, Func<ValueTask<IShape>> shapeFactory)
+    {
+        return factory.CreateAsync(shapeType, shapeFactory, null, null);
+    }
 
-        public static ValueTask<IShape> CreateAsync(this IShapeFactory factory, string shapeType, Func<ValueTask<IShape>> shapeFactory)
+    /// <summary>
+    /// Creates a dynamic proxy instance for the type and initializes it.
+    /// </summary>
+    /// <typeparam name="TModel">The type to instantiate.</typeparam>
+    /// <param name="factory">The <see cref="IShapeFactory"/>.</param>
+    /// <param name="shapeType">The shape type to create.</param>
+    /// <param name="initializeAsync">The initialization method.</param>
+    /// <returns></returns>
+    public static ValueTask<IShape> CreateAsync<TModel>(this IShapeFactory factory, string shapeType, Func<TModel, ValueTask> initializeAsync)
+    {
+        static async ValueTask<IShape> Awaited(ValueTask task, IShape shape)
         {
-            return factory.CreateAsync(shapeType, shapeFactory, null, null);
+            await task;
+            return shape;
         }
 
-        /// <summary>
-        /// Creates a dynamic proxy instance for the type and initializes it.
-        /// </summary>
-        /// <typeparam name="TModel">The type to instantiate.</typeparam>
-        /// <param name="factory">The <see cref="IShapeFactory"/>.</param>
-        /// <param name="shapeType">The shape type to create.</param>
-        /// <param name="initializeAsync">The initialization method.</param>
-        /// <returns></returns>
-        public static ValueTask<IShape> CreateAsync<TModel>(this IShapeFactory factory, string shapeType, Func<TModel, ValueTask> initializeAsync)
+        static ValueTask<IShape> ShapeFactory(Func<TModel, ValueTask> init)
         {
-            static async ValueTask<IShape> Awaited(ValueTask task, IShape shape)
+            var shape = CreateShape(typeof(TModel));
+            var task = init((TModel)shape);
+            if (!task.IsCompletedSuccessfully)
             {
-                await task;
-                return shape;
+                return Awaited(task, shape);
             }
 
-            static ValueTask<IShape> ShapeFactory(Func<TModel, ValueTask> init)
-            {
-                var shape = CreateShape(typeof(TModel));
-                var task = init((TModel)shape);
-                if (!task.IsCompletedSuccessfully)
-                {
-                    return Awaited(task, shape);
-                }
+            return new ValueTask<IShape>(shape);
+        }
 
-                return new ValueTask<IShape>(shape);
-            }
+        return factory.CreateAsync(shapeType, () => ShapeFactory(initializeAsync));
+    }
 
-            return factory.CreateAsync(shapeType, () => ShapeFactory(initializeAsync));
-        }
+    /// <summary>
+    /// Creates a dynamic proxy instance for the type and initializes it.
+    /// </summary>
+    /// <typeparam name="TModel">The type to instantiate.</typeparam>
+    /// <param name="factory">The <see cref="IShapeFactory"/>.</param>
+    /// <param name="shapeType">The shape type to create.</param>
+    /// <param name="initialize">The initialization method.</param>
+    /// <returns></returns>
+    public static ValueTask<IShape> CreateAsync<TModel>(this IShapeFactory factory, string shapeType, Action<TModel> initialize)
+    {
+        return factory.CreateAsync(shapeType, () =>
+        {
+            var shape = CreateShape(typeof(TModel));
+            initialize((TModel)shape);
+            return new ValueTask<IShape>(shape);
+        });
+    }
 
-        /// <summary>
-        /// Creates a dynamic proxy instance for the type and initializes it.
-        /// </summary>
-        /// <typeparam name="TModel">The type to instantiate.</typeparam>
-        /// <param name="factory">The <see cref="IShapeFactory"/>.</param>
-        /// <param name="shapeType">The shape type to create.</param>
-        /// <param name="initialize">The initialization method.</param>
-        /// <returns></returns>
-        public static ValueTask<IShape> CreateAsync<TModel>(this IShapeFactory factory, string shapeType, Action<TModel> initialize)
+    public static ValueTask<IShape> CreateAsync<T>(this IShapeFactory factory, string shapeType, INamedEnumerable<T> parameters)
+    {
+        if (parameters == null || parameters == Arguments.Empty)
         {
-            return factory.CreateAsync(shapeType, () =>
-            {
-                var shape = CreateShape(typeof(TModel));
-                initialize((TModel)shape);
-                return new ValueTask<IShape>(shape);
-            });
+            return factory.CreateAsync(shapeType);
         }
 
-        public static ValueTask<IShape> CreateAsync<T>(this IShapeFactory factory, string shapeType, INamedEnumerable<T> parameters)
+        return factory.CreateAsync(shapeType, _newShape, null, createdContext =>
         {
-            if (parameters == null || parameters == Arguments.Empty)
-            {
-                return factory.CreateAsync(shapeType);
-            }
+            var shape = (Shape)createdContext.Shape;
 
-            return factory.CreateAsync(shapeType, _newShape, null, createdContext =>
-            {
-                var shape = (Shape)createdContext.Shape;
+            // If only one non-Type, use it as the source object to copy
 
-                // If only one non-Type, use it as the source object to copy
+            var initializer = parameters.Positional.SingleOrDefault();
 
-                var initializer = parameters.Positional.SingleOrDefault();
+            if (initializer != null)
+            {
+                // Use the Arguments class to optimize reflection code
+                var arguments = Arguments.From(initializer);
 
-                if (initializer != null)
+                foreach (var prop in arguments.Named)
                 {
-                    // Use the Arguments class to optimize reflection code
-                    var arguments = Arguments.From(initializer);
-
-                    foreach (var prop in arguments.Named)
-                    {
-                        shape.Properties[prop.Key] = prop.Value;
-                    }
+                    shape.Properties[prop.Key] = prop.Value;
                 }
-                else
+            }
+            else
+            {
+                foreach (var kv in parameters.Named)
                 {
-                    foreach (var kv in parameters.Named)
-                    {
-                        shape.Properties[kv.Key] = kv.Value;
-                    }
+                    shape.Properties[kv.Key] = kv.Value;
                 }
-            });
-        }
+            }
+        });
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/DefaultHtmlDisplay.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/DefaultHtmlDisplay.cs
index 69bb24bdde3..01860bf4864 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/DefaultHtmlDisplay.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/DefaultHtmlDisplay.cs
@@ -11,151 +11,166 @@
 using OrchardCore.DisplayManagement.Theming;
 using OrchardCore.Modules;
 
-namespace OrchardCore.DisplayManagement.Implementation
+namespace OrchardCore.DisplayManagement.Implementation;
+
+public class DefaultHtmlDisplay : IHtmlDisplay
 {
-    public class DefaultHtmlDisplay : IHtmlDisplay
+    private const string _separator = "__";
+    private static readonly ConcurrentDictionary<string, string[]> _alternateShapeTypes = [];
+
+    private readonly IShapeTableManager _shapeTableManager;
+    private readonly IEnumerable<IShapeDisplayEvents> _shapeDisplayEvents;
+    private readonly IEnumerable<IShapeBindingResolver> _shapeBindingResolvers;
+    private readonly IThemeManager _themeManager;
+    private readonly IServiceProvider _serviceProvider;
+    private readonly ILogger _logger;
+
+    public DefaultHtmlDisplay(
+        IEnumerable<IShapeDisplayEvents> shapeDisplayEvents,
+        IEnumerable<IShapeBindingResolver> shapeBindingResolvers,
+        IShapeTableManager shapeTableManager,
+        IServiceProvider serviceProvider,
+        ILogger<DefaultHtmlDisplay> logger,
+        IThemeManager themeManager)
+    {
+        _shapeTableManager = shapeTableManager;
+        _shapeDisplayEvents = shapeDisplayEvents;
+        _shapeBindingResolvers = shapeBindingResolvers;
+        _themeManager = themeManager;
+        _serviceProvider = serviceProvider;
+        _logger = logger;
+    }
+
+    public async Task<IHtmlContent> ExecuteAsync(DisplayContext context)
     {
-        private const string _separator = "__";
-        private static readonly ConcurrentDictionary<string, string[]> _alternateShapeTypes = [];
-
-        private readonly IShapeTableManager _shapeTableManager;
-        private readonly IEnumerable<IShapeDisplayEvents> _shapeDisplayEvents;
-        private readonly IEnumerable<IShapeBindingResolver> _shapeBindingResolvers;
-        private readonly IThemeManager _themeManager;
-        private readonly IServiceProvider _serviceProvider;
-        private readonly ILogger _logger;
-
-        public DefaultHtmlDisplay(
-            IEnumerable<IShapeDisplayEvents> shapeDisplayEvents,
-            IEnumerable<IShapeBindingResolver> shapeBindingResolvers,
-            IShapeTableManager shapeTableManager,
-            IServiceProvider serviceProvider,
-            ILogger<DefaultHtmlDisplay> logger,
-            IThemeManager themeManager)
+        var shape = context.Value;
+
+        // Check if the shape is null or empty.
+        if (shape.IsNullOrEmpty())
         {
-            _shapeTableManager = shapeTableManager;
-            _shapeDisplayEvents = shapeDisplayEvents;
-            _shapeBindingResolvers = shapeBindingResolvers;
-            _themeManager = themeManager;
-            _serviceProvider = serviceProvider;
-            _logger = logger;
+            return HtmlString.Empty;
         }
 
-        public async Task<IHtmlContent> ExecuteAsync(DisplayContext context)
+        // Check if the shape is Position Wrapper
+        if (shape is PositionWrapper wrapper)
         {
-            var shape = context.Value;
+            return PositionWrapper.UnWrap(wrapper);
+        }
 
-            // Check if the shape is null or empty.
-            if (shape.IsNullOrEmpty())
-            {
-                return HtmlString.Empty;
-            }
+        // Check if the shape is pre-rendered.
+        if (shape is IHtmlContent htmlContent)
+        {
+            return htmlContent;
+        }
 
-            // Check if the shape is Position Wrapper
-            if (shape is PositionWrapper wrapper)
-            {
-                return PositionWrapper.UnWrap(wrapper);
-            }
+        var shapeMetadata = shape.Metadata;
 
-            // Check if the shape is pre-rendered.
-            if (shape is IHtmlContent htmlContent)
-            {
-                return htmlContent;
-            }
+        // Can't really cope with a shape that has no type information.
+        if (string.IsNullOrEmpty(shapeMetadata?.Type))
+        {
+            return new HtmlContentString(context.Value.ToString());
+        }
 
-            var shapeMetadata = shape.Metadata;
+        // Copy the current context such that the rendering can customize it if necessary,
+        // for instance to change the HtmlFieldPrefix.
+        var localContext = new DisplayContext(context)
+        {
+            HtmlFieldPrefix = shapeMetadata.Prefix ?? string.Empty,
+        };
 
-            // Can't really cope with a shape that has no type information.
-            if (string.IsNullOrEmpty(shapeMetadata?.Type))
-            {
-                return new HtmlContentString(context.Value.ToString());
-            }
+        var displayContext = new ShapeDisplayContext
+        {
+            Shape = shape,
+            DisplayContext = localContext,
+            ServiceProvider = _serviceProvider
+        };
 
-            // Copy the current context such that the rendering can customize it if necessary,
-            // for instance to change the HtmlFieldPrefix.
-            var localContext = new DisplayContext(context)
-            {
-                HtmlFieldPrefix = shapeMetadata.Prefix ?? string.Empty,
-            };
+        try
+        {
+            var theme = await _themeManager.GetThemeAsync();
+            var shapeTable = await _shapeTableManager.GetShapeTableAsync(theme?.Id);
 
-            var displayContext = new ShapeDisplayContext
-            {
-                Shape = shape,
-                DisplayContext = localContext,
-                ServiceProvider = _serviceProvider
-            };
+            // Evaluate global Shape Display Events.
+            await _shapeDisplayEvents.InvokeAsync((e, displayContext) => e.DisplayingAsync(displayContext), displayContext, _logger);
 
-            try
+            // Find base shape association using only the fundamental shape type.
+            // Alternates that may already be registered do not affect the "displaying" event calls.
+            var shapeDescriptor = GetShapeDescriptor(shapeMetadata.Type, shapeTable);
+            if (shapeDescriptor != null)
             {
-                var theme = await _themeManager.GetThemeAsync();
-                var shapeTable = await _shapeTableManager.GetShapeTableAsync(theme?.Id);
+                await shapeDescriptor.DisplayingAsync.InvokeAsync((action, displayContext) => action(displayContext), displayContext, _logger);
 
-                // Evaluate global Shape Display Events.
-                await _shapeDisplayEvents.InvokeAsync((e, displayContext) => e.DisplayingAsync(displayContext), displayContext, _logger);
+                // Copy all binding sources (all templates for this shape) in order to use them as Localization scopes.
+                shapeMetadata.BindingSources = shapeDescriptor.BindingSources;
 
-                // Find base shape association using only the fundamental shape type.
-                // Alternates that may already be registered do not affect the "displaying" event calls.
-                var shapeDescriptor = GetShapeDescriptor(shapeMetadata.Type, shapeTable);
-                if (shapeDescriptor != null)
+                if (shapeMetadata.BindingSources.Count == 0)
                 {
-                    await shapeDescriptor.DisplayingAsync.InvokeAsync((action, displayContext) => action(displayContext), displayContext, _logger);
-
-                    // Copy all binding sources (all templates for this shape) in order to use them as Localization scopes.
-                    shapeMetadata.BindingSources = shapeDescriptor.BindingSources;
-
-                    if (shapeMetadata.BindingSources.Count == 0)
-                    {
-                        shapeMetadata.BindingSources = [shapeDescriptor.BindingSource];
-                    }
+                    shapeMetadata.BindingSources = [shapeDescriptor.BindingSource];
                 }
+            }
+
+            // Invoking ShapeMetadata displaying events.
+            shapeMetadata.Displaying.Invoke((action, displayContext) => action(displayContext), displayContext, _logger);
 
-                // Invoking ShapeMetadata displaying events.
-                shapeMetadata.Displaying.Invoke((action, displayContext) => action(displayContext), displayContext, _logger);
+            // Use pre-fetched content if available (e.g. coming from specific cache implementation).
+            if (displayContext.ChildContent != null)
+            {
+                shape.Metadata.ChildContent = displayContext.ChildContent;
+            }
 
-                // Use pre-fetched content if available (e.g. coming from specific cache implementation).
-                if (displayContext.ChildContent != null)
+            if (shape.Metadata.ChildContent == null)
+            {
+                // There might be no shape binding for the main shape, and only for its alternates.
+                if (shapeDescriptor != null)
                 {
-                    shape.Metadata.ChildContent = displayContext.ChildContent;
+                    await shapeDescriptor.ProcessingAsync.InvokeAsync((action, displayContext) => action(displayContext), displayContext, _logger);
                 }
 
-                if (shape.Metadata.ChildContent == null)
+                // Now find the actual binding to render, taking alternates into account.
+                var actualBinding = await GetShapeBindingAsync(shapeMetadata.Type, shapeMetadata.Alternates, shapeTable)
+                    ?? throw new Exception($"The shape type '{shapeMetadata.Type}' is not found");
+
+                await shapeMetadata.ProcessingAsync.InvokeAsync((action, displayContext) => action(displayContext.Shape), displayContext, _logger);
+
+                shape.Metadata.ChildContent = await ProcessAsync(actualBinding, shape, localContext);
+            }
+
+            // Process wrappers.
+            if (shape.Metadata.Wrappers.Count > 0)
+            {
+                foreach (var frameType in shape.Metadata.Wrappers)
                 {
-                    // There might be no shape binding for the main shape, and only for its alternates.
-                    if (shapeDescriptor != null)
+                    var frameBinding = await GetShapeBindingAsync(frameType, AlternatesCollection.Empty, shapeTable);
+                    if (frameBinding != null)
                     {
-                        await shapeDescriptor.ProcessingAsync.InvokeAsync((action, displayContext) => action(displayContext), displayContext, _logger);
+                        shape.Metadata.ChildContent = await ProcessAsync(frameBinding, shape, localContext);
                     }
+                }
 
-                    // Now find the actual binding to render, taking alternates into account.
-                    var actualBinding = await GetShapeBindingAsync(shapeMetadata.Type, shapeMetadata.Alternates, shapeTable)
-                        ?? throw new Exception($"The shape type '{shapeMetadata.Type}' is not found");
+                // Clear wrappers to prevent the child content from rendering them again.
+                shape.Metadata.Wrappers.Clear();
+            }
 
-                    await shapeMetadata.ProcessingAsync.InvokeAsync((action, displayContext) => action(displayContext.Shape), displayContext, _logger);
+            await _shapeDisplayEvents.InvokeAsync(async (e, displayContext) =>
+            {
+                var prior = displayContext.ChildContent = displayContext.Shape.Metadata.ChildContent;
 
-                    shape.Metadata.ChildContent = await ProcessAsync(actualBinding, shape, localContext);
-                }
+                await e.DisplayedAsync(displayContext);
 
-                // Process wrappers.
-                if (shape.Metadata.Wrappers.Count > 0)
+                // Update the child content if the context variable has been reassigned.
+                if (prior != displayContext.ChildContent)
                 {
-                    foreach (var frameType in shape.Metadata.Wrappers)
-                    {
-                        var frameBinding = await GetShapeBindingAsync(frameType, AlternatesCollection.Empty, shapeTable);
-                        if (frameBinding != null)
-                        {
-                            shape.Metadata.ChildContent = await ProcessAsync(frameBinding, shape, localContext);
-                        }
-                    }
-
-                    // Clear wrappers to prevent the child content from rendering them again.
-                    shape.Metadata.Wrappers.Clear();
+                    displayContext.Shape.Metadata.ChildContent = displayContext.ChildContent;
                 }
+            }, displayContext, _logger);
 
-                await _shapeDisplayEvents.InvokeAsync(async (e, displayContext) =>
+            if (shapeDescriptor != null)
+            {
+                await shapeDescriptor.DisplayedAsync.InvokeAsync(async (action, displayContext) =>
                 {
                     var prior = displayContext.ChildContent = displayContext.Shape.Metadata.ChildContent;
 
-                    await e.DisplayedAsync(displayContext);
+                    await action(displayContext);
 
                     // Update the child content if the context variable has been reassigned.
                     if (prior != displayContext.ChildContent)
@@ -163,157 +178,141 @@ await _shapeDisplayEvents.InvokeAsync(async (e, displayContext) =>
                         displayContext.Shape.Metadata.ChildContent = displayContext.ChildContent;
                     }
                 }, displayContext, _logger);
+            }
 
-                if (shapeDescriptor != null)
-                {
-                    await shapeDescriptor.DisplayedAsync.InvokeAsync(async (action, displayContext) =>
-                    {
-                        var prior = displayContext.ChildContent = displayContext.Shape.Metadata.ChildContent;
+            // Invoking ShapeMetadata displayed events.
+            shapeMetadata.Displayed.Invoke((action, displayContext) => action(displayContext), displayContext, _logger);
+        }
+        finally
+        {
+            await _shapeDisplayEvents.InvokeAsync((e, displayContext) => e.DisplayingFinalizedAsync(displayContext), displayContext, _logger);
+        }
 
-                        await action(displayContext);
+        return shape.Metadata.ChildContent;
+    }
 
-                        // Update the child content if the context variable has been reassigned.
-                        if (prior != displayContext.ChildContent)
-                        {
-                            displayContext.Shape.Metadata.ChildContent = displayContext.ChildContent;
-                        }
-                    }, displayContext, _logger);
-                }
+    private static ShapeDescriptor GetShapeDescriptor(string shapeType, ShapeTable shapeTable)
+    {
+        // Note: The shape type of a descriptor is a fundamental shape type that never contains
+        // any '__' separator. If a shape type contains some '__' separators, its fundamental
+        // shape type is the left part just before the 1st occurrence of the '__' separator.
 
-                // Invoking ShapeMetadata displayed events.
-                shapeMetadata.Displayed.Invoke((action, displayContext) => action(displayContext), displayContext, _logger);
-            }
-            finally
+        // As a fast path we 1st use the shapeType as is but it may contain some '__'.
+        if (!shapeTable.Descriptors.TryGetValue(shapeType, out var shapeDescriptor))
+        {
+            // Check if not a fundamental type.
+            var index = shapeType.IndexOf(_separator, StringComparison.Ordinal);
+
+            if (index > 0)
             {
-                await _shapeDisplayEvents.InvokeAsync((e, displayContext) => e.DisplayingFinalizedAsync(displayContext), displayContext, _logger);
+                // Try again by using the fundamental shape type without any '__' separator.
+                shapeTable.Descriptors.TryGetValue(shapeType[..index], out shapeDescriptor);
             }
-
-            return shape.Metadata.ChildContent;
         }
 
-        private static ShapeDescriptor GetShapeDescriptor(string shapeType, ShapeTable shapeTable)
+        return shapeDescriptor;
+    }
+
+    private async Task<ShapeBinding> GetShapeBindingAsync(string shapeType, AlternatesCollection shapeAlternates, ShapeTable shapeTable)
+    {
+        // Shape alternates are optional, fully qualified binding names,
+        // the earliest added alternates have the lowest priority,
+        // the descriptor returned is based on the binding that is matched, so it may be an entirely
+        // different descriptor if the alternate has a different base name.
+        for (var i = shapeAlternates.Count - 1; i >= 0; i--)
         {
-            // Note: The shape type of a descriptor is a fundamental shape type that never contains
-            // any '__' separator. If a shape type contains some '__' separators, its fundamental
-            // shape type is the left part just before the 1st occurrence of the '__' separator.
+            var shapeAlternate = shapeAlternates[i];
 
-            // As a fast path we 1st use the shapeType as is but it may contain some '__'.
-            if (!shapeTable.Descriptors.TryGetValue(shapeType, out var shapeDescriptor))
+            foreach (var shapeBindingResolver in _shapeBindingResolvers)
             {
-                // Check if not a fundamental type.
-                var index = shapeType.IndexOf(_separator, StringComparison.Ordinal);
+                var binding = await shapeBindingResolver.GetShapeBindingAsync(shapeAlternate);
 
-                if (index > 0)
+                if (binding != null)
                 {
-                    // Try again by using the fundamental shape type without any '__' separator.
-                    shapeTable.Descriptors.TryGetValue(shapeType[..index], out shapeDescriptor);
+                    return binding;
                 }
             }
 
-            return shapeDescriptor;
-        }
-
-        private async Task<ShapeBinding> GetShapeBindingAsync(string shapeType, AlternatesCollection shapeAlternates, ShapeTable shapeTable)
-        {
-            // Shape alternates are optional, fully qualified binding names,
-            // the earliest added alternates have the lowest priority,
-            // the descriptor returned is based on the binding that is matched, so it may be an entirely
-            // different descriptor if the alternate has a different base name.
-            for (var i = shapeAlternates.Count - 1; i >= 0; i--)
+            if (shapeTable.Bindings.TryGetValue(shapeAlternate, out var shapeBinding))
             {
-                var shapeAlternate = shapeAlternates[i];
-
-                foreach (var shapeBindingResolver in _shapeBindingResolvers)
-                {
-                    var binding = await shapeBindingResolver.GetShapeBindingAsync(shapeAlternate);
-
-                    if (binding != null)
-                    {
-                        return binding;
-                    }
-                }
-
-                if (shapeTable.Bindings.TryGetValue(shapeAlternate, out var shapeBinding))
-                {
-                    return shapeBinding;
-                }
+                return shapeBinding;
             }
+        }
 
-            // When no alternates matches, the shapeType is used to find the longest matching binding,
-            // the shapetype name can break itself into shorter fallbacks at double-underscore marks,
-            // so the shapetype itself may contain a longer alternate forms that falls back to a shorter one.
-
-            // Build a cache of such values
-            var alternateShapeTypes = _alternateShapeTypes.GetOrAdd(shapeType, shapeType =>
-            {
-                var segments = new List<string>(2);
+        // When no alternates matches, the shapeType is used to find the longest matching binding,
+        // the shapetype name can break itself into shorter fallbacks at double-underscore marks,
+        // so the shapetype itself may contain a longer alternate forms that falls back to a shorter one.
 
-                var alternate = shapeType;
+        // Build a cache of such values
+        var alternateShapeTypes = _alternateShapeTypes.GetOrAdd(shapeType, shapeType =>
+        {
+            var segments = new List<string>(2);
 
-                do
-                {
-                    segments.Add(alternate);
-                } while (TryGetParentShapeTypeName(alternate, out alternate));
+            var alternate = shapeType;
 
-                return segments.ToArray();
-            });
+            do
+            {
+                segments.Add(alternate);
+            } while (TryGetParentShapeTypeName(alternate, out alternate));
 
-            foreach (var shapeTypeSegment in alternateShapeTypes)
-            { 
-                foreach (var shapeBindingResolver in _shapeBindingResolvers)
-                {
-                    var binding = await shapeBindingResolver.GetShapeBindingAsync(shapeTypeSegment);
+            return segments.ToArray();
+        });
 
-                    if (binding != null)
-                    {
-                        return binding;
-                    }
-                }
+        foreach (var shapeTypeSegment in alternateShapeTypes)
+        {
+            foreach (var shapeBindingResolver in _shapeBindingResolvers)
+            {
+                var binding = await shapeBindingResolver.GetShapeBindingAsync(shapeTypeSegment);
 
-                if (shapeTable.Bindings.TryGetValue(shapeTypeSegment, out var shapeBinding))
+                if (binding != null)
                 {
-                    return shapeBinding;
+                    return binding;
                 }
             }
 
-            return null;
+            if (shapeTable.Bindings.TryGetValue(shapeTypeSegment, out var shapeBinding))
+            {
+                return shapeBinding;
+            }
         }
 
-        private static bool TryGetParentShapeTypeName(string shapeTypeScan, out string parentType)
-        {
-            parentType = shapeTypeScan;
+        return null;
+    }
 
-            var delimiterIndex = shapeTypeScan.LastIndexOf(_separator, StringComparison.Ordinal);
-            if (delimiterIndex > 0)
-            {
-                parentType = shapeTypeScan[..delimiterIndex];
-                return true;
-            }
+    private static bool TryGetParentShapeTypeName(string shapeTypeScan, out string parentType)
+    {
+        parentType = shapeTypeScan;
 
-            return false;
+        var delimiterIndex = shapeTypeScan.LastIndexOf(_separator, StringComparison.Ordinal);
+        if (delimiterIndex > 0)
+        {
+            parentType = shapeTypeScan[..delimiterIndex];
+            return true;
         }
 
-        private static ValueTask<IHtmlContent> ProcessAsync(ShapeBinding shapeBinding, IShape shape, DisplayContext context)
-        {
-            static async ValueTask<IHtmlContent> Awaited(Task<IHtmlContent> task)
-            {
-                return (await task) ?? HtmlString.Empty;
-            }
+        return false;
+    }
 
-            if (shapeBinding?.BindingAsync == null)
-            {
-                // Todo: create result from all child shapes.
-                return new ValueTask<IHtmlContent>(shape.Metadata.ChildContent ?? HtmlString.Empty);
-            }
+    private static ValueTask<IHtmlContent> ProcessAsync(ShapeBinding shapeBinding, IShape shape, DisplayContext context)
+    {
+        static async ValueTask<IHtmlContent> Awaited(Task<IHtmlContent> task)
+        {
+            return (await task) ?? HtmlString.Empty;
+        }
 
-            var task = shapeBinding.BindingAsync(context);
+        if (shapeBinding?.BindingAsync == null)
+        {
+            // Todo: create result from all child shapes.
+            return new ValueTask<IHtmlContent>(shape.Metadata.ChildContent ?? HtmlString.Empty);
+        }
 
-            if (!task.IsCompletedSuccessfully)
-            {
-                return Awaited(task);
-            }
+        var task = shapeBinding.BindingAsync(context);
 
-            return new ValueTask<IHtmlContent>(task.Result ?? HtmlString.Empty);
+        if (!task.IsCompletedSuccessfully)
+        {
+            return Awaited(task);
         }
+
+        return new ValueTask<IHtmlContent>(task.Result ?? HtmlString.Empty);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/DefaultShapeFactory.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/DefaultShapeFactory.cs
index 1b8ee2a17ee..b52cda45b6c 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/DefaultShapeFactory.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/DefaultShapeFactory.cs
@@ -5,138 +5,137 @@
 using OrchardCore.DisplayManagement.Descriptors;
 using OrchardCore.DisplayManagement.Theming;
 
-namespace OrchardCore.DisplayManagement.Implementation
+namespace OrchardCore.DisplayManagement.Implementation;
+
+public class DefaultShapeFactory : DynamicObject, IShapeFactory
 {
-    public class DefaultShapeFactory : DynamicObject, IShapeFactory
+    private readonly IEnumerable<IShapeFactoryEvents> _events;
+    private readonly IShapeTableManager _shapeTableManager;
+    private readonly IThemeManager _themeManager;
+    private readonly IServiceProvider _serviceProvider;
+    private ShapeTable _scopedShapeTable;
+
+    public DefaultShapeFactory(
+        IEnumerable<IShapeFactoryEvents> events,
+        IShapeTableManager shapeTableManager,
+        IThemeManager themeManager,
+        IServiceProvider serviceProvider)
+    {
+        _events = events;
+        _shapeTableManager = shapeTableManager;
+        _themeManager = themeManager;
+        _serviceProvider = serviceProvider;
+    }
+
+    public dynamic New => this;
+
+    public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result)
     {
-        private readonly IEnumerable<IShapeFactoryEvents> _events;
-        private readonly IShapeTableManager _shapeTableManager;
-        private readonly IThemeManager _themeManager;
-        private readonly IServiceProvider _serviceProvider;
-        private ShapeTable _scopedShapeTable;
-
-        public DefaultShapeFactory(
-            IEnumerable<IShapeFactoryEvents> events,
-            IShapeTableManager shapeTableManager,
-            IThemeManager themeManager,
-            IServiceProvider serviceProvider)
+        // await New.FooAsync()
+        // await New.Foo()
+
+        var binderName = binder.Name;
+
+        if (binderName.EndsWith("Async", StringComparison.Ordinal))
         {
-            _events = events;
-            _shapeTableManager = shapeTableManager;
-            _themeManager = themeManager;
-            _serviceProvider = serviceProvider;
+            binderName = binder.Name[..^"Async".Length];
         }
 
-        public dynamic New => this;
+        result = ShapeFactoryExtensions
+            .CreateAsync(this, binderName, Arguments.From(args, binder.CallInfo.ArgumentNames))
+            .AsTask();
 
-        public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result)
-        {
-            // await New.FooAsync()
-            // await New.Foo()
+        return true;
+    }
 
-            var binderName = binder.Name;
+    private async Task<ShapeTable> GetShapeTableAsync()
+    {
+        if (_scopedShapeTable == null)
+        {
+            var theme = await _themeManager.GetThemeAsync();
+            _scopedShapeTable = await _shapeTableManager.GetShapeTableAsync(theme?.Id);
+        }
 
-            if (binderName.EndsWith("Async", StringComparison.Ordinal))
-            {
-                binderName = binder.Name[..^"Async".Length];
-            }
+        return _scopedShapeTable;
+    }
 
-            result = ShapeFactoryExtensions
-                .CreateAsync(this, binderName, Arguments.From(args, binder.CallInfo.ArgumentNames))
-                .AsTask();
+    public async ValueTask<IShape> CreateAsync(string shapeType, Func<ValueTask<IShape>> shapeFactory, Action<ShapeCreatingContext> creating, Action<ShapeCreatedContext> created)
+    {
+        ShapeDescriptor shapeDescriptor;
+        (await GetShapeTableAsync()).Descriptors.TryGetValue(shapeType, out shapeDescriptor);
 
-            return true;
+        var creatingContext = new ShapeCreatingContext
+        {
+            ServiceProvider = _serviceProvider,
+            New = this,
+            ShapeFactory = this,
+            ShapeType = shapeType,
+            OnCreated = [],
+            CreateAsync = shapeFactory
+        };
+
+        creating?.Invoke(creatingContext);
+
+        // 'Creating' events may add behaviors and alter base type.
+        foreach (var ev in _events)
+        {
+            ev.Creating(creatingContext);
         }
 
-        private async Task<ShapeTable> GetShapeTableAsync()
+        if (shapeDescriptor != null)
         {
-            if (_scopedShapeTable == null)
+            foreach (var ev in shapeDescriptor.CreatingAsync)
             {
-                var theme = await _themeManager.GetThemeAsync();
-                _scopedShapeTable = await _shapeTableManager.GetShapeTableAsync(theme?.Id);
+                await ev(creatingContext);
             }
-
-            return _scopedShapeTable;
         }
 
-        public async ValueTask<IShape> CreateAsync(string shapeType, Func<ValueTask<IShape>> shapeFactory, Action<ShapeCreatingContext> creating, Action<ShapeCreatedContext> created)
+        // Create the new instance.
+        var createdContext = new ShapeCreatedContext
         {
-            ShapeDescriptor shapeDescriptor;
-            (await GetShapeTableAsync()).Descriptors.TryGetValue(shapeType, out shapeDescriptor);
+            ServiceProvider = _serviceProvider,
+            New = creatingContext.New,
+            ShapeFactory = creatingContext.ShapeFactory,
+            ShapeType = creatingContext.ShapeType,
+            Shape = await creatingContext.CreateAsync()
+        };
 
-            var creatingContext = new ShapeCreatingContext
-            {
-                ServiceProvider = _serviceProvider,
-                New = this,
-                ShapeFactory = this,
-                ShapeType = shapeType,
-                OnCreated = [],
-                CreateAsync = shapeFactory
-            };
-
-            creating?.Invoke(creatingContext);
-
-            // 'Creating' events may add behaviors and alter base type.
-            foreach (var ev in _events)
-            {
-                ev.Creating(creatingContext);
-            }
-
-            if (shapeDescriptor != null)
-            {
-                foreach (var ev in shapeDescriptor.CreatingAsync)
-                {
-                    await ev(creatingContext);
-                }
-            }
-
-            // Create the new instance.
-            var createdContext = new ShapeCreatedContext
-            {
-                ServiceProvider = _serviceProvider,
-                New = creatingContext.New,
-                ShapeFactory = creatingContext.ShapeFactory,
-                ShapeType = creatingContext.ShapeType,
-                Shape = await creatingContext.CreateAsync()
-            };
-
-            var shape = createdContext.Shape
-                ?? throw new InvalidOperationException("Invalid base type for shape: " + createdContext.Shape.GetType().ToString());
+        var shape = createdContext.Shape
+            ?? throw new InvalidOperationException("Invalid base type for shape: " + createdContext.Shape.GetType().ToString());
 
-            var shapeMetadata = shape.Metadata;
-            shapeMetadata.Type = shapeType;
+        var shapeMetadata = shape.Metadata;
+        shapeMetadata.Type = shapeType;
 
-            // Merge wrappers if there are any.
-            if (shapeDescriptor != null && shapeMetadata.Wrappers.Count + shapeDescriptor.Wrappers.Count > 0)
-            {
-                shapeMetadata.Wrappers.AddRange(shapeDescriptor.Wrappers);
-            }
+        // Merge wrappers if there are any.
+        if (shapeDescriptor != null && shapeMetadata.Wrappers.Count + shapeDescriptor.Wrappers.Count > 0)
+        {
+            shapeMetadata.Wrappers.AddRange(shapeDescriptor.Wrappers);
+        }
 
-            // 'Created' events provides default values and new object initialization.
-            foreach (var ev in _events)
-            {
-                ev.Created(createdContext);
-            }
+        // 'Created' events provides default values and new object initialization.
+        foreach (var ev in _events)
+        {
+            ev.Created(createdContext);
+        }
 
-            if (shapeDescriptor != null)
+        if (shapeDescriptor != null)
+        {
+            foreach (var ev in shapeDescriptor.CreatedAsync)
             {
-                foreach (var ev in shapeDescriptor.CreatedAsync)
-                {
-                    await ev(createdContext);
-                }
+                await ev(createdContext);
             }
+        }
 
-            if (creatingContext != null)
+        if (creatingContext != null)
+        {
+            foreach (var ev in creatingContext.OnCreated)
             {
-                foreach (var ev in creatingContext.OnCreated)
-                {
-                    await ev(createdContext);
-                }
+                await ev(createdContext);
             }
+        }
 
-            created?.Invoke(createdContext);
+        created?.Invoke(createdContext);
 
-            return createdContext.Shape;
-        }
+        return createdContext.Shape;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/DisplayContext.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/DisplayContext.cs
index 8625807a499..038eb67b15a 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/DisplayContext.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/DisplayContext.cs
@@ -1,24 +1,23 @@
 using System;
 
-namespace OrchardCore.DisplayManagement.Implementation
+namespace OrchardCore.DisplayManagement.Implementation;
+
+public class DisplayContext
 {
-    public class DisplayContext
+    public DisplayContext()
     {
-        public DisplayContext()
-        {
-        }
-
-        public DisplayContext(DisplayContext context)
-        {
-            ServiceProvider = context.ServiceProvider;
-            DisplayHelper = context.DisplayHelper;
-            Value = context.Value;
-            HtmlFieldPrefix = context.HtmlFieldPrefix;
-        }
+    }
 
-        public IServiceProvider ServiceProvider { get; set; }
-        public IDisplayHelper DisplayHelper { get; set; }
-        public string HtmlFieldPrefix { get; set; }
-        public IShape Value { get; set; }
+    public DisplayContext(DisplayContext context)
+    {
+        ServiceProvider = context.ServiceProvider;
+        DisplayHelper = context.DisplayHelper;
+        Value = context.Value;
+        HtmlFieldPrefix = context.HtmlFieldPrefix;
     }
+
+    public IServiceProvider ServiceProvider { get; set; }
+    public IDisplayHelper DisplayHelper { get; set; }
+    public string HtmlFieldPrefix { get; set; }
+    public IShape Value { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/DisplayHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/DisplayHelper.cs
index d293c15eb9b..b3b5e47bef8 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/DisplayHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/DisplayHelper.cs
@@ -5,105 +5,104 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Html;
 
-namespace OrchardCore.DisplayManagement.Implementation
+namespace OrchardCore.DisplayManagement.Implementation;
+
+public class DisplayHelper : DynamicObject, IDisplayHelper
 {
-    public class DisplayHelper : DynamicObject, IDisplayHelper
+    private readonly IHtmlDisplay _htmlDisplay;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly IServiceProvider _serviceProvider;
+
+    public DisplayHelper(
+        IHtmlDisplay htmlDisplay,
+        IShapeFactory shapeFactory,
+        IServiceProvider serviceProvider)
+    {
+        _htmlDisplay = htmlDisplay;
+        _shapeFactory = shapeFactory;
+        _serviceProvider = serviceProvider;
+    }
+
+    public override bool TryInvoke(InvokeBinder binder, object[] args, out object result)
     {
-        private readonly IHtmlDisplay _htmlDisplay;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly IServiceProvider _serviceProvider;
-
-        public DisplayHelper(
-            IHtmlDisplay htmlDisplay,
-            IShapeFactory shapeFactory,
-            IServiceProvider serviceProvider)
+        result = InvokeAsync(null, Arguments.From(args, binder.CallInfo.ArgumentNames));
+
+        return true;
+    }
+
+    public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result)
+    {
+        result = InvokeAsync(binder.Name, Arguments.From(args, binder.CallInfo.ArgumentNames));
+
+        return true;
+    }
+
+    public Task<IHtmlContent> InvokeAsync(string name, INamedEnumerable<object> parameters)
+    {
+        if (!string.IsNullOrEmpty(name))
         {
-            _htmlDisplay = htmlDisplay;
-            _shapeFactory = shapeFactory;
-            _serviceProvider = serviceProvider;
+            return ShapeTypeExecuteAsync(name, parameters);
         }
 
-        public override bool TryInvoke(InvokeBinder binder, object[] args, out object result)
+        if (parameters.Positional.Count == 1)
         {
-            result = InvokeAsync(null, Arguments.From(args, binder.CallInfo.ArgumentNames));
-
-            return true;
+            return ShapeExecuteAsync(parameters.Positional.First() as IShape);
         }
 
-        public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result)
+        if (parameters.Positional.Count > 0)
         {
-            result = InvokeAsync(binder.Name, Arguments.From(args, binder.CallInfo.ArgumentNames));
-
-            return true;
+            return ShapeExecuteAsync(parameters.Positional.Cast<IShape>());
         }
 
-        public Task<IHtmlContent> InvokeAsync(string name, INamedEnumerable<object> parameters)
+        // zero args - no display to execute
+        return Task.FromResult<IHtmlContent>(null);
+    }
+
+    private async Task<IHtmlContent> ShapeTypeExecuteAsync(string name, INamedEnumerable<object> parameters)
+    {
+        var shape = await _shapeFactory.CreateAsync(name, parameters);
+        return await ShapeExecuteAsync(shape);
+    }
+
+    public Task<IHtmlContent> ShapeExecuteAsync(IShape shape)
+    {
+        // Check if the shape is null or empty.
+        if (shape.IsNullOrEmpty())
         {
-            if (!string.IsNullOrEmpty(name))
-            {
-                return ShapeTypeExecuteAsync(name, parameters);
-            }
-
-            if (parameters.Positional.Count == 1)
-            {
-                return ShapeExecuteAsync(parameters.Positional.First() as IShape);
-            }
-
-            if (parameters.Positional.Count > 0)
-            {
-                return ShapeExecuteAsync(parameters.Positional.Cast<IShape>());
-            }
-
-            // zero args - no display to execute
-            return Task.FromResult<IHtmlContent>(null);
+            return Task.FromResult<IHtmlContent>(HtmlString.Empty);
         }
 
-        private async Task<IHtmlContent> ShapeTypeExecuteAsync(string name, INamedEnumerable<object> parameters)
+        // Check if the shape is wrapper, return underlying IHtmlContent
+        if (shape is PositionWrapper wrapper)
         {
-            var shape = await _shapeFactory.CreateAsync(name, parameters);
-            return await ShapeExecuteAsync(shape);
+            return Task.FromResult(PositionWrapper.UnWrap(wrapper));
         }
 
-        public Task<IHtmlContent> ShapeExecuteAsync(IShape shape)
+        // Check if the shape is pre-rendered.
+        if (shape is IHtmlContent htmlContent)
         {
-            // Check if the shape is null or empty.
-            if (shape.IsNullOrEmpty())
-            {
-                return Task.FromResult<IHtmlContent>(HtmlString.Empty);
-            }
-
-            // Check if the shape is wrapper, return underlying IHtmlContent
-            if( shape is PositionWrapper wrapper)
-            {
-                return Task.FromResult(PositionWrapper.UnWrap(wrapper));
-            }
-
-            // Check if the shape is pre-rendered.
-            if (shape is IHtmlContent htmlContent)
-            {
-                return Task.FromResult(htmlContent);
-            }
-
-            var context = new DisplayContext
-            {
-                DisplayHelper = this,
-                Value = shape,
-                ServiceProvider = _serviceProvider
-            };
-
-            return _htmlDisplay.ExecuteAsync(context);
+            return Task.FromResult(htmlContent);
         }
 
-        public async Task<IHtmlContent> ShapeExecuteAsync(IEnumerable<IShape> shapes)
+        var context = new DisplayContext
         {
-            var htmlContentBuilder = new HtmlContentBuilder();
+            DisplayHelper = this,
+            Value = shape,
+            ServiceProvider = _serviceProvider
+        };
+
+        return _htmlDisplay.ExecuteAsync(context);
+    }
 
-            foreach (var shape in shapes)
-            {
-                htmlContentBuilder.AppendHtml(await ShapeExecuteAsync(shape));
-            }
+    public async Task<IHtmlContent> ShapeExecuteAsync(IEnumerable<IShape> shapes)
+    {
+        var htmlContentBuilder = new HtmlContentBuilder();
 
-            return htmlContentBuilder;
+        foreach (var shape in shapes)
+        {
+            htmlContentBuilder.AppendHtml(await ShapeExecuteAsync(shape));
         }
+
+        return htmlContentBuilder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/IHtmlDisplay.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/IHtmlDisplay.cs
index 8cc29975c71..0e227e4322c 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/IHtmlDisplay.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/IHtmlDisplay.cs
@@ -1,13 +1,12 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Html;
 
-namespace OrchardCore.DisplayManagement.Implementation
+namespace OrchardCore.DisplayManagement.Implementation;
+
+/// <summary>
+/// Coordinates the rendering of shapes.
+/// </summary>
+public interface IHtmlDisplay
 {
-    /// <summary>
-    /// Coordinates the rendering of shapes.
-    /// </summary>
-    public interface IHtmlDisplay
-    {
-        Task<IHtmlContent> ExecuteAsync(DisplayContext context);
-    }
+    Task<IHtmlContent> ExecuteAsync(DisplayContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/IShapeDisplayEvents.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/IShapeDisplayEvents.cs
index 0370470f2e5..d904ea7f574 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/IShapeDisplayEvents.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/IShapeDisplayEvents.cs
@@ -1,14 +1,13 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.DisplayManagement.Implementation
+namespace OrchardCore.DisplayManagement.Implementation;
+
+public interface IShapeDisplayEvents
 {
-    public interface IShapeDisplayEvents
-    {
-        Task DisplayingAsync(ShapeDisplayContext context);
-        Task DisplayedAsync(ShapeDisplayContext context);
-        /// <summary>
-        /// Guaranteed to be called, even in the event of an exception when rendering the shape.
-        /// </summary>
-        Task DisplayingFinalizedAsync(ShapeDisplayContext context);
-    }
+    Task DisplayingAsync(ShapeDisplayContext context);
+    Task DisplayedAsync(ShapeDisplayContext context);
+    /// <summary>
+    /// Guaranteed to be called, even in the event of an exception when rendering the shape.
+    /// </summary>
+    Task DisplayingFinalizedAsync(ShapeDisplayContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/IShapeFactoryEvents.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/IShapeFactoryEvents.cs
index f0cdbff3e71..5d5e225de01 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/IShapeFactoryEvents.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/IShapeFactoryEvents.cs
@@ -2,45 +2,44 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace OrchardCore.DisplayManagement.Implementation
+namespace OrchardCore.DisplayManagement.Implementation;
+
+public interface IShapeFactoryEvents
 {
-    public interface IShapeFactoryEvents
-    {
-        void Creating(ShapeCreatingContext context);
-        void Created(ShapeCreatedContext context);
-    }
+    void Creating(ShapeCreatingContext context);
+    void Created(ShapeCreatedContext context);
+}
 
-    public class ShapeCreatingContext
-    {
-        public IServiceProvider ServiceProvider { get; set; }
-        public IShapeFactory ShapeFactory { get; set; }
-        public dynamic New { get; set; }
-        public string ShapeType { get; set; }
-        public Func<ValueTask<IShape>> CreateAsync { get; set; }
-        public IList<Func<ShapeCreatedContext, Task>> OnCreated { get; set; }
+public class ShapeCreatingContext
+{
+    public IServiceProvider ServiceProvider { get; set; }
+    public IShapeFactory ShapeFactory { get; set; }
+    public dynamic New { get; set; }
+    public string ShapeType { get; set; }
+    public Func<ValueTask<IShape>> CreateAsync { get; set; }
+    public IList<Func<ShapeCreatedContext, Task>> OnCreated { get; set; }
 
-        public Func<IShape> Create
-        {
-            set => CreateAsync = () => new ValueTask<IShape>(value());
-        }
+    public Func<IShape> Create
+    {
+        set => CreateAsync = () => new ValueTask<IShape>(value());
     }
+}
+
+public class ShapeCreatedContext
+{
+    public IServiceProvider ServiceProvider { get; set; }
+    public IShapeFactory ShapeFactory { get; set; }
+    public dynamic New { get; set; }
+    public string ShapeType { get; set; }
+    public IShape Shape { get; set; }
+}
 
-    public class ShapeCreatedContext
+public abstract class ShapeFactoryEvents : IShapeFactoryEvents
+{
+    public virtual void Creating(ShapeCreatingContext context)
     {
-        public IServiceProvider ServiceProvider { get; set; }
-        public IShapeFactory ShapeFactory { get; set; }
-        public dynamic New { get; set; }
-        public string ShapeType { get; set; }
-        public IShape Shape { get; set; }
     }
-
-    public abstract class ShapeFactoryEvents : IShapeFactoryEvents
+    public virtual void Created(ShapeCreatedContext context)
     {
-        public virtual void Creating(ShapeCreatingContext context)
-        {
-        }
-        public virtual void Created(ShapeCreatedContext context)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/ShapeDisplayContext.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/ShapeDisplayContext.cs
index 50a9e381d82..1b36b560a2e 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/ShapeDisplayContext.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Implementation/ShapeDisplayContext.cs
@@ -1,13 +1,12 @@
 using System;
 using Microsoft.AspNetCore.Html;
 
-namespace OrchardCore.DisplayManagement.Implementation
+namespace OrchardCore.DisplayManagement.Implementation;
+
+public class ShapeDisplayContext
 {
-    public class ShapeDisplayContext
-    {
-        public IShape Shape { get; set; }
-        public IHtmlContent ChildContent { get; set; }
-        public DisplayContext DisplayContext { get; set; }
-        public IServiceProvider ServiceProvider { get; set; }
-    }
+    public IShape Shape { get; set; }
+    public IHtmlContent ChildContent { get; set; }
+    public DisplayContext DisplayContext { get; set; }
+    public IServiceProvider ServiceProvider { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Layout/ILayoutAccessor.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Layout/ILayoutAccessor.cs
index 68065992a3b..8708c3683fc 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Layout/ILayoutAccessor.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Layout/ILayoutAccessor.cs
@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
 using OrchardCore.DisplayManagement.Zones;
 
-namespace OrchardCore.DisplayManagement.Layout
+namespace OrchardCore.DisplayManagement.Layout;
+
+public interface ILayoutAccessor
 {
-    public interface ILayoutAccessor
-    {
-        Task<IZoneHolding> GetLayoutAsync();
-    }
+    Task<IZoneHolding> GetLayoutAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Layout/LayoutAccessor.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Layout/LayoutAccessor.cs
index bb1d236d051..8e0db4c7c37 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Layout/LayoutAccessor.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Layout/LayoutAccessor.cs
@@ -2,32 +2,31 @@
 using System.Threading.Tasks;
 using OrchardCore.DisplayManagement.Zones;
 
-namespace OrchardCore.DisplayManagement.Layout
+namespace OrchardCore.DisplayManagement.Layout;
+
+public class LayoutAccessor : ILayoutAccessor
 {
-    public class LayoutAccessor : ILayoutAccessor
+    private IZoneHolding _layout;
+    private readonly IShapeFactory _shapeFactory;
+
+    public LayoutAccessor(IShapeFactory shapeFactory)
     {
-        private IZoneHolding _layout;
-        private readonly IShapeFactory _shapeFactory;
+        _shapeFactory = shapeFactory;
+    }
 
-        public LayoutAccessor(IShapeFactory shapeFactory)
-        {
-            _shapeFactory = shapeFactory;
-        }
+    public async Task<IZoneHolding> GetLayoutAsync()
+    {
+        // Create a shape whose properties are dynamically created as Zone shapes.
+        _layout ??= await _shapeFactory.CreateAsync(
+            "Layout",
+            () => new ValueTask<IShape>(new ZoneHolding(() => _shapeFactory.CreateAsync("Zone")))) as IZoneHolding;
 
-        public async Task<IZoneHolding> GetLayoutAsync()
+        if (_layout == null)
         {
-            // Create a shape whose properties are dynamically created as Zone shapes.
-            _layout ??= await _shapeFactory.CreateAsync(
-                "Layout",
-                () => new ValueTask<IShape>(new ZoneHolding(() => _shapeFactory.CreateAsync("Zone")))) as IZoneHolding;
-
-            if (_layout == null)
-            {
-                // At this point a Layout shape should always exist.
-                throw new ApplicationException("Fatal error, a Layout couldn't be created.");
-            }
-
-            return _layout;
+            // At this point a Layout shape should always exist.
+            throw new ApplicationException("Fatal error, a Layout couldn't be created.");
         }
+
+        return _layout;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/LocationExpander/ThemeViewLocationExpanderProvider.cs b/src/OrchardCore/OrchardCore.DisplayManagement/LocationExpander/ThemeViewLocationExpanderProvider.cs
index 8ea6177fc16..91f415df578 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/LocationExpander/ThemeViewLocationExpanderProvider.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/LocationExpander/ThemeViewLocationExpanderProvider.cs
@@ -8,94 +8,93 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Mvc.LocationExpander;
 
-namespace OrchardCore.DisplayManagement.LocationExpander
+namespace OrchardCore.DisplayManagement.LocationExpander;
+
+public class ThemeViewLocationExpanderProvider : IViewLocationExpanderProvider
 {
-    public class ThemeViewLocationExpanderProvider : IViewLocationExpanderProvider
+    private readonly IHostEnvironment _hostingEnvironment;
+    private readonly IExtensionManager _extensionManager;
+
+    public ThemeViewLocationExpanderProvider(IHostEnvironment hostingEnvironment, IExtensionManager extensionManager)
     {
-        private readonly IHostEnvironment _hostingEnvironment;
-        private readonly IExtensionManager _extensionManager;
+        _hostingEnvironment = hostingEnvironment;
+        _extensionManager = extensionManager;
+    }
 
-        public ThemeViewLocationExpanderProvider(IHostEnvironment hostingEnvironment, IExtensionManager extensionManager)
-        {
-            _hostingEnvironment = hostingEnvironment;
-            _extensionManager = extensionManager;
-        }
+    public int Priority => 15;
 
-        public int Priority => 15;
+    /// <inheritdoc />
+    public void PopulateValues(ViewLocationExpanderContext context)
+    {
+        var currentTheme = context.ActionContext.HttpContext.Features.Get<RazorViewFeature>()?.Theme;
 
-        /// <inheritdoc />
-        public void PopulateValues(ViewLocationExpanderContext context)
+        if (currentTheme != null)
         {
-            var currentTheme = context.ActionContext.HttpContext.Features.Get<RazorViewFeature>()?.Theme;
-
-            if (currentTheme != null)
-            {
-                context.Values["Theme"] = currentTheme.Id;
-            }
+            context.Values["Theme"] = currentTheme.Id;
         }
+    }
 
-        /// <inheritdoc />
-        public virtual IEnumerable<string> ExpandViewLocations(ViewLocationExpanderContext context,
-                                                               IEnumerable<string> viewLocations)
+    /// <inheritdoc />
+    public virtual IEnumerable<string> ExpandViewLocations(ViewLocationExpanderContext context,
+                                                           IEnumerable<string> viewLocations)
+    {
+        if (!context.Values.TryGetValue("Theme", out var currentThemeId))
         {
-            if (!context.Values.TryGetValue("Theme", out var currentThemeId))
-            {
-                return viewLocations;
-            }
+            return viewLocations;
+        }
 
-            var currentThemeAndBaseThemesOrdered = _extensionManager
-                .GetFeatures([currentThemeId])
-                .Where(f => f.IsTheme())
-                .Reverse()
-                .ToList();
+        var currentThemeAndBaseThemesOrdered = _extensionManager
+            .GetFeatures([currentThemeId])
+            .Where(f => f.IsTheme())
+            .Reverse()
+            .ToList();
 
-            // let the application acting as a super theme also for mvc views discovering.
-            var applicationTheme = _extensionManager
-                .GetFeatures()
-                .FirstOrDefault(x => x.Id == _hostingEnvironment.ApplicationName);
+        // let the application acting as a super theme also for mvc views discovering.
+        var applicationTheme = _extensionManager
+            .GetFeatures()
+            .FirstOrDefault(x => x.Id == _hostingEnvironment.ApplicationName);
 
-            if (applicationTheme != null)
-            {
-                currentThemeAndBaseThemesOrdered.Insert(0, applicationTheme);
-            }
+        if (applicationTheme != null)
+        {
+            currentThemeAndBaseThemesOrdered.Insert(0, applicationTheme);
+        }
 
-            var result = new List<string>();
+        var result = new List<string>();
 
-            foreach (var theme in currentThemeAndBaseThemesOrdered)
+        foreach (var theme in currentThemeAndBaseThemesOrdered)
+        {
+            if (context.AreaName != theme.Id)
             {
-                if (context.AreaName != theme.Id)
-                {
-                    var themePagesPath = '/' + theme.Extension.SubPath + "/Pages";
-                    var themeViewsPath = '/' + theme.Extension.SubPath + "/Views";
-
-                    if (context.AreaName != null)
-                    {
-                        if (context.PageName != null)
-                        {
-                            result.Add(themePagesPath + "/{2}/{0}" + RazorViewEngine.ViewExtension);
-                        }
-                        else
-                        {
-                            result.Add(themeViewsPath + "/{2}/{1}/{0}" + RazorViewEngine.ViewExtension);
-                        }
-                    }
+                var themePagesPath = '/' + theme.Extension.SubPath + "/Pages";
+                var themeViewsPath = '/' + theme.Extension.SubPath + "/Views";
 
+                if (context.AreaName != null)
+                {
                     if (context.PageName != null)
                     {
-                        result.Add(themePagesPath + "/Shared/{0}" + RazorViewEngine.ViewExtension);
+                        result.Add(themePagesPath + "/{2}/{0}" + RazorViewEngine.ViewExtension);
                     }
-
-                    if (context.AreaName != null)
+                    else
                     {
-                        result.Add(themeViewsPath + "/{2}/Shared/{0}" + RazorViewEngine.ViewExtension);
+                        result.Add(themeViewsPath + "/{2}/{1}/{0}" + RazorViewEngine.ViewExtension);
                     }
+                }
 
-                    result.Add(themeViewsPath + "/Shared/{0}" + RazorViewEngine.ViewExtension);
+                if (context.PageName != null)
+                {
+                    result.Add(themePagesPath + "/Shared/{0}" + RazorViewEngine.ViewExtension);
+                }
+
+                if (context.AreaName != null)
+                {
+                    result.Add(themeViewsPath + "/{2}/Shared/{0}" + RazorViewEngine.ViewExtension);
                 }
-            }
 
-            result.AddRange(viewLocations);
-            return result;
+                result.Add(themeViewsPath + "/Shared/{0}" + RazorViewEngine.ViewExtension);
+            }
         }
+
+        result.AddRange(viewLocations);
+        return result;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Manifest/ThemeAttribute.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Manifest/ThemeAttribute.cs
index 1761be24990..dd4e2ead4a9 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Manifest/ThemeAttribute.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Manifest/ThemeAttribute.cs
@@ -1,211 +1,210 @@
 using System;
 
-namespace OrchardCore.DisplayManagement.Manifest
+namespace OrchardCore.DisplayManagement.Manifest;
+
+using Modules.Manifest;
+
+/// <summary>
+/// Defines a Theme which is a dedicated Module for theming purposes.
+/// If the Theme has only one default feature, it may be defined there.
+/// </summary>
+[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false, Inherited = false)]
+public class ThemeAttribute : ModuleAttribute
 {
-    using Modules.Manifest;
+    /// <summary>
+    /// &quot;&quot;.
+    /// </summary>
+    internal const string DefaultBaseTheme = "";
 
     /// <summary>
-    /// Defines a Theme which is a dedicated Module for theming purposes.
-    /// If the Theme has only one default feature, it may be defined there.
+    /// Default parameterless ctor.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false, Inherited = false)]
-    public class ThemeAttribute : ModuleAttribute
+    public ThemeAttribute() : base()
     {
-        /// <summary>
-        /// &quot;&quot;.
-        /// </summary>
-        internal const string DefaultBaseTheme = "";
-
-        /// <summary>
-        /// Default parameterless ctor.
-        /// </summary>
-        public ThemeAttribute() : base()
-        {
-        }
+    }
 
-        /// <summary>
-        /// Ctor allowing <paramref name="author"/>, as well as defaults for
-        /// <paramref name="websiteUrl"/>, <paramref name="semVer"/>, and <paramref name="tags"/>.
-        /// </summary>
-        /// <param name="id">The identifier for the Module.</param>
-        /// <param name="baseTheme">The base theme.</param>
-        /// <param name="description">A simple feature description.</param>
-        /// <param name="author">The module author name.</param>
-        /// <param name="semVer">Semantic Version string.</param>
-        /// <param name="websiteUrl">The module website URL.</param>
-        /// <param name="featureDependencies">Zero or more delimited feature dependencies,
-        /// corresponding to each of the feature <see cref="FeatureAttribute.Name"/>
-        /// properties.</param>
-        /// <param name="tags">Tags associated with the Module.</param>
-        /// <param name="defaultTenant">Whether considered default tenant only.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        /// <param name="alwaysEnabled">Whether feature is always enabled.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        /// <see cref="!:https://semver.org">Semantic Versioning.</see>
-        /// <remarks>At least <paramref name="author" /> expected herein to differentiate with
-        /// parameterless ctor.</remarks>
-        /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        public ThemeAttribute(
-            string id,
-            string baseTheme,
-            string description,
-            string author,
-            string semVer,
-            string websiteUrl,
-            string featureDependencies,
-            string tags,
-            object defaultTenant,
-            object alwaysEnabled,
-            object enabledByDependencyOnly
-        ) : this(
-            id,
-            default,
-            baseTheme,
-            default,
-            default,
-            description,
-            author,
-            semVer,
-            websiteUrl,
-            featureDependencies,
-            tags,
-            defaultTenant,
-            alwaysEnabled,
-            enabledByDependencyOnly
-        )
-        {
-        }
+    /// <summary>
+    /// Ctor allowing <paramref name="author"/>, as well as defaults for
+    /// <paramref name="websiteUrl"/>, <paramref name="semVer"/>, and <paramref name="tags"/>.
+    /// </summary>
+    /// <param name="id">The identifier for the Module.</param>
+    /// <param name="baseTheme">The base theme.</param>
+    /// <param name="description">A simple feature description.</param>
+    /// <param name="author">The module author name.</param>
+    /// <param name="semVer">Semantic Version string.</param>
+    /// <param name="websiteUrl">The module website URL.</param>
+    /// <param name="featureDependencies">Zero or more delimited feature dependencies,
+    /// corresponding to each of the feature <see cref="FeatureAttribute.Name"/>
+    /// properties.</param>
+    /// <param name="tags">Tags associated with the Module.</param>
+    /// <param name="defaultTenant">Whether considered default tenant only.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    /// <param name="alwaysEnabled">Whether feature is always enabled.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    /// <see cref="!:https://semver.org">Semantic Versioning.</see>
+    /// <remarks>At least <paramref name="author" /> expected herein to differentiate with
+    /// parameterless ctor.</remarks>
+    /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    public ThemeAttribute(
+        string id,
+        string baseTheme,
+        string description,
+        string author,
+        string semVer,
+        string websiteUrl,
+        string featureDependencies,
+        string tags,
+        object defaultTenant,
+        object alwaysEnabled,
+        object enabledByDependencyOnly
+    ) : this(
+        id,
+        default,
+        baseTheme,
+        default,
+        default,
+        description,
+        author,
+        semVer,
+        websiteUrl,
+        featureDependencies,
+        tags,
+        defaultTenant,
+        alwaysEnabled,
+        enabledByDependencyOnly
+    )
+    {
+    }
 
-        /// <summary>
-        /// Ctor allowing <paramref name="author"/>, as well as defaults for
-        /// <paramref name="websiteUrl"/>, <paramref name="semVer"/>, and <paramref name="tags"/>.
-        /// </summary>
-        /// <param name="id">The identifier for the Module.</param>
-        /// <param name="name">The feature name, defaults to <see cref="FeatureAttribute.Id"/>
-        /// when null or blank.</param>
-        /// <param name="baseTheme">The base theme.</param>
-        /// <param name="description">A simple feature description.</param>
-        /// <param name="author">The module author name.</param>
-        /// <param name="semVer">Semantic Version string.</param>
-        /// <param name="websiteUrl">The module website URL.</param>
-        /// <param name="featureDependencies">Zero or more delimited feature dependencies,
-        /// corresponding to each of the feature <see cref="FeatureAttribute.Name"/>
-        /// properties.</param>
-        /// <param name="tags">Tags associated with the Module.</param>
-        /// <param name="defaultTenant">Whether considered default tenant only.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        /// <param name="alwaysEnabled">Whether feature is always enabled.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        /// <see cref="!:https://semver.org">Semantic Versioning.</see>
-        /// <remarks>At least <paramref name="author" /> expected herein to differentiate with
-        /// parameterless ctor.</remarks>
-        /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        public ThemeAttribute(
-            string id,
-            string name,
-            string baseTheme,
-            string description,
-            string author,
-            string semVer,
-            string websiteUrl,
-            string featureDependencies,
-            string tags,
-            object defaultTenant,
-            object alwaysEnabled,
-            object enabledByDependencyOnly
-        ) : this(
-            id,
-            name,
-            baseTheme,
-            default,
-            default,
-            description,
-            author,
-            semVer,
-            websiteUrl,
-            featureDependencies,
-            tags,
-            defaultTenant,
-            alwaysEnabled,
-            enabledByDependencyOnly
-        )
-        {
-        }
+    /// <summary>
+    /// Ctor allowing <paramref name="author"/>, as well as defaults for
+    /// <paramref name="websiteUrl"/>, <paramref name="semVer"/>, and <paramref name="tags"/>.
+    /// </summary>
+    /// <param name="id">The identifier for the Module.</param>
+    /// <param name="name">The feature name, defaults to <see cref="FeatureAttribute.Id"/>
+    /// when null or blank.</param>
+    /// <param name="baseTheme">The base theme.</param>
+    /// <param name="description">A simple feature description.</param>
+    /// <param name="author">The module author name.</param>
+    /// <param name="semVer">Semantic Version string.</param>
+    /// <param name="websiteUrl">The module website URL.</param>
+    /// <param name="featureDependencies">Zero or more delimited feature dependencies,
+    /// corresponding to each of the feature <see cref="FeatureAttribute.Name"/>
+    /// properties.</param>
+    /// <param name="tags">Tags associated with the Module.</param>
+    /// <param name="defaultTenant">Whether considered default tenant only.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    /// <param name="alwaysEnabled">Whether feature is always enabled.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    /// <see cref="!:https://semver.org">Semantic Versioning.</see>
+    /// <remarks>At least <paramref name="author" /> expected herein to differentiate with
+    /// parameterless ctor.</remarks>
+    /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    public ThemeAttribute(
+        string id,
+        string name,
+        string baseTheme,
+        string description,
+        string author,
+        string semVer,
+        string websiteUrl,
+        string featureDependencies,
+        string tags,
+        object defaultTenant,
+        object alwaysEnabled,
+        object enabledByDependencyOnly
+    ) : this(
+        id,
+        name,
+        baseTheme,
+        default,
+        default,
+        description,
+        author,
+        semVer,
+        websiteUrl,
+        featureDependencies,
+        tags,
+        defaultTenant,
+        alwaysEnabled,
+        enabledByDependencyOnly
+    )
+    {
+    }
 
-        // TODO: MWP: do we need a 'type' version? probably not...
-        /// <summary>
-        /// Ctor allowing <paramref name="author"/>, as well as defaults for
-        /// <paramref name="websiteUrl"/>, <paramref name="semVer"/>, and <paramref name="tags"/>.
-        /// </summary>
-        /// <param name="id">The identifier for the Module.</param>
-        /// <param name="name">The feature name, defaults to <see cref="FeatureAttribute.Id"/>
-        /// when null or blank.</param>
-        /// <param name="baseTheme">The base theme.</param>
-        /// <param name="category">A simple feature category.</param>
-        /// <param name="priority">Priority for the Module.</param>
-        /// <param name="description">A simple feature description.</param>
-        /// <param name="author">The module author name.</param>
-        /// <param name="semVer">Semantic Version string.</param>
-        /// <param name="websiteUrl">The module website URL.</param>
-        /// <param name="featureDependencies">Zero or more delimited feature dependencies,
-        /// corresponding to each of the feature <see cref="FeatureAttribute.Name"/>
-        /// properties.</param>
-        /// <param name="tags">Tags associated with the Module.</param>
-        /// <param name="defaultTenant">Whether considered default tenant only.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        /// <param name="alwaysEnabled">Whether feature is always enabled.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        /// <see cref="!:https://semver.org">Semantic Versioning.</see>
-        /// <remarks>At least <paramref name="author" /> expected herein to differentiate with
-        /// parameterless ctor.</remarks>
-        /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
-        /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
-        public ThemeAttribute(
-            string id,
-            string name,
-            string baseTheme,
-            string category,
-            string priority,
-            string description,
-            string author,
-            string semVer,
-            string websiteUrl,
-            string featureDependencies,
-            string tags,
-            object defaultTenant,
-            object alwaysEnabled,
-            object enabledByDependencyOnly
-        ) : base(
-            id,
-            name,
-            category,
-            priority,
-            description,
-            author,
-            semVer,
-            websiteUrl,
-            featureDependencies,
-            tags,
-            defaultTenant,
-            alwaysEnabled,
-            enabledByDependencyOnly
-        )
-        {
-            BaseTheme = baseTheme;
-        }
+    // TODO: MWP: do we need a 'type' version? probably not...
+    /// <summary>
+    /// Ctor allowing <paramref name="author"/>, as well as defaults for
+    /// <paramref name="websiteUrl"/>, <paramref name="semVer"/>, and <paramref name="tags"/>.
+    /// </summary>
+    /// <param name="id">The identifier for the Module.</param>
+    /// <param name="name">The feature name, defaults to <see cref="FeatureAttribute.Id"/>
+    /// when null or blank.</param>
+    /// <param name="baseTheme">The base theme.</param>
+    /// <param name="category">A simple feature category.</param>
+    /// <param name="priority">Priority for the Module.</param>
+    /// <param name="description">A simple feature description.</param>
+    /// <param name="author">The module author name.</param>
+    /// <param name="semVer">Semantic Version string.</param>
+    /// <param name="websiteUrl">The module website URL.</param>
+    /// <param name="featureDependencies">Zero or more delimited feature dependencies,
+    /// corresponding to each of the feature <see cref="FeatureAttribute.Name"/>
+    /// properties.</param>
+    /// <param name="tags">Tags associated with the Module.</param>
+    /// <param name="defaultTenant">Whether considered default tenant only.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    /// <param name="alwaysEnabled">Whether feature is always enabled.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    /// <see cref="!:https://semver.org">Semantic Versioning.</see>
+    /// <remarks>At least <paramref name="author" /> expected herein to differentiate with
+    /// parameterless ctor.</remarks>
+    /// <param name="enabledByDependencyOnly">Whether feature is enabled by dependency only.
+    /// Supported types are <see cref="string"/> and <see cref="bool"/> only.</param>
+    public ThemeAttribute(
+        string id,
+        string name,
+        string baseTheme,
+        string category,
+        string priority,
+        string description,
+        string author,
+        string semVer,
+        string websiteUrl,
+        string featureDependencies,
+        string tags,
+        object defaultTenant,
+        object alwaysEnabled,
+        object enabledByDependencyOnly
+    ) : base(
+        id,
+        name,
+        category,
+        priority,
+        description,
+        author,
+        semVer,
+        websiteUrl,
+        featureDependencies,
+        tags,
+        defaultTenant,
+        alwaysEnabled,
+        enabledByDependencyOnly
+    )
+    {
+        BaseTheme = baseTheme;
+    }
 
-        private string _baseTheme;
+    private string _baseTheme;
 
-        /// <summary>
-        /// Gets or sets the Base Theme if the theme is derived from an existing one.
-        /// </summary>
-        public string BaseTheme
-        {
-            get => _baseTheme;
-            // Only case we need to be concerned about is Null, everything else we Trim up front
-            set => _baseTheme = (value ?? DefaultBaseTheme).Trim();
-        }
+    /// <summary>
+    /// Gets or sets the Base Theme if the theme is derived from an existing one.
+    /// </summary>
+    public string BaseTheme
+    {
+        get => _baseTheme;
+        // Only case we need to be concerned about is Null, everything else we Trim up front
+        set => _baseTheme = (value ?? DefaultBaseTheme).Trim();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/ControllerModelUpdater.cs b/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/ControllerModelUpdater.cs
index f2ebe2dd9f9..f06a5b55c13 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/ControllerModelUpdater.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/ControllerModelUpdater.cs
@@ -4,42 +4,41 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.DisplayManagement.ModelBinding
+namespace OrchardCore.DisplayManagement.ModelBinding;
+
+public class ControllerModelUpdater : IUpdateModel
 {
-    public class ControllerModelUpdater : IUpdateModel
+    private readonly Controller _controller;
+
+    public ControllerModelUpdater(Controller controller)
+    {
+        _controller = controller;
+    }
+
+    public ModelStateDictionary ModelState => _controller.ModelState;
+
+    public Task<bool> TryUpdateModelAsync<TModel>(TModel model) where TModel : class
+    {
+        return _controller.TryUpdateModelAsync<TModel>(model);
+    }
+
+    public Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix) where TModel : class
+    {
+        return _controller.TryUpdateModelAsync<TModel>(model, prefix);
+    }
+
+    public Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix, params Expression<Func<TModel, object>>[] includeExpressions) where TModel : class
+    {
+        return _controller.TryUpdateModelAsync<TModel>(model, prefix, includeExpressions);
+    }
+
+    public bool TryValidateModel(object model)
+    {
+        return _controller.TryValidateModel(model);
+    }
+
+    public bool TryValidateModel(object model, string prefix)
     {
-        private readonly Controller _controller;
-
-        public ControllerModelUpdater(Controller controller)
-        {
-            _controller = controller;
-        }
-
-        public ModelStateDictionary ModelState => _controller.ModelState;
-
-        public Task<bool> TryUpdateModelAsync<TModel>(TModel model) where TModel : class
-        {
-            return _controller.TryUpdateModelAsync<TModel>(model);
-        }
-
-        public Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix) where TModel : class
-        {
-            return _controller.TryUpdateModelAsync<TModel>(model, prefix);
-        }
-
-        public Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix, params Expression<Func<TModel, object>>[] includeExpressions) where TModel : class
-        {
-            return _controller.TryUpdateModelAsync<TModel>(model, prefix, includeExpressions);
-        }
-
-        public bool TryValidateModel(object model)
-        {
-            return _controller.TryValidateModel(model);
-        }
-
-        public bool TryValidateModel(object model, string prefix)
-        {
-            return _controller.TryValidateModel(model, prefix);
-        }
+        return _controller.TryValidateModel(model, prefix);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/LocalModelBinderAccessor.cs b/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/LocalModelBinderAccessor.cs
index 7751814ce0f..dc64cc6a5f3 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/LocalModelBinderAccessor.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/LocalModelBinderAccessor.cs
@@ -1,26 +1,25 @@
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.DisplayManagement.ModelBinding
+namespace OrchardCore.DisplayManagement.ModelBinding;
+
+public class LocalModelBinderAccessor : IUpdateModelAccessor
 {
-    public class LocalModelBinderAccessor : IUpdateModelAccessor
+    private static readonly object _key = typeof(LocalModelBinderAccessor);
+    private readonly IHttpContextAccessor _httpContextAccessor;
+
+    public LocalModelBinderAccessor(IHttpContextAccessor httpContextAccessor)
     {
-        private static readonly object _key = typeof(LocalModelBinderAccessor);
-        private readonly IHttpContextAccessor _httpContextAccessor;
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        public LocalModelBinderAccessor(IHttpContextAccessor httpContextAccessor)
+    public IUpdateModel ModelUpdater
+    {
+        get
         {
-            _httpContextAccessor = httpContextAccessor;
+            var updateModel = _httpContextAccessor.HttpContext.Items[_key] as IUpdateModel;
+            return updateModel ?? new NullModelUpdater();
         }
 
-        public IUpdateModel ModelUpdater
-        {
-            get
-            {
-                var updateModel = _httpContextAccessor.HttpContext.Items[_key] as IUpdateModel;
-                return updateModel ?? new NullModelUpdater();
-            }
-
-            set { _httpContextAccessor.HttpContext.Items[_key] = value; }
-        }
+        set { _httpContextAccessor.HttpContext.Items[_key] = value; }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/ModelBinderAccessorFilter.cs b/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/ModelBinderAccessorFilter.cs
index e55da72756b..a83043038c6 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/ModelBinderAccessorFilter.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/ModelBinderAccessorFilter.cs
@@ -3,41 +3,40 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace OrchardCore.DisplayManagement.ModelBinding
+namespace OrchardCore.DisplayManagement.ModelBinding;
+
+public sealed class ModelBinderAccessorFilter : IActionFilter, IPageFilter
 {
-    public sealed class ModelBinderAccessorFilter : IActionFilter, IPageFilter
+    public void OnActionExecuted(ActionExecutedContext context)
     {
-        public void OnActionExecuted(ActionExecutedContext context)
-        {
-        }
-
-        public void OnActionExecuting(ActionExecutingContext context)
-        {
-            var controller = context.Controller as Controller;
-            if (controller != null)
-            {
-                var modelBinderAccessor = context.HttpContext.RequestServices.GetRequiredService<IUpdateModelAccessor>();
-                modelBinderAccessor.ModelUpdater = new ControllerModelUpdater(controller);
-            }
-        }
+    }
 
-        public void OnPageHandlerSelected(PageHandlerSelectedContext context)
+    public void OnActionExecuting(ActionExecutingContext context)
+    {
+        var controller = context.Controller as Controller;
+        if (controller != null)
         {
+            var modelBinderAccessor = context.HttpContext.RequestServices.GetRequiredService<IUpdateModelAccessor>();
+            modelBinderAccessor.ModelUpdater = new ControllerModelUpdater(controller);
         }
+    }
 
-        public void OnPageHandlerExecuting(PageHandlerExecutingContext context)
-        {
-            var page = context.HandlerInstance as PageModel;
+    public void OnPageHandlerSelected(PageHandlerSelectedContext context)
+    {
+    }
 
-            if (page != null)
-            {
-                var modelBinderAccessor = context.HttpContext.RequestServices.GetRequiredService<IUpdateModelAccessor>();
-                modelBinderAccessor.ModelUpdater = new PageModelUpdater(page);
-            }
-        }
+    public void OnPageHandlerExecuting(PageHandlerExecutingContext context)
+    {
+        var page = context.HandlerInstance as PageModel;
 
-        public void OnPageHandlerExecuted(PageHandlerExecutedContext context)
+        if (page != null)
         {
+            var modelBinderAccessor = context.HttpContext.RequestServices.GetRequiredService<IUpdateModelAccessor>();
+            modelBinderAccessor.ModelUpdater = new PageModelUpdater(page);
         }
     }
+
+    public void OnPageHandlerExecuted(PageHandlerExecutedContext context)
+    {
+    }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/ModelStateWrapperUpdater.cs b/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/ModelStateWrapperUpdater.cs
index 182b026a110..38a1010ab26 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/ModelStateWrapperUpdater.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/ModelStateWrapperUpdater.cs
@@ -3,57 +3,56 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.DisplayManagement.ModelBinding
+namespace OrchardCore.DisplayManagement.ModelBinding;
+
+public class ModelStateWrapperUpdater : IUpdateModel
 {
-    public class ModelStateWrapperUpdater : IUpdateModel
+    private readonly IUpdateModel _updater;
+    private readonly ModelStateDictionary _commonModelState;
+
+    public ModelStateWrapperUpdater(IUpdateModel updateModel)
+    {
+        _updater = updateModel;
+        _commonModelState = new ModelStateDictionary();
+    }
+
+    public ModelStateDictionary ModelState => _updater.ModelState;
+
+    public Task<bool> TryUpdateModelAsync<TModel>(TModel model) where TModel : class
+    {
+        return PreserveModelState(() => _updater.TryUpdateModelAsync(model));
+    }
+
+    public Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix) where TModel : class
+    {
+        return PreserveModelState(() => _updater.TryUpdateModelAsync(model, prefix));
+    }
+
+    public Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix, params Expression<Func<TModel, object>>[] includeExpressions) where TModel : class
     {
-        private readonly IUpdateModel _updater;
-        private readonly ModelStateDictionary _commonModelState;
-
-        public ModelStateWrapperUpdater(IUpdateModel updateModel)
-        {
-            _updater = updateModel;
-            _commonModelState = new ModelStateDictionary();
-        }
-
-        public ModelStateDictionary ModelState => _updater.ModelState;
-
-        public Task<bool> TryUpdateModelAsync<TModel>(TModel model) where TModel : class
-        {
-            return PreserveModelState(() => _updater.TryUpdateModelAsync(model));
-        }
-
-        public Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix) where TModel : class
-        {
-            return PreserveModelState(() => _updater.TryUpdateModelAsync(model, prefix));
-        }
-
-        public Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix, params Expression<Func<TModel, object>>[] includeExpressions) where TModel : class
-        {
-            return PreserveModelState(() => _updater.TryUpdateModelAsync(model, prefix, includeExpressions));
-        }
-
-        public bool TryValidateModel(object model)
-        {
-            return PreserveModelState(() => _updater.TryValidateModel(model));
-        }
-
-        public bool TryValidateModel(object model, string prefix)
-        {
-            return PreserveModelState(() => _updater.TryValidateModel(model, prefix));
-        }
-
-        private T PreserveModelState<T>(Func<T> action)
-        {
-            // Passing a clean ModelState to child contentItem.
-            _commonModelState.Merge(_updater.ModelState);
-            _updater.ModelState.Clear();
-
-            var result = action();
-
-            _updater.ModelState.Merge(_commonModelState);
-
-            return result;
-        }
+        return PreserveModelState(() => _updater.TryUpdateModelAsync(model, prefix, includeExpressions));
+    }
+
+    public bool TryValidateModel(object model)
+    {
+        return PreserveModelState(() => _updater.TryValidateModel(model));
+    }
+
+    public bool TryValidateModel(object model, string prefix)
+    {
+        return PreserveModelState(() => _updater.TryValidateModel(model, prefix));
+    }
+
+    private T PreserveModelState<T>(Func<T> action)
+    {
+        // Passing a clean ModelState to child contentItem.
+        _commonModelState.Merge(_updater.ModelState);
+        _updater.ModelState.Clear();
+
+        var result = action();
+
+        _updater.ModelState.Merge(_commonModelState);
+
+        return result;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/NullModelUpdater.cs b/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/NullModelUpdater.cs
index 908e777f267..972d3193f2f 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/NullModelUpdater.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/NullModelUpdater.cs
@@ -3,19 +3,18 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.DisplayManagement.ModelBinding
+namespace OrchardCore.DisplayManagement.ModelBinding;
+
+public class NullModelUpdater : IUpdateModel
 {
-    public class NullModelUpdater : IUpdateModel
+    public NullModelUpdater()
     {
-        public NullModelUpdater()
-        {
-        }
-
-        public ModelStateDictionary ModelState { get; } = new ModelStateDictionary();
-        public Task<bool> TryUpdateModelAsync<TModel>(TModel model) where TModel : class => Task.FromResult(true);
-        public Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix) where TModel : class => Task.FromResult(true);
-        public Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix, params Expression<Func<TModel, object>>[] includeExpressions) where TModel : class => Task.FromResult(true);
-        public bool TryValidateModel(object model) => true;
-        public bool TryValidateModel(object model, string prefix) => true;
     }
+
+    public ModelStateDictionary ModelState { get; } = new ModelStateDictionary();
+    public Task<bool> TryUpdateModelAsync<TModel>(TModel model) where TModel : class => Task.FromResult(true);
+    public Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix) where TModel : class => Task.FromResult(true);
+    public Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix, params Expression<Func<TModel, object>>[] includeExpressions) where TModel : class => Task.FromResult(true);
+    public bool TryValidateModel(object model) => true;
+    public bool TryValidateModel(object model, string prefix) => true;
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/PageModelUpdater.cs b/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/PageModelUpdater.cs
index dfb6ec59f59..9e95cb2fe80 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/PageModelUpdater.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/PageModelUpdater.cs
@@ -3,19 +3,18 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace OrchardCore.DisplayManagement.ModelBinding
+namespace OrchardCore.DisplayManagement.ModelBinding;
+
+public class PageModelUpdater : PageModel, IUpdateModel
 {
-    public class PageModelUpdater : PageModel, IUpdateModel
-    {
-        public PageModelUpdater(PageModel page) => PageContext = page.PageContext;
+    public PageModelUpdater(PageModel page) => PageContext = page.PageContext;
 
-        public new Task<bool> TryUpdateModelAsync<TModel>(TModel model) where TModel : class
-            => base.TryUpdateModelAsync(model);
+    public new Task<bool> TryUpdateModelAsync<TModel>(TModel model) where TModel : class
+        => base.TryUpdateModelAsync(model);
 
-        public new Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix) where TModel : class
-            => base.TryUpdateModelAsync(model, prefix);
+    public new Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix) where TModel : class
+        => base.TryUpdateModelAsync(model, prefix);
 
-        public new Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix, params Expression<Func<TModel, object>>[] includeExpressions) where TModel : class
-            => base.TryUpdateModelAsync(model, prefix, includeExpressions);
-    }
+    public new Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix, params Expression<Func<TModel, object>>[] includeExpressions) where TModel : class
+        => base.TryUpdateModelAsync(model, prefix, includeExpressions);
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/PrefixedModelUpdater.cs b/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/PrefixedModelUpdater.cs
index 64cf746cae6..f9e9fd247ff 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/PrefixedModelUpdater.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/ModelBinding/PrefixedModelUpdater.cs
@@ -3,38 +3,37 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.DisplayManagement.ModelBinding
+namespace OrchardCore.DisplayManagement.ModelBinding;
+
+public class PrefixedModelUpdater : IUpdateModel
 {
-    public class PrefixedModelUpdater : IUpdateModel
-    {
-        private readonly IUpdateModel _updateModel;
+    private readonly IUpdateModel _updateModel;
 
-        public PrefixedModelUpdater(IUpdateModel updateModel) : this(updateModel, x => x)
-        {
-        }
+    public PrefixedModelUpdater(IUpdateModel updateModel) : this(updateModel, x => x)
+    {
+    }
 
-        public PrefixedModelUpdater(IUpdateModel updateModel, Func<string, string> prefix)
-        {
-            _updateModel = updateModel;
-            Prefix = prefix;
-        }
+    public PrefixedModelUpdater(IUpdateModel updateModel, Func<string, string> prefix)
+    {
+        _updateModel = updateModel;
+        Prefix = prefix;
+    }
 
-        public ModelStateDictionary ModelState => _updateModel.ModelState;
+    public ModelStateDictionary ModelState => _updateModel.ModelState;
 
-        public Func<string, string> Prefix { get; set; }
+    public Func<string, string> Prefix { get; set; }
 
-        public Task<bool> TryUpdateModelAsync<TModel>(TModel model) where TModel : class
-            => _updateModel.TryUpdateModelAsync(model);
+    public Task<bool> TryUpdateModelAsync<TModel>(TModel model) where TModel : class
+        => _updateModel.TryUpdateModelAsync(model);
 
-        public Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix) where TModel : class
-            => _updateModel.TryUpdateModelAsync(Prefix(prefix));
+    public Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix) where TModel : class
+        => _updateModel.TryUpdateModelAsync(Prefix(prefix));
 
-        public Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix, params Expression<Func<TModel, object>>[] includeExpressions) where TModel : class
-            => _updateModel.TryUpdateModelAsync(model, Prefix(prefix), includeExpressions);
+    public Task<bool> TryUpdateModelAsync<TModel>(TModel model, string prefix, params Expression<Func<TModel, object>>[] includeExpressions) where TModel : class
+        => _updateModel.TryUpdateModelAsync(model, Prefix(prefix), includeExpressions);
 
-        public bool TryValidateModel(object model) => _updateModel.TryValidateModel(model);
+    public bool TryValidateModel(object model) => _updateModel.TryValidateModel(model);
 
-        public bool TryValidateModel(object model, string prefix)
-            => _updateModel.TryValidateModel(model, Prefix(prefix));
-    }
+    public bool TryValidateModel(object model, string prefix)
+        => _updateModel.TryValidateModel(model, Prefix(prefix));
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Notify/INotifier.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Notify/INotifier.cs
index fb7c438eb30..548cc063dda 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Notify/INotifier.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Notify/INotifier.cs
@@ -3,31 +3,30 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Localization;
 
-namespace OrchardCore.DisplayManagement.Notify
+namespace OrchardCore.DisplayManagement.Notify;
+
+/// <summary>
+/// Notification manager for UI notifications.
+/// </summary>
+/// <remarks>
+/// Where such notifications are displayed depends on the theme used. Default themes contain a
+/// Messages zone for this.
+/// </remarks>
+public interface INotifier
 {
     /// <summary>
-    /// Notification manager for UI notifications.
+    /// Adds a new UI notification asynchronously.
     /// </summary>
+    /// <param name="type">
+    /// The type of the notification (notifications with different types can be displayed differently).</param>
+    /// <param name="message">A localized message to display.</param>
     /// <remarks>
-    /// Where such notifications are displayed depends on the theme used. Default themes contain a
-    /// Messages zone for this.
+    /// Added with a default interface implementation for backwards compatibility.
     /// </remarks>
-    public interface INotifier
-    {
-        /// <summary>
-        /// Adds a new UI notification asynchronously.
-        /// </summary>
-        /// <param name="type">
-        /// The type of the notification (notifications with different types can be displayed differently).</param>
-        /// <param name="message">A localized message to display.</param>
-        /// <remarks>
-        /// Added with a default interface implementation for backwards compatibility.
-        /// </remarks>
-        ValueTask AddAsync(NotifyType type, LocalizedHtmlString message);
+    ValueTask AddAsync(NotifyType type, LocalizedHtmlString message);
 
-        /// <summary>
-        /// Get all notifications added.
-        /// </summary>
-        IList<NotifyEntry> List();
-    }
+    /// <summary>
+    /// Get all notifications added.
+    /// </summary>
+    IList<NotifyEntry> List();
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Notify/Notifier.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Notify/Notifier.cs
index 79e41324c1a..b68b41d71f6 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Notify/Notifier.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Notify/Notifier.cs
@@ -3,28 +3,27 @@
 using Microsoft.AspNetCore.Mvc.Localization;
 using Microsoft.Extensions.Logging;
 
-namespace OrchardCore.DisplayManagement.Notify
-{
-    public class Notifier : INotifier
-    {
-        private readonly List<NotifyEntry> _entries = [];
-        private readonly ILogger _logger;
+namespace OrchardCore.DisplayManagement.Notify;
 
-        public Notifier(ILogger<Notifier> logger)
-        {
-            _logger = logger;
-        }
+public class Notifier : INotifier
+{
+    private readonly List<NotifyEntry> _entries = [];
+    private readonly ILogger _logger;
 
-        public ValueTask AddAsync(NotifyType type, LocalizedHtmlString message)
-        {
-            _logger.LogInformation("Notification '{NotificationType}' with message '{NotificationMessage}'", type, message);
+    public Notifier(ILogger<Notifier> logger)
+    {
+        _logger = logger;
+    }
 
-            _entries.Add(new NotifyEntry { Type = type, Message = message });
+    public ValueTask AddAsync(NotifyType type, LocalizedHtmlString message)
+    {
+        _logger.LogInformation("Notification '{NotificationType}' with message '{NotificationMessage}'", type, message);
 
-            return ValueTask.CompletedTask;
-        }
+        _entries.Add(new NotifyEntry { Type = type, Message = message });
 
-        public IList<NotifyEntry> List()
-            => _entries;
+        return ValueTask.CompletedTask;
     }
+
+    public IList<NotifyEntry> List()
+        => _entries;
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifierExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifierExtensions.cs
index a43e38f427c..288ca4ebbd6 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifierExtensions.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifierExtensions.cs
@@ -1,44 +1,43 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Localization;
 
-namespace OrchardCore.DisplayManagement.Notify
+namespace OrchardCore.DisplayManagement.Notify;
+
+public static class NotifierExtensions
 {
-    public static class NotifierExtensions
-    {
-        /// <summary>
-        /// Adds a new UI notification of type Information.
-        /// </summary>
-        /// <seealso cref="INotifier.AddAsync"/>
-        /// <param name="notifier">The <see cref="INotifier"/>.</param>
-        /// <param name="message">A localized message to display.</param>
-        public static ValueTask InformationAsync(this INotifier notifier, LocalizedHtmlString message)
-            => notifier.AddAsync(NotifyType.Information, message);
+    /// <summary>
+    /// Adds a new UI notification of type Information.
+    /// </summary>
+    /// <seealso cref="INotifier.AddAsync"/>
+    /// <param name="notifier">The <see cref="INotifier"/>.</param>
+    /// <param name="message">A localized message to display.</param>
+    public static ValueTask InformationAsync(this INotifier notifier, LocalizedHtmlString message)
+        => notifier.AddAsync(NotifyType.Information, message);
 
-        /// <summary>
-        /// Adds a new UI notification of type Warning.
-        /// </summary>
-        /// <seealso cref="INotifier.AddAsync"/>
-        /// <param name="notifier">The <see cref="INotifier"/>.</param>
-        /// <param name="message">A localized message to display.</param>
-        public static ValueTask WarningAsync(this INotifier notifier, LocalizedHtmlString message)
-            => notifier.AddAsync(NotifyType.Warning, message);
+    /// <summary>
+    /// Adds a new UI notification of type Warning.
+    /// </summary>
+    /// <seealso cref="INotifier.AddAsync"/>
+    /// <param name="notifier">The <see cref="INotifier"/>.</param>
+    /// <param name="message">A localized message to display.</param>
+    public static ValueTask WarningAsync(this INotifier notifier, LocalizedHtmlString message)
+        => notifier.AddAsync(NotifyType.Warning, message);
 
-        /// <summary>
-        /// Adds a new UI notification of type Error.
-        /// </summary>
-        /// <seealso cref="INotifier.AddAsync"/>
-        /// <param name="notifier">The <see cref="INotifier"/>.</param>
-        /// <param name="message">A localized message to display.</param>
-        public static ValueTask ErrorAsync(this INotifier notifier, LocalizedHtmlString message)
-            => notifier.AddAsync(NotifyType.Error, message);
+    /// <summary>
+    /// Adds a new UI notification of type Error.
+    /// </summary>
+    /// <seealso cref="INotifier.AddAsync"/>
+    /// <param name="notifier">The <see cref="INotifier"/>.</param>
+    /// <param name="message">A localized message to display.</param>
+    public static ValueTask ErrorAsync(this INotifier notifier, LocalizedHtmlString message)
+        => notifier.AddAsync(NotifyType.Error, message);
 
-        /// <summary>
-        /// Adds a new UI notification of type Success.
-        /// </summary>
-        /// <seealso cref="INotifier.AddAsync"/>
-        /// <param name="notifier">The <see cref="INotifier"/>.</param>
-        /// <param name="message">A localized message to display.</param>
-        public static ValueTask SuccessAsync(this INotifier notifier, LocalizedHtmlString message)
-            => notifier.AddAsync(NotifyType.Success, message);
-    }
+    /// <summary>
+    /// Adds a new UI notification of type Success.
+    /// </summary>
+    /// <seealso cref="INotifier.AddAsync"/>
+    /// <param name="notifier">The <see cref="INotifier"/>.</param>
+    /// <param name="message">A localized message to display.</param>
+    public static ValueTask SuccessAsync(this INotifier notifier, LocalizedHtmlString message)
+        => notifier.AddAsync(NotifyType.Success, message);
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifyEntry.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifyEntry.cs
index 11d71a347e2..de2269bb556 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifyEntry.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifyEntry.cs
@@ -3,52 +3,51 @@
 using Cysharp.Text;
 using Microsoft.AspNetCore.Html;
 
-namespace OrchardCore.DisplayManagement.Notify
+namespace OrchardCore.DisplayManagement.Notify;
+
+public enum NotifyType
 {
-    public enum NotifyType
-    {
-        Success,
-        Information,
-        Warning,
-        Error
-    }
+    Success,
+    Information,
+    Warning,
+    Error
+}
 
-    public class NotifyEntry
-    {
-        private (HtmlEncoder HtmlEncoder, string Message) _cache;
+public class NotifyEntry
+{
+    private (HtmlEncoder HtmlEncoder, string Message) _cache;
 
-        public NotifyType Type { get; set; }
-        public IHtmlContent Message { get; set; }
+    public NotifyType Type { get; set; }
+    public IHtmlContent Message { get; set; }
 
-        public string ToHtmlString(HtmlEncoder htmlEncoder)
-        {
-            // When the object is created from a cookie the message
-            // is an HtmlString so we can use this instead of using
-            // the TextWriter path.
+    public string ToHtmlString(HtmlEncoder htmlEncoder)
+    {
+        // When the object is created from a cookie the message
+        // is an HtmlString so we can use this instead of using
+        // the TextWriter path.
 
-            if (Message is IHtmlString htmlString)
-            {
-                return htmlString.ToHtmlString();
-            }
+        if (Message is IHtmlString htmlString)
+        {
+            return htmlString.ToHtmlString();
+        }
 
-            // Cache the encoded version for the specified encoder.
-            // This is necessary as long as there will be string-based comparisons
-            // and the need of NotifyEntryComparer
+        // Cache the encoded version for the specified encoder.
+        // This is necessary as long as there will be string-based comparisons
+        // and the need of NotifyEntryComparer
 
-            var cache = _cache;
+        var cache = _cache;
 
-            if (cache.Message != null && cache.HtmlEncoder == htmlEncoder)
-            {
-                return cache.Message;
-            }
+        if (cache.Message != null && cache.HtmlEncoder == htmlEncoder)
+        {
+            return cache.Message;
+        }
 
-            using var stringWriter = new ZStringWriter();
-            Message.WriteTo(stringWriter, htmlEncoder);
-            stringWriter.Flush();
+        using var stringWriter = new ZStringWriter();
+        Message.WriteTo(stringWriter, htmlEncoder);
+        stringWriter.Flush();
 
-            _cache = cache = new(htmlEncoder, stringWriter.ToString());
+        _cache = cache = new(htmlEncoder, stringWriter.ToString());
 
-            return cache.Message;
-        }
+        return cache.Message;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifyEntryComparer.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifyEntryComparer.cs
index 9a718082bc0..9ff9ef58d8e 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifyEntryComparer.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifyEntryComparer.cs
@@ -2,25 +2,24 @@
 using System.Collections.Generic;
 using System.Text.Encodings.Web;
 
-namespace OrchardCore.DisplayManagement.Notify
+namespace OrchardCore.DisplayManagement.Notify;
+
+internal sealed class NotifyEntryComparer : IEqualityComparer<NotifyEntry>
 {
-    internal sealed class NotifyEntryComparer : IEqualityComparer<NotifyEntry>
-    {
-        private readonly HtmlEncoder _htmlEncoder;
+    private readonly HtmlEncoder _htmlEncoder;
 
-        public NotifyEntryComparer(HtmlEncoder htmlEncoder)
-        {
-            _htmlEncoder = htmlEncoder;
-        }
+    public NotifyEntryComparer(HtmlEncoder htmlEncoder)
+    {
+        _htmlEncoder = htmlEncoder;
+    }
 
-        public bool Equals(NotifyEntry x, NotifyEntry y)
-        {
-            return x.Type == y.Type && x.ToHtmlString(_htmlEncoder) == y.ToHtmlString(_htmlEncoder);
-        }
+    public bool Equals(NotifyEntry x, NotifyEntry y)
+    {
+        return x.Type == y.Type && x.ToHtmlString(_htmlEncoder) == y.ToHtmlString(_htmlEncoder);
+    }
 
-        public int GetHashCode(NotifyEntry obj)
-        {
-            return HashCode.Combine(obj.ToHtmlString(_htmlEncoder), obj.Type);
-        }
+    public int GetHashCode(NotifyEntry obj)
+    {
+        return HashCode.Combine(obj.ToHtmlString(_htmlEncoder), obj.Type);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifyEntryConverter.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifyEntryConverter.cs
index 9446ec8df7e..f23b68f5853 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifyEntryConverter.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifyEntryConverter.cs
@@ -5,54 +5,53 @@
 using System.Text.Json.Serialization;
 using Microsoft.AspNetCore.Html;
 
-namespace OrchardCore.DisplayManagement.Notify
+namespace OrchardCore.DisplayManagement.Notify;
+
+public class NotifyEntryConverter : JsonConverter<NotifyEntry>
 {
-    public class NotifyEntryConverter : JsonConverter<NotifyEntry>
+    private readonly HtmlEncoder _htmlEncoder;
+
+    public NotifyEntryConverter(HtmlEncoder htmlEncoder)
     {
-        private readonly HtmlEncoder _htmlEncoder;
+        _htmlEncoder = htmlEncoder;
+    }
 
-        public NotifyEntryConverter(HtmlEncoder htmlEncoder)
-        {
-            _htmlEncoder = htmlEncoder;
-        }
+    public override bool CanConvert(Type objectType)
+    {
+        return typeof(NotifyEntry).IsAssignableFrom(objectType);
+    }
 
-        public override bool CanConvert(Type objectType)
-        {
-            return typeof(NotifyEntry).IsAssignableFrom(objectType);
-        }
+    public override NotifyEntry Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        var jo = JObject.Load(ref reader);
 
-        public override NotifyEntry Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        var notifyEntry = new NotifyEntry
         {
-            var jo = JObject.Load(ref reader);
+            Message = new HtmlString(jo.Value<string>("Message")),
+        };
 
-            var notifyEntry = new NotifyEntry
-            {
-                Message = new HtmlString(jo.Value<string>("Message")),
-            };
+        if (Enum.TryParse<NotifyType>(jo.Value<string>("Type"), out var type))
+        {
+            notifyEntry.Type = type;
+        }
 
-            if (Enum.TryParse<NotifyType>(jo.Value<string>("Type"), out var type))
-            {
-                notifyEntry.Type = type;
-            }
+        return notifyEntry;
+    }
 
-            return notifyEntry;
+    public override void Write(Utf8JsonWriter writer, NotifyEntry value, JsonSerializerOptions options)
+    {
+        var notifyEntry = value;
+        if (notifyEntry == null)
+        {
+            return;
         }
 
-        public override void Write(Utf8JsonWriter writer, NotifyEntry value, JsonSerializerOptions options)
+        var o = new JsonObject
         {
-            var notifyEntry = value;
-            if (notifyEntry == null)
-            {
-                return;
-            }
-
-            var o = new JsonObject
-            {
-                { nameof(NotifyEntry.Type), notifyEntry.Type.ToString() },
-                { nameof(NotifyEntry.Message), notifyEntry.ToHtmlString(_htmlEncoder) }
-            };
-
-            o.WriteTo(writer);
-        }
+            { nameof(NotifyEntry.Type), notifyEntry.Type.ToString() },
+            { nameof(NotifyEntry.Message), notifyEntry.ToHtmlString(_htmlEncoder) }
+        };
+
+        o.WriteTo(writer);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifyFilter.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifyFilter.cs
index 6439677de23..8e1999d0754 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifyFilter.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Notify/NotifyFilter.cs
@@ -12,210 +12,209 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.DisplayManagement.Layout;
 
-namespace OrchardCore.DisplayManagement.Notify
+namespace OrchardCore.DisplayManagement.Notify;
+
+public sealed class NotifyFilter : IActionFilter, IAsyncResultFilter, IPageFilter
 {
-    public sealed class NotifyFilter : IActionFilter, IAsyncResultFilter, IPageFilter
+    public const string CookiePrefix = "orch_notify";
+
+    private readonly INotifier _notifier;
+    private readonly IShapeFactory _shapeFactory;
+    private readonly ILayoutAccessor _layoutAccessor;
+    private readonly IDataProtectionProvider _dataProtectionProvider;
+    private readonly HtmlEncoder _htmlEncoder;
+    private readonly IOptions<NotifyJsonSerializerOptions> _notifyJsonSerializerOptions;
+    private readonly ILogger _logger;
+
+    private NotifyEntry[] _existingEntries = [];
+    private bool _shouldDeleteCookie;
+
+    public NotifyFilter(
+        INotifier notifier,
+        IShapeFactory shapeFactory,
+        ILayoutAccessor layoutAccessor,
+        IDataProtectionProvider dataProtectionProvider,
+        HtmlEncoder htmlEncoder,
+        IOptions<NotifyJsonSerializerOptions> notifyJsonSerializerOptions,
+        ILogger<NotifyFilter> logger)
     {
-        public const string CookiePrefix = "orch_notify";
-
-        private readonly INotifier _notifier;
-        private readonly IShapeFactory _shapeFactory;
-        private readonly ILayoutAccessor _layoutAccessor;
-        private readonly IDataProtectionProvider _dataProtectionProvider;
-        private readonly HtmlEncoder _htmlEncoder;
-        private readonly IOptions<NotifyJsonSerializerOptions> _notifyJsonSerializerOptions;
-        private readonly ILogger _logger;
-
-        private NotifyEntry[] _existingEntries = [];
-        private bool _shouldDeleteCookie;
-
-        public NotifyFilter(
-            INotifier notifier,
-            IShapeFactory shapeFactory,
-            ILayoutAccessor layoutAccessor,
-            IDataProtectionProvider dataProtectionProvider,
-            HtmlEncoder htmlEncoder,
-            IOptions<NotifyJsonSerializerOptions> notifyJsonSerializerOptions,
-            ILogger<NotifyFilter> logger)
-        {
-            _notifier = notifier;
-            _shapeFactory = shapeFactory;
-            _layoutAccessor = layoutAccessor;
-            _dataProtectionProvider = dataProtectionProvider;
-            _htmlEncoder = htmlEncoder;
-            _notifyJsonSerializerOptions = notifyJsonSerializerOptions;
-            _logger = logger;
-        }
+        _notifier = notifier;
+        _shapeFactory = shapeFactory;
+        _layoutAccessor = layoutAccessor;
+        _dataProtectionProvider = dataProtectionProvider;
+        _htmlEncoder = htmlEncoder;
+        _notifyJsonSerializerOptions = notifyJsonSerializerOptions;
+        _logger = logger;
+    }
 
-        private void OnHandlerExecuting(FilterContext filterContext)
+    private void OnHandlerExecuting(FilterContext filterContext)
+    {
+        if (!filterContext.HttpContext.Request.Cookies.TryGetValue(CookiePrefix, out var messages))
         {
-            if (!filterContext.HttpContext.Request.Cookies.TryGetValue(CookiePrefix, out var messages))
-            {
-                return;
-            }
-
-            if (string.IsNullOrEmpty(messages))
-            {
-                return;
-            }
-
-            DeserializeNotifyEntries(messages, out var messageEntries);
-
-            if (messageEntries == null)
-            {
-                // An error occurred during deserialization.
-                _shouldDeleteCookie = true;
-                return;
-            }
-
-            if (messageEntries.Length == 0)
-            {
-                return;
-            }
-
-            // Make the notifications available for the rest of the current request.
-            _existingEntries = messageEntries;
+            return;
         }
 
-        private void OnHandlerExecuted(FilterContext filterContext)
+        if (string.IsNullOrEmpty(messages))
         {
-            var messageEntries = _notifier.List();
-
-            // Don't touch temp data if there's no work to perform.
-            if (messageEntries.Count == 0 && _existingEntries.Length == 0)
-            {
-                return;
-            }
-
-            // Assign values to the Items collection instead of TempData and
-            // combine any existing entries added by the previous request with new ones.
-
-            _existingEntries = messageEntries.Concat(_existingEntries).Distinct(new NotifyEntryComparer(_htmlEncoder)).ToArray();
-            object result = filterContext is ActionExecutedContext ace ? ace.Result : ((PageHandlerExecutedContext)filterContext).Result;
-            // Result is not a view, so assume a redirect and assign values to TemData.
-            // String data type used instead of complex array to be session-friendly.
-            if (result is not ViewResult && result is not PageResult && _existingEntries.Length > 0)
-            {
-                filterContext.HttpContext.Response.Cookies.Append(CookiePrefix, SerializeNotifyEntry(_existingEntries), GetCookieOptions(filterContext.HttpContext));
-            }
+            return;
         }
 
-        #region Interface wrappers
+        DeserializeNotifyEntries(messages, out var messageEntries);
 
-        public void OnActionExecuting(ActionExecutingContext filterContext)
+        if (messageEntries == null)
         {
-            OnHandlerExecuting(filterContext);
+            // An error occurred during deserialization.
+            _shouldDeleteCookie = true;
+            return;
         }
 
-        public void OnActionExecuted(ActionExecutedContext filterContext)
+        if (messageEntries.Length == 0)
         {
-            OnHandlerExecuted(filterContext);
+            return;
         }
 
-        public void OnPageHandlerSelected(PageHandlerSelectedContext context)
-        {
-        }
+        // Make the notifications available for the rest of the current request.
+        _existingEntries = messageEntries;
+    }
 
-        public void OnPageHandlerExecuting(PageHandlerExecutingContext filterContext)
-        {
-            OnHandlerExecuting(filterContext);
-        }
+    private void OnHandlerExecuted(FilterContext filterContext)
+    {
+        var messageEntries = _notifier.List();
 
-        public void OnPageHandlerExecuted(PageHandlerExecutedContext context)
+        // Don't touch temp data if there's no work to perform.
+        if (messageEntries.Count == 0 && _existingEntries.Length == 0)
         {
-            OnHandlerExecuted(context);
+            return;
         }
 
-        #endregion
+        // Assign values to the Items collection instead of TempData and
+        // combine any existing entries added by the previous request with new ones.
 
-        public async Task OnResultExecutionAsync(ResultExecutingContext filterContext, ResultExecutionDelegate next)
+        _existingEntries = messageEntries.Concat(_existingEntries).Distinct(new NotifyEntryComparer(_htmlEncoder)).ToArray();
+        object result = filterContext is ActionExecutedContext ace ? ace.Result : ((PageHandlerExecutedContext)filterContext).Result;
+        // Result is not a view, so assume a redirect and assign values to TemData.
+        // String data type used instead of complex array to be session-friendly.
+        if (result is not ViewResult && result is not PageResult && _existingEntries.Length > 0)
         {
-            if (_shouldDeleteCookie)
-            {
-                DeleteCookies(filterContext);
+            filterContext.HttpContext.Response.Cookies.Append(CookiePrefix, SerializeNotifyEntry(_existingEntries), GetCookieOptions(filterContext.HttpContext));
+        }
+    }
 
-                await next();
-                return;
-            }
+    #region Interface wrappers
 
-            if (!filterContext.IsViewOrPageResult())
-            {
-                await next();
-                return;
-            }
+    public void OnActionExecuting(ActionExecutingContext filterContext)
+    {
+        OnHandlerExecuting(filterContext);
+    }
 
-            if (_existingEntries.Length == 0)
-            {
-                await next();
-                return;
-            }
+    public void OnActionExecuted(ActionExecutedContext filterContext)
+    {
+        OnHandlerExecuted(filterContext);
+    }
+
+    public void OnPageHandlerSelected(PageHandlerSelectedContext context)
+    {
+    }
 
-            var layout = await _layoutAccessor.GetLayoutAsync();
+    public void OnPageHandlerExecuting(PageHandlerExecutingContext filterContext)
+    {
+        OnHandlerExecuting(filterContext);
+    }
 
-            var messagesZone = layout.Zones["Messages"];
+    public void OnPageHandlerExecuted(PageHandlerExecutedContext context)
+    {
+        OnHandlerExecuted(context);
+    }
 
-            if (messagesZone is IShape zone)
-            {
-                foreach (var messageEntry in _existingEntries)
-                {
-                    // Also retrieve the actual zone in case it was only a temporary empty zone created on demand.
-                    zone = await zone.AddAsync(await _shapeFactory.CreateAsync("Message", Arguments.From(messageEntry)));
-                }
-            }
+    #endregion
 
+    public async Task OnResultExecutionAsync(ResultExecutingContext filterContext, ResultExecutionDelegate next)
+    {
+        if (_shouldDeleteCookie)
+        {
             DeleteCookies(filterContext);
 
             await next();
+            return;
         }
 
-        private static void DeleteCookies(ResultExecutingContext filterContext)
+        if (!filterContext.IsViewOrPageResult())
         {
-            filterContext.HttpContext.Response.Cookies.Delete(CookiePrefix, GetCookieOptions(filterContext.HttpContext));
+            await next();
+            return;
         }
 
-        private string SerializeNotifyEntry(NotifyEntry[] notifyEntries)
+        if (_existingEntries.Length == 0)
         {
-            try
-            {
-                var protector = _dataProtectionProvider.CreateProtector(nameof(NotifyFilter));
-                var signed = protector.Protect(JConvert.SerializeObject(notifyEntries, _notifyJsonSerializerOptions.Value.SerializerOptions));
-                return WebUtility.UrlEncode(signed);
-            }
-            catch
-            {
-                return null;
-            }
+            await next();
+            return;
         }
 
-        private void DeserializeNotifyEntries(string value, out NotifyEntry[] messageEntries)
+        var layout = await _layoutAccessor.GetLayoutAsync();
+
+        var messagesZone = layout.Zones["Messages"];
+
+        if (messagesZone is IShape zone)
         {
-            try
+            foreach (var messageEntry in _existingEntries)
             {
-                var protector = _dataProtectionProvider.CreateProtector(nameof(NotifyFilter));
-                var decoded = protector.Unprotect(WebUtility.UrlDecode(value));
-                messageEntries = JConvert.DeserializeObject<NotifyEntry[]>(decoded, _notifyJsonSerializerOptions.Value.SerializerOptions);
+                // Also retrieve the actual zone in case it was only a temporary empty zone created on demand.
+                zone = await zone.AddAsync(await _shapeFactory.CreateAsync("Message", Arguments.From(messageEntry)));
             }
-            catch
-            {
-                messageEntries = null;
+        }
 
-                _logger.LogWarning("The notification entries could not be decrypted");
-            }
+        DeleteCookies(filterContext);
+
+        await next();
+    }
+
+    private static void DeleteCookies(ResultExecutingContext filterContext)
+    {
+        filterContext.HttpContext.Response.Cookies.Delete(CookiePrefix, GetCookieOptions(filterContext.HttpContext));
+    }
+
+    private string SerializeNotifyEntry(NotifyEntry[] notifyEntries)
+    {
+        try
+        {
+            var protector = _dataProtectionProvider.CreateProtector(nameof(NotifyFilter));
+            var signed = protector.Protect(JConvert.SerializeObject(notifyEntries, _notifyJsonSerializerOptions.Value.SerializerOptions));
+            return WebUtility.UrlEncode(signed);
         }
+        catch
+        {
+            return null;
+        }
+    }
 
-        private static CookieOptions GetCookieOptions(HttpContext httpContext)
+    private void DeserializeNotifyEntries(string value, out NotifyEntry[] messageEntries)
+    {
+        try
         {
-            var cookieOptions = new CookieOptions
-            {
-                HttpOnly = true
-            };
+            var protector = _dataProtectionProvider.CreateProtector(nameof(NotifyFilter));
+            var decoded = protector.Unprotect(WebUtility.UrlDecode(value));
+            messageEntries = JConvert.DeserializeObject<NotifyEntry[]>(decoded, _notifyJsonSerializerOptions.Value.SerializerOptions);
+        }
+        catch
+        {
+            messageEntries = null;
 
-            if (httpContext.Request.PathBase.HasValue)
-            {
-                cookieOptions.Path = httpContext.Request.PathBase;
-            }
+            _logger.LogWarning("The notification entries could not be decrypted");
+        }
+    }
 
-            return cookieOptions;
+    private static CookieOptions GetCookieOptions(HttpContext httpContext)
+    {
+        var cookieOptions = new CookieOptions
+        {
+            HttpOnly = true
+        };
+
+        if (httpContext.Request.PathBase.HasValue)
+        {
+            cookieOptions.Path = httpContext.Request.PathBase;
         }
+
+        return cookieOptions;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/ObjectPool.cs b/src/OrchardCore/OrchardCore.DisplayManagement/ObjectPool.cs
index 6ea90b89dad..2e1c44132d5 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/ObjectPool.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/ObjectPool.cs
@@ -5,257 +5,256 @@
 using System.Text;
 using System.Threading;
 
-namespace OrchardCore.DisplayManagement
+namespace OrchardCore.DisplayManagement;
+
+/// <summary>
+/// Generic implementation of object pooling pattern with predefined pool size limit. The main
+/// purpose is that limited number of frequently used objects can be kept in the pool for
+/// further recycling.
+///
+/// Notes:
+/// 1) it is not the goal to keep all returned objects. Pool is not meant for storage. If there
+///    is no space in the pool, extra returned objects will be dropped.
+///
+/// 2) it is implied that if object was obtained from a pool, the caller will return it back in
+///    a relatively short time. Keeping checked out objects for long durations is ok, but
+///    reduces usefulness of pooling. Just new up your own.
+///
+/// Not returning objects to the pool in not detrimental to the pool's work, but is a bad practice.
+/// Rationale:
+///    If there is no intent for reusing the object, do not use pool - just use "new".
+/// </summary>
+internal sealed class ObjectPool<T> where T : class
 {
-    /// <summary>
-    /// Generic implementation of object pooling pattern with predefined pool size limit. The main
-    /// purpose is that limited number of frequently used objects can be kept in the pool for
-    /// further recycling.
-    ///
-    /// Notes:
-    /// 1) it is not the goal to keep all returned objects. Pool is not meant for storage. If there
-    ///    is no space in the pool, extra returned objects will be dropped.
-    ///
-    /// 2) it is implied that if object was obtained from a pool, the caller will return it back in
-    ///    a relatively short time. Keeping checked out objects for long durations is ok, but
-    ///    reduces usefulness of pooling. Just new up your own.
-    ///
-    /// Not returning objects to the pool in not detrimental to the pool's work, but is a bad practice.
-    /// Rationale:
-    ///    If there is no intent for reusing the object, do not use pool - just use "new".
-    /// </summary>
-    internal sealed class ObjectPool<T> where T : class
+    [DebuggerDisplay("{Value,nq}")]
+    private struct Element
     {
-        [DebuggerDisplay("{Value,nq}")]
-        private struct Element
-        {
-            internal T Value;
-        }
+        internal T Value;
+    }
 
-        /// <remarks>
-        /// Not using System.Func{T} because this file is linked into the (debugger) Formatter,
-        /// which does not have that type (since it compiles against .NET 2.0).
-        /// </remarks>
-        internal delegate T Factory();
+    /// <remarks>
+    /// Not using System.Func{T} because this file is linked into the (debugger) Formatter,
+    /// which does not have that type (since it compiles against .NET 2.0).
+    /// </remarks>
+    internal delegate T Factory();
 
-        // Storage for the pool objects. The first item is stored in a dedicated field because we
-        // expect to be able to satisfy most requests from it.
-        private T _firstItem;
+    // Storage for the pool objects. The first item is stored in a dedicated field because we
+    // expect to be able to satisfy most requests from it.
+    private T _firstItem;
 
-        private readonly Element[] _items;
+    private readonly Element[] _items;
 
-        // factory is stored for the lifetime of the pool. We will call this only when pool needs to
-        // expand. compared to "new T()", Func gives more flexibility to implementers and faster
-        // than "new T()".
-        private readonly Factory _factory;
+    // factory is stored for the lifetime of the pool. We will call this only when pool needs to
+    // expand. compared to "new T()", Func gives more flexibility to implementers and faster
+    // than "new T()".
+    private readonly Factory _factory;
 
 #if DETECT_LEAKS
-        private static readonly ConditionalWeakTable<T, LeakTracker> leakTrackers = new ConditionalWeakTable<T, LeakTracker>();
+    private static readonly ConditionalWeakTable<T, LeakTracker> leakTrackers = new ConditionalWeakTable<T, LeakTracker>();
 
-        private sealed class LeakTracker : IDisposable
-        {
-            private volatile bool disposed;
+    private sealed class LeakTracker : IDisposable
+    {
+        private volatile bool disposed;
 
 #if TRACE_LEAKS
-            internal volatile object Trace = null;
+        internal volatile object Trace = null;
 #endif
 
-            public void Dispose()
-            {
-                disposed = true;
-                GC.SuppressFinalize(this);
-            }
+        public void Dispose()
+        {
+            disposed = true;
+            GC.SuppressFinalize(this);
+        }
 
-            private string GetTrace()
-            {
+        private string GetTrace()
+        {
 #if TRACE_LEAKS
-                return Trace == null ? "" : Trace.ToString();
+            return Trace == null ? "" : Trace.ToString();
 #else
-                return "Leak tracing information is disabled. Define TRACE_LEAKS on ObjectPool`1.cs to get more info \n";
+            return "Leak tracing information is disabled. Define TRACE_LEAKS on ObjectPool`1.cs to get more info \n";
 #endif
-            }
+        }
 
-            ~LeakTracker()
+        ~LeakTracker()
+        {
+            if (!this.disposed && !Environment.HasShutdownStarted)
             {
-                if (!this.disposed && !Environment.HasShutdownStarted)
-                {
-                    var trace = GetTrace();
+                var trace = GetTrace();
 
-                    // If you are seeing this message it means that object has been allocated from the pool
-                    // and has not been returned back. This is not critical, but turns pool into rather
-                    // inefficient kind of "new".
-                    Debug.WriteLine($"TRACEOBJECTPOOLLEAKS_BEGIN\nPool detected potential leaking of {typeof(T)}. \n Location of the leak: \n {GetTrace()} TRACEOBJECTPOOLLEAKS_END");
-                }
+                // If you are seeing this message it means that object has been allocated from the pool
+                // and has not been returned back. This is not critical, but turns pool into rather
+                // inefficient kind of "new".
+                Debug.WriteLine($"TRACEOBJECTPOOLLEAKS_BEGIN\nPool detected potential leaking of {typeof(T)}. \n Location of the leak: \n {GetTrace()} TRACEOBJECTPOOLLEAKS_END");
             }
         }
+    }
 #endif
 
-        internal ObjectPool(Factory factory)
-            : this(factory, System.Environment.ProcessorCount * 2)
-        { }
+    internal ObjectPool(Factory factory)
+        : this(factory, System.Environment.ProcessorCount * 2)
+    { }
 
-        internal ObjectPool(Factory factory, int size)
-        {
-            Debug.Assert(size >= 1);
-            _factory = factory;
-            _items = new Element[size - 1];
-        }
+    internal ObjectPool(Factory factory, int size)
+    {
+        Debug.Assert(size >= 1);
+        _factory = factory;
+        _items = new Element[size - 1];
+    }
 
-        private T CreateInstance()
-        {
-            var inst = _factory();
-            return inst;
-        }
+    private T CreateInstance()
+    {
+        var inst = _factory();
+        return inst;
+    }
 
-        /// <summary>
-        /// Produces an instance.
-        /// </summary>
-        /// <remarks>
-        /// Search strategy is a simple linear probing which is chosen for it cache-friendliness.
-        /// Note that Free will try to store recycled objects close to the start thus statistically
-        /// reducing how far we will typically search.
-        /// </remarks>
-        internal T Allocate()
+    /// <summary>
+    /// Produces an instance.
+    /// </summary>
+    /// <remarks>
+    /// Search strategy is a simple linear probing which is chosen for it cache-friendliness.
+    /// Note that Free will try to store recycled objects close to the start thus statistically
+    /// reducing how far we will typically search.
+    /// </remarks>
+    internal T Allocate()
+    {
+        // PERF: Examine the first element. If that fails, AllocateSlow will look at the remaining elements.
+        // Note that the initial read is optimistically not synchronized. That is intentional.
+        // We will interlock only when we have a candidate. in a worst case we may miss some
+        // recently returned objects. Not a big deal.
+        var inst = _firstItem;
+        if (inst == null || inst != Interlocked.CompareExchange(ref _firstItem, null, inst))
         {
-            // PERF: Examine the first element. If that fails, AllocateSlow will look at the remaining elements.
-            // Note that the initial read is optimistically not synchronized. That is intentional.
-            // We will interlock only when we have a candidate. in a worst case we may miss some
-            // recently returned objects. Not a big deal.
-            var inst = _firstItem;
-            if (inst == null || inst != Interlocked.CompareExchange(ref _firstItem, null, inst))
-            {
-                inst = AllocateSlow();
-            }
+            inst = AllocateSlow();
+        }
 
 #if DETECT_LEAKS
-            var tracker = new LeakTracker();
-            leakTrackers.Add(inst, tracker);
+        var tracker = new LeakTracker();
+        leakTrackers.Add(inst, tracker);
 
 #if TRACE_LEAKS
-            var frame = CaptureStackTrace();
-            tracker.Trace = frame;
+        var frame = CaptureStackTrace();
+        tracker.Trace = frame;
 #endif
 #endif
-            return inst;
-        }
+        return inst;
+    }
 
-        private T AllocateSlow()
-        {
-            var items = _items;
+    private T AllocateSlow()
+    {
+        var items = _items;
 
-            for (var i = 0; i < items.Length; i++)
+        for (var i = 0; i < items.Length; i++)
+        {
+            // Note that the initial read is optimistically not synchronized. That is intentional.
+            // We will interlock only when we have a candidate. in a worst case we may miss some
+            // recently returned objects. Not a big deal.
+            var inst = items[i].Value;
+            if (inst != null)
             {
-                // Note that the initial read is optimistically not synchronized. That is intentional.
-                // We will interlock only when we have a candidate. in a worst case we may miss some
-                // recently returned objects. Not a big deal.
-                var inst = items[i].Value;
-                if (inst != null)
+                if (inst == Interlocked.CompareExchange(ref items[i].Value, null, inst))
                 {
-                    if (inst == Interlocked.CompareExchange(ref items[i].Value, null, inst))
-                    {
-                        return inst;
-                    }
+                    return inst;
                 }
             }
+        }
 
-            return CreateInstance();
+        return CreateInstance();
+    }
+
+    /// <summary>
+    /// Returns objects to the pool.
+    /// </summary>
+    /// <remarks>
+    /// Search strategy is a simple linear probing which is chosen for it cache-friendliness.
+    /// Note that Free will try to store recycled objects close to the start thus statistically
+    /// reducing how far we will typically search in Allocate.
+    /// </remarks>
+    internal void Free(T obj)
+    {
+        if (_firstItem == null)
+        {
+            // Intentionally not using interlocked here.
+            // In a worst case scenario two objects may be stored into same slot.
+            // It is very unlikely to happen and will only mean that one of the objects will get collected.
+            _firstItem = obj;
         }
+        else
+        {
+            FreeSlow(obj);
+        }
+    }
 
-        /// <summary>
-        /// Returns objects to the pool.
-        /// </summary>
-        /// <remarks>
-        /// Search strategy is a simple linear probing which is chosen for it cache-friendliness.
-        /// Note that Free will try to store recycled objects close to the start thus statistically
-        /// reducing how far we will typically search in Allocate.
-        /// </remarks>
-        internal void Free(T obj)
+    private void FreeSlow(T obj)
+    {
+        var items = _items;
+        for (var i = 0; i < items.Length; i++)
         {
-            if (_firstItem == null)
+            if (items[i].Value == null)
             {
                 // Intentionally not using interlocked here.
                 // In a worst case scenario two objects may be stored into same slot.
                 // It is very unlikely to happen and will only mean that one of the objects will get collected.
-                _firstItem = obj;
-            }
-            else
-            {
-                FreeSlow(obj);
-            }
-        }
-
-        private void FreeSlow(T obj)
-        {
-            var items = _items;
-            for (var i = 0; i < items.Length; i++)
-            {
-                if (items[i].Value == null)
-                {
-                    // Intentionally not using interlocked here.
-                    // In a worst case scenario two objects may be stored into same slot.
-                    // It is very unlikely to happen and will only mean that one of the objects will get collected.
-                    items[i].Value = obj;
-                    break;
-                }
+                items[i].Value = obj;
+                break;
             }
         }
     }
+}
 
-    /// <summary>
-    /// The usage is:
-    ///        var inst = PooledStringBuilder.GetInstance();
-    ///        var sb = inst.builder;
-    ///        ... Do Stuff...
-    ///        ... sb.ToString() ...
-    ///        inst.Free();.
-    /// </summary>
-    public sealed class StringBuilderPool : IDisposable
-    {
-        private const int DefaultCapacity = 1 * 1024;
+/// <summary>
+/// The usage is:
+///        var inst = PooledStringBuilder.GetInstance();
+///        var sb = inst.builder;
+///        ... Do Stuff...
+///        ... sb.ToString() ...
+///        inst.Free();.
+/// </summary>
+public sealed class StringBuilderPool : IDisposable
+{
+    private const int DefaultCapacity = 1 * 1024;
 
-        // Global pool.
-        private static readonly ObjectPool<StringBuilderPool> _poolInstance = CreatePool();
+    // Global pool.
+    private static readonly ObjectPool<StringBuilderPool> _poolInstance = CreatePool();
 
-        public readonly StringBuilder Builder = new(DefaultCapacity);
-        private readonly ObjectPool<StringBuilderPool> _pool;
+    public readonly StringBuilder Builder = new(DefaultCapacity);
+    private readonly ObjectPool<StringBuilderPool> _pool;
 
-        private StringBuilderPool(ObjectPool<StringBuilderPool> pool)
-        {
-            Debug.Assert(pool != null);
-            _pool = pool;
-        }
+    private StringBuilderPool(ObjectPool<StringBuilderPool> pool)
+    {
+        Debug.Assert(pool != null);
+        _pool = pool;
+    }
 
-        public int Length => Builder.Length;
+    public int Length => Builder.Length;
 
-        internal static ObjectPool<StringBuilderPool> CreatePool(int size = 1000)
-        {
-            ObjectPool<StringBuilderPool> pool = null;
-            pool = new ObjectPool<StringBuilderPool>(() => new StringBuilderPool(pool), size);
-            return pool;
-        }
+    internal static ObjectPool<StringBuilderPool> CreatePool(int size = 1000)
+    {
+        ObjectPool<StringBuilderPool> pool = null;
+        pool = new ObjectPool<StringBuilderPool>(() => new StringBuilderPool(pool), size);
+        return pool;
+    }
 
-        public static StringBuilderPool GetInstance()
-        {
-            var builder = _poolInstance.Allocate();
-            Debug.Assert(builder.Builder.Length == 0);
-            return builder;
-        }
+    public static StringBuilderPool GetInstance()
+    {
+        var builder = _poolInstance.Allocate();
+        Debug.Assert(builder.Builder.Length == 0);
+        return builder;
+    }
 
-        public override string ToString()
-        {
-            return Builder.ToString();
-        }
+    public override string ToString()
+    {
+        return Builder.ToString();
+    }
 
-        public void Dispose()
-        {
-            var builder = Builder;
+    public void Dispose()
+    {
+        var builder = Builder;
 
-            // Do not store builders that are too large.
-            if (builder.Capacity == DefaultCapacity)
-            {
-                builder.Clear();
-                _pool.Free(this);
-            }
+        // Do not store builders that are too large.
+        if (builder.Capacity == DefaultCapacity)
+        {
+            builder.Clear();
+            _pool.Free(this);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/OrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/OrchardCoreBuilderExtensions.cs
index f16c2a9e869..1ae80deb9a7 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/OrchardCoreBuilderExtensions.cs
@@ -27,107 +27,106 @@
 using OrchardCore.Environment.Extensions.Features;
 using OrchardCore.Mvc.LocationExpander;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class OrchardCoreBuilderExtensions
 {
-    public static class OrchardCoreBuilderExtensions
+    /// <summary>
+    /// Adds host and tenant level services for managing themes.
+    /// </summary>
+    public static OrchardCoreBuilder AddTheming(this OrchardCoreBuilder builder)
     {
-        /// <summary>
-        /// Adds host and tenant level services for managing themes.
-        /// </summary>
-        public static OrchardCoreBuilder AddTheming(this OrchardCoreBuilder builder)
-        {
-            builder.AddThemingHost()
-                .ConfigureServices(services =>
+        builder.AddThemingHost()
+            .ConfigureServices(services =>
+            {
+                services.Configure<MvcOptions>((options) =>
                 {
-                    services.Configure<MvcOptions>((options) =>
-                    {
-                        options.Filters.Add<ModelBinderAccessorFilter>();
-                        options.Filters.Add<NotifyFilter>();
-                        options.Filters.Add<RazorViewActionFilter>();
-                    });
-
-                    services.AddTransient<IConfigureOptions<NotifyJsonSerializerOptions>, NotifyJsonSerializerOptionsConfiguration>();
-
-                    // Used as a service when we create a fake 'ActionContext'.
-                    services.AddScoped<IAsyncViewActionFilter, RazorViewActionFilter>();
-
-                    services.AddScoped<IUpdateModelAccessor, LocalModelBinderAccessor>();
-                    services.AddScoped<ViewContextAccessor>();
-
-                    services.AddScoped<RazorShapeTemplateViewEngine>();
-                    services.AddScoped<IShapeTemplateViewEngine>(sp => sp.GetService<RazorShapeTemplateViewEngine>());
-
-                    services.AddSingleton<IApplicationFeatureProvider<ViewsFeature>, ThemingViewsFeatureProvider>();
-                    services.AddScoped<IViewLocationExpanderProvider, ThemeViewLocationExpanderProvider>();
-
-                    services.AddScoped<IShapeTemplateHarvester, BasicShapeTemplateHarvester>();
-                    services.AddKeyedSingleton<IDictionary<string, ShapeTable>>(nameof(DefaultShapeTableManager), new ConcurrentDictionary<string, ShapeTable>());
-                    services.AddScoped<IShapeTableManager, DefaultShapeTableManager>();
-
-                    services.AddScoped<IShapeTableProvider, ShapeAttributeBindingStrategy>();
-                    services.AddScoped<IShapeTableProvider, ShapePlacementParsingStrategy>();
-                    services.AddScoped<IShapeTableProvider, ShapeTemplateBindingStrategy>();
-
-                    services.AddScoped<IPlacementNodeFilterProvider, PathPlacementNodeFilterProvider>();
-
-                    services.AddScoped<IShapePlacementProvider, ShapeTablePlacementProvider>();
-
-                    services.TryAddEnumerable(
-                        ServiceDescriptor.Transient<IConfigureOptions<ShapeTemplateOptions>, ShapeTemplateOptionsSetup>());
-                    services.TryAddSingleton<IShapeTemplateFileProviderAccessor, ShapeTemplateFileProviderAccessor>();
-
-                    services.AddShapeAttributes<CoreShapes>();
-                    services.AddScoped<IShapeTableProvider, CoreShapesTableProvider>();
-                    services.AddShapeAttributes<ZoneShapes>();
-                    services.AddScoped<IShapeTableProvider, ZoneShapeAlternates>();
-                    services.AddShapeAttributes<GroupShapes>();
-
-                    services.AddScoped(typeof(IDisplayManager<>), typeof(DisplayManager<>));
-                    services.AddScoped<IHtmlDisplay, DefaultHtmlDisplay>();
-                    services.AddScoped<ILayoutAccessor, LayoutAccessor>();
-                    services.AddScoped<IThemeManager, ThemeManager>();
-                    services.AddScoped<IPageTitleBuilder, PageTitleBuilder>();
-
-                    services.AddScoped<IShapeFactory, DefaultShapeFactory>();
-                    services.AddScoped<IDisplayHelper, DisplayHelper>();
-
-                    services.AddScoped<INotifier, Notifier>();
-
-                    services.AddShapeAttributes<DateTimeShapes>();
-                    services.AddShapeAttributes<PageTitleShapes>();
-
-                    services.AddTagHelpers<AddAlternateTagHelper>();
-                    services.AddTagHelpers<AddClassTagHelper>();
-                    services.AddTagHelpers<AddWrapperTagHelper>();
-                    services.AddTagHelpers<ClearAlternatesTagHelper>();
-                    services.AddTagHelpers<ClearClassesTagHelper>();
-                    services.AddTagHelpers<ClearWrappersTagHelper>();
-                    services.AddTagHelpers<DateTimeTagHelper>();
-                    services.AddTagHelpers<InputIsDisabledTagHelper>();
-                    services.AddTagHelpers<RemoveAlternateTagHelper>();
-                    services.AddTagHelpers<RemoveClassTagHelper>();
-                    services.AddTagHelpers<RemoveWrapperTagHelper>();
-                    services.AddTagHelpers<ShapeMetadataTagHelper>();
-                    services.AddTagHelpers<ShapeTagHelper>();
-                    services.AddTagHelpers<TimeSpanTagHelper>();
-                    services.AddTagHelpers<ValidationMessageTagHelper>();
-                    services.AddTagHelpers<ZoneTagHelper>();
+                    options.Filters.Add<ModelBinderAccessorFilter>();
+                    options.Filters.Add<NotifyFilter>();
+                    options.Filters.Add<RazorViewActionFilter>();
                 });
 
-            return builder;
-        }
+                services.AddTransient<IConfigureOptions<NotifyJsonSerializerOptions>, NotifyJsonSerializerOptionsConfiguration>();
+
+                // Used as a service when we create a fake 'ActionContext'.
+                services.AddScoped<IAsyncViewActionFilter, RazorViewActionFilter>();
+
+                services.AddScoped<IUpdateModelAccessor, LocalModelBinderAccessor>();
+                services.AddScoped<ViewContextAccessor>();
+
+                services.AddScoped<RazorShapeTemplateViewEngine>();
+                services.AddScoped<IShapeTemplateViewEngine>(sp => sp.GetService<RazorShapeTemplateViewEngine>());
+
+                services.AddSingleton<IApplicationFeatureProvider<ViewsFeature>, ThemingViewsFeatureProvider>();
+                services.AddScoped<IViewLocationExpanderProvider, ThemeViewLocationExpanderProvider>();
+
+                services.AddScoped<IShapeTemplateHarvester, BasicShapeTemplateHarvester>();
+                services.AddKeyedSingleton<IDictionary<string, ShapeTable>>(nameof(DefaultShapeTableManager), new ConcurrentDictionary<string, ShapeTable>());
+                services.AddScoped<IShapeTableManager, DefaultShapeTableManager>();
+
+                services.AddScoped<IShapeTableProvider, ShapeAttributeBindingStrategy>();
+                services.AddScoped<IShapeTableProvider, ShapePlacementParsingStrategy>();
+                services.AddScoped<IShapeTableProvider, ShapeTemplateBindingStrategy>();
+
+                services.AddScoped<IPlacementNodeFilterProvider, PathPlacementNodeFilterProvider>();
+
+                services.AddScoped<IShapePlacementProvider, ShapeTablePlacementProvider>();
+
+                services.TryAddEnumerable(
+                    ServiceDescriptor.Transient<IConfigureOptions<ShapeTemplateOptions>, ShapeTemplateOptionsSetup>());
+                services.TryAddSingleton<IShapeTemplateFileProviderAccessor, ShapeTemplateFileProviderAccessor>();
 
-        /// <summary>
-        /// Adds host level services for managing themes.
-        /// </summary>
-        public static OrchardCoreBuilder AddThemingHost(this OrchardCoreBuilder builder)
-        {
-            var services = builder.ApplicationServices;
+                services.AddShapeAttributes<CoreShapes>();
+                services.AddScoped<IShapeTableProvider, CoreShapesTableProvider>();
+                services.AddShapeAttributes<ZoneShapes>();
+                services.AddScoped<IShapeTableProvider, ZoneShapeAlternates>();
+                services.AddShapeAttributes<GroupShapes>();
+
+                services.AddScoped(typeof(IDisplayManager<>), typeof(DisplayManager<>));
+                services.AddScoped<IHtmlDisplay, DefaultHtmlDisplay>();
+                services.AddScoped<ILayoutAccessor, LayoutAccessor>();
+                services.AddScoped<IThemeManager, ThemeManager>();
+                services.AddScoped<IPageTitleBuilder, PageTitleBuilder>();
+
+                services.AddScoped<IShapeFactory, DefaultShapeFactory>();
+                services.AddScoped<IDisplayHelper, DisplayHelper>();
+
+                services.AddScoped<INotifier, Notifier>();
+
+                services.AddShapeAttributes<DateTimeShapes>();
+                services.AddShapeAttributes<PageTitleShapes>();
+
+                services.AddTagHelpers<AddAlternateTagHelper>();
+                services.AddTagHelpers<AddClassTagHelper>();
+                services.AddTagHelpers<AddWrapperTagHelper>();
+                services.AddTagHelpers<ClearAlternatesTagHelper>();
+                services.AddTagHelpers<ClearClassesTagHelper>();
+                services.AddTagHelpers<ClearWrappersTagHelper>();
+                services.AddTagHelpers<DateTimeTagHelper>();
+                services.AddTagHelpers<InputIsDisabledTagHelper>();
+                services.AddTagHelpers<RemoveAlternateTagHelper>();
+                services.AddTagHelpers<RemoveClassTagHelper>();
+                services.AddTagHelpers<RemoveWrapperTagHelper>();
+                services.AddTagHelpers<ShapeMetadataTagHelper>();
+                services.AddTagHelpers<ShapeTagHelper>();
+                services.AddTagHelpers<TimeSpanTagHelper>();
+                services.AddTagHelpers<ValidationMessageTagHelper>();
+                services.AddTagHelpers<ZoneTagHelper>();
+            });
+
+        return builder;
+    }
+
+    /// <summary>
+    /// Adds host level services for managing themes.
+    /// </summary>
+    public static OrchardCoreBuilder AddThemingHost(this OrchardCoreBuilder builder)
+    {
+        var services = builder.ApplicationServices;
 
-            services.AddTransient<IExtensionDependencyStrategy, ThemeExtensionDependencyStrategy>();
-            services.AddTransient<IFeatureBuilderEvents, ThemeFeatureBuilderEvents>();
+        services.AddTransient<IExtensionDependencyStrategy, ThemeExtensionDependencyStrategy>();
+        services.AddTransient<IFeatureBuilderEvents, ThemeFeatureBuilderEvents>();
 
-            return builder;
-        }
+        return builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/OrchardDisplayHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/OrchardDisplayHelper.cs
index 6ec25810794..4f7f8826f4e 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/OrchardDisplayHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/OrchardDisplayHelper.cs
@@ -1,16 +1,15 @@
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.DisplayManagement.Razor
+namespace OrchardCore.DisplayManagement.Razor;
+
+internal sealed class OrchardDisplayHelper : IOrchardDisplayHelper
 {
-    internal sealed class OrchardDisplayHelper : IOrchardDisplayHelper
+    public OrchardDisplayHelper(HttpContext context, IDisplayHelper displayHelper)
     {
-        public OrchardDisplayHelper(HttpContext context, IDisplayHelper displayHelper)
-        {
-            HttpContext = context;
-            DisplayHelper = displayHelper;
-        }
-
-        public HttpContext HttpContext { get; set; }
-        public IDisplayHelper DisplayHelper { get; set; }
+        HttpContext = context;
+        DisplayHelper = displayHelper;
     }
+
+    public HttpContext HttpContext { get; set; }
+    public IDisplayHelper DisplayHelper { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/PositionWrapper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/PositionWrapper.cs
index b0d7841d1d3..f7905816e3d 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/PositionWrapper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/PositionWrapper.cs
@@ -7,77 +7,76 @@
 using OrchardCore.DisplayManagement.Html;
 using OrchardCore.DisplayManagement.Shapes;
 
-namespace OrchardCore.DisplayManagement
+namespace OrchardCore.DisplayManagement;
+
+public sealed class PositionWrapper : IHtmlContent, IPositioned, IShape
 {
-    public sealed class PositionWrapper : IHtmlContent, IPositioned, IShape
-    {
-        private readonly IHtmlContent _value;
-        public string Position { get; set; }
+    private readonly IHtmlContent _value;
+    public string Position { get; set; }
 
-        public ShapeMetadata Metadata { get; set; } = new ShapeMetadata();
+    public ShapeMetadata Metadata { get; set; } = new ShapeMetadata();
 
-        public string Id { get; set; }
+    public string Id { get; set; }
 
-        public string TagName { get; set; }
+    public string TagName { get; set; }
 
-        public IList<string> Classes { get; }
+    public IList<string> Classes { get; }
 
-        public IDictionary<string, string> Attributes { get; }
+    public IDictionary<string, string> Attributes { get; }
 
-        private Dictionary<string, object> _properties;
+    private Dictionary<string, object> _properties;
 
-        public IDictionary<string, object> Properties => _properties ??= [];
+    public IDictionary<string, object> Properties => _properties ??= [];
 
-        public IReadOnlyList<IPositioned> Items => throw new System.NotImplementedException();
+    public IReadOnlyList<IPositioned> Items => throw new System.NotImplementedException();
 
-        private PositionWrapper(IHtmlContent value, string position)
-        {
-            _value = value;
-            Position = position;
-        }
+    private PositionWrapper(IHtmlContent value, string position)
+    {
+        _value = value;
+        Position = position;
+    }
+
+    private PositionWrapper(string value, string position)
+    {
+        _value = new HtmlContentString(value);
+        Position = position;
+    }
+
+    public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+    {
+        _value.WriteTo(writer, encoder);
+    }
 
-        private PositionWrapper(string value, string position)
+    public ValueTask<IShape> AddAsync(object item, string position)
+    {
+        throw new System.NotImplementedException();
+    }
+
+    public static IPositioned TryWrap(object value, string position)
+    {
+        if (value is IPositioned wrapper)
         {
-            _value = new HtmlContentString(value);
-            Position = position;
+            // Update the new Position
+            if (position != null)
+            {
+                wrapper.Position = position;
+            }
+            return wrapper;
         }
-
-        public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+        else if (value is IHtmlContent content)
         {
-            _value.WriteTo(writer, encoder);
+            return new PositionWrapper(content, position);
         }
-
-        public ValueTask<IShape> AddAsync(object item, string position)
+        else if (value is string stringContent)
         {
-            throw new System.NotImplementedException();
+            return new PositionWrapper(stringContent, position);
         }
-
-        public static IPositioned TryWrap(object value, string position)
+        else
         {
-            if (value is IPositioned wrapper)
-            {
-                // Update the new Position
-                if (position != null)
-                {
-                    wrapper.Position = position;
-                }
-                return wrapper;
-            }
-            else if (value is IHtmlContent content)
-            {
-                return new PositionWrapper(content, position);
-            }
-            else if (value is string stringContent)
-            {
-                return new PositionWrapper(stringContent, position);
-            }
-            else
-            {
-                return null;
-            }
+            return null;
         }
-
-        public static IHtmlContent UnWrap(PositionWrapper wrapper)
-            => wrapper._value;
     }
+
+    public static IHtmlContent UnWrap(PositionWrapper wrapper)
+        => wrapper._value;
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Razor/IRazorViewExtensionProvider.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Razor/IRazorViewExtensionProvider.cs
index ee9c4c62417..439d324d56e 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Razor/IRazorViewExtensionProvider.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Razor/IRazorViewExtensionProvider.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.DisplayManagement.Razor
+namespace OrchardCore.DisplayManagement.Razor;
+
+public interface IRazorViewExtensionProvider
 {
-    public interface IRazorViewExtensionProvider
-    {
-        string ViewExtension { get; }
-    }
+    string ViewExtension { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Razor/RazorPage.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Razor/RazorPage.cs
index f99f8798a09..d387dff93e8 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Razor/RazorPage.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Razor/RazorPage.cs
@@ -10,324 +10,323 @@
 using OrchardCore.DisplayManagement.Zones;
 using OrchardCore.Settings;
 
-namespace OrchardCore.DisplayManagement.Razor
+namespace OrchardCore.DisplayManagement.Razor;
+
+public abstract class RazorPage<TModel> : Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>, IRazorPage
 {
-    public abstract class RazorPage<TModel> : Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>, IRazorPage
-    {
-        private IDisplayHelper _displayHelper;
-        private IShapeFactory _shapeFactory;
-        private IOrchardDisplayHelper _orchardHelper;
-        private ISite _site;
+    private IDisplayHelper _displayHelper;
+    private IShapeFactory _shapeFactory;
+    private IOrchardDisplayHelper _orchardHelper;
+    private ISite _site;
 
-        public override ViewContext ViewContext
+    public override ViewContext ViewContext
+    {
+        get => base.ViewContext;
+        set
         {
-            get => base.ViewContext;
-            set
-            {
-                // We make the ViewContext available to other sub-systems that need it.
-                var viewContextAccessor = value.HttpContext.RequestServices.GetService<ViewContextAccessor>();
-                base.ViewContext = viewContextAccessor.ViewContext = value;
-            }
+            // We make the ViewContext available to other sub-systems that need it.
+            var viewContextAccessor = value.HttpContext.RequestServices.GetService<ViewContextAccessor>();
+            base.ViewContext = viewContextAccessor.ViewContext = value;
         }
+    }
 
-        private void EnsureDisplayHelper() => _displayHelper ??= Context.RequestServices.GetService<IDisplayHelper>();
-
-        private void EnsureShapeFactory() => _shapeFactory ??= Context.RequestServices.GetService<IShapeFactory>();
-
-        /// <summary>
-        /// Gets a dynamic shape factory to create new shapes.
-        /// </summary>
-        /// <example>
-        /// Usage:
-        /// <code>
-        /// await New.MyShape()
-        /// await New.MyShape(A: 1, B: "Some text")
-        /// (await New.MyShape()).A(1).B("Some text")
-        /// </code>
-        /// </example>
-        public dynamic New => Factory;
-
-        /// <summary>
-        /// Gets an <see cref="IShapeFactory"/> to create new shapes.
-        /// </summary>
-        public IShapeFactory Factory
+    private void EnsureDisplayHelper() => _displayHelper ??= Context.RequestServices.GetService<IDisplayHelper>();
+
+    private void EnsureShapeFactory() => _shapeFactory ??= Context.RequestServices.GetService<IShapeFactory>();
+
+    /// <summary>
+    /// Gets a dynamic shape factory to create new shapes.
+    /// </summary>
+    /// <example>
+    /// Usage:
+    /// <code>
+    /// await New.MyShape()
+    /// await New.MyShape(A: 1, B: "Some text")
+    /// (await New.MyShape()).A(1).B("Some text")
+    /// </code>
+    /// </example>
+    public dynamic New => Factory;
+
+    /// <summary>
+    /// Gets an <see cref="IShapeFactory"/> to create new shapes.
+    /// </summary>
+    public IShapeFactory Factory
+    {
+        get
         {
-            get
-            {
-                EnsureShapeFactory();
-                return _shapeFactory;
-            }
+            EnsureShapeFactory();
+            return _shapeFactory;
         }
+    }
 
-        /// <summary>
-        /// Renders a shape.
-        /// </summary>
-        /// <param name="shape">The shape.</param>
-        public Task<IHtmlContent> DisplayAsync(dynamic shape)
+    /// <summary>
+    /// Renders a shape.
+    /// </summary>
+    /// <param name="shape">The shape.</param>
+    public Task<IHtmlContent> DisplayAsync(dynamic shape)
+    {
+        if (shape is IShape s)
         {
-            if (shape is IShape s)
-            {
-                EnsureDisplayHelper();
-                return _displayHelper.ShapeExecuteAsync(s);
-            }
-
-            if (shape is IHtmlContent hc)
-            {
-                return Task.FromResult(hc);
-            }
-
-            if (shape is string str)
-            {
-                return Task.FromResult<IHtmlContent>(new HtmlContentString(str));
-            }
+            EnsureDisplayHelper();
+            return _displayHelper.ShapeExecuteAsync(s);
+        }
 
-            throw new ArgumentException("DisplayAsync requires an instance of IShape");
+        if (shape is IHtmlContent hc)
+        {
+            return Task.FromResult(hc);
         }
 
-        /// <summary>
-        /// Renders a shape.
-        /// </summary>
-        /// <param name="shape">The shape.</param>
-        public Task<IHtmlContent> DisplayAsync(IShape shape)
+        if (shape is string str)
         {
-            EnsureDisplayHelper();
-            return _displayHelper.ShapeExecuteAsync(shape);
+            return Task.FromResult<IHtmlContent>(new HtmlContentString(str));
         }
 
-        public IOrchardDisplayHelper Orchard
+        throw new ArgumentException("DisplayAsync requires an instance of IShape");
+    }
+
+    /// <summary>
+    /// Renders a shape.
+    /// </summary>
+    /// <param name="shape">The shape.</param>
+    public Task<IHtmlContent> DisplayAsync(IShape shape)
+    {
+        EnsureDisplayHelper();
+        return _displayHelper.ShapeExecuteAsync(shape);
+    }
+
+    public IOrchardDisplayHelper Orchard
+    {
+        get
         {
-            get
+            if (_orchardHelper == null)
             {
-                if (_orchardHelper == null)
-                {
-                    EnsureDisplayHelper();
-                    _orchardHelper = new OrchardDisplayHelper(Context, _displayHelper);
-                }
-
-                return _orchardHelper;
+                EnsureDisplayHelper();
+                _orchardHelper = new OrchardDisplayHelper(Context, _displayHelper);
             }
+
+            return _orchardHelper;
         }
+    }
 
-        protected IZoneHolding _themeLayout;
+    protected IZoneHolding _themeLayout;
 
-        public IZoneHolding ThemeLayout
-        {
-            get => _themeLayout ??= Context.Features.Get<RazorViewFeature>()?.ThemeLayout;
-            set => _themeLayout = value;
-        }
+    public IZoneHolding ThemeLayout
+    {
+        get => _themeLayout ??= Context.Features.Get<RazorViewFeature>()?.ThemeLayout;
+        set => _themeLayout = value;
+    }
 
-        public string ViewLayout
+    public string ViewLayout
+    {
+        get
         {
-            get
+            if (ThemeLayout is IShape layout)
             {
-                if (ThemeLayout is IShape layout)
+                if (layout.Metadata.Alternates.Count > 0)
                 {
-                    if (layout.Metadata.Alternates.Count > 0)
-                    {
-                        return layout.Metadata.Alternates.Last;
-                    }
-
-                    return layout.Metadata.Type;
+                    return layout.Metadata.Alternates.Last;
                 }
 
-                return string.Empty;
+                return layout.Metadata.Type;
             }
 
-            set
+            return string.Empty;
+        }
+
+        set
+        {
+            if (ThemeLayout is IShape layout)
             {
-                if (ThemeLayout is IShape layout)
+                if (layout.Metadata.Alternates.Contains(value))
                 {
-                    if (layout.Metadata.Alternates.Contains(value))
+                    if (layout.Metadata.Alternates.Last == value)
                     {
-                        if (layout.Metadata.Alternates.Last == value)
-                        {
-                            return;
-                        }
-
-                        layout.Metadata.Alternates.Remove(value);
+                        return;
                     }
 
-                    layout.Metadata.Alternates.Add(value);
+                    layout.Metadata.Alternates.Remove(value);
                 }
+
+                layout.Metadata.Alternates.Add(value);
             }
         }
+    }
 
-        private IPageTitleBuilder _pageTitleBuilder;
+    private IPageTitleBuilder _pageTitleBuilder;
 
-        public IPageTitleBuilder Title => _pageTitleBuilder ??= Context.RequestServices.GetRequiredService<IPageTitleBuilder>();
+    public IPageTitleBuilder Title => _pageTitleBuilder ??= Context.RequestServices.GetRequiredService<IPageTitleBuilder>();
 
-        private IViewLocalizer _t;
+    private IViewLocalizer _t;
 
-        /// <summary>
-        /// The <see cref="IViewLocalizer"/> instance for the current view.
-        /// </summary>
-        public IViewLocalizer T
+    /// <summary>
+    /// The <see cref="IViewLocalizer"/> instance for the current view.
+    /// </summary>
+    public IViewLocalizer T
+    {
+        get
         {
-            get
+            if (_t == null)
             {
-                if (_t == null)
-                {
-                    _t = Context.RequestServices.GetRequiredService<IViewLocalizer>();
-                    ((IViewContextAware)_t).Contextualize(ViewContext);
-                }
-
-                return _t;
+                _t = Context.RequestServices.GetRequiredService<IViewLocalizer>();
+                ((IViewContextAware)_t).Contextualize(ViewContext);
             }
-        }
 
-        /// <summary>
-        /// Adds a segment to the title and returns all segments.
-        /// </summary>
-        /// <param name="segment">The segment to add to the title.</param>
-        /// <param name="position">Optional. The position of the segment in the title.</param>
-        /// <param name="separator">The html string that should separate all segments.</param>
-        /// <returns>And <see cref="IHtmlContent"/> instance representing the full title.</returns>
-        public IHtmlContent RenderTitleSegments(IHtmlContent segment, string position = "0", IHtmlContent separator = null)
-        {
-            Title.AddSegment(segment, position);
-            return Title.GenerateTitle(separator);
+            return _t;
         }
+    }
 
-        /// <summary>
-        /// Adds a segment to the title and returns all segments.
-        /// </summary>
-        /// <param name="segment">The segment to add to the title.</param>
-        /// <param name="position">Optional. The position of the segment in the title.</param>
-        /// <param name="separator">The html string that should separate all segments.</param>
-        /// <returns>And <see cref="IHtmlContent"/> instance representing the full title.</returns>
-        public IHtmlContent RenderTitleSegments(string segment, string position = "0", IHtmlContent separator = null)
-        {
-            if (!string.IsNullOrEmpty(segment))
-            {
-                Title.AddSegment(new HtmlContentString(segment), position);
-            }
-
-            return Title.GenerateTitle(separator);
-        }
+    /// <summary>
+    /// Adds a segment to the title and returns all segments.
+    /// </summary>
+    /// <param name="segment">The segment to add to the title.</param>
+    /// <param name="position">Optional. The position of the segment in the title.</param>
+    /// <param name="separator">The html string that should separate all segments.</param>
+    /// <returns>And <see cref="IHtmlContent"/> instance representing the full title.</returns>
+    public IHtmlContent RenderTitleSegments(IHtmlContent segment, string position = "0", IHtmlContent separator = null)
+    {
+        Title.AddSegment(segment, position);
+        return Title.GenerateTitle(separator);
+    }
 
-        /// <summary>
-        /// Renders the content zone of the layout.
-        /// </summary>
-        public IHtmlContent RenderLayoutBody() => base.RenderBody();
-
-        /// <summary>
-        /// Creates a <see cref="TagBuilder"/> to render a shape.
-        /// </summary>
-        /// <param name="shape">The shape.</param>
-        /// <returns>A new <see cref="TagBuilder"/>.</returns>
-        public static TagBuilder Tag(IShape shape) => shape.GetTagBuilder();
-
-        /// <summary>
-        /// Creates a <see cref="TagBuilder"/> to render a shape.
-        /// </summary>
-        /// <param name="shape">The shape.</param>
-        /// <param name="tag">The tag name to use.</param>
-        /// <returns>A new <see cref="TagBuilder"/>.</returns>
-        public static TagBuilder Tag(IShape shape, string tag) => shape.GetTagBuilder(tag);
-
-        /// <summary>
-        /// In a Razor layout page, renders the portion of a content page that is not within a named zone.
-        /// </summary>
-        /// <returns>The HTML content to render.</returns>
-        public Task<IHtmlContent> RenderBodyAsync() => DisplayAsync(ThemeLayout.Zones["Content"]);
-
-        /// <summary>
-        /// Check if a zone is defined in the layout or it has items.
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public new bool IsSectionDefined(string name)
+    /// <summary>
+    /// Adds a segment to the title and returns all segments.
+    /// </summary>
+    /// <param name="segment">The segment to add to the title.</param>
+    /// <param name="position">Optional. The position of the segment in the title.</param>
+    /// <param name="separator">The html string that should separate all segments.</param>
+    /// <returns>And <see cref="IHtmlContent"/> instance representing the full title.</returns>
+    public IHtmlContent RenderTitleSegments(string segment, string position = "0", IHtmlContent separator = null)
+    {
+        if (!string.IsNullOrEmpty(segment))
         {
-            // We can replace the base implementation as it can't be called on a view that is not an actual MVC Layout.
+            Title.AddSegment(new HtmlContentString(segment), position);
+        }
 
-            ArgumentNullException.ThrowIfNull(name);
+        return Title.GenerateTitle(separator);
+    }
 
-            return ThemeLayout.Zones.IsNotEmpty(name);
-        }
+    /// <summary>
+    /// Renders the content zone of the layout.
+    /// </summary>
+    public IHtmlContent RenderLayoutBody() => base.RenderBody();
+
+    /// <summary>
+    /// Creates a <see cref="TagBuilder"/> to render a shape.
+    /// </summary>
+    /// <param name="shape">The shape.</param>
+    /// <returns>A new <see cref="TagBuilder"/>.</returns>
+    public static TagBuilder Tag(IShape shape) => shape.GetTagBuilder();
+
+    /// <summary>
+    /// Creates a <see cref="TagBuilder"/> to render a shape.
+    /// </summary>
+    /// <param name="shape">The shape.</param>
+    /// <param name="tag">The tag name to use.</param>
+    /// <returns>A new <see cref="TagBuilder"/>.</returns>
+    public static TagBuilder Tag(IShape shape, string tag) => shape.GetTagBuilder(tag);
+
+    /// <summary>
+    /// In a Razor layout page, renders the portion of a content page that is not within a named zone.
+    /// </summary>
+    /// <returns>The HTML content to render.</returns>
+    public Task<IHtmlContent> RenderBodyAsync() => DisplayAsync(ThemeLayout.Zones["Content"]);
+
+    /// <summary>
+    /// Check if a zone is defined in the layout or it has items.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public new bool IsSectionDefined(string name)
+    {
+        // We can replace the base implementation as it can't be called on a view that is not an actual MVC Layout.
 
-        /// <summary>
-        /// Renders a zone from the layout.
-        /// </summary>
-        /// <param name="name">The name of the zone to render.</param>
-        public new IHtmlContent RenderSection(string name)
-        {
-            // We can replace the base implementation as it can't be called on a view that is not an actual MVC Layout.
+        ArgumentNullException.ThrowIfNull(name);
 
-            ArgumentNullException.ThrowIfNull(name);
+        return ThemeLayout.Zones.IsNotEmpty(name);
+    }
 
-            return RenderSection(name, required: true);
-        }
+    /// <summary>
+    /// Renders a zone from the layout.
+    /// </summary>
+    /// <param name="name">The name of the zone to render.</param>
+    public new IHtmlContent RenderSection(string name)
+    {
+        // We can replace the base implementation as it can't be called on a view that is not an actual MVC Layout.
 
-        /// <summary>
-        /// Renders a zone from the layout.
-        /// </summary>
-        /// <param name="name">The name of the zone to render.</param>
-        /// <param name="required">Whether the zone is required or not.</param>
-        public new IHtmlContent RenderSection(string name, bool required)
-        {
-            // We can replace the base implementation as it can't be called on a view that is not an actual MVC Layout.
+        ArgumentNullException.ThrowIfNull(name);
 
-            ArgumentNullException.ThrowIfNull(name);
+        return RenderSection(name, required: true);
+    }
 
-            return RenderSectionAsync(name, required).GetAwaiter().GetResult();
-        }
+    /// <summary>
+    /// Renders a zone from the layout.
+    /// </summary>
+    /// <param name="name">The name of the zone to render.</param>
+    /// <param name="required">Whether the zone is required or not.</param>
+    public new IHtmlContent RenderSection(string name, bool required)
+    {
+        // We can replace the base implementation as it can't be called on a view that is not an actual MVC Layout.
 
-        /// <summary>
-        /// Renders a zone from the layout.
-        /// </summary>
-        /// <param name="name">The name of the zone to render.</param>
-        public new Task<IHtmlContent> RenderSectionAsync(string name)
-        {
-            // We can replace the base implementation as it can't be called on a view that is not an actual MVC Layout.
+        ArgumentNullException.ThrowIfNull(name);
 
-            ArgumentNullException.ThrowIfNull(name);
+        return RenderSectionAsync(name, required).GetAwaiter().GetResult();
+    }
 
-            return RenderSectionAsync(name, required: true);
-        }
+    /// <summary>
+    /// Renders a zone from the layout.
+    /// </summary>
+    /// <param name="name">The name of the zone to render.</param>
+    public new Task<IHtmlContent> RenderSectionAsync(string name)
+    {
+        // We can replace the base implementation as it can't be called on a view that is not an actual MVC Layout.
 
-        /// <summary>
-        /// Renders a zone from the layout.
-        /// </summary>
-        /// <param name="name">The name of the zone to render.</param>
-        /// <param name="required">Whether the zone is required or not.</param>
-        public new Task<IHtmlContent> RenderSectionAsync(string name, bool required)
-        {
-            // We can replace the base implementation as it can't be called on a view that is not an actual MVC Layout.
+        ArgumentNullException.ThrowIfNull(name);
 
-            ArgumentNullException.ThrowIfNull(name);
+        return RenderSectionAsync(name, required: true);
+    }
 
-            var zone = ThemeLayout.Zones[name];
+    /// <summary>
+    /// Renders a zone from the layout.
+    /// </summary>
+    /// <param name="name">The name of the zone to render.</param>
+    /// <param name="required">Whether the zone is required or not.</param>
+    public new Task<IHtmlContent> RenderSectionAsync(string name, bool required)
+    {
+        // We can replace the base implementation as it can't be called on a view that is not an actual MVC Layout.
 
-            if (required && zone.IsNullOrEmpty())
-            {
-                throw new InvalidOperationException("Zone not found: " + name);
-            }
+        ArgumentNullException.ThrowIfNull(name);
 
-            return DisplayAsync(zone);
-        }
+        var zone = ThemeLayout.Zones[name];
 
-        public static object OrDefault(object text, object other)
+        if (required && zone.IsNullOrEmpty())
         {
-            if (text == null || Convert.ToString(text) == "")
-            {
-                return other;
-            }
-
-            return text;
+            throw new InvalidOperationException("Zone not found: " + name);
         }
 
-        /// <summary>
-        /// Returns the full escaped path of the current request.
-        /// </summary>
-        public string FullRequestPath => Context.Request.PathBase + Context.Request.Path + Context.Request.QueryString;
-
-        /// <summary>
-        /// Gets the <see cref="ISite"/> instance.
-        /// </summary>
-        public ISite Site => _site ??= Context.Features.Get<RazorViewFeature>()?.Site;
+        return DisplayAsync(zone);
     }
 
-    public abstract class RazorPage : RazorPage<dynamic>
+    public static object OrDefault(object text, object other)
     {
+        if (text == null || Convert.ToString(text) == "")
+        {
+            return other;
+        }
+
+        return text;
     }
+
+    /// <summary>
+    /// Returns the full escaped path of the current request.
+    /// </summary>
+    public string FullRequestPath => Context.Request.PathBase + Context.Request.Path + Context.Request.QueryString;
+
+    /// <summary>
+    /// Gets the <see cref="ISite"/> instance.
+    /// </summary>
+    public ISite Site => _site ??= Context.Features.Get<RazorViewFeature>()?.Site;
+}
+
+public abstract class RazorPage : RazorPage<dynamic>
+{
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Razor/RazorShapeTemplateViewEngine.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Razor/RazorShapeTemplateViewEngine.cs
index beb54f6e477..a05261dfcb1 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Razor/RazorShapeTemplateViewEngine.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Razor/RazorShapeTemplateViewEngine.cs
@@ -20,166 +20,165 @@
 using OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy;
 using OrchardCore.DisplayManagement.Implementation;
 
-namespace OrchardCore.DisplayManagement.Razor
+namespace OrchardCore.DisplayManagement.Razor;
+
+public class RazorShapeTemplateViewEngine : IShapeTemplateViewEngine
 {
-    public class RazorShapeTemplateViewEngine : IShapeTemplateViewEngine
+    private readonly IOptions<MvcViewOptions> _options;
+    private readonly IEnumerable<IRazorViewExtensionProvider> _viewExtensionProviders;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly ViewContextAccessor _viewContextAccessor;
+    private readonly ITempDataProvider _tempDataProvider;
+    private readonly IHtmlHelper _htmlHelper;
+
+    public RazorShapeTemplateViewEngine(
+        IOptions<MvcViewOptions> options,
+        IEnumerable<IRazorViewExtensionProvider> viewExtensionProviders,
+        IHttpContextAccessor httpContextAccessor,
+        ViewContextAccessor viewContextAccessor,
+        ITempDataProvider tempDataProvider,
+        IHtmlHelper htmlHelper)
     {
-        private readonly IOptions<MvcViewOptions> _options;
-        private readonly IEnumerable<IRazorViewExtensionProvider> _viewExtensionProviders;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly ViewContextAccessor _viewContextAccessor;
-        private readonly ITempDataProvider _tempDataProvider;
-        private readonly IHtmlHelper _htmlHelper;
-
-        public RazorShapeTemplateViewEngine(
-            IOptions<MvcViewOptions> options,
-            IEnumerable<IRazorViewExtensionProvider> viewExtensionProviders,
-            IHttpContextAccessor httpContextAccessor,
-            ViewContextAccessor viewContextAccessor,
-            ITempDataProvider tempDataProvider,
-            IHtmlHelper htmlHelper)
-        {
-            _options = options;
-            _viewExtensionProviders = viewExtensionProviders;
-            _httpContextAccessor = httpContextAccessor;
-            _viewContextAccessor = viewContextAccessor;
-            _tempDataProvider = tempDataProvider;
-            _htmlHelper = htmlHelper;
-        }
+        _options = options;
+        _viewExtensionProviders = viewExtensionProviders;
+        _httpContextAccessor = httpContextAccessor;
+        _viewContextAccessor = viewContextAccessor;
+        _tempDataProvider = tempDataProvider;
+        _htmlHelper = htmlHelper;
+    }
 
-        public IEnumerable<string> TemplateFileExtensions
+    public IEnumerable<string> TemplateFileExtensions
+    {
+        get
         {
-            get
+            yield return RazorViewEngine.ViewExtension;
+            foreach (var provider in _viewExtensionProviders)
             {
-                yield return RazorViewEngine.ViewExtension;
-                foreach (var provider in _viewExtensionProviders)
-                {
-                    yield return provider.ViewExtension;
-                }
+                yield return provider.ViewExtension;
             }
         }
+    }
 
-        public Task<IHtmlContent> RenderAsync(string relativePath, DisplayContext displayContext)
-        {
-            var viewName = "/" + relativePath;
-            viewName = Path.ChangeExtension(viewName, RazorViewEngine.ViewExtension);
+    public Task<IHtmlContent> RenderAsync(string relativePath, DisplayContext displayContext)
+    {
+        var viewName = "/" + relativePath;
+        viewName = Path.ChangeExtension(viewName, RazorViewEngine.ViewExtension);
 
-            var viewContext = _viewContextAccessor.ViewContext;
+        var viewContext = _viewContextAccessor.ViewContext;
 
-            if (viewContext?.View != null)
-            {
-                var viewData = new ViewDataDictionary(viewContext.ViewData);
-                viewData.TemplateInfo.HtmlFieldPrefix = displayContext.HtmlFieldPrefix;
+        if (viewContext?.View != null)
+        {
+            var viewData = new ViewDataDictionary(viewContext.ViewData);
+            viewData.TemplateInfo.HtmlFieldPrefix = displayContext.HtmlFieldPrefix;
 
-                var htmlHelper = MakeHtmlHelper(viewContext, viewData);
-                return htmlHelper.PartialAsync(viewName, displayContext.Value);
-            }
-            else
-            {
-                return RenderRazorViewAsync(viewName, displayContext);
-            }
+            var htmlHelper = MakeHtmlHelper(viewContext, viewData);
+            return htmlHelper.PartialAsync(viewName, displayContext.Value);
         }
-
-        private async Task<IHtmlContent> RenderRazorViewAsync(string viewName, DisplayContext displayContext)
+        else
         {
-            var viewEngines = _options.Value.ViewEngines;
+            return RenderRazorViewAsync(viewName, displayContext);
+        }
+    }
 
-            if (viewEngines.Count == 0)
-            {
-                throw new InvalidOperationException(string.Format("'{0}.{1}' must not be empty. At least one '{2}' is required to locate a view for rendering.",
-                    typeof(MvcViewOptions).FullName,
-                    nameof(MvcViewOptions.ViewEngines),
-                    typeof(IViewEngine).FullName));
-            }
+    private async Task<IHtmlContent> RenderRazorViewAsync(string viewName, DisplayContext displayContext)
+    {
+        var viewEngines = _options.Value.ViewEngines;
 
-            var viewEngine = viewEngines[0];
+        if (viewEngines.Count == 0)
+        {
+            throw new InvalidOperationException(string.Format("'{0}.{1}' must not be empty. At least one '{2}' is required to locate a view for rendering.",
+                typeof(MvcViewOptions).FullName,
+                nameof(MvcViewOptions.ViewEngines),
+                typeof(IViewEngine).FullName));
+        }
 
-            var result = await RenderViewToStringAsync(viewName, displayContext.Value, viewEngine);
+        var viewEngine = viewEngines[0];
 
-            return new HtmlString(result);
-        }
+        var result = await RenderViewToStringAsync(viewName, displayContext.Value, viewEngine);
 
-        public async Task<string> RenderViewToStringAsync(string viewName, object model, IViewEngine viewEngine)
-        {
-            var actionContext = await GetActionContextAsync();
-            var view = FindView(actionContext, viewName, viewEngine);
-
-            using var output = new ZStringWriter();
-            var viewContext = new ViewContext(
-                actionContext,
-                view,
-                new ViewDataDictionary(
-                    metadataProvider: new EmptyModelMetadataProvider(),
-                    modelState: new ModelStateDictionary())
-                {
-                    Model = model
-                },
-                new TempDataDictionary(
-                    actionContext.HttpContext,
-                    _tempDataProvider),
-                output,
-                new HtmlHelperOptions());
-
-            await view.RenderAsync(viewContext);
-
-            return output.ToString();
-        }
+        return new HtmlString(result);
+    }
 
-        private static IView FindView(ActionContext actionContext, string viewName, IViewEngine viewEngine)
-        {
-            var getViewResult = viewEngine.GetView(executingFilePath: null, viewPath: viewName, isMainPage: true);
-            if (getViewResult.Success)
+    public async Task<string> RenderViewToStringAsync(string viewName, object model, IViewEngine viewEngine)
+    {
+        var actionContext = await GetActionContextAsync();
+        var view = FindView(actionContext, viewName, viewEngine);
+
+        using var output = new ZStringWriter();
+        var viewContext = new ViewContext(
+            actionContext,
+            view,
+            new ViewDataDictionary(
+                metadataProvider: new EmptyModelMetadataProvider(),
+                modelState: new ModelStateDictionary())
             {
-                return getViewResult.View;
-            }
+                Model = model
+            },
+            new TempDataDictionary(
+                actionContext.HttpContext,
+                _tempDataProvider),
+            output,
+            new HtmlHelperOptions());
 
-            var findViewResult = viewEngine.FindView(actionContext, viewName, isMainPage: true);
-            if (findViewResult.Success)
-            {
-                return findViewResult.View;
-            }
+        await view.RenderAsync(viewContext);
 
-            var searchedLocations = getViewResult.SearchedLocations.Concat(findViewResult.SearchedLocations);
-            var errorMessage = string.Join(
-                System.Environment.NewLine,
-                new[] { $"Unable to find view '{viewName}'. The following locations were searched:" }.Concat(searchedLocations));
+        return output.ToString();
+    }
 
-            throw new InvalidOperationException(errorMessage);
+    private static IView FindView(ActionContext actionContext, string viewName, IViewEngine viewEngine)
+    {
+        var getViewResult = viewEngine.GetView(executingFilePath: null, viewPath: viewName, isMainPage: true);
+        if (getViewResult.Success)
+        {
+            return getViewResult.View;
         }
 
-        private async Task<ActionContext> GetActionContextAsync()
+        var findViewResult = viewEngine.FindView(actionContext, viewName, isMainPage: true);
+        if (findViewResult.Success)
         {
-            var httpContext = _httpContextAccessor.HttpContext;
-            var actionContext = httpContext.RequestServices.GetService<IActionContextAccessor>()?.ActionContext;
-
-            if (actionContext != null)
-            {
-                return actionContext;
-            }
+            return findViewResult.View;
+        }
 
-            var routeData = new RouteData();
-            routeData.Routers.Add(new RouteCollection());
+        var searchedLocations = getViewResult.SearchedLocations.Concat(findViewResult.SearchedLocations);
+        var errorMessage = string.Join(
+            System.Environment.NewLine,
+            new[] { $"Unable to find view '{viewName}'. The following locations were searched:" }.Concat(searchedLocations));
 
-            actionContext = new ActionContext(httpContext, routeData, new ActionDescriptor());
-            var filters = httpContext.RequestServices.GetServices<IAsyncViewActionFilter>();
+        throw new InvalidOperationException(errorMessage);
+    }
 
-            foreach (var filter in filters)
-            {
-                await filter.OnActionExecutionAsync(actionContext);
-            }
+    private async Task<ActionContext> GetActionContextAsync()
+    {
+        var httpContext = _httpContextAccessor.HttpContext;
+        var actionContext = httpContext.RequestServices.GetService<IActionContextAccessor>()?.ActionContext;
 
+        if (actionContext != null)
+        {
             return actionContext;
         }
 
-        private IHtmlHelper MakeHtmlHelper(ViewContext viewContext, ViewDataDictionary viewData)
+        var routeData = new RouteData();
+        routeData.Routers.Add(new RouteCollection());
+
+        actionContext = new ActionContext(httpContext, routeData, new ActionDescriptor());
+        var filters = httpContext.RequestServices.GetServices<IAsyncViewActionFilter>();
+
+        foreach (var filter in filters)
         {
-            if (_htmlHelper is IViewContextAware contextAwareHelper)
-            {
-                var newViewContext = new ViewContext(viewContext, viewContext.View, viewData, viewContext.Writer);
-                contextAwareHelper.Contextualize(newViewContext);
-            }
+            await filter.OnActionExecutionAsync(actionContext);
+        }
+
+        return actionContext;
+    }
 
-            return _htmlHelper;
+    private IHtmlHelper MakeHtmlHelper(ViewContext viewContext, ViewDataDictionary viewData)
+    {
+        if (_htmlHelper is IViewContextAware contextAwareHelper)
+        {
+            var newViewContext = new ViewContext(viewContext, viewContext.View, viewData, viewContext.Writer);
+            contextAwareHelper.Contextualize(newViewContext);
         }
+
+        return _htmlHelper;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Razor/RazorViewActionFilter.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Razor/RazorViewActionFilter.cs
index 0e7d9438656..37d0900d637 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Razor/RazorViewActionFilter.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Razor/RazorViewActionFilter.cs
@@ -7,80 +7,79 @@
 using OrchardCore.Environment.Shell;
 using OrchardCore.Settings;
 
-namespace OrchardCore.DisplayManagement.Razor
+namespace OrchardCore.DisplayManagement.Razor;
+
+/// <summary>
+/// Inject commonly used data through an HttpContext feature <see cref="RazorViewFeature"/> such that
+/// e.g a <see cref="RazorPage"/> can reuse them when it's executed.
+/// </summary>
+public sealed class RazorViewActionFilter : IAsyncViewActionFilter
 {
-    /// <summary>
-    /// Inject commonly used data through an HttpContext feature <see cref="RazorViewFeature"/> such that
-    /// e.g a <see cref="RazorPage"/> can reuse them when it's executed.
-    /// </summary>
-    public sealed class RazorViewActionFilter : IAsyncViewActionFilter
+    public Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
     {
-        public Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
-        {
-            static async Task Awaited(Task task, ActionExecutionDelegate next)
-            {
-                await task;
-                await next();
-            }
-
-            var task = OnActionExecutionAsync(context);
-            return !task.IsCompletedSuccessfully
-                ? Awaited(task, next)
-                : next();
-        }
-
-        public async Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next)
+        static async Task Awaited(Task task, ActionExecutionDelegate next)
         {
-            await OnActionExecutionAsync(context);
+            await task;
             await next();
         }
 
-        public Task OnPageHandlerSelectionAsync(PageHandlerSelectedContext context)
+        var task = OnActionExecutionAsync(context);
+        return !task.IsCompletedSuccessfully
+            ? Awaited(task, next)
+            : next();
+    }
+
+    public async Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next)
+    {
+        await OnActionExecutionAsync(context);
+        await next();
+    }
+
+    public Task OnPageHandlerSelectionAsync(PageHandlerSelectedContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    // Used as a service when we create a fake 'ActionContext'.
+    public async Task OnActionExecutionAsync(ActionContext context)
+    {
+        var razorViewFeature = context.HttpContext.Features.Get<RazorViewFeature>();
+
+        if (razorViewFeature is null)
         {
-            return Task.CompletedTask;
+            razorViewFeature = new RazorViewFeature();
+            context.HttpContext.Features.Set(razorViewFeature);
         }
 
-        // Used as a service when we create a fake 'ActionContext'.
-        public async Task OnActionExecutionAsync(ActionContext context)
+        if (razorViewFeature.Site is null)
         {
-            var razorViewFeature = context.HttpContext.Features.Get<RazorViewFeature>();
+            var shellSettings = context.HttpContext.RequestServices.GetService<ShellSettings>();
+            var siteService = context.HttpContext.RequestServices.GetService<ISiteService>();
 
-            if (razorViewFeature is null)
+            // 'ISiteService' may be null during a setup and can't be used if the tenant is 'Uninitialized'.
+            if (siteService is not null && !shellSettings.IsUninitialized())
             {
-                razorViewFeature = new RazorViewFeature();
-                context.HttpContext.Features.Set(razorViewFeature);
+                razorViewFeature.Site = await siteService.GetSiteSettingsAsync();
             }
+        }
 
-            if (razorViewFeature.Site is null)
-            {
-                var shellSettings = context.HttpContext.RequestServices.GetService<ShellSettings>();
-                var siteService = context.HttpContext.RequestServices.GetService<ISiteService>();
-
-                // 'ISiteService' may be null during a setup and can't be used if the tenant is 'Uninitialized'.
-                if (siteService is not null && !shellSettings.IsUninitialized())
-                {
-                    razorViewFeature.Site = await siteService.GetSiteSettingsAsync();
-                }
-            }
+        if (razorViewFeature.ThemeLayout is null)
+        {
+            var layoutAccessor = context.HttpContext.RequestServices.GetService<ILayoutAccessor>();
 
-            if (razorViewFeature.ThemeLayout is null)
+            if (layoutAccessor is not null)
             {
-                var layoutAccessor = context.HttpContext.RequestServices.GetService<ILayoutAccessor>();
-
-                if (layoutAccessor is not null)
-                {
-                    razorViewFeature.ThemeLayout = await layoutAccessor.GetLayoutAsync();
-                }
+                razorViewFeature.ThemeLayout = await layoutAccessor.GetLayoutAsync();
             }
+        }
 
-            if (razorViewFeature.Theme is null)
-            {
-                var themeManager = context.HttpContext.RequestServices.GetService<IThemeManager>();
+        if (razorViewFeature.Theme is null)
+        {
+            var themeManager = context.HttpContext.RequestServices.GetService<IThemeManager>();
 
-                if (themeManager is not null)
-                {
-                    razorViewFeature.Theme = await themeManager.GetThemeAsync();
-                }
+            if (themeManager is not null)
+            {
+                razorViewFeature.Theme = await themeManager.GetThemeAsync();
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Razor/RazorViewFeature.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Razor/RazorViewFeature.cs
index cb1aa02407e..b1b34f78146 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Razor/RazorViewFeature.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Razor/RazorViewFeature.cs
@@ -2,26 +2,25 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Settings;
 
-namespace OrchardCore.DisplayManagement.Razor
+namespace OrchardCore.DisplayManagement.Razor;
+
+/// <summary>
+/// Used to capture commonly used data that can be retrieved e.g by a <see cref="RazorPage"/>.
+/// </summary>
+public class RazorViewFeature
 {
     /// <summary>
-    /// Used to capture commonly used data that can be retrieved e.g by a <see cref="RazorPage"/>.
+    /// The <see cref="ISite"/> instance.
     /// </summary>
-    public class RazorViewFeature
-    {
-        /// <summary>
-        /// The <see cref="ISite"/> instance.
-        /// </summary>
-        public ISite Site { get; set; }
+    public ISite Site { get; set; }
 
-        /// <summary>
-        /// The current theme layout.
-        /// </summary>
-        public IZoneHolding ThemeLayout { get; set; }
+    /// <summary>
+    /// The current theme layout.
+    /// </summary>
+    public IZoneHolding ThemeLayout { get; set; }
 
-        /// <summary>
-        /// The current theme.
-        /// </summary>
-        public IExtensionInfo Theme { get; set; }
-    }
+    /// <summary>
+    /// The current theme.
+    /// </summary>
+    public IExtensionInfo Theme { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/RazorPages/Page.cs b/src/OrchardCore/OrchardCore.DisplayManagement/RazorPages/Page.cs
index 8f975d0b80e..fbe2a741d8d 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/RazorPages/Page.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/RazorPages/Page.cs
@@ -11,274 +11,273 @@
 using OrchardCore.DisplayManagement.Zones;
 using OrchardCore.Settings;
 
-namespace OrchardCore.DisplayManagement.RazorPages
+namespace OrchardCore.DisplayManagement.RazorPages;
+
+public abstract class Page : Microsoft.AspNetCore.Mvc.RazorPages.Page
 {
-    public abstract class Page : Microsoft.AspNetCore.Mvc.RazorPages.Page
-    {
-        private IDisplayHelper _displayHelper;
-        private IShapeFactory _shapeFactory;
-        private IOrchardDisplayHelper _orchardHelper;
-        private ISite _site;
+    private IDisplayHelper _displayHelper;
+    private IShapeFactory _shapeFactory;
+    private IOrchardDisplayHelper _orchardHelper;
+    private ISite _site;
 
-        public override ViewContext ViewContext
+    public override ViewContext ViewContext
+    {
+        get => base.ViewContext;
+        set
         {
-            get => base.ViewContext;
-            set
-            {
-                // We make the ViewContext available to other sub-systems that need it.
-                var viewContextAccessor = value.HttpContext.RequestServices.GetService<ViewContextAccessor>();
-                base.ViewContext = viewContextAccessor.ViewContext = value;
-            }
+            // We make the ViewContext available to other sub-systems that need it.
+            var viewContextAccessor = value.HttpContext.RequestServices.GetService<ViewContextAccessor>();
+            base.ViewContext = viewContextAccessor.ViewContext = value;
         }
+    }
 
-        private void EnsureDisplayHelper() => _displayHelper ??= HttpContext.RequestServices.GetService<IDisplayHelper>();
-
-        private void EnsureShapeFactory() => _shapeFactory ??= HttpContext.RequestServices.GetService<IShapeFactory>();
-
-        /// <summary>
-        /// Gets a dynamic shape factory to create new shapes.
-        /// </summary>
-        /// <example>
-        /// Usage:
-        /// <code>
-        /// await New.MyShape()
-        /// await New.MyShape(A: 1, B: "Some text")
-        /// (await New.MyShape()).A(1).B("Some text")
-        /// </code>
-        /// </example>
-        public dynamic New => Factory;
-
-        /// <summary>
-        /// Gets an <see cref="IShapeFactory"/> to create new shapes.
-        /// </summary>
-        public IShapeFactory Factory
+    private void EnsureDisplayHelper() => _displayHelper ??= HttpContext.RequestServices.GetService<IDisplayHelper>();
+
+    private void EnsureShapeFactory() => _shapeFactory ??= HttpContext.RequestServices.GetService<IShapeFactory>();
+
+    /// <summary>
+    /// Gets a dynamic shape factory to create new shapes.
+    /// </summary>
+    /// <example>
+    /// Usage:
+    /// <code>
+    /// await New.MyShape()
+    /// await New.MyShape(A: 1, B: "Some text")
+    /// (await New.MyShape()).A(1).B("Some text")
+    /// </code>
+    /// </example>
+    public dynamic New => Factory;
+
+    /// <summary>
+    /// Gets an <see cref="IShapeFactory"/> to create new shapes.
+    /// </summary>
+    public IShapeFactory Factory
+    {
+        get
         {
-            get
-            {
-                EnsureShapeFactory();
-                return _shapeFactory;
-            }
+            EnsureShapeFactory();
+            return _shapeFactory;
         }
+    }
 
-        /// <summary>
-        /// Renders a shape.
-        /// </summary>
-        /// <param name="shape">The shape.</param>
-        public Task<IHtmlContent> DisplayAsync(dynamic shape)
+    /// <summary>
+    /// Renders a shape.
+    /// </summary>
+    /// <param name="shape">The shape.</param>
+    public Task<IHtmlContent> DisplayAsync(dynamic shape)
+    {
+        if (shape is IShape s)
         {
-            if (shape is IShape s)
-            {
-                EnsureDisplayHelper();
-                return _displayHelper.ShapeExecuteAsync(s);
-            }
-
-            if (shape is IHtmlContent hc)
-            {
-                return Task.FromResult(hc);
-            }
-
-            if (shape is string str)
-            {
-                return Task.FromResult<IHtmlContent>(new HtmlContentString(str));
-            }
+            EnsureDisplayHelper();
+            return _displayHelper.ShapeExecuteAsync(s);
+        }
 
-            throw new ArgumentException("DisplayAsync requires an instance of IShape");
+        if (shape is IHtmlContent hc)
+        {
+            return Task.FromResult(hc);
         }
 
-        /// <summary>
-        /// Renders a shape.
-        /// </summary>
-        /// <param name="shape">The shape.</param>
-        public Task<IHtmlContent> DisplayAsync(IShape shape)
+        if (shape is string str)
         {
-            EnsureDisplayHelper();
-            return _displayHelper.ShapeExecuteAsync(shape);
+            return Task.FromResult<IHtmlContent>(new HtmlContentString(str));
         }
 
-        public IOrchardDisplayHelper Orchard
+        throw new ArgumentException("DisplayAsync requires an instance of IShape");
+    }
+
+    /// <summary>
+    /// Renders a shape.
+    /// </summary>
+    /// <param name="shape">The shape.</param>
+    public Task<IHtmlContent> DisplayAsync(IShape shape)
+    {
+        EnsureDisplayHelper();
+        return _displayHelper.ShapeExecuteAsync(shape);
+    }
+
+    public IOrchardDisplayHelper Orchard
+    {
+        get
         {
-            get
+            if (_orchardHelper == null)
             {
-                if (_orchardHelper == null)
-                {
-                    EnsureDisplayHelper();
-                    _orchardHelper = new OrchardDisplayHelper(HttpContext, _displayHelper);
-                }
-
-                return _orchardHelper;
+                EnsureDisplayHelper();
+                _orchardHelper = new OrchardDisplayHelper(HttpContext, _displayHelper);
             }
+
+            return _orchardHelper;
         }
+    }
 
-        private IZoneHolding _themeLayout;
+    private IZoneHolding _themeLayout;
 
-        public IZoneHolding ThemeLayout
-        {
-            get => _themeLayout ??= HttpContext.Features.Get<RazorViewFeature>()?.ThemeLayout;
-            set => _themeLayout = value;
-        }
+    public IZoneHolding ThemeLayout
+    {
+        get => _themeLayout ??= HttpContext.Features.Get<RazorViewFeature>()?.ThemeLayout;
+        set => _themeLayout = value;
+    }
 
-        public string ViewLayout
+    public string ViewLayout
+    {
+        get
         {
-            get
+            if (ThemeLayout is IShape layout)
             {
-                if (ThemeLayout is IShape layout)
+                if (layout.Metadata.Alternates.Count > 0)
                 {
-                    if (layout.Metadata.Alternates.Count > 0)
-                    {
-                        return layout.Metadata.Alternates.Last;
-                    }
-
-                    return layout.Metadata.Type;
+                    return layout.Metadata.Alternates.Last;
                 }
 
-                return string.Empty;
+                return layout.Metadata.Type;
             }
 
-            set
+            return string.Empty;
+        }
+
+        set
+        {
+            if (ThemeLayout is IShape layout)
             {
-                if (ThemeLayout is IShape layout)
+                if (layout.Metadata.Alternates.Contains(value))
                 {
-                    if (layout.Metadata.Alternates.Contains(value))
+                    if (layout.Metadata.Alternates.Last == value)
                     {
-                        if (layout.Metadata.Alternates.Last == value)
-                        {
-                            return;
-                        }
-
-                        layout.Metadata.Alternates.Remove(value);
+                        return;
                     }
 
-                    layout.Metadata.Alternates.Add(value);
+                    layout.Metadata.Alternates.Remove(value);
                 }
+
+                layout.Metadata.Alternates.Add(value);
             }
         }
+    }
 
-        private IPageTitleBuilder _pageTitleBuilder;
+    private IPageTitleBuilder _pageTitleBuilder;
 
-        public IPageTitleBuilder Title => _pageTitleBuilder ??= HttpContext.RequestServices.GetRequiredService<IPageTitleBuilder>();
+    public IPageTitleBuilder Title => _pageTitleBuilder ??= HttpContext.RequestServices.GetRequiredService<IPageTitleBuilder>();
 
-        private IViewLocalizer _t;
+    private IViewLocalizer _t;
 
-        /// <summary>
-        /// The <see cref="IViewLocalizer"/> instance for the current view.
-        /// </summary>
-        public IViewLocalizer T
+    /// <summary>
+    /// The <see cref="IViewLocalizer"/> instance for the current view.
+    /// </summary>
+    public IViewLocalizer T
+    {
+        get
         {
-            get
+            if (_t == null)
             {
-                if (_t == null)
-                {
-                    _t = HttpContext.RequestServices.GetRequiredService<IViewLocalizer>();
-                    ((IViewContextAware)_t).Contextualize(ViewContext);
-                }
-
-                return _t;
+                _t = HttpContext.RequestServices.GetRequiredService<IViewLocalizer>();
+                ((IViewContextAware)_t).Contextualize(ViewContext);
             }
-        }
 
-        /// <summary>
-        /// Adds a segment to the title and returns all segments.
-        /// </summary>
-        /// <param name="segment">The segment to add to the title.</param>
-        /// <param name="position">Optional. The position of the segment in the title.</param>
-        /// <param name="separator">The html string that should separate all segments.</param>
-        /// <returns>And <see cref="IHtmlContent"/> instance representing the full title.</returns>
-        public IHtmlContent RenderTitleSegments(IHtmlContent segment, string position = "0", IHtmlContent separator = null)
-        {
-            Title.AddSegment(segment, position);
-            return Title.GenerateTitle(separator);
+            return _t;
         }
+    }
 
-        /// <summary>
-        /// Adds a segment to the title and returns all segments.
-        /// </summary>
-        /// <param name="segment">The segment to add to the title.</param>
-        /// <param name="position">Optional. The position of the segment in the title.</param>
-        /// <param name="separator">The html string that should separate all segments.</param>
-        /// <returns>And <see cref="IHtmlContent"/> instance representing the full title.</returns>
-        public IHtmlContent RenderTitleSegments(string segment, string position = "0", IHtmlContent separator = null)
-        {
-            Title.AddSegment(new HtmlContentString(segment), position);
-            return Title.GenerateTitle(separator);
-        }
+    /// <summary>
+    /// Adds a segment to the title and returns all segments.
+    /// </summary>
+    /// <param name="segment">The segment to add to the title.</param>
+    /// <param name="position">Optional. The position of the segment in the title.</param>
+    /// <param name="separator">The html string that should separate all segments.</param>
+    /// <returns>And <see cref="IHtmlContent"/> instance representing the full title.</returns>
+    public IHtmlContent RenderTitleSegments(IHtmlContent segment, string position = "0", IHtmlContent separator = null)
+    {
+        Title.AddSegment(segment, position);
+        return Title.GenerateTitle(separator);
+    }
 
-        /// <summary>
-        /// Creates a <see cref="TagBuilder"/> to render a shape.
-        /// </summary>
-        /// <param name="shape">The shape.</param>
-        /// <returns>A new <see cref="TagBuilder"/>.</returns>
-        public static TagBuilder Tag(IShape shape) => shape.GetTagBuilder();
-
-        /// <summary>
-        /// Creates a <see cref="TagBuilder"/> to render a shape.
-        /// </summary>
-        /// <param name="shape">The shape.</param>
-        /// <param name="tag">The tag name to use.</param>
-        /// <returns>A new <see cref="TagBuilder"/>.</returns>
-        public static TagBuilder Tag(IShape shape, string tag) => shape.GetTagBuilder(tag);
-
-        /// <summary>
-        /// Check if a zone is defined in the layout or it has items.
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public bool IsSectionDefined(string name)
-        {
-            // We can replace the base implementation as it can't be called on a view that is not an actual MVC Layout.
+    /// <summary>
+    /// Adds a segment to the title and returns all segments.
+    /// </summary>
+    /// <param name="segment">The segment to add to the title.</param>
+    /// <param name="position">Optional. The position of the segment in the title.</param>
+    /// <param name="separator">The html string that should separate all segments.</param>
+    /// <returns>And <see cref="IHtmlContent"/> instance representing the full title.</returns>
+    public IHtmlContent RenderTitleSegments(string segment, string position = "0", IHtmlContent separator = null)
+    {
+        Title.AddSegment(new HtmlContentString(segment), position);
+        return Title.GenerateTitle(separator);
+    }
 
-            ArgumentNullException.ThrowIfNull(name);
+    /// <summary>
+    /// Creates a <see cref="TagBuilder"/> to render a shape.
+    /// </summary>
+    /// <param name="shape">The shape.</param>
+    /// <returns>A new <see cref="TagBuilder"/>.</returns>
+    public static TagBuilder Tag(IShape shape) => shape.GetTagBuilder();
+
+    /// <summary>
+    /// Creates a <see cref="TagBuilder"/> to render a shape.
+    /// </summary>
+    /// <param name="shape">The shape.</param>
+    /// <param name="tag">The tag name to use.</param>
+    /// <returns>A new <see cref="TagBuilder"/>.</returns>
+    public static TagBuilder Tag(IShape shape, string tag) => shape.GetTagBuilder(tag);
+
+    /// <summary>
+    /// Check if a zone is defined in the layout or it has items.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public bool IsSectionDefined(string name)
+    {
+        // We can replace the base implementation as it can't be called on a view that is not an actual MVC Layout.
 
-            return ThemeLayout.Zones.IsNotEmpty(name);
-        }
+        ArgumentNullException.ThrowIfNull(name);
 
-        /// <summary>
-        /// Renders a zone from the RazorPages.
-        /// </summary>
-        /// <param name="name">The name of the zone to render.</param>
-        public Task<IHtmlContent> RenderSectionAsync(string name)
-        {
-            ArgumentNullException.ThrowIfNull(name);
+        return ThemeLayout.Zones.IsNotEmpty(name);
+    }
 
-            return RenderSectionAsync(name, required: true);
-        }
+    /// <summary>
+    /// Renders a zone from the RazorPages.
+    /// </summary>
+    /// <param name="name">The name of the zone to render.</param>
+    public Task<IHtmlContent> RenderSectionAsync(string name)
+    {
+        ArgumentNullException.ThrowIfNull(name);
 
-        /// <summary>
-        /// Renders a zone from the RazorPages.
-        /// </summary>
-        /// <param name="name">The name of the zone to render.</param>
-        /// <param name="required">Whether the zone is required or not.</param>
-        public Task<IHtmlContent> RenderSectionAsync(string name, bool required)
-        {
-            ArgumentNullException.ThrowIfNull(name);
+        return RenderSectionAsync(name, required: true);
+    }
 
-            var zone = ThemeLayout.Zones[name];
+    /// <summary>
+    /// Renders a zone from the RazorPages.
+    /// </summary>
+    /// <param name="name">The name of the zone to render.</param>
+    /// <param name="required">Whether the zone is required or not.</param>
+    public Task<IHtmlContent> RenderSectionAsync(string name, bool required)
+    {
+        ArgumentNullException.ThrowIfNull(name);
 
-            if (required && zone.IsNullOrEmpty())
-            {
-                throw new InvalidOperationException("Zone not found: " + name);
-            }
+        var zone = ThemeLayout.Zones[name];
 
-            return DisplayAsync(zone);
+        if (required && zone.IsNullOrEmpty())
+        {
+            throw new InvalidOperationException("Zone not found: " + name);
         }
 
-        public static object OrDefault(object text, object other)
-        {
-            if (text == null || Convert.ToString(text) == "")
-            {
-                return other;
-            }
+        return DisplayAsync(zone);
+    }
 
-            return text;
+    public static object OrDefault(object text, object other)
+    {
+        if (text == null || Convert.ToString(text) == "")
+        {
+            return other;
         }
 
-        /// <summary>
-        /// Returns the full escaped path of the current request.
-        /// </summary>
-        public string FullRequestPath => HttpContext.Request.PathBase + HttpContext.Request.Path + HttpContext.Request.QueryString;
-
-        /// <summary>
-        /// Gets the <see cref="ISite"/> instance.
-        /// </summary>
-        public ISite Site => _site ??= HttpContext.Features.Get<RazorViewFeature>()?.Site;
+        return text;
     }
+
+    /// <summary>
+    /// Returns the full escaped path of the current request.
+    /// </summary>
+    public string FullRequestPath => HttpContext.Request.PathBase + HttpContext.Request.Path + HttpContext.Request.QueryString;
+
+    /// <summary>
+    /// Gets the <see cref="ISite"/> instance.
+    /// </summary>
+    public ISite Site => _site ??= HttpContext.Features.Get<RazorViewFeature>()?.Site;
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/ShapeAttribute.cs b/src/OrchardCore/OrchardCore.DisplayManagement/ShapeAttribute.cs
index 6a98bf8e312..5ea1ec3171b 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/ShapeAttribute.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/ShapeAttribute.cs
@@ -1,19 +1,18 @@
 using System;
 
-namespace OrchardCore.DisplayManagement
+namespace OrchardCore.DisplayManagement;
+
+[AttributeUsage(AttributeTargets.Method)]
+public class ShapeAttribute : Attribute
 {
-    [AttributeUsage(AttributeTargets.Method)]
-    public class ShapeAttribute : Attribute
+    public ShapeAttribute()
     {
-        public ShapeAttribute()
-        {
-        }
-
-        public ShapeAttribute(string shapeType)
-        {
-            ShapeType = shapeType;
-        }
+    }
 
-        public string ShapeType { get; private set; }
+    public ShapeAttribute(string shapeType)
+    {
+        ShapeType = shapeType;
     }
+
+    public string ShapeType { get; private set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/AlternatesCollection.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/AlternatesCollection.cs
index ef47101722a..90d751fc638 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/AlternatesCollection.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/AlternatesCollection.cs
@@ -4,130 +4,129 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 
-namespace OrchardCore.DisplayManagement.Shapes
+namespace OrchardCore.DisplayManagement.Shapes;
+
+/// <summary>
+/// An ordered collection optimized for lookups.
+/// </summary>
+public class AlternatesCollection : IEnumerable<string>
 {
-    /// <summary>
-    /// An ordered collection optimized for lookups.
-    /// </summary>
-    public class AlternatesCollection : IEnumerable<string>
-    {
-        public static readonly AlternatesCollection Empty = [];
+    public static readonly AlternatesCollection Empty = [];
 
-        private KeyedAlternateCollection _collection;
+    private KeyedAlternateCollection _collection;
 
-        public AlternatesCollection(params string[] alternates)
-        {
-            EnsureCollection();
+    public AlternatesCollection(params string[] alternates)
+    {
+        EnsureCollection();
 
-            foreach (var alternate in alternates)
-            {
-                Add(alternate);
-            }
+        foreach (var alternate in alternates)
+        {
+            Add(alternate);
         }
+    }
 
-        public string this[int index] => _collection?[index] ?? "";
+    public string this[int index] => _collection?[index] ?? "";
 
-        public string Last => _collection?.LastOrDefault() ?? "";
+    public string Last => _collection?.LastOrDefault() ?? "";
 
-        public void Add(string alternate)
-        {
-            ArgumentNullException.ThrowIfNull(alternate);
+    public void Add(string alternate)
+    {
+        ArgumentNullException.ThrowIfNull(alternate);
 
-            EnsureCollection();
+        EnsureCollection();
 
-            if (!_collection.Contains(alternate))
-            {
-                _collection.Add(alternate);
-            }
+        if (!_collection.Contains(alternate))
+        {
+            _collection.Add(alternate);
         }
+    }
+
+    public void Remove(string alternate)
+    {
+        ArgumentNullException.ThrowIfNull(alternate);
 
-        public void Remove(string alternate)
+        if (_collection == null)
         {
-            ArgumentNullException.ThrowIfNull(alternate);
+            return;
+        }
 
-            if (_collection == null)
-            {
-                return;
-            }
+        _collection.Remove(alternate);
+    }
 
-            _collection.Remove(alternate);
+    public void Clear()
+    {
+        if (_collection == null)
+        {
+            return;
         }
 
-        public void Clear()
-        {
-            if (_collection == null)
-            {
-                return;
-            }
+        _collection.Clear();
+    }
 
-            _collection.Clear();
-        }
+    public bool Contains(string alternate)
+    {
+        ArgumentNullException.ThrowIfNull(alternate);
 
-        public bool Contains(string alternate)
+        if (_collection == null)
         {
-            ArgumentNullException.ThrowIfNull(alternate);
+            return false;
+        }
 
-            if (_collection == null)
-            {
-                return false;
-            }
+        return _collection.Contains(alternate);
+    }
 
-            return _collection.Contains(alternate);
-        }
+    public int Count => _collection == null ? 0 : _collection.Count;
 
-        public int Count => _collection == null ? 0 : _collection.Count;
+    public void AddRange(AlternatesCollection alternates)
+    {
+        AddRange(alternates._collection);
+    }
 
-        public void AddRange(AlternatesCollection alternates)
-        {
-            AddRange(alternates._collection);
-        }
+    public void AddRange(IEnumerable<string> alternates)
+    {
+        ArgumentNullException.ThrowIfNull(alternates);
 
-        public void AddRange(IEnumerable<string> alternates)
+        if (alternates.Any())
         {
-            ArgumentNullException.ThrowIfNull(alternates);
+            EnsureCollection();
 
-            if (alternates.Any())
+            foreach (var alternate in alternates)
             {
-                EnsureCollection();
-
-                foreach (var alternate in alternates)
-                {
-                    Add(alternate);
-                }
+                Add(alternate);
             }
         }
+    }
 
-        private void EnsureCollection()
+    private void EnsureCollection()
+    {
+        if (this == Empty)
         {
-            if (this == Empty)
-            {
-                throw new NotSupportedException("AlternateCollection can't be changed.");
-            }
-
-            _collection ??= new KeyedAlternateCollection();
+            throw new NotSupportedException("AlternateCollection can't be changed.");
         }
 
-        public IEnumerator<string> GetEnumerator()
-        {
-            if (_collection == null)
-            {
-                return ((IEnumerable<string>)[]).GetEnumerator();
-            }
-
-            return _collection.GetEnumerator();
-        }
+        _collection ??= new KeyedAlternateCollection();
+    }
 
-        IEnumerator IEnumerable.GetEnumerator()
+    public IEnumerator<string> GetEnumerator()
+    {
+        if (_collection == null)
         {
-            return GetEnumerator();
+            return ((IEnumerable<string>)[]).GetEnumerator();
         }
 
-        private sealed class KeyedAlternateCollection : KeyedCollection<string, string>
+        return _collection.GetEnumerator();
+    }
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return GetEnumerator();
+    }
+
+    private sealed class KeyedAlternateCollection : KeyedCollection<string, string>
+    {
+        protected override string GetKeyForItem(string item)
         {
-            protected override string GetKeyForItem(string item)
-            {
-                return item;
-            }
+            return item;
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/Composite.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/Composite.cs
index 8118700e6df..17e88d67ebd 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/Composite.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/Composite.cs
@@ -3,246 +3,245 @@
 using System.Linq;
 using System.Linq.Expressions;
 
-namespace OrchardCore.DisplayManagement.Shapes
+namespace OrchardCore.DisplayManagement.Shapes;
+
+public class Composite : DynamicObject
 {
-    public class Composite : DynamicObject
+    protected readonly Dictionary<string, object> _properties = [];
+
+    public override bool TryGetMember(GetMemberBinder binder, out object result)
     {
-        protected readonly Dictionary<string, object> _properties = [];
+        return TryGetMemberImpl(binder.Name, out result);
+    }
 
-        public override bool TryGetMember(GetMemberBinder binder, out object result)
+    protected virtual bool TryGetMemberImpl(string name, out object result)
+    {
+        if (_properties.TryGetValue(name, out result))
         {
-            return TryGetMemberImpl(binder.Name, out result);
+            return true;
         }
 
-        protected virtual bool TryGetMemberImpl(string name, out object result)
-        {
-            if (_properties.TryGetValue(name, out result))
-            {
-                return true;
-            }
+        result = null;
+        return true;
+    }
 
-            result = null;
-            return true;
-        }
+    public override bool TrySetMember(SetMemberBinder binder, object value)
+    {
+        return TrySetMemberImpl(binder.Name, value);
+    }
 
-        public override bool TrySetMember(SetMemberBinder binder, object value)
-        {
-            return TrySetMemberImpl(binder.Name, value);
-        }
+    protected virtual bool TrySetMemberImpl(string name, object value)
+    {
+        _properties[name] = value;
+        return true;
+    }
 
-        protected virtual bool TrySetMemberImpl(string name, object value)
+    public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result)
+    {
+        if (args.Length == 0)
         {
-            _properties[name] = value;
-            return true;
+            return TryGetMemberImpl(binder.Name, out result);
         }
 
-        public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result)
+        // Method call with one argument will assign the property.
+        if (args.Length == 1)
         {
-            if (args.Length == 0)
-            {
-                return TryGetMemberImpl(binder.Name, out result);
-            }
-
-            // Method call with one argument will assign the property.
-            if (args.Length == 1)
-            {
-                result = this;
-                return TrySetMemberImpl(binder.Name, args.First());
-            }
-
-            if (!base.TryInvokeMember(binder, args, out result))
-            {
-                if (binder.Name == "ToString")
-                {
-                    result = string.Empty;
-                    return true;
-                }
-
-                return false;
-            }
-
-            return true;
+            result = this;
+            return TrySetMemberImpl(binder.Name, args.First());
         }
 
-        public virtual bool TryGetIndexImpl(string name, out object result)
+        if (!base.TryInvokeMember(binder, args, out result))
         {
-            if (name != null && TryGetMemberImpl(name, out result))
+            if (binder.Name == "ToString")
             {
+                result = string.Empty;
                 return true;
             }
-            else
-            {
-                result = null;
-                return false;
-            }
-        }
 
-        public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out object result)
-        {
-            if (indexes.Length == 1)
-            {
-                var stringIndex = indexes[0] as string;
-
-                return TryGetIndexImpl(stringIndex, out result);
-            }
-            // Returning false results in a RuntimeBinderException if the index supplied is not an existing string property name.
-            result = null;
             return false;
         }
 
-        public override bool TrySetIndex(SetIndexBinder binder, object[] indexes, object value)
-        {
-            if (indexes.Length == 1)
-            {
-                // try to access an existing member.
-                var stringIndex = indexes[0] as string;
-
-                if (stringIndex != null && TrySetMemberImpl(stringIndex, value))
-                {
-                    return true;
-                }
-                else
-                {
-                    // Returning false results in a RuntimeBinderException if the index supplied is not an existing string property name.
-                    return false;
-                }
-            }
-            // Returning false results in a RuntimeBinderException if the index supplied is not an existing string property name.
-            return false;
-        }
+        return true;
+    }
 
-        public IDictionary<string, object> Properties
+    public virtual bool TryGetIndexImpl(string name, out object result)
+    {
+        if (name != null && TryGetMemberImpl(name, out result))
         {
-            get { return _properties; }
+            return true;
         }
-
-        public static bool operator ==(Composite a, Nil _)
+        else
         {
-            return null == a;
+            result = null;
+            return false;
         }
+    }
 
-        public static bool operator !=(Composite a, Nil b)
+    public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out object result)
+    {
+        if (indexes.Length == 1)
         {
-            return !(a == b);
-        }
+            var stringIndex = indexes[0] as string;
 
-        protected bool Equals(Composite other)
-        {
-            return Equals(_properties, other._properties);
+            return TryGetIndexImpl(stringIndex, out result);
         }
+        // Returning false results in a RuntimeBinderException if the index supplied is not an existing string property name.
+        result = null;
+        return false;
+    }
 
-        public override bool Equals(object obj)
+    public override bool TrySetIndex(SetIndexBinder binder, object[] indexes, object value)
+    {
+        if (indexes.Length == 1)
         {
-            if (obj is null)
-            {
-                return false;
-            }
+            // try to access an existing member.
+            var stringIndex = indexes[0] as string;
 
-            if (ReferenceEquals(this, obj))
+            if (stringIndex != null && TrySetMemberImpl(stringIndex, value))
             {
                 return true;
             }
-
-            if (obj.GetType() != GetType())
+            else
             {
+                // Returning false results in a RuntimeBinderException if the index supplied is not an existing string property name.
                 return false;
             }
-
-            return Equals((Composite)obj);
         }
+        // Returning false results in a RuntimeBinderException if the index supplied is not an existing string property name.
+        return false;
+    }
 
-        public override int GetHashCode()
-        {
-            return (_properties != null ? _properties.GetHashCode() : 0);
-        }
+    public IDictionary<string, object> Properties
+    {
+        get { return _properties; }
+    }
+
+    public static bool operator ==(Composite a, Nil _)
+    {
+        return null == a;
     }
 
-    public class Nil : DynamicObject
+    public static bool operator !=(Composite a, Nil b)
     {
-        private static readonly Nil _singleton = new();
-        public static Nil Instance { get { return _singleton; } }
+        return !(a == b);
+    }
 
-        private Nil()
-        {
-        }
+    protected bool Equals(Composite other)
+    {
+        return Equals(_properties, other._properties);
+    }
 
-        public override bool TryGetMember(GetMemberBinder binder, out object result)
+    public override bool Equals(object obj)
+    {
+        if (obj is null)
         {
-            result = Instance;
-            return true;
+            return false;
         }
 
-        public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out object result)
+        if (ReferenceEquals(this, obj))
         {
-            result = Instance;
             return true;
         }
 
-        public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result)
+        if (obj.GetType() != GetType())
         {
-            result = Nil.Instance;
-            return true;
+            return false;
         }
 
-        public override bool TryBinaryOperation(BinaryOperationBinder binder, object arg, out object result)
-        {
-            switch (binder.Operation)
-            {
-                case ExpressionType.Equal:
-                    result = ReferenceEquals(arg, Nil.Instance) || arg == null;
-                    return true;
-                case ExpressionType.NotEqual:
-                    result = !ReferenceEquals(arg, Nil.Instance) && arg != null;
-                    return true;
-            }
+        return Equals((Composite)obj);
+    }
 
-            return base.TryBinaryOperation(binder, arg, out result);
-        }
+    public override int GetHashCode()
+    {
+        return (_properties != null ? _properties.GetHashCode() : 0);
+    }
+}
 
-        public static bool operator ==(Nil _1, Nil _2)
-        {
-            return true;
-        }
+public class Nil : DynamicObject
+{
+    private static readonly Nil _singleton = new();
+    public static Nil Instance { get { return _singleton; } }
 
-        public static bool operator !=(Nil _1, Nil _2)
-        {
-            return false;
-        }
+    private Nil()
+    {
+    }
 
-        public static bool operator ==(Nil a, object b)
-        {
-            return ReferenceEquals(a, b) || b == null;
-        }
+    public override bool TryGetMember(GetMemberBinder binder, out object result)
+    {
+        result = Instance;
+        return true;
+    }
 
-        public static bool operator !=(Nil a, object b)
-        {
-            return !(a == b);
-        }
+    public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out object result)
+    {
+        result = Instance;
+        return true;
+    }
 
-        public override bool Equals(object obj)
+    public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result)
+    {
+        result = Nil.Instance;
+        return true;
+    }
+
+    public override bool TryBinaryOperation(BinaryOperationBinder binder, object arg, out object result)
+    {
+        switch (binder.Operation)
         {
-            if (obj == null)
-            {
+            case ExpressionType.Equal:
+                result = ReferenceEquals(arg, Nil.Instance) || arg == null;
+                return true;
+            case ExpressionType.NotEqual:
+                result = !ReferenceEquals(arg, Nil.Instance) && arg != null;
                 return true;
-            }
-
-            return ReferenceEquals(obj, Nil.Instance);
         }
 
-        public override int GetHashCode()
-        {
-            return 0;
-        }
+        return base.TryBinaryOperation(binder, arg, out result);
+    }
+
+    public static bool operator ==(Nil _1, Nil _2)
+    {
+        return true;
+    }
+
+    public static bool operator !=(Nil _1, Nil _2)
+    {
+        return false;
+    }
+
+    public static bool operator ==(Nil a, object b)
+    {
+        return ReferenceEquals(a, b) || b == null;
+    }
+
+    public static bool operator !=(Nil a, object b)
+    {
+        return !(a == b);
+    }
 
-        public override bool TryConvert(ConvertBinder binder, out object result)
+    public override bool Equals(object obj)
+    {
+        if (obj == null)
         {
-            result = null;
             return true;
         }
 
-        public override string ToString()
-        {
-            return string.Empty;
-        }
+        return ReferenceEquals(obj, Nil.Instance);
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+
+    public override bool TryConvert(ConvertBinder binder, out object result)
+    {
+        result = null;
+        return true;
+    }
+
+    public override string ToString()
+    {
+        return string.Empty;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/CoreShapes.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/CoreShapes.cs
index c68ec5e1c05..6be2e5dc44b 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/CoreShapes.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/CoreShapes.cs
@@ -9,130 +9,129 @@
 using OrchardCore.DisplayManagement.Implementation;
 using OrchardCore.Modules;
 
-namespace OrchardCore.DisplayManagement.Shapes
+namespace OrchardCore.DisplayManagement.Shapes;
+
+[Feature(Application.DefaultFeatureId)]
+public class CoreShapes : IShapeAttributeProvider
 {
-    [Feature(Application.DefaultFeatureId)]
-    public class CoreShapes : IShapeAttributeProvider
+    [Shape]
+    public void PlaceChildContent(dynamic Source, TextWriter Output)
     {
-        [Shape]
-        public void PlaceChildContent(dynamic Source, TextWriter Output)
-        {
-            throw new NotImplementedException();
-        }
+        throw new NotImplementedException();
+    }
 
-        [Shape]
+    [Shape]
 #pragma warning disable CA1822 // Mark members as static
-        public async Task<IHtmlContent> List(Shape shape, DisplayContext displayContext, IEnumerable<object> Items,
+    public async Task<IHtmlContent> List(Shape shape, DisplayContext displayContext, IEnumerable<object> Items,
 #pragma warning restore CA1822 // Mark members as static
-            string ItemTagName,
-            IEnumerable<string> ItemClasses,
-            IDictionary<string, string> ItemAttributes,
-            string FirstClass,
-            string LastClass)
+        string ItemTagName,
+        IEnumerable<string> ItemClasses,
+        IDictionary<string, string> ItemAttributes,
+        string FirstClass,
+        string LastClass)
+    {
+        if (Items == null)
         {
-            if (Items == null)
+            if (shape.Items != null && shape.Items.Any())
             {
-                if (shape.Items != null && shape.Items.Any())
-                {
-                    Items = shape.Items;
-                }
-                else
-                {
-                    return HtmlString.Empty;
-                }
+                Items = shape.Items;
             }
-
-            // Prevent multiple enumerations.
-            var items = Items.ToList();
-
-            // var itemDisplayOutputs = Items.Select(item => Display(item)).Where(output => !string.IsNullOrWhiteSpace(output.ToHtmlString())).ToList();
-            var count = items.Count;
-            if (count < 1)
+            else
             {
                 return HtmlString.Empty;
             }
+        }
 
-            var listTagBuilder = shape.GetTagBuilder("ul");
-
-            var itemTagName = string.IsNullOrEmpty(ItemTagName) ? "li" : ItemTagName;
+        // Prevent multiple enumerations.
+        var items = Items.ToList();
 
-            var index = 0;
+        // var itemDisplayOutputs = Items.Select(item => Display(item)).Where(output => !string.IsNullOrWhiteSpace(output.ToHtmlString())).ToList();
+        var count = items.Count;
+        if (count < 1)
+        {
+            return HtmlString.Empty;
+        }
 
-            foreach (var item in items)
-            {
-                var itemTag = new TagBuilder(itemTagName);
+        var listTagBuilder = shape.GetTagBuilder("ul");
 
-                if (ItemAttributes != null)
-                {
-                    itemTag.MergeAttributes(ItemAttributes, false);
-                }
+        var itemTagName = string.IsNullOrEmpty(ItemTagName) ? "li" : ItemTagName;
 
-                if (ItemClasses != null)
-                {
-                    foreach (var cssClass in ItemClasses)
-                    {
-                        itemTag.AddCssClass(cssClass);
-                    }
-                }
+        var index = 0;
 
-                if (index == 0)
-                {
-                    itemTag.AddCssClass(FirstClass ?? "first");
-                }
+        foreach (var item in items)
+        {
+            var itemTag = new TagBuilder(itemTagName);
 
-                if (index == count - 1)
-                {
-                    itemTag.AddCssClass(LastClass ?? "last");
-                }
+            if (ItemAttributes != null)
+            {
+                itemTag.MergeAttributes(ItemAttributes, false);
+            }
 
-                if (item is IShape itemShape)
+            if (ItemClasses != null)
+            {
+                foreach (var cssClass in ItemClasses)
                 {
-                    itemShape.Properties["Tag"] = itemTag;
+                    itemTag.AddCssClass(cssClass);
                 }
+            }
 
-                // Give the item shape the possibility to alter its container tag
-                // by rendering them before rendering the containing list.
-                var itemContent = await displayContext.DisplayHelper.ShapeExecuteAsync((IShape)item);
+            if (index == 0)
+            {
+                itemTag.AddCssClass(FirstClass ?? "first");
+            }
 
-                itemTag.InnerHtml.AppendHtml(itemContent);
-                listTagBuilder.InnerHtml.AppendHtml(itemTag);
+            if (index == count - 1)
+            {
+                itemTag.AddCssClass(LastClass ?? "last");
+            }
 
-                ++index;
+            if (item is IShape itemShape)
+            {
+                itemShape.Properties["Tag"] = itemTag;
             }
 
-            return listTagBuilder;
+            // Give the item shape the possibility to alter its container tag
+            // by rendering them before rendering the containing list.
+            var itemContent = await displayContext.DisplayHelper.ShapeExecuteAsync((IShape)item);
+
+            itemTag.InnerHtml.AppendHtml(itemContent);
+            listTagBuilder.InnerHtml.AppendHtml(itemTag);
+
+            ++index;
         }
 
-        [Shape]
+        return listTagBuilder;
+    }
+
+    [Shape]
 #pragma warning disable CA1822 // Mark members as static
-        public IHtmlContent Message(IShape Shape)
+    public IHtmlContent Message(IShape Shape)
 #pragma warning restore CA1822 // Mark members as static
-        {
-            var tagBuilder = Shape.GetTagBuilder("div");
-            var type = Shape.Properties["Type"].ToString().ToLowerInvariant();
-            var message = Shape.Properties["Message"] as IHtmlContent;
-            tagBuilder.AddCssClass("message");
-            tagBuilder.AddCssClass("message-" + type);
-            tagBuilder.Attributes["role"] = "alert";
-            tagBuilder.InnerHtml.AppendHtml(message);
-            return tagBuilder;
-        }
+    {
+        var tagBuilder = Shape.GetTagBuilder("div");
+        var type = Shape.Properties["Type"].ToString().ToLowerInvariant();
+        var message = Shape.Properties["Message"] as IHtmlContent;
+        tagBuilder.AddCssClass("message");
+        tagBuilder.AddCssClass("message-" + type);
+        tagBuilder.Attributes["role"] = "alert";
+        tagBuilder.InnerHtml.AppendHtml(message);
+        return tagBuilder;
     }
+}
 
-    public class CoreShapesTableProvider : ShapeTableProvider
+public class CoreShapesTableProvider : ShapeTableProvider
+{
+    public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
     {
-        public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
-        {
-            builder.Describe("List")
-                .OnCreated(created =>
-                {
-                    // Initializes the common properties of a List shape
-                    // such that views can safely add values to them.
-                    created.Shape.Properties["ItemClasses"] = new List<string>();
-                    created.Shape.Properties["ItemAttributes"] = new Dictionary<string, string>();
-                });
+        builder.Describe("List")
+            .OnCreated(created =>
+            {
+                // Initializes the common properties of a List shape
+                // such that views can safely add values to them.
+                created.Shape.Properties["ItemClasses"] = new List<string>();
+                created.Shape.Properties["ItemAttributes"] = new Dictionary<string, string>();
+            });
 
-            return ValueTask.CompletedTask;
-        }
+        return ValueTask.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/DateTimeShapes.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/DateTimeShapes.cs
index a54ef37848c..e1639787931 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/DateTimeShapes.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/DateTimeShapes.cs
@@ -8,139 +8,138 @@
 using OrchardCore.DisplayManagement.Descriptors;
 using OrchardCore.Modules;
 
-namespace OrchardCore.DisplayManagement.Shapes
+namespace OrchardCore.DisplayManagement.Shapes;
+
+[Feature(Application.DefaultFeatureId)]
+public class DateTimeShapes : IShapeAttributeProvider
 {
-    [Feature(Application.DefaultFeatureId)]
-    public class DateTimeShapes : IShapeAttributeProvider
+    private const string LongDateTimeFormat = "dddd, MMMM d, yyyy h:mm:ss tt";
+    private readonly IClock _clock;
+    private readonly ILocalClock _localClock;
+    protected readonly IStringLocalizer S;
+    protected readonly IHtmlLocalizer H;
+
+    public DateTimeShapes(
+        IClock clock,
+        IStringLocalizer<DateTimeShapes> localizer,
+        IHtmlLocalizer<DateTimeShapes> htmlLocalizer,
+        ILocalClock localClock
+        )
+    {
+        _localClock = localClock;
+        _clock = clock;
+        S = localizer;
+        H = htmlLocalizer;
+    }
+
+    [Shape]
+    public IHtmlContent TimeSpan(DateTime? Utc, DateTime? Origin)
     {
-        private const string LongDateTimeFormat = "dddd, MMMM d, yyyy h:mm:ss tt";
-        private readonly IClock _clock;
-        private readonly ILocalClock _localClock;
-        protected readonly IStringLocalizer S;
-        protected readonly IHtmlLocalizer H;
-
-        public DateTimeShapes(
-            IClock clock,
-            IStringLocalizer<DateTimeShapes> localizer,
-            IHtmlLocalizer<DateTimeShapes> htmlLocalizer,
-            ILocalClock localClock
-            )
+        Utc ??= _clock.UtcNow;
+        Origin ??= _clock.UtcNow;
+
+        var time = Origin.Value - Utc.Value;
+
+        if (time.TotalYears() > 1)
         {
-            _localClock = localClock;
-            _clock = clock;
-            S = localizer;
-            H = htmlLocalizer;
+            return H.Plural(time.TotalYears(), "1 year ago", "{0} years ago");
         }
 
-        [Shape]
-        public IHtmlContent TimeSpan(DateTime? Utc, DateTime? Origin)
+        if (time.TotalYears() < -1)
         {
-            Utc ??= _clock.UtcNow;
-            Origin ??= _clock.UtcNow;
-
-            var time = Origin.Value - Utc.Value;
-
-            if (time.TotalYears() > 1)
-            {
-                return H.Plural(time.TotalYears(), "1 year ago", "{0} years ago");
-            }
-
-            if (time.TotalYears() < -1)
-            {
-                return H.Plural(-time.TotalYears(), "in 1 year", "in {0} years");
-            }
-
-            if (time.TotalMonths() > 1)
-            {
-                return H.Plural(time.TotalMonths(), "1 month ago", "{0} months ago");
-            }
-
-            if (time.TotalMonths() < -1)
-            {
-                return H.Plural(-time.TotalMonths(), "in 1 month", "in {0} months");
-            }
-
-            if (time.TotalWeeks() > 1)
-            {
-                return H.Plural(time.TotalWeeks(), "1 week ago", "{0} weeks ago");
-            }
-
-            if (time.TotalWeeks() < -1)
-            {
-                return H.Plural(-time.TotalWeeks(), "in 1 week", "in {0} weeks");
-            }
-
-            if (time.TotalHours > 24)
-            {
-                return H.Plural(time.Days, "1 day ago", "{0} days ago");
-            }
-
-            if (time.TotalHours < -24)
-            {
-                return H.Plural(-time.Days, "in 1 day", "in {0} days");
-            }
-
-            if (time.TotalMinutes > 60)
-            {
-                return H.Plural(time.Hours, "1 hour ago", "{0} hours ago");
-            }
-
-            if (time.TotalMinutes < -60)
-            {
-                return H.Plural(-time.Hours, "in 1 hour", "in {0} hours");
-            }
-
-            if (time.TotalSeconds > 60)
-            {
-                return H.Plural(time.Minutes, "1 minute ago", "{0} minutes ago");
-            }
-
-            if (time.TotalSeconds < -60)
-            {
-                return H.Plural(-time.Minutes, "in 1 minute", "in {0} minutes");
-            }
-
-            if (time.TotalSeconds > 10)
-            {
-                return H.Plural(time.Seconds, "1 second ago", "{0} seconds ago"); // Aware that the singular won't be used.
-            }
-
-            if (time.TotalSeconds < -10)
-            {
-                return H.Plural(-time.Seconds, "in 1 second", "in {0} seconds");
-            }
-
-            return time.TotalMilliseconds > 0
-                       ? H["a moment ago"]
-                       : H["in a moment"];
+            return H.Plural(-time.TotalYears(), "in 1 year", "in {0} years");
         }
 
-        [Shape]
-        public async Task<IHtmlContent> DateTime(IHtmlHelper Html, DateTime? Utc, string Format)
+        if (time.TotalMonths() > 1)
         {
-            Utc ??= _clock.UtcNow;
-            var zonedTime = await _localClock.ConvertToLocalAsync(Utc.Value);
-            Format ??= S[LongDateTimeFormat].Value;
+            return H.Plural(time.TotalMonths(), "1 month ago", "{0} months ago");
+        }
 
-            return Html.Raw(Html.Encode(zonedTime.ToString(Format, CultureInfo.CurrentUICulture)));
+        if (time.TotalMonths() < -1)
+        {
+            return H.Plural(-time.TotalMonths(), "in 1 month", "in {0} months");
         }
-    }
 
-    public static class TimespanExtensions
-    {
-        public static int TotalWeeks(this TimeSpan time)
+        if (time.TotalWeeks() > 1)
+        {
+            return H.Plural(time.TotalWeeks(), "1 week ago", "{0} weeks ago");
+        }
+
+        if (time.TotalWeeks() < -1)
+        {
+            return H.Plural(-time.TotalWeeks(), "in 1 week", "in {0} weeks");
+        }
+
+        if (time.TotalHours > 24)
+        {
+            return H.Plural(time.Days, "1 day ago", "{0} days ago");
+        }
+
+        if (time.TotalHours < -24)
+        {
+            return H.Plural(-time.Days, "in 1 day", "in {0} days");
+        }
+
+        if (time.TotalMinutes > 60)
         {
-            return (int)time.TotalDays / 7;
+            return H.Plural(time.Hours, "1 hour ago", "{0} hours ago");
         }
 
-        public static int TotalMonths(this TimeSpan time)
+        if (time.TotalMinutes < -60)
         {
-            return (int)time.TotalDays / 31;
+            return H.Plural(-time.Hours, "in 1 hour", "in {0} hours");
         }
 
-        public static int TotalYears(this TimeSpan time)
+        if (time.TotalSeconds > 60)
         {
-            return (int)time.TotalDays / 365;
+            return H.Plural(time.Minutes, "1 minute ago", "{0} minutes ago");
         }
+
+        if (time.TotalSeconds < -60)
+        {
+            return H.Plural(-time.Minutes, "in 1 minute", "in {0} minutes");
+        }
+
+        if (time.TotalSeconds > 10)
+        {
+            return H.Plural(time.Seconds, "1 second ago", "{0} seconds ago"); // Aware that the singular won't be used.
+        }
+
+        if (time.TotalSeconds < -10)
+        {
+            return H.Plural(-time.Seconds, "in 1 second", "in {0} seconds");
+        }
+
+        return time.TotalMilliseconds > 0
+                   ? H["a moment ago"]
+                   : H["in a moment"];
+    }
+
+    [Shape]
+    public async Task<IHtmlContent> DateTime(IHtmlHelper Html, DateTime? Utc, string Format)
+    {
+        Utc ??= _clock.UtcNow;
+        var zonedTime = await _localClock.ConvertToLocalAsync(Utc.Value);
+        Format ??= S[LongDateTimeFormat].Value;
+
+        return Html.Raw(Html.Encode(zonedTime.ToString(Format, CultureInfo.CurrentUICulture)));
+    }
+}
+
+public static class TimespanExtensions
+{
+    public static int TotalWeeks(this TimeSpan time)
+    {
+        return (int)time.TotalDays / 7;
+    }
+
+    public static int TotalMonths(this TimeSpan time)
+    {
+        return (int)time.TotalDays / 31;
+    }
+
+    public static int TotalYears(this TimeSpan time)
+    {
+        return (int)time.TotalDays / 365;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/GroupShapes.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/GroupShapes.cs
index 0a320bce025..9b41be85317 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/GroupShapes.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/GroupShapes.cs
@@ -8,214 +8,213 @@
 using OrchardCore.Modules;
 using OrchardCore.Mvc.Utilities;
 
-namespace OrchardCore.DisplayManagement.Shapes
+namespace OrchardCore.DisplayManagement.Shapes;
+
+[Feature(Application.DefaultFeatureId)]
+public class GroupShapes : IShapeAttributeProvider
 {
-    [Feature(Application.DefaultFeatureId)]
-    public class GroupShapes : IShapeAttributeProvider
-    {
-        [Shape]
+    [Shape]
 #pragma warning disable CA1822 // Mark members as static
-        public IHtmlContent AdminTabs(IShape shape)
+    public IHtmlContent AdminTabs(IShape shape)
+    {
+        var tabsGrouping = shape.GetProperty<IList<IGrouping<string, object>>>("Tabs");
+        if (tabsGrouping == null)
         {
-            var tabsGrouping = shape.GetProperty<IList<IGrouping<string, object>>>("Tabs");
-            if (tabsGrouping == null)
-            {
-                return HtmlString.Empty;
-            }
+            return HtmlString.Empty;
+        }
+
+        var tabs = tabsGrouping.Select(group => group.Key).ToArray();
+        if (tabs.Length == 0)
+        {
+            return HtmlString.Empty;
+        }
 
-            var tabs = tabsGrouping.Select(group => group.Key).ToArray();
-            if (tabs.Length == 0)
+        var tagBuilder = shape.GetTagBuilder("ul");
+        var identifier = shape.GetProperty<string>("Identifier");
+        tagBuilder.AddCssClass("nav nav-tabs flex-column flex-md-row");
+        tagBuilder.Attributes["role"] = "tablist";
+
+        var tabIndex = 0;
+        foreach (var tab in tabs)
+        {
+            var linkTag = new TagBuilder("li");
+            linkTag.AddCssClass("nav-item");
+
+            if (tabIndex != tabs.Length - 1)
             {
-                return HtmlString.Empty;
+                linkTag.AddCssClass("pe-md-2");
             }
 
-            var tagBuilder = shape.GetTagBuilder("ul");
-            var identifier = shape.GetProperty<string>("Identifier");
-            tagBuilder.AddCssClass("nav nav-tabs flex-column flex-md-row");
-            tagBuilder.Attributes["role"] = "tablist";
+            var aTag = new TagBuilder("a");
+            aTag.AddCssClass("nav-item nav-link");
 
-            var tabIndex = 0;
-            foreach (var tab in tabs)
+            if (tabIndex == 0)
             {
-                var linkTag = new TagBuilder("li");
-                linkTag.AddCssClass("nav-item");
-
-                if (tabIndex != tabs.Length - 1)
-                {
-                    linkTag.AddCssClass("pe-md-2");
-                }
-
-                var aTag = new TagBuilder("a");
-                aTag.AddCssClass("nav-item nav-link");
-
-                if (tabIndex == 0)
-                {
-                    aTag.AddCssClass("active");
-                }
-
-                var tabId = $"tab-{tab}-{identifier}".HtmlClassify();
-
-                aTag.Attributes["href"] = '#' + tabId;
-                aTag.Attributes["data-bs-toggle"] = "tab";
-                aTag.Attributes["role"] = "tab";
-                aTag.Attributes["aria-controls"] = tabId;
-                aTag.Attributes["aria-selected"] = "false";
-                aTag.InnerHtml.Append(tab);
-
-                linkTag.InnerHtml.AppendHtml(aTag);
-                tagBuilder.InnerHtml.AppendHtml(linkTag);
-                tabIndex++;
+                aTag.AddCssClass("active");
             }
 
-            return tagBuilder;
+            var tabId = $"tab-{tab}-{identifier}".HtmlClassify();
+
+            aTag.Attributes["href"] = '#' + tabId;
+            aTag.Attributes["data-bs-toggle"] = "tab";
+            aTag.Attributes["role"] = "tab";
+            aTag.Attributes["aria-controls"] = tabId;
+            aTag.Attributes["aria-selected"] = "false";
+            aTag.InnerHtml.Append(tab);
+
+            linkTag.InnerHtml.AppendHtml(aTag);
+            tagBuilder.InnerHtml.AppendHtml(linkTag);
+            tabIndex++;
         }
 
-        [Shape]
-        public async Task<IHtmlContent> Card(IDisplayHelper displayAsync, GroupingViewModel shape)
-        {
-            var tagBuilder = shape.GetTagBuilder("div");
-            tagBuilder.AddCssClass("card-body");
-            shape.Metadata.Alternates.Clear();
-            shape.Metadata.Type = "ColumnGrouping";
+        return tagBuilder;
+    }
 
-            tagBuilder.InnerHtml.AppendHtml(await displayAsync.ShapeExecuteAsync(shape));
-            var cardIdPrefix = $"card-{shape.Identifier}-{shape.Grouping.Key}".HtmlClassify();
+    [Shape]
+    public async Task<IHtmlContent> Card(IDisplayHelper displayAsync, GroupingViewModel shape)
+    {
+        var tagBuilder = shape.GetTagBuilder("div");
+        tagBuilder.AddCssClass("card-body");
+        shape.Metadata.Alternates.Clear();
+        shape.Metadata.Type = "ColumnGrouping";
 
-            var cardTag = new TagBuilder("div");
-            cardTag.AddCssClass("card mb-2");
+        tagBuilder.InnerHtml.AppendHtml(await displayAsync.ShapeExecuteAsync(shape));
+        var cardIdPrefix = $"card-{shape.Identifier}-{shape.Grouping.Key}".HtmlClassify();
 
-            var headerArrowTag = new TagBuilder("div");
-            headerArrowTag.AddCssClass("card-header");
-            headerArrowTag.Attributes["id"] = $"heading-{cardIdPrefix}";
+        var cardTag = new TagBuilder("div");
+        cardTag.AddCssClass("card mb-2");
 
-            var headerTitleTag = new TagBuilder("h5");
-            headerTitleTag.AddCssClass("float-start mb-0 mt-1");
-            headerTitleTag.InnerHtml.Append(shape.Grouping.Key);
+        var headerArrowTag = new TagBuilder("div");
+        headerArrowTag.AddCssClass("card-header");
+        headerArrowTag.Attributes["id"] = $"heading-{cardIdPrefix}";
 
-            var buttonTag = new TagBuilder("button");
-            buttonTag.AddCssClass("btn btn-link btn-block text-start float-end");
-            buttonTag.Attributes["type"] = "button";
-            buttonTag.Attributes["data-bs-toggle"] = "collapse";
-            buttonTag.Attributes["data-bs-target"] = $"#collapse-{cardIdPrefix}";
-            buttonTag.Attributes["aria-expanded"] = "true";
-            buttonTag.Attributes["aria-controls"] = $"collapse-{cardIdPrefix}";
+        var headerTitleTag = new TagBuilder("h5");
+        headerTitleTag.AddCssClass("float-start mb-0 mt-1");
+        headerTitleTag.InnerHtml.Append(shape.Grouping.Key);
 
-            var buttonIconTag = new TagBuilder("i");
-            buttonIconTag.AddCssClass("fa-solid fa-angle-down");
+        var buttonTag = new TagBuilder("button");
+        buttonTag.AddCssClass("btn btn-link btn-block text-start float-end");
+        buttonTag.Attributes["type"] = "button";
+        buttonTag.Attributes["data-bs-toggle"] = "collapse";
+        buttonTag.Attributes["data-bs-target"] = $"#collapse-{cardIdPrefix}";
+        buttonTag.Attributes["aria-expanded"] = "true";
+        buttonTag.Attributes["aria-controls"] = $"collapse-{cardIdPrefix}";
 
-            buttonTag.InnerHtml.AppendHtml(buttonIconTag);
+        var buttonIconTag = new TagBuilder("i");
+        buttonIconTag.AddCssClass("fa-solid fa-angle-down");
 
-            headerArrowTag.InnerHtml.AppendHtml(headerTitleTag);
-            headerArrowTag.InnerHtml.AppendHtml(buttonTag);
+        buttonTag.InnerHtml.AppendHtml(buttonIconTag);
 
-            var bodyTag = new TagBuilder("div");
-            bodyTag.AddCssClass("collapse show");
-            bodyTag.Attributes["id"] = $"collapse-{cardIdPrefix}";
+        headerArrowTag.InnerHtml.AppendHtml(headerTitleTag);
+        headerArrowTag.InnerHtml.AppendHtml(buttonTag);
 
-            bodyTag.InnerHtml.AppendHtml(tagBuilder);
-            cardTag.InnerHtml.AppendHtml(headerArrowTag);
-            cardTag.InnerHtml.AppendHtml(bodyTag);
+        var bodyTag = new TagBuilder("div");
+        bodyTag.AddCssClass("collapse show");
+        bodyTag.Attributes["id"] = $"collapse-{cardIdPrefix}";
 
-            return cardTag;
-        }
+        bodyTag.InnerHtml.AppendHtml(tagBuilder);
+        cardTag.InnerHtml.AppendHtml(headerArrowTag);
+        cardTag.InnerHtml.AppendHtml(bodyTag);
 
-        [Shape]
-        public async Task<IHtmlContent> CardContainer(IDisplayHelper displayAsync, GroupViewModel shape)
-        {
-            var tagBuilder = shape.GetTagBuilder("div");
-            tagBuilder.AddCssClass("mb-3");
+        return cardTag;
+    }
 
-            foreach (var card in shape.Items.OfType<IShape>())
-            {
-                tagBuilder.InnerHtml.AppendHtml(await displayAsync.ShapeExecuteAsync(card));
-            }
+    [Shape]
+    public async Task<IHtmlContent> CardContainer(IDisplayHelper displayAsync, GroupViewModel shape)
+    {
+        var tagBuilder = shape.GetTagBuilder("div");
+        tagBuilder.AddCssClass("mb-3");
 
-            return tagBuilder;
+        foreach (var card in shape.Items.OfType<IShape>())
+        {
+            tagBuilder.InnerHtml.AppendHtml(await displayAsync.ShapeExecuteAsync(card));
         }
 
-        [Shape]
-        public async Task<IHtmlContent> Column(IDisplayHelper displayAsync, GroupViewModel shape)
-        {
-            var tagBuilder = shape.GetTagBuilder("div");
-            foreach (var column in shape.Items)
-            {
-                tagBuilder.InnerHtml.AppendHtml(await displayAsync.ShapeExecuteAsync((IShape)column));
-            }
+        return tagBuilder;
+    }
 
-            return tagBuilder;
+    [Shape]
+    public async Task<IHtmlContent> Column(IDisplayHelper displayAsync, GroupViewModel shape)
+    {
+        var tagBuilder = shape.GetTagBuilder("div");
+        foreach (var column in shape.Items)
+        {
+            tagBuilder.InnerHtml.AppendHtml(await displayAsync.ShapeExecuteAsync((IShape)column));
         }
 
-        [Shape]
-        public async Task<IHtmlContent> ColumnContainer(IDisplayHelper displayAsync, GroupViewModel shape)
-        {
-            var tagBuilder = shape.GetTagBuilder("div");
-            tagBuilder.AddCssClass("row");
+        return tagBuilder;
+    }
 
-            foreach (var column in shape.Items)
-            {
-                tagBuilder.InnerHtml.AppendHtml(await displayAsync.ShapeExecuteAsync((IShape)column));
-            }
+    [Shape]
+    public async Task<IHtmlContent> ColumnContainer(IDisplayHelper displayAsync, GroupViewModel shape)
+    {
+        var tagBuilder = shape.GetTagBuilder("div");
+        tagBuilder.AddCssClass("row");
 
-            return tagBuilder;
+        foreach (var column in shape.Items)
+        {
+            tagBuilder.InnerHtml.AppendHtml(await displayAsync.ShapeExecuteAsync((IShape)column));
         }
 
-        [Shape]
-        public async Task<IHtmlContent> Tab(IDisplayHelper displayAsync, GroupingViewModel shape)
-        {
-            var tagBuilder = shape.GetTagBuilder("div");
-            tagBuilder.Attributes["id"] = $"tab-{shape.Grouping.Key}-{shape.Identifier}".HtmlClassify();
-            tagBuilder.AddCssClass("tab-pane fade");
+        return tagBuilder;
+    }
 
-            // Morphing this shape to a grouping shape to keep Model untouched.
-            shape.Metadata.Alternates.Clear();
-            shape.Metadata.Type = "CardGrouping";
+    [Shape]
+    public async Task<IHtmlContent> Tab(IDisplayHelper displayAsync, GroupingViewModel shape)
+    {
+        var tagBuilder = shape.GetTagBuilder("div");
+        tagBuilder.Attributes["id"] = $"tab-{shape.Grouping.Key}-{shape.Identifier}".HtmlClassify();
+        tagBuilder.AddCssClass("tab-pane fade");
 
-            tagBuilder.InnerHtml.AppendHtml(await displayAsync.ShapeExecuteAsync(shape));
+        // Morphing this shape to a grouping shape to keep Model untouched.
+        shape.Metadata.Alternates.Clear();
+        shape.Metadata.Type = "CardGrouping";
 
-            return tagBuilder;
-        }
+        tagBuilder.InnerHtml.AppendHtml(await displayAsync.ShapeExecuteAsync(shape));
 
-        [Shape]
-        public async Task<IHtmlContent> TabContainer(IDisplayHelper displayAsync, GroupingsViewModel shape, IShapeFactory shapeFactory)
+        return tagBuilder;
+    }
+
+    [Shape]
+    public async Task<IHtmlContent> TabContainer(IDisplayHelper displayAsync, GroupingsViewModel shape, IShapeFactory shapeFactory)
+    {
+        var localNavigation = await shapeFactory.CreateAsync("LocalNavigation", Arguments.From(new
         {
-            var localNavigation = await shapeFactory.CreateAsync("LocalNavigation", Arguments.From(new
-            {
-                shape.Identifier,
-                Tabs = shape.Groupings
-            }));
+            shape.Identifier,
+            Tabs = shape.Groupings
+        }));
 
-            var htmlContentBuilder = new HtmlContentBuilder();
-            htmlContentBuilder.AppendHtml(await displayAsync.ShapeExecuteAsync(localNavigation));
+        var htmlContentBuilder = new HtmlContentBuilder();
+        htmlContentBuilder.AppendHtml(await displayAsync.ShapeExecuteAsync(localNavigation));
 
-            var tagBuilder = shape.GetTagBuilder("div");
-            tagBuilder.AddCssClass("tab-content");
+        var tagBuilder = shape.GetTagBuilder("div");
+        tagBuilder.AddCssClass("tab-content");
 
-            htmlContentBuilder.AppendHtml(tagBuilder);
+        htmlContentBuilder.AppendHtml(tagBuilder);
 
-            var first = true;
-            foreach (var tab in shape.Items.OfType<IShape>())
+        var first = true;
+        foreach (var tab in shape.Items.OfType<IShape>())
+        {
+            if (first)
             {
-                if (first)
-                {
-                    first = false;
-                    tab.Classes.Add("show active");
-                }
-
-                tagBuilder.InnerHtml.AppendHtml(await displayAsync.ShapeExecuteAsync(tab));
+                first = false;
+                tab.Classes.Add("show active");
             }
 
-            return htmlContentBuilder;
+            tagBuilder.InnerHtml.AppendHtml(await displayAsync.ShapeExecuteAsync(tab));
         }
 
-        [Shape]
-        public Task<IHtmlContent> LocalNavigation(IDisplayHelper displayAsync, IShape shape)
-        {
-            // Morphing this shape to keep Model untouched.
-            shape.Metadata.Alternates.Clear();
-            shape.Metadata.Type = "AdminTabs";
+        return htmlContentBuilder;
+    }
 
-            return displayAsync.ShapeExecuteAsync(shape);
-        }
-#pragma warning restore CA1822 // Mark members as static
+    [Shape]
+    public Task<IHtmlContent> LocalNavigation(IDisplayHelper displayAsync, IShape shape)
+    {
+        // Morphing this shape to keep Model untouched.
+        shape.Metadata.Alternates.Clear();
+        shape.Metadata.Type = "AdminTabs";
+
+        return displayAsync.ShapeExecuteAsync(shape);
     }
+#pragma warning restore CA1822 // Mark members as static
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/PageTitleShapes.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/PageTitleShapes.cs
index 25d46bc3154..9515a099e2c 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/PageTitleShapes.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/PageTitleShapes.cs
@@ -9,33 +9,32 @@
 using OrchardCore.Modules;
 using OrchardCore.Settings;
 
-namespace OrchardCore.DisplayManagement.Shapes
+namespace OrchardCore.DisplayManagement.Shapes;
+
+[Feature(Application.DefaultFeatureId)]
+public class PageTitleShapes : IShapeAttributeProvider
 {
-    [Feature(Application.DefaultFeatureId)]
-    public class PageTitleShapes : IShapeAttributeProvider
-    {
-        private IPageTitleBuilder _pageTitleBuilder;
+    private IPageTitleBuilder _pageTitleBuilder;
 
-        public IPageTitleBuilder Title => _pageTitleBuilder ??= ShellScope.Services.GetRequiredService<IPageTitleBuilder>();
+    public IPageTitleBuilder Title => _pageTitleBuilder ??= ShellScope.Services.GetRequiredService<IPageTitleBuilder>();
 
-        [Shape]
-        public async Task<IHtmlContent> PageTitle()
-        {
-            var siteSettings = await ShellScope.Services.GetRequiredService<ISiteService>().GetSiteSettingsAsync();
+    [Shape]
+    public async Task<IHtmlContent> PageTitle()
+    {
+        var siteSettings = await ShellScope.Services.GetRequiredService<ISiteService>().GetSiteSettingsAsync();
 
-            // We must return a page title so if the format setting is blank just use the current title unformatted
-            if (string.IsNullOrWhiteSpace(siteSettings.PageTitleFormat))
-            {
-                return Title.GenerateTitle(null);
-            }
-            else
-            {
-                var liquidTemplateManager = ShellScope.Services.GetRequiredService<ILiquidTemplateManager>();
-                var htmlEncoder = ShellScope.Services.GetRequiredService<HtmlEncoder>();
+        // We must return a page title so if the format setting is blank just use the current title unformatted
+        if (string.IsNullOrWhiteSpace(siteSettings.PageTitleFormat))
+        {
+            return Title.GenerateTitle(null);
+        }
+        else
+        {
+            var liquidTemplateManager = ShellScope.Services.GetRequiredService<ILiquidTemplateManager>();
+            var htmlEncoder = ShellScope.Services.GetRequiredService<HtmlEncoder>();
 
-                var result = await liquidTemplateManager.RenderHtmlContentAsync(siteSettings.PageTitleFormat, htmlEncoder);
-                return result;
-            }
+            var result = await liquidTemplateManager.RenderHtmlContentAsync(siteSettings.PageTitleFormat, htmlEncoder);
+            return result;
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/Shape.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/Shape.cs
index d887cff7319..fa243d10b13 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/Shape.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/Shape.cs
@@ -9,260 +9,259 @@
 using Microsoft.AspNetCore.Html;
 using OrchardCore.DisplayManagement.Zones;
 
-namespace OrchardCore.DisplayManagement.Shapes
+namespace OrchardCore.DisplayManagement.Shapes;
+
+[DebuggerTypeProxy(typeof(ShapeDebugView))]
+public class Shape : Composite, IShape, IPositioned, IEnumerable<object>
 {
-    [DebuggerTypeProxy(typeof(ShapeDebugView))]
-    public class Shape : Composite, IShape, IPositioned, IEnumerable<object>
-    {
-        private bool _sorted;
+    private bool _sorted;
 
-        public ShapeMetadata Metadata { get; } = new ShapeMetadata();
+    public ShapeMetadata Metadata { get; } = new ShapeMetadata();
 
-        public string Id { get; set; }
-        public string TagName { get; set; }
+    public string Id { get; set; }
+    public string TagName { get; set; }
 
-        private List<string> _classes;
-        public IList<string> Classes => _classes ??= [];
+    private List<string> _classes;
+    public IList<string> Classes => _classes ??= [];
 
-        private Dictionary<string, string> _attributes;
-        public IDictionary<string, string> Attributes => _attributes ??= [];
+    private Dictionary<string, string> _attributes;
+    public IDictionary<string, string> Attributes => _attributes ??= [];
 
-        private List<IPositioned> _items;
-        public IReadOnlyList<IPositioned> Items
+    private List<IPositioned> _items;
+    public IReadOnlyList<IPositioned> Items
+    {
+        get
         {
-            get
-            {
-                _items ??= [];
-
-                if (!_sorted)
-                {
-                    _items = _items.OrderBy(x => x, FlatPositionComparer.Instance).ToList();
-                    _sorted = true;
-                }
+            _items ??= [];
 
-                return _items;
+            if (!_sorted)
+            {
+                _items = _items.OrderBy(x => x, FlatPositionComparer.Instance).ToList();
+                _sorted = true;
             }
+
+            return _items;
         }
+    }
 
-        public bool HasItems => _items != null && _items.Count > 0;
+    public bool HasItems => _items != null && _items.Count > 0;
 
-        public string Position
+    public string Position
+    {
+        get { return Metadata.Position; }
+        set { Metadata.Position = value; }
+    }
+
+    public virtual ValueTask<IShape> AddAsync(object item, string position)
+    {
+        if (item == null)
         {
-            get { return Metadata.Position; }
-            set { Metadata.Position = value; }
+            return new ValueTask<IShape>(this);
         }
 
-        public virtual ValueTask<IShape> AddAsync(object item, string position)
-        {
-            if (item == null)
-            {
-                return new ValueTask<IShape>(this);
-            }
+        position ??= "";
 
-            position ??= "";
+        _sorted = false;
 
-            _sorted = false;
+        _items ??= [];
 
-            _items ??= [];
+        var wrapped = PositionWrapper.TryWrap(item, position);
+        if (wrapped is not null)
+        {
+            _items.Add(wrapped);
+        }
 
-            var wrapped = PositionWrapper.TryWrap(item, position);
-            if (wrapped is not null)
-            {
-                _items.Add(wrapped);
-            }
+        return new ValueTask<IShape>(this);
+    }
 
-            return new ValueTask<IShape>(this);
+    public void Remove(string shapeName)
+    {
+        if (_items == null)
+        {
+            return;
         }
 
-        public void Remove(string shapeName)
+        for (var i = _items.Count - 1; i >= 0; i--)
         {
-            if (_items == null)
+            if (_items[i] is IShape shape && shape.Metadata.Name == shapeName)
             {
+                _items.RemoveAt(i);
                 return;
             }
-
-            for (var i = _items.Count - 1; i >= 0; i--)
-            {
-                if (_items[i] is IShape shape && shape.Metadata.Name == shapeName)
-                {
-                    _items.RemoveAt(i);
-                    return;
-                }
-            }
         }
+    }
 
-        public IShape Named(string shapeName)
+    public IShape Named(string shapeName)
+    {
+        if (_items == null)
         {
-            if (_items == null)
-            {
-                return null;
-            }
-
-            for (var i = 0; i < _items.Count; i++)
-            {
-                if (_items[i] is IShape shape && shape.Metadata.Name == shapeName)
-                {
-                    return shape;
-                }
-            }
-
             return null;
         }
 
-        public IShape NormalizedNamed(string shapeName)
+        for (var i = 0; i < _items.Count; i++)
         {
-            if (_items == null)
+            if (_items[i] is IShape shape && shape.Metadata.Name == shapeName)
             {
-                return null;
+                return shape;
             }
+        }
 
-            for (var i = 0; i < _items.Count; i++)
-            {
-                if (_items[i] is IShape shape && shape.Metadata.Name?.Replace("__", "-") == shapeName)
-                {
-                    return shape;
-                }
-            }
+        return null;
+    }
 
+    public IShape NormalizedNamed(string shapeName)
+    {
+        if (_items == null)
+        {
             return null;
         }
 
-        IEnumerator<object> IEnumerable<object>.GetEnumerator()
+        for (var i = 0; i < _items.Count; i++)
         {
-            if (_items == null)
+            if (_items[i] is IShape shape && shape.Metadata.Name?.Replace("__", "-") == shapeName)
             {
-                return Enumerable.Empty<object>().GetEnumerator();
+                return shape;
             }
+        }
 
-            if (!_sorted)
-            {
-                _items = _items.OrderBy(x => x, FlatPositionComparer.Instance).ToList();
-                _sorted = true;
-            }
+        return null;
+    }
 
-            return _items.GetEnumerator();
+    IEnumerator<object> IEnumerable<object>.GetEnumerator()
+    {
+        if (_items == null)
+        {
+            return Enumerable.Empty<object>().GetEnumerator();
         }
 
-        public IEnumerator GetEnumerator()
+        if (!_sorted)
         {
-            if (_items == null)
-            {
-                return Enumerable.Empty<object>().GetEnumerator();
-            }
+            _items = _items.OrderBy(x => x, FlatPositionComparer.Instance).ToList();
+            _sorted = true;
+        }
 
-            if (!_sorted)
-            {
-                _items = _items.OrderBy(x => x, FlatPositionComparer.Instance).ToList();
-                _sorted = true;
-            }
+        return _items.GetEnumerator();
+    }
 
-            return _items.GetEnumerator();
+    public IEnumerator GetEnumerator()
+    {
+        if (_items == null)
+        {
+            return Enumerable.Empty<object>().GetEnumerator();
         }
 
-        public override bool TryConvert(ConvertBinder binder, out object result)
+        if (!_sorted)
         {
-            result = Items;
+            _items = _items.OrderBy(x => x, FlatPositionComparer.Instance).ToList();
+            _sorted = true;
+        }
 
-            if (binder.ReturnType == typeof(IEnumerable<object>))
-            {
-                return true;
-            }
+        return _items.GetEnumerator();
+    }
 
-            return base.TryConvert(binder, out result);
-        }
+    public override bool TryConvert(ConvertBinder binder, out object result)
+    {
+        result = Items;
 
-        public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result)
+        if (binder.ReturnType == typeof(IEnumerable<object>))
         {
-            // In case AddAsync() is called on a dynamic object, to prevent Composite from seing it as a property assignment.
-            if (binder.Name == "AddAsync")
-            {
-                result =
-                    AddAsync(args.Length > 0 ? args[0] : null, args.Length > 1 ? args[1].ToString() : "")
-                    .AsTask();
+            return true;
+        }
 
-                return true;
-            }
+        return base.TryConvert(binder, out result);
+    }
 
-            return base.TryInvokeMember(binder, args, out result);
+    public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result)
+    {
+        // In case AddAsync() is called on a dynamic object, to prevent Composite from seing it as a property assignment.
+        if (binder.Name == "AddAsync")
+        {
+            result =
+                AddAsync(args.Length > 0 ? args[0] : null, args.Length > 1 ? args[1].ToString() : "")
+                .AsTask();
+
+            return true;
         }
 
-        public override bool TryGetMember(GetMemberBinder binder, out object result)
+        return base.TryInvokeMember(binder, args, out result);
+    }
+
+    public override bool TryGetMember(GetMemberBinder binder, out object result)
+    {
+        return TryGetMemberImpl(binder.Name, out result);
+    }
+
+    protected override bool TryGetMemberImpl(string name, out object result)
+    {
+        if (!base.TryGetMemberImpl(name, out result) || (null == result))
         {
-            return TryGetMemberImpl(binder.Name, out result);
+            // Try to get a Named shape.
+            result = Named(name);
+
+            result ??= NormalizedNamed(name.Replace("__", "-"));
         }
 
-        protected override bool TryGetMemberImpl(string name, out object result)
-        {
-            if (!base.TryGetMemberImpl(name, out result) || (null == result))
-            {
-                // Try to get a Named shape.
-                result = Named(name);
+        return true;
+    }
 
-                result ??= NormalizedNamed(name.Replace("__", "-"));
-            }
+    protected override bool TrySetMemberImpl(string name, object value)
+    {
+        // We set the Shape real properties for Razor.
+
+        if (name == "Id")
+        {
+            Id = value as string;
 
             return true;
         }
-
-        protected override bool TrySetMemberImpl(string name, object value)
+        else if (name == "TagName")
         {
-            // We set the Shape real properties for Razor.
+            TagName = value as string;
 
-            if (name == "Id")
+            return true;
+        }
+        else if (name == "Attributes")
+        {
+            if (value is Dictionary<string, string> attributes)
             {
-                Id = value as string;
-
-                return true;
+                foreach (var attribute in attributes)
+                {
+                    Attributes.TryAdd(attribute.Key, attribute.Value);
+                }
             }
-            else if (name == "TagName")
-            {
-                TagName = value as string;
 
-                return true;
-            }
-            else if (name == "Attributes")
+            if (value is string stringValue)
             {
-                if (value is Dictionary<string, string> attributes)
-                {
-                    foreach (var attribute in attributes)
-                    {
-                        Attributes.TryAdd(attribute.Key, attribute.Value);
-                    }
-                }
+                attributes = JConvert.DeserializeObject<Dictionary<string, string>>(stringValue);
 
-                if (value is string stringValue)
+                foreach (var attribute in attributes)
                 {
-                    attributes = JConvert.DeserializeObject<Dictionary<string, string>>(stringValue);
-
-                    foreach (var attribute in attributes)
-                    {
-                        Attributes.TryAdd(attribute.Key, attribute.Value);
-                    }
+                    Attributes.TryAdd(attribute.Key, attribute.Value);
                 }
             }
-            else if (name == "Classes")
+        }
+        else if (name == "Classes")
+        {
+            if (value is List<string> classes)
             {
-                if (value is List<string> classes)
+                foreach (var item in classes)
                 {
-                    foreach (var item in classes)
-                    {
-                        Classes.Add(item);
-                    }
+                    Classes.Add(item);
                 }
+            }
 
-                if (value is string stringValue)
+            if (value is string stringValue)
+            {
+                var values = stringValue.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+                foreach (var item in values)
                 {
-                    var values = stringValue.Split(' ', StringSplitOptions.RemoveEmptyEntries);
-                    foreach (var item in values)
-                    {
-                        Classes.Add(item);
-                    }
+                    Classes.Add(item);
                 }
             }
+        }
 
-            base.TrySetMemberImpl(name, value);
+        base.TrySetMemberImpl(name, value);
 
-            return true;
-        }
+        return true;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/ShapeDebugView.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/ShapeDebugView.cs
index 338fb04223e..12fab72b404 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/ShapeDebugView.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/ShapeDebugView.cs
@@ -2,59 +2,58 @@
 using System.Diagnostics;
 using System.Linq;
 
-namespace OrchardCore.DisplayManagement.Shapes
+namespace OrchardCore.DisplayManagement.Shapes;
+
+public class ShapeDebugView
 {
-    public class ShapeDebugView
-    {
-        private readonly Shape _shape;
+    private readonly Shape _shape;
 
-        public ShapeDebugView(Shape shape)
-        {
-            _shape = shape;
-        }
+    public ShapeDebugView(Shape shape)
+    {
+        _shape = shape;
+    }
 
-        public ShapeMetadata Metadata { get { return _shape.Metadata; } }
+    public ShapeMetadata Metadata { get { return _shape.Metadata; } }
 
-        public string Id { get { return _shape.Id; } }
-        public IList<string> Classes { get { return _shape.Classes; } }
-        public IDictionary<string, string> Attributes { get { return _shape.Attributes; } }
-        public IEnumerable<dynamic> Items { get { return _shape.Items; } }
+    public string Id { get { return _shape.Id; } }
+    public IList<string> Classes { get { return _shape.Classes; } }
+    public IDictionary<string, string> Attributes { get { return _shape.Attributes; } }
+    public IEnumerable<dynamic> Items { get { return _shape.Items; } }
 
-        [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
-        public KeyValuePairs[] Properties
+    [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
+    public KeyValuePairs[] Properties
+    {
+        get
         {
-            get
-            {
-                return _shape.Properties
-                    .Select(entry => new KeyValuePairs(entry.Key, entry.Value))
-                    .ToArray();
-            }
+            return _shape.Properties
+                .Select(entry => new KeyValuePairs(entry.Key, entry.Value))
+                .ToArray();
         }
+    }
 
-        [DebuggerDisplay(" { _shapeType == null ? _value : \"Shape: \" + _shapeType}", Name = "{_key,nq}")]
-        public class KeyValuePairs
+    [DebuggerDisplay(" { _shapeType == null ? _value : \"Shape: \" + _shapeType}", Name = "{_key,nq}")]
+    public class KeyValuePairs
+    {
+        public KeyValuePairs(string key, object value)
         {
-            public KeyValuePairs(string key, object value)
+            if (_value is IShape)
             {
-                if (_value is IShape)
-                {
-                    _shapeType = ((IShape)_value).Metadata.Type;
-                }
-
-                _value = value;
-                _key = key;
+                _shapeType = ((IShape)_value).Metadata.Type;
             }
 
-            [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+            _value = value;
+            _key = key;
+        }
+
+        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
 #pragma warning disable IDE0052 // Remove unread private members
-            private readonly string _key;
+        private readonly string _key;
 #pragma warning restore IDE0052 // Remove unread private members
 
-            [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-            private readonly object _shapeType;
+        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+        private readonly object _shapeType;
 
-            [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
-            private readonly object _value;
-        }
+        [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
+        private readonly object _value;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/ShapeMetadata.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/ShapeMetadata.cs
index 70c3dfd3ba0..25ed183f5ba 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/ShapeMetadata.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/ShapeMetadata.cs
@@ -6,86 +6,85 @@
 using OrchardCore.DisplayManagement.Implementation;
 using OrchardCore.Environment.Cache;
 
-namespace OrchardCore.DisplayManagement.Shapes
+namespace OrchardCore.DisplayManagement.Shapes;
+
+public class ShapeMetadata
 {
-    public class ShapeMetadata
+    private CacheContext _cacheContext;
+
+    public ShapeMetadata()
     {
-        private CacheContext _cacheContext;
+    }
 
-        public ShapeMetadata()
-        {
-        }
+    public string Type { get; set; }
+    public string DisplayType { get; set; }
+    public string Position { get; set; }
+    public string Tab { get; set; }
+    public string Card { get; set; }
+    public string Column { get; set; }
+    public string PlacementSource { get; set; }
+    public string Prefix { get; set; }
+    public string Name { get; set; }
+    public string Differentiator { get; set; }
+    public AlternatesCollection Wrappers { get; set; } = [];
+    public AlternatesCollection Alternates { get; set; } = [];
+    public bool IsCached => _cacheContext != null;
+    public IHtmlContent ChildContent { get; set; }
 
-        public string Type { get; set; }
-        public string DisplayType { get; set; }
-        public string Position { get; set; }
-        public string Tab { get; set; }
-        public string Card { get; set; }
-        public string Column { get; set; }
-        public string PlacementSource { get; set; }
-        public string Prefix { get; set; }
-        public string Name { get; set; }
-        public string Differentiator { get; set; }
-        public AlternatesCollection Wrappers { get; set; } = [];
-        public AlternatesCollection Alternates { get; set; } = [];
-        public bool IsCached => _cacheContext != null;
-        public IHtmlContent ChildContent { get; set; }
+    /// <summary>
+    /// Event use for a specific shape instance.
+    /// </summary>
+    [JsonIgnore]
+    public IReadOnlyList<Action<ShapeDisplayContext>> Displaying { get; private set; } = [];
 
-        /// <summary>
-        /// Event use for a specific shape instance.
-        /// </summary>
-        [JsonIgnore]
-        public IReadOnlyList<Action<ShapeDisplayContext>> Displaying { get; private set; } = [];
+    /// <summary>
+    /// Event use for a specific shape instance.
+    /// </summary>
+    [JsonIgnore]
+    public IReadOnlyList<Func<IShape, Task>> ProcessingAsync { get; private set; } = [];
 
-        /// <summary>
-        /// Event use for a specific shape instance.
-        /// </summary>
-        [JsonIgnore]
-        public IReadOnlyList<Func<IShape, Task>> ProcessingAsync { get; private set; } = [];
+    /// <summary>
+    /// Event use for a specific shape instance.
+    /// </summary>
+    [JsonIgnore]
+    public IReadOnlyList<Action<ShapeDisplayContext>> Displayed { get; private set; } = [];
 
-        /// <summary>
-        /// Event use for a specific shape instance.
-        /// </summary>
-        [JsonIgnore]
-        public IReadOnlyList<Action<ShapeDisplayContext>> Displayed { get; private set; } = [];
+    [JsonIgnore]
+    public IReadOnlyList<string> BindingSources { get; set; } = [];
 
-        [JsonIgnore]
-        public IReadOnlyList<string> BindingSources { get; set; } = [];
+    public void OnDisplaying(Action<ShapeDisplayContext> context)
+    {
+        Displaying = [.. Displaying, context];
+    }
 
-        public void OnDisplaying(Action<ShapeDisplayContext> context)
-        {
-            Displaying = [..Displaying, context];
-        }
+    public void OnProcessing(Func<IShape, Task> context)
+    {
+        ProcessingAsync = [.. ProcessingAsync, context];
+    }
 
-        public void OnProcessing(Func<IShape, Task> context)
-        {
-            ProcessingAsync = [.. ProcessingAsync, context];
-        }
+    public void OnDisplayed(Action<ShapeDisplayContext> context)
+    {
+        Displayed = [.. Displayed, context];
+    }
 
-        public void OnDisplayed(Action<ShapeDisplayContext> context)
+    /// <summary>
+    /// Marks this shape to be cached.
+    /// </summary>
+    public CacheContext Cache(string cacheId)
+    {
+        if (_cacheContext == null || _cacheContext.CacheId != cacheId)
         {
-            Displayed = [.. Displayed, context];
+            _cacheContext = new CacheContext(cacheId);
         }
 
-        /// <summary>
-        /// Marks this shape to be cached.
-        /// </summary>
-        public CacheContext Cache(string cacheId)
-        {
-            if (_cacheContext == null || _cacheContext.CacheId != cacheId)
-            {
-                _cacheContext = new CacheContext(cacheId);
-            }
-
-            return _cacheContext;
-        }
+        return _cacheContext;
+    }
 
-        /// <summary>
-        /// Returns the <see cref="CacheContext"/> instance if the shape is cached.
-        /// </summary>
-        public CacheContext Cache()
-        {
-            return _cacheContext;
-        }
+    /// <summary>
+    /// Returns the <see cref="CacheContext"/> instance if the shape is cached.
+    /// </summary>
+    public CacheContext Cache()
+    {
+        return _cacheContext;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/ShapeSerializer.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/ShapeSerializer.cs
index c91cbb006ca..e96901127f0 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/ShapeSerializer.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Shapes/ShapeSerializer.cs
@@ -4,107 +4,106 @@
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
-namespace OrchardCore.DisplayManagement.Shapes
+namespace OrchardCore.DisplayManagement.Shapes;
+
+/// <summary>
+/// Safely serializes a shape to Json.
+/// </summary>
+/// <remarks>
+/// A new instance should be created for each <see cref="IShape"/>.
+/// </remarks>
+public class ShapeSerializer
 {
-    /// <summary>
-    /// Safely serializes a shape to Json.
-    /// </summary>
-    /// <remarks>
-    /// A new instance should be created for each <see cref="IShape"/>.
-    /// </remarks>
-    public class ShapeSerializer
+    private static readonly JsonSerializerOptions _shapeJsonSerializer = new()
     {
-        private static readonly JsonSerializerOptions _shapeJsonSerializer = new()
-        {
-            ReferenceHandler = ReferenceHandler.IgnoreCycles,
-        };
+        ReferenceHandler = ReferenceHandler.IgnoreCycles,
+    };
 
-        private readonly HashSet<IShape> _shapes = [];
-        private readonly IShape _shape;
+    private readonly HashSet<IShape> _shapes = [];
+    private readonly IShape _shape;
 
-        public ShapeSerializer(IShape shape)
-        {
-            _shape = shape;
-        }
+    public ShapeSerializer(IShape shape)
+    {
+        _shape = shape;
+    }
 
-        public JsonObject Serialize()
+    public JsonObject Serialize()
+    {
+        if (_shape == null)
         {
-            if (_shape == null)
-            {
-                return [];
-            }
+            return [];
+        }
 
-            var jObject = new JsonObject();
+        var jObject = new JsonObject();
 
-            // Provides a convenient identifier in console.
-            var displayText = _shape.Metadata.Name;
-            if (string.IsNullOrEmpty(displayText))
-            {
-                displayText = _shape.Metadata.Type;
-            }
+        // Provides a convenient identifier in console.
+        var displayText = _shape.Metadata.Name;
+        if (string.IsNullOrEmpty(displayText))
+        {
+            displayText = _shape.Metadata.Type;
+        }
 
-            if (string.IsNullOrEmpty(displayText))
-            {
-                displayText = _shape.GetType().Name;
-            }
+        if (string.IsNullOrEmpty(displayText))
+        {
+            displayText = _shape.GetType().Name;
+        }
 
-            jObject.Add("Shape", displayText);
+        jObject.Add("Shape", displayText);
 
-            var metadata = JObject.FromObject(_shape.Metadata, _shapeJsonSerializer);
+        var metadata = JObject.FromObject(_shape.Metadata, _shapeJsonSerializer);
 
-            jObject.Add(nameof(ShapeMetadata), metadata);
+        jObject.Add(nameof(ShapeMetadata), metadata);
 
-            if (_shape.Classes != null && _shape.Classes.Any())
-            {
-                jObject.Add(nameof(_shape.Classes), JArray.FromObject(_shape.Classes, _shapeJsonSerializer));
-            }
+        if (_shape.Classes != null && _shape.Classes.Any())
+        {
+            jObject.Add(nameof(_shape.Classes), JArray.FromObject(_shape.Classes, _shapeJsonSerializer));
+        }
 
-            if (_shape.Attributes != null && _shape.Attributes.Any())
-            {
-                jObject.Add(nameof(_shape.Attributes), JObject.FromObject(_shape.Attributes, _shapeJsonSerializer));
-            }
+        if (_shape.Attributes != null && _shape.Attributes.Any())
+        {
+            jObject.Add(nameof(_shape.Attributes), JObject.FromObject(_shape.Attributes, _shapeJsonSerializer));
+        }
 
-            if (_shape.Properties != null && _shape.Properties.Any())
-            {
-                jObject.Add(nameof(_shape.Properties), JObject.FromObject(_shape.Properties, _shapeJsonSerializer));
-                FindShapesInProperties(_shape);
-            }
+        if (_shape.Properties != null && _shape.Properties.Any())
+        {
+            jObject.Add(nameof(_shape.Properties), JObject.FromObject(_shape.Properties, _shapeJsonSerializer));
+            FindShapesInProperties(_shape);
+        }
 
-            if (_shape is Shape actualShape && actualShape.HasItems && _shapes.Add(actualShape))
+        if (_shape is Shape actualShape && actualShape.HasItems && _shapes.Add(actualShape))
+        {
+            var jItems = new JsonArray();
+            // Because items can be mutated during shape execution.
+            var shapeItems = actualShape.Items.ToArray();
+            foreach (var item in shapeItems)
             {
-                var jItems = new JsonArray();
-                // Because items can be mutated during shape execution.
-                var shapeItems = actualShape.Items.ToArray();
-                foreach (var item in shapeItems)
+                if (item is IShape shapeItem && _shapes.Add(shapeItem))
                 {
-                    if (item is IShape shapeItem && _shapes.Add(shapeItem))
-                    {
-                        // Display item in json so source of item remains clear.
-                        var jItem = shapeItem.ShapeToJson();
-                        jItems.Add(jItem);
-                    }
+                    // Display item in json so source of item remains clear.
+                    var jItem = shapeItem.ShapeToJson();
+                    jItems.Add(jItem);
                 }
-
-                jObject.Add(nameof(actualShape.Items), jItems);
             }
 
-            return jObject;
+            jObject.Add(nameof(actualShape.Items), jItems);
         }
 
-        private void FindShapesInProperties(IShape shape)
+        return jObject;
+    }
+
+    private void FindShapesInProperties(IShape shape)
+    {
+        foreach (var property in shape.Properties.Values)
         {
-            foreach (var property in shape.Properties.Values)
+            if (property is Shape shapeProperty && _shapes.Add(shapeProperty) && shapeProperty.HasItems)
             {
-                if (property is Shape shapeProperty && _shapes.Add(shapeProperty) && shapeProperty.HasItems)
+                var shapeItems = shapeProperty.Items.ToArray();
+                foreach (var item in shapeItems.Cast<IShape>())
                 {
-                    var shapeItems = shapeProperty.Items.ToArray();
-                    foreach (var item in shapeItems.Cast<IShape>())
+                    if (item is IShape shapeItem && _shapes.Add(shapeItem))
                     {
-                        if (item is IShape shapeItem && _shapes.Add(shapeItem))
-                        {
-                            // Recurse for more shapes.
-                            FindShapesInProperties(shapeItem);
-                        }
+                        // Recurse for more shapes.
+                        FindShapesInProperties(shapeItem);
                     }
                 }
             }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/AddAlternateTagHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/AddAlternateTagHelper.cs
index 5d7341ed4a9..4d522b04f6a 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/AddAlternateTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/AddAlternateTagHelper.cs
@@ -2,20 +2,19 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.DisplayManagement.TagHelpers
+namespace OrchardCore.DisplayManagement.TagHelpers;
+
+[HtmlTargetElement("add-alternate", ParentTag = ShapeMetadataTagHelper.TagName, Attributes = "name", TagStructure = TagStructure.WithoutEndTag)]
+public class AddAlternateTagHelper : TagHelper
 {
-    [HtmlTargetElement("add-alternate", ParentTag = ShapeMetadataTagHelper.TagName, Attributes = "name", TagStructure = TagStructure.WithoutEndTag)]
-    public class AddAlternateTagHelper : TagHelper
+    public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
     {
-        public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
-        {
-            var shape = (IShape)context.Items[typeof(IShape)];
+        var shape = (IShape)context.Items[typeof(IShape)];
 
-            shape?.Metadata.Alternates.Add(Convert.ToString(output.Attributes["name"].Value));
+        shape?.Metadata.Alternates.Add(Convert.ToString(output.Attributes["name"].Value));
 
-            output.SuppressOutput();
+        output.SuppressOutput();
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/AddClassTagHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/AddClassTagHelper.cs
index 90250d4ef3f..ac41e8bcea5 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/AddClassTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/AddClassTagHelper.cs
@@ -2,20 +2,19 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.DisplayManagement.TagHelpers
+namespace OrchardCore.DisplayManagement.TagHelpers;
+
+[HtmlTargetElement("add-class", Attributes = "name", TagStructure = TagStructure.WithoutEndTag)]
+public class AddClassTagHelper : TagHelper
 {
-    [HtmlTargetElement("add-class", Attributes = "name", TagStructure = TagStructure.WithoutEndTag)]
-    public class AddClassTagHelper : TagHelper
+    public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
     {
-        public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
-        {
-            var shape = (IShape)context.Items[typeof(IShape)];
+        var shape = (IShape)context.Items[typeof(IShape)];
 
-            shape?.Classes.Add(Convert.ToString(output.Attributes["name"].Value));
+        shape?.Classes.Add(Convert.ToString(output.Attributes["name"].Value));
 
-            output.SuppressOutput();
+        output.SuppressOutput();
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/AddPropertyTagHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/AddPropertyTagHelper.cs
index 1af4565a368..7c224fc3ecb 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/AddPropertyTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/AddPropertyTagHelper.cs
@@ -1,6 +1,6 @@
-using Microsoft.AspNetCore.Html;
-using Microsoft.AspNetCore.Razor.TagHelpers;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 
 namespace OrchardCore.DisplayManagement.TagHelpers;
 
@@ -22,7 +22,7 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
         shape.Properties[Name.Trim()] = output.Attributes.ContainsName("value")
             ? output.Attributes["value"].Value
             : new HtmlString(content.GetContent());
-            
+
         output.SuppressOutput();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/AddWrapperTagHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/AddWrapperTagHelper.cs
index 1dfe620d4ea..6fdf32120f1 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/AddWrapperTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/AddWrapperTagHelper.cs
@@ -2,20 +2,19 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.DisplayManagement.TagHelpers
+namespace OrchardCore.DisplayManagement.TagHelpers;
+
+[HtmlTargetElement("add-wrapper", ParentTag = ShapeMetadataTagHelper.TagName, Attributes = "name", TagStructure = TagStructure.WithoutEndTag)]
+public class AddWrapperTagHelper : TagHelper
 {
-    [HtmlTargetElement("add-wrapper", ParentTag = ShapeMetadataTagHelper.TagName, Attributes = "name", TagStructure = TagStructure.WithoutEndTag)]
-    public class AddWrapperTagHelper : TagHelper
+    public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
     {
-        public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
-        {
-            var shape = (IShape)context.Items[typeof(IShape)];
+        var shape = (IShape)context.Items[typeof(IShape)];
 
-            shape?.Metadata.Wrappers.Add(Convert.ToString(output.Attributes["name"].Value));
+        shape?.Metadata.Wrappers.Add(Convert.ToString(output.Attributes["name"].Value));
 
-            output.SuppressOutput();
+        output.SuppressOutput();
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/BaseShapeTagHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/BaseShapeTagHelper.cs
index 7a7a6f95e7e..8b42c39552f 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/BaseShapeTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/BaseShapeTagHelper.cs
@@ -4,172 +4,171 @@
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using OrchardCore.Mvc.Utilities;
 
-namespace OrchardCore.DisplayManagement.TagHelpers
+namespace OrchardCore.DisplayManagement.TagHelpers;
+
+public abstract class BaseShapeTagHelper : TagHelper
 {
-    public abstract class BaseShapeTagHelper : TagHelper
+    protected const string PropertyDictionaryName = "prop-all";
+    protected const string PropertyPrefix = "prop-";
+
+    private static readonly HashSet<string> _internalProperties =
+    [
+        "id",
+        "alternate",
+        "wrapper",
+        "cache-id",
+        "cache-context",
+        "cache-tag",
+        "cache-fixed-duration",
+        "cache-sliding-duration"
+    ];
+
+    private static readonly char[] _separators = [',', ' '];
+
+    protected IShapeFactory _shapeFactory;
+    protected IDisplayHelper _displayHelper;
+
+    public string Type { get; set; }
+
+    // The following properties are declared as internal to prevent any attribute with a
+    // matching name from being automatically bound and removed from the output attributes,
+    // and then not added to the properties of the shape we are building.
+
+    internal string Cache { get; set; }
+    internal TimeSpan? FixedDuration { get; set; }
+    internal TimeSpan? SlidingDuration { get; set; }
+    internal string Context { get; set; }
+    internal string Tag { get; set; }
+
+    protected BaseShapeTagHelper(IShapeFactory shapeFactory, IDisplayHelper displayHelper)
     {
-        protected const string PropertyDictionaryName = "prop-all";
-        protected const string PropertyPrefix = "prop-";
-
-        private static readonly HashSet<string> _internalProperties =
-        [
-            "id",
-            "alternate",
-            "wrapper",
-            "cache-id",
-            "cache-context",
-            "cache-tag",
-            "cache-fixed-duration",
-            "cache-sliding-duration"
-        ];
-
-        private static readonly char[] _separators = [',', ' '];
-
-        protected IShapeFactory _shapeFactory;
-        protected IDisplayHelper _displayHelper;
-
-        public string Type { get; set; }
-
-        // The following properties are declared as internal to prevent any attribute with a
-        // matching name from being automatically bound and removed from the output attributes,
-        // and then not added to the properties of the shape we are building.
-
-        internal string Cache { get; set; }
-        internal TimeSpan? FixedDuration { get; set; }
-        internal TimeSpan? SlidingDuration { get; set; }
-        internal string Context { get; set; }
-        internal string Tag { get; set; }
-
-        protected BaseShapeTagHelper(IShapeFactory shapeFactory, IDisplayHelper displayHelper)
-        {
-            _shapeFactory = shapeFactory;
-            _displayHelper = displayHelper;
-        }
+        _shapeFactory = shapeFactory;
+        _displayHelper = displayHelper;
+    }
 
-        /// <summary>
-        /// Additional properties for the shape.
-        /// </summary>
-        [HtmlAttributeName(PropertyDictionaryName, DictionaryAttributePrefix = PropertyPrefix)]
-        public IDictionary<string, object> Properties { get; set; } = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+    /// <summary>
+    /// Additional properties for the shape.
+    /// </summary>
+    [HtmlAttributeName(PropertyDictionaryName, DictionaryAttributePrefix = PropertyPrefix)]
+    public IDictionary<string, object> Properties { get; set; } = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
 
-        public override async Task ProcessAsync(TagHelperContext tagHelperContext, TagHelperOutput output)
+    public override async Task ProcessAsync(TagHelperContext tagHelperContext, TagHelperOutput output)
+    {
+        var properties = new Dictionary<string, object>();
+
+        // These prefixed properties are bound with their original type and not converted as IHtmlContent
+        foreach (var property in Properties)
         {
-            var properties = new Dictionary<string, object>();
+            var normalizedName = property.Key.ToPascalCaseDash();
+            properties.Add(normalizedName, property.Value);
+        }
 
-            // These prefixed properties are bound with their original type and not converted as IHtmlContent
-            foreach (var property in Properties)
+        // Extract all other attributes from the tag helper, which are passed as IHtmlContent
+        foreach (var pair in output.Attributes)
+        {
+            // Check it's not a reserved property name
+            if (!_internalProperties.Contains(pair.Name))
             {
-                var normalizedName = property.Key.ToPascalCaseDash();
-                properties.Add(normalizedName, property.Value);
-            }
+                var normalizedName = pair.Name.ToPascalCaseDash();
 
-            // Extract all other attributes from the tag helper, which are passed as IHtmlContent
-            foreach (var pair in output.Attributes)
-            {
-                // Check it's not a reserved property name
-                if (!_internalProperties.Contains(pair.Name))
+                if (!properties.ContainsKey(normalizedName))
                 {
-                    var normalizedName = pair.Name.ToPascalCaseDash();
-
-                    if (!properties.ContainsKey(normalizedName))
-                    {
-                        properties.Add(normalizedName, pair.Value.ToString());
-                    }
+                    properties.Add(normalizedName, pair.Value.ToString());
                 }
             }
+        }
 
-            if (string.IsNullOrWhiteSpace(Type))
-            {
-                Type = output.TagName;
-            }
+        if (string.IsNullOrWhiteSpace(Type))
+        {
+            Type = output.TagName;
+        }
 
-            if (string.IsNullOrWhiteSpace(Cache) && output.Attributes.ContainsName("cache-id"))
-            {
-                Cache = Convert.ToString(output.Attributes["cache-id"].Value);
-            }
+        if (string.IsNullOrWhiteSpace(Cache) && output.Attributes.ContainsName("cache-id"))
+        {
+            Cache = Convert.ToString(output.Attributes["cache-id"].Value);
+        }
 
-            if (string.IsNullOrWhiteSpace(Context) && output.Attributes.ContainsName("cache-context"))
-            {
-                Context = Convert.ToString(output.Attributes["cache-context"].Value);
-            }
+        if (string.IsNullOrWhiteSpace(Context) && output.Attributes.ContainsName("cache-context"))
+        {
+            Context = Convert.ToString(output.Attributes["cache-context"].Value);
+        }
 
-            if (string.IsNullOrWhiteSpace(Tag) && output.Attributes.ContainsName("cache-tag"))
-            {
-                Tag = Convert.ToString(output.Attributes["cache-tag"].Value);
-            }
+        if (string.IsNullOrWhiteSpace(Tag) && output.Attributes.ContainsName("cache-tag"))
+        {
+            Tag = Convert.ToString(output.Attributes["cache-tag"].Value);
+        }
 
-            if (!FixedDuration.HasValue && output.Attributes.ContainsName("cache-fixed-duration"))
+        if (!FixedDuration.HasValue && output.Attributes.ContainsName("cache-fixed-duration"))
+        {
+            TimeSpan timespan;
+            if (TimeSpan.TryParse(Convert.ToString(output.Attributes["cache-fixed-duration"].Value), out timespan))
             {
-                TimeSpan timespan;
-                if (TimeSpan.TryParse(Convert.ToString(output.Attributes["cache-fixed-duration"].Value), out timespan))
-                {
-                    FixedDuration = timespan;
-                }
+                FixedDuration = timespan;
             }
+        }
 
-            if (!SlidingDuration.HasValue && output.Attributes.ContainsName("cache-sliding-duration"))
+        if (!SlidingDuration.HasValue && output.Attributes.ContainsName("cache-sliding-duration"))
+        {
+            TimeSpan timespan;
+            if (TimeSpan.TryParse(Convert.ToString(output.Attributes["cache-sliding-duration"].Value), out timespan))
             {
-                TimeSpan timespan;
-                if (TimeSpan.TryParse(Convert.ToString(output.Attributes["cache-sliding-duration"].Value), out timespan))
-                {
-                    SlidingDuration = timespan;
-                }
+                SlidingDuration = timespan;
             }
+        }
+
+        var shape = await _shapeFactory.CreateAsync(Type, Arguments.From(properties));
+
+        if (output.Attributes.ContainsName("id"))
+        {
+            shape.Id = Convert.ToString(output.Attributes["id"].Value);
+        }
+
+        if (output.Attributes.ContainsName("alternate"))
+        {
+            shape.Metadata.Alternates.Add(Convert.ToString(output.Attributes["alternate"].Value));
+        }
+
+        if (output.Attributes.ContainsName("wrapper"))
+        {
+            shape.Metadata.Wrappers.Add(Convert.ToString(output.Attributes["wrapper"].Value));
+        }
+
+        tagHelperContext.Items[typeof(IShape)] = shape;
+
+        if (!string.IsNullOrWhiteSpace(Cache))
+        {
+            var metadata = shape.Metadata;
 
-            var shape = await _shapeFactory.CreateAsync(Type, Arguments.From(properties));
+            metadata.Cache(Cache);
 
-            if (output.Attributes.ContainsName("id"))
+            if (FixedDuration.HasValue)
             {
-                shape.Id = Convert.ToString(output.Attributes["id"].Value);
+                metadata.Cache().WithExpiryAfter(FixedDuration.Value);
             }
 
-            if (output.Attributes.ContainsName("alternate"))
+            if (SlidingDuration.HasValue)
             {
-                shape.Metadata.Alternates.Add(Convert.ToString(output.Attributes["alternate"].Value));
+                metadata.Cache().WithExpirySliding(SlidingDuration.Value);
             }
 
-            if (output.Attributes.ContainsName("wrapper"))
+            if (!string.IsNullOrWhiteSpace(Context))
             {
-                shape.Metadata.Wrappers.Add(Convert.ToString(output.Attributes["wrapper"].Value));
+                var contexts = Context.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
+                metadata.Cache().AddContext(contexts);
             }
 
-            tagHelperContext.Items[typeof(IShape)] = shape;
-
-            if (!string.IsNullOrWhiteSpace(Cache))
+            if (!string.IsNullOrWhiteSpace(Tag))
             {
-                var metadata = shape.Metadata;
-
-                metadata.Cache(Cache);
-
-                if (FixedDuration.HasValue)
-                {
-                    metadata.Cache().WithExpiryAfter(FixedDuration.Value);
-                }
-
-                if (SlidingDuration.HasValue)
-                {
-                    metadata.Cache().WithExpirySliding(SlidingDuration.Value);
-                }
-
-                if (!string.IsNullOrWhiteSpace(Context))
-                {
-                    var contexts = Context.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
-                    metadata.Cache().AddContext(contexts);
-                }
-
-                if (!string.IsNullOrWhiteSpace(Tag))
-                {
-                    var tags = Tag.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
-                    metadata.Cache().AddTag(tags);
-                }
+                var tags = Tag.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
+                metadata.Cache().AddTag(tags);
             }
+        }
 
-            await output.GetChildContentAsync();
+        await output.GetChildContentAsync();
 
-            output.Content.SetHtmlContent(await _displayHelper.ShapeExecuteAsync(shape));
+        output.Content.SetHtmlContent(await _displayHelper.ShapeExecuteAsync(shape));
 
-            // We don't want any encapsulating tag around the shape
-            output.TagName = null;
-        }
+        // We don't want any encapsulating tag around the shape
+        output.TagName = null;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ClearAlternatesTagHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ClearAlternatesTagHelper.cs
index 8cbcca9859d..b797df57981 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ClearAlternatesTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ClearAlternatesTagHelper.cs
@@ -1,20 +1,19 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.DisplayManagement.TagHelpers
+namespace OrchardCore.DisplayManagement.TagHelpers;
+
+[HtmlTargetElement("clear-alternates", ParentTag = ShapeMetadataTagHelper.TagName, TagStructure = TagStructure.WithoutEndTag)]
+public class ClearAlternatesTagHelper : TagHelper
 {
-    [HtmlTargetElement("clear-alternates", ParentTag = ShapeMetadataTagHelper.TagName, TagStructure = TagStructure.WithoutEndTag)]
-    public class ClearAlternatesTagHelper : TagHelper
+    public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
     {
-        public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
-        {
-            var shape = (IShape)context.Items[typeof(IShape)];
+        var shape = (IShape)context.Items[typeof(IShape)];
 
-            shape?.Metadata.Alternates.Clear();
+        shape?.Metadata.Alternates.Clear();
 
-            output.SuppressOutput();
+        output.SuppressOutput();
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ClearClassesTagHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ClearClassesTagHelper.cs
index 263c7222637..cc3e16ec29a 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ClearClassesTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ClearClassesTagHelper.cs
@@ -1,20 +1,19 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.DisplayManagement.TagHelpers
+namespace OrchardCore.DisplayManagement.TagHelpers;
+
+[HtmlTargetElement("clear-classes", TagStructure = TagStructure.WithoutEndTag)]
+public class ClearClassesTagHelper : TagHelper
 {
-    [HtmlTargetElement("clear-classes", TagStructure = TagStructure.WithoutEndTag)]
-    public class ClearClassesTagHelper : TagHelper
+    public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
     {
-        public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
-        {
-            var shape = (IShape)context.Items[typeof(IShape)];
+        var shape = (IShape)context.Items[typeof(IShape)];
 
-            shape?.Classes.Clear();
+        shape?.Classes.Clear();
 
-            output.SuppressOutput();
+        output.SuppressOutput();
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ClearWrappersTagHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ClearWrappersTagHelper.cs
index 9140a33ae63..4283f07d78b 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ClearWrappersTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ClearWrappersTagHelper.cs
@@ -1,20 +1,19 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.DisplayManagement.TagHelpers
+namespace OrchardCore.DisplayManagement.TagHelpers;
+
+[HtmlTargetElement("clear-wrappers", ParentTag = ShapeMetadataTagHelper.TagName, TagStructure = TagStructure.WithoutEndTag)]
+public class ClearWrappersTagHelper : TagHelper
 {
-    [HtmlTargetElement("clear-wrappers", ParentTag = ShapeMetadataTagHelper.TagName, TagStructure = TagStructure.WithoutEndTag)]
-    public class ClearWrappersTagHelper : TagHelper
+    public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
     {
-        public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
-        {
-            var shape = (IShape)context.Items[typeof(IShape)];
+        var shape = (IShape)context.Items[typeof(IShape)];
 
-            shape?.Metadata.Wrappers.Clear();
+        shape?.Metadata.Wrappers.Clear();
 
-            output.SuppressOutput();
+        output.SuppressOutput();
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/DateTimeTagHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/DateTimeTagHelper.cs
index a5c71e683d0..d5dee159ee6 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/DateTimeTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/DateTimeTagHelper.cs
@@ -2,40 +2,39 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.DisplayManagement.TagHelpers
+namespace OrchardCore.DisplayManagement.TagHelpers;
+
+[HtmlTargetElement("datetime")]
+public class DateTimeTagHelper : TagHelper
 {
-    [HtmlTargetElement("datetime")]
-    public class DateTimeTagHelper : TagHelper
-    {
-        private const string UtcAttribute = "utc";
-        private const string FormatAttribute = "format";
+    private const string UtcAttribute = "utc";
+    private const string FormatAttribute = "format";
 
-        protected IShapeFactory _shapeFactory;
-        protected IDisplayHelper _displayHelper;
+    protected IShapeFactory _shapeFactory;
+    protected IDisplayHelper _displayHelper;
 
-        public DateTimeTagHelper(IShapeFactory shapeFactory, IDisplayHelper displayHelper)
-        {
-            _shapeFactory = shapeFactory;
-            _displayHelper = displayHelper;
-        }
+    public DateTimeTagHelper(IShapeFactory shapeFactory, IDisplayHelper displayHelper)
+    {
+        _shapeFactory = shapeFactory;
+        _displayHelper = displayHelper;
+    }
 
-        [HtmlAttributeName(UtcAttribute)]
-        public DateTime? Utc { set; get; }
+    [HtmlAttributeName(UtcAttribute)]
+    public DateTime? Utc { set; get; }
 
-        [HtmlAttributeName(FormatAttribute)]
-        public string Format { set; get; }
+    [HtmlAttributeName(FormatAttribute)]
+    public string Format { set; get; }
 
-        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
-        {
-            var shapeType = "DateTime";
-            var shape = await _shapeFactory.CreateAsync(shapeType);
-            shape.Properties["Utc"] = Utc;
-            shape.Properties["Format"] = Format;
+    public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+    {
+        var shapeType = "DateTime";
+        var shape = await _shapeFactory.CreateAsync(shapeType);
+        shape.Properties["Utc"] = Utc;
+        shape.Properties["Format"] = Format;
 
-            output.Content.SetHtmlContent(await _displayHelper.ShapeExecuteAsync(shape));
+        output.Content.SetHtmlContent(await _displayHelper.ShapeExecuteAsync(shape));
 
-            // We don't want any encapsulating tag around the shape
-            output.TagName = null;
-        }
+        // We don't want any encapsulating tag around the shape
+        output.TagName = null;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/InputIsDisabledTagHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/InputIsDisabledTagHelper.cs
index 01138996d4c..771851a8dcd 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/InputIsDisabledTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/InputIsDisabledTagHelper.cs
@@ -1,23 +1,22 @@
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.DisplayManagement.TagHelpers
+namespace OrchardCore.DisplayManagement.TagHelpers;
+
+[HtmlTargetElement("input", Attributes = ForAttributeName + "," + IsDisabledAttributeName)]
+public class InputIsDisabledTagHelper : TagHelper
 {
-    [HtmlTargetElement("input", Attributes = ForAttributeName + "," + IsDisabledAttributeName)]
-    public class InputIsDisabledTagHelper : TagHelper
-    {
-        private const string ForAttributeName = "asp-for";
-        private const string IsDisabledAttributeName = "asp-is-disabled";
+    private const string ForAttributeName = "asp-for";
+    private const string IsDisabledAttributeName = "asp-is-disabled";
 
-        [HtmlAttributeName("asp-is-disabled")]
-        public bool IsDisabled { set; get; }
+    [HtmlAttributeName("asp-is-disabled")]
+    public bool IsDisabled { set; get; }
 
-        public override void Process(TagHelperContext context, TagHelperOutput output)
+    public override void Process(TagHelperContext context, TagHelperOutput output)
+    {
+        if (IsDisabled)
         {
-            if (IsDisabled)
-            {
-                var d = new TagHelperAttribute("disabled", "disabled");
-                output.Attributes.Add(d);
-            }
+            var d = new TagHelperAttribute("disabled", "disabled");
+            output.Attributes.Add(d);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/RemoveAlternateTagHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/RemoveAlternateTagHelper.cs
index 204838ad416..1a1586571bc 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/RemoveAlternateTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/RemoveAlternateTagHelper.cs
@@ -2,20 +2,19 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.DisplayManagement.TagHelpers
+namespace OrchardCore.DisplayManagement.TagHelpers;
+
+[HtmlTargetElement("remove-alternate", ParentTag = ShapeMetadataTagHelper.TagName, Attributes = "name", TagStructure = TagStructure.WithoutEndTag)]
+public class RemoveAlternateTagHelper : TagHelper
 {
-    [HtmlTargetElement("remove-alternate", ParentTag = ShapeMetadataTagHelper.TagName, Attributes = "name", TagStructure = TagStructure.WithoutEndTag)]
-    public class RemoveAlternateTagHelper : TagHelper
+    public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
     {
-        public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
-        {
-            var shape = (IShape)context.Items[typeof(IShape)];
+        var shape = (IShape)context.Items[typeof(IShape)];
 
-            shape?.Metadata.Alternates.Remove(Convert.ToString(output.Attributes["name"].Value));
+        shape?.Metadata.Alternates.Remove(Convert.ToString(output.Attributes["name"].Value));
 
-            output.SuppressOutput();
+        output.SuppressOutput();
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/RemoveClassTagHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/RemoveClassTagHelper.cs
index 8fc91cd4c48..76040973960 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/RemoveClassTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/RemoveClassTagHelper.cs
@@ -2,20 +2,19 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.DisplayManagement.TagHelpers
+namespace OrchardCore.DisplayManagement.TagHelpers;
+
+[HtmlTargetElement("remove-class", Attributes = "name", TagStructure = TagStructure.WithoutEndTag)]
+public class RemoveClassTagHelper : TagHelper
 {
-    [HtmlTargetElement("remove-class", Attributes = "name", TagStructure = TagStructure.WithoutEndTag)]
-    public class RemoveClassTagHelper : TagHelper
+    public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
     {
-        public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
-        {
-            var shape = (IShape)context.Items[typeof(IShape)];
+        var shape = (IShape)context.Items[typeof(IShape)];
 
-            shape?.Classes.Remove(Convert.ToString(output.Attributes["name"].Value));
+        shape?.Classes.Remove(Convert.ToString(output.Attributes["name"].Value));
 
-            output.SuppressOutput();
+        output.SuppressOutput();
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/RemoveWrapperTagHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/RemoveWrapperTagHelper.cs
index 708c0353145..bf6f7a47556 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/RemoveWrapperTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/RemoveWrapperTagHelper.cs
@@ -2,20 +2,19 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.DisplayManagement.TagHelpers
+namespace OrchardCore.DisplayManagement.TagHelpers;
+
+[HtmlTargetElement("remove-wrapper", ParentTag = ShapeMetadataTagHelper.TagName, Attributes = "name", TagStructure = TagStructure.WithoutEndTag)]
+public class RemoveWrapperTagHelper : TagHelper
 {
-    [HtmlTargetElement("remove-wrapper", ParentTag = ShapeMetadataTagHelper.TagName, Attributes = "name", TagStructure = TagStructure.WithoutEndTag)]
-    public class RemoveWrapperTagHelper : TagHelper
+    public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
     {
-        public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
-        {
-            var shape = (IShape)context.Items[typeof(IShape)];
+        var shape = (IShape)context.Items[typeof(IShape)];
 
-            shape?.Metadata.Wrappers.Remove(Convert.ToString(output.Attributes["name"].Value));
+        shape?.Metadata.Wrappers.Remove(Convert.ToString(output.Attributes["name"].Value));
 
-            output.SuppressOutput();
+        output.SuppressOutput();
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ShapeMetadataTagHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ShapeMetadataTagHelper.cs
index 50cea56e2e9..f2a8480b2d3 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ShapeMetadataTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ShapeMetadataTagHelper.cs
@@ -2,24 +2,23 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.DisplayManagement.TagHelpers
+namespace OrchardCore.DisplayManagement.TagHelpers;
+
+[HtmlTargetElement(TagName, TagStructure = TagStructure.NormalOrSelfClosing)]
+public class ShapeMetadataTagHelper : TagHelper
 {
-    [HtmlTargetElement(TagName, TagStructure = TagStructure.NormalOrSelfClosing)]
-    public class ShapeMetadataTagHelper : TagHelper
+    internal const string TagName = "metadata";
+
+    public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
     {
-        internal const string TagName = "metadata";
+        var shape = (IShape)context.Items[typeof(IShape)];
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        if (shape != null && output.Attributes.ContainsName("display-type"))
         {
-            var shape = (IShape)context.Items[typeof(IShape)];
-
-            if (shape != null && output.Attributes.ContainsName("display-type"))
-            {
-                shape.Metadata.DisplayType = Convert.ToString(output.Attributes["display-type"].Value);
-            }
-
-            await output.GetChildContentAsync();
-            output.SuppressOutput();
+            shape.Metadata.DisplayType = Convert.ToString(output.Attributes["display-type"].Value);
         }
+
+        await output.GetChildContentAsync();
+        output.SuppressOutput();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ShapeTagHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ShapeTagHelper.cs
index 4b7c8839863..33de79828ba 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ShapeTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ShapeTagHelper.cs
@@ -1,14 +1,13 @@
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.DisplayManagement.TagHelpers
+namespace OrchardCore.DisplayManagement.TagHelpers;
+
+[HtmlTargetElement("shape", Attributes = nameof(Type))]
+[HtmlTargetElement("shape", Attributes = PropertyPrefix + "*")]
+public class ShapeTagHelper : BaseShapeTagHelper
 {
-    [HtmlTargetElement("shape", Attributes = nameof(Type))]
-    [HtmlTargetElement("shape", Attributes = PropertyPrefix + "*")]
-    public class ShapeTagHelper : BaseShapeTagHelper
+    public ShapeTagHelper(IShapeFactory shapeFactory, IDisplayHelper displayHelper)
+        : base(shapeFactory, displayHelper)
     {
-        public ShapeTagHelper(IShapeFactory shapeFactory, IDisplayHelper displayHelper)
-            : base(shapeFactory, displayHelper)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/TimeSpanTagHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/TimeSpanTagHelper.cs
index 186c30b167e..734a82e2cf1 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/TimeSpanTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/TimeSpanTagHelper.cs
@@ -2,40 +2,39 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.DisplayManagement.TagHelpers
+namespace OrchardCore.DisplayManagement.TagHelpers;
+
+[HtmlTargetElement("timespan")]
+public class TimeSpanTagHelper : TagHelper
 {
-    [HtmlTargetElement("timespan")]
-    public class TimeSpanTagHelper : TagHelper
-    {
-        private const string UtcAttribute = "utc";
-        private const string OriginAttribute = "origin";
+    private const string UtcAttribute = "utc";
+    private const string OriginAttribute = "origin";
 
-        protected IShapeFactory _shapeFactory;
-        protected IDisplayHelper _displayHelper;
+    protected IShapeFactory _shapeFactory;
+    protected IDisplayHelper _displayHelper;
 
-        public TimeSpanTagHelper(IShapeFactory shapeFactory, IDisplayHelper displayHelper)
-        {
-            _shapeFactory = shapeFactory;
-            _displayHelper = displayHelper;
-        }
+    public TimeSpanTagHelper(IShapeFactory shapeFactory, IDisplayHelper displayHelper)
+    {
+        _shapeFactory = shapeFactory;
+        _displayHelper = displayHelper;
+    }
 
-        [HtmlAttributeName(UtcAttribute)]
-        public DateTime? Utc { set; get; }
+    [HtmlAttributeName(UtcAttribute)]
+    public DateTime? Utc { set; get; }
 
-        [HtmlAttributeName(OriginAttribute)]
-        public DateTime? Origin { set; get; }
+    [HtmlAttributeName(OriginAttribute)]
+    public DateTime? Origin { set; get; }
 
-        public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
-        {
-            var shapeType = "TimeSpan";
-            var shape = await _shapeFactory.CreateAsync(shapeType);
-            shape.Properties["Utc"] = Utc;
-            shape.Properties["Origin"] = Origin;
+    public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+    {
+        var shapeType = "TimeSpan";
+        var shape = await _shapeFactory.CreateAsync(shapeType);
+        shape.Properties["Utc"] = Utc;
+        shape.Properties["Origin"] = Origin;
 
-            output.Content.SetHtmlContent(await _displayHelper.ShapeExecuteAsync(shape));
+        output.Content.SetHtmlContent(await _displayHelper.ShapeExecuteAsync(shape));
 
-            // We don't want any encapsulating tag around the shape
-            output.TagName = null;
-        }
+        // We don't want any encapsulating tag around the shape
+        output.TagName = null;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ValidationMessageTagHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ValidationMessageTagHelper.cs
index 0c3d12fe50a..7f0f94ecf32 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ValidationMessageTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ValidationMessageTagHelper.cs
@@ -4,82 +4,81 @@
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.DisplayManagement.TagHelpers
+namespace OrchardCore.DisplayManagement.TagHelpers;
+
+/// <summary>
+/// <see cref="ITagHelper"/> implementation targeting any HTML element with an <c>asp-validation-for</c>
+/// attribute.
+/// </summary>
+[HtmlTargetElement("*", Attributes = ValidationForAttributeName)]
+public class ValidationMessageTagHelper : TagHelper
 {
-    /// <summary>
-    /// <see cref="ITagHelper"/> implementation targeting any HTML element with an <c>asp-validation-for</c>
-    /// attribute.
-    /// </summary>
-    [HtmlTargetElement("*", Attributes = ValidationForAttributeName)]
-    public class ValidationMessageTagHelper : TagHelper
+    private const string ValidationForAttributeName = "asp-validation-class-for";
+    private const string HasValidationErrorClassName = "has-validation-error is-invalid";
+    private readonly IHtmlHelper _htmlHelper;
+
+    public ValidationMessageTagHelper(IHtmlHelper htmlHelper)
     {
-        private const string ValidationForAttributeName = "asp-validation-class-for";
-        private const string HasValidationErrorClassName = "has-validation-error is-invalid";
-        private readonly IHtmlHelper _htmlHelper;
+        _htmlHelper = htmlHelper;
+    }
 
-        public ValidationMessageTagHelper(IHtmlHelper htmlHelper)
+    /// <inheritdoc />
+    public override int Order
+    {
+        get
         {
-            _htmlHelper = htmlHelper;
+            return -1000;
         }
+    }
 
-        /// <inheritdoc />
-        public override int Order
-        {
-            get
-            {
-                return -1000;
-            }
-        }
+    [HtmlAttributeNotBound]
+    [ViewContext]
+    public ViewContext ViewContext { get; set; }
 
-        [HtmlAttributeNotBound]
-        [ViewContext]
-        public ViewContext ViewContext { get; set; }
+    /// <summary>
+    /// Name to be validated on the current model.
+    /// </summary>
+    [HtmlAttributeName(ValidationForAttributeName)]
+    public ModelExpression For { get; set; }
 
-        /// <summary>
-        /// Name to be validated on the current model.
-        /// </summary>
-        [HtmlAttributeName(ValidationForAttributeName)]
-        public ModelExpression For { get; set; }
+    /// <inheritdoc />
+    /// <remarks>Does nothing if <see cref="For"/> is <c>null</c>.</remarks>
+    public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+    {
+        ArgumentNullException.ThrowIfNull(context);
 
-        /// <inheritdoc />
-        /// <remarks>Does nothing if <see cref="For"/> is <c>null</c>.</remarks>
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        ArgumentNullException.ThrowIfNull(output);
+
+        if (For != null)
         {
-            ArgumentNullException.ThrowIfNull(context);
+            // contextualize IHtmlHelper
+            var viewContextAware = _htmlHelper as IViewContextAware;
+            viewContextAware?.Contextualize(ViewContext);
 
-            ArgumentNullException.ThrowIfNull(output);
+            var fullName = _htmlHelper.Name(For.Name);
 
-            if (For != null)
+            if (ViewContext.ViewData.ModelState.TryGetValue(fullName, out var entry) && entry.Errors.Count > 0)
             {
-                // contextualize IHtmlHelper
-                var viewContextAware = _htmlHelper as IViewContextAware;
-                viewContextAware?.Contextualize(ViewContext);
-
-                var fullName = _htmlHelper.Name(For.Name);
+                TagHelperAttribute classAttribute;
 
-                if (ViewContext.ViewData.ModelState.TryGetValue(fullName, out var entry) && entry.Errors.Count > 0)
+                if (output.Attributes.TryGetAttribute("class", out classAttribute))
                 {
-                    TagHelperAttribute classAttribute;
-
-                    if (output.Attributes.TryGetAttribute("class", out classAttribute))
-                    {
-                        output.Attributes.SetAttribute("class", classAttribute.Value + " " + HasValidationErrorClassName);
-                    }
-                    else
-                    {
-                        output.Attributes.Add("class", HasValidationErrorClassName);
-                    }
+                    output.Attributes.SetAttribute("class", classAttribute.Value + " " + HasValidationErrorClassName);
                 }
-
-                // We check for whitespace to detect scenarios such as:
-                // <span validation-for="Name">
-                // </span>
-                if (!output.IsContentModified)
+                else
                 {
-                    var childContent = await output.GetChildContentAsync();
-                    output.Content.SetHtmlContent(childContent);
+                    output.Attributes.Add("class", HasValidationErrorClassName);
                 }
             }
+
+            // We check for whitespace to detect scenarios such as:
+            // <span validation-for="Name">
+            // </span>
+            if (!output.IsContentModified)
+            {
+                var childContent = await output.GetChildContentAsync();
+                output.Content.SetHtmlContent(childContent);
+            }
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ZoneTagHelper.cs b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ZoneTagHelper.cs
index c9d1cba3ae4..b2d1babadcd 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ZoneTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/TagHelpers/ZoneTagHelper.cs
@@ -5,56 +5,55 @@
 using OrchardCore.DisplayManagement.Layout;
 using OrchardCore.DisplayManagement.Shapes;
 
-namespace OrchardCore.DisplayManagement.TagHelpers
+namespace OrchardCore.DisplayManagement.TagHelpers;
+
+[HtmlTargetElement("zone", Attributes = NameAttribute)]
+public class ZoneTagHelper : TagHelper
 {
-    [HtmlTargetElement("zone", Attributes = NameAttribute)]
-    public class ZoneTagHelper : TagHelper
+    private const string PositionAttribute = "position";
+    private const string NameAttribute = "name";
+
+    private readonly ILayoutAccessor _layoutAccessor;
+    private readonly ILogger _logger;
+
+    public ZoneTagHelper(ILayoutAccessor layoutAccessor, ILogger<ZoneTagHelper> logger)
     {
-        private const string PositionAttribute = "position";
-        private const string NameAttribute = "name";
+        _layoutAccessor = layoutAccessor;
+        _logger = logger;
+    }
+
+    [HtmlAttributeName(PositionAttribute)]
+    public string Position { get; set; }
 
-        private readonly ILayoutAccessor _layoutAccessor;
-        private readonly ILogger _logger;
+    [HtmlAttributeName(NameAttribute)]
+    public string Name { get; set; }
 
-        public ZoneTagHelper(ILayoutAccessor layoutAccessor, ILogger<ZoneTagHelper> logger)
+    public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+    {
+        if (string.IsNullOrEmpty(Name))
         {
-            _layoutAccessor = layoutAccessor;
-            _logger = logger;
+            throw new ArgumentException("The name attribute can't be empty");
         }
 
-        [HtmlAttributeName(PositionAttribute)]
-        public string Position { get; set; }
+        var childContent = await output.GetChildContentAsync();
+        var layout = await _layoutAccessor.GetLayoutAsync();
 
-        [HtmlAttributeName(NameAttribute)]
-        public string Name { get; set; }
+        var zone = layout.Zones[Name];
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        if (zone is Shape shape)
+        {
+            await shape.AddAsync(childContent, Position);
+        }
+        else
         {
-            if (string.IsNullOrEmpty(Name))
-            {
-                throw new ArgumentException("The name attribute can't be empty");
-            }
-
-            var childContent = await output.GetChildContentAsync();
-            var layout = await _layoutAccessor.GetLayoutAsync();
-
-            var zone = layout.Zones[Name];
-
-            if (zone is Shape shape)
-            {
-                await shape.AddAsync(childContent, Position);
-            }
-            else
-            {
-                _logger.LogWarning(
-                    "Unable to add shape to the zone using the <zone> tag helper because the zone's type is " +
-                    "\"{ActualType}\" instead of the expected {ExpectedType}",
-                    zone.GetType().FullName,
-                    nameof(Shape));
-            }
-
-            // Don't render the zone tag or the inner content
-            output.SuppressOutput();
+            _logger.LogWarning(
+                "Unable to add shape to the zone using the <zone> tag helper because the zone's type is " +
+                "\"{ActualType}\" instead of the expected {ExpectedType}",
+                zone.GetType().FullName,
+                nameof(Shape));
         }
+
+        // Don't render the zone tag or the inner content
+        output.SuppressOutput();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Theming/IThemeManager.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Theming/IThemeManager.cs
index 7b30f09684d..dab128727ad 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Theming/IThemeManager.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Theming/IThemeManager.cs
@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
 using OrchardCore.Environment.Extensions;
 
-namespace OrchardCore.DisplayManagement.Theming
+namespace OrchardCore.DisplayManagement.Theming;
+
+public interface IThemeManager
 {
-    public interface IThemeManager
-    {
-        Task<IExtensionInfo> GetThemeAsync();
-    }
+    Task<IExtensionInfo> GetThemeAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Theming/IThemeSelector.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Theming/IThemeSelector.cs
index 8bf9b81ea17..d52370a9cd8 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Theming/IThemeSelector.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Theming/IThemeSelector.cs
@@ -1,19 +1,18 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.DisplayManagement.Theming
+namespace OrchardCore.DisplayManagement.Theming;
+
+/// <summary>
+/// When implemented, defines a way to provide specific themes for the current request.
+/// The results of all implementations are then ordered by priority, and the result
+/// with the highest priority is selected as the current theme.
+/// </summary>
+public interface IThemeSelector
 {
     /// <summary>
-    /// When implemented, defines a way to provide specific themes for the current request.
-    /// The results of all implementations are then ordered by priority, and the result
-    /// with the highest priority is selected as the current theme.
+    /// Returns a <see cref="ThemeSelectorResult"/> representing a specific theme
+    /// and a priority order. The highest priority value will be used.
     /// </summary>
-    public interface IThemeSelector
-    {
-        /// <summary>
-        /// Returns a <see cref="ThemeSelectorResult"/> representing a specific theme
-        /// and a priority order. The highest priority value will be used.
-        /// </summary>
-        /// <returns></returns>
-        Task<ThemeSelectorResult> GetThemeAsync();
-    }
+    /// <returns></returns>
+    Task<ThemeSelectorResult> GetThemeAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemeLayout.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemeLayout.cs
index 6c5d60ab014..c92763cd610 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemeLayout.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemeLayout.cs
@@ -2,61 +2,60 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Html;
 
-namespace OrchardCore.DisplayManagement.Theming
+namespace OrchardCore.DisplayManagement.Theming;
+
+/// <summary>
+/// This class represents a precompiled _Layout.cshtml view that renders a
+/// Layout shape and the View's body in its Content zone.
+///
+/// 1- Views look for any _ViewStart.cshtml
+/// 2- <see cref="ThemingViewsFeatureProvider"/> has registered <see cref="ThemeViewStart"/> as the top one
+/// 3- <see cref="ThemeViewStart"/> then set a special Layout filename as the default View's Layout.
+/// 4- <see cref="ThemingViewsFeatureProvider"/> has registered <see cref="ThemeLayout"/> for this special filename.
+/// 5- <see cref="ThemeLayout"/> evaluates the Body of the view, and renders a Layout shape with this Body in the Content zone.
+/// </summary>
+public class ThemeLayout : Razor.RazorPage<dynamic>
 {
-    /// <summary>
-    /// This class represents a precompiled _Layout.cshtml view that renders a
-    /// Layout shape and the View's body in its Content zone.
-    ///
-    /// 1- Views look for any _ViewStart.cshtml
-    /// 2- <see cref="ThemingViewsFeatureProvider"/> has registered <see cref="ThemeViewStart"/> as the top one
-    /// 3- <see cref="ThemeViewStart"/> then set a special Layout filename as the default View's Layout.
-    /// 4- <see cref="ThemingViewsFeatureProvider"/> has registered <see cref="ThemeLayout"/> for this special filename.
-    /// 5- <see cref="ThemeLayout"/> evaluates the Body of the view, and renders a Layout shape with this Body in the Content zone.
-    /// </summary>
-    public class ThemeLayout : Razor.RazorPage<dynamic>
+    public override async Task ExecuteAsync()
     {
-        public override async Task ExecuteAsync()
-        {
-            // The View's body is rendered.
-            var body = RenderLayoutBody();
+        // The View's body is rendered.
+        var body = RenderLayoutBody();
 
-            if (ThemeLayout != null)
-            {
-                // Then is added to the Content zone of the Layout shape.
-                await ThemeLayout.Zones["Content"].AddAsync(body);
+        if (ThemeLayout != null)
+        {
+            // Then is added to the Content zone of the Layout shape.
+            await ThemeLayout.Zones["Content"].AddAsync(body);
 
-                // Pre-render all shapes and replace the zone content with it.
-                ThemeLayout.Zones["Content"] = PositionWrapper.TryWrap(await DisplayAsync(ThemeLayout.Zones["Content"]), "") as IShape;
+            // Pre-render all shapes and replace the zone content with it.
+            ThemeLayout.Zones["Content"] = PositionWrapper.TryWrap(await DisplayAsync(ThemeLayout.Zones["Content"]), "") as IShape;
 
-                // Render each layout zone.
-                foreach (var zone in ThemeLayout.Properties.ToArray())
+            // Render each layout zone.
+            foreach (var zone in ThemeLayout.Properties.ToArray())
+            {
+                if (zone.Value is IShape shape)
                 {
-                    if (zone.Value is IShape shape)
+                    // Check if the shape is null or empty.
+                    if (shape.IsNullOrEmpty())
                     {
-                        // Check if the shape is null or empty.
-                        if (shape.IsNullOrEmpty())
-                        {
-                            continue;
-                        }
-
-                        // Check if the shape is pre-rendered.
-                        if (shape is IHtmlContent)
-                        {
-                            continue;
-                        }
-
-                        ThemeLayout.Zones[zone.Key] = PositionWrapper.TryWrap(await DisplayAsync(shape), "") as IShape;
+                        continue;
                     }
-                }
 
-                // Finally we render the Layout Shape's HTML to the page's output.
-                Write(await DisplayAsync(ThemeLayout));
-            }
-            else
-            {
-                Write(body);
+                    // Check if the shape is pre-rendered.
+                    if (shape is IHtmlContent)
+                    {
+                        continue;
+                    }
+
+                    ThemeLayout.Zones[zone.Key] = PositionWrapper.TryWrap(await DisplayAsync(shape), "") as IShape;
+                }
             }
+
+            // Finally we render the Layout Shape's HTML to the page's output.
+            Write(await DisplayAsync(ThemeLayout));
+        }
+        else
+        {
+            Write(body);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemeManager.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemeManager.cs
index 28ea22aa2d1..cf988fc631c 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemeManager.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemeManager.cs
@@ -3,62 +3,61 @@
 using OrchardCore.DisplayManagement.Extensions;
 using OrchardCore.Environment.Extensions;
 
-namespace OrchardCore.DisplayManagement.Theming
+namespace OrchardCore.DisplayManagement.Theming;
+
+public class ThemeManager : IThemeManager
 {
-    public class ThemeManager : IThemeManager
-    {
-        private readonly IEnumerable<IThemeSelector> _themeSelectors;
-        private readonly IExtensionManager _extensionManager;
+    private readonly IEnumerable<IThemeSelector> _themeSelectors;
+    private readonly IExtensionManager _extensionManager;
 
-        private IExtensionInfo _theme;
+    private IExtensionInfo _theme;
 
-        public ThemeManager(
-            IEnumerable<IThemeSelector> themeSelectors,
-            IExtensionManager extensionManager)
-        {
-            _themeSelectors = themeSelectors;
-            _extensionManager = extensionManager;
-        }
+    public ThemeManager(
+        IEnumerable<IThemeSelector> themeSelectors,
+        IExtensionManager extensionManager)
+    {
+        _themeSelectors = themeSelectors;
+        _extensionManager = extensionManager;
+    }
 
-        public async Task<IExtensionInfo> GetThemeAsync()
+    public async Task<IExtensionInfo> GetThemeAsync()
+    {
+        // For performance reason, processes the current theme only once per scope (request).
+        // This can't be cached as each request gets a different value.
+        if (_theme == null)
         {
-            // For performance reason, processes the current theme only once per scope (request).
-            // This can't be cached as each request gets a different value.
-            if (_theme == null)
+            var themeResults = new List<ThemeSelectorResult>();
+            foreach (var themeSelector in _themeSelectors)
             {
-                var themeResults = new List<ThemeSelectorResult>();
-                foreach (var themeSelector in _themeSelectors)
+                var themeResult = await themeSelector.GetThemeAsync();
+                if (themeResult != null)
                 {
-                    var themeResult = await themeSelector.GetThemeAsync();
-                    if (themeResult != null)
-                    {
-                        themeResults.Add(themeResult);
-                    }
+                    themeResults.Add(themeResult);
                 }
+            }
 
-                if (themeResults.Count == 0)
-                {
-                    return null;
-                }
+            if (themeResults.Count == 0)
+            {
+                return null;
+            }
 
-                themeResults.Sort((x, y) => y.Priority.CompareTo(x.Priority));
+            themeResults.Sort((x, y) => y.Priority.CompareTo(x.Priority));
 
-                // Try to load the theme to ensure it's present
-                foreach (var theme in themeResults)
-                {
-                    var t = _extensionManager.GetExtension(theme.ThemeName);
+            // Try to load the theme to ensure it's present
+            foreach (var theme in themeResults)
+            {
+                var t = _extensionManager.GetExtension(theme.ThemeName);
 
-                    if (t.Exists)
-                    {
-                        return _theme = new ThemeExtensionInfo(t);
-                    }
+                if (t.Exists)
+                {
+                    return _theme = new ThemeExtensionInfo(t);
                 }
-
-                // No valid theme. Don't save the result right now.
-                return null;
             }
 
-            return _theme;
+            // No valid theme. Don't save the result right now.
+            return null;
         }
+
+        return _theme;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemeSelectorResult.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemeSelectorResult.cs
index 960d7dbecda..9f54b0178c5 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemeSelectorResult.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemeSelectorResult.cs
@@ -1,19 +1,18 @@
-namespace OrchardCore.DisplayManagement.Theming
+namespace OrchardCore.DisplayManagement.Theming;
+
+/// <summary>
+/// Represents a result for a selected theme.
+/// </summary>
+public class ThemeSelectorResult
 {
     /// <summary>
-    /// Represents a result for a selected theme.
+    /// Gets or sets the priority for the selected theme.
     /// </summary>
-    public class ThemeSelectorResult
-    {
-        /// <summary>
-        /// Gets or sets the priority for the selected theme.
-        /// </summary>
-        public int Priority { get; set; }
+    public int Priority { get; set; }
 
-        /// <summary>
-        /// Gets or sets the theme name.
-        /// </summary>
-        /// <remarks>This is the theme identifier. By default this is also the theme name, but if a custom identifier has been specified, please use the identifier.</remarks>
-        public string ThemeName { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the theme name.
+    /// </summary>
+    /// <remarks>This is the theme identifier. By default this is also the theme name, but if a custom identifier has been specified, please use the identifier.</remarks>
+    public string ThemeName { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemeViewStart.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemeViewStart.cs
index 3cc363aa5cf..d749308ae4b 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemeViewStart.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemeViewStart.cs
@@ -2,27 +2,26 @@
 using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace OrchardCore.DisplayManagement.Theming
+namespace OrchardCore.DisplayManagement.Theming;
+
+/// <summary>
+/// A precompiled view that resets the View's Layout to the <see cref="ThemeLayout"/>
+/// class to ensure the Layout shape is used.
+/// </summary>
+public class ThemeViewStart : RazorPage<dynamic>
 {
-    /// <summary>
-    /// A precompiled view that resets the View's Layout to the <see cref="ThemeLayout"/>
-    /// class to ensure the Layout shape is used.
-    /// </summary>
-    public class ThemeViewStart : RazorPage<dynamic>
+    public override async Task ExecuteAsync()
     {
-        public override async Task ExecuteAsync()
-        {
-            // Checking if the current request has an active theme before assigning a Layout shape
-            var themeManager = Context.RequestServices.GetRequiredService<IThemeManager>();
-
-            var theme = await themeManager.GetThemeAsync();
+        // Checking if the current request has an active theme before assigning a Layout shape
+        var themeManager = Context.RequestServices.GetRequiredService<IThemeManager>();
 
-            if (theme == null)
-            {
-                return;
-            }
+        var theme = await themeManager.GetThemeAsync();
 
-            Layout = ThemingViewsFeatureProvider.ThemeLayoutFileName;
+        if (theme == null)
+        {
+            return;
         }
+
+        Layout = ThemingViewsFeatureProvider.ThemeLayoutFileName;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemingViewsFeatureProvider.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemingViewsFeatureProvider.cs
index 5738daffee4..33cfc712841 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemingViewsFeatureProvider.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemingViewsFeatureProvider.cs
@@ -6,34 +6,33 @@
 using Microsoft.AspNetCore.Razor.Hosting;
 using Microsoft.Extensions.Primitives;
 
-namespace OrchardCore.DisplayManagement.Theming
+namespace OrchardCore.DisplayManagement.Theming;
+
+/// <summary>
+/// Provides Theming precompiled views when specific Layout and ViewStart files are seeked on the filesystem.
+/// </summary>
+public class ThemingViewsFeatureProvider : IApplicationFeatureProvider<ViewsFeature>
 {
-    /// <summary>
-    /// Provides Theming precompiled views when specific Layout and ViewStart files are seeked on the filesystem.
-    /// </summary>
-    public class ThemingViewsFeatureProvider : IApplicationFeatureProvider<ViewsFeature>
+    public static readonly string ThemeLayoutFileName = "DefaultOrchardCoreThemingLayout" + RazorViewEngine.ViewExtension;
+
+    public ThemingViewsFeatureProvider()
     {
-        public static readonly string ThemeLayoutFileName = "DefaultOrchardCoreThemingLayout" + RazorViewEngine.ViewExtension;
+    }
 
-        public ThemingViewsFeatureProvider()
+    public void PopulateFeature(IEnumerable<ApplicationPart> parts, ViewsFeature feature)
+    {
+        feature.ViewDescriptors.Add(new CompiledViewDescriptor()
         {
-        }
+            ExpirationTokens = Array.Empty<IChangeToken>(),
+            RelativePath = "/_ViewStart" + RazorViewEngine.ViewExtension,
+            Item = new TenantRazorCompiledItem(typeof(ThemeViewStart), "/_ViewStart")
+        });
 
-        public void PopulateFeature(IEnumerable<ApplicationPart> parts, ViewsFeature feature)
+        feature.ViewDescriptors.Add(new CompiledViewDescriptor()
         {
-            feature.ViewDescriptors.Add(new CompiledViewDescriptor()
-            {
-                ExpirationTokens = Array.Empty<IChangeToken>(),
-                RelativePath = "/_ViewStart" + RazorViewEngine.ViewExtension,
-                Item = new TenantRazorCompiledItem(typeof(ThemeViewStart), "/_ViewStart")
-            });
-
-            feature.ViewDescriptors.Add(new CompiledViewDescriptor()
-            {
-                ExpirationTokens = Array.Empty<IChangeToken>(),
-                RelativePath = '/' + ThemeLayoutFileName,
-                Item = new TenantRazorCompiledItem(typeof(ThemeLayout), '/' + ThemeLayoutFileName)
-            });
-        }
+            ExpirationTokens = Array.Empty<IChangeToken>(),
+            RelativePath = '/' + ThemeLayoutFileName,
+            Item = new TenantRazorCompiledItem(typeof(ThemeLayout), '/' + ThemeLayoutFileName)
+        });
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Title/IPageTitleBuilder.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Title/IPageTitleBuilder.cs
index 821433e2ddb..9a5ac48b4d5 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Title/IPageTitleBuilder.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Title/IPageTitleBuilder.cs
@@ -1,44 +1,43 @@
 using Microsoft.AspNetCore.Html;
 
-namespace OrchardCore.DisplayManagement.Title
+namespace OrchardCore.DisplayManagement.Title;
+
+public interface IPageTitleBuilder
 {
-    public interface IPageTitleBuilder
-    {
-        /// <summary>
-        /// Sets a fixed title that will be used instead of any segmented titles added later.
-        /// Can be cleared with <see cref="Clear()"/>.
-        /// </summary>
-        void SetFixedTitle(IHtmlContent title);
+    /// <summary>
+    /// Sets a fixed title that will be used instead of any segmented titles added later.
+    /// Can be cleared with <see cref="Clear()"/>.
+    /// </summary>
+    void SetFixedTitle(IHtmlContent title);
 
-        /// <summary>
-        /// Clears the current list of segments.
-        /// </summary>
-        void Clear();
+    /// <summary>
+    /// Clears the current list of segments.
+    /// </summary>
+    void Clear();
 
-        /// <summary>
-        /// Adds a segment to the title.
-        /// </summary>
-        /// <param name="segment">A segments to add at the specific location in the title.</param>
-        /// <param name="position">The position, defaults to 0.</param>
-        void AddSegment(IHtmlContent segment, string position = "0");
+    /// <summary>
+    /// Adds a segment to the title.
+    /// </summary>
+    /// <param name="segment">A segments to add at the specific location in the title.</param>
+    /// <param name="position">The position, defaults to 0.</param>
+    void AddSegment(IHtmlContent segment, string position = "0");
 
-        /// <summary>
-        /// Concatenates every title segments using the separator defined in settings.
-        /// </summary>
-        /// <param name="separator">The html string that should separate all segments.</param>
-        /// <returns>A string representing the aggregate title for the current page.</returns>
-        IHtmlContent GenerateTitle(IHtmlContent separator);
-    }
+    /// <summary>
+    /// Concatenates every title segments using the separator defined in settings.
+    /// </summary>
+    /// <param name="separator">The html string that should separate all segments.</param>
+    /// <returns>A string representing the aggregate title for the current page.</returns>
+    IHtmlContent GenerateTitle(IHtmlContent separator);
+}
 
-    public static class PageTitleBuilderExtensions
+public static class PageTitleBuilderExtensions
+{
+    /// <summary>
+    /// Concatenates every title segments using the separator defined in settings.
+    /// </summary>
+    /// <returns>A string representing the aggregate title for the current page.</returns>
+    public static IHtmlContent GenerateTitle(this IPageTitleBuilder builder)
     {
-        /// <summary>
-        /// Concatenates every title segments using the separator defined in settings.
-        /// </summary>
-        /// <returns>A string representing the aggregate title for the current page.</returns>
-        public static IHtmlContent GenerateTitle(this IPageTitleBuilder builder)
-        {
-            return builder.GenerateTitle(null);
-        }
+        return builder.GenerateTitle(null);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Title/PageTitleBuilder.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Title/PageTitleBuilder.cs
index 4909ed2940f..35d34b721d5 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Title/PageTitleBuilder.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Title/PageTitleBuilder.cs
@@ -2,95 +2,94 @@
 using Microsoft.AspNetCore.Html;
 using OrchardCore.DisplayManagement.Zones;
 
-namespace OrchardCore.DisplayManagement.Title
+namespace OrchardCore.DisplayManagement.Title;
+
+public class PageTitleBuilder : IPageTitleBuilder
 {
-    public class PageTitleBuilder : IPageTitleBuilder
+    private readonly static HtmlString _defaultTitleSeparator = new(" - ");
+
+    private readonly List<PositionalTitlePart> _titleParts;
+    private HtmlContentBuilder _title;
+    private IHtmlContent _fixedTitle;
+
+    public PageTitleBuilder()
     {
-        private readonly static HtmlString _defaultTitleSeparator = new(" - ");
+        _titleParts = new List<PositionalTitlePart>(5);
+    }
 
-        private readonly List<PositionalTitlePart> _titleParts;
-        private HtmlContentBuilder _title;
-        private IHtmlContent _fixedTitle;
+    public void SetFixedTitle(IHtmlContent title)
+    {
+        _fixedTitle = title;
+    }
 
-        public PageTitleBuilder()
-        {
-            _titleParts = new List<PositionalTitlePart>(5);
-        }
+    public void AddSegment(IHtmlContent titlePart, string position)
+    {
+        _title = null;
 
-        public void SetFixedTitle(IHtmlContent title)
+        _titleParts.Add(new PositionalTitlePart
         {
-            _fixedTitle = title;
-        }
+            Value = titlePart,
+            Position = position
+        });
+    }
 
-        public void AddSegment(IHtmlContent titlePart, string position)
+    public void AddSegments(IEnumerable<IHtmlContent> titleParts, string position)
+    {
+        foreach (var titlePart in titleParts)
         {
-            _title = null;
-
-            _titleParts.Add(new PositionalTitlePart
-            {
-                Value = titlePart,
-                Position = position
-            });
+            AddSegment(titlePart, position);
         }
+    }
 
-        public void AddSegments(IEnumerable<IHtmlContent> titleParts, string position)
+    public IHtmlContent GenerateTitle(IHtmlContent separator)
+    {
+        if (_fixedTitle != null)
         {
-            foreach (var titlePart in titleParts)
-            {
-                AddSegment(titlePart, position);
-            }
+            return _fixedTitle;
         }
 
-        public IHtmlContent GenerateTitle(IHtmlContent separator)
+        if (_title is { Count: > 0 })
         {
-            if (_fixedTitle != null)
-            {
-                return _fixedTitle;
-            }
+            return _title;
+        }
 
-            if (_title is { Count: > 0 })
-            {
-                return _title;
-            }
+        separator ??= _defaultTitleSeparator;
 
-            separator ??= _defaultTitleSeparator;
+        _titleParts.Sort(FlatPositionComparer.Instance);
 
-            _titleParts.Sort(FlatPositionComparer.Instance);
+        if (_titleParts.Count == 0)
+        {
+            return HtmlString.Empty;
+        }
 
-            if (_titleParts.Count == 0)
-            {
-                return HtmlString.Empty;
-            }
+        // _titleParts.Count * 2 because we add a separator for each entry
+        var htmlContentBuilder = new HtmlContentBuilder(_titleParts.Count * 2);
 
-            // _titleParts.Count * 2 because we add a separator for each entry
-            var htmlContentBuilder = new HtmlContentBuilder(_titleParts.Count * 2);
+        for (var i = 0; i < _titleParts.Count; i++)
+        {
+            htmlContentBuilder.AppendHtml(_titleParts[i].Value);
 
-            for (var i = 0; i < _titleParts.Count; i++)
+            if (i < _titleParts.Count - 1)
             {
-                htmlContentBuilder.AppendHtml(_titleParts[i].Value);
-
-                if (i < _titleParts.Count - 1)
-                {
-                    htmlContentBuilder.AppendHtml(separator);
-                }
+                htmlContentBuilder.AppendHtml(separator);
             }
-
-            _title = htmlContentBuilder;
-
-            return _title;
         }
 
-        public void Clear()
-        {
-            _fixedTitle = null;
-            _title = null;
-            _titleParts.Clear();
-        }
+        _title = htmlContentBuilder;
+
+        return _title;
     }
 
-    internal sealed class PositionalTitlePart : IPositioned
+    public void Clear()
     {
-        public string Position { get; set; }
-        public IHtmlContent Value { get; set; }
+        _fixedTitle = null;
+        _title = null;
+        _titleParts.Clear();
     }
 }
+
+internal sealed class PositionalTitlePart : IPositioned
+{
+    public string Position { get; set; }
+    public IHtmlContent Value { get; set; }
+}
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/ViewContextAccessor.cs b/src/OrchardCore/OrchardCore.DisplayManagement/ViewContextAccessor.cs
index 2e6db103b31..5c24b0a2f6b 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/ViewContextAccessor.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/ViewContextAccessor.cs
@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.DisplayManagement
+namespace OrchardCore.DisplayManagement;
+
+public class ViewContextAccessor
 {
-    public class ViewContextAccessor
-    {
-        public ViewContext ViewContext { get; set; }
-    }
+    public ViewContext ViewContext { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/ViewModels/GroupViewModel.cs b/src/OrchardCore/OrchardCore.DisplayManagement/ViewModels/GroupViewModel.cs
index 5ebff55d89a..e5a04465bbf 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/ViewModels/GroupViewModel.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/ViewModels/GroupViewModel.cs
@@ -1,20 +1,19 @@
 using System.Linq;
 using OrchardCore.DisplayManagement.Shapes;
 
-namespace OrchardCore.DisplayManagement.ViewModels
+namespace OrchardCore.DisplayManagement.ViewModels;
+
+public class GroupViewModel : Shape
 {
-    public class GroupViewModel : Shape
-    {
-        public string Identifier { get; set; }
-    }
+    public string Identifier { get; set; }
+}
 
-    public class GroupingsViewModel : GroupViewModel
-    {
-        public IGrouping<string, object>[] Groupings { get; set; }
-    }
+public class GroupingsViewModel : GroupViewModel
+{
+    public IGrouping<string, object>[] Groupings { get; set; }
+}
 
-    public class GroupingViewModel : GroupViewModel
-    {
-        public IGrouping<string, object> Grouping { get; set; }
-    }
+public class GroupingViewModel : GroupViewModel
+{
+    public IGrouping<string, object> Grouping { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Views/CombinedResult.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Views/CombinedResult.cs
index 972438dc1e5..7545956b9e5 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Views/CombinedResult.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Views/CombinedResult.cs
@@ -2,41 +2,40 @@
 using System.Threading.Tasks;
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.DisplayManagement.Views
+namespace OrchardCore.DisplayManagement.Views;
+
+public class CombinedResult : IDisplayResult
 {
-    public class CombinedResult : IDisplayResult
-    {
-        private readonly IEnumerable<IDisplayResult> _results;
+    private readonly IEnumerable<IDisplayResult> _results;
 
-        public CombinedResult(params IDisplayResult[] results)
-        {
-            _results = results;
-        }
+    public CombinedResult(params IDisplayResult[] results)
+    {
+        _results = results;
+    }
 
-        public CombinedResult(IEnumerable<IDisplayResult> results)
-        {
-            _results = results;
-        }
+    public CombinedResult(IEnumerable<IDisplayResult> results)
+    {
+        _results = results;
+    }
 
-        public async Task ApplyAsync(BuildDisplayContext context)
+    public async Task ApplyAsync(BuildDisplayContext context)
+    {
+        foreach (var result in _results)
         {
-            foreach (var result in _results)
-            {
-                await result.ApplyAsync(context);
-            }
+            await result.ApplyAsync(context);
         }
+    }
 
-        public async Task ApplyAsync(BuildEditorContext context)
+    public async Task ApplyAsync(BuildEditorContext context)
+    {
+        foreach (var result in _results)
         {
-            foreach (var result in _results)
-            {
-                await result.ApplyAsync(context);
-            }
+            await result.ApplyAsync(context);
         }
+    }
 
-        public IEnumerable<IDisplayResult> GetResults()
-        {
-            return _results;
-        }
+    public IEnumerable<IDisplayResult> GetResults()
+    {
+        return _results;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Views/IDisplayResult.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Views/IDisplayResult.cs
index d3a6f50b205..267601b6771 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Views/IDisplayResult.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Views/IDisplayResult.cs
@@ -1,11 +1,10 @@
 using System.Threading.Tasks;
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.DisplayManagement.Views
+namespace OrchardCore.DisplayManagement.Views;
+
+public interface IDisplayResult
 {
-    public interface IDisplayResult
-    {
-        Task ApplyAsync(BuildDisplayContext context);
-        Task ApplyAsync(BuildEditorContext context);
-    }
+    Task ApplyAsync(BuildDisplayContext context);
+    Task ApplyAsync(BuildEditorContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Views/ShapeResult.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Views/ShapeResult.cs
index abd04a4d42e..5df669838c9 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Views/ShapeResult.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Views/ShapeResult.cs
@@ -8,285 +8,284 @@
 using OrchardCore.DisplayManagement.Zones;
 using OrchardCore.Environment.Cache;
 
-namespace OrchardCore.DisplayManagement.Views
+namespace OrchardCore.DisplayManagement.Views;
+
+public class ShapeResult : IDisplayResult
 {
-    public class ShapeResult : IDisplayResult
+    private string _defaultLocation;
+    private Dictionary<string, string> _otherLocations;
+    private string _name;
+    private string _differentiator;
+    private string _prefix;
+    private string _cacheId;
+    private readonly string _shapeType;
+    private readonly Func<IBuildShapeContext, ValueTask<IShape>> _shapeBuilder;
+    private readonly Func<IShape, Task> _processing;
+    private Action<CacheContext> _cache;
+    private string _groupId;
+    private Action<ShapeDisplayContext> _displaying;
+    private Func<Task<bool>> _renderPredicateAsync;
+
+    public ShapeResult(string shapeType, Func<IBuildShapeContext, ValueTask<IShape>> shapeBuilder)
+        : this(shapeType, shapeBuilder, null)
     {
-        private string _defaultLocation;
-        private Dictionary<string, string> _otherLocations;
-        private string _name;
-        private string _differentiator;
-        private string _prefix;
-        private string _cacheId;
-        private readonly string _shapeType;
-        private readonly Func<IBuildShapeContext, ValueTask<IShape>> _shapeBuilder;
-        private readonly Func<IShape, Task> _processing;
-        private Action<CacheContext> _cache;
-        private string _groupId;
-        private Action<ShapeDisplayContext> _displaying;
-        private Func<Task<bool>> _renderPredicateAsync;
-
-        public ShapeResult(string shapeType, Func<IBuildShapeContext, ValueTask<IShape>> shapeBuilder)
-            : this(shapeType, shapeBuilder, null)
-        {
-        }
+    }
 
-        public ShapeResult(string shapeType, Func<IBuildShapeContext, ValueTask<IShape>> shapeBuilder, Func<IShape, Task> processing)
-        {
-            // The shape type is necessary before the shape is created as it will drive the placement
-            // resolution which itself can prevent the shape from being created.
+    public ShapeResult(string shapeType, Func<IBuildShapeContext, ValueTask<IShape>> shapeBuilder, Func<IShape, Task> processing)
+    {
+        // The shape type is necessary before the shape is created as it will drive the placement
+        // resolution which itself can prevent the shape from being created.
 
-            _shapeType = shapeType;
-            _shapeBuilder = shapeBuilder;
-            _processing = processing;
-        }
+        _shapeType = shapeType;
+        _shapeBuilder = shapeBuilder;
+        _processing = processing;
+    }
 
-        public Task ApplyAsync(BuildDisplayContext context)
-        {
-            return ApplyImplementationAsync(context, context.DisplayType);
-        }
+    public Task ApplyAsync(BuildDisplayContext context)
+    {
+        return ApplyImplementationAsync(context, context.DisplayType);
+    }
 
-        public Task ApplyAsync(BuildEditorContext context)
+    public Task ApplyAsync(BuildEditorContext context)
+    {
+        return ApplyImplementationAsync(context, "Edit");
+    }
+
+    private async Task ApplyImplementationAsync(BuildShapeContext context, string displayType)
+    {
+        // If no location is set from the driver, use the one from the context.
+        if (string.IsNullOrEmpty(_defaultLocation))
         {
-            return ApplyImplementationAsync(context, "Edit");
+            _defaultLocation = context.DefaultZone;
         }
 
-        private async Task ApplyImplementationAsync(BuildShapeContext context, string displayType)
+        // Look into specific implementations of placements (like placement.json files and IShapePlacementProviders).
+        var placement = context.FindPlacement(_shapeType, _differentiator, displayType, context);
+
+        // Look for mapped display type locations.
+        if (_otherLocations != null)
         {
-            // If no location is set from the driver, use the one from the context.
-            if (string.IsNullOrEmpty(_defaultLocation))
+            string displayTypePlacement;
+            if (_otherLocations.TryGetValue(displayType, out displayTypePlacement))
             {
-                _defaultLocation = context.DefaultZone;
+                _defaultLocation = displayTypePlacement;
             }
+        }
 
-            // Look into specific implementations of placements (like placement.json files and IShapePlacementProviders).
-            var placement = context.FindPlacement(_shapeType, _differentiator, displayType, context);
+        // If no placement is found, use the default location.
+        placement ??= new PlacementInfo() { Location = _defaultLocation };
 
-            // Look for mapped display type locations.
-            if (_otherLocations != null)
-            {
-                string displayTypePlacement;
-                if (_otherLocations.TryGetValue(displayType, out displayTypePlacement))
-                {
-                    _defaultLocation = displayTypePlacement;
-                }
-            }
+        // If a placement was found without actual location, use the default.
+        // It can happen when just setting alternates or wrappers for instance.
+        placement.Location ??= _defaultLocation;
 
-            // If no placement is found, use the default location.
-            placement ??= new PlacementInfo() { Location = _defaultLocation };
+        placement.DefaultPosition ??= context.DefaultPosition;
 
-            // If a placement was found without actual location, use the default.
-            // It can happen when just setting alternates or wrappers for instance.
-            placement.Location ??= _defaultLocation;
+        // If there are no placement or it's explicitly noop then stop rendering execution.
+        if (string.IsNullOrEmpty(placement.Location) || placement.Location == "-")
+        {
+            return;
+        }
 
-            placement.DefaultPosition ??= context.DefaultPosition;
+        // Parse group placement.
+        _groupId = placement.GetGroup() ?? _groupId;
 
-            // If there are no placement or it's explicitly noop then stop rendering execution.
-            if (string.IsNullOrEmpty(placement.Location) || placement.Location == "-")
-            {
-                return;
-            }
+        // If the shape's group doesn't match the currently rendered one, return.
+        if (!string.Equals(context.GroupId ?? "", _groupId ?? "", StringComparison.OrdinalIgnoreCase))
+        {
+            return;
+        }
 
-            // Parse group placement.
-            _groupId = placement.GetGroup() ?? _groupId;
+        // If a condition has been applied to this result evaluate it only if the shape has been placed.
+        if (_renderPredicateAsync != null && !(await _renderPredicateAsync()))
+        {
+            return;
+        }
 
-            // If the shape's group doesn't match the currently rendered one, return.
-            if (!string.Equals(context.GroupId ?? "", _groupId ?? "", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
+        var newShape = Shape = await _shapeBuilder(context);
 
-            // If a condition has been applied to this result evaluate it only if the shape has been placed.
-            if (_renderPredicateAsync != null && !(await _renderPredicateAsync()))
-            {
-                return;
-            }
+        // Ignore it if the driver returned a null shape.
+        if (newShape == null)
+        {
+            return;
+        }
 
-            var newShape = Shape = await _shapeBuilder(context);
+        var newShapeMetadata = newShape.Metadata;
+        newShapeMetadata.Prefix = _prefix;
+        newShapeMetadata.Name = _name ?? _differentiator ?? _shapeType;
+        newShapeMetadata.Differentiator = _differentiator ?? _shapeType;
+        newShapeMetadata.DisplayType = displayType;
+        newShapeMetadata.PlacementSource = placement.Source;
+        newShapeMetadata.Tab = placement.GetTab();
+        newShapeMetadata.Card = placement.GetCard();
+        newShapeMetadata.Column = placement.GetColumn();
+        newShapeMetadata.Type = _shapeType;
+
+        if (_displaying != null)
+        {
+            newShapeMetadata.OnDisplaying(_displaying);
+        }
 
-            // Ignore it if the driver returned a null shape.
-            if (newShape == null)
-            {
-                return;
-            }
+        // The _processing callback is used to delay execution of costly initialization
+        // that can be prevented by caching.
+        if (_processing != null)
+        {
+            newShapeMetadata.OnProcessing(_processing);
+        }
 
-            var newShapeMetadata = newShape.Metadata;
-            newShapeMetadata.Prefix = _prefix;
-            newShapeMetadata.Name = _name ?? _differentiator ?? _shapeType;
-            newShapeMetadata.Differentiator = _differentiator ?? _shapeType;
-            newShapeMetadata.DisplayType = displayType;
-            newShapeMetadata.PlacementSource = placement.Source;
-            newShapeMetadata.Tab = placement.GetTab();
-            newShapeMetadata.Card = placement.GetCard();
-            newShapeMetadata.Column = placement.GetColumn();
-            newShapeMetadata.Type = _shapeType;
-
-            if (_displaying != null)
-            {
-                newShapeMetadata.OnDisplaying(_displaying);
-            }
+        // Apply cache settings
+        if (!string.IsNullOrEmpty(_cacheId) && _cache != null)
+        {
+            _cache(newShapeMetadata.Cache(_cacheId));
+        }
 
-            // The _processing callback is used to delay execution of costly initialization
-            // that can be prevented by caching.
-            if (_processing != null)
-            {
-                newShapeMetadata.OnProcessing(_processing);
-            }
+        // If a specific shape is provided, remove all previous alternates and wrappers.
+        if (!string.IsNullOrEmpty(placement.ShapeType))
+        {
+            newShapeMetadata.Type = placement.ShapeType;
+            newShapeMetadata.Alternates.Clear();
+            newShapeMetadata.Wrappers.Clear();
+        }
 
-            // Apply cache settings
-            if (!string.IsNullOrEmpty(_cacheId) && _cache != null)
+        if (placement != null)
+        {
+            if (placement.Alternates != null)
             {
-                _cache(newShapeMetadata.Cache(_cacheId));
+                newShapeMetadata.Alternates.AddRange(placement.Alternates);
             }
 
-            // If a specific shape is provided, remove all previous alternates and wrappers.
-            if (!string.IsNullOrEmpty(placement.ShapeType))
+            if (placement.Wrappers != null)
             {
-                newShapeMetadata.Type = placement.ShapeType;
-                newShapeMetadata.Alternates.Clear();
-                newShapeMetadata.Wrappers.Clear();
+                newShapeMetadata.Wrappers.AddRange(placement.Wrappers);
             }
+        }
 
-            if (placement != null)
-            {
-                if (placement.Alternates != null)
-                {
-                    newShapeMetadata.Alternates.AddRange(placement.Alternates);
-                }
-
-                if (placement.Wrappers != null)
-                {
-                    newShapeMetadata.Wrappers.AddRange(placement.Wrappers);
-                }
-            }
+        var parentShape = context.Shape;
+
+        if (placement.IsLayoutZone())
+        {
+            parentShape = context.Layout;
+        }
 
-            var parentShape = context.Shape;
+        var position = placement.GetPosition();
+        var zones = placement.GetZones();
 
-            if (placement.IsLayoutZone())
+        foreach (var zone in zones)
+        {
+            if (parentShape == null)
             {
-                parentShape = context.Layout;
+                break;
             }
 
-            var position = placement.GetPosition();
-            var zones = placement.GetZones();
-
-            foreach (var zone in zones)
+            if (parentShape is IZoneHolding layout)
             {
-                if (parentShape == null)
-                {
-                    break;
-                }
-
-                if (parentShape is IZoneHolding layout)
-                {
-                    // parentShape is a ZoneHolding.
-                    parentShape = layout.Zones[zone];
-                }
-                else
-                {
-                    // try to access it as a member.
-                    parentShape = parentShape.GetProperty<IShape>(zone);
-                }
+                // parentShape is a ZoneHolding.
+                parentShape = layout.Zones[zone];
             }
-
-            position = !string.IsNullOrEmpty(position) ? position : null;
-
-            if (parentShape is Shape shape)
+            else
             {
-                await shape.AddAsync(newShape, position);
+                // try to access it as a member.
+                parentShape = parentShape.GetProperty<IShape>(zone);
             }
         }
 
-        /// <summary>
-        /// Sets the prefix of the form elements rendered in the shape.
-        /// </summary>
-        /// <remarks>
-        /// The goal is to isolate each shape when edited together.
-        /// </remarks>
-        public ShapeResult Prefix(string prefix)
-        {
-            _prefix = prefix;
-            return this;
-        }
+        position = !string.IsNullOrEmpty(position) ? position : null;
 
-        /// <summary>
-        /// Sets the default location of the shape when no specific placement applies.
-        /// </summary>
-        public ShapeResult Location(string location)
+        if (parentShape is Shape shape)
         {
-            _defaultLocation = location;
-            return this;
+            await shape.AddAsync(newShape, position);
         }
+    }
 
-        /// <summary>
-        /// Sets the location to use for a matching display type.
-        /// </summary>
-        public ShapeResult Location(string displayType, string location)
-        {
-            _otherLocations ??= new Dictionary<string, string>(2);
-            _otherLocations[displayType] = location;
-            return this;
-        }
+    /// <summary>
+    /// Sets the prefix of the form elements rendered in the shape.
+    /// </summary>
+    /// <remarks>
+    /// The goal is to isolate each shape when edited together.
+    /// </remarks>
+    public ShapeResult Prefix(string prefix)
+    {
+        _prefix = prefix;
+        return this;
+    }
 
-        /// <summary>
-        /// Sets the location to use for a matching display type.
-        /// </summary>
-        public ShapeResult Displaying(Action<ShapeDisplayContext> displaying)
-        {
-            _displaying = displaying;
+    /// <summary>
+    /// Sets the default location of the shape when no specific placement applies.
+    /// </summary>
+    public ShapeResult Location(string location)
+    {
+        _defaultLocation = location;
+        return this;
+    }
 
-            return this;
-        }
+    /// <summary>
+    /// Sets the location to use for a matching display type.
+    /// </summary>
+    public ShapeResult Location(string displayType, string location)
+    {
+        _otherLocations ??= new Dictionary<string, string>(2);
+        _otherLocations[displayType] = location;
+        return this;
+    }
 
-        /// <summary>
-        /// Sets the shape name regardless its 'Differentiator'.
-        /// </summary>
-        public ShapeResult Name(string name)
-        {
-            _name = name;
-            return this;
-        }
+    /// <summary>
+    /// Sets the location to use for a matching display type.
+    /// </summary>
+    public ShapeResult Displaying(Action<ShapeDisplayContext> displaying)
+    {
+        _displaying = displaying;
 
-        /// <summary>
-        /// Sets a discriminator that is used to find the location of the shape when two shapes of the same type are displayed.
-        /// </summary>
-        public ShapeResult Differentiator(string differentiator)
-        {
-            _differentiator = differentiator;
-            return this;
-        }
+        return this;
+    }
 
-        /// <summary>
-        /// Sets the group identifier the shape will be rendered in.
-        /// </summary>
-        /// <param name="groupId"></param>
-        /// <returns></returns>
-        public ShapeResult OnGroup(string groupId)
-        {
-            _groupId = groupId;
-            return this;
-        }
+    /// <summary>
+    /// Sets the shape name regardless its 'Differentiator'.
+    /// </summary>
+    public ShapeResult Name(string name)
+    {
+        _name = name;
+        return this;
+    }
 
-        /// <summary>
-        /// Sets the caching properties of the shape to render.
-        /// </summary>
-        public ShapeResult Cache(string cacheId, Action<CacheContext> cache = null)
-        {
-            _cacheId = cacheId;
-            _cache = cache;
-            return this;
-        }
+    /// <summary>
+    /// Sets a discriminator that is used to find the location of the shape when two shapes of the same type are displayed.
+    /// </summary>
+    public ShapeResult Differentiator(string differentiator)
+    {
+        _differentiator = differentiator;
+        return this;
+    }
 
-        /// <summary>
-        /// Sets a condition that must return true for the shape to render.
-        /// The condition is only evaluated if the shape has been placed.
-        /// </summary>
-        public ShapeResult RenderWhen(Func<Task<bool>> renderPredicateAsync)
-        {
-            _renderPredicateAsync = renderPredicateAsync;
-            return this;
-        }
+    /// <summary>
+    /// Sets the group identifier the shape will be rendered in.
+    /// </summary>
+    /// <param name="groupId"></param>
+    /// <returns></returns>
+    public ShapeResult OnGroup(string groupId)
+    {
+        _groupId = groupId;
+        return this;
+    }
 
-        public IShape Shape { get; private set; }
+    /// <summary>
+    /// Sets the caching properties of the shape to render.
+    /// </summary>
+    public ShapeResult Cache(string cacheId, Action<CacheContext> cache = null)
+    {
+        _cacheId = cacheId;
+        _cache = cache;
+        return this;
     }
+
+    /// <summary>
+    /// Sets a condition that must return true for the shape to render.
+    /// The condition is only evaluated if the shape has been placed.
+    /// </summary>
+    public ShapeResult RenderWhen(Func<Task<bool>> renderPredicateAsync)
+    {
+        _renderPredicateAsync = renderPredicateAsync;
+        return this;
+    }
+
+    public IShape Shape { get; private set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Views/ShapeViewModel.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Views/ShapeViewModel.cs
index a94def0de3e..d64d0ddcdb7 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Views/ShapeViewModel.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Views/ShapeViewModel.cs
@@ -5,88 +5,87 @@
 using OrchardCore.DisplayManagement.Shapes;
 using OrchardCore.DisplayManagement.Zones;
 
-namespace OrchardCore.DisplayManagement.Views
+namespace OrchardCore.DisplayManagement.Views;
+
+public class ShapeViewModel : IShape, IPositioned
 {
-    public class ShapeViewModel : IShape, IPositioned
+    public ShapeViewModel()
     {
-        public ShapeViewModel()
-        {
-        }
+    }
 
-        public ShapeViewModel(string shapeType)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(shapeType);
+    public ShapeViewModel(string shapeType)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(shapeType);
 
-            Metadata.Type = shapeType;
-        }
+        Metadata.Type = shapeType;
+    }
 
-        private ShapeMetadata _metadata;
+    private ShapeMetadata _metadata;
 
-        public ShapeMetadata Metadata => _metadata ??= new ShapeMetadata();
+    public ShapeMetadata Metadata => _metadata ??= new ShapeMetadata();
 
-        public string Position
+    public string Position
+    {
+        get => Metadata.Position;
+        set
         {
-            get => Metadata.Position;
-            set
-            {
-                Metadata.Position = value;
-            }
+            Metadata.Position = value;
         }
+    }
 
-        public string Id { get; set; }
+    public string Id { get; set; }
 
-        public string TagName { get; set; }
+    public string TagName { get; set; }
 
-        private List<string> _classes;
+    private List<string> _classes;
 
-        public IList<string> Classes => _classes ??= [];
+    public IList<string> Classes => _classes ??= [];
 
-        private Dictionary<string, string> _attributes;
+    private Dictionary<string, string> _attributes;
 
-        public IDictionary<string, string> Attributes => _attributes ??= [];
+    public IDictionary<string, string> Attributes => _attributes ??= [];
 
-        private Dictionary<string, object> _properties;
+    private Dictionary<string, object> _properties;
 
-        public IDictionary<string, object> Properties => _properties ??= [];
+    public IDictionary<string, object> Properties => _properties ??= [];
 
-        private bool _sorted;
+    private bool _sorted;
 
-        private List<IPositioned> _items;
+    private List<IPositioned> _items;
 
-        public IReadOnlyList<IPositioned> Items
+    public IReadOnlyList<IPositioned> Items
+    {
+        get
         {
-            get
-            {
-                _items ??= [];
-
-                if (!_sorted)
-                {
-                    _items = _items.OrderBy(x => x, FlatPositionComparer.Instance).ToList();
-                    _sorted = true;
-                }
+            _items ??= [];
 
-                return _items;
+            if (!_sorted)
+            {
+                _items = _items.OrderBy(x => x, FlatPositionComparer.Instance).ToList();
+                _sorted = true;
             }
+
+            return _items;
         }
+    }
 
-        public ValueTask<IShape> AddAsync(object item, string position)
+    public ValueTask<IShape> AddAsync(object item, string position)
+    {
+        if (item == null)
         {
-            if (item == null)
-            {
-                return new ValueTask<IShape>(this);
-            }
-
-            position ??= string.Empty;
-            _sorted = false;
-            _items ??= [];
+            return new ValueTask<IShape>(this);
+        }
 
-            var wrapped = PositionWrapper.TryWrap(item, position);
-            if (wrapped is not null)
-            {
-                _items.Add(wrapped);
-            }
+        position ??= string.Empty;
+        _sorted = false;
+        _items ??= [];
 
-            return new ValueTask<IShape>(this);
+        var wrapped = PositionWrapper.TryWrap(item, position);
+        if (wrapped is not null)
+        {
+            _items.Add(wrapped);
         }
+
+        return new ValueTask<IShape>(this);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Views/ShapeViewModelOfT.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Views/ShapeViewModelOfT.cs
index 0ba3fbb215f..9eb2526a033 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Views/ShapeViewModelOfT.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Views/ShapeViewModelOfT.cs
@@ -1,18 +1,17 @@
-namespace OrchardCore.DisplayManagement.Views
+namespace OrchardCore.DisplayManagement.Views;
+
+public class ShapeViewModel<T> : ShapeViewModel
 {
-    public class ShapeViewModel<T> : ShapeViewModel
+    public ShapeViewModel(T value)
+        : this(typeof(T).Name, value)
     {
-        public ShapeViewModel(T value)
-            : this(typeof(T).Name, value)
-        {
-        }
-
-        public ShapeViewModel(string shapeType, T value)
-            : base(shapeType)
-        {
-            Value = value;
-        }
+    }
 
-        public T Value { get; }
+    public ShapeViewModel(string shapeType, T value)
+        : base(shapeType)
+    {
+        Value = value;
     }
+
+    public T Value { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Zones/FlatPositionComparer.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Zones/FlatPositionComparer.cs
index 0db7fe032a6..68ee5187e15 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Zones/FlatPositionComparer.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Zones/FlatPositionComparer.cs
@@ -1,105 +1,104 @@
 using System;
 using System.Collections.Generic;
 
-namespace OrchardCore.DisplayManagement.Zones
+namespace OrchardCore.DisplayManagement.Zones;
+
+public class FlatPositionComparer : IComparer<IPositioned>, IComparer<string>
 {
-    public class FlatPositionComparer : IComparer<IPositioned>, IComparer<string>
+    public static FlatPositionComparer Instance { get; private set; }
+
+    static FlatPositionComparer()
     {
-        public static FlatPositionComparer Instance { get; private set; }
+        Instance = new FlatPositionComparer();
+    }
 
-        static FlatPositionComparer()
-        {
-            Instance = new FlatPositionComparer();
-        }
+    private FlatPositionComparer()
+    {
+    }
 
-        private FlatPositionComparer()
+    public int Compare(IPositioned a, IPositioned b)
+    {
+        var x = a.Position;
+        var y = b.Position;
+
+        return Compare(x, y);
+    }
+
+    public int Compare(string x, string y)
+    {
+        if (x == y)
         {
+            return 0;
         }
 
-        public int Compare(IPositioned a, IPositioned b)
+        // null == "before"; "" == "0"
+        x = x == null
+            ? "before." // in order to have before < null when 'before' is explicitly defined
+            : x.Trim().Length == 0 ? "0" : x.Trim(':').TrimEnd('.'); // ':' is _sometimes_ used as a partition identifier
+        y = y == null
+            ? "before."
+            : y.Trim().Length == 0 ? "0" : y.Trim(':').TrimEnd('.');
+
+        var xParts = x.Split(['.', ':']);
+        var yParts = y.Split(['.', ':']);
+        for (var i = 0; i < xParts.Length; i++)
         {
-            var x = a.Position;
-            var y = b.Position;
+            // x is further defined meaning it comes after y (e.g. x == 1.2.3 and y == 1.2)
+            if (yParts.Length < i + 1)
+            {
+                return 1;
+            }
 
-            return Compare(x, y);
-        }
+            int xPos, yPos;
+            var xPart = string.IsNullOrEmpty(xParts[i]) ? "before" : NormalizeKnownPartitions(xParts[i]);
+            var yPart = string.IsNullOrEmpty(yParts[i]) ? "before" : NormalizeKnownPartitions(yParts[i]);
 
-        public int Compare(string x, string y)
-        {
-            if (x == y)
+            var xIsInt = int.TryParse(xPart, out xPos);
+            var yIsInt = int.TryParse(yPart, out yPos);
+
+            if (!xIsInt && !yIsInt)
             {
-                return 0;
+                return string.Compare(string.Join(".", xParts), string.Join(".", yParts), StringComparison.OrdinalIgnoreCase);
             }
 
-            // null == "before"; "" == "0"
-            x = x == null
-                ? "before." // in order to have before < null when 'before' is explicitly defined
-                : x.Trim().Length == 0 ? "0" : x.Trim(':').TrimEnd('.'); // ':' is _sometimes_ used as a partition identifier
-            y = y == null
-                ? "before."
-                : y.Trim().Length == 0 ? "0" : y.Trim(':').TrimEnd('.');
-
-            var xParts = x.Split(['.', ':']);
-            var yParts = y.Split(['.', ':']);
-            for (var i = 0; i < xParts.Length; i++)
+            // Non-int after int or greater x pos than y pos (which is an int)
+            if (!xIsInt || (yIsInt && xPos > yPos))
             {
-                // x is further defined meaning it comes after y (e.g. x == 1.2.3 and y == 1.2)
-                if (yParts.Length < i + 1)
-                {
-                    return 1;
-                }
-
-                int xPos, yPos;
-                var xPart = string.IsNullOrEmpty(xParts[i]) ? "before" : NormalizeKnownPartitions(xParts[i]);
-                var yPart = string.IsNullOrEmpty(yParts[i]) ? "before" : NormalizeKnownPartitions(yParts[i]);
-
-                var xIsInt = int.TryParse(xPart, out xPos);
-                var yIsInt = int.TryParse(yPart, out yPos);
-
-                if (!xIsInt && !yIsInt)
-                {
-                    return string.Compare(string.Join(".", xParts), string.Join(".", yParts), StringComparison.OrdinalIgnoreCase);
-                }
-
-                // Non-int after int or greater x pos than y pos (which is an int)
-                if (!xIsInt || (yIsInt && xPos > yPos))
-                {
-                    return 1;
-                }
-
-                if (!yIsInt || xPos < yPos)
-                {
-                    return -1;
-                }
+                return 1;
             }
 
-            // All things being equal y might be further defined than x (e.g. x == 1.2 and y == 1.2.3)
-            if (xParts.Length < yParts.Length)
+            if (!yIsInt || xPos < yPos)
             {
                 return -1;
             }
-
-            return 0;
         }
 
-        private static string NormalizeKnownPartitions(string partition)
+        // All things being equal y might be further defined than x (e.g. x == 1.2 and y == 1.2.3)
+        if (xParts.Length < yParts.Length)
         {
-            if (partition.Length < 5) // known partitions are long
-            {
-                return partition;
-            }
-
-            if (string.Equals(partition, "before", StringComparison.OrdinalIgnoreCase))
-            {
-                return "-9999";
-            }
+            return -1;
+        }
 
-            if (string.Equals(partition, "after", StringComparison.OrdinalIgnoreCase))
-            {
-                return "9999";
-            }
+        return 0;
+    }
 
+    private static string NormalizeKnownPartitions(string partition)
+    {
+        if (partition.Length < 5) // known partitions are long
+        {
             return partition;
         }
+
+        if (string.Equals(partition, "before", StringComparison.OrdinalIgnoreCase))
+        {
+            return "-9999";
+        }
+
+        if (string.Equals(partition, "after", StringComparison.OrdinalIgnoreCase))
+        {
+            return "9999";
+        }
+
+        return partition;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Zones/ZoneOnDemand.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Zones/ZoneOnDemand.cs
index 1a4c433f710..d63b8cc1063 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Zones/ZoneOnDemand.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Zones/ZoneOnDemand.cs
@@ -2,132 +2,131 @@
 using System.Threading.Tasks;
 using OrchardCore.DisplayManagement.Shapes;
 
-namespace OrchardCore.DisplayManagement.Zones
+namespace OrchardCore.DisplayManagement.Zones;
+
+/// <remarks>
+/// InterfaceProxyBehavior().
+/// NilBehavior() => return Nil on GetMember and GetIndex in all cases.
+/// ZoneOnDemandBehavior(_zoneFactory, _parent, name) => when a zone (Shape) is
+/// created, replace itself with the zone so that Layout.ZoneName is no more equal to Nil.
+/// </remarks>
+public class ZoneOnDemand : Shape
 {
-    /// <remarks>
-    /// InterfaceProxyBehavior().
-    /// NilBehavior() => return Nil on GetMember and GetIndex in all cases.
-    /// ZoneOnDemandBehavior(_zoneFactory, _parent, name) => when a zone (Shape) is
-    /// created, replace itself with the zone so that Layout.ZoneName is no more equal to Nil.
-    /// </remarks>
-    public class ZoneOnDemand : Shape
+    private readonly Func<ValueTask<IShape>> _zoneFactory;
+    private readonly ZoneHolding _parent;
+    private readonly string _potentialZoneName;
+    private IShape _zone;
+
+    public ZoneOnDemand(Func<ValueTask<IShape>> zoneFactory, ZoneHolding parent, string potentialZoneName)
     {
-        private readonly Func<ValueTask<IShape>> _zoneFactory;
-        private readonly ZoneHolding _parent;
-        private readonly string _potentialZoneName;
-        private IShape _zone;
+        _zoneFactory = zoneFactory;
+        _parent = parent;
+        _potentialZoneName = potentialZoneName;
+    }
 
-        public ZoneOnDemand(Func<ValueTask<IShape>> zoneFactory, ZoneHolding parent, string potentialZoneName)
-        {
-            _zoneFactory = zoneFactory;
-            _parent = parent;
-            _potentialZoneName = potentialZoneName;
-        }
+    public override bool TryGetMember(System.Dynamic.GetMemberBinder binder, out object result)
+    {
+        // NilBehavior.
+        result = Nil.Instance;
+        return true;
+    }
 
-        public override bool TryGetMember(System.Dynamic.GetMemberBinder binder, out object result)
-        {
-            // NilBehavior.
-            result = Nil.Instance;
-            return true;
-        }
+    public override bool TryGetIndex(System.Dynamic.GetIndexBinder binder, object[] indexes, out object result)
+    {
+        // NilBehavior.
+        result = Nil.Instance;
+        return true;
+    }
 
-        public override bool TryGetIndex(System.Dynamic.GetIndexBinder binder, object[] indexes, out object result)
+    public override bool TryInvokeMember(System.Dynamic.InvokeMemberBinder binder, object[] args, out object result)
+    {
+        var name = binder.Name;
+
+        // NilBehavior.
+        if (args.Length == 0 && name != "ToString")
         {
-            // NilBehavior.
             result = Nil.Instance;
             return true;
         }
 
-        public override bool TryInvokeMember(System.Dynamic.InvokeMemberBinder binder, object[] args, out object result)
-        {
-            var name = binder.Name;
-
-            // NilBehavior.
-            if (args.Length == 0 && name != "ToString")
-            {
-                result = Nil.Instance;
-                return true;
-            }
+        return base.TryInvokeMember(binder, args, out result);
+    }
 
-            return base.TryInvokeMember(binder, args, out result);
-        }
+    public override string ToString()
+    {
+        return string.Empty;
+    }
 
-        public override string ToString()
+    public override bool TryConvert(System.Dynamic.ConvertBinder binder, out object result)
+    {
+        if (binder.ReturnType == typeof(string))
         {
-            return string.Empty;
+            result = null;
         }
-
-        public override bool TryConvert(System.Dynamic.ConvertBinder binder, out object result)
+        else if (binder.ReturnType.IsValueType)
         {
-            if (binder.ReturnType == typeof(string))
-            {
-                result = null;
-            }
-            else if (binder.ReturnType.IsValueType)
-            {
-                result = Activator.CreateInstance(binder.ReturnType);
-            }
-            else
-            {
-                result = null;
-            }
-
-            return true;
+            result = Activator.CreateInstance(binder.ReturnType);
         }
-
-        public static bool operator ==(ZoneOnDemand _, object b)
+        else
         {
-            // If ZoneOnDemand is compared to null it must return true.
-            return b == null || ReferenceEquals(b, Nil.Instance);
+            result = null;
         }
 
-        public static bool operator !=(ZoneOnDemand a, object b)
-        {
-            // If ZoneOnDemand is compared to null it must return true.
-            return !(a == b);
-        }
+        return true;
+    }
 
-        public override bool Equals(object obj)
-        {
-            if (obj is null)
-            {
-                return true;
-            }
+    public static bool operator ==(ZoneOnDemand _, object b)
+    {
+        // If ZoneOnDemand is compared to null it must return true.
+        return b == null || ReferenceEquals(b, Nil.Instance);
+    }
 
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
+    public static bool operator !=(ZoneOnDemand a, object b)
+    {
+        // If ZoneOnDemand is compared to null it must return true.
+        return !(a == b);
+    }
 
-            return false;
+    public override bool Equals(object obj)
+    {
+        if (obj is null)
+        {
+            return true;
         }
 
-        public override int GetHashCode()
+        if (ReferenceEquals(this, obj))
         {
-            return HashCode.Combine(_parent, _potentialZoneName);
+            return true;
         }
 
-        public override async ValueTask<IShape> AddAsync(object item, string position)
-        {
-            if (item == null)
-            {
-                if (_zone != null)
-                {
-                    return _zone;
-                }
+        return false;
+    }
 
-                return this;
-            }
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(_parent, _potentialZoneName);
+    }
 
-            if (_zone == null)
+    public override async ValueTask<IShape> AddAsync(object item, string position)
+    {
+        if (item == null)
+        {
+            if (_zone != null)
             {
-                _zone = await _zoneFactory();
-                _zone.Properties["Parent"] = _parent;
-                _zone.Properties["ZoneName"] = _potentialZoneName;
-                _parent.Properties[_potentialZoneName] = _zone;
+                return _zone;
             }
 
-            return _zone = await _zone.AddAsync(item, position);
+            return this;
         }
+
+        if (_zone == null)
+        {
+            _zone = await _zoneFactory();
+            _zone.Properties["Parent"] = _parent;
+            _zone.Properties["ZoneName"] = _potentialZoneName;
+            _parent.Properties[_potentialZoneName] = _zone;
+        }
+
+        return _zone = await _zone.AddAsync(item, position);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Zones/ZoneShapes.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Zones/ZoneShapes.cs
index c56a80ed73f..c52724de95b 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Zones/ZoneShapes.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Zones/ZoneShapes.cs
@@ -8,21 +8,48 @@
 using OrchardCore.Modules;
 using OrchardCore.Mvc.Utilities;
 
-namespace OrchardCore.DisplayManagement.Zones
+namespace OrchardCore.DisplayManagement.Zones;
+
+[Feature(Application.DefaultFeatureId)]
+public class ZoneShapes : IShapeAttributeProvider
 {
-    [Feature(Application.DefaultFeatureId)]
-    public class ZoneShapes : IShapeAttributeProvider
+    // By convention all placement delimiters default to the name 'Content' when not specified during placement.
+    private const string ContentKey = "Content";
+
+    [Shape]
+#pragma warning disable CA1822 // Mark members as static
+    public async Task<IHtmlContent> Zone(IDisplayHelper DisplayAsync, IEnumerable<object> Shape)
+#pragma warning restore CA1822 // Mark members as static
     {
-        // By convention all placement delimiters default to the name 'Content' when not specified during placement.
-        private const string ContentKey = "Content";
+        var htmlContentBuilder = new HtmlContentBuilder();
+        foreach (var item in Shape)
+        {
+            htmlContentBuilder.AppendHtml(await DisplayAsync.ShapeExecuteAsync((IShape)item));
+        }
 
-        [Shape]
+        return htmlContentBuilder;
+    }
+
+    [Shape]
 #pragma warning disable CA1822 // Mark members as static
-        public async Task<IHtmlContent> Zone(IDisplayHelper DisplayAsync, IEnumerable<object> Shape)
+    public async Task<IHtmlContent> ContentZone(IDisplayHelper DisplayAsync, dynamic Shape, IShapeFactory ShapeFactory)
 #pragma warning restore CA1822 // Mark members as static
+    {
+        var htmlContentBuilder = new HtmlContentBuilder();
+
+        // This maybe a collection of IShape, IHtmlContent, or plain object.
+        var shapes = ((IEnumerable<object>)Shape);
+
+        // Evaluate shapes for grouping metadata, when it is not an IShape it cannot be grouped.
+        var isGrouped = shapes.Any(x => x is IShape s &&
+            (!string.IsNullOrEmpty(s.Metadata.Tab) ||
+            !string.IsNullOrEmpty(s.Metadata.Card) ||
+            !string.IsNullOrEmpty(s.Metadata.Column)));
+
+        // When there is no grouping metadata on any shapes just render the Zone.
+        if (!isGrouped)
         {
-            var htmlContentBuilder = new HtmlContentBuilder();
-            foreach (var item in Shape)
+            foreach (var item in shapes)
             {
                 htmlContentBuilder.AppendHtml(await DisplayAsync.ShapeExecuteAsync((IShape)item));
             }
@@ -30,431 +57,403 @@ public async Task<IHtmlContent> Zone(IDisplayHelper DisplayAsync, IEnumerable<ob
             return htmlContentBuilder;
         }
 
-        [Shape]
-#pragma warning disable CA1822 // Mark members as static
-        public async Task<IHtmlContent> ContentZone(IDisplayHelper DisplayAsync, dynamic Shape, IShapeFactory ShapeFactory)
-#pragma warning restore CA1822 // Mark members as static
-        {
-            var htmlContentBuilder = new HtmlContentBuilder();
+        string identifier = Shape.Identifier ?? string.Empty;
 
-            // This maybe a collection of IShape, IHtmlContent, or plain object.
-            var shapes = ((IEnumerable<object>)Shape);
-
-            // Evaluate shapes for grouping metadata, when it is not an IShape it cannot be grouped.
-            var isGrouped = shapes.Any(x => x is IShape s &&
-                (!string.IsNullOrEmpty(s.Metadata.Tab) ||
-                !string.IsNullOrEmpty(s.Metadata.Card) ||
-                !string.IsNullOrEmpty(s.Metadata.Column)));
-
-            // When there is no grouping metadata on any shapes just render the Zone.
-            if (!isGrouped)
+        var groupings = shapes.ToLookup(x =>
+        {
+            if (x is IShape s)
             {
-                foreach (var item in shapes)
+                var key = s.Metadata.Tab;
+                if (string.IsNullOrEmpty(key))
                 {
-                    htmlContentBuilder.AppendHtml(await DisplayAsync.ShapeExecuteAsync((IShape)item));
+                    return ContentKey;
                 }
 
-                return htmlContentBuilder;
+                // Remove any positioning modifier.
+                var modifierIndex = key.IndexOf(';');
+                if (modifierIndex != -1)
+                {
+                    key = key[..modifierIndex];
+                }
+
+                return key;
             }
 
-            string identifier = Shape.Identifier ?? string.Empty;
+            return ContentKey;
+        });
 
-            var groupings = shapes.ToLookup(x =>
+        // Process Tabs first, then Cards, then Columns.
+        if (groupings.Count > 1)
+        {
+            var orderedGroupings = groupings.OrderBy(grouping =>
             {
-                if (x is IShape s)
+                var firstGroupWithModifier = grouping.FirstOrDefault(group =>
                 {
-                    var key = s.Metadata.Tab;
-                    if (string.IsNullOrEmpty(key))
+                    if (group is IShape s && !string.IsNullOrEmpty(s.Metadata.Tab) && s.Metadata.Tab.Contains(';'))
                     {
-                        return ContentKey;
+                        return true;
                     }
 
-                    // Remove any positioning modifier.
+                    return false;
+                });
+
+                if (firstGroupWithModifier is IShape shape)
+                {
+                    var key = shape.Metadata.Tab;
                     var modifierIndex = key.IndexOf(';');
-                    if (modifierIndex != -1)
-                    {
-                        key = key[..modifierIndex];
-                    }
 
-                    return key;
+                    return new PositionalGrouping(key[modifierIndex..]);
                 }
 
-                return ContentKey;
-            });
+                return new PositionalGrouping(null);
+            }, FlatPositionComparer.Instance).ToArray();
 
-            // Process Tabs first, then Cards, then Columns.
-            if (groupings.Count > 1)
+            var container = (GroupingsViewModel)await ShapeFactory.CreateAsync<GroupingsViewModel>("TabContainer", m =>
             {
-                var orderedGroupings = groupings.OrderBy(grouping =>
-                {
-                    var firstGroupWithModifier = grouping.FirstOrDefault(group =>
-                    {
-                        if (group is IShape s && !string.IsNullOrEmpty(s.Metadata.Tab) && s.Metadata.Tab.Contains(';'))
-                        {
-                            return true;
-                        }
-
-                        return false;
-                    });
-
-                    if (firstGroupWithModifier is IShape shape)
-                    {
-                        var key = shape.Metadata.Tab;
-                        var modifierIndex = key.IndexOf(';');
-
-                        return new PositionalGrouping(key[modifierIndex..]);
-                    }
+                m.Identifier = identifier;
+                m.Groupings = orderedGroupings;
+            });
 
-                    return new PositionalGrouping(null);
-                }, FlatPositionComparer.Instance).ToArray();
+            container.Classes.Add("accordion");
 
-                var container = (GroupingsViewModel)await ShapeFactory.CreateAsync<GroupingsViewModel>("TabContainer", m =>
+            foreach (var orderedGrouping in orderedGroupings)
+            {
+                var groupingShape = (GroupingViewModel)await ShapeFactory.CreateAsync<GroupingViewModel>("Tab", m =>
                 {
                     m.Identifier = identifier;
-                    m.Groupings = orderedGroupings;
+                    m.Grouping = orderedGrouping;
                 });
 
-                container.Classes.Add("accordion");
-
-                foreach (var orderedGrouping in orderedGroupings)
+                foreach (var item in orderedGrouping)
                 {
-                    var groupingShape = (GroupingViewModel)await ShapeFactory.CreateAsync<GroupingViewModel>("Tab", m =>
-                    {
-                        m.Identifier = identifier;
-                        m.Grouping = orderedGrouping;
-                    });
-
-                    foreach (var item in orderedGrouping)
-                    {
-                        await groupingShape.AddAsync(item);
-                    }
-
-                    await container.AddAsync(groupingShape);
+                    await groupingShape.AddAsync(item);
                 }
 
-                htmlContentBuilder.AppendHtml(await DisplayAsync.ShapeExecuteAsync(container));
+                await container.AddAsync(groupingShape);
             }
-            else if (groupings.Count == 1)
-            {
-                // Evaluate for cards.
-                var cardGrouping = (GroupingViewModel)await ShapeFactory.CreateAsync<GroupingViewModel>("CardGrouping", m =>
-                {
-                    m.Identifier = identifier;
-                    m.Grouping = groupings.ElementAt(0);
-                });
 
-                htmlContentBuilder.AppendHtml(await DisplayAsync.ShapeExecuteAsync(cardGrouping));
-            }
+            htmlContentBuilder.AppendHtml(await DisplayAsync.ShapeExecuteAsync(container));
+        }
+        else if (groupings.Count == 1)
+        {
+            // Evaluate for cards.
+            var cardGrouping = (GroupingViewModel)await ShapeFactory.CreateAsync<GroupingViewModel>("CardGrouping", m =>
+            {
+                m.Identifier = identifier;
+                m.Grouping = groupings.ElementAt(0);
+            });
 
-            return htmlContentBuilder;
+            htmlContentBuilder.AppendHtml(await DisplayAsync.ShapeExecuteAsync(cardGrouping));
         }
 
-        [Shape]
+        return htmlContentBuilder;
+    }
+
+    [Shape]
 #pragma warning disable CA1822 // Mark members as static
-        public async Task<IHtmlContent> CardGrouping(IDisplayHelper DisplayAsync, GroupingViewModel Shape, IShapeFactory ShapeFactory)
+    public async Task<IHtmlContent> CardGrouping(IDisplayHelper DisplayAsync, GroupingViewModel Shape, IShapeFactory ShapeFactory)
 #pragma warning restore CA1822 // Mark members as static
-        {
-            var htmlContentBuilder = new HtmlContentBuilder();
+    {
+        var htmlContentBuilder = new HtmlContentBuilder();
 
-            var groupings = Shape.Grouping.ToLookup(x =>
+        var groupings = Shape.Grouping.ToLookup(x =>
+        {
+            if (x is IShape s)
             {
-                if (x is IShape s)
+                var key = s.Metadata.Card;
+                if (string.IsNullOrEmpty(key))
                 {
-                    var key = s.Metadata.Card;
-                    if (string.IsNullOrEmpty(key))
-                    {
-                        return ContentKey;
-                    }
-
-                    // Remove positional modifier.
-                    var modifierIndex = key.IndexOf(';');
-                    if (modifierIndex != -1)
-                    {
-                        key = key[..modifierIndex];
-                    }
+                    return ContentKey;
+                }
 
-                    return key;
+                // Remove positional modifier.
+                var modifierIndex = key.IndexOf(';');
+                if (modifierIndex != -1)
+                {
+                    key = key[..modifierIndex];
                 }
 
-                return ContentKey;
+                return key;
+            }
 
-            });
+            return ContentKey;
+
+        });
 
-            if (groupings.Count > 1)
+        if (groupings.Count > 1)
+        {
+            var orderedGroupings = groupings.OrderBy(grouping =>
             {
-                var orderedGroupings = groupings.OrderBy(grouping =>
+                var firstGroupWithModifier = grouping.FirstOrDefault(group =>
                 {
-                    var firstGroupWithModifier = grouping.FirstOrDefault(group =>
-                    {
-                        if (group is IShape s && !string.IsNullOrEmpty(s.Metadata.Card) && s.Metadata.Card.Contains(';'))
-                        {
-                            return true;
-                        }
-
-                        return false;
-                    });
-
-                    if (firstGroupWithModifier is IShape shape)
+                    if (group is IShape s && !string.IsNullOrEmpty(s.Metadata.Card) && s.Metadata.Card.Contains(';'))
                     {
-                        var key = shape.Metadata.Card;
-                        var modifierIndex = key.IndexOf(';');
-                        return new PositionalGrouping(key[modifierIndex..]);
+                        return true;
                     }
 
-                    return new PositionalGrouping();
-                }, FlatPositionComparer.Instance);
-
-                var container = (GroupViewModel)await ShapeFactory.CreateAsync<GroupViewModel>("CardContainer", m =>
-                {
-                    m.Identifier = Shape.Identifier;
+                    return false;
                 });
 
-                container.Classes.Add("accordion");
-
-                foreach (var orderedGrouping in orderedGroupings)
+                if (firstGroupWithModifier is IShape shape)
                 {
-                    var groupingShape = (GroupingViewModel)await ShapeFactory.CreateAsync<GroupingViewModel>("Card", m =>
-                    {
-                        m.Identifier = Shape.Identifier;
-                        m.Grouping = orderedGrouping;
-                    });
+                    var key = shape.Metadata.Card;
+                    var modifierIndex = key.IndexOf(';');
+                    return new PositionalGrouping(key[modifierIndex..]);
+                }
 
-                    foreach (var item in orderedGrouping)
-                    {
-                        await groupingShape.AddAsync(item);
-                    }
+                return new PositionalGrouping();
+            }, FlatPositionComparer.Instance);
 
-                    await container.AddAsync(groupingShape);
-                }
+            var container = (GroupViewModel)await ShapeFactory.CreateAsync<GroupViewModel>("CardContainer", m =>
+            {
+                m.Identifier = Shape.Identifier;
+            });
 
-                htmlContentBuilder.AppendHtml(await DisplayAsync.ShapeExecuteAsync(container));
-            }
-            else
+            container.Classes.Add("accordion");
+
+            foreach (var orderedGrouping in orderedGroupings)
             {
-                // Evaluate for columns.
-                var groupingShape = (GroupingViewModel)await ShapeFactory.CreateAsync<GroupingViewModel>("ColumnGrouping", m =>
+                var groupingShape = (GroupingViewModel)await ShapeFactory.CreateAsync<GroupingViewModel>("Card", m =>
                 {
                     m.Identifier = Shape.Identifier;
-                    m.Grouping = Shape.Grouping;
+                    m.Grouping = orderedGrouping;
                 });
 
-                htmlContentBuilder.AppendHtml(await DisplayAsync.ShapeExecuteAsync(groupingShape));
+                foreach (var item in orderedGrouping)
+                {
+                    await groupingShape.AddAsync(item);
+                }
+
+                await container.AddAsync(groupingShape);
             }
 
-            return htmlContentBuilder;
+            htmlContentBuilder.AppendHtml(await DisplayAsync.ShapeExecuteAsync(container));
+        }
+        else
+        {
+            // Evaluate for columns.
+            var groupingShape = (GroupingViewModel)await ShapeFactory.CreateAsync<GroupingViewModel>("ColumnGrouping", m =>
+            {
+                m.Identifier = Shape.Identifier;
+                m.Grouping = Shape.Grouping;
+            });
+
+            htmlContentBuilder.AppendHtml(await DisplayAsync.ShapeExecuteAsync(groupingShape));
         }
 
-        [Shape]
+        return htmlContentBuilder;
+    }
+
+    [Shape]
 #pragma warning disable CA1822 // Mark members as static
-        public async Task<IHtmlContent> ColumnGrouping(IDisplayHelper DisplayAsync, GroupingViewModel Shape, IShapeFactory ShapeFactory)
+    public async Task<IHtmlContent> ColumnGrouping(IDisplayHelper DisplayAsync, GroupingViewModel Shape, IShapeFactory ShapeFactory)
 #pragma warning restore CA1822 // Mark members as static
-        {
-            var htmlContentBuilder = new HtmlContentBuilder();
+    {
+        var htmlContentBuilder = new HtmlContentBuilder();
 
-            var groupings = Shape.Grouping.ToLookup(x =>
+        var groupings = Shape.Grouping.ToLookup(x =>
+        {
+            if (x is IShape s)
             {
-                if (x is IShape s)
+                var key = s.Metadata.Column;
+                if (string.IsNullOrEmpty(key))
                 {
-                    var key = s.Metadata.Column;
-                    if (string.IsNullOrEmpty(key))
-                    {
-                        return ContentKey;
-                    }
-
-                    // Remove column modifier.
-                    var modifierIndex = key.IndexOf('_');
-                    if (modifierIndex != -1)
-                    {
-                        key = key[..modifierIndex];
-                    }
+                    return ContentKey;
+                }
 
-                    // Remove positional modifier.
-                    modifierIndex = key.IndexOf(';');
-                    if (modifierIndex != -1)
-                    {
-                        key = key[..modifierIndex];
-                    }
+                // Remove column modifier.
+                var modifierIndex = key.IndexOf('_');
+                if (modifierIndex != -1)
+                {
+                    key = key[..modifierIndex];
+                }
 
-                    return key;
+                // Remove positional modifier.
+                modifierIndex = key.IndexOf(';');
+                if (modifierIndex != -1)
+                {
+                    key = key[..modifierIndex];
                 }
 
-                return ContentKey;
-            });
+                return key;
+            }
 
-            if (groupings.Count > 1)
-            {
-                var positionModifiers = GetColumnPositions(groupings);
+            return ContentKey;
+        });
 
-                var orderedGroupings = groupings.OrderBy(grouping =>
+        if (groupings.Count > 1)
+        {
+            var positionModifiers = GetColumnPositions(groupings);
+
+            var orderedGroupings = groupings.OrderBy(grouping =>
+            {
+                if (positionModifiers.TryGetValue(grouping.Key, out var position))
                 {
-                    if (positionModifiers.TryGetValue(grouping.Key, out var position))
-                    {
-                        return new PositionalGrouping { Position = position };
-                    }
-                    else
-                    {
-                        return new PositionalGrouping();
-                    }
-                }, FlatPositionComparer.Instance);
+                    return new PositionalGrouping { Position = position };
+                }
+                else
+                {
+                    return new PositionalGrouping();
+                }
+            }, FlatPositionComparer.Instance);
 
-                var columnModifiers = GetColumnModifiers(orderedGroupings);
+            var columnModifiers = GetColumnModifiers(orderedGroupings);
 
-                var container = (GroupViewModel)await ShapeFactory.CreateAsync<GroupViewModel>("ColumnContainer", m =>
+            var container = (GroupViewModel)await ShapeFactory.CreateAsync<GroupViewModel>("ColumnContainer", m =>
+            {
+                m.Identifier = Shape.Identifier;
+            });
+
+            foreach (var orderedGrouping in orderedGroupings)
+            {
+                var groupingShape = (GroupingViewModel)await ShapeFactory.CreateAsync<GroupingViewModel>("Column", m =>
                 {
                     m.Identifier = Shape.Identifier;
+                    m.Grouping = orderedGrouping;
                 });
 
-                foreach (var orderedGrouping in orderedGroupings)
-                {
-                    var groupingShape = (GroupingViewModel)await ShapeFactory.CreateAsync<GroupingViewModel>("Column", m =>
-                    {
-                        m.Identifier = Shape.Identifier;
-                        m.Grouping = orderedGrouping;
-                    });
-
-                    groupingShape.Classes.Add("ta-col-grouping");
-                    groupingShape.Classes.Add("column-" + orderedGrouping.Key.HtmlClassify());
+                groupingShape.Classes.Add("ta-col-grouping");
+                groupingShape.Classes.Add("column-" + orderedGrouping.Key.HtmlClassify());
 
-                    // To adjust this breakpoint apply a modifier of lg-3 to every column.
-                    var columnClasses = "col-12 col-md";
-                    if (columnModifiers.TryGetValue(orderedGrouping.Key, out var columnModifier))
+                // To adjust this breakpoint apply a modifier of lg-3 to every column.
+                var columnClasses = "col-12 col-md";
+                if (columnModifiers.TryGetValue(orderedGrouping.Key, out var columnModifier))
+                {
+                    // When the modifier also has a - assume it is providing a breakpointed class.
+                    if (columnModifier.Contains('-'))
                     {
-                        // When the modifier also has a - assume it is providing a breakpointed class.
-                        if (columnModifier.Contains('-'))
-                        {
-                            columnClasses = "col-12 col-" + columnModifier;
-                        }
-                        else // Otherwise assume a default md breakpoint.
-                        {
-                            columnClasses = "col-12 col-md-" + columnModifier;
-                        }
+                        columnClasses = "col-12 col-" + columnModifier;
                     }
-
-                    groupingShape.Classes.Add(columnClasses);
-
-                    foreach (var item in orderedGrouping)
+                    else // Otherwise assume a default md breakpoint.
                     {
-                        await groupingShape.AddAsync(item);
+                        columnClasses = "col-12 col-md-" + columnModifier;
                     }
-                    await container.AddAsync(groupingShape);
                 }
 
-                htmlContentBuilder.AppendHtml(await DisplayAsync.ShapeExecuteAsync(container));
-            }
-            else
-            {
-                // When nothing is grouped in a column, the grouping is rendered directly.
-                foreach (var item in Shape.Grouping)
+                groupingShape.Classes.Add(columnClasses);
+
+                foreach (var item in orderedGrouping)
                 {
-                    htmlContentBuilder.AppendHtml(await DisplayAsync.ShapeExecuteAsync((IShape)item));
+                    await groupingShape.AddAsync(item);
                 }
+                await container.AddAsync(groupingShape);
             }
 
-            return htmlContentBuilder;
+            htmlContentBuilder.AppendHtml(await DisplayAsync.ShapeExecuteAsync(container));
         }
-        private static Dictionary<string, string> GetColumnPositions(ILookup<string, object> groupings)
+        else
         {
-            var positionModifiers = new Dictionary<string, string>();
-            foreach (var grouping in groupings)
+            // When nothing is grouped in a column, the grouping is rendered directly.
+            foreach (var item in Shape.Grouping)
             {
-                var firstGroupWithModifier = FirstGroupingWithModifierOrDefault(grouping, ';');
-                if (firstGroupWithModifier is IShape shape)
+                htmlContentBuilder.AppendHtml(await DisplayAsync.ShapeExecuteAsync((IShape)item));
+            }
+        }
+
+        return htmlContentBuilder;
+    }
+    private static Dictionary<string, string> GetColumnPositions(ILookup<string, object> groupings)
+    {
+        var positionModifiers = new Dictionary<string, string>();
+        foreach (var grouping in groupings)
+        {
+            var firstGroupWithModifier = FirstGroupingWithModifierOrDefault(grouping, ';');
+            if (firstGroupWithModifier is IShape shape)
+            {
+                var key = shape.Metadata.Column;
+                var columnModifierIndex = key.IndexOf('_');
+                if (columnModifierIndex != -1)
                 {
-                    var key = shape.Metadata.Column;
-                    var columnModifierIndex = key.IndexOf('_');
-                    if (columnModifierIndex != -1)
+                    var positionModifierIndex = key.IndexOf(';');
+                    // Column-9;56
+                    if (positionModifierIndex > columnModifierIndex)
                     {
-                        var positionModifierIndex = key.IndexOf(';');
-                        // Column-9;56
-                        if (positionModifierIndex > columnModifierIndex)
-                        {
-                            positionModifiers.Add(key[..columnModifierIndex], key[(positionModifierIndex + 1)..]);
-                        }
-                        else // Column;56-9
-                        {
-                            var length = columnModifierIndex - positionModifierIndex;
-                            positionModifiers.Add(key[..positionModifierIndex], key.Substring(positionModifierIndex + 1, length - 1));
-                        }
+                        positionModifiers.Add(key[..columnModifierIndex], key[(positionModifierIndex + 1)..]);
                     }
-                    else
+                    else // Column;56-9
                     {
-                        var positionModifierIndex = key.IndexOf(';');
-                        positionModifiers.Add(key[..positionModifierIndex], key[(positionModifierIndex + 1)..]);
+                        var length = columnModifierIndex - positionModifierIndex;
+                        positionModifiers.Add(key[..positionModifierIndex], key.Substring(positionModifierIndex + 1, length - 1));
                     }
                 }
+                else
+                {
+                    var positionModifierIndex = key.IndexOf(';');
+                    positionModifiers.Add(key[..positionModifierIndex], key[(positionModifierIndex + 1)..]);
+                }
             }
-
-            return positionModifiers;
         }
 
-        private static Dictionary<string, string> GetColumnModifiers(IEnumerable<IGrouping<string, object>> groupings)
+        return positionModifiers;
+    }
+
+    private static Dictionary<string, string> GetColumnModifiers(IEnumerable<IGrouping<string, object>> groupings)
+    {
+        var columnModifiers = new Dictionary<string, string>();
+        foreach (var grouping in groupings)
         {
-            var columnModifiers = new Dictionary<string, string>();
-            foreach (var grouping in groupings)
+            var firstGroupWithModifier = FirstGroupingWithModifierOrDefault(grouping, '_');
+            if (firstGroupWithModifier is IShape shape)
             {
-                var firstGroupWithModifier = FirstGroupingWithModifierOrDefault(grouping, '_');
-                if (firstGroupWithModifier is IShape shape)
+                var key = shape.Metadata.Column;
+                var posModifierIndex = key.IndexOf(';');
+                if (posModifierIndex != -1)
                 {
-                    var key = shape.Metadata.Column;
-                    var posModifierIndex = key.IndexOf(';');
-                    if (posModifierIndex != -1)
+                    var colModifierIndex = key.IndexOf('_');
+                    // Column;5.1_9
+                    if (colModifierIndex > posModifierIndex)
                     {
-                        var colModifierIndex = key.IndexOf('_');
-                        // Column;5.1_9
-                        if (colModifierIndex > posModifierIndex)
-                        {
-                            columnModifiers.Add(key[..posModifierIndex], key[(colModifierIndex + 1)..]);
-                        }
-                        else // Column_9;5.1
-                        {
-                            var length = posModifierIndex - colModifierIndex;
-                            columnModifiers.Add(key[..colModifierIndex], key.Substring(colModifierIndex + 1, length - 1));
-                        }
+                        columnModifiers.Add(key[..posModifierIndex], key[(colModifierIndex + 1)..]);
                     }
-                    else
+                    else // Column_9;5.1
                     {
-                        var columnModifierIndex = key.IndexOf('_');
-                        columnModifiers.Add(key[..columnModifierIndex], key[(columnModifierIndex + 1)..]);
+                        var length = posModifierIndex - colModifierIndex;
+                        columnModifiers.Add(key[..colModifierIndex], key.Substring(colModifierIndex + 1, length - 1));
                     }
                 }
+                else
+                {
+                    var columnModifierIndex = key.IndexOf('_');
+                    columnModifiers.Add(key[..columnModifierIndex], key[(columnModifierIndex + 1)..]);
+                }
             }
-
-            return columnModifiers;
         }
 
-        private static object FirstGroupingWithModifierOrDefault(IGrouping<string, object> grouping, char modifier)
+        return columnModifiers;
+    }
+
+    private static object FirstGroupingWithModifierOrDefault(IGrouping<string, object> grouping, char modifier)
+    {
+        var firstGroupWithModifier = grouping.FirstOrDefault(group =>
         {
-            var firstGroupWithModifier = grouping.FirstOrDefault(group =>
+            if (group is IShape s && !string.IsNullOrEmpty(s.Metadata.Column) && s.Metadata.Column.Contains(modifier))
             {
-                if (group is IShape s && !string.IsNullOrEmpty(s.Metadata.Column) && s.Metadata.Column.Contains(modifier))
-                {
-                    return true;
-                }
+                return true;
+            }
 
-                return false;
-            });
+            return false;
+        });
 
-            return firstGroupWithModifier;
-        }
+        return firstGroupWithModifier;
     }
+}
 
-    internal sealed class PositionalGrouping : IPositioned
+internal sealed class PositionalGrouping : IPositioned
+{
+    public PositionalGrouping()
     {
-        public PositionalGrouping()
-        {
-        }
+    }
 
-        public PositionalGrouping(string key)
+    public PositionalGrouping(string key)
+    {
+        if (!string.IsNullOrEmpty(key))
         {
-            if (!string.IsNullOrEmpty(key))
+            var modifierIndex = key.IndexOf(';');
+            if (modifierIndex != -1)
             {
-                var modifierIndex = key.IndexOf(';');
-                if (modifierIndex != -1)
-                {
-                    Position = key[(modifierIndex + 1)..];
-                }
+                Position = key[(modifierIndex + 1)..];
             }
         }
-        public string Position { get; set; }
     }
+    public string Position { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DynamicCache.Abstractions/DynamicCacheOptions.cs b/src/OrchardCore/OrchardCore.DynamicCache.Abstractions/DynamicCacheOptions.cs
index 8db9856fea0..01fd9f9a438 100644
--- a/src/OrchardCore/OrchardCore.DynamicCache.Abstractions/DynamicCacheOptions.cs
+++ b/src/OrchardCore/OrchardCore.DynamicCache.Abstractions/DynamicCacheOptions.cs
@@ -1,9 +1,8 @@
 using System;
 
-namespace OrchardCore.DynamicCache
+namespace OrchardCore.DynamicCache;
+
+public class DynamicCacheOptions
 {
-    public class DynamicCacheOptions
-    {
-        public TimeSpan? FailoverRetryLatency { get; set; }
-    }
+    public TimeSpan? FailoverRetryLatency { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.DynamicCache.Abstractions/IDynamicCache.cs b/src/OrchardCore/OrchardCore.DynamicCache.Abstractions/IDynamicCache.cs
index 5168b4e578f..29891eba917 100644
--- a/src/OrchardCore/OrchardCore.DynamicCache.Abstractions/IDynamicCache.cs
+++ b/src/OrchardCore/OrchardCore.DynamicCache.Abstractions/IDynamicCache.cs
@@ -1,12 +1,11 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Caching.Distributed;
 
-namespace OrchardCore.DynamicCache
+namespace OrchardCore.DynamicCache;
+
+public interface IDynamicCache
 {
-    public interface IDynamicCache
-    {
-        Task<byte[]> GetAsync(string key);
-        Task RemoveAsync(string key);
-        Task SetAsync(string key, byte[] value, DistributedCacheEntryOptions options);
-    }
+    Task<byte[]> GetAsync(string key);
+    Task RemoveAsync(string key);
+    Task SetAsync(string key, byte[] value, DistributedCacheEntryOptions options);
 }
diff --git a/src/OrchardCore/OrchardCore.DynamicCache.Abstractions/IDynamicCacheService.cs b/src/OrchardCore/OrchardCore.DynamicCache.Abstractions/IDynamicCacheService.cs
index a1379c20fce..aef46baa8ca 100644
--- a/src/OrchardCore/OrchardCore.DynamicCache.Abstractions/IDynamicCacheService.cs
+++ b/src/OrchardCore/OrchardCore.DynamicCache.Abstractions/IDynamicCacheService.cs
@@ -1,11 +1,10 @@
 using System.Threading.Tasks;
 using OrchardCore.Environment.Cache;
 
-namespace OrchardCore.DynamicCache
+namespace OrchardCore.DynamicCache;
+
+public interface IDynamicCacheService : ITagRemovedEventHandler
 {
-    public interface IDynamicCacheService : ITagRemovedEventHandler
-    {
-        Task<string> GetCachedValueAsync(CacheContext context);
-        Task SetCachedValueAsync(CacheContext context, string value);
-    }
+    Task<string> GetCachedValueAsync(CacheContext context);
+    Task SetCachedValueAsync(CacheContext context, string value);
 }
diff --git a/src/OrchardCore/OrchardCore.Email.Abstractions/MailMessage.cs b/src/OrchardCore/OrchardCore.Email.Abstractions/MailMessage.cs
index 5bd26dc8f22..05dabd7f7f6 100644
--- a/src/OrchardCore/OrchardCore.Email.Abstractions/MailMessage.cs
+++ b/src/OrchardCore/OrchardCore.Email.Abstractions/MailMessage.cs
@@ -1,64 +1,63 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Email
+namespace OrchardCore.Email;
+
+/// <summary>
+/// Represents a class that contains information of the mail message.
+/// </summary>
+public class MailMessage
 {
     /// <summary>
-    /// Represents a class that contains information of the mail message.
+    /// Gets or sets the author of the email.
     /// </summary>
-    public class MailMessage
-    {
-        /// <summary>
-        /// Gets or sets the author of the email.
-        /// </summary>
-        public string From { get; set; }
+    public string From { get; set; }
 
-        /// <summary>
-        /// Gets or sets the recipients.
-        /// </summary>
-        public string To { get; set; }
+    /// <summary>
+    /// Gets or sets the recipients.
+    /// </summary>
+    public string To { get; set; }
 
-        /// <summary>
-        /// Gets or sets the carbon copy emails.
-        /// </summary>
-        public string Cc { get; set; }
+    /// <summary>
+    /// Gets or sets the carbon copy emails.
+    /// </summary>
+    public string Cc { get; set; }
 
-        /// <summary>
-        /// Gets or sets a blind copy emails.
-        /// </summary>
-        public string Bcc { get; set; }
+    /// <summary>
+    /// Gets or sets a blind copy emails.
+    /// </summary>
+    public string Bcc { get; set; }
 
-        /// <summary>
-        /// Gets or sets the replied to emails.
-        /// </summary>
-        public string ReplyTo { get; set; }
+    /// <summary>
+    /// Gets or sets the replied to emails.
+    /// </summary>
+    public string ReplyTo { get; set; }
 
-        /// <summary>
-        /// Gets or sets the actual submitter of the email.
-        /// </summary>
-        /// <remark>
-        /// This property is required if not the same as <see cref="From"/>, for more information please refer to https://ietf.org/rfc/rfc822.txt.
-        /// </remark>
-        public string Sender { get; set; }
+    /// <summary>
+    /// Gets or sets the actual submitter of the email.
+    /// </summary>
+    /// <remark>
+    /// This property is required if not the same as <see cref="From"/>, for more information please refer to https://ietf.org/rfc/rfc822.txt.
+    /// </remark>
+    public string Sender { get; set; }
 
-        /// <summary>
-        /// Gets or sets the message subject.
-        /// </summary>
-        public string Subject { get; set; }
+    /// <summary>
+    /// Gets or sets the message subject.
+    /// </summary>
+    public string Subject { get; set; }
 
-        /// <summary>
-        /// Gets or sets the message content aka body.
-        /// </summary>
-        /// <remarks>This property is work in conjunction with <see cref="IsHtmlBody"/> to determine the body type..</remarks>
-        public string Body { get; set; }
+    /// <summary>
+    /// Gets or sets the message content aka body.
+    /// </summary>
+    /// <remarks>This property is work in conjunction with <see cref="IsHtmlBody"/> to determine the body type..</remarks>
+    public string Body { get; set; }
 
-        /// <summary>
-        /// Gets or sets whether the message body is an HTML or not. Default is <c>false</c> which is plain text.
-        /// </summary>
-        public bool IsHtmlBody { get; set; }
+    /// <summary>
+    /// Gets or sets whether the message body is an HTML or not. Default is <c>false</c> which is plain text.
+    /// </summary>
+    public bool IsHtmlBody { get; set; }
 
-        /// <summary>
-        /// The collection of message attachments.
-        /// </summary>
-        public List<MailMessageAttachment> Attachments { get; init; } = [];
-    }
+    /// <summary>
+    /// The collection of message attachments.
+    /// </summary>
+    public List<MailMessageAttachment> Attachments { get; init; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.Email.Abstractions/MailMessageAttachment.cs b/src/OrchardCore/OrchardCore.Email.Abstractions/MailMessageAttachment.cs
index 71102d5cd43..5808d59d2cb 100644
--- a/src/OrchardCore/OrchardCore.Email.Abstractions/MailMessageAttachment.cs
+++ b/src/OrchardCore/OrchardCore.Email.Abstractions/MailMessageAttachment.cs
@@ -1,20 +1,19 @@
 using System.IO;
 
-namespace OrchardCore.Email
+namespace OrchardCore.Email;
+
+/// <summary>
+/// Represents a class that contains information for a mail message attachment.
+/// </summary>
+public class MailMessageAttachment
 {
     /// <summary>
-    /// Represents a class that contains information for a mail message attachment.
+    /// Gets or sets the attachment filename.
     /// </summary>
-    public class MailMessageAttachment
-    {
-        /// <summary>
-        /// Gets or sets the attachment filename.
-        /// </summary>
-        public string Filename { get; set; }
+    public string Filename { get; set; }
 
-        /// <summary>
-        /// Gets or sets the attachment file stream.
-        /// </summary>
-        public Stream Stream { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the attachment file stream.
+    /// </summary>
+    public Stream Stream { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Email.Abstractions/MailMessageRecipients.cs b/src/OrchardCore/OrchardCore.Email.Abstractions/MailMessageRecipients.cs
index 9e3cddc0dd1..75b6c47d08f 100644
--- a/src/OrchardCore/OrchardCore.Email.Abstractions/MailMessageRecipients.cs
+++ b/src/OrchardCore/OrchardCore.Email.Abstractions/MailMessageRecipients.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace OrchardCore.Email;
 
diff --git a/src/OrchardCore/OrchardCore.Email.Abstractions/SmtpDeliveryMethod.cs b/src/OrchardCore/OrchardCore.Email.Abstractions/SmtpDeliveryMethod.cs
index 43b8aed4fc6..e56be54751c 100644
--- a/src/OrchardCore/OrchardCore.Email.Abstractions/SmtpDeliveryMethod.cs
+++ b/src/OrchardCore/OrchardCore.Email.Abstractions/SmtpDeliveryMethod.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.Email
+namespace OrchardCore.Email;
+
+/// <summary>
+/// Represents an enumeration for the mail delivery methods.
+/// </summary>
+public enum SmtpDeliveryMethod
 {
-    /// <summary>
-    /// Represents an enumeration for the mail delivery methods.
-    /// </summary>
-    public enum SmtpDeliveryMethod
-    {
-        Network,
-        SpecifiedPickupDirectory
-    }
+    Network,
+    SpecifiedPickupDirectory
 }
diff --git a/src/OrchardCore/OrchardCore.Email.Abstractions/SmtpEncryptionMethod.cs b/src/OrchardCore/OrchardCore.Email.Abstractions/SmtpEncryptionMethod.cs
index 4458bb4271e..650bec3c0d6 100644
--- a/src/OrchardCore/OrchardCore.Email.Abstractions/SmtpEncryptionMethod.cs
+++ b/src/OrchardCore/OrchardCore.Email.Abstractions/SmtpEncryptionMethod.cs
@@ -1,12 +1,11 @@
-namespace OrchardCore.Email
+namespace OrchardCore.Email;
+
+/// <summary>
+/// Represents an enumeration for mail encryption methods.
+/// </summary>
+public enum SmtpEncryptionMethod
 {
-    /// <summary>
-    /// Represents an enumeration for mail encryption methods.
-    /// </summary>
-    public enum SmtpEncryptionMethod
-    {
-        None = 0,
-        SslTls = 1,
-        StartTls = 2
-    }
+    None = 0,
+    SslTls = 1,
+    StartTls = 2
 }
diff --git a/src/OrchardCore/OrchardCore.Features.Core/Models/ModuleFeature.cs b/src/OrchardCore/OrchardCore.Features.Core/Models/ModuleFeature.cs
index 5a3a1a2a2bd..2fe37467e8e 100644
--- a/src/OrchardCore/OrchardCore.Features.Core/Models/ModuleFeature.cs
+++ b/src/OrchardCore/OrchardCore.Features.Core/Models/ModuleFeature.cs
@@ -1,56 +1,55 @@
 using System.Collections.Generic;
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.Features.Models
+namespace OrchardCore.Features.Models;
+
+/// <summary>
+/// Represents a module's feature.
+/// </summary>
+public class ModuleFeature
 {
     /// <summary>
-    /// Represents a module's feature.
-    /// </summary>
-    public class ModuleFeature
-    {
-        /// <summary>
-        /// The feature descriptor.
-        /// </summary>
-        public IFeatureInfo Descriptor { get; set; }
-
-        /// <summary>
-        /// Boolean value indicating if the feature is enabled.
-        /// </summary>
-        public bool IsEnabled { get; set; }
-
-        /// <summary>
-        /// Boolean value indicating if the feature is always enabled.
-        /// </summary>
-        public bool IsAlwaysEnabled { get; set; }
-
-        /// <summary>
-        /// Boolean value indicating if the feature needs a data update / migration.
-        /// </summary>
-        public bool NeedsUpdate { get; set; }
-
-        /// <summary>
-        /// Boolean value indicating if the module needs a version update.
-        /// </summary>
-        public bool NeedsVersionUpdate { get; set; }
-
-        /// <summary>
-        /// Boolean value indicating if the feature was recently installed.
-        /// </summary>
-        public bool IsRecentlyInstalled { get; set; }
-
-        /// <summary>
-        /// Boolean value indicating if the feature is enabled by dependency only.
-        /// </summary>
-        public bool EnabledByDependencyOnly { get; set; }
-
-        /// <summary>
-        /// List of enabled features that depend on this feature.
-        /// </summary>
-        public IEnumerable<IFeatureInfo> EnabledDependentFeatures { get; set; }
-
-        /// <summary>
-        /// List of features that this feature depends on.
-        /// </summary>
-        public IEnumerable<IFeatureInfo> FeatureDependencies { get; set; }
-    }
+    /// The feature descriptor.
+    /// </summary>
+    public IFeatureInfo Descriptor { get; set; }
+
+    /// <summary>
+    /// Boolean value indicating if the feature is enabled.
+    /// </summary>
+    public bool IsEnabled { get; set; }
+
+    /// <summary>
+    /// Boolean value indicating if the feature is always enabled.
+    /// </summary>
+    public bool IsAlwaysEnabled { get; set; }
+
+    /// <summary>
+    /// Boolean value indicating if the feature needs a data update / migration.
+    /// </summary>
+    public bool NeedsUpdate { get; set; }
+
+    /// <summary>
+    /// Boolean value indicating if the module needs a version update.
+    /// </summary>
+    public bool NeedsVersionUpdate { get; set; }
+
+    /// <summary>
+    /// Boolean value indicating if the feature was recently installed.
+    /// </summary>
+    public bool IsRecentlyInstalled { get; set; }
+
+    /// <summary>
+    /// Boolean value indicating if the feature is enabled by dependency only.
+    /// </summary>
+    public bool EnabledByDependencyOnly { get; set; }
+
+    /// <summary>
+    /// List of enabled features that depend on this feature.
+    /// </summary>
+    public IEnumerable<IFeatureInfo> EnabledDependentFeatures { get; set; }
+
+    /// <summary>
+    /// List of features that this feature depends on.
+    /// </summary>
+    public IEnumerable<IFeatureInfo> FeatureDependencies { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Feeds.Abstractions/Extensions/FeedBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Feeds.Abstractions/Extensions/FeedBuilderExtensions.cs
index 97b8cde1c89..6f057f5aed0 100644
--- a/src/OrchardCore/OrchardCore.Feeds.Abstractions/Extensions/FeedBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Feeds.Abstractions/Extensions/FeedBuilderExtensions.cs
@@ -1,11 +1,10 @@
 using System.Xml.Linq;
 using OrchardCore.Feeds.Models;
 
-namespace OrchardCore.Feeds
+namespace OrchardCore.Feeds;
+
+public static class FeedBuilderExtensions
 {
-    public static class FeedBuilderExtensions
-    {
-        public static void AddProperty(this IFeedBuilder feedBuilder, FeedContext context, FeedItem feedItem, string name, string value)
-            => feedBuilder.AddProperty(context, feedItem, new XElement(name, value));
-    }
+    public static void AddProperty(this IFeedBuilder feedBuilder, FeedContext context, FeedItem feedItem, string name, string value)
+        => feedBuilder.AddProperty(context, feedItem, new XElement(name, value));
 }
diff --git a/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedBuilder.cs b/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedBuilder.cs
index 2b5a5ffdac8..3815b84ea9d 100644
--- a/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedBuilder.cs
+++ b/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedBuilder.cs
@@ -3,14 +3,13 @@
 using System.Xml.Linq;
 using OrchardCore.Feeds.Models;
 
-namespace OrchardCore.Feeds
+namespace OrchardCore.Feeds;
+
+public interface IFeedBuilder
 {
-    public interface IFeedBuilder
-    {
-        Task<XDocument> ProcessAsync(FeedContext context, Func<Task> populate);
+    Task<XDocument> ProcessAsync(FeedContext context, Func<Task> populate);
 
-        FeedItem<TItem> AddItem<TItem>(FeedContext context, TItem contentItem);
+    FeedItem<TItem> AddItem<TItem>(FeedContext context, TItem contentItem);
 
-        void AddProperty(FeedContext context, FeedItem feedItem, XElement element);
-    }
+    void AddProperty(FeedContext context, FeedItem feedItem, XElement element);
 }
diff --git a/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedBuilderProvider.cs b/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedBuilderProvider.cs
index 4485a3d6a0a..6b53975cd08 100644
--- a/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedBuilderProvider.cs
+++ b/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedBuilderProvider.cs
@@ -1,15 +1,14 @@
 using OrchardCore.Feeds.Models;
 
-namespace OrchardCore.Feeds
+namespace OrchardCore.Feeds;
+
+public interface IFeedBuilderProvider
 {
-    public interface IFeedBuilderProvider
-    {
-        FeedBuilderMatch Match(FeedContext context);
-    }
+    FeedBuilderMatch Match(FeedContext context);
+}
 
-    public class FeedBuilderMatch
-    {
-        public int Priority { get; set; }
-        public IFeedBuilder FeedBuilder { get; set; }
-    }
+public class FeedBuilderMatch
+{
+    public int Priority { get; set; }
+    public IFeedBuilder FeedBuilder { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedItemBuilder.cs b/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedItemBuilder.cs
index 3f75a775057..86b1f96ff80 100644
--- a/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedItemBuilder.cs
+++ b/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedItemBuilder.cs
@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
 using OrchardCore.Feeds.Models;
 
-namespace OrchardCore.Feeds
+namespace OrchardCore.Feeds;
+
+public interface IFeedItemBuilder
 {
-    public interface IFeedItemBuilder
-    {
-        Task PopulateAsync(FeedContext context);
-    }
+    Task PopulateAsync(FeedContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedQuery.cs b/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedQuery.cs
index d6493bc6ecf..73345a93622 100644
--- a/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedQuery.cs
+++ b/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedQuery.cs
@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
 using OrchardCore.Feeds.Models;
 
-namespace OrchardCore.Feeds
+namespace OrchardCore.Feeds;
+
+public interface IFeedQuery
 {
-    public interface IFeedQuery
-    {
-        Task ExecuteAsync(FeedContext context);
-    }
+    Task ExecuteAsync(FeedContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedQueryProvider.cs b/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedQueryProvider.cs
index 180114247e8..95e0e49d80a 100644
--- a/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedQueryProvider.cs
+++ b/src/OrchardCore/OrchardCore.Feeds.Abstractions/IFeedQueryProvider.cs
@@ -1,16 +1,15 @@
 using System.Threading.Tasks;
 using OrchardCore.Feeds.Models;
 
-namespace OrchardCore.Feeds
+namespace OrchardCore.Feeds;
+
+public interface IFeedQueryProvider
 {
-    public interface IFeedQueryProvider
-    {
-        Task<FeedQueryMatch> MatchAsync(FeedContext context);
-    }
+    Task<FeedQueryMatch> MatchAsync(FeedContext context);
+}
 
-    public class FeedQueryMatch
-    {
-        public int Priority { get; set; }
-        public IFeedQuery FeedQuery { get; set; }
-    }
+public class FeedQueryMatch
+{
+    public int Priority { get; set; }
+    public IFeedQuery FeedQuery { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/ContextualizeContext.cs b/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/ContextualizeContext.cs
index be303329363..b83c25953a5 100644
--- a/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/ContextualizeContext.cs
+++ b/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/ContextualizeContext.cs
@@ -1,11 +1,10 @@
 using System;
 using Microsoft.AspNetCore.Mvc;
 
-namespace OrchardCore.Feeds.Models
+namespace OrchardCore.Feeds.Models;
+
+public class ContextualizeContext
 {
-    public class ContextualizeContext
-    {
-        public IServiceProvider ServiceProvider { get; set; }
-        public IUrlHelper Url { get; set; }
-    }
+    public IServiceProvider ServiceProvider { get; set; }
+    public IUrlHelper Url { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/FeedContext.cs b/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/FeedContext.cs
index fa485b61325..8b9ed5f5193 100644
--- a/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/FeedContext.cs
+++ b/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/FeedContext.cs
@@ -1,19 +1,18 @@
 using OrchardCore.DisplayManagement.ModelBinding;
 
-namespace OrchardCore.Feeds.Models
+namespace OrchardCore.Feeds.Models;
+
+public class FeedContext
 {
-    public class FeedContext
+    public FeedContext(IUpdateModel updater, string format)
     {
-        public FeedContext(IUpdateModel updater, string format)
-        {
-            Updater = updater;
-            Format = format;
-            Response = new FeedResponse();
-        }
-
-        public IUpdateModel Updater { get; set; }
-        public string Format { get; set; }
-        public FeedResponse Response { get; set; }
-        public IFeedBuilder Builder { get; set; }
+        Updater = updater;
+        Format = format;
+        Response = new FeedResponse();
     }
+
+    public IUpdateModel Updater { get; set; }
+    public string Format { get; set; }
+    public FeedResponse Response { get; set; }
+    public IFeedBuilder Builder { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/FeedItem.cs b/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/FeedItem.cs
index f59e335f3dd..630ce449ee5 100644
--- a/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/FeedItem.cs
+++ b/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/FeedItem.cs
@@ -1,28 +1,27 @@
 using System.Xml.Linq;
 
-namespace OrchardCore.Feeds.Models
+namespace OrchardCore.Feeds.Models;
+
+public class FeedItem
 {
-    public class FeedItem
-    {
-        private object _item;
-        public object Item { get { return _item; } set { SetItem(value); } }
-        public XElement Element { get; set; }
+    private object _item;
+    public object Item { get { return _item; } set { SetItem(value); } }
+    public XElement Element { get; set; }
 
-        protected virtual void SetItem(object item)
-        {
-            _item = item;
-        }
+    protected virtual void SetItem(object item)
+    {
+        _item = item;
     }
+}
 
-    public class FeedItem<TItem> : FeedItem
-    {
-        private TItem _item;
-        public new TItem Item { get { return _item; } set { SetItem(value); } }
+public class FeedItem<TItem> : FeedItem
+{
+    private TItem _item;
+    public new TItem Item { get { return _item; } set { SetItem(value); } }
 
-        protected override void SetItem(object item)
-        {
-            _item = (TItem)item;
-            base.SetItem(item);
-        }
+    protected override void SetItem(object item)
+    {
+        _item = (TItem)item;
+        base.SetItem(item);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/FeedMetadata.cs b/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/FeedMetadata.cs
index dce9f69acf6..df14eecd111 100644
--- a/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/FeedMetadata.cs
+++ b/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/FeedMetadata.cs
@@ -1,12 +1,11 @@
-namespace OrchardCore.Feeds.Models
+namespace OrchardCore.Feeds.Models;
+
+/// <summary>
+/// Used to gather custom Feed properties for a content item.
+/// </summary>
+public class FeedMetadata
 {
-    /// <summary>
-    /// Used to gather custom Feed properties for a content item.
-    /// </summary>
-    public class FeedMetadata
-    {
-        public bool DisableRssFeed { get; set; }
+    public bool DisableRssFeed { get; set; }
 
-        public string FeedProxyUrl { get; set; }
-    }
+    public string FeedProxyUrl { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/FeedResponse.cs b/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/FeedResponse.cs
index 357593001ee..025dd8cb284 100644
--- a/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/FeedResponse.cs
+++ b/src/OrchardCore/OrchardCore.Feeds.Abstractions/Models/FeedResponse.cs
@@ -2,16 +2,15 @@
 using System.Collections.Generic;
 using System.Xml.Linq;
 
-namespace OrchardCore.Feeds.Models
+namespace OrchardCore.Feeds.Models;
+
+public class FeedResponse
 {
-    public class FeedResponse
+    public XElement Element { get; set; }
+    public IList<FeedItem> Items { get; } = [];
+    public IList<Action<ContextualizeContext>> Contextualizers { get; } = [];
+    public void Contextualize(Action<ContextualizeContext> contextualizer)
     {
-        public XElement Element { get; set; }
-        public IList<FeedItem> Items { get; } = [];
-        public IList<Action<ContextualizeContext>> Contextualizers { get; } = [];
-        public void Contextualize(Action<ContextualizeContext> contextualizer)
-        {
-            Contextualizers.Add(contextualizer);
-        }
+        Contextualizers.Add(contextualizer);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Feeds.Core/Rss/RssFeedBuilder.cs b/src/OrchardCore/OrchardCore.Feeds.Core/Rss/RssFeedBuilder.cs
index c75af64b5e6..e1d2aaa8e8a 100644
--- a/src/OrchardCore/OrchardCore.Feeds.Core/Rss/RssFeedBuilder.cs
+++ b/src/OrchardCore/OrchardCore.Feeds.Core/Rss/RssFeedBuilder.cs
@@ -3,46 +3,45 @@
 using System.Xml.Linq;
 using OrchardCore.Feeds.Models;
 
-namespace OrchardCore.Feeds.Rss
+namespace OrchardCore.Feeds.Rss;
+
+public class RssFeedBuilder : IFeedBuilder
 {
-    public class RssFeedBuilder : IFeedBuilder
+    public async Task<XDocument> ProcessAsync(FeedContext context, Func<Task> populate)
     {
-        public async Task<XDocument> ProcessAsync(FeedContext context, Func<Task> populate)
-        {
-            var rss = new XElement("rss");
-            rss.SetAttributeValue("version", "2.0");
+        var rss = new XElement("rss");
+        rss.SetAttributeValue("version", "2.0");
 
-            var channel = new XElement("channel");
-            context.Response.Element = channel;
-            rss.Add(channel);
+        var channel = new XElement("channel");
+        context.Response.Element = channel;
+        rss.Add(channel);
 
-            await populate();
+        await populate();
 
-            return new XDocument(rss);
-        }
+        return new XDocument(rss);
+    }
+
+    public FeedItem<TItem> AddItem<TItem>(FeedContext context, TItem item)
+    {
+        var feedItem = new FeedItem<TItem>
+        {
+            Item = item,
+            Element = new XElement("item"),
+        };
+        context.Response.Items.Add(feedItem);
+        context.Response.Element.Add(feedItem.Element);
+        return feedItem;
+    }
 
-        public FeedItem<TItem> AddItem<TItem>(FeedContext context, TItem item)
+    public void AddProperty(FeedContext context, FeedItem feedItem, XElement element)
+    {
+        if (feedItem == null)
         {
-            var feedItem = new FeedItem<TItem>
-            {
-                Item = item,
-                Element = new XElement("item"),
-            };
-            context.Response.Items.Add(feedItem);
-            context.Response.Element.Add(feedItem.Element);
-            return feedItem;
+            context.Response.Element.Add(element);
         }
-
-        public void AddProperty(FeedContext context, FeedItem feedItem, XElement element)
+        else
         {
-            if (feedItem == null)
-            {
-                context.Response.Element.Add(element);
-            }
-            else
-            {
-                feedItem.Element.Add(element);
-            }
+            feedItem.Element.Add(element);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Feeds.Core/Rss/RssFeedBuilderProvider.cs b/src/OrchardCore/OrchardCore.Feeds.Core/Rss/RssFeedBuilderProvider.cs
index 01ff390978c..2227dab9959 100644
--- a/src/OrchardCore/OrchardCore.Feeds.Core/Rss/RssFeedBuilderProvider.cs
+++ b/src/OrchardCore/OrchardCore.Feeds.Core/Rss/RssFeedBuilderProvider.cs
@@ -1,21 +1,20 @@
 using OrchardCore.Feeds.Models;
 
-namespace OrchardCore.Feeds.Rss
+namespace OrchardCore.Feeds.Rss;
+
+public class RssFeedBuilderProvider : IFeedBuilderProvider
 {
-    public class RssFeedBuilderProvider : IFeedBuilderProvider
+    public FeedBuilderMatch Match(FeedContext context)
     {
-        public FeedBuilderMatch Match(FeedContext context)
+        if (context.Format == "rss")
         {
-            if (context.Format == "rss")
+            return new FeedBuilderMatch
             {
-                return new FeedBuilderMatch
-                {
-                    FeedBuilder = new RssFeedBuilder(),
-                    Priority = -5
-                };
-            }
-
-            return null;
+                FeedBuilder = new RssFeedBuilder(),
+                Priority = -5
+            };
         }
+
+        return null;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Feeds.Core/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Feeds.Core/ServiceCollectionExtensions.cs
index 7ffc1f6fdbe..f67c54a6acb 100644
--- a/src/OrchardCore/OrchardCore.Feeds.Core/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Feeds.Core/ServiceCollectionExtensions.cs
@@ -1,15 +1,14 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Feeds.Rss;
 
-namespace OrchardCore.Feeds
+namespace OrchardCore.Feeds;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    public static IServiceCollection AddFeeds(this IServiceCollection services)
     {
-        public static IServiceCollection AddFeeds(this IServiceCollection services)
-        {
-            services.AddSingleton<IFeedBuilderProvider, RssFeedBuilderProvider>();
+        services.AddSingleton<IFeedBuilderProvider, RssFeedBuilderProvider>();
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.FileStorage.Abstractions/FileStoreException.cs b/src/OrchardCore/OrchardCore.FileStorage.Abstractions/FileStoreException.cs
index 232952edb7a..e9405f0e25b 100644
--- a/src/OrchardCore/OrchardCore.FileStorage.Abstractions/FileStoreException.cs
+++ b/src/OrchardCore/OrchardCore.FileStorage.Abstractions/FileStoreException.cs
@@ -1,15 +1,14 @@
 using System;
 
-namespace OrchardCore.FileStorage
+namespace OrchardCore.FileStorage;
+
+public class FileStoreException : Exception
 {
-    public class FileStoreException : Exception
+    public FileStoreException(string message) : base(message)
     {
-        public FileStoreException(string message) : base(message)
-        {
-        }
+    }
 
-        public FileStoreException(string message, Exception innerException) : base(message, innerException)
-        {
-        }
+    public FileStoreException(string message, Exception innerException) : base(message, innerException)
+    {
     }
 }
diff --git a/src/OrchardCore/OrchardCore.FileStorage.Abstractions/IFileStore.cs b/src/OrchardCore/OrchardCore.FileStorage.Abstractions/IFileStore.cs
index f5fd3a74a08..02bf45ef88c 100644
--- a/src/OrchardCore/OrchardCore.FileStorage.Abstractions/IFileStore.cs
+++ b/src/OrchardCore/OrchardCore.FileStorage.Abstractions/IFileStore.cs
@@ -4,184 +4,183 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace OrchardCore.FileStorage
+namespace OrchardCore.FileStorage;
+
+/// <summary>
+/// Represents a generic abstraction over a virtual file store.
+/// </summary>
+/// <remarks>
+/// The virtual file store uses forward slash (/) as the path delimiter, and has no concept of
+/// volumes or drives. All paths are specified and returned as relative to the root of the virtual
+/// file store. Absolute paths using a leading slash or leading period, and parent traversal
+/// using "../", are not supported.
+///
+/// This abstraction does not dictate any case sensitivity semantics. Case sensitivity is left to
+/// the underlying storage system of concrete implementations. For example, the Windows file system
+/// is case insensitive, while Linux file system and Azure Blob Storage are case sensitive.
+/// </remarks>
+public interface IFileStore
 {
     /// <summary>
-    /// Represents a generic abstraction over a virtual file store.
+    /// Retrieves information about the given file within the file store.
     /// </summary>
+    /// <param name="path">The path within the file store.</param>
+    /// <returns>A <see cref="IFileStoreEntry"/> object representing the file, or <c>null</c> if the file does not exist.</returns>
+    Task<IFileStoreEntry> GetFileInfoAsync(string path);
+
+    /// <summary>
+    /// Retrieves information about the given directory within the file store.
+    /// </summary>
+    /// <param name="path">The path within the file store.</param>
+    /// <returns>A <see cref="IFileStoreEntry"/> object representing the directory, or <c>null</c> if the directory does not exist.</returns>
+    Task<IFileStoreEntry> GetDirectoryInfoAsync(string path);
+
+    /// <summary>
+    /// Enumerates the content (files and directories) in a given directory within the file store.
+    /// </summary>
+    /// <param name="path">The path of the directory to enumerate, or <c>null</c> to enumerate the root of the file store.</param>
+    /// <param name="includeSubDirectories">A flag to indicate whether to get the contents from just the top directory or from all sub-directories as well.</param>
+    /// <returns>The list of files and directories in the given directory.</returns>
+    /// <exception cref="FileStoreException">Thrown if the specified directory does not exist.</exception>
     /// <remarks>
-    /// The virtual file store uses forward slash (/) as the path delimiter, and has no concept of
-    /// volumes or drives. All paths are specified and returned as relative to the root of the virtual
-    /// file store. Absolute paths using a leading slash or leading period, and parent traversal
-    /// using "../", are not supported.
-    ///
-    /// This abstraction does not dictate any case sensitivity semantics. Case sensitivity is left to
-    /// the underlying storage system of concrete implementations. For example, the Windows file system
-    /// is case insensitive, while Linux file system and Azure Blob Storage are case sensitive.
+    /// Results are grouped by entry type, where directories are followed by files.
     /// </remarks>
-    public interface IFileStore
-    {
-        /// <summary>
-        /// Retrieves information about the given file within the file store.
-        /// </summary>
-        /// <param name="path">The path within the file store.</param>
-        /// <returns>A <see cref="IFileStoreEntry"/> object representing the file, or <c>null</c> if the file does not exist.</returns>
-        Task<IFileStoreEntry> GetFileInfoAsync(string path);
-
-        /// <summary>
-        /// Retrieves information about the given directory within the file store.
-        /// </summary>
-        /// <param name="path">The path within the file store.</param>
-        /// <returns>A <see cref="IFileStoreEntry"/> object representing the directory, or <c>null</c> if the directory does not exist.</returns>
-        Task<IFileStoreEntry> GetDirectoryInfoAsync(string path);
-
-        /// <summary>
-        /// Enumerates the content (files and directories) in a given directory within the file store.
-        /// </summary>
-        /// <param name="path">The path of the directory to enumerate, or <c>null</c> to enumerate the root of the file store.</param>
-        /// <param name="includeSubDirectories">A flag to indicate whether to get the contents from just the top directory or from all sub-directories as well.</param>
-        /// <returns>The list of files and directories in the given directory.</returns>
-        /// <exception cref="FileStoreException">Thrown if the specified directory does not exist.</exception>
-        /// <remarks>
-        /// Results are grouped by entry type, where directories are followed by files.
-        /// </remarks>
-        IAsyncEnumerable<IFileStoreEntry> GetDirectoryContentAsync(string path = null, bool includeSubDirectories = false);
-
-        /// <summary>
-        /// Creates a directory in the file store if it doesn't already exist.
-        /// </summary>
-        /// <param name="path">The path of the directory to be created.</param>
-        /// <returns><c>true</c> if the directory was created; <c>false</c> if the directory already existed.</returns>
-        /// <exception cref="FileStoreException">Thrown if the specified path exists but is not a directory.</exception>
-        Task<bool> TryCreateDirectoryAsync(string path);
-
-        /// <summary>
-        /// Deletes a file in the file store if it exists.
-        /// </summary>
-        /// <param name="path">The path of the file to be deleted.</param>
-        /// <returns><c>true</c> if the file was deleted; <c>false</c> if the file did not exist.</returns>
-        Task<bool> TryDeleteFileAsync(string path);
-
-        /// <summary>
-        /// Deletes a directory in the file store if it exists.
-        /// </summary>
-        /// <param name="path">The path of the directory to be deleted.</param>
-        /// <returns><c>true</c> if the directory was deleted; <c>false</c> if the directory did not exist.</returns>
-        Task<bool> TryDeleteDirectoryAsync(string path);
-
-        /// <summary>
-        /// Renames or moves a file to another location in the file store.
-        /// </summary>
-        /// <param name="oldPath">The path of the file to be renamed/moved.</param>
-        /// <param name="newPath">The new path of the file after the rename/move.</param>
-        /// <exception cref="FileStoreException">Thrown if the specified file does not exist or if the <paramref name="newPath"/> path already exists.</exception>
-        Task MoveFileAsync(string oldPath, string newPath);
-
-        /// <summary>
-        /// Creates a copy of a file in the file store.
-        /// </summary>
-        /// <param name="srcPath">The path of the source file to be copied.</param>
-        /// <param name="dstPath">The path of the destination file to be created.</param>
-        /// <exception cref="FileStoreException">Thrown if the specified file does not exist or if the <paramref name="dstPath"/> path already exists.</exception>
-        Task CopyFileAsync(string srcPath, string dstPath);
-
-        /// <summary>
-        /// Creates a stream to read the contents of a file in the file store.
-        /// </summary>
-        /// <param name="path">The path of the file to be read.</param>
-        /// <returns>An instance of <see cref="System.IO.Stream"/> that can be used to read the contents of the file. The caller must close the stream when finished.</returns>
-        /// <exception cref="FileStoreException">Thrown if the specified file does not exist.</exception>
-        Task<Stream> GetFileStreamAsync(string path);
-
-        /// <summary>
-        /// Creates a stream to read the contents of a file in the file store.
-        /// </summary>
-        /// <param name="fileStoreEntry">The IFileStoreEntry to be read.</param>
-        /// <returns>An instance of <see cref="System.IO.Stream"/> that can be used to read the contents of the file. The caller must close the stream when finished.</returns>
-        /// <exception cref="FileStoreException">Thrown if the specified file does not exist.</exception>
-        Task<Stream> GetFileStreamAsync(IFileStoreEntry fileStoreEntry);
-
-        /// <summary>
-        /// Creates a new file in the file store from the contents of an input stream.
-        /// </summary>
-        /// <param name="path">The path of the file to be created.</param>
-        /// <param name="inputStream">The stream whose contents to write to the new file.</param>
-        /// <param name="overwrite"><c>true</c> to overwrite if a file already exists; <c>false</c> to throw an exception if the file already exists.</param>
-        /// <exception cref="FileStoreException">Thrown if the specified file already exists and <paramref name="overwrite"/> was not set to <c>true</c>, or if the specified path exists but is not a file.</exception>
-        /// <remarks>
-        /// If the specified path contains one or more directories, then those directories are
-        /// created if they do not already exist.
-        /// </remarks>
-        Task<string> CreateFileFromStreamAsync(string path, Stream inputStream, bool overwrite = false);
-    }
+    IAsyncEnumerable<IFileStoreEntry> GetDirectoryContentAsync(string path = null, bool includeSubDirectories = false);
+
+    /// <summary>
+    /// Creates a directory in the file store if it doesn't already exist.
+    /// </summary>
+    /// <param name="path">The path of the directory to be created.</param>
+    /// <returns><c>true</c> if the directory was created; <c>false</c> if the directory already existed.</returns>
+    /// <exception cref="FileStoreException">Thrown if the specified path exists but is not a directory.</exception>
+    Task<bool> TryCreateDirectoryAsync(string path);
+
+    /// <summary>
+    /// Deletes a file in the file store if it exists.
+    /// </summary>
+    /// <param name="path">The path of the file to be deleted.</param>
+    /// <returns><c>true</c> if the file was deleted; <c>false</c> if the file did not exist.</returns>
+    Task<bool> TryDeleteFileAsync(string path);
+
+    /// <summary>
+    /// Deletes a directory in the file store if it exists.
+    /// </summary>
+    /// <param name="path">The path of the directory to be deleted.</param>
+    /// <returns><c>true</c> if the directory was deleted; <c>false</c> if the directory did not exist.</returns>
+    Task<bool> TryDeleteDirectoryAsync(string path);
+
+    /// <summary>
+    /// Renames or moves a file to another location in the file store.
+    /// </summary>
+    /// <param name="oldPath">The path of the file to be renamed/moved.</param>
+    /// <param name="newPath">The new path of the file after the rename/move.</param>
+    /// <exception cref="FileStoreException">Thrown if the specified file does not exist or if the <paramref name="newPath"/> path already exists.</exception>
+    Task MoveFileAsync(string oldPath, string newPath);
+
+    /// <summary>
+    /// Creates a copy of a file in the file store.
+    /// </summary>
+    /// <param name="srcPath">The path of the source file to be copied.</param>
+    /// <param name="dstPath">The path of the destination file to be created.</param>
+    /// <exception cref="FileStoreException">Thrown if the specified file does not exist or if the <paramref name="dstPath"/> path already exists.</exception>
+    Task CopyFileAsync(string srcPath, string dstPath);
+
+    /// <summary>
+    /// Creates a stream to read the contents of a file in the file store.
+    /// </summary>
+    /// <param name="path">The path of the file to be read.</param>
+    /// <returns>An instance of <see cref="System.IO.Stream"/> that can be used to read the contents of the file. The caller must close the stream when finished.</returns>
+    /// <exception cref="FileStoreException">Thrown if the specified file does not exist.</exception>
+    Task<Stream> GetFileStreamAsync(string path);
+
+    /// <summary>
+    /// Creates a stream to read the contents of a file in the file store.
+    /// </summary>
+    /// <param name="fileStoreEntry">The IFileStoreEntry to be read.</param>
+    /// <returns>An instance of <see cref="System.IO.Stream"/> that can be used to read the contents of the file. The caller must close the stream when finished.</returns>
+    /// <exception cref="FileStoreException">Thrown if the specified file does not exist.</exception>
+    Task<Stream> GetFileStreamAsync(IFileStoreEntry fileStoreEntry);
 
-    public static class IFileStoreExtensions
+    /// <summary>
+    /// Creates a new file in the file store from the contents of an input stream.
+    /// </summary>
+    /// <param name="path">The path of the file to be created.</param>
+    /// <param name="inputStream">The stream whose contents to write to the new file.</param>
+    /// <param name="overwrite"><c>true</c> to overwrite if a file already exists; <c>false</c> to throw an exception if the file already exists.</param>
+    /// <exception cref="FileStoreException">Thrown if the specified file already exists and <paramref name="overwrite"/> was not set to <c>true</c>, or if the specified path exists but is not a file.</exception>
+    /// <remarks>
+    /// If the specified path contains one or more directories, then those directories are
+    /// created if they do not already exist.
+    /// </remarks>
+    Task<string> CreateFileFromStreamAsync(string path, Stream inputStream, bool overwrite = false);
+}
+
+public static class IFileStoreExtensions
+{
+    private readonly static char[] _pathSeparators = ['\\', '/'];
+    private readonly static char[] _trimChars = ['/', ' '];
+
+    /// <summary>
+    /// Combines multiple path parts using the path delimiter semantics of the abstract virtual file store.
+    /// </summary>
+    /// <param name="fileStore">The <see cref="IFileStore"/>.</param>
+    /// <param name="paths">The path parts to combine.</param>
+    /// <returns>The full combined path.</returns>
+    public static string Combine(this IFileStore fileStore, params string[] paths)
     {
-        private readonly static char[] _pathSeparators = ['\\', '/'];
-        private readonly static char[] _trimChars = ['/', ' '];
-
-        /// <summary>
-        /// Combines multiple path parts using the path delimiter semantics of the abstract virtual file store.
-        /// </summary>
-        /// <param name="fileStore">The <see cref="IFileStore"/>.</param>
-        /// <param name="paths">The path parts to combine.</param>
-        /// <returns>The full combined path.</returns>
-        public static string Combine(this IFileStore fileStore, params string[] paths)
-        {
-            if (paths.Length == 0)
-                return null;
+        if (paths.Length == 0)
+            return null;
 
-            var normalizedParts =
-                paths
-                    .Select(x => fileStore.NormalizePath(x))
-                    .Where(x => !string.IsNullOrEmpty(x));
+        var normalizedParts =
+            paths
+                .Select(x => fileStore.NormalizePath(x))
+                .Where(x => !string.IsNullOrEmpty(x));
 
-            var combined = string.Join("/", normalizedParts);
+        var combined = string.Join("/", normalizedParts);
 
-            // Preserve the initial '/' if it's present.
-            if (paths[0]?.StartsWith('/') == true)
-                combined = "/" + combined;
+        // Preserve the initial '/' if it's present.
+        if (paths[0]?.StartsWith('/') == true)
+            combined = "/" + combined;
 
-            return combined;
-        }
+        return combined;
+    }
 
-        /// <summary>
-        /// Normalizes a path using the path delimiter semantics of the abstract virtual file store.
-        /// </summary>
-        /// <remarks>
-        /// Backslash is converted to forward slash and any leading or trailing slashes
-        /// are removed.
-        /// </remarks>
-        public static string NormalizePath(this IFileStore _, string path)
+    /// <summary>
+    /// Normalizes a path using the path delimiter semantics of the abstract virtual file store.
+    /// </summary>
+    /// <remarks>
+    /// Backslash is converted to forward slash and any leading or trailing slashes
+    /// are removed.
+    /// </remarks>
+    public static string NormalizePath(this IFileStore _, string path)
+    {
+        if (path == null)
         {
-            if (path == null)
-            {
-                return null;
-            }
-
-            return path.Replace('\\', '/').Trim(_trimChars);
+            return null;
         }
 
-        /// <summary>
-        /// Normalizes a path using the path delimiter semantics of the abstract virtual file store and
-        /// escapes each part of the path to be usable in an URI.
-        /// </summary>
-        /// <remarks>
-        /// Backslash is converted to forward slash and any leading or trailing slashes
-        /// are removed. Each part of the path will be escaped by using <c>Uri.EscapeDataString</c>.
-        /// </remarks>
-        public static string NormalizeAndEscapePath(this IFileStore _, string path)
+        return path.Replace('\\', '/').Trim(_trimChars);
+    }
+
+    /// <summary>
+    /// Normalizes a path using the path delimiter semantics of the abstract virtual file store and
+    /// escapes each part of the path to be usable in an URI.
+    /// </summary>
+    /// <remarks>
+    /// Backslash is converted to forward slash and any leading or trailing slashes
+    /// are removed. Each part of the path will be escaped by using <c>Uri.EscapeDataString</c>.
+    /// </remarks>
+    public static string NormalizeAndEscapePath(this IFileStore _, string path)
+    {
+        if (path == null)
         {
-            if (path == null)
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var normalizedParts = path
-                    .Split(_pathSeparators, StringSplitOptions.RemoveEmptyEntries)
-                    .Select(Uri.EscapeDataString);
+        var normalizedParts = path
+                .Split(_pathSeparators, StringSplitOptions.RemoveEmptyEntries)
+                .Select(Uri.EscapeDataString);
 
-            return string.Join('/', normalizedParts);
-        }
+        return string.Join('/', normalizedParts);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.FileStorage.Abstractions/IFileStoreCache.cs b/src/OrchardCore/OrchardCore.FileStorage.Abstractions/IFileStoreCache.cs
index 1adffcb2ff4..e5293891f21 100644
--- a/src/OrchardCore/OrchardCore.FileStorage.Abstractions/IFileStoreCache.cs
+++ b/src/OrchardCore/OrchardCore.FileStorage.Abstractions/IFileStoreCache.cs
@@ -2,14 +2,13 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace OrchardCore.FileStorage
+namespace OrchardCore.FileStorage;
+
+/// <summary>
+/// Cache a file store.
+/// </summary>
+public interface IFileStoreCache
 {
-    /// <summary>
-    /// Cache a file store.
-    /// </summary>
-    public interface IFileStoreCache
-    {
-        Task<bool> IsCachedAsync(string path);
-        Task SetCacheAsync(Stream stream, IFileStoreEntry fileStoreEntry, CancellationToken cancellationToken);
-    }
+    Task<bool> IsCachedAsync(string path);
+    Task SetCacheAsync(Stream stream, IFileStoreEntry fileStoreEntry, CancellationToken cancellationToken);
 }
diff --git a/src/OrchardCore/OrchardCore.FileStorage.Abstractions/IFileStoreEntry.cs b/src/OrchardCore/OrchardCore.FileStorage.Abstractions/IFileStoreEntry.cs
index db73b7ba0ab..ecdd51fa01d 100644
--- a/src/OrchardCore/OrchardCore.FileStorage.Abstractions/IFileStoreEntry.cs
+++ b/src/OrchardCore/OrchardCore.FileStorage.Abstractions/IFileStoreEntry.cs
@@ -1,40 +1,39 @@
 using System;
 
-namespace OrchardCore.FileStorage
+namespace OrchardCore.FileStorage;
+
+/// <summary>
+/// Represents an abstract entry (file or directory) in a virtual file store.
+/// </summary>
+public interface IFileStoreEntry
 {
     /// <summary>
-    /// Represents an abstract entry (file or directory) in a virtual file store.
+    /// Gets the full path of the file store entry within the file store.
     /// </summary>
-    public interface IFileStoreEntry
-    {
-        /// <summary>
-        /// Gets the full path of the file store entry within the file store.
-        /// </summary>
-        string Path { get; }
+    string Path { get; }
 
-        /// <summary>
-        /// Gets the name of the file store entry.
-        /// </summary>
-        string Name { get; }
+    /// <summary>
+    /// Gets the name of the file store entry.
+    /// </summary>
+    string Name { get; }
 
-        /// <summary>
-        /// Gets the full path of the file store entry's containing directory within the file store.
-        /// </summary>
-        string DirectoryPath { get; }
+    /// <summary>
+    /// Gets the full path of the file store entry's containing directory within the file store.
+    /// </summary>
+    string DirectoryPath { get; }
 
-        /// <summary>
-        /// Gets the length of the file (0 if the file store entry is a directory).
-        /// </summary>
-        long Length { get; }
+    /// <summary>
+    /// Gets the length of the file (0 if the file store entry is a directory).
+    /// </summary>
+    long Length { get; }
 
-        /// <summary>
-        /// Gets the date and time in UTC when the file store entry was last modified.
-        /// </summary>
-        DateTime LastModifiedUtc { get; }
+    /// <summary>
+    /// Gets the date and time in UTC when the file store entry was last modified.
+    /// </summary>
+    DateTime LastModifiedUtc { get; }
 
-        /// <summary>
-        /// Gets a boolean indicating whether the file store entry is a directory.
-        /// </summary>
-        bool IsDirectory { get; }
-    }
+    /// <summary>
+    /// Gets a boolean indicating whether the file store entry is a directory.
+    /// </summary>
+    bool IsDirectory { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.FileStorage.AzureBlob/BlobDirectory.cs b/src/OrchardCore/OrchardCore.FileStorage.AzureBlob/BlobDirectory.cs
index 73fa4ef697d..489668dbd51 100644
--- a/src/OrchardCore/OrchardCore.FileStorage.AzureBlob/BlobDirectory.cs
+++ b/src/OrchardCore/OrchardCore.FileStorage.AzureBlob/BlobDirectory.cs
@@ -1,34 +1,33 @@
 using System;
 
-namespace OrchardCore.FileStorage.AzureBlob
+namespace OrchardCore.FileStorage.AzureBlob;
+
+public class BlobDirectory : IFileStoreEntry
 {
-    public class BlobDirectory : IFileStoreEntry
-    {
-        private readonly string _path;
-        private readonly DateTime _lastModifiedUtc;
-        private readonly string _name;
-        private readonly string _directoryPath;
+    private readonly string _path;
+    private readonly DateTime _lastModifiedUtc;
+    private readonly string _name;
+    private readonly string _directoryPath;
 
-        public BlobDirectory(string path, DateTime lastModifiedUtc)
-        {
-            _path = path;
-            _lastModifiedUtc = lastModifiedUtc;
+    public BlobDirectory(string path, DateTime lastModifiedUtc)
+    {
+        _path = path;
+        _lastModifiedUtc = lastModifiedUtc;
 
-            // Use GetFileName rather than GetDirectoryName as GetDirectoryName requires a delimiter.
-            _name = System.IO.Path.GetFileName(path);
-            _directoryPath = _path.Length > _name.Length ? _path[..^(_name.Length + 1)] : "";
-        }
+        // Use GetFileName rather than GetDirectoryName as GetDirectoryName requires a delimiter.
+        _name = System.IO.Path.GetFileName(path);
+        _directoryPath = _path.Length > _name.Length ? _path[..^(_name.Length + 1)] : "";
+    }
 
-        public string Path => _path;
+    public string Path => _path;
 
-        public string Name => _name;
+    public string Name => _name;
 
-        public string DirectoryPath => _directoryPath;
+    public string DirectoryPath => _directoryPath;
 
-        public long Length => 0;
+    public long Length => 0;
 
-        public DateTime LastModifiedUtc => _lastModifiedUtc;
+    public DateTime LastModifiedUtc => _lastModifiedUtc;
 
-        public bool IsDirectory => true;
-    }
+    public bool IsDirectory => true;
 }
diff --git a/src/OrchardCore/OrchardCore.FileStorage.AzureBlob/BlobFile.cs b/src/OrchardCore/OrchardCore.FileStorage.AzureBlob/BlobFile.cs
index 346b971b346..9c41423ee81 100644
--- a/src/OrchardCore/OrchardCore.FileStorage.AzureBlob/BlobFile.cs
+++ b/src/OrchardCore/OrchardCore.FileStorage.AzureBlob/BlobFile.cs
@@ -1,44 +1,43 @@
 using System;
 
-namespace OrchardCore.FileStorage.AzureBlob
+namespace OrchardCore.FileStorage.AzureBlob;
+
+public class BlobFile : IFileStoreEntry
 {
-    public class BlobFile : IFileStoreEntry
+    private readonly string _path;
+    private readonly string _name;
+    private readonly string _directoryPath;
+    private readonly long? _length;
+    private readonly DateTimeOffset? _lastModified;
+
+    public BlobFile(string path, long? length, DateTimeOffset? lastModified)
     {
-        private readonly string _path;
-        private readonly string _name;
-        private readonly string _directoryPath;
-        private readonly long? _length;
-        private readonly DateTimeOffset? _lastModified;
+        _path = path;
+        _name = System.IO.Path.GetFileName(_path);
 
-        public BlobFile(string path, long? length, DateTimeOffset? lastModified)
+        // File is in root Directory.
+        if (_name == _path)
+        {
+            _directoryPath = "";
+        }
+        else
         {
-            _path = path;
-            _name = System.IO.Path.GetFileName(_path);
-
-            // File is in root Directory.
-            if (_name == _path)
-            {
-                _directoryPath = "";
-            }
-            else
-            {
-                _directoryPath = _path[..^(_name.Length + 1)];
-            }
-
-            _length = length;
-            _lastModified = lastModified;
+            _directoryPath = _path[..^(_name.Length + 1)];
         }
 
-        public string Path => _path;
+        _length = length;
+        _lastModified = lastModified;
+    }
 
-        public string Name => _name;
+    public string Path => _path;
 
-        public string DirectoryPath => _directoryPath;
+    public string Name => _name;
 
-        public long Length => _length.GetValueOrDefault();
+    public string DirectoryPath => _directoryPath;
 
-        public DateTime LastModifiedUtc => _lastModified.GetValueOrDefault().UtcDateTime;
+    public long Length => _length.GetValueOrDefault();
 
-        public bool IsDirectory => false;
-    }
+    public DateTime LastModifiedUtc => _lastModified.GetValueOrDefault().UtcDateTime;
+
+    public bool IsDirectory => false;
 }
diff --git a/src/OrchardCore/OrchardCore.FileStorage.AzureBlob/BlobFileStore.cs b/src/OrchardCore/OrchardCore.FileStorage.AzureBlob/BlobFileStore.cs
index f0112535093..48f7ff683b4 100644
--- a/src/OrchardCore/OrchardCore.FileStorage.AzureBlob/BlobFileStore.cs
+++ b/src/OrchardCore/OrchardCore.FileStorage.AzureBlob/BlobFileStore.cs
@@ -10,454 +10,453 @@
 using Microsoft.AspNetCore.StaticFiles;
 using OrchardCore.Modules;
 
-namespace OrchardCore.FileStorage.AzureBlob
+namespace OrchardCore.FileStorage.AzureBlob;
+
+/// <summary>
+/// Provides an <see cref="IFileStore"/> implementation that targets an underlying Azure Blob Storage account.
+/// </summary>
+/// <remarks>
+/// Azure Blob Storage has very different semantics for directories compared to a local file system, and
+/// some special consideration is required for make this provider conform to the semantics of the
+/// <see cref="IFileStore"/> interface and behave in an expected way.
+///
+/// Directories have no physical manifestation in blob storage; we can obtain a reference to them, but
+/// that reference can be created regardless of whether the directory exists, and it can only be used
+/// as a scoping container to operate on blobs within that directory namespace.
+///
+/// As a consequence, this provider generally behaves as if any given directory always exists. To
+/// simulate "creating" a directory (which cannot technically be done in blob storage) this provider creates
+/// a marker file inside the directory, which makes the directory "exist" and appear when listing contents
+/// subsequently. This marker file is ignored (excluded) when listing directory contents.
+///
+/// Note that the Blob Container is not created automatically, and existence of the Container is not verified.
+///
+/// Create the Blob Container before enabling a Blob File Store.
+///
+/// Azure Blog Storage will create the BasePath inside the container during the upload of the first file.
+/// </remarks>
+public class BlobFileStore : IFileStore
 {
-    /// <summary>
-    /// Provides an <see cref="IFileStore"/> implementation that targets an underlying Azure Blob Storage account.
-    /// </summary>
-    /// <remarks>
-    /// Azure Blob Storage has very different semantics for directories compared to a local file system, and
-    /// some special consideration is required for make this provider conform to the semantics of the
-    /// <see cref="IFileStore"/> interface and behave in an expected way.
-    ///
-    /// Directories have no physical manifestation in blob storage; we can obtain a reference to them, but
-    /// that reference can be created regardless of whether the directory exists, and it can only be used
-    /// as a scoping container to operate on blobs within that directory namespace.
-    ///
-    /// As a consequence, this provider generally behaves as if any given directory always exists. To
-    /// simulate "creating" a directory (which cannot technically be done in blob storage) this provider creates
-    /// a marker file inside the directory, which makes the directory "exist" and appear when listing contents
-    /// subsequently. This marker file is ignored (excluded) when listing directory contents.
-    ///
-    /// Note that the Blob Container is not created automatically, and existence of the Container is not verified.
-    ///
-    /// Create the Blob Container before enabling a Blob File Store.
-    ///
-    /// Azure Blog Storage will create the BasePath inside the container during the upload of the first file.
-    /// </remarks>
-    public class BlobFileStore : IFileStore
-    {
-        private static readonly byte[] MarkerFileContent = "This is a directory marker file used by Orchard Core."u8.ToArray();
-        private const string DirectoryMarkerFileName = "OrchardCore.Media.txt";
+    private static readonly byte[] MarkerFileContent = "This is a directory marker file used by Orchard Core."u8.ToArray();
+    private const string DirectoryMarkerFileName = "OrchardCore.Media.txt";
 
-        private readonly BlobStorageOptions _options;
-        private readonly IClock _clock;
-        private readonly BlobContainerClient _blobContainer;
-        private readonly IContentTypeProvider _contentTypeProvider;
-        private readonly string _basePrefix;
+    private readonly BlobStorageOptions _options;
+    private readonly IClock _clock;
+    private readonly BlobContainerClient _blobContainer;
+    private readonly IContentTypeProvider _contentTypeProvider;
+    private readonly string _basePrefix;
 
-        public BlobFileStore(BlobStorageOptions options, IClock clock, IContentTypeProvider contentTypeProvider)
-        {
-            _options = options;
-            _clock = clock;
-            _contentTypeProvider = contentTypeProvider;
+    public BlobFileStore(BlobStorageOptions options, IClock clock, IContentTypeProvider contentTypeProvider)
+    {
+        _options = options;
+        _clock = clock;
+        _contentTypeProvider = contentTypeProvider;
 
-            _blobContainer = new BlobContainerClient(_options.ConnectionString, _options.ContainerName);
+        _blobContainer = new BlobContainerClient(_options.ConnectionString, _options.ContainerName);
 
-            if (!string.IsNullOrEmpty(_options.BasePath))
-            {
-                _basePrefix = NormalizePrefix(_options.BasePath);
-            }
+        if (!string.IsNullOrEmpty(_options.BasePath))
+        {
+            _basePrefix = NormalizePrefix(_options.BasePath);
         }
+    }
 
-        public async Task<IFileStoreEntry> GetFileInfoAsync(string path)
+    public async Task<IFileStoreEntry> GetFileInfoAsync(string path)
+    {
+        try
         {
-            try
-            {
-                var blob = GetBlobReference(path);
+            var blob = GetBlobReference(path);
 
-                var properties = await blob.GetPropertiesAsync();
+            var properties = await blob.GetPropertiesAsync();
 
-                return new BlobFile(path, properties.Value.ContentLength, properties.Value.LastModified);
-            }
-            catch (RequestFailedException ex) when (ex.ErrorCode == BlobErrorCode.BlobNotFound)
-            {
-                // Instead of ExistsAsync() check which is 'slow' if we're expecting to find the blob we rely on the exception.
-                return null;
-            }
-            catch (Exception ex)
-            {
-                throw new FileStoreException($"Cannot get file info with path '{path}'.", ex);
-            }
+            return new BlobFile(path, properties.Value.ContentLength, properties.Value.LastModified);
+        }
+        catch (RequestFailedException ex) when (ex.ErrorCode == BlobErrorCode.BlobNotFound)
+        {
+            // Instead of ExistsAsync() check which is 'slow' if we're expecting to find the blob we rely on the exception.
+            return null;
+        }
+        catch (Exception ex)
+        {
+            throw new FileStoreException($"Cannot get file info with path '{path}'.", ex);
         }
+    }
 
-        public async Task<IFileStoreEntry> GetDirectoryInfoAsync(string path)
+    public async Task<IFileStoreEntry> GetDirectoryInfoAsync(string path)
+    {
+        try
         {
-            try
+            if (path == string.Empty)
             {
-                if (path == string.Empty)
-                {
-                    return new BlobDirectory(path, _clock.UtcNow);
-                }
+                return new BlobDirectory(path, _clock.UtcNow);
+            }
 
-                var blobDirectory = await GetBlobDirectoryReference(path);
+            var blobDirectory = await GetBlobDirectoryReference(path);
 
-                if (blobDirectory != null)
-                {
-                    return new BlobDirectory(path, _clock.UtcNow);
-                }
-
-                return null;
-            }
-            catch (Exception ex)
+            if (blobDirectory != null)
             {
-                throw new FileStoreException($"Cannot get directory info with path '{path}'.", ex);
+                return new BlobDirectory(path, _clock.UtcNow);
             }
+
+            return null;
         }
+        catch (Exception ex)
+        {
+            throw new FileStoreException($"Cannot get directory info with path '{path}'.", ex);
+        }
+    }
 
-        public IAsyncEnumerable<IFileStoreEntry> GetDirectoryContentAsync(string path = null, bool includeSubDirectories = false)
+    public IAsyncEnumerable<IFileStoreEntry> GetDirectoryContentAsync(string path = null, bool includeSubDirectories = false)
+    {
+        try
         {
-            try
+            if (includeSubDirectories)
             {
-                if (includeSubDirectories)
-                {
-                    return GetDirectoryContentFlatAsync(path);
-                }
-                else
-                {
-                    return GetDirectoryContentByHierarchyAsync(path);
-                }
+                return GetDirectoryContentFlatAsync(path);
             }
-            catch (Exception ex)
+            else
             {
-                throw new FileStoreException($"Cannot get directory content with path '{path}'.", ex);
+                return GetDirectoryContentByHierarchyAsync(path);
             }
         }
-
-        private async IAsyncEnumerable<IFileStoreEntry> GetDirectoryContentByHierarchyAsync(string path = null)
+        catch (Exception ex)
         {
-            var prefix = this.Combine(_basePrefix, path);
-            prefix = NormalizePrefix(prefix);
-
-            var page = _blobContainer.GetBlobsByHierarchyAsync(BlobTraits.Metadata, BlobStates.None, "/", prefix);
-
-            await foreach (var blob in page)
-            {
-                if (blob.IsPrefix)
-                {
-                    var folderPath = blob.Prefix;
-                    if (!string.IsNullOrEmpty(_basePrefix))
-                    {
-                        folderPath = folderPath[(_basePrefix.Length - 1)..];
-                    }
-
-                    folderPath = folderPath.Trim('/');
-                    yield return new BlobDirectory(folderPath, _clock.UtcNow);
-                }
-                else
-                {
-                    var itemName = Path.GetFileName(WebUtility.UrlDecode(blob.Blob.Name)).Trim('/');
-
-                    // Ignore directory marker files.
-                    if (itemName != DirectoryMarkerFileName)
-                    {
-                        var itemPath = this.Combine(path?.Trim('/'), itemName);
-                        yield return new BlobFile(itemPath, blob.Blob.Properties.ContentLength, blob.Blob.Properties.LastModified);
-                    }
-                }
-            }
+            throw new FileStoreException($"Cannot get directory content with path '{path}'.", ex);
         }
+    }
 
-        private async IAsyncEnumerable<IFileStoreEntry> GetDirectoryContentFlatAsync(string path = null)
-        {
-            // Folders are considered case sensitive in blob storage.
-            var directories = new HashSet<string>();
+    private async IAsyncEnumerable<IFileStoreEntry> GetDirectoryContentByHierarchyAsync(string path = null)
+    {
+        var prefix = this.Combine(_basePrefix, path);
+        prefix = NormalizePrefix(prefix);
 
-            var prefix = this.Combine(_basePrefix, path);
-            prefix = NormalizePrefix(prefix);
+        var page = _blobContainer.GetBlobsByHierarchyAsync(BlobTraits.Metadata, BlobStates.None, "/", prefix);
 
-            var page = _blobContainer.GetBlobsAsync(BlobTraits.Metadata, BlobStates.None, prefix);
-            await foreach (var blob in page)
+        await foreach (var blob in page)
+        {
+            if (blob.IsPrefix)
             {
-                var name = WebUtility.UrlDecode(blob.Name);
-
-                // A flat blob listing does not return a folder hierarchy.
-                // We can infer a hierarchy by examining the paths returned for the file contents
-                // and evaluate whether a directory exists and should be added to the results listing.
-                var directory = Path.GetDirectoryName(name);
-
-                // Strip base folder from directory name.
+                var folderPath = blob.Prefix;
                 if (!string.IsNullOrEmpty(_basePrefix))
                 {
-                    directory = directory[(_basePrefix.Length - 1)..];
+                    folderPath = folderPath[(_basePrefix.Length - 1)..];
                 }
 
-                // Do not include root folder, or current path, or multiple folders in folder listing.
-                if (!string.IsNullOrEmpty(directory) &&
-                    !directories.Contains(directory) &&
-                    (string.IsNullOrEmpty(path) ||
-                    !directory.EndsWith(path)))
-                {
-                    directories.Add(directory);
-                    yield return new BlobDirectory(directory, _clock.UtcNow);
-                }
+                folderPath = folderPath.Trim('/');
+                yield return new BlobDirectory(folderPath, _clock.UtcNow);
+            }
+            else
+            {
+                var itemName = Path.GetFileName(WebUtility.UrlDecode(blob.Blob.Name)).Trim('/');
 
                 // Ignore directory marker files.
-                if (!name.EndsWith(DirectoryMarkerFileName))
+                if (itemName != DirectoryMarkerFileName)
                 {
-                    if (!string.IsNullOrEmpty(_basePrefix))
-                    {
-                        name = name[(_basePrefix.Length - 1)..];
-                    }
-                    yield return new BlobFile(name.Trim('/'), blob.Properties.ContentLength, blob.Properties.LastModified);
+                    var itemPath = this.Combine(path?.Trim('/'), itemName);
+                    yield return new BlobFile(itemPath, blob.Blob.Properties.ContentLength, blob.Blob.Properties.LastModified);
                 }
             }
         }
+    }
 
-        public async Task<bool> TryCreateDirectoryAsync(string path)
-        {
-            // Since directories are only created implicitly when creating blobs, we
-            // simply pretend like we created the directory, unless there is already
-            // a blob with the same path.
-            try
-            {
-                var blobFile = GetBlobReference(path);
+    private async IAsyncEnumerable<IFileStoreEntry> GetDirectoryContentFlatAsync(string path = null)
+    {
+        // Folders are considered case sensitive in blob storage.
+        var directories = new HashSet<string>();
 
-                if (await blobFile.ExistsAsync())
-                {
-                    throw new FileStoreException($"Cannot create directory because the path '{path}' already exists and is a file.");
-                }
+        var prefix = this.Combine(_basePrefix, path);
+        prefix = NormalizePrefix(prefix);
 
-                var blobDirectory = await GetBlobDirectoryReference(path);
-                if (blobDirectory == null)
-                {
-                    await CreateDirectoryAsync(path);
-                }
+        var page = _blobContainer.GetBlobsAsync(BlobTraits.Metadata, BlobStates.None, prefix);
+        await foreach (var blob in page)
+        {
+            var name = WebUtility.UrlDecode(blob.Name);
+
+            // A flat blob listing does not return a folder hierarchy.
+            // We can infer a hierarchy by examining the paths returned for the file contents
+            // and evaluate whether a directory exists and should be added to the results listing.
+            var directory = Path.GetDirectoryName(name);
 
-                return true;
+            // Strip base folder from directory name.
+            if (!string.IsNullOrEmpty(_basePrefix))
+            {
+                directory = directory[(_basePrefix.Length - 1)..];
             }
-            catch (FileStoreException)
+
+            // Do not include root folder, or current path, or multiple folders in folder listing.
+            if (!string.IsNullOrEmpty(directory) &&
+                !directories.Contains(directory) &&
+                (string.IsNullOrEmpty(path) ||
+                !directory.EndsWith(path)))
             {
-                throw;
+                directories.Add(directory);
+                yield return new BlobDirectory(directory, _clock.UtcNow);
             }
-            catch (Exception ex)
+
+            // Ignore directory marker files.
+            if (!name.EndsWith(DirectoryMarkerFileName))
             {
-                throw new FileStoreException($"Cannot create directory '{path}'.", ex);
+                if (!string.IsNullOrEmpty(_basePrefix))
+                {
+                    name = name[(_basePrefix.Length - 1)..];
+                }
+                yield return new BlobFile(name.Trim('/'), blob.Properties.ContentLength, blob.Properties.LastModified);
             }
         }
+    }
 
-        public async Task<bool> TryDeleteFileAsync(string path)
+    public async Task<bool> TryCreateDirectoryAsync(string path)
+    {
+        // Since directories are only created implicitly when creating blobs, we
+        // simply pretend like we created the directory, unless there is already
+        // a blob with the same path.
+        try
         {
-            try
-            {
-                var blob = GetBlobReference(path);
+            var blobFile = GetBlobReference(path);
 
-                return await blob.DeleteIfExistsAsync();
+            if (await blobFile.ExistsAsync())
+            {
+                throw new FileStoreException($"Cannot create directory because the path '{path}' already exists and is a file.");
             }
-            catch (Exception ex)
+
+            var blobDirectory = await GetBlobDirectoryReference(path);
+            if (blobDirectory == null)
             {
-                throw new FileStoreException($"Cannot delete file '{path}'.", ex);
+                await CreateDirectoryAsync(path);
             }
-        }
 
-        public async Task<bool> TryDeleteDirectoryAsync(string path)
+            return true;
+        }
+        catch (FileStoreException)
         {
-            try
-            {
-                if (string.IsNullOrEmpty(path))
-                {
-                    throw new FileStoreException("Cannot delete the root directory.");
-                }
+            throw;
+        }
+        catch (Exception ex)
+        {
+            throw new FileStoreException($"Cannot create directory '{path}'.", ex);
+        }
+    }
 
-                var blobsWereDeleted = false;
-                var prefix = this.Combine(_basePrefix, path);
-                prefix = NormalizePrefix(prefix);
+    public async Task<bool> TryDeleteFileAsync(string path)
+    {
+        try
+        {
+            var blob = GetBlobReference(path);
 
-                var page = _blobContainer.GetBlobsAsync(BlobTraits.Metadata, BlobStates.None, prefix);
-                await foreach (var blob in page)
-                {
-                    var blobReference = _blobContainer.GetBlobClient(blob.Name);
-                    await blobReference.DeleteIfExistsAsync(DeleteSnapshotsOption.IncludeSnapshots);
-                    blobsWereDeleted = true;
-                }
+            return await blob.DeleteIfExistsAsync();
+        }
+        catch (Exception ex)
+        {
+            throw new FileStoreException($"Cannot delete file '{path}'.", ex);
+        }
+    }
 
-                return blobsWereDeleted;
-            }
-            catch (FileStoreException)
+    public async Task<bool> TryDeleteDirectoryAsync(string path)
+    {
+        try
+        {
+            if (string.IsNullOrEmpty(path))
             {
-                throw;
+                throw new FileStoreException("Cannot delete the root directory.");
             }
-            catch (Exception ex)
+
+            var blobsWereDeleted = false;
+            var prefix = this.Combine(_basePrefix, path);
+            prefix = NormalizePrefix(prefix);
+
+            var page = _blobContainer.GetBlobsAsync(BlobTraits.Metadata, BlobStates.None, prefix);
+            await foreach (var blob in page)
             {
-                throw new FileStoreException($"Cannot delete directory '{path}'.", ex);
+                var blobReference = _blobContainer.GetBlobClient(blob.Name);
+                await blobReference.DeleteIfExistsAsync(DeleteSnapshotsOption.IncludeSnapshots);
+                blobsWereDeleted = true;
             }
+
+            return blobsWereDeleted;
         }
+        catch (FileStoreException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            throw new FileStoreException($"Cannot delete directory '{path}'.", ex);
+        }
+    }
 
-        public async Task MoveFileAsync(string oldPath, string newPath)
+    public async Task MoveFileAsync(string oldPath, string newPath)
+    {
+        try
         {
-            try
-            {
-                await CopyFileAsync(oldPath, newPath);
-                await TryDeleteFileAsync(oldPath);
-            }
-            catch (Exception ex)
-            {
-                throw new FileStoreException($"Cannot move file '{oldPath}' to '{newPath}'.", ex);
-            }
+            await CopyFileAsync(oldPath, newPath);
+            await TryDeleteFileAsync(oldPath);
         }
+        catch (Exception ex)
+        {
+            throw new FileStoreException($"Cannot move file '{oldPath}' to '{newPath}'.", ex);
+        }
+    }
 
-        public async Task CopyFileAsync(string srcPath, string dstPath)
+    public async Task CopyFileAsync(string srcPath, string dstPath)
+    {
+        try
         {
-            try
+            if (srcPath == dstPath)
             {
-                if (srcPath == dstPath)
-                {
-                    throw new ArgumentException($"The values for {nameof(srcPath)} and {nameof(dstPath)} must not be the same.");
-                }
-
-                var oldBlob = GetBlobReference(srcPath);
-                var newBlob = GetBlobReference(dstPath);
-
-                if (!await oldBlob.ExistsAsync())
-                {
-                    throw new FileStoreException($"Cannot copy file '{srcPath}' because it does not exist.");
-                }
-
-                if (await newBlob.ExistsAsync())
-                {
-                    throw new FileStoreException($"Cannot copy file '{srcPath}' because a file already exists in the new path '{dstPath}'.");
-                }
-
-                await newBlob.StartCopyFromUriAsync(oldBlob.Uri);
-
-                await Task.Delay(250);
-                var properties = await newBlob.GetPropertiesAsync();
-
-                while (properties.Value.CopyStatus == CopyStatus.Pending)
-                {
-                    await Task.Delay(250);
+                throw new ArgumentException($"The values for {nameof(srcPath)} and {nameof(dstPath)} must not be the same.");
+            }
 
-                    // Need to fetch properties or CopyStatus will never update.
-                    properties = await newBlob.GetPropertiesAsync();
-                }
+            var oldBlob = GetBlobReference(srcPath);
+            var newBlob = GetBlobReference(dstPath);
 
-                if (properties.Value.CopyStatus != CopyStatus.Success)
-                {
-                    throw new FileStoreException($"Error while copying file '{srcPath}'; copy operation failed with status {properties.Value.CopyStatus} and description {properties.Value.CopyStatusDescription}.");
-                }
-            }
-            catch (FileStoreException)
+            if (!await oldBlob.ExistsAsync())
             {
-                throw;
+                throw new FileStoreException($"Cannot copy file '{srcPath}' because it does not exist.");
             }
-            catch (Exception ex)
+
+            if (await newBlob.ExistsAsync())
             {
-                throw new FileStoreException($"Cannot copy file '{srcPath}' to '{dstPath}'.", ex);
+                throw new FileStoreException($"Cannot copy file '{srcPath}' because a file already exists in the new path '{dstPath}'.");
             }
-        }
 
-        public async Task<Stream> GetFileStreamAsync(string path)
-        {
-            try
-            {
-                var blob = GetBlobReference(path);
+            await newBlob.StartCopyFromUriAsync(oldBlob.Uri);
 
-                if (!await blob.ExistsAsync())
-                {
-                    throw new FileStoreException($"Cannot get file stream because the file '{path}' does not exist.");
-                }
+            await Task.Delay(250);
+            var properties = await newBlob.GetPropertiesAsync();
 
-                return (await blob.DownloadAsync()).Value.Content;
-            }
-            catch (FileStoreException)
+            while (properties.Value.CopyStatus == CopyStatus.Pending)
             {
-                throw;
+                await Task.Delay(250);
+
+                // Need to fetch properties or CopyStatus will never update.
+                properties = await newBlob.GetPropertiesAsync();
             }
-            catch (Exception ex)
+
+            if (properties.Value.CopyStatus != CopyStatus.Success)
             {
-                throw new FileStoreException($"Cannot get file stream of the file '{path}'.", ex);
+                throw new FileStoreException($"Error while copying file '{srcPath}'; copy operation failed with status {properties.Value.CopyStatus} and description {properties.Value.CopyStatusDescription}.");
             }
         }
-
-        // Reduces the need to call blob.FetchAttributes, and blob.ExistsAsync,
-        // as Azure Storage Library will perform these actions on OpenReadAsync().
-        public Task<Stream> GetFileStreamAsync(IFileStoreEntry fileStoreEntry)
+        catch (FileStoreException)
+        {
+            throw;
+        }
+        catch (Exception ex)
         {
-            return GetFileStreamAsync(fileStoreEntry.Path);
+            throw new FileStoreException($"Cannot copy file '{srcPath}' to '{dstPath}'.", ex);
         }
+    }
 
-        public async Task<string> CreateFileFromStreamAsync(string path, Stream inputStream, bool overwrite = false)
+    public async Task<Stream> GetFileStreamAsync(string path)
+    {
+        try
         {
-            try
-            {
-                var blob = GetBlobReference(path);
+            var blob = GetBlobReference(path);
 
-                if (!overwrite && await blob.ExistsAsync())
-                {
-                    throw new FileStoreException($"Cannot create file '{path}' because it already exists.");
-                }
+            if (!await blob.ExistsAsync())
+            {
+                throw new FileStoreException($"Cannot get file stream because the file '{path}' does not exist.");
+            }
 
-                _contentTypeProvider.TryGetContentType(path, out var contentType);
+            return (await blob.DownloadAsync()).Value.Content;
+        }
+        catch (FileStoreException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            throw new FileStoreException($"Cannot get file stream of the file '{path}'.", ex);
+        }
+    }
 
-                var headers = new BlobHttpHeaders
-                {
-                    ContentType = contentType ?? "application/octet-stream"
-                };
+    // Reduces the need to call blob.FetchAttributes, and blob.ExistsAsync,
+    // as Azure Storage Library will perform these actions on OpenReadAsync().
+    public Task<Stream> GetFileStreamAsync(IFileStoreEntry fileStoreEntry)
+    {
+        return GetFileStreamAsync(fileStoreEntry.Path);
+    }
 
-                await blob.UploadAsync(inputStream, headers);
+    public async Task<string> CreateFileFromStreamAsync(string path, Stream inputStream, bool overwrite = false)
+    {
+        try
+        {
+            var blob = GetBlobReference(path);
 
-                return path;
-            }
-            catch (FileStoreException)
+            if (!overwrite && await blob.ExistsAsync())
             {
-                throw;
+                throw new FileStoreException($"Cannot create file '{path}' because it already exists.");
             }
-            catch (Exception ex)
+
+            _contentTypeProvider.TryGetContentType(path, out var contentType);
+
+            var headers = new BlobHttpHeaders
             {
-                throw new FileStoreException($"Cannot create file '{path}'.", ex);
-            }
-        }
+                ContentType = contentType ?? "application/octet-stream"
+            };
 
-        private BlobClient GetBlobReference(string path)
-        {
-            var blobPath = this.Combine(_options.BasePath, path);
-            var blob = _blobContainer.GetBlobClient(blobPath);
+            await blob.UploadAsync(inputStream, headers);
 
-            return blob;
+            return path;
         }
-
-        private async Task<BlobHierarchyItem> GetBlobDirectoryReference(string path)
+        catch (FileStoreException)
         {
-            var prefix = this.Combine(_basePrefix, path);
-            prefix = NormalizePrefix(prefix);
+            throw;
+        }
+        catch (Exception ex)
+        {
+            throw new FileStoreException($"Cannot create file '{path}'.", ex);
+        }
+    }
 
-            // Directory exists if path contains any files.
-            var page = _blobContainer.GetBlobsByHierarchyAsync(BlobTraits.Metadata, BlobStates.None, "/", prefix);
+    private BlobClient GetBlobReference(string path)
+    {
+        var blobPath = this.Combine(_options.BasePath, path);
+        var blob = _blobContainer.GetBlobClient(blobPath);
 
-            var enumerator = page.GetAsyncEnumerator();
+        return blob;
+    }
 
-            var result = await enumerator.MoveNextAsync();
-            if (result)
-            {
-                return enumerator.Current;
-            }
+    private async Task<BlobHierarchyItem> GetBlobDirectoryReference(string path)
+    {
+        var prefix = this.Combine(_basePrefix, path);
+        prefix = NormalizePrefix(prefix);
 
-            return null;
-        }
+        // Directory exists if path contains any files.
+        var page = _blobContainer.GetBlobsByHierarchyAsync(BlobTraits.Metadata, BlobStates.None, "/", prefix);
 
-        private async Task CreateDirectoryAsync(string path)
-        {
-            var placeholderBlob = GetBlobReference(this.Combine(path, DirectoryMarkerFileName));
+        var enumerator = page.GetAsyncEnumerator();
 
-            // Create a directory marker file to make this directory appear when listing directories.
-            using var stream = new MemoryStream(MarkerFileContent);
-            await placeholderBlob.UploadAsync(stream);
+        var result = await enumerator.MoveNextAsync();
+        if (result)
+        {
+            return enumerator.Current;
         }
 
-        /// <summary>
-        /// Blob prefix requires a trailing slash except when loading the root of the container.
-        /// </summary>
-        private static string NormalizePrefix(string prefix)
+        return null;
+    }
+
+    private async Task CreateDirectoryAsync(string path)
+    {
+        var placeholderBlob = GetBlobReference(this.Combine(path, DirectoryMarkerFileName));
+
+        // Create a directory marker file to make this directory appear when listing directories.
+        using var stream = new MemoryStream(MarkerFileContent);
+        await placeholderBlob.UploadAsync(stream);
+    }
+
+    /// <summary>
+    /// Blob prefix requires a trailing slash except when loading the root of the container.
+    /// </summary>
+    private static string NormalizePrefix(string prefix)
+    {
+        prefix = prefix.Trim('/') + '/';
+        if (prefix.Length == 1)
         {
-            prefix = prefix.Trim('/') + '/';
-            if (prefix.Length == 1)
-            {
-                return string.Empty;
-            }
-            else
-            {
-                return prefix;
-            }
+            return string.Empty;
+        }
+        else
+        {
+            return prefix;
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.FileStorage.AzureBlob/BlobStorageOptions.cs b/src/OrchardCore/OrchardCore.FileStorage.AzureBlob/BlobStorageOptions.cs
index 2b94e2c8971..fd2d4f627fd 100644
--- a/src/OrchardCore/OrchardCore.FileStorage.AzureBlob/BlobStorageOptions.cs
+++ b/src/OrchardCore/OrchardCore.FileStorage.AzureBlob/BlobStorageOptions.cs
@@ -1,28 +1,27 @@
-namespace OrchardCore.FileStorage.AzureBlob
+namespace OrchardCore.FileStorage.AzureBlob;
+
+public abstract class BlobStorageOptions
 {
-    public abstract class BlobStorageOptions
-    {
-        /// <summary>
-        /// The Azure Blob connection string.
-        /// </summary>
-        public string ConnectionString { get; set; }
+    /// <summary>
+    /// The Azure Blob connection string.
+    /// </summary>
+    public string ConnectionString { get; set; }
 
-        /// <summary>
-        /// The Azure Blob container name.
-        /// </summary>
-        public string ContainerName { get; set; }
+    /// <summary>
+    /// The Azure Blob container name.
+    /// </summary>
+    public string ContainerName { get; set; }
 
-        /// <summary>
-        /// The base directory path to use inside the container for this store's content.
-        /// </summary>
-        public string BasePath { get; set; } = "";
+    /// <summary>
+    /// The base directory path to use inside the container for this store's content.
+    /// </summary>
+    public string BasePath { get; set; } = "";
 
-        /// <summary>
-        /// Returns a value indicating whether the basic state of the configuration is valid.
-        /// </summary>
-        public virtual bool IsConfigured()
-        {
-            return !string.IsNullOrEmpty(ConnectionString) && !string.IsNullOrEmpty(ContainerName);
-        }
+    /// <summary>
+    /// Returns a value indicating whether the basic state of the configuration is valid.
+    /// </summary>
+    public virtual bool IsConfigured()
+    {
+        return !string.IsNullOrEmpty(ConnectionString) && !string.IsNullOrEmpty(ContainerName);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.FileStorage.FileSystem/FileSystemStore.cs b/src/OrchardCore/OrchardCore.FileStorage.FileSystem/FileSystemStore.cs
index f98b3f784be..6e72407ad84 100644
--- a/src/OrchardCore/OrchardCore.FileStorage.FileSystem/FileSystemStore.cs
+++ b/src/OrchardCore/OrchardCore.FileStorage.FileSystem/FileSystemStore.cs
@@ -5,357 +5,356 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.FileProviders.Physical;
 
-namespace OrchardCore.FileStorage.FileSystem
+namespace OrchardCore.FileStorage.FileSystem;
+
+public class FileSystemStore : IFileStore
 {
-    public class FileSystemStore : IFileStore
-    {
-        private readonly string _fileSystemPath;
+    private readonly string _fileSystemPath;
 
-        public FileSystemStore(string fileSystemPath)
-        {
-            _fileSystemPath = Path.GetFullPath(fileSystemPath);
-        }
+    public FileSystemStore(string fileSystemPath)
+    {
+        _fileSystemPath = Path.GetFullPath(fileSystemPath);
+    }
 
-        public Task<IFileStoreEntry> GetFileInfoAsync(string path)
+    public Task<IFileStoreEntry> GetFileInfoAsync(string path)
+    {
+        try
         {
-            try
-            {
-                var physicalPath = GetPhysicalPath(path);
+            var physicalPath = GetPhysicalPath(path);
 
-                var fileInfo = new PhysicalFileInfo(new FileInfo(physicalPath));
+            var fileInfo = new PhysicalFileInfo(new FileInfo(physicalPath));
 
-                if (fileInfo.Exists)
-                {
-                    return Task.FromResult<IFileStoreEntry>(new FileSystemStoreEntry(path, fileInfo));
-                }
-
-                return Task.FromResult<IFileStoreEntry>(null);
-            }
-            catch (Exception ex)
+            if (fileInfo.Exists)
             {
-                throw new FileStoreException($"Cannot get file info with path '{path}'.", ex);
+                return Task.FromResult<IFileStoreEntry>(new FileSystemStoreEntry(path, fileInfo));
             }
-        }
 
-        public Task<IFileStoreEntry> GetDirectoryInfoAsync(string path)
+            return Task.FromResult<IFileStoreEntry>(null);
+        }
+        catch (Exception ex)
         {
-            try
-            {
-                var physicalPath = GetPhysicalPath(path);
+            throw new FileStoreException($"Cannot get file info with path '{path}'.", ex);
+        }
+    }
 
-                var directoryInfo = new PhysicalDirectoryInfo(new DirectoryInfo(physicalPath));
+    public Task<IFileStoreEntry> GetDirectoryInfoAsync(string path)
+    {
+        try
+        {
+            var physicalPath = GetPhysicalPath(path);
 
-                if (directoryInfo.Exists)
-                {
-                    return Task.FromResult<IFileStoreEntry>(new FileSystemStoreEntry(path, directoryInfo));
-                }
+            var directoryInfo = new PhysicalDirectoryInfo(new DirectoryInfo(physicalPath));
 
-                return Task.FromResult<IFileStoreEntry>(null);
-            }
-            catch (Exception ex)
+            if (directoryInfo.Exists)
             {
-                throw new FileStoreException($"Cannot get directory info with path '{path}'.", ex);
+                return Task.FromResult<IFileStoreEntry>(new FileSystemStoreEntry(path, directoryInfo));
             }
-        }
 
-        public IAsyncEnumerable<IFileStoreEntry> GetDirectoryContentAsync(string path = null, bool includeSubDirectories = false)
+            return Task.FromResult<IFileStoreEntry>(null);
+        }
+        catch (Exception ex)
         {
-            try
-            {
-                var physicalPath = GetPhysicalPath(path);
-                var results = new List<IFileStoreEntry>();
-
-                if (!Directory.Exists(physicalPath))
-                {
-                    return results.ToAsyncEnumerable();
-                }
-
-                // Add directories.
-                results.AddRange(
-                    Directory
-                        .GetDirectories(physicalPath, "*", includeSubDirectories ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly)
-                        .Select(f =>
-                        {
-                            var fileSystemInfo = new PhysicalDirectoryInfo(new DirectoryInfo(f));
-                            var fileRelativePath = f[_fileSystemPath.Length..];
-                            var filePath = this.NormalizePath(fileRelativePath);
-                            return new FileSystemStoreEntry(filePath, fileSystemInfo);
-                        }));
-
-                // Add files.
-                results.AddRange(
-                    Directory
-                        .GetFiles(physicalPath, "*", includeSubDirectories ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly)
-                        .Select(f =>
-                        {
-                            var fileSystemInfo = new PhysicalFileInfo(new FileInfo(f));
-                            var fileRelativePath = f[_fileSystemPath.Length..];
-                            var filePath = this.NormalizePath(fileRelativePath);
-                            return new FileSystemStoreEntry(filePath, fileSystemInfo);
-                        }));
-
-                return results.ToAsyncEnumerable();
-            }
-            catch (Exception ex)
-            {
-                throw new FileStoreException($"Cannot get directory content with path '{path}'.", ex);
-            }
+            throw new FileStoreException($"Cannot get directory info with path '{path}'.", ex);
         }
+    }
 
-        public Task<bool> TryCreateDirectoryAsync(string path)
+    public IAsyncEnumerable<IFileStoreEntry> GetDirectoryContentAsync(string path = null, bool includeSubDirectories = false)
+    {
+        try
         {
-            try
-            {
-                var physicalPath = GetPhysicalPath(path);
+            var physicalPath = GetPhysicalPath(path);
+            var results = new List<IFileStoreEntry>();
 
-                if (File.Exists(physicalPath))
-                {
-                    throw new FileStoreException($"Cannot create directory because the path '{path}' already exists and is a file.");
-                }
-
-                if (Directory.Exists(physicalPath))
-                {
-                    return Task.FromResult(false);
-                }
-
-                Directory.CreateDirectory(physicalPath);
-
-                return Task.FromResult(true);
-            }
-            catch (FileStoreException)
+            if (!Directory.Exists(physicalPath))
             {
-                throw;
-            }
-            catch (Exception ex)
-            {
-                throw new FileStoreException($"Cannot create directory '{path}'.", ex);
+                return results.ToAsyncEnumerable();
             }
-        }
 
-        public Task<bool> TryDeleteFileAsync(string path)
+            // Add directories.
+            results.AddRange(
+                Directory
+                    .GetDirectories(physicalPath, "*", includeSubDirectories ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly)
+                    .Select(f =>
+                    {
+                        var fileSystemInfo = new PhysicalDirectoryInfo(new DirectoryInfo(f));
+                        var fileRelativePath = f[_fileSystemPath.Length..];
+                        var filePath = this.NormalizePath(fileRelativePath);
+                        return new FileSystemStoreEntry(filePath, fileSystemInfo);
+                    }));
+
+            // Add files.
+            results.AddRange(
+                Directory
+                    .GetFiles(physicalPath, "*", includeSubDirectories ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly)
+                    .Select(f =>
+                    {
+                        var fileSystemInfo = new PhysicalFileInfo(new FileInfo(f));
+                        var fileRelativePath = f[_fileSystemPath.Length..];
+                        var filePath = this.NormalizePath(fileRelativePath);
+                        return new FileSystemStoreEntry(filePath, fileSystemInfo);
+                    }));
+
+            return results.ToAsyncEnumerable();
+        }
+        catch (Exception ex)
         {
-            try
-            {
-                var physicalPath = GetPhysicalPath(path);
-
-                if (!File.Exists(physicalPath))
-                {
-                    return Task.FromResult(false);
-                }
-
-                File.Delete(physicalPath);
-
-                return Task.FromResult(true);
-            }
-            catch (Exception ex)
-            {
-                throw new FileStoreException($"Cannot delete file '{path}'.", ex);
-            }
+            throw new FileStoreException($"Cannot get directory content with path '{path}'.", ex);
         }
+    }
 
-        public Task<bool> TryDeleteDirectoryAsync(string path)
+    public Task<bool> TryCreateDirectoryAsync(string path)
+    {
+        try
         {
-            try
-            {
-                var physicalPath = GetPhysicalPath(path);
+            var physicalPath = GetPhysicalPath(path);
 
-                if (!Directory.Exists(physicalPath))
-                {
-                    return Task.FromResult(false);
-                }
-
-                Directory.Delete(physicalPath, recursive: true);
-
-                return Task.FromResult(true);
-            }
-            catch (Exception ex)
+            if (File.Exists(physicalPath))
             {
-                throw new FileStoreException($"Cannot delete directory '{path}'.", ex);
+                throw new FileStoreException($"Cannot create directory because the path '{path}' already exists and is a file.");
             }
-        }
 
-        public Task MoveFileAsync(string oldPath, string newPath)
-        {
-            try
+            if (Directory.Exists(physicalPath))
             {
-                var physicalOldPath = GetPhysicalPath(oldPath);
-
-                if (!File.Exists(physicalOldPath))
-                {
-                    throw new FileStoreException($"Cannot move file '{oldPath}' because it does not exist.");
-                }
+                return Task.FromResult(false);
+            }
 
-                var physicalNewPath = GetPhysicalPath(newPath);
+            Directory.CreateDirectory(physicalPath);
 
-                if (File.Exists(physicalNewPath) || Directory.Exists(physicalNewPath))
-                {
-                    throw new FileStoreException($"Cannot move file because the new path '{newPath}' already exists.");
-                }
+            return Task.FromResult(true);
+        }
+        catch (FileStoreException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            throw new FileStoreException($"Cannot create directory '{path}'.", ex);
+        }
+    }
 
-                File.Move(physicalOldPath, physicalNewPath);
+    public Task<bool> TryDeleteFileAsync(string path)
+    {
+        try
+        {
+            var physicalPath = GetPhysicalPath(path);
 
-                return Task.CompletedTask;
-            }
-            catch (FileStoreException)
-            {
-                throw;
-            }
-            catch (Exception ex)
+            if (!File.Exists(physicalPath))
             {
-                throw new FileStoreException($"Cannot move file '{oldPath}' to '{newPath}'.", ex);
+                return Task.FromResult(false);
             }
+
+            File.Delete(physicalPath);
+
+            return Task.FromResult(true);
         }
+        catch (Exception ex)
+        {
+            throw new FileStoreException($"Cannot delete file '{path}'.", ex);
+        }
+    }
 
-        public Task CopyFileAsync(string srcPath, string dstPath)
+    public Task<bool> TryDeleteDirectoryAsync(string path)
+    {
+        try
         {
-            try
-            {
-                var physicalSrcPath = GetPhysicalPath(srcPath);
+            var physicalPath = GetPhysicalPath(path);
 
-                if (!File.Exists(physicalSrcPath))
-                {
-                    throw new FileStoreException($"The file '{srcPath}' does not exist.");
-                }
+            if (!Directory.Exists(physicalPath))
+            {
+                return Task.FromResult(false);
+            }
 
-                var physicalDstPath = GetPhysicalPath(dstPath);
+            Directory.Delete(physicalPath, recursive: true);
 
-                if (File.Exists(physicalDstPath) || Directory.Exists(physicalDstPath))
-                {
-                    throw new FileStoreException($"Cannot copy file because the destination path '{dstPath}' already exists.");
-                }
+            return Task.FromResult(true);
+        }
+        catch (Exception ex)
+        {
+            throw new FileStoreException($"Cannot delete directory '{path}'.", ex);
+        }
+    }
 
-                File.Copy(GetPhysicalPath(srcPath), GetPhysicalPath(dstPath));
+    public Task MoveFileAsync(string oldPath, string newPath)
+    {
+        try
+        {
+            var physicalOldPath = GetPhysicalPath(oldPath);
 
-                return Task.CompletedTask;
-            }
-            catch (FileStoreException)
+            if (!File.Exists(physicalOldPath))
             {
-                throw;
+                throw new FileStoreException($"Cannot move file '{oldPath}' because it does not exist.");
             }
-            catch (Exception ex)
+
+            var physicalNewPath = GetPhysicalPath(newPath);
+
+            if (File.Exists(physicalNewPath) || Directory.Exists(physicalNewPath))
             {
-                throw new FileStoreException($"Cannot copy file '{srcPath}' to '{dstPath}'.", ex);
+                throw new FileStoreException($"Cannot move file because the new path '{newPath}' already exists.");
             }
-        }
 
-        public Task<Stream> GetFileStreamAsync(string path)
-        {
-            try
-            {
-                var physicalPath = GetPhysicalPath(path);
+            File.Move(physicalOldPath, physicalNewPath);
 
-                if (!File.Exists(physicalPath))
-                {
-                    throw new FileStoreException($"Cannot get file stream because the file '{path}' does not exist.");
-                }
+            return Task.CompletedTask;
+        }
+        catch (FileStoreException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            throw new FileStoreException($"Cannot move file '{oldPath}' to '{newPath}'.", ex);
+        }
+    }
 
-                var stream = File.OpenRead(physicalPath);
+    public Task CopyFileAsync(string srcPath, string dstPath)
+    {
+        try
+        {
+            var physicalSrcPath = GetPhysicalPath(srcPath);
 
-                return Task.FromResult<Stream>(stream);
-            }
-            catch (FileStoreException)
+            if (!File.Exists(physicalSrcPath))
             {
-                throw;
+                throw new FileStoreException($"The file '{srcPath}' does not exist.");
             }
-            catch (Exception ex)
+
+            var physicalDstPath = GetPhysicalPath(dstPath);
+
+            if (File.Exists(physicalDstPath) || Directory.Exists(physicalDstPath))
             {
-                throw new FileStoreException($"Cannot get file stream of the file '{path}'.", ex);
+                throw new FileStoreException($"Cannot copy file because the destination path '{dstPath}' already exists.");
             }
-        }
 
-        public Task<Stream> GetFileStreamAsync(IFileStoreEntry fileStoreEntry)
+            File.Copy(GetPhysicalPath(srcPath), GetPhysicalPath(dstPath));
+
+            return Task.CompletedTask;
+        }
+        catch (FileStoreException)
         {
-            try
-            {
-                var physicalPath = GetPhysicalPath(fileStoreEntry.Path);
-                if (!File.Exists(physicalPath))
-                {
-                    throw new FileStoreException($"Cannot get file stream because the file '{fileStoreEntry.Path}' does not exist.");
-                }
+            throw;
+        }
+        catch (Exception ex)
+        {
+            throw new FileStoreException($"Cannot copy file '{srcPath}' to '{dstPath}'.", ex);
+        }
+    }
 
-                var stream = File.OpenRead(physicalPath);
+    public Task<Stream> GetFileStreamAsync(string path)
+    {
+        try
+        {
+            var physicalPath = GetPhysicalPath(path);
 
-                return Task.FromResult<Stream>(stream);
-            }
-            catch (FileStoreException)
+            if (!File.Exists(physicalPath))
             {
-                throw;
-            }
-            catch (Exception ex)
-            {
-                throw new FileStoreException($"Cannot get file stream of the file '{fileStoreEntry.Path}'.", ex);
+                throw new FileStoreException($"Cannot get file stream because the file '{path}' does not exist.");
             }
+
+            var stream = File.OpenRead(physicalPath);
+
+            return Task.FromResult<Stream>(stream);
         }
+        catch (FileStoreException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            throw new FileStoreException($"Cannot get file stream of the file '{path}'.", ex);
+        }
+    }
 
-        public async Task<string> CreateFileFromStreamAsync(string path, Stream inputStream, bool overwrite = false)
+    public Task<Stream> GetFileStreamAsync(IFileStoreEntry fileStoreEntry)
+    {
+        try
         {
-            try
+            var physicalPath = GetPhysicalPath(fileStoreEntry.Path);
+            if (!File.Exists(physicalPath))
             {
-                var physicalPath = GetPhysicalPath(path);
-
-                if (!overwrite && File.Exists(physicalPath))
-                {
-                    throw new FileStoreException($"Cannot create file '{path}' because it already exists.");
-                }
+                throw new FileStoreException($"Cannot get file stream because the file '{fileStoreEntry.Path}' does not exist.");
+            }
 
-                if (Directory.Exists(physicalPath))
-                {
-                    throw new FileStoreException($"Cannot create file '{path}' because it already exists as a directory.");
-                }
+            var stream = File.OpenRead(physicalPath);
 
-                // Create directory path if it doesn't exist.
-                var physicalDirectoryPath = Path.GetDirectoryName(physicalPath);
-                Directory.CreateDirectory(physicalDirectoryPath);
+            return Task.FromResult<Stream>(stream);
+        }
+        catch (FileStoreException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            throw new FileStoreException($"Cannot get file stream of the file '{fileStoreEntry.Path}'.", ex);
+        }
+    }
 
-                var fileInfo = new FileInfo(physicalPath);
-                using (var outputStream = fileInfo.Create())
-                {
-                    await inputStream.CopyToAsync(outputStream);
-                }
+    public async Task<string> CreateFileFromStreamAsync(string path, Stream inputStream, bool overwrite = false)
+    {
+        try
+        {
+            var physicalPath = GetPhysicalPath(path);
 
-                return path;
+            if (!overwrite && File.Exists(physicalPath))
+            {
+                throw new FileStoreException($"Cannot create file '{path}' because it already exists.");
             }
-            catch (FileStoreException)
+
+            if (Directory.Exists(physicalPath))
             {
-                throw;
+                throw new FileStoreException($"Cannot create file '{path}' because it already exists as a directory.");
             }
-            catch (Exception ex)
+
+            // Create directory path if it doesn't exist.
+            var physicalDirectoryPath = Path.GetDirectoryName(physicalPath);
+            Directory.CreateDirectory(physicalDirectoryPath);
+
+            var fileInfo = new FileInfo(physicalPath);
+            using (var outputStream = fileInfo.Create())
             {
-                throw new FileStoreException($"Cannot create file '{path}'.", ex);
+                await inputStream.CopyToAsync(outputStream);
             }
-        }
 
-        /// <summary>
-        /// Translates a relative path in the virtual file store to a physical path in the underlying file system.
-        /// </summary>
-        /// <param name="path">The relative path within the file store.</param>
-        /// <returns></returns>
-        /// <remarks>The resulting physical path is verified to be inside designated root file system path.</remarks>
-        private string GetPhysicalPath(string path)
+            return path;
+        }
+        catch (FileStoreException)
         {
-            try
-            {
-                path = this.NormalizePath(path);
+            throw;
+        }
+        catch (Exception ex)
+        {
+            throw new FileStoreException($"Cannot create file '{path}'.", ex);
+        }
+    }
 
-                var physicalPath = string.IsNullOrEmpty(path) ? _fileSystemPath : Path.Combine(_fileSystemPath, path);
+    /// <summary>
+    /// Translates a relative path in the virtual file store to a physical path in the underlying file system.
+    /// </summary>
+    /// <param name="path">The relative path within the file store.</param>
+    /// <returns></returns>
+    /// <remarks>The resulting physical path is verified to be inside designated root file system path.</remarks>
+    private string GetPhysicalPath(string path)
+    {
+        try
+        {
+            path = this.NormalizePath(path);
 
-                // Verify that the resulting path is inside the root file system path.
-                var pathIsAllowed = Path.GetFullPath(physicalPath).StartsWith(_fileSystemPath, StringComparison.OrdinalIgnoreCase);
-                if (!pathIsAllowed)
-                {
-                    throw new FileStoreException($"The path '{path}' resolves to a physical path outside the file system store root.");
-                }
+            var physicalPath = string.IsNullOrEmpty(path) ? _fileSystemPath : Path.Combine(_fileSystemPath, path);
 
-                return physicalPath;
-            }
-            catch (FileStoreException)
+            // Verify that the resulting path is inside the root file system path.
+            var pathIsAllowed = Path.GetFullPath(physicalPath).StartsWith(_fileSystemPath, StringComparison.OrdinalIgnoreCase);
+            if (!pathIsAllowed)
             {
-                throw;
-            }
-            catch (Exception ex)
-            {
-                throw new FileStoreException($"Cannot resolve physical path with the path '{path}'.", ex);
+                throw new FileStoreException($"The path '{path}' resolves to a physical path outside the file system store root.");
             }
+
+            return physicalPath;
+        }
+        catch (FileStoreException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            throw new FileStoreException($"Cannot resolve physical path with the path '{path}'.", ex);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.FileStorage.FileSystem/FileSystemStoreEntry.cs b/src/OrchardCore/OrchardCore.FileStorage.FileSystem/FileSystemStoreEntry.cs
index d5e423927fc..2e3d40acc34 100644
--- a/src/OrchardCore/OrchardCore.FileStorage.FileSystem/FileSystemStoreEntry.cs
+++ b/src/OrchardCore/OrchardCore.FileStorage.FileSystem/FileSystemStoreEntry.cs
@@ -1,27 +1,26 @@
 using System;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.FileStorage.FileSystem
-{
-    public class FileSystemStoreEntry : IFileStoreEntry
-    {
-        private readonly IFileInfo _fileInfo;
-        private readonly string _path;
+namespace OrchardCore.FileStorage.FileSystem;
 
-        internal FileSystemStoreEntry(string path, IFileInfo fileInfo)
-        {
-            ArgumentNullException.ThrowIfNull(path);
-            ArgumentNullException.ThrowIfNull(fileInfo);
+public class FileSystemStoreEntry : IFileStoreEntry
+{
+    private readonly IFileInfo _fileInfo;
+    private readonly string _path;
 
-            _fileInfo = fileInfo;
-            _path = path;
-        }
+    internal FileSystemStoreEntry(string path, IFileInfo fileInfo)
+    {
+        ArgumentNullException.ThrowIfNull(path);
+        ArgumentNullException.ThrowIfNull(fileInfo);
 
-        public string Path => _path;
-        public string Name => _fileInfo.Name;
-        public string DirectoryPath => _path[..^Name.Length].TrimEnd('/');
-        public DateTime LastModifiedUtc => _fileInfo.LastModified.UtcDateTime;
-        public long Length => _fileInfo.Length;
-        public bool IsDirectory => _fileInfo.IsDirectory;
+        _fileInfo = fileInfo;
+        _path = path;
     }
+
+    public string Path => _path;
+    public string Name => _fileInfo.Name;
+    public string DirectoryPath => _path[..^Name.Length].TrimEnd('/');
+    public DateTime LastModifiedUtc => _fileInfo.LastModified.UtcDateTime;
+    public long Length => _fileInfo.Length;
+    public bool IsDirectory => _fileInfo.IsDirectory;
 }
diff --git a/src/OrchardCore/OrchardCore.Indexing.Abstractions/BuildFieldIndexContext.cs b/src/OrchardCore/OrchardCore.Indexing.Abstractions/BuildFieldIndexContext.cs
index 3bb122fa77a..6dff635f2ba 100644
--- a/src/OrchardCore/OrchardCore.Indexing.Abstractions/BuildFieldIndexContext.cs
+++ b/src/OrchardCore/OrchardCore.Indexing.Abstractions/BuildFieldIndexContext.cs
@@ -2,25 +2,24 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.Indexing
+namespace OrchardCore.Indexing;
+
+public class BuildFieldIndexContext : BuildPartIndexContext
 {
-    public class BuildFieldIndexContext : BuildPartIndexContext
+    public BuildFieldIndexContext(
+        DocumentIndex documentIndex,
+        ContentItem contentItem,
+        IList<string> keys,
+        ContentPart contentPart,
+        ContentTypePartDefinition typePartDefinition,
+        ContentPartFieldDefinition partFieldDefinition,
+        IContentIndexSettings settings)
+        : base(documentIndex, contentItem, keys, typePartDefinition, settings)
     {
-        public BuildFieldIndexContext(
-            DocumentIndex documentIndex,
-            ContentItem contentItem,
-            IList<string> keys,
-            ContentPart contentPart,
-            ContentTypePartDefinition typePartDefinition,
-            ContentPartFieldDefinition partFieldDefinition,
-            IContentIndexSettings settings)
-            : base(documentIndex, contentItem, keys, typePartDefinition, settings)
-        {
-            ContentPartFieldDefinition = partFieldDefinition;
-            ContentPart = contentPart;
-        }
-
-        public ContentPart ContentPart { get; }
-        public ContentPartFieldDefinition ContentPartFieldDefinition { get; }
+        ContentPartFieldDefinition = partFieldDefinition;
+        ContentPart = contentPart;
     }
+
+    public ContentPart ContentPart { get; }
+    public ContentPartFieldDefinition ContentPartFieldDefinition { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Indexing.Abstractions/BuildIndexContext.cs b/src/OrchardCore/OrchardCore.Indexing.Abstractions/BuildIndexContext.cs
index 0260768e9d7..8879628cea3 100644
--- a/src/OrchardCore/OrchardCore.Indexing.Abstractions/BuildIndexContext.cs
+++ b/src/OrchardCore/OrchardCore.Indexing.Abstractions/BuildIndexContext.cs
@@ -1,26 +1,25 @@
 using System.Collections.Generic;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Indexing
+namespace OrchardCore.Indexing;
+
+public class BuildIndexContext
 {
-    public class BuildIndexContext
+    public BuildIndexContext(
+        DocumentIndex documentIndex,
+        ContentItem contentItem,
+        IList<string> keys,
+        IContentIndexSettings settings
+    )
     {
-        public BuildIndexContext(
-            DocumentIndex documentIndex,
-            ContentItem contentItem,
-            IList<string> keys,
-            IContentIndexSettings settings
-        )
-        {
-            ContentItem = contentItem;
-            DocumentIndex = documentIndex;
-            Keys = keys;
-            Settings = settings;
-        }
-
-        public IList<string> Keys { get; }
-        public ContentItem ContentItem { get; }
-        public DocumentIndex DocumentIndex { get; }
-        public IContentIndexSettings Settings { get; }
+        ContentItem = contentItem;
+        DocumentIndex = documentIndex;
+        Keys = keys;
+        Settings = settings;
     }
+
+    public IList<string> Keys { get; }
+    public ContentItem ContentItem { get; }
+    public DocumentIndex DocumentIndex { get; }
+    public IContentIndexSettings Settings { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Indexing.Abstractions/BuildPartIndexContext.cs b/src/OrchardCore/OrchardCore.Indexing.Abstractions/BuildPartIndexContext.cs
index 6b4a482f30a..ec7ee122bbf 100644
--- a/src/OrchardCore/OrchardCore.Indexing.Abstractions/BuildPartIndexContext.cs
+++ b/src/OrchardCore/OrchardCore.Indexing.Abstractions/BuildPartIndexContext.cs
@@ -2,21 +2,20 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.Indexing
+namespace OrchardCore.Indexing;
+
+public class BuildPartIndexContext : BuildIndexContext
 {
-    public class BuildPartIndexContext : BuildIndexContext
+    public BuildPartIndexContext(
+        DocumentIndex documentIndex,
+        ContentItem contentItem,
+        IList<string> keys,
+        ContentTypePartDefinition typePartDefinition,
+        IContentIndexSettings settings)
+        : base(documentIndex, contentItem, keys, settings)
     {
-        public BuildPartIndexContext(
-            DocumentIndex documentIndex,
-            ContentItem contentItem,
-            IList<string> keys,
-            ContentTypePartDefinition typePartDefinition,
-            IContentIndexSettings settings)
-            : base(documentIndex, contentItem, keys, settings)
-        {
-            ContentTypePartDefinition = typePartDefinition;
-        }
-
-        public ContentTypePartDefinition ContentTypePartDefinition { get; }
+        ContentTypePartDefinition = typePartDefinition;
     }
+
+    public ContentTypePartDefinition ContentTypePartDefinition { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Indexing.Abstractions/ContentFieldIndexHandler.cs b/src/OrchardCore/OrchardCore.Indexing.Abstractions/ContentFieldIndexHandler.cs
index 5485fd3bd5d..a354f9b7bb2 100644
--- a/src/OrchardCore/OrchardCore.Indexing.Abstractions/ContentFieldIndexHandler.cs
+++ b/src/OrchardCore/OrchardCore.Indexing.Abstractions/ContentFieldIndexHandler.cs
@@ -4,56 +4,55 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.Indexing
+namespace OrchardCore.Indexing;
+
+/// <summary>
+/// An implementation of <see cref="ContentFieldIndexHandler&lt;TField&gt;"/> is able to take part in the rendering of
+/// a <see typeparamref="TField"/> instance.
+/// </summary>
+public abstract class ContentFieldIndexHandler<TField> : IContentFieldIndexHandler where TField : ContentField
 {
-    /// <summary>
-    /// An implementation of <see cref="ContentFieldIndexHandler&lt;TField&gt;"/> is able to take part in the rendering of
-    /// a <see typeparamref="TField"/> instance.
-    /// </summary>
-    public abstract class ContentFieldIndexHandler<TField> : IContentFieldIndexHandler where TField : ContentField
+    Task IContentFieldIndexHandler.BuildIndexAsync(
+        ContentPart contentPart,
+        ContentTypePartDefinition typePartDefinition,
+        ContentPartFieldDefinition partFieldDefinition,
+        BuildIndexContext context,
+        IContentIndexSettings settings)
     {
-        Task IContentFieldIndexHandler.BuildIndexAsync(
-            ContentPart contentPart,
-            ContentTypePartDefinition typePartDefinition,
-            ContentPartFieldDefinition partFieldDefinition,
-            BuildIndexContext context,
-            IContentIndexSettings settings)
+        if (contentPart == null)
         {
-            if (contentPart == null)
-            {
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
+
+        ArgumentNullException.ThrowIfNull(partFieldDefinition);
 
-            ArgumentNullException.ThrowIfNull(partFieldDefinition);
+        if (!string.Equals(typeof(TField).Name, partFieldDefinition.FieldDefinition.Name, StringComparison.Ordinal) &&
+           !string.Equals(nameof(ContentField), partFieldDefinition.FieldDefinition.Name, StringComparison.Ordinal))
+        {
+            return Task.CompletedTask;
+        }
 
-            if (!string.Equals(typeof(TField).Name, partFieldDefinition.FieldDefinition.Name, StringComparison.Ordinal) &&
-               !string.Equals(nameof(ContentField), partFieldDefinition.FieldDefinition.Name, StringComparison.Ordinal))
+        var field = contentPart.Get<TField>(partFieldDefinition.Name);
+        if (field != null)
+        {
+            var keys = new List<string>();
+            foreach (var key in context.Keys)
             {
-                return Task.CompletedTask;
+                keys.Add($"{key}.{partFieldDefinition.Name}");
             }
 
-            var field = contentPart.Get<TField>(partFieldDefinition.Name);
-            if (field != null)
+            if (!keys.Contains($"{typePartDefinition.Name}.{partFieldDefinition.Name}"))
             {
-                var keys = new List<string>();
-                foreach (var key in context.Keys)
-                {
-                    keys.Add($"{key}.{partFieldDefinition.Name}");
-                }
-
-                if (!keys.Contains($"{typePartDefinition.Name}.{partFieldDefinition.Name}"))
-                {
-                    keys.Add($"{typePartDefinition.Name}.{partFieldDefinition.Name}");
-                }
-
-                var buildFieldIndexContext = new BuildFieldIndexContext(context.DocumentIndex, context.ContentItem, keys, contentPart, typePartDefinition, partFieldDefinition, settings);
-
-                return BuildIndexAsync(field, buildFieldIndexContext);
+                keys.Add($"{typePartDefinition.Name}.{partFieldDefinition.Name}");
             }
 
-            return Task.CompletedTask;
+            var buildFieldIndexContext = new BuildFieldIndexContext(context.DocumentIndex, context.ContentItem, keys, contentPart, typePartDefinition, partFieldDefinition, settings);
+
+            return BuildIndexAsync(field, buildFieldIndexContext);
         }
 
-        public abstract Task BuildIndexAsync(TField field, BuildFieldIndexContext context);
+        return Task.CompletedTask;
     }
+
+    public abstract Task BuildIndexAsync(TField field, BuildFieldIndexContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Indexing.Abstractions/ContentPartIndexHandler.cs b/src/OrchardCore/OrchardCore.Indexing.Abstractions/ContentPartIndexHandler.cs
index 975f5426414..72961e0b1ef 100644
--- a/src/OrchardCore/OrchardCore.Indexing.Abstractions/ContentPartIndexHandler.cs
+++ b/src/OrchardCore/OrchardCore.Indexing.Abstractions/ContentPartIndexHandler.cs
@@ -3,38 +3,37 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.Indexing
+namespace OrchardCore.Indexing;
+
+/// <summary>
+/// An implementation of <see cref="ContentPartIndexHandler&lt;TPart&gt;"/> is able to take part in the rendering of
+/// a <see typeparamref="TPart"/> instance.
+/// </summary>
+public abstract class ContentPartIndexHandler<TPart> : IContentPartIndexHandler where TPart : ContentPart
 {
-    /// <summary>
-    /// An implementation of <see cref="ContentPartIndexHandler&lt;TPart&gt;"/> is able to take part in the rendering of
-    /// a <see typeparamref="TPart"/> instance.
-    /// </summary>
-    public abstract class ContentPartIndexHandler<TPart> : IContentPartIndexHandler where TPart : ContentPart
+    Task IContentPartIndexHandler.BuildIndexAsync(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, BuildIndexContext context, IContentIndexSettings settings)
     {
-        Task IContentPartIndexHandler.BuildIndexAsync(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, BuildIndexContext context, IContentIndexSettings settings)
-        {
-            var part = contentPart as TPart;
-
-            if (part == null)
-            {
-                return Task.CompletedTask;
-            }
+        var part = contentPart as TPart;
 
-            var keys = new List<string>
-            {
-                typePartDefinition.Name,
-            };
-
-            foreach (var key in context.Keys)
-            {
-                keys.Add($"{key}.{typePartDefinition.Name}");
-            }
+        if (part == null)
+        {
+            return Task.CompletedTask;
+        }
 
-            var buildPartIndexContext = new BuildPartIndexContext(context.DocumentIndex, context.ContentItem, keys, typePartDefinition, settings);
+        var keys = new List<string>
+        {
+            typePartDefinition.Name,
+        };
 
-            return BuildIndexAsync(part, buildPartIndexContext);
+        foreach (var key in context.Keys)
+        {
+            keys.Add($"{key}.{typePartDefinition.Name}");
         }
 
-        public abstract Task BuildIndexAsync(TPart part, BuildPartIndexContext context);
+        var buildPartIndexContext = new BuildPartIndexContext(context.DocumentIndex, context.ContentItem, keys, typePartDefinition, settings);
+
+        return BuildIndexAsync(part, buildPartIndexContext);
     }
+
+    public abstract Task BuildIndexAsync(TPart part, BuildPartIndexContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Indexing.Abstractions/DocumentIndexOptions.cs b/src/OrchardCore/OrchardCore.Indexing.Abstractions/DocumentIndexOptions.cs
index 7f4693b2638..32e0ddc4590 100644
--- a/src/OrchardCore/OrchardCore.Indexing.Abstractions/DocumentIndexOptions.cs
+++ b/src/OrchardCore/OrchardCore.Indexing.Abstractions/DocumentIndexOptions.cs
@@ -1,21 +1,20 @@
 using System;
 
-namespace OrchardCore.Indexing
+namespace OrchardCore.Indexing;
+
+/// <summary>
+/// Store means that the value will be stored in the index.
+/// Keyword means that the value will be indexed and tokenized as a single term. See Lucene StringField.
+/// We should use keyword and store options together for technical values. This way it will be using a StringField but also be stored.
+/// Stored and Keyword are not the same.
+/// If you absolutely need to only store the original value of a field then you should use a Lucene StoredField.
+/// See Elasticsearch documentation : <see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-store.html#mapping-store"/>.
+/// </summary>
+[Flags]
+public enum DocumentIndexOptions
 {
-    /// <summary>
-    /// Store means that the value will be stored in the index.
-    /// Keyword means that the value will be indexed and tokenized as a single term. See Lucene StringField.
-    /// We should use keyword and store options together for technical values. This way it will be using a StringField but also be stored.
-    /// Stored and Keyword are not the same.
-    /// If you absolutely need to only store the original value of a field then you should use a Lucene StoredField.
-    /// See Elasticsearch documentation : <see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-store.html#mapping-store"/>.
-    /// </summary>
-    [Flags]
-    public enum DocumentIndexOptions
-    {
-        None = 0,
-        Store = 1,
-        Sanitize = 2,
-        Keyword = 4
-    }
+    None = 0,
+    Store = 1,
+    Sanitize = 2,
+    Keyword = 4
 }
diff --git a/src/OrchardCore/OrchardCore.Indexing.Abstractions/IContentFieldIndexHandler.cs b/src/OrchardCore/OrchardCore.Indexing.Abstractions/IContentFieldIndexHandler.cs
index f3a3af6db5a..de50dcbcb76 100644
--- a/src/OrchardCore/OrchardCore.Indexing.Abstractions/IContentFieldIndexHandler.cs
+++ b/src/OrchardCore/OrchardCore.Indexing.Abstractions/IContentFieldIndexHandler.cs
@@ -2,14 +2,13 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.Indexing
+namespace OrchardCore.Indexing;
+
+/// <summary>
+/// An implementation of <see cref="IContentFieldIndexHandler"/> is able to take part in the rendering of
+/// a <see cref="ContentField"/> instance.
+/// </summary>
+public interface IContentFieldIndexHandler
 {
-    /// <summary>
-    /// An implementation of <see cref="IContentFieldIndexHandler"/> is able to take part in the rendering of
-    /// a <see cref="ContentField"/> instance.
-    /// </summary>
-    public interface IContentFieldIndexHandler
-    {
-        Task BuildIndexAsync(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, ContentPartFieldDefinition partFieldDefinition, BuildIndexContext context, IContentIndexSettings settings);
-    }
+    Task BuildIndexAsync(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, ContentPartFieldDefinition partFieldDefinition, BuildIndexContext context, IContentIndexSettings settings);
 }
diff --git a/src/OrchardCore/OrchardCore.Indexing.Abstractions/IContentIndexSettings.cs b/src/OrchardCore/OrchardCore.Indexing.Abstractions/IContentIndexSettings.cs
index 71bfdfd690f..bae5b2dc2e4 100644
--- a/src/OrchardCore/OrchardCore.Indexing.Abstractions/IContentIndexSettings.cs
+++ b/src/OrchardCore/OrchardCore.Indexing.Abstractions/IContentIndexSettings.cs
@@ -1,12 +1,11 @@
-namespace OrchardCore.Indexing
+namespace OrchardCore.Indexing;
+
+/// <summary>
+/// Represents the indexing settings for a content part or a field.
+/// </summary>
+public interface IContentIndexSettings
 {
-    /// <summary>
-    /// Represents the indexing settings for a content part or a field.
-    /// </summary>
-    public interface IContentIndexSettings
-    {
-        public bool Included { get; set; }
+    public bool Included { get; set; }
 
-        public DocumentIndexOptions ToOptions();
-    }
+    public DocumentIndexOptions ToOptions();
 }
diff --git a/src/OrchardCore/OrchardCore.Indexing.Abstractions/IContentItemIndexHandler.cs b/src/OrchardCore/OrchardCore.Indexing.Abstractions/IContentItemIndexHandler.cs
index 947576af791..bcc8b415b2d 100644
--- a/src/OrchardCore/OrchardCore.Indexing.Abstractions/IContentItemIndexHandler.cs
+++ b/src/OrchardCore/OrchardCore.Indexing.Abstractions/IContentItemIndexHandler.cs
@@ -1,12 +1,11 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Indexing
+namespace OrchardCore.Indexing;
+
+/// <summary>
+/// An implementation of <see cref="IContentItemIndexHandler"/> can provide property values for an index document.
+/// </summary>
+public interface IContentItemIndexHandler
 {
-    /// <summary>
-    /// An implementation of <see cref="IContentItemIndexHandler"/> can provide property values for an index document.
-    /// </summary>
-    public interface IContentItemIndexHandler
-    {
-        Task BuildIndexAsync(BuildIndexContext context);
-    }
+    Task BuildIndexAsync(BuildIndexContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Indexing.Abstractions/IContentPartIndexHandler.cs b/src/OrchardCore/OrchardCore.Indexing.Abstractions/IContentPartIndexHandler.cs
index e2753e57062..78e8a3fe0e6 100644
--- a/src/OrchardCore/OrchardCore.Indexing.Abstractions/IContentPartIndexHandler.cs
+++ b/src/OrchardCore/OrchardCore.Indexing.Abstractions/IContentPartIndexHandler.cs
@@ -2,14 +2,13 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
-namespace OrchardCore.Indexing
+namespace OrchardCore.Indexing;
+
+/// <summary>
+/// An implementation of <see cref="IContentPartIndexHandler"/> is able to take part in the rendering of
+/// a <see cref="ContentPart"/> instance.
+/// </summary>
+public interface IContentPartIndexHandler
 {
-    /// <summary>
-    /// An implementation of <see cref="IContentPartIndexHandler"/> is able to take part in the rendering of
-    /// a <see cref="ContentPart"/> instance.
-    /// </summary>
-    public interface IContentPartIndexHandler
-    {
-        Task BuildIndexAsync(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, BuildIndexContext context, IContentIndexSettings settings);
-    }
+    Task BuildIndexAsync(ContentPart contentPart, ContentTypePartDefinition typePartDefinition, BuildIndexContext context, IContentIndexSettings settings);
 }
diff --git a/src/OrchardCore/OrchardCore.Indexing.Abstractions/IIndexingTaskManager.cs b/src/OrchardCore/OrchardCore.Indexing.Abstractions/IIndexingTaskManager.cs
index c505bd13a5e..568711d18da 100644
--- a/src/OrchardCore/OrchardCore.Indexing.Abstractions/IIndexingTaskManager.cs
+++ b/src/OrchardCore/OrchardCore.Indexing.Abstractions/IIndexingTaskManager.cs
@@ -2,22 +2,21 @@
 using System.Threading.Tasks;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Indexing
+namespace OrchardCore.Indexing;
+
+/// <summary>
+/// Provides services to create and retrieve <see cref="IndexingTask"/> instances.
+/// It is used by indexers to track all content items that have to be indexed or re-indexed.
+/// </summary>
+public interface IIndexingTaskManager
 {
     /// <summary>
-    /// Provides services to create and retrieve <see cref="IndexingTask"/> instances.
-    /// It is used by indexers to track all content items that have to be indexed or re-indexed.
+    /// Returns a page of <see cref="IndexingTask"/>.
     /// </summary>
-    public interface IIndexingTaskManager
-    {
-        /// <summary>
-        /// Returns a page of <see cref="IndexingTask"/>.
-        /// </summary>
-        Task<IEnumerable<IndexingTask>> GetIndexingTasksAsync(long afterTaskId, int count);
+    Task<IEnumerable<IndexingTask>> GetIndexingTasksAsync(long afterTaskId, int count);
 
-        /// <summary>
-        /// Creates a new <see cref="IndexingTask"/>.
-        /// </summary>
-        Task CreateTaskAsync(ContentItem contentItem, IndexingTaskTypes type);
-    }
+    /// <summary>
+    /// Creates a new <see cref="IndexingTask"/>.
+    /// </summary>
+    Task CreateTaskAsync(ContentItem contentItem, IndexingTaskTypes type);
 }
diff --git a/src/OrchardCore/OrchardCore.Indexing.Abstractions/IndexingTask.cs b/src/OrchardCore/OrchardCore.Indexing.Abstractions/IndexingTask.cs
index 8a3df1b5113..37dc5a177ac 100644
--- a/src/OrchardCore/OrchardCore.Indexing.Abstractions/IndexingTask.cs
+++ b/src/OrchardCore/OrchardCore.Indexing.Abstractions/IndexingTask.cs
@@ -1,33 +1,32 @@
 using System;
 
-namespace OrchardCore.Indexing
+namespace OrchardCore.Indexing;
+
+public enum IndexingTaskTypes
 {
-    public enum IndexingTaskTypes
-    {
-        Update = 0,
-        Delete = 1
-    }
+    Update = 0,
+    Delete = 1
+}
 
-    public class IndexingTask
-    {
-        /// <summary>
-        /// The unique identifier of the <see cref="IndexingTask"/>.
-        /// </summary>
-        public long Id { get; set; }
+public class IndexingTask
+{
+    /// <summary>
+    /// The unique identifier of the <see cref="IndexingTask"/>.
+    /// </summary>
+    public long Id { get; set; }
 
-        /// <summary>
-        /// The id of the content item that is represented by the <see cref="IndexingTask"/> instance.
-        /// </summary>
-        public string ContentItemId { get; set; }
+    /// <summary>
+    /// The id of the content item that is represented by the <see cref="IndexingTask"/> instance.
+    /// </summary>
+    public string ContentItemId { get; set; }
 
-        /// <summary>
-        /// The <see cref="DateTime"/> value the task was created.
-        /// </summary>
-        public DateTime CreatedUtc { get; set; }
+    /// <summary>
+    /// The <see cref="DateTime"/> value the task was created.
+    /// </summary>
+    public DateTime CreatedUtc { get; set; }
 
-        /// <summary>
-        /// The type of task.
-        /// </summary>
-        public IndexingTaskTypes Type { get; set; }
-    }
+    /// <summary>
+    /// The type of task.
+    /// </summary>
+    public IndexingTaskTypes Type { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Indexing.Abstractions/StorableAttribute.cs b/src/OrchardCore/OrchardCore.Indexing.Abstractions/StorableAttribute.cs
index 773ef96b7a0..3db22e1f535 100644
--- a/src/OrchardCore/OrchardCore.Indexing.Abstractions/StorableAttribute.cs
+++ b/src/OrchardCore/OrchardCore.Indexing.Abstractions/StorableAttribute.cs
@@ -1,15 +1,14 @@
 using System;
 
-namespace OrchardCore.Indexing
+namespace OrchardCore.Indexing;
+
+[AttributeUsage(AttributeTargets.Class)]
+public class StorableAttribute : Attribute
 {
-    [AttributeUsage(AttributeTargets.Class)]
-    public class StorableAttribute : Attribute
+    public StorableAttribute(Type valueType)
     {
-        public StorableAttribute(Type valueType)
-        {
-            ValueType = valueType;
-        }
-
-        public Type ValueType { get; private set; }
+        ValueType = valueType;
     }
+
+    public Type ValueType { get; private set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/CacheContext.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/CacheContext.cs
index 44f85f3cfbf..58ab67aff4b 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/CacheContext.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/CacheContext.cs
@@ -1,98 +1,97 @@
 using System;
 using System.Collections.Generic;
 
-namespace OrchardCore.Environment.Cache
+namespace OrchardCore.Environment.Cache;
+
+public class CacheContext
 {
-    public class CacheContext
+    private HashSet<string> _contexts;
+    private HashSet<string> _tags;
+
+    public CacheContext(string cacheId)
     {
-        private HashSet<string> _contexts;
-        private HashSet<string> _tags;
+        CacheId = cacheId;
+    }
 
-        public CacheContext(string cacheId)
-        {
-            CacheId = cacheId;
-        }
+    /// <summary>
+    /// Defines the absolute time the value should be cached for.
+    /// If not called a sliding value will be used.
+    /// </summary>
+    public CacheContext WithExpiryOn(DateTimeOffset expiry)
+    {
+        ExpiresOn = expiry;
+        return this;
+    }
 
-        /// <summary>
-        /// Defines the absolute time the value should be cached for.
-        /// If not called a sliding value will be used.
-        /// </summary>
-        public CacheContext WithExpiryOn(DateTimeOffset expiry)
-        {
-            ExpiresOn = expiry;
-            return this;
-        }
+    /// <summary>
+    /// Defines the absolute time (relative from now) the value should be cached for.
+    /// If not called a sliding value will be used.
+    /// </summary>
+    public CacheContext WithExpiryAfter(TimeSpan duration)
+    {
+        ExpiresAfter = duration;
+        return this;
+    }
 
-        /// <summary>
-        /// Defines the absolute time (relative from now) the value should be cached for.
-        /// If not called a sliding value will be used.
-        /// </summary>
-        public CacheContext WithExpiryAfter(TimeSpan duration)
-        {
-            ExpiresAfter = duration;
-            return this;
-        }
+    /// <summary>
+    /// Defines the sliding expiry time the value should be cached for.
+    /// If not called a default sliding value will be used (unless an absolute expiry time has been specified).
+    /// </summary>
+    public CacheContext WithExpirySliding(TimeSpan window)
+    {
+        ExpiresSliding = window;
+        return this;
+    }
 
-        /// <summary>
-        /// Defines the sliding expiry time the value should be cached for.
-        /// If not called a default sliding value will be used (unless an absolute expiry time has been specified).
-        /// </summary>
-        public CacheContext WithExpirySliding(TimeSpan window)
-        {
-            ExpiresSliding = window;
-            return this;
-        }
+    /// <summary>
+    /// Defines a dimension to cache the shape for. For instance by using. <code>"user"</code>
+    /// each user will get a different value.
+    /// </summary>
+    public CacheContext AddContext(params string[] contexts)
+    {
+        _contexts ??= [];
 
-        /// <summary>
-        /// Defines a dimension to cache the shape for. For instance by using. <code>"user"</code>
-        /// each user will get a different value.
-        /// </summary>
-        public CacheContext AddContext(params string[] contexts)
+        foreach (var context in contexts)
         {
-            _contexts ??= [];
-
-            foreach (var context in contexts)
-            {
-                _contexts.Add(context);
-            }
-
-            return this;
+            _contexts.Add(context);
         }
 
-        /// <summary>
-        /// Removes a specific context.
-        /// </summary>
-        public CacheContext RemoveContext(string context)
-        {
-            _contexts?.Remove(context);
+        return this;
+    }
 
-            return this;
-        }
+    /// <summary>
+    /// Removes a specific context.
+    /// </summary>
+    public CacheContext RemoveContext(string context)
+    {
+        _contexts?.Remove(context);
 
-        public CacheContext AddTag(params string[] tags)
-        {
-            _tags ??= [];
+        return this;
+    }
 
-            foreach (var tag in tags)
-            {
-                _tags.Add(tag);
-            }
+    public CacheContext AddTag(params string[] tags)
+    {
+        _tags ??= [];
 
-            return this;
+        foreach (var tag in tags)
+        {
+            _tags.Add(tag);
         }
 
-        public CacheContext RemoveTag(string tag)
-        {
-            _tags?.Remove(tag);
+        return this;
+    }
 
-            return this;
-        }
+    public CacheContext RemoveTag(string tag)
+    {
+        _tags?.Remove(tag);
 
-        public string CacheId { get; }
-        public ICollection<string> Contexts => (ICollection<string>)_contexts ?? [];
-        public IEnumerable<string> Tags => _tags ?? [];
-        public DateTimeOffset? ExpiresOn { get; private set; }
-        public TimeSpan? ExpiresAfter { get; private set; }
-        public TimeSpan? ExpiresSliding { get; private set; }
+        return this;
     }
+
+    public string CacheId { get; }
+    public ICollection<string> Contexts => (ICollection<string>)_contexts ?? [];
+    public IEnumerable<string> Tags => _tags ?? [];
+    public DateTimeOffset? ExpiresOn { get; private set; }
+    public TimeSpan? ExpiresAfter { get; private set; }
+    public TimeSpan? ExpiresSliding { get; private set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/CacheContextEntry.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/CacheContextEntry.cs
index afba6701b9a..b977f9a8b26 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/CacheContextEntry.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/CacheContextEntry.cs
@@ -1,14 +1,13 @@
-namespace OrchardCore.Environment.Cache
+namespace OrchardCore.Environment.Cache;
+
+public readonly struct CacheContextEntry
 {
-    public readonly struct CacheContextEntry
+    public CacheContextEntry(string key, string value)
     {
-        public CacheContextEntry(string key, string value)
-        {
-            Key = key;
-            Value = value;
-        }
-
-        public string Key { get; init; }
-        public string Value { get; init; }
+        Key = key;
+        Value = value;
     }
+
+    public string Key { get; init; }
+    public string Value { get; init; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/CacheOptions.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/CacheOptions.cs
index d5b755615c4..7824e30b480 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/CacheOptions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/CacheOptions.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Environment.Cache
+namespace OrchardCore.Environment.Cache;
+
+public class CacheOptions
 {
-    public class CacheOptions
-    {
-        public bool Enabled { get; set; } = true;
-        public bool DebugMode { get; set; }
-    }
+    public bool Enabled { get; set; } = true;
+    public bool DebugMode { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/ICacheContextManager.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/ICacheContextManager.cs
index 07668251be6..0eb0ab8a86d 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/ICacheContextManager.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/ICacheContextManager.cs
@@ -1,14 +1,13 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Environment.Cache
+namespace OrchardCore.Environment.Cache;
+
+public interface ICacheContextManager
 {
-    public interface ICacheContextManager
-    {
-        /// <summary>
-        /// Provides the discriminator for a specific cache context by requesting all <see cref="ICacheContextProvider"/>
-        /// implementations.
-        /// </summary>
-        Task<IEnumerable<CacheContextEntry>> GetDiscriminatorsAsync(IEnumerable<string> contexts);
-    }
+    /// <summary>
+    /// Provides the discriminator for a specific cache context by requesting all <see cref="ICacheContextProvider"/>
+    /// implementations.
+    /// </summary>
+    Task<IEnumerable<CacheContextEntry>> GetDiscriminatorsAsync(IEnumerable<string> contexts);
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/ICacheContextProvider.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/ICacheContextProvider.cs
index 464ffb1fc30..10339f3e07d 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/ICacheContextProvider.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/ICacheContextProvider.cs
@@ -1,15 +1,14 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Environment.Cache
+namespace OrchardCore.Environment.Cache;
+
+/// <summary>
+/// Returns a set of values describing the discriminators of the context and a value
+/// which changes whenever the state of the discriminator changes, for instance a serial
+/// number of a timestamp.
+/// </summary>
+public interface ICacheContextProvider
 {
-    /// <summary>
-    /// Returns a set of values describing the discriminators of the context and a value
-    /// which changes whenever the state of the discriminator changes, for instance a serial
-    /// number of a timestamp.
-    /// </summary>
-    public interface ICacheContextProvider
-    {
-        Task PopulateContextEntriesAsync(IEnumerable<string> contexts, List<CacheContextEntry> entries);
-    }
+    Task PopulateContextEntriesAsync(IEnumerable<string> contexts, List<CacheContextEntry> entries);
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/ICacheScopeManager.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/ICacheScopeManager.cs
index 6d3919865b9..fee84e89585 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/ICacheScopeManager.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/ICacheScopeManager.cs
@@ -1,23 +1,22 @@
 using System;
 
-namespace OrchardCore.Environment.Cache
+namespace OrchardCore.Environment.Cache;
+
+public interface ICacheScopeManager
 {
-    public interface ICacheScopeManager
-    {
-        void EnterScope(CacheContext context);
-        void ExitScope();
-        /// <summary>
-        /// Adds the given dependencies to the current innermost cache context.
-        /// </summary>
-        /// <param name="dependencies">The dependencies to add.</param>
-        void AddDependencies(params string[] dependencies);
-        /// <summary>
-        /// Adds the given contexts to the current innermost cache context.
-        /// </summary>
-        /// <param name="contexts">The contexts to add.</param>
-        void AddContexts(params string[] contexts);
-        void WithExpiryOn(DateTimeOffset expiryOn);
-        void WithExpiryAfter(TimeSpan expiryAfter);
-        void WithExpirySliding(TimeSpan expirySliding);
-    }
+    void EnterScope(CacheContext context);
+    void ExitScope();
+    /// <summary>
+    /// Adds the given dependencies to the current innermost cache context.
+    /// </summary>
+    /// <param name="dependencies">The dependencies to add.</param>
+    void AddDependencies(params string[] dependencies);
+    /// <summary>
+    /// Adds the given contexts to the current innermost cache context.
+    /// </summary>
+    /// <param name="contexts">The contexts to add.</param>
+    void AddContexts(params string[] contexts);
+    void WithExpiryOn(DateTimeOffset expiryOn);
+    void WithExpiryAfter(TimeSpan expiryAfter);
+    void WithExpirySliding(TimeSpan expirySliding);
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/ITagCache.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/ITagCache.cs
index f02f530866b..74a8ace50af 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/ITagCache.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Cache/ITagCache.cs
@@ -1,17 +1,16 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Environment.Cache
+namespace OrchardCore.Environment.Cache;
+
+public interface ITagCache
 {
-    public interface ITagCache
-    {
-        Task TagAsync(string key, params string[] tags);
-        Task<IEnumerable<string>> GetTaggedItemsAsync(string tag);
-        Task RemoveTagAsync(string tag);
-    }
+    Task TagAsync(string key, params string[] tags);
+    Task<IEnumerable<string>> GetTaggedItemsAsync(string tag);
+    Task RemoveTagAsync(string tag);
+}
 
-    public interface ITagRemovedEventHandler
-    {
-        Task TagRemovedAsync(string tag, IEnumerable<string> keys);
-    }
+public interface ITagRemovedEventHandler
+{
+    Task TagRemovedAsync(string tag, IEnumerable<string> keys);
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandContext.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandContext.cs
index baff7b1fcbc..3c055570218 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandContext.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandContext.cs
@@ -1,17 +1,16 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace OrchardCore.Environment.Commands
+namespace OrchardCore.Environment.Commands;
+
+public class CommandContext
 {
-    public class CommandContext
-    {
-        public TextReader Input { get; set; }
-        public TextWriter Output { get; set; }
+    public TextReader Input { get; set; }
+    public TextWriter Output { get; set; }
 
-        public string Command { get; set; }
-        public IEnumerable<string> Arguments { get; set; }
-        public IDictionary<string, string> Switches { get; set; }
+    public string Command { get; set; }
+    public IEnumerable<string> Arguments { get; set; }
+    public IDictionary<string, string> Switches { get; set; }
 
-        public CommandDescriptor CommandDescriptor { get; set; }
-    }
+    public CommandDescriptor CommandDescriptor { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandDescriptor.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandDescriptor.cs
index 2d57a0c2d9e..0d7db62f2e4 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandDescriptor.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandDescriptor.cs
@@ -1,11 +1,10 @@
 using System.Reflection;
 
-namespace OrchardCore.Environment.Commands
+namespace OrchardCore.Environment.Commands;
+
+public class CommandDescriptor
 {
-    public class CommandDescriptor
-    {
-        public string[] Names { get; set; }
-        public MethodInfo MethodInfo { get; set; }
-        public string HelpText { get; set; }
-    }
+    public string[] Names { get; set; }
+    public MethodInfo MethodInfo { get; set; }
+    public string HelpText { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandHandlerDescriptor.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandHandlerDescriptor.cs
index 6a471c129d4..ecc933df881 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandHandlerDescriptor.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandHandlerDescriptor.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Environment.Commands
+namespace OrchardCore.Environment.Commands;
+
+public class CommandHandlerDescriptor
 {
-    public class CommandHandlerDescriptor
-    {
-        public IEnumerable<CommandDescriptor> Commands { get; set; }
-    }
+    public IEnumerable<CommandDescriptor> Commands { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandNameAttribute.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandNameAttribute.cs
index 58515dd41a3..db0039ae4a5 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandNameAttribute.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandNameAttribute.cs
@@ -1,50 +1,49 @@
 using System;
 using System.Text;
 
-namespace OrchardCore.Environment.Commands
+namespace OrchardCore.Environment.Commands;
+
+[AttributeUsage(AttributeTargets.Method)]
+public class CommandNameAttribute : Attribute
 {
-    [AttributeUsage(AttributeTargets.Method)]
-    public class CommandNameAttribute : Attribute
+    public CommandNameAttribute(params string[] commandsAlias)
     {
-        public CommandNameAttribute(params string[] commandsAlias)
-        {
-            Commands = commandsAlias;
-        }
+        Commands = commandsAlias;
+    }
 
-        public string[] Commands { get; }
+    public string[] Commands { get; }
+}
+
+[AttributeUsage(AttributeTargets.Method)]
+public class CommandHelpAttribute : Attribute
+{
+    public CommandHelpAttribute(string helpText)
+    {
+        HelpText = helpText;
     }
 
-    [AttributeUsage(AttributeTargets.Method)]
-    public class CommandHelpAttribute : Attribute
+    public CommandHelpAttribute(params string[] helpText)
     {
-        public CommandHelpAttribute(string helpText)
+        if (helpText.Length == 0)
         {
-            HelpText = helpText;
+            return;
         }
 
-        public CommandHelpAttribute(params string[] helpText)
+        if (helpText.Length == 1)
         {
-            if (helpText.Length == 0)
-            {
-                return;
-            }
-
-            if (helpText.Length == 1)
-            {
-                HelpText = helpText[0];
-                return;
-            }
-
-            var builder = new StringBuilder();
+            HelpText = helpText[0];
+            return;
+        }
 
-            foreach (var value in helpText)
-            {
-                builder.AppendLine(value);
-            }
+        var builder = new StringBuilder();
 
-            HelpText = builder.ToString();
+        foreach (var value in helpText)
+        {
+            builder.AppendLine(value);
         }
 
-        public string HelpText { get; }
+        HelpText = builder.ToString();
     }
+
+    public string HelpText { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandParameters.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandParameters.cs
index 08a88b398aa..a08d5031160 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandParameters.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandParameters.cs
@@ -1,14 +1,13 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace OrchardCore.Environment.Commands
+namespace OrchardCore.Environment.Commands;
+
+public class CommandParameters
 {
-    public class CommandParameters
-    {
-        public IEnumerable<string> Arguments { get; set; }
-        public IDictionary<string, string> Switches { get; set; }
+    public IEnumerable<string> Arguments { get; set; }
+    public IDictionary<string, string> Switches { get; set; }
 
-        public TextReader Input { get; set; }
-        public TextWriter Output { get; set; }
-    }
+    public TextReader Input { get; set; }
+    public TextWriter Output { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandReturnCodes.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandReturnCodes.cs
index d64dbbfbefc..a1cda5206ac 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandReturnCodes.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/CommandReturnCodes.cs
@@ -1,12 +1,11 @@
-namespace OrchardCore.Environment.Commands
+namespace OrchardCore.Environment.Commands;
+
+/// <summary>
+/// Different return codes for a command execution.
+/// </summary>
+public enum CommandReturnCodes
 {
-    /// <summary>
-    /// Different return codes for a command execution.
-    /// </summary>
-    public enum CommandReturnCodes
-    {
-        Ok = 0,
-        Fail = 5,
-        Retry = 240
-    }
+    Ok = 0,
+    Fail = 5,
+    Retry = 240
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/DefaultCommandHandler.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/DefaultCommandHandler.cs
index be0b6b8a127..edbd4f35f3b 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/DefaultCommandHandler.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/DefaultCommandHandler.cs
@@ -6,193 +6,192 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Environment.Commands
+namespace OrchardCore.Environment.Commands;
+
+public abstract class DefaultCommandHandler : ICommandHandler
 {
-    public abstract class DefaultCommandHandler : ICommandHandler
+    protected readonly IStringLocalizer S;
+
+    protected DefaultCommandHandler(IStringLocalizer localizer)
     {
-        protected readonly IStringLocalizer S;
+        S = localizer;
+    }
 
-        protected DefaultCommandHandler(IStringLocalizer localizer)
+    public CommandContext Context { get; set; }
+
+    public Task ExecuteAsync(CommandContext context)
+    {
+        SetSwitchValues(context);
+        return InvokeAsync(context);
+    }
+
+    private void SetSwitchValues(CommandContext context)
+    {
+        if (context.Switches != null && context.Switches.Count > 0)
         {
-            S = localizer;
+            foreach (var commandSwitch in context.Switches)
+            {
+                SetSwitchValue(commandSwitch);
+            }
         }
+    }
 
-        public CommandContext Context { get; set; }
+    private void SetSwitchValue(KeyValuePair<string, string> commandSwitch)
+    {
+        // Find the property.
+        var propertyInfo = GetType()
+            .GetProperty(commandSwitch.Key, BindingFlags.Instance | BindingFlags.Public | BindingFlags.IgnoreCase)
+            ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
 
-        public Task ExecuteAsync(CommandContext context)
+        if (propertyInfo.GetCustomAttributes(typeof(OrchardSwitchAttribute), false).Length == 0)
         {
-            SetSwitchValues(context);
-            return InvokeAsync(context);
+            throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, nameof(OrchardSwitchAttribute)]);
         }
 
-        private void SetSwitchValues(CommandContext context)
+        // Set the value.
+        try
         {
-            if (context.Switches != null && context.Switches.Count > 0)
-            {
-                foreach (var commandSwitch in context.Switches)
-                {
-                    SetSwitchValue(commandSwitch);
-                }
-            }
+            var value = ConvertToType(propertyInfo.PropertyType, commandSwitch.Value);
+            propertyInfo.SetValue(this, value, null /*index*/);
         }
-
-        private void SetSwitchValue(KeyValuePair<string, string> commandSwitch)
+        catch (Exception ex) when (!ex.IsFatal())
         {
-            // Find the property.
-            var propertyInfo = GetType()
-                .GetProperty(commandSwitch.Key, BindingFlags.Instance | BindingFlags.Public | BindingFlags.IgnoreCase)
-                ?? throw new InvalidOperationException(S["Switch \"{0}\" was not found", commandSwitch.Key]);
+            // TODO: (ngm) fix this message.
+            var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
+                commandSwitch.Value,
+                propertyInfo.PropertyType.FullName,
+                commandSwitch.Key];
 
-            if (propertyInfo.GetCustomAttributes(typeof(OrchardSwitchAttribute), false).Length == 0)
-            {
-                throw new InvalidOperationException(S["A property \"{0}\" exists but is not decorated with \"{1}\"", commandSwitch.Key, nameof(OrchardSwitchAttribute)]);
-            }
+            throw new InvalidOperationException(message, ex);
+        }
+    }
 
-            // Set the value.
-            try
-            {
-                var value = ConvertToType(propertyInfo.PropertyType, commandSwitch.Value);
-                propertyInfo.SetValue(this, value, null /*index*/);
-            }
-            catch (Exception ex) when (!ex.IsFatal())
-            {
-                // TODO: (ngm) fix this message.
-                var message = S["Error converting value \"{0}\" to \"{1}\" for switch \"{2}\"",
-                    commandSwitch.Value,
-                    propertyInfo.PropertyType.FullName,
-                    commandSwitch.Key];
+    private async Task InvokeAsync(CommandContext context)
+    {
+        CheckMethodForSwitches(context.CommandDescriptor.MethodInfo, context.Switches);
 
-                throw new InvalidOperationException(message, ex);
-            }
-        }
+        var arguments = (context.Arguments ?? []).ToArray();
+        var invokeParameters = GetInvokeParametersForMethod(context.CommandDescriptor.MethodInfo, arguments)
+            ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+
+        Context = context;
 
-        private async Task InvokeAsync(CommandContext context)
+        if (context.CommandDescriptor.MethodInfo.ReturnType == typeof(Task<string>))
         {
-            CheckMethodForSwitches(context.CommandDescriptor.MethodInfo, context.Switches);
+            var taskResult = await (Task<string>)context.CommandDescriptor.MethodInfo.Invoke(this, invokeParameters);
+            await context.Output.WriteAsync(taskResult);
+            return;
+        }
+        else if (typeof(Task).IsAssignableFrom(context.CommandDescriptor.MethodInfo.ReturnType))
+        {
+            await (Task)context.CommandDescriptor.MethodInfo.Invoke(this, invokeParameters);
+            return;
+        }
 
-            var arguments = (context.Arguments ?? []).ToArray();
-            var invokeParameters = GetInvokeParametersForMethod(context.CommandDescriptor.MethodInfo, arguments)
-                ?? throw new InvalidOperationException(S["Command arguments \"{0}\" don't match command definition", string.Join(" ", arguments)]);
+        var result = context.CommandDescriptor.MethodInfo.Invoke(this, invokeParameters);
+        if (result is string)
+        {
+            await context.Output.WriteAsync(result.ToString());
+        }
+    }
 
-            Context = context;
+    private static object[] GetInvokeParametersForMethod(MethodInfo methodInfo, string[] arguments)
+    {
+        var invokeParameters = new List<object>();
+        var args = new List<string>(arguments);
+        var methodParameters = methodInfo.GetParameters();
+        var methodHasParams = false;
 
-            if (context.CommandDescriptor.MethodInfo.ReturnType == typeof(Task<string>))
-            {
-                var taskResult = await (Task<string>)context.CommandDescriptor.MethodInfo.Invoke(this, invokeParameters);
-                await context.Output.WriteAsync(taskResult);
-                return;
-            }
-            else if (typeof(Task).IsAssignableFrom(context.CommandDescriptor.MethodInfo.ReturnType))
+        if (methodParameters.Length == 0)
+        {
+            if (args.Count == 0)
             {
-                await (Task)context.CommandDescriptor.MethodInfo.Invoke(this, invokeParameters);
-                return;
+                return invokeParameters.ToArray();
             }
 
-            var result = context.CommandDescriptor.MethodInfo.Invoke(this, invokeParameters);
-            if (result is string)
-            {
-                await context.Output.WriteAsync(result.ToString());
-            }
+            return null;
         }
 
-        private static object[] GetInvokeParametersForMethod(MethodInfo methodInfo, string[] arguments)
+        if (methodParameters[^1].ParameterType.IsAssignableFrom(typeof(string[])))
         {
-            var invokeParameters = new List<object>();
-            var args = new List<string>(arguments);
-            var methodParameters = methodInfo.GetParameters();
-            var methodHasParams = false;
+            methodHasParams = true;
+        }
 
-            if (methodParameters.Length == 0)
-            {
-                if (args.Count == 0)
-                {
-                    return invokeParameters.ToArray();
-                }
+        var requiredMethodParameters = methodParameters.Where(x => !x.HasDefaultValue).ToArray();
 
-                return null;
-            }
+        if (!methodHasParams && args.Count < requiredMethodParameters.Length) return null;
+        if (methodHasParams && (methodParameters.Length - args.Count >= 2)) return null;
 
-            if (methodParameters[^1].ParameterType.IsAssignableFrom(typeof(string[])))
+        for (var i = 0; i < methodParameters.Length; i++)
+        {
+            if (methodParameters[i].ParameterType.IsAssignableFrom(typeof(string[])))
             {
-                methodHasParams = true;
+                invokeParameters.Add(args.GetRange(i, args.Count - i).ToArray());
+                break;
             }
 
-            var requiredMethodParameters = methodParameters.Where(x => !x.HasDefaultValue).ToArray();
-
-            if (!methodHasParams && args.Count < requiredMethodParameters.Length) return null;
-            if (methodHasParams && (methodParameters.Length - args.Count >= 2)) return null;
-
-            for (var i = 0; i < methodParameters.Length; i++)
+            if (i < arguments.Length)
             {
-                if (methodParameters[i].ParameterType.IsAssignableFrom(typeof(string[])))
-                {
-                    invokeParameters.Add(args.GetRange(i, args.Count - i).ToArray());
-                    break;
-                }
-
-                if (i < arguments.Length)
-                {
-                    var val = ConvertToType(methodParameters[i].ParameterType, arguments[i]);
-                    if (val == null) return null;
-
-                    invokeParameters.Add(val);
-                }
-                else
-                {
-                    invokeParameters.Add(methodParameters[i].DefaultValue);
-                }
-            }
-
-            var lastParameterIsParams = methodParameters
-                .LastOrDefault()
-                ?.GetCustomAttributes(typeof(ParamArrayAttribute), false)
-                ?.Length > 0;
+                var val = ConvertToType(methodParameters[i].ParameterType, arguments[i]);
+                if (val == null) return null;
 
-            if (methodHasParams && (methodParameters.Length - args.Count == 1) && !lastParameterIsParams)
+                invokeParameters.Add(val);
+            }
+            else
             {
-                invokeParameters.Add(Array.Empty<string>());
+                invokeParameters.Add(methodParameters[i].DefaultValue);
             }
-
-            return invokeParameters.ToArray();
         }
 
-        private void CheckMethodForSwitches(MethodInfo methodInfo, IDictionary<string, string> switches)
+        var lastParameterIsParams = methodParameters
+            .LastOrDefault()
+            ?.GetCustomAttributes(typeof(ParamArrayAttribute), false)
+            ?.Length > 0;
+
+        if (methodHasParams && (methodParameters.Length - args.Count == 1) && !lastParameterIsParams)
         {
-            if (switches == null || switches.Count == 0)
-                return;
+            invokeParameters.Add(Array.Empty<string>());
+        }
 
-            var supportedSwitches = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-            foreach (var switchesAttribute in methodInfo.GetCustomAttributes(typeof(OrchardSwitchesAttribute), false).Cast<OrchardSwitchesAttribute>())
-            {
-                supportedSwitches.UnionWith(switchesAttribute.Switches);
-            }
+        return invokeParameters.ToArray();
+    }
+
+    private void CheckMethodForSwitches(MethodInfo methodInfo, IDictionary<string, string> switches)
+    {
+        if (switches == null || switches.Count == 0)
+            return;
+
+        var supportedSwitches = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        foreach (var switchesAttribute in methodInfo.GetCustomAttributes(typeof(OrchardSwitchesAttribute), false).Cast<OrchardSwitchesAttribute>())
+        {
+            supportedSwitches.UnionWith(switchesAttribute.Switches);
+        }
 
-            foreach (var commandSwitch in switches.Keys)
+        foreach (var commandSwitch in switches.Keys)
+        {
+            if (!supportedSwitches.Contains(commandSwitch))
             {
-                if (!supportedSwitches.Contains(commandSwitch))
-                {
-                    throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
-                }
+                throw new InvalidOperationException(S["Method \"{0}\" does not support switch \"{1}\".", methodInfo.Name, commandSwitch]);
             }
         }
+    }
 
-        private static object ConvertToType(Type type, string value)
+    private static object ConvertToType(Type type, string value)
+    {
+        if (type.IsEnum)
         {
-            if (type.IsEnum)
+            try
             {
-                try
-                {
-                    return Enum.Parse(type, value, true);
-                }
-                catch (ArgumentException)
-                {
-                    return null;
-                }
+                return Enum.Parse(type, value, true);
             }
-            else
+            catch (ArgumentException)
             {
-                return Convert.ChangeType(value, type);
+                return null;
             }
         }
+        else
+        {
+            return Convert.ChangeType(value, type);
+        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/ICommandHandler.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/ICommandHandler.cs
index 548f049365b..4f829352213 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/ICommandHandler.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/ICommandHandler.cs
@@ -1,9 +1,8 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Environment.Commands
+namespace OrchardCore.Environment.Commands;
+
+public interface ICommandHandler
 {
-    public interface ICommandHandler
-    {
-        Task ExecuteAsync(CommandContext context);
-    }
+    Task ExecuteAsync(CommandContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/ICommandManager.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/ICommandManager.cs
index 6108716514a..19c1ce7a1d5 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/ICommandManager.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/ICommandManager.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Environment.Commands
+namespace OrchardCore.Environment.Commands;
+
+public interface ICommandManager
 {
-    public interface ICommandManager
-    {
-        Task ExecuteAsync(CommandParameters parameters);
-        IEnumerable<CommandDescriptor> GetCommandDescriptors();
-    }
+    Task ExecuteAsync(CommandParameters parameters);
+    IEnumerable<CommandDescriptor> GetCommandDescriptors();
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/OrchardSwitchAttribute.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/OrchardSwitchAttribute.cs
index 10da8cb83eb..485895d2918 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/OrchardSwitchAttribute.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/OrchardSwitchAttribute.cs
@@ -1,9 +1,8 @@
 using System;
 
-namespace OrchardCore.Environment.Commands
+namespace OrchardCore.Environment.Commands;
+
+[AttributeUsage(AttributeTargets.Property)]
+public class OrchardSwitchAttribute : Attribute
 {
-    [AttributeUsage(AttributeTargets.Property)]
-    public class OrchardSwitchAttribute : Attribute
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/OrchardSwitchesAttribute.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/OrchardSwitchesAttribute.cs
index fd7d3c3a65d..0c7b24ce584 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/OrchardSwitchesAttribute.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/OrchardSwitchesAttribute.cs
@@ -2,24 +2,23 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OrchardCore.Environment.Commands
+namespace OrchardCore.Environment.Commands;
+
+[AttributeUsage(AttributeTargets.Method)]
+public class OrchardSwitchesAttribute : Attribute
 {
-    [AttributeUsage(AttributeTargets.Method)]
-    public class OrchardSwitchesAttribute : Attribute
-    {
-        private readonly string _switches;
+    private readonly string _switches;
 
-        public OrchardSwitchesAttribute(string switches)
-        {
-            _switches = switches;
-        }
+    public OrchardSwitchesAttribute(string switches)
+    {
+        _switches = switches;
+    }
 
-        public IEnumerable<string> Switches
+    public IEnumerable<string> Switches
+    {
+        get
         {
-            get
-            {
-                return (_switches ?? "").Trim().Split(',').Select(s => s.Trim());
-            }
+            return (_switches ?? "").Trim().Split(',').Select(s => s.Trim());
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/Parameters/ICommandParametersParser.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/Parameters/ICommandParametersParser.cs
index 143793f544f..f26fbc81b17 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/Parameters/ICommandParametersParser.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/Parameters/ICommandParametersParser.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Environment.Commands.Parameters
+namespace OrchardCore.Environment.Commands.Parameters;
+
+public interface ICommandParametersParser
 {
-    public interface ICommandParametersParser
-    {
-        CommandParameters Parse(IEnumerable<string> args);
-    }
+    CommandParameters Parse(IEnumerable<string> args);
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/Parameters/ICommandParser.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/Parameters/ICommandParser.cs
index 533caaf7aae..1d42cbfd71f 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/Parameters/ICommandParser.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Commands/Parameters/ICommandParser.cs
@@ -2,144 +2,143 @@
 using System.Security;
 using System.Text;
 
-namespace OrchardCore.Environment.Commands.Parameters
+namespace OrchardCore.Environment.Commands.Parameters;
+
+public interface ICommandParser
+{
+    IEnumerable<string> Parse(string commandLine);
+}
+
+public class CommandParser : ICommandParser
 {
-    public interface ICommandParser
+    [SecurityCritical]
+    public IEnumerable<string> Parse(string commandLine)
     {
-        IEnumerable<string> Parse(string commandLine);
+        return SplitArgs(commandLine);
     }
 
-    public class CommandParser : ICommandParser
+    public class State
     {
-        [SecurityCritical]
-        public IEnumerable<string> Parse(string commandLine)
+        private readonly string _commandLine;
+        private readonly StringBuilder _stringBuilder;
+        private readonly List<string> _arguments;
+        private int _index;
+
+        public State(string commandLine)
         {
-            return SplitArgs(commandLine);
+            _commandLine = commandLine;
+            _stringBuilder = new StringBuilder();
+            _arguments = [];
         }
 
-        public class State
+        public StringBuilder StringBuilder { get { return _stringBuilder; } }
+        public bool EOF { get { return _index >= _commandLine.Length; } }
+        public char Current { get { return _commandLine[_index]; } }
+        public IEnumerable<string> Arguments { get { return _arguments; } }
+
+        public void AddArgument()
         {
-            private readonly string _commandLine;
-            private readonly StringBuilder _stringBuilder;
-            private readonly List<string> _arguments;
-            private int _index;
+            _arguments.Add(StringBuilder.ToString());
+            StringBuilder.Clear();
+        }
 
-            public State(string commandLine)
-            {
-                _commandLine = commandLine;
-                _stringBuilder = new StringBuilder();
-                _arguments = [];
-            }
+        public void AppendCurrent()
+        {
+            StringBuilder.Append(Current);
+        }
 
-            public StringBuilder StringBuilder { get { return _stringBuilder; } }
-            public bool EOF { get { return _index >= _commandLine.Length; } }
-            public char Current { get { return _commandLine[_index]; } }
-            public IEnumerable<string> Arguments { get { return _arguments; } }
+        public void Append(char ch)
+        {
+            StringBuilder.Append(ch);
+        }
 
-            public void AddArgument()
-            {
-                _arguments.Add(StringBuilder.ToString());
-                StringBuilder.Clear();
-            }
+        public void MoveNext()
+        {
+            if (!EOF)
+                _index++;
+        }
+    }
 
-            public void AppendCurrent()
+    /// <summary>
+    /// Implement the same logic as found at
+    /// http://msdn.microsoft.com/en-us/library/17w5ykft.aspx
+    /// The 3 special characters are quote, backslash and whitespaces, in order
+    /// of priority.
+    /// The semantics of a quote is: whatever the state of the lexer, copy
+    /// all characters verbatim until the next quote or EOF.
+    /// The semantics of backslash is: If the next character is a backslash or a quote,
+    /// copy the next character. Otherwise, copy the backslash and the next character.
+    /// The semantics of whitespace is: end the current argument and move on to the next one.
+    /// </summary>
+    private static IEnumerable<string> SplitArgs(string commandLine)
+    {
+        var state = new State(commandLine);
+        while (!state.EOF)
+        {
+            switch (state.Current)
             {
-                StringBuilder.Append(Current);
-            }
+                case '"':
+                    ProcessQuote(state);
+                    break;
 
-            public void Append(char ch)
-            {
-                StringBuilder.Append(ch);
-            }
+                case '\\':
+                    ProcessBackslash(state);
+                    break;
 
-            public void MoveNext()
-            {
-                if (!EOF)
-                    _index++;
-            }
-        }
+                case ' ':
+                case '\t':
+                    if (state.StringBuilder.Length > 0)
+                        state.AddArgument();
+                    state.MoveNext();
+                    break;
 
-        /// <summary>
-        /// Implement the same logic as found at
-        /// http://msdn.microsoft.com/en-us/library/17w5ykft.aspx
-        /// The 3 special characters are quote, backslash and whitespaces, in order
-        /// of priority.
-        /// The semantics of a quote is: whatever the state of the lexer, copy
-        /// all characters verbatim until the next quote or EOF.
-        /// The semantics of backslash is: If the next character is a backslash or a quote,
-        /// copy the next character. Otherwise, copy the backslash and the next character.
-        /// The semantics of whitespace is: end the current argument and move on to the next one.
-        /// </summary>
-        private static IEnumerable<string> SplitArgs(string commandLine)
-        {
-            var state = new State(commandLine);
-            while (!state.EOF)
-            {
-                switch (state.Current)
-                {
-                    case '"':
-                        ProcessQuote(state);
-                        break;
-
-                    case '\\':
-                        ProcessBackslash(state);
-                        break;
-
-                    case ' ':
-                    case '\t':
-                        if (state.StringBuilder.Length > 0)
-                            state.AddArgument();
-                        state.MoveNext();
-                        break;
-
-                    default:
-                        state.AppendCurrent();
-                        state.MoveNext();
-                        break;
-                }
+                default:
+                    state.AppendCurrent();
+                    state.MoveNext();
+                    break;
             }
-            if (state.StringBuilder.Length > 0)
-                state.AddArgument();
-            return state.Arguments;
         }
+        if (state.StringBuilder.Length > 0)
+            state.AddArgument();
+        return state.Arguments;
+    }
 
-        private static void ProcessQuote(State state)
+    private static void ProcessQuote(State state)
+    {
+        state.MoveNext();
+        while (!state.EOF)
         {
-            state.MoveNext();
-            while (!state.EOF)
+            if (state.Current == '"')
             {
-                if (state.Current == '"')
-                {
-                    state.MoveNext();
-                    break;
-                }
-                state.AppendCurrent();
                 state.MoveNext();
+                break;
             }
+            state.AppendCurrent();
+            state.MoveNext();
+        }
 
-            state.AddArgument();
+        state.AddArgument();
+    }
+
+    private static void ProcessBackslash(State state)
+    {
+        state.MoveNext();
+        if (state.EOF)
+        {
+            state.Append('\\');
+            return;
         }
 
-        private static void ProcessBackslash(State state)
+        if (state.Current == '"')
         {
+            state.Append('"');
+            state.MoveNext();
+        }
+        else
+        {
+            state.Append('\\');
+            state.AppendCurrent();
             state.MoveNext();
-            if (state.EOF)
-            {
-                state.Append('\\');
-                return;
-            }
-
-            if (state.Current == '"')
-            {
-                state.Append('"');
-                state.MoveNext();
-            }
-            else
-            {
-                state.Append('\\');
-                state.AppendCurrent();
-                state.MoveNext();
-            }
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentEntity.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentEntity.cs
index fe5463183e8..d48865bebac 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentEntity.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentEntity.cs
@@ -1,12 +1,11 @@
 using OrchardCore.Data.Documents;
 using OrchardCore.Entities;
 
-namespace OrchardCore.Documents
+namespace OrchardCore.Documents;
+
+/// <summary>
+/// An <see cref="IDocument"/> being an <see cref="IEntity"/>.
+/// </summary>
+public interface IDocumentEntity : IDocument, IEntity
 {
-    /// <summary>
-    /// An <see cref="IDocument"/> being an <see cref="IEntity"/>.
-    /// </summary>
-    public interface IDocumentEntity : IDocument, IEntity
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentEntityManager.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentEntityManager.cs
index 6b7bea65eec..a56bc0845bb 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentEntityManager.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentEntityManager.cs
@@ -1,25 +1,24 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Documents
+namespace OrchardCore.Documents;
+
+/// <summary>
+/// A generic service to keep in sync any single <see cref="IDocumentEntity"/> between a document store and a shared cache.
+/// </summary>
+public interface IDocumentEntityManager<TDocumentEntity> where TDocumentEntity : class, IDocumentEntity, new()
 {
     /// <summary>
-    /// A generic service to keep in sync any single <see cref="IDocumentEntity"/> between a document store and a shared cache.
+    /// Gets a persistent property of a given type.
     /// </summary>
-    public interface IDocumentEntityManager<TDocumentEntity> where TDocumentEntity : class, IDocumentEntity, new()
-    {
-        /// <summary>
-        /// Gets a persistent property of a given type.
-        /// </summary>
-        Task<T> GetAsync<T>(string name) where T : new();
+    Task<T> GetAsync<T>(string name) where T : new();
 
-        /// <summary>
-        /// Sets a persistent property once the ambient session is committed.
-        /// </summary>
-        Task SetAsync<T>(string name, T value) where T : new();
+    /// <summary>
+    /// Sets a persistent property once the ambient session is committed.
+    /// </summary>
+    Task SetAsync<T>(string name, T value) where T : new();
 
-        /// <summary>
-        /// Removes a persistent property once the ambient session is committed.
-        /// </summary>
-        Task RemoveAsync(string name);
-    }
+    /// <summary>
+    /// Removes a persistent property once the ambient session is committed.
+    /// </summary>
+    Task RemoveAsync(string name);
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentEntityManagerOfT.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentEntityManagerOfT.cs
index 367fdf61b34..d49b0480b2d 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentEntityManagerOfT.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentEntityManagerOfT.cs
@@ -1,12 +1,11 @@
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.Documents
+namespace OrchardCore.Documents;
+
+/// <summary>
+/// An <see cref="IDocumentEntityManager{TDocumentEntity}"/> using a given type of <see cref="IDocumentStore"/>.
+/// </summary>
+public interface IDocumentEntityManager<TDocumentStore, TDocumentEntity> : IDocumentEntityManager<TDocumentEntity>
+    where TDocumentStore : IDocumentStore where TDocumentEntity : class, IDocumentEntity, new()
 {
-    /// <summary>
-    /// An <see cref="IDocumentEntityManager{TDocumentEntity}"/> using a given type of <see cref="IDocumentStore"/>.
-    /// </summary>
-    public interface IDocumentEntityManager<TDocumentStore, TDocumentEntity> : IDocumentEntityManager<TDocumentEntity>
-        where TDocumentStore : IDocumentStore where TDocumentEntity : class, IDocumentEntity, new()
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentManager.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentManager.cs
index 5e725f8f6a6..6cb99a84f0f 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentManager.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentManager.cs
@@ -2,26 +2,25 @@
 using System.Threading.Tasks;
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.Documents
+namespace OrchardCore.Documents;
+
+/// <summary>
+/// A generic service to keep in sync any single <see cref="IDocument"/> between a document store and a shared cache.
+/// </summary>
+public interface IDocumentManager<TDocument> where TDocument : class, IDocument, new()
 {
     /// <summary>
-    /// A generic service to keep in sync any single <see cref="IDocument"/> between a document store and a shared cache.
+    /// Loads a single document from the store (or create a new one) for updating and that should not be cached.
     /// </summary>
-    public interface IDocumentManager<TDocument> where TDocument : class, IDocument, new()
-    {
-        /// <summary>
-        /// Loads a single document from the store (or create a new one) for updating and that should not be cached.
-        /// </summary>
-        Task<TDocument> GetOrCreateMutableAsync(Func<Task<TDocument>> factoryAsync = null);
+    Task<TDocument> GetOrCreateMutableAsync(Func<Task<TDocument>> factoryAsync = null);
 
-        /// <summary>
-        /// Gets a single document from the cache (or create a new one) for sharing and that should not be updated.
-        /// </summary>
-        Task<TDocument> GetOrCreateImmutableAsync(Func<Task<TDocument>> factoryAsync = null);
+    /// <summary>
+    /// Gets a single document from the cache (or create a new one) for sharing and that should not be updated.
+    /// </summary>
+    Task<TDocument> GetOrCreateImmutableAsync(Func<Task<TDocument>> factoryAsync = null);
 
-        /// <summary>
-        /// Updates the store with the provided document and then updates the cache after the session is committed.
-        /// </summary>
-        Task UpdateAsync(TDocument document, Func<TDocument, Task> afterUpdateAsync = null);
-    }
+    /// <summary>
+    /// Updates the store with the provided document and then updates the cache after the session is committed.
+    /// </summary>
+    Task UpdateAsync(TDocument document, Func<TDocument, Task> afterUpdateAsync = null);
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentManagerOfT.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentManagerOfT.cs
index 28ca30faf00..98d394e5dca 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentManagerOfT.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentManagerOfT.cs
@@ -1,12 +1,11 @@
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.Documents
+namespace OrchardCore.Documents;
+
+/// <summary>
+/// An <see cref="IDocumentManager{TDocument}"/> using a given type of <see cref="IDocumentStore"/>.
+/// </summary>
+public interface IDocumentManager<TDocumentStore, TDocument> : IDocumentManager<TDocument>
+    where TDocumentStore : IDocumentStore where TDocument : class, IDocument, new()
 {
-    /// <summary>
-    /// An <see cref="IDocumentManager{TDocument}"/> using a given type of <see cref="IDocumentStore"/>.
-    /// </summary>
-    public interface IDocumentManager<TDocumentStore, TDocument> : IDocumentManager<TDocument>
-        where TDocumentStore : IDocumentStore where TDocument : class, IDocument, new()
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentSerializer.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentSerializer.cs
index 5972125fc37..89e2c178635 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentSerializer.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IDocumentSerializer.cs
@@ -1,21 +1,20 @@
 using System.Threading.Tasks;
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.Documents
+namespace OrchardCore.Documents;
+
+/// <summary>
+/// Serializes and deserializes an <see cref="IDocument"/> into and from a sequence of bytes.
+/// </summary>
+public interface IDocumentSerializer
 {
     /// <summary>
-    /// Serializes and deserializes an <see cref="IDocument"/> into and from a sequence of bytes.
+    /// Serializes an <see cref="IDocument"/> into a sequence of bytes.
     /// </summary>
-    public interface IDocumentSerializer
-    {
-        /// <summary>
-        /// Serializes an <see cref="IDocument"/> into a sequence of bytes.
-        /// </summary>
-        Task<byte[]> SerializeAsync<TDocument>(TDocument document, int compressThreshold = int.MaxValue) where TDocument : class, IDocument, new();
+    Task<byte[]> SerializeAsync<TDocument>(TDocument document, int compressThreshold = int.MaxValue) where TDocument : class, IDocument, new();
 
-        /// <summary>
-        /// Deserializes an <see cref="IDocument"/> from a sequence of bytes.
-        /// </summary>
-        Task<TDocument> DeserializeAsync<TDocument>(byte[] data) where TDocument : class, IDocument, new();
-    }
+    /// <summary>
+    /// Deserializes an <see cref="IDocument"/> from a sequence of bytes.
+    /// </summary>
+    Task<TDocument> DeserializeAsync<TDocument>(byte[] data) where TDocument : class, IDocument, new();
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IVolatileDocumentEntityManager.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IVolatileDocumentEntityManager.cs
index 44b47fe6117..ed879c0e462 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IVolatileDocumentEntityManager.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IVolatileDocumentEntityManager.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Documents
+namespace OrchardCore.Documents;
+
+/// <summary>
+/// An <see cref="IDocumentEntityManager{TDocumentEntity}"/> using a shared cache but without any persistent storage.
+/// </summary>
+public interface IVolatileDocumentEntityManager<TDocumentEntity> : IDocumentEntityManager<TDocumentEntity> where TDocumentEntity : class, IDocumentEntity, new()
 {
-    /// <summary>
-    /// An <see cref="IDocumentEntityManager{TDocumentEntity}"/> using a shared cache but without any persistent storage.
-    /// </summary>
-    public interface IVolatileDocumentEntityManager<TDocumentEntity> : IDocumentEntityManager<TDocumentEntity> where TDocumentEntity : class, IDocumentEntity, new()
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IVolatileDocumentManager.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IVolatileDocumentManager.cs
index 7f1f7e072f4..94956392e33 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IVolatileDocumentManager.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/IVolatileDocumentManager.cs
@@ -2,17 +2,16 @@
 using System.Threading.Tasks;
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.Documents
+namespace OrchardCore.Documents;
+
+/// <summary>
+/// An <see cref="IDocumentManager{TDocument}"/> using a shared cache but without any persistent storage.
+/// </summary>
+public interface IVolatileDocumentManager<TDocument> : IDocumentManager<TDocument> where TDocument : class, IDocument, new()
 {
     /// <summary>
-    /// An <see cref="IDocumentManager{TDocument}"/> using a shared cache but without any persistent storage.
+    /// Executes the provided delegate and updates the cache, the whole being done atomically and after the session is committed,
+    /// this only if a lock can be acquired (default timeout to 10s), and atomically if the lock doesn't expire (default to 10s).
     /// </summary>
-    public interface IVolatileDocumentManager<TDocument> : IDocumentManager<TDocument> where TDocument : class, IDocument, new()
-    {
-        /// <summary>
-        /// Executes the provided delegate and updates the cache, the whole being done atomically and after the session is committed,
-        /// this only if a lock can be acquired (default timeout to 10s), and atomically if the lock doesn't expire (default to 10s).
-        /// </summary>
-        Task UpdateAtomicAsync(Func<Task<TDocument>> updateAsync, Func<TDocument, Task> afterUpdateAsync = null);
-    }
+    Task UpdateAtomicAsync(Func<Task<TDocument>> updateAsync, Func<TDocument, Task> afterUpdateAsync = null);
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/Options/DocumentNamedOptions.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/Options/DocumentNamedOptions.cs
index 11e19b17336..4f1354e121c 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/Options/DocumentNamedOptions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/Options/DocumentNamedOptions.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Documents.Options
+namespace OrchardCore.Documents.Options;
+
+public class DocumentNamedOptions : DocumentOptionsBase, IDocumentNamedOptions
 {
-    public class DocumentNamedOptions : DocumentOptionsBase, IDocumentNamedOptions
-    {
-        public string CacheKey { get; set; }
-        public string CacheIdKey { get; set; }
-    }
+    public string CacheKey { get; set; }
+    public string CacheIdKey { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/Options/DocumentOptions.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/Options/DocumentOptions.cs
index bb636fdf9dc..10523dda32d 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/Options/DocumentOptions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/Options/DocumentOptions.cs
@@ -1,14 +1,13 @@
 using System;
 
-namespace OrchardCore.Documents.Options
+namespace OrchardCore.Documents.Options;
+
+public class DocumentOptions : DocumentOptionsBase, IDocumentNamedOptions, IDocumentSharedOptions
 {
-    public class DocumentOptions : DocumentOptionsBase, IDocumentNamedOptions, IDocumentSharedOptions
-    {
-        // Only from the named config or default.
-        public string CacheKey { get; set; }
-        public string CacheIdKey { get; set; }
+    // Only from the named config or default.
+    public string CacheKey { get; set; }
+    public string CacheIdKey { get; set; }
 
-        // Only from the shared config or default.
-        public TimeSpan? FailoverRetryLatency { get; set; }
-    }
+    // Only from the shared config or default.
+    public TimeSpan? FailoverRetryLatency { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/Options/DocumentOptionsBase.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/Options/DocumentOptionsBase.cs
index 962a10becde..4ebc8fe1f6f 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/Options/DocumentOptionsBase.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/Options/DocumentOptionsBase.cs
@@ -1,19 +1,18 @@
 using System;
 using Microsoft.Extensions.Caching.Distributed;
 
-namespace OrchardCore.Documents.Options
+namespace OrchardCore.Documents.Options;
+
+public class DocumentOptionsBase : DistributedCacheEntryOptions
 {
-    public class DocumentOptionsBase : DistributedCacheEntryOptions
-    {
-        // From the named or shared config or default.
-        public bool? CheckConcurrency { get; set; }
-        public bool? CheckConsistency { get; set; }
-        public TimeSpan? SynchronizationLatency { get; set; }
-        public IDocumentSerializer Serializer { get; set; }
-        public int CompressThreshold { get; set; }
+    // From the named or shared config or default.
+    public bool? CheckConcurrency { get; set; }
+    public bool? CheckConsistency { get; set; }
+    public TimeSpan? SynchronizationLatency { get; set; }
+    public IDocumentSerializer Serializer { get; set; }
+    public int CompressThreshold { get; set; }
 
-        // Only used by an explicit atomic update.
-        public int LockTimeout { get; set; }
-        public int LockExpiration { get; set; }
-    }
+    // Only used by an explicit atomic update.
+    public int LockTimeout { get; set; }
+    public int LockExpiration { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/Options/DocumentSharedOptions.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/Options/DocumentSharedOptions.cs
index 867e102f0d5..f2312e7f804 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/Options/DocumentSharedOptions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Documents/Options/DocumentSharedOptions.cs
@@ -1,9 +1,8 @@
 using System;
 
-namespace OrchardCore.Documents.Options
+namespace OrchardCore.Documents.Options;
+
+public class DocumentSharedOptions : DocumentOptionsBase, IDocumentSharedOptions
 {
-    public class DocumentSharedOptions : DocumentOptionsBase, IDocumentSharedOptions
-    {
-        public TimeSpan? FailoverRetryLatency { get; set; }
-    }
+    public TimeSpan? FailoverRetryLatency { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Email/EmailAddressAttribute.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Email/EmailAddressAttribute.cs
index 4ef66774cee..7aafed96544 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Email/EmailAddressAttribute.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Email/EmailAddressAttribute.cs
@@ -2,25 +2,24 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Email
+namespace OrchardCore.Email;
+
+/// <summary>
+/// Validates an email address.
+/// </summary>
+public class EmailAddressAttribute : ValidationAttribute
 {
-    /// <summary>
-    /// Validates an email address.
-    /// </summary>
-    public class EmailAddressAttribute : ValidationAttribute
+    /// <inheritdoc/>
+    protected override ValidationResult IsValid(object value, ValidationContext validationContext)
     {
-        /// <inheritdoc/>
-        protected override ValidationResult IsValid(object value, ValidationContext validationContext)
-        {
-            var emailAddressValidator = validationContext.GetService<IEmailAddressValidator>();
-            var S = validationContext.GetService<IStringLocalizer<EmailAddressAttribute>>();
-
-            if (value == null || emailAddressValidator.Validate(value.ToString()))
-            {
-                return ValidationResult.Success;
-            }
+        var emailAddressValidator = validationContext.GetService<IEmailAddressValidator>();
+        var S = validationContext.GetService<IStringLocalizer<EmailAddressAttribute>>();
 
-            return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
+        if (value == null || emailAddressValidator.Validate(value.ToString()))
+        {
+            return ValidationResult.Success;
         }
+
+        return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) });
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Email/IEmailAddressValidator.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Email/IEmailAddressValidator.cs
index 3e5ad856ec5..3074cb3342c 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Email/IEmailAddressValidator.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Email/IEmailAddressValidator.cs
@@ -1,15 +1,14 @@
-namespace OrchardCore.Email
+namespace OrchardCore.Email;
+
+/// <summary>
+/// Contract for e-mail address validation service.
+/// </summary>
+public interface IEmailAddressValidator
 {
     /// <summary>
-    /// Contract for e-mail address validation service.
+    /// Validates an e-mail address.
     /// </summary>
-    public interface IEmailAddressValidator
-    {
-        /// <summary>
-        /// Validates an e-mail address.
-        /// </summary>
-        /// <param name="emailAddress">The e-mail address to be validated.</param>
-        /// <returns><c>true</c> if the email is valid, otherwise <c>false</c>.</returns>
-        bool Validate(string emailAddress);
-    }
+    /// <param name="emailAddress">The e-mail address to be validated.</param>
+    /// <returns><c>true</c> if the email is valid, otherwise <c>false</c>.</returns>
+    bool Validate(string emailAddress);
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Entities/IIdGenerator.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Entities/IIdGenerator.cs
index b86fde969a7..b42592b7285 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Entities/IIdGenerator.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Entities/IIdGenerator.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Entities
+namespace OrchardCore.Entities;
+
+public interface IIdGenerator
 {
-    public interface IIdGenerator
-    {
-        string GenerateUniqueId();
-    }
+    string GenerateUniqueId();
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Files/FileProviderExtensions.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Files/FileProviderExtensions.cs
index 75d643da24f..f206a3cf0bd 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Files/FileProviderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Files/FileProviderExtensions.cs
@@ -1,15 +1,14 @@
 using System.IO;
 
-namespace Microsoft.Extensions.FileProviders
+namespace Microsoft.Extensions.FileProviders;
+
+public static class FileProviderExtensions
 {
-    public static class FileProviderExtensions
+    /// <summary>
+    /// Locate a file at the give relative paths.
+    /// </summary>
+    public static IFileInfo GetRelativeFileInfo(this IFileProvider provider, string path, string other = null)
     {
-        /// <summary>
-        /// Locate a file at the give relative paths.
-        /// </summary>
-        public static IFileInfo GetRelativeFileInfo(this IFileProvider provider, string path, string other = null)
-        {
-            return provider.GetFileInfo(PathExtensions.ResolvePath(PathExtensions.Combine(path, other)));
-        }
+        return provider.GetFileInfo(PathExtensions.ResolvePath(PathExtensions.Combine(path, other)));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Files/PathExtensions.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Files/PathExtensions.cs
index cb3cec9ea16..2bfe2907c50 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Files/PathExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Files/PathExtensions.cs
@@ -2,133 +2,132 @@
 using System.Text;
 using Microsoft.Extensions.Primitives;
 
-namespace System.IO
+namespace System.IO;
+
+public static class PathExtensions
 {
-    public static class PathExtensions
+    public static readonly char[] PathSeparators = ['/', '\\'];
+    private const string CurrentDirectoryToken = ".";
+    private const string ParentDirectoryToken = "..";
+
+    /// <summary>
+    /// Combines two path parts.
+    /// </summary>
+    public static string Combine(string path, string other = null)
     {
-        public static readonly char[] PathSeparators = ['/', '\\'];
-        private const string CurrentDirectoryToken = ".";
-        private const string ParentDirectoryToken = "..";
-
-        /// <summary>
-        /// Combines two path parts.
-        /// </summary>
-        public static string Combine(string path, string other = null)
+        if (string.IsNullOrWhiteSpace(other))
         {
-            if (string.IsNullOrWhiteSpace(other))
-            {
-                return path;
-            }
+            return path;
+        }
 
-            if (other.StartsWith('/') || other.StartsWith('\\'))
-            {
-                // "other" is already an app-rooted path. Return it as-is.
-                return other;
-            }
+        if (other.StartsWith('/') || other.StartsWith('\\'))
+        {
+            // "other" is already an app-rooted path. Return it as-is.
+            return other;
+        }
 
-            string result;
+        string result;
 
-            var index = path.LastIndexOfAny(PathSeparators);
+        var index = path.LastIndexOfAny(PathSeparators);
 
-            if (index != path.Length - 1)
-            {
-                // If the first ends in a trailing slash e.g. "/Home/", assume it's a directory.
-                result = path + "/" + other;
-            }
-            else
-            {
-                result = string.Concat(path.AsSpan(0, index + 1), other);
-            }
+        if (index != path.Length - 1)
+        {
+            // If the first ends in a trailing slash e.g. "/Home/", assume it's a directory.
+            result = path + "/" + other;
+        }
+        else
+        {
+            result = string.Concat(path.AsSpan(0, index + 1), other);
+        }
+
+        return result;
+    }
+
+    /// <summary>
+    /// Combines multiple path parts.
+    /// </summary>
+    public static string Combine(string path, params string[] others)
+    {
+        var result = path;
 
-            return result;
+        for (var i = 0; i < others.Length; i++)
+        {
+            result = Combine(result, others[i]);
         }
 
-        /// <summary>
-        /// Combines multiple path parts.
-        /// </summary>
-        public static string Combine(string path, params string[] others)
+        return result;
+    }
+
+    /// <summary>
+    /// Resolves relative segments in a path.
+    /// </summary>
+    public static string ResolvePath(string path)
+    {
+        var pathSegment = new StringSegment(path);
+        if (path[0] == PathSeparators[0] || path[0] == PathSeparators[1])
         {
-            var result = path;
+            // Leading slashes (e.g. "/Views/Index.cshtml") always generate an empty first token. Ignore these
+            // for purposes of resolution.
+            pathSegment = pathSegment.Subsegment(1);
+        }
 
-            for (var i = 0; i < others.Length; i++)
+        var tokenizer = new StringTokenizer(pathSegment, PathSeparators);
+        var requiresResolution = false;
+        foreach (var segment in tokenizer)
+        {
+            // Determine if we need to do any path resolution.
+            // We need to resolve paths with multiple path separators (e.g "//" or "\\") or, directory traversals e.g. ("../" or "./").
+            if (segment.Length == 0 ||
+                segment.Equals(ParentDirectoryToken) ||
+                segment.Equals(CurrentDirectoryToken))
             {
-                result = Combine(result, others[i]);
+                requiresResolution = true;
+                break;
             }
+        }
 
-            return result;
+        if (!requiresResolution)
+        {
+            return path;
         }
 
-        /// <summary>
-        /// Resolves relative segments in a path.
-        /// </summary>
-        public static string ResolvePath(string path)
+        var pathSegments = new List<StringSegment>();
+        foreach (var segment in tokenizer)
         {
-            var pathSegment = new StringSegment(path);
-            if (path[0] == PathSeparators[0] || path[0] == PathSeparators[1])
+            if (segment.Length == 0)
             {
-                // Leading slashes (e.g. "/Views/Index.cshtml") always generate an empty first token. Ignore these
-                // for purposes of resolution.
-                pathSegment = pathSegment.Subsegment(1);
+                // Ignore multiple directory separators
+                continue;
             }
-
-            var tokenizer = new StringTokenizer(pathSegment, PathSeparators);
-            var requiresResolution = false;
-            foreach (var segment in tokenizer)
+            if (segment.Equals(ParentDirectoryToken))
             {
-                // Determine if we need to do any path resolution.
-                // We need to resolve paths with multiple path separators (e.g "//" or "\\") or, directory traversals e.g. ("../" or "./").
-                if (segment.Length == 0 ||
-                    segment.Equals(ParentDirectoryToken) ||
-                    segment.Equals(CurrentDirectoryToken))
+                if (pathSegments.Count == 0)
                 {
-                    requiresResolution = true;
-                    break;
+                    // Don't resolve the path if we ever escape the file system root. We can't reason about it in a
+                    // consistent way.
+                    return path;
                 }
+                pathSegments.RemoveAt(pathSegments.Count - 1);
             }
-
-            if (!requiresResolution)
+            else if (segment.Equals(CurrentDirectoryToken))
             {
-                return path;
+                // We already have the current directory
+                continue;
             }
-
-            var pathSegments = new List<StringSegment>();
-            foreach (var segment in tokenizer)
-            {
-                if (segment.Length == 0)
-                {
-                    // Ignore multiple directory separators
-                    continue;
-                }
-                if (segment.Equals(ParentDirectoryToken))
-                {
-                    if (pathSegments.Count == 0)
-                    {
-                        // Don't resolve the path if we ever escape the file system root. We can't reason about it in a
-                        // consistent way.
-                        return path;
-                    }
-                    pathSegments.RemoveAt(pathSegments.Count - 1);
-                }
-                else if (segment.Equals(CurrentDirectoryToken))
-                {
-                    // We already have the current directory
-                    continue;
-                }
-                else
-                {
-                    pathSegments.Add(segment);
-                }
-            }
-
-            var builder = new StringBuilder();
-            for (var i = 0; i < pathSegments.Count; i++)
+            else
             {
-                var segment = pathSegments[i];
-                builder.Append('/');
-                builder.Append(segment.Buffer, segment.Offset, segment.Length);
+                pathSegments.Add(segment);
             }
+        }
 
-            return builder.ToString();
+        var builder = new StringBuilder();
+        for (var i = 0; i < pathSegments.Count; i++)
+        {
+            var segment = pathSegments[i];
+            builder.Append('/');
+            builder.Append(segment.Buffer, segment.Offset, segment.Length);
         }
+
+        return builder.ToString();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Html/IHtmlSanitizerService.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Html/IHtmlSanitizerService.cs
index 6f2b2a0d8d5..81fc9112e5a 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Html/IHtmlSanitizerService.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Html/IHtmlSanitizerService.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Infrastructure.Html
+namespace OrchardCore.Infrastructure.Html;
+
+public interface IHtmlSanitizerService
 {
-    public interface IHtmlSanitizerService
-    {
-        string Sanitize(string html);
-    }
+    string Sanitize(string html);
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/GlobalMethod.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/GlobalMethod.cs
index 657bf6ba28d..b7981870133 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/GlobalMethod.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/GlobalMethod.cs
@@ -1,10 +1,9 @@
 using System;
 
-namespace OrchardCore.Scripting
+namespace OrchardCore.Scripting;
+
+public class GlobalMethod
 {
-    public class GlobalMethod
-    {
-        public string Name { get; set; }
-        public Func<IServiceProvider, Delegate> Method { get; set; }
-    }
+    public string Name { get; set; }
+    public Func<IServiceProvider, Delegate> Method { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/IGlobalMethodProvider.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/IGlobalMethodProvider.cs
index cadcd3d3b71..725da876619 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/IGlobalMethodProvider.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/IGlobalMethodProvider.cs
@@ -1,17 +1,16 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Scripting
+namespace OrchardCore.Scripting;
+
+/// <summary>
+/// An implementation of <see cref="IGlobalMethodProvider"/> provides custom methods for
+/// an <see cref="IScriptingManager"/> instance.
+/// </summary>
+public interface IGlobalMethodProvider
 {
     /// <summary>
-    /// An implementation of <see cref="IGlobalMethodProvider"/> provides custom methods for
-    /// an <see cref="IScriptingManager"/> instance.
+    /// Gets the list of methods to provide to the <see cref="IScriptingManager"/>.
     /// </summary>
-    public interface IGlobalMethodProvider
-    {
-        /// <summary>
-        /// Gets the list of methods to provide to the <see cref="IScriptingManager"/>.
-        /// </summary>
-        /// <returns>A list of <see cref="GlobalMethod"/> instances.</returns>
-        IEnumerable<GlobalMethod> GetMethods();
-    }
+    /// <returns>A list of <see cref="GlobalMethod"/> instances.</returns>
+    IEnumerable<GlobalMethod> GetMethods();
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/IScriptingEngine.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/IScriptingEngine.cs
index dba5f819152..03898060f44 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/IScriptingEngine.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/IScriptingEngine.cs
@@ -2,12 +2,11 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.Scripting
+namespace OrchardCore.Scripting;
+
+public interface IScriptingEngine
 {
-    public interface IScriptingEngine
-    {
-        string Prefix { get; }
-        object Evaluate(IScriptingScope scope, string script);
-        IScriptingScope CreateScope(IEnumerable<GlobalMethod> methods, IServiceProvider serviceProvider, IFileProvider fileProvider, string basePath);
-    }
+    string Prefix { get; }
+    object Evaluate(IScriptingScope scope, string script);
+    IScriptingScope CreateScope(IEnumerable<GlobalMethod> methods, IServiceProvider serviceProvider, IFileProvider fileProvider, string basePath);
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/IScriptingManager.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/IScriptingManager.cs
index 5c9593e8968..5848c1b7c19 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/IScriptingManager.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/IScriptingManager.cs
@@ -1,35 +1,34 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.Scripting
+namespace OrchardCore.Scripting;
+
+/// <summary>
+/// An implementation of <see cref="IScriptingManager"/> provides services to evaluate
+/// custom scripts.
+/// </summary>
+public interface IScriptingManager
 {
     /// <summary>
-    /// An implementation of <see cref="IScriptingManager"/> provides services to evaluate
-    /// custom scripts.
+    /// Gets the scripting engine with the specified prefix.
     /// </summary>
-    public interface IScriptingManager
-    {
-        /// <summary>
-        /// Gets the scripting engine with the specified prefix.
-        /// </summary>
-        /// <param name="prefix">A string representing the engine to return.</param>
-        /// <returns>A scripting engine or. <code>null</code> if it couldn't be found.</returns>
-        IScriptingEngine GetScriptingEngine(string prefix);
+    /// <param name="prefix">A string representing the engine to return.</param>
+    /// <returns>A scripting engine or. <code>null</code> if it couldn't be found.</returns>
+    IScriptingEngine GetScriptingEngine(string prefix);
 
-        /// <summary>
-        /// Executes some prefixed script by looking for a matching scripting engine.
-        /// </summary>
-        /// <param name="directive">The directive to execute. A directive is made of a. </param>
-        /// <param name="fileProvider">An optional <see cref="IFileProvider"/> instance.</param>
-        /// <param name="basePath">The base path.</param>
-        /// <param name="scopedMethodProviders">A list of method providers scoped to the script evaluation.</param>
-        /// <returns>The result of the script if any.</returns>
-        object Evaluate(string directive, IFileProvider fileProvider, string basePath, IEnumerable<IGlobalMethodProvider> scopedMethodProviders);
+    /// <summary>
+    /// Executes some prefixed script by looking for a matching scripting engine.
+    /// </summary>
+    /// <param name="directive">The directive to execute. A directive is made of a. </param>
+    /// <param name="fileProvider">An optional <see cref="IFileProvider"/> instance.</param>
+    /// <param name="basePath">The base path.</param>
+    /// <param name="scopedMethodProviders">A list of method providers scoped to the script evaluation.</param>
+    /// <returns>The result of the script if any.</returns>
+    object Evaluate(string directive, IFileProvider fileProvider, string basePath, IEnumerable<IGlobalMethodProvider> scopedMethodProviders);
 
-        /// <summary>
-        /// The list of available method providers for this <see cref="IScriptingManager"/>
-        /// instance.
-        /// </summary>
-        IReadOnlyList<IGlobalMethodProvider> GlobalMethodProviders { get; }
-    }
+    /// <summary>
+    /// The list of available method providers for this <see cref="IScriptingManager"/>
+    /// instance.
+    /// </summary>
+    IReadOnlyList<IGlobalMethodProvider> GlobalMethodProviders { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/IScriptingScope.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/IScriptingScope.cs
index 427c66946f1..1d9dc434552 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/IScriptingScope.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Scripting/IScriptingScope.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Scripting
+namespace OrchardCore.Scripting;
+
+public interface IScriptingScope
 {
-    public interface IScriptingScope
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/ApiAuthorizationOptions.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/ApiAuthorizationOptions.cs
index 511b580a526..3bf0fa29d29 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/ApiAuthorizationOptions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/ApiAuthorizationOptions.cs
@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.Authentication;
 
-namespace OrchardCore.Security
+namespace OrchardCore.Security;
+
+public class ApiAuthorizationOptions : AuthenticationSchemeOptions
 {
-    public class ApiAuthorizationOptions : AuthenticationSchemeOptions
-    {
-        public string ApiAuthenticationScheme { get; set; } = "Bearer";
-    }
+    public string ApiAuthenticationScheme { get; set; } = "Bearer";
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/AuthorizationServiceExtensions.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/AuthorizationServiceExtensions.cs
index f50826dd063..d09e77c3e26 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/AuthorizationServiceExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/AuthorizationServiceExtensions.cs
@@ -3,23 +3,22 @@
 using OrchardCore.Security;
 using OrchardCore.Security.Permissions;
 
-namespace Microsoft.AspNetCore.Authorization
+namespace Microsoft.AspNetCore.Authorization;
+
+public static class AuthorizationServiceExtensions
 {
-    public static class AuthorizationServiceExtensions
+    public static Task<bool> AuthorizeAsync(this IAuthorizationService service, ClaimsPrincipal user, Permission permission)
     {
-        public static Task<bool> AuthorizeAsync(this IAuthorizationService service, ClaimsPrincipal user, Permission permission)
-        {
-            return AuthorizeAsync(service, user, permission, null);
-        }
+        return AuthorizeAsync(service, user, permission, null);
+    }
 
-        public static async Task<bool> AuthorizeAsync(this IAuthorizationService service, ClaimsPrincipal user, Permission permission, object resource)
+    public static async Task<bool> AuthorizeAsync(this IAuthorizationService service, ClaimsPrincipal user, Permission permission, object resource)
+    {
+        if (user == null)
         {
-            if (user == null)
-            {
-                return false;
-            }
-
-            return (await service.AuthorizeAsync(user, resource, new PermissionRequirement(permission))).Succeeded;
+            return false;
         }
+
+        return (await service.AuthorizeAsync(user, resource, new PermissionRequirement(permission))).Succeeded;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/IPermissionGrantingService.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/IPermissionGrantingService.cs
index ec066a9cf61..e86bf84317f 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/IPermissionGrantingService.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/IPermissionGrantingService.cs
@@ -1,16 +1,15 @@
 using System.Collections.Generic;
 using System.Security.Claims;
 
-namespace OrchardCore.Security
+namespace OrchardCore.Security;
+
+public interface IPermissionGrantingService
 {
-    public interface IPermissionGrantingService
-    {
-        /// <summary>
-        /// Evaluates if the specified <see cref="PermissionRequirement"/> is granted by provided claims.
-        /// </summary>
-        /// <param name="requirement">The <see cref="PermissionRequirement"/> to challenge.</param>
-        /// <param name="claims">Provided claims.</param>
-        /// <returns>True if the permission is granted, otherwise false.</returns>
-        public bool IsGranted(PermissionRequirement requirement, IEnumerable<Claim> claims);
-    }
+    /// <summary>
+    /// Evaluates if the specified <see cref="PermissionRequirement"/> is granted by provided claims.
+    /// </summary>
+    /// <param name="requirement">The <see cref="PermissionRequirement"/> to challenge.</param>
+    /// <param name="claims">Provided claims.</param>
+    /// <returns>True if the permission is granted, otherwise false.</returns>
+    public bool IsGranted(PermissionRequirement requirement, IEnumerable<Claim> claims);
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/IRole.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/IRole.cs
index 32db1a974ed..c612fb05d06 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/IRole.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/IRole.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Security
+namespace OrchardCore.Security;
+
+public interface IRole
 {
-    public interface IRole
-    {
-        string RoleName { get; }
+    string RoleName { get; }
 
-        string RoleDescription { get; }
-    }
+    string RoleDescription { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/IRoleCreatedEventHandler.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/IRoleCreatedEventHandler.cs
index 2367712e639..8dd80784f20 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/IRoleCreatedEventHandler.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/IRoleCreatedEventHandler.cs
@@ -1,9 +1,8 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Security
+namespace OrchardCore.Security;
+
+public interface IRoleCreatedEventHandler
 {
-    public interface IRoleCreatedEventHandler
-    {
-        Task RoleCreatedAsync(string roleName);
-    }
+    Task RoleCreatedAsync(string roleName);
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/IRoleRemovedEventHandler.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/IRoleRemovedEventHandler.cs
index a3f8c77fcd4..7a398fd5567 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/IRoleRemovedEventHandler.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/IRoleRemovedEventHandler.cs
@@ -1,9 +1,8 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Security
+namespace OrchardCore.Security;
+
+public interface IRoleRemovedEventHandler
 {
-    public interface IRoleRemovedEventHandler
-    {
-        Task RoleRemovedAsync(string roleName);
-    }
+    Task RoleRemovedAsync(string roleName);
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/PermissionRequirement.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/PermissionRequirement.cs
index 714c4311981..a2346db41c5 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/PermissionRequirement.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/PermissionRequirement.cs
@@ -2,17 +2,16 @@
 using Microsoft.AspNetCore.Authorization;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Security
+namespace OrchardCore.Security;
+
+public class PermissionRequirement : IAuthorizationRequirement
 {
-    public class PermissionRequirement : IAuthorizationRequirement
+    public PermissionRequirement(Permission permission)
     {
-        public PermissionRequirement(Permission permission)
-        {
-            ArgumentNullException.ThrowIfNull(permission);
-
-            Permission = permission;
-        }
+        ArgumentNullException.ThrowIfNull(permission);
 
-        public Permission Permission { get; set; }
+        Permission = permission;
     }
+
+    public Permission Permission { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Permissions/IPermissionProvider.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Permissions/IPermissionProvider.cs
index f52f8aa1170..2cfc8f5fd10 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Permissions/IPermissionProvider.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Permissions/IPermissionProvider.cs
@@ -1,21 +1,20 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Security.Permissions
+namespace OrchardCore.Security.Permissions;
+
+/// <summary>
+/// Implemented by modules to enumerate the types of permissions
+/// the which may be granted.
+/// </summary>
+public interface IPermissionProvider
 {
-    /// <summary>
-    /// Implemented by modules to enumerate the types of permissions
-    /// the which may be granted.
-    /// </summary>
-    public interface IPermissionProvider
-    {
-        Task<IEnumerable<Permission>> GetPermissionsAsync();
-        IEnumerable<PermissionStereotype> GetDefaultStereotypes();
-    }
+    Task<IEnumerable<Permission>> GetPermissionsAsync();
+    IEnumerable<PermissionStereotype> GetDefaultStereotypes();
+}
 
-    public class PermissionStereotype
-    {
-        public string Name { get; set; }
-        public IEnumerable<Permission> Permissions { get; set; }
-    }
+public class PermissionStereotype
+{
+    public string Name { get; set; }
+    public IEnumerable<Permission> Permissions { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Permissions/Permission.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Permissions/Permission.cs
index cf059734e68..75b261cf1d7 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Permissions/Permission.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Permissions/Permission.cs
@@ -2,39 +2,38 @@
 using System.Collections.Generic;
 using System.Security.Claims;
 
-namespace OrchardCore.Security.Permissions
+namespace OrchardCore.Security.Permissions;
+
+public class Permission
 {
-    public class Permission
+    public const string ClaimType = "Permission";
+
+    public Permission(string name)
+    {
+        ArgumentNullException.ThrowIfNull(name);
+
+        Name = name;
+    }
+
+    public Permission(string name, string description, bool isSecurityCritical = false) : this(name)
+    {
+        Description = description;
+        IsSecurityCritical = isSecurityCritical;
+    }
+
+    public Permission(string name, string description, IEnumerable<Permission> impliedBy, bool isSecurityCritical = false) : this(name, description, isSecurityCritical)
+    {
+        ImpliedBy = impliedBy;
+    }
+
+    public string Name { get; }
+    public string Description { get; set; }
+    public string Category { get; set; }
+    public IEnumerable<Permission> ImpliedBy { get; }
+    public bool IsSecurityCritical { get; }
+
+    public static implicit operator Claim(Permission p)
     {
-        public const string ClaimType = "Permission";
-
-        public Permission(string name)
-        {
-            ArgumentNullException.ThrowIfNull(name);
-
-            Name = name;
-        }
-
-        public Permission(string name, string description, bool isSecurityCritical = false) : this(name)
-        {
-            Description = description;
-            IsSecurityCritical = isSecurityCritical;
-        }
-
-        public Permission(string name, string description, IEnumerable<Permission> impliedBy, bool isSecurityCritical = false) : this(name, description, isSecurityCritical)
-        {
-            ImpliedBy = impliedBy;
-        }
-
-        public string Name { get; }
-        public string Description { get; set; }
-        public string Category { get; set; }
-        public IEnumerable<Permission> ImpliedBy { get; }
-        public bool IsSecurityCritical { get; }
-
-        public static implicit operator Claim(Permission p)
-        {
-            return new Claim(ClaimType, p.Name);
-        }
+        return new Claim(ClaimType, p.Name);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Role.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Role.cs
index 99093671910..97f89601b9e 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Role.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Role.cs
@@ -1,29 +1,28 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Security
+namespace OrchardCore.Security;
+
+public class Role : IRole
 {
-    public class Role : IRole
-    {
-        public string RoleName { get; set; }
-        public string RoleDescription { get; set; }
-        public string NormalizedRoleName { get; set; }
-        public List<RoleClaim> RoleClaims { get; set; } = [];
+    public string RoleName { get; set; }
+    public string RoleDescription { get; set; }
+    public string NormalizedRoleName { get; set; }
+    public List<RoleClaim> RoleClaims { get; set; } = [];
 
-        public Role Clone()
+    public Role Clone()
+    {
+        var role = new Role
         {
-            var role = new Role
-            {
-                RoleName = RoleName,
-                RoleDescription = RoleDescription,
-                NormalizedRoleName = NormalizedRoleName,
-            };
+            RoleName = RoleName,
+            RoleDescription = RoleDescription,
+            NormalizedRoleName = NormalizedRoleName,
+        };
 
-            foreach (var claim in RoleClaims)
-            {
-                role.RoleClaims.Add(new RoleClaim() { ClaimType = claim.ClaimType, ClaimValue = claim.ClaimValue });
-            }
-
-            return role;
+        foreach (var claim in RoleClaims)
+        {
+            role.RoleClaims.Add(new RoleClaim() { ClaimType = claim.ClaimType, ClaimValue = claim.ClaimValue });
         }
+
+        return role;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/RoleClaim.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/RoleClaim.cs
index 99f80ed41b7..1c112559aef 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/RoleClaim.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/RoleClaim.cs
@@ -1,30 +1,29 @@
 using System.Security.Claims;
 
-namespace OrchardCore.Security
+namespace OrchardCore.Security;
+
+/// <summary>
+/// Represents a claim that is granted to all users within a role.
+/// </summary>
+public class RoleClaim
 {
     /// <summary>
-    /// Represents a claim that is granted to all users within a role.
+    /// Gets or sets the claim type for this claim.
     /// </summary>
-    public class RoleClaim
-    {
-        /// <summary>
-        /// Gets or sets the claim type for this claim.
-        /// </summary>
-        public string ClaimType { get; set; }
+    public string ClaimType { get; set; }
 
-        /// <summary>
-        /// Gets or sets the claim value for this claim.
-        /// </summary>
-        public string ClaimValue { get; set; }
+    /// <summary>
+    /// Gets or sets the claim value for this claim.
+    /// </summary>
+    public string ClaimValue { get; set; }
 
-        public Claim ToClaim()
-        {
-            return new Claim(ClaimType, ClaimValue);
-        }
+    public Claim ToClaim()
+    {
+        return new Claim(ClaimType, ClaimValue);
+    }
 
-        public static implicit operator Claim(RoleClaim claim)
-        {
-            return claim.ToClaim();
-        }
+    public static implicit operator Claim(RoleClaim claim)
+    {
+        return claim.ToClaim();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/SecurityHeaderNames.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/SecurityHeaderNames.cs
index 59c267708b8..d795ab0542d 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/SecurityHeaderNames.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/SecurityHeaderNames.cs
@@ -1,13 +1,12 @@
-namespace OrchardCore.Security
+namespace OrchardCore.Security;
+
+public static class SecurityHeaderNames
 {
-    public static class SecurityHeaderNames
-    {
-        public const string ContentSecurityPolicy = "Content-Security-Policy";
+    public const string ContentSecurityPolicy = "Content-Security-Policy";
 
-        public const string PermissionsPolicy = "Permissions-Policy";
+    public const string PermissionsPolicy = "Permissions-Policy";
 
-        public const string ReferrerPolicy = "Referrer-Policy";
+    public const string ReferrerPolicy = "Referrer-Policy";
 
-        public const string XContentTypeOptions = "X-Content-Type-Options";
-    }
+    public const string XContentTypeOptions = "X-Content-Type-Options";
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Services/IRoleService.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Services/IRoleService.cs
index 43adccf31dd..00a980a24ad 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Services/IRoleService.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Services/IRoleService.cs
@@ -3,12 +3,11 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Security.Services
+namespace OrchardCore.Security.Services;
+
+public interface IRoleService
 {
-    public interface IRoleService
-    {
-        Task<IEnumerable<IRole>> GetRolesAsync();
-        Task<IEnumerable<Claim>> GetRoleClaimsAsync(string role, CancellationToken cancellationToken = default);
-        Task<IEnumerable<string>> GetNormalizedRoleNamesAsync();
-    }
+    Task<IEnumerable<IRole>> GetRolesAsync();
+    Task<IEnumerable<Claim>> GetRoleClaimsAsync(string role, CancellationToken cancellationToken = default);
+    Task<IEnumerable<string>> GetNormalizedRoleNamesAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Services/RoleServiceExtensions.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Services/RoleServiceExtensions.cs
index 94e36ac220a..fb327464715 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Services/RoleServiceExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Security/Services/RoleServiceExtensions.cs
@@ -5,45 +5,44 @@
 using Microsoft.AspNetCore.Authorization;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Security.Services
+namespace OrchardCore.Security.Services;
+
+public static class RoleServiceExtensions
 {
-    public static class RoleServiceExtensions
+    public static async Task<IEnumerable<string>> GetRoleNamesAsync(this IRoleService roleService)
     {
-        public static async Task<IEnumerable<string>> GetRoleNamesAsync(this IRoleService roleService)
-        {
-            var roles = await roleService.GetRolesAsync();
+        var roles = await roleService.GetRolesAsync();
 
-            return roles.Select(r => r.RoleName);
-        }
+        return roles.Select(r => r.RoleName);
+    }
 
-        public static async Task<IEnumerable<IRole>> GetAccessibleRolesAsync(this IRoleService roleService, IAuthorizationService authorizationService, ClaimsPrincipal user, Permission permission)
-        {
-            var roles = await roleService.GetRolesAsync();
+    public static async Task<IEnumerable<IRole>> GetAccessibleRolesAsync(this IRoleService roleService, IAuthorizationService authorizationService, ClaimsPrincipal user, Permission permission)
+    {
+        var roles = await roleService.GetRolesAsync();
 
-            var accessibleRoles = new List<IRole>();
-            foreach (var role in roles)
+        var accessibleRoles = new List<IRole>();
+        foreach (var role in roles)
+        {
+            if (RoleHelper.SystemRoleNames.Contains(role.RoleName))
             {
-                if (RoleHelper.SystemRoleNames.Contains(role.RoleName))
-                {
-                    continue;
-                }
-
-                if (!await authorizationService.AuthorizeAsync(user, permission, role))
-                {
-                    continue;
-                }
+                continue;
+            }
 
-                accessibleRoles.Add(role);
+            if (!await authorizationService.AuthorizeAsync(user, permission, role))
+            {
+                continue;
             }
 
-            return accessibleRoles;
+            accessibleRoles.Add(role);
         }
 
-        public static async Task<IEnumerable<string>> GetAccessibleRoleNamesAsync(this IRoleService roleService, IAuthorizationService authorizationService, ClaimsPrincipal user, Permission permission)
-        {
-            var roles = await roleService.GetAccessibleRolesAsync(authorizationService, user, permission);
+        return accessibleRoles;
+    }
 
-            return roles.Select(x => x.RoleName);
-        }
+    public static async Task<IEnumerable<string>> GetAccessibleRoleNamesAsync(this IRoleService roleService, IAuthorizationService authorizationService, ClaimsPrincipal user, Permission permission)
+    {
+        var roles = await roleService.GetAccessibleRolesAsync(authorizationService, user, permission);
+
+        return roles.Select(x => x.RoleName);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Settings/CacheMode.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Settings/CacheMode.cs
index f96bfe606cf..9a27ca41631 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Settings/CacheMode.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Settings/CacheMode.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.Settings
+namespace OrchardCore.Settings;
+
+public enum CacheMode
 {
-    public enum CacheMode
-    {
-        FromConfiguration,
-        Enabled,
-        DebugEnabled,
-        Disabled
-    }
+    FromConfiguration,
+    Enabled,
+    DebugEnabled,
+    Disabled
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Settings/ISiteService.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Settings/ISiteService.cs
index a0a7b3a62f3..de3a49e55a4 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Settings/ISiteService.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Settings/ISiteService.cs
@@ -1,25 +1,24 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Settings
+namespace OrchardCore.Settings;
+
+/// <summary>
+/// Provides services to manage the sites settings.
+/// </summary>
+public interface ISiteService
 {
     /// <summary>
-    /// Provides services to manage the sites settings.
+    /// Loads the site settings from the store for updating and that should not be cached.
     /// </summary>
-    public interface ISiteService
-    {
-        /// <summary>
-        /// Loads the site settings from the store for updating and that should not be cached.
-        /// </summary>
-        Task<ISite> LoadSiteSettingsAsync();
+    Task<ISite> LoadSiteSettingsAsync();
 
-        /// <summary>
-        /// Gets the site settings from the cache for sharing and that should not be updated.
-        /// </summary>
-        Task<ISite> GetSiteSettingsAsync();
+    /// <summary>
+    /// Gets the site settings from the cache for sharing and that should not be updated.
+    /// </summary>
+    Task<ISite> GetSiteSettingsAsync();
 
-        /// <summary>
-        /// Updates the store with the provided site settings and then updates the cache.
-        /// </summary>
-        Task UpdateSiteSettingsAsync(ISite site);
-    }
+    /// <summary>
+    /// Updates the store with the provided site settings and then updates the cache.
+    /// </summary>
+    Task UpdateSiteSettingsAsync(ISite site);
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextManager.cs b/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextManager.cs
index c9c5b829066..887411ebd64 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextManager.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextManager.cs
@@ -2,27 +2,26 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Environment.Cache
+namespace OrchardCore.Environment.Cache;
+
+public class CacheContextManager : ICacheContextManager
 {
-    public class CacheContextManager : ICacheContextManager
+    private readonly IEnumerable<ICacheContextProvider> _cacheContextProviders;
+
+    public CacheContextManager(IEnumerable<ICacheContextProvider> cacheContextProviders)
     {
-        private readonly IEnumerable<ICacheContextProvider> _cacheContextProviders;
+        _cacheContextProviders = cacheContextProviders;
+    }
 
-        public CacheContextManager(IEnumerable<ICacheContextProvider> cacheContextProviders)
-        {
-            _cacheContextProviders = cacheContextProviders;
-        }
+    public async Task<IEnumerable<CacheContextEntry>> GetDiscriminatorsAsync(IEnumerable<string> contexts)
+    {
+        var entries = new List<CacheContextEntry>();
 
-        public async Task<IEnumerable<CacheContextEntry>> GetDiscriminatorsAsync(IEnumerable<string> contexts)
+        foreach (var provider in _cacheContextProviders.Reverse())
         {
-            var entries = new List<CacheContextEntry>();
-
-            foreach (var provider in _cacheContextProviders.Reverse())
-            {
-                await provider.PopulateContextEntriesAsync(contexts, entries);
-            }
-
-            return entries;
+            await provider.PopulateContextEntriesAsync(contexts, entries);
         }
+
+        return entries;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/FeaturesCacheContextProvider.cs b/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/FeaturesCacheContextProvider.cs
index cd88ec4e81c..ea31a06f141 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/FeaturesCacheContextProvider.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/FeaturesCacheContextProvider.cs
@@ -5,36 +5,35 @@
 using System.Threading.Tasks;
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.Environment.Cache.CacheContextProviders
+namespace OrchardCore.Environment.Cache.CacheContextProviders;
+
+public class FeaturesCacheContextProvider : ICacheContextProvider
 {
-    public class FeaturesCacheContextProvider : ICacheContextProvider
-    {
-        private const string FeaturesPrefix = "features:";
+    private const string FeaturesPrefix = "features:";
+
+    private readonly IFeatureHash _featureHash;
 
-        private readonly IFeatureHash _featureHash;
+    public FeaturesCacheContextProvider(IFeatureHash featureHash)
+    {
+        _featureHash = featureHash;
+    }
 
-        public FeaturesCacheContextProvider(IFeatureHash featureHash)
+    public async Task PopulateContextEntriesAsync(IEnumerable<string> contexts, List<CacheContextEntry> entries)
+    {
+        if (contexts.Any(ctx => string.Equals(ctx, "features", StringComparison.OrdinalIgnoreCase)))
         {
-            _featureHash = featureHash;
+            // Add a hash of the enabled features.
+            var hash = await _featureHash.GetFeatureHashAsync();
+            entries.Add(new CacheContextEntry("features", hash.ToString(CultureInfo.InvariantCulture)));
         }
-
-        public async Task PopulateContextEntriesAsync(IEnumerable<string> contexts, List<CacheContextEntry> entries)
+        else
         {
-            if (contexts.Any(ctx => string.Equals(ctx, "features", StringComparison.OrdinalIgnoreCase)))
+            foreach (var context in contexts.Where(ctx => ctx.StartsWith(FeaturesPrefix, StringComparison.OrdinalIgnoreCase)))
             {
-                // Add a hash of the enabled features.
-                var hash = await _featureHash.GetFeatureHashAsync();
-                entries.Add(new CacheContextEntry("features", hash.ToString(CultureInfo.InvariantCulture)));
-            }
-            else
-            {
-                foreach (var context in contexts.Where(ctx => ctx.StartsWith(FeaturesPrefix, StringComparison.OrdinalIgnoreCase)))
-                {
-                    var featureName = context[FeaturesPrefix.Length..];
-                    var hash = await _featureHash.GetFeatureHashAsync(featureName);
+                var featureName = context[FeaturesPrefix.Length..];
+                var hash = await _featureHash.GetFeatureHashAsync(featureName);
 
-                    entries.Add(new CacheContextEntry("features", hash.ToString(CultureInfo.InvariantCulture)));
-                }
+                entries.Add(new CacheContextEntry("features", hash.ToString(CultureInfo.InvariantCulture)));
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/KnownValueCacheContextProvider.cs b/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/KnownValueCacheContextProvider.cs
index f4505390b1a..11f01318b5d 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/KnownValueCacheContextProvider.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/KnownValueCacheContextProvider.cs
@@ -1,18 +1,17 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Environment.Cache.CacheContextProviders
+namespace OrchardCore.Environment.Cache.CacheContextProviders;
+
+/// <summary>
+/// Adds all context values as they are to the cache entries. This allows for known value variation.
+/// </summary>
+public class KnownValueCacheContextProvider : ICacheContextProvider
 {
-    /// <summary>
-    /// Adds all context values as they are to the cache entries. This allows for known value variation.
-    /// </summary>
-    public class KnownValueCacheContextProvider : ICacheContextProvider
+    public Task PopulateContextEntriesAsync(IEnumerable<string> contexts, List<CacheContextEntry> entries)
     {
-        public Task PopulateContextEntriesAsync(IEnumerable<string> contexts, List<CacheContextEntry> entries)
-        {
-            entries.Add(new CacheContextEntry("", string.Join(",", contexts)));
+        entries.Add(new CacheContextEntry("", string.Join(",", contexts)));
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/QueryCacheContextProvider.cs b/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/QueryCacheContextProvider.cs
index cbadd36fdd3..999f54febc9 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/QueryCacheContextProvider.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/QueryCacheContextProvider.cs
@@ -4,48 +4,47 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Environment.Cache.CacheContextProviders
+namespace OrchardCore.Environment.Cache.CacheContextProviders;
+
+public class QueryCacheContextProvider : ICacheContextProvider
 {
-    public class QueryCacheContextProvider : ICacheContextProvider
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private const string QueryPrefix = "query:";
+
+    public QueryCacheContextProvider(IHttpContextAccessor httpContextAccessor)
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private const string QueryPrefix = "query:";
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        public QueryCacheContextProvider(IHttpContextAccessor httpContextAccessor)
+    public Task PopulateContextEntriesAsync(IEnumerable<string> contexts, List<CacheContextEntry> entries)
+    {
+        if (contexts.Any(ctx => string.Equals(ctx, "query", StringComparison.OrdinalIgnoreCase)))
         {
-            _httpContextAccessor = httpContextAccessor;
+            var httpContext = _httpContextAccessor.HttpContext;
+            var query = httpContext.Request.Query;
+            var allKeys = query.Keys.OrderBy(x => x).ToArray();
+            entries.AddRange(allKeys
+                .Select(x => new CacheContextEntry(
+                    key: x.ToLowerInvariant(),
+                    value: query[x].ToString().ToLowerInvariant())
+                ));
+
+            // If we track any query value, we don't need to look into specific ones.
+            return Task.CompletedTask;
         }
 
-        public Task PopulateContextEntriesAsync(IEnumerable<string> contexts, List<CacheContextEntry> entries)
+        foreach (var context in contexts.Where(ctx => ctx.StartsWith(QueryPrefix, StringComparison.OrdinalIgnoreCase)))
         {
-            if (contexts.Any(ctx => string.Equals(ctx, "query", StringComparison.OrdinalIgnoreCase)))
-            {
-                var httpContext = _httpContextAccessor.HttpContext;
-                var query = httpContext.Request.Query;
-                var allKeys = query.Keys.OrderBy(x => x).ToArray();
-                entries.AddRange(allKeys
-                    .Select(x => new CacheContextEntry(
-                        key: x.ToLowerInvariant(),
-                        value: query[x].ToString().ToLowerInvariant())
-                    ));
-
-                // If we track any query value, we don't need to look into specific ones.
-                return Task.CompletedTask;
-            }
-
-            foreach (var context in contexts.Where(ctx => ctx.StartsWith(QueryPrefix, StringComparison.OrdinalIgnoreCase)))
-            {
-                var key = context[QueryPrefix.Length..];
-
-                var httpContext = _httpContextAccessor.HttpContext;
-                var query = httpContext.Request.Query;
-                entries.Add(new CacheContextEntry(
-                        key: key.ToLowerInvariant(),
-                        value: query[key].ToString().ToLowerInvariant())
-                    );
-            }
+            var key = context[QueryPrefix.Length..];
 
-            return Task.CompletedTask;
+            var httpContext = _httpContextAccessor.HttpContext;
+            var query = httpContext.Request.Query;
+            entries.Add(new CacheContextEntry(
+                    key: key.ToLowerInvariant(),
+                    value: query[key].ToString().ToLowerInvariant())
+                );
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/RolesCacheContextProvider.cs b/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/RolesCacheContextProvider.cs
index 443a1a177b2..be5b90eabc8 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/RolesCacheContextProvider.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/RolesCacheContextProvider.cs
@@ -5,35 +5,34 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Environment.Cache.CacheContextProviders
+namespace OrchardCore.Environment.Cache.CacheContextProviders;
+
+public class RolesCacheContextProvider : ICacheContextProvider
 {
-    public class RolesCacheContextProvider : ICacheContextProvider
-    {
-        private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public RolesCacheContextProvider(IHttpContextAccessor httpContextAccessor)
-        {
-            _httpContextAccessor = httpContextAccessor;
-        }
+    public RolesCacheContextProvider(IHttpContextAccessor httpContextAccessor)
+    {
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        public Task PopulateContextEntriesAsync(IEnumerable<string> contexts, List<CacheContextEntry> entries)
+    public Task PopulateContextEntriesAsync(IEnumerable<string> contexts, List<CacheContextEntry> entries)
+    {
+        if (contexts.Any(ctx => string.Equals(ctx, "user.roles", StringComparison.OrdinalIgnoreCase)))
         {
-            if (contexts.Any(ctx => string.Equals(ctx, "user.roles", StringComparison.OrdinalIgnoreCase)))
+            var user = _httpContextAccessor.HttpContext.User;
+            if (user.Identity.IsAuthenticated)
             {
-                var user = _httpContextAccessor.HttpContext.User;
-                if (user.Identity.IsAuthenticated)
+                var roleClaims = user.Claims.Where(x => x.Type == ClaimTypes.Role);
+                foreach (var roleClaim in roleClaims)
                 {
-                    var roleClaims = user.Claims.Where(x => x.Type == ClaimTypes.Role);
-                    foreach (var roleClaim in roleClaims)
-                    {
-                        entries.Add(new CacheContextEntry("user.roles", roleClaim.Value));
-                    }
-
-                    return Task.CompletedTask;
+                    entries.Add(new CacheContextEntry("user.roles", roleClaim.Value));
                 }
-            }
 
-            return Task.CompletedTask;
+                return Task.CompletedTask;
+            }
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/RouteCacheContextProvider.cs b/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/RouteCacheContextProvider.cs
index 1ea9a9580e2..747aa352871 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/RouteCacheContextProvider.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/RouteCacheContextProvider.cs
@@ -4,28 +4,27 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Environment.Cache.CacheContextProviders
+namespace OrchardCore.Environment.Cache.CacheContextProviders;
+
+public class RouteCacheContextProvider : ICacheContextProvider
 {
-    public class RouteCacheContextProvider : ICacheContextProvider
-    {
-        private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public RouteCacheContextProvider(IHttpContextAccessor httpContextAccessor)
-        {
-            _httpContextAccessor = httpContextAccessor;
-        }
+    public RouteCacheContextProvider(IHttpContextAccessor httpContextAccessor)
+    {
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        public Task PopulateContextEntriesAsync(IEnumerable<string> contexts, List<CacheContextEntry> entries)
+    public Task PopulateContextEntriesAsync(IEnumerable<string> contexts, List<CacheContextEntry> entries)
+    {
+        if (contexts.Any(ctx => string.Equals(ctx, "route", StringComparison.OrdinalIgnoreCase)))
         {
-            if (contexts.Any(ctx => string.Equals(ctx, "route", StringComparison.OrdinalIgnoreCase)))
-            {
-                var httpContext = _httpContextAccessor.HttpContext;
-                entries.Add(new CacheContextEntry("route", httpContext.Request.Path.Value.ToLowerInvariant()));
-
-                return Task.CompletedTask;
-            }
+            var httpContext = _httpContextAccessor.HttpContext;
+            entries.Add(new CacheContextEntry("route", httpContext.Request.Path.Value.ToLowerInvariant()));
 
             return Task.CompletedTask;
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/UserCacheContextProvider.cs b/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/UserCacheContextProvider.cs
index eedad7d7287..e2700b76aec 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/UserCacheContextProvider.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheContextProviders/UserCacheContextProvider.cs
@@ -4,33 +4,32 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Environment.Cache.CacheContextProviders
+namespace OrchardCore.Environment.Cache.CacheContextProviders;
+
+public class UserCacheContextProvider : ICacheContextProvider
 {
-    public class UserCacheContextProvider : ICacheContextProvider
-    {
-        private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public UserCacheContextProvider(IHttpContextAccessor httpContextAccessor)
-        {
-            _httpContextAccessor = httpContextAccessor;
-        }
+    public UserCacheContextProvider(IHttpContextAccessor httpContextAccessor)
+    {
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        public Task PopulateContextEntriesAsync(IEnumerable<string> contexts, List<CacheContextEntry> entries)
+    public Task PopulateContextEntriesAsync(IEnumerable<string> contexts, List<CacheContextEntry> entries)
+    {
+        if (contexts.Any(ctx => string.Equals(ctx, "user", StringComparison.OrdinalIgnoreCase)))
         {
-            if (contexts.Any(ctx => string.Equals(ctx, "user", StringComparison.OrdinalIgnoreCase)))
+            var httpContext = _httpContextAccessor.HttpContext;
+            if (httpContext.User?.Identity?.IsAuthenticated ?? false)
             {
-                var httpContext = _httpContextAccessor.HttpContext;
-                if (httpContext.User?.Identity?.IsAuthenticated ?? false)
-                {
-                    entries.Add(new CacheContextEntry("user", httpContext.User.Identity.Name));
-                }
-                else
-                {
-                    entries.Add(new CacheContextEntry("user", ""));
-                }
+                entries.Add(new CacheContextEntry("user", httpContext.User.Identity.Name));
+            }
+            else
+            {
+                entries.Add(new CacheContextEntry("user", ""));
             }
-
-            return Task.CompletedTask;
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheScopeManager.cs b/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheScopeManager.cs
index 202c97ee520..7ad8837e886 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheScopeManager.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Cache/CacheScopeManager.cs
@@ -2,139 +2,138 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OrchardCore.Environment.Cache
+namespace OrchardCore.Environment.Cache;
+
+// Todo: does this belong in dynamic cache?
+public class CacheScopeManager : ICacheScopeManager
 {
-    // Todo: does this belong in dynamic cache?
-    public class CacheScopeManager : ICacheScopeManager
+    private readonly Stack<CacheContext> _scopes;
+
+    public CacheScopeManager()
     {
-        private readonly Stack<CacheContext> _scopes;
+        _scopes = new Stack<CacheContext>();
+    }
 
-        public CacheScopeManager()
+    public void EnterScope(CacheContext context)
+    {
+        _scopes.Push(context);
+    }
+
+    public void ExitScope()
+    {
+        var childScope = _scopes.Pop();
+
+        if (_scopes.Count > 0)
         {
-            _scopes = new Stack<CacheContext>();
+            MergeCacheContexts(_scopes.Peek(), childScope);
         }
+    }
 
-        public void EnterScope(CacheContext context)
+    public void AddDependencies(params string[] dependencies)
+    {
+        if (_scopes.Count > 0)
         {
-            _scopes.Push(context);
+            _scopes.Peek().AddTag(dependencies);
         }
+    }
 
-        public void ExitScope()
+    public void AddContexts(params string[] contexts)
+    {
+        if (_scopes.Count > 0)
         {
-            var childScope = _scopes.Pop();
+            _scopes.Peek().AddContext(contexts);
+        }
+    }
 
-            if (_scopes.Count > 0)
-            {
-                MergeCacheContexts(_scopes.Peek(), childScope);
-            }
+    public void WithExpiryOn(DateTimeOffset expiryOn)
+    {
+        if (_scopes.Count <= 0)
+        {
+            return;
         }
 
-        public void AddDependencies(params string[] dependencies)
+        var scope = _scopes.Peek();
+        var value = GetMostRestrictiveDateTimeOffset(scope.ExpiresOn, expiryOn);
+
+        if (value.HasValue)
         {
-            if (_scopes.Count > 0)
-            {
-                _scopes.Peek().AddTag(dependencies);
-            }
+            scope.WithExpiryOn(value.Value);
         }
+    }
 
-        public void AddContexts(params string[] contexts)
+    public void WithExpiryAfter(TimeSpan expiryAfter)
+    {
+        if (_scopes.Count <= 0)
         {
-            if (_scopes.Count > 0)
-            {
-                _scopes.Peek().AddContext(contexts);
-            }
+            return;
         }
 
-        public void WithExpiryOn(DateTimeOffset expiryOn)
+        var scope = _scopes.Peek();
+        var value = GetMostRestrictiveTimespan(scope.ExpiresAfter, expiryAfter);
+
+        if (value.HasValue)
         {
-            if (_scopes.Count <= 0)
-            {
-                return;
-            }
-
-            var scope = _scopes.Peek();
-            var value = GetMostRestrictiveDateTimeOffset(scope.ExpiresOn, expiryOn);
-
-            if (value.HasValue)
-            {
-                scope.WithExpiryOn(value.Value);
-            }
+            scope.WithExpiryAfter(value.Value);
         }
+    }
 
-        public void WithExpiryAfter(TimeSpan expiryAfter)
+    public void WithExpirySliding(TimeSpan expirySliding)
+    {
+        if (_scopes.Count <= 0)
         {
-            if (_scopes.Count <= 0)
-            {
-                return;
-            }
-
-            var scope = _scopes.Peek();
-            var value = GetMostRestrictiveTimespan(scope.ExpiresAfter, expiryAfter);
-
-            if (value.HasValue)
-            {
-                scope.WithExpiryAfter(value.Value);
-            }
+            return;
         }
 
-        public void WithExpirySliding(TimeSpan expirySliding)
+        var scope = _scopes.Peek();
+        var value = GetMostRestrictiveTimespan(scope.ExpiresSliding, expirySliding);
+
+        if (value.HasValue)
         {
-            if (_scopes.Count <= 0)
-            {
-                return;
-            }
-
-            var scope = _scopes.Peek();
-            var value = GetMostRestrictiveTimespan(scope.ExpiresSliding, expirySliding);
-
-            if (value.HasValue)
-            {
-                scope.WithExpirySliding(value.Value);
-            }
+            scope.WithExpirySliding(value.Value);
         }
+    }
+
+    private static void MergeCacheContexts(CacheContext into, CacheContext from)
+    {
+        into.AddContext(from.Contexts.ToArray());
+        into.AddTag(from.Tags.ToArray());
 
-        private static void MergeCacheContexts(CacheContext into, CacheContext from)
+        var offset = GetMostRestrictiveDateTimeOffset(into.ExpiresOn, from.ExpiresOn);
+        if (offset.HasValue)
         {
-            into.AddContext(from.Contexts.ToArray());
-            into.AddTag(from.Tags.ToArray());
-
-            var offset = GetMostRestrictiveDateTimeOffset(into.ExpiresOn, from.ExpiresOn);
-            if (offset.HasValue)
-            {
-                into.WithExpiryOn(offset.Value);
-            }
-
-            var slidingExpiration = GetMostRestrictiveTimespan(into.ExpiresSliding, from.ExpiresSliding);
-            if (slidingExpiration.HasValue)
-            {
-                into.WithExpirySliding(slidingExpiration.Value);
-            }
-
-            var duration = GetMostRestrictiveTimespan(into.ExpiresAfter, from.ExpiresAfter);
-            if (duration.HasValue)
-            {
-                into.WithExpiryAfter(duration.Value);
-            }
+            into.WithExpiryOn(offset.Value);
         }
 
-        private static DateTimeOffset? GetMostRestrictiveDateTimeOffset(DateTimeOffset? a, DateTimeOffset? b)
+        var slidingExpiration = GetMostRestrictiveTimespan(into.ExpiresSliding, from.ExpiresSliding);
+        if (slidingExpiration.HasValue)
         {
-            if (a.HasValue && b.HasValue)
-            {
-                return b < a ? b : a;
-            }
+            into.WithExpirySliding(slidingExpiration.Value);
+        }
 
-            return a ?? b;
+        var duration = GetMostRestrictiveTimespan(into.ExpiresAfter, from.ExpiresAfter);
+        if (duration.HasValue)
+        {
+            into.WithExpiryAfter(duration.Value);
         }
+    }
 
-        private static TimeSpan? GetMostRestrictiveTimespan(TimeSpan? a, TimeSpan? b)
+    private static DateTimeOffset? GetMostRestrictiveDateTimeOffset(DateTimeOffset? a, DateTimeOffset? b)
+    {
+        if (a.HasValue && b.HasValue)
         {
-            if (a.HasValue && b.HasValue)
-            {
-                return b < a ? b : a;
-            }
+            return b < a ? b : a;
+        }
 
-            return a ?? b;
+        return a ?? b;
+    }
+
+    private static TimeSpan? GetMostRestrictiveTimespan(TimeSpan? a, TimeSpan? b)
+    {
+        if (a.HasValue && b.HasValue)
+        {
+            return b < a ? b : a;
         }
+
+        return a ?? b;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Cache/DefaultTagCache.cs b/src/OrchardCore/OrchardCore.Infrastructure/Cache/DefaultTagCache.cs
index b3ecf16eca0..cc0f0d0708e 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Cache/DefaultTagCache.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Cache/DefaultTagCache.cs
@@ -7,73 +7,72 @@
 using Microsoft.Extensions.Logging;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Environment.Cache
-{
-    public class DefaultTagCache : ITagCache
-    {
-        private const string CacheKey = nameof(DefaultTagCache);
+namespace OrchardCore.Environment.Cache;
 
-        private readonly ConcurrentDictionary<string, HashSet<string>> _dictionary;
-        private readonly IEnumerable<ITagRemovedEventHandler> _tagRemovedEventHandlers;
-        private readonly ILogger _logger;
+public class DefaultTagCache : ITagCache
+{
+    private const string CacheKey = nameof(DefaultTagCache);
 
-        public DefaultTagCache(
-            IEnumerable<ITagRemovedEventHandler> tagRemovedEventHandlers,
-            IMemoryCache memoryCache,
-            ILogger<DefaultTagCache> logger)
-        {
-            // We use the memory cache as the state holder and keep this class transient as it has
-            // dependencies on non-singletons
+    private readonly ConcurrentDictionary<string, HashSet<string>> _dictionary;
+    private readonly IEnumerable<ITagRemovedEventHandler> _tagRemovedEventHandlers;
+    private readonly ILogger _logger;
 
-            if (!memoryCache.TryGetValue(CacheKey, out _dictionary))
-            {
-                _dictionary = new ConcurrentDictionary<string, HashSet<string>>(StringComparer.OrdinalIgnoreCase);
-                memoryCache.Set(CacheKey, _dictionary);
-            }
+    public DefaultTagCache(
+        IEnumerable<ITagRemovedEventHandler> tagRemovedEventHandlers,
+        IMemoryCache memoryCache,
+        ILogger<DefaultTagCache> logger)
+    {
+        // We use the memory cache as the state holder and keep this class transient as it has
+        // dependencies on non-singletons
 
-            _tagRemovedEventHandlers = tagRemovedEventHandlers;
-            _logger = logger;
+        if (!memoryCache.TryGetValue(CacheKey, out _dictionary))
+        {
+            _dictionary = new ConcurrentDictionary<string, HashSet<string>>(StringComparer.OrdinalIgnoreCase);
+            memoryCache.Set(CacheKey, _dictionary);
         }
 
-        public Task TagAsync(string key, params string[] tags)
+        _tagRemovedEventHandlers = tagRemovedEventHandlers;
+        _logger = logger;
+    }
+
+    public Task TagAsync(string key, params string[] tags)
+    {
+        foreach (var tag in tags)
         {
-            foreach (var tag in tags)
-            {
-                var set = _dictionary.GetOrAdd(tag, x => new HashSet<string>());
+            var set = _dictionary.GetOrAdd(tag, x => new HashSet<string>());
 
-                lock (set)
-                {
-                    set.Add(key);
-                }
+            lock (set)
+            {
+                set.Add(key);
             }
-
-            return Task.CompletedTask;
         }
 
-        public Task<IEnumerable<string>> GetTaggedItemsAsync(string tag)
+        return Task.CompletedTask;
+    }
+
+    public Task<IEnumerable<string>> GetTaggedItemsAsync(string tag)
+    {
+        HashSet<string> set;
+        if (_dictionary.TryGetValue(tag, out set))
         {
-            HashSet<string> set;
-            if (_dictionary.TryGetValue(tag, out set))
+            lock (set)
             {
-                lock (set)
-                {
-                    return Task.FromResult(set.AsEnumerable());
-                }
+                return Task.FromResult(set.AsEnumerable());
             }
-
-            return Task.FromResult(Enumerable.Empty<string>());
         }
 
-        public Task RemoveTagAsync(string tag)
-        {
-            HashSet<string> set;
+        return Task.FromResult(Enumerable.Empty<string>());
+    }
 
-            if (_dictionary.TryRemove(tag, out set))
-            {
-                return _tagRemovedEventHandlers.InvokeAsync((handler, tag, set) => handler.TagRemovedAsync(tag, set), tag, set, _logger);
-            }
+    public Task RemoveTagAsync(string tag)
+    {
+        HashSet<string> set;
 
-            return Task.CompletedTask;
+        if (_dictionary.TryRemove(tag, out set))
+        {
+            return _tagRemovedEventHandlers.InvokeAsync((handler, tag, set) => handler.TagRemovedAsync(tag, set), tag, set, _logger);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Cache/OrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Infrastructure/Cache/OrchardCoreBuilderExtensions.cs
index 24c12c6dc90..4a204602b3e 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Cache/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Cache/OrchardCoreBuilderExtensions.cs
@@ -5,53 +5,52 @@
 using OrchardCore.Environment.Cache.CacheContextProviders;
 using OrchardCore.Modules;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static partial class OrchardCoreBuilderExtensions
 {
-    public static partial class OrchardCoreBuilderExtensions
+    /// <summary>
+    /// Adds tenant level caching services.
+    /// </summary>
+    public static OrchardCoreBuilder AddCaching(this OrchardCoreBuilder builder)
     {
-        /// <summary>
-        /// Adds tenant level caching services.
-        /// </summary>
-        public static OrchardCoreBuilder AddCaching(this OrchardCoreBuilder builder)
+        builder.ConfigureServices(services =>
         {
-            builder.ConfigureServices(services =>
+            services.AddSingleton<ISignal>(sp =>
             {
-                services.AddSingleton<ISignal>(sp =>
+                var messageBus = sp.GetService<IMessageBus>();
+
+                if (messageBus == null)
                 {
-                    var messageBus = sp.GetService<IMessageBus>();
-
-                    if (messageBus == null)
-                    {
-                        return new Signal();
-                    }
-                    else
-                    {
-                        return new DistributedSignal(messageBus);
-                    }
-                });
-
-                services.AddSingleton<IModularTenantEvents>(sp => sp.GetRequiredService<ISignal>());
-
-                services.AddScoped<ITagCache, DefaultTagCache>();
-                services.AddScoped<ICacheContextManager, CacheContextManager>();
-                services.AddScoped<ICacheScopeManager, CacheScopeManager>();
-
-                services.AddScoped<ICacheContextProvider, FeaturesCacheContextProvider>();
-                services.AddScoped<ICacheContextProvider, QueryCacheContextProvider>();
-                services.AddScoped<ICacheContextProvider, RolesCacheContextProvider>();
-                services.AddScoped<ICacheContextProvider, RouteCacheContextProvider>();
-                services.AddScoped<ICacheContextProvider, UserCacheContextProvider>();
-                services.AddScoped<ICacheContextProvider, KnownValueCacheContextProvider>();
-
-                // IMemoryCache is registered at the tenant level so that there is one instance for each tenant.
-                services.AddSingleton<IMemoryCache, MemoryCache>();
-
-                // MemoryDistributedCache needs to be registered as a singleton as it owns a MemoryCache instance.
-                services.AddSingleton<IDistributedCache, MemoryDistributedCache>();
+                    return new Signal();
+                }
+                else
+                {
+                    return new DistributedSignal(messageBus);
+                }
             });
 
-            // Adds services to keep in sync any document type between a document store and a multi level cache.
-            return builder.AddDocumentManagement();
-        }
+            services.AddSingleton<IModularTenantEvents>(sp => sp.GetRequiredService<ISignal>());
+
+            services.AddScoped<ITagCache, DefaultTagCache>();
+            services.AddScoped<ICacheContextManager, CacheContextManager>();
+            services.AddScoped<ICacheScopeManager, CacheScopeManager>();
+
+            services.AddScoped<ICacheContextProvider, FeaturesCacheContextProvider>();
+            services.AddScoped<ICacheContextProvider, QueryCacheContextProvider>();
+            services.AddScoped<ICacheContextProvider, RolesCacheContextProvider>();
+            services.AddScoped<ICacheContextProvider, RouteCacheContextProvider>();
+            services.AddScoped<ICacheContextProvider, UserCacheContextProvider>();
+            services.AddScoped<ICacheContextProvider, KnownValueCacheContextProvider>();
+
+            // IMemoryCache is registered at the tenant level so that there is one instance for each tenant.
+            services.AddSingleton<IMemoryCache, MemoryCache>();
+
+            // MemoryDistributedCache needs to be registered as a singleton as it owns a MemoryCache instance.
+            services.AddSingleton<IDistributedCache, MemoryDistributedCache>();
+        });
+
+        // Adds services to keep in sync any document type between a document store and a multi level cache.
+        return builder.AddDocumentManagement();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Commands/Builtin/HelpCommand.cs b/src/OrchardCore/OrchardCore.Infrastructure/Commands/Builtin/HelpCommand.cs
index a6055da50e5..e2e9fe891f7 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Commands/Builtin/HelpCommand.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Commands/Builtin/HelpCommand.cs
@@ -5,72 +5,71 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Environment.Commands.Builtin
+namespace OrchardCore.Environment.Commands.Builtin;
+
+public class HelpCommand : DefaultCommandHandler
 {
-    public class HelpCommand : DefaultCommandHandler
+    private readonly IServiceProvider _serviceProvider;
+    private readonly CommandHandlerDescriptorBuilder _builder = new();
+
+    public HelpCommand(IServiceProvider serviceProvider,
+        IStringLocalizer<HelpCommand> localizer) : base(localizer)
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly CommandHandlerDescriptorBuilder _builder = new();
+        _serviceProvider = serviceProvider;
+    }
 
-        public HelpCommand(IServiceProvider serviceProvider,
-            IStringLocalizer<HelpCommand> localizer) : base(localizer)
-        {
-            _serviceProvider = serviceProvider;
-        }
+    [CommandName("help commands")]
+    [CommandHelp("help commands", "\tDisplay help text for all available commands")]
+    public async Task AllCommandsAsync()
+    {
+        await Context.Output.WriteLineAsync(S["List of available commands:"]);
+        await Context.Output.WriteLineAsync("---------------------------");
+        await Context.Output.WriteLineAsync();
 
-        [CommandName("help commands")]
-        [CommandHelp("help commands", "\tDisplay help text for all available commands")]
-        public async Task AllCommandsAsync()
+        var descriptors = GetCommandDescriptors().OrderBy(d => d.Names.First());
+
+        foreach (var descriptor in descriptors)
         {
-            await Context.Output.WriteLineAsync(S["List of available commands:"]);
-            await Context.Output.WriteLineAsync("---------------------------");
+            await Context.Output.WriteLineAsync(GetHelpText(descriptor));
             await Context.Output.WriteLineAsync();
+        }
+    }
 
-            var descriptors = GetCommandDescriptors().OrderBy(d => d.Names.First());
+    [CommandName("help")]
+    [CommandHelp("help <command>", "\tDisplay help text for <command>")]
+    public async Task SingleCommandAsync(string[] commandNameStrings)
+    {
+        var command = string.Join(" ", commandNameStrings);
+        var descriptors = GetCommandDescriptors()
+            .Where(t => t.Names.Any(x => x.StartsWith(command, StringComparison.OrdinalIgnoreCase)))
+            .OrderBy(d => d.Names);
 
+        if (!descriptors.Any())
+        {
+            await Context.Output.WriteLineAsync(S["Command {0} doesn't exist", command]);
+        }
+        else
+        {
             foreach (var descriptor in descriptors)
             {
                 await Context.Output.WriteLineAsync(GetHelpText(descriptor));
                 await Context.Output.WriteLineAsync();
             }
         }
+    }
+    private IEnumerable<CommandDescriptor> GetCommandDescriptors()
+    {
+        var commandhandlers = _serviceProvider.GetServices<ICommandHandler>();
+        return commandhandlers.SelectMany(x => _builder.Build(x.GetType()).Commands);
+    }
 
-        [CommandName("help")]
-        [CommandHelp("help <command>", "\tDisplay help text for <command>")]
-        public async Task SingleCommandAsync(string[] commandNameStrings)
-        {
-            var command = string.Join(" ", commandNameStrings);
-            var descriptors = GetCommandDescriptors()
-                .Where(t => t.Names.Any(x => x.StartsWith(command, StringComparison.OrdinalIgnoreCase)))
-                .OrderBy(d => d.Names);
-
-            if (!descriptors.Any())
-            {
-                await Context.Output.WriteLineAsync(S["Command {0} doesn't exist", command]);
-            }
-            else
-            {
-                foreach (var descriptor in descriptors)
-                {
-                    await Context.Output.WriteLineAsync(GetHelpText(descriptor));
-                    await Context.Output.WriteLineAsync();
-                }
-            }
-        }
-        private IEnumerable<CommandDescriptor> GetCommandDescriptors()
+    private LocalizedString GetHelpText(CommandDescriptor descriptor)
+    {
+        if (string.IsNullOrEmpty(descriptor.HelpText))
         {
-            var commandhandlers = _serviceProvider.GetServices<ICommandHandler>();
-            return commandhandlers.SelectMany(x => _builder.Build(x.GetType()).Commands);
+            return S["{0}.{1}: no help text", descriptor.MethodInfo.DeclaringType?.FullName, descriptor.MethodInfo.Name];
         }
 
-        private LocalizedString GetHelpText(CommandDescriptor descriptor)
-        {
-            if (string.IsNullOrEmpty(descriptor.HelpText))
-            {
-                return S["{0}.{1}: no help text", descriptor.MethodInfo.DeclaringType?.FullName, descriptor.MethodInfo.Name];
-            }
-
-            return S[descriptor.HelpText];
-        }
+        return S[descriptor.HelpText];
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Commands/CommandHandlerDescriptorBuilder.cs b/src/OrchardCore/OrchardCore.Infrastructure/Commands/CommandHandlerDescriptorBuilder.cs
index 25b90e2707c..3581a77a09d 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Commands/CommandHandlerDescriptorBuilder.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Commands/CommandHandlerDescriptorBuilder.cs
@@ -3,58 +3,57 @@
 using System.Linq;
 using System.Reflection;
 
-namespace OrchardCore.Environment.Commands
+namespace OrchardCore.Environment.Commands;
+
+public class CommandHandlerDescriptorBuilder
 {
-    public class CommandHandlerDescriptorBuilder
-    {
 #pragma warning disable CA1822 // Mark members as static
-        public CommandHandlerDescriptor Build(Type type)
+    public CommandHandlerDescriptor Build(Type type)
 #pragma warning restore CA1822 // Mark members as static
-        {
-            return new CommandHandlerDescriptor { Commands = CollectMethods(type) };
-        }
+    {
+        return new CommandHandlerDescriptor { Commands = CollectMethods(type) };
+    }
+
+    private static IEnumerable<CommandDescriptor> CollectMethods(Type type)
+    {
+        var methods = type
+            .GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly)
+            .Where(m => !m.IsSpecialName);
 
-        private static IEnumerable<CommandDescriptor> CollectMethods(Type type)
+        foreach (var methodInfo in methods)
         {
-            var methods = type
-                .GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly)
-                .Where(m => !m.IsSpecialName);
-
-            foreach (var methodInfo in methods)
-            {
-                yield return BuildMethod(methodInfo);
-            }
+            yield return BuildMethod(methodInfo);
         }
+    }
 
-        private static CommandDescriptor BuildMethod(MethodInfo methodInfo)
+    private static CommandDescriptor BuildMethod(MethodInfo methodInfo)
+    {
+        return new CommandDescriptor
         {
-            return new CommandDescriptor
-            {
-                Names = GetCommandNames(methodInfo),
-                MethodInfo = methodInfo,
-                HelpText = GetCommandHelpText(methodInfo)
-            };
-        }
+            Names = GetCommandNames(methodInfo),
+            MethodInfo = methodInfo,
+            HelpText = GetCommandHelpText(methodInfo)
+        };
+    }
 
-        private static string GetCommandHelpText(MethodInfo methodInfo)
+    private static string GetCommandHelpText(MethodInfo methodInfo)
+    {
+        var attributes = methodInfo.GetCustomAttributes(typeof(CommandHelpAttribute), false/*inherit*/);
+        if (attributes != null && attributes.Length > 0)
         {
-            var attributes = methodInfo.GetCustomAttributes(typeof(CommandHelpAttribute), false/*inherit*/);
-            if (attributes != null && attributes.Length > 0)
-            {
-                return attributes.Cast<CommandHelpAttribute>().Single().HelpText;
-            }
-            return string.Empty;
+            return attributes.Cast<CommandHelpAttribute>().Single().HelpText;
         }
+        return string.Empty;
+    }
 
-        private static string[] GetCommandNames(MethodInfo methodInfo)
+    private static string[] GetCommandNames(MethodInfo methodInfo)
+    {
+        var attributes = methodInfo.GetCustomAttributes(typeof(CommandNameAttribute), false/*inherit*/);
+        if (attributes != null && attributes.Length > 0)
         {
-            var attributes = methodInfo.GetCustomAttributes(typeof(CommandNameAttribute), false/*inherit*/);
-            if (attributes != null && attributes.Length > 0)
-            {
-                return attributes.Cast<CommandNameAttribute>().Single().Commands;
-            }
-
-            return [methodInfo.Name];
+            return attributes.Cast<CommandNameAttribute>().Single().Commands;
         }
+
+        return [methodInfo.Name];
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Commands/DefaultCommandManager.cs b/src/OrchardCore/OrchardCore.Infrastructure/Commands/DefaultCommandManager.cs
index 7c546f1c475..d9aa1f52230 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Commands/DefaultCommandManager.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Commands/DefaultCommandManager.cs
@@ -4,99 +4,98 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Environment.Commands
+namespace OrchardCore.Environment.Commands;
+
+public class DefaultCommandManager : ICommandManager
 {
-    public class DefaultCommandManager : ICommandManager
+    private readonly IEnumerable<ICommandHandler> _commandHandlers;
+    private readonly CommandHandlerDescriptorBuilder _builder = new();
+    protected readonly IStringLocalizer S;
+
+    public DefaultCommandManager(IEnumerable<ICommandHandler> commandHandlers,
+        IStringLocalizer<DefaultCommandManager> localizer)
     {
-        private readonly IEnumerable<ICommandHandler> _commandHandlers;
-        private readonly CommandHandlerDescriptorBuilder _builder = new();
-        protected readonly IStringLocalizer S;
+        _commandHandlers = commandHandlers;
 
-        public DefaultCommandManager(IEnumerable<ICommandHandler> commandHandlers,
-            IStringLocalizer<DefaultCommandManager> localizer)
-        {
-            _commandHandlers = commandHandlers;
+        S = localizer;
+    }
 
-            S = localizer;
-        }
+    public async Task ExecuteAsync(CommandParameters parameters)
+    {
+        var matches = MatchCommands(parameters);
 
-        public async Task ExecuteAsync(CommandParameters parameters)
+        if (matches.Count == 1)
         {
-            var matches = MatchCommands(parameters);
-
-            if (matches.Count == 1)
-            {
-                var match = matches.Single();
-                await match.CommandHandler.ExecuteAsync(match.Context);
-            }
-            else
+            var match = matches.Single();
+            await match.CommandHandler.ExecuteAsync(match.Context);
+        }
+        else
+        {
+            var commandMatch = string.Join(" ", parameters.Arguments.ToArray());
+            var commandList = string.Join(",", GetCommandDescriptors().SelectMany(d => d.Names).ToArray());
+            if (matches.Count > 0)
             {
-                var commandMatch = string.Join(" ", parameters.Arguments.ToArray());
-                var commandList = string.Join(",", GetCommandDescriptors().SelectMany(d => d.Names).ToArray());
-                if (matches.Count > 0)
-                {
-                    throw new Exception(S["Multiple commands found matching arguments \"{0}\". Commands available: {1}.",
-                        commandMatch, commandList]);
-                }
-                throw new Exception(S["No command found matching arguments \"{0}\". Commands available: {1}.",
+                throw new Exception(S["Multiple commands found matching arguments \"{0}\". Commands available: {1}.",
                     commandMatch, commandList]);
             }
+            throw new Exception(S["No command found matching arguments \"{0}\". Commands available: {1}.",
+                commandMatch, commandList]);
         }
+    }
 
-        public IEnumerable<CommandDescriptor> GetCommandDescriptors()
-        {
-            return _commandHandlers.SelectMany(x => _builder.Build(x.GetType()).Commands);
-        }
+    public IEnumerable<CommandDescriptor> GetCommandDescriptors()
+    {
+        return _commandHandlers.SelectMany(x => _builder.Build(x.GetType()).Commands);
+    }
 
-        private List<Match> MatchCommands(CommandParameters parameters)
-        {
-            // Commands are matched with arguments. first argument
-            // is the command others are arguments to the command.
-            return _commandHandlers.SelectMany(h =>
-                    MatchCommands(parameters, parameters.Arguments.Count(), _builder.Build(h.GetType()), h)).ToList();
-        }
+    private List<Match> MatchCommands(CommandParameters parameters)
+    {
+        // Commands are matched with arguments. first argument
+        // is the command others are arguments to the command.
+        return _commandHandlers.SelectMany(h =>
+                MatchCommands(parameters, parameters.Arguments.Count(), _builder.Build(h.GetType()), h)).ToList();
+    }
 
-        private static IEnumerable<Match> MatchCommands(CommandParameters parameters, int argCount, CommandHandlerDescriptor descriptor, ICommandHandler handler)
+    private static IEnumerable<Match> MatchCommands(CommandParameters parameters, int argCount, CommandHandlerDescriptor descriptor, ICommandHandler handler)
+    {
+        foreach (var commandDescriptor in descriptor.Commands)
         {
-            foreach (var commandDescriptor in descriptor.Commands)
+            foreach (var name in commandDescriptor.Names)
             {
-                foreach (var name in commandDescriptor.Names)
-                {
-                    var names = name.Split(' ');
-                    var namesCount = names.Length;
+                var names = name.Split(' ');
+                var namesCount = names.Length;
 
-                    // We check here number of arguments a command can recieve against
-                    // arguments provided for the command to identify the correct command
-                    // and avoid matching multiple commands.
-                    if (name == string.Join(" ", parameters.Arguments.Take(namesCount)) && commandDescriptor.MethodInfo.GetParameters().Length == argCount - namesCount)
-                    {
-                        names = parameters.Arguments.ToArray();
-                    }
+                // We check here number of arguments a command can recieve against
+                // arguments provided for the command to identify the correct command
+                // and avoid matching multiple commands.
+                if (name == string.Join(" ", parameters.Arguments.Take(namesCount)) && commandDescriptor.MethodInfo.GetParameters().Length == argCount - namesCount)
+                {
+                    names = parameters.Arguments.ToArray();
+                }
 
-                    if (parameters.Arguments.Take(argCount).SequenceEqual(names, StringComparer.OrdinalIgnoreCase))
+                if (parameters.Arguments.Take(argCount).SequenceEqual(names, StringComparer.OrdinalIgnoreCase))
+                {
+                    yield return new Match
                     {
-                        yield return new Match
+                        Context = new CommandContext
                         {
-                            Context = new CommandContext
-                            {
-                                Arguments = parameters.Arguments.Skip(name.Split(' ').Length),
-                                Command = string.Join(" ", names),
-                                CommandDescriptor = commandDescriptor,
-                                Input = parameters.Input,
-                                Output = parameters.Output,
-                                Switches = parameters.Switches,
-                            },
-                            CommandHandler = handler,
-                        };
-                    }
+                            Arguments = parameters.Arguments.Skip(name.Split(' ').Length),
+                            Command = string.Join(" ", names),
+                            CommandDescriptor = commandDescriptor,
+                            Input = parameters.Input,
+                            Output = parameters.Output,
+                            Switches = parameters.Switches,
+                        },
+                        CommandHandler = handler,
+                    };
                 }
             }
         }
+    }
 
-        private sealed class Match
-        {
-            public CommandContext Context { get; set; }
-            public ICommandHandler CommandHandler { get; set; }
-        }
+    private sealed class Match
+    {
+        public CommandContext Context { get; set; }
+        public ICommandHandler CommandHandler { get; set; }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Commands/OrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Infrastructure/Commands/OrchardCoreBuilderExtensions.cs
index ed5d6f621b7..3cdd160e406 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Commands/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Commands/OrchardCoreBuilderExtensions.cs
@@ -2,24 +2,23 @@
 using OrchardCore.Environment.Commands.Builtin;
 using OrchardCore.Environment.Commands.Parameters;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static partial class OrchardCoreBuilderExtensions
 {
-    public static partial class OrchardCoreBuilderExtensions
+    /// <summary>
+    /// Adds host level services to provide CLI commands.
+    /// </summary>
+    public static OrchardCoreBuilder AddCommands(this OrchardCoreBuilder builder)
     {
-        /// <summary>
-        /// Adds host level services to provide CLI commands.
-        /// </summary>
-        public static OrchardCoreBuilder AddCommands(this OrchardCoreBuilder builder)
-        {
-            var services = builder.ApplicationServices;
+        var services = builder.ApplicationServices;
 
-            services.AddScoped<ICommandManager, DefaultCommandManager>();
-            services.AddScoped<ICommandHandler, HelpCommand>();
+        services.AddScoped<ICommandManager, DefaultCommandManager>();
+        services.AddScoped<ICommandHandler, HelpCommand>();
 
-            services.AddScoped<ICommandParametersParser, CommandParametersParser>();
-            services.AddScoped<ICommandParser, CommandParser>();
+        services.AddScoped<ICommandParametersParser, CommandParametersParser>();
+        services.AddScoped<ICommandParser, CommandParser>();
 
-            return builder;
-        }
+        return builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Commands/Parameters/CommandParametersParser.cs b/src/OrchardCore/OrchardCore.Infrastructure/Commands/Parameters/CommandParametersParser.cs
index d190d8ffeae..6ed5b93cc12 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Commands/Parameters/CommandParametersParser.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Commands/Parameters/CommandParametersParser.cs
@@ -2,43 +2,42 @@
 using System.Collections.Generic;
 using System.Security;
 
-namespace OrchardCore.Environment.Commands.Parameters
+namespace OrchardCore.Environment.Commands.Parameters;
+
+public class CommandParametersParser : ICommandParametersParser
 {
-    public class CommandParametersParser : ICommandParametersParser
+    [SecurityCritical]
+    public CommandParameters Parse(IEnumerable<string> args)
     {
-        [SecurityCritical]
-        public CommandParameters Parse(IEnumerable<string> args)
-        {
-            var arguments = new List<string>();
-            var switches = new Dictionary<string, string>();
+        var arguments = new List<string>();
+        var switches = new Dictionary<string, string>();
 
-            foreach (var arg in args)
+        foreach (var arg in args)
+        {
+            // Switch?
+            if (arg[0] == '/')
             {
-                // Switch?
-                if (arg[0] == '/')
-                {
-                    var index = arg.IndexOf(':');
-                    var switchName = index < 0 ? arg[1..] : arg[1..index];
-                    var switchValue = index < 0 || index >= arg.Length ? string.Empty : arg[(index + 1)..];
-
-                    if (string.IsNullOrEmpty(switchName))
-                    {
-                        throw new ArgumentException(string.Format("Invalid switch syntax: \"{0}\". Valid syntax is /<switchName>[:<switchValue>].", arg));
-                    }
+                var index = arg.IndexOf(':');
+                var switchName = index < 0 ? arg[1..] : arg[1..index];
+                var switchValue = index < 0 || index >= arg.Length ? string.Empty : arg[(index + 1)..];
 
-                    switches.Add(switchName, switchValue);
-                }
-                else
+                if (string.IsNullOrEmpty(switchName))
                 {
-                    arguments.Add(arg);
+                    throw new ArgumentException(string.Format("Invalid switch syntax: \"{0}\". Valid syntax is /<switchName>[:<switchValue>].", arg));
                 }
-            }
 
-            return new CommandParameters
+                switches.Add(switchName, switchValue);
+            }
+            else
             {
-                Arguments = arguments,
-                Switches = switches
-            };
+                arguments.Add(arg);
+            }
         }
+
+        return new CommandParameters
+        {
+            Arguments = arguments,
+            Switches = switches
+        };
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Documents/DefaultDocumentSerializer.cs b/src/OrchardCore/OrchardCore.Infrastructure/Documents/DefaultDocumentSerializer.cs
index 6a158569333..7bd623d72ff 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Documents/DefaultDocumentSerializer.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Documents/DefaultDocumentSerializer.cs
@@ -6,93 +6,92 @@
 using System.Threading.Tasks;
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.Documents
+namespace OrchardCore.Documents;
+
+/// <summary>
+/// Serializes and deserializes an <see cref="IDocument"/> into and from a sequence of bytes.
+/// </summary>
+public class DefaultDocumentSerializer : IDocumentSerializer
 {
-    /// <summary>
-    /// Serializes and deserializes an <see cref="IDocument"/> into and from a sequence of bytes.
-    /// </summary>
-    public class DefaultDocumentSerializer : IDocumentSerializer
-    {
-        private static readonly byte[] _gZipHeaderBytes = [0x1f, 0x8b];
+    private static readonly byte[] _gZipHeaderBytes = [0x1f, 0x8b];
+
+    private readonly JsonSerializerOptions _serializerOptions;
 
-        private readonly JsonSerializerOptions _serializerOptions;
+    public DefaultDocumentSerializer(JsonSerializerOptions serializerOptions)
+    {
+        _serializerOptions = serializerOptions;
+    }
 
-        public DefaultDocumentSerializer(JsonSerializerOptions serializerOptions)
+    public Task<byte[]> SerializeAsync<TDocument>(TDocument document, int compressThreshold = int.MaxValue)
+        where TDocument : class, IDocument, new()
+    {
+        var data = JsonSerializer.SerializeToUtf8Bytes(document, _serializerOptions);
+        if (data.Length >= compressThreshold)
         {
-            _serializerOptions = serializerOptions;
+            data = Compress(data);
         }
 
-        public Task<byte[]> SerializeAsync<TDocument>(TDocument document, int compressThreshold = int.MaxValue)
-            where TDocument : class, IDocument, new()
-        {
-            var data = JsonSerializer.SerializeToUtf8Bytes(document, _serializerOptions);
-            if (data.Length >= compressThreshold)
-            {
-                data = Compress(data);
-            }
+        return Task.FromResult(data);
+    }
 
-            return Task.FromResult(data);
+    public Task<TDocument> DeserializeAsync<TDocument>(byte[] data)
+        where TDocument : class, IDocument, new()
+    {
+        if (IsCompressed(data))
+        {
+            data = Decompress(data);
         }
 
-        public Task<TDocument> DeserializeAsync<TDocument>(byte[] data)
-            where TDocument : class, IDocument, new()
-        {
-            if (IsCompressed(data))
-            {
-                data = Decompress(data);
-            }
+        using var ms = new MemoryStream(data);
+
+        var document = JsonSerializer.Deserialize<TDocument>(ms, _serializerOptions);
 
-            using var ms = new MemoryStream(data);
+        return Task.FromResult(document);
+    }
+
+    internal static bool IsCompressed(byte[] data)
+    {
+        // Ensure data is at least as long as the GZip header
+        if (data.Length >= _gZipHeaderBytes.Length)
+        {
+            // Compare the header bytes.
+            return data.Take(_gZipHeaderBytes.Length).SequenceEqual(_gZipHeaderBytes);
+        }
 
-            var document = JsonSerializer.Deserialize<TDocument>(ms, _serializerOptions);
+        return false;
+    }
 
-            return Task.FromResult(document);
+    internal static byte[] Compress(byte[] data)
+    {
+        using var input = new MemoryStream(data);
+        using var output = new MemoryStream();
+        using (var gzip = new GZipStream(output, CompressionMode.Compress))
+        {
+            input.CopyTo(gzip);
         }
 
-        internal static bool IsCompressed(byte[] data)
+        if (output.TryGetBuffer(out var buffer))
         {
-            // Ensure data is at least as long as the GZip header
-            if (data.Length >= _gZipHeaderBytes.Length)
-            {
-                // Compare the header bytes.
-                return data.Take(_gZipHeaderBytes.Length).SequenceEqual(_gZipHeaderBytes);
-            }
-
-            return false;
+            return buffer.Array;
         }
 
-        internal static byte[] Compress(byte[] data)
+        return output.ToArray();
+    }
+
+    internal static byte[] Decompress(byte[] data)
+    {
+        using var input = new MemoryStream(data);
+        using var output = new MemoryStream();
+        using (var gzip = new GZipStream(input, CompressionMode.Decompress))
         {
-            using var input = new MemoryStream(data);
-            using var output = new MemoryStream();
-            using (var gzip = new GZipStream(output, CompressionMode.Compress))
-            {
-                input.CopyTo(gzip);
-            }
-
-            if (output.TryGetBuffer(out var buffer))
-            {
-                return buffer.Array;
-            }
-
-            return output.ToArray();
+            gzip.CopyTo(output);
         }
 
-        internal static byte[] Decompress(byte[] data)
+        if (output.TryGetBuffer(out var buffer))
         {
-            using var input = new MemoryStream(data);
-            using var output = new MemoryStream();
-            using (var gzip = new GZipStream(input, CompressionMode.Decompress))
-            {
-                gzip.CopyTo(output);
-            }
-
-            if (output.TryGetBuffer(out var buffer))
-            {
-                return buffer.Array;
-            }
-
-            return output.ToArray();
+            return buffer.Array;
         }
+
+        return output.ToArray();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Documents/DocumentEntityManager.cs b/src/OrchardCore/OrchardCore.Infrastructure/Documents/DocumentEntityManager.cs
index bd2769a3765..165f28e30df 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Documents/DocumentEntityManager.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Documents/DocumentEntityManager.cs
@@ -3,43 +3,42 @@
 using System.Threading.Tasks;
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.Documents
+namespace OrchardCore.Documents;
+
+/// <summary>
+/// A generic service to keep in sync any single <see cref="IDocumentEntity"/> between an <see cref="IDocumentStore"/> and a multi level cache.
+/// </summary>
+public class DocumentEntityManager<TDocumentEntity> : IDocumentEntityManager<TDocumentEntity> where TDocumentEntity : class, IDocumentEntity, new()
 {
-    /// <summary>
-    /// A generic service to keep in sync any single <see cref="IDocumentEntity"/> between an <see cref="IDocumentStore"/> and a multi level cache.
-    /// </summary>
-    public class DocumentEntityManager<TDocumentEntity> : IDocumentEntityManager<TDocumentEntity> where TDocumentEntity : class, IDocumentEntity, new()
+    private readonly IDocumentManager<TDocumentEntity> _documentManager;
+
+    public DocumentEntityManager(IDocumentManager<TDocumentEntity> documentManager)
     {
-        private readonly IDocumentManager<TDocumentEntity> _documentManager;
+        _documentManager = documentManager;
+    }
 
-        public DocumentEntityManager(IDocumentManager<TDocumentEntity> documentManager)
+    public async Task<T> GetAsync<T>(string key) where T : new()
+    {
+        var document = await _documentManager.GetOrCreateImmutableAsync();
+        if (document.Properties.TryGetPropertyValue(key, out var value))
         {
-            _documentManager = documentManager;
+            return value.Deserialize<T>(JOptions.Default);
         }
 
-        public async Task<T> GetAsync<T>(string key) where T : new()
-        {
-            var document = await _documentManager.GetOrCreateImmutableAsync();
-            if (document.Properties.TryGetPropertyValue(key, out var value))
-            {
-                return value.Deserialize<T>(JOptions.Default);
-            }
-
-            return new T();
-        }
+        return new T();
+    }
 
-        public async Task SetAsync<T>(string key, T value) where T : new()
-        {
-            var document = await _documentManager.GetOrCreateMutableAsync();
-            document.Properties[key] = JObject.FromObject(value);
-            await _documentManager.UpdateAsync(document);
-        }
+    public async Task SetAsync<T>(string key, T value) where T : new()
+    {
+        var document = await _documentManager.GetOrCreateMutableAsync();
+        document.Properties[key] = JObject.FromObject(value);
+        await _documentManager.UpdateAsync(document);
+    }
 
-        public async Task RemoveAsync(string key)
-        {
-            var document = await _documentManager.GetOrCreateMutableAsync();
-            document.Properties.Remove(key);
-            await _documentManager.UpdateAsync(document);
-        }
+    public async Task RemoveAsync(string key)
+    {
+        var document = await _documentManager.GetOrCreateMutableAsync();
+        document.Properties.Remove(key);
+        await _documentManager.UpdateAsync(document);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Documents/DocumentEntityManagerOfT.cs b/src/OrchardCore/OrchardCore.Infrastructure/Documents/DocumentEntityManagerOfT.cs
index 30804762639..c33f7ecf754 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Documents/DocumentEntityManagerOfT.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Documents/DocumentEntityManagerOfT.cs
@@ -1,16 +1,15 @@
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.Documents
+namespace OrchardCore.Documents;
+
+/// <summary>
+/// A <see cref="DocumentEntityManager{TDocumentEntity}"/> using a given type of <see cref="IDocumentStore"/>.
+/// </summary>
+public class DocumentEntityManager<TDocumentStore, TDocumentEntity> : DocumentEntityManager<TDocumentEntity>, IDocumentEntityManager<TDocumentStore, TDocumentEntity>
+    where TDocumentStore : IDocumentStore where TDocumentEntity : class, IDocumentEntity, new()
 {
-    /// <summary>
-    /// A <see cref="DocumentEntityManager{TDocumentEntity}"/> using a given type of <see cref="IDocumentStore"/>.
-    /// </summary>
-    public class DocumentEntityManager<TDocumentStore, TDocumentEntity> : DocumentEntityManager<TDocumentEntity>, IDocumentEntityManager<TDocumentStore, TDocumentEntity>
-        where TDocumentStore : IDocumentStore where TDocumentEntity : class, IDocumentEntity, new()
+    public DocumentEntityManager(IDocumentManager<TDocumentEntity> documentManager)
+        : base(documentManager)
     {
-        public DocumentEntityManager(IDocumentManager<TDocumentEntity> documentManager)
-            : base(documentManager)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Documents/DocumentManager.cs b/src/OrchardCore/OrchardCore.Infrastructure/Documents/DocumentManager.cs
index ebca7aa17bc..05287067da1 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Documents/DocumentManager.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Documents/DocumentManager.cs
@@ -9,391 +9,390 @@
 using OrchardCore.Documents.Options;
 using OrchardCore.Environment.Shell.Scope;
 
-namespace OrchardCore.Documents
+namespace OrchardCore.Documents;
+
+/// <summary>
+/// A generic service to keep in sync any single <see cref="IDocument"/> between an <see cref="IDocumentStore"/> and a multi level cache.
+/// </summary>
+public class DocumentManager<TDocument> : IDocumentManager<TDocument> where TDocument : class, IDocument, new()
 {
-    /// <summary>
-    /// A generic service to keep in sync any single <see cref="IDocument"/> between an <see cref="IDocumentStore"/> and a multi level cache.
-    /// </summary>
-    public class DocumentManager<TDocument> : IDocumentManager<TDocument> where TDocument : class, IDocument, new()
-    {
-        public const string FailoverKey = "OrchardCore_Documents_FailoverKey";
+    public const string FailoverKey = "OrchardCore_Documents_FailoverKey";
+
+    protected readonly IDistributedCache _distributedCache;
+    private readonly IMemoryCache _memoryCache;
+    protected readonly DocumentOptions _options;
+    private readonly ILogger _logger;
 
-        protected readonly IDistributedCache _distributedCache;
-        private readonly IMemoryCache _memoryCache;
-        protected readonly DocumentOptions _options;
-        private readonly ILogger _logger;
+    protected readonly bool _isDistributed;
+    protected bool _isVolatile;
 
-        protected readonly bool _isDistributed;
-        protected bool _isVolatile;
+    public DocumentManager(
+        IDistributedCache distributedCache,
+        IMemoryCache memoryCache,
+        IOptionsMonitor<DocumentOptions> options,
+        ILogger<DocumentManager<TDocument>> logger)
+    {
+        _distributedCache = distributedCache;
+        _memoryCache = memoryCache;
+        _options = options.Get(typeof(TDocument).FullName);
+        _logger = logger;
 
-        public DocumentManager(
-            IDistributedCache distributedCache,
-            IMemoryCache memoryCache,
-            IOptionsMonitor<DocumentOptions> options,
-            ILogger<DocumentManager<TDocument>> logger)
+        if (_distributedCache is not MemoryDistributedCache)
         {
-            _distributedCache = distributedCache;
-            _memoryCache = memoryCache;
-            _options = options.Get(typeof(TDocument).FullName);
-            _logger = logger;
+            _isDistributed = true;
+        }
+
+        DocumentStoreServiceType = typeof(IDocumentStore);
+    }
+
+    public Type DocumentStoreServiceType { get; set; }
 
-            if (_distributedCache is not MemoryDistributedCache)
+    public IDocumentStore DocumentStore
+    {
+        get
+        {
+            var documentStore = (IDocumentStore)ShellScope.Get(DocumentStoreServiceType);
+            if (documentStore is null)
             {
-                _isDistributed = true;
+                documentStore = (IDocumentStore)ShellScope.Services.GetRequiredService(DocumentStoreServiceType);
+                ShellScope.Set(DocumentStoreServiceType, documentStore);
             }
 
-            DocumentStoreServiceType = typeof(IDocumentStore);
+            return documentStore;
         }
+    }
 
-        public Type DocumentStoreServiceType { get; set; }
+    public async Task<TDocument> GetOrCreateMutableAsync(Func<Task<TDocument>> factoryAsync = null)
+    {
+        TDocument document = null;
 
-        public IDocumentStore DocumentStore
+        if (!_isVolatile)
         {
-            get
-            {
-                var documentStore = (IDocumentStore)ShellScope.Get(DocumentStoreServiceType);
-                if (documentStore is null)
-                {
-                    documentStore = (IDocumentStore)ShellScope.Services.GetRequiredService(DocumentStoreServiceType);
-                    ShellScope.Set(DocumentStoreServiceType, documentStore);
-                }
+            document = await DocumentStore.GetOrCreateMutableAsync(factoryAsync);
 
-                return documentStore;
+            if (_memoryCache.TryGetValue<TDocument>(_options.CacheKey, out var cached) && document == cached)
+            {
+                throw new InvalidOperationException("Can't load for update a cached object");
             }
         }
-
-        public async Task<TDocument> GetOrCreateMutableAsync(Func<Task<TDocument>> factoryAsync = null)
+        else
         {
-            TDocument document = null;
-
-            if (!_isVolatile)
+            var volatileCache = ShellScope.Get<TDocument>(typeof(TDocument));
+            if (volatileCache is not null)
             {
-                document = await DocumentStore.GetOrCreateMutableAsync(factoryAsync);
-
-                if (_memoryCache.TryGetValue<TDocument>(_options.CacheKey, out var cached) && document == cached)
-                {
-                    throw new InvalidOperationException("Can't load for update a cached object");
-                }
+                document = volatileCache;
             }
             else
             {
-                var volatileCache = ShellScope.Get<TDocument>(typeof(TDocument));
-                if (volatileCache is not null)
-                {
-                    document = volatileCache;
-                }
-                else
-                {
-                    document = await GetFromDistributedCacheAsync()
-                        ?? await (factoryAsync?.Invoke() ?? Task.FromResult((TDocument)null))
-                        ?? new TDocument();
+                document = await GetFromDistributedCacheAsync()
+                    ?? await (factoryAsync?.Invoke() ?? Task.FromResult((TDocument)null))
+                    ?? new TDocument();
 
-                    ShellScope.Set(typeof(TDocument), document);
-                }
+                ShellScope.Set(typeof(TDocument), document);
             }
+        }
 
-            document.Identifier = IdGenerator.GenerateId();
-            document.IsReadOnly = false;
+        document.Identifier = IdGenerator.GenerateId();
+        document.IsReadOnly = false;
 
-            return document;
-        }
+        return document;
+    }
 
-        public async Task<TDocument> GetOrCreateImmutableAsync(Func<Task<TDocument>> factoryAsync = null)
-        {
-            // If called from a constructor, e.g. through an 'IConfigureOptions', the 'IDocumentStore' should
-            // be resolved before any async IO operation to prevent a DI dead lock. So, only if the store may
-            // be used (if non volatile) and an async IO may be done before (if a distributed cache is used).
+    public async Task<TDocument> GetOrCreateImmutableAsync(Func<Task<TDocument>> factoryAsync = null)
+    {
+        // If called from a constructor, e.g. through an 'IConfigureOptions', the 'IDocumentStore' should
+        // be resolved before any async IO operation to prevent a DI dead lock. So, only if the store may
+        // be used (if non volatile) and an async IO may be done before (if a distributed cache is used).
 
-            if (!_isVolatile && _isDistributed)
-            {
-                // Resolve the 'IDocumentStore' and hold it in a scoped cache.
-                _ = DocumentStore;
-            }
+        if (!_isVolatile && _isDistributed)
+        {
+            // Resolve the 'IDocumentStore' and hold it in a scoped cache.
+            _ = DocumentStore;
+        }
 
-            TDocument document = null;
+        TDocument document = null;
 
-            var failover = _isDistributed && _memoryCache.Get<bool>(FailoverKey);
-            try
+        var failover = _isDistributed && _memoryCache.Get<bool>(FailoverKey);
+        try
+        {
+            // May call an async IO if using a distributed cache.
+            document = await GetInternalAsync(failover);
+        }
+        catch (Exception e)
+        {
+            if (!_isDistributed)
             {
-                // May call an async IO if using a distributed cache.
-                document = await GetInternalAsync(failover);
+                throw;
             }
-            catch (Exception e)
-            {
-                if (!_isDistributed)
-                {
-                    throw;
-                }
-
-                _logger.LogError(e, "Failed to read the '{DocumentName}' from the distributed cache", typeof(TDocument).Name);
 
-                failover = true;
-                _memoryCache.Set(FailoverKey, failover, new MemoryCacheEntryOptions()
-                {
-                    AbsoluteExpirationRelativeToNow = _options.FailoverRetryLatency
-                });
-            }
+            _logger.LogError(e, "Failed to read the '{DocumentName}' from the distributed cache", typeof(TDocument).Name);
 
-            if (document is null)
+            failover = true;
+            _memoryCache.Set(FailoverKey, failover, new MemoryCacheEntryOptions()
             {
-                var cacheable = true;
-
-                if (!_isVolatile)
-                {
-                    (cacheable, document) = await DocumentStore.GetOrCreateImmutableAsync(factoryAsync);
-                }
-                else
-                {
-                    document = await (factoryAsync?.Invoke()
-                        ?? Task.FromResult((TDocument)null))
-                        ?? new TDocument();
-                }
-
-                if (cacheable)
-                {
-                    await SetInternalAsync(document, failover);
-                }
-            }
-
-            return document;
+                AbsoluteExpirationRelativeToNow = _options.FailoverRetryLatency
+            });
         }
 
-        public async Task UpdateAsync(TDocument document, Func<TDocument, Task> afterUpdateAsync = null)
+        if (document is null)
         {
-            if (_isDistributed)
-            {
-                try
-                {
-                    _ = await _distributedCache.GetStringAsync(_options.CacheIdKey);
-                }
-                catch
-                {
-                    await DocumentStore.CancelAsync();
-
-                    _logger.LogError("Can't update the '{DocumentName}' if not able to access the distributed cache", typeof(TDocument).Name);
+            var cacheable = true;
 
-                    throw;
-                }
+            if (!_isVolatile)
+            {
+                (cacheable, document) = await DocumentStore.GetOrCreateImmutableAsync(factoryAsync);
+            }
+            else
+            {
+                document = await (factoryAsync?.Invoke()
+                    ?? Task.FromResult((TDocument)null))
+                    ?? new TDocument();
             }
 
-            if (_memoryCache.TryGetValue<TDocument>(_options.CacheKey, out var cached) && document == cached)
+            if (cacheable)
             {
-                throw new InvalidOperationException("Can't update a cached object");
+                await SetInternalAsync(document, failover);
             }
+        }
 
-            document.Identifier ??= IdGenerator.GenerateId();
+        return document;
+    }
 
-            if (!_isVolatile)
+    public async Task UpdateAsync(TDocument document, Func<TDocument, Task> afterUpdateAsync = null)
+    {
+        if (_isDistributed)
+        {
+            try
             {
-                await DocumentStore.UpdateAsync(document, async document =>
-                {
-                    // A non volatile document can be invalidated.
-                    await InvalidateInternalAsync(document);
+                _ = await _distributedCache.GetStringAsync(_options.CacheIdKey);
+            }
+            catch
+            {
+                await DocumentStore.CancelAsync();
 
-                    if (afterUpdateAsync != null)
-                    {
-                        await afterUpdateAsync(document);
-                    }
-                },
-                _options.CheckConcurrency.Value);
+                _logger.LogError("Can't update the '{DocumentName}' if not able to access the distributed cache", typeof(TDocument).Name);
 
-                return;
+                throw;
             }
+        }
+
+        if (_memoryCache.TryGetValue<TDocument>(_options.CacheKey, out var cached) && document == cached)
+        {
+            throw new InvalidOperationException("Can't update a cached object");
+        }
 
-            // Set the scoped cache in case of multiple updates.
-            ShellScope.Set(typeof(TDocument), document);
+        document.Identifier ??= IdGenerator.GenerateId();
 
-            // But still update the shared cache after committing.
-            DocumentStore.AfterCommitSuccess<TDocument>(async () =>
+        if (!_isVolatile)
+        {
+            await DocumentStore.UpdateAsync(document, async document =>
             {
-                // A volatile document can't be invalidated.
-                await SetInternalAsync(document);
+                // A non volatile document can be invalidated.
+                await InvalidateInternalAsync(document);
 
-                if (afterUpdateAsync is not null)
+                if (afterUpdateAsync != null)
                 {
                     await afterUpdateAsync(document);
                 }
-            });
+            },
+            _options.CheckConcurrency.Value);
 
             return;
         }
 
-        private async Task<TDocument> GetInternalAsync(bool failover = false)
-        {
-            string id;
-            if (_isDistributed)
-            {
-                // Cache the id locally for the synchronization latency time.
-                id = await _memoryCache.GetOrCreateAsync(_options.CacheIdKey, entry =>
-                {
-                    entry.AbsoluteExpirationRelativeToNow = _options.SynchronizationLatency;
+        // Set the scoped cache in case of multiple updates.
+        ShellScope.Set(typeof(TDocument), document);
 
-                    if (failover)
-                    {
-                        return Task.FromResult<string>(null);
-                    }
+        // But still update the shared cache after committing.
+        DocumentStore.AfterCommitSuccess<TDocument>(async () =>
+        {
+            // A volatile document can't be invalidated.
+            await SetInternalAsync(document);
 
-                    return _distributedCache.GetStringAsync(_options.CacheIdKey);
-                });
-            }
-            else
+            if (afterUpdateAsync is not null)
             {
-                // Otherwise, always get the id from the memory cache.
-                id = _memoryCache.Get<string>(_options.CacheIdKey);
+                await afterUpdateAsync(document);
             }
+        });
 
-            if (id is null)
-            {
-                return null;
-            }
+        return;
+    }
 
-            if (id == "NULL")
+    private async Task<TDocument> GetInternalAsync(bool failover = false)
+    {
+        string id;
+        if (_isDistributed)
+        {
+            // Cache the id locally for the synchronization latency time.
+            id = await _memoryCache.GetOrCreateAsync(_options.CacheIdKey, entry =>
             {
-                id = null;
-            }
+                entry.AbsoluteExpirationRelativeToNow = _options.SynchronizationLatency;
 
-            if (_memoryCache.TryGetValue<TDocument>(_options.CacheKey, out var document))
-            {
-                if (document.Identifier == id)
+                if (failover)
                 {
-                    if (failover)
-                    {
-                        return document;
-                    }
+                    return Task.FromResult<string>(null);
+                }
 
-                    if (_isDistributed && _options.SlidingExpiration.HasValue)
-                    {
-                        await _distributedCache.RefreshAsync(_options.CacheKey);
-                    }
+                return _distributedCache.GetStringAsync(_options.CacheIdKey);
+            });
+        }
+        else
+        {
+            // Otherwise, always get the id from the memory cache.
+            id = _memoryCache.Get<string>(_options.CacheIdKey);
+        }
 
-                    return document;
-                }
-            }
+        if (id is null)
+        {
+            return null;
+        }
 
-            if (!_isDistributed)
-            {
-                return null;
-            }
+        if (id == "NULL")
+        {
+            id = null;
+        }
 
-            if (failover)
+        if (_memoryCache.TryGetValue<TDocument>(_options.CacheKey, out var document))
+        {
+            if (document.Identifier == id)
             {
-                return null;
-            }
+                if (failover)
+                {
+                    return document;
+                }
 
-            document = await GetFromDistributedCacheAsync();
+                if (_isDistributed && _options.SlidingExpiration.HasValue)
+                {
+                    await _distributedCache.RefreshAsync(_options.CacheKey);
+                }
 
-            if (document is null)
-            {
-                return null;
+                return document;
             }
+        }
 
-            if (document.Identifier != id)
-            {
-                return null;
-            }
+        if (!_isDistributed)
+        {
+            return null;
+        }
 
-            _memoryCache.Set(_options.CacheKey, document, new MemoryCacheEntryOptions()
-            {
-                AbsoluteExpiration = _options.AbsoluteExpiration,
-                AbsoluteExpirationRelativeToNow = _options.AbsoluteExpirationRelativeToNow,
-                SlidingExpiration = _options.SlidingExpiration
-            });
+        if (failover)
+        {
+            return null;
+        }
 
-            // Remove the id from the one second cache.
-            _memoryCache.Remove(_options.CacheIdKey);
+        document = await GetFromDistributedCacheAsync();
 
-            return document;
+        if (document is null)
+        {
+            return null;
         }
 
-        protected async Task SetInternalAsync(TDocument document, bool failover = false)
+        if (document.Identifier != id)
         {
-            document.IsReadOnly = true;
+            return null;
+        }
 
-            if (!failover)
-            {
-                await UpdateDistributedCacheAsync(document);
-            }
+        _memoryCache.Set(_options.CacheKey, document, new MemoryCacheEntryOptions()
+        {
+            AbsoluteExpiration = _options.AbsoluteExpiration,
+            AbsoluteExpirationRelativeToNow = _options.AbsoluteExpirationRelativeToNow,
+            SlidingExpiration = _options.SlidingExpiration
+        });
 
-            _memoryCache.Set(_options.CacheKey, document, new MemoryCacheEntryOptions()
-            {
-                AbsoluteExpiration = _options.AbsoluteExpiration,
-                AbsoluteExpirationRelativeToNow = _options.AbsoluteExpirationRelativeToNow,
-                SlidingExpiration = _options.SlidingExpiration
-            });
+        // Remove the id from the one second cache.
+        _memoryCache.Remove(_options.CacheIdKey);
 
-            if (failover)
-            {
-                // Cache the id locally so that the memory cache is used during the 'FailoverRetryLatency'.
-                _memoryCache.Set(_options.CacheIdKey, document.Identifier ?? "NULL", new MemoryCacheEntryOptions()
-                {
-                    AbsoluteExpirationRelativeToNow = _options.FailoverRetryLatency
-                });
+        return document;
+    }
 
-                return;
-            }
+    protected async Task SetInternalAsync(TDocument document, bool failover = false)
+    {
+        document.IsReadOnly = true;
 
-            if (_isDistributed)
-            {
-                // Remove the id from the one second cache.
-                _memoryCache.Remove(_options.CacheIdKey);
-            }
+        if (!failover)
+        {
+            await UpdateDistributedCacheAsync(document);
+        }
+
+        _memoryCache.Set(_options.CacheKey, document, new MemoryCacheEntryOptions()
+        {
+            AbsoluteExpiration = _options.AbsoluteExpiration,
+            AbsoluteExpirationRelativeToNow = _options.AbsoluteExpirationRelativeToNow,
+            SlidingExpiration = _options.SlidingExpiration
+        });
 
-            // Consistency: We may have been the last to update the cache but not with the last stored document.
-            if (!_isVolatile && _options.CheckConsistency.Value)
+        if (failover)
+        {
+            // Cache the id locally so that the memory cache is used during the 'FailoverRetryLatency'.
+            _memoryCache.Set(_options.CacheIdKey, document.Identifier ?? "NULL", new MemoryCacheEntryOptions()
             {
-                (_, var stored) = await DocumentStore.GetOrCreateImmutableAsync<TDocument>();
+                AbsoluteExpirationRelativeToNow = _options.FailoverRetryLatency
+            });
 
-                if (stored.Identifier != document.Identifier)
-                {
-                    await InvalidateInternalAsync(document);
-                }
-            }
+            return;
         }
 
-#pragma warning disable IDE0060 // Remove unused parameter
-        protected async Task InvalidateInternalAsync(TDocument document, bool failover = false)
-#pragma warning restore IDE0060 // Remove unused parameter
+        if (_isDistributed)
         {
-            if (_isDistributed)
-            {
-                await _distributedCache.RemoveAsync(_options.CacheIdKey);
-            }
+            // Remove the id from the one second cache.
             _memoryCache.Remove(_options.CacheIdKey);
         }
 
-        private async Task<TDocument> GetFromDistributedCacheAsync()
+        // Consistency: We may have been the last to update the cache but not with the last stored document.
+        if (!_isVolatile && _options.CheckConsistency.Value)
         {
-            byte[] data = null;
+            (_, var stored) = await DocumentStore.GetOrCreateImmutableAsync<TDocument>();
 
-            if (_isDistributed)
-            {
-                data = await _distributedCache.GetAsync(_options.CacheKey);
-            }
-            else if (_memoryCache.TryGetValue<TDocument>(_options.CacheKey, out var cached))
+            if (stored.Identifier != document.Identifier)
             {
-                data = await _options.Serializer.SerializeAsync(cached);
+                await InvalidateInternalAsync(document);
             }
+        }
+    }
 
-            if (data == null)
-            {
-                return null;
-            }
+#pragma warning disable IDE0060 // Remove unused parameter
+    protected async Task InvalidateInternalAsync(TDocument document, bool failover = false)
+#pragma warning restore IDE0060 // Remove unused parameter
+    {
+        if (_isDistributed)
+        {
+            await _distributedCache.RemoveAsync(_options.CacheIdKey);
+        }
+        _memoryCache.Remove(_options.CacheIdKey);
+    }
+
+    private async Task<TDocument> GetFromDistributedCacheAsync()
+    {
+        byte[] data = null;
 
-            return await _options.Serializer.DeserializeAsync<TDocument>(data);
+        if (_isDistributed)
+        {
+            data = await _distributedCache.GetAsync(_options.CacheKey);
+        }
+        else if (_memoryCache.TryGetValue<TDocument>(_options.CacheKey, out var cached))
+        {
+            data = await _options.Serializer.SerializeAsync(cached);
         }
 
-        private async Task UpdateDistributedCacheAsync(TDocument document)
+        if (data == null)
         {
-            if (_isDistributed)
-            {
-                var data = await _options.Serializer.SerializeAsync(document, _options.CompressThreshold);
-                await _distributedCache.SetAsync(_options.CacheKey, data, _options);
-                await _distributedCache.SetStringAsync(_options.CacheIdKey, document.Identifier ?? "NULL", _options);
-            }
-            else
-            {
-                _memoryCache.Set(_options.CacheIdKey, document.Identifier ?? "NULL");
-            }
+            return null;
+        }
+
+        return await _options.Serializer.DeserializeAsync<TDocument>(data);
+    }
+
+    private async Task UpdateDistributedCacheAsync(TDocument document)
+    {
+        if (_isDistributed)
+        {
+            var data = await _options.Serializer.SerializeAsync(document, _options.CompressThreshold);
+            await _distributedCache.SetAsync(_options.CacheKey, data, _options);
+            await _distributedCache.SetStringAsync(_options.CacheIdKey, document.Identifier ?? "NULL", _options);
+        }
+        else
+        {
+            _memoryCache.Set(_options.CacheIdKey, document.Identifier ?? "NULL");
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Documents/DocumentManagerOfT.cs b/src/OrchardCore/OrchardCore.Infrastructure/Documents/DocumentManagerOfT.cs
index 587872ffacf..6a2f40a0356 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Documents/DocumentManagerOfT.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Documents/DocumentManagerOfT.cs
@@ -5,22 +5,21 @@
 using OrchardCore.Data.Documents;
 using OrchardCore.Documents.Options;
 
-namespace OrchardCore.Documents
+namespace OrchardCore.Documents;
+
+/// <summary>
+/// A <see cref="DocumentManager{TDocument}"/> using a given type of <see cref="IDocumentStore"/>.
+/// </summary>
+public class DocumentManager<TDocumentStore, TDocument> : DocumentManager<TDocument>, IDocumentManager<TDocumentStore, TDocument>
+    where TDocumentStore : IDocumentStore where TDocument : class, IDocument, new()
 {
-    /// <summary>
-    /// A <see cref="DocumentManager{TDocument}"/> using a given type of <see cref="IDocumentStore"/>.
-    /// </summary>
-    public class DocumentManager<TDocumentStore, TDocument> : DocumentManager<TDocument>, IDocumentManager<TDocumentStore, TDocument>
-        where TDocumentStore : IDocumentStore where TDocument : class, IDocument, new()
+    public DocumentManager(
+        IDistributedCache distributedCache,
+        IMemoryCache memoryCache,
+        IOptionsMonitor<DocumentOptions> options,
+        ILogger<DocumentManager<TDocument>> logger)
+        : base(distributedCache, memoryCache, options, logger)
     {
-        public DocumentManager(
-            IDistributedCache distributedCache,
-            IMemoryCache memoryCache,
-            IOptionsMonitor<DocumentOptions> options,
-            ILogger<DocumentManager<TDocument>> logger)
-            : base(distributedCache, memoryCache, options, logger)
-        {
-            DocumentStoreServiceType = typeof(TDocumentStore);
-        }
+        DocumentStoreServiceType = typeof(TDocumentStore);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Documents/Options/DocumentOptionsSetup.cs b/src/OrchardCore/OrchardCore.Infrastructure/Documents/Options/DocumentOptionsSetup.cs
index f568a76975a..9618e465e1e 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Documents/Options/DocumentOptionsSetup.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Documents/Options/DocumentOptionsSetup.cs
@@ -5,93 +5,92 @@
 using OrchardCore.Environment.Shell.Configuration;
 using OrchardCore.Json;
 
-namespace OrchardCore.Documents.Options
+namespace OrchardCore.Documents.Options;
+
+public class DocumentOptionsSetup : IConfigureNamedOptions<DocumentOptions>
 {
-    public class DocumentOptionsSetup : IConfigureNamedOptions<DocumentOptions>
-    {
-        public static readonly TimeSpan DefaultFailoverRetryLatency = TimeSpan.FromSeconds(30);
+    public static readonly TimeSpan DefaultFailoverRetryLatency = TimeSpan.FromSeconds(30);
 
-        private readonly IShellConfiguration _shellConfiguration;
-        private readonly DocumentJsonSerializerOptions _documentJsonSerializerOptions;
+    private readonly IShellConfiguration _shellConfiguration;
+    private readonly DocumentJsonSerializerOptions _documentJsonSerializerOptions;
 
-        private DefaultDocumentSerializer _defaultDocumentSerializer;
+    private DefaultDocumentSerializer _defaultDocumentSerializer;
 
-        public DocumentOptionsSetup(
-            IShellConfiguration shellConfiguration,
-            IOptions<DocumentJsonSerializerOptions> documentJsonSerializerOptions)
-        {
-            _shellConfiguration = shellConfiguration;
-            _documentJsonSerializerOptions = documentJsonSerializerOptions.Value;
-        }
+    public DocumentOptionsSetup(
+        IShellConfiguration shellConfiguration,
+        IOptions<DocumentJsonSerializerOptions> documentJsonSerializerOptions)
+    {
+        _shellConfiguration = shellConfiguration;
+        _documentJsonSerializerOptions = documentJsonSerializerOptions.Value;
+    }
 
-        public void Configure(DocumentOptions options)
-            => Configure(string.Empty, options);
+    public void Configure(DocumentOptions options)
+        => Configure(string.Empty, options);
 
-        public void Configure(string name, DocumentOptions options)
-        {
-            var sharedConfig = _shellConfiguration
-                .GetSection("OrchardCore_Documents")
-                .Get<DocumentSharedOptions>()
-                ?? new DocumentSharedOptions();
+    public void Configure(string name, DocumentOptions options)
+    {
+        var sharedConfig = _shellConfiguration
+            .GetSection("OrchardCore_Documents")
+            .Get<DocumentSharedOptions>()
+            ?? new DocumentSharedOptions();
 
-            var namedConfig = _shellConfiguration
-                .GetSection(name)
-                .Get<DocumentNamedOptions>()
-                ?? new DocumentNamedOptions();
+        var namedConfig = _shellConfiguration
+            .GetSection(name)
+            .Get<DocumentNamedOptions>()
+            ?? new DocumentNamedOptions();
 
-            // Only from the named config or default.
-            options.CacheKey = namedConfig.CacheKey ?? name;
-            options.CacheIdKey = namedConfig.CacheIdKey ?? "ID_" + name;
+        // Only from the named config or default.
+        options.CacheKey = namedConfig.CacheKey ?? name;
+        options.CacheIdKey = namedConfig.CacheIdKey ?? "ID_" + name;
 
-            // Only from the shared config or default.
-            options.FailoverRetryLatency = sharedConfig.FailoverRetryLatency ?? DefaultFailoverRetryLatency;
+        // Only from the shared config or default.
+        options.FailoverRetryLatency = sharedConfig.FailoverRetryLatency ?? DefaultFailoverRetryLatency;
 
-            // From the named or shared config or default.
-            options.CheckConcurrency = namedConfig.CheckConcurrency ?? sharedConfig.CheckConcurrency ?? true;
-            options.CheckConsistency = namedConfig.CheckConsistency ?? sharedConfig.CheckConsistency ?? true;
+        // From the named or shared config or default.
+        options.CheckConcurrency = namedConfig.CheckConcurrency ?? sharedConfig.CheckConcurrency ?? true;
+        options.CheckConsistency = namedConfig.CheckConsistency ?? sharedConfig.CheckConsistency ?? true;
 
-            options.SynchronizationLatency = namedConfig.SynchronizationLatency
-                ?? sharedConfig.SynchronizationLatency
-                ?? TimeSpan.FromSeconds(1);
+        options.SynchronizationLatency = namedConfig.SynchronizationLatency
+            ?? sharedConfig.SynchronizationLatency
+            ?? TimeSpan.FromSeconds(1);
 
-            options.Serializer = _defaultDocumentSerializer ??= new DefaultDocumentSerializer(_documentJsonSerializerOptions.SerializerOptions);
+        options.Serializer = _defaultDocumentSerializer ??= new DefaultDocumentSerializer(_documentJsonSerializerOptions.SerializerOptions);
 
-            options.CompressThreshold = namedConfig.CompressThreshold;
+        options.CompressThreshold = namedConfig.CompressThreshold;
+        if (options.CompressThreshold == 0)
+        {
+            options.CompressThreshold = sharedConfig.CompressThreshold;
             if (options.CompressThreshold == 0)
             {
-                options.CompressThreshold = sharedConfig.CompressThreshold;
-                if (options.CompressThreshold == 0)
-                {
-                    options.CompressThreshold = 10_000;
-                }
+                options.CompressThreshold = 10_000;
             }
+        }
 
-            // Only used by an explicit atomic update.
-            options.LockTimeout = namedConfig.LockTimeout;
+        // Only used by an explicit atomic update.
+        options.LockTimeout = namedConfig.LockTimeout;
+        if (options.LockTimeout <= 0)
+        {
+            options.LockTimeout = sharedConfig.LockTimeout;
             if (options.LockTimeout <= 0)
             {
-                options.LockTimeout = sharedConfig.LockTimeout;
-                if (options.LockTimeout <= 0)
-                {
-                    options.LockTimeout = 10_000;
-                }
+                options.LockTimeout = 10_000;
             }
+        }
 
-            // Only used by an explicit atomic update.
-            options.LockExpiration = namedConfig.LockExpiration;
+        // Only used by an explicit atomic update.
+        options.LockExpiration = namedConfig.LockExpiration;
+        if (options.LockExpiration <= 0)
+        {
+            options.LockExpiration = sharedConfig.LockExpiration;
             if (options.LockExpiration <= 0)
             {
-                options.LockExpiration = sharedConfig.LockExpiration;
-                if (options.LockExpiration <= 0)
-                {
-                    options.LockExpiration = 10_000;
-                }
+                options.LockExpiration = 10_000;
             }
-
-            // Inherited 'DistributedCacheEntryOptions'.
-            options.AbsoluteExpiration = namedConfig.AbsoluteExpiration ?? sharedConfig.AbsoluteExpiration;
-            options.AbsoluteExpirationRelativeToNow = namedConfig.AbsoluteExpirationRelativeToNow ?? sharedConfig.AbsoluteExpirationRelativeToNow;
-            options.SlidingExpiration = namedConfig.SlidingExpiration ?? sharedConfig.SlidingExpiration;
         }
+
+        // Inherited 'DistributedCacheEntryOptions'.
+        options.AbsoluteExpiration = namedConfig.AbsoluteExpiration ?? sharedConfig.AbsoluteExpiration;
+        options.AbsoluteExpirationRelativeToNow = namedConfig.AbsoluteExpirationRelativeToNow ?? sharedConfig.AbsoluteExpirationRelativeToNow;
+        options.SlidingExpiration = namedConfig.SlidingExpiration ?? sharedConfig.SlidingExpiration;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Documents/OrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Infrastructure/Documents/OrchardCoreBuilderExtensions.cs
index 833bc15d96d..be4ce25df0b 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Documents/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Documents/OrchardCoreBuilderExtensions.cs
@@ -4,27 +4,26 @@
 using OrchardCore.Documents;
 using OrchardCore.Documents.Options;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static partial class OrchardCoreBuilderExtensions
 {
-    public static partial class OrchardCoreBuilderExtensions
+    /// <summary>
+    /// Adds tenant level services to keep in sync any single <see cref="IDocument"/> between an <see cref="IDocumentStore"/> and a multi level cache.
+    /// </summary>
+    public static OrchardCoreBuilder AddDocumentManagement(this OrchardCoreBuilder builder)
     {
-        /// <summary>
-        /// Adds tenant level services to keep in sync any single <see cref="IDocument"/> between an <see cref="IDocumentStore"/> and a multi level cache.
-        /// </summary>
-        public static OrchardCoreBuilder AddDocumentManagement(this OrchardCoreBuilder builder)
+        return builder.ConfigureServices(services =>
         {
-            return builder.ConfigureServices(services =>
-            {
-                services.AddSingleton(typeof(IDocumentManager<>), typeof(DocumentManager<>));
-                services.AddSingleton(typeof(IVolatileDocumentManager<>), typeof(VolatileDocumentManager<>));
-                services.AddSingleton(typeof(IDocumentManager<,>), typeof(DocumentManager<,>));
+            services.AddSingleton(typeof(IDocumentManager<>), typeof(DocumentManager<>));
+            services.AddSingleton(typeof(IVolatileDocumentManager<>), typeof(VolatileDocumentManager<>));
+            services.AddSingleton(typeof(IDocumentManager<,>), typeof(DocumentManager<,>));
 
-                services.TryAddEnumerable(ServiceDescriptor.Singleton<IConfigureOptions<DocumentOptions>, DocumentOptionsSetup>());
+            services.TryAddEnumerable(ServiceDescriptor.Singleton<IConfigureOptions<DocumentOptions>, DocumentOptionsSetup>());
 
-                services.AddSingleton(typeof(IDocumentEntityManager<>), typeof(DocumentEntityManager<>));
-                services.AddSingleton(typeof(IVolatileDocumentEntityManager<>), typeof(VolatileDocumentEntityManager<>));
-                services.AddSingleton(typeof(IDocumentEntityManager<,>), typeof(DocumentEntityManager<,>));
-            });
-        }
+            services.AddSingleton(typeof(IDocumentEntityManager<>), typeof(DocumentEntityManager<>));
+            services.AddSingleton(typeof(IVolatileDocumentEntityManager<>), typeof(VolatileDocumentEntityManager<>));
+            services.AddSingleton(typeof(IDocumentEntityManager<,>), typeof(DocumentEntityManager<,>));
+        });
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Documents/VolatileDocumentEntityManager.cs b/src/OrchardCore/OrchardCore.Infrastructure/Documents/VolatileDocumentEntityManager.cs
index b33d4ea9be6..ef62dc4d296 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Documents/VolatileDocumentEntityManager.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Documents/VolatileDocumentEntityManager.cs
@@ -1,13 +1,12 @@
-namespace OrchardCore.Documents
+namespace OrchardCore.Documents;
+
+/// <summary>
+/// A <see cref="DocumentEntityManager{TDocumentEntity}"/> using a multi level cache but without any persistent storage.
+/// </summary>
+public class VolatileDocumentEntityManager<TDocumentEntity> : DocumentEntityManager<TDocumentEntity>, IVolatileDocumentEntityManager<TDocumentEntity> where TDocumentEntity : class, IDocumentEntity, new()
 {
-    /// <summary>
-    /// A <see cref="DocumentEntityManager{TDocumentEntity}"/> using a multi level cache but without any persistent storage.
-    /// </summary>
-    public class VolatileDocumentEntityManager<TDocumentEntity> : DocumentEntityManager<TDocumentEntity>, IVolatileDocumentEntityManager<TDocumentEntity> where TDocumentEntity : class, IDocumentEntity, new()
+    public VolatileDocumentEntityManager(IVolatileDocumentManager<TDocumentEntity> documentManager)
+        : base(documentManager)
     {
-        public VolatileDocumentEntityManager(IVolatileDocumentManager<TDocumentEntity> documentManager)
-            : base(documentManager)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Documents/VolatileDocumentManager.cs b/src/OrchardCore/OrchardCore.Infrastructure/Documents/VolatileDocumentManager.cs
index ea25f1b156d..770d7b9cfbf 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Documents/VolatileDocumentManager.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Documents/VolatileDocumentManager.cs
@@ -10,113 +10,112 @@
 using OrchardCore.Environment.Shell.Scope;
 using OrchardCore.Locking.Distributed;
 
-namespace OrchardCore.Documents
+namespace OrchardCore.Documents;
+
+/// <summary>
+/// A <see cref="DocumentManager{TDocument}"/> using a multi level cache but without any persistent storage.
+/// </summary>
+public class VolatileDocumentManager<TDocument> : DocumentManager<TDocument>, IVolatileDocumentManager<TDocument>
+    where TDocument : class, IDocument, new()
 {
-    /// <summary>
-    /// A <see cref="DocumentManager{TDocument}"/> using a multi level cache but without any persistent storage.
-    /// </summary>
-    public class VolatileDocumentManager<TDocument> : DocumentManager<TDocument>, IVolatileDocumentManager<TDocument>
-        where TDocument : class, IDocument, new()
+    private readonly IDistributedLock _distributedLock;
+    private readonly ILogger _logger;
+
+    private delegate Task<TDocument> UpdateDelegate();
+    private delegate Task AfterUpdateDelegate(TDocument document);
+
+    public VolatileDocumentManager(
+        IDistributedCache distributedCache,
+        IDistributedLock distributedLock,
+        IMemoryCache memoryCache,
+        IOptionsMonitor<DocumentOptions> options,
+        ILogger<DocumentManager<TDocument>> logger)
+        : base(distributedCache, memoryCache, options, logger)
     {
-        private readonly IDistributedLock _distributedLock;
-        private readonly ILogger _logger;
-
-        private delegate Task<TDocument> UpdateDelegate();
-        private delegate Task AfterUpdateDelegate(TDocument document);
-
-        public VolatileDocumentManager(
-            IDistributedCache distributedCache,
-            IDistributedLock distributedLock,
-            IMemoryCache memoryCache,
-            IOptionsMonitor<DocumentOptions> options,
-            ILogger<DocumentManager<TDocument>> logger)
-            : base(distributedCache, memoryCache, options, logger)
-        {
-            _isVolatile = true;
-            _distributedLock = distributedLock;
-            _logger = logger;
-        }
+        _isVolatile = true;
+        _distributedLock = distributedLock;
+        _logger = logger;
+    }
 
-        public async Task UpdateAtomicAsync(Func<Task<TDocument>> updateAsync, Func<TDocument, Task> afterUpdateAsync = null)
+    public async Task UpdateAtomicAsync(Func<Task<TDocument>> updateAsync, Func<TDocument, Task> afterUpdateAsync = null)
+    {
+        if (_isDistributed)
         {
-            if (_isDistributed)
+            try
             {
-                try
-                {
-                    _ = await _distributedCache.GetStringAsync(_options.CacheIdKey);
-                }
-                catch
-                {
-                    await DocumentStore.CancelAsync();
+                _ = await _distributedCache.GetStringAsync(_options.CacheIdKey);
+            }
+            catch
+            {
+                await DocumentStore.CancelAsync();
 
-                    _logger.LogError("Can't update the '{DocumentName}' if not able to access the distributed cache", typeof(TDocument).Name);
+                _logger.LogError("Can't update the '{DocumentName}' if not able to access the distributed cache", typeof(TDocument).Name);
 
-                    throw;
-                }
+                throw;
             }
+        }
 
-            var delegates = ShellScope.GetOrCreateFeature<UpdateDelegates>();
+        var delegates = ShellScope.GetOrCreateFeature<UpdateDelegates>();
 
-            var updateDelegate = new UpdateDelegate(updateAsync);
-            if (delegates.Targets.Add(updateDelegate.Target))
-            {
-                delegates.UpdateDelegateAsync += updateDelegate;
-            }
+        var updateDelegate = new UpdateDelegate(updateAsync);
+        if (delegates.Targets.Add(updateDelegate.Target))
+        {
+            delegates.UpdateDelegateAsync += updateDelegate;
+        }
 
-            if (afterUpdateAsync is not null)
+        if (afterUpdateAsync is not null)
+        {
+            var afterUpdateDelegate = new AfterUpdateDelegate(afterUpdateAsync);
+            if (delegates.Targets.Add(afterUpdateDelegate.Target))
             {
-                var afterUpdateDelegate = new AfterUpdateDelegate(afterUpdateAsync);
-                if (delegates.Targets.Add(afterUpdateDelegate.Target))
-                {
-                    delegates.AfterUpdateDelegateAsync += afterUpdateDelegate;
-                }
+                delegates.AfterUpdateDelegateAsync += afterUpdateDelegate;
             }
+        }
 
-            DocumentStore.AfterCommitSuccess<TDocument>(async () =>
-            {
-                (var locker, var locked) = await _distributedLock.TryAcquireLockAsync(
-                    _options.CacheKey + "_LOCK",
-                    TimeSpan.FromMilliseconds(_options.LockTimeout),
-                    TimeSpan.FromMilliseconds(_options.LockExpiration));
+        DocumentStore.AfterCommitSuccess<TDocument>(async () =>
+        {
+            (var locker, var locked) = await _distributedLock.TryAcquireLockAsync(
+                _options.CacheKey + "_LOCK",
+                TimeSpan.FromMilliseconds(_options.LockTimeout),
+                TimeSpan.FromMilliseconds(_options.LockExpiration));
 
-                if (!locked)
-                {
-                    return;
-                }
+            if (!locked)
+            {
+                return;
+            }
 
-                await using var acquiredLock = locker;
+            await using var acquiredLock = locker;
 
-                TDocument document = null;
-                foreach (var d in delegates.UpdateDelegateAsync.GetInvocationList())
-                {
-                    document = await ((UpdateDelegate)d)();
-                }
+            TDocument document = null;
+            foreach (var d in delegates.UpdateDelegateAsync.GetInvocationList())
+            {
+                document = await ((UpdateDelegate)d)();
+            }
 
-                if (document is null)
-                {
-                    return;
-                }
+            if (document is null)
+            {
+                return;
+            }
 
-                document.Identifier ??= IdGenerator.GenerateId();
+            document.Identifier ??= IdGenerator.GenerateId();
 
-                // A volatile document can't be invalidated.
-                await SetInternalAsync(document);
+            // A volatile document can't be invalidated.
+            await SetInternalAsync(document);
 
-                if (delegates.AfterUpdateDelegateAsync is not null)
+            if (delegates.AfterUpdateDelegateAsync is not null)
+            {
+                foreach (var d in delegates.AfterUpdateDelegateAsync.GetInvocationList())
                 {
-                    foreach (var d in delegates.AfterUpdateDelegateAsync.GetInvocationList())
-                    {
-                        await ((AfterUpdateDelegate)d)(document);
-                    }
+                    await ((AfterUpdateDelegate)d)(document);
                 }
-            });
-        }
+            }
+        });
+    }
 
-        private sealed class UpdateDelegates
-        {
-            public UpdateDelegate UpdateDelegateAsync;
-            public AfterUpdateDelegate AfterUpdateDelegateAsync;
-            public HashSet<object> Targets { get; set; } = [];
-        }
+    private sealed class UpdateDelegates
+    {
+        public UpdateDelegate UpdateDelegateAsync;
+        public AfterUpdateDelegate AfterUpdateDelegateAsync;
+        public HashSet<object> Targets { get; set; } = [];
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Email/EmailAddressValidator.cs b/src/OrchardCore/OrchardCore.Infrastructure/Email/EmailAddressValidator.cs
index 7871d9f4046..d7d6d4c2959 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Email/EmailAddressValidator.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Email/EmailAddressValidator.cs
@@ -1,14 +1,13 @@
 using MimeKit;
 
-namespace OrchardCore.Email
+namespace OrchardCore.Email;
+
+/// <summary>
+/// Represents a service for e-mail address validation.
+/// </summary>
+public class EmailAddressValidator : IEmailAddressValidator
 {
-    /// <summary>
-    /// Represents a service for e-mail address validation.
-    /// </summary>
-    public class EmailAddressValidator : IEmailAddressValidator
-    {
-        /// <inheritdoc/>
-        public bool Validate(string emailAddress)
-            => emailAddress?.IndexOf('@') > -1 && MailboxAddress.TryParse(emailAddress, out _);
-    }
+    /// <inheritdoc/>
+    public bool Validate(string emailAddress)
+        => emailAddress?.IndexOf('@') > -1 && MailboxAddress.TryParse(emailAddress, out _);
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Email/OrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Infrastructure/Email/OrchardCoreBuilderExtensions.cs
index f0050e02310..07beb0f78b9 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Email/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Email/OrchardCoreBuilderExtensions.cs
@@ -1,24 +1,23 @@
 using OrchardCore.Email;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+/// <summary>
+/// Provides an extension method for <see cref="OrchardCoreBuilder"/>.
+/// </summary>
+public static partial class OrchardCoreBuilderExtensions
 {
     /// <summary>
-    /// Provides an extension method for <see cref="OrchardCoreBuilder"/>.
+    /// Adds e-mail address validator service.
     /// </summary>
-    public static partial class OrchardCoreBuilderExtensions
+    /// <param name="builder">The <see cref="OrchardCoreBuilder"/>.</param>
+    public static OrchardCoreBuilder AddEmailAddressValidator(this OrchardCoreBuilder builder)
     {
-        /// <summary>
-        /// Adds e-mail address validator service.
-        /// </summary>
-        /// <param name="builder">The <see cref="OrchardCoreBuilder"/>.</param>
-        public static OrchardCoreBuilder AddEmailAddressValidator(this OrchardCoreBuilder builder)
+        builder.ConfigureServices(services =>
         {
-            builder.ConfigureServices(services =>
-            {
-                services.AddTransient<IEmailAddressValidator, EmailAddressValidator>();
-            });
+            services.AddTransient<IEmailAddressValidator, EmailAddressValidator>();
+        });
 
-            return builder;
-        }
+        return builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Entities/DefaultIdGenerator.cs b/src/OrchardCore/OrchardCore.Infrastructure/Entities/DefaultIdGenerator.cs
index afc009d4532..4c576e99c32 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Entities/DefaultIdGenerator.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Entities/DefaultIdGenerator.cs
@@ -1,56 +1,55 @@
 using System;
 
-namespace OrchardCore.Entities
+namespace OrchardCore.Entities;
+
+public class DefaultIdGenerator : IIdGenerator
 {
-    public class DefaultIdGenerator : IIdGenerator
+    // Some confusing chars are ignored: http://www.crockford.com/wrmg/base32.html
+    private const string Encode32Chars = "0123456789abcdefghjkmnpqrstvwxyz";
+
+    public string GenerateUniqueId()
+    {
+        // Generate a base32 Guid value
+        var guid = Guid.NewGuid().ToByteArray();
+
+        var hs = BitConverter.ToInt64(guid, 0);
+        var ls = BitConverter.ToInt64(guid, 8);
+
+        return ToBase32(hs, ls);
+    }
+
+    private static string ToBase32(long hs, long ls)
     {
-        // Some confusing chars are ignored: http://www.crockford.com/wrmg/base32.html
-        private const string Encode32Chars = "0123456789abcdefghjkmnpqrstvwxyz";
-
-        public string GenerateUniqueId()
-        {
-            // Generate a base32 Guid value
-            var guid = Guid.NewGuid().ToByteArray();
-
-            var hs = BitConverter.ToInt64(guid, 0);
-            var ls = BitConverter.ToInt64(guid, 8);
-
-            return ToBase32(hs, ls);
-        }
-
-        private static string ToBase32(long hs, long ls)
-        {
-            var charBuffer = new char[26];
-
-            charBuffer[0] = Encode32Chars[(int)(hs >> 60) & 31];
-            charBuffer[1] = Encode32Chars[(int)(hs >> 55) & 31];
-            charBuffer[2] = Encode32Chars[(int)(hs >> 50) & 31];
-            charBuffer[3] = Encode32Chars[(int)(hs >> 45) & 31];
-            charBuffer[4] = Encode32Chars[(int)(hs >> 40) & 31];
-            charBuffer[5] = Encode32Chars[(int)(hs >> 35) & 31];
-            charBuffer[6] = Encode32Chars[(int)(hs >> 30) & 31];
-            charBuffer[7] = Encode32Chars[(int)(hs >> 25) & 31];
-            charBuffer[8] = Encode32Chars[(int)(hs >> 20) & 31];
-            charBuffer[9] = Encode32Chars[(int)(hs >> 15) & 31];
-            charBuffer[10] = Encode32Chars[(int)(hs >> 10) & 31];
-            charBuffer[11] = Encode32Chars[(int)(hs >> 5) & 31];
-            charBuffer[12] = Encode32Chars[(int)hs & 31];
-
-            charBuffer[13] = Encode32Chars[(int)(ls >> 60) & 31];
-            charBuffer[14] = Encode32Chars[(int)(ls >> 55) & 31];
-            charBuffer[15] = Encode32Chars[(int)(ls >> 50) & 31];
-            charBuffer[16] = Encode32Chars[(int)(ls >> 45) & 31];
-            charBuffer[17] = Encode32Chars[(int)(ls >> 40) & 31];
-            charBuffer[18] = Encode32Chars[(int)(ls >> 35) & 31];
-            charBuffer[19] = Encode32Chars[(int)(ls >> 30) & 31];
-            charBuffer[20] = Encode32Chars[(int)(ls >> 25) & 31];
-            charBuffer[21] = Encode32Chars[(int)(ls >> 20) & 31];
-            charBuffer[22] = Encode32Chars[(int)(ls >> 15) & 31];
-            charBuffer[23] = Encode32Chars[(int)(ls >> 10) & 31];
-            charBuffer[24] = Encode32Chars[(int)(ls >> 5) & 31];
-            charBuffer[25] = Encode32Chars[(int)ls & 31];
-
-            return new string(charBuffer);
-        }
+        var charBuffer = new char[26];
+
+        charBuffer[0] = Encode32Chars[(int)(hs >> 60) & 31];
+        charBuffer[1] = Encode32Chars[(int)(hs >> 55) & 31];
+        charBuffer[2] = Encode32Chars[(int)(hs >> 50) & 31];
+        charBuffer[3] = Encode32Chars[(int)(hs >> 45) & 31];
+        charBuffer[4] = Encode32Chars[(int)(hs >> 40) & 31];
+        charBuffer[5] = Encode32Chars[(int)(hs >> 35) & 31];
+        charBuffer[6] = Encode32Chars[(int)(hs >> 30) & 31];
+        charBuffer[7] = Encode32Chars[(int)(hs >> 25) & 31];
+        charBuffer[8] = Encode32Chars[(int)(hs >> 20) & 31];
+        charBuffer[9] = Encode32Chars[(int)(hs >> 15) & 31];
+        charBuffer[10] = Encode32Chars[(int)(hs >> 10) & 31];
+        charBuffer[11] = Encode32Chars[(int)(hs >> 5) & 31];
+        charBuffer[12] = Encode32Chars[(int)hs & 31];
+
+        charBuffer[13] = Encode32Chars[(int)(ls >> 60) & 31];
+        charBuffer[14] = Encode32Chars[(int)(ls >> 55) & 31];
+        charBuffer[15] = Encode32Chars[(int)(ls >> 50) & 31];
+        charBuffer[16] = Encode32Chars[(int)(ls >> 45) & 31];
+        charBuffer[17] = Encode32Chars[(int)(ls >> 40) & 31];
+        charBuffer[18] = Encode32Chars[(int)(ls >> 35) & 31];
+        charBuffer[19] = Encode32Chars[(int)(ls >> 30) & 31];
+        charBuffer[20] = Encode32Chars[(int)(ls >> 25) & 31];
+        charBuffer[21] = Encode32Chars[(int)(ls >> 20) & 31];
+        charBuffer[22] = Encode32Chars[(int)(ls >> 15) & 31];
+        charBuffer[23] = Encode32Chars[(int)(ls >> 10) & 31];
+        charBuffer[24] = Encode32Chars[(int)(ls >> 5) & 31];
+        charBuffer[25] = Encode32Chars[(int)ls & 31];
+
+        return new string(charBuffer);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Entities/OrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Infrastructure/Entities/OrchardCoreBuilderExtensions.cs
index bf73893ef71..4682b7a4f0f 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Entities/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Entities/OrchardCoreBuilderExtensions.cs
@@ -2,25 +2,24 @@
 using OrchardCore.Entities.Scripting;
 using OrchardCore.Scripting;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+/// <summary>
+/// Provides an extension method for <see cref="OrchardCoreBuilder"/>.
+/// </summary>
+public static partial class OrchardCoreBuilderExtensions
 {
     /// <summary>
-    /// Provides an extension method for <see cref="OrchardCoreBuilder"/>.
+    /// Adds IdGeneration services.
     /// </summary>
-    public static partial class OrchardCoreBuilderExtensions
+    /// <param name="builder">The <see cref="OrchardCoreBuilder"/>.</param>
+    public static OrchardCoreBuilder AddIdGeneration(this OrchardCoreBuilder builder)
     {
-        /// <summary>
-        /// Adds IdGeneration services.
-        /// </summary>
-        /// <param name="builder">The <see cref="OrchardCoreBuilder"/>.</param>
-        public static OrchardCoreBuilder AddIdGeneration(this OrchardCoreBuilder builder)
-        {
-            var services = builder.ApplicationServices;
+        var services = builder.ApplicationServices;
 
-            services.AddSingleton<IIdGenerator, DefaultIdGenerator>();
-            services.AddSingleton<IGlobalMethodProvider, IdGeneratorMethod>();
+        services.AddSingleton<IIdGenerator, DefaultIdGenerator>();
+        services.AddSingleton<IGlobalMethodProvider, IdGeneratorMethod>();
 
-            return builder;
-        }
+        return builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Entities/Scripting/IdGeneratorMethod.cs b/src/OrchardCore/OrchardCore.Infrastructure/Entities/Scripting/IdGeneratorMethod.cs
index 1c0c694d994..b72c2125918 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Entities/Scripting/IdGeneratorMethod.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Entities/Scripting/IdGeneratorMethod.cs
@@ -2,23 +2,22 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Scripting;
 
-namespace OrchardCore.Entities.Scripting
+namespace OrchardCore.Entities.Scripting;
+
+public class IdGeneratorMethod : IGlobalMethodProvider
 {
-    public class IdGeneratorMethod : IGlobalMethodProvider
+    private static readonly GlobalMethod _uuid = new()
     {
-        private static readonly GlobalMethod _uuid = new()
-        {
-            Name = "uuid",
-            Method = serviceProvider => () =>
-           {
-               var idGenerator = serviceProvider.GetRequiredService<IIdGenerator>();
-               return idGenerator.GenerateUniqueId();
-           },
-        };
+        Name = "uuid",
+        Method = serviceProvider => () =>
+       {
+           var idGenerator = serviceProvider.GetRequiredService<IIdGenerator>();
+           return idGenerator.GenerateUniqueId();
+       },
+    };
 
-        public IEnumerable<GlobalMethod> GetMethods()
-        {
-            yield return _uuid;
-        }
+    public IEnumerable<GlobalMethod> GetMethods()
+    {
+        yield return _uuid;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Entities/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Infrastructure/Entities/ServiceCollectionExtensions.cs
index 62644b78c85..35dfe41e3db 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Entities/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Entities/ServiceCollectionExtensions.cs
@@ -3,15 +3,14 @@
 using OrchardCore.Entities.Scripting;
 using OrchardCore.Scripting;
 
-namespace OrchardCore.Entities
+namespace OrchardCore.Entities;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    public static IServiceCollection AddIdGeneration(this IServiceCollection services)
     {
-        public static IServiceCollection AddIdGeneration(this IServiceCollection services)
-        {
-            services.TryAddSingleton<IIdGenerator, DefaultIdGenerator>();
-            services.TryAddEnumerable(ServiceDescriptor.Singleton<IGlobalMethodProvider, IdGeneratorMethod>());
-            return services;
-        }
+        services.TryAddSingleton<IIdGenerator, DefaultIdGenerator>();
+        services.TryAddEnumerable(ServiceDescriptor.Singleton<IGlobalMethodProvider, IdGeneratorMethod>());
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Html/HtmlSanitizerOptions.cs b/src/OrchardCore/OrchardCore.Infrastructure/Html/HtmlSanitizerOptions.cs
index b177cadc871..9f2048145d2 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Html/HtmlSanitizerOptions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Html/HtmlSanitizerOptions.cs
@@ -2,10 +2,9 @@
 using System.Collections.Generic;
 using Ganss.Xss;
 
-namespace OrchardCore.Infrastructure.Html
+namespace OrchardCore.Infrastructure.Html;
+
+public class HtmlSanitizerOptions
 {
-    public class HtmlSanitizerOptions
-    {
-        public List<Action<HtmlSanitizer>> Configure { get; } = [];
-    }
+    public List<Action<HtmlSanitizer>> Configure { get; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Html/HtmlSanitizerOptionsExtensions.cs b/src/OrchardCore/OrchardCore.Infrastructure/Html/HtmlSanitizerOptionsExtensions.cs
index dcdb6841abe..85ed7d4f47d 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Html/HtmlSanitizerOptionsExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Html/HtmlSanitizerOptionsExtensions.cs
@@ -2,19 +2,18 @@
 using Ganss.Xss;
 using HtmlSanitizerOptions = OrchardCore.Infrastructure.Html.HtmlSanitizerOptions;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class HtmlSanitizerOptionsExtensions
 {
-    public static class HtmlSanitizerOptionsExtensions
+    /// <summary>
+    /// Adds a configuration action to the html sanitizer.
+    /// </summary>
+    public static void ConfigureHtmlSanitizer(this IServiceCollection services, Action<HtmlSanitizer> action)
     {
-        /// <summary>
-        /// Adds a configuration action to the html sanitizer.
-        /// </summary>
-        public static void ConfigureHtmlSanitizer(this IServiceCollection services, Action<HtmlSanitizer> action)
+        services.Configure<HtmlSanitizerOptions>(o =>
         {
-            services.Configure<HtmlSanitizerOptions>(o =>
-            {
-                o.Configure.Add(action);
-            });
-        }
+            o.Configure.Add(action);
+        });
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Html/HtmlSanitizerService.cs b/src/OrchardCore/OrchardCore.Infrastructure/Html/HtmlSanitizerService.cs
index bb73aadbac2..f8af78aa3a6 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Html/HtmlSanitizerService.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Html/HtmlSanitizerService.cs
@@ -1,20 +1,19 @@
 using Ganss.Xss;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Infrastructure.Html
+namespace OrchardCore.Infrastructure.Html;
+
+public class HtmlSanitizerService : IHtmlSanitizerService
 {
-    public class HtmlSanitizerService : IHtmlSanitizerService
-    {
-        private readonly HtmlSanitizer _sanitizer = new();
+    private readonly HtmlSanitizer _sanitizer = new();
 
-        public HtmlSanitizerService(IOptions<HtmlSanitizerOptions> options)
+    public HtmlSanitizerService(IOptions<HtmlSanitizerOptions> options)
+    {
+        foreach (var action in options.Value.Configure)
         {
-            foreach (var action in options.Value.Configure)
-            {
-                action?.Invoke(_sanitizer);
-            }
+            action?.Invoke(_sanitizer);
         }
-
-        public string Sanitize(string html) => _sanitizer.Sanitize(html);
     }
+
+    public string Sanitize(string html) => _sanitizer.Sanitize(html);
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Html/OrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Infrastructure/Html/OrchardCoreBuilderExtensions.cs
index 35ef302e2c5..3ef8e4cf206 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Html/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Html/OrchardCoreBuilderExtensions.cs
@@ -1,29 +1,28 @@
 using OrchardCore.Infrastructure.Html;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static partial class OrchardCoreBuilderExtensions
 {
-    public static partial class OrchardCoreBuilderExtensions
+    /// <summary>
+    /// Adds html script sanitization services.
+    /// </summary>
+    /// <param name="builder">The <see cref="OrchardCoreBuilder"/>.</param>
+    public static OrchardCoreBuilder AddHtmlSanitizer(this OrchardCoreBuilder builder)
     {
-        /// <summary>
-        /// Adds html script sanitization services.
-        /// </summary>
-        /// <param name="builder">The <see cref="OrchardCoreBuilder"/>.</param>
-        public static OrchardCoreBuilder AddHtmlSanitizer(this OrchardCoreBuilder builder)
+        builder.ConfigureServices(services =>
         {
-            builder.ConfigureServices(services =>
-            {
-                services.AddOptions<HtmlSanitizerOptions>();
-
-                services.ConfigureHtmlSanitizer((sanitizer) =>
-                {
-                    sanitizer.AllowedAttributes.Add("class");
-                    sanitizer.AllowedTags.Remove("form");
-                });
+            services.AddOptions<HtmlSanitizerOptions>();
 
-                services.AddSingleton<IHtmlSanitizerService, HtmlSanitizerService>();
+            services.ConfigureHtmlSanitizer((sanitizer) =>
+            {
+                sanitizer.AllowedAttributes.Add("class");
+                sanitizer.AllowedTags.Remove("form");
             });
 
-            return builder;
-        }
+            services.AddSingleton<IHtmlSanitizerService, HtmlSanitizerService>();
+        });
+
+        return builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Scripting/CommonGeneratorMethods.cs b/src/OrchardCore/OrchardCore.Infrastructure/Scripting/CommonGeneratorMethods.cs
index fcdc082b6f6..0e8712ed8bb 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Scripting/CommonGeneratorMethods.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Scripting/CommonGeneratorMethods.cs
@@ -5,53 +5,52 @@
 using System.Net;
 using System.Text;
 
-namespace OrchardCore.Scripting
+namespace OrchardCore.Scripting;
+
+public class CommonGeneratorMethods : IGlobalMethodProvider
 {
-    public class CommonGeneratorMethods : IGlobalMethodProvider
+    private static readonly GlobalMethod _base64 = new()
     {
-        private static readonly GlobalMethod _base64 = new()
+        Name = "base64",
+        Method = serviceProvider => (Func<string, string>)(encoded =>
         {
-            Name = "base64",
-            Method = serviceProvider => (Func<string, string>)(encoded =>
-            {
-                return Encoding.UTF8.GetString(Convert.FromBase64String(encoded));
-            }),
-        };
+            return Encoding.UTF8.GetString(Convert.FromBase64String(encoded));
+        }),
+    };
 
-        private static readonly GlobalMethod _html = new()
+    private static readonly GlobalMethod _html = new()
+    {
+        Name = "html",
+        Method = serviceProvider => (Func<string, string>)(encoded =>
         {
-            Name = "html",
-            Method = serviceProvider => (Func<string, string>)(encoded =>
-            {
-                return WebUtility.HtmlDecode(encoded);
-            }),
-        };
-
-        /// <summary>
-        /// Converts a Base64 encoded gzip stream to an uncompressed Base64 string.
-        /// See http://www.txtwizard.net/compression.
-        /// </summary>
-        private static readonly GlobalMethod _gZip = new()
+            return WebUtility.HtmlDecode(encoded);
+        }),
+    };
+
+    /// <summary>
+    /// Converts a Base64 encoded gzip stream to an uncompressed Base64 string.
+    /// See http://www.txtwizard.net/compression.
+    /// </summary>
+    private static readonly GlobalMethod _gZip = new()
+    {
+        Name = "gzip",
+        Method = serviceProvider => (Func<string, string>)(encoded =>
         {
-            Name = "gzip",
-            Method = serviceProvider => (Func<string, string>)(encoded =>
-            {
-                var bytes = Convert.FromBase64String(encoded);
-                using var gzip = new GZipStream(new MemoryStream(bytes), CompressionMode.Decompress);
+            var bytes = Convert.FromBase64String(encoded);
+            using var gzip = new GZipStream(new MemoryStream(bytes), CompressionMode.Decompress);
 
-                var decompressed = new MemoryStream();
-                var buffer = new byte[1024];
-                int nRead;
+            var decompressed = new MemoryStream();
+            var buffer = new byte[1024];
+            int nRead;
 
-                while ((nRead = gzip.Read(buffer, 0, buffer.Length)) > 0)
-                {
-                    decompressed.Write(buffer, 0, nRead);
-                }
+            while ((nRead = gzip.Read(buffer, 0, buffer.Length)) > 0)
+            {
+                decompressed.Write(buffer, 0, nRead);
+            }
 
-                return Convert.ToBase64String(decompressed.ToArray());
-            }),
-        };
+            return Convert.ToBase64String(decompressed.ToArray());
+        }),
+    };
 
-        public IEnumerable<GlobalMethod> GetMethods() => new[] { _base64, _html, _gZip };
-    }
+    public IEnumerable<GlobalMethod> GetMethods() => new[] { _base64, _html, _gZip };
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Scripting/DefaultScriptingManager.cs b/src/OrchardCore/OrchardCore.Infrastructure/Scripting/DefaultScriptingManager.cs
index 52f72476ff3..6419a559cc4 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Scripting/DefaultScriptingManager.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Scripting/DefaultScriptingManager.cs
@@ -3,50 +3,49 @@
 using Microsoft.Extensions.FileProviders;
 using OrchardCore.Environment.Shell.Scope;
 
-namespace OrchardCore.Scripting
+namespace OrchardCore.Scripting;
+
+public class DefaultScriptingManager : IScriptingManager
 {
-    public class DefaultScriptingManager : IScriptingManager
+    private readonly IEnumerable<IScriptingEngine> _engines;
+
+    public DefaultScriptingManager(
+        IEnumerable<IScriptingEngine> engines,
+        IEnumerable<IGlobalMethodProvider> globalMethodProviders)
     {
-        private readonly IEnumerable<IScriptingEngine> _engines;
+        _engines = engines;
+        GlobalMethodProviders = new List<IGlobalMethodProvider>(globalMethodProviders).AsReadOnly();
+    }
 
-        public DefaultScriptingManager(
-            IEnumerable<IScriptingEngine> engines,
-            IEnumerable<IGlobalMethodProvider> globalMethodProviders)
+    public IReadOnlyList<IGlobalMethodProvider> GlobalMethodProviders { get; }
+
+    public object Evaluate(string directive,
+        IFileProvider fileProvider,
+        string basePath,
+        IEnumerable<IGlobalMethodProvider> scopedMethodProviders)
+    {
+        var directiveIndex = directive.IndexOf(':');
+        if (directiveIndex == -1 || directiveIndex >= directive.Length - 2)
         {
-            _engines = engines;
-            GlobalMethodProviders = new List<IGlobalMethodProvider>(globalMethodProviders).AsReadOnly();
+            return directive;
         }
 
-        public IReadOnlyList<IGlobalMethodProvider> GlobalMethodProviders { get; }
+        var prefix = directive[..directiveIndex];
+        var script = directive[(directiveIndex + 1)..];
 
-        public object Evaluate(string directive,
-            IFileProvider fileProvider,
-            string basePath,
-            IEnumerable<IGlobalMethodProvider> scopedMethodProviders)
+        var engine = GetScriptingEngine(prefix);
+        if (engine == null)
         {
-            var directiveIndex = directive.IndexOf(':');
-            if (directiveIndex == -1 || directiveIndex >= directive.Length - 2)
-            {
-                return directive;
-            }
-
-            var prefix = directive[..directiveIndex];
-            var script = directive[(directiveIndex + 1)..];
-
-            var engine = GetScriptingEngine(prefix);
-            if (engine == null)
-            {
-                return directive;
-            }
-
-            var methodProviders = scopedMethodProviders != null ? GlobalMethodProviders.Concat(scopedMethodProviders) : GlobalMethodProviders;
-            var scope = engine.CreateScope(methodProviders.SelectMany(x => x.GetMethods()), ShellScope.Services, fileProvider, basePath);
-            return engine.Evaluate(scope, script);
+            return directive;
         }
 
-        public IScriptingEngine GetScriptingEngine(string prefix)
-        {
-            return _engines.FirstOrDefault(x => x.Prefix == prefix);
-        }
+        var methodProviders = scopedMethodProviders != null ? GlobalMethodProviders.Concat(scopedMethodProviders) : GlobalMethodProviders;
+        var scope = engine.CreateScope(methodProviders.SelectMany(x => x.GetMethods()), ShellScope.Services, fileProvider, basePath);
+        return engine.Evaluate(scope, script);
+    }
+
+    public IScriptingEngine GetScriptingEngine(string prefix)
+    {
+        return _engines.FirstOrDefault(x => x.Prefix == prefix);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Scripting/Files/FilesScriptEngine.cs b/src/OrchardCore/OrchardCore.Infrastructure/Scripting/Files/FilesScriptEngine.cs
index 8550501873c..2b530cd5903 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Scripting/Files/FilesScriptEngine.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Scripting/Files/FilesScriptEngine.cs
@@ -3,60 +3,59 @@
 using System.IO;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.Scripting.Files
+namespace OrchardCore.Scripting.Files;
+
+/// <summary>
+/// Provides.
+/// </summary>
+public class FilesScriptEngine : IScriptingEngine
 {
-    /// <summary>
-    /// Provides.
-    /// </summary>
-    public class FilesScriptEngine : IScriptingEngine
+    public string Prefix => "file";
+
+    public IScriptingScope CreateScope(IEnumerable<GlobalMethod> methods, IServiceProvider serviceProvider, IFileProvider fileProvider, string basePath)
+    {
+        return new FilesScriptScope(fileProvider, basePath);
+    }
+
+    public object Evaluate(IScriptingScope scope, string script)
     {
-        public string Prefix => "file";
+        ArgumentNullException.ThrowIfNull(scope);
 
-        public IScriptingScope CreateScope(IEnumerable<GlobalMethod> methods, IServiceProvider serviceProvider, IFileProvider fileProvider, string basePath)
+        if (scope is not FilesScriptScope fileScope)
         {
-            return new FilesScriptScope(fileProvider, basePath);
+            throw new ArgumentException($"Expected a scope of type {nameof(FilesScriptScope)}", nameof(scope));
         }
 
-        public object Evaluate(IScriptingScope scope, string script)
+        if (script.StartsWith("text('", StringComparison.Ordinal) && script.EndsWith("')", StringComparison.Ordinal))
         {
-            ArgumentNullException.ThrowIfNull(scope);
-
-            if (scope is not FilesScriptScope fileScope)
+            var filePath = script[6..^2];
+            var fileInfo = fileScope.FileProvider.GetRelativeFileInfo(fileScope.BasePath, filePath);
+            if (!fileInfo.Exists)
             {
-                throw new ArgumentException($"Expected a scope of type {nameof(FilesScriptScope)}", nameof(scope));
+                throw new FileNotFoundException(filePath);
             }
 
-            if (script.StartsWith("text('", StringComparison.Ordinal) && script.EndsWith("')", StringComparison.Ordinal))
-            {
-                var filePath = script[6..^2];
-                var fileInfo = fileScope.FileProvider.GetRelativeFileInfo(fileScope.BasePath, filePath);
-                if (!fileInfo.Exists)
-                {
-                    throw new FileNotFoundException(filePath);
-                }
-
-                using var fileStream = fileInfo.CreateReadStream();
-                using var streamReader = new StreamReader(fileStream);
-                return streamReader.ReadToEnd();
-            }
-            else if (script.StartsWith("base64('", StringComparison.Ordinal) && script.EndsWith("')", StringComparison.Ordinal))
-            {
-                var filePath = script[8..^2];
-                var fileInfo = fileScope.FileProvider.GetRelativeFileInfo(fileScope.BasePath, filePath);
-                if (!fileInfo.Exists)
-                {
-                    throw new FileNotFoundException(filePath);
-                }
-
-                using var fileStream = fileInfo.CreateReadStream();
-                using var ms = new MemoryStream();
-                fileStream.CopyTo(ms);
-                return Convert.ToBase64String(ms.ToArray());
-            }
-            else
+            using var fileStream = fileInfo.CreateReadStream();
+            using var streamReader = new StreamReader(fileStream);
+            return streamReader.ReadToEnd();
+        }
+        else if (script.StartsWith("base64('", StringComparison.Ordinal) && script.EndsWith("')", StringComparison.Ordinal))
+        {
+            var filePath = script[8..^2];
+            var fileInfo = fileScope.FileProvider.GetRelativeFileInfo(fileScope.BasePath, filePath);
+            if (!fileInfo.Exists)
             {
-                throw new ArgumentException($"Unknown command '{script}'");
+                throw new FileNotFoundException(filePath);
             }
+
+            using var fileStream = fileInfo.CreateReadStream();
+            using var ms = new MemoryStream();
+            fileStream.CopyTo(ms);
+            return Convert.ToBase64String(ms.ToArray());
+        }
+        else
+        {
+            throw new ArgumentException($"Unknown command '{script}'");
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Scripting/Files/FilesScriptScope.cs b/src/OrchardCore/OrchardCore.Infrastructure/Scripting/Files/FilesScriptScope.cs
index 20afb53e6b4..7bc420bc514 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Scripting/Files/FilesScriptScope.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Scripting/Files/FilesScriptScope.cs
@@ -1,16 +1,15 @@
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.Scripting.Files
+namespace OrchardCore.Scripting.Files;
+
+public class FilesScriptScope : IScriptingScope
 {
-    public class FilesScriptScope : IScriptingScope
+    public FilesScriptScope(IFileProvider fileProvider, string basePath)
     {
-        public FilesScriptScope(IFileProvider fileProvider, string basePath)
-        {
-            FileProvider = fileProvider;
-            BasePath = basePath;
-        }
-
-        public IFileProvider FileProvider { get; }
-        public string BasePath { get; }
+        FileProvider = fileProvider;
+        BasePath = basePath;
     }
+
+    public IFileProvider FileProvider { get; }
+    public string BasePath { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Scripting/OrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Infrastructure/Scripting/OrchardCoreBuilderExtensions.cs
index 56b40926c1e..6b21826b04b 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Scripting/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Scripting/OrchardCoreBuilderExtensions.cs
@@ -1,28 +1,27 @@
 using OrchardCore.Scripting;
 using OrchardCore.Scripting.Files;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+/// <summary>
+/// Provides an extension method for <see cref="OrchardCoreBuilder"/>.
+/// </summary>
+public static partial class OrchardCoreBuilderExtensions
 {
     /// <summary>
-    /// Provides an extension method for <see cref="OrchardCoreBuilder"/>.
+    /// Adds scripting services.
     /// </summary>
-    public static partial class OrchardCoreBuilderExtensions
+    /// <param name="builder">The <see cref="OrchardCoreBuilder"/>.</param>
+    public static OrchardCoreBuilder AddScripting(this OrchardCoreBuilder builder)
     {
-        /// <summary>
-        /// Adds scripting services.
-        /// </summary>
-        /// <param name="builder">The <see cref="OrchardCoreBuilder"/>.</param>
-        public static OrchardCoreBuilder AddScripting(this OrchardCoreBuilder builder)
-        {
-            builder.ApplicationServices.AddSingleton<IGlobalMethodProvider, CommonGeneratorMethods>();
-            builder.ApplicationServices.AddSingleton<IScriptingEngine, FilesScriptEngine>();
+        builder.ApplicationServices.AddSingleton<IGlobalMethodProvider, CommonGeneratorMethods>();
+        builder.ApplicationServices.AddSingleton<IScriptingEngine, FilesScriptEngine>();
 
-            builder.ConfigureServices(services =>
-            {
-                services.AddSingleton<IScriptingManager, DefaultScriptingManager>();
-            });
+        builder.ConfigureServices(services =>
+        {
+            services.AddSingleton<IScriptingManager, DefaultScriptingManager>();
+        });
 
-            return builder;
-        }
+        return builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Scripting/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Infrastructure/Scripting/ServiceCollectionExtensions.cs
index d8b3499a116..d041ac34697 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Scripting/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Scripting/ServiceCollectionExtensions.cs
@@ -1,17 +1,16 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Scripting.Files;
 
-namespace OrchardCore.Scripting
+namespace OrchardCore.Scripting;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    public static IServiceCollection AddScripting(this IServiceCollection services)
     {
-        public static IServiceCollection AddScripting(this IServiceCollection services)
-        {
-            services.AddSingleton<IScriptingManager, DefaultScriptingManager>();
-            services.AddSingleton<IGlobalMethodProvider, CommonGeneratorMethods>();
+        services.AddSingleton<IScriptingManager, DefaultScriptingManager>();
+        services.AddSingleton<IGlobalMethodProvider, CommonGeneratorMethods>();
 
-            services.AddSingleton<IScriptingEngine, FilesScriptEngine>();
-            return services;
-        }
+        services.AddSingleton<IScriptingEngine, FilesScriptEngine>();
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Security/ApiAuthenticationHandler.cs b/src/OrchardCore/OrchardCore.Infrastructure/Security/ApiAuthenticationHandler.cs
index e0ea44c392e..4e4a592cedd 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Security/ApiAuthenticationHandler.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Security/ApiAuthenticationHandler.cs
@@ -5,68 +5,67 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Security
+namespace OrchardCore.Security;
+
+/// <summary>
+/// Provides a delegating logic for API authentication.
+/// If no specific scheme handler is found it returns an anonymous user.
+/// </summary>
+public class ApiAuthenticationHandler : AuthenticationHandler<ApiAuthorizationOptions>
 {
-    /// <summary>
-    /// Provides a delegating logic for API authentication.
-    /// If no specific scheme handler is found it returns an anonymous user.
-    /// </summary>
-    public class ApiAuthenticationHandler : AuthenticationHandler<ApiAuthorizationOptions>
+    private readonly IOptions<AuthenticationOptions> _authenticationOptions;
+
+    public ApiAuthenticationHandler(
+        IOptions<AuthenticationOptions> authenticationOptions,
+        IOptionsMonitor<ApiAuthorizationOptions> options,
+        ILoggerFactory logger,
+        UrlEncoder encoder)
+        : base(options, logger, encoder)
     {
-        private readonly IOptions<AuthenticationOptions> _authenticationOptions;
+        _authenticationOptions = authenticationOptions;
+    }
 
-        public ApiAuthenticationHandler(
-            IOptions<AuthenticationOptions> authenticationOptions,
-            IOptionsMonitor<ApiAuthorizationOptions> options,
-            ILoggerFactory logger,
-            UrlEncoder encoder)
-            : base(options, logger, encoder)
+    protected override Task<AuthenticateResult> HandleAuthenticateAsync()
+    {
+        if (!_authenticationOptions.Value.SchemeMap.ContainsKey(Options.ApiAuthenticationScheme))
         {
-            _authenticationOptions = authenticationOptions;
+            return Task.FromResult<AuthenticateResult>(AuthenticateResult.NoResult());
         }
 
-        protected override Task<AuthenticateResult> HandleAuthenticateAsync()
-        {
-            if (!_authenticationOptions.Value.SchemeMap.ContainsKey(Options.ApiAuthenticationScheme))
-            {
-                return Task.FromResult<AuthenticateResult>(AuthenticateResult.NoResult());
-            }
+        return Context.AuthenticateAsync(Options.ApiAuthenticationScheme);
+    }
 
-            return Context.AuthenticateAsync(Options.ApiAuthenticationScheme);
+    protected override Task HandleChallengeAsync(AuthenticationProperties properties)
+    {
+        if (!_authenticationOptions.Value.SchemeMap.ContainsKey(Options.ApiAuthenticationScheme))
+        {
+            Response.StatusCode = (int)System.Net.HttpStatusCode.Unauthorized;
+            return Task.CompletedTask;
         }
 
-        protected override Task HandleChallengeAsync(AuthenticationProperties properties)
+        var statusCodePagesFeature = Context.Features.Get<IStatusCodePagesFeature>();
+        if (statusCodePagesFeature != null)
         {
-            if (!_authenticationOptions.Value.SchemeMap.ContainsKey(Options.ApiAuthenticationScheme))
-            {
-                Response.StatusCode = (int)System.Net.HttpStatusCode.Unauthorized;
-                return Task.CompletedTask;
-            }
+            statusCodePagesFeature.Enabled = false;
+        }
 
-            var statusCodePagesFeature = Context.Features.Get<IStatusCodePagesFeature>();
-            if (statusCodePagesFeature != null)
-            {
-                statusCodePagesFeature.Enabled = false;
-            }
+        return Context.ChallengeAsync(Options.ApiAuthenticationScheme);
+    }
 
-            return Context.ChallengeAsync(Options.ApiAuthenticationScheme);
+    protected override Task HandleForbiddenAsync(AuthenticationProperties properties)
+    {
+        if (!_authenticationOptions.Value.SchemeMap.ContainsKey(Options.ApiAuthenticationScheme))
+        {
+            Response.StatusCode = (int)System.Net.HttpStatusCode.Forbidden;
+            return Task.CompletedTask;
         }
 
-        protected override Task HandleForbiddenAsync(AuthenticationProperties properties)
+        var statusCodePagesFeature = Context.Features.Get<IStatusCodePagesFeature>();
+        if (statusCodePagesFeature != null)
         {
-            if (!_authenticationOptions.Value.SchemeMap.ContainsKey(Options.ApiAuthenticationScheme))
-            {
-                Response.StatusCode = (int)System.Net.HttpStatusCode.Forbidden;
-                return Task.CompletedTask;
-            }
-
-            var statusCodePagesFeature = Context.Features.Get<IStatusCodePagesFeature>();
-            if (statusCodePagesFeature != null)
-            {
-                statusCodePagesFeature.Enabled = false;
-            }
-
-            return Context.ForbidAsync(Options.ApiAuthenticationScheme);
+            statusCodePagesFeature.Enabled = false;
         }
+
+        return Context.ForbidAsync(Options.ApiAuthenticationScheme);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Security/AuthorizationHandlers/PermissionHandler.cs b/src/OrchardCore/OrchardCore.Infrastructure/Security/AuthorizationHandlers/PermissionHandler.cs
index 6d38022e96e..50ebf3d75e4 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Security/AuthorizationHandlers/PermissionHandler.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Security/AuthorizationHandlers/PermissionHandler.cs
@@ -1,32 +1,31 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 
-namespace OrchardCore.Security.AuthorizationHandlers
+namespace OrchardCore.Security.AuthorizationHandlers;
+
+/// <summary>
+/// This authorization handler ensures that the user has the required permission.
+/// </summary>
+public class PermissionHandler : AuthorizationHandler<PermissionRequirement>
 {
-    /// <summary>
-    /// This authorization handler ensures that the user has the required permission.
-    /// </summary>
-    public class PermissionHandler : AuthorizationHandler<PermissionRequirement>
+    private readonly IPermissionGrantingService _permissionGrantingService;
+
+    public PermissionHandler(IPermissionGrantingService permissionGrantingService)
     {
-        private readonly IPermissionGrantingService _permissionGrantingService;
+        _permissionGrantingService = permissionGrantingService;
+    }
 
-        public PermissionHandler(IPermissionGrantingService permissionGrantingService)
+    protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement)
+    {
+        if (context.HasSucceeded || !(context?.User?.Identity?.IsAuthenticated ?? false))
         {
-            _permissionGrantingService = permissionGrantingService;
+            return Task.CompletedTask;
         }
-
-        protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement)
+        else if (_permissionGrantingService.IsGranted(requirement, context.User.Claims))
         {
-            if (context.HasSucceeded || !(context?.User?.Identity?.IsAuthenticated ?? false))
-            {
-                return Task.CompletedTask;
-            }
-            else if (_permissionGrantingService.IsGranted(requirement, context.User.Claims))
-            {
-                context.Succeed(requirement);
-            }
-
-            return Task.CompletedTask;
+            context.Succeed(requirement);
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Security/DefaultPermissionGrantingService.cs b/src/OrchardCore/OrchardCore.Infrastructure/Security/DefaultPermissionGrantingService.cs
index 71073926ef6..4ef7f32c5e4 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Security/DefaultPermissionGrantingService.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Security/DefaultPermissionGrantingService.cs
@@ -4,51 +4,50 @@
 using System.Security.Claims;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Security
+namespace OrchardCore.Security;
+
+/// <summary>
+/// Default implementation if <see cref="IPermissionGrantingService"/>.
+/// It is responsible for checking implied permissions.
+/// </summary>
+public class DefaultPermissionGrantingService : IPermissionGrantingService
 {
-    /// <summary>
-    /// Default implementation if <see cref="IPermissionGrantingService"/>.
-    /// It is responsible for checking implied permissions.
-    /// </summary>
-    public class DefaultPermissionGrantingService : IPermissionGrantingService
+    public bool IsGranted(PermissionRequirement requirement, IEnumerable<Claim> claims)
     {
-        public bool IsGranted(PermissionRequirement requirement, IEnumerable<Claim> claims)
+        if (claims == null || !claims.Any())
         {
-            if (claims == null || !claims.Any())
-            {
-                return false;
-            }
+            return false;
+        }
 
-            var grantingNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        var grantingNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
-            GetGrantingNamesInternal(requirement.Permission, grantingNames);
+        GetGrantingNamesInternal(requirement.Permission, grantingNames);
 
-            // SiteOwner permission grants them all
-            grantingNames.Add(StandardPermissions.SiteOwner.Name);
+        // SiteOwner permission grants them all
+        grantingNames.Add(StandardPermissions.SiteOwner.Name);
 
-            return claims.Any(claim => string.Equals(claim.Type, Permission.ClaimType, StringComparison.OrdinalIgnoreCase)
-                && grantingNames.Contains(claim.Value));
-        }
+        return claims.Any(claim => string.Equals(claim.Type, Permission.ClaimType, StringComparison.OrdinalIgnoreCase)
+            && grantingNames.Contains(claim.Value));
+    }
 
-        private static void GetGrantingNamesInternal(Permission permission, HashSet<string> stack)
-        {
-            // The given name is tested
-            stack.Add(permission.Name);
+    private static void GetGrantingNamesInternal(Permission permission, HashSet<string> stack)
+    {
+        // The given name is tested
+        stack.Add(permission.Name);
 
-            // Iterate implied permissions to grant, it present
-            if (permission.ImpliedBy != null && permission.ImpliedBy.Any())
+        // Iterate implied permissions to grant, it present
+        if (permission.ImpliedBy != null && permission.ImpliedBy.Any())
+        {
+            foreach (var impliedBy in permission.ImpliedBy)
             {
-                foreach (var impliedBy in permission.ImpliedBy)
+                // Avoid potential recursion
+                if (impliedBy == null || stack.Contains(impliedBy.Name))
                 {
-                    // Avoid potential recursion
-                    if (impliedBy == null || stack.Contains(impliedBy.Name))
-                    {
-                        continue;
-                    }
-
-                    // Otherwise accumulate the implied permission names recursively
-                    GetGrantingNamesInternal(impliedBy, stack);
+                    continue;
                 }
+
+                // Otherwise accumulate the implied permission names recursively
+                GetGrantingNamesInternal(impliedBy, stack);
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Security/OrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Infrastructure/Security/OrchardCoreBuilderExtensions.cs
index 34ff82bb070..199e9daac4a 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Security/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Security/OrchardCoreBuilderExtensions.cs
@@ -4,32 +4,31 @@
 using OrchardCore.Security;
 using OrchardCore.Security.AuthorizationHandlers;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static partial class OrchardCoreBuilderExtensions
 {
-    public static partial class OrchardCoreBuilderExtensions
+    /// <summary>
+    /// Adds tenant level services.
+    /// </summary>
+    public static OrchardCoreBuilder AddSecurity(this OrchardCoreBuilder builder)
     {
-        /// <summary>
-        /// Adds tenant level services.
-        /// </summary>
-        public static OrchardCoreBuilder AddSecurity(this OrchardCoreBuilder builder)
+        builder.ConfigureServices(services =>
         {
-            builder.ConfigureServices(services =>
-            {
-                services.AddAuthorization();
+            services.AddAuthorization();
 
-                services.Configure<AuthenticationOptions>((options) =>
+            services.Configure<AuthenticationOptions>((options) =>
+            {
+                if (!options.Schemes.Any(x => x.Name == "Api"))
                 {
-                    if (!options.Schemes.Any(x => x.Name == "Api"))
-                    {
-                        options.AddScheme<ApiAuthenticationHandler>("Api", null);
-                    }
-                });
-
-                services.AddScoped<IPermissionGrantingService, DefaultPermissionGrantingService>();
-                services.AddScoped<IAuthorizationHandler, PermissionHandler>();
+                    options.AddScheme<ApiAuthenticationHandler>("Api", null);
+                }
             });
 
-            return builder;
-        }
+            services.AddScoped<IPermissionGrantingService, DefaultPermissionGrantingService>();
+            services.AddScoped<IAuthorizationHandler, PermissionHandler>();
+        });
+
+        return builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellDescriptorManager.cs b/src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellDescriptorManager.cs
index d9fd9c07cd0..6aedd5168a4 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellDescriptorManager.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellDescriptorManager.cs
@@ -12,137 +12,136 @@
 using OrchardCore.Environment.Shell.Descriptor.Models;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Environment.Shell.Data.Descriptors
+namespace OrchardCore.Environment.Shell.Data.Descriptors;
+
+/// <summary>
+/// Implements <see cref="IShellDescriptorManager"/> by providing the list of features store in the database.
+/// </summary>
+public class ShellDescriptorManager : IShellDescriptorManager
 {
-    /// <summary>
-    /// Implements <see cref="IShellDescriptorManager"/> by providing the list of features store in the database.
-    /// </summary>
-    public class ShellDescriptorManager : IShellDescriptorManager
+    private readonly ShellSettings _shellSettings;
+    private readonly IShellConfiguration _shellConfiguration;
+    private readonly IEnumerable<ShellFeature> _alwaysEnabledFeatures;
+    private readonly IEnumerable<IShellDescriptorManagerEventHandler> _shellDescriptorManagerEventHandlers;
+    private readonly IExtensionManager _extensionManager;
+    private readonly IDocumentStore _documentStore;
+    private readonly ILogger _logger;
+
+    private ShellDescriptor _shellDescriptor;
+
+    public ShellDescriptorManager(
+        ShellSettings shellSettings,
+        IShellConfiguration shellConfiguration,
+        IEnumerable<ShellFeature> shellFeatures,
+        IEnumerable<IShellDescriptorManagerEventHandler> shellDescriptorManagerEventHandlers,
+        IExtensionManager extensionManager,
+        IDocumentStore documentStore,
+        ILogger<ShellDescriptorManager> logger)
     {
-        private readonly ShellSettings _shellSettings;
-        private readonly IShellConfiguration _shellConfiguration;
-        private readonly IEnumerable<ShellFeature> _alwaysEnabledFeatures;
-        private readonly IEnumerable<IShellDescriptorManagerEventHandler> _shellDescriptorManagerEventHandlers;
-        private readonly IExtensionManager _extensionManager;
-        private readonly IDocumentStore _documentStore;
-        private readonly ILogger _logger;
-
-        private ShellDescriptor _shellDescriptor;
-
-        public ShellDescriptorManager(
-            ShellSettings shellSettings,
-            IShellConfiguration shellConfiguration,
-            IEnumerable<ShellFeature> shellFeatures,
-            IEnumerable<IShellDescriptorManagerEventHandler> shellDescriptorManagerEventHandlers,
-            IExtensionManager extensionManager,
-            IDocumentStore documentStore,
-            ILogger<ShellDescriptorManager> logger)
+        _shellSettings = shellSettings;
+        _shellConfiguration = shellConfiguration;
+        _alwaysEnabledFeatures = shellFeatures.Where(f => f.AlwaysEnabled).ToArray();
+        _shellDescriptorManagerEventHandlers = shellDescriptorManagerEventHandlers;
+        _extensionManager = extensionManager;
+        _documentStore = documentStore;
+        _logger = logger;
+    }
+
+    public async Task<ShellDescriptor> GetShellDescriptorAsync()
+    {
+        if (_shellDescriptor != null)
         {
-            _shellSettings = shellSettings;
-            _shellConfiguration = shellConfiguration;
-            _alwaysEnabledFeatures = shellFeatures.Where(f => f.AlwaysEnabled).ToArray();
-            _shellDescriptorManagerEventHandlers = shellDescriptorManagerEventHandlers;
-            _extensionManager = extensionManager;
-            _documentStore = documentStore;
-            _logger = logger;
+            return _shellDescriptor;
         }
 
-        public async Task<ShellDescriptor> GetShellDescriptorAsync()
-        {
-            if (_shellDescriptor != null)
-            {
-                return _shellDescriptor;
-            }
+        (var cacheable, var shellDescriptor) = await _documentStore.GetOrCreateImmutableAsync<ShellDescriptor>();
 
-            (var cacheable, var shellDescriptor) = await _documentStore.GetOrCreateImmutableAsync<ShellDescriptor>();
+        if (shellDescriptor.SerialNumber == 0)
+        {
+            return null;
+        }
 
-            if (shellDescriptor.SerialNumber == 0)
+        if (!cacheable)
+        {
+            // Clone ShellDescriptor
+            shellDescriptor = new ShellDescriptor
             {
-                return null;
-            }
+                SerialNumber = shellDescriptor.SerialNumber,
+                Installed = new List<InstalledShellFeature>(shellDescriptor.Installed),
+            };
+        }
 
-            if (!cacheable)
-            {
-                // Clone ShellDescriptor
-                shellDescriptor = new ShellDescriptor
-                {
-                    SerialNumber = shellDescriptor.SerialNumber,
-                    Installed = new List<InstalledShellFeature>(shellDescriptor.Installed),
-                };
-            }
+        // Init shell descriptor and load features
+        var configuredFeatures = new ConfiguredFeatures();
+        _shellConfiguration.Bind(configuredFeatures);
 
-            // Init shell descriptor and load features
-            var configuredFeatures = new ConfiguredFeatures();
-            _shellConfiguration.Bind(configuredFeatures);
+        var features = _alwaysEnabledFeatures
+            .Concat(configuredFeatures.Features.Select(id => new ShellFeature(id) { AlwaysEnabled = true }))
+            .Concat(shellDescriptor.Features)
+            .Distinct();
 
-            var features = _alwaysEnabledFeatures
-                .Concat(configuredFeatures.Features.Select(id => new ShellFeature(id) { AlwaysEnabled = true }))
-                .Concat(shellDescriptor.Features)
-                .Distinct();
+        var featureIds = features.Select(sf => sf.Id).ToArray();
 
-            var featureIds = features.Select(sf => sf.Id).ToArray();
+        var missingDependencies = (await _extensionManager.LoadFeaturesAsync(featureIds))
+            .Select(entry => entry.Id)
+            .Except(featureIds)
+            .Select(id => new ShellFeature(id));
 
-            var missingDependencies = (await _extensionManager.LoadFeaturesAsync(featureIds))
-                .Select(entry => entry.Id)
-                .Except(featureIds)
-                .Select(id => new ShellFeature(id));
+        shellDescriptor.Features = features
+            .Concat(missingDependencies)
+            .ToList();
 
-            shellDescriptor.Features = features
-                .Concat(missingDependencies)
-                .ToList();
+        return _shellDescriptor = shellDescriptor;
+    }
 
-            return _shellDescriptor = shellDescriptor;
-        }
+    public async Task UpdateShellDescriptorAsync(int priorSerialNumber, IEnumerable<ShellFeature> enabledFeatures)
+    {
+        var shellDescriptor = await _documentStore.GetOrCreateMutableAsync<ShellDescriptor>();
 
-        public async Task UpdateShellDescriptorAsync(int priorSerialNumber, IEnumerable<ShellFeature> enabledFeatures)
+        if (priorSerialNumber != shellDescriptor.SerialNumber)
         {
-            var shellDescriptor = await _documentStore.GetOrCreateMutableAsync<ShellDescriptor>();
-
-            if (priorSerialNumber != shellDescriptor.SerialNumber)
-            {
-                throw new InvalidOperationException("Invalid serial number for shell descriptor");
-            }
+            throw new InvalidOperationException("Invalid serial number for shell descriptor");
+        }
 
-            if (_logger.IsEnabled(LogLevel.Information))
-            {
-                _logger.LogInformation("Updating shell descriptor for tenant '{TenantName}' ...", _shellSettings.Name);
-            }
+        if (_logger.IsEnabled(LogLevel.Information))
+        {
+            _logger.LogInformation("Updating shell descriptor for tenant '{TenantName}' ...", _shellSettings.Name);
+        }
 
-            shellDescriptor.SerialNumber++;
+        shellDescriptor.SerialNumber++;
 
-            shellDescriptor.Features = _alwaysEnabledFeatures.Union(enabledFeatures).ToList();
-            foreach (var feature in shellDescriptor.Features)
+        shellDescriptor.Features = _alwaysEnabledFeatures.Union(enabledFeatures).ToList();
+        foreach (var feature in shellDescriptor.Features)
+        {
+            if (shellDescriptor.Installed.Contains(feature))
             {
-                if (shellDescriptor.Installed.Contains(feature))
-                {
-                    continue;
-                }
-
-                var installed = new InstalledShellFeature(feature)
-                {
-                    SerialNumber = shellDescriptor.SerialNumber
-                };
-
-                shellDescriptor.Installed.Add(installed);
+                continue;
             }
 
-            if (_logger.IsEnabled(LogLevel.Information))
+            var installed = new InstalledShellFeature(feature)
             {
-                _logger.LogInformation("Shell descriptor updated for tenant '{TenantName}'.", _shellSettings.Name);
-            }
+                SerialNumber = shellDescriptor.SerialNumber
+            };
 
-            await _documentStore.UpdateAsync(shellDescriptor, _ => Task.CompletedTask);
-            await _documentStore.CommitAsync();
-
-            // In the 'ChangedAsync()' event the shell will be released so that, on request, a new one will be built.
-            // So, we commit the session earlier to prevent a new shell from being built from an outdated descriptor.
-            await _shellDescriptorManagerEventHandlers.InvokeAsync((handler, shellDescriptor, _shellSettings) =>
-                handler.ChangedAsync(shellDescriptor, _shellSettings), shellDescriptor, _shellSettings, _logger);
+            shellDescriptor.Installed.Add(installed);
         }
 
-        private sealed class ConfiguredFeatures
+        if (_logger.IsEnabled(LogLevel.Information))
         {
-            public string[] Features { get; set; } = [];
+            _logger.LogInformation("Shell descriptor updated for tenant '{TenantName}'.", _shellSettings.Name);
         }
+
+        await _documentStore.UpdateAsync(shellDescriptor, _ => Task.CompletedTask);
+        await _documentStore.CommitAsync();
+
+        // In the 'ChangedAsync()' event the shell will be released so that, on request, a new one will be built.
+        // So, we commit the session earlier to prevent a new shell from being built from an outdated descriptor.
+        await _shellDescriptorManagerEventHandlers.InvokeAsync((handler, shellDescriptor, _shellSettings) =>
+            handler.ChangedAsync(shellDescriptor, _shellSettings), shellDescriptor, _shellSettings, _logger);
+    }
+
+    private sealed class ConfiguredFeatures
+    {
+        public string[] Features { get; set; } = [];
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellOrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellOrchardCoreBuilderExtensions.cs
index 0db4d4c1ea7..39d5d1b0986 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellOrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellOrchardCoreBuilderExtensions.cs
@@ -4,39 +4,38 @@
 using OrchardCore.Environment.Shell.Data.Descriptors;
 using OrchardCore.Environment.Shell.Descriptor;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class ShellOrchardCoreBuilderExtensions
 {
-    public static class ShellOrchardCoreBuilderExtensions
+    /// <summary>
+    /// Adds services at the host level to load site settings from the file system
+    /// and tenant level services to store states and descriptors in the database.
+    /// </summary>
+    public static OrchardCoreBuilder AddDataStorage(this OrchardCoreBuilder builder)
     {
-        /// <summary>
-        /// Adds services at the host level to load site settings from the file system
-        /// and tenant level services to store states and descriptors in the database.
-        /// </summary>
-        public static OrchardCoreBuilder AddDataStorage(this OrchardCoreBuilder builder)
-        {
-            builder.AddSitesFolder()
-                .ConfigureServices(services =>
-                {
-                    services.AddScoped<IShellDescriptorManager, ShellDescriptorManager>();
-                });
+        builder.AddSitesFolder()
+            .ConfigureServices(services =>
+            {
+                services.AddScoped<IShellDescriptorManager, ShellDescriptorManager>();
+            });
 
-            return builder;
-        }
+        return builder;
+    }
 
-        /// <summary>
-        /// Host services to load site settings from the file system.
-        /// </summary>
-        public static OrchardCoreBuilder AddSitesFolder(this OrchardCoreBuilder builder)
-        {
-            var services = builder.ApplicationServices;
+    /// <summary>
+    /// Host services to load site settings from the file system.
+    /// </summary>
+    public static OrchardCoreBuilder AddSitesFolder(this OrchardCoreBuilder builder)
+    {
+        var services = builder.ApplicationServices;
 
-            services.AddSingleton<IShellsSettingsSources, ShellsSettingsSources>();
-            services.AddSingleton<IShellsConfigurationSources, ShellsConfigurationSources>();
-            services.AddSingleton<IShellConfigurationSources, ShellConfigurationSources>();
-            services.AddTransient<IConfigureOptions<ShellOptions>, ShellOptionsSetup>();
-            services.AddSingleton<IShellSettingsManager, ShellSettingsManager>();
+        services.AddSingleton<IShellsSettingsSources, ShellsSettingsSources>();
+        services.AddSingleton<IShellsConfigurationSources, ShellsConfigurationSources>();
+        services.AddSingleton<IShellConfigurationSources, ShellConfigurationSources>();
+        services.AddTransient<IConfigureOptions<ShellOptions>, ShellOptionsSetup>();
+        services.AddSingleton<IShellSettingsManager, ShellSettingsManager>();
 
-            return builder;
-        }
+        return builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Configuration/DatabaseShellConfigurationSources.cs b/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Configuration/DatabaseShellConfigurationSources.cs
index 6a9dfe129be..a1a12c5c3ad 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Configuration/DatabaseShellConfigurationSources.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Configuration/DatabaseShellConfigurationSources.cs
@@ -15,147 +15,146 @@
 using OrchardCore.Shells.Database.Models;
 using YesSql;
 
-namespace OrchardCore.Shells.Database.Configuration
+namespace OrchardCore.Shells.Database.Configuration;
+
+public class DatabaseShellConfigurationSources : IShellConfigurationSources
 {
-    public class DatabaseShellConfigurationSources : IShellConfigurationSources
-    {
-        private readonly DatabaseShellsStorageOptions _options;
-        private readonly IShellContextFactory _shellContextFactory;
-        private readonly string _container;
+    private readonly DatabaseShellsStorageOptions _options;
+    private readonly IShellContextFactory _shellContextFactory;
+    private readonly string _container;
 
-        public DatabaseShellConfigurationSources(
-            Microsoft.Extensions.Configuration.IConfiguration configuration,
-            IShellContextFactory shellContextFactory,
-            IOptions<ShellOptions> shellOptions)
+    public DatabaseShellConfigurationSources(
+        Microsoft.Extensions.Configuration.IConfiguration configuration,
+        IShellContextFactory shellContextFactory,
+        IOptions<ShellOptions> shellOptions)
 
-        {
-            _options = configuration
-                .GetSection("OrchardCore")
-                .GetSectionCompat("OrchardCore_Shells_Database")
-                .Get<DatabaseShellsStorageOptions>()
-                ?? new DatabaseShellsStorageOptions();
+    {
+        _options = configuration
+            .GetSection("OrchardCore")
+            .GetSectionCompat("OrchardCore_Shells_Database")
+            .Get<DatabaseShellsStorageOptions>()
+            ?? new DatabaseShellsStorageOptions();
 
-            _shellContextFactory = shellContextFactory;
+        _shellContextFactory = shellContextFactory;
 
-            _container = Path.Combine(shellOptions.Value.ShellsApplicationDataPath, shellOptions.Value.ShellsContainerName);
-        }
+        _container = Path.Combine(shellOptions.Value.ShellsApplicationDataPath, shellOptions.Value.ShellsContainerName);
+    }
+
+    public async Task AddSourcesAsync(string tenant, IConfigurationBuilder builder)
+    {
+        JsonObject configurations = null;
 
-        public async Task AddSourcesAsync(string tenant, IConfigurationBuilder builder)
+        await using var context = await _shellContextFactory.GetDatabaseContextAsync(_options);
+        await (await context.CreateScopeAsync()).UsingServiceScopeAsync(async scope =>
         {
-            JsonObject configurations = null;
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
 
-            await using var context = await _shellContextFactory.GetDatabaseContextAsync(_options);
-            await (await context.CreateScopeAsync()).UsingServiceScopeAsync(async scope =>
+            var document = await session.Query<DatabaseShellConfigurations>().FirstOrDefaultAsync();
+            if (document is not null)
             {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
+                configurations = document.ShellConfigurations;
+            }
+            else
+            {
+                document = new DatabaseShellConfigurations();
+                configurations = [];
+            }
 
-                var document = await session.Query<DatabaseShellConfigurations>().FirstOrDefaultAsync();
-                if (document is not null)
-                {
-                    configurations = document.ShellConfigurations;
-                }
-                else
+            if (!configurations.ContainsKey(tenant))
+            {
+                if (!_options.MigrateFromFiles || !await TryMigrateFromFileAsync(tenant, configurations))
                 {
-                    document = new DatabaseShellConfigurations();
-                    configurations = [];
+                    return;
                 }
 
-                if (!configurations.ContainsKey(tenant))
-                {
-                    if (!_options.MigrateFromFiles || !await TryMigrateFromFileAsync(tenant, configurations))
-                    {
-                        return;
-                    }
-
-                    document.ShellConfigurations = configurations;
-
-                    await session.SaveAsync(document, checkConcurrency: true);
-                }
-            });
+                document.ShellConfigurations = configurations;
 
-            var configuration = configurations[tenant] as JsonObject;
-            if (configuration is not null)
-            {
-                var configurationString = configuration.ToJsonString(JOptions.Default);
-                builder.AddTenantJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(configurationString)));
+                await session.SaveAsync(document, checkConcurrency: true);
             }
+        });
+
+        var configuration = configurations[tenant] as JsonObject;
+        if (configuration is not null)
+        {
+            var configurationString = configuration.ToJsonString(JOptions.Default);
+            builder.AddTenantJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(configurationString)));
         }
+    }
 
-        public async Task SaveAsync(string tenant, IDictionary<string, string> data)
+    public async Task SaveAsync(string tenant, IDictionary<string, string> data)
+    {
+        await using var context = await _shellContextFactory.GetDatabaseContextAsync(_options);
+        await (await context.CreateScopeAsync()).UsingServiceScopeAsync(async scope =>
         {
-            await using var context = await _shellContextFactory.GetDatabaseContextAsync(_options);
-            await (await context.CreateScopeAsync()).UsingServiceScopeAsync(async scope =>
-            {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
 
-                var document = await session.Query<DatabaseShellConfigurations>().FirstOrDefaultAsync();
+            var document = await session.Query<DatabaseShellConfigurations>().FirstOrDefaultAsync();
 
-                JsonObject configurations;
-                if (document is not null)
+            JsonObject configurations;
+            if (document is not null)
+            {
+                configurations = document.ShellConfigurations;
+            }
+            else
+            {
+                document = new DatabaseShellConfigurations();
+                configurations = [];
+            }
+
+            var configData = await (configurations[tenant] as JsonObject).ToConfigurationDataAsync();
+            foreach (var key in data.Keys)
+            {
+                if (data[key] is not null)
                 {
-                    configurations = document.ShellConfigurations;
+                    configData[key] = data[key];
                 }
                 else
                 {
-                    document = new DatabaseShellConfigurations();
-                    configurations = [];
-                }
-
-                var configData = await (configurations[tenant] as JsonObject).ToConfigurationDataAsync();
-                foreach (var key in data.Keys)
-                {
-                    if (data[key] is not null)
-                    {
-                        configData[key] = data[key];
-                    }
-                    else
-                    {
-                        configData.Remove(key);
-                    }
+                    configData.Remove(key);
                 }
+            }
 
-                configurations[tenant] = configData.ToJsonObject();
-                document.ShellConfigurations = configurations;
-
-                await session.SaveAsync(document, checkConcurrency: true);
-            });
-        }
+            configurations[tenant] = configData.ToJsonObject();
+            document.ShellConfigurations = configurations;
 
-        public async Task RemoveAsync(string tenant)
-        {
-            await using var context = await _shellContextFactory.GetDatabaseContextAsync(_options);
-            await (await context.CreateScopeAsync()).UsingServiceScopeAsync(async scope =>
-            {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
-
-                var document = await session.Query<DatabaseShellConfigurations>().FirstOrDefaultAsync();
-                if (document is not null)
-                {
-                    document.ShellConfigurations.Remove(tenant);
-                    await session.SaveAsync(document, checkConcurrency: true);
-                }
-            });
-        }
+            await session.SaveAsync(document, checkConcurrency: true);
+        });
+    }
 
-        private async Task<bool> TryMigrateFromFileAsync(string tenant, JsonObject configurations)
+    public async Task RemoveAsync(string tenant)
+    {
+        await using var context = await _shellContextFactory.GetDatabaseContextAsync(_options);
+        await (await context.CreateScopeAsync()).UsingServiceScopeAsync(async scope =>
         {
-            var tenantFolder = Path.Combine(_container, tenant);
-            var appsettings = Path.Combine(tenantFolder, OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
 
-            if (!File.Exists(appsettings))
+            var document = await session.Query<DatabaseShellConfigurations>().FirstOrDefaultAsync();
+            if (document is not null)
             {
-                return false;
+                document.ShellConfigurations.Remove(tenant);
+                await session.SaveAsync(document, checkConcurrency: true);
             }
+        });
+    }
+
+    private async Task<bool> TryMigrateFromFileAsync(string tenant, JsonObject configurations)
+    {
+        var tenantFolder = Path.Combine(_container, tenant);
+        var appsettings = Path.Combine(tenantFolder, OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
 
-            using var stream = File.OpenRead(appsettings);
+        if (!File.Exists(appsettings))
+        {
+            return false;
+        }
 
-            var configuration = await JObject.LoadAsync(stream);
-            if (configuration is JsonObject jsonObject)
-            {
-                configurations[tenant] = jsonObject;
-            }
+        using var stream = File.OpenRead(appsettings);
 
-            return true;
+        var configuration = await JObject.LoadAsync(stream);
+        if (configuration is JsonObject jsonObject)
+        {
+            configurations[tenant] = jsonObject;
         }
+
+        return true;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Configuration/DatabaseShellsSettingsSources.cs b/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Configuration/DatabaseShellsSettingsSources.cs
index 7148942297e..2cc94d2116c 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Configuration/DatabaseShellsSettingsSources.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Configuration/DatabaseShellsSettingsSources.cs
@@ -14,145 +14,144 @@
 using OrchardCore.Shells.Database.Models;
 using YesSql;
 
-namespace OrchardCore.Shells.Database.Configuration
+namespace OrchardCore.Shells.Database.Configuration;
+
+public class DatabaseShellsSettingsSources : IShellsSettingsSources
 {
-    public class DatabaseShellsSettingsSources : IShellsSettingsSources
-    {
-        private readonly DatabaseShellsStorageOptions _options;
-        private readonly IShellContextFactory _shellContextFactory;
-        private readonly string _tenants;
+    private readonly DatabaseShellsStorageOptions _options;
+    private readonly IShellContextFactory _shellContextFactory;
+    private readonly string _tenants;
 
-        public DatabaseShellsSettingsSources(
-            Microsoft.Extensions.Configuration.IConfiguration configuration,
-            IShellContextFactory shellContextFactory,
-            IOptions<ShellOptions> shellOptions)
+    public DatabaseShellsSettingsSources(
+        Microsoft.Extensions.Configuration.IConfiguration configuration,
+        IShellContextFactory shellContextFactory,
+        IOptions<ShellOptions> shellOptions)
 
-        {
-            _options = configuration
-                .GetSection("OrchardCore")
-                .GetSectionCompat("OrchardCore_Shells_Database")
-                .Get<DatabaseShellsStorageOptions>()
-                ?? new DatabaseShellsStorageOptions();
+    {
+        _options = configuration
+            .GetSection("OrchardCore")
+            .GetSectionCompat("OrchardCore_Shells_Database")
+            .Get<DatabaseShellsStorageOptions>()
+            ?? new DatabaseShellsStorageOptions();
 
-            _shellContextFactory = shellContextFactory;
+        _shellContextFactory = shellContextFactory;
 
-            _tenants = Path.Combine(shellOptions.Value.ShellsApplicationDataPath, OrchardCoreConstants.Shell.TenantsFileName);
-        }
+        _tenants = Path.Combine(shellOptions.Value.ShellsApplicationDataPath, OrchardCoreConstants.Shell.TenantsFileName);
+    }
 
-        public async Task AddSourcesAsync(IConfigurationBuilder builder)
+    public async Task AddSourcesAsync(IConfigurationBuilder builder)
+    {
+        var document = await GetDocumentAsync();
+        if (document.ShellsSettings is not null)
         {
-            var document = await GetDocumentAsync();
-            if (document.ShellsSettings is not null)
-            {
-                var shellsSettingsString = document.ShellsSettings.ToJsonString(JOptions.Default);
-                builder.AddTenantJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(shellsSettingsString)));
-            }
+            var shellsSettingsString = document.ShellsSettings.ToJsonString(JOptions.Default);
+            builder.AddTenantJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(shellsSettingsString)));
         }
+    }
 
-        public async Task AddSourcesAsync(string tenant, IConfigurationBuilder builder)
+    public async Task AddSourcesAsync(string tenant, IConfigurationBuilder builder)
+    {
+        var document = await GetDocumentAsync();
+        if (document.ShellsSettings is not null && document.ShellsSettings.ContainsKey(tenant))
         {
-            var document = await GetDocumentAsync();
-            if (document.ShellsSettings is not null && document.ShellsSettings.ContainsKey(tenant))
-            {
-                var shellSettings = new JsonObject { [tenant] = document.ShellsSettings[tenant] };
-                var shellSettingsString = shellSettings.ToJsonString(JOptions.Default);
-                builder.AddTenantJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(shellSettingsString)));
-            }
+            var shellSettings = new JsonObject { [tenant] = document.ShellsSettings[tenant] };
+            var shellSettingsString = shellSettings.ToJsonString(JOptions.Default);
+            builder.AddTenantJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(shellSettingsString)));
         }
+    }
 
-        public async Task SaveAsync(string tenant, IDictionary<string, string> data)
+    public async Task SaveAsync(string tenant, IDictionary<string, string> data)
+    {
+        await using var context = await _shellContextFactory.GetDatabaseContextAsync(_options);
+        await (await context.CreateScopeAsync()).UsingServiceScopeAsync(async scope =>
         {
-            await using var context = await _shellContextFactory.GetDatabaseContextAsync(_options);
-            await (await context.CreateScopeAsync()).UsingServiceScopeAsync(async scope =>
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
+
+            var document = await session.Query<DatabaseShellsSettings>().FirstOrDefaultAsync();
+
+            JsonObject tenantsSettings;
+            if (document is not null)
+            {
+                tenantsSettings = document.ShellsSettings;
+            }
+            else
             {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
+                document = new DatabaseShellsSettings();
+                tenantsSettings = [];
+            }
 
-                var document = await session.Query<DatabaseShellsSettings>().FirstOrDefaultAsync();
+            var settings = tenantsSettings[tenant] as JsonObject ?? [];
 
-                JsonObject tenantsSettings;
-                if (document is not null)
+            foreach (var key in data.Keys)
+            {
+                if (data[key] is not null)
                 {
-                    tenantsSettings = document.ShellsSettings;
+                    settings[key] = data[key];
                 }
                 else
                 {
-                    document = new DatabaseShellsSettings();
-                    tenantsSettings = [];
-                }
-
-                var settings = tenantsSettings[tenant] as JsonObject ?? [];
-
-                foreach (var key in data.Keys)
-                {
-                    if (data[key] is not null)
-                    {
-                        settings[key] = data[key];
-                    }
-                    else
-                    {
-                        settings.Remove(key);
-                    }
+                    settings.Remove(key);
                 }
+            }
 
-                tenantsSettings[tenant] = settings;
-                document.ShellsSettings = tenantsSettings;
+            tenantsSettings[tenant] = settings;
+            document.ShellsSettings = tenantsSettings;
 
-                await session.SaveAsync(document, checkConcurrency: true);
-            });
-        }
+            await session.SaveAsync(document, checkConcurrency: true);
+        });
+    }
 
-        public async Task RemoveAsync(string tenant)
+    public async Task RemoveAsync(string tenant)
+    {
+        await using var context = await _shellContextFactory.GetDatabaseContextAsync(_options);
+        await (await context.CreateScopeAsync()).UsingServiceScopeAsync(async scope =>
         {
-            await using var context = await _shellContextFactory.GetDatabaseContextAsync(_options);
-            await (await context.CreateScopeAsync()).UsingServiceScopeAsync(async scope =>
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
+
+            var document = await session.Query<DatabaseShellsSettings>().FirstOrDefaultAsync();
+            if (document is not null)
             {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
+                document.ShellsSettings.Remove(tenant);
+                await session.SaveAsync(document, checkConcurrency: true);
+            }
+        });
+    }
 
-                var document = await session.Query<DatabaseShellsSettings>().FirstOrDefaultAsync();
-                if (document is not null)
-                {
-                    document.ShellsSettings.Remove(tenant);
-                    await session.SaveAsync(document, checkConcurrency: true);
-                }
-            });
-        }
+    private async Task<DatabaseShellsSettings> GetDocumentAsync()
+    {
+        DatabaseShellsSettings document = null;
 
-        private async Task<DatabaseShellsSettings> GetDocumentAsync()
+        await using var context = await _shellContextFactory.GetDatabaseContextAsync(_options);
+        await (await context.CreateScopeAsync()).UsingServiceScopeAsync(async scope =>
         {
-            DatabaseShellsSettings document = null;
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
 
-            await using var context = await _shellContextFactory.GetDatabaseContextAsync(_options);
-            await (await context.CreateScopeAsync()).UsingServiceScopeAsync(async scope =>
+            document = await session.Query<DatabaseShellsSettings>().FirstOrDefaultAsync();
+            if (document is null)
             {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
-
-                document = await session.Query<DatabaseShellsSettings>().FirstOrDefaultAsync();
-                if (document is null)
+                document = new DatabaseShellsSettings();
+                if (!_options.MigrateFromFiles || !await TryMigrateFromFileAsync(document))
                 {
-                    document = new DatabaseShellsSettings();
-                    if (!_options.MigrateFromFiles || !await TryMigrateFromFileAsync(document))
-                    {
-                        return;
-                    }
-
-                    await session.SaveAsync(document, checkConcurrency: true);
+                    return;
                 }
-            });
-
-            return document;
-        }
 
-        private async Task<bool> TryMigrateFromFileAsync(DatabaseShellsSettings document)
-        {
-            if (!File.Exists(_tenants))
-            {
-                return false;
+                await session.SaveAsync(document, checkConcurrency: true);
             }
+        });
 
-            using var fileStream = File.OpenRead(_tenants);
-            document.ShellsSettings = await JObject.LoadAsync(fileStream);
+        return document;
+    }
 
-            return true;
+    private async Task<bool> TryMigrateFromFileAsync(DatabaseShellsSettings document)
+    {
+        if (!File.Exists(_tenants))
+        {
+            return false;
         }
+
+        using var fileStream = File.OpenRead(_tenants);
+        document.ShellsSettings = await JObject.LoadAsync(fileStream);
+
+        return true;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Configuration/DatabaseShellsStorageOptions.cs b/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Configuration/DatabaseShellsStorageOptions.cs
index 695349aa124..8facdea1282 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Configuration/DatabaseShellsStorageOptions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Configuration/DatabaseShellsStorageOptions.cs
@@ -1,13 +1,12 @@
 using OrchardCore.Data;
 
-namespace OrchardCore.Shells.Database.Configuration
+namespace OrchardCore.Shells.Database.Configuration;
+
+public class DatabaseShellsStorageOptions : IDbConnectionInfo
 {
-    public class DatabaseShellsStorageOptions : IDbConnectionInfo
-    {
-        public bool MigrateFromFiles { get; set; }
-        public string DatabaseProvider { get; set; }
-        public string ConnectionString { get; set; }
-        public string TablePrefix { get; set; }
-        public string Schema { get; set; }
-    }
+    public bool MigrateFromFiles { get; set; }
+    public string DatabaseProvider { get; set; }
+    public string ConnectionString { get; set; }
+    public string TablePrefix { get; set; }
+    public string Schema { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Extensions/DatabaseShellContextFactoryExtensions.cs b/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Extensions/DatabaseShellContextFactoryExtensions.cs
index 3887e63607a..d5edaccba9a 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Extensions/DatabaseShellContextFactoryExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Extensions/DatabaseShellContextFactoryExtensions.cs
@@ -5,29 +5,28 @@
 using OrchardCore.Environment.Shell.Descriptor.Models;
 using OrchardCore.Shells.Database.Configuration;
 
-namespace OrchardCore.Shells.Database.Extensions
+namespace OrchardCore.Shells.Database.Extensions;
+
+public static class DatabaseShellContextFactoryExtensions
 {
-    public static class DatabaseShellContextFactoryExtensions
+    internal static Task<ShellContext> GetDatabaseContextAsync(
+        this IShellContextFactory shellContextFactory, DatabaseShellsStorageOptions options)
     {
-        internal static Task<ShellContext> GetDatabaseContextAsync(
-            this IShellContextFactory shellContextFactory, DatabaseShellsStorageOptions options)
+        if (options.DatabaseProvider is null)
         {
-            if (options.DatabaseProvider is null)
-            {
-                throw new InvalidOperationException("The 'OrchardCore.Shells.Database' configuration section should define a 'DatabaseProvider'");
-            }
+            throw new InvalidOperationException("The 'OrchardCore.Shells.Database' configuration section should define a 'DatabaseProvider'");
+        }
 
-            var settings = new ShellSettings()
-                .AsDefaultShell()
-                .AsDisposable()
-                .AsRunning();
+        var settings = new ShellSettings()
+            .AsDefaultShell()
+            .AsDisposable()
+            .AsRunning();
 
-            settings["DatabaseProvider"] = options.DatabaseProvider;
-            settings["ConnectionString"] = options.ConnectionString;
-            settings["TablePrefix"] = options.TablePrefix;
-            settings["Schema"] = options.Schema;
+        settings["DatabaseProvider"] = options.DatabaseProvider;
+        settings["ConnectionString"] = options.ConnectionString;
+        settings["TablePrefix"] = options.TablePrefix;
+        settings["Schema"] = options.Schema;
 
-            return shellContextFactory.CreateDescribedContextAsync(settings, new ShellDescriptor());
-        }
+        return shellContextFactory.CreateDescribedContextAsync(settings, new ShellDescriptor());
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Extensions/DatabaseShellsOrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Extensions/DatabaseShellsOrchardCoreBuilderExtensions.cs
index 42a9b0dcb4b..f2c822a1473 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Extensions/DatabaseShellsOrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Extensions/DatabaseShellsOrchardCoreBuilderExtensions.cs
@@ -2,21 +2,20 @@
 using OrchardCore.Environment.Shell.Configuration;
 using OrchardCore.Shells.Database.Configuration;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class DatabaseShellsOrchardCoreBuilderExtensions
 {
-    public static class DatabaseShellsOrchardCoreBuilderExtensions
+    /// <summary>
+    /// Host services to load shells settings and configuration from database.
+    /// </summary>
+    public static OrchardCoreBuilder AddDatabaseShellsConfiguration(this OrchardCoreBuilder builder)
     {
-        /// <summary>
-        /// Host services to load shells settings and configuration from database.
-        /// </summary>
-        public static OrchardCoreBuilder AddDatabaseShellsConfiguration(this OrchardCoreBuilder builder)
-        {
-            var services = builder.ApplicationServices;
+        var services = builder.ApplicationServices;
 
-            services.Replace(ServiceDescriptor.Singleton<IShellsSettingsSources, DatabaseShellsSettingsSources>());
-            services.Replace(ServiceDescriptor.Singleton<IShellConfigurationSources, DatabaseShellConfigurationSources>());
+        services.Replace(ServiceDescriptor.Singleton<IShellsSettingsSources, DatabaseShellsSettingsSources>());
+        services.Replace(ServiceDescriptor.Singleton<IShellConfigurationSources, DatabaseShellConfigurationSources>());
 
-            return builder;
-        }
+        return builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Models/DatabaseShellConfigurations.cs b/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Models/DatabaseShellConfigurations.cs
index 8d95b2354dc..48ba47be224 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Models/DatabaseShellConfigurations.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Models/DatabaseShellConfigurations.cs
@@ -1,9 +1,8 @@
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.Shells.Database.Models
+namespace OrchardCore.Shells.Database.Models;
+
+public class DatabaseShellConfigurations
 {
-    public class DatabaseShellConfigurations
-    {
-        public JsonObject ShellConfigurations { get; set; }
-    }
+    public JsonObject ShellConfigurations { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Models/DatabaseShellsSettings.cs b/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Models/DatabaseShellsSettings.cs
index a9d16682d8f..d67c8bfbc15 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Models/DatabaseShellsSettings.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Models/DatabaseShellsSettings.cs
@@ -1,9 +1,8 @@
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.Shells.Database.Models
+namespace OrchardCore.Shells.Database.Models;
+
+public class DatabaseShellsSettings
 {
-    public class DatabaseShellsSettings
-    {
-        public JsonObject ShellsSettings { get; set; }
-    }
+    public JsonObject ShellsSettings { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Liquid.Abstractions/ILiquidFilter.cs b/src/OrchardCore/OrchardCore.Liquid.Abstractions/ILiquidFilter.cs
index 22cabac3256..4f45a23b0cb 100644
--- a/src/OrchardCore/OrchardCore.Liquid.Abstractions/ILiquidFilter.cs
+++ b/src/OrchardCore/OrchardCore.Liquid.Abstractions/ILiquidFilter.cs
@@ -2,10 +2,9 @@
 using Fluid;
 using Fluid.Values;
 
-namespace OrchardCore.Liquid
+namespace OrchardCore.Liquid;
+
+public interface ILiquidFilter
 {
-    public interface ILiquidFilter
-    {
-        ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context);
-    }
+    ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Liquid.Abstractions/ILiquidTemplateManager.cs b/src/OrchardCore/OrchardCore.Liquid.Abstractions/ILiquidTemplateManager.cs
index dc2cc480cc6..66feb0e4f99 100644
--- a/src/OrchardCore/OrchardCore.Liquid.Abstractions/ILiquidTemplateManager.cs
+++ b/src/OrchardCore/OrchardCore.Liquid.Abstractions/ILiquidTemplateManager.cs
@@ -5,61 +5,60 @@
 using Fluid.Values;
 using Microsoft.AspNetCore.Html;
 
-namespace OrchardCore.Liquid
+namespace OrchardCore.Liquid;
+
+/// <summary>
+/// Provides services to render Liquid templates.
+/// </summary>
+public interface ILiquidTemplateManager
 {
     /// <summary>
-    /// Provides services to render Liquid templates.
+    /// Renders a Liquid template as a <see cref="string"/>.
     /// </summary>
-    public interface ILiquidTemplateManager
-    {
-        /// <summary>
-        /// Renders a Liquid template as a <see cref="string"/>.
-        /// </summary>
-        Task<string> RenderStringAsync(string template, TextEncoder encoder, object model, IEnumerable<KeyValuePair<string, FluidValue>> properties);
+    Task<string> RenderStringAsync(string template, TextEncoder encoder, object model, IEnumerable<KeyValuePair<string, FluidValue>> properties);
 
-        /// <summary>
-        /// Renders a Liquid template as a <see cref="IHtmlContent"/>.
-        /// </summary>
-        Task<IHtmlContent> RenderHtmlContentAsync(string template, TextEncoder encoder, object model, IEnumerable<KeyValuePair<string, FluidValue>> properties);
+    /// <summary>
+    /// Renders a Liquid template as a <see cref="IHtmlContent"/>.
+    /// </summary>
+    Task<IHtmlContent> RenderHtmlContentAsync(string template, TextEncoder encoder, object model, IEnumerable<KeyValuePair<string, FluidValue>> properties);
 
-        /// <summary>
-        /// Renders a Liquid template on a <see cref="TextWriter"/>.
-        /// </summary>
-        Task RenderAsync(string template, TextWriter writer, TextEncoder encoder, object model, IEnumerable<KeyValuePair<string, FluidValue>> properties);
+    /// <summary>
+    /// Renders a Liquid template on a <see cref="TextWriter"/>.
+    /// </summary>
+    Task RenderAsync(string template, TextWriter writer, TextEncoder encoder, object model, IEnumerable<KeyValuePair<string, FluidValue>> properties);
 
-        /// <summary>
-        /// Validates a Liquid template.
-        /// </summary>
-        bool Validate(string template, out IEnumerable<string> errors);
-    }
+    /// <summary>
+    /// Validates a Liquid template.
+    /// </summary>
+    bool Validate(string template, out IEnumerable<string> errors);
+}
 
-    public static class LiquidTemplateManagerExtensions
-    {
-        public static Task<string> RenderStringAsync(this ILiquidTemplateManager manager, string template, TextEncoder encoder)
-            => manager.RenderStringAsync(template, encoder, model: null, properties: null);
+public static class LiquidTemplateManagerExtensions
+{
+    public static Task<string> RenderStringAsync(this ILiquidTemplateManager manager, string template, TextEncoder encoder)
+        => manager.RenderStringAsync(template, encoder, model: null, properties: null);
 
-        public static Task RenderStringAsync(this ILiquidTemplateManager manager, string template, TextWriter writer, TextEncoder encoder)
-            => manager.RenderAsync(template, writer, encoder, model: null, properties: null);
+    public static Task RenderStringAsync(this ILiquidTemplateManager manager, string template, TextWriter writer, TextEncoder encoder)
+        => manager.RenderAsync(template, writer, encoder, model: null, properties: null);
 
-        public static Task<string> RenderStringAsync(this ILiquidTemplateManager manager, string template, TextEncoder encoder, object model)
-            => manager.RenderStringAsync(template, encoder, model, properties: null);
+    public static Task<string> RenderStringAsync(this ILiquidTemplateManager manager, string template, TextEncoder encoder, object model)
+        => manager.RenderStringAsync(template, encoder, model, properties: null);
 
-        public static Task RenderStringAsync(this ILiquidTemplateManager manager, string template, TextWriter writer, TextEncoder encoder, object model)
-            => manager.RenderAsync(template, writer, encoder, model, properties: null);
+    public static Task RenderStringAsync(this ILiquidTemplateManager manager, string template, TextWriter writer, TextEncoder encoder, object model)
+        => manager.RenderAsync(template, writer, encoder, model, properties: null);
 
-        public static Task<string> RenderStringAsync(this ILiquidTemplateManager manager, string template, TextEncoder encoder, IEnumerable<KeyValuePair<string, FluidValue>> properties)
-            => manager.RenderStringAsync(template, encoder, model: null, properties);
+    public static Task<string> RenderStringAsync(this ILiquidTemplateManager manager, string template, TextEncoder encoder, IEnumerable<KeyValuePair<string, FluidValue>> properties)
+        => manager.RenderStringAsync(template, encoder, model: null, properties);
 
-        public static Task RenderStringAsync(this ILiquidTemplateManager manager, string template, TextWriter writer, TextEncoder encoder, IEnumerable<KeyValuePair<string, FluidValue>> properties)
-            => manager.RenderAsync(template, writer, encoder, model: null, properties);
+    public static Task RenderStringAsync(this ILiquidTemplateManager manager, string template, TextWriter writer, TextEncoder encoder, IEnumerable<KeyValuePair<string, FluidValue>> properties)
+        => manager.RenderAsync(template, writer, encoder, model: null, properties);
 
-        public static Task<IHtmlContent> RenderHtmlContentAsync(this ILiquidTemplateManager manager, string template, TextEncoder encoder)
-            => manager.RenderHtmlContentAsync(template, encoder, model: null, properties: null);
+    public static Task<IHtmlContent> RenderHtmlContentAsync(this ILiquidTemplateManager manager, string template, TextEncoder encoder)
+        => manager.RenderHtmlContentAsync(template, encoder, model: null, properties: null);
 
-        public static Task<IHtmlContent> RenderHtmlContentAsync(this ILiquidTemplateManager manager, string template, TextEncoder encoder, object model)
-            => manager.RenderHtmlContentAsync(template, encoder, model, properties: null);
+    public static Task<IHtmlContent> RenderHtmlContentAsync(this ILiquidTemplateManager manager, string template, TextEncoder encoder, object model)
+        => manager.RenderHtmlContentAsync(template, encoder, model, properties: null);
 
-        public static Task<IHtmlContent> RenderHtmlContentAsync(this ILiquidTemplateManager manager, string template, TextEncoder encoder, IEnumerable<KeyValuePair<string, FluidValue>> properties)
-            => manager.RenderHtmlContentAsync(template, encoder, model: null, properties);
-    }
+    public static Task<IHtmlContent> RenderHtmlContentAsync(this ILiquidTemplateManager manager, string template, TextEncoder encoder, IEnumerable<KeyValuePair<string, FluidValue>> properties)
+        => manager.RenderHtmlContentAsync(template, encoder, model: null, properties);
 }
diff --git a/src/OrchardCore/OrchardCore.Liquid.Abstractions/LiquidContentAccessor.cs b/src/OrchardCore/OrchardCore.Liquid.Abstractions/LiquidContentAccessor.cs
index 8676d63e0a5..6dbb5fdff0b 100644
--- a/src/OrchardCore/OrchardCore.Liquid.Abstractions/LiquidContentAccessor.cs
+++ b/src/OrchardCore/OrchardCore.Liquid.Abstractions/LiquidContentAccessor.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Liquid
+namespace OrchardCore.Liquid;
+
+/// <summary>
+/// This is a placeholder class that allows modules to extend the `Content` property in the current Liquid scope.
+/// </summary>
+public class LiquidContentAccessor
 {
-    /// <summary>
-    /// This is a placeholder class that allows modules to extend the `Content` property in the current Liquid scope.
-    /// </summary>
-    public class LiquidContentAccessor
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Liquid.Abstractions/LiquidFilterDelegateResolver.cs b/src/OrchardCore/OrchardCore.Liquid.Abstractions/LiquidFilterDelegateResolver.cs
index 5e9123e2c47..c325dfb1983 100644
--- a/src/OrchardCore/OrchardCore.Liquid.Abstractions/LiquidFilterDelegateResolver.cs
+++ b/src/OrchardCore/OrchardCore.Liquid.Abstractions/LiquidFilterDelegateResolver.cs
@@ -4,19 +4,18 @@
 using Fluid.Values;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace OrchardCore.Liquid
+namespace OrchardCore.Liquid;
+
+public class LiquidFilterDelegateResolver<TLiquidFilter> where TLiquidFilter : class, ILiquidFilter
 {
-    public class LiquidFilterDelegateResolver<TLiquidFilter> where TLiquidFilter : class, ILiquidFilter
+    public ValueTask<FluidValue> ResolveAsync(FluidValue input, FilterArguments arguments, TemplateContext context)
     {
-        public ValueTask<FluidValue> ResolveAsync(FluidValue input, FilterArguments arguments, TemplateContext context)
-        {
-            var ctx = context as LiquidTemplateContext
-                ?? throw new InvalidOperationException("An implementation of 'LiquidTemplateContext' is required");
+        var ctx = context as LiquidTemplateContext
+            ?? throw new InvalidOperationException("An implementation of 'LiquidTemplateContext' is required");
 
-            var services = ctx.Services;
-            var filter = services.GetRequiredService<TLiquidFilter>();
+        var services = ctx.Services;
+        var filter = services.GetRequiredService<TLiquidFilter>();
 
-            return filter.ProcessAsync(input, arguments, ctx);
-        }
+        return filter.ProcessAsync(input, arguments, ctx);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Liquid.Abstractions/LiquidPropertyAccessor.cs b/src/OrchardCore/OrchardCore.Liquid.Abstractions/LiquidPropertyAccessor.cs
index d2d36ebf897..d701e7d76ac 100644
--- a/src/OrchardCore/OrchardCore.Liquid.Abstractions/LiquidPropertyAccessor.cs
+++ b/src/OrchardCore/OrchardCore.Liquid.Abstractions/LiquidPropertyAccessor.cs
@@ -2,28 +2,27 @@
 using System.Threading.Tasks;
 using Fluid.Values;
 
-namespace OrchardCore.Liquid
+namespace OrchardCore.Liquid;
+
+/// <summary>
+/// Can be used to provide a factory to return a value based on a property name
+/// that is unknown at registration time.
+///
+/// e.g. {{ LiquidPropertyAccessor.MyPropertyName }} (MyPropertyName will be passed as the identifier argument to the factory).
+/// </summary>
+public class LiquidPropertyAccessor
 {
-    /// <summary>
-    /// Can be used to provide a factory to return a value based on a property name
-    /// that is unknown at registration time.
-    ///
-    /// e.g. {{ LiquidPropertyAccessor.MyPropertyName }} (MyPropertyName will be passed as the identifier argument to the factory).
-    /// </summary>
-    public class LiquidPropertyAccessor
-    {
-        private readonly Func<string, LiquidTemplateContext, Task<FluidValue>> _getter;
-        private readonly LiquidTemplateContext _context;
+    private readonly Func<string, LiquidTemplateContext, Task<FluidValue>> _getter;
+    private readonly LiquidTemplateContext _context;
 
-        public LiquidPropertyAccessor(LiquidTemplateContext context, Func<string, LiquidTemplateContext, Task<FluidValue>> getter)
-        {
-            _getter = getter;
-            _context = context;
-        }
+    public LiquidPropertyAccessor(LiquidTemplateContext context, Func<string, LiquidTemplateContext, Task<FluidValue>> getter)
+    {
+        _getter = getter;
+        _context = context;
+    }
 
-        public Task<FluidValue> GetValueAsync(string identifier)
-        {
-            return _getter(identifier, _context);
-        }
+    public Task<FluidValue> GetValueAsync(string identifier)
+    {
+        return _getter(identifier, _context);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Liquid.Abstractions/LiquidTemplateContext.cs b/src/OrchardCore/OrchardCore.Liquid.Abstractions/LiquidTemplateContext.cs
index 691bb2284cb..e3ce9d2cc3a 100644
--- a/src/OrchardCore/OrchardCore.Liquid.Abstractions/LiquidTemplateContext.cs
+++ b/src/OrchardCore/OrchardCore.Liquid.Abstractions/LiquidTemplateContext.cs
@@ -2,23 +2,22 @@
 using Fluid;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.Liquid
+namespace OrchardCore.Liquid;
+
+public class LiquidTemplateContext : TemplateContext
 {
-    public class LiquidTemplateContext : TemplateContext
-    {
-        public const int MaxShapeRecursions = 3;
+    public const int MaxShapeRecursions = 3;
 
-        public LiquidTemplateContext(IServiceProvider services, TemplateOptions options) : base(options)
-        {
-            Services = services;
-        }
+    public LiquidTemplateContext(IServiceProvider services, TemplateOptions options) : base(options)
+    {
+        Services = services;
+    }
 
-        public IServiceProvider Services { get; }
+    public IServiceProvider Services { get; }
 
-        public ViewContext ViewContext { get; set; }
+    public ViewContext ViewContext { get; set; }
 
-        public bool IsInitialized { get; set; }
+    public bool IsInitialized { get; set; }
 
-        public int ShapeRecursions { get; set; }
-    }
+    public int ShapeRecursions { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Liquid.Abstractions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Liquid.Abstractions/ServiceCollectionExtensions.cs
index eb4a00b87fb..2c3d89b08df 100644
--- a/src/OrchardCore/OrchardCore.Liquid.Abstractions/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Liquid.Abstractions/ServiceCollectionExtensions.cs
@@ -1,16 +1,15 @@
 using Fluid;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace OrchardCore.Liquid
+namespace OrchardCore.Liquid;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    public static IServiceCollection AddLiquidFilter<TLiquidFilter>(this IServiceCollection services, string name) where TLiquidFilter : class, ILiquidFilter
     {
-        public static IServiceCollection AddLiquidFilter<TLiquidFilter>(this IServiceCollection services, string name) where TLiquidFilter : class, ILiquidFilter
-        {
-            services.Configure<TemplateOptions>(o => o.Filters.AddFilter(name, new LiquidFilterDelegateResolver<TLiquidFilter>().ResolveAsync));
-            services.AddScoped<TLiquidFilter>();
+        services.Configure<TemplateOptions>(o => o.Filters.AddFilter(name, new LiquidFilterDelegateResolver<TLiquidFilter>().ResolveAsync));
+        services.AddScoped<TLiquidFilter>();
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Abstractions/CultureDictionary.cs b/src/OrchardCore/OrchardCore.Localization.Abstractions/CultureDictionary.cs
index da2330ba8d0..76d9603cc5b 100644
--- a/src/OrchardCore/OrchardCore.Localization.Abstractions/CultureDictionary.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Abstractions/CultureDictionary.cs
@@ -2,93 +2,92 @@
 using System.Collections.Generic;
 using System.Globalization;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents a dictionary for a certain culture.
+/// </summary>
+/// <remarks>This type is not thread safe.</remarks>
+public class CultureDictionary : IEnumerable<CultureDictionaryRecord>
 {
     /// <summary>
-    /// Represents a dictionary for a certain culture.
+    /// Creates a new instance of <see cref="CultureDictionary"/>.
     /// </summary>
-    /// <remarks>This type is not thread safe.</remarks>
-    public class CultureDictionary : IEnumerable<CultureDictionaryRecord>
+    /// <param name="cultureName">The culture name.</param>
+    /// <param name="pluralRule">The pluralization rule.</param>
+    public CultureDictionary(string cultureName, PluralizationRuleDelegate pluralRule)
     {
-        /// <summary>
-        /// Creates a new instance of <see cref="CultureDictionary"/>.
-        /// </summary>
-        /// <param name="cultureName">The culture name.</param>
-        /// <param name="pluralRule">The pluralization rule.</param>
-        public CultureDictionary(string cultureName, PluralizationRuleDelegate pluralRule)
-        {
-            Translations = new Dictionary<CultureDictionaryRecordKey, string[]>();
-            CultureName = cultureName;
-            PluralRule = pluralRule;
-        }
+        Translations = new Dictionary<CultureDictionaryRecordKey, string[]>();
+        CultureName = cultureName;
+        PluralRule = pluralRule;
+    }
 
-        /// <summary>
-        /// Gets the culture name.
-        /// </summary>
-        public string CultureName { get; }
+    /// <summary>
+    /// Gets the culture name.
+    /// </summary>
+    public string CultureName { get; }
 
-        /// <summary>
-        /// gets the pluralization rule.
-        /// </summary>
-        public PluralizationRuleDelegate PluralRule { get; }
+    /// <summary>
+    /// gets the pluralization rule.
+    /// </summary>
+    public PluralizationRuleDelegate PluralRule { get; }
 
-        /// <summary>
-        /// Gets the localized value.
-        /// </summary>
-        /// <param name="key">The resource key.</param>
-        /// <returns></returns>
-        public string this[CultureDictionaryRecordKey key] => this[key, null];
+    /// <summary>
+    /// Gets the localized value.
+    /// </summary>
+    /// <param name="key">The resource key.</param>
+    /// <returns></returns>
+    public string this[CultureDictionaryRecordKey key] => this[key, null];
 
-        /// <summary>
-        /// Gets the localized value.
-        /// </summary>
-        /// <param name="key">The resource key.</param>
-        /// <param name="count">The number to specify the pluralization form.</param>
-        /// <returns></returns>
-        public string this[CultureDictionaryRecordKey key, int? count]
+    /// <summary>
+    /// Gets the localized value.
+    /// </summary>
+    /// <param name="key">The resource key.</param>
+    /// <param name="count">The number to specify the pluralization form.</param>
+    /// <returns></returns>
+    public string this[CultureDictionaryRecordKey key, int? count]
+    {
+        get
         {
-            get
+            if (!Translations.TryGetValue(key, out var translations))
             {
-                if (!Translations.TryGetValue(key, out var translations))
-                {
-                    return null;
-                }
-
-                var pluralForm = count.HasValue ? PluralRule(count.Value) : 0;
-                if (pluralForm >= translations.Length)
-                {
-                    throw new PluralFormNotFoundException($"Plural form '{pluralForm}' doesn't exist for the key '{key}' in the '{CultureName}' culture.", new PluralForm(key, pluralForm, CultureInfo.GetCultureInfo(CultureName)));
-                }
+                return null;
+            }
 
-                return translations[pluralForm];
+            var pluralForm = count.HasValue ? PluralRule(count.Value) : 0;
+            if (pluralForm >= translations.Length)
+            {
+                throw new PluralFormNotFoundException($"Plural form '{pluralForm}' doesn't exist for the key '{key}' in the '{CultureName}' culture.", new PluralForm(key, pluralForm, CultureInfo.GetCultureInfo(CultureName)));
             }
+
+            return translations[pluralForm];
         }
+    }
 
-        /// <summary>
-        /// Gets a list of the culture translations including the plural forms.
-        /// </summary>
-        public IDictionary<CultureDictionaryRecordKey, string[]> Translations { get; }
+    /// <summary>
+    /// Gets a list of the culture translations including the plural forms.
+    /// </summary>
+    public IDictionary<CultureDictionaryRecordKey, string[]> Translations { get; }
 
-        /// <summary>
-        /// Merges the translations from multiple dictionary records.
-        /// </summary>
-        /// <param name="records">The records to be merged.</param>
-        public void MergeTranslations(IEnumerable<CultureDictionaryRecord> records)
+    /// <summary>
+    /// Merges the translations from multiple dictionary records.
+    /// </summary>
+    /// <param name="records">The records to be merged.</param>
+    public void MergeTranslations(IEnumerable<CultureDictionaryRecord> records)
+    {
+        foreach (var record in records)
         {
-            foreach (var record in records)
-            {
-                Translations[record.Key] = record.Translations;
-            }
+            Translations[record.Key] = record.Translations;
         }
+    }
 
-        public IEnumerator<CultureDictionaryRecord> GetEnumerator()
+    public IEnumerator<CultureDictionaryRecord> GetEnumerator()
+    {
+        foreach (var item in Translations)
         {
-            foreach (var item in Translations)
-            {
-                yield return new CultureDictionaryRecord(item.Key, null, item.Value);
-            }
+            yield return new CultureDictionaryRecord(item.Key, null, item.Value);
         }
-
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
     }
+
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Abstractions/CultureDictionaryRecord.cs b/src/OrchardCore/OrchardCore.Localization.Abstractions/CultureDictionaryRecord.cs
index 990c272d8f1..4be44603b91 100644
--- a/src/OrchardCore/OrchardCore.Localization.Abstractions/CultureDictionaryRecord.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Abstractions/CultureDictionaryRecord.cs
@@ -1,62 +1,62 @@
 using System;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents a record in a <see cref="CultureDictionary"/>.
+/// </summary>
+public class CultureDictionaryRecord
 {
     /// <summary>
-    /// Represents a record in a <see cref="CultureDictionary"/>.
+    /// Creates new instance of <see cref="CultureDictionaryRecord"/>.
     /// </summary>
-    public class CultureDictionaryRecord
+    /// <param name="messageId">The message Id.</param>
+    /// <param name="translations">a list of translations.</param>
+    public CultureDictionaryRecord(string messageId, params string[] translations)
+        : this(messageId, null, translations)
     {
-        /// <summary>
-        /// Creates new instance of <see cref="CultureDictionaryRecord"/>.
-        /// </summary>
-        /// <param name="messageId">The message Id.</param>
-        /// <param name="translations">a list of translations.</param>
-        public CultureDictionaryRecord(string messageId, params string[] translations)
-            : this(messageId, null, translations)
-        {
 
-        }
+    }
+
+    /// <summary>
+    /// Creates new instance of <see cref="CultureDictionaryRecord"/>.
+    /// </summary>
+    /// <param name="messageId">The message Id.</param>
+    /// <param name="context">The message context.</param>
+    /// <param name="translations">a list of translations.</param>
+    public CultureDictionaryRecord(string messageId, string context, string[] translations)
+    {
+        Key = GetKey(messageId, context);
+        Translations = translations;
+    }
 
-        /// <summary>
-        /// Creates new instance of <see cref="CultureDictionaryRecord"/>.
-        /// </summary>
-        /// <param name="messageId">The message Id.</param>
-        /// <param name="context">The message context.</param>
-        /// <param name="translations">a list of translations.</param>
-        public CultureDictionaryRecord(string messageId, string context, string[] translations)
+    /// <summary>
+    /// Gets the resource key.
+    /// </summary>
+    public CultureDictionaryRecordKey Key { get; }
+
+    /// <summary>
+    /// Gets the translation values.
+    /// </summary>
+    public string[] Translations { get; }
+
+    /// <summary>
+    /// Retrieved the resource key using <paramref name="messageId"/> and <paramref name="context"/>.
+    /// </summary>
+    /// <param name="messageId">The message Id.</param>
+    /// <param name="context">The message context.</param>
+    /// <returns>The resource key.</returns>
+    public static CultureDictionaryRecordKey GetKey(string messageId, string context)
+    {
+        if (string.IsNullOrEmpty(messageId))
         {
-            Key = GetKey(messageId, context);
-            Translations = translations;
+            throw new ArgumentException("MessageId can't be empty.", nameof(messageId));
         }
 
-        /// <summary>
-        /// Gets the resource key.
-        /// </summary>
-        public CultureDictionaryRecordKey Key { get; }
-
-        /// <summary>
-        /// Gets the translation values.
-        /// </summary>
-        public string[] Translations { get; }
-
-        /// <summary>
-        /// Retrieved the resource key using <paramref name="messageId"/> and <paramref name="context"/>.
-        /// </summary>
-        /// <param name="messageId">The message Id.</param>
-        /// <param name="context">The message context.</param>
-        /// <returns>The resource key.</returns>
-        public static CultureDictionaryRecordKey GetKey(string messageId, string context)
+        return new CultureDictionaryRecordKey
         {
-            if (string.IsNullOrEmpty(messageId))
-            {
-                throw new ArgumentException("MessageId can't be empty.", nameof(messageId));
-            }
-
-            return new CultureDictionaryRecordKey
-            {
-                MessageId = messageId, Context = context
-            };
-        }
+            MessageId = messageId,
+            Context = context
+        };
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Abstractions/CultureDictionaryRecordKey.cs b/src/OrchardCore/OrchardCore.Localization.Abstractions/CultureDictionaryRecordKey.cs
index 557ba56b11f..7a938a1c3e8 100644
--- a/src/OrchardCore/OrchardCore.Localization.Abstractions/CultureDictionaryRecordKey.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Abstractions/CultureDictionaryRecordKey.cs
@@ -1,26 +1,25 @@
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents a key for <see cref="CultureDictionaryRecord"/>.
+/// </summary>
+public readonly record struct CultureDictionaryRecordKey
 {
     /// <summary>
-    /// Represents a key for <see cref="CultureDictionaryRecord"/>.
+    /// Gets the message Id.
     /// </summary>
-    public readonly record struct CultureDictionaryRecordKey
-    {
-        /// <summary>
-        /// Gets the message Id.
-        /// </summary>
-        public required string MessageId { get; init; }
+    public required string MessageId { get; init; }
 
-        /// <summary>
-        /// Gets the message context.
-        /// </summary>
-        public string Context { get; init; }
+    /// <summary>
+    /// Gets the message context.
+    /// </summary>
+    public string Context { get; init; }
 
-        public static implicit operator string(CultureDictionaryRecordKey cultureDictionaryRecordKey)
-            => cultureDictionaryRecordKey.ToString();
+    public static implicit operator string(CultureDictionaryRecordKey cultureDictionaryRecordKey)
+        => cultureDictionaryRecordKey.ToString();
 
-        public override string ToString()
-            => string.IsNullOrEmpty(Context)
-                ? MessageId
-                : $"{Context.ToLowerInvariant()}|{MessageId}";
-    }
+    public override string ToString()
+        => string.IsNullOrEmpty(Context)
+            ? MessageId
+            : $"{Context.ToLowerInvariant()}|{MessageId}";
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Abstractions/Extensions/HtmlLocalizerExtensions.cs b/src/OrchardCore/OrchardCore.Localization.Abstractions/Extensions/HtmlLocalizerExtensions.cs
index 37b1b404a46..596acee7cbf 100644
--- a/src/OrchardCore/OrchardCore.Localization.Abstractions/Extensions/HtmlLocalizerExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Abstractions/Extensions/HtmlLocalizerExtensions.cs
@@ -1,53 +1,52 @@
 using System;
 using OrchardCore.Localization;
 
-namespace Microsoft.AspNetCore.Mvc.Localization
+namespace Microsoft.AspNetCore.Mvc.Localization;
+
+/// <summary>
+/// Provides extension methods for <see cref="IHtmlLocalizer"/>.
+/// </summary>
+public static class HtmlLocalizerExtensions
 {
     /// <summary>
-    /// Provides extension methods for <see cref="IHtmlLocalizer"/>.
+    /// Gets the pluralization form.
     /// </summary>
-    public static class HtmlLocalizerExtensions
+    /// <param name="localizer">The <see cref="IHtmlLocalizer"/>.</param>
+    /// <param name="count">The number to be used for selecting the pluralization form.</param>
+    /// <param name="singular">The singular form key.</param>
+    /// <param name="plural">The plural form key.</param>
+    /// <param name="arguments">The parameters used in the key.</param>
+    public static LocalizedHtmlString Plural(this IHtmlLocalizer localizer, int count, string singular, string plural, params object[] arguments)
     {
-        /// <summary>
-        /// Gets the pluralization form.
-        /// </summary>
-        /// <param name="localizer">The <see cref="IHtmlLocalizer"/>.</param>
-        /// <param name="count">The number to be used for selecting the pluralization form.</param>
-        /// <param name="singular">The singular form key.</param>
-        /// <param name="plural">The plural form key.</param>
-        /// <param name="arguments">The parameters used in the key.</param>
-        public static LocalizedHtmlString Plural(this IHtmlLocalizer localizer, int count, string singular, string plural, params object[] arguments)
+        if (plural == null)
         {
-            if (plural == null)
-            {
-                throw new ArgumentNullException(nameof(plural), "Plural text can't be null. If you don't want to specify the plural text, use IStringLocalizer without Plural extension.");
-            }
-
-            return localizer[singular, new PluralizationArgument { Count = count, Forms = [singular, plural], Arguments = arguments }];
+            throw new ArgumentNullException(nameof(plural), "Plural text can't be null. If you don't want to specify the plural text, use IStringLocalizer without Plural extension.");
         }
 
-        /// <summary>
-        /// Gets the pluralization form.
-        /// </summary>
-        /// <param name="localizer">The <see cref="IHtmlLocalizer"/>.</param>
-        /// <param name="count">The number to be used for selecting the pluralization form.</param>
-        /// <param name="pluralForms">A list of pluralization forms.</param>
-        /// <param name="arguments">The parameters used in the key.</param>
-        public static LocalizedHtmlString Plural(this IHtmlLocalizer localizer, int count, string[] pluralForms, params object[] arguments)
+        return localizer[singular, new PluralizationArgument { Count = count, Forms = [singular, plural], Arguments = arguments }];
+    }
+
+    /// <summary>
+    /// Gets the pluralization form.
+    /// </summary>
+    /// <param name="localizer">The <see cref="IHtmlLocalizer"/>.</param>
+    /// <param name="count">The number to be used for selecting the pluralization form.</param>
+    /// <param name="pluralForms">A list of pluralization forms.</param>
+    /// <param name="arguments">The parameters used in the key.</param>
+    public static LocalizedHtmlString Plural(this IHtmlLocalizer localizer, int count, string[] pluralForms, params object[] arguments)
+    {
+        if (pluralForms == null)
         {
-            if (pluralForms == null)
-            {
-                throw new ArgumentNullException(nameof(pluralForms), "PluralForms array can't be null. If you don't want to specify the plural text, use IStringLocalizer without Plural extension.");
-            }
+            throw new ArgumentNullException(nameof(pluralForms), "PluralForms array can't be null. If you don't want to specify the plural text, use IStringLocalizer without Plural extension.");
+        }
 
-            if (pluralForms.Length == 0)
-            {
-                throw new ArgumentException("PluralForms array can't be empty, it must contain at least one element. If you don't want to specify the plural text, use IStringLocalizer without Plural extension.", nameof(pluralForms));
-            }
+        if (pluralForms.Length == 0)
+        {
+            throw new ArgumentException("PluralForms array can't be empty, it must contain at least one element. If you don't want to specify the plural text, use IStringLocalizer without Plural extension.", nameof(pluralForms));
+        }
 
-            var name = pluralForms[0];
+        var name = pluralForms[0];
 
-            return localizer[name, new PluralizationArgument { Count = count, Forms = pluralForms, Arguments = arguments }];
-        }
+        return localizer[name, new PluralizationArgument { Count = count, Forms = pluralForms, Arguments = arguments }];
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Abstractions/Extensions/StringLocalizerExtensions.cs b/src/OrchardCore/OrchardCore.Localization.Abstractions/Extensions/StringLocalizerExtensions.cs
index 3262404d92b..5ac57272c8c 100644
--- a/src/OrchardCore/OrchardCore.Localization.Abstractions/Extensions/StringLocalizerExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Abstractions/Extensions/StringLocalizerExtensions.cs
@@ -1,51 +1,50 @@
 using System;
 using OrchardCore.Localization;
 
-namespace Microsoft.Extensions.Localization
+namespace Microsoft.Extensions.Localization;
+
+/// <summary>
+/// Provides extension methods for <see cref="IStringLocalizer"/>.
+/// </summary>
+public static class StringLocalizerExtensions
 {
     /// <summary>
-    /// Provides extension methods for <see cref="IStringLocalizer"/>.
+    /// Gets the pluralization form.
     /// </summary>
-    public static class StringLocalizerExtensions
+    /// <param name="localizer">The <see cref="IStringLocalizer"/>.</param>
+    /// <param name="count">The number to be used for selecting the pluralization form.</param>
+    /// <param name="singular">The singular form key.</param>
+    /// <param name="plural">The plural form key.</param>
+    /// <param name="arguments">The parameters used in the key.</param>
+    public static LocalizedString Plural(this IStringLocalizer localizer, int count, string singular, string plural, params object[] arguments)
     {
-        /// <summary>
-        /// Gets the pluralization form.
-        /// </summary>
-        /// <param name="localizer">The <see cref="IStringLocalizer"/>.</param>
-        /// <param name="count">The number to be used for selecting the pluralization form.</param>
-        /// <param name="singular">The singular form key.</param>
-        /// <param name="plural">The plural form key.</param>
-        /// <param name="arguments">The parameters used in the key.</param>
-        public static LocalizedString Plural(this IStringLocalizer localizer, int count, string singular, string plural, params object[] arguments)
+        if (plural == null)
         {
-            if (plural == null)
-            {
-                throw new ArgumentNullException(nameof(plural), "Plural text can't be null. If you don't want to specify the plural text, use IStringLocalizer without Plural extension.");
-            }
-
-            return localizer[singular, new PluralizationArgument { Count = count, Forms = [singular, plural], Arguments = arguments }];
+            throw new ArgumentNullException(nameof(plural), "Plural text can't be null. If you don't want to specify the plural text, use IStringLocalizer without Plural extension.");
         }
 
-        /// <summary>
-        /// Gets the pluralization form.
-        /// </summary>
-        /// <param name="localizer">The <see cref="IStringLocalizer"/>.</param>
-        /// <param name="count">The number to be used for selecting the pluralization form.</param>
-        /// <param name="pluralForms">A list of pluralization forms.</param>
-        /// <param name="arguments">The parameters used in the key.</param>
-        public static LocalizedString Plural(this IStringLocalizer localizer, int count, string[] pluralForms, params object[] arguments)
-        {
-            if (pluralForms == null)
-            {
-                throw new ArgumentNullException(nameof(pluralForms), "PluralForms array can't be null. If you don't want to specify the plural text, use IStringLocalizer without Plural extension.");
-            }
+        return localizer[singular, new PluralizationArgument { Count = count, Forms = [singular, plural], Arguments = arguments }];
+    }
 
-            if (pluralForms.Length == 0)
-            {
-                throw new ArgumentException("PluralForms array can't be empty, it must contain at least one element. If you don't want to specify the plural text, use IStringLocalizer without Plural extension.", nameof(pluralForms));
-            }
+    /// <summary>
+    /// Gets the pluralization form.
+    /// </summary>
+    /// <param name="localizer">The <see cref="IStringLocalizer"/>.</param>
+    /// <param name="count">The number to be used for selecting the pluralization form.</param>
+    /// <param name="pluralForms">A list of pluralization forms.</param>
+    /// <param name="arguments">The parameters used in the key.</param>
+    public static LocalizedString Plural(this IStringLocalizer localizer, int count, string[] pluralForms, params object[] arguments)
+    {
+        if (pluralForms == null)
+        {
+            throw new ArgumentNullException(nameof(pluralForms), "PluralForms array can't be null. If you don't want to specify the plural text, use IStringLocalizer without Plural extension.");
+        }
 
-            return localizer[pluralForms[0], new PluralizationArgument { Count = count, Forms = pluralForms, Arguments = arguments }];
+        if (pluralForms.Length == 0)
+        {
+            throw new ArgumentException("PluralForms array can't be empty, it must contain at least one element. If you don't want to specify the plural text, use IStringLocalizer without Plural extension.", nameof(pluralForms));
         }
+
+        return localizer[pluralForms[0], new PluralizationArgument { Count = count, Forms = pluralForms, Arguments = arguments }];
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Abstractions/Extensions/ViewLocalizerExtensions.cs b/src/OrchardCore/OrchardCore.Localization.Abstractions/Extensions/ViewLocalizerExtensions.cs
index 0cf9e980dd7..72917e47abf 100644
--- a/src/OrchardCore/OrchardCore.Localization.Abstractions/Extensions/ViewLocalizerExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Abstractions/Extensions/ViewLocalizerExtensions.cs
@@ -1,52 +1,51 @@
 using System;
 using OrchardCore.Localization;
 
-namespace Microsoft.AspNetCore.Mvc.Localization
+namespace Microsoft.AspNetCore.Mvc.Localization;
+
+/// <summary>
+/// Provides extension methods for <see cref="IViewLocalizer"/>.
+/// </summary>
+public static class ViewLocalizerExtensions
 {
     /// <summary>
-    /// Provides extension methods for <see cref="IViewLocalizer"/>.
+    /// Gets the pluralization form.
     /// </summary>
-    public static class ViewLocalizerExtensions
+    /// <param name="localizer">The <see cref="IViewLocalizer"/>.</param>
+    /// <param name="count">The number to be used for selecting the pluralization form.</param>
+    /// <param name="singular">The singular form key.</param>
+    /// <param name="plural">The plural form key.</param>
+    /// <param name="arguments">The parameters used in the key.</param>
+    /// <returns></returns>
+    public static LocalizedHtmlString Plural(this IViewLocalizer localizer, int count, string singular, string plural, params object[] arguments)
     {
-        /// <summary>
-        /// Gets the pluralization form.
-        /// </summary>
-        /// <param name="localizer">The <see cref="IViewLocalizer"/>.</param>
-        /// <param name="count">The number to be used for selecting the pluralization form.</param>
-        /// <param name="singular">The singular form key.</param>
-        /// <param name="plural">The plural form key.</param>
-        /// <param name="arguments">The parameters used in the key.</param>
-        /// <returns></returns>
-        public static LocalizedHtmlString Plural(this IViewLocalizer localizer, int count, string singular, string plural, params object[] arguments)
+        if (plural == null)
         {
-            if (plural == null)
-            {
-                throw new ArgumentNullException(nameof(plural), "Plural text can't be null. If you don't want to specify the plural text, use IStringLocalizer without Plural extension.");
-            }
-
-            return localizer[singular, new PluralizationArgument { Count = count, Forms = [singular, plural], Arguments = arguments }];
+            throw new ArgumentNullException(nameof(plural), "Plural text can't be null. If you don't want to specify the plural text, use IStringLocalizer without Plural extension.");
         }
 
-        /// <summary>
-        /// Gets the pluralization form.
-        /// </summary>
-        /// <param name="localizer">The <see cref="IViewLocalizer"/>.</param>
-        /// <param name="count">The number to be used for selecting the pluralization form.</param>
-        /// <param name="pluralForms">A list of pluralization forms.</param>
-        /// <param name="arguments">The parameters used in the key.</param>
-        public static LocalizedHtmlString Plural(this IViewLocalizer localizer, int count, string[] pluralForms, params object[] arguments)
-        {
-            if (pluralForms == null)
-            {
-                throw new ArgumentNullException(nameof(pluralForms), "PluralForms array can't be null. If you don't want to specify the plural text, use IStringLocalizer without Plural extension.");
-            }
+        return localizer[singular, new PluralizationArgument { Count = count, Forms = [singular, plural], Arguments = arguments }];
+    }
 
-            if (pluralForms.Length == 0)
-            {
-                throw new ArgumentException("PluralForms array can't be empty, it must contain at least one element. If you don't want to specify the plural text, use IStringLocalizer without Plural extension.", nameof(pluralForms));
-            }
+    /// <summary>
+    /// Gets the pluralization form.
+    /// </summary>
+    /// <param name="localizer">The <see cref="IViewLocalizer"/>.</param>
+    /// <param name="count">The number to be used for selecting the pluralization form.</param>
+    /// <param name="pluralForms">A list of pluralization forms.</param>
+    /// <param name="arguments">The parameters used in the key.</param>
+    public static LocalizedHtmlString Plural(this IViewLocalizer localizer, int count, string[] pluralForms, params object[] arguments)
+    {
+        if (pluralForms == null)
+        {
+            throw new ArgumentNullException(nameof(pluralForms), "PluralForms array can't be null. If you don't want to specify the plural text, use IStringLocalizer without Plural extension.");
+        }
 
-            return localizer[pluralForms[0], new PluralizationArgument { Count = count, Forms = pluralForms, Arguments = arguments }];
+        if (pluralForms.Length == 0)
+        {
+            throw new ArgumentException("PluralForms array can't be empty, it must contain at least one element. If you don't want to specify the plural text, use IStringLocalizer without Plural extension.", nameof(pluralForms));
         }
+
+        return localizer[pluralForms[0], new PluralizationArgument { Count = count, Forms = pluralForms, Arguments = arguments }];
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Abstractions/ILocalizationFileLocationProvider.cs b/src/OrchardCore/OrchardCore.Localization.Abstractions/ILocalizationFileLocationProvider.cs
index 75fa29dcb84..a375892d4b4 100644
--- a/src/OrchardCore/OrchardCore.Localization.Abstractions/ILocalizationFileLocationProvider.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Abstractions/ILocalizationFileLocationProvider.cs
@@ -1,18 +1,17 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Contract that provides a location for the localization strings in the file system.
+/// </summary>
+public interface ILocalizationFileLocationProvider
 {
     /// <summary>
-    /// Contract that provides a location for the localization strings in the file system.
+    /// Gets the localization location for a specified culture.
     /// </summary>
-    public interface ILocalizationFileLocationProvider
-    {
-        /// <summary>
-        /// Gets the localization location for a specified culture.
-        /// </summary>
-        /// <param name="cultureName">The culture name.</param>
-        /// <returns>A list of localization files.</returns>
-        IEnumerable<IFileInfo> GetLocations(string cultureName);
-    }
+    /// <param name="cultureName">The culture name.</param>
+    /// <returns>A list of localization files.</returns>
+    IEnumerable<IFileInfo> GetLocations(string cultureName);
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Abstractions/ILocalizationManager.cs b/src/OrchardCore/OrchardCore.Localization.Abstractions/ILocalizationManager.cs
index eb960280761..fde185debd6 100644
--- a/src/OrchardCore/OrchardCore.Localization.Abstractions/ILocalizationManager.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Abstractions/ILocalizationManager.cs
@@ -1,17 +1,16 @@
 using System.Globalization;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Contract to manage the localization.
+/// </summary>
+public interface ILocalizationManager
 {
     /// <summary>
-    /// Contract to manage the localization.
+    /// Retrieves a dictionary for a specified culture.
     /// </summary>
-    public interface ILocalizationManager
-    {
-        /// <summary>
-        /// Retrieves a dictionary for a specified culture.
-        /// </summary>
-        /// <param name="culture">The <see cref="CultureInfo"/>.</param>
-        /// <returns>A <see cref="CultureDictionary"/> for the specified culture.</returns>
-        CultureDictionary GetDictionary(CultureInfo culture);
-    }
+    /// <param name="culture">The <see cref="CultureInfo"/>.</param>
+    /// <returns>A <see cref="CultureDictionary"/> for the specified culture.</returns>
+    CultureDictionary GetDictionary(CultureInfo culture);
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Abstractions/IPluralRuleProvider.cs b/src/OrchardCore/OrchardCore.Localization.Abstractions/IPluralRuleProvider.cs
index 57446254c64..0e49a63cabd 100644
--- a/src/OrchardCore/OrchardCore.Localization.Abstractions/IPluralRuleProvider.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Abstractions/IPluralRuleProvider.cs
@@ -1,25 +1,24 @@
 using System.Globalization;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Contract to provide a pluralization rule for cultures.
+/// </summary>
+public interface IPluralRuleProvider
 {
     /// <summary>
-    /// Contract to provide a pluralization rule for cultures.
+    /// Gets the order for <see cref="IPluralRuleProvider"/> implementation to be executed.
     /// </summary>
-    public interface IPluralRuleProvider
-    {
-        /// <summary>
-        /// Gets the order for <see cref="IPluralRuleProvider"/> implementation to be executed.
-        /// </summary>
-        /// <remarks>Set the <see cref="Order"/> to a negative value in order to get called before the default implementation, or a
-        /// positive value to be used as a fallback one.</remarks>
-        int Order { get; }
+    /// <remarks>Set the <see cref="Order"/> to a negative value in order to get called before the default implementation, or a
+    /// positive value to be used as a fallback one.</remarks>
+    int Order { get; }
 
-        /// <summary>
-        /// Gets a pluralization rule for the specified culture if there is one.
-        /// </summary>
-        /// <param name="culture">The culture.</param>
-        /// <param name="rule">The <see cref="PluralizationRuleDelegate"/>.</param>
-        /// <returns>A boolean value indicates whether the culture rule is retrieved?.</returns>
-        bool TryGetRule(CultureInfo culture, out PluralizationRuleDelegate rule);
-    }
+    /// <summary>
+    /// Gets a pluralization rule for the specified culture if there is one.
+    /// </summary>
+    /// <param name="culture">The culture.</param>
+    /// <param name="rule">The <see cref="PluralizationRuleDelegate"/>.</param>
+    /// <returns>A boolean value indicates whether the culture rule is retrieved?.</returns>
+    bool TryGetRule(CultureInfo culture, out PluralizationRuleDelegate rule);
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Abstractions/IPluralStringLocalizer.cs b/src/OrchardCore/OrchardCore.Localization.Abstractions/IPluralStringLocalizer.cs
index 0ab57486c0b..2fbdd4b4b31 100644
--- a/src/OrchardCore/OrchardCore.Localization.Abstractions/IPluralStringLocalizer.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Abstractions/IPluralStringLocalizer.cs
@@ -1,18 +1,17 @@
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Contract that extends <see cref="IStringLocalizer"/> to support pluralization.
+/// </summary>
+public interface IPluralStringLocalizer : IStringLocalizer
 {
     /// <summary>
-    /// Contract that extends <see cref="IStringLocalizer"/> to support pluralization.
+    /// Gets the localized strings.
     /// </summary>
-    public interface IPluralStringLocalizer : IStringLocalizer
-    {
-        /// <summary>
-        /// Gets the localized strings.
-        /// </summary>
-        /// <param name="name">The resource name.</param>
-        /// <param name="arguments">Optional parameters that can be used inside the resource key.</param>
-        /// <returns>A list of localized strings including the plural forms.</returns>
-        (LocalizedString, object[]) GetTranslation(string name, params object[] arguments);
-    }
+    /// <param name="name">The resource name.</param>
+    /// <param name="arguments">Optional parameters that can be used inside the resource key.</param>
+    /// <returns>A list of localized strings including the plural forms.</returns>
+    (LocalizedString, object[]) GetTranslation(string name, params object[] arguments);
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Abstractions/ITranslationProvider.cs b/src/OrchardCore/OrchardCore.Localization.Abstractions/ITranslationProvider.cs
index e25d92a35df..734c9f3e51b 100644
--- a/src/OrchardCore/OrchardCore.Localization.Abstractions/ITranslationProvider.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Abstractions/ITranslationProvider.cs
@@ -1,15 +1,14 @@
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Contract to provide a translations.
+/// </summary>
+public interface ITranslationProvider
 {
     /// <summary>
-    /// Contract to provide a translations.
+    /// Loads translations from a certain source for a specific culture.
     /// </summary>
-    public interface ITranslationProvider
-    {
-        /// <summary>
-        /// Loads translations from a certain source for a specific culture.
-        /// </summary>
-        /// <param name="cultureName">The culture name.</param>
-        /// <param name="dictionary">The <see cref="CultureDictionary"/> that will contains all loaded translations.</param>
-        void LoadTranslations(string cultureName, CultureDictionary dictionary);
-    }
+    /// <param name="cultureName">The culture name.</param>
+    /// <param name="dictionary">The <see cref="CultureDictionary"/> that will contains all loaded translations.</param>
+    void LoadTranslations(string cultureName, CultureDictionary dictionary);
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Abstractions/PluralForm.cs b/src/OrchardCore/OrchardCore.Localization.Abstractions/PluralForm.cs
index c6dbae04552..b1bbfcaa4ff 100644
--- a/src/OrchardCore/OrchardCore.Localization.Abstractions/PluralForm.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Abstractions/PluralForm.cs
@@ -1,49 +1,48 @@
 using System.Globalization;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents a pluralization form.
+/// </summary>
+public class PluralForm
 {
     /// <summary>
-    /// Represents a pluralization form.
+    /// Creates new instance of <see cref="PluralForm"/> with key and form.
     /// </summary>
-    public class PluralForm
+    /// <param name="key">The localized string.</param>
+    /// <param name="form">The plural form.</param>
+    public PluralForm(string key, int form)
+        : this(key, form, CultureInfo.CurrentUICulture)
     {
-        /// <summary>
-        /// Creates new instance of <see cref="PluralForm"/> with key and form.
-        /// </summary>
-        /// <param name="key">The localized string.</param>
-        /// <param name="form">The plural form.</param>
-        public PluralForm(string key, int form)
-            : this(key, form, CultureInfo.CurrentUICulture)
-        {
 
-        }
+    }
 
-        /// <summary>
-        /// Creates new instance of <see cref="PluralForm"/> with key, form and culture.
-        /// </summary>
-        /// <param name="key">The localized string.</param>
-        /// <param name="form">The plural form.</param>
-        /// <param name="culture">The <see cref="CultureInfo"/>.</param>
-        public PluralForm(string key, int form, CultureInfo culture)
-        {
-            Key = key;
-            Form = form;
-            Culture = culture;
-        }
+    /// <summary>
+    /// Creates new instance of <see cref="PluralForm"/> with key, form and culture.
+    /// </summary>
+    /// <param name="key">The localized string.</param>
+    /// <param name="form">The plural form.</param>
+    /// <param name="culture">The <see cref="CultureInfo"/>.</param>
+    public PluralForm(string key, int form, CultureInfo culture)
+    {
+        Key = key;
+        Form = form;
+        Culture = culture;
+    }
 
-        /// <summary>
-        /// The current UI culture.
-        /// </summary>
-        public CultureInfo Culture { get; }
+    /// <summary>
+    /// The current UI culture.
+    /// </summary>
+    public CultureInfo Culture { get; }
 
-        /// <summary>
-        /// Get the plural form.
-        /// </summary>
-        public int Form { get; }
+    /// <summary>
+    /// Get the plural form.
+    /// </summary>
+    public int Form { get; }
 
-        /// <summary>
-        /// Gets the localized string.
-        /// </summary>
-        public string Key { get; }
-    }
+    /// <summary>
+    /// Gets the localized string.
+    /// </summary>
+    public string Key { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Abstractions/PluralFormNotFoundException.cs b/src/OrchardCore/OrchardCore.Localization.Abstractions/PluralFormNotFoundException.cs
index 23705a52c28..a3788cf5167 100644
--- a/src/OrchardCore/OrchardCore.Localization.Abstractions/PluralFormNotFoundException.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Abstractions/PluralFormNotFoundException.cs
@@ -1,52 +1,51 @@
 using System;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents an exception that is thrown when a pluralization form is not found.
+/// </summary>
+public class PluralFormNotFoundException : Exception
 {
     /// <summary>
-    /// Represents an exception that is thrown when a pluralization form is not found.
+    /// Creates new instance of <see cref="PluralFormNotFoundException"/>.
+    /// </summary>
+    public PluralFormNotFoundException()
+    {
+
+    }
+
+    /// <summary>
+    /// Creates new instance of <see cref="PluralFormNotFoundException"/> with a message.
+    /// </summary>
+    /// <param name="message">The exception message.</param>
+    public PluralFormNotFoundException(string message) : base(message)
+    {
+
+    }
+
+    /// <summary>
+    /// Creates new instance of <see cref="PluralFormNotFoundException"/> with a message.
     /// </summary>
-    public class PluralFormNotFoundException : Exception
+    /// <param name="message">The exception message.</param>
+    /// <param name="form">The <see cref="PluralForm"/> that causes the exception.</param>
+    public PluralFormNotFoundException(string message, PluralForm form) : base(message)
     {
-        /// <summary>
-        /// Creates new instance of <see cref="PluralFormNotFoundException"/>.
-        /// </summary>
-        public PluralFormNotFoundException()
-        {
-
-        }
-
-        /// <summary>
-        /// Creates new instance of <see cref="PluralFormNotFoundException"/> with a message.
-        /// </summary>
-        /// <param name="message">The exception message.</param>
-        public PluralFormNotFoundException(string message) : base(message)
-        {
-
-        }
-
-        /// <summary>
-        /// Creates new instance of <see cref="PluralFormNotFoundException"/> with a message.
-        /// </summary>
-        /// <param name="message">The exception message.</param>
-        /// <param name="form">The <see cref="PluralForm"/> that causes the exception.</param>
-        public PluralFormNotFoundException(string message, PluralForm form) : base(message)
-        {
-            Form = form;
-        }
-
-        /// <summary>
-        /// Creates new instance of <see cref="PluralFormNotFoundException"/> with a message and inner exception.
-        /// </summary>
-        /// <param name="message">The exception message.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/>.</param>
-        public PluralFormNotFoundException(string message, Exception innerException) : base(message, innerException)
-        {
-
-        }
-
-        /// <summary>
-        /// Gets the pluralization form.
-        /// </summary>
-        public PluralForm Form { get; }
+        Form = form;
     }
+
+    /// <summary>
+    /// Creates new instance of <see cref="PluralFormNotFoundException"/> with a message and inner exception.
+    /// </summary>
+    /// <param name="message">The exception message.</param>
+    /// <param name="innerException">The inner <see cref="Exception"/>.</param>
+    public PluralFormNotFoundException(string message, Exception innerException) : base(message, innerException)
+    {
+
+    }
+
+    /// <summary>
+    /// Gets the pluralization form.
+    /// </summary>
+    public PluralForm Form { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Abstractions/PluralizationArgument.cs b/src/OrchardCore/OrchardCore.Localization.Abstractions/PluralizationArgument.cs
index edb4ce50e45..0a340532413 100644
--- a/src/OrchardCore/OrchardCore.Localization.Abstractions/PluralizationArgument.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Abstractions/PluralizationArgument.cs
@@ -1,23 +1,22 @@
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents a pluralization argument.
+/// </summary>
+public struct PluralizationArgument
 {
     /// <summary>
-    /// Represents a pluralization argument.
+    /// Gets or sets the number to be used for selecting the proper pluralization form.
     /// </summary>
-    public struct PluralizationArgument
-    {
-        /// <summary>
-        /// Gets or sets the number to be used for selecting the proper pluralization form.
-        /// </summary>
-        public int Count { get; set; }
+    public int Count { get; set; }
 
-        /// <summary>
-        /// Gets or sets the pluralization forms.
-        /// </summary>
-        public string[] Forms { get; set; }
+    /// <summary>
+    /// Gets or sets the pluralization forms.
+    /// </summary>
+    public string[] Forms { get; set; }
 
-        /// <summary>
-        /// Gets or sets the parameters that could be used in localization.
-        /// </summary>
-        public object[] Arguments { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the parameters that could be used in localization.
+    /// </summary>
+    public object[] Arguments { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Abstractions/PluralizationRuleDelegate.cs b/src/OrchardCore/OrchardCore.Localization.Abstractions/PluralizationRuleDelegate.cs
index 1aa6b542339..77666df433c 100644
--- a/src/OrchardCore/OrchardCore.Localization.Abstractions/PluralizationRuleDelegate.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Abstractions/PluralizationRuleDelegate.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Localization
-{
-    /// <summary>
-    /// Represents the method that will get the position of the pluralization form.
-    /// </summary>
-    /// <param name="count">The number used to specify the pluralization form.</param>
-    /// <returns>The pluralization rule position.</returns>
-    public delegate int PluralizationRuleDelegate(int count);
-}
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents the method that will get the position of the pluralization form.
+/// </summary>
+/// <param name="count">The number used to specify the pluralization form.</param>
+/// <returns>The pluralization rule position.</returns>
+public delegate int PluralizationRuleDelegate(int count);
diff --git a/src/OrchardCore/OrchardCore.Localization.Core/DataAnnotations/DataAnnotationsDefaultErrorMessages.cs b/src/OrchardCore/OrchardCore.Localization.Core/DataAnnotations/DataAnnotationsDefaultErrorMessages.cs
index d02ac89d02b..38815de96a5 100644
--- a/src/OrchardCore/OrchardCore.Localization.Core/DataAnnotations/DataAnnotationsDefaultErrorMessages.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Core/DataAnnotations/DataAnnotationsDefaultErrorMessages.cs
@@ -1,120 +1,119 @@
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Localization.DataAnnotations
+namespace OrchardCore.Localization.DataAnnotations;
+
+/// <summary>
+/// This is just a marker class to allow the POExtractor to extract the default error messages for data annotations attributes.
+/// </summary>
+internal sealed class DataAnnotationsDefaultErrorMessages
 {
-    /// <summary>
-    /// This is just a marker class to allow the POExtractor to extract the default error messages for data annotations attributes.
-    /// </summary>
-    internal sealed class DataAnnotationsDefaultErrorMessages
-    {
 #pragma warning disable IDE1006 // Naming Styles
 #pragma warning disable CS0649 // Field is never assigned to, and will always have its default value
-        private readonly IStringLocalizer S;
+    private readonly IStringLocalizer S;
 #pragma warning restore CS0649 // Field is never assigned to, and will always have its default value
 #pragma warning restore IDE1006 // Naming Styles
 
-        public string AssociatedMetadataTypeTypeDescriptorMetadataTypeContainsUnknownProperties => S["The associated metadata type for type '{0}' contains the following unknown properties or fields: {1}. Please make sure that the names of these members match the names of the properties on the main type."];
+    public string AssociatedMetadataTypeTypeDescriptorMetadataTypeContainsUnknownProperties => S["The associated metadata type for type '{0}' contains the following unknown properties or fields: {1}. Please make sure that the names of these members match the names of the properties on the main type."];
 
-        public string AttributeStoreUnknownProperty => S["The type '{0}' does not contain a public property named '{1}'."];
+    public string AttributeStoreUnknownProperty => S["The type '{0}' does not contain a public property named '{1}'."];
 
-        public string CommonPropertyNotFound => S["The property {0}.{1} could not be found."];
+    public string CommonPropertyNotFound => S["The property {0}.{1} could not be found."];
 
-        public string CompareAttributeMustMatch => S["'{0}' and '{1}' do not match."];
+    public string CompareAttributeMustMatch => S["'{0}' and '{1}' do not match."];
 
-        public string CompareAttributeUnknownProperty => S["Could not find a property named {0}."];
+    public string CompareAttributeUnknownProperty => S["Could not find a property named {0}."];
 
-        public string CreditCardAttributeInvalid => S["The {0} field is not a valid credit card number."];
+    public string CreditCardAttributeInvalid => S["The {0} field is not a valid credit card number."];
 
-        public string CustomValidationAttributeMethodMustReturnValidationResult => S["The CustomValidationAttribute method '{0}' in type '{1}' must return System.ComponentModel.DataAnnotations.ValidationResult.  Use System.ComponentModel.DataAnnotations.ValidationResult.Success to represent success."];
+    public string CustomValidationAttributeMethodMustReturnValidationResult => S["The CustomValidationAttribute method '{0}' in type '{1}' must return System.ComponentModel.DataAnnotations.ValidationResult.  Use System.ComponentModel.DataAnnotations.ValidationResult.Success to represent success."];
 
-        public string CustomValidationAttributeMethodNotFound => S["The CustomValidationAttribute method '{0}' does not exist in type '{1}' or is not public and static."];
+    public string CustomValidationAttributeMethodNotFound => S["The CustomValidationAttribute method '{0}' does not exist in type '{1}' or is not public and static."];
 
-        public string CustomValidationAttributeMethodRequired => S["The CustomValidationAttribute.Method was not specified."];
+    public string CustomValidationAttributeMethodRequired => S["The CustomValidationAttribute.Method was not specified."];
 
-        public string CustomValidationAttributeMethodSignature => S["The CustomValidationAttribute method '{0}' in type '{1}' must match the expected signature: public static ValidationResult {0}(object value, ValidationContext context). The value can be strongly typed. The ValidationContext parameter is optional."];
+    public string CustomValidationAttributeMethodSignature => S["The CustomValidationAttribute method '{0}' in type '{1}' must match the expected signature: public static ValidationResult {0}(object value, ValidationContext context). The value can be strongly typed. The ValidationContext parameter is optional."];
 
-        public string CustomValidationAttributeTypeConversionFailed => S["Could not convert the value of type '{0}' to '{1}' as expected by method {2}.{3}."];
+    public string CustomValidationAttributeTypeConversionFailed => S["Could not convert the value of type '{0}' to '{1}' as expected by method {2}.{3}."];
 
-        public string CustomValidationAttributeTypeMustBePublic => S["The custom validation type '{0}' must be public."];
+    public string CustomValidationAttributeTypeMustBePublic => S["The custom validation type '{0}' must be public."];
 
-        public string CustomValidationAttributeValidationError => S["{0} is not valid."];
+    public string CustomValidationAttributeValidationError => S["{0} is not valid."];
 
-        public string CustomValidationAttributeValidatorTypeRequired => S["The CustomValidationAttribute.ValidatorType was not specified."];
+    public string CustomValidationAttributeValidatorTypeRequired => S["The CustomValidationAttribute.ValidatorType was not specified."];
 
-        public string DataTypeAttributeEmptyDataTypeString => S["The custom DataType string cannot be null or empty."];
+    public string DataTypeAttributeEmptyDataTypeString => S["The custom DataType string cannot be null or empty."];
 
-        public string DisplayAttributePropertyNotSet => S["The {0} property has not been set.  Use the {1} method to get the value."];
+    public string DisplayAttributePropertyNotSet => S["The {0} property has not been set.  Use the {1} method to get the value."];
 
-        public string EmailAddressAttributeInvalid => S["The {0} field is not a valid e-mail address."];
+    public string EmailAddressAttributeInvalid => S["The {0} field is not a valid e-mail address."];
 
-        public string EnumDataTypeAttributeTypeCannotBeNull => S["The type provided for EnumDataTypeAttribute cannot be null."];
+    public string EnumDataTypeAttributeTypeCannotBeNull => S["The type provided for EnumDataTypeAttribute cannot be null."];
 
-        public string EnumDataTypeAttributeTypeNeedsToBeAnEnum => S["The type '{0}' needs to represent an enumeration type."];
+    public string EnumDataTypeAttributeTypeNeedsToBeAnEnum => S["The type '{0}' needs to represent an enumeration type."];
 
-        public string FileExtensionsAttributeInvalid => S["The {0} field only accepts files with the following extensions: {1}."];
+    public string FileExtensionsAttributeInvalid => S["The {0} field only accepts files with the following extensions: {1}."];
 
-        public string LocalizableStringLocalizationFailed => S["Cannot retrieve property '{0}' because localization failed.  Type '{1}' is not public or does not contain a public static string property with the name '{2}'."];
+    public string LocalizableStringLocalizationFailed => S["Cannot retrieve property '{0}' because localization failed.  Type '{1}' is not public or does not contain a public static string property with the name '{2}'."];
 
-        public string MaxLengthAttributeInvalidMaxLength => S["MaxLengthAttribute must have a Length value that is greater than zero. Use MaxLength() without parameters to indicate that the string or array can have the maximum allowable length."];
+    public string MaxLengthAttributeInvalidMaxLength => S["MaxLengthAttribute must have a Length value that is greater than zero. Use MaxLength() without parameters to indicate that the string or array can have the maximum allowable length."];
 
-        public string MaxLengthAttributeValidationError => S["The field {0} must be a string or array type with a maximum length of '{1}'."];
+    public string MaxLengthAttributeValidationError => S["The field {0} must be a string or array type with a maximum length of '{1}'."];
 
-        public string MetadataTypeAttributeTypeCannotBeNull => S["MetadataClassType cannot be null."];
+    public string MetadataTypeAttributeTypeCannotBeNull => S["MetadataClassType cannot be null."];
 
-        public string MinLengthAttributeInvalidMinLength => S["MinLengthAttribute must have a Length value that is zero or greater."];
+    public string MinLengthAttributeInvalidMinLength => S["MinLengthAttribute must have a Length value that is zero or greater."];
 
-        public string MinLengthAttributeValidationError => S["The field {0} must be a string or array type with a minimum length of '{1}'."];
+    public string MinLengthAttributeValidationError => S["The field {0} must be a string or array type with a minimum length of '{1}'."];
 
-        public string LengthAttributeInvalidValueType => S["The field of type {0} must be a string, array or ICollection type."];
+    public string LengthAttributeInvalidValueType => S["The field of type {0} must be a string, array or ICollection type."];
 
-        public string PhoneAttributeInvalid => S["The {0} field is not a valid phone number."];
+    public string PhoneAttributeInvalid => S["The {0} field is not a valid phone number."];
 
-        public string RangeAttributeArbitraryTypeNotIComparable => S["The type {0} must implement {1}."];
+    public string RangeAttributeArbitraryTypeNotIComparable => S["The type {0} must implement {1}."];
 
-        public string RangeAttributeMinGreaterThanMax => S["The maximum value '{0}' must be greater than or equal to the minimum value '{1}'."];
+    public string RangeAttributeMinGreaterThanMax => S["The maximum value '{0}' must be greater than or equal to the minimum value '{1}'."];
 
-        public string RangeAttributeMustSetMinAndMax => S["The minimum and maximum values must be set."];
+    public string RangeAttributeMustSetMinAndMax => S["The minimum and maximum values must be set."];
 
-        public string RangeAttributeMustSetOperandType => S["The OperandType must be set when strings are used for minimum and maximum values."];
+    public string RangeAttributeMustSetOperandType => S["The OperandType must be set when strings are used for minimum and maximum values."];
 
-        public string RangeAttributeValidationError => S["The field {0} must be between {1} and {2}."];
+    public string RangeAttributeValidationError => S["The field {0} must be between {1} and {2}."];
 
-        public string RegexAttributeValidationError => S["The field {0} must match the regular expression '{1}'."];
+    public string RegexAttributeValidationError => S["The field {0} must match the regular expression '{1}'."];
 
-        public string RegularExpressionAttributeEmptyPattern => S["The pattern must be set to a valid regular expression."];
+    public string RegularExpressionAttributeEmptyPattern => S["The pattern must be set to a valid regular expression."];
 
-        public string RequiredAttributeValidationError => S["The {0} field is required."];
+    public string RequiredAttributeValidationError => S["The {0} field is required."];
 
-        public string StringLengthAttributeInvalidMaxLength => S["The maximum length must be a nonnegative integer."];
+    public string StringLengthAttributeInvalidMaxLength => S["The maximum length must be a nonnegative integer."];
 
-        public string StringLengthAttributeValidationError => S["The field {0} must be a string with a maximum length of {1}."];
+    public string StringLengthAttributeValidationError => S["The field {0} must be a string with a maximum length of {1}."];
 
-        public string StringLengthAttributeValidationErrorIncludingMinimum => S["The field {0} must be a string with a minimum length of {2} and a maximum length of {1}."];
+    public string StringLengthAttributeValidationErrorIncludingMinimum => S["The field {0} must be a string with a minimum length of {2} and a maximum length of {1}."];
 
-        public string UIHintImplementationControlParameterKeyIsNotAString => S["The key parameter at position {0} with value '{1}' is not a string. Every key control parameter must be a string."];
+    public string UIHintImplementationControlParameterKeyIsNotAString => S["The key parameter at position {0} with value '{1}' is not a string. Every key control parameter must be a string."];
 
-        public string UIHintImplementationControlParameterKeyIsNull => S["The key parameter at position {0} is null. Every key control parameter must be a string."];
+    public string UIHintImplementationControlParameterKeyIsNull => S["The key parameter at position {0} is null. Every key control parameter must be a string."];
 
-        public string UIHintImplementationControlParameterKeyOccursMoreThanOnce => S["The key parameter at position {0} with value '{1}' occurs more than once."];
+    public string UIHintImplementationControlParameterKeyOccursMoreThanOnce => S["The key parameter at position {0} with value '{1}' occurs more than once."];
 
-        public string UIHintImplementationNeedEvenNumberOfControlParameters => S["The number of control parameters must be even."];
+    public string UIHintImplementationNeedEvenNumberOfControlParameters => S["The number of control parameters must be even."];
 
-        public string UrlAttributeInvalid => S["The {0} field is not a valid fully-qualified http, https, or ftp URL."];
+    public string UrlAttributeInvalid => S["The {0} field is not a valid fully-qualified http, https, or ftp URL."];
 
-        public string ValidationAttributeCannotSetErrorMessageAndResource => S["Either ErrorMessageString or ErrorMessageResourceName must be set, but not both."];
+    public string ValidationAttributeCannotSetErrorMessageAndResource => S["Either ErrorMessageString or ErrorMessageResourceName must be set, but not both."];
 
-        public string ValidationAttributeIsValidNotImplemented => S["IsValid(object value) has not been implemented by this class. The preferred entry point is GetValidationResult() and classes should override IsValid(object value, ValidationContext context)."];
+    public string ValidationAttributeIsValidNotImplemented => S["IsValid(object value) has not been implemented by this class. The preferred entry point is GetValidationResult() and classes should override IsValid(object value, ValidationContext context)."];
 
-        public string ValidationAttributeNeedBothResourceTypeAndResourceName => S["Both ErrorMessageResourceType and ErrorMessageResourceName need to be set on this attribute."];
+    public string ValidationAttributeNeedBothResourceTypeAndResourceName => S["Both ErrorMessageResourceType and ErrorMessageResourceName need to be set on this attribute."];
 
-        public string ValidationAttributeResourcePropertyNotStringType => S["The property '{0}' on resource type '{1}' is not a string type."];
+    public string ValidationAttributeResourcePropertyNotStringType => S["The property '{0}' on resource type '{1}' is not a string type."];
 
-        public string ValidationAttributeResourceTypeDoesNotHaveProperty => S["The resource type '{0}' does not have an accessible static property named '{1}'."];
+    public string ValidationAttributeResourceTypeDoesNotHaveProperty => S["The resource type '{0}' does not have an accessible static property named '{1}'."];
 
-        public string ValidationAttributeValidationError => S["The field {0} is invalid."];
+    public string ValidationAttributeValidationError => S["The field {0} is invalid."];
 
-        public string ValidatorInstanceMustMatchValidationContextInstance => S["The instance provided must match the ObjectInstance on the ValidationContext supplied."];
+    public string ValidatorInstanceMustMatchValidationContextInstance => S["The instance provided must match the ObjectInstance on the ValidationContext supplied."];
 
-        public string ValidatorPropertyValueWrongType => S["The value for property '{0}' must be of type '{1}'."];
-    }
+    public string ValidatorPropertyValueWrongType => S["The value for property '{0}' must be of type '{1}'."];
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Core/DataAnnotations/LocalizedDataAnnotationsMvcOptions.cs b/src/OrchardCore/OrchardCore.Localization.Core/DataAnnotations/LocalizedDataAnnotationsMvcOptions.cs
index ea5f0c1eac7..4f024f2a62f 100644
--- a/src/OrchardCore/OrchardCore.Localization.Core/DataAnnotations/LocalizedDataAnnotationsMvcOptions.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Core/DataAnnotations/LocalizedDataAnnotationsMvcOptions.cs
@@ -2,22 +2,21 @@
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Localization.DataAnnotations
+namespace OrchardCore.Localization.DataAnnotations;
+
+internal sealed class LocalizedDataAnnotationsMvcOptions : IConfigureOptions<MvcOptions>
 {
-    internal sealed class LocalizedDataAnnotationsMvcOptions : IConfigureOptions<MvcOptions>
-    {
-        private readonly IStringLocalizerFactory _stringLocalizerFactory;
+    private readonly IStringLocalizerFactory _stringLocalizerFactory;
 
-        public LocalizedDataAnnotationsMvcOptions(IStringLocalizerFactory stringLocalizerFactory)
-        {
-            _stringLocalizerFactory = stringLocalizerFactory;
-        }
+    public LocalizedDataAnnotationsMvcOptions(IStringLocalizerFactory stringLocalizerFactory)
+    {
+        _stringLocalizerFactory = stringLocalizerFactory;
+    }
 
-        public void Configure(MvcOptions options)
-        {
-            var localizer = _stringLocalizerFactory.Create(typeof(LocalizedDataAnnotationsMvcOptions));
+    public void Configure(MvcOptions options)
+    {
+        var localizer = _stringLocalizerFactory.Create(typeof(LocalizedDataAnnotationsMvcOptions));
 
-            options.ModelMetadataDetailsProviders.Add(new LocalizedValidationMetadataProvider(localizer));
-        }
+        options.ModelMetadataDetailsProviders.Add(new LocalizedValidationMetadataProvider(localizer));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Core/DataAnnotations/LocalizedValidationMetadataProvider.cs b/src/OrchardCore/OrchardCore.Localization.Core/DataAnnotations/LocalizedValidationMetadataProvider.cs
index aac783d2c8c..3bb40fabcb0 100644
--- a/src/OrchardCore/OrchardCore.Localization.Core/DataAnnotations/LocalizedValidationMetadataProvider.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Core/DataAnnotations/LocalizedValidationMetadataProvider.cs
@@ -3,54 +3,53 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Localization.DataAnnotations
+namespace OrchardCore.Localization.DataAnnotations;
+
+/// <summary>
+/// Provides a validation for a <see cref="DefaultModelMetadata"/>.
+/// </summary>
+public class LocalizedValidationMetadataProvider : IValidationMetadataProvider
 {
+    private readonly IStringLocalizer _stringLocalizer;
+
     /// <summary>
-    /// Provides a validation for a <see cref="DefaultModelMetadata"/>.
+    /// Initializes a new instance of a <see cref="LocalizedValidationMetadataProvider"/> with string localizer.
     /// </summary>
-    public class LocalizedValidationMetadataProvider : IValidationMetadataProvider
+    /// <param name="stringLocalizer">The <see cref="IStringLocalizer"/>.</param>
+    public LocalizedValidationMetadataProvider(IStringLocalizer stringLocalizer)
     {
-        private readonly IStringLocalizer _stringLocalizer;
-
-        /// <summary>
-        /// Initializes a new instance of a <see cref="LocalizedValidationMetadataProvider"/> with string localizer.
-        /// </summary>
-        /// <param name="stringLocalizer">The <see cref="IStringLocalizer"/>.</param>
-        public LocalizedValidationMetadataProvider(IStringLocalizer stringLocalizer)
-        {
-            _stringLocalizer = stringLocalizer;
-        }
+        _stringLocalizer = stringLocalizer;
+    }
 
-        /// <remarks>This will localize the default data annotations error message if it is exist, otherwise will try to look for a parameterized version.</remarks>
-        /// <example>
-        /// A property named 'UserName' that decorated with <see cref="RequiredAttribute"/> will be localized using
-        /// "The {0} field is required." and "The UserName field is required." error messages.
-        /// </example>
-        public void CreateValidationMetadata(ValidationMetadataProviderContext context)
+    /// <remarks>This will localize the default data annotations error message if it is exist, otherwise will try to look for a parameterized version.</remarks>
+    /// <example>
+    /// A property named 'UserName' that decorated with <see cref="RequiredAttribute"/> will be localized using
+    /// "The {0} field is required." and "The UserName field is required." error messages.
+    /// </example>
+    public void CreateValidationMetadata(ValidationMetadataProviderContext context)
+    {
+        foreach (var metadata in context.ValidationMetadata.ValidatorMetadata)
         {
-            foreach (var metadata in context.ValidationMetadata.ValidatorMetadata)
+            if (metadata is ValidationAttribute attribute)
             {
-                if (metadata is ValidationAttribute attribute)
-                {
-                    var displayName = context.Attributes.OfType<DisplayAttribute>().FirstOrDefault()?.Name;
-                    // Use DisplayName if present
-                    var argument = displayName ?? context.Key.Name;
-                    var errorMessageString = attribute.ErrorMessage == null && attribute.ErrorMessageResourceName == null
-                        ? attribute.FormatErrorMessage(argument)
-                        : attribute.ErrorMessage;
-
-                    // Localize the parameterized error message
-                    var localizedString = _stringLocalizer[errorMessageString];
+                var displayName = context.Attributes.OfType<DisplayAttribute>().FirstOrDefault()?.Name;
+                // Use DisplayName if present
+                var argument = displayName ?? context.Key.Name;
+                var errorMessageString = attribute.ErrorMessage == null && attribute.ErrorMessageResourceName == null
+                    ? attribute.FormatErrorMessage(argument)
+                    : attribute.ErrorMessage;
 
-                    if (localizedString == errorMessageString)
-                    {
-                        // Localize the unparameterized error message
-                        var unparameterizedErrorMessage = errorMessageString.Replace(argument, "{0}");
-                        localizedString = _stringLocalizer[unparameterizedErrorMessage];
-                    }
+                // Localize the parameterized error message
+                var localizedString = _stringLocalizer[errorMessageString];
 
-                    attribute.ErrorMessage = localizedString;
+                if (localizedString == errorMessageString)
+                {
+                    // Localize the unparameterized error message
+                    var unparameterizedErrorMessage = errorMessageString.Replace(argument, "{0}");
+                    localizedString = _stringLocalizer[unparameterizedErrorMessage];
                 }
+
+                attribute.ErrorMessage = localizedString;
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore.Localization.Core/DefaultPluralRuleProvider.cs b/src/OrchardCore/OrchardCore.Localization.Core/DefaultPluralRuleProvider.cs
index 74c022dabdd..f5001b09776 100644
--- a/src/OrchardCore/OrchardCore.Localization.Core/DefaultPluralRuleProvider.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Core/DefaultPluralRuleProvider.cs
@@ -1,74 +1,73 @@
 using System.Collections.Generic;
 using System.Globalization;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Provides pluralization rules based on the Unicode Common Locale Data Repository.
+/// c.f. http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html
+/// c.f. https://github.com/unicode-org/cldr/blob/master/common/supplemental/plurals.xml.
+/// </summary>
+public class DefaultPluralRuleProvider : IPluralRuleProvider
 {
-    /// <summary>
-    /// Provides pluralization rules based on the Unicode Common Locale Data Repository.
-    /// c.f. http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html
-    /// c.f. https://github.com/unicode-org/cldr/blob/master/common/supplemental/plurals.xml.
-    /// </summary>
-    public class DefaultPluralRuleProvider : IPluralRuleProvider
-    {
-        private readonly static Dictionary<string, PluralizationRuleDelegate> _rules;
+    private readonly static Dictionary<string, PluralizationRuleDelegate> _rules;
 
-        static DefaultPluralRuleProvider()
-        {
-            _rules = [];
+    static DefaultPluralRuleProvider()
+    {
+        _rules = [];
 
-            AddRule(["ay", "bo", "cgg", "dz", "fa", "id", "ja", "jbo", "ka", "kk", "km", "ko", "ky", "lo", "ms", "my", "sah", "su", "th", "tt", "ug", "vi", "wo", "zh"], n => 0);
-            AddRule(["ach", "ak", "am", "arn", "br", "fil", "fr", "gun", "ln", "mfe", "mg", "mi", "oc", "pt-BR", "tg", "ti", "tr", "uz", "wa"], n => (n > 1 ? 1 : 0));
-            AddRule(["af", "an", "anp", "as", "ast", "az", "bg", "bn", "brx", "ca", "da", "de", "doi", "el", "en", "eo", "es", "es-AR", "et", "eu", "ff", "fi", "fo", "fur", "fy", "gl", "gu", "ha", "he", "hi", "hne", "hu", "hy", "ia", "it", "kl", "kn", "ku", "lb", "mai", "ml", "mn", "mni", "mr", "nah", "nap", "nb", "ne", "nl", "nn", "no", "nso", "or", "pa", "pap", "pms", "ps", "pt", "rm", "rw", "sat", "sco", "sd", "se", "si", "so", "son", "sq", "sv", "sw", "ta", "te", "tk", "ur", "yo"], n => (n != 1 ? 1 : 0));
-            AddRule(["is"], n => (n % 10 != 1 || n % 100 == 11 ? 1 : 0));
-            AddRule(["jv"], n => (n != 0 ? 1 : 0));
-            AddRule(["mk"], n => (n == 1 || n % 10 == 1 ? 0 : 1));
-            AddRule(["be", "bs", "hr", "lt"], n => (n % 10 == 1 && n % 100 != 11 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2));
-            AddRule(["cs"], n => ((n == 1) ? 0 : (n >= 2 && n <= 4) ? 1 : 2));
-            AddRule(["csb", "pl"], n => ((n == 1) ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2));
-            AddRule(["lv"], n => (n % 10 == 1 && n % 100 != 11 ? 0 : n != 0 ? 1 : 2));
-            AddRule(["mnk"], n => (n == 0 ? 0 : n == 1 ? 1 : 2));
-            AddRule(["ro"], n => (n == 1 ? 0 : (n == 0 || (n % 100 > 0 && n % 100 < 20)) ? 1 : 2));
-            AddRule(["cy"], n => ((n == 1) ? 0 : (n == 2) ? 1 : (n != 8 && n != 11) ? 2 : 3));
-            AddRule(["gd"], n => ((n == 1 || n == 11) ? 0 : (n == 2 || n == 12) ? 1 : (n > 2 && n < 20) ? 2 : 3));
-            AddRule(["kw"], n => ((n == 1) ? 0 : (n == 2) ? 1 : (n == 3) ? 2 : 3));
-            AddRule(["mt"], n => (n == 1 ? 0 : n == 0 || (n % 100 > 1 && n % 100 < 11) ? 1 : (n % 100 > 10 && n % 100 < 20) ? 2 : 3));
-            AddRule(["sl"], n => (n % 100 == 1 ? 1 : n % 100 == 2 ? 2 : n % 100 == 3 || n % 100 == 4 ? 3 : 0));
-            AddRule(["ru", "sr", "uk"], n => (n % 10 == 1 && n % 100 != 11 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2));
-            AddRule(["sk"], n => ((n == 1) ? 0 : (n >= 2 && n <= 4) ? 1 : 2));
-            AddRule(["ga"], n => (n == 1 ? 0 : n == 2 ? 1 : (n > 2 && n < 7) ? 2 : (n > 6 && n < 11) ? 3 : 4));
-            AddRule(["ar"], n => (n == 0 ? 0 : n == 1 ? 1 : n == 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5));
-        }
+        AddRule(["ay", "bo", "cgg", "dz", "fa", "id", "ja", "jbo", "ka", "kk", "km", "ko", "ky", "lo", "ms", "my", "sah", "su", "th", "tt", "ug", "vi", "wo", "zh"], n => 0);
+        AddRule(["ach", "ak", "am", "arn", "br", "fil", "fr", "gun", "ln", "mfe", "mg", "mi", "oc", "pt-BR", "tg", "ti", "tr", "uz", "wa"], n => (n > 1 ? 1 : 0));
+        AddRule(["af", "an", "anp", "as", "ast", "az", "bg", "bn", "brx", "ca", "da", "de", "doi", "el", "en", "eo", "es", "es-AR", "et", "eu", "ff", "fi", "fo", "fur", "fy", "gl", "gu", "ha", "he", "hi", "hne", "hu", "hy", "ia", "it", "kl", "kn", "ku", "lb", "mai", "ml", "mn", "mni", "mr", "nah", "nap", "nb", "ne", "nl", "nn", "no", "nso", "or", "pa", "pap", "pms", "ps", "pt", "rm", "rw", "sat", "sco", "sd", "se", "si", "so", "son", "sq", "sv", "sw", "ta", "te", "tk", "ur", "yo"], n => (n != 1 ? 1 : 0));
+        AddRule(["is"], n => (n % 10 != 1 || n % 100 == 11 ? 1 : 0));
+        AddRule(["jv"], n => (n != 0 ? 1 : 0));
+        AddRule(["mk"], n => (n == 1 || n % 10 == 1 ? 0 : 1));
+        AddRule(["be", "bs", "hr", "lt"], n => (n % 10 == 1 && n % 100 != 11 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2));
+        AddRule(["cs"], n => ((n == 1) ? 0 : (n >= 2 && n <= 4) ? 1 : 2));
+        AddRule(["csb", "pl"], n => ((n == 1) ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2));
+        AddRule(["lv"], n => (n % 10 == 1 && n % 100 != 11 ? 0 : n != 0 ? 1 : 2));
+        AddRule(["mnk"], n => (n == 0 ? 0 : n == 1 ? 1 : 2));
+        AddRule(["ro"], n => (n == 1 ? 0 : (n == 0 || (n % 100 > 0 && n % 100 < 20)) ? 1 : 2));
+        AddRule(["cy"], n => ((n == 1) ? 0 : (n == 2) ? 1 : (n != 8 && n != 11) ? 2 : 3));
+        AddRule(["gd"], n => ((n == 1 || n == 11) ? 0 : (n == 2 || n == 12) ? 1 : (n > 2 && n < 20) ? 2 : 3));
+        AddRule(["kw"], n => ((n == 1) ? 0 : (n == 2) ? 1 : (n == 3) ? 2 : 3));
+        AddRule(["mt"], n => (n == 1 ? 0 : n == 0 || (n % 100 > 1 && n % 100 < 11) ? 1 : (n % 100 > 10 && n % 100 < 20) ? 2 : 3));
+        AddRule(["sl"], n => (n % 100 == 1 ? 1 : n % 100 == 2 ? 2 : n % 100 == 3 || n % 100 == 4 ? 3 : 0));
+        AddRule(["ru", "sr", "uk"], n => (n % 10 == 1 && n % 100 != 11 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2));
+        AddRule(["sk"], n => ((n == 1) ? 0 : (n >= 2 && n <= 4) ? 1 : 2));
+        AddRule(["ga"], n => (n == 1 ? 0 : n == 2 ? 1 : (n > 2 && n < 7) ? 2 : (n > 6 && n < 11) ? 3 : 4));
+        AddRule(["ar"], n => (n == 0 ? 0 : n == 1 ? 1 : n == 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5));
+    }
 
-        /// <inheritdocs />
-        public int Order => 0;
+    /// <inheritdocs />
+    public int Order => 0;
 
-        /// <inheritdocs />
-        public bool TryGetRule(CultureInfo culture, out PluralizationRuleDelegate rule)
-        {
-            var cultureForPlural = GetBaseCulture(culture);
+    /// <inheritdocs />
+    public bool TryGetRule(CultureInfo culture, out PluralizationRuleDelegate rule)
+    {
+        var cultureForPlural = GetBaseCulture(culture);
 
-            return _rules.TryGetValue(cultureForPlural.Name, out rule);
-        }
+        return _rules.TryGetValue(cultureForPlural.Name, out rule);
+    }
 
-        private static void AddRule(string[] cultures, PluralizationRuleDelegate rule)
+    private static void AddRule(string[] cultures, PluralizationRuleDelegate rule)
+    {
+        foreach (var culture in cultures)
         {
-            foreach (var culture in cultures)
-            {
-                _rules.Add(culture, rule);
-            }
+            _rules.Add(culture, rule);
         }
+    }
 
-        /// <example>zh-Hans-CN -> zh-Hans -> zh.</example>
-        private static CultureInfo GetBaseCulture(CultureInfo culture)
-        {
-            var returnCulture = culture;
-
-            while (returnCulture.Parent.Name != "") // Stop at Invariant culture
-            {
-                returnCulture = returnCulture.Parent;
-            }
+    /// <example>zh-Hans-CN -> zh-Hans -> zh.</example>
+    private static CultureInfo GetBaseCulture(CultureInfo culture)
+    {
+        var returnCulture = culture;
 
-            return returnCulture;
+        while (returnCulture.Parent.Name != "") // Stop at Invariant culture
+        {
+            returnCulture = returnCulture.Parent;
         }
+
+        return returnCulture;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Core/Extensions/LocalizationServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Localization.Core/Extensions/LocalizationServiceCollectionExtensions.cs
index 8604b7f291d..8a07062c51f 100644
--- a/src/OrchardCore/OrchardCore.Localization.Core/Extensions/LocalizationServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Core/Extensions/LocalizationServiceCollectionExtensions.cs
@@ -8,56 +8,55 @@
 using OrchardCore.Localization.DataAnnotations;
 using OrchardCore.Localization.PortableObject;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+/// <summary>
+/// Provides extension methods for <see cref="IServiceCollection"/>.
+/// </summary>
+public static class LocalizationServiceCollectionExtensions
 {
     /// <summary>
-    /// Provides extension methods for <see cref="IServiceCollection"/>.
+    /// Registers the services to enable localization using Portable Object files.
     /// </summary>
-    public static class LocalizationServiceCollectionExtensions
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    public static IServiceCollection AddPortableObjectLocalization(this IServiceCollection services)
     {
-        /// <summary>
-        /// Registers the services to enable localization using Portable Object files.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        public static IServiceCollection AddPortableObjectLocalization(this IServiceCollection services)
-        {
-            return AddPortableObjectLocalization(services, null);
-        }
+        return AddPortableObjectLocalization(services, null);
+    }
+
+    /// <summary>
+    /// Registers the services to enable localization using Portable Object files.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="setupAction">An action to configure the Microsoft.Extensions.Localization.LocalizationOptions.</param>
+    public static IServiceCollection AddPortableObjectLocalization(this IServiceCollection services, Action<LocalizationOptions> setupAction)
+    {
+        services.AddSingleton<IPluralRuleProvider, DefaultPluralRuleProvider>();
+        services.AddSingleton<ITranslationProvider, PoFilesTranslationsProvider>();
+        services.AddSingleton<ILocalizationFileLocationProvider, ContentRootPoFileLocationProvider>();
+        services.AddSingleton<ILocalizationManager, LocalizationManager>();
+        services.AddSingleton<IStringLocalizerFactory, PortableObjectStringLocalizerFactory>();
+        services.AddSingleton<IHtmlLocalizerFactory, PortableObjectHtmlLocalizerFactory>();
+        services.TryAddTransient(typeof(IStringLocalizer<>), typeof(StringLocalizer<>));
 
-        /// <summary>
-        /// Registers the services to enable localization using Portable Object files.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="setupAction">An action to configure the Microsoft.Extensions.Localization.LocalizationOptions.</param>
-        public static IServiceCollection AddPortableObjectLocalization(this IServiceCollection services, Action<LocalizationOptions> setupAction)
+        if (setupAction != null)
         {
-            services.AddSingleton<IPluralRuleProvider, DefaultPluralRuleProvider>();
-            services.AddSingleton<ITranslationProvider, PoFilesTranslationsProvider>();
-            services.AddSingleton<ILocalizationFileLocationProvider, ContentRootPoFileLocationProvider>();
-            services.AddSingleton<ILocalizationManager, LocalizationManager>();
-            services.AddSingleton<IStringLocalizerFactory, PortableObjectStringLocalizerFactory>();
-            services.AddSingleton<IHtmlLocalizerFactory, PortableObjectHtmlLocalizerFactory>();
-            services.TryAddTransient(typeof(IStringLocalizer<>), typeof(StringLocalizer<>));
-
-            if (setupAction != null)
-            {
-                services.Configure(setupAction);
-            }
-
-            return services;
+            services.Configure(setupAction);
         }
 
-        /// <summary>
-        /// Localize data annotations attributes from portable object files.  
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        public static IServiceCollection AddDataAnnotationsPortableObjectLocalization(this IServiceCollection services)
-        {
-            ArgumentNullException.ThrowIfNull(services);
+        return services;
+    }
 
-            services.AddSingleton<IConfigureOptions<MvcOptions>, LocalizedDataAnnotationsMvcOptions>();
+    /// <summary>
+    /// Localize data annotations attributes from portable object files.  
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    public static IServiceCollection AddDataAnnotationsPortableObjectLocalization(this IServiceCollection services)
+    {
+        ArgumentNullException.ThrowIfNull(services);
 
-            return services;
-        }
+        services.AddSingleton<IConfigureOptions<MvcOptions>, LocalizedDataAnnotationsMvcOptions>();
+
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Core/LocalizationManager.cs b/src/OrchardCore/OrchardCore.Localization.Core/LocalizationManager.cs
index 828b9d5848c..b7104f93c8e 100644
--- a/src/OrchardCore/OrchardCore.Localization.Core/LocalizationManager.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Core/LocalizationManager.cs
@@ -5,62 +5,61 @@
 using System.Threading;
 using Microsoft.Extensions.Caching.Memory;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents a manager that manage the localization resources.
+/// </summary>
+public class LocalizationManager : ILocalizationManager
 {
+    private const string CacheKeyPrefix = "CultureDictionary-";
+
+    private static readonly PluralizationRuleDelegate _defaultPluralRule = n => (n != 1 ? 1 : 0);
+
+    private readonly IList<IPluralRuleProvider> _pluralRuleProviders;
+    private readonly IEnumerable<ITranslationProvider> _translationProviders;
+    private readonly IMemoryCache _cache;
+
     /// <summary>
-    /// Represents a manager that manage the localization resources.
+    /// Creates a new instance of <see cref="LocalizationManager"/>.
     /// </summary>
-    public class LocalizationManager : ILocalizationManager
+    /// <param name="pluralRuleProviders">A list of <see cref="IPluralRuleProvider"/>s.</param>
+    /// <param name="translationProviders">The list of available <see cref="ITranslationProvider"/>.</param>
+    /// <param name="cache">The <see cref="IMemoryCache"/>.</param>
+    public LocalizationManager(
+        IEnumerable<IPluralRuleProvider> pluralRuleProviders,
+        IEnumerable<ITranslationProvider> translationProviders,
+        IMemoryCache cache)
     {
-        private const string CacheKeyPrefix = "CultureDictionary-";
-
-        private static readonly PluralizationRuleDelegate _defaultPluralRule = n => (n != 1 ? 1 : 0);
-
-        private readonly IList<IPluralRuleProvider> _pluralRuleProviders;
-        private readonly IEnumerable<ITranslationProvider> _translationProviders;
-        private readonly IMemoryCache _cache;
+        _pluralRuleProviders = pluralRuleProviders.OrderBy(o => o.Order).ToArray();
+        _translationProviders = translationProviders;
+        _cache = cache;
+    }
 
-        /// <summary>
-        /// Creates a new instance of <see cref="LocalizationManager"/>.
-        /// </summary>
-        /// <param name="pluralRuleProviders">A list of <see cref="IPluralRuleProvider"/>s.</param>
-        /// <param name="translationProviders">The list of available <see cref="ITranslationProvider"/>.</param>
-        /// <param name="cache">The <see cref="IMemoryCache"/>.</param>
-        public LocalizationManager(
-            IEnumerable<IPluralRuleProvider> pluralRuleProviders,
-            IEnumerable<ITranslationProvider> translationProviders,
-            IMemoryCache cache)
+    /// <inheritdoc />
+    public CultureDictionary GetDictionary(CultureInfo culture)
+    {
+        var cachedDictionary = _cache.GetOrCreate(CacheKeyPrefix + culture.Name, k => new Lazy<CultureDictionary>(() =>
         {
-            _pluralRuleProviders = pluralRuleProviders.OrderBy(o => o.Order).ToArray();
-            _translationProviders = translationProviders;
-            _cache = cache;
-        }
+            var rule = _defaultPluralRule;
 
-        /// <inheritdoc />
-        public CultureDictionary GetDictionary(CultureInfo culture)
-        {
-            var cachedDictionary = _cache.GetOrCreate(CacheKeyPrefix + culture.Name, k => new Lazy<CultureDictionary>(() =>
+            foreach (var provider in _pluralRuleProviders)
             {
-                var rule = _defaultPluralRule;
-
-                foreach (var provider in _pluralRuleProviders)
+                if (provider.TryGetRule(culture, out rule))
                 {
-                    if (provider.TryGetRule(culture, out rule))
-                    {
-                        break;
-                    }
+                    break;
                 }
+            }
 
-                var dictionary = new CultureDictionary(culture.Name, rule ?? _defaultPluralRule);
-                foreach (var translationProvider in _translationProviders)
-                {
-                    translationProvider.LoadTranslations(culture.Name, dictionary);
-                }
+            var dictionary = new CultureDictionary(culture.Name, rule ?? _defaultPluralRule);
+            foreach (var translationProvider in _translationProviders)
+            {
+                translationProvider.LoadTranslations(culture.Name, dictionary);
+            }
 
-                return dictionary;
-            }, LazyThreadSafetyMode.ExecutionAndPublication));
+            return dictionary;
+        }, LazyThreadSafetyMode.ExecutionAndPublication));
 
-            return cachedDictionary.Value;
-        }
+        return cachedDictionary.Value;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/ContentRootPoFileLocationProvider.cs b/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/ContentRootPoFileLocationProvider.cs
index 12fde4e920c..c6379fc6c6d 100644
--- a/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/ContentRootPoFileLocationProvider.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/ContentRootPoFileLocationProvider.cs
@@ -5,31 +5,30 @@
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Localization.PortableObject
+namespace OrchardCore.Localization.PortableObject;
+
+/// <summary>
+/// provides a localization files from the content root folder.
+/// </summary>
+public class ContentRootPoFileLocationProvider : ILocalizationFileLocationProvider
 {
+    private readonly IFileProvider _fileProvider;
+    private readonly string _resourcesContainer;
+
     /// <summary>
-    /// provides a localization files from the content root folder.
+    /// Creates a new instance of <see cref="ContentRootPoFileLocationProvider"/>.
     /// </summary>
-    public class ContentRootPoFileLocationProvider : ILocalizationFileLocationProvider
+    /// <param name="hostingEnvironment">The <see cref="IHostEnvironment"/>.</param>
+    /// <param name="localizationOptions">The <see cref="LocalizationOptions"/>.</param>
+    public ContentRootPoFileLocationProvider(IHostEnvironment hostingEnvironment, IOptions<LocalizationOptions> localizationOptions)
     {
-        private readonly IFileProvider _fileProvider;
-        private readonly string _resourcesContainer;
-
-        /// <summary>
-        /// Creates a new instance of <see cref="ContentRootPoFileLocationProvider"/>.
-        /// </summary>
-        /// <param name="hostingEnvironment">The <see cref="IHostEnvironment"/>.</param>
-        /// <param name="localizationOptions">The <see cref="LocalizationOptions"/>.</param>
-        public ContentRootPoFileLocationProvider(IHostEnvironment hostingEnvironment, IOptions<LocalizationOptions> localizationOptions)
-        {
-            _fileProvider = hostingEnvironment.ContentRootFileProvider;
-            _resourcesContainer = localizationOptions.Value.ResourcesPath;
-        }
+        _fileProvider = hostingEnvironment.ContentRootFileProvider;
+        _resourcesContainer = localizationOptions.Value.ResourcesPath;
+    }
 
-        /// <inheritdocs />
-        public IEnumerable<IFileInfo> GetLocations(string cultureName)
-        {
-            yield return _fileProvider.GetFileInfo(Path.Combine(_resourcesContainer, cultureName + ".po"));
-        }
+    /// <inheritdocs />
+    public IEnumerable<IFileInfo> GetLocations(string cultureName)
+    {
+        yield return _fileProvider.GetFileInfo(Path.Combine(_resourcesContainer, cultureName + ".po"));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PoFilesTranslationsProvider.cs b/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PoFilesTranslationsProvider.cs
index 4c49f5f8116..60c25e19cc4 100644
--- a/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PoFilesTranslationsProvider.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PoFilesTranslationsProvider.cs
@@ -1,43 +1,42 @@
 using System.IO;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.Localization.PortableObject
+namespace OrchardCore.Localization.PortableObject;
+
+/// <summary>
+/// Represents a provider that provides a translations for .po files.
+/// </summary>
+public class PoFilesTranslationsProvider : ITranslationProvider
 {
+    private readonly ILocalizationFileLocationProvider _poFilesLocationProvider;
+    private readonly PoParser _parser;
+
     /// <summary>
-    /// Represents a provider that provides a translations for .po files.
+    /// Creates a new instance of <see cref="PoFilesTranslationsProvider"/>.
     /// </summary>
-    public class PoFilesTranslationsProvider : ITranslationProvider
+    /// <param name="poFileLocationProvider">The <see cref="ILocalizationFileLocationProvider"/>.</param>
+    public PoFilesTranslationsProvider(ILocalizationFileLocationProvider poFileLocationProvider)
     {
-        private readonly ILocalizationFileLocationProvider _poFilesLocationProvider;
-        private readonly PoParser _parser;
-
-        /// <summary>
-        /// Creates a new instance of <see cref="PoFilesTranslationsProvider"/>.
-        /// </summary>
-        /// <param name="poFileLocationProvider">The <see cref="ILocalizationFileLocationProvider"/>.</param>
-        public PoFilesTranslationsProvider(ILocalizationFileLocationProvider poFileLocationProvider)
-        {
-            _poFilesLocationProvider = poFileLocationProvider;
-            _parser = new PoParser();
-        }
+        _poFilesLocationProvider = poFileLocationProvider;
+        _parser = new PoParser();
+    }
 
-        /// <inheritdocs />
-        public void LoadTranslations(string cultureName, CultureDictionary dictionary)
+    /// <inheritdocs />
+    public void LoadTranslations(string cultureName, CultureDictionary dictionary)
+    {
+        foreach (var fileInfo in _poFilesLocationProvider.GetLocations(cultureName))
         {
-            foreach (var fileInfo in _poFilesLocationProvider.GetLocations(cultureName))
-            {
-                LoadFileToDictionary(fileInfo, dictionary);
-            }
+            LoadFileToDictionary(fileInfo, dictionary);
         }
+    }
 
-        private void LoadFileToDictionary(IFileInfo fileInfo, CultureDictionary dictionary)
+    private void LoadFileToDictionary(IFileInfo fileInfo, CultureDictionary dictionary)
+    {
+        if (fileInfo.Exists && !fileInfo.IsDirectory)
         {
-            if (fileInfo.Exists && !fileInfo.IsDirectory)
-            {
-                using var stream = fileInfo.CreateReadStream();
-                using var reader = new StreamReader(stream);
-                dictionary.MergeTranslations(_parser.Parse(reader));
-            }
+            using var stream = fileInfo.CreateReadStream();
+            using var reader = new StreamReader(stream);
+            dictionary.MergeTranslations(_parser.Parse(reader));
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PoParser.cs b/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PoParser.cs
index a6b672307f2..e1e73597f31 100644
--- a/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PoParser.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PoParser.cs
@@ -6,226 +6,225 @@
 using System.Text;
 using Cysharp.Text;
 
-namespace OrchardCore.Localization.PortableObject
+namespace OrchardCore.Localization.PortableObject;
+
+/// <summary>
+/// Represents a parser for portable objects.
+/// </summary>
+public class PoParser
 {
-    /// <summary>
-    /// Represents a parser for portable objects.
-    /// </summary>
-    public class PoParser
-    {
-        private static readonly FrozenDictionary<char, char> _escapeTranslations;
+    private static readonly FrozenDictionary<char, char> _escapeTranslations;
 
-        static PoParser()
+    static PoParser()
+    {
+        _escapeTranslations = new Dictionary<char, char>()
         {
-            _escapeTranslations = new Dictionary<char, char>()
-            {
-                { 'n', '\n' },
-                { 'r', '\r' },
-                { 't', '\t' }
-            }.ToFrozenDictionary();
-        }
+            { 'n', '\n' },
+            { 'r', '\r' },
+            { 't', '\t' }
+        }.ToFrozenDictionary();
+    }
 
-        /// <summary>
-        /// Parses a .po file.
-        /// </summary>
-        /// <param name="reader">The <see cref="TextReader"/>.</param>
-        /// <returns>A list of culture records.</returns>
+    /// <summary>
+    /// Parses a .po file.
+    /// </summary>
+    /// <param name="reader">The <see cref="TextReader"/>.</param>
+    /// <returns>A list of culture records.</returns>
 #pragma warning disable CA1822 // Mark members as static
-        public IEnumerable<CultureDictionaryRecord> Parse(TextReader reader)
+    public IEnumerable<CultureDictionaryRecord> Parse(TextReader reader)
 #pragma warning restore CA1822 // Mark members as static
+    {
+        var entryBuilder = new DictionaryRecordBuilder();
+        string line;
+        while ((line = reader.ReadLine()) != null)
         {
-            var entryBuilder = new DictionaryRecordBuilder();
-            string line;
-            while ((line = reader.ReadLine()) != null)
-            {
-                (var context, var content) = ParseLine(line);
+            (var context, var content) = ParseLine(line);
 
-                if (context == PoContext.Other)
-                {
-                    continue;
-                }
-
-                // msgid or msgctxt are first lines of the entry. If builder contains valid entry return it and start building a new one.
-                if ((context == PoContext.MessageId || context == PoContext.MessageContext) && entryBuilder.ShouldFlushRecord)
-                {
-                    yield return entryBuilder.BuildRecordAndReset();
-                }
-
-                entryBuilder.Set(context, content);
+            if (context == PoContext.Other)
+            {
+                continue;
             }
 
-            if (entryBuilder.ShouldFlushRecord)
+            // msgid or msgctxt are first lines of the entry. If builder contains valid entry return it and start building a new one.
+            if ((context == PoContext.MessageId || context == PoContext.MessageContext) && entryBuilder.ShouldFlushRecord)
             {
                 yield return entryBuilder.BuildRecordAndReset();
             }
+
+            entryBuilder.Set(context, content);
         }
 
-        private static string Unescape(string str)
+        if (entryBuilder.ShouldFlushRecord)
         {
-            if (!str.Contains('\\'))
-            {
-                return str;
-            }
+            yield return entryBuilder.BuildRecordAndReset();
+        }
+    }
 
-            var escaped = false;
-            using var builder = ZString.CreateStringBuilder();
+    private static string Unescape(string str)
+    {
+        if (!str.Contains('\\'))
+        {
+            return str;
+        }
 
-            for (var i = 0; i < str.Length; i++)
+        var escaped = false;
+        using var builder = ZString.CreateStringBuilder();
+
+        for (var i = 0; i < str.Length; i++)
+        {
+            var c = str[i];
+            if (escaped)
             {
-                var c = str[i];
-                if (escaped)
+                char unescaped;
+                if (_escapeTranslations.TryGetValue(c, out unescaped))
                 {
-                    char unescaped;
-                    if (_escapeTranslations.TryGetValue(c, out unescaped))
-                    {
-                        builder.Append(unescaped);
-                    }
-                    else
-                    {
-                        // General rule: \x ==> x
-                        builder.Append(c);
-                    }
-
-                    escaped = false;
+                    builder.Append(unescaped);
                 }
                 else
                 {
-                    if (c == '\\')
-                    {
-                        escaped = true;
-                    }
-                    else
-                    {
-                        builder.Append(c);
-                    }
+                    // General rule: \x ==> x
+                    builder.Append(c);
                 }
-            }
 
-            return builder.ToString();
-        }
-
-        private static string TrimQuote(string str)
-        {
-            if (str.StartsWith('\"') && str.EndsWith('\"'))
+                escaped = false;
+            }
+            else
             {
-                if (str.Length == 1)
+                if (c == '\\')
                 {
-                    return "";
+                    escaped = true;
+                }
+                else
+                {
+                    builder.Append(c);
                 }
-
-                return str[1..^1];
             }
-
-            return str;
         }
 
-        private static (PoContext context, string content) ParseLine(string line)
+        return builder.ToString();
+    }
+
+    private static string TrimQuote(string str)
+    {
+        if (str.StartsWith('\"') && str.EndsWith('\"'))
         {
-            if (line.StartsWith('\"'))
+            if (str.Length == 1)
             {
-                return (PoContext.Text, Unescape(TrimQuote(line.Trim())));
+                return "";
             }
 
-            var keyAndValue = line.Split(null, 2);
-            if (keyAndValue.Length != 2)
-            {
-                return (PoContext.Other, string.Empty);
-            }
+            return str[1..^1];
+        }
 
-            var content = Unescape(TrimQuote(keyAndValue[1].Trim()));
-            return keyAndValue[0] switch
-            {
-                "msgctxt" => (PoContext.MessageContext, content),
-                "msgid" => (PoContext.MessageId, content),
-                "msgid_plural" => (PoContext.MessageIdPlural, content),
-                var key when key.StartsWith("msgstr", StringComparison.Ordinal) => (PoContext.Translation, content),
-                _ => (PoContext.Other, content),
-            };
+        return str;
+    }
+
+    private static (PoContext context, string content) ParseLine(string line)
+    {
+        if (line.StartsWith('\"'))
+        {
+            return (PoContext.Text, Unescape(TrimQuote(line.Trim())));
         }
 
-        private sealed class DictionaryRecordBuilder
+        var keyAndValue = line.Split(null, 2);
+        if (keyAndValue.Length != 2)
         {
-            private readonly List<string> _values;
-            private IEnumerable<string> _validValues => _values.Where(value => !string.IsNullOrEmpty(value));
-            private PoContext _context;
+            return (PoContext.Other, string.Empty);
+        }
 
-            public string MessageId { get; private set; }
-            public string MessageContext { get; private set; }
+        var content = Unescape(TrimQuote(keyAndValue[1].Trim()));
+        return keyAndValue[0] switch
+        {
+            "msgctxt" => (PoContext.MessageContext, content),
+            "msgid" => (PoContext.MessageId, content),
+            "msgid_plural" => (PoContext.MessageIdPlural, content),
+            var key when key.StartsWith("msgstr", StringComparison.Ordinal) => (PoContext.Translation, content),
+            _ => (PoContext.Other, content),
+        };
+    }
 
-            public IEnumerable<string> Values => _values;
+    private sealed class DictionaryRecordBuilder
+    {
+        private readonly List<string> _values;
+        private IEnumerable<string> _validValues => _values.Where(value => !string.IsNullOrEmpty(value));
+        private PoContext _context;
 
-            public bool IsValid => !string.IsNullOrEmpty(MessageId) && _validValues.Any();
-            public bool ShouldFlushRecord => IsValid && _context == PoContext.Translation;
+        public string MessageId { get; private set; }
+        public string MessageContext { get; private set; }
 
-            public DictionaryRecordBuilder()
-            {
-                _values = [];
-            }
+        public IEnumerable<string> Values => _values;
 
-            public void Set(PoContext context, string text)
+        public bool IsValid => !string.IsNullOrEmpty(MessageId) && _validValues.Any();
+        public bool ShouldFlushRecord => IsValid && _context == PoContext.Translation;
+
+        public DictionaryRecordBuilder()
+        {
+            _values = [];
+        }
+
+        public void Set(PoContext context, string text)
+        {
+            switch (context)
             {
-                switch (context)
-                {
-                    case PoContext.MessageId:
+                case PoContext.MessageId:
+                    {
+                        // If the MessageId has been set to an empty string and now gets set again
+                        // before flushing the values should be reset.
+                        if (string.IsNullOrEmpty(MessageId))
                         {
-                            // If the MessageId has been set to an empty string and now gets set again
-                            // before flushing the values should be reset.
-                            if (string.IsNullOrEmpty(MessageId))
-                            {
-                                _values.Clear();
-                            }
-
-                            MessageId = text;
-                            break;
+                            _values.Clear();
                         }
-                    case PoContext.MessageContext: MessageContext = text; break;
-                    case PoContext.Translation: _values.Add(text); break;
-                    case PoContext.Text: AppendText(text); return; // We don't want to set context to Text.
-                }
 
-                _context = context;
+                        MessageId = text;
+                        break;
+                    }
+                case PoContext.MessageContext: MessageContext = text; break;
+                case PoContext.Translation: _values.Add(text); break;
+                case PoContext.Text: AppendText(text); return; // We don't want to set context to Text.
             }
 
-            private void AppendText(string text)
+            _context = context;
+        }
+
+        private void AppendText(string text)
+        {
+            switch (_context)
             {
-                switch (_context)
-                {
-                    case PoContext.MessageId: MessageId += text; break;
-                    case PoContext.MessageContext: MessageContext += text; break;
-                    case PoContext.Translation:
-                        if (_values.Count > 0)
-                        {
-                            _values[^1] += text;
-                        }
-                        break;
-                }
+                case PoContext.MessageId: MessageId += text; break;
+                case PoContext.MessageContext: MessageContext += text; break;
+                case PoContext.Translation:
+                    if (_values.Count > 0)
+                    {
+                        _values[^1] += text;
+                    }
+                    break;
             }
+        }
 
-            public CultureDictionaryRecord BuildRecordAndReset()
+        public CultureDictionaryRecord BuildRecordAndReset()
+        {
+            if (!IsValid)
             {
-                if (!IsValid)
-                {
-                    return null;
-                }
+                return null;
+            }
 
-                var result = new CultureDictionaryRecord(MessageId, MessageContext, _validValues.ToArray());
+            var result = new CultureDictionaryRecord(MessageId, MessageContext, _validValues.ToArray());
 
-                MessageId = null;
-                MessageContext = null;
-                _values.Clear();
+            MessageId = null;
+            MessageContext = null;
+            _values.Clear();
 
-                return result;
-            }
+            return result;
         }
+    }
 
-        private enum PoContext
-        {
-            MessageId,
-            MessageIdPlural,
-            MessageContext,
-            Translation,
-            Text,
-            Other
-        }
+    private enum PoContext
+    {
+        MessageId,
+        MessageIdPlural,
+        MessageContext,
+        Translation,
+        Text,
+        Other
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PortableObjectHtmlLocalizer.cs b/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PortableObjectHtmlLocalizer.cs
index 03285d9017f..e45a554bb50 100644
--- a/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PortableObjectHtmlLocalizer.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PortableObjectHtmlLocalizer.cs
@@ -1,54 +1,53 @@
 using Microsoft.AspNetCore.Mvc.Localization;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Localization.PortableObject
+namespace OrchardCore.Localization.PortableObject;
+
+/// <summary>
+/// Represents an <see cref="HtmlLocalizer"/> for portable objects.
+/// </summary>
+public class PortableObjectHtmlLocalizer : HtmlLocalizer
 {
+    private readonly IStringLocalizer _localizer;
+
     /// <summary>
-    /// Represents an <see cref="HtmlLocalizer"/> for portable objects.
+    /// Creates a new instance of <see cref="PortableObjectHtmlLocalizer"/>.
     /// </summary>
-    public class PortableObjectHtmlLocalizer : HtmlLocalizer
+    /// <param name="localizer"></param>
+    public PortableObjectHtmlLocalizer(IStringLocalizer localizer) : base(localizer)
     {
-        private readonly IStringLocalizer _localizer;
-
-        /// <summary>
-        /// Creates a new instance of <see cref="PortableObjectHtmlLocalizer"/>.
-        /// </summary>
-        /// <param name="localizer"></param>
-        public PortableObjectHtmlLocalizer(IStringLocalizer localizer) : base(localizer)
-        {
-            _localizer = localizer;
-        }
+        _localizer = localizer;
+    }
 
-        /// <inheritdocs />
-        public override LocalizedHtmlString this[string name]
-            => ToHtmlString(_localizer[name]);
+    /// <inheritdocs />
+    public override LocalizedHtmlString this[string name]
+        => ToHtmlString(_localizer[name]);
 
-        /// <inheritdocs />
-        public override LocalizedHtmlString this[string name, params object[] arguments]
+    /// <inheritdocs />
+    public override LocalizedHtmlString this[string name, params object[] arguments]
+    {
+        get
         {
-            get
-            {
-                // 'HtmlLocalizer' doesn't use '_localizer[name, arguments]' but '_localizer[name]' to get
-                // an unformatted string because a formatting is done through 'LocalizedHtmlString.WriteTo()'.
-
-                // See https://github.com/aspnet/Mvc/blob/master/src/Microsoft.AspNetCore.Mvc.Localization/LocalizedHtmlString.cs#L97
+            // 'HtmlLocalizer' doesn't use '_localizer[name, arguments]' but '_localizer[name]' to get
+            // an unformatted string because a formatting is done through 'LocalizedHtmlString.WriteTo()'.
 
-                // But with a plural localizer, arguments may be provided for plural localization. So, we
-                // still use them to get a non formatted translation and extract all non plural arguments.
+            // See https://github.com/aspnet/Mvc/blob/master/src/Microsoft.AspNetCore.Mvc.Localization/LocalizedHtmlString.cs#L97
 
-                // Otherwise an already formatted string containing curly braces will be wrongly reformatted.
+            // But with a plural localizer, arguments may be provided for plural localization. So, we
+            // still use them to get a non formatted translation and extract all non plural arguments.
 
-                if (_localizer is IPluralStringLocalizer pluralLocalizer && arguments.Length == 1 && arguments[0] is PluralizationArgument)
-                {
-                    // Get an unformatted string and all non plural arguments (1st one is the plural count).
-                    var (translation, argumentsWithCount) = pluralLocalizer.GetTranslation(name, arguments);
+            // Otherwise an already formatted string containing curly braces will be wrongly reformatted.
 
-                    // Formatting will use non plural arguments if any.
-                    return ToHtmlString(translation, argumentsWithCount);
-                }
+            if (_localizer is IPluralStringLocalizer pluralLocalizer && arguments.Length == 1 && arguments[0] is PluralizationArgument)
+            {
+                // Get an unformatted string and all non plural arguments (1st one is the plural count).
+                var (translation, argumentsWithCount) = pluralLocalizer.GetTranslation(name, arguments);
 
-                return ToHtmlString(_localizer[name], arguments);
+                // Formatting will use non plural arguments if any.
+                return ToHtmlString(translation, argumentsWithCount);
             }
+
+            return ToHtmlString(_localizer[name], arguments);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PortableObjectHtmlLocalizerFactory.cs b/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PortableObjectHtmlLocalizerFactory.cs
index 18dfea17442..62270241647 100644
--- a/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PortableObjectHtmlLocalizerFactory.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PortableObjectHtmlLocalizerFactory.cs
@@ -2,28 +2,27 @@
 using Microsoft.AspNetCore.Mvc.Localization;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Localization.PortableObject
+namespace OrchardCore.Localization.PortableObject;
+
+/// <summary>
+/// Represents an <see cref="IHtmlLocalizerFactory"/> for portable objects.
+/// </summary>
+public class PortableObjectHtmlLocalizerFactory : IHtmlLocalizerFactory
 {
+    private readonly IStringLocalizerFactory _stringLocalizerFactory;
+
     /// <summary>
-    /// Represents an <see cref="IHtmlLocalizerFactory"/> for portable objects.
+    /// Creates a new instance of <see cref="PortableObjectHtmlLocalizerFactory"/>.
     /// </summary>
-    public class PortableObjectHtmlLocalizerFactory : IHtmlLocalizerFactory
-    {
-        private readonly IStringLocalizerFactory _stringLocalizerFactory;
-
-        /// <summary>
-        /// Creates a new instance of <see cref="PortableObjectHtmlLocalizerFactory"/>.
-        /// </summary>
-        /// <param name="stringLocalizerFactory">The <see cref="IStringLocalizerFactory"/>.</param>
-        public PortableObjectHtmlLocalizerFactory(IStringLocalizerFactory stringLocalizerFactory) =>
-            _stringLocalizerFactory = stringLocalizerFactory;
+    /// <param name="stringLocalizerFactory">The <see cref="IStringLocalizerFactory"/>.</param>
+    public PortableObjectHtmlLocalizerFactory(IStringLocalizerFactory stringLocalizerFactory) =>
+        _stringLocalizerFactory = stringLocalizerFactory;
 
-        /// <inheritdocs />
-        public IHtmlLocalizer Create(Type resourceSource) =>
-            new PortableObjectHtmlLocalizer(_stringLocalizerFactory.Create(resourceSource));
+    /// <inheritdocs />
+    public IHtmlLocalizer Create(Type resourceSource) =>
+        new PortableObjectHtmlLocalizer(_stringLocalizerFactory.Create(resourceSource));
 
-        /// <inheritdocs />
-        public IHtmlLocalizer Create(string baseName, string location) =>
-            new PortableObjectHtmlLocalizer(_stringLocalizerFactory.Create(baseName, location));
-    }
+    /// <inheritdocs />
+    public IHtmlLocalizer Create(string baseName, string location) =>
+        new PortableObjectHtmlLocalizer(_stringLocalizerFactory.Create(baseName, location));
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PortableObjectStringLocalizer.cs b/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PortableObjectStringLocalizer.cs
index 79120b6ec16..2c0d6c7cebd 100644
--- a/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PortableObjectStringLocalizer.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PortableObjectStringLocalizer.cs
@@ -6,238 +6,237 @@
 using Microsoft.Extensions.Logging;
 using OrchardCore.Localization.DataAnnotations;
 
-namespace OrchardCore.Localization.PortableObject
+namespace OrchardCore.Localization.PortableObject;
+
+/// <summary>
+/// Represents <see cref="IPluralStringLocalizer"/> for portable objects.
+/// </summary>
+public class PortableObjectStringLocalizer : IPluralStringLocalizer
 {
+    private static readonly string _dataAnnotationsDefaultErrorMessagesContext = typeof(DataAnnotationsDefaultErrorMessages).FullName;
+    private static readonly string _localizedDataAnnotationsMvcOptionsContext = typeof(LocalizedDataAnnotationsMvcOptions).FullName;
+
+    private readonly ILocalizationManager _localizationManager;
+    private readonly bool _fallBackToParentCulture;
+    private readonly ILogger _logger;
+    private readonly string _context;
+
     /// <summary>
-    /// Represents <see cref="IPluralStringLocalizer"/> for portable objects.
+    /// Creates a new instance of <see cref="PortableObjectStringLocalizer"/>.
     /// </summary>
-    public class PortableObjectStringLocalizer : IPluralStringLocalizer
+    /// <param name="context"></param>
+    /// <param name="localizationManager"></param>
+    /// <param name="fallBackToParentCulture"></param>
+    /// <param name="logger"></param>
+    public PortableObjectStringLocalizer(
+        string context,
+        ILocalizationManager localizationManager,
+        bool fallBackToParentCulture,
+        ILogger logger)
     {
-        private static readonly string _dataAnnotationsDefaultErrorMessagesContext = typeof(DataAnnotationsDefaultErrorMessages).FullName;
-        private static readonly string _localizedDataAnnotationsMvcOptionsContext = typeof(LocalizedDataAnnotationsMvcOptions).FullName;
-
-        private readonly ILocalizationManager _localizationManager;
-        private readonly bool _fallBackToParentCulture;
-        private readonly ILogger _logger;
-        private readonly string _context;
-
-        /// <summary>
-        /// Creates a new instance of <see cref="PortableObjectStringLocalizer"/>.
-        /// </summary>
-        /// <param name="context"></param>
-        /// <param name="localizationManager"></param>
-        /// <param name="fallBackToParentCulture"></param>
-        /// <param name="logger"></param>
-        public PortableObjectStringLocalizer(
-            string context,
-            ILocalizationManager localizationManager,
-            bool fallBackToParentCulture,
-            ILogger logger)
-        {
-            _context = context;
-            _localizationManager = localizationManager;
-            _fallBackToParentCulture = fallBackToParentCulture;
-            _logger = logger;
-        }
+        _context = context;
+        _localizationManager = localizationManager;
+        _fallBackToParentCulture = fallBackToParentCulture;
+        _logger = logger;
+    }
 
-        /// <inheritdocs />
-        public virtual LocalizedString this[string name]
+    /// <inheritdocs />
+    public virtual LocalizedString this[string name]
+    {
+        get
         {
-            get
-            {
-                ArgumentNullException.ThrowIfNull(name);
-
-                var translation = GetTranslation(name, _context, CultureInfo.CurrentUICulture, null);
-
-                return new LocalizedString(name, translation ?? name, translation == null);
-            }
-        }
+            ArgumentNullException.ThrowIfNull(name);
 
-        /// <inheritdocs />
-        public virtual LocalizedString this[string name, params object[] arguments]
-        {
-            get
-            {
-                var (translation, argumentsWithCount) = GetTranslation(name, arguments);
-                var formatted = string.Format(translation.Value, argumentsWithCount);
+            var translation = GetTranslation(name, _context, CultureInfo.CurrentUICulture, null);
 
-                return new LocalizedString(name, formatted, translation.ResourceNotFound);
-            }
+            return new LocalizedString(name, translation ?? name, translation == null);
         }
+    }
 
-        /// <inheritdocs />
-        public virtual IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures)
+    /// <inheritdocs />
+    public virtual LocalizedString this[string name, params object[] arguments]
+    {
+        get
         {
-            var culture = CultureInfo.CurrentUICulture;
+            var (translation, argumentsWithCount) = GetTranslation(name, arguments);
+            var formatted = string.Format(translation.Value, argumentsWithCount);
 
-            return includeParentCultures
-                ? GetAllStringsFromCultureHierarchy(culture)
-                : GetAllStrings(culture);
+            return new LocalizedString(name, formatted, translation.ResourceNotFound);
         }
+    }
 
-        /// <inheritdocs />
-        public virtual (LocalizedString, object[]) GetTranslation(string name, params object[] arguments)
-        {
-            ArgumentNullException.ThrowIfNull(name);
+    /// <inheritdocs />
+    public virtual IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures)
+    {
+        var culture = CultureInfo.CurrentUICulture;
 
-            // Check if a plural form is called, which is when the only argument is of type PluralizationArgument.
-            if (arguments.Length == 1 && arguments[0] is PluralizationArgument pluralArgument)
-            {
-                var translation = GetTranslation(name, _context, CultureInfo.CurrentUICulture, pluralArgument.Count);
+        return includeParentCultures
+            ? GetAllStringsFromCultureHierarchy(culture)
+            : GetAllStrings(culture);
+    }
 
-                object[] argumentsWithCount;
+    /// <inheritdocs />
+    public virtual (LocalizedString, object[]) GetTranslation(string name, params object[] arguments)
+    {
+        ArgumentNullException.ThrowIfNull(name);
 
-                if (pluralArgument.Arguments.Length > 0)
-                {
-                    argumentsWithCount = new object[pluralArgument.Arguments.Length + 1];
-                    argumentsWithCount[0] = pluralArgument.Count;
-                    Array.Copy(pluralArgument.Arguments, 0, argumentsWithCount, 1, pluralArgument.Arguments.Length);
-                }
-                else
-                {
-                    argumentsWithCount = [pluralArgument.Count];
-                }
+        // Check if a plural form is called, which is when the only argument is of type PluralizationArgument.
+        if (arguments.Length == 1 && arguments[0] is PluralizationArgument pluralArgument)
+        {
+            var translation = GetTranslation(name, _context, CultureInfo.CurrentUICulture, pluralArgument.Count);
 
-                translation ??= GetTranslation(pluralArgument.Forms, CultureInfo.CurrentUICulture, pluralArgument.Count);
+            object[] argumentsWithCount;
 
-                return (new LocalizedString(name, translation, translation == null), argumentsWithCount);
+            if (pluralArgument.Arguments.Length > 0)
+            {
+                argumentsWithCount = new object[pluralArgument.Arguments.Length + 1];
+                argumentsWithCount[0] = pluralArgument.Count;
+                Array.Copy(pluralArgument.Arguments, 0, argumentsWithCount, 1, pluralArgument.Arguments.Length);
             }
             else
             {
-                var translation = this[name];
-                return (new LocalizedString(name, translation, translation.ResourceNotFound), arguments);
+                argumentsWithCount = [pluralArgument.Count];
             }
-        }
 
-        private IEnumerable<LocalizedString> GetAllStrings(CultureInfo culture)
+            translation ??= GetTranslation(pluralArgument.Forms, CultureInfo.CurrentUICulture, pluralArgument.Count);
+
+            return (new LocalizedString(name, translation, translation == null), argumentsWithCount);
+        }
+        else
         {
-            var dictionary = _localizationManager.GetDictionary(culture);
+            var translation = this[name];
+            return (new LocalizedString(name, translation, translation.ResourceNotFound), arguments);
+        }
+    }
 
-            foreach (var translation in dictionary.Translations)
-            {
-                yield return new LocalizedString(translation.Key, translation.Value.FirstOrDefault());
-            }
+    private IEnumerable<LocalizedString> GetAllStrings(CultureInfo culture)
+    {
+        var dictionary = _localizationManager.GetDictionary(culture);
+
+        foreach (var translation in dictionary.Translations)
+        {
+            yield return new LocalizedString(translation.Key, translation.Value.FirstOrDefault());
         }
+    }
 
-        private List<LocalizedString> GetAllStringsFromCultureHierarchy(CultureInfo culture)
+    private List<LocalizedString> GetAllStringsFromCultureHierarchy(CultureInfo culture)
+    {
+        var currentCulture = culture;
+        var allLocalizedStrings = new List<LocalizedString>();
+
+        do
         {
-            var currentCulture = culture;
-            var allLocalizedStrings = new List<LocalizedString>();
+            var localizedStrings = GetAllStrings(currentCulture);
 
-            do
+            if (localizedStrings != null)
             {
-                var localizedStrings = GetAllStrings(currentCulture);
-
-                if (localizedStrings != null)
+                foreach (var localizedString in localizedStrings)
                 {
-                    foreach (var localizedString in localizedStrings)
+                    if (!allLocalizedStrings.Any(ls => ls.Name == localizedString.Name))
                     {
-                        if (!allLocalizedStrings.Any(ls => ls.Name == localizedString.Name))
-                        {
-                            allLocalizedStrings.Add(localizedString);
-                        }
+                        allLocalizedStrings.Add(localizedString);
                     }
                 }
+            }
 
-                currentCulture = currentCulture.Parent;
-            } while (currentCulture != currentCulture.Parent);
+            currentCulture = currentCulture.Parent;
+        } while (currentCulture != currentCulture.Parent);
 
-            return allLocalizedStrings;
-        }
+        return allLocalizedStrings;
+    }
 
-        protected string GetTranslation(string[] pluralForms, CultureInfo culture, int? count)
-        {
-            var dictionary = _localizationManager.GetDictionary(culture);
+    protected string GetTranslation(string[] pluralForms, CultureInfo culture, int? count)
+    {
+        var dictionary = _localizationManager.GetDictionary(culture);
 
-            var pluralForm = count.HasValue ? dictionary.PluralRule(count.Value) : 0;
+        var pluralForm = count.HasValue ? dictionary.PluralRule(count.Value) : 0;
 
-            if (pluralForm >= pluralForms.Length)
+        if (pluralForm >= pluralForms.Length)
+        {
+            if (_logger.IsEnabled(LogLevel.Warning))
             {
-                if (_logger.IsEnabled(LogLevel.Warning))
-                {
-                    _logger.LogWarning("Plural form '{PluralForm}' doesn't exist in values provided by the 'IStringLocalizer.Plural' method. Provided values: {PluralForms}", pluralForm, string.Join(", ", pluralForms));
-                }
-
-                // Use the latest available form.
-                return pluralForms[^1];
+                _logger.LogWarning("Plural form '{PluralForm}' doesn't exist in values provided by the 'IStringLocalizer.Plural' method. Provided values: {PluralForms}", pluralForm, string.Join(", ", pluralForms));
             }
 
-            return pluralForms[pluralForm];
+            // Use the latest available form.
+            return pluralForms[^1];
         }
 
-        protected string GetTranslation(string name, string context, CultureInfo culture, int? count)
+        return pluralForms[pluralForm];
+    }
+
+    protected string GetTranslation(string name, string context, CultureInfo culture, int? count)
+    {
+        string translation = null;
+        try
         {
-            string translation = null;
-            try
+            if (_fallBackToParentCulture)
             {
-                if (_fallBackToParentCulture)
+                do
                 {
-                    do
+                    if (ExtractTranslation() != null)
                     {
-                        if (ExtractTranslation() != null)
-                        {
-                            break;
-                        }
-
-                        culture = culture.Parent;
+                        break;
                     }
-                    while (culture != CultureInfo.InvariantCulture);
-                }
-                else
-                {
-                    ExtractTranslation();
+
+                    culture = culture.Parent;
                 }
+                while (culture != CultureInfo.InvariantCulture);
+            }
+            else
+            {
+                ExtractTranslation();
+            }
 
-                string ExtractTranslation()
+            string ExtractTranslation()
+            {
+                var dictionary = _localizationManager.GetDictionary(culture);
+
+                if (dictionary != null)
                 {
-                    var dictionary = _localizationManager.GetDictionary(culture);
+                    var key = CultureDictionaryRecord.GetKey(name, context);
 
-                    if (dictionary != null)
+                    // Extract translation from data annotations attributes.
+                    if (context == _localizedDataAnnotationsMvcOptionsContext)
                     {
-                        var key = CultureDictionaryRecord.GetKey(name, context);
+                        // Extract translation with context.
+                        key = CultureDictionaryRecord.GetKey(name, _dataAnnotationsDefaultErrorMessagesContext);
+                        translation = dictionary[key];
 
-                        // Extract translation from data annotations attributes.
-                        if (context == _localizedDataAnnotationsMvcOptionsContext)
+                        if (translation != null)
                         {
-                            // Extract translation with context.
-                            key = CultureDictionaryRecord.GetKey(name, _dataAnnotationsDefaultErrorMessagesContext);
-                            translation = dictionary[key];
-
-                            if (translation != null)
-                            {
-                                return translation;
-                            }
-
-                            // Extract translation without context.
-                            key = CultureDictionaryRecord.GetKey(name, null);
-                            translation = dictionary[key];
-
-                            if (translation != null)
-                            {
-                                return translation;
-                            }
+                            return translation;
                         }
 
-                        // Extract translation with context.
-                        translation = dictionary[key, count];
+                        // Extract translation without context.
+                        key = CultureDictionaryRecord.GetKey(name, null);
+                        translation = dictionary[key];
 
-                        if (context != null && translation == null)
+                        if (translation != null)
                         {
-                            // Extract translation without context.
-                            key = CultureDictionaryRecord.GetKey(name, null);
-                            translation = dictionary[key, count];
+                            return translation;
                         }
                     }
 
-                    return translation;
+                    // Extract translation with context.
+                    translation = dictionary[key, count];
+
+                    if (context != null && translation == null)
+                    {
+                        // Extract translation without context.
+                        key = CultureDictionaryRecord.GetKey(name, null);
+                        translation = dictionary[key, count];
+                    }
                 }
-            }
-            catch (PluralFormNotFoundException ex)
-            {
-                _logger.LogWarning(ex, "Plural form not found.");
-            }
 
-            return translation;
+                return translation;
+            }
         }
+        catch (PluralFormNotFoundException ex)
+        {
+            _logger.LogWarning(ex, "Plural form not found.");
+        }
+
+        return translation;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PortableObjectStringLocalizerFactory.cs b/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PortableObjectStringLocalizerFactory.cs
index 75cfa796f4d..da9e8e1df2f 100644
--- a/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PortableObjectStringLocalizerFactory.cs
+++ b/src/OrchardCore/OrchardCore.Localization.Core/PortableObject/PortableObjectStringLocalizerFactory.cs
@@ -4,79 +4,78 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Localization.PortableObject
+namespace OrchardCore.Localization.PortableObject;
+
+/// <summary>
+/// Represents a <see cref="IStringLocalizerFactory"/> for portable objects.
+/// </summary>
+public class PortableObjectStringLocalizerFactory : IStringLocalizerFactory
 {
+    private readonly ILocalizationManager _localizationManager;
+    private readonly bool _fallBackToParentCulture;
+    private readonly ILogger _logger;
+
     /// <summary>
-    /// Represents a <see cref="IStringLocalizerFactory"/> for portable objects.
+    /// Creates a new instance of <see cref="PortableObjectStringLocalizerFactory"/>.
     /// </summary>
-    public class PortableObjectStringLocalizerFactory : IStringLocalizerFactory
+    /// <param name="localizationManager"></param>
+    /// <param name="requestLocalizationOptions"></param>
+    /// <param name="logger"></param>
+    public PortableObjectStringLocalizerFactory(
+        ILocalizationManager localizationManager,
+        IOptions<RequestLocalizationOptions> requestLocalizationOptions,
+        ILogger<PortableObjectStringLocalizerFactory> logger)
+    {
+        _localizationManager = localizationManager;
+        _fallBackToParentCulture = requestLocalizationOptions.Value.FallBackToParentUICultures;
+        _logger = logger;
+    }
+
+    /// <inheritedoc />
+    public IStringLocalizer Create(Type resourceSource)
     {
-        private readonly ILocalizationManager _localizationManager;
-        private readonly bool _fallBackToParentCulture;
-        private readonly ILogger _logger;
+        var resourceFullName = resourceSource.FullName;
+        resourceFullName = TryFixInnerClassPath(resourceFullName);
 
-        /// <summary>
-        /// Creates a new instance of <see cref="PortableObjectStringLocalizerFactory"/>.
-        /// </summary>
-        /// <param name="localizationManager"></param>
-        /// <param name="requestLocalizationOptions"></param>
-        /// <param name="logger"></param>
-        public PortableObjectStringLocalizerFactory(
-            ILocalizationManager localizationManager,
-            IOptions<RequestLocalizationOptions> requestLocalizationOptions,
-            ILogger<PortableObjectStringLocalizerFactory> logger)
+        return new PortableObjectStringLocalizer(resourceFullName, _localizationManager, _fallBackToParentCulture, _logger);
+    }
+
+    /// <inheritedoc />
+    public IStringLocalizer Create(string baseName, string location)
+    {
+        baseName = TryFixInnerClassPath(baseName);
+
+        var index = 0;
+        if (baseName.StartsWith(location, StringComparison.OrdinalIgnoreCase))
         {
-            _localizationManager = localizationManager;
-            _fallBackToParentCulture = requestLocalizationOptions.Value.FallBackToParentUICultures;
-            _logger = logger;
+            index = location.Length;
         }
 
-        /// <inheritedoc />
-        public IStringLocalizer Create(Type resourceSource)
+        if (baseName.Length > index && baseName[index] == '.')
         {
-            var resourceFullName = resourceSource.FullName;
-            resourceFullName = TryFixInnerClassPath(resourceFullName);
-
-            return new PortableObjectStringLocalizer(resourceFullName, _localizationManager, _fallBackToParentCulture, _logger);
+            index += 1;
         }
 
-        /// <inheritedoc />
-        public IStringLocalizer Create(string baseName, string location)
+        if (baseName.Length > index && baseName.IndexOf("Areas.", index, StringComparison.Ordinal) == index)
         {
-            baseName = TryFixInnerClassPath(baseName);
-
-            var index = 0;
-            if (baseName.StartsWith(location, StringComparison.OrdinalIgnoreCase))
-            {
-                index = location.Length;
-            }
-
-            if (baseName.Length > index && baseName[index] == '.')
-            {
-                index += 1;
-            }
-
-            if (baseName.Length > index && baseName.IndexOf("Areas.", index, StringComparison.Ordinal) == index)
-            {
-                index += "Areas.".Length;
-            }
+            index += "Areas.".Length;
+        }
 
-            var relativeName = baseName[index..];
+        var relativeName = baseName[index..];
 
-            return new PortableObjectStringLocalizer(relativeName, _localizationManager, _fallBackToParentCulture, _logger);
-        }
+        return new PortableObjectStringLocalizer(relativeName, _localizationManager, _fallBackToParentCulture, _logger);
+    }
 
-        // The context within inner class.
-        private static string TryFixInnerClassPath(string context)
+    // The context within inner class.
+    private static string TryFixInnerClassPath(string context)
+    {
+        const char innerClassSeparator = '+';
+        var path = context;
+        if (context.Contains(innerClassSeparator))
         {
-            const char innerClassSeparator = '+';
-            var path = context;
-            if (context.Contains(innerClassSeparator))
-            {
-                path = context.Replace(innerClassSeparator, '.');
-            }
-
-            return path;
+            path = context.Replace(innerClassSeparator, '.');
         }
+
+        return path;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Logging.NLog/TenantLayoutRenderer.cs b/src/OrchardCore/OrchardCore.Logging.NLog/TenantLayoutRenderer.cs
index fbbdebbebf5..1232a40018d 100644
--- a/src/OrchardCore/OrchardCore.Logging.NLog/TenantLayoutRenderer.cs
+++ b/src/OrchardCore/OrchardCore.Logging.NLog/TenantLayoutRenderer.cs
@@ -5,24 +5,23 @@
 using OrchardCore.Environment.Shell;
 using OrchardCore.Environment.Shell.Scope;
 
-namespace OrchardCore.Logging
+namespace OrchardCore.Logging;
+
+/// <summary>
+/// Print the tenant name.
+/// </summary>
+[LayoutRenderer(LayoutRendererName)]
+public class TenantLayoutRenderer : AspNetLayoutRendererBase
 {
-    /// <summary>
-    /// Print the tenant name.
-    /// </summary>
-    [LayoutRenderer(LayoutRendererName)]
-    public class TenantLayoutRenderer : AspNetLayoutRendererBase
-    {
-        public const string LayoutRendererName = "orchard-tenant-name";
+    public const string LayoutRendererName = "orchard-tenant-name";
 
-        protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
-        {
-            var tenantName = ShellScope.Context?.Settings.Name;
+    protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
+    {
+        var tenantName = ShellScope.Context?.Settings.Name;
 
-            // If there is no ShellContext in the Features then the log is rendered from the Host.
-            tenantName ??= HttpContextAccessor.HttpContext.Features.Get<ShellContextFeature>()?.ShellContext.Settings.Name ?? "None";
+        // If there is no ShellContext in the Features then the log is rendered from the Host.
+        tenantName ??= HttpContextAccessor.HttpContext.Features.Get<ShellContextFeature>()?.ShellContext.Settings.Name ?? "None";
 
-            builder.Append(tenantName);
-        }
+        builder.Append(tenantName);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Logging.Serilog/ApplicationBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Logging.Serilog/ApplicationBuilderExtensions.cs
index f4cdd464c65..53e7f6b3519 100644
--- a/src/OrchardCore/OrchardCore.Logging.Serilog/ApplicationBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Logging.Serilog/ApplicationBuilderExtensions.cs
@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Builder;
 
-namespace OrchardCore.Logging
+namespace OrchardCore.Logging;
+
+public static class ApplicationBuilderExtensions
 {
-    public static class ApplicationBuilderExtensions
+    public static IApplicationBuilder UseSerilogTenantNameLogging(this IApplicationBuilder builder)
     {
-        public static IApplicationBuilder UseSerilogTenantNameLogging(this IApplicationBuilder builder)
-        {
-            return builder.UseMiddleware<SerilogTenantNameLoggingMiddleware>();
-        }
+        return builder.UseMiddleware<SerilogTenantNameLoggingMiddleware>();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Logging.Serilog/SerilogTenantNameLoggingMiddleware.cs b/src/OrchardCore/OrchardCore.Logging.Serilog/SerilogTenantNameLoggingMiddleware.cs
index a35b0fb8aea..9425c710c3c 100644
--- a/src/OrchardCore/OrchardCore.Logging.Serilog/SerilogTenantNameLoggingMiddleware.cs
+++ b/src/OrchardCore/OrchardCore.Logging.Serilog/SerilogTenantNameLoggingMiddleware.cs
@@ -3,24 +3,23 @@
 using OrchardCore.Environment.Shell.Scope;
 using Serilog.Context;
 
-namespace OrchardCore.Logging
+namespace OrchardCore.Logging;
+
+public class SerilogTenantNameLoggingMiddleware
 {
-    public class SerilogTenantNameLoggingMiddleware
-    {
-        private readonly RequestDelegate _next;
+    private readonly RequestDelegate _next;
 
-        public SerilogTenantNameLoggingMiddleware(RequestDelegate next)
-        {
-            _next = next;
-        }
+    public SerilogTenantNameLoggingMiddleware(RequestDelegate next)
+    {
+        _next = next;
+    }
 
-        public async Task Invoke(HttpContext context)
+    public async Task Invoke(HttpContext context)
+    {
+        var tenantName = ShellScope.Context?.Settings.Name ?? "None";
+        using (LogContext.PushProperty("TenantName", tenantName))
         {
-            var tenantName = ShellScope.Context?.Settings.Name ?? "None";
-            using (LogContext.PushProperty("TenantName", tenantName))
-            {
-                await _next.Invoke(context);
-            }
+            await _next.Invoke(context);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Logging.Serilog/WebHostBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Logging.Serilog/WebHostBuilderExtensions.cs
index c3f23994e5b..f9913e453f4 100644
--- a/src/OrchardCore/OrchardCore.Logging.Serilog/WebHostBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Logging.Serilog/WebHostBuilderExtensions.cs
@@ -1,17 +1,16 @@
 using Microsoft.Extensions.Hosting;
 using Serilog;
 
-namespace OrchardCore.Logging
+namespace OrchardCore.Logging;
+
+public static class WebHostBuilderExtensions
 {
-    public static class WebHostBuilderExtensions
+    public static IHostBuilder UseSerilogWeb(this IHostBuilder builder)
     {
-        public static IHostBuilder UseSerilogWeb(this IHostBuilder builder)
+        return builder.UseSerilog((hostingContext, configBuilder) =>
         {
-            return builder.UseSerilog((hostingContext, configBuilder) =>
-            {
-                configBuilder.ReadFrom.Configuration(hostingContext.Configuration)
-                .Enrich.FromLogContext();
-            });
-        }
+            configBuilder.ReadFrom.Configuration(hostingContext.Configuration)
+            .Enrich.FromLogContext();
+        });
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Markdown.Abstractions/Services/IMarkdownService.cs b/src/OrchardCore/OrchardCore.Markdown.Abstractions/Services/IMarkdownService.cs
index 34798a804af..4d0a66451bb 100644
--- a/src/OrchardCore/OrchardCore.Markdown.Abstractions/Services/IMarkdownService.cs
+++ b/src/OrchardCore/OrchardCore.Markdown.Abstractions/Services/IMarkdownService.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Markdown.Services
+namespace OrchardCore.Markdown.Services;
+
+public interface IMarkdownService
 {
-    public interface IMarkdownService
-    {
-        string ToHtml(string markdown);
-    }
+    string ToHtml(string markdown);
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Abstractions/Events/IMediaCreatingEventHandler.cs b/src/OrchardCore/OrchardCore.Media.Abstractions/Events/IMediaCreatingEventHandler.cs
index 204e7651ad5..0a081c8cae9 100644
--- a/src/OrchardCore/OrchardCore.Media.Abstractions/Events/IMediaCreatingEventHandler.cs
+++ b/src/OrchardCore/OrchardCore.Media.Abstractions/Events/IMediaCreatingEventHandler.cs
@@ -1,18 +1,17 @@
 using System.IO;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Media.Events
+namespace OrchardCore.Media.Events;
+
+/// <summary>
+/// Event handler fired during creation of new media items.
+/// </summary>
+public interface IMediaCreatingEventHandler
 {
     /// <summary>
-    /// Event handler fired during creation of new media items.
+    /// Allows a stream to be mutated during creation of media.
+    /// Any implementation must return a new stream,
+    /// which should be disposed by the caller.
     /// </summary>
-    public interface IMediaCreatingEventHandler
-    {
-        /// <summary>
-        /// Allows a stream to be mutated during creation of media.
-        /// Any implementation must return a new stream,
-        /// which should be disposed by the caller.
-        /// </summary>
-        Task<Stream> MediaCreatingAsync(MediaCreatingContext context, Stream creatingStream);
-    }
+    Task<Stream> MediaCreatingAsync(MediaCreatingContext context, Stream creatingStream);
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Abstractions/Events/IMediaEventHandler.cs b/src/OrchardCore/OrchardCore.Media.Abstractions/Events/IMediaEventHandler.cs
index a58d051483a..d988662d84e 100644
--- a/src/OrchardCore/OrchardCore.Media.Abstractions/Events/IMediaEventHandler.cs
+++ b/src/OrchardCore/OrchardCore.Media.Abstractions/Events/IMediaEventHandler.cs
@@ -1,19 +1,18 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Media.Events
+namespace OrchardCore.Media.Events;
+
+/// <summary>
+/// Event handler fired during operations for existing media.
+/// </summary>
+public interface IMediaEventHandler
 {
-    /// <summary>
-    /// Event handler fired during operations for existing media.
-    /// </summary>
-    public interface IMediaEventHandler
-    {
-        Task MediaDeletingFileAsync(MediaDeletingContext context);
-        Task MediaDeletedFileAsync(MediaDeletedContext context);
-        Task MediaDeletingDirectoryAsync(MediaDeletingContext context);
-        Task MediaDeletedDirectoryAsync(MediaDeletedContext context);
-        Task MediaMovingAsync(MediaMoveContext context);
-        Task MediaMovedAsync(MediaMoveContext context);
-        Task MediaCreatingDirectoryAsync(MediaCreatingContext context);
-        Task MediaCreatedDirectoryAsync(MediaCreatedContext context);
-    }
+    Task MediaDeletingFileAsync(MediaDeletingContext context);
+    Task MediaDeletedFileAsync(MediaDeletedContext context);
+    Task MediaDeletingDirectoryAsync(MediaDeletingContext context);
+    Task MediaDeletedDirectoryAsync(MediaDeletedContext context);
+    Task MediaMovingAsync(MediaMoveContext context);
+    Task MediaMovedAsync(MediaMoveContext context);
+    Task MediaCreatingDirectoryAsync(MediaCreatingContext context);
+    Task MediaCreatedDirectoryAsync(MediaCreatedContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaContextBase.cs b/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaContextBase.cs
index 2354e7424f1..2c757d178e2 100644
--- a/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaContextBase.cs
+++ b/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaContextBase.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.Media.Events
+namespace OrchardCore.Media.Events;
+
+public class MediaContextBase
 {
-    public class MediaContextBase
-    {
-        /// <summary>
-        /// The path of the file for the current filestore operation.
-        /// </summary>
-        public string Path { get; set; }
-    }
+    /// <summary>
+    /// The path of the file for the current filestore operation.
+    /// </summary>
+    public string Path { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaCreatedContext.cs b/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaCreatedContext.cs
index 3fa42542fda..a8cea08e395 100644
--- a/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaCreatedContext.cs
+++ b/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaCreatedContext.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Media.Events
+namespace OrchardCore.Media.Events;
+
+public class MediaCreatedContext : MediaContextBase
 {
-    public class MediaCreatedContext : MediaContextBase
-    {
-        public bool Result { get; set; }
-    }
+    public bool Result { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaCreatingContext.cs b/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaCreatingContext.cs
index 5f6d1e81b12..536117b952c 100644
--- a/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaCreatingContext.cs
+++ b/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaCreatingContext.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Media.Events
+namespace OrchardCore.Media.Events;
+
+public class MediaCreatingContext : MediaContextBase
 {
-    public class MediaCreatingContext : MediaContextBase
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaDeletedContext.cs b/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaDeletedContext.cs
index 207b30304fe..f4c0ce3a983 100644
--- a/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaDeletedContext.cs
+++ b/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaDeletedContext.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Media.Events
+namespace OrchardCore.Media.Events;
+
+public class MediaDeletedContext : MediaContextBase
 {
-    public class MediaDeletedContext : MediaContextBase
-    {
-        public bool Result { get; set; }
-    }
+    public bool Result { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaDeletingContext.cs b/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaDeletingContext.cs
index e6e6b273386..e6d08e50a36 100644
--- a/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaDeletingContext.cs
+++ b/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaDeletingContext.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Media.Events
+namespace OrchardCore.Media.Events;
+
+public class MediaDeletingContext : MediaContextBase
 {
-    public class MediaDeletingContext : MediaContextBase
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaMoveContext.cs b/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaMoveContext.cs
index 2c6cbd28fb0..4c5deef4c4b 100644
--- a/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaMoveContext.cs
+++ b/src/OrchardCore/OrchardCore.Media.Abstractions/Events/MediaMoveContext.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Media.Events
+namespace OrchardCore.Media.Events;
+
+public class MediaMoveContext
 {
-    public class MediaMoveContext
-    {
-        public string NewPath { get; set; }
-        public string OldPath { get; set; }
-    }
+    public string NewPath { get; set; }
+    public string OldPath { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaFileProvider.cs b/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaFileProvider.cs
index 45a95de47b3..5b9796e7b89 100644
--- a/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaFileProvider.cs
+++ b/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaFileProvider.cs
@@ -1,8 +1,7 @@
 using OrchardCore.Modules.FileProviders;
 
-namespace OrchardCore.Media
+namespace OrchardCore.Media;
+
+public interface IMediaFileProvider : IStaticFileProvider, IVirtualPathBaseProvider
 {
-    public interface IMediaFileProvider : IStaticFileProvider, IVirtualPathBaseProvider
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaFileStore.cs b/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaFileStore.cs
index 97a48cda9e1..5440063de7e 100644
--- a/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaFileStore.cs
+++ b/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaFileStore.cs
@@ -1,17 +1,16 @@
 using OrchardCore.FileStorage;
 
-namespace OrchardCore.Media
+namespace OrchardCore.Media;
+
+/// <summary>
+/// Represents an abstraction over a specialized file store for storing media and service it to clients.
+/// </summary>
+public interface IMediaFileStore : IFileStore
 {
     /// <summary>
-    /// Represents an abstraction over a specialized file store for storing media and service it to clients.
+    /// Maps a path within the file store to a publicly accessible URL.
     /// </summary>
-    public interface IMediaFileStore : IFileStore
-    {
-        /// <summary>
-        /// Maps a path within the file store to a publicly accessible URL.
-        /// </summary>
-        /// <param name="path">The path within the file store.</param>
-        /// <returns>A string containing the mapped public URL of the given path.</returns>
-        string MapPathToPublicUrl(string path);
-    }
+    /// <param name="path">The path within the file store.</param>
+    /// <returns>A string containing the mapped public URL of the given path.</returns>
+    string MapPathToPublicUrl(string path);
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaFileStoreCache.cs b/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaFileStoreCache.cs
index b011babbdd1..691a0480561 100644
--- a/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaFileStoreCache.cs
+++ b/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaFileStoreCache.cs
@@ -1,15 +1,14 @@
 using System.Threading.Tasks;
 using OrchardCore.FileStorage;
 
-namespace OrchardCore.Media
+namespace OrchardCore.Media;
+
+/// <summary>
+/// Cache a media file store.
+/// </summary>
+public interface IMediaFileStoreCache : IFileStoreCache
 {
-    /// <summary>
-    /// Cache a media file store.
-    /// </summary>
-    public interface IMediaFileStoreCache : IFileStoreCache
-    {
-        Task<bool> PurgeAsync();
-        Task<bool> TryDeleteFileAsync(string path);
-        Task<bool> TryDeleteDirectoryAsync(string path);
-    }
+    Task<bool> PurgeAsync();
+    Task<bool> TryDeleteFileAsync(string path);
+    Task<bool> TryDeleteDirectoryAsync(string path);
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaFileStoreCacheFileProvider.cs b/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaFileStoreCacheFileProvider.cs
index 763302b3a37..1682a6a5596 100644
--- a/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaFileStoreCacheFileProvider.cs
+++ b/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaFileStoreCacheFileProvider.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Media
+namespace OrchardCore.Media;
+
+/// <summary>
+/// Identifier for when a file provider serves as a cache provider for a file store.
+/// </summary>
+public interface IMediaFileStoreCacheFileProvider : IMediaFileProvider, IMediaFileStoreCache
 {
-    /// <summary>
-    /// Identifier for when a file provider serves as a cache provider for a file store.
-    /// </summary>
-    public interface IMediaFileStoreCacheFileProvider : IMediaFileProvider, IMediaFileStoreCache
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaNameNormalizerService.cs b/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaNameNormalizerService.cs
index 234c98b70de..80fe9570e95 100644
--- a/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaNameNormalizerService.cs
+++ b/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaNameNormalizerService.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Media
+namespace OrchardCore.Media;
+
+public interface IMediaNameNormalizerService
 {
-    public interface IMediaNameNormalizerService
-    {
-        public string NormalizeFolderName(string folderName);
-        public string NormalizeFileName(string fileName);
-    }
+    public string NormalizeFolderName(string folderName);
+    public string NormalizeFileName(string fileName);
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaTokenService.cs b/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaTokenService.cs
index 61ec2efe60b..5bab2af736c 100644
--- a/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaTokenService.cs
+++ b/src/OrchardCore/OrchardCore.Media.Abstractions/IMediaTokenService.cs
@@ -1,15 +1,14 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
-namespace OrchardCore.Media
+namespace OrchardCore.Media;
+
+/// <summary>
+/// The media token service adds a digital signature to a query string.
+/// This allows the media processor to validate that commands were issued by this host.
+/// </summary>
+public interface IMediaTokenService
 {
-    /// <summary>
-    /// The media token service adds a digital signature to a query string.
-    /// This allows the media processor to validate that commands were issued by this host.
-    /// </summary>
-    public interface IMediaTokenService
-    {
-        string AddTokenToPath(string path);
-        bool TryValidateToken(KeyedCollection<string, KeyValuePair<string, string>> commands, string token);
-    }
+    string AddTokenToPath(string path);
+    bool TryValidateToken(KeyedCollection<string, KeyValuePair<string, string>> commands, string token);
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Abstractions/IUserAssetFolderNameProvider.cs b/src/OrchardCore/OrchardCore.Media.Abstractions/IUserAssetFolderNameProvider.cs
index bb23e2f0017..b59781d5148 100644
--- a/src/OrchardCore/OrchardCore.Media.Abstractions/IUserAssetFolderNameProvider.cs
+++ b/src/OrchardCore/OrchardCore.Media.Abstractions/IUserAssetFolderNameProvider.cs
@@ -1,9 +1,8 @@
 using System.Security.Claims;
 
-namespace OrchardCore.Media
+namespace OrchardCore.Media;
+
+public interface IUserAssetFolderNameProvider
 {
-    public interface IUserAssetFolderNameProvider
-    {
-        string GetUserAssetFolderName(ClaimsPrincipal claimsPrincipal);
-    }
+    string GetUserAssetFolderName(ClaimsPrincipal claimsPrincipal);
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Abstractions/Indexing/IMediaFileTextProvider.cs b/src/OrchardCore/OrchardCore.Media.Abstractions/Indexing/IMediaFileTextProvider.cs
index 64e46991123..ad4bc4e6290 100644
--- a/src/OrchardCore/OrchardCore.Media.Abstractions/Indexing/IMediaFileTextProvider.cs
+++ b/src/OrchardCore/OrchardCore.Media.Abstractions/Indexing/IMediaFileTextProvider.cs
@@ -1,19 +1,18 @@
 using System.IO;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Media.Indexing
+namespace OrchardCore.Media.Indexing;
+
+/// <summary>
+/// Service for producing the textual representation of a media file, e.g. the text contained in a PDF document.
+/// </summary>
+public interface IMediaFileTextProvider
 {
     /// <summary>
-    /// Service for producing the textual representation of a media file, e.g. the text contained in a PDF document.
+    /// Produces the textual representation of the media file with the given path.
     /// </summary>
-    public interface IMediaFileTextProvider
-    {
-        /// <summary>
-        /// Produces the textual representation of the media file with the given path.
-        /// </summary>
-        /// <param name="path">The full relative path of the media file.</param>
-        /// <param name="fileStream">The <see cref="Stream"/> that can be used to access the file's content.</param>
-        /// <returns>The textual representation of the media file.</returns>
-        Task<string> GetTextAsync(string path, Stream fileStream);
-    }
+    /// <param name="path">The full relative path of the media file.</param>
+    /// <param name="fileStream">The <see cref="Stream"/> that can be used to access the file's content.</param>
+    /// <returns>The textual representation of the media file.</returns>
+    Task<string> GetTextAsync(string path, Stream fileStream);
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Abstractions/Indexing/MediaFileIndexingOptions.cs b/src/OrchardCore/OrchardCore.Media.Abstractions/Indexing/MediaFileIndexingOptions.cs
index 9019138c8e3..5a4c2f3618e 100644
--- a/src/OrchardCore/OrchardCore.Media.Abstractions/Indexing/MediaFileIndexingOptions.cs
+++ b/src/OrchardCore/OrchardCore.Media.Abstractions/Indexing/MediaFileIndexingOptions.cs
@@ -1,44 +1,43 @@
 using System;
 using System.Collections.Generic;
 
-namespace OrchardCore.Media.Indexing
+namespace OrchardCore.Media.Indexing;
+
+public class MediaFileIndexingOptions
 {
-    public class MediaFileIndexingOptions
-    {
-        private readonly Dictionary<string, Type> _mediaFileTextProviderRegistrations = new(StringComparer.OrdinalIgnoreCase);
+    private readonly Dictionary<string, Type> _mediaFileTextProviderRegistrations = new(StringComparer.OrdinalIgnoreCase);
 
-        public MediaFileIndexingOptions RegisterMediaFileTextProvider<TMediaFileTextProvider>(string fileExtension)
-            where TMediaFileTextProvider : class, IMediaFileTextProvider
-        {
-            return RegisterMediaFileTextProvider(fileExtension, typeof(TMediaFileTextProvider));
-        }
+    public MediaFileIndexingOptions RegisterMediaFileTextProvider<TMediaFileTextProvider>(string fileExtension)
+        where TMediaFileTextProvider : class, IMediaFileTextProvider
+    {
+        return RegisterMediaFileTextProvider(fileExtension, typeof(TMediaFileTextProvider));
+    }
 
-        public MediaFileIndexingOptions RegisterMediaFileTextProvider(string fileExtension, Type providerType)
-        {
-            // Deliberate overwrite behavior so you can override registrations.
-            _mediaFileTextProviderRegistrations[ValidateFileExtension(fileExtension)] = providerType;
+    public MediaFileIndexingOptions RegisterMediaFileTextProvider(string fileExtension, Type providerType)
+    {
+        // Deliberate overwrite behavior so you can override registrations.
+        _mediaFileTextProviderRegistrations[ValidateFileExtension(fileExtension)] = providerType;
 
-            return this;
-        }
+        return this;
+    }
 
-        public Type GetRegisteredMediaFileTextProvider(string fileExtension)
+    public Type GetRegisteredMediaFileTextProvider(string fileExtension)
+    {
+        if (_mediaFileTextProviderRegistrations.TryGetValue(ValidateFileExtension(fileExtension), out var providerType))
         {
-            if (_mediaFileTextProviderRegistrations.TryGetValue(ValidateFileExtension(fileExtension), out var providerType))
-            {
-                return providerType;
-            }
-
-            return null;
+            return providerType;
         }
 
-        private static string ValidateFileExtension(string fileExtension)
-        {
-            if (!fileExtension.StartsWith('.'))
-            {
-                throw new ArgumentException("The file extension should start with a dot.");
-            }
+        return null;
+    }
 
-            return fileExtension;
+    private static string ValidateFileExtension(string fileExtension)
+    {
+        if (!fileExtension.StartsWith('.'))
+        {
+            throw new ArgumentException("The file extension should start with a dot.");
         }
+
+        return fileExtension;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Abstractions/Indexing/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Media.Abstractions/Indexing/ServiceCollectionExtensions.cs
index 21c3962b54e..6567fd95285 100644
--- a/src/OrchardCore/OrchardCore.Media.Abstractions/Indexing/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Media.Abstractions/Indexing/ServiceCollectionExtensions.cs
@@ -1,28 +1,27 @@
 using Microsoft.Extensions.DependencyInjection;
 
-namespace OrchardCore.Media.Indexing
+namespace OrchardCore.Media.Indexing;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    /// <summary>
+    /// Adds a new <see cref="IMediaFileTextProvider"/> to the <see cref="IServiceCollection"/> to process Media
+    /// files with the given file extension.
+    /// </summary>
+    /// <typeparam name="TMediaFileTextProvider">
+    /// The <see cref="IMediaFileTextProvider"/> implementation to process Media files with the given file
+    /// extension.
+    /// </typeparam>
+    /// <param name="services">
+    /// The <see cref="IServiceCollection"/> to add the <see cref="IMediaFileTextProvider"/> implementation to.
+    /// </param>
+    /// <param name="fileExtension">
+    /// The file extension of those files, wit a leading dot, that the given <see
+    /// cref="IMediaFileTextProvider"/> implementation will process.
+    /// </param>
+    public static IServiceCollection AddMediaFileTextProvider<TMediaFileTextProvider>(this IServiceCollection services, string fileExtension)
+        where TMediaFileTextProvider : class, IMediaFileTextProvider
     {
-        /// <summary>
-        /// Adds a new <see cref="IMediaFileTextProvider"/> to the <see cref="IServiceCollection"/> to process Media
-        /// files with the given file extension.
-        /// </summary>
-        /// <typeparam name="TMediaFileTextProvider">
-        /// The <see cref="IMediaFileTextProvider"/> implementation to process Media files with the given file
-        /// extension.
-        /// </typeparam>
-        /// <param name="services">
-        /// The <see cref="IServiceCollection"/> to add the <see cref="IMediaFileTextProvider"/> implementation to.
-        /// </param>
-        /// <param name="fileExtension">
-        /// The file extension of those files, wit a leading dot, that the given <see
-        /// cref="IMediaFileTextProvider"/> implementation will process.
-        /// </param>
-        public static IServiceCollection AddMediaFileTextProvider<TMediaFileTextProvider>(this IServiceCollection services, string fileExtension)
-            where TMediaFileTextProvider : class, IMediaFileTextProvider
-        {
-            return services.Configure<MediaFileIndexingOptions>(options => options.RegisterMediaFileTextProvider<TMediaFileTextProvider>(fileExtension));
-        }
+        return services.Configure<MediaFileIndexingOptions>(options => options.RegisterMediaFileTextProvider<TMediaFileTextProvider>(fileExtension));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Abstractions/MediaOptions.cs b/src/OrchardCore/OrchardCore.Media.Abstractions/MediaOptions.cs
index f08cac9d3a0..4f257301515 100644
--- a/src/OrchardCore/OrchardCore.Media.Abstractions/MediaOptions.cs
+++ b/src/OrchardCore/OrchardCore.Media.Abstractions/MediaOptions.cs
@@ -3,99 +3,98 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Media
+namespace OrchardCore.Media;
+
+public class MediaOptions
 {
-    public class MediaOptions
-    {
-        /// <summary>
-        /// The accepted sizes for custom width and height.
-        /// When <see cref="UseTokenizedQueryString"/> is enabled all sizes are valid
-        /// and this range acts as a helper for media profiles.
-        /// </summary>
-        // Setting a default value will make the IShellConfiguration add to the default values, rather than replace.
-        public int[] SupportedSizes { get; set; }
-
-        /// <summary>
-        /// The list of allowed file extensions.
-        /// </summary>
-        // Setting a default value will make the IShellConfiguration add to the default values, rather than replace.
-        public HashSet<string> AllowedFileExtensions { get; set; }
-
-        /// <summary>
-        /// The default number of days for the media cache control header.
-        /// </summary>
-        public int MaxBrowserCacheDays { get; set; }
-
-        /// <summary>
-        /// The default number of days for the media cache control header when serving secure files.
-        /// </summary>
-        /// <remarks>
-        /// Set to 0 to disable caching secure files.
-        /// </remarks>
-        public int MaxSecureFilesBrowserCacheDays { get; set; }
-
-        /// <summary>
-        /// The maximum number of days a cached resized media item will be valid for, before being rebuilt on request.
-        /// </summary>
-        public int MaxCacheDays { get; set; }
-
-        /// <summary>
-        /// The time before a stale item is removed from the resized media cache, if not provided there is no cleanup.
-        /// </summary>
-        public TimeSpan? ResizedCacheMaxStale { get; set; }
-
-        /// <summary>
-        /// The time before a stale remote media item is removed from the cache, if not provided there is no cleanup.
-        /// </summary>
-        public TimeSpan? RemoteCacheMaxStale { get; set; }
-
-        /// <summary>
-        /// The maximum size of an uploaded file in bytes.
-        /// NB: You might still need to configure the limit in IIS (https://docs.microsoft.com/en-us/iis/configuration/system.webserver/security/requestfiltering/requestlimits/).
-        /// </summary>
-        public int MaxFileSize { get; set; }
-
-        /// <summary>
-        /// A CDN base url that will be prefixed to the request path when serving images.
-        /// </summary>
-        public string CdnBaseUrl { get; set; }
-
-        /// <summary>
-        /// The request path used to route asset files.
-        /// </summary>
-        public PathString AssetsRequestPath { get; set; }
-
-        /// <summary>
-        /// The name of the folder used to store media assets inside the App_Data folder.
-        /// </summary>
-        public string AssetsPath { get; set; }
-
-        /// <summary>
-        /// The folder under AssetsPath used to store users own media assets.
-        /// </summary>
-        public string AssetsUsersFolder { get; set; }
-
-        /// <summary>
-        /// Encrypts the image processing query string to prevent disc filling.
-        /// Defaults to <see langword="True"/>.
-        /// </summary>
-        public bool UseTokenizedQueryString { get; set; }
-
-        /// <summary>
-        /// The static file options used to serve non resized media.
-        /// </summary>
-        public StaticFileOptions StaticFileOptions { get; set; }
-
-        /// <summary>
-        /// The maximum chunk size when uploading files in bytes. If 0, no chunked upload is used. Defaults to 100 MB.
-        /// </summary>
-        public int MaxUploadChunkSize { get; set; }
-
-        /// <summary>
-        /// The lifetime of temporary files created during upload. Defaults to 1 hour.
-        /// </summary>
-        public TimeSpan TemporaryFileLifetime { get; set; }
-
-        public const string EncryptedCommandCacheKeyPrefix = "MediaCommands:";
-    }
+    /// <summary>
+    /// The accepted sizes for custom width and height.
+    /// When <see cref="UseTokenizedQueryString"/> is enabled all sizes are valid
+    /// and this range acts as a helper for media profiles.
+    /// </summary>
+    // Setting a default value will make the IShellConfiguration add to the default values, rather than replace.
+    public int[] SupportedSizes { get; set; }
+
+    /// <summary>
+    /// The list of allowed file extensions.
+    /// </summary>
+    // Setting a default value will make the IShellConfiguration add to the default values, rather than replace.
+    public HashSet<string> AllowedFileExtensions { get; set; }
+
+    /// <summary>
+    /// The default number of days for the media cache control header.
+    /// </summary>
+    public int MaxBrowserCacheDays { get; set; }
+
+    /// <summary>
+    /// The default number of days for the media cache control header when serving secure files.
+    /// </summary>
+    /// <remarks>
+    /// Set to 0 to disable caching secure files.
+    /// </remarks>
+    public int MaxSecureFilesBrowserCacheDays { get; set; }
+
+    /// <summary>
+    /// The maximum number of days a cached resized media item will be valid for, before being rebuilt on request.
+    /// </summary>
+    public int MaxCacheDays { get; set; }
+
+    /// <summary>
+    /// The time before a stale item is removed from the resized media cache, if not provided there is no cleanup.
+    /// </summary>
+    public TimeSpan? ResizedCacheMaxStale { get; set; }
+
+    /// <summary>
+    /// The time before a stale remote media item is removed from the cache, if not provided there is no cleanup.
+    /// </summary>
+    public TimeSpan? RemoteCacheMaxStale { get; set; }
+
+    /// <summary>
+    /// The maximum size of an uploaded file in bytes.
+    /// NB: You might still need to configure the limit in IIS (https://docs.microsoft.com/en-us/iis/configuration/system.webserver/security/requestfiltering/requestlimits/).
+    /// </summary>
+    public int MaxFileSize { get; set; }
+
+    /// <summary>
+    /// A CDN base url that will be prefixed to the request path when serving images.
+    /// </summary>
+    public string CdnBaseUrl { get; set; }
+
+    /// <summary>
+    /// The request path used to route asset files.
+    /// </summary>
+    public PathString AssetsRequestPath { get; set; }
+
+    /// <summary>
+    /// The name of the folder used to store media assets inside the App_Data folder.
+    /// </summary>
+    public string AssetsPath { get; set; }
+
+    /// <summary>
+    /// The folder under AssetsPath used to store users own media assets.
+    /// </summary>
+    public string AssetsUsersFolder { get; set; }
+
+    /// <summary>
+    /// Encrypts the image processing query string to prevent disc filling.
+    /// Defaults to <see langword="True"/>.
+    /// </summary>
+    public bool UseTokenizedQueryString { get; set; }
+
+    /// <summary>
+    /// The static file options used to serve non resized media.
+    /// </summary>
+    public StaticFileOptions StaticFileOptions { get; set; }
+
+    /// <summary>
+    /// The maximum chunk size when uploading files in bytes. If 0, no chunked upload is used. Defaults to 100 MB.
+    /// </summary>
+    public int MaxUploadChunkSize { get; set; }
+
+    /// <summary>
+    /// The lifetime of temporary files created during upload. Defaults to 1 hour.
+    /// </summary>
+    public TimeSpan TemporaryFileLifetime { get; set; }
+
+    public const string EncryptedCommandCacheKeyPrefix = "MediaCommands:";
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Core/DefaultMediaFileStore.cs b/src/OrchardCore/OrchardCore.Media.Core/DefaultMediaFileStore.cs
index 5dd33aee96c..97178d4e793 100644
--- a/src/OrchardCore/OrchardCore.Media.Core/DefaultMediaFileStore.cs
+++ b/src/OrchardCore/OrchardCore.Media.Core/DefaultMediaFileStore.cs
@@ -12,219 +12,218 @@
 using OrchardCore.Media.Events;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Media.Core
+namespace OrchardCore.Media.Core;
+
+public class DefaultMediaFileStore : IMediaFileStore
 {
-    public class DefaultMediaFileStore : IMediaFileStore
+    private readonly IFileStore _fileStore;
+    private string _requestBasePath;
+    private readonly string _cdnBaseUrl;
+    private readonly IEnumerable<IMediaEventHandler> _mediaEventHandlers;
+    private readonly IEnumerable<IMediaCreatingEventHandler> _mediaCreatingEventHandlers;
+    private readonly ILogger _logger;
+
+    private bool _requestBasePathValidated;
+
+    public DefaultMediaFileStore(
+        IFileStore fileStore,
+        string requestBasePath,
+        string cdnBaseUrl,
+        IEnumerable<IMediaEventHandler> mediaEventHandlers,
+        IEnumerable<IMediaCreatingEventHandler> mediaCreatingEventHandlers,
+        ILogger<DefaultMediaFileStore> logger
+        )
     {
-        private readonly IFileStore _fileStore;
-        private string _requestBasePath;
-        private readonly string _cdnBaseUrl;
-        private readonly IEnumerable<IMediaEventHandler> _mediaEventHandlers;
-        private readonly IEnumerable<IMediaCreatingEventHandler> _mediaCreatingEventHandlers;
-        private readonly ILogger _logger;
-
-        private bool _requestBasePathValidated;
-
-        public DefaultMediaFileStore(
-            IFileStore fileStore,
-            string requestBasePath,
-            string cdnBaseUrl,
-            IEnumerable<IMediaEventHandler> mediaEventHandlers,
-            IEnumerable<IMediaCreatingEventHandler> mediaCreatingEventHandlers,
-            ILogger<DefaultMediaFileStore> logger
-            )
-        {
-            _fileStore = fileStore;
+        _fileStore = fileStore;
 
-            // Ensure trailing slash removed.
-            _requestBasePath = requestBasePath.TrimEnd('/');
+        // Ensure trailing slash removed.
+        _requestBasePath = requestBasePath.TrimEnd('/');
 
-            // Media options configuration ensures any trailing slash is removed.
-            _cdnBaseUrl = cdnBaseUrl;
+        // Media options configuration ensures any trailing slash is removed.
+        _cdnBaseUrl = cdnBaseUrl;
 
-            _mediaEventHandlers = mediaEventHandlers;
-            _mediaCreatingEventHandlers = mediaCreatingEventHandlers;
-            _logger = logger;
-        }
+        _mediaEventHandlers = mediaEventHandlers;
+        _mediaCreatingEventHandlers = mediaCreatingEventHandlers;
+        _logger = logger;
+    }
 
-        public virtual Task<IFileStoreEntry> GetFileInfoAsync(string path)
-        {
-            return _fileStore.GetFileInfoAsync(path);
-        }
+    public virtual Task<IFileStoreEntry> GetFileInfoAsync(string path)
+    {
+        return _fileStore.GetFileInfoAsync(path);
+    }
 
-        public virtual Task<IFileStoreEntry> GetDirectoryInfoAsync(string path)
-        {
-            return _fileStore.GetDirectoryInfoAsync(path);
-        }
+    public virtual Task<IFileStoreEntry> GetDirectoryInfoAsync(string path)
+    {
+        return _fileStore.GetDirectoryInfoAsync(path);
+    }
 
-        public virtual IAsyncEnumerable<IFileStoreEntry> GetDirectoryContentAsync(string path = null, bool includeSubDirectories = false)
-        {
-            return _fileStore.GetDirectoryContentAsync(path, includeSubDirectories);
-        }
+    public virtual IAsyncEnumerable<IFileStoreEntry> GetDirectoryContentAsync(string path = null, bool includeSubDirectories = false)
+    {
+        return _fileStore.GetDirectoryContentAsync(path, includeSubDirectories);
+    }
 
-        public virtual async Task<bool> TryCreateDirectoryAsync(string path)
+    public virtual async Task<bool> TryCreateDirectoryAsync(string path)
+    {
+        var creatingContext = new MediaCreatingContext
         {
-            var creatingContext = new MediaCreatingContext
-            {
-                Path = path
-            };
+            Path = path
+        };
 
-            await _mediaEventHandlers.InvokeAsync((handler, context) => handler.MediaCreatingDirectoryAsync(context), creatingContext, _logger);
+        await _mediaEventHandlers.InvokeAsync((handler, context) => handler.MediaCreatingDirectoryAsync(context), creatingContext, _logger);
 
-            var result = await _fileStore.TryCreateDirectoryAsync(path);
+        var result = await _fileStore.TryCreateDirectoryAsync(path);
 
-            var createdContext = new MediaCreatedContext
-            {
-                Path = path,
-                Result = result
-            };
+        var createdContext = new MediaCreatedContext
+        {
+            Path = path,
+            Result = result
+        };
 
-            await _mediaEventHandlers.InvokeAsync((handler, context) => handler.MediaCreatedDirectoryAsync(context), createdContext, _logger);
+        await _mediaEventHandlers.InvokeAsync((handler, context) => handler.MediaCreatedDirectoryAsync(context), createdContext, _logger);
 
-            return result;
-        }
+        return result;
+    }
 
-        public virtual async Task<bool> TryDeleteFileAsync(string path)
+    public virtual async Task<bool> TryDeleteFileAsync(string path)
+    {
+        var deletingContext = new MediaDeletingContext
         {
-            var deletingContext = new MediaDeletingContext
-            {
-                Path = path
-            };
+            Path = path
+        };
 
-            await _mediaEventHandlers.InvokeAsync((handler, context) => handler.MediaDeletingFileAsync(context), deletingContext, _logger);
+        await _mediaEventHandlers.InvokeAsync((handler, context) => handler.MediaDeletingFileAsync(context), deletingContext, _logger);
 
-            var result = await _fileStore.TryDeleteFileAsync(deletingContext.Path);
+        var result = await _fileStore.TryDeleteFileAsync(deletingContext.Path);
 
-            var deletedContext = new MediaDeletedContext
-            {
-                Path = path,
-                Result = result
-            };
+        var deletedContext = new MediaDeletedContext
+        {
+            Path = path,
+            Result = result
+        };
 
-            await _mediaEventHandlers.InvokeAsync((handler, deletedContext) => handler.MediaDeletedFileAsync(deletedContext), deletedContext, _logger);
+        await _mediaEventHandlers.InvokeAsync((handler, deletedContext) => handler.MediaDeletedFileAsync(deletedContext), deletedContext, _logger);
 
-            return result;
-        }
+        return result;
+    }
 
-        public virtual async Task<bool> TryDeleteDirectoryAsync(string path)
+    public virtual async Task<bool> TryDeleteDirectoryAsync(string path)
+    {
+        var deletingContext = new MediaDeletingContext
         {
-            var deletingContext = new MediaDeletingContext
-            {
-                Path = path
-            };
+            Path = path
+        };
 
-            await _mediaEventHandlers.InvokeAsync((handler, context) => handler.MediaDeletingDirectoryAsync(context), deletingContext, _logger);
+        await _mediaEventHandlers.InvokeAsync((handler, context) => handler.MediaDeletingDirectoryAsync(context), deletingContext, _logger);
 
-            var result = await _fileStore.TryDeleteDirectoryAsync(path);
+        var result = await _fileStore.TryDeleteDirectoryAsync(path);
 
-            var deletedContext = new MediaDeletedContext
-            {
-                Path = path,
-                Result = result
-            };
+        var deletedContext = new MediaDeletedContext
+        {
+            Path = path,
+            Result = result
+        };
 
-            await _mediaEventHandlers.InvokeAsync((handler, deletedContext) => handler.MediaDeletedDirectoryAsync(deletedContext), deletedContext, _logger);
+        await _mediaEventHandlers.InvokeAsync((handler, deletedContext) => handler.MediaDeletedDirectoryAsync(deletedContext), deletedContext, _logger);
 
-            return result;
-        }
+        return result;
+    }
 
-        public virtual async Task MoveFileAsync(string oldPath, string newPath)
+    public virtual async Task MoveFileAsync(string oldPath, string newPath)
+    {
+        var context = new MediaMoveContext
         {
-            var context = new MediaMoveContext
-            {
-                OldPath = oldPath,
-                NewPath = newPath
-            };
+            OldPath = oldPath,
+            NewPath = newPath
+        };
 
-            await _mediaEventHandlers.InvokeAsync((handler, context) => handler.MediaMovingAsync(context), context, _logger);
+        await _mediaEventHandlers.InvokeAsync((handler, context) => handler.MediaMovingAsync(context), context, _logger);
 
-            await _fileStore.MoveFileAsync(context.OldPath, context.NewPath);
+        await _fileStore.MoveFileAsync(context.OldPath, context.NewPath);
 
-            await _mediaEventHandlers.InvokeAsync((handler, context) => handler.MediaMovedAsync(context), context, _logger);
-        }
+        await _mediaEventHandlers.InvokeAsync((handler, context) => handler.MediaMovedAsync(context), context, _logger);
+    }
 
-        public virtual Task CopyFileAsync(string srcPath, string dstPath)
-        {
-            return _fileStore.CopyFileAsync(srcPath, dstPath);
-        }
+    public virtual Task CopyFileAsync(string srcPath, string dstPath)
+    {
+        return _fileStore.CopyFileAsync(srcPath, dstPath);
+    }
 
-        public virtual Task<Stream> GetFileStreamAsync(string path)
-        {
-            return _fileStore.GetFileStreamAsync(path);
-        }
+    public virtual Task<Stream> GetFileStreamAsync(string path)
+    {
+        return _fileStore.GetFileStreamAsync(path);
+    }
 
-        public virtual Task<Stream> GetFileStreamAsync(IFileStoreEntry fileStoreEntry)
-        {
-            return _fileStore.GetFileStreamAsync(fileStoreEntry);
-        }
+    public virtual Task<Stream> GetFileStreamAsync(IFileStoreEntry fileStoreEntry)
+    {
+        return _fileStore.GetFileStreamAsync(fileStoreEntry);
+    }
 
-        public virtual async Task<string> CreateFileFromStreamAsync(string path, Stream inputStream, bool overwrite = false)
+    public virtual async Task<string> CreateFileFromStreamAsync(string path, Stream inputStream, bool overwrite = false)
+    {
+        if (_mediaCreatingEventHandlers.Any())
         {
-            if (_mediaCreatingEventHandlers.Any())
+            // Follows https://rules.sonarsource.com/csharp/RSPEC-3966
+            // Assumes that each stream should be disposed of only once by it's caller.
+            var outputStream = inputStream;
+            try
             {
-                // Follows https://rules.sonarsource.com/csharp/RSPEC-3966
-                // Assumes that each stream should be disposed of only once by it's caller.
-                var outputStream = inputStream;
-                try
+                var context = new MediaCreatingContext
                 {
-                    var context = new MediaCreatingContext
-                    {
-                        Path = path
-                    };
+                    Path = path
+                };
 
-                    foreach (var mediaCreatingEventHandler in _mediaCreatingEventHandlers)
-                    {
-                        // Creating stream disposed by using.
-                        using var creatingStream = outputStream;
-
-                        // Stop disposal of inputStream, as creating stream is the object to dispose.
-                        inputStream = null;
+                foreach (var mediaCreatingEventHandler in _mediaCreatingEventHandlers)
+                {
+                    // Creating stream disposed by using.
+                    using var creatingStream = outputStream;
 
-                        // Outputstream must be created by event handler.
-                        outputStream = null;
+                    // Stop disposal of inputStream, as creating stream is the object to dispose.
+                    inputStream = null;
 
-                        outputStream = await mediaCreatingEventHandler.MediaCreatingAsync(context, creatingStream);
-                    }
+                    // Outputstream must be created by event handler.
+                    outputStream = null;
 
-                    return await _fileStore.CreateFileFromStreamAsync(context.Path, outputStream, overwrite);
-                }
-                finally
-                {
-                    // This disposes the last outputStream.
-                    outputStream?.Dispose();
+                    outputStream = await mediaCreatingEventHandler.MediaCreatingAsync(context, creatingStream);
                 }
+
+                return await _fileStore.CreateFileFromStreamAsync(context.Path, outputStream, overwrite);
             }
-            else
+            finally
             {
-                return await _fileStore.CreateFileFromStreamAsync(path, inputStream, overwrite);
+                // This disposes the last outputStream.
+                outputStream?.Dispose();
             }
         }
+        else
+        {
+            return await _fileStore.CreateFileFromStreamAsync(path, inputStream, overwrite);
+        }
+    }
 
-        public virtual string MapPathToPublicUrl(string path)
+    public virtual string MapPathToPublicUrl(string path)
+    {
+        if (!_requestBasePathValidated)
         {
-            if (!_requestBasePathValidated)
+            var httpContext = ShellScope.Services?.GetRequiredService<IHttpContextAccessor>().HttpContext;
+            if (httpContext is not null && !httpContext.Items.ContainsKey("IsBackground"))
             {
-                var httpContext = ShellScope.Services?.GetRequiredService<IHttpContextAccessor>().HttpContext;
-                if (httpContext is not null && !httpContext.Items.ContainsKey("IsBackground"))
-                {
-                    ValidateRequestBasePath(httpContext);
-                    _requestBasePathValidated = true;
-                }
+                ValidateRequestBasePath(httpContext);
+                _requestBasePathValidated = true;
             }
-
-            return _cdnBaseUrl + _requestBasePath + "/" + _fileStore.NormalizeAndEscapePath(path);
         }
 
-        private void ValidateRequestBasePath(HttpContext httpContext)
+        return _cdnBaseUrl + _requestBasePath + "/" + _fileStore.NormalizeAndEscapePath(path);
+    }
+
+    private void ValidateRequestBasePath(HttpContext httpContext)
+    {
+        var originalPathBase = httpContext.Features.Get<ShellContextFeature>()?.OriginalPathBase ?? PathString.Empty;
+        if (originalPathBase.HasValue)
         {
-            var originalPathBase = httpContext.Features.Get<ShellContextFeature>()?.OriginalPathBase ?? PathString.Empty;
-            if (originalPathBase.HasValue)
+            var requestBasePath = _requestBasePath;
+            if (!requestBasePath.StartsWith(originalPathBase.Value, StringComparison.OrdinalIgnoreCase))
             {
-                var requestBasePath = _requestBasePath;
-                if (!requestBasePath.StartsWith(originalPathBase.Value, StringComparison.OrdinalIgnoreCase))
-                {
-                    _requestBasePath = _fileStore.Combine(originalPathBase.Value, requestBasePath);
-                }
+                _requestBasePath = _fileStore.Combine(originalPathBase.Value, requestBasePath);
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore.Media.Core/DefaultMediaFileStoreCacheFileProvider.cs b/src/OrchardCore/OrchardCore.Media.Core/DefaultMediaFileStoreCacheFileProvider.cs
index 0a1d66af21c..77d8c5b8296 100644
--- a/src/OrchardCore/OrchardCore.Media.Core/DefaultMediaFileStoreCacheFileProvider.cs
+++ b/src/OrchardCore/OrchardCore.Media.Core/DefaultMediaFileStoreCacheFileProvider.cs
@@ -8,164 +8,163 @@
 using Microsoft.Extensions.Logging;
 using OrchardCore.FileStorage;
 
-namespace OrchardCore.Media.Core
+namespace OrchardCore.Media.Core;
+
+public class DefaultMediaFileStoreCacheFileProvider : PhysicalFileProvider, IMediaFileStoreCacheFileProvider
 {
-    public class DefaultMediaFileStoreCacheFileProvider : PhysicalFileProvider, IMediaFileStoreCacheFileProvider
+    /// <summary>
+    /// The path in the wwwroot folder containing the asset cache.
+    /// The tenants name will be prepended to this path.
+    /// </summary>
+    public const string AssetsCachePath = "ms-cache";
+
+    // Use default stream copy buffer size to stay in gen0 garbage collection.
+    private const int StreamCopyBufferSize = 81920;
+
+    private readonly ILogger _logger;
+
+    public DefaultMediaFileStoreCacheFileProvider(ILogger<DefaultMediaFileStoreCacheFileProvider> logger, PathString virtualPathBase, string root) : base(root)
     {
-        /// <summary>
-        /// The path in the wwwroot folder containing the asset cache.
-        /// The tenants name will be prepended to this path.
-        /// </summary>
-        public const string AssetsCachePath = "ms-cache";
+        _logger = logger;
+        VirtualPathBase = virtualPathBase;
+    }
 
-        // Use default stream copy buffer size to stay in gen0 garbage collection.
-        private const int StreamCopyBufferSize = 81920;
+    public DefaultMediaFileStoreCacheFileProvider(ILogger<DefaultMediaFileStoreCacheFileProvider> logger, PathString virtualPathBase, string root, ExclusionFilters filters) : base(root, filters)
+    {
+        _logger = logger;
+        VirtualPathBase = virtualPathBase;
+    }
 
-        private readonly ILogger _logger;
+    public PathString VirtualPathBase { get; }
 
-        public DefaultMediaFileStoreCacheFileProvider(ILogger<DefaultMediaFileStoreCacheFileProvider> logger, PathString virtualPathBase, string root) : base(root)
-        {
-            _logger = logger;
-            VirtualPathBase = virtualPathBase;
-        }
+    public Task<bool> IsCachedAsync(string path)
+    {
+        // Opportunity here to save metadata and/or provide cache validation / integrity checks.
 
-        public DefaultMediaFileStoreCacheFileProvider(ILogger<DefaultMediaFileStoreCacheFileProvider> logger, PathString virtualPathBase, string root, ExclusionFilters filters) : base(root, filters)
-        {
-            _logger = logger;
-            VirtualPathBase = virtualPathBase;
-        }
+        var fileInfo = GetFileInfo(path);
+        return Task.FromResult(fileInfo.Exists);
+    }
 
-        public PathString VirtualPathBase { get; }
+    public async Task SetCacheAsync(Stream stream, IFileStoreEntry fileStoreEntry, CancellationToken cancellationToken)
+    {
+        // File store semantics may include a leading slash.
+        var cachePath = Path.Combine(Root, fileStoreEntry.Path.TrimStart('/'));
+        var directory = Path.GetDirectoryName(cachePath);
 
-        public Task<bool> IsCachedAsync(string path)
+        if (!Directory.Exists(directory))
         {
-            // Opportunity here to save metadata and/or provide cache validation / integrity checks.
-
-            var fileInfo = GetFileInfo(path);
-            return Task.FromResult(fileInfo.Exists);
+            Directory.CreateDirectory(directory);
         }
 
-        public async Task SetCacheAsync(Stream stream, IFileStoreEntry fileStoreEntry, CancellationToken cancellationToken)
+        // A file download may fail, so a partially downloaded file should be deleted so the next request can reprocess.
+        // All exceptions here are recaught by the MediaFileStoreResolverMiddleware.
+        try
         {
-            // File store semantics may include a leading slash.
-            var cachePath = Path.Combine(Root, fileStoreEntry.Path.TrimStart('/'));
-            var directory = Path.GetDirectoryName(cachePath);
-
-            if (!Directory.Exists(directory))
+            if (File.Exists(cachePath))
             {
-                Directory.CreateDirectory(directory);
+                File.Delete(cachePath);
             }
 
-            // A file download may fail, so a partially downloaded file should be deleted so the next request can reprocess.
-            // All exceptions here are recaught by the MediaFileStoreResolverMiddleware.
-            try
+            using var fileStream = File.Create(cachePath);
+            await stream.CopyToAsync(fileStream, StreamCopyBufferSize, CancellationToken.None);
+            await stream.FlushAsync(CancellationToken.None);
+
+            if (fileStream.Length == 0)
             {
-                if (File.Exists(cachePath))
+                throw new Exception($"Error retrieving file (length equals 0 byte) : {cachePath}");
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error saving file {Path}", cachePath);
+            if (File.Exists(cachePath))
+            {
+                try
                 {
                     File.Delete(cachePath);
                 }
-
-                using var fileStream = File.Create(cachePath);
-                await stream.CopyToAsync(fileStream, StreamCopyBufferSize, CancellationToken.None);
-                await stream.FlushAsync(CancellationToken.None);
-
-                if (fileStream.Length == 0)
+                catch (Exception e)
                 {
-                    throw new Exception($"Error retrieving file (length equals 0 byte) : {cachePath}");
+                    _logger.LogError(e, "Error deleting file {Path}", cachePath);
+                    throw;
                 }
             }
-            catch (Exception ex)
+            throw;
+        }
+    }
+
+    public Task<bool> PurgeAsync()
+    {
+        var hasErrors = false;
+        var folders = GetDirectoryContents(string.Empty);
+        foreach (var fileInfo in folders)
+        {
+            if (fileInfo.IsDirectory)
             {
-                _logger.LogError(ex, "Error saving file {Path}", cachePath);
-                if (File.Exists(cachePath))
+                try
                 {
-                    try
-                    {
-                        File.Delete(cachePath);
-                    }
-                    catch (Exception e)
-                    {
-                        _logger.LogError(e, "Error deleting file {Path}", cachePath);
-                        throw;
-                    }
+                    Directory.Delete(fileInfo.PhysicalPath, true);
+                }
+                catch (IOException ex)
+                {
+                    _logger.LogError(ex, "Error deleting cache folder {Path}", fileInfo.PhysicalPath);
+                    hasErrors = true;
                 }
-                throw;
             }
-        }
-
-        public Task<bool> PurgeAsync()
-        {
-            var hasErrors = false;
-            var folders = GetDirectoryContents(string.Empty);
-            foreach (var fileInfo in folders)
+            else
             {
-                if (fileInfo.IsDirectory)
+                try
                 {
-                    try
-                    {
-                        Directory.Delete(fileInfo.PhysicalPath, true);
-                    }
-                    catch (IOException ex)
-                    {
-                        _logger.LogError(ex, "Error deleting cache folder {Path}", fileInfo.PhysicalPath);
-                        hasErrors = true;
-                    }
+                    File.Delete(fileInfo.PhysicalPath);
                 }
-                else
+                catch (IOException ex)
                 {
-                    try
-                    {
-                        File.Delete(fileInfo.PhysicalPath);
-                    }
-                    catch (IOException ex)
-                    {
-                        _logger.LogError(ex, "Error deleting cache file {Path}", fileInfo.PhysicalPath);
-                        hasErrors = true;
-                    }
+                    _logger.LogError(ex, "Error deleting cache file {Path}", fileInfo.PhysicalPath);
+                    hasErrors = true;
                 }
             }
-
-            return Task.FromResult(hasErrors);
         }
 
-        public Task<bool> TryDeleteDirectoryAsync(string path)
+        return Task.FromResult(hasErrors);
+    }
+
+    public Task<bool> TryDeleteDirectoryAsync(string path)
+    {
+        var directoryInfo = GetFileInfo(path);
+
+        try
         {
-            var directoryInfo = GetFileInfo(path);
+            Directory.Delete(directoryInfo.PhysicalPath, true);
+        }
+        catch (IOException ex)
+        {
+            _logger.LogError(ex, "Error deleting cache folder {Path}", directoryInfo.PhysicalPath);
+            return Task.FromResult(false);
+        }
+
+        return Task.FromResult(true);
+    }
+
+    public Task<bool> TryDeleteFileAsync(string path)
+    {
+        var fileInfo = GetFileInfo(path);
 
+        if (fileInfo.Exists)
+        {
             try
             {
-                Directory.Delete(directoryInfo.PhysicalPath, true);
+                File.Delete(fileInfo.PhysicalPath);
+                return Task.FromResult(true);
             }
             catch (IOException ex)
             {
-                _logger.LogError(ex, "Error deleting cache folder {Path}", directoryInfo.PhysicalPath);
+                _logger.LogError(ex, "Error deleting cache file {Path}", fileInfo.PhysicalPath);
                 return Task.FromResult(false);
             }
-
-            return Task.FromResult(true);
         }
-
-        public Task<bool> TryDeleteFileAsync(string path)
+        else
         {
-            var fileInfo = GetFileInfo(path);
-
-            if (fileInfo.Exists)
-            {
-                try
-                {
-                    File.Delete(fileInfo.PhysicalPath);
-                    return Task.FromResult(true);
-                }
-                catch (IOException ex)
-                {
-                    _logger.LogError(ex, "Error deleting cache file {Path}", fileInfo.PhysicalPath);
-                    return Task.FromResult(false);
-                }
-            }
-            else
-            {
-                return Task.FromResult(false);
-            }
+            return Task.FromResult(false);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Core/Events/DefaultMediaFileStoreCacheEventHandler.cs b/src/OrchardCore/OrchardCore.Media.Core/Events/DefaultMediaFileStoreCacheEventHandler.cs
index 3be80deb93c..d5cbb714325 100644
--- a/src/OrchardCore/OrchardCore.Media.Core/Events/DefaultMediaFileStoreCacheEventHandler.cs
+++ b/src/OrchardCore/OrchardCore.Media.Core/Events/DefaultMediaFileStoreCacheEventHandler.cs
@@ -1,36 +1,35 @@
 using System.Threading.Tasks;
 using OrchardCore.Media.Events;
 
-namespace OrchardCore.Media.Core.Events
+namespace OrchardCore.Media.Core.Events;
+
+public class DefaultMediaFileStoreCacheEventHandler : MediaEventHandlerBase
 {
-    public class DefaultMediaFileStoreCacheEventHandler : MediaEventHandlerBase
-    {
-        private readonly IMediaFileStoreCacheFileProvider _mediaFileStoreCacheFileProvider;
+    private readonly IMediaFileStoreCacheFileProvider _mediaFileStoreCacheFileProvider;
 
-        public DefaultMediaFileStoreCacheEventHandler(IMediaFileStoreCacheFileProvider mediaFileStoreCacheFileProvider)
-        {
-            _mediaFileStoreCacheFileProvider = mediaFileStoreCacheFileProvider;
-        }
+    public DefaultMediaFileStoreCacheEventHandler(IMediaFileStoreCacheFileProvider mediaFileStoreCacheFileProvider)
+    {
+        _mediaFileStoreCacheFileProvider = mediaFileStoreCacheFileProvider;
+    }
 
-        public override Task MediaDeletedDirectoryAsync(MediaDeletedContext context)
-        {
-            _mediaFileStoreCacheFileProvider.TryDeleteDirectoryAsync(context.Path);
+    public override Task MediaDeletedDirectoryAsync(MediaDeletedContext context)
+    {
+        _mediaFileStoreCacheFileProvider.TryDeleteDirectoryAsync(context.Path);
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
+    }
 
-        public override Task MediaDeletedFileAsync(MediaDeletedContext context)
-        {
-            _mediaFileStoreCacheFileProvider.TryDeleteFileAsync(context.Path);
+    public override Task MediaDeletedFileAsync(MediaDeletedContext context)
+    {
+        _mediaFileStoreCacheFileProvider.TryDeleteFileAsync(context.Path);
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
+    }
 
-        public override Task MediaMovedAsync(MediaMoveContext context)
-        {
-            _mediaFileStoreCacheFileProvider.TryDeleteFileAsync(context.OldPath);
+    public override Task MediaMovedAsync(MediaMoveContext context)
+    {
+        _mediaFileStoreCacheFileProvider.TryDeleteFileAsync(context.OldPath);
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Core/Events/MediaEventHandlerBase.cs b/src/OrchardCore/OrchardCore.Media.Core/Events/MediaEventHandlerBase.cs
index 62205c3c37d..cd5c48f7fc7 100644
--- a/src/OrchardCore/OrchardCore.Media.Core/Events/MediaEventHandlerBase.cs
+++ b/src/OrchardCore/OrchardCore.Media.Core/Events/MediaEventHandlerBase.cs
@@ -1,42 +1,41 @@
 using System.Threading.Tasks;
 using OrchardCore.Media.Events;
 
-namespace OrchardCore.Media.Core.Events
+namespace OrchardCore.Media.Core.Events;
+
+public class MediaEventHandlerBase : IMediaEventHandler
 {
-    public class MediaEventHandlerBase : IMediaEventHandler
+    public virtual Task MediaDeletedDirectoryAsync(MediaDeletedContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task MediaDeletedFileAsync(MediaDeletedContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task MediaDeletingDirectoryAsync(MediaDeletingContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task MediaDeletingFileAsync(MediaDeletingContext context)
     {
-        public virtual Task MediaDeletedDirectoryAsync(MediaDeletedContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task MediaDeletedFileAsync(MediaDeletedContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task MediaDeletingDirectoryAsync(MediaDeletingContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task MediaDeletingFileAsync(MediaDeletingContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public Task MediaMovingAsync(MediaMoveContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task MediaMovedAsync(MediaMoveContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task MediaCreatingDirectoryAsync(MediaCreatingContext context) => Task.CompletedTask;
-
-        public virtual Task MediaCreatedDirectoryAsync(MediaCreatedContext context) => Task.CompletedTask;
+        return Task.CompletedTask;
     }
+
+    public Task MediaMovingAsync(MediaMoveContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task MediaMovedAsync(MediaMoveContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task MediaCreatingDirectoryAsync(MediaCreatingContext context) => Task.CompletedTask;
+
+    public virtual Task MediaCreatedDirectoryAsync(MediaCreatedContext context) => Task.CompletedTask;
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Core/Fields/MediaField.cs b/src/OrchardCore/OrchardCore.Media.Core/Fields/MediaField.cs
index 047c9c4340d..b942cdbe13c 100644
--- a/src/OrchardCore/OrchardCore.Media.Core/Fields/MediaField.cs
+++ b/src/OrchardCore/OrchardCore.Media.Core/Fields/MediaField.cs
@@ -1,10 +1,9 @@
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Media.Fields
+namespace OrchardCore.Media.Fields;
+
+public class MediaField : ContentField
 {
-    public class MediaField : ContentField
-    {
-        public string[] Paths { get; set; }
-        public string[] MediaTexts { get; set; }
-    }
+    public string[] Paths { get; set; }
+    public string[] MediaTexts { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Media.Core/Services/MediaSizeLimitAttribute.cs b/src/OrchardCore/OrchardCore.Media.Core/Services/MediaSizeLimitAttribute.cs
index 97c2d1fed30..f3b1e20ac61 100644
--- a/src/OrchardCore/OrchardCore.Media.Core/Services/MediaSizeLimitAttribute.cs
+++ b/src/OrchardCore/OrchardCore.Media.Core/Services/MediaSizeLimitAttribute.cs
@@ -5,65 +5,64 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Media.Services
+namespace OrchardCore.Media.Services;
+
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+public class MediaSizeLimitAttribute : Attribute, IFilterFactory, IOrderedFilter
 {
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
-    public class MediaSizeLimitAttribute : Attribute, IFilterFactory, IOrderedFilter
+    public int Order { get; set; } = 900;
+
+    /// <inheritdoc />
+    public bool IsReusable => true;
+
+    /// <inheritdoc />
+    public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
     {
-        public int Order { get; set; } = 900;
+        var options = serviceProvider.GetRequiredService<IOptions<MediaOptions>>();
+
+        return new InternalMediaSizeFilter(options.Value.MaxFileSize);
+    }
 
-        /// <inheritdoc />
-        public bool IsReusable => true;
+    private sealed class InternalMediaSizeFilter : IAuthorizationFilter, IRequestFormLimitsPolicy
+    {
+        private readonly long _maxFileSize;
 
-        /// <inheritdoc />
-        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+        public InternalMediaSizeFilter(long maxFileSize)
         {
-            var options = serviceProvider.GetRequiredService<IOptions<MediaOptions>>();
-
-            return new InternalMediaSizeFilter(options.Value.MaxFileSize);
+            _maxFileSize = maxFileSize;
         }
 
-        private sealed class InternalMediaSizeFilter : IAuthorizationFilter, IRequestFormLimitsPolicy
+        public void OnAuthorization(AuthorizationFilterContext context)
         {
-            private readonly long _maxFileSize;
-
-            public InternalMediaSizeFilter(long maxFileSize)
-            {
-                _maxFileSize = maxFileSize;
-            }
+            ArgumentNullException.ThrowIfNull(context);
 
-            public void OnAuthorization(AuthorizationFilterContext context)
+            var effectiveFormPolicy = context.FindEffectivePolicy<IRequestFormLimitsPolicy>();
+            if (effectiveFormPolicy == null || effectiveFormPolicy == this)
             {
-                ArgumentNullException.ThrowIfNull(context);
+                var features = context.HttpContext.Features;
+                var formFeature = features.Get<IFormFeature>();
 
-                var effectiveFormPolicy = context.FindEffectivePolicy<IRequestFormLimitsPolicy>();
-                if (effectiveFormPolicy == null || effectiveFormPolicy == this)
+                if (formFeature == null || formFeature.Form == null)
                 {
-                    var features = context.HttpContext.Features;
-                    var formFeature = features.Get<IFormFeature>();
-
-                    if (formFeature == null || formFeature.Form == null)
+                    // Request form has not been read yet, so set the limits
+                    var formOptions = new FormOptions
                     {
-                        // Request form has not been read yet, so set the limits
-                        var formOptions = new FormOptions
-                        {
-                            MultipartBodyLengthLimit = _maxFileSize
-                        };
+                        MultipartBodyLengthLimit = _maxFileSize
+                    };
 
-                        features.Set<IFormFeature>(new FormFeature(context.HttpContext.Request, formOptions));
-                    }
+                    features.Set<IFormFeature>(new FormFeature(context.HttpContext.Request, formOptions));
                 }
+            }
 
-                var effectiveRequestSizePolicy = context.FindEffectivePolicy<IRequestSizePolicy>();
-                if (effectiveRequestSizePolicy == null)
-                {
-                    // Will only be available when running OutOfProcess with Kestrel.
-                    var maxRequestBodySizeFeature = context.HttpContext.Features.Get<IHttpMaxRequestBodySizeFeature>();
+            var effectiveRequestSizePolicy = context.FindEffectivePolicy<IRequestSizePolicy>();
+            if (effectiveRequestSizePolicy == null)
+            {
+                // Will only be available when running OutOfProcess with Kestrel.
+                var maxRequestBodySizeFeature = context.HttpContext.Features.Get<IHttpMaxRequestBodySizeFeature>();
 
-                    if (maxRequestBodySizeFeature != null && !maxRequestBodySizeFeature.IsReadOnly)
-                    {
-                        maxRequestBodySizeFeature.MaxRequestBodySize = _maxFileSize;
-                    }
+                if (maxRequestBodySizeFeature != null && !maxRequestBodySizeFeature.IsReadOnly)
+                {
+                    maxRequestBodySizeFeature.MaxRequestBodySize = _maxFileSize;
                 }
             }
         }
diff --git a/src/OrchardCore/OrchardCore.Media.Core/Settings/MediaFieldSettings.cs b/src/OrchardCore/OrchardCore.Media.Core/Settings/MediaFieldSettings.cs
index 5f10f0e1f04..a56cc9f5603 100644
--- a/src/OrchardCore/OrchardCore.Media.Core/Settings/MediaFieldSettings.cs
+++ b/src/OrchardCore/OrchardCore.Media.Core/Settings/MediaFieldSettings.cs
@@ -1,21 +1,20 @@
 using System.ComponentModel;
 
-namespace OrchardCore.Media.Settings
+namespace OrchardCore.Media.Settings;
+
+public class MediaFieldSettings
 {
-    public class MediaFieldSettings
-    {
-        public string Hint { get; set; }
+    public string Hint { get; set; }
 
-        public bool Required { get; set; }
+    public bool Required { get; set; }
 
-        [DefaultValue(true)]
-        public bool Multiple { get; set; } = true;
+    [DefaultValue(true)]
+    public bool Multiple { get; set; } = true;
 
-        [DefaultValue(true)]
-        public bool AllowMediaText { get; set; } = true;
+    [DefaultValue(true)]
+    public bool AllowMediaText { get; set; } = true;
 
-        public bool AllowAnchors { get; set; }
+    public bool AllowAnchors { get; set; }
 
-        public string[] AllowedExtensions { get; set; } = [];
-    }
+    public string[] AllowedExtensions { get; set; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.MetaWeblog.Abstractions/IMetaWeblogDriver.cs b/src/OrchardCore/OrchardCore.MetaWeblog.Abstractions/IMetaWeblogDriver.cs
index 8f153285e0f..55f656a994d 100644
--- a/src/OrchardCore/OrchardCore.MetaWeblog.Abstractions/IMetaWeblogDriver.cs
+++ b/src/OrchardCore/OrchardCore.MetaWeblog.Abstractions/IMetaWeblogDriver.cs
@@ -3,12 +3,11 @@
 using OrchardCore.XmlRpc;
 using OrchardCore.XmlRpc.Models;
 
-namespace OrchardCore.MetaWeblog
+namespace OrchardCore.MetaWeblog;
+
+public interface IMetaWeblogDriver
 {
-    public interface IMetaWeblogDriver
-    {
-        void SetCapabilities(Action<string, string> setCapability);
-        void BuildPost(XRpcStruct rpcStruct, XmlRpcContext context, ContentItem contentItem);
-        void EditPost(XRpcStruct rpcStruct, ContentItem contentItem);
-    }
+    void SetCapabilities(Action<string, string> setCapability);
+    void BuildPost(XRpcStruct rpcStruct, XmlRpcContext context, ContentItem contentItem);
+    void EditPost(XRpcStruct rpcStruct, ContentItem contentItem);
 }
diff --git a/src/OrchardCore/OrchardCore.MetaWeblog.Abstractions/MetaWeblogDriver.cs b/src/OrchardCore/OrchardCore.MetaWeblog.Abstractions/MetaWeblogDriver.cs
index 329ff47da1b..050c90abe7b 100644
--- a/src/OrchardCore/OrchardCore.MetaWeblog.Abstractions/MetaWeblogDriver.cs
+++ b/src/OrchardCore/OrchardCore.MetaWeblog.Abstractions/MetaWeblogDriver.cs
@@ -3,20 +3,19 @@
 using OrchardCore.XmlRpc;
 using OrchardCore.XmlRpc.Models;
 
-namespace OrchardCore.MetaWeblog
+namespace OrchardCore.MetaWeblog;
+
+public abstract class MetaWeblogDriver : IMetaWeblogDriver
 {
-    public abstract class MetaWeblogDriver : IMetaWeblogDriver
+    public virtual void BuildPost(XRpcStruct rpcStruct, XmlRpcContext context, ContentItem contentItem)
     {
-        public virtual void BuildPost(XRpcStruct rpcStruct, XmlRpcContext context, ContentItem contentItem)
-        {
-        }
+    }
 
-        public virtual void EditPost(XRpcStruct rpcStruct, ContentItem contentItem)
-        {
-        }
+    public virtual void EditPost(XRpcStruct rpcStruct, ContentItem contentItem)
+    {
+    }
 
-        public virtual void SetCapabilities(Action<string, string> setCapability)
-        {
-        }
+    public virtual void SetCapabilities(Action<string, string> setCapability)
+    {
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/ApplicationViewFileProvider.cs b/src/OrchardCore/OrchardCore.Mvc.Core/ApplicationViewFileProvider.cs
index 0dc162dbb6d..fda8c211796 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/ApplicationViewFileProvider.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/ApplicationViewFileProvider.cs
@@ -7,109 +7,108 @@
 using Microsoft.Extensions.Primitives;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Mvc
-{
-    /// <summary>
-    /// This custom <see cref="IFileProvider"/> implementation provides the file contents of
-    /// the Application's module view files while in a development or production environment.
-    /// </summary>
-    public class ApplicationViewFileProvider : IFileProvider
-    {
-        private readonly IApplicationContext _applicationContext;
-
-        public ApplicationViewFileProvider(IApplicationContext applicationContext)
-        {
-            _applicationContext = applicationContext;
-        }
-
-        private Application Application => _applicationContext.Application;
+namespace OrchardCore.Mvc;
 
-        public IDirectoryContents GetDirectoryContents(string subpath)
-        {
-            // 'GetDirectoryContents()' is used to discover shapes templates and build fixed binding tables.
-            // So the embedded file provider can always provide the structure under modules "Views" folders.
-            // But application's module shapes are not embedded, so we need to serve the application "Views".
+/// <summary>
+/// This custom <see cref="IFileProvider"/> implementation provides the file contents of
+/// the Application's module view files while in a development or production environment.
+/// </summary>
+public class ApplicationViewFileProvider : IFileProvider
+{
+    private readonly IApplicationContext _applicationContext;
 
-            // The razor view engine also uses 'GetDirectoryContents()' to find razor pages (not mvc views).
-            // So here, we also need to serve the directory contents under the application "Pages" folder.
+    public ApplicationViewFileProvider(IApplicationContext applicationContext)
+    {
+        _applicationContext = applicationContext;
+    }
 
-            // Note: This provider is also used in production where application views may not be precompiled.
+    private Application Application => _applicationContext.Application;
 
-            if (subpath == null)
-            {
-                return NotFoundDirectoryContents.Singleton;
-            }
+    public IDirectoryContents GetDirectoryContents(string subpath)
+    {
+        // 'GetDirectoryContents()' is used to discover shapes templates and build fixed binding tables.
+        // So the embedded file provider can always provide the structure under modules "Views" folders.
+        // But application's module shapes are not embedded, so we need to serve the application "Views".
 
-            var folder = NormalizePath(subpath);
+        // The razor view engine also uses 'GetDirectoryContents()' to find razor pages (not mvc views).
+        // So here, we also need to serve the directory contents under the application "Pages" folder.
 
-            // Under "Areas/{ApplicationName}".
-            if (folder == Application.ModulePath)
-            {
-                // Serve the contents from the file system.
-                return new PhysicalDirectoryContents(Application.Path);
-            }
-            // Under "Areas/{ApplicationName}/**".
-            else if (folder.StartsWith(Application.ModuleRoot, StringComparison.Ordinal))
-            {
-                // Check for a "Pages" or a "Views" segment.
-                var tokenizer = new StringTokenizer(folder, ['/']);
-                if (tokenizer.Any(s => s == "Pages" || s == "Views"))
-                {
-                    // Resolve the subpath relative to the application's module root.
-                    var folderSubPath = folder[Application.ModuleRoot.Length..];
-
-                    // And serve the contents from the physical application root folder.
-                    return new PhysicalDirectoryContents(Application.Root + folderSubPath);
-                }
-            }
+        // Note: This provider is also used in production where application views may not be precompiled.
 
+        if (subpath == null)
+        {
             return NotFoundDirectoryContents.Singleton;
         }
 
-        public IFileInfo GetFileInfo(string subpath)
-        {
-            if (subpath == null)
-            {
-                return new NotFoundFileInfo(subpath);
-            }
+        var folder = NormalizePath(subpath);
 
-            var path = NormalizePath(subpath);
-
-            // "Areas/{ApplicationName}/**/*.*".
-            if (path.StartsWith(Application.ModuleRoot, StringComparison.Ordinal))
+        // Under "Areas/{ApplicationName}".
+        if (folder == Application.ModulePath)
+        {
+            // Serve the contents from the file system.
+            return new PhysicalDirectoryContents(Application.Path);
+        }
+        // Under "Areas/{ApplicationName}/**".
+        else if (folder.StartsWith(Application.ModuleRoot, StringComparison.Ordinal))
+        {
+            // Check for a "Pages" or a "Views" segment.
+            var tokenizer = new StringTokenizer(folder, ['/']);
+            if (tokenizer.Any(s => s == "Pages" || s == "Views"))
             {
-                // Resolve the subpath relative to the application's module.
-                var fileSubPath = path[Application.ModuleRoot.Length..];
+                // Resolve the subpath relative to the application's module root.
+                var folderSubPath = folder[Application.ModuleRoot.Length..];
 
-                // And serve the file from the physical application root folder.
-                return new PhysicalFileInfo(new FileInfo(Application.Root + fileSubPath));
+                // And serve the contents from the physical application root folder.
+                return new PhysicalDirectoryContents(Application.Root + folderSubPath);
             }
+        }
 
+        return NotFoundDirectoryContents.Singleton;
+    }
+
+    public IFileInfo GetFileInfo(string subpath)
+    {
+        if (subpath == null)
+        {
             return new NotFoundFileInfo(subpath);
         }
 
-        public IChangeToken Watch(string filter)
-        {
-            if (filter == null)
-            {
-                return NullChangeToken.Singleton;
-            }
+        var path = NormalizePath(subpath);
 
-            var path = NormalizePath(filter);
+        // "Areas/{ApplicationName}/**/*.*".
+        if (path.StartsWith(Application.ModuleRoot, StringComparison.Ordinal))
+        {
+            // Resolve the subpath relative to the application's module.
+            var fileSubPath = path[Application.ModuleRoot.Length..];
 
-            // "Areas/{ApplicationName}/**/*.*".
-            if (path.StartsWith(Application.ModuleRoot, StringComparison.Ordinal))
-            {
-                // Resolve the subpath relative to the application's module.
-                var fileSubPath = path[Application.ModuleRoot.Length..];
+            // And serve the file from the physical application root folder.
+            return new PhysicalFileInfo(new FileInfo(Application.Root + fileSubPath));
+        }
 
-                // And watch the application file from the physical application root folder.
-                return new PollingFileChangeToken(new FileInfo(Application.Root + fileSubPath));
-            }
+        return new NotFoundFileInfo(subpath);
+    }
 
+    public IChangeToken Watch(string filter)
+    {
+        if (filter == null)
+        {
             return NullChangeToken.Singleton;
         }
 
-        private static string NormalizePath(string path) => path.Replace('\\', '/').Trim('/');
+        var path = NormalizePath(filter);
+
+        // "Areas/{ApplicationName}/**/*.*".
+        if (path.StartsWith(Application.ModuleRoot, StringComparison.Ordinal))
+        {
+            // Resolve the subpath relative to the application's module.
+            var fileSubPath = path[Application.ModuleRoot.Length..];
+
+            // And watch the application file from the physical application root folder.
+            return new PollingFileChangeToken(new FileInfo(Application.Root + fileSubPath));
+        }
+
+        return NullChangeToken.Singleton;
     }
+
+    private static string NormalizePath(string path) => path.Replace('\\', '/').Trim('/');
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/DevelopmentViewsFeature.cs b/src/OrchardCore/OrchardCore.Mvc.Core/DevelopmentViewsFeature.cs
index 28e9cd32050..fdf69e632f5 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/DevelopmentViewsFeature.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/DevelopmentViewsFeature.cs
@@ -1,8 +1,7 @@
 using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 
-namespace OrchardCore.Mvc
+namespace OrchardCore.Mvc;
+
+public class DevelopmentViewsFeature : ViewsFeature
 {
-    public class DevelopmentViewsFeature : ViewsFeature
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/Extensions/ControllerBaseExtensions.cs b/src/OrchardCore/OrchardCore.Mvc.Core/Extensions/ControllerBaseExtensions.cs
index 5db9e40769a..4f96d17e41d 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/Extensions/ControllerBaseExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/Extensions/ControllerBaseExtensions.cs
@@ -1,72 +1,71 @@
 using System;
 using System.Net;
 
-namespace Microsoft.AspNetCore.Mvc
+namespace Microsoft.AspNetCore.Mvc;
+
+public static class ControllerBaseExtensions
 {
-    public static class ControllerBaseExtensions
-    {
-        /// <summary>
-        /// Returns the proper actionresult for unauthorized or unauthenticated users.
-        /// Will return a forbid when the user is authenticated.
-        /// Will return a challenge when the user is not authenticated.
-        /// </summary>
-        /// <param name="controller"></param>
-        /// <returns>The proper actionresult based upon if the user is authenticated.</returns>
-        public static ActionResult ChallengeOrForbid(this ControllerBase controller)
-            => controller.User?.Identity?.IsAuthenticated ?? false ? (ActionResult)controller.Forbid() : controller.Challenge();
+    /// <summary>
+    /// Returns the proper actionresult for unauthorized or unauthenticated users.
+    /// Will return a forbid when the user is authenticated.
+    /// Will return a challenge when the user is not authenticated.
+    /// </summary>
+    /// <param name="controller"></param>
+    /// <returns>The proper actionresult based upon if the user is authenticated.</returns>
+    public static ActionResult ChallengeOrForbid(this ControllerBase controller)
+        => controller.User?.Identity?.IsAuthenticated ?? false ? (ActionResult)controller.Forbid() : controller.Challenge();
 
-        /// <summary>
-        /// Returns the proper actionresult for unauthorized or unauthenticated users
-        /// with the specified authenticationSchemes.
-        /// Will return a forbid when the user is authenticated.
-        /// Will return a challenge when the user is not authenticated.
-        /// If authentication schemes are specified, will return a challenge to them.
-        /// </summary>
-        /// <param name="controller"></param>
-        /// <param name="authenticationSchemes">The authentication schemes to challenge.</param>
-        /// <returns>The proper actionresult based upon if the user is authenticated.</returns>
-        public static ActionResult ChallengeOrForbid(this ControllerBase controller, params string[] authenticationSchemes)
-            => controller.User?.Identity?.IsAuthenticated ?? false ? (ActionResult)controller.Forbid(authenticationSchemes) : controller.Challenge(authenticationSchemes);
+    /// <summary>
+    /// Returns the proper actionresult for unauthorized or unauthenticated users
+    /// with the specified authenticationSchemes.
+    /// Will return a forbid when the user is authenticated.
+    /// Will return a challenge when the user is not authenticated.
+    /// If authentication schemes are specified, will return a challenge to them.
+    /// </summary>
+    /// <param name="controller"></param>
+    /// <param name="authenticationSchemes">The authentication schemes to challenge.</param>
+    /// <returns>The proper actionresult based upon if the user is authenticated.</returns>
+    public static ActionResult ChallengeOrForbid(this ControllerBase controller, params string[] authenticationSchemes)
+        => controller.User?.Identity?.IsAuthenticated ?? false ? (ActionResult)controller.Forbid(authenticationSchemes) : controller.Challenge(authenticationSchemes);
 
-        /// <summary>
-        /// Creates <see cref="ObjectResult"/> that produces a <see cref="HttpStatusCode.InternalServerError"/> response.
-        /// </summary>
-        /// <param name="controller">The <see cref="Controller"/>.</param>
-        /// <param name="value">An optional value to set on <see cref="ObjectResult"/>.</param>
-        public static ActionResult InternalServerError(this ControllerBase controller, object value = null)
-            => controller.StatusCode((int)HttpStatusCode.InternalServerError, value);
+    /// <summary>
+    /// Creates <see cref="ObjectResult"/> that produces a <see cref="HttpStatusCode.InternalServerError"/> response.
+    /// </summary>
+    /// <param name="controller">The <see cref="Controller"/>.</param>
+    /// <param name="value">An optional value to set on <see cref="ObjectResult"/>.</param>
+    public static ActionResult InternalServerError(this ControllerBase controller, object value = null)
+        => controller.StatusCode((int)HttpStatusCode.InternalServerError, value);
 
-        /// <summary>
-        /// Creates a <see cref="LocalRedirectResult"/> object that redirects to the specified local localUrl.
-        /// </summary>
-        /// <param name="controller"></param>
-        /// <param name="localUrl">The local URL to redirect to.</param>
-        /// <param name="escapeUrl">Whether to escape the url.</param>
-        public static ActionResult LocalRedirect(this ControllerBase controller, string localUrl, bool escapeUrl)
+    /// <summary>
+    /// Creates a <see cref="LocalRedirectResult"/> object that redirects to the specified local localUrl.
+    /// </summary>
+    /// <param name="controller"></param>
+    /// <param name="localUrl">The local URL to redirect to.</param>
+    /// <param name="escapeUrl">Whether to escape the url.</param>
+    public static ActionResult LocalRedirect(this ControllerBase controller, string localUrl, bool escapeUrl)
+    {
+        if (!escapeUrl)
         {
-            if (!escapeUrl)
-            {
-                return controller.LocalRedirect(localUrl);
-            }
-
-            return controller.LocalRedirect(localUrl.ToUriComponents());
+            return controller.LocalRedirect(localUrl);
         }
 
+        return controller.LocalRedirect(localUrl.ToUriComponents());
+    }
 
-        /// <summary>
-        /// Creates a <see cref="RedirectResult"/> object that redirects to the specified url.
-        /// </summary>
-        /// <param name="controller"></param>
-        /// <param name="url">The URL to redirect to.</param>
-        /// <param name="escapeUrl">Whether to escape the url.</param>
-        public static ActionResult Redirect(this ControllerBase controller, string url, bool escapeUrl)
-        {
-            if (!escapeUrl)
-            {
-                return controller.Redirect(url);
-            }
 
-            return controller.Redirect(url.ToUriComponents());
+    /// <summary>
+    /// Creates a <see cref="RedirectResult"/> object that redirects to the specified url.
+    /// </summary>
+    /// <param name="controller"></param>
+    /// <param name="url">The URL to redirect to.</param>
+    /// <param name="escapeUrl">Whether to escape the url.</param>
+    public static ActionResult Redirect(this ControllerBase controller, string url, bool escapeUrl)
+    {
+        if (!escapeUrl)
+        {
+            return controller.Redirect(url);
         }
+
+        return controller.Redirect(url.ToUriComponents());
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/Extensions/ModelStateDictionaryExtensions.cs b/src/OrchardCore/OrchardCore.Mvc.Core/Extensions/ModelStateDictionaryExtensions.cs
index 7c1fcc8d437..f6dc512b382 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/Extensions/ModelStateDictionaryExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/Extensions/ModelStateDictionaryExtensions.cs
@@ -3,31 +3,30 @@
 using System.Linq;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Mvc.ModelBinding
+namespace OrchardCore.Mvc.ModelBinding;
+
+public static class ModelStateDictionaryExtensions
 {
-    public static class ModelStateDictionaryExtensions
+    public static void AddModelError(this ModelStateDictionary modelState, ModelError error)
     {
-        public static void AddModelError(this ModelStateDictionary modelState, ModelError error)
-        {
-            ArgumentNullException.ThrowIfNull(modelState);
+        ArgumentNullException.ThrowIfNull(modelState);
 
-            ArgumentNullException.ThrowIfNull(error);
+        ArgumentNullException.ThrowIfNull(error);
 
-            modelState.AddModelError(error.Key, error.Message);
-        }
+        modelState.AddModelError(error.Key, error.Message);
+    }
 
-        public static void AddModelErrors(this ModelStateDictionary modelState, IEnumerable<ModelError> errors)
-        {
-            ArgumentNullException.ThrowIfNull(modelState);
+    public static void AddModelErrors(this ModelStateDictionary modelState, IEnumerable<ModelError> errors)
+    {
+        ArgumentNullException.ThrowIfNull(modelState);
 
-            ArgumentNullException.ThrowIfNull(errors);
+        ArgumentNullException.ThrowIfNull(errors);
 
-            if (errors.Any())
+        if (errors.Any())
+        {
+            foreach (var error in errors)
             {
-                foreach (var error in errors)
-                {
-                    modelState.AddModelError(error);
-                }
+                modelState.AddModelError(error);
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/Extensions/OrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Mvc.Core/Extensions/OrchardCoreBuilderExtensions.cs
index 2040961c67b..0640a3c8684 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/Extensions/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/Extensions/OrchardCoreBuilderExtensions.cs
@@ -2,31 +2,30 @@
 using OrchardCore.Mvc;
 using OrchardCore.Routing;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class OrchardCoreBuilderExtensions
 {
-    public static class OrchardCoreBuilderExtensions
+    /// <summary>
+    /// Adds tenant level MVC services and configuration.
+    /// </summary>
+    public static OrchardCoreBuilder AddMvc(this OrchardCoreBuilder builder)
     {
-        /// <summary>
-        /// Adds tenant level MVC services and configuration.
-        /// </summary>
-        public static OrchardCoreBuilder AddMvc(this OrchardCoreBuilder builder)
+        builder.ConfigureServices(collection =>
         {
-            builder.ConfigureServices(collection =>
-            {
-                // Allows a tenant to add its own route endpoint schemes for link generation.
-                collection.AddSingleton<IEndpointAddressScheme<RouteValuesAddress>, ShellRouteValuesAddressScheme>();
+            // Allows a tenant to add its own route endpoint schemes for link generation.
+            collection.AddSingleton<IEndpointAddressScheme<RouteValuesAddress>, ShellRouteValuesAddressScheme>();
 
-                collection.Configure<RouteOptions>(options =>
-                {
-                    // The Cors module is designed to handle CORS, thus we skip checking for unhandled security metadata by default.
-                    // Additionally, skipping security metadata checks on the endpoint provides a minor performance benefit.
-                    options.SuppressCheckForUnhandledSecurityMetadata = true;
-                });
-            },
-            // Need to be registered last.
-            order: int.MaxValue - 100);
+            collection.Configure<RouteOptions>(options =>
+            {
+                // The Cors module is designed to handle CORS, thus we skip checking for unhandled security metadata by default.
+                // Additionally, skipping security metadata checks on the endpoint provides a minor performance benefit.
+                options.SuppressCheckForUnhandledSecurityMetadata = true;
+            });
+        },
+        // Need to be registered last.
+        order: int.MaxValue - 100);
 
-            return builder.RegisterStartup<Startup>();
-        }
+        return builder.RegisterStartup<Startup>();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/FileProviders/FileProviderExtensions.cs b/src/OrchardCore/OrchardCore.Mvc.Core/FileProviders/FileProviderExtensions.cs
index 5d398ffebf6..cb2e6606a2c 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/FileProviders/FileProviderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/FileProviders/FileProviderExtensions.cs
@@ -4,54 +4,53 @@
 using System.Linq;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.Mvc.FileProviders
+namespace OrchardCore.Mvc.FileProviders;
+
+public static class FileProviderExtensions
 {
-    public static class FileProviderExtensions
+    public static IEnumerable<string> GetViewFilePaths(this IFileProvider fileProvider,
+        string subPath,
+        string[] extensions,
+        string viewsFolder = null,
+        bool inViewsFolder = false,
+        bool inDepth = true)
     {
-        public static IEnumerable<string> GetViewFilePaths(this IFileProvider fileProvider,
-            string subPath,
-            string[] extensions,
-            string viewsFolder = null,
-            bool inViewsFolder = false,
-            bool inDepth = true)
+        var contents = fileProvider.GetDirectoryContents(subPath);
+
+        if (contents == null)
         {
-            var contents = fileProvider.GetDirectoryContents(subPath);
+            yield break;
+        }
 
-            if (contents == null)
-            {
-                yield break;
-            }
+        if (!inViewsFolder && viewsFolder != null && inDepth)
+        {
+            var viewsFolderInfo = contents.FirstOrDefault(c => c.Name == viewsFolder && c.IsDirectory);
 
-            if (!inViewsFolder && viewsFolder != null && inDepth)
+            if (viewsFolderInfo != null)
             {
-                var viewsFolderInfo = contents.FirstOrDefault(c => c.Name == viewsFolder && c.IsDirectory);
-
-                if (viewsFolderInfo != null)
+                foreach (var filePath in GetViewFilePaths(fileProvider, $"{subPath}/{viewsFolderInfo.Name}", extensions, viewsFolder, inViewsFolder: true))
                 {
-                    foreach (var filePath in GetViewFilePaths(fileProvider, $"{subPath}/{viewsFolderInfo.Name}", extensions, viewsFolder, inViewsFolder: true))
-                    {
-                        yield return filePath;
-                    }
-
-                    yield break;
+                    yield return filePath;
                 }
+
+                yield break;
             }
+        }
 
-            foreach (var content in contents)
+        foreach (var content in contents)
+        {
+            if (content.IsDirectory && inDepth)
             {
-                if (content.IsDirectory && inDepth)
+                foreach (var filePath in GetViewFilePaths(fileProvider, $"{subPath}/{content.Name}", extensions, viewsFolder, inViewsFolder))
                 {
-                    foreach (var filePath in GetViewFilePaths(fileProvider, $"{subPath}/{content.Name}", extensions, viewsFolder, inViewsFolder))
-                    {
-                        yield return filePath;
-                    }
+                    yield return filePath;
                 }
-                else if (inViewsFolder)
+            }
+            else if (inViewsFolder)
+            {
+                if (Array.IndexOf(extensions, Path.GetExtension(content.Name)) != -1)
                 {
-                    if (Array.IndexOf(extensions, Path.GetExtension(content.Name)) != -1)
-                    {
-                        yield return $"{subPath}/{content.Name}";
-                    }
+                    yield return $"{subPath}/{content.Name}";
                 }
             }
         }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/LocationExpander/ComponentViewLocationExpanderProvider.cs b/src/OrchardCore/OrchardCore.Mvc.Core/LocationExpander/ComponentViewLocationExpanderProvider.cs
index 26f672bc538..b657edaf653 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/LocationExpander/ComponentViewLocationExpanderProvider.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/LocationExpander/ComponentViewLocationExpanderProvider.cs
@@ -7,126 +7,125 @@
 using OrchardCore.Environment.Shell.Descriptor.Models;
 using OrchardCore.Mvc.FileProviders;
 
-namespace OrchardCore.Mvc.LocationExpander
+namespace OrchardCore.Mvc.LocationExpander;
+
+public class ComponentViewLocationExpanderProvider : IViewLocationExpanderProvider
 {
-    public class ComponentViewLocationExpanderProvider : IViewLocationExpanderProvider
+    private static readonly string _sharedViewsPath = "/Views/Shared/{0}" + RazorViewEngine.ViewExtension;
+    private static readonly string _sharedPagesPath = "/Pages/Shared/{0}" + RazorViewEngine.ViewExtension;
+    private static readonly string[] _razorExtensions = [RazorViewEngine.ViewExtension];
+    private const string CacheKey = "ModuleComponentViewLocations";
+    private static List<IExtensionInfo> _modulesWithComponentViews;
+    private static List<IExtensionInfo> _modulesWithPagesComponentViews;
+    private static readonly object _synLock = new();
+    private static bool _initialized;
+
+    private readonly IExtensionManager _extensionManager;
+    private readonly ShellDescriptor _shellDescriptor;
+    private readonly IMemoryCache _memoryCache;
+
+    public ComponentViewLocationExpanderProvider(
+        RazorCompilationFileProviderAccessor fileProviderAccessor,
+        IExtensionManager extensionManager,
+        ShellDescriptor shellDescriptor,
+        IMemoryCache memoryCache)
     {
-        private static readonly string _sharedViewsPath = "/Views/Shared/{0}" + RazorViewEngine.ViewExtension;
-        private static readonly string _sharedPagesPath = "/Pages/Shared/{0}" + RazorViewEngine.ViewExtension;
-        private static readonly string[] _razorExtensions = [RazorViewEngine.ViewExtension];
-        private const string CacheKey = "ModuleComponentViewLocations";
-        private static List<IExtensionInfo> _modulesWithComponentViews;
-        private static List<IExtensionInfo> _modulesWithPagesComponentViews;
-        private static readonly object _synLock = new();
-        private static bool _initialized;
-
-        private readonly IExtensionManager _extensionManager;
-        private readonly ShellDescriptor _shellDescriptor;
-        private readonly IMemoryCache _memoryCache;
-
-        public ComponentViewLocationExpanderProvider(
-            RazorCompilationFileProviderAccessor fileProviderAccessor,
-            IExtensionManager extensionManager,
-            ShellDescriptor shellDescriptor,
-            IMemoryCache memoryCache)
+        _extensionManager = extensionManager;
+        _shellDescriptor = shellDescriptor;
+        _memoryCache = memoryCache;
+
+        if (_initialized)
         {
-            _extensionManager = extensionManager;
-            _shellDescriptor = shellDescriptor;
-            _memoryCache = memoryCache;
+            return;
+        }
 
-            if (_initialized)
+        lock (_synLock)
+        {
+            if (!_initialized)
             {
-                return;
-            }
+                var modulesWithComponentViews = new List<IExtensionInfo>();
+                var modulesWithPagesComponentViews = new List<IExtensionInfo>();
 
-            lock (_synLock)
-            {
-                if (!_initialized)
-                {
-                    var modulesWithComponentViews = new List<IExtensionInfo>();
-                    var modulesWithPagesComponentViews = new List<IExtensionInfo>();
+                var orderedModules = _extensionManager.GetExtensions()
+                    .Where(e => e.Manifest.Type.Equals("module", StringComparison.OrdinalIgnoreCase))
+                    .Reverse();
 
-                    var orderedModules = _extensionManager.GetExtensions()
-                        .Where(e => e.Manifest.Type.Equals("module", StringComparison.OrdinalIgnoreCase))
-                        .Reverse();
+                foreach (var module in orderedModules)
+                {
+                    var moduleComponentsViewFilePaths = fileProviderAccessor.FileProvider.GetViewFilePaths(
+                        module.SubPath + "/Views/Shared/Components", _razorExtensions,
+                        viewsFolder: null, inViewsFolder: true, inDepth: true);
 
-                    foreach (var module in orderedModules)
+                    if (moduleComponentsViewFilePaths.Any())
                     {
-                        var moduleComponentsViewFilePaths = fileProviderAccessor.FileProvider.GetViewFilePaths(
-                            module.SubPath + "/Views/Shared/Components", _razorExtensions,
-                            viewsFolder: null, inViewsFolder: true, inDepth: true);
-
-                        if (moduleComponentsViewFilePaths.Any())
-                        {
-                            modulesWithComponentViews.Add(module);
-                        }
-
-                        var modulePagesComponentsViewFilePaths = fileProviderAccessor.FileProvider.GetViewFilePaths(
-                            module.SubPath + "/Pages/Shared/Components", _razorExtensions,
-                            viewsFolder: null, inViewsFolder: true, inDepth: true);
-
-                        if (modulePagesComponentsViewFilePaths.Any())
-                        {
-                            modulesWithPagesComponentViews.Add(module);
-                        }
+                        modulesWithComponentViews.Add(module);
                     }
 
-                    _modulesWithComponentViews = modulesWithComponentViews;
-                    _modulesWithPagesComponentViews = modulesWithPagesComponentViews;
+                    var modulePagesComponentsViewFilePaths = fileProviderAccessor.FileProvider.GetViewFilePaths(
+                        module.SubPath + "/Pages/Shared/Components", _razorExtensions,
+                        viewsFolder: null, inViewsFolder: true, inDepth: true);
 
-                    _initialized = true;
+                    if (modulePagesComponentsViewFilePaths.Any())
+                    {
+                        modulesWithPagesComponentViews.Add(module);
+                    }
                 }
+
+                _modulesWithComponentViews = modulesWithComponentViews;
+                _modulesWithPagesComponentViews = modulesWithPagesComponentViews;
+
+                _initialized = true;
             }
         }
+    }
 
-        public int Priority => 5;
+    public int Priority => 5;
 
-        /// <inheritdoc />
-        public void PopulateValues(ViewLocationExpanderContext context)
+    /// <inheritdoc />
+    public void PopulateValues(ViewLocationExpanderContext context)
+    {
+    }
+
+    /// <inheritdoc />
+    public virtual IEnumerable<string> ExpandViewLocations(ViewLocationExpanderContext context,
+                                                           IEnumerable<string> viewLocations)
+    {
+        if (context.AreaName == null)
         {
+            return viewLocations;
         }
 
-        /// <inheritdoc />
-        public virtual IEnumerable<string> ExpandViewLocations(ViewLocationExpanderContext context,
-                                                               IEnumerable<string> viewLocations)
+        var result = new List<string>();
+
+        if (context.ViewName.StartsWith("Components/", StringComparison.Ordinal))
         {
-            if (context.AreaName == null)
+            if (!_memoryCache.TryGetValue(CacheKey, out string[] moduleComponentViewLocations))
             {
-                return viewLocations;
+                var enabledIds = _extensionManager.GetFeatures().Where(f => _shellDescriptor
+                    .Features.Any(sf => sf.Id == f.Id)).Select(f => f.Extension.Id).ToHashSet();
+
+                var enabledExtensionIds = _extensionManager
+                    .GetExtensions()
+                    .Where(e => enabledIds.Contains(e.Id))
+                    .Select(x => x.Id)
+                    .ToHashSet();
+
+                moduleComponentViewLocations = _modulesWithComponentViews
+                    .Where(m => enabledExtensionIds.Contains(m.Id))
+                    .Select(m => '/' + m.SubPath + _sharedViewsPath)
+                    .Concat(_modulesWithPagesComponentViews
+                    .Where(m => enabledExtensionIds.Contains(m.Id))
+                    .Select(m => '/' + m.SubPath + _sharedPagesPath))
+                    .ToArray();
+
+                _memoryCache.Set(CacheKey, moduleComponentViewLocations);
             }
 
-            var result = new List<string>();
-
-            if (context.ViewName.StartsWith("Components/", StringComparison.Ordinal))
-            {
-                if (!_memoryCache.TryGetValue(CacheKey, out string[] moduleComponentViewLocations))
-                {
-                    var enabledIds = _extensionManager.GetFeatures().Where(f => _shellDescriptor
-                        .Features.Any(sf => sf.Id == f.Id)).Select(f => f.Extension.Id).ToHashSet();
-
-                    var enabledExtensionIds = _extensionManager
-                        .GetExtensions()
-                        .Where(e => enabledIds.Contains(e.Id))
-                        .Select(x => x.Id)
-                        .ToHashSet();
-
-                    moduleComponentViewLocations = _modulesWithComponentViews
-                        .Where(m => enabledExtensionIds.Contains(m.Id))
-                        .Select(m => '/' + m.SubPath + _sharedViewsPath)
-                        .Concat(_modulesWithPagesComponentViews
-                        .Where(m => enabledExtensionIds.Contains(m.Id))
-                        .Select(m => '/' + m.SubPath + _sharedPagesPath))
-                        .ToArray();
-
-                    _memoryCache.Set(CacheKey, moduleComponentViewLocations);
-                }
-
-                result.AddRange(moduleComponentViewLocations);
-            }
+            result.AddRange(moduleComponentViewLocations);
+        }
 
-            result.AddRange(viewLocations);
+        result.AddRange(viewLocations);
 
-            return result;
-        }
+        return result;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/LocationExpander/CompositeViewLocationExpanderProvider.cs b/src/OrchardCore/OrchardCore.Mvc.Core/LocationExpander/CompositeViewLocationExpanderProvider.cs
index d4438c4910c..3d4c89e5c33 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/LocationExpander/CompositeViewLocationExpanderProvider.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/LocationExpander/CompositeViewLocationExpanderProvider.cs
@@ -4,44 +4,43 @@
 using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace OrchardCore.Mvc.LocationExpander
+namespace OrchardCore.Mvc.LocationExpander;
+
+internal sealed class CompositeViewLocationExpanderProvider : IViewLocationExpanderProvider
 {
-    internal sealed class CompositeViewLocationExpanderProvider : IViewLocationExpanderProvider
+    public int Priority
     {
-        public int Priority
-        {
-            get { throw new NotSupportedException(); }
-        }
-
-        public IEnumerable<string> ExpandViewLocations(ViewLocationExpanderContext context, IEnumerable<string> viewLocations)
-        {
-            var expanderProviders = DiscoverProviders(context);
+        get { throw new NotSupportedException(); }
+    }
 
-            foreach (var provider in expanderProviders.OrderBy(x => x.Priority))
-            {
-                viewLocations = provider.ExpandViewLocations(context, viewLocations);
-            }
+    public IEnumerable<string> ExpandViewLocations(ViewLocationExpanderContext context, IEnumerable<string> viewLocations)
+    {
+        var expanderProviders = DiscoverProviders(context);
 
-            return viewLocations;
+        foreach (var provider in expanderProviders.OrderBy(x => x.Priority))
+        {
+            viewLocations = provider.ExpandViewLocations(context, viewLocations);
         }
 
-        public void PopulateValues(ViewLocationExpanderContext context)
-        {
-            var expanderProviders = DiscoverProviders(context);
+        return viewLocations;
+    }
 
-            foreach (var provider in expanderProviders.OrderBy(x => x.Priority))
-            {
-                provider.PopulateValues(context);
-            }
-        }
+    public void PopulateValues(ViewLocationExpanderContext context)
+    {
+        var expanderProviders = DiscoverProviders(context);
 
-        private static IEnumerable<IViewLocationExpanderProvider> DiscoverProviders(ViewLocationExpanderContext context)
+        foreach (var provider in expanderProviders.OrderBy(x => x.Priority))
         {
-            return context
-                .ActionContext
-                .HttpContext
-                .RequestServices
-                .GetServices<IViewLocationExpanderProvider>();
+            provider.PopulateValues(context);
         }
     }
+
+    private static IEnumerable<IViewLocationExpanderProvider> DiscoverProviders(ViewLocationExpanderContext context)
+    {
+        return context
+            .ActionContext
+            .HttpContext
+            .RequestServices
+            .GetServices<IViewLocationExpanderProvider>();
+    }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/LocationExpander/IViewLocationExpanderProvider.cs b/src/OrchardCore/OrchardCore.Mvc.Core/LocationExpander/IViewLocationExpanderProvider.cs
index bfa2dea4b97..06321421460 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/LocationExpander/IViewLocationExpanderProvider.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/LocationExpander/IViewLocationExpanderProvider.cs
@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.Mvc.Razor;
 
-namespace OrchardCore.Mvc.LocationExpander
+namespace OrchardCore.Mvc.LocationExpander;
+
+public interface IViewLocationExpanderProvider : IViewLocationExpander
 {
-    public interface IViewLocationExpanderProvider : IViewLocationExpander
-    {
-        int Priority { get; }
-    }
+    int Priority { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/LocationExpander/SharedViewLocationExpanderProvider.cs b/src/OrchardCore/OrchardCore.Mvc.Core/LocationExpander/SharedViewLocationExpanderProvider.cs
index 859a119c5be..4f07908fbfa 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/LocationExpander/SharedViewLocationExpanderProvider.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/LocationExpander/SharedViewLocationExpanderProvider.cs
@@ -7,138 +7,137 @@
 using OrchardCore.Environment.Shell.Descriptor.Models;
 using OrchardCore.Mvc.FileProviders;
 
-namespace OrchardCore.Mvc.LocationExpander
+namespace OrchardCore.Mvc.LocationExpander;
+
+public class SharedViewLocationExpanderProvider : IViewLocationExpanderProvider
 {
-    public class SharedViewLocationExpanderProvider : IViewLocationExpanderProvider
+    private static readonly string _pageSharedViewsPath = "/Pages/Shared/{0}" + RazorViewEngine.ViewExtension;
+    private static readonly string _sharedViewsPath = "/Views/Shared/{0}" + RazorViewEngine.ViewExtension;
+
+    private static readonly string[] _razorExtensions = [RazorViewEngine.ViewExtension];
+    private const string CacheKey = "ModuleSharedViewLocations";
+    private const string PageCacheKey = "ModulePageSharedViewLocations";
+    private static List<IExtensionInfo> _modulesWithPageSharedViews;
+    private static List<IExtensionInfo> _modulesWithSharedViews;
+    private static readonly object _synLock = new();
+
+    private readonly IExtensionManager _extensionManager;
+    private readonly ShellDescriptor _shellDescriptor;
+    private readonly IMemoryCache _memoryCache;
+
+    public SharedViewLocationExpanderProvider(
+        RazorCompilationFileProviderAccessor fileProviderAccessor,
+        IExtensionManager extensionManager,
+        ShellDescriptor shellDescriptor,
+        IMemoryCache memoryCache)
     {
-        private static readonly string _pageSharedViewsPath = "/Pages/Shared/{0}" + RazorViewEngine.ViewExtension;
-        private static readonly string _sharedViewsPath = "/Views/Shared/{0}" + RazorViewEngine.ViewExtension;
-
-        private static readonly string[] _razorExtensions = [RazorViewEngine.ViewExtension];
-        private const string CacheKey = "ModuleSharedViewLocations";
-        private const string PageCacheKey = "ModulePageSharedViewLocations";
-        private static List<IExtensionInfo> _modulesWithPageSharedViews;
-        private static List<IExtensionInfo> _modulesWithSharedViews;
-        private static readonly object _synLock = new();
-
-        private readonly IExtensionManager _extensionManager;
-        private readonly ShellDescriptor _shellDescriptor;
-        private readonly IMemoryCache _memoryCache;
-
-        public SharedViewLocationExpanderProvider(
-            RazorCompilationFileProviderAccessor fileProviderAccessor,
-            IExtensionManager extensionManager,
-            ShellDescriptor shellDescriptor,
-            IMemoryCache memoryCache)
+        _extensionManager = extensionManager;
+        _shellDescriptor = shellDescriptor;
+        _memoryCache = memoryCache;
+
+        if (_modulesWithSharedViews != null)
         {
-            _extensionManager = extensionManager;
-            _shellDescriptor = shellDescriptor;
-            _memoryCache = memoryCache;
+            return;
+        }
 
-            if (_modulesWithSharedViews != null)
+        lock (_synLock)
+        {
+            if (_modulesWithSharedViews == null)
             {
-                return;
-            }
+                var orderedModules = _extensionManager.GetExtensions()
+                    .Where(e => e.Manifest.Type.Equals("module", StringComparison.OrdinalIgnoreCase))
+                    .Reverse();
 
-            lock (_synLock)
-            {
-                if (_modulesWithSharedViews == null)
-                {
-                    var orderedModules = _extensionManager.GetExtensions()
-                        .Where(e => e.Manifest.Type.Equals("module", StringComparison.OrdinalIgnoreCase))
-                        .Reverse();
+                var modulesWithPageSharedViews = new List<IExtensionInfo>();
+                var modulesWithSharedViews = new List<IExtensionInfo>();
 
-                    var modulesWithPageSharedViews = new List<IExtensionInfo>();
-                    var modulesWithSharedViews = new List<IExtensionInfo>();
+                foreach (var module in orderedModules)
+                {
+                    var modulePageSharedViewFilePaths = fileProviderAccessor.FileProvider.GetViewFilePaths(
+                        module.SubPath + "/Pages/Shared", _razorExtensions,
+                        viewsFolder: null, inViewsFolder: true, inDepth: true);
 
-                    foreach (var module in orderedModules)
+                    if (modulePageSharedViewFilePaths.Any())
                     {
-                        var modulePageSharedViewFilePaths = fileProviderAccessor.FileProvider.GetViewFilePaths(
-                            module.SubPath + "/Pages/Shared", _razorExtensions,
-                            viewsFolder: null, inViewsFolder: true, inDepth: true);
-
-                        if (modulePageSharedViewFilePaths.Any())
-                        {
-                            modulesWithPageSharedViews.Add(module);
-                        }
-
-                        var moduleSharedViewFilePaths = fileProviderAccessor.FileProvider.GetViewFilePaths(
-                            module.SubPath + "/Views/Shared", _razorExtensions,
-                            viewsFolder: null, inViewsFolder: true, inDepth: true);
-
-                        if (moduleSharedViewFilePaths.Any())
-                        {
-                            modulesWithSharedViews.Add(module);
-                        }
+                        modulesWithPageSharedViews.Add(module);
                     }
 
-                    _modulesWithPageSharedViews = modulesWithPageSharedViews;
-                    _modulesWithSharedViews = modulesWithSharedViews;
+                    var moduleSharedViewFilePaths = fileProviderAccessor.FileProvider.GetViewFilePaths(
+                        module.SubPath + "/Views/Shared", _razorExtensions,
+                        viewsFolder: null, inViewsFolder: true, inDepth: true);
+
+                    if (moduleSharedViewFilePaths.Any())
+                    {
+                        modulesWithSharedViews.Add(module);
+                    }
                 }
+
+                _modulesWithPageSharedViews = modulesWithPageSharedViews;
+                _modulesWithSharedViews = modulesWithSharedViews;
             }
         }
+    }
 
-        public int Priority => 5;
+    public int Priority => 5;
 
-        /// <inheritdoc />
-        public void PopulateValues(ViewLocationExpanderContext context)
-        {
-        }
+    /// <inheritdoc />
+    public void PopulateValues(ViewLocationExpanderContext context)
+    {
+    }
 
-        /// <inheritdoc />
-        public virtual IEnumerable<string> ExpandViewLocations(ViewLocationExpanderContext context,
-                                                               IEnumerable<string> viewLocations)
+    /// <inheritdoc />
+    public virtual IEnumerable<string> ExpandViewLocations(ViewLocationExpanderContext context,
+                                                           IEnumerable<string> viewLocations)
+    {
+        if (context.AreaName == null)
         {
-            if (context.AreaName == null)
-            {
-                return viewLocations;
-            }
+            return viewLocations;
+        }
 
-            HashSet<string> enabledExtensionIds = null;
+        HashSet<string> enabledExtensionIds = null;
 
-            var result = new List<string>();
+        var result = new List<string>();
 
-            if (context.PageName != null)
+        if (context.PageName != null)
+        {
+            if (!_memoryCache.TryGetValue(PageCacheKey, out IEnumerable<string> modulePageSharedViewLocations))
             {
-                if (!_memoryCache.TryGetValue(PageCacheKey, out IEnumerable<string> modulePageSharedViewLocations))
-                {
-                    modulePageSharedViewLocations = _modulesWithPageSharedViews
-                        .Where(m => GetEnabledExtensionIds().Contains(m.Id))
-                        .Select(m => '/' + m.SubPath + _pageSharedViewsPath);
-
-                    _memoryCache.Set(PageCacheKey, modulePageSharedViewLocations);
-                }
+                modulePageSharedViewLocations = _modulesWithPageSharedViews
+                    .Where(m => GetEnabledExtensionIds().Contains(m.Id))
+                    .Select(m => '/' + m.SubPath + _pageSharedViewsPath);
 
-                result.AddRange(modulePageSharedViewLocations);
+                _memoryCache.Set(PageCacheKey, modulePageSharedViewLocations);
             }
 
-            if (!_memoryCache.TryGetValue(CacheKey, out IEnumerable<string> moduleSharedViewLocations))
-            {
-                moduleSharedViewLocations = _modulesWithSharedViews
-                    .Where(m => GetEnabledExtensionIds().Contains(m.Id))
-                    .Select(m => '/' + m.SubPath + _sharedViewsPath);
+            result.AddRange(modulePageSharedViewLocations);
+        }
 
-                _memoryCache.Set(CacheKey, moduleSharedViewLocations);
-            }
+        if (!_memoryCache.TryGetValue(CacheKey, out IEnumerable<string> moduleSharedViewLocations))
+        {
+            moduleSharedViewLocations = _modulesWithSharedViews
+                .Where(m => GetEnabledExtensionIds().Contains(m.Id))
+                .Select(m => '/' + m.SubPath + _sharedViewsPath);
 
-            result.AddRange(moduleSharedViewLocations);
-            result.AddRange(viewLocations);
+            _memoryCache.Set(CacheKey, moduleSharedViewLocations);
+        }
 
-            return result;
+        result.AddRange(moduleSharedViewLocations);
+        result.AddRange(viewLocations);
 
-            HashSet<string> GetEnabledExtensionIds()
+        return result;
+
+        HashSet<string> GetEnabledExtensionIds()
+        {
+            if (enabledExtensionIds != null)
             {
-                if (enabledExtensionIds != null)
-                {
-                    return enabledExtensionIds;
-                }
+                return enabledExtensionIds;
+            }
 
-                var enabledIds = _extensionManager.GetFeatures().Where(f => _shellDescriptor
-                        .Features.Any(sf => sf.Id == f.Id)).Select(f => f.Extension.Id).ToHashSet();
+            var enabledIds = _extensionManager.GetFeatures().Where(f => _shellDescriptor
+                    .Features.Any(sf => sf.Id == f.Id)).Select(f => f.Extension.Id).ToHashSet();
 
-                return enabledExtensionIds = _extensionManager.GetExtensions()
-                    .Where(e => enabledIds.Contains(e.Id)).Select(x => x.Id).ToHashSet();
-            }
+            return enabledExtensionIds = _extensionManager.GetExtensions()
+                .Where(e => enabledIds.Contains(e.Id)).Select(x => x.Id).ToHashSet();
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/ModelBinding/CheckMarkModelBinder.cs b/src/OrchardCore/OrchardCore.Mvc.Core/ModelBinding/CheckMarkModelBinder.cs
index 12d74155800..fe3d20ed322 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/ModelBinding/CheckMarkModelBinder.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/ModelBinding/CheckMarkModelBinder.cs
@@ -2,35 +2,34 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Mvc.ModelBinding
+namespace OrchardCore.Mvc.ModelBinding;
+
+public class CheckMarkModelBinder : IModelBinder
 {
-    public class CheckMarkModelBinder : IModelBinder
+    public Task BindModelAsync(ModelBindingContext bindingContext)
     {
-        public Task BindModelAsync(ModelBindingContext bindingContext)
-        {
-            ArgumentNullException.ThrowIfNull(bindingContext);
+        ArgumentNullException.ThrowIfNull(bindingContext);
 
-            if (bindingContext.ModelType == typeof(bool))
+        if (bindingContext.ModelType == typeof(bool))
+        {
+            var valueProviderResult = bindingContext.ValueProvider.GetValue(bindingContext.ModelName);
+            if (valueProviderResult == ValueProviderResult.None)
             {
-                var valueProviderResult = bindingContext.ValueProvider.GetValue(bindingContext.ModelName);
-                if (valueProviderResult == ValueProviderResult.None)
-                {
-                    return Task.CompletedTask;
-                }
+                return Task.CompletedTask;
+            }
 
-                bindingContext.ModelState.SetModelValue(bindingContext.ModelName, valueProviderResult);
+            bindingContext.ModelState.SetModelValue(bindingContext.ModelName, valueProviderResult);
 
-                if (valueProviderResult.Values == "✓")
-                {
-                    bindingContext.Result = ModelBindingResult.Success(bindingContext.ModelName);
-                }
-                else if (valueProviderResult.Values == "✗")
-                {
-                    bindingContext.Result = ModelBindingResult.Failed();
-                }
+            if (valueProviderResult.Values == "✓")
+            {
+                bindingContext.Result = ModelBindingResult.Success(bindingContext.ModelName);
+            }
+            else if (valueProviderResult.Values == "✗")
+            {
+                bindingContext.Result = ModelBindingResult.Failed();
             }
-
-            return Task.CompletedTask;
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/ModelBinding/CheckMarkModelBinderProvider.cs b/src/OrchardCore/OrchardCore.Mvc.Core/ModelBinding/CheckMarkModelBinderProvider.cs
index defeeb26db9..5bc5dfd3625 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/ModelBinding/CheckMarkModelBinderProvider.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/ModelBinding/CheckMarkModelBinderProvider.cs
@@ -1,24 +1,23 @@
 using System;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Mvc.ModelBinding
+namespace OrchardCore.Mvc.ModelBinding;
+
+/// <summary>
+/// An <see cref="IModelBinderProvider"/> for <see cref="CheckMarkModelBinder"/>.
+/// </summary>
+public class CheckMarkModelBinderProvider : IModelBinderProvider
 {
-    /// <summary>
-    /// An <see cref="IModelBinderProvider"/> for <see cref="CheckMarkModelBinder"/>.
-    /// </summary>
-    public class CheckMarkModelBinderProvider : IModelBinderProvider
+    /// <inheritdoc />
+    public IModelBinder GetBinder(ModelBinderProviderContext context)
     {
-        /// <inheritdoc />
-        public IModelBinder GetBinder(ModelBinderProviderContext context)
-        {
-            ArgumentNullException.ThrowIfNull(context);
-
-            if (context.Metadata.ModelType == typeof(CheckMarkModelBinder))
-            {
-                return new CheckMarkModelBinder();
-            }
+        ArgumentNullException.ThrowIfNull(context);
 
-            return null;
+        if (context.Metadata.ModelType == typeof(CheckMarkModelBinder))
+        {
+            return new CheckMarkModelBinder();
         }
+
+        return null;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/ModelBinding/ModelError.cs b/src/OrchardCore/OrchardCore.Mvc.Core/ModelBinding/ModelError.cs
index 8669573bcaf..44236e6a89c 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/ModelBinding/ModelError.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/ModelBinding/ModelError.cs
@@ -1,15 +1,14 @@
-namespace OrchardCore.Mvc.ModelBinding
+namespace OrchardCore.Mvc.ModelBinding;
+
+public class ModelError
 {
-    public class ModelError
+    public ModelError(string key, string message)
     {
-        public ModelError(string key, string message)
-        {
-            Key = key;
-            Message = message;
-        }
+        Key = key;
+        Message = message;
+    }
 
-        public string Key { get; }
+    public string Key { get; }
 
-        public string Message { get; }
-    }
+    public string Message { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/ModularApplicationModelProvider.cs b/src/OrchardCore/OrchardCore.Mvc.Core/ModularApplicationModelProvider.cs
index a9a52c04be6..4123c142c2a 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/ModularApplicationModelProvider.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/ModularApplicationModelProvider.cs
@@ -4,68 +4,67 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Environment.Shell;
 
-namespace OrchardCore.Mvc
+namespace OrchardCore.Mvc;
+
+/// <summary>
+/// Adds an area route constraint using the name of the module.
+/// And filters all controller actions of disabled features.
+/// </summary>
+public class ModularApplicationModelProvider : IApplicationModelProvider
 {
-    /// <summary>
-    /// Adds an area route constraint using the name of the module.
-    /// And filters all controller actions of disabled features.
-    /// </summary>
-    public class ModularApplicationModelProvider : IApplicationModelProvider
+    private readonly ITypeFeatureProvider _typeFeatureProvider;
+    private readonly IHostEnvironment _hostingEnvironment;
+    private readonly ShellSettings _shellSettings;
+
+    public ModularApplicationModelProvider(
+        ITypeFeatureProvider typeFeatureProvider,
+        IHostEnvironment hostingEnvironment,
+        ShellSettings shellSettings)
     {
-        private readonly ITypeFeatureProvider _typeFeatureProvider;
-        private readonly IHostEnvironment _hostingEnvironment;
-        private readonly ShellSettings _shellSettings;
+        _typeFeatureProvider = typeFeatureProvider;
+        _hostingEnvironment = hostingEnvironment;
+        _shellSettings = shellSettings;
+    }
 
-        public ModularApplicationModelProvider(
-            ITypeFeatureProvider typeFeatureProvider,
-            IHostEnvironment hostingEnvironment,
-            ShellSettings shellSettings)
+    public int Order
+    {
+        get
         {
-            _typeFeatureProvider = typeFeatureProvider;
-            _hostingEnvironment = hostingEnvironment;
-            _shellSettings = shellSettings;
+            return 1000;
         }
+    }
 
-        public int Order
-        {
-            get
-            {
-                return 1000;
-            }
-        }
+    public void OnProvidersExecuted(ApplicationModelProviderContext context)
+    {
+        // This code is called only once per tenant during the construction of routes.
+        // Or if an 'IActionDescriptorChangeProvider' tells that an action descriptor
+        // has changed. E.g 'PageActionDescriptorChangeProvider' after any page update.
 
-        public void OnProvidersExecuted(ApplicationModelProviderContext context)
+        foreach (var controller in context.Result.Controllers)
         {
-            // This code is called only once per tenant during the construction of routes.
-            // Or if an 'IActionDescriptorChangeProvider' tells that an action descriptor
-            // has changed. E.g 'PageActionDescriptorChangeProvider' after any page update.
-
-            foreach (var controller in context.Result.Controllers)
-            {
-                var controllerType = controller.ControllerType.AsType();
+            var controllerType = controller.ControllerType.AsType();
 
-                var extension = _typeFeatureProvider.GetExtensionForDependency(controllerType);
+            var extension = _typeFeatureProvider.GetExtensionForDependency(controllerType);
 
-                if (extension.Id == _hostingEnvironment.ApplicationName && !_shellSettings.IsRunning())
-                {
-                    // Don't serve any action of the application's module which is enabled during a setup.
-                    foreach (var action in controller.Actions)
-                    {
-                        action.Selectors.Clear();
-                    }
-
-                    controller.Selectors.Clear();
-                }
-                else
+            if (extension.Id == _hostingEnvironment.ApplicationName && !_shellSettings.IsRunning())
+            {
+                // Don't serve any action of the application's module which is enabled during a setup.
+                foreach (var action in controller.Actions)
                 {
-                    // Add an "area" route value equal to the module id.
-                    controller.RouteValues.Add("area", extension.Id);
+                    action.Selectors.Clear();
                 }
+
+                controller.Selectors.Clear();
+            }
+            else
+            {
+                // Add an "area" route value equal to the module id.
+                controller.RouteValues.Add("area", extension.Id);
             }
         }
+    }
 
-        public void OnProvidersExecuting(ApplicationModelProviderContext context)
-        {
-        }
+    public void OnProvidersExecuting(ApplicationModelProviderContext context)
+    {
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/ModularRazorViewEngineOptionsSetup.cs b/src/OrchardCore/OrchardCore.Mvc.Core/ModularRazorViewEngineOptionsSetup.cs
index 4a19f2a8c8c..ce684301bf8 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/ModularRazorViewEngineOptionsSetup.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/ModularRazorViewEngineOptionsSetup.cs
@@ -2,17 +2,16 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Mvc.LocationExpander;
 
-namespace OrchardCore.Mvc
+namespace OrchardCore.Mvc;
+
+public sealed class ModularRazorViewEngineOptionsSetup : IConfigureOptions<RazorViewEngineOptions>
 {
-    public sealed class ModularRazorViewEngineOptionsSetup : IConfigureOptions<RazorViewEngineOptions>
+    public ModularRazorViewEngineOptionsSetup()
     {
-        public ModularRazorViewEngineOptionsSetup()
-        {
-        }
+    }
 
-        public void Configure(RazorViewEngineOptions options)
-        {
-            options.ViewLocationExpanders.Add(new CompositeViewLocationExpanderProvider());
-        }
+    public void Configure(RazorViewEngineOptions options)
+    {
+        options.ViewLocationExpanders.Add(new CompositeViewLocationExpanderProvider());
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/ModuleProjectRazorFileProvider.cs b/src/OrchardCore/OrchardCore.Mvc.Core/ModuleProjectRazorFileProvider.cs
index f1ed90d4d0a..be9b055fdbd 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/ModuleProjectRazorFileProvider.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/ModuleProjectRazorFileProvider.cs
@@ -8,245 +8,244 @@
 using Microsoft.Extensions.Primitives;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Mvc
+namespace OrchardCore.Mvc;
+
+/// <summary>
+/// This custom <see cref="IFileProvider"/> implementation provides the file contents
+/// of Module Project Razor files while in a development environment.
+/// </summary>
+public class ModuleProjectRazorFileProvider : IFileProvider
 {
-    /// <summary>
-    /// This custom <see cref="IFileProvider"/> implementation provides the file contents
-    /// of Module Project Razor files while in a development environment.
-    /// </summary>
-    public class ModuleProjectRazorFileProvider : IFileProvider
+    private static List<IFileProvider> _pageFileProviders;
+    private static Dictionary<string, string> _roots;
+    private static readonly object _synLock = new();
+
+    public ModuleProjectRazorFileProvider(IApplicationContext applicationContext)
     {
-        private static List<IFileProvider> _pageFileProviders;
-        private static Dictionary<string, string> _roots;
-        private static readonly object _synLock = new();
+        if (_roots != null)
+        {
+            return;
+        }
 
-        public ModuleProjectRazorFileProvider(IApplicationContext applicationContext)
+        lock (_synLock)
         {
-            if (_roots != null)
+            if (_roots == null)
             {
-                return;
-            }
+                var application = applicationContext.Application;
 
-            lock (_synLock)
-            {
-                if (_roots == null)
+                _pageFileProviders = [];
+                var roots = new Dictionary<string, string>();
+
+                // Resolve all module projects roots.
+                foreach (var module in application.Modules)
                 {
-                    var application = applicationContext.Application;
+                    // If the module and the application assemblies are not at the same location,
+                    // this means that the module is referenced as a package, not as a project in dev.
+                    if (module.Assembly == null || Path.GetDirectoryName(module.Assembly.Location)
+                        != Path.GetDirectoryName(application.Assembly.Location))
+                    {
+                        continue;
+                    }
 
-                    _pageFileProviders = [];
-                    var roots = new Dictionary<string, string>();
+                    // Get module assets which are razor files.
+                    var assets = module.Assets.Where(a => a.ModuleAssetPath
+                        .EndsWith(".cshtml", StringComparison.Ordinal));
 
-                    // Resolve all module projects roots.
-                    foreach (var module in application.Modules)
+                    if (assets.Any())
                     {
-                        // If the module and the application assemblies are not at the same location,
-                        // this means that the module is referenced as a package, not as a project in dev.
-                        if (module.Assembly == null || Path.GetDirectoryName(module.Assembly.Location)
-                            != Path.GetDirectoryName(application.Assembly.Location))
-                        {
-                            continue;
-                        }
+                        var asset = assets.First();
+                        var index = asset.ModuleAssetPath.IndexOf(module.Root, StringComparison.Ordinal);
+
+                        // Resolve the physical "{ModuleProjectDirectory}" from the project asset.
+                        var filePath = asset.ModuleAssetPath[(index + module.Root.Length)..];
+                        var root = asset.ProjectAssetPath[..^filePath.Length];
 
-                        // Get module assets which are razor files.
-                        var assets = module.Assets.Where(a => a.ModuleAssetPath
-                            .EndsWith(".cshtml", StringComparison.Ordinal));
+                        // Get the first module project asset which is under a "Pages" folder.
+                        var page = assets.FirstOrDefault(a => a.ProjectAssetPath.Contains("/Pages/"));
 
-                        if (assets.Any())
+                        // Check if the module project may have a razor page.
+                        if (page != null && Directory.Exists(root))
                         {
-                            var asset = assets.First();
-                            var index = asset.ModuleAssetPath.IndexOf(module.Root, StringComparison.Ordinal);
-
-                            // Resolve the physical "{ModuleProjectDirectory}" from the project asset.
-                            var filePath = asset.ModuleAssetPath[(index + module.Root.Length)..];
-                            var root = asset.ProjectAssetPath[..^filePath.Length];
-
-                            // Get the first module project asset which is under a "Pages" folder.
-                            var page = assets.FirstOrDefault(a => a.ProjectAssetPath.Contains("/Pages/"));
-
-                            // Check if the module project may have a razor page.
-                            if (page != null && Directory.Exists(root))
-                            {
-                                // Razor pages are not watched in the same way as other razor views.
-                                // We need a physical file provider on the "{ModuleProjectDirectory}".
-                                _pageFileProviders.Add(new PhysicalFileProvider(root));
-                            }
-
-                            // Add the module project root.
-                            roots[module.Name] = root;
+                            // Razor pages are not watched in the same way as other razor views.
+                            // We need a physical file provider on the "{ModuleProjectDirectory}".
+                            _pageFileProviders.Add(new PhysicalFileProvider(root));
                         }
-                    }
 
-                    _roots = roots;
+                        // Add the module project root.
+                        roots[module.Name] = root;
+                    }
                 }
+
+                _roots = roots;
             }
         }
+    }
 
-        public IDirectoryContents GetDirectoryContents(string subpath)
-        {
-            // 'GetDirectoryContents()' is used to discover shapes templates and build fixed binding tables.
-            // So the embedded file provider can always provide the structure under modules "Views" folders.
+    public IDirectoryContents GetDirectoryContents(string subpath)
+    {
+        // 'GetDirectoryContents()' is used to discover shapes templates and build fixed binding tables.
+        // So the embedded file provider can always provide the structure under modules "Views" folders.
 
-            // The razor view engine also uses 'GetDirectoryContents()' to find razor pages (not mvc views).
-            // So here, we only need to serve the directory contents under modules projects "Pages" folders.
+        // The razor view engine also uses 'GetDirectoryContents()' to find razor pages (not mvc views).
+        // So here, we only need to serve the directory contents under modules projects "Pages" folders.
 
-            // Note: This provider is not used in production where all modules precompiled views are used.
-            // Note: See 'ApplicationRazorFileProvider' for the specific case of the application's module.
+        // Note: This provider is not used in production where all modules precompiled views are used.
+        // Note: See 'ApplicationRazorFileProvider' for the specific case of the application's module.
 
-            if (subpath == null)
-            {
-                return NotFoundDirectoryContents.Singleton;
-            }
+        if (subpath == null)
+        {
+            return NotFoundDirectoryContents.Singleton;
+        }
+
+        var folder = NormalizePath(subpath);
 
-            var folder = NormalizePath(subpath);
+        // Under "Areas/{ModuleId}" or "Areas/{ModuleId}/**".
+        if (folder.StartsWith(Application.ModulesRoot, StringComparison.Ordinal))
+        {
+            // Remove "Areas/" from the folder path.
+            folder = folder[Application.ModulesRoot.Length..];
+            var index = folder.IndexOf('/');
 
-            // Under "Areas/{ModuleId}" or "Areas/{ModuleId}/**".
-            if (folder.StartsWith(Application.ModulesRoot, StringComparison.Ordinal))
+            // "{ModuleId}/**".
+            if (index != -1)
             {
-                // Remove "Areas/" from the folder path.
-                folder = folder[Application.ModulesRoot.Length..];
-                var index = folder.IndexOf('/');
+                // Resolve the module id.
+                var module = folder[..index];
 
-                // "{ModuleId}/**".
-                if (index != -1)
+                // Try to get the module project root.
+                if (_roots.TryGetValue(module, out var root) &&
+                    // Check for a final or an intermadiate "Pages" segment.
+                    (folder.EndsWith("/Pages", StringComparison.Ordinal) || folder.Contains("/Pages/")))
                 {
-                    // Resolve the module id.
-                    var module = folder[..index];
+                    // Resolve the subpath relative to "{ModuleProjectDirectory}".
+                    folder = string.Concat(root, folder.AsSpan(module.Length + 1));
 
-                    // Try to get the module project root.
-                    if (_roots.TryGetValue(module, out var root) &&
-                        // Check for a final or an intermadiate "Pages" segment.
-                        (folder.EndsWith("/Pages", StringComparison.Ordinal) || folder.Contains("/Pages/")))
+                    if (Directory.Exists(folder))
                     {
-                        // Resolve the subpath relative to "{ModuleProjectDirectory}".
-                        folder = string.Concat(root, folder.AsSpan(module.Length + 1));
-
-                        if (Directory.Exists(folder))
-                        {
-                            // Serve the contents from the file system.
-                            return new PhysicalDirectoryContents(folder);
-                        }
+                        // Serve the contents from the file system.
+                        return new PhysicalDirectoryContents(folder);
                     }
                 }
             }
-
-            return NotFoundDirectoryContents.Singleton;
         }
 
-        public IFileInfo GetFileInfo(string subpath)
+        return NotFoundDirectoryContents.Singleton;
+    }
+
+    public IFileInfo GetFileInfo(string subpath)
+    {
+        if (subpath == null)
         {
-            if (subpath == null)
-            {
-                return new NotFoundFileInfo(subpath);
-            }
+            return new NotFoundFileInfo(subpath);
+        }
 
-            var path = NormalizePath(subpath);
+        var path = NormalizePath(subpath);
 
-            // "Areas/**/*.*".
-            if (path.StartsWith(Application.ModulesRoot, StringComparison.Ordinal))
+        // "Areas/**/*.*".
+        if (path.StartsWith(Application.ModulesRoot, StringComparison.Ordinal))
+        {
+            // Skip the "Areas/" root folder.
+            path = path[Application.ModulesRoot.Length..];
+            var index = path.IndexOf('/');
+
+            // "{ModuleId}/**/*.*".
+            if (index != -1)
             {
-                // Skip the "Areas/" root folder.
-                path = path[Application.ModulesRoot.Length..];
-                var index = path.IndexOf('/');
+                // Resolve the module id.
+                var module = path[..index];
 
-                // "{ModuleId}/**/*.*".
-                if (index != -1)
+                // Get the module root folder.
+                if (_roots.TryGetValue(module, out var root))
                 {
-                    // Resolve the module id.
-                    var module = path[..index];
+                    // Resolve "{ModuleProjectDirectory}**/*.*".
+                    var filePath = string.Concat(root, path.AsSpan(module.Length + 1));
 
-                    // Get the module root folder.
-                    if (_roots.TryGetValue(module, out var root))
+                    if (File.Exists(filePath))
                     {
-                        // Resolve "{ModuleProjectDirectory}**/*.*".
-                        var filePath = string.Concat(root, path.AsSpan(module.Length + 1));
-
-                        if (File.Exists(filePath))
-                        {
-                            // Serve the file from the physical file system.
-                            return new PhysicalFileInfo(new FileInfo(filePath));
-                        }
+                        // Serve the file from the physical file system.
+                        return new PhysicalFileInfo(new FileInfo(filePath));
                     }
                 }
             }
-
-            return new NotFoundFileInfo(subpath);
         }
 
-        public IChangeToken Watch(string filter)
+        return new NotFoundFileInfo(subpath);
+    }
+
+    public IChangeToken Watch(string filter)
+    {
+        if (filter == null)
         {
-            if (filter == null)
-            {
-                return NullChangeToken.Singleton;
-            }
+            return NullChangeToken.Singleton;
+        }
 
-            var path = NormalizePath(filter);
+        var path = NormalizePath(filter);
+
+        // "Areas/**/*.*".
+        if (path.StartsWith(Application.ModulesRoot, StringComparison.Ordinal) && !path.Contains('*'))
+        {
+            // Skip the "Areas/" root folder.
+            path = path[Application.ModulesRoot.Length..];
+            var index = path.IndexOf('/');
 
-            // "Areas/**/*.*".
-            if (path.StartsWith(Application.ModulesRoot, StringComparison.Ordinal) && !path.Contains('*'))
+            // "{ModuleId}/**/*.*".
+            if (index != -1)
             {
-                // Skip the "Areas/" root folder.
-                path = path[Application.ModulesRoot.Length..];
-                var index = path.IndexOf('/');
+                // Resolve the module id.
+                var module = path[..index];
 
-                // "{ModuleId}/**/*.*".
-                if (index != -1)
+                // Get the module root folder.
+                if (_roots.TryGetValue(module, out var root))
                 {
-                    // Resolve the module id.
-                    var module = path[..index];
+                    // Resolve "{ModuleProjectDirectory}**/*.*".
+                    var filePath = string.Concat(root, path.AsSpan(module.Length + 1));
 
-                    // Get the module root folder.
-                    if (_roots.TryGetValue(module, out var root))
-                    {
-                        // Resolve "{ModuleProjectDirectory}**/*.*".
-                        var filePath = string.Concat(root, path.AsSpan(module.Length + 1));
-
-                        var directory = Path.GetDirectoryName(filePath);
-                        var fileName = Path.GetFileNameWithoutExtension(filePath);
+                    var directory = Path.GetDirectoryName(filePath);
+                    var fileName = Path.GetFileNameWithoutExtension(filePath);
 
-                        if (Directory.Exists(directory))
-                        {
-                            // Watch the project asset from the physical file system.
-                            // Note: Here a wildcard is used on the file extension
-                            // so that removing and re-adding a file is detected.
-                            return new PollingWildCardChangeToken(directory, fileName + ".*");
-                        }
+                    if (Directory.Exists(directory))
+                    {
+                        // Watch the project asset from the physical file system.
+                        // Note: Here a wildcard is used on the file extension
+                        // so that removing and re-adding a file is detected.
+                        return new PollingWildCardChangeToken(directory, fileName + ".*");
                     }
                 }
             }
+        }
 
-            // The view engine uses a watch on "Pages/**/*.cshtml" but only for razor pages.
-            // So here, we only use file providers for modules which have a "Pages" folder.
-            else if (path.Equals("Pages/**/*.cshtml", StringComparison.Ordinal))
-            {
-                var changeTokens = new List<IChangeToken>();
-
-                // For each module which might have pages.
-                foreach (var provider in _pageFileProviders)
-                {
-                    // Watch all razor files under its "Pages" folder.
-                    var changeToken = provider.Watch("Pages/**/*.cshtml");
+        // The view engine uses a watch on "Pages/**/*.cshtml" but only for razor pages.
+        // So here, we only use file providers for modules which have a "Pages" folder.
+        else if (path.Equals("Pages/**/*.cshtml", StringComparison.Ordinal))
+        {
+            var changeTokens = new List<IChangeToken>();
 
-                    if (changeToken != null)
-                    {
-                        changeTokens.Add(changeToken);
-                    }
-                }
+            // For each module which might have pages.
+            foreach (var provider in _pageFileProviders)
+            {
+                // Watch all razor files under its "Pages" folder.
+                var changeToken = provider.Watch("Pages/**/*.cshtml");
 
-                if (changeTokens.Count == 1)
+                if (changeToken != null)
                 {
-                    return changeTokens.First();
+                    changeTokens.Add(changeToken);
                 }
+            }
 
-                if (changeTokens.Count > 0)
-                {
-                    // Use a composite of all provider tokens.
-                    return new CompositeChangeToken(changeTokens);
-                }
+            if (changeTokens.Count == 1)
+            {
+                return changeTokens.First();
             }
 
-            return NullChangeToken.Singleton;
+            if (changeTokens.Count > 0)
+            {
+                // Use a composite of all provider tokens.
+                return new CompositeChangeToken(changeTokens);
+            }
         }
 
-        private static string NormalizePath(string path) => path.Replace('\\', '/').Trim('/');
+        return NullChangeToken.Singleton;
     }
+
+    private static string NormalizePath(string path) => path.Replace('\\', '/').Trim('/');
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/RazorCompilationFileProviderAccessor.cs b/src/OrchardCore/OrchardCore.Mvc.Core/RazorCompilationFileProviderAccessor.cs
index a12acae31e0..529fe4dfa8a 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/RazorCompilationFileProviderAccessor.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/RazorCompilationFileProviderAccessor.cs
@@ -3,40 +3,39 @@
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Mvc
+namespace OrchardCore.Mvc;
+
+public class RazorCompilationFileProviderAccessor
 {
-    public class RazorCompilationFileProviderAccessor
-    {
-        private readonly MvcRazorRuntimeCompilationOptions _options;
-        private IFileProvider _compositeFileProvider;
+    private readonly MvcRazorRuntimeCompilationOptions _options;
+    private IFileProvider _compositeFileProvider;
 
-        public RazorCompilationFileProviderAccessor(IOptions<MvcRazorRuntimeCompilationOptions> options)
-        {
-            ArgumentNullException.ThrowIfNull(options);
+    public RazorCompilationFileProviderAccessor(IOptions<MvcRazorRuntimeCompilationOptions> options)
+    {
+        ArgumentNullException.ThrowIfNull(options);
 
-            _options = options.Value;
-        }
+        _options = options.Value;
+    }
 
-        public IFileProvider FileProvider
+    public IFileProvider FileProvider
+    {
+        get
         {
-            get
-            {
-                _compositeFileProvider ??= GetCompositeFileProvider(_options);
+            _compositeFileProvider ??= GetCompositeFileProvider(_options);
 
-                return _compositeFileProvider;
-            }
+            return _compositeFileProvider;
         }
+    }
 
-        private static IFileProvider GetCompositeFileProvider(MvcRazorRuntimeCompilationOptions options)
-        {
-            var fileProviders = options.FileProviders;
-
-            if (fileProviders.Count == 1)
-            {
-                return fileProviders[0];
-            }
+    private static IFileProvider GetCompositeFileProvider(MvcRazorRuntimeCompilationOptions options)
+    {
+        var fileProviders = options.FileProviders;
 
-            return new CompositeFileProvider(fileProviders);
+        if (fileProviders.Count == 1)
+        {
+            return fileProviders[0];
         }
+
+        return new CompositeFileProvider(fileProviders);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/RazorCompilationOptionsSetup.cs b/src/OrchardCore/OrchardCore.Mvc.Core/RazorCompilationOptionsSetup.cs
index 2e904000857..cef8340ac00 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/RazorCompilationOptionsSetup.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/RazorCompilationOptionsSetup.cs
@@ -6,40 +6,39 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Mvc
+namespace OrchardCore.Mvc;
+
+public sealed class RazorCompilationOptionsSetup : IConfigureOptions<MvcRazorRuntimeCompilationOptions>
 {
-    public sealed class RazorCompilationOptionsSetup : IConfigureOptions<MvcRazorRuntimeCompilationOptions>
+    private readonly IHostEnvironment _hostingEnvironment;
+    private readonly IApplicationContext _applicationContext;
+
+    public RazorCompilationOptionsSetup(IHostEnvironment hostingEnvironment, IApplicationContext applicationContext)
     {
-        private readonly IHostEnvironment _hostingEnvironment;
-        private readonly IApplicationContext _applicationContext;
+        _hostingEnvironment = hostingEnvironment;
+        _applicationContext = applicationContext;
+    }
 
-        public RazorCompilationOptionsSetup(IHostEnvironment hostingEnvironment, IApplicationContext applicationContext)
-        {
-            _hostingEnvironment = hostingEnvironment;
-            _applicationContext = applicationContext;
-        }
+    public void Configure(MvcRazorRuntimeCompilationOptions options)
+    {
+        // In dev mode or if there is no 'refs' folder, we don't register razor runtime compilation services.
+        var refsFolderExists = Directory.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "refs"));
 
-        public void Configure(MvcRazorRuntimeCompilationOptions options)
+        // But in some view location expanders we always use the file providers that we enlist here, so
+        // we still need to add 'ContentRootFileProvider' that includes our 'ModuleEmbeddedFileProvider'.
+        if (!_hostingEnvironment.IsDevelopment() || !refsFolderExists)
         {
-            // In dev mode or if there is no 'refs' folder, we don't register razor runtime compilation services.
-            var refsFolderExists = Directory.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "refs"));
-
-            // But in some view location expanders we always use the file providers that we enlist here, so
-            // we still need to add 'ContentRootFileProvider' that includes our 'ModuleEmbeddedFileProvider'.
-            if (!_hostingEnvironment.IsDevelopment() || !refsFolderExists)
-            {
-                options.FileProviders.Insert(0, _hostingEnvironment.ContentRootFileProvider);
-            }
+            options.FileProviders.Insert(0, _hostingEnvironment.ContentRootFileProvider);
+        }
 
-            // To let the application behave as a module, its razor files are requested under the virtual
-            // "Areas" folder, but they are still served from the file system by this custom provider.
-            options.FileProviders.Insert(0, new ApplicationViewFileProvider(_applicationContext));
+        // To let the application behave as a module, its razor files are requested under the virtual
+        // "Areas" folder, but they are still served from the file system by this custom provider.
+        options.FileProviders.Insert(0, new ApplicationViewFileProvider(_applicationContext));
 
-            if (_hostingEnvironment.IsDevelopment())
-            {
-                // While in development, razor files are 1st served from their module project locations.
-                options.FileProviders.Insert(0, new ModuleProjectRazorFileProvider(_applicationContext));
-            }
+        if (_hostingEnvironment.IsDevelopment())
+        {
+            // While in development, razor files are 1st served from their module project locations.
+            options.FileProviders.Insert(0, new ModuleProjectRazorFileProvider(_applicationContext));
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/ModularPageApplicationModelProvider.cs b/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/ModularPageApplicationModelProvider.cs
index 36a442a2093..3bec7b45253 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/ModularPageApplicationModelProvider.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/ModularPageApplicationModelProvider.cs
@@ -6,48 +6,47 @@
 using OrchardCore.Environment.Shell.Descriptor.Models;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Mvc.RazorPages
+namespace OrchardCore.Mvc.RazorPages;
+
+public class ModularPageApplicationModelProvider : IPageApplicationModelProvider
 {
-    public class ModularPageApplicationModelProvider : IPageApplicationModelProvider
+    private readonly ILookup<string, string> _featureIdsByArea;
+
+    public ModularPageApplicationModelProvider(
+        IExtensionManager extensionManager,
+        ShellDescriptor shellDescriptor)
     {
-        private readonly ILookup<string, string> _featureIdsByArea;
+        // Available features by area in the current shell.            
+        _featureIdsByArea = extensionManager.GetFeatures()
+            .Where(f => shellDescriptor.Features.Any(sf => sf.Id == f.Id))
+            .ToLookup(f => f.Extension.Id, f => f.Id);
+    }
 
-        public ModularPageApplicationModelProvider(
-            IExtensionManager extensionManager,
-            ShellDescriptor shellDescriptor)
-        {
-            // Available features by area in the current shell.            
-            _featureIdsByArea = extensionManager.GetFeatures()
-                .Where(f => shellDescriptor.Features.Any(sf => sf.Id == f.Id))
-                .ToLookup(f => f.Extension.Id, f => f.Id);
-        }
+    public int Order => -1000 + 10;
 
-        public int Order => -1000 + 10;
+    public void OnProvidersExecuting(PageApplicationModelProviderContext context)
+    {
+    }
 
-        public void OnProvidersExecuting(PageApplicationModelProviderContext context)
-        {
-        }
+    // Called the 1st time a page is requested or if any page has been updated.
+    public void OnProvidersExecuted(PageApplicationModelProviderContext context)
+    {
+        // Check if the page belongs to an enabled feature.
+        var found = false;
 
-        // Called the 1st time a page is requested or if any page has been updated.
-        public void OnProvidersExecuted(PageApplicationModelProviderContext context)
+        var area = context.PageApplicationModel.AreaName;
+        if (_featureIdsByArea.Contains(area))
         {
-            // Check if the page belongs to an enabled feature.
-            var found = false;
+            found = true;
 
-            var area = context.PageApplicationModel.AreaName;
-            if (_featureIdsByArea.Contains(area))
+            var pageModelType = context.PageApplicationModel.ModelType.AsType();
+            var attribute = pageModelType.GetCustomAttributes<FeatureAttribute>(false).FirstOrDefault();
+            if (attribute != null)
             {
-                found = true;
-
-                var pageModelType = context.PageApplicationModel.ModelType.AsType();
-                var attribute = pageModelType.GetCustomAttributes<FeatureAttribute>(false).FirstOrDefault();
-                if (attribute != null)
-                {
-                    found = _featureIdsByArea[area].Contains(attribute.FeatureName);
-                }
+                found = _featureIdsByArea[area].Contains(attribute.FeatureName);
             }
-
-            context.PageApplicationModel.Filters.Add(new ModularPageViewEnginePathFilter(found));
         }
+
+        context.PageApplicationModel.Filters.Add(new ModularPageViewEnginePathFilter(found));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/ModularPageMvcCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/ModularPageMvcCoreBuilderExtensions.cs
index 479b26648e0..a44e27e59cd 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/ModularPageMvcCoreBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/ModularPageMvcCoreBuilderExtensions.cs
@@ -5,28 +5,27 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Mvc.RazorPages
+namespace OrchardCore.Mvc.RazorPages;
+
+public static class ModularPageMvcCoreBuilderExtensions
 {
-    public static class ModularPageMvcCoreBuilderExtensions
+    public static IMvcCoreBuilder AddModularRazorPages(this IMvcCoreBuilder builder)
     {
-        public static IMvcCoreBuilder AddModularRazorPages(this IMvcCoreBuilder builder)
-        {
-            builder.AddRazorPages();
-            builder.Services.AddModularRazorPages();
-            return builder;
-        }
+        builder.AddRazorPages();
+        builder.Services.AddModularRazorPages();
+        return builder;
+    }
 
-        internal static IServiceCollection AddModularRazorPages(this IServiceCollection services)
-        {
-            services.TryAddEnumerable(ServiceDescriptor.Singleton<MatcherPolicy, PageEndpointComparerPolicy>());
+    internal static IServiceCollection AddModularRazorPages(this IServiceCollection services)
+    {
+        services.TryAddEnumerable(ServiceDescriptor.Singleton<MatcherPolicy, PageEndpointComparerPolicy>());
 
-            services.TryAddEnumerable(
-                ServiceDescriptor.Transient<IConfigureOptions<RazorPagesOptions>, ModularPageRazorPagesOptionsSetup>());
+        services.TryAddEnumerable(
+            ServiceDescriptor.Transient<IConfigureOptions<RazorPagesOptions>, ModularPageRazorPagesOptionsSetup>());
 
-            services.TryAddEnumerable(
-                ServiceDescriptor.Singleton<IPageApplicationModelProvider, ModularPageApplicationModelProvider>());
+        services.TryAddEnumerable(
+            ServiceDescriptor.Singleton<IPageApplicationModelProvider, ModularPageApplicationModelProvider>());
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/ModularPageRazorPagesOptionsSetup.cs b/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/ModularPageRazorPagesOptionsSetup.cs
index 4562bdb2a37..e6cc0c8dca6 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/ModularPageRazorPagesOptionsSetup.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/ModularPageRazorPagesOptionsSetup.cs
@@ -4,35 +4,34 @@
 using OrchardCore.Environment.Shell;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Mvc.RazorPages
+namespace OrchardCore.Mvc.RazorPages;
+
+public sealed class ModularPageRazorPagesOptionsSetup : IConfigureOptions<RazorPagesOptions>
 {
-    public sealed class ModularPageRazorPagesOptionsSetup : IConfigureOptions<RazorPagesOptions>
+    private readonly IApplicationContext _applicationContext;
+    private readonly ShellSettings _shellSettings;
+
+    public ModularPageRazorPagesOptionsSetup(IApplicationContext applicationContext, ShellSettings shellSettings)
     {
-        private readonly IApplicationContext _applicationContext;
-        private readonly ShellSettings _shellSettings;
+        _applicationContext = applicationContext;
+        _shellSettings = shellSettings;
+    }
 
-        public ModularPageRazorPagesOptionsSetup(IApplicationContext applicationContext, ShellSettings shellSettings)
+    public void Configure(RazorPagesOptions options)
+    {
+        // Only serve pages under the "Areas" folder and whose routes have an area name.
+        options.Conventions.AddFolderRouteModelConvention("/", model => model.Selectors.Clear());
+
+        if (!_shellSettings.IsRunning())
         {
-            _applicationContext = applicationContext;
-            _shellSettings = shellSettings;
+            // Don't serve any page of the application'module which is enabled during a setup.
+            options.Conventions.AddAreaFolderRouteModelConvention(_applicationContext.Application.Name, "/",
+                model => model.Selectors.Clear());
         }
-
-        public void Configure(RazorPagesOptions options)
+        else
         {
-            // Only serve pages under the "Areas" folder and whose routes have an area name.
-            options.Conventions.AddFolderRouteModelConvention("/", model => model.Selectors.Clear());
-
-            if (!_shellSettings.IsRunning())
-            {
-                // Don't serve any page of the application'module which is enabled during a setup.
-                options.Conventions.AddAreaFolderRouteModelConvention(_applicationContext.Application.Name, "/",
-                    model => model.Selectors.Clear());
-            }
-            else
-            {
-                // Add a custom folder route to serve the application's module pages from the root.
-                options.Conventions.AddAreaFolderRoute(_applicationContext.Application.Name, "/", "");
-            }
+            // Add a custom folder route to serve the application's module pages from the root.
+            options.Conventions.AddAreaFolderRoute(_applicationContext.Application.Name, "/", "");
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/ModularPageViewEnginePathFilter.cs b/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/ModularPageViewEnginePathFilter.cs
index 66146894586..f78b63ff854 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/ModularPageViewEnginePathFilter.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/ModularPageViewEnginePathFilter.cs
@@ -2,31 +2,30 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 
-namespace OrchardCore.Mvc.RazorPages
+namespace OrchardCore.Mvc.RazorPages;
+
+public class ModularPageViewEnginePathFilter : IAsyncPageFilter
 {
-    public class ModularPageViewEnginePathFilter : IAsyncPageFilter
+    private readonly bool _found;
+
+    public ModularPageViewEnginePathFilter(bool found)
     {
-        private readonly bool _found;
+        _found = found;
+    }
 
-        public ModularPageViewEnginePathFilter(bool found)
+    public async Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next)
+    {
+        if (!_found)
         {
-            _found = found;
+            context.Result = new NotFoundResult();
+            return;
         }
 
-        public async Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next)
-        {
-            if (!_found)
-            {
-                context.Result = new NotFoundResult();
-                return;
-            }
-
-            await next();
-        }
+        await next();
+    }
 
-        public Task OnPageHandlerSelectionAsync(PageHandlerSelectedContext context)
-        {
-            return Task.CompletedTask;
-        }
+    public Task OnPageHandlerSelectionAsync(PageHandlerSelectedContext context)
+    {
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/PageConventionCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/PageConventionCollectionExtensions.cs
index 7efda4f3c05..6c433aaba5d 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/PageConventionCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/PageConventionCollectionExtensions.cs
@@ -1,80 +1,79 @@
 using System;
 using System.Linq;
 
-namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+public static class PageConventionCollectionExtensions
 {
-    public static class PageConventionCollectionExtensions
+    /// <summary>
+    /// Adds a folder route for all pages in the specified area and under the specified area folder.
+    /// These pages can be routed via their names prefixed by folder route in addition to the default
+    /// set of path based routes. Links generated for these pages will use the specified folder route.
+    /// Note: Applied to all pages whose razor view file path doesn't contain any '/Admin/' segment
+    /// and whose route model properties doesn't contains an 'Admin' key.
+    /// </summary>
+    public static PageConventionCollection AddAreaFolderRoute(this PageConventionCollection conventions,
+        string areaName, string folderPath, string folderRoute)
     {
-        /// <summary>
-        /// Adds a folder route for all pages in the specified area and under the specified area folder.
-        /// These pages can be routed via their names prefixed by folder route in addition to the default
-        /// set of path based routes. Links generated for these pages will use the specified folder route.
-        /// Note: Applied to all pages whose razor view file path doesn't contain any '/Admin/' segment
-        /// and whose route model properties doesn't contains an 'Admin' key.
-        /// </summary>
-        public static PageConventionCollection AddAreaFolderRoute(this PageConventionCollection conventions,
-            string areaName, string folderPath, string folderRoute)
-        {
-            return conventions.AddAreaFolderRouteInternal(areaName, folderPath, folderRoute, isAdmin: false);
-        }
+        return conventions.AddAreaFolderRouteInternal(areaName, folderPath, folderRoute, isAdmin: false);
+    }
 
-        /// <summary>
-        /// Adds a folder route for all pages in the specified area and under the specified area folder.
-        /// These pages can be routed via their names prefixed by folder route in addition to the default
-        /// set of path based routes. Links generated for these pages will use the specified folder route.
-        /// Note: Applied to all pages whose razor view file path contains an '/Admin/' segment
-        /// or whose route model properties contains an 'Admin' key.
-        /// </summary>
-        public static PageConventionCollection AddAdminAreaFolderRoute(this PageConventionCollection conventions,
-            string areaName, string folderPath, string folderRoute)
-        {
-            return conventions.AddAreaFolderRouteInternal(areaName, folderPath, folderRoute, isAdmin: true);
-        }
+    /// <summary>
+    /// Adds a folder route for all pages in the specified area and under the specified area folder.
+    /// These pages can be routed via their names prefixed by folder route in addition to the default
+    /// set of path based routes. Links generated for these pages will use the specified folder route.
+    /// Note: Applied to all pages whose razor view file path contains an '/Admin/' segment
+    /// or whose route model properties contains an 'Admin' key.
+    /// </summary>
+    public static PageConventionCollection AddAdminAreaFolderRoute(this PageConventionCollection conventions,
+        string areaName, string folderPath, string folderRoute)
+    {
+        return conventions.AddAreaFolderRouteInternal(areaName, folderPath, folderRoute, isAdmin: true);
+    }
 
-        internal static PageConventionCollection AddAreaFolderRouteInternal(this PageConventionCollection conventions,
-            string areaName, string folderPath, string folderRoute, bool isAdmin)
+    internal static PageConventionCollection AddAreaFolderRouteInternal(this PageConventionCollection conventions,
+        string areaName, string folderPath, string folderRoute, bool isAdmin)
+    {
+        conventions.AddAreaFolderRouteModelConvention(areaName, folderPath, model =>
         {
-            conventions.AddAreaFolderRouteModelConvention(areaName, folderPath, model =>
+            if (isAdmin != (model.ViewEnginePath.Contains("/Admin/") || model.Properties.ContainsKey("Admin")))
             {
-                if (isAdmin != (model.ViewEnginePath.Contains("/Admin/") || model.Properties.ContainsKey("Admin")))
-                {
-                    return;
-                }
+                return;
+            }
 
-                var areaFolder = areaName + folderPath;
+            var areaFolder = areaName + folderPath;
+
+            foreach (var selector in model.Selectors.ToArray())
+            {
+                var route = selector.AttributeRouteModel;
 
-                foreach (var selector in model.Selectors.ToArray())
+                if (route.Template.StartsWith(areaFolder, StringComparison.Ordinal) || (route.Template == areaName && folderPath == "/"))
                 {
-                    var route = selector.AttributeRouteModel;
+                    route.SuppressLinkGeneration = true;
 
-                    if (route.Template.StartsWith(areaFolder, StringComparison.Ordinal) || (route.Template == areaName && folderPath == "/"))
-                    {
-                        route.SuppressLinkGeneration = true;
+                    string template;
 
-                        string template;
+                    if (route.Template == areaName && folderPath == "/")
+                    {
+                        template = folderRoute;
+                    }
+                    else
+                    {
+                        var cleanSubTemplate = route.Template[areaFolder.Length..].TrimStart('/');
+                        template = AttributeRouteModel.CombineTemplates(folderRoute, cleanSubTemplate);
+                    }
 
-                        if (route.Template == areaName && folderPath == "/")
-                        {
-                            template = folderRoute;
-                        }
-                        else
+                    model.Selectors.Add(new SelectorModel
+                    {
+                        AttributeRouteModel = new AttributeRouteModel
                         {
-                            var cleanSubTemplate = route.Template[areaFolder.Length..].TrimStart('/');
-                            template = AttributeRouteModel.CombineTemplates(folderRoute, cleanSubTemplate);
+                            Template = template
                         }
-
-                        model.Selectors.Add(new SelectorModel
-                        {
-                            AttributeRouteModel = new AttributeRouteModel
-                            {
-                                Template = template
-                            }
-                        });
-                    }
+                    });
                 }
-            });
+            }
+        });
 
-            return conventions;
-        }
+        return conventions;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/PageEndpointComparerPolicy.cs b/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/PageEndpointComparerPolicy.cs
index ff9ea35bc3b..553a5903c82 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/PageEndpointComparerPolicy.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/PageEndpointComparerPolicy.cs
@@ -4,20 +4,19 @@
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Routing.Matching;
 
-namespace OrchardCore.Mvc.RazorPages
+namespace OrchardCore.Mvc.RazorPages;
+
+public sealed class PageEndpointComparerPolicy : MatcherPolicy, IEndpointComparerPolicy
 {
-    public sealed class PageEndpointComparerPolicy : MatcherPolicy, IEndpointComparerPolicy
-    {
-        public override int Order => -1000;
+    public override int Order => -1000;
 
-        public IComparer<Endpoint> Comparer => new PageEndpointComparer();
+    public IComparer<Endpoint> Comparer => new PageEndpointComparer();
 
-        private sealed class PageEndpointComparer : EndpointMetadataComparer<PageActionDescriptor>
+    private sealed class PageEndpointComparer : EndpointMetadataComparer<PageActionDescriptor>
+    {
+        protected override int CompareMetadata(PageActionDescriptor x, PageActionDescriptor y)
         {
-            protected override int CompareMetadata(PageActionDescriptor x, PageActionDescriptor y)
-            {
-                return base.CompareMetadata(x, y);
-            }
+            return base.CompareMetadata(x, y);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/Routing/DefaultAreaControllerRouteMapper.cs b/src/OrchardCore/OrchardCore.Mvc.Core/Routing/DefaultAreaControllerRouteMapper.cs
index 545efb7e5ac..ec091f577fe 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/Routing/DefaultAreaControllerRouteMapper.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/Routing/DefaultAreaControllerRouteMapper.cs
@@ -2,25 +2,24 @@
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Routing;
 
-namespace OrchardCore.Mvc.Routing
+namespace OrchardCore.Mvc.Routing;
+
+public class DefaultAreaControllerRouteMapper : IAreaControllerRouteMapper
 {
-    public class DefaultAreaControllerRouteMapper : IAreaControllerRouteMapper
-    {
-        private const string DefaultAreaPattern = "/{area}/{controller}/{action}/{id?}";
+    private const string DefaultAreaPattern = "/{area}/{controller}/{action}/{id?}";
 
-        public int Order => 1000;
+    public int Order => 1000;
 
-        public bool TryMapAreaControllerRoute(IEndpointRouteBuilder routes, ControllerActionDescriptor descriptor)
-        {
-            var (area, controller, action) = RoutingHelper.GetMvcRouteValues(descriptor);
+    public bool TryMapAreaControllerRoute(IEndpointRouteBuilder routes, ControllerActionDescriptor descriptor)
+    {
+        var (area, controller, action) = RoutingHelper.GetMvcRouteValues(descriptor);
 
-            routes.MapControllerRoute(
-               name: descriptor.DisplayName,
-               pattern: RoutingHelper.ReplaceMvcPlaceholders(DefaultAreaPattern, area, controller, action),
-               defaults: new { area, controller, action }
-            );
+        routes.MapControllerRoute(
+           name: descriptor.DisplayName,
+           pattern: RoutingHelper.ReplaceMvcPlaceholders(DefaultAreaPattern, area, controller, action),
+           defaults: new { area, controller, action }
+        );
 
-            return true;
-        }
+        return true;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/SharedViewCompilerProvider.cs b/src/OrchardCore/OrchardCore.Mvc.Core/SharedViewCompilerProvider.cs
index e57a4cca2fb..4cde89ea420 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/SharedViewCompilerProvider.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/SharedViewCompilerProvider.cs
@@ -3,43 +3,42 @@
 using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace OrchardCore.Mvc
+namespace OrchardCore.Mvc;
+
+/// <summary>
+/// Shares across tenants the same <see cref="IViewCompiler"/>.
+/// </summary>
+public class SharedViewCompilerProvider : IViewCompilerProvider
 {
-    /// <summary>
-    /// Shares across tenants the same <see cref="IViewCompiler"/>.
-    /// </summary>
-    public class SharedViewCompilerProvider : IViewCompilerProvider
+    private readonly object _synLock = new();
+    private static IViewCompiler _compiler;
+    private readonly IServiceProvider _services;
+
+    public SharedViewCompilerProvider(IServiceProvider services)
     {
-        private readonly object _synLock = new();
-        private static IViewCompiler _compiler;
-        private readonly IServiceProvider _services;
+        _services = services;
+    }
 
-        public SharedViewCompilerProvider(IServiceProvider services)
+    public IViewCompiler GetCompiler()
+    {
+        if (_compiler is not null)
         {
-            _services = services;
+            return _compiler;
         }
 
-        public IViewCompiler GetCompiler()
+        lock (_synLock)
         {
             if (_compiler is not null)
             {
                 return _compiler;
             }
 
-            lock (_synLock)
-            {
-                if (_compiler is not null)
-                {
-                    return _compiler;
-                }
-
-                _compiler = _services
-                    .GetServices<IViewCompilerProvider>()
-                    .FirstOrDefault()
-                    ?.GetCompiler();
-            }
-
-            return _compiler;
+            _compiler = _services
+                .GetServices<IViewCompilerProvider>()
+                .FirstOrDefault()
+                ?.GetCompiler();
         }
+
+        return _compiler;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/ShellFeatureApplicationPart.cs b/src/OrchardCore/OrchardCore.Mvc.Core/ShellFeatureApplicationPart.cs
index 1954505d039..4f4623d7bac 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/ShellFeatureApplicationPart.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/ShellFeatureApplicationPart.cs
@@ -8,85 +8,84 @@
 using OrchardCore.Environment.Shell.Builders.Models;
 using OrchardCore.Environment.Shell.Scope;
 
-namespace OrchardCore.Mvc
+namespace OrchardCore.Mvc;
+
+/// <summary>
+/// An <see cref="ApplicationPart"/> backed by an <see cref="Assembly"/>.
+/// </summary>
+public class ShellFeatureApplicationPart :
+    ApplicationPart,
+    IApplicationPartTypeProvider,
+    ICompilationReferencesProvider
 {
+    private static IEnumerable<string> _referencePaths;
+    private static readonly object _synLock = new();
+    private ShellBlueprint _shellBlueprint;
+    private IEnumerable<ITagHelpersProvider> _tagHelpers;
+
     /// <summary>
-    /// An <see cref="ApplicationPart"/> backed by an <see cref="Assembly"/>.
+    /// Initalizes a new <see cref="AssemblyPart"/> instance.
     /// </summary>
-    public class ShellFeatureApplicationPart :
-        ApplicationPart,
-        IApplicationPartTypeProvider,
-        ICompilationReferencesProvider
+    public ShellFeatureApplicationPart()
     {
-        private static IEnumerable<string> _referencePaths;
-        private static readonly object _synLock = new();
-        private ShellBlueprint _shellBlueprint;
-        private IEnumerable<ITagHelpersProvider> _tagHelpers;
+    }
 
-        /// <summary>
-        /// Initalizes a new <see cref="AssemblyPart"/> instance.
-        /// </summary>
-        public ShellFeatureApplicationPart()
+    public override string Name
+    {
+        get
         {
+            return nameof(ShellFeatureApplicationPart);
         }
+    }
 
-        public override string Name
-        {
-            get
-            {
-                return nameof(ShellFeatureApplicationPart);
-            }
-        }
-
-        /// <inheritdoc />
-        public IEnumerable<TypeInfo> Types
+    /// <inheritdoc />
+    public IEnumerable<TypeInfo> Types
+    {
+        get
         {
-            get
-            {
-                var services = ShellScope.Services;
+            var services = ShellScope.Services;
 
-                // The scope is null when this code is called through a 'ChangeToken' callback, e.g to recompile razor pages.
-                // So, here we resolve and cache tenant level singletons, application singletons can be resolved in the ctor.
+            // The scope is null when this code is called through a 'ChangeToken' callback, e.g to recompile razor pages.
+            // So, here we resolve and cache tenant level singletons, application singletons can be resolved in the ctor.
 
-                if (services != null && _tagHelpers == null)
+            if (services != null && _tagHelpers == null)
+            {
+                lock (this)
                 {
-                    lock (this)
+                    if (_tagHelpers == null)
                     {
-                        if (_tagHelpers == null)
-                        {
-                            _shellBlueprint = services.GetRequiredService<ShellBlueprint>();
-                            _tagHelpers = services.GetServices<ITagHelpersProvider>();
-                        }
+                        _shellBlueprint = services.GetRequiredService<ShellBlueprint>();
+                        _tagHelpers = services.GetServices<ITagHelpersProvider>();
                     }
                 }
-
-                return _shellBlueprint
-                    .Dependencies.Keys
-                    .Concat(_tagHelpers.SelectMany(p => p.GetTypes()))
-                    .Select(x => x.GetTypeInfo());
             }
+
+            return _shellBlueprint
+                .Dependencies.Keys
+                .Concat(_tagHelpers.SelectMany(p => p.GetTypes()))
+                .Select(x => x.GetTypeInfo());
         }
+    }
 
-        /// <inheritdoc />
-        public IEnumerable<string> GetReferencePaths()
+    /// <inheritdoc />
+    public IEnumerable<string> GetReferencePaths()
+    {
+        if (_referencePaths != null)
+        {
+            return _referencePaths;
+        }
+
+        lock (_synLock)
         {
             if (_referencePaths != null)
             {
                 return _referencePaths;
             }
 
-            lock (_synLock)
-            {
-                if (_referencePaths != null)
-                {
-                    return _referencePaths;
-                }
-
-                _referencePaths = DependencyContext.Default.CompileLibraries
-                    .SelectMany(library => library.ResolveReferencePaths());
-            }
-
-            return _referencePaths;
+            _referencePaths = DependencyContext.Default.CompileLibraries
+                .SelectMany(library => library.ResolveReferencePaths());
         }
+
+        return _referencePaths;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/ShellFileVersionProvider.cs b/src/OrchardCore/OrchardCore.Mvc.Core/ShellFileVersionProvider.cs
index 8888d4ca701..8e57c04a746 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/ShellFileVersionProvider.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/ShellFileVersionProvider.cs
@@ -11,130 +11,129 @@
 using OrchardCore.Modules;
 using OrchardCore.Modules.FileProviders;
 
-namespace OrchardCore.Mvc
+namespace OrchardCore.Mvc;
+
+/// <summary>
+/// Provides version hash for a specified file.
+/// </summary>
+public class ShellFileVersionProvider : IFileVersionProvider
 {
-    /// <summary>
-    /// Provides version hash for a specified file.
-    /// </summary>
-    public class ShellFileVersionProvider : IFileVersionProvider
+    private const string VersionKey = "v";
+    private static readonly char[] _queryStringAndFragmentTokens = ['?', '#'];
+    private static readonly MemoryCache _sharedCache = new(new MemoryCacheOptions());
+
+    private readonly IFileProvider[] _fileProviders;
+    private readonly IMemoryCache _cache;
+
+    public ShellFileVersionProvider(
+        IEnumerable<IStaticFileProvider> staticFileProviders,
+        IWebHostEnvironment environment,
+        IMemoryCache cache)
     {
-        private const string VersionKey = "v";
-        private static readonly char[] _queryStringAndFragmentTokens = ['?', '#'];
-        private static readonly MemoryCache _sharedCache = new(new MemoryCacheOptions());
+        _fileProviders = staticFileProviders
+            .Concat(new[] { environment.WebRootFileProvider })
+            .ToArray();
 
-        private readonly IFileProvider[] _fileProviders;
-        private readonly IMemoryCache _cache;
+        _cache = cache;
+    }
 
-        public ShellFileVersionProvider(
-            IEnumerable<IStaticFileProvider> staticFileProviders,
-            IWebHostEnvironment environment,
-            IMemoryCache cache)
-        {
-            _fileProviders = staticFileProviders
-                .Concat(new[] { environment.WebRootFileProvider })
-                .ToArray();
+    public string AddFileVersionToPath(PathString requestPathBase, string path)
+    {
+        ArgumentNullException.ThrowIfNull(path);
 
-            _cache = cache;
-        }
+        var resolvedPath = path;
 
-        public string AddFileVersionToPath(PathString requestPathBase, string path)
+        var queryStringOrFragmentStartIndex = path.IndexOfAny(_queryStringAndFragmentTokens);
+        if (queryStringOrFragmentStartIndex != -1)
         {
-            ArgumentNullException.ThrowIfNull(path);
+            resolvedPath = path[..queryStringOrFragmentStartIndex];
+        }
 
-            var resolvedPath = path;
+        if (Uri.TryCreate(resolvedPath, UriKind.Absolute, out var uri) && !uri.IsFile)
+        {
+            // Don't append version if the path is absolute.
+            return path;
+        }
 
-            var queryStringOrFragmentStartIndex = path.IndexOfAny(_queryStringAndFragmentTokens);
-            if (queryStringOrFragmentStartIndex != -1)
+        // Try to get the hash from the tenant level cache.
+        if (_cache.TryGetValue(resolvedPath, out string value))
+        {
+            if (value.Length > 0)
             {
-                resolvedPath = path[..queryStringOrFragmentStartIndex];
+                return QueryHelpers.AddQueryString(path, VersionKey, value);
             }
 
-            if (Uri.TryCreate(resolvedPath, UriKind.Absolute, out var uri) && !uri.IsFile)
+            return path;
+        }
+
+        // Try to get the hash from the cache shared across tenants.
+        if (resolvedPath.StartsWith(requestPathBase.Value, StringComparison.OrdinalIgnoreCase))
+        {
+            if (_sharedCache.TryGetValue(resolvedPath[requestPathBase.Value.Length..], out value))
             {
-                // Don't append version if the path is absolute.
-                return path;
+                return QueryHelpers.AddQueryString(path, VersionKey, value);
             }
+        }
 
-            // Try to get the hash from the tenant level cache.
-            if (_cache.TryGetValue(resolvedPath, out string value))
-            {
-                if (value.Length > 0)
-                {
-                    return QueryHelpers.AddQueryString(path, VersionKey, value);
-                }
+        var cacheKey = resolvedPath;
 
-                return path;
-            }
+        var cacheEntryOptions = new MemoryCacheEntryOptions();
+        foreach (var fileProvider in _fileProviders)
+        {
+            cacheEntryOptions.AddExpirationToken(fileProvider.Watch(resolvedPath));
+            var fileInfo = fileProvider.GetFileInfo(resolvedPath);
 
-            // Try to get the hash from the cache shared across tenants.
-            if (resolvedPath.StartsWith(requestPathBase.Value, StringComparison.OrdinalIgnoreCase))
+            // Perform check against requestPathBase.
+            if (!fileInfo.Exists &&
+                requestPathBase.HasValue &&
+                resolvedPath.StartsWith(requestPathBase.Value, StringComparison.OrdinalIgnoreCase))
             {
-                if (_sharedCache.TryGetValue(resolvedPath[requestPathBase.Value.Length..], out value))
-                {
-                    return QueryHelpers.AddQueryString(path, VersionKey, value);
-                }
+                resolvedPath = resolvedPath[requestPathBase.Value.Length..];
+                cacheEntryOptions.AddExpirationToken(fileProvider.Watch(resolvedPath));
+                fileInfo = fileProvider.GetFileInfo(resolvedPath);
             }
 
-            var cacheKey = resolvedPath;
-
-            var cacheEntryOptions = new MemoryCacheEntryOptions();
-            foreach (var fileProvider in _fileProviders)
+            // Perform check against VirtualPathBase.
+            if (!fileInfo.Exists &&
+                fileProvider is IVirtualPathBaseProvider virtualPathBaseProvider &&
+                virtualPathBaseProvider.VirtualPathBase.HasValue &&
+                resolvedPath.StartsWith(virtualPathBaseProvider.VirtualPathBase.Value, StringComparison.OrdinalIgnoreCase))
             {
+                resolvedPath = resolvedPath[virtualPathBaseProvider.VirtualPathBase.Value.Length..];
                 cacheEntryOptions.AddExpirationToken(fileProvider.Watch(resolvedPath));
-                var fileInfo = fileProvider.GetFileInfo(resolvedPath);
+                fileInfo = fileProvider.GetFileInfo(resolvedPath);
+            }
 
-                // Perform check against requestPathBase.
-                if (!fileInfo.Exists &&
-                    requestPathBase.HasValue &&
-                    resolvedPath.StartsWith(requestPathBase.Value, StringComparison.OrdinalIgnoreCase))
-                {
-                    resolvedPath = resolvedPath[requestPathBase.Value.Length..];
-                    cacheEntryOptions.AddExpirationToken(fileProvider.Watch(resolvedPath));
-                    fileInfo = fileProvider.GetFileInfo(resolvedPath);
-                }
+            if (fileInfo.Exists)
+            {
+                value = GetHashForFile(fileInfo);
+                cacheEntryOptions.SetSize(value.Length * sizeof(char));
 
-                // Perform check against VirtualPathBase.
-                if (!fileInfo.Exists &&
-                    fileProvider is IVirtualPathBaseProvider virtualPathBaseProvider &&
-                    virtualPathBaseProvider.VirtualPathBase.HasValue &&
-                    resolvedPath.StartsWith(virtualPathBaseProvider.VirtualPathBase.Value, StringComparison.OrdinalIgnoreCase))
+                // Cache module static files to the shared cache.
+                if (fileProvider is IModuleStaticFileProvider)
                 {
-                    resolvedPath = resolvedPath[virtualPathBaseProvider.VirtualPathBase.Value.Length..];
-                    cacheEntryOptions.AddExpirationToken(fileProvider.Watch(resolvedPath));
-                    fileInfo = fileProvider.GetFileInfo(resolvedPath);
+                    _sharedCache.Set(resolvedPath, value, cacheEntryOptions);
                 }
-
-                if (fileInfo.Exists)
+                else
                 {
-                    value = GetHashForFile(fileInfo);
-                    cacheEntryOptions.SetSize(value.Length * sizeof(char));
-
-                    // Cache module static files to the shared cache.
-                    if (fileProvider is IModuleStaticFileProvider)
-                    {
-                        _sharedCache.Set(resolvedPath, value, cacheEntryOptions);
-                    }
-                    else
-                    {
-                        _cache.Set(cacheKey, value, cacheEntryOptions);
-                    }
-
-                    return QueryHelpers.AddQueryString(path, VersionKey, value);
+                    _cache.Set(cacheKey, value, cacheEntryOptions);
                 }
-            }
 
-            // If the file is not in the current server, set cache so no further checks are done.
-            cacheEntryOptions.SetSize(0);
-            _cache.Set(cacheKey, string.Empty, cacheEntryOptions);
-            return path;
+                return QueryHelpers.AddQueryString(path, VersionKey, value);
+            }
         }
 
-        private static string GetHashForFile(IFileInfo fileInfo)
-        {
-            using var sha256 = SHA256.Create();
-            using var readStream = fileInfo.CreateReadStream();
-            var hash = sha256.ComputeHash(readStream);
-            return WebEncoders.Base64UrlEncode(hash);
-        }
+        // If the file is not in the current server, set cache so no further checks are done.
+        cacheEntryOptions.SetSize(0);
+        _cache.Set(cacheKey, string.Empty, cacheEntryOptions);
+        return path;
+    }
+
+    private static string GetHashForFile(IFileInfo fileInfo)
+    {
+        using var sha256 = SHA256.Create();
+        using var readStream = fileInfo.CreateReadStream();
+        var hash = sha256.ComputeHash(readStream);
+        return WebEncoders.Base64UrlEncode(hash);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/ShellViewFeatureProvider.cs b/src/OrchardCore/OrchardCore.Mvc.Core/ShellViewFeatureProvider.cs
index 857ec1e46dd..988bd6afbee 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/ShellViewFeatureProvider.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/ShellViewFeatureProvider.cs
@@ -11,186 +11,185 @@
 using OrchardCore.Environment.Shell.Scope;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Mvc
+namespace OrchardCore.Mvc;
+
+public class ShellViewFeatureProvider : IApplicationFeatureProvider<ViewsFeature>, IApplicationFeatureProvider<DevelopmentViewsFeature>
 {
-    public class ShellViewFeatureProvider : IApplicationFeatureProvider<ViewsFeature>, IApplicationFeatureProvider<DevelopmentViewsFeature>
+    private readonly IHostEnvironment _hostingEnvironment;
+    private readonly IApplicationContext _applicationContext;
+
+    private ApplicationPartManager _applicationPartManager;
+    private IEnumerable<IApplicationFeatureProvider<ViewsFeature>> _featureProviders;
+
+    public ShellViewFeatureProvider(IServiceProvider services)
     {
-        private readonly IHostEnvironment _hostingEnvironment;
-        private readonly IApplicationContext _applicationContext;
+        _hostingEnvironment = services.GetRequiredService<IHostEnvironment>();
+        _applicationContext = services.GetRequiredService<IApplicationContext>();
+    }
 
-        private ApplicationPartManager _applicationPartManager;
-        private IEnumerable<IApplicationFeatureProvider<ViewsFeature>> _featureProviders;
+    public void PopulateFeature(IEnumerable<ApplicationPart> parts, ViewsFeature feature)
+    {
+        EnsureScopedServices();
 
-        public ShellViewFeatureProvider(IServiceProvider services)
+        // Check if the feature can be retrieved from the shell scope.
+        var viewsFeature = ShellScope.GetFeature<ViewsFeature>();
+        if (viewsFeature is not null)
         {
-            _hostingEnvironment = services.GetRequiredService<IHostEnvironment>();
-            _applicationContext = services.GetRequiredService<IApplicationContext>();
+            foreach (var descriptor in viewsFeature.ViewDescriptors)
+            {
+                feature.ViewDescriptors.Add(descriptor);
+            }
+
+            return;
         }
 
-        public void PopulateFeature(IEnumerable<ApplicationPart> parts, ViewsFeature feature)
-        {
-            EnsureScopedServices();
+        // Set it as a shell scope feature to be used later on.
+        ShellScope.SetFeature(feature);
 
-            // Check if the feature can be retrieved from the shell scope.
-            var viewsFeature = ShellScope.GetFeature<ViewsFeature>();
-            if (viewsFeature is not null)
-            {
-                foreach (var descriptor in viewsFeature.ViewDescriptors)
-                {
-                    feature.ViewDescriptors.Add(descriptor);
-                }
+        PopulateFeatureInternal(feature);
 
-                return;
-            }
+        // Apply views feature providers registered at the tenant level.
+        foreach (var provider in _featureProviders)
+        {
+            provider.PopulateFeature(parts, feature);
+        }
+    }
 
-            // Set it as a shell scope feature to be used later on.
-            ShellScope.SetFeature(feature);
+    public void PopulateFeature(IEnumerable<ApplicationPart> parts, DevelopmentViewsFeature developmentViewsFeature)
+    {
+        EnsureScopedServices();
 
-            PopulateFeatureInternal(feature);
+        // Module compiled views are only served if not in dev mode or if the 'refs' folder doesn't exists.
+        var refsFolderExists = Directory.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "refs"));
+
+        // But in dev mode we still provide all view descriptors.
+        if (_hostingEnvironment.IsDevelopment() && refsFolderExists)
+        {
+            var viewsFeature = new ViewsFeature();
+            PopulateFeatureInternal(viewsFeature);
 
             // Apply views feature providers registered at the tenant level.
             foreach (var provider in _featureProviders)
             {
-                provider.PopulateFeature(parts, feature);
+                provider.PopulateFeature(parts, viewsFeature);
             }
-        }
 
-        public void PopulateFeature(IEnumerable<ApplicationPart> parts, DevelopmentViewsFeature developmentViewsFeature)
-        {
-            EnsureScopedServices();
+            foreach (var descriptor in viewsFeature.ViewDescriptors)
+            {
+                developmentViewsFeature.ViewDescriptors.Add(descriptor);
+            }
+        }
+    }
 
-            // Module compiled views are only served if not in dev mode or if the 'refs' folder doesn't exists.
-            var refsFolderExists = Directory.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "refs"));
+    private void PopulateFeatureInternal(ViewsFeature feature)
+    {
+        // Retrieve mvc views feature providers but not this one.
+        var mvcFeatureProviders = _applicationPartManager.FeatureProviders
+            .OfType<IApplicationFeatureProvider<ViewsFeature>>()
+            .Where(p => p.GetType() != typeof(ShellViewFeatureProvider));
 
-            // But in dev mode we still provide all view descriptors.
-            if (_hostingEnvironment.IsDevelopment() && refsFolderExists)
-            {
-                var viewsFeature = new ViewsFeature();
-                PopulateFeatureInternal(viewsFeature);
+        var modules = _applicationContext.Application.Modules;
+        var moduleFeature = new ViewsFeature();
 
-                // Apply views feature providers registered at the tenant level.
-                foreach (var provider in _featureProviders)
-                {
-                    provider.PopulateFeature(parts, viewsFeature);
-                }
+        var refsFolderExists = Directory.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "refs"));
 
-                foreach (var descriptor in viewsFeature.ViewDescriptors)
+        foreach (var module in modules)
+        {
+            // If the module and the application assemblies are at the same location, the module is referenced as a project not as a package.
+            if (Path.GetDirectoryName(module.Assembly.Location) == Path.GetDirectoryName(_applicationContext.Application.Assembly.Location))
+            {
+                // If the module is referenced as a project, view descriptors are not provided if in dev mode and if the 'refs' folder exists.
+                if (_hostingEnvironment.IsDevelopment() && refsFolderExists)
                 {
-                    developmentViewsFeature.ViewDescriptors.Add(descriptor);
+                    continue;
                 }
             }
-        }
 
-        private void PopulateFeatureInternal(ViewsFeature feature)
-        {
-            // Retrieve mvc views feature providers but not this one.
-            var mvcFeatureProviders = _applicationPartManager.FeatureProviders
-                .OfType<IApplicationFeatureProvider<ViewsFeature>>()
-                .Where(p => p.GetType() != typeof(ShellViewFeatureProvider));
+            // If the module is referenced as a package, view descriptors are always provided.
 
-            var modules = _applicationContext.Application.Modules;
-            var moduleFeature = new ViewsFeature();
+            var assembliesWithViews = new List<Assembly>();
 
-            var refsFolderExists = Directory.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "refs"));
+            var relatedAssemblyAttribute = module.Assembly.GetCustomAttribute<RelatedAssemblyAttribute>();
 
-            foreach (var module in modules)
+            // Is there a dedicated Views assembly (< net6.0)
+            if (relatedAssemblyAttribute != null)
             {
-                // If the module and the application assemblies are at the same location, the module is referenced as a project not as a package.
-                if (Path.GetDirectoryName(module.Assembly.Location) == Path.GetDirectoryName(_applicationContext.Application.Assembly.Location))
+                var precompiledAssemblyPath = Path.Combine(Path.GetDirectoryName(module.Assembly.Location), relatedAssemblyAttribute.AssemblyFileName + ".dll");
+
+                if (File.Exists(precompiledAssemblyPath))
                 {
-                    // If the module is referenced as a project, view descriptors are not provided if in dev mode and if the 'refs' folder exists.
-                    if (_hostingEnvironment.IsDevelopment() && refsFolderExists)
+                    try
+                    {
+                        var assembly = Assembly.LoadFile(precompiledAssemblyPath);
+                        assembliesWithViews.Add(assembly);
+                    }
+                    catch (FileLoadException)
                     {
-                        continue;
+                        // Don't throw if assembly cannot be loaded. This can happen if the file is not a managed assembly.
                     }
                 }
+            }
 
-                // If the module is referenced as a package, view descriptors are always provided.
-
-                var assembliesWithViews = new List<Assembly>();
+            // Look for compiled views in the same assembly as the module.
+            if (module.Assembly.GetCustomAttributes<RazorCompiledItemAttribute>().Any())
+            {
+                assembliesWithViews.Add(module.Assembly);
+            }
 
-                var relatedAssemblyAttribute = module.Assembly.GetCustomAttribute<RelatedAssemblyAttribute>();
+            foreach (var assembly in assembliesWithViews)
+            {
+                var applicationPart = new ApplicationPart[] { new TenantCompiledRazorAssemblyPart(assembly) };
 
-                // Is there a dedicated Views assembly (< net6.0)
-                if (relatedAssemblyAttribute != null)
+                foreach (var provider in mvcFeatureProviders)
                 {
-                    var precompiledAssemblyPath = Path.Combine(Path.GetDirectoryName(module.Assembly.Location), relatedAssemblyAttribute.AssemblyFileName + ".dll");
-
-                    if (File.Exists(precompiledAssemblyPath))
-                    {
-                        try
-                        {
-                            var assembly = Assembly.LoadFile(precompiledAssemblyPath);
-                            assembliesWithViews.Add(assembly);
-                        }
-                        catch (FileLoadException)
-                        {
-                            // Don't throw if assembly cannot be loaded. This can happen if the file is not a managed assembly.
-                        }
-                    }
+                    provider.PopulateFeature(applicationPart, moduleFeature);
                 }
 
-                // Look for compiled views in the same assembly as the module.
-                if (module.Assembly.GetCustomAttributes<RazorCompiledItemAttribute>().Any())
+                // Razor views are precompiled in the context of their modules, but at runtime
+                // their paths need to be relative to the virtual "Areas/{ModuleId}" folders.
+                // Note: For the app's module this folder is "Areas/{env.ApplicationName}".
+                foreach (var descriptor in moduleFeature.ViewDescriptors)
                 {
-                    assembliesWithViews.Add(module.Assembly);
+                    descriptor.RelativePath = '/' + module.SubPath + descriptor.RelativePath;
+                    feature.ViewDescriptors.Add(descriptor);
                 }
 
-                foreach (var assembly in assembliesWithViews)
+                // For the app's module we still allow to explicitly specify view paths relative to the app content root.
+                // So for the application's module we re-apply the feature providers without updating the relative paths.
+                // Note: This is only needed in prod mode if app's views are precompiled and views files no longer exist.
+                if (module.Name == _hostingEnvironment.ApplicationName)
                 {
-                    var applicationPart = new ApplicationPart[] { new TenantCompiledRazorAssemblyPart(assembly) };
-
                     foreach (var provider in mvcFeatureProviders)
                     {
                         provider.PopulateFeature(applicationPart, moduleFeature);
                     }
 
-                    // Razor views are precompiled in the context of their modules, but at runtime
-                    // their paths need to be relative to the virtual "Areas/{ModuleId}" folders.
-                    // Note: For the app's module this folder is "Areas/{env.ApplicationName}".
                     foreach (var descriptor in moduleFeature.ViewDescriptors)
                     {
-                        descriptor.RelativePath = '/' + module.SubPath + descriptor.RelativePath;
                         feature.ViewDescriptors.Add(descriptor);
                     }
-
-                    // For the app's module we still allow to explicitly specify view paths relative to the app content root.
-                    // So for the application's module we re-apply the feature providers without updating the relative paths.
-                    // Note: This is only needed in prod mode if app's views are precompiled and views files no longer exist.
-                    if (module.Name == _hostingEnvironment.ApplicationName)
-                    {
-                        foreach (var provider in mvcFeatureProviders)
-                        {
-                            provider.PopulateFeature(applicationPart, moduleFeature);
-                        }
-
-                        foreach (var descriptor in moduleFeature.ViewDescriptors)
-                        {
-                            feature.ViewDescriptors.Add(descriptor);
-                        }
-                    }
-
-                    moduleFeature.ViewDescriptors.Clear();
                 }
+
+                moduleFeature.ViewDescriptors.Clear();
             }
         }
+    }
 
-        private void EnsureScopedServices()
-        {
-            var services = ShellScope.Services;
+    private void EnsureScopedServices()
+    {
+        var services = ShellScope.Services;
 
-            // The scope is null when this code is called through a 'ChangeToken' callback, e.g to recompile razor pages.
-            // So, here we resolve and cache tenant level singletons, application singletons can be resolved in the ctor.
+        // The scope is null when this code is called through a 'ChangeToken' callback, e.g to recompile razor pages.
+        // So, here we resolve and cache tenant level singletons, application singletons can be resolved in the ctor.
 
-            if (services != null && _featureProviders == null)
+        if (services != null && _featureProviders == null)
+        {
+            lock (this)
             {
-                lock (this)
+                if (_featureProviders == null)
                 {
-                    if (_featureProviders == null)
-                    {
-                        _applicationPartManager = services.GetRequiredService<ApplicationPartManager>();
-                        _featureProviders = services.GetServices<IApplicationFeatureProvider<ViewsFeature>>();
-                    }
+                    _applicationPartManager = services.GetRequiredService<ApplicationPartManager>();
+                    _featureProviders = services.GetServices<IApplicationFeatureProvider<ViewsFeature>>();
                 }
             }
         }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/Startup.cs b/src/OrchardCore/OrchardCore.Mvc.Core/Startup.cs
index a560762cdaa..0f21814df3e 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/Startup.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/Startup.cs
@@ -23,123 +23,122 @@
 using OrchardCore.Mvc.Routing;
 using OrchardCore.Routing;
 
-namespace OrchardCore.Mvc
+namespace OrchardCore.Mvc;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
-    {
-        public override int Order => -1000;
-        public override int ConfigureOrder => 1000;
+    public override int Order => -1000;
+    public override int ConfigureOrder => 1000;
 
-        private readonly IHostEnvironment _hostingEnvironment;
-        private readonly IServiceProvider _serviceProvider;
+    private readonly IHostEnvironment _hostingEnvironment;
+    private readonly IServiceProvider _serviceProvider;
 
-        public Startup(IHostEnvironment hostingEnvironment, IServiceProvider serviceProvider)
-        {
-            _hostingEnvironment = hostingEnvironment;
-            _serviceProvider = serviceProvider;
-        }
+    public Startup(IHostEnvironment hostingEnvironment, IServiceProvider serviceProvider)
+    {
+        _hostingEnvironment = hostingEnvironment;
+        _serviceProvider = serviceProvider;
+    }
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            var descriptors = serviceProvider.GetRequiredService<IActionDescriptorCollectionProvider>()
-                .ActionDescriptors.Items
-                .OfType<ControllerActionDescriptor>()
-                .ToArray();
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        var descriptors = serviceProvider.GetRequiredService<IActionDescriptorCollectionProvider>()
+            .ActionDescriptors.Items
+            .OfType<ControllerActionDescriptor>()
+            .ToArray();
 
-            var mappers = serviceProvider.GetServices<IAreaControllerRouteMapper>().OrderBy(x => x.Order);
+        var mappers = serviceProvider.GetServices<IAreaControllerRouteMapper>().OrderBy(x => x.Order);
 
-            foreach (var descriptor in descriptors)
+        foreach (var descriptor in descriptors)
+        {
+            if (!descriptor.RouteValues.ContainsKey("area"))
             {
-                if (!descriptor.RouteValues.ContainsKey("area"))
-                {
-                    continue;
-                }
+                continue;
+            }
 
-                foreach (var mapper in mappers)
+            foreach (var mapper in mappers)
+            {
+                if (mapper.TryMapAreaControllerRoute(routes, descriptor))
                 {
-                    if (mapper.TryMapAreaControllerRoute(routes, descriptor))
-                    {
-                        break;
-                    }
+                    break;
                 }
             }
-
-            routes.MapRazorPages();
         }
 
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            // Register an isolated tenant part manager.
-            services.AddSingleton(new ApplicationPartManager());
+        routes.MapRazorPages();
+    }
 
-            var builder = services.AddMvc(options =>
-            {
-                // Forcing AntiForgery Token Validation on by default, it's only in Razor Pages by default
-                // Load this filter after the MediaSizeFilterLimitAttribute, but before the
-                // IgnoreAntiforgeryTokenAttribute. refer : https://github.com/aspnet/AspNetCore/issues/10384
-                options.Filters.Add<AutoValidateAntiforgeryTokenAttribute>(999);
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        // Register an isolated tenant part manager.
+        services.AddSingleton(new ApplicationPartManager());
 
-                // Custom model binder to testing purpose
-                options.ModelBinderProviders.Insert(0, new CheckMarkModelBinderProvider());
+        var builder = services.AddMvc(options =>
+        {
+            // Forcing AntiForgery Token Validation on by default, it's only in Razor Pages by default
+            // Load this filter after the MediaSizeFilterLimitAttribute, but before the
+            // IgnoreAntiforgeryTokenAttribute. refer : https://github.com/aspnet/AspNetCore/issues/10384
+            options.Filters.Add<AutoValidateAntiforgeryTokenAttribute>(999);
 
-                options.ModelBinderProviders.Insert(0, new SafeBoolModelBinderProvider());
-            });
+            // Custom model binder to testing purpose
+            options.ModelBinderProviders.Insert(0, new CheckMarkModelBinderProvider());
 
-            // Add a route endpoint selector policy.
-            services.AddSingleton<MatcherPolicy, FormValueRequiredMatcherPolicy>();
+            options.ModelBinderProviders.Insert(0, new SafeBoolModelBinderProvider());
+        });
 
-            services.AddModularRazorPages();
+        // Add a route endpoint selector policy.
+        services.AddSingleton<MatcherPolicy, FormValueRequiredMatcherPolicy>();
 
-            AddModularFrameworkParts(_serviceProvider, builder.PartManager);
+        services.AddModularRazorPages();
 
-            // Adding localization
-            builder.AddViewLocalization();
-            builder.AddDataAnnotationsLocalization();
+        AddModularFrameworkParts(_serviceProvider, builder.PartManager);
 
-            services.TryAddEnumerable(
-                ServiceDescriptor.Transient<IConfigureOptions<RazorViewEngineOptions>, ModularRazorViewEngineOptionsSetup>());
+        // Adding localization
+        builder.AddViewLocalization();
+        builder.AddDataAnnotationsLocalization();
 
-            // Support razor runtime compilation only if in dev mode and if the 'refs' folder exists.
-            var refsFolderExists = Directory.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "refs"));
+        services.TryAddEnumerable(
+            ServiceDescriptor.Transient<IConfigureOptions<RazorViewEngineOptions>, ModularRazorViewEngineOptionsSetup>());
 
-            if (_hostingEnvironment.IsDevelopment() && refsFolderExists)
-            {
-                builder.AddRazorRuntimeCompilation();
-            }
+        // Support razor runtime compilation only if in dev mode and if the 'refs' folder exists.
+        var refsFolderExists = Directory.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "refs"));
 
-            // Share across tenants a static compiler even if there is no runtime compilation
-            // because the compiler still uses its internal cache to retrieve compiled items.
-            services.AddSingleton<IViewCompilerProvider, SharedViewCompilerProvider>();
+        if (_hostingEnvironment.IsDevelopment() && refsFolderExists)
+        {
+            builder.AddRazorRuntimeCompilation();
+        }
 
-            services.TryAddEnumerable(
-                ServiceDescriptor.Transient<IConfigureOptions<MvcRazorRuntimeCompilationOptions>, RazorCompilationOptionsSetup>());
+        // Share across tenants a static compiler even if there is no runtime compilation
+        // because the compiler still uses its internal cache to retrieve compiled items.
+        services.AddSingleton<IViewCompilerProvider, SharedViewCompilerProvider>();
 
-            services.AddSingleton<RazorCompilationFileProviderAccessor>();
+        services.TryAddEnumerable(
+            ServiceDescriptor.Transient<IConfigureOptions<MvcRazorRuntimeCompilationOptions>, RazorCompilationOptionsSetup>());
 
-            services.TryAddSingleton<IActionContextAccessor, ActionContextAccessor>();
+        services.AddSingleton<RazorCompilationFileProviderAccessor>();
 
-            // Use a custom 'IFileVersionProvider' that also lookup all tenant level 'IStaticFileProvider'.
-            services.Replace(ServiceDescriptor.Singleton<IFileVersionProvider, ShellFileVersionProvider>());
+        services.TryAddSingleton<IActionContextAccessor, ActionContextAccessor>();
 
-            // Register a DefaultAreaControllerRouteMapper that will run last.
-            services.AddTransient<IAreaControllerRouteMapper, DefaultAreaControllerRouteMapper>();
+        // Use a custom 'IFileVersionProvider' that also lookup all tenant level 'IStaticFileProvider'.
+        services.Replace(ServiceDescriptor.Singleton<IFileVersionProvider, ShellFileVersionProvider>());
 
-            AddMvcModuleCoreServices(services);
-        }
+        // Register a DefaultAreaControllerRouteMapper that will run last.
+        services.AddTransient<IAreaControllerRouteMapper, DefaultAreaControllerRouteMapper>();
 
-        internal static void AddModularFrameworkParts(IServiceProvider services, ApplicationPartManager manager)
-        {
-            manager.ApplicationParts.Insert(0, new ShellFeatureApplicationPart());
-            manager.FeatureProviders.Add(new ShellViewFeatureProvider(services));
-        }
+        AddMvcModuleCoreServices(services);
+    }
 
-        internal static void AddMvcModuleCoreServices(IServiceCollection services)
-        {
-            services.AddScoped<IViewLocationExpanderProvider, ComponentViewLocationExpanderProvider>();
-            services.AddScoped<IViewLocationExpanderProvider, SharedViewLocationExpanderProvider>();
+    internal static void AddModularFrameworkParts(IServiceProvider services, ApplicationPartManager manager)
+    {
+        manager.ApplicationParts.Insert(0, new ShellFeatureApplicationPart());
+        manager.FeatureProviders.Add(new ShellViewFeatureProvider(services));
+    }
 
-            services.TryAddEnumerable(
-                ServiceDescriptor.Singleton<IApplicationModelProvider, ModularApplicationModelProvider>());
-        }
+    internal static void AddMvcModuleCoreServices(IServiceCollection services)
+    {
+        services.AddScoped<IViewLocationExpanderProvider, ComponentViewLocationExpanderProvider>();
+        services.AddScoped<IViewLocationExpanderProvider, SharedViewLocationExpanderProvider>();
+
+        services.TryAddEnumerable(
+            ServiceDescriptor.Singleton<IApplicationModelProvider, ModularApplicationModelProvider>());
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/Utilities/ControllerTypeExtensions.cs b/src/OrchardCore/OrchardCore.Mvc.Core/Utilities/ControllerTypeExtensions.cs
index 8531ab0c0dc..b072a4da456 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/Utilities/ControllerTypeExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/Utilities/ControllerTypeExtensions.cs
@@ -1,20 +1,19 @@
 using System;
 using Microsoft.AspNetCore.Mvc;
 
-namespace OrchardCore.Mvc.Core.Utilities
+namespace OrchardCore.Mvc.Core.Utilities;
+
+public static class ControllerTypeExtensions
 {
-    public static class ControllerTypeExtensions
+    public static string ControllerName(this Type controllerType)
     {
-        public static string ControllerName(this Type controllerType)
+        if (!typeof(ControllerBase).IsAssignableFrom(controllerType))
         {
-            if (!typeof(ControllerBase).IsAssignableFrom(controllerType))
-            {
-                throw new ArgumentException($"The specified type must inherit from '{nameof(ControllerBase)}'", nameof(controllerType));
-            }
-
-            return controllerType.Name.EndsWith(nameof(Controller), StringComparison.OrdinalIgnoreCase)
-                ? controllerType.Name[..^nameof(Controller).Length]
-                : controllerType.Name;
+            throw new ArgumentException($"The specified type must inherit from '{nameof(ControllerBase)}'", nameof(controllerType));
         }
+
+        return controllerType.Name.EndsWith(nameof(Controller), StringComparison.OrdinalIgnoreCase)
+            ? controllerType.Name[..^nameof(Controller).Length]
+            : controllerType.Name;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/Utilities/StringExtensions.cs b/src/OrchardCore/OrchardCore.Mvc.Core/Utilities/StringExtensions.cs
index 8ecf827b993..c7bbb2020d8 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/Utilities/StringExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/Utilities/StringExtensions.cs
@@ -10,509 +10,508 @@
 using Cysharp.Text;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Mvc.Utilities
+namespace OrchardCore.Mvc.Utilities;
+
+public static class StringExtensions
 {
-    public static class StringExtensions
+    public static string CamelFriendly(this string camel)
     {
-        public static string CamelFriendly(this string camel)
-        {
-            // Optimize common cases.
-            if (string.IsNullOrWhiteSpace(camel))
-            {
-                return "";
-            }
-
-            using var sb = ZString.CreateStringBuilder();
-            for (var i = 0; i < camel.Length; ++i)
-            {
-                var c = camel[i];
-                if (i != 0 && char.IsUpper(c))
-                {
-                    sb.Append(' ');
-                }
-                sb.Append(c);
-            }
-
-            return sb.ToString();
-        }
-
-        public static string Ellipsize(this string text, int characterCount)
+        // Optimize common cases.
+        if (string.IsNullOrWhiteSpace(camel))
         {
-            return text.Ellipsize(characterCount, "\u00A0\u2026");
+            return "";
         }
 
-        public static string Ellipsize(this string text, int characterCount, string ellipsis, bool wordBoundary = false)
+        using var sb = ZString.CreateStringBuilder();
+        for (var i = 0; i < camel.Length; ++i)
         {
-            if (string.IsNullOrWhiteSpace(text))
+            var c = camel[i];
+            if (i != 0 && char.IsUpper(c))
             {
-                return "";
+                sb.Append(' ');
             }
+            sb.Append(c);
+        }
 
-            if (characterCount < 0 || text.Length <= characterCount)
-                return text;
+        return sb.ToString();
+    }
 
-            // Search beginning of word.
-            var backup = characterCount;
-            while (characterCount > 0 && text[characterCount - 1].IsLetter())
-            {
-                characterCount--;
-            }
+    public static string Ellipsize(this string text, int characterCount)
+    {
+        return text.Ellipsize(characterCount, "\u00A0\u2026");
+    }
 
-            // Search previous word.
-            while (characterCount > 0 && text[characterCount - 1].IsSpace())
-            {
-                characterCount--;
-            }
+    public static string Ellipsize(this string text, int characterCount, string ellipsis, bool wordBoundary = false)
+    {
+        if (string.IsNullOrWhiteSpace(text))
+        {
+            return "";
+        }
 
-            // If it was the last word, recover it, unless boundary is requested.
-            if (characterCount == 0 && !wordBoundary)
-            {
-                characterCount = backup;
-            }
+        if (characterCount < 0 || text.Length <= characterCount)
+            return text;
 
-            var trimmed = text[..characterCount];
-            return trimmed + ellipsis;
+        // Search beginning of word.
+        var backup = characterCount;
+        while (characterCount > 0 && text[characterCount - 1].IsLetter())
+        {
+            characterCount--;
         }
 
-        public static string HtmlClassify(this string text)
+        // Search previous word.
+        while (characterCount > 0 && text[characterCount - 1].IsSpace())
         {
-            if (string.IsNullOrWhiteSpace(text))
-            {
-                return "";
-            }
-
-            var friendlier = text.CamelFriendly();
-
-            var result = new char[friendlier.Length];
-
-            var cursor = 0;
-            var previousIsNotLetter = false;
-            for (var i = 0; i < friendlier.Length; i++)
-            {
-                var current = friendlier[i];
-                if (IsLetter(current) || (char.IsDigit(current) && cursor > 0))
-                {
-                    if (previousIsNotLetter && i != 0 && cursor > 0)
-                    {
-                        result[cursor++] = '-';
-                    }
-
-                    result[cursor++] = char.ToLowerInvariant(current);
-                    previousIsNotLetter = false;
-                }
-                else
-                {
-                    previousIsNotLetter = true;
-                }
-            }
-
-            return new string(result, 0, cursor);
+            characterCount--;
         }
 
-        public static LocalizedString OrDefault(this string text, LocalizedString defaultValue)
+        // If it was the last word, recover it, unless boundary is requested.
+        if (characterCount == 0 && !wordBoundary)
         {
-            return string.IsNullOrEmpty(text)
-                ? defaultValue
-                : new LocalizedString(null, text);
+            characterCount = backup;
         }
 
-        public static string RemoveTags(this string html, bool htmlDecode = false)
+        var trimmed = text[..characterCount];
+        return trimmed + ellipsis;
+    }
+
+    public static string HtmlClassify(this string text)
+    {
+        if (string.IsNullOrWhiteSpace(text))
         {
-            if (string.IsNullOrEmpty(html))
-            {
-                return string.Empty;
-            }
+            return "";
+        }
 
-            var result = new char[html.Length];
+        var friendlier = text.CamelFriendly();
 
-            var cursor = 0;
-            var inside = false;
-            for (var i = 0; i < html.Length; i++)
-            {
-                var current = html[i];
+        var result = new char[friendlier.Length];
 
-                switch (current)
+        var cursor = 0;
+        var previousIsNotLetter = false;
+        for (var i = 0; i < friendlier.Length; i++)
+        {
+            var current = friendlier[i];
+            if (IsLetter(current) || (char.IsDigit(current) && cursor > 0))
+            {
+                if (previousIsNotLetter && i != 0 && cursor > 0)
                 {
-                    case '<':
-                        inside = true;
-                        continue;
-                    case '>':
-                        inside = false;
-                        continue;
+                    result[cursor++] = '-';
                 }
 
-                if (!inside)
-                {
-                    result[cursor++] = current;
-                }
+                result[cursor++] = char.ToLowerInvariant(current);
+                previousIsNotLetter = false;
             }
-
-            var stringResult = new string(result, 0, cursor);
-
-            if (htmlDecode)
+            else
             {
-                stringResult = WebUtility.HtmlDecode(stringResult);
+                previousIsNotLetter = true;
             }
-
-            return stringResult;
         }
 
-        // Not accounting for only \r (e.g. Apple OS 9 carriage return only new lines).
-        public static string ReplaceNewLinesWith(this string text, string replacement)
-        {
-            return string.IsNullOrWhiteSpace(text)
-                       ? string.Empty
-                       : text
-                             .Replace("\r\n", "\r\r")
-                             .Replace("\n", string.Format(replacement, "\r\n"))
-                             .Replace("\r\r", string.Format(replacement, "\r\n"));
-        }
-
-        private static readonly char[] _validSegmentChars = "/?#[]@\"^{}|`<>\t\r\n\f ".ToCharArray();
-        public static bool IsValidUrlSegment(this string segment)
-        {
-            // Valid isegment from rfc3987 - http://tools.ietf.org/html/rfc3987#page-8
-            // The relevant bits:
-            // isegment    = *ipchar
-            // ipchar      = iunreserved / pct-encoded / sub-delims / ":" / "@"
-            // iunreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" / ucschar
-            // pct-encoded = "%" HEXDIG HEXDIG
-            // sub-delims  = "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
-            // ucschar     = %xA0-D7FF / %xF900-FDCF / %xFDF0-FFEF / %x10000-1FFFD / %x20000-2FFFD / %x30000-3FFFD / %x40000-4FFFD / %x50000-5FFFD / %x60000-6FFFD / %x70000-7FFFD / %x80000-8FFFD / %x90000-9FFFD / %xA0000-AFFFD / %xB0000-BFFFD / %xC0000-CFFFD / %xD0000-DFFFD / %xE1000-EFFFD
-            //
-            // rough blacklist regex == m/^[^/?#[]@"^{}|\s`<>]+$/ (leaving off % to keep the regex simple)
+        return new string(result, 0, cursor);
+    }
 
-            return !segment.Any(_validSegmentChars);
-        }
+    public static LocalizedString OrDefault(this string text, LocalizedString defaultValue)
+    {
+        return string.IsNullOrEmpty(text)
+            ? defaultValue
+            : new LocalizedString(null, text);
+    }
 
-        /// <summary>
-        /// Generates a valid technical name.
-        /// </summary>
-        /// <remarks>
-        /// Uses a white list set of chars.
-        /// </remarks>
-        public static string ToSafeName(this string name)
+    public static string RemoveTags(this string html, bool htmlDecode = false)
+    {
+        if (string.IsNullOrEmpty(html))
         {
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                return string.Empty;
-            }
+            return string.Empty;
+        }
 
-            name = RemoveDiacritics(name);
-            name = name.Strip(c =>
-                !c.IsLetter()
-                && !char.IsDigit(c)
-                );
+        var result = new char[html.Length];
 
-            name = name.Trim();
+        var cursor = 0;
+        var inside = false;
+        for (var i = 0; i < html.Length; i++)
+        {
+            var current = html[i];
 
-            // Don't allow non A-Z chars as first letter, as they are not allowed in prefixes.
-            while (name.Length > 0 && !IsLetter(name[0]))
+            switch (current)
             {
-                name = name[1..];
+                case '<':
+                    inside = true;
+                    continue;
+                case '>':
+                    inside = false;
+                    continue;
             }
 
-            if (name.Length > 128)
+            if (!inside)
             {
-                name = name[..128];
+                result[cursor++] = current;
             }
-
-            return name;
         }
 
-        /// <summary>
-        /// Whether the char is a letter between A and Z or not.
-        /// </summary>
-        public static bool IsLetter(this char c)
+        var stringResult = new string(result, 0, cursor);
+
+        if (htmlDecode)
         {
-            return ('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z');
+            stringResult = WebUtility.HtmlDecode(stringResult);
         }
 
-        public static bool IsSpace(this char c)
+        return stringResult;
+    }
+
+    // Not accounting for only \r (e.g. Apple OS 9 carriage return only new lines).
+    public static string ReplaceNewLinesWith(this string text, string replacement)
+    {
+        return string.IsNullOrWhiteSpace(text)
+                   ? string.Empty
+                   : text
+                         .Replace("\r\n", "\r\r")
+                         .Replace("\n", string.Format(replacement, "\r\n"))
+                         .Replace("\r\r", string.Format(replacement, "\r\n"));
+    }
+
+    private static readonly char[] _validSegmentChars = "/?#[]@\"^{}|`<>\t\r\n\f ".ToCharArray();
+    public static bool IsValidUrlSegment(this string segment)
+    {
+        // Valid isegment from rfc3987 - http://tools.ietf.org/html/rfc3987#page-8
+        // The relevant bits:
+        // isegment    = *ipchar
+        // ipchar      = iunreserved / pct-encoded / sub-delims / ":" / "@"
+        // iunreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" / ucschar
+        // pct-encoded = "%" HEXDIG HEXDIG
+        // sub-delims  = "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
+        // ucschar     = %xA0-D7FF / %xF900-FDCF / %xFDF0-FFEF / %x10000-1FFFD / %x20000-2FFFD / %x30000-3FFFD / %x40000-4FFFD / %x50000-5FFFD / %x60000-6FFFD / %x70000-7FFFD / %x80000-8FFFD / %x90000-9FFFD / %xA0000-AFFFD / %xB0000-BFFFD / %xC0000-CFFFD / %xD0000-DFFFD / %xE1000-EFFFD
+        //
+        // rough blacklist regex == m/^[^/?#[]@"^{}|\s`<>]+$/ (leaving off % to keep the regex simple)
+
+        return !segment.Any(_validSegmentChars);
+    }
+
+    /// <summary>
+    /// Generates a valid technical name.
+    /// </summary>
+    /// <remarks>
+    /// Uses a white list set of chars.
+    /// </remarks>
+    public static string ToSafeName(this string name)
+    {
+        if (string.IsNullOrWhiteSpace(name))
         {
-            return (c == '\r' || c == '\n' || c == '\t' || c == '\f' || c == ' ');
+            return string.Empty;
         }
 
-        public static string RemoveDiacritics(this string name)
-        {
-            var stFormD = name.Normalize(NormalizationForm.FormD);
-            var sb = new StringBuilder();
+        name = RemoveDiacritics(name);
+        name = name.Strip(c =>
+            !c.IsLetter()
+            && !char.IsDigit(c)
+            );
 
-            foreach (var t in stFormD)
-            {
-                var uc = CharUnicodeInfo.GetUnicodeCategory(t);
-                if (uc != UnicodeCategory.NonSpacingMark)
-                {
-                    sb.Append(t);
-                }
-            }
+        name = name.Trim();
 
-            return (sb.ToString().Normalize(NormalizationForm.FormC));
+        // Don't allow non A-Z chars as first letter, as they are not allowed in prefixes.
+        while (name.Length > 0 && !IsLetter(name[0]))
+        {
+            name = name[1..];
         }
 
-        /// <summary>
-        /// Transforms the culture of a letter to its equivalent representation in the 0-127 ascii table, such as the letter 'é' is substituted by an 'e'.
-        /// </summary>
-        /// <param name="s"></param>
-        /// <returns></returns>
-        public static string ReplaceDiacritics(this string s)
+        if (name.Length > 128)
         {
-            var stringBuilder = new StringBuilder();
-            var normalizedString = s.Normalize(NormalizationForm.FormD);
+            name = name[..128];
+        }
 
-            for (var i = 0; i <= normalizedString.Length - 1; i++)
-            {
-                var c = normalizedString[i];
-                if (CharUnicodeInfo.GetUnicodeCategory(c) != UnicodeCategory.NonSpacingMark)
-                {
-                    stringBuilder.Append(c);
-                }
-            }
+        return name;
+    }
 
-            return stringBuilder.ToString();
-        }
+    /// <summary>
+    /// Whether the char is a letter between A and Z or not.
+    /// </summary>
+    public static bool IsLetter(this char c)
+    {
+        return ('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z');
+    }
+
+    public static bool IsSpace(this char c)
+    {
+        return (c == '\r' || c == '\n' || c == '\t' || c == '\f' || c == ' ');
+    }
 
-        public static string Strip(this string subject, params char[] stripped)
+    public static string RemoveDiacritics(this string name)
+    {
+        var stFormD = name.Normalize(NormalizationForm.FormD);
+        var sb = new StringBuilder();
+
+        foreach (var t in stFormD)
         {
-            if (stripped == null || stripped.Length == 0 || string.IsNullOrEmpty(subject))
+            var uc = CharUnicodeInfo.GetUnicodeCategory(t);
+            if (uc != UnicodeCategory.NonSpacingMark)
             {
-                return subject;
+                sb.Append(t);
             }
+        }
 
-            var result = new char[subject.Length];
+        return (sb.ToString().Normalize(NormalizationForm.FormC));
+    }
 
-            var cursor = 0;
-            for (var i = 0; i < subject.Length; i++)
+    /// <summary>
+    /// Transforms the culture of a letter to its equivalent representation in the 0-127 ascii table, such as the letter 'é' is substituted by an 'e'.
+    /// </summary>
+    /// <param name="s"></param>
+    /// <returns></returns>
+    public static string ReplaceDiacritics(this string s)
+    {
+        var stringBuilder = new StringBuilder();
+        var normalizedString = s.Normalize(NormalizationForm.FormD);
+
+        for (var i = 0; i <= normalizedString.Length - 1; i++)
+        {
+            var c = normalizedString[i];
+            if (CharUnicodeInfo.GetUnicodeCategory(c) != UnicodeCategory.NonSpacingMark)
             {
-                var current = subject[i];
-                if (Array.IndexOf(stripped, current) < 0)
-                {
-                    result[cursor++] = current;
-                }
+                stringBuilder.Append(c);
             }
-
-            return new string(result, 0, cursor);
         }
 
-        public static string Strip(this string subject, Func<char, bool> predicate)
+        return stringBuilder.ToString();
+    }
+
+    public static string Strip(this string subject, params char[] stripped)
+    {
+        if (stripped == null || stripped.Length == 0 || string.IsNullOrEmpty(subject))
         {
-            var result = new char[subject.Length];
+            return subject;
+        }
+
+        var result = new char[subject.Length];
 
-            var cursor = 0;
-            for (var i = 0; i < subject.Length; i++)
+        var cursor = 0;
+        for (var i = 0; i < subject.Length; i++)
+        {
+            var current = subject[i];
+            if (Array.IndexOf(stripped, current) < 0)
             {
-                var current = subject[i];
-                if (!predicate(current))
-                {
-                    result[cursor++] = current;
-                }
+                result[cursor++] = current;
             }
-
-            return new string(result, 0, cursor);
         }
 
-        public static bool Any(this string subject, params char[] chars)
+        return new string(result, 0, cursor);
+    }
+
+    public static string Strip(this string subject, Func<char, bool> predicate)
+    {
+        var result = new char[subject.Length];
+
+        var cursor = 0;
+        for (var i = 0; i < subject.Length; i++)
         {
-            if (string.IsNullOrEmpty(subject) || chars == null || chars.Length == 0)
+            var current = subject[i];
+            if (!predicate(current))
             {
-                return false;
+                result[cursor++] = current;
             }
+        }
 
-            for (var i = 0; i < subject.Length; i++)
-            {
-                var current = subject[i];
-                if (Array.IndexOf(chars, current) >= 0)
-                {
-                    return true;
-                }
-            }
+        return new string(result, 0, cursor);
+    }
 
+    public static bool Any(this string subject, params char[] chars)
+    {
+        if (string.IsNullOrEmpty(subject) || chars == null || chars.Length == 0)
+        {
             return false;
         }
 
-        public static bool All(this string subject, params char[] chars)
+        for (var i = 0; i < subject.Length; i++)
         {
-            if (string.IsNullOrEmpty(subject))
+            var current = subject[i];
+            if (Array.IndexOf(chars, current) >= 0)
             {
                 return true;
             }
+        }
 
-            if (chars == null || chars.Length == 0)
-            {
-                return false;
-            }
-
-            for (var i = 0; i < subject.Length; i++)
-            {
-                var current = subject[i];
-                if (Array.IndexOf(chars, current) < 0)
-                {
-                    return false;
-                }
-            }
+        return false;
+    }
 
+    public static bool All(this string subject, params char[] chars)
+    {
+        if (string.IsNullOrEmpty(subject))
+        {
             return true;
         }
 
-        public static string Translate(this string subject, char[] from, char[] to)
+        if (chars == null || chars.Length == 0)
         {
-            if (string.IsNullOrEmpty(subject))
-            {
-                return subject;
-            }
-
-            ArgumentNullException.ThrowIfNull(from);
-
-            ArgumentNullException.ThrowIfNull(to);
+            return false;
+        }
 
-            if (from.Length != to.Length)
+        for (var i = 0; i < subject.Length; i++)
+        {
+            var current = subject[i];
+            if (Array.IndexOf(chars, current) < 0)
             {
-                throw new ArgumentNullException(nameof(from), "Parameters must have the same length");
+                return false;
             }
+        }
 
-            var map = new Dictionary<char, char>(from.Length);
-            for (var i = 0; i < from.Length; i++)
-            {
-                map[from[i]] = to[i];
-            }
+        return true;
+    }
 
-            var result = new char[subject.Length];
+    public static string Translate(this string subject, char[] from, char[] to)
+    {
+        if (string.IsNullOrEmpty(subject))
+        {
+            return subject;
+        }
 
-            for (var i = 0; i < subject.Length; i++)
-            {
-                var current = subject[i];
-                if (map.TryGetValue(current, out var value))
-                {
-                    result[i] = value;
-                }
-                else
-                {
-                    result[i] = current;
-                }
-            }
+        ArgumentNullException.ThrowIfNull(from);
+
+        ArgumentNullException.ThrowIfNull(to);
 
-            return new string(result);
+        if (from.Length != to.Length)
+        {
+            throw new ArgumentNullException(nameof(from), "Parameters must have the same length");
         }
 
-        public static string ReplaceAll(this string original, IDictionary<string, string> replacements)
+        var map = new Dictionary<char, char>(from.Length);
+        for (var i = 0; i < from.Length; i++)
         {
-            var pattern = $"{string.Join("|", replacements.Keys)}";
-            return Regex.Replace(original, pattern, match => replacements[match.Value]);
+            map[from[i]] = to[i];
         }
 
-        public static string TrimEnd(this string rough, string trim = "")
+        var result = new char[subject.Length];
+
+        for (var i = 0; i < subject.Length; i++)
         {
-            if (rough == null)
+            var current = subject[i];
+            if (map.TryGetValue(current, out var value))
             {
-                return null;
+                result[i] = value;
+            }
+            else
+            {
+                result[i] = current;
             }
-
-            return rough.EndsWith(trim, StringComparison.Ordinal)
-                       ? rough[..^trim.Length]
-                       : rough;
         }
 
-        public static string ReplaceLastOccurrence(this string source, string find, string replace)
+        return new string(result);
+    }
+
+    public static string ReplaceAll(this string original, IDictionary<string, string> replacements)
+    {
+        var pattern = $"{string.Join("|", replacements.Keys)}";
+        return Regex.Replace(original, pattern, match => replacements[match.Value]);
+    }
+
+    public static string TrimEnd(this string rough, string trim = "")
+    {
+        if (rough == null)
         {
-            var place = source.LastIndexOf(find, StringComparison.Ordinal);
-            return source.Remove(place, find.Length).Insert(place, replace);
+            return null;
         }
 
-        private static ImmutableDictionary<string, string> _underscorePascalCaseIndex = ImmutableDictionary<string, string>.Empty;
-        private static ImmutableDictionary<string, string> _dashPascalCaseIndex = ImmutableDictionary<string, string>.Empty;
+        return rough.EndsWith(trim, StringComparison.Ordinal)
+                   ? rough[..^trim.Length]
+                   : rough;
+    }
 
-        /// <summary>
-        /// Converts a liquid attribute to pascal case.
-        /// </summary>
-        public static string ToPascalCaseUnderscore(this string attribute)
+    public static string ReplaceLastOccurrence(this string source, string find, string replace)
+    {
+        var place = source.LastIndexOf(find, StringComparison.Ordinal);
+        return source.Remove(place, find.Length).Insert(place, replace);
+    }
+
+    private static ImmutableDictionary<string, string> _underscorePascalCaseIndex = ImmutableDictionary<string, string>.Empty;
+    private static ImmutableDictionary<string, string> _dashPascalCaseIndex = ImmutableDictionary<string, string>.Empty;
+
+    /// <summary>
+    /// Converts a liquid attribute to pascal case.
+    /// </summary>
+    public static string ToPascalCaseUnderscore(this string attribute)
+    {
+        if (!_underscorePascalCaseIndex.TryGetValue(attribute, out var result))
         {
-            if (!_underscorePascalCaseIndex.TryGetValue(attribute, out var result))
-            {
-                result = ToPascalCase(attribute, '_');
-                _underscorePascalCaseIndex = _underscorePascalCaseIndex.SetItem(attribute, result);
-            }
+            result = ToPascalCase(attribute, '_');
+            _underscorePascalCaseIndex = _underscorePascalCaseIndex.SetItem(attribute, result);
+        }
 
-            return result;
+        return result;
+    }
+
+    /// <summary>
+    /// Converts an html attribute to pascal case.
+    /// </summary>
+    public static string ToPascalCaseDash(this string attribute)
+    {
+        if (!_dashPascalCaseIndex.TryGetValue(attribute, out var result))
+        {
+            result = ToPascalCase(attribute, '-');
+            _dashPascalCaseIndex = _dashPascalCaseIndex.SetItem(attribute, result);
         }
 
-        /// <summary>
-        /// Converts an html attribute to pascal case.
-        /// </summary>
-        public static string ToPascalCaseDash(this string attribute)
+        return result;
+    }
+
+    /// <summary>
+    /// Converts a string to pascal case.
+    /// </summary>
+    public static string ToPascalCase(this string attribute, char upperAfterDelimiter)
+    {
+        attribute = attribute.Trim();
+
+        var delimitersCount = 0;
+
+        for (var i = 0; i < attribute.Length; i++)
         {
-            if (!_dashPascalCaseIndex.TryGetValue(attribute, out var result))
+            if (attribute[i] == upperAfterDelimiter)
             {
-                result = ToPascalCase(attribute, '-');
-                _dashPascalCaseIndex = _dashPascalCaseIndex.SetItem(attribute, result);
+                delimitersCount++;
             }
-
-            return result;
         }
 
-        /// <summary>
-        /// Converts a string to pascal case.
-        /// </summary>
-        public static string ToPascalCase(this string attribute, char upperAfterDelimiter)
+        var result = string.Create(attribute.Length - delimitersCount, new { attribute, upperAfterDelimiter }, (buffer, state) =>
         {
-            attribute = attribute.Trim();
-
-            var delimitersCount = 0;
+            var nextIsUpper = true;
+            var k = 0;
 
-            for (var i = 0; i < attribute.Length; i++)
+            for (var i = 0; i < state.attribute.Length; i++)
             {
-                if (attribute[i] == upperAfterDelimiter)
+                var c = state.attribute[i];
+
+                if (c == state.upperAfterDelimiter)
                 {
-                    delimitersCount++;
+                    nextIsUpper = true;
+                    continue;
                 }
-            }
-
-            var result = string.Create(attribute.Length - delimitersCount, new { attribute, upperAfterDelimiter }, (buffer, state) =>
-            {
-                var nextIsUpper = true;
-                var k = 0;
 
-                for (var i = 0; i < state.attribute.Length; i++)
+                if (nextIsUpper)
+                {
+                    buffer[k] = char.ToUpperInvariant(c);
+                }
+                else
                 {
-                    var c = state.attribute[i];
-
-                    if (c == state.upperAfterDelimiter)
-                    {
-                        nextIsUpper = true;
-                        continue;
-                    }
-
-                    if (nextIsUpper)
-                    {
-                        buffer[k] = char.ToUpperInvariant(c);
-                    }
-                    else
-                    {
-                        buffer[k] = c;
-                    }
-
-                    nextIsUpper = false;
-
-                    k++;
+                    buffer[k] = c;
                 }
-            });
 
-            return result;
-        }
+                nextIsUpper = false;
 
-        /// <summary>
-        /// Tests if a string is valid json.
-        /// </summary>
-        public static bool IsJson(this string json, JsonDocumentOptions jsonDocumentOptions = default)
-        {
-            try
-            {
-                JsonNode.Parse(json, null, jsonDocumentOptions);
-                return true;
-            }
-            catch
-            {
-                return false;
+                k++;
             }
+        });
+
+        return result;
+    }
+
+    /// <summary>
+    /// Tests if a string is valid json.
+    /// </summary>
+    public static bool IsJson(this string json, JsonDocumentOptions jsonDocumentOptions = default)
+    {
+        try
+        {
+            JsonNode.Parse(json, null, jsonDocumentOptions);
+            return true;
+        }
+        catch
+        {
+            return false;
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Mvc.Core/Utilities/UrlHelperExtensions.cs b/src/OrchardCore/OrchardCore.Mvc.Core/Utilities/UrlHelperExtensions.cs
index 2bd8ef6882b..476c2bb6c56 100644
--- a/src/OrchardCore/OrchardCore.Mvc.Core/Utilities/UrlHelperExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Mvc.Core/Utilities/UrlHelperExtensions.cs
@@ -1,27 +1,26 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace OrchardCore.Mvc.Core.Utilities
+namespace OrchardCore.Mvc.Core.Utilities;
+
+public static class UrlHelperExtensions
 {
-    public static class UrlHelperExtensions
+    public static string ToAbsoluteAction(this IUrlHelper url, string actionName, string controllerName, object routeValues = null)
     {
-        public static string ToAbsoluteAction(this IUrlHelper url, string actionName, string controllerName, object routeValues = null)
-        {
-            return url.Action(actionName, controllerName, routeValues, url.ActionContext.HttpContext.Request.Scheme);
-        }
+        return url.Action(actionName, controllerName, routeValues, url.ActionContext.HttpContext.Request.Scheme);
+    }
 
-        public static string GetBaseUrl(this IUrlHelper url)
-        {
-            var request = url.ActionContext.HttpContext.Request;
-            var scheme = request.Scheme;
-            var host = request.Host.ToUriComponent();
-            return $"{scheme}://{host}";
-        }
+    public static string GetBaseUrl(this IUrlHelper url)
+    {
+        var request = url.ActionContext.HttpContext.Request;
+        var scheme = request.Scheme;
+        var host = request.Host.ToUriComponent();
+        return $"{scheme}://{host}";
+    }
 
-        public static string ToAbsoluteUrl(this IUrlHelper url, string virtualPath)
-        {
-            var baseUrl = url.GetBaseUrl();
-            var path = url.Content(virtualPath);
-            return $"{baseUrl}{path}";
-        }
+    public static string ToAbsoluteUrl(this IUrlHelper url, string virtualPath)
+    {
+        var baseUrl = url.GetBaseUrl();
+        var path = url.Content(virtualPath);
+        return $"{baseUrl}{path}";
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/INavigationManager.cs b/src/OrchardCore/OrchardCore.Navigation.Core/INavigationManager.cs
index dc09f61233a..aee37a0204d 100644
--- a/src/OrchardCore/OrchardCore.Navigation.Core/INavigationManager.cs
+++ b/src/OrchardCore/OrchardCore.Navigation.Core/INavigationManager.cs
@@ -2,10 +2,9 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 
-namespace OrchardCore.Navigation
+namespace OrchardCore.Navigation;
+
+public interface INavigationManager
 {
-    public interface INavigationManager
-    {
-        Task<IEnumerable<MenuItem>> BuildMenuAsync(string name, ActionContext context);
-    }
+    Task<IEnumerable<MenuItem>> BuildMenuAsync(string name, ActionContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/INavigationProvider.cs b/src/OrchardCore/OrchardCore.Navigation.Core/INavigationProvider.cs
index a55648ea5ef..811a98e3046 100644
--- a/src/OrchardCore/OrchardCore.Navigation.Core/INavigationProvider.cs
+++ b/src/OrchardCore/OrchardCore.Navigation.Core/INavigationProvider.cs
@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Navigation
+namespace OrchardCore.Navigation;
 
+
+public interface INavigationProvider
 {
-    public interface INavigationProvider
-    {
-        Task BuildNavigationAsync(string name, NavigationBuilder builder);
-    }
+    Task BuildNavigationAsync(string name, NavigationBuilder builder);
 }
diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/MenuItem.cs b/src/OrchardCore/OrchardCore.Navigation.Core/MenuItem.cs
index 28e1f39d783..491572cff69 100644
--- a/src/OrchardCore/OrchardCore.Navigation.Core/MenuItem.cs
+++ b/src/OrchardCore/OrchardCore.Navigation.Core/MenuItem.cs
@@ -4,99 +4,98 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Navigation
+namespace OrchardCore.Navigation;
+
+/// <summary>
+/// Represents a menu item described by an <see cref="INavigationProvider"/> implementation.
+/// A menu item can describe child menu items.
+/// </summary>
+public class MenuItem
 {
-    /// <summary>
-    /// Represents a menu item described by an <see cref="INavigationProvider"/> implementation.
-    /// A menu item can describe child menu items.
-    /// </summary>
-    public class MenuItem
+    public MenuItem()
     {
-        public MenuItem()
-        {
-            Permissions = [];
-            Classes = [];
-            Items = [];
-            LinkToFirstChild = true;
-        }
-
-        /// <summary>
-        /// The text to display with the menu item.
-        /// </summary>
-        public LocalizedString Text { get; set; }
-
-        /// <summary>
-        /// The html id of the menu item.
-        /// </summary>
-        public string Id { get; set; }
-
-        /// <summary>
-        /// The final url that the menu item will link to. This property is computed
-        /// based on <see cref="Url"/> or <see cref="RouteValues"/>.
-        /// </summary>
-        public string Href { get; set; }
-
-        /// <summary>
-        /// The html target of the menu item.
-        /// </summary>
-        public string Target { get; set; }
-
-        /// <summary>
-        /// The optional url the menu item should link to.
-        /// </summary>
-        public string Url { get; set; }
-
-        /// <summary>
-        /// The relative position of the menu item among its siblings. e.g., 10, 0, "after".
-        /// </summary>
-        public string Position { get; set; }
-
-        /// <summary>
-        /// The priority of the menu item in case there are other menu items that could be marked as selected for the request.
-        /// </summary>
-        public int Priority { get; set; }
-
-        /// <summary>
-        /// Whether the menu item should link to the same url as its first child.
-        /// </summary>
-        public bool LinkToFirstChild { get; set; }
-
-        /// <summary>
-        /// <c>True</c> if the menu item is local to the page, like a tab.
-        /// </summary>
-        public bool LocalNav { get; set; }
-
-        /// <summary>
-        /// The culture for which this menu item is used.
-        /// </summary>
-        public string Culture { get; set; }
-
-        /// <summary>
-        /// The resource the permission is protecting.
-        /// </summary>
-        [JsonIgnore]
-        public object Resource { get; set; }
-
-        /// <summary>
-        /// The child menu items.
-        /// </summary>
-        public List<MenuItem> Items { get; set; }
-
-        /// <summary>
-        /// The optional route values for this menu item.
-        /// </summary>
-        [JsonIgnore]
-        public RouteValueDictionary RouteValues { get; set; }
-
-        /// <summary>
-        /// The list of <see cref="Permission"/> objects the user must have in order to see this menu item.
-        /// </summary>
-        [JsonIgnore]
-        public List<Permission> Permissions { get; }
-
-        /// <summary>
-        /// The css classes to render with the menu item.
-        /// </summary>
-        public List<string> Classes { get; }
+        Permissions = [];
+        Classes = [];
+        Items = [];
+        LinkToFirstChild = true;
     }
+
+    /// <summary>
+    /// The text to display with the menu item.
+    /// </summary>
+    public LocalizedString Text { get; set; }
+
+    /// <summary>
+    /// The html id of the menu item.
+    /// </summary>
+    public string Id { get; set; }
+
+    /// <summary>
+    /// The final url that the menu item will link to. This property is computed
+    /// based on <see cref="Url"/> or <see cref="RouteValues"/>.
+    /// </summary>
+    public string Href { get; set; }
+
+    /// <summary>
+    /// The html target of the menu item.
+    /// </summary>
+    public string Target { get; set; }
+
+    /// <summary>
+    /// The optional url the menu item should link to.
+    /// </summary>
+    public string Url { get; set; }
+
+    /// <summary>
+    /// The relative position of the menu item among its siblings. e.g., 10, 0, "after".
+    /// </summary>
+    public string Position { get; set; }
+
+    /// <summary>
+    /// The priority of the menu item in case there are other menu items that could be marked as selected for the request.
+    /// </summary>
+    public int Priority { get; set; }
+
+    /// <summary>
+    /// Whether the menu item should link to the same url as its first child.
+    /// </summary>
+    public bool LinkToFirstChild { get; set; }
+
+    /// <summary>
+    /// <c>True</c> if the menu item is local to the page, like a tab.
+    /// </summary>
+    public bool LocalNav { get; set; }
+
+    /// <summary>
+    /// The culture for which this menu item is used.
+    /// </summary>
+    public string Culture { get; set; }
+
+    /// <summary>
+    /// The resource the permission is protecting.
+    /// </summary>
+    [JsonIgnore]
+    public object Resource { get; set; }
+
+    /// <summary>
+    /// The child menu items.
+    /// </summary>
+    public List<MenuItem> Items { get; set; }
+
+    /// <summary>
+    /// The optional route values for this menu item.
+    /// </summary>
+    [JsonIgnore]
+    public RouteValueDictionary RouteValues { get; set; }
+
+    /// <summary>
+    /// The list of <see cref="Permission"/> objects the user must have in order to see this menu item.
+    /// </summary>
+    [JsonIgnore]
+    public List<Permission> Permissions { get; }
+
+    /// <summary>
+    /// The css classes to render with the menu item.
+    /// </summary>
+    public List<string> Classes { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationBuilder.cs b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationBuilder.cs
index 1d6bc5350c5..5bc0a663b77 100644
--- a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationBuilder.cs
+++ b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationBuilder.cs
@@ -4,112 +4,111 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Navigation
+namespace OrchardCore.Navigation;
+
+public class NavigationBuilder
 {
-    public class NavigationBuilder
-    {
-        private List<MenuItem> Contained { get; set; }
+    private List<MenuItem> Contained { get; set; }
 
-        public NavigationBuilder()
-        {
-            Contained = [];
-        }
+    public NavigationBuilder()
+    {
+        Contained = [];
+    }
 
-        public async Task<NavigationBuilder> AddAsync(LocalizedString caption, string position, Func<NavigationItemBuilder, Task> itemBuilder, IEnumerable<string> classes = null, int priority = 0)
-        {
-            var childBuilder = new NavigationItemBuilder();
+    public async Task<NavigationBuilder> AddAsync(LocalizedString caption, string position, Func<NavigationItemBuilder, Task> itemBuilder, IEnumerable<string> classes = null, int priority = 0)
+    {
+        var childBuilder = new NavigationItemBuilder();
 
-            childBuilder.Caption(caption);
-            childBuilder.Position(position);
-            childBuilder.Priority(priority);
-            await itemBuilder(childBuilder);
-            Contained.AddRange(childBuilder.Build());
+        childBuilder.Caption(caption);
+        childBuilder.Position(position);
+        childBuilder.Priority(priority);
+        await itemBuilder(childBuilder);
+        Contained.AddRange(childBuilder.Build());
 
-            if (classes != null)
+        if (classes != null)
+        {
+            foreach (var className in classes)
             {
-                foreach (var className in classes)
-                {
-                    childBuilder.AddClass(className);
-                }
+                childBuilder.AddClass(className);
             }
-
-            return this;
         }
 
-        public NavigationBuilder Add(LocalizedString caption, string position, Action<NavigationItemBuilder> itemBuilder, IEnumerable<string> classes = null, int priority = 0)
-        {
-            var childBuilder = new NavigationItemBuilder();
+        return this;
+    }
+
+    public NavigationBuilder Add(LocalizedString caption, string position, Action<NavigationItemBuilder> itemBuilder, IEnumerable<string> classes = null, int priority = 0)
+    {
+        var childBuilder = new NavigationItemBuilder();
 
-            childBuilder.Caption(caption);
-            childBuilder.Position(position);
-            childBuilder.Priority(priority);
-            itemBuilder(childBuilder);
-            Contained.AddRange(childBuilder.Build());
+        childBuilder.Caption(caption);
+        childBuilder.Position(position);
+        childBuilder.Priority(priority);
+        itemBuilder(childBuilder);
+        Contained.AddRange(childBuilder.Build());
 
-            if (classes != null)
+        if (classes != null)
+        {
+            foreach (var className in classes)
             {
-                foreach (var className in classes)
-                {
-                    childBuilder.AddClass(className);
-                }
+                childBuilder.AddClass(className);
             }
-
-            return this;
         }
 
-        public Task<NavigationBuilder> AddAsync(LocalizedString caption, Func<NavigationItemBuilder, Task> itemBuilder, IEnumerable<string> classes = null)
-        {
-            return AddAsync(caption, null, itemBuilder, classes);
-        }
-        public Task<NavigationBuilder> AddAsync(Func<NavigationItemBuilder, Task> itemBuilder, IEnumerable<string> classes = null)
-        {
-            return AddAsync(new LocalizedString(null, null), null, itemBuilder, classes);
-        }
+        return this;
+    }
 
-        public NavigationBuilder Add(LocalizedString caption, Action<NavigationItemBuilder> itemBuilder, IEnumerable<string> classes = null)
-        {
-            return Add(caption, null, itemBuilder, classes);
-        }
-        public NavigationBuilder Add(Action<NavigationItemBuilder> itemBuilder, IEnumerable<string> classes = null)
-        {
-            return Add(new LocalizedString(null, null), null, itemBuilder, classes);
-        }
+    public Task<NavigationBuilder> AddAsync(LocalizedString caption, Func<NavigationItemBuilder, Task> itemBuilder, IEnumerable<string> classes = null)
+    {
+        return AddAsync(caption, null, itemBuilder, classes);
+    }
+    public Task<NavigationBuilder> AddAsync(Func<NavigationItemBuilder, Task> itemBuilder, IEnumerable<string> classes = null)
+    {
+        return AddAsync(new LocalizedString(null, null), null, itemBuilder, classes);
+    }
 
-        public NavigationBuilder Add(LocalizedString caption, string position, IEnumerable<string> classes = null)
-        {
-            return Add(caption, position, x => { }, classes);
-        }
-        public NavigationBuilder Add(LocalizedString caption, IEnumerable<string> classes = null)
-        {
-            return Add(caption, null, x => { }, classes);
-        }
+    public NavigationBuilder Add(LocalizedString caption, Action<NavigationItemBuilder> itemBuilder, IEnumerable<string> classes = null)
+    {
+        return Add(caption, null, itemBuilder, classes);
+    }
+    public NavigationBuilder Add(Action<NavigationItemBuilder> itemBuilder, IEnumerable<string> classes = null)
+    {
+        return Add(new LocalizedString(null, null), null, itemBuilder, classes);
+    }
 
-        public NavigationBuilder Remove(MenuItem item)
-        {
-            Contained.Remove(item);
-            return this;
-        }
+    public NavigationBuilder Add(LocalizedString caption, string position, IEnumerable<string> classes = null)
+    {
+        return Add(caption, position, x => { }, classes);
+    }
+    public NavigationBuilder Add(LocalizedString caption, IEnumerable<string> classes = null)
+    {
+        return Add(caption, null, x => { }, classes);
+    }
 
-        public NavigationBuilder Remove(Predicate<MenuItem> match)
-        {
-            RemoveRecursive(Contained, match);
-            return this;
-        }
+    public NavigationBuilder Remove(MenuItem item)
+    {
+        Contained.Remove(item);
+        return this;
+    }
 
-        public virtual List<MenuItem> Build()
-        {
-            return (Contained ?? []).ToList();
-        }
+    public NavigationBuilder Remove(Predicate<MenuItem> match)
+    {
+        RemoveRecursive(Contained, match);
+        return this;
+    }
+
+    public virtual List<MenuItem> Build()
+    {
+        return (Contained ?? []).ToList();
+    }
 
-        private static void RemoveRecursive(List<MenuItem> menuItems, Predicate<MenuItem> match)
+    private static void RemoveRecursive(List<MenuItem> menuItems, Predicate<MenuItem> match)
+    {
+        menuItems.RemoveAll(match);
+        foreach (var menuItem in menuItems)
         {
-            menuItems.RemoveAll(match);
-            foreach (var menuItem in menuItems)
+            if (menuItem.Items?.Count > 0)
             {
-                if (menuItem.Items?.Count > 0)
-                {
-                    RemoveRecursive(menuItem.Items, match);
-                }
+                RemoveRecursive(menuItem.Items, match);
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationExtensions.cs b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationExtensions.cs
index 9c2e4f37619..c6d09a214cd 100644
--- a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationExtensions.cs
@@ -1,20 +1,19 @@
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Navigation
+namespace OrchardCore.Navigation;
+
+public static class NavigationExtensions
 {
-    public static class NavigationExtensions
-    {
-        public const string AdminMenuPositionPrefix = "am";
-        public const string Separator = "-";
+    public const string AdminMenuPositionPrefix = "am";
+    public const string Separator = "-";
 
-        public static string PrefixPosition(this string position, string sublevel = "", string prefix = AdminMenuPositionPrefix, string separator = Separator)
-        {
-            return prefix + sublevel + separator + position;
-        }
+    public static string PrefixPosition(this string position, string sublevel = "", string prefix = AdminMenuPositionPrefix, string separator = Separator)
+    {
+        return prefix + sublevel + separator + position;
+    }
 
-        public static string PrefixPosition(this LocalizedString position, string sublevel = "", string prefix = AdminMenuPositionPrefix, string separator = Separator)
-        {
-            return position.ToString().PrefixPosition(sublevel, prefix, separator);
-        }
+    public static string PrefixPosition(this LocalizedString position, string sublevel = "", string prefix = AdminMenuPositionPrefix, string separator = Separator)
+    {
+        return position.ToString().PrefixPosition(sublevel, prefix, separator);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationItemBuilder.cs b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationItemBuilder.cs
index 2737d0e2933..7edfe2a0938 100644
--- a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationItemBuilder.cs
+++ b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationItemBuilder.cs
@@ -4,177 +4,176 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Navigation
+namespace OrchardCore.Navigation;
+
+public class NavigationItemBuilder : NavigationBuilder
 {
-    public class NavigationItemBuilder : NavigationBuilder
+    private readonly MenuItem _item;
+
+    public NavigationItemBuilder()
     {
-        private readonly MenuItem _item;
+        _item = new MenuItem();
+    }
 
-        public NavigationItemBuilder()
-        {
-            _item = new MenuItem();
-        }
+    public NavigationItemBuilder(MenuItem existingItem)
+    {
+        ArgumentNullException.ThrowIfNull(existingItem);
 
-        public NavigationItemBuilder(MenuItem existingItem)
-        {
-            ArgumentNullException.ThrowIfNull(existingItem);
+        _item = existingItem;
+    }
 
-            _item = existingItem;
-        }
+    public NavigationItemBuilder Caption(LocalizedString caption)
+    {
+        _item.Text = caption;
+        return this;
+    }
 
-        public NavigationItemBuilder Caption(LocalizedString caption)
-        {
-            _item.Text = caption;
-            return this;
-        }
+    public NavigationItemBuilder Position(string position)
+    {
+        _item.Position = position;
+        return this;
+    }
 
-        public NavigationItemBuilder Position(string position)
-        {
-            _item.Position = position;
-            return this;
-        }
+    public NavigationItemBuilder Priority(int priority)
+    {
+        _item.Priority = priority;
+        return this;
+    }
 
-        public NavigationItemBuilder Priority(int priority)
-        {
-            _item.Priority = priority;
-            return this;
-        }
+    public NavigationItemBuilder Url(string url)
+    {
+        _item.Url = url;
+        return this;
+    }
 
-        public NavigationItemBuilder Url(string url)
-        {
-            _item.Url = url;
-            return this;
-        }
+    public NavigationItemBuilder Target(string target)
+    {
+        _item.Target = target;
 
-        public NavigationItemBuilder Target(string target)
-        {
-            _item.Target = target;
+        return this;
+    }
 
-            return this;
-        }
+    public NavigationItemBuilder Culture(string culture)
+    {
+        _item.Culture = culture;
+        return this;
+    }
 
-        public NavigationItemBuilder Culture(string culture)
-        {
-            _item.Culture = culture;
-            return this;
-        }
+    public NavigationItemBuilder Id(string id)
+    {
+        _item.Id = id;
+        return this;
+    }
 
-        public NavigationItemBuilder Id(string id)
+    public NavigationItemBuilder AddClass(string className)
+    {
+        if (!_item.Classes.Contains(className))
         {
-            _item.Id = id;
-            return this;
+            _item.Classes.Add(className);
         }
 
-        public NavigationItemBuilder AddClass(string className)
-        {
-            if (!_item.Classes.Contains(className))
-            {
-                _item.Classes.Add(className);
-            }
+        return this;
+    }
 
-            return this;
-        }
+    public NavigationItemBuilder RemoveClass(string className)
+    {
+        _item.Classes.Remove(className);
 
-        public NavigationItemBuilder RemoveClass(string className)
-        {
-            _item.Classes.Remove(className);
+        return this;
+    }
 
-            return this;
-        }
+    public NavigationItemBuilder LinkToFirstChild(bool value)
+    {
+        _item.LinkToFirstChild = value;
+        return this;
+    }
 
-        public NavigationItemBuilder LinkToFirstChild(bool value)
-        {
-            _item.LinkToFirstChild = value;
-            return this;
-        }
+    public NavigationItemBuilder LocalNav()
+    {
+        _item.LocalNav = true;
+        return this;
+    }
 
-        public NavigationItemBuilder LocalNav()
-        {
-            _item.LocalNav = true;
-            return this;
-        }
+    public NavigationItemBuilder Local(bool value)
+    {
+        _item.LocalNav = value;
+        return this;
+    }
 
-        public NavigationItemBuilder Local(bool value)
-        {
-            _item.LocalNav = value;
-            return this;
-        }
+    public NavigationItemBuilder Permission(Permission permission)
+    {
+        _item.Permissions.Add(permission);
+        return this;
+    }
 
-        public NavigationItemBuilder Permission(Permission permission)
-        {
-            _item.Permissions.Add(permission);
-            return this;
-        }
+    public NavigationItemBuilder Permissions(IEnumerable<Permission> permissions)
+    {
+        _item.Permissions.AddRange(permissions);
+        return this;
+    }
 
-        public NavigationItemBuilder Permissions(IEnumerable<Permission> permissions)
-        {
-            _item.Permissions.AddRange(permissions);
-            return this;
-        }
+    public NavigationItemBuilder Resource(object resource)
+    {
+        _item.Resource = resource;
+        return this;
+    }
 
-        public NavigationItemBuilder Resource(object resource)
-        {
-            _item.Resource = resource;
-            return this;
-        }
+    public override List<MenuItem> Build()
+    {
+        _item.Items = base.Build();
+        return [_item];
+    }
 
-        public override List<MenuItem> Build()
-        {
-            _item.Items = base.Build();
-            return [_item];
-        }
+    public NavigationItemBuilder Action(RouteValueDictionary values)
+    {
+        return values != null
+                   ? Action(values["action"] as string, values["controller"] as string, values)
+                   : Action(null, null, new RouteValueDictionary());
+    }
 
-        public NavigationItemBuilder Action(RouteValueDictionary values)
-        {
-            return values != null
-                       ? Action(values["action"] as string, values["controller"] as string, values)
-                       : Action(null, null, new RouteValueDictionary());
-        }
+    public NavigationItemBuilder Action(string actionName)
+    {
+        return Action(actionName, null, new RouteValueDictionary());
+    }
 
-        public NavigationItemBuilder Action(string actionName)
-        {
-            return Action(actionName, null, new RouteValueDictionary());
-        }
+    public NavigationItemBuilder Action(string actionName, string controllerName)
+    {
+        return Action(actionName, controllerName, new RouteValueDictionary());
+    }
 
-        public NavigationItemBuilder Action(string actionName, string controllerName)
-        {
-            return Action(actionName, controllerName, new RouteValueDictionary());
-        }
+    public NavigationItemBuilder Action(string actionName, string controllerName, object values)
+    {
+        return Action(actionName, controllerName, new RouteValueDictionary(values));
+    }
 
-        public NavigationItemBuilder Action(string actionName, string controllerName, object values)
-        {
-            return Action(actionName, controllerName, new RouteValueDictionary(values));
-        }
+    public NavigationItemBuilder Action(string actionName, string controllerName, RouteValueDictionary values)
+    {
+        return Action(actionName, controllerName, null, values);
+    }
 
-        public NavigationItemBuilder Action(string actionName, string controllerName, RouteValueDictionary values)
+    public NavigationItemBuilder Action(string actionName, string controllerName, string areaName)
+    {
+        return Action(actionName, controllerName, areaName, []);
+    }
+
+    public NavigationItemBuilder Action(string actionName, string controllerName, string areaName, RouteValueDictionary values)
+    {
+        _item.RouteValues = new RouteValueDictionary(values);
+        if (!string.IsNullOrEmpty(actionName))
         {
-            return Action(actionName, controllerName, null, values);
+            _item.RouteValues["action"] = actionName;
         }
 
-        public NavigationItemBuilder Action(string actionName, string controllerName, string areaName)
+        if (!string.IsNullOrEmpty(controllerName))
         {
-            return Action(actionName, controllerName, areaName, []);
+            _item.RouteValues["controller"] = controllerName;
         }
 
-        public NavigationItemBuilder Action(string actionName, string controllerName, string areaName, RouteValueDictionary values)
+        if (!string.IsNullOrEmpty(areaName))
         {
-            _item.RouteValues = new RouteValueDictionary(values);
-            if (!string.IsNullOrEmpty(actionName))
-            {
-                _item.RouteValues["action"] = actionName;
-            }
-
-            if (!string.IsNullOrEmpty(controllerName))
-            {
-                _item.RouteValues["controller"] = controllerName;
-            }
-
-            if (!string.IsNullOrEmpty(areaName))
-            {
-                _item.RouteValues["area"] = areaName;
-            }
-
-            return this;
+            _item.RouteValues["area"] = areaName;
         }
+
+        return this;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationManager.cs b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationManager.cs
index d1ebefa9d7e..75f4218c7c2 100644
--- a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationManager.cs
+++ b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationManager.cs
@@ -10,95 +10,119 @@
 using Microsoft.Extensions.Logging;
 using OrchardCore.Environment.Shell;
 
-namespace OrchardCore.Navigation
+namespace OrchardCore.Navigation;
+
+public class NavigationManager : INavigationManager
 {
-    public class NavigationManager : INavigationManager
+    private readonly IEnumerable<INavigationProvider> _navigationProviders;
+    private readonly ILogger _logger;
+    protected readonly ShellSettings _shellSettings;
+    private readonly IUrlHelperFactory _urlHelperFactory;
+    private readonly IAuthorizationService _authorizationService;
+
+    private IUrlHelper _urlHelper;
+
+    public NavigationManager(
+        IEnumerable<INavigationProvider> navigationProviders,
+        ILogger<NavigationManager> logger,
+        ShellSettings shellSettings,
+        IUrlHelperFactory urlHelperFactory,
+        IAuthorizationService authorizationService)
     {
-        private readonly IEnumerable<INavigationProvider> _navigationProviders;
-        private readonly ILogger _logger;
-        protected readonly ShellSettings _shellSettings;
-        private readonly IUrlHelperFactory _urlHelperFactory;
-        private readonly IAuthorizationService _authorizationService;
-
-        private IUrlHelper _urlHelper;
-
-        public NavigationManager(
-            IEnumerable<INavigationProvider> navigationProviders,
-            ILogger<NavigationManager> logger,
-            ShellSettings shellSettings,
-            IUrlHelperFactory urlHelperFactory,
-            IAuthorizationService authorizationService)
-        {
-            _navigationProviders = navigationProviders;
-            _logger = logger;
-            _shellSettings = shellSettings;
-            _urlHelperFactory = urlHelperFactory;
-            _authorizationService = authorizationService;
-        }
+        _navigationProviders = navigationProviders;
+        _logger = logger;
+        _shellSettings = shellSettings;
+        _urlHelperFactory = urlHelperFactory;
+        _authorizationService = authorizationService;
+    }
 
-        public async Task<IEnumerable<MenuItem>> BuildMenuAsync(string name, ActionContext actionContext)
-        {
-            var builder = new NavigationBuilder();
+    public async Task<IEnumerable<MenuItem>> BuildMenuAsync(string name, ActionContext actionContext)
+    {
+        var builder = new NavigationBuilder();
 
-            // Processes all navigation builders to create a flat list of menu items.
-            // If a navigation builder fails, it is ignored.
-            foreach (var navigationProvider in _navigationProviders)
+        // Processes all navigation builders to create a flat list of menu items.
+        // If a navigation builder fails, it is ignored.
+        foreach (var navigationProvider in _navigationProviders)
+        {
+            try
             {
-                try
-                {
-                    await navigationProvider.BuildNavigationAsync(name, builder);
-                }
-                catch (Exception e)
-                {
-                    _logger.LogError(e, "An exception occurred while building the menu '{MenuName}'", name);
-                }
+                await navigationProvider.BuildNavigationAsync(name, builder);
             }
+            catch (Exception e)
+            {
+                _logger.LogError(e, "An exception occurred while building the menu '{MenuName}'", name);
+            }
+        }
 
-            var menuItems = builder.Build();
+        var menuItems = builder.Build();
 
-            // Merge all menu hierarchies into a single one.
-            Merge(menuItems);
+        // Merge all menu hierarchies into a single one.
+        Merge(menuItems);
 
-            // Remove unauthorized menu items.
-            menuItems = await AuthorizeAsync(menuItems, actionContext.HttpContext.User);
+        // Remove unauthorized menu items.
+        menuItems = await AuthorizeAsync(menuItems, actionContext.HttpContext.User);
 
-            // Compute Url and RouteValues properties to Href.
-            menuItems = ComputeHref(menuItems, actionContext);
+        // Compute Url and RouteValues properties to Href.
+        menuItems = ComputeHref(menuItems, actionContext);
 
-            // Keep only menu items with an Href, or that have child items with an Href.
-            menuItems = Reduce(menuItems);
+        // Keep only menu items with an Href, or that have child items with an Href.
+        menuItems = Reduce(menuItems);
 
-            return menuItems;
-        }
+        return menuItems;
+    }
 
-        /// <summary>
-        /// Mutates a list of <see cref="MenuItem"/> into a hierarchy.
-        /// </summary>
-        private static void Merge(List<MenuItem> items)
+    /// <summary>
+    /// Mutates a list of <see cref="MenuItem"/> into a hierarchy.
+    /// </summary>
+    private static void Merge(List<MenuItem> items)
+    {
+        // Use two cursors to find all similar captions. If the same caption is represented
+        // by multiple menu items, try to merge it recursively.
+        for (var i = 0; i < items.Count; i++)
         {
-            // Use two cursors to find all similar captions. If the same caption is represented
-            // by multiple menu items, try to merge it recursively.
-            for (var i = 0; i < items.Count; i++)
+            var source = items[i];
+            var merged = false;
+            for (var j = items.Count - 1; j > i; j--)
             {
-                var source = items[i];
-                var merged = false;
-                for (var j = items.Count - 1; j > i; j--)
-                {
-                    var cursor = items[j];
+                var cursor = items[j];
 
-                    // A match is found, add all its items to the source.
-                    if (string.Equals(cursor.Text.Name, source.Text.Name, StringComparison.OrdinalIgnoreCase))
+                // A match is found, add all its items to the source.
+                if (string.Equals(cursor.Text.Name, source.Text.Name, StringComparison.OrdinalIgnoreCase))
+                {
+                    merged = true;
+                    foreach (var child in cursor.Items)
                     {
-                        merged = true;
-                        foreach (var child in cursor.Items)
-                        {
-                            source.Items.Add(child);
-                        }
+                        source.Items.Add(child);
+                    }
 
-                        items.RemoveAt(j);
+                    items.RemoveAt(j);
 
-                        // If the item to merge is more authoritative then use its values.
-                        if (cursor.Priority > source.Priority)
+                    // If the item to merge is more authoritative then use its values.
+                    if (cursor.Priority > source.Priority)
+                    {
+                        source.Culture = cursor.Culture;
+                        source.Href = cursor.Href;
+                        source.Id = cursor.Id;
+                        source.LinkToFirstChild = cursor.LinkToFirstChild;
+                        source.LocalNav = cursor.LocalNav;
+                        source.Position = cursor.Position;
+                        source.Resource = cursor.Resource;
+                        source.RouteValues = cursor.RouteValues;
+                        source.Text = cursor.Text;
+                        source.Url = cursor.Url;
+                        source.Target = cursor.Target;
+
+                        source.Permissions.Clear();
+                        source.Permissions.AddRange(cursor.Permissions);
+
+                        source.Classes.Clear();
+                        source.Classes.AddRange(cursor.Classes);
+                    }
+
+                    // Fallback to get the same behavior than before having the Priority var.
+                    if (cursor.Priority == source.Priority)
+                    {
+                        if (cursor.Position != null && source.Position == null)
                         {
                             source.Culture = cursor.Culture;
                             source.Href = cursor.Href;
@@ -118,163 +142,138 @@ private static void Merge(List<MenuItem> items)
                             source.Classes.Clear();
                             source.Classes.AddRange(cursor.Classes);
                         }
-
-                        // Fallback to get the same behavior than before having the Priority var.
-                        if (cursor.Priority == source.Priority)
-                        {
-                            if (cursor.Position != null && source.Position == null)
-                            {
-                                source.Culture = cursor.Culture;
-                                source.Href = cursor.Href;
-                                source.Id = cursor.Id;
-                                source.LinkToFirstChild = cursor.LinkToFirstChild;
-                                source.LocalNav = cursor.LocalNav;
-                                source.Position = cursor.Position;
-                                source.Resource = cursor.Resource;
-                                source.RouteValues = cursor.RouteValues;
-                                source.Text = cursor.Text;
-                                source.Url = cursor.Url;
-                                source.Target = cursor.Target;
-
-                                source.Permissions.Clear();
-                                source.Permissions.AddRange(cursor.Permissions);
-
-                                source.Classes.Clear();
-                                source.Classes.AddRange(cursor.Classes);
-                            }
-                        }
                     }
                 }
+            }
 
-                // If some items have been merged, apply recursively.
-                if (merged)
-                {
-                    Merge(source.Items);
-                }
+            // If some items have been merged, apply recursively.
+            if (merged)
+            {
+                Merge(source.Items);
             }
         }
+    }
 
-        /// <summary>
-        /// Computes the <see cref="MenuItem.Href"/> properties based on <see cref="MenuItem.Url"/>
-        /// and <see cref="MenuItem.RouteValues"/> values.
-        /// </summary>
-        private List<MenuItem> ComputeHref(List<MenuItem> menuItems, ActionContext actionContext)
+    /// <summary>
+    /// Computes the <see cref="MenuItem.Href"/> properties based on <see cref="MenuItem.Url"/>
+    /// and <see cref="MenuItem.RouteValues"/> values.
+    /// </summary>
+    private List<MenuItem> ComputeHref(List<MenuItem> menuItems, ActionContext actionContext)
+    {
+        foreach (var menuItem in menuItems)
         {
-            foreach (var menuItem in menuItems)
-            {
-                menuItem.Href = GetUrl(menuItem.Url, menuItem.RouteValues, actionContext);
-                menuItem.Items = ComputeHref(menuItem.Items, actionContext);
-            }
+            menuItem.Href = GetUrl(menuItem.Url, menuItem.RouteValues, actionContext);
+            menuItem.Items = ComputeHref(menuItem.Items, actionContext);
+        }
 
-            return menuItems;
+        return menuItems;
+    }
+
+    /// <summary>
+    /// Gets the url.from a menu item url a routeValueDictionary and an actionContext.
+    /// </summary>
+    /// <param name="menuItemUrl"></param>
+    /// <param name="routeValueDictionary"></param>
+    /// <param name="actionContext"></param>
+    /// <returns></returns>
+    private string GetUrl(string menuItemUrl, RouteValueDictionary routeValueDictionary, ActionContext actionContext)
+    {
+        if (routeValueDictionary?.Count > 0)
+        {
+            _urlHelper ??= _urlHelperFactory.GetUrlHelper(actionContext);
+
+            return _urlHelper.RouteUrl(new UrlRouteContext { Values = routeValueDictionary });
         }
 
-        /// <summary>
-        /// Gets the url.from a menu item url a routeValueDictionary and an actionContext.
-        /// </summary>
-        /// <param name="menuItemUrl"></param>
-        /// <param name="routeValueDictionary"></param>
-        /// <param name="actionContext"></param>
-        /// <returns></returns>
-        private string GetUrl(string menuItemUrl, RouteValueDictionary routeValueDictionary, ActionContext actionContext)
+        if (string.IsNullOrEmpty(menuItemUrl))
         {
-            if (routeValueDictionary?.Count > 0)
-            {
-                _urlHelper ??= _urlHelperFactory.GetUrlHelper(actionContext);
+            return "#";
+        }
 
-                return _urlHelper.RouteUrl(new UrlRouteContext { Values = routeValueDictionary });
-            }
+        if (menuItemUrl[0] == '/' || menuItemUrl.Contains("://"))
+        {
+            // Return the unescaped url and let the browser generate all uri components.
+            return menuItemUrl;
+        }
 
-            if (string.IsNullOrEmpty(menuItemUrl))
-            {
-                return "#";
-            }
+        if (menuItemUrl.StartsWith("~/", StringComparison.Ordinal))
+        {
+            menuItemUrl = menuItemUrl[2..];
+        }
 
-            if (menuItemUrl[0] == '/' || menuItemUrl.Contains("://"))
+        // Use the unescaped 'Value' to not encode some possible reserved delimiters.
+        return actionContext.HttpContext.Request.PathBase.Add($"/{menuItemUrl}").Value;
+    }
+
+    /// <summary>
+    /// Updates the items by checking for permissions.
+    /// </summary>
+    private async Task<List<MenuItem>> AuthorizeAsync(IEnumerable<MenuItem> items, ClaimsPrincipal user)
+    {
+        var filtered = new List<MenuItem>();
+        foreach (var item in items)
+        {
+            // TODO: Attach actual user and remove this clause.
+            if (user == null)
             {
-                // Return the unescaped url and let the browser generate all uri components.
-                return menuItemUrl;
+                filtered.Add(item);
             }
-
-            if (menuItemUrl.StartsWith("~/", StringComparison.Ordinal))
+            else if (item.Permissions.Count == 0)
             {
-                menuItemUrl = menuItemUrl[2..];
+                filtered.Add(item);
             }
-
-            // Use the unescaped 'Value' to not encode some possible reserved delimiters.
-            return actionContext.HttpContext.Request.PathBase.Add($"/{menuItemUrl}").Value;
-        }
-
-        /// <summary>
-        /// Updates the items by checking for permissions.
-        /// </summary>
-        private async Task<List<MenuItem>> AuthorizeAsync(IEnumerable<MenuItem> items, ClaimsPrincipal user)
-        {
-            var filtered = new List<MenuItem>();
-            foreach (var item in items)
+            else
             {
-                // TODO: Attach actual user and remove this clause.
-                if (user == null)
-                {
-                    filtered.Add(item);
-                }
-                else if (item.Permissions.Count == 0)
-                {
-                    filtered.Add(item);
-                }
-                else
+                // When multiple permissions are supplied all permissions must be authorized.
+                var isAuthorized = true;
+                foreach (var permission in item.Permissions)
                 {
-                    // When multiple permissions are supplied all permissions must be authorized.
-                    var isAuthorized = true;
-                    foreach (var permission in item.Permissions)
-                    {
-                        if (!(await _authorizationService.AuthorizeAsync(user, permission, item.Resource)))
-                        {
-                            isAuthorized = false;
-                            break;
-                        }
-                    }
-
-                    if (isAuthorized)
+                    if (!(await _authorizationService.AuthorizeAsync(user, permission, item.Resource)))
                     {
-                        filtered.Add(item);
+                        isAuthorized = false;
+                        break;
                     }
                 }
 
-                // Process child items.
-                item.Items = (await AuthorizeAsync(item.Items, user));
+                if (isAuthorized)
+                {
+                    filtered.Add(item);
+                }
             }
 
-            return filtered;
+            // Process child items.
+            item.Items = (await AuthorizeAsync(item.Items, user));
         }
 
-        /// <summary>
-        /// Retains only menu items with an Href, or that have child items with an Href.
-        /// </summary>
-        private static List<MenuItem> Reduce(IEnumerable<MenuItem> items)
+        return filtered;
+    }
+
+    /// <summary>
+    /// Retains only menu items with an Href, or that have child items with an Href.
+    /// </summary>
+    private static List<MenuItem> Reduce(IEnumerable<MenuItem> items)
+    {
+        var filtered = items.ToList();
+        foreach (var item in items)
         {
-            var filtered = items.ToList();
-            foreach (var item in items)
+            if (!HasHrefOrChildHref(item))
             {
-                if (!HasHrefOrChildHref(item))
-                {
-                    filtered.Remove(item);
-                }
-
-                item.Items = Reduce(item.Items);
+                filtered.Remove(item);
             }
 
-            return filtered;
+            item.Items = Reduce(item.Items);
         }
 
-        private static bool HasHrefOrChildHref(MenuItem item)
-        {
-            if (item.Href != "#")
-            {
-                return true;
-            }
+        return filtered;
+    }
 
-            return item.Items.Any(HasHrefOrChildHref);
+    private static bool HasHrefOrChildHref(MenuItem item)
+    {
+        if (item.Href != "#")
+        {
+            return true;
         }
+
+        return item.Items.Any(HasHrefOrChildHref);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/Pager.cs b/src/OrchardCore/OrchardCore.Navigation.Core/Pager.cs
index ffa2c9dd057..00e4221ebf0 100644
--- a/src/OrchardCore/OrchardCore.Navigation.Core/Pager.cs
+++ b/src/OrchardCore/OrchardCore.Navigation.Core/Pager.cs
@@ -1,52 +1,51 @@
-namespace OrchardCore.Navigation
+namespace OrchardCore.Navigation;
+
+public class Pager
 {
-    public class Pager
-    {
-        /// <summary>
-        /// The default page number.
-        /// </summary>
-        public const int PageDefault = 1;
+    /// <summary>
+    /// The default page number.
+    /// </summary>
+    public const int PageDefault = 1;
 
-        /// <summary>
-        /// Constructs a new pager.
-        /// </summary>
-        /// <param name="pagerParameters">The pager parameters.</param>
-        /// <param name="defaultPageSize">The default page size.</param>
-        public Pager(PagerParameters pagerParameters, int defaultPageSize)
-            : this(pagerParameters.Page, pagerParameters.PageSize, defaultPageSize)
-        {
-        }
+    /// <summary>
+    /// Constructs a new pager.
+    /// </summary>
+    /// <param name="pagerParameters">The pager parameters.</param>
+    /// <param name="defaultPageSize">The default page size.</param>
+    public Pager(PagerParameters pagerParameters, int defaultPageSize)
+        : this(pagerParameters.Page, pagerParameters.PageSize, defaultPageSize)
+    {
+    }
 
-        /// <summary>
-        /// Constructs a new pager.
-        /// </summary>
-        /// <param name="page">The page parameter.</param>
-        /// <param name="pageSize">The page size parameter.</param>
-        /// <param name="defaultPageSize">The default page size.</param>
-        public Pager(int? page, int? pageSize, int defaultPageSize)
-        {
-            Page = (int)(page != null ? (page > 0 ? page : PageDefault) : PageDefault);
-            PageSize = pageSize ?? defaultPageSize;
-        }
+    /// <summary>
+    /// Constructs a new pager.
+    /// </summary>
+    /// <param name="page">The page parameter.</param>
+    /// <param name="pageSize">The page size parameter.</param>
+    /// <param name="defaultPageSize">The default page size.</param>
+    public Pager(int? page, int? pageSize, int defaultPageSize)
+    {
+        Page = (int)(page != null ? (page > 0 ? page : PageDefault) : PageDefault);
+        PageSize = pageSize ?? defaultPageSize;
+    }
 
-        /// <summary>
-        /// Gets or sets the current page number or the default page number if none is specified.
-        /// </summary>
-        public int Page { get; set; }
+    /// <summary>
+    /// Gets or sets the current page number or the default page number if none is specified.
+    /// </summary>
+    public int Page { get; set; }
 
-        /// <summary>
-        /// Gets or sets the current page size or the site default size if none is specified.
-        /// </summary>
-        public int PageSize { get; set; }
+    /// <summary>
+    /// Gets or sets the current page size or the site default size if none is specified.
+    /// </summary>
+    public int PageSize { get; set; }
 
-        /// <summary>
-        /// Gets the current page start index.
-        /// </summary>
-        /// <param name="page">The current page number.</param>
-        /// <returns>The index in which the page starts.</returns>
-        public int GetStartIndex(int? page = null)
-        {
-            return ((page ?? Page) - PageDefault) * PageSize;
-        }
+    /// <summary>
+    /// Gets the current page start index.
+    /// </summary>
+    /// <param name="page">The current page number.</param>
+    /// <returns>The index in which the page starts.</returns>
+    public int GetStartIndex(int? page = null)
+    {
+        return ((page ?? Page) - PageDefault) * PageSize;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/PagerParameters.cs b/src/OrchardCore/OrchardCore.Navigation.Core/PagerParameters.cs
index 4077cee80b4..bc814be8aa3 100644
--- a/src/OrchardCore/OrchardCore.Navigation.Core/PagerParameters.cs
+++ b/src/OrchardCore/OrchardCore.Navigation.Core/PagerParameters.cs
@@ -1,18 +1,17 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace OrchardCore.Navigation
+namespace OrchardCore.Navigation;
+
+public class PagerParameters
 {
-    public class PagerParameters
-    {
-        /// <summary>
-        /// Gets or sets the current page number or null if none specified.
-        /// </summary>
-        [BindProperty(Name = "PageNum")]
-        public int? Page { get; set; }
+    /// <summary>
+    /// Gets or sets the current page number or null if none specified.
+    /// </summary>
+    [BindProperty(Name = "PageNum")]
+    public int? Page { get; set; }
 
-        /// <summary>
-        /// Gets or sets the current page size or null if none specified.
-        /// </summary>
-        public int? PageSize { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the current page size or null if none specified.
+    /// </summary>
+    public int? PageSize { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/PagerSlim.cs b/src/OrchardCore/OrchardCore.Navigation.Core/PagerSlim.cs
index 881737333ca..d2027bc639c 100644
--- a/src/OrchardCore/OrchardCore.Navigation.Core/PagerSlim.cs
+++ b/src/OrchardCore/OrchardCore.Navigation.Core/PagerSlim.cs
@@ -1,43 +1,42 @@
-namespace OrchardCore.Navigation
+namespace OrchardCore.Navigation;
+
+public class PagerSlim
 {
-    public class PagerSlim
+    /// <summary>
+    /// Constructs a new pager.
+    /// </summary>
+    /// <param name="pagerParameters">The pager parameters.</param>
+    /// <param name="pageSize">The page size parameter.</param>
+    public PagerSlim(PagerSlimParameters pagerParameters, int pageSize)
+        : this(pagerParameters.Before, pagerParameters.After, pageSize)
     {
-        /// <summary>
-        /// Constructs a new pager.
-        /// </summary>
-        /// <param name="pagerParameters">The pager parameters.</param>
-        /// <param name="pageSize">The page size parameter.</param>
-        public PagerSlim(PagerSlimParameters pagerParameters, int pageSize)
-            : this(pagerParameters.Before, pagerParameters.After, pageSize)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Constructs a new pager.
-        /// </summary>
-        /// <param name="before">The identifier of the first element in the page.</param>
-        /// <param name="after">The identifier of the last element in the page.</param>
-        /// <param name="pageSize">The page size parameter.</param>
-        public PagerSlim(string before, string after, int pageSize)
-        {
-            Before = before;
-            After = after;
-            PageSize = pageSize;
-        }
+    /// <summary>
+    /// Constructs a new pager.
+    /// </summary>
+    /// <param name="before">The identifier of the first element in the page.</param>
+    /// <param name="after">The identifier of the last element in the page.</param>
+    /// <param name="pageSize">The page size parameter.</param>
+    public PagerSlim(string before, string after, int pageSize)
+    {
+        Before = before;
+        After = after;
+        PageSize = pageSize;
+    }
 
-        /// <summary>
-        /// Gets or sets the current page size or the site default size if none is specified.
-        /// </summary>
-        public int PageSize { get; set; }
+    /// <summary>
+    /// Gets or sets the current page size or the site default size if none is specified.
+    /// </summary>
+    public int PageSize { get; set; }
 
-        /// <summary>
-        /// Gets or sets the the first element in the page or. <code>null</code>  if none is specified.
-        /// </summary>
-        public string Before { get; set; }
+    /// <summary>
+    /// Gets or sets the the first element in the page or. <code>null</code>  if none is specified.
+    /// </summary>
+    public string Before { get; set; }
 
-        /// <summary>
-        /// Gets or sets the the last element in the page or. <code>null</code>  if none is specified.
-        /// </summary>
-        public string After { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the the last element in the page or. <code>null</code>  if none is specified.
+    /// </summary>
+    public string After { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/PagerSlimParameters.cs b/src/OrchardCore/OrchardCore.Navigation.Core/PagerSlimParameters.cs
index 1173053d726..01101b6ab05 100644
--- a/src/OrchardCore/OrchardCore.Navigation.Core/PagerSlimParameters.cs
+++ b/src/OrchardCore/OrchardCore.Navigation.Core/PagerSlimParameters.cs
@@ -1,19 +1,18 @@
-namespace OrchardCore.Navigation
+namespace OrchardCore.Navigation;
+
+/// <summary>
+/// Represents the paging parameters of a safe navigation that doesn't
+/// require counting, and doesn't support page size alteration.
+/// </summary>
+public class PagerSlimParameters
 {
     /// <summary>
-    /// Represents the paging parameters of a safe navigation that doesn't
-    /// require counting, and doesn't support page size alteration.
+    /// Gets or sets the first item displayed on the page.
     /// </summary>
-    public class PagerSlimParameters
-    {
-        /// <summary>
-        /// Gets or sets the first item displayed on the page.
-        /// </summary>
-        public string Before { get; set; }
+    public string Before { get; set; }
 
-        /// <summary>
-        /// Gets or sets the last item displayed on the page.
-        /// </summary>
-        public string After { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the last item displayed on the page.
+    /// </summary>
+    public string After { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Navigation.Core/ServiceCollectionExtensions.cs
index ba03d570034..202decafcfb 100644
--- a/src/OrchardCore/OrchardCore.Navigation.Core/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Navigation.Core/ServiceCollectionExtensions.cs
@@ -1,20 +1,19 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace OrchardCore.Navigation
+namespace OrchardCore.Navigation;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    /// <summary>
+    /// Adds tenant level services.
+    /// </summary>
+    /// <param name="services"></param>
+    /// <returns></returns>
+    public static IServiceCollection AddNavigation(this IServiceCollection services)
     {
-        /// <summary>
-        /// Adds tenant level services.
-        /// </summary>
-        /// <param name="services"></param>
-        /// <returns></returns>
-        public static IServiceCollection AddNavigation(this IServiceCollection services)
-        {
-            services.TryAddEnumerable(ServiceDescriptor.Scoped<INavigationManager, NavigationManager>());
+        services.TryAddEnumerable(ServiceDescriptor.Scoped<INavigationManager, NavigationManager>());
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Notifications.Core/Services/EmailNotificationProvider.cs b/src/OrchardCore/OrchardCore.Notifications.Core/Services/EmailNotificationProvider.cs
index 94b7b6e9a05..dd56564aca1 100644
--- a/src/OrchardCore/OrchardCore.Notifications.Core/Services/EmailNotificationProvider.cs
+++ b/src/OrchardCore/OrchardCore.Notifications.Core/Services/EmailNotificationProvider.cs
@@ -33,7 +33,7 @@ public async Task<bool> TrySendAsync(object notify, INotificationMessage message
 
         string body;
         bool isHtmlBody;
-        
+
         if (message.IsHtmlPreferred && !string.IsNullOrWhiteSpace(message.HtmlBody))
         {
             body = message.HtmlBody;
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Descriptors/OpenIdApplicationDescriptor.cs b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Descriptors/OpenIdApplicationDescriptor.cs
index 5e0d19d490b..abe36e3e390 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Descriptors/OpenIdApplicationDescriptor.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Descriptors/OpenIdApplicationDescriptor.cs
@@ -2,13 +2,12 @@
 using System.Collections.Generic;
 using OpenIddict.Abstractions;
 
-namespace OrchardCore.OpenId.Abstractions.Descriptors
+namespace OrchardCore.OpenId.Abstractions.Descriptors;
+
+public class OpenIdApplicationDescriptor : OpenIddictApplicationDescriptor
 {
-    public class OpenIdApplicationDescriptor : OpenIddictApplicationDescriptor
-    {
-        /// <summary>
-        /// Gets the roles associated with the application.
-        /// </summary>
-        public ISet<string> Roles { get; init; } = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-    }
+    /// <summary>
+    /// Gets the roles associated with the application.
+    /// </summary>
+    public ISet<string> Roles { get; init; } = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Descriptors/OpenIdAuthorizationDescriptor.cs b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Descriptors/OpenIdAuthorizationDescriptor.cs
index 9ed301da415..37377d8b1ad 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Descriptors/OpenIdAuthorizationDescriptor.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Descriptors/OpenIdAuthorizationDescriptor.cs
@@ -1,6 +1,5 @@
 using OpenIddict.Abstractions;
 
-namespace OrchardCore.OpenId.Abstractions.Descriptors
-{
-    public class OpenIdAuthorizationDescriptor : OpenIddictAuthorizationDescriptor { }
-}
+namespace OrchardCore.OpenId.Abstractions.Descriptors;
+
+public class OpenIdAuthorizationDescriptor : OpenIddictAuthorizationDescriptor { }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Descriptors/OpenIdScopeDescriptor.cs b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Descriptors/OpenIdScopeDescriptor.cs
index aef3a864a94..43bc4c74ebe 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Descriptors/OpenIdScopeDescriptor.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Descriptors/OpenIdScopeDescriptor.cs
@@ -1,6 +1,5 @@
 using OpenIddict.Abstractions;
 
-namespace OrchardCore.OpenId.Abstractions.Descriptors
-{
-    public class OpenIdScopeDescriptor : OpenIddictScopeDescriptor { }
-}
+namespace OrchardCore.OpenId.Abstractions.Descriptors;
+
+public class OpenIdScopeDescriptor : OpenIddictScopeDescriptor { }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Descriptors/OpenIdTokenDescriptor.cs b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Descriptors/OpenIdTokenDescriptor.cs
index 2a93ac046c6..01b1dcc1142 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Descriptors/OpenIdTokenDescriptor.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Descriptors/OpenIdTokenDescriptor.cs
@@ -1,6 +1,5 @@
 using OpenIddict.Abstractions;
 
-namespace OrchardCore.OpenId.Abstractions.Descriptors
-{
-    public class OpenIdTokenDescriptor : OpenIddictTokenDescriptor { }
-}
+namespace OrchardCore.OpenId.Abstractions.Descriptors;
+
+public class OpenIdTokenDescriptor : OpenIddictTokenDescriptor { }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Managers/IOpenIdApplicationManager.cs b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Managers/IOpenIdApplicationManager.cs
index 3d24d431de7..23a34dbc397 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Managers/IOpenIdApplicationManager.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Managers/IOpenIdApplicationManager.cs
@@ -4,22 +4,21 @@
 using System.Threading.Tasks;
 using OpenIddict.Abstractions;
 
-namespace OrchardCore.OpenId.Abstractions.Managers
+namespace OrchardCore.OpenId.Abstractions.Managers;
+
+/// <summary>
+/// Provides methods allowing to manage the applications stored in the store.
+/// Note: this interface is not meant to be implemented by custom managers,
+/// that should inherit from the generic OpenIdApplicationManager class.
+/// It is primarily intended to be used by services that cannot easily depend
+/// on the generic application manager. The actual application entity type
+/// is automatically determined at runtime based on the OpenIddict core options.
+/// </summary>
+public interface IOpenIdApplicationManager : IOpenIddictApplicationManager
 {
-    /// <summary>
-    /// Provides methods allowing to manage the applications stored in the store.
-    /// Note: this interface is not meant to be implemented by custom managers,
-    /// that should inherit from the generic OpenIdApplicationManager class.
-    /// It is primarily intended to be used by services that cannot easily depend
-    /// on the generic application manager. The actual application entity type
-    /// is automatically determined at runtime based on the OpenIddict core options.
-    /// </summary>
-    public interface IOpenIdApplicationManager : IOpenIddictApplicationManager
-    {
-        ValueTask<object> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken = default);
-        ValueTask<string> GetPhysicalIdAsync(object application, CancellationToken cancellationToken = default);
-        ValueTask<ImmutableArray<string>> GetRolesAsync(object application, CancellationToken cancellationToken = default);
-        IAsyncEnumerable<object> ListInRoleAsync(string role, CancellationToken cancellationToken = default);
-        ValueTask SetRolesAsync(object application, ImmutableArray<string> roles, CancellationToken cancellationToken = default);
-    }
+    ValueTask<object> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken = default);
+    ValueTask<string> GetPhysicalIdAsync(object application, CancellationToken cancellationToken = default);
+    ValueTask<ImmutableArray<string>> GetRolesAsync(object application, CancellationToken cancellationToken = default);
+    IAsyncEnumerable<object> ListInRoleAsync(string role, CancellationToken cancellationToken = default);
+    ValueTask SetRolesAsync(object application, ImmutableArray<string> roles, CancellationToken cancellationToken = default);
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Managers/IOpenIdAuthorizationManager.cs b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Managers/IOpenIdAuthorizationManager.cs
index 63cf3b48254..2ed1adfac81 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Managers/IOpenIdAuthorizationManager.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Managers/IOpenIdAuthorizationManager.cs
@@ -2,19 +2,18 @@
 using System.Threading.Tasks;
 using OpenIddict.Abstractions;
 
-namespace OrchardCore.OpenId.Abstractions.Managers
+namespace OrchardCore.OpenId.Abstractions.Managers;
+
+/// <summary>
+/// Provides methods allowing to manage the authorizations stored in the store.
+/// Note: this interface is not meant to be implemented by custom managers,
+/// that should inherit from the generic OpenIdAuthorizationManager class.
+/// It is primarily intended to be used by services that cannot easily depend
+/// on the generic authorization manager. The actual authorization entity type
+/// is automatically determined at runtime based on the OpenIddict core options.
+/// </summary>
+public interface IOpenIdAuthorizationManager : IOpenIddictAuthorizationManager
 {
-    /// <summary>
-    /// Provides methods allowing to manage the authorizations stored in the store.
-    /// Note: this interface is not meant to be implemented by custom managers,
-    /// that should inherit from the generic OpenIdAuthorizationManager class.
-    /// It is primarily intended to be used by services that cannot easily depend
-    /// on the generic authorization manager. The actual authorization entity type
-    /// is automatically determined at runtime based on the OpenIddict core options.
-    /// </summary>
-    public interface IOpenIdAuthorizationManager : IOpenIddictAuthorizationManager
-    {
-        ValueTask<object> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken = default);
-        ValueTask<string> GetPhysicalIdAsync(object authorization, CancellationToken cancellationToken = default);
-    }
+    ValueTask<object> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken = default);
+    ValueTask<string> GetPhysicalIdAsync(object authorization, CancellationToken cancellationToken = default);
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Managers/IOpenIdScopeManager.cs b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Managers/IOpenIdScopeManager.cs
index 24d43814b93..f08868383f1 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Managers/IOpenIdScopeManager.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Managers/IOpenIdScopeManager.cs
@@ -2,19 +2,18 @@
 using System.Threading.Tasks;
 using OpenIddict.Abstractions;
 
-namespace OrchardCore.OpenId.Abstractions.Managers
+namespace OrchardCore.OpenId.Abstractions.Managers;
+
+/// <summary>
+/// Provides methods allowing to manage the scopes stored in the store.
+/// Note: this interface is not meant to be implemented by custom managers,
+/// that should inherit from the generic OpenIdScopeManager class.
+/// It is primarily intended to be used by services that cannot easily
+/// depend on the generic scope manager. The actual scope entity type is
+/// automatically determined at runtime based on the OpenIddict core options.
+/// </summary>
+public interface IOpenIdScopeManager : IOpenIddictScopeManager
 {
-    /// <summary>
-    /// Provides methods allowing to manage the scopes stored in the store.
-    /// Note: this interface is not meant to be implemented by custom managers,
-    /// that should inherit from the generic OpenIdScopeManager class.
-    /// It is primarily intended to be used by services that cannot easily
-    /// depend on the generic scope manager. The actual scope entity type is
-    /// automatically determined at runtime based on the OpenIddict core options.
-    /// </summary>
-    public interface IOpenIdScopeManager : IOpenIddictScopeManager
-    {
-        ValueTask<object> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken = default);
-        ValueTask<string> GetPhysicalIdAsync(object scope, CancellationToken cancellationToken = default);
-    }
+    ValueTask<object> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken = default);
+    ValueTask<string> GetPhysicalIdAsync(object scope, CancellationToken cancellationToken = default);
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Managers/IOpenIdTokenManager.cs b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Managers/IOpenIdTokenManager.cs
index 3fe61333529..05334ab9b76 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Managers/IOpenIdTokenManager.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Managers/IOpenIdTokenManager.cs
@@ -2,19 +2,18 @@
 using System.Threading.Tasks;
 using OpenIddict.Abstractions;
 
-namespace OrchardCore.OpenId.Abstractions.Managers
+namespace OrchardCore.OpenId.Abstractions.Managers;
+
+/// <summary>
+/// Provides methods allowing to manage the tokens stored in the store.
+/// Note: this interface is not meant to be implemented by custom managers,
+/// that should inherit from the generic OpenIdTokenManager class.
+/// It is primarily intended to be used by services that cannot easily
+/// depend on the generic token manager. The actual token entity type is
+/// automatically determined at runtime based on the OpenIddict core options.
+/// </summary>
+public interface IOpenIdTokenManager : IOpenIddictTokenManager
 {
-    /// <summary>
-    /// Provides methods allowing to manage the tokens stored in the store.
-    /// Note: this interface is not meant to be implemented by custom managers,
-    /// that should inherit from the generic OpenIdTokenManager class.
-    /// It is primarily intended to be used by services that cannot easily
-    /// depend on the generic token manager. The actual token entity type is
-    /// automatically determined at runtime based on the OpenIddict core options.
-    /// </summary>
-    public interface IOpenIdTokenManager : IOpenIddictTokenManager
-    {
-        ValueTask<object> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken = default);
-        ValueTask<string> GetPhysicalIdAsync(object token, CancellationToken cancellationToken = default);
-    }
+    ValueTask<object> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken = default);
+    ValueTask<string> GetPhysicalIdAsync(object token, CancellationToken cancellationToken = default);
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Stores/IOpenIdApplicationStore.cs b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Stores/IOpenIdApplicationStore.cs
index 50ce9d5a108..e22a7b73ea4 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Stores/IOpenIdApplicationStore.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Stores/IOpenIdApplicationStore.cs
@@ -4,15 +4,14 @@
 using System.Threading.Tasks;
 using OpenIddict.Abstractions;
 
-namespace OrchardCore.OpenId.Abstractions.Stores
+namespace OrchardCore.OpenId.Abstractions.Stores;
+
+public interface IOpenIdApplicationStore<TApplication> : IOpenIddictApplicationStore<TApplication> where TApplication : class
 {
-    public interface IOpenIdApplicationStore<TApplication> : IOpenIddictApplicationStore<TApplication> where TApplication : class
-    {
-        ValueTask<TApplication> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken);
-        ValueTask<string> GetPhysicalIdAsync(TApplication application, CancellationToken cancellationToken);
+    ValueTask<TApplication> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken);
+    ValueTask<string> GetPhysicalIdAsync(TApplication application, CancellationToken cancellationToken);
 
-        ValueTask<ImmutableArray<string>> GetRolesAsync(TApplication application, CancellationToken cancellationToken);
-        IAsyncEnumerable<TApplication> ListInRoleAsync(string role, CancellationToken cancellationToken);
-        ValueTask SetRolesAsync(TApplication application, ImmutableArray<string> roles, CancellationToken cancellationToken);
-    }
+    ValueTask<ImmutableArray<string>> GetRolesAsync(TApplication application, CancellationToken cancellationToken);
+    IAsyncEnumerable<TApplication> ListInRoleAsync(string role, CancellationToken cancellationToken);
+    ValueTask SetRolesAsync(TApplication application, ImmutableArray<string> roles, CancellationToken cancellationToken);
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Stores/IOpenIdAuthorizationStore.cs b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Stores/IOpenIdAuthorizationStore.cs
index 52216beb0e5..1fa62a97e72 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Stores/IOpenIdAuthorizationStore.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Stores/IOpenIdAuthorizationStore.cs
@@ -2,11 +2,10 @@
 using System.Threading.Tasks;
 using OpenIddict.Abstractions;
 
-namespace OrchardCore.OpenId.Abstractions.Stores
+namespace OrchardCore.OpenId.Abstractions.Stores;
+
+public interface IOpenIdAuthorizationStore<TAuthorization> : IOpenIddictAuthorizationStore<TAuthorization> where TAuthorization : class
 {
-    public interface IOpenIdAuthorizationStore<TAuthorization> : IOpenIddictAuthorizationStore<TAuthorization> where TAuthorization : class
-    {
-        ValueTask<TAuthorization> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken);
-        ValueTask<string> GetPhysicalIdAsync(TAuthorization authorization, CancellationToken cancellationToken);
-    }
+    ValueTask<TAuthorization> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken);
+    ValueTask<string> GetPhysicalIdAsync(TAuthorization authorization, CancellationToken cancellationToken);
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Stores/IOpenIdScopeStore.cs b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Stores/IOpenIdScopeStore.cs
index 0cce5089dd7..38c13d89469 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Stores/IOpenIdScopeStore.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Stores/IOpenIdScopeStore.cs
@@ -2,11 +2,10 @@
 using System.Threading.Tasks;
 using OpenIddict.Abstractions;
 
-namespace OrchardCore.OpenId.Abstractions.Stores
+namespace OrchardCore.OpenId.Abstractions.Stores;
+
+public interface IOpenIdScopeStore<TScope> : IOpenIddictScopeStore<TScope> where TScope : class
 {
-    public interface IOpenIdScopeStore<TScope> : IOpenIddictScopeStore<TScope> where TScope : class
-    {
-        ValueTask<TScope> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken);
-        ValueTask<string> GetPhysicalIdAsync(TScope scope, CancellationToken cancellationToken);
-    }
+    ValueTask<TScope> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken);
+    ValueTask<string> GetPhysicalIdAsync(TScope scope, CancellationToken cancellationToken);
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Stores/IOpenIdTokenStore.cs b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Stores/IOpenIdTokenStore.cs
index 292c9930265..8f3d8046543 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Stores/IOpenIdTokenStore.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/Abstractions/Stores/IOpenIdTokenStore.cs
@@ -2,11 +2,10 @@
 using System.Threading.Tasks;
 using OpenIddict.Abstractions;
 
-namespace OrchardCore.OpenId.Abstractions.Stores
+namespace OrchardCore.OpenId.Abstractions.Stores;
+
+public interface IOpenIdTokenStore<TToken> : IOpenIddictTokenStore<TToken> where TToken : class
 {
-    public interface IOpenIdTokenStore<TToken> : IOpenIddictTokenStore<TToken> where TToken : class
-    {
-        ValueTask<TToken> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken);
-        ValueTask<string> GetPhysicalIdAsync(TToken token, CancellationToken cancellationToken);
-    }
+    ValueTask<TToken> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken);
+    ValueTask<string> GetPhysicalIdAsync(TToken token, CancellationToken cancellationToken);
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/OpenIdConstants.cs b/src/OrchardCore/OrchardCore.OpenId.Core/OpenIdConstants.cs
index 28129418c3f..a6e409440ff 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/OpenIdConstants.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/OpenIdConstants.cs
@@ -1,35 +1,34 @@
-namespace OrchardCore.OpenId
+namespace OrchardCore.OpenId;
+
+public static class OpenIdConstants
 {
-    public static class OpenIdConstants
+    public static class Claims
     {
-        public static class Claims
-        {
-            public const string EntityType = "oc:entyp";
-        }
+        public const string EntityType = "oc:entyp";
+    }
 
-        public static class EntityTypes
-        {
-            public const string Application = "application";
-            public const string User = "user";
-        }
+    public static class EntityTypes
+    {
+        public const string Application = "application";
+        public const string User = "user";
+    }
 
-        public static class Features
-        {
-            public const string Client = "OrchardCore.OpenId.Client";
-            public const string Core = "OrchardCore.OpenId";
-            public const string Management = "OrchardCore.OpenId.Management";
-            public const string Server = "OrchardCore.OpenId.Server";
-            public const string Validation = "OrchardCore.OpenId.Validation";
-        }
+    public static class Features
+    {
+        public const string Client = "OrchardCore.OpenId.Client";
+        public const string Core = "OrchardCore.OpenId";
+        public const string Management = "OrchardCore.OpenId.Management";
+        public const string Server = "OrchardCore.OpenId.Server";
+        public const string Validation = "OrchardCore.OpenId.Validation";
+    }
 
-        public static class Prefixes
-        {
-            public const string Tenant = "oct:";
-        }
+    public static class Prefixes
+    {
+        public const string Tenant = "oct:";
+    }
 
-        public static class Properties
-        {
-            public const string Roles = "Roles";
-        }
+    public static class Properties
+    {
+        public const string Roles = "Roles";
     }
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/OpenIdExtensions.cs b/src/OrchardCore/OrchardCore.OpenId.Core/OpenIdExtensions.cs
index d42c7d0192d..7b3801b7e82 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/OpenIdExtensions.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/OpenIdExtensions.cs
@@ -12,80 +12,79 @@
 using OrchardCore.OpenId.YesSql.Stores;
 using YesSql.Indexes;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class OpenIdExtensions
 {
-    public static class OpenIdExtensions
+    public static OpenIddictCoreBuilder AddOrchardMigrations(this OpenIddictCoreBuilder builder)
     {
-        public static OpenIddictCoreBuilder AddOrchardMigrations(this OpenIddictCoreBuilder builder)
-        {
-            ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(builder);
 
-            builder.Services.TryAddEnumerable(
-                ServiceDescriptor.Scoped<IDataMigration, OpenIdMigrations>());
+        builder.Services.TryAddEnumerable(
+            ServiceDescriptor.Scoped<IDataMigration, OpenIdMigrations>());
 
-            // Configure support for an OpenId collection.
-            builder.Services.Configure<StoreCollectionOptions>(o => o.Collections.Add("OpenId"));
+        // Configure support for an OpenId collection.
+        builder.Services.Configure<StoreCollectionOptions>(o => o.Collections.Add("OpenId"));
 
-            return builder;
-        }
+        return builder;
+    }
 
-        public static OpenIddictCoreBuilder UseOrchardManagers(this OpenIddictCoreBuilder builder)
-        {
-            ArgumentNullException.ThrowIfNull(builder);
+    public static OpenIddictCoreBuilder UseOrchardManagers(this OpenIddictCoreBuilder builder)
+    {
+        ArgumentNullException.ThrowIfNull(builder);
 
-            builder.ReplaceApplicationManager(typeof(OpenIdApplicationManager<>))
-                   .ReplaceAuthorizationManager(typeof(OpenIdAuthorizationManager<>))
-                   .ReplaceScopeManager(typeof(OpenIdScopeManager<>))
-                   .ReplaceTokenManager(typeof(OpenIdTokenManager<>));
+        builder.ReplaceApplicationManager(typeof(OpenIdApplicationManager<>))
+               .ReplaceAuthorizationManager(typeof(OpenIdAuthorizationManager<>))
+               .ReplaceScopeManager(typeof(OpenIdScopeManager<>))
+               .ReplaceTokenManager(typeof(OpenIdTokenManager<>));
 
-            // Register proxy delegates so that the Orchard managers can be directly
-            // resolved from the DI using the non-generic, Orchard-specific interfaces.
-            builder.Services.TryAddScoped(provider => (IOpenIdApplicationManager)provider.GetRequiredService<IOpenIddictApplicationManager>());
-            builder.Services.TryAddScoped(provider => (IOpenIdAuthorizationManager)provider.GetRequiredService<IOpenIddictAuthorizationManager>());
-            builder.Services.TryAddScoped(provider => (IOpenIdScopeManager)provider.GetRequiredService<IOpenIddictScopeManager>());
-            builder.Services.TryAddScoped(provider => (IOpenIdTokenManager)provider.GetRequiredService<IOpenIddictTokenManager>());
+        // Register proxy delegates so that the Orchard managers can be directly
+        // resolved from the DI using the non-generic, Orchard-specific interfaces.
+        builder.Services.TryAddScoped(provider => (IOpenIdApplicationManager)provider.GetRequiredService<IOpenIddictApplicationManager>());
+        builder.Services.TryAddScoped(provider => (IOpenIdAuthorizationManager)provider.GetRequiredService<IOpenIddictAuthorizationManager>());
+        builder.Services.TryAddScoped(provider => (IOpenIdScopeManager)provider.GetRequiredService<IOpenIddictScopeManager>());
+        builder.Services.TryAddScoped(provider => (IOpenIdTokenManager)provider.GetRequiredService<IOpenIddictTokenManager>());
 
-            return builder;
-        }
+        return builder;
+    }
 
-        public static OpenIddictCoreBuilder UseYesSql(this OpenIddictCoreBuilder builder)
+    public static OpenIddictCoreBuilder UseYesSql(this OpenIddictCoreBuilder builder)
+    {
+        ArgumentNullException.ThrowIfNull(builder);
+
+        // Since the YesSql stores may be used with databases performing case-insensitive or
+        // culture-sensitive comparisons, ensure the additional filtering logic is enforced
+        // in case case-sensitive stores were registered before this extension was called.
+        builder.Configure(options => options.DisableAdditionalFiltering = false);
+
+        builder.SetDefaultApplicationEntity<OpenIdApplication>()
+               .SetDefaultAuthorizationEntity<OpenIdAuthorization>()
+               .SetDefaultScopeEntity<OpenIdScope>()
+               .SetDefaultTokenEntity<OpenIdToken>();
+
+        builder.ReplaceApplicationStoreResolver<OpenIdApplicationStoreResolver>()
+               .ReplaceAuthorizationStoreResolver<OpenIdAuthorizationStoreResolver>()
+               .ReplaceScopeStoreResolver<OpenIdScopeStoreResolver>()
+               .ReplaceTokenStoreResolver<OpenIdTokenStoreResolver>();
+
+        builder.Services.TryAddSingleton<OpenIdApplicationStoreResolver.TypeResolutionCache>();
+        builder.Services.TryAddSingleton<OpenIdAuthorizationStoreResolver.TypeResolutionCache>();
+        builder.Services.TryAddSingleton<OpenIdScopeStoreResolver.TypeResolutionCache>();
+        builder.Services.TryAddSingleton<OpenIdTokenStoreResolver.TypeResolutionCache>();
+
+        builder.Services.TryAddScoped(typeof(OpenIdApplicationStore<>));
+        builder.Services.TryAddScoped(typeof(OpenIdAuthorizationStore<>));
+        builder.Services.TryAddScoped(typeof(OpenIdScopeStore<>));
+        builder.Services.TryAddScoped(typeof(OpenIdTokenStore<>));
+
+        builder.Services.TryAddEnumerable(new[]
         {
-            ArgumentNullException.ThrowIfNull(builder);
-
-            // Since the YesSql stores may be used with databases performing case-insensitive or
-            // culture-sensitive comparisons, ensure the additional filtering logic is enforced
-            // in case case-sensitive stores were registered before this extension was called.
-            builder.Configure(options => options.DisableAdditionalFiltering = false);
-
-            builder.SetDefaultApplicationEntity<OpenIdApplication>()
-                   .SetDefaultAuthorizationEntity<OpenIdAuthorization>()
-                   .SetDefaultScopeEntity<OpenIdScope>()
-                   .SetDefaultTokenEntity<OpenIdToken>();
-
-            builder.ReplaceApplicationStoreResolver<OpenIdApplicationStoreResolver>()
-                   .ReplaceAuthorizationStoreResolver<OpenIdAuthorizationStoreResolver>()
-                   .ReplaceScopeStoreResolver<OpenIdScopeStoreResolver>()
-                   .ReplaceTokenStoreResolver<OpenIdTokenStoreResolver>();
-
-            builder.Services.TryAddSingleton<OpenIdApplicationStoreResolver.TypeResolutionCache>();
-            builder.Services.TryAddSingleton<OpenIdAuthorizationStoreResolver.TypeResolutionCache>();
-            builder.Services.TryAddSingleton<OpenIdScopeStoreResolver.TypeResolutionCache>();
-            builder.Services.TryAddSingleton<OpenIdTokenStoreResolver.TypeResolutionCache>();
-
-            builder.Services.TryAddScoped(typeof(OpenIdApplicationStore<>));
-            builder.Services.TryAddScoped(typeof(OpenIdAuthorizationStore<>));
-            builder.Services.TryAddScoped(typeof(OpenIdScopeStore<>));
-            builder.Services.TryAddScoped(typeof(OpenIdTokenStore<>));
-
-            builder.Services.TryAddEnumerable(new[]
-            {
-                ServiceDescriptor.Singleton<IIndexProvider, OpenIdApplicationIndexProvider>(),
-                ServiceDescriptor.Singleton<IIndexProvider, OpenIdAuthorizationIndexProvider>(),
-                ServiceDescriptor.Singleton<IIndexProvider, OpenIdScopeIndexProvider>(),
-                ServiceDescriptor.Singleton<IIndexProvider, OpenIdTokenIndexProvider>()
-            });
-
-            return builder;
-        }
+            ServiceDescriptor.Singleton<IIndexProvider, OpenIdApplicationIndexProvider>(),
+            ServiceDescriptor.Singleton<IIndexProvider, OpenIdAuthorizationIndexProvider>(),
+            ServiceDescriptor.Singleton<IIndexProvider, OpenIdScopeIndexProvider>(),
+            ServiceDescriptor.Singleton<IIndexProvider, OpenIdTokenIndexProvider>()
+        });
+
+        return builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdApplicationManager.cs b/src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdApplicationManager.cs
index 9d4e052c98f..a8b1ec9441a 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdApplicationManager.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdApplicationManager.cs
@@ -14,228 +14,227 @@
 using OrchardCore.OpenId.Abstractions.Managers;
 using OrchardCore.OpenId.Abstractions.Stores;
 
-namespace OrchardCore.OpenId.Services.Managers
+namespace OrchardCore.OpenId.Services.Managers;
+
+public class OpenIdApplicationManager<TApplication> : OpenIddictApplicationManager<TApplication>,
+    IOpenIdApplicationManager where TApplication : class
 {
-    public class OpenIdApplicationManager<TApplication> : OpenIddictApplicationManager<TApplication>,
-        IOpenIdApplicationManager where TApplication : class
+    public OpenIdApplicationManager(
+        IOpenIddictApplicationCache<TApplication> cache,
+        ILogger<OpenIdApplicationManager<TApplication>> logger,
+        IOptionsMonitor<OpenIddictCoreOptions> options,
+        IOpenIddictApplicationStoreResolver resolver)
+        : base(cache, logger, options, resolver)
+    {
+    }
+
+    /// <summary>
+    /// Retrieves an application using its physical identifier.
+    /// </summary>
+    /// <param name="identifier">The unique identifier associated with the application.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
+    /// <returns>
+    /// A <see cref="ValueTask{TResult}"/> that can be used to monitor the asynchronous operation,
+    /// whose result returns the client application corresponding to the identifier.
+    /// </returns>
+    public virtual ValueTask<TApplication> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken = default)
     {
-        public OpenIdApplicationManager(
-            IOpenIddictApplicationCache<TApplication> cache,
-            ILogger<OpenIdApplicationManager<TApplication>> logger,
-            IOptionsMonitor<OpenIddictCoreOptions> options,
-            IOpenIddictApplicationStoreResolver resolver)
-            : base(cache, logger, options, resolver)
+        if (string.IsNullOrEmpty(identifier))
         {
+            throw new ArgumentException("The identifier cannot be null or empty.", nameof(identifier));
         }
 
-        /// <summary>
-        /// Retrieves an application using its physical identifier.
-        /// </summary>
-        /// <param name="identifier">The unique identifier associated with the application.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
-        /// <returns>
-        /// A <see cref="ValueTask{TResult}"/> that can be used to monitor the asynchronous operation,
-        /// whose result returns the client application corresponding to the identifier.
-        /// </returns>
-        public virtual ValueTask<TApplication> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken = default)
-        {
-            if (string.IsNullOrEmpty(identifier))
-            {
-                throw new ArgumentException("The identifier cannot be null or empty.", nameof(identifier));
-            }
+        return Store is IOpenIdApplicationStore<TApplication> store ?
+            store.FindByPhysicalIdAsync(identifier, cancellationToken) :
+            Store.FindByIdAsync(identifier, cancellationToken);
+    }
 
-            return Store is IOpenIdApplicationStore<TApplication> store ?
-                store.FindByPhysicalIdAsync(identifier, cancellationToken) :
-                Store.FindByIdAsync(identifier, cancellationToken);
-        }
+    /// <summary>
+    /// Retrieves the physical identifier associated with an application.
+    /// </summary>
+    /// <param name="application">The application.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
+    /// <returns>
+    /// A <see cref="ValueTask{TResult}"/> that can be used to monitor the asynchronous operation,
+    /// whose result returns the physical identifier associated with the application.
+    /// </returns>
+    public virtual ValueTask<string> GetPhysicalIdAsync(TApplication application, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-        /// <summary>
-        /// Retrieves the physical identifier associated with an application.
-        /// </summary>
-        /// <param name="application">The application.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
-        /// <returns>
-        /// A <see cref="ValueTask{TResult}"/> that can be used to monitor the asynchronous operation,
-        /// whose result returns the physical identifier associated with the application.
-        /// </returns>
-        public virtual ValueTask<string> GetPhysicalIdAsync(TApplication application, CancellationToken cancellationToken = default)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+        return Store is IOpenIdApplicationStore<TApplication> store ?
+            store.GetPhysicalIdAsync(application, cancellationToken) :
+            Store.GetIdAsync(application, cancellationToken);
+    }
 
-            return Store is IOpenIdApplicationStore<TApplication> store ?
-                store.GetPhysicalIdAsync(application, cancellationToken) :
-                Store.GetIdAsync(application, cancellationToken);
-        }
+    public virtual async ValueTask<ImmutableArray<string>> GetRolesAsync(
+        TApplication application, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-        public virtual async ValueTask<ImmutableArray<string>> GetRolesAsync(
-            TApplication application, CancellationToken cancellationToken = default)
+        if (Store is IOpenIdApplicationStore<TApplication> store)
         {
-            ArgumentNullException.ThrowIfNull(application);
-
-            if (Store is IOpenIdApplicationStore<TApplication> store)
-            {
-                return await store.GetRolesAsync(application, cancellationToken);
-            }
-            else
+            return await store.GetRolesAsync(application, cancellationToken);
+        }
+        else
+        {
+            var properties = await Store.GetPropertiesAsync(application, cancellationToken);
+            if (properties.TryGetValue(OpenIdConstants.Properties.Roles, out var value))
             {
-                var properties = await Store.GetPropertiesAsync(application, cancellationToken);
-                if (properties.TryGetValue(OpenIdConstants.Properties.Roles, out var value))
-                {
-                    var builder = ImmutableArray.CreateBuilder<string>();
-
-                    foreach (var item in value.EnumerateArray())
-                    {
-                        builder.Add(item.GetString());
-                    }
+                var builder = ImmutableArray.CreateBuilder<string>();
 
-                    return builder.ToImmutable();
+                foreach (var item in value.EnumerateArray())
+                {
+                    builder.Add(item.GetString());
                 }
 
-                return [];
+                return builder.ToImmutable();
             }
+
+            return [];
         }
+    }
 
-        public virtual IAsyncEnumerable<TApplication> ListInRoleAsync(
-            string role, CancellationToken cancellationToken = default)
+    public virtual IAsyncEnumerable<TApplication> ListInRoleAsync(
+        string role, CancellationToken cancellationToken = default)
+    {
+        if (string.IsNullOrEmpty(role))
         {
-            if (string.IsNullOrEmpty(role))
-            {
-                throw new ArgumentException("The role name cannot be null or empty.", nameof(role));
-            }
+            throw new ArgumentException("The role name cannot be null or empty.", nameof(role));
+        }
 
-            if (Store is IOpenIdApplicationStore<TApplication> store)
-            {
-                return store.ListInRoleAsync(role, cancellationToken);
-            }
+        if (Store is IOpenIdApplicationStore<TApplication> store)
+        {
+            return store.ListInRoleAsync(role, cancellationToken);
+        }
 
-            return ExecuteAsync();
+        return ExecuteAsync();
 
-            async IAsyncEnumerable<TApplication> ExecuteAsync()
+        async IAsyncEnumerable<TApplication> ExecuteAsync()
+        {
+            for (var offset = 0; ; offset += 1_000)
             {
-                for (var offset = 0; ; offset += 1_000)
+                await foreach (var application in Store.ListAsync(1_000, offset, cancellationToken))
                 {
-                    await foreach (var application in Store.ListAsync(1_000, offset, cancellationToken))
+                    var roles = await GetRolesAsync(application, cancellationToken);
+                    if (roles.Contains(role, StringComparer.OrdinalIgnoreCase))
                     {
-                        var roles = await GetRolesAsync(application, cancellationToken);
-                        if (roles.Contains(role, StringComparer.OrdinalIgnoreCase))
-                        {
-                            yield return application;
-                        }
+                        yield return application;
                     }
                 }
             }
         }
+    }
 
-        public virtual async ValueTask SetRolesAsync(TApplication application,
-            ImmutableArray<string> roles, CancellationToken cancellationToken = default)
+    public virtual async ValueTask SetRolesAsync(TApplication application,
+        ImmutableArray<string> roles, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(application);
+
+        if (roles.Any(role => string.IsNullOrEmpty(role)))
         {
-            ArgumentNullException.ThrowIfNull(application);
+            throw new ArgumentException("Role names cannot be null or empty.", nameof(roles));
+        }
 
-            if (roles.Any(role => string.IsNullOrEmpty(role)))
-            {
-                throw new ArgumentException("Role names cannot be null or empty.", nameof(roles));
-            }
+        if (Store is IOpenIdApplicationStore<TApplication> store)
+        {
+            await store.SetRolesAsync(application, roles, cancellationToken);
+        }
+        else
+        {
+            var properties = await Store.GetPropertiesAsync(application, cancellationToken);
+            properties = properties.SetItem(OpenIdConstants.Properties.Roles,
+                JsonSerializer.SerializeToElement(roles, JOptions.UnsafeRelaxedJsonEscaping));
+
+            await Store.SetPropertiesAsync(application, properties, cancellationToken);
+        }
+
+        await UpdateAsync(application, cancellationToken);
+    }
+
+    public override async ValueTask PopulateAsync(TApplication application,
+        OpenIddictApplicationDescriptor descriptor, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
+        ArgumentNullException.ThrowIfNull(descriptor);
+
+        // Note: this method MUST be called first before applying any change to the untyped
+        // properties bag to ensure the base method doesn't override the added properties.
+        await base.PopulateAsync(application, descriptor, cancellationToken);
+
+        if (descriptor is OpenIdApplicationDescriptor model)
+        {
+            // If the underlying store is an Orchard implementation that natively supports roles,
+            // use the corresponding API. Otherwise, store the roles in the untyped properties bag.
             if (Store is IOpenIdApplicationStore<TApplication> store)
             {
-                await store.SetRolesAsync(application, roles, cancellationToken);
+                await store.SetRolesAsync(application, model.Roles.ToImmutableArray(), cancellationToken);
             }
             else
             {
                 var properties = await Store.GetPropertiesAsync(application, cancellationToken);
                 properties = properties.SetItem(OpenIdConstants.Properties.Roles,
-                    JsonSerializer.SerializeToElement(roles, JOptions.UnsafeRelaxedJsonEscaping));
+                    JsonSerializer.SerializeToElement(model.Roles, JOptions.UnsafeRelaxedJsonEscaping));
 
                 await Store.SetPropertiesAsync(application, properties, cancellationToken);
             }
-
-            await UpdateAsync(application, cancellationToken);
         }
+    }
 
-        public override async ValueTask PopulateAsync(TApplication application,
-            OpenIddictApplicationDescriptor descriptor, CancellationToken cancellationToken = default)
-        {
-            ArgumentNullException.ThrowIfNull(application);
-
-            ArgumentNullException.ThrowIfNull(descriptor);
-
-            // Note: this method MUST be called first before applying any change to the untyped
-            // properties bag to ensure the base method doesn't override the added properties.
-            await base.PopulateAsync(application, descriptor, cancellationToken);
+    public override async ValueTask PopulateAsync(OpenIddictApplicationDescriptor descriptor,
+        TApplication application, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(descriptor);
 
-            if (descriptor is OpenIdApplicationDescriptor model)
-            {
-                // If the underlying store is an Orchard implementation that natively supports roles,
-                // use the corresponding API. Otherwise, store the roles in the untyped properties bag.
-                if (Store is IOpenIdApplicationStore<TApplication> store)
-                {
-                    await store.SetRolesAsync(application, model.Roles.ToImmutableArray(), cancellationToken);
-                }
-                else
-                {
-                    var properties = await Store.GetPropertiesAsync(application, cancellationToken);
-                    properties = properties.SetItem(OpenIdConstants.Properties.Roles,
-                        JsonSerializer.SerializeToElement(model.Roles, JOptions.UnsafeRelaxedJsonEscaping));
+        ArgumentNullException.ThrowIfNull(application);
 
-                    await Store.SetPropertiesAsync(application, properties, cancellationToken);
-                }
-            }
-        }
+        await base.PopulateAsync(descriptor, application, cancellationToken);
 
-        public override async ValueTask PopulateAsync(OpenIddictApplicationDescriptor descriptor,
-            TApplication application, CancellationToken cancellationToken = default)
+        if (descriptor is OpenIdApplicationDescriptor model)
         {
-            ArgumentNullException.ThrowIfNull(descriptor);
+            model.Roles.UnionWith(await GetRolesAsync(application, cancellationToken));
+        }
+    }
 
-            ArgumentNullException.ThrowIfNull(application);
+    public override IAsyncEnumerable<ValidationResult> ValidateAsync(
+        TApplication application, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-            await base.PopulateAsync(descriptor, application, cancellationToken);
+        return ExecuteAsync();
 
-            if (descriptor is OpenIdApplicationDescriptor model)
+        async IAsyncEnumerable<ValidationResult> ExecuteAsync()
+        {
+            await foreach (var result in base.ValidateAsync(application, cancellationToken))
             {
-                model.Roles.UnionWith(await GetRolesAsync(application, cancellationToken));
+                yield return result;
             }
-        }
 
-        public override IAsyncEnumerable<ValidationResult> ValidateAsync(
-            TApplication application, CancellationToken cancellationToken = default)
-        {
-            ArgumentNullException.ThrowIfNull(application);
-
-            return ExecuteAsync();
-
-            async IAsyncEnumerable<ValidationResult> ExecuteAsync()
+            foreach (var role in await GetRolesAsync(application, cancellationToken))
             {
-                await foreach (var result in base.ValidateAsync(application, cancellationToken))
-                {
-                    yield return result;
-                }
-
-                foreach (var role in await GetRolesAsync(application, cancellationToken))
+                if (string.IsNullOrEmpty(role))
                 {
-                    if (string.IsNullOrEmpty(role))
-                    {
-                        yield return new ValidationResult("Roles cannot be null or empty.");
+                    yield return new ValidationResult("Roles cannot be null or empty.");
 
-                        break;
-                    }
+                    break;
                 }
             }
         }
+    }
 
-        async ValueTask<object> IOpenIdApplicationManager.FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken)
-            => await FindByPhysicalIdAsync(identifier, cancellationToken);
+    async ValueTask<object> IOpenIdApplicationManager.FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken)
+        => await FindByPhysicalIdAsync(identifier, cancellationToken);
 
-        ValueTask<string> IOpenIdApplicationManager.GetPhysicalIdAsync(object application, CancellationToken cancellationToken)
-            => GetPhysicalIdAsync((TApplication)application, cancellationToken);
+    ValueTask<string> IOpenIdApplicationManager.GetPhysicalIdAsync(object application, CancellationToken cancellationToken)
+        => GetPhysicalIdAsync((TApplication)application, cancellationToken);
 
-        ValueTask<ImmutableArray<string>> IOpenIdApplicationManager.GetRolesAsync(object application, CancellationToken cancellationToken)
-            => GetRolesAsync((TApplication)application, cancellationToken);
+    ValueTask<ImmutableArray<string>> IOpenIdApplicationManager.GetRolesAsync(object application, CancellationToken cancellationToken)
+        => GetRolesAsync((TApplication)application, cancellationToken);
 
-        IAsyncEnumerable<object> IOpenIdApplicationManager.ListInRoleAsync(string role, CancellationToken cancellationToken)
-            => ListInRoleAsync(role, cancellationToken);
+    IAsyncEnumerable<object> IOpenIdApplicationManager.ListInRoleAsync(string role, CancellationToken cancellationToken)
+        => ListInRoleAsync(role, cancellationToken);
 
-        ValueTask IOpenIdApplicationManager.SetRolesAsync(object application, ImmutableArray<string> roles, CancellationToken cancellationToken)
-            => SetRolesAsync((TApplication)application, roles, cancellationToken);
-    }
+    ValueTask IOpenIdApplicationManager.SetRolesAsync(object application, ImmutableArray<string> roles, CancellationToken cancellationToken)
+        => SetRolesAsync((TApplication)application, roles, cancellationToken);
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdAuthorizationManager.cs b/src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdAuthorizationManager.cs
index 6c6e567f289..c643565f10c 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdAuthorizationManager.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdAuthorizationManager.cs
@@ -8,63 +8,62 @@
 using OrchardCore.OpenId.Abstractions.Managers;
 using OrchardCore.OpenId.Abstractions.Stores;
 
-namespace OrchardCore.OpenId.Services.Managers
+namespace OrchardCore.OpenId.Services.Managers;
+
+public class OpenIdAuthorizationManager<TAuthorization> : OpenIddictAuthorizationManager<TAuthorization>,
+    IOpenIdAuthorizationManager where TAuthorization : class
 {
-    public class OpenIdAuthorizationManager<TAuthorization> : OpenIddictAuthorizationManager<TAuthorization>,
-        IOpenIdAuthorizationManager where TAuthorization : class
+    public OpenIdAuthorizationManager(
+        IOpenIddictAuthorizationCache<TAuthorization> cache,
+        ILogger<OpenIddictAuthorizationManager<TAuthorization>> logger,
+        IOptionsMonitor<OpenIddictCoreOptions> options,
+        IOpenIddictAuthorizationStoreResolver resolver)
+        : base(cache, logger, options, resolver)
     {
-        public OpenIdAuthorizationManager(
-            IOpenIddictAuthorizationCache<TAuthorization> cache,
-            ILogger<OpenIddictAuthorizationManager<TAuthorization>> logger,
-            IOptionsMonitor<OpenIddictCoreOptions> options,
-            IOpenIddictAuthorizationStoreResolver resolver)
-            : base(cache, logger, options, resolver)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Retrieves an authorization using its physical identifier.
-        /// </summary>
-        /// <param name="identifier">The unique identifier associated with the authorization.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
-        /// <returns>
-        /// A <see cref="ValueTask{TResult}"/> that can be used to monitor the asynchronous operation,
-        /// whose result returns the authorization corresponding to the identifier.
-        /// </returns>
-        public virtual ValueTask<TAuthorization> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken = default)
+    /// <summary>
+    /// Retrieves an authorization using its physical identifier.
+    /// </summary>
+    /// <param name="identifier">The unique identifier associated with the authorization.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
+    /// <returns>
+    /// A <see cref="ValueTask{TResult}"/> that can be used to monitor the asynchronous operation,
+    /// whose result returns the authorization corresponding to the identifier.
+    /// </returns>
+    public virtual ValueTask<TAuthorization> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken = default)
+    {
+        if (string.IsNullOrEmpty(identifier))
         {
-            if (string.IsNullOrEmpty(identifier))
-            {
-                throw new ArgumentException("The identifier cannot be null or empty.", nameof(identifier));
-            }
-
-            return Store is IOpenIdApplicationStore<TAuthorization> store ?
-                store.FindByPhysicalIdAsync(identifier, cancellationToken) :
-                Store.FindByIdAsync(identifier, cancellationToken);
+            throw new ArgumentException("The identifier cannot be null or empty.", nameof(identifier));
         }
 
-        /// <summary>
-        /// Retrieves the physical identifier associated with an authorization.
-        /// </summary>
-        /// <param name="authorization">The authorization.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
-        /// <returns>
-        /// A <see cref="ValueTask{TResult}"/> that can be used to monitor the asynchronous operation,
-        /// whose result returns the physical identifier associated with the authorization.
-        /// </returns>
-        public virtual ValueTask<string> GetPhysicalIdAsync(TAuthorization authorization, CancellationToken cancellationToken = default)
-        {
-            ArgumentNullException.ThrowIfNull(authorization);
-
-            return Store is IOpenIdAuthorizationStore<TAuthorization> store ?
-                store.GetPhysicalIdAsync(authorization, cancellationToken) :
-                Store.GetIdAsync(authorization, cancellationToken);
-        }
+        return Store is IOpenIdApplicationStore<TAuthorization> store ?
+            store.FindByPhysicalIdAsync(identifier, cancellationToken) :
+            Store.FindByIdAsync(identifier, cancellationToken);
+    }
 
-        async ValueTask<object> IOpenIdAuthorizationManager.FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken)
-            => await FindByPhysicalIdAsync(identifier, cancellationToken);
+    /// <summary>
+    /// Retrieves the physical identifier associated with an authorization.
+    /// </summary>
+    /// <param name="authorization">The authorization.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
+    /// <returns>
+    /// A <see cref="ValueTask{TResult}"/> that can be used to monitor the asynchronous operation,
+    /// whose result returns the physical identifier associated with the authorization.
+    /// </returns>
+    public virtual ValueTask<string> GetPhysicalIdAsync(TAuthorization authorization, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
 
-        ValueTask<string> IOpenIdAuthorizationManager.GetPhysicalIdAsync(object authorization, CancellationToken cancellationToken)
-            => GetPhysicalIdAsync((TAuthorization)authorization, cancellationToken);
+        return Store is IOpenIdAuthorizationStore<TAuthorization> store ?
+            store.GetPhysicalIdAsync(authorization, cancellationToken) :
+            Store.GetIdAsync(authorization, cancellationToken);
     }
+
+    async ValueTask<object> IOpenIdAuthorizationManager.FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken)
+        => await FindByPhysicalIdAsync(identifier, cancellationToken);
+
+    ValueTask<string> IOpenIdAuthorizationManager.GetPhysicalIdAsync(object authorization, CancellationToken cancellationToken)
+        => GetPhysicalIdAsync((TAuthorization)authorization, cancellationToken);
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdScopeManager.cs b/src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdScopeManager.cs
index eab3ec1b16c..70edf125ae5 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdScopeManager.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdScopeManager.cs
@@ -8,62 +8,61 @@
 using OrchardCore.OpenId.Abstractions.Managers;
 using OrchardCore.OpenId.Abstractions.Stores;
 
-namespace OrchardCore.OpenId.Services.Managers
+namespace OrchardCore.OpenId.Services.Managers;
+
+public class OpenIdScopeManager<TScope> : OpenIddictScopeManager<TScope>, IOpenIdScopeManager where TScope : class
 {
-    public class OpenIdScopeManager<TScope> : OpenIddictScopeManager<TScope>, IOpenIdScopeManager where TScope : class
+    public OpenIdScopeManager(
+        IOpenIddictScopeCache<TScope> cache,
+        ILogger<OpenIddictScopeManager<TScope>> logger,
+        IOptionsMonitor<OpenIddictCoreOptions> options,
+        IOpenIddictScopeStoreResolver resolver)
+        : base(cache, logger, options, resolver)
     {
-        public OpenIdScopeManager(
-            IOpenIddictScopeCache<TScope> cache,
-            ILogger<OpenIddictScopeManager<TScope>> logger,
-            IOptionsMonitor<OpenIddictCoreOptions> options,
-            IOpenIddictScopeStoreResolver resolver)
-            : base(cache, logger, options, resolver)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Retrieves a scope using its physical identifier.
-        /// </summary>
-        /// <param name="identifier">The physical identifier associated with the scope.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
-        /// <returns>
-        /// A <see cref="ValueTask{TResult}"/> that can be used to monitor the asynchronous operation,
-        /// whose result returns the scope corresponding to the identifier.
-        /// </returns>
-        public virtual ValueTask<TScope> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken = default)
+    /// <summary>
+    /// Retrieves a scope using its physical identifier.
+    /// </summary>
+    /// <param name="identifier">The physical identifier associated with the scope.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
+    /// <returns>
+    /// A <see cref="ValueTask{TResult}"/> that can be used to monitor the asynchronous operation,
+    /// whose result returns the scope corresponding to the identifier.
+    /// </returns>
+    public virtual ValueTask<TScope> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken = default)
+    {
+        if (string.IsNullOrEmpty(identifier))
         {
-            if (string.IsNullOrEmpty(identifier))
-            {
-                throw new ArgumentException("The identifier cannot be null or empty.", nameof(identifier));
-            }
-
-            return Store is IOpenIdScopeStore<TScope> store ?
-                store.FindByPhysicalIdAsync(identifier, cancellationToken) :
-                Store.FindByIdAsync(identifier, cancellationToken);
+            throw new ArgumentException("The identifier cannot be null or empty.", nameof(identifier));
         }
 
-        /// <summary>
-        /// Retrieves the physical identifier associated with an authorization.
-        /// </summary>
-        /// <param name="scope">The scope.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
-        /// <returns>
-        /// A <see cref="ValueTask{TResult}"/> that can be used to monitor the asynchronous operation,
-        /// whose result returns the physical identifier associated with the authorization.
-        /// </returns>
-        public virtual ValueTask<string> GetPhysicalIdAsync(TScope scope, CancellationToken cancellationToken = default)
-        {
-            ArgumentNullException.ThrowIfNull(scope);
-
-            return Store is IOpenIdScopeStore<TScope> store ?
-                store.GetPhysicalIdAsync(scope, cancellationToken) :
-                Store.GetIdAsync(scope, cancellationToken);
-        }
+        return Store is IOpenIdScopeStore<TScope> store ?
+            store.FindByPhysicalIdAsync(identifier, cancellationToken) :
+            Store.FindByIdAsync(identifier, cancellationToken);
+    }
 
-        async ValueTask<object> IOpenIdScopeManager.FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken)
-            => await FindByPhysicalIdAsync(identifier, cancellationToken);
+    /// <summary>
+    /// Retrieves the physical identifier associated with an authorization.
+    /// </summary>
+    /// <param name="scope">The scope.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
+    /// <returns>
+    /// A <see cref="ValueTask{TResult}"/> that can be used to monitor the asynchronous operation,
+    /// whose result returns the physical identifier associated with the authorization.
+    /// </returns>
+    public virtual ValueTask<string> GetPhysicalIdAsync(TScope scope, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
 
-        ValueTask<string> IOpenIdScopeManager.GetPhysicalIdAsync(object scope, CancellationToken cancellationToken)
-            => GetPhysicalIdAsync((TScope)scope, cancellationToken);
+        return Store is IOpenIdScopeStore<TScope> store ?
+            store.GetPhysicalIdAsync(scope, cancellationToken) :
+            Store.GetIdAsync(scope, cancellationToken);
     }
+
+    async ValueTask<object> IOpenIdScopeManager.FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken)
+        => await FindByPhysicalIdAsync(identifier, cancellationToken);
+
+    ValueTask<string> IOpenIdScopeManager.GetPhysicalIdAsync(object scope, CancellationToken cancellationToken)
+        => GetPhysicalIdAsync((TScope)scope, cancellationToken);
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdTokenManager.cs b/src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdTokenManager.cs
index 57f60a3c396..b00adf2f1bb 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdTokenManager.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdTokenManager.cs
@@ -8,62 +8,61 @@
 using OrchardCore.OpenId.Abstractions.Managers;
 using OrchardCore.OpenId.Abstractions.Stores;
 
-namespace OrchardCore.OpenId.Services.Managers
+namespace OrchardCore.OpenId.Services.Managers;
+
+public class OpenIdTokenManager<TToken> : OpenIddictTokenManager<TToken>, IOpenIdTokenManager where TToken : class
 {
-    public class OpenIdTokenManager<TToken> : OpenIddictTokenManager<TToken>, IOpenIdTokenManager where TToken : class
+    public OpenIdTokenManager(
+        IOpenIddictTokenCache<TToken> cache,
+        ILogger<OpenIddictTokenManager<TToken>> logger,
+        IOptionsMonitor<OpenIddictCoreOptions> options,
+        IOpenIddictTokenStoreResolver resolver)
+        : base(cache, logger, options, resolver)
     {
-        public OpenIdTokenManager(
-            IOpenIddictTokenCache<TToken> cache,
-            ILogger<OpenIddictTokenManager<TToken>> logger,
-            IOptionsMonitor<OpenIddictCoreOptions> options,
-            IOpenIddictTokenStoreResolver resolver)
-            : base(cache, logger, options, resolver)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Retrieves a token using its physical identifier.
-        /// </summary>
-        /// <param name="identifier">The physical identifier associated with the token.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
-        /// <returns>
-        /// A <see cref="ValueTask{TResult}"/> that can be used to monitor the asynchronous operation,
-        /// whose result returns the token corresponding to the physical identifier.
-        /// </returns>
-        public virtual ValueTask<TToken> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken = default)
+    /// <summary>
+    /// Retrieves a token using its physical identifier.
+    /// </summary>
+    /// <param name="identifier">The physical identifier associated with the token.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
+    /// <returns>
+    /// A <see cref="ValueTask{TResult}"/> that can be used to monitor the asynchronous operation,
+    /// whose result returns the token corresponding to the physical identifier.
+    /// </returns>
+    public virtual ValueTask<TToken> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken = default)
+    {
+        if (string.IsNullOrEmpty(identifier))
         {
-            if (string.IsNullOrEmpty(identifier))
-            {
-                throw new ArgumentException("The identifier cannot be null or empty.", nameof(identifier));
-            }
-
-            return Store is IOpenIdTokenStore<TToken> store ?
-                store.FindByPhysicalIdAsync(identifier, cancellationToken) :
-                Store.FindByIdAsync(identifier, cancellationToken);
+            throw new ArgumentException("The identifier cannot be null or empty.", nameof(identifier));
         }
 
-        /// <summary>
-        /// Retrieves the physical identifier associated with a token.
-        /// </summary>
-        /// <param name="token">The token.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
-        /// <returns>
-        /// A <see cref="ValueTask{TResult}"/> that can be used to monitor the asynchronous operation,
-        /// whose result returns the physical identifier associated with the token.
-        /// </returns>
-        public virtual ValueTask<string> GetPhysicalIdAsync(TToken token, CancellationToken cancellationToken = default)
-        {
-            ArgumentNullException.ThrowIfNull(token);
-
-            return Store is IOpenIdTokenStore<TToken> store ?
-                store.GetPhysicalIdAsync(token, cancellationToken) :
-                Store.GetIdAsync(token, cancellationToken);
-        }
+        return Store is IOpenIdTokenStore<TToken> store ?
+            store.FindByPhysicalIdAsync(identifier, cancellationToken) :
+            Store.FindByIdAsync(identifier, cancellationToken);
+    }
 
-        async ValueTask<object> IOpenIdTokenManager.FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken)
-            => await FindByPhysicalIdAsync(identifier, cancellationToken);
+    /// <summary>
+    /// Retrieves the physical identifier associated with a token.
+    /// </summary>
+    /// <param name="token">The token.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
+    /// <returns>
+    /// A <see cref="ValueTask{TResult}"/> that can be used to monitor the asynchronous operation,
+    /// whose result returns the physical identifier associated with the token.
+    /// </returns>
+    public virtual ValueTask<string> GetPhysicalIdAsync(TToken token, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-        ValueTask<string> IOpenIdTokenManager.GetPhysicalIdAsync(object token, CancellationToken cancellationToken)
-            => GetPhysicalIdAsync((TToken)token, cancellationToken);
+        return Store is IOpenIdTokenStore<TToken> store ?
+            store.GetPhysicalIdAsync(token, cancellationToken) :
+            Store.GetIdAsync(token, cancellationToken);
     }
+
+    async ValueTask<object> IOpenIdTokenManager.FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken)
+        => await FindByPhysicalIdAsync(identifier, cancellationToken);
+
+    ValueTask<string> IOpenIdTokenManager.GetPhysicalIdAsync(object token, CancellationToken cancellationToken)
+        => GetPhysicalIdAsync((TToken)token, cancellationToken);
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Indexes/OpenIdApplicationIndex.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Indexes/OpenIdApplicationIndex.cs
index b09b973fa62..5b4237f0771 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Indexes/OpenIdApplicationIndex.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Indexes/OpenIdApplicationIndex.cs
@@ -2,101 +2,100 @@
 using OrchardCore.OpenId.YesSql.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.OpenId.YesSql.Indexes
+namespace OrchardCore.OpenId.YesSql.Indexes;
+
+public class OpenIdApplicationIndex : MapIndex
 {
-    public class OpenIdApplicationIndex : MapIndex
-    {
-        public string ApplicationId { get; set; }
-        public string ClientId { get; set; }
-    }
+    public string ApplicationId { get; set; }
+    public string ClientId { get; set; }
+}
 
-    public class OpenIdAppByLogoutUriIndex : ReduceIndex
-    {
-        public string LogoutRedirectUri { get; set; }
-        public int Count { get; set; }
-    }
+public class OpenIdAppByLogoutUriIndex : ReduceIndex
+{
+    public string LogoutRedirectUri { get; set; }
+    public int Count { get; set; }
+}
 
-    public class OpenIdAppByRedirectUriIndex : ReduceIndex
-    {
-        public string RedirectUri { get; set; }
-        public int Count { get; set; }
-    }
+public class OpenIdAppByRedirectUriIndex : ReduceIndex
+{
+    public string RedirectUri { get; set; }
+    public int Count { get; set; }
+}
 
-    public class OpenIdAppByRoleNameIndex : ReduceIndex
-    {
-        public string RoleName { get; set; }
-        public int Count { get; set; }
-    }
+public class OpenIdAppByRoleNameIndex : ReduceIndex
+{
+    public string RoleName { get; set; }
+    public int Count { get; set; }
+}
 
-    public class OpenIdApplicationIndexProvider : IndexProvider<OpenIdApplication>
-    {
-        private const string OpenIdCollection = OpenIdApplication.OpenIdCollection;
+public class OpenIdApplicationIndexProvider : IndexProvider<OpenIdApplication>
+{
+    private const string OpenIdCollection = OpenIdApplication.OpenIdCollection;
 
-        public OpenIdApplicationIndexProvider()
-            => CollectionName = OpenIdCollection;
+    public OpenIdApplicationIndexProvider()
+        => CollectionName = OpenIdCollection;
 
-        public override void Describe(DescribeContext<OpenIdApplication> context)
-        {
-            context.For<OpenIdApplicationIndex>()
-                .Map(application => new OpenIdApplicationIndex
-                {
-                    ApplicationId = application.ApplicationId,
-                    ClientId = application.ClientId
-                });
+    public override void Describe(DescribeContext<OpenIdApplication> context)
+    {
+        context.For<OpenIdApplicationIndex>()
+            .Map(application => new OpenIdApplicationIndex
+            {
+                ApplicationId = application.ApplicationId,
+                ClientId = application.ClientId
+            });
 
-            context.For<OpenIdAppByLogoutUriIndex, string>()
-                .Map(application => application.PostLogoutRedirectUris.Select(uri => new OpenIdAppByLogoutUriIndex
-                {
-                    LogoutRedirectUri = uri,
-                    Count = 1
-                }))
-                .Group(index => index.LogoutRedirectUri)
-                .Reduce(group => new OpenIdAppByLogoutUriIndex
-                {
-                    LogoutRedirectUri = group.Key,
-                    Count = group.Sum(x => x.Count)
-                })
-                .Delete((index, map) =>
-                {
-                    index.Count -= map.Sum(x => x.Count);
-                    return index.Count > 0 ? index : null;
-                });
+        context.For<OpenIdAppByLogoutUriIndex, string>()
+            .Map(application => application.PostLogoutRedirectUris.Select(uri => new OpenIdAppByLogoutUriIndex
+            {
+                LogoutRedirectUri = uri,
+                Count = 1
+            }))
+            .Group(index => index.LogoutRedirectUri)
+            .Reduce(group => new OpenIdAppByLogoutUriIndex
+            {
+                LogoutRedirectUri = group.Key,
+                Count = group.Sum(x => x.Count)
+            })
+            .Delete((index, map) =>
+            {
+                index.Count -= map.Sum(x => x.Count);
+                return index.Count > 0 ? index : null;
+            });
 
-            context.For<OpenIdAppByRedirectUriIndex, string>()
-                .Map(application => application.RedirectUris.Select(uri => new OpenIdAppByRedirectUriIndex
-                {
-                    RedirectUri = uri,
-                    Count = 1
-                }))
-                .Group(index => index.RedirectUri)
-                .Reduce(group => new OpenIdAppByRedirectUriIndex
-                {
-                    RedirectUri = group.Key,
-                    Count = group.Sum(x => x.Count)
-                })
-                .Delete((index, map) =>
-                {
-                    index.Count -= map.Sum(x => x.Count);
-                    return index.Count > 0 ? index : null;
-                });
+        context.For<OpenIdAppByRedirectUriIndex, string>()
+            .Map(application => application.RedirectUris.Select(uri => new OpenIdAppByRedirectUriIndex
+            {
+                RedirectUri = uri,
+                Count = 1
+            }))
+            .Group(index => index.RedirectUri)
+            .Reduce(group => new OpenIdAppByRedirectUriIndex
+            {
+                RedirectUri = group.Key,
+                Count = group.Sum(x => x.Count)
+            })
+            .Delete((index, map) =>
+            {
+                index.Count -= map.Sum(x => x.Count);
+                return index.Count > 0 ? index : null;
+            });
 
-            context.For<OpenIdAppByRoleNameIndex, string>()
-                .Map(application => application.Roles.Select(role => new OpenIdAppByRoleNameIndex
-                {
-                    RoleName = role,
-                    Count = 1
-                }))
-                .Group(index => index.RoleName)
-                .Reduce(group => new OpenIdAppByRoleNameIndex
-                {
-                    RoleName = group.Key,
-                    Count = group.Sum(x => x.Count)
-                })
-                .Delete((index, map) =>
-                {
-                    index.Count -= map.Sum(x => x.Count);
-                    return index.Count > 0 ? index : null;
-                });
-        }
+        context.For<OpenIdAppByRoleNameIndex, string>()
+            .Map(application => application.Roles.Select(role => new OpenIdAppByRoleNameIndex
+            {
+                RoleName = role,
+                Count = 1
+            }))
+            .Group(index => index.RoleName)
+            .Reduce(group => new OpenIdAppByRoleNameIndex
+            {
+                RoleName = group.Key,
+                Count = group.Sum(x => x.Count)
+            })
+            .Delete((index, map) =>
+            {
+                index.Count -= map.Sum(x => x.Count);
+                return index.Count > 0 ? index : null;
+            });
     }
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Indexes/OpenIdAuthorizationIndex.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Indexes/OpenIdAuthorizationIndex.cs
index 3e587cee8cb..f0bed8a75fc 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Indexes/OpenIdAuthorizationIndex.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Indexes/OpenIdAuthorizationIndex.cs
@@ -2,37 +2,36 @@
 using OrchardCore.OpenId.YesSql.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.OpenId.YesSql.Indexes
+namespace OrchardCore.OpenId.YesSql.Indexes;
+
+public class OpenIdAuthorizationIndex : MapIndex
 {
-    public class OpenIdAuthorizationIndex : MapIndex
-    {
-        public string AuthorizationId { get; set; }
-        public string ApplicationId { get; set; }
-        public DateTime? CreationDate { get; set; }
-        public string Status { get; set; }
-        public string Subject { get; set; }
-        public string Type { get; set; }
-    }
+    public string AuthorizationId { get; set; }
+    public string ApplicationId { get; set; }
+    public DateTime? CreationDate { get; set; }
+    public string Status { get; set; }
+    public string Subject { get; set; }
+    public string Type { get; set; }
+}
 
-    public class OpenIdAuthorizationIndexProvider : IndexProvider<OpenIdAuthorization>
-    {
-        private const string OpenIdCollection = OpenIdAuthorization.OpenIdCollection;
+public class OpenIdAuthorizationIndexProvider : IndexProvider<OpenIdAuthorization>
+{
+    private const string OpenIdCollection = OpenIdAuthorization.OpenIdCollection;
 
-        public OpenIdAuthorizationIndexProvider()
-            => CollectionName = OpenIdCollection;
+    public OpenIdAuthorizationIndexProvider()
+        => CollectionName = OpenIdCollection;
 
-        public override void Describe(DescribeContext<OpenIdAuthorization> context)
-        {
-            context.For<OpenIdAuthorizationIndex>()
-                .Map(authorization => new OpenIdAuthorizationIndex
-                {
-                    ApplicationId = authorization.ApplicationId,
-                    AuthorizationId = authorization.AuthorizationId,
-                    CreationDate = authorization.CreationDate,
-                    Status = authorization.Status,
-                    Subject = authorization.Subject,
-                    Type = authorization.Type
-                });
-        }
+    public override void Describe(DescribeContext<OpenIdAuthorization> context)
+    {
+        context.For<OpenIdAuthorizationIndex>()
+            .Map(authorization => new OpenIdAuthorizationIndex
+            {
+                ApplicationId = authorization.ApplicationId,
+                AuthorizationId = authorization.AuthorizationId,
+                CreationDate = authorization.CreationDate,
+                Status = authorization.Status,
+                Subject = authorization.Subject,
+                Type = authorization.Type
+            });
     }
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Indexes/OpenIdScopeIndex.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Indexes/OpenIdScopeIndex.cs
index 8f47940b140..61956be770c 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Indexes/OpenIdScopeIndex.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Indexes/OpenIdScopeIndex.cs
@@ -2,53 +2,52 @@
 using OrchardCore.OpenId.YesSql.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.OpenId.YesSql.Indexes
+namespace OrchardCore.OpenId.YesSql.Indexes;
+
+public class OpenIdScopeIndex : MapIndex
 {
-    public class OpenIdScopeIndex : MapIndex
-    {
-        public string Name { get; set; }
-        public string ScopeId { get; set; }
-    }
+    public string Name { get; set; }
+    public string ScopeId { get; set; }
+}
 
-    public class OpenIdScopeByResourceIndex : ReduceIndex
-    {
-        public string Resource { get; set; }
-        public int Count { get; set; }
-    }
+public class OpenIdScopeByResourceIndex : ReduceIndex
+{
+    public string Resource { get; set; }
+    public int Count { get; set; }
+}
 
-    public class OpenIdScopeIndexProvider : IndexProvider<OpenIdScope>
-    {
-        private const string OpenIdCollection = OpenIdScope.OpenIdCollection;
+public class OpenIdScopeIndexProvider : IndexProvider<OpenIdScope>
+{
+    private const string OpenIdCollection = OpenIdScope.OpenIdCollection;
 
-        public OpenIdScopeIndexProvider()
-            => CollectionName = OpenIdCollection;
+    public OpenIdScopeIndexProvider()
+        => CollectionName = OpenIdCollection;
 
-        public override void Describe(DescribeContext<OpenIdScope> context)
-        {
-            context.For<OpenIdScopeIndex>()
-                .Map(scope => new OpenIdScopeIndex
-                {
-                    Name = scope.Name,
-                    ScopeId = scope.ScopeId
-                });
+    public override void Describe(DescribeContext<OpenIdScope> context)
+    {
+        context.For<OpenIdScopeIndex>()
+            .Map(scope => new OpenIdScopeIndex
+            {
+                Name = scope.Name,
+                ScopeId = scope.ScopeId
+            });
 
-            context.For<OpenIdScopeByResourceIndex, string>()
-                .Map(scope => scope.Resources.Select(resource => new OpenIdScopeByResourceIndex
-                {
-                    Resource = resource,
-                    Count = 1
-                }))
-                .Group(index => index.Resource)
-                .Reduce(group => new OpenIdScopeByResourceIndex
-                {
-                    Resource = group.Key,
-                    Count = group.Sum(x => x.Count)
-                })
-                .Delete((index, map) =>
-                {
-                    index.Count -= map.Sum(x => x.Count);
-                    return index.Count > 0 ? index : null;
-                });
-        }
+        context.For<OpenIdScopeByResourceIndex, string>()
+            .Map(scope => scope.Resources.Select(resource => new OpenIdScopeByResourceIndex
+            {
+                Resource = resource,
+                Count = 1
+            }))
+            .Group(index => index.Resource)
+            .Reduce(group => new OpenIdScopeByResourceIndex
+            {
+                Resource = group.Key,
+                Count = group.Sum(x => x.Count)
+            })
+            .Delete((index, map) =>
+            {
+                index.Count -= map.Sum(x => x.Count);
+                return index.Count > 0 ? index : null;
+            });
     }
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Indexes/OpenIdTokenIndex.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Indexes/OpenIdTokenIndex.cs
index f768eefc92e..c44d9800172 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Indexes/OpenIdTokenIndex.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Indexes/OpenIdTokenIndex.cs
@@ -2,43 +2,42 @@
 using OrchardCore.OpenId.YesSql.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.OpenId.YesSql.Indexes
+namespace OrchardCore.OpenId.YesSql.Indexes;
+
+public class OpenIdTokenIndex : MapIndex
 {
-    public class OpenIdTokenIndex : MapIndex
-    {
-        public string TokenId { get; set; }
-        public string ApplicationId { get; set; }
-        public string AuthorizationId { get; set; }
-        public DateTime? CreationDate { get; set; }
-        public DateTime? ExpirationDate { get; set; }
-        public string ReferenceId { get; set; }
-        public string Status { get; set; }
-        public string Subject { get; set; }
-        public string Type { get; set; }
-    }
+    public string TokenId { get; set; }
+    public string ApplicationId { get; set; }
+    public string AuthorizationId { get; set; }
+    public DateTime? CreationDate { get; set; }
+    public DateTime? ExpirationDate { get; set; }
+    public string ReferenceId { get; set; }
+    public string Status { get; set; }
+    public string Subject { get; set; }
+    public string Type { get; set; }
+}
 
-    public class OpenIdTokenIndexProvider : IndexProvider<OpenIdToken>
-    {
-        private const string OpenIdCollection = OpenIdToken.OpenIdCollection;
+public class OpenIdTokenIndexProvider : IndexProvider<OpenIdToken>
+{
+    private const string OpenIdCollection = OpenIdToken.OpenIdCollection;
 
-        public OpenIdTokenIndexProvider()
-            => CollectionName = OpenIdCollection;
+    public OpenIdTokenIndexProvider()
+        => CollectionName = OpenIdCollection;
 
-        public override void Describe(DescribeContext<OpenIdToken> context)
-        {
-            context.For<OpenIdTokenIndex>()
-                .Map(token => new OpenIdTokenIndex
-                {
-                    TokenId = token.TokenId,
-                    ApplicationId = token.ApplicationId,
-                    AuthorizationId = token.AuthorizationId,
-                    CreationDate = token.CreationDate,
-                    ExpirationDate = token.ExpirationDate,
-                    ReferenceId = token.ReferenceId,
-                    Status = token.Status,
-                    Subject = token.Subject,
-                    Type = token.Type
-                });
-        }
+    public override void Describe(DescribeContext<OpenIdToken> context)
+    {
+        context.For<OpenIdTokenIndex>()
+            .Map(token => new OpenIdTokenIndex
+            {
+                TokenId = token.TokenId,
+                ApplicationId = token.ApplicationId,
+                AuthorizationId = token.AuthorizationId,
+                CreationDate = token.CreationDate,
+                ExpirationDate = token.ExpirationDate,
+                ReferenceId = token.ReferenceId,
+                Status = token.Status,
+                Subject = token.Subject,
+                Type = token.Type
+            });
     }
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Migrations/OpenIdMigrations.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Migrations/OpenIdMigrations.cs
index eb2251cddda..beaa087c367 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Migrations/OpenIdMigrations.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Migrations/OpenIdMigrations.cs
@@ -6,509 +6,508 @@
 using YesSql;
 using YesSql.Sql;
 
-namespace OrchardCore.OpenId.YesSql.Migrations
+namespace OrchardCore.OpenId.YesSql.Migrations;
+
+public sealed class OpenIdMigrations : DataMigration
 {
-    public sealed class OpenIdMigrations : DataMigration
+    private const string OpenIdTokenCollection = OpenIdToken.OpenIdCollection;
+    private const string OpenIdAuthorizationCollection = OpenIdAuthorization.OpenIdCollection;
+    private const string OpenIdApplicationCollection = OpenIdApplication.OpenIdCollection;
+    private const string OpenIdScopeCollection = OpenIdScope.OpenIdCollection;
+
+    private readonly ISession _session;
+
+    public OpenIdMigrations(ISession session)
     {
-        private const string OpenIdTokenCollection = OpenIdToken.OpenIdCollection;
-        private const string OpenIdAuthorizationCollection = OpenIdAuthorization.OpenIdCollection;
-        private const string OpenIdApplicationCollection = OpenIdApplication.OpenIdCollection;
-        private const string OpenIdScopeCollection = OpenIdScope.OpenIdCollection;
+        _session = session;
+    }
 
-        private readonly ISession _session;
+    public async Task<int> CreateAsync()
+    {
+        await SchemaBuilder.CreateMapIndexTableAsync<OpenIdApplicationIndex>(table => table
+            .Column<string>("ApplicationId", column => column.WithLength(48))
+            .Column<string>("ClientId", column => column.Unique()),
+            collection: OpenIdApplicationCollection);
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdApplicationIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdApplication",
+                "DocumentId",
+                "ApplicationId",
+                "ClientId"),
+            collection: OpenIdApplicationCollection
+        );
+
+        await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdAppByLogoutUriIndex>(table => table
+            .Column<string>("LogoutRedirectUri")
+            .Column<int>("Count"),
+            collection: OpenIdApplicationCollection);
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdAppByLogoutUriIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdAppByLogoutUri_LogoutRedirectUri", "LogoutRedirectUri"),
+            collection: OpenIdApplicationCollection
+        );
+
+        await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdAppByRedirectUriIndex>(table => table
+            .Column<string>("RedirectUri")
+            .Column<int>("Count"),
+            collection: OpenIdApplicationCollection);
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdAppByRedirectUriIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdAppByRedirectUri_RedirectUri", "RedirectUri"),
+            collection: OpenIdApplicationCollection
+        );
+
+        await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdAppByRoleNameIndex>(table => table
+            .Column<string>("RoleName")
+            .Column<int>("Count"),
+            collection: OpenIdApplicationCollection);
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdAppByRoleNameIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdAppByRoleName_RoleName", "RoleName"),
+            collection: OpenIdApplicationCollection
+        );
+
+        await SchemaBuilder.CreateMapIndexTableAsync<OpenIdAuthorizationIndex>(table => table
+            .Column<string>("AuthorizationId", column => column.WithLength(48))
+            .Column<string>("ApplicationId", column => column.WithLength(48))
+            .Column<string>("Status")
+            .Column<string>("Subject")
+            .Column<string>("Type")
+            .Column<DateTime>("CreationDate"),
+            collection: OpenIdAuthorizationCollection);
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdAuthorizationIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdAuthorization_ApplicationId",
+                "DocumentId",
+                "ApplicationId",
+                "Status",
+                "Subject"),
+            collection: OpenIdAuthorizationCollection
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdAuthorizationIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdAuthorization_AuthorizationId",
+                "DocumentId",
+                "AuthorizationId",
+                "Status",
+                "Type",
+                "CreationDate"),
+            collection: OpenIdAuthorizationCollection
+        );
+
+        await SchemaBuilder.CreateMapIndexTableAsync<OpenIdScopeIndex>(table => table
+            .Column<string>("Name", column => column.Unique())
+            .Column<string>("ScopeId", column => column.WithLength(48)),
+            collection: OpenIdScopeCollection);
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdScopeIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdScope",
+                "DocumentId",
+                "Name",
+                "ScopeId"),
+            collection: OpenIdScopeCollection
+        );
+
+        await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdScopeByResourceIndex>(table => table
+            .Column<string>("Resource")
+            .Column<int>("Count"),
+            collection: OpenIdScopeCollection);
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdScopeByResourceIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdScopeByResource_Resource",
+                "Resource"),
+            collection: OpenIdScopeCollection
+        );
+
+        await SchemaBuilder.CreateMapIndexTableAsync<OpenIdTokenIndex>(table => table
+            .Column<string>("TokenId", column => column.WithLength(48))
+            .Column<string>("ApplicationId", column => column.WithLength(48))
+            .Column<string>("AuthorizationId", column => column.WithLength(48))
+            .Column<DateTime>("ExpirationDate")
+            .Column<string>("ReferenceId")
+            .Column<string>("Status")
+            .Column<string>("Subject")
+            .Column<string>("Type")
+            .Column<DateTime>("CreationDate"),
+            collection: OpenIdTokenCollection);
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdToken_ApplicationId",
+                "DocumentId",
+                "ApplicationId",
+                "Status",
+                "Subject"),
+            collection: OpenIdTokenCollection
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdToken_AuthorizationId",
+                "DocumentId",
+                "AuthorizationId",
+                "Status",
+                "Type",
+                "CreationDate",
+                "ExpirationDate"),
+            collection: OpenIdTokenCollection
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdToken_TokenId",
+                "DocumentId",
+                "TokenId",
+                "ReferenceId"),
+            collection: OpenIdTokenCollection
+        );
+
+        // Shortcut other migration steps on new content definition schemas.
+        return 8;
+    }
 
-        public OpenIdMigrations(ISession session)
-        {
-            _session = session;
-        }
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom1Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
+            .AddColumn<string>("Type"));
 
-        public async Task<int> CreateAsync()
-        {
-            await SchemaBuilder.CreateMapIndexTableAsync<OpenIdApplicationIndex>(table => table
-                .Column<string>("ApplicationId", column => column.WithLength(48))
-                .Column<string>("ClientId", column => column.Unique()),
-                collection: OpenIdApplicationCollection);
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdApplicationIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdApplication",
-                    "DocumentId",
-                    "ApplicationId",
-                    "ClientId"),
-                collection: OpenIdApplicationCollection
-            );
-
-            await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdAppByLogoutUriIndex>(table => table
-                .Column<string>("LogoutRedirectUri")
-                .Column<int>("Count"),
-                collection: OpenIdApplicationCollection);
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdAppByLogoutUriIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdAppByLogoutUri_LogoutRedirectUri", "LogoutRedirectUri"),
-                collection: OpenIdApplicationCollection
-            );
-
-            await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdAppByRedirectUriIndex>(table => table
-                .Column<string>("RedirectUri")
-                .Column<int>("Count"),
-                collection: OpenIdApplicationCollection);
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdAppByRedirectUriIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdAppByRedirectUri_RedirectUri", "RedirectUri"),
-                collection: OpenIdApplicationCollection
-            );
-
-            await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdAppByRoleNameIndex>(table => table
-                .Column<string>("RoleName")
-                .Column<int>("Count"),
-                collection: OpenIdApplicationCollection);
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdAppByRoleNameIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdAppByRoleName_RoleName", "RoleName"),
-                collection: OpenIdApplicationCollection
-            );
-
-            await SchemaBuilder.CreateMapIndexTableAsync<OpenIdAuthorizationIndex>(table => table
-                .Column<string>("AuthorizationId", column => column.WithLength(48))
-                .Column<string>("ApplicationId", column => column.WithLength(48))
-                .Column<string>("Status")
-                .Column<string>("Subject")
-                .Column<string>("Type")
-                .Column<DateTime>("CreationDate"),
-                collection: OpenIdAuthorizationCollection);
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdAuthorizationIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdAuthorization_ApplicationId",
-                    "DocumentId",
-                    "ApplicationId",
-                    "Status",
-                    "Subject"),
-                collection: OpenIdAuthorizationCollection
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdAuthorizationIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdAuthorization_AuthorizationId",
-                    "DocumentId",
-                    "AuthorizationId",
-                    "Status",
-                    "Type",
-                    "CreationDate"),
-                collection: OpenIdAuthorizationCollection
-            );
-
-            await SchemaBuilder.CreateMapIndexTableAsync<OpenIdScopeIndex>(table => table
-                .Column<string>("Name", column => column.Unique())
-                .Column<string>("ScopeId", column => column.WithLength(48)),
-                collection: OpenIdScopeCollection);
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdScopeIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdScope",
-                    "DocumentId",
-                    "Name",
-                    "ScopeId"),
-                collection: OpenIdScopeCollection
-            );
-
-            await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdScopeByResourceIndex>(table => table
-                .Column<string>("Resource")
-                .Column<int>("Count"),
-                collection: OpenIdScopeCollection);
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdScopeByResourceIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdScopeByResource_Resource",
-                    "Resource"),
-                collection: OpenIdScopeCollection
-            );
-
-            await SchemaBuilder.CreateMapIndexTableAsync<OpenIdTokenIndex>(table => table
-                .Column<string>("TokenId", column => column.WithLength(48))
-                .Column<string>("ApplicationId", column => column.WithLength(48))
-                .Column<string>("AuthorizationId", column => column.WithLength(48))
-                .Column<DateTime>("ExpirationDate")
-                .Column<string>("ReferenceId")
-                .Column<string>("Status")
-                .Column<string>("Subject")
-                .Column<string>("Type")
-                .Column<DateTime>("CreationDate"),
-                collection: OpenIdTokenCollection);
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdToken_ApplicationId",
-                    "DocumentId",
-                    "ApplicationId",
-                    "Status",
-                    "Subject"),
-                collection: OpenIdTokenCollection
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdToken_AuthorizationId",
-                    "DocumentId",
-                    "AuthorizationId",
-                    "Status",
-                    "Type",
-                    "CreationDate",
-                    "ExpirationDate"),
-                collection: OpenIdTokenCollection
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdToken_TokenId",
-                    "DocumentId",
-                    "TokenId",
-                    "ReferenceId"),
-                collection: OpenIdTokenCollection
-            );
-
-            // Shortcut other migration steps on new content definition schemas.
-            return 8;
-        }
+        return 2;
+    }
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom1Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
-                .AddColumn<string>("Type"));
+    private sealed class OpenIdApplicationByPostLogoutRedirectUriIndex { }
+    private sealed class OpenIdApplicationByRedirectUriIndex { }
+    private sealed class OpenIdApplicationByRoleNameIndex { }
 
-            return 2;
-        }
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom2Async()
+    {
+        await SchemaBuilder.DropReduceIndexTableAsync<OpenIdApplicationByPostLogoutRedirectUriIndex>(null);
+        await SchemaBuilder.DropReduceIndexTableAsync<OpenIdApplicationByRedirectUriIndex>(null);
+        await SchemaBuilder.DropReduceIndexTableAsync<OpenIdApplicationByRoleNameIndex>(null);
 
-        private sealed class OpenIdApplicationByPostLogoutRedirectUriIndex { }
-        private sealed class OpenIdApplicationByRedirectUriIndex { }
-        private sealed class OpenIdApplicationByRoleNameIndex { }
+        await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdAppByLogoutUriIndex>(table => table
+            .Column<string>("LogoutRedirectUri")
+            .Column<int>("Count"));
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom2Async()
-        {
-            await SchemaBuilder.DropReduceIndexTableAsync<OpenIdApplicationByPostLogoutRedirectUriIndex>(null);
-            await SchemaBuilder.DropReduceIndexTableAsync<OpenIdApplicationByRedirectUriIndex>(null);
-            await SchemaBuilder.DropReduceIndexTableAsync<OpenIdApplicationByRoleNameIndex>(null);
+        await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdAppByRedirectUriIndex>(table => table
+            .Column<string>("RedirectUri")
+            .Column<int>("Count"));
 
-            await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdAppByLogoutUriIndex>(table => table
-                .Column<string>("LogoutRedirectUri")
-                .Column<int>("Count"));
+        await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdAppByRoleNameIndex>(table => table
+            .Column<string>("RoleName")
+            .Column<int>("Count"));
 
-            await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdAppByRedirectUriIndex>(table => table
-                .Column<string>("RedirectUri")
-                .Column<int>("Count"));
+        return 3;
+    }
 
-            await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdAppByRoleNameIndex>(table => table
-                .Column<string>("RoleName")
-                .Column<int>("Count"));
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom3Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdAuthorizationIndex>(table => table
+            .AddColumn<DateTime>("CreationDate"));
 
-            return 3;
-        }
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
+            .AddColumn<DateTime>("CreationDate"));
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom3Async()
-        {
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdAuthorizationIndex>(table => table
-                .AddColumn<DateTime>("CreationDate"));
+        return 4;
+    }
 
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
-                .AddColumn<DateTime>("CreationDate"));
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom4Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdApplicationIndex>(table => table
+            .CreateIndex("IDX_OpenIdApplicationIndex_DocumentId",
+                "DocumentId",
+                "ApplicationId",
+                "ClientId")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdAuthorizationIndex>(table => table
+            .CreateIndex("IDX_OpenIdAuthorizationIndex_DocumentId_ApplicationId",
+                "DocumentId",
+                "ApplicationId",
+                "Status",
+                "Subject")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdAuthorizationIndex>(table => table
+            .CreateIndex("IDX_OpenIdAuthorizationIndex_DocumentId_AuthorizationId",
+                "DocumentId",
+                "AuthorizationId",
+                "Status",
+                "Type",
+                "CreationDate")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdScopeIndex>(table => table
+            .CreateIndex("IDX_OpenIdScopeIndex_DocumentId",
+                "DocumentId",
+                "Name",
+                "ScopeId")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
+            .CreateIndex("IDX_OpenIdTokenIndex_DocumentId_ApplicationId",
+                "DocumentId",
+                "ApplicationId",
+                "Status",
+                "Subject")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
+            .CreateIndex("IDX_OpenIdTokenIndex_DocumentId_AuthorizationId",
+                "DocumentId",
+                "AuthorizationId",
+                "Status",
+                "Type",
+                "CreationDate",
+                "ExpirationDate")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
+            .CreateIndex("IDX_OpenIdTokenIndex_DocumentId_TokenId",
+                "DocumentId",
+                "TokenId",
+                "ReferenceId")
+        );
+
+        return 5;
+    }
 
-            return 4;
-        }
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom5Async()
+    {
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdAppByLogoutUriIndex>(table => table
+            .CreateIndex("IDX_OpenIdAppByLogoutUriIndex_LogoutRedirectUri", "LogoutRedirectUri")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdAppByRedirectUriIndex>(table => table
+            .CreateIndex("IDX_OpenIdAppByRedirectUriIndex_RedirectUri", "RedirectUri")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdAppByRoleNameIndex>(table => table
+            .CreateIndex("IDX_OpenIdAppByRoleNameIndex_RoleName", "RoleName")
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdScopeByResourceIndex>(table => table
+            .CreateIndex("IDX_OpenIdScopeByResourceIndex_Resource", "Resource")
+        );
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom4Async()
+        return 6;
+    }
+
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom6Async()
+    {
+        // Create all index tables with the new collection value.
+        await SchemaBuilder.CreateMapIndexTableAsync<OpenIdTokenIndex>(table => table
+            .Column<string>("TokenId", column => column.WithLength(48))
+            .Column<string>("ApplicationId", column => column.WithLength(48))
+            .Column<string>("AuthorizationId", column => column.WithLength(48))
+            .Column<DateTime>("ExpirationDate")
+            .Column<string>("ReferenceId")
+            .Column<string>("Status")
+            .Column<string>("Subject")
+            .Column<string>("Type")
+            .Column<DateTime>("CreationDate"),
+            collection: OpenIdTokenCollection);
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdToken_ApplicationId",
+                "DocumentId",
+                "ApplicationId",
+                "Status",
+                "Subject"),
+            collection: OpenIdTokenCollection
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdToken_AuthorizationId",
+                "DocumentId",
+                "AuthorizationId",
+                "Status",
+                "Type",
+                "CreationDate",
+                "ExpirationDate"),
+            collection: OpenIdTokenCollection
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdToken_TokenId",
+                "DocumentId",
+                "TokenId",
+                "ReferenceId"),
+            collection: OpenIdTokenCollection
+        );
+
+        await SchemaBuilder.CreateMapIndexTableAsync<OpenIdAuthorizationIndex>(table => table
+            .Column<string>("AuthorizationId", column => column.WithLength(48))
+            .Column<string>("ApplicationId", column => column.WithLength(48))
+            .Column<string>("Status")
+            .Column<string>("Subject")
+            .Column<string>("Type")
+            .Column<DateTime>("CreationDate"),
+            collection: OpenIdAuthorizationCollection);
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdAuthorizationIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdAuthorization_ApplicationId",
+                "DocumentId",
+                "ApplicationId",
+                "Status",
+                "Subject"),
+            collection: OpenIdAuthorizationCollection
+        );
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdAuthorizationIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdAuthorization_AuthorizationId",
+                "DocumentId",
+                "AuthorizationId",
+                "Status",
+                "Type",
+                "CreationDate"),
+            collection: OpenIdAuthorizationCollection
+        );
+
+        // Retrieve all existing tokens and authorizations from original Document table.
+        var tokens = await _session.Query<OpenIdToken>().ListAsync();
+        var authorizations = await _session.Query<OpenIdAuthorization>().ListAsync();
+
+        // Enlist the old documents in the new collection and remove from the old collections.
+        foreach (var token in tokens)
         {
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdApplicationIndex>(table => table
-                .CreateIndex("IDX_OpenIdApplicationIndex_DocumentId",
-                    "DocumentId",
-                    "ApplicationId",
-                    "ClientId")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdAuthorizationIndex>(table => table
-                .CreateIndex("IDX_OpenIdAuthorizationIndex_DocumentId_ApplicationId",
-                    "DocumentId",
-                    "ApplicationId",
-                    "Status",
-                    "Subject")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdAuthorizationIndex>(table => table
-                .CreateIndex("IDX_OpenIdAuthorizationIndex_DocumentId_AuthorizationId",
-                    "DocumentId",
-                    "AuthorizationId",
-                    "Status",
-                    "Type",
-                    "CreationDate")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdScopeIndex>(table => table
-                .CreateIndex("IDX_OpenIdScopeIndex_DocumentId",
-                    "DocumentId",
-                    "Name",
-                    "ScopeId")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
-                .CreateIndex("IDX_OpenIdTokenIndex_DocumentId_ApplicationId",
-                    "DocumentId",
-                    "ApplicationId",
-                    "Status",
-                    "Subject")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
-                .CreateIndex("IDX_OpenIdTokenIndex_DocumentId_AuthorizationId",
-                    "DocumentId",
-                    "AuthorizationId",
-                    "Status",
-                    "Type",
-                    "CreationDate",
-                    "ExpirationDate")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
-                .CreateIndex("IDX_OpenIdTokenIndex_DocumentId_TokenId",
-                    "DocumentId",
-                    "TokenId",
-                    "ReferenceId")
-            );
-
-            return 5;
+            // Set the id to 0 or it will be considered an updated entity.
+            token.Id = 0;
+            await _session.SaveAsync(token, collection: OpenIdTokenCollection);
+
+            // Delete from the original collection.
+            _session.Delete(token);
         }
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom5Async()
+        // Enlist the old documents in the new collection and remove from the old collections.
+        foreach (var authorization in authorizations)
         {
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdAppByLogoutUriIndex>(table => table
-                .CreateIndex("IDX_OpenIdAppByLogoutUriIndex_LogoutRedirectUri", "LogoutRedirectUri")
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdAppByRedirectUriIndex>(table => table
-                .CreateIndex("IDX_OpenIdAppByRedirectUriIndex_RedirectUri", "RedirectUri")
-            );
+            // Set the id to 0 or it will be considered an updated entity.
+            authorization.Id = 0;
+            await _session.SaveAsync(authorization, collection: OpenIdTokenCollection);
 
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdAppByRoleNameIndex>(table => table
-                .CreateIndex("IDX_OpenIdAppByRoleNameIndex_RoleName", "RoleName")
-            );
+            // Delete from the original collection.
+            _session.Delete(authorization);
+        }
 
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdScopeByResourceIndex>(table => table
-                .CreateIndex("IDX_OpenIdScopeByResourceIndex_Resource", "Resource")
-            );
+        // This can be safely dropped here as the index provider now only writes to the new collection table.
+        await SchemaBuilder.DropMapIndexTableAsync<OpenIdTokenIndex>();
+        await SchemaBuilder.DropMapIndexTableAsync<OpenIdAuthorizationIndex>();
 
-            return 6;
-        }
+        return 7;
+    }
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom6Async()
+    // This code can be removed in a later version.
+    public async Task<int> UpdateFrom7Async()
+    {
+        // Create all index tables with the new collection value.
+        await SchemaBuilder.CreateMapIndexTableAsync<OpenIdApplicationIndex>(table => table
+            .Column<string>("ApplicationId", column => column.WithLength(48))
+            .Column<string>("ClientId", column => column.Unique()),
+            collection: OpenIdApplicationCollection);
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdApplicationIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdApplication",
+                "DocumentId",
+                "ApplicationId",
+                "ClientId"),
+            collection: OpenIdApplicationCollection
+        );
+
+        await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdAppByLogoutUriIndex>(table => table
+            .Column<string>("LogoutRedirectUri")
+            .Column<int>("Count"),
+            collection: OpenIdApplicationCollection);
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdAppByLogoutUriIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdAppByLogoutUri_LogoutRedirectUri", "LogoutRedirectUri"),
+            collection: OpenIdApplicationCollection
+        );
+
+        await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdAppByRedirectUriIndex>(table => table
+            .Column<string>("RedirectUri")
+            .Column<int>("Count"),
+            collection: OpenIdApplicationCollection);
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdAppByRedirectUriIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdAppByRedirectUri_RedirectUri", "RedirectUri"),
+            collection: OpenIdApplicationCollection
+        );
+
+        await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdAppByRoleNameIndex>(table => table
+            .Column<string>("RoleName")
+            .Column<int>("Count"),
+            collection: OpenIdApplicationCollection);
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdAppByRoleNameIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdAppByRoleName_RoleName", "RoleName"),
+            collection: OpenIdApplicationCollection
+        );
+
+        await SchemaBuilder.CreateMapIndexTableAsync<OpenIdScopeIndex>(table => table
+            .Column<string>("Name", column => column.Unique())
+            .Column<string>("ScopeId", column => column.WithLength(48)),
+            collection: OpenIdScopeCollection);
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdScopeIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdScope",
+                "DocumentId",
+                "Name",
+                "ScopeId"),
+            collection: OpenIdScopeCollection
+        );
+
+        await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdScopeByResourceIndex>(table => table
+            .Column<string>("Resource")
+            .Column<int>("Count"),
+            collection: OpenIdScopeCollection);
+
+        await SchemaBuilder.AlterIndexTableAsync<OpenIdScopeByResourceIndex>(table => table
+            .CreateIndex("IDX_COL_OpenIdScopeByResource_Resource", "Resource"),
+            collection: OpenIdScopeCollection
+        );
+
+        // Retrieve all existing applications and scopes from original Document table.
+        var applications = await _session.Query<OpenIdApplication>().ListAsync();
+        var scopes = await _session.Query<OpenIdScope>().ListAsync();
+
+        // Enlist the old documents in the new collection and remove from the old collections.
+        foreach (var application in applications)
         {
-            // Create all index tables with the new collection value.
-            await SchemaBuilder.CreateMapIndexTableAsync<OpenIdTokenIndex>(table => table
-                .Column<string>("TokenId", column => column.WithLength(48))
-                .Column<string>("ApplicationId", column => column.WithLength(48))
-                .Column<string>("AuthorizationId", column => column.WithLength(48))
-                .Column<DateTime>("ExpirationDate")
-                .Column<string>("ReferenceId")
-                .Column<string>("Status")
-                .Column<string>("Subject")
-                .Column<string>("Type")
-                .Column<DateTime>("CreationDate"),
-                collection: OpenIdTokenCollection);
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdToken_ApplicationId",
-                    "DocumentId",
-                    "ApplicationId",
-                    "Status",
-                    "Subject"),
-                collection: OpenIdTokenCollection
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdToken_AuthorizationId",
-                    "DocumentId",
-                    "AuthorizationId",
-                    "Status",
-                    "Type",
-                    "CreationDate",
-                    "ExpirationDate"),
-                collection: OpenIdTokenCollection
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdTokenIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdToken_TokenId",
-                    "DocumentId",
-                    "TokenId",
-                    "ReferenceId"),
-                collection: OpenIdTokenCollection
-            );
-
-            await SchemaBuilder.CreateMapIndexTableAsync<OpenIdAuthorizationIndex>(table => table
-                .Column<string>("AuthorizationId", column => column.WithLength(48))
-                .Column<string>("ApplicationId", column => column.WithLength(48))
-                .Column<string>("Status")
-                .Column<string>("Subject")
-                .Column<string>("Type")
-                .Column<DateTime>("CreationDate"),
-                collection: OpenIdAuthorizationCollection);
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdAuthorizationIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdAuthorization_ApplicationId",
-                    "DocumentId",
-                    "ApplicationId",
-                    "Status",
-                    "Subject"),
-                collection: OpenIdAuthorizationCollection
-            );
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdAuthorizationIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdAuthorization_AuthorizationId",
-                    "DocumentId",
-                    "AuthorizationId",
-                    "Status",
-                    "Type",
-                    "CreationDate"),
-                collection: OpenIdAuthorizationCollection
-            );
-
-            // Retrieve all existing tokens and authorizations from original Document table.
-            var tokens = await _session.Query<OpenIdToken>().ListAsync();
-            var authorizations = await _session.Query<OpenIdAuthorization>().ListAsync();
-
-            // Enlist the old documents in the new collection and remove from the old collections.
-            foreach (var token in tokens)
-            {
-                // Set the id to 0 or it will be considered an updated entity.
-                token.Id = 0;
-                await _session.SaveAsync(token, collection: OpenIdTokenCollection);
-
-                // Delete from the original collection.
-                _session.Delete(token);
-            }
-
-            // Enlist the old documents in the new collection and remove from the old collections.
-            foreach (var authorization in authorizations)
-            {
-                // Set the id to 0 or it will be considered an updated entity.
-                authorization.Id = 0;
-                await _session.SaveAsync(authorization, collection: OpenIdTokenCollection);
-
-                // Delete from the original collection.
-                _session.Delete(authorization);
-            }
-
-            // This can be safely dropped here as the index provider now only writes to the new collection table.
-            await SchemaBuilder.DropMapIndexTableAsync<OpenIdTokenIndex>();
-            await SchemaBuilder.DropMapIndexTableAsync<OpenIdAuthorizationIndex>();
-
-            return 7;
+            // Set the id to 0 or it will be considered an updated entity.
+            application.Id = 0;
+            await _session.SaveAsync(application, collection: OpenIdApplicationCollection);
+
+            // Delete from the original collection.
+            _session.Delete(application);
         }
 
-        // This code can be removed in a later version.
-        public async Task<int> UpdateFrom7Async()
+        // Enlist the old documents in the new collection and remove from the old collections.
+        foreach (var scope in scopes)
         {
-            // Create all index tables with the new collection value.
-            await SchemaBuilder.CreateMapIndexTableAsync<OpenIdApplicationIndex>(table => table
-                .Column<string>("ApplicationId", column => column.WithLength(48))
-                .Column<string>("ClientId", column => column.Unique()),
-                collection: OpenIdApplicationCollection);
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdApplicationIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdApplication",
-                    "DocumentId",
-                    "ApplicationId",
-                    "ClientId"),
-                collection: OpenIdApplicationCollection
-            );
-
-            await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdAppByLogoutUriIndex>(table => table
-                .Column<string>("LogoutRedirectUri")
-                .Column<int>("Count"),
-                collection: OpenIdApplicationCollection);
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdAppByLogoutUriIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdAppByLogoutUri_LogoutRedirectUri", "LogoutRedirectUri"),
-                collection: OpenIdApplicationCollection
-            );
-
-            await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdAppByRedirectUriIndex>(table => table
-                .Column<string>("RedirectUri")
-                .Column<int>("Count"),
-                collection: OpenIdApplicationCollection);
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdAppByRedirectUriIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdAppByRedirectUri_RedirectUri", "RedirectUri"),
-                collection: OpenIdApplicationCollection
-            );
-
-            await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdAppByRoleNameIndex>(table => table
-                .Column<string>("RoleName")
-                .Column<int>("Count"),
-                collection: OpenIdApplicationCollection);
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdAppByRoleNameIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdAppByRoleName_RoleName", "RoleName"),
-                collection: OpenIdApplicationCollection
-            );
-
-            await SchemaBuilder.CreateMapIndexTableAsync<OpenIdScopeIndex>(table => table
-                .Column<string>("Name", column => column.Unique())
-                .Column<string>("ScopeId", column => column.WithLength(48)),
-                collection: OpenIdScopeCollection);
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdScopeIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdScope",
-                    "DocumentId",
-                    "Name",
-                    "ScopeId"),
-                collection: OpenIdScopeCollection
-            );
-
-            await SchemaBuilder.CreateReduceIndexTableAsync<OpenIdScopeByResourceIndex>(table => table
-                .Column<string>("Resource")
-                .Column<int>("Count"),
-                collection: OpenIdScopeCollection);
-
-            await SchemaBuilder.AlterIndexTableAsync<OpenIdScopeByResourceIndex>(table => table
-                .CreateIndex("IDX_COL_OpenIdScopeByResource_Resource", "Resource"),
-                collection: OpenIdScopeCollection
-            );
-
-            // Retrieve all existing applications and scopes from original Document table.
-            var applications = await _session.Query<OpenIdApplication>().ListAsync();
-            var scopes = await _session.Query<OpenIdScope>().ListAsync();
-
-            // Enlist the old documents in the new collection and remove from the old collections.
-            foreach (var application in applications)
-            {
-                // Set the id to 0 or it will be considered an updated entity.
-                application.Id = 0;
-                await _session.SaveAsync(application, collection: OpenIdApplicationCollection);
-
-                // Delete from the original collection.
-                _session.Delete(application);
-            }
-
-            // Enlist the old documents in the new collection and remove from the old collections.
-            foreach (var scope in scopes)
-            {
-                // Set the id to 0 or it will be considered an updated entity.
-                scope.Id = 0;
-                await _session.SaveAsync(scope, collection: OpenIdScopeCollection);
-
-                // Delete from the original collection.
-                _session.Delete(scope);
-            }
-
-            // Flush the saved documents so that the old reduced indexes will be calculated
-            // and committed to the transaction before they are then dropped.
-            await _session.FlushAsync();
-
-            // These can be safely dropped after flushing.
-            await SchemaBuilder.DropMapIndexTableAsync<OpenIdApplicationIndex>();
-            await SchemaBuilder.DropReduceIndexTableAsync<OpenIdAppByLogoutUriIndex>();
-            await SchemaBuilder.DropReduceIndexTableAsync<OpenIdAppByRedirectUriIndex>();
-            await SchemaBuilder.DropReduceIndexTableAsync<OpenIdAppByRoleNameIndex>();
-
-            await SchemaBuilder.DropMapIndexTableAsync<OpenIdScopeIndex>();
-            await SchemaBuilder.DropReduceIndexTableAsync<OpenIdScopeByResourceIndex>();
-
-            return 8;
+            // Set the id to 0 or it will be considered an updated entity.
+            scope.Id = 0;
+            await _session.SaveAsync(scope, collection: OpenIdScopeCollection);
+
+            // Delete from the original collection.
+            _session.Delete(scope);
         }
+
+        // Flush the saved documents so that the old reduced indexes will be calculated
+        // and committed to the transaction before they are then dropped.
+        await _session.FlushAsync();
+
+        // These can be safely dropped after flushing.
+        await SchemaBuilder.DropMapIndexTableAsync<OpenIdApplicationIndex>();
+        await SchemaBuilder.DropReduceIndexTableAsync<OpenIdAppByLogoutUriIndex>();
+        await SchemaBuilder.DropReduceIndexTableAsync<OpenIdAppByRedirectUriIndex>();
+        await SchemaBuilder.DropReduceIndexTableAsync<OpenIdAppByRoleNameIndex>();
+
+        await SchemaBuilder.DropMapIndexTableAsync<OpenIdScopeIndex>();
+        await SchemaBuilder.DropReduceIndexTableAsync<OpenIdScopeByResourceIndex>();
+
+        return 8;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Models/OpenIdApplication.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Models/OpenIdApplication.cs
index 178f51a5720..c9eeb192ba9 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Models/OpenIdApplication.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Models/OpenIdApplication.cs
@@ -2,103 +2,102 @@
 using System.Globalization;
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.OpenId.YesSql.Models
+namespace OrchardCore.OpenId.YesSql.Models;
+
+public class OpenIdApplication
 {
-    public class OpenIdApplication
-    {
-        /// <summary>
-        /// The name of the collection that is used for this type.
-        /// </summary>
-        public const string OpenIdCollection = "OpenId";
-
-        /// <summary>
-        /// Gets or sets the unique identifier associated with the current application.
-        /// </summary>
-        public string ApplicationId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the application type associated with the current application.
-        /// </summary>
-        public string ApplicationType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the client identifier associated with the current application.
-        /// </summary>
-        public string ClientId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the client secret associated with the current application.
-        /// Note: depending on the application manager used to create this instance,
-        /// this property may be hashed or encrypted for security reasons.
-        /// </summary>
-        public string ClientSecret { get; set; }
-
-        /// <summary>
-        /// Gets or sets the consent type associated with the current application.
-        /// </summary>
-        public string ConsentType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the display name associated with the current application.
-        /// </summary>
-        public string DisplayName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the localized display names associated with the application.
-        /// </summary>
-        public ImmutableDictionary<CultureInfo, string> DisplayNames { get; set; }
-            = ImmutableDictionary.Create<CultureInfo, string>();
-
-        /// <summary>
-        /// Gets or sets the physical identifier associated with the current application.
-        /// </summary>
-        public long Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the JSON Web Key Set associated with the current application.
-        /// </summary>
-        // TODO: change the property type to JsonWebKeySet after migrating to System.Text.Json.
-        public JsonObject JsonWebKeySet { get; set; }
-
-        /// <summary>
-        /// Gets or sets the permissions associated with the application.
-        /// </summary>
-        public ImmutableArray<string> Permissions { get; set; } = [];
-
-        /// <summary>
-        /// Gets the logout callback URLs associated with the current application.
-        /// </summary>
-        public ImmutableArray<string> PostLogoutRedirectUris { get; set; } = [];
-
-        /// <summary>
-        /// Gets or sets the additional properties associated with the current application.
-        /// </summary>
-        public JsonObject Properties { get; set; }
-
-        /// <summary>
-        /// Gets or sets the callback URLs associated with the current application.
-        /// </summary>
-        public ImmutableArray<string> RedirectUris { get; set; } = [];
-
-        /// <summary>
-        /// Gets or sets the requirements associated with the current application.
-        /// </summary>
-        public ImmutableArray<string> Requirements { get; set; } = [];
-
-        /// <summary>
-        /// Gets or sets the roles associated with the application.
-        /// </summary>
-        public ImmutableArray<string> Roles { get; set; } = [];
-
-        /// <summary>
-        /// Gets or sets the settings associated with the application.
-        /// </summary>
-        public ImmutableDictionary<string, string> Settings { get; set; }
-            = ImmutableDictionary.Create<string, string>();
-
-        /// <summary>
-        /// Gets or sets the client type associated with the current application.
-        /// </summary>
-        public string Type { get; set; }
-    }
+    /// <summary>
+    /// The name of the collection that is used for this type.
+    /// </summary>
+    public const string OpenIdCollection = "OpenId";
+
+    /// <summary>
+    /// Gets or sets the unique identifier associated with the current application.
+    /// </summary>
+    public string ApplicationId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the application type associated with the current application.
+    /// </summary>
+    public string ApplicationType { get; set; }
+
+    /// <summary>
+    /// Gets or sets the client identifier associated with the current application.
+    /// </summary>
+    public string ClientId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the client secret associated with the current application.
+    /// Note: depending on the application manager used to create this instance,
+    /// this property may be hashed or encrypted for security reasons.
+    /// </summary>
+    public string ClientSecret { get; set; }
+
+    /// <summary>
+    /// Gets or sets the consent type associated with the current application.
+    /// </summary>
+    public string ConsentType { get; set; }
+
+    /// <summary>
+    /// Gets or sets the display name associated with the current application.
+    /// </summary>
+    public string DisplayName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the localized display names associated with the application.
+    /// </summary>
+    public ImmutableDictionary<CultureInfo, string> DisplayNames { get; set; }
+        = ImmutableDictionary.Create<CultureInfo, string>();
+
+    /// <summary>
+    /// Gets or sets the physical identifier associated with the current application.
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// Gets or sets the JSON Web Key Set associated with the current application.
+    /// </summary>
+    // TODO: change the property type to JsonWebKeySet after migrating to System.Text.Json.
+    public JsonObject JsonWebKeySet { get; set; }
+
+    /// <summary>
+    /// Gets or sets the permissions associated with the application.
+    /// </summary>
+    public ImmutableArray<string> Permissions { get; set; } = [];
+
+    /// <summary>
+    /// Gets the logout callback URLs associated with the current application.
+    /// </summary>
+    public ImmutableArray<string> PostLogoutRedirectUris { get; set; } = [];
+
+    /// <summary>
+    /// Gets or sets the additional properties associated with the current application.
+    /// </summary>
+    public JsonObject Properties { get; set; }
+
+    /// <summary>
+    /// Gets or sets the callback URLs associated with the current application.
+    /// </summary>
+    public ImmutableArray<string> RedirectUris { get; set; } = [];
+
+    /// <summary>
+    /// Gets or sets the requirements associated with the current application.
+    /// </summary>
+    public ImmutableArray<string> Requirements { get; set; } = [];
+
+    /// <summary>
+    /// Gets or sets the roles associated with the application.
+    /// </summary>
+    public ImmutableArray<string> Roles { get; set; } = [];
+
+    /// <summary>
+    /// Gets or sets the settings associated with the application.
+    /// </summary>
+    public ImmutableDictionary<string, string> Settings { get; set; }
+        = ImmutableDictionary.Create<string, string>();
+
+    /// <summary>
+    /// Gets or sets the client type associated with the current application.
+    /// </summary>
+    public string Type { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Models/OpenIdAuthorization.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Models/OpenIdAuthorization.cs
index c64e38bb7d7..64a7838a36f 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Models/OpenIdAuthorization.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Models/OpenIdAuthorization.cs
@@ -2,59 +2,58 @@
 using System.Collections.Immutable;
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.OpenId.YesSql.Models
+namespace OrchardCore.OpenId.YesSql.Models;
+
+public class OpenIdAuthorization
 {
-    public class OpenIdAuthorization
-    {
-        /// <summary>
-        /// The name of the collection that is used for this type.
-        /// </summary>
-        public const string OpenIdCollection = "OpenId";
-
-        /// <summary>
-        /// Gets or sets the unique identifier associated with the current application.
-        /// </summary>
-        public string AuthorizationId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the identifier of the client application
-        /// associated with the current authorization.
-        /// </summary>
-        public string ApplicationId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the creation date of the current authorization.
-        /// </summary>
-        public DateTime? CreationDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the physical identifier associated with the current authorization.
-        /// </summary>
-        public long Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the additional properties associated with the current authorization.
-        /// </summary>
-        public JsonObject Properties { get; set; }
-
-        /// <summary>
-        /// Gets or sets the scopes associated with the current authorization.
-        /// </summary>
-        public ImmutableArray<string> Scopes { get; set; } = [];
-
-        /// <summary>
-        /// Gets or sets the status of the current authorization.
-        /// </summary>
-        public string Status { get; set; }
-
-        /// <summary>
-        /// Gets or sets the subject associated with the current authorization.
-        /// </summary>
-        public string Subject { get; set; }
-
-        /// <summary>
-        /// Gets or sets the type of the current authorization.
-        /// </summary>
-        public string Type { get; set; }
-    }
+    /// <summary>
+    /// The name of the collection that is used for this type.
+    /// </summary>
+    public const string OpenIdCollection = "OpenId";
+
+    /// <summary>
+    /// Gets or sets the unique identifier associated with the current application.
+    /// </summary>
+    public string AuthorizationId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the identifier of the client application
+    /// associated with the current authorization.
+    /// </summary>
+    public string ApplicationId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the creation date of the current authorization.
+    /// </summary>
+    public DateTime? CreationDate { get; set; }
+
+    /// <summary>
+    /// Gets or sets the physical identifier associated with the current authorization.
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// Gets or sets the additional properties associated with the current authorization.
+    /// </summary>
+    public JsonObject Properties { get; set; }
+
+    /// <summary>
+    /// Gets or sets the scopes associated with the current authorization.
+    /// </summary>
+    public ImmutableArray<string> Scopes { get; set; } = [];
+
+    /// <summary>
+    /// Gets or sets the status of the current authorization.
+    /// </summary>
+    public string Status { get; set; }
+
+    /// <summary>
+    /// Gets or sets the subject associated with the current authorization.
+    /// </summary>
+    public string Subject { get; set; }
+
+    /// <summary>
+    /// Gets or sets the type of the current authorization.
+    /// </summary>
+    public string Type { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Models/OpenIdScope.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Models/OpenIdScope.cs
index 9d4396816bd..86f6984755d 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Models/OpenIdScope.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Models/OpenIdScope.cs
@@ -2,60 +2,59 @@
 using System.Globalization;
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.OpenId.YesSql.Models
+namespace OrchardCore.OpenId.YesSql.Models;
+
+public class OpenIdScope
 {
-    public class OpenIdScope
-    {
-        /// <summary>
-        /// The name of the collection that is used for this type.
-        /// </summary>
-        public const string OpenIdCollection = "OpenId";
-
-        /// <summary>
-        /// Gets or sets the unique identifier associated with the current scope.
-        /// </summary>
-        public string ScopeId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the public description associated with the current scope.
-        /// </summary>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the localized descriptions associated with the scope.
-        /// </summary>
-        public ImmutableDictionary<CultureInfo, string> Descriptions { get; set; }
-            = ImmutableDictionary.Create<CultureInfo, string>();
-
-        /// <summary>
-        /// Gets or sets the display name associated with the current scope.
-        /// </summary>
-        public string DisplayName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the localized display names associated with the scope.
-        /// </summary>
-        public ImmutableDictionary<CultureInfo, string> DisplayNames { get; set; }
-            = ImmutableDictionary.Create<CultureInfo, string>();
-
-        /// <summary>
-        /// Gets or sets the physical identifier associated with the current scope.
-        /// </summary>
-        public long Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the unique name associated with the current scope.
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the additional properties associated with the current scope.
-        /// </summary>
-        public JsonObject Properties { get; set; }
-
-        /// <summary>
-        /// Gets or sets the resources associated with the current scope.
-        /// </summary>
-        public ImmutableArray<string> Resources { get; set; } = [];
-    }
+    /// <summary>
+    /// The name of the collection that is used for this type.
+    /// </summary>
+    public const string OpenIdCollection = "OpenId";
+
+    /// <summary>
+    /// Gets or sets the unique identifier associated with the current scope.
+    /// </summary>
+    public string ScopeId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the public description associated with the current scope.
+    /// </summary>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// Gets or sets the localized descriptions associated with the scope.
+    /// </summary>
+    public ImmutableDictionary<CultureInfo, string> Descriptions { get; set; }
+        = ImmutableDictionary.Create<CultureInfo, string>();
+
+    /// <summary>
+    /// Gets or sets the display name associated with the current scope.
+    /// </summary>
+    public string DisplayName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the localized display names associated with the scope.
+    /// </summary>
+    public ImmutableDictionary<CultureInfo, string> DisplayNames { get; set; }
+        = ImmutableDictionary.Create<CultureInfo, string>();
+
+    /// <summary>
+    /// Gets or sets the physical identifier associated with the current scope.
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// Gets or sets the unique name associated with the current scope.
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the additional properties associated with the current scope.
+    /// </summary>
+    public JsonObject Properties { get; set; }
+
+    /// <summary>
+    /// Gets or sets the resources associated with the current scope.
+    /// </summary>
+    public ImmutableArray<string> Resources { get; set; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Models/OpenIdToken.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Models/OpenIdToken.cs
index bd68b2fc5e3..c2e837a2c44 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Models/OpenIdToken.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Models/OpenIdToken.cs
@@ -1,86 +1,85 @@
 using System;
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.OpenId.YesSql.Models
+namespace OrchardCore.OpenId.YesSql.Models;
+
+/// <summary>
+/// Represents an OpenId token.
+/// </summary>
+public class OpenIdToken
 {
     /// <summary>
-    /// Represents an OpenId token.
+    /// The name of the collection that is used for this type.
     /// </summary>
-    public class OpenIdToken
-    {
-        /// <summary>
-        /// The name of the collection that is used for this type.
-        /// </summary>
-        public const string OpenIdCollection = "OpenId";
+    public const string OpenIdCollection = "OpenId";
 
-        /// <summary>
-        /// Gets or sets the unique identifier associated with the current token.
-        /// </summary>
-        public string TokenId { get; set; }
+    /// <summary>
+    /// Gets or sets the unique identifier associated with the current token.
+    /// </summary>
+    public string TokenId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the identifier of the application associated with the current token.
-        /// </summary>
-        public string ApplicationId { get; set; }
+    /// <summary>
+    /// Gets or sets the identifier of the application associated with the current token.
+    /// </summary>
+    public string ApplicationId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the identifier of the authorization associated with the current token.
-        /// </summary>
-        public string AuthorizationId { get; set; }
+    /// <summary>
+    /// Gets or sets the identifier of the authorization associated with the current token.
+    /// </summary>
+    public string AuthorizationId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the creation date of the current token.
-        /// </summary>
-        public DateTime? CreationDate { get; set; }
+    /// <summary>
+    /// Gets or sets the creation date of the current token.
+    /// </summary>
+    public DateTime? CreationDate { get; set; }
 
-        /// <summary>
-        /// Gets or sets the expiration date of the current token.
-        /// </summary>
-        public DateTime? ExpirationDate { get; set; }
+    /// <summary>
+    /// Gets or sets the expiration date of the current token.
+    /// </summary>
+    public DateTime? ExpirationDate { get; set; }
 
-        /// <summary>
-        /// Gets or sets the physical identifier associated with the current token.
-        /// </summary>
-        public long Id { get; set; }
+    /// <summary>
+    /// Gets or sets the physical identifier associated with the current token.
+    /// </summary>
+    public long Id { get; set; }
 
-        /// <summary>
-        /// Gets or sets the payload of the current token, if applicable.
-        /// Note: this property is only used for reference tokens
-        /// and may be encrypted for security reasons.
-        /// </summary>
-        public string Payload { get; set; }
+    /// <summary>
+    /// Gets or sets the payload of the current token, if applicable.
+    /// Note: this property is only used for reference tokens
+    /// and may be encrypted for security reasons.
+    /// </summary>
+    public string Payload { get; set; }
 
-        /// <summary>
-        /// Gets or sets the additional properties associated with the current token.
-        /// </summary>
-        public JsonObject Properties { get; set; }
+    /// <summary>
+    /// Gets or sets the additional properties associated with the current token.
+    /// </summary>
+    public JsonObject Properties { get; set; }
 
-        /// <summary>
-        /// Gets or sets the redemption date of the current token.
-        /// </summary>
-        public DateTime? RedemptionDate { get; set; }
+    /// <summary>
+    /// Gets or sets the redemption date of the current token.
+    /// </summary>
+    public DateTime? RedemptionDate { get; set; }
 
-        /// <summary>
-        /// Gets or sets the reference identifier associated
-        /// with the current token, if applicable.
-        /// Note: this property is only used for reference tokens
-        /// and may be hashed or encrypted for security reasons.
-        /// </summary>
-        public string ReferenceId { get; set; }
+    /// <summary>
+    /// Gets or sets the reference identifier associated
+    /// with the current token, if applicable.
+    /// Note: this property is only used for reference tokens
+    /// and may be hashed or encrypted for security reasons.
+    /// </summary>
+    public string ReferenceId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the status of the current token.
-        /// </summary>
-        public string Status { get; set; }
+    /// <summary>
+    /// Gets or sets the status of the current token.
+    /// </summary>
+    public string Status { get; set; }
 
-        /// <summary>
-        /// Gets or sets the subject associated with the current token.
-        /// </summary>
-        public string Subject { get; set; }
+    /// <summary>
+    /// Gets or sets the subject associated with the current token.
+    /// </summary>
+    public string Subject { get; set; }
 
-        /// <summary>
-        /// Gets or sets the type of the current token.
-        /// </summary>
-        public string Type { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the type of the current token.
+    /// </summary>
+    public string Type { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Resolvers/OpenIdApplicationStoreResolver.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Resolvers/OpenIdApplicationStoreResolver.cs
index 49362e000f4..33b16a4253a 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Resolvers/OpenIdApplicationStoreResolver.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Resolvers/OpenIdApplicationStoreResolver.cs
@@ -6,51 +6,50 @@
 using OrchardCore.OpenId.YesSql.Models;
 using OrchardCore.OpenId.YesSql.Stores;
 
-namespace OrchardCore.OpenId.YesSql.Resolvers
+namespace OrchardCore.OpenId.YesSql.Resolvers;
+
+/// <inheritdoc/>
+public class OpenIdApplicationStoreResolver : IOpenIddictApplicationStoreResolver
 {
-    /// <inheritdoc/>
-    public class OpenIdApplicationStoreResolver : IOpenIddictApplicationStoreResolver
+    private readonly TypeResolutionCache _cache;
+    private readonly IServiceProvider _provider;
+
+    public OpenIdApplicationStoreResolver(TypeResolutionCache cache, IServiceProvider provider)
     {
-        private readonly TypeResolutionCache _cache;
-        private readonly IServiceProvider _provider;
+        _cache = cache;
+        _provider = provider;
+    }
 
-        public OpenIdApplicationStoreResolver(TypeResolutionCache cache, IServiceProvider provider)
+    /// <inheritdoc/>
+    public IOpenIddictApplicationStore<TApplication> Get<TApplication>() where TApplication : class
+    {
+        var store = _provider.GetService<IOpenIddictApplicationStore<TApplication>>();
+        if (store != null)
         {
-            _cache = cache;
-            _provider = provider;
+            return store;
         }
 
-        /// <inheritdoc/>
-        public IOpenIddictApplicationStore<TApplication> Get<TApplication>() where TApplication : class
+        var type = _cache.GetOrAdd(typeof(TApplication), key =>
         {
-            var store = _provider.GetService<IOpenIddictApplicationStore<TApplication>>();
-            if (store != null)
+            if (!typeof(OpenIdApplication).IsAssignableFrom(key))
             {
-                return store;
+                throw new InvalidOperationException(new StringBuilder()
+                    .AppendLine("The specified application type is not compatible with the YesSql stores.")
+                    .Append("When enabling the YesSql stores, make sure you use the built-in 'OpenIdApplication' ")
+                    .Append("entity (from the 'OrchardCore.OpenId.Core' package) or a custom entity ")
+                    .Append("that inherits from the 'OpenIdApplication' entity.")
+                    .ToString());
             }
 
-            var type = _cache.GetOrAdd(typeof(TApplication), key =>
-            {
-                if (!typeof(OpenIdApplication).IsAssignableFrom(key))
-                {
-                    throw new InvalidOperationException(new StringBuilder()
-                        .AppendLine("The specified application type is not compatible with the YesSql stores.")
-                        .Append("When enabling the YesSql stores, make sure you use the built-in 'OpenIdApplication' ")
-                        .Append("entity (from the 'OrchardCore.OpenId.Core' package) or a custom entity ")
-                        .Append("that inherits from the 'OpenIdApplication' entity.")
-                        .ToString());
-                }
-
-                return typeof(OpenIdApplicationStore<>).MakeGenericType(key);
-            });
-
-            return (IOpenIddictApplicationStore<TApplication>)_provider.GetRequiredService(type);
-        }
+            return typeof(OpenIdApplicationStore<>).MakeGenericType(key);
+        });
 
-        // Note: OrchardCore YesSql resolvers are registered as scoped dependencies as their inner
-        // service provider must be able to resolve scoped services (typically, the store they return).
-        // To avoid having to declare a static type resolution cache, a special cache service is used
-        // here and registered as a singleton dependency so that its content persists beyond the scope.
-        public class TypeResolutionCache : ConcurrentDictionary<Type, Type> { }
+        return (IOpenIddictApplicationStore<TApplication>)_provider.GetRequiredService(type);
     }
+
+    // Note: OrchardCore YesSql resolvers are registered as scoped dependencies as their inner
+    // service provider must be able to resolve scoped services (typically, the store they return).
+    // To avoid having to declare a static type resolution cache, a special cache service is used
+    // here and registered as a singleton dependency so that its content persists beyond the scope.
+    public class TypeResolutionCache : ConcurrentDictionary<Type, Type> { }
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Resolvers/OpenIdAuthorizationStoreResolver.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Resolvers/OpenIdAuthorizationStoreResolver.cs
index 39868f9fafb..b9fb0d215d7 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Resolvers/OpenIdAuthorizationStoreResolver.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Resolvers/OpenIdAuthorizationStoreResolver.cs
@@ -6,51 +6,50 @@
 using OrchardCore.OpenId.YesSql.Models;
 using OrchardCore.OpenId.YesSql.Stores;
 
-namespace OrchardCore.OpenId.YesSql.Resolvers
+namespace OrchardCore.OpenId.YesSql.Resolvers;
+
+/// <inheritdoc/>
+public class OpenIdAuthorizationStoreResolver : IOpenIddictAuthorizationStoreResolver
 {
-    /// <inheritdoc/>
-    public class OpenIdAuthorizationStoreResolver : IOpenIddictAuthorizationStoreResolver
+    private readonly TypeResolutionCache _cache;
+    private readonly IServiceProvider _provider;
+
+    public OpenIdAuthorizationStoreResolver(TypeResolutionCache cache, IServiceProvider provider)
     {
-        private readonly TypeResolutionCache _cache;
-        private readonly IServiceProvider _provider;
+        _cache = cache;
+        _provider = provider;
+    }
 
-        public OpenIdAuthorizationStoreResolver(TypeResolutionCache cache, IServiceProvider provider)
+    /// <inheritdoc/>
+    public IOpenIddictAuthorizationStore<TAuthorization> Get<TAuthorization>() where TAuthorization : class
+    {
+        var store = _provider.GetService<IOpenIddictAuthorizationStore<TAuthorization>>();
+        if (store != null)
         {
-            _cache = cache;
-            _provider = provider;
+            return store;
         }
 
-        /// <inheritdoc/>
-        public IOpenIddictAuthorizationStore<TAuthorization> Get<TAuthorization>() where TAuthorization : class
+        var type = _cache.GetOrAdd(typeof(TAuthorization), key =>
         {
-            var store = _provider.GetService<IOpenIddictAuthorizationStore<TAuthorization>>();
-            if (store != null)
+            if (!typeof(OpenIdAuthorization).IsAssignableFrom(key))
             {
-                return store;
+                throw new InvalidOperationException(new StringBuilder()
+                    .AppendLine("The specified authorization type is not compatible with the YesSql stores.")
+                    .Append("When enabling the YesSql stores, make sure you use the built-in 'OpenIdAuthorization' ")
+                    .Append("entity (from the 'OrchardCore.OpenId.Core' package) or a custom entity ")
+                    .Append("that inherits from the 'OpenIdAuthorization' entity.")
+                    .ToString());
             }
 
-            var type = _cache.GetOrAdd(typeof(TAuthorization), key =>
-            {
-                if (!typeof(OpenIdAuthorization).IsAssignableFrom(key))
-                {
-                    throw new InvalidOperationException(new StringBuilder()
-                        .AppendLine("The specified authorization type is not compatible with the YesSql stores.")
-                        .Append("When enabling the YesSql stores, make sure you use the built-in 'OpenIdAuthorization' ")
-                        .Append("entity (from the 'OrchardCore.OpenId.Core' package) or a custom entity ")
-                        .Append("that inherits from the 'OpenIdAuthorization' entity.")
-                        .ToString());
-                }
-
-                return typeof(OpenIdAuthorizationStore<>).MakeGenericType(key);
-            });
-
-            return (IOpenIddictAuthorizationStore<TAuthorization>)_provider.GetRequiredService(type);
-        }
+            return typeof(OpenIdAuthorizationStore<>).MakeGenericType(key);
+        });
 
-        // Note: OrchardCore YesSql resolvers are registered as scoped dependencies as their inner
-        // service provider must be able to resolve scoped services (typically, the store they return).
-        // To avoid having to declare a static type resolution cache, a special cache service is used
-        // here and registered as a singleton dependency so that its content persists beyond the scope.
-        public class TypeResolutionCache : ConcurrentDictionary<Type, Type> { }
+        return (IOpenIddictAuthorizationStore<TAuthorization>)_provider.GetRequiredService(type);
     }
+
+    // Note: OrchardCore YesSql resolvers are registered as scoped dependencies as their inner
+    // service provider must be able to resolve scoped services (typically, the store they return).
+    // To avoid having to declare a static type resolution cache, a special cache service is used
+    // here and registered as a singleton dependency so that its content persists beyond the scope.
+    public class TypeResolutionCache : ConcurrentDictionary<Type, Type> { }
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Resolvers/OpenIdScopeStoreResolver.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Resolvers/OpenIdScopeStoreResolver.cs
index 756d45308fc..c15faa437ab 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Resolvers/OpenIdScopeStoreResolver.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Resolvers/OpenIdScopeStoreResolver.cs
@@ -6,51 +6,50 @@
 using OrchardCore.OpenId.YesSql.Models;
 using OrchardCore.OpenId.YesSql.Stores;
 
-namespace OrchardCore.OpenId.YesSql.Resolvers
+namespace OrchardCore.OpenId.YesSql.Resolvers;
+
+/// <inheritdoc/>
+public class OpenIdScopeStoreResolver : IOpenIddictScopeStoreResolver
 {
-    /// <inheritdoc/>
-    public class OpenIdScopeStoreResolver : IOpenIddictScopeStoreResolver
+    private readonly TypeResolutionCache _cache;
+    private readonly IServiceProvider _provider;
+
+    public OpenIdScopeStoreResolver(TypeResolutionCache cache, IServiceProvider provider)
     {
-        private readonly TypeResolutionCache _cache;
-        private readonly IServiceProvider _provider;
+        _cache = cache;
+        _provider = provider;
+    }
 
-        public OpenIdScopeStoreResolver(TypeResolutionCache cache, IServiceProvider provider)
+    /// <inheritdoc/>
+    public IOpenIddictScopeStore<TScope> Get<TScope>() where TScope : class
+    {
+        var store = _provider.GetService<IOpenIddictScopeStore<TScope>>();
+        if (store != null)
         {
-            _cache = cache;
-            _provider = provider;
+            return store;
         }
 
-        /// <inheritdoc/>
-        public IOpenIddictScopeStore<TScope> Get<TScope>() where TScope : class
+        var type = _cache.GetOrAdd(typeof(TScope), key =>
         {
-            var store = _provider.GetService<IOpenIddictScopeStore<TScope>>();
-            if (store != null)
+            if (!typeof(OpenIdScope).IsAssignableFrom(key))
             {
-                return store;
+                throw new InvalidOperationException(new StringBuilder()
+                    .AppendLine("The specified scope type is not compatible with the YesSql stores.")
+                    .Append("When enabling the YesSql stores, make sure you use the built-in 'OpenIdScope' ")
+                    .Append("entity (from the 'OrchardCore.OpenId.Core' package) or a custom entity ")
+                    .Append("that inherits from the 'OpenIdScope' entity.")
+                    .ToString());
             }
 
-            var type = _cache.GetOrAdd(typeof(TScope), key =>
-            {
-                if (!typeof(OpenIdScope).IsAssignableFrom(key))
-                {
-                    throw new InvalidOperationException(new StringBuilder()
-                        .AppendLine("The specified scope type is not compatible with the YesSql stores.")
-                        .Append("When enabling the YesSql stores, make sure you use the built-in 'OpenIdScope' ")
-                        .Append("entity (from the 'OrchardCore.OpenId.Core' package) or a custom entity ")
-                        .Append("that inherits from the 'OpenIdScope' entity.")
-                        .ToString());
-                }
-
-                return typeof(OpenIdScopeStore<>).MakeGenericType(key);
-            });
-
-            return (IOpenIddictScopeStore<TScope>)_provider.GetRequiredService(type);
-        }
+            return typeof(OpenIdScopeStore<>).MakeGenericType(key);
+        });
 
-        // Note: OrchardCore YesSql resolvers are registered as scoped dependencies as their inner
-        // service provider must be able to resolve scoped services (typically, the store they return).
-        // To avoid having to declare a static type resolution cache, a special cache service is used
-        // here and registered as a singleton dependency so that its content persists beyond the scope.
-        public class TypeResolutionCache : ConcurrentDictionary<Type, Type> { }
+        return (IOpenIddictScopeStore<TScope>)_provider.GetRequiredService(type);
     }
+
+    // Note: OrchardCore YesSql resolvers are registered as scoped dependencies as their inner
+    // service provider must be able to resolve scoped services (typically, the store they return).
+    // To avoid having to declare a static type resolution cache, a special cache service is used
+    // here and registered as a singleton dependency so that its content persists beyond the scope.
+    public class TypeResolutionCache : ConcurrentDictionary<Type, Type> { }
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Resolvers/OpenIdTokenStoreResolver.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Resolvers/OpenIdTokenStoreResolver.cs
index 309d08a1e99..33610b16b02 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Resolvers/OpenIdTokenStoreResolver.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Resolvers/OpenIdTokenStoreResolver.cs
@@ -6,51 +6,50 @@
 using OrchardCore.OpenId.YesSql.Models;
 using OrchardCore.OpenId.YesSql.Stores;
 
-namespace OrchardCore.OpenId.YesSql.Resolvers
+namespace OrchardCore.OpenId.YesSql.Resolvers;
+
+/// <inheritdoc/>
+public class OpenIdTokenStoreResolver : IOpenIddictTokenStoreResolver
 {
-    /// <inheritdoc/>
-    public class OpenIdTokenStoreResolver : IOpenIddictTokenStoreResolver
+    private readonly TypeResolutionCache _cache;
+    private readonly IServiceProvider _provider;
+
+    public OpenIdTokenStoreResolver(TypeResolutionCache cache, IServiceProvider provider)
     {
-        private readonly TypeResolutionCache _cache;
-        private readonly IServiceProvider _provider;
+        _cache = cache;
+        _provider = provider;
+    }
 
-        public OpenIdTokenStoreResolver(TypeResolutionCache cache, IServiceProvider provider)
+    /// <inheritdoc/>
+    public IOpenIddictTokenStore<TToken> Get<TToken>() where TToken : class
+    {
+        var store = _provider.GetService<IOpenIddictTokenStore<TToken>>();
+        if (store != null)
         {
-            _cache = cache;
-            _provider = provider;
+            return store;
         }
 
-        /// <inheritdoc/>
-        public IOpenIddictTokenStore<TToken> Get<TToken>() where TToken : class
+        var type = _cache.GetOrAdd(typeof(TToken), key =>
         {
-            var store = _provider.GetService<IOpenIddictTokenStore<TToken>>();
-            if (store != null)
+            if (!typeof(OpenIdToken).IsAssignableFrom(key))
             {
-                return store;
+                throw new InvalidOperationException(new StringBuilder()
+                    .AppendLine("The specified token type is not compatible with the YesSql stores.")
+                    .Append("When enabling the YesSql stores, make sure you use the built-in 'OpenIdToken' ")
+                    .Append("entity (from the 'OrchardCore.OpenId.Core' package) or a custom entity ")
+                    .Append("that inherits from the 'OpenIdToken' entity.")
+                    .ToString());
             }
 
-            var type = _cache.GetOrAdd(typeof(TToken), key =>
-            {
-                if (!typeof(OpenIdToken).IsAssignableFrom(key))
-                {
-                    throw new InvalidOperationException(new StringBuilder()
-                        .AppendLine("The specified token type is not compatible with the YesSql stores.")
-                        .Append("When enabling the YesSql stores, make sure you use the built-in 'OpenIdToken' ")
-                        .Append("entity (from the 'OrchardCore.OpenId.Core' package) or a custom entity ")
-                        .Append("that inherits from the 'OpenIdToken' entity.")
-                        .ToString());
-                }
-
-                return typeof(OpenIdTokenStore<>).MakeGenericType(key);
-            });
-
-            return (IOpenIddictTokenStore<TToken>)_provider.GetRequiredService(type);
-        }
+            return typeof(OpenIdTokenStore<>).MakeGenericType(key);
+        });
 
-        // Note: OrchardCore YesSql resolvers are registered as scoped dependencies as their inner
-        // service provider must be able to resolve scoped services (typically, the store they return).
-        // To avoid having to declare a static type resolution cache, a special cache service is used
-        // here and registered as a singleton dependency so that its content persists beyond the scope.
-        public class TypeResolutionCache : ConcurrentDictionary<Type, Type> { }
+        return (IOpenIddictTokenStore<TToken>)_provider.GetRequiredService(type);
     }
+
+    // Note: OrchardCore YesSql resolvers are registered as scoped dependencies as their inner
+    // service provider must be able to resolve scoped services (typically, the store they return).
+    // To avoid having to declare a static type resolution cache, a special cache service is used
+    // here and registered as a singleton dependency so that its content persists beyond the scope.
+    public class TypeResolutionCache : ConcurrentDictionary<Type, Type> { }
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdApplicationStore.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdApplicationStore.cs
index 62b81c60ead..0f086c53fe0 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdApplicationStore.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdApplicationStore.cs
@@ -16,495 +16,494 @@
 using OrchardCore.OpenId.YesSql.Models;
 using YesSql;
 
-namespace OrchardCore.OpenId.YesSql.Stores
+namespace OrchardCore.OpenId.YesSql.Stores;
+
+public class OpenIdApplicationStore<TApplication> : IOpenIdApplicationStore<TApplication>
+    where TApplication : OpenIdApplication, new()
 {
-    public class OpenIdApplicationStore<TApplication> : IOpenIdApplicationStore<TApplication>
-        where TApplication : OpenIdApplication, new()
+    private static readonly JsonSerializerOptions _serializerOptions = new()
     {
-        private static readonly JsonSerializerOptions _serializerOptions = new()
-        {
-            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-            WriteIndented = false
-        };
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+        WriteIndented = false
+    };
 
-        private const string OpenIdCollection = OpenIdAuthorization.OpenIdCollection;
-        private readonly ISession _session;
+    private const string OpenIdCollection = OpenIdAuthorization.OpenIdCollection;
+    private readonly ISession _session;
 
-        public OpenIdApplicationStore(ISession session)
-        {
-            _session = session;
-        }
+    public OpenIdApplicationStore(ISession session)
+    {
+        _session = session;
+    }
 
-        /// <inheritdoc/>
-        public virtual async ValueTask<long> CountAsync(CancellationToken cancellationToken)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
+    /// <inheritdoc/>
+    public virtual async ValueTask<long> CountAsync(CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
 
-            return await _session.Query<TApplication>(collection: OpenIdCollection).CountAsync();
-        }
+        return await _session.Query<TApplication>(collection: OpenIdCollection).CountAsync();
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask<long> CountAsync<TResult>(Func<IQueryable<TApplication>, IQueryable<TResult>> query, CancellationToken cancellationToken)
-            => throw new NotSupportedException();
+    /// <inheritdoc/>
+    public virtual ValueTask<long> CountAsync<TResult>(Func<IQueryable<TApplication>, IQueryable<TResult>> query, CancellationToken cancellationToken)
+        => throw new NotSupportedException();
 
-        /// <inheritdoc/>
-        public virtual async ValueTask CreateAsync(TApplication application, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+    /// <inheritdoc/>
+    public virtual async ValueTask CreateAsync(TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-            cancellationToken.ThrowIfCancellationRequested();
+        cancellationToken.ThrowIfCancellationRequested();
 
-            await _session.SaveAsync(application, collection: OpenIdCollection);
-            await _session.SaveChangesAsync();
-        }
+        await _session.SaveAsync(application, collection: OpenIdCollection);
+        await _session.SaveChangesAsync();
+    }
 
-        /// <inheritdoc/>
-        public virtual async ValueTask DeleteAsync(TApplication application, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+    /// <inheritdoc/>
+    public virtual async ValueTask DeleteAsync(TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-            cancellationToken.ThrowIfCancellationRequested();
+        cancellationToken.ThrowIfCancellationRequested();
 
-            _session.Delete(application, collection: OpenIdCollection);
-            await _session.SaveChangesAsync();
-        }
+        _session.Delete(application, collection: OpenIdCollection);
+        await _session.SaveChangesAsync();
+    }
 
-        /// <inheritdoc/>
-        public virtual async ValueTask<TApplication> FindByIdAsync(string identifier, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(identifier);
+    /// <inheritdoc/>
+    public virtual async ValueTask<TApplication> FindByIdAsync(string identifier, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(identifier);
 
-            cancellationToken.ThrowIfCancellationRequested();
+        cancellationToken.ThrowIfCancellationRequested();
 
-            return await _session.Query<TApplication, OpenIdApplicationIndex>(index => index.ApplicationId == identifier, collection: OpenIdCollection).FirstOrDefaultAsync();
-        }
+        return await _session.Query<TApplication, OpenIdApplicationIndex>(index => index.ApplicationId == identifier, collection: OpenIdCollection).FirstOrDefaultAsync();
+    }
 
-        /// <inheritdoc/>
-        public virtual async ValueTask<TApplication> FindByClientIdAsync(string identifier, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(identifier);
+    /// <inheritdoc/>
+    public virtual async ValueTask<TApplication> FindByClientIdAsync(string identifier, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(identifier);
 
-            cancellationToken.ThrowIfCancellationRequested();
+        cancellationToken.ThrowIfCancellationRequested();
 
-            return await _session.Query<TApplication, OpenIdApplicationIndex>(index => index.ClientId == identifier, collection: OpenIdCollection).FirstOrDefaultAsync();
-        }
+        return await _session.Query<TApplication, OpenIdApplicationIndex>(index => index.ClientId == identifier, collection: OpenIdCollection).FirstOrDefaultAsync();
+    }
 
-        /// <inheritdoc/>
-        public virtual async ValueTask<TApplication> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(identifier);
+    /// <inheritdoc/>
+    public virtual async ValueTask<TApplication> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(identifier);
 
-            cancellationToken.ThrowIfCancellationRequested();
+        cancellationToken.ThrowIfCancellationRequested();
 
-            return await _session.GetAsync<TApplication>(long.Parse(identifier, CultureInfo.InvariantCulture), collection: OpenIdCollection);
-        }
+        return await _session.GetAsync<TApplication>(long.Parse(identifier, CultureInfo.InvariantCulture), collection: OpenIdCollection);
+    }
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TApplication> FindByPostLogoutRedirectUriAsync(string uri, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(uri);
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TApplication> FindByPostLogoutRedirectUriAsync(string uri, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(uri);
 
-            cancellationToken.ThrowIfCancellationRequested();
+        cancellationToken.ThrowIfCancellationRequested();
 
-            return _session.Query<TApplication, OpenIdAppByLogoutUriIndex>(
-                index => index.LogoutRedirectUri == uri,
-                collection: OpenIdCollection).ToAsyncEnumerable();
-        }
+        return _session.Query<TApplication, OpenIdAppByLogoutUriIndex>(
+            index => index.LogoutRedirectUri == uri,
+            collection: OpenIdCollection).ToAsyncEnumerable();
+    }
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TApplication> FindByRedirectUriAsync(string uri, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(uri);
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TApplication> FindByRedirectUriAsync(string uri, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(uri);
 
-            cancellationToken.ThrowIfCancellationRequested();
+        cancellationToken.ThrowIfCancellationRequested();
 
-            return _session.Query<TApplication, OpenIdAppByRedirectUriIndex>(
-                index => index.RedirectUri == uri,
-                collection: OpenIdCollection).ToAsyncEnumerable();
-        }
+        return _session.Query<TApplication, OpenIdAppByRedirectUriIndex>(
+            index => index.RedirectUri == uri,
+            collection: OpenIdCollection).ToAsyncEnumerable();
+    }
 
-        public virtual ValueTask<string> GetApplicationTypeAsync(TApplication application, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+    public virtual ValueTask<string> GetApplicationTypeAsync(TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-            return new ValueTask<string>(application.ApplicationType);
-        }
+        return new ValueTask<string>(application.ApplicationType);
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask<TResult> GetAsync<TState, TResult>(
-            Func<IQueryable<TApplication>, TState, IQueryable<TResult>> query,
-            TState state, CancellationToken cancellationToken)
-            => throw new NotSupportedException();
+    /// <inheritdoc/>
+    public virtual ValueTask<TResult> GetAsync<TState, TResult>(
+        Func<IQueryable<TApplication>, TState, IQueryable<TResult>> query,
+        TState state, CancellationToken cancellationToken)
+        => throw new NotSupportedException();
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetClientIdAsync(TApplication application, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetClientIdAsync(TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-            return new ValueTask<string>(application.ClientId);
-        }
+        return new ValueTask<string>(application.ClientId);
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetClientSecretAsync(TApplication application, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetClientSecretAsync(TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-            return new ValueTask<string>(application.ClientSecret);
-        }
+        return new ValueTask<string>(application.ClientSecret);
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetClientTypeAsync(TApplication application, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetClientTypeAsync(TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-            return new ValueTask<string>(application.Type);
-        }
+        return new ValueTask<string>(application.Type);
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetConsentTypeAsync(TApplication application, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetConsentTypeAsync(TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-            return new ValueTask<string>(application.ConsentType);
-        }
+        return new ValueTask<string>(application.ConsentType);
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetDisplayNameAsync(TApplication application, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetDisplayNameAsync(TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-            return new ValueTask<string>(application.DisplayName);
-        }
+        return new ValueTask<string>(application.DisplayName);
+    }
+
+    /// <inheritdoc/>
+    public virtual ValueTask<ImmutableDictionary<CultureInfo, string>> GetDisplayNamesAsync(
+        TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<ImmutableDictionary<CultureInfo, string>> GetDisplayNamesAsync(
-            TApplication application, CancellationToken cancellationToken)
+        if (application.DisplayNames == null)
         {
-            ArgumentNullException.ThrowIfNull(application);
+            return new ValueTask<ImmutableDictionary<CultureInfo, string>>(ImmutableDictionary.Create<CultureInfo, string>());
+        }
 
-            if (application.DisplayNames == null)
-            {
-                return new ValueTask<ImmutableDictionary<CultureInfo, string>>(ImmutableDictionary.Create<CultureInfo, string>());
-            }
+        return new ValueTask<ImmutableDictionary<CultureInfo, string>>(application.DisplayNames);
+    }
 
-            return new ValueTask<ImmutableDictionary<CultureInfo, string>>(application.DisplayNames);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetIdAsync(TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetIdAsync(TApplication application, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+        return new ValueTask<string>(application.ApplicationId);
+    }
 
-            return new ValueTask<string>(application.ApplicationId);
-        }
+    public virtual ValueTask<JsonWebKeySet> GetJsonWebKeySetAsync(TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-        public virtual ValueTask<JsonWebKeySet> GetJsonWebKeySetAsync(TApplication application, CancellationToken cancellationToken)
+        if (application.JsonWebKeySet is null)
         {
-            ArgumentNullException.ThrowIfNull(application);
+            return new ValueTask<JsonWebKeySet>(result: null);
+        }
 
-            if (application.JsonWebKeySet is null)
-            {
-                return new ValueTask<JsonWebKeySet>(result: null);
-            }
+        return new ValueTask<JsonWebKeySet>(JsonSerializer.Deserialize<JsonWebKeySet>(application.JsonWebKeySet.ToString(), JOptions.Default));
+    }
 
-            return new ValueTask<JsonWebKeySet>(JsonSerializer.Deserialize<JsonWebKeySet>(application.JsonWebKeySet.ToString(), JOptions.Default));
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<ImmutableArray<string>> GetPermissionsAsync(TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<ImmutableArray<string>> GetPermissionsAsync(TApplication application, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+        return new ValueTask<ImmutableArray<string>>(application.Permissions);
+    }
 
-            return new ValueTask<ImmutableArray<string>>(application.Permissions);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetPhysicalIdAsync(TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetPhysicalIdAsync(TApplication application, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+        return new ValueTask<string>(application.Id.ToString(CultureInfo.InvariantCulture));
+    }
 
-            return new ValueTask<string>(application.Id.ToString(CultureInfo.InvariantCulture));
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<ImmutableArray<string>> GetPostLogoutRedirectUrisAsync(TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<ImmutableArray<string>> GetPostLogoutRedirectUrisAsync(TApplication application, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+        return new ValueTask<ImmutableArray<string>>(application.PostLogoutRedirectUris);
+    }
 
-            return new ValueTask<ImmutableArray<string>>(application.PostLogoutRedirectUris);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<ImmutableDictionary<string, JsonElement>> GetPropertiesAsync(TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<ImmutableDictionary<string, JsonElement>> GetPropertiesAsync(TApplication application, CancellationToken cancellationToken)
+        if (application.Properties == null)
         {
-            ArgumentNullException.ThrowIfNull(application);
+            return new ValueTask<ImmutableDictionary<string, JsonElement>>(ImmutableDictionary.Create<string, JsonElement>());
+        }
 
-            if (application.Properties == null)
-            {
-                return new ValueTask<ImmutableDictionary<string, JsonElement>>(ImmutableDictionary.Create<string, JsonElement>());
-            }
+        return new ValueTask<ImmutableDictionary<string, JsonElement>>(
+            JConvert.DeserializeObject<ImmutableDictionary<string, JsonElement>>(application.Properties.ToString()));
+    }
 
-            return new ValueTask<ImmutableDictionary<string, JsonElement>>(
-                JConvert.DeserializeObject<ImmutableDictionary<string, JsonElement>>(application.Properties.ToString()));
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<ImmutableArray<string>> GetRedirectUrisAsync(TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<ImmutableArray<string>> GetRedirectUrisAsync(TApplication application, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+        return new ValueTask<ImmutableArray<string>>(application.RedirectUris);
+    }
 
-            return new ValueTask<ImmutableArray<string>>(application.RedirectUris);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<ImmutableArray<string>> GetRequirementsAsync(TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<ImmutableArray<string>> GetRequirementsAsync(TApplication application, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+        return new ValueTask<ImmutableArray<string>>(application.Requirements);
+    }
 
-            return new ValueTask<ImmutableArray<string>>(application.Requirements);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<ImmutableDictionary<string, string>> GetSettingsAsync(TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
+
+        return new ValueTask<ImmutableDictionary<string, string>>(application.Settings);
+    }
+
+    /// <inheritdoc/>
+    public virtual ValueTask<TApplication> InstantiateAsync(CancellationToken cancellationToken)
+        => new(new TApplication { ApplicationId = Guid.NewGuid().ToString("n") });
 
-        /// <inheritdoc/>
-        public virtual ValueTask<ImmutableDictionary<string, string>> GetSettingsAsync(TApplication application, CancellationToken cancellationToken)
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TApplication> ListAsync(int? count, int? offset, CancellationToken cancellationToken)
+    {
+        var query = _session.Query<TApplication>(collection: OpenIdCollection);
+
+        if (offset.HasValue)
         {
-            ArgumentNullException.ThrowIfNull(application);
+            query = query.Skip(offset.Value);
+        }
 
-            return new ValueTask<ImmutableDictionary<string, string>>(application.Settings);
+        if (count.HasValue)
+        {
+            query = query.Take(count.Value);
         }
 
-        /// <inheritdoc/>
-        public virtual ValueTask<TApplication> InstantiateAsync(CancellationToken cancellationToken)
-            => new(new TApplication { ApplicationId = Guid.NewGuid().ToString("n") });
+        return query.ToAsyncEnumerable();
+    }
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TApplication> ListAsync(int? count, int? offset, CancellationToken cancellationToken)
-        {
-            var query = _session.Query<TApplication>(collection: OpenIdCollection);
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TResult> ListAsync<TState, TResult>(
+        Func<IQueryable<TApplication>, TState, IQueryable<TResult>> query,
+        TState state, CancellationToken cancellationToken)
+        => throw new NotSupportedException();
 
-            if (offset.HasValue)
-            {
-                query = query.Skip(offset.Value);
-            }
+    /// <inheritdoc/>
+    public virtual ValueTask SetApplicationTypeAsync(TApplication application, string type, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-            if (count.HasValue)
-            {
-                query = query.Take(count.Value);
-            }
+        application.ApplicationType = type;
 
-            return query.ToAsyncEnumerable();
-        }
+        return default;
+    }
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TResult> ListAsync<TState, TResult>(
-            Func<IQueryable<TApplication>, TState, IQueryable<TResult>> query,
-            TState state, CancellationToken cancellationToken)
-            => throw new NotSupportedException();
+    /// <inheritdoc/>
+    public virtual ValueTask SetClientIdAsync(TApplication application,
+        string identifier, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetApplicationTypeAsync(TApplication application, string type, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+        application.ClientId = identifier;
 
-            application.ApplicationType = type;
+        return default;
+    }
 
-            return default;
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask SetClientSecretAsync(TApplication application, string secret, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetClientIdAsync(TApplication application,
-            string identifier, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+        application.ClientSecret = secret;
 
-            application.ClientId = identifier;
+        return default;
+    }
 
-            return default;
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask SetClientTypeAsync(TApplication application, string type, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetClientSecretAsync(TApplication application, string secret, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+        application.Type = type;
 
-            application.ClientSecret = secret;
+        return default;
+    }
 
-            return default;
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask SetConsentTypeAsync(TApplication application, string type, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetClientTypeAsync(TApplication application, string type, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+        application.ConsentType = type;
 
-            application.Type = type;
+        return default;
+    }
 
-            return default;
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask SetDisplayNameAsync(TApplication application, string name, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetConsentTypeAsync(TApplication application, string type, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+        application.DisplayName = name;
 
-            application.ConsentType = type;
+        return default;
+    }
 
-            return default;
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask SetDisplayNamesAsync(TApplication application, ImmutableDictionary<CultureInfo, string> names, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetDisplayNameAsync(TApplication application, string name, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+        application.DisplayNames = names;
 
-            application.DisplayName = name;
+        return default;
+    }
 
-            return default;
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask SetJsonWebKeySetAsync(TApplication application, JsonWebKeySet set, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetDisplayNamesAsync(TApplication application, ImmutableDictionary<CultureInfo, string> names, CancellationToken cancellationToken)
+        if (set is not null)
         {
-            ArgumentNullException.ThrowIfNull(application);
-
-            application.DisplayNames = names;
+            application.JsonWebKeySet = JObject.Parse(JsonSerializer.Serialize(set, _serializerOptions));
 
             return default;
         }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetJsonWebKeySetAsync(TApplication application, JsonWebKeySet set, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+        application.JsonWebKeySet = null;
 
-            if (set is not null)
-            {
-                application.JsonWebKeySet = JObject.Parse(JsonSerializer.Serialize(set, _serializerOptions));
+        return default;
+    }
 
-                return default;
-            }
+    /// <inheritdoc/>
+    public virtual ValueTask SetPermissionsAsync(TApplication application, ImmutableArray<string> permissions, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-            application.JsonWebKeySet = null;
+        application.Permissions = permissions;
 
-            return default;
-        }
+        return default;
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetPermissionsAsync(TApplication application, ImmutableArray<string> permissions, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+    /// <inheritdoc/>
+    public virtual ValueTask SetPostLogoutRedirectUrisAsync(TApplication application,
+        ImmutableArray<string> uris, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-            application.Permissions = permissions;
+        application.PostLogoutRedirectUris = uris;
 
-            return default;
-        }
+        return default;
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetPostLogoutRedirectUrisAsync(TApplication application,
-            ImmutableArray<string> uris, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+    /// <inheritdoc/>
+    public virtual ValueTask SetPropertiesAsync(TApplication application, ImmutableDictionary<string, JsonElement> properties, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-            application.PostLogoutRedirectUris = uris;
+        if (properties == null || properties.IsEmpty)
+        {
+            application.Properties = null;
 
             return default;
         }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetPropertiesAsync(TApplication application, ImmutableDictionary<string, JsonElement> properties, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+        application.Properties = JObject.Parse(JConvert.SerializeObject(properties, JOptions.UnsafeRelaxedJsonEscaping));
 
-            if (properties == null || properties.IsEmpty)
-            {
-                application.Properties = null;
+        return default;
+    }
 
-                return default;
-            }
+    /// <inheritdoc/>
+    public virtual ValueTask SetRedirectUrisAsync(TApplication application,
+        ImmutableArray<string> uris, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-            application.Properties = JObject.Parse(JConvert.SerializeObject(properties, JOptions.UnsafeRelaxedJsonEscaping));
+        application.RedirectUris = uris;
 
-            return default;
-        }
+        return default;
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetRedirectUrisAsync(TApplication application,
-            ImmutableArray<string> uris, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+    /// <inheritdoc/>
+    public virtual ValueTask SetRequirementsAsync(TApplication application,
+        ImmutableArray<string> requirements, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-            application.RedirectUris = uris;
+        application.Requirements = requirements;
 
-            return default;
-        }
+        return default;
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetRequirementsAsync(TApplication application,
-            ImmutableArray<string> requirements, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+    /// <inheritdoc/>
+    public virtual ValueTask SetSettingsAsync(TApplication application,
+        ImmutableDictionary<string, string> settings, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-            application.Requirements = requirements;
+        application.Settings = settings;
 
-            return default;
-        }
+        return default;
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetSettingsAsync(TApplication application,
-            ImmutableDictionary<string, string> settings, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+    /// <inheritdoc/>
+    public virtual async ValueTask UpdateAsync(TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-            application.Settings = settings;
+        cancellationToken.ThrowIfCancellationRequested();
 
-            return default;
-        }
+        await _session.SaveAsync(application, checkConcurrency: true, collection: OpenIdCollection);
 
-        /// <inheritdoc/>
-        public virtual async ValueTask UpdateAsync(TApplication application, CancellationToken cancellationToken)
+        try
         {
-            ArgumentNullException.ThrowIfNull(application);
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            await _session.SaveAsync(application, checkConcurrency: true, collection: OpenIdCollection);
-
-            try
-            {
-                await _session.SaveChangesAsync();
-            }
-            catch (ConcurrencyException exception)
-            {
-                throw new OpenIddictExceptions.ConcurrencyException(new StringBuilder()
-                    .AppendLine("The application was concurrently updated and cannot be persisted in its current state.")
-                    .Append("Reload the application from the database and retry the operation.")
-                    .ToString(), exception);
-            }
+            await _session.SaveChangesAsync();
         }
-
-        /// <inheritdoc/>
-        public virtual ValueTask<ImmutableArray<string>> GetRolesAsync(TApplication application, CancellationToken cancellationToken)
+        catch (ConcurrencyException exception)
         {
-            ArgumentNullException.ThrowIfNull(application);
-
-            return new ValueTask<ImmutableArray<string>>(application.Roles);
+            throw new OpenIddictExceptions.ConcurrencyException(new StringBuilder()
+                .AppendLine("The application was concurrently updated and cannot be persisted in its current state.")
+                .Append("Reload the application from the database and retry the operation.")
+                .ToString(), exception);
         }
+    }
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TApplication> ListInRoleAsync(string role, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(role);
+    /// <inheritdoc/>
+    public virtual ValueTask<ImmutableArray<string>> GetRolesAsync(TApplication application, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
 
-            return _session.Query<TApplication, OpenIdAppByRoleNameIndex>(index => index.RoleName == role, collection: OpenIdCollection).ToAsyncEnumerable();
-        }
+        return new ValueTask<ImmutableArray<string>>(application.Roles);
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetRolesAsync(TApplication application, ImmutableArray<string> roles, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(application);
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TApplication> ListInRoleAsync(string role, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(role);
 
-            application.Roles = roles;
+        return _session.Query<TApplication, OpenIdAppByRoleNameIndex>(index => index.RoleName == role, collection: OpenIdCollection).ToAsyncEnumerable();
+    }
 
-            return default;
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask SetRolesAsync(TApplication application, ImmutableArray<string> roles, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(application);
+
+        application.Roles = roles;
+
+        return default;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdAuthorizationStore.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdAuthorizationStore.cs
index cfcd1810363..4e04a114833 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdAuthorizationStore.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdAuthorizationStore.cs
@@ -16,445 +16,444 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.OpenId.YesSql.Stores
+namespace OrchardCore.OpenId.YesSql.Stores;
+
+public class OpenIdAuthorizationStore<TAuthorization> : IOpenIdAuthorizationStore<TAuthorization>
+    where TAuthorization : OpenIdAuthorization, new()
 {
-    public class OpenIdAuthorizationStore<TAuthorization> : IOpenIdAuthorizationStore<TAuthorization>
-        where TAuthorization : OpenIdAuthorization, new()
-    {
-        private readonly ISession _session;
-        private const string OpenIdCollection = OpenIdAuthorization.OpenIdCollection;
+    private readonly ISession _session;
+    private const string OpenIdCollection = OpenIdAuthorization.OpenIdCollection;
 
-        public OpenIdAuthorizationStore(ISession session)
-        {
-            _session = session;
-        }
+    public OpenIdAuthorizationStore(ISession session)
+    {
+        _session = session;
+    }
 
-        /// <inheritdoc/>
-        public virtual async ValueTask<long> CountAsync(CancellationToken cancellationToken)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
+    /// <inheritdoc/>
+    public virtual async ValueTask<long> CountAsync(CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
 
-            return await _session.Query<TAuthorization>(collection: OpenIdCollection).CountAsync();
-        }
+        return await _session.Query<TAuthorization>(collection: OpenIdCollection).CountAsync();
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask<long> CountAsync<TResult>(Func<IQueryable<TAuthorization>, IQueryable<TResult>> query, CancellationToken cancellationToken)
-            => throw new NotSupportedException();
+    /// <inheritdoc/>
+    public virtual ValueTask<long> CountAsync<TResult>(Func<IQueryable<TAuthorization>, IQueryable<TResult>> query, CancellationToken cancellationToken)
+        => throw new NotSupportedException();
 
-        /// <inheritdoc/>
-        public virtual async ValueTask CreateAsync(TAuthorization authorization, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(authorization);
+    /// <inheritdoc/>
+    public virtual async ValueTask CreateAsync(TAuthorization authorization, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
 
-            cancellationToken.ThrowIfCancellationRequested();
+        cancellationToken.ThrowIfCancellationRequested();
 
-            await _session.SaveAsync(authorization, collection: OpenIdCollection);
-            await _session.SaveChangesAsync();
-        }
+        await _session.SaveAsync(authorization, collection: OpenIdCollection);
+        await _session.SaveChangesAsync();
+    }
 
-        /// <inheritdoc/>
-        public virtual async ValueTask DeleteAsync(TAuthorization authorization, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(authorization);
+    /// <inheritdoc/>
+    public virtual async ValueTask DeleteAsync(TAuthorization authorization, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
 
-            cancellationToken.ThrowIfCancellationRequested();
+        cancellationToken.ThrowIfCancellationRequested();
 
-            _session.Delete(authorization, collection: OpenIdCollection);
-            await _session.SaveChangesAsync();
-        }
+        _session.Delete(authorization, collection: OpenIdCollection);
+        await _session.SaveChangesAsync();
+    }
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TAuthorization> FindAsync(
-            string subject, string client, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(subject);
-            ArgumentException.ThrowIfNullOrEmpty(client);
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TAuthorization> FindAsync(
+        string subject, string client, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(subject);
+        ArgumentException.ThrowIfNullOrEmpty(client);
 
-            cancellationToken.ThrowIfCancellationRequested();
+        cancellationToken.ThrowIfCancellationRequested();
 
-            return _session.Query<TAuthorization, OpenIdAuthorizationIndex>(
-                index => index.ApplicationId == client && index.Subject == subject,
-                collection: OpenIdCollection).ToAsyncEnumerable();
-        }
+        return _session.Query<TAuthorization, OpenIdAuthorizationIndex>(
+            index => index.ApplicationId == client && index.Subject == subject,
+            collection: OpenIdCollection).ToAsyncEnumerable();
+    }
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TAuthorization> FindAsync(
-            string subject, string client, string status, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(subject);
-            ArgumentException.ThrowIfNullOrEmpty(client);
-            ArgumentException.ThrowIfNullOrEmpty(status);
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TAuthorization> FindAsync(
+        string subject, string client, string status, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(subject);
+        ArgumentException.ThrowIfNullOrEmpty(client);
+        ArgumentException.ThrowIfNullOrEmpty(status);
 
-            cancellationToken.ThrowIfCancellationRequested();
+        cancellationToken.ThrowIfCancellationRequested();
 
-            return _session.Query<TAuthorization, OpenIdAuthorizationIndex>(
-                index => index.ApplicationId == client && index.Subject == subject && index.Status == status,
-                collection: OpenIdCollection).ToAsyncEnumerable();
-        }
+        return _session.Query<TAuthorization, OpenIdAuthorizationIndex>(
+            index => index.ApplicationId == client && index.Subject == subject && index.Status == status,
+            collection: OpenIdCollection).ToAsyncEnumerable();
+    }
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TAuthorization> FindAsync(
-            string subject, string client,
-            string status, string type, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(subject);
-            ArgumentException.ThrowIfNullOrEmpty(client);
-            ArgumentException.ThrowIfNullOrEmpty(status);
-            ArgumentException.ThrowIfNullOrEmpty(type);
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TAuthorization> FindAsync(
+        string subject, string client,
+        string status, string type, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(subject);
+        ArgumentException.ThrowIfNullOrEmpty(client);
+        ArgumentException.ThrowIfNullOrEmpty(status);
+        ArgumentException.ThrowIfNullOrEmpty(type);
 
-            cancellationToken.ThrowIfCancellationRequested();
+        cancellationToken.ThrowIfCancellationRequested();
 
-            return _session.Query<TAuthorization, OpenIdAuthorizationIndex>(
-                index => index.ApplicationId == client && index.Subject == subject &&
-                         index.Status == status && index.Type == type,
-                collection: OpenIdCollection).ToAsyncEnumerable();
-        }
+        return _session.Query<TAuthorization, OpenIdAuthorizationIndex>(
+            index => index.ApplicationId == client && index.Subject == subject &&
+                     index.Status == status && index.Type == type,
+            collection: OpenIdCollection).ToAsyncEnumerable();
+    }
 
-        /// <inheritdoc/>
-        public virtual async IAsyncEnumerable<TAuthorization> FindAsync(
-            string subject, string client, string status, string type,
-            ImmutableArray<string> scopes, [EnumeratorCancellation] CancellationToken cancellationToken)
+    /// <inheritdoc/>
+    public virtual async IAsyncEnumerable<TAuthorization> FindAsync(
+        string subject, string client, string status, string type,
+        ImmutableArray<string> scopes, [EnumeratorCancellation] CancellationToken cancellationToken)
+    {
+        await foreach (var authorization in FindAsync(subject, client, status, type, cancellationToken))
         {
-            await foreach (var authorization in FindAsync(subject, client, status, type, cancellationToken))
+            if (new HashSet<string>(await GetScopesAsync(authorization, cancellationToken), StringComparer.Ordinal).IsSupersetOf(scopes))
             {
-                if (new HashSet<string>(await GetScopesAsync(authorization, cancellationToken), StringComparer.Ordinal).IsSupersetOf(scopes))
-                {
-                    yield return authorization;
-                }
+                yield return authorization;
             }
         }
+    }
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TAuthorization> FindByApplicationIdAsync(
-            string identifier, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(identifier);
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TAuthorization> FindByApplicationIdAsync(
+        string identifier, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(identifier);
 
-            cancellationToken.ThrowIfCancellationRequested();
+        cancellationToken.ThrowIfCancellationRequested();
 
-            return _session.Query<TAuthorization, OpenIdAuthorizationIndex>(
-                index => index.ApplicationId == identifier,
-                collection: OpenIdCollection).ToAsyncEnumerable();
-        }
+        return _session.Query<TAuthorization, OpenIdAuthorizationIndex>(
+            index => index.ApplicationId == identifier,
+            collection: OpenIdCollection).ToAsyncEnumerable();
+    }
 
-        /// <inheritdoc/>
-        public virtual async ValueTask<TAuthorization> FindByIdAsync(string identifier, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(identifier);
+    /// <inheritdoc/>
+    public virtual async ValueTask<TAuthorization> FindByIdAsync(string identifier, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(identifier);
 
-            cancellationToken.ThrowIfCancellationRequested();
+        cancellationToken.ThrowIfCancellationRequested();
 
-            return await _session.Query<TAuthorization, OpenIdAuthorizationIndex>(
-                index => index.AuthorizationId == identifier,
-                collection: OpenIdCollection).FirstOrDefaultAsync();
-        }
+        return await _session.Query<TAuthorization, OpenIdAuthorizationIndex>(
+            index => index.AuthorizationId == identifier,
+            collection: OpenIdCollection).FirstOrDefaultAsync();
+    }
 
-        /// <inheritdoc/>
-        public virtual async ValueTask<TAuthorization> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(identifier);
+    /// <inheritdoc/>
+    public virtual async ValueTask<TAuthorization> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(identifier);
 
-            cancellationToken.ThrowIfCancellationRequested();
+        cancellationToken.ThrowIfCancellationRequested();
 
-            return await _session.GetAsync<TAuthorization>(long.Parse(identifier, CultureInfo.InvariantCulture), collection: OpenIdCollection);
-        }
+        return await _session.GetAsync<TAuthorization>(long.Parse(identifier, CultureInfo.InvariantCulture), collection: OpenIdCollection);
+    }
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TAuthorization> FindBySubjectAsync(
-            string subject, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(subject);
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TAuthorization> FindBySubjectAsync(
+        string subject, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(subject);
 
-            cancellationToken.ThrowIfCancellationRequested();
+        cancellationToken.ThrowIfCancellationRequested();
 
-            return _session.Query<TAuthorization, OpenIdAuthorizationIndex>(
-                index => index.Subject == subject,
-                collection: OpenIdCollection).ToAsyncEnumerable();
-        }
+        return _session.Query<TAuthorization, OpenIdAuthorizationIndex>(
+            index => index.Subject == subject,
+            collection: OpenIdCollection).ToAsyncEnumerable();
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetApplicationIdAsync(TAuthorization authorization, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(authorization);
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetApplicationIdAsync(TAuthorization authorization, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
 
-            return new ValueTask<string>(authorization.ApplicationId);
-        }
+        return new ValueTask<string>(authorization.ApplicationId);
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask<TResult> GetAsync<TState, TResult>(
-            Func<IQueryable<TAuthorization>, TState, IQueryable<TResult>> query,
-            TState state, CancellationToken cancellationToken)
-            => throw new NotSupportedException();
+    /// <inheritdoc/>
+    public virtual ValueTask<TResult> GetAsync<TState, TResult>(
+        Func<IQueryable<TAuthorization>, TState, IQueryable<TResult>> query,
+        TState state, CancellationToken cancellationToken)
+        => throw new NotSupportedException();
 
-        /// <inheritdoc/>
-        public virtual ValueTask<DateTimeOffset?> GetCreationDateAsync(TAuthorization authorization, CancellationToken cancellationToken)
+    /// <inheritdoc/>
+    public virtual ValueTask<DateTimeOffset?> GetCreationDateAsync(TAuthorization authorization, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
+
+        if (authorization.CreationDate is null)
         {
-            ArgumentNullException.ThrowIfNull(authorization);
+            return new ValueTask<DateTimeOffset?>(result: null);
+        }
 
-            if (authorization.CreationDate is null)
-            {
-                return new ValueTask<DateTimeOffset?>(result: null);
-            }
+        return new ValueTask<DateTimeOffset?>(DateTime.SpecifyKind(authorization.CreationDate.Value, DateTimeKind.Utc));
+    }
 
-            return new ValueTask<DateTimeOffset?>(DateTime.SpecifyKind(authorization.CreationDate.Value, DateTimeKind.Utc));
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetIdAsync(TAuthorization authorization, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetIdAsync(TAuthorization authorization, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(authorization);
+        return new ValueTask<string>(authorization.AuthorizationId);
+    }
 
-            return new ValueTask<string>(authorization.AuthorizationId);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetPhysicalIdAsync(TAuthorization authorization, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetPhysicalIdAsync(TAuthorization authorization, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(authorization);
+        return new ValueTask<string>(authorization.Id.ToString(CultureInfo.InvariantCulture));
+    }
 
-            return new ValueTask<string>(authorization.Id.ToString(CultureInfo.InvariantCulture));
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<ImmutableDictionary<string, JsonElement>> GetPropertiesAsync(TAuthorization authorization, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<ImmutableDictionary<string, JsonElement>> GetPropertiesAsync(TAuthorization authorization, CancellationToken cancellationToken)
+        if (authorization.Properties == null)
         {
-            ArgumentNullException.ThrowIfNull(authorization);
+            return new ValueTask<ImmutableDictionary<string, JsonElement>>(ImmutableDictionary.Create<string, JsonElement>());
+        }
 
-            if (authorization.Properties == null)
-            {
-                return new ValueTask<ImmutableDictionary<string, JsonElement>>(ImmutableDictionary.Create<string, JsonElement>());
-            }
+        return new ValueTask<ImmutableDictionary<string, JsonElement>>(
+            JConvert.DeserializeObject<ImmutableDictionary<string, JsonElement>>(authorization.Properties.ToString()));
+    }
 
-            return new ValueTask<ImmutableDictionary<string, JsonElement>>(
-                JConvert.DeserializeObject<ImmutableDictionary<string, JsonElement>>(authorization.Properties.ToString()));
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<ImmutableArray<string>> GetScopesAsync(TAuthorization authorization, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<ImmutableArray<string>> GetScopesAsync(TAuthorization authorization, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(authorization);
+        return new ValueTask<ImmutableArray<string>>(authorization.Scopes);
+    }
 
-            return new ValueTask<ImmutableArray<string>>(authorization.Scopes);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetStatusAsync(TAuthorization authorization, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetStatusAsync(TAuthorization authorization, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(authorization);
+        return new ValueTask<string>(authorization.Status);
+    }
 
-            return new ValueTask<string>(authorization.Status);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetSubjectAsync(TAuthorization authorization, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetSubjectAsync(TAuthorization authorization, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(authorization);
+        return new ValueTask<string>(authorization.Subject);
+    }
 
-            return new ValueTask<string>(authorization.Subject);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetTypeAsync(TAuthorization authorization, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetTypeAsync(TAuthorization authorization, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(authorization);
+        return new ValueTask<string>(authorization.Type);
+    }
 
-            return new ValueTask<string>(authorization.Type);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<TAuthorization> InstantiateAsync(CancellationToken cancellationToken)
+        => new(new TAuthorization { AuthorizationId = Guid.NewGuid().ToString("n") });
 
-        /// <inheritdoc/>
-        public virtual ValueTask<TAuthorization> InstantiateAsync(CancellationToken cancellationToken)
-            => new(new TAuthorization { AuthorizationId = Guid.NewGuid().ToString("n") });
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TAuthorization> ListAsync(int? count, int? offset, CancellationToken cancellationToken)
+    {
+        var query = _session.Query<TAuthorization>(collection: OpenIdCollection);
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TAuthorization> ListAsync(int? count, int? offset, CancellationToken cancellationToken)
+        if (offset.HasValue)
         {
-            var query = _session.Query<TAuthorization>(collection: OpenIdCollection);
+            query = query.Skip(offset.Value);
+        }
 
-            if (offset.HasValue)
-            {
-                query = query.Skip(offset.Value);
-            }
+        if (count.HasValue)
+        {
+            query = query.Take(count.Value);
+        }
 
-            if (count.HasValue)
-            {
-                query = query.Take(count.Value);
-            }
+        return query.ToAsyncEnumerable();
+    }
 
-            return query.ToAsyncEnumerable();
-        }
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TResult> ListAsync<TState, TResult>(
+        Func<IQueryable<TAuthorization>, TState, IQueryable<TResult>> query,
+        TState state, CancellationToken cancellationToken)
+        => throw new NotSupportedException();
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TResult> ListAsync<TState, TResult>(
-            Func<IQueryable<TAuthorization>, TState, IQueryable<TResult>> query,
-            TState state, CancellationToken cancellationToken)
-            => throw new NotSupportedException();
+    /// <inheritdoc/>
+    public virtual async ValueTask<long> PruneAsync(DateTimeOffset threshold, CancellationToken cancellationToken)
+    {
+        // Note: YesSql doesn't support set-based deletes, which prevents removing entities
+        // in a single command without having to retrieve and materialize them first.
+        // To work around this limitation, entities are manually listed and deleted using a batch logic.
 
-        /// <inheritdoc/>
-        public virtual async ValueTask<long> PruneAsync(DateTimeOffset threshold, CancellationToken cancellationToken)
-        {
-            // Note: YesSql doesn't support set-based deletes, which prevents removing entities
-            // in a single command without having to retrieve and materialize them first.
-            // To work around this limitation, entities are manually listed and deleted using a batch logic.
+        List<Exception> exceptions = null;
+
+        var result = 0L;
 
-            List<Exception> exceptions = null;
+        for (var i = 0; i < 1000; i++)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
 
-            var result = 0L;
+            var authorizations = (await _session.Query<TAuthorization, OpenIdAuthorizationIndex>(
+                authorization => authorization.CreationDate < threshold.UtcDateTime &&
+                                (authorization.Status != OpenIddictConstants.Statuses.Valid ||
+                                (authorization.Type == OpenIddictConstants.AuthorizationTypes.AdHoc &&
+                                 authorization.AuthorizationId.IsNotIn<OpenIdTokenIndex>(
+                                     token => token.AuthorizationId,
+                                     token => token.Id != 0))),
+                collection: OpenIdCollection).Take(100).ListAsync()).ToList();
 
-            for (var i = 0; i < 1000; i++)
+            if (authorizations.Count is 0)
             {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                var authorizations = (await _session.Query<TAuthorization, OpenIdAuthorizationIndex>(
-                    authorization => authorization.CreationDate < threshold.UtcDateTime &&
-                                    (authorization.Status != OpenIddictConstants.Statuses.Valid ||
-                                    (authorization.Type == OpenIddictConstants.AuthorizationTypes.AdHoc &&
-                                     authorization.AuthorizationId.IsNotIn<OpenIdTokenIndex>(
-                                         token => token.AuthorizationId,
-                                         token => token.Id != 0))),
-                    collection: OpenIdCollection).Take(100).ListAsync()).ToList();
-
-                if (authorizations.Count is 0)
-                {
-                    break;
-                }
-
-                foreach (var authorization in authorizations)
-                {
-                    _session.Delete(authorization, collection: OpenIdCollection);
-                }
-
-                try
-                {
-                    await _session.SaveChangesAsync();
-                }
-                catch (Exception exception)
-                {
-                    exceptions ??= new List<Exception>(capacity: 1);
-                    exceptions.Add(exception);
-
-                    continue;
-                }
-
-                result += authorizations.Count;
+                break;
             }
 
-            if (exceptions != null)
+            foreach (var authorization in authorizations)
             {
-                throw new AggregateException("An error occurred while pruning authorizations.", exceptions);
+                _session.Delete(authorization, collection: OpenIdCollection);
             }
 
-            return result;
-        }
-
-        /// <inheritdoc/>
-        public virtual ValueTask SetApplicationIdAsync(TAuthorization authorization,
-            string identifier, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(authorization);
-
-            if (string.IsNullOrEmpty(identifier))
+            try
             {
-                authorization.ApplicationId = null;
+                await _session.SaveChangesAsync();
             }
-            else
+            catch (Exception exception)
             {
-                authorization.ApplicationId = identifier;
+                exceptions ??= new List<Exception>(capacity: 1);
+                exceptions.Add(exception);
+
+                continue;
             }
 
-            return default;
+            result += authorizations.Count;
         }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetCreationDateAsync(TAuthorization authorization, DateTimeOffset? date, CancellationToken cancellationToken)
+        if (exceptions != null)
         {
-            ArgumentNullException.ThrowIfNull(authorization);
+            throw new AggregateException("An error occurred while pruning authorizations.", exceptions);
+        }
 
-            authorization.CreationDate = date?.UtcDateTime;
+        return result;
+    }
 
-            return default;
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask SetApplicationIdAsync(TAuthorization authorization,
+        string identifier, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetPropertiesAsync(TAuthorization authorization, ImmutableDictionary<string, JsonElement> properties, CancellationToken cancellationToken)
+        if (string.IsNullOrEmpty(identifier))
         {
-            ArgumentNullException.ThrowIfNull(authorization);
+            authorization.ApplicationId = null;
+        }
+        else
+        {
+            authorization.ApplicationId = identifier;
+        }
 
-            if (properties == null || properties.IsEmpty)
-            {
-                authorization.Properties = null;
+        return default;
+    }
 
-                return default;
-            }
+    /// <inheritdoc/>
+    public virtual ValueTask SetCreationDateAsync(TAuthorization authorization, DateTimeOffset? date, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
 
-            authorization.Properties = JObject.Parse(JConvert.SerializeObject(properties, JOptions.UnsafeRelaxedJsonEscaping));
+        authorization.CreationDate = date?.UtcDateTime;
 
-            return default;
-        }
+        return default;
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetScopesAsync(TAuthorization authorization,
-            ImmutableArray<string> scopes, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(authorization);
+    /// <inheritdoc/>
+    public virtual ValueTask SetPropertiesAsync(TAuthorization authorization, ImmutableDictionary<string, JsonElement> properties, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
 
-            authorization.Scopes = scopes;
+        if (properties == null || properties.IsEmpty)
+        {
+            authorization.Properties = null;
 
             return default;
         }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetStatusAsync(TAuthorization authorization,
-            string status, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(authorization);
+        authorization.Properties = JObject.Parse(JConvert.SerializeObject(properties, JOptions.UnsafeRelaxedJsonEscaping));
 
-            authorization.Status = status;
+        return default;
+    }
 
-            return default;
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask SetScopesAsync(TAuthorization authorization,
+        ImmutableArray<string> scopes, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetSubjectAsync(TAuthorization authorization,
-            string subject, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(authorization);
+        authorization.Scopes = scopes;
 
-            authorization.Subject = subject;
+        return default;
+    }
 
-            return default;
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask SetStatusAsync(TAuthorization authorization,
+        string status, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetTypeAsync(TAuthorization authorization,
-            string type, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(authorization);
+        authorization.Status = status;
 
-            authorization.Type = type;
+        return default;
+    }
 
-            return default;
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask SetSubjectAsync(TAuthorization authorization,
+        string subject, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
 
-        /// <inheritdoc/>
-        public virtual async ValueTask UpdateAsync(TAuthorization authorization, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(authorization);
+        authorization.Subject = subject;
 
-            cancellationToken.ThrowIfCancellationRequested();
+        return default;
+    }
 
-            await _session.SaveAsync(authorization, checkConcurrency: true, collection: OpenIdCollection);
+    /// <inheritdoc/>
+    public virtual ValueTask SetTypeAsync(TAuthorization authorization,
+        string type, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
 
-            try
-            {
-                await _session.SaveChangesAsync();
-            }
-            catch (ConcurrencyException exception)
-            {
-                throw new OpenIddictExceptions.ConcurrencyException(new StringBuilder()
-                    .AppendLine("The authorization was concurrently updated and cannot be persisted in its current state.")
-                    .Append("Reload the authorization from the database and retry the operation.")
-                    .ToString(), exception);
-            }
+        authorization.Type = type;
+
+        return default;
+    }
+
+    /// <inheritdoc/>
+    public virtual async ValueTask UpdateAsync(TAuthorization authorization, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(authorization);
+
+        cancellationToken.ThrowIfCancellationRequested();
+
+        await _session.SaveAsync(authorization, checkConcurrency: true, collection: OpenIdCollection);
+
+        try
+        {
+            await _session.SaveChangesAsync();
+        }
+        catch (ConcurrencyException exception)
+        {
+            throw new OpenIddictExceptions.ConcurrencyException(new StringBuilder()
+                .AppendLine("The authorization was concurrently updated and cannot be persisted in its current state.")
+                .Append("Reload the authorization from the database and retry the operation.")
+                .ToString(), exception);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdScopeStore.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdScopeStore.cs
index 9415dca4446..734392ffa34 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdScopeStore.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdScopeStore.cs
@@ -15,332 +15,331 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.OpenId.YesSql.Stores
+namespace OrchardCore.OpenId.YesSql.Stores;
+
+public class OpenIdScopeStore<TScope> : IOpenIdScopeStore<TScope>
+    where TScope : OpenIdScope, new()
 {
-    public class OpenIdScopeStore<TScope> : IOpenIdScopeStore<TScope>
-        where TScope : OpenIdScope, new()
+    private const string OpenIdCollection = OpenIdScope.OpenIdCollection;
+    private readonly ISession _session;
+
+    public OpenIdScopeStore(ISession session)
     {
-        private const string OpenIdCollection = OpenIdScope.OpenIdCollection;
-        private readonly ISession _session;
+        _session = session;
+    }
 
-        public OpenIdScopeStore(ISession session)
-        {
-            _session = session;
-        }
+    /// <inheritdoc/>
+    public virtual async ValueTask<long> CountAsync(CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
 
-        /// <inheritdoc/>
-        public virtual async ValueTask<long> CountAsync(CancellationToken cancellationToken)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
+        return await _session.Query<TScope>(collection: OpenIdCollection).CountAsync();
+    }
 
-            return await _session.Query<TScope>(collection: OpenIdCollection).CountAsync();
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<long> CountAsync<TResult>(Func<IQueryable<TScope>, IQueryable<TResult>> query, CancellationToken cancellationToken)
+        => throw new NotSupportedException();
 
-        /// <inheritdoc/>
-        public virtual ValueTask<long> CountAsync<TResult>(Func<IQueryable<TScope>, IQueryable<TResult>> query, CancellationToken cancellationToken)
-            => throw new NotSupportedException();
+    /// <inheritdoc/>
+    public virtual async ValueTask CreateAsync(TScope scope, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
 
-        /// <inheritdoc/>
-        public virtual async ValueTask CreateAsync(TScope scope, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(scope);
+        cancellationToken.ThrowIfCancellationRequested();
 
-            cancellationToken.ThrowIfCancellationRequested();
+        await _session.SaveAsync(scope, collection: OpenIdCollection);
+        await _session.SaveChangesAsync();
+    }
 
-            await _session.SaveAsync(scope, collection: OpenIdCollection);
-            await _session.SaveChangesAsync();
-        }
+    /// <inheritdoc/>
+    public virtual async ValueTask DeleteAsync(TScope scope, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
 
-        /// <inheritdoc/>
-        public virtual async ValueTask DeleteAsync(TScope scope, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(scope);
+        cancellationToken.ThrowIfCancellationRequested();
 
-            cancellationToken.ThrowIfCancellationRequested();
+        _session.Delete(scope, collection: OpenIdCollection);
+        await _session.SaveChangesAsync();
+    }
 
-            _session.Delete(scope, collection: OpenIdCollection);
-            await _session.SaveChangesAsync();
-        }
+    /// <inheritdoc/>
+    public virtual async ValueTask<TScope> FindByIdAsync(string identifier, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(identifier);
 
-        /// <inheritdoc/>
-        public virtual async ValueTask<TScope> FindByIdAsync(string identifier, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(identifier);
+        cancellationToken.ThrowIfCancellationRequested();
 
-            cancellationToken.ThrowIfCancellationRequested();
+        return await _session.Query<TScope, OpenIdScopeIndex>(index => index.ScopeId == identifier, collection: OpenIdCollection).FirstOrDefaultAsync();
+    }
 
-            return await _session.Query<TScope, OpenIdScopeIndex>(index => index.ScopeId == identifier, collection: OpenIdCollection).FirstOrDefaultAsync();
-        }
+    /// <inheritdoc/>
+    public virtual async ValueTask<TScope> FindByNameAsync(string name, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(name);
 
-        /// <inheritdoc/>
-        public virtual async ValueTask<TScope> FindByNameAsync(string name, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(name);
+        cancellationToken.ThrowIfCancellationRequested();
 
-            cancellationToken.ThrowIfCancellationRequested();
+        return await _session.Query<TScope, OpenIdScopeIndex>(index => index.Name == name, collection: OpenIdCollection).FirstOrDefaultAsync();
+    }
 
-            return await _session.Query<TScope, OpenIdScopeIndex>(index => index.Name == name, collection: OpenIdCollection).FirstOrDefaultAsync();
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TScope> FindByNamesAsync(
+        ImmutableArray<string> names, CancellationToken cancellationToken)
+    {
+        if (names.Any(name => string.IsNullOrEmpty(name)))
+        {
+            throw new ArgumentException("Scope names cannot be null or empty.", nameof(names));
         }
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TScope> FindByNamesAsync(
-            ImmutableArray<string> names, CancellationToken cancellationToken)
-        {
-            if (names.Any(name => string.IsNullOrEmpty(name)))
-            {
-                throw new ArgumentException("Scope names cannot be null or empty.", nameof(names));
-            }
+        cancellationToken.ThrowIfCancellationRequested();
 
-            cancellationToken.ThrowIfCancellationRequested();
+        return _session.Query<TScope, OpenIdScopeIndex>(index => index.Name.IsIn(names), collection: OpenIdCollection).ToAsyncEnumerable();
+    }
 
-            return _session.Query<TScope, OpenIdScopeIndex>(index => index.Name.IsIn(names), collection: OpenIdCollection).ToAsyncEnumerable();
-        }
+    /// <inheritdoc/>
+    public virtual async ValueTask<TScope> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(identifier);
 
-        /// <inheritdoc/>
-        public virtual async ValueTask<TScope> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(identifier);
+        cancellationToken.ThrowIfCancellationRequested();
 
-            cancellationToken.ThrowIfCancellationRequested();
+        return await _session.GetAsync<TScope>(long.Parse(identifier, CultureInfo.InvariantCulture), collection: OpenIdCollection);
+    }
 
-            return await _session.GetAsync<TScope>(long.Parse(identifier, CultureInfo.InvariantCulture), collection: OpenIdCollection);
-        }
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TScope> FindByResourceAsync(string resource, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(resource);
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TScope> FindByResourceAsync(string resource, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(resource);
+        cancellationToken.ThrowIfCancellationRequested();
 
-            cancellationToken.ThrowIfCancellationRequested();
+        return _session.Query<TScope, OpenIdScopeByResourceIndex>(
+            index => index.Resource == resource,
+            collection: OpenIdCollection).ToAsyncEnumerable();
+    }
 
-            return _session.Query<TScope, OpenIdScopeByResourceIndex>(
-                index => index.Resource == resource,
-                collection: OpenIdCollection).ToAsyncEnumerable();
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<TResult> GetAsync<TState, TResult>(
+        Func<IQueryable<TScope>, TState, IQueryable<TResult>> query,
+        TState state, CancellationToken cancellationToken)
+        => throw new NotSupportedException();
 
-        /// <inheritdoc/>
-        public virtual ValueTask<TResult> GetAsync<TState, TResult>(
-            Func<IQueryable<TScope>, TState, IQueryable<TResult>> query,
-            TState state, CancellationToken cancellationToken)
-            => throw new NotSupportedException();
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetDescriptionAsync(TScope scope, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetDescriptionAsync(TScope scope, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(scope);
+        return new ValueTask<string>(scope.Description);
+    }
 
-            return new ValueTask<string>(scope.Description);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<ImmutableDictionary<CultureInfo, string>> GetDescriptionsAsync(
+        TScope scope, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<ImmutableDictionary<CultureInfo, string>> GetDescriptionsAsync(
-            TScope scope, CancellationToken cancellationToken)
+        if (scope.Descriptions == null)
         {
-            ArgumentNullException.ThrowIfNull(scope);
+            return new ValueTask<ImmutableDictionary<CultureInfo, string>>(ImmutableDictionary.Create<CultureInfo, string>());
+        }
 
-            if (scope.Descriptions == null)
-            {
-                return new ValueTask<ImmutableDictionary<CultureInfo, string>>(ImmutableDictionary.Create<CultureInfo, string>());
-            }
+        return new ValueTask<ImmutableDictionary<CultureInfo, string>>(scope.Descriptions);
+    }
 
-            return new ValueTask<ImmutableDictionary<CultureInfo, string>>(scope.Descriptions);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetDisplayNameAsync(TScope scope, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetDisplayNameAsync(TScope scope, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(scope);
+        return new ValueTask<string>(scope.DisplayName);
+    }
 
-            return new ValueTask<string>(scope.DisplayName);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<ImmutableDictionary<CultureInfo, string>> GetDisplayNamesAsync(
+        TScope scope, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<ImmutableDictionary<CultureInfo, string>> GetDisplayNamesAsync(
-            TScope scope, CancellationToken cancellationToken)
+        if (scope.DisplayNames == null)
         {
-            ArgumentNullException.ThrowIfNull(scope);
+            return new ValueTask<ImmutableDictionary<CultureInfo, string>>(ImmutableDictionary.Create<CultureInfo, string>());
+        }
 
-            if (scope.DisplayNames == null)
-            {
-                return new ValueTask<ImmutableDictionary<CultureInfo, string>>(ImmutableDictionary.Create<CultureInfo, string>());
-            }
+        return new ValueTask<ImmutableDictionary<CultureInfo, string>>(scope.DisplayNames);
+    }
 
-            return new ValueTask<ImmutableDictionary<CultureInfo, string>>(scope.DisplayNames);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetIdAsync(TScope scope, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetIdAsync(TScope scope, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(scope);
+        return new ValueTask<string>(scope.ScopeId);
+    }
 
-            return new ValueTask<string>(scope.ScopeId);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetNameAsync(TScope scope, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetNameAsync(TScope scope, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(scope);
+        return new ValueTask<string>(scope.Name);
+    }
 
-            return new ValueTask<string>(scope.Name);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetPhysicalIdAsync(TScope scope, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetPhysicalIdAsync(TScope scope, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(scope);
+        return new ValueTask<string>(scope.Id.ToString(CultureInfo.InvariantCulture));
+    }
 
-            return new ValueTask<string>(scope.Id.ToString(CultureInfo.InvariantCulture));
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<ImmutableDictionary<string, JsonElement>> GetPropertiesAsync(TScope scope, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<ImmutableDictionary<string, JsonElement>> GetPropertiesAsync(TScope scope, CancellationToken cancellationToken)
+        if (scope.Properties == null)
         {
-            ArgumentNullException.ThrowIfNull(scope);
+            return new ValueTask<ImmutableDictionary<string, JsonElement>>(ImmutableDictionary.Create<string, JsonElement>());
+        }
 
-            if (scope.Properties == null)
-            {
-                return new ValueTask<ImmutableDictionary<string, JsonElement>>(ImmutableDictionary.Create<string, JsonElement>());
-            }
+        return new ValueTask<ImmutableDictionary<string, JsonElement>>(
+            JConvert.DeserializeObject<ImmutableDictionary<string, JsonElement>>(scope.Properties.ToString()));
+    }
 
-            return new ValueTask<ImmutableDictionary<string, JsonElement>>(
-                JConvert.DeserializeObject<ImmutableDictionary<string, JsonElement>>(scope.Properties.ToString()));
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<ImmutableArray<string>> GetResourcesAsync(TScope scope, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
+
+        return new ValueTask<ImmutableArray<string>>(scope.Resources);
+    }
+
+    /// <inheritdoc/>
+    public virtual ValueTask<TScope> InstantiateAsync(CancellationToken cancellationToken)
+        => new(new TScope { ScopeId = Guid.NewGuid().ToString("n") });
 
-        /// <inheritdoc/>
-        public virtual ValueTask<ImmutableArray<string>> GetResourcesAsync(TScope scope, CancellationToken cancellationToken)
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TScope> ListAsync(int? count, int? offset, CancellationToken cancellationToken)
+    {
+        var query = _session.Query<TScope>(collection: OpenIdCollection);
+
+        if (offset.HasValue)
         {
-            ArgumentNullException.ThrowIfNull(scope);
+            query = query.Skip(offset.Value);
+        }
 
-            return new ValueTask<ImmutableArray<string>>(scope.Resources);
+        if (count.HasValue)
+        {
+            query = query.Take(count.Value);
         }
 
-        /// <inheritdoc/>
-        public virtual ValueTask<TScope> InstantiateAsync(CancellationToken cancellationToken)
-            => new(new TScope { ScopeId = Guid.NewGuid().ToString("n") });
+        return query.ToAsyncEnumerable();
+    }
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TScope> ListAsync(int? count, int? offset, CancellationToken cancellationToken)
-        {
-            var query = _session.Query<TScope>(collection: OpenIdCollection);
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TResult> ListAsync<TState, TResult>(
+        Func<IQueryable<TScope>, TState, IQueryable<TResult>> query,
+        TState state, CancellationToken cancellationToken)
+        => throw new NotSupportedException();
 
-            if (offset.HasValue)
-            {
-                query = query.Skip(offset.Value);
-            }
+    /// <inheritdoc/>
+    public virtual ValueTask SetDescriptionAsync(TScope scope, string description, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
 
-            if (count.HasValue)
-            {
-                query = query.Take(count.Value);
-            }
+        scope.Description = description;
 
-            return query.ToAsyncEnumerable();
-        }
+        return default;
+    }
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TResult> ListAsync<TState, TResult>(
-            Func<IQueryable<TScope>, TState, IQueryable<TResult>> query,
-            TState state, CancellationToken cancellationToken)
-            => throw new NotSupportedException();
+    /// <inheritdoc/>
+    public virtual ValueTask SetDescriptionsAsync(TScope scope,
+        ImmutableDictionary<CultureInfo, string> descriptions, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetDescriptionAsync(TScope scope, string description, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(scope);
+        scope.Descriptions = descriptions;
 
-            scope.Description = description;
+        return default;
+    }
 
-            return default;
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask SetDisplayNameAsync(TScope scope, string name, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetDescriptionsAsync(TScope scope,
-            ImmutableDictionary<CultureInfo, string> descriptions, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(scope);
+        scope.DisplayName = name;
 
-            scope.Descriptions = descriptions;
+        return default;
+    }
 
-            return default;
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask SetDisplayNamesAsync(TScope scope,
+        ImmutableDictionary<CultureInfo, string> names, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetDisplayNameAsync(TScope scope, string name, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(scope);
+        scope.DisplayNames = names;
 
-            scope.DisplayName = name;
+        return default;
+    }
 
-            return default;
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask SetNameAsync(TScope scope, string name, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetDisplayNamesAsync(TScope scope,
-            ImmutableDictionary<CultureInfo, string> names, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(scope);
+        scope.Name = name;
 
-            scope.DisplayNames = names;
+        return default;
+    }
 
-            return default;
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask SetPropertiesAsync(TScope scope, ImmutableDictionary<string, JsonElement> properties, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetNameAsync(TScope scope, string name, CancellationToken cancellationToken)
+        if (properties == null || properties.IsEmpty)
         {
-            ArgumentNullException.ThrowIfNull(scope);
-
-            scope.Name = name;
+            scope.Properties = null;
 
             return default;
         }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetPropertiesAsync(TScope scope, ImmutableDictionary<string, JsonElement> properties, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(scope);
+        scope.Properties = JObject.Parse(JConvert.SerializeObject(properties, JOptions.UnsafeRelaxedJsonEscaping));
 
-            if (properties == null || properties.IsEmpty)
-            {
-                scope.Properties = null;
+        return default;
+    }
 
-                return default;
-            }
+    /// <inheritdoc/>
+    public virtual ValueTask SetResourcesAsync(TScope scope, ImmutableArray<string> resources, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
 
-            scope.Properties = JObject.Parse(JConvert.SerializeObject(properties, JOptions.UnsafeRelaxedJsonEscaping));
+        scope.Resources = resources;
 
-            return default;
-        }
+        return default;
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetResourcesAsync(TScope scope, ImmutableArray<string> resources, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(scope);
+    /// <inheritdoc/>
+    public virtual async ValueTask UpdateAsync(TScope scope, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(scope);
 
-            scope.Resources = resources;
+        cancellationToken.ThrowIfCancellationRequested();
 
-            return default;
-        }
+        await _session.SaveAsync(scope, checkConcurrency: true, collection: OpenIdCollection);
 
-        /// <inheritdoc/>
-        public virtual async ValueTask UpdateAsync(TScope scope, CancellationToken cancellationToken)
+        try
+        {
+            await _session.SaveChangesAsync();
+        }
+        catch (ConcurrencyException exception)
         {
-            ArgumentNullException.ThrowIfNull(scope);
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            await _session.SaveAsync(scope, checkConcurrency: true, collection: OpenIdCollection);
-
-            try
-            {
-                await _session.SaveChangesAsync();
-            }
-            catch (ConcurrencyException exception)
-            {
-                throw new OpenIddictExceptions.ConcurrencyException(new StringBuilder()
-                    .AppendLine("The scope was concurrently updated and cannot be persisted in its current state.")
-                    .Append("Reload the scope from the database and retry the operation.")
-                    .ToString(), exception);
-            }
+            throw new OpenIddictExceptions.ConcurrencyException(new StringBuilder()
+                .AppendLine("The scope was concurrently updated and cannot be persisted in its current state.")
+                .Append("Reload the scope from the database and retry the operation.")
+                .ToString(), exception);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdTokenStore.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdTokenStore.cs
index 855669fe72d..8c408b2acaf 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdTokenStore.cs
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdTokenStore.cs
@@ -16,551 +16,550 @@
 using YesSql.Services;
 using static OpenIddict.Abstractions.OpenIddictConstants;
 
-namespace OrchardCore.OpenId.YesSql.Stores
+namespace OrchardCore.OpenId.YesSql.Stores;
+
+public class OpenIdTokenStore<TToken> : IOpenIdTokenStore<TToken>
+    where TToken : OpenIdToken, new()
 {
-    public class OpenIdTokenStore<TToken> : IOpenIdTokenStore<TToken>
-        where TToken : OpenIdToken, new()
+    private readonly ISession _session;
+    private const string OpenIdCollection = OpenIdToken.OpenIdCollection;
+
+    public OpenIdTokenStore(ISession session)
     {
-        private readonly ISession _session;
-        private const string OpenIdCollection = OpenIdToken.OpenIdCollection;
+        _session = session;
+    }
 
-        public OpenIdTokenStore(ISession session)
-        {
-            _session = session;
-        }
+    /// <inheritdoc/>
+    public virtual async ValueTask<long> CountAsync(CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
 
-        /// <inheritdoc/>
-        public virtual async ValueTask<long> CountAsync(CancellationToken cancellationToken)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
+        return await _session.Query<TToken>(collection: OpenIdCollection).CountAsync();
+    }
 
-            return await _session.Query<TToken>(collection: OpenIdCollection).CountAsync();
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<long> CountAsync<TResult>(Func<IQueryable<TToken>, IQueryable<TResult>> query, CancellationToken cancellationToken)
+        => throw new NotSupportedException();
 
-        /// <inheritdoc/>
-        public virtual ValueTask<long> CountAsync<TResult>(Func<IQueryable<TToken>, IQueryable<TResult>> query, CancellationToken cancellationToken)
-            => throw new NotSupportedException();
+    /// <inheritdoc/>
+    public virtual async ValueTask CreateAsync(TToken token, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-        /// <inheritdoc/>
-        public virtual async ValueTask CreateAsync(TToken token, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
+        cancellationToken.ThrowIfCancellationRequested();
 
-            cancellationToken.ThrowIfCancellationRequested();
+        await _session.SaveAsync(token, collection: OpenIdCollection);
+        await _session.SaveChangesAsync();
+    }
 
-            await _session.SaveAsync(token, collection: OpenIdCollection);
-            await _session.SaveChangesAsync();
-        }
+    /// <inheritdoc/>
+    public virtual async ValueTask DeleteAsync(TToken token, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-        /// <inheritdoc/>
-        public virtual async ValueTask DeleteAsync(TToken token, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
+        cancellationToken.ThrowIfCancellationRequested();
 
-            cancellationToken.ThrowIfCancellationRequested();
+        _session.Delete(token, collection: OpenIdCollection);
+        await _session.SaveChangesAsync();
+    }
 
-            _session.Delete(token, collection: OpenIdCollection);
-            await _session.SaveChangesAsync();
-        }
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TToken> FindAsync(
+        string subject, string client, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(subject);
+        ArgumentException.ThrowIfNullOrEmpty(client);
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TToken> FindAsync(
-            string subject, string client, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(subject);
-            ArgumentException.ThrowIfNullOrEmpty(client);
+        cancellationToken.ThrowIfCancellationRequested();
 
-            cancellationToken.ThrowIfCancellationRequested();
+        return _session.Query<TToken, OpenIdTokenIndex>(
+            index => index.ApplicationId == client && index.Subject == subject, collection: OpenIdCollection).ToAsyncEnumerable();
+    }
 
-            return _session.Query<TToken, OpenIdTokenIndex>(
-                index => index.ApplicationId == client && index.Subject == subject, collection: OpenIdCollection).ToAsyncEnumerable();
-        }
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TToken> FindAsync(
+        string subject, string client, string status, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(subject);
+        ArgumentException.ThrowIfNullOrEmpty(client);
+        ArgumentException.ThrowIfNullOrEmpty(status);
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TToken> FindAsync(
-            string subject, string client, string status, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(subject);
-            ArgumentException.ThrowIfNullOrEmpty(client);
-            ArgumentException.ThrowIfNullOrEmpty(status);
+        cancellationToken.ThrowIfCancellationRequested();
 
-            cancellationToken.ThrowIfCancellationRequested();
+        return _session.Query<TToken, OpenIdTokenIndex>(
+            index => index.ApplicationId == client && index.Subject == subject && index.Status == status, collection: OpenIdCollection).ToAsyncEnumerable();
+    }
 
-            return _session.Query<TToken, OpenIdTokenIndex>(
-                index => index.ApplicationId == client && index.Subject == subject && index.Status == status, collection: OpenIdCollection).ToAsyncEnumerable();
-        }
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TToken> FindAsync(
+        string subject, string client, string status, string type, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(subject);
+        ArgumentException.ThrowIfNullOrEmpty(client);
+        ArgumentException.ThrowIfNullOrEmpty(status);
+        ArgumentException.ThrowIfNullOrEmpty(type);
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TToken> FindAsync(
-            string subject, string client, string status, string type, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(subject);
-            ArgumentException.ThrowIfNullOrEmpty(client);
-            ArgumentException.ThrowIfNullOrEmpty(status);
-            ArgumentException.ThrowIfNullOrEmpty(type);
+        cancellationToken.ThrowIfCancellationRequested();
 
-            cancellationToken.ThrowIfCancellationRequested();
+        return _session.Query<TToken, OpenIdTokenIndex>(
+            index => index.ApplicationId == client && index.Subject == subject &&
+                     index.Status == status && index.Type == type, collection: OpenIdCollection).ToAsyncEnumerable();
+    }
 
-            return _session.Query<TToken, OpenIdTokenIndex>(
-                index => index.ApplicationId == client && index.Subject == subject &&
-                         index.Status == status && index.Type == type, collection: OpenIdCollection).ToAsyncEnumerable();
-        }
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TToken> FindByApplicationIdAsync(string identifier, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(identifier);
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TToken> FindByApplicationIdAsync(string identifier, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(identifier);
+        cancellationToken.ThrowIfCancellationRequested();
 
-            cancellationToken.ThrowIfCancellationRequested();
+        return _session.Query<TToken, OpenIdTokenIndex>(index => index.ApplicationId == identifier, collection: OpenIdCollection).ToAsyncEnumerable();
+    }
 
-            return _session.Query<TToken, OpenIdTokenIndex>(index => index.ApplicationId == identifier, collection: OpenIdCollection).ToAsyncEnumerable();
-        }
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TToken> FindByAuthorizationIdAsync(string identifier, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(identifier);
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TToken> FindByAuthorizationIdAsync(string identifier, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(identifier);
+        cancellationToken.ThrowIfCancellationRequested();
 
-            cancellationToken.ThrowIfCancellationRequested();
+        return _session.Query<TToken, OpenIdTokenIndex>(index => index.AuthorizationId == identifier, collection: OpenIdCollection).ToAsyncEnumerable();
+    }
 
-            return _session.Query<TToken, OpenIdTokenIndex>(index => index.AuthorizationId == identifier, collection: OpenIdCollection).ToAsyncEnumerable();
-        }
+    /// <inheritdoc/>
+    public virtual async ValueTask<TToken> FindByReferenceIdAsync(string identifier, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(identifier);
 
-        /// <inheritdoc/>
-        public virtual async ValueTask<TToken> FindByReferenceIdAsync(string identifier, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(identifier);
+        cancellationToken.ThrowIfCancellationRequested();
 
-            cancellationToken.ThrowIfCancellationRequested();
+        return await _session.Query<TToken, OpenIdTokenIndex>(index => index.ReferenceId == identifier, collection: OpenIdCollection).FirstOrDefaultAsync();
+    }
 
-            return await _session.Query<TToken, OpenIdTokenIndex>(index => index.ReferenceId == identifier, collection: OpenIdCollection).FirstOrDefaultAsync();
-        }
+    /// <inheritdoc/>
+    public virtual async ValueTask<TToken> FindByIdAsync(string identifier, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(identifier);
 
-        /// <inheritdoc/>
-        public virtual async ValueTask<TToken> FindByIdAsync(string identifier, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(identifier);
+        cancellationToken.ThrowIfCancellationRequested();
 
-            cancellationToken.ThrowIfCancellationRequested();
+        return await _session.Query<TToken, OpenIdTokenIndex>(index => index.TokenId == identifier, collection: OpenIdCollection).FirstOrDefaultAsync();
+    }
 
-            return await _session.Query<TToken, OpenIdTokenIndex>(index => index.TokenId == identifier, collection: OpenIdCollection).FirstOrDefaultAsync();
-        }
+    /// <inheritdoc/>
+    public virtual async ValueTask<TToken> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(identifier);
 
-        /// <inheritdoc/>
-        public virtual async ValueTask<TToken> FindByPhysicalIdAsync(string identifier, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(identifier);
+        cancellationToken.ThrowIfCancellationRequested();
 
-            cancellationToken.ThrowIfCancellationRequested();
+        return await _session.GetAsync<TToken>(long.Parse(identifier, CultureInfo.InvariantCulture), collection: OpenIdCollection);
+    }
 
-            return await _session.GetAsync<TToken>(long.Parse(identifier, CultureInfo.InvariantCulture), collection: OpenIdCollection);
-        }
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TToken> FindBySubjectAsync(string subject, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(subject);
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TToken> FindBySubjectAsync(string subject, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(subject);
+        cancellationToken.ThrowIfCancellationRequested();
 
-            cancellationToken.ThrowIfCancellationRequested();
+        return _session.Query<TToken, OpenIdTokenIndex>(index => index.Subject == subject, collection: OpenIdCollection).ToAsyncEnumerable();
+    }
 
-            return _session.Query<TToken, OpenIdTokenIndex>(index => index.Subject == subject, collection: OpenIdCollection).ToAsyncEnumerable();
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<TResult> GetAsync<TState, TResult>(
+        Func<IQueryable<TToken>, TState, IQueryable<TResult>> query,
+        TState state, CancellationToken cancellationToken)
+        => throw new NotSupportedException();
 
-        /// <inheritdoc/>
-        public virtual ValueTask<TResult> GetAsync<TState, TResult>(
-            Func<IQueryable<TToken>, TState, IQueryable<TResult>> query,
-            TState state, CancellationToken cancellationToken)
-            => throw new NotSupportedException();
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetApplicationIdAsync(TToken token, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetApplicationIdAsync(TToken token, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
+        return new ValueTask<string>(token.ApplicationId?.ToString(CultureInfo.InvariantCulture));
+    }
 
-            return new ValueTask<string>(token.ApplicationId?.ToString(CultureInfo.InvariantCulture));
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetAuthorizationIdAsync(TToken token, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetAuthorizationIdAsync(TToken token, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
+        return new ValueTask<string>(token.AuthorizationId);
+    }
 
-            return new ValueTask<string>(token.AuthorizationId);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<DateTimeOffset?> GetCreationDateAsync(TToken token, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<DateTimeOffset?> GetCreationDateAsync(TToken token, CancellationToken cancellationToken)
+        if (token.CreationDate is null)
         {
-            ArgumentNullException.ThrowIfNull(token);
-
-            if (token.CreationDate is null)
-            {
-                return new ValueTask<DateTimeOffset?>(result: null);
-            }
-
-            return new ValueTask<DateTimeOffset?>(DateTime.SpecifyKind(token.CreationDate.Value, DateTimeKind.Utc));
+            return new ValueTask<DateTimeOffset?>(result: null);
         }
 
-        /// <inheritdoc/>
-        public virtual ValueTask<DateTimeOffset?> GetExpirationDateAsync(TToken token, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
-
-            if (token.ExpirationDate is null)
-            {
-                return new ValueTask<DateTimeOffset?>(result: null);
-            }
+        return new ValueTask<DateTimeOffset?>(DateTime.SpecifyKind(token.CreationDate.Value, DateTimeKind.Utc));
+    }
 
-            return new ValueTask<DateTimeOffset?>(DateTime.SpecifyKind(token.ExpirationDate.Value, DateTimeKind.Utc));
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<DateTimeOffset?> GetExpirationDateAsync(TToken token, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetIdAsync(TToken token, CancellationToken cancellationToken)
+        if (token.ExpirationDate is null)
         {
-            ArgumentNullException.ThrowIfNull(token);
-
-            return new ValueTask<string>(token.TokenId);
+            return new ValueTask<DateTimeOffset?>(result: null);
         }
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetPayloadAsync(TToken token, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
+        return new ValueTask<DateTimeOffset?>(DateTime.SpecifyKind(token.ExpirationDate.Value, DateTimeKind.Utc));
+    }
 
-            return new ValueTask<string>(token.Payload);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetIdAsync(TToken token, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetPhysicalIdAsync(TToken token, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
+        return new ValueTask<string>(token.TokenId);
+    }
 
-            return new ValueTask<string>(token.Id.ToString(CultureInfo.InvariantCulture));
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetPayloadAsync(TToken token, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<ImmutableDictionary<string, JsonElement>> GetPropertiesAsync(TToken token, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
+        return new ValueTask<string>(token.Payload);
+    }
 
-            if (token.Properties == null)
-            {
-                return new ValueTask<ImmutableDictionary<string, JsonElement>>(ImmutableDictionary.Create<string, JsonElement>());
-            }
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetPhysicalIdAsync(TToken token, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-            return new ValueTask<ImmutableDictionary<string, JsonElement>>(
-                JConvert.DeserializeObject<ImmutableDictionary<string, JsonElement>>(token.Properties.ToString()));
-        }
+        return new ValueTask<string>(token.Id.ToString(CultureInfo.InvariantCulture));
+    }
+
+    /// <inheritdoc/>
+    public virtual ValueTask<ImmutableDictionary<string, JsonElement>> GetPropertiesAsync(TToken token, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<DateTimeOffset?> GetRedemptionDateAsync(TToken token, CancellationToken cancellationToken)
+        if (token.Properties == null)
         {
-            ArgumentNullException.ThrowIfNull(token);
+            return new ValueTask<ImmutableDictionary<string, JsonElement>>(ImmutableDictionary.Create<string, JsonElement>());
+        }
 
-            if (token.RedemptionDate is null)
-            {
-                return new ValueTask<DateTimeOffset?>(result: null);
-            }
+        return new ValueTask<ImmutableDictionary<string, JsonElement>>(
+            JConvert.DeserializeObject<ImmutableDictionary<string, JsonElement>>(token.Properties.ToString()));
+    }
 
-            return new ValueTask<DateTimeOffset?>(DateTime.SpecifyKind(token.RedemptionDate.Value, DateTimeKind.Utc));
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<DateTimeOffset?> GetRedemptionDateAsync(TToken token, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetReferenceIdAsync(TToken token, CancellationToken cancellationToken)
+        if (token.RedemptionDate is null)
         {
-            ArgumentNullException.ThrowIfNull(token);
-
-            return new ValueTask<string>(token.ReferenceId);
+            return new ValueTask<DateTimeOffset?>(result: null);
         }
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetStatusAsync(TToken token, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
+        return new ValueTask<DateTimeOffset?>(DateTime.SpecifyKind(token.RedemptionDate.Value, DateTimeKind.Utc));
+    }
 
-            return new ValueTask<string>(token.Status);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetReferenceIdAsync(TToken token, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetSubjectAsync(TToken token, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
+        return new ValueTask<string>(token.ReferenceId);
+    }
 
-            return new ValueTask<string>(token.Subject);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetStatusAsync(TToken token, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<string> GetTypeAsync(TToken token, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
+        return new ValueTask<string>(token.Status);
+    }
 
-            return new ValueTask<string>(token.Type);
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetSubjectAsync(TToken token, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-        /// <inheritdoc/>
-        public virtual ValueTask<TToken> InstantiateAsync(CancellationToken cancellationToken)
-            => new(new TToken { TokenId = Guid.NewGuid().ToString("n") });
+        return new ValueTask<string>(token.Subject);
+    }
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TToken> ListAsync(int? count, int? offset, CancellationToken cancellationToken)
-        {
-            var query = _session.Query<TToken>(collection: OpenIdCollection);
+    /// <inheritdoc/>
+    public virtual ValueTask<string> GetTypeAsync(TToken token, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-            if (offset.HasValue)
-            {
-                query = query.Skip(offset.Value);
-            }
+        return new ValueTask<string>(token.Type);
+    }
 
-            if (count.HasValue)
-            {
-                query = query.Take(count.Value);
-            }
+    /// <inheritdoc/>
+    public virtual ValueTask<TToken> InstantiateAsync(CancellationToken cancellationToken)
+        => new(new TToken { TokenId = Guid.NewGuid().ToString("n") });
 
-            return query.ToAsyncEnumerable();
-        }
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TToken> ListAsync(int? count, int? offset, CancellationToken cancellationToken)
+    {
+        var query = _session.Query<TToken>(collection: OpenIdCollection);
 
-        /// <inheritdoc/>
-        public virtual IAsyncEnumerable<TResult> ListAsync<TState, TResult>(
-            Func<IQueryable<TToken>, TState, IQueryable<TResult>> query,
-            TState state, CancellationToken cancellationToken)
-            => throw new NotSupportedException();
+        if (offset.HasValue)
+        {
+            query = query.Skip(offset.Value);
+        }
 
-        /// <inheritdoc/>
-        public virtual async ValueTask<long> PruneAsync(DateTimeOffset threshold, CancellationToken cancellationToken = default)
+        if (count.HasValue)
         {
-            // Note: YesSql doesn't support set-based deletes, which prevents removing entities
-            // in a single command without having to retrieve and materialize them first.
-            // To work around this limitation, entities are manually listed and deleted using a batch logic.
+            query = query.Take(count.Value);
+        }
 
-            List<Exception> exceptions = null;
+        return query.ToAsyncEnumerable();
+    }
 
-            var result = 0L;
+    /// <inheritdoc/>
+    public virtual IAsyncEnumerable<TResult> ListAsync<TState, TResult>(
+        Func<IQueryable<TToken>, TState, IQueryable<TResult>> query,
+        TState state, CancellationToken cancellationToken)
+        => throw new NotSupportedException();
 
-            for (var i = 0; i < 1000; i++)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                var tokens = (await _session.Query<TToken, OpenIdTokenIndex>(
-                    token => token.CreationDate < threshold.UtcDateTime &&
-                           ((token.Status != Statuses.Inactive && token.Status != Statuses.Valid) ||
-                             token.AuthorizationId.IsNotIn<OpenIdAuthorizationIndex>(
-                                authorization => authorization.AuthorizationId,
-                                authorization => authorization.Status == Statuses.Valid) ||
-                             token.ExpirationDate < DateTime.UtcNow), collection: OpenIdCollection).Take(100).ListAsync()).ToList();
-
-                if (tokens.Count is 0)
-                {
-                    break;
-                }
-
-                foreach (var token in tokens)
-                {
-                    _session.Delete(token, collection: OpenIdCollection);
-                }
-
-                try
-                {
-                    await _session.SaveChangesAsync();
-                }
-                catch (Exception exception)
-                {
-                    exceptions ??= new List<Exception>(capacity: 1);
-                    exceptions.Add(exception);
-
-                    continue;
-                }
-
-                result += tokens.Count;
-            }
+    /// <inheritdoc/>
+    public virtual async ValueTask<long> PruneAsync(DateTimeOffset threshold, CancellationToken cancellationToken = default)
+    {
+        // Note: YesSql doesn't support set-based deletes, which prevents removing entities
+        // in a single command without having to retrieve and materialize them first.
+        // To work around this limitation, entities are manually listed and deleted using a batch logic.
 
-            if (exceptions != null)
-            {
-                throw new AggregateException("An error occurred while pruning authorizations.", exceptions);
-            }
+        List<Exception> exceptions = null;
 
-            return result;
-        }
+        var result = 0L;
 
-        /// <inheritdoc/>
-        public virtual async ValueTask<long> RevokeByAuthorizationIdAsync(string identifier, CancellationToken cancellationToken)
+        for (var i = 0; i < 1000; i++)
         {
-            // Note: YesSql doesn't support set-based updates, which prevents updating entities
-            // in a single command without having to retrieve and materialize them first.
-            // To work around this limitation, entities are manually listed and updated.
-
             cancellationToken.ThrowIfCancellationRequested();
 
             var tokens = (await _session.Query<TToken, OpenIdTokenIndex>(
-                token => token.AuthorizationId == identifier, collection: OpenIdCollection).ListAsync()).ToList();
+                token => token.CreationDate < threshold.UtcDateTime &&
+                       ((token.Status != Statuses.Inactive && token.Status != Statuses.Valid) ||
+                         token.AuthorizationId.IsNotIn<OpenIdAuthorizationIndex>(
+                            authorization => authorization.AuthorizationId,
+                            authorization => authorization.Status == Statuses.Valid) ||
+                         token.ExpirationDate < DateTime.UtcNow), collection: OpenIdCollection).Take(100).ListAsync()).ToList();
 
             if (tokens.Count is 0)
             {
-                return 0;
+                break;
             }
 
             foreach (var token in tokens)
             {
-                token.Status = Statuses.Revoked;
-
-                await _session.SaveAsync(token, checkConcurrency: false, collection: OpenIdCollection);
+                _session.Delete(token, collection: OpenIdCollection);
             }
 
-            await _session.SaveChangesAsync();
-
-            return tokens.Count;
-        }
-
-        /// <inheritdoc/>
-        public virtual ValueTask SetApplicationIdAsync(TToken token, string identifier, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
-
-            if (string.IsNullOrEmpty(identifier))
+            try
             {
-                token.ApplicationId = null;
+                await _session.SaveChangesAsync();
             }
-            else
+            catch (Exception exception)
             {
-                token.ApplicationId = identifier;
+                exceptions ??= new List<Exception>(capacity: 1);
+                exceptions.Add(exception);
+
+                continue;
             }
 
-            return default;
+            result += tokens.Count;
         }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetAuthorizationIdAsync(TToken token, string identifier, CancellationToken cancellationToken)
+        if (exceptions != null)
         {
-            ArgumentNullException.ThrowIfNull(token);
+            throw new AggregateException("An error occurred while pruning authorizations.", exceptions);
+        }
 
-            if (string.IsNullOrEmpty(identifier))
-            {
-                token.AuthorizationId = null;
-            }
-            else
-            {
-                token.AuthorizationId = identifier;
-            }
+        return result;
+    }
 
-            return default;
-        }
+    /// <inheritdoc/>
+    public virtual async ValueTask<long> RevokeByAuthorizationIdAsync(string identifier, CancellationToken cancellationToken)
+    {
+        // Note: YesSql doesn't support set-based updates, which prevents updating entities
+        // in a single command without having to retrieve and materialize them first.
+        // To work around this limitation, entities are manually listed and updated.
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetCreationDateAsync(TToken token, DateTimeOffset? date, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
+        cancellationToken.ThrowIfCancellationRequested();
 
-            token.CreationDate = date?.UtcDateTime;
+        var tokens = (await _session.Query<TToken, OpenIdTokenIndex>(
+            token => token.AuthorizationId == identifier, collection: OpenIdCollection).ListAsync()).ToList();
 
-            return default;
+        if (tokens.Count is 0)
+        {
+            return 0;
         }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetExpirationDateAsync(TToken token, DateTimeOffset? date, CancellationToken cancellationToken)
+        foreach (var token in tokens)
         {
-            ArgumentNullException.ThrowIfNull(token);
+            token.Status = Statuses.Revoked;
 
-            token.ExpirationDate = date?.UtcDateTime;
-
-            return default;
+            await _session.SaveAsync(token, checkConcurrency: false, collection: OpenIdCollection);
         }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetPayloadAsync(TToken token, string payload, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
+        await _session.SaveChangesAsync();
 
-            token.Payload = payload;
+        return tokens.Count;
+    }
 
-            return default;
+    /// <inheritdoc/>
+    public virtual ValueTask SetApplicationIdAsync(TToken token, string identifier, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
+
+        if (string.IsNullOrEmpty(identifier))
+        {
+            token.ApplicationId = null;
+        }
+        else
+        {
+            token.ApplicationId = identifier;
         }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetPropertiesAsync(TToken token, ImmutableDictionary<string, JsonElement> properties, CancellationToken cancellationToken)
+        return default;
+    }
+
+    /// <inheritdoc/>
+    public virtual ValueTask SetAuthorizationIdAsync(TToken token, string identifier, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
+
+        if (string.IsNullOrEmpty(identifier))
         {
-            ArgumentNullException.ThrowIfNull(token);
+            token.AuthorizationId = null;
+        }
+        else
+        {
+            token.AuthorizationId = identifier;
+        }
 
-            if (properties == null || properties.IsEmpty)
-            {
-                token.Properties = null;
+        return default;
+    }
 
-                return default;
-            }
+    /// <inheritdoc/>
+    public virtual ValueTask SetCreationDateAsync(TToken token, DateTimeOffset? date, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-            token.Properties = JObject.Parse(JConvert.SerializeObject(properties, JOptions.UnsafeRelaxedJsonEscaping));
+        token.CreationDate = date?.UtcDateTime;
 
-            return default;
-        }
+        return default;
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetRedemptionDateAsync(TToken token, DateTimeOffset? date, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
+    /// <inheritdoc/>
+    public virtual ValueTask SetExpirationDateAsync(TToken token, DateTimeOffset? date, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-            token.RedemptionDate = date?.UtcDateTime;
+        token.ExpirationDate = date?.UtcDateTime;
 
-            return default;
-        }
+        return default;
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetReferenceIdAsync(TToken token, string identifier, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
+    /// <inheritdoc/>
+    public virtual ValueTask SetPayloadAsync(TToken token, string payload, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-            token.ReferenceId = identifier;
+        token.Payload = payload;
 
-            return default;
-        }
+        return default;
+    }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetStatusAsync(TToken token, string status, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
+    /// <inheritdoc/>
+    public virtual ValueTask SetPropertiesAsync(TToken token, ImmutableDictionary<string, JsonElement> properties, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-            token.Status = status;
+        if (properties == null || properties.IsEmpty)
+        {
+            token.Properties = null;
 
             return default;
         }
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetSubjectAsync(TToken token, string subject, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
+        token.Properties = JObject.Parse(JConvert.SerializeObject(properties, JOptions.UnsafeRelaxedJsonEscaping));
 
-            token.Subject = subject;
+        return default;
+    }
 
-            return default;
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask SetRedemptionDateAsync(TToken token, DateTimeOffset? date, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-        /// <inheritdoc/>
-        public virtual ValueTask SetTypeAsync(TToken token, string type, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
+        token.RedemptionDate = date?.UtcDateTime;
 
-            token.Type = type;
+        return default;
+    }
 
-            return default;
-        }
+    /// <inheritdoc/>
+    public virtual ValueTask SetReferenceIdAsync(TToken token, string identifier, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-        /// <inheritdoc/>
-        public virtual async ValueTask UpdateAsync(TToken token, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(token);
+        token.ReferenceId = identifier;
 
-            cancellationToken.ThrowIfCancellationRequested();
+        return default;
+    }
 
-            await _session.SaveAsync(token, checkConcurrency: true, collection: OpenIdCollection);
+    /// <inheritdoc/>
+    public virtual ValueTask SetStatusAsync(TToken token, string status, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
 
-            try
-            {
-                await _session.SaveChangesAsync();
-            }
-            catch (ConcurrencyException exception)
-            {
-                throw new OpenIddictExceptions.ConcurrencyException(new StringBuilder()
-                    .AppendLine("The token was concurrently updated and cannot be persisted in its current state.")
-                    .Append("Reload the token from the database and retry the operation.")
-                    .ToString(), exception);
-            }
+        token.Status = status;
+
+        return default;
+    }
+
+    /// <inheritdoc/>
+    public virtual ValueTask SetSubjectAsync(TToken token, string subject, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
+
+        token.Subject = subject;
+
+        return default;
+    }
+
+    /// <inheritdoc/>
+    public virtual ValueTask SetTypeAsync(TToken token, string type, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
+
+        token.Type = type;
+
+        return default;
+    }
+
+    /// <inheritdoc/>
+    public virtual async ValueTask UpdateAsync(TToken token, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(token);
+
+        cancellationToken.ThrowIfCancellationRequested();
+
+        await _session.SaveAsync(token, checkConcurrency: true, collection: OpenIdCollection);
+
+        try
+        {
+            await _session.SaveChangesAsync();
+        }
+        catch (ConcurrencyException exception)
+        {
+            throw new OpenIddictExceptions.ConcurrencyException(new StringBuilder()
+                .AppendLine("The token was concurrently updated and cannot be persisted in its current state.")
+                .Append("Reload the token from the database and retry the operation.")
+                .ToString(), exception);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Queries.Abstractions/IQueryResults.cs b/src/OrchardCore/OrchardCore.Queries.Abstractions/IQueryResults.cs
index 92cda4184ed..c71e9160494 100644
--- a/src/OrchardCore/OrchardCore.Queries.Abstractions/IQueryResults.cs
+++ b/src/OrchardCore/OrchardCore.Queries.Abstractions/IQueryResults.cs
@@ -1,15 +1,14 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Queries
+namespace OrchardCore.Queries;
+
+/// <summary>
+/// Contracts for query results.
+/// </summary>
+public interface IQueryResults
 {
     /// <summary>
-    /// Contracts for query results.
+    /// Gets or sets the query items.
     /// </summary>
-    public interface IQueryResults
-    {
-        /// <summary>
-        /// Gets or sets the query items.
-        /// </summary>
-        public IEnumerable<object> Items { get; set; }
-    }
+    public IEnumerable<object> Items { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Queries.Abstractions/Models/DeletingQueryContext.cs b/src/OrchardCore/OrchardCore.Queries.Abstractions/Models/DeletingQueryContext.cs
index 997b1534615..75b77954fef 100644
--- a/src/OrchardCore/OrchardCore.Queries.Abstractions/Models/DeletingQueryContext.cs
+++ b/src/OrchardCore/OrchardCore.Queries.Abstractions/Models/DeletingQueryContext.cs
@@ -1,4 +1,4 @@
-namespace OrchardCore.Queries;
+namespace OrchardCore.Queries;
 
 public sealed class DeletingQueryContext : QueryContextBase
 {
diff --git a/src/OrchardCore/OrchardCore.Queries.Abstractions/Models/UpdatedQueryContext.cs b/src/OrchardCore/OrchardCore.Queries.Abstractions/Models/UpdatedQueryContext.cs
index 9914e3e3963..a1dbeea9bc9 100644
--- a/src/OrchardCore/OrchardCore.Queries.Abstractions/Models/UpdatedQueryContext.cs
+++ b/src/OrchardCore/OrchardCore.Queries.Abstractions/Models/UpdatedQueryContext.cs
@@ -1,4 +1,4 @@
-namespace OrchardCore.Queries;
+namespace OrchardCore.Queries;
 
 public sealed class UpdatedQueryContext : QueryContextBase
 {
diff --git a/src/OrchardCore/OrchardCore.ReCaptcha.Core/ActionFilters/Detection/IDetectRobots.cs b/src/OrchardCore/OrchardCore.ReCaptcha.Core/ActionFilters/Detection/IDetectRobots.cs
index 422386d300f..de84bc24b5c 100644
--- a/src/OrchardCore/OrchardCore.ReCaptcha.Core/ActionFilters/Detection/IDetectRobots.cs
+++ b/src/OrchardCore/OrchardCore.ReCaptcha.Core/ActionFilters/Detection/IDetectRobots.cs
@@ -1,29 +1,28 @@
-namespace OrchardCore.ReCaptcha.ActionFilters.Detection
+namespace OrchardCore.ReCaptcha.ActionFilters.Detection;
+
+/// <summary>
+/// This interface describes the contract for components that can detect Robots.
+/// </summary>
+public interface IDetectRobots
 {
     /// <summary>
-    /// This interface describes the contract for components that can detect Robots.
+    /// Performs a check to see if the current request could be submitted by a robot.
     /// </summary>
-    public interface IDetectRobots
-    {
-        /// <summary>
-        /// Performs a check to see if the current request could be submitted by a robot.
-        /// </summary>
-        /// <returns>Detection result.</returns>
-        RobotDetectionResult DetectRobot();
+    /// <returns>Detection result.</returns>
+    RobotDetectionResult DetectRobot();
 
-        /// <summary>
-        /// Clear the detectors internal state, we are not dealing with a robot.
-        /// </summary>
-        void IsNotARobot();
+    /// <summary>
+    /// Clear the detectors internal state, we are not dealing with a robot.
+    /// </summary>
+    void IsNotARobot();
 
-        /// <summary>
-        /// We are dealing with a robot, shields up.
-        /// </summary>
-        void FlagAsRobot();
-    }
+    /// <summary>
+    /// We are dealing with a robot, shields up.
+    /// </summary>
+    void FlagAsRobot();
+}
 
-    public class RobotDetectionResult
-    {
-        public bool IsRobot { get; set; }
-    }
+public class RobotDetectionResult
+{
+    public bool IsRobot { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ReCaptcha.Core/ActionFilters/Detection/IPAddressRobotDetector.cs b/src/OrchardCore/OrchardCore.ReCaptcha.Core/ActionFilters/Detection/IPAddressRobotDetector.cs
index 98a50a0b442..d054882efe5 100644
--- a/src/OrchardCore/OrchardCore.ReCaptcha.Core/ActionFilters/Detection/IPAddressRobotDetector.cs
+++ b/src/OrchardCore/OrchardCore.ReCaptcha.Core/ActionFilters/Detection/IPAddressRobotDetector.cs
@@ -2,58 +2,57 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.ReCaptcha.Configuration;
 
-namespace OrchardCore.ReCaptcha.ActionFilters.Detection
+namespace OrchardCore.ReCaptcha.ActionFilters.Detection;
+
+public class IPAddressRobotDetector : IDetectRobots
 {
-    public class IPAddressRobotDetector : IDetectRobots
-    {
-        private const string IpAddressAbuseDetectorCacheKey = "IpAddressRobotDetector";
+    private const string IpAddressAbuseDetectorCacheKey = "IpAddressRobotDetector";
 
-        private readonly IMemoryCache _memoryCache;
-        private readonly IClientIPAddressAccessor _clientIpAddressAccessor;
-        private readonly ReCaptchaSettings _settings;
+    private readonly IMemoryCache _memoryCache;
+    private readonly IClientIPAddressAccessor _clientIpAddressAccessor;
+    private readonly ReCaptchaSettings _settings;
 
-        public IPAddressRobotDetector(
-            IClientIPAddressAccessor clientIpAddressAccessor,
-            IMemoryCache memoryCache,
-            IOptions<ReCaptchaSettings> settingsAccessor)
-        {
-            _clientIpAddressAccessor = clientIpAddressAccessor;
-            _memoryCache = memoryCache;
-            _settings = settingsAccessor.Value;
-        }
-
-        public void IsNotARobot()
-        {
-            var ipAddressKey = GetIpAddressCacheKey();
-            _memoryCache.Remove(ipAddressKey);
-        }
+    public IPAddressRobotDetector(
+        IClientIPAddressAccessor clientIpAddressAccessor,
+        IMemoryCache memoryCache,
+        IOptions<ReCaptchaSettings> settingsAccessor)
+    {
+        _clientIpAddressAccessor = clientIpAddressAccessor;
+        _memoryCache = memoryCache;
+        _settings = settingsAccessor.Value;
+    }
 
-        private string GetIpAddressCacheKey()
-        {
-            var address = _clientIpAddressAccessor.GetIPAddressAsync().GetAwaiter().GetResult();
+    public void IsNotARobot()
+    {
+        var ipAddressKey = GetIpAddressCacheKey();
+        _memoryCache.Remove(ipAddressKey);
+    }
 
-            return $"{IpAddressAbuseDetectorCacheKey}:{address?.ToString() ?? string.Empty}";
-        }
+    private string GetIpAddressCacheKey()
+    {
+        var address = _clientIpAddressAccessor.GetIPAddressAsync().GetAwaiter().GetResult();
 
-        public RobotDetectionResult DetectRobot()
-        {
-            var ipAddressKey = GetIpAddressCacheKey();
-            var faultyRequestCount = _memoryCache.GetOrCreate(ipAddressKey, fact => 0);
+        return $"{IpAddressAbuseDetectorCacheKey}:{address?.ToString() ?? string.Empty}";
+    }
 
-            return new RobotDetectionResult()
-            {
-                IsRobot = faultyRequestCount > _settings.DetectionThreshold
-            };
-        }
+    public RobotDetectionResult DetectRobot()
+    {
+        var ipAddressKey = GetIpAddressCacheKey();
+        var faultyRequestCount = _memoryCache.GetOrCreate(ipAddressKey, fact => 0);
 
-        public void FlagAsRobot()
+        return new RobotDetectionResult()
         {
-            var ipAddressKey = GetIpAddressCacheKey();
+            IsRobot = faultyRequestCount > _settings.DetectionThreshold
+        };
+    }
+
+    public void FlagAsRobot()
+    {
+        var ipAddressKey = GetIpAddressCacheKey();
 
-            // This has race conditions, but it's ok.
-            var faultyRequestCount = _memoryCache.GetOrCreate(ipAddressKey, fact => 0);
-            faultyRequestCount++;
-            _memoryCache.Set(ipAddressKey, faultyRequestCount);
-        }
+        // This has race conditions, but it's ok.
+        var faultyRequestCount = _memoryCache.GetOrCreate(ipAddressKey, fact => 0);
+        faultyRequestCount++;
+        _memoryCache.Set(ipAddressKey, faultyRequestCount);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ReCaptcha.Core/ActionFilters/ReCaptchaMode.cs b/src/OrchardCore/OrchardCore.ReCaptcha.Core/ActionFilters/ReCaptchaMode.cs
index ff5dc158b5d..daa743feb69 100644
--- a/src/OrchardCore/OrchardCore.ReCaptcha.Core/ActionFilters/ReCaptchaMode.cs
+++ b/src/OrchardCore/OrchardCore.ReCaptcha.Core/ActionFilters/ReCaptchaMode.cs
@@ -1,15 +1,14 @@
-namespace OrchardCore.ReCaptcha.ActionFilters
+namespace OrchardCore.ReCaptcha.ActionFilters;
+
+public enum ReCaptchaMode
 {
-    public enum ReCaptchaMode
-    {
-        /// <summary>
-        /// Captcha is always shown.
-        /// </summary>
-        AlwaysShow,
+    /// <summary>
+    /// Captcha is always shown.
+    /// </summary>
+    AlwaysShow,
 
-        /// <summary>
-        /// Captcha initially is not shown, but when a robot is detected it will show on until dismissed.
-        /// </summary>
-        PreventRobots
-    }
+    /// <summary>
+    /// Captcha initially is not shown, but when a robot is detected it will show on until dismissed.
+    /// </summary>
+    PreventRobots
 }
diff --git a/src/OrchardCore/OrchardCore.ReCaptcha.Core/ActionFilters/ValidateReCaptchaAttribute.cs b/src/OrchardCore/OrchardCore.ReCaptcha.Core/ActionFilters/ValidateReCaptchaAttribute.cs
index 51e774cff22..aa43961fdd1 100644
--- a/src/OrchardCore/OrchardCore.ReCaptcha.Core/ActionFilters/ValidateReCaptchaAttribute.cs
+++ b/src/OrchardCore/OrchardCore.ReCaptcha.Core/ActionFilters/ValidateReCaptchaAttribute.cs
@@ -5,57 +5,56 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.ReCaptcha.Services;
 
-namespace OrchardCore.ReCaptcha.ActionFilters
+namespace OrchardCore.ReCaptcha.ActionFilters;
+
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+public class ValidateReCaptchaAttribute : ActionFilterAttribute
 {
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
-    public class ValidateReCaptchaAttribute : ActionFilterAttribute
+    private readonly ReCaptchaMode _mode;
+
+    public ValidateReCaptchaAttribute(ReCaptchaMode mode = ReCaptchaMode.AlwaysShow)
     {
-        private readonly ReCaptchaMode _mode;
+        _mode = mode;
+    }
+
+    public override async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
+    {
+        var recaptchaService = context.HttpContext.RequestServices.GetService<ReCaptchaService>();
+        var S = context.HttpContext.RequestServices.GetService<IStringLocalizer<ReCaptchaService>>();
+        var isValidCaptcha = false;
+        var reCaptchaResponse = context.HttpContext.Request?.Form?[Constants.ReCaptchaServerResponseHeaderName].ToString();
+
+        if (!string.IsNullOrWhiteSpace(reCaptchaResponse))
+            isValidCaptcha = await recaptchaService.VerifyCaptchaResponseAsync(reCaptchaResponse);
+
+        var isRobot = false;
 
-        public ValidateReCaptchaAttribute(ReCaptchaMode mode = ReCaptchaMode.AlwaysShow)
+        switch (_mode)
         {
-            _mode = mode;
+            case ReCaptchaMode.PreventRobots:
+                isRobot = recaptchaService.IsThisARobot();
+                break;
+            case ReCaptchaMode.AlwaysShow:
+                isRobot = true;
+                break;
         }
 
-        public override async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
+        if (isRobot && !isValidCaptcha)
         {
-            var recaptchaService = context.HttpContext.RequestServices.GetService<ReCaptchaService>();
-            var S = context.HttpContext.RequestServices.GetService<IStringLocalizer<ReCaptchaService>>();
-            var isValidCaptcha = false;
-            var reCaptchaResponse = context.HttpContext.Request?.Form?[Constants.ReCaptchaServerResponseHeaderName].ToString();
-
-            if (!string.IsNullOrWhiteSpace(reCaptchaResponse))
-                isValidCaptcha = await recaptchaService.VerifyCaptchaResponseAsync(reCaptchaResponse);
-
-            var isRobot = false;
-
-            switch (_mode)
-            {
-                case ReCaptchaMode.PreventRobots:
-                    isRobot = recaptchaService.IsThisARobot();
-                    break;
-                case ReCaptchaMode.AlwaysShow:
-                    isRobot = true;
-                    break;
-            }
-
-            if (isRobot && !isValidCaptcha)
-            {
-                context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
-            }
-
-            await next();
-
-            if (context.ModelState.IsValid)
-            {
-                recaptchaService.ThisIsAHuman();
-            }
-            else
-            {
-                recaptchaService.MaybeThisIsARobot();
-            }
-
-            return;
+            context.ModelState.AddModelError("ReCaptcha", S["Failed to validate captcha"]);
         }
+
+        await next();
+
+        if (context.ModelState.IsValid)
+        {
+            recaptchaService.ThisIsAHuman();
+        }
+        else
+        {
+            recaptchaService.MaybeThisIsARobot();
+        }
+
+        return;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ReCaptcha.Core/Configuration/ReCaptchaSettings.cs b/src/OrchardCore/OrchardCore.ReCaptcha.Core/Configuration/ReCaptchaSettings.cs
index 9ef25e413fb..2c1da5f664e 100644
--- a/src/OrchardCore/OrchardCore.ReCaptcha.Core/Configuration/ReCaptchaSettings.cs
+++ b/src/OrchardCore/OrchardCore.ReCaptcha.Core/Configuration/ReCaptchaSettings.cs
@@ -1,25 +1,24 @@
-namespace OrchardCore.ReCaptcha.Configuration
+namespace OrchardCore.ReCaptcha.Configuration;
+
+public class ReCaptchaSettings
 {
-    public class ReCaptchaSettings
-    {
-        public string SiteKey { get; set; }
+    public string SiteKey { get; set; }
 
-        public string SecretKey { get; set; }
+    public string SecretKey { get; set; }
 
-        public string ReCaptchaScriptUri { get; set; } = Constants.ReCaptchaScriptUri;
+    public string ReCaptchaScriptUri { get; set; } = Constants.ReCaptchaScriptUri;
 
-        public string ReCaptchaApiUri { get; set; } = Constants.ReCaptchaApiUri;
+    public string ReCaptchaApiUri { get; set; } = Constants.ReCaptchaApiUri;
 
-        /// <summary>
-        /// Value for supplying the amount of lenience we are willing to show robots.
-        /// </summary>
-        public int DetectionThreshold { get; set; } = 5;
+    /// <summary>
+    /// Value for supplying the amount of lenience we are willing to show robots.
+    /// </summary>
+    public int DetectionThreshold { get; set; } = 5;
 
-        private bool? _isValid;
+    private bool? _isValid;
 
-        public bool IsValid()
-            => _isValid ??= !string.IsNullOrWhiteSpace(SiteKey)
-            && !string.IsNullOrWhiteSpace(SecretKey)
-            && !string.IsNullOrWhiteSpace(ReCaptchaApiUri);
-    }
+    public bool IsValid()
+        => _isValid ??= !string.IsNullOrWhiteSpace(SiteKey)
+        && !string.IsNullOrWhiteSpace(SecretKey)
+        && !string.IsNullOrWhiteSpace(ReCaptchaApiUri);
 }
diff --git a/src/OrchardCore/OrchardCore.ReCaptcha.Core/Configuration/ReCaptchaSettingsConfiguration.cs b/src/OrchardCore/OrchardCore.ReCaptcha.Core/Configuration/ReCaptchaSettingsConfiguration.cs
index 0a531292146..c93b274280a 100644
--- a/src/OrchardCore/OrchardCore.ReCaptcha.Core/Configuration/ReCaptchaSettingsConfiguration.cs
+++ b/src/OrchardCore/OrchardCore.ReCaptcha.Core/Configuration/ReCaptchaSettingsConfiguration.cs
@@ -1,25 +1,24 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Settings;
 
-namespace OrchardCore.ReCaptcha.Configuration
+namespace OrchardCore.ReCaptcha.Configuration;
+
+public sealed class ReCaptchaSettingsConfiguration : IConfigureOptions<ReCaptchaSettings>
 {
-    public sealed class ReCaptchaSettingsConfiguration : IConfigureOptions<ReCaptchaSettings>
-    {
-        private readonly ISiteService _site;
+    private readonly ISiteService _site;
 
-        public ReCaptchaSettingsConfiguration(ISiteService site)
-        {
-            _site = site;
-        }
+    public ReCaptchaSettingsConfiguration(ISiteService site)
+    {
+        _site = site;
+    }
 
-        public void Configure(ReCaptchaSettings options)
-        {
-            var settings = _site.GetSettingsAsync<ReCaptchaSettings>()
-                .GetAwaiter()
-                .GetResult();
+    public void Configure(ReCaptchaSettings options)
+    {
+        var settings = _site.GetSettingsAsync<ReCaptchaSettings>()
+            .GetAwaiter()
+            .GetResult();
 
-            options.SiteKey = settings.SiteKey;
-            options.SecretKey = settings.SecretKey;
-        }
+        options.SiteKey = settings.SiteKey;
+        options.SecretKey = settings.SecretKey;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ReCaptcha.Core/Constants.cs b/src/OrchardCore/OrchardCore.ReCaptcha.Core/Constants.cs
index 88335255c2f..573cdf98379 100644
--- a/src/OrchardCore/OrchardCore.ReCaptcha.Core/Constants.cs
+++ b/src/OrchardCore/OrchardCore.ReCaptcha.Core/Constants.cs
@@ -1,11 +1,10 @@
-namespace OrchardCore.ReCaptcha
+namespace OrchardCore.ReCaptcha;
+
+public static class Constants
 {
-    public static class Constants
-    {
-        public const string ReCaptchaScriptUri = "https://www.google.com/recaptcha/api.js";
+    public const string ReCaptchaScriptUri = "https://www.google.com/recaptcha/api.js";
 
-        public const string ReCaptchaApiUri = "https://www.google.com/recaptcha/api/";
+    public const string ReCaptchaApiUri = "https://www.google.com/recaptcha/api/";
 
-        public const string ReCaptchaServerResponseHeaderName = "g-recaptcha-response";
-    }
+    public const string ReCaptchaServerResponseHeaderName = "g-recaptcha-response";
 }
diff --git a/src/OrchardCore/OrchardCore.ReCaptcha.Core/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.ReCaptcha.Core/ServiceCollectionExtensions.cs
index b8a76288e02..f70c74a368a 100644
--- a/src/OrchardCore/OrchardCore.ReCaptcha.Core/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ReCaptcha.Core/ServiceCollectionExtensions.cs
@@ -9,42 +9,41 @@
 using OrchardCore.ReCaptcha.TagHelpers;
 using Polly;
 
-namespace OrchardCore.ReCaptcha.Core
+namespace OrchardCore.ReCaptcha.Core;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    public static IServiceCollection AddReCaptcha(this IServiceCollection services, Action<ReCaptchaSettings> configure = null)
     {
-        public static IServiceCollection AddReCaptcha(this IServiceCollection services, Action<ReCaptchaSettings> configure = null)
-        {
-            // c.f. https://learn.microsoft.com/en-us/dotnet/architecture/microservices/implement-resilient-applications/use-httpclientfactory-to-implement-resilient-http-requests
-            services.AddSingleton<ReCaptchaService>();
+        // c.f. https://learn.microsoft.com/en-us/dotnet/architecture/microservices/implement-resilient-applications/use-httpclientfactory-to-implement-resilient-http-requests
+        services.AddSingleton<ReCaptchaService>();
 
-            services
-                .AddHttpClient(nameof(ReCaptchaService))
-                .AddResilienceHandler("oc-handler", builder => builder
-                    .AddRetry(new HttpRetryStrategyOptions
+        services
+            .AddHttpClient(nameof(ReCaptchaService))
+            .AddResilienceHandler("oc-handler", builder => builder
+                .AddRetry(new HttpRetryStrategyOptions
+                {
+                    Name = "oc-retry",
+                    MaxRetryAttempts = 3,
+                    OnRetry = attempt =>
                     {
-                        Name = "oc-retry",
-                        MaxRetryAttempts = 3,
-                        OnRetry = attempt =>
-                        {
-                            attempt.RetryDelay.Add(TimeSpan.FromSeconds(0.5 * attempt.AttemptNumber));
-
-                            return ValueTask.CompletedTask;
-                        }
-                    })
-                );
+                        attempt.RetryDelay.Add(TimeSpan.FromSeconds(0.5 * attempt.AttemptNumber));
 
-            services.AddSingleton<IDetectRobots, IPAddressRobotDetector>();
-            services.AddTransient<IConfigureOptions<ReCaptchaSettings>, ReCaptchaSettingsConfiguration>();
+                        return ValueTask.CompletedTask;
+                    }
+                })
+            );
 
-            services.AddTagHelpers<ReCaptchaTagHelper>();
+        services.AddSingleton<IDetectRobots, IPAddressRobotDetector>();
+        services.AddTransient<IConfigureOptions<ReCaptchaSettings>, ReCaptchaSettingsConfiguration>();
 
-            if (configure != null)
-            {
-                services.Configure(configure);
-            }
+        services.AddTagHelpers<ReCaptchaTagHelper>();
 
-            return services;
+        if (configure != null)
+        {
+            services.Configure(configure);
         }
+
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ReCaptcha.Core/Services/ReCaptchaService.cs b/src/OrchardCore/OrchardCore.ReCaptcha.Core/Services/ReCaptchaService.cs
index c12142eeacf..043929ce685 100644
--- a/src/OrchardCore/OrchardCore.ReCaptcha.Core/Services/ReCaptchaService.cs
+++ b/src/OrchardCore/OrchardCore.ReCaptcha.Core/Services/ReCaptchaService.cs
@@ -13,131 +13,130 @@
 using OrchardCore.ReCaptcha.ActionFilters.Detection;
 using OrchardCore.ReCaptcha.Configuration;
 
-namespace OrchardCore.ReCaptcha.Services
+namespace OrchardCore.ReCaptcha.Services;
+
+public class ReCaptchaService
 {
-    public class ReCaptchaService
+    private static readonly JsonSerializerOptions _jsonSerializerOptions = new()
     {
-        private static readonly JsonSerializerOptions _jsonSerializerOptions = new()
-        {
-            PropertyNamingPolicy = SnakeCaseNamingPolicy.Instance,
-        };
-
-        private readonly ReCaptchaSettings _reCaptchaSettings;
-        private readonly IHttpClientFactory _httpClientFactory;
-        private readonly IEnumerable<IDetectRobots> _robotDetectors;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly ILogger _logger;
-        private readonly string _verifyHost;
-        protected readonly IStringLocalizer S;
-
-        public ReCaptchaService(
-            IHttpClientFactory httpClientFactory,
-            IOptions<ReCaptchaSettings> optionsAccessor,
-            IEnumerable<IDetectRobots> robotDetectors,
-            IHttpContextAccessor httpContextAccessor,
-            ILogger<ReCaptchaService> logger,
-            IStringLocalizer<ReCaptchaService> stringLocalizer)
+        PropertyNamingPolicy = SnakeCaseNamingPolicy.Instance,
+    };
+
+    private readonly ReCaptchaSettings _reCaptchaSettings;
+    private readonly IHttpClientFactory _httpClientFactory;
+    private readonly IEnumerable<IDetectRobots> _robotDetectors;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly ILogger _logger;
+    private readonly string _verifyHost;
+    protected readonly IStringLocalizer S;
+
+    public ReCaptchaService(
+        IHttpClientFactory httpClientFactory,
+        IOptions<ReCaptchaSettings> optionsAccessor,
+        IEnumerable<IDetectRobots> robotDetectors,
+        IHttpContextAccessor httpContextAccessor,
+        ILogger<ReCaptchaService> logger,
+        IStringLocalizer<ReCaptchaService> stringLocalizer)
+    {
+        _httpClientFactory = httpClientFactory;
+        _reCaptchaSettings = optionsAccessor.Value;
+        _verifyHost = $"{optionsAccessor.Value.ReCaptchaApiUri?.TrimEnd('/')}/siteverify";
+        _robotDetectors = robotDetectors;
+        _httpContextAccessor = httpContextAccessor;
+        _logger = logger;
+        S = stringLocalizer;
+    }
+
+    /// <summary>
+    /// Flags the behavior as that of a robot.
+    /// </summary>
+    public void MaybeThisIsARobot()
+        => _robotDetectors.Invoke(i => i.FlagAsRobot(), _logger);
+
+    /// <summary>
+    /// Determines if the request has been made by a robot.
+    /// </summary>
+    /// <returns>Yes (true) or no (false).</returns>
+    public bool IsThisARobot()
+        => _robotDetectors.Invoke(i => i.DetectRobot(), _logger)
+        .Any(a => a.IsRobot);
+
+    /// <summary>
+    /// Clears all robot markers, we are dealing with a human.
+    /// </summary>
+    /// <returns></returns>
+    public void ThisIsAHuman()
+        => _robotDetectors.Invoke(i => i.IsNotARobot(), _logger);
+
+    /// <summary>
+    /// Verifies the ReCaptcha response with the ReCaptcha webservice.
+    /// </summary>
+    /// <param name="reCaptchaResponse"></param>
+    /// <returns></returns>
+    public async Task<bool> VerifyCaptchaResponseAsync(string reCaptchaResponse)
+        => !string.IsNullOrWhiteSpace(reCaptchaResponse)
+            && _reCaptchaSettings.IsValid()
+            && await VerifyAsync(reCaptchaResponse);
+
+
+    /// <summary>
+    /// Validates the captcha that is in the Form of the current request.
+    /// </summary>
+    /// <param name="reportError">Lambda for reporting errors.</param>
+    public async Task<bool> ValidateCaptchaAsync(Action<string, string> reportError)
+    {
+        if (!_reCaptchaSettings.IsValid())
         {
-            _httpClientFactory = httpClientFactory;
-            _reCaptchaSettings = optionsAccessor.Value;
-            _verifyHost = $"{optionsAccessor.Value.ReCaptchaApiUri?.TrimEnd('/')}/siteverify";
-            _robotDetectors = robotDetectors;
-            _httpContextAccessor = httpContextAccessor;
-            _logger = logger;
-            S = stringLocalizer;
+            _logger.LogWarning("The ReCaptcha settings are invalid");
+            return false;
         }
 
-        /// <summary>
-        /// Flags the behavior as that of a robot.
-        /// </summary>
-        public void MaybeThisIsARobot()
-            => _robotDetectors.Invoke(i => i.FlagAsRobot(), _logger);
-
-        /// <summary>
-        /// Determines if the request has been made by a robot.
-        /// </summary>
-        /// <returns>Yes (true) or no (false).</returns>
-        public bool IsThisARobot()
-            => _robotDetectors.Invoke(i => i.DetectRobot(), _logger)
-            .Any(a => a.IsRobot);
-
-        /// <summary>
-        /// Clears all robot markers, we are dealing with a human.
-        /// </summary>
-        /// <returns></returns>
-        public void ThisIsAHuman()
-            => _robotDetectors.Invoke(i => i.IsNotARobot(), _logger);
-
-        /// <summary>
-        /// Verifies the ReCaptcha response with the ReCaptcha webservice.
-        /// </summary>
-        /// <param name="reCaptchaResponse"></param>
-        /// <returns></returns>
-        public async Task<bool> VerifyCaptchaResponseAsync(string reCaptchaResponse)
-            => !string.IsNullOrWhiteSpace(reCaptchaResponse)
-                && _reCaptchaSettings.IsValid()
-                && await VerifyAsync(reCaptchaResponse);
-
-
-        /// <summary>
-        /// Validates the captcha that is in the Form of the current request.
-        /// </summary>
-        /// <param name="reportError">Lambda for reporting errors.</param>
-        public async Task<bool> ValidateCaptchaAsync(Action<string, string> reportError)
+        // We use the header value as default if it's passed
+        var reCaptchaResponse = _httpContextAccessor.HttpContext?.Request.Headers[Constants.ReCaptchaServerResponseHeaderName];
+
+        // If this is a standard form post we get the token from the form values if not affected previously in the header.
+        if (string.IsNullOrEmpty(reCaptchaResponse) && (_httpContextAccessor.HttpContext?.Request.HasFormContentType ?? false))
         {
-            if (!_reCaptchaSettings.IsValid())
-            {
-                _logger.LogWarning("The ReCaptcha settings are invalid");
-                return false;
-            }
+            reCaptchaResponse = _httpContextAccessor.HttpContext.Request.Form[Constants.ReCaptchaServerResponseHeaderName].ToString();
+        }
 
-            // We use the header value as default if it's passed
-            var reCaptchaResponse = _httpContextAccessor.HttpContext?.Request.Headers[Constants.ReCaptchaServerResponseHeaderName];
+        var isValid = await VerifyCaptchaResponseAsync(reCaptchaResponse);
 
-            // If this is a standard form post we get the token from the form values if not affected previously in the header.
-            if (string.IsNullOrEmpty(reCaptchaResponse) && (_httpContextAccessor.HttpContext?.Request.HasFormContentType ?? false))
-            {
-                reCaptchaResponse = _httpContextAccessor.HttpContext.Request.Form[Constants.ReCaptchaServerResponseHeaderName].ToString();
-            }
+        if (!isValid)
+        {
+            reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
+        }
 
-            var isValid = await VerifyCaptchaResponseAsync(reCaptchaResponse);
+        return isValid;
+    }
 
-            if (!isValid)
+    /// <summary>
+    /// Verifies the supplied token with ReCaptcha Api.
+    /// </summary>
+    /// <param name="responseToken">Token received from the ReCaptcha UI.</param>
+    /// <returns>A boolean indicating if the token is valid.</returns>
+    private async Task<bool> VerifyAsync(string responseToken)
+    {
+        try
+        {
+            var content = new FormUrlEncodedContent(new Dictionary<string, string>
             {
-                reportError("ReCaptcha", S["Failed to validate ReCaptcha"]);
-            }
+                { "secret", _reCaptchaSettings.SecretKey },
+                { "response", responseToken }
+            });
 
-            return isValid;
-        }
+            var httpClient = _httpClientFactory.CreateClient(nameof(ReCaptchaService));
+            var response = await httpClient.PostAsync(_verifyHost, content);
+            response.EnsureSuccessStatusCode();
+            var result = await response.Content.ReadFromJsonAsync<ReCaptchaResponse>(_jsonSerializerOptions);
 
-        /// <summary>
-        /// Verifies the supplied token with ReCaptcha Api.
-        /// </summary>
-        /// <param name="responseToken">Token received from the ReCaptcha UI.</param>
-        /// <returns>A boolean indicating if the token is valid.</returns>
-        private async Task<bool> VerifyAsync(string responseToken)
+            return result.Success;
+        }
+        catch (HttpRequestException e)
         {
-            try
-            {
-                var content = new FormUrlEncodedContent(new Dictionary<string, string>
-                {
-                    { "secret", _reCaptchaSettings.SecretKey },
-                    { "response", responseToken }
-                });
-
-                var httpClient = _httpClientFactory.CreateClient(nameof(ReCaptchaService));
-                var response = await httpClient.PostAsync(_verifyHost, content);
-                response.EnsureSuccessStatusCode();
-                var result = await response.Content.ReadFromJsonAsync<ReCaptchaResponse>(_jsonSerializerOptions);
-
-                return result.Success;
-            }
-            catch (HttpRequestException e)
-            {
-                _logger.LogError(e, "Could not contact Google to verify ReCaptcha.");
-            }
-
-            return false;
+            _logger.LogError(e, "Could not contact Google to verify ReCaptcha.");
         }
+
+        return false;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ReCaptcha.Core/TagHelpers/ReCaptchaTagHelper.cs b/src/OrchardCore/OrchardCore.ReCaptcha.Core/TagHelpers/ReCaptchaTagHelper.cs
index 6737e890a26..271925102b9 100644
--- a/src/OrchardCore/OrchardCore.ReCaptcha.Core/TagHelpers/ReCaptchaTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.ReCaptcha.Core/TagHelpers/ReCaptchaTagHelper.cs
@@ -15,121 +15,120 @@
 using OrchardCore.ReCaptcha.Configuration;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.ReCaptcha.TagHelpers
+namespace OrchardCore.ReCaptcha.TagHelpers;
+
+[HtmlTargetElement("captcha", TagStructure = TagStructure.WithoutEndTag)]
+[HtmlTargetElement("captcha", Attributes = "mode,language,onload", TagStructure = TagStructure.WithoutEndTag)]
+public class ReCaptchaTagHelper : TagHelper
 {
-    [HtmlTargetElement("captcha", TagStructure = TagStructure.WithoutEndTag)]
-    [HtmlTargetElement("captcha", Attributes = "mode,language,onload", TagStructure = TagStructure.WithoutEndTag)]
-    public class ReCaptchaTagHelper : TagHelper
+    private readonly IResourceManager _resourceManager;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly ReCaptchaSettings _settings;
+    private readonly ILogger _logger;
+    private readonly ILocalizationService _localizationService;
+
+    public ReCaptchaTagHelper(
+        IOptions<ReCaptchaSettings> optionsAccessor,
+        IResourceManager resourceManager,
+        ILocalizationService localizationService,
+        IHttpContextAccessor httpContextAccessor,
+        ILogger<ReCaptchaTagHelper> logger)
+    {
+        _resourceManager = resourceManager;
+        _httpContextAccessor = httpContextAccessor;
+        _settings = optionsAccessor.Value;
+        Mode = ReCaptchaMode.PreventRobots;
+        _localizationService = localizationService;
+        _logger = logger;
+    }
+
+    [HtmlAttributeName("mode")]
+    public ReCaptchaMode Mode { get; set; }
+
+    /// <summary>
+    /// The two letter ISO code of the language the captcha should be displayed in.
+    /// When left blank it will fall back to the default OrchardCore language.
+    /// </summary>
+    [HtmlAttributeName("language")]
+    public string Language { get; set; }
+
+    /// <summary>
+    /// The name of the JavaScript callback method to be called when the reCAPTCHA loads.
+    /// </summary>
+    [HtmlAttributeName("onload")]
+    public string OnLoad { get; set; }
+
+    public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
     {
-        private readonly IResourceManager _resourceManager;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly ReCaptchaSettings _settings;
-        private readonly ILogger _logger;
-        private readonly ILocalizationService _localizationService;
-
-        public ReCaptchaTagHelper(
-            IOptions<ReCaptchaSettings> optionsAccessor,
-            IResourceManager resourceManager,
-            ILocalizationService localizationService,
-            IHttpContextAccessor httpContextAccessor,
-            ILogger<ReCaptchaTagHelper> logger)
+        var robotDetectors = _httpContextAccessor.HttpContext.RequestServices.GetServices<IDetectRobots>();
+        var robotDetected = robotDetectors.Invoke(d => d.DetectRobot(), _logger).Any(d => d.IsRobot) && Mode == ReCaptchaMode.PreventRobots;
+        var alwaysShow = Mode == ReCaptchaMode.AlwaysShow;
+        var isConfigured = _settings != null;
+
+        if (isConfigured && (robotDetected || alwaysShow))
+        {
+            await ShowCaptcha(output);
+        }
+        else
         {
-            _resourceManager = resourceManager;
-            _httpContextAccessor = httpContextAccessor;
-            _settings = optionsAccessor.Value;
-            Mode = ReCaptchaMode.PreventRobots;
-            _localizationService = localizationService;
-            _logger = logger;
+            output.SuppressOutput();
         }
+    }
 
-        [HtmlAttributeName("mode")]
-        public ReCaptchaMode Mode { get; set; }
+    private async Task ShowCaptcha(TagHelperOutput output)
+    {
+        output.TagName = "div";
+        output.Attributes.SetAttribute("class", "g-recaptcha");
+        output.Attributes.SetAttribute("data-sitekey", _settings.SiteKey);
+        output.TagMode = TagMode.StartTagAndEndTag;
 
-        /// <summary>
-        /// The two letter ISO code of the language the captcha should be displayed in.
-        /// When left blank it will fall back to the default OrchardCore language.
-        /// </summary>
-        [HtmlAttributeName("language")]
-        public string Language { get; set; }
+        var builder = new TagBuilder("script");
+        builder.Attributes.Add("src", await GetReCaptchaScriptUrlAsync());
 
-        /// <summary>
-        /// The name of the JavaScript callback method to be called when the reCAPTCHA loads.
-        /// </summary>
-        [HtmlAttributeName("onload")]
-        public string OnLoad { get; set; }
+        _resourceManager.RegisterFootScript(builder);
+    }
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+    private async Task<string> GetReCaptchaScriptUrlAsync()
+    {
+        var query = new QueryString();
+        var cultureInfo = await GetCultureAsync();
+        if (cultureInfo != null)
         {
-            var robotDetectors = _httpContextAccessor.HttpContext.RequestServices.GetServices<IDetectRobots>();
-            var robotDetected = robotDetectors.Invoke(d => d.DetectRobot(), _logger).Any(d => d.IsRobot) && Mode == ReCaptchaMode.PreventRobots;
-            var alwaysShow = Mode == ReCaptchaMode.AlwaysShow;
-            var isConfigured = _settings != null;
-
-            if (isConfigured && (robotDetected || alwaysShow))
-            {
-                await ShowCaptcha(output);
-            }
-            else
-            {
-                output.SuppressOutput();
-            }
+            query = query.Add("hl", cultureInfo.TwoLetterISOLanguageName);
         }
 
-        private async Task ShowCaptcha(TagHelperOutput output)
+        if (!string.IsNullOrWhiteSpace(OnLoad))
         {
-            output.TagName = "div";
-            output.Attributes.SetAttribute("class", "g-recaptcha");
-            output.Attributes.SetAttribute("data-sitekey", _settings.SiteKey);
-            output.TagMode = TagMode.StartTagAndEndTag;
+            query = query.Add("onload", OnLoad);
+        }
 
-            var builder = new TagBuilder("script");
-            builder.Attributes.Add("src", await GetReCaptchaScriptUrlAsync());
+        var settingsUrl = new UriBuilder(_settings.ReCaptchaScriptUri)
+        {
+            Query = query.ToString()
+        };
 
-            _resourceManager.RegisterFootScript(builder);
-        }
+        return settingsUrl.ToString();
+    }
 
-        private async Task<string> GetReCaptchaScriptUrlAsync()
+    private async Task<CultureInfo> GetCultureAsync()
+    {
+        var language = Language;
+        CultureInfo culture = null;
+
+        if (string.IsNullOrWhiteSpace(language))
         {
-            var query = new QueryString();
-            var cultureInfo = await GetCultureAsync();
-            if (cultureInfo != null)
-            {
-                query = query.Add("hl", cultureInfo.TwoLetterISOLanguageName);
-            }
-
-            if (!string.IsNullOrWhiteSpace(OnLoad))
-            {
-                query = query.Add("onload", OnLoad);
-            }
-
-            var settingsUrl = new UriBuilder(_settings.ReCaptchaScriptUri)
-            {
-                Query = query.ToString()
-            };
-
-            return settingsUrl.ToString();
+            language = await _localizationService.GetDefaultCultureAsync();
         }
 
-        private async Task<CultureInfo> GetCultureAsync()
+        try
         {
-            var language = Language;
-            CultureInfo culture = null;
-
-            if (string.IsNullOrWhiteSpace(language))
-            {
-                language = await _localizationService.GetDefaultCultureAsync();
-            }
-
-            try
-            {
-                culture = CultureInfo.GetCultureInfo(language);
-            }
-            catch (CultureNotFoundException)
-            {
-                _logger.LogWarning("Language with name {LanguageName} not found.", language);
-            }
-
-            return culture;
+            culture = CultureInfo.GetCultureInfo(language);
         }
+        catch (CultureNotFoundException)
+        {
+            _logger.LogWarning("Language with name {LanguageName} not found.", language);
+        }
+
+        return culture;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Events/IRecipeEventHandler.cs b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Events/IRecipeEventHandler.cs
index 3e58e7fb120..86bcd485163 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Events/IRecipeEventHandler.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Events/IRecipeEventHandler.cs
@@ -1,19 +1,18 @@
 using System.Threading.Tasks;
 using OrchardCore.Recipes.Models;
 
-namespace OrchardCore.Recipes.Events
+namespace OrchardCore.Recipes.Events;
+
+/// <summary>
+/// Note: The recipe executor creates for each step a scope that may be based on a new shell if the features have changed,
+/// so an 'IRecipeEventHandler', that is also used in each step scope, can't be a tenant level service, otherwise it may
+/// be used in a shell container it doesn't belong, so it should be an application level transient or singleton service.
+/// </summary>
+public interface IRecipeEventHandler
 {
-    /// <summary>
-    /// Note: The recipe executor creates for each step a scope that may be based on a new shell if the features have changed,
-    /// so an 'IRecipeEventHandler', that is also used in each step scope, can't be a tenant level service, otherwise it may
-    /// be used in a shell container it doesn't belong, so it should be an application level transient or singleton service.
-    /// </summary>
-    public interface IRecipeEventHandler
-    {
-        Task RecipeExecutingAsync(string executionId, RecipeDescriptor descriptor);
-        Task RecipeStepExecutingAsync(RecipeExecutionContext context);
-        Task RecipeStepExecutedAsync(RecipeExecutionContext context);
-        Task RecipeExecutedAsync(string executionId, RecipeDescriptor descriptor);
-        Task ExecutionFailedAsync(string executionId, RecipeDescriptor descriptor);
-    }
+    Task RecipeExecutingAsync(string executionId, RecipeDescriptor descriptor);
+    Task RecipeStepExecutingAsync(RecipeExecutionContext context);
+    Task RecipeStepExecutedAsync(RecipeExecutionContext context);
+    Task RecipeExecutedAsync(string executionId, RecipeDescriptor descriptor);
+    Task ExecutionFailedAsync(string executionId, RecipeDescriptor descriptor);
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Models/RecipeDescriptor.cs b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Models/RecipeDescriptor.cs
index 08431d5ee19..08a8ab01675 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Models/RecipeDescriptor.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Models/RecipeDescriptor.cs
@@ -1,28 +1,27 @@
 using System;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.Recipes.Models
+namespace OrchardCore.Recipes.Models;
+
+public class RecipeDescriptor
 {
-    public class RecipeDescriptor
-    {
-        public string Name { get; set; }
-        public string DisplayName { get; set; }
-        public string Description { get; set; }
-        public string Author { get; set; }
-        public string WebSite { get; set; }
-        public string Version { get; set; }
-        public bool IsSetupRecipe { get; set; }
-        public DateTime? ExportUtc { get; set; }
-        public string[] Categories { get; set; }
-        public string[] Tags { get; set; }
-        public bool RequireNewScope { get; set; } = true;
+    public string Name { get; set; }
+    public string DisplayName { get; set; }
+    public string Description { get; set; }
+    public string Author { get; set; }
+    public string WebSite { get; set; }
+    public string Version { get; set; }
+    public bool IsSetupRecipe { get; set; }
+    public DateTime? ExportUtc { get; set; }
+    public string[] Categories { get; set; }
+    public string[] Tags { get; set; }
+    public bool RequireNewScope { get; set; } = true;
 
-        /// <summary>
-        /// The path of the recipe file for the <see cref="RecipeDescriptor.FileProvider"/> property.
-        /// </summary>
-        public string BasePath { get; set; }
+    /// <summary>
+    /// The path of the recipe file for the <see cref="RecipeDescriptor.FileProvider"/> property.
+    /// </summary>
+    public string BasePath { get; set; }
 
-        public IFileInfo RecipeFileInfo { get; set; }
-        public IFileProvider FileProvider { get; set; }
-    }
+    public IFileInfo RecipeFileInfo { get; set; }
+    public IFileProvider FileProvider { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Models/RecipeEnvironmentFeature.cs b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Models/RecipeEnvironmentFeature.cs
index dee46d50078..60029a5ff41 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Models/RecipeEnvironmentFeature.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Models/RecipeEnvironmentFeature.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Recipes.Models
+namespace OrchardCore.Recipes.Models;
+
+public class RecipeEnvironmentFeature
 {
-    public class RecipeEnvironmentFeature
-    {
-        public Dictionary<string, object> Properties { get; init; } = [];
-    }
+    public Dictionary<string, object> Properties { get; init; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Models/RecipeResult.cs b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Models/RecipeResult.cs
index 4df129b1faf..17e210249c2 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Models/RecipeResult.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Models/RecipeResult.cs
@@ -1,13 +1,12 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OrchardCore.Recipes.Models
+namespace OrchardCore.Recipes.Models;
+
+public class RecipeResult
 {
-    public class RecipeResult
-    {
-        public string ExecutionId { get; set; }
-        public List<RecipeStepResult> Steps { get; set; } = [];
-        public bool IsCompleted => Steps.All(s => s.IsCompleted);
-        public bool IsSuccessful => Steps.All(s => s.IsCompleted && s.IsSuccessful);
-    }
+    public string ExecutionId { get; set; }
+    public List<RecipeStepResult> Steps { get; set; } = [];
+    public bool IsCompleted => Steps.All(s => s.IsCompleted);
+    public bool IsSuccessful => Steps.All(s => s.IsCompleted && s.IsSuccessful);
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Abstractions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Recipes.Abstractions/ServiceCollectionExtensions.cs
index c26aeef080b..4e86bd56afb 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Abstractions/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Abstractions/ServiceCollectionExtensions.cs
@@ -1,17 +1,16 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Recipes
+namespace OrchardCore.Recipes;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    public static IServiceCollection AddRecipeExecutionStep<TImplementation>(
+        this IServiceCollection serviceCollection)
+        where TImplementation : class, IRecipeStepHandler
     {
-        public static IServiceCollection AddRecipeExecutionStep<TImplementation>(
-            this IServiceCollection serviceCollection)
-            where TImplementation : class, IRecipeStepHandler
-        {
-            serviceCollection.AddScoped<IRecipeStepHandler, TImplementation>();
+        serviceCollection.AddScoped<IRecipeStepHandler, TImplementation>();
 
-            return serviceCollection;
-        }
+        return serviceCollection;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeEnvironmentProvider.cs b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeEnvironmentProvider.cs
index 8bdb40fbf9f..869226c464b 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeEnvironmentProvider.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeEnvironmentProvider.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Recipes.Services
+namespace OrchardCore.Recipes.Services;
+
+public interface IRecipeEnvironmentProvider
 {
-    public interface IRecipeEnvironmentProvider
-    {
-        Task PopulateEnvironmentAsync(IDictionary<string, object> environment);
-        int Order { get; }
-    }
+    Task PopulateEnvironmentAsync(IDictionary<string, object> environment);
+    int Order { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeExecutor.cs b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeExecutor.cs
index 706c745fc71..a4a80669d7a 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeExecutor.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeExecutor.cs
@@ -3,10 +3,9 @@
 using System.Threading.Tasks;
 using OrchardCore.Recipes.Models;
 
-namespace OrchardCore.Recipes.Services
+namespace OrchardCore.Recipes.Services;
+
+public interface IRecipeExecutor
 {
-    public interface IRecipeExecutor
-    {
-        Task<string> ExecuteAsync(string executionId, RecipeDescriptor recipeDescriptor, IDictionary<string, object> environment, CancellationToken cancellationToken);
-    }
+    Task<string> ExecuteAsync(string executionId, RecipeDescriptor recipeDescriptor, IDictionary<string, object> environment, CancellationToken cancellationToken);
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeHarvester.cs b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeHarvester.cs
index 9eda96f19c1..43fa6d46920 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeHarvester.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeHarvester.cs
@@ -2,13 +2,12 @@
 using System.Threading.Tasks;
 using OrchardCore.Recipes.Models;
 
-namespace OrchardCore.Recipes.Services
+namespace OrchardCore.Recipes.Services;
+
+public interface IRecipeHarvester
 {
-    public interface IRecipeHarvester
-    {
-        /// <summary>
-        /// Returns a collection of all recipes.
-        /// </summary>
-        Task<IEnumerable<RecipeDescriptor>> HarvestRecipesAsync();
-    }
+    /// <summary>
+    /// Returns a collection of all recipes.
+    /// </summary>
+    Task<IEnumerable<RecipeDescriptor>> HarvestRecipesAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeMigrator.cs b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeMigrator.cs
index 54e05ce3494..bf1702fae54 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeMigrator.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeMigrator.cs
@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
 using OrchardCore.Data.Migration;
 
-namespace OrchardCore.Recipes.Services
+namespace OrchardCore.Recipes.Services;
+
+public interface IRecipeMigrator
 {
-    public interface IRecipeMigrator
-    {
-        Task<string> ExecuteAsync(string recipeFileName, IDataMigration migration);
-    }
+    Task<string> ExecuteAsync(string recipeFileName, IDataMigration migration);
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeReader.cs b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeReader.cs
index 2e0517ea87a..bb39d2fb8df 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeReader.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeReader.cs
@@ -2,10 +2,9 @@
 using Microsoft.Extensions.FileProviders;
 using OrchardCore.Recipes.Models;
 
-namespace OrchardCore.Recipes.Services
+namespace OrchardCore.Recipes.Services;
+
+public interface IRecipeReader
 {
-    public interface IRecipeReader
-    {
-        Task<RecipeDescriptor> GetRecipeDescriptorAsync(string recipeBasePath, IFileInfo recipeFileInfo, IFileProvider fileProvider);
-    }
+    Task<RecipeDescriptor> GetRecipeDescriptorAsync(string recipeBasePath, IFileInfo recipeFileInfo, IFileProvider fileProvider);
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeStepHandler.cs b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeStepHandler.cs
index ee69eceb2a3..fdac178d8e7 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeStepHandler.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Abstractions/Services/IRecipeStepHandler.cs
@@ -1,18 +1,17 @@
 using System.Threading.Tasks;
 using OrchardCore.Recipes.Models;
 
-namespace OrchardCore.Recipes.Services
+namespace OrchardCore.Recipes.Services;
+
+/// <summary>
+/// An implementation of this interface will be used every time a recipe step is processed.
+/// Each implementation is responsible for processing only the steps that it targets.
+/// </summary>
+public interface IRecipeStepHandler
 {
     /// <summary>
-    /// An implementation of this interface will be used every time a recipe step is processed.
-    /// Each implementation is responsible for processing only the steps that it targets.
+    /// Processes a recipe step.
     /// </summary>
-    public interface IRecipeStepHandler
-    {
-        /// <summary>
-        /// Processes a recipe step.
-        /// </summary>
-        /// <param name="context">The context object representing the processed step.</param>
-        Task ExecuteAsync(RecipeExecutionContext context);
-    }
+    /// <param name="context">The context object representing the processed step.</param>
+    Task ExecuteAsync(RecipeExecutionContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Core/ConfigurationMethodProvider.cs b/src/OrchardCore/OrchardCore.Recipes.Core/ConfigurationMethodProvider.cs
index 1de5fe57039..1e64c958b18 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Core/ConfigurationMethodProvider.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Core/ConfigurationMethodProvider.cs
@@ -4,24 +4,23 @@
 using OrchardCore.Environment.Shell.Configuration;
 using OrchardCore.Scripting;
 
-namespace OrchardCore.Recipes
+namespace OrchardCore.Recipes;
+
+public class ConfigurationMethodProvider : IGlobalMethodProvider
 {
-    public class ConfigurationMethodProvider : IGlobalMethodProvider
-    {
-        private readonly GlobalMethod _globalMethod;
+    private readonly GlobalMethod _globalMethod;
 
-        public ConfigurationMethodProvider(IShellConfiguration configuration)
+    public ConfigurationMethodProvider(IShellConfiguration configuration)
+    {
+        _globalMethod = new GlobalMethod
         {
-            _globalMethod = new GlobalMethod
-            {
-                Name = "configuration",
-                Method = serviceprovider => (Func<string, object, object>)((key, defaultValue) => configuration.GetValue<object>(key, defaultValue)),
-            };
-        }
+            Name = "configuration",
+            Method = serviceprovider => (Func<string, object, object>)((key, defaultValue) => configuration.GetValue<object>(key, defaultValue)),
+        };
+    }
 
-        public IEnumerable<GlobalMethod> GetMethods()
-        {
-            yield return _globalMethod;
-        }
+    public IEnumerable<GlobalMethod> GetMethods()
+    {
+        yield return _globalMethod;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Core/ParametersMethodProvider.cs b/src/OrchardCore/OrchardCore.Recipes.Core/ParametersMethodProvider.cs
index 503db793984..13d8218d08b 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Core/ParametersMethodProvider.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Core/ParametersMethodProvider.cs
@@ -3,29 +3,28 @@
 using System.Text.Json.Nodes;
 using OrchardCore.Scripting;
 
-namespace OrchardCore.Recipes
+namespace OrchardCore.Recipes;
+
+public class ParametersMethodProvider : IGlobalMethodProvider
 {
-    public class ParametersMethodProvider : IGlobalMethodProvider
+    private readonly GlobalMethod _globalMethod;
+
+    public ParametersMethodProvider(object environment)
     {
-        private readonly GlobalMethod _globalMethod;
+        var environmentObject = JObject.FromObject(environment);
 
-        public ParametersMethodProvider(object environment)
+        _globalMethod = new GlobalMethod
         {
-            var environmentObject = JObject.FromObject(environment);
-
-            _globalMethod = new GlobalMethod
-            {
-                Name = "parameters",
-                Method = serviceprovider => (Func<string, object>)(name =>
-               {
-                   return environmentObject.SelectNode(name)?.Value<string>();
-               }),
-            };
-        }
+            Name = "parameters",
+            Method = serviceprovider => (Func<string, object>)(name =>
+           {
+               return environmentObject.SelectNode(name)?.Value<string>();
+           }),
+        };
+    }
 
-        public IEnumerable<GlobalMethod> GetMethods()
-        {
-            yield return _globalMethod;
-        }
+    public IEnumerable<GlobalMethod> GetMethods()
+    {
+        yield return _globalMethod;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Core/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Recipes.Core/ServiceCollectionExtensions.cs
index ced19a9bfb2..add94bfac6f 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Core/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Core/ServiceCollectionExtensions.cs
@@ -1,20 +1,19 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Recipes
+namespace OrchardCore.Recipes;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    public static IServiceCollection AddRecipes(this IServiceCollection services)
     {
-        public static IServiceCollection AddRecipes(this IServiceCollection services)
-        {
-            services.AddScoped<IRecipeHarvester, ApplicationRecipeHarvester>();
-            services.AddScoped<IRecipeHarvester, RecipeHarvester>();
-            services.AddTransient<IRecipeExecutor, RecipeExecutor>();
-            services.AddScoped<IRecipeMigrator, RecipeMigrator>();
-            services.AddScoped<IRecipeReader, RecipeReader>();
-            services.AddScoped<IRecipeEnvironmentProvider, RecipeEnvironmentFeatureProvider>();
+        services.AddScoped<IRecipeHarvester, ApplicationRecipeHarvester>();
+        services.AddScoped<IRecipeHarvester, RecipeHarvester>();
+        services.AddTransient<IRecipeExecutor, RecipeExecutor>();
+        services.AddScoped<IRecipeMigrator, RecipeMigrator>();
+        services.AddScoped<IRecipeReader, RecipeReader>();
+        services.AddScoped<IRecipeEnvironmentProvider, RecipeEnvironmentFeatureProvider>();
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Core/Services/ApplicationRecipeHarvester.cs b/src/OrchardCore/OrchardCore.Recipes.Core/Services/ApplicationRecipeHarvester.cs
index 3c32f148328..058065bc258 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Core/Services/ApplicationRecipeHarvester.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Core/Services/ApplicationRecipeHarvester.cs
@@ -5,25 +5,24 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Recipes.Models;
 
-namespace OrchardCore.Recipes.Services
+namespace OrchardCore.Recipes.Services;
+
+/// <summary>
+/// Finds recipes in the application content folder.
+/// </summary>
+public class ApplicationRecipeHarvester : RecipeHarvester
 {
-    /// <summary>
-    /// Finds recipes in the application content folder.
-    /// </summary>
-    public class ApplicationRecipeHarvester : RecipeHarvester
+    public ApplicationRecipeHarvester(
+        IRecipeReader recipeReader,
+        IExtensionManager extensionManager,
+        IHostEnvironment hostingEnvironment,
+        ILogger<RecipeHarvester> logger)
+        : base(recipeReader, extensionManager, hostingEnvironment, logger)
     {
-        public ApplicationRecipeHarvester(
-            IRecipeReader recipeReader,
-            IExtensionManager extensionManager,
-            IHostEnvironment hostingEnvironment,
-            ILogger<RecipeHarvester> logger)
-            : base(recipeReader, extensionManager, hostingEnvironment, logger)
-        {
-        }
+    }
 
-        public override Task<IEnumerable<RecipeDescriptor>> HarvestRecipesAsync()
-        {
-            return HarvestRecipesAsync("Recipes");
-        }
+    public override Task<IEnumerable<RecipeDescriptor>> HarvestRecipesAsync()
+    {
+        return HarvestRecipesAsync("Recipes");
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeEnvironmentFeatureProvider.cs b/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeEnvironmentFeatureProvider.cs
index 0c37ce82340..991f5862521 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeEnvironmentFeatureProvider.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeEnvironmentFeatureProvider.cs
@@ -3,41 +3,40 @@
 using Microsoft.AspNetCore.Http;
 using OrchardCore.Recipes.Models;
 
-namespace OrchardCore.Recipes.Services
+namespace OrchardCore.Recipes.Services;
+
+public class RecipeEnvironmentFeatureProvider : IRecipeEnvironmentProvider
 {
-    public class RecipeEnvironmentFeatureProvider : IRecipeEnvironmentProvider
-    {
-        private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public RecipeEnvironmentFeatureProvider(IHttpContextAccessor httpContextAccessor)
-        {
-            _httpContextAccessor = httpContextAccessor;
-        }
+    public RecipeEnvironmentFeatureProvider(IHttpContextAccessor httpContextAccessor)
+    {
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        // Set later to override any pre existing values.
-        public int Order => 1000;
+    // Set later to override any pre existing values.
+    public int Order => 1000;
 
-        public Task PopulateEnvironmentAsync(IDictionary<string, object> environment)
+    public Task PopulateEnvironmentAsync(IDictionary<string, object> environment)
+    {
+        // When a migration is executed during setup these properties are available on the feature.
+        var feature = _httpContextAccessor.HttpContext.Features.Get<RecipeEnvironmentFeature>();
+        if (feature != null)
         {
-            // When a migration is executed during setup these properties are available on the feature.
-            var feature = _httpContextAccessor.HttpContext.Features.Get<RecipeEnvironmentFeature>();
-            if (feature != null)
+            if (feature.Properties.TryGetValue("AdminUserId", out var adminUserId))
             {
-                if (feature.Properties.TryGetValue("AdminUserId", out var adminUserId))
-                {
-                    environment["AdminUserId"] = adminUserId;
-                }
-                if (feature.Properties.TryGetValue("AdminUsername", out var adminUserName))
-                {
-                    environment["AdminUsername"] = adminUserName;
-                }
-                if (feature.Properties.TryGetValue("SiteName", out var siteName))
-                {
-                    environment["SiteName"] = siteName;
-                }
+                environment["AdminUserId"] = adminUserId;
+            }
+            if (feature.Properties.TryGetValue("AdminUsername", out var adminUserName))
+            {
+                environment["AdminUsername"] = adminUserName;
+            }
+            if (feature.Properties.TryGetValue("SiteName", out var siteName))
+            {
+                environment["SiteName"] = siteName;
             }
-
-            return Task.CompletedTask;
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeExecutor.cs b/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeExecutor.cs
index a58cca59d2d..3b5f7ebdb5c 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeExecutor.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeExecutor.cs
@@ -16,250 +16,249 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Scripting;
 
-namespace OrchardCore.Recipes.Services
+namespace OrchardCore.Recipes.Services;
+
+public class RecipeExecutor : IRecipeExecutor
 {
-    public class RecipeExecutor : IRecipeExecutor
+    private readonly IShellHost _shellHost;
+    private readonly ShellSettings _shellSettings;
+    private readonly IEnumerable<IRecipeEventHandler> _recipeEventHandlers;
+    private readonly ILogger _logger;
+    private readonly Dictionary<string, List<IGlobalMethodProvider>> _methodProviders = [];
+
+    protected readonly IStringLocalizer S;
+
+    public RecipeExecutor(
+        IShellHost shellHost,
+        ShellSettings shellSettings,
+        IEnumerable<IRecipeEventHandler> recipeEventHandlers,
+        ILogger<RecipeExecutor> logger,
+        IStringLocalizer<RecipeExecutor> stringLocalizer)
     {
-        private readonly IShellHost _shellHost;
-        private readonly ShellSettings _shellSettings;
-        private readonly IEnumerable<IRecipeEventHandler> _recipeEventHandlers;
-        private readonly ILogger _logger;
-        private readonly Dictionary<string, List<IGlobalMethodProvider>> _methodProviders = [];
-
-        protected readonly IStringLocalizer S;
-
-        public RecipeExecutor(
-            IShellHost shellHost,
-            ShellSettings shellSettings,
-            IEnumerable<IRecipeEventHandler> recipeEventHandlers,
-            ILogger<RecipeExecutor> logger,
-            IStringLocalizer<RecipeExecutor> stringLocalizer)
-        {
-            _shellHost = shellHost;
-            _shellSettings = shellSettings;
-            _recipeEventHandlers = recipeEventHandlers;
-            _logger = logger;
-            S = stringLocalizer;
-        }
+        _shellHost = shellHost;
+        _shellSettings = shellSettings;
+        _recipeEventHandlers = recipeEventHandlers;
+        _logger = logger;
+        S = stringLocalizer;
+    }
+
+    public async Task<string> ExecuteAsync(string executionId, RecipeDescriptor recipeDescriptor, IDictionary<string, object> environment, CancellationToken cancellationToken)
+    {
+        await _recipeEventHandlers.InvokeAsync((handler, executionId, recipeDescriptor) => handler.RecipeExecutingAsync(executionId, recipeDescriptor), executionId, recipeDescriptor, _logger);
 
-        public async Task<string> ExecuteAsync(string executionId, RecipeDescriptor recipeDescriptor, IDictionary<string, object> environment, CancellationToken cancellationToken)
+        try
         {
-            await _recipeEventHandlers.InvokeAsync((handler, executionId, recipeDescriptor) => handler.RecipeExecutingAsync(executionId, recipeDescriptor), executionId, recipeDescriptor, _logger);
+            var methodProviders = new List<IGlobalMethodProvider>();
+            _methodProviders.Add(executionId, methodProviders);
 
-            try
-            {
-                var methodProviders = new List<IGlobalMethodProvider>();
-                _methodProviders.Add(executionId, methodProviders);
+            methodProviders.Add(new ParametersMethodProvider(environment));
+            methodProviders.Add(new ConfigurationMethodProvider(_shellSettings.ShellConfiguration));
 
-                methodProviders.Add(new ParametersMethodProvider(environment));
-                methodProviders.Add(new ConfigurationMethodProvider(_shellSettings.ShellConfiguration));
+            var result = new RecipeResult { ExecutionId = executionId };
 
-                var result = new RecipeResult { ExecutionId = executionId };
+            await using (var stream = recipeDescriptor.RecipeFileInfo.CreateReadStream())
+            {
+                using var doc = await JsonDocument.ParseAsync(stream, JOptions.Document, cancellationToken);
+                if (doc.RootElement.ValueKind != JsonValueKind.Object)
+                {
+                    throw new FormatException($"Top-level JSON element must be an object. Instead, '{doc.RootElement.ValueKind}' was found.");
+                }
 
-                await using (var stream = recipeDescriptor.RecipeFileInfo.CreateReadStream())
+                foreach (var property in doc.RootElement.EnumerateObject())
                 {
-                    using var doc = await JsonDocument.ParseAsync(stream, JOptions.Document, cancellationToken);
-                    if (doc.RootElement.ValueKind != JsonValueKind.Object)
+                    if (property.Name == "variables")
                     {
-                        throw new FormatException($"Top-level JSON element must be an object. Instead, '{doc.RootElement.ValueKind}' was found.");
+                        var variables = JsonObject.Create(property.Value);
+                        methodProviders.Add(new VariablesMethodProvider(variables, methodProviders));
                     }
 
-                    foreach (var property in doc.RootElement.EnumerateObject())
+                    // Go to Steps, then iterate.
+                    if (property.Name == "steps" && property.Value.ValueKind == JsonValueKind.Array)
                     {
-                        if (property.Name == "variables")
+                        foreach (var step in property.Value.EnumerateArray())
                         {
-                            var variables = JsonObject.Create(property.Value);
-                            methodProviders.Add(new VariablesMethodProvider(variables, methodProviders));
-                        }
+                            var child = JsonObject.Create(step);
 
-                        // Go to Steps, then iterate.
-                        if (property.Name == "steps" && property.Value.ValueKind == JsonValueKind.Array)
-                        {
-                            foreach (var step in property.Value.EnumerateArray())
+                            var recipeStep = new RecipeExecutionContext
+                            {
+                                Name = child.Value<string>("name"),
+                                Step = child,
+                                ExecutionId = executionId,
+                                Environment = environment,
+                                RecipeDescriptor = recipeDescriptor
+                            };
+
+                            if (cancellationToken.IsCancellationRequested)
                             {
-                                var child = JsonObject.Create(step);
+                                _logger.LogError("Recipe interrupted by cancellation token.");
+                                return null;
+                            }
 
-                                var recipeStep = new RecipeExecutionContext
-                                {
-                                    Name = child.Value<string>("name"),
-                                    Step = child,
-                                    ExecutionId = executionId,
-                                    Environment = environment,
-                                    RecipeDescriptor = recipeDescriptor
-                                };
-
-                                if (cancellationToken.IsCancellationRequested)
-                                {
-                                    _logger.LogError("Recipe interrupted by cancellation token.");
-                                    return null;
-                                }
+                            var stepResult = new RecipeStepResult { StepName = recipeStep.Name };
+                            result.Steps.Add(stepResult);
 
-                                var stepResult = new RecipeStepResult { StepName = recipeStep.Name };
-                                result.Steps.Add(stepResult);
+                            ExceptionDispatchInfo capturedException = null;
+                            try
+                            {
+                                await ExecuteStepAsync(recipeStep);
 
-                                ExceptionDispatchInfo capturedException = null;
-                                try
+                                if (recipeStep.Errors.Count > 0)
                                 {
-                                    await ExecuteStepAsync(recipeStep);
-
-                                    if (recipeStep.Errors.Count > 0)
-                                    {
-                                        stepResult.IsSuccessful = false;
-                                        stepResult.Errors = recipeStep.Errors.ToArray();
-                                    }
-                                    else
-                                    {
-                                        stepResult.IsSuccessful = true;
-                                    }
+                                    stepResult.IsSuccessful = false;
+                                    stepResult.Errors = recipeStep.Errors.ToArray();
                                 }
-                                catch (Exception e)
+                                else
                                 {
-                                    stepResult.IsSuccessful = false;
-                                    stepResult.Errors = [S["Unexpected error occurred while executing the '{0}' step.", stepResult.StepName]];
+                                    stepResult.IsSuccessful = true;
+                                }
+                            }
+                            catch (Exception e)
+                            {
+                                stepResult.IsSuccessful = false;
+                                stepResult.Errors = [S["Unexpected error occurred while executing the '{0}' step.", stepResult.StepName]];
 
-                                    // Because we can't do some async processing the in catch or finally
-                                    // blocks, we store the exception to throw it later.
+                                // Because we can't do some async processing the in catch or finally
+                                // blocks, we store the exception to throw it later.
 
-                                    capturedException = ExceptionDispatchInfo.Capture(new RecipeExecutionException(e, stepResult));
-                                }
+                                capturedException = ExceptionDispatchInfo.Capture(new RecipeExecutionException(e, stepResult));
+                            }
 
-                                stepResult.IsCompleted = true;
+                            stepResult.IsCompleted = true;
 
-                                capturedException?.Throw();
+                            capturedException?.Throw();
 
-                                if (!stepResult.IsSuccessful)
-                                {
-                                    throw new RecipeExecutionException(stepResult);
-                                }
+                            if (!stepResult.IsSuccessful)
+                            {
+                                throw new RecipeExecutionException(stepResult);
+                            }
 
-                                if (recipeStep.InnerRecipes != null)
+                            if (recipeStep.InnerRecipes != null)
+                            {
+                                foreach (var descriptor in recipeStep.InnerRecipes)
                                 {
-                                    foreach (var descriptor in recipeStep.InnerRecipes)
-                                    {
-                                        var innerExecutionId = Guid.NewGuid().ToString();
-                                        descriptor.RequireNewScope = recipeDescriptor.RequireNewScope;
-                                        await ExecuteAsync(innerExecutionId, descriptor, environment, cancellationToken);
-                                    }
+                                    var innerExecutionId = Guid.NewGuid().ToString();
+                                    descriptor.RequireNewScope = recipeDescriptor.RequireNewScope;
+                                    await ExecuteAsync(innerExecutionId, descriptor, environment, cancellationToken);
                                 }
                             }
                         }
                     }
                 }
+            }
 
-                await _recipeEventHandlers.InvokeAsync((handler, executionId, recipeDescriptor) => handler.RecipeExecutedAsync(executionId, recipeDescriptor), executionId, recipeDescriptor, _logger);
+            await _recipeEventHandlers.InvokeAsync((handler, executionId, recipeDescriptor) => handler.RecipeExecutedAsync(executionId, recipeDescriptor), executionId, recipeDescriptor, _logger);
 
-                return executionId;
-            }
-            catch (Exception)
-            {
-                await _recipeEventHandlers.InvokeAsync((handler, executionId, recipeDescriptor) => handler.ExecutionFailedAsync(executionId, recipeDescriptor), executionId, recipeDescriptor, _logger);
+            return executionId;
+        }
+        catch (Exception)
+        {
+            await _recipeEventHandlers.InvokeAsync((handler, executionId, recipeDescriptor) => handler.ExecutionFailedAsync(executionId, recipeDescriptor), executionId, recipeDescriptor, _logger);
 
-                throw;
-            }
-            finally
-            {
-                _methodProviders.Remove(executionId);
-            }
+            throw;
+        }
+        finally
+        {
+            _methodProviders.Remove(executionId);
         }
+    }
+
+    private async Task ExecuteStepAsync(RecipeExecutionContext recipeStep)
+    {
+        var shellScope = recipeStep.RecipeDescriptor.RequireNewScope
+            ? await _shellHost.GetScopeAsync(_shellSettings)
+            : ShellScope.Current;
 
-        private async Task ExecuteStepAsync(RecipeExecutionContext recipeStep)
+        await shellScope.UsingAsync(async scope =>
         {
-            var shellScope = recipeStep.RecipeDescriptor.RequireNewScope
-                ? await _shellHost.GetScopeAsync(_shellSettings)
-                : ShellScope.Current;
+            var recipeStepHandlers = scope.ServiceProvider.GetServices<IRecipeStepHandler>();
+            var scriptingManager = scope.ServiceProvider.GetRequiredService<IScriptingManager>();
 
-            await shellScope.UsingAsync(async scope =>
-            {
-                var recipeStepHandlers = scope.ServiceProvider.GetServices<IRecipeStepHandler>();
-                var scriptingManager = scope.ServiceProvider.GetRequiredService<IScriptingManager>();
+            // Substitutes the script elements by their actual values.
+            EvaluateJsonTree(scriptingManager, recipeStep, recipeStep.Step);
 
-                // Substitutes the script elements by their actual values.
-                EvaluateJsonTree(scriptingManager, recipeStep, recipeStep.Step);
+            _logger.LogInformation("Executing recipe step '{RecipeName}'.", recipeStep.Name);
 
-                _logger.LogInformation("Executing recipe step '{RecipeName}'.", recipeStep.Name);
+            await _recipeEventHandlers.InvokeAsync((handler, recipeStep) => handler.RecipeStepExecutingAsync(recipeStep), recipeStep, _logger);
 
-                await _recipeEventHandlers.InvokeAsync((handler, recipeStep) => handler.RecipeStepExecutingAsync(recipeStep), recipeStep, _logger);
+            foreach (var recipeStepHandler in recipeStepHandlers)
+            {
+                await recipeStepHandler.ExecuteAsync(recipeStep);
+            }
 
-                foreach (var recipeStepHandler in recipeStepHandlers)
-                {
-                    await recipeStepHandler.ExecuteAsync(recipeStep);
-                }
+            await _recipeEventHandlers.InvokeAsync((handler, recipeStep) => handler.RecipeStepExecutedAsync(recipeStep), recipeStep, _logger);
 
-                await _recipeEventHandlers.InvokeAsync((handler, recipeStep) => handler.RecipeStepExecutedAsync(recipeStep), recipeStep, _logger);
+            _logger.LogInformation("Finished executing recipe step '{RecipeName}'.", recipeStep.Name);
+        });
+    }
 
-                _logger.LogInformation("Finished executing recipe step '{RecipeName}'.", recipeStep.Name);
-            });
+    /// <summary>
+    /// Traverse all the nodes of the json document and replaces their value if they are scripted.
+    /// </summary>
+    private JsonNode EvaluateJsonTree(IScriptingManager scriptingManager, RecipeExecutionContext context, JsonNode node)
+    {
+        if (node is null)
+        {
+            return null;
         }
 
-        /// <summary>
-        /// Traverse all the nodes of the json document and replaces their value if they are scripted.
-        /// </summary>
-        private JsonNode EvaluateJsonTree(IScriptingManager scriptingManager, RecipeExecutionContext context, JsonNode node)
+        switch (node.GetValueKind())
         {
-            if (node is null)
-            {
-                return null;
-            }
-
-            switch (node.GetValueKind())
-            {
-                case JsonValueKind.Array:
-                    var array = node.AsArray();
-                    for (var i = 0; i < array.Count; i++)
+            case JsonValueKind.Array:
+                var array = node.AsArray();
+                for (var i = 0; i < array.Count; i++)
+                {
+                    var item = EvaluateJsonTree(scriptingManager, context, array[i]);
+                    if (item is JsonValue && item != array[i])
                     {
-                        var item = EvaluateJsonTree(scriptingManager, context, array[i]);
-                        if (item is JsonValue && item != array[i])
-                        {
-                            array[i] = item;
-                        }
+                        array[i] = item;
                     }
+                }
 
-                    break;
+                break;
 
-                case JsonValueKind.Object:
-                    var properties = node.AsObject();
-                    foreach (var property in properties.ToArray())
+            case JsonValueKind.Object:
+                var properties = node.AsObject();
+                foreach (var property in properties.ToArray())
+                {
+                    var newProperty = EvaluateJsonTree(scriptingManager, context, property.Value);
+                    if (newProperty is JsonValue && newProperty != property.Value)
                     {
-                        var newProperty = EvaluateJsonTree(scriptingManager, context, property.Value);
-                        if (newProperty is JsonValue && newProperty != property.Value)
-                        {
-                            properties[property.Key] = newProperty;
-                        }
+                        properties[property.Key] = newProperty;
                     }
+                }
 
-                    break;
-
-                case JsonValueKind.String:
-                    const char scriptSeparator = ':';
-                    var value = node.Value<string>();
-
-                    // Evaluate the expression while the result is another expression.
-                    while (value.StartsWith('[') && value.EndsWith(']'))
-                    {
-                        var scriptSeparatorIndex = value.IndexOf(scriptSeparator);
+                break;
 
-                        // Only remove brackets if this is a valid script expression, e.g. '[js:xxx]', or '[file:xxx]'.
-                        if (!(scriptSeparatorIndex > -1 && value[1..scriptSeparatorIndex].All(char.IsLetter)))
-                        {
-                            break;
-                        }
+            case JsonValueKind.String:
+                const char scriptSeparator = ':';
+                var value = node.Value<string>();
 
-                        value = value.Trim('[', ']');
+                // Evaluate the expression while the result is another expression.
+                while (value.StartsWith('[') && value.EndsWith(']'))
+                {
+                    var scriptSeparatorIndex = value.IndexOf(scriptSeparator);
 
-                        value = (scriptingManager.Evaluate(
-                            value,
-                            context.RecipeDescriptor.FileProvider,
-                            context.RecipeDescriptor.BasePath,
-                            _methodProviders[context.ExecutionId])
-                            ?? string.Empty).ToString();
+                    // Only remove brackets if this is a valid script expression, e.g. '[js:xxx]', or '[file:xxx]'.
+                    if (!(scriptSeparatorIndex > -1 && value[1..scriptSeparatorIndex].All(char.IsLetter)))
+                    {
+                        break;
                     }
 
-                    node = JsonValue.Create<string>(value);
+                    value = value.Trim('[', ']');
 
-                    break;
-            }
+                    value = (scriptingManager.Evaluate(
+                        value,
+                        context.RecipeDescriptor.FileProvider,
+                        context.RecipeDescriptor.BasePath,
+                        _methodProviders[context.ExecutionId])
+                        ?? string.Empty).ToString();
+                }
 
-            return node;
+                node = JsonValue.Create<string>(value);
+
+                break;
         }
+
+        return node;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeHarvester.cs b/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeHarvester.cs
index 3099fd3db77..13c1603e849 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeHarvester.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeHarvester.cs
@@ -9,63 +9,62 @@
 using OrchardCore.Modules;
 using OrchardCore.Recipes.Models;
 
-namespace OrchardCore.Recipes.Services
+namespace OrchardCore.Recipes.Services;
+
+public class RecipeHarvester : IRecipeHarvester
 {
-    public class RecipeHarvester : IRecipeHarvester
+    private readonly IRecipeReader _recipeReader;
+    private readonly IExtensionManager _extensionManager;
+    private readonly IHostEnvironment _hostingEnvironment;
+    private readonly ILogger _logger;
+
+    public RecipeHarvester(
+        IRecipeReader recipeReader,
+        IExtensionManager extensionManager,
+        IHostEnvironment hostingEnvironment,
+        ILogger<RecipeHarvester> logger)
     {
-        private readonly IRecipeReader _recipeReader;
-        private readonly IExtensionManager _extensionManager;
-        private readonly IHostEnvironment _hostingEnvironment;
-        private readonly ILogger _logger;
+        _recipeReader = recipeReader;
+        _extensionManager = extensionManager;
+        _hostingEnvironment = hostingEnvironment;
+        _logger = logger;
+    }
 
-        public RecipeHarvester(
-            IRecipeReader recipeReader,
-            IExtensionManager extensionManager,
-            IHostEnvironment hostingEnvironment,
-            ILogger<RecipeHarvester> logger)
-        {
-            _recipeReader = recipeReader;
-            _extensionManager = extensionManager;
-            _hostingEnvironment = hostingEnvironment;
-            _logger = logger;
-        }
+    /// <inheritdoc/>
+    public virtual Task<IEnumerable<RecipeDescriptor>> HarvestRecipesAsync()
+        => _extensionManager.GetExtensions().InvokeAsync(GetRecipesAsync, _logger);
+
+    /// <summary>
+    /// Returns a list of recipes for a content path.
+    /// </summary>
+    /// <param name="path">A path string relative to the content root of the application.</param>
+    /// <returns>The list of <see cref="RecipeDescriptor"/> instances.</returns>
+    protected async Task<IEnumerable<RecipeDescriptor>> HarvestRecipesAsync(string path)
+    {
+        var recipeDescriptors = new List<RecipeDescriptor>();
 
-        /// <inheritdoc/>
-        public virtual Task<IEnumerable<RecipeDescriptor>> HarvestRecipesAsync()
-            => _extensionManager.GetExtensions().InvokeAsync(GetRecipesAsync, _logger);
+        var recipeFiles = _hostingEnvironment.ContentRootFileProvider.GetDirectoryContents(path)
+            .Where(f => !f.IsDirectory && f.Name.EndsWith(RecipesConstants.RecipeExtension, StringComparison.Ordinal));
 
-        /// <summary>
-        /// Returns a list of recipes for a content path.
-        /// </summary>
-        /// <param name="path">A path string relative to the content root of the application.</param>
-        /// <returns>The list of <see cref="RecipeDescriptor"/> instances.</returns>
-        protected async Task<IEnumerable<RecipeDescriptor>> HarvestRecipesAsync(string path)
+        foreach (var recipeFile in recipeFiles)
         {
-            var recipeDescriptors = new List<RecipeDescriptor>();
-
-            var recipeFiles = _hostingEnvironment.ContentRootFileProvider.GetDirectoryContents(path)
-                .Where(f => !f.IsDirectory && f.Name.EndsWith(RecipesConstants.RecipeExtension, StringComparison.Ordinal));
+            var recipeDescriptor = await _recipeReader.GetRecipeDescriptorAsync(path, recipeFile, _hostingEnvironment.ContentRootFileProvider);
 
-            foreach (var recipeFile in recipeFiles)
+            if (recipeDescriptor == null)
             {
-                var recipeDescriptor = await _recipeReader.GetRecipeDescriptorAsync(path, recipeFile, _hostingEnvironment.ContentRootFileProvider);
-
-                if (recipeDescriptor == null)
-                {
-                    continue;
-                }
-
-                recipeDescriptors.Add(recipeDescriptor);
+                continue;
             }
 
-            return recipeDescriptors;
+            recipeDescriptors.Add(recipeDescriptor);
         }
 
-        private Task<IEnumerable<RecipeDescriptor>> GetRecipesAsync(IExtensionInfo extension)
-        {
-            var folderSubPath = PathExtensions.Combine(extension.SubPath, RecipesConstants.RecipesFolderName);
+        return recipeDescriptors;
+    }
 
-            return HarvestRecipesAsync(folderSubPath);
-        }
+    private Task<IEnumerable<RecipeDescriptor>> GetRecipesAsync(IExtensionInfo extension)
+    {
+        var folderSubPath = PathExtensions.Combine(extension.SubPath, RecipesConstants.RecipesFolderName);
+
+        return HarvestRecipesAsync(folderSubPath);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeMigrator.cs b/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeMigrator.cs
index 91215655429..7fe882e0492 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeMigrator.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeMigrator.cs
@@ -10,58 +10,57 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Recipes.Services
+namespace OrchardCore.Recipes.Services;
+
+public class RecipeMigrator : IRecipeMigrator
 {
-    public class RecipeMigrator : IRecipeMigrator
-    {
-        private readonly IRecipeReader _recipeReader;
-        private readonly IRecipeExecutor _recipeExecutor;
-        private readonly IHostEnvironment _hostingEnvironment;
-        private readonly ITypeFeatureProvider _typeFeatureProvider;
-        private readonly IEnumerable<IRecipeEnvironmentProvider> _environmentProviders;
-        private readonly ILogger _logger;
+    private readonly IRecipeReader _recipeReader;
+    private readonly IRecipeExecutor _recipeExecutor;
+    private readonly IHostEnvironment _hostingEnvironment;
+    private readonly ITypeFeatureProvider _typeFeatureProvider;
+    private readonly IEnumerable<IRecipeEnvironmentProvider> _environmentProviders;
+    private readonly ILogger _logger;
 
-        public RecipeMigrator(
-            IRecipeReader recipeReader,
-            IRecipeExecutor recipeExecutor,
-            IHostEnvironment hostingEnvironment,
-            ITypeFeatureProvider typeFeatureProvider,
-            IEnumerable<IRecipeEnvironmentProvider> environmentProviders,
-            ILogger<RecipeMigrator> logger)
-        {
-            _recipeReader = recipeReader;
-            _recipeExecutor = recipeExecutor;
-            _hostingEnvironment = hostingEnvironment;
-            _typeFeatureProvider = typeFeatureProvider;
-            _environmentProviders = environmentProviders;
-            _logger = logger;
-        }
+    public RecipeMigrator(
+        IRecipeReader recipeReader,
+        IRecipeExecutor recipeExecutor,
+        IHostEnvironment hostingEnvironment,
+        ITypeFeatureProvider typeFeatureProvider,
+        IEnumerable<IRecipeEnvironmentProvider> environmentProviders,
+        ILogger<RecipeMigrator> logger)
+    {
+        _recipeReader = recipeReader;
+        _recipeExecutor = recipeExecutor;
+        _hostingEnvironment = hostingEnvironment;
+        _typeFeatureProvider = typeFeatureProvider;
+        _environmentProviders = environmentProviders;
+        _logger = logger;
+    }
 
-        public async Task<string> ExecuteAsync(string recipeFileName, IDataMigration migration)
-        {
-            var extensionInfo = _typeFeatureProvider.GetExtensionForDependency(migration.GetType());
+    public async Task<string> ExecuteAsync(string recipeFileName, IDataMigration migration)
+    {
+        var extensionInfo = _typeFeatureProvider.GetExtensionForDependency(migration.GetType());
 
-            var recipeBasePath = Path.Combine(extensionInfo.SubPath, "Migrations").Replace('\\', '/');
-            var recipeFilePath = Path.Combine(recipeBasePath, recipeFileName).Replace('\\', '/');
-            var recipeFileInfo = _hostingEnvironment.ContentRootFileProvider.GetFileInfo(recipeFilePath);
-            var recipeDescriptor = await _recipeReader.GetRecipeDescriptorAsync(recipeBasePath, recipeFileInfo, _hostingEnvironment.ContentRootFileProvider);
+        var recipeBasePath = Path.Combine(extensionInfo.SubPath, "Migrations").Replace('\\', '/');
+        var recipeFilePath = Path.Combine(recipeBasePath, recipeFileName).Replace('\\', '/');
+        var recipeFileInfo = _hostingEnvironment.ContentRootFileProvider.GetFileInfo(recipeFilePath);
+        var recipeDescriptor = await _recipeReader.GetRecipeDescriptorAsync(recipeBasePath, recipeFileInfo, _hostingEnvironment.ContentRootFileProvider);
 
-            if (recipeDescriptor == null)
-            {
-                return null;
-            }
+        if (recipeDescriptor == null)
+        {
+            return null;
+        }
 
-            recipeDescriptor.RequireNewScope = false;
+        recipeDescriptor.RequireNewScope = false;
 
-            var environment = new Dictionary<string, object>();
+        var environment = new Dictionary<string, object>();
 
-            await _environmentProviders.OrderBy(x => x.Order)
-                .InvokeAsync((provider, env) => provider.PopulateEnvironmentAsync(env), environment, _logger);
+        await _environmentProviders.OrderBy(x => x.Order)
+            .InvokeAsync((provider, env) => provider.PopulateEnvironmentAsync(env), environment, _logger);
 
-            var executionId = Guid.NewGuid().ToString("n");
+        var executionId = Guid.NewGuid().ToString("n");
 
-            return await _recipeExecutor.ExecuteAsync(executionId, recipeDescriptor, environment, CancellationToken.None);
-        }
+        return await _recipeExecutor.ExecuteAsync(executionId, recipeDescriptor, environment, CancellationToken.None);
     }
 }
 
diff --git a/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeReader.cs b/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeReader.cs
index a922d33b3e1..e394f2ebf5d 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeReader.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeReader.cs
@@ -5,39 +5,38 @@
 using Microsoft.Extensions.Logging;
 using OrchardCore.Recipes.Models;
 
-namespace OrchardCore.Recipes.Services
-{
-    public class RecipeReader : IRecipeReader
-    {
-        private readonly ILogger _logger;
+namespace OrchardCore.Recipes.Services;
 
-        public RecipeReader(ILogger<RecipeReader> logger)
-        {
-            _logger = logger;
-        }
+public class RecipeReader : IRecipeReader
+{
+    private readonly ILogger _logger;
 
-        public async Task<RecipeDescriptor> GetRecipeDescriptorAsync(string recipeBasePath, IFileInfo recipeFileInfo, IFileProvider recipeFileProvider)
-        {
-            // TODO: Try to optimize by only reading the required metadata instead of the whole file.
-            using var stream = recipeFileInfo.CreateReadStream();
+    public RecipeReader(ILogger<RecipeReader> logger)
+    {
+        _logger = logger;
+    }
 
-            RecipeDescriptor recipeDescriptor = null;
+    public async Task<RecipeDescriptor> GetRecipeDescriptorAsync(string recipeBasePath, IFileInfo recipeFileInfo, IFileProvider recipeFileProvider)
+    {
+        // TODO: Try to optimize by only reading the required metadata instead of the whole file.
+        using var stream = recipeFileInfo.CreateReadStream();
 
-            try
-            {
-                recipeDescriptor = await JsonSerializer.DeserializeAsync<RecipeDescriptor>(stream, JOptions.Default);
+        RecipeDescriptor recipeDescriptor = null;
 
-                recipeDescriptor.FileProvider = recipeFileProvider;
-                recipeDescriptor.BasePath = recipeBasePath;
-                recipeDescriptor.RecipeFileInfo = recipeFileInfo;
+        try
+        {
+            recipeDescriptor = await JsonSerializer.DeserializeAsync<RecipeDescriptor>(stream, JOptions.Default);
 
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Unable to deserialize the recipe file: '{FileName}'.", recipeFileInfo.Name);
-            }
+            recipeDescriptor.FileProvider = recipeFileProvider;
+            recipeDescriptor.BasePath = recipeBasePath;
+            recipeDescriptor.RecipeFileInfo = recipeFileInfo;
 
-            return recipeDescriptor;
         }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Unable to deserialize the recipe file: '{FileName}'.", recipeFileInfo.Name);
+        }
+
+        return recipeDescriptor;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Core/VariablesMethodProvider.cs b/src/OrchardCore/OrchardCore.Recipes.Core/VariablesMethodProvider.cs
index 8a054cc975d..88346ab6ab5 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Core/VariablesMethodProvider.cs
+++ b/src/OrchardCore/OrchardCore.Recipes.Core/VariablesMethodProvider.cs
@@ -7,49 +7,48 @@
 using OrchardCore.Environment.Shell.Scope;
 using OrchardCore.Scripting;
 
-namespace OrchardCore.Recipes
+namespace OrchardCore.Recipes;
+
+public class VariablesMethodProvider : IGlobalMethodProvider
 {
-    public class VariablesMethodProvider : IGlobalMethodProvider
-    {
-        private readonly GlobalMethod _globalMethod;
-        private const string GlobalMethodName = "variables";
+    private readonly GlobalMethod _globalMethod;
+    private const string GlobalMethodName = "variables";
 
-        public VariablesMethodProvider(JsonObject variables, List<IGlobalMethodProvider> scopedMethodProviders)
+    public VariablesMethodProvider(JsonObject variables, List<IGlobalMethodProvider> scopedMethodProviders)
+    {
+        _globalMethod = new GlobalMethod
         {
-            _globalMethod = new GlobalMethod
+            Name = GlobalMethodName,
+            Method = serviceProvider => (Func<string, object>)(name =>
             {
-                Name = GlobalMethodName,
-                Method = serviceProvider => (Func<string, object>)(name =>
-                {
-                    var variable = variables[name];
-
-                    if (variable == null)
-                    {
-                        var S = serviceProvider.GetService<IStringLocalizer<VariablesMethodProvider>>();
+                var variable = variables[name];
 
-                        throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
-                    }
+                if (variable == null)
+                {
+                    var S = serviceProvider.GetService<IStringLocalizer<VariablesMethodProvider>>();
 
-                    var value = variable.Value<string>();
+                    throw new ValidationException(S["The variable '{0}' was used in the recipe but not defined. Make sure you add the '{0}' variable in the '{1}' section of the recipe.", name, GlobalMethodName]);
+                }
 
-                    // Replace variable value while the result returns another script.
-                    while (value.StartsWith('[') && value.EndsWith(']'))
-                    {
-                        value = value.Trim('[', ']');
-                        value = (ScriptingManager.Evaluate(value, null, null, scopedMethodProviders) ?? "").ToString();
-                        variables[name] = value;
-                    }
+                var value = variable.Value<string>();
 
-                    return value;
-                }),
-            };
-        }
+                // Replace variable value while the result returns another script.
+                while (value.StartsWith('[') && value.EndsWith(']'))
+                {
+                    value = value.Trim('[', ']');
+                    value = (ScriptingManager.Evaluate(value, null, null, scopedMethodProviders) ?? "").ToString();
+                    variables[name] = value;
+                }
+
+                return value;
+            }),
+        };
+    }
 
-        public static IScriptingManager ScriptingManager => ShellScope.Services.GetRequiredService<IScriptingManager>();
+    public static IScriptingManager ScriptingManager => ShellScope.Services.GetRequiredService<IScriptingManager>();
 
-        public IEnumerable<GlobalMethod> GetMethods()
-        {
-            yield return _globalMethod;
-        }
+    public IEnumerable<GlobalMethod> GetMethods()
+    {
+        yield return _globalMethod;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Redis.Abstractions/IRedisService.cs b/src/OrchardCore/OrchardCore.Redis.Abstractions/IRedisService.cs
index b8e419f22e6..79c03038cfa 100644
--- a/src/OrchardCore/OrchardCore.Redis.Abstractions/IRedisService.cs
+++ b/src/OrchardCore/OrchardCore.Redis.Abstractions/IRedisService.cs
@@ -2,16 +2,15 @@
 using OrchardCore.Modules;
 using StackExchange.Redis;
 
-namespace OrchardCore.Redis
+namespace OrchardCore.Redis;
+
+public interface IRedisService : IModularTenantEvents
 {
-    public interface IRedisService : IModularTenantEvents
-    {
-        Task ConnectAsync();
+    Task ConnectAsync();
 
-        IConnectionMultiplexer Connection { get; }
+    IConnectionMultiplexer Connection { get; }
 
-        string InstancePrefix { get; }
+    string InstancePrefix { get; }
 
-        IDatabase Database { get; }
-    }
+    IDatabase Database { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Redis.Abstractions/RedisOptions.cs b/src/OrchardCore/OrchardCore.Redis.Abstractions/RedisOptions.cs
index 52f799ff4b6..91fc93367e1 100644
--- a/src/OrchardCore/OrchardCore.Redis.Abstractions/RedisOptions.cs
+++ b/src/OrchardCore/OrchardCore.Redis.Abstractions/RedisOptions.cs
@@ -1,25 +1,24 @@
 using StackExchange.Redis;
 
-namespace OrchardCore.Redis
+namespace OrchardCore.Redis;
+
+/// <summary>
+/// Configuration options for <see cref="IRedisService"/>.
+/// </summary>
+public class RedisOptions
 {
     /// <summary>
-    /// Configuration options for <see cref="IRedisService"/>.
+    /// The configuration string used to connect to Redis.
     /// </summary>
-    public class RedisOptions
-    {
-        /// <summary>
-        /// The configuration string used to connect to Redis.
-        /// </summary>
-        public string Configuration { get; set; }
+    public string Configuration { get; set; }
 
-        /// <summary>
-        /// The configuration used to connect to Redis.
-        /// </summary>
-        public ConfigurationOptions ConfigurationOptions { get; set; }
+    /// <summary>
+    /// The configuration used to connect to Redis.
+    /// </summary>
+    public ConfigurationOptions ConfigurationOptions { get; set; }
 
-        /// <summary>
-        /// Prefix alowing a Redis instance to be shared.
-        /// </summary>
-        public string InstancePrefix { get; set; }
-    }
+    /// <summary>
+    /// Prefix alowing a Redis instance to be shared.
+    /// </summary>
+    public string InstancePrefix { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/IResourceManager.cs b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/IResourceManager.cs
index fe804d6cea5..19b33ba102a 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/IResourceManager.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/IResourceManager.cs
@@ -2,130 +2,129 @@
 using System.IO;
 using Microsoft.AspNetCore.Html;
 
-namespace OrchardCore.ResourceManagement
+namespace OrchardCore.ResourceManagement;
+
+public interface IResourceManager
 {
-    public interface IResourceManager
-    {
-        /// <summary>
-        /// Returns an inline manifest.
-        /// </summary>
-        ResourceManifest InlineManifest { get; }
-
-        /// <summary>
-        /// Returns the resource matching the specific settings.
-        /// </summary>
-        ResourceDefinition FindResource(RequireSettings settings);
-
-        /// <summary>
-        /// Removes a resource from the registrations.
-        /// </summary>
-        void NotRequired(string resourceType, string resourceName);
-
-        /// <summary>
-        /// Registers a specific resource url.
-        /// </summary>
-        RequireSettings RegisterUrl(string resourceType, string resourcePath, string resourceDebugPath);
-
-        /// <summary>
-        /// Registers a named resource.
-        /// </summary>
-        RequireSettings RegisterResource(string resourceType, string resourceName);
-
-        /// <summary>
-        /// Registers a custom script tag at the head.
-        /// </summary>
-        void RegisterHeadScript(IHtmlContent script);
-
-        /// <summary>
-        /// Registers a custom script tag at the foot.
-        /// </summary>
-        /// <param name="script"></param>
-        void RegisterFootScript(IHtmlContent script);
-
-        /// <summary>
-        /// Registers a custom style tag at the head.
-        /// </summary>
-        /// <param name="style"></param>
-        void RegisterStyle(IHtmlContent style);
-
-        /// <summary>
-        /// Registers a link tag.
-        /// </summary>
-        void RegisterLink(LinkEntry link);
-
-        /// <summary>
-        /// Registers a meta tag.
-        /// </summary>
-        void RegisterMeta(MetaEntry meta);
-
-        /// <summary>
-        /// Appends a value to the current content of a meta tag, separated by a custom separator.
-        /// </summary>
-        void AppendMeta(MetaEntry meta, string contentSeparator);
-
-        /// <summary>
-        /// Returns the required resources of the specified type.
-        /// </summary>
-        IEnumerable<ResourceRequiredContext> GetRequiredResources(string resourceType);
-
-        /// <summary>
-        /// Returns the registered link resources.
-        /// </summary>
-        IEnumerable<LinkEntry> GetRegisteredLinks();
-
-        /// <summary>
-        /// Returns the registered meta resources.
-        /// </summary>
-        IEnumerable<MetaEntry> GetRegisteredMetas();
-
-        /// <summary>
-        /// Returns the registered header script resources.
-        /// </summary>
-        IEnumerable<IHtmlContent> GetRegisteredHeadScripts();
-
-        /// <summary>
-        /// Returns the registered footer script resources.
-        /// </summary>
-        IEnumerable<IHtmlContent> GetRegisteredFootScripts();
-
-        /// <summary>
-        /// Returns the registered style resources.
-        /// </summary>
-        IEnumerable<IHtmlContent> GetRegisteredStyles();
-
-        /// <summary>
-        /// Renders the registered meta tags.
-        /// </summary>
-        void RenderMeta(TextWriter writer);
-
-        /// <summary>
-        /// Renders the registered header link tags.
-        /// </summary>
-        void RenderHeadLink(TextWriter writer);
-
-        /// <summary>
-        /// Renders the registered stylesheets.
-        /// </summary>
-        void RenderStylesheet(TextWriter writer);
-
-        /// <summary>
-        /// Renders the registered header script tags.
-        /// </summary>
-        void RenderHeadScript(TextWriter writer);
-
-        /// <summary>
-        /// Renders the registered footer script tags.
-        /// </summary>
-        void RenderFootScript(TextWriter writer);
-
-        /// <summary>
-        /// Renders the registered local script tags.
-        /// </summary>
-        void RenderLocalScript(RequireSettings settings, TextWriter writer);
-
-        /// <summary>
-        /// Renders the registered local style tags.
-        /// </summary>
-        void RenderLocalStyle(RequireSettings settings, TextWriter writer);
-    }
+    /// <summary>
+    /// Returns an inline manifest.
+    /// </summary>
+    ResourceManifest InlineManifest { get; }
+
+    /// <summary>
+    /// Returns the resource matching the specific settings.
+    /// </summary>
+    ResourceDefinition FindResource(RequireSettings settings);
+
+    /// <summary>
+    /// Removes a resource from the registrations.
+    /// </summary>
+    void NotRequired(string resourceType, string resourceName);
+
+    /// <summary>
+    /// Registers a specific resource url.
+    /// </summary>
+    RequireSettings RegisterUrl(string resourceType, string resourcePath, string resourceDebugPath);
+
+    /// <summary>
+    /// Registers a named resource.
+    /// </summary>
+    RequireSettings RegisterResource(string resourceType, string resourceName);
+
+    /// <summary>
+    /// Registers a custom script tag at the head.
+    /// </summary>
+    void RegisterHeadScript(IHtmlContent script);
+
+    /// <summary>
+    /// Registers a custom script tag at the foot.
+    /// </summary>
+    /// <param name="script"></param>
+    void RegisterFootScript(IHtmlContent script);
+
+    /// <summary>
+    /// Registers a custom style tag at the head.
+    /// </summary>
+    /// <param name="style"></param>
+    void RegisterStyle(IHtmlContent style);
+
+    /// <summary>
+    /// Registers a link tag.
+    /// </summary>
+    void RegisterLink(LinkEntry link);
+
+    /// <summary>
+    /// Registers a meta tag.
+    /// </summary>
+    void RegisterMeta(MetaEntry meta);
+
+    /// <summary>
+    /// Appends a value to the current content of a meta tag, separated by a custom separator.
+    /// </summary>
+    void AppendMeta(MetaEntry meta, string contentSeparator);
+
+    /// <summary>
+    /// Returns the required resources of the specified type.
+    /// </summary>
+    IEnumerable<ResourceRequiredContext> GetRequiredResources(string resourceType);
+
+    /// <summary>
+    /// Returns the registered link resources.
+    /// </summary>
+    IEnumerable<LinkEntry> GetRegisteredLinks();
+
+    /// <summary>
+    /// Returns the registered meta resources.
+    /// </summary>
+    IEnumerable<MetaEntry> GetRegisteredMetas();
+
+    /// <summary>
+    /// Returns the registered header script resources.
+    /// </summary>
+    IEnumerable<IHtmlContent> GetRegisteredHeadScripts();
+
+    /// <summary>
+    /// Returns the registered footer script resources.
+    /// </summary>
+    IEnumerable<IHtmlContent> GetRegisteredFootScripts();
+
+    /// <summary>
+    /// Returns the registered style resources.
+    /// </summary>
+    IEnumerable<IHtmlContent> GetRegisteredStyles();
+
+    /// <summary>
+    /// Renders the registered meta tags.
+    /// </summary>
+    void RenderMeta(TextWriter writer);
+
+    /// <summary>
+    /// Renders the registered header link tags.
+    /// </summary>
+    void RenderHeadLink(TextWriter writer);
+
+    /// <summary>
+    /// Renders the registered stylesheets.
+    /// </summary>
+    void RenderStylesheet(TextWriter writer);
+
+    /// <summary>
+    /// Renders the registered header script tags.
+    /// </summary>
+    void RenderHeadScript(TextWriter writer);
+
+    /// <summary>
+    /// Renders the registered footer script tags.
+    /// </summary>
+    void RenderFootScript(TextWriter writer);
+
+    /// <summary>
+    /// Renders the registered local script tags.
+    /// </summary>
+    void RenderLocalScript(RequireSettings settings, TextWriter writer);
+
+    /// <summary>
+    /// Renders the registered local style tags.
+    /// </summary>
+    void RenderLocalStyle(RequireSettings settings, TextWriter writer);
 }
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/LinkEntry.cs b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/LinkEntry.cs
index 84bb97cf3d4..73c8480b5b9 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/LinkEntry.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/LinkEntry.cs
@@ -1,90 +1,89 @@
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace OrchardCore.ResourceManagement
+namespace OrchardCore.ResourceManagement;
+
+public class LinkEntry
 {
-    public class LinkEntry
-    {
-        private readonly TagBuilder _builder = new("link");
+    private readonly TagBuilder _builder = new("link");
 
-        public string Condition { get; set; }
+    public string Condition { get; set; }
 
-        public LinkEntry()
-        {
-            _builder.TagRenderMode = TagRenderMode.SelfClosing;
-        }
+    public LinkEntry()
+    {
+        _builder.TagRenderMode = TagRenderMode.SelfClosing;
+    }
 
-        public string Rel
+    public string Rel
+    {
+        get
         {
-            get
-            {
-                string value;
-                _builder.Attributes.TryGetValue("rel", out value);
-                return value;
-            }
-            set { SetAttribute("rel", value); }
+            string value;
+            _builder.Attributes.TryGetValue("rel", out value);
+            return value;
         }
+        set { SetAttribute("rel", value); }
+    }
 
-        public string Type
+    public string Type
+    {
+        get
         {
-            get
-            {
-                string value;
-                _builder.Attributes.TryGetValue("type", out value);
-                return value;
-            }
-            set { SetAttribute("type", value); }
+            string value;
+            _builder.Attributes.TryGetValue("type", out value);
+            return value;
         }
+        set { SetAttribute("type", value); }
+    }
 
-        public string Title
+    public string Title
+    {
+        get
         {
-            get
-            {
-                string value;
-                _builder.Attributes.TryGetValue("title", out value);
-                return value;
-            }
-            set { SetAttribute("title", value); }
+            string value;
+            _builder.Attributes.TryGetValue("title", out value);
+            return value;
         }
+        set { SetAttribute("title", value); }
+    }
 
-        public string Href
+    public string Href
+    {
+        get
         {
-            get
-            {
-                string value;
-                _builder.Attributes.TryGetValue("href", out value);
-                return value;
-            }
-            set { SetAttribute("href", value); }
+            string value;
+            _builder.Attributes.TryGetValue("href", out value);
+            return value;
         }
+        set { SetAttribute("href", value); }
+    }
 
-        public bool AppendVersion { get; set; }
+    public bool AppendVersion { get; set; }
 
-        public IHtmlContent GetTag()
+    public IHtmlContent GetTag()
+    {
+        if (!string.IsNullOrEmpty(Condition))
         {
-            if (!string.IsNullOrEmpty(Condition))
-            {
-                var htmlBuilder = new HtmlContentBuilder();
-                htmlBuilder.AppendHtml("<!--[if " + Condition + "]>");
-                htmlBuilder.AppendHtml(_builder);
-                htmlBuilder.AppendHtml("<![endif]-->");
-
-                return htmlBuilder;
-            }
+            var htmlBuilder = new HtmlContentBuilder();
+            htmlBuilder.AppendHtml("<!--[if " + Condition + "]>");
+            htmlBuilder.AppendHtml(_builder);
+            htmlBuilder.AppendHtml("<![endif]-->");
 
-            return _builder;
+            return htmlBuilder;
         }
 
-        public LinkEntry AddAttribute(string name, string value)
-        {
-            _builder.MergeAttribute(name, value);
-            return this;
-        }
+        return _builder;
+    }
 
-        public LinkEntry SetAttribute(string name, string value)
-        {
-            _builder.MergeAttribute(name, value, true);
-            return this;
-        }
+    public LinkEntry AddAttribute(string name, string value)
+    {
+        _builder.MergeAttribute(name, value);
+        return this;
+    }
+
+    public LinkEntry SetAttribute(string name, string value)
+    {
+        _builder.MergeAttribute(name, value, true);
+        return this;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/MetaEntry.cs b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/MetaEntry.cs
index eba699650a3..33c0af8de11 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/MetaEntry.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/MetaEntry.cs
@@ -2,134 +2,133 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 
-namespace OrchardCore.ResourceManagement
+namespace OrchardCore.ResourceManagement;
+
+public class MetaEntry
 {
-    public class MetaEntry
+    private readonly TagBuilder _builder = new("meta");
+
+    public MetaEntry()
     {
-        private readonly TagBuilder _builder = new("meta");
+        _builder.TagRenderMode = TagRenderMode.SelfClosing;
+    }
 
-        public MetaEntry()
+    public MetaEntry(string name = null, string property = null, string content = null, string httpEquiv = null, string charset = null) : this()
+    {
+        if (!string.IsNullOrEmpty(name))
         {
-            _builder.TagRenderMode = TagRenderMode.SelfClosing;
+            Name = name;
         }
 
-        public MetaEntry(string name = null, string property = null, string content = null, string httpEquiv = null, string charset = null) : this()
+        if (!string.IsNullOrEmpty(property))
         {
-            if (!string.IsNullOrEmpty(name))
-            {
-                Name = name;
-            }
-
-            if (!string.IsNullOrEmpty(property))
-            {
-                Property = property;
-            }
-
-            if (!string.IsNullOrEmpty(content))
-            {
-                Content = content;
-            }
-
-            if (!string.IsNullOrEmpty(httpEquiv))
-            {
-                HttpEquiv = httpEquiv;
-            }
-
-            if (!string.IsNullOrEmpty(charset))
-            {
-                Charset = charset;
-            }
+            Property = property;
         }
 
-        public static MetaEntry Combine(MetaEntry meta1, MetaEntry meta2, string contentSeparator)
+        if (!string.IsNullOrEmpty(content))
         {
-            var newMeta = new MetaEntry();
-            Merge(newMeta._builder.Attributes, meta1._builder.Attributes, meta2._builder.Attributes);
-            if (!string.IsNullOrEmpty(meta1.Content) && !string.IsNullOrEmpty(meta2.Content))
-            {
-                newMeta.Content = meta1.Content + contentSeparator + meta2.Content;
-            }
-
-            return newMeta;
+            Content = content;
         }
 
-        private static void Merge(AttributeDictionary d1, params AttributeDictionary[] sources)
+        if (!string.IsNullOrEmpty(httpEquiv))
         {
-            foreach (var d in sources)
-            {
-                foreach (var pair in d)
-                {
-                    d1[pair.Key] = pair.Value;
-                }
-            }
+            HttpEquiv = httpEquiv;
         }
 
-        public MetaEntry AddAttribute(string name, string value)
+        if (!string.IsNullOrEmpty(charset))
         {
-            _builder.MergeAttribute(name, value);
-            return this;
+            Charset = charset;
         }
+    }
 
-        public MetaEntry SetAttribute(string name, string value)
+    public static MetaEntry Combine(MetaEntry meta1, MetaEntry meta2, string contentSeparator)
+    {
+        var newMeta = new MetaEntry();
+        Merge(newMeta._builder.Attributes, meta1._builder.Attributes, meta2._builder.Attributes);
+        if (!string.IsNullOrEmpty(meta1.Content) && !string.IsNullOrEmpty(meta2.Content))
         {
-            _builder.MergeAttribute(name, value, true);
-            return this;
+            newMeta.Content = meta1.Content + contentSeparator + meta2.Content;
         }
 
-        public string Name
+        return newMeta;
+    }
+
+    private static void Merge(AttributeDictionary d1, params AttributeDictionary[] sources)
+    {
+        foreach (var d in sources)
         {
-            get
+            foreach (var pair in d)
             {
-                _builder.Attributes.TryGetValue("name", out var value);
-                return value;
+                d1[pair.Key] = pair.Value;
             }
-            set { SetAttribute("name", value); }
         }
+    }
+
+    public MetaEntry AddAttribute(string name, string value)
+    {
+        _builder.MergeAttribute(name, value);
+        return this;
+    }
+
+    public MetaEntry SetAttribute(string name, string value)
+    {
+        _builder.MergeAttribute(name, value, true);
+        return this;
+    }
 
-        public string Property
+    public string Name
+    {
+        get
         {
-            get
-            {
-                _builder.Attributes.TryGetValue("property", out var value);
-                return value;
-            }
-            set { SetAttribute("property", value); }
+            _builder.Attributes.TryGetValue("name", out var value);
+            return value;
         }
+        set { SetAttribute("name", value); }
+    }
 
-        public string Content
+    public string Property
+    {
+        get
         {
-            get
-            {
-                string value;
-                _builder.Attributes.TryGetValue("content", out value);
-                return value;
-            }
-            set { SetAttribute("content", value); }
+            _builder.Attributes.TryGetValue("property", out var value);
+            return value;
         }
+        set { SetAttribute("property", value); }
+    }
 
-        public string HttpEquiv
+    public string Content
+    {
+        get
         {
-            get
-            {
-                _builder.Attributes.TryGetValue("http-equiv", out var value);
-                return value;
-            }
-            set { SetAttribute("http-equiv", value); }
+            string value;
+            _builder.Attributes.TryGetValue("content", out value);
+            return value;
         }
+        set { SetAttribute("content", value); }
+    }
 
-        public string Charset
+    public string HttpEquiv
+    {
+        get
         {
-            get
-            {
-                _builder.Attributes.TryGetValue("charset", out var value);
-                return value;
-            }
-            set { SetAttribute("charset", value); }
+            _builder.Attributes.TryGetValue("http-equiv", out var value);
+            return value;
         }
+        set { SetAttribute("http-equiv", value); }
+    }
 
-        public IHtmlContent GetTag()
+    public string Charset
+    {
+        get
         {
-            return _builder;
+            _builder.Attributes.TryGetValue("charset", out var value);
+            return value;
         }
+        set { SetAttribute("charset", value); }
+    }
+
+    public IHtmlContent GetTag()
+    {
+        return _builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/RequireSettings.cs b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/RequireSettings.cs
index 686748ad0ca..9c45000beb1 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/RequireSettings.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/RequireSettings.cs
@@ -3,293 +3,292 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 
-namespace OrchardCore.ResourceManagement
+namespace OrchardCore.ResourceManagement;
+
+public class RequireSettings
 {
-    public class RequireSettings
+    private Dictionary<string, string> _attributes;
+
+    public string BasePath { get; set; }
+    public string Type { get; set; }
+    public string Name { get; set; }
+    public string Culture { get; set; }
+    public bool DebugMode { get; set; }
+    public bool CdnMode { get; set; }
+    public string CdnBaseUrl { get; set; }
+    public ResourceLocation Location { get; set; }
+    public string Condition { get; set; }
+    public string Version { get; set; }
+    public bool? AppendVersion { get; set; }
+    public List<string> Dependencies { get; set; }
+    public Action<ResourceDefinition> InlineDefinition { get; set; }
+    public ResourcePosition Position { get; set; }
+
+    public Dictionary<string, string> Attributes
     {
-        private Dictionary<string, string> _attributes;
-
-        public string BasePath { get; set; }
-        public string Type { get; set; }
-        public string Name { get; set; }
-        public string Culture { get; set; }
-        public bool DebugMode { get; set; }
-        public bool CdnMode { get; set; }
-        public string CdnBaseUrl { get; set; }
-        public ResourceLocation Location { get; set; }
-        public string Condition { get; set; }
-        public string Version { get; set; }
-        public bool? AppendVersion { get; set; }
-        public List<string> Dependencies { get; set; }
-        public Action<ResourceDefinition> InlineDefinition { get; set; }
-        public ResourcePosition Position { get; set; }
-
-        public Dictionary<string, string> Attributes
-        {
-            get => _attributes ??= [];
-            private set { _attributes = value; }
-        }
+        get => _attributes ??= [];
+        private set { _attributes = value; }
+    }
 
-        public RequireSettings()
-        {
-        }
+    public RequireSettings()
+    {
+    }
 
-        public RequireSettings(ResourceManagementOptions options)
-        {
-            CdnMode = options.UseCdn;
-            DebugMode = options.DebugMode;
-            Culture = options.Culture;
-            CdnBaseUrl = options.CdnBaseUrl;
-            AppendVersion = options.AppendVersion;
-        }
+    public RequireSettings(ResourceManagementOptions options)
+    {
+        CdnMode = options.UseCdn;
+        DebugMode = options.DebugMode;
+        Culture = options.Culture;
+        CdnBaseUrl = options.CdnBaseUrl;
+        AppendVersion = options.AppendVersion;
+    }
 
-        public RequireSettings(ResourceManagementOptions options, ResourceDefinition resource)
-            : this(options)
-        {
-            Name = resource.Name;
-            Type = resource.Type;
-            BasePath = resource.BasePath;
-            Version = resource.Version;
-            Position = resource.Position;
+    public RequireSettings(ResourceManagementOptions options, ResourceDefinition resource)
+        : this(options)
+    {
+        Name = resource.Name;
+        Type = resource.Type;
+        BasePath = resource.BasePath;
+        Version = resource.Version;
+        Position = resource.Position;
 
-            if (resource.Attributes != null)
-            {
-                _attributes = new Dictionary<string, string>(resource.Attributes);
-            }
+        if (resource.Attributes != null)
+        {
+            _attributes = new Dictionary<string, string>(resource.Attributes);
         }
+    }
 
-        public bool HasAttributes => _attributes != null && _attributes.Any(a => a.Value != null);
+    public bool HasAttributes => _attributes != null && _attributes.Any(a => a.Value != null);
 
-        /// <summary>
-        /// The resource will be displayed in the head of the page.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public RequireSettings AtHead()
-        {
-            return AtLocation(ResourceLocation.Head);
-        }
+    /// <summary>
+    /// The resource will be displayed in the head of the page.
+    /// </summary>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public RequireSettings AtHead()
+    {
+        return AtLocation(ResourceLocation.Head);
+    }
 
-        /// <summary>
-        /// The resource will be displayed at the foot of the page.
-        /// </summary>
-        /// <returns></returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public RequireSettings AtFoot()
-        {
-            return AtLocation(ResourceLocation.Foot);
-        }
+    /// <summary>
+    /// The resource will be displayed at the foot of the page.
+    /// </summary>
+    /// <returns></returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public RequireSettings AtFoot()
+    {
+        return AtLocation(ResourceLocation.Foot);
+    }
 
-        /// <summary>
-        /// The resource will be displayed at the specified location.
-        /// </summary>
-        /// <param name="location">The location where the resource should be displayed.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public RequireSettings AtLocation(ResourceLocation location)
-        {
-            // if head is specified it takes precedence since it's safer than foot
-            Location = (ResourceLocation)Math.Max((int)Location, (int)location);
-            return this;
-        }
+    /// <summary>
+    /// The resource will be displayed at the specified location.
+    /// </summary>
+    /// <param name="location">The location where the resource should be displayed.</param>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public RequireSettings AtLocation(ResourceLocation location)
+    {
+        // if head is specified it takes precedence since it's safer than foot
+        Location = (ResourceLocation)Math.Max((int)Location, (int)location);
+        return this;
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public RequireSettings UseCulture(string cultureName)
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public RequireSettings UseCulture(string cultureName)
+    {
+        if (!string.IsNullOrEmpty(cultureName))
         {
-            if (!string.IsNullOrEmpty(cultureName))
-            {
-                Culture = cultureName;
-            }
-            return this;
+            Culture = cultureName;
         }
+        return this;
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public RequireSettings UseDebugMode()
-        {
-            return UseDebugMode(true);
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public RequireSettings UseDebugMode()
+    {
+        return UseDebugMode(true);
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public RequireSettings UseDebugMode(bool debugMode)
-        {
-            DebugMode |= debugMode;
-            return this;
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public RequireSettings UseDebugMode(bool debugMode)
+    {
+        DebugMode |= debugMode;
+        return this;
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public RequireSettings UseCdn()
-        {
-            return UseCdn(true);
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public RequireSettings UseCdn()
+    {
+        return UseCdn(true);
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public RequireSettings UseCdn(bool cdn)
-        {
-            CdnMode |= cdn;
-            return this;
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public RequireSettings UseCdn(bool cdn)
+    {
+        CdnMode |= cdn;
+        return this;
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public RequireSettings UseCdnBaseUrl(string cdnBaseUrl)
-        {
-            CdnBaseUrl = cdnBaseUrl;
-            return this;
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public RequireSettings UseCdnBaseUrl(string cdnBaseUrl)
+    {
+        CdnBaseUrl = cdnBaseUrl;
+        return this;
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public RequireSettings WithBasePath(string basePath)
-        {
-            BasePath = basePath;
-            return this;
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public RequireSettings WithBasePath(string basePath)
+    {
+        BasePath = basePath;
+        return this;
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public RequireSettings UseCondition(string condition)
-        {
-            Condition ??= condition;
-            return this;
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public RequireSettings UseCondition(string condition)
+    {
+        Condition ??= condition;
+        return this;
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public RequireSettings UseVersion(string version)
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public RequireSettings UseVersion(string version)
+    {
+        if (!string.IsNullOrEmpty(version))
         {
-            if (!string.IsNullOrEmpty(version))
-            {
-                Version = version;
-            }
-            return this;
+            Version = version;
         }
+        return this;
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public RequireSettings ShouldAppendVersion(bool? appendVersion)
-        {
-            AppendVersion = appendVersion;
-            return this;
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public RequireSettings ShouldAppendVersion(bool? appendVersion)
+    {
+        AppendVersion = appendVersion;
+        return this;
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public RequireSettings SetDependencies(params string[] dependencies)
-        {
-            Dependencies ??= [];
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public RequireSettings SetDependencies(params string[] dependencies)
+    {
+        Dependencies ??= [];
 
-            Dependencies.AddRange(dependencies);
+        Dependencies.AddRange(dependencies);
 
-            return this;
-        }
+        return this;
+    }
 
-        public RequireSettings Define(Action<ResourceDefinition> resourceDefinition)
+    public RequireSettings Define(Action<ResourceDefinition> resourceDefinition)
+    {
+        if (resourceDefinition != null)
         {
-            if (resourceDefinition != null)
+            var previous = InlineDefinition;
+            if (previous != null)
             {
-                var previous = InlineDefinition;
-                if (previous != null)
+                InlineDefinition = r =>
                 {
-                    InlineDefinition = r =>
-                    {
-                        previous(r);
-                        resourceDefinition(r);
-                    };
-                }
-                else
-                {
-                    InlineDefinition = resourceDefinition;
-                }
+                    previous(r);
+                    resourceDefinition(r);
+                };
+            }
+            else
+            {
+                InlineDefinition = resourceDefinition;
             }
-            return this;
         }
+        return this;
+    }
+
+    public RequireSettings SetAttribute(string name, string value)
+    {
+        _attributes ??= [];
+        _attributes[name] = value;
+        return this;
+    }
 
-        public RequireSettings SetAttribute(string name, string value)
+    private Dictionary<string, string> MergeAttributes(RequireSettings other)
+    {
+        // efficiently merge the two dictionaries, taking into account that one or both may not exist
+        // and that attributes in 'other' should override attributes in this, even if the value is null.
+        if (_attributes == null)
         {
-            _attributes ??= [];
-            _attributes[name] = value;
-            return this;
+            return other._attributes == null ? null : new Dictionary<string, string>(other._attributes);
         }
-
-        private Dictionary<string, string> MergeAttributes(RequireSettings other)
+        if (other._attributes == null)
         {
-            // efficiently merge the two dictionaries, taking into account that one or both may not exist
-            // and that attributes in 'other' should override attributes in this, even if the value is null.
-            if (_attributes == null)
-            {
-                return other._attributes == null ? null : new Dictionary<string, string>(other._attributes);
-            }
-            if (other._attributes == null)
-            {
-                return new Dictionary<string, string>(_attributes);
-            }
-            var mergedAttributes = new Dictionary<string, string>(_attributes);
-            foreach (var pair in other._attributes)
-            {
-                mergedAttributes[pair.Key] = pair.Value;
-            }
-            return mergedAttributes;
+            return new Dictionary<string, string>(_attributes);
         }
-
-        public RequireSettings UpdatePositionFromDependent(RequireSettings dependent)
+        var mergedAttributes = new Dictionary<string, string>(_attributes);
+        foreach (var pair in other._attributes)
         {
-            if (dependent.Position == ResourcePosition.First && Position == ResourcePosition.Last)
-            {
-                throw new InvalidOperationException($"Invalid dependency position of type '{dependent.Type}' for resource '{dependent.Name}' positioned at '{dependent.Position}' depending on '{Name}' positioned at '{Position}'");
-            }
-
-            // If a 'First' resource depends on a 'ByDependency' resource, position the dependency 'First'.
-            if (dependent.Position == ResourcePosition.First && Position == ResourcePosition.ByDependency)
-            {
-                Position = ResourcePosition.First;
-            }
-
-            return this;
+            mergedAttributes[pair.Key] = pair.Value;
         }
+        return mergedAttributes;
+    }
 
-        public RequireSettings UpdatePositionFromDependency(RequireSettings dependency)
+    public RequireSettings UpdatePositionFromDependent(RequireSettings dependent)
+    {
+        if (dependent.Position == ResourcePosition.First && Position == ResourcePosition.Last)
         {
-            // If a 'ByDependency' resource depends on a 'Last' resource, position the dependent 'Last'.
-            if (Position == ResourcePosition.ByDependency && dependency.Position == ResourcePosition.Last)
-            {
-                Position = ResourcePosition.Last;
-            }
-
-            return this;
+            throw new InvalidOperationException($"Invalid dependency position of type '{dependent.Type}' for resource '{dependent.Name}' positioned at '{dependent.Position}' depending on '{Name}' positioned at '{Position}'");
         }
 
-        public RequireSettings CombinePosition(RequireSettings dependent)
+        // If a 'First' resource depends on a 'ByDependency' resource, position the dependency 'First'.
+        if (dependent.Position == ResourcePosition.First && Position == ResourcePosition.ByDependency)
         {
-            UpdatePositionFromDependent(dependent);
-            dependent.UpdatePositionFromDependency(this);
-
-            return this;
+            Position = ResourcePosition.First;
         }
 
-        public RequireSettings New() => new()
-        {
-            CdnMode = CdnMode,
-            DebugMode = DebugMode,
-            Culture = Culture,
-            CdnBaseUrl = CdnBaseUrl,
-            AppendVersion = AppendVersion,
-            Name = Name,
-            Type = Type,
-            Location = Location,
-            Position = Position,
-        };
-
-        public RequireSettings NewAndCombine(RequireSettings other) =>
-            New().Combine(other);
-
-        public RequireSettings Combine(RequireSettings other)
+        return this;
+    }
+
+    public RequireSettings UpdatePositionFromDependency(RequireSettings dependency)
+    {
+        // If a 'ByDependency' resource depends on a 'Last' resource, position the dependent 'Last'.
+        if (Position == ResourcePosition.ByDependency && dependency.Position == ResourcePosition.Last)
         {
-            AtLocation(Location).AtLocation(other.Location)
-            .WithBasePath(BasePath).WithBasePath(other.BasePath)
-            .UseCdn(CdnMode).UseCdn(other.CdnMode)
-            .UseCdnBaseUrl(CdnBaseUrl).UseCdnBaseUrl(other.CdnBaseUrl)
-            .UseDebugMode(DebugMode).UseDebugMode(other.DebugMode)
-            .UseCulture(Culture).UseCulture(other.Culture)
-            .UseCondition(Condition).UseCondition(other.Condition)
-            .UseVersion(Version).UseVersion(other.Version)
-            .ShouldAppendVersion(AppendVersion).ShouldAppendVersion(other.AppendVersion)
-            .Define(InlineDefinition).Define(other.InlineDefinition)
-            ;
-
-            _attributes = MergeAttributes(other);
-            return this;
+            Position = ResourcePosition.Last;
         }
+
+        return this;
+    }
+
+    public RequireSettings CombinePosition(RequireSettings dependent)
+    {
+        UpdatePositionFromDependent(dependent);
+        dependent.UpdatePositionFromDependency(this);
+
+        return this;
+    }
+
+    public RequireSettings New() => new()
+    {
+        CdnMode = CdnMode,
+        DebugMode = DebugMode,
+        Culture = Culture,
+        CdnBaseUrl = CdnBaseUrl,
+        AppendVersion = AppendVersion,
+        Name = Name,
+        Type = Type,
+        Location = Location,
+        Position = Position,
+    };
+
+    public RequireSettings NewAndCombine(RequireSettings other) =>
+        New().Combine(other);
+
+    public RequireSettings Combine(RequireSettings other)
+    {
+        AtLocation(Location).AtLocation(other.Location)
+        .WithBasePath(BasePath).WithBasePath(other.BasePath)
+        .UseCdn(CdnMode).UseCdn(other.CdnMode)
+        .UseCdnBaseUrl(CdnBaseUrl).UseCdnBaseUrl(other.CdnBaseUrl)
+        .UseDebugMode(DebugMode).UseDebugMode(other.DebugMode)
+        .UseCulture(Culture).UseCulture(other.Culture)
+        .UseCondition(Condition).UseCondition(other.Condition)
+        .UseVersion(Version).UseVersion(other.Version)
+        .ShouldAppendVersion(AppendVersion).ShouldAppendVersion(other.AppendVersion)
+        .Define(InlineDefinition).Define(other.InlineDefinition)
+        ;
+
+        _attributes = MergeAttributes(other);
+        return this;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceDebugMode.cs b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceDebugMode.cs
index 19fe8cbaf29..838a193f0d7 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceDebugMode.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceDebugMode.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Settings
+namespace OrchardCore.Settings;
+
+public enum ResourceDebugMode
 {
-    public enum ResourceDebugMode
-    {
-        FromConfiguration,
-        Enabled,
-        Disabled
-    }
+    FromConfiguration,
+    Enabled,
+    Disabled
 }
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceDefinition.cs b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceDefinition.cs
index 2bad2305ff5..202a0858dc2 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceDefinition.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceDefinition.cs
@@ -5,367 +5,366 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 
-namespace OrchardCore.ResourceManagement
+namespace OrchardCore.ResourceManagement;
+
+public class ResourceDefinition
 {
-    public class ResourceDefinition
+    public ResourceDefinition(ResourceManifest manifest, string type, string name)
     {
-        public ResourceDefinition(ResourceManifest manifest, string type, string name)
-        {
-            Manifest = manifest;
-            Type = type;
-            Name = name;
-        }
+        Manifest = manifest;
+        Type = type;
+        Name = name;
+    }
 
-        private static string Coalesce(params string[] strings)
+    private static string Coalesce(params string[] strings)
+    {
+        foreach (var str in strings)
         {
-            foreach (var str in strings)
+            if (!string.IsNullOrEmpty(str))
             {
-                if (!string.IsNullOrEmpty(str))
-                {
-                    return str;
-                }
+                return str;
             }
-            return null;
         }
+        return null;
+    }
 
-        public ResourceManifest Manifest { get; private set; }
-
-        public string BasePath { get; private set; }
-        public string Name { get; private set; }
-        public string Type { get; private set; }
-        public string Version { get; private set; }
-        public bool? AppendVersion { get; private set; }
-        public string Url { get; private set; }
-        public string UrlDebug { get; private set; }
-        public string UrlCdn { get; private set; }
-        public string UrlCdnDebug { get; private set; }
-        public string CdnDebugIntegrity { get; private set; }
-        public string CdnIntegrity { get; private set; }
-        public string[] Cultures { get; private set; }
-        public bool CdnSupportsSsl { get; private set; }
-        public List<string> Dependencies { get; private set; }
-        public AttributeDictionary Attributes { get; private set; }
-        public string InnerContent { get; private set; }
-        public ResourcePosition Position { get; private set; }
-
-        public ResourceDefinition SetAttribute(string name, string value)
-        {
-            Attributes ??= [];
+    public ResourceManifest Manifest { get; private set; }
+
+    public string BasePath { get; private set; }
+    public string Name { get; private set; }
+    public string Type { get; private set; }
+    public string Version { get; private set; }
+    public bool? AppendVersion { get; private set; }
+    public string Url { get; private set; }
+    public string UrlDebug { get; private set; }
+    public string UrlCdn { get; private set; }
+    public string UrlCdnDebug { get; private set; }
+    public string CdnDebugIntegrity { get; private set; }
+    public string CdnIntegrity { get; private set; }
+    public string[] Cultures { get; private set; }
+    public bool CdnSupportsSsl { get; private set; }
+    public List<string> Dependencies { get; private set; }
+    public AttributeDictionary Attributes { get; private set; }
+    public string InnerContent { get; private set; }
+    public ResourcePosition Position { get; private set; }
+
+    public ResourceDefinition SetAttribute(string name, string value)
+    {
+        Attributes ??= [];
 
-            Attributes[name] = value;
-            return this;
-        }
+        Attributes[name] = value;
+        return this;
+    }
 
-        public ResourceDefinition SetBasePath(string basePath)
-        {
-            BasePath = basePath;
-            return this;
-        }
+    public ResourceDefinition SetBasePath(string basePath)
+    {
+        BasePath = basePath;
+        return this;
+    }
+
+    public ResourceDefinition SetUrl(string url)
+    {
+        return SetUrl(url, null);
+    }
+
+    public ResourceDefinition SetUrl(string url, string urlDebug)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(url);
 
-        public ResourceDefinition SetUrl(string url)
+        Url = url;
+        if (urlDebug != null)
         {
-            return SetUrl(url, null);
+            UrlDebug = urlDebug;
         }
+        return this;
+    }
 
-        public ResourceDefinition SetUrl(string url, string urlDebug)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(url);
+    public ResourceDefinition SetCdn(string cdnUrl)
+    {
+        return SetCdn(cdnUrl, null, null);
+    }
 
-            Url = url;
-            if (urlDebug != null)
-            {
-                UrlDebug = urlDebug;
-            }
-            return this;
-        }
+    public ResourceDefinition SetCdn(string cdnUrl, string cdnUrlDebug)
+    {
+        return SetCdn(cdnUrl, cdnUrlDebug, null);
+    }
 
-        public ResourceDefinition SetCdn(string cdnUrl)
+    public ResourceDefinition SetCdnIntegrity(string cdnIntegrity)
+    {
+        return SetCdnIntegrity(cdnIntegrity, null);
+    }
+
+    public ResourceDefinition SetCdnIntegrity(string cdnIntegrity, string cdnDebugIntegrity)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(cdnIntegrity);
+
+        CdnIntegrity = cdnIntegrity;
+        if (cdnDebugIntegrity != null)
         {
-            return SetCdn(cdnUrl, null, null);
+            CdnDebugIntegrity = cdnDebugIntegrity;
         }
+        return this;
+    }
 
-        public ResourceDefinition SetCdn(string cdnUrl, string cdnUrlDebug)
+    public ResourceDefinition SetCdn(string cdnUrl, string cdnUrlDebug, bool? cdnSupportsSsl)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(cdnUrl);
+
+        UrlCdn = cdnUrl;
+        if (cdnUrlDebug != null)
         {
-            return SetCdn(cdnUrl, cdnUrlDebug, null);
+            UrlCdnDebug = cdnUrlDebug;
         }
-
-        public ResourceDefinition SetCdnIntegrity(string cdnIntegrity)
+        if (cdnSupportsSsl.HasValue)
         {
-            return SetCdnIntegrity(cdnIntegrity, null);
+            CdnSupportsSsl = cdnSupportsSsl.Value;
         }
+        return this;
+    }
 
-        public ResourceDefinition SetCdnIntegrity(string cdnIntegrity, string cdnDebugIntegrity)
+    /// <summary>
+    /// Sets the version of the resource.
+    /// </summary>
+    /// <param name="version">The version to set, in the form of. <code>major.minor[.build[.revision]]</code></param>
+    public ResourceDefinition SetVersion(string version)
+    {
+        if (!System.Version.TryParse(version, out _))
         {
-            ArgumentException.ThrowIfNullOrEmpty(cdnIntegrity);
-
-            CdnIntegrity = cdnIntegrity;
-            if (cdnDebugIntegrity != null)
-            {
-                CdnDebugIntegrity = cdnDebugIntegrity;
-            }
-            return this;
+            throw new FormatException("The resource version should be in the form of major.minor[.build[.revision]].");
         }
 
-        public ResourceDefinition SetCdn(string cdnUrl, string cdnUrlDebug, bool? cdnSupportsSsl)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(cdnUrl);
+        Version = version;
 
-            UrlCdn = cdnUrl;
-            if (cdnUrlDebug != null)
-            {
-                UrlCdnDebug = cdnUrlDebug;
-            }
-            if (cdnSupportsSsl.HasValue)
-            {
-                CdnSupportsSsl = cdnSupportsSsl.Value;
-            }
-            return this;
-        }
+        return this;
+    }
 
-        /// <summary>
-        /// Sets the version of the resource.
-        /// </summary>
-        /// <param name="version">The version to set, in the form of. <code>major.minor[.build[.revision]]</code></param>
-        public ResourceDefinition SetVersion(string version)
-        {
-            if (!System.Version.TryParse(version, out _))
-            {
-                throw new FormatException("The resource version should be in the form of major.minor[.build[.revision]].");
-            }
+    /// <summary>
+    /// Should a file version be appended to the resource.
+    /// </summary>
+    /// <param name="appendVersion"></param>
+    public ResourceDefinition ShouldAppendVersion(bool? appendVersion)
+    {
+        AppendVersion = appendVersion;
+        return this;
+    }
 
-            Version = version;
+    public ResourceDefinition SetCultures(params string[] cultures)
+    {
+        Cultures = cultures;
+        return this;
+    }
 
-            return this;
-        }
+    public ResourceDefinition SetDependencies(params string[] dependencies)
+    {
+        Dependencies ??= [];
 
-        /// <summary>
-        /// Should a file version be appended to the resource.
-        /// </summary>
-        /// <param name="appendVersion"></param>
-        public ResourceDefinition ShouldAppendVersion(bool? appendVersion)
-        {
-            AppendVersion = appendVersion;
-            return this;
-        }
+        Dependencies.AddRange(dependencies);
 
-        public ResourceDefinition SetCultures(params string[] cultures)
-        {
-            Cultures = cultures;
-            return this;
-        }
+        return this;
+    }
 
-        public ResourceDefinition SetDependencies(params string[] dependencies)
-        {
-            Dependencies ??= [];
+    public ResourceDefinition SetInnerContent(string innerContent)
+    {
+        InnerContent = innerContent;
 
-            Dependencies.AddRange(dependencies);
+        return this;
+    }
+    /// <summary>
+    /// Position a resource first, last or by dependency.
+    /// </summary>
+    /// <param name="position"></param>
+    public ResourceDefinition SetPosition(ResourcePosition position)
+    {
+        Position = position;
 
-            return this;
-        }
+        return this;
+    }
 
-        public ResourceDefinition SetInnerContent(string innerContent)
-        {
-            InnerContent = innerContent;
+    public TagBuilder GetTagBuilder(RequireSettings settings,
+        string applicationPath,
+        IFileVersionProvider fileVersionProvider)
+    {
+        string url, filePathAttributeName = null;
 
-            return this;
+        // Url priority.
+        if (settings.DebugMode)
+        {
+            url = settings.CdnMode
+                ? Coalesce(UrlCdnDebug, UrlDebug, UrlCdn, Url)
+                : Coalesce(UrlDebug, Url, UrlCdnDebug, UrlCdn);
         }
-        /// <summary>
-        /// Position a resource first, last or by dependency.
-        /// </summary>
-        /// <param name="position"></param>
-        public ResourceDefinition SetPosition(ResourcePosition position)
+        else
         {
-            Position = position;
-
-            return this;
+            url = settings.CdnMode
+                ? Coalesce(UrlCdn, Url, UrlCdnDebug, UrlDebug)
+                : Coalesce(Url, UrlDebug, UrlCdn, UrlCdnDebug);
         }
 
-        public TagBuilder GetTagBuilder(RequireSettings settings,
-            string applicationPath,
-            IFileVersionProvider fileVersionProvider)
+        if (string.IsNullOrEmpty(url))
         {
-            string url, filePathAttributeName = null;
-
-            // Url priority.
-            if (settings.DebugMode)
-            {
-                url = settings.CdnMode
-                    ? Coalesce(UrlCdnDebug, UrlDebug, UrlCdn, Url)
-                    : Coalesce(UrlDebug, Url, UrlCdnDebug, UrlCdn);
-            }
-            else
+            url = null;
+        }
+        if (!string.IsNullOrEmpty(settings.Culture))
+        {
+            var nearestCulture = FindNearestCulture(settings.Culture);
+            if (!string.IsNullOrEmpty(nearestCulture))
             {
-                url = settings.CdnMode
-                    ? Coalesce(UrlCdn, Url, UrlCdnDebug, UrlDebug)
-                    : Coalesce(Url, UrlDebug, UrlCdn, UrlCdnDebug);
+                url = Path.ChangeExtension(url, nearestCulture + Path.GetExtension(url));
             }
+        }
 
-            if (string.IsNullOrEmpty(url))
+        if (url != null && url.StartsWith("~/", StringComparison.Ordinal))
+        {
+            if (!string.IsNullOrEmpty(BasePath))
             {
-                url = null;
+                url = string.Concat(BasePath, url.AsSpan(1));
             }
-            if (!string.IsNullOrEmpty(settings.Culture))
+            else
             {
-                var nearestCulture = FindNearestCulture(settings.Culture);
-                if (!string.IsNullOrEmpty(nearestCulture))
-                {
-                    url = Path.ChangeExtension(url, nearestCulture + Path.GetExtension(url));
-                }
-            }
-
-            if (url != null && url.StartsWith("~/", StringComparison.Ordinal))
-            {
-                if (!string.IsNullOrEmpty(BasePath))
-                {
-                    url = string.Concat(BasePath, url.AsSpan(1));
-                }
-                else
-                {
-                    url = string.Concat(applicationPath, url.AsSpan(1));
-                }
+                url = string.Concat(applicationPath, url.AsSpan(1));
             }
+        }
 
-            // If settings has value, it can override resource definition, otherwise use resource definition.
-            if (url != null && ((settings.AppendVersion.HasValue && settings.AppendVersion == true) ||
-                (!settings.AppendVersion.HasValue && AppendVersion == true)))
-            {
-                url = fileVersionProvider.AddFileVersionToPath(applicationPath, url);
-            }
+        // If settings has value, it can override resource definition, otherwise use resource definition.
+        if (url != null && ((settings.AppendVersion.HasValue && settings.AppendVersion == true) ||
+            (!settings.AppendVersion.HasValue && AppendVersion == true)))
+        {
+            url = fileVersionProvider.AddFileVersionToPath(applicationPath, url);
+        }
 
-            // Don't prefix cdn if the path includes a protocol, i.e. is an external url, or is in debug mode.
-            if (url != null && !settings.DebugMode && !string.IsNullOrEmpty(settings.CdnBaseUrl) &&
+        // Don't prefix cdn if the path includes a protocol, i.e. is an external url, or is in debug mode.
+        if (url != null && !settings.DebugMode && !string.IsNullOrEmpty(settings.CdnBaseUrl) &&
 
-                // Don't evaluate with Uri.TryCreate as it produces incorrect results on Linux.
-                !url.StartsWith("https://", StringComparison.OrdinalIgnoreCase) &&
-                !url.StartsWith("http://", StringComparison.OrdinalIgnoreCase) &&
-                !url.StartsWith("//", StringComparison.OrdinalIgnoreCase) &&
-                !url.StartsWith("file://", StringComparison.OrdinalIgnoreCase))
-            {
-                url = settings.CdnBaseUrl + url;
-            }
+            // Don't evaluate with Uri.TryCreate as it produces incorrect results on Linux.
+            !url.StartsWith("https://", StringComparison.OrdinalIgnoreCase) &&
+            !url.StartsWith("http://", StringComparison.OrdinalIgnoreCase) &&
+            !url.StartsWith("//", StringComparison.OrdinalIgnoreCase) &&
+            !url.StartsWith("file://", StringComparison.OrdinalIgnoreCase))
+        {
+            url = settings.CdnBaseUrl + url;
+        }
 
-            TagBuilder tagBuilder;
-            switch (Type)
-            {
-                case "script":
-                    tagBuilder = new TagBuilder("script");
-                    if (settings.Attributes.Count > 0)
+        TagBuilder tagBuilder;
+        switch (Type)
+        {
+            case "script":
+                tagBuilder = new TagBuilder("script");
+                if (settings.Attributes.Count > 0)
+                {
+                    foreach (var kv in settings.Attributes)
                     {
-                        foreach (var kv in settings.Attributes)
-                        {
-                            tagBuilder.Attributes.Add(kv);
-                        }
+                        tagBuilder.Attributes.Add(kv);
                     }
-                    filePathAttributeName = "src";
-                    break;
-                case "stylesheet":
-                    if (url == null && InnerContent != null)
+                }
+                filePathAttributeName = "src";
+                break;
+            case "stylesheet":
+                if (url == null && InnerContent != null)
+                {
+                    // Inline style declaration.
+                    tagBuilder = new TagBuilder("style")
                     {
-                        // Inline style declaration.
-                        tagBuilder = new TagBuilder("style")
-                        {
-                            Attributes = {
-                                { "type", "text/css" }
-                            }
-                        };
-                    }
-                    else
+                        Attributes = {
+                            { "type", "text/css" }
+                        }
+                    };
+                }
+                else
+                {
+                    // Stylesheet resource.
+                    tagBuilder = new TagBuilder("link")
                     {
-                        // Stylesheet resource.
-                        tagBuilder = new TagBuilder("link")
-                        {
-                            TagRenderMode = TagRenderMode.SelfClosing,
-                            Attributes = {
-                                { "type", "text/css" },
-                                { "rel", "stylesheet" }
-                            }
-                        };
-                        filePathAttributeName = "href";
-                    }
-                    break;
-                case "link":
-                    tagBuilder = new TagBuilder("link") { TagRenderMode = TagRenderMode.SelfClosing };
+                        TagRenderMode = TagRenderMode.SelfClosing,
+                        Attributes = {
+                            { "type", "text/css" },
+                            { "rel", "stylesheet" }
+                        }
+                    };
                     filePathAttributeName = "href";
-                    break;
-                default:
-                    tagBuilder = new TagBuilder("meta") { TagRenderMode = TagRenderMode.SelfClosing };
-                    break;
-            }
-
-            if (!string.IsNullOrEmpty(CdnIntegrity) && url != null && url == UrlCdn)
-            {
-                tagBuilder.Attributes["integrity"] = CdnIntegrity;
-                tagBuilder.Attributes["crossorigin"] = "anonymous";
-            }
-            else if (!string.IsNullOrEmpty(CdnDebugIntegrity) && url != null && url == UrlCdnDebug)
-            {
-                tagBuilder.Attributes["integrity"] = CdnDebugIntegrity;
-                tagBuilder.Attributes["crossorigin"] = "anonymous";
-            }
+                }
+                break;
+            case "link":
+                tagBuilder = new TagBuilder("link") { TagRenderMode = TagRenderMode.SelfClosing };
+                filePathAttributeName = "href";
+                break;
+            default:
+                tagBuilder = new TagBuilder("meta") { TagRenderMode = TagRenderMode.SelfClosing };
+                break;
+        }
 
-            if (Attributes != null)
-            {
-                tagBuilder.MergeAttributes(Attributes);
-            }
+        if (!string.IsNullOrEmpty(CdnIntegrity) && url != null && url == UrlCdn)
+        {
+            tagBuilder.Attributes["integrity"] = CdnIntegrity;
+            tagBuilder.Attributes["crossorigin"] = "anonymous";
+        }
+        else if (!string.IsNullOrEmpty(CdnDebugIntegrity) && url != null && url == UrlCdnDebug)
+        {
+            tagBuilder.Attributes["integrity"] = CdnDebugIntegrity;
+            tagBuilder.Attributes["crossorigin"] = "anonymous";
+        }
 
-            if (settings.HasAttributes)
-            {
-                tagBuilder.MergeAttributes(settings.Attributes);
-            }
+        if (Attributes != null)
+        {
+            tagBuilder.MergeAttributes(Attributes);
+        }
 
-            if (!string.IsNullOrEmpty(url) && filePathAttributeName != null)
-            {
-                tagBuilder.MergeAttribute(filePathAttributeName, url, true);
-            }
-            else if (!string.IsNullOrEmpty(InnerContent))
-            {
-                tagBuilder.InnerHtml.AppendHtml(InnerContent);
-            }
+        if (settings.HasAttributes)
+        {
+            tagBuilder.MergeAttributes(settings.Attributes);
+        }
 
-            return tagBuilder;
+        if (!string.IsNullOrEmpty(url) && filePathAttributeName != null)
+        {
+            tagBuilder.MergeAttribute(filePathAttributeName, url, true);
+        }
+        else if (!string.IsNullOrEmpty(InnerContent))
+        {
+            tagBuilder.InnerHtml.AppendHtml(InnerContent);
         }
 
-        public string FindNearestCulture(string culture)
+        return tagBuilder;
+    }
+
+    public string FindNearestCulture(string culture)
+    {
+        // Go for an exact match.
+        if (Cultures == null)
         {
-            // Go for an exact match.
-            if (Cultures == null)
-            {
-                return null;
-            }
-            var selectedIndex = Array.IndexOf(Cultures, culture);
-            if (selectedIndex != -1)
-            {
-                return Cultures[selectedIndex];
-            }
-            // Try parent culture if any.
-            var cultureInfo = CultureInfo.GetCultureInfo(culture);
-            if (cultureInfo.Parent.Name != culture)
-            {
-                var selectedCulture = FindNearestCulture(cultureInfo.Parent.Name);
-                if (selectedCulture != null)
-                {
-                    return selectedCulture;
-                }
-            }
             return null;
         }
-
-        public override bool Equals(object obj)
+        var selectedIndex = Array.IndexOf(Cultures, culture);
+        if (selectedIndex != -1)
+        {
+            return Cultures[selectedIndex];
+        }
+        // Try parent culture if any.
+        var cultureInfo = CultureInfo.GetCultureInfo(culture);
+        if (cultureInfo.Parent.Name != culture)
         {
-            if (obj == null || obj.GetType() != GetType())
+            var selectedCulture = FindNearestCulture(cultureInfo.Parent.Name);
+            if (selectedCulture != null)
             {
-                return false;
+                return selectedCulture;
             }
-
-            var that = (ResourceDefinition)obj;
-            return string.Equals(that.Name, Name, StringComparison.Ordinal) &&
-                string.Equals(that.Type, Type, StringComparison.Ordinal) &&
-                string.Equals(that.Version, Version, StringComparison.Ordinal);
         }
+        return null;
+    }
 
-        public override int GetHashCode()
+    public override bool Equals(object obj)
+    {
+        if (obj == null || obj.GetType() != GetType())
         {
-            return HashCode.Combine(Name, Type);
+            return false;
         }
+
+        var that = (ResourceDefinition)obj;
+        return string.Equals(that.Name, Name, StringComparison.Ordinal) &&
+            string.Equals(that.Type, Type, StringComparison.Ordinal) &&
+            string.Equals(that.Version, Version, StringComparison.Ordinal);
+    }
+
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(Name, Type);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceLocation.cs b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceLocation.cs
index 1dc2fceaa55..8917f3e0598 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceLocation.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceLocation.cs
@@ -1,10 +1,9 @@
-namespace OrchardCore.ResourceManagement
+namespace OrchardCore.ResourceManagement;
+
+public enum ResourceLocation
 {
-    public enum ResourceLocation
-    {
-        Unspecified,
-        Foot,
-        Head,
-        Inline
-    }
+    Unspecified,
+    Foot,
+    Head,
+    Inline
 }
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceManagementOptions.cs b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceManagementOptions.cs
index 7d71a274ef1..b921bf1d0d8 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceManagementOptions.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceManagementOptions.cs
@@ -1,24 +1,23 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.ResourceManagement
+namespace OrchardCore.ResourceManagement;
+
+public class ResourceManagementOptions
 {
-    public class ResourceManagementOptions
-    {
-        public bool UseCdn { get; set; }
+    public bool UseCdn { get; set; }
 
-        public string CdnBaseUrl { get; set; }
+    public string CdnBaseUrl { get; set; }
 
-        public bool DebugMode { get; set; }
+    public bool DebugMode { get; set; }
 
-        public string Culture { get; set; }
+    public string Culture { get; set; }
 
-        public bool AppendVersion { get; set; } = true;
+    public bool AppendVersion { get; set; } = true;
 
-        /// <summary>
-        /// The prefix path that is used when a url starts with "~/".
-        /// </summary>
-        public string ContentBasePath { get; set; } = string.Empty;
+    /// <summary>
+    /// The prefix path that is used when a url starts with "~/".
+    /// </summary>
+    public string ContentBasePath { get; set; } = string.Empty;
 
-        public HashSet<ResourceManifest> ResourceManifests { get; init; } = [];
-    }
+    public HashSet<ResourceManifest> ResourceManifests { get; init; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceManifest.cs b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceManifest.cs
index ac7bc824ea3..298fad4cc84 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceManifest.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceManifest.cs
@@ -1,46 +1,45 @@
 using System;
 using System.Collections.Generic;
 
-namespace OrchardCore.ResourceManagement
+namespace OrchardCore.ResourceManagement;
+
+public class ResourceManifest
 {
-    public class ResourceManifest
-    {
-        private readonly Dictionary<string, IDictionary<string, IList<ResourceDefinition>>> _resources = new(StringComparer.OrdinalIgnoreCase);
+    private readonly Dictionary<string, IDictionary<string, IList<ResourceDefinition>>> _resources = new(StringComparer.OrdinalIgnoreCase);
 
-        public virtual ResourceDefinition DefineResource(string resourceType, string resourceName)
+    public virtual ResourceDefinition DefineResource(string resourceType, string resourceName)
+    {
+        var definition = new ResourceDefinition(this, resourceType, resourceName);
+        var resources = GetResources(resourceType);
+        if (!resources.TryGetValue(resourceName, out var value))
         {
-            var definition = new ResourceDefinition(this, resourceType, resourceName);
-            var resources = GetResources(resourceType);
-            if (!resources.TryGetValue(resourceName, out var value))
-            {
-                value = new List<ResourceDefinition>();
-                resources[resourceName] = value;
-            }
-
-            value.Add(definition);
-            return definition;
+            value = new List<ResourceDefinition>();
+            resources[resourceName] = value;
         }
 
-        public ResourceDefinition DefineScript(string name)
-        {
-            return DefineResource("script", name);
-        }
+        value.Add(definition);
+        return definition;
+    }
 
-        public ResourceDefinition DefineStyle(string name)
-        {
-            return DefineResource("stylesheet", name);
-        }
+    public ResourceDefinition DefineScript(string name)
+    {
+        return DefineResource("script", name);
+    }
 
-        public virtual IDictionary<string, IList<ResourceDefinition>> GetResources(string resourceType)
-        {
-            if (!_resources.TryGetValue(resourceType, out var resources))
-            {
-                _resources[resourceType] = resources = new Dictionary<string, IList<ResourceDefinition>>(StringComparer.OrdinalIgnoreCase);
-            }
+    public ResourceDefinition DefineStyle(string name)
+    {
+        return DefineResource("stylesheet", name);
+    }
 
-            return resources;
+    public virtual IDictionary<string, IList<ResourceDefinition>> GetResources(string resourceType)
+    {
+        if (!_resources.TryGetValue(resourceType, out var resources))
+        {
+            _resources[resourceType] = resources = new Dictionary<string, IList<ResourceDefinition>>(StringComparer.OrdinalIgnoreCase);
         }
 
-        public string BasePath { get; } = "";
+        return resources;
     }
+
+    public string BasePath { get; } = "";
 }
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourcePosition.cs b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourcePosition.cs
index a9cfea30d95..873738c3def 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourcePosition.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourcePosition.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.ResourceManagement
+namespace OrchardCore.ResourceManagement;
+
+public enum ResourcePosition
 {
-    public enum ResourcePosition
-    {
-        ByDependency,
-        First,
-        Last
-    }
+    ByDependency,
+    First,
+    Last
 }
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceRequiredContext.cs b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceRequiredContext.cs
index d9c41af76d6..980bee36bc0 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceRequiredContext.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ResourceRequiredContext.cs
@@ -2,45 +2,44 @@
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.ResourceManagement
+namespace OrchardCore.ResourceManagement;
+
+public class ResourceRequiredContext
 {
-    public class ResourceRequiredContext
+    private const string NotIE = "!IE";
+
+    public ResourceDefinition Resource { get; set; }
+    public RequireSettings Settings { get; set; }
+    public IFileVersionProvider FileVersionProvider { get; set; }
+
+    public void WriteTo(TextWriter writer, string appPath)
     {
-        private const string NotIE = "!IE";
+        var tagBuilder = Resource.GetTagBuilder(Settings, appPath, FileVersionProvider);
 
-        public ResourceDefinition Resource { get; set; }
-        public RequireSettings Settings { get; set; }
-        public IFileVersionProvider FileVersionProvider { get; set; }
+        if (string.IsNullOrEmpty(Settings.Condition))
+        {
+            tagBuilder.WriteTo(writer, NullHtmlEncoder.Default);
+            return;
+        }
 
-        public void WriteTo(TextWriter writer, string appPath)
+        if (Settings.Condition == NotIE)
         {
-            var tagBuilder = Resource.GetTagBuilder(Settings, appPath, FileVersionProvider);
-
-            if (string.IsNullOrEmpty(Settings.Condition))
-            {
-                tagBuilder.WriteTo(writer, NullHtmlEncoder.Default);
-                return;
-            }
-
-            if (Settings.Condition == NotIE)
-            {
-                writer.Write("<!--[if " + Settings.Condition + "]>-->");
-            }
-            else
-            {
-                writer.Write("<!--[if " + Settings.Condition + "]>");
-            }
+            writer.Write("<!--[if " + Settings.Condition + "]>-->");
+        }
+        else
+        {
+            writer.Write("<!--[if " + Settings.Condition + "]>");
+        }
 
-            tagBuilder.WriteTo(writer, NullHtmlEncoder.Default);
+        tagBuilder.WriteTo(writer, NullHtmlEncoder.Default);
 
-            if (Settings.Condition == NotIE)
-            {
-                writer.Write("<!--<![endif]-->");
-            }
-            else
-            {
-                writer.Write("<![endif]-->");
-            }
+        if (Settings.Condition == NotIE)
+        {
+            writer.Write("<!--<![endif]-->");
+        }
+        else
+        {
+            writer.Write("<![endif]-->");
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement/ResourceDictionary.cs b/src/OrchardCore/OrchardCore.ResourceManagement/ResourceDictionary.cs
index 66d0e6b5334..7be767dc9e2 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement/ResourceDictionary.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement/ResourceDictionary.cs
@@ -2,49 +2,48 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 
-namespace OrchardCore.ResourceManagement
-{
+namespace OrchardCore.ResourceManagement;
+
 #pragma warning disable CA1010 // Type 'ResourceDictionary' directly or indirectly inherits 'ICollection' without implementing any of 'ICollection<T>', 'IReadOnlyCollection<T>'. Publicly-visible types should implement the generic version to broaden usability.
-    public class ResourceDictionary : OrderedDictionary
+public class ResourceDictionary : OrderedDictionary
 #pragma warning restore CA1010
-    {
-        private readonly Stack<ResourceDefinition> _expanding = new();
+{
+    private readonly Stack<ResourceDefinition> _expanding = new();
 
-        public int FirstCount { get; private set; }
-        public int LastCount { get; private set; }
+    public int FirstCount { get; private set; }
+    public int LastCount { get; private set; }
 
-        public void AddExpandingResource(ResourceDefinition resource, RequireSettings settings)
+    public void AddExpandingResource(ResourceDefinition resource, RequireSettings settings)
+    {
+        if (_expanding.Contains(resource))
         {
-            if (_expanding.Contains(resource))
-            {
-                throw new InvalidOperationException($"Circular dependency of type '{settings.Type}' detected between '{settings.Name}' and '{resource.Name}'");
-            }
-
-            _expanding.Push(resource);
+            throw new InvalidOperationException($"Circular dependency of type '{settings.Type}' detected between '{settings.Name}' and '{resource.Name}'");
         }
 
-        public void AddExpandedResource(ResourceDefinition resource, RequireSettings settings)
-        {
-            _expanding.Pop();
+        _expanding.Push(resource);
+    }
+
+    public void AddExpandedResource(ResourceDefinition resource, RequireSettings settings)
+    {
+        _expanding.Pop();
 
-            if (settings.Position != ResourcePosition.ByDependency)
+        if (settings.Position != ResourcePosition.ByDependency)
+        {
+            var existing = (RequireSettings)this[resource];
+            if (existing == null || existing.Position == ResourcePosition.ByDependency)
             {
-                var existing = (RequireSettings)this[resource];
-                if (existing == null || existing.Position == ResourcePosition.ByDependency)
+                if (settings.Position == ResourcePosition.First)
                 {
-                    if (settings.Position == ResourcePosition.First)
-                    {
-                        FirstCount++;
-                    }
-
-                    if (settings.Position == ResourcePosition.Last)
-                    {
-                        LastCount++;
-                    }
+                    FirstCount++;
                 }
-            }
 
-            this[resource] = settings;
+                if (settings.Position == ResourcePosition.Last)
+                {
+                    LastCount++;
+                }
+            }
         }
+
+        this[resource] = settings;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement/ResourceManager.cs b/src/OrchardCore/OrchardCore.ResourceManagement/ResourceManager.cs
index 3ed69e5090e..b6decf9a0b0 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement/ResourceManager.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement/ResourceManager.cs
@@ -8,628 +8,651 @@
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.ResourceManagement
+namespace OrchardCore.ResourceManagement;
+
+public class ResourceManager : IResourceManager
 {
-    public class ResourceManager : IResourceManager
+    private readonly Dictionary<ResourceTypeName, RequireSettings> _required = [];
+    private readonly Dictionary<string, ResourceRequiredContext[]> _builtResources;
+    private readonly IFileVersionProvider _fileVersionProvider;
+    private ResourceManifest _dynamicManifest;
+
+    private List<LinkEntry> _links;
+    private Dictionary<string, MetaEntry> _metas;
+    private List<IHtmlContent> _headScripts;
+    private List<IHtmlContent> _footScripts;
+    private List<IHtmlContent> _styles;
+    private HashSet<string> _localScripts;
+    private HashSet<string> _localStyles;
+    private readonly ResourceManagementOptions _options;
+
+    public ResourceManager(
+        IOptions<ResourceManagementOptions> options,
+        IFileVersionProvider fileVersionProvider)
     {
-        private readonly Dictionary<ResourceTypeName, RequireSettings> _required = [];
-        private readonly Dictionary<string, ResourceRequiredContext[]> _builtResources;
-        private readonly IFileVersionProvider _fileVersionProvider;
-        private ResourceManifest _dynamicManifest;
+        _options = options.Value;
+        _fileVersionProvider = fileVersionProvider;
 
-        private List<LinkEntry> _links;
-        private Dictionary<string, MetaEntry> _metas;
-        private List<IHtmlContent> _headScripts;
-        private List<IHtmlContent> _footScripts;
-        private List<IHtmlContent> _styles;
-        private HashSet<string> _localScripts;
-        private HashSet<string> _localStyles;
-        private readonly ResourceManagementOptions _options;
+        _builtResources = new Dictionary<string, ResourceRequiredContext[]>(StringComparer.OrdinalIgnoreCase);
+    }
 
-        public ResourceManager(
-            IOptions<ResourceManagementOptions> options,
-            IFileVersionProvider fileVersionProvider)
-        {
-            _options = options.Value;
-            _fileVersionProvider = fileVersionProvider;
 
-            _builtResources = new Dictionary<string, ResourceRequiredContext[]>(StringComparer.OrdinalIgnoreCase);
+    public ResourceManifest InlineManifest => _dynamicManifest ??= new ResourceManifest();
+
+    public RequireSettings RegisterResource(string resourceType, string resourceName)
+    {
+        ArgumentNullException.ThrowIfNull(resourceType);
+        ArgumentNullException.ThrowIfNull(resourceName);
+
+        var key = new ResourceTypeName(resourceType, resourceName);
+        if (!_required.TryGetValue(key, out var settings))
+        {
+            settings = new RequireSettings(_options)
+            {
+                Type = resourceType,
+                Name = resourceName
+            };
+            _required[key] = settings;
         }
+        _builtResources[resourceType] = null;
+        return settings;
+    }
 
+    public RequireSettings RegisterUrl(string resourceType, string resourcePath, string resourceDebugPath)
+    {
+        ArgumentNullException.ThrowIfNull(resourceType);
+        ArgumentNullException.ThrowIfNull(resourcePath);
 
-        public ResourceManifest InlineManifest => _dynamicManifest ??= new ResourceManifest();
+        // ~/ ==> convert to absolute path (e.g. /orchard/..).
 
-        public RequireSettings RegisterResource(string resourceType, string resourceName)
+        if (resourcePath.StartsWith("~/", StringComparison.Ordinal))
         {
-            ArgumentNullException.ThrowIfNull(resourceType);
-            ArgumentNullException.ThrowIfNull(resourceName);
-
-            var key = new ResourceTypeName(resourceType, resourceName);
-            if (!_required.TryGetValue(key, out var settings))
-            {
-                settings = new RequireSettings(_options)
-                {
-                    Type = resourceType,
-                    Name = resourceName
-                };
-                _required[key] = settings;
-            }
-            _builtResources[resourceType] = null;
-            return settings;
+            resourcePath = string.Concat(_options.ContentBasePath, resourcePath.AsSpan(1));
         }
 
-        public RequireSettings RegisterUrl(string resourceType, string resourcePath, string resourceDebugPath)
+        if (resourceDebugPath != null && resourceDebugPath.StartsWith("~/", StringComparison.Ordinal))
         {
-            ArgumentNullException.ThrowIfNull(resourceType);
-            ArgumentNullException.ThrowIfNull(resourcePath);
+            resourceDebugPath = string.Concat(_options.ContentBasePath, resourceDebugPath.AsSpan(1));
+        }
 
-            // ~/ ==> convert to absolute path (e.g. /orchard/..).
+        return RegisterResource(
+            resourceType,
+            GetResourceKey(resourcePath, resourceDebugPath)).Define(d => d.SetUrl(resourcePath, resourceDebugPath));
+    }
 
-            if (resourcePath.StartsWith("~/", StringComparison.Ordinal))
-            {
-                resourcePath = string.Concat(_options.ContentBasePath, resourcePath.AsSpan(1));
-            }
+    public void RegisterHeadScript(IHtmlContent script)
+    {
+        _headScripts ??= [];
 
-            if (resourceDebugPath != null && resourceDebugPath.StartsWith("~/", StringComparison.Ordinal))
-            {
-                resourceDebugPath = string.Concat(_options.ContentBasePath, resourceDebugPath.AsSpan(1));
-            }
+        _headScripts.Add(script);
+    }
 
-            return RegisterResource(
-                resourceType,
-                GetResourceKey(resourcePath, resourceDebugPath)).Define(d => d.SetUrl(resourcePath, resourceDebugPath));
-        }
+    public void RegisterFootScript(IHtmlContent script)
+    {
+        _footScripts ??= [];
 
-        public void RegisterHeadScript(IHtmlContent script)
-        {
-            _headScripts ??= [];
+        _footScripts.Add(script);
+    }
 
-            _headScripts.Add(script);
-        }
+    public void RegisterStyle(IHtmlContent style)
+    {
+        _styles ??= [];
 
-        public void RegisterFootScript(IHtmlContent script)
-        {
-            _footScripts ??= [];
+        _styles.Add(style);
+    }
 
-            _footScripts.Add(script);
-        }
+    public void NotRequired(string resourceType, string resourceName)
+    {
+        ArgumentNullException.ThrowIfNull(resourceType);
+        ArgumentNullException.ThrowIfNull(resourceType);
 
-        public void RegisterStyle(IHtmlContent style)
-        {
-            _styles ??= [];
+        var key = new ResourceTypeName(resourceType, resourceName);
+        _builtResources[resourceType] = null;
+        _required.Remove(key);
+    }
 
-            _styles.Add(style);
-        }
+    public ResourceDefinition FindResource(RequireSettings settings)
+    {
+        return FindResource(settings, true);
+    }
 
-        public void NotRequired(string resourceType, string resourceName)
-        {
-            ArgumentNullException.ThrowIfNull(resourceType);
-            ArgumentNullException.ThrowIfNull(resourceType);
+    private ResourceDefinition FindResource(RequireSettings settings, bool resolveInlineDefinitions)
+    {
+        // Find the resource with the given type and name
+        // that has at least the given version number. If multiple,
+        // return the resource with the greatest version number.
+        // If not found and an inlineDefinition is given, define the resource on the fly
+        // using the action.
+        var name = settings.Name ?? "";
+        var type = settings.Type;
 
-            var key = new ResourceTypeName(resourceType, resourceName);
-            _builtResources[resourceType] = null;
-            _required.Remove(key);
-        }
+        var stream = _options.ResourceManifests.SelectMany(x => x.GetResources(type));
+        var resource = FindMatchingResource(stream, settings, name);
 
-        public ResourceDefinition FindResource(RequireSettings settings)
+        if (resource == null && _dynamicManifest != null)
         {
-            return FindResource(settings, true);
+            stream = _dynamicManifest.GetResources(type);
+            resource = FindMatchingResource(stream, settings, name);
         }
 
-        private ResourceDefinition FindResource(RequireSettings settings, bool resolveInlineDefinitions)
+        if (resolveInlineDefinitions && resource == null)
         {
-            // Find the resource with the given type and name
-            // that has at least the given version number. If multiple,
-            // return the resource with the greatest version number.
-            // If not found and an inlineDefinition is given, define the resource on the fly
-            // using the action.
-            var name = settings.Name ?? "";
-            var type = settings.Type;
-
-            var stream = _options.ResourceManifests.SelectMany(x => x.GetResources(type));
-            var resource = FindMatchingResource(stream, settings, name);
-
-            if (resource == null && _dynamicManifest != null)
+            // Does not seem to exist, but it's possible it is being
+            // defined by a Define() from a RequireSettings somewhere.
+            if (ResolveInlineDefinitions(settings.Type))
             {
-                stream = _dynamicManifest.GetResources(type);
-                resource = FindMatchingResource(stream, settings, name);
+                // If any were defined, now try to find it.
+                resource = FindResource(settings, false);
             }
+        }
 
-            if (resolveInlineDefinitions && resource == null)
-            {
-                // Does not seem to exist, but it's possible it is being
-                // defined by a Define() from a RequireSettings somewhere.
-                if (ResolveInlineDefinitions(settings.Type))
-                {
-                    // If any were defined, now try to find it.
-                    resource = FindResource(settings, false);
-                }
-            }
+        return resource;
+    }
 
-            return resource;
+    private static ResourceDefinition FindMatchingResource(
+        IEnumerable<KeyValuePair<string, IList<ResourceDefinition>>> stream,
+        RequireSettings settings,
+        string name)
+    {
+        Version lower = null;
+        Version upper = null;
+        if (!string.IsNullOrEmpty(settings.Version))
+        {
+            // Specific version, filter.
+            lower = GetLowerBoundVersion(settings.Version);
+            upper = GetUpperBoundVersion(settings.Version);
         }
 
-        private static ResourceDefinition FindMatchingResource(
-            IEnumerable<KeyValuePair<string, IList<ResourceDefinition>>> stream,
-            RequireSettings settings,
-            string name)
+        ResourceDefinition resource = null;
+        foreach (var r in stream)
         {
-            Version lower = null;
-            Version upper = null;
-            if (!string.IsNullOrEmpty(settings.Version))
-            {
-                // Specific version, filter.
-                lower = GetLowerBoundVersion(settings.Version);
-                upper = GetUpperBoundVersion(settings.Version);
-            }
-
-            ResourceDefinition resource = null;
-            foreach (var r in stream)
+            if (string.Equals(r.Key, name, StringComparison.OrdinalIgnoreCase))
             {
-                if (string.Equals(r.Key, name, StringComparison.OrdinalIgnoreCase))
+                foreach (var resourceDefinition in r.Value)
                 {
-                    foreach (var resourceDefinition in r.Value)
-                    {
-                        var version = resourceDefinition.Version != null
-                            ? new Version(resourceDefinition.Version)
-                            : null;
+                    var version = resourceDefinition.Version != null
+                        ? new Version(resourceDefinition.Version)
+                        : null;
 
-                        if (lower != null)
+                    if (lower != null)
+                    {
+                        if (lower > version || version >= upper)
                         {
-                            if (lower > version || version >= upper)
-                            {
-                                continue;
-                            }
+                            continue;
                         }
+                    }
 
-                        // Use the highest version of all matches. Resources that don't specify a version have the lowest priority.
-                        if (resource?.Version is null || new Version(resource.Version) < version)
-                        {
-                            resource = resourceDefinition;
-                        }
+                    // Use the highest version of all matches. Resources that don't specify a version have the lowest priority.
+                    if (resource?.Version is null || new Version(resource.Version) < version)
+                    {
+                        resource = resourceDefinition;
                     }
                 }
             }
-
-            return resource;
         }
 
-        /// <summary>
-        /// Returns the upper bound value of a required version number.
-        /// For instance, 3.1.0 returns 3.1.1, 4 returns 5.0.0, 6.1 returns 6.2.0.
-        /// </summary>
-        private static Version GetUpperBoundVersion(string minimumVersion)
-        {
-            if (!Version.TryParse(minimumVersion, out var version))
-            {
-                // Is is a single number?
-                if (int.TryParse(minimumVersion, out var major))
-                {
-                    return new Version(major + 1, 0, 0);
-                }
-            }
+        return resource;
+    }
 
-            if (version.Build != -1)
+    /// <summary>
+    /// Returns the upper bound value of a required version number.
+    /// For instance, 3.1.0 returns 3.1.1, 4 returns 5.0.0, 6.1 returns 6.2.0.
+    /// </summary>
+    private static Version GetUpperBoundVersion(string minimumVersion)
+    {
+        if (!Version.TryParse(minimumVersion, out var version))
+        {
+            // Is is a single number?
+            if (int.TryParse(minimumVersion, out var major))
             {
-                return new Version(version.Major, version.Minor, version.Build + 1);
+                return new Version(major + 1, 0, 0);
             }
+        }
 
-            if (version.Minor != -1)
-            {
-                return new Version(version.Major, version.Minor + 1, 0);
-            }
+        if (version.Build != -1)
+        {
+            return new Version(version.Major, version.Minor, version.Build + 1);
+        }
 
-            return version;
+        if (version.Minor != -1)
+        {
+            return new Version(version.Major, version.Minor + 1, 0);
         }
 
-        /// <summary>
-        /// Returns the lower bound value of a required version number.
-        /// For instance, 3.1.0 returns 3.1.0, 4 returns 4.0.0, 6.1 returns 6.1.0.
-        /// </summary>
-        private static Version GetLowerBoundVersion(string minimumVersion)
+        return version;
+    }
+
+    /// <summary>
+    /// Returns the lower bound value of a required version number.
+    /// For instance, 3.1.0 returns 3.1.0, 4 returns 4.0.0, 6.1 returns 6.1.0.
+    /// </summary>
+    private static Version GetLowerBoundVersion(string minimumVersion)
+    {
+        if (!Version.TryParse(minimumVersion, out var version))
         {
-            if (!Version.TryParse(minimumVersion, out var version))
+            // Is is a single number?
+            if (int.TryParse(minimumVersion, out var major))
             {
-                // Is is a single number?
-                if (int.TryParse(minimumVersion, out var major))
-                {
-                    return new Version(major, 0, 0);
-                }
+                return new Version(major, 0, 0);
             }
-
-            return version;
         }
 
-        private bool ResolveInlineDefinitions(string resourceType)
+        return version;
+    }
+
+    private bool ResolveInlineDefinitions(string resourceType)
+    {
+        var anyWereDefined = false;
+        foreach (var settings in ResolveRequiredResources(resourceType))
         {
-            var anyWereDefined = false;
-            foreach (var settings in ResolveRequiredResources(resourceType))
+            if (settings.InlineDefinition == null)
             {
-                if (settings.InlineDefinition == null)
-                {
-                    continue;
-                }
+                continue;
+            }
 
-                // Defining it on the fly.
-                var resource = FindResource(settings, false);
-                if (resource == null)
-                {
-                    // Does not already exist, so define it.
-                    resource = InlineManifest.DefineResource(resourceType, settings.Name).SetBasePath(settings.BasePath);
-                    anyWereDefined = true;
-                }
-                settings.InlineDefinition(resource);
-                settings.InlineDefinition = null;
+            // Defining it on the fly.
+            var resource = FindResource(settings, false);
+            if (resource == null)
+            {
+                // Does not already exist, so define it.
+                resource = InlineManifest.DefineResource(resourceType, settings.Name).SetBasePath(settings.BasePath);
+                anyWereDefined = true;
             }
-            return anyWereDefined;
+            settings.InlineDefinition(resource);
+            settings.InlineDefinition = null;
         }
+        return anyWereDefined;
+    }
 
-        private IEnumerable<RequireSettings> ResolveRequiredResources(string resourceType)
+    private IEnumerable<RequireSettings> ResolveRequiredResources(string resourceType)
+    {
+        foreach (var (key, value) in _required)
         {
-            foreach (var (key, value) in _required)
+            if (key.Type == resourceType)
             {
-                if (key.Type == resourceType)
-                {
-                    yield return value;
-                }
+                yield return value;
             }
         }
+    }
 
-        public IEnumerable<LinkEntry> GetRegisteredLinks() => DoGetRegisteredLinks();
+    public IEnumerable<LinkEntry> GetRegisteredLinks() => DoGetRegisteredLinks();
 
-        private List<LinkEntry> DoGetRegisteredLinks()
-        {
-            return _links ?? EmptyList<LinkEntry>.Instance;
-        }
+    private List<LinkEntry> DoGetRegisteredLinks()
+    {
+        return _links ?? EmptyList<LinkEntry>.Instance;
+    }
 
-        public IEnumerable<MetaEntry> GetRegisteredMetas() => DoGetRegisteredMetas();
+    public IEnumerable<MetaEntry> GetRegisteredMetas() => DoGetRegisteredMetas();
 
-        private Dictionary<string, MetaEntry>.ValueCollection DoGetRegisteredMetas()
-        {
-            return _metas?.Values ?? EmptyValueCollection<MetaEntry>.Instance;
-        }
+    private Dictionary<string, MetaEntry>.ValueCollection DoGetRegisteredMetas()
+    {
+        return _metas?.Values ?? EmptyValueCollection<MetaEntry>.Instance;
+    }
 
-        public IEnumerable<IHtmlContent> GetRegisteredHeadScripts() => DoGetRegisteredHeadScripts();
+    public IEnumerable<IHtmlContent> GetRegisteredHeadScripts() => DoGetRegisteredHeadScripts();
 
-        public List<IHtmlContent> DoGetRegisteredHeadScripts()
-        {
-            return _headScripts ?? EmptyList<IHtmlContent>.Instance;
-        }
+    public List<IHtmlContent> DoGetRegisteredHeadScripts()
+    {
+        return _headScripts ?? EmptyList<IHtmlContent>.Instance;
+    }
 
-        public IEnumerable<IHtmlContent> GetRegisteredFootScripts() => DoGetRegisteredFootScripts();
+    public IEnumerable<IHtmlContent> GetRegisteredFootScripts() => DoGetRegisteredFootScripts();
 
-        public List<IHtmlContent> DoGetRegisteredFootScripts()
-        {
-            return _footScripts ?? EmptyList<IHtmlContent>.Instance;
-        }
+    public List<IHtmlContent> DoGetRegisteredFootScripts()
+    {
+        return _footScripts ?? EmptyList<IHtmlContent>.Instance;
+    }
+
+    public IEnumerable<IHtmlContent> GetRegisteredStyles() => DoGetRegisteredStyles();
 
-        public IEnumerable<IHtmlContent> GetRegisteredStyles() => DoGetRegisteredStyles();
+    public List<IHtmlContent> DoGetRegisteredStyles()
+    {
+        return _styles ?? EmptyList<IHtmlContent>.Instance;
+    }
 
-        public List<IHtmlContent> DoGetRegisteredStyles()
+    public IEnumerable<ResourceRequiredContext> GetRequiredResources(string resourceType)
+        => DoGetRequiredResources(resourceType);
+
+    private ResourceRequiredContext[] DoGetRequiredResources(string resourceType)
+    {
+        if (_builtResources.TryGetValue(resourceType, out var requiredResources) && requiredResources != null)
         {
-            return _styles ?? EmptyList<IHtmlContent>.Instance;
+            return requiredResources;
         }
 
-        public IEnumerable<ResourceRequiredContext> GetRequiredResources(string resourceType)
-            => DoGetRequiredResources(resourceType);
+        var allResources = new ResourceDictionary();
+        foreach (var settings in ResolveRequiredResources(resourceType))
+        {
+            var resource = FindResource(settings)
+                ?? throw new InvalidOperationException($"Could not find a resource of type '{settings.Type}' named '{settings.Name}' with version '{settings.Version ?? "any"}'.");
+
+            ExpandDependencies(resource, settings, allResources);
+        }
 
-        private ResourceRequiredContext[] DoGetRequiredResources(string resourceType)
+        requiredResources = new ResourceRequiredContext[allResources.Count];
+        int i, first = 0, byDependency = allResources.FirstCount, last = allResources.Count - allResources.LastCount;
+        foreach (DictionaryEntry entry in allResources)
         {
-            if (_builtResources.TryGetValue(resourceType, out var requiredResources) && requiredResources != null)
+            var settings = (RequireSettings)entry.Value;
+            if (settings.Position == ResourcePosition.First)
             {
-                return requiredResources;
+                i = first++;
             }
-
-            var allResources = new ResourceDictionary();
-            foreach (var settings in ResolveRequiredResources(resourceType))
+            else if (settings.Position == ResourcePosition.Last)
             {
-                var resource = FindResource(settings)
-                    ?? throw new InvalidOperationException($"Could not find a resource of type '{settings.Type}' named '{settings.Name}' with version '{settings.Version ?? "any"}'.");
-
-                ExpandDependencies(resource, settings, allResources);
+                i = last++;
+            }
+            else
+            {
+                i = byDependency++;
             }
 
-            requiredResources = new ResourceRequiredContext[allResources.Count];
-            int i, first = 0, byDependency = allResources.FirstCount, last = allResources.Count - allResources.LastCount;
-            foreach (DictionaryEntry entry in allResources)
+            requiredResources[i] = new ResourceRequiredContext
             {
-                var settings = (RequireSettings)entry.Value;
-                if (settings.Position == ResourcePosition.First)
-                {
-                    i = first++;
-                }
-                else if (settings.Position == ResourcePosition.Last)
-                {
-                    i = last++;
-                }
-                else
-                {
-                    i = byDependency++;
-                }
+                Settings = settings,
+                Resource = (ResourceDefinition)entry.Key,
+                FileVersionProvider = _fileVersionProvider
+            };
+        }
 
-                requiredResources[i] = new ResourceRequiredContext
-                {
-                    Settings = settings,
-                    Resource = (ResourceDefinition)entry.Key,
-                    FileVersionProvider = _fileVersionProvider
-                };
-            }
+        return _builtResources[resourceType] = requiredResources;
+    }
 
-            return _builtResources[resourceType] = requiredResources;
+    protected virtual void ExpandDependencies(
+        ResourceDefinition resource,
+        RequireSettings settings,
+        ResourceDictionary allResources) =>
+        ExpandDependenciesImplementation(resource, settings, allResources, isTopLevel: true);
+
+    private void ExpandDependenciesImplementation(
+        ResourceDefinition resource,
+        RequireSettings settings,
+        ResourceDictionary allResources,
+        bool isTopLevel)
+    {
+        if (resource == null)
+        {
+            return;
         }
 
-        protected virtual void ExpandDependencies(
-            ResourceDefinition resource,
-            RequireSettings settings,
-            ResourceDictionary allResources) =>
-            ExpandDependenciesImplementation(resource, settings, allResources, isTopLevel: true);
+        allResources.AddExpandingResource(resource, settings);
 
-        private void ExpandDependenciesImplementation(
-            ResourceDefinition resource,
-            RequireSettings settings,
-            ResourceDictionary allResources,
-            bool isTopLevel)
+        // Use any additional dependencies from the settings without mutating the resource that is held in a singleton collection.
+        List<string> dependencies = null;
+        if (resource.Dependencies != null)
         {
-            if (resource == null)
+            dependencies = new List<string>(resource.Dependencies);
+            if (settings.Dependencies != null)
             {
-                return;
+                dependencies.AddRange(settings.Dependencies);
             }
+        }
+        else if (settings.Dependencies != null)
+        {
+            dependencies = new List<string>(settings.Dependencies);
+        }
 
-            allResources.AddExpandingResource(resource, settings);
+        // Settings is given so the location can cascade down into dependencies. For example, if Foo depends on Bar,
+        // and Foo's required location is Head, so too should Bar's location, similarly, if Foo is First positioned,
+        // Bar dependency should be too. This behavior only applies to the dependencies.
 
-            // Use any additional dependencies from the settings without mutating the resource that is held in a singleton collection.
-            List<string> dependencies = null;
-            if (resource.Dependencies != null)
+        var dependencySettings = ((RequireSettings)allResources[resource])?.New() ?? new RequireSettings(_options, resource);
+        dependencySettings = isTopLevel ? dependencySettings.Combine(settings) : dependencySettings.AtLocation(settings.Location);
+        dependencySettings = dependencySettings.CombinePosition(settings);
+
+        if (dependencies != null)
+        {
+            // Share search instance.
+            var tempSettings = new RequireSettings();
+
+            for (var i = 0; i < dependencies.Count; i++)
             {
-                dependencies = new List<string>(resource.Dependencies);
-                if (settings.Dependencies != null)
+                var d = dependencies[i];
+                var idx = d.IndexOf(':');
+                var name = d;
+                string version = null;
+                if (idx != -1)
                 {
-                    dependencies.AddRange(settings.Dependencies);
+                    name = d[..idx];
+                    version = d[(idx + 1)..];
                 }
-            }
-            else if (settings.Dependencies != null)
-            {
-                dependencies = new List<string>(settings.Dependencies);
-            }
 
-            // Settings is given so the location can cascade down into dependencies. For example, if Foo depends on Bar,
-            // and Foo's required location is Head, so too should Bar's location, similarly, if Foo is First positioned,
-            // Bar dependency should be too. This behavior only applies to the dependencies.
+                tempSettings.Type = resource.Type;
+                tempSettings.Name = name;
+                tempSettings.Version = version;
 
-            var dependencySettings = ((RequireSettings)allResources[resource])?.New() ?? new RequireSettings(_options, resource);
-            dependencySettings = isTopLevel ? dependencySettings.Combine(settings) : dependencySettings.AtLocation(settings.Location);
-            dependencySettings = dependencySettings.CombinePosition(settings);
+                var dependency = FindResource(tempSettings);
+                if (dependency == null)
+                {
+                    continue;
+                }
 
-            if (dependencies != null)
-            {
-                // Share search instance.
-                var tempSettings = new RequireSettings();
+                ExpandDependenciesImplementation(dependency, dependencySettings, allResources, isTopLevel: false);
+            }
+        }
 
-                for (var i = 0; i < dependencies.Count; i++)
-                {
-                    var d = dependencies[i];
-                    var idx = d.IndexOf(':');
-                    var name = d;
-                    string version = null;
-                    if (idx != -1)
-                    {
-                        name = d[..idx];
-                        version = d[(idx + 1)..];
-                    }
+        settings.UpdatePositionFromDependency(dependencySettings);
+        allResources.AddExpandedResource(resource, dependencySettings);
+    }
 
-                    tempSettings.Type = resource.Type;
-                    tempSettings.Name = name;
-                    tempSettings.Version = version;
+    public void RegisterLink(LinkEntry link)
+    {
+        _links ??= [];
 
-                    var dependency = FindResource(tempSettings);
-                    if (dependency == null)
-                    {
-                        continue;
-                    }
+        var href = link.Href;
 
-                    ExpandDependenciesImplementation(dependency, dependencySettings, allResources, isTopLevel: false);
-                }
-            }
+        if (href != null && href.StartsWith("~/", StringComparison.Ordinal))
+        {
+            link.Href = string.Concat(_options.ContentBasePath, href.AsSpan(1));
+        }
 
-            settings.UpdatePositionFromDependency(dependencySettings);
-            allResources.AddExpandedResource(resource, dependencySettings);
+        if (link.AppendVersion)
+        {
+            link.Href = _fileVersionProvider.AddFileVersionToPath(_options.ContentBasePath, link.Href);
         }
 
-        public void RegisterLink(LinkEntry link)
+        _links.Add(link);
+    }
+
+    public void RegisterMeta(MetaEntry meta)
+    {
+        if (meta == null)
         {
-            _links ??= [];
+            return;
+        }
 
-            var href = link.Href;
+        _metas ??= [];
 
-            if (href != null && href.StartsWith("~/", StringComparison.Ordinal))
-            {
-                link.Href = string.Concat(_options.ContentBasePath, href.AsSpan(1));
-            }
+        var index = meta.Name ?? meta.Property ?? meta.HttpEquiv ?? "charset";
 
-            if (link.AppendVersion)
-            {
-                link.Href = _fileVersionProvider.AddFileVersionToPath(_options.ContentBasePath, link.Href);
-            }
+        _metas[index] = meta;
+    }
 
-            _links.Add(link);
+    public void AppendMeta(MetaEntry meta, string contentSeparator)
+    {
+        if (meta == null)
+        {
+            return;
         }
 
-        public void RegisterMeta(MetaEntry meta)
-        {
-            if (meta == null)
-            {
-                return;
-            }
+        var index = meta.Name ?? meta.Property ?? meta.HttpEquiv;
 
-            _metas ??= [];
+        if (string.IsNullOrEmpty(index))
+        {
+            return;
+        }
 
-            var index = meta.Name ?? meta.Property ?? meta.HttpEquiv ?? "charset";
+        _metas ??= [];
 
-            _metas[index] = meta;
+        if (_metas.TryGetValue(index, out var existingMeta))
+        {
+            meta = MetaEntry.Combine(existingMeta, meta, contentSeparator);
         }
 
-        public void AppendMeta(MetaEntry meta, string contentSeparator)
+        _metas[index] = meta;
+    }
+
+    public void RenderMeta(TextWriter writer)
+    {
+        var first = true;
+
+        foreach (var meta in DoGetRegisteredMetas())
         {
-            if (meta == null)
+            if (!first)
             {
-                return;
+                writer.Write(System.Environment.NewLine);
             }
 
-            var index = meta.Name ?? meta.Property ?? meta.HttpEquiv;
+            first = false;
 
-            if (string.IsNullOrEmpty(index))
-            {
-                return;
-            }
+            meta.GetTag().WriteTo(writer, NullHtmlEncoder.Default);
+        }
+    }
 
-            _metas ??= [];
+    public void RenderHeadLink(TextWriter writer)
+    {
+        var first = true;
 
-            if (_metas.TryGetValue(index, out var existingMeta))
+        var registeredLinks = DoGetRegisteredLinks();
+        for (var i = 0; i < registeredLinks.Count; i++)
+        {
+            var link = registeredLinks[i];
+            if (!first)
             {
-                meta = MetaEntry.Combine(existingMeta, meta, contentSeparator);
+                writer.Write(System.Environment.NewLine);
             }
 
-            _metas[index] = meta;
+            first = false;
+
+            link.GetTag().WriteTo(writer, NullHtmlEncoder.Default);
         }
+    }
+
+    public void RenderStylesheet(TextWriter writer)
+    {
+        var first = true;
 
-        public void RenderMeta(TextWriter writer)
+        var styleSheets = DoGetRequiredResources("stylesheet");
+
+        foreach (var context in styleSheets)
         {
-            var first = true;
+            if (context.Settings.Location == ResourceLocation.Inline)
+            {
+                continue;
+            }
 
-            foreach (var meta in DoGetRegisteredMetas())
+            if (!first)
             {
-                if (!first)
-                {
-                    writer.Write(System.Environment.NewLine);
-                }
+                writer.Write(System.Environment.NewLine);
+            }
 
-                first = false;
+            first = false;
 
-                meta.GetTag().WriteTo(writer, NullHtmlEncoder.Default);
-            }
+            context.WriteTo(writer, _options.ContentBasePath);
         }
 
-        public void RenderHeadLink(TextWriter writer)
+        var registeredStyles = DoGetRegisteredStyles();
+        for (var i = 0; i < registeredStyles.Count; i++)
         {
-            var first = true;
-
-            var registeredLinks = DoGetRegisteredLinks();
-            for (var i = 0; i < registeredLinks.Count; i++)
+            var context = registeredStyles[i];
+            if (!first)
             {
-                var link = registeredLinks[i];
-                if (!first)
-                {
-                    writer.Write(System.Environment.NewLine);
-                }
+                writer.Write(System.Environment.NewLine);
+            }
 
-                first = false;
+            first = false;
 
-                link.GetTag().WriteTo(writer, NullHtmlEncoder.Default);
-            }
+            context.WriteTo(writer, NullHtmlEncoder.Default);
         }
+    }
 
-        public void RenderStylesheet(TextWriter writer)
-        {
-            var first = true;
+    public void RenderHeadScript(TextWriter writer)
+    {
+        var headScripts = DoGetRequiredResources("script");
 
-            var styleSheets = DoGetRequiredResources("stylesheet");
+        var first = true;
 
-            foreach (var context in styleSheets)
+        foreach (var context in headScripts)
+        {
+            if (context.Settings.Location != ResourceLocation.Head)
             {
-                if (context.Settings.Location == ResourceLocation.Inline)
-                {
-                    continue;
-                }
-
-                if (!first)
-                {
-                    writer.Write(System.Environment.NewLine);
-                }
-
-                first = false;
-
-                context.WriteTo(writer, _options.ContentBasePath);
+                continue;
             }
 
-            var registeredStyles = DoGetRegisteredStyles();
-            for (var i = 0; i < registeredStyles.Count; i++)
+            if (!first)
             {
-                var context = registeredStyles[i];
-                if (!first)
-                {
-                    writer.Write(System.Environment.NewLine);
-                }
+                writer.Write(System.Environment.NewLine);
+            }
 
-                first = false;
+            first = false;
 
-                context.WriteTo(writer, NullHtmlEncoder.Default);
-            }
+            context.WriteTo(writer, _options.ContentBasePath);
         }
 
-        public void RenderHeadScript(TextWriter writer)
+        var registeredHeadScripts = DoGetRegisteredHeadScripts();
+        for (var i = 0; i < registeredHeadScripts.Count; i++)
         {
-            var headScripts = DoGetRequiredResources("script");
-
-            var first = true;
-
-            foreach (var context in headScripts)
+            var context = registeredHeadScripts[i];
+            if (!first)
             {
-                if (context.Settings.Location != ResourceLocation.Head)
-                {
-                    continue;
-                }
+                writer.Write(System.Environment.NewLine);
+            }
 
-                if (!first)
-                {
-                    writer.Write(System.Environment.NewLine);
-                }
+            first = false;
 
-                first = false;
+            context.WriteTo(writer, NullHtmlEncoder.Default);
+        }
+    }
 
-                context.WriteTo(writer, _options.ContentBasePath);
+    public void RenderFootScript(TextWriter writer)
+    {
+        var footScripts = DoGetRequiredResources("script");
+
+        var first = true;
+        foreach (var context in footScripts)
+        {
+            if (context.Settings.Location != ResourceLocation.Foot)
+            {
+                continue;
             }
 
-            var registeredHeadScripts = DoGetRegisteredHeadScripts();
-            for (var i = 0; i < registeredHeadScripts.Count; i++)
+            if (!first)
             {
-                var context = registeredHeadScripts[i];
-                if (!first)
-                {
-                    writer.Write(System.Environment.NewLine);
-                }
+                writer.Write(System.Environment.NewLine);
+            }
 
-                first = false;
+            first = false;
 
-                context.WriteTo(writer, NullHtmlEncoder.Default);
-            }
+            context.WriteTo(writer, _options.ContentBasePath);
         }
 
-        public void RenderFootScript(TextWriter writer)
+        var registeredFootScripts = DoGetRegisteredFootScripts();
+        for (var i = 0; i < registeredFootScripts.Count; i++)
         {
-            var footScripts = DoGetRequiredResources("script");
-
-            var first = true;
-            foreach (var context in footScripts)
+            var context = registeredFootScripts[i];
+            if (!first)
             {
-                if (context.Settings.Location != ResourceLocation.Foot)
-                {
-                    continue;
-                }
+                writer.Write(System.Environment.NewLine);
+            }
 
-                if (!first)
-                {
-                    writer.Write(System.Environment.NewLine);
-                }
+            first = false;
 
-                first = false;
+            context.WriteTo(writer, NullHtmlEncoder.Default);
+        }
+    }
 
-                context.WriteTo(writer, _options.ContentBasePath);
-            }
+    public void RenderLocalScript(RequireSettings settings, TextWriter writer)
+    {
+        var localScripts = DoGetRequiredResources("script");
+        _localScripts ??= new HashSet<string>(localScripts.Length);
+
+        var first = true;
 
-            var registeredFootScripts = DoGetRegisteredFootScripts();
-            for (var i = 0; i < registeredFootScripts.Count; i++)
+        foreach (var context in localScripts)
+        {
+            if ((context.Settings.Location == ResourceLocation.Unspecified || context.Settings.Location == ResourceLocation.Inline) &&
+                (_localScripts.Add(context.Settings.Name) || context.Settings.Name == settings.Name))
             {
-                var context = registeredFootScripts[i];
                 if (!first)
                 {
                     writer.Write(System.Environment.NewLine);
@@ -637,104 +660,80 @@ public void RenderFootScript(TextWriter writer)
 
                 first = false;
 
-                context.WriteTo(writer, NullHtmlEncoder.Default);
+                context.WriteTo(writer, _options.ContentBasePath);
             }
         }
+    }
 
-        public void RenderLocalScript(RequireSettings settings, TextWriter writer)
-        {
-            var localScripts = DoGetRequiredResources("script");
-            _localScripts ??= new HashSet<string>(localScripts.Length);
+    public void RenderLocalStyle(RequireSettings settings, TextWriter writer)
+    {
+        var localStyles = DoGetRequiredResources("stylesheet");
+        _localStyles ??= new HashSet<string>(localStyles.Length);
 
-            var first = true;
+        var first = true;
 
-            foreach (var context in localScripts)
+        foreach (var context in localStyles)
+        {
+            if (context.Settings.Location == ResourceLocation.Inline &&
+                (_localStyles.Add(context.Settings.Name) || context.Settings.Name == settings.Name))
             {
-                if ((context.Settings.Location == ResourceLocation.Unspecified || context.Settings.Location == ResourceLocation.Inline) &&
-                    (_localScripts.Add(context.Settings.Name) || context.Settings.Name == settings.Name))
+                if (!first)
                 {
-                    if (!first)
-                    {
-                        writer.Write(System.Environment.NewLine);
-                    }
+                    writer.Write(System.Environment.NewLine);
+                }
 
-                    first = false;
+                first = false;
 
-                    context.WriteTo(writer, _options.ContentBasePath);
-                }
+                context.WriteTo(writer, _options.ContentBasePath);
             }
         }
+    }
 
-        public void RenderLocalStyle(RequireSettings settings, TextWriter writer)
-        {
-            var localStyles = DoGetRequiredResources("stylesheet");
-            _localStyles ??= new HashSet<string>(localStyles.Length);
-
-            var first = true;
-
-            foreach (var context in localStyles)
-            {
-                if (context.Settings.Location == ResourceLocation.Inline &&
-                    (_localStyles.Add(context.Settings.Name) || context.Settings.Name == settings.Name))
-                {
-                    if (!first)
-                    {
-                        writer.Write(System.Environment.NewLine);
-                    }
-
-                    first = false;
+    private readonly struct ResourceTypeName : IEquatable<ResourceTypeName>
+    {
+        public readonly string Type;
+        public readonly string Name;
 
-                    context.WriteTo(writer, _options.ContentBasePath);
-                }
-            }
+        public ResourceTypeName(string resourceType, string resourceName)
+        {
+            Type = resourceType;
+            Name = resourceName;
         }
 
-        private readonly struct ResourceTypeName : IEquatable<ResourceTypeName>
+        public bool Equals(ResourceTypeName other)
         {
-            public readonly string Type;
-            public readonly string Name;
-
-            public ResourceTypeName(string resourceType, string resourceName)
-            {
-                Type = resourceType;
-                Name = resourceName;
-            }
-
-            public bool Equals(ResourceTypeName other)
-            {
-                return Type == other.Type && Name == other.Name;
-            }
-
-            public override int GetHashCode()
-            {
-                return HashCode.Combine(Type, Name);
-            }
-
-            public override string ToString() => "(" + Type + ", " + Name + ")";
-
-            public override bool Equals(object obj) => obj is ResourceTypeName && Equals((ResourceTypeName)obj);
+            return Type == other.Type && Name == other.Name;
         }
 
-        private string GetResourceKey(string releasePath, string debugPath)
+        public override int GetHashCode()
         {
-            if (_options.DebugMode && !string.IsNullOrWhiteSpace(debugPath))
-            {
-                return debugPath;
-            }
-            else
-            {
-                return releasePath;
-            }
+            return HashCode.Combine(Type, Name);
         }
 
-        private static class EmptyList<T>
+        public override string ToString() => "(" + Type + ", " + Name + ")";
+
+        public override bool Equals(object obj) => obj is ResourceTypeName && Equals((ResourceTypeName)obj);
+    }
+
+    private string GetResourceKey(string releasePath, string debugPath)
+    {
+        if (_options.DebugMode && !string.IsNullOrWhiteSpace(debugPath))
         {
-            public static readonly List<T> Instance = [];
+            return debugPath;
         }
-
-        private static class EmptyValueCollection<T>
+        else
         {
-            public static readonly Dictionary<string, T>.ValueCollection Instance = new([]);
+            return releasePath;
         }
     }
+
+    private static class EmptyList<T>
+    {
+        public static readonly List<T> Instance = [];
+    }
+
+    private static class EmptyValueCollection<T>
+    {
+        public static readonly Dictionary<string, T>.ValueCollection Instance = new([]);
+    }
 }
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.ResourceManagement/ServiceCollectionExtensions.cs
index cd1cc848e88..be8d0f3d8d5 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement/ServiceCollectionExtensions.cs
@@ -1,18 +1,17 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using OrchardCore.ResourceManagement;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    /// <summary>
+    /// Adds services for managing resources.
+    /// </summary>
+    public static IServiceCollection AddResourceManagement(this IServiceCollection services)
     {
-        /// <summary>
-        /// Adds services for managing resources.
-        /// </summary>
-        public static IServiceCollection AddResourceManagement(this IServiceCollection services)
-        {
-            services.TryAddScoped<IResourceManager, ResourceManager>();
+        services.TryAddScoped<IResourceManager, ResourceManager>();
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/LinkTagHelper.cs b/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/LinkTagHelper.cs
index 3afea00f185..7b269b1a52b 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/LinkTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/LinkTagHelper.cs
@@ -1,82 +1,81 @@
 using System;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.ResourceManagement.TagHelpers
+namespace OrchardCore.ResourceManagement.TagHelpers;
+
+[HtmlTargetElement("link", Attributes = SrcAttributeName)]
+public class LinkTagHelper : TagHelper
 {
-    [HtmlTargetElement("link", Attributes = SrcAttributeName)]
-    public class LinkTagHelper : TagHelper
-    {
-        private const string SrcAttributeName = "asp-src";
-        private const string AppendVersionAttributeName = "asp-append-version";
+    private const string SrcAttributeName = "asp-src";
+    private const string AppendVersionAttributeName = "asp-append-version";
+
+    public string Rel { get; set; }
 
-        public string Rel { get; set; }
+    [HtmlAttributeName(SrcAttributeName)]
+    public string Src { get; set; }
 
-        [HtmlAttributeName(SrcAttributeName)]
-        public string Src { get; set; }
+    [HtmlAttributeName(AppendVersionAttributeName)]
+    public bool? AppendVersion { get; set; }
 
-        [HtmlAttributeName(AppendVersionAttributeName)]
-        public bool? AppendVersion { get; set; }
+    public string Title { get; set; }
 
-        public string Title { get; set; }
+    public string Type { get; set; }
 
-        public string Type { get; set; }
+    public string Condition { get; set; }
 
-        public string Condition { get; set; }
+    private readonly IResourceManager _resourceManager;
 
-        private readonly IResourceManager _resourceManager;
+    public LinkTagHelper(IResourceManager resourceManager)
+    {
+        _resourceManager = resourceManager;
+    }
 
-        public LinkTagHelper(IResourceManager resourceManager)
+    public override void Process(TagHelperContext context, TagHelperOutput output)
+    {
+        var linkEntry = new LinkEntry();
+
+        if (!string.IsNullOrEmpty(Src))
         {
-            _resourceManager = resourceManager;
+            linkEntry.Href = Src;
         }
 
-        public override void Process(TagHelperContext context, TagHelperOutput output)
+        if (!string.IsNullOrEmpty(Rel))
         {
-            var linkEntry = new LinkEntry();
-
-            if (!string.IsNullOrEmpty(Src))
-            {
-                linkEntry.Href = Src;
-            }
+            linkEntry.Rel = Rel;
+        }
 
-            if (!string.IsNullOrEmpty(Rel))
-            {
-                linkEntry.Rel = Rel;
-            }
+        if (!string.IsNullOrEmpty(Condition))
+        {
+            linkEntry.Condition = Condition;
+        }
 
-            if (!string.IsNullOrEmpty(Condition))
-            {
-                linkEntry.Condition = Condition;
-            }
+        if (!string.IsNullOrEmpty(Title))
+        {
+            linkEntry.Title = Title;
+        }
 
-            if (!string.IsNullOrEmpty(Title))
-            {
-                linkEntry.Title = Title;
-            }
+        if (!string.IsNullOrEmpty(Type))
+        {
+            linkEntry.Type = Type;
+        }
 
-            if (!string.IsNullOrEmpty(Type))
-            {
-                linkEntry.Type = Type;
-            }
+        if (AppendVersion.HasValue)
+        {
+            linkEntry.AppendVersion = AppendVersion.Value;
+        }
 
-            if (AppendVersion.HasValue)
+        foreach (var attribute in output.Attributes)
+        {
+            if (string.Equals(attribute.Name, "href", StringComparison.OrdinalIgnoreCase))
             {
-                linkEntry.AppendVersion = AppendVersion.Value;
+                continue;
             }
 
-            foreach (var attribute in output.Attributes)
-            {
-                if (string.Equals(attribute.Name, "href", StringComparison.OrdinalIgnoreCase))
-                {
-                    continue;
-                }
-
-                linkEntry.SetAttribute(attribute.Name, attribute.Value.ToString());
-            }
+            linkEntry.SetAttribute(attribute.Name, attribute.Value.ToString());
+        }
 
-            _resourceManager.RegisterLink(linkEntry);
+        _resourceManager.RegisterLink(linkEntry);
 
-            output.TagName = null;
-        }
+        output.TagName = null;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/MetaTagHelper.cs b/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/MetaTagHelper.cs
index 5e20bfb64fd..4c79296a737 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/MetaTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/MetaTagHelper.cs
@@ -1,53 +1,52 @@
 using System;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.ResourceManagement.TagHelpers
+namespace OrchardCore.ResourceManagement.TagHelpers;
+
+[HtmlTargetElement("meta", Attributes = NameAttributeName)]
+[HtmlTargetElement("meta", Attributes = PropertyAttributeName)]
+public class MetaTagHelper : TagHelper
 {
-    [HtmlTargetElement("meta", Attributes = NameAttributeName)]
-    [HtmlTargetElement("meta", Attributes = PropertyAttributeName)]
-    public class MetaTagHelper : TagHelper
-    {
-        private const string NameAttributeName = "asp-name";
-        private const string PropertyAttributeName = "asp-property";
+    private const string NameAttributeName = "asp-name";
+    private const string PropertyAttributeName = "asp-property";
 
-        [HtmlAttributeName(NameAttributeName)]
-        public string Name { get; set; }
+    [HtmlAttributeName(NameAttributeName)]
+    public string Name { get; set; }
 
-        [HtmlAttributeName(PropertyAttributeName)]
-        public string Property { get; set; }
+    [HtmlAttributeName(PropertyAttributeName)]
+    public string Property { get; set; }
 
-        public string Content { get; set; }
+    public string Content { get; set; }
 
-        public string HttpEquiv { get; set; }
+    public string HttpEquiv { get; set; }
 
-        public string Charset { get; set; }
+    public string Charset { get; set; }
 
-        public string Separator { get; set; }
+    public string Separator { get; set; }
 
-        private readonly IResourceManager _resourceManager;
+    private readonly IResourceManager _resourceManager;
 
-        public MetaTagHelper(IResourceManager resourceManager)
-        {
-            _resourceManager = resourceManager;
-        }
+    public MetaTagHelper(IResourceManager resourceManager)
+    {
+        _resourceManager = resourceManager;
+    }
 
-        public override void Process(TagHelperContext context, TagHelperOutput output)
-        {
-            var metaEntry = new MetaEntry(Name, Property, Content, HttpEquiv, Charset);
+    public override void Process(TagHelperContext context, TagHelperOutput output)
+    {
+        var metaEntry = new MetaEntry(Name, Property, Content, HttpEquiv, Charset);
 
-            foreach (var attribute in output.Attributes)
+        foreach (var attribute in output.Attributes)
+        {
+            if (string.Equals(attribute.Name, "name", StringComparison.OrdinalIgnoreCase) || string.Equals(attribute.Name, "property", StringComparison.OrdinalIgnoreCase))
             {
-                if (string.Equals(attribute.Name, "name", StringComparison.OrdinalIgnoreCase) || string.Equals(attribute.Name, "property", StringComparison.OrdinalIgnoreCase))
-                {
-                    continue;
-                }
-
-                metaEntry.SetAttribute(attribute.Name, attribute.Value.ToString());
+                continue;
             }
 
-            _resourceManager.AppendMeta(metaEntry, Separator ?? ", ");
-
-            output.TagName = null;
+            metaEntry.SetAttribute(attribute.Name, attribute.Value.ToString());
         }
+
+        _resourceManager.AppendMeta(metaEntry, Separator ?? ", ");
+
+        output.TagName = null;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/ResourcesTagHelper.cs b/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/ResourcesTagHelper.cs
index bccd406e402..2c7d53d6614 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/ResourcesTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/ResourcesTagHelper.cs
@@ -5,50 +5,49 @@
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Logging;
 
-namespace OrchardCore.ResourceManagement.TagHelpers
+namespace OrchardCore.ResourceManagement.TagHelpers;
+
+[HtmlTargetElement("resources", Attributes = nameof(Type))]
+public class ResourcesTagHelper : TagHelper
 {
-    [HtmlTargetElement("resources", Attributes = nameof(Type))]
-    public class ResourcesTagHelper : TagHelper
+    private readonly IResourceManager _resourceManager;
+    private readonly ILogger _logger;
+    private readonly IEnumerable<IResourcesTagHelperProcessor> _processors;
+
+    public ResourcesTagHelper(
+        IResourceManager resourceManager,
+        ILogger<ResourcesTagHelper> logger,
+        IEnumerable<IResourcesTagHelperProcessor> processors)
     {
-        private readonly IResourceManager _resourceManager;
-        private readonly ILogger _logger;
-        private readonly IEnumerable<IResourcesTagHelperProcessor> _processors;
-
-        public ResourcesTagHelper(
-            IResourceManager resourceManager,
-            ILogger<ResourcesTagHelper> logger,
-            IEnumerable<IResourcesTagHelperProcessor> processors)
-        {
-            _resourceManager = resourceManager;
-            _logger = logger;
-            _processors = processors;
-        }
+        _resourceManager = resourceManager;
+        _logger = logger;
+        _processors = processors;
+    }
 
-        public ResourceTagType Type { get; set; }
+    public ResourceTagType Type { get; set; }
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+    public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+    {
+        try
         {
-            try
-            {
-                await using var writer = new ZStringWriter();
-
-                var processorContext = new ResourcesTagHelperProcessorContext(Type, writer);
+            await using var writer = new ZStringWriter();
 
-                foreach (var processor in _processors)
-                {
-                    await processor.ProcessAsync(processorContext);
-                }
+            var processorContext = new ResourcesTagHelperProcessorContext(Type, writer);
 
-                output.Content.AppendHtml(writer.ToString());
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "An error occurred while rendering {Type} resource.", Type);
-            }
-            finally
+            foreach (var processor in _processors)
             {
-                output.TagName = null;
+                await processor.ProcessAsync(processorContext);
             }
+
+            output.Content.AppendHtml(writer.ToString());
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "An error occurred while rendering {Type} resource.", Type);
+        }
+        finally
+        {
+            output.TagName = null;
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/ScriptTagHelper.cs b/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/ScriptTagHelper.cs
index c5333e3da3a..a454398cb3b 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/ScriptTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/ScriptTagHelper.cs
@@ -4,255 +4,254 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.ResourceManagement.TagHelpers
+namespace OrchardCore.ResourceManagement.TagHelpers;
+
+[HtmlTargetElement("script", Attributes = NameAttributeName)]
+[HtmlTargetElement("script", Attributes = SrcAttributeName)]
+[HtmlTargetElement("script", Attributes = AtAttributeName)]
+public class ScriptTagHelper : TagHelper
 {
-    [HtmlTargetElement("script", Attributes = NameAttributeName)]
-    [HtmlTargetElement("script", Attributes = SrcAttributeName)]
-    [HtmlTargetElement("script", Attributes = AtAttributeName)]
-    public class ScriptTagHelper : TagHelper
-    {
-        private static readonly char[] _separator = [',', ' '];
+    private static readonly char[] _separator = [',', ' '];
 
-        private const string NameAttributeName = "asp-name";
-        private const string SrcAttributeName = "asp-src";
-        private const string AtAttributeName = "at";
-        private const string AppendVersionAttributeName = "asp-append-version";
+    private const string NameAttributeName = "asp-name";
+    private const string SrcAttributeName = "asp-src";
+    private const string AtAttributeName = "at";
+    private const string AppendVersionAttributeName = "asp-append-version";
 
-        [HtmlAttributeName(NameAttributeName)]
-        public string Name { get; set; }
+    [HtmlAttributeName(NameAttributeName)]
+    public string Name { get; set; }
 
-        [HtmlAttributeName(SrcAttributeName)]
-        public string Src { get; set; }
+    [HtmlAttributeName(SrcAttributeName)]
+    public string Src { get; set; }
 
-        [HtmlAttributeName(AppendVersionAttributeName)]
-        public bool? AppendVersion { get; set; }
+    [HtmlAttributeName(AppendVersionAttributeName)]
+    public bool? AppendVersion { get; set; }
 
-        public string CdnSrc { get; set; }
-        public string DebugSrc { get; set; }
-        public string DebugCdnSrc { get; set; }
+    public string CdnSrc { get; set; }
+    public string DebugSrc { get; set; }
+    public string DebugCdnSrc { get; set; }
 
-        public bool? UseCdn { get; set; }
-        public string Condition { get; set; }
-        public string Culture { get; set; }
-        public bool? Debug { get; set; }
-        public string DependsOn { get; set; }
-        public string Version { get; set; }
+    public bool? UseCdn { get; set; }
+    public string Condition { get; set; }
+    public string Culture { get; set; }
+    public bool? Debug { get; set; }
+    public string DependsOn { get; set; }
+    public string Version { get; set; }
 
-        [HtmlAttributeName(AtAttributeName)]
-        public ResourceLocation At { get; set; }
+    [HtmlAttributeName(AtAttributeName)]
+    public ResourceLocation At { get; set; }
 
-        private readonly IResourceManager _resourceManager;
+    private readonly IResourceManager _resourceManager;
 
-        public ScriptTagHelper(IResourceManager resourceManager)
-        {
-            _resourceManager = resourceManager;
-        }
+    public ScriptTagHelper(IResourceManager resourceManager)
+    {
+        _resourceManager = resourceManager;
+    }
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
-        {
-            output.SuppressOutput();
+    public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+    {
+        output.SuppressOutput();
 
-            var hasName = !string.IsNullOrEmpty(Name);
-            var hasSource = !string.IsNullOrEmpty(Src);
+        var hasName = !string.IsNullOrEmpty(Name);
+        var hasSource = !string.IsNullOrEmpty(Src);
 
-            if (!hasName && hasSource)
-            {
-                // <script asp-src="~/TheBlogTheme/js/clean-blog.min.js"></script>
-                RequireSettings setting;
-
-                if (string.IsNullOrEmpty(DependsOn))
-                {
-                    // Include custom script url
-                    setting = _resourceManager.RegisterUrl("script", Src, DebugSrc);
-                }
-                else
-                {
-                    // Anonymous declaration with dependencies, then display
+        if (!hasName && hasSource)
+        {
+            // <script asp-src="~/TheBlogTheme/js/clean-blog.min.js"></script>
+            RequireSettings setting;
 
-                    // Using the source as the name to prevent duplicate references to the same file
-                    var name = Src.ToLowerInvariant();
+            if (string.IsNullOrEmpty(DependsOn))
+            {
+                // Include custom script url
+                setting = _resourceManager.RegisterUrl("script", Src, DebugSrc);
+            }
+            else
+            {
+                // Anonymous declaration with dependencies, then display
 
-                    PopulateResourceDefinition(_resourceManager.InlineManifest.DefineScript(name));
+                // Using the source as the name to prevent duplicate references to the same file
+                var name = Src.ToLowerInvariant();
 
-                    setting = _resourceManager.RegisterResource("script", name);
-                }
+                PopulateResourceDefinition(_resourceManager.InlineManifest.DefineScript(name));
 
-                PopulateRequireSettings(setting, output, hasName: false);
+                setting = _resourceManager.RegisterResource("script", name);
+            }
 
-                if (AppendVersion.HasValue)
-                {
-                    setting.ShouldAppendVersion(AppendVersion);
-                }
+            PopulateRequireSettings(setting, output, hasName: false);
 
-                if (At == ResourceLocation.Unspecified || At == ResourceLocation.Inline)
-                {
-                    RenderScript(output, setting);
-                }
+            if (AppendVersion.HasValue)
+            {
+                setting.ShouldAppendVersion(AppendVersion);
             }
-            else if (hasName && !hasSource)
+
+            if (At == ResourceLocation.Unspecified || At == ResourceLocation.Inline)
             {
-                // Resource required
-                // <script asp-name="bootstrap"></script>
+                RenderScript(output, setting);
+            }
+        }
+        else if (hasName && !hasSource)
+        {
+            // Resource required
+            // <script asp-name="bootstrap"></script>
 
-                var setting = _resourceManager.RegisterResource("script", Name);
+            var setting = _resourceManager.RegisterResource("script", Name);
 
-                PopulateRequireSettings(setting, output, hasName: true);
+            PopulateRequireSettings(setting, output, hasName: true);
 
-                if (AppendVersion.HasValue)
-                {
-                    setting.ShouldAppendVersion(AppendVersion);
-                }
+            if (AppendVersion.HasValue)
+            {
+                setting.ShouldAppendVersion(AppendVersion);
+            }
 
-                if (!string.IsNullOrEmpty(Version))
-                {
-                    setting.UseVersion(Version);
-                }
+            if (!string.IsNullOrEmpty(Version))
+            {
+                setting.UseVersion(Version);
+            }
 
-                // This allows additions to the pre registered scripts dependencies.
-                if (!string.IsNullOrEmpty(DependsOn))
-                {
-                    setting.SetDependencies(DependsOn.Split(_separator, StringSplitOptions.RemoveEmptyEntries));
-                }
+            // This allows additions to the pre registered scripts dependencies.
+            if (!string.IsNullOrEmpty(DependsOn))
+            {
+                setting.SetDependencies(DependsOn.Split(_separator, StringSplitOptions.RemoveEmptyEntries));
+            }
 
-                // Allow Inline to work with both named scripts, and named inline scripts.
-                if (At != ResourceLocation.Unspecified)
-                {
-                    // Named inline declaration.
-                    var childContent = await output.GetChildContentAsync();
-                    if (!childContent.IsEmptyOrWhiteSpace)
-                    {
-                        // Inline content definition
-                        _resourceManager.InlineManifest.DefineScript(Name)
-                           .SetInnerContent(childContent.GetContent());
-                    }
-
-                    if (At == ResourceLocation.Inline)
-                    {
-                        RenderScript(output, setting);
-                    }
-                }
-                else
+            // Allow Inline to work with both named scripts, and named inline scripts.
+            if (At != ResourceLocation.Unspecified)
+            {
+                // Named inline declaration.
+                var childContent = await output.GetChildContentAsync();
+                if (!childContent.IsEmptyOrWhiteSpace)
                 {
-                    RenderScript(output, setting);
+                    // Inline content definition
+                    _resourceManager.InlineManifest.DefineScript(Name)
+                       .SetInnerContent(childContent.GetContent());
                 }
-            }
-            else if (hasName && hasSource)
-            {
-                // Inline declaration
-
-                PopulateResourceDefinition(_resourceManager.InlineManifest.DefineScript(Name));
 
-                // If At is specified then we also render it
-                if (At != ResourceLocation.Unspecified)
+                if (At == ResourceLocation.Inline)
                 {
-                    var setting = _resourceManager.RegisterResource("script", Name);
-
-                    PopulateRequireSettings(setting, output, hasName: true);
-
-                    if (At == ResourceLocation.Inline)
-                    {
-                        RenderScript(output, setting);
-                    }
+                    RenderScript(output, setting);
                 }
             }
             else
             {
-                // Custom script content
+                RenderScript(output, setting);
+            }
+        }
+        else if (hasName && hasSource)
+        {
+            // Inline declaration
 
-                var childContent = await output.GetChildContentAsync();
+            PopulateResourceDefinition(_resourceManager.InlineManifest.DefineScript(Name));
 
-                var builder = new TagBuilder("script");
-                builder.InnerHtml.AppendHtml(childContent);
-                builder.TagRenderMode = TagRenderMode.Normal;
+            // If At is specified then we also render it
+            if (At != ResourceLocation.Unspecified)
+            {
+                var setting = _resourceManager.RegisterResource("script", Name);
 
-                foreach (var attribute in output.Attributes)
-                {
-                    builder.Attributes.Add(attribute.Name, attribute.Value.ToString());
-                }
+                PopulateRequireSettings(setting, output, hasName: true);
 
-                if (At == ResourceLocation.Head)
-                {
-                    _resourceManager.RegisterHeadScript(builder);
-                }
-                else if (At == ResourceLocation.Inline)
-                {
-                    output.Content.SetHtmlContent(builder);
-                }
-                else
+                if (At == ResourceLocation.Inline)
                 {
-                    _resourceManager.RegisterFootScript(builder);
+                    RenderScript(output, setting);
                 }
             }
         }
-
-        private void PopulateResourceDefinition(ResourceDefinition definition)
+        else
         {
-            definition.SetUrl(Src, DebugSrc);
+            // Custom script content
 
-            if (!string.IsNullOrEmpty(CdnSrc))
-            {
-                definition.SetCdn(CdnSrc, DebugCdnSrc);
-            }
+            var childContent = await output.GetChildContentAsync();
 
-            if (!string.IsNullOrEmpty(Culture))
+            var builder = new TagBuilder("script");
+            builder.InnerHtml.AppendHtml(childContent);
+            builder.TagRenderMode = TagRenderMode.Normal;
+
+            foreach (var attribute in output.Attributes)
             {
-                definition.SetCultures(Culture.Split(_separator, StringSplitOptions.RemoveEmptyEntries));
+                builder.Attributes.Add(attribute.Name, attribute.Value.ToString());
             }
 
-            if (!string.IsNullOrEmpty(DependsOn))
+            if (At == ResourceLocation.Head)
             {
-                definition.SetDependencies(DependsOn.Split(_separator, StringSplitOptions.RemoveEmptyEntries));
+                _resourceManager.RegisterHeadScript(builder);
             }
-
-            if (AppendVersion.HasValue)
+            else if (At == ResourceLocation.Inline)
             {
-                definition.ShouldAppendVersion(AppendVersion);
+                output.Content.SetHtmlContent(builder);
             }
-
-            if (!string.IsNullOrEmpty(Version))
+            else
             {
-                definition.SetVersion(Version);
+                _resourceManager.RegisterFootScript(builder);
             }
         }
+    }
+
+    private void PopulateResourceDefinition(ResourceDefinition definition)
+    {
+        definition.SetUrl(Src, DebugSrc);
 
-        private void PopulateRequireSettings(RequireSettings setting, TagHelperOutput output, bool hasName)
+        if (!string.IsNullOrEmpty(CdnSrc))
         {
-            if (At != ResourceLocation.Unspecified)
-            {
-                setting.AtLocation(At);
-            }
+            definition.SetCdn(CdnSrc, DebugCdnSrc);
+        }
 
-            if (hasName && UseCdn != null)
-            {
-                setting.UseCdn(UseCdn.Value);
-            }
+        if (!string.IsNullOrEmpty(Culture))
+        {
+            definition.SetCultures(Culture.Split(_separator, StringSplitOptions.RemoveEmptyEntries));
+        }
 
-            if (!string.IsNullOrEmpty(Condition))
-            {
-                setting.UseCondition(Condition);
-            }
+        if (!string.IsNullOrEmpty(DependsOn))
+        {
+            definition.SetDependencies(DependsOn.Split(_separator, StringSplitOptions.RemoveEmptyEntries));
+        }
 
-            if (Debug != null)
-            {
-                setting.UseDebugMode(Debug.Value);
-            }
+        if (AppendVersion.HasValue)
+        {
+            definition.ShouldAppendVersion(AppendVersion);
+        }
 
-            if (!string.IsNullOrEmpty(Culture))
-            {
-                setting.UseCulture(Culture);
-            }
+        if (!string.IsNullOrEmpty(Version))
+        {
+            definition.SetVersion(Version);
+        }
+    }
 
-            foreach (var attribute in output.Attributes)
-            {
-                setting.SetAttribute(attribute.Name, attribute.Value.ToString());
-            }
+    private void PopulateRequireSettings(RequireSettings setting, TagHelperOutput output, bool hasName)
+    {
+        if (At != ResourceLocation.Unspecified)
+        {
+            setting.AtLocation(At);
+        }
+
+        if (hasName && UseCdn != null)
+        {
+            setting.UseCdn(UseCdn.Value);
+        }
+
+        if (!string.IsNullOrEmpty(Condition))
+        {
+            setting.UseCondition(Condition);
+        }
+
+        if (Debug != null)
+        {
+            setting.UseDebugMode(Debug.Value);
+        }
+
+        if (!string.IsNullOrEmpty(Culture))
+        {
+            setting.UseCulture(Culture);
         }
 
-        private void RenderScript(TagHelperOutput output, RequireSettings setting)
+        foreach (var attribute in output.Attributes)
         {
-            using var sw = new StringWriter();
-            _resourceManager.RenderLocalScript(setting, sw);
-            output.Content.AppendHtml(sw.ToString());
+            setting.SetAttribute(attribute.Name, attribute.Value.ToString());
         }
     }
+
+    private void RenderScript(TagHelperOutput output, RequireSettings setting)
+    {
+        using var sw = new StringWriter();
+        _resourceManager.RenderLocalScript(setting, sw);
+        output.Content.AppendHtml(sw.ToString());
+    }
 }
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/StyleTagHelper.cs b/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/StyleTagHelper.cs
index 486128229ef..6b7e3762e6b 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/StyleTagHelper.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement/TagHelpers/StyleTagHelper.cs
@@ -4,275 +4,274 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace OrchardCore.ResourceManagement.TagHelpers
+namespace OrchardCore.ResourceManagement.TagHelpers;
+
+[HtmlTargetElement("style", Attributes = NameAttributeName)]
+[HtmlTargetElement("style", Attributes = SrcAttributeName)]
+[HtmlTargetElement("style", Attributes = AtAttributeName)]
+public class StyleTagHelper : TagHelper
 {
-    [HtmlTargetElement("style", Attributes = NameAttributeName)]
-    [HtmlTargetElement("style", Attributes = SrcAttributeName)]
-    [HtmlTargetElement("style", Attributes = AtAttributeName)]
-    public class StyleTagHelper : TagHelper
+    private static readonly char[] _splitSeparators = [',', ' '];
+    private const string NameAttributeName = "asp-name";
+    private const string SrcAttributeName = "asp-src";
+    private const string AtAttributeName = "at";
+    private const string AppendVersionAttributeName = "asp-append-version";
+
+    [HtmlAttributeName(NameAttributeName)]
+    public string Name { get; set; }
+
+    [HtmlAttributeName(SrcAttributeName)]
+    public string Src { get; set; }
+
+    [HtmlAttributeName(AppendVersionAttributeName)]
+    public bool? AppendVersion { get; set; }
+
+    public string CdnSrc { get; set; }
+    public string DebugSrc { get; set; }
+    public string DebugCdnSrc { get; set; }
+
+    public bool? UseCdn { get; set; }
+    public string Condition { get; set; }
+    public string Culture { get; set; }
+    public bool? Debug { get; set; }
+    public string DependsOn { get; set; }
+    public string Version { get; set; }
+
+    [HtmlAttributeName(AtAttributeName)]
+    public ResourceLocation At { get; set; }
+
+    private readonly IResourceManager _resourceManager;
+
+    public StyleTagHelper(IResourceManager resourceManager)
+    {
+        _resourceManager = resourceManager;
+    }
+
+    public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
     {
-        private static readonly char[] _splitSeparators = [',', ' '];
-        private const string NameAttributeName = "asp-name";
-        private const string SrcAttributeName = "asp-src";
-        private const string AtAttributeName = "at";
-        private const string AppendVersionAttributeName = "asp-append-version";
+        output.SuppressOutput();
 
-        [HtmlAttributeName(NameAttributeName)]
-        public string Name { get; set; }
+        if (string.IsNullOrEmpty(Name) && !string.IsNullOrEmpty(Src))
+        {
+            // Include custom style
+            var setting = _resourceManager.RegisterUrl("stylesheet", Src, DebugSrc);
+
+            foreach (var attribute in output.Attributes)
+            {
+                setting.SetAttribute(attribute.Name, attribute.Value.ToString());
+            }
 
-        [HtmlAttributeName(SrcAttributeName)]
-        public string Src { get; set; }
+            if (At != ResourceLocation.Unspecified)
+            {
+                setting.AtLocation(At);
+            }
+            else
+            {
+                setting.AtLocation(ResourceLocation.Head);
+            }
 
-        [HtmlAttributeName(AppendVersionAttributeName)]
-        public bool? AppendVersion { get; set; }
+            if (!string.IsNullOrEmpty(Condition))
+            {
+                setting.UseCondition(Condition);
+            }
 
-        public string CdnSrc { get; set; }
-        public string DebugSrc { get; set; }
-        public string DebugCdnSrc { get; set; }
+            if (AppendVersion.HasValue == true)
+            {
+                setting.ShouldAppendVersion(AppendVersion);
+            }
 
-        public bool? UseCdn { get; set; }
-        public string Condition { get; set; }
-        public string Culture { get; set; }
-        public bool? Debug { get; set; }
-        public string DependsOn { get; set; }
-        public string Version { get; set; }
+            if (Debug != null)
+            {
+                setting.UseDebugMode(Debug.Value);
+            }
 
-        [HtmlAttributeName(AtAttributeName)]
-        public ResourceLocation At { get; set; }
+            if (!string.IsNullOrEmpty(Culture))
+            {
+                setting.UseCulture(Culture);
+            }
 
-        private readonly IResourceManager _resourceManager;
+            if (!string.IsNullOrEmpty(DependsOn))
+            {
+                setting.SetDependencies(DependsOn.Split(_splitSeparators, StringSplitOptions.RemoveEmptyEntries));
+            }
 
-        public StyleTagHelper(IResourceManager resourceManager)
+            if (At == ResourceLocation.Inline)
+            {
+                using var sw = new StringWriter();
+                _resourceManager.RenderLocalStyle(setting, sw);
+                output.Content.AppendHtml(sw.ToString());
+            }
+        }
+        else if (!string.IsNullOrEmpty(Name) && string.IsNullOrEmpty(Src))
         {
-            _resourceManager = resourceManager;
+            // Resource required
+
+            var setting = _resourceManager.RegisterResource("stylesheet", Name);
+
+            foreach (var attribute in output.Attributes)
+            {
+                setting.SetAttribute(attribute.Name, attribute.Value.ToString());
+            }
+
+            if (At != ResourceLocation.Unspecified)
+            {
+                setting.AtLocation(At);
+            }
+            else
+            {
+                setting.AtLocation(ResourceLocation.Head);
+            }
+
+            if (UseCdn != null)
+            {
+                setting.UseCdn(UseCdn.Value);
+            }
+
+            if (!string.IsNullOrEmpty(Condition))
+            {
+                setting.UseCondition(Condition);
+            }
+
+            if (Debug != null)
+            {
+                setting.UseDebugMode(Debug.Value);
+            }
+
+            if (!string.IsNullOrEmpty(Culture))
+            {
+                setting.UseCulture(Culture);
+            }
+
+            if (AppendVersion.HasValue == true)
+            {
+                setting.ShouldAppendVersion(AppendVersion);
+            }
+
+            if (!string.IsNullOrEmpty(Version))
+            {
+                setting.UseVersion(Version);
+            }
+
+            // This allows additions to the pre registered style dependencies.
+            if (!string.IsNullOrEmpty(DependsOn))
+            {
+                setting.SetDependencies(DependsOn.Split(_splitSeparators, StringSplitOptions.RemoveEmptyEntries));
+            }
+
+            var childContent = await output.GetChildContentAsync();
+            if (!childContent.IsEmptyOrWhiteSpace)
+            {
+                // Inline named style definition
+                _resourceManager.InlineManifest.DefineStyle(Name)
+                    .SetInnerContent(childContent.GetContent());
+            }
+
+            if (At == ResourceLocation.Inline)
+            {
+                using var sw = new StringWriter();
+                _resourceManager.RenderLocalStyle(setting, sw);
+                output.Content.AppendHtml(sw.ToString());
+            }
         }
+        else if (!string.IsNullOrEmpty(Name) && !string.IsNullOrEmpty(Src))
+        {
+            // Inline declaration
+
+            var definition = _resourceManager.InlineManifest.DefineStyle(Name);
+            definition.SetUrl(Src, DebugSrc);
+
+            foreach (var attribute in output.Attributes)
+            {
+                definition.SetAttribute(attribute.Name, attribute.Value.ToString());
+            }
+
+            if (!string.IsNullOrEmpty(Version))
+            {
+                definition.SetVersion(Version);
+            }
+
+            if (!string.IsNullOrEmpty(CdnSrc))
+            {
+                definition.SetCdn(CdnSrc, DebugCdnSrc);
+            }
+
+            if (!string.IsNullOrEmpty(Culture))
+            {
+                definition.SetCultures(Culture.Split(',', StringSplitOptions.RemoveEmptyEntries));
+            }
+
+            if (!string.IsNullOrEmpty(DependsOn))
+            {
+                definition.SetDependencies(DependsOn.Split(',', StringSplitOptions.RemoveEmptyEntries));
+            }
+
+            // Also include the style.
+            var setting = _resourceManager.RegisterResource("stylesheet", Name);
+
+            if (UseCdn != null)
+            {
+                setting.UseCdn(UseCdn.Value);
+            }
 
-        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+            if (!string.IsNullOrEmpty(Condition))
+            {
+                setting.UseCondition(Condition);
+            }
+
+            if (Debug != null)
+            {
+                setting.UseDebugMode(Debug.Value);
+            }
+
+            if (!string.IsNullOrEmpty(Culture))
+            {
+                setting.UseCulture(Culture);
+            }
+
+            if (At != ResourceLocation.Unspecified)
+            {
+                setting.AtLocation(At);
+            }
+            else
+            {
+                setting.AtLocation(ResourceLocation.Head);
+            }
+
+            if (At == ResourceLocation.Inline)
+            {
+                using var sw = new StringWriter();
+                _resourceManager.RenderLocalStyle(setting, sw);
+                output.Content.AppendHtml(sw.ToString());
+            }
+        }
+        else if (string.IsNullOrEmpty(Name) && string.IsNullOrEmpty(Src))
         {
-            output.SuppressOutput();
-
-            if (string.IsNullOrEmpty(Name) && !string.IsNullOrEmpty(Src))
-            {
-                // Include custom style
-                var setting = _resourceManager.RegisterUrl("stylesheet", Src, DebugSrc);
-
-                foreach (var attribute in output.Attributes)
-                {
-                    setting.SetAttribute(attribute.Name, attribute.Value.ToString());
-                }
-
-                if (At != ResourceLocation.Unspecified)
-                {
-                    setting.AtLocation(At);
-                }
-                else
-                {
-                    setting.AtLocation(ResourceLocation.Head);
-                }
-
-                if (!string.IsNullOrEmpty(Condition))
-                {
-                    setting.UseCondition(Condition);
-                }
-
-                if (AppendVersion.HasValue == true)
-                {
-                    setting.ShouldAppendVersion(AppendVersion);
-                }
-
-                if (Debug != null)
-                {
-                    setting.UseDebugMode(Debug.Value);
-                }
-
-                if (!string.IsNullOrEmpty(Culture))
-                {
-                    setting.UseCulture(Culture);
-                }
-
-                if (!string.IsNullOrEmpty(DependsOn))
-                {
-                    setting.SetDependencies(DependsOn.Split(_splitSeparators, StringSplitOptions.RemoveEmptyEntries));
-                }
-
-                if (At == ResourceLocation.Inline)
-                {
-                    using var sw = new StringWriter();
-                    _resourceManager.RenderLocalStyle(setting, sw);
-                    output.Content.AppendHtml(sw.ToString());
-                }
-            }
-            else if (!string.IsNullOrEmpty(Name) && string.IsNullOrEmpty(Src))
-            {
-                // Resource required
-
-                var setting = _resourceManager.RegisterResource("stylesheet", Name);
-
-                foreach (var attribute in output.Attributes)
-                {
-                    setting.SetAttribute(attribute.Name, attribute.Value.ToString());
-                }
-
-                if (At != ResourceLocation.Unspecified)
-                {
-                    setting.AtLocation(At);
-                }
-                else
-                {
-                    setting.AtLocation(ResourceLocation.Head);
-                }
-
-                if (UseCdn != null)
-                {
-                    setting.UseCdn(UseCdn.Value);
-                }
-
-                if (!string.IsNullOrEmpty(Condition))
-                {
-                    setting.UseCondition(Condition);
-                }
-
-                if (Debug != null)
-                {
-                    setting.UseDebugMode(Debug.Value);
-                }
-
-                if (!string.IsNullOrEmpty(Culture))
-                {
-                    setting.UseCulture(Culture);
-                }
-
-                if (AppendVersion.HasValue == true)
-                {
-                    setting.ShouldAppendVersion(AppendVersion);
-                }
-
-                if (!string.IsNullOrEmpty(Version))
-                {
-                    setting.UseVersion(Version);
-                }
-
-                // This allows additions to the pre registered style dependencies.
-                if (!string.IsNullOrEmpty(DependsOn))
-                {
-                    setting.SetDependencies(DependsOn.Split(_splitSeparators, StringSplitOptions.RemoveEmptyEntries));
-                }
-
-                var childContent = await output.GetChildContentAsync();
-                if (!childContent.IsEmptyOrWhiteSpace)
-                {
-                    // Inline named style definition
-                    _resourceManager.InlineManifest.DefineStyle(Name)
-                        .SetInnerContent(childContent.GetContent());
-                }
-
-                if (At == ResourceLocation.Inline)
-                {
-                    using var sw = new StringWriter();
-                    _resourceManager.RenderLocalStyle(setting, sw);
-                    output.Content.AppendHtml(sw.ToString());
-                }
-            }
-            else if (!string.IsNullOrEmpty(Name) && !string.IsNullOrEmpty(Src))
-            {
-                // Inline declaration
-
-                var definition = _resourceManager.InlineManifest.DefineStyle(Name);
-                definition.SetUrl(Src, DebugSrc);
-
-                foreach (var attribute in output.Attributes)
-                {
-                    definition.SetAttribute(attribute.Name, attribute.Value.ToString());
-                }
-
-                if (!string.IsNullOrEmpty(Version))
-                {
-                    definition.SetVersion(Version);
-                }
-
-                if (!string.IsNullOrEmpty(CdnSrc))
-                {
-                    definition.SetCdn(CdnSrc, DebugCdnSrc);
-                }
-
-                if (!string.IsNullOrEmpty(Culture))
-                {
-                    definition.SetCultures(Culture.Split(',', StringSplitOptions.RemoveEmptyEntries));
-                }
-
-                if (!string.IsNullOrEmpty(DependsOn))
-                {
-                    definition.SetDependencies(DependsOn.Split(',', StringSplitOptions.RemoveEmptyEntries));
-                }
-
-                // Also include the style.
-                var setting = _resourceManager.RegisterResource("stylesheet", Name);
-
-                if (UseCdn != null)
-                {
-                    setting.UseCdn(UseCdn.Value);
-                }
-
-                if (!string.IsNullOrEmpty(Condition))
-                {
-                    setting.UseCondition(Condition);
-                }
-
-                if (Debug != null)
-                {
-                    setting.UseDebugMode(Debug.Value);
-                }
-
-                if (!string.IsNullOrEmpty(Culture))
-                {
-                    setting.UseCulture(Culture);
-                }
-
-                if (At != ResourceLocation.Unspecified)
-                {
-                    setting.AtLocation(At);
-                }
-                else
-                {
-                    setting.AtLocation(ResourceLocation.Head);
-                }
-
-                if (At == ResourceLocation.Inline)
-                {
-                    using var sw = new StringWriter();
-                    _resourceManager.RenderLocalStyle(setting, sw);
-                    output.Content.AppendHtml(sw.ToString());
-                }
-            }
-            else if (string.IsNullOrEmpty(Name) && string.IsNullOrEmpty(Src))
-            {
-                // Custom style content
-
-                var childContent = await output.GetChildContentAsync();
-
-                var builder = new TagBuilder("style");
-                builder.InnerHtml.AppendHtml(childContent);
-                builder.TagRenderMode = TagRenderMode.Normal;
-
-                foreach (var attribute in output.Attributes)
-                {
-                    builder.Attributes.Add(attribute.Name, attribute.Value.ToString());
-                }
-
-                // If no type was specified, define a default one
-                if (!builder.Attributes.ContainsKey("type"))
-                {
-                    builder.Attributes.Add("type", "text/css");
-                }
-
-                if (At == ResourceLocation.Inline)
-                {
-                    output.Content.SetHtmlContent(builder);
-                }
-                else
-                {
-                    _resourceManager.RegisterStyle(builder);
-                }
+            // Custom style content
+
+            var childContent = await output.GetChildContentAsync();
+
+            var builder = new TagBuilder("style");
+            builder.InnerHtml.AppendHtml(childContent);
+            builder.TagRenderMode = TagRenderMode.Normal;
+
+            foreach (var attribute in output.Attributes)
+            {
+                builder.Attributes.Add(attribute.Name, attribute.Value.ToString());
+            }
+
+            // If no type was specified, define a default one
+            if (!builder.Attributes.ContainsKey("type"))
+            {
+                builder.Attributes.Add("type", "text/css");
+            }
+
+            if (At == ResourceLocation.Inline)
+            {
+                output.Content.SetHtmlContent(builder);
+            }
+            else
+            {
+                _resourceManager.RegisterStyle(builder);
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/Condition.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/Condition.cs
index a0bde8185e4..9a548350713 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/Condition.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/Condition.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Rules
+namespace OrchardCore.Rules;
+
+public class Condition
 {
-    public class Condition
-    {
-        public string Name { get; set; }
-        public string ConditionId { get; set; }
-    }
+    public string Name { get; set; }
+    public string ConditionId { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionEvaluator.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionEvaluator.cs
index f1cff188592..22bd0e7060b 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionEvaluator.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionEvaluator.cs
@@ -1,15 +1,14 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Rules
+namespace OrchardCore.Rules;
+
+public abstract class ConditionEvaluator<T> : IConditionEvaluator where T : Condition
 {
-    public abstract class ConditionEvaluator<T> : IConditionEvaluator where T : Condition
-    {
-        protected static ValueTask<bool> False => new(false);
-        protected static ValueTask<bool> True => new(true);
+    protected static ValueTask<bool> False => new(false);
+    protected static ValueTask<bool> True => new(true);
 
-        ValueTask<bool> IConditionEvaluator.EvaluateAsync(Condition condition)
-            => EvaluateAsync(condition as T);
+    ValueTask<bool> IConditionEvaluator.EvaluateAsync(Condition condition)
+        => EvaluateAsync(condition as T);
 
-        public abstract ValueTask<bool> EvaluateAsync(T condition);
-    }
+    public abstract ValueTask<bool> EvaluateAsync(T condition);
 }
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionGroup.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionGroup.cs
index e2c49c8a9b5..6f1c4449ffe 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionGroup.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionGroup.cs
@@ -1,14 +1,13 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Rules
+namespace OrchardCore.Rules;
+
+public class ConditionGroup : Condition
 {
-    public class ConditionGroup : Condition
-    {
-        public List<Condition> Conditions { get; init; } = [];
-    }
+    public List<Condition> Conditions { get; init; } = [];
+}
 
-    public abstract class DisplayTextConditionGroup : ConditionGroup
-    {
-        public string DisplayText { get; set; }
-    }
+public abstract class DisplayTextConditionGroup : ConditionGroup
+{
+    public string DisplayText { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionOperator.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionOperator.cs
index 4c02e0238a3..313dee8bafe 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionOperator.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionOperator.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Rules
+namespace OrchardCore.Rules;
+
+public abstract class ConditionOperator
 {
-    public abstract class ConditionOperator
-    {
 
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionOperatorOptions.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionOperatorOptions.cs
index 4a07bfa23b0..913972945a1 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionOperatorOptions.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionOperatorOptions.cs
@@ -3,54 +3,53 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Rules
+namespace OrchardCore.Rules;
+
+public class ConditionOperatorOptions
 {
-    public class ConditionOperatorOptions
-    {
-        private FrozenDictionary<string, IConditionOperatorFactory> _factories;
-        private FrozenDictionary<Type, ConditionOperatorOption> _conditionOperatorOptionByType;
+    private FrozenDictionary<string, IConditionOperatorFactory> _factories;
+    private FrozenDictionary<Type, ConditionOperatorOption> _conditionOperatorOptionByType;
 
-        public IReadOnlyDictionary<string, IConditionOperatorFactory> Factories
-            => _factories ??= Operators.ToFrozenDictionary(x => x.Factory.Name, x => x.Factory);
+    public IReadOnlyDictionary<string, IConditionOperatorFactory> Factories
+        => _factories ??= Operators.ToFrozenDictionary(x => x.Factory.Name, x => x.Factory);
 
-        public IReadOnlyDictionary<Type, ConditionOperatorOption> ConditionOperatorOptionByType
-            => _conditionOperatorOptionByType ??= Operators.ToFrozenDictionary(x => x.Operator, x => x);
+    public IReadOnlyDictionary<Type, ConditionOperatorOption> ConditionOperatorOptionByType
+        => _conditionOperatorOptionByType ??= Operators.ToFrozenDictionary(x => x.Operator, x => x);
 
-        public List<ConditionOperatorOption> Operators { get; set; } = [];
-    }
+    public List<ConditionOperatorOption> Operators { get; set; } = [];
+}
 
-    public class ConditionOperatorOption<TLocalizer> : ConditionOperatorOption where TLocalizer : class
+public class ConditionOperatorOption<TLocalizer> : ConditionOperatorOption where TLocalizer : class
+{
+    public ConditionOperatorOption(
+        Func<IStringLocalizer, LocalizedString> displayText,
+        IOperatorComparer comparer,
+        Type operatorType,
+        IConditionOperatorFactory factory) : base(
+            (sp) => displayText((IStringLocalizer)sp.GetService(typeof(IStringLocalizer<>).MakeGenericType(typeof(TLocalizer)))),
+            comparer,
+            operatorType,
+            factory)
     {
-        public ConditionOperatorOption(
-            Func<IStringLocalizer, LocalizedString> displayText,
-            IOperatorComparer comparer,
-            Type operatorType,
-            IConditionOperatorFactory factory) : base(
-                (sp) => displayText((IStringLocalizer)sp.GetService(typeof(IStringLocalizer<>).MakeGenericType(typeof(TLocalizer)))),
-                comparer,
-                operatorType,
-                factory)
-        {
-        }
     }
+}
 
-    public class ConditionOperatorOption
+public class ConditionOperatorOption
+{
+    public ConditionOperatorOption(
+        Func<IServiceProvider, LocalizedString> displayText,
+        IOperatorComparer comparer,
+        Type operatorType,
+        IConditionOperatorFactory factory)
     {
-        public ConditionOperatorOption(
-            Func<IServiceProvider, LocalizedString> displayText,
-            IOperatorComparer comparer,
-            Type operatorType,
-            IConditionOperatorFactory factory)
-        {
-            DisplayText = displayText;
-            Comparer = comparer;
-            Operator = operatorType;
-            Factory = factory;
-        }
-
-        public Func<IServiceProvider, LocalizedString> DisplayText { get; }
-        public IOperatorComparer Comparer { get; }
-        public Type Operator { get; }
-        public IConditionOperatorFactory Factory { get; }
+        DisplayText = displayText;
+        Comparer = comparer;
+        Operator = operatorType;
+        Factory = factory;
     }
+
+    public Func<IServiceProvider, LocalizedString> DisplayText { get; }
+    public IOperatorComparer Comparer { get; }
+    public Type Operator { get; }
+    public IConditionOperatorFactory Factory { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionOptions.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionOptions.cs
index 31650da23bf..08543cc2f22 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionOptions.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/ConditionOptions.cs
@@ -1,26 +1,25 @@
 using System;
 using System.Collections.Generic;
 
-namespace OrchardCore.Rules
+namespace OrchardCore.Rules;
+
+public class ConditionOptions
 {
-    public class ConditionOptions
-    {
-        private readonly Dictionary<Type, Type> _evaluators = [];
-        public IReadOnlyDictionary<Type, Type> Evaluators => _evaluators;
+    private readonly Dictionary<Type, Type> _evaluators = [];
+    public IReadOnlyDictionary<Type, Type> Evaluators => _evaluators;
 
-        internal void AddCondition(Type condition, Type conditionEvaluator)
+    internal void AddCondition(Type condition, Type conditionEvaluator)
+    {
+        if (!typeof(Condition).IsAssignableFrom(condition))
         {
-            if (!typeof(Condition).IsAssignableFrom(condition))
-            {
-                throw new ArgumentException("The type must implement " + nameof(Condition));
-            }
-
-            if (!typeof(IConditionEvaluator).IsAssignableFrom(conditionEvaluator))
-            {
-                throw new ArgumentException("The type must implement " + nameof(conditionEvaluator));
-            }
+            throw new ArgumentException("The type must implement " + nameof(Condition));
+        }
 
-            _evaluators[condition] = conditionEvaluator;
+        if (!typeof(IConditionEvaluator).IsAssignableFrom(conditionEvaluator))
+        {
+            throw new ArgumentException("The type must implement " + nameof(conditionEvaluator));
         }
+
+        _evaluators[condition] = conditionEvaluator;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/IConditionFactory.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/IConditionFactory.cs
index ee776bdbb8b..604da53c549 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/IConditionFactory.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/IConditionFactory.cs
@@ -1,20 +1,19 @@
-namespace OrchardCore.Rules
+namespace OrchardCore.Rules;
+
+public interface IConditionFactory
 {
-    public interface IConditionFactory
-    {
-        string Name { get; }
-        Condition Create();
-    }
+    string Name { get; }
+    Condition Create();
+}
 
-    public class ConditionFactory<TCondition> : IConditionFactory where TCondition : Condition, new()
-    {
-        private static readonly string _typeName = typeof(TCondition).Name;
-        public string Name => _typeName;
+public class ConditionFactory<TCondition> : IConditionFactory where TCondition : Condition, new()
+{
+    private static readonly string _typeName = typeof(TCondition).Name;
+    public string Name => _typeName;
 
-        public Condition Create()
-            => new TCondition()
-            {
-                Name = Name,
-            };
-    }
+    public Condition Create()
+        => new TCondition()
+        {
+            Name = Name,
+        };
 }
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/IConditionOperatorFactory.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/IConditionOperatorFactory.cs
index 9fb9c1b7364..253281cca81 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/IConditionOperatorFactory.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/IConditionOperatorFactory.cs
@@ -1,17 +1,16 @@
-namespace OrchardCore.Rules
+namespace OrchardCore.Rules;
+
+public interface IConditionOperatorFactory
 {
-    public interface IConditionOperatorFactory
-    {
-        string Name { get; }
-        ConditionOperator Create();
-    }
+    string Name { get; }
+    ConditionOperator Create();
+}
 
-    public class ConditionOperatorFactory<TConditionOperator> : IConditionOperatorFactory where TConditionOperator : ConditionOperator, new()
-    {
-        private static readonly string _typeName = typeof(TConditionOperator).Name;
-        public string Name => _typeName;
+public class ConditionOperatorFactory<TConditionOperator> : IConditionOperatorFactory where TConditionOperator : ConditionOperator, new()
+{
+    private static readonly string _typeName = typeof(TConditionOperator).Name;
+    public string Name => _typeName;
 
-        public ConditionOperator Create()
-            => new TConditionOperator();
-    }
+    public ConditionOperator Create()
+        => new TConditionOperator();
 }
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/INegateOperator.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/INegateOperator.cs
index 19f06975943..f2b484b0503 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/INegateOperator.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/INegateOperator.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Rules
+namespace OrchardCore.Rules;
+
+public interface INegateOperator
 {
-    public interface INegateOperator
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/IOperatorComparer.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/IOperatorComparer.cs
index 29f21bb8af8..959cdeaa01a 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/IOperatorComparer.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/IOperatorComparer.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Rules
+namespace OrchardCore.Rules;
+
+public interface IOperatorComparer
 {
-    public interface IOperatorComparer
-    {
-        bool Compare(ConditionOperator ruleOperation, object a, object b);
-    }
+    bool Compare(ConditionOperator ruleOperation, object a, object b);
 }
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/OperatorComparer.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/OperatorComparer.cs
index a227b35b8ca..d0addf63596 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/OperatorComparer.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/OperatorComparer.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Rules
+namespace OrchardCore.Rules;
+
+public abstract class OperatorComparer<TConditionOperator, TCompare> : IOperatorComparer where TConditionOperator : ConditionOperator
 {
-    public abstract class OperatorComparer<TConditionOperator, TCompare> : IOperatorComparer where TConditionOperator : ConditionOperator
-    {
-        bool IOperatorComparer.Compare(ConditionOperator conditionOperator, object a, object b)
-            => Compare((TConditionOperator)conditionOperator, (TCompare)a, (TCompare)b);
-        public abstract bool Compare(TConditionOperator conditionOperator, TCompare a, TCompare b);
-    }
+    bool IOperatorComparer.Compare(ConditionOperator conditionOperator, object a, object b)
+        => Compare((TConditionOperator)conditionOperator, (TCompare)a, (TCompare)b);
+    public abstract bool Compare(TConditionOperator conditionOperator, TCompare a, TCompare b);
 }
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/Rule.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/Rule.cs
index b4a8c88c3e2..5af2a758158 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/Rule.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/Rule.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Rules
+namespace OrchardCore.Rules;
+
+public class Rule : ConditionGroup
 {
-    public class Rule : ConditionGroup
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/ServiceCollectionExtensions.cs
index b05cd6fbf54..15fe0881578 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/ServiceCollectionExtensions.cs
@@ -2,54 +2,53 @@
 using System.Text.Json.Serialization;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace OrchardCore.Rules
+namespace OrchardCore.Rules;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    [Obsolete("This method is deprecated and will be removed in future releases. Please use the .AddRule() or .AddRuleCondition() extensions found in OrchardCore.Rule.Core instead.")]
+    public static IServiceCollection AddCondition(this IServiceCollection services, Type condition, Type conditionEvaluator, Type conditionFactory)
     {
-        [Obsolete("This method is deprecated and will be removed in future releases. Please use the .AddRule() or .AddRuleCondition() extensions found in OrchardCore.Rule.Core instead.")]
-        public static IServiceCollection AddCondition(this IServiceCollection services, Type condition, Type conditionEvaluator, Type conditionFactory)
+        services.Configure<ConditionOptions>(o =>
         {
-            services.Configure<ConditionOptions>(o =>
-            {
-                o.AddCondition(condition, conditionEvaluator);
-            });
+            o.AddCondition(condition, conditionEvaluator);
+        });
 
-            // Rules are scoped so that during a request rules like the script rule can build the scripting engine once.
-            services.AddScoped(conditionEvaluator);
+        // Rules are scoped so that during a request rules like the script rule can build the scripting engine once.
+        services.AddScoped(conditionEvaluator);
 
-            var factoryDescriptor = new ServiceDescriptor(typeof(IConditionFactory), conditionFactory, ServiceLifetime.Singleton);
-            services.Add(factoryDescriptor);
+        var factoryDescriptor = new ServiceDescriptor(typeof(IConditionFactory), conditionFactory, ServiceLifetime.Singleton);
+        services.Add(factoryDescriptor);
 
-            return services;
-        }
+        return services;
+    }
 
-        [Obsolete("This method is deprecated and will be removed in future releases. Please use the .AddRule<> or .AddRuleCondition<> extensions found in OrchardCore.Rule.Core instead.")]
-        public static IServiceCollection AddCondition<TCondition, TConditionEvaluator, TConditionFactory>(this IServiceCollection services)
-            where TCondition : Condition
-            where TConditionEvaluator : IConditionEvaluator
-            where TConditionFactory : IConditionFactory
-        {
-            return services.AddCondition(typeof(TCondition), typeof(TConditionEvaluator), typeof(TConditionFactory));
-        }
+    [Obsolete("This method is deprecated and will be removed in future releases. Please use the .AddRule<> or .AddRuleCondition<> extensions found in OrchardCore.Rule.Core instead.")]
+    public static IServiceCollection AddCondition<TCondition, TConditionEvaluator, TConditionFactory>(this IServiceCollection services)
+        where TCondition : Condition
+        where TConditionEvaluator : IConditionEvaluator
+        where TConditionFactory : IConditionFactory
+    {
+        return services.AddCondition(typeof(TCondition), typeof(TConditionEvaluator), typeof(TConditionFactory));
+    }
 
-        public static IServiceCollection AddRuleCondition<TCondition, TConditionEvaluator, TConditionFactory>(this IServiceCollection services)
-            where TCondition : Condition
-            where TConditionEvaluator : class, IConditionEvaluator
-            where TConditionFactory : class, IConditionFactory
+    public static IServiceCollection AddRuleCondition<TCondition, TConditionEvaluator, TConditionFactory>(this IServiceCollection services)
+        where TCondition : Condition
+        where TConditionEvaluator : class, IConditionEvaluator
+        where TConditionFactory : class, IConditionFactory
+    {
+        services.Configure<ConditionOptions>(o =>
         {
-            services.Configure<ConditionOptions>(o =>
-            {
-                o.AddCondition(typeof(TCondition), typeof(TConditionEvaluator));
-            });
+            o.AddCondition(typeof(TCondition), typeof(TConditionEvaluator));
+        });
 
-            // Rules are scoped so that during a request rules like the script rule can build the scripting engine once.
-            services.AddScoped<TConditionEvaluator>();
+        // Rules are scoped so that during a request rules like the script rule can build the scripting engine once.
+        services.AddScoped<TConditionEvaluator>();
 
-            services.AddSingleton<IConditionFactory, TConditionFactory>();
+        services.AddSingleton<IConditionFactory, TConditionFactory>();
 
-            services.AddJsonDerivedTypeInfo<TCondition, Condition>();
+        services.AddJsonDerivedTypeInfo<TCondition, Condition>();
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionIdGenerator.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionIdGenerator.cs
index 3093018557a..882d3e42a01 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionIdGenerator.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionIdGenerator.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Rules.Services
+namespace OrchardCore.Rules.Services;
+
+public interface IConditionIdGenerator
 {
-    public interface IConditionIdGenerator
-    {
-        void GenerateUniqueId(Condition condition);
-    }
+    void GenerateUniqueId(Condition condition);
 }
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionOperatorResolver.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionOperatorResolver.cs
index 32c345771d2..2c476c339e6 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionOperatorResolver.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionOperatorResolver.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Rules.Services
+namespace OrchardCore.Rules.Services;
+
+public interface IConditionOperatorResolver
 {
-    public interface IConditionOperatorResolver
-    {
-        IOperatorComparer GetOperatorComparer(ConditionOperator conditionOperator);
-    }
+    IOperatorComparer GetOperatorComparer(ConditionOperator conditionOperator);
 }
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionResolver.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionResolver.cs
index d8b5a6a1a0e..793cb9f2f09 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionResolver.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IConditionResolver.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Rules.Services
+namespace OrchardCore.Rules.Services;
+
+public interface IConditionResolver
 {
-    public interface IConditionResolver
-    {
-        IConditionEvaluator GetConditionEvaluator(Condition condition);
-    }
+    IConditionEvaluator GetConditionEvaluator(Condition condition);
 }
diff --git a/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IRuleService.cs b/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IRuleService.cs
index 795ee50e3e1..1f6468e9eec 100644
--- a/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IRuleService.cs
+++ b/src/OrchardCore/OrchardCore.Rules.Abstractions/Services/IRuleService.cs
@@ -1,9 +1,8 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Rules.Services
+namespace OrchardCore.Rules.Services;
+
+public interface IRuleService
 {
-    public interface IRuleService
-    {
-        ValueTask<bool> EvaluateAsync(Rule rule);
-    }
+    ValueTask<bool> EvaluateAsync(Rule rule);
 }
diff --git a/src/OrchardCore/OrchardCore.Scripting.JavaScript/JavaScriptEngine.cs b/src/OrchardCore/OrchardCore.Scripting.JavaScript/JavaScriptEngine.cs
index ac74b791461..04510d9daf0 100644
--- a/src/OrchardCore/OrchardCore.Scripting.JavaScript/JavaScriptEngine.cs
+++ b/src/OrchardCore/OrchardCore.Scripting.JavaScript/JavaScriptEngine.cs
@@ -7,69 +7,68 @@
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.Scripting.JavaScript
+namespace OrchardCore.Scripting.JavaScript;
+
+public sealed class JavaScriptEngine : IScriptingEngine
 {
-    public sealed class JavaScriptEngine : IScriptingEngine
-    {
-        private readonly IMemoryCache _memoryCache;
+    private readonly IMemoryCache _memoryCache;
 
-        public JavaScriptEngine(IMemoryCache memoryCache)
-        {
-            _memoryCache = memoryCache;
-        }
+    public JavaScriptEngine(IMemoryCache memoryCache)
+    {
+        _memoryCache = memoryCache;
+    }
 
-        public string Prefix => "js";
+    public string Prefix => "js";
 
-        public IScriptingScope CreateScope(IEnumerable<GlobalMethod> methods, IServiceProvider serviceProvider, IFileProvider fileProvider, string basePath)
+    public IScriptingScope CreateScope(IEnumerable<GlobalMethod> methods, IServiceProvider serviceProvider, IFileProvider fileProvider, string basePath)
+    {
+        var engine = new Engine(options =>
         {
-            var engine = new Engine(options =>
+            options.SetWrapObjectHandler(static (e, target, type) =>
             {
-                options.SetWrapObjectHandler(static (e, target, type) =>
+                if (target is JsonDynamicObject dynamicObject)
                 {
-                    if (target is JsonDynamicObject dynamicObject)
-                    {
-                        return ObjectWrapper.Create(e, (JsonObject)dynamicObject, type);
-                    }
+                    return ObjectWrapper.Create(e, (JsonObject)dynamicObject, type);
+                }
 
-                    if (target is JsonDynamicArray dynamicArray)
-                    {
-                        return ObjectWrapper.Create(e, (JsonArray)dynamicArray, type);
-                    }
+                if (target is JsonDynamicArray dynamicArray)
+                {
+                    return ObjectWrapper.Create(e, (JsonArray)dynamicArray, type);
+                }
 
-                    if (target is JsonDynamicValue dynamicValue)
-                    {
-                        return ObjectWrapper.Create(e, (JsonValue)dynamicValue, type);
-                    }
+                if (target is JsonDynamicValue dynamicValue)
+                {
+                    return ObjectWrapper.Create(e, (JsonValue)dynamicValue, type);
+                }
 
-                    return ObjectWrapper.Create(e, target, type);
-                });
+                return ObjectWrapper.Create(e, target, type);
             });
+        });
 
-            foreach (var method in methods)
-            {
-                engine.SetValue(method.Name, method.Method(serviceProvider));
-            }
-
-            return new JavaScriptScope(engine, serviceProvider);
+        foreach (var method in methods)
+        {
+            engine.SetValue(method.Name, method.Method(serviceProvider));
         }
 
-        public object Evaluate(IScriptingScope scope, string script)
+        return new JavaScriptScope(engine, serviceProvider);
+    }
+
+    public object Evaluate(IScriptingScope scope, string script)
+    {
+        static void ThrowInvalidScopeTypeException()
         {
-            static void ThrowInvalidScopeTypeException()
-            {
-                throw new ArgumentException($"Expected a scope of type {nameof(JavaScriptScope)}", nameof(scope));
-            }
+            throw new ArgumentException($"Expected a scope of type {nameof(JavaScriptScope)}", nameof(scope));
+        }
 
-            if (scope is not JavaScriptScope jsScope)
-            {
-                ThrowInvalidScopeTypeException();
-            }
+        if (scope is not JavaScriptScope jsScope)
+        {
+            ThrowInvalidScopeTypeException();
+        }
 
-            var parsedAst = _memoryCache.GetOrCreate(script, static entry => Engine.PrepareScript((string)entry.Key));
+        var parsedAst = _memoryCache.GetOrCreate(script, static entry => Engine.PrepareScript((string)entry.Key));
 
-            var result = jsScope.Engine.Evaluate(parsedAst).ToObject();
+        var result = jsScope.Engine.Evaluate(parsedAst).ToObject();
 
-            return result;
-        }
+        return result;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Scripting.JavaScript/JavaScriptScope.cs b/src/OrchardCore/OrchardCore.Scripting.JavaScript/JavaScriptScope.cs
index 90862cbd1d7..7fc831b8bc0 100644
--- a/src/OrchardCore/OrchardCore.Scripting.JavaScript/JavaScriptScope.cs
+++ b/src/OrchardCore/OrchardCore.Scripting.JavaScript/JavaScriptScope.cs
@@ -1,18 +1,17 @@
 using System;
 using Jint;
 
-namespace OrchardCore.Scripting.JavaScript
+namespace OrchardCore.Scripting.JavaScript;
+
+public class JavaScriptScope : IScriptingScope
 {
-    public class JavaScriptScope : IScriptingScope
+    public JavaScriptScope(Engine engine, IServiceProvider serviceProvider)
     {
-        public JavaScriptScope(Engine engine, IServiceProvider serviceProvider)
-        {
-            Engine = engine;
-            ServiceProvider = serviceProvider;
-        }
+        Engine = engine;
+        ServiceProvider = serviceProvider;
+    }
 
-        public Engine Engine { get; }
+    public Engine Engine { get; }
 
-        public IServiceProvider ServiceProvider { get; }
-    }
+    public IServiceProvider ServiceProvider { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Scripting.JavaScript/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Scripting.JavaScript/ServiceCollectionExtensions.cs
index 7e09487e9ad..4548bd268e0 100644
--- a/src/OrchardCore/OrchardCore.Scripting.JavaScript/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Scripting.JavaScript/ServiceCollectionExtensions.cs
@@ -1,14 +1,13 @@
 using Microsoft.Extensions.DependencyInjection;
 
-namespace OrchardCore.Scripting.JavaScript
+namespace OrchardCore.Scripting.JavaScript;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    public static IServiceCollection AddJavaScriptEngine(this IServiceCollection services)
     {
-        public static IServiceCollection AddJavaScriptEngine(this IServiceCollection services)
-        {
-            services.AddSingleton<IScriptingEngine, JavaScriptEngine>();
+        services.AddSingleton<IScriptingEngine, JavaScriptEngine>();
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Abstractions/ViewModels/SearchFormViewModel.cs b/src/OrchardCore/OrchardCore.Search.Abstractions/ViewModels/SearchFormViewModel.cs
index 56f042b567b..c929ae1d1b8 100644
--- a/src/OrchardCore/OrchardCore.Search.Abstractions/ViewModels/SearchFormViewModel.cs
+++ b/src/OrchardCore/OrchardCore.Search.Abstractions/ViewModels/SearchFormViewModel.cs
@@ -1,25 +1,24 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Search.ViewModels
+namespace OrchardCore.Search.ViewModels;
+
+public class SearchFormViewModel : ShapeViewModel
 {
-    public class SearchFormViewModel : ShapeViewModel
+    public SearchFormViewModel()
+        : base("Search__Form")
     {
-        public SearchFormViewModel()
-            : base("Search__Form")
-        {
-        }
+    }
 
-        public SearchFormViewModel(string shapeType)
-            : base(shapeType)
-        {
-        }
+    public SearchFormViewModel(string shapeType)
+        : base(shapeType)
+    {
+    }
 
-        public string Terms { get; set; }
+    public string Terms { get; set; }
 
-        public string Index { get; set; }
+    public string Index { get; set; }
 
-        [BindNever]
-        public string Placeholder { get; set; }
-    }
+    [BindNever]
+    public string Placeholder { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Abstractions/ViewModels/SearchIndexViewModel.cs b/src/OrchardCore/OrchardCore.Search.Abstractions/ViewModels/SearchIndexViewModel.cs
index 5c1578ad340..665891a17ce 100644
--- a/src/OrchardCore/OrchardCore.Search.Abstractions/ViewModels/SearchIndexViewModel.cs
+++ b/src/OrchardCore/OrchardCore.Search.Abstractions/ViewModels/SearchIndexViewModel.cs
@@ -3,37 +3,36 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Search.ViewModels
+namespace OrchardCore.Search.ViewModels;
+
+public class SearchIndexViewModel : ShapeViewModel
 {
-    public class SearchIndexViewModel : ShapeViewModel
+    public SearchIndexViewModel()
+        : base("Search__List")
     {
-        public SearchIndexViewModel()
-            : base("Search__List")
-        {
-        }
+    }
 
-        public SearchIndexViewModel(string shapeType)
-            : base(shapeType)
-        {
-        }
+    public SearchIndexViewModel(string shapeType)
+        : base(shapeType)
+    {
+    }
 
-        public string Terms { get; set; }
+    public string Terms { get; set; }
 
-        public string Index { get; set; }
+    public string Index { get; set; }
 
-        [BindNever]
-        public string PageTitle { get; set; }
+    [BindNever]
+    public string PageTitle { get; set; }
 
-        [BindNever]
-        public SearchFormViewModel SearchForm { get; set; }
+    [BindNever]
+    public SearchFormViewModel SearchForm { get; set; }
 
-        [BindNever]
-        public SearchResultsViewModel SearchResults { get; set; }
+    [BindNever]
+    public SearchResultsViewModel SearchResults { get; set; }
 
-        [BindNever]
-        public dynamic Pager { get; set; }
+    [BindNever]
+    public dynamic Pager { get; set; }
 
-        [BindNever]
-        public IEnumerable<ContentItem> ContentItems { get; set; }
-    }
+    [BindNever]
+    public IEnumerable<ContentItem> ContentItems { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Abstractions/ViewModels/SearchResultsViewModel.cs b/src/OrchardCore/OrchardCore.Search.Abstractions/ViewModels/SearchResultsViewModel.cs
index 3c67016640d..2eb2486d37a 100644
--- a/src/OrchardCore/OrchardCore.Search.Abstractions/ViewModels/SearchResultsViewModel.cs
+++ b/src/OrchardCore/OrchardCore.Search.Abstractions/ViewModels/SearchResultsViewModel.cs
@@ -3,23 +3,22 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.DisplayManagement.Views;
 
-namespace OrchardCore.Search.ViewModels
+namespace OrchardCore.Search.ViewModels;
+
+public class SearchResultsViewModel : ShapeViewModel
 {
-    public class SearchResultsViewModel : ShapeViewModel
+    public SearchResultsViewModel()
+        : base("Search__Results")
     {
-        public SearchResultsViewModel()
-            : base("Search__Results")
-        {
-        }
+    }
 
-        public SearchResultsViewModel(string shapeType)
-            : base(shapeType)
-        {
-        }
+    public SearchResultsViewModel(string shapeType)
+        : base(shapeType)
+    {
+    }
 
-        [BindNever]
-        public IEnumerable<ContentItem> ContentItems { get; set; }
+    [BindNever]
+    public IEnumerable<ContentItem> ContentItems { get; set; }
 
-        public string Index { get; set; }
-    }
+    public string Index { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.AzureAI.Core/Handlers/AzureAISearchFieldIndexEventsBase.cs b/src/OrchardCore/OrchardCore.Search.AzureAI.Core/Handlers/AzureAISearchFieldIndexEventsBase.cs
index 63b92ecdc16..8cfacb59c6f 100644
--- a/src/OrchardCore/OrchardCore.Search.AzureAI.Core/Handlers/AzureAISearchFieldIndexEventsBase.cs
+++ b/src/OrchardCore/OrchardCore.Search.AzureAI.Core/Handlers/AzureAISearchFieldIndexEventsBase.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using OrchardCore.Search.AzureAI.Models;
 
 namespace OrchardCore.Search.AzureAI.Handlers;
@@ -7,7 +7,7 @@ public class AzureAISearchFieldIndexEventsBase : IAzureAISearchFieldIndexEvents
 {
     public virtual Task MappingAsync(SearchIndexDefinition context)
         => Task.CompletedTask;
-   
+
     public virtual Task MappedAsync(SearchIndexDefinition context)
         => Task.CompletedTask;
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/ElasticQueryResults.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/ElasticQueryResults.cs
index 81e47ef597e..db232c50734 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/ElasticQueryResults.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/ElasticQueryResults.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 using OrchardCore.Queries;
 
-namespace OrchardCore.Search.Elasticsearch
+namespace OrchardCore.Search.Elasticsearch;
+
+public class ElasticQueryResults : IQueryResults
 {
-    public class ElasticQueryResults : IQueryResults
-    {
-        public IEnumerable<object> Items { get; set; }
-        public long Count { get; set; }
-    }
+    public IEnumerable<object> Items { get; set; }
+    public long Count { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/ElasticTopDocs.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/ElasticTopDocs.cs
index 69805483e1a..3d4b995adc1 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/ElasticTopDocs.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/ElasticTopDocs.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Search.Elasticsearch
+namespace OrchardCore.Search.Elasticsearch;
+
+public class ElasticTopDocs
 {
-    public class ElasticTopDocs
-    {
-        public List<Dictionary<string, object>> TopDocs { get; set; }
-        public List<Dictionary<string, object>> Fields { get; set; }
-        public long Count { get; set; }
-    }
+    public List<Dictionary<string, object>> TopDocs { get; set; }
+    public List<Dictionary<string, object>> Fields { get; set; }
+    public long Count { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/IElasticAnalyzer.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/IElasticAnalyzer.cs
index 12ff2dada46..448b77233c9 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/IElasticAnalyzer.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/IElasticAnalyzer.cs
@@ -1,13 +1,12 @@
 using Nest;
 
-namespace OrchardCore.Search.Elasticsearch
+namespace OrchardCore.Search.Elasticsearch;
+
+/// <summary>
+/// Represents an <see cref="IAnalyzer"/> instance that is available in the system.
+/// </summary>
+public interface IElasticAnalyzer
 {
-    /// <summary>
-    /// Represents an <see cref="IAnalyzer"/> instance that is available in the system.
-    /// </summary>
-    public interface IElasticAnalyzer
-    {
-        string Name { get; }
-        IAnalyzer CreateAnalyzer();
-    }
+    string Name { get; }
+    IAnalyzer CreateAnalyzer();
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/IElasticQueryService.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/IElasticQueryService.cs
index 6b6a8b7e8fb..09adba42e53 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/IElasticQueryService.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/IElasticQueryService.cs
@@ -1,21 +1,20 @@
 using System.Threading.Tasks;
 using OrchardCore.Queries;
 
-namespace OrchardCore.Search.Elasticsearch
+namespace OrchardCore.Search.Elasticsearch;
+
+public interface IElasticQueryService
 {
-    public interface IElasticQueryService
-    {
-        /// <summary>
-        /// <para>Provides a way to execute an OC <see cref="Query"/> in Elasticsearch.</para>
-        /// <para>OC implementation deserializes the <see cref="Query"/> JSON string to an Elasticsearch SearchRequest.</para>
-        /// <para>Also provides a way to return only specific fields:
-        /// <see href="https://www.elastic.co/guide/en/elasticsearch/reference/7.17/search-fields.html#search-fields">The fields option</see>.
-        /// </para>
-        /// <para>Also provides a way to return only specific _source fields:
-        /// <see href="https://www.elastic.co/guide/en/elasticsearch/reference/7.17/search-fields.html#source-filtering">The _source option</see>.
-        /// </para>
-        /// </summary>
-        /// <returns><see cref="ElasticTopDocs"/>.</returns>
-        Task<ElasticTopDocs> SearchAsync(string indexName, string query);
-    }
+    /// <summary>
+    /// <para>Provides a way to execute an OC <see cref="Query"/> in Elasticsearch.</para>
+    /// <para>OC implementation deserializes the <see cref="Query"/> JSON string to an Elasticsearch SearchRequest.</para>
+    /// <para>Also provides a way to return only specific fields:
+    /// <see href="https://www.elastic.co/guide/en/elasticsearch/reference/7.17/search-fields.html#search-fields">The fields option</see>.
+    /// </para>
+    /// <para>Also provides a way to return only specific _source fields:
+    /// <see href="https://www.elastic.co/guide/en/elasticsearch/reference/7.17/search-fields.html#source-filtering">The _source option</see>.
+    /// </para>
+    /// </summary>
+    /// <returns><see cref="ElasticTopDocs"/>.</returns>
+    Task<ElasticTopDocs> SearchAsync(string indexName, string query);
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/IElasticsearchQueryService.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/IElasticsearchQueryService.cs
index 5f4dcf3c936..f5a300f271c 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/IElasticsearchQueryService.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Abstractions/IElasticsearchQueryService.cs
@@ -2,14 +2,13 @@
 using System.Threading.Tasks;
 using Nest;
 
-namespace OrchardCore.Search.Elasticsearch
+namespace OrchardCore.Search.Elasticsearch;
+
+public interface IElasticSearchQueryService
 {
-    public interface IElasticSearchQueryService
-    {
-        /// <summary>
-        /// Provides a way to execute a search request in Elasticsearch based on a <see cref="QueryContainer"/>. 
-        /// </summary>
-        /// <returns><see cref="IList{String}">IList&lt;string&gt;</see>.</returns>
-        Task<IList<string>> ExecuteQueryAsync(string indexName, QueryContainer query, List<ISort> sort, int start = 0, int end = 20);
-    }
+    /// <summary>
+    /// Provides a way to execute a search request in Elasticsearch based on a <see cref="QueryContainer"/>. 
+    /// </summary>
+    /// <returns><see cref="IList{String}">IList&lt;string&gt;</see>.</returns>
+    Task<IList<string>> ExecuteQueryAsync(string indexName, QueryContainer query, List<ISort> sort, int start = 0, int end = 20);
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexDeploymentSource.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexDeploymentSource.cs
index 1f3b28376bf..d9fc6fdc67a 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexDeploymentSource.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexDeploymentSource.cs
@@ -6,48 +6,47 @@
 using OrchardCore.Search.Elasticsearch.Core.Models;
 using OrchardCore.Search.Elasticsearch.Core.Services;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Deployment
+namespace OrchardCore.Search.Elasticsearch.Core.Deployment;
+
+public class ElasticIndexDeploymentSource : IDeploymentSource
 {
-    public class ElasticIndexDeploymentSource : IDeploymentSource
+    private readonly ElasticIndexSettingsService _elasticIndexSettingsService;
+
+    public ElasticIndexDeploymentSource(ElasticIndexSettingsService elasticIndexSettingsService)
     {
-        private readonly ElasticIndexSettingsService _elasticIndexSettingsService;
+        _elasticIndexSettingsService = elasticIndexSettingsService;
+    }
 
-        public ElasticIndexDeploymentSource(ElasticIndexSettingsService elasticIndexSettingsService)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        if (step is not ElasticIndexDeploymentStep elasticIndexStep)
         {
-            _elasticIndexSettingsService = elasticIndexSettingsService;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
-        {
-            if (step is not ElasticIndexDeploymentStep elasticIndexStep)
-            {
-                return;
-            }
+        var indexSettings = await _elasticIndexSettingsService.GetSettingsAsync();
 
-            var indexSettings = await _elasticIndexSettingsService.GetSettingsAsync();
+        var data = new JsonArray();
+        var indicesToAdd = elasticIndexStep.IncludeAll ? indexSettings.Select(x => x.IndexName).ToArray() : elasticIndexStep.IndexNames;
 
-            var data = new JsonArray();
-            var indicesToAdd = elasticIndexStep.IncludeAll ? indexSettings.Select(x => x.IndexName).ToArray() : elasticIndexStep.IndexNames;
-
-            foreach (var index in indexSettings)
+        foreach (var index in indexSettings)
+        {
+            if (indicesToAdd.Contains(index.IndexName))
             {
-                if (indicesToAdd.Contains(index.IndexName))
+                var indexSettingsDict = new Dictionary<string, ElasticIndexSettings>
                 {
-                    var indexSettingsDict = new Dictionary<string, ElasticIndexSettings>
-                    {
-                        { index.IndexName, index },
-                    };
+                    { index.IndexName, index },
+                };
 
-                    data.Add(JObject.FromObject(indexSettingsDict));
-                }
+                data.Add(JObject.FromObject(indexSettingsDict));
             }
-
-            // Adding Elasticsearch settings.
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "ElasticIndexSettings",
-                ["Indices"] = data,
-            });
         }
+
+        // Adding Elasticsearch settings.
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "ElasticIndexSettings",
+            ["Indices"] = data,
+        });
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexDeploymentStep.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexDeploymentStep.cs
index 890be8c89d3..a3d4ae1471a 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexDeploymentStep.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexDeploymentStep.cs
@@ -1,19 +1,18 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Deployment
+namespace OrchardCore.Search.Elasticsearch.Core.Deployment;
+
+/// <summary>
+/// Adds layers to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class ElasticIndexDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds layers to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class ElasticIndexDeploymentStep : DeploymentStep
+    public ElasticIndexDeploymentStep()
     {
-        public ElasticIndexDeploymentStep()
-        {
-            Name = "ElasticIndexSettings";
-        }
+        Name = "ElasticIndexSettings";
+    }
 
-        public bool IncludeAll { get; set; } = true;
+    public bool IncludeAll { get; set; } = true;
 
-        public string[] IndexNames { get; set; }
-    }
+    public string[] IndexNames { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexRebuildDeploymentSource.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexRebuildDeploymentSource.cs
index ef573459423..888ab67a94c 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexRebuildDeploymentSource.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexRebuildDeploymentSource.cs
@@ -2,32 +2,31 @@
 using System.Threading.Tasks;
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Deployment
+namespace OrchardCore.Search.Elasticsearch.Core.Deployment;
+
+public class ElasticIndexRebuildDeploymentSource : IDeploymentSource
 {
-    public class ElasticIndexRebuildDeploymentSource : IDeploymentSource
+    public ElasticIndexRebuildDeploymentSource()
     {
-        public ElasticIndexRebuildDeploymentSource()
-        {
-        }
+    }
 
-        public Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    public Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        var elasticIndexRebuildStep = step as ElasticIndexRebuildDeploymentStep;
+        if (elasticIndexRebuildStep == null)
         {
-            var elasticIndexRebuildStep = step as ElasticIndexRebuildDeploymentStep;
-            if (elasticIndexRebuildStep == null)
-            {
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            var indicesToRebuild = elasticIndexRebuildStep.IncludeAll ? [] : elasticIndexRebuildStep.Indices;
+        var indicesToRebuild = elasticIndexRebuildStep.IncludeAll ? [] : elasticIndexRebuildStep.Indices;
 
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "elastic-index-rebuild",
-                ["includeAll"] = elasticIndexRebuildStep.IncludeAll,
-                ["Indices"] = JArray.FromObject(indicesToRebuild),
-            });
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "elastic-index-rebuild",
+            ["includeAll"] = elasticIndexRebuildStep.IncludeAll,
+            ["Indices"] = JArray.FromObject(indicesToRebuild),
+        });
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexRebuildDeploymentStep.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexRebuildDeploymentStep.cs
index d4941cd2da5..5d5ff3bf12f 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexRebuildDeploymentStep.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexRebuildDeploymentStep.cs
@@ -1,19 +1,18 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Deployment
+namespace OrchardCore.Search.Elasticsearch.Core.Deployment;
+
+/// <summary>
+/// Adds rebuild Elasticsearch index task to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class ElasticIndexRebuildDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds rebuild Elasticsearch index task to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class ElasticIndexRebuildDeploymentStep : DeploymentStep
+    public ElasticIndexRebuildDeploymentStep()
     {
-        public ElasticIndexRebuildDeploymentStep()
-        {
-            Name = "ElasticIndexRebuild";
-        }
+        Name = "ElasticIndexRebuild";
+    }
 
-        public bool IncludeAll { get; set; } = true;
+    public bool IncludeAll { get; set; } = true;
 
-        public string[] Indices { get; set; }
-    }
+    public string[] Indices { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexResetDeploymentSource.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexResetDeploymentSource.cs
index 8df988254e5..d3ff7cfa362 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexResetDeploymentSource.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexResetDeploymentSource.cs
@@ -2,33 +2,32 @@
 using System.Threading.Tasks;
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Deployment
+namespace OrchardCore.Search.Elasticsearch.Core.Deployment;
+
+public class ElasticIndexResetDeploymentSource : IDeploymentSource
 {
-    public class ElasticIndexResetDeploymentSource : IDeploymentSource
+    public ElasticIndexResetDeploymentSource()
     {
-        public ElasticIndexResetDeploymentSource()
-        {
-        }
+    }
 
-        public Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
-        {
-            var elasticIndexResetStep = step as ElasticIndexResetDeploymentStep;
+    public Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        var elasticIndexResetStep = step as ElasticIndexResetDeploymentStep;
 
-            if (elasticIndexResetStep == null)
-            {
-                return Task.CompletedTask;
-            }
+        if (elasticIndexResetStep == null)
+        {
+            return Task.CompletedTask;
+        }
 
-            var indicesToReset = elasticIndexResetStep.IncludeAll ? [] : elasticIndexResetStep.Indices;
+        var indicesToReset = elasticIndexResetStep.IncludeAll ? [] : elasticIndexResetStep.Indices;
 
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "lucene-index-reset",
-                ["includeAll"] = elasticIndexResetStep.IncludeAll,
-                ["Indices"] = JArray.FromObject(indicesToReset),
-            });
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "lucene-index-reset",
+            ["includeAll"] = elasticIndexResetStep.IncludeAll,
+            ["Indices"] = JArray.FromObject(indicesToReset),
+        });
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexResetDeploymentStep.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexResetDeploymentStep.cs
index 71a5ed8daa0..3420d503c80 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexResetDeploymentStep.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticIndexResetDeploymentStep.cs
@@ -1,19 +1,18 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Deployment
+namespace OrchardCore.Search.Elasticsearch.Core.Deployment;
+
+/// <summary>
+/// Adds reset Elasticsearch index task to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class ElasticIndexResetDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds reset Elasticsearch index task to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class ElasticIndexResetDeploymentStep : DeploymentStep
+    public ElasticIndexResetDeploymentStep()
     {
-        public ElasticIndexResetDeploymentStep()
-        {
-            Name = "ElasticIndexReset";
-        }
+        Name = "ElasticIndexReset";
+    }
 
-        public bool IncludeAll { get; set; } = true;
+    public bool IncludeAll { get; set; } = true;
 
-        public string[] Indices { get; set; }
-    }
+    public string[] Indices { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticSettingsDeploymentSource.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticSettingsDeploymentSource.cs
index f0e249f0e99..a3c33b38c26 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticSettingsDeploymentSource.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticSettingsDeploymentSource.cs
@@ -3,32 +3,31 @@
 using OrchardCore.Deployment;
 using OrchardCore.Search.Elasticsearch.Core.Services;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Deployment
+namespace OrchardCore.Search.Elasticsearch.Core.Deployment;
+
+public class ElasticSettingsDeploymentSource : IDeploymentSource
 {
-    public class ElasticSettingsDeploymentSource : IDeploymentSource
+    private readonly ElasticIndexingService _elasticIndexingService;
+
+    public ElasticSettingsDeploymentSource(ElasticIndexingService elasticIndexingService)
     {
-        private readonly ElasticIndexingService _elasticIndexingService;
+        _elasticIndexingService = elasticIndexingService;
+    }
 
-        public ElasticSettingsDeploymentSource(ElasticIndexingService elasticIndexingService)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        if (step is not ElasticSettingsDeploymentStep)
         {
-            _elasticIndexingService = elasticIndexingService;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
-        {
-            if (step is not ElasticSettingsDeploymentStep)
-            {
-                return;
-            }
-
-            var elasticSettings = await _elasticIndexingService.GetElasticSettingsAsync();
+        var elasticSettings = await _elasticIndexingService.GetElasticSettingsAsync();
 
-            // Adding Elasticsearch settings
-            result.Steps.Add(new JsonObject
-            {
-                ["name"] = "Settings",
-                ["ElasticSettings"] = JObject.FromObject(elasticSettings),
-            });
-        }
+        // Adding Elasticsearch settings
+        result.Steps.Add(new JsonObject
+        {
+            ["name"] = "Settings",
+            ["ElasticSettings"] = JObject.FromObject(elasticSettings),
+        });
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticSettingsDeploymentStep.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticSettingsDeploymentStep.cs
index 09af0730df4..8214e7d7b28 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticSettingsDeploymentStep.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Deployment/ElasticSettingsDeploymentStep.cs
@@ -1,15 +1,14 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Deployment
+namespace OrchardCore.Search.Elasticsearch.Core.Deployment;
+
+/// <summary>
+/// Adds layers to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class ElasticSettingsDeploymentStep : DeploymentStep
 {
-    /// <summary>
-    /// Adds layers to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class ElasticSettingsDeploymentStep : DeploymentStep
+    public ElasticSettingsDeploymentStep()
     {
-        public ElasticSettingsDeploymentStep()
-        {
-            Name = "ElasticSettings";
-        }
+        Name = "ElasticSettings";
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Handlers/ElasticIndexingContentHandler.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Handlers/ElasticIndexingContentHandler.cs
index 73988833b3f..de29af893bc 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Handlers/ElasticIndexingContentHandler.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Handlers/ElasticIndexingContentHandler.cs
@@ -15,110 +15,109 @@
 using OrchardCore.Search.Elasticsearch.Core.Models;
 using OrchardCore.Search.Elasticsearch.Core.Services;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Handlers
+namespace OrchardCore.Search.Elasticsearch.Core.Handlers;
+
+public class ElasticIndexingContentHandler(IHttpContextAccessor httpContextAccessor) : ContentHandlerBase
 {
-    public class ElasticIndexingContentHandler(IHttpContextAccessor httpContextAccessor) : ContentHandlerBase
-    {
-        private readonly List<ContentContextBase> _contexts = [];
-        private readonly IHttpContextAccessor _httpContextAccessor = httpContextAccessor;
+    private readonly List<ContentContextBase> _contexts = [];
+    private readonly IHttpContextAccessor _httpContextAccessor = httpContextAccessor;
 
-        public override Task PublishedAsync(PublishContentContext context)
-            => AddContextAsync(context);
+    public override Task PublishedAsync(PublishContentContext context)
+        => AddContextAsync(context);
 
-        public override Task CreatedAsync(CreateContentContext context)
-            => AddContextAsync(context);
+    public override Task CreatedAsync(CreateContentContext context)
+        => AddContextAsync(context);
 
-        public override Task UpdatedAsync(UpdateContentContext context)
-            => AddContextAsync(context);
+    public override Task UpdatedAsync(UpdateContentContext context)
+        => AddContextAsync(context);
 
-        public override Task RemovedAsync(RemoveContentContext context)
-            => AddContextAsync(context);
+    public override Task RemovedAsync(RemoveContentContext context)
+        => AddContextAsync(context);
 
-        public override Task UnpublishedAsync(PublishContentContext context)
-            => AddContextAsync(context);
+    public override Task UnpublishedAsync(PublishContentContext context)
+        => AddContextAsync(context);
 
-        private Task AddContextAsync(ContentContextBase context)
+    private Task AddContextAsync(ContentContextBase context)
+    {
+        // Do not index a preview content item.
+        if (_httpContextAccessor.HttpContext?.Features.Get<ContentPreviewFeature>()?.Previewing == true)
         {
-            // Do not index a preview content item.
-            if (_httpContextAccessor.HttpContext?.Features.Get<ContentPreviewFeature>()?.Previewing == true)
-            {
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            if (context.ContentItem.Id == 0)
-            {
-                // Ignore that case, when Update is called on a content item which has not been created yet.
-                return Task.CompletedTask;
-            }
+        if (context.ContentItem.Id == 0)
+        {
+            // Ignore that case, when Update is called on a content item which has not been created yet.
+            return Task.CompletedTask;
+        }
 
-            if (_contexts.Count == 0)
-            {
-                var contexts = _contexts;
+        if (_contexts.Count == 0)
+        {
+            var contexts = _contexts;
 
-                // Using a local var prevents the lambda from holding a ref on this scoped service.
-                ShellScope.AddDeferredTask(scope => IndexingAsync(scope, contexts));
-            }
+            // Using a local var prevents the lambda from holding a ref on this scoped service.
+            ShellScope.AddDeferredTask(scope => IndexingAsync(scope, contexts));
+        }
 
-            _contexts.Add(context);
+        _contexts.Add(context);
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
+    }
 
-        private static async Task IndexingAsync(ShellScope scope, IEnumerable<ContentContextBase> contexts)
+    private static async Task IndexingAsync(ShellScope scope, IEnumerable<ContentContextBase> contexts)
+    {
+        var services = scope.ServiceProvider;
+        var contentManager = services.GetRequiredService<IContentManager>();
+        var contentItemIndexHandlers = services.GetServices<IContentItemIndexHandler>();
+        var elasticIndexManager = services.GetRequiredService<ElasticIndexManager>();
+        var elasticIndexSettingsService = services.GetRequiredService<ElasticIndexSettingsService>();
+        var logger = services.GetRequiredService<ILogger<ElasticIndexingContentHandler>>();
+
+        // Multiple items may have been updated in the same scope, e.g through a recipe.
+        var contextsGroupById = contexts.GroupBy(c => c.ContentItem.ContentItemId, c => c);
+
+        // Get all contexts for each content item id.
+        foreach (var ContextsById in contextsGroupById)
         {
-            var services = scope.ServiceProvider;
-            var contentManager = services.GetRequiredService<IContentManager>();
-            var contentItemIndexHandlers = services.GetServices<IContentItemIndexHandler>();
-            var elasticIndexManager = services.GetRequiredService<ElasticIndexManager>();
-            var elasticIndexSettingsService = services.GetRequiredService<ElasticIndexSettingsService>();
-            var logger = services.GetRequiredService<ILogger<ElasticIndexingContentHandler>>();
-
-            // Multiple items may have been updated in the same scope, e.g through a recipe.
-            var contextsGroupById = contexts.GroupBy(c => c.ContentItem.ContentItemId, c => c);
-
-            // Get all contexts for each content item id.
-            foreach (var ContextsById in contextsGroupById)
-            {
-                // Only process the last context.
-                var context = ContextsById.Last();
+            // Only process the last context.
+            var context = ContextsById.Last();
+
+            ContentItem published = null, latest = null;
+            bool publishedLoaded = false, latestLoaded = false;
 
-                ContentItem published = null, latest = null;
-                bool publishedLoaded = false, latestLoaded = false;
+            foreach (var indexSettings in await elasticIndexSettingsService.GetSettingsAsync())
+            {
+                var cultureAspect = await contentManager.PopulateAspectAsync<CultureAspect>(context.ContentItem);
+                var culture = cultureAspect.HasCulture ? cultureAspect.Culture.Name : null;
+                var ignoreIndexedCulture = indexSettings.Culture != "any" && culture != indexSettings.Culture;
 
-                foreach (var indexSettings in await elasticIndexSettingsService.GetSettingsAsync())
+                if (indexSettings.IndexedContentTypes.Contains(context.ContentItem.ContentType) && !ignoreIndexedCulture)
                 {
-                    var cultureAspect = await contentManager.PopulateAspectAsync<CultureAspect>(context.ContentItem);
-                    var culture = cultureAspect.HasCulture ? cultureAspect.Culture.Name : null;
-                    var ignoreIndexedCulture = indexSettings.Culture != "any" && culture != indexSettings.Culture;
+                    if (!indexSettings.IndexLatest && !publishedLoaded)
+                    {
+                        publishedLoaded = true;
+                        published = await contentManager.GetAsync(context.ContentItem.ContentItemId, VersionOptions.Published);
+                    }
+
+                    if (indexSettings.IndexLatest && !latestLoaded)
+                    {
+                        latestLoaded = true;
+                        latest = await contentManager.GetAsync(context.ContentItem.ContentItemId, VersionOptions.Latest);
+                    }
 
-                    if (indexSettings.IndexedContentTypes.Contains(context.ContentItem.ContentType) && !ignoreIndexedCulture)
+                    var contentItem = !indexSettings.IndexLatest ? published : latest;
+
+                    if (contentItem == null)
+                    {
+                        await elasticIndexManager.DeleteDocumentsAsync(indexSettings.IndexName, [context.ContentItem.ContentItemId]);
+                    }
+                    else
                     {
-                        if (!indexSettings.IndexLatest && !publishedLoaded)
-                        {
-                            publishedLoaded = true;
-                            published = await contentManager.GetAsync(context.ContentItem.ContentItemId, VersionOptions.Published);
-                        }
-
-                        if (indexSettings.IndexLatest && !latestLoaded)
-                        {
-                            latestLoaded = true;
-                            latest = await contentManager.GetAsync(context.ContentItem.ContentItemId, VersionOptions.Latest);
-                        }
-
-                        var contentItem = !indexSettings.IndexLatest ? published : latest;
-
-                        if (contentItem == null)
-                        {
-                            await elasticIndexManager.DeleteDocumentsAsync(indexSettings.IndexName, [context.ContentItem.ContentItemId]);
-                        }
-                        else
-                        {
-                            var buildIndexContext = new BuildIndexContext(new DocumentIndex(contentItem.ContentItemId, contentItem.ContentItemVersionId), contentItem, [contentItem.ContentType], new ElasticContentIndexSettings());
-                            await contentItemIndexHandlers.InvokeAsync(x => x.BuildIndexAsync(buildIndexContext), logger);
-
-                            await elasticIndexManager.DeleteDocumentsAsync(indexSettings.IndexName, [contentItem.ContentItemId]);
-                            await elasticIndexManager.StoreDocumentsAsync(indexSettings.IndexName, [buildIndexContext.DocumentIndex]);
-                        }
+                        var buildIndexContext = new BuildIndexContext(new DocumentIndex(contentItem.ContentItemId, contentItem.ContentItemVersionId), contentItem, [contentItem.ContentType], new ElasticContentIndexSettings());
+                        await contentItemIndexHandlers.InvokeAsync(x => x.BuildIndexAsync(buildIndexContext), logger);
+
+                        await elasticIndexManager.DeleteDocumentsAsync(indexSettings.IndexName, [contentItem.ContentItemId]);
+                        await elasticIndexManager.StoreDocumentsAsync(indexSettings.IndexName, [buildIndexContext.DocumentIndex]);
                     }
                 }
             }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Mappings/ContainedPartModel.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Mappings/ContainedPartModel.cs
index 147712c03fc..4597b87dee2 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Mappings/ContainedPartModel.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Mappings/ContainedPartModel.cs
@@ -1,13 +1,12 @@
 using Nest;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Mappings
+namespace OrchardCore.Search.Elasticsearch.Core.Mappings;
+
+internal sealed class ContainedPartModel
 {
-    internal sealed class ContainedPartModel
-    {
-        [Keyword(Name = "Ids")]
-        public string Ids { get; set; }
+    [Keyword(Name = "Ids")]
+    public string Ids { get; set; }
 
-        [Number(Name = "Order")]
-        public string Order { get; set; }
-    }
+    [Number(Name = "Order")]
+    public string Order { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Mappings/DisplayTextModel.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Mappings/DisplayTextModel.cs
index 601b2b744ff..0698a83eb57 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Mappings/DisplayTextModel.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Mappings/DisplayTextModel.cs
@@ -1,16 +1,15 @@
 using Nest;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Mappings
+namespace OrchardCore.Search.Elasticsearch.Core.Mappings;
+
+internal sealed class DisplayTextModel
 {
-    internal sealed class DisplayTextModel
-    {
-        [Text(Name = "Analyzed")]
-        public string Analyzed { get; set; }
+    [Text(Name = "Analyzed")]
+    public string Analyzed { get; set; }
 
-        [Keyword(Name = "Normalized")]
-        public string Normalized { get; set; }
+    [Keyword(Name = "Normalized")]
+    public string Normalized { get; set; }
 
-        [Keyword(Name = "keyword")]
-        public string Keyword { get; set; }
-    }
+    [Keyword(Name = "keyword")]
+    public string Keyword { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Models/ContentPickerFieldElasticEditorSettings.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Models/ContentPickerFieldElasticEditorSettings.cs
index a1c06815172..d44190757f5 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Models/ContentPickerFieldElasticEditorSettings.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Models/ContentPickerFieldElasticEditorSettings.cs
@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Models
+namespace OrchardCore.Search.Elasticsearch.Core.Models;
+
+public class ContentPickerFieldElasticEditorSettings
 {
-    public class ContentPickerFieldElasticEditorSettings
-    {
-        public string Index { get; set; }
+    public string Index { get; set; }
 
-        [BindNever]
-        public string[] Indices { get; set; }
-    }
+    [BindNever]
+    public string[] Indices { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Models/ElasticConnectionOptions.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Models/ElasticConnectionOptions.cs
index 4cab12ee9ef..7da703fcffc 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Models/ElasticConnectionOptions.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Models/ElasticConnectionOptions.cs
@@ -1,66 +1,65 @@
 using Nest;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Models
+namespace OrchardCore.Search.Elasticsearch.Core.Models;
+
+public class ElasticConnectionOptions
 {
-    public class ElasticConnectionOptions
-    {
-        /// <summary>
-        /// The server url.
-        /// </summary>
-        public string Url { get; set; }
+    /// <summary>
+    /// The server url.
+    /// </summary>
+    public string Url { get; set; }
 
-        /// <summary>
-        /// The server connection port.
-        /// </summary>
-        public int[] Ports { get; set; }
+    /// <summary>
+    /// The server connection port.
+    /// </summary>
+    public int[] Ports { get; set; }
 
-        /// <summary>
-        /// The server connection type.
-        /// </summary>
-        public string ConnectionType { get; set; }
+    /// <summary>
+    /// The server connection type.
+    /// </summary>
+    public string ConnectionType { get; set; }
 
-        /// <summary>
-        /// The Elasticsearch cloud service CloudId.
-        /// </summary>
-        public string CloudId { get; set; }
+    /// <summary>
+    /// The Elasticsearch cloud service CloudId.
+    /// </summary>
+    public string CloudId { get; set; }
 
-        /// <summary>
-        /// The server Username.
-        /// </summary>
-        public string Username { get; set; }
+    /// <summary>
+    /// The server Username.
+    /// </summary>
+    public string Username { get; set; }
 
-        /// <summary>
-        /// The server Password.
-        /// </summary>
-        public string Password { get; set; }
+    /// <summary>
+    /// The server Password.
+    /// </summary>
+    public string Password { get; set; }
 
-        /// <summary>
-        /// The server Certificate Fingerprint.
-        /// </summary>
-        public string CertificateFingerprint { get; set; }
+    /// <summary>
+    /// The server Certificate Fingerprint.
+    /// </summary>
+    public string CertificateFingerprint { get; set; }
 
-        /// <summary>
-        /// Enables compatibility mode for Elasticsearch 8.x.
-        /// </summary>
-        public bool EnableApiVersioningHeader { get; set; }
+    /// <summary>
+    /// Enables compatibility mode for Elasticsearch 8.x.
+    /// </summary>
+    public bool EnableApiVersioningHeader { get; set; }
 
-        /// <summary>
-        /// Whether the configuration section exists.
-        /// </summary>
-        private bool _fileConfigurationExists { get; set; }
+    /// <summary>
+    /// Whether the configuration section exists.
+    /// </summary>
+    private bool _fileConfigurationExists { get; set; }
 
-        private IConnectionSettingsValues _conntectionSettings;
+    private IConnectionSettingsValues _conntectionSettings;
 
-        public void SetFileConfigurationExists(bool fileConfigurationExists)
-            => _fileConfigurationExists = fileConfigurationExists;
+    public void SetFileConfigurationExists(bool fileConfigurationExists)
+        => _fileConfigurationExists = fileConfigurationExists;
 
-        public bool FileConfigurationExists()
-            => _fileConfigurationExists;
+    public bool FileConfigurationExists()
+        => _fileConfigurationExists;
 
-        public void SetConnectionSettings(IConnectionSettingsValues settings)
-         => _conntectionSettings = settings;
+    public void SetConnectionSettings(IConnectionSettingsValues settings)
+     => _conntectionSettings = settings;
 
-        public IConnectionSettingsValues GetConnectionSettings()
-            => _conntectionSettings;
-    }
+    public IConnectionSettingsValues GetConnectionSettings()
+        => _conntectionSettings;
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Models/ElasticContentIndexSettings.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Models/ElasticContentIndexSettings.cs
index 9f97417f0ff..e34a276c8f8 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Models/ElasticContentIndexSettings.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Models/ElasticContentIndexSettings.cs
@@ -1,19 +1,18 @@
 using OrchardCore.Indexing;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Models
+namespace OrchardCore.Search.Elasticsearch.Core.Models;
+
+/// <summary>
+/// Represents the indexing settings for a content part or a field.
+/// </summary>
+public class ElasticContentIndexSettings : IContentIndexSettings
 {
-    /// <summary>
-    /// Represents the indexing settings for a content part or a field.
-    /// </summary>
-    public class ElasticContentIndexSettings : IContentIndexSettings
-    {
-        public bool Included { get; set; }
+    public bool Included { get; set; }
 
-        public DocumentIndexOptions ToOptions()
-        {
-            var options = DocumentIndexOptions.None;
+    public DocumentIndexOptions ToOptions()
+    {
+        var options = DocumentIndexOptions.None;
 
-            return options;
-        }
+        return options;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Providers/ElasticContentPickerResultProvider.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Providers/ElasticContentPickerResultProvider.cs
index 42310d7ec50..4245cd10c7a 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Providers/ElasticContentPickerResultProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Providers/ElasticContentPickerResultProvider.cs
@@ -9,113 +9,112 @@
 using OrchardCore.Search.Elasticsearch.Core.Models;
 using OrchardCore.Search.Elasticsearch.Core.Services;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Providers
+namespace OrchardCore.Search.Elasticsearch.Core.Providers;
+
+public class ElasticContentPickerResultProvider : IContentPickerResultProvider
 {
-    public class ElasticContentPickerResultProvider : IContentPickerResultProvider
+    private readonly ElasticIndexManager _elasticIndexManager;
+    private readonly string _indexPrefix;
+    private readonly ElasticConnectionOptions _elasticConnectionOptions;
+
+    public ElasticContentPickerResultProvider(
+        ShellSettings shellSettings,
+        IOptions<ElasticConnectionOptions> elasticConnectionOptions,
+        ElasticIndexManager elasticIndexManager)
     {
-        private readonly ElasticIndexManager _elasticIndexManager;
-        private readonly string _indexPrefix;
-        private readonly ElasticConnectionOptions _elasticConnectionOptions;
+        _indexPrefix = shellSettings.Name.ToLowerInvariant() + "_";
+        _elasticConnectionOptions = elasticConnectionOptions.Value;
+        _elasticIndexManager = elasticIndexManager;
+    }
 
-        public ElasticContentPickerResultProvider(
-            ShellSettings shellSettings,
-            IOptions<ElasticConnectionOptions> elasticConnectionOptions,
-            ElasticIndexManager elasticIndexManager)
+    public string Name => "Elasticsearch";
+
+    public async Task<IEnumerable<ContentPickerResult>> Search(ContentPickerSearchContext searchContext)
+    {
+        if (!_elasticConnectionOptions.FileConfigurationExists())
         {
-            _indexPrefix = shellSettings.Name.ToLowerInvariant() + "_";
-            _elasticConnectionOptions = elasticConnectionOptions.Value;
-            _elasticIndexManager = elasticIndexManager;
+            return [];
         }
 
-        public string Name => "Elasticsearch";
-
-        public async Task<IEnumerable<ContentPickerResult>> Search(ContentPickerSearchContext searchContext)
-        {
-            if (!_elasticConnectionOptions.FileConfigurationExists())
-            {
-                return [];
-            }
+        string indexName = null;
 
-            string indexName = null;
+        var fieldSettings = searchContext.PartFieldDefinition?.GetSettings<ContentPickerFieldElasticEditorSettings>();
 
-            var fieldSettings = searchContext.PartFieldDefinition?.GetSettings<ContentPickerFieldElasticEditorSettings>();
+        if (!string.IsNullOrWhiteSpace(fieldSettings?.Index))
+        {
+            indexName = fieldSettings.Index;
+        }
 
-            if (!string.IsNullOrWhiteSpace(fieldSettings?.Index))
-            {
-                indexName = fieldSettings.Index;
-            }
+        if (indexName != null && !await _elasticIndexManager.ExistsAsync(indexName))
+        {
+            return [];
+        }
 
-            if (indexName != null && !await _elasticIndexManager.ExistsAsync(indexName))
-            {
-                return [];
-            }
+        var results = new List<ContentPickerResult>();
 
-            var results = new List<ContentPickerResult>();
+        await _elasticIndexManager.SearchAsync(indexName, async elasticClient =>
+        {
+            ISearchResponse<Dictionary<string, object>> searchResponse = null;
+            var elasticTopDocs = new ElasticTopDocs();
 
-            await _elasticIndexManager.SearchAsync(indexName, async elasticClient =>
+            if (string.IsNullOrWhiteSpace(searchContext.Query))
             {
-                ISearchResponse<Dictionary<string, object>> searchResponse = null;
-                var elasticTopDocs = new ElasticTopDocs();
-
-                if (string.IsNullOrWhiteSpace(searchContext.Query))
-                {
-                    searchResponse = await elasticClient.SearchAsync<Dictionary<string, object>>(s => s
-                        .Index(_indexPrefix + indexName)
-                        .Query(q => q
-                            .Bool(b => b
-                                .Filter(f => f
-                                    .Terms(t => t
-                                        .Field("Content.ContentItem.ContentType")
-                                        .Terms(searchContext.ContentTypes.ToArray())
-                                    )
+                searchResponse = await elasticClient.SearchAsync<Dictionary<string, object>>(s => s
+                    .Index(_indexPrefix + indexName)
+                    .Query(q => q
+                        .Bool(b => b
+                            .Filter(f => f
+                                .Terms(t => t
+                                    .Field("Content.ContentItem.ContentType")
+                                    .Terms(searchContext.ContentTypes.ToArray())
                                 )
                             )
                         )
-                    );
-                }
-                else
-                {
-                    searchResponse = await elasticClient.SearchAsync<Dictionary<string, object>>(s => s
-                        .Index(_indexPrefix + indexName)
-                        .Query(q => q
-                            .Bool(b => b
-                                .Filter(f => f
-                                    .Terms(t => t
-                                        .Field("Content.ContentItem.ContentType")
-                                        .Terms(searchContext.ContentTypes.ToArray())
-                                    )
+                    )
+                );
+            }
+            else
+            {
+                searchResponse = await elasticClient.SearchAsync<Dictionary<string, object>>(s => s
+                    .Index(_indexPrefix + indexName)
+                    .Query(q => q
+                        .Bool(b => b
+                            .Filter(f => f
+                                .Terms(t => t
+                                    .Field("Content.ContentItem.ContentType")
+                                    .Terms(searchContext.ContentTypes.ToArray())
                                 )
-                                .Should(s => s
-                                    .Wildcard(w => w
-                                        .Field("Content.ContentItem.DisplayText.Normalized")
-                                        .Wildcard(searchContext.Query.ToLowerInvariant() + "*")
-                                    )
+                            )
+                            .Should(s => s
+                                .Wildcard(w => w
+                                    .Field("Content.ContentItem.DisplayText.Normalized")
+                                    .Wildcard(searchContext.Query.ToLowerInvariant() + "*")
                                 )
                             )
                         )
-                    );
-                }
+                    )
+                );
+            }
 
-                if (searchResponse.IsValid)
-                {
-                    elasticTopDocs.TopDocs = searchResponse.Documents.ToList();
-                }
+            if (searchResponse.IsValid)
+            {
+                elasticTopDocs.TopDocs = searchResponse.Documents.ToList();
+            }
 
-                if (elasticTopDocs.TopDocs != null)
+            if (elasticTopDocs.TopDocs != null)
+            {
+                foreach (var doc in elasticTopDocs.TopDocs)
                 {
-                    foreach (var doc in elasticTopDocs.TopDocs)
+                    results.Add(new ContentPickerResult
                     {
-                        results.Add(new ContentPickerResult
-                        {
-                            ContentItemId = doc["ContentItemId"].ToString(),
-                            DisplayText = doc["Content.ContentItem.DisplayText.keyword"].ToString(),
-                            HasPublished = doc["Content.ContentItem.Published"].ToString().ToLowerInvariant().Equals("true", StringComparison.Ordinal)
-                        });
-                    }
+                        ContentItemId = doc["ContentItemId"].ToString(),
+                        DisplayText = doc["Content.ContentItem.DisplayText.keyword"].ToString(),
+                        HasPublished = doc["Content.ContentItem.Published"].ToString().ToLowerInvariant().Equals("true", StringComparison.Ordinal)
+                    });
                 }
-            });
+            }
+        });
 
-            return results.OrderBy(x => x.DisplayText);
-        }
+        return results.OrderBy(x => x.DisplayText);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Recipes/ElasticIndexRebuildStep.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Recipes/ElasticIndexRebuildStep.cs
index c66764efd78..a6076212821 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Recipes/ElasticIndexRebuildStep.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Recipes/ElasticIndexRebuildStep.cs
@@ -9,56 +9,55 @@
 using OrchardCore.Search.Elasticsearch.Core.Deployment;
 using OrchardCore.Search.Elasticsearch.Core.Services;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Recipes
+namespace OrchardCore.Search.Elasticsearch.Core.Recipes;
+
+/// <summary>
+/// This recipe step rebuilds an Elasticsearch index.
+/// </summary>
+public sealed class ElasticIndexRebuildStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step rebuilds an Elasticsearch index.
-    /// </summary>
-    public sealed class ElasticIndexRebuildStep : IRecipeStepHandler
+    public async Task ExecuteAsync(RecipeExecutionContext context)
     {
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        if (!string.Equals(context.Name, "elastic-index-rebuild", StringComparison.OrdinalIgnoreCase))
         {
-            if (!string.Equals(context.Name, "elastic-index-rebuild", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
+            return;
+        }
 
-            var model = context.Step.ToObject<ElasticIndexRebuildDeploymentStep>();
+        var model = context.Step.ToObject<ElasticIndexRebuildDeploymentStep>();
 
-            if (model != null && (model.IncludeAll || model.Indices.Length > 0))
+        if (model != null && (model.IncludeAll || model.Indices.Length > 0))
+        {
+            await HttpBackgroundJob.ExecuteAfterEndOfRequestAsync("elastic-index-rebuild", async scope =>
             {
-                await HttpBackgroundJob.ExecuteAfterEndOfRequestAsync("elastic-index-rebuild", async scope =>
-                {
-                    var elasticIndexingService = scope.ServiceProvider.GetService<ElasticIndexingService>();
-                    var elasticIndexSettingsService = scope.ServiceProvider.GetService<ElasticIndexSettingsService>();
-                    var elasticIndexManager = scope.ServiceProvider.GetRequiredService<ElasticIndexManager>();
+                var elasticIndexingService = scope.ServiceProvider.GetService<ElasticIndexingService>();
+                var elasticIndexSettingsService = scope.ServiceProvider.GetService<ElasticIndexSettingsService>();
+                var elasticIndexManager = scope.ServiceProvider.GetRequiredService<ElasticIndexManager>();
 
-                    var indexNames = model.IncludeAll
-                    ? (await elasticIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray()
-                    : model.Indices;
+                var indexNames = model.IncludeAll
+                ? (await elasticIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray()
+                : model.Indices;
 
-                    foreach (var indexName in indexNames)
-                    {
-                        var elasticIndexSettings = await elasticIndexSettingsService.GetSettingsAsync(indexName);
+                foreach (var indexName in indexNames)
+                {
+                    var elasticIndexSettings = await elasticIndexSettingsService.GetSettingsAsync(indexName);
 
-                        if (elasticIndexSettings == null)
-                        {
-                            continue;
-                        }
+                    if (elasticIndexSettings == null)
+                    {
+                        continue;
+                    }
 
-                        if (!await elasticIndexManager.ExistsAsync(indexName))
-                        {
-                            await elasticIndexingService.CreateIndexAsync(elasticIndexSettings);
-                        }
-                        else
-                        {
-                            await elasticIndexingService.RebuildIndexAsync(elasticIndexSettings);
-                        }
+                    if (!await elasticIndexManager.ExistsAsync(indexName))
+                    {
+                        await elasticIndexingService.CreateIndexAsync(elasticIndexSettings);
+                    }
+                    else
+                    {
+                        await elasticIndexingService.RebuildIndexAsync(elasticIndexSettings);
                     }
+                }
 
-                    await elasticIndexingService.ProcessContentItemsAsync(indexNames);
-                });
-            }
+                await elasticIndexingService.ProcessContentItemsAsync(indexNames);
+            });
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Recipes/ElasticIndexResetStep.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Recipes/ElasticIndexResetStep.cs
index ffc79ebde8e..e4d1b93c45c 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Recipes/ElasticIndexResetStep.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Recipes/ElasticIndexResetStep.cs
@@ -9,56 +9,55 @@
 using OrchardCore.Search.Elasticsearch.Core.Deployment;
 using OrchardCore.Search.Elasticsearch.Core.Services;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Recipes
+namespace OrchardCore.Search.Elasticsearch.Core.Recipes;
+
+/// <summary>
+/// This recipe step resets an Elasticsearch index.
+/// </summary>
+public sealed class ElasticIndexResetStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step resets an Elasticsearch index.
-    /// </summary>
-    public sealed class ElasticIndexResetStep : IRecipeStepHandler
+    public async Task ExecuteAsync(RecipeExecutionContext context)
     {
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        if (!string.Equals(context.Name, "elastic-index-reset", StringComparison.OrdinalIgnoreCase))
         {
-            if (!string.Equals(context.Name, "elastic-index-reset", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
+            return;
+        }
 
-            var model = context.Step.ToObject<ElasticIndexResetDeploymentStep>();
+        var model = context.Step.ToObject<ElasticIndexResetDeploymentStep>();
 
-            if (model != null && (model.IncludeAll || model.Indices.Length > 0))
+        if (model != null && (model.IncludeAll || model.Indices.Length > 0))
+        {
+            await HttpBackgroundJob.ExecuteAfterEndOfRequestAsync("elastic-index-reset", async scope =>
             {
-                await HttpBackgroundJob.ExecuteAfterEndOfRequestAsync("elastic-index-reset", async scope =>
-                {
-                    var elasticIndexingService = scope.ServiceProvider.GetService<ElasticIndexingService>();
-                    var elasticIndexSettingsService = scope.ServiceProvider.GetService<ElasticIndexSettingsService>();
-                    var elasticIndexManager = scope.ServiceProvider.GetRequiredService<ElasticIndexManager>();
+                var elasticIndexingService = scope.ServiceProvider.GetService<ElasticIndexingService>();
+                var elasticIndexSettingsService = scope.ServiceProvider.GetService<ElasticIndexSettingsService>();
+                var elasticIndexManager = scope.ServiceProvider.GetRequiredService<ElasticIndexManager>();
 
-                    var indexNames = model.IncludeAll
-                    ? (await elasticIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray()
-                    : model.Indices;
+                var indexNames = model.IncludeAll
+                ? (await elasticIndexSettingsService.GetSettingsAsync()).Select(x => x.IndexName).ToArray()
+                : model.Indices;
 
-                    foreach (var indexName in indexNames)
-                    {
-                        var elasticIndexSettings = await elasticIndexSettingsService.GetSettingsAsync(indexName);
+                foreach (var indexName in indexNames)
+                {
+                    var elasticIndexSettings = await elasticIndexSettingsService.GetSettingsAsync(indexName);
 
-                        if (elasticIndexSettings == null)
-                        {
-                            continue;
-                        }
+                    if (elasticIndexSettings == null)
+                    {
+                        continue;
+                    }
 
-                        if (!await elasticIndexManager.ExistsAsync(indexName))
-                        {
-                            await elasticIndexingService.CreateIndexAsync(elasticIndexSettings);
-                        }
-                        else
-                        {
-                            await elasticIndexingService.ResetIndexAsync(elasticIndexSettings.IndexName);
-                        }
+                    if (!await elasticIndexManager.ExistsAsync(indexName))
+                    {
+                        await elasticIndexingService.CreateIndexAsync(elasticIndexSettings);
+                    }
+                    else
+                    {
+                        await elasticIndexingService.ResetIndexAsync(elasticIndexSettings.IndexName);
                     }
+                }
 
-                    await elasticIndexingService.ProcessContentItemsAsync(indexNames);
-                });
-            }
+                await elasticIndexingService.ProcessContentItemsAsync(indexNames);
+            });
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Recipes/ElasticIndexStep.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Recipes/ElasticIndexStep.cs
index 2cbbb5fc556..ec6c486f29c 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Recipes/ElasticIndexStep.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Recipes/ElasticIndexStep.cs
@@ -8,46 +8,45 @@
 using OrchardCore.Search.Elasticsearch.Core.Models;
 using OrchardCore.Search.Elasticsearch.Core.Services;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Recipes
+namespace OrchardCore.Search.Elasticsearch.Core.Recipes;
+
+/// <summary>
+/// This recipe step creates a Elasticsearch index.
+/// </summary>
+public sealed class ElasticIndexStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step creates a Elasticsearch index.
-    /// </summary>
-    public sealed class ElasticIndexStep : IRecipeStepHandler
+    private readonly ElasticIndexingService _elasticIndexingService;
+    private readonly ElasticIndexManager _elasticIndexManager;
+
+    public ElasticIndexStep(
+        ElasticIndexingService elasticIndexingService,
+        ElasticIndexManager elasticIndexManager
+        )
     {
-        private readonly ElasticIndexingService _elasticIndexingService;
-        private readonly ElasticIndexManager _elasticIndexManager;
+        _elasticIndexManager = elasticIndexManager;
+        _elasticIndexingService = elasticIndexingService;
+    }
 
-        public ElasticIndexStep(
-            ElasticIndexingService elasticIndexingService,
-            ElasticIndexManager elasticIndexManager
-            )
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "ElasticIndexSettings", StringComparison.OrdinalIgnoreCase))
         {
-            _elasticIndexManager = elasticIndexManager;
-            _elasticIndexingService = elasticIndexingService;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
+        if (context.Step["Indices"] is not JsonArray jsonArray)
         {
-            if (!string.Equals(context.Name, "ElasticIndexSettings", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
+            return;
+        }
 
-            if (context.Step["Indices"] is not JsonArray jsonArray)
-            {
-                return;
-            }
+        foreach (var index in jsonArray)
+        {
+            var elasticIndexSettings = index.ToObject<Dictionary<string, ElasticIndexSettings>>().FirstOrDefault();
 
-            foreach (var index in jsonArray)
+            if (!await _elasticIndexManager.ExistsAsync(elasticIndexSettings.Key))
             {
-                var elasticIndexSettings = index.ToObject<Dictionary<string, ElasticIndexSettings>>().FirstOrDefault();
-
-                if (!await _elasticIndexManager.ExistsAsync(elasticIndexSettings.Key))
-                {
-                    elasticIndexSettings.Value.IndexName = elasticIndexSettings.Key;
-                    await _elasticIndexingService.CreateIndexAsync(elasticIndexSettings.Value);
-                }
+                elasticIndexSettings.Value.IndexName = elasticIndexSettings.Key;
+                await _elasticIndexingService.CreateIndexAsync(elasticIndexSettings.Value);
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Recipes/ElasticSettingsStep.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Recipes/ElasticSettingsStep.cs
index 36b3c37ed72..0390a659435 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Recipes/ElasticSettingsStep.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Recipes/ElasticSettingsStep.cs
@@ -4,35 +4,34 @@
 using OrchardCore.Recipes.Services;
 using OrchardCore.Search.Elasticsearch.Core.Services;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Recipes
+namespace OrchardCore.Search.Elasticsearch.Core.Recipes;
+
+/// <summary>
+/// This recipe step is used to sync Elasticsearch and Lucene settings.
+/// </summary>
+public sealed class ElasticSettingsStep : IRecipeStepHandler
 {
-    /// <summary>
-    /// This recipe step is used to sync Elasticsearch and Lucene settings.
-    /// </summary>
-    public sealed class ElasticSettingsStep : IRecipeStepHandler
+    private readonly ElasticIndexingService _elasticIndexingService;
+
+    public ElasticSettingsStep(ElasticIndexingService elasticIndexingService)
     {
-        private readonly ElasticIndexingService _elasticIndexingService;
+        _elasticIndexingService = elasticIndexingService;
+    }
 
-        public ElasticSettingsStep(ElasticIndexingService elasticIndexingService)
+    public async Task ExecuteAsync(RecipeExecutionContext context)
+    {
+        if (!string.Equals(context.Name, "Settings", StringComparison.OrdinalIgnoreCase))
         {
-            _elasticIndexingService = elasticIndexingService;
+            return;
         }
 
-        public async Task ExecuteAsync(RecipeExecutionContext context)
-        {
-            if (!string.Equals(context.Name, "Settings", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
+        var step = context.Step["ElasticSettings"];
 
-            var step = context.Step["ElasticSettings"];
-
-            if (step != null)
+        if (step != null)
+        {
+            if (step["SyncWithLucene"] != null && (bool)step["SyncWithLucene"])
             {
-                if (step["SyncWithLucene"] != null && (bool)step["SyncWithLucene"])
-                {
-                    await _elasticIndexingService.SyncSettings();
-                }
+                await _elasticIndexingService.SyncSettings();
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticAnalyzer.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticAnalyzer.cs
index 0b20c621f64..f2aa2024458 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticAnalyzer.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticAnalyzer.cs
@@ -1,27 +1,26 @@
 using System;
 using Nest;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Services
+namespace OrchardCore.Search.Elasticsearch.Core.Services;
+
+public class ElasticAnalyzer : IElasticAnalyzer
 {
-    public class ElasticAnalyzer : IElasticAnalyzer
-    {
-        private readonly Func<IAnalyzer> _factory;
+    private readonly Func<IAnalyzer> _factory;
 
-        public ElasticAnalyzer(string name, Func<IAnalyzer> factory)
-        {
-            _factory = factory;
-            Name = name;
-        }
+    public ElasticAnalyzer(string name, Func<IAnalyzer> factory)
+    {
+        _factory = factory;
+        Name = name;
+    }
 
-        public ElasticAnalyzer(string name, IAnalyzer instance) : this(name, () => instance)
-        {
-        }
+    public ElasticAnalyzer(string name, IAnalyzer instance) : this(name, () => instance)
+    {
+    }
 
-        public string Name { get; }
+    public string Name { get; }
 
-        public IAnalyzer CreateAnalyzer()
-        {
-            return _factory();
-        }
+    public IAnalyzer CreateAnalyzer()
+    {
+        return _factory();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexInitializerService.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexInitializerService.cs
index 6428cd27c48..948bbda453f 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexInitializerService.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexInitializerService.cs
@@ -10,87 +10,86 @@
 using OrchardCore.Modules;
 using OrchardCore.Search.Elasticsearch.Core.Services;
 
-namespace OrchardCore.Search.Elasticsearch
+namespace OrchardCore.Search.Elasticsearch;
+
+/// <summary>
+/// Provides a way to initialize Elasticsearch index on startup of the application
+/// if the index is not found on the Elasticsearch server.
+/// </summary>
+public class ElasticIndexInitializerService : ModularTenantEvents
 {
-    /// <summary>
-    /// Provides a way to initialize Elasticsearch index on startup of the application
-    /// if the index is not found on the Elasticsearch server.
-    /// </summary>
-    public class ElasticIndexInitializerService : ModularTenantEvents
+    private readonly ShellSettings _shellSettings;
+    private readonly ElasticIndexManager _elasticIndexManager;
+    private readonly ElasticIndexSettingsService _elasticIndexSettingsService;
+    protected readonly IStringLocalizer S;
+    private readonly ILogger _logger;
+
+    public ElasticIndexInitializerService(
+        ShellSettings shellSettings,
+        ElasticIndexManager elasticIndexManager,
+        ElasticIndexSettingsService elasticIndexSettingsService,
+        IStringLocalizer<ElasticIndexInitializerService> localizer,
+        ILogger<ElasticIndexInitializerService> logger)
     {
-        private readonly ShellSettings _shellSettings;
-        private readonly ElasticIndexManager _elasticIndexManager;
-        private readonly ElasticIndexSettingsService _elasticIndexSettingsService;
-        protected readonly IStringLocalizer S;
-        private readonly ILogger _logger;
+        _shellSettings = shellSettings;
+        _elasticIndexManager = elasticIndexManager;
+        _elasticIndexSettingsService = elasticIndexSettingsService;
+        S = localizer;
+        _logger = logger;
+    }
 
-        public ElasticIndexInitializerService(
-            ShellSettings shellSettings,
-            ElasticIndexManager elasticIndexManager,
-            ElasticIndexSettingsService elasticIndexSettingsService,
-            IStringLocalizer<ElasticIndexInitializerService> localizer,
-            ILogger<ElasticIndexInitializerService> logger)
+    public override async Task ActivatedAsync()
+    {
+        if (!_shellSettings.IsRunning())
         {
-            _shellSettings = shellSettings;
-            _elasticIndexManager = elasticIndexManager;
-            _elasticIndexSettingsService = elasticIndexSettingsService;
-            S = localizer;
-            _logger = logger;
+            return;
         }
 
-        public override async Task ActivatedAsync()
+        await HttpBackgroundJob.ExecuteAfterEndOfRequestAsync("elastic-initialize", async scope =>
         {
-            if (!_shellSettings.IsRunning())
-            {
-                return;
-            }
+            var elasticIndexSettingsService = scope.ServiceProvider.GetRequiredService<ElasticIndexSettingsService>();
+            var elasticIndexingService = scope.ServiceProvider.GetRequiredService<ElasticIndexingService>();
+            var indexManager = scope.ServiceProvider.GetRequiredService<ElasticIndexManager>();
 
-            await HttpBackgroundJob.ExecuteAfterEndOfRequestAsync("elastic-initialize", async scope =>
-            {
-                var elasticIndexSettingsService = scope.ServiceProvider.GetRequiredService<ElasticIndexSettingsService>();
-                var elasticIndexingService = scope.ServiceProvider.GetRequiredService<ElasticIndexingService>();
-                var indexManager = scope.ServiceProvider.GetRequiredService<ElasticIndexManager>();
-
-                var elasticIndexSettings = await elasticIndexSettingsService.GetSettingsAsync();
-                var createdIndexes = new List<string>();
+            var elasticIndexSettings = await elasticIndexSettingsService.GetSettingsAsync();
+            var createdIndexes = new List<string>();
 
-                foreach (var settings in elasticIndexSettings)
+            foreach (var settings in elasticIndexSettings)
+            {
+                if (!await indexManager.ExistsAsync(settings.IndexName))
                 {
-                    if (!await indexManager.ExistsAsync(settings.IndexName))
-                    {
-                        await elasticIndexingService.CreateIndexAsync(settings);
-                        createdIndexes.Add(settings.IndexName);
-                    }
+                    await elasticIndexingService.CreateIndexAsync(settings);
+                    createdIndexes.Add(settings.IndexName);
                 }
+            }
 
-                if (createdIndexes.Count > 0)
-                {
-                    await elasticIndexingService.ProcessContentItemsAsync(createdIndexes.ToArray());
-                }
-            });
-        }
+            if (createdIndexes.Count > 0)
+            {
+                await elasticIndexingService.ProcessContentItemsAsync(createdIndexes.ToArray());
+            }
+        });
+    }
 
-        public override async Task RemovingAsync(ShellRemovingContext context)
+    public override async Task RemovingAsync(ShellRemovingContext context)
+    {
+        try
         {
-            try
+            var elasticIndexSettings = await _elasticIndexSettingsService.GetSettingsAsync();
+            foreach (var settings in elasticIndexSettings)
             {
-                var elasticIndexSettings = await _elasticIndexSettingsService.GetSettingsAsync();
-                foreach (var settings in elasticIndexSettings)
+                var result = await _elasticIndexManager.DeleteIndex(settings.IndexName);
+                if (!result)
                 {
-                    var result = await _elasticIndexManager.DeleteIndex(settings.IndexName);
-                    if (!result)
-                    {
-                        _logger.LogError("Failed to remove the Elasticsearch index {IndexName}", settings.IndexName);
-                        context.ErrorMessage = S["Failed to remove the Elasticsearch index '{0}'.", settings.IndexName];
-                    }
+                    _logger.LogError("Failed to remove the Elasticsearch index {IndexName}", settings.IndexName);
+                    context.ErrorMessage = S["Failed to remove the Elasticsearch index '{0}'.", settings.IndexName];
                 }
             }
-            catch (Exception ex) when (!ex.IsFatal())
-            {
-                _logger.LogError(ex, "Failed to remove Elasticsearch indices");
-                context.ErrorMessage = S["Failed to remove Elasticsearch indices."];
-                context.Error = ex;
-            }
+        }
+        catch (Exception ex) when (!ex.IsFatal())
+        {
+            _logger.LogError(ex, "Failed to remove Elasticsearch indices");
+            context.ErrorMessage = S["Failed to remove Elasticsearch indices."];
+            context.Error = ex;
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexManager.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexManager.cs
index 4ada976fa43..9dc12f29602 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexManager.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexManager.cs
@@ -18,614 +18,613 @@
 using OrchardCore.Search.Elasticsearch.Core.Mappings;
 using OrchardCore.Search.Elasticsearch.Core.Models;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Services
+namespace OrchardCore.Search.Elasticsearch.Core.Services;
+
+/// <summary>
+/// Provides methods to manage Elasticsearch indices.
+/// </summary>
+public sealed class ElasticIndexManager
 {
+    private const string _separator = "_";
+
+    private readonly IElasticClient _elasticClient;
+    private readonly ShellSettings _shellSettings;
+    private readonly IClock _clock;
+    private readonly ILogger _logger;
+    private readonly ElasticsearchOptions _elasticsearchOptions;
+    private readonly ConcurrentDictionary<string, DateTime> _timestamps = new(StringComparer.OrdinalIgnoreCase);
+    private readonly string _lastTaskId = "last_task_id";
+    private readonly Dictionary<string, Func<IAnalyzer>> _analyzerGetter = new(StringComparer.OrdinalIgnoreCase)
+    {
+        { "standard", () => new StandardAnalyzer() },
+        { "simple", () => new SimpleAnalyzer() },
+        { "keyword", () => new KeywordAnalyzer() },
+        { "whitespace", () => new WhitespaceAnalyzer() },
+        { "pattern", () => new PatternAnalyzer() },
+        { "language", () => new LanguageAnalyzer() },
+        { "fingerprint", () => new FingerprintAnalyzer() },
+        { "custom", () => new CustomAnalyzer() },
+        { "stop", () => new StopAnalyzer() },
+    };
+    private static readonly List<char> _charsToRemove =
+    [
+        '\\',
+        '/',
+        '*',
+        '\"',
+        '|',
+        '<',
+        '>',
+        '`',
+        '\'',
+        ' ',
+        '#',
+        ':',
+        '.',
+    ];
+
+    private string _indexPrefix;
+
+    public ElasticIndexManager(
+        IElasticClient elasticClient,
+        ShellSettings shellSettings,
+        IOptions<ElasticsearchOptions> elasticsearchOptions,
+        IClock clock,
+        ILogger<ElasticIndexManager> logger
+        )
+    {
+        _elasticClient = elasticClient;
+        _shellSettings = shellSettings;
+        _clock = clock;
+        _logger = logger;
+        _elasticsearchOptions = elasticsearchOptions.Value;
+    }
+
     /// <summary>
-    /// Provides methods to manage Elasticsearch indices.
+    /// <para>Creates an Elasticsearch index with _source mapping.</para>
+    /// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.3/mapping-source-field.html#disable-source-field"/>.</para>
+    /// <para>Specify an analyzer for an index based on the ElasticsearchIndexSettings.
+    /// <see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/specify-analyzer.html#specify-index-time-default-analyzer"/>,
+    /// <see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/analysis-analyzers.html"/>.
+    /// </para>
     /// </summary>
-    public sealed class ElasticIndexManager
+    /// <returns><see cref="bool"/>.</returns>
+    public async Task<bool> CreateIndexAsync(ElasticIndexSettings elasticIndexSettings)
     {
-        private const string _separator = "_";
-
-        private readonly IElasticClient _elasticClient;
-        private readonly ShellSettings _shellSettings;
-        private readonly IClock _clock;
-        private readonly ILogger _logger;
-        private readonly ElasticsearchOptions _elasticsearchOptions;
-        private readonly ConcurrentDictionary<string, DateTime> _timestamps = new(StringComparer.OrdinalIgnoreCase);
-        private readonly string _lastTaskId = "last_task_id";
-        private readonly Dictionary<string, Func<IAnalyzer>> _analyzerGetter = new(StringComparer.OrdinalIgnoreCase)
-        {
-            { "standard", () => new StandardAnalyzer() },
-            { "simple", () => new SimpleAnalyzer() },
-            { "keyword", () => new KeywordAnalyzer() },
-            { "whitespace", () => new WhitespaceAnalyzer() },
-            { "pattern", () => new PatternAnalyzer() },
-            { "language", () => new LanguageAnalyzer() },
-            { "fingerprint", () => new FingerprintAnalyzer() },
-            { "custom", () => new CustomAnalyzer() },
-            { "stop", () => new StopAnalyzer() },
-        };
-        private static readonly List<char> _charsToRemove =
-        [
-            '\\',
-            '/',
-            '*',
-            '\"',
-            '|',
-            '<',
-            '>',
-            '`',
-            '\'',
-            ' ',
-            '#',
-            ':',
-            '.',
-        ];
-
-        private string _indexPrefix;
-
-        public ElasticIndexManager(
-            IElasticClient elasticClient,
-            ShellSettings shellSettings,
-            IOptions<ElasticsearchOptions> elasticsearchOptions,
-            IClock clock,
-            ILogger<ElasticIndexManager> logger
-            )
+        // Get Index name scoped by ShellName
+        if (await ExistsAsync(elasticIndexSettings.IndexName))
         {
-            _elasticClient = elasticClient;
-            _shellSettings = shellSettings;
-            _clock = clock;
-            _logger = logger;
-            _elasticsearchOptions = elasticsearchOptions.Value;
+            return true;
         }
 
-        /// <summary>
-        /// <para>Creates an Elasticsearch index with _source mapping.</para>
-        /// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.3/mapping-source-field.html#disable-source-field"/>.</para>
-        /// <para>Specify an analyzer for an index based on the ElasticsearchIndexSettings.
-        /// <see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/specify-analyzer.html#specify-index-time-default-analyzer"/>,
-        /// <see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/analysis-analyzers.html"/>.
-        /// </para>
-        /// </summary>
-        /// <returns><see cref="bool"/>.</returns>
-        public async Task<bool> CreateIndexAsync(ElasticIndexSettings elasticIndexSettings)
-        {
-            // Get Index name scoped by ShellName
-            if (await ExistsAsync(elasticIndexSettings.IndexName))
-            {
-                return true;
-            }
-
-            var analysisDescriptor = new AnalysisDescriptor();
-            var analyzersDescriptor = new AnalyzersDescriptor();
-            var indexSettingsDescriptor = new IndexSettingsDescriptor();
+        var analysisDescriptor = new AnalysisDescriptor();
+        var analyzersDescriptor = new AnalyzersDescriptor();
+        var indexSettingsDescriptor = new IndexSettingsDescriptor();
 
-            // The name "standardanalyzer" is a legacy used prior OC 1.6 release. It can be removed in future releases.
-            var analyzerName = (elasticIndexSettings.AnalyzerName == "standardanalyzer" ? null : elasticIndexSettings.AnalyzerName) ?? "standard";
+        // The name "standardanalyzer" is a legacy used prior OC 1.6 release. It can be removed in future releases.
+        var analyzerName = (elasticIndexSettings.AnalyzerName == "standardanalyzer" ? null : elasticIndexSettings.AnalyzerName) ?? "standard";
 
-            if (_elasticsearchOptions.Analyzers.TryGetValue(analyzerName, out var analyzerProperties))
-            {
-                var analyzer = CreateAnalyzer(analyzerProperties);
-                analysisDescriptor.Analyzers(a => a.UserDefined(analyzerName, analyzer));
+        if (_elasticsearchOptions.Analyzers.TryGetValue(analyzerName, out var analyzerProperties))
+        {
+            var analyzer = CreateAnalyzer(analyzerProperties);
+            analysisDescriptor.Analyzers(a => a.UserDefined(analyzerName, analyzer));
 
-                indexSettingsDescriptor = new IndexSettingsDescriptor();
-                indexSettingsDescriptor.Analysis(an => analysisDescriptor);
-            }
+            indexSettingsDescriptor = new IndexSettingsDescriptor();
+            indexSettingsDescriptor.Analysis(an => analysisDescriptor);
+        }
 
-            // Custom metadata to store the last indexing task id.
-            var IndexingState = new FluentDictionary<string, object>() {
-                    { _lastTaskId, 0 }
-                };
-            var fullIndexName = GetFullIndexName(elasticIndexSettings.IndexName);
-            var createIndexDescriptor = new CreateIndexDescriptor(fullIndexName)
-                .Settings(s => indexSettingsDescriptor)
-                .Map(m => m
-                    .SourceField(s => s
-                        .Enabled(elasticIndexSettings.StoreSourceData)
-                        .Excludes([IndexingConstants.DisplayTextAnalyzedKey]))
-                    .Meta(me => IndexingState));
-
-            var response = await _elasticClient.Indices.CreateAsync(createIndexDescriptor);
-
-            // We force some mappings for common fields.
-            await _elasticClient.MapAsync<string>(p => p
-                .Index(fullIndexName)
-                .Properties(p => p
-                    .Keyword(obj => obj
-                        .Name(IndexingConstants.ContentItemIdKey)
-                    )
-                    .Keyword(obj => obj
-                        .Name(IndexingConstants.ContentItemVersionIdKey)
-                    )
-                    .Keyword(obj => obj
-                        .Name(IndexingConstants.OwnerKey)
-                    )
-                    .Text(obj => obj
-                        .Name(IndexingConstants.FullTextKey)
-                    )
-                ));
-
-            // ContainedPart mappings.
-            await _elasticClient.MapAsync<ContainedPartModel>(p => p
-                .Index(fullIndexName)
-                .Properties(p => p
-                    .Object<ContainedPartModel>(obj => obj
-                        .Name(IndexingConstants.ContainedPartKey)
-                        .AutoMap()
-                    )
-                ));
-
-            // We map DisplayText here because we have 3 different fields with it.
-            // We can't have Content.ContentItem.DisplayText as it is mapped as an Object in Elasticsearch.
-            await _elasticClient.MapAsync<DisplayTextModel>(p => p
-                .Index(fullIndexName)
-                .Properties(p => p
-                    .Object<DisplayTextModel>(obj => obj
-                        .Name(IndexingConstants.DisplayTextKey)
-                        .AutoMap()
-                    )
-                ));
-
-            // We map ContentType as a keyword because else the automatic mapping will break the queries.
-            // We need to access it with Content.ContentItem.ContentType as a keyword
-            // for the ContentPickerResultProvider(s).
-            await _elasticClient.MapAsync<string>(p => p
-                .Index(fullIndexName)
-                .Properties(p => p
-                    .Keyword(obj => obj
-                        .Name(IndexingConstants.ContentTypeKey)
-                    )
-                ));
-
-            // DynamicTemplates mapping for Taxonomy indexing mostly.
-            await _elasticClient.MapAsync<string>(p => p
-                .Index(fullIndexName)
-                .DynamicTemplates(d => d
-                    .DynamicTemplate("*.Inherited", dyn => dyn
-                        .MatchMappingType("string")
-                        .PathMatch("*" + IndexingConstants.InheritedKey)
-                        .Mapping(m => m
-                            .Keyword(k => k))
-                    )
-                    .DynamicTemplate("*.Ids", dyn => dyn
-                        .MatchMappingType("string")
-                        .PathMatch("*" + IndexingConstants.IdsKey)
-                        .Mapping(m => m
-                            .Keyword(k => k))
-                        )
+        // Custom metadata to store the last indexing task id.
+        var IndexingState = new FluentDictionary<string, object>() {
+                { _lastTaskId, 0 }
+            };
+        var fullIndexName = GetFullIndexName(elasticIndexSettings.IndexName);
+        var createIndexDescriptor = new CreateIndexDescriptor(fullIndexName)
+            .Settings(s => indexSettingsDescriptor)
+            .Map(m => m
+                .SourceField(s => s
+                    .Enabled(elasticIndexSettings.StoreSourceData)
+                    .Excludes([IndexingConstants.DisplayTextAnalyzedKey]))
+                .Meta(me => IndexingState));
+
+        var response = await _elasticClient.Indices.CreateAsync(createIndexDescriptor);
+
+        // We force some mappings for common fields.
+        await _elasticClient.MapAsync<string>(p => p
+            .Index(fullIndexName)
+            .Properties(p => p
+                .Keyword(obj => obj
+                    .Name(IndexingConstants.ContentItemIdKey)
+                )
+                .Keyword(obj => obj
+                    .Name(IndexingConstants.ContentItemVersionIdKey)
+                )
+                .Keyword(obj => obj
+                    .Name(IndexingConstants.OwnerKey)
+                )
+                .Text(obj => obj
+                    .Name(IndexingConstants.FullTextKey)
+                )
+            ));
+
+        // ContainedPart mappings.
+        await _elasticClient.MapAsync<ContainedPartModel>(p => p
+            .Index(fullIndexName)
+            .Properties(p => p
+                .Object<ContainedPartModel>(obj => obj
+                    .Name(IndexingConstants.ContainedPartKey)
+                    .AutoMap()
+                )
+            ));
+
+        // We map DisplayText here because we have 3 different fields with it.
+        // We can't have Content.ContentItem.DisplayText as it is mapped as an Object in Elasticsearch.
+        await _elasticClient.MapAsync<DisplayTextModel>(p => p
+            .Index(fullIndexName)
+            .Properties(p => p
+                .Object<DisplayTextModel>(obj => obj
+                    .Name(IndexingConstants.DisplayTextKey)
+                    .AutoMap()
+                )
+            ));
+
+        // We map ContentType as a keyword because else the automatic mapping will break the queries.
+        // We need to access it with Content.ContentItem.ContentType as a keyword
+        // for the ContentPickerResultProvider(s).
+        await _elasticClient.MapAsync<string>(p => p
+            .Index(fullIndexName)
+            .Properties(p => p
+                .Keyword(obj => obj
+                    .Name(IndexingConstants.ContentTypeKey)
+                )
+            ));
+
+        // DynamicTemplates mapping for Taxonomy indexing mostly.
+        await _elasticClient.MapAsync<string>(p => p
+            .Index(fullIndexName)
+            .DynamicTemplates(d => d
+                .DynamicTemplate("*.Inherited", dyn => dyn
+                    .MatchMappingType("string")
+                    .PathMatch("*" + IndexingConstants.InheritedKey)
+                    .Mapping(m => m
+                        .Keyword(k => k))
+                )
+                .DynamicTemplate("*.Ids", dyn => dyn
+                    .MatchMappingType("string")
+                    .PathMatch("*" + IndexingConstants.IdsKey)
+                    .Mapping(m => m
+                        .Keyword(k => k))
                     )
-                );
+                )
+            );
 
-            return response.Acknowledged;
-        }
+        return response.Acknowledged;
+    }
 
-        private IAnalyzer CreateAnalyzer(JsonObject analyzerProperties)
-        {
-            IAnalyzer analyzer = null;
+    private IAnalyzer CreateAnalyzer(JsonObject analyzerProperties)
+    {
+        IAnalyzer analyzer = null;
 
-            if (analyzerProperties.TryGetPropertyValue("type", out var typeObject)
-                && _analyzerGetter.TryGetValue(typeObject.ToString(), out var getter))
-            {
-                analyzer = getter.Invoke();
+        if (analyzerProperties.TryGetPropertyValue("type", out var typeObject)
+            && _analyzerGetter.TryGetValue(typeObject.ToString(), out var getter))
+        {
+            analyzer = getter.Invoke();
 
-                var properties = analyzer.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
+            var properties = analyzer.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
 
-                foreach (var analyzerProperty in analyzerProperties)
+            foreach (var analyzerProperty in analyzerProperties)
+            {
+                if (analyzerProperty.Value == null || string.Equals(analyzerProperty.Key, "type", StringComparison.OrdinalIgnoreCase))
                 {
-                    if (analyzerProperty.Value == null || string.Equals(analyzerProperty.Key, "type", StringComparison.OrdinalIgnoreCase))
-                    {
-                        continue;
-                    }
+                    continue;
+                }
 
-                    var key = analyzerProperty.Key.Replace(_separator, string.Empty);
+                var key = analyzerProperty.Key.Replace(_separator, string.Empty);
 
-                    var property = properties.FirstOrDefault(p => p.Name.Equals(key, StringComparison.OrdinalIgnoreCase));
+                var property = properties.FirstOrDefault(p => p.Name.Equals(key, StringComparison.OrdinalIgnoreCase));
 
-                    if (property == null)
-                    {
-                        continue;
-                    }
+                if (property == null)
+                {
+                    continue;
+                }
 
-                    try
+                try
+                {
+                    if (property.PropertyType == typeof(StopWords))
                     {
-                        if (property.PropertyType == typeof(StopWords))
+                        if (analyzerProperty.Value is JsonArray)
                         {
-                            if (analyzerProperty.Value is JsonArray)
-                            {
-                                var values = analyzerProperty.Value.Values<string>().ToArray();
+                            var values = analyzerProperty.Value.Values<string>().ToArray();
 
-                                property.SetValue(analyzer, new StopWords(values));
-                            }
-
-                            continue;
+                            property.SetValue(analyzer, new StopWords(values));
                         }
 
-                        if (analyzerProperty.Value is JsonArray jsonArray)
-                        {
-                            var values = jsonArray.Values<string>().ToArray();
+                        continue;
+                    }
 
-                            property.SetValue(analyzer, values);
-                        }
-                        else
-                        {
-                            var value = JNode.ToObject(analyzerProperty.Value, property.PropertyType);
+                    if (analyzerProperty.Value is JsonArray jsonArray)
+                    {
+                        var values = jsonArray.Values<string>().ToArray();
 
-                            property.SetValue(analyzer, value);
-                        }
+                        property.SetValue(analyzer, values);
                     }
-                    catch { }
-                }
-            }
+                    else
+                    {
+                        var value = JNode.ToObject(analyzerProperty.Value, property.PropertyType);
 
-            if (analyzer == null)
-            {
-                if (_analyzerGetter.TryGetValue(ElasticsearchConstants.DefaultAnalyzer, out getter))
-                {
-                    analyzer = getter.Invoke();
-                }
-                else
-                {
-                    analyzer = _analyzerGetter.First().Value.Invoke();
+                        property.SetValue(analyzer, value);
+                    }
                 }
+                catch { }
             }
-
-            return analyzer;
         }
 
-        public async Task<string> GetIndexMappings(string indexName)
+        if (analyzer == null)
         {
-            var response = await _elasticClient.LowLevel.Indices.GetMappingAsync<StringResponse>(GetFullIndexName(indexName));
-
-            return response.Body;
+            if (_analyzerGetter.TryGetValue(ElasticsearchConstants.DefaultAnalyzer, out getter))
+            {
+                analyzer = getter.Invoke();
+            }
+            else
+            {
+                analyzer = _analyzerGetter.First().Value.Invoke();
+            }
         }
 
-        /// <summary>
-        /// Store a last_task_id in the Elasticsearch index _meta mappings.
-        /// This allows storing the last indexing task id executed on the Elasticsearch index.
-        /// <see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-meta-field.html"/>.
-        /// </summary>
-        public async Task SetLastTaskId(string indexName, long lastTaskId)
-        {
-            var IndexingState = new FluentDictionary<string, object>() {
-                { _lastTaskId, lastTaskId }
-            };
+        return analyzer;
+    }
 
-            var putMappingRequest = new PutMappingRequest(GetFullIndexName(indexName))
-            {
-                Meta = IndexingState
-            };
+    public async Task<string> GetIndexMappings(string indexName)
+    {
+        var response = await _elasticClient.LowLevel.Indices.GetMappingAsync<StringResponse>(GetFullIndexName(indexName));
 
-            await _elasticClient.Indices.PutMappingAsync(putMappingRequest);
-        }
+        return response.Body;
+    }
 
-        /// <summary>
-        /// Get a last_task_id in the Elasticsearch index _meta mappings.
-        /// This allows retrieving the last indexing task id executed on the index.
-        /// </summary>
-        public async Task<long> GetLastTaskId(string indexName)
-        {
-            var jsonDocument = JsonDocument.Parse(await GetIndexMappings(indexName));
-            jsonDocument.RootElement.TryGetProperty(GetFullIndexName(indexName), out var jsonElement);
-            jsonElement.TryGetProperty("mappings", out var mappings);
-            mappings.TryGetProperty("_meta", out var meta);
-            meta.TryGetProperty(_lastTaskId, out var lastTaskId);
-            lastTaskId.TryGetInt64(out var longValue);
-
-            return longValue;
-        }
+    /// <summary>
+    /// Store a last_task_id in the Elasticsearch index _meta mappings.
+    /// This allows storing the last indexing task id executed on the Elasticsearch index.
+    /// <see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-meta-field.html"/>.
+    /// </summary>
+    public async Task SetLastTaskId(string indexName, long lastTaskId)
+    {
+        var IndexingState = new FluentDictionary<string, object>() {
+            { _lastTaskId, lastTaskId }
+        };
 
-        public async Task<bool> DeleteDocumentsAsync(string indexName, IEnumerable<string> contentItemIds)
+        var putMappingRequest = new PutMappingRequest(GetFullIndexName(indexName))
         {
-            var success = true;
+            Meta = IndexingState
+        };
 
-            if (contentItemIds.Any())
-            {
-                var descriptor = new BulkDescriptor();
+        await _elasticClient.Indices.PutMappingAsync(putMappingRequest);
+    }
 
-                foreach (var id in contentItemIds)
-                    descriptor.Delete<Dictionary<string, object>>(d => d
-                        .Index(GetFullIndexName(indexName))
-                        .Id(id)
-                    );
+    /// <summary>
+    /// Get a last_task_id in the Elasticsearch index _meta mappings.
+    /// This allows retrieving the last indexing task id executed on the index.
+    /// </summary>
+    public async Task<long> GetLastTaskId(string indexName)
+    {
+        var jsonDocument = JsonDocument.Parse(await GetIndexMappings(indexName));
+        jsonDocument.RootElement.TryGetProperty(GetFullIndexName(indexName), out var jsonElement);
+        jsonElement.TryGetProperty("mappings", out var mappings);
+        mappings.TryGetProperty("_meta", out var meta);
+        meta.TryGetProperty(_lastTaskId, out var lastTaskId);
+        lastTaskId.TryGetInt64(out var longValue);
+
+        return longValue;
+    }
 
-                var response = await _elasticClient.BulkAsync(descriptor);
+    public async Task<bool> DeleteDocumentsAsync(string indexName, IEnumerable<string> contentItemIds)
+    {
+        var success = true;
 
-                if (response.Errors)
-                {
-                    _logger.LogWarning("There were issues deleting documents from Elasticsearch. {result.OriginalException}", response.OriginalException);
-                }
+        if (contentItemIds.Any())
+        {
+            var descriptor = new BulkDescriptor();
 
-                success = response.IsValid;
+            foreach (var id in contentItemIds)
+                descriptor.Delete<Dictionary<string, object>>(d => d
+                    .Index(GetFullIndexName(indexName))
+                    .Id(id)
+                );
+
+            var response = await _elasticClient.BulkAsync(descriptor);
+
+            if (response.Errors)
+            {
+                _logger.LogWarning("There were issues deleting documents from Elasticsearch. {result.OriginalException}", response.OriginalException);
             }
 
-            return success;
+            success = response.IsValid;
         }
 
-        /// <summary>
-        /// Deletes all documents in an index in one request.
-        /// <see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete-by-query.html"/>.
-        /// </summary>
-        public async Task<bool> DeleteAllDocumentsAsync(string indexName)
-        {
-            var response = await _elasticClient.DeleteByQueryAsync<Dictionary<string, object>>(del => del
-                .Index(GetFullIndexName(indexName))
-                .Query(q => q.MatchAll())
-            );
+        return success;
+    }
 
-            return response.IsValid;
-        }
+    /// <summary>
+    /// Deletes all documents in an index in one request.
+    /// <see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete-by-query.html"/>.
+    /// </summary>
+    public async Task<bool> DeleteAllDocumentsAsync(string indexName)
+    {
+        var response = await _elasticClient.DeleteByQueryAsync<Dictionary<string, object>>(del => del
+            .Index(GetFullIndexName(indexName))
+            .Query(q => q.MatchAll())
+        );
 
-        public async Task<bool> DeleteIndex(string indexName)
-        {
-            if (await ExistsAsync(indexName))
-            {
-                var result = await _elasticClient.Indices.DeleteAsync(GetFullIndexName(indexName));
+        return response.IsValid;
+    }
 
-                return result.Acknowledged;
-            }
+    public async Task<bool> DeleteIndex(string indexName)
+    {
+        if (await ExistsAsync(indexName))
+        {
+            var result = await _elasticClient.Indices.DeleteAsync(GetFullIndexName(indexName));
 
-            return true;
+            return result.Acknowledged;
         }
 
-        /// <summary>
-        /// Verify if an index exists for the current tenant.
-        /// </summary>
-        public async Task<bool> ExistsAsync(string indexName)
+        return true;
+    }
+
+    /// <summary>
+    /// Verify if an index exists for the current tenant.
+    /// </summary>
+    public async Task<bool> ExistsAsync(string indexName)
+    {
+        if (string.IsNullOrWhiteSpace(indexName))
         {
-            if (string.IsNullOrWhiteSpace(indexName))
-            {
-                return false;
-            }
+            return false;
+        }
 
-            var existResponse = await _elasticClient.Indices.ExistsAsync(GetFullIndexName(indexName));
+        var existResponse = await _elasticClient.Indices.ExistsAsync(GetFullIndexName(indexName));
 
-            return existResponse.Exists;
-        }
+        return existResponse.Exists;
+    }
 
-        /// <summary>
-        /// Makes sure that the index names are compliant with Elasticsearch specifications.
-        /// <see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-create-index.html#indices-create-api-path-params"/>.
-        /// </summary>
-        public static string ToSafeIndexName(string indexName)
+    /// <summary>
+    /// Makes sure that the index names are compliant with Elasticsearch specifications.
+    /// <see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-create-index.html#indices-create-api-path-params"/>.
+    /// </summary>
+    public static string ToSafeIndexName(string indexName)
+    {
+        indexName = indexName.ToLowerInvariant();
+
+        if (indexName[0] == '-' || indexName[0] == '_' || indexName[0] == '+' || indexName[0] == '.')
         {
-            indexName = indexName.ToLowerInvariant();
+            indexName = indexName.Remove(0, 1);
+        }
 
-            if (indexName[0] == '-' || indexName[0] == '_' || indexName[0] == '+' || indexName[0] == '.')
-            {
-                indexName = indexName.Remove(0, 1);
-            }
+        _charsToRemove.ForEach(c => indexName = indexName.Replace(c.ToString(), string.Empty));
 
-            _charsToRemove.ForEach(c => indexName = indexName.Replace(c.ToString(), string.Empty));
+        return indexName;
+    }
 
-            return indexName;
+    public async Task StoreDocumentsAsync(string indexName, IEnumerable<DocumentIndex> indexDocuments)
+    {
+        var documents = new List<Dictionary<string, object>>();
+
+        foreach (var indexDocument in indexDocuments)
+        {
+            documents.Add(CreateElasticDocument(indexDocument));
         }
 
-        public async Task StoreDocumentsAsync(string indexName, IEnumerable<DocumentIndex> indexDocuments)
+        if (documents.Count > 0)
         {
-            var documents = new List<Dictionary<string, object>>();
+            var descriptor = new BulkDescriptor();
 
-            foreach (var indexDocument in indexDocuments)
+            foreach (var document in documents)
             {
-                documents.Add(CreateElasticDocument(indexDocument));
+                descriptor.Index<Dictionary<string, object>>(op => op
+                    .Id(document.GetValueOrDefault("ContentItemId").ToString())
+                    .Document(document)
+                    .Index(GetFullIndexName(indexName))
+                );
             }
 
-            if (documents.Count > 0)
-            {
-                var descriptor = new BulkDescriptor();
-
-                foreach (var document in documents)
-                {
-                    descriptor.Index<Dictionary<string, object>>(op => op
-                        .Id(document.GetValueOrDefault("ContentItemId").ToString())
-                        .Document(document)
-                        .Index(GetFullIndexName(indexName))
-                    );
-                }
-
-                var result = await _elasticClient.BulkAsync(d => descriptor);
+            var result = await _elasticClient.BulkAsync(d => descriptor);
 
-                if (result.Errors)
-                {
-                    _logger.LogWarning("There were issues reported indexing the documents. {result.ServerError}", result.ServerError);
-                }
+            if (result.Errors)
+            {
+                _logger.LogWarning("There were issues reported indexing the documents. {result.ServerError}", result.ServerError);
             }
         }
+    }
 
-        /// <summary>
-        /// Returns results from a search made with a NEST QueryContainer query.
-        /// </summary>
-        /// <param name="indexName"></param>
-        /// <param name="query"></param>
-        /// <param name="sort"></param>
-        /// <param name="from"></param>
-        /// <param name="size"></param>
-        /// <returns><see cref="ElasticTopDocs"/>.</returns>
-        public async Task<ElasticTopDocs> SearchAsync(string indexName, QueryContainer query, List<ISort> sort, int from, int size)
+    /// <summary>
+    /// Returns results from a search made with a NEST QueryContainer query.
+    /// </summary>
+    /// <param name="indexName"></param>
+    /// <param name="query"></param>
+    /// <param name="sort"></param>
+    /// <param name="from"></param>
+    /// <param name="size"></param>
+    /// <returns><see cref="ElasticTopDocs"/>.</returns>
+    public async Task<ElasticTopDocs> SearchAsync(string indexName, QueryContainer query, List<ISort> sort, int from, int size)
+    {
+        var elasticTopDocs = new ElasticTopDocs();
+
+        if (await ExistsAsync(indexName))
         {
-            var elasticTopDocs = new ElasticTopDocs();
+            var fullIndexName = GetFullIndexName(indexName);
 
-            if (await ExistsAsync(indexName))
+            var searchRequest = new SearchRequest(fullIndexName)
             {
-                var fullIndexName = GetFullIndexName(indexName);
+                Query = query,
+                From = from,
+                Size = size,
+                Sort = sort
+            };
 
-                var searchRequest = new SearchRequest(fullIndexName)
-                {
-                    Query = query,
-                    From = from,
-                    Size = size,
-                    Sort = sort
-                };
+            var searchResponse = await _elasticClient.SearchAsync<Dictionary<string, object>>(searchRequest);
 
-                var searchResponse = await _elasticClient.SearchAsync<Dictionary<string, object>>(searchRequest);
+            if (searchResponse.IsValid)
+            {
+                elasticTopDocs.Count = searchResponse.Hits.Count;
 
-                if (searchResponse.IsValid)
-                {
-                    elasticTopDocs.Count = searchResponse.Hits.Count;
+                var topDocs = new List<Dictionary<string, object>>();
 
-                    var topDocs = new List<Dictionary<string, object>>();
+                var documents = searchResponse.Documents.GetEnumerator();
+                var hits = searchResponse.Hits.GetEnumerator();
 
-                    var documents = searchResponse.Documents.GetEnumerator();
-                    var hits = searchResponse.Hits.GetEnumerator();
+                while (documents.MoveNext() && hits.MoveNext())
+                {
+                    var document = documents.Current;
 
-                    while (documents.MoveNext() && hits.MoveNext())
+                    if (document != null)
                     {
-                        var document = documents.Current;
-
-                        if (document != null)
-                        {
-                            topDocs.Add(document);
+                        topDocs.Add(document);
 
-                            continue;
-                        }
-
-                        var hit = hits.Current;
+                        continue;
+                    }
 
-                        var topDoc = new Dictionary<string, object>
-                        {
-                            { "ContentItemId", hit.Id }
-                        };
+                    var hit = hits.Current;
 
-                        topDocs.Add(topDoc);
-                    }
+                    var topDoc = new Dictionary<string, object>
+                    {
+                        { "ContentItemId", hit.Id }
+                    };
 
-                    elasticTopDocs.TopDocs = topDocs;
+                    topDocs.Add(topDoc);
                 }
 
-                _timestamps[fullIndexName] = _clock.UtcNow;
+                elasticTopDocs.TopDocs = topDocs;
             }
 
-            return elasticTopDocs;
+            _timestamps[fullIndexName] = _clock.UtcNow;
         }
 
-        /// <summary>
-        /// Returns results from a search made with NEST Fluent DSL query.
-        /// </summary>
-        public async Task SearchAsync(string indexName, Func<IElasticClient, Task> elasticClient)
+        return elasticTopDocs;
+    }
+
+    /// <summary>
+    /// Returns results from a search made with NEST Fluent DSL query.
+    /// </summary>
+    public async Task SearchAsync(string indexName, Func<IElasticClient, Task> elasticClient)
+    {
+        if (await ExistsAsync(indexName))
         {
-            if (await ExistsAsync(indexName))
-            {
-                await elasticClient(_elasticClient);
+            await elasticClient(_elasticClient);
 
-                _timestamps[GetFullIndexName(indexName)] = _clock.UtcNow;
-            }
+            _timestamps[GetFullIndexName(indexName)] = _clock.UtcNow;
         }
+    }
 
-        private static Dictionary<string, object> CreateElasticDocument(DocumentIndex documentIndex)
+    private static Dictionary<string, object> CreateElasticDocument(DocumentIndex documentIndex)
+    {
+        var entries = new Dictionary<string, object>
         {
-            var entries = new Dictionary<string, object>
-            {
-                { IndexingConstants.ContentItemIdKey, documentIndex.ContentItemId },
-                { IndexingConstants.ContentItemVersionIdKey, documentIndex.ContentItemVersionId }
-            };
+            { IndexingConstants.ContentItemIdKey, documentIndex.ContentItemId },
+            { IndexingConstants.ContentItemVersionIdKey, documentIndex.ContentItemVersionId }
+        };
 
-            foreach (var entry in documentIndex.Entries)
+        foreach (var entry in documentIndex.Entries)
+        {
+            switch (entry.Type)
             {
-                switch (entry.Type)
-                {
-                    case DocumentIndex.Types.Boolean:
-                        if (entry.Value is bool boolValue)
-                        {
-                            AddValue(entries, entry.Name, boolValue);
-                        }
-                        break;
+                case DocumentIndex.Types.Boolean:
+                    if (entry.Value is bool boolValue)
+                    {
+                        AddValue(entries, entry.Name, boolValue);
+                    }
+                    break;
 
-                    case DocumentIndex.Types.DateTime:
+                case DocumentIndex.Types.DateTime:
 
-                        if (entry.Value is DateTimeOffset offsetValue)
-                        {
-                            AddValue(entries, entry.Name, offsetValue);
-                        }
-                        else if (entry.Value is DateTime dateTimeValue)
-                        {
-                            AddValue(entries, entry.Name, dateTimeValue.ToUniversalTime());
-                        }
+                    if (entry.Value is DateTimeOffset offsetValue)
+                    {
+                        AddValue(entries, entry.Name, offsetValue);
+                    }
+                    else if (entry.Value is DateTime dateTimeValue)
+                    {
+                        AddValue(entries, entry.Name, dateTimeValue.ToUniversalTime());
+                    }
 
-                        break;
+                    break;
 
-                    case DocumentIndex.Types.Integer:
-                        if (entry.Value != null && long.TryParse(entry.Value.ToString(), out var value))
-                        {
-                            AddValue(entries, entry.Name, value);
-                        }
+                case DocumentIndex.Types.Integer:
+                    if (entry.Value != null && long.TryParse(entry.Value.ToString(), out var value))
+                    {
+                        AddValue(entries, entry.Name, value);
+                    }
 
-                        break;
+                    break;
 
-                    case DocumentIndex.Types.Number:
-                        if (entry.Value != null)
-                        {
-                            AddValue(entries, entry.Name, Convert.ToDouble(entry.Value));
-                        }
-                        break;
+                case DocumentIndex.Types.Number:
+                    if (entry.Value != null)
+                    {
+                        AddValue(entries, entry.Name, Convert.ToDouble(entry.Value));
+                    }
+                    break;
 
-                    case DocumentIndex.Types.Text:
-                        if (entry.Value != null)
-                        {
-                            var stringValue = Convert.ToString(entry.Value);
+                case DocumentIndex.Types.Text:
+                    if (entry.Value != null)
+                    {
+                        var stringValue = Convert.ToString(entry.Value);
 
-                            if (!string.IsNullOrEmpty(stringValue))
-                            {
-                                AddValue(entries, entry.Name, stringValue);
-                            }
+                        if (!string.IsNullOrEmpty(stringValue))
+                        {
+                            AddValue(entries, entry.Name, stringValue);
                         }
-                        break;
-                }
+                    }
+                    break;
             }
-
-            return entries;
         }
 
-        public string GetFullIndexName(string indexName)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(indexName);
-
-            return GetIndexPrefix() + _separator + indexName;
-        }
+        return entries;
+    }
 
-        private static void AddValue(Dictionary<string, object> entries, string key, object value)
-        {
-            if (entries.TryAdd(key, value))
-            {
-                return;
-            }
+    public string GetFullIndexName(string indexName)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(indexName);
 
-            // At this point, we know that a value already exists.
-            if (entries[key] is List<object> list)
-            {
-                list.Add(value);
+        return GetIndexPrefix() + _separator + indexName;
+    }
 
-                entries[key] = list;
+    private static void AddValue(Dictionary<string, object> entries, string key, object value)
+    {
+        if (entries.TryAdd(key, value))
+        {
+            return;
+        }
 
-                return;
-            }
+        // At this point, we know that a value already exists.
+        if (entries[key] is List<object> list)
+        {
+            list.Add(value);
 
-            // Convert the existing value to a list of values.
-            var values = new List<object>()
-            {
-                entries[key],
-                value,
-            };
+            entries[key] = list;
 
-            entries[key] = values;
+            return;
         }
 
-        private string GetIndexPrefix()
+        // Convert the existing value to a list of values.
+        var values = new List<object>()
         {
-            if (_indexPrefix == null)
-            {
-                var parts = new List<string>();
+            entries[key],
+            value,
+        };
 
-                if (!string.IsNullOrWhiteSpace(_elasticsearchOptions.IndexPrefix))
-                {
-                    parts.Add(_elasticsearchOptions.IndexPrefix.ToLowerInvariant());
-                }
+        entries[key] = values;
+    }
 
-                parts.Add(_shellSettings.Name.ToLowerInvariant());
+    private string GetIndexPrefix()
+    {
+        if (_indexPrefix == null)
+        {
+            var parts = new List<string>();
 
-                _indexPrefix = string.Join(_separator, parts);
+            if (!string.IsNullOrWhiteSpace(_elasticsearchOptions.IndexPrefix))
+            {
+                parts.Add(_elasticsearchOptions.IndexPrefix.ToLowerInvariant());
             }
 
-            return _indexPrefix;
+            parts.Add(_shellSettings.Name.ToLowerInvariant());
+
+            _indexPrefix = string.Join(_separator, parts);
         }
+
+        return _indexPrefix;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexSettingsService.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexSettingsService.cs
index 66d8e30309f..cc8df12ed75 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexSettingsService.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexSettingsService.cs
@@ -5,114 +5,113 @@
 using OrchardCore.Environment.Shell.Scope;
 using OrchardCore.Search.Elasticsearch.Core.Models;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Services
+namespace OrchardCore.Search.Elasticsearch.Core.Services;
+
+public class ElasticIndexSettingsService
 {
-    public class ElasticIndexSettingsService
-    {
-        /// <summary>
-        /// Loads the index settings document from the store for updating and that should not be cached.
-        /// </summary>
+    /// <summary>
+    /// Loads the index settings document from the store for updating and that should not be cached.
+    /// </summary>
 #pragma warning disable CA1822 // Mark members as static
-        public Task<ElasticIndexSettingsDocument> LoadDocumentAsync() => DocumentManager.GetOrCreateMutableAsync();
+    public Task<ElasticIndexSettingsDocument> LoadDocumentAsync() => DocumentManager.GetOrCreateMutableAsync();
 #pragma warning restore CA1822 // Mark members as static
 
-        /// <summary>
-        /// Gets the index settings document from the cache for sharing and that should not be updated.
-        /// </summary>
+    /// <summary>
+    /// Gets the index settings document from the cache for sharing and that should not be updated.
+    /// </summary>
 #pragma warning disable CA1822 // Mark members as static
-        public async Task<ElasticIndexSettingsDocument> GetDocumentAsync()
+    public async Task<ElasticIndexSettingsDocument> GetDocumentAsync()
 #pragma warning restore CA1822 // Mark members as static
+    {
+        var document = await DocumentManager.GetOrCreateImmutableAsync();
+
+        foreach (var name in document.ElasticIndexSettings.Keys)
         {
-            var document = await DocumentManager.GetOrCreateImmutableAsync();
+            document.ElasticIndexSettings[name].IndexName = name;
+        }
 
-            foreach (var name in document.ElasticIndexSettings.Keys)
-            {
-                document.ElasticIndexSettings[name].IndexName = name;
-            }
+        return document;
+    }
 
-            return document;
-        }
+    public async Task<IEnumerable<ElasticIndexSettings>> GetSettingsAsync()
+    {
+        return (await GetDocumentAsync()).ElasticIndexSettings.Values;
+    }
 
-        public async Task<IEnumerable<ElasticIndexSettings>> GetSettingsAsync()
+    public async Task<ElasticIndexSettings> GetSettingsAsync(string indexName)
+    {
+        var document = await GetDocumentAsync();
+
+        if (document.ElasticIndexSettings.TryGetValue(indexName, out var settings))
         {
-            return (await GetDocumentAsync()).ElasticIndexSettings.Values;
+            return settings;
         }
 
-        public async Task<ElasticIndexSettings> GetSettingsAsync(string indexName)
-        {
-            var document = await GetDocumentAsync();
+        return null;
+    }
 
-            if (document.ElasticIndexSettings.TryGetValue(indexName, out var settings))
-            {
-                return settings;
-            }
+    /// <summary>
+    /// Returns the name of he index-time analyzer.
+    /// </summary>
+    /// <param name="indexName"></param>
+    /// <returns></returns>
+    public async Task<string> GetIndexAnalyzerAsync(string indexName)
+    {
+        var document = await GetDocumentAsync();
 
-            return null;
-        }
+        return GetAnalyzerName(document, indexName);
+    }
 
-        /// <summary>
-        /// Returns the name of he index-time analyzer.
-        /// </summary>
-        /// <param name="indexName"></param>
-        /// <returns></returns>
-        public async Task<string> GetIndexAnalyzerAsync(string indexName)
-        {
-            var document = await GetDocumentAsync();
+    /// <summary>
+    /// Returns the name of the query-time analyzer.
+    /// </summary>
+    /// <param name="indexName"></param>
+    /// <returns></returns>
+    public async Task<string> GetQueryAnalyzerAsync(string indexName)
+    {
+        var document = await GetDocumentAsync();
 
-            return GetAnalyzerName(document, indexName);
+        if (document.ElasticIndexSettings.TryGetValue(indexName, out var settings) && !string.IsNullOrEmpty(settings.QueryAnalyzerName))
+        {
+            return settings.QueryAnalyzerName;
         }
 
-        /// <summary>
-        /// Returns the name of the query-time analyzer.
-        /// </summary>
-        /// <param name="indexName"></param>
-        /// <returns></returns>
-        public async Task<string> GetQueryAnalyzerAsync(string indexName)
-        {
-            var document = await GetDocumentAsync();
+        return ElasticsearchConstants.DefaultAnalyzer;
+    }
 
-            if (document.ElasticIndexSettings.TryGetValue(indexName, out var settings) && !string.IsNullOrEmpty(settings.QueryAnalyzerName))
-            {
-                return settings.QueryAnalyzerName;
-            }
+    public async Task<string> LoadIndexAnalyzerAsync(string indexName)
+    {
+        var document = await LoadDocumentAsync();
 
-            return ElasticsearchConstants.DefaultAnalyzer;
-        }
+        return GetAnalyzerName(document, indexName);
+    }
 
-        public async Task<string> LoadIndexAnalyzerAsync(string indexName)
-        {
-            var document = await LoadDocumentAsync();
+    public async Task UpdateIndexAsync(ElasticIndexSettings settings)
+    {
+        var document = await LoadDocumentAsync();
+        document.ElasticIndexSettings[settings.IndexName] = settings;
+        await DocumentManager.UpdateAsync(document);
+    }
 
-            return GetAnalyzerName(document, indexName);
-        }
+    public async Task DeleteIndexAsync(string indexName)
+    {
+        var document = await LoadDocumentAsync();
+        document.ElasticIndexSettings.Remove(indexName);
+        await DocumentManager.UpdateAsync(document);
+    }
 
-        public async Task UpdateIndexAsync(ElasticIndexSettings settings)
-        {
-            var document = await LoadDocumentAsync();
-            document.ElasticIndexSettings[settings.IndexName] = settings;
-            await DocumentManager.UpdateAsync(document);
-        }
+    private static IDocumentManager<ElasticIndexSettingsDocument> DocumentManager =>
+        ShellScope.Services.GetRequiredService<IDocumentManager<ElasticIndexSettingsDocument>>();
 
-        public async Task DeleteIndexAsync(string indexName)
+    // Returns the name of the analyzer configured for the given index name.
+    private static string GetAnalyzerName(ElasticIndexSettingsDocument document, string indexName)
+    {
+        // The name "standardanalyzer" is a legacy used prior OC 1.6 release. It can be removed in future releases.
+        if (document.ElasticIndexSettings.TryGetValue(indexName, out var settings) && settings.AnalyzerName != "standardanalyzer")
         {
-            var document = await LoadDocumentAsync();
-            document.ElasticIndexSettings.Remove(indexName);
-            await DocumentManager.UpdateAsync(document);
+            return settings.AnalyzerName;
         }
 
-        private static IDocumentManager<ElasticIndexSettingsDocument> DocumentManager =>
-            ShellScope.Services.GetRequiredService<IDocumentManager<ElasticIndexSettingsDocument>>();
-
-        // Returns the name of the analyzer configured for the given index name.
-        private static string GetAnalyzerName(ElasticIndexSettingsDocument document, string indexName)
-        {
-            // The name "standardanalyzer" is a legacy used prior OC 1.6 release. It can be removed in future releases.
-            if (document.ElasticIndexSettings.TryGetValue(indexName, out var settings) && settings.AnalyzerName != "standardanalyzer")
-            {
-                return settings.AnalyzerName;
-            }
-
-            return ElasticsearchConstants.DefaultAnalyzer;
-        }
+        return ElasticsearchConstants.DefaultAnalyzer;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexingService.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexingService.cs
index 55991703176..c059d522fa9 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexingService.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticIndexingService.cs
@@ -17,300 +17,281 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Services
+namespace OrchardCore.Search.Elasticsearch.Core.Services;
+
+/// <summary>
+/// This class provides services to update all the Elasticsearch indices.
+/// </summary>
+public class ElasticIndexingService
 {
-    /// <summary>
-    /// This class provides services to update all the Elasticsearch indices.
-    /// </summary>
-    public class ElasticIndexingService
+    private const int BatchSize = 100;
+
+    private readonly IShellHost _shellHost;
+    private readonly ShellSettings _shellSettings;
+    private readonly ElasticIndexSettingsService _elasticIndexSettingsService;
+    private readonly ElasticIndexManager _indexManager;
+    private readonly IIndexingTaskManager _indexingTaskManager;
+    private readonly ElasticConnectionOptions _elasticConnectionOptions;
+    private readonly ISiteService _siteService;
+    private readonly IContentManager _contentManager;
+    private readonly IEnumerable<IContentItemIndexHandler> _contentItemIndexHandlers;
+    private readonly IStore _store;
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly ILogger _logger;
+
+    public ElasticIndexingService(
+        IShellHost shellHost,
+        ShellSettings shellSettings,
+        ElasticIndexSettingsService elasticIndexSettingsService,
+        ElasticIndexManager indexManager,
+        IIndexingTaskManager indexingTaskManager,
+        IOptions<ElasticConnectionOptions> elasticConnectionOptions,
+        ISiteService siteService,
+        IContentManager contentManager,
+        IEnumerable<IContentItemIndexHandler> contentItemIndexHandlers,
+        IStore store,
+        IContentDefinitionManager contentDefinitionManager,
+        ILogger<ElasticIndexingService> logger)
+    {
+        _shellHost = shellHost;
+        _shellSettings = shellSettings;
+        _elasticIndexSettingsService = elasticIndexSettingsService;
+        _indexManager = indexManager;
+        _indexingTaskManager = indexingTaskManager;
+        _elasticConnectionOptions = elasticConnectionOptions.Value;
+        _siteService = siteService;
+        _contentManager = contentManager;
+        _contentItemIndexHandlers = contentItemIndexHandlers;
+        _store = store;
+        _contentDefinitionManager = contentDefinitionManager;
+        _logger = logger;
+    }
+
+    public async Task ProcessContentItemsAsync(params string[] indexNames)
     {
-        private const int BatchSize = 100;
-
-        private readonly IShellHost _shellHost;
-        private readonly ShellSettings _shellSettings;
-        private readonly ElasticIndexSettingsService _elasticIndexSettingsService;
-        private readonly ElasticIndexManager _indexManager;
-        private readonly IIndexingTaskManager _indexingTaskManager;
-        private readonly ElasticConnectionOptions _elasticConnectionOptions;
-        private readonly ISiteService _siteService;
-        private readonly IContentManager _contentManager;
-        private readonly IEnumerable<IContentItemIndexHandler> _contentItemIndexHandlers;
-        private readonly IStore _store;
-        private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly ILogger _logger;
-
-        public ElasticIndexingService(
-            IShellHost shellHost,
-            ShellSettings shellSettings,
-            ElasticIndexSettingsService elasticIndexSettingsService,
-            ElasticIndexManager indexManager,
-            IIndexingTaskManager indexingTaskManager,
-            IOptions<ElasticConnectionOptions> elasticConnectionOptions,
-            ISiteService siteService,
-            IContentManager contentManager,
-            IEnumerable<IContentItemIndexHandler> contentItemIndexHandlers,
-            IStore store,
-            IContentDefinitionManager contentDefinitionManager,
-            ILogger<ElasticIndexingService> logger)
+        if (!_elasticConnectionOptions.FileConfigurationExists())
+        {
+            return;
+        }
+
+        var indexSettingsList = await _elasticIndexSettingsService.GetSettingsAsync();
+
+        if (indexNames != null && indexNames.Length > 0)
+        {
+            indexSettingsList = indexSettingsList
+                .Where(x => indexNames.Contains(x.IndexName, StringComparer.OrdinalIgnoreCase));
+        }
+
+        if (!indexSettingsList.Any())
+        {
+            return;
+        }
+
+        var allIndices = new Dictionary<string, long>();
+        var lastTaskId = long.MaxValue;
+
+        // Find the lowest task id to process.
+        foreach (var indexSetting in indexSettingsList)
         {
-            _shellHost = shellHost;
-            _shellSettings = shellSettings;
-            _elasticIndexSettingsService = elasticIndexSettingsService;
-            _indexManager = indexManager;
-            _indexingTaskManager = indexingTaskManager;
-            _elasticConnectionOptions = elasticConnectionOptions.Value;
-            _siteService = siteService;
-            _contentManager = contentManager;
-            _contentItemIndexHandlers = contentItemIndexHandlers;
-            _store = store;
-            _contentDefinitionManager = contentDefinitionManager;
-            _logger = logger;
+            var taskId = await _indexManager.GetLastTaskId(indexSetting.IndexName);
+            lastTaskId = Math.Min(lastTaskId, taskId);
+            allIndices.Add(indexSetting.IndexName, taskId);
         }
 
-        public async Task ProcessContentItemsAsync(params string[] indexNames)
+        IEnumerable<IndexingTask> tasks = [];
+        var allContentTypes = indexSettingsList.SelectMany(x => x.IndexedContentTypes ?? []).Distinct().ToArray();
+        var readOnlySession = _store.CreateSession(withTracking: false);
+
+        while (true)
         {
-            if (!_elasticConnectionOptions.FileConfigurationExists())
+            // Load the next batch of tasks.
+            tasks = await _indexingTaskManager.GetIndexingTasksAsync(lastTaskId, BatchSize);
+
+            if (!tasks.Any())
             {
-                return;
+                break;
             }
 
-            var indexSettingsList = await _elasticIndexSettingsService.GetSettingsAsync();
+            var updatedContentItemIds = tasks
+                .Where(x => x.Type == IndexingTaskTypes.Update)
+                .Select(x => x.ContentItemId)
+                .ToList();
 
-            if (indexNames != null && indexNames.Length > 0)
+            Dictionary<string, ContentItem> allPublished = null;
+            Dictionary<string, ContentItem> allLatest = null;
+
+            var settingsByIndex = indexSettingsList.ToDictionary(x => x.IndexName);
+
+            if (indexSettingsList.Any(x => !x.IndexLatest))
             {
-                indexSettingsList = indexSettingsList
-                    .Where(x => indexNames.Contains(x.IndexName, StringComparer.OrdinalIgnoreCase));
+                var publishedContentItems = await readOnlySession.Query<ContentItem, ContentItemIndex>(index => index.Published && index.ContentType.IsIn(allContentTypes) && index.ContentItemId.IsIn(updatedContentItemIds)).ListAsync();
+                allPublished = publishedContentItems.DistinctBy(x => x.ContentItemId)
+                .ToDictionary(k => k.ContentItemId);
             }
 
-            if (!indexSettingsList.Any())
+            if (indexSettingsList.Any(x => x.IndexLatest))
             {
-                return;
+                var latestContentItems = await readOnlySession.Query<ContentItem, ContentItemIndex>(index => index.Latest && index.ContentType.IsIn(allContentTypes) && index.ContentItemId.IsIn(updatedContentItemIds)).ListAsync();
+                allLatest = latestContentItems.DistinctBy(x => x.ContentItemId).ToDictionary(k => k.ContentItemId);
             }
 
-            var allIndices = new Dictionary<string, long>();
-            var lastTaskId = long.MaxValue;
+            // Group all DocumentIndex by index to batch update them.
+            var updatedDocumentsByIndex = new Dictionary<string, List<DocumentIndex>>();
 
-            // Find the lowest task id to process.
-            foreach (var indexSetting in indexSettingsList)
+            foreach (var index in allIndices)
             {
-                var taskId = await _indexManager.GetLastTaskId(indexSetting.IndexName);
-                lastTaskId = Math.Min(lastTaskId, taskId);
-                allIndices.Add(indexSetting.IndexName, taskId);
+                updatedDocumentsByIndex[index.Key] = [];
             }
 
-            IEnumerable<IndexingTask> tasks = [];
-            var allContentTypes = indexSettingsList.SelectMany(x => x.IndexedContentTypes ?? []).Distinct().ToArray();
-            var readOnlySession = _store.CreateSession(withTracking: false);
+            var needPublished = indexSettingsList.FirstOrDefault(x => !x.IndexLatest) != null;
 
-            while (true)
+            foreach (var task in tasks)
             {
-                // Load the next batch of tasks.
-                tasks = await _indexingTaskManager.GetIndexingTasksAsync(lastTaskId, BatchSize);
-
-                if (!tasks.Any())
+                if (task.Type != IndexingTaskTypes.Update)
                 {
-                    break;
+                    continue;
                 }
 
-                var updatedContentItemIds = tasks
-                    .Where(x => x.Type == IndexingTaskTypes.Update)
-                    .Select(x => x.ContentItemId)
-                    .ToList();
-
-                Dictionary<string, ContentItem> allPublished = null;
-                Dictionary<string, ContentItem> allLatest = null;
+                BuildIndexContext publishedIndexContext = null, latestIndexContext = null;
 
-                var settingsByIndex = indexSettingsList.ToDictionary(x => x.IndexName);
-
-                if (indexSettingsList.Any(x => !x.IndexLatest))
+                if (allPublished != null && allPublished.TryGetValue(task.ContentItemId, out var publishedContentItem))
                 {
-                    var publishedContentItems = await readOnlySession.Query<ContentItem, ContentItemIndex>(index => index.Published && index.ContentType.IsIn(allContentTypes) && index.ContentItemId.IsIn(updatedContentItemIds)).ListAsync();
-                    allPublished = publishedContentItems.DistinctBy(x => x.ContentItemId)
-                    .ToDictionary(k => k.ContentItemId);
+                    publishedIndexContext = new BuildIndexContext(new DocumentIndex(task.ContentItemId, publishedContentItem.ContentItemVersionId), publishedContentItem, [publishedContentItem.ContentType], new ElasticContentIndexSettings());
+                    await _contentItemIndexHandlers.InvokeAsync(x => x.BuildIndexAsync(publishedIndexContext), _logger);
                 }
 
-                if (indexSettingsList.Any(x => x.IndexLatest))
+                if (allLatest != null && allLatest.TryGetValue(task.ContentItemId, out var latestContentItem))
                 {
-                    var latestContentItems = await readOnlySession.Query<ContentItem, ContentItemIndex>(index => index.Latest && index.ContentType.IsIn(allContentTypes) && index.ContentItemId.IsIn(updatedContentItemIds)).ListAsync();
-                    allLatest = latestContentItems.DistinctBy(x => x.ContentItemId).ToDictionary(k => k.ContentItemId);
+                    latestIndexContext = new BuildIndexContext(new DocumentIndex(task.ContentItemId, latestContentItem.ContentItemVersionId), latestContentItem, [latestContentItem.ContentType], new ElasticContentIndexSettings());
+                    await _contentItemIndexHandlers.InvokeAsync(x => x.BuildIndexAsync(latestIndexContext), _logger);
                 }
 
-                // Group all DocumentIndex by index to batch update them.
-                var updatedDocumentsByIndex = new Dictionary<string, List<DocumentIndex>>();
-
-                foreach (var index in allIndices)
+                if (publishedIndexContext == null && latestIndexContext == null)
                 {
-                    updatedDocumentsByIndex[index.Key] = [];
+                    continue;
                 }
 
-                var needPublished = indexSettingsList.FirstOrDefault(x => !x.IndexLatest) != null;
-
-                foreach (var task in tasks)
+                // Update the document from the index if its lastIndexId is smaller than the current task id.
+                foreach (var index in allIndices)
                 {
-                    if (task.Type != IndexingTaskTypes.Update)
+                    if (index.Value >= task.Id || !settingsByIndex.TryGetValue(index.Key, out var settings))
                     {
                         continue;
                     }
 
-                    BuildIndexContext publishedIndexContext = null, latestIndexContext = null;
+                    var context = !settings.IndexLatest ? publishedIndexContext : latestIndexContext;
 
-                    if (allPublished != null && allPublished.TryGetValue(task.ContentItemId, out var publishedContentItem))
+                    // We index only if we actually found a content item in the database.
+                    if (context == null)
                     {
-                        publishedIndexContext = new BuildIndexContext(new DocumentIndex(task.ContentItemId, publishedContentItem.ContentItemVersionId), publishedContentItem, [publishedContentItem.ContentType], new ElasticContentIndexSettings());
-                        await _contentItemIndexHandlers.InvokeAsync(x => x.BuildIndexAsync(publishedIndexContext), _logger);
+                        // TODO purge these content items from IndexingTask table.
+                        continue;
                     }
 
-                    if (allLatest != null && allLatest.TryGetValue(task.ContentItemId, out var latestContentItem))
-                    {
-                        latestIndexContext = new BuildIndexContext(new DocumentIndex(task.ContentItemId, latestContentItem.ContentItemVersionId), latestContentItem, [latestContentItem.ContentType], new ElasticContentIndexSettings());
-                        await _contentItemIndexHandlers.InvokeAsync(x => x.BuildIndexAsync(latestIndexContext), _logger);
-                    }
+                    var cultureAspect = await _contentManager.PopulateAspectAsync<CultureAspect>(context.ContentItem);
+                    var culture = cultureAspect.HasCulture ? cultureAspect.Culture.Name : null;
+                    var ignoreIndexedCulture = settings.Culture != "any" && culture != settings.Culture;
 
-                    if (publishedIndexContext == null && latestIndexContext == null)
+                    // Ignore if the content item content type or culture is not indexed in this index.
+                    if (!settings.IndexedContentTypes.Contains(context.ContentItem.ContentType) || ignoreIndexedCulture)
                     {
                         continue;
                     }
 
-                    // Update the document from the index if its lastIndexId is smaller than the current task id.
-                    foreach (var index in allIndices)
-                    {
-                        if (index.Value >= task.Id || !settingsByIndex.TryGetValue(index.Key, out var settings))
-                        {
-                            continue;
-                        }
-
-                        var context = !settings.IndexLatest ? publishedIndexContext : latestIndexContext;
-
-                        // We index only if we actually found a content item in the database.
-                        if (context == null)
-                        {
-                            // TODO purge these content items from IndexingTask table.
-                            continue;
-                        }
-
-                        var cultureAspect = await _contentManager.PopulateAspectAsync<CultureAspect>(context.ContentItem);
-                        var culture = cultureAspect.HasCulture ? cultureAspect.Culture.Name : null;
-                        var ignoreIndexedCulture = settings.Culture != "any" && culture != settings.Culture;
-
-                        // Ignore if the content item content type or culture is not indexed in this index.
-                        if (!settings.IndexedContentTypes.Contains(context.ContentItem.ContentType) || ignoreIndexedCulture)
-                        {
-                            continue;
-                        }
-
-                        updatedDocumentsByIndex[index.Key].Add(context.DocumentIndex);
-                    }
+                    updatedDocumentsByIndex[index.Key].Add(context.DocumentIndex);
                 }
+            }
 
-                // Delete all the existing documents.
-                foreach (var index in updatedDocumentsByIndex)
-                {
-                    var deletedDocuments = updatedDocumentsByIndex[index.Key].Select(x => x.ContentItemId);
-                    await _indexManager.DeleteDocumentsAsync(index.Key, deletedDocuments);
-                }
+            // Delete all the existing documents.
+            foreach (var index in updatedDocumentsByIndex)
+            {
+                var deletedDocuments = updatedDocumentsByIndex[index.Key].Select(x => x.ContentItemId);
+                await _indexManager.DeleteDocumentsAsync(index.Key, deletedDocuments);
+            }
 
-                // Submits all the new documents to the index.
-                foreach (var index in updatedDocumentsByIndex)
-                {
-                    await _indexManager.StoreDocumentsAsync(index.Key, updatedDocumentsByIndex[index.Key]);
-                }
+            // Submits all the new documents to the index.
+            foreach (var index in updatedDocumentsByIndex)
+            {
+                await _indexManager.StoreDocumentsAsync(index.Key, updatedDocumentsByIndex[index.Key]);
+            }
 
-                // Update task ids.
-                lastTaskId = tasks.Last().Id;
+            // Update task ids.
+            lastTaskId = tasks.Last().Id;
 
-                foreach (var indexStatus in allIndices)
+            foreach (var indexStatus in allIndices)
+            {
+                if (indexStatus.Value < lastTaskId)
                 {
-                    if (indexStatus.Value < lastTaskId)
-                    {
-                        await _indexManager.SetLastTaskId(indexStatus.Key, lastTaskId);
-                    }
+                    await _indexManager.SetLastTaskId(indexStatus.Key, lastTaskId);
                 }
             }
         }
+    }
 
-        /// <summary>
-        /// Creates a new index.
-        /// </summary>
-        public async Task CreateIndexAsync(ElasticIndexSettings elasticIndexSettings)
-        {
-            await _elasticIndexSettingsService.UpdateIndexAsync(elasticIndexSettings);
-            await RebuildIndexAsync(elasticIndexSettings);
-        }
-
-        /// <summary>
-        /// Update an existing index.
-        /// </summary>
-        public Task UpdateIndexAsync(ElasticIndexSettings elasticIndexSettings)
-            => _elasticIndexSettingsService.UpdateIndexAsync(elasticIndexSettings);
-
-        /// <summary>
-        /// Deletes permanently an index.
-        /// </summary>
-        public async Task<bool> DeleteIndexAsync(string indexName)
-        {
-            // Delete the Elasticsearch Index first.
-            var result = await _indexManager.DeleteIndex(indexName);
-
-            if (result)
-            {
-                // Now delete it's setting.
-                await _elasticIndexSettingsService.DeleteIndexAsync(indexName);
-            }
+    /// <summary>
+    /// Creates a new index.
+    /// </summary>
+    public async Task CreateIndexAsync(ElasticIndexSettings elasticIndexSettings)
+    {
+        await _elasticIndexSettingsService.UpdateIndexAsync(elasticIndexSettings);
+        await RebuildIndexAsync(elasticIndexSettings);
+    }
 
-            return result;
-        }
+    /// <summary>
+    /// Update an existing index.
+    /// </summary>
+    public Task UpdateIndexAsync(ElasticIndexSettings elasticIndexSettings)
+        => _elasticIndexSettingsService.UpdateIndexAsync(elasticIndexSettings);
 
-        /// <summary>
-        /// Restarts the indexing process from the beginning in order to update
-        /// current content items. It doesn't delete existing entries from the index.
-        /// </summary>
-        public async Task ResetIndexAsync(string indexName)
-        {
-            await _indexManager.SetLastTaskId(indexName, 0);
-        }
+    /// <summary>
+    /// Deletes permanently an index.
+    /// </summary>
+    public async Task<bool> DeleteIndexAsync(string indexName)
+    {
+        // Delete the Elasticsearch Index first.
+        var result = await _indexManager.DeleteIndex(indexName);
 
-        /// <summary>
-        /// Deletes and recreates the full index content.
-        /// </summary>
-        public async Task RebuildIndexAsync(ElasticIndexSettings elasticIndexSettings)
+        if (result)
         {
-            await _indexManager.DeleteIndex(elasticIndexSettings.IndexName);
-            await _indexManager.CreateIndexAsync(elasticIndexSettings);
-            await ResetIndexAsync(elasticIndexSettings.IndexName);
+            // Now delete it's setting.
+            await _elasticIndexSettingsService.DeleteIndexAsync(indexName);
         }
 
-        public async Task<ElasticSettings> GetElasticSettingsAsync()        
-            => await _siteService.GetSettingsAsync<ElasticSettings>() ?? new ElasticSettings();
+        return result;
+    }
 
-        /// <summary>
-        /// Synchronizes Elasticsearch content index settings with Lucene ones.
-        /// </summary>
-        public async Task SyncSettings()
-        {
-            var contentTypeDefinitions = await _contentDefinitionManager.LoadTypeDefinitionsAsync();
+    /// <summary>
+    /// Restarts the indexing process from the beginning in order to update
+    /// current content items. It doesn't delete existing entries from the index.
+    /// </summary>
+    public async Task ResetIndexAsync(string indexName)
+    {
+        await _indexManager.SetLastTaskId(indexName, 0);
+    }
 
-            foreach (var contentTypeDefinition in contentTypeDefinitions)
-            {
-                foreach (var partDefinition in contentTypeDefinition.Parts)
-                {
-                    await _contentDefinitionManager.AlterPartDefinitionAsync(partDefinition.Name, partBuilder =>
-                    {
-                        if (partDefinition.Settings.TryGetPropertyValue("LuceneContentIndexSettings", out var existingPartSettings))
-                        {
-                            var included = existingPartSettings["Included"];
+    /// <summary>
+    /// Deletes and recreates the full index content.
+    /// </summary>
+    public async Task RebuildIndexAsync(ElasticIndexSettings elasticIndexSettings)
+    {
+        await _indexManager.DeleteIndex(elasticIndexSettings.IndexName);
+        await _indexManager.CreateIndexAsync(elasticIndexSettings);
+        await ResetIndexAsync(elasticIndexSettings.IndexName);
+    }
 
-                            if (included is not null && (bool)included)
-                            {
-                                partDefinition.Settings.Add(nameof(ElasticContentIndexSettings), JNode.FromObject(existingPartSettings.ToObject<ElasticContentIndexSettings>()));
-                            }
-                        }
-                    });
-                }
-            }
+    public async Task<ElasticSettings> GetElasticSettingsAsync()
+        => await _siteService.GetSettingsAsync<ElasticSettings>() ?? new ElasticSettings();
 
-            var partDefinitions = await _contentDefinitionManager.LoadPartDefinitionsAsync();
+    /// <summary>
+    /// Synchronizes Elasticsearch content index settings with Lucene ones.
+    /// </summary>
+    public async Task SyncSettings()
+    {
+        var contentTypeDefinitions = await _contentDefinitionManager.LoadTypeDefinitionsAsync();
 
-            foreach (var partDefinition in partDefinitions)
+        foreach (var contentTypeDefinition in contentTypeDefinitions)
+        {
+            foreach (var partDefinition in contentTypeDefinition.Parts)
             {
                 await _contentDefinitionManager.AlterPartDefinitionAsync(partDefinition.Name, partBuilder =>
                 {
@@ -318,26 +299,44 @@ await _contentDefinitionManager.AlterPartDefinitionAsync(partDefinition.Name, pa
                     {
                         var included = existingPartSettings["Included"];
 
-                        if (included != null && (bool)included)
+                        if (included is not null && (bool)included)
                         {
                             partDefinition.Settings.Add(nameof(ElasticContentIndexSettings), JNode.FromObject(existingPartSettings.ToObject<ElasticContentIndexSettings>()));
                         }
                     }
+                });
+            }
+        }
+
+        var partDefinitions = await _contentDefinitionManager.LoadPartDefinitionsAsync();
 
-                    foreach (var fieldDefinition in partDefinition.Fields)
+        foreach (var partDefinition in partDefinitions)
+        {
+            await _contentDefinitionManager.AlterPartDefinitionAsync(partDefinition.Name, partBuilder =>
+            {
+                if (partDefinition.Settings.TryGetPropertyValue("LuceneContentIndexSettings", out var existingPartSettings))
+                {
+                    var included = existingPartSettings["Included"];
+
+                    if (included != null && (bool)included)
                     {
-                        if (fieldDefinition.Settings.TryGetPropertyValue("LuceneContentIndexSettings", out var existingFieldSettings))
-                        {
-                            var included = existingFieldSettings["Included"];
+                        partDefinition.Settings.Add(nameof(ElasticContentIndexSettings), JNode.FromObject(existingPartSettings.ToObject<ElasticContentIndexSettings>()));
+                    }
+                }
+
+                foreach (var fieldDefinition in partDefinition.Fields)
+                {
+                    if (fieldDefinition.Settings.TryGetPropertyValue("LuceneContentIndexSettings", out var existingFieldSettings))
+                    {
+                        var included = existingFieldSettings["Included"];
 
-                            if (included != null && (bool)included)
-                            {
-                                fieldDefinition.Settings.Add(nameof(ElasticContentIndexSettings), JNode.FromObject(existingFieldSettings.ToObject<ElasticContentIndexSettings>()));
-                            }
+                        if (included != null && (bool)included)
+                        {
+                            fieldDefinition.Settings.Add(nameof(ElasticContentIndexSettings), JNode.FromObject(existingFieldSettings.ToObject<ElasticContentIndexSettings>()));
                         }
                     }
-                });
-            }
+                }
+            });
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticQueryService.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticQueryService.cs
index 8ca429e6780..9dd1cb33406 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticQueryService.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticQueryService.cs
@@ -6,88 +6,87 @@
 using Microsoft.Extensions.Logging;
 using Nest;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Services
+namespace OrchardCore.Search.Elasticsearch.Core.Services;
+
+public class ElasticQueryService : IElasticQueryService
 {
-    public class ElasticQueryService : IElasticQueryService
+    private readonly IElasticClient _elasticClient;
+    private readonly ElasticIndexManager _elasticIndexManager;
+    private readonly ILogger _logger;
+
+    public ElasticQueryService(
+        IElasticClient elasticClient,
+        ElasticIndexManager elasticIndexManager,
+        ILogger<ElasticQueryService> logger
+        )
     {
-        private readonly IElasticClient _elasticClient;
-        private readonly ElasticIndexManager _elasticIndexManager;
-        private readonly ILogger _logger;
+        _elasticClient = elasticClient;
+        _elasticIndexManager = elasticIndexManager;
+        _logger = logger;
+    }
 
-        public ElasticQueryService(
-            IElasticClient elasticClient,
-            ElasticIndexManager elasticIndexManager,
-            ILogger<ElasticQueryService> logger
-            )
+    public async Task<ElasticTopDocs> SearchAsync(string indexName, string query)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(indexName);
+
+        var elasticTopDocs = new ElasticTopDocs();
+
+        if (_elasticClient == null)
         {
-            _elasticClient = elasticClient;
-            _elasticIndexManager = elasticIndexManager;
-            _logger = logger;
+            _logger.LogWarning("Elasticsearch Client is not setup, please validate your Elasticsearch Configurations");
+
+            return elasticTopDocs;
         }
 
-        public async Task<ElasticTopDocs> SearchAsync(string indexName, string query)
+        try
         {
-            ArgumentException.ThrowIfNullOrEmpty(indexName);
-
-            var elasticTopDocs = new ElasticTopDocs();
+            using var stream = new MemoryStream(Encoding.UTF8.GetBytes(query));
+            var deserializedSearchRequest = _elasticClient.RequestResponseSerializer.Deserialize<SearchRequest>(stream);
 
-            if (_elasticClient == null)
+            var searchRequest = new SearchRequest(_elasticIndexManager.GetFullIndexName(indexName))
             {
-                _logger.LogWarning("Elasticsearch Client is not setup, please validate your Elasticsearch Configurations");
+                Query = deserializedSearchRequest.Query,
+                From = deserializedSearchRequest.From,
+                Size = deserializedSearchRequest.Size,
+                Fields = deserializedSearchRequest.Fields,
+                Sort = deserializedSearchRequest.Sort,
+                Source = deserializedSearchRequest.Source,
+            };
 
-                return elasticTopDocs;
-            }
+            var searchResponse = await _elasticClient.SearchAsync<Dictionary<string, object>>(searchRequest);
+            var hits = new List<Dictionary<string, object>>();
 
-            try
+            foreach (var hit in searchResponse.Hits)
             {
-                using var stream = new MemoryStream(Encoding.UTF8.GetBytes(query));
-                var deserializedSearchRequest = _elasticClient.RequestResponseSerializer.Deserialize<SearchRequest>(stream);
-
-                var searchRequest = new SearchRequest(_elasticIndexManager.GetFullIndexName(indexName))
+                if (hit.Fields != null)
                 {
-                    Query = deserializedSearchRequest.Query,
-                    From = deserializedSearchRequest.From,
-                    Size = deserializedSearchRequest.Size,
-                    Fields = deserializedSearchRequest.Fields,
-                    Sort = deserializedSearchRequest.Sort,
-                    Source = deserializedSearchRequest.Source,
-                };
+                    var row = new Dictionary<string, object>();
 
-                var searchResponse = await _elasticClient.SearchAsync<Dictionary<string, object>>(searchRequest);
-                var hits = new List<Dictionary<string, object>>();
-
-                foreach (var hit in searchResponse.Hits)
-                {
-                    if (hit.Fields != null)
+                    foreach (var keyValuePair in hit.Fields)
                     {
-                        var row = new Dictionary<string, object>();
-
-                        foreach (var keyValuePair in hit.Fields)
-                        {
-                            row[keyValuePair.Key] = keyValuePair.Value.As<string[]>();
-                        }
-
-                        hits.Add(row);
+                        row[keyValuePair.Key] = keyValuePair.Value.As<string[]>();
                     }
-                }
 
-                if (searchResponse.IsValid)
-                {
-                    elasticTopDocs.Count = searchResponse.Total;
-                    elasticTopDocs.TopDocs = new List<Dictionary<string, object>>(searchResponse.Documents);
-                    elasticTopDocs.Fields = hits;
-                }
-                else
-                {
-                    _logger.LogError("Received failure response from Elasticsearch: {ServerError}", searchResponse.ServerError);
+                    hits.Add(row);
                 }
             }
-            catch (Exception ex)
+
+            if (searchResponse.IsValid)
             {
-                _logger.LogError(ex, "Error while querying elastic with exception: {Message}", ex.Message);
+                elasticTopDocs.Count = searchResponse.Total;
+                elasticTopDocs.TopDocs = new List<Dictionary<string, object>>(searchResponse.Documents);
+                elasticTopDocs.Fields = hits;
+            }
+            else
+            {
+                _logger.LogError("Received failure response from Elasticsearch: {ServerError}", searchResponse.ServerError);
             }
-
-            return elasticTopDocs;
         }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error while querying elastic with exception: {Message}", ex.Message);
+        }
+
+        return elasticTopDocs;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticQuerySource.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticQuerySource.cs
index 58d1e27b794..8f0af71881e 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticQuerySource.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticQuerySource.cs
@@ -15,82 +15,81 @@
 using YesSql;
 using YesSql.Services;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Services
+namespace OrchardCore.Search.Elasticsearch.Core.Services;
+
+public sealed class ElasticQuerySource : IQuerySource
 {
-    public sealed class ElasticQuerySource : IQuerySource
+    public const string SourceName = "Elasticsearch";
+
+    private readonly IElasticQueryService _queryService;
+    private readonly ILiquidTemplateManager _liquidTemplateManager;
+    private readonly ISession _session;
+    private readonly JavaScriptEncoder _javaScriptEncoder;
+    private readonly TemplateOptions _templateOptions;
+
+    public ElasticQuerySource(
+        IElasticQueryService queryService,
+        ILiquidTemplateManager liquidTemplateManager,
+        ISession session,
+        JavaScriptEncoder javaScriptEncoder,
+        IOptions<TemplateOptions> templateOptions)
     {
-        public const string SourceName = "Elasticsearch";
+        _queryService = queryService;
+        _liquidTemplateManager = liquidTemplateManager;
+        _session = session;
+        _javaScriptEncoder = javaScriptEncoder;
+        _templateOptions = templateOptions.Value;
+    }
 
-        private readonly IElasticQueryService _queryService;
-        private readonly ILiquidTemplateManager _liquidTemplateManager;
-        private readonly ISession _session;
-        private readonly JavaScriptEncoder _javaScriptEncoder;
-        private readonly TemplateOptions _templateOptions;
+    public string Name
+        => SourceName;
 
-        public ElasticQuerySource(
-            IElasticQueryService queryService,
-            ILiquidTemplateManager liquidTemplateManager,
-            ISession session,
-            JavaScriptEncoder javaScriptEncoder,
-            IOptions<TemplateOptions> templateOptions)
-        {
-            _queryService = queryService;
-            _liquidTemplateManager = liquidTemplateManager;
-            _session = session;
-            _javaScriptEncoder = javaScriptEncoder;
-            _templateOptions = templateOptions.Value;
-        }
+    public async Task<IQueryResults> ExecuteQueryAsync(Query query, IDictionary<string, object> parameters)
+    {
+        var metadata = query.As<ElasticsearchQueryMetadata>();
+        var elasticQueryResults = new ElasticQueryResults();
 
-        public string Name
-            => SourceName;
+        var tokenizedContent = await _liquidTemplateManager.RenderStringAsync(metadata?.Template, _javaScriptEncoder, parameters.Select(x => new KeyValuePair<string, FluidValue>(x.Key, FluidValue.Create(x.Value, _templateOptions))));
+        var docs = await _queryService.SearchAsync(metadata?.Index, tokenizedContent);
+        elasticQueryResults.Count = docs.Count;
 
-        public async Task<IQueryResults> ExecuteQueryAsync(Query query, IDictionary<string, object> parameters)
+        if (query.ReturnContentItems)
         {
-            var metadata = query.As<ElasticsearchQueryMetadata>();
-            var elasticQueryResults = new ElasticQueryResults();
+            // We always return an empty collection if the bottom lines queries have no results.
+            elasticQueryResults.Items = [];
 
-            var tokenizedContent = await _liquidTemplateManager.RenderStringAsync(metadata?.Template, _javaScriptEncoder, parameters.Select(x => new KeyValuePair<string, FluidValue>(x.Key, FluidValue.Create(x.Value, _templateOptions))));
-            var docs = await _queryService.SearchAsync(metadata?.Index, tokenizedContent);
-            elasticQueryResults.Count = docs.Count;
+            // Load corresponding content item versions.
+            var topDocs = docs.TopDocs.Where(x => x != null).ToList();
 
-            if (query.ReturnContentItems)
+            if (topDocs.Count > 0)
             {
-                // We always return an empty collection if the bottom lines queries have no results.
-                elasticQueryResults.Items = [];
+                var indexedContentItemVersionIds = topDocs.Select(x => x.GetValueOrDefault("ContentItemVersionId").ToString()).ToArray();
+                var dbContentItems = await _session.Query<ContentItem, ContentItemIndex>(x => x.ContentItemVersionId.IsIn(indexedContentItemVersionIds)).ListAsync();
 
-                // Load corresponding content item versions.
-                var topDocs = docs.TopDocs.Where(x => x != null).ToList();
-
-                if (topDocs.Count > 0)
+                // Reorder the result to preserve the one from the Elasticsearch query.
+                if (dbContentItems.Any())
                 {
-                    var indexedContentItemVersionIds = topDocs.Select(x => x.GetValueOrDefault("ContentItemVersionId").ToString()).ToArray();
-                    var dbContentItems = await _session.Query<ContentItem, ContentItemIndex>(x => x.ContentItemVersionId.IsIn(indexedContentItemVersionIds)).ListAsync();
-
-                    // Reorder the result to preserve the one from the Elasticsearch query.
-                    if (dbContentItems.Any())
-                    {
-                        var dbContentItemVersionIds = dbContentItems.ToDictionary(x => x.ContentItemVersionId, x => x);
-                        var indexedAndInDB = indexedContentItemVersionIds.Where(dbContentItemVersionIds.ContainsKey);
-                        elasticQueryResults.Items = indexedAndInDB.Select(x => dbContentItemVersionIds[x]).ToArray();
-                    }
+                    var dbContentItemVersionIds = dbContentItems.ToDictionary(x => x.ContentItemVersionId, x => x);
+                    var indexedAndInDB = indexedContentItemVersionIds.Where(dbContentItemVersionIds.ContainsKey);
+                    elasticQueryResults.Items = indexedAndInDB.Select(x => dbContentItemVersionIds[x]).ToArray();
                 }
-
-                // TODO : get ContentItemVersionId from docs.Fields
             }
-            else
-            {
-                var results = new List<JsonObject>();
 
-                foreach (var document in docs.TopDocs)
-                {
-                    results.Add(new JsonObject(document.Select(x =>
-                        KeyValuePair.Create(x.Key, (JsonNode)JsonValue.Create(x.Value.ToString())))));
-                }
+            // TODO : get ContentItemVersionId from docs.Fields
+        }
+        else
+        {
+            var results = new List<JsonObject>();
 
-                elasticQueryResults.Items = results;
+            foreach (var document in docs.TopDocs)
+            {
+                results.Add(new JsonObject(document.Select(x =>
+                    KeyValuePair.Create(x.Key, (JsonNode)JsonValue.Create(x.Value.ToString())))));
             }
 
-            return elasticQueryResults;
+            elasticQueryResults.Items = results;
         }
+
+        return elasticQueryResults;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticSearchQueryService.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticSearchQueryService.cs
index b19d54f5769..b5295ce37c4 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticSearchQueryService.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticSearchQueryService.cs
@@ -2,29 +2,28 @@
 using System.Threading.Tasks;
 using Nest;
 
-namespace OrchardCore.Search.Elasticsearch.Core.Services
-{
-    public class ElasticSearchQueryService : IElasticSearchQueryService
-    {
-        private readonly ElasticIndexManager _elasticIndexManager;
+namespace OrchardCore.Search.Elasticsearch.Core.Services;
 
-        public ElasticSearchQueryService(ElasticIndexManager elasticIndexManager)
-        {
-            _elasticIndexManager = elasticIndexManager;
-        }
+public class ElasticSearchQueryService : IElasticSearchQueryService
+{
+    private readonly ElasticIndexManager _elasticIndexManager;
 
-        public async Task<IList<string>> ExecuteQueryAsync(string indexName, QueryContainer query, List<ISort> sort, int from, int size)
-        {
-            var contentItemIds = new List<string>();
+    public ElasticSearchQueryService(ElasticIndexManager elasticIndexManager)
+    {
+        _elasticIndexManager = elasticIndexManager;
+    }
 
-            var results = await _elasticIndexManager.SearchAsync(indexName, query, sort, from, size);
+    public async Task<IList<string>> ExecuteQueryAsync(string indexName, QueryContainer query, List<ISort> sort, int from, int size)
+    {
+        var contentItemIds = new List<string>();
 
-            foreach (var item in results.TopDocs)
-            {
-                contentItemIds.Add(item.GetValueOrDefault("ContentItemId").ToString());
-            }
+        var results = await _elasticIndexManager.SearchAsync(indexName, query, sort, from, size);
 
-            return contentItemIds;
+        foreach (var item in results.TopDocs)
+        {
+            contentItemIds.Add(item.GetValueOrDefault("ContentItemId").ToString());
         }
+
+        return contentItemIds;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Shapes/ElasticContentPickerShapeProvider.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Shapes/ElasticContentPickerShapeProvider.cs
index 6b95e7a1aef..8309030aaca 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Shapes/ElasticContentPickerShapeProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Shapes/ElasticContentPickerShapeProvider.cs
@@ -4,29 +4,28 @@
 using OrchardCore.DisplayManagement.Descriptors;
 using OrchardCore.DisplayManagement.Shapes;
 
-namespace OrchardCore.Search.Elasticsearch
+namespace OrchardCore.Search.Elasticsearch;
+
+public class ElasticContentPickerShapeProvider : IShapeAttributeProvider
 {
-    public class ElasticContentPickerShapeProvider : IShapeAttributeProvider
-    {
-        protected readonly IStringLocalizer S;
+    protected readonly IStringLocalizer S;
 
-        public ElasticContentPickerShapeProvider(IStringLocalizer<ElasticContentPickerShapeProvider> stringLocalizer)
-        {
-            S = stringLocalizer;
-        }
+    public ElasticContentPickerShapeProvider(IStringLocalizer<ElasticContentPickerShapeProvider> stringLocalizer)
+    {
+        S = stringLocalizer;
+    }
 
-        [Shape]
+    [Shape]
 #pragma warning disable CA1707 // Remove the underscores from member name
-        public IHtmlContent ContentPickerField_Option__Elasticsearch(dynamic shape)
+    public IHtmlContent ContentPickerField_Option__Elasticsearch(dynamic shape)
 #pragma warning restore CA1707
+    {
+        var selected = shape.Editor == "Elasticsearch";
+        if (selected)
         {
-            var selected = shape.Editor == "Elasticsearch";
-            if (selected)
-            {
-                return new HtmlString($"<option value=\"Elasticsearch\" selected=\"selected\">{S["Elasticsearch"]}</option>");
-            }
-
-            return new HtmlString($"<option value=\"Elasticsearch\">{S["Elasticsearch"]}</option>");
+            return new HtmlString($"<option value=\"Elasticsearch\" selected=\"selected\">{S["Elasticsearch"]}</option>");
         }
+
+        return new HtmlString($"<option value=\"Elasticsearch\">{S["Elasticsearch"]}</option>");
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/ILuceneAnalyzer.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/ILuceneAnalyzer.cs
index baa61819776..0ad2dde7b48 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/ILuceneAnalyzer.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/ILuceneAnalyzer.cs
@@ -1,13 +1,12 @@
 using Lucene.Net.Analysis;
 
-namespace OrchardCore.Search.Lucene
+namespace OrchardCore.Search.Lucene;
+
+/// <summary>
+/// Represents an <see cref="Analyzer"/> instance that is available in the system.
+/// </summary>
+public interface ILuceneAnalyzer
 {
-    /// <summary>
-    /// Represents an <see cref="Analyzer"/> instance that is available in the system.
-    /// </summary>
-    public interface ILuceneAnalyzer
-    {
-        string Name { get; }
-        Analyzer CreateAnalyzer();
-    }
+    string Name { get; }
+    Analyzer CreateAnalyzer();
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/ILuceneQueryProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/ILuceneQueryProvider.cs
index ec43f2250ef..ef31643fcb0 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/ILuceneQueryProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/ILuceneQueryProvider.cs
@@ -1,10 +1,9 @@
 using System.Text.Json.Nodes;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene
+namespace OrchardCore.Search.Lucene;
+
+public interface ILuceneQueryProvider
 {
-    public interface ILuceneQueryProvider
-    {
-        Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query);
-    }
+    Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query);
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/ILuceneQueryService.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/ILuceneQueryService.cs
index fe68c92af6a..9f4eb509c97 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/ILuceneQueryService.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/ILuceneQueryService.cs
@@ -2,19 +2,18 @@
 using System.Threading.Tasks;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene
+namespace OrchardCore.Search.Lucene;
+
+public interface ILuceneQueryService
 {
-    public interface ILuceneQueryService
-    {
-        /// <summary>
-        /// <para>Provides a way to execute a search request in Lucene based on a JSON object.</para>
-        /// <para>OC implementation serializes that JSON object to a Lucene Query based on its <see cref="ILuceneQueryProvider"/> implementations.</para>
-        /// </summary>
-        /// <param name="context"></param>
-        /// <param name="queryObj"></param>
-        /// <returns><see cref="LuceneTopDocs"/>.</returns>
-        Task<LuceneTopDocs> SearchAsync(LuceneQueryContext context, JsonObject queryObj);
+    /// <summary>
+    /// <para>Provides a way to execute a search request in Lucene based on a JSON object.</para>
+    /// <para>OC implementation serializes that JSON object to a Lucene Query based on its <see cref="ILuceneQueryProvider"/> implementations.</para>
+    /// </summary>
+    /// <param name="context"></param>
+    /// <param name="queryObj"></param>
+    /// <returns><see cref="LuceneTopDocs"/>.</returns>
+    Task<LuceneTopDocs> SearchAsync(LuceneQueryContext context, JsonObject queryObj);
 
-        Query CreateQueryFragment(LuceneQueryContext context, JsonObject queryObj);
-    }
+    Query CreateQueryFragment(LuceneQueryContext context, JsonObject queryObj);
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/ILuceneSearchQueryService.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/ILuceneSearchQueryService.cs
index 53cacd510fa..b707b5227d3 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/ILuceneSearchQueryService.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/ILuceneSearchQueryService.cs
@@ -2,18 +2,17 @@
 using System.Threading.Tasks;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene
+namespace OrchardCore.Search.Lucene;
+
+public interface ILuceneSearchQueryService
 {
-    public interface ILuceneSearchQueryService
-    {
-        /// <summary>
-        /// Provides a way to execute a search request in Lucene based on a Lucene Query.
-        /// </summary>
-        /// <param name="query"></param>
-        /// <param name="indexName"></param>
-        /// <param name="start"></param>
-        /// <param name="end"></param>
-        /// <returns><see cref="IList{String}">IList&lt;string&gt;</see>.</returns>
-        Task<IList<string>> ExecuteQueryAsync(Query query, string indexName, int start = 0, int end = 20);
-    }
+    /// <summary>
+    /// Provides a way to execute a search request in Lucene based on a Lucene Query.
+    /// </summary>
+    /// <param name="query"></param>
+    /// <param name="indexName"></param>
+    /// <param name="start"></param>
+    /// <param name="end"></param>
+    /// <returns><see cref="IList{String}">IList&lt;string&gt;</see>.</returns>
+    Task<IList<string>> ExecuteQueryAsync(Query query, string indexName, int start = 0, int end = 20);
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/Indexing/Index.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/Indexing/Index.cs
index a3b54a4b5d7..1a6f356c527 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/Indexing/Index.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/Indexing/Index.cs
@@ -1,30 +1,29 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Search.Lucene.Indexing
+namespace OrchardCore.Search.Lucene.Indexing;
+
+/// <summary>
+/// Represents the settings of a Lucene index.
+/// </summary>
+public class Index
 {
     /// <summary>
-    /// Represents the settings of a Lucene index.
+    /// Gets or sets the technical name of the index.
     /// </summary>
-    public class Index
-    {
-        /// <summary>
-        /// Gets or sets the technical name of the index.
-        /// </summary>
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the name of the default analyzer.
-        /// </summary>
-        public string DefaultAnalyzer { get; set; }
+    /// <summary>
+    /// Gets or sets the name of the default analyzer.
+    /// </summary>
+    public string DefaultAnalyzer { get; set; }
 
-        /// <summary>
-        /// Gets or sets the list of default search fields.
-        /// </summary>
-        public string[] DefaultSearchFields { get; set; }
+    /// <summary>
+    /// Gets or sets the list of default search fields.
+    /// </summary>
+    public string[] DefaultSearchFields { get; set; }
 
-        /// <summary>
-        /// Gets the list of types to index indexed by name.
-        /// </summary>
-        public Dictionary<string, Mapping> Mappings { get; init; } = [];
-    }
+    /// <summary>
+    /// Gets the list of types to index indexed by name.
+    /// </summary>
+    public Dictionary<string, Mapping> Mappings { get; init; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/Indexing/Mapping.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/Indexing/Mapping.cs
index e95e8d0447f..dab6dd659f1 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/Indexing/Mapping.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/Indexing/Mapping.cs
@@ -1,15 +1,14 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Search.Lucene.Indexing
+namespace OrchardCore.Search.Lucene.Indexing;
+
+/// <summary>
+/// Represents the information of a content type in a Lucene index.
+/// </summary>
+public class Mapping
 {
     /// <summary>
-    /// Represents the information of a content type in a Lucene index.
+    /// Gets the list properties to index indexed by name.
     /// </summary>
-    public class Mapping
-    {
-        /// <summary>
-        /// Gets the list properties to index indexed by name.
-        /// </summary>
-        public Dictionary<string, Property> Properties { get; init; } = [];
-    }
+    public Dictionary<string, Property> Properties { get; init; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/Indexing/Property.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/Indexing/Property.cs
index 6418fd8dd10..cbfb5883250 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/Indexing/Property.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/Indexing/Property.cs
@@ -1,57 +1,56 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Search.Lucene.Indexing
+namespace OrchardCore.Search.Lucene.Indexing;
+
+/// <summary>
+/// Represents the Lucene index settings of a property.
+/// </summary>
+public class Property
 {
     /// <summary>
-    /// Represents the Lucene index settings of a property.
-    /// </summary>
-    public class Property
-    {
-        /// <summary>
-        /// Gets or sets the data type in the Lucene index.
-        /// </summary>
-        public Types Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets whether the field should be searchable or not. Default is. <code>true</code>.
-        /// </summary>
-        public bool? Index { get; set; }
-
-        /// <summary>
-        /// Gets or sets whether the field value should be stored and retrievable. Default is. <code>false</code>.
-        /// </summary>
-        public bool? Store { get; set; }
-
-        /// <summary>
-        /// Gets or sets whether the field value should included in the. <code>_all</code> field. Default is. <code>false</code>.
-        /// </summary>
-        public bool? IncludeInAll { get; set; }
-
-        /// <summary>
-        /// Gets or sets the scaling factor of the field. Values will be multiplied by this factor at index time
-        /// and rounded to the closest value.
-        /// </summary>
-        public int? ScalingFactor { get; set; }
-
-        /// <summary>
-        /// Gets or sets the analyzer to be used at both index-time and search-time unless overridden by the
-        /// <see cref="SearchAnalyzer"/>.
-        /// </summary>
-        public string Analyzer { get; set; }
-
-        /// <summary>
-        /// Gets or sets the analyzer to be used at search-time.
-        /// </summary>
-        public string SearchAnalyzer { get; set; }
-
-        /// <summary>
-        /// Gets the list of supplemental values to be indexed.
-        /// </summary>
-        public Dictionary<string, Property> Fields { get; init; } = [];
-
-        /// <summary>
-        /// Gets or sets the query time boosting.
-        /// </summary>
-        public float? Boost { get; set; }
-    }
+    /// Gets or sets the data type in the Lucene index.
+    /// </summary>
+    public Types Type { get; set; }
+
+    /// <summary>
+    /// Gets or sets whether the field should be searchable or not. Default is. <code>true</code>.
+    /// </summary>
+    public bool? Index { get; set; }
+
+    /// <summary>
+    /// Gets or sets whether the field value should be stored and retrievable. Default is. <code>false</code>.
+    /// </summary>
+    public bool? Store { get; set; }
+
+    /// <summary>
+    /// Gets or sets whether the field value should included in the. <code>_all</code> field. Default is. <code>false</code>.
+    /// </summary>
+    public bool? IncludeInAll { get; set; }
+
+    /// <summary>
+    /// Gets or sets the scaling factor of the field. Values will be multiplied by this factor at index time
+    /// and rounded to the closest value.
+    /// </summary>
+    public int? ScalingFactor { get; set; }
+
+    /// <summary>
+    /// Gets or sets the analyzer to be used at both index-time and search-time unless overridden by the
+    /// <see cref="SearchAnalyzer"/>.
+    /// </summary>
+    public string Analyzer { get; set; }
+
+    /// <summary>
+    /// Gets or sets the analyzer to be used at search-time.
+    /// </summary>
+    public string SearchAnalyzer { get; set; }
+
+    /// <summary>
+    /// Gets the list of supplemental values to be indexed.
+    /// </summary>
+    public Dictionary<string, Property> Fields { get; init; } = [];
+
+    /// <summary>
+    /// Gets or sets the query time boosting.
+    /// </summary>
+    public float? Boost { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/Indexing/Types.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/Indexing/Types.cs
index ed1ddccab36..ec03c5e20d1 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/Indexing/Types.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/Indexing/Types.cs
@@ -1,21 +1,20 @@
-namespace OrchardCore.Search.Lucene.Indexing
+namespace OrchardCore.Search.Lucene.Indexing;
+
+public enum Types
 {
-    public enum Types
-    {
-        // Numeric
-        Long,
+    // Numeric
+    Long,
 
-        Integer,
-        Short,
-        Byte,
-        Double,
-        Float,
-        ScaledFloat,
+    Integer,
+    Short,
+    Byte,
+    Double,
+    Float,
+    ScaledFloat,
 
-        Boolean,
-        Binary,
-        Date,
-        Text,
-        Keyword,
-    }
+    Boolean,
+    Binary,
+    Date,
+    Text,
+    Keyword,
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/LuceneOptions.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/LuceneOptions.cs
index 5ad3aacb758..05f5f50f8ba 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/LuceneOptions.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/LuceneOptions.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Search.Lucene
+namespace OrchardCore.Search.Lucene;
+
+public class LuceneOptions
 {
-    public class LuceneOptions
-    {
-        public IList<ILuceneAnalyzer> Analyzers { get; } = [];
-    }
+    public IList<ILuceneAnalyzer> Analyzers { get; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/LuceneQueryContext.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/LuceneQueryContext.cs
index aecb6517401..0c7df268740 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/LuceneQueryContext.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/LuceneQueryContext.cs
@@ -2,19 +2,18 @@
 using Lucene.Net.Search;
 using Lucene.Net.Util;
 
-namespace OrchardCore.Search.Lucene
+namespace OrchardCore.Search.Lucene;
+
+public class LuceneQueryContext
 {
-    public class LuceneQueryContext
+    public LuceneQueryContext(IndexSearcher indexSearcher, LuceneVersion defaultVersion, Analyzer defaultAnalyzer)
     {
-        public LuceneQueryContext(IndexSearcher indexSearcher, LuceneVersion defaultVersion, Analyzer defaultAnalyzer)
-        {
-            DefaultAnalyzer = defaultAnalyzer;
-            DefaultVersion = defaultVersion;
-            IndexSearcher = indexSearcher;
-        }
-
-        public LuceneVersion DefaultVersion { get; } = LuceneVersion.LUCENE_48;
-        public Analyzer DefaultAnalyzer { get; }
-        public IndexSearcher IndexSearcher { get; set; }
+        DefaultAnalyzer = defaultAnalyzer;
+        DefaultVersion = defaultVersion;
+        IndexSearcher = indexSearcher;
     }
+
+    public LuceneVersion DefaultVersion { get; } = LuceneVersion.LUCENE_48;
+    public Analyzer DefaultAnalyzer { get; }
+    public IndexSearcher IndexSearcher { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/LuceneQueryResults.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/LuceneQueryResults.cs
index 4f341164a98..4f05e7c6d9e 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/LuceneQueryResults.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/LuceneQueryResults.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 using OrchardCore.Queries;
 
-namespace OrchardCore.Search.Lucene
+namespace OrchardCore.Search.Lucene;
+
+public class LuceneQueryResults : IQueryResults
 {
-    public class LuceneQueryResults : IQueryResults
-    {
-        public IEnumerable<object> Items { get; set; }
-        public int Count { get; set; }
-    }
+    public IEnumerable<object> Items { get; set; }
+    public int Count { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/LuceneTopDocs.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/LuceneTopDocs.cs
index 292ee88e500..6acd757fd91 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/LuceneTopDocs.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/LuceneTopDocs.cs
@@ -1,10 +1,9 @@
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene
+namespace OrchardCore.Search.Lucene;
+
+public class LuceneTopDocs
 {
-    public class LuceneTopDocs
-    {
-        public TopDocs TopDocs { get; set; }
-        public int Count { get; set; }
-    }
+    public TopDocs TopDocs { get; set; }
+    public int Count { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/LuceneQueryService.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/LuceneQueryService.cs
index 64c489ac1b0..ef4802476e5 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/LuceneQueryService.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/LuceneQueryService.cs
@@ -8,50 +8,66 @@
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene
+namespace OrchardCore.Search.Lucene;
+
+public class LuceneQueryService : ILuceneQueryService
 {
-    public class LuceneQueryService : ILuceneQueryService
+    private readonly IEnumerable<ILuceneQueryProvider> _queryProviders;
+
+    public LuceneQueryService(IEnumerable<ILuceneQueryProvider> queryProviders)
     {
-        private readonly IEnumerable<ILuceneQueryProvider> _queryProviders;
+        _queryProviders = queryProviders;
+    }
 
-        public LuceneQueryService(IEnumerable<ILuceneQueryProvider> queryProviders)
-        {
-            _queryProviders = queryProviders;
-        }
+    public Task<LuceneTopDocs> SearchAsync(LuceneQueryContext context, JsonObject queryObj)
+    {
+        var queryProp = queryObj["query"].AsObject()
+            ?? throw new ArgumentException("Query DSL requires a [query] property");
 
-        public Task<LuceneTopDocs> SearchAsync(LuceneQueryContext context, JsonObject queryObj)
-        {
-            var queryProp = queryObj["query"].AsObject()
-                ?? throw new ArgumentException("Query DSL requires a [query] property");
+        var query = CreateQueryFragment(context, queryProp);
 
-            var query = CreateQueryFragment(context, queryProp);
+        var sortProperty = queryObj["sort"];
+        var fromProperty = queryObj["from"];
+        var sizeProperty = queryObj["size"];
 
-            var sortProperty = queryObj["sort"];
-            var fromProperty = queryObj["from"];
-            var sizeProperty = queryObj["size"];
+        var size = sizeProperty.ValueOrDefault<int>(10);
+        var from = fromProperty.ValueOrDefault<int>(0);
 
-            var size = sizeProperty.ValueOrDefault<int>(10);
-            var from = fromProperty.ValueOrDefault<int>(0);
+        string sortField = null;
+        string sortOrder = null;
 
-            string sortField = null;
-            string sortOrder = null;
+        var sortFields = new List<SortField>();
 
-            var sortFields = new List<SortField>();
+        if (sortProperty is not null)
+        {
+            string sortType;
 
-            if (sortProperty is not null)
+            if (sortProperty.GetValueKind() == JsonValueKind.String)
+            {
+                sortField = sortProperty.ToString();
+                sortFields.Add(new SortField(sortField, SortFieldType.STRING, sortOrder == "desc"));
+            }
+            else if (sortProperty is JsonObject jsonObject)
             {
-                string sortType;
+                sortField = jsonObject.First().Key;
+                sortOrder = jsonObject.First().Value["order"].ToString();
+                sortType = jsonObject.First().Value["type"]?.ToString();
+                var sortFieldType = SortFieldType.STRING;
 
-                if (sortProperty.GetValueKind() == JsonValueKind.String)
+                if (sortType != null)
                 {
-                    sortField = sortProperty.ToString();
-                    sortFields.Add(new SortField(sortField, SortFieldType.STRING, sortOrder == "desc"));
+                    sortFieldType = (SortFieldType)Enum.Parse(typeof(SortFieldType), sortType.ToUpper());
                 }
-                else if (sortProperty is JsonObject jsonObject)
+
+                sortFields.Add(new SortField(sortField, sortFieldType, sortOrder == "desc"));
+            }
+            else if (sortProperty is JsonArray jsonArray)
+            {
+                foreach (var item in jsonArray)
                 {
-                    sortField = jsonObject.First().Key;
-                    sortOrder = jsonObject.First().Value["order"].ToString();
-                    sortType = jsonObject.First().Value["type"]?.ToString();
+                    sortField = item.AsObject().First().Key;
+                    sortOrder = item.AsObject().First().Value["order"].ToString();
+                    sortType = item.AsObject().First().Value["type"]?.ToString();
                     var sortFieldType = SortFieldType.STRING;
 
                     if (sortType != null)
@@ -61,91 +77,74 @@ public Task<LuceneTopDocs> SearchAsync(LuceneQueryContext context, JsonObject qu
 
                     sortFields.Add(new SortField(sortField, sortFieldType, sortOrder == "desc"));
                 }
-                else if (sortProperty is JsonArray jsonArray)
-                {
-                    foreach (var item in jsonArray)
-                    {
-                        sortField = item.AsObject().First().Key;
-                        sortOrder = item.AsObject().First().Value["order"].ToString();
-                        sortType = item.AsObject().First().Value["type"]?.ToString();
-                        var sortFieldType = SortFieldType.STRING;
-
-                        if (sortType != null)
-                        {
-                            sortFieldType = (SortFieldType)Enum.Parse(typeof(SortFieldType), sortType.ToUpper());
-                        }
-
-                        sortFields.Add(new SortField(sortField, sortFieldType, sortOrder == "desc"));
-                    }
-                }
             }
+        }
+
+        LuceneTopDocs result = null;
 
-            LuceneTopDocs result = null;
+        if (size > 0)
+        {
+            TopDocs topDocs = context.IndexSearcher.Search(
+                query,
+                size + from,
+                sortField == null ? Sort.RELEVANCE : new Sort(sortFields.ToArray())
+            );
 
-            if (size > 0)
+            if (from > 0)
             {
-                TopDocs topDocs = context.IndexSearcher.Search(
-                    query,
-                    size + from,
-                    sortField == null ? Sort.RELEVANCE : new Sort(sortFields.ToArray())
-                );
+                topDocs = new TopDocs(topDocs.TotalHits - from, topDocs.ScoreDocs.Skip(from).ToArray(), topDocs.MaxScore);
+            }
 
-                if (from > 0)
-                {
-                    topDocs = new TopDocs(topDocs.TotalHits - from, topDocs.ScoreDocs.Skip(from).ToArray(), topDocs.MaxScore);
-                }
+            var collector = new TotalHitCountCollector();
+            context.IndexSearcher.Search(query, collector);
 
-                var collector = new TotalHitCountCollector();
-                context.IndexSearcher.Search(query, collector);
+            result = new LuceneTopDocs() { TopDocs = topDocs, Count = collector.TotalHits };
+        }
 
-                result = new LuceneTopDocs() { TopDocs = topDocs, Count = collector.TotalHits };
-            }
+        return Task.FromResult(result);
+    }
 
-            return Task.FromResult(result);
-        }
+    public Query CreateQueryFragment(LuceneQueryContext context, JsonObject queryObj)
+    {
+        var first = queryObj.First();
 
-        public Query CreateQueryFragment(LuceneQueryContext context, JsonObject queryObj)
-        {
-            var first = queryObj.First();
+        Query query = null;
 
-            Query query = null;
+        foreach (var queryProvider in _queryProviders)
+        {
+            query = queryProvider.CreateQuery(this, context, first.Key, first.Value.AsObject());
 
-            foreach (var queryProvider in _queryProviders)
+            if (query != null)
             {
-                query = queryProvider.CreateQuery(this, context, first.Key, first.Value.AsObject());
-
-                if (query != null)
-                {
-                    break;
-                }
+                break;
             }
+        }
 
-            return query;
+        return query;
+    }
+
+    public static List<string> Tokenize(string fieldName, string text, Analyzer analyzer)
+    {
+        if (string.IsNullOrEmpty(text))
+        {
+            return [];
         }
 
-        public static List<string> Tokenize(string fieldName, string text, Analyzer analyzer)
+        var result = new List<string>();
+        using (var tokenStream = analyzer.GetTokenStream(fieldName, text))
         {
-            if (string.IsNullOrEmpty(text))
+            tokenStream.Reset();
+            while (tokenStream.IncrementToken())
             {
-                return [];
-            }
+                var termAttribute = tokenStream.GetAttribute<ICharTermAttribute>();
 
-            var result = new List<string>();
-            using (var tokenStream = analyzer.GetTokenStream(fieldName, text))
-            {
-                tokenStream.Reset();
-                while (tokenStream.IncrementToken())
+                if (termAttribute != null)
                 {
-                    var termAttribute = tokenStream.GetAttribute<ICharTermAttribute>();
-
-                    if (termAttribute != null)
-                    {
-                        result.Add(termAttribute.ToString());
-                    }
+                    result.Add(termAttribute.ToString());
                 }
             }
-
-            return result;
         }
+
+        return result;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/BooleanQueryProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/BooleanQueryProvider.cs
index c18c74173b1..a44ea9ae783 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/BooleanQueryProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/BooleanQueryProvider.cs
@@ -6,121 +6,120 @@
 using Lucene.Net.Search;
 using OrchardCore.Search.Lucene.QueryProviders.Filters;
 
-namespace OrchardCore.Search.Lucene.QueryProviders
+namespace OrchardCore.Search.Lucene.QueryProviders;
+
+public class BooleanQueryProvider : ILuceneQueryProvider
 {
-    public class BooleanQueryProvider : ILuceneQueryProvider
+    private readonly IEnumerable<ILuceneBooleanFilterProvider> _filters;
+
+    public BooleanQueryProvider(IEnumerable<ILuceneBooleanFilterProvider> filters)
     {
-        private readonly IEnumerable<ILuceneBooleanFilterProvider> _filters;
+        _filters = filters;
+    }
 
-        public BooleanQueryProvider(IEnumerable<ILuceneBooleanFilterProvider> filters)
+    public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
+    {
+        if (type != "bool")
         {
-            _filters = filters;
+            return null;
         }
 
-        public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
+        var boolQuery = new BooleanQuery();
+
+        foreach (var property in query)
         {
-            if (type != "bool")
+            var occur = Occur.MUST;
+            var isProps = false;
+
+            switch (property.Key.ToLowerInvariant())
             {
-                return null;
+                case "must":
+                    occur = Occur.MUST;
+                    break;
+                case "mustnot":
+                case "must_not":
+                    occur = Occur.MUST_NOT;
+                    break;
+                case "should":
+                    occur = Occur.SHOULD;
+                    break;
+                case "boost":
+                    boolQuery.Boost = property.Value.Value<float>();
+                    isProps = true;
+                    break;
+                case "minimum_should_match":
+                    boolQuery.MinimumNumberShouldMatch = property.Value.Value<int>();
+                    isProps = true;
+                    break;
+                case "filter":
+                    return CreateFilteredQuery(builder, context, boolQuery, property.Value);
+                default: throw new ArgumentException($"Invalid property '{property.Key}' in boolean query");
             }
 
-            var boolQuery = new BooleanQuery();
-
-            foreach (var property in query)
+            if (!isProps)
             {
-                var occur = Occur.MUST;
-                var isProps = false;
-
-                switch (property.Key.ToLowerInvariant())
+                switch (property.Value.GetValueKind())
                 {
-                    case "must":
-                        occur = Occur.MUST;
-                        break;
-                    case "mustnot":
-                    case "must_not":
-                        occur = Occur.MUST_NOT;
+                    case JsonValueKind.Object:
+                        boolQuery.Add(builder.CreateQueryFragment(context, property.Value.AsObject()), occur);
                         break;
-                    case "should":
-                        occur = Occur.SHOULD;
-                        break;
-                    case "boost":
-                        boolQuery.Boost = property.Value.Value<float>();
-                        isProps = true;
-                        break;
-                    case "minimum_should_match":
-                        boolQuery.MinimumNumberShouldMatch = property.Value.Value<int>();
-                        isProps = true;
-                        break;
-                    case "filter":
-                        return CreateFilteredQuery(builder, context, boolQuery, property.Value);
-                    default: throw new ArgumentException($"Invalid property '{property.Key}' in boolean query");
-                }
-
-                if (!isProps)
-                {
-                    switch (property.Value.GetValueKind())
-                    {
-                        case JsonValueKind.Object:
-                            boolQuery.Add(builder.CreateQueryFragment(context, property.Value.AsObject()), occur);
-                            break;
-                        case JsonValueKind.Array:
-                            foreach (var item in property.Value.AsArray())
+                    case JsonValueKind.Array:
+                        foreach (var item in property.Value.AsArray())
+                        {
+                            if (item.GetValueKind() != JsonValueKind.Object)
                             {
-                                if (item.GetValueKind() != JsonValueKind.Object)
-                                {
-                                    throw new ArgumentException($"Invalid value in boolean query");
-                                }
-                                boolQuery.Add(builder.CreateQueryFragment(context, item.AsObject()), occur);
+                                throw new ArgumentException($"Invalid value in boolean query");
                             }
-                            break;
-                        default: throw new ArgumentException($"Invalid value in boolean query");
-                    }
+                            boolQuery.Add(builder.CreateQueryFragment(context, item.AsObject()), occur);
+                        }
+                        break;
+                    default: throw new ArgumentException($"Invalid value in boolean query");
                 }
             }
-
-            return boolQuery;
         }
 
-        private Query CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, Query query, JsonNode filter)
+        return boolQuery;
+    }
+
+    private Query CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, Query query, JsonNode filter)
+    {
+        Query filteredQuery = null;
+        var queryObj = filter.AsObject();
+
+        switch (filter.GetValueKind())
         {
-            Query filteredQuery = null;
-            var queryObj = filter.AsObject();
+            case JsonValueKind.Object:
+                var first = queryObj.First();
 
-            switch (filter.GetValueKind())
-            {
-                case JsonValueKind.Object:
-                    var first = queryObj.First();
+                foreach (var queryProvider in _filters)
+                {
+                    filteredQuery = queryProvider.CreateFilteredQuery(builder, context, first.Key, first.Value, query);
+
+                    if (filteredQuery != null)
+                    {
+                        break;
+                    }
+                }
+                break;
+            case JsonValueKind.Array:
+                foreach (var item in filter.AsArray())
+                {
+                    var firstQuery = item.AsObject().First();
 
                     foreach (var queryProvider in _filters)
                     {
-                        filteredQuery = queryProvider.CreateFilteredQuery(builder, context, first.Key, first.Value, query);
+                        filteredQuery = queryProvider.CreateFilteredQuery(builder, context, firstQuery.Key, firstQuery.Value, query);
 
                         if (filteredQuery != null)
                         {
                             break;
                         }
                     }
-                    break;
-                case JsonValueKind.Array:
-                    foreach (var item in filter.AsArray())
-                    {
-                        var firstQuery = item.AsObject().First();
-
-                        foreach (var queryProvider in _filters)
-                        {
-                            filteredQuery = queryProvider.CreateFilteredQuery(builder, context, firstQuery.Key, firstQuery.Value, query);
-
-                            if (filteredQuery != null)
-                            {
-                                break;
-                            }
-                        }
-                    }
-                    break;
-                default: throw new ArgumentException($"Invalid value in boolean query");
-            }
-
-            return filteredQuery;
+                }
+                break;
+            default: throw new ArgumentException($"Invalid value in boolean query");
         }
+
+        return filteredQuery;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/FuzzyFilterProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/FuzzyFilterProvider.cs
index 066a5dfe668..b14d1c38abd 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/FuzzyFilterProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/FuzzyFilterProvider.cs
@@ -6,64 +6,63 @@
 using Lucene.Net.Search;
 using Lucene.Net.Util.Automaton;
 
-namespace OrchardCore.Search.Lucene.QueryProviders.Filters
+namespace OrchardCore.Search.Lucene.QueryProviders.Filters;
+
+public class FuzzyFilterProvider : ILuceneBooleanFilterProvider
 {
-    public class FuzzyFilterProvider : ILuceneBooleanFilterProvider
+    public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
     {
-        public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
+        if (type != "fuzzy")
         {
-            if (type != "fuzzy")
-            {
-                return null;
-            }
+            return null;
+        }
 
-            if (toFilter is not BooleanQuery booleanQuery)
-            {
-                return null;
-            }
+        if (toFilter is not BooleanQuery booleanQuery)
+        {
+            return null;
+        }
 
-            var queryObj = filter.AsObject();
-            var first = queryObj.First();
+        var queryObj = filter.AsObject();
+        var first = queryObj.First();
 
-            FuzzyQuery fuzzyQuery;
+        FuzzyQuery fuzzyQuery;
 
-            switch (first.Value.GetValueKind())
-            {
-                case JsonValueKind.String:
-                    fuzzyQuery = new FuzzyQuery(new Term(first.Key, first.Value.ToString()));
-                    break;
-                case JsonValueKind.Object:
-                    var obj = first.Value.AsObject();
+        switch (first.Value.GetValueKind())
+        {
+            case JsonValueKind.String:
+                fuzzyQuery = new FuzzyQuery(new Term(first.Key, first.Value.ToString()));
+                break;
+            case JsonValueKind.Object:
+                var obj = first.Value.AsObject();
 
-                    if (!obj.TryGetPropertyValue("value", out var value))
-                    {
-                        throw new ArgumentException("Missing value in fuzzy query");
-                    }
+                if (!obj.TryGetPropertyValue("value", out var value))
+                {
+                    throw new ArgumentException("Missing value in fuzzy query");
+                }
 
-                    obj.TryGetPropertyValue("fuzziness", out var fuzziness);
-                    obj.TryGetPropertyValue("prefix_length", out var prefixLength);
-                    obj.TryGetPropertyValue("max_expansions", out var maxExpansions);
+                obj.TryGetPropertyValue("fuzziness", out var fuzziness);
+                obj.TryGetPropertyValue("prefix_length", out var prefixLength);
+                obj.TryGetPropertyValue("max_expansions", out var maxExpansions);
 
-                    fuzzyQuery = new FuzzyQuery(
-                        new Term(first.Key, value.Value<string>()),
-                        fuzziness?.Value<int>() ?? LevenshteinAutomata.MAXIMUM_SUPPORTED_DISTANCE,
-                        prefixLength?.Value<int>() ?? 0,
-                        maxExpansions?.Value<int>() ?? 50,
-                        true);
+                fuzzyQuery = new FuzzyQuery(
+                    new Term(first.Key, value.Value<string>()),
+                    fuzziness?.Value<int>() ?? LevenshteinAutomata.MAXIMUM_SUPPORTED_DISTANCE,
+                    prefixLength?.Value<int>() ?? 0,
+                    maxExpansions?.Value<int>() ?? 50,
+                    true);
 
-                    if (obj.TryGetPropertyValue("boost", out var boost))
-                    {
-                        fuzzyQuery.Boost = boost.Value<float>();
-                    }
+                if (obj.TryGetPropertyValue("boost", out var boost))
+                {
+                    fuzzyQuery.Boost = boost.Value<float>();
+                }
 
-                    break;
-                default: throw new ArgumentException("Invalid fuzzy query");
-            }
+                break;
+            default: throw new ArgumentException("Invalid fuzzy query");
+        }
 
-            booleanQuery.Add(fuzzyQuery, Occur.MUST);
-            var queryFilter = new QueryWrapperFilter(fuzzyQuery);
+        booleanQuery.Add(fuzzyQuery, Occur.MUST);
+        var queryFilter = new QueryWrapperFilter(fuzzyQuery);
 
-            return new FilteredQuery(booleanQuery, queryFilter);
-        }
+        return new FilteredQuery(booleanQuery, queryFilter);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/GeoBoundingBoxFilterProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/GeoBoundingBoxFilterProvider.cs
index dae406edd76..a632d83425b 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/GeoBoundingBoxFilterProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/GeoBoundingBoxFilterProvider.cs
@@ -8,61 +8,60 @@
 using Lucene.Net.Spatial.Util;
 using Spatial4n.Context;
 
-namespace OrchardCore.Search.Lucene.QueryProviders.Filters
+namespace OrchardCore.Search.Lucene.QueryProviders.Filters;
+
+public class GeoBoundingBoxFilterProvider : ILuceneBooleanFilterProvider
 {
-    public class GeoBoundingBoxFilterProvider : ILuceneBooleanFilterProvider
+    public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
     {
-        public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
+        if (type != "geo_bounding_box")
         {
-            if (type != "geo_bounding_box")
-            {
-                return null;
-            }
+            return null;
+        }
 
-            if (toFilter is not BooleanQuery booleanQuery)
-            {
-                return null;
-            }
+        if (toFilter is not BooleanQuery booleanQuery)
+        {
+            return null;
+        }
 
-            var queryObj = filter.AsObject();
-            var first = queryObj.First();
+        var queryObj = filter.AsObject();
+        var first = queryObj.First();
 
-            var ctx = SpatialContext.Geo;
+        var ctx = SpatialContext.Geo;
 
-            var maxLevels = 11; // results in sub-meter precision for geohash
+        var maxLevels = 11; // results in sub-meter precision for geohash
 
-            // This can also be constructed from SpatialPrefixTreeFactory
-            SpatialPrefixTree grid = new GeohashPrefixTree(ctx, maxLevels);
+        // This can also be constructed from SpatialPrefixTreeFactory
+        SpatialPrefixTree grid = new GeohashPrefixTree(ctx, maxLevels);
 
-            var geoPropertyName = first.Key;
-            var strategy = new RecursivePrefixTreeStrategy(grid, geoPropertyName);
+        var geoPropertyName = first.Key;
+        var strategy = new RecursivePrefixTreeStrategy(grid, geoPropertyName);
 
-            var boundingBox = first.Value.AsObject();
+        var boundingBox = first.Value.AsObject();
 
-            var topLeftProperty = boundingBox["top_left"].AsObject();
-            var bottomRightProperty = boundingBox["bottom_right"].AsObject();
+        var topLeftProperty = boundingBox["top_left"].AsObject();
+        var bottomRightProperty = boundingBox["bottom_right"].AsObject();
 
-            if (topLeftProperty == null || bottomRightProperty == null)
-            {
-                return null;
-            }
+        if (topLeftProperty == null || bottomRightProperty == null)
+        {
+            return null;
+        }
 
-            var left = topLeftProperty["lon"];
-            var top = topLeftProperty["lat"];
-            var bottom = bottomRightProperty["lat"];
-            var right = bottomRightProperty["lon"];
+        var left = topLeftProperty["lon"];
+        var top = topLeftProperty["lat"];
+        var bottom = bottomRightProperty["lat"];
+        var right = bottomRightProperty["lon"];
 
-            var rectangle = ctx.MakeRectangle((double)left, (double)right, (double)bottom, (double)top);
+        var rectangle = ctx.MakeRectangle((double)left, (double)right, (double)bottom, (double)top);
 
-            var args = new SpatialArgs(SpatialOperation.Intersects, rectangle);
+        var args = new SpatialArgs(SpatialOperation.Intersects, rectangle);
 
-            var spatialQuery = strategy.MakeQuery(args);
-            var valueSource = strategy.MakeRecipDistanceValueSource(rectangle);
-            var valueSourceFilter = new ValueSourceFilter(new QueryWrapperFilter(spatialQuery), valueSource, 0, 1);
+        var spatialQuery = strategy.MakeQuery(args);
+        var valueSource = strategy.MakeRecipDistanceValueSource(rectangle);
+        var valueSourceFilter = new ValueSourceFilter(new QueryWrapperFilter(spatialQuery), valueSource, 0, 1);
 
-            booleanQuery.Add(new FunctionQuery(valueSource), Occur.MUST);
+        booleanQuery.Add(new FunctionQuery(valueSource), Occur.MUST);
 
-            return new FilteredQuery(booleanQuery, valueSourceFilter);
-        }
+        return new FilteredQuery(booleanQuery, valueSourceFilter);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/GeoDistanceFilterProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/GeoDistanceFilterProvider.cs
index 982b78bc77a..1420503fd65 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/GeoDistanceFilterProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/GeoDistanceFilterProvider.cs
@@ -13,200 +13,199 @@
 using Spatial4n.Shapes;
 using Spatial4n.Util;
 
-namespace OrchardCore.Search.Lucene.QueryProviders.Filters
+namespace OrchardCore.Search.Lucene.QueryProviders.Filters;
+
+public partial class GeoDistanceFilterProvider : ILuceneBooleanFilterProvider
 {
-    public partial class GeoDistanceFilterProvider : ILuceneBooleanFilterProvider
+    public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
     {
-        public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
+        if (type != "geo_distance")
         {
-            if (type != "geo_distance")
-            {
-                return null;
-            }
+            return null;
+        }
 
-            if (toFilter is not BooleanQuery booleanQuery)
-            {
-                return null;
-            }
+        if (toFilter is not BooleanQuery booleanQuery)
+        {
+            return null;
+        }
 
-            var queryObj = filter.AsObject();
+        var queryObj = filter.AsObject();
 
-            if (queryObj.Count != 2)
-            {
-                return null;
-            }
+        if (queryObj.Count != 2)
+        {
+            return null;
+        }
 
-            var ctx = SpatialContext.Geo;
+        var ctx = SpatialContext.Geo;
 
-            var maxLevels = 11; // Results in sub-meter precision for geohash.
+        var maxLevels = 11; // Results in sub-meter precision for geohash.
 
-            // This can also be constructed from SpatialPrefixTreeFactory.
-            SpatialPrefixTree grid = new GeohashPrefixTree(ctx, maxLevels);
+        // This can also be constructed from SpatialPrefixTreeFactory.
+        SpatialPrefixTree grid = new GeohashPrefixTree(ctx, maxLevels);
 
-            JsonNode distanceProperty = null;
-            JsonNode geoProperty = null;
+        JsonNode distanceProperty = null;
+        JsonNode geoProperty = null;
 
-            foreach (var jProperty in queryObj)
+        foreach (var jProperty in queryObj)
+        {
+            if (jProperty.Key.Equals("distance", StringComparison.Ordinal))
             {
-                if (jProperty.Key.Equals("distance", StringComparison.Ordinal))
-                {
-                    distanceProperty = jProperty.Value;
-                }
-                else
-                {
-                    geoProperty = jProperty.Value;
-                }
+                distanceProperty = jProperty.Value;
             }
-
-            if (distanceProperty == null || geoProperty == null)
+            else
             {
-                return null;
+                geoProperty = jProperty.Value;
             }
+        }
 
-            var strategy = new RecursivePrefixTreeStrategy(grid, geoProperty.GetPropertyName());
-
-            if (!TryParseDistance(distanceProperty.Value<string>(), out var distanceDegrees))
-            {
-                return null;
-            }
+        if (distanceProperty == null || geoProperty == null)
+        {
+            return null;
+        }
 
-            if (!TryGetPointFromJToken(geoProperty, out var point))
-            {
-                return null;
-            }
+        var strategy = new RecursivePrefixTreeStrategy(grid, geoProperty.GetPropertyName());
 
-            var circle = ctx.MakeCircle(point.X, point.Y, distanceDegrees);
+        if (!TryParseDistance(distanceProperty.Value<string>(), out var distanceDegrees))
+        {
+            return null;
+        }
 
-            var args = new SpatialArgs(SpatialOperation.Intersects, circle);
+        if (!TryGetPointFromJToken(geoProperty, out var point))
+        {
+            return null;
+        }
 
-            var spatialQuery = strategy.MakeQuery(args);
-            var valueSource = strategy.MakeRecipDistanceValueSource(circle);
-            var valueSourceFilter = new ValueSourceFilter(new QueryWrapperFilter(spatialQuery), valueSource, 0, 1);
+        var circle = ctx.MakeCircle(point.X, point.Y, distanceDegrees);
 
-            booleanQuery.Add(new FunctionQuery(valueSource), Occur.MUST);
+        var args = new SpatialArgs(SpatialOperation.Intersects, circle);
 
-            return new FilteredQuery(booleanQuery, valueSourceFilter);
-        }
+        var spatialQuery = strategy.MakeQuery(args);
+        var valueSource = strategy.MakeRecipDistanceValueSource(circle);
+        var valueSourceFilter = new ValueSourceFilter(new QueryWrapperFilter(spatialQuery), valueSource, 0, 1);
 
-        private static bool TryParseDistance(string distanceValue, out double distanceDegrees)
-        {
-            distanceDegrees = -1;
+        booleanQuery.Add(new FunctionQuery(valueSource), Occur.MUST);
 
-            var distanceString = StringDistanceRegex().Match(distanceValue).Value;
+        return new FilteredQuery(booleanQuery, valueSourceFilter);
+    }
 
-            if (string.IsNullOrEmpty(distanceString))
-            {
-                return false;
-            }
+    private static bool TryParseDistance(string distanceValue, out double distanceDegrees)
+    {
+        distanceDegrees = -1;
 
-            var distanceUnits = distanceValue[distanceString.Length..].ToLower();
+        var distanceString = StringDistanceRegex().Match(distanceValue).Value;
 
-            if (!double.TryParse(distanceString, out var distance))
-            {
-                return false;
-            }
+        if (string.IsNullOrEmpty(distanceString))
+        {
+            return false;
+        }
 
-            switch (distanceUnits)
-            {
-                case "mi":
-                case "miles":
-                    distanceDegrees = DistanceUtils.Dist2Degrees(distance, DistanceUtils.EarthMeanRadiusMiles);
-                    return true;
-                case "km":
-                case "kilometers":
-                    distanceDegrees = DistanceUtils.Dist2Degrees(distance, DistanceUtils.EarthMeanRadiusKilometers);
-                    return true;
-                case "ft":
-                case "feet":
-                    distanceDegrees = DistanceUtils.Dist2Degrees(distance / 5280, DistanceUtils.EarthMeanRadiusMiles);
-                    return true;
-                case "yd":
-                case "yards":
-                    distanceDegrees = DistanceUtils.Dist2Degrees(distance / 1760, DistanceUtils.EarthMeanRadiusMiles);
-                    return true;
-                case "in":
-                case "inch":
-                    distanceDegrees = DistanceUtils.Dist2Degrees(distance / 63360, DistanceUtils.EarthMeanRadiusMiles);
-                    return true;
-                case "m":
-                case "meters":
-                    distanceDegrees = DistanceUtils.Dist2Degrees(distance / 1000, DistanceUtils.EarthMeanRadiusKilometers);
-                    return true;
-                case "cm":
-                case "centimeters":
-                    distanceDegrees = DistanceUtils.Dist2Degrees(distance / 100000, DistanceUtils.EarthMeanRadiusKilometers);
-                    return true;
-                case "mm":
-                case "millimeters":
-                    distanceDegrees = DistanceUtils.Dist2Degrees(distance / 1000000, DistanceUtils.EarthMeanRadiusKilometers);
-                    return true;
-                case "nm":
-                case "nmi":
-                case "nauticalmiles":
-                    distanceDegrees = DistanceUtils.Dist2Degrees(distance * 1.852, DistanceUtils.EarthMeanRadiusKilometers);
-                    return true;
-            }
+        var distanceUnits = distanceValue[distanceString.Length..].ToLower();
 
+        if (!double.TryParse(distanceString, out var distance))
+        {
             return false;
         }
 
-        private static bool TryGetPointFromJToken(JsonNode geoToken, out IPoint point)
+        switch (distanceUnits)
         {
-            point = null;
+            case "mi":
+            case "miles":
+                distanceDegrees = DistanceUtils.Dist2Degrees(distance, DistanceUtils.EarthMeanRadiusMiles);
+                return true;
+            case "km":
+            case "kilometers":
+                distanceDegrees = DistanceUtils.Dist2Degrees(distance, DistanceUtils.EarthMeanRadiusKilometers);
+                return true;
+            case "ft":
+            case "feet":
+                distanceDegrees = DistanceUtils.Dist2Degrees(distance / 5280, DistanceUtils.EarthMeanRadiusMiles);
+                return true;
+            case "yd":
+            case "yards":
+                distanceDegrees = DistanceUtils.Dist2Degrees(distance / 1760, DistanceUtils.EarthMeanRadiusMiles);
+                return true;
+            case "in":
+            case "inch":
+                distanceDegrees = DistanceUtils.Dist2Degrees(distance / 63360, DistanceUtils.EarthMeanRadiusMiles);
+                return true;
+            case "m":
+            case "meters":
+                distanceDegrees = DistanceUtils.Dist2Degrees(distance / 1000, DistanceUtils.EarthMeanRadiusKilometers);
+                return true;
+            case "cm":
+            case "centimeters":
+                distanceDegrees = DistanceUtils.Dist2Degrees(distance / 100000, DistanceUtils.EarthMeanRadiusKilometers);
+                return true;
+            case "mm":
+            case "millimeters":
+                distanceDegrees = DistanceUtils.Dist2Degrees(distance / 1000000, DistanceUtils.EarthMeanRadiusKilometers);
+                return true;
+            case "nm":
+            case "nmi":
+            case "nauticalmiles":
+                distanceDegrees = DistanceUtils.Dist2Degrees(distance * 1.852, DistanceUtils.EarthMeanRadiusKilometers);
+                return true;
+        }
 
-            var ctx = SpatialContext.Geo;
+        return false;
+    }
 
-            switch (geoToken.GetValueKind())
-            {
-                case JsonValueKind.String:
-                    var geoStringValue = geoToken.ToString();
+    private static bool TryGetPointFromJToken(JsonNode geoToken, out IPoint point)
+    {
+        point = null;
 
-                    var geoStringSplit = geoStringValue.Split(',');
+        var ctx = SpatialContext.Geo;
 
-                    if (geoStringSplit.Length == 2)
-                    {
-                        if (!double.TryParse(geoStringSplit[0], out var lat))
-                        {
-                            return false;
-                        }
-
-                        if (!double.TryParse(geoStringSplit[1], out var lon))
-                        {
-                            return false;
-                        }
-
-                        point = new Point(lon, lat, ctx);
-                        return true;
-                    }
+        switch (geoToken.GetValueKind())
+        {
+            case JsonValueKind.String:
+                var geoStringValue = geoToken.ToString();
 
-                    point = GeohashUtils.Decode(geoStringValue, ctx);
-                    return true;
-                case JsonValueKind.Object:
-                    var geoPointValue = geoToken.AsObject();
+                var geoStringSplit = geoStringValue.Split(',');
 
-                    if (!geoPointValue.ContainsKey("lon") || !geoPointValue.ContainsKey("lat"))
+                if (geoStringSplit.Length == 2)
+                {
+                    if (!double.TryParse(geoStringSplit[0], out var lat))
                     {
                         return false;
                     }
 
-                    point = new Point(geoPointValue["lon"].Value<double>(), geoPointValue["lat"].Value<double>(), ctx);
-                    return true;
-                case JsonValueKind.Array:
-                    var geoArrayValue = geoToken.AsArray();
-
-                    if (geoArrayValue.Count != 2)
+                    if (!double.TryParse(geoStringSplit[1], out var lon))
                     {
                         return false;
                     }
 
-                    point = new Point(geoArrayValue[0].Value<double>(), geoArrayValue[1].Value<double>(), ctx);
-
+                    point = new Point(lon, lat, ctx);
                     return true;
-                default: throw new ArgumentException("Invalid geo point representation");
-            }
-        }
+                }
 
-        [GeneratedRegex(@"^((\d+(\.\d*)?)|(\.\d+))")]
-        private static partial Regex StringDistanceRegex();
+                point = GeohashUtils.Decode(geoStringValue, ctx);
+                return true;
+            case JsonValueKind.Object:
+                var geoPointValue = geoToken.AsObject();
+
+                if (!geoPointValue.ContainsKey("lon") || !geoPointValue.ContainsKey("lat"))
+                {
+                    return false;
+                }
+
+                point = new Point(geoPointValue["lon"].Value<double>(), geoPointValue["lat"].Value<double>(), ctx);
+                return true;
+            case JsonValueKind.Array:
+                var geoArrayValue = geoToken.AsArray();
+
+                if (geoArrayValue.Count != 2)
+                {
+                    return false;
+                }
+
+                point = new Point(geoArrayValue[0].Value<double>(), geoArrayValue[1].Value<double>(), ctx);
+
+                return true;
+            default: throw new ArgumentException("Invalid geo point representation");
+        }
     }
+
+    [GeneratedRegex(@"^((\d+(\.\d*)?)|(\.\d+))")]
+    private static partial Regex StringDistanceRegex();
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/ILuceneBooleanFilterProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/ILuceneBooleanFilterProvider.cs
index b82adaf1712..26891fd3d25 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/ILuceneBooleanFilterProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/ILuceneBooleanFilterProvider.cs
@@ -1,10 +1,9 @@
 using System.Text.Json.Nodes;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders.Filters
+namespace OrchardCore.Search.Lucene.QueryProviders.Filters;
+
+public interface ILuceneBooleanFilterProvider
 {
-    public interface ILuceneBooleanFilterProvider
-    {
-        FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode token, Query toFilter);
-    }
+    FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode token, Query toFilter);
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/MatchAllFilterProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/MatchAllFilterProvider.cs
index e75fdf2c594..f7546bbef79 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/MatchAllFilterProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/MatchAllFilterProvider.cs
@@ -1,28 +1,27 @@
 using System.Text.Json.Nodes;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders.Filters
+namespace OrchardCore.Search.Lucene.QueryProviders.Filters;
+
+public class MatchAllFilterProvider : ILuceneBooleanFilterProvider
 {
-    public class MatchAllFilterProvider : ILuceneBooleanFilterProvider
+    public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
     {
-        public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
+        if (type != "match_all")
         {
-            if (type != "match_all")
-            {
-                return null;
-            }
+            return null;
+        }
 
-            if (toFilter is not BooleanQuery booleanQuery)
-            {
-                return null;
-            }
+        if (toFilter is not BooleanQuery booleanQuery)
+        {
+            return null;
+        }
 
-            var matchAllQuery = new MatchAllDocsQuery();
+        var matchAllQuery = new MatchAllDocsQuery();
 
-            booleanQuery.Add(matchAllQuery, Occur.MUST);
-            var queryFilter = new QueryWrapperFilter(matchAllQuery);
+        booleanQuery.Add(matchAllQuery, Occur.MUST);
+        var queryFilter = new QueryWrapperFilter(matchAllQuery);
 
-            return new FilteredQuery(booleanQuery, queryFilter);
-        }
+        return new FilteredQuery(booleanQuery, queryFilter);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/MatchFilterProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/MatchFilterProvider.cs
index 9685f67d198..09067b648d9 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/MatchFilterProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/MatchFilterProvider.cs
@@ -5,79 +5,78 @@
 using Lucene.Net.Index;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders.Filters
+namespace OrchardCore.Search.Lucene.QueryProviders.Filters;
+
+public class MatchFilterProvider : ILuceneBooleanFilterProvider
 {
-    public class MatchFilterProvider : ILuceneBooleanFilterProvider
+    public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
     {
-        public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
+        if (type != "match")
         {
-            if (type != "match")
-            {
-                return null;
-            }
+            return null;
+        }
 
-            if (toFilter is not BooleanQuery booleanQuery)
-            {
-                return null;
-            }
+        if (toFilter is not BooleanQuery booleanQuery)
+        {
+            return null;
+        }
 
-            var queryObj = filter.AsObject();
-            var first = queryObj.First();
+        var queryObj = filter.AsObject();
+        var first = queryObj.First();
 
-            var boolQuery = new BooleanQuery();
-            QueryWrapperFilter queryFilter;
+        var boolQuery = new BooleanQuery();
+        QueryWrapperFilter queryFilter;
 
-            switch (first.Value.GetValueKind())
-            {
-                case JsonValueKind.String:
-                    foreach (var term in LuceneQueryService.Tokenize(first.Key, first.Value.ToString(), context.DefaultAnalyzer))
-                    {
-                        boolQuery.Add(new TermQuery(new Term(first.Key, term)), Occur.SHOULD);
-                    }
-                    break;
-                case JsonValueKind.Object:
-                    var obj = first.Value.AsObject();
-                    var value = obj["query"]?.Value<string>();
+        switch (first.Value.GetValueKind())
+        {
+            case JsonValueKind.String:
+                foreach (var term in LuceneQueryService.Tokenize(first.Key, first.Value.ToString(), context.DefaultAnalyzer))
+                {
+                    boolQuery.Add(new TermQuery(new Term(first.Key, term)), Occur.SHOULD);
+                }
+                break;
+            case JsonValueKind.Object:
+                var obj = first.Value.AsObject();
+                var value = obj["query"]?.Value<string>();
 
-                    if (obj.TryGetPropertyValue("boost", out var boost))
-                    {
-                        boolQuery.Boost = boost.Value<float>();
-                    }
+                if (obj.TryGetPropertyValue("boost", out var boost))
+                {
+                    boolQuery.Boost = boost.Value<float>();
+                }
 
-                    var occur = Occur.SHOULD;
-                    if (obj.TryGetPropertyValue("operator", out var op))
-                    {
-                        occur = op.ToString() == "and" ? Occur.MUST : Occur.SHOULD;
-                    }
+                var occur = Occur.SHOULD;
+                if (obj.TryGetPropertyValue("operator", out var op))
+                {
+                    occur = op.ToString() == "and" ? Occur.MUST : Occur.SHOULD;
+                }
 
-                    var terms = LuceneQueryService.Tokenize(first.Key, value, context.DefaultAnalyzer);
+                var terms = LuceneQueryService.Tokenize(first.Key, value, context.DefaultAnalyzer);
 
-                    if (terms.Count == 0)
+                if (terms.Count == 0)
+                {
+                    if (obj.TryGetPropertyValue("zero_terms_query", out var zeroTermsQuery))
                     {
-                        if (obj.TryGetPropertyValue("zero_terms_query", out var zeroTermsQuery))
+                        if (zeroTermsQuery.ToString() == "all")
                         {
-                            if (zeroTermsQuery.ToString() == "all")
-                            {
-                                var matchAllDocsQuery = new MatchAllDocsQuery();
-                                booleanQuery.Add(matchAllDocsQuery, Occur.MUST);
-                                break;
-                            }
+                            var matchAllDocsQuery = new MatchAllDocsQuery();
+                            booleanQuery.Add(matchAllDocsQuery, Occur.MUST);
+                            break;
                         }
                     }
+                }
 
-                    foreach (var term in terms)
-                    {
-                        boolQuery.Add(new TermQuery(new Term(first.Key, term)), occur);
-                    }
+                foreach (var term in terms)
+                {
+                    boolQuery.Add(new TermQuery(new Term(first.Key, term)), occur);
+                }
 
-                    break;
-                default: throw new ArgumentException("Invalid query");
-            }
+                break;
+            default: throw new ArgumentException("Invalid query");
+        }
 
-            booleanQuery.Add(boolQuery, Occur.MUST);
-            queryFilter = new QueryWrapperFilter(boolQuery);
+        booleanQuery.Add(boolQuery, Occur.MUST);
+        queryFilter = new QueryWrapperFilter(boolQuery);
 
-            return new FilteredQuery(booleanQuery, queryFilter);
-        }
+        return new FilteredQuery(booleanQuery, queryFilter);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/MatchPhraseFilterProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/MatchPhraseFilterProvider.cs
index ca4bbb5ede3..f21be20e213 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/MatchPhraseFilterProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/MatchPhraseFilterProvider.cs
@@ -5,61 +5,60 @@
 using Lucene.Net.Index;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders.Filters
+namespace OrchardCore.Search.Lucene.QueryProviders.Filters;
+
+public class MatchPhraseFilterProvider : ILuceneBooleanFilterProvider
 {
-    public class MatchPhraseFilterProvider : ILuceneBooleanFilterProvider
+    public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
     {
-        public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
+        if (type != "match_phrase")
         {
-            if (type != "match_phrase")
-            {
-                return null;
-            }
+            return null;
+        }
 
-            if (toFilter is not BooleanQuery booleanQuery)
-            {
-                return null;
-            }
+        if (toFilter is not BooleanQuery booleanQuery)
+        {
+            return null;
+        }
 
-            var queryObj = filter.AsObject();
-            var first = queryObj.First();
+        var queryObj = filter.AsObject();
+        var first = queryObj.First();
 
-            var phraseQuery = new PhraseQuery();
-            JsonNode value;
+        var phraseQuery = new PhraseQuery();
+        JsonNode value;
 
-            switch (first.Value.GetValueKind())
-            {
-                case JsonValueKind.String:
-                    value = first.Value;
-                    break;
-                case JsonValueKind.Object:
-                    var obj = first.Value.AsObject();
+        switch (first.Value.GetValueKind())
+        {
+            case JsonValueKind.String:
+                value = first.Value;
+                break;
+            case JsonValueKind.Object:
+                var obj = first.Value.AsObject();
 
-                    if (!obj.TryGetPropertyValue("value", out value))
-                    {
-                        throw new ArgumentException("Missing value in match phrase query");
-                    }
+                if (!obj.TryGetPropertyValue("value", out value))
+                {
+                    throw new ArgumentException("Missing value in match phrase query");
+                }
 
-                    // TODO: read "analyzer" property
+                // TODO: read "analyzer" property
 
-                    if (obj.TryGetPropertyValue("slop", out var slop))
-                    {
-                        phraseQuery.Slop = slop.Value<int>();
-                    }
+                if (obj.TryGetPropertyValue("slop", out var slop))
+                {
+                    phraseQuery.Slop = slop.Value<int>();
+                }
 
-                    break;
-                default: throw new ArgumentException("Invalid wildcard query");
-            }
+                break;
+            default: throw new ArgumentException("Invalid wildcard query");
+        }
 
-            foreach (var term in LuceneQueryService.Tokenize(first.Key, value.Value<string>(), context.DefaultAnalyzer))
-            {
-                phraseQuery.Add(new Term(first.Key, term));
-            }
+        foreach (var term in LuceneQueryService.Tokenize(first.Key, value.Value<string>(), context.DefaultAnalyzer))
+        {
+            phraseQuery.Add(new Term(first.Key, term));
+        }
 
-            booleanQuery.Add(phraseQuery, Occur.MUST);
-            var queryFilter = new QueryWrapperFilter(phraseQuery);
+        booleanQuery.Add(phraseQuery, Occur.MUST);
+        var queryFilter = new QueryWrapperFilter(phraseQuery);
 
-            return new FilteredQuery(booleanQuery, queryFilter);
-        }
+        return new FilteredQuery(booleanQuery, queryFilter);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/PrefixFilterProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/PrefixFilterProvider.cs
index da292af306b..c75df2bb516 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/PrefixFilterProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/PrefixFilterProvider.cs
@@ -5,62 +5,61 @@
 using Lucene.Net.Index;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders.Filters
+namespace OrchardCore.Search.Lucene.QueryProviders.Filters;
+
+public class PrefixFilterProvider : ILuceneBooleanFilterProvider
 {
-    public class PrefixFilterProvider : ILuceneBooleanFilterProvider
+    public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
     {
-        public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
+        if (type != "prefix")
         {
-            if (type != "prefix")
-            {
-                return null;
-            }
+            return null;
+        }
 
-            if (toFilter is not BooleanQuery booleanQuery)
-            {
-                return null;
-            }
+        if (toFilter is not BooleanQuery booleanQuery)
+        {
+            return null;
+        }
 
-            var queryObj = filter.AsObject();
-            var first = queryObj.First();
+        var queryObj = filter.AsObject();
+        var first = queryObj.First();
 
-            // A prefix query has only one member, which can either be a string or an object
-            PrefixQuery prefixQuery;
+        // A prefix query has only one member, which can either be a string or an object
+        PrefixQuery prefixQuery;
 
-            switch (first.Value.GetValueKind())
-            {
-                case JsonValueKind.String:
-                    prefixQuery = new PrefixQuery(new Term(first.Key, first.Value.ToString()));
-                    break;
-                case JsonValueKind.Object:
-                    var obj = first.Value.AsObject();
+        switch (first.Value.GetValueKind())
+        {
+            case JsonValueKind.String:
+                prefixQuery = new PrefixQuery(new Term(first.Key, first.Value.ToString()));
+                break;
+            case JsonValueKind.Object:
+                var obj = first.Value.AsObject();
 
-                    if (obj.TryGetPropertyValue("value", out var value))
-                    {
-                        prefixQuery = new PrefixQuery(new Term(first.Key, value.Value<string>()));
-                    }
-                    else if (obj.TryGetPropertyValue("prefix", out var prefix))
-                    {
-                        prefixQuery = new PrefixQuery(new Term(first.Key, prefix.Value<string>()));
-                    }
-                    else
-                    {
-                        throw new ArgumentException("Prefix query misses prefix value");
-                    }
+                if (obj.TryGetPropertyValue("value", out var value))
+                {
+                    prefixQuery = new PrefixQuery(new Term(first.Key, value.Value<string>()));
+                }
+                else if (obj.TryGetPropertyValue("prefix", out var prefix))
+                {
+                    prefixQuery = new PrefixQuery(new Term(first.Key, prefix.Value<string>()));
+                }
+                else
+                {
+                    throw new ArgumentException("Prefix query misses prefix value");
+                }
 
-                    if (obj.TryGetPropertyValue("boost", out var boost))
-                    {
-                        prefixQuery.Boost = boost.Value<float>();
-                    }
+                if (obj.TryGetPropertyValue("boost", out var boost))
+                {
+                    prefixQuery.Boost = boost.Value<float>();
+                }
 
-                    break;
-                default: throw new ArgumentException("Invalid prefix query");
-            }
+                break;
+            default: throw new ArgumentException("Invalid prefix query");
+        }
 
-            booleanQuery.Add(prefixQuery, Occur.MUST);
-            var queryFilter = new QueryWrapperFilter(prefixQuery);
+        booleanQuery.Add(prefixQuery, Occur.MUST);
+        var queryFilter = new QueryWrapperFilter(prefixQuery);
 
-            return new FilteredQuery(booleanQuery, queryFilter);
-        }
+        return new FilteredQuery(booleanQuery, queryFilter);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/RangeFilterProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/RangeFilterProvider.cs
index 98bf687e8d5..26e1d9cb4b5 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/RangeFilterProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/RangeFilterProvider.cs
@@ -4,114 +4,113 @@
 using System.Text.Json.Nodes;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders.Filters
+namespace OrchardCore.Search.Lucene.QueryProviders.Filters;
+
+public class RangeFilterProvider : ILuceneBooleanFilterProvider
 {
-    public class RangeFilterProvider : ILuceneBooleanFilterProvider
+    public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
     {
-        public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
+        if (type != "range")
         {
-            if (type != "range")
-            {
-                return null;
-            }
+            return null;
+        }
 
-            if (toFilter is not BooleanQuery booleanQuery)
-            {
-                return null;
-            }
+        if (toFilter is not BooleanQuery booleanQuery)
+        {
+            return null;
+        }
 
-            var queryObj = filter.AsObject();
-            var range = queryObj.First();
+        var queryObj = filter.AsObject();
+        var range = queryObj.First();
 
-            Query rangeQuery;
+        Query rangeQuery;
 
-            switch (range.Value.GetValueKind())
-            {
-                case JsonValueKind.Object:
-                    var field = range.Key;
+        switch (range.Value.GetValueKind())
+        {
+            case JsonValueKind.Object:
+                var field = range.Key;
 
-                    JsonNode gt = null;
-                    JsonNode lt = null;
-                    var nodeKind = JsonValueKind.Null;
-                    float? boost = null;
+                JsonNode gt = null;
+                JsonNode lt = null;
+                var nodeKind = JsonValueKind.Null;
+                float? boost = null;
 
-                    bool includeLower = false, includeUpper = false;
+                bool includeLower = false, includeUpper = false;
 
-                    foreach (var element in range.Value.AsObject())
+                foreach (var element in range.Value.AsObject())
+                {
+                    switch (element.Key.ToLowerInvariant())
                     {
-                        switch (element.Key.ToLowerInvariant())
+                        case "gt":
+                            gt = element.Value;
+                            nodeKind = gt.GetValueKind();
+                            break;
+                        case "gte":
+                            gt = element.Value;
+                            nodeKind = gt.GetValueKind();
+                            includeLower = true;
+                            break;
+                        case "lt":
+                            lt = element.Value;
+                            nodeKind = lt.GetValueKind();
+                            break;
+                        case "lte":
+                            lt = element.Value;
+                            nodeKind = lt.GetValueKind();
+                            includeUpper = true;
+                            break;
+                        case "boost":
+                            boost = element.Value.Value<float>();
+                            break;
+                    }
+                }
+
+                if (gt is not null && lt is not null && gt.GetValueKind() != lt.GetValueKind())
+                {
+                    throw new ArgumentException("Lower and upper bound range types don't match");
+                }
+
+                switch (nodeKind)
+                {
+                    case JsonValueKind.Number:
+                        if (gt.AsValue().TryGetValue<long>(out var minInt) &&
+                            lt.AsValue().TryGetValue<long>(out var maxInt))
                         {
-                            case "gt":
-                                gt = element.Value;
-                                nodeKind = gt.GetValueKind();
-                                break;
-                            case "gte":
-                                gt = element.Value;
-                                nodeKind = gt.GetValueKind();
-                                includeLower = true;
-                                break;
-                            case "lt":
-                                lt = element.Value;
-                                nodeKind = lt.GetValueKind();
-                                break;
-                            case "lte":
-                                lt = element.Value;
-                                nodeKind = lt.GetValueKind();
-                                includeUpper = true;
-                                break;
-                            case "boost":
-                                boost = element.Value.Value<float>();
-                                break;
+                            rangeQuery = NumericRangeQuery.NewInt64Range(field, minInt, maxInt, includeLower, includeUpper);
+                        }
+                        else if (gt.AsValue().TryGetValue<double>(out var minFloat) &&
+                            lt.AsValue().TryGetValue<double>(out var maxFloat))
+                        {
+                            rangeQuery = NumericRangeQuery.NewDoubleRange(field, minFloat, maxFloat, includeLower, includeUpper);
+                        }
+                        else
+                        {
+                            throw new ArgumentException($"Unsupported range value type: {type}");
                         }
-                    }
-
-                    if (gt is not null && lt is not null && gt.GetValueKind() != lt.GetValueKind())
-                    {
-                        throw new ArgumentException("Lower and upper bound range types don't match");
-                    }
-
-                    switch (nodeKind)
-                    {
-                        case JsonValueKind.Number:
-                            if (gt.AsValue().TryGetValue<long>(out var minInt) &&
-                                lt.AsValue().TryGetValue<long>(out var maxInt))
-                            {
-                                rangeQuery = NumericRangeQuery.NewInt64Range(field, minInt, maxInt, includeLower, includeUpper);
-                            }
-                            else if (gt.AsValue().TryGetValue<double>(out var minFloat) &&
-                                lt.AsValue().TryGetValue<double>(out var maxFloat))
-                            {
-                                rangeQuery = NumericRangeQuery.NewDoubleRange(field, minFloat, maxFloat, includeLower, includeUpper);
-                            }
-                            else
-                            {
-                                throw new ArgumentException($"Unsupported range value type: {type}");
-                            }
 
-                            break;
+                        break;
 
-                        case JsonValueKind.String:
-                            var minString = gt?.Value<string>();
-                            var maxString = lt?.Value<string>();
-                            rangeQuery = TermRangeQuery.NewStringRange(field, minString, maxString, includeLower, includeUpper);
-                            break;
+                    case JsonValueKind.String:
+                        var minString = gt?.Value<string>();
+                        var maxString = lt?.Value<string>();
+                        rangeQuery = TermRangeQuery.NewStringRange(field, minString, maxString, includeLower, includeUpper);
+                        break;
 
-                        default: throw new ArgumentException($"Unsupported range value type: {type}");
-                    }
+                    default: throw new ArgumentException($"Unsupported range value type: {type}");
+                }
 
-                    if (boost != null)
-                    {
-                        rangeQuery.Boost = boost.Value;
-                    }
+                if (boost != null)
+                {
+                    rangeQuery.Boost = boost.Value;
+                }
 
-                    break;
-                default: throw new ArgumentException("Invalid range query");
-            }
+                break;
+            default: throw new ArgumentException("Invalid range query");
+        }
 
-            booleanQuery.Add(rangeQuery, Occur.MUST);
-            var queryFilter = new QueryWrapperFilter(rangeQuery);
+        booleanQuery.Add(rangeQuery, Occur.MUST);
+        var queryFilter = new QueryWrapperFilter(rangeQuery);
 
-            return new FilteredQuery(booleanQuery, queryFilter);
-        }
+        return new FilteredQuery(booleanQuery, queryFilter);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/TermFilterProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/TermFilterProvider.cs
index b342548ca1a..f3c13b97a93 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/TermFilterProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/TermFilterProvider.cs
@@ -5,50 +5,49 @@
 using Lucene.Net.Index;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders.Filters
+namespace OrchardCore.Search.Lucene.QueryProviders.Filters;
+
+public class TermFilterProvider : ILuceneBooleanFilterProvider
 {
-    public class TermFilterProvider : ILuceneBooleanFilterProvider
+    public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
     {
-        public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
+        if (type != "term")
+        {
+            return null;
+        }
+
+        if (toFilter is not BooleanQuery booleanQuery)
         {
-            if (type != "term")
-            {
-                return null;
-            }
-
-            if (toFilter is not BooleanQuery booleanQuery)
-            {
-                return null;
-            }
-
-            var queryObj = filter.AsObject();
-            var first = queryObj.First();
-
-            // A term query has only one member, which can either be a string or an object
-            TermQuery termQuery;
-
-            switch (first.Value.GetValueKind())
-            {
-                case JsonValueKind.String:
-                    termQuery = new TermQuery(new Term(first.Key, first.Value.ToString()));
-                    break;
-                case JsonValueKind.Object:
-                    var obj = first.Value.AsObject();
-                    var value = obj["value"].Value<string>();
-                    termQuery = new TermQuery(new Term(first.Key, value));
-
-                    if (obj.TryGetPropertyValue("boost", out var boost))
-                    {
-                        termQuery.Boost = boost.Value<float>();
-                    }
-                    break;
-                default: throw new ArgumentException("Invalid term query");
-            }
-
-            booleanQuery.Add(termQuery, Occur.MUST);
-            var queryFilter = new QueryWrapperFilter(termQuery);
-
-            return new FilteredQuery(booleanQuery, queryFilter);
+            return null;
         }
+
+        var queryObj = filter.AsObject();
+        var first = queryObj.First();
+
+        // A term query has only one member, which can either be a string or an object
+        TermQuery termQuery;
+
+        switch (first.Value.GetValueKind())
+        {
+            case JsonValueKind.String:
+                termQuery = new TermQuery(new Term(first.Key, first.Value.ToString()));
+                break;
+            case JsonValueKind.Object:
+                var obj = first.Value.AsObject();
+                var value = obj["value"].Value<string>();
+                termQuery = new TermQuery(new Term(first.Key, value));
+
+                if (obj.TryGetPropertyValue("boost", out var boost))
+                {
+                    termQuery.Boost = boost.Value<float>();
+                }
+                break;
+            default: throw new ArgumentException("Invalid term query");
+        }
+
+        booleanQuery.Add(termQuery, Occur.MUST);
+        var queryFilter = new QueryWrapperFilter(termQuery);
+
+        return new FilteredQuery(booleanQuery, queryFilter);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/TermsFilterProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/TermsFilterProvider.cs
index da05e2e40c8..c79af79fc63 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/TermsFilterProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/TermsFilterProvider.cs
@@ -5,54 +5,53 @@
 using Lucene.Net.Index;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders.Filters
+namespace OrchardCore.Search.Lucene.QueryProviders.Filters;
+
+public class TermsFilterProvider : ILuceneBooleanFilterProvider
 {
-    public class TermsFilterProvider : ILuceneBooleanFilterProvider
+    public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
     {
-        public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
+        if (type != "terms")
         {
-            if (type != "terms")
-            {
-                return null;
-            }
+            return null;
+        }
 
-            if (toFilter is not BooleanQuery booleanQuery)
-            {
-                return null;
-            }
+        if (toFilter is not BooleanQuery booleanQuery)
+        {
+            return null;
+        }
 
-            var queryObj = filter.AsObject();
-            var first = queryObj.First();
+        var queryObj = filter.AsObject();
+        var first = queryObj.First();
 
-            var field = first.Key;
-            var boolQuery = new BooleanQuery();
+        var field = first.Key;
+        var boolQuery = new BooleanQuery();
 
-            switch (first.Value.GetValueKind())
-            {
-                case JsonValueKind.Array:
+        switch (first.Value.GetValueKind())
+        {
+            case JsonValueKind.Array:
 
-                    foreach (var item in first.Value.AsArray())
+                foreach (var item in first.Value.AsArray())
+                {
+                    if (item.GetValueKind() != JsonValueKind.String)
                     {
-                        if (item.GetValueKind() != JsonValueKind.String)
-                        {
-                            throw new ArgumentException($"Invalid term in terms query");
-                        }
-
-                        boolQuery.Add(new TermQuery(new Term(field, item.Value<string>())), Occur.SHOULD);
+                        throw new ArgumentException($"Invalid term in terms query");
                     }
 
-                    break;
-
-                case JsonValueKind.Object:
-                    throw new ArgumentException("The terms lookup query is not supported");
+                    boolQuery.Add(new TermQuery(new Term(field, item.Value<string>())), Occur.SHOULD);
+                }
 
-                default: throw new ArgumentException("Invalid terms query");
-            }
+                break;
 
-            booleanQuery.Add(boolQuery, Occur.MUST);
-            var queryFilter = new QueryWrapperFilter(boolQuery);
+            case JsonValueKind.Object:
+                throw new ArgumentException("The terms lookup query is not supported");
 
-            return new FilteredQuery(booleanQuery, queryFilter);
+            default: throw new ArgumentException("Invalid terms query");
         }
+
+        booleanQuery.Add(boolQuery, Occur.MUST);
+        var queryFilter = new QueryWrapperFilter(boolQuery);
+
+        return new FilteredQuery(booleanQuery, queryFilter);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/WildcardFilterProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/WildcardFilterProvider.cs
index 1c8162ea2f4..51bd318bff1 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/WildcardFilterProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/Filters/WildcardFilterProvider.cs
@@ -5,56 +5,55 @@
 using Lucene.Net.Index;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders.Filters
+namespace OrchardCore.Search.Lucene.QueryProviders.Filters;
+
+public class WildcardFilterProvider : ILuceneBooleanFilterProvider
 {
-    public class WildcardFilterProvider : ILuceneBooleanFilterProvider
+    public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
     {
-        public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonNode filter, Query toFilter)
+        if (type != "wildcard")
+        {
+            return null;
+        }
+
+        if (toFilter is not BooleanQuery booleanQuery)
         {
-            if (type != "wildcard")
-            {
-                return null;
-            }
-
-            if (toFilter is not BooleanQuery booleanQuery)
-            {
-                return null;
-            }
-
-            var queryObj = filter.AsObject();
-            var first = queryObj.First();
-
-            // A term query has only one member, which can either be a string or an object
-            WildcardQuery wildcardQuery;
-
-            switch (first.Value.GetValueKind())
-            {
-                case JsonValueKind.String:
-                    wildcardQuery = new WildcardQuery(new Term(first.Key, first.Value.ToString()));
-                    break;
-                case JsonValueKind.Object:
-                    var obj = first.Value.AsObject();
-
-                    if (!obj.TryGetPropertyValue("value", out var value))
-                    {
-                        throw new ArgumentException("Missing value in wildcard query");
-                    }
-
-                    wildcardQuery = new WildcardQuery(new Term(first.Key, value.Value<string>()));
-
-                    if (obj.TryGetPropertyValue("boost", out var boost))
-                    {
-                        wildcardQuery.Boost = boost.Value<float>();
-                    }
-
-                    break;
-                default: throw new ArgumentException("Invalid wildcard query");
-            }
-
-            booleanQuery.Add(wildcardQuery, Occur.MUST);
-            var queryFilter = new QueryWrapperFilter(wildcardQuery);
-
-            return new FilteredQuery(booleanQuery, queryFilter);
+            return null;
         }
+
+        var queryObj = filter.AsObject();
+        var first = queryObj.First();
+
+        // A term query has only one member, which can either be a string or an object
+        WildcardQuery wildcardQuery;
+
+        switch (first.Value.GetValueKind())
+        {
+            case JsonValueKind.String:
+                wildcardQuery = new WildcardQuery(new Term(first.Key, first.Value.ToString()));
+                break;
+            case JsonValueKind.Object:
+                var obj = first.Value.AsObject();
+
+                if (!obj.TryGetPropertyValue("value", out var value))
+                {
+                    throw new ArgumentException("Missing value in wildcard query");
+                }
+
+                wildcardQuery = new WildcardQuery(new Term(first.Key, value.Value<string>()));
+
+                if (obj.TryGetPropertyValue("boost", out var boost))
+                {
+                    wildcardQuery.Boost = boost.Value<float>();
+                }
+
+                break;
+            default: throw new ArgumentException("Invalid wildcard query");
+        }
+
+        booleanQuery.Add(wildcardQuery, Occur.MUST);
+        var queryFilter = new QueryWrapperFilter(wildcardQuery);
+
+        return new FilteredQuery(booleanQuery, queryFilter);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/FuzzyQueryProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/FuzzyQueryProvider.cs
index 1d134e0f6f2..182853307c9 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/FuzzyQueryProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/FuzzyQueryProvider.cs
@@ -6,51 +6,50 @@
 using Lucene.Net.Search;
 using Lucene.Net.Util.Automaton;
 
-namespace OrchardCore.Search.Lucene.QueryProviders
+namespace OrchardCore.Search.Lucene.QueryProviders;
+
+public class FuzzyQueryProvider : ILuceneQueryProvider
 {
-    public class FuzzyQueryProvider : ILuceneQueryProvider
+    public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
     {
-        public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
+        if (type != "fuzzy")
+        {
+            return null;
+        }
+
+        var first = query.First();
+
+        switch (first.Value.GetValueKind())
         {
-            if (type != "fuzzy")
-            {
-                return null;
-            }
-
-            var first = query.First();
-
-            switch (first.Value.GetValueKind())
-            {
-                case JsonValueKind.String:
-                    return new FuzzyQuery(new Term(first.Key, first.Value.ToString()));
-
-                case JsonValueKind.Object:
-                    var obj = first.Value.AsObject();
-
-                    if (!obj.TryGetPropertyValue("value", out var value))
-                    {
-                        throw new ArgumentException("Missing value in fuzzy query");
-                    }
-
-                    obj.TryGetPropertyValue("fuzziness", out var fuzziness);
-                    obj.TryGetPropertyValue("prefix_length", out var prefixLength);
-                    obj.TryGetPropertyValue("max_expansions", out var maxExpansions);
-
-                    var fuzzyQuery = new FuzzyQuery(
-                        new Term(first.Key, value.Value<string>()),
-                        fuzziness?.Value<int>() ?? LevenshteinAutomata.MAXIMUM_SUPPORTED_DISTANCE,
-                        prefixLength?.Value<int>() ?? 0,
-                        maxExpansions?.Value<int>() ?? 50,
-                        true);
-
-                    if (obj.TryGetPropertyValue("boost", out var boost))
-                    {
-                        fuzzyQuery.Boost = boost.Value<float>();
-                    }
-
-                    return fuzzyQuery;
-                default: throw new ArgumentException("Invalid fuzzy query");
-            }
+            case JsonValueKind.String:
+                return new FuzzyQuery(new Term(first.Key, first.Value.ToString()));
+
+            case JsonValueKind.Object:
+                var obj = first.Value.AsObject();
+
+                if (!obj.TryGetPropertyValue("value", out var value))
+                {
+                    throw new ArgumentException("Missing value in fuzzy query");
+                }
+
+                obj.TryGetPropertyValue("fuzziness", out var fuzziness);
+                obj.TryGetPropertyValue("prefix_length", out var prefixLength);
+                obj.TryGetPropertyValue("max_expansions", out var maxExpansions);
+
+                var fuzzyQuery = new FuzzyQuery(
+                    new Term(first.Key, value.Value<string>()),
+                    fuzziness?.Value<int>() ?? LevenshteinAutomata.MAXIMUM_SUPPORTED_DISTANCE,
+                    prefixLength?.Value<int>() ?? 0,
+                    maxExpansions?.Value<int>() ?? 50,
+                    true);
+
+                if (obj.TryGetPropertyValue("boost", out var boost))
+                {
+                    fuzzyQuery.Boost = boost.Value<float>();
+                }
+
+                return fuzzyQuery;
+            default: throw new ArgumentException("Invalid fuzzy query");
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/MatchAllQueryProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/MatchAllQueryProvider.cs
index 3b40e348e61..5598f7c1294 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/MatchAllQueryProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/MatchAllQueryProvider.cs
@@ -1,25 +1,24 @@
 using System.Text.Json.Nodes;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders
+namespace OrchardCore.Search.Lucene.QueryProviders;
+
+public class MatchAllQueryProvider : ILuceneQueryProvider
 {
-    public class MatchAllQueryProvider : ILuceneQueryProvider
+    public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
     {
-        public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
+        if (type != "match_all")
         {
-            if (type != "match_all")
-            {
-                return null;
-            }
-
-            var matchAllQuery = new MatchAllDocsQuery();
+            return null;
+        }
 
-            if (query.TryGetPropertyValue("boost", out var boost))
-            {
-                matchAllQuery.Boost = boost.Value<float>();
-            }
+        var matchAllQuery = new MatchAllDocsQuery();
 
-            return matchAllQuery;
+        if (query.TryGetPropertyValue("boost", out var boost))
+        {
+            matchAllQuery.Boost = boost.Value<float>();
         }
+
+        return matchAllQuery;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/MatchPhraseQueryProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/MatchPhraseQueryProvider.cs
index 01dad531e83..d344a6ca6ab 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/MatchPhraseQueryProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/MatchPhraseQueryProvider.cs
@@ -5,53 +5,52 @@
 using Lucene.Net.Index;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders
+namespace OrchardCore.Search.Lucene.QueryProviders;
+
+public class MatchPhraseQueryProvider : ILuceneQueryProvider
 {
-    public class MatchPhraseQueryProvider : ILuceneQueryProvider
+    public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
     {
-        public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
+        if (type != "match_phrase")
         {
-            if (type != "match_phrase")
-            {
-                return null;
-            }
-
-            var first = query.First();
+            return null;
+        }
 
-            var phraseQuery = new PhraseQuery();
-            JsonNode value;
+        var first = query.First();
 
-            switch (first.Value.GetValueKind())
-            {
-                case JsonValueKind.String:
-                    value = first.Value;
-                    break;
+        var phraseQuery = new PhraseQuery();
+        JsonNode value;
 
-                case JsonValueKind.Object:
-                    var obj = first.Value.AsObject();
+        switch (first.Value.GetValueKind())
+        {
+            case JsonValueKind.String:
+                value = first.Value;
+                break;
 
-                    if (!obj.TryGetPropertyValue("value", out value))
-                    {
-                        throw new ArgumentException("Missing value in match phrase query");
-                    }
+            case JsonValueKind.Object:
+                var obj = first.Value.AsObject();
 
-                    // TODO: read "analyzer" property
+                if (!obj.TryGetPropertyValue("value", out value))
+                {
+                    throw new ArgumentException("Missing value in match phrase query");
+                }
 
-                    if (obj.TryGetPropertyValue("slop", out var slop))
-                    {
-                        phraseQuery.Slop = slop.Value<int>();
-                    }
+                // TODO: read "analyzer" property
 
-                    break;
-                default: throw new ArgumentException("Invalid wildcard query");
-            }
+                if (obj.TryGetPropertyValue("slop", out var slop))
+                {
+                    phraseQuery.Slop = slop.Value<int>();
+                }
 
-            foreach (var term in LuceneQueryService.Tokenize(first.Key, value.Value<string>(), context.DefaultAnalyzer))
-            {
-                phraseQuery.Add(new Term(first.Key, term));
-            }
+                break;
+            default: throw new ArgumentException("Invalid wildcard query");
+        }
 
-            return phraseQuery;
+        foreach (var term in LuceneQueryService.Tokenize(first.Key, value.Value<string>(), context.DefaultAnalyzer))
+        {
+            phraseQuery.Add(new Term(first.Key, term));
         }
+
+        return phraseQuery;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/MatchQueryProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/MatchQueryProvider.cs
index 286a570f03c..9bd0bb8d446 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/MatchQueryProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/MatchQueryProvider.cs
@@ -5,67 +5,66 @@
 using Lucene.Net.Index;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders
+namespace OrchardCore.Search.Lucene.QueryProviders;
+
+public class MatchQueryProvider : ILuceneQueryProvider
 {
-    public class MatchQueryProvider : ILuceneQueryProvider
+    public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
     {
-        public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
+        if (type != "match")
         {
-            if (type != "match")
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var first = query.First();
+        var first = query.First();
 
-            var boolQuery = new BooleanQuery();
+        var boolQuery = new BooleanQuery();
 
-            switch (first.Value.GetValueKind())
-            {
-                case JsonValueKind.String:
-                    foreach (var term in LuceneQueryService.Tokenize(first.Key, first.Value.ToString(), context.DefaultAnalyzer))
-                    {
-                        boolQuery.Add(new TermQuery(new Term(first.Key, term)), Occur.SHOULD);
-                    }
+        switch (first.Value.GetValueKind())
+        {
+            case JsonValueKind.String:
+                foreach (var term in LuceneQueryService.Tokenize(first.Key, first.Value.ToString(), context.DefaultAnalyzer))
+                {
+                    boolQuery.Add(new TermQuery(new Term(first.Key, term)), Occur.SHOULD);
+                }
 
-                    return boolQuery;
+                return boolQuery;
 
-                case JsonValueKind.Object:
-                    var obj = first.Value.AsObject();
-                    var value = obj["query"]?.Value<string>();
+            case JsonValueKind.Object:
+                var obj = first.Value.AsObject();
+                var value = obj["query"]?.Value<string>();
 
-                    if (obj.TryGetPropertyValue("boost", out var boost))
-                    {
-                        boolQuery.Boost = boost.Value<float>();
-                    }
+                if (obj.TryGetPropertyValue("boost", out var boost))
+                {
+                    boolQuery.Boost = boost.Value<float>();
+                }
 
-                    var occur = Occur.SHOULD;
-                    if (obj.TryGetPropertyValue("operator", out var op))
-                    {
-                        occur = op.ToString() == "and" ? Occur.MUST : Occur.SHOULD;
-                    }
+                var occur = Occur.SHOULD;
+                if (obj.TryGetPropertyValue("operator", out var op))
+                {
+                    occur = op.ToString() == "and" ? Occur.MUST : Occur.SHOULD;
+                }
 
-                    var terms = LuceneQueryService.Tokenize(first.Key, value, context.DefaultAnalyzer);
+                var terms = LuceneQueryService.Tokenize(first.Key, value, context.DefaultAnalyzer);
 
-                    if (terms.Count == 0)
+                if (terms.Count == 0)
+                {
+                    if (obj.TryGetPropertyValue("zero_terms_query", out var zeroTermsQuery))
                     {
-                        if (obj.TryGetPropertyValue("zero_terms_query", out var zeroTermsQuery))
+                        if (zeroTermsQuery.ToString() == "all")
                         {
-                            if (zeroTermsQuery.ToString() == "all")
-                            {
-                                return new MatchAllDocsQuery();
-                            }
+                            return new MatchAllDocsQuery();
                         }
                     }
+                }
 
-                    foreach (var term in terms)
-                    {
-                        boolQuery.Add(new TermQuery(new Term(first.Key, term)), occur);
-                    }
+                foreach (var term in terms)
+                {
+                    boolQuery.Add(new TermQuery(new Term(first.Key, term)), occur);
+                }
 
-                    return boolQuery;
-                default: throw new ArgumentException("Invalid query");
-            }
+                return boolQuery;
+            default: throw new ArgumentException("Invalid query");
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/PrefixQueryProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/PrefixQueryProvider.cs
index 9c65e3b7602..43bc7bb1bfe 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/PrefixQueryProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/PrefixQueryProvider.cs
@@ -5,52 +5,51 @@
 using Lucene.Net.Index;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders
+namespace OrchardCore.Search.Lucene.QueryProviders;
+
+public class PrefixQueryProvider : ILuceneQueryProvider
 {
-    public class PrefixQueryProvider : ILuceneQueryProvider
+    public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
     {
-        public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
+        if (type != "prefix")
+        {
+            return null;
+        }
+
+        var first = query.First();
+
+        // A prefix query has only one member, which can either be a string or an object.
+
+        switch (first.Value.GetValueKind())
         {
-            if (type != "prefix")
-            {
-                return null;
-            }
-
-            var first = query.First();
-
-            // A prefix query has only one member, which can either be a string or an object.
-
-            switch (first.Value.GetValueKind())
-            {
-                case JsonValueKind.String:
-                    return new PrefixQuery(new Term(first.Key, first.Value.ToString()));
-
-                case JsonValueKind.Object:
-                    var obj = first.Value.AsObject();
-                    PrefixQuery prefixQuery;
-
-                    if (obj.TryGetPropertyValue("value", out var value))
-                    {
-                        prefixQuery = new PrefixQuery(new Term(first.Key, value.Value<string>()));
-                    }
-                    else if (obj.TryGetPropertyValue("prefix", out var prefix))
-                    {
-                        prefixQuery = new PrefixQuery(new Term(first.Key, prefix.Value<string>()));
-                    }
-                    else
-                    {
-                        throw new ArgumentException("Prefix query misses prefix value");
-                    }
-
-                    if (obj.TryGetPropertyValue("boost", out var boost))
-                    {
-                        prefixQuery.Boost = boost.Value<float>();
-                    }
-
-                    return prefixQuery;
-
-                default: throw new ArgumentException("Invalid prefix query");
-            }
+            case JsonValueKind.String:
+                return new PrefixQuery(new Term(first.Key, first.Value.ToString()));
+
+            case JsonValueKind.Object:
+                var obj = first.Value.AsObject();
+                PrefixQuery prefixQuery;
+
+                if (obj.TryGetPropertyValue("value", out var value))
+                {
+                    prefixQuery = new PrefixQuery(new Term(first.Key, value.Value<string>()));
+                }
+                else if (obj.TryGetPropertyValue("prefix", out var prefix))
+                {
+                    prefixQuery = new PrefixQuery(new Term(first.Key, prefix.Value<string>()));
+                }
+                else
+                {
+                    throw new ArgumentException("Prefix query misses prefix value");
+                }
+
+                if (obj.TryGetPropertyValue("boost", out var boost))
+                {
+                    prefixQuery.Boost = boost.Value<float>();
+                }
+
+                return prefixQuery;
+
+            default: throw new ArgumentException("Invalid prefix query");
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/QueryStringQueryProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/QueryStringQueryProvider.cs
index c8110591e22..4fcbd202cec 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/QueryStringQueryProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/QueryStringQueryProvider.cs
@@ -2,22 +2,21 @@
 using Lucene.Net.QueryParsers.Classic;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders
+namespace OrchardCore.Search.Lucene.QueryProviders;
+
+public class QueryStringQueryProvider : ILuceneQueryProvider
 {
-    public class QueryStringQueryProvider : ILuceneQueryProvider
+    public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
     {
-        public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
+        if (type != "query_string")
         {
-            if (type != "query_string")
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var queryString = query["query"]?.Value<string>();
-            var defaultField = query["default_field"]?.Value<string>() ?? "";
+        var queryString = query["query"]?.Value<string>();
+        var defaultField = query["default_field"]?.Value<string>() ?? "";
 
-            var queryParser = new QueryParser(context.DefaultVersion, defaultField, context.DefaultAnalyzer);
-            return queryParser.Parse(queryString);
-        }
+        var queryParser = new QueryParser(context.DefaultVersion, defaultField, context.DefaultAnalyzer);
+        return queryParser.Parse(queryString);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/RangeQueryProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/RangeQueryProvider.cs
index 684e1dbe91b..2cab14050d8 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/RangeQueryProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/RangeQueryProvider.cs
@@ -4,101 +4,100 @@
 using System.Text.Json.Nodes;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders
+namespace OrchardCore.Search.Lucene.QueryProviders;
+
+public class RangeQueryProvider : ILuceneQueryProvider
 {
-    public class RangeQueryProvider : ILuceneQueryProvider
+    public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
     {
-        public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
+        if (type != "range")
         {
-            if (type != "range")
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var range = query.First();
-            Query rangeQuery;
+        var range = query.First();
+        Query rangeQuery;
 
-            switch (range.Value.GetValueKind())
-            {
-                case JsonValueKind.Object:
-                    var field = range.Key;
+        switch (range.Value.GetValueKind())
+        {
+            case JsonValueKind.Object:
+                var field = range.Key;
 
-                    JsonNode gt = null;
-                    JsonNode lt = null;
-                    var nodeKind = JsonValueKind.Undefined;
-                    float? boost = null;
+                JsonNode gt = null;
+                JsonNode lt = null;
+                var nodeKind = JsonValueKind.Undefined;
+                float? boost = null;
 
-                    bool includeLower = false, includeUpper = false;
+                bool includeLower = false, includeUpper = false;
 
-                    foreach (var element in range.Value.AsObject())
+                foreach (var element in range.Value.AsObject())
+                {
+                    switch (element.Key.ToLowerInvariant())
                     {
-                        switch (element.Key.ToLowerInvariant())
-                        {
-                            case "gt":
-                                gt = element.Value;
-                                nodeKind = gt.GetValueKind();
-                                break;
-                            case "gte":
-                                gt = element.Value;
-                                nodeKind = gt.GetValueKind();
-                                includeLower = true;
-                                break;
-                            case "lt":
-                                lt = element.Value;
-                                nodeKind = gt.GetValueKind();
-                                break;
-                            case "lte":
-                                lt = element.Value;
-                                nodeKind = gt.GetValueKind();
-                                includeUpper = true;
-                                break;
-                            case "boost":
-                                boost = element.Value.Value<float>();
-                                break;
-                        }
+                        case "gt":
+                            gt = element.Value;
+                            nodeKind = gt.GetValueKind();
+                            break;
+                        case "gte":
+                            gt = element.Value;
+                            nodeKind = gt.GetValueKind();
+                            includeLower = true;
+                            break;
+                        case "lt":
+                            lt = element.Value;
+                            nodeKind = gt.GetValueKind();
+                            break;
+                        case "lte":
+                            lt = element.Value;
+                            nodeKind = gt.GetValueKind();
+                            includeUpper = true;
+                            break;
+                        case "boost":
+                            boost = element.Value.Value<float>();
+                            break;
                     }
+                }
 
-                    if (gt != null && lt != null && gt.GetValueKind() != lt.GetValueKind())
-                    {
-                        throw new ArgumentException("Lower and upper bound range types don't match");
-                    }
+                if (gt != null && lt != null && gt.GetValueKind() != lt.GetValueKind())
+                {
+                    throw new ArgumentException("Lower and upper bound range types don't match");
+                }
 
-                    switch (nodeKind)
-                    {
-                        case JsonValueKind.Number:
-                            if (gt.AsValue().TryGetValue<long>(out var minInt) &&
-                                lt.AsValue().TryGetValue<long>(out var maxInt))
-                            {
-                                rangeQuery = NumericRangeQuery.NewInt64Range(field, minInt, maxInt, includeLower, includeUpper);
-                            }
-                            else if (gt.AsValue().TryGetValue<double>(out var minFloat) &&
-                                lt.AsValue().TryGetValue<double>(out var maxFloat))
-                            {
-                                rangeQuery = NumericRangeQuery.NewDoubleRange(field, minFloat, maxFloat, includeLower, includeUpper);
-                            }
-                            else
-                            {
-                                throw new ArgumentException($"Unsupported range value type: {type}");
-                            }
+                switch (nodeKind)
+                {
+                    case JsonValueKind.Number:
+                        if (gt.AsValue().TryGetValue<long>(out var minInt) &&
+                            lt.AsValue().TryGetValue<long>(out var maxInt))
+                        {
+                            rangeQuery = NumericRangeQuery.NewInt64Range(field, minInt, maxInt, includeLower, includeUpper);
+                        }
+                        else if (gt.AsValue().TryGetValue<double>(out var minFloat) &&
+                            lt.AsValue().TryGetValue<double>(out var maxFloat))
+                        {
+                            rangeQuery = NumericRangeQuery.NewDoubleRange(field, minFloat, maxFloat, includeLower, includeUpper);
+                        }
+                        else
+                        {
+                            throw new ArgumentException($"Unsupported range value type: {type}");
+                        }
 
-                            break;
+                        break;
 
-                        case JsonValueKind.String:
-                            var minString = gt?.Value<string>();
-                            var maxString = lt?.Value<string>();
-                            rangeQuery = TermRangeQuery.NewStringRange(field, minString, maxString, includeLower, includeUpper);
-                            break;
-                        default: throw new ArgumentException($"Unsupported range value type: {type}");
-                    }
+                    case JsonValueKind.String:
+                        var minString = gt?.Value<string>();
+                        var maxString = lt?.Value<string>();
+                        rangeQuery = TermRangeQuery.NewStringRange(field, minString, maxString, includeLower, includeUpper);
+                        break;
+                    default: throw new ArgumentException($"Unsupported range value type: {type}");
+                }
 
-                    if (boost != null)
-                    {
-                        rangeQuery.Boost = boost.Value;
-                    }
+                if (boost != null)
+                {
+                    rangeQuery.Boost = boost.Value;
+                }
 
-                    return rangeQuery;
-                default: throw new ArgumentException("Invalid range query");
-            }
+                return rangeQuery;
+            default: throw new ArgumentException("Invalid range query");
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/RegexpQueryProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/RegexpQueryProvider.cs
index 133a4d44a3b..d7d8b5b8222 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/RegexpQueryProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/RegexpQueryProvider.cs
@@ -5,44 +5,43 @@
 using Lucene.Net.Index;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders
+namespace OrchardCore.Search.Lucene.QueryProviders;
+
+public class RegexpQueryProvider : ILuceneQueryProvider
 {
-    public class RegexpQueryProvider : ILuceneQueryProvider
+    public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
     {
-        public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
+        if (type != "regexp")
         {
-            if (type != "regexp")
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var first = query.First();
+        var first = query.First();
 
-            switch (first.Value.GetValueKind())
-            {
-                case JsonValueKind.String:
-                    return new RegexpQuery(new Term(first.Key, first.Value.ToString()));
+        switch (first.Value.GetValueKind())
+        {
+            case JsonValueKind.String:
+                return new RegexpQuery(new Term(first.Key, first.Value.ToString()));
 
-                case JsonValueKind.Object:
-                    var obj = first.Value.AsObject();
+            case JsonValueKind.Object:
+                var obj = first.Value.AsObject();
 
-                    if (!obj.TryGetPropertyValue("value", out var value))
-                    {
-                        throw new ArgumentException("Missing value in regexp query");
-                    }
+                if (!obj.TryGetPropertyValue("value", out var value))
+                {
+                    throw new ArgumentException("Missing value in regexp query");
+                }
 
-                    // TODO: Support flags
+                // TODO: Support flags
 
-                    var regexpQuery = new RegexpQuery(new Term(first.Key, value.Value<string>()));
+                var regexpQuery = new RegexpQuery(new Term(first.Key, value.Value<string>()));
 
-                    if (obj.TryGetPropertyValue("boost", out var boost))
-                    {
-                        regexpQuery.Boost = boost.Value<float>();
-                    }
+                if (obj.TryGetPropertyValue("boost", out var boost))
+                {
+                    regexpQuery.Boost = boost.Value<float>();
+                }
 
-                    return regexpQuery;
-                default: throw new ArgumentException("Invalid regexp query");
-            }
+                return regexpQuery;
+            default: throw new ArgumentException("Invalid regexp query");
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/SimpleQueryStringQueryProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/SimpleQueryStringQueryProvider.cs
index 77a20fdb47e..6138759af1c 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/SimpleQueryStringQueryProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/SimpleQueryStringQueryProvider.cs
@@ -4,45 +4,44 @@
 using Lucene.Net.QueryParsers.Simple;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders
+namespace OrchardCore.Search.Lucene.QueryProviders;
+
+public class SimpleQueryStringQueryProvider : ILuceneQueryProvider
 {
-    public class SimpleQueryStringQueryProvider : ILuceneQueryProvider
+    public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
     {
-        public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
+        if (type != "simple_query_string")
         {
-            if (type != "simple_query_string")
-            {
-                return null;
-            }
-
-            var queryString = query["query"]?.Value<string>();
-            var fields = query["fields"]?.Values<string>() ?? Array.Empty<string>();
-            var defaultOperator = query["default_operator"]?.Value<string>().ToLowerInvariant() ?? "or";
-            var weight = 1.0f;
-            var weights = fields.ToDictionary(field => field, field => weight);
+            return null;
+        }
 
-            foreach (var field in fields)
-            {
-                var fieldWeightArray = field.Split('^', 2);
+        var queryString = query["query"]?.Value<string>();
+        var fields = query["fields"]?.Values<string>() ?? Array.Empty<string>();
+        var defaultOperator = query["default_operator"]?.Value<string>().ToLowerInvariant() ?? "or";
+        var weight = 1.0f;
+        var weights = fields.ToDictionary(field => field, field => weight);
 
-                if (fieldWeightArray.Length > 1 && float.TryParse(fieldWeightArray[1], out weight))
-                {
-                    weights.Remove(field);
-                    weights.Add(fieldWeightArray[0], weight);
-                }
-            }
+        foreach (var field in fields)
+        {
+            var fieldWeightArray = field.Split('^', 2);
 
-            var queryParser = new SimpleQueryParser(context.DefaultAnalyzer, weights);
-            switch (defaultOperator)
+            if (fieldWeightArray.Length > 1 && float.TryParse(fieldWeightArray[1], out weight))
             {
-                case "and":
-                    queryParser.DefaultOperator = Occur.MUST;
-                    break;
-                case "or":
-                    queryParser.DefaultOperator = Occur.SHOULD;
-                    break;
+                weights.Remove(field);
+                weights.Add(fieldWeightArray[0], weight);
             }
-            return queryParser.Parse(queryString);
         }
+
+        var queryParser = new SimpleQueryParser(context.DefaultAnalyzer, weights);
+        switch (defaultOperator)
+        {
+            case "and":
+                queryParser.DefaultOperator = Occur.MUST;
+                break;
+            case "or":
+                queryParser.DefaultOperator = Occur.SHOULD;
+                break;
+        }
+        return queryParser.Parse(queryString);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/TermQueryProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/TermQueryProvider.cs
index 824c99bdb4e..9866d4fb80f 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/TermQueryProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/TermQueryProvider.cs
@@ -5,39 +5,38 @@
 using Lucene.Net.Index;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders
+namespace OrchardCore.Search.Lucene.QueryProviders;
+
+public class TermQueryProvider : ILuceneQueryProvider
 {
-    public class TermQueryProvider : ILuceneQueryProvider
+    public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
     {
-        public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
+        if (type != "term")
         {
-            if (type != "term")
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var first = query.First();
+        var first = query.First();
 
-            // A term query has only one member, which can either be a string or an object
+        // A term query has only one member, which can either be a string or an object
 
-            switch (first.Value.GetValueKind())
-            {
-                case JsonValueKind.String:
-                    return new TermQuery(new Term(first.Key, first.Value.ToString()));
+        switch (first.Value.GetValueKind())
+        {
+            case JsonValueKind.String:
+                return new TermQuery(new Term(first.Key, first.Value.ToString()));
 
-                case JsonValueKind.Object:
-                    var obj = first.Value.AsObject();
-                    var value = obj["value"].Value<string>();
-                    var termQuery = new TermQuery(new Term(first.Key, value));
+            case JsonValueKind.Object:
+                var obj = first.Value.AsObject();
+                var value = obj["value"].Value<string>();
+                var termQuery = new TermQuery(new Term(first.Key, value));
 
-                    if (obj.TryGetPropertyValue("boost", out var boost))
-                    {
-                        termQuery.Boost = boost.Value<float>();
-                    }
+                if (obj.TryGetPropertyValue("boost", out var boost))
+                {
+                    termQuery.Boost = boost.Value<float>();
+                }
 
-                    return termQuery;
-                default: throw new ArgumentException("Invalid term query");
-            }
+                return termQuery;
+            default: throw new ArgumentException("Invalid term query");
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/TermsQueryProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/TermsQueryProvider.cs
index aa074cfd578..b9b490e7da8 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/TermsQueryProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/TermsQueryProvider.cs
@@ -5,44 +5,43 @@
 using Lucene.Net.Index;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders
+namespace OrchardCore.Search.Lucene.QueryProviders;
+
+public class TermsQueryProvider : ILuceneQueryProvider
 {
-    public class TermsQueryProvider : ILuceneQueryProvider
+    public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
     {
-        public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
+        if (type != "terms")
         {
-            if (type != "terms")
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var first = query.First();
+        var first = query.First();
 
-            var field = first.Key;
-            var boolQuery = new BooleanQuery();
+        var field = first.Key;
+        var boolQuery = new BooleanQuery();
 
-            switch (first.Value.GetValueKind())
-            {
-                case JsonValueKind.Array:
+        switch (first.Value.GetValueKind())
+        {
+            case JsonValueKind.Array:
 
-                    foreach (var item in first.Value.AsArray())
+                foreach (var item in first.Value.AsArray())
+                {
+                    if (item.GetValueKind() != JsonValueKind.String)
                     {
-                        if (item.GetValueKind() != JsonValueKind.String)
-                        {
-                            throw new ArgumentException($"Invalid term in terms query");
-                        }
-
-                        boolQuery.Add(new TermQuery(new Term(field, item.Value<string>())), Occur.SHOULD);
+                        throw new ArgumentException($"Invalid term in terms query");
                     }
 
-                    break;
-                case JsonValueKind.Object:
-                    throw new ArgumentException("The terms lookup query is not supported");
+                    boolQuery.Add(new TermQuery(new Term(field, item.Value<string>())), Occur.SHOULD);
+                }
 
-                default: throw new ArgumentException("Invalid terms query");
-            }
+                break;
+            case JsonValueKind.Object:
+                throw new ArgumentException("The terms lookup query is not supported");
 
-            return boolQuery;
+            default: throw new ArgumentException("Invalid terms query");
         }
+
+        return boolQuery;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/WildcardQueryProvider.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/WildcardQueryProvider.cs
index 5e1b8a6aba4..d1321578999 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/WildcardQueryProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/QueryProviders/WildcardQueryProvider.cs
@@ -5,43 +5,42 @@
 using Lucene.Net.Index;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.QueryProviders
+namespace OrchardCore.Search.Lucene.QueryProviders;
+
+public class WildcardQueryProvider : ILuceneQueryProvider
 {
-    public class WildcardQueryProvider : ILuceneQueryProvider
+    public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
     {
-        public Query CreateQuery(ILuceneQueryService builder, LuceneQueryContext context, string type, JsonObject query)
+        if (type != "wildcard")
         {
-            if (type != "wildcard")
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var first = query.First();
+        var first = query.First();
 
-            switch (first.Value.GetValueKind())
-            {
-                case JsonValueKind.String:
-                    return new WildcardQuery(new Term(first.Key, first.Value.ToString()));
+        switch (first.Value.GetValueKind())
+        {
+            case JsonValueKind.String:
+                return new WildcardQuery(new Term(first.Key, first.Value.ToString()));
 
-                case JsonValueKind.Object:
-                    var obj = first.Value.AsObject();
+            case JsonValueKind.Object:
+                var obj = first.Value.AsObject();
 
-                    if (!obj.TryGetPropertyValue("value", out var value))
-                    {
-                        throw new ArgumentException("Missing value in wildcard query");
-                    }
+                if (!obj.TryGetPropertyValue("value", out var value))
+                {
+                    throw new ArgumentException("Missing value in wildcard query");
+                }
 
-                    var wildCardQuery = new WildcardQuery(new Term(first.Key, value.Value<string>()));
+                var wildCardQuery = new WildcardQuery(new Term(first.Key, value.Value<string>()));
 
-                    if (obj.TryGetPropertyValue("boost", out var boost))
-                    {
-                        wildCardQuery.Boost = boost.Value<float>();
-                    }
+                if (obj.TryGetPropertyValue("boost", out var boost))
+                {
+                    wildCardQuery.Boost = boost.Value<float>();
+                }
 
-                    return wildCardQuery;
+                return wildCardQuery;
 
-                default: throw new ArgumentException("Invalid wildcard query");
-            }
+            default: throw new ArgumentException("Invalid wildcard query");
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Search.Lucene.Core/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Search.Lucene.Core/ServiceCollectionExtensions.cs
index e0402d05646..db9b992fa96 100644
--- a/src/OrchardCore/OrchardCore.Search.Lucene.Core/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Search.Lucene.Core/ServiceCollectionExtensions.cs
@@ -2,44 +2,43 @@
 using OrchardCore.Search.Lucene.QueryProviders;
 using OrchardCore.Search.Lucene.QueryProviders.Filters;
 
-namespace OrchardCore.Search.Lucene
+namespace OrchardCore.Search.Lucene;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    /// <summary>
+    /// Adds Lucene queries services.
+    /// </summary>
+    public static IServiceCollection AddLuceneQueries(this IServiceCollection services)
     {
-        /// <summary>
-        /// Adds Lucene queries services.
-        /// </summary>
-        public static IServiceCollection AddLuceneQueries(this IServiceCollection services)
-        {
-            services.AddScoped<ILuceneQueryService, LuceneQueryService>();
+        services.AddScoped<ILuceneQueryService, LuceneQueryService>();
 
-            services.AddSingleton<ILuceneQueryProvider, BooleanQueryProvider>();
-            services.AddSingleton<ILuceneQueryProvider, FuzzyQueryProvider>();
-            services.AddSingleton<ILuceneQueryProvider, MatchQueryProvider>();
-            services.AddSingleton<ILuceneQueryProvider, MatchAllQueryProvider>();
-            services.AddSingleton<ILuceneQueryProvider, MatchPhraseQueryProvider>();
-            services.AddSingleton<ILuceneQueryProvider, PrefixQueryProvider>();
-            services.AddSingleton<ILuceneQueryProvider, QueryStringQueryProvider>();
-            services.AddSingleton<ILuceneQueryProvider, RangeQueryProvider>();
-            services.AddSingleton<ILuceneQueryProvider, RegexpQueryProvider>();
-            services.AddSingleton<ILuceneQueryProvider, SimpleQueryStringQueryProvider>();
-            services.AddSingleton<ILuceneQueryProvider, TermQueryProvider>();
-            services.AddSingleton<ILuceneQueryProvider, TermsQueryProvider>();
-            services.AddSingleton<ILuceneQueryProvider, WildcardQueryProvider>();
+        services.AddSingleton<ILuceneQueryProvider, BooleanQueryProvider>();
+        services.AddSingleton<ILuceneQueryProvider, FuzzyQueryProvider>();
+        services.AddSingleton<ILuceneQueryProvider, MatchQueryProvider>();
+        services.AddSingleton<ILuceneQueryProvider, MatchAllQueryProvider>();
+        services.AddSingleton<ILuceneQueryProvider, MatchPhraseQueryProvider>();
+        services.AddSingleton<ILuceneQueryProvider, PrefixQueryProvider>();
+        services.AddSingleton<ILuceneQueryProvider, QueryStringQueryProvider>();
+        services.AddSingleton<ILuceneQueryProvider, RangeQueryProvider>();
+        services.AddSingleton<ILuceneQueryProvider, RegexpQueryProvider>();
+        services.AddSingleton<ILuceneQueryProvider, SimpleQueryStringQueryProvider>();
+        services.AddSingleton<ILuceneQueryProvider, TermQueryProvider>();
+        services.AddSingleton<ILuceneQueryProvider, TermsQueryProvider>();
+        services.AddSingleton<ILuceneQueryProvider, WildcardQueryProvider>();
 
-            services.AddSingleton<ILuceneBooleanFilterProvider, FuzzyFilterProvider>();
-            services.AddSingleton<ILuceneBooleanFilterProvider, GeoBoundingBoxFilterProvider>();
-            services.AddSingleton<ILuceneBooleanFilterProvider, GeoDistanceFilterProvider>();
-            services.AddSingleton<ILuceneBooleanFilterProvider, MatchFilterProvider>();
-            services.AddSingleton<ILuceneBooleanFilterProvider, MatchPhraseFilterProvider>();
-            services.AddSingleton<ILuceneBooleanFilterProvider, MatchAllFilterProvider>();
-            services.AddSingleton<ILuceneBooleanFilterProvider, PrefixFilterProvider>();
-            services.AddSingleton<ILuceneBooleanFilterProvider, RangeFilterProvider>();
-            services.AddSingleton<ILuceneBooleanFilterProvider, TermFilterProvider>();
-            services.AddSingleton<ILuceneBooleanFilterProvider, TermsFilterProvider>();
-            services.AddSingleton<ILuceneBooleanFilterProvider, WildcardFilterProvider>();
+        services.AddSingleton<ILuceneBooleanFilterProvider, FuzzyFilterProvider>();
+        services.AddSingleton<ILuceneBooleanFilterProvider, GeoBoundingBoxFilterProvider>();
+        services.AddSingleton<ILuceneBooleanFilterProvider, GeoDistanceFilterProvider>();
+        services.AddSingleton<ILuceneBooleanFilterProvider, MatchFilterProvider>();
+        services.AddSingleton<ILuceneBooleanFilterProvider, MatchPhraseFilterProvider>();
+        services.AddSingleton<ILuceneBooleanFilterProvider, MatchAllFilterProvider>();
+        services.AddSingleton<ILuceneBooleanFilterProvider, PrefixFilterProvider>();
+        services.AddSingleton<ILuceneBooleanFilterProvider, RangeFilterProvider>();
+        services.AddSingleton<ILuceneBooleanFilterProvider, TermFilterProvider>();
+        services.AddSingleton<ILuceneBooleanFilterProvider, TermsFilterProvider>();
+        services.AddSingleton<ILuceneBooleanFilterProvider, WildcardFilterProvider>();
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Settings.Core/Deployment/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Settings.Core/Deployment/ServiceCollectionExtensions.cs
index dcebba84a6e..a652aaf0d5b 100644
--- a/src/OrchardCore/OrchardCore.Settings.Core/Deployment/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Settings.Core/Deployment/ServiceCollectionExtensions.cs
@@ -5,25 +5,24 @@
 using OrchardCore.Deployment;
 using OrchardCore.DisplayManagement.Handlers;
 
-namespace OrchardCore.Settings.Deployment
+namespace OrchardCore.Settings.Deployment;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    /// <summary>
+    /// Registers a <see cref="SiteSettingsPropertyDeploymentSource{TModel}"/> step.
+    /// </summary>
+    public static void AddSiteSettingsPropertyDeploymentStep<TModel, TLocalizer>(this IServiceCollection services, Func<IStringLocalizer, LocalizedString> title, Func<IStringLocalizer, string> description) where TModel : class, new() where TLocalizer : class
     {
-        /// <summary>
-        /// Registers a <see cref="SiteSettingsPropertyDeploymentSource{TModel}"/> step.
-        /// </summary>
-        public static void AddSiteSettingsPropertyDeploymentStep<TModel, TLocalizer>(this IServiceCollection services, Func<IStringLocalizer, LocalizedString> title, Func<IStringLocalizer, string> description) where TModel : class, new() where TLocalizer : class
+        services.AddTransient<IDeploymentSource, SiteSettingsPropertyDeploymentSource<TModel>>();
+        services.AddScoped<IDisplayDriver<DeploymentStep>>(sp =>
         {
-            services.AddTransient<IDeploymentSource, SiteSettingsPropertyDeploymentSource<TModel>>();
-            services.AddScoped<IDisplayDriver<DeploymentStep>>(sp =>
-            {
-                // Do not name this S, it should not be collected up by the po extractor.
-                var stringLocalizer = sp.GetService<IStringLocalizer<TLocalizer>>();
-                return new SiteSettingsPropertyDeploymentStepDriver<TModel>(title(stringLocalizer), description(stringLocalizer));
-            });
+            // Do not name this S, it should not be collected up by the po extractor.
+            var stringLocalizer = sp.GetService<IStringLocalizer<TLocalizer>>();
+            return new SiteSettingsPropertyDeploymentStepDriver<TModel>(title(stringLocalizer), description(stringLocalizer));
+        });
 
-            services.AddSingleton<IDeploymentStepFactory>(new SiteSettingsPropertyDeploymentStepFactory<TModel>());
-            services.AddJsonDerivedTypeInfo<SiteSettingsPropertyDeploymentStep<TModel>, DeploymentStep>();
-        }
+        services.AddSingleton<IDeploymentStepFactory>(new SiteSettingsPropertyDeploymentStepFactory<TModel>());
+        services.AddJsonDerivedTypeInfo<SiteSettingsPropertyDeploymentStep<TModel>, DeploymentStep>();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Settings.Core/Deployment/SiteSettingsPropertyDeploymentSource.cs b/src/OrchardCore/OrchardCore.Settings.Core/Deployment/SiteSettingsPropertyDeploymentSource.cs
index ef3c3e278a5..0c60fde28fc 100644
--- a/src/OrchardCore/OrchardCore.Settings.Core/Deployment/SiteSettingsPropertyDeploymentSource.cs
+++ b/src/OrchardCore/OrchardCore.Settings.Core/Deployment/SiteSettingsPropertyDeploymentSource.cs
@@ -3,40 +3,39 @@
 using System.Threading.Tasks;
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Settings.Deployment
+namespace OrchardCore.Settings.Deployment;
+
+public class SiteSettingsPropertyDeploymentSource<TModel> : IDeploymentSource where TModel : class, new()
 {
-    public class SiteSettingsPropertyDeploymentSource<TModel> : IDeploymentSource where TModel : class, new()
+    private readonly ISiteService _siteService;
+
+    public SiteSettingsPropertyDeploymentSource(ISiteService siteService)
     {
-        private readonly ISiteService _siteService;
+        _siteService = siteService;
+    }
 
-        public SiteSettingsPropertyDeploymentSource(ISiteService siteService)
+    public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
+    {
+        if (step is not SiteSettingsPropertyDeploymentStep<TModel> settingsStep)
         {
-            _siteService = siteService;
+            return;
         }
 
-        public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
-        {
-            if (step is not SiteSettingsPropertyDeploymentStep<TModel> settingsStep)
-            {
-                return;
-            }
+        var settingJPropertyName = typeof(TModel).Name;
+        var settingJPropertyValue = JObject.FromObject(await _siteService.GetSettingsAsync<TModel>());
 
-            var settingJPropertyName = typeof(TModel).Name;
-            var settingJPropertyValue = JObject.FromObject(await _siteService.GetSettingsAsync<TModel>());
-
-            var settingsStepJObject = result.Steps.FirstOrDefault(s => s["name"]?.ToString() == "Settings");
-            if (settingsStepJObject != null)
-            {
-                settingsStepJObject.Add(settingJPropertyName, settingJPropertyValue);
-            }
-            else
+        var settingsStepJObject = result.Steps.FirstOrDefault(s => s["name"]?.ToString() == "Settings");
+        if (settingsStepJObject != null)
+        {
+            settingsStepJObject.Add(settingJPropertyName, settingJPropertyValue);
+        }
+        else
+        {
+            result.Steps.Add(new JsonObject
             {
-                result.Steps.Add(new JsonObject
-                {
-                    ["name"] = "Settings",
-                    [settingJPropertyName] = settingJPropertyValue,
-                });
-            }
+                ["name"] = "Settings",
+                [settingJPropertyName] = settingJPropertyValue,
+            });
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Settings.Core/Deployment/SiteSettingsPropertyDeploymentStep.cs b/src/OrchardCore/OrchardCore.Settings.Core/Deployment/SiteSettingsPropertyDeploymentStep.cs
index 6059c8162ab..4ddfff48a8d 100644
--- a/src/OrchardCore/OrchardCore.Settings.Core/Deployment/SiteSettingsPropertyDeploymentStep.cs
+++ b/src/OrchardCore/OrchardCore.Settings.Core/Deployment/SiteSettingsPropertyDeploymentStep.cs
@@ -1,15 +1,14 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Settings.Deployment
+namespace OrchardCore.Settings.Deployment;
+
+/// <summary>
+/// Adds a site setting from the properties dictionary to a <see cref="DeploymentPlanResult"/>.
+/// </summary>
+public class SiteSettingsPropertyDeploymentStep<TModel> : DeploymentStep where TModel : class, new()
 {
-    /// <summary>
-    /// Adds a site setting from the properties dictionary to a <see cref="DeploymentPlanResult"/>.
-    /// </summary>
-    public class SiteSettingsPropertyDeploymentStep<TModel> : DeploymentStep where TModel : class, new()
+    public SiteSettingsPropertyDeploymentStep()
     {
-        public SiteSettingsPropertyDeploymentStep()
-        {
-            Name = typeof(TModel).Name + "_SiteSettingsPropertyDeploymentStep";
-        }
+        Name = typeof(TModel).Name + "_SiteSettingsPropertyDeploymentStep";
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Settings.Core/Deployment/SiteSettingsPropertyDeploymentStepDriver.cs b/src/OrchardCore/OrchardCore.Settings.Core/Deployment/SiteSettingsPropertyDeploymentStepDriver.cs
index 579d6288e03..8c60b3da957 100644
--- a/src/OrchardCore/OrchardCore.Settings.Core/Deployment/SiteSettingsPropertyDeploymentStepDriver.cs
+++ b/src/OrchardCore/OrchardCore.Settings.Core/Deployment/SiteSettingsPropertyDeploymentStepDriver.cs
@@ -4,39 +4,38 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Settings.ViewModels;
 
-namespace OrchardCore.Settings.Deployment
+namespace OrchardCore.Settings.Deployment;
+
+public class SiteSettingsPropertyDeploymentStepDriver<TModel> : DisplayDriver<DeploymentStep, SiteSettingsPropertyDeploymentStep<TModel>> where TModel : class, new()
 {
-    public class SiteSettingsPropertyDeploymentStepDriver<TModel> : DisplayDriver<DeploymentStep, SiteSettingsPropertyDeploymentStep<TModel>> where TModel : class, new()
-    {
-        private readonly string _title;
-        private readonly string _description;
+    private readonly string _title;
+    private readonly string _description;
 
-        public SiteSettingsPropertyDeploymentStepDriver(string title, string description)
-        {
-            _title = title;
-            _description = description;
-        }
+    public SiteSettingsPropertyDeploymentStepDriver(string title, string description)
+    {
+        _title = title;
+        _description = description;
+    }
 
-        public override Task<IDisplayResult> DisplayAsync(SiteSettingsPropertyDeploymentStep<TModel> step, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                    Initialize<SiteSettingsPropertyDeploymentStepViewModel>("SiteSettingsPropertyDeploymentStep_Fields_Summary", m => BuildViewModel(m))
-                        .Location("Summary", "Content"),
-                    Initialize<SiteSettingsPropertyDeploymentStepViewModel>("SiteSettingsPropertyDeploymentStep_Fields_Thumbnail", m => BuildViewModel(m))
-                        .Location("Thumbnail", "Content")
-                );
-        }
+    public override Task<IDisplayResult> DisplayAsync(SiteSettingsPropertyDeploymentStep<TModel> step, BuildDisplayContext context)
+    {
+        return CombineAsync(
+                Initialize<SiteSettingsPropertyDeploymentStepViewModel>("SiteSettingsPropertyDeploymentStep_Fields_Summary", m => BuildViewModel(m))
+                    .Location("Summary", "Content"),
+                Initialize<SiteSettingsPropertyDeploymentStepViewModel>("SiteSettingsPropertyDeploymentStep_Fields_Thumbnail", m => BuildViewModel(m))
+                    .Location("Thumbnail", "Content")
+            );
+    }
 
-        public override IDisplayResult Edit(SiteSettingsPropertyDeploymentStep<TModel> step, BuildEditorContext context)
-        {
-            return Initialize<SiteSettingsPropertyDeploymentStepViewModel>("SiteSettingsPropertyDeploymentStep_Fields_Edit", BuildViewModel)
-                .Location("Content");
-        }
+    public override IDisplayResult Edit(SiteSettingsPropertyDeploymentStep<TModel> step, BuildEditorContext context)
+    {
+        return Initialize<SiteSettingsPropertyDeploymentStepViewModel>("SiteSettingsPropertyDeploymentStep_Fields_Edit", BuildViewModel)
+            .Location("Content");
+    }
 
-        private void BuildViewModel(SiteSettingsPropertyDeploymentStepViewModel model)
-        {
-            model.Title = _title;
-            model.Description = _description;
-        }
+    private void BuildViewModel(SiteSettingsPropertyDeploymentStepViewModel model)
+    {
+        model.Title = _title;
+        model.Description = _description;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Settings.Core/Deployment/SiteSettingsPropertyDeploymentStepFactory.cs b/src/OrchardCore/OrchardCore.Settings.Core/Deployment/SiteSettingsPropertyDeploymentStepFactory.cs
index 396d711f18c..bc4f45a135b 100644
--- a/src/OrchardCore/OrchardCore.Settings.Core/Deployment/SiteSettingsPropertyDeploymentStepFactory.cs
+++ b/src/OrchardCore/OrchardCore.Settings.Core/Deployment/SiteSettingsPropertyDeploymentStepFactory.cs
@@ -1,17 +1,16 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Settings.Deployment
+namespace OrchardCore.Settings.Deployment;
+
+public class SiteSettingsPropertyDeploymentStepFactory<TModel> : IDeploymentStepFactory
+    where TModel : class, new()
 {
-    public class SiteSettingsPropertyDeploymentStepFactory<TModel> : IDeploymentStepFactory
-        where TModel : class, new()
-    {
-        private static readonly string _genericTypeKey = typeof(TModel).Name + "_SiteSettingsPropertyDeploymentStep";
+    private static readonly string _genericTypeKey = typeof(TModel).Name + "_SiteSettingsPropertyDeploymentStep";
 
-        public string Name => _genericTypeKey;
+    public string Name => _genericTypeKey;
 
-        public DeploymentStep Create()
-        {
-            return new SiteSettingsPropertyDeploymentStep<TModel>();
-        }
+    public DeploymentStep Create()
+    {
+        return new SiteSettingsPropertyDeploymentStep<TModel>();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Settings.Core/ViewModels/SiteSettingsPropertyDeploymentStepViewModel.cs b/src/OrchardCore/OrchardCore.Settings.Core/ViewModels/SiteSettingsPropertyDeploymentStepViewModel.cs
index a1d11f8c550..0ceeb8dd2a9 100644
--- a/src/OrchardCore/OrchardCore.Settings.Core/ViewModels/SiteSettingsPropertyDeploymentStepViewModel.cs
+++ b/src/OrchardCore/OrchardCore.Settings.Core/ViewModels/SiteSettingsPropertyDeploymentStepViewModel.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Settings.ViewModels
+namespace OrchardCore.Settings.ViewModels;
+
+public class SiteSettingsPropertyDeploymentStepViewModel
 {
-    public class SiteSettingsPropertyDeploymentStepViewModel
-    {
-        public string Title { get; set; }
-        public string Description { get; set; }
-    }
+    public string Title { get; set; }
+    public string Description { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Setup.Abstractions/ISetupService.cs b/src/OrchardCore/OrchardCore.Setup.Abstractions/ISetupService.cs
index d114ecb832a..0d4e6688778 100644
--- a/src/OrchardCore/OrchardCore.Setup.Abstractions/ISetupService.cs
+++ b/src/OrchardCore/OrchardCore.Setup.Abstractions/ISetupService.cs
@@ -2,24 +2,23 @@
 using System.Threading.Tasks;
 using OrchardCore.Recipes.Models;
 
-namespace OrchardCore.Setup.Services
+namespace OrchardCore.Setup.Services;
+
+/// <summary>
+/// Contract that represents the setup service.
+/// </summary>
+public interface ISetupService
 {
     /// <summary>
-    /// Contract that represents the setup service.
+    /// Gets the setup recipes.
     /// </summary>
-    public interface ISetupService
-    {
-        /// <summary>
-        /// Gets the setup recipes.
-        /// </summary>
-        /// <returns>A list of <see cref="RecipeDescriptor"/>s.</returns>
-        Task<IEnumerable<RecipeDescriptor>> GetSetupRecipesAsync();
+    /// <returns>A list of <see cref="RecipeDescriptor"/>s.</returns>
+    Task<IEnumerable<RecipeDescriptor>> GetSetupRecipesAsync();
 
-        /// <summary>
-        /// Set up the tenant.
-        /// </summary>
-        /// <param name="context">The <see cref="SetupContext"/>.</param>
-        /// <returns> A GUID string the represents a setup execution identifier.</returns>
-        Task<string> SetupAsync(SetupContext context);
-    }
+    /// <summary>
+    /// Set up the tenant.
+    /// </summary>
+    /// <param name="context">The <see cref="SetupContext"/>.</param>
+    /// <returns> A GUID string the represents a setup execution identifier.</returns>
+    Task<string> SetupAsync(SetupContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Setup.Abstractions/ISetupUserIdGenerator.cs b/src/OrchardCore/OrchardCore.Setup.Abstractions/ISetupUserIdGenerator.cs
index 90d32c07a76..76c0e8e515b 100644
--- a/src/OrchardCore/OrchardCore.Setup.Abstractions/ISetupUserIdGenerator.cs
+++ b/src/OrchardCore/OrchardCore.Setup.Abstractions/ISetupUserIdGenerator.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Setup.Services
+namespace OrchardCore.Setup.Services;
+
+public interface ISetupUserIdGenerator
 {
-    public interface ISetupUserIdGenerator
-    {
-        string GenerateUniqueId();
-    }
+    string GenerateUniqueId();
 }
diff --git a/src/OrchardCore/OrchardCore.Setup.Abstractions/SetupContext.cs b/src/OrchardCore/OrchardCore.Setup.Abstractions/SetupContext.cs
index ec4bbc8afba..a56d2bb1d83 100644
--- a/src/OrchardCore/OrchardCore.Setup.Abstractions/SetupContext.cs
+++ b/src/OrchardCore/OrchardCore.Setup.Abstractions/SetupContext.cs
@@ -2,36 +2,35 @@
 using OrchardCore.Environment.Shell;
 using OrchardCore.Recipes.Models;
 
-namespace OrchardCore.Setup.Services
+namespace OrchardCore.Setup.Services;
+
+/// <summary>
+/// Represents a class that contains setup information.
+/// </summary>
+public class SetupContext
 {
     /// <summary>
-    /// Represents a class that contains setup information.
+    /// Gets or sets the shell settings.
     /// </summary>
-    public class SetupContext
-    {
-        /// <summary>
-        /// Gets or sets the shell settings.
-        /// </summary>
-        public ShellSettings ShellSettings { get; set; }
+    public ShellSettings ShellSettings { get; set; }
 
-        /// <summary>
-        /// Gets or sets the features that will be enabled.
-        /// </summary>
-        public IEnumerable<string> EnabledFeatures { get; set; }
+    /// <summary>
+    /// Gets or sets the features that will be enabled.
+    /// </summary>
+    public IEnumerable<string> EnabledFeatures { get; set; }
 
-        /// <summary>
-        /// Gets or sets the site recipe.
-        /// </summary>
-        public RecipeDescriptor Recipe { get; set; }
+    /// <summary>
+    /// Gets or sets the site recipe.
+    /// </summary>
+    public RecipeDescriptor Recipe { get; set; }
 
-        /// <summary>
-        /// Gets or sets the errors that occurred during the setup.
-        /// </summary>
-        public IDictionary<string, string> Errors { get; set; }
+    /// <summary>
+    /// Gets or sets the errors that occurred during the setup.
+    /// </summary>
+    public IDictionary<string, string> Errors { get; set; }
 
-        /// <summary>
-        /// Gets additional key/value info.
-        /// </summary>
-        public Dictionary<string, object> Properties { get; set; } = [];
-    }
+    /// <summary>
+    /// Gets additional key/value info.
+    /// </summary>
+    public Dictionary<string, object> Properties { get; set; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.Setup.Core/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Setup.Core/ServiceCollectionExtensions.cs
index cbe7537c14d..a19204d7554 100644
--- a/src/OrchardCore/OrchardCore.Setup.Core/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Setup.Core/ServiceCollectionExtensions.cs
@@ -1,23 +1,22 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Setup.Services;
 
-namespace OrchardCore.Setup
+namespace OrchardCore.Setup;
+
+/// <summary>
+/// Provides extension methods for <see cref="IServiceCollection"/>.
+/// </summary>
+public static class ServiceCollectionExtensions
 {
     /// <summary>
-    /// Provides extension methods for <see cref="IServiceCollection"/>.
+    /// Adds tenant level services.
     /// </summary>
-    public static class ServiceCollectionExtensions
+    public static IServiceCollection AddSetup(this IServiceCollection services)
     {
-        /// <summary>
-        /// Adds tenant level services.
-        /// </summary>
-        public static IServiceCollection AddSetup(this IServiceCollection services)
-        {
-            services.AddScoped<ISetupService, SetupService>();
+        services.AddScoped<ISetupService, SetupService>();
 
-            services.AddSingleton<ISetupUserIdGenerator, SetupUserIdGenerator>();
+        services.AddSingleton<ISetupUserIdGenerator, SetupUserIdGenerator>();
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Setup.Core/SetupService.cs b/src/OrchardCore/OrchardCore.Setup.Core/SetupService.cs
index ff70e897cf6..d493cdf7026 100644
--- a/src/OrchardCore/OrchardCore.Setup.Core/SetupService.cs
+++ b/src/OrchardCore/OrchardCore.Setup.Core/SetupService.cs
@@ -18,262 +18,261 @@
 using OrchardCore.Recipes.Services;
 using OrchardCore.Setup.Events;
 
-namespace OrchardCore.Setup.Services
+namespace OrchardCore.Setup.Services;
+
+/// <summary>
+/// Represents a setup service.
+/// </summary>
+public class SetupService : ISetupService
 {
+    private readonly IShellHost _shellHost;
+    private readonly IShellContextFactory _shellContextFactory;
+    private readonly ISetupUserIdGenerator _setupUserIdGenerator;
+    private readonly IEnumerable<IRecipeHarvester> _recipeHarvesters;
+    private readonly ILogger _logger;
+    protected readonly IStringLocalizer S;
+    private readonly IHostApplicationLifetime _applicationLifetime;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IDbConnectionValidator _dbConnectionValidator;
+    private readonly string _applicationName;
+    private IEnumerable<RecipeDescriptor> _recipes;
+
     /// <summary>
-    /// Represents a setup service.
+    /// Creates a new instance of <see cref="SetupService"/>.
     /// </summary>
-    public class SetupService : ISetupService
+    /// <param name="shellHost">The <see cref="IShellHost"/>.</param>
+    /// <param name="hostingEnvironment">The <see cref="IHostEnvironment"/>.</param>
+    /// <param name="shellContextFactory">The <see cref="IShellContextFactory"/>.</param>
+    /// <param name="setupUserIdGenerator">The <see cref="ISetupUserIdGenerator"/>.</param>
+    /// <param name="recipeHarvesters">A list of <see cref="IRecipeHarvester"/>s.</param>
+    /// <param name="logger">The <see cref="ILogger"/>.</param>
+    /// <param name="stringLocalizer">The <see cref="IStringLocalizer"/>.</param>
+    /// <param name="applicationLifetime">The <see cref="IHostApplicationLifetime"/>.</param>
+    /// <param name="httpContextAccessor">The <see cref="IHttpContextAccessor"/>.</param>
+    /// <param name="dbConnectionValidator">The <see cref="IDbConnectionValidator"/>.</param>
+    public SetupService(
+        IShellHost shellHost,
+        IHostEnvironment hostingEnvironment,
+        IShellContextFactory shellContextFactory,
+        ISetupUserIdGenerator setupUserIdGenerator,
+        IEnumerable<IRecipeHarvester> recipeHarvesters,
+        ILogger<SetupService> logger,
+        IStringLocalizer<SetupService> stringLocalizer,
+        IHostApplicationLifetime applicationLifetime,
+        IHttpContextAccessor httpContextAccessor,
+        IDbConnectionValidator dbConnectionValidator)
     {
-        private readonly IShellHost _shellHost;
-        private readonly IShellContextFactory _shellContextFactory;
-        private readonly ISetupUserIdGenerator _setupUserIdGenerator;
-        private readonly IEnumerable<IRecipeHarvester> _recipeHarvesters;
-        private readonly ILogger _logger;
-        protected readonly IStringLocalizer S;
-        private readonly IHostApplicationLifetime _applicationLifetime;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IDbConnectionValidator _dbConnectionValidator;
-        private readonly string _applicationName;
-        private IEnumerable<RecipeDescriptor> _recipes;
-
-        /// <summary>
-        /// Creates a new instance of <see cref="SetupService"/>.
-        /// </summary>
-        /// <param name="shellHost">The <see cref="IShellHost"/>.</param>
-        /// <param name="hostingEnvironment">The <see cref="IHostEnvironment"/>.</param>
-        /// <param name="shellContextFactory">The <see cref="IShellContextFactory"/>.</param>
-        /// <param name="setupUserIdGenerator">The <see cref="ISetupUserIdGenerator"/>.</param>
-        /// <param name="recipeHarvesters">A list of <see cref="IRecipeHarvester"/>s.</param>
-        /// <param name="logger">The <see cref="ILogger"/>.</param>
-        /// <param name="stringLocalizer">The <see cref="IStringLocalizer"/>.</param>
-        /// <param name="applicationLifetime">The <see cref="IHostApplicationLifetime"/>.</param>
-        /// <param name="httpContextAccessor">The <see cref="IHttpContextAccessor"/>.</param>
-        /// <param name="dbConnectionValidator">The <see cref="IDbConnectionValidator"/>.</param>
-        public SetupService(
-            IShellHost shellHost,
-            IHostEnvironment hostingEnvironment,
-            IShellContextFactory shellContextFactory,
-            ISetupUserIdGenerator setupUserIdGenerator,
-            IEnumerable<IRecipeHarvester> recipeHarvesters,
-            ILogger<SetupService> logger,
-            IStringLocalizer<SetupService> stringLocalizer,
-            IHostApplicationLifetime applicationLifetime,
-            IHttpContextAccessor httpContextAccessor,
-            IDbConnectionValidator dbConnectionValidator)
-        {
-            _shellHost = shellHost;
-            _applicationName = hostingEnvironment.ApplicationName;
-            _shellContextFactory = shellContextFactory;
-            _setupUserIdGenerator = setupUserIdGenerator;
-            _recipeHarvesters = recipeHarvesters;
-            _logger = logger;
-            S = stringLocalizer;
-            _applicationLifetime = applicationLifetime;
-            _httpContextAccessor = httpContextAccessor;
-            _dbConnectionValidator = dbConnectionValidator;
-        }
+        _shellHost = shellHost;
+        _applicationName = hostingEnvironment.ApplicationName;
+        _shellContextFactory = shellContextFactory;
+        _setupUserIdGenerator = setupUserIdGenerator;
+        _recipeHarvesters = recipeHarvesters;
+        _logger = logger;
+        S = stringLocalizer;
+        _applicationLifetime = applicationLifetime;
+        _httpContextAccessor = httpContextAccessor;
+        _dbConnectionValidator = dbConnectionValidator;
+    }
 
-        /// <inheritdoc />
-        public async Task<IEnumerable<RecipeDescriptor>> GetSetupRecipesAsync()
+    /// <inheritdoc />
+    public async Task<IEnumerable<RecipeDescriptor>> GetSetupRecipesAsync()
+    {
+        if (_recipes is null)
         {
-            if (_recipes is null)
-            {
-                var recipeCollections = await Task.WhenAll(_recipeHarvesters.Select(x => x.HarvestRecipesAsync()));
-                _recipes = recipeCollections.SelectMany(x => x).Where(x => x.IsSetupRecipe).ToArray();
-            }
-
-            return _recipes;
+            var recipeCollections = await Task.WhenAll(_recipeHarvesters.Select(x => x.HarvestRecipesAsync()));
+            _recipes = recipeCollections.SelectMany(x => x).Where(x => x.IsSetupRecipe).ToArray();
         }
 
-        /// <inheritdoc />
-        public async Task<string> SetupAsync(SetupContext context)
-        {
-            var initialState = context.ShellSettings.State;
-            try
-            {
-                var executionId = await SetupInternalAsync(context);
+        return _recipes;
+    }
 
-                if (context.Errors.Count > 0)
-                {
-                    context.ShellSettings.State = initialState;
-                    await _shellHost.ReloadShellContextAsync(context.ShellSettings, eventSource: false);
-                }
+    /// <inheritdoc />
+    public async Task<string> SetupAsync(SetupContext context)
+    {
+        var initialState = context.ShellSettings.State;
+        try
+        {
+            var executionId = await SetupInternalAsync(context);
 
-                return executionId;
-            }
-            catch
+            if (context.Errors.Count > 0)
             {
                 context.ShellSettings.State = initialState;
                 await _shellHost.ReloadShellContextAsync(context.ShellSettings, eventSource: false);
-
-                throw;
             }
-        }
 
-        private async Task<string> SetupInternalAsync(SetupContext context)
+            return executionId;
+        }
+        catch
         {
-            if (_logger.IsEnabled(LogLevel.Information))
-            {
-                _logger.LogInformation("Running setup for tenant '{TenantName}'.", context.ShellSettings?.Name);
-            }
+            context.ShellSettings.State = initialState;
+            await _shellHost.ReloadShellContextAsync(context.ShellSettings, eventSource: false);
 
-            // Features to enable for Setup.
-            string[] coreFeatures =
-            [
-                _applicationName,
-                "OrchardCore.Features",
-                "OrchardCore.Scripting",
-                "OrchardCore.Recipes"
-            ];
+            throw;
+        }
+    }
 
-            context.EnabledFeatures = coreFeatures.Union(context.EnabledFeatures ?? []).Distinct().ToList();
+    private async Task<string> SetupInternalAsync(SetupContext context)
+    {
+        if (_logger.IsEnabled(LogLevel.Information))
+        {
+            _logger.LogInformation("Running setup for tenant '{TenantName}'.", context.ShellSettings?.Name);
+        }
 
-            // Set shell state to "Initializing" so that subsequent HTTP requests are responded to with "Service Unavailable" while Orchard is setting up.
-            context.ShellSettings.AsInitializing();
+        // Features to enable for Setup.
+        string[] coreFeatures =
+        [
+            _applicationName,
+            "OrchardCore.Features",
+            "OrchardCore.Scripting",
+            "OrchardCore.Recipes"
+        ];
 
-            // Due to database collation we normalize the userId to lower invariant.
-            // During setup there are no users so we do not need to check unicity.
-            var adminUserId = _setupUserIdGenerator.GenerateUniqueId().ToLowerInvariant();
-            context.Properties[SetupConstants.AdminUserId] = adminUserId;
+        context.EnabledFeatures = coreFeatures.Union(context.EnabledFeatures ?? []).Distinct().ToList();
 
-            var recipeEnvironmentFeature = new RecipeEnvironmentFeature();
-            recipeEnvironmentFeature.Properties[SetupConstants.AdminUserId] = adminUserId;
+        // Set shell state to "Initializing" so that subsequent HTTP requests are responded to with "Service Unavailable" while Orchard is setting up.
+        context.ShellSettings.AsInitializing();
 
-            if (context.Properties.TryGetValue(SetupConstants.AdminUsername, out var adminUsername))
-            {
-                recipeEnvironmentFeature.Properties[SetupConstants.AdminUsername] = adminUsername;
-            }
+        // Due to database collation we normalize the userId to lower invariant.
+        // During setup there are no users so we do not need to check unicity.
+        var adminUserId = _setupUserIdGenerator.GenerateUniqueId().ToLowerInvariant();
+        context.Properties[SetupConstants.AdminUserId] = adminUserId;
 
-            if (context.Properties.TryGetValue(SetupConstants.SiteName, out var siteName))
-            {
-                recipeEnvironmentFeature.Properties[SetupConstants.SiteName] = siteName;
-            }
+        var recipeEnvironmentFeature = new RecipeEnvironmentFeature();
+        recipeEnvironmentFeature.Properties[SetupConstants.AdminUserId] = adminUserId;
 
-            _httpContextAccessor.HttpContext.Features.Set(recipeEnvironmentFeature);
+        if (context.Properties.TryGetValue(SetupConstants.AdminUsername, out var adminUsername))
+        {
+            recipeEnvironmentFeature.Properties[SetupConstants.AdminUsername] = adminUsername;
+        }
 
-            var shellSettings = new ShellSettings(context.ShellSettings).ConfigureDatabaseTableOptions();
-            if (string.IsNullOrWhiteSpace(shellSettings["DatabaseProvider"]))
-            {
-                shellSettings["DatabaseProvider"] = context.Properties.TryGetValue(SetupConstants.DatabaseProvider, out var databaseProvider) ? databaseProvider?.ToString() : string.Empty;
-                shellSettings["ConnectionString"] = context.Properties.TryGetValue(SetupConstants.DatabaseConnectionString, out var databaseConnectionString) ? databaseConnectionString?.ToString() : string.Empty;
-                shellSettings["TablePrefix"] = context.Properties.TryGetValue(SetupConstants.DatabaseTablePrefix, out var databaseTablePrefix) ? databaseTablePrefix?.ToString() : string.Empty;
-                shellSettings["Schema"] = context.Properties.TryGetValue(SetupConstants.DatabaseSchema, out var schema) ? schema?.ToString() : null;
-            }
+        if (context.Properties.TryGetValue(SetupConstants.SiteName, out var siteName))
+        {
+            recipeEnvironmentFeature.Properties[SetupConstants.SiteName] = siteName;
+        }
 
-            if (shellSettings["DatabaseProvider"] == DatabaseProviderValue.Sqlite && string.IsNullOrEmpty(shellSettings["DatabaseName"]))
-            {
-                shellSettings["DatabaseName"] = context.Properties.TryGetValue(SetupConstants.DatabaseName, out var dbName) ? dbName?.ToString() : "OrchardCore.db";
-            }
+        _httpContextAccessor.HttpContext.Features.Set(recipeEnvironmentFeature);
 
-            var validationContext = new DbConnectionValidatorContext(shellSettings);
-            switch (await _dbConnectionValidator.ValidateAsync(validationContext))
-            {
-                case DbConnectionValidatorResult.NoProvider:
-                    context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
-                    break;
-                case DbConnectionValidatorResult.UnsupportedProvider:
-                    context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
-                    break;
-                case DbConnectionValidatorResult.InvalidConnection:
-                    context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
-                    break;
-                case DbConnectionValidatorResult.InvalidCertificate:
-                    context.Errors.Add(string.Empty, S["The security certificate on the server is from a non-trusted source (the certificate issuing authority isn't listed as a trusted authority in Trusted Root Certification Authorities on the client machine). In a development environment, you have the option to use the '{0}' parameter in your connection string to bypass the validation performed by the certificate authority.", "TrustServerCertificate=True"]);
-                    break;
-                case DbConnectionValidatorResult.DocumentTableFound:
-                    context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
-                    break;
-            }
+        var shellSettings = new ShellSettings(context.ShellSettings).ConfigureDatabaseTableOptions();
+        if (string.IsNullOrWhiteSpace(shellSettings["DatabaseProvider"]))
+        {
+            shellSettings["DatabaseProvider"] = context.Properties.TryGetValue(SetupConstants.DatabaseProvider, out var databaseProvider) ? databaseProvider?.ToString() : string.Empty;
+            shellSettings["ConnectionString"] = context.Properties.TryGetValue(SetupConstants.DatabaseConnectionString, out var databaseConnectionString) ? databaseConnectionString?.ToString() : string.Empty;
+            shellSettings["TablePrefix"] = context.Properties.TryGetValue(SetupConstants.DatabaseTablePrefix, out var databaseTablePrefix) ? databaseTablePrefix?.ToString() : string.Empty;
+            shellSettings["Schema"] = context.Properties.TryGetValue(SetupConstants.DatabaseSchema, out var schema) ? schema?.ToString() : null;
+        }
 
-            if (context.Errors.Count > 0)
-            {
-                return null;
-            }
+        if (shellSettings["DatabaseProvider"] == DatabaseProviderValue.Sqlite && string.IsNullOrEmpty(shellSettings["DatabaseName"]))
+        {
+            shellSettings["DatabaseName"] = context.Properties.TryGetValue(SetupConstants.DatabaseName, out var dbName) ? dbName?.ToString() : "OrchardCore.db";
+        }
 
-            // Creating a standalone environment based on a "minimum shell descriptor".
-            // In theory this environment can be used to resolve any normal components by interface, and those
-            // components will exist entirely in isolation - no crossover between the safemode container currently in effect
-            // It is used to initialize the database before the recipe is run.
-            var shellDescriptor = new ShellDescriptor
-            {
-                Features = context.EnabledFeatures.Select(id => new ShellFeature(id)).ToList()
-            };
+        var validationContext = new DbConnectionValidatorContext(shellSettings);
+        switch (await _dbConnectionValidator.ValidateAsync(validationContext))
+        {
+            case DbConnectionValidatorResult.NoProvider:
+                context.Errors.Add(string.Empty, S["DatabaseProvider setting is required."]);
+                break;
+            case DbConnectionValidatorResult.UnsupportedProvider:
+                context.Errors.Add(string.Empty, S["The provided database provider is not supported."]);
+                break;
+            case DbConnectionValidatorResult.InvalidConnection:
+                context.Errors.Add(string.Empty, S["The provided connection string is invalid or server is unreachable."]);
+                break;
+            case DbConnectionValidatorResult.InvalidCertificate:
+                context.Errors.Add(string.Empty, S["The security certificate on the server is from a non-trusted source (the certificate issuing authority isn't listed as a trusted authority in Trusted Root Certification Authorities on the client machine). In a development environment, you have the option to use the '{0}' parameter in your connection string to bypass the validation performed by the certificate authority.", "TrustServerCertificate=True"]);
+                break;
+            case DbConnectionValidatorResult.DocumentTableFound:
+                context.Errors.Add(string.Empty, S["The provided database, table prefix and schema are already in use."]);
+                break;
+        }
 
-            string executionId;
+        if (context.Errors.Count > 0)
+        {
+            return null;
+        }
 
-            await using (var shellContext = await _shellContextFactory.CreateDescribedContextAsync(shellSettings, shellDescriptor))
-            {
-                await (await shellContext.CreateScopeAsync()).UsingServiceScopeAsync(async scope =>
-                {
-                    try
-                    {
-                        // Create the "minimum" shell descriptor.
-                        await scope.ServiceProvider.GetService<IShellDescriptorManager>()
-                            .UpdateShellDescriptorAsync(0, shellContext.Blueprint.Descriptor.Features);
-                    }
-                    catch (Exception e)
-                    {
-                        _logger.LogError(e, "An error occurred while initializing the datastore.");
-                        context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
-                    }
-                });
-
-                if (context.Errors.Count > 0)
-                {
-                    return null;
-                }
+        // Creating a standalone environment based on a "minimum shell descriptor".
+        // In theory this environment can be used to resolve any normal components by interface, and those
+        // components will exist entirely in isolation - no crossover between the safemode container currently in effect
+        // It is used to initialize the database before the recipe is run.
+        var shellDescriptor = new ShellDescriptor
+        {
+            Features = context.EnabledFeatures.Select(id => new ShellFeature(id)).ToList()
+        };
 
-                executionId = Guid.NewGuid().ToString("n");
+        string executionId;
 
-                var recipeExecutor = shellContext.ServiceProvider.GetRequiredService<IRecipeExecutor>();
+        await using (var shellContext = await _shellContextFactory.CreateDescribedContextAsync(shellSettings, shellDescriptor))
+        {
+            await (await shellContext.CreateScopeAsync()).UsingServiceScopeAsync(async scope =>
+            {
                 try
                 {
-                    await recipeExecutor.ExecuteAsync(executionId, context.Recipe, context.Properties, _applicationLifetime.ApplicationStopping);
-                }
-                catch (RecipeExecutionException e)
-                {
-                    _logger.LogError(e, "Unable to import a recipe during setup.");
-
-                    context.Errors.Add(string.Empty, string.Join(' ', e.StepResult.Errors));
+                    // Create the "minimum" shell descriptor.
+                    await scope.ServiceProvider.GetService<IShellDescriptorManager>()
+                        .UpdateShellDescriptorAsync(0, shellContext.Blueprint.Descriptor.Features);
                 }
                 catch (Exception e)
                 {
-                    _logger.LogError(e, "Unable to import a recipe during setup.");
-
-                    context.Errors.Add(string.Empty, S["Unexpected error occurred while importing the recipe."]);
+                    _logger.LogError(e, "An error occurred while initializing the datastore.");
+                    context.Errors.Add(string.Empty, S["An error occurred while initializing the datastore: {0}", e.Message]);
                 }
-            }
+            });
 
-            // Reloading the shell context as the recipe has probably updated its features.
-            await (await _shellHost.GetScopeAsync(shellSettings)).UsingAsync(async scope =>
+            if (context.Errors.Count > 0)
             {
-                var handlers = scope.ServiceProvider.GetServices<ISetupEventHandler>();
-                var logger = scope.ServiceProvider.GetRequiredService<ILogger<SetupService>>();
+                return null;
+            }
 
-                await handlers.InvokeAsync((handler, ctx) => handler.SetupAsync(ctx), context, _logger);
+            executionId = Guid.NewGuid().ToString("n");
 
-                if (context.Errors.Count > 0)
-                {
-                    await handlers.InvokeAsync((handler) => handler.FailedAsync(context), _logger);
-                }
-            });
+            var recipeExecutor = shellContext.ServiceProvider.GetRequiredService<IRecipeExecutor>();
+            try
+            {
+                await recipeExecutor.ExecuteAsync(executionId, context.Recipe, context.Properties, _applicationLifetime.ApplicationStopping);
+            }
+            catch (RecipeExecutionException e)
+            {
+                _logger.LogError(e, "Unable to import a recipe during setup.");
 
-            if (context.Errors.Count > 0)
+                context.Errors.Add(string.Empty, string.Join(' ', e.StepResult.Errors));
+            }
+            catch (Exception e)
             {
-                return executionId;
+                _logger.LogError(e, "Unable to import a recipe during setup.");
+
+                context.Errors.Add(string.Empty, S["Unexpected error occurred while importing the recipe."]);
             }
+        }
+
+        // Reloading the shell context as the recipe has probably updated its features.
+        await (await _shellHost.GetScopeAsync(shellSettings)).UsingAsync(async scope =>
+        {
+            var handlers = scope.ServiceProvider.GetServices<ISetupEventHandler>();
+            var logger = scope.ServiceProvider.GetRequiredService<ILogger<SetupService>>();
 
-            // Update the shell state.
-            await _shellHost.UpdateShellSettingsAsync(shellSettings.AsRunning());
+            await handlers.InvokeAsync((handler, ctx) => handler.SetupAsync(ctx), context, _logger);
 
-            await (await _shellHost.GetScopeAsync(shellSettings.Name)).UsingAsync(async scope =>
+            if (context.Errors.Count > 0)
             {
-                var handlers = scope.ServiceProvider.GetServices<ISetupEventHandler>();
-                await handlers.InvokeAsync((handler) => handler.SucceededAsync(), _logger);
-            });
+                await handlers.InvokeAsync((handler) => handler.FailedAsync(context), _logger);
+            }
+        });
 
+        if (context.Errors.Count > 0)
+        {
             return executionId;
         }
+
+        // Update the shell state.
+        await _shellHost.UpdateShellSettingsAsync(shellSettings.AsRunning());
+
+        await (await _shellHost.GetScopeAsync(shellSettings.Name)).UsingAsync(async scope =>
+        {
+            var handlers = scope.ServiceProvider.GetServices<ISetupEventHandler>();
+            await handlers.InvokeAsync((handler) => handler.SucceededAsync(), _logger);
+        });
+
+        return executionId;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Setup.Core/SetupUserIdGenerator.cs b/src/OrchardCore/OrchardCore.Setup.Core/SetupUserIdGenerator.cs
index 66e5bf56588..c9e2e6e1484 100644
--- a/src/OrchardCore/OrchardCore.Setup.Core/SetupUserIdGenerator.cs
+++ b/src/OrchardCore/OrchardCore.Setup.Core/SetupUserIdGenerator.cs
@@ -1,19 +1,18 @@
 using OrchardCore.Entities;
 
-namespace OrchardCore.Setup.Services
+namespace OrchardCore.Setup.Services;
+
+public class SetupUserIdGenerator : ISetupUserIdGenerator
 {
-    public class SetupUserIdGenerator : ISetupUserIdGenerator
-    {
-        private readonly IIdGenerator _generator;
+    private readonly IIdGenerator _generator;
 
-        public SetupUserIdGenerator(IIdGenerator generator)
-        {
-            _generator = generator;
-        }
+    public SetupUserIdGenerator(IIdGenerator generator)
+    {
+        _generator = generator;
+    }
 
-        public string GenerateUniqueId()
-        {
-            return _generator.GenerateUniqueId();
-        }
+    public string GenerateUniqueId()
+    {
+        return _generator.GenerateUniqueId();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Shells.Azure/Configuration/BlobShellConfigurationSources.cs b/src/OrchardCore/OrchardCore.Shells.Azure/Configuration/BlobShellConfigurationSources.cs
index fabac0bde01..7870969abb7 100644
--- a/src/OrchardCore/OrchardCore.Shells.Azure/Configuration/BlobShellConfigurationSources.cs
+++ b/src/OrchardCore/OrchardCore.Shells.Azure/Configuration/BlobShellConfigurationSources.cs
@@ -11,110 +11,109 @@
 using OrchardCore.FileStorage;
 using OrchardCore.Shells.Azure.Services;
 
-namespace OrchardCore.Shells.Azure.Configuration
+namespace OrchardCore.Shells.Azure.Configuration;
+
+public class BlobShellConfigurationSources : IShellConfigurationSources
 {
-    public class BlobShellConfigurationSources : IShellConfigurationSources
+    private readonly IShellsFileStore _shellsFileStore;
+    private readonly BlobShellStorageOptions _blobOptions;
+    private readonly string _container;
+    private readonly string _fileStoreContainer;
+
+    public BlobShellConfigurationSources(
+        IShellsFileStore shellsFileStore,
+        BlobShellStorageOptions blobOptions,
+        IOptions<ShellOptions> shellOptions)
     {
-        private readonly IShellsFileStore _shellsFileStore;
-        private readonly BlobShellStorageOptions _blobOptions;
-        private readonly string _container;
-        private readonly string _fileStoreContainer;
-
-        public BlobShellConfigurationSources(
-            IShellsFileStore shellsFileStore,
-            BlobShellStorageOptions blobOptions,
-            IOptions<ShellOptions> shellOptions)
-        {
-            _shellsFileStore = shellsFileStore;
-            _blobOptions = blobOptions;
+        _shellsFileStore = shellsFileStore;
+        _blobOptions = blobOptions;
 
-            // e.g., Sites.
-            _container = shellOptions.Value.ShellsContainerName;
+        // e.g., Sites.
+        _container = shellOptions.Value.ShellsContainerName;
 
-            // e.g., App_Data/Sites
-            _fileStoreContainer = Path.Combine(shellOptions.Value.ShellsApplicationDataPath, shellOptions.Value.ShellsContainerName);
-        }
-
-        public async Task AddSourcesAsync(string tenant, IConfigurationBuilder builder)
-        {
-            var appSettings = IFileStoreExtensions.Combine(null, _container, tenant, OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
-            var fileInfo = await _shellsFileStore.GetFileInfoAsync(appSettings);
+        // e.g., App_Data/Sites
+        _fileStoreContainer = Path.Combine(shellOptions.Value.ShellsApplicationDataPath, shellOptions.Value.ShellsContainerName);
+    }
 
-            if (fileInfo == null && _blobOptions.MigrateFromFiles)
-            {
-                if (await TryMigrateFromFileAsync(tenant, appSettings))
-                {
-                    fileInfo = await _shellsFileStore.GetFileInfoAsync(appSettings);
-                }
-            }
+    public async Task AddSourcesAsync(string tenant, IConfigurationBuilder builder)
+    {
+        var appSettings = IFileStoreExtensions.Combine(null, _container, tenant, OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
+        var fileInfo = await _shellsFileStore.GetFileInfoAsync(appSettings);
 
-            if (fileInfo != null)
+        if (fileInfo == null && _blobOptions.MigrateFromFiles)
+        {
+            if (await TryMigrateFromFileAsync(tenant, appSettings))
             {
-                var stream = await _shellsFileStore.GetFileStreamAsync(appSettings);
-                builder.AddTenantJsonStream(stream);
+                fileInfo = await _shellsFileStore.GetFileInfoAsync(appSettings);
             }
         }
 
-        public async Task SaveAsync(string tenant, IDictionary<string, string> data)
+        if (fileInfo != null)
         {
-            var appsettings = IFileStoreExtensions.Combine(null, _container, tenant, OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
+            var stream = await _shellsFileStore.GetFileStreamAsync(appSettings);
+            builder.AddTenantJsonStream(stream);
+        }
+    }
+
+    public async Task SaveAsync(string tenant, IDictionary<string, string> data)
+    {
+        var appsettings = IFileStoreExtensions.Combine(null, _container, tenant, OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
 
-            var fileInfo = await _shellsFileStore.GetFileInfoAsync(appsettings);
+        var fileInfo = await _shellsFileStore.GetFileInfoAsync(appsettings);
 
 #pragma warning disable CA1859 // Use concrete types when possible for improved performance
-            IDictionary<string, string> configData;
+        IDictionary<string, string> configData;
 #pragma warning restore CA1859 // Use concrete types when possible for improved performance
-            if (fileInfo != null)
+        if (fileInfo != null)
+        {
+            using var stream = await _shellsFileStore.GetFileStreamAsync(appsettings);
+            configData = await JsonConfigurationParser.ParseAsync(stream);
+        }
+        else
+        {
+            configData = new Dictionary<string, string>();
+        }
+
+        foreach (var key in data.Keys)
+        {
+            if (data[key] is not null)
             {
-                using var stream = await _shellsFileStore.GetFileStreamAsync(appsettings);
-                configData = await JsonConfigurationParser.ParseAsync(stream);
+                configData[key] = data[key];
             }
             else
             {
-                configData = new Dictionary<string, string>();
+                configData.Remove(key);
             }
+        }
 
-            foreach (var key in data.Keys)
-            {
-                if (data[key] is not null)
-                {
-                    configData[key] = data[key];
-                }
-                else
-                {
-                    configData.Remove(key);
-                }
-            }
+        var configurationString = configData.ToJsonObject().ToJsonString(JOptions.Default);
+        using var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(configurationString));
 
-            var configurationString = configData.ToJsonObject().ToJsonString(JOptions.Default);
-            using var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(configurationString));
+        await _shellsFileStore.CreateFileFromStreamAsync(appsettings, memoryStream);
+    }
 
-            await _shellsFileStore.CreateFileFromStreamAsync(appsettings, memoryStream);
-        }
+    public async Task RemoveAsync(string tenant)
+    {
+        var appsettings = IFileStoreExtensions.Combine(null, _container, tenant, OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
 
-        public async Task RemoveAsync(string tenant)
+        var fileInfo = await _shellsFileStore.GetFileInfoAsync(appsettings);
+        if (fileInfo != null)
         {
-            var appsettings = IFileStoreExtensions.Combine(null, _container, tenant, OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
-
-            var fileInfo = await _shellsFileStore.GetFileInfoAsync(appsettings);
-            if (fileInfo != null)
-            {
-                await _shellsFileStore.RemoveFileAsync(appsettings);
-            }
+            await _shellsFileStore.RemoveFileAsync(appsettings);
         }
+    }
 
-        private async Task<bool> TryMigrateFromFileAsync(string tenant, string destFile)
+    private async Task<bool> TryMigrateFromFileAsync(string tenant, string destFile)
+    {
+        var tenantFile = Path.Combine(_fileStoreContainer, tenant, OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
+        if (!File.Exists(tenantFile))
         {
-            var tenantFile = Path.Combine(_fileStoreContainer, tenant, OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
-            if (!File.Exists(tenantFile))
-            {
-                return false;
-            }
+            return false;
+        }
 
-            using var file = File.OpenRead(tenantFile);
-            await _shellsFileStore.CreateFileFromStreamAsync(destFile, file);
+        using var file = File.OpenRead(tenantFile);
+        await _shellsFileStore.CreateFileFromStreamAsync(destFile, file);
 
-            return true;
-        }
+        return true;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Shells.Azure/Configuration/BlobShellStorageOptions.cs b/src/OrchardCore/OrchardCore.Shells.Azure/Configuration/BlobShellStorageOptions.cs
index 33facb590f1..3e60eef8aec 100644
--- a/src/OrchardCore/OrchardCore.Shells.Azure/Configuration/BlobShellStorageOptions.cs
+++ b/src/OrchardCore/OrchardCore.Shells.Azure/Configuration/BlobShellStorageOptions.cs
@@ -1,9 +1,8 @@
 using OrchardCore.FileStorage.AzureBlob;
 
-namespace OrchardCore.Shells.Azure.Configuration
+namespace OrchardCore.Shells.Azure.Configuration;
+
+public class BlobShellStorageOptions : BlobStorageOptions
 {
-    public class BlobShellStorageOptions : BlobStorageOptions
-    {
-        public bool MigrateFromFiles { get; set; }
-    }
+    public bool MigrateFromFiles { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Shells.Azure/Configuration/BlobShellsConfigurationSources.cs b/src/OrchardCore/OrchardCore.Shells.Azure/Configuration/BlobShellsConfigurationSources.cs
index 3c8b423f49f..aec82cad96d 100644
--- a/src/OrchardCore/OrchardCore.Shells.Azure/Configuration/BlobShellsConfigurationSources.cs
+++ b/src/OrchardCore/OrchardCore.Shells.Azure/Configuration/BlobShellsConfigurationSources.cs
@@ -7,82 +7,81 @@
 using OrchardCore.Environment.Shell.Configuration;
 using OrchardCore.Shells.Azure.Services;
 
-namespace OrchardCore.Shells.Azure.Configuration
+namespace OrchardCore.Shells.Azure.Configuration;
+
+public class BlobShellsConfigurationSources : IShellsConfigurationSources
 {
-    public class BlobShellsConfigurationSources : IShellsConfigurationSources
-    {
-        private static readonly string _appSettings =
-            Path.GetFileNameWithoutExtension(OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
+    private static readonly string _appSettings =
+        Path.GetFileNameWithoutExtension(OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
 
-        private readonly IShellsFileStore _shellsFileStore;
-        private readonly BlobShellStorageOptions _blobOptions;
+    private readonly IShellsFileStore _shellsFileStore;
+    private readonly BlobShellStorageOptions _blobOptions;
 
-        private readonly string _environment;
-        private readonly string _fileSystemAppSettings;
+    private readonly string _environment;
+    private readonly string _fileSystemAppSettings;
 
-        public BlobShellsConfigurationSources(
-            IShellsFileStore shellsFileStore,
-            IHostEnvironment hostingEnvironment,
-            BlobShellStorageOptions blobOptions,
-            IOptions<ShellOptions> shellOptions
-            )
-        {
-            _shellsFileStore = shellsFileStore;
-            _environment = hostingEnvironment.EnvironmentName;
-            _blobOptions = blobOptions;
-            _fileSystemAppSettings = Path.Combine(shellOptions.Value.ShellsApplicationDataPath, _appSettings);
-        }
+    public BlobShellsConfigurationSources(
+        IShellsFileStore shellsFileStore,
+        IHostEnvironment hostingEnvironment,
+        BlobShellStorageOptions blobOptions,
+        IOptions<ShellOptions> shellOptions
+        )
+    {
+        _shellsFileStore = shellsFileStore;
+        _environment = hostingEnvironment.EnvironmentName;
+        _blobOptions = blobOptions;
+        _fileSystemAppSettings = Path.Combine(shellOptions.Value.ShellsApplicationDataPath, _appSettings);
+    }
 
-        public async Task AddSourcesAsync(IConfigurationBuilder builder)
-        {
-            var appSettingsFileInfo = await _shellsFileStore.GetFileInfoAsync(OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
+    public async Task AddSourcesAsync(IConfigurationBuilder builder)
+    {
+        var appSettingsFileInfo = await _shellsFileStore.GetFileInfoAsync(OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
 
-            if (appSettingsFileInfo == null && _blobOptions.MigrateFromFiles)
+        if (appSettingsFileInfo == null && _blobOptions.MigrateFromFiles)
+        {
+            if (await TryMigrateFromFileAsync($"{_fileSystemAppSettings}.json", OrchardCoreConstants.Configuration.ApplicationSettingsFileName))
             {
-                if (await TryMigrateFromFileAsync($"{_fileSystemAppSettings}.json", OrchardCoreConstants.Configuration.ApplicationSettingsFileName))
-                {
-                    appSettingsFileInfo = await _shellsFileStore.GetFileInfoAsync(OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
-                }
+                appSettingsFileInfo = await _shellsFileStore.GetFileInfoAsync(OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
             }
+        }
 
-            if (appSettingsFileInfo != null)
-            {
-                var stream = await _shellsFileStore.GetFileStreamAsync(OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
-                builder.AddTenantJsonStream(stream);
-            }
+        if (appSettingsFileInfo != null)
+        {
+            var stream = await _shellsFileStore.GetFileStreamAsync(OrchardCoreConstants.Configuration.ApplicationSettingsFileName);
+            builder.AddTenantJsonStream(stream);
+        }
 
-            var environmentAppSettingsFileName = $"{_appSettings}.{_environment}.json";
-            var environmentAppSettingsFileInfo = await _shellsFileStore.GetFileInfoAsync(environmentAppSettingsFileName);
-            if (environmentAppSettingsFileInfo == null && _blobOptions.MigrateFromFiles)
+        var environmentAppSettingsFileName = $"{_appSettings}.{_environment}.json";
+        var environmentAppSettingsFileInfo = await _shellsFileStore.GetFileInfoAsync(environmentAppSettingsFileName);
+        if (environmentAppSettingsFileInfo == null && _blobOptions.MigrateFromFiles)
+        {
+            if (await TryMigrateFromFileAsync($"{_fileSystemAppSettings}.{_environment}.json", environmentAppSettingsFileName))
             {
-                if (await TryMigrateFromFileAsync($"{_fileSystemAppSettings}.{_environment}.json", environmentAppSettingsFileName))
-                {
-                    environmentAppSettingsFileInfo = await _shellsFileStore.GetFileInfoAsync(environmentAppSettingsFileName);
-                }
-                else
-                {
-                    return;
-                }
+                environmentAppSettingsFileInfo = await _shellsFileStore.GetFileInfoAsync(environmentAppSettingsFileName);
             }
-
-            if (environmentAppSettingsFileInfo != null)
+            else
             {
-                var stream = await _shellsFileStore.GetFileStreamAsync(environmentAppSettingsFileName);
-                builder.AddTenantJsonStream(stream);
+                return;
             }
         }
 
-        private async Task<bool> TryMigrateFromFileAsync(string fileSystemPath, string destPath)
+        if (environmentAppSettingsFileInfo != null)
         {
-            if (!File.Exists(fileSystemPath))
-            {
-                return false;
-            }
-
-            using var file = File.OpenRead(fileSystemPath);
-            await _shellsFileStore.CreateFileFromStreamAsync(destPath, file);
+            var stream = await _shellsFileStore.GetFileStreamAsync(environmentAppSettingsFileName);
+            builder.AddTenantJsonStream(stream);
+        }
+    }
 
-            return true;
+    private async Task<bool> TryMigrateFromFileAsync(string fileSystemPath, string destPath)
+    {
+        if (!File.Exists(fileSystemPath))
+        {
+            return false;
         }
+
+        using var file = File.OpenRead(fileSystemPath);
+        await _shellsFileStore.CreateFileFromStreamAsync(destPath, file);
+
+        return true;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Shells.Azure/Configuration/BlobShellsSettingsSources.cs b/src/OrchardCore/OrchardCore.Shells.Azure/Configuration/BlobShellsSettingsSources.cs
index fe9c5d27ae7..790feb77c08 100644
--- a/src/OrchardCore/OrchardCore.Shells.Azure/Configuration/BlobShellsSettingsSources.cs
+++ b/src/OrchardCore/OrchardCore.Shells.Azure/Configuration/BlobShellsSettingsSources.cs
@@ -10,118 +10,117 @@
 using OrchardCore.Environment.Shell.Configuration;
 using OrchardCore.Shells.Azure.Services;
 
-namespace OrchardCore.Shells.Azure.Configuration
+namespace OrchardCore.Shells.Azure.Configuration;
+
+public class BlobShellsSettingsSources : IShellsSettingsSources
 {
-    public class BlobShellsSettingsSources : IShellsSettingsSources
-    {
-        private readonly IShellsFileStore _shellsFileStore;
-        private readonly BlobShellStorageOptions _blobOptions;
+    private readonly IShellsFileStore _shellsFileStore;
+    private readonly BlobShellStorageOptions _blobOptions;
 
-        private readonly string _tenantsFileSystemName;
+    private readonly string _tenantsFileSystemName;
 
-        public BlobShellsSettingsSources(IShellsFileStore shellsFileStore,
-            BlobShellStorageOptions blobOptions,
-            IOptions<ShellOptions> shellOptions)
-        {
-            _shellsFileStore = shellsFileStore;
-            _blobOptions = blobOptions;
-            _tenantsFileSystemName = Path.Combine(shellOptions.Value.ShellsApplicationDataPath, OrchardCoreConstants.Shell.TenantsFileName);
-        }
+    public BlobShellsSettingsSources(IShellsFileStore shellsFileStore,
+        BlobShellStorageOptions blobOptions,
+        IOptions<ShellOptions> shellOptions)
+    {
+        _shellsFileStore = shellsFileStore;
+        _blobOptions = blobOptions;
+        _tenantsFileSystemName = Path.Combine(shellOptions.Value.ShellsApplicationDataPath, OrchardCoreConstants.Shell.TenantsFileName);
+    }
 
-        public async Task AddSourcesAsync(IConfigurationBuilder builder)
-        {
-            var fileInfo = await _shellsFileStore.GetFileInfoAsync(OrchardCoreConstants.Shell.TenantsFileName);
+    public async Task AddSourcesAsync(IConfigurationBuilder builder)
+    {
+        var fileInfo = await _shellsFileStore.GetFileInfoAsync(OrchardCoreConstants.Shell.TenantsFileName);
 
-            if (fileInfo == null && _blobOptions.MigrateFromFiles)
+        if (fileInfo == null && _blobOptions.MigrateFromFiles)
+        {
+            if (await TryMigrateFromFileAsync())
             {
-                if (await TryMigrateFromFileAsync())
-                {
-                    fileInfo = await _shellsFileStore.GetFileInfoAsync(OrchardCoreConstants.Shell.TenantsFileName);
-                }
-                else
-                {
-                    return;
-                }
+                fileInfo = await _shellsFileStore.GetFileInfoAsync(OrchardCoreConstants.Shell.TenantsFileName);
             }
-
-            if (fileInfo != null)
+            else
             {
-                var stream = await _shellsFileStore.GetFileStreamAsync(OrchardCoreConstants.Shell.TenantsFileName);
-                builder.AddTenantJsonStream(stream);
+                return;
             }
         }
 
-        public Task AddSourcesAsync(string tenant, IConfigurationBuilder builder) => AddSourcesAsync(builder);
-
-        public async Task SaveAsync(string tenant, IDictionary<string, string> data)
+        if (fileInfo != null)
         {
-            JsonObject tenantsSettings;
+            var stream = await _shellsFileStore.GetFileStreamAsync(OrchardCoreConstants.Shell.TenantsFileName);
+            builder.AddTenantJsonStream(stream);
+        }
+    }
+
+    public Task AddSourcesAsync(string tenant, IConfigurationBuilder builder) => AddSourcesAsync(builder);
+
+    public async Task SaveAsync(string tenant, IDictionary<string, string> data)
+    {
+        JsonObject tenantsSettings;
 
-            var fileInfo = await _shellsFileStore.GetFileInfoAsync(OrchardCoreConstants.Shell.TenantsFileName);
+        var fileInfo = await _shellsFileStore.GetFileInfoAsync(OrchardCoreConstants.Shell.TenantsFileName);
 
-            if (fileInfo != null)
+        if (fileInfo != null)
+        {
+            using var stream = await _shellsFileStore.GetFileStreamAsync(OrchardCoreConstants.Shell.TenantsFileName);
+            tenantsSettings = await JObject.LoadAsync(stream);
+        }
+        else
+        {
+            tenantsSettings = [];
+        }
+
+        var settings = tenantsSettings[tenant] as JsonObject ?? [];
+        foreach (var key in data.Keys)
+        {
+            if (data[key] != null)
             {
-                using var stream = await _shellsFileStore.GetFileStreamAsync(OrchardCoreConstants.Shell.TenantsFileName);
-                tenantsSettings = await JObject.LoadAsync(stream);
+                settings[key] = data[key];
             }
             else
             {
-                tenantsSettings = [];
+                settings.Remove(key);
             }
+        }
 
-            var settings = tenantsSettings[tenant] as JsonObject ?? [];
-            foreach (var key in data.Keys)
-            {
-                if (data[key] != null)
-                {
-                    settings[key] = data[key];
-                }
-                else
-                {
-                    settings.Remove(key);
-                }
-            }
+        tenantsSettings[tenant] = settings;
 
-            tenantsSettings[tenant] = settings;
+        var tenantsSettingsString = tenantsSettings.ToJsonString(JOptions.Default);
+        using var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(tenantsSettingsString));
 
-            var tenantsSettingsString = tenantsSettings.ToJsonString(JOptions.Default);
-            using var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(tenantsSettingsString));
+        await _shellsFileStore.CreateFileFromStreamAsync(OrchardCoreConstants.Shell.TenantsFileName, memoryStream);
+    }
 
-            await _shellsFileStore.CreateFileFromStreamAsync(OrchardCoreConstants.Shell.TenantsFileName, memoryStream);
-        }
+    public async Task RemoveAsync(string tenant)
+    {
+        var fileInfo = await _shellsFileStore.GetFileInfoAsync(OrchardCoreConstants.Shell.TenantsFileName);
 
-        public async Task RemoveAsync(string tenant)
+        if (fileInfo != null)
         {
-            var fileInfo = await _shellsFileStore.GetFileInfoAsync(OrchardCoreConstants.Shell.TenantsFileName);
-
-            if (fileInfo != null)
+            JsonObject tenantsSettings;
+            using (var stream = await _shellsFileStore.GetFileStreamAsync(OrchardCoreConstants.Shell.TenantsFileName))
             {
-                JsonObject tenantsSettings;
-                using (var stream = await _shellsFileStore.GetFileStreamAsync(OrchardCoreConstants.Shell.TenantsFileName))
-                {
-                    tenantsSettings = await JObject.LoadAsync(stream);
-                }
+                tenantsSettings = await JObject.LoadAsync(stream);
+            }
 
-                tenantsSettings.Remove(tenant);
+            tenantsSettings.Remove(tenant);
 
-                var tenantsSettingsString = tenantsSettings.ToJsonString(JOptions.Default);
-                using var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(tenantsSettingsString));
+            var tenantsSettingsString = tenantsSettings.ToJsonString(JOptions.Default);
+            using var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(tenantsSettingsString));
 
-                await _shellsFileStore.CreateFileFromStreamAsync(OrchardCoreConstants.Shell.TenantsFileName, memoryStream);
-            }
+            await _shellsFileStore.CreateFileFromStreamAsync(OrchardCoreConstants.Shell.TenantsFileName, memoryStream);
         }
+    }
 
-        private async Task<bool> TryMigrateFromFileAsync()
+    private async Task<bool> TryMigrateFromFileAsync()
+    {
+        if (!File.Exists(_tenantsFileSystemName))
         {
-            if (!File.Exists(_tenantsFileSystemName))
-            {
-                return false;
-            }
+            return false;
+        }
 
-            using var file = File.OpenRead(_tenantsFileSystemName);
-            await _shellsFileStore.CreateFileFromStreamAsync(OrchardCoreConstants.Shell.TenantsFileName, file);
+        using var file = File.OpenRead(_tenantsFileSystemName);
+        await _shellsFileStore.CreateFileFromStreamAsync(OrchardCoreConstants.Shell.TenantsFileName, file);
 
-            return true;
-        }
+        return true;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Shells.Azure/Extensions/BlobShellsOrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Shells.Azure/Extensions/BlobShellsOrchardCoreBuilderExtensions.cs
index e3f5f161dfe..44123ebb628 100644
--- a/src/OrchardCore/OrchardCore.Shells.Azure/Extensions/BlobShellsOrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Shells.Azure/Extensions/BlobShellsOrchardCoreBuilderExtensions.cs
@@ -11,67 +11,66 @@
 using OrchardCore.Shells.Azure.Configuration;
 using OrchardCore.Shells.Azure.Services;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class BlobShellsOrchardCoreBuilderExtensions
 {
-    public static class BlobShellsOrchardCoreBuilderExtensions
+    /// <summary>
+    /// Host services to load site and shell settings from Azure Blob Storage.
+    /// </summary>
+    public static OrchardCoreBuilder AddAzureShellsConfiguration(this OrchardCoreBuilder builder)
     {
-        /// <summary>
-        /// Host services to load site and shell settings from Azure Blob Storage.
-        /// </summary>
-        public static OrchardCoreBuilder AddAzureShellsConfiguration(this OrchardCoreBuilder builder)
-        {
-            var services = builder.ApplicationServices;
+        var services = builder.ApplicationServices;
 
-            services.TryAddSingleton<IContentTypeProvider, FileExtensionContentTypeProvider>();
+        services.TryAddSingleton<IContentTypeProvider, FileExtensionContentTypeProvider>();
 
-            services.AddSingleton<IShellsFileStore>(sp =>
-            {
-                var configuration = sp.GetRequiredService<IConfiguration>();
+        services.AddSingleton<IShellsFileStore>(sp =>
+        {
+            var configuration = sp.GetRequiredService<IConfiguration>();
 
-                var blobOptions = configuration.GetSectionCompat("OrchardCore:OrchardCore_Shells_Azure")
-                    .Get<BlobShellStorageOptions>()
-                    ?? throw new Exception("The 'OrchardCore.Shells.Azure' configuration section must be defined");
+            var blobOptions = configuration.GetSectionCompat("OrchardCore:OrchardCore_Shells_Azure")
+                .Get<BlobShellStorageOptions>()
+                ?? throw new Exception("The 'OrchardCore.Shells.Azure' configuration section must be defined");
 
-                var clock = sp.GetRequiredService<IClock>();
-                var contentTypeProvider = sp.GetRequiredService<IContentTypeProvider>();
+            var clock = sp.GetRequiredService<IClock>();
+            var contentTypeProvider = sp.GetRequiredService<IContentTypeProvider>();
 
-                var fileStore = new BlobFileStore(blobOptions, clock, contentTypeProvider);
+            var fileStore = new BlobFileStore(blobOptions, clock, contentTypeProvider);
 
-                return new BlobShellsFileStore(fileStore);
-            });
+            return new BlobShellsFileStore(fileStore);
+        });
 
-            services.Replace(ServiceDescriptor.Singleton<IShellsSettingsSources>(sp =>
-            {
-                var shellsFileStore = sp.GetRequiredService<IShellsFileStore>();
-                var configuration = sp.GetRequiredService<IConfiguration>();
-                var blobOptions = configuration.GetSectionCompat("OrchardCore:OrchardCore_Shells_Azure").Get<BlobShellStorageOptions>();
-                var shellOptions = sp.GetRequiredService<IOptions<ShellOptions>>();
+        services.Replace(ServiceDescriptor.Singleton<IShellsSettingsSources>(sp =>
+        {
+            var shellsFileStore = sp.GetRequiredService<IShellsFileStore>();
+            var configuration = sp.GetRequiredService<IConfiguration>();
+            var blobOptions = configuration.GetSectionCompat("OrchardCore:OrchardCore_Shells_Azure").Get<BlobShellStorageOptions>();
+            var shellOptions = sp.GetRequiredService<IOptions<ShellOptions>>();
 
-                return new BlobShellsSettingsSources(shellsFileStore, blobOptions, shellOptions);
-            }));
+            return new BlobShellsSettingsSources(shellsFileStore, blobOptions, shellOptions);
+        }));
 
-            services.Replace(ServiceDescriptor.Singleton<IShellConfigurationSources>(sp =>
-            {
-                var shellsFileStore = sp.GetRequiredService<IShellsFileStore>();
-                var configuration = sp.GetRequiredService<IConfiguration>();
-                var blobOptions = configuration.GetSectionCompat("OrchardCore:OrchardCore_Shells_Azure").Get<BlobShellStorageOptions>();
-                var shellOptions = sp.GetRequiredService<IOptions<ShellOptions>>();
+        services.Replace(ServiceDescriptor.Singleton<IShellConfigurationSources>(sp =>
+        {
+            var shellsFileStore = sp.GetRequiredService<IShellsFileStore>();
+            var configuration = sp.GetRequiredService<IConfiguration>();
+            var blobOptions = configuration.GetSectionCompat("OrchardCore:OrchardCore_Shells_Azure").Get<BlobShellStorageOptions>();
+            var shellOptions = sp.GetRequiredService<IOptions<ShellOptions>>();
 
-                return new BlobShellConfigurationSources(shellsFileStore, blobOptions, shellOptions);
-            }));
+            return new BlobShellConfigurationSources(shellsFileStore, blobOptions, shellOptions);
+        }));
 
-            services.Replace(ServiceDescriptor.Singleton<IShellsConfigurationSources>(sp =>
-            {
-                var shellsFileStore = sp.GetRequiredService<IShellsFileStore>();
-                var environment = sp.GetRequiredService<IHostEnvironment>();
-                var configuration = sp.GetRequiredService<IConfiguration>();
-                var blobOptions = configuration.GetSectionCompat("OrchardCore:OrchardCore_Shells_Azure").Get<BlobShellStorageOptions>();
-                var shellOptions = sp.GetRequiredService<IOptions<ShellOptions>>();
+        services.Replace(ServiceDescriptor.Singleton<IShellsConfigurationSources>(sp =>
+        {
+            var shellsFileStore = sp.GetRequiredService<IShellsFileStore>();
+            var environment = sp.GetRequiredService<IHostEnvironment>();
+            var configuration = sp.GetRequiredService<IConfiguration>();
+            var blobOptions = configuration.GetSectionCompat("OrchardCore:OrchardCore_Shells_Azure").Get<BlobShellStorageOptions>();
+            var shellOptions = sp.GetRequiredService<IOptions<ShellOptions>>();
 
-                return new BlobShellsConfigurationSources(shellsFileStore, environment, blobOptions, shellOptions);
-            }));
+            return new BlobShellsConfigurationSources(shellsFileStore, environment, blobOptions, shellOptions);
+        }));
 
-            return builder;
-        }
+        return builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Shells.Azure/Services/BlobShellsFileStore.cs b/src/OrchardCore/OrchardCore.Shells.Azure/Services/BlobShellsFileStore.cs
index c3f5a2da14d..4ee0828be18 100644
--- a/src/OrchardCore/OrchardCore.Shells.Azure/Services/BlobShellsFileStore.cs
+++ b/src/OrchardCore/OrchardCore.Shells.Azure/Services/BlobShellsFileStore.cs
@@ -2,32 +2,31 @@
 using System.Threading.Tasks;
 using OrchardCore.FileStorage;
 
-namespace OrchardCore.Shells.Azure.Services
-{
-    public class BlobShellsFileStore : IShellsFileStore
-    {
-        private readonly IFileStore _fileStore;
+namespace OrchardCore.Shells.Azure.Services;
 
-        public BlobShellsFileStore(IFileStore fileStore)
-        {
-            _fileStore = fileStore;
-        }
+public class BlobShellsFileStore : IShellsFileStore
+{
+    private readonly IFileStore _fileStore;
 
-        public Task<string> CreateFileFromStreamAsync(string path, Stream inputStream)
-        {
-            return _fileStore.CreateFileFromStreamAsync(path, inputStream, true);
-        }
+    public BlobShellsFileStore(IFileStore fileStore)
+    {
+        _fileStore = fileStore;
+    }
 
-        public Task<IFileStoreEntry> GetFileInfoAsync(string path)
-        {
-            return _fileStore.GetFileInfoAsync(path);
-        }
+    public Task<string> CreateFileFromStreamAsync(string path, Stream inputStream)
+    {
+        return _fileStore.CreateFileFromStreamAsync(path, inputStream, true);
+    }
 
-        public Task<Stream> GetFileStreamAsync(string path)
-        {
-            return _fileStore.GetFileStreamAsync(path);
-        }
+    public Task<IFileStoreEntry> GetFileInfoAsync(string path)
+    {
+        return _fileStore.GetFileInfoAsync(path);
+    }
 
-        public Task RemoveFileAsync(string path) => _fileStore.TryDeleteFileAsync(path);
+    public Task<Stream> GetFileStreamAsync(string path)
+    {
+        return _fileStore.GetFileStreamAsync(path);
     }
+
+    public Task RemoveFileAsync(string path) => _fileStore.TryDeleteFileAsync(path);
 }
diff --git a/src/OrchardCore/OrchardCore.Shells.Azure/Services/IShellsFileStore.cs b/src/OrchardCore/OrchardCore.Shells.Azure/Services/IShellsFileStore.cs
index 5decfa39c9a..9a991584c6c 100644
--- a/src/OrchardCore/OrchardCore.Shells.Azure/Services/IShellsFileStore.cs
+++ b/src/OrchardCore/OrchardCore.Shells.Azure/Services/IShellsFileStore.cs
@@ -2,13 +2,12 @@
 using System.Threading.Tasks;
 using OrchardCore.FileStorage;
 
-namespace OrchardCore.Shells.Azure.Services
+namespace OrchardCore.Shells.Azure.Services;
+
+public interface IShellsFileStore
 {
-    public interface IShellsFileStore
-    {
-        Task<IFileStoreEntry> GetFileInfoAsync(string path);
-        Task<Stream> GetFileStreamAsync(string path);
-        Task<string> CreateFileFromStreamAsync(string path, Stream inputStream);
-        Task RemoveFileAsync(string path);
-    }
+    Task<IFileStoreEntry> GetFileInfoAsync(string path);
+    Task<Stream> GetFileStreamAsync(string path);
+    Task<string> CreateFileFromStreamAsync(string path, Stream inputStream);
+    Task RemoveFileAsync(string path);
 }
diff --git a/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/ServiceCollectionExtensions.cs
index bd6e1d398dc..fe9dfa8fdaf 100644
--- a/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/ServiceCollectionExtensions.cs
@@ -2,29 +2,28 @@
 using Microsoft.Extensions.DependencyInjection;
 using Shortcodes;
 
-namespace OrchardCore.Shortcodes
+namespace OrchardCore.Shortcodes;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
-    {
-        public static IServiceCollection AddShortcode<T>(this IServiceCollection services, string name) where T : class, IShortcodeProvider =>
-            services.AddShortcode(name, null);
+    public static IServiceCollection AddShortcode<T>(this IServiceCollection services, string name) where T : class, IShortcodeProvider =>
+        services.AddShortcode(name, null);
 
-        public static IServiceCollection AddShortcode<T>(this IServiceCollection services, string name, Action<ShortcodeOption> describe) where T : class, IShortcodeProvider
-        {
-            services.Configure<ShortcodeOptions>(options => options.AddShortcode(name, describe));
-            services.AddScoped<IShortcodeProvider, T>();
+    public static IServiceCollection AddShortcode<T>(this IServiceCollection services, string name, Action<ShortcodeOption> describe) where T : class, IShortcodeProvider
+    {
+        services.Configure<ShortcodeOptions>(options => options.AddShortcode(name, describe));
+        services.AddScoped<IShortcodeProvider, T>();
 
-            return services;
-        }
+        return services;
+    }
 
-        public static IServiceCollection AddShortcode(this IServiceCollection services, string name, ShortcodeDelegate shortcode) =>
-            services.Configure<ShortcodeOptions>(options => options.AddShortcodeDelegate(name, shortcode, null));
+    public static IServiceCollection AddShortcode(this IServiceCollection services, string name, ShortcodeDelegate shortcode) =>
+        services.Configure<ShortcodeOptions>(options => options.AddShortcodeDelegate(name, shortcode, null));
 
-        public static IServiceCollection AddShortcode(this IServiceCollection services, string name, ShortcodeDelegate shortcode, Action<ShortcodeOption> describe)
-        {
-            services.Configure<ShortcodeOptions>(options => options.AddShortcodeDelegate(name, shortcode, describe));
+    public static IServiceCollection AddShortcode(this IServiceCollection services, string name, ShortcodeDelegate shortcode, Action<ShortcodeOption> describe)
+    {
+        services.Configure<ShortcodeOptions>(options => options.AddShortcodeDelegate(name, shortcode, describe));
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/Services/IShortcodeContextProvider.cs b/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/Services/IShortcodeContextProvider.cs
index fe5685b98e3..824e41372c4 100644
--- a/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/Services/IShortcodeContextProvider.cs
+++ b/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/Services/IShortcodeContextProvider.cs
@@ -1,12 +1,11 @@
 using Shortcodes;
 
-namespace OrchardCore.Shortcodes.Services
+namespace OrchardCore.Shortcodes.Services;
+
+/// <summary>
+/// Implementations are able to provide a default context to the shortcode service.
+/// </summary>
+public interface IShortcodeContextProvider
 {
-    /// <summary>
-    /// Implementations are able to provide a default context to the shortcode service.
-    /// </summary>
-    public interface IShortcodeContextProvider
-    {
-        void Contextualize(Context context);
-    }
+    void Contextualize(Context context);
 }
diff --git a/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/Services/IShortcodeDescriptorManager.cs b/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/Services/IShortcodeDescriptorManager.cs
index b58548a07d1..b67533cf9b0 100644
--- a/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/Services/IShortcodeDescriptorManager.cs
+++ b/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/Services/IShortcodeDescriptorManager.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Shortcodes.Services
+namespace OrchardCore.Shortcodes.Services;
+
+public interface IShortcodeDescriptorManager
 {
-    public interface IShortcodeDescriptorManager
-    {
-        Task<IEnumerable<ShortcodeDescriptor>> GetShortcodeDescriptors();
-    }
+    Task<IEnumerable<ShortcodeDescriptor>> GetShortcodeDescriptors();
 }
diff --git a/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/Services/IShortcodeDescriptorProvider.cs b/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/Services/IShortcodeDescriptorProvider.cs
index 0eecfd10ab3..2da431acbfe 100644
--- a/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/Services/IShortcodeDescriptorProvider.cs
+++ b/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/Services/IShortcodeDescriptorProvider.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Shortcodes.Services
+namespace OrchardCore.Shortcodes.Services;
+
+public interface IShortcodeDescriptorProvider
 {
-    public interface IShortcodeDescriptorProvider
-    {
-        Task<IEnumerable<ShortcodeDescriptor>> DiscoverAsync();
-    }
+    Task<IEnumerable<ShortcodeDescriptor>> DiscoverAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/Services/IShortcodeService.cs b/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/Services/IShortcodeService.cs
index fb7360d61e9..b3d5f7e8556 100644
--- a/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/Services/IShortcodeService.cs
+++ b/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/Services/IShortcodeService.cs
@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
 using Shortcodes;
 
-namespace OrchardCore.Shortcodes.Services
+namespace OrchardCore.Shortcodes.Services;
+
+public interface IShortcodeService
 {
-    public interface IShortcodeService
-    {
-        ValueTask<string> ProcessAsync(string input, Context context = null);
-    }
+    ValueTask<string> ProcessAsync(string input, Context context = null);
 }
diff --git a/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/ShortcodeDescriptor.cs b/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/ShortcodeDescriptor.cs
index d79d0eb94e3..504b7d288b5 100644
--- a/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/ShortcodeDescriptor.cs
+++ b/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/ShortcodeDescriptor.cs
@@ -1,49 +1,48 @@
-namespace OrchardCore.Shortcodes
+namespace OrchardCore.Shortcodes;
+
+public class ShortcodeDescriptor
 {
-    public class ShortcodeDescriptor
-    {
-        private string _defaultValue;
+    private string _defaultValue;
 
-        /// <summary>
-        /// The shortcode name.
-        /// </summary>
-        public string Name { get; set; }
+    /// <summary>
+    /// The shortcode name.
+    /// </summary>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// The default value of the shortcode when selected.
-        /// </summary>
-        public string DefaultValue
+    /// <summary>
+    /// The default value of the shortcode when selected.
+    /// </summary>
+    public string DefaultValue
+    {
+        get
         {
-            get
+            if (string.IsNullOrEmpty(_defaultValue))
             {
-                if (string.IsNullOrEmpty(_defaultValue))
-                {
-                    return '[' + Name + ']';
-                }
-                else
-                {
-                    return _defaultValue;
-                }
+                return '[' + Name + ']';
             }
-            set
+            else
             {
-                _defaultValue = value;
+                return _defaultValue;
             }
         }
+        set
+        {
+            _defaultValue = value;
+        }
+    }
 
-        /// <summary>
-        /// The hint text for the shortcode.
-        /// </summary>
-        public string Hint { get; set; }
+    /// <summary>
+    /// The hint text for the shortcode.
+    /// </summary>
+    public string Hint { get; set; }
 
-        /// <summary>
-        /// The HTML usage description for the shortcode.
-        /// </summary>
-        public string Usage { get; set; }
+    /// <summary>
+    /// The HTML usage description for the shortcode.
+    /// </summary>
+    public string Usage { get; set; }
 
-        /// <summary>
-        /// The categories for the shortcode.
-        /// </summary>
-        public string[] Categories { get; set; } = [];
-    }
+    /// <summary>
+    /// The categories for the shortcode.
+    /// </summary>
+    public string[] Categories { get; set; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/ShortcodeOption.cs b/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/ShortcodeOption.cs
index dc644177f83..5e110ab4239 100644
--- a/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/ShortcodeOption.cs
+++ b/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/ShortcodeOption.cs
@@ -1,49 +1,48 @@
-namespace OrchardCore.Shortcodes
+namespace OrchardCore.Shortcodes;
+
+public class ShortcodeOption
 {
-    public class ShortcodeOption
-    {
-        private string _defaultValue;
+    private string _defaultValue;
 
-        /// <summary>
-        /// The shortcode name.
-        /// </summary>
-        public string Name { get; set; }
+    /// <summary>
+    /// The shortcode name.
+    /// </summary>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// The default value of the shortcode when selected.
-        /// </summary>
-        public string DefaultValue
+    /// <summary>
+    /// The default value of the shortcode when selected.
+    /// </summary>
+    public string DefaultValue
+    {
+        get
         {
-            get
+            if (string.IsNullOrEmpty(_defaultValue))
             {
-                if (string.IsNullOrEmpty(_defaultValue))
-                {
-                    return '[' + Name + ']';
-                }
-                else
-                {
-                    return _defaultValue;
-                }
+                return '[' + Name + ']';
             }
-            set
+            else
             {
-                _defaultValue = value;
+                return _defaultValue;
             }
         }
+        set
+        {
+            _defaultValue = value;
+        }
+    }
 
-        /// <summary>
-        /// The hint text for the shortcode.
-        /// </summary>
-        public string Hint { get; set; }
+    /// <summary>
+    /// The hint text for the shortcode.
+    /// </summary>
+    public string Hint { get; set; }
 
-        /// <summary>
-        /// The HTML usage description for the shortcode.
-        /// </summary>
-        public string Usage { get; set; }
+    /// <summary>
+    /// The HTML usage description for the shortcode.
+    /// </summary>
+    public string Usage { get; set; }
 
-        /// <summary>
-        /// The categories for the shortcode.
-        /// </summary>
-        public string[] Categories { get; set; }
-    }
+    /// <summary>
+    /// The categories for the shortcode.
+    /// </summary>
+    public string[] Categories { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/ShortcodeOptions.cs b/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/ShortcodeOptions.cs
index f846aade60a..b5b22e0478d 100644
--- a/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/ShortcodeOptions.cs
+++ b/src/OrchardCore/OrchardCore.Shortcodes.Abstractions/ShortcodeOptions.cs
@@ -2,38 +2,37 @@
 using System.Collections.Generic;
 using Shortcodes;
 
-namespace OrchardCore.Shortcodes
+namespace OrchardCore.Shortcodes;
+
+/// <summary>
+/// Provides a way to register shortcodes for discovery.
+/// </summary>
+public class ShortcodeOptions
 {
-    /// <summary>
-    /// Provides a way to register shortcodes for discovery.
-    /// </summary>
-    public class ShortcodeOptions
-    {
-        private readonly Dictionary<string, ShortcodeOption> _shortcodes = [];
+    private readonly Dictionary<string, ShortcodeOption> _shortcodes = [];
 
-        public IReadOnlyDictionary<string, ShortcodeOption> Shortcodes => _shortcodes;
+    public IReadOnlyDictionary<string, ShortcodeOption> Shortcodes => _shortcodes;
 
-        private readonly Dictionary<string, ShortcodeDelegate> _shortcodeDelegates = [];
+    private readonly Dictionary<string, ShortcodeDelegate> _shortcodeDelegates = [];
 
-        public IReadOnlyDictionary<string, ShortcodeDelegate> ShortcodeDelegates => _shortcodeDelegates;
+    public IReadOnlyDictionary<string, ShortcodeDelegate> ShortcodeDelegates => _shortcodeDelegates;
 
-        internal ShortcodeOptions AddShortcode(string name, Action<ShortcodeOption> describe)
-        {
-            var option = new ShortcodeOption { Name = name };
-            describe?.Invoke(option);
-            _shortcodes[name] = option;
+    internal ShortcodeOptions AddShortcode(string name, Action<ShortcodeOption> describe)
+    {
+        var option = new ShortcodeOption { Name = name };
+        describe?.Invoke(option);
+        _shortcodes[name] = option;
 
-            return this;
-        }
+        return this;
+    }
 
-        internal ShortcodeOptions AddShortcodeDelegate(string name, ShortcodeDelegate shortcode, Action<ShortcodeOption> describe)
-        {
-            var option = new ShortcodeOption { Name = name };
-            describe?.Invoke(option);
-            _shortcodes[name] = option;
-            _shortcodeDelegates[name] = shortcode;
+    internal ShortcodeOptions AddShortcodeDelegate(string name, ShortcodeDelegate shortcode, Action<ShortcodeOption> describe)
+    {
+        var option = new ShortcodeOption { Name = name };
+        describe?.Invoke(option);
+        _shortcodes[name] = option;
+        _shortcodeDelegates[name] = shortcode;
 
-            return this;
-        }
+        return this;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Aspects/SitemapMetadataAspect.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Aspects/SitemapMetadataAspect.cs
index 1e04aa795be..cb7ba0e16e8 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Aspects/SitemapMetadataAspect.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Aspects/SitemapMetadataAspect.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Sitemaps.Aspects
+namespace OrchardCore.Sitemaps.Aspects;
+
+public class SitemapMetadataAspect
 {
-    public class SitemapMetadataAspect
-    {
-        public string ChangeFrequency { get; set; }
-        public int? Priority { get; set; }
-        public bool Exclude { get; set; }
-    }
+    public string ChangeFrequency { get; set; }
+    public int? Priority { get; set; }
+    public bool Exclude { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ContentItemsQueryContext.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ContentItemsQueryContext.cs
index 9dd86f42b85..2e213497820 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ContentItemsQueryContext.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ContentItemsQueryContext.cs
@@ -1,18 +1,17 @@
 using System.Collections.Generic;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Sitemaps.Builders
+namespace OrchardCore.Sitemaps.Builders;
+
+public class ContentItemsQueryContext
 {
-    public class ContentItemsQueryContext
-    {
-        /// <summary>
-        /// Content items to include in sitemap.
-        /// </summary>
-        public IEnumerable<ContentItem> ContentItems { get; set; } = [];
+    /// <summary>
+    /// Content items to include in sitemap.
+    /// </summary>
+    public IEnumerable<ContentItem> ContentItems { get; set; } = [];
 
-        /// <summary>
-        /// Reference content items that may be used to perform a lookup for url alternatives.
-        /// </summary>
-        public IEnumerable<ContentItem> ReferenceContentItems { get; set; } = [];
-    }
+    /// <summary>
+    /// Reference content items that may be used to perform a lookup for url alternatives.
+    /// </summary>
+    public IEnumerable<ContentItem> ReferenceContentItems { get; set; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/IContentItemsQueryProvider.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/IContentItemsQueryProvider.cs
index 50b96242c35..1cc812e57b9 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/IContentItemsQueryProvider.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/IContentItemsQueryProvider.cs
@@ -1,13 +1,12 @@
 using System.Threading.Tasks;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Builders
+namespace OrchardCore.Sitemaps.Builders;
+
+public interface IContentItemsQueryProvider
 {
-    public interface IContentItemsQueryProvider
-    {
-        /// <summary>
-        /// Get content items to evaluate for inclusion in a sitemap.
-        /// </summary>
-        Task GetContentItemsAsync(ContentTypesSitemapSource source, ContentItemsQueryContext context);
-    }
+    /// <summary>
+    /// Get content items to evaluate for inclusion in a sitemap.
+    /// </summary>
+    Task GetContentItemsAsync(ContentTypesSitemapSource source, ContentItemsQueryContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapBuilder.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapBuilder.cs
index 4d1c24d3af8..15a7d4cd371 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapBuilder.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapBuilder.cs
@@ -2,13 +2,12 @@
 using System.Xml.Linq;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Builders
+namespace OrchardCore.Sitemaps.Builders;
+
+/// <summary>
+/// Builds a sitemap.
+/// </summary>
+public interface ISitemapBuilder
 {
-    /// <summary>
-    /// Builds a sitemap.
-    /// </summary>
-    public interface ISitemapBuilder
-    {
-        Task<XDocument> BuildAsync(SitemapType sitemap, SitemapBuilderContext context);
-    }
+    Task<XDocument> BuildAsync(SitemapType sitemap, SitemapBuilderContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapContentItemExtendedMetadataProvider.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapContentItemExtendedMetadataProvider.cs
index ffcf5c6d8dd..a2fc83ab653 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapContentItemExtendedMetadataProvider.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapContentItemExtendedMetadataProvider.cs
@@ -2,21 +2,20 @@
 using System.Xml.Linq;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Sitemaps.Builders
+namespace OrchardCore.Sitemaps.Builders;
+
+/// <summary>
+/// Provides extended metadata, such as hreflang, or image sitemap metadata, to a url element.
+/// </summary>
+public interface ISitemapContentItemExtendedMetadataProvider
 {
     /// <summary>
-    /// Provides extended metadata, such as hreflang, or image sitemap metadata, to a url element.
+    /// Get extended attributes to add to the xml schema.
     /// </summary>
-    public interface ISitemapContentItemExtendedMetadataProvider
-    {
-        /// <summary>
-        /// Get extended attributes to add to the xml schema.
-        /// </summary>
-        XAttribute GetExtendedAttribute { get; }
+    XAttribute GetExtendedAttribute { get; }
 
-        /// <summary>
-        /// Apply extended metadata to the url element.
-        /// </summary>
-        Task<bool> ApplyExtendedMetadataAsync(SitemapBuilderContext context, ContentItemsQueryContext queryContext, ContentItem contentItem, XElement url);
-    }
+    /// <summary>
+    /// Apply extended metadata to the url element.
+    /// </summary>
+    Task<bool> ApplyExtendedMetadataAsync(SitemapBuilderContext context, ContentItemsQueryContext queryContext, ContentItem contentItem, XElement url);
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapModifiedDateProvider.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapModifiedDateProvider.cs
index d1ed3c9ea1f..b444a1136f7 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapModifiedDateProvider.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapModifiedDateProvider.cs
@@ -2,13 +2,12 @@
 using System.Threading.Tasks;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Builders
+namespace OrchardCore.Sitemaps.Builders;
+
+/// <summary>
+/// Provides a last modified date for a sitemap.
+/// </summary>
+public interface ISitemapModifiedDateProvider
 {
-    /// <summary>
-    /// Provides a last modified date for a sitemap.
-    /// </summary>
-    public interface ISitemapModifiedDateProvider
-    {
-        Task<DateTime?> GetLastModifiedDateAsync(SitemapType sitemap);
-    }
+    Task<DateTime?> GetLastModifiedDateAsync(SitemapType sitemap);
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapSourceBuilder.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapSourceBuilder.cs
index 1f5a5f8bfd7..18f6fa7d3e5 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapSourceBuilder.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapSourceBuilder.cs
@@ -1,13 +1,12 @@
 using System.Threading.Tasks;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Builders
+namespace OrchardCore.Sitemaps.Builders;
+
+/// <summary>
+/// Builds items for a sitemap source.
+/// </summary>
+public interface ISitemapSourceBuilder
 {
-    /// <summary>
-    /// Builds items for a sitemap source.
-    /// </summary>
-    public interface ISitemapSourceBuilder
-    {
-        Task BuildAsync(SitemapSource source, SitemapBuilderContext context);
-    }
+    Task BuildAsync(SitemapSource source, SitemapBuilderContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapSourceModifiedDateProvider.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapSourceModifiedDateProvider.cs
index c2251e881ad..35ad91c6135 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapSourceModifiedDateProvider.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapSourceModifiedDateProvider.cs
@@ -2,13 +2,12 @@
 using System.Threading.Tasks;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Builders
+namespace OrchardCore.Sitemaps.Builders;
+
+/// <summary>
+/// Provides a last modified date from a sitemap source.
+/// </summary>
+public interface ISitemapSourceModifiedDateProvider
 {
-    /// <summary>
-    /// Provides a last modified date from a sitemap source.
-    /// </summary>
-    public interface ISitemapSourceModifiedDateProvider
-    {
-        Task<DateTime?> GetLastModifiedDateAsync(SitemapSource source);
-    }
+    Task<DateTime?> GetLastModifiedDateAsync(SitemapSource source);
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapTypeBuilder.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapTypeBuilder.cs
index 348c87f86a1..2a5eceac718 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapTypeBuilder.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/ISitemapTypeBuilder.cs
@@ -1,13 +1,12 @@
 using System.Threading.Tasks;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Builders
+namespace OrchardCore.Sitemaps.Builders;
+
+/// <summary>
+/// Builds a sitemap source.
+/// </summary>
+public interface ISitemapTypeBuilder
 {
-    /// <summary>
-    /// Builds a sitemap source.
-    /// </summary>
-    public interface ISitemapTypeBuilder
-    {
-        Task BuildAsync(SitemapType sitemap, SitemapBuilderContext context);
-    }
+    Task BuildAsync(SitemapType sitemap, SitemapBuilderContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/SitemapBuilderContext.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/SitemapBuilderContext.cs
index ef28c1af935..d7feaaa892f 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/SitemapBuilderContext.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/SitemapBuilderContext.cs
@@ -1,17 +1,16 @@
 using System.Xml.Linq;
 using Microsoft.AspNetCore.Mvc;
 
-namespace OrchardCore.Sitemaps.Builders
+namespace OrchardCore.Sitemaps.Builders;
+
+public class SitemapBuilderContext
 {
-    public class SitemapBuilderContext
-    {
-        public string HostPrefix { get; set; }
-        public IUrlHelper UrlHelper { get; set; }
-        public SitemapResponse Response { get; set; }
-    }
+    public string HostPrefix { get; set; }
+    public IUrlHelper UrlHelper { get; set; }
+    public SitemapResponse Response { get; set; }
+}
 
-    public class SitemapResponse
-    {
-        public XElement ResponseElement { get; set; }
-    }
+public class SitemapResponse
+{
+    public XElement ResponseElement { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/SitemapSourceBuilderBase.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/SitemapSourceBuilderBase.cs
index 8e2809545bf..14b83b2a72b 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/SitemapSourceBuilderBase.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/SitemapSourceBuilderBase.cs
@@ -1,23 +1,22 @@
 using System.Threading.Tasks;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Builders
+namespace OrchardCore.Sitemaps.Builders;
+
+/// <summary>
+/// Inherit to provide a sitemap source item builder.
+/// </summary>
+public abstract class SitemapSourceBuilderBase<TSitemapSource> : ISitemapSourceBuilder where TSitemapSource : SitemapSource
 {
-    /// <summary>
-    /// Inherit to provide a sitemap source item builder.
-    /// </summary>
-    public abstract class SitemapSourceBuilderBase<TSitemapSource> : ISitemapSourceBuilder where TSitemapSource : SitemapSource
+    async Task ISitemapSourceBuilder.BuildAsync(SitemapSource source, SitemapBuilderContext context)
     {
-        async Task ISitemapSourceBuilder.BuildAsync(SitemapSource source, SitemapBuilderContext context)
+        var tSource = source as TSitemapSource;
+        if (tSource != null)
         {
-            var tSource = source as TSitemapSource;
-            if (tSource != null)
-            {
-                await BuildSourceAsync(tSource, context);
-            }
-
+            await BuildSourceAsync(tSource, context);
         }
 
-        public abstract Task BuildSourceAsync(TSitemapSource source, SitemapBuilderContext context);
     }
+
+    public abstract Task BuildSourceAsync(TSitemapSource source, SitemapBuilderContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/SitemapSourceModifiedDateProviderBase.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/SitemapSourceModifiedDateProviderBase.cs
index aed3e1cc840..d05aeb89fca 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/SitemapSourceModifiedDateProviderBase.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/SitemapSourceModifiedDateProviderBase.cs
@@ -2,31 +2,30 @@
 using System.Threading.Tasks;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Builders
+namespace OrchardCore.Sitemaps.Builders;
+
+/// <summary>
+/// Inherit to provide a sitemap source modified date provider.
+/// </summary>
+public abstract class SitemapSourceModifiedDateProviderBase<TSitemapSource> : ISitemapSourceModifiedDateProvider where TSitemapSource : SitemapSource
 {
-    /// <summary>
-    /// Inherit to provide a sitemap source modified date provider.
-    /// </summary>
-    public abstract class SitemapSourceModifiedDateProviderBase<TSitemapSource> : ISitemapSourceModifiedDateProvider where TSitemapSource : SitemapSource
+    Task<DateTime?> ISitemapSourceModifiedDateProvider.GetLastModifiedDateAsync(SitemapSource source)
     {
-        Task<DateTime?> ISitemapSourceModifiedDateProvider.GetLastModifiedDateAsync(SitemapSource source)
-        {
-            var tSource = source as TSitemapSource;
-
-            if (tSource == null)
-            {
-                return Task.FromResult<DateTime?>(null);
-            }
-
-            return GetLastModifiedDateAsync(tSource);
-        }
+        var tSource = source as TSitemapSource;
 
-        /// <summary>
-        /// Implement to provide a last modified date for a sitemap source.
-        /// </summary>
-        public virtual Task<DateTime?> GetLastModifiedDateAsync(TSitemapSource tSource)
+        if (tSource == null)
         {
             return Task.FromResult<DateTime?>(null);
         }
+
+        return GetLastModifiedDateAsync(tSource);
+    }
+
+    /// <summary>
+    /// Implement to provide a last modified date for a sitemap source.
+    /// </summary>
+    public virtual Task<DateTime?> GetLastModifiedDateAsync(TSitemapSource tSource)
+    {
+        return Task.FromResult<DateTime?>(null);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/SitemapTypeBuilderBase.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/SitemapTypeBuilderBase.cs
index a345db81701..633b60af7a8 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/SitemapTypeBuilderBase.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Builders/SitemapTypeBuilderBase.cs
@@ -1,22 +1,21 @@
 using System.Threading.Tasks;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Builders
+namespace OrchardCore.Sitemaps.Builders;
+
+/// <summary>
+/// Inherit to provide a sitemap type builder.
+/// </summary>
+public abstract class SitemapTypeBuilderBase<TSitemapType> : ISitemapTypeBuilder where TSitemapType : SitemapType
 {
-    /// <summary>
-    /// Inherit to provide a sitemap type builder.
-    /// </summary>
-    public abstract class SitemapTypeBuilderBase<TSitemapType> : ISitemapTypeBuilder where TSitemapType : SitemapType
+    public async Task BuildAsync(SitemapType sitemap, SitemapBuilderContext context)
     {
-        public async Task BuildAsync(SitemapType sitemap, SitemapBuilderContext context)
+        var tSitemap = sitemap as TSitemapType;
+        if (tSitemap != null)
         {
-            var tSitemap = sitemap as TSitemapType;
-            if (tSitemap != null)
-            {
-                await BuildSitemapTypeAsync(tSitemap, context);
-            }
+            await BuildSitemapTypeAsync(tSitemap, context);
         }
-
-        public abstract Task BuildSitemapTypeAsync(TSitemapType sitemap, SitemapBuilderContext context);
     }
+
+    public abstract Task BuildSitemapTypeAsync(TSitemapType sitemap, SitemapBuilderContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Cache/ISitemapCacheFileResolver.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Cache/ISitemapCacheFileResolver.cs
index c4625d67a39..58441837981 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Cache/ISitemapCacheFileResolver.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Cache/ISitemapCacheFileResolver.cs
@@ -1,13 +1,12 @@
 using System.IO;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Sitemaps.Cache
+namespace OrchardCore.Sitemaps.Cache;
+
+/// <summary>
+/// Resolves a sitemap cache file.
+/// </summary>
+public interface ISitemapCacheFileResolver
 {
-    /// <summary>
-    /// Resolves a sitemap cache file.
-    /// </summary>
-    public interface ISitemapCacheFileResolver
-    {
-        Task<Stream> OpenReadStreamAsync();
-    }
+    Task<Stream> OpenReadStreamAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Cache/ISitemapCacheProvider.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Cache/ISitemapCacheProvider.cs
index 6159c70c0e6..1c7ebc46fe0 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Cache/ISitemapCacheProvider.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Cache/ISitemapCacheProvider.cs
@@ -3,19 +3,18 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Sitemaps.Cache
+namespace OrchardCore.Sitemaps.Cache;
+
+/// <summary>
+/// Provides sitemap files from the cache.
+/// </summary>
+public interface ISitemapCacheProvider
 {
-    /// <summary>
-    /// Provides sitemap files from the cache.
-    /// </summary>
-    public interface ISitemapCacheProvider
-    {
-        Task<ISitemapCacheFileResolver> GetCachedSitemapAsync(string cacheFileName);
-        Task SetSitemapCacheAsync(Stream stream, string cacheFileName, CancellationToken cancellationToken);
-        Task CleanSitemapCacheAsync(IEnumerable<string> validCacheFileNames);
-        Task ClearSitemapCacheAsync(string cacheFileName);
-        Task<bool> PurgeAllAsync();
-        Task<bool> PurgeAsync(string cacheFileName);
-        Task<IEnumerable<string>> ListAsync();
-    }
+    Task<ISitemapCacheFileResolver> GetCachedSitemapAsync(string cacheFileName);
+    Task SetSitemapCacheAsync(Stream stream, string cacheFileName, CancellationToken cancellationToken);
+    Task CleanSitemapCacheAsync(IEnumerable<string> validCacheFileNames);
+    Task ClearSitemapCacheAsync(string cacheFileName);
+    Task<bool> PurgeAllAsync();
+    Task<bool> PurgeAsync(string cacheFileName);
+    Task<IEnumerable<string>> ListAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Handlers/ISitemapSourceUpdateHandler.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Handlers/ISitemapSourceUpdateHandler.cs
index 23e7febb14d..b5888a34402 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Handlers/ISitemapSourceUpdateHandler.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Handlers/ISitemapSourceUpdateHandler.cs
@@ -1,13 +1,12 @@
 using System.Threading.Tasks;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Handlers
+namespace OrchardCore.Sitemaps.Handlers;
+
+/// <summary>
+/// Handles sitemaps updates based on their <see cref="SitemapSource"/> of a given type.
+/// </summary>
+public interface ISitemapSourceUpdateHandler
 {
-    /// <summary>
-    /// Handles sitemaps updates based on their <see cref="SitemapSource"/> of a given type.
-    /// </summary>
-    public interface ISitemapSourceUpdateHandler
-    {
-        Task UpdateSitemapAsync(SitemapUpdateContext context);
-    }
+    Task UpdateSitemapAsync(SitemapUpdateContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Handlers/ISitemapTypeUpdateHandler.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Handlers/ISitemapTypeUpdateHandler.cs
index a0bfc336862..9d04c26b09a 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Handlers/ISitemapTypeUpdateHandler.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Handlers/ISitemapTypeUpdateHandler.cs
@@ -1,13 +1,12 @@
 using System.Threading.Tasks;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Handlers
+namespace OrchardCore.Sitemaps.Handlers;
+
+/// <summary>
+/// Handles sitemaps updates based on their <see cref="SitemapSource"/>.
+/// </summary>
+public interface ISitemapTypeUpdateHandler
 {
-    /// <summary>
-    /// Handles sitemaps updates based on their <see cref="SitemapSource"/>.
-    /// </summary>
-    public interface ISitemapTypeUpdateHandler
-    {
-        Task UpdateSitemapAsync(SitemapUpdateContext context);
-    }
+    Task UpdateSitemapAsync(SitemapUpdateContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Handlers/ISitemapUpdateHandler.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Handlers/ISitemapUpdateHandler.cs
index 424f8888762..fb26dda5bd8 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Handlers/ISitemapUpdateHandler.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Handlers/ISitemapUpdateHandler.cs
@@ -1,12 +1,11 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Sitemaps.Handlers
+namespace OrchardCore.Sitemaps.Handlers;
+
+/// <summary>
+/// Handles sitemaps updates by using all <see cref="ISitemapTypeUpdateHandler"/>.
+/// </summary>
+public interface ISitemapUpdateHandler
 {
-    /// <summary>
-    /// Handles sitemaps updates by using all <see cref="ISitemapTypeUpdateHandler"/>.
-    /// </summary>
-    public interface ISitemapUpdateHandler
-    {
-        Task UpdateSitemapAsync(SitemapUpdateContext context);
-    }
+    Task UpdateSitemapAsync(SitemapUpdateContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Handlers/SitemapUpdateContext.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Handlers/SitemapUpdateContext.cs
index 64ef10c4c74..df3a94c07e7 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Handlers/SitemapUpdateContext.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Handlers/SitemapUpdateContext.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Sitemaps.Handlers
+namespace OrchardCore.Sitemaps.Handlers;
+
+public class SitemapUpdateContext
 {
-    public class SitemapUpdateContext
-    {
-        public object UpdateObject { get; set; }
-    }
+    public object UpdateObject { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/ChangeFrequency.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/ChangeFrequency.cs
index dc31cacfa64..95c9eb863ff 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/ChangeFrequency.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/ChangeFrequency.cs
@@ -1,13 +1,12 @@
-namespace OrchardCore.Sitemaps.Models
+namespace OrchardCore.Sitemaps.Models;
+
+public enum ChangeFrequency
 {
-    public enum ChangeFrequency
-    {
-        Daily,
-        Hourly,
-        Weekly,
-        Monthly,
-        Yearly,
-        Always,
-        Never,
-    }
+    Daily,
+    Hourly,
+    Weekly,
+    Monthly,
+    Yearly,
+    Always,
+    Never,
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/ContentTypesSitemapSource.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/ContentTypesSitemapSource.cs
index 4457d7ca041..c8a965ae019 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/ContentTypesSitemapSource.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/ContentTypesSitemapSource.cs
@@ -1,49 +1,48 @@
-namespace OrchardCore.Sitemaps.Models
+namespace OrchardCore.Sitemaps.Models;
+
+/// <summary>
+/// A sitemap source for managing content by content type.
+/// </summary>
+public class ContentTypesSitemapSource : SitemapSource
 {
     /// <summary>
-    /// A sitemap source for managing content by content type.
+    /// Index all content types.
+    /// </summary>
+    public bool IndexAll { get; set; } = true;
+
+    /// <summary>
+    /// Limit quantity of content items in sitemap.
+    /// </summary>
+    public bool LimitItems { get; set; }
+
+    /// <summary>
+    /// Change frequency to apply to sitemap entries.
+    /// </summary>
+    public ChangeFrequency ChangeFrequency { get; set; }
+
+    // Handle as int, and convert to float, when building, to support localization.
+    public int Priority { get; set; } = 5;
+
+    /// <summary>
+    /// When not indexing all content types this contains the list of content types to index.
     /// </summary>
-    public class ContentTypesSitemapSource : SitemapSource
-    {
-        /// <summary>
-        /// Index all content types.
-        /// </summary>
-        public bool IndexAll { get; set; } = true;
-
-        /// <summary>
-        /// Limit quantity of content items in sitemap.
-        /// </summary>
-        public bool LimitItems { get; set; }
-
-        /// <summary>
-        /// Change frequency to apply to sitemap entries.
-        /// </summary>
-        public ChangeFrequency ChangeFrequency { get; set; }
-
-        // Handle as int, and convert to float, when building, to support localization.
-        public int Priority { get; set; } = 5;
-
-        /// <summary>
-        /// When not indexing all content types this contains the list of content types to index.
-        /// </summary>
-        public ContentTypeSitemapEntry[] ContentTypes { get; set; } = [];
-
-        /// <summary>
-        /// When limiting content items, only one content type can be specified.
-        /// </summary>
-        public LimitedContentTypeSitemapEntry LimitedContentType { get; set; } = new LimitedContentTypeSitemapEntry();
-    }
-
-    public class ContentTypeSitemapEntry
-    {
-        public string ContentTypeName { get; set; }
-        public ChangeFrequency ChangeFrequency { get; set; }
-        public int Priority { get; set; }
-    }
-
-    public class LimitedContentTypeSitemapEntry : ContentTypeSitemapEntry
-    {
-        public int Skip { get; set; }
-        public int Take { get; set; }
-    }
+    public ContentTypeSitemapEntry[] ContentTypes { get; set; } = [];
+
+    /// <summary>
+    /// When limiting content items, only one content type can be specified.
+    /// </summary>
+    public LimitedContentTypeSitemapEntry LimitedContentType { get; set; } = new LimitedContentTypeSitemapEntry();
+}
+
+public class ContentTypeSitemapEntry
+{
+    public string ContentTypeName { get; set; }
+    public ChangeFrequency ChangeFrequency { get; set; }
+    public int Priority { get; set; }
+}
+
+public class LimitedContentTypeSitemapEntry : ContentTypeSitemapEntry
+{
+    public int Skip { get; set; }
+    public int Take { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/CustomPathSitemapSource.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/CustomPathSitemapSource.cs
index 2e630fdeabb..0c8d3f19ee8 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/CustomPathSitemapSource.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/CustomPathSitemapSource.cs
@@ -1,31 +1,30 @@
 using System;
 
-namespace OrchardCore.Sitemaps.Models
+namespace OrchardCore.Sitemaps.Models;
+
+/// <summary>
+/// A sitemap source for managing a custom path.
+/// </summary>
+public class CustomPathSitemapSource : SitemapSource
 {
+    public static readonly char[] InvalidCharactersForPath = ":?#[]@!$&'()*+,.;=<>\\|%{}".ToCharArray();
+    public const int MaxPathLength = 1024;
+
     /// <summary>
-    /// A sitemap source for managing a custom path.
+    /// Gets and sets the custom path.
     /// </summary>
-    public class CustomPathSitemapSource : SitemapSource
-    {
-        public static readonly char[] InvalidCharactersForPath = ":?#[]@!$&'()*+,.;=<>\\|%{}".ToCharArray();
-        public const int MaxPathLength = 1024;
+    public string Path { get; set; }
 
-        /// <summary>
-        /// Gets and sets the custom path.
-        /// </summary>
-        public string Path { get; set; }
-
-        /// <summary>
-        /// Gets and sets last update date time. Updated automatically by te system.
-        /// </summary>
-        public DateTime? LastUpdate { get; set; } = DateTime.Now;
+    /// <summary>
+    /// Gets and sets last update date time. Updated automatically by te system.
+    /// </summary>
+    public DateTime? LastUpdate { get; set; } = DateTime.Now;
 
-        /// <summary>
-        /// Gets and sets the frequency to apply to sitemap entries.
-        /// </summary>
-        public ChangeFrequency ChangeFrequency { get; set; }
+    /// <summary>
+    /// Gets and sets the frequency to apply to sitemap entries.
+    /// </summary>
+    public ChangeFrequency ChangeFrequency { get; set; }
 
-        // Handle as int, and convert to float, when building, to support localization.
-        public int Priority { get; set; } = 5;
-    }
+    // Handle as int, and convert to float, when building, to support localization.
+    public int Priority { get; set; } = 5;
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/Sitemap.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/Sitemap.cs
index fc6c4d27c0e..eb4e277ba7a 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/Sitemap.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/Sitemap.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Sitemaps.Models
+namespace OrchardCore.Sitemaps.Models;
+
+public class Sitemap : SitemapType
 {
-    public class Sitemap : SitemapType
-    {
-        public const string PathExtension = ".xml";
-    }
+    public const string PathExtension = ".xml";
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/SitemapSource.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/SitemapSource.cs
index 50958031109..29863a64e7c 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/SitemapSource.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/SitemapSource.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Sitemaps.Models
+namespace OrchardCore.Sitemaps.Models;
+
+public abstract class SitemapSource
 {
-    public abstract class SitemapSource
-    {
-        public string Id { get; set; }
-    }
+    public string Id { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/SitemapType.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/SitemapType.cs
index c3519e426e5..3ac6c13849f 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/SitemapType.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Models/SitemapType.cs
@@ -2,48 +2,47 @@
 using System.Text.Json.Serialization;
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.Sitemaps.Models
+namespace OrchardCore.Sitemaps.Models;
+
+/// <summary>
+/// Abstract to provide a type of sitemap.
+/// </summary>
+public abstract class SitemapType : Document
 {
+    private string _path;
+
+    /// <summary>
+    /// Sitemap id.
+    /// </summary>
+    public string SitemapId { get; set; }
+
     /// <summary>
-    /// Abstract to provide a type of sitemap.
+    /// Name of sitemap.
     /// </summary>
-    public abstract class SitemapType : Document
+    public string Name { get; set; }
+
+    /// <summary>
+    /// When false sitemap will not be included in routing.
+    /// </summary>
+    public bool Enabled { get; set; } = true;
+
+    /// <summary>
+    /// Sitemap path.
+    /// </summary>
+    public string Path
     {
-        private string _path;
-
-        /// <summary>
-        /// Sitemap id.
-        /// </summary>
-        public string SitemapId { get; set; }
-
-        /// <summary>
-        /// Name of sitemap.
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// When false sitemap will not be included in routing.
-        /// </summary>
-        public bool Enabled { get; set; } = true;
-
-        /// <summary>
-        /// Sitemap path.
-        /// </summary>
-        public string Path
-        {
-            get => _path;
-            set => _path = value.TrimStart('/');
-        }
-
-        /// <summary>
-        /// Sitemap unique file name used for caching.
-        /// </summary>
-        [JsonIgnore]
-        public string CacheFileName => Name + "_" + Identifier + Sitemap.PathExtension;
-
-        /// <summary>
-        /// Sitemap sources contained by this sitemap.
-        /// </summary>
-        public List<SitemapSource> SitemapSources { get; set; } = [];
+        get => _path;
+        set => _path = value.TrimStart('/');
     }
+
+    /// <summary>
+    /// Sitemap unique file name used for caching.
+    /// </summary>
+    [JsonIgnore]
+    public string CacheFileName => Name + "_" + Identifier + Sitemap.PathExtension;
+
+    /// <summary>
+    /// Sitemap sources contained by this sitemap.
+    /// </summary>
+    public List<SitemapSource> SitemapSources { get; set; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Services/ISitemapHelperService.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Services/ISitemapHelperService.cs
index d0afc2fcfe2..7431797f5d3 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Services/ISitemapHelperService.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Services/ISitemapHelperService.cs
@@ -1,15 +1,14 @@
 using System.Threading.Tasks;
 using OrchardCore.DisplayManagement.ModelBinding;
 
-namespace OrchardCore.Sitemaps.Services
+namespace OrchardCore.Sitemaps.Services;
+
+/// <summary>
+/// Helper services to provides path validation, and sitemap slugs.
+/// </summary>
+public interface ISitemapHelperService
 {
-    /// <summary>
-    /// Helper services to provides path validation, and sitemap slugs.
-    /// </summary>
-    public interface ISitemapHelperService
-    {
-        Task ValidatePathAsync(string path, IUpdateModel updater, string sitemapId = null);
+    Task ValidatePathAsync(string path, IUpdateModel updater, string sitemapId = null);
 
-        string GetSitemapSlug(string name);
-    }
+    string GetSitemapSlug(string name);
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Services/ISitemapIdGenerator.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Services/ISitemapIdGenerator.cs
index c717ff2a1e1..c7f8bba5d50 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Services/ISitemapIdGenerator.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Services/ISitemapIdGenerator.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Sitemaps.Services
+namespace OrchardCore.Sitemaps.Services;
+
+public interface ISitemapIdGenerator
 {
-    public interface ISitemapIdGenerator
-    {
-        string GenerateUniqueId();
-    }
+    string GenerateUniqueId();
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Services/ISitemapManager.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Services/ISitemapManager.cs
index 13b38be3f49..93fd26a6299 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Services/ISitemapManager.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Services/ISitemapManager.cs
@@ -2,51 +2,50 @@
 using System.Threading.Tasks;
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Services
+namespace OrchardCore.Sitemaps.Services;
+
+public interface ISitemapManager
 {
-    public interface ISitemapManager
-    {
-        /// <summary>
-        /// Gets an unique identifier that is updated when any <see cref="SitemapType"/> has changed.
-        /// </summary>
-        Task<string> GetIdentifierAsync();
-
-        /// <summary>
-        /// Loads all stored <see cref="SitemapType"/> for updating.
-        /// </summary>
-        Task<IEnumerable<SitemapType>> LoadSitemapsAsync();
-
-        /// <summary>
-        /// Gets all cached <see cref="SitemapType"/> for sharing.
-        /// </summary>
-        Task<IEnumerable<SitemapType>> GetSitemapsAsync();
-
-        /// <summary>
-        /// Loads the specified <see cref="SitemapType"/> for updating.
-        /// </summary>
-        /// <param name="sitemapId">The id of the sitemap to load.</param>
-        Task<SitemapType> LoadSitemapAsync(string sitemapId);
-
-        /// <summary>
-        /// Gets the specified <see cref="SitemapType"/> for sharing.
-        /// </summary>
-        /// <param name="sitemapId">The id of the sitemap to get.</param>
-        Task<SitemapType> GetSitemapAsync(string sitemapId);
-
-        /// <summary>
-        /// Deletes the specified <see cref="SitemapType"/>.
-        /// </summary>
-        /// <param name="sitemapId">The id of the sitemap to delete.</param>
-        Task DeleteSitemapAsync(string sitemapId);
-
-        /// <summary>
-        /// Updates the specific <see cref="SitemapType"/>.
-        /// </summary>
-        Task UpdateSitemapAsync(SitemapType sitemap);
-
-        /// <summary>
-        /// Updates all <see cref="SitemapType"/>.
-        /// </summary>
-        Task UpdateSitemapAsync();
-    }
+    /// <summary>
+    /// Gets an unique identifier that is updated when any <see cref="SitemapType"/> has changed.
+    /// </summary>
+    Task<string> GetIdentifierAsync();
+
+    /// <summary>
+    /// Loads all stored <see cref="SitemapType"/> for updating.
+    /// </summary>
+    Task<IEnumerable<SitemapType>> LoadSitemapsAsync();
+
+    /// <summary>
+    /// Gets all cached <see cref="SitemapType"/> for sharing.
+    /// </summary>
+    Task<IEnumerable<SitemapType>> GetSitemapsAsync();
+
+    /// <summary>
+    /// Loads the specified <see cref="SitemapType"/> for updating.
+    /// </summary>
+    /// <param name="sitemapId">The id of the sitemap to load.</param>
+    Task<SitemapType> LoadSitemapAsync(string sitemapId);
+
+    /// <summary>
+    /// Gets the specified <see cref="SitemapType"/> for sharing.
+    /// </summary>
+    /// <param name="sitemapId">The id of the sitemap to get.</param>
+    Task<SitemapType> GetSitemapAsync(string sitemapId);
+
+    /// <summary>
+    /// Deletes the specified <see cref="SitemapType"/>.
+    /// </summary>
+    /// <param name="sitemapId">The id of the sitemap to delete.</param>
+    Task DeleteSitemapAsync(string sitemapId);
+
+    /// <summary>
+    /// Updates the specific <see cref="SitemapType"/>.
+    /// </summary>
+    Task UpdateSitemapAsync(SitemapType sitemap);
+
+    /// <summary>
+    /// Updates all <see cref="SitemapType"/>.
+    /// </summary>
+    Task UpdateSitemapAsync();
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Services/ISitemapSourceFactory.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Services/ISitemapSourceFactory.cs
index aef049e898f..a39bcb43bab 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Services/ISitemapSourceFactory.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/Services/ISitemapSourceFactory.cs
@@ -1,32 +1,31 @@
 using OrchardCore.Sitemaps.Models;
 
-namespace OrchardCore.Sitemaps.Services
+namespace OrchardCore.Sitemaps.Services;
+
+public interface ISitemapSourceFactory
 {
-    public interface ISitemapSourceFactory
-    {
-        string Name { get; }
-        SitemapSource Create();
-    }
+    string Name { get; }
+    SitemapSource Create();
+}
 
-    public class SitemapSourceFactory<TSitemapSource> : ISitemapSourceFactory where TSitemapSource : SitemapSource, new()
-    {
-        private static readonly string _typeName = typeof(TSitemapSource).Name;
+public class SitemapSourceFactory<TSitemapSource> : ISitemapSourceFactory where TSitemapSource : SitemapSource, new()
+{
+    private static readonly string _typeName = typeof(TSitemapSource).Name;
 
-        private readonly ISitemapIdGenerator _sitemapIdGenerator;
+    private readonly ISitemapIdGenerator _sitemapIdGenerator;
 
-        public SitemapSourceFactory(ISitemapIdGenerator sitemapIdGenerator)
-        {
-            _sitemapIdGenerator = sitemapIdGenerator;
-        }
+    public SitemapSourceFactory(ISitemapIdGenerator sitemapIdGenerator)
+    {
+        _sitemapIdGenerator = sitemapIdGenerator;
+    }
 
-        public string Name => _typeName;
+    public string Name => _typeName;
 
-        public SitemapSource Create()
+    public SitemapSource Create()
+    {
+        return new TSitemapSource()
         {
-            return new TSitemapSource()
-            {
-                Id = _sitemapIdGenerator.GenerateUniqueId()
-            };
-        }
+            Id = _sitemapIdGenerator.GenerateUniqueId()
+        };
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/SitemapsOptions.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/SitemapsOptions.cs
index 63553fc2b1b..04e7c8a88c8 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/SitemapsOptions.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/SitemapsOptions.cs
@@ -1,10 +1,9 @@
 using Microsoft.AspNetCore.Routing;
 
-namespace OrchardCore.Sitemaps
+namespace OrchardCore.Sitemaps;
+
+public class SitemapsOptions
 {
-    public class SitemapsOptions
-    {
-        public RouteValueDictionary GlobalRouteValues { get; set; } = [];
-        public string SitemapIdKey { get; set; } = "";
-    }
+    public RouteValueDictionary GlobalRouteValues { get; set; } = [];
+    public string SitemapIdKey { get; set; } = "";
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/SitemapsRazorPagesContentTypeOption.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/SitemapsRazorPagesContentTypeOption.cs
index 18dfdcbd9e2..9ba98929ab3 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/SitemapsRazorPagesContentTypeOption.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/SitemapsRazorPagesContentTypeOption.cs
@@ -1,29 +1,28 @@
 using System;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Sitemaps
+namespace OrchardCore.Sitemaps;
+
+public class SitemapsRazorPagesContentTypeOption
 {
-    public class SitemapsRazorPagesContentTypeOption
+    public SitemapsRazorPagesContentTypeOption(string contentType)
     {
-        public SitemapsRazorPagesContentTypeOption(string contentType)
-        {
-            ContentType = contentType;
-        }
+        ContentType = contentType;
+    }
 
-        /// <summary>
-        /// The content type name using razor pages.
-        /// </summary>
-        public string ContentType { get; }
+    /// <summary>
+    /// The content type name using razor pages.
+    /// </summary>
+    public string ContentType { get; }
 
-        /// <summary>
-        /// The razor page name.
-        /// </summary>
-        public string PageName { get; set; }
+    /// <summary>
+    /// The razor page name.
+    /// </summary>
+    public string PageName { get; set; }
 
-        /// <summary>
-        /// Route values used to create the link to the razor page.
-        /// Must include the area, or namespace of module, the razor page belongs to. 
-        /// </summary>
-        public Func<ContentItem, object> RouteValues { get; set; }
-    }
+    /// <summary>
+    /// Route values used to create the link to the razor page.
+    /// Must include the area, or namespace of module, the razor page belongs to. 
+    /// </summary>
+    public Func<ContentItem, object> RouteValues { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/SitemapsRazorPagesOptions.cs b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/SitemapsRazorPagesOptions.cs
index 6449316c86c..875d0cc1718 100644
--- a/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/SitemapsRazorPagesOptions.cs
+++ b/src/OrchardCore/OrchardCore.Sitemaps.Abstractions/SitemapsRazorPagesOptions.cs
@@ -1,24 +1,23 @@
 using System;
 using System.Collections.Generic;
 
-namespace OrchardCore.Sitemaps
-{
-    public class SitemapsRazorPagesOptions
-    {
+namespace OrchardCore.Sitemaps;
 
-        private readonly List<SitemapsRazorPagesContentTypeOption> _contentTypeOptions = [];
+public class SitemapsRazorPagesOptions
+{
 
-        public SitemapsRazorPagesOptions ConfigureContentType(string contentType, Action<SitemapsRazorPagesContentTypeOption> action)
-        {
-            var option = new SitemapsRazorPagesContentTypeOption(contentType);
+    private readonly List<SitemapsRazorPagesContentTypeOption> _contentTypeOptions = [];
 
-            action(option);
+    public SitemapsRazorPagesOptions ConfigureContentType(string contentType, Action<SitemapsRazorPagesContentTypeOption> action)
+    {
+        var option = new SitemapsRazorPagesContentTypeOption(contentType);
 
-            _contentTypeOptions.Add(option);
+        action(option);
 
-            return this;
-        }
+        _contentTypeOptions.Add(option);
 
-        public IReadOnlyList<SitemapsRazorPagesContentTypeOption> ContentTypeOptions => _contentTypeOptions;
+        return this;
     }
+
+    public IReadOnlyList<SitemapsRazorPagesContentTypeOption> ContentTypeOptions => _contentTypeOptions;
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/ClaimsPrincipalExtensions.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/ClaimsPrincipalExtensions.cs
index e829591889e..54cf45b1289 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/ClaimsPrincipalExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/ClaimsPrincipalExtensions.cs
@@ -2,30 +2,29 @@
 using System.Linq;
 using System.Security.Claims;
 
-namespace OrchardCore.Users
+namespace OrchardCore.Users;
+
+/// <summary>
+/// Provides extension methods for <see cref="ClaimsPrincipal"/>.
+/// </summary>
+public static class ClaimsPrincipalExtensions
 {
     /// <summary>
-    /// Provides extension methods for <see cref="ClaimsPrincipal"/>.
+    /// Gets a serialized version of the claims.
     /// </summary>
-    public static class ClaimsPrincipalExtensions
+    /// <param name="principal">The <see cref="ClaimsPrincipal"/>.</param>
+    /// <returns>A list of <see cref="SerializableClaim"/>.</returns>
+    public static IEnumerable<SerializableClaim> GetSerializableClaims(this ClaimsPrincipal principal)
     {
-        /// <summary>
-        /// Gets a serialized version of the claims.
-        /// </summary>
-        /// <param name="principal">The <see cref="ClaimsPrincipal"/>.</param>
-        /// <returns>A list of <see cref="SerializableClaim"/>.</returns>
-        public static IEnumerable<SerializableClaim> GetSerializableClaims(this ClaimsPrincipal principal)
+        return principal.Claims.Select(c => new SerializableClaim
         {
-            return principal.Claims.Select(c => new SerializableClaim
-            {
-                Subject = c.Subject.Name,
-                Issuer = c.Issuer,
-                OriginalIssuer = c.OriginalIssuer,
-                Properties = c.Properties.ToArray(),
-                Type = c.Type,
-                Value = c.Value,
-                ValueType = c.ValueType
-            });
-        }
+            Subject = c.Subject.Name,
+            Issuer = c.Issuer,
+            OriginalIssuer = c.OriginalIssuer,
+            Properties = c.Properties.ToArray(),
+            Type = c.Type,
+            Value = c.Value,
+            ValueType = c.ValueType
+        });
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/Events/ILoginFormEvent.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/Events/ILoginFormEvent.cs
index 60c0266963a..aafba58c5ae 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/Events/ILoginFormEvent.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/Events/ILoginFormEvent.cs
@@ -1,42 +1,41 @@
 using System;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Users.Events
+namespace OrchardCore.Users.Events;
+
+/// <summary>
+/// Contract for login events.
+/// </summary>
+public interface ILoginFormEvent
 {
     /// <summary>
-    /// Contract for login events.
+    /// Occurs when the user is logging.
     /// </summary>
-    public interface ILoginFormEvent
-    {
-        /// <summary>
-        /// Occurs when the user is logging.
-        /// </summary>
-        /// <param name="userName">The username.</param>
-        /// <param name="reportError">The reported error if failure happened during the login process.</param>
-        Task LoggingInAsync(string userName, Action<string, string> reportError);
+    /// <param name="userName">The username.</param>
+    /// <param name="reportError">The reported error if failure happened during the login process.</param>
+    Task LoggingInAsync(string userName, Action<string, string> reportError);
 
-        /// <summary>
-        /// Occurs when the user login has failed and the user was not found.
-        /// </summary>
-        /// <param name="userName">The username.</param>
-        Task LoggingInFailedAsync(string userName);
+    /// <summary>
+    /// Occurs when the user login has failed and the user was not found.
+    /// </summary>
+    /// <param name="userName">The username.</param>
+    Task LoggingInFailedAsync(string userName);
 
-        /// <summary>
-        /// Occurs when the user login has failed and the user is known.
-        /// </summary>
-        /// <param name="user">The <see cref="IUser"/>.</param>
-        Task LoggingInFailedAsync(IUser user);
+    /// <summary>
+    /// Occurs when the user login has failed and the user is known.
+    /// </summary>
+    /// <param name="user">The <see cref="IUser"/>.</param>
+    Task LoggingInFailedAsync(IUser user);
 
-        /// <summary>
-        /// Occurs when a user is locked out.
-        /// </summary>
-        /// <param name="user">The <see cref="IUser"/>.</param>
-        Task IsLockedOutAsync(IUser user);
+    /// <summary>
+    /// Occurs when a user is locked out.
+    /// </summary>
+    /// <param name="user">The <see cref="IUser"/>.</param>
+    Task IsLockedOutAsync(IUser user);
 
-        /// <summary>
-        /// Occurs when the user is logged in.
-        /// </summary>
-        /// <param name="user">The <see cref="IUser"/>.</param>
-        Task LoggedInAsync(IUser user);
-    }
+    /// <summary>
+    /// Occurs when the user is logged in.
+    /// </summary>
+    /// <param name="user">The <see cref="IUser"/>.</param>
+    Task LoggedInAsync(IUser user);
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/Events/IPasswordRecoveryFormEvents.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/Events/IPasswordRecoveryFormEvents.cs
index bb6d687733d..bbe888c3c88 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/Events/IPasswordRecoveryFormEvents.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/Events/IPasswordRecoveryFormEvents.cs
@@ -1,33 +1,32 @@
 using System;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Users.Events
+namespace OrchardCore.Users.Events;
+
+/// <summary>
+/// Contract for password recovery events.
+/// </summary>
+public interface IPasswordRecoveryFormEvents
 {
     /// <summary>
-    /// Contract for password recovery events.
+    /// Occurs during the user password is being reset.
     /// </summary>
-    public interface IPasswordRecoveryFormEvents
-    {
-        /// <summary>
-        /// Occurs during the user password is being reset.
-        /// </summary>
-        /// <param name="reportError">The reported error if failure happened during the rest process.</param>
-        Task ResettingPasswordAsync(Action<string, string> reportError);
+    /// <param name="reportError">The reported error if failure happened during the rest process.</param>
+    Task ResettingPasswordAsync(Action<string, string> reportError);
 
-        /// <summary>
-        /// Occurs after the user password has been reset.
-        /// </summary>
-        Task PasswordResetAsync(PasswordRecoveryContext context);
+    /// <summary>
+    /// Occurs after the user password has been reset.
+    /// </summary>
+    Task PasswordResetAsync(PasswordRecoveryContext context);
 
-        /// <summary>
-        /// Occurs during the user password recovery.
-        /// </summary>
-        /// <param name="reportError">The reported error if failure happened during the recovery process.</param>
-        Task RecoveringPasswordAsync(Action<string, string> reportError);
+    /// <summary>
+    /// Occurs during the user password recovery.
+    /// </summary>
+    /// <param name="reportError">The reported error if failure happened during the recovery process.</param>
+    Task RecoveringPasswordAsync(Action<string, string> reportError);
 
-        /// <summary>
-        /// Occurs after the user password has been recovered.
-        /// </summary>
-        Task PasswordRecoveredAsync(PasswordRecoveryContext context);
-    }
+    /// <summary>
+    /// Occurs after the user password has been recovered.
+    /// </summary>
+    Task PasswordRecoveredAsync(PasswordRecoveryContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/Events/IRegistrationFormEvents.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/Events/IRegistrationFormEvents.cs
index 34173d225bd..2b42edfa2c4 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/Events/IRegistrationFormEvents.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/Events/IRegistrationFormEvents.cs
@@ -1,23 +1,22 @@
 using System;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Users.Events
+namespace OrchardCore.Users.Events;
+
+/// <summary>
+/// Contract for user registration events.
+/// </summary>
+public interface IRegistrationFormEvents
 {
     /// <summary>
-    /// Contract for user registration events.
+    /// Occurs during the user registration.
     /// </summary>
-    public interface IRegistrationFormEvents
-    {
-        /// <summary>
-        /// Occurs during the user registration.
-        /// </summary>
-        /// <param name="reportError">The reported error if failure happened in validation process.</param>
-        Task RegistrationValidationAsync(Action<string, string> reportError);
+    /// <param name="reportError">The reported error if failure happened in validation process.</param>
+    Task RegistrationValidationAsync(Action<string, string> reportError);
 
-        /// <summary>
-        /// Occurs when user has been registered.
-        /// </summary>
-        /// <param name="user">The <see cref="IUser"/>.</param>
-        Task RegisteredAsync(IUser user);
-    }
+    /// <summary>
+    /// Occurs when user has been registered.
+    /// </summary>
+    /// <param name="user">The <see cref="IUser"/>.</param>
+    Task RegisteredAsync(IUser user);
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/Events/PasswordRecoveryContext.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/Events/PasswordRecoveryContext.cs
index f4a54509148..b369160cf26 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/Events/PasswordRecoveryContext.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/Events/PasswordRecoveryContext.cs
@@ -1,19 +1,18 @@
 using System;
 
-namespace OrchardCore.Users.Events
+namespace OrchardCore.Users.Events;
+
+/// <summary>
+/// Context for password recovery events.
+/// </summary>
+public class PasswordRecoveryContext
 {
-    /// <summary>
-    /// Context for password recovery events.
-    /// </summary>
-    public class PasswordRecoveryContext
+    public PasswordRecoveryContext(IUser user)
     {
-        public PasswordRecoveryContext(IUser user)
-        {
-            ArgumentNullException.ThrowIfNull(user);
-
-            User = user;
-        }
+        ArgumentNullException.ThrowIfNull(user);
 
-        public IUser User { get; }
+        User = user;
     }
+
+    public IUser User { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/IExternalLoginEventHandler.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/IExternalLoginEventHandler.cs
index 1310cddc462..1f1eff92d80 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/IExternalLoginEventHandler.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/IExternalLoginEventHandler.cs
@@ -1,26 +1,25 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Users.Handlers
+namespace OrchardCore.Users.Handlers;
+
+/// <summary>
+/// Contract for external login events, this occurs when a tenant is set up.
+/// </summary>
+public interface IExternalLoginEventHandler
 {
     /// <summary>
-    /// Contract for external login events, this occurs when a tenant is set up.
+    /// Occurs when the username is generated.
+    /// </summary>
+    /// <param name="provider">The login provider.</param>
+    /// <param name="claims">A <see cref="SerializableClaim"/>s.</param>
+    /// <return>A username.</return>
+    Task<string> GenerateUserName(string provider, IEnumerable<SerializableClaim> claims);
+
+    /// <summary>
+    /// Occurs when the user is updated.
     /// </summary>
-    public interface IExternalLoginEventHandler
-    {
-        /// <summary>
-        /// Occurs when the username is generated.
-        /// </summary>
-        /// <param name="provider">The login provider.</param>
-        /// <param name="claims">A <see cref="SerializableClaim"/>s.</param>
-        /// <return>A username.</return>
-        Task<string> GenerateUserName(string provider, IEnumerable<SerializableClaim> claims);
+    /// <param name="context">The <see cref="UpdateUserContext"/>.</param>
+    Task UpdateUserAsync(UpdateUserContext context);
 
-        /// <summary>
-        /// Occurs when the user is updated.
-        /// </summary>
-        /// <param name="context">The <see cref="UpdateUserContext"/>.</param>
-        Task UpdateUserAsync(UpdateUserContext context);
-       
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/IUserEventHandler.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/IUserEventHandler.cs
index e4fa07ed45e..b8612eb748f 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/IUserEventHandler.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/IUserEventHandler.cs
@@ -1,58 +1,57 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Users.Handlers
+namespace OrchardCore.Users.Handlers;
+
+/// <summary>
+/// Contract for user events.
+/// </summary>
+public interface IUserEventHandler
 {
     /// <summary>
-    /// Contract for user events.
-    /// </summary>
-    public interface IUserEventHandler
-    {
-        /// <summary>
-        /// Occurs before a user is created.
-        /// </summary>
-        /// <param name="context">The <see cref="UserCreateContext"/>.</param>
-        Task CreatingAsync(UserCreateContext context);
-
-        /// <summary>
-        /// Occurs when a user is created.
-        /// </summary>
-        /// <param name="context">The <see cref="UserCreateContext"/>.</param>
-        Task CreatedAsync(UserCreateContext context);
-
-        /// <summary>
-        /// Occurs before a user is deleted.
-        /// </summary>
-        /// <param name="context">The <see cref="UserDeleteContext"/>.</param>
-        Task DeletingAsync(UserDeleteContext context);
-
-        /// <summary>
-        /// Occurs when a user is deleted.
-        /// </summary>
-        /// <param name="context">The <see cref="UserDeleteContext"/>.</param>
-        Task DeletedAsync(UserDeleteContext context);
-
-        /// <summary>
-        /// Occurs before a user is updated.
-        /// </summary>
-        /// <param name="context">The <see cref="UserUpdateContext"/>.</param>
-        Task UpdatingAsync(UserUpdateContext context);
-
-        /// <summary>
-        /// Occurs when a user is updated.
-        /// </summary>
-        /// <param name="context">The <see cref="UserUpdateContext"/>.</param>
-        Task UpdatedAsync(UserUpdateContext context);
-
-        /// <summary>
-        /// Occurs when a user is disabled.
-        /// </summary>
-        /// <param name="context">The <see cref="UserContext"/>.</param>
-        Task DisabledAsync(UserContext context);
-
-        /// <summary>
-        /// Occurs when a user is enabled.
-        /// </summary>
-        /// <param name="context">The <see cref="UserContext"/>.</param>
-        Task EnabledAsync(UserContext context);
-    }
+    /// Occurs before a user is created.
+    /// </summary>
+    /// <param name="context">The <see cref="UserCreateContext"/>.</param>
+    Task CreatingAsync(UserCreateContext context);
+
+    /// <summary>
+    /// Occurs when a user is created.
+    /// </summary>
+    /// <param name="context">The <see cref="UserCreateContext"/>.</param>
+    Task CreatedAsync(UserCreateContext context);
+
+    /// <summary>
+    /// Occurs before a user is deleted.
+    /// </summary>
+    /// <param name="context">The <see cref="UserDeleteContext"/>.</param>
+    Task DeletingAsync(UserDeleteContext context);
+
+    /// <summary>
+    /// Occurs when a user is deleted.
+    /// </summary>
+    /// <param name="context">The <see cref="UserDeleteContext"/>.</param>
+    Task DeletedAsync(UserDeleteContext context);
+
+    /// <summary>
+    /// Occurs before a user is updated.
+    /// </summary>
+    /// <param name="context">The <see cref="UserUpdateContext"/>.</param>
+    Task UpdatingAsync(UserUpdateContext context);
+
+    /// <summary>
+    /// Occurs when a user is updated.
+    /// </summary>
+    /// <param name="context">The <see cref="UserUpdateContext"/>.</param>
+    Task UpdatedAsync(UserUpdateContext context);
+
+    /// <summary>
+    /// Occurs when a user is disabled.
+    /// </summary>
+    /// <param name="context">The <see cref="UserContext"/>.</param>
+    Task DisabledAsync(UserContext context);
+
+    /// <summary>
+    /// Occurs when a user is enabled.
+    /// </summary>
+    /// <param name="context">The <see cref="UserContext"/>.</param>
+    Task EnabledAsync(UserContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UpdateUserContext.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UpdateUserContext.cs
index 48a31028db3..b73aea1b5f0 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UpdateUserContext.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UpdateUserContext.cs
@@ -3,75 +3,74 @@
 using System.Text.Json.Nodes;
 using OrchardCore.Users.Models;
 
-namespace OrchardCore.Users.Handlers
+namespace OrchardCore.Users.Handlers;
+
+/// <summary>
+/// Represents a <see cref="UserContextBase"/> for updated user roles.
+/// </summary>
+public class UpdateUserContext : UserContextBase
 {
     /// <summary>
-    /// Represents a <see cref="UserContextBase"/> for updated user roles.
+    /// Creates a new instance of <see cref="UpdateUserContext"/>.
     /// </summary>
-    public class UpdateUserContext : UserContextBase
+    /// <param name="user">The <see cref="IUser"/>.</param>
+    /// <param name="loginProvider">The login provider.</param>
+    /// <param name="externalClaims">The user claims.</param>
+    /// <param name="userProperties">The user properties.</param>
+    public UpdateUserContext(IUser user, string loginProvider, IEnumerable<SerializableClaim> externalClaims, JsonObject userProperties) : base(user)
     {
-        /// <summary>
-        /// Creates a new instance of <see cref="UpdateUserContext"/>.
-        /// </summary>
-        /// <param name="user">The <see cref="IUser"/>.</param>
-        /// <param name="loginProvider">The login provider.</param>
-        /// <param name="externalClaims">The user claims.</param>
-        /// <param name="userProperties">The user properties.</param>
-        public UpdateUserContext(IUser user, string loginProvider, IEnumerable<SerializableClaim> externalClaims, JsonObject userProperties) : base(user)
-        {
-            ExternalClaims = externalClaims.AsEnumerable();
-            LoginProvider = loginProvider;
-            UserProperties = userProperties.DeepClone() as JsonObject;
-        }
+        ExternalClaims = externalClaims.AsEnumerable();
+        LoginProvider = loginProvider;
+        UserProperties = userProperties.DeepClone() as JsonObject;
+    }
 
-        /// <summary>
-        /// Gets the login provider.
-        /// </summary>
-        public string LoginProvider { get; }
+    /// <summary>
+    /// Gets the login provider.
+    /// </summary>
+    public string LoginProvider { get; }
 
-        /// <summary>
-        /// Gets a list of external claims.
-        /// </summary>
-        public IEnumerable<SerializableClaim> ExternalClaims { get; }
+    /// <summary>
+    /// Gets a list of external claims.
+    /// </summary>
+    public IEnumerable<SerializableClaim> ExternalClaims { get; }
 
-        /// <summary>
-        /// Gets the user properties.
-        /// </summary>
-        public JsonObject UserProperties { get; }
+    /// <summary>
+    /// Gets the user properties.
+    /// </summary>
+    public JsonObject UserProperties { get; }
 
-        /// <summary>
-        /// Gets the user's roles.
-        /// </summary>
-        public IEnumerable<string> UserRoles { get; set; } = [];
+    /// <summary>
+    /// Gets the user's roles.
+    /// </summary>
+    public IEnumerable<string> UserRoles { get; set; } = [];
 
-        /// <summary>
-        /// Gets the user's roles.
-        /// </summary>
-        public IEnumerable<UserClaim> UserClaims { get; set; } = [];
+    /// <summary>
+    /// Gets the user's roles.
+    /// </summary>
+    public IEnumerable<UserClaim> UserClaims { get; set; } = [];
 
-        /// <summary>
-        /// Gets the roles to be added to the user roles.
-        /// </summary>
-        public List<string> RolesToAdd { get; init; } = [];
+    /// <summary>
+    /// Gets the roles to be added to the user roles.
+    /// </summary>
+    public List<string> RolesToAdd { get; init; } = [];
 
-        /// <summary>
-        /// Gets the roles to be removed from the user roles.
-        /// </summary>
-        public List<string> RolesToRemove { get; init; } = [];
+    /// <summary>
+    /// Gets the roles to be removed from the user roles.
+    /// </summary>
+    public List<string> RolesToRemove { get; init; } = [];
 
-        /// <summary>
-        /// Gets the claims to be added from the user claims.
-        /// </summary>
-        public List<UserClaim> ClaimsToUpdate { get; init; } = [];
+    /// <summary>
+    /// Gets the claims to be added from the user claims.
+    /// </summary>
+    public List<UserClaim> ClaimsToUpdate { get; init; } = [];
 
-        /// <summary>
-        /// Gets the claims to be removed from the user claims.
-        /// </summary>
-        public List<UserClaim> ClaimsToRemove { get; init; } = [];
+    /// <summary>
+    /// Gets the claims to be removed from the user claims.
+    /// </summary>
+    public List<UserClaim> ClaimsToRemove { get; init; } = [];
 
-        /// <summary>
-        /// Gets the user properties to update the user
-        /// </summary>
-        public JsonObject PropertiesToUpdate { get; set; }
-    }
+    /// <summary>
+    /// Gets the user properties to update the user
+    /// </summary>
+    public JsonObject PropertiesToUpdate { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserContext.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserContext.cs
index d9252877e4f..0f0d3785755 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserContext.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserContext.cs
@@ -1,13 +1,12 @@
-namespace OrchardCore.Users.Handlers
+namespace OrchardCore.Users.Handlers;
+
+/// <summary>
+/// Represents a context for a user.
+/// </summary>
+public class UserContext : UserContextBase
 {
-    /// <summary>
-    /// Represents a context for a user.
-    /// </summary>
-    public class UserContext : UserContextBase
+    /// <inheritdocs />
+    public UserContext(IUser user) : base(user)
     {
-        /// <inheritdocs />
-        public UserContext(IUser user) : base(user)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserContextBase.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserContextBase.cs
index 22893e0bdb0..6a61bd8088a 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserContextBase.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserContextBase.cs
@@ -1,22 +1,21 @@
-namespace OrchardCore.Users.Handlers
+namespace OrchardCore.Users.Handlers;
+
+/// <summary>
+/// Represents a base context for a user.
+/// </summary>
+public class UserContextBase
 {
     /// <summary>
-    /// Represents a base context for a user.
+    /// Creates a new instance of <see cref="UserContextBase"/>.
     /// </summary>
-    public class UserContextBase
+    /// <param name="user">The <see cref="IUser"/>.</param>
+    protected UserContextBase(IUser user)
     {
-        /// <summary>
-        /// Creates a new instance of <see cref="UserContextBase"/>.
-        /// </summary>
-        /// <param name="user">The <see cref="IUser"/>.</param>
-        protected UserContextBase(IUser user)
-        {
-            User = user;
-        }
-
-        /// <summary>
-        /// Gets the user.
-        /// </summary>
-        public IUser User { get; private set; }
+        User = user;
     }
+
+    /// <summary>
+    /// Gets the user.
+    /// </summary>
+    public IUser User { get; private set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserCreateContext.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserCreateContext.cs
index b0115a37a7f..6660d4447b2 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserCreateContext.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserCreateContext.cs
@@ -1,15 +1,14 @@
-namespace OrchardCore.Users.Handlers
+namespace OrchardCore.Users.Handlers;
+
+/// <summary>
+/// Represents a context for a user creation.
+/// </summary>
+public class UserCreateContext : UserContextBase
 {
-    /// <summary>
-    /// Represents a context for a user creation.
-    /// </summary>
-    public class UserCreateContext : UserContextBase
+    /// <inheritdocs />
+    public UserCreateContext(IUser user) : base(user)
     {
-        /// <inheritdocs />
-        public UserCreateContext(IUser user) : base(user)
-        {
-        }
-
-        public bool Cancel { get; set; }
     }
+
+    public bool Cancel { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserDeleteContext.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserDeleteContext.cs
index afb33232440..c4b05738aa5 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserDeleteContext.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserDeleteContext.cs
@@ -1,15 +1,14 @@
-namespace OrchardCore.Users.Handlers
+namespace OrchardCore.Users.Handlers;
+
+/// <summary>
+/// Represents a context for deleting a user.
+/// </summary>
+public class UserDeleteContext : UserContextBase
 {
-    /// <summary>
-    /// Represents a context for deleting a user.
-    /// </summary>
-    public class UserDeleteContext : UserContextBase
+    /// <inheritdocs />
+    public UserDeleteContext(IUser user) : base(user)
     {
-        /// <inheritdocs />
-        public UserDeleteContext(IUser user) : base(user)
-        {
-        }
-
-        public bool Cancel { get; set; }
     }
+
+    public bool Cancel { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserEventHandlerBase.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserEventHandlerBase.cs
index 7f45bc31a3b..0a2a7178abc 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserEventHandlerBase.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserEventHandlerBase.cs
@@ -1,31 +1,30 @@
 using System.Threading.Tasks;
 
-namespace OrchardCore.Users.Handlers
+namespace OrchardCore.Users.Handlers;
+
+public abstract class UserEventHandlerBase : IUserEventHandler
 {
-    public abstract class UserEventHandlerBase : IUserEventHandler
-    {
-        /// <inheritdocs />
-        public virtual Task CreatingAsync(UserCreateContext context) => Task.CompletedTask;
+    /// <inheritdocs />
+    public virtual Task CreatingAsync(UserCreateContext context) => Task.CompletedTask;
 
-        /// <inheritdocs />
-        public virtual Task CreatedAsync(UserCreateContext context) => Task.CompletedTask;
+    /// <inheritdocs />
+    public virtual Task CreatedAsync(UserCreateContext context) => Task.CompletedTask;
 
-        /// <inheritdocs />
-        public virtual Task DeletingAsync(UserDeleteContext context) => Task.CompletedTask;
+    /// <inheritdocs />
+    public virtual Task DeletingAsync(UserDeleteContext context) => Task.CompletedTask;
 
-        /// <inheritdocs />
-        public virtual Task DeletedAsync(UserDeleteContext context) => Task.CompletedTask;
+    /// <inheritdocs />
+    public virtual Task DeletedAsync(UserDeleteContext context) => Task.CompletedTask;
 
-        /// <inheritdocs />
-        public virtual Task UpdatingAsync(UserUpdateContext context) => Task.CompletedTask;
+    /// <inheritdocs />
+    public virtual Task UpdatingAsync(UserUpdateContext context) => Task.CompletedTask;
 
-        /// <inheritdocs />
-        public virtual Task UpdatedAsync(UserUpdateContext context) => Task.CompletedTask;
+    /// <inheritdocs />
+    public virtual Task UpdatedAsync(UserUpdateContext context) => Task.CompletedTask;
 
-        /// <inheritdocs />
-        public virtual Task DisabledAsync(UserContext context) => Task.CompletedTask;
+    /// <inheritdocs />
+    public virtual Task DisabledAsync(UserContext context) => Task.CompletedTask;
 
-        /// <inheritdocs />
-        public virtual Task EnabledAsync(UserContext context) => Task.CompletedTask;
-    }
+    /// <inheritdocs />
+    public virtual Task EnabledAsync(UserContext context) => Task.CompletedTask;
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserUpdateContext.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserUpdateContext.cs
index 5501b59cb43..6bed51c24f3 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserUpdateContext.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/Handlers/UserUpdateContext.cs
@@ -1,15 +1,14 @@
-namespace OrchardCore.Users.Handlers
+namespace OrchardCore.Users.Handlers;
+
+/// <summary>
+/// Represents a context for updating a user.
+/// </summary>
+public class UserUpdateContext : UserContextBase
 {
-    /// <summary>
-    /// Represents a context for updating a user.
-    /// </summary>
-    public class UserUpdateContext : UserContextBase
+    /// <inheritdocs />
+    public UserUpdateContext(IUser user) : base(user)
     {
-        /// <inheritdocs />
-        public UserUpdateContext(IUser user) : base(user)
-        {
-        }
-
-        public bool Cancel { get; set; }
     }
+
+    public bool Cancel { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/IUser.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/IUser.cs
index 335e72fbe79..b850b38bbd7 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/IUser.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/IUser.cs
@@ -1,13 +1,12 @@
-namespace OrchardCore.Users
+namespace OrchardCore.Users;
+
+/// <summary>
+/// Contract for ASP.NET Core Identity services.
+/// </summary>
+public interface IUser
 {
     /// <summary>
-    /// Contract for ASP.NET Core Identity services.
+    /// Gets the user name.
     /// </summary>
-    public interface IUser
-    {
-        /// <summary>
-        /// Gets the user name.
-        /// </summary>
-        string UserName { get; }
-    }
+    string UserName { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/Models/UserClaim.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/Models/UserClaim.cs
index a0d55383e49..1bed0487b94 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/Models/UserClaim.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/Models/UserClaim.cs
@@ -1,25 +1,24 @@
 using System.Security.Claims;
 
-namespace OrchardCore.Users.Models
+namespace OrchardCore.Users.Models;
+
+/// <summary>
+/// Represents a claim that is granted to a specific user.
+/// </summary>
+public class UserClaim
 {
     /// <summary>
-    /// Represents a claim that is granted to a specific user.
+    /// Gets or sets the claim type for this claim.
     /// </summary>
-    public class UserClaim
-    {
-        /// <summary>
-        /// Gets or sets the claim type for this claim.
-        /// </summary>
-        public string ClaimType { get; set; }
+    public string ClaimType { get; set; }
 
-        /// <summary>
-        /// Gets or sets the claim value for this claim.
-        /// </summary>
-        public string ClaimValue { get; set; }
+    /// <summary>
+    /// Gets or sets the claim value for this claim.
+    /// </summary>
+    public string ClaimValue { get; set; }
 
-        public Claim ToClaim()
-        {
-            return new Claim(ClaimType, ClaimValue);
-        }
+    public Claim ToClaim()
+    {
+        return new Claim(ClaimType, ClaimValue);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/SerializableClaim.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/SerializableClaim.cs
index b703be0d8ce..5f103455fb7 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/SerializableClaim.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/SerializableClaim.cs
@@ -1,45 +1,44 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Users
+namespace OrchardCore.Users;
+
+/// <summary>
+/// Represents a serialized version for the claim.
+/// </summary>
+public class SerializableClaim
 {
     /// <summary>
-    /// Represents a serialized version for the claim.
+    /// Gets or sets the claim subject.
+    /// </summary>
+    public string Subject { get; set; }
+
+    /// <summary>
+    /// Gets or sets the claim issuer.
+    /// </summary>
+    public string Issuer { get; set; }
+
+    /// <summary>
+    /// Gets or sets the claim original issuer for the claim.
+    /// </summary>
+    public string OriginalIssuer { get; set; }
+
+    /// <summary>
+    /// Gets or sets the claim properties.
+    /// </summary>
+    public KeyValuePair<string, string>[] Properties { get; set; }
+
+    /// <summary>
+    /// Gets or sets the claim type.
+    /// </summary>
+    public string Type { get; set; }
+
+    /// <summary>
+    /// Gets or sets the claim value.
+    /// </summary>
+    public string Value { get; set; }
+
+    /// <summary>
+    /// Gets or sets the type of the claim value.
     /// </summary>
-    public class SerializableClaim
-    {
-        /// <summary>
-        /// Gets or sets the claim subject.
-        /// </summary>
-        public string Subject { get; set; }
-
-        /// <summary>
-        /// Gets or sets the claim issuer.
-        /// </summary>
-        public string Issuer { get; set; }
-
-        /// <summary>
-        /// Gets or sets the claim original issuer for the claim.
-        /// </summary>
-        public string OriginalIssuer { get; set; }
-
-        /// <summary>
-        /// Gets or sets the claim properties.
-        /// </summary>
-        public KeyValuePair<string, string>[] Properties { get; set; }
-
-        /// <summary>
-        /// Gets or sets the claim type.
-        /// </summary>
-        public string Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the claim value.
-        /// </summary>
-        public string Value { get; set; }
-
-        /// <summary>
-        /// Gets or sets the type of the claim value.
-        /// </summary>
-        public string ValueType { get; set; }
-    }
+    public string ValueType { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/Services/IMembershipService.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/Services/IMembershipService.cs
index 54b6eda9ab2..2091d3ef49d 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/Services/IMembershipService.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/Services/IMembershipService.cs
@@ -1,33 +1,32 @@
 using System.Security.Claims;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+/// <summary>
+/// Contract for membership services.
+/// </summary>
+public interface IMembershipService
 {
     /// <summary>
-    /// Contract for membership services.
+    /// Get the user with the specified username.
     /// </summary>
-    public interface IMembershipService
-    {
-        /// <summary>
-        /// Get the user with the specified username.
-        /// </summary>
-        /// <param name="userName">The username for the retrieved user.</param>
-        /// <returns>The <see cref="IUser"/>.</returns>
-        Task<IUser> GetUserAsync(string userName);
+    /// <param name="userName">The username for the retrieved user.</param>
+    /// <returns>The <see cref="IUser"/>.</returns>
+    Task<IUser> GetUserAsync(string userName);
 
-        /// <summary>
-        /// Checks the user password.
-        /// </summary>
-        /// <param name="userName">The username.</param>
-        /// <param name="password">The user password.</param>
-        /// <returns>Returns<c>true</c> if the password is correct, otherwise <c>false</c>.</returns>
-        Task<bool> CheckPasswordAsync(string userName, string password);
+    /// <summary>
+    /// Checks the user password.
+    /// </summary>
+    /// <param name="userName">The username.</param>
+    /// <param name="password">The user password.</param>
+    /// <returns>Returns<c>true</c> if the password is correct, otherwise <c>false</c>.</returns>
+    Task<bool> CheckPasswordAsync(string userName, string password);
 
-        /// <summary>
-        /// Creates a <see cref="ClaimsPrincipal"/> for the specified user.
-        /// </summary>
-        /// <param name="user">The <see cref="IUser"/>.</param>
-        /// <returns>A user <see cref="ClaimsPrincipal"/>s.</returns>
-        Task<ClaimsPrincipal> CreateClaimsPrincipal(IUser user);
-    }
+    /// <summary>
+    /// Creates a <see cref="ClaimsPrincipal"/> for the specified user.
+    /// </summary>
+    /// <param name="user">The <see cref="IUser"/>.</param>
+    /// <returns>A user <see cref="ClaimsPrincipal"/>s.</returns>
+    Task<ClaimsPrincipal> CreateClaimsPrincipal(IUser user);
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/Services/IUserClaimsProvider.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/Services/IUserClaimsProvider.cs
index 8d76c97006f..6173537ea49 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/Services/IUserClaimsProvider.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/Services/IUserClaimsProvider.cs
@@ -1,10 +1,9 @@
 using System.Security.Claims;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+public interface IUserClaimsProvider
 {
-    public interface IUserClaimsProvider
-    {
-        Task GenerateAsync(IUser user, ClaimsIdentity claims);
-    }
+    Task GenerateAsync(IUser user, ClaimsIdentity claims);
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/Services/IUserIdGenerator.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/Services/IUserIdGenerator.cs
index 42ee8077965..4bcd7261013 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/Services/IUserIdGenerator.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/Services/IUserIdGenerator.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+public interface IUserIdGenerator
 {
-    public interface IUserIdGenerator
-    {
-        string GenerateUniqueId(IUser user);
-    }
+    string GenerateUniqueId(IUser user);
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/Services/IUserService.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/Services/IUserService.cs
index 0d668f59e59..0351e9ea21f 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/Services/IUserService.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/Services/IUserService.cs
@@ -2,93 +2,92 @@
 using System.Security.Claims;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+/// <summary>
+/// Contract that provides an abstraction for common user operations.
+/// </summary>
+public interface IUserService
 {
     /// <summary>
-    /// Contract that provides an abstraction for common user operations.
+    /// Authenticates the user credentials.
     /// </summary>
-    public interface IUserService
-    {
-        /// <summary>
-        /// Authenticates the user credentials.
-        /// </summary>
-        /// <param name="usernameOrEmail">The username or email address.</param>
-        /// <param name="password">The user password.</param>
-        /// <param name="reportError">The error reported in case failure happened during the authentication process.</param>
-        /// <returns>A <see cref="IUser"/> that represents an authenticated user.</returns>
-        Task<IUser> AuthenticateAsync(string usernameOrEmail, string password, Action<string, string> reportError);
+    /// <param name="usernameOrEmail">The username or email address.</param>
+    /// <param name="password">The user password.</param>
+    /// <param name="reportError">The error reported in case failure happened during the authentication process.</param>
+    /// <returns>A <see cref="IUser"/> that represents an authenticated user.</returns>
+    Task<IUser> AuthenticateAsync(string usernameOrEmail, string password, Action<string, string> reportError);
 
-        /// <summary>
-        /// Creates a user.
-        /// </summary>
-        /// <param name="user">The <see cref="IUser"/>.</param>
-        /// <param name="password">The user password.</param>
-        /// <param name="reportError">The error reported in case failure happened during the creation process.</param>
-        /// <returns>A <see cref="IUser"/> represents a created user.</returns>
-        Task<IUser> CreateUserAsync(IUser user, string password, Action<string, string> reportError);
+    /// <summary>
+    /// Creates a user.
+    /// </summary>
+    /// <param name="user">The <see cref="IUser"/>.</param>
+    /// <param name="password">The user password.</param>
+    /// <param name="reportError">The error reported in case failure happened during the creation process.</param>
+    /// <returns>A <see cref="IUser"/> represents a created user.</returns>
+    Task<IUser> CreateUserAsync(IUser user, string password, Action<string, string> reportError);
 
-        /// <summary>
-        /// Change a user email.
-        /// </summary>
-        /// <param name="user">The user.</param>
-        /// <param name="newEmail">The new email.</param>
-        /// <param name="reportError">The error reported in case failure happened during the creation process.</param>
-        /// <returns>Returns <c>true</c> if the email has been changed, otherwise <c>false</c>.</returns>
-        Task<bool> ChangeEmailAsync(IUser user, string newEmail, Action<string, string> reportError);
+    /// <summary>
+    /// Change a user email.
+    /// </summary>
+    /// <param name="user">The user.</param>
+    /// <param name="newEmail">The new email.</param>
+    /// <param name="reportError">The error reported in case failure happened during the creation process.</param>
+    /// <returns>Returns <c>true</c> if the email has been changed, otherwise <c>false</c>.</returns>
+    Task<bool> ChangeEmailAsync(IUser user, string newEmail, Action<string, string> reportError);
 
-        /// <summary>
-        /// Change a user password.
-        /// </summary>
-        /// <param name="user">The user.</param>
-        /// <param name="currentPassword">The current password.</param>
-        /// <param name="newPassword">The new password.</param>
-        /// <param name="reportError"></param>
-        /// <returns>Returns <c>true</c> if the password has been changed, otherwise <c>false</c>.</returns>
-        Task<bool> ChangePasswordAsync(IUser user, string currentPassword, string newPassword, Action<string, string> reportError);
+    /// <summary>
+    /// Change a user password.
+    /// </summary>
+    /// <param name="user">The user.</param>
+    /// <param name="currentPassword">The current password.</param>
+    /// <param name="newPassword">The new password.</param>
+    /// <param name="reportError"></param>
+    /// <returns>Returns <c>true</c> if the password has been changed, otherwise <c>false</c>.</returns>
+    Task<bool> ChangePasswordAsync(IUser user, string currentPassword, string newPassword, Action<string, string> reportError);
 
-        /// <summary>
-        /// Gets the authenticated user from a given <see cref="ClaimsPrincipal"/>.
-        /// </summary>
-        /// <param name="principal">The <see cref="ClaimsPrincipal"/>.</param>
-        /// <returns>A <see cref="IUser"/> represents the authenticated user.</returns>
-        Task<IUser> GetAuthenticatedUserAsync(ClaimsPrincipal principal);
+    /// <summary>
+    /// Gets the authenticated user from a given <see cref="ClaimsPrincipal"/>.
+    /// </summary>
+    /// <param name="principal">The <see cref="ClaimsPrincipal"/>.</param>
+    /// <returns>A <see cref="IUser"/> represents the authenticated user.</returns>
+    Task<IUser> GetAuthenticatedUserAsync(ClaimsPrincipal principal);
 
-        /// <summary>
-        /// Gets the user with a specified username or email address.
-        /// </summary>
-        /// <param name="usernameOrEmail">The username or email address.</param>
-        /// <returns>The <see cref="IUser"/> represents the retrieved user.</returns>
-        Task<IUser> GetUserAsync(string usernameOrEmail);
+    /// <summary>
+    /// Gets the user with a specified username or email address.
+    /// </summary>
+    /// <param name="usernameOrEmail">The username or email address.</param>
+    /// <returns>The <see cref="IUser"/> represents the retrieved user.</returns>
+    Task<IUser> GetUserAsync(string usernameOrEmail);
 
-        /// <summary>
-        /// Gets the user with a specified ID.
-        /// </summary>
-        /// <param name="userId">The user ID.</param>
-        /// <returns>A <see cref="IUser"/> represents a retrieved user.</returns>
-        Task<IUser> GetUserByUniqueIdAsync(string userId);
+    /// <summary>
+    /// Gets the user with a specified ID.
+    /// </summary>
+    /// <param name="userId">The user ID.</param>
+    /// <returns>A <see cref="IUser"/> represents a retrieved user.</returns>
+    Task<IUser> GetUserByUniqueIdAsync(string userId);
 
-        /// <summary>
-        /// Get a forgotten password for a specified user ID.
-        /// </summary>
-        /// <param name="userId">The user ID.</param>
-        /// <returns>A <see cref="IUser"/> represents a user with forgotten password.</returns>
-        Task<IUser> GetForgotPasswordUserAsync(string userId);
+    /// <summary>
+    /// Get a forgotten password for a specified user ID.
+    /// </summary>
+    /// <param name="userId">The user ID.</param>
+    /// <returns>A <see cref="IUser"/> represents a user with forgotten password.</returns>
+    Task<IUser> GetForgotPasswordUserAsync(string userId);
 
-        /// <summary>
-        /// Resets the user password.
-        /// </summary>
-        /// <param name="usernameOrEmail">The username or email address.</param>
-        /// <param name="resetToken">The token used to reset the password.</param>
-        /// <param name="newPassword">The new password.</param>
-        /// <param name="reportError">The error reported in case failure happened during the reset process.</param>
-        /// <returns>Returns <c>true</c> if the password reset, otherwise <c>false</c>.</returns>
-        Task<bool> ResetPasswordAsync(string usernameOrEmail, string resetToken, string newPassword, Action<string, string> reportError);
+    /// <summary>
+    /// Resets the user password.
+    /// </summary>
+    /// <param name="usernameOrEmail">The username or email address.</param>
+    /// <param name="resetToken">The token used to reset the password.</param>
+    /// <param name="newPassword">The new password.</param>
+    /// <param name="reportError">The error reported in case failure happened during the reset process.</param>
+    /// <returns>Returns <c>true</c> if the password reset, otherwise <c>false</c>.</returns>
+    Task<bool> ResetPasswordAsync(string usernameOrEmail, string resetToken, string newPassword, Action<string, string> reportError);
 
-        /// <summary>
-        /// Creates a <see cref="ClaimsPrincipal"/> for a given user.
-        /// </summary>
-        /// <param name="user">The <see cref="IUser"/>.</param>
-        /// <returns>The <see cref="ClaimsPrincipal"/>.</returns>
-        Task<ClaimsPrincipal> CreatePrincipalAsync(IUser user);
-    }
+    /// <summary>
+    /// Creates a <see cref="ClaimsPrincipal"/> for a given user.
+    /// </summary>
+    /// <param name="user">The <see cref="IUser"/>.</param>
+    /// <returns>The <see cref="ClaimsPrincipal"/>.</returns>
+    Task<ClaimsPrincipal> CreatePrincipalAsync(IUser user);
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Abstractions/UserOptions.cs b/src/OrchardCore/OrchardCore.Users.Abstractions/UserOptions.cs
index bb3e8c1b118..87c8041d464 100644
--- a/src/OrchardCore/OrchardCore.Users.Abstractions/UserOptions.cs
+++ b/src/OrchardCore/OrchardCore.Users.Abstractions/UserOptions.cs
@@ -1,48 +1,47 @@
-namespace OrchardCore.Users
+namespace OrchardCore.Users;
+
+public class UserOptions
 {
-    public class UserOptions
-    {
-        private string _loginPath = "Login";
-        private string _logoffPath = "Users/LogOff";
-        private string _changePasswordUrl = "ChangePassword";
-        private string _changePasswordConfirmationUrl = "ChangePasswordConfirmation";
-        private string _externalLoginsUrl = "ExternalLogins";
-        private string _twoFactorAuthenticationPath = "TwoFactor";
+    private string _loginPath = "Login";
+    private string _logoffPath = "Users/LogOff";
+    private string _changePasswordUrl = "ChangePassword";
+    private string _changePasswordConfirmationUrl = "ChangePasswordConfirmation";
+    private string _externalLoginsUrl = "ExternalLogins";
+    private string _twoFactorAuthenticationPath = "TwoFactor";
 
-        public string LoginPath
-        {
-            get => _loginPath;
-            set => _loginPath = value.Trim(' ', '/');
-        }
+    public string LoginPath
+    {
+        get => _loginPath;
+        set => _loginPath = value.Trim(' ', '/');
+    }
 
-        public string LogoffPath
-        {
-            get => _logoffPath;
-            set => _logoffPath = value.Trim(' ', '/');
-        }
+    public string LogoffPath
+    {
+        get => _logoffPath;
+        set => _logoffPath = value.Trim(' ', '/');
+    }
 
-        public string ChangePasswordUrl
-        {
-            get => _changePasswordUrl;
-            set => _changePasswordUrl = value.Trim(' ', '/');
-        }
+    public string ChangePasswordUrl
+    {
+        get => _changePasswordUrl;
+        set => _changePasswordUrl = value.Trim(' ', '/');
+    }
 
-        public string ChangePasswordConfirmationUrl
-        {
-            get => _changePasswordConfirmationUrl;
-            set => _changePasswordConfirmationUrl = value.Trim(' ', '/');
-        }
+    public string ChangePasswordConfirmationUrl
+    {
+        get => _changePasswordConfirmationUrl;
+        set => _changePasswordConfirmationUrl = value.Trim(' ', '/');
+    }
 
-        public string ExternalLoginsUrl
-        {
-            get => _externalLoginsUrl;
-            set => _externalLoginsUrl = value.Trim(' ', '/');
-        }
+    public string ExternalLoginsUrl
+    {
+        get => _externalLoginsUrl;
+        set => _externalLoginsUrl = value.Trim(' ', '/');
+    }
 
-        public string TwoFactorAuthenticationPath
-        {
-            get => _twoFactorAuthenticationPath;
-            set => _twoFactorAuthenticationPath = value.Trim(' ', '/');
-        }
+    public string TwoFactorAuthenticationPath
+    {
+        get => _twoFactorAuthenticationPath;
+        set => _twoFactorAuthenticationPath = value.Trim(' ', '/');
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Core/Extensions/UsersServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Users.Core/Extensions/UsersServiceCollectionExtensions.cs
index c8ca86e82bf..4585523b40e 100644
--- a/src/OrchardCore/OrchardCore.Users.Core/Extensions/UsersServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Users.Core/Extensions/UsersServiceCollectionExtensions.cs
@@ -12,57 +12,56 @@
 using OrchardCore.Users.Indexes;
 using OrchardCore.Users.Services;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+/// <summary>
+/// Provides extension methods for <see cref="IServiceCollection"/>.
+/// </summary>
+public static class UsersServiceCollectionExtensions
 {
     /// <summary>
-    /// Provides extension methods for <see cref="IServiceCollection"/>.
+    /// Registers the users services.
     /// </summary>
-    public static class UsersServiceCollectionExtensions
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    public static IServiceCollection AddUsers(this IServiceCollection services)
     {
-        /// <summary>
-        /// Registers the users services.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        public static IServiceCollection AddUsers(this IServiceCollection services)
-        {
-            services.TryAddScoped<UserStore>();
-            services.TryAddScoped<IUserStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
-            services.TryAddScoped<IUserRoleStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
-            services.TryAddScoped<IUserPasswordStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
-            services.TryAddScoped<IUserEmailStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
-            services.TryAddScoped<IUserSecurityStampStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
-            services.TryAddScoped<IUserLoginStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
-            services.TryAddScoped<IUserClaimStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
-            services.TryAddScoped<IUserTwoFactorStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
-            services.TryAddScoped<IUserTwoFactorRecoveryCodeStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
-            services.TryAddScoped<IUserAuthenticatorKeyStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
-            services.TryAddScoped<IUserAuthenticationTokenStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
-            services.TryAddScoped<IUserPhoneNumberStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
+        services.TryAddScoped<UserStore>();
+        services.TryAddScoped<IUserStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
+        services.TryAddScoped<IUserRoleStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
+        services.TryAddScoped<IUserPasswordStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
+        services.TryAddScoped<IUserEmailStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
+        services.TryAddScoped<IUserSecurityStampStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
+        services.TryAddScoped<IUserLoginStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
+        services.TryAddScoped<IUserClaimStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
+        services.TryAddScoped<IUserTwoFactorStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
+        services.TryAddScoped<IUserTwoFactorRecoveryCodeStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
+        services.TryAddScoped<IUserAuthenticatorKeyStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
+        services.TryAddScoped<IUserAuthenticationTokenStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
+        services.TryAddScoped<IUserPhoneNumberStore<IUser>>(sp => sp.GetRequiredService<UserStore>());
 
-            services.AddScoped<NullRoleStore>();
-            services.TryAddScoped<IRoleClaimStore<IRole>>(sp => sp.GetRequiredService<NullRoleStore>());
-            services.TryAddScoped<IRoleStore<IRole>>(sp => sp.GetRequiredService<NullRoleStore>());
+        services.AddScoped<NullRoleStore>();
+        services.TryAddScoped<IRoleClaimStore<IRole>>(sp => sp.GetRequiredService<NullRoleStore>());
+        services.TryAddScoped<IRoleStore<IRole>>(sp => sp.GetRequiredService<NullRoleStore>());
 
-            services.TryAddScoped<RoleManager<IRole>>();
-            services.TryAddScoped<IRoleService, RoleService>();
+        services.TryAddScoped<RoleManager<IRole>>();
+        services.TryAddScoped<IRoleService, RoleService>();
 
-            services.AddIndexProvider<UserIndexProvider>();
-            services.AddIndexProvider<UserByLoginInfoIndexProvider>();
-            services.AddIndexProvider<UserByClaimIndexProvider>();
+        services.AddIndexProvider<UserIndexProvider>();
+        services.AddIndexProvider<UserByLoginInfoIndexProvider>();
+        services.AddIndexProvider<UserByClaimIndexProvider>();
 
-            services.AddScoped<IUserService, UserService>();
-            services.AddScoped<IUserClaimsPrincipalFactory<IUser>, DefaultUserClaimsPrincipalProviderFactory>();
-            services.AddScoped<IUserEventHandler, UserDisabledEventHandler>();
+        services.AddScoped<IUserService, UserService>();
+        services.AddScoped<IUserClaimsPrincipalFactory<IUser>, DefaultUserClaimsPrincipalProviderFactory>();
+        services.AddScoped<IUserEventHandler, UserDisabledEventHandler>();
 
-            services.AddScoped<ITwoFactorAuthenticationHandler, DefaultTwoFactorAuthenticationHandler>();
-            services.AddScoped<ITwoFactorAuthenticationHandlerCoordinator, DefaultTwoFactorAuthenticationHandlerCoordinator>();
+        services.AddScoped<ITwoFactorAuthenticationHandler, DefaultTwoFactorAuthenticationHandler>();
+        services.AddScoped<ITwoFactorAuthenticationHandlerCoordinator, DefaultTwoFactorAuthenticationHandlerCoordinator>();
 
-            services.Configure<DocumentJsonSerializerOptions>(options =>
-            {
-                options.SerializerOptions.Converters.Add(LoginInfoJsonConverter.Instance);
-            });
+        services.Configure<DocumentJsonSerializerOptions>(options =>
+        {
+            options.SerializerOptions.Converters.Add(LoginInfoJsonConverter.Instance);
+        });
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Core/Handlers/UserDisabledEventHandler.cs b/src/OrchardCore/OrchardCore.Users.Core/Handlers/UserDisabledEventHandler.cs
index c6ac792f32d..088e49a14ff 100644
--- a/src/OrchardCore/OrchardCore.Users.Core/Handlers/UserDisabledEventHandler.cs
+++ b/src/OrchardCore/OrchardCore.Users.Core/Handlers/UserDisabledEventHandler.cs
@@ -3,21 +3,20 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace OrchardCore.Users.Handlers
+namespace OrchardCore.Users.Handlers;
+
+public class UserDisabledEventHandler : UserEventHandlerBase
 {
-    public class UserDisabledEventHandler : UserEventHandlerBase
-    {
-        private readonly IServiceProvider _serviceProvider;
+    private readonly IServiceProvider _serviceProvider;
 
-        private UserManager<IUser> _userManager;
+    private UserManager<IUser> _userManager;
 
-        public UserDisabledEventHandler(IServiceProvider serviceProvider) => _serviceProvider = serviceProvider;
+    public UserDisabledEventHandler(IServiceProvider serviceProvider) => _serviceProvider = serviceProvider;
 
-        public override async Task DisabledAsync(UserContext context)
-        {
-            _userManager ??= _serviceProvider.GetRequiredService<UserManager<IUser>>();
+    public override async Task DisabledAsync(UserContext context)
+    {
+        _userManager ??= _serviceProvider.GetRequiredService<UserManager<IUser>>();
 
-            await _userManager.UpdateSecurityStampAsync(context.User);
-        }
+        await _userManager.UpdateSecurityStampAsync(context.User);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Core/Indexes/UserByClaimIndex.cs b/src/OrchardCore/OrchardCore.Users.Core/Indexes/UserByClaimIndex.cs
index e17022e61d1..45ddcf21a42 100644
--- a/src/OrchardCore/OrchardCore.Users.Core/Indexes/UserByClaimIndex.cs
+++ b/src/OrchardCore/OrchardCore.Users.Core/Indexes/UserByClaimIndex.cs
@@ -2,25 +2,24 @@
 using OrchardCore.Users.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.Users.Indexes
+namespace OrchardCore.Users.Indexes;
+
+public class UserByClaimIndex : MapIndex
 {
-    public class UserByClaimIndex : MapIndex
-    {
-        public string ClaimType { get; set; }
+    public string ClaimType { get; set; }
 
-        public string ClaimValue { get; set; }
-    }
+    public string ClaimValue { get; set; }
+}
 
-    public class UserByClaimIndexProvider : IndexProvider<User>
+public class UserByClaimIndexProvider : IndexProvider<User>
+{
+    public override void Describe(DescribeContext<User> context)
     {
-        public override void Describe(DescribeContext<User> context)
-        {
-            context.For<UserByClaimIndex>()
-                .Map(user => user.UserClaims.Select(x => new UserByClaimIndex
-                {
-                    ClaimType = x.ClaimType,
-                    ClaimValue = x.ClaimValue,
-                }));
-        }
+        context.For<UserByClaimIndex>()
+            .Map(user => user.UserClaims.Select(x => new UserByClaimIndex
+            {
+                ClaimType = x.ClaimType,
+                ClaimValue = x.ClaimValue,
+            }));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Core/Indexes/UserByLoginInfoIndex.cs b/src/OrchardCore/OrchardCore.Users.Core/Indexes/UserByLoginInfoIndex.cs
index 7d726afe536..9adc9af193a 100644
--- a/src/OrchardCore/OrchardCore.Users.Core/Indexes/UserByLoginInfoIndex.cs
+++ b/src/OrchardCore/OrchardCore.Users.Core/Indexes/UserByLoginInfoIndex.cs
@@ -2,24 +2,23 @@
 using OrchardCore.Users.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.Users.Indexes
+namespace OrchardCore.Users.Indexes;
+
+public class UserByLoginInfoIndex : MapIndex
 {
-    public class UserByLoginInfoIndex : MapIndex
-    {
-        public string LoginProvider { get; set; }
-        public string ProviderKey { get; set; }
-    }
+    public string LoginProvider { get; set; }
+    public string ProviderKey { get; set; }
+}
 
-    public class UserByLoginInfoIndexProvider : IndexProvider<User>
+public class UserByLoginInfoIndexProvider : IndexProvider<User>
+{
+    public override void Describe(DescribeContext<User> context)
     {
-        public override void Describe(DescribeContext<User> context)
-        {
-            context.For<UserByLoginInfoIndex>()
-                .Map(user => user.LoginInfos.Select(x => new UserByLoginInfoIndex
-                {
-                    LoginProvider = x.LoginProvider,
-                    ProviderKey = x.ProviderKey,
-                }));
-        }
+        context.For<UserByLoginInfoIndex>()
+            .Map(user => user.LoginInfos.Select(x => new UserByLoginInfoIndex
+            {
+                LoginProvider = x.LoginProvider,
+                ProviderKey = x.ProviderKey,
+            }));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Core/Indexes/UserByRoleNameIndex.cs b/src/OrchardCore/OrchardCore.Users.Core/Indexes/UserByRoleNameIndex.cs
index 34bdb371dea..9164fb0b473 100644
--- a/src/OrchardCore/OrchardCore.Users.Core/Indexes/UserByRoleNameIndex.cs
+++ b/src/OrchardCore/OrchardCore.Users.Core/Indexes/UserByRoleNameIndex.cs
@@ -3,62 +3,61 @@
 using OrchardCore.Users.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.Users.Indexes
+namespace OrchardCore.Users.Indexes;
+
+public class UserByRoleNameIndex : ReduceIndex
+{
+    public string RoleName { get; set; }
+    public int Count { get; set; }
+}
+
+public class UserByRoleNameIndexProvider : IndexProvider<User>
 {
-    public class UserByRoleNameIndex : ReduceIndex
+    private readonly ILookupNormalizer _keyNormalizer;
+
+    public UserByRoleNameIndexProvider(ILookupNormalizer keyNormalizer)
     {
-        public string RoleName { get; set; }
-        public int Count { get; set; }
+        _keyNormalizer = keyNormalizer;
     }
 
-    public class UserByRoleNameIndexProvider : IndexProvider<User>
+    public override void Describe(DescribeContext<User> context)
     {
-        private readonly ILookupNormalizer _keyNormalizer;
-
-        public UserByRoleNameIndexProvider(ILookupNormalizer keyNormalizer)
-        {
-            _keyNormalizer = keyNormalizer;
-        }
-
-        public override void Describe(DescribeContext<User> context)
-        {
-            context.For<UserByRoleNameIndex, string>()
-                .Map(user =>
+        context.For<UserByRoleNameIndex, string>()
+            .Map(user =>
+            {
+                // Include a marker that the user does not have any roles, i.e. is Authenticated only.
+                if (!user.RoleNames.Any())
                 {
-                    // Include a marker that the user does not have any roles, i.e. is Authenticated only.
-                    if (!user.RoleNames.Any())
+                    return new UserByRoleNameIndex[]
                     {
-                        return new UserByRoleNameIndex[]
-                        {
-                            new() {
-                                RoleName = NormalizeKey(OrchardCoreConstants.Roles.Authenticated),
-                                Count = 1
-                            }
-                        };
-                    }
+                        new() {
+                            RoleName = NormalizeKey(OrchardCoreConstants.Roles.Authenticated),
+                            Count = 1
+                        }
+                    };
+                }
 
-                    return user.RoleNames.Select(x => new UserByRoleNameIndex
-                    {
-                        RoleName = NormalizeKey(x),
-                        Count = 1
-                    });
-                })
-                .Group(index => index.RoleName)
-                .Reduce(group => new UserByRoleNameIndex
-                {
-                    RoleName = group.Key,
-                    Count = group.Sum(x => x.Count)
-                })
-                .Delete((index, map) =>
+                return user.RoleNames.Select(x => new UserByRoleNameIndex
                 {
-                    index.Count -= map.Sum(x => x.Count);
-                    return index.Count > 0 ? index : null;
+                    RoleName = NormalizeKey(x),
+                    Count = 1
                 });
-        }
+            })
+            .Group(index => index.RoleName)
+            .Reduce(group => new UserByRoleNameIndex
+            {
+                RoleName = group.Key,
+                Count = group.Sum(x => x.Count)
+            })
+            .Delete((index, map) =>
+            {
+                index.Count -= map.Sum(x => x.Count);
+                return index.Count > 0 ? index : null;
+            });
+    }
 
-        private string NormalizeKey(string key)
-        {
-            return _keyNormalizer.NormalizeName(key);
-        }
+    private string NormalizeKey(string key)
+    {
+        return _keyNormalizer.NormalizeName(key);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Core/Indexes/UserIndex.cs b/src/OrchardCore/OrchardCore.Users.Core/Indexes/UserIndex.cs
index 0c60e58d8d2..6401d69b7b4 100644
--- a/src/OrchardCore/OrchardCore.Users.Core/Indexes/UserIndex.cs
+++ b/src/OrchardCore/OrchardCore.Users.Core/Indexes/UserIndex.cs
@@ -2,38 +2,37 @@
 using OrchardCore.Users.Models;
 using YesSql.Indexes;
 
-namespace OrchardCore.Users.Indexes
+namespace OrchardCore.Users.Indexes;
+
+public class UserIndex : MapIndex
 {
-    public class UserIndex : MapIndex
-    {
-        public long DocumentId { get; set; }
-        public string UserId { get; set; }
-        public string NormalizedUserName { get; set; }
-        public string NormalizedEmail { get; set; }
-        public bool IsEnabled { get; set; }
-        public bool IsLockoutEnabled { get; set; }
-        public DateTime? LockoutEndUtc { get; set; }
-        public int AccessFailedCount { get; set; }
-    }
+    public long DocumentId { get; set; }
+    public string UserId { get; set; }
+    public string NormalizedUserName { get; set; }
+    public string NormalizedEmail { get; set; }
+    public bool IsEnabled { get; set; }
+    public bool IsLockoutEnabled { get; set; }
+    public DateTime? LockoutEndUtc { get; set; }
+    public int AccessFailedCount { get; set; }
+}
 
-    public class UserIndexProvider : IndexProvider<User>
+public class UserIndexProvider : IndexProvider<User>
+{
+    public override void Describe(DescribeContext<User> context)
     {
-        public override void Describe(DescribeContext<User> context)
-        {
-            context.For<UserIndex>()
-                .Map(user =>
+        context.For<UserIndex>()
+            .Map(user =>
+            {
+                return new UserIndex
                 {
-                    return new UserIndex
-                    {
-                        UserId = user.UserId,
-                        NormalizedUserName = user.NormalizedUserName,
-                        NormalizedEmail = user.NormalizedEmail,
-                        IsEnabled = user.IsEnabled,
-                        IsLockoutEnabled = user.IsLockoutEnabled,
-                        LockoutEndUtc = user.LockoutEndUtc,
-                        AccessFailedCount = user.AccessFailedCount
-                    };
-                });
-        }
+                    UserId = user.UserId,
+                    NormalizedUserName = user.NormalizedUserName,
+                    NormalizedEmail = user.NormalizedEmail,
+                    IsEnabled = user.IsEnabled,
+                    IsLockoutEnabled = user.IsLockoutEnabled,
+                    LockoutEndUtc = user.LockoutEndUtc,
+                    AccessFailedCount = user.AccessFailedCount
+                };
+            });
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Core/Models/User.cs b/src/OrchardCore/OrchardCore.Users.Core/Models/User.cs
index 37b274f5097..ace64622f4f 100644
--- a/src/OrchardCore/OrchardCore.Users.Core/Models/User.cs
+++ b/src/OrchardCore/OrchardCore.Users.Core/Models/User.cs
@@ -3,55 +3,54 @@
 using Microsoft.AspNetCore.Identity;
 using OrchardCore.Entities;
 
-namespace OrchardCore.Users.Models
+namespace OrchardCore.Users.Models;
+
+public class User : Entity, IUser
 {
-    public class User : Entity, IUser
-    {
-        public long Id { get; set; }
+    public long Id { get; set; }
 
-        public string UserId { get; set; }
+    public string UserId { get; set; }
 
-        public string UserName { get; set; }
+    public string UserName { get; set; }
 
-        public string NormalizedUserName { get; set; }
+    public string NormalizedUserName { get; set; }
 
-        public string Email { get; set; }
+    public string Email { get; set; }
 
-        public string PhoneNumber { get; set; }
+    public string PhoneNumber { get; set; }
 
-        public string NormalizedEmail { get; set; }
+    public string NormalizedEmail { get; set; }
 
-        public string PasswordHash { get; set; }
+    public string PasswordHash { get; set; }
 
-        public string SecurityStamp { get; set; }
+    public string SecurityStamp { get; set; }
 
-        public bool EmailConfirmed { get; set; }
+    public bool EmailConfirmed { get; set; }
 
-        public bool PhoneNumberConfirmed { get; set; }
+    public bool PhoneNumberConfirmed { get; set; }
 
-        public bool IsEnabled { get; set; } = true;
+    public bool IsEnabled { get; set; } = true;
 
-        public bool TwoFactorEnabled { get; set; }
+    public bool TwoFactorEnabled { get; set; }
 
-        public bool IsLockoutEnabled { get; set; }
+    public bool IsLockoutEnabled { get; set; }
 
-        public DateTime? LockoutEndUtc { get; set; }
+    public DateTime? LockoutEndUtc { get; set; }
 
-        public int AccessFailedCount { get; set; }
+    public int AccessFailedCount { get; set; }
 
-        public string ResetToken { get; set; }
+    public string ResetToken { get; set; }
 
-        public IList<string> RoleNames { get; set; } = [];
+    public IList<string> RoleNames { get; set; } = [];
 
-        public IList<UserClaim> UserClaims { get; set; } = [];
+    public IList<UserClaim> UserClaims { get; set; } = [];
 
-        public IList<UserLoginInfo> LoginInfos { get; set; } = [];
+    public IList<UserLoginInfo> LoginInfos { get; set; } = [];
 
-        public IList<UserToken> UserTokens { get; set; } = [];
+    public IList<UserToken> UserTokens { get; set; } = [];
 
-        public override string ToString()
-        {
-            return UserName;
-        }
+    public override string ToString()
+    {
+        return UserName;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Core/Models/UserToken.cs b/src/OrchardCore/OrchardCore.Users.Core/Models/UserToken.cs
index 89a67659bb5..da4d673ad8e 100644
--- a/src/OrchardCore/OrchardCore.Users.Core/Models/UserToken.cs
+++ b/src/OrchardCore/OrchardCore.Users.Core/Models/UserToken.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Users.Models
+namespace OrchardCore.Users.Models;
+
+public class UserToken
 {
-    public class UserToken
-    {
-        public string LoginProvider { get; set; }
-        public string Name { get; set; }
-        public string Value { get; set; }
-    }
+    public string LoginProvider { get; set; }
+    public string Name { get; set; }
+    public string Value { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Core/Services/DefaultUserClaimsPrincipalProviderFactory.cs b/src/OrchardCore/OrchardCore.Users.Core/Services/DefaultUserClaimsPrincipalProviderFactory.cs
index 010f8bee25d..8c95cbb85b5 100644
--- a/src/OrchardCore/OrchardCore.Users.Core/Services/DefaultUserClaimsPrincipalProviderFactory.cs
+++ b/src/OrchardCore/OrchardCore.Users.Core/Services/DefaultUserClaimsPrincipalProviderFactory.cs
@@ -7,34 +7,33 @@
 using OrchardCore.Modules;
 using OrchardCore.Security;
 
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+/// <summary>
+/// Custom implementation of <see cref="IUserClaimsPrincipalFactory{TUser}"/> allowing adding claims by implementing the <see cref="IUserClaimsProvider"/>.
+/// </summary>
+public class DefaultUserClaimsPrincipalProviderFactory : UserClaimsPrincipalFactory<IUser, IRole>
 {
-    /// <summary>
-    /// Custom implementation of <see cref="IUserClaimsPrincipalFactory{TUser}"/> allowing adding claims by implementing the <see cref="IUserClaimsProvider"/>.
-    /// </summary>
-    public class DefaultUserClaimsPrincipalProviderFactory : UserClaimsPrincipalFactory<IUser, IRole>
-    {
-        private readonly IEnumerable<IUserClaimsProvider> _claimsProviders;
-        private readonly ILogger _logger;
+    private readonly IEnumerable<IUserClaimsProvider> _claimsProviders;
+    private readonly ILogger _logger;
 
-        public DefaultUserClaimsPrincipalProviderFactory(
-            UserManager<IUser> userManager,
-            RoleManager<IRole> roleManager,
-            IOptions<IdentityOptions> identityOptions,
-            IEnumerable<IUserClaimsProvider> claimsProviders,
-            ILogger<DefaultUserClaimsPrincipalProviderFactory> logger) : base(userManager, roleManager, identityOptions)
-        {
-            _claimsProviders = claimsProviders;
-            _logger = logger;
-        }
+    public DefaultUserClaimsPrincipalProviderFactory(
+        UserManager<IUser> userManager,
+        RoleManager<IRole> roleManager,
+        IOptions<IdentityOptions> identityOptions,
+        IEnumerable<IUserClaimsProvider> claimsProviders,
+        ILogger<DefaultUserClaimsPrincipalProviderFactory> logger) : base(userManager, roleManager, identityOptions)
+    {
+        _claimsProviders = claimsProviders;
+        _logger = logger;
+    }
 
-        protected override async Task<ClaimsIdentity> GenerateClaimsAsync(IUser user)
-        {
-            var claims = await base.GenerateClaimsAsync(user);
+    protected override async Task<ClaimsIdentity> GenerateClaimsAsync(IUser user)
+    {
+        var claims = await base.GenerateClaimsAsync(user);
 
-            await _claimsProviders.InvokeAsync((claimsProvider) => claimsProvider.GenerateAsync(user, claims), _logger);
+        await _claimsProviders.InvokeAsync((claimsProvider) => claimsProvider.GenerateAsync(user, claims), _logger);
 
-            return claims;
-        }
+        return claims;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Core/Services/IUsersAdminListFilterParser.cs b/src/OrchardCore/OrchardCore.Users.Core/Services/IUsersAdminListFilterParser.cs
index a8210aa66a5..4cec3dca123 100644
--- a/src/OrchardCore/OrchardCore.Users.Core/Services/IUsersAdminListFilterParser.cs
+++ b/src/OrchardCore/OrchardCore.Users.Core/Services/IUsersAdminListFilterParser.cs
@@ -1,9 +1,8 @@
 using OrchardCore.Users.Models;
 using YesSql.Filters.Query;
 
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+public interface IUsersAdminListFilterParser : IQueryParser<User>
 {
-    public interface IUsersAdminListFilterParser : IQueryParser<User>
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Core/Services/IUsersAdminListFilterProvider.cs b/src/OrchardCore/OrchardCore.Users.Core/Services/IUsersAdminListFilterProvider.cs
index 8df30a3bec0..84edf20e9b4 100644
--- a/src/OrchardCore/OrchardCore.Users.Core/Services/IUsersAdminListFilterProvider.cs
+++ b/src/OrchardCore/OrchardCore.Users.Core/Services/IUsersAdminListFilterProvider.cs
@@ -1,10 +1,9 @@
 using OrchardCore.Users.Models;
 using YesSql.Filters.Query;
 
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+public interface IUsersAdminListFilterProvider
 {
-    public interface IUsersAdminListFilterProvider
-    {
-        void Build(QueryEngineBuilder<User> builder);
-    }
+    void Build(QueryEngineBuilder<User> builder);
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Core/Services/IUsersAdminListQueryService.cs b/src/OrchardCore/OrchardCore.Users.Core/Services/IUsersAdminListQueryService.cs
index eb4072c9dcf..e08131fa8eb 100644
--- a/src/OrchardCore/OrchardCore.Users.Core/Services/IUsersAdminListQueryService.cs
+++ b/src/OrchardCore/OrchardCore.Users.Core/Services/IUsersAdminListQueryService.cs
@@ -4,10 +4,9 @@
 using OrchardCore.Users.ViewModels;
 using YesSql;
 
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+public interface IUsersAdminListQueryService
 {
-    public interface IUsersAdminListQueryService
-    {
-        Task<IQuery<User>> QueryAsync(UserIndexOptions options, IUpdateModel updater);
-    }
+    Task<IQuery<User>> QueryAsync(UserIndexOptions options, IUpdateModel updater);
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Core/Services/UserFilterEngineModelBinder.cs b/src/OrchardCore/OrchardCore.Users.Core/Services/UserFilterEngineModelBinder.cs
index e2de0a2d30f..c4dbc79534f 100644
--- a/src/OrchardCore/OrchardCore.Users.Core/Services/UserFilterEngineModelBinder.cs
+++ b/src/OrchardCore/OrchardCore.Users.Core/Services/UserFilterEngineModelBinder.cs
@@ -2,41 +2,40 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+public class UserFilterEngineModelBinder : IModelBinder
 {
-    public class UserFilterEngineModelBinder : IModelBinder
-    {
-        private readonly IUsersAdminListFilterParser _parser;
+    private readonly IUsersAdminListFilterParser _parser;
 
-        public UserFilterEngineModelBinder(IUsersAdminListFilterParser parser)
-        {
-            _parser = parser;
-        }
+    public UserFilterEngineModelBinder(IUsersAdminListFilterParser parser)
+    {
+        _parser = parser;
+    }
 
-        public Task BindModelAsync(ModelBindingContext bindingContext)
-        {
-            ArgumentNullException.ThrowIfNull(bindingContext);
+    public Task BindModelAsync(ModelBindingContext bindingContext)
+    {
+        ArgumentNullException.ThrowIfNull(bindingContext);
 
-            var modelName = bindingContext.ModelName;
+        var modelName = bindingContext.ModelName;
 
-            // Try to fetch the value of the argument by name q=
-            var valueProviderResult = bindingContext.ValueProvider.GetValue(modelName);
+        // Try to fetch the value of the argument by name q=
+        var valueProviderResult = bindingContext.ValueProvider.GetValue(modelName);
 
-            if (valueProviderResult == ValueProviderResult.None)
-            {
-                bindingContext.Result = ModelBindingResult.Success(_parser.Parse(string.Empty));
+        if (valueProviderResult == ValueProviderResult.None)
+        {
+            bindingContext.Result = ModelBindingResult.Success(_parser.Parse(string.Empty));
 
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
+        }
 
-            bindingContext.ModelState.SetModelValue(modelName, valueProviderResult);
+        bindingContext.ModelState.SetModelValue(modelName, valueProviderResult);
 
-            var value = valueProviderResult.FirstValue;
+        var value = valueProviderResult.FirstValue;
 
-            // When value is null or empty the parser returns an empty result.
-            bindingContext.Result = ModelBindingResult.Success(_parser.Parse(value));
+        // When value is null or empty the parser returns an empty result.
+        bindingContext.Result = ModelBindingResult.Success(_parser.Parse(value));
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Core/Services/UserQueryContext.cs b/src/OrchardCore/OrchardCore.Users.Core/Services/UserQueryContext.cs
index bd1d8184629..f27265d6048 100644
--- a/src/OrchardCore/OrchardCore.Users.Core/Services/UserQueryContext.cs
+++ b/src/OrchardCore/OrchardCore.Users.Core/Services/UserQueryContext.cs
@@ -3,15 +3,14 @@
 using YesSql;
 using YesSql.Filters.Query.Services;
 
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+public class UserQueryContext : QueryExecutionContext<User>
 {
-    public class UserQueryContext : QueryExecutionContext<User>
+    public UserQueryContext(IServiceProvider serviceProvider, IQuery<User> query) : base(query)
     {
-        public UserQueryContext(IServiceProvider serviceProvider, IQuery<User> query) : base(query)
-        {
-            ServiceProvider = serviceProvider;
-        }
-
-        public IServiceProvider ServiceProvider { get; }
+        ServiceProvider = serviceProvider;
     }
+
+    public IServiceProvider ServiceProvider { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Core/Services/UserService.cs b/src/OrchardCore/OrchardCore.Users.Core/Services/UserService.cs
index e03996e5b82..8af8ab785ef 100644
--- a/src/OrchardCore/OrchardCore.Users.Core/Services/UserService.cs
+++ b/src/OrchardCore/OrchardCore.Users.Core/Services/UserService.cs
@@ -11,307 +11,306 @@
 using OrchardCore.Users.Events;
 using OrchardCore.Users.Models;
 
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+/// <summary>
+/// Implements <see cref="IUserService"/> by using the ASP.NET Core Identity packages.
+/// </summary>
+public class UserService : IUserService
 {
-    /// <summary>
-    /// Implements <see cref="IUserService"/> by using the ASP.NET Core Identity packages.
-    /// </summary>
-    public class UserService : IUserService
+    private readonly SignInManager<IUser> _signInManager;
+    private readonly UserManager<IUser> _userManager;
+    private readonly IdentityOptions _identityOptions;
+    private readonly IEnumerable<IPasswordRecoveryFormEvents> _passwordRecoveryFormEvents;
+    private readonly ISiteService _siteService;
+    private readonly ILogger _logger;
+
+    protected readonly IStringLocalizer S;
+
+    public UserService(
+        SignInManager<IUser> signInManager,
+        UserManager<IUser> userManager,
+        IOptions<IdentityOptions> identityOptions,
+        IEnumerable<IPasswordRecoveryFormEvents> passwordRecoveryFormEvents,
+        IStringLocalizer<UserService> stringLocalizer,
+        ISiteService siteService,
+        ILogger<UserService> logger)
+    {
+        _signInManager = signInManager;
+        _userManager = userManager;
+        _identityOptions = identityOptions.Value;
+        _passwordRecoveryFormEvents = passwordRecoveryFormEvents;
+        S = stringLocalizer;
+        _siteService = siteService;
+        _logger = logger;
+    }
+
+    public async Task<IUser> AuthenticateAsync(string usernameOrEmail, string password, Action<string, string> reportError)
     {
-        private readonly SignInManager<IUser> _signInManager;
-        private readonly UserManager<IUser> _userManager;
-        private readonly IdentityOptions _identityOptions;
-        private readonly IEnumerable<IPasswordRecoveryFormEvents> _passwordRecoveryFormEvents;
-        private readonly ISiteService _siteService;
-        private readonly ILogger _logger;
-
-        protected readonly IStringLocalizer S;
-
-        public UserService(
-            SignInManager<IUser> signInManager,
-            UserManager<IUser> userManager,
-            IOptions<IdentityOptions> identityOptions,
-            IEnumerable<IPasswordRecoveryFormEvents> passwordRecoveryFormEvents,
-            IStringLocalizer<UserService> stringLocalizer,
-            ISiteService siteService,
-            ILogger<UserService> logger)
+        var disableLocalLogin = (await _siteService.GetSettingsAsync<LoginSettings>()).DisableLocalLogin;
+
+        if (disableLocalLogin)
         {
-            _signInManager = signInManager;
-            _userManager = userManager;
-            _identityOptions = identityOptions.Value;
-            _passwordRecoveryFormEvents = passwordRecoveryFormEvents;
-            S = stringLocalizer;
-            _siteService = siteService;
-            _logger = logger;
+            reportError(string.Empty, S["Local login is disabled."]);
+            return null;
         }
 
-        public async Task<IUser> AuthenticateAsync(string usernameOrEmail, string password, Action<string, string> reportError)
+        if (string.IsNullOrWhiteSpace(usernameOrEmail))
         {
-            var disableLocalLogin = (await _siteService.GetSettingsAsync<LoginSettings>()).DisableLocalLogin;
-
-            if (disableLocalLogin)
-            {
-                reportError(string.Empty, S["Local login is disabled."]);
-                return null;
-            }
-
-            if (string.IsNullOrWhiteSpace(usernameOrEmail))
-            {
-                reportError("Username", S["A user name is required."]);
-                return null;
-            }
-
-            if (string.IsNullOrWhiteSpace(password))
-            {
-                reportError("Password", S["A password is required."]);
-                return null;
-            }
-
-            var user = await GetUserAsync(usernameOrEmail);
-            if (user == null)
-            {
-                reportError(string.Empty, S["The specified username/password couple is invalid."]);
-                return null;
-            }
-
-            var result = await _signInManager.CheckPasswordSignInAsync(user, password, lockoutOnFailure: true);
+            reportError("Username", S["A user name is required."]);
+            return null;
+        }
 
-            if (result.IsLockedOut)
-            {
-                reportError(string.Empty, S["The user is locked out."]);
-                return null;
-            }
-            else if (result.IsNotAllowed)
-            {
-                reportError(string.Empty, S["The specified user is not allowed to sign in."]);
-                return null;
-            }
-            else if (result.RequiresTwoFactor)
-            {
-                reportError(string.Empty, S["The specified user is not allowed to sign in using password authentication."]);
-                return null;
-            }
-            else if (!result.Succeeded)
-            {
-                reportError(string.Empty, S["The specified username/password couple is invalid."]);
-                return null;
-            }
+        if (string.IsNullOrWhiteSpace(password))
+        {
+            reportError("Password", S["A password is required."]);
+            return null;
+        }
 
-            if (!(user as User).IsEnabled)
-            {
-                reportError(string.Empty, S["The specified user is not allowed to sign in."]);
+        var user = await GetUserAsync(usernameOrEmail);
+        if (user == null)
+        {
+            reportError(string.Empty, S["The specified username/password couple is invalid."]);
+            return null;
+        }
 
-                return null;
-            }
+        var result = await _signInManager.CheckPasswordSignInAsync(user, password, lockoutOnFailure: true);
 
-            return user;
+        if (result.IsLockedOut)
+        {
+            reportError(string.Empty, S["The user is locked out."]);
+            return null;
+        }
+        else if (result.IsNotAllowed)
+        {
+            reportError(string.Empty, S["The specified user is not allowed to sign in."]);
+            return null;
+        }
+        else if (result.RequiresTwoFactor)
+        {
+            reportError(string.Empty, S["The specified user is not allowed to sign in using password authentication."]);
+            return null;
+        }
+        else if (!result.Succeeded)
+        {
+            reportError(string.Empty, S["The specified username/password couple is invalid."]);
+            return null;
         }
 
-        public async Task<IUser> CreateUserAsync(IUser user, string password, Action<string, string> reportError)
+        if (!(user as User).IsEnabled)
         {
-            if (user is not User newUser)
-            {
-                throw new ArgumentException("Expected a User instance.", nameof(user));
-            }
+            reportError(string.Empty, S["The specified user is not allowed to sign in."]);
 
-            // Accounts can be created with no password.
-            var identityResult = string.IsNullOrWhiteSpace(password)
-                ? await _userManager.CreateAsync(user)
-                : await _userManager.CreateAsync(user, password);
-            if (!identityResult.Succeeded)
-            {
-                ProcessValidationErrors(identityResult.Errors, newUser, reportError);
-                return null;
-            }
+            return null;
+        }
+
+        return user;
+    }
 
-            return user;
+    public async Task<IUser> CreateUserAsync(IUser user, string password, Action<string, string> reportError)
+    {
+        if (user is not User newUser)
+        {
+            throw new ArgumentException("Expected a User instance.", nameof(user));
         }
 
-        public async Task<bool> ChangeEmailAsync(IUser user, string newEmail, Action<string, string> reportError)
+        // Accounts can be created with no password.
+        var identityResult = string.IsNullOrWhiteSpace(password)
+            ? await _userManager.CreateAsync(user)
+            : await _userManager.CreateAsync(user, password);
+        if (!identityResult.Succeeded)
         {
-            var token = await _userManager.GenerateChangeEmailTokenAsync(user, newEmail);
-            var identityResult = await _userManager.ChangeEmailAsync(user, newEmail, token);
+            ProcessValidationErrors(identityResult.Errors, newUser, reportError);
+            return null;
+        }
 
-            if (!identityResult.Succeeded)
-            {
-                ProcessValidationErrors(identityResult.Errors, (User)user, reportError);
-            }
+        return user;
+    }
 
-            return identityResult.Succeeded;
-        }
+    public async Task<bool> ChangeEmailAsync(IUser user, string newEmail, Action<string, string> reportError)
+    {
+        var token = await _userManager.GenerateChangeEmailTokenAsync(user, newEmail);
+        var identityResult = await _userManager.ChangeEmailAsync(user, newEmail, token);
 
-        public async Task<bool> ChangePasswordAsync(IUser user, string currentPassword, string newPassword, Action<string, string> reportError)
+        if (!identityResult.Succeeded)
         {
-            var identityResult = await _userManager.ChangePasswordAsync(user, currentPassword, newPassword);
+            ProcessValidationErrors(identityResult.Errors, (User)user, reportError);
+        }
 
-            if (!identityResult.Succeeded)
-            {
-                ProcessValidationErrors(identityResult.Errors, (User)user, reportError);
-            }
+        return identityResult.Succeeded;
+    }
 
-            return identityResult.Succeeded;
-        }
+    public async Task<bool> ChangePasswordAsync(IUser user, string currentPassword, string newPassword, Action<string, string> reportError)
+    {
+        var identityResult = await _userManager.ChangePasswordAsync(user, currentPassword, newPassword);
 
-        public Task<IUser> GetAuthenticatedUserAsync(ClaimsPrincipal principal)
+        if (!identityResult.Succeeded)
         {
-            if (principal == null)
-            {
-                return Task.FromResult<IUser>(null);
-            }
-
-            return _userManager.GetUserAsync(principal);
+            ProcessValidationErrors(identityResult.Errors, (User)user, reportError);
         }
 
-        public async Task<IUser> GetForgotPasswordUserAsync(string userId)
+        return identityResult.Succeeded;
+    }
+
+    public Task<IUser> GetAuthenticatedUserAsync(ClaimsPrincipal principal)
+    {
+        if (principal == null)
         {
-            if (string.IsNullOrWhiteSpace(userId))
-            {
-                return await Task.FromResult<IUser>(null);
-            }
+            return Task.FromResult<IUser>(null);
+        }
 
-            var user = await GetUserAsync(userId);
+        return _userManager.GetUserAsync(principal);
+    }
 
-            if (user == null)
-            {
-                return await Task.FromResult<IUser>(null);
-            }
+    public async Task<IUser> GetForgotPasswordUserAsync(string userId)
+    {
+        if (string.IsNullOrWhiteSpace(userId))
+        {
+            return await Task.FromResult<IUser>(null);
+        }
 
-            if (user is User u)
-            {
-                u.ResetToken = await _userManager.GeneratePasswordResetTokenAsync(user);
-            }
+        var user = await GetUserAsync(userId);
 
-            return user;
+        if (user == null)
+        {
+            return await Task.FromResult<IUser>(null);
         }
 
-        public async Task<bool> ResetPasswordAsync(string usernameOrEmail, string resetToken, string newPassword, Action<string, string> reportError)
+        if (user is User u)
         {
-            var result = true;
-            if (string.IsNullOrWhiteSpace(usernameOrEmail))
-            {
-                reportError(nameof(ResetPasswordForm.UsernameOrEmail), S["A username or email address is required."]);
-                result = false;
-            }
-
-            if (string.IsNullOrWhiteSpace(newPassword))
-            {
-                reportError(nameof(ResetPasswordForm.NewPassword), S["A password is required."]);
-                result = false;
-            }
+            u.ResetToken = await _userManager.GeneratePasswordResetTokenAsync(user);
+        }
 
-            if (string.IsNullOrWhiteSpace(resetToken))
-            {
-                reportError(nameof(ResetPasswordForm.ResetToken), S["A token is required."]);
-                result = false;
-            }
+        return user;
+    }
 
-            if (!result)
-            {
-                return result;
-            }
+    public async Task<bool> ResetPasswordAsync(string usernameOrEmail, string resetToken, string newPassword, Action<string, string> reportError)
+    {
+        var result = true;
+        if (string.IsNullOrWhiteSpace(usernameOrEmail))
+        {
+            reportError(nameof(ResetPasswordForm.UsernameOrEmail), S["A username or email address is required."]);
+            result = false;
+        }
 
-            var user = await GetUserAsync(usernameOrEmail) as User;
+        if (string.IsNullOrWhiteSpace(newPassword))
+        {
+            reportError(nameof(ResetPasswordForm.NewPassword), S["A password is required."]);
+            result = false;
+        }
 
-            if (user == null)
-            {
-                return false;
-            }
+        if (string.IsNullOrWhiteSpace(resetToken))
+        {
+            reportError(nameof(ResetPasswordForm.ResetToken), S["A token is required."]);
+            result = false;
+        }
 
-            var identityResult = await _userManager.ResetPasswordAsync(user, resetToken, newPassword);
+        if (!result)
+        {
+            return result;
+        }
 
-            if (!identityResult.Succeeded)
-            {
-                ProcessValidationErrors(identityResult.Errors, user, reportError);
-            }
+        var user = await GetUserAsync(usernameOrEmail) as User;
 
-            if (identityResult.Succeeded)
-            {
-                var context = new PasswordRecoveryContext(user);
+        if (user == null)
+        {
+            return false;
+        }
 
-                await _passwordRecoveryFormEvents.InvokeAsync((handler, context) => handler.PasswordResetAsync(context), context, _logger);
-            }
+        var identityResult = await _userManager.ResetPasswordAsync(user, resetToken, newPassword);
 
-            return identityResult.Succeeded;
+        if (!identityResult.Succeeded)
+        {
+            ProcessValidationErrors(identityResult.Errors, user, reportError);
         }
 
-        public Task<ClaimsPrincipal> CreatePrincipalAsync(IUser user)
+        if (identityResult.Succeeded)
         {
-            if (user == null)
-            {
-                return Task.FromResult<ClaimsPrincipal>(null);
-            }
+            var context = new PasswordRecoveryContext(user);
 
-            return _signInManager.CreateUserPrincipalAsync(user);
+            await _passwordRecoveryFormEvents.InvokeAsync((handler, context) => handler.PasswordResetAsync(context), context, _logger);
         }
 
-        public async Task<IUser> GetUserAsync(string usernameOrEmail)
+        return identityResult.Succeeded;
+    }
+
+    public Task<ClaimsPrincipal> CreatePrincipalAsync(IUser user)
+    {
+        if (user == null)
         {
-            var user = await _userManager.FindByNameAsync(usernameOrEmail);
+            return Task.FromResult<ClaimsPrincipal>(null);
+        }
 
-            if (user is null && _identityOptions.User.RequireUniqueEmail)
-            {
-                user = await _userManager.FindByEmailAsync(usernameOrEmail);
-            }
+        return _signInManager.CreateUserPrincipalAsync(user);
+    }
+
+    public async Task<IUser> GetUserAsync(string usernameOrEmail)
+    {
+        var user = await _userManager.FindByNameAsync(usernameOrEmail);
 
-            return user;
+        if (user is null && _identityOptions.User.RequireUniqueEmail)
+        {
+            user = await _userManager.FindByEmailAsync(usernameOrEmail);
         }
 
-        public Task<IUser> GetUserByUniqueIdAsync(string userId)
-            => _userManager.FindByIdAsync(userId);
+        return user;
+    }
+
+    public Task<IUser> GetUserByUniqueIdAsync(string userId)
+        => _userManager.FindByIdAsync(userId);
 
-        public void ProcessValidationErrors(IEnumerable<IdentityError> errors, User user, Action<string, string> reportError)
+    public void ProcessValidationErrors(IEnumerable<IdentityError> errors, User user, Action<string, string> reportError)
+    {
+        foreach (var error in errors)
         {
-            foreach (var error in errors)
+            switch (error.Code)
             {
-                switch (error.Code)
-                {
-                    // Password.
-                    case "PasswordRequiresDigit":
-                        reportError("Password", S["Passwords must have at least one digit character ('0'-'9')."]);
-                        break;
-                    case "PasswordRequiresLower":
-                        reportError("Password", S["Passwords must have at least one lowercase character ('a'-'z')."]);
-                        break;
-                    case "PasswordRequiresUpper":
-                        reportError("Password", S["Passwords must have at least one uppercase character ('A'-'Z')."]);
-                        break;
-                    case "PasswordRequiresNonAlphanumeric":
-                        reportError("Password", S["Passwords must have at least one non letter or digit character."]);
-                        break;
-                    case "PasswordTooShort":
-                        reportError("Password", S["Passwords must be at least {0} characters.", _identityOptions.Password.RequiredLength]);
-                        break;
-                    case "PasswordRequiresUniqueChars":
-                        reportError("Password", S["Passwords must contain at least {0} unique characters.", _identityOptions.Password.RequiredUniqueChars]);
-                        break;
-
-                    // CurrentPassword.
-                    case "PasswordMismatch":
-                        reportError("CurrentPassword", S["Incorrect password."]);
-                        break;
-
-                    // User name.
-                    case "InvalidUserName":
-                        reportError("UserName", S["User name '{0}' is invalid, can only contain letters or digits.", user.UserName]);
-                        break;
-                    case "DuplicateUserName":
-                        reportError("UserName", S["User name '{0}' is already used.", user.UserName]);
-                        break;
-
-                    // Email.
-                    case "DuplicateEmail":
-                        reportError("Email", S["Email '{0}' is already used.", user.Email]);
-                        break;
-                    case "InvalidEmail":
-                        reportError("Email", S["Email '{0}' is invalid.", user.Email]);
-                        break;
-                    case "InvalidToken":
-                        reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
-                        break;
-                    default:
-                        reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
-                        break;
-                }
+                // Password.
+                case "PasswordRequiresDigit":
+                    reportError("Password", S["Passwords must have at least one digit character ('0'-'9')."]);
+                    break;
+                case "PasswordRequiresLower":
+                    reportError("Password", S["Passwords must have at least one lowercase character ('a'-'z')."]);
+                    break;
+                case "PasswordRequiresUpper":
+                    reportError("Password", S["Passwords must have at least one uppercase character ('A'-'Z')."]);
+                    break;
+                case "PasswordRequiresNonAlphanumeric":
+                    reportError("Password", S["Passwords must have at least one non letter or digit character."]);
+                    break;
+                case "PasswordTooShort":
+                    reportError("Password", S["Passwords must be at least {0} characters.", _identityOptions.Password.RequiredLength]);
+                    break;
+                case "PasswordRequiresUniqueChars":
+                    reportError("Password", S["Passwords must contain at least {0} unique characters.", _identityOptions.Password.RequiredUniqueChars]);
+                    break;
+
+                // CurrentPassword.
+                case "PasswordMismatch":
+                    reportError("CurrentPassword", S["Incorrect password."]);
+                    break;
+
+                // User name.
+                case "InvalidUserName":
+                    reportError("UserName", S["User name '{0}' is invalid, can only contain letters or digits.", user.UserName]);
+                    break;
+                case "DuplicateUserName":
+                    reportError("UserName", S["User name '{0}' is already used.", user.UserName]);
+                    break;
+
+                // Email.
+                case "DuplicateEmail":
+                    reportError("Email", S["Email '{0}' is already used.", user.Email]);
+                    break;
+                case "InvalidEmail":
+                    reportError("Email", S["Email '{0}' is invalid.", user.Email]);
+                    break;
+                case "InvalidToken":
+                    reportError(string.Empty, S["The reset token is invalid. Please request a new token."]);
+                    break;
+                default:
+                    reportError(string.Empty, S["Unexpected error: '{0}'.", error.Code]);
+                    break;
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore.Users.Core/Services/UserStore.cs b/src/OrchardCore/OrchardCore.Users.Core/Services/UserStore.cs
index f542717b5e8..5d531243b66 100644
--- a/src/OrchardCore/OrchardCore.Users.Core/Services/UserStore.cs
+++ b/src/OrchardCore/OrchardCore.Users.Core/Services/UserStore.cs
@@ -14,943 +14,942 @@
 using OrchardCore.Users.Models;
 using YesSql;
 
-namespace OrchardCore.Users.Services
+namespace OrchardCore.Users.Services;
+
+public class UserStore :
+    IUserClaimStore<IUser>,
+    IUserRoleStore<IUser>,
+    IUserPasswordStore<IUser>,
+    IUserEmailStore<IUser>,
+    IUserSecurityStampStore<IUser>,
+    IUserLoginStore<IUser>,
+    IUserLockoutStore<IUser>,
+    IUserAuthenticationTokenStore<IUser>,
+    IUserTwoFactorRecoveryCodeStore<IUser>,
+    IUserTwoFactorStore<IUser>,
+    IUserAuthenticatorKeyStore<IUser>,
+    IUserPhoneNumberStore<IUser>
 {
-    public class UserStore :
-        IUserClaimStore<IUser>,
-        IUserRoleStore<IUser>,
-        IUserPasswordStore<IUser>,
-        IUserEmailStore<IUser>,
-        IUserSecurityStampStore<IUser>,
-        IUserLoginStore<IUser>,
-        IUserLockoutStore<IUser>,
-        IUserAuthenticationTokenStore<IUser>,
-        IUserTwoFactorRecoveryCodeStore<IUser>,
-        IUserTwoFactorStore<IUser>,
-        IUserAuthenticatorKeyStore<IUser>,
-        IUserPhoneNumberStore<IUser>
+    private const string TokenProtector = "OrchardCore.UserStore.Token";
+    private const string InternalLoginProvider = "[OrchardCoreUserStore]";
+    private const string RecoveryCodeTokenName = "RecoveryCodes";
+    private const string AuthenticatorKeyTokenName = "AuthenticatorKey";
+
+    private readonly ISession _session;
+    private readonly ILookupNormalizer _keyNormalizer;
+    private readonly IUserIdGenerator _userIdGenerator;
+    private readonly ILogger _logger;
+    private readonly IRoleService _roleService;
+    private readonly IDataProtectionProvider _dataProtectionProvider;
+
+    public UserStore(ISession session,
+        ILookupNormalizer keyNormalizer,
+        IUserIdGenerator userIdGenerator,
+        ILogger<UserStore> logger,
+        IEnumerable<IUserEventHandler> handlers,
+        IRoleService roleService,
+        IDataProtectionProvider dataProtectionProvider)
     {
-        private const string TokenProtector = "OrchardCore.UserStore.Token";
-        private const string InternalLoginProvider = "[OrchardCoreUserStore]";
-        private const string RecoveryCodeTokenName = "RecoveryCodes";
-        private const string AuthenticatorKeyTokenName = "AuthenticatorKey";
+        _session = session;
+        _keyNormalizer = keyNormalizer;
+        _userIdGenerator = userIdGenerator;
+        _logger = logger;
+        _dataProtectionProvider = dataProtectionProvider;
+        Handlers = handlers;
+        _roleService = roleService;
+    }
 
-        private readonly ISession _session;
-        private readonly ILookupNormalizer _keyNormalizer;
-        private readonly IUserIdGenerator _userIdGenerator;
-        private readonly ILogger _logger;
-        private readonly IRoleService _roleService;
-        private readonly IDataProtectionProvider _dataProtectionProvider;
+    public IEnumerable<IUserEventHandler> Handlers { get; private set; }
 
-        public UserStore(ISession session,
-            ILookupNormalizer keyNormalizer,
-            IUserIdGenerator userIdGenerator,
-            ILogger<UserStore> logger,
-            IEnumerable<IUserEventHandler> handlers,
-            IRoleService roleService,
-            IDataProtectionProvider dataProtectionProvider)
-        {
-            _session = session;
-            _keyNormalizer = keyNormalizer;
-            _userIdGenerator = userIdGenerator;
-            _logger = logger;
-            _dataProtectionProvider = dataProtectionProvider;
-            Handlers = handlers;
-            _roleService = roleService;
-        }
+    public void Dispose()
+    {
+        GC.SuppressFinalize(this);
+    }
 
-        public IEnumerable<IUserEventHandler> Handlers { get; private set; }
+    public string NormalizeKey(string key)
+    {
+        return _keyNormalizer == null ? key : _keyNormalizer.NormalizeName(key);
+    }
 
-        public void Dispose()
-        {
-            GC.SuppressFinalize(this);
-        }
+    #region IUserStore<IUser>
+
+    public async Task<IdentityResult> CreateAsync(IUser user, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-        public string NormalizeKey(string key)
+        if (user is not User newUser)
         {
-            return _keyNormalizer == null ? key : _keyNormalizer.NormalizeName(key);
+            throw new ArgumentException("Expected a User instance.", nameof(user));
         }
 
-        #region IUserStore<IUser>
+        var newUserId = newUser.UserId;
 
-        public async Task<IdentityResult> CreateAsync(IUser user, CancellationToken cancellationToken = default)
+        if (string.IsNullOrEmpty(newUserId))
         {
-            ArgumentNullException.ThrowIfNull(user);
-
-            if (user is not User newUser)
-            {
-                throw new ArgumentException("Expected a User instance.", nameof(user));
-            }
-
-            var newUserId = newUser.UserId;
+            // Due to database collation we normalize the userId to lower invariant.
+            newUserId = _userIdGenerator.GenerateUniqueId(user).ToLowerInvariant();
+        }
 
-            if (string.IsNullOrEmpty(newUserId))
-            {
-                // Due to database collation we normalize the userId to lower invariant.
-                newUserId = _userIdGenerator.GenerateUniqueId(user).ToLowerInvariant();
-            }
+        try
+        {
+            var attempts = 10;
 
-            try
+            while (await _session.QueryIndex<UserIndex>(x => x.UserId == newUserId).CountAsync() != 0)
             {
-                var attempts = 10;
-
-                while (await _session.QueryIndex<UserIndex>(x => x.UserId == newUserId).CountAsync() != 0)
+                if (attempts-- == 0)
                 {
-                    if (attempts-- == 0)
-                    {
-                        throw new ApplicationException("Couldn't generate a unique user id. Too many attempts.");
-                    }
-
-                    newUserId = _userIdGenerator.GenerateUniqueId(user).ToLowerInvariant();
+                    throw new ApplicationException("Couldn't generate a unique user id. Too many attempts.");
                 }
 
-                newUser.UserId = newUserId;
+                newUserId = _userIdGenerator.GenerateUniqueId(user).ToLowerInvariant();
+            }
 
-                var context = new UserCreateContext(user);
+            newUser.UserId = newUserId;
 
-                await Handlers.InvokeAsync((handler, context) => handler.CreatingAsync(context), context, _logger);
+            var context = new UserCreateContext(user);
 
-                if (context.Cancel)
-                {
-                    return IdentityResult.Failed();
-                }
+            await Handlers.InvokeAsync((handler, context) => handler.CreatingAsync(context), context, _logger);
 
-                await _session.SaveAsync(user);
-                await _session.SaveChangesAsync();
-                await Handlers.InvokeAsync((handler, context) => handler.CreatedAsync(context), context, _logger);
-            }
-            catch (Exception e)
+            if (context.Cancel)
             {
-                _logger.LogError(e, "Unexpected error while creating a new user.");
-
                 return IdentityResult.Failed();
             }
 
-            return IdentityResult.Success;
+            await _session.SaveAsync(user);
+            await _session.SaveChangesAsync();
+            await Handlers.InvokeAsync((handler, context) => handler.CreatedAsync(context), context, _logger);
         }
-
-        public async Task<IdentityResult> DeleteAsync(IUser user, CancellationToken cancellationToken = default)
+        catch (Exception e)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            _logger.LogError(e, "Unexpected error while creating a new user.");
 
-            try
-            {
-                var context = new UserDeleteContext(user);
-                await Handlers.InvokeAsync((handler, context) => handler.DeletingAsync(context), context, _logger);
+            return IdentityResult.Failed();
+        }
 
-                if (context.Cancel)
-                {
-                    return IdentityResult.Failed();
-                }
+        return IdentityResult.Success;
+    }
 
-                _session.Delete(user);
-                await _session.SaveChangesAsync();
-                await Handlers.InvokeAsync((handler, context) => handler.DeletedAsync(context), context, _logger);
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "Unexpected error while deleting a user.");
+    public async Task<IdentityResult> DeleteAsync(IUser user, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(user);
+
+        try
+        {
+            var context = new UserDeleteContext(user);
+            await Handlers.InvokeAsync((handler, context) => handler.DeletingAsync(context), context, _logger);
 
+            if (context.Cancel)
+            {
                 return IdentityResult.Failed();
             }
 
-            return IdentityResult.Success;
+            _session.Delete(user);
+            await _session.SaveChangesAsync();
+            await Handlers.InvokeAsync((handler, context) => handler.DeletedAsync(context), context, _logger);
         }
-
-        public async Task<IUser> FindByIdAsync(string userId, CancellationToken cancellationToken = default)
+        catch (Exception e)
         {
-            return await _session.Query<User, UserIndex>(u => u.UserId == userId).FirstOrDefaultAsync();
+            _logger.LogError(e, "Unexpected error while deleting a user.");
+
+            return IdentityResult.Failed();
         }
 
-        public async Task<IUser> FindByNameAsync(string normalizedUserName, CancellationToken cancellationToken = default)
+        return IdentityResult.Success;
+    }
+
+    public async Task<IUser> FindByIdAsync(string userId, CancellationToken cancellationToken = default)
+    {
+        return await _session.Query<User, UserIndex>(u => u.UserId == userId).FirstOrDefaultAsync();
+    }
+
+    public async Task<IUser> FindByNameAsync(string normalizedUserName, CancellationToken cancellationToken = default)
+    {
+        return await _session.Query<User, UserIndex>(u => u.NormalizedUserName == normalizedUserName).FirstOrDefaultAsync();
+    }
+
+    public Task<string> GetNormalizedUserNameAsync(IUser user, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(user);
+
+        if (user is User u)
         {
-            return await _session.Query<User, UserIndex>(u => u.NormalizedUserName == normalizedUserName).FirstOrDefaultAsync();
+            return Task.FromResult(u.NormalizedUserName);
         }
 
-        public Task<string> GetNormalizedUserNameAsync(IUser user, CancellationToken cancellationToken = default)
-        {
-            ArgumentNullException.ThrowIfNull(user);
+        return Task.FromResult<string>(null);
+    }
 
-            if (user is User u)
-            {
-                return Task.FromResult(u.NormalizedUserName);
-            }
+    public Task<string> GetUserIdAsync(IUser user, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            return Task.FromResult<string>(null);
+        if (user is User u)
+        {
+            return Task.FromResult(u.UserId);
         }
 
-        public Task<string> GetUserIdAsync(IUser user, CancellationToken cancellationToken = default)
-        {
-            ArgumentNullException.ThrowIfNull(user);
+        return Task.FromResult<string>(null);
+    }
 
-            if (user is User u)
-            {
-                return Task.FromResult(u.UserId);
-            }
+    public Task<string> GetUserNameAsync(IUser user, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            return Task.FromResult<string>(null);
-        }
+        return Task.FromResult(user.UserName);
+    }
 
-        public Task<string> GetUserNameAsync(IUser user, CancellationToken cancellationToken = default)
-        {
-            ArgumentNullException.ThrowIfNull(user);
+    public Task SetNormalizedUserNameAsync(IUser user, string normalizedName, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            return Task.FromResult(user.UserName);
+        if (user is User u)
+        {
+            u.NormalizedUserName = normalizedName;
         }
 
-        public Task SetNormalizedUserNameAsync(IUser user, string normalizedName, CancellationToken cancellationToken = default)
-        {
-            ArgumentNullException.ThrowIfNull(user);
+        return Task.CompletedTask;
+    }
 
-            if (user is User u)
-            {
-                u.NormalizedUserName = normalizedName;
-            }
+    public Task SetUserNameAsync(IUser user, string userName, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            return Task.CompletedTask;
+        if (user is User u)
+        {
+            u.UserName = userName;
         }
 
-        public Task SetUserNameAsync(IUser user, string userName, CancellationToken cancellationToken = default)
+        return Task.CompletedTask;
+    }
+
+    public async Task<IdentityResult> UpdateAsync(IUser user, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(user);
+
+        try
         {
-            ArgumentNullException.ThrowIfNull(user);
+            var context = new UserUpdateContext(user);
+            await Handlers.InvokeAsync((handler, context) => handler.UpdatingAsync(context), context, _logger);
 
-            if (user is User u)
+            if (context.Cancel)
             {
-                u.UserName = userName;
+                return IdentityResult.Failed();
             }
 
-            return Task.CompletedTask;
+            await _session.SaveAsync(user);
+            await _session.SaveChangesAsync();
+            await Handlers.InvokeAsync((handler, context) => handler.UpdatedAsync(context), context, _logger);
         }
-
-        public async Task<IdentityResult> UpdateAsync(IUser user, CancellationToken cancellationToken = default)
+        catch (Exception e)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            _logger.LogError(e, "Unexpected error while updating a user.");
 
-            try
-            {
-                var context = new UserUpdateContext(user);
-                await Handlers.InvokeAsync((handler, context) => handler.UpdatingAsync(context), context, _logger);
+            return IdentityResult.Failed();
+        }
 
-                if (context.Cancel)
-                {
-                    return IdentityResult.Failed();
-                }
+        return IdentityResult.Success;
+    }
 
-                await _session.SaveAsync(user);
-                await _session.SaveChangesAsync();
-                await Handlers.InvokeAsync((handler, context) => handler.UpdatedAsync(context), context, _logger);
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "Unexpected error while updating a user.");
+    #endregion IUserStore<IUser>
 
-                return IdentityResult.Failed();
-            }
+    #region IUserPasswordStore<IUser>
 
-            return IdentityResult.Success;
+    public Task<string> GetPasswordHashAsync(IUser user, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(user);
+
+        if (user is User u)
+        {
+            return Task.FromResult(u.PasswordHash);
         }
 
-        #endregion IUserStore<IUser>
+        return Task.FromResult<string>(null);
+    }
 
-        #region IUserPasswordStore<IUser>
+    public Task SetPasswordHashAsync(IUser user, string passwordHash, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-        public Task<string> GetPasswordHashAsync(IUser user, CancellationToken cancellationToken = default)
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            u.PasswordHash = passwordHash;
+        }
 
-            if (user is User u)
-            {
-                return Task.FromResult(u.PasswordHash);
-            }
+        return Task.CompletedTask;
+    }
 
-            return Task.FromResult<string>(null);
-        }
+    public Task<bool> HasPasswordAsync(IUser user, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-        public Task SetPasswordHashAsync(IUser user, string passwordHash, CancellationToken cancellationToken = default)
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            return Task.FromResult(u.PasswordHash != null);
+        }
 
-            if (user is User u)
-            {
-                u.PasswordHash = passwordHash;
-            }
+        return Task.FromResult(false);
+    }
 
-            return Task.CompletedTask;
-        }
+    #endregion IUserPasswordStore<IUser>
 
-        public Task<bool> HasPasswordAsync(IUser user, CancellationToken cancellationToken = default)
-        {
-            ArgumentNullException.ThrowIfNull(user);
+    #region ISecurityStampValidator<IUser>
 
-            if (user is User u)
-            {
-                return Task.FromResult(u.PasswordHash != null);
-            }
+    public Task SetSecurityStampAsync(IUser user, string stamp, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            return Task.FromResult(false);
+        if (user is User u)
+        {
+            u.SecurityStamp = stamp;
         }
 
-        #endregion IUserPasswordStore<IUser>
+        return Task.CompletedTask;
+    }
 
-        #region ISecurityStampValidator<IUser>
+    public Task<string> GetSecurityStampAsync(IUser user, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-        public Task SetSecurityStampAsync(IUser user, string stamp, CancellationToken cancellationToken = default)
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            return Task.FromResult(u.SecurityStamp);
+        }
 
-            if (user is User u)
-            {
-                u.SecurityStamp = stamp;
-            }
+        return Task.FromResult<string>(null);
+    }
 
-            return Task.CompletedTask;
-        }
+    #endregion ISecurityStampValidator<IUser>
 
-        public Task<string> GetSecurityStampAsync(IUser user, CancellationToken cancellationToken = default)
-        {
-            ArgumentNullException.ThrowIfNull(user);
+    #region IUserEmailStore<IUser>
 
-            if (user is User u)
-            {
-                return Task.FromResult(u.SecurityStamp);
-            }
+    public Task SetEmailAsync(IUser user, string email, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            return Task.FromResult<string>(null);
+        if (user is User u)
+        {
+            u.Email = email;
         }
 
-        #endregion ISecurityStampValidator<IUser>
+        return Task.CompletedTask;
+    }
 
-        #region IUserEmailStore<IUser>
+    public Task<string> GetEmailAsync(IUser user, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-        public Task SetEmailAsync(IUser user, string email, CancellationToken cancellationToken)
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            return Task.FromResult(u.Email);
+        }
 
-            if (user is User u)
-            {
-                u.Email = email;
-            }
+        return Task.FromResult<string>(null);
+    }
 
-            return Task.CompletedTask;
-        }
+    public Task<bool> GetEmailConfirmedAsync(IUser user, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-        public Task<string> GetEmailAsync(IUser user, CancellationToken cancellationToken)
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            return Task.FromResult(u.EmailConfirmed);
+        }
 
-            if (user is User u)
-            {
-                return Task.FromResult(u.Email);
-            }
+        return Task.FromResult(false);
+    }
 
-            return Task.FromResult<string>(null);
-        }
+    public Task SetEmailConfirmedAsync(IUser user, bool confirmed, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-        public Task<bool> GetEmailConfirmedAsync(IUser user, CancellationToken cancellationToken)
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            u.EmailConfirmed = confirmed;
+        }
 
-            if (user is User u)
-            {
-                return Task.FromResult(u.EmailConfirmed);
-            }
+        return Task.CompletedTask;
+    }
 
-            return Task.FromResult(false);
-        }
+    public async Task<IUser> FindByEmailAsync(string normalizedEmail, CancellationToken cancellationToken)
+    {
+        return await _session.Query<User, UserIndex>(u => u.NormalizedEmail == normalizedEmail).FirstOrDefaultAsync();
+    }
+
+    public Task<string> GetNormalizedEmailAsync(IUser user, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-        public Task SetEmailConfirmedAsync(IUser user, bool confirmed, CancellationToken cancellationToken)
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            return Task.FromResult(u.NormalizedEmail);
+        }
 
-            if (user is User u)
-            {
-                u.EmailConfirmed = confirmed;
-            }
+        return Task.FromResult<string>(null);
+    }
 
-            return Task.CompletedTask;
-        }
+    public Task SetNormalizedEmailAsync(IUser user, string normalizedEmail, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-        public async Task<IUser> FindByEmailAsync(string normalizedEmail, CancellationToken cancellationToken)
+        if (user is User u)
         {
-            return await _session.Query<User, UserIndex>(u => u.NormalizedEmail == normalizedEmail).FirstOrDefaultAsync();
+            u.NormalizedEmail = normalizedEmail;
         }
 
-        public Task<string> GetNormalizedEmailAsync(IUser user, CancellationToken cancellationToken)
+        return Task.CompletedTask;
+    }
+
+    #endregion IUserEmailStore<IUser>
+
+    #region IUserRoleStore<IUser>
+
+    public async Task AddToRoleAsync(IUser user, string normalizedRoleName, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
+
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            var roleNames = await _roleService.GetRoleNamesAsync();
 
-            if (user is User u)
+            var roleName = roleNames.FirstOrDefault(r => NormalizeKey(r) == normalizedRoleName);
+            if (string.IsNullOrEmpty(roleName))
             {
-                return Task.FromResult(u.NormalizedEmail);
+                throw new InvalidOperationException($"Role {normalizedRoleName} does not exist.");
             }
 
-            return Task.FromResult<string>(null);
+            u.RoleNames.Add(roleName);
         }
+    }
 
-        public Task SetNormalizedEmailAsync(IUser user, string normalizedEmail, CancellationToken cancellationToken)
+    public async Task RemoveFromRoleAsync(IUser user, string normalizedRoleName, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
+
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            var roleNames = await _roleService.GetRoleNamesAsync();
 
-            if (user is User u)
+            var roleName = roleNames.FirstOrDefault(r => NormalizeKey(r) == normalizedRoleName);
+            if (string.IsNullOrEmpty(roleName))
             {
-                u.NormalizedEmail = normalizedEmail;
+                throw new InvalidOperationException($"Role {normalizedRoleName} does not exist.");
             }
 
-            return Task.CompletedTask;
+            u.RoleNames.Remove(roleName);
         }
+    }
 
-        #endregion IUserEmailStore<IUser>
-
-        #region IUserRoleStore<IUser>
+    public Task<IList<string>> GetRolesAsync(IUser user, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-        public async Task AddToRoleAsync(IUser user, string normalizedRoleName, CancellationToken cancellationToken)
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            return Task.FromResult(u.RoleNames);
+        }
 
-            if (user is User u)
-            {
-                var roleNames = await _roleService.GetRoleNamesAsync();
+        return Task.FromResult<IList<string>>([]);
+    }
 
-                var roleName = roleNames.FirstOrDefault(r => NormalizeKey(r) == normalizedRoleName);
-                if (string.IsNullOrEmpty(roleName))
-                {
-                    throw new InvalidOperationException($"Role {normalizedRoleName} does not exist.");
-                }
+    public Task<bool> IsInRoleAsync(IUser user, string normalizedRoleName, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-                u.RoleNames.Add(roleName);
-            }
+        if (string.IsNullOrWhiteSpace(normalizedRoleName))
+        {
+            throw new ArgumentException("Value cannot be null or empty.", nameof(normalizedRoleName));
         }
 
-        public async Task RemoveFromRoleAsync(IUser user, string normalizedRoleName, CancellationToken cancellationToken)
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
-
-            if (user is User u)
-            {
-                var roleNames = await _roleService.GetRoleNamesAsync();
+            return Task.FromResult(u.RoleNames.Contains(normalizedRoleName, StringComparer.OrdinalIgnoreCase));
+        }
 
-                var roleName = roleNames.FirstOrDefault(r => NormalizeKey(r) == normalizedRoleName);
-                if (string.IsNullOrEmpty(roleName))
-                {
-                    throw new InvalidOperationException($"Role {normalizedRoleName} does not exist.");
-                }
+        return Task.FromResult(false);
+    }
 
-                u.RoleNames.Remove(roleName);
-            }
-        }
+    public async Task<IList<IUser>> GetUsersInRoleAsync(string normalizedRoleName, CancellationToken cancellationToken)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(normalizedRoleName);
 
-        public Task<IList<string>> GetRolesAsync(IUser user, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(user);
+        var users = await _session.Query<User, UserByRoleNameIndex>(u => u.RoleName == normalizedRoleName).ListAsync();
+        return users == null ? [] : users.ToList<IUser>();
+    }
 
-            if (user is User u)
-            {
-                return Task.FromResult(u.RoleNames);
-            }
+    #endregion IUserRoleStore<IUser>
 
-            return Task.FromResult<IList<string>>([]);
-        }
+    #region IUserLoginStore<IUser>
 
-        public Task<bool> IsInRoleAsync(IUser user, string normalizedRoleName, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(user);
+    public Task AddLoginAsync(IUser user, UserLoginInfo login, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            if (string.IsNullOrWhiteSpace(normalizedRoleName))
-            {
-                throw new ArgumentException("Value cannot be null or empty.", nameof(normalizedRoleName));
-            }
+        ArgumentNullException.ThrowIfNull(login);
 
-            if (user is User u)
+        if (user is User u)
+        {
+            if (u.LoginInfos.Any(i => i.LoginProvider == login.LoginProvider))
             {
-                return Task.FromResult(u.RoleNames.Contains(normalizedRoleName, StringComparer.OrdinalIgnoreCase));
+                throw new InvalidOperationException($"Provider {login.LoginProvider} is already linked for {user.UserName}");
             }
 
-            return Task.FromResult(false);
+            u.LoginInfos.Add(login);
         }
 
-        public async Task<IList<IUser>> GetUsersInRoleAsync(string normalizedRoleName, CancellationToken cancellationToken)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(normalizedRoleName);
+        return Task.CompletedTask;
+    }
+
+    public async Task<IUser> FindByLoginAsync(string loginProvider, string providerKey, CancellationToken cancellationToken)
+    {
+        return await _session.Query<User, UserByLoginInfoIndex>(u => u.LoginProvider == loginProvider && u.ProviderKey == providerKey).FirstOrDefaultAsync();
+    }
 
-            var users = await _session.Query<User, UserByRoleNameIndex>(u => u.RoleName == normalizedRoleName).ListAsync();
-            return users == null ? [] : users.ToList<IUser>();
+    public Task<IList<UserLoginInfo>> GetLoginsAsync(IUser user, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
+
+        if (user is User u)
+        {
+            return Task.FromResult(u.LoginInfos);
         }
 
-        #endregion IUserRoleStore<IUser>
+        return Task.FromResult<IList<UserLoginInfo>>([]);
+    }
 
-        #region IUserLoginStore<IUser>
+    public Task RemoveLoginAsync(IUser user, string loginProvider, string providerKey, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-        public Task AddLoginAsync(IUser user, UserLoginInfo login, CancellationToken cancellationToken)
+        if (user is User u && u.LoginInfos != null)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            var item = u.LoginInfos.FirstOrDefault(c => c.LoginProvider == loginProvider && c.ProviderKey == providerKey);
+            if (item != null)
+            {
+                u.LoginInfos.Remove(item);
+            }
+        }
 
-            ArgumentNullException.ThrowIfNull(login);
+        return Task.CompletedTask;
+    }
 
-            if (user is User u)
-            {
-                if (u.LoginInfos.Any(i => i.LoginProvider == login.LoginProvider))
-                {
-                    throw new InvalidOperationException($"Provider {login.LoginProvider} is already linked for {user.UserName}");
-                }
+    #endregion IUserLoginStore<IUser>
 
-                u.LoginInfos.Add(login);
-            }
+    #region IUserClaimStore<IUser>
 
-            return Task.CompletedTask;
-        }
+    public Task<IList<Claim>> GetClaimsAsync(IUser user, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-        public async Task<IUser> FindByLoginAsync(string loginProvider, string providerKey, CancellationToken cancellationToken)
+        if (user is not User u)
         {
-            return await _session.Query<User, UserByLoginInfoIndex>(u => u.LoginProvider == loginProvider && u.ProviderKey == providerKey).FirstOrDefaultAsync();
+            return Task.FromResult<IList<Claim>>([]);
         }
 
-        public Task<IList<UserLoginInfo>> GetLoginsAsync(IUser user, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(user);
+        return Task.FromResult<IList<Claim>>(u.UserClaims.Select(x => x.ToClaim()).ToList());
+    }
 
-            if (user is User u)
-            {
-                return Task.FromResult(u.LoginInfos);
-            }
+    public Task AddClaimsAsync(IUser user, IEnumerable<Claim> claims, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            return Task.FromResult<IList<UserLoginInfo>>([]);
-        }
+        ArgumentNullException.ThrowIfNull(claims);
 
-        public Task RemoveLoginAsync(IUser user, string loginProvider, string providerKey, CancellationToken cancellationToken)
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
-
-            if (user is User u && u.LoginInfos != null)
+            foreach (var claim in claims)
             {
-                var item = u.LoginInfos.FirstOrDefault(c => c.LoginProvider == loginProvider && c.ProviderKey == providerKey);
-                if (item != null)
-                {
-                    u.LoginInfos.Remove(item);
-                }
+                u.UserClaims.Add(new UserClaim { ClaimType = claim.Type, ClaimValue = claim.Value });
             }
-
-            return Task.CompletedTask;
         }
 
-        #endregion IUserLoginStore<IUser>
-
-        #region IUserClaimStore<IUser>
+        return Task.CompletedTask;
+    }
 
-        public Task<IList<Claim>> GetClaimsAsync(IUser user, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(user);
+    public Task ReplaceClaimAsync(IUser user, Claim claim, Claim newClaim, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            if (user is not User u)
-            {
-                return Task.FromResult<IList<Claim>>([]);
-            }
+        ArgumentNullException.ThrowIfNull(claim);
 
-            return Task.FromResult<IList<Claim>>(u.UserClaims.Select(x => x.ToClaim()).ToList());
-        }
+        ArgumentNullException.ThrowIfNull(newClaim);
 
-        public Task AddClaimsAsync(IUser user, IEnumerable<Claim> claims, CancellationToken cancellationToken)
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
-
-            ArgumentNullException.ThrowIfNull(claims);
-
-            if (user is User u)
+            foreach (var userClaim in u.UserClaims.Where(uc => uc.ClaimValue == claim.Value && uc.ClaimType == claim.Type))
             {
-                foreach (var claim in claims)
-                {
-                    u.UserClaims.Add(new UserClaim { ClaimType = claim.Type, ClaimValue = claim.Value });
-                }
+                userClaim.ClaimValue = newClaim.Value;
+                userClaim.ClaimType = newClaim.Type;
             }
-
-            return Task.CompletedTask;
         }
 
-        public Task ReplaceClaimAsync(IUser user, Claim claim, Claim newClaim, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(user);
+        return Task.CompletedTask;
+    }
 
-            ArgumentNullException.ThrowIfNull(claim);
+    public Task RemoveClaimsAsync(IUser user, IEnumerable<Claim> claims, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            ArgumentNullException.ThrowIfNull(newClaim);
+        ArgumentNullException.ThrowIfNull(claims);
 
-            if (user is User u)
+        if (user is User u)
+        {
+            foreach (var claim in claims)
             {
-                foreach (var userClaim in u.UserClaims.Where(uc => uc.ClaimValue == claim.Value && uc.ClaimType == claim.Type))
+                foreach (var userClaim in u.UserClaims.Where(uc => uc.ClaimValue == claim.Value && uc.ClaimType == claim.Type).ToList())
                 {
-                    userClaim.ClaimValue = newClaim.Value;
-                    userClaim.ClaimType = newClaim.Type;
+                    u.UserClaims.Remove(userClaim);
                 }
             }
-
-            return Task.CompletedTask;
         }
 
-        public Task RemoveClaimsAsync(IUser user, IEnumerable<Claim> claims, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(user);
+        return Task.CompletedTask;
+    }
 
-            ArgumentNullException.ThrowIfNull(claims);
+    public async Task<IList<IUser>> GetUsersForClaimAsync(Claim claim, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(claim);
 
-            if (user is User u)
-            {
-                foreach (var claim in claims)
-                {
-                    foreach (var userClaim in u.UserClaims.Where(uc => uc.ClaimValue == claim.Value && uc.ClaimType == claim.Type).ToList())
-                    {
-                        u.UserClaims.Remove(userClaim);
-                    }
-                }
-            }
+        var users = await _session.Query<User, UserByClaimIndex>(uc => uc.ClaimType == claim.Type && uc.ClaimValue == claim.Value).ListAsync();
 
-            return Task.CompletedTask;
-        }
+        return users.Cast<IUser>().ToList();
+    }
 
-        public async Task<IList<IUser>> GetUsersForClaimAsync(Claim claim, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(claim);
+    #endregion IUserClaimStore<IUser>
 
-            var users = await _session.Query<User, UserByClaimIndex>(uc => uc.ClaimType == claim.Type && uc.ClaimValue == claim.Value).ListAsync();
+    #region IUserAuthenticationTokenStore
+    public Task<string> GetTokenAsync(IUser user, string loginProvider, string name, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            return users.Cast<IUser>().ToList();
+        if (string.IsNullOrEmpty(loginProvider))
+        {
+            throw new ArgumentException("The login provider cannot be null or empty.", nameof(loginProvider));
         }
 
-        #endregion IUserClaimStore<IUser>
-
-        #region IUserAuthenticationTokenStore
-        public Task<string> GetTokenAsync(IUser user, string loginProvider, string name, CancellationToken cancellationToken = default)
+        if (string.IsNullOrEmpty(name))
         {
-            ArgumentNullException.ThrowIfNull(user);
+            throw new ArgumentException("The name cannot be null or empty.", nameof(name));
+        }
 
-            if (string.IsNullOrEmpty(loginProvider))
-            {
-                throw new ArgumentException("The login provider cannot be null or empty.", nameof(loginProvider));
-            }
+        var userToken = GetUserToken(user, loginProvider, name);
+        if (userToken != null)
+        {
+            var value = _dataProtectionProvider.CreateProtector(TokenProtector).Unprotect(userToken.Value);
 
-            if (string.IsNullOrEmpty(name))
-            {
-                throw new ArgumentException("The name cannot be null or empty.", nameof(name));
-            }
+            return Task.FromResult(value);
+        }
 
-            var userToken = GetUserToken(user, loginProvider, name);
-            if (userToken != null)
-            {
-                var value = _dataProtectionProvider.CreateProtector(TokenProtector).Unprotect(userToken.Value);
+        return Task.FromResult<string>(null);
+    }
 
-                return Task.FromResult(value);
-            }
+    public Task RemoveTokenAsync(IUser user, string loginProvider, string name, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            return Task.FromResult<string>(null);
+        if (string.IsNullOrEmpty(loginProvider))
+        {
+            throw new ArgumentException("The login provider cannot be null or empty.", nameof(loginProvider));
         }
 
-        public Task RemoveTokenAsync(IUser user, string loginProvider, string name, CancellationToken cancellationToken = default)
+        if (string.IsNullOrEmpty(name))
         {
-            ArgumentNullException.ThrowIfNull(user);
-
-            if (string.IsNullOrEmpty(loginProvider))
-            {
-                throw new ArgumentException("The login provider cannot be null or empty.", nameof(loginProvider));
-            }
-
-            if (string.IsNullOrEmpty(name))
-            {
-                throw new ArgumentException("The name cannot be null or empty.", nameof(name));
-            }
-
-            var userToken = GetUserToken(user, loginProvider, name);
-            if (userToken != null && user is User u)
-            {
-                u.UserTokens.Remove(userToken);
-            }
-
-            return Task.CompletedTask;
+            throw new ArgumentException("The name cannot be null or empty.", nameof(name));
         }
 
-        public Task SetTokenAsync(IUser user, string loginProvider, string name, string value, CancellationToken cancellationToken = default)
+        var userToken = GetUserToken(user, loginProvider, name);
+        if (userToken != null && user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            u.UserTokens.Remove(userToken);
+        }
 
-            if (string.IsNullOrEmpty(loginProvider))
-            {
-                throw new ArgumentException("The login provider cannot be null or empty.", nameof(loginProvider));
-            }
+        return Task.CompletedTask;
+    }
 
-            if (string.IsNullOrEmpty(name))
-            {
-                throw new ArgumentException("The name cannot be null or empty.", nameof(name));
-            }
+    public Task SetTokenAsync(IUser user, string loginProvider, string name, string value, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            if (string.IsNullOrEmpty(value))
-            {
-                throw new ArgumentException("The value cannot be null or empty.", nameof(value));
-            }
+        if (string.IsNullOrEmpty(loginProvider))
+        {
+            throw new ArgumentException("The login provider cannot be null or empty.", nameof(loginProvider));
+        }
 
-            var userToken = GetUserToken(user, loginProvider, name);
+        if (string.IsNullOrEmpty(name))
+        {
+            throw new ArgumentException("The name cannot be null or empty.", nameof(name));
+        }
 
-            if (userToken == null && user is User u)
-            {
-                userToken = new UserToken
-                {
-                    LoginProvider = loginProvider,
-                    Name = name
-                };
+        if (string.IsNullOrEmpty(value))
+        {
+            throw new ArgumentException("The value cannot be null or empty.", nameof(value));
+        }
 
-                u.UserTokens.Add(userToken);
-            }
+        var userToken = GetUserToken(user, loginProvider, name);
 
-            // Encrypt the token.
-            if (userToken != null)
+        if (userToken == null && user is User u)
+        {
+            userToken = new UserToken
             {
-                userToken.Value = _dataProtectionProvider.CreateProtector(TokenProtector).Protect(value);
-            }
+                LoginProvider = loginProvider,
+                Name = name
+            };
 
-            return Task.CompletedTask;
+            u.UserTokens.Add(userToken);
         }
 
-        private static UserToken GetUserToken(IUser user, string loginProvider, string name)
+        // Encrypt the token.
+        if (userToken != null)
         {
-            if (user is User u)
-            {
-                return u.UserTokens.FirstOrDefault(ut => ut.LoginProvider == loginProvider && ut.Name == name);
-            }
-
-            return null;
+            userToken.Value = _dataProtectionProvider.CreateProtector(TokenProtector).Protect(value);
         }
-        #endregion
 
-        #region IUserLockoutStore<IUser>
-        public Task<int> GetAccessFailedCountAsync(IUser user, CancellationToken cancellationToken)
+        return Task.CompletedTask;
+    }
+
+    private static UserToken GetUserToken(IUser user, string loginProvider, string name)
+    {
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            return u.UserTokens.FirstOrDefault(ut => ut.LoginProvider == loginProvider && ut.Name == name);
+        }
 
-            if (user is User u)
-            {
-                return Task.FromResult(u.AccessFailedCount);
-            }
+        return null;
+    }
+    #endregion
 
-            return Task.FromResult(0);
-        }
+    #region IUserLockoutStore<IUser>
+    public Task<int> GetAccessFailedCountAsync(IUser user, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-        public Task<bool> GetLockoutEnabledAsync(IUser user, CancellationToken cancellationToken)
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            return Task.FromResult(u.AccessFailedCount);
+        }
 
-            if (user is User u)
-            {
-                return Task.FromResult(u.IsLockoutEnabled);
-            }
+        return Task.FromResult(0);
+    }
 
-            return Task.FromResult(false);
-        }
+    public Task<bool> GetLockoutEnabledAsync(IUser user, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-        public Task<DateTimeOffset?> GetLockoutEndDateAsync(IUser user, CancellationToken cancellationToken)
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            return Task.FromResult(u.IsLockoutEnabled);
+        }
 
-            if (user is User u && u.LockoutEndUtc.HasValue)
-            {
-                return Task.FromResult<DateTimeOffset?>(u.LockoutEndUtc.Value.ToUniversalTime());
-            }
+        return Task.FromResult(false);
+    }
 
-            return Task.FromResult<DateTimeOffset?>(null);
-        }
+    public Task<DateTimeOffset?> GetLockoutEndDateAsync(IUser user, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-        public Task<int> IncrementAccessFailedCountAsync(IUser user, CancellationToken cancellationToken)
+        if (user is User u && u.LockoutEndUtc.HasValue)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            return Task.FromResult<DateTimeOffset?>(u.LockoutEndUtc.Value.ToUniversalTime());
+        }
 
-            if (user is User u)
-            {
-                return Task.FromResult(u.AccessFailedCount++);
-            }
+        return Task.FromResult<DateTimeOffset?>(null);
+    }
 
-            return Task.FromResult(0);
-        }
+    public Task<int> IncrementAccessFailedCountAsync(IUser user, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-        public Task ResetAccessFailedCountAsync(IUser user, CancellationToken cancellationToken)
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            return Task.FromResult(u.AccessFailedCount++);
+        }
 
-            if (user is User u)
-            {
-                u.AccessFailedCount = 0;
-            }
+        return Task.FromResult(0);
+    }
 
-            return Task.CompletedTask;
-        }
+    public Task ResetAccessFailedCountAsync(IUser user, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-        public Task SetLockoutEnabledAsync(IUser user, bool enabled, CancellationToken cancellationToken)
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            u.AccessFailedCount = 0;
+        }
 
-            if (user is User u)
-            {
-                u.IsLockoutEnabled = enabled;
-            }
+        return Task.CompletedTask;
+    }
 
-            return Task.CompletedTask;
-        }
+    public Task SetLockoutEnabledAsync(IUser user, bool enabled, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-        public Task SetLockoutEndDateAsync(IUser user, DateTimeOffset? lockoutEnd, CancellationToken cancellationToken)
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            u.IsLockoutEnabled = enabled;
+        }
 
-            if (user is User u)
-            {
-                if (lockoutEnd.HasValue)
-                {
-                    u.LockoutEndUtc = lockoutEnd.Value.UtcDateTime;
-                }
-                else
-                {
-                    u.LockoutEndUtc = null;
-                }
-            }
+        return Task.CompletedTask;
+    }
 
-            return Task.CompletedTask;
-        }
-        #endregion IUserLockoutStore<IUser>
+    public Task SetLockoutEndDateAsync(IUser user, DateTimeOffset? lockoutEnd, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-        #region IUserTwoFactorStore<IUser>
-        public Task SetTwoFactorEnabledAsync(IUser user, bool enabled, CancellationToken cancellationToken)
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
-
-            if (user is User u)
+            if (lockoutEnd.HasValue)
             {
-                u.TwoFactorEnabled = enabled;
+                u.LockoutEndUtc = lockoutEnd.Value.UtcDateTime;
             }
-
-            return Task.CompletedTask;
-        }
-
-        public Task<bool> GetTwoFactorEnabledAsync(IUser user, CancellationToken cancellationToken)
-        {
-            if (user is User u)
+            else
             {
-                return Task.FromResult(u.TwoFactorEnabled);
+                u.LockoutEndUtc = null;
             }
-
-            return Task.FromResult(false);
         }
-        #endregion
 
-        #region IUserTwoFactorRecoveryCodeStore
-        public Task ReplaceCodesAsync(IUser user, IEnumerable<string> recoveryCodes, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(user);
-            ArgumentNullException.ThrowIfNull(recoveryCodes);
+        return Task.CompletedTask;
+    }
+    #endregion IUserLockoutStore<IUser>
 
-            var mergedCodes = string.Join(";", recoveryCodes);
+    #region IUserTwoFactorStore<IUser>
+    public Task SetTwoFactorEnabledAsync(IUser user, bool enabled, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            return SetTokenAsync(user, InternalLoginProvider, RecoveryCodeTokenName, mergedCodes, cancellationToken);
+        if (user is User u)
+        {
+            u.TwoFactorEnabled = enabled;
         }
 
-        public async Task<bool> RedeemCodeAsync(IUser user, string code, CancellationToken cancellationToken)
+        return Task.CompletedTask;
+    }
+
+    public Task<bool> GetTwoFactorEnabledAsync(IUser user, CancellationToken cancellationToken)
+    {
+        if (user is User u)
         {
-            ArgumentNullException.ThrowIfNull(user);
+            return Task.FromResult(u.TwoFactorEnabled);
+        }
 
-            if (string.IsNullOrWhiteSpace(code))
-            {
-                throw new ArgumentException($"{nameof(code)} cannot be null or empty.");
-            }
+        return Task.FromResult(false);
+    }
+    #endregion
 
-            var mergedCodes = (await GetTokenAsync(user, InternalLoginProvider, RecoveryCodeTokenName, cancellationToken)) ?? string.Empty;
-            var splitCodes = mergedCodes.Split(';');
-            if (splitCodes.Contains(code))
-            {
-                var updatedCodes = new List<string>(splitCodes.Where(s => s != code));
-                await ReplaceCodesAsync(user, updatedCodes, cancellationToken);
+    #region IUserTwoFactorRecoveryCodeStore
+    public Task ReplaceCodesAsync(IUser user, IEnumerable<string> recoveryCodes, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
+        ArgumentNullException.ThrowIfNull(recoveryCodes);
 
-                return true;
-            }
+        var mergedCodes = string.Join(";", recoveryCodes);
 
-            return false;
+        return SetTokenAsync(user, InternalLoginProvider, RecoveryCodeTokenName, mergedCodes, cancellationToken);
+    }
+
+    public async Task<bool> RedeemCodeAsync(IUser user, string code, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
+
+        if (string.IsNullOrWhiteSpace(code))
+        {
+            throw new ArgumentException($"{nameof(code)} cannot be null or empty.");
         }
 
-        public async Task<int> CountCodesAsync(IUser user, CancellationToken cancellationToken)
+        var mergedCodes = (await GetTokenAsync(user, InternalLoginProvider, RecoveryCodeTokenName, cancellationToken)) ?? string.Empty;
+        var splitCodes = mergedCodes.Split(';');
+        if (splitCodes.Contains(code))
         {
-            ArgumentNullException.ThrowIfNull(user);
+            var updatedCodes = new List<string>(splitCodes.Where(s => s != code));
+            await ReplaceCodesAsync(user, updatedCodes, cancellationToken);
+
+            return true;
+        }
 
-            var mergedCodes = (await GetTokenAsync(user, InternalLoginProvider, RecoveryCodeTokenName, cancellationToken)) ?? "";
-            if (mergedCodes.Length > 0)
+        return false;
+    }
+
+    public async Task<int> CountCodesAsync(IUser user, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
+
+        var mergedCodes = (await GetTokenAsync(user, InternalLoginProvider, RecoveryCodeTokenName, cancellationToken)) ?? "";
+        if (mergedCodes.Length > 0)
+        {
+            // non-allocating version of mergedCodes.Split(';').Length
+            var count = 1;
+            var index = 0;
+            while (index < mergedCodes.Length)
             {
-                // non-allocating version of mergedCodes.Split(';').Length
-                var count = 1;
-                var index = 0;
-                while (index < mergedCodes.Length)
+                var semiColonIndex = mergedCodes.IndexOf(';', index);
+                if (semiColonIndex < 0)
                 {
-                    var semiColonIndex = mergedCodes.IndexOf(';', index);
-                    if (semiColonIndex < 0)
-                    {
-                        break;
-                    }
-                    count++;
-                    index = semiColonIndex + 1;
+                    break;
                 }
-
-                return count;
+                count++;
+                index = semiColonIndex + 1;
             }
 
-            return 0;
+            return count;
         }
-        #endregion
 
-        #region IUserAuthenticatorKeyStore<IUser>
-        public virtual Task SetAuthenticatorKeyAsync(IUser user, string key, CancellationToken cancellationToken)
-            => SetTokenAsync(user, InternalLoginProvider, AuthenticatorKeyTokenName, key, cancellationToken);
+        return 0;
+    }
+    #endregion
 
-        public virtual Task<string> GetAuthenticatorKeyAsync(IUser user, CancellationToken cancellationToken)
-            => GetTokenAsync(user, InternalLoginProvider, AuthenticatorKeyTokenName, cancellationToken);
-        #endregion
+    #region IUserAuthenticatorKeyStore<IUser>
+    public virtual Task SetAuthenticatorKeyAsync(IUser user, string key, CancellationToken cancellationToken)
+        => SetTokenAsync(user, InternalLoginProvider, AuthenticatorKeyTokenName, key, cancellationToken);
 
-        #region IUserPhoneNumberStore<IUser>
-        public Task SetPhoneNumberAsync(IUser user, string phoneNumber, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(user);
+    public virtual Task<string> GetAuthenticatorKeyAsync(IUser user, CancellationToken cancellationToken)
+        => GetTokenAsync(user, InternalLoginProvider, AuthenticatorKeyTokenName, cancellationToken);
+    #endregion
 
-            if (user is User u)
-            {
-                u.PhoneNumber = phoneNumber;
-            }
+    #region IUserPhoneNumberStore<IUser>
+    public Task SetPhoneNumberAsync(IUser user, string phoneNumber, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            return Task.CompletedTask;
+        if (user is User u)
+        {
+            u.PhoneNumber = phoneNumber;
         }
 
-        public Task SetPhoneNumberConfirmedAsync(IUser user, bool confirmed, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(user);
+        return Task.CompletedTask;
+    }
 
-            if (user is User u)
-            {
-                u.PhoneNumberConfirmed = confirmed;
-            }
+    public Task SetPhoneNumberConfirmedAsync(IUser user, bool confirmed, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            return Task.CompletedTask;
+        if (user is User u)
+        {
+            u.PhoneNumberConfirmed = confirmed;
         }
 
-        public Task<string> GetPhoneNumberAsync(IUser user, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(user);
+        return Task.CompletedTask;
+    }
 
-            if (user is User u)
-            {
-                return Task.FromResult(u.PhoneNumber);
-            }
+    public Task<string> GetPhoneNumberAsync(IUser user, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            return Task.FromResult<string>(null);
+        if (user is User u)
+        {
+            return Task.FromResult(u.PhoneNumber);
         }
 
-        public Task<bool> GetPhoneNumberConfirmedAsync(IUser user, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(user);
+        return Task.FromResult<string>(null);
+    }
 
-            if (user is User u)
-            {
-                return Task.FromResult(u.PhoneNumberConfirmed);
-            }
+    public Task<bool> GetPhoneNumberConfirmedAsync(IUser user, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(user);
 
-            return Task.FromResult<bool>(false);
+        if (user is User u)
+        {
+            return Task.FromResult(u.PhoneNumberConfirmed);
         }
-        #endregion
+
+        return Task.FromResult<bool>(false);
     }
+    #endregion
 }
diff --git a/src/OrchardCore/OrchardCore.Users.Core/ViewModels/UserIndexOptions.cs b/src/OrchardCore/OrchardCore.Users.Core/ViewModels/UserIndexOptions.cs
index 13a65b15895..270169277c5 100644
--- a/src/OrchardCore/OrchardCore.Users.Core/ViewModels/UserIndexOptions.cs
+++ b/src/OrchardCore/OrchardCore.Users.Core/ViewModels/UserIndexOptions.cs
@@ -7,63 +7,62 @@
 using OrchardCore.Users.Services;
 using YesSql.Filters.Query;
 
-namespace OrchardCore.Users.ViewModels
+namespace OrchardCore.Users.ViewModels;
+
+public class UserIndexOptions
 {
-    public class UserIndexOptions
-    {
-        public string SearchText { get; set; }
-        public string OriginalSearchText { get; set; }
-        public UsersOrder Order { get; set; }
-        public UsersFilter Filter { get; set; }
-        public string SelectedRole { get; set; }
-        public UsersBulkAction BulkAction { get; set; }
-        public int StartIndex { get; set; }
-        public int EndIndex { get; set; }
-        public int UsersCount { get; set; }
-        public int TotalItemCount { get; set; }
+    public string SearchText { get; set; }
+    public string OriginalSearchText { get; set; }
+    public UsersOrder Order { get; set; }
+    public UsersFilter Filter { get; set; }
+    public string SelectedRole { get; set; }
+    public UsersBulkAction BulkAction { get; set; }
+    public int StartIndex { get; set; }
+    public int EndIndex { get; set; }
+    public int UsersCount { get; set; }
+    public int TotalItemCount { get; set; }
 
-        [ModelBinder(BinderType = typeof(UserFilterEngineModelBinder), Name = nameof(SearchText))]
-        public QueryFilterResult<User> FilterResult { get; set; }
+    [ModelBinder(BinderType = typeof(UserFilterEngineModelBinder), Name = nameof(SearchText))]
+    public QueryFilterResult<User> FilterResult { get; set; }
 
-        [BindNever]
-        public RouteValueDictionary RouteValues { get; set; } = [];
+    [BindNever]
+    public RouteValueDictionary RouteValues { get; set; } = [];
 
-        [BindNever]
-        public List<SelectListItem> UserFilters { get; set; }
+    [BindNever]
+    public List<SelectListItem> UserFilters { get; set; }
 
-        [BindNever]
-        public List<SelectListItem> UserRoleFilters { get; set; }
+    [BindNever]
+    public List<SelectListItem> UserRoleFilters { get; set; }
 
-        [BindNever]
-        public List<SelectListItem> UserSorts { get; set; }
+    [BindNever]
+    public List<SelectListItem> UserSorts { get; set; }
 
-        [BindNever]
-        public List<SelectListItem> UsersBulkAction { get; set; }
-    }
+    [BindNever]
+    public List<SelectListItem> UsersBulkAction { get; set; }
+}
 
-    public enum UsersOrder
-    {
-        Name,
-        Email,
-    }
+public enum UsersOrder
+{
+    Name,
+    Email,
+}
 
-    public enum UsersFilter
-    {
-        All,
-        Approved,
-        Pending,
-        EmailPending,
-        Enabled,
-        Disabled
-    }
+public enum UsersFilter
+{
+    All,
+    Approved,
+    Pending,
+    EmailPending,
+    Enabled,
+    Disabled
+}
 
-    public enum UsersBulkAction
-    {
-        None,
-        Delete,
-        Enable,
-        Disable,
-        Approve,
-        ChallengeEmail
-    }
+public enum UsersBulkAction
+{
+    None,
+    Delete,
+    Enable,
+    Disable,
+    Approve,
+    ChallengeEmail
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/Activity.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/Activity.cs
index b2807b7be13..4b17bcc03c8 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/Activity.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/Activity.cs
@@ -10,148 +10,147 @@
 using OrchardCore.Workflows.Abstractions.Models;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Activities
+namespace OrchardCore.Workflows.Activities;
+
+public abstract class Activity : Entity, IActivity
 {
-    public abstract class Activity : Entity, IActivity
-    {
-        public abstract string Name { get; }
-        public abstract LocalizedString DisplayText { get; }
-        public abstract LocalizedString Category { get; }
-        public virtual bool HasEditor => true;
-
-        public abstract IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext);
-
-        public virtual Task<bool> CanExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Task.FromResult(CanExecute(workflowContext, activityContext));
-        }
-
-        public virtual bool CanExecute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return true;
-        }
-
-        public virtual Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Task.FromResult(Execute(workflowContext, activityContext));
-        }
-
-        public virtual ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Noop();
-        }
-
-        public virtual Task<ActivityExecutionResult> ResumeAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Task.FromResult(Resume(workflowContext, activityContext));
-        }
-
-        public virtual ActivityExecutionResult Resume(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Noop();
-        }
-
-        public virtual Task OnInputReceivedAsync(WorkflowExecutionContext workflowContext, IDictionary<string, object> input)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task OnWorkflowStartingAsync(WorkflowExecutionContext context, CancellationToken cancellationToken = default)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task OnWorkflowStartedAsync(WorkflowExecutionContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task OnWorkflowRestartingAsync(WorkflowExecutionContext context, CancellationToken cancellationToken = default)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task OnWorkflowRestartedAsync(WorkflowExecutionContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task OnWorkflowResumingAsync(WorkflowExecutionContext context, CancellationToken cancellationToken = default)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task OnWorkflowResumedAsync(WorkflowExecutionContext context)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task OnActivityExecutingAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext, CancellationToken cancellationToken = default)
-        {
-            return Task.CompletedTask;
-        }
-
-        public virtual Task OnActivityExecutedAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Task.CompletedTask;
-        }
-
-        protected static Outcome Outcome(LocalizedString name)
-        {
-            return new Outcome(name);
-        }
-
-        protected static IEnumerable<Outcome> Outcomes(params LocalizedString[] names)
-        {
-            return names.Select(x => new Outcome(x));
-        }
-
-        protected static IEnumerable<Outcome> Outcomes(IEnumerable<LocalizedString> names)
-        {
-            return names.Select(x => new Outcome(x));
-        }
-
-        protected static ActivityExecutionResult Outcomes(string name)
-        {
-            return new ActivityExecutionResult(new string[] { name });
-        }
-
-        protected static ActivityExecutionResult Outcomes(params string[] names)
-        {
-            return new ActivityExecutionResult(names);
-        }
-
-        protected static ActivityExecutionResult Outcomes(IEnumerable<string> names)
-        {
-            return new ActivityExecutionResult(names);
-        }
-
-        protected static ActivityExecutionResult Halt()
-        {
-            return ActivityExecutionResult.Halted;
-        }
-
-        protected static ActivityExecutionResult Noop()
-        {
-            return ActivityExecutionResult.Empty;
-        }
-
-        protected virtual T GetProperty<T>(Func<T> defaultValue = null, [CallerMemberName] string name = null)
-        {
-            var item = Properties[name];
-            return item != null ? item.ToObject<T>() : defaultValue != null ? defaultValue() : default;
-        }
-
-        protected virtual T GetProperty<T>(Type type, Func<T> defaultValue = null, [CallerMemberName] string name = null)
-        {
-            var item = Properties[name];
-            return item != null ? (T)item.ToObject(type) : defaultValue != null ? defaultValue() : default;
-        }
-
-        protected virtual void SetProperty(object value, [CallerMemberName] string name = null)
-        {
-            // Properties[name] = JToken.FromObject(value);
-            Properties[name] = JNode.FromObject(value);
-        }
+    public abstract string Name { get; }
+    public abstract LocalizedString DisplayText { get; }
+    public abstract LocalizedString Category { get; }
+    public virtual bool HasEditor => true;
+
+    public abstract IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext);
+
+    public virtual Task<bool> CanExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Task.FromResult(CanExecute(workflowContext, activityContext));
+    }
+
+    public virtual bool CanExecute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return true;
+    }
+
+    public virtual Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Task.FromResult(Execute(workflowContext, activityContext));
+    }
+
+    public virtual ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Noop();
+    }
+
+    public virtual Task<ActivityExecutionResult> ResumeAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Task.FromResult(Resume(workflowContext, activityContext));
+    }
+
+    public virtual ActivityExecutionResult Resume(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Noop();
+    }
+
+    public virtual Task OnInputReceivedAsync(WorkflowExecutionContext workflowContext, IDictionary<string, object> input)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task OnWorkflowStartingAsync(WorkflowExecutionContext context, CancellationToken cancellationToken = default)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task OnWorkflowStartedAsync(WorkflowExecutionContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task OnWorkflowRestartingAsync(WorkflowExecutionContext context, CancellationToken cancellationToken = default)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task OnWorkflowRestartedAsync(WorkflowExecutionContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task OnWorkflowResumingAsync(WorkflowExecutionContext context, CancellationToken cancellationToken = default)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task OnWorkflowResumedAsync(WorkflowExecutionContext context)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task OnActivityExecutingAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext, CancellationToken cancellationToken = default)
+    {
+        return Task.CompletedTask;
+    }
+
+    public virtual Task OnActivityExecutedAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Task.CompletedTask;
+    }
+
+    protected static Outcome Outcome(LocalizedString name)
+    {
+        return new Outcome(name);
+    }
+
+    protected static IEnumerable<Outcome> Outcomes(params LocalizedString[] names)
+    {
+        return names.Select(x => new Outcome(x));
+    }
+
+    protected static IEnumerable<Outcome> Outcomes(IEnumerable<LocalizedString> names)
+    {
+        return names.Select(x => new Outcome(x));
+    }
+
+    protected static ActivityExecutionResult Outcomes(string name)
+    {
+        return new ActivityExecutionResult(new string[] { name });
+    }
+
+    protected static ActivityExecutionResult Outcomes(params string[] names)
+    {
+        return new ActivityExecutionResult(names);
+    }
+
+    protected static ActivityExecutionResult Outcomes(IEnumerable<string> names)
+    {
+        return new ActivityExecutionResult(names);
+    }
+
+    protected static ActivityExecutionResult Halt()
+    {
+        return ActivityExecutionResult.Halted;
+    }
+
+    protected static ActivityExecutionResult Noop()
+    {
+        return ActivityExecutionResult.Empty;
+    }
+
+    protected virtual T GetProperty<T>(Func<T> defaultValue = null, [CallerMemberName] string name = null)
+    {
+        var item = Properties[name];
+        return item != null ? item.ToObject<T>() : defaultValue != null ? defaultValue() : default;
+    }
+
+    protected virtual T GetProperty<T>(Type type, Func<T> defaultValue = null, [CallerMemberName] string name = null)
+    {
+        var item = Properties[name];
+        return item != null ? (T)item.ToObject(type) : defaultValue != null ? defaultValue() : default;
+    }
+
+    protected virtual void SetProperty(object value, [CallerMemberName] string name = null)
+    {
+        // Properties[name] = JToken.FromObject(value);
+        Properties[name] = JNode.FromObject(value);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/ActivityExecutionResult.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/ActivityExecutionResult.cs
index 8482508a252..7d8a7711c12 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/ActivityExecutionResult.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/ActivityExecutionResult.cs
@@ -1,25 +1,24 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Workflows.Activities
-{
-    public class ActivityExecutionResult
-    {
-        public static readonly ActivityExecutionResult Empty = new([]);
+namespace OrchardCore.Workflows.Activities;
 
-        public static readonly ActivityExecutionResult Halted = new([]) { IsHalted = true };
+public class ActivityExecutionResult
+{
+    public static readonly ActivityExecutionResult Empty = new([]);
 
-        public ActivityExecutionResult(IEnumerable<string> outcomes)
-        {
-            Outcomes = outcomes;
-        }
+    public static readonly ActivityExecutionResult Halted = new([]) { IsHalted = true };
 
-        public ActivityExecutionResult(string[] outcomes, bool halted)
-        {
-            Outcomes = outcomes;
-            IsHalted = halted;
-        }
+    public ActivityExecutionResult(IEnumerable<string> outcomes)
+    {
+        Outcomes = outcomes;
+    }
 
-        public IEnumerable<string> Outcomes { get; private set; }
-        public bool IsHalted { get; private set; }
+    public ActivityExecutionResult(string[] outcomes, bool halted)
+    {
+        Outcomes = outcomes;
+        IsHalted = halted;
     }
+
+    public IEnumerable<string> Outcomes { get; private set; }
+    public bool IsHalted { get; private set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/EventActivity.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/EventActivity.cs
index 3fccfee3287..6586abef219 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/EventActivity.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/EventActivity.cs
@@ -1,13 +1,12 @@
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Activities
+namespace OrchardCore.Workflows.Activities;
+
+public abstract class EventActivity : Activity, IEvent
 {
-    public abstract class EventActivity : Activity, IEvent
+    public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
     {
-        public override ActivityExecutionResult Execute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            // Halt the workflow to wait for the event to occur.
-            return Halt();
-        }
+        // Halt the workflow to wait for the event to occur.
+        return Halt();
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/IActivity.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/IActivity.cs
index 09d3e86a22d..486fade6bed 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/IActivity.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/IActivity.cs
@@ -7,80 +7,79 @@
 using OrchardCore.Workflows.Abstractions.Models;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Activities
+namespace OrchardCore.Workflows.Activities;
+
+public interface IActivity : IEntity
 {
-    public interface IActivity : IEntity
-    {
-        string Name { get; }
-        LocalizedString DisplayText { get; }
-        LocalizedString Category { get; }
-        new JsonObject Properties { get; set; }
-        bool HasEditor { get; }
+    string Name { get; }
+    LocalizedString DisplayText { get; }
+    LocalizedString Category { get; }
+    new JsonObject Properties { get; set; }
+    bool HasEditor { get; }
 
-        /// <summary>
-        /// List of possible outcomes when the activity is executed.
-        /// </summary>
-        IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext);
+    /// <summary>
+    /// List of possible outcomes when the activity is executed.
+    /// </summary>
+    IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext);
 
-        /// <summary>
-        /// Whether the activity can transition to the next outcome. Can prevent the activity from being transitioned
-        /// because a condition is not valid.
-        /// </summary>
-        Task<bool> CanExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext);
+    /// <summary>
+    /// Whether the activity can transition to the next outcome. Can prevent the activity from being transitioned
+    /// because a condition is not valid.
+    /// </summary>
+    Task<bool> CanExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext);
 
-        /// <summary>
-        /// Executes the specified activity.
-        /// </summary>
-        Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext);
+    /// <summary>
+    /// Executes the specified activity.
+    /// </summary>
+    Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext);
 
-        /// <summary>
-        /// Resumes the specified activity.
-        /// </summary>
-        Task<ActivityExecutionResult> ResumeAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext);
+    /// <summary>
+    /// Resumes the specified activity.
+    /// </summary>
+    Task<ActivityExecutionResult> ResumeAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext);
 
-        /// <summary>
-        /// Executes before a workflow starts or resumes, giving activities an opportunity to read and store any values of interest.
-        /// </summary>
-        Task OnInputReceivedAsync(WorkflowExecutionContext workflowContext, IDictionary<string, object> input);
+    /// <summary>
+    /// Executes before a workflow starts or resumes, giving activities an opportunity to read and store any values of interest.
+    /// </summary>
+    Task OnInputReceivedAsync(WorkflowExecutionContext workflowContext, IDictionary<string, object> input);
 
-        /// <summary>
-        /// Called on each activity when a workflow is about to start.
-        /// </summary>
-        Task OnWorkflowStartingAsync(WorkflowExecutionContext context, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Called on each activity when a workflow is about to start.
+    /// </summary>
+    Task OnWorkflowStartingAsync(WorkflowExecutionContext context, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Called on each activity when a workflow has started.
-        /// </summary>
-        Task OnWorkflowStartedAsync(WorkflowExecutionContext context);
+    /// <summary>
+    /// Called on each activity when a workflow has started.
+    /// </summary>
+    Task OnWorkflowStartedAsync(WorkflowExecutionContext context);
 
-        /// <summary>
-        /// Called on each activity when a workflow is about to be resumed.
-        /// </summary>
-        Task OnWorkflowResumingAsync(WorkflowExecutionContext context, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Called on each activity when a workflow is about to be resumed.
+    /// </summary>
+    Task OnWorkflowResumingAsync(WorkflowExecutionContext context, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Called on each activity when a workflow is resumed.
-        /// </summary>
-        Task OnWorkflowResumedAsync(WorkflowExecutionContext context);
+    /// <summary>
+    /// Called on each activity when a workflow is resumed.
+    /// </summary>
+    Task OnWorkflowResumedAsync(WorkflowExecutionContext context);
 
-        /// <summary>
-        /// Called on each activity when a workflow is about to be restarted.
-        /// </summary>
-        Task OnWorkflowRestartingAsync(WorkflowExecutionContext context, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Called on each activity when a workflow is about to be restarted.
+    /// </summary>
+    Task OnWorkflowRestartingAsync(WorkflowExecutionContext context, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Called on each activity when a workflow is restarted.
-        /// </summary>
-        Task OnWorkflowRestartedAsync(WorkflowExecutionContext context);
+    /// <summary>
+    /// Called on each activity when a workflow is restarted.
+    /// </summary>
+    Task OnWorkflowRestartedAsync(WorkflowExecutionContext context);
 
-        /// <summary>
-        /// Called on each activity when an activity is about to be executed.
-        /// </summary>
-        Task OnActivityExecutingAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Called on each activity when an activity is about to be executed.
+    /// </summary>
+    Task OnActivityExecutingAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Called on each activity when an activity has been executed.
-        /// </summary>
-        Task OnActivityExecutedAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext);
-    }
+    /// <summary>
+    /// Called on each activity when an activity has been executed.
+    /// </summary>
+    Task OnActivityExecutedAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext);
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/IEvent.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/IEvent.cs
index 8180fa78e47..bbdbfc1aa5c 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/IEvent.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/IEvent.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Workflows.Activities
+namespace OrchardCore.Workflows.Activities;
+
+public interface IEvent : IActivity
 {
-    public interface IEvent : IActivity
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/ITask.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/ITask.cs
index 10454bd31f3..545a0880a72 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/ITask.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Activities/ITask.cs
@@ -1,6 +1,5 @@
-namespace OrchardCore.Workflows.Activities
+namespace OrchardCore.Workflows.Activities;
+
+public interface ITask : IActivity
 {
-    public interface ITask : IActivity
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Converters/LocalizedStringConverter.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Converters/LocalizedStringConverter.cs
index 3fedbec9e3f..3d62706baf0 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Converters/LocalizedStringConverter.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Converters/LocalizedStringConverter.cs
@@ -4,20 +4,19 @@
 using System.Text.Json.Serialization;
 using Microsoft.Extensions.Localization;
 
-namespace OrchardCore.Workflows.Abstractions.Converters
+namespace OrchardCore.Workflows.Abstractions.Converters;
+
+// TODO: Should this be moved to a more central library?
+/// <summary>
+/// Serializes the <see cref="LocalizedString"/> to a simple string using the translated text.
+/// </summary>
+public class LocalizedStringConverter : JsonConverter<LocalizedString>
 {
-    // TODO: Should this be moved to a more central library?
-    /// <summary>
-    /// Serializes the <see cref="LocalizedString"/> to a simple string using the translated text.
-    /// </summary>
-    public class LocalizedStringConverter : JsonConverter<LocalizedString>
+    public override LocalizedString Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        public override LocalizedString Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            throw new NotImplementedException();
-        }
-
-        public override void Write(Utf8JsonWriter writer, LocalizedString value, JsonSerializerOptions options)
-            => JsonValue.Create(value.Value).WriteTo(writer, options);
+        throw new NotImplementedException();
     }
+
+    public override void Write(Utf8JsonWriter writer, LocalizedString value, JsonSerializerOptions options)
+        => JsonValue.Create(value.Value).WriteTo(writer, options);
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Display/ActivityDisplayDriver.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Display/ActivityDisplayDriver.cs
index 79eca356899..f2be15ee9b4 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Display/ActivityDisplayDriver.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Display/ActivityDisplayDriver.cs
@@ -4,83 +4,82 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.ViewModels;
 
-namespace OrchardCore.Workflows.Display
+namespace OrchardCore.Workflows.Display;
+
+/// <summary>
+/// Base class for activity drivers.
+/// </summary>
+public abstract class ActivityDisplayDriver<TActivity> : DisplayDriver<IActivity, TActivity>
+    where TActivity : class, IActivity
 {
-    /// <summary>
-    /// Base class for activity drivers.
-    /// </summary>
-    public abstract class ActivityDisplayDriver<TActivity> : DisplayDriver<IActivity, TActivity>
-        where TActivity : class, IActivity
-    {
-        protected static readonly string ActivityName = typeof(TActivity).Name;
+    protected static readonly string ActivityName = typeof(TActivity).Name;
 
-        private static readonly string _thumbnailShapeType = $"{ActivityName}_Fields_Thumbnail";
-        private static readonly string _designShapeType = $"{ActivityName}_Fields_Design";
+    private static readonly string _thumbnailShapeType = $"{ActivityName}_Fields_Thumbnail";
+    private static readonly string _designShapeType = $"{ActivityName}_Fields_Design";
 
-        public override Task<IDisplayResult> DisplayAsync(TActivity activity, BuildDisplayContext context)
-        {
-            return CombineAsync(
-                Shape(_thumbnailShapeType, new ActivityViewModel<TActivity>(activity)).Location("Thumbnail", "Content"),
-                Shape(_designShapeType, new ActivityViewModel<TActivity>(activity)).Location("Design", "Content")
-            );
-        }
+    public override Task<IDisplayResult> DisplayAsync(TActivity activity, BuildDisplayContext context)
+    {
+        return CombineAsync(
+            Shape(_thumbnailShapeType, new ActivityViewModel<TActivity>(activity)).Location("Thumbnail", "Content"),
+            Shape(_designShapeType, new ActivityViewModel<TActivity>(activity)).Location("Design", "Content")
+        );
     }
+}
 
-    /// <summary>
-    /// Base class for activity drivers using a strongly typed view model.
-    /// </summary>
-    public abstract class ActivityDisplayDriver<TActivity, TEditViewModel> : ActivityDisplayDriver<TActivity>
-        where TActivity : class, IActivity where TEditViewModel : class, new()
-    {
-        private static readonly string _editShapeType = $"{ActivityName}_Fields_Edit";
+/// <summary>
+/// Base class for activity drivers using a strongly typed view model.
+/// </summary>
+public abstract class ActivityDisplayDriver<TActivity, TEditViewModel> : ActivityDisplayDriver<TActivity>
+    where TActivity : class, IActivity where TEditViewModel : class, new()
+{
+    private static readonly string _editShapeType = $"{ActivityName}_Fields_Edit";
 
-        public override IDisplayResult Edit(TActivity activity, BuildEditorContext context)
-        {
-            return Initialize<TEditViewModel>(_editShapeType, viewModel => EditActivityAsync(activity, viewModel))
-                .Location("Content");
-        }
+    public override IDisplayResult Edit(TActivity activity, BuildEditorContext context)
+    {
+        return Initialize<TEditViewModel>(_editShapeType, viewModel => EditActivityAsync(activity, viewModel))
+            .Location("Content");
+    }
 
-        public override async Task<IDisplayResult> UpdateAsync(TActivity activity, UpdateEditorContext context)
-        {
-            var viewModel = new TEditViewModel();
-            await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
-            await UpdateActivityAsync(viewModel, activity);
+    public override async Task<IDisplayResult> UpdateAsync(TActivity activity, UpdateEditorContext context)
+    {
+        var viewModel = new TEditViewModel();
+        await context.Updater.TryUpdateModelAsync(viewModel, Prefix);
+        await UpdateActivityAsync(viewModel, activity);
 
-            return Edit(activity, context);
-        }
+        return Edit(activity, context);
+    }
 
-        /// <summary>
-        /// Edit the view model before it's used in the editor.
-        /// </summary>
-        protected virtual ValueTask EditActivityAsync(TActivity activity, TEditViewModel model)
-        {
-            EditActivity(activity, model);
+    /// <summary>
+    /// Edit the view model before it's used in the editor.
+    /// </summary>
+    protected virtual ValueTask EditActivityAsync(TActivity activity, TEditViewModel model)
+    {
+        EditActivity(activity, model);
 
-            return new ValueTask();
-        }
+        return new ValueTask();
+    }
 
-        /// <summary>
-        /// Edit the view model before it's used in the editor.
-        /// </summary>
-        protected virtual void EditActivity(TActivity activity, TEditViewModel model)
-        {
-        }
+    /// <summary>
+    /// Edit the view model before it's used in the editor.
+    /// </summary>
+    protected virtual void EditActivity(TActivity activity, TEditViewModel model)
+    {
+    }
 
-        /// <summary>
-        /// Updates the activity when the view model is validated.
-        /// </summary>
-        protected virtual Task UpdateActivityAsync(TEditViewModel model, TActivity activity)
-        {
-            UpdateActivity(model, activity);
+    /// <summary>
+    /// Updates the activity when the view model is validated.
+    /// </summary>
+    protected virtual Task UpdateActivityAsync(TEditViewModel model, TActivity activity)
+    {
+        UpdateActivity(model, activity);
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
+    }
 
-        /// <summary>
-        /// Updates the activity when the view model is validated.
-        /// </summary>
-        protected virtual void UpdateActivity(TEditViewModel model, TActivity activity)
-        {
-        }
+    /// <summary>
+    /// Updates the activity when the view model is validated.
+    /// </summary>
+    protected virtual void UpdateActivity(TEditViewModel model, TActivity activity)
+    {
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/ActivityExtensions.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/ActivityExtensions.cs
index 7cfe4fa2091..469ae4b3049 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/ActivityExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/ActivityExtensions.cs
@@ -4,40 +4,39 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Helpers
+namespace OrchardCore.Workflows.Helpers;
+
+public static class ActivityExtensions
 {
-    public static class ActivityExtensions
+    public static bool IsEvent(this IActivity activity)
     {
-        public static bool IsEvent(this IActivity activity)
-        {
-            return activity is IEvent;
-        }
+        return activity is IEvent;
+    }
 
-        public static LocalizedHtmlString GetTitleOrDefault(this IActivity activity, Func<LocalizedHtmlString> defaultTitle)
-        {
-            var title = activity.As<ActivityMetadata>().Title;
+    public static LocalizedHtmlString GetTitleOrDefault(this IActivity activity, Func<LocalizedHtmlString> defaultTitle)
+    {
+        var title = activity.As<ActivityMetadata>().Title;
 
-            // A string used in LocalizedHtmlString won't be encoded so it needs to be pre-encoded.
-            // Passing the title as an argument so it uses the HtmlEncoder when rendered
-            // Another options would be to use new LocalizedHtmlString(Html.Encode(title)) but it's not available in the current context
+        // A string used in LocalizedHtmlString won't be encoded so it needs to be pre-encoded.
+        // Passing the title as an argument so it uses the HtmlEncoder when rendered
+        // Another options would be to use new LocalizedHtmlString(Html.Encode(title)) but it's not available in the current context
 
-            return !string.IsNullOrEmpty(title) ? new LocalizedHtmlString(nameof(ActivityExtensions.GetTitleOrDefault), "{0}", false, title) : defaultTitle();
-        }
+        return !string.IsNullOrEmpty(title) ? new LocalizedHtmlString(nameof(ActivityExtensions.GetTitleOrDefault), "{0}", false, title) : defaultTitle();
+    }
 
-        public static LocalizedHtmlString GetLocalizedStatus(this IHtmlLocalizer H, WorkflowStatus status)
+    public static LocalizedHtmlString GetLocalizedStatus(this IHtmlLocalizer H, WorkflowStatus status)
+    {
+        return status switch
         {
-            return status switch
-            {
-                WorkflowStatus.Aborted => H["Aborted"],
-                WorkflowStatus.Executing => H["Executing"],
-                WorkflowStatus.Faulted => H["Faulted"],
-                WorkflowStatus.Finished => H["Finished"],
-                WorkflowStatus.Halted => H["Halted"],
-                WorkflowStatus.Idle => H["Idle"],
-                WorkflowStatus.Resuming => H["Resuming"],
-                WorkflowStatus.Starting => H["Starting"],
-                _ => throw new NotSupportedException(),
-            };
-        }
+            WorkflowStatus.Aborted => H["Aborted"],
+            WorkflowStatus.Executing => H["Executing"],
+            WorkflowStatus.Faulted => H["Faulted"],
+            WorkflowStatus.Finished => H["Finished"],
+            WorkflowStatus.Halted => H["Halted"],
+            WorkflowStatus.Idle => H["Idle"],
+            WorkflowStatus.Resuming => H["Resuming"],
+            WorkflowStatus.Starting => H["Starting"],
+            _ => throw new NotSupportedException(),
+        };
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/DictionaryExtensions.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/DictionaryExtensions.cs
index fda94622fd8..7f93906a95d 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/DictionaryExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/DictionaryExtensions.cs
@@ -1,44 +1,43 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Workflows.Helpers
+namespace OrchardCore.Workflows.Helpers;
+
+public static class DictionaryExtensions
 {
-    public static class DictionaryExtensions
+    /// <summary>
+    /// Safely tries and returns a value by the specified key. If the specified key does not exist, null is returned.
+    /// </summary>
+    public static TValue GetValue<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key)
     {
-        /// <summary>
-        /// Safely tries and returns a value by the specified key. If the specified key does not exist, null is returned.
-        /// </summary>
-        public static TValue GetValue<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key)
-        {
-            return dictionary.TryGetValue(key, out var value) ? value : default;
-        }
-
-        /// <summary>
-        /// Safely tries and returns a value by the specified key. If the specified key does not exist, null is returned.
-        /// </summary>
-        public static TValue GetValue<TValue>(this IDictionary<string, object> dictionary, string key)
-        {
-            var value = dictionary.GetValue(key);
+        return dictionary.TryGetValue(key, out var value) ? value : default;
+    }
 
-            if (value == null)
-            {
-                return default;
-            }
+    /// <summary>
+    /// Safely tries and returns a value by the specified key. If the specified key does not exist, null is returned.
+    /// </summary>
+    public static TValue GetValue<TValue>(this IDictionary<string, object> dictionary, string key)
+    {
+        var value = dictionary.GetValue(key);
 
-            return (TValue)value;
+        if (value == null)
+        {
+            return default;
         }
 
-        /// <summary>
-        /// Merges the specified other dictionary into this dictionary.
-        /// Existing entries are overwritten.
-        /// </summary>
-        public static IDictionary<TKey, TValue> Merge<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, IDictionary<TKey, TValue> other)
+        return (TValue)value;
+    }
+
+    /// <summary>
+    /// Merges the specified other dictionary into this dictionary.
+    /// Existing entries are overwritten.
+    /// </summary>
+    public static IDictionary<TKey, TValue> Merge<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, IDictionary<TKey, TValue> other)
+    {
+        var copy = new Dictionary<TKey, TValue>(dictionary);
+        foreach (var item in other)
         {
-            var copy = new Dictionary<TKey, TValue>(dictionary);
-            foreach (var item in other)
-            {
-                copy[item.Key] = item.Value;
-            }
-            return copy;
+            copy[item.Key] = item.Value;
         }
+        return copy;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/DistributedLockExtensions.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/DistributedLockExtensions.cs
index ae80c3e9ce2..3d339fc2c33 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/DistributedLockExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/DistributedLockExtensions.cs
@@ -4,47 +4,46 @@
 using OrchardCore.Locking.Distributed;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Helpers
+namespace OrchardCore.Workflows.Helpers;
+
+public static class DistributedLockExtensions
 {
-    public static class DistributedLockExtensions
+    /// <summary>
+    /// Tries to acquire a lock before resuming this workflow instance, but only
+    /// if it is an atomic workflow, otherwise returns true with a null locker.
+    /// </summary>
+    public static Task<(ILocker locker, bool locked)> TryAcquireWorkflowLockAsync(
+        this IDistributedLock distributedLock,
+        Workflow workflow)
     {
-        /// <summary>
-        /// Tries to acquire a lock before resuming this workflow instance, but only
-        /// if it is an atomic workflow, otherwise returns true with a null locker.
-        /// </summary>
-        public static Task<(ILocker locker, bool locked)> TryAcquireWorkflowLockAsync(
-            this IDistributedLock distributedLock,
-            Workflow workflow)
+        if (workflow.IsAtomic)
         {
-            if (workflow.IsAtomic)
-            {
-                return distributedLock.TryAcquireLockAsync(
-                    "WFI_" + workflow.WorkflowId + "_LOCK",
-                    TimeSpan.FromMilliseconds(workflow.LockTimeout),
-                    TimeSpan.FromMilliseconds(workflow.LockExpiration));
-            }
-
-            return Task.FromResult<(ILocker, bool)>((null, true));
+            return distributedLock.TryAcquireLockAsync(
+                "WFI_" + workflow.WorkflowId + "_LOCK",
+                TimeSpan.FromMilliseconds(workflow.LockTimeout),
+                TimeSpan.FromMilliseconds(workflow.LockExpiration));
         }
 
-        /// <summary>
-        /// Tries to acquire a lock before starting an instance of this workflow type, if it is
-        /// a singleton or if the event is exclusive, otherwise returns true with a null locker.
-        /// </summary>
-        public static Task<(ILocker locker, bool locked)> TryAcquireWorkflowTypeLockAsync(
-            this IDistributedLock distributedLock,
-            WorkflowType workflowType,
-            bool isExclusiveEvent = false)
-        {
-            if (workflowType.IsSingleton || isExclusiveEvent)
-            {
-                return distributedLock.TryAcquireLockAsync(
-                    "WFT_" + workflowType.WorkflowTypeId + "_LOCK",
-                    TimeSpan.FromMilliseconds(20_000),
-                    TimeSpan.FromMilliseconds(20_000));
-            }
+        return Task.FromResult<(ILocker, bool)>((null, true));
+    }
 
-            return Task.FromResult<(ILocker, bool)>((null, true));
+    /// <summary>
+    /// Tries to acquire a lock before starting an instance of this workflow type, if it is
+    /// a singleton or if the event is exclusive, otherwise returns true with a null locker.
+    /// </summary>
+    public static Task<(ILocker locker, bool locked)> TryAcquireWorkflowTypeLockAsync(
+        this IDistributedLock distributedLock,
+        WorkflowType workflowType,
+        bool isExclusiveEvent = false)
+    {
+        if (workflowType.IsSingleton || isExclusiveEvent)
+        {
+            return distributedLock.TryAcquireLockAsync(
+                "WFT_" + workflowType.WorkflowTypeId + "_LOCK",
+                TimeSpan.FromMilliseconds(20_000),
+                TimeSpan.FromMilliseconds(20_000));
         }
+
+        return Task.FromResult<(ILocker, bool)>((null, true));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/ListExtensions.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/ListExtensions.cs
index 183d3bd885b..db9835e2a9a 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/ListExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/ListExtensions.cs
@@ -1,23 +1,22 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.Workflows.Helpers
+namespace OrchardCore.Workflows.Helpers;
+
+public static class ListExtensions
 {
-    public static class ListExtensions
+    public static void AddRange<T>(this IList<T> list, IEnumerable<T> items)
     {
-        public static void AddRange<T>(this IList<T> list, IEnumerable<T> items)
+        foreach (var item in items)
         {
-            foreach (var item in items)
-            {
-                list.Add(item);
-            }
+            list.Add(item);
         }
+    }
 
-        public static void RemoveRange<T>(this IList<T> list, IEnumerable<T> items)
+    public static void RemoveRange<T>(this IList<T> list, IEnumerable<T> items)
+    {
+        foreach (var item in items)
         {
-            foreach (var item in items)
-            {
-                list.Remove(item);
-            }
+            list.Remove(item);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/ServiceCollectionExtensions.cs
index 2178256c3d0..0f3dd65f49b 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Helpers/ServiceCollectionExtensions.cs
@@ -3,13 +3,12 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.Options;
 
-namespace OrchardCore.Workflows.Helpers
+namespace OrchardCore.Workflows.Helpers;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    public static void AddActivity<TActivity, TDriver>(this IServiceCollection services) where TActivity : class, IActivity where TDriver : class, IDisplayDriver<IActivity>
     {
-        public static void AddActivity<TActivity, TDriver>(this IServiceCollection services) where TActivity : class, IActivity where TDriver : class, IDisplayDriver<IActivity>
-        {
-            services.Configure<WorkflowOptions>(options => options.RegisterActivity<TActivity, TDriver>());
-        }
+        services.Configure<WorkflowOptions>(options => options.RegisterActivity<TActivity, TDriver>());
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/ActivityContext.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/ActivityContext.cs
index a754686e02f..5cf1b660cd7 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/ActivityContext.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/ActivityContext.cs
@@ -1,10 +1,9 @@
 using OrchardCore.Workflows.Activities;
 
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public class ActivityContext
 {
-    public class ActivityContext
-    {
-        public ActivityRecord ActivityRecord { get; set; }
-        public IActivity Activity { get; set; }
-    }
+    public ActivityRecord ActivityRecord { get; set; }
+    public IActivity Activity { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/ActivityMetadata.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/ActivityMetadata.cs
index 6e577acba4c..212a49adb44 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/ActivityMetadata.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/ActivityMetadata.cs
@@ -1,13 +1,12 @@
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+/// <summary>
+/// Provides additional information about an activity.
+/// </summary>
+public class ActivityMetadata
 {
     /// <summary>
-    /// Provides additional information about an activity.
+    /// A custom title that can be set by the user.
     /// </summary>
-    public class ActivityMetadata
-    {
-        /// <summary>
-        /// A custom title that can be set by the user.
-        /// </summary>
-        public string Title { get; set; }
-    }
+    public string Title { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/ActivityRecord.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/ActivityRecord.cs
index 807a6219b24..8dec9678dc6 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/ActivityRecord.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/ActivityRecord.cs
@@ -1,29 +1,28 @@
 using OrchardCore.Entities;
 
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public class ActivityRecord : Entity
 {
-    public class ActivityRecord : Entity
-    {
-        public string ActivityId { get; set; }
+    public string ActivityId { get; set; }
 
-        /// <summary>
-        /// The type of the activity.
-        /// </summary>
-        public string Name { get; set; }
+    /// <summary>
+    /// The type of the activity.
+    /// </summary>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// The left coordinate of the activity.
-        /// </summary>
-        public int X { get; set; }
+    /// <summary>
+    /// The left coordinate of the activity.
+    /// </summary>
+    public int X { get; set; }
 
-        /// <summary>
-        /// The top coordinate of the activity.
-        /// </summary>
-        public int Y { get; set; }
+    /// <summary>
+    /// The top coordinate of the activity.
+    /// </summary>
+    public int Y { get; set; }
 
-        /// <summary>
-        /// Whether the activity is a start state for a <see cref="WorkflowType"/>.
-        /// </summary>
-        public bool IsStart { get; set; }
-    }
+    /// <summary>
+    /// Whether the activity is a start state for a <see cref="WorkflowType"/>.
+    /// </summary>
+    public bool IsStart { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/BlockingActivity.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/BlockingActivity.cs
index c739292e41b..554c0b334d6 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/BlockingActivity.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/BlockingActivity.cs
@@ -1,19 +1,18 @@
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public class BlockingActivity
 {
-    public class BlockingActivity
+    public static BlockingActivity FromActivity(ActivityRecord activity)
     {
-        public static BlockingActivity FromActivity(ActivityRecord activity)
+        return new BlockingActivity
         {
-            return new BlockingActivity
-            {
-                ActivityId = activity.ActivityId,
-                IsStart = activity.IsStart,
-                Name = activity.Name
-            };
-        }
-
-        public string ActivityId { get; set; }
-        public bool IsStart { get; set; }
-        public string Name { get; set; }
+            ActivityId = activity.ActivityId,
+            IsStart = activity.IsStart,
+            Name = activity.Name
+        };
     }
+
+    public string ActivityId { get; set; }
+    public bool IsStart { get; set; }
+    public string Name { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/ExecutedActivity.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/ExecutedActivity.cs
index a623f0195e4..901834371cf 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/ExecutedActivity.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/ExecutedActivity.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public class ExecutedActivity
 {
-    public class ExecutedActivity
-    {
-        public string ActivityId { get; set; }
-        public string Outcome { get; set; }
-    }
+    public string ActivityId { get; set; }
+    public string Outcome { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/Outcome.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/Outcome.cs
index dad5d647439..dbbba8f3f3d 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/Outcome.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/Outcome.cs
@@ -2,23 +2,22 @@
 using Microsoft.Extensions.Localization;
 using OrchardCore.Workflows.Abstractions.Converters;
 
-namespace OrchardCore.Workflows.Abstractions.Models
+namespace OrchardCore.Workflows.Abstractions.Models;
+
+public class Outcome
 {
-    public class Outcome
+    public Outcome(LocalizedString displayName) : this(displayName.Name, displayName)
     {
-        public Outcome(LocalizedString displayName) : this(displayName.Name, displayName)
-        {
-        }
+    }
 
-        public Outcome(string name, LocalizedString displayName)
-        {
-            Name = name;
-            DisplayName = displayName;
-        }
+    public Outcome(string name, LocalizedString displayName)
+    {
+        Name = name;
+        DisplayName = displayName;
+    }
 
-        public string Name { get; }
+    public string Name { get; }
 
-        [JsonConverter(typeof(LocalizedStringConverter))]
-        public LocalizedString DisplayName { get; }
-    }
+    [JsonConverter(typeof(LocalizedStringConverter))]
+    public LocalizedString DisplayName { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/Transition.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/Transition.cs
index 743309250c2..f4059ec3861 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/Transition.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/Transition.cs
@@ -1,25 +1,24 @@
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+/// <summary>
+/// Represents a transition between two activities.
+/// </summary>
+public class Transition
 {
+    public int Id { get; set; }
+
     /// <summary>
-    /// Represents a transition between two activities.
+    /// The source <see cref="ActivityRecord.ActivityId"/>.
     /// </summary>
-    public class Transition
-    {
-        public int Id { get; set; }
+    public string SourceActivityId { get; set; }
 
-        /// <summary>
-        /// The source <see cref="ActivityRecord.ActivityId"/>.
-        /// </summary>
-        public string SourceActivityId { get; set; }
-
-        /// <summary>
-        /// The name of the outcome on the source <see cref="ActivityRecord"/>.
-        /// </summary>
-        public string SourceOutcomeName { get; set; }
+    /// <summary>
+    /// The name of the outcome on the source <see cref="ActivityRecord"/>.
+    /// </summary>
+    public string SourceOutcomeName { get; set; }
 
-        /// <summary>
-        /// The destination <see cref="ActivityRecord.ActivityId"/>.
-        /// </summary>
-        public string DestinationActivityId { get; set; }
-    }
+    /// <summary>
+    /// The destination <see cref="ActivityRecord.ActivityId"/>.
+    /// </summary>
+    public string DestinationActivityId { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/Workflow.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/Workflow.cs
index 00f3169bce4..f8b2220ebce 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/Workflow.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/Workflow.cs
@@ -2,56 +2,55 @@
 using System.Collections.Generic;
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+/// <summary>
+/// Represents a workflow instance.
+/// </summary>
+public class Workflow
 {
+    public long Id { get; set; }
+
+    /// <summary>
+    /// A unique identifier for this workflow.
+    /// </summary>
+    public string WorkflowId { get; set; }
+
+    public string WorkflowTypeId { get; set; }
+
+    /// <summary>
+    /// The correlation ID can be used to resume workflows that are associated with specific objects, such as content items.
+    /// </summary>
+    public string CorrelationId { get; set; }
+
+    /// <summary>
+    /// Serialized state of the workflow.
+    /// </summary>
+    public JsonObject State { get; set; } = [];
+
+    public WorkflowStatus Status { get; set; }
+    public string FaultMessage { get; set; }
+
+    /// <summary>
+    /// The timeout in milliseconds to acquire a lock before resuming this workflow instance.
+    /// </summary>
+    public int LockTimeout { get; set; }
+
+    /// <summary>
+    /// The expiration in milliseconds of the lock acquired before resuming this workflow instance.
+    /// </summary>
+    public int LockExpiration { get; set; }
+
+    /// <summary>
+    /// List of activities the current workflow instance is waiting on
+    /// for continuing its process.
+    /// </summary>
+    public IList<BlockingActivity> BlockingActivities { get; init; } = [];
+
+    public DateTime CreatedUtc { get; set; }
+
     /// <summary>
-    /// Represents a workflow instance.
+    /// Whether this workflow instance needs to be resumed atomically.
     /// </summary>
-    public class Workflow
-    {
-        public long Id { get; set; }
-
-        /// <summary>
-        /// A unique identifier for this workflow.
-        /// </summary>
-        public string WorkflowId { get; set; }
-
-        public string WorkflowTypeId { get; set; }
-
-        /// <summary>
-        /// The correlation ID can be used to resume workflows that are associated with specific objects, such as content items.
-        /// </summary>
-        public string CorrelationId { get; set; }
-
-        /// <summary>
-        /// Serialized state of the workflow.
-        /// </summary>
-        public JsonObject State { get; set; } = [];
-
-        public WorkflowStatus Status { get; set; }
-        public string FaultMessage { get; set; }
-
-        /// <summary>
-        /// The timeout in milliseconds to acquire a lock before resuming this workflow instance.
-        /// </summary>
-        public int LockTimeout { get; set; }
-
-        /// <summary>
-        /// The expiration in milliseconds of the lock acquired before resuming this workflow instance.
-        /// </summary>
-        public int LockExpiration { get; set; }
-
-        /// <summary>
-        /// List of activities the current workflow instance is waiting on
-        /// for continuing its process.
-        /// </summary>
-        public IList<BlockingActivity> BlockingActivities { get; init; } = [];
-
-        public DateTime CreatedUtc { get; set; }
-
-        /// <summary>
-        /// Whether this workflow instance needs to be resumed atomically.
-        /// </summary>
-        public bool IsAtomic => LockTimeout > 0 && LockExpiration > 0;
-    }
+    public bool IsAtomic => LockTimeout > 0 && LockExpiration > 0;
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowContext.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowContext.cs
index e7e8eaf461c..1233c946d51 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowContext.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowContext.cs
@@ -1,12 +1,11 @@
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public class WorkflowContext
 {
-    public class WorkflowContext
+    public WorkflowContext(Workflow workflow)
     {
-        public WorkflowContext(Workflow workflow)
-        {
-            Workflow = workflow;
-        }
-
-        public Workflow Workflow { get; }
+        Workflow = workflow;
     }
+
+    public Workflow Workflow { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowCreatedContext.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowCreatedContext.cs
index 23a3f70f875..01fc050cbc2 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowCreatedContext.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowCreatedContext.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public class WorkflowCreatedContext : WorkflowContext
 {
-    public class WorkflowCreatedContext : WorkflowContext
+    public WorkflowCreatedContext(Workflow workflow) : base(workflow)
     {
-        public WorkflowCreatedContext(Workflow workflow) : base(workflow)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowDeletedContext.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowDeletedContext.cs
index 9a1416e989a..ee8695a99f0 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowDeletedContext.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowDeletedContext.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public class WorkflowDeletedContext : WorkflowContext
 {
-    public class WorkflowDeletedContext : WorkflowContext
+    public WorkflowDeletedContext(Workflow workflow) : base(workflow)
     {
-        public WorkflowDeletedContext(Workflow workflow) : base(workflow)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExecutionContext.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExecutionContext.cs
index 33fe357f6e0..e04195aa994 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExecutionContext.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExecutionContext.cs
@@ -2,124 +2,123 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public class WorkflowExecutionContext
 {
-    public class WorkflowExecutionContext
+    public WorkflowExecutionContext
+    (
+        WorkflowType workflowType,
+        Workflow workflow,
+        IDictionary<string, object> input,
+        IDictionary<string, object> output,
+        IDictionary<string, object> properties,
+        IList<ExecutedActivity> executedActivities,
+        object lastResult,
+        IEnumerable<ActivityContext> activities
+    )
     {
-        public WorkflowExecutionContext
-        (
-            WorkflowType workflowType,
-            Workflow workflow,
-            IDictionary<string, object> input,
-            IDictionary<string, object> output,
-            IDictionary<string, object> properties,
-            IList<ExecutedActivity> executedActivities,
-            object lastResult,
-            IEnumerable<ActivityContext> activities
-        )
-        {
-            Input = input ?? new Dictionary<string, object>();
-            Output = output ?? new Dictionary<string, object>();
-            Properties = properties ?? new Dictionary<string, object>();
-            ExecutedActivities = new Stack<ExecutedActivity>(executedActivities ?? []);
-            LastResult = lastResult;
-            WorkflowType = workflowType;
-            Workflow = workflow;
-            Activities = activities.ToDictionary(x => x.ActivityRecord.ActivityId);
-        }
+        Input = input ?? new Dictionary<string, object>();
+        Output = output ?? new Dictionary<string, object>();
+        Properties = properties ?? new Dictionary<string, object>();
+        ExecutedActivities = new Stack<ExecutedActivity>(executedActivities ?? []);
+        LastResult = lastResult;
+        WorkflowType = workflowType;
+        Workflow = workflow;
+        Activities = activities.ToDictionary(x => x.ActivityRecord.ActivityId);
+    }
 
-        public Workflow Workflow { get; }
-        public WorkflowType WorkflowType { get; }
-        public IDictionary<string, ActivityContext> Activities { get; }
+    public Workflow Workflow { get; }
+    public WorkflowType WorkflowType { get; }
+    public IDictionary<string, ActivityContext> Activities { get; }
 
-        public string WorkflowId
-        {
-            get => Workflow.WorkflowId;
-        }
+    public string WorkflowId
+    {
+        get => Workflow.WorkflowId;
+    }
 
-        public string CorrelationId
-        {
-            get => Workflow.CorrelationId;
-            set => Workflow.CorrelationId = value;
-        }
+    public string CorrelationId
+    {
+        get => Workflow.CorrelationId;
+        set => Workflow.CorrelationId = value;
+    }
 
-        /// <summary>
-        /// A dictionary of re-hydrated values provided by the initiator of the workflow.
-        /// </summary>
-        public IDictionary<string, object> Input { get; }
+    /// <summary>
+    /// A dictionary of re-hydrated values provided by the initiator of the workflow.
+    /// </summary>
+    public IDictionary<string, object> Input { get; }
 
-        /// <summary>
-        /// A dictionary of re-hydrated values provided to the initiator of the workflow.
-        /// </summary>
-        public IDictionary<string, object> Output { get; }
+    /// <summary>
+    /// A dictionary of re-hydrated values provided to the initiator of the workflow.
+    /// </summary>
+    public IDictionary<string, object> Output { get; }
 
-        /// <summary>
-        /// A dictionary of re-hydrated values provided by the workflow activities.
-        /// </summary>
-        public IDictionary<string, object> Properties { get; }
+    /// <summary>
+    /// A dictionary of re-hydrated values provided by the workflow activities.
+    /// </summary>
+    public IDictionary<string, object> Properties { get; }
 
-        /// <summary>
-        /// The value returned from the previous activity, if any.
-        /// </summary>
-        public object LastResult { get; set; }
+    /// <summary>
+    /// The value returned from the previous activity, if any.
+    /// </summary>
+    public object LastResult { get; set; }
 
-        public WorkflowStatus Status
-        {
-            get => Workflow.Status;
-            set => Workflow.Status = value;
-        }
+    public WorkflowStatus Status
+    {
+        get => Workflow.Status;
+        set => Workflow.Status = value;
+    }
 
-        /// <summary>
-        /// Keeps track of which activities executed in which order.
-        /// </summary>
-        public Stack<ExecutedActivity> ExecutedActivities { get; set; }
+    /// <summary>
+    /// Keeps track of which activities executed in which order.
+    /// </summary>
+    public Stack<ExecutedActivity> ExecutedActivities { get; set; }
 
-        public ActivityContext GetActivity(string activityId)
-        {
-            return Activities[activityId];
-        }
+    public ActivityContext GetActivity(string activityId)
+    {
+        return Activities[activityId];
+    }
 
-        public void Fault(Exception exception, ActivityContext _)
-        {
-            Workflow.Status = WorkflowStatus.Faulted;
-            Workflow.FaultMessage = exception.Message;
-        }
+    public void Fault(Exception exception, ActivityContext _)
+    {
+        Workflow.Status = WorkflowStatus.Faulted;
+        Workflow.FaultMessage = exception.Message;
+    }
 
-        public IEnumerable<Transition> GetInboundTransitions(string activityId)
-        {
-            return WorkflowType.Transitions.Where(x => x.DestinationActivityId == activityId).ToList();
-        }
+    public IEnumerable<Transition> GetInboundTransitions(string activityId)
+    {
+        return WorkflowType.Transitions.Where(x => x.DestinationActivityId == activityId).ToList();
+    }
 
-        public IEnumerable<Transition> GetOutboundTransitions(string activityId)
-        {
-            return WorkflowType.Transitions.Where(x => x.SourceActivityId == activityId).ToList();
-        }
+    public IEnumerable<Transition> GetOutboundTransitions(string activityId)
+    {
+        return WorkflowType.Transitions.Where(x => x.SourceActivityId == activityId).ToList();
+    }
 
-        /// <summary>
-        /// Returns the full path of incoming activities.
-        /// </summary>
-        public IEnumerable<string> GetInboundActivityPath(string activityId)
-        {
-            return GetInboundActivityPathInternal(activityId, activityId).Distinct().ToList();
-        }
+    /// <summary>
+    /// Returns the full path of incoming activities.
+    /// </summary>
+    public IEnumerable<string> GetInboundActivityPath(string activityId)
+    {
+        return GetInboundActivityPathInternal(activityId, activityId).Distinct().ToList();
+    }
 
-        private IEnumerable<string> GetInboundActivityPathInternal(string activityId, string startingPointActivityId)
+    private IEnumerable<string> GetInboundActivityPathInternal(string activityId, string startingPointActivityId)
+    {
+        foreach (var transition in GetInboundTransitions(activityId))
         {
-            foreach (var transition in GetInboundTransitions(activityId))
+            // Circuit breaker: Detect workflows that implement repeating flows to prevent an infinite loop here.
+            if (transition.SourceActivityId == startingPointActivityId)
             {
-                // Circuit breaker: Detect workflows that implement repeating flows to prevent an infinite loop here.
-                if (transition.SourceActivityId == startingPointActivityId)
-                {
-                    yield break;
-                }
-                else
-                {
-                    yield return transition.SourceActivityId;
+                yield break;
+            }
+            else
+            {
+                yield return transition.SourceActivityId;
 
-                    foreach (var parentActivityId in GetInboundActivityPathInternal(transition.SourceActivityId, startingPointActivityId).Distinct())
-                    {
-                        yield return parentActivityId;
-                    }
+                foreach (var parentActivityId in GetInboundActivityPathInternal(transition.SourceActivityId, startingPointActivityId).Distinct())
+                {
+                    yield return parentActivityId;
                 }
             }
         }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExecutionExpressionContext.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExecutionExpressionContext.cs
index 9314c689f64..0072e2d7a8e 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExecutionExpressionContext.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExecutionExpressionContext.cs
@@ -1,14 +1,13 @@
 using Fluid;
 
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public class WorkflowExecutionExpressionContext : WorkflowExecutionHandlerContextBase
 {
-    public class WorkflowExecutionExpressionContext : WorkflowExecutionHandlerContextBase
+    public WorkflowExecutionExpressionContext(TemplateContext templateContext, WorkflowExecutionContext workflowExecutionContext) : base(workflowExecutionContext)
     {
-        public WorkflowExecutionExpressionContext(TemplateContext templateContext, WorkflowExecutionContext workflowExecutionContext) : base(workflowExecutionContext)
-        {
-            TemplateContext = templateContext;
-        }
-
-        public TemplateContext TemplateContext { get; }
+        TemplateContext = templateContext;
     }
+
+    public TemplateContext TemplateContext { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExecutionHandlerContextBase.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExecutionHandlerContextBase.cs
index 8a07471bc78..94458bac8de 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExecutionHandlerContextBase.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExecutionHandlerContextBase.cs
@@ -1,12 +1,11 @@
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public class WorkflowExecutionHandlerContextBase
 {
-    public class WorkflowExecutionHandlerContextBase
+    protected WorkflowExecutionHandlerContextBase(WorkflowExecutionContext workflowContext)
     {
-        protected WorkflowExecutionHandlerContextBase(WorkflowExecutionContext workflowContext)
-        {
-            WorkflowContext = workflowContext;
-        }
-
-        public WorkflowExecutionContext WorkflowContext { get; }
+        WorkflowContext = workflowContext;
     }
+
+    public WorkflowExecutionContext WorkflowContext { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExecutionScriptContext.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExecutionScriptContext.cs
index 4096dd7a787..a3b8eeeea62 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExecutionScriptContext.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExecutionScriptContext.cs
@@ -1,14 +1,13 @@
 using System.Collections.Generic;
 using OrchardCore.Scripting;
 
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public class WorkflowExecutionScriptContext : WorkflowExecutionHandlerContextBase
 {
-    public class WorkflowExecutionScriptContext : WorkflowExecutionHandlerContextBase
+    public WorkflowExecutionScriptContext(WorkflowExecutionContext workflowContext) : base(workflowContext)
     {
-        public WorkflowExecutionScriptContext(WorkflowExecutionContext workflowContext) : base(workflowContext)
-        {
-        }
-
-        public IList<IGlobalMethodProvider> ScopedMethodProviders { get; init; } = [];
     }
+
+    public IList<IGlobalMethodProvider> ScopedMethodProviders { get; init; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExpression.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExpression.cs
index c22fbc0c70e..da811b6f482 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExpression.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowExpression.cs
@@ -1,21 +1,20 @@
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public class WorkflowExpression<T>
 {
-    public class WorkflowExpression<T>
+    public WorkflowExpression()
     {
-        public WorkflowExpression()
-        {
-        }
+    }
 
-        public WorkflowExpression(string expression)
-        {
-            Expression = expression;
-        }
+    public WorkflowExpression(string expression)
+    {
+        Expression = expression;
+    }
 
-        public string Expression { get; set; }
+    public string Expression { get; set; }
 
-        public override string ToString()
-        {
-            return Expression;
-        }
+    public override string ToString()
+    {
+        return Expression;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowFaultModel.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowFaultModel.cs
index 3bc282641da..e7aaa9bf00a 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowFaultModel.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowFaultModel.cs
@@ -1,16 +1,15 @@
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public class WorkflowFaultModel
 {
-    public class WorkflowFaultModel
-    {
-        public const string WorkflowFaultInputKey = "ErrorInfo";
-        public string WorkflowId { get; set; }
-        public string ActivityId { get; set; }
-        public string ActivityDisplayName { get; set; }
-        public string ActivityTypeName { get; set; }
-        public string ExceptionDetails { get; set; }
-        public string ErrorMessage { get; set; }
-        public string FaultMessage { get; set; }
-        public string WorkflowName { get; set; }
-        public int ExecutedActivityCount { get; set; }
-    }
+    public const string WorkflowFaultInputKey = "ErrorInfo";
+    public string WorkflowId { get; set; }
+    public string ActivityId { get; set; }
+    public string ActivityDisplayName { get; set; }
+    public string ActivityTypeName { get; set; }
+    public string ExceptionDetails { get; set; }
+    public string ErrorMessage { get; set; }
+    public string FaultMessage { get; set; }
+    public string WorkflowName { get; set; }
+    public int ExecutedActivityCount { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowState.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowState.cs
index b5ae0e1904f..d21991443e3 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowState.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowState.cs
@@ -1,42 +1,41 @@
 using System.Collections.Generic;
 using System.Text.Json.Nodes;
 
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+/// <summary>
+/// Represents a workflow's serializable runtime state.
+/// </summary>
+public class WorkflowState
 {
     /// <summary>
-    /// Represents a workflow's serializable runtime state.
+    /// The stack of values pushed onto by individual activities.
+    /// Can be used by subsequent activities to pop the last value and do something with it.
     /// </summary>
-    public class WorkflowState
-    {
-        /// <summary>
-        /// The stack of values pushed onto by individual activities.
-        /// Can be used by subsequent activities to pop the last value and do something with it.
-        /// </summary>
-        public object LastResult { get; set; }
+    public object LastResult { get; set; }
 
-        /// <summary>
-        /// A dictionary of input values provided by the caller of the workflow.
-        /// </summary>
-        public IDictionary<string, object> Input { get; set; } = new Dictionary<string, object>();
+    /// <summary>
+    /// A dictionary of input values provided by the caller of the workflow.
+    /// </summary>
+    public IDictionary<string, object> Input { get; set; } = new Dictionary<string, object>();
 
-        /// <summary>
-        /// A dictionary of output values provided by activities of the workflow.
-        /// </summary>
-        public IDictionary<string, object> Output { get; set; } = new Dictionary<string, object>();
+    /// <summary>
+    /// A dictionary of output values provided by activities of the workflow.
+    /// </summary>
+    public IDictionary<string, object> Output { get; set; } = new Dictionary<string, object>();
 
-        /// <summary>
-        /// A dictionary of values that activities within a running workflow can read and write information from and to.
-        /// </summary>
-        public IDictionary<string, object> Properties { get; set; } = new Dictionary<string, object>();
+    /// <summary>
+    /// A dictionary of values that activities within a running workflow can read and write information from and to.
+    /// </summary>
+    public IDictionary<string, object> Properties { get; set; } = new Dictionary<string, object>();
 
-        /// <summary>
-        /// A dictionary of activity states. Each entry contains runtime state for a particular activity.
-        /// </summary>
-        public IDictionary<string, JsonObject> ActivityStates { get; set; } = new Dictionary<string, JsonObject>();
+    /// <summary>
+    /// A dictionary of activity states. Each entry contains runtime state for a particular activity.
+    /// </summary>
+    public IDictionary<string, JsonObject> ActivityStates { get; set; } = new Dictionary<string, JsonObject>();
 
-        /// <summary>
-        /// The list of executed activities.
-        /// </summary>
-        public IList<ExecutedActivity> ExecutedActivities { get; set; } = [];
-    }
+    /// <summary>
+    /// The list of executed activities.
+    /// </summary>
+    public IList<ExecutedActivity> ExecutedActivities { get; set; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowStatus.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowStatus.cs
index 75296cc7de1..e52fe515a0a 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowStatus.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowStatus.cs
@@ -1,14 +1,13 @@
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public enum WorkflowStatus
 {
-    public enum WorkflowStatus
-    {
-        Idle,
-        Starting,
-        Resuming,
-        Executing,
-        Halted,
-        Finished,
-        Faulted,
-        Aborted
-    }
+    Idle,
+    Starting,
+    Resuming,
+    Executing,
+    Halted,
+    Finished,
+    Faulted,
+    Aborted
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowType.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowType.cs
index f9e0f3f5e45..0154426a84a 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowType.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowType.cs
@@ -1,58 +1,57 @@
 using System.Collections.Generic;
 using OrchardCore.Entities;
 
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+/// <summary>
+/// Represents a workflow type.
+/// </summary>
+public class WorkflowType : Entity
 {
+    public long Id { get; set; }
+
+    /// <summary>
+    /// A unique identifier for this workflow type.
+    /// </summary>
+    public string WorkflowTypeId { get; set; }
+
+    /// <summary>
+    /// The name of this workflow type.
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Whether this workflow definition is enabled or not.
+    /// </summary>
+    public bool IsEnabled { get; set; }
+
+    /// <summary>
+    /// Controls whether this workflow can spawn one or multiple instances.
+    /// </summary>
+    public bool IsSingleton { get; set; }
+
     /// <summary>
-    /// Represents a workflow type.
-    /// </summary>
-    public class WorkflowType : Entity
-    {
-        public long Id { get; set; }
-
-        /// <summary>
-        /// A unique identifier for this workflow type.
-        /// </summary>
-        public string WorkflowTypeId { get; set; }
-
-        /// <summary>
-        /// The name of this workflow type.
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Whether this workflow definition is enabled or not.
-        /// </summary>
-        public bool IsEnabled { get; set; }
-
-        /// <summary>
-        /// Controls whether this workflow can spawn one or multiple instances.
-        /// </summary>
-        public bool IsSingleton { get; set; }
-
-        /// <summary>
-        /// The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type.
-        /// </summary>
-        public int LockTimeout { get; set; }
-
-        /// <summary>
-        /// The expiration in milliseconds of the lock acquired before resuming a workflow instance of this type.
-        /// </summary>
-        public int LockExpiration { get; set; }
-
-        /// <summary>
-        /// Controls whether workflow instances will be deleted upon completion.
-        /// </summary>
-        public bool DeleteFinishedWorkflows { get; set; }
-
-        /// <summary>
-        /// A complete list of all activities that are part of this workflow.
-        /// </summary>
-        public IList<ActivityRecord> Activities { get; set; } = [];
-
-        /// <summary>
-        /// A complete list of the transitions between the activities on this workflow.
-        /// </summary>
-        public IList<Transition> Transitions { get; set; } = [];
-    }
+    /// The timeout in milliseconds to acquire a lock before resuming a given workflow instance of this type.
+    /// </summary>
+    public int LockTimeout { get; set; }
+
+    /// <summary>
+    /// The expiration in milliseconds of the lock acquired before resuming a workflow instance of this type.
+    /// </summary>
+    public int LockExpiration { get; set; }
+
+    /// <summary>
+    /// Controls whether workflow instances will be deleted upon completion.
+    /// </summary>
+    public bool DeleteFinishedWorkflows { get; set; }
+
+    /// <summary>
+    /// A complete list of all activities that are part of this workflow.
+    /// </summary>
+    public IList<ActivityRecord> Activities { get; set; } = [];
+
+    /// <summary>
+    /// A complete list of the transitions between the activities on this workflow.
+    /// </summary>
+    public IList<Transition> Transitions { get; set; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowTypeContext.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowTypeContext.cs
index 829d823716c..b238573ffd5 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowTypeContext.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowTypeContext.cs
@@ -1,12 +1,11 @@
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public class WorkflowTypeContext
 {
-    public class WorkflowTypeContext
+    public WorkflowTypeContext(WorkflowType workflowType)
     {
-        public WorkflowTypeContext(WorkflowType workflowType)
-        {
-            WorkflowType = workflowType;
-        }
-
-        public WorkflowType WorkflowType { get; }
+        WorkflowType = workflowType;
     }
+
+    public WorkflowType WorkflowType { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowTypeCreatedContext.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowTypeCreatedContext.cs
index 7ec9fc4b3a9..72aee3bff20 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowTypeCreatedContext.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowTypeCreatedContext.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public class WorkflowTypeCreatedContext : WorkflowTypeContext
 {
-    public class WorkflowTypeCreatedContext : WorkflowTypeContext
+    public WorkflowTypeCreatedContext(WorkflowType workflowType) : base(workflowType)
     {
-        public WorkflowTypeCreatedContext(WorkflowType workflowType) : base(workflowType)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowTypeDeletedContext.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowTypeDeletedContext.cs
index 5be80a63acd..f40279c19f4 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowTypeDeletedContext.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowTypeDeletedContext.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public class WorkflowTypeDeletedContext : WorkflowTypeContext
 {
-    public class WorkflowTypeDeletedContext : WorkflowTypeContext
+    public WorkflowTypeDeletedContext(WorkflowType workflowType) : base(workflowType)
     {
-        public WorkflowTypeDeletedContext(WorkflowType workflowType) : base(workflowType)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowTypeUpdatedContext.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowTypeUpdatedContext.cs
index 5c60e08553c..bad8568e5dc 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowTypeUpdatedContext.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowTypeUpdatedContext.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public class WorkflowTypeUpdatedContext : WorkflowTypeContext
 {
-    public class WorkflowTypeUpdatedContext : WorkflowTypeContext
+    public WorkflowTypeUpdatedContext(WorkflowType workflowType) : base(workflowType)
     {
-        public WorkflowTypeUpdatedContext(WorkflowType workflowType) : base(workflowType)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowUpdatedContext.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowUpdatedContext.cs
index cdc950b7548..ebaf9f8c1da 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowUpdatedContext.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Models/WorkflowUpdatedContext.cs
@@ -1,9 +1,8 @@
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public class WorkflowUpdatedContext : WorkflowContext
 {
-    public class WorkflowUpdatedContext : WorkflowContext
+    public WorkflowUpdatedContext(Workflow workflow) : base(workflow)
     {
-        public WorkflowUpdatedContext(Workflow workflow) : base(workflow)
-        {
-        }
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Options/ActivityRegistration.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Options/ActivityRegistration.cs
index 0ccd9ae4edd..687eec9e072 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Options/ActivityRegistration.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Options/ActivityRegistration.cs
@@ -1,22 +1,21 @@
 using System;
 using System.Collections.Generic;
 
-namespace OrchardCore.Workflows.Options
+namespace OrchardCore.Workflows.Options;
+
+public class ActivityRegistration
 {
-    public class ActivityRegistration
+    public ActivityRegistration(Type activityType)
     {
-        public ActivityRegistration(Type activityType)
-        {
-            ActivityType = activityType;
-            DriverTypes = [];
-        }
-
-        public ActivityRegistration(Type activityType, Type driverType) : this(activityType)
-        {
-            DriverTypes.Add(driverType);
-        }
+        ActivityType = activityType;
+        DriverTypes = [];
+    }
 
-        public Type ActivityType { get; }
-        public HashSet<Type> DriverTypes { get; }
+    public ActivityRegistration(Type activityType, Type driverType) : this(activityType)
+    {
+        DriverTypes.Add(driverType);
     }
+
+    public Type ActivityType { get; }
+    public HashSet<Type> DriverTypes { get; }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Options/WorkflowOptions.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Options/WorkflowOptions.cs
index ce17b9c3c38..1dff6f48472 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Options/WorkflowOptions.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Options/WorkflowOptions.cs
@@ -2,76 +2,75 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OrchardCore.Workflows.Options
+namespace OrchardCore.Workflows.Options;
+
+public class WorkflowOptions
 {
-    public class WorkflowOptions
+    public WorkflowOptions()
     {
-        public WorkflowOptions()
-        {
-            ActivityDictionary = [];
-        }
+        ActivityDictionary = [];
+    }
 
-        /// <summary>
-        /// The set of activities available to workflows.
-        /// Modules can register and unregister activities.
-        /// </summary>
-        private Dictionary<Type, ActivityRegistration> ActivityDictionary { get; }
+    /// <summary>
+    /// The set of activities available to workflows.
+    /// Modules can register and unregister activities.
+    /// </summary>
+    private Dictionary<Type, ActivityRegistration> ActivityDictionary { get; }
 
-        public IEnumerable<Type> ActivityTypes => ActivityDictionary.Values.Select(x => x.ActivityType).ToList().AsReadOnly();
-        public IEnumerable<Type> ActivityDisplayDriverTypes => ActivityDictionary.Values.SelectMany(x => x.DriverTypes).ToList().AsReadOnly();
+    public IEnumerable<Type> ActivityTypes => ActivityDictionary.Values.Select(x => x.ActivityType).ToList().AsReadOnly();
+    public IEnumerable<Type> ActivityDisplayDriverTypes => ActivityDictionary.Values.SelectMany(x => x.DriverTypes).ToList().AsReadOnly();
 
-        public WorkflowOptions RegisterActivity(Type activityType, Type driverType = null)
+    public WorkflowOptions RegisterActivity(Type activityType, Type driverType = null)
+    {
+        if (ActivityDictionary.TryGetValue(activityType, out var value))
         {
-            if (ActivityDictionary.TryGetValue(activityType, out var value))
+            if (driverType != null)
             {
-                if (driverType != null)
-                {
-                    value.DriverTypes.Add(driverType);
-                }
+                value.DriverTypes.Add(driverType);
             }
-            else
-            {
-                ActivityDictionary.Add(activityType, new ActivityRegistration(activityType, driverType));
-            }
-
-            return this;
         }
-
-        public WorkflowOptions UnregisterActivityType(Type activityType)
+        else
         {
-            if (!ActivityDictionary.ContainsKey(activityType))
-                throw new InvalidOperationException("The specified activity type is not registered.");
-
-            ActivityDictionary.Remove(activityType);
-            return this;
+            ActivityDictionary.Add(activityType, new ActivityRegistration(activityType, driverType));
         }
 
-        public bool IsActivityRegistered(Type activityType)
-        {
-            return ActivityDictionary.ContainsKey(activityType);
-        }
+        return this;
     }
 
-    public static class WorkflowOptionsExtensions
+    public WorkflowOptions UnregisterActivityType(Type activityType)
     {
-        public static WorkflowOptions RegisterActivityType<T>(this WorkflowOptions options)
-        {
-            return options.RegisterActivity(typeof(T));
-        }
+        if (!ActivityDictionary.ContainsKey(activityType))
+            throw new InvalidOperationException("The specified activity type is not registered.");
 
-        public static WorkflowOptions RegisterActivity<T, TDriver>(this WorkflowOptions options)
-        {
-            return options.RegisterActivity(typeof(T), typeof(TDriver));
-        }
+        ActivityDictionary.Remove(activityType);
+        return this;
+    }
 
-        public static WorkflowOptions UnregisterActivityType<T>(this WorkflowOptions options)
-        {
-            return options.UnregisterActivityType(typeof(T));
-        }
+    public bool IsActivityRegistered(Type activityType)
+    {
+        return ActivityDictionary.ContainsKey(activityType);
+    }
+}
 
-        public static bool IsActivityRegistered<T>(this WorkflowOptions options)
-        {
-            return options.IsActivityRegistered(typeof(T));
-        }
+public static class WorkflowOptionsExtensions
+{
+    public static WorkflowOptions RegisterActivityType<T>(this WorkflowOptions options)
+    {
+        return options.RegisterActivity(typeof(T));
+    }
+
+    public static WorkflowOptions RegisterActivity<T, TDriver>(this WorkflowOptions options)
+    {
+        return options.RegisterActivity(typeof(T), typeof(TDriver));
+    }
+
+    public static WorkflowOptions UnregisterActivityType<T>(this WorkflowOptions options)
+    {
+        return options.UnregisterActivityType(typeof(T));
+    }
+
+    public static bool IsActivityRegistered<T>(this WorkflowOptions options)
+    {
+        return options.IsActivityRegistered(typeof(T));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IActivityDisplayManager.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IActivityDisplayManager.cs
index 6ecbf9f3811..7536877143b 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IActivityDisplayManager.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IActivityDisplayManager.cs
@@ -1,9 +1,8 @@
 using OrchardCore.DisplayManagement;
 using OrchardCore.Workflows.Activities;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public interface IActivityDisplayManager : IDisplayManager<IActivity>
 {
-    public interface IActivityDisplayManager : IDisplayManager<IActivity>
-    {
-    }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IActivityIdGenerator.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IActivityIdGenerator.cs
index 9b9f2441dfc..d3a8172ade1 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IActivityIdGenerator.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IActivityIdGenerator.cs
@@ -1,9 +1,8 @@
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public interface IActivityIdGenerator
 {
-    public interface IActivityIdGenerator
-    {
-        string GenerateUniqueId(ActivityRecord activityRecord);
-    }
+    string GenerateUniqueId(ActivityRecord activityRecord);
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IActivityLibrary.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IActivityLibrary.cs
index 4685f57b4bc..3717104ca3c 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IActivityLibrary.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IActivityLibrary.cs
@@ -4,59 +4,58 @@
 using OrchardCore.Workflows.Activities;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public interface IActivityLibrary
+{
+    /// <summary>
+    /// Returns a list of instances of all available <see cref="IActivity"/> implementations.
+    /// </summary>
+    IEnumerable<IActivity> ListActivities();
+
+    /// <summary>
+    /// Returns a list of all available activity categories.
+    /// </summary>
+    /// <returns></returns>
+    IEnumerable<LocalizedString> ListCategories();
+
+    /// <summary>
+    /// Returns an activity instance with the specified name from the library.
+    /// </summary>
+    IActivity GetActivityByName(string name);
+
+    /// <summary>
+    /// Returns a new instance of the activity with the specified name.
+    /// </summary>
+    IActivity InstantiateActivity(string name);
+
+    /// <summary>
+    /// Returns new instances the specified activities.
+    /// </summary>
+    IEnumerable<IActivity> InstantiateActivities(IEnumerable<string> activityNames);
+}
+
+public static class ActivityLibraryExtensions
 {
-    public interface IActivityLibrary
+    public static T InstantiateActivity<T>(this IActivityLibrary library, string name) where T : IActivity
     {
-        /// <summary>
-        /// Returns a list of instances of all available <see cref="IActivity"/> implementations.
-        /// </summary>
-        IEnumerable<IActivity> ListActivities();
-
-        /// <summary>
-        /// Returns a list of all available activity categories.
-        /// </summary>
-        /// <returns></returns>
-        IEnumerable<LocalizedString> ListCategories();
-
-        /// <summary>
-        /// Returns an activity instance with the specified name from the library.
-        /// </summary>
-        IActivity GetActivityByName(string name);
-
-        /// <summary>
-        /// Returns a new instance of the activity with the specified name.
-        /// </summary>
-        IActivity InstantiateActivity(string name);
-
-        /// <summary>
-        /// Returns new instances the specified activities.
-        /// </summary>
-        IEnumerable<IActivity> InstantiateActivities(IEnumerable<string> activityNames);
+        return (T)library.InstantiateActivity(name);
     }
 
-    public static class ActivityLibraryExtensions
+    public static T InstantiateActivity<T>(this IActivityLibrary library, string name, JsonObject properties) where T : IActivity
     {
-        public static T InstantiateActivity<T>(this IActivityLibrary library, string name) where T : IActivity
-        {
-            return (T)library.InstantiateActivity(name);
-        }
+        var activity = InstantiateActivity<T>(library, name);
 
-        public static T InstantiateActivity<T>(this IActivityLibrary library, string name, JsonObject properties) where T : IActivity
+        if (activity != null)
         {
-            var activity = InstantiateActivity<T>(library, name);
-
-            if (activity != null)
-            {
-                activity.Properties = properties;
-            }
-
-            return activity;
+            activity.Properties = properties;
         }
 
-        public static T InstantiateActivity<T>(this IActivityLibrary library, ActivityRecord record) where T : IActivity
-        {
-            return InstantiateActivity<T>(library, record.Name, record.Properties);
-        }
+        return activity;
+    }
+
+    public static T InstantiateActivity<T>(this IActivityLibrary library, ActivityRecord record) where T : IActivity
+    {
+        return InstantiateActivity<T>(library, record.Name, record.Properties);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/ISecurityTokenService.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/ISecurityTokenService.cs
index ebc8fa7cb6e..4342eebaae6 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/ISecurityTokenService.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/ISecurityTokenService.cs
@@ -1,17 +1,16 @@
 using System;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public interface ISecurityTokenService
 {
-    public interface ISecurityTokenService
-    {
-        /// <summary>
-        /// Creates a SAS (Shared Access Signature) token containing the specified data.
-        /// </summary>
-        string CreateToken<T>(T payload, TimeSpan lifetime);
+    /// <summary>
+    /// Creates a SAS (Shared Access Signature) token containing the specified data.
+    /// </summary>
+    string CreateToken<T>(T payload, TimeSpan lifetime);
 
-        /// <summary>
-        /// Decrypts the specified SAS token.
-        /// </summary>
-        bool TryDecryptToken<T>(string token, out T payload);
-    }
+    /// <summary>
+    /// Decrypts the specified SAS token.
+    /// </summary>
+    bool TryDecryptToken<T>(string token, out T payload);
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowExecutionContextHandler.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowExecutionContextHandler.cs
index ee9e0f85333..65f24ed77ad 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowExecutionContextHandler.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowExecutionContextHandler.cs
@@ -1,13 +1,12 @@
 using System.Threading.Tasks;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public interface IWorkflowExecutionContextHandler
 {
-    public interface IWorkflowExecutionContextHandler
-    {
-        Task EvaluatingExpressionAsync(WorkflowExecutionExpressionContext context);
-        Task EvaluatingScriptAsync(WorkflowExecutionScriptContext context);
-        Task DehydrateValueAsync(SerializeWorkflowValueContext context);
-        Task RehydrateValueAsync(SerializeWorkflowValueContext context);
-    }
+    Task EvaluatingExpressionAsync(WorkflowExecutionExpressionContext context);
+    Task EvaluatingScriptAsync(WorkflowExecutionScriptContext context);
+    Task DehydrateValueAsync(SerializeWorkflowValueContext context);
+    Task RehydrateValueAsync(SerializeWorkflowValueContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowExpressionEvaluator.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowExpressionEvaluator.cs
index 69f0aa1d9ba..9ddf45a1e55 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowExpressionEvaluator.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowExpressionEvaluator.cs
@@ -2,10 +2,9 @@
 using System.Threading.Tasks;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public interface IWorkflowExpressionEvaluator
 {
-    public interface IWorkflowExpressionEvaluator
-    {
-        Task<T> EvaluateAsync<T>(WorkflowExpression<T> expression, WorkflowExecutionContext workflowContext, TextEncoder encoder);
-    }
+    Task<T> EvaluateAsync<T>(WorkflowExpression<T> expression, WorkflowExecutionContext workflowContext, TextEncoder encoder);
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowFaultHandler.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowFaultHandler.cs
index d92c2441513..a12e25b9ca7 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowFaultHandler.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowFaultHandler.cs
@@ -2,14 +2,13 @@
 using System.Threading.Tasks;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public interface IWorkflowFaultHandler
 {
-    public interface IWorkflowFaultHandler
-    {
-        Task OnWorkflowFaultAsync(
-            IWorkflowManager workflowManager,
-            WorkflowExecutionContext workflowContext,
-            ActivityContext activityContext,
-            Exception exception);
-    }
+    Task OnWorkflowFaultAsync(
+        IWorkflowManager workflowManager,
+        WorkflowExecutionContext workflowContext,
+        ActivityContext activityContext,
+        Exception exception);
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowHandler.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowHandler.cs
index 77ba1e177f7..84483354ef6 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowHandler.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowHandler.cs
@@ -1,12 +1,11 @@
 using System.Threading.Tasks;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public interface IWorkflowHandler
 {
-    public interface IWorkflowHandler
-    {
-        Task CreatedAsync(WorkflowCreatedContext context);
-        Task UpdatedAsync(WorkflowUpdatedContext context);
-        Task DeletedAsync(WorkflowDeletedContext context);
-    }
+    Task CreatedAsync(WorkflowCreatedContext context);
+    Task UpdatedAsync(WorkflowUpdatedContext context);
+    Task DeletedAsync(WorkflowDeletedContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowIdGenerator.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowIdGenerator.cs
index ece273396fb..9c62d019fd3 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowIdGenerator.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowIdGenerator.cs
@@ -1,9 +1,8 @@
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public interface IWorkflowIdGenerator
 {
-    public interface IWorkflowIdGenerator
-    {
-        string GenerateUniqueId(Workflow workflow);
-    }
+    string GenerateUniqueId(Workflow workflow);
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowManager.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowManager.cs
index 78e620e6deb..833f162b7a9 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowManager.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowManager.cs
@@ -6,87 +6,86 @@
 using Microsoft.AspNetCore.Routing;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public interface IWorkflowManager
 {
-    public interface IWorkflowManager
-    {
-        /// <summary>
-        /// Creates a new workflow instance for the specified workflow definition.
-        /// </summary>
-        Workflow NewWorkflow(WorkflowType workflowType, string correlationId = null);
+    /// <summary>
+    /// Creates a new workflow instance for the specified workflow definition.
+    /// </summary>
+    Workflow NewWorkflow(WorkflowType workflowType, string correlationId = null);
 
-        /// <summary>
-        /// Creates a new <see cref="WorkflowExecutionContext"/>.
-        /// </summary>
-        Task<WorkflowExecutionContext> CreateWorkflowExecutionContextAsync(WorkflowType workflowType, Workflow workflow, IDictionary<string, object> input = null);
+    /// <summary>
+    /// Creates a new <see cref="WorkflowExecutionContext"/>.
+    /// </summary>
+    Task<WorkflowExecutionContext> CreateWorkflowExecutionContextAsync(WorkflowType workflowType, Workflow workflow, IDictionary<string, object> input = null);
 
-        /// <summary>
-        /// Creates a new <see cref="ActivityContext"/>.
-        /// </summary>
-        /// <param name="activityRecord"></param>
-        /// <param name="properties"></param>
-        Task<ActivityContext> CreateActivityExecutionContextAsync(ActivityRecord activityRecord, JsonObject properties);
+    /// <summary>
+    /// Creates a new <see cref="ActivityContext"/>.
+    /// </summary>
+    /// <param name="activityRecord"></param>
+    /// <param name="properties"></param>
+    Task<ActivityContext> CreateActivityExecutionContextAsync(ActivityRecord activityRecord, JsonObject properties);
 
-        /// <summary>
-        /// Triggers a specific <see cref="OrchardCore.Workflows.Activities.IEvent"/>.
-        /// </summary>
-        /// <param name="name">The type of the event to trigger, e.g. ContentPublishedEvent.</param>
-        /// <param name="input">An object containing context for the event.</param>
-        /// <param name="correlationId">Optionally specify a application-specific value to associate the workflow instance with. For example, a content item ID.</param>
-        /// <param name="isExclusive">
-        /// If true, a new workflow instance is not created if an existing one is already halted on a starting activity related to this event. False by default.
-        /// </param>
-        /// <param name="isAlwaysCorrelated">
-        /// If true, to be correlated a workflow instance only needs to be halted on an event activity of the related type, regardless the 'correlationId'. False by default.
-        /// </param>
-        Task<IEnumerable<WorkflowExecutionContext>> TriggerEventAsync(string name, IDictionary<string, object> input = null, string correlationId = null, bool isExclusive = false, bool isAlwaysCorrelated = false);
+    /// <summary>
+    /// Triggers a specific <see cref="OrchardCore.Workflows.Activities.IEvent"/>.
+    /// </summary>
+    /// <param name="name">The type of the event to trigger, e.g. ContentPublishedEvent.</param>
+    /// <param name="input">An object containing context for the event.</param>
+    /// <param name="correlationId">Optionally specify a application-specific value to associate the workflow instance with. For example, a content item ID.</param>
+    /// <param name="isExclusive">
+    /// If true, a new workflow instance is not created if an existing one is already halted on a starting activity related to this event. False by default.
+    /// </param>
+    /// <param name="isAlwaysCorrelated">
+    /// If true, to be correlated a workflow instance only needs to be halted on an event activity of the related type, regardless the 'correlationId'. False by default.
+    /// </param>
+    Task<IEnumerable<WorkflowExecutionContext>> TriggerEventAsync(string name, IDictionary<string, object> input = null, string correlationId = null, bool isExclusive = false, bool isAlwaysCorrelated = false);
 
-        /// <summary>
-        /// Starts a new workflow using the specified workflow definition.
-        /// </summary>
-        /// <param name="workflowType">The workflow definition to start.</param>
-        /// <param name="startActivity">If a workflow definition contains multiple start activities, you can specify which one to use. If none specified, the first one will be used.</param>
-        /// <param name="input">Optionally specify any inputs to be used by the workflow.</param>
-        /// <param name="correlationId">Optionally specify an application-specific value to associate the workflow instance with. For example, a content item ID.</param>
-        /// <returns>Returns the created workflow context. Can be used for further inspection of the workflow state.</returns>
-        Task<WorkflowExecutionContext> StartWorkflowAsync(WorkflowType workflowType, ActivityRecord startActivity = null, IDictionary<string, object> input = null, string correlationId = null);
+    /// <summary>
+    /// Starts a new workflow using the specified workflow definition.
+    /// </summary>
+    /// <param name="workflowType">The workflow definition to start.</param>
+    /// <param name="startActivity">If a workflow definition contains multiple start activities, you can specify which one to use. If none specified, the first one will be used.</param>
+    /// <param name="input">Optionally specify any inputs to be used by the workflow.</param>
+    /// <param name="correlationId">Optionally specify an application-specific value to associate the workflow instance with. For example, a content item ID.</param>
+    /// <returns>Returns the created workflow context. Can be used for further inspection of the workflow state.</returns>
+    Task<WorkflowExecutionContext> StartWorkflowAsync(WorkflowType workflowType, ActivityRecord startActivity = null, IDictionary<string, object> input = null, string correlationId = null);
 
-        /// <summary>
-        /// Starts a new workflow using the specified workflow definition.
-        /// </summary>
-        /// <param name="workflowType">The workflow definition to start.</param>
-        /// <param name="input">Optionally specify any inputs to be used by the workflow.</param>
-        /// <param name="correlationId">Optionally specify an application-specific value to associate the workflow instance with. For example, a content item ID.</param>
-        /// <returns>Returns the created workflow context. Can be used for further inspection of the workflow state.</returns>
-        Task<WorkflowExecutionContext> RestartWorkflowAsync(WorkflowType workflowType, IDictionary<string, object> input = null, string correlationId = null);
+    /// <summary>
+    /// Starts a new workflow using the specified workflow definition.
+    /// </summary>
+    /// <param name="workflowType">The workflow definition to start.</param>
+    /// <param name="input">Optionally specify any inputs to be used by the workflow.</param>
+    /// <param name="correlationId">Optionally specify an application-specific value to associate the workflow instance with. For example, a content item ID.</param>
+    /// <returns>Returns the created workflow context. Can be used for further inspection of the workflow state.</returns>
+    Task<WorkflowExecutionContext> RestartWorkflowAsync(WorkflowType workflowType, IDictionary<string, object> input = null, string correlationId = null);
 
-        /// <summary>
-        /// Resumes the specified workflow instance at the specified activity.
-        /// </summary>
-        Task<WorkflowExecutionContext> ResumeWorkflowAsync(Workflow workflow, BlockingActivity awaitingActivity, IDictionary<string, object> input = null);
+    /// <summary>
+    /// Resumes the specified workflow instance at the specified activity.
+    /// </summary>
+    Task<WorkflowExecutionContext> ResumeWorkflowAsync(Workflow workflow, BlockingActivity awaitingActivity, IDictionary<string, object> input = null);
 
-        /// <summary>
-        /// Executes the specified workflow starting at the specified activity.
-        /// </summary>
-        Task<IEnumerable<ActivityRecord>> ExecuteWorkflowAsync(WorkflowExecutionContext workflowExecutionContext, ActivityRecord activity);
-    }
+    /// <summary>
+    /// Executes the specified workflow starting at the specified activity.
+    /// </summary>
+    Task<IEnumerable<ActivityRecord>> ExecuteWorkflowAsync(WorkflowExecutionContext workflowExecutionContext, ActivityRecord activity);
+}
 
-    public static class WorkflowManagerExtensions
+public static class WorkflowManagerExtensions
+{
+    public static Task<IEnumerable<WorkflowExecutionContext>> TriggerEventAsync(this IWorkflowManager workflowManager, string name, object input = null, string correlationId = null)
     {
-        public static Task<IEnumerable<WorkflowExecutionContext>> TriggerEventAsync(this IWorkflowManager workflowManager, string name, object input = null, string correlationId = null)
-        {
-            return workflowManager.TriggerEventAsync(name, new RouteValueDictionary(input), correlationId);
-        }
+        return workflowManager.TriggerEventAsync(name, new RouteValueDictionary(input), correlationId);
+    }
 
-        public static Task<WorkflowExecutionContext> RestartWorkflowAsync(this IWorkflowManager workflowManager, Workflow workflow, WorkflowType workflowType, JsonSerializerOptions jsonSerializerOptions = null)
-        {
-            ArgumentNullException.ThrowIfNull(workflow);
+    public static Task<WorkflowExecutionContext> RestartWorkflowAsync(this IWorkflowManager workflowManager, Workflow workflow, WorkflowType workflowType, JsonSerializerOptions jsonSerializerOptions = null)
+    {
+        ArgumentNullException.ThrowIfNull(workflow);
 
-            ArgumentNullException.ThrowIfNull(workflowType);
+        ArgumentNullException.ThrowIfNull(workflowType);
 
-            var state = workflow.State.ToObject<WorkflowState>(jsonSerializerOptions);
+        var state = workflow.State.ToObject<WorkflowState>(jsonSerializerOptions);
 
-            return workflowManager.RestartWorkflowAsync(workflowType, state.Input, workflow.CorrelationId);
-        }
+        return workflowManager.RestartWorkflowAsync(workflowType, state.Input, workflow.CorrelationId);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowScriptEvaluator.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowScriptEvaluator.cs
index 79e659440d6..d2410487c26 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowScriptEvaluator.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowScriptEvaluator.cs
@@ -2,10 +2,9 @@
 using OrchardCore.Scripting;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public interface IWorkflowScriptEvaluator
 {
-    public interface IWorkflowScriptEvaluator
-    {
-        Task<T> EvaluateAsync<T>(WorkflowExpression<T> expression, WorkflowExecutionContext workflowContext, params IGlobalMethodProvider[] scopedMethodProviders);
-    }
+    Task<T> EvaluateAsync<T>(WorkflowExpression<T> expression, WorkflowExecutionContext workflowContext, params IGlobalMethodProvider[] scopedMethodProviders);
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowStore.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowStore.cs
index 60548c03831..0bc27e74f2b 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowStore.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowStore.cs
@@ -2,22 +2,21 @@
 using System.Threading.Tasks;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public interface IWorkflowStore
 {
-    public interface IWorkflowStore
-    {
-        Task<int> CountAsync(string workflowTypeId = null);
-        Task<bool> HasHaltedInstanceAsync(string workflowTypeId);
-        Task<IEnumerable<Workflow>> ListAsync(string workflowTypeId = null, int? skip = null, int? take = null);
-        Task<IEnumerable<Workflow>> ListAsync(IEnumerable<string> workflowTypeIds);
-        Task<IEnumerable<Workflow>> ListAsync(string workflowTypeId, IEnumerable<string> blockingActivityIds);
-        Task<IEnumerable<Workflow>> ListByActivityNameAsync(string activityName, string correlationId = null, bool isAlwaysCorrelated = false);
-        Task<IEnumerable<Workflow>> ListAsync(string workflowTypeId, string activityName, string correlationId = null, bool isAlwaysCorrelated = false);
-        Task<Workflow> GetAsync(long id);
-        Task<Workflow> GetAsync(string uid);
-        Task<IEnumerable<Workflow>> GetAsync(IEnumerable<long> ids);
-        Task<IEnumerable<Workflow>> GetAsync(IEnumerable<string> uids);
-        Task SaveAsync(Workflow workflow);
-        Task DeleteAsync(Workflow workflow);
-    }
+    Task<int> CountAsync(string workflowTypeId = null);
+    Task<bool> HasHaltedInstanceAsync(string workflowTypeId);
+    Task<IEnumerable<Workflow>> ListAsync(string workflowTypeId = null, int? skip = null, int? take = null);
+    Task<IEnumerable<Workflow>> ListAsync(IEnumerable<string> workflowTypeIds);
+    Task<IEnumerable<Workflow>> ListAsync(string workflowTypeId, IEnumerable<string> blockingActivityIds);
+    Task<IEnumerable<Workflow>> ListByActivityNameAsync(string activityName, string correlationId = null, bool isAlwaysCorrelated = false);
+    Task<IEnumerable<Workflow>> ListAsync(string workflowTypeId, string activityName, string correlationId = null, bool isAlwaysCorrelated = false);
+    Task<Workflow> GetAsync(long id);
+    Task<Workflow> GetAsync(string uid);
+    Task<IEnumerable<Workflow>> GetAsync(IEnumerable<long> ids);
+    Task<IEnumerable<Workflow>> GetAsync(IEnumerable<string> uids);
+    Task SaveAsync(Workflow workflow);
+    Task DeleteAsync(Workflow workflow);
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowTypeEventHandler.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowTypeEventHandler.cs
index f4774aeb462..722dc48fd0d 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowTypeEventHandler.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowTypeEventHandler.cs
@@ -1,12 +1,11 @@
 using System.Threading.Tasks;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public interface IWorkflowTypeEventHandler
 {
-    public interface IWorkflowTypeEventHandler
-    {
-        Task CreatedAsync(WorkflowTypeCreatedContext context);
-        Task UpdatedAsync(WorkflowTypeUpdatedContext context);
-        Task DeletedAsync(WorkflowTypeDeletedContext context);
-    }
+    Task CreatedAsync(WorkflowTypeCreatedContext context);
+    Task UpdatedAsync(WorkflowTypeUpdatedContext context);
+    Task DeletedAsync(WorkflowTypeDeletedContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowTypeIdGenerator.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowTypeIdGenerator.cs
index 397c3e0528e..5c594a9e373 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowTypeIdGenerator.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowTypeIdGenerator.cs
@@ -1,9 +1,8 @@
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public interface IWorkflowTypeIdGenerator
 {
-    public interface IWorkflowTypeIdGenerator
-    {
-        string GenerateUniqueId(WorkflowType workflowType);
-    }
+    string GenerateUniqueId(WorkflowType workflowType);
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowTypeStore.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowTypeStore.cs
index 222dfdecc67..46cdad17cb4 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowTypeStore.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowTypeStore.cs
@@ -2,16 +2,15 @@
 using System.Threading.Tasks;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public interface IWorkflowTypeStore
 {
-    public interface IWorkflowTypeStore
-    {
-        Task<WorkflowType> GetAsync(long id);
-        Task<WorkflowType> GetAsync(string uid);
-        Task<IEnumerable<WorkflowType>> GetAsync(IEnumerable<long> ids);
-        Task<IEnumerable<WorkflowType>> ListAsync();
-        Task<IEnumerable<WorkflowType>> GetByStartActivityAsync(string activityName);
-        Task SaveAsync(WorkflowType workflowType);
-        Task DeleteAsync(WorkflowType workflowType);
-    }
+    Task<WorkflowType> GetAsync(long id);
+    Task<WorkflowType> GetAsync(string uid);
+    Task<IEnumerable<WorkflowType>> GetAsync(IEnumerable<long> ids);
+    Task<IEnumerable<WorkflowType>> ListAsync();
+    Task<IEnumerable<WorkflowType>> GetByStartActivityAsync(string activityName);
+    Task SaveAsync(WorkflowType workflowType);
+    Task DeleteAsync(WorkflowType workflowType);
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowValueSerializer.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowValueSerializer.cs
index 25862c6e95c..d8f57f73085 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowValueSerializer.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/IWorkflowValueSerializer.cs
@@ -1,16 +1,15 @@
 using System.Threading.Tasks;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+/// <summary>
+/// Implementors serialize complex external stimuli into a serializable format.
+/// for example, when triggering a workflow and passing in a content item, only the content item's ID is persisted and re-hydrated
+/// when the workflow is resumed.
+/// </summary>
+public interface IWorkflowValueSerializer
 {
-    /// <summary>
-    /// Implementors serialize complex external stimuli into a serializable format.
-    /// for example, when triggering a workflow and passing in a content item, only the content item's ID is persisted and re-hydrated
-    /// when the workflow is resumed.
-    /// </summary>
-    public interface IWorkflowValueSerializer
-    {
-        Task SerializeValueAsync(SerializeWorkflowValueContext context);
-        Task DeserializeValueAsync(SerializeWorkflowValueContext context);
-    }
+    Task SerializeValueAsync(SerializeWorkflowValueContext context);
+    Task DeserializeValueAsync(SerializeWorkflowValueContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/SerializeWorkflowValueContext.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/SerializeWorkflowValueContext.cs
index 2a63d1ab73e..0f1a87723a8 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/SerializeWorkflowValueContext.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/SerializeWorkflowValueContext.cs
@@ -1,14 +1,13 @@
-namespace OrchardCore.Workflows.Models
+namespace OrchardCore.Workflows.Models;
+
+public class SerializeWorkflowValueContext
 {
-    public class SerializeWorkflowValueContext
+    public SerializeWorkflowValueContext(object input)
     {
-        public SerializeWorkflowValueContext(object input)
-        {
-            Input = input;
-            Output = input;
-        }
-
-        public object Input { get; set; }
-        public object Output { get; set; }
+        Input = input;
+        Output = input;
     }
+
+    public object Input { get; set; }
+    public object Output { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/WorkflowExecutionContextHandlerBase.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/WorkflowExecutionContextHandlerBase.cs
index 063442999cd..183bf8fc990 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/WorkflowExecutionContextHandlerBase.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/WorkflowExecutionContextHandlerBase.cs
@@ -1,28 +1,27 @@
 using System.Threading.Tasks;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public abstract class WorkflowExecutionContextHandlerBase : IWorkflowExecutionContextHandler
 {
-    public abstract class WorkflowExecutionContextHandlerBase : IWorkflowExecutionContextHandler
+    public virtual Task EvaluatingExpressionAsync(WorkflowExecutionExpressionContext context)
     {
-        public virtual Task EvaluatingExpressionAsync(WorkflowExecutionExpressionContext context)
-        {
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
+    }
 
-        public virtual Task EvaluatingScriptAsync(WorkflowExecutionScriptContext context)
-        {
-            return Task.CompletedTask;
-        }
+    public virtual Task EvaluatingScriptAsync(WorkflowExecutionScriptContext context)
+    {
+        return Task.CompletedTask;
+    }
 
-        public Task DehydrateValueAsync(SerializeWorkflowValueContext context)
-        {
-            return Task.CompletedTask;
-        }
+    public Task DehydrateValueAsync(SerializeWorkflowValueContext context)
+    {
+        return Task.CompletedTask;
+    }
 
-        public Task RehydrateValueAsync(SerializeWorkflowValueContext context)
-        {
-            return Task.CompletedTask;
-        }
+    public Task RehydrateValueAsync(SerializeWorkflowValueContext context)
+    {
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/WorkflowHandlerBase.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/WorkflowHandlerBase.cs
index de1fc1fa2e8..cd4f310910b 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/WorkflowHandlerBase.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/WorkflowHandlerBase.cs
@@ -1,23 +1,22 @@
 using System.Threading.Tasks;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public abstract class WorkflowHandlerBase : IWorkflowHandler
 {
-    public abstract class WorkflowHandlerBase : IWorkflowHandler
+    public virtual Task CreatedAsync(WorkflowCreatedContext context)
     {
-        public virtual Task CreatedAsync(WorkflowCreatedContext context)
-        {
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
+    }
 
-        public virtual Task UpdatedAsync(WorkflowUpdatedContext context)
-        {
-            return Task.CompletedTask;
-        }
+    public virtual Task UpdatedAsync(WorkflowUpdatedContext context)
+    {
+        return Task.CompletedTask;
+    }
 
-        public virtual Task DeletedAsync(WorkflowDeletedContext context)
-        {
-            return Task.CompletedTask;
-        }
+    public virtual Task DeletedAsync(WorkflowDeletedContext context)
+    {
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/WorkflowTypeHandlerBase.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/WorkflowTypeHandlerBase.cs
index 170397ffe1a..e7039eb4996 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/WorkflowTypeHandlerBase.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/Services/WorkflowTypeHandlerBase.cs
@@ -1,23 +1,22 @@
 using System.Threading.Tasks;
 using OrchardCore.Workflows.Models;
 
-namespace OrchardCore.Workflows.Services
+namespace OrchardCore.Workflows.Services;
+
+public abstract class WorkflowTypeHandlerBase : IWorkflowTypeEventHandler
 {
-    public abstract class WorkflowTypeHandlerBase : IWorkflowTypeEventHandler
+    public virtual Task CreatedAsync(WorkflowTypeCreatedContext context)
     {
-        public virtual Task CreatedAsync(WorkflowTypeCreatedContext context)
-        {
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
+    }
 
-        public virtual Task DeletedAsync(WorkflowTypeDeletedContext context)
-        {
-            return Task.CompletedTask;
-        }
+    public virtual Task DeletedAsync(WorkflowTypeDeletedContext context)
+    {
+        return Task.CompletedTask;
+    }
 
-        public virtual Task UpdatedAsync(WorkflowTypeUpdatedContext context)
-        {
-            return Task.CompletedTask;
-        }
+    public virtual Task UpdatedAsync(WorkflowTypeUpdatedContext context)
+    {
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Workflows.Abstractions/ViewModels/ActivityViewModel.cs b/src/OrchardCore/OrchardCore.Workflows.Abstractions/ViewModels/ActivityViewModel.cs
index 7ce3b8efe7f..9e3f0b6bd75 100644
--- a/src/OrchardCore/OrchardCore.Workflows.Abstractions/ViewModels/ActivityViewModel.cs
+++ b/src/OrchardCore/OrchardCore.Workflows.Abstractions/ViewModels/ActivityViewModel.cs
@@ -2,20 +2,19 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Workflows.Activities;
 
-namespace OrchardCore.Workflows.ViewModels
+namespace OrchardCore.Workflows.ViewModels;
+
+public class ActivityViewModel<TActivity> : ShapeViewModel where TActivity : IActivity
 {
-    public class ActivityViewModel<TActivity> : ShapeViewModel where TActivity : IActivity
+    public ActivityViewModel()
     {
-        public ActivityViewModel()
-        {
-        }
-
-        public ActivityViewModel(TActivity activity)
-        {
-            Activity = activity;
-        }
+    }
 
-        [BindNever]
-        public TActivity Activity { get; set; }
+    public ActivityViewModel(TActivity activity)
+    {
+        Activity = activity;
     }
+
+    [BindNever]
+    public TActivity Activity { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/IXmlRpcDriver.cs b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/IXmlRpcDriver.cs
index 10f190c1976..55fe7465cad 100644
--- a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/IXmlRpcDriver.cs
+++ b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/IXmlRpcDriver.cs
@@ -1,7 +1,6 @@
-namespace OrchardCore.XmlRpc
+namespace OrchardCore.XmlRpc;
+
+public interface IXmlRpcDriver
 {
-    public interface IXmlRpcDriver
-    {
-        void Process(object item);
-    }
+    void Process(object item);
 }
diff --git a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/IXmlRpcHandler.cs b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/IXmlRpcHandler.cs
index 1c76a014594..83b981dc2af 100644
--- a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/IXmlRpcHandler.cs
+++ b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/IXmlRpcHandler.cs
@@ -1,11 +1,10 @@
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
-namespace OrchardCore.XmlRpc
+namespace OrchardCore.XmlRpc;
+
+public interface IXmlRpcHandler
 {
-    public interface IXmlRpcHandler
-    {
-        void SetCapabilities(XElement element);
-        Task ProcessAsync(XmlRpcContext context);
-    }
+    void SetCapabilities(XElement element);
+    Task ProcessAsync(XmlRpcContext context);
 }
diff --git a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcArray.cs b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcArray.cs
index 0f0d6945880..0c6bb9b2a27 100644
--- a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcArray.cs
+++ b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcArray.cs
@@ -1,24 +1,23 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.XmlRpc.Models
+namespace OrchardCore.XmlRpc.Models;
+
+public class XRpcArray
 {
-    public class XRpcArray
+    public XRpcArray()
     {
-        public XRpcArray()
-        {
-            Data = [];
-        }
-        public IList<XRpcData> Data { get; set; }
+        Data = [];
+    }
+    public IList<XRpcData> Data { get; set; }
 
-        public object this[int index]
-        {
-            get { return Data[index].Value; }
-        }
+    public object this[int index]
+    {
+        get { return Data[index].Value; }
+    }
 
-        public XRpcArray Add<T>(T value)
-        {
-            Data.Add(XRpcData.For(value));
-            return this;
-        }
+    public XRpcArray Add<T>(T value)
+    {
+        Data.Add(XRpcData.For(value));
+        return this;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcData.cs b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcData.cs
index 86bf6d86883..9f1d02dce11 100644
--- a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcData.cs
+++ b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcData.cs
@@ -1,64 +1,63 @@
 using System;
 
-namespace OrchardCore.XmlRpc.Models
-{
-    public class XRpcData
-    {
-        private object _value;
-
-        public object Value
-        {
-            get { return _value; }
-            set { SetValue(value); }
-        }
+namespace OrchardCore.XmlRpc.Models;
 
-        protected virtual void SetValue(object value)
-        {
-            _value = value;
-        }
-
-        public virtual Type Type { get { return typeof(object); } }
+public class XRpcData
+{
+    private object _value;
 
-        public static XRpcData<T> For<T>(T t)
-        {
-            return new XRpcData<T> { Value = t };
-        }
+    public object Value
+    {
+        get { return _value; }
+        set { SetValue(value); }
     }
 
-    public class XRpcData<T> : XRpcData
+    protected virtual void SetValue(object value)
     {
-        private T _value;
+        _value = value;
+    }
 
-        public new T Value
-        {
-            get { return _value; }
-            set { SetValue(value); }
-        }
+    public virtual Type Type { get { return typeof(object); } }
 
-        private void SetValue(T value)
-        {
-            _value = value;
-            base.SetValue(value);
-        }
+    public static XRpcData<T> For<T>(T t)
+    {
+        return new XRpcData<T> { Value = t };
+    }
+}
 
-        protected override void SetValue(object value)
-        {
-            _value = (T)Convert.ChangeType(value, typeof(T));
-            base.SetValue(value);
-        }
+public class XRpcData<T> : XRpcData
+{
+    private T _value;
 
-        public override Type Type { get { return typeof(T); } }
+    public new T Value
+    {
+        get { return _value; }
+        set { SetValue(value); }
     }
 
-    public class XRpcFault
+    private void SetValue(T value)
     {
-        public XRpcFault(int code, string message)
-        {
-            Code = code;
-            Message = message;
-        }
+        _value = value;
+        base.SetValue(value);
+    }
+
+    protected override void SetValue(object value)
+    {
+        _value = (T)Convert.ChangeType(value, typeof(T));
+        base.SetValue(value);
+    }
 
-        public string Message { get; set; }
-        public int Code { get; set; }
+    public override Type Type { get { return typeof(T); } }
+}
+
+public class XRpcFault
+{
+    public XRpcFault(int code, string message)
+    {
+        Code = code;
+        Message = message;
     }
+
+    public string Message { get; set; }
+    public int Code { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcMethodCall.cs b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcMethodCall.cs
index 4929872b4c4..2fdb44cbba9 100644
--- a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcMethodCall.cs
+++ b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcMethodCall.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.XmlRpc.Models
+namespace OrchardCore.XmlRpc.Models;
+
+public class XRpcMethodCall
 {
-    public class XRpcMethodCall
-    {
-        public string MethodName { get; set; }
-        public IList<XRpcData> Params { get; set; } = [];
-    }
+    public string MethodName { get; set; }
+    public IList<XRpcData> Params { get; set; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcMethodResponse.cs b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcMethodResponse.cs
index fce5461dff5..fca541af3df 100644
--- a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcMethodResponse.cs
+++ b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcMethodResponse.cs
@@ -1,21 +1,20 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.XmlRpc.Models
+namespace OrchardCore.XmlRpc.Models;
+
+public class XRpcMethodResponse
 {
-    public class XRpcMethodResponse
+    public XRpcMethodResponse()
     {
-        public XRpcMethodResponse()
-        {
-            Params = [];
-        }
+        Params = [];
+    }
 
-        public IList<XRpcData> Params { get; set; }
-        public XRpcFault Fault { get; set; }
+    public IList<XRpcData> Params { get; set; }
+    public XRpcFault Fault { get; set; }
 
-        public XRpcMethodResponse Add<T>(T value)
-        {
-            Params.Add(XRpcData.For(value));
-            return this;
-        }
+    public XRpcMethodResponse Add<T>(T value)
+    {
+        Params.Add(XRpcData.For(value));
+        return this;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcStruct.cs b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcStruct.cs
index f2ac164b20d..e0cabeecde8 100644
--- a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcStruct.cs
+++ b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Models/XRpcStruct.cs
@@ -1,34 +1,33 @@
 using System.Collections.Generic;
 
-namespace OrchardCore.XmlRpc.Models
+namespace OrchardCore.XmlRpc.Models;
+
+public class XRpcStruct
 {
-    public class XRpcStruct
+    public XRpcStruct()
     {
-        public XRpcStruct()
-        {
-            Members = new Dictionary<string, XRpcData>();
-        }
-        public IDictionary<string, XRpcData> Members { get; set; }
+        Members = new Dictionary<string, XRpcData>();
+    }
+    public IDictionary<string, XRpcData> Members { get; set; }
 
-        public object this[string index]
-        {
-            get { return Members[index].Value; }
-        }
+    public object this[string index]
+    {
+        get { return Members[index].Value; }
+    }
 
-        public XRpcStruct Set<T>(string name, T value)
-        {
-            Members[name] = XRpcData.For(value);
-            return this;
-        }
+    public XRpcStruct Set<T>(string name, T value)
+    {
+        Members[name] = XRpcData.For(value);
+        return this;
+    }
 
-        public T Optional<T>(string name)
+    public T Optional<T>(string name)
+    {
+        if (Members.TryGetValue(name, out var data))
         {
-            if (Members.TryGetValue(name, out var data))
-            {
-                return (T)data.Value;
-            }
-
-            return default;
+            return (T)data.Value;
         }
+
+        return default;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Services/IXmlRpcReader.cs b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Services/IXmlRpcReader.cs
index 5795036e3e3..bd36f8c0e55 100644
--- a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Services/IXmlRpcReader.cs
+++ b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Services/IXmlRpcReader.cs
@@ -1,39 +1,38 @@
 using System.Xml.Linq;
 using OrchardCore.XmlRpc.Models;
 
-namespace OrchardCore.XmlRpc.Services
+namespace OrchardCore.XmlRpc.Services;
+
+/// <summary>
+/// Abstraction to read XML and convert it to rpc entities.
+/// </summary>
+public interface IXmlRpcReader
 {
     /// <summary>
-    /// Abstraction to read XML and convert it to rpc entities.
+    /// Maps an XML element to a rpc method call.
     /// </summary>
-    public interface IXmlRpcReader
-    {
-        /// <summary>
-        /// Maps an XML element to a rpc method call.
-        /// </summary>
-        /// <param name="source">The XML element to be mapped.</param>
-        /// <returns>The rpc method call.</returns>
-        XRpcMethodCall MapToMethodCall(XElement source);
+    /// <param name="source">The XML element to be mapped.</param>
+    /// <returns>The rpc method call.</returns>
+    XRpcMethodCall MapToMethodCall(XElement source);
 
-        /// <summary>
-        /// Maps an XML element to rpc data.
-        /// </summary>
-        /// <param name="source">The XML element to be mapped.</param>
-        /// <returns>The rpc data.</returns>
-        XRpcData MapToData(XElement source);
+    /// <summary>
+    /// Maps an XML element to rpc data.
+    /// </summary>
+    /// <param name="source">The XML element to be mapped.</param>
+    /// <returns>The rpc data.</returns>
+    XRpcData MapToData(XElement source);
 
-        /// <summary>
-        /// Maps an XML element to a rpc struct.
-        /// </summary>
-        /// <param name="source">The XML element to be mapped.</param>
-        /// <returns>The rpc struct.</returns>
-        XRpcStruct MapToStruct(XElement source);
+    /// <summary>
+    /// Maps an XML element to a rpc struct.
+    /// </summary>
+    /// <param name="source">The XML element to be mapped.</param>
+    /// <returns>The rpc struct.</returns>
+    XRpcStruct MapToStruct(XElement source);
 
-        /// <summary>
-        /// Maps an XML element to a rpc array.
-        /// </summary>
-        /// <param name="source">The XML element to be mapped.</param>
-        /// <returns>The rpc array.</returns>
-        XRpcArray MapToArray(XElement source);
-    }
+    /// <summary>
+    /// Maps an XML element to a rpc array.
+    /// </summary>
+    /// <param name="source">The XML element to be mapped.</param>
+    /// <returns>The rpc array.</returns>
+    XRpcArray MapToArray(XElement source);
 }
diff --git a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Services/IXmlRpcWriter.cs b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Services/IXmlRpcWriter.cs
index 6099ccf78e1..e2921b9fbd3 100644
--- a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Services/IXmlRpcWriter.cs
+++ b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/Services/IXmlRpcWriter.cs
@@ -1,39 +1,38 @@
 using System.Xml.Linq;
 using OrchardCore.XmlRpc.Models;
 
-namespace OrchardCore.XmlRpc.Services
+namespace OrchardCore.XmlRpc.Services;
+
+/// <summary>
+/// Abstraction to write XML based on rpc entities.
+/// </summary>
+public interface IXmlRpcWriter
 {
     /// <summary>
-    /// Abstraction to write XML based on rpc entities.
+    /// Maps a method response to XML.
     /// </summary>
-    public interface IXmlRpcWriter
-    {
-        /// <summary>
-        /// Maps a method response to XML.
-        /// </summary>
-        /// <param name="rpcMethodResponse">The method response to be mapped.</param>
-        /// <returns>The XML element.</returns>
-        XElement MapMethodResponse(XRpcMethodResponse rpcMethodResponse);
+    /// <param name="rpcMethodResponse">The method response to be mapped.</param>
+    /// <returns>The XML element.</returns>
+    XElement MapMethodResponse(XRpcMethodResponse rpcMethodResponse);
 
-        /// <summary>
-        /// Maps rpc data to XML.
-        /// </summary>
-        /// <param name="rpcData">The rpc data.</param>
-        /// <returns>The XML element.</returns>
-        XElement MapData(XRpcData rpcData);
+    /// <summary>
+    /// Maps rpc data to XML.
+    /// </summary>
+    /// <param name="rpcData">The rpc data.</param>
+    /// <returns>The XML element.</returns>
+    XElement MapData(XRpcData rpcData);
 
-        /// <summary>
-        /// Maps a rpc struct to XML.
-        /// </summary>
-        /// <param name="rpcStruct">The rpc struct.</param>
-        /// <returns>The XML element.</returns>
-        XElement MapStruct(XRpcStruct rpcStruct);
+    /// <summary>
+    /// Maps a rpc struct to XML.
+    /// </summary>
+    /// <param name="rpcStruct">The rpc struct.</param>
+    /// <returns>The XML element.</returns>
+    XElement MapStruct(XRpcStruct rpcStruct);
 
-        /// <summary>
-        /// Maps a rpc array to XML.
-        /// </summary>
-        /// <param name="rpcArray">The rpc array.</param>
-        /// <returns>The XML element.</returns>
-        XElement MapArray(XRpcArray rpcArray);
-    }
+    /// <summary>
+    /// Maps a rpc array to XML.
+    /// </summary>
+    /// <param name="rpcArray">The rpc array.</param>
+    /// <returns>The XML element.</returns>
+    XElement MapArray(XRpcArray rpcArray);
 }
diff --git a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/XmlRpcContext.cs b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/XmlRpcContext.cs
index cb8ee8d6001..8bf40c87da6 100644
--- a/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/XmlRpcContext.cs
+++ b/src/OrchardCore/OrchardCore.XmlRpc.Abstractions/XmlRpcContext.cs
@@ -3,15 +3,14 @@
 using Microsoft.AspNetCore.Mvc;
 using OrchardCore.XmlRpc.Models;
 
-namespace OrchardCore.XmlRpc
+namespace OrchardCore.XmlRpc;
+
+public class XmlRpcContext
 {
-    public class XmlRpcContext
-    {
-        public ControllerContext ControllerContext { get; set; }
-        public HttpContext HttpContext { get; set; }
-        public IUrlHelper Url { get; set; }
-        public XRpcMethodCall RpcMethodCall { get; set; }
-        public XRpcMethodResponse RpcMethodResponse { get; set; }
-        public ICollection<IXmlRpcDriver> Drivers { get; set; } = [];
-    }
+    public ControllerContext ControllerContext { get; set; }
+    public HttpContext HttpContext { get; set; }
+    public IUrlHelper Url { get; set; }
+    public XRpcMethodCall RpcMethodCall { get; set; }
+    public XRpcMethodResponse RpcMethodResponse { get; set; }
+    public ICollection<IXmlRpcDriver> Drivers { get; set; } = [];
 }
diff --git a/src/OrchardCore/OrchardCore/BackgroundTasks/BackgroundTaskScheduler.cs b/src/OrchardCore/OrchardCore/BackgroundTasks/BackgroundTaskScheduler.cs
index b352ddacb5a..c86e0dfbfad 100644
--- a/src/OrchardCore/OrchardCore/BackgroundTasks/BackgroundTaskScheduler.cs
+++ b/src/OrchardCore/OrchardCore/BackgroundTasks/BackgroundTaskScheduler.cs
@@ -2,59 +2,58 @@
 using NCrontab;
 using OrchardCore.Modules;
 
-namespace OrchardCore.BackgroundTasks
+namespace OrchardCore.BackgroundTasks;
+
+public sealed class BackgroundTaskScheduler
 {
-    public sealed class BackgroundTaskScheduler
+    private readonly IClock _clock;
+
+    public BackgroundTaskScheduler(string tenant, string name, DateTime referenceTime, IClock clock)
     {
-        private readonly IClock _clock;
+        Name = name;
+        Tenant = tenant;
+        ReferenceTime = referenceTime;
+        Settings = new BackgroundTaskSettings() { Name = name };
+        State = new BackgroundTaskState() { Name = name };
+        _clock = clock;
+    }
 
-        public BackgroundTaskScheduler(string tenant, string name, DateTime referenceTime, IClock clock)
-        {
-            Name = name;
-            Tenant = tenant;
-            ReferenceTime = referenceTime;
-            Settings = new BackgroundTaskSettings() { Name = name };
-            State = new BackgroundTaskState() { Name = name };
-            _clock = clock;
-        }
+    public string Name { get; }
+    public string Tenant { get; }
+    public DateTime ReferenceTime { get; set; }
+    public BackgroundTaskSettings Settings { get; set; }
+    public BackgroundTaskState State { get; set; }
+    public ITimeZone TimeZone { get; set; }
+    public bool Released { get; set; }
+    public bool Updated { get; set; }
 
-        public string Name { get; }
-        public string Tenant { get; }
-        public DateTime ReferenceTime { get; set; }
-        public BackgroundTaskSettings Settings { get; set; }
-        public BackgroundTaskState State { get; set; }
-        public ITimeZone TimeZone { get; set; }
-        public bool Released { get; set; }
-        public bool Updated { get; set; }
+    public bool CanRun()
+    {
+        var now = DateTime.UtcNow;
+        var referenceTime = ReferenceTime;
 
-        public bool CanRun()
+        if (TimeZone != null)
         {
-            var now = DateTime.UtcNow;
-            var referenceTime = ReferenceTime;
-
-            if (TimeZone != null)
-            {
-                now = _clock.ConvertToTimeZone(DateTime.UtcNow, TimeZone).DateTime;
-                referenceTime = _clock.ConvertToTimeZone(ReferenceTime, TimeZone).DateTime;
-            }
+            now = _clock.ConvertToTimeZone(DateTime.UtcNow, TimeZone).DateTime;
+            referenceTime = _clock.ConvertToTimeZone(ReferenceTime, TimeZone).DateTime;
+        }
 
-            var nextStartTime = CrontabSchedule.Parse(Settings.Schedule).GetNextOccurrence(referenceTime);
-            if (now >= nextStartTime)
+        var nextStartTime = CrontabSchedule.Parse(Settings.Schedule).GetNextOccurrence(referenceTime);
+        if (now >= nextStartTime)
+        {
+            if (Settings.Enable && !Released && Updated)
             {
-                if (Settings.Enable && !Released && Updated)
-                {
-                    return true;
-                }
-
-                ReferenceTime = DateTime.UtcNow;
+                return true;
             }
 
-            return false;
+            ReferenceTime = DateTime.UtcNow;
         }
 
-        public void Run()
-        {
-            State.LastStartTime = ReferenceTime = DateTime.UtcNow;
-        }
+        return false;
+    }
+
+    public void Run()
+    {
+        State.LastStartTime = ReferenceTime = DateTime.UtcNow;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Caching/Distributed/DistributedSignal.cs b/src/OrchardCore/OrchardCore/Caching/Distributed/DistributedSignal.cs
index 6ae40b22cdf..94d111ad0cf 100644
--- a/src/OrchardCore/OrchardCore/Caching/Distributed/DistributedSignal.cs
+++ b/src/OrchardCore/OrchardCore/Caching/Distributed/DistributedSignal.cs
@@ -2,25 +2,24 @@
 using Microsoft.Extensions.Primitives;
 using OrchardCore.Environment.Cache;
 
-namespace OrchardCore.Caching.Distributed
-{
-    /// <summary>
-    /// Distributed implementation of <see cref="Signal"/> using an <see cref="IMessageBus"/>.
-    /// </summary>
-    public class DistributedSignal : Signal, ISignal
-    {
-        private readonly IMessageBus _messageBus;
+namespace OrchardCore.Caching.Distributed;
 
-        public DistributedSignal(IMessageBus messageBus) => _messageBus = messageBus;
+/// <summary>
+/// Distributed implementation of <see cref="Signal"/> using an <see cref="IMessageBus"/>.
+/// </summary>
+public class DistributedSignal : Signal, ISignal
+{
+    private readonly IMessageBus _messageBus;
 
-        IChangeToken ISignal.GetToken(string key) => GetToken(key);
+    public DistributedSignal(IMessageBus messageBus) => _messageBus = messageBus;
 
-        Task ISignal.SignalTokenAsync(string key)
-        {
-            SignalToken(key);
-            return _messageBus.PublishAsync("Signal", key);
-        }
+    IChangeToken ISignal.GetToken(string key) => GetToken(key);
 
-        public override Task ActivatedAsync() => _messageBus.SubscribeAsync("Signal", (channel, message) => SignalToken(message));
+    Task ISignal.SignalTokenAsync(string key)
+    {
+        SignalToken(key);
+        return _messageBus.PublishAsync("Signal", key);
     }
+
+    public override Task ActivatedAsync() => _messageBus.SubscribeAsync("Signal", (channel, message) => SignalToken(message));
 }
diff --git a/src/OrchardCore/OrchardCore/Caching/Signal.cs b/src/OrchardCore/OrchardCore/Caching/Signal.cs
index 27a48acb808..69c8c9b9fde 100644
--- a/src/OrchardCore/OrchardCore/Caching/Signal.cs
+++ b/src/OrchardCore/OrchardCore/Caching/Signal.cs
@@ -4,58 +4,57 @@
 using Microsoft.Extensions.Primitives;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Environment.Cache
+namespace OrchardCore.Environment.Cache;
+
+/// <summary>
+/// This component is a singleton that holds all the existing signal tokens for a tenant.
+/// </summary>
+public class Signal : ModularTenantEvents, ISignal
 {
-    /// <summary>
-    /// This component is a singleton that holds all the existing signal tokens for a tenant.
-    /// </summary>
-    public class Signal : ModularTenantEvents, ISignal
+    private readonly ConcurrentDictionary<string, ChangeTokenInfo> _changeTokens;
+
+    public Signal()
     {
-        private readonly ConcurrentDictionary<string, ChangeTokenInfo> _changeTokens;
+        _changeTokens = new ConcurrentDictionary<string, ChangeTokenInfo>();
+    }
 
-        public Signal()
-        {
-            _changeTokens = new ConcurrentDictionary<string, ChangeTokenInfo>();
-        }
+    public IChangeToken GetToken(string key)
+    {
+        return _changeTokens.GetOrAdd(
+            key,
+            _ =>
+            {
+                var cancellationTokenSource = new CancellationTokenSource();
+                var changeToken = new CancellationChangeToken(cancellationTokenSource.Token);
+                return new ChangeTokenInfo(changeToken, cancellationTokenSource);
+            })
+            .ChangeToken;
+    }
 
-        public IChangeToken GetToken(string key)
+    public void SignalToken(string key)
+    {
+        if (_changeTokens.TryRemove(key, out var changeTokenInfo))
         {
-            return _changeTokens.GetOrAdd(
-                key,
-                _ =>
-                {
-                    var cancellationTokenSource = new CancellationTokenSource();
-                    var changeToken = new CancellationChangeToken(cancellationTokenSource.Token);
-                    return new ChangeTokenInfo(changeToken, cancellationTokenSource);
-                })
-                .ChangeToken;
+            changeTokenInfo.TokenSource.Cancel();
         }
+    }
 
-        public void SignalToken(string key)
-        {
-            if (_changeTokens.TryRemove(key, out var changeTokenInfo))
-            {
-                changeTokenInfo.TokenSource.Cancel();
-            }
-        }
+    public Task SignalTokenAsync(string key)
+    {
+        SignalToken(key);
+        return Task.CompletedTask;
+    }
 
-        public Task SignalTokenAsync(string key)
+    private readonly struct ChangeTokenInfo
+    {
+        public ChangeTokenInfo(IChangeToken changeToken, CancellationTokenSource tokenSource)
         {
-            SignalToken(key);
-            return Task.CompletedTask;
+            ChangeToken = changeToken;
+            TokenSource = tokenSource;
         }
 
-        private readonly struct ChangeTokenInfo
-        {
-            public ChangeTokenInfo(IChangeToken changeToken, CancellationTokenSource tokenSource)
-            {
-                ChangeToken = changeToken;
-                TokenSource = tokenSource;
-            }
+        public IChangeToken ChangeToken { get; }
 
-            public IChangeToken ChangeToken { get; }
-
-            public CancellationTokenSource TokenSource { get; }
-        }
+        public CancellationTokenSource TokenSource { get; }
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Extensions/ExtensionDependencyStrategy.cs b/src/OrchardCore/OrchardCore/Extensions/ExtensionDependencyStrategy.cs
index 4635400a35f..01f397339a3 100644
--- a/src/OrchardCore/OrchardCore/Extensions/ExtensionDependencyStrategy.cs
+++ b/src/OrchardCore/OrchardCore/Extensions/ExtensionDependencyStrategy.cs
@@ -1,13 +1,12 @@
 using System.Linq;
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.Environment.Extensions
+namespace OrchardCore.Environment.Extensions;
+
+public class ExtensionDependencyStrategy : IExtensionDependencyStrategy
 {
-    public class ExtensionDependencyStrategy : IExtensionDependencyStrategy
+    public bool HasDependency(IFeatureInfo observer, IFeatureInfo subject)
     {
-        public bool HasDependency(IFeatureInfo observer, IFeatureInfo subject)
-        {
-            return observer.Dependencies.Contains(subject.Id);
-        }
+        return observer.Dependencies.Contains(subject.Id);
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Extensions/ExtensionInfo.cs b/src/OrchardCore/OrchardCore/Extensions/ExtensionInfo.cs
index 909994f4085..3ca55302e58 100644
--- a/src/OrchardCore/OrchardCore/Extensions/ExtensionInfo.cs
+++ b/src/OrchardCore/OrchardCore/Extensions/ExtensionInfo.cs
@@ -4,33 +4,32 @@
 using OrchardCore.Environment.Extensions.Manifests;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Environment.Extensions
+namespace OrchardCore.Environment.Extensions;
+
+public class ExtensionInfo : IExtensionInfo
 {
-    public class ExtensionInfo : IExtensionInfo
+    public ExtensionInfo(string extensionId)
     {
-        public ExtensionInfo(string extensionId)
-        {
-            Id = extensionId;
-            SubPath = Application.ModulesRoot + extensionId;
-            Manifest = new NotFoundManifestInfo();
-            Features = [];
-        }
-
-        public ExtensionInfo(
-            string subPath,
-            IManifestInfo manifestInfo,
-            Func<IManifestInfo, IExtensionInfo, IEnumerable<IFeatureInfo>> features)
-        {
-            Id = manifestInfo.ModuleInfo.Id;
-            SubPath = subPath;
-            Manifest = manifestInfo;
-            Features = features(manifestInfo, this);
-        }
+        Id = extensionId;
+        SubPath = Application.ModulesRoot + extensionId;
+        Manifest = new NotFoundManifestInfo();
+        Features = [];
+    }
 
-        public string Id { get; }
-        public string SubPath { get; }
-        public IManifestInfo Manifest { get; }
-        public IEnumerable<IFeatureInfo> Features { get; }
-        public bool Exists => Manifest.Exists;
+    public ExtensionInfo(
+        string subPath,
+        IManifestInfo manifestInfo,
+        Func<IManifestInfo, IExtensionInfo, IEnumerable<IFeatureInfo>> features)
+    {
+        Id = manifestInfo.ModuleInfo.Id;
+        SubPath = subPath;
+        Manifest = manifestInfo;
+        Features = features(manifestInfo, this);
     }
+
+    public string Id { get; }
+    public string SubPath { get; }
+    public IManifestInfo Manifest { get; }
+    public IEnumerable<IFeatureInfo> Features { get; }
+    public bool Exists => Manifest.Exists;
 }
diff --git a/src/OrchardCore/OrchardCore/Extensions/ExtensionManager.cs b/src/OrchardCore/OrchardCore/Extensions/ExtensionManager.cs
index deb8a8a766c..2b7ffff626f 100644
--- a/src/OrchardCore/OrchardCore/Extensions/ExtensionManager.cs
+++ b/src/OrchardCore/OrchardCore/Extensions/ExtensionManager.cs
@@ -17,387 +17,386 @@
 // ReSharper disable ConvertClosureToMethodGroup
 // ReSharper disable LoopCanBeConvertedToQuery
 
-namespace OrchardCore.Environment.Extensions
-{
-    public sealed class ExtensionManager : IExtensionManager
-    {
-        private readonly IServiceProvider _serviceProvider;
+namespace OrchardCore.Environment.Extensions;
 
-        private FrozenDictionary<string, ExtensionEntry> _extensions;
-        private IExtensionInfo[] _extensionsInfos;
-        private FrozenDictionary<string, IFeatureInfo> _features;
-        private IFeatureInfo[] _featureInfos;
+public sealed class ExtensionManager : IExtensionManager
+{
+    private readonly IServiceProvider _serviceProvider;
 
-        private readonly ConcurrentDictionary<string, Lazy<IEnumerable<IFeatureInfo>>> _featureDependencies = new();
-        private readonly ConcurrentDictionary<string, Lazy<IEnumerable<IFeatureInfo>>> _dependentFeatures = new();
+    private FrozenDictionary<string, ExtensionEntry> _extensions;
+    private IExtensionInfo[] _extensionsInfos;
+    private FrozenDictionary<string, IFeatureInfo> _features;
+    private IFeatureInfo[] _featureInfos;
 
-        private bool _isInitialized;
-        private readonly object _synLock = new();
+    private readonly ConcurrentDictionary<string, Lazy<IEnumerable<IFeatureInfo>>> _featureDependencies = new();
+    private readonly ConcurrentDictionary<string, Lazy<IEnumerable<IFeatureInfo>>> _dependentFeatures = new();
 
-        public ExtensionManager(
-            IServiceProvider serviceProvider,
-            ILogger<ExtensionManager> logger)
-        {
-            _serviceProvider = serviceProvider;
-            L = logger;
-        }
+    private bool _isInitialized;
+    private readonly object _synLock = new();
 
-        public ILogger L { get; set; }
+    public ExtensionManager(
+        IServiceProvider serviceProvider,
+        ILogger<ExtensionManager> logger)
+    {
+        _serviceProvider = serviceProvider;
+        L = logger;
+    }
 
-        public IExtensionInfo GetExtension(string extensionId)
-        {
-            EnsureInitialized();
+    public ILogger L { get; set; }
 
-            if (!string.IsNullOrEmpty(extensionId) && _extensions.TryGetValue(extensionId, out var extension))
-            {
-                return extension.ExtensionInfo;
-            }
+    public IExtensionInfo GetExtension(string extensionId)
+    {
+        EnsureInitialized();
 
-            return new NotFoundExtensionInfo(extensionId);
+        if (!string.IsNullOrEmpty(extensionId) && _extensions.TryGetValue(extensionId, out var extension))
+        {
+            return extension.ExtensionInfo;
         }
 
-        public IEnumerable<IExtensionInfo> GetExtensions()
-        {
-            EnsureInitialized();
+        return new NotFoundExtensionInfo(extensionId);
+    }
 
-            return _extensionsInfos;
-        }
+    public IEnumerable<IExtensionInfo> GetExtensions()
+    {
+        EnsureInitialized();
 
-        public IEnumerable<IFeatureInfo> GetFeatures()
-        {
-            EnsureInitialized();
+        return _extensionsInfos;
+    }
 
-            return _featureInfos;
-        }
+    public IEnumerable<IFeatureInfo> GetFeatures()
+    {
+        EnsureInitialized();
 
-        public IEnumerable<IFeatureInfo> GetFeatures(string[] featureIdsToLoad)
-        {
-            EnsureInitialized();
+        return _featureInfos;
+    }
 
-            var allDependencyIds = new HashSet<string>(featureIdsToLoad
-                .SelectMany(GetFeatureDependencies)
-                .Select(x => x.Id));
+    public IEnumerable<IFeatureInfo> GetFeatures(string[] featureIdsToLoad)
+    {
+        EnsureInitialized();
 
-            foreach (var featureInfo in _featureInfos)
+        var allDependencyIds = new HashSet<string>(featureIdsToLoad
+            .SelectMany(GetFeatureDependencies)
+            .Select(x => x.Id));
+
+        foreach (var featureInfo in _featureInfos)
+        {
+            if (allDependencyIds.Contains(featureInfo.Id))
             {
-                if (allDependencyIds.Contains(featureInfo.Id))
-                {
-                    yield return featureInfo;
-                }
+                yield return featureInfo;
             }
         }
+    }
 
-        public Task<ExtensionEntry> LoadExtensionAsync(IExtensionInfo extensionInfo)
-        {
-            EnsureInitialized();
+    public Task<ExtensionEntry> LoadExtensionAsync(IExtensionInfo extensionInfo)
+    {
+        EnsureInitialized();
 
-            _extensions.TryGetValue(extensionInfo.Id, out var extension);
+        _extensions.TryGetValue(extensionInfo.Id, out var extension);
 
-            return Task.FromResult(extension);
-        }
+        return Task.FromResult(extension);
+    }
 
-        public Task<IEnumerable<IFeatureInfo>> LoadFeaturesAsync()
-        {
-            EnsureInitialized();
+    public Task<IEnumerable<IFeatureInfo>> LoadFeaturesAsync()
+    {
+        EnsureInitialized();
 
-            // Must return the features ordered by dependencies.
-            return Task.FromResult<IEnumerable<IFeatureInfo>>(_featureInfos);
-        }
+        // Must return the features ordered by dependencies.
+        return Task.FromResult<IEnumerable<IFeatureInfo>>(_featureInfos);
+    }
 
-        public Task<IEnumerable<IFeatureInfo>> LoadFeaturesAsync(string[] featureIdsToLoad)
-        {
-            EnsureInitialized();
+    public Task<IEnumerable<IFeatureInfo>> LoadFeaturesAsync(string[] featureIdsToLoad)
+    {
+        EnsureInitialized();
 
-            var features = new HashSet<string>(GetFeatures(featureIdsToLoad).Select(f => f.Id));
+        var features = new HashSet<string>(GetFeatures(featureIdsToLoad).Select(f => f.Id));
 
-            // Must return the features ordered by dependencies.
-            var loadedFeatures = _featureInfos
-                .Where(f => features.Contains(f.Id));
+        // Must return the features ordered by dependencies.
+        var loadedFeatures = _featureInfos
+            .Where(f => features.Contains(f.Id));
 
-            return Task.FromResult(loadedFeatures);
-        }
+        return Task.FromResult(loadedFeatures);
+    }
 
-        public IEnumerable<IFeatureInfo> GetFeatureDependencies(string featureId)
-        {
-            EnsureInitialized();
+    public IEnumerable<IFeatureInfo> GetFeatureDependencies(string featureId)
+    {
+        EnsureInitialized();
 
-            return _featureDependencies.GetOrAdd(featureId, (key) => new Lazy<IEnumerable<IFeatureInfo>>(() =>
+        return _featureDependencies.GetOrAdd(featureId, (key) => new Lazy<IEnumerable<IFeatureInfo>>(() =>
+        {
+            if (!_features.TryGetValue(key, out var entry))
             {
-                if (!_features.TryGetValue(key, out var entry))
-                {
-                    return [];
-                }
+                return [];
+            }
 
-                return GetFeatureDependencies(entry, _featureInfos);
-            })).Value;
-        }
+            return GetFeatureDependencies(entry, _featureInfos);
+        })).Value;
+    }
 
-        public IEnumerable<IFeatureInfo> GetDependentFeatures(string featureId)
-        {
-            EnsureInitialized();
+    public IEnumerable<IFeatureInfo> GetDependentFeatures(string featureId)
+    {
+        EnsureInitialized();
 
-            return _dependentFeatures.GetOrAdd(featureId, (key) => new Lazy<IEnumerable<IFeatureInfo>>(() =>
+        return _dependentFeatures.GetOrAdd(featureId, (key) => new Lazy<IEnumerable<IFeatureInfo>>(() =>
+        {
+            if (!_features.TryGetValue(key, out var entry))
             {
-                if (!_features.TryGetValue(key, out var entry))
-                {
-                    return [];
-                }
+                return [];
+            }
 
-                return GetDependentFeatures(entry, _featureInfos);
-            })).Value;
+            return GetDependentFeatures(entry, _featureInfos);
+        })).Value;
+    }
+
+    private void EnsureInitialized()
+    {
+        if (_isInitialized)
+        {
+            return;
         }
 
-        private void EnsureInitialized()
+        lock (_synLock)
         {
             if (_isInitialized)
             {
                 return;
             }
 
-            lock (_synLock)
+            var applicationContext = _serviceProvider.GetRequiredService<IApplicationContext>();
+            var typeFeatureProvider = _serviceProvider.GetRequiredService<ITypeFeatureProvider>();
+            var featuresProvider = _serviceProvider.GetRequiredService<IFeaturesProvider>();
+
+            var extensionDependencyStrategies = _serviceProvider.GetServices<IExtensionDependencyStrategy>();
+            var extensionPriorityStrategies = _serviceProvider.GetServices<IExtensionPriorityStrategy>();
+
+            var modules = applicationContext.Application.Modules;
+            var loadedExtensions = new ConcurrentDictionary<string, ExtensionEntry>();
+
+            // Load all extensions in parallel.
+            Parallel.ForEach(modules, (module, cancellationToken) =>
             {
-                if (_isInitialized)
+                if (!module.ModuleInfo.Exists)
                 {
                     return;
                 }
 
-                var applicationContext = _serviceProvider.GetRequiredService<IApplicationContext>();
-                var typeFeatureProvider = _serviceProvider.GetRequiredService<ITypeFeatureProvider>();
-                var featuresProvider = _serviceProvider.GetRequiredService<IFeaturesProvider>();
+                var manifestInfo = new ManifestInfo(module.ModuleInfo);
+                var extensionInfo = new ExtensionInfo(module.SubPath, manifestInfo, (manifestInfo, extensionInfo) =>
+                {
+                    return featuresProvider.GetFeatures(extensionInfo, manifestInfo);
+                });
+
+                var entry = new ExtensionEntry
+                {
+                    ExtensionInfo = extensionInfo,
+                    Assembly = module.Assembly,
+                    ExportedTypes = module.Assembly.ExportedTypes
+                };
 
-                var extensionDependencyStrategies = _serviceProvider.GetServices<IExtensionDependencyStrategy>();
-                var extensionPriorityStrategies = _serviceProvider.GetServices<IExtensionPriorityStrategy>();
+                loadedExtensions.TryAdd(module.Name, entry);
+            });
 
-                var modules = applicationContext.Application.Modules;
-                var loadedExtensions = new ConcurrentDictionary<string, ExtensionEntry>();
+            // Get all types from all extension and add them to the type feature provider.
+            foreach (var loadedExtension in loadedExtensions)
+            {
+                var extension = loadedExtension.Value;
 
-                // Load all extensions in parallel.
-                Parallel.ForEach(modules, (module, cancellationToken) =>
+                foreach (var exportedType in extension.ExportedTypes.Where(IsComponentType))
                 {
-                    if (!module.ModuleInfo.Exists)
+                    if (!SkipExtensionFeatureRegistration(exportedType))
                     {
-                        return;
-                    }
+                        var sourceFeature = GetSourceFeatureNameForType(exportedType, extension.ExtensionInfo.Id);
 
-                    var manifestInfo = new ManifestInfo(module.ModuleInfo);
-                    var extensionInfo = new ExtensionInfo(module.SubPath, manifestInfo, (manifestInfo, extensionInfo) =>
-                    {
-                        return featuresProvider.GetFeatures(extensionInfo, manifestInfo);
-                    });
+                        var feature = extension.ExtensionInfo.Features.FirstOrDefault(f => f.Id == sourceFeature);
 
-                    var entry = new ExtensionEntry
-                    {
-                        ExtensionInfo = extensionInfo,
-                        Assembly = module.Assembly,
-                        ExportedTypes = module.Assembly.ExportedTypes
-                    };
-
-                    loadedExtensions.TryAdd(module.Name, entry);
-                });
+                        if (feature != null)
+                        {
+                            typeFeatureProvider.TryAdd(exportedType, feature);
 
-                // Get all types from all extension and add them to the type feature provider.
-                foreach (var loadedExtension in loadedExtensions)
-                {
-                    var extension = loadedExtension.Value;
+                            continue;
+                        }
 
-                    foreach (var exportedType in extension.ExportedTypes.Where(IsComponentType))
-                    {
-                        if (!SkipExtensionFeatureRegistration(exportedType))
+                        // Type has no specific feature, add it to all features.
+                        foreach (var curFeature in extension.ExtensionInfo.Features)
                         {
-                            var sourceFeature = GetSourceFeatureNameForType(exportedType, extension.ExtensionInfo.Id);
-
-                            var feature = extension.ExtensionInfo.Features.FirstOrDefault(f => f.Id == sourceFeature);
-
-                            if (feature != null)
-                            {
-                                typeFeatureProvider.TryAdd(exportedType, feature);
-                            
-                                continue;
-                            }
-                            
-                            // Type has no specific feature, add it to all features.
-                            foreach (var curFeature in extension.ExtensionInfo.Features)
-                            {
-                                typeFeatureProvider.TryAdd(exportedType, curFeature);
-                            }
+                            typeFeatureProvider.TryAdd(exportedType, curFeature);
                         }
                     }
                 }
+            }
 
-                // Feature infos and entries are ordered by priority and dependencies.
-                _featureInfos = Order(
-                    loadedExtensions.SelectMany(extension => extension.Value.ExtensionInfo.Features),
-                    extensionDependencyStrategies as IExtensionDependencyStrategy[] ?? extensionDependencyStrategies.ToArray(),
-                    extensionPriorityStrategies as IExtensionPriorityStrategy[] ?? extensionPriorityStrategies.ToArray());
-                _features = _featureInfos.ToFrozenDictionary(feature => feature.Id, feature => feature);
-
-                // Extensions are also ordered according to the weight of their first features.
-                _extensionsInfos = _featureInfos
-                    .Where(feature => feature.Id == feature.Extension.Features.First().Id)
-                    .Select(feature => feature.Extension)
-                    .ToArray();
+            // Feature infos and entries are ordered by priority and dependencies.
+            _featureInfos = Order(
+                loadedExtensions.SelectMany(extension => extension.Value.ExtensionInfo.Features),
+                extensionDependencyStrategies as IExtensionDependencyStrategy[] ?? extensionDependencyStrategies.ToArray(),
+                extensionPriorityStrategies as IExtensionPriorityStrategy[] ?? extensionPriorityStrategies.ToArray());
+            _features = _featureInfos.ToFrozenDictionary(feature => feature.Id, feature => feature);
+
+            // Extensions are also ordered according to the weight of their first features.
+            _extensionsInfos = _featureInfos
+                .Where(feature => feature.Id == feature.Extension.Features.First().Id)
+                .Select(feature => feature.Extension)
+                .ToArray();
 
-                _extensions = _extensionsInfos.ToFrozenDictionary(extension => extension.Id, extension => loadedExtensions[extension.Id]);
+            _extensions = _extensionsInfos.ToFrozenDictionary(extension => extension.Id, extension => loadedExtensions[extension.Id]);
 
-                if (L.IsEnabled(LogLevel.Trace))
+            if (L.IsEnabled(LogLevel.Trace))
+            {
+                foreach (var featureInfo in _featureInfos)
                 {
-                    foreach (var featureInfo in _featureInfos)
-                    {
-                        L.LogTrace("Loaded feature: {ExtensionId} - {FeatureId} ({FeatureName})", featureInfo.Extension.Id, featureInfo.Id, featureInfo.Name);
-                    }
+                    L.LogTrace("Loaded feature: {ExtensionId} - {FeatureId} ({FeatureName})", featureInfo.Extension.Id, featureInfo.Id, featureInfo.Name);
                 }
-
-                _isInitialized = true;
             }
+
+            _isInitialized = true;
         }
+    }
 
-        private static IEnumerable<IFeatureInfo> GetFeatureDependencies(
-            IFeatureInfo feature,
-            IFeatureInfo[] featureInfos)
-        {
-            var dependencyIds = new HashSet<string> { feature.Id };
-            var stack = new Stack<List<IFeatureInfo>>();
+    private static IEnumerable<IFeatureInfo> GetFeatureDependencies(
+        IFeatureInfo feature,
+        IFeatureInfo[] featureInfos)
+    {
+        var dependencyIds = new HashSet<string> { feature.Id };
+        var stack = new Stack<List<IFeatureInfo>>();
 
-            stack.Push(GetFeatureDependenciesFunc(feature, featureInfos));
+        stack.Push(GetFeatureDependenciesFunc(feature, featureInfos));
 
-            while (stack.Count > 0)
+        while (stack.Count > 0)
+        {
+            var next = stack.Pop();
+            foreach (var dependency in next)
             {
-                var next = stack.Pop();
-                foreach (var dependency in next)
+                if (dependencyIds.Add(dependency.Id))
                 {
-                    if (dependencyIds.Add(dependency.Id))
-                    {
-                        stack.Push(GetFeatureDependenciesFunc(dependency, featureInfos));
-                    }
+                    stack.Push(GetFeatureDependenciesFunc(dependency, featureInfos));
                 }
             }
+        }
 
-            // Preserve the underlying order of feature infos.
-            foreach (var featureInfo in featureInfos)
+        // Preserve the underlying order of feature infos.
+        foreach (var featureInfo in featureInfos)
+        {
+            if (dependencyIds.Contains(featureInfo.Id))
             {
-                if (dependencyIds.Contains(featureInfo.Id))
-                {
-                    yield return featureInfo;
-                }
+                yield return featureInfo;
             }
         }
+    }
 
-        private static IEnumerable<IFeatureInfo> GetDependentFeatures(
-            IFeatureInfo feature,
-            IFeatureInfo[] featureInfos)
-        {
-            var dependencyIds = new HashSet<string> { feature.Id };
-            var stack = new Stack<List<IFeatureInfo>>();
-
-            stack.Push(GetDependentFeaturesFunc(feature, featureInfos));
+    private static IEnumerable<IFeatureInfo> GetDependentFeatures(
+        IFeatureInfo feature,
+        IFeatureInfo[] featureInfos)
+    {
+        var dependencyIds = new HashSet<string> { feature.Id };
+        var stack = new Stack<List<IFeatureInfo>>();
 
-            while (stack.Count > 0)
-            {
-                var next = stack.Pop();
-                foreach (var dependency in next)
-                {
-                    if (dependencyIds.Add(dependency.Id))
-                    {
-                        stack.Push(GetDependentFeaturesFunc(dependency, featureInfos));
-                    }
-                }
-            }
+        stack.Push(GetDependentFeaturesFunc(feature, featureInfos));
 
-            // Preserve the underlying order of feature infos.
-            foreach (var featureInfo in featureInfos)
+        while (stack.Count > 0)
+        {
+            var next = stack.Pop();
+            foreach (var dependency in next)
             {
-                if (dependencyIds.Contains(featureInfo.Id))
+                if (dependencyIds.Add(dependency.Id))
                 {
-                    yield return featureInfo;
+                    stack.Push(GetDependentFeaturesFunc(dependency, featureInfos));
                 }
             }
         }
 
-        private static List<IFeatureInfo> GetDependentFeaturesFunc(IFeatureInfo currentFeature, IFeatureInfo[] features)
+        // Preserve the underlying order of feature infos.
+        foreach (var featureInfo in featureInfos)
         {
-            var list = new List<IFeatureInfo>();
-            foreach (var feature in features)
+            if (dependencyIds.Contains(featureInfo.Id))
             {
-                foreach (var dependencyId in feature.Dependencies)
-                {
-                    if (dependencyId == currentFeature.Id)
-                    {
-                        list.Add(feature);
-                        break;
-                    }
-                }
+                yield return featureInfo;
             }
-
-            return list;
         }
+    }
 
-        private static List<IFeatureInfo> GetFeatureDependenciesFunc(IFeatureInfo currentFeature, IFeatureInfo[] features)
+    private static List<IFeatureInfo> GetDependentFeaturesFunc(IFeatureInfo currentFeature, IFeatureInfo[] features)
+    {
+        var list = new List<IFeatureInfo>();
+        foreach (var feature in features)
         {
-            var list = new List<IFeatureInfo>();
-            foreach (var feature in features)
+            foreach (var dependencyId in feature.Dependencies)
             {
-                foreach (var dependencyId in currentFeature.Dependencies)
+                if (dependencyId == currentFeature.Id)
                 {
-                    if (dependencyId == feature.Id)
-                    {
-                        list.Add(feature);
-                        break;
-                    }
+                    list.Add(feature);
+                    break;
                 }
             }
-
-            return list;
         }
 
-        private static IFeatureInfo[] Order(IEnumerable<IFeatureInfo> featuresToOrder, IExtensionDependencyStrategy[] extensionDependencyStrategies, IExtensionPriorityStrategy[] extensionPriorityStrategies)
-        {
-            return featuresToOrder
-                .OrderBy(x => x.Id)
-                .OrderByDependenciesAndPriorities(
-                    (feature1, feature2) => HasDependency(feature1, feature2, extensionDependencyStrategies),
-                    feature => GetPriority(feature, extensionPriorityStrategies))
-                .ToArray();
-        }
+        return list;
+    }
 
-        private static bool HasDependency(IFeatureInfo observer, IFeatureInfo subject, IExtensionDependencyStrategy[] extensionDependencyStrategies)
+    private static List<IFeatureInfo> GetFeatureDependenciesFunc(IFeatureInfo currentFeature, IFeatureInfo[] features)
+    {
+        var list = new List<IFeatureInfo>();
+        foreach (var feature in features)
         {
-            foreach (var extensionDependencyStrategy in extensionDependencyStrategies)
+            foreach (var dependencyId in currentFeature.Dependencies)
             {
-                if (extensionDependencyStrategy.HasDependency(observer, subject))
+                if (dependencyId == feature.Id)
                 {
-                    return true;
+                    list.Add(feature);
+                    break;
                 }
             }
-
-            return false;
         }
 
-        private static int GetPriority(IFeatureInfo feature, IExtensionPriorityStrategy[] extensionPriorityStrategies)
+        return list;
+    }
+
+    private static IFeatureInfo[] Order(IEnumerable<IFeatureInfo> featuresToOrder, IExtensionDependencyStrategy[] extensionDependencyStrategies, IExtensionPriorityStrategy[] extensionPriorityStrategies)
+    {
+        return featuresToOrder
+            .OrderBy(x => x.Id)
+            .OrderByDependenciesAndPriorities(
+                (feature1, feature2) => HasDependency(feature1, feature2, extensionDependencyStrategies),
+                feature => GetPriority(feature, extensionPriorityStrategies))
+            .ToArray();
+    }
+
+    private static bool HasDependency(IFeatureInfo observer, IFeatureInfo subject, IExtensionDependencyStrategy[] extensionDependencyStrategies)
+    {
+        foreach (var extensionDependencyStrategy in extensionDependencyStrategies)
         {
-            var sum = 0;
-            foreach (var extensionPriorityStrategy in extensionPriorityStrategies)
+            if (extensionDependencyStrategy.HasDependency(observer, subject))
             {
-                sum += extensionPriorityStrategy.GetPriority(feature);
+                return true;
             }
-
-            return sum;
         }
 
-        private static string GetSourceFeatureNameForType(Type type, string extensionId)
-        {
-            var attribute = type.GetCustomAttributes<FeatureAttribute>(false).FirstOrDefault();
-
-            return attribute?.FeatureName ?? extensionId;
-        }
+        return false;
+    }
 
-        private static bool IsComponentType(Type type)
+    private static int GetPriority(IFeatureInfo feature, IExtensionPriorityStrategy[] extensionPriorityStrategies)
+    {
+        var sum = 0;
+        foreach (var extensionPriorityStrategy in extensionPriorityStrategies)
         {
-            return type.IsClass && !type.IsAbstract && type.IsPublic;
+            sum += extensionPriorityStrategy.GetPriority(feature);
         }
 
-        private static bool SkipExtensionFeatureRegistration(Type type)
-        {
-            return FeatureTypeDiscoveryAttribute.GetFeatureTypeDiscoveryForType(type)?.SkipExtension ?? false;
-        }
+        return sum;
+    }
+
+    private static string GetSourceFeatureNameForType(Type type, string extensionId)
+    {
+        var attribute = type.GetCustomAttributes<FeatureAttribute>(false).FirstOrDefault();
+
+        return attribute?.FeatureName ?? extensionId;
+    }
+
+    private static bool IsComponentType(Type type)
+    {
+        return type.IsClass && !type.IsAbstract && type.IsPublic;
+    }
+
+    private static bool SkipExtensionFeatureRegistration(Type type)
+    {
+        return FeatureTypeDiscoveryAttribute.GetFeatureTypeDiscoveryForType(type)?.SkipExtension ?? false;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Extensions/ExtensionPriorityStrategy.cs b/src/OrchardCore/OrchardCore/Extensions/ExtensionPriorityStrategy.cs
index a3b098d9be8..69c6148586e 100644
--- a/src/OrchardCore/OrchardCore/Extensions/ExtensionPriorityStrategy.cs
+++ b/src/OrchardCore/OrchardCore/Extensions/ExtensionPriorityStrategy.cs
@@ -1,12 +1,11 @@
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.Environment.Extensions
+namespace OrchardCore.Environment.Extensions;
+
+public class ExtensionPriorityStrategy : IExtensionPriorityStrategy
 {
-    public class ExtensionPriorityStrategy : IExtensionPriorityStrategy
+    public int GetPriority(IFeatureInfo feature)
     {
-        public int GetPriority(IFeatureInfo feature)
-        {
-            return feature.Priority;
-        }
+        return feature.Priority;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Extensions/Features/FeatureHash.cs b/src/OrchardCore/OrchardCore/Extensions/Features/FeatureHash.cs
index 8f06c2d13d3..0db2b220669 100644
--- a/src/OrchardCore/OrchardCore/Extensions/Features/FeatureHash.cs
+++ b/src/OrchardCore/OrchardCore/Extensions/Features/FeatureHash.cs
@@ -4,58 +4,57 @@
 using Microsoft.Extensions.Caching.Memory;
 using OrchardCore.Environment.Shell;
 
-namespace OrchardCore.Environment.Extensions.Features
+namespace OrchardCore.Environment.Extensions.Features;
+
+public class FeatureHash : IFeatureHash
 {
-    public class FeatureHash : IFeatureHash
-    {
-        private const string FeatureHashCacheKey = "FeatureHash:Features";
+    private const string FeatureHashCacheKey = "FeatureHash:Features";
+
+    private readonly IShellFeaturesManager _featureManager;
+    private readonly IMemoryCache _memoryCache;
 
-        private readonly IShellFeaturesManager _featureManager;
-        private readonly IMemoryCache _memoryCache;
+    public FeatureHash(IShellFeaturesManager featureManager, IMemoryCache memoryCache)
+    {
+        _memoryCache = memoryCache;
+        _featureManager = featureManager;
+    }
 
-        public FeatureHash(IShellFeaturesManager featureManager, IMemoryCache memoryCache)
+    public async Task<int> GetFeatureHashAsync()
+    {
+        if (_memoryCache.TryGetValue<int>(FeatureHashCacheKey, out var serial))
         {
-            _memoryCache = memoryCache;
-            _featureManager = featureManager;
+            return serial;
         }
 
-        public async Task<int> GetFeatureHashAsync()
-        {
-            if (_memoryCache.TryGetValue<int>(FeatureHashCacheKey, out var serial))
-            {
-                return serial;
-            }
+        // Calculate a hash of all enabled features' id
+        var enabledFeatures = await _featureManager.GetEnabledFeaturesAsync();
 
-            // Calculate a hash of all enabled features' id
-            var enabledFeatures = await _featureManager.GetEnabledFeaturesAsync();
+        var hashCode = new HashCode();
+        foreach (var feature in enabledFeatures)
+        {
+            hashCode.Add(feature.Id);
+        }
 
-            var hashCode = new HashCode();
-            foreach (var feature in enabledFeatures)
-            {
-                hashCode.Add(feature.Id);
-            }
+        serial = hashCode.ToHashCode();
 
-            serial = hashCode.ToHashCode();
+        _memoryCache.Set(FeatureHashCacheKey, serial);
 
-            _memoryCache.Set(FeatureHashCacheKey, serial);
+        return serial;
+    }
 
-            return serial;
-        }
+    public async Task<int> GetFeatureHashAsync(string featureId)
+    {
+        var cacheKey = string.Format("{0}:{1}", FeatureHashCacheKey, featureId);
 
-        public async Task<int> GetFeatureHashAsync(string featureId)
+        if (!_memoryCache.TryGetValue<bool>(cacheKey, out var enabled))
         {
-            var cacheKey = string.Format("{0}:{1}", FeatureHashCacheKey, featureId);
-
-            if (!_memoryCache.TryGetValue<bool>(cacheKey, out var enabled))
-            {
-                var enabledFeatures = await _featureManager.GetEnabledFeaturesAsync();
-
-                enabled = enabledFeatures.Any(x => x.Id.Equals(featureId, StringComparison.Ordinal));
+            var enabledFeatures = await _featureManager.GetEnabledFeaturesAsync();
 
-                _memoryCache.Set(cacheKey, enabled);
-            }
+            enabled = enabledFeatures.Any(x => x.Id.Equals(featureId, StringComparison.Ordinal));
 
-            return enabled ? 1 : 0;
+            _memoryCache.Set(cacheKey, enabled);
         }
+
+        return enabled ? 1 : 0;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Extensions/Features/FeatureInfo.cs b/src/OrchardCore/OrchardCore/Extensions/Features/FeatureInfo.cs
index 078cf64cc67..e5e711c13c3 100644
--- a/src/OrchardCore/OrchardCore/Extensions/Features/FeatureInfo.cs
+++ b/src/OrchardCore/OrchardCore/Extensions/Features/FeatureInfo.cs
@@ -1,47 +1,46 @@
-namespace OrchardCore.Environment.Extensions.Features
+namespace OrchardCore.Environment.Extensions.Features;
+
+public class FeatureInfo : IFeatureInfo
 {
-    public class FeatureInfo : IFeatureInfo
+    public FeatureInfo(string id, IExtensionInfo extensionInfo)
     {
-        public FeatureInfo(string id, IExtensionInfo extensionInfo)
-        {
-            Id = Name = id;
-            Extension = extensionInfo;
-            Dependencies = [];
-        }
-
-        public FeatureInfo(
-            string id,
-            string name,
-            int priority,
-            string category,
-            string description,
-            IExtensionInfo extension,
-            string[] dependencies,
-            bool defaultTenantOnly,
-            bool isAlwaysEnabled,
-            bool enabledByDependencyOnly)
-        {
-            Id = id;
-            Name = name;
-            Priority = priority;
-            Category = category;
-            Description = description;
-            Extension = extension;
-            Dependencies = dependencies;
-            DefaultTenantOnly = defaultTenantOnly;
-            IsAlwaysEnabled = isAlwaysEnabled;
-            EnabledByDependencyOnly = enabledByDependencyOnly;
-        }
+        Id = Name = id;
+        Extension = extensionInfo;
+        Dependencies = [];
+    }
 
-        public string Id { get; }
-        public string Name { get; }
-        public int Priority { get; }
-        public string Category { get; }
-        public string Description { get; }
-        public bool DefaultTenantOnly { get; }
-        public IExtensionInfo Extension { get; }
-        public string[] Dependencies { get; }
-        public bool IsAlwaysEnabled { get; }
-        public bool EnabledByDependencyOnly { get; }
+    public FeatureInfo(
+        string id,
+        string name,
+        int priority,
+        string category,
+        string description,
+        IExtensionInfo extension,
+        string[] dependencies,
+        bool defaultTenantOnly,
+        bool isAlwaysEnabled,
+        bool enabledByDependencyOnly)
+    {
+        Id = id;
+        Name = name;
+        Priority = priority;
+        Category = category;
+        Description = description;
+        Extension = extension;
+        Dependencies = dependencies;
+        DefaultTenantOnly = defaultTenantOnly;
+        IsAlwaysEnabled = isAlwaysEnabled;
+        EnabledByDependencyOnly = enabledByDependencyOnly;
     }
+
+    public string Id { get; }
+    public string Name { get; }
+    public int Priority { get; }
+    public string Category { get; }
+    public string Description { get; }
+    public bool DefaultTenantOnly { get; }
+    public IExtensionInfo Extension { get; }
+    public string[] Dependencies { get; }
+    public bool IsAlwaysEnabled { get; }
+    public bool EnabledByDependencyOnly { get; }
 }
diff --git a/src/OrchardCore/OrchardCore/Extensions/Features/FeaturesProvider.cs b/src/OrchardCore/OrchardCore/Extensions/Features/FeaturesProvider.cs
index 392644a5576..0947165b0db 100644
--- a/src/OrchardCore/OrchardCore/Extensions/Features/FeaturesProvider.cs
+++ b/src/OrchardCore/OrchardCore/Extensions/Features/FeaturesProvider.cs
@@ -2,109 +2,53 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OrchardCore.Environment.Extensions.Features
+namespace OrchardCore.Environment.Extensions.Features;
+
+/// <inheritdoc/>
+public class FeaturesProvider : IFeaturesProvider
 {
-    /// <inheritdoc/>
-    public class FeaturesProvider : IFeaturesProvider
-    {
-        public const string FeatureProviderStateKey = "FeatureProvider:Features";
+    public const string FeatureProviderStateKey = "FeatureProvider:Features";
 
-        private readonly IEnumerable<IFeatureBuilderEvents> _featureBuilderEvents;
+    private readonly IEnumerable<IFeatureBuilderEvents> _featureBuilderEvents;
 
-        /// <summary>
-        /// Constructs a provider instance.
-        /// </summary>
-        /// <param name="featureBuilderEvents"></param>
-        public FeaturesProvider(IEnumerable<IFeatureBuilderEvents> featureBuilderEvents)
-        {
-            _featureBuilderEvents = featureBuilderEvents;
-        }
+    /// <summary>
+    /// Constructs a provider instance.
+    /// </summary>
+    /// <param name="featureBuilderEvents"></param>
+    public FeaturesProvider(IEnumerable<IFeatureBuilderEvents> featureBuilderEvents)
+    {
+        _featureBuilderEvents = featureBuilderEvents;
+    }
 
-        public IEnumerable<IFeatureInfo> GetFeatures(IExtensionInfo extensionInfo, IManifestInfo manifestInfo)
-        {
-            var featuresInfos = new List<IFeatureInfo>();
+    public IEnumerable<IFeatureInfo> GetFeatures(IExtensionInfo extensionInfo, IManifestInfo manifestInfo)
+    {
+        var featuresInfos = new List<IFeatureInfo>();
 
-            // Features and Dependencies live within this section
-            var features = manifestInfo.ModuleInfo.Features.ToList();
-            if (features.Count > 0)
+        // Features and Dependencies live within this section
+        var features = manifestInfo.ModuleInfo.Features.ToList();
+        if (features.Count > 0)
+        {
+            foreach (var feature in features)
             {
-                foreach (var feature in features)
+                if (string.IsNullOrWhiteSpace(feature.Id))
                 {
-                    if (string.IsNullOrWhiteSpace(feature.Id))
-                    {
-                        throw new ArgumentException(
-                            $"A {nameof(feature)} is missing a mandatory '{nameof(feature.Id)}' property in the Module '{extensionInfo.Id}'");
-                    }
-
-                    // Attribute properties are transparently resolved by the instances themselves for convenience
-                    var featureId = feature.Id;
-                    var featureName = feature.Name;
-
-                    var featureDependencyIds = feature.Dependencies;
-
-                    // Categorize, Prioritize, Describe, using the ModuleInfo (ModuleAttribute) as the back stop
-                    var featureCategory = feature.Categorize(manifestInfo.ModuleInfo);
-                    var featurePriority = feature.Prioritize(manifestInfo.ModuleInfo);
-                    var featureDescription = feature.Describe(manifestInfo.ModuleInfo);
-                    var featureDefaultTenantOnly = feature.DefaultTenantOnly;
-                    var featureIsAlwaysEnabled = feature.IsAlwaysEnabled;
-                    var featureEnabledByDependencyOnly = feature.EnabledByDependencyOnly;
-
-                    var context = new FeatureBuildingContext
-                    {
-                        FeatureId = featureId,
-                        FeatureName = featureName,
-                        Category = featureCategory,
-                        Description = featureDescription,
-                        ExtensionInfo = extensionInfo,
-                        ManifestInfo = manifestInfo,
-                        Priority = featurePriority,
-                        FeatureDependencyIds = featureDependencyIds,
-                        DefaultTenantOnly = featureDefaultTenantOnly,
-                        IsAlwaysEnabled = featureIsAlwaysEnabled,
-                        EnabledByDependencyOnly = featureEnabledByDependencyOnly
-                    };
-
-                    foreach (var builder in _featureBuilderEvents)
-                    {
-                        builder.Building(context);
-                    }
-
-                    var featureInfo = new FeatureInfo(
-                        context.FeatureId,
-                        context.FeatureName,
-                        context.Priority,
-                        context.Category,
-                        context.Description,
-                        context.ExtensionInfo,
-                        context.FeatureDependencyIds,
-                        context.DefaultTenantOnly,
-                        context.IsAlwaysEnabled,
-                        context.EnabledByDependencyOnly);
-
-                    foreach (var builder in _featureBuilderEvents)
-                    {
-                        builder.Built(featureInfo);
-                    }
-
-                    featuresInfos.Add(featureInfo);
+                    throw new ArgumentException(
+                        $"A {nameof(feature)} is missing a mandatory '{nameof(feature.Id)}' property in the Module '{extensionInfo.Id}'");
                 }
-            }
-            else
-            {
-                // The Extension has only one feature, itself, and that can have dependencies
-                var featureId = extensionInfo.Id;
-                var featureName = manifestInfo.Name;
 
-                var featureDependencyIds = manifestInfo.ModuleInfo.Dependencies;
+                // Attribute properties are transparently resolved by the instances themselves for convenience
+                var featureId = feature.Id;
+                var featureName = feature.Name;
+
+                var featureDependencyIds = feature.Dependencies;
 
-                // Ditto Categorize, Prioritize, Describe, in this case the root Module 'is' the back stop
-                var featureCategory = manifestInfo.ModuleInfo.Categorize();
-                var featurePriority = manifestInfo.ModuleInfo.Prioritize();
-                var featureDescription = manifestInfo.ModuleInfo.Describe();
-                var featureDefaultTenantOnly = manifestInfo.ModuleInfo.DefaultTenantOnly;
-                var featureIsAlwaysEnabled = manifestInfo.ModuleInfo.IsAlwaysEnabled;
-                var featureEnabledByDependencyOnly = manifestInfo.ModuleInfo.EnabledByDependencyOnly;
+                // Categorize, Prioritize, Describe, using the ModuleInfo (ModuleAttribute) as the back stop
+                var featureCategory = feature.Categorize(manifestInfo.ModuleInfo);
+                var featurePriority = feature.Prioritize(manifestInfo.ModuleInfo);
+                var featureDescription = feature.Describe(manifestInfo.ModuleInfo);
+                var featureDefaultTenantOnly = feature.DefaultTenantOnly;
+                var featureIsAlwaysEnabled = feature.IsAlwaysEnabled;
+                var featureEnabledByDependencyOnly = feature.EnabledByDependencyOnly;
 
                 var context = new FeatureBuildingContext
                 {
@@ -118,7 +62,7 @@ public IEnumerable<IFeatureInfo> GetFeatures(IExtensionInfo extensionInfo, IMani
                     FeatureDependencyIds = featureDependencyIds,
                     DefaultTenantOnly = featureDefaultTenantOnly,
                     IsAlwaysEnabled = featureIsAlwaysEnabled,
-                    EnabledByDependencyOnly = featureEnabledByDependencyOnly,
+                    EnabledByDependencyOnly = featureEnabledByDependencyOnly
                 };
 
                 foreach (var builder in _featureBuilderEvents)
@@ -145,8 +89,63 @@ public IEnumerable<IFeatureInfo> GetFeatures(IExtensionInfo extensionInfo, IMani
 
                 featuresInfos.Add(featureInfo);
             }
+        }
+        else
+        {
+            // The Extension has only one feature, itself, and that can have dependencies
+            var featureId = extensionInfo.Id;
+            var featureName = manifestInfo.Name;
+
+            var featureDependencyIds = manifestInfo.ModuleInfo.Dependencies;
+
+            // Ditto Categorize, Prioritize, Describe, in this case the root Module 'is' the back stop
+            var featureCategory = manifestInfo.ModuleInfo.Categorize();
+            var featurePriority = manifestInfo.ModuleInfo.Prioritize();
+            var featureDescription = manifestInfo.ModuleInfo.Describe();
+            var featureDefaultTenantOnly = manifestInfo.ModuleInfo.DefaultTenantOnly;
+            var featureIsAlwaysEnabled = manifestInfo.ModuleInfo.IsAlwaysEnabled;
+            var featureEnabledByDependencyOnly = manifestInfo.ModuleInfo.EnabledByDependencyOnly;
+
+            var context = new FeatureBuildingContext
+            {
+                FeatureId = featureId,
+                FeatureName = featureName,
+                Category = featureCategory,
+                Description = featureDescription,
+                ExtensionInfo = extensionInfo,
+                ManifestInfo = manifestInfo,
+                Priority = featurePriority,
+                FeatureDependencyIds = featureDependencyIds,
+                DefaultTenantOnly = featureDefaultTenantOnly,
+                IsAlwaysEnabled = featureIsAlwaysEnabled,
+                EnabledByDependencyOnly = featureEnabledByDependencyOnly,
+            };
+
+            foreach (var builder in _featureBuilderEvents)
+            {
+                builder.Building(context);
+            }
+
+            var featureInfo = new FeatureInfo(
+                context.FeatureId,
+                context.FeatureName,
+                context.Priority,
+                context.Category,
+                context.Description,
+                context.ExtensionInfo,
+                context.FeatureDependencyIds,
+                context.DefaultTenantOnly,
+                context.IsAlwaysEnabled,
+                context.EnabledByDependencyOnly);
+
+            foreach (var builder in _featureBuilderEvents)
+            {
+                builder.Built(featureInfo);
+            }
 
-            return featuresInfos;
+            featuresInfos.Add(featureInfo);
         }
+
+        return featuresInfos;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Extensions/Features/TypeFeatureProvider.cs b/src/OrchardCore/OrchardCore/Extensions/Features/TypeFeatureProvider.cs
index 6bea06f9815..008c5181217 100644
--- a/src/OrchardCore/OrchardCore/Extensions/Features/TypeFeatureProvider.cs
+++ b/src/OrchardCore/OrchardCore/Extensions/Features/TypeFeatureProvider.cs
@@ -4,57 +4,56 @@
 using System.Linq;
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.Environment.Extensions
+namespace OrchardCore.Environment.Extensions;
+
+public class TypeFeatureProvider : ITypeFeatureProvider
 {
-    public class TypeFeatureProvider : ITypeFeatureProvider
-    {
-        private readonly ConcurrentDictionary<Type, IEnumerable<IFeatureInfo>> _features = new();
+    private readonly ConcurrentDictionary<Type, IEnumerable<IFeatureInfo>> _features = new();
 
-        public IExtensionInfo GetExtensionForDependency(Type dependency)
+    public IExtensionInfo GetExtensionForDependency(Type dependency)
+    {
+        if (_features.TryGetValue(dependency, out var features))
         {
-            if (_features.TryGetValue(dependency, out var features))
-            {
-                return features.First().Extension;
-            }
-
-            throw new InvalidOperationException($"Could not resolve extension for type {dependency.Name}.");
+            return features.First().Extension;
         }
 
-        public IFeatureInfo GetFeatureForDependency(Type dependency)
-        {
-            if (_features.TryGetValue(dependency, out var features))
-            {
-                // Gets the first feature that has the same ID as the extension, if any. 
-                // Otherwise returns the first feature.
-                return features.FirstOrDefault(feature => feature.Extension.Id == feature.Id) ?? features.First();
-            }
-
-            throw new InvalidOperationException($"Could not resolve main feature for type {dependency.Name}.");
-        }
+        throw new InvalidOperationException($"Could not resolve extension for type {dependency.Name}.");
+    }
 
-        public IEnumerable<IFeatureInfo> GetFeaturesForDependency(Type dependency)
+    public IFeatureInfo GetFeatureForDependency(Type dependency)
+    {
+        if (_features.TryGetValue(dependency, out var features))
         {
-            if (_features.TryGetValue(dependency, out var features))
-            {
-                return features;
-            }
-
-            throw new InvalidOperationException($"Could not resolve features for type {dependency.Name}.");
+            // Gets the first feature that has the same ID as the extension, if any. 
+            // Otherwise returns the first feature.
+            return features.FirstOrDefault(feature => feature.Extension.Id == feature.Id) ?? features.First();
         }
 
-        public IEnumerable<Type> GetTypesForFeature(IFeatureInfo feature)
+        throw new InvalidOperationException($"Could not resolve main feature for type {dependency.Name}.");
+    }
+
+    public IEnumerable<IFeatureInfo> GetFeaturesForDependency(Type dependency)
+    {
+        if (_features.TryGetValue(dependency, out var features))
         {
-            return _features.Where(kv => kv.Value.Contains(feature)).Select(kv => kv.Key);
+            return features;
         }
 
-        public void TryAdd(Type type, IFeatureInfo feature)
-        {
-            var features = _features.AddOrUpdate(type, (key, value) => [value], (key, features, value) => features.Contains(value) ? features : features.Append(value).ToArray(), feature);
+        throw new InvalidOperationException($"Could not resolve features for type {dependency.Name}.");
+    }
+
+    public IEnumerable<Type> GetTypesForFeature(IFeatureInfo feature)
+    {
+        return _features.Where(kv => kv.Value.Contains(feature)).Select(kv => kv.Key);
+    }
 
-            if (features.Count() > 1 && (FeatureTypeDiscoveryAttribute.GetFeatureTypeDiscoveryForType(type)?.SingleFeatureOnly ?? false))
-            {
-                throw new InvalidOperationException($"The type {type} can only be assigned to a single feature. Make sure the type is not added to DI by multiple startup classes.");
-            }
+    public void TryAdd(Type type, IFeatureInfo feature)
+    {
+        var features = _features.AddOrUpdate(type, (key, value) => [value], (key, features, value) => features.Contains(value) ? features : features.Append(value).ToArray(), feature);
+
+        if (features.Count() > 1 && (FeatureTypeDiscoveryAttribute.GetFeatureTypeDiscoveryForType(type)?.SingleFeatureOnly ?? false))
+        {
+            throw new InvalidOperationException($"The type {type} can only be assigned to a single feature. Make sure the type is not added to DI by multiple startup classes.");
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Extensions/Manifests/ManifestInfo.cs b/src/OrchardCore/OrchardCore/Extensions/Manifests/ManifestInfo.cs
index 6394a02dbdb..2bb15bed76b 100644
--- a/src/OrchardCore/OrchardCore/Extensions/Manifests/ManifestInfo.cs
+++ b/src/OrchardCore/OrchardCore/Extensions/Manifests/ManifestInfo.cs
@@ -1,23 +1,22 @@
 using System.Collections.Generic;
 using OrchardCore.Modules.Manifest;
 
-namespace OrchardCore.Environment.Extensions.Manifests
+namespace OrchardCore.Environment.Extensions.Manifests;
+
+public class ManifestInfo : IManifestInfo
 {
-    public class ManifestInfo : IManifestInfo
+    public ManifestInfo(ModuleAttribute moduleInfo)
     {
-        public ManifestInfo(ModuleAttribute moduleInfo)
-        {
-            ModuleInfo = moduleInfo;
-        }
-
-        public bool Exists => ModuleInfo.Exists;
-        public string Name => ModuleInfo.Name ?? ModuleInfo.Id;
-        public string Description => ModuleInfo.Description;
-        public string Type => ModuleInfo.Type;
-        public string Author => ModuleInfo.Author;
-        public string Website => ModuleInfo.Website;
-        public string Version => ModuleInfo.Version;
-        public IEnumerable<string> Tags => ModuleInfo.Tags;
-        public ModuleAttribute ModuleInfo { get; }
+        ModuleInfo = moduleInfo;
     }
+
+    public bool Exists => ModuleInfo.Exists;
+    public string Name => ModuleInfo.Name ?? ModuleInfo.Id;
+    public string Description => ModuleInfo.Description;
+    public string Type => ModuleInfo.Type;
+    public string Author => ModuleInfo.Author;
+    public string Website => ModuleInfo.Website;
+    public string Version => ModuleInfo.Version;
+    public IEnumerable<string> Tags => ModuleInfo.Tags;
+    public ModuleAttribute ModuleInfo { get; }
 }
diff --git a/src/OrchardCore/OrchardCore/Extensions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore/Extensions/ServiceCollectionExtensions.cs
index 1018b115756..46025e141a9 100644
--- a/src/OrchardCore/OrchardCore/Extensions/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore/Extensions/ServiceCollectionExtensions.cs
@@ -2,26 +2,25 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.Environment.Extensions
+namespace OrchardCore.Environment.Extensions;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    public static IServiceCollection AddExtensionManagerHost(this IServiceCollection services)
     {
-        public static IServiceCollection AddExtensionManagerHost(this IServiceCollection services)
-        {
-            services.AddSingleton<IExtensionManager, ExtensionManager>();
-            services.AddSingleton<ITypeFeatureProvider, TypeFeatureProvider>();
-            services.AddTransient<IFeaturesProvider, FeaturesProvider>();
-            services.AddTransient<IExtensionDependencyStrategy, ExtensionDependencyStrategy>();
-            services.AddTransient<IExtensionPriorityStrategy, ExtensionPriorityStrategy>();
+        services.AddSingleton<IExtensionManager, ExtensionManager>();
+        services.AddSingleton<ITypeFeatureProvider, TypeFeatureProvider>();
+        services.AddTransient<IFeaturesProvider, FeaturesProvider>();
+        services.AddTransient<IExtensionDependencyStrategy, ExtensionDependencyStrategy>();
+        services.AddTransient<IExtensionPriorityStrategy, ExtensionPriorityStrategy>();
 
-            return services;
-        }
+        return services;
+    }
 
-        public static IServiceCollection AddExtensionManager(this IServiceCollection services)
-        {
-            services.TryAddTransient<IFeatureHash, FeatureHash>();
+    public static IServiceCollection AddExtensionManager(this IServiceCollection services)
+    {
+        services.TryAddTransient<IFeatureHash, FeatureHash>();
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Localization/BclCalendars.cs b/src/OrchardCore/OrchardCore/Localization/BclCalendars.cs
index 64f70d72d96..8fb65931c99 100644
--- a/src/OrchardCore/OrchardCore/Localization/BclCalendars.cs
+++ b/src/OrchardCore/OrchardCore/Localization/BclCalendars.cs
@@ -2,101 +2,100 @@
 using System.Globalization;
 using NodaTime;
 
-namespace OrchardCore.Localization
-{
-    internal static class BclCalendars
-    {
-        public readonly static Calendar Hebrew = new HebrewCalendar();
-        public readonly static Calendar Hijri = new HijriCalendar();
-        public readonly static Calendar Gregorian = new GregorianCalendar();
-        public readonly static Calendar Julian = new JulianCalendar();
-        public readonly static Calendar Persian = new PersianCalendar();
-        public readonly static Calendar UmAlQura = new UmAlQuraCalendar();
+namespace OrchardCore.Localization;
 
-        public static CalendarSystem GetCalendarByName(CalendarName calendarName) =>
-            calendarName switch
-            {
-                CalendarName.Hebrew => CalendarSystem.HebrewCivil,
-                CalendarName.Hijri => CalendarSystem.IslamicBcl,
-                CalendarName.Gregorian => CalendarSystem.Iso,
-                CalendarName.Julian => CalendarSystem.Julian,
-                CalendarName.Persian => CultureInfo.CurrentUICulture.Calendar.IsLeapYear(1)
-                    ? CalendarSystem.PersianSimple
-                    : CalendarSystem.PersianAstronomical,
-                CalendarName.UmAlQura => CalendarSystem.UmAlQura,
-                _ => throw new NotSupportedException($"The calendar is not supported."),
-            };
+internal static class BclCalendars
+{
+    public readonly static Calendar Hebrew = new HebrewCalendar();
+    public readonly static Calendar Hijri = new HijriCalendar();
+    public readonly static Calendar Gregorian = new GregorianCalendar();
+    public readonly static Calendar Julian = new JulianCalendar();
+    public readonly static Calendar Persian = new PersianCalendar();
+    public readonly static Calendar UmAlQura = new UmAlQuraCalendar();
 
-        public static CalendarName GetCalendarName(Calendar calendar)
+    public static CalendarSystem GetCalendarByName(CalendarName calendarName) =>
+        calendarName switch
         {
-            ArgumentNullException.ThrowIfNull(calendar);
+            CalendarName.Hebrew => CalendarSystem.HebrewCivil,
+            CalendarName.Hijri => CalendarSystem.IslamicBcl,
+            CalendarName.Gregorian => CalendarSystem.Iso,
+            CalendarName.Julian => CalendarSystem.Julian,
+            CalendarName.Persian => CultureInfo.CurrentUICulture.Calendar.IsLeapYear(1)
+                ? CalendarSystem.PersianSimple
+                : CalendarSystem.PersianAstronomical,
+            CalendarName.UmAlQura => CalendarSystem.UmAlQura,
+            _ => throw new NotSupportedException($"The calendar is not supported."),
+        };
 
-            var calendarType = calendar.GetType();
-            if (calendarType == typeof(GregorianCalendar))
-            {
-                return CalendarName.Gregorian;
-            }
-            else if (calendarType == typeof(HebrewCalendar))
-            {
-                return CalendarName.Hebrew;
-            }
-            else if (calendarType == typeof(HijriCalendar))
-            {
-                return CalendarName.Hijri;
-            }
-            else if (calendarType == typeof(JulianCalendar))
-            {
-                return CalendarName.Julian;
-            }
-            else if (calendarType == typeof(PersianCalendar))
-            {
-                return CalendarName.Persian;
-            }
-            else if (calendarType == typeof(UmAlQuraCalendar))
-            {
-                return CalendarName.UmAlQura;
-            }
-            else
-            {
-                return CalendarName.Unknown;
-            }
-        }
+    public static CalendarName GetCalendarName(Calendar calendar)
+    {
+        ArgumentNullException.ThrowIfNull(calendar);
 
-        public static CalendarSystem ConvertToCalendarSystem(Calendar calendar)
+        var calendarType = calendar.GetType();
+        if (calendarType == typeof(GregorianCalendar))
+        {
+            return CalendarName.Gregorian;
+        }
+        else if (calendarType == typeof(HebrewCalendar))
+        {
+            return CalendarName.Hebrew;
+        }
+        else if (calendarType == typeof(HijriCalendar))
+        {
+            return CalendarName.Hijri;
+        }
+        else if (calendarType == typeof(JulianCalendar))
+        {
+            return CalendarName.Julian;
+        }
+        else if (calendarType == typeof(PersianCalendar))
+        {
+            return CalendarName.Persian;
+        }
+        else if (calendarType == typeof(UmAlQuraCalendar))
+        {
+            return CalendarName.UmAlQura;
+        }
+        else
         {
-            ArgumentNullException.ThrowIfNull(calendar);
+            return CalendarName.Unknown;
+        }
+    }
 
-            var calendarType = calendar.GetType();
-            if (calendarType == typeof(GregorianCalendar))
-            {
-                return CalendarSystem.Iso;
-            }
-            else if (calendarType == typeof(HebrewCalendar))
-            {
-                return CalendarSystem.HebrewCivil;
-            }
-            else if (calendarType == typeof(HijriCalendar))
-            {
-                return CalendarSystem.IslamicBcl;
-            }
-            else if (calendarType == typeof(JulianCalendar))
-            {
-                return CalendarSystem.Julian;
-            }
-            else if (calendarType == typeof(PersianCalendar))
-            {
-                return calendar.IsLeapYear(1)
-                    ? CalendarSystem.PersianSimple
-                    : CalendarSystem.PersianAstronomical;
-            }
-            else if (calendarType == typeof(UmAlQuraCalendar))
-            {
-                return CalendarSystem.UmAlQura;
-            }
-            else
-            {
-                return null;
-            }
+    public static CalendarSystem ConvertToCalendarSystem(Calendar calendar)
+    {
+        ArgumentNullException.ThrowIfNull(calendar);
+
+        var calendarType = calendar.GetType();
+        if (calendarType == typeof(GregorianCalendar))
+        {
+            return CalendarSystem.Iso;
+        }
+        else if (calendarType == typeof(HebrewCalendar))
+        {
+            return CalendarSystem.HebrewCivil;
+        }
+        else if (calendarType == typeof(HijriCalendar))
+        {
+            return CalendarSystem.IslamicBcl;
+        }
+        else if (calendarType == typeof(JulianCalendar))
+        {
+            return CalendarSystem.Julian;
+        }
+        else if (calendarType == typeof(PersianCalendar))
+        {
+            return calendar.IsLeapYear(1)
+                ? CalendarSystem.PersianSimple
+                : CalendarSystem.PersianAstronomical;
+        }
+        else if (calendarType == typeof(UmAlQuraCalendar))
+        {
+            return CalendarSystem.UmAlQura;
+        }
+        else
+        {
+            return null;
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Localization/DefaultCalendarManager.cs b/src/OrchardCore/OrchardCore/Localization/DefaultCalendarManager.cs
index 9f5b62f12ed..4d2c51882f6 100644
--- a/src/OrchardCore/OrchardCore/Localization/DefaultCalendarManager.cs
+++ b/src/OrchardCore/OrchardCore/Localization/DefaultCalendarManager.cs
@@ -2,58 +2,57 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents a default implementation to manage the calendars.
+/// </summary>
+public class DefaultCalendarManager : ICalendarManager
 {
+    private readonly IEnumerable<ICalendarSelector> _calendarSelectors;
+
+    private CalendarName? _calendarName;
+
     /// <summary>
-    /// Represents a default implementation to manage the calendars.
+    /// Creates a new instance of <see cref="DefaultCalendarManager"/>.
     /// </summary>
-    public class DefaultCalendarManager : ICalendarManager
+    /// <param name="calendarSelectors">A list of <see cref="ICalendarSelector"/>.</param>
+    public DefaultCalendarManager(IEnumerable<ICalendarSelector> calendarSelectors)
     {
-        private readonly IEnumerable<ICalendarSelector> _calendarSelectors;
-
-        private CalendarName? _calendarName;
+        _calendarSelectors = calendarSelectors;
+    }
 
-        /// <summary>
-        /// Creates a new instance of <see cref="DefaultCalendarManager"/>.
-        /// </summary>
-        /// <param name="calendarSelectors">A list of <see cref="ICalendarSelector"/>.</param>
-        public DefaultCalendarManager(IEnumerable<ICalendarSelector> calendarSelectors)
+    /// <inheritdocs />
+    public async Task<CalendarName> GetCurrentCalendar()
+    {
+        if (_calendarName.HasValue)
         {
-            _calendarSelectors = calendarSelectors;
+            return _calendarName.Value;
         }
 
-        /// <inheritdocs />
-        public async Task<CalendarName> GetCurrentCalendar()
-        {
-            if (_calendarName.HasValue)
-            {
-                return _calendarName.Value;
-            }
+        var calendarResults = new List<CalendarSelectorResult>();
 
-            var calendarResults = new List<CalendarSelectorResult>();
+        foreach (var calendarSelector in _calendarSelectors)
+        {
+            var calendarResult = await calendarSelector.GetCalendarAsync();
 
-            foreach (var calendarSelector in _calendarSelectors)
+            if (calendarResult != null)
             {
-                var calendarResult = await calendarSelector.GetCalendarAsync();
-
-                if (calendarResult != null)
-                {
-                    calendarResults.Add(calendarResult);
-                }
+                calendarResults.Add(calendarResult);
             }
+        }
 
-            if (calendarResults.Count == 0)
-            {
-                return CalendarName.Unknown;
-            }
-            else if (calendarResults.Count > 1)
-            {
-                calendarResults.Sort((x, y) => y.Priority.CompareTo(x.Priority));
-            }
+        if (calendarResults.Count == 0)
+        {
+            return CalendarName.Unknown;
+        }
+        else if (calendarResults.Count > 1)
+        {
+            calendarResults.Sort((x, y) => y.Priority.CompareTo(x.Priority));
+        }
 
-            _calendarName = await calendarResults.First().CalendarName();
+        _calendarName = await calendarResults.First().CalendarName();
 
-            return _calendarName.Value;
-        }
+        return _calendarName.Value;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Localization/DefaultCalendarSelector.cs b/src/OrchardCore/OrchardCore/Localization/DefaultCalendarSelector.cs
index 7f94edd444b..d8a8dfd4633 100644
--- a/src/OrchardCore/OrchardCore/Localization/DefaultCalendarSelector.cs
+++ b/src/OrchardCore/OrchardCore/Localization/DefaultCalendarSelector.cs
@@ -1,20 +1,19 @@
 using System.Globalization;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents a default implementation for <see cref="ICalendarSelector"/>.
+/// </summary>
+public class DefaultCalendarSelector : ICalendarSelector
 {
-    /// <summary>
-    /// Represents a default implementation for <see cref="ICalendarSelector"/>.
-    /// </summary>
-    public class DefaultCalendarSelector : ICalendarSelector
+    private static readonly Task<CalendarSelectorResult> _calendarResult = Task.FromResult(new CalendarSelectorResult
     {
-        private static readonly Task<CalendarSelectorResult> _calendarResult = Task.FromResult(new CalendarSelectorResult
-        {
-            Priority = 0,
-            CalendarName = () => Task.FromResult(BclCalendars.GetCalendarName(CultureInfo.CurrentUICulture.Calendar))
-        });
+        Priority = 0,
+        CalendarName = () => Task.FromResult(BclCalendars.GetCalendarName(CultureInfo.CurrentUICulture.Calendar))
+    });
 
-        /// <inheritdocs />
-        public Task<CalendarSelectorResult> GetCalendarAsync() => _calendarResult;
-    }
+    /// <inheritdocs />
+    public Task<CalendarSelectorResult> GetCalendarAsync() => _calendarResult;
 }
diff --git a/src/OrchardCore/OrchardCore/Localization/DefaultLocalizationService.cs b/src/OrchardCore/OrchardCore/Localization/DefaultLocalizationService.cs
index 00d352b6a47..750222f4319 100644
--- a/src/OrchardCore/OrchardCore/Localization/DefaultLocalizationService.cs
+++ b/src/OrchardCore/OrchardCore/Localization/DefaultLocalizationService.cs
@@ -1,20 +1,19 @@
 using System.Globalization;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Localization
+namespace OrchardCore.Localization;
+
+/// <summary>
+/// Represents a default implementation for <see cref="ILocalizationService"/>.
+/// </summary>
+public class DefaultLocalizationService : ILocalizationService
 {
-    /// <summary>
-    /// Represents a default implementation for <see cref="ILocalizationService"/>.
-    /// </summary>
-    public class DefaultLocalizationService : ILocalizationService
-    {
-        private static readonly Task<string> _defaultCulture = Task.FromResult(CultureInfo.InstalledUICulture.Name);
-        private static readonly Task<string[]> _supportedCultures = Task.FromResult(new[] { CultureInfo.InstalledUICulture.Name });
+    private static readonly Task<string> _defaultCulture = Task.FromResult(CultureInfo.InstalledUICulture.Name);
+    private static readonly Task<string[]> _supportedCultures = Task.FromResult(new[] { CultureInfo.InstalledUICulture.Name });
 
-        /// <inheritdocs />
-        public Task<string> GetDefaultCultureAsync() => _defaultCulture;
+    /// <inheritdocs />
+    public Task<string> GetDefaultCultureAsync() => _defaultCulture;
 
-        /// <inheritdocs />
-        public Task<string[]> GetSupportedCulturesAsync() => _supportedCultures;
-    }
+    /// <inheritdocs />
+    public Task<string[]> GetSupportedCulturesAsync() => _supportedCultures;
 }
diff --git a/src/OrchardCore/OrchardCore/Locking/LocalLock.cs b/src/OrchardCore/OrchardCore/Locking/LocalLock.cs
index cd69738e494..799937d0ca0 100644
--- a/src/OrchardCore/OrchardCore/Locking/LocalLock.cs
+++ b/src/OrchardCore/OrchardCore/Locking/LocalLock.cs
@@ -6,171 +6,170 @@
 using Microsoft.Extensions.Logging;
 using OrchardCore.Locking.Distributed;
 
-namespace OrchardCore.Locking
+namespace OrchardCore.Locking;
+
+/// <summary>
+/// This component is a tenant singleton which allows to acquire named locks for a given tenant.
+/// </summary>
+public sealed class LocalLock : IDistributedLock, ILocalLock, IDisposable
 {
+    private readonly ILogger _logger;
+
+    private readonly Dictionary<string, Semaphore> _semaphores = [];
+
+    public LocalLock(ILogger<LocalLock> logger)
+    {
+        _logger = logger;
+    }
+
     /// <summary>
-    /// This component is a tenant singleton which allows to acquire named locks for a given tenant.
+    /// Waits indefinitely until acquiring a named lock with a given expiration for the current tenant.
+    /// After 'expiration' the lock is auto released, a null value is equivalent to 'TimeSpan.MaxValue'.
     /// </summary>
-    public sealed class LocalLock : IDistributedLock, ILocalLock, IDisposable
+    public async Task<ILocker> AcquireLockAsync(string key, TimeSpan? expiration = null)
     {
-        private readonly ILogger _logger;
+        var semaphore = GetOrCreateSemaphore(key);
+        await semaphore.Value.WaitAsync();
 
-        private readonly Dictionary<string, Semaphore> _semaphores = [];
+        return new Locker(this, semaphore, expiration);
+    }
 
-        public LocalLock(ILogger<LocalLock> logger)
-        {
-            _logger = logger;
-        }
+    /// <summary>
+    /// Tries to acquire a named lock in a given timeout with a given expiration for the current tenant.
+    /// After 'expiration' the lock is auto released, a null value is equivalent to 'TimeSpan.MaxValue'.
+    /// </summary>
+    public async Task<(ILocker locker, bool locked)> TryAcquireLockAsync(string key, TimeSpan timeout, TimeSpan? expiration = null)
+    {
+        var semaphore = GetOrCreateSemaphore(key);
 
-        /// <summary>
-        /// Waits indefinitely until acquiring a named lock with a given expiration for the current tenant.
-        /// After 'expiration' the lock is auto released, a null value is equivalent to 'TimeSpan.MaxValue'.
-        /// </summary>
-        public async Task<ILocker> AcquireLockAsync(string key, TimeSpan? expiration = null)
+        if (await semaphore.Value.WaitAsync(timeout != TimeSpan.MaxValue ? timeout : Timeout.InfiniteTimeSpan))
         {
-            var semaphore = GetOrCreateSemaphore(key);
-            await semaphore.Value.WaitAsync();
-
-            return new Locker(this, semaphore, expiration);
+            return (new Locker(this, semaphore, expiration), true);
         }
 
-        /// <summary>
-        /// Tries to acquire a named lock in a given timeout with a given expiration for the current tenant.
-        /// After 'expiration' the lock is auto released, a null value is equivalent to 'TimeSpan.MaxValue'.
-        /// </summary>
-        public async Task<(ILocker locker, bool locked)> TryAcquireLockAsync(string key, TimeSpan timeout, TimeSpan? expiration = null)
+        if (_logger.IsEnabled(LogLevel.Debug))
         {
-            var semaphore = GetOrCreateSemaphore(key);
+            _logger.LogDebug("Timeout elapsed before acquiring the named lock '{LockName}' after the given timeout of '{Timeout}'.",
+                key, timeout.ToString());
+        }
 
-            if (await semaphore.Value.WaitAsync(timeout != TimeSpan.MaxValue ? timeout : Timeout.InfiniteTimeSpan))
-            {
-                return (new Locker(this, semaphore, expiration), true);
-            }
+        return (null, false);
+    }
 
-            if (_logger.IsEnabled(LogLevel.Debug))
+    public Task<bool> IsLockAcquiredAsync(string key)
+    {
+        lock (_semaphores)
+        {
+            if (_semaphores.TryGetValue(key, out var semaphore))
             {
-                _logger.LogDebug("Timeout elapsed before acquiring the named lock '{LockName}' after the given timeout of '{Timeout}'.",
-                    key, timeout.ToString());
+                return Task.FromResult(semaphore.Value.CurrentCount == 0);
             }
 
-            return (null, false);
+            return Task.FromResult(false);
         }
+    }
 
-        public Task<bool> IsLockAcquiredAsync(string key)
+    private Semaphore GetOrCreateSemaphore(string key)
+    {
+        lock (_semaphores)
         {
-            lock (_semaphores)
+            if (_semaphores.TryGetValue(key, out var semaphore))
             {
-                if (_semaphores.TryGetValue(key, out var semaphore))
-                {
-                    return Task.FromResult(semaphore.Value.CurrentCount == 0);
-                }
-
-                return Task.FromResult(false);
+                semaphore.RefCount++;
             }
-        }
-
-        private Semaphore GetOrCreateSemaphore(string key)
-        {
-            lock (_semaphores)
+            else
             {
-                if (_semaphores.TryGetValue(key, out var semaphore))
-                {
-                    semaphore.RefCount++;
-                }
-                else
-                {
-                    semaphore = new Semaphore(key, new SemaphoreSlim(1));
-                    _semaphores[key] = semaphore;
-                }
-
-                return semaphore;
+                semaphore = new Semaphore(key, new SemaphoreSlim(1));
+                _semaphores[key] = semaphore;
             }
+
+            return semaphore;
         }
+    }
 
-        private sealed class Semaphore
+    private sealed class Semaphore
+    {
+        public Semaphore(string key, SemaphoreSlim value)
         {
-            public Semaphore(string key, SemaphoreSlim value)
-            {
-                Key = key;
-                Value = value;
-                RefCount = 1;
-            }
-
-            internal string Key { get; }
-            internal SemaphoreSlim Value { get; }
-            internal int RefCount { get; set; }
+            Key = key;
+            Value = value;
+            RefCount = 1;
         }
 
-        private sealed class Locker : ILocker
+        internal string Key { get; }
+        internal SemaphoreSlim Value { get; }
+        internal int RefCount { get; set; }
+    }
+
+    private sealed class Locker : ILocker
+    {
+        private readonly LocalLock _localLock;
+        private readonly Semaphore _semaphore;
+        private readonly CancellationTokenSource _cts;
+        private volatile int _released;
+        private bool _disposed;
+
+        public Locker(LocalLock localLock, Semaphore semaphore, TimeSpan? expiration)
         {
-            private readonly LocalLock _localLock;
-            private readonly Semaphore _semaphore;
-            private readonly CancellationTokenSource _cts;
-            private volatile int _released;
-            private bool _disposed;
+            _localLock = localLock;
+            _semaphore = semaphore;
 
-            public Locker(LocalLock localLock, Semaphore semaphore, TimeSpan? expiration)
+            if (expiration.HasValue && expiration.Value != TimeSpan.MaxValue)
             {
-                _localLock = localLock;
-                _semaphore = semaphore;
-
-                if (expiration.HasValue && expiration.Value != TimeSpan.MaxValue)
-                {
-                    _cts = new CancellationTokenSource(expiration.Value);
-                    _cts.Token.Register(Release);
-                }
+                _cts = new CancellationTokenSource(expiration.Value);
+                _cts.Token.Register(Release);
             }
+        }
 
-            private void Release()
+        private void Release()
+        {
+            if (Interlocked.Exchange(ref _released, 1) == 0)
             {
-                if (Interlocked.Exchange(ref _released, 1) == 0)
+                lock (_localLock._semaphores)
                 {
-                    lock (_localLock._semaphores)
+                    if (_localLock._semaphores.TryGetValue(_semaphore.Key, out var semaphore))
                     {
-                        if (_localLock._semaphores.TryGetValue(_semaphore.Key, out var semaphore))
-                        {
-                            semaphore.RefCount--;
+                        semaphore.RefCount--;
 
-                            if (semaphore.RefCount == 0)
-                            {
-                                _localLock._semaphores.Remove(_semaphore.Key);
-                            }
+                        if (semaphore.RefCount == 0)
+                        {
+                            _localLock._semaphores.Remove(_semaphore.Key);
                         }
                     }
-
-                    _semaphore.Value.Release();
                 }
-            }
 
-            public ValueTask DisposeAsync()
-            {
-                Dispose();
-                return default;
+                _semaphore.Value.Release();
             }
+        }
 
-            public void Dispose()
+        public ValueTask DisposeAsync()
+        {
+            Dispose();
+            return default;
+        }
+
+        public void Dispose()
+        {
+            if (_disposed)
             {
-                if (_disposed)
-                {
-                    return;
-                }
+                return;
+            }
 
-                _disposed = true;
+            _disposed = true;
 
-                _cts?.Dispose();
+            _cts?.Dispose();
 
-                Release();
-            }
+            Release();
         }
+    }
 
-        public void Dispose()
-        {
-            var semaphores = _semaphores.Values.ToArray();
+    public void Dispose()
+    {
+        var semaphores = _semaphores.Values.ToArray();
 
-            foreach (var semaphore in semaphores)
-            {
-                semaphore.Value.Dispose();
-            }
+        foreach (var semaphore in semaphores)
+        {
+            semaphore.Value.Dispose();
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Modules/DefaultOrchardHelper.cs b/src/OrchardCore/OrchardCore/Modules/DefaultOrchardHelper.cs
index 83b4c0bd16e..dd88f33d243 100644
--- a/src/OrchardCore/OrchardCore/Modules/DefaultOrchardHelper.cs
+++ b/src/OrchardCore/OrchardCore/Modules/DefaultOrchardHelper.cs
@@ -1,14 +1,13 @@
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+public class DefaultOrchardHelper : IOrchardHelper
 {
-    public class DefaultOrchardHelper : IOrchardHelper
+    public DefaultOrchardHelper(IHttpContextAccessor httpContextAccessor)
     {
-        public DefaultOrchardHelper(IHttpContextAccessor httpContextAccessor)
-        {
-            HttpContext = httpContextAccessor.HttpContext;
-        }
-
-        public HttpContext HttpContext { get; set; }
+        HttpContext = httpContextAccessor.HttpContext;
     }
+
+    public HttpContext HttpContext { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore/Modules/Extensions/ApplicationBuilderExtensions.cs b/src/OrchardCore/OrchardCore/Modules/Extensions/ApplicationBuilderExtensions.cs
index d20bf380169..806f1c9305b 100644
--- a/src/OrchardCore/OrchardCore/Modules/Extensions/ApplicationBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore/Modules/Extensions/ApplicationBuilderExtensions.cs
@@ -5,37 +5,36 @@
 using Microsoft.Extensions.Hosting;
 using OrchardCore.Modules;
 
-namespace Microsoft.AspNetCore.Builder
+namespace Microsoft.AspNetCore.Builder;
+
+public static class ApplicationBuilderExtensions
 {
-    public static class ApplicationBuilderExtensions
+    /// <summary>
+    /// Enables multi-tenant requests support for the current path.
+    /// </summary>
+    public static IApplicationBuilder UseOrchardCore(this IApplicationBuilder app, Action<IApplicationBuilder> configure = null)
     {
-        /// <summary>
-        /// Enables multi-tenant requests support for the current path.
-        /// </summary>
-        public static IApplicationBuilder UseOrchardCore(this IApplicationBuilder app, Action<IApplicationBuilder> configure = null)
-        {
-            var env = app.ApplicationServices.GetRequiredService<IHostEnvironment>();
-            var appContext = app.ApplicationServices.GetRequiredService<IApplicationContext>();
+        var env = app.ApplicationServices.GetRequiredService<IHostEnvironment>();
+        var appContext = app.ApplicationServices.GetRequiredService<IApplicationContext>();
 
-            env.ContentRootFileProvider = new CompositeFileProvider(
-                new ModuleEmbeddedFileProvider(appContext),
-                env.ContentRootFileProvider);
+        env.ContentRootFileProvider = new CompositeFileProvider(
+            new ModuleEmbeddedFileProvider(appContext),
+            env.ContentRootFileProvider);
 
-            // Init also the web host 'ContentRootFileProvider'.
-            app.ApplicationServices.GetRequiredService<IWebHostEnvironment>()
-                .ContentRootFileProvider = env.ContentRootFileProvider;
+        // Init also the web host 'ContentRootFileProvider'.
+        app.ApplicationServices.GetRequiredService<IWebHostEnvironment>()
+            .ContentRootFileProvider = env.ContentRootFileProvider;
 
-            app.UseMiddleware<PoweredByMiddleware>();
+        app.UseMiddleware<PoweredByMiddleware>();
 
-            // Ensure the shell tenants are loaded when a request comes in
-            // and replaces the current service provider for the tenant's one.
-            app.UseMiddleware<ModularTenantContainerMiddleware>();
+        // Ensure the shell tenants are loaded when a request comes in
+        // and replaces the current service provider for the tenant's one.
+        app.UseMiddleware<ModularTenantContainerMiddleware>();
 
-            configure?.Invoke(app);
+        configure?.Invoke(app);
 
-            app.UseMiddleware<ModularTenantRouterMiddleware>();
+        app.UseMiddleware<ModularTenantRouterMiddleware>();
 
-            return app;
-        }
+        return app;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Modules/Extensions/OrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore/Modules/Extensions/OrchardCoreBuilderExtensions.cs
index 0ef4cb9cded..20aadf47afe 100644
--- a/src/OrchardCore/OrchardCore/Modules/Extensions/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore/Modules/Extensions/OrchardCoreBuilderExtensions.cs
@@ -9,116 +9,115 @@
 using OrchardCore.Environment.Shell.Descriptor.Settings;
 using OrchardCore.Modules;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static partial class OrchardCoreBuilderExtensions
 {
-    public static partial class OrchardCoreBuilderExtensions
+    /// <summary>
+    /// Registers at the host level a set of features which are always enabled for any tenant.
+    /// </summary>
+    public static OrchardCoreBuilder AddGlobalFeatures(this OrchardCoreBuilder builder, params string[] featureIds)
     {
-        /// <summary>
-        /// Registers at the host level a set of features which are always enabled for any tenant.
-        /// </summary>
-        public static OrchardCoreBuilder AddGlobalFeatures(this OrchardCoreBuilder builder, params string[] featureIds)
+        foreach (var featureId in featureIds)
         {
-            foreach (var featureId in featureIds)
-            {
-                builder.ApplicationServices.AddTransient(sp => new ShellFeature(featureId, alwaysEnabled: true));
-            }
-
-            return builder;
+            builder.ApplicationServices.AddTransient(sp => new ShellFeature(featureId, alwaysEnabled: true));
         }
 
-        /// <summary>
-        /// Registers at the tenant level a set of features which are always enabled.
-        /// </summary>
-        public static OrchardCoreBuilder AddTenantFeatures(this OrchardCoreBuilder builder, params string[] featureIds)
-        {
-            builder.ConfigureServices(services =>
-            {
-                foreach (var featureId in featureIds)
-                {
-                    services.AddTransient(sp => new ShellFeature(featureId, alwaysEnabled: true));
-                }
-            });
-
-            return builder;
-        }
+        return builder;
+    }
 
-        /// <summary>
-        /// Registers a default tenant with a set of features that are used to setup and configure the actual tenants.
-        /// For instance you can use this to add a custom Setup module.
-        /// </summary>
-        public static OrchardCoreBuilder AddSetupFeatures(this OrchardCoreBuilder builder, params string[] featureIds)
+    /// <summary>
+    /// Registers at the tenant level a set of features which are always enabled.
+    /// </summary>
+    public static OrchardCoreBuilder AddTenantFeatures(this OrchardCoreBuilder builder, params string[] featureIds)
+    {
+        builder.ConfigureServices(services =>
         {
             foreach (var featureId in featureIds)
             {
-                builder.ApplicationServices.AddTransient(sp => new ShellFeature(featureId));
+                services.AddTransient(sp => new ShellFeature(featureId, alwaysEnabled: true));
             }
+        });
 
-            return builder;
-        }
+        return builder;
+    }
 
-        /// <summary>
-        /// Registers tenants defined in configuration.
-        /// </summary>
-        public static OrchardCoreBuilder WithTenants(this OrchardCoreBuilder builder)
+    /// <summary>
+    /// Registers a default tenant with a set of features that are used to setup and configure the actual tenants.
+    /// For instance you can use this to add a custom Setup module.
+    /// </summary>
+    public static OrchardCoreBuilder AddSetupFeatures(this OrchardCoreBuilder builder, params string[] featureIds)
+    {
+        foreach (var featureId in featureIds)
         {
-            var services = builder.ApplicationServices;
+            builder.ApplicationServices.AddTransient(sp => new ShellFeature(featureId));
+        }
 
-            services.AddSingleton<IShellsSettingsSources, ShellsSettingsSources>();
-            services.AddSingleton<IShellsConfigurationSources, ShellsConfigurationSources>();
-            services.AddSingleton<IShellConfigurationSources, ShellConfigurationSources>();
-            services.AddTransient<IConfigureOptions<ShellOptions>, ShellOptionsSetup>();
-            services.AddSingleton<IShellSettingsManager, ShellSettingsManager>();
+        return builder;
+    }
 
-            return builder.ConfigureServices(s =>
-            {
-                s.AddScoped<IShellDescriptorManager, ConfiguredFeaturesShellDescriptorManager>();
-            });
-        }
+    /// <summary>
+    /// Registers tenants defined in configuration.
+    /// </summary>
+    public static OrchardCoreBuilder WithTenants(this OrchardCoreBuilder builder)
+    {
+        var services = builder.ApplicationServices;
 
-        /// <summary>
-        /// Registers a single tenant with the specified set of features.
-        /// </summary>
-        public static OrchardCoreBuilder WithFeatures(this OrchardCoreBuilder builder, params string[] featureIds)
-        {
-            foreach (var featureId in featureIds)
-            {
-                builder.ApplicationServices.AddTransient(sp => new ShellFeature(featureId));
-            }
+        services.AddSingleton<IShellsSettingsSources, ShellsSettingsSources>();
+        services.AddSingleton<IShellsConfigurationSources, ShellsConfigurationSources>();
+        services.AddSingleton<IShellConfigurationSources, ShellConfigurationSources>();
+        services.AddTransient<IConfigureOptions<ShellOptions>, ShellOptionsSetup>();
+        services.AddSingleton<IShellSettingsManager, ShellSettingsManager>();
 
-            builder.ApplicationServices.AddSetFeaturesDescriptor();
+        return builder.ConfigureServices(s =>
+        {
+            s.AddScoped<IShellDescriptorManager, ConfiguredFeaturesShellDescriptorManager>();
+        });
+    }
 
-            return builder;
+    /// <summary>
+    /// Registers a single tenant with the specified set of features.
+    /// </summary>
+    public static OrchardCoreBuilder WithFeatures(this OrchardCoreBuilder builder, params string[] featureIds)
+    {
+        foreach (var featureId in featureIds)
+        {
+            builder.ApplicationServices.AddTransient(sp => new ShellFeature(featureId));
         }
 
-        /// <summary>
-        /// Registers and configures a background hosted service to manage tenant background tasks.
-        /// </summary>
-        public static OrchardCoreBuilder AddBackgroundService(this OrchardCoreBuilder builder)
-        {
-            builder.ApplicationServices.AddHostedService<ModularBackgroundService>();
+        builder.ApplicationServices.AddSetFeaturesDescriptor();
 
-            builder.ApplicationServices
-                .AddOptions<BackgroundServiceOptions>()
-                .Configure<IConfiguration>((options, config) => config
-                    .Bind("OrchardCore:OrchardCore_BackgroundService", options));
+        return builder;
+    }
+
+    /// <summary>
+    /// Registers and configures a background hosted service to manage tenant background tasks.
+    /// </summary>
+    public static OrchardCoreBuilder AddBackgroundService(this OrchardCoreBuilder builder)
+    {
+        builder.ApplicationServices.AddHostedService<ModularBackgroundService>();
 
-            builder.Configure(app =>
+        builder.ApplicationServices
+            .AddOptions<BackgroundServiceOptions>()
+            .Configure<IConfiguration>((options, config) => config
+                .Bind("OrchardCore:OrchardCore_BackgroundService", options));
+
+        builder.Configure(app =>
+        {
+            app.Use((context, next) =>
             {
-                app.Use((context, next) =>
+                // In the background only the endpoints middlewares need to be executed.
+                if (context.Items.ContainsKey("IsBackground"))
                 {
-                    // In the background only the endpoints middlewares need to be executed.
-                    if (context.Items.ContainsKey("IsBackground"))
-                    {
-                        // Shortcut the tenant pipeline.
-                        return Task.CompletedTask;
-                    }
-
-                    return next(context);
-                });
-            },
-            order: int.MinValue);
-
-            return builder;
-        }
+                    // Shortcut the tenant pipeline.
+                    return Task.CompletedTask;
+                }
+
+                return next(context);
+            });
+        },
+        order: int.MinValue);
+
+        return builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Modules/Extensions/PoweredByOrchardCoreExtensions.cs b/src/OrchardCore/OrchardCore/Modules/Extensions/PoweredByOrchardCoreExtensions.cs
index adb3e323724..f22209e6b1d 100644
--- a/src/OrchardCore/OrchardCore/Modules/Extensions/PoweredByOrchardCoreExtensions.cs
+++ b/src/OrchardCore/OrchardCore/Modules/Extensions/PoweredByOrchardCoreExtensions.cs
@@ -1,40 +1,39 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Modules;
 
-namespace Microsoft.AspNetCore.Builder
+namespace Microsoft.AspNetCore.Builder;
+
+public static class PoweredByOrchardCoreExtensions
 {
-    public static class PoweredByOrchardCoreExtensions
+    /// <summary>
+    /// Configures whether use or not the Header X-Powered-By.
+    /// Default value is OrchardCore.
+    /// </summary>
+    /// <param name="app">The modular application builder.</param>
+    /// <param name="enabled">Boolean indicating if the header should be included in the response or not.</param>
+    /// <returns>The modular application builder.</returns>
+    public static IApplicationBuilder UsePoweredByOrchardCore(this IApplicationBuilder app, bool enabled)
     {
-        /// <summary>
-        /// Configures whether use or not the Header X-Powered-By.
-        /// Default value is OrchardCore.
-        /// </summary>
-        /// <param name="app">The modular application builder.</param>
-        /// <param name="enabled">Boolean indicating if the header should be included in the response or not.</param>
-        /// <returns>The modular application builder.</returns>
-        public static IApplicationBuilder UsePoweredByOrchardCore(this IApplicationBuilder app, bool enabled)
-        {
-            var options = app.ApplicationServices.GetRequiredService<IPoweredByMiddlewareOptions>();
-            options.Enabled = enabled;
+        var options = app.ApplicationServices.GetRequiredService<IPoweredByMiddlewareOptions>();
+        options.Enabled = enabled;
 
-            return app;
-        }
+        return app;
+    }
 
-        /// <summary>
-        /// Configures whether use or not the Header X-Powered-By and its value.
-        /// Default value is OrchardCore.
-        /// </summary>
-        /// <param name="app">The modular application builder.</param>
-        /// <param name="enabled">Boolean indicating if the header should be included in the response or not.</param>
-        /// <param name="headerValue">Header's value.</param>
-        /// <returns>The modular application builder.</returns>
-        public static IApplicationBuilder UsePoweredBy(this IApplicationBuilder app, bool enabled, string headerValue)
-        {
-            var options = app.ApplicationServices.GetRequiredService<IPoweredByMiddlewareOptions>();
-            options.Enabled = enabled;
-            options.HeaderValue = headerValue;
+    /// <summary>
+    /// Configures whether use or not the Header X-Powered-By and its value.
+    /// Default value is OrchardCore.
+    /// </summary>
+    /// <param name="app">The modular application builder.</param>
+    /// <param name="enabled">Boolean indicating if the header should be included in the response or not.</param>
+    /// <param name="headerValue">Header's value.</param>
+    /// <returns>The modular application builder.</returns>
+    public static IApplicationBuilder UsePoweredBy(this IApplicationBuilder app, bool enabled, string headerValue)
+    {
+        var options = app.ApplicationServices.GetRequiredService<IPoweredByMiddlewareOptions>();
+        options.Enabled = enabled;
+        options.HeaderValue = headerValue;
 
-            return app;
-        }
+        return app;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Modules/Extensions/RunningShellTableExtensions.cs b/src/OrchardCore/OrchardCore/Modules/Extensions/RunningShellTableExtensions.cs
index 0f63d50fb35..e1912d1b94d 100644
--- a/src/OrchardCore/OrchardCore/Modules/Extensions/RunningShellTableExtensions.cs
+++ b/src/OrchardCore/OrchardCore/Modules/Extensions/RunningShellTableExtensions.cs
@@ -2,25 +2,24 @@
 using Microsoft.AspNetCore.Http;
 using OrchardCore.Environment.Shell;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+// Not public because it wouldn't match tenants with an URL prefix later in the request pipeline. Mostly to be used
+// from ModularTenantContainerMiddleware.
+// For details see: https://github.com/OrchardCMS/OrchardCore/pull/10779#discussion_r758741155.
+internal static class RunningShellTableExtensions
 {
-    // Not public because it wouldn't match tenants with an URL prefix later in the request pipeline. Mostly to be used
-    // from ModularTenantContainerMiddleware.
-    // For details see: https://github.com/OrchardCMS/OrchardCore/pull/10779#discussion_r758741155.
-    internal static class RunningShellTableExtensions
+    public static ShellSettings Match(this IRunningShellTable table, HttpContext httpContext)
     {
-        public static ShellSettings Match(this IRunningShellTable table, HttpContext httpContext)
-        {
-            ArgumentNullException.ThrowIfNull(httpContext);
+        ArgumentNullException.ThrowIfNull(httpContext);
 
-            var httpRequest = httpContext.Request;
+        var httpRequest = httpContext.Request;
 
-            // The Host property contains the value as set from the client. It is replaced automatically
-            // to the value of X-Forwarded-Host when UseIISIntegration() is invoked.
-            // The same way .Scheme contains the protocol that the user set and not what a proxy
-            // could be using (see X-Forwarded-Proto).
+        // The Host property contains the value as set from the client. It is replaced automatically
+        // to the value of X-Forwarded-Host when UseIISIntegration() is invoked.
+        // The same way .Scheme contains the protocol that the user set and not what a proxy
+        // could be using (see X-Forwarded-Proto).
 
-            return table.Match(httpRequest.Host, httpRequest.Path, true);
-        }
+        return table.Match(httpRequest.Host, httpRequest.Path, true);
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Modules/Extensions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore/Modules/Extensions/ServiceCollectionExtensions.cs
index 3a06108b8e2..b2bb8524dce 100644
--- a/src/OrchardCore/OrchardCore/Modules/Extensions/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore/Modules/Extensions/ServiceCollectionExtensions.cs
@@ -38,526 +38,525 @@
 using OrchardCore.Modules.Services;
 using SameSiteMode = Microsoft.AspNetCore.Http.SameSiteMode;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
-    {
-        /// <summary>
-        /// Routing singleton and global config types used to isolate tenants from the host.
-        /// </summary>
-        private static readonly Type[] _routingTypesToIsolate = new ServiceCollection()
-            .AddRouting()
-            .Where(sd =>
-                sd.Lifetime == ServiceLifetime.Singleton ||
-                sd.ServiceType == typeof(IConfigureOptions<RouteOptions>))
-            .Select(sd => sd.GetImplementationType())
-            .ToArray();
-
-        /// <summary>
-        /// Http client singleton types used to isolate tenants from the host.
-        /// </summary>
-        private static readonly Type[] _httpClientTypesToIsolate = new ServiceCollection()
-            .AddHttpClient()
+    /// <summary>
+    /// Routing singleton and global config types used to isolate tenants from the host.
+    /// </summary>
+    private static readonly Type[] _routingTypesToIsolate = new ServiceCollection()
+        .AddRouting()
+        .Where(sd =>
+            sd.Lifetime == ServiceLifetime.Singleton ||
+            sd.ServiceType == typeof(IConfigureOptions<RouteOptions>))
+        .Select(sd => sd.GetImplementationType())
+        .ToArray();
+
+    /// <summary>
+    /// Http client singleton types used to isolate tenants from the host.
+    /// </summary>
+    private static readonly Type[] _httpClientTypesToIsolate = new ServiceCollection()
+        .AddHttpClient()
+        .Where(sd => sd.Lifetime == ServiceLifetime.Singleton)
+        .Select(sd => sd.GetImplementationType())
+        .Except(new ServiceCollection()
+            .AddLogging()
             .Where(sd => sd.Lifetime == ServiceLifetime.Singleton)
-            .Select(sd => sd.GetImplementationType())
-            .Except(new ServiceCollection()
-                .AddLogging()
-                .Where(sd => sd.Lifetime == ServiceLifetime.Singleton)
-                .Select(sd => sd.GetImplementationType()))
-            .ToArray();
-
-        /// <summary>
-        /// Metrics singletons used to isolate tenants from the host.
-        /// </summary>
-        private static readonly Type[] _metricsTypesToIsolate = new ServiceCollection()
-            .AddMetrics()
-            .Where(sd => sd.Lifetime == ServiceLifetime.Singleton)
-            .Select(sd => sd.GetImplementationType())
-            .ToArray();
-
-        /// <summary>
-        /// Adds OrchardCore services to the host service collection.
-        /// </summary>
-        public static OrchardCoreBuilder AddOrchardCore(this IServiceCollection services)
-        {
-            ArgumentNullException.ThrowIfNull(services);
-
-            // If an instance of OrchardCoreBuilder exists reuse it,
-            // so we can call AddOrchardCore several times.
-            var builder = services
-                .LastOrDefault(d => d.ServiceType == typeof(OrchardCoreBuilder))?
-                .ImplementationInstance as OrchardCoreBuilder;
+            .Select(sd => sd.GetImplementationType()))
+        .ToArray();
+
+    /// <summary>
+    /// Metrics singletons used to isolate tenants from the host.
+    /// </summary>
+    private static readonly Type[] _metricsTypesToIsolate = new ServiceCollection()
+        .AddMetrics()
+        .Where(sd => sd.Lifetime == ServiceLifetime.Singleton)
+        .Select(sd => sd.GetImplementationType())
+        .ToArray();
+
+    /// <summary>
+    /// Adds OrchardCore services to the host service collection.
+    /// </summary>
+    public static OrchardCoreBuilder AddOrchardCore(this IServiceCollection services)
+    {
+        ArgumentNullException.ThrowIfNull(services);
 
-            if (builder == null)
-            {
-                builder = new OrchardCoreBuilder(services);
-                services.AddSingleton(builder);
-
-                AddDefaultServices(builder);
-                AddShellServices(builder);
-                AddExtensionServices(builder);
-                AddStaticFiles(builder);
-
-                AddMetrics(builder);
-                AddRouting(builder);
-                IsolateHttpClient(builder);
-                AddEndpointsApiExplorer(builder);
-                AddAntiForgery(builder);
-                AddSameSiteCookieBackwardsCompatibility(builder);
-                AddAuthentication(builder);
-                AddDataProtection(builder);
-
-                // Register the list of services to be resolved later on
-                services.AddSingleton(services);
-            }
+        // If an instance of OrchardCoreBuilder exists reuse it,
+        // so we can call AddOrchardCore several times.
+        var builder = services
+            .LastOrDefault(d => d.ServiceType == typeof(OrchardCoreBuilder))?
+            .ImplementationInstance as OrchardCoreBuilder;
 
-            return builder;
+        if (builder == null)
+        {
+            builder = new OrchardCoreBuilder(services);
+            services.AddSingleton(builder);
+
+            AddDefaultServices(builder);
+            AddShellServices(builder);
+            AddExtensionServices(builder);
+            AddStaticFiles(builder);
+
+            AddMetrics(builder);
+            AddRouting(builder);
+            IsolateHttpClient(builder);
+            AddEndpointsApiExplorer(builder);
+            AddAntiForgery(builder);
+            AddSameSiteCookieBackwardsCompatibility(builder);
+            AddAuthentication(builder);
+            AddDataProtection(builder);
+
+            // Register the list of services to be resolved later on
+            services.AddSingleton(services);
         }
 
-        /// <summary>
-        /// Adds OrchardCore services to the host service collection and let the app change
-        /// the default behavior and set of features through a configure action.
-        /// </summary>
-        public static IServiceCollection AddOrchardCore(this IServiceCollection services, Action<OrchardCoreBuilder> configure)
-        {
-            var builder = services.AddOrchardCore();
+        return builder;
+    }
 
-            configure?.Invoke(builder);
+    /// <summary>
+    /// Adds OrchardCore services to the host service collection and let the app change
+    /// the default behavior and set of features through a configure action.
+    /// </summary>
+    public static IServiceCollection AddOrchardCore(this IServiceCollection services, Action<OrchardCoreBuilder> configure)
+    {
+        var builder = services.AddOrchardCore();
 
-            return services;
-        }
+        configure?.Invoke(builder);
 
-        private static void AddDefaultServices(OrchardCoreBuilder builder)
-        {
-            var services = builder.ApplicationServices;
+        return services;
+    }
 
-            services.AddLogging();
-            services.AddOptions();
+    private static void AddDefaultServices(OrchardCoreBuilder builder)
+    {
+        var services = builder.ApplicationServices;
 
-            // These services might be moved at a higher level if no components from OrchardCore needs them.
-            services.AddLocalization();
+        services.AddLogging();
+        services.AddOptions();
 
-            // For performance, prevents the 'ResourceManagerStringLocalizer' from being used.
-            // Also support pluralization.
-            services.AddSingleton<IStringLocalizerFactory, NullStringLocalizerFactory>();
-            services.AddSingleton<IHtmlLocalizerFactory, NullHtmlLocalizerFactory>();
+        // These services might be moved at a higher level if no components from OrchardCore needs them.
+        services.AddLocalization();
 
-            services.AddWebEncoders();
+        // For performance, prevents the 'ResourceManagerStringLocalizer' from being used.
+        // Also support pluralization.
+        services.AddSingleton<IStringLocalizerFactory, NullStringLocalizerFactory>();
+        services.AddSingleton<IHtmlLocalizerFactory, NullHtmlLocalizerFactory>();
 
-            services.AddHttpContextAccessor();
-            services.AddSingleton<IClock, Clock>();
-            services.AddScoped<ILocalClock, LocalClock>();
+        services.AddWebEncoders();
 
-            services.AddScoped<ILocalizationService, DefaultLocalizationService>();
-            services.AddScoped<ICalendarManager, DefaultCalendarManager>();
-            services.AddScoped<ICalendarSelector, DefaultCalendarSelector>();
+        services.AddHttpContextAccessor();
+        services.AddSingleton<IClock, Clock>();
+        services.AddScoped<ILocalClock, LocalClock>();
 
-            services.AddSingleton<IPoweredByMiddlewareOptions, PoweredByMiddlewareOptions>();
+        services.AddScoped<ILocalizationService, DefaultLocalizationService>();
+        services.AddScoped<ICalendarManager, DefaultCalendarManager>();
+        services.AddScoped<ICalendarSelector, DefaultCalendarSelector>();
 
-            services.AddTransient<IConfigureOptions<Microsoft.AspNetCore.Http.Json.JsonOptions>, JsonOptionsConfigurations>();
-            services.AddTransient<IConfigureOptions<DocumentJsonSerializerOptions>, DocumentJsonSerializerOptionsConfiguration>();
+        services.AddSingleton<IPoweredByMiddlewareOptions, PoweredByMiddlewareOptions>();
 
-            services.AddScoped<IOrchardHelper, DefaultOrchardHelper>();
-            services.AddSingleton<IClientIPAddressAccessor, DefaultClientIPAddressAccessor>();
-            services.AddSingleton<ISlugService, SlugService>();
+        services.AddTransient<IConfigureOptions<Microsoft.AspNetCore.Http.Json.JsonOptions>, JsonOptionsConfigurations>();
+        services.AddTransient<IConfigureOptions<DocumentJsonSerializerOptions>, DocumentJsonSerializerOptionsConfiguration>();
 
-            builder.ConfigureServices((services, serviceProvider) =>
-            {
-                services.AddSingleton<LocalLock>();
-                services.AddSingleton<ILocalLock>(sp => sp.GetRequiredService<LocalLock>());
-                services.AddSingleton<IDistributedLock>(sp => sp.GetRequiredService<LocalLock>());
+        services.AddScoped<IOrchardHelper, DefaultOrchardHelper>();
+        services.AddSingleton<IClientIPAddressAccessor, DefaultClientIPAddressAccessor>();
+        services.AddSingleton<ISlugService, SlugService>();
 
-                var configuration = serviceProvider.GetService<IShellConfiguration>();
+        builder.ConfigureServices((services, serviceProvider) =>
+        {
+            services.AddSingleton<LocalLock>();
+            services.AddSingleton<ILocalLock>(sp => sp.GetRequiredService<LocalLock>());
+            services.AddSingleton<IDistributedLock>(sp => sp.GetRequiredService<LocalLock>());
 
-                services.Configure<CultureOptions>(configuration.GetSection("OrchardCore_Localization_CultureOptions"));
-            });
-        }
+            var configuration = serviceProvider.GetService<IShellConfiguration>();
 
-        private static void AddShellServices(OrchardCoreBuilder builder)
-        {
-            var services = builder.ApplicationServices;
+            services.Configure<CultureOptions>(configuration.GetSection("OrchardCore_Localization_CultureOptions"));
+        });
+    }
 
-            // Use a single tenant and all features by default
-            services.AddHostingShellServices();
-            services.AddAllFeaturesDescriptor();
+    private static void AddShellServices(OrchardCoreBuilder builder)
+    {
+        var services = builder.ApplicationServices;
 
-            // Registers the application primary feature.
-            services.AddTransient(sp => new ShellFeature
-            (
-                sp.GetRequiredService<IHostEnvironment>().ApplicationName, alwaysEnabled: true)
-            );
+        // Use a single tenant and all features by default
+        services.AddHostingShellServices();
+        services.AddAllFeaturesDescriptor();
 
-            // Registers the application default feature.
-            services.AddTransient(sp => new ShellFeature
-            (
-                Application.DefaultFeatureId, alwaysEnabled: true)
-            );
+        // Registers the application primary feature.
+        services.AddTransient(sp => new ShellFeature
+        (
+            sp.GetRequiredService<IHostEnvironment>().ApplicationName, alwaysEnabled: true)
+        );
 
-            builder.ConfigureServices(shellServices =>
-            {
-                shellServices.AddScoped<IShellReleaseManager, DefaultShellReleaseManager>();
-                shellServices.AddTransient<IConfigureOptions<ShellContextOptions>, ShellContextOptionsSetup>();
-                shellServices.AddNullFeatureProfilesService();
-                shellServices.AddFeatureValidation();
-                shellServices.ConfigureFeatureProfilesRuleOptions();
-            });
-        }
+        // Registers the application default feature.
+        services.AddTransient(sp => new ShellFeature
+        (
+            Application.DefaultFeatureId, alwaysEnabled: true)
+        );
 
-        private static void AddExtensionServices(OrchardCoreBuilder builder)
+        builder.ConfigureServices(shellServices =>
         {
-            builder.ApplicationServices.AddSingleton<IModuleNamesProvider, AssemblyAttributeModuleNamesProvider>();
-            builder.ApplicationServices.AddSingleton<IApplicationContext, ModularApplicationContext>();
+            shellServices.AddScoped<IShellReleaseManager, DefaultShellReleaseManager>();
+            shellServices.AddTransient<IConfigureOptions<ShellContextOptions>, ShellContextOptionsSetup>();
+            shellServices.AddNullFeatureProfilesService();
+            shellServices.AddFeatureValidation();
+            shellServices.ConfigureFeatureProfilesRuleOptions();
+        });
+    }
 
-            builder.ApplicationServices.AddExtensionManagerHost();
+    private static void AddExtensionServices(OrchardCoreBuilder builder)
+    {
+        builder.ApplicationServices.AddSingleton<IModuleNamesProvider, AssemblyAttributeModuleNamesProvider>();
+        builder.ApplicationServices.AddSingleton<IApplicationContext, ModularApplicationContext>();
 
-            builder.ConfigureServices(services =>
-            {
-                services.AddExtensionManager();
-                services.AddScoped<IShellFeaturesManager, ShellFeaturesManager>();
-                services.AddScoped<IShellDescriptorFeaturesManager, ShellDescriptorFeaturesManager>();
-            });
-        }
+        builder.ApplicationServices.AddExtensionManagerHost();
 
-        /// <summary>
-        /// Adds tenant level configuration to serve static files from modules.
-        /// </summary>
-        private static void AddStaticFiles(OrchardCoreBuilder builder)
+        builder.ConfigureServices(services =>
         {
-            builder.ConfigureServices(services =>
+            services.AddExtensionManager();
+            services.AddScoped<IShellFeaturesManager, ShellFeaturesManager>();
+            services.AddScoped<IShellDescriptorFeaturesManager, ShellDescriptorFeaturesManager>();
+        });
+    }
+
+    /// <summary>
+    /// Adds tenant level configuration to serve static files from modules.
+    /// </summary>
+    private static void AddStaticFiles(OrchardCoreBuilder builder)
+    {
+        builder.ConfigureServices(services =>
+        {
+            services.AddSingleton<IModuleStaticFileProvider>(serviceProvider =>
             {
-                services.AddSingleton<IModuleStaticFileProvider>(serviceProvider =>
-                {
-                    var env = serviceProvider.GetRequiredService<IHostEnvironment>();
-                    var appContext = serviceProvider.GetRequiredService<IApplicationContext>();
+                var env = serviceProvider.GetRequiredService<IHostEnvironment>();
+                var appContext = serviceProvider.GetRequiredService<IApplicationContext>();
 
-                    IModuleStaticFileProvider fileProvider;
-                    if (env.IsDevelopment())
-                    {
-                        var fileProviders = new List<IStaticFileProvider>
-                        {
-                            new ModuleProjectStaticFileProvider(appContext),
-                            new ModuleEmbeddedStaticFileProvider(appContext)
-                        };
-                        fileProvider = new ModuleCompositeStaticFileProvider(fileProviders);
-                    }
-                    else
+                IModuleStaticFileProvider fileProvider;
+                if (env.IsDevelopment())
+                {
+                    var fileProviders = new List<IStaticFileProvider>
                     {
-                        fileProvider = new ModuleEmbeddedStaticFileProvider(appContext);
-                    }
-                    return fileProvider;
-                });
-
-                services.AddSingleton<IStaticFileProvider>(serviceProvider =>
+                        new ModuleProjectStaticFileProvider(appContext),
+                        new ModuleEmbeddedStaticFileProvider(appContext)
+                    };
+                    fileProvider = new ModuleCompositeStaticFileProvider(fileProviders);
+                }
+                else
                 {
-                    return serviceProvider.GetRequiredService<IModuleStaticFileProvider>();
-                });
+                    fileProvider = new ModuleEmbeddedStaticFileProvider(appContext);
+                }
+                return fileProvider;
             });
 
-            builder.Configure((app, routes, serviceProvider) =>
+            services.AddSingleton<IStaticFileProvider>(serviceProvider =>
             {
-                var fileProvider = serviceProvider.GetRequiredService<IModuleStaticFileProvider>();
-
-                var shellConfiguration = serviceProvider.GetRequiredService<IShellConfiguration>();
-                // Cache static files for a year as they are coming from embedded resources and should not vary.
-                var cacheControl = shellConfiguration.GetValue("StaticFileOptions:CacheControl", $"public, max-age={TimeSpan.FromDays(30).TotalSeconds}, s-maxage={TimeSpan.FromDays(365.25).TotalSeconds}");
-
-                // Use the current options values but without mutating the resolved instance.
-                var options = serviceProvider.GetRequiredService<IOptions<StaticFileOptions>>().Value;
-                options = new StaticFileOptions
-                {
-                    RequestPath = string.Empty,
-                    FileProvider = fileProvider,
-                    RedirectToAppendTrailingSlash = options.RedirectToAppendTrailingSlash,
-                    ContentTypeProvider = options.ContentTypeProvider,
-                    DefaultContentType = options.DefaultContentType,
-                    ServeUnknownFileTypes = options.ServeUnknownFileTypes,
-                    HttpsCompression = options.HttpsCompression,
-
-                    OnPrepareResponse = ctx =>
-                    {
-                        ctx.Context.Response.Headers[HeaderNames.CacheControl] = cacheControl;
-                    },
-                };
-
-                app.UseStaticFiles(options);
+                return serviceProvider.GetRequiredService<IModuleStaticFileProvider>();
             });
-        }
+        });
 
-        /// <summary>
-        /// Adds isolated tenant level metrics services.
-        /// </summary>
-        private static void AddMetrics(OrchardCoreBuilder builder)
+        builder.Configure((app, routes, serviceProvider) =>
         {
-            // 'AddMetrics()' is called by the host.
+            var fileProvider = serviceProvider.GetRequiredService<IModuleStaticFileProvider>();
 
-            builder.ConfigureServices(collection =>
+            var shellConfiguration = serviceProvider.GetRequiredService<IShellConfiguration>();
+            // Cache static files for a year as they are coming from embedded resources and should not vary.
+            var cacheControl = shellConfiguration.GetValue("StaticFileOptions:CacheControl", $"public, max-age={TimeSpan.FromDays(30).TotalSeconds}, s-maxage={TimeSpan.FromDays(365.25).TotalSeconds}");
+
+            // Use the current options values but without mutating the resolved instance.
+            var options = serviceProvider.GetRequiredService<IOptions<StaticFileOptions>>().Value;
+            options = new StaticFileOptions
             {
-                // The 'DefaultMeterFactory' caches 'Meters' in a non thread safe dictionary.
-                // So, we need to register an isolated 'IMeterFactory' singleton per tenant.
-                var descriptorsToRemove = collection
-                    .Where(sd =>
-                        sd is ClonedSingletonDescriptor &&
-                        _metricsTypesToIsolate.Contains(sd.GetImplementationType()))
-                    .ToArray();
-                // Isolate each tenant from the host.
-
-                foreach (var descriptor in descriptorsToRemove)
+                RequestPath = string.Empty,
+                FileProvider = fileProvider,
+                RedirectToAppendTrailingSlash = options.RedirectToAppendTrailingSlash,
+                ContentTypeProvider = options.ContentTypeProvider,
+                DefaultContentType = options.DefaultContentType,
+                ServeUnknownFileTypes = options.ServeUnknownFileTypes,
+                HttpsCompression = options.HttpsCompression,
+
+                OnPrepareResponse = ctx =>
                 {
-                    collection.Remove(descriptor);
-                }
+                    ctx.Context.Response.Headers[HeaderNames.CacheControl] = cacheControl;
+                },
+            };
 
-                collection.AddMetrics();
-            },
-            order: OrchardCoreConstants.ConfigureOrder.InfrastructureService);
-        }
+            app.UseStaticFiles(options);
+        });
+    }
 
-        /// <summary>
-        /// Adds isolated tenant level routing services.
-        /// </summary>
-        private static void AddRouting(OrchardCoreBuilder builder)
-        {
-            // 'AddRouting()' is called by the host.
+    /// <summary>
+    /// Adds isolated tenant level metrics services.
+    /// </summary>
+    private static void AddMetrics(OrchardCoreBuilder builder)
+    {
+        // 'AddMetrics()' is called by the host.
 
-            builder.ConfigureServices(collection =>
+        builder.ConfigureServices(collection =>
+        {
+            // The 'DefaultMeterFactory' caches 'Meters' in a non thread safe dictionary.
+            // So, we need to register an isolated 'IMeterFactory' singleton per tenant.
+            var descriptorsToRemove = collection
+                .Where(sd =>
+                    sd is ClonedSingletonDescriptor &&
+                    _metricsTypesToIsolate.Contains(sd.GetImplementationType()))
+                .ToArray();
+            // Isolate each tenant from the host.
+
+            foreach (var descriptor in descriptorsToRemove)
             {
-                // The routing system is not tenant aware and uses a global list of endpoint data sources which is
-                // setup by the default configuration of 'RouteOptions' and mutated on each call of 'UseEndPoints()'.
-                // So, we need isolated routing singletons (and a default configuration) per tenant.
-
-                var descriptorsToRemove = collection
-                    .Where(sd =>
-                        (sd is ClonedSingletonDescriptor ||
-                        sd.ServiceType == typeof(IConfigureOptions<RouteOptions>)) &&
-                        _routingTypesToIsolate.Contains(sd.GetImplementationType()))
-                    .ToArray();
-
-                // Isolate each tenant from the host.
-                foreach (var descriptor in descriptorsToRemove)
-                {
-                    collection.Remove(descriptor);
-                }
+                collection.Remove(descriptor);
+            }
 
-                collection.AddRouting();
-            },
-            order: OrchardCoreConstants.ConfigureOrder.InfrastructureService);
-        }
+            collection.AddMetrics();
+        },
+        order: OrchardCoreConstants.ConfigureOrder.InfrastructureService);
+    }
+
+    /// <summary>
+    /// Adds isolated tenant level routing services.
+    /// </summary>
+    private static void AddRouting(OrchardCoreBuilder builder)
+    {
+        // 'AddRouting()' is called by the host.
 
-        /// <summary>
-        /// Isolates tenant http client singletons and configurations from the host.
-        /// </summary>
-        private static void IsolateHttpClient(OrchardCoreBuilder builder)
+        builder.ConfigureServices(collection =>
         {
-            builder.ConfigureServices(collection =>
+            // The routing system is not tenant aware and uses a global list of endpoint data sources which is
+            // setup by the default configuration of 'RouteOptions' and mutated on each call of 'UseEndPoints()'.
+            // So, we need isolated routing singletons (and a default configuration) per tenant.
+
+            var descriptorsToRemove = collection
+                .Where(sd =>
+                    (sd is ClonedSingletonDescriptor ||
+                    sd.ServiceType == typeof(IConfigureOptions<RouteOptions>)) &&
+                    _routingTypesToIsolate.Contains(sd.GetImplementationType()))
+                .ToArray();
+
+            // Isolate each tenant from the host.
+            foreach (var descriptor in descriptorsToRemove)
             {
-                // Each tenant needs isolated http client singletons and configurations, so that
-                // typed clients/handlers are activated/resolved from the right tenant container.
-
-                // Retrieve current options configurations.
-                var configurationDescriptorsToRemove = collection
-                    .Where(sd =>
-                        sd.ServiceType.IsGenericType &&
-                        sd.ServiceType.GenericTypeArguments.Contains(typeof(HttpClientFactoryOptions)))
-                    .ToArray();
-
-                // Retrieve all descriptors to remove.
-                var descriptorsToRemove = collection
-                    .Where(sd =>
-                        sd is ClonedSingletonDescriptor &&
-                        _httpClientTypesToIsolate.Contains(sd.GetImplementationType()))
-                    .Concat(configurationDescriptorsToRemove)
-                    .ToArray();
-
-                // Isolate each tenant from the host.
-                foreach (var descriptor in descriptorsToRemove)
-                {
-                    collection.Remove(descriptor);
-                }
+                collection.Remove(descriptor);
+            }
 
-                // Make the http client factory 'IDisposable'.
-                collection.AddSingleton<TenantHttpClientFactory>();
-                collection.AddSingleton<IHttpClientFactory>(sp => sp.GetRequiredService<TenantHttpClientFactory>());
-                collection.AddSingleton<IHttpMessageHandlerFactory>(sp => sp.GetRequiredService<TenantHttpClientFactory>());
-            },
-            order: OrchardCoreConstants.ConfigureOrder.InfrastructureService);
-        }
+            collection.AddRouting();
+        },
+        order: OrchardCoreConstants.ConfigureOrder.InfrastructureService);
+    }
 
-        /// <summary>
-        /// Configures ApiExplorer at the tenant level using <see cref="Endpoint.Metadata"/>.
-        /// </summary>
-        private static void AddEndpointsApiExplorer(OrchardCoreBuilder builder)
+    /// <summary>
+    /// Isolates tenant http client singletons and configurations from the host.
+    /// </summary>
+    private static void IsolateHttpClient(OrchardCoreBuilder builder)
+    {
+        builder.ConfigureServices(collection =>
         {
-            // 'AddEndpointsApiExplorer()' is called by the host.
-
-            builder.ConfigureServices(collection =>
+            // Each tenant needs isolated http client singletons and configurations, so that
+            // typed clients/handlers are activated/resolved from the right tenant container.
+
+            // Retrieve current options configurations.
+            var configurationDescriptorsToRemove = collection
+                .Where(sd =>
+                    sd.ServiceType.IsGenericType &&
+                    sd.ServiceType.GenericTypeArguments.Contains(typeof(HttpClientFactoryOptions)))
+                .ToArray();
+
+            // Retrieve all descriptors to remove.
+            var descriptorsToRemove = collection
+                .Where(sd =>
+                    sd is ClonedSingletonDescriptor &&
+                    _httpClientTypesToIsolate.Contains(sd.GetImplementationType()))
+                .Concat(configurationDescriptorsToRemove)
+                .ToArray();
+
+            // Isolate each tenant from the host.
+            foreach (var descriptor in descriptorsToRemove)
             {
-                // Remove the related host singletons as they are not tenant aware.
-                var descriptorsToRemove = collection
-                    .Where(sd =>
-                        sd is ClonedSingletonDescriptor &&
-                        (sd.ServiceType == typeof(IActionDescriptorCollectionProvider) ||
-                        sd.ServiceType == typeof(IApiDescriptionGroupCollectionProvider)))
-                    .ToArray();
-
-                // Isolate each tenant from the host.
-                foreach (var descriptor in descriptorsToRemove)
-                {
-                    collection.Remove(descriptor);
-                }
+                collection.Remove(descriptor);
+            }
 
-                // Configure ApiExplorer at the tenant level.
-                collection.AddEndpointsApiExplorer();
-            },
-            order: OrchardCoreConstants.ConfigureOrder.InfrastructureService);
-        }
+            // Make the http client factory 'IDisposable'.
+            collection.AddSingleton<TenantHttpClientFactory>();
+            collection.AddSingleton<IHttpClientFactory>(sp => sp.GetRequiredService<TenantHttpClientFactory>());
+            collection.AddSingleton<IHttpMessageHandlerFactory>(sp => sp.GetRequiredService<TenantHttpClientFactory>());
+        },
+        order: OrchardCoreConstants.ConfigureOrder.InfrastructureService);
+    }
 
-        /// <summary>
-        /// Adds host and tenant level antiforgery services.
-        /// </summary>
-        private static void AddAntiForgery(OrchardCoreBuilder builder)
-        {
-            builder.ApplicationServices.AddAntiforgery();
+    /// <summary>
+    /// Configures ApiExplorer at the tenant level using <see cref="Endpoint.Metadata"/>.
+    /// </summary>
+    private static void AddEndpointsApiExplorer(OrchardCoreBuilder builder)
+    {
+        // 'AddEndpointsApiExplorer()' is called by the host.
 
-            builder.ConfigureServices((services, serviceProvider) =>
+        builder.ConfigureServices(collection =>
+        {
+            // Remove the related host singletons as they are not tenant aware.
+            var descriptorsToRemove = collection
+                .Where(sd =>
+                    sd is ClonedSingletonDescriptor &&
+                    (sd.ServiceType == typeof(IActionDescriptorCollectionProvider) ||
+                    sd.ServiceType == typeof(IApiDescriptionGroupCollectionProvider)))
+                .ToArray();
+
+            // Isolate each tenant from the host.
+            foreach (var descriptor in descriptorsToRemove)
             {
-                var settings = serviceProvider.GetRequiredService<ShellSettings>();
-                var cookieName = "__orchantiforgery_" + settings.VersionId;
-
-                // Re-register the antiforgery services to be tenant-aware.
-                var collection = new ServiceCollection()
-                    .AddAntiforgery(options =>
-                    {
-                        options.Cookie.Name = cookieName;
+                collection.Remove(descriptor);
+            }
 
-                        // Don't set the cookie builder 'Path' so that it uses the 'IAuthenticationFeature' value
-                        // set by the pipeline and coming from the request 'PathBase' which already ends with the
-                        // tenant prefix but may also start by a path related e.g to a virtual folder.
-                    });
+            // Configure ApiExplorer at the tenant level.
+            collection.AddEndpointsApiExplorer();
+        },
+        order: OrchardCoreConstants.ConfigureOrder.InfrastructureService);
+    }
 
-                services.Add(collection);
-            });
-        }
+    /// <summary>
+    /// Adds host and tenant level antiforgery services.
+    /// </summary>
+    private static void AddAntiForgery(OrchardCoreBuilder builder)
+    {
+        builder.ApplicationServices.AddAntiforgery();
 
-        /// <summary>
-        /// Adds backwards compatibility to the handling of SameSite cookies.
-        /// </summary>
-        private static void AddSameSiteCookieBackwardsCompatibility(OrchardCoreBuilder builder)
+        builder.ConfigureServices((services, serviceProvider) =>
         {
-            builder.ConfigureServices(services =>
-            {
-                services.Configure<CookiePolicyOptions>(options =>
+            var settings = serviceProvider.GetRequiredService<ShellSettings>();
+            var cookieName = "__orchantiforgery_" + settings.VersionId;
+
+            // Re-register the antiforgery services to be tenant-aware.
+            var collection = new ServiceCollection()
+                .AddAntiforgery(options =>
                 {
-                    options.MinimumSameSitePolicy = SameSiteMode.Unspecified;
-                    options.OnAppendCookie = cookieContext => CheckSameSiteBackwardsCompatibility(cookieContext.Context, cookieContext.CookieOptions);
-                    options.OnDeleteCookie = cookieContext => CheckSameSiteBackwardsCompatibility(cookieContext.Context, cookieContext.CookieOptions);
+                    options.Cookie.Name = cookieName;
+
+                    // Don't set the cookie builder 'Path' so that it uses the 'IAuthenticationFeature' value
+                    // set by the pipeline and coming from the request 'PathBase' which already ends with the
+                    // tenant prefix but may also start by a path related e.g to a virtual folder.
                 });
-            })
-            .Configure(app =>
+
+            services.Add(collection);
+        });
+    }
+
+    /// <summary>
+    /// Adds backwards compatibility to the handling of SameSite cookies.
+    /// </summary>
+    private static void AddSameSiteCookieBackwardsCompatibility(OrchardCoreBuilder builder)
+    {
+        builder.ConfigureServices(services =>
+        {
+            services.Configure<CookiePolicyOptions>(options =>
             {
-                app.UseCookiePolicy();
+                options.MinimumSameSitePolicy = SameSiteMode.Unspecified;
+                options.OnAppendCookie = cookieContext => CheckSameSiteBackwardsCompatibility(cookieContext.Context, cookieContext.CookieOptions);
+                options.OnDeleteCookie = cookieContext => CheckSameSiteBackwardsCompatibility(cookieContext.Context, cookieContext.CookieOptions);
             });
-        }
-
-        private static void CheckSameSiteBackwardsCompatibility(HttpContext httpContext, CookieOptions options)
+        })
+        .Configure(app =>
         {
-            var userAgent = httpContext.Request.Headers.UserAgent.ToString();
+            app.UseCookiePolicy();
+        });
+    }
+
+    private static void CheckSameSiteBackwardsCompatibility(HttpContext httpContext, CookieOptions options)
+    {
+        var userAgent = httpContext.Request.Headers.UserAgent.ToString();
 
-            if (options.SameSite == SameSiteMode.None)
+        if (options.SameSite == SameSiteMode.None)
+        {
+            if (string.IsNullOrEmpty(userAgent))
             {
-                if (string.IsNullOrEmpty(userAgent))
-                {
-                    return;
-                }
+                return;
+            }
 
-                // Cover all iOS based browsers here. This includes:
-                // - Safari on iOS 12 for iPhone, iPod Touch, iPad.
-                // - WkWebview on iOS 12 for iPhone, iPod Touch, iPad.
-                // - Chrome on iOS 12 for iPhone, iPod Touch, iPad.
-                // All of which are broken by SameSite=None, because they use the iOS networking stack.
-                if (userAgent.Contains("CPU iPhone OS 12") || userAgent.Contains("iPad; CPU OS 12"))
-                {
-                    options.SameSite = SameSiteMode.Unspecified;
-                    return;
-                }
+            // Cover all iOS based browsers here. This includes:
+            // - Safari on iOS 12 for iPhone, iPod Touch, iPad.
+            // - WkWebview on iOS 12 for iPhone, iPod Touch, iPad.
+            // - Chrome on iOS 12 for iPhone, iPod Touch, iPad.
+            // All of which are broken by SameSite=None, because they use the iOS networking stack.
+            if (userAgent.Contains("CPU iPhone OS 12") || userAgent.Contains("iPad; CPU OS 12"))
+            {
+                options.SameSite = SameSiteMode.Unspecified;
+                return;
+            }
 
-                // Cover Mac OS X based browsers that use the Mac OS networking stack. This includes:
-                // - Safari on Mac OS X.
-                // This does not include:
-                // - Chrome on Mac OS X.
-                // Because they do not use the Mac OS networking stack.
-                if (userAgent.Contains("Macintosh; Intel Mac OS X 10_14") &&
-                    userAgent.Contains("Version/") && userAgent.Contains("Safari"))
-                {
-                    options.SameSite = SameSiteMode.Unspecified;
-                    return;
-                }
+            // Cover Mac OS X based browsers that use the Mac OS networking stack. This includes:
+            // - Safari on Mac OS X.
+            // This does not include:
+            // - Chrome on Mac OS X.
+            // Because they do not use the Mac OS networking stack.
+            if (userAgent.Contains("Macintosh; Intel Mac OS X 10_14") &&
+                userAgent.Contains("Version/") && userAgent.Contains("Safari"))
+            {
+                options.SameSite = SameSiteMode.Unspecified;
+                return;
+            }
 
-                // Cover Chrome 50-69, because some versions are broken by SameSite=None,
-                // and none in this range require it.
-                // Note: this covers some pre-Chromium Edge versions,
-                // but pre-Chromium Edge does not require SameSite=None.
-                if (userAgent.Contains("Chrome/5") || userAgent.Contains("Chrome/6"))
-                {
-                    options.SameSite = SameSiteMode.Unspecified;
-                }
+            // Cover Chrome 50-69, because some versions are broken by SameSite=None,
+            // and none in this range require it.
+            // Note: this covers some pre-Chromium Edge versions,
+            // but pre-Chromium Edge does not require SameSite=None.
+            if (userAgent.Contains("Chrome/5") || userAgent.Contains("Chrome/6"))
+            {
+                options.SameSite = SameSiteMode.Unspecified;
             }
         }
+    }
 
-        /// <summary>
-        /// Adds host and tenant level authentication services and configuration.
-        /// </summary>
-        private static void AddAuthentication(OrchardCoreBuilder builder)
-        {
-            builder.ApplicationServices.AddAuthentication();
+    /// <summary>
+    /// Adds host and tenant level authentication services and configuration.
+    /// </summary>
+    private static void AddAuthentication(OrchardCoreBuilder builder)
+    {
+        builder.ApplicationServices.AddAuthentication();
 
-            builder.ConfigureServices(services =>
-            {
-                services.AddAuthentication();
-
-                // IAuthenticationSchemeProvider is already registered at the host level.
-                // We need to register it again so it is taken into account at the tenant level
-                // because it holds a reference to an underlying dictionary, responsible of storing
-                // the registered schemes which need to be distinct for each tenant.
-                services.AddSingleton<IAuthenticationSchemeProvider, AuthenticationSchemeProvider>();
-            })
-            .Configure(app =>
-            {
-                app.UseAuthentication();
-            }, order: OrchardCoreConstants.ConfigureOrder.Authentication);
-        }
+        builder.ConfigureServices(services =>
+        {
+            services.AddAuthentication();
+
+            // IAuthenticationSchemeProvider is already registered at the host level.
+            // We need to register it again so it is taken into account at the tenant level
+            // because it holds a reference to an underlying dictionary, responsible of storing
+            // the registered schemes which need to be distinct for each tenant.
+            services.AddSingleton<IAuthenticationSchemeProvider, AuthenticationSchemeProvider>();
+        })
+        .Configure(app =>
+        {
+            app.UseAuthentication();
+        }, order: OrchardCoreConstants.ConfigureOrder.Authentication);
+    }
 
-        /// <summary>
-        /// Adds tenant level data protection services.
-        /// </summary>
-        private static void AddDataProtection(OrchardCoreBuilder builder)
+    /// <summary>
+    /// Adds tenant level data protection services.
+    /// </summary>
+    private static void AddDataProtection(OrchardCoreBuilder builder)
+    {
+        builder.ConfigureServices((services, serviceProvider) =>
         {
-            builder.ConfigureServices((services, serviceProvider) =>
-            {
-                var settings = serviceProvider.GetRequiredService<ShellSettings>();
-                var options = serviceProvider.GetRequiredService<IOptions<ShellOptions>>();
-
-                // The 'FileSystemXmlRepository' will create the directory, but only if it is not overridden.
-                var directory = new DirectoryInfo(Path.Combine(
-                    options.Value.ShellsApplicationDataPath,
-                    options.Value.ShellsContainerName,
-                    settings.Name, "DataProtection-Keys"));
-
-                // Re-register the data protection services to be tenant-aware so that modules that internally
-                // rely on IDataProtector/IDataProtectionProvider automatically get an isolated instance that
-                // manages its own key ring and doesn't allow decrypting payloads encrypted by another tenant.
-                // By default, the key ring is stored in the tenant directory of the configured App_Data path.
-                var collection = new ServiceCollection()
-                    .AddDataProtection()
-                    .PersistKeysToFileSystem(directory)
-                    .SetApplicationName(settings.Name)
-                    .AddKeyManagementOptions(o => o.XmlEncryptor ??= new NullXmlEncryptor())
-                    .Services;
-
-                // Remove any previously registered options setups.
-                services.RemoveAll<IConfigureOptions<KeyManagementOptions>>();
-                services.RemoveAll<IConfigureOptions<DataProtectionOptions>>();
-
-                services.Add(collection);
-            }, order: OrchardCoreConstants.ConfigureOrder.DataProtection);
-        }
+            var settings = serviceProvider.GetRequiredService<ShellSettings>();
+            var options = serviceProvider.GetRequiredService<IOptions<ShellOptions>>();
+
+            // The 'FileSystemXmlRepository' will create the directory, but only if it is not overridden.
+            var directory = new DirectoryInfo(Path.Combine(
+                options.Value.ShellsApplicationDataPath,
+                options.Value.ShellsContainerName,
+                settings.Name, "DataProtection-Keys"));
+
+            // Re-register the data protection services to be tenant-aware so that modules that internally
+            // rely on IDataProtector/IDataProtectionProvider automatically get an isolated instance that
+            // manages its own key ring and doesn't allow decrypting payloads encrypted by another tenant.
+            // By default, the key ring is stored in the tenant directory of the configured App_Data path.
+            var collection = new ServiceCollection()
+                .AddDataProtection()
+                .PersistKeysToFileSystem(directory)
+                .SetApplicationName(settings.Name)
+                .AddKeyManagementOptions(o => o.XmlEncryptor ??= new NullXmlEncryptor())
+                .Services;
+
+            // Remove any previously registered options setups.
+            services.RemoveAll<IConfigureOptions<KeyManagementOptions>>();
+            services.RemoveAll<IConfigureOptions<DataProtectionOptions>>();
+
+            services.Add(collection);
+        }, order: OrchardCoreConstants.ConfigureOrder.DataProtection);
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Modules/Model/TimeZone.cs b/src/OrchardCore/OrchardCore/Modules/Model/TimeZone.cs
index aaff200d9db..4632daedc93 100644
--- a/src/OrchardCore/OrchardCore/Modules/Model/TimeZone.cs
+++ b/src/OrchardCore/OrchardCore/Modules/Model/TimeZone.cs
@@ -1,28 +1,27 @@
 using NodaTime;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+public class TimeZone : ITimeZone
 {
-    public class TimeZone : ITimeZone
-    {
-        public string TimeZoneId { get; set; }
+    public string TimeZoneId { get; set; }
 
-        public Offset StandardOffset { get; set; }
+    public Offset StandardOffset { get; set; }
 
-        public Offset WallOffset { get; set; }
+    public Offset WallOffset { get; set; }
 
-        public DateTimeZone DateTimeZone { get; set; }
+    public DateTimeZone DateTimeZone { get; set; }
 
-        public TimeZone(string timeZoneId, Offset standardOffset, Offset wallOffset, DateTimeZone dateTimeZone)
-        {
-            TimeZoneId = timeZoneId;
-            StandardOffset = standardOffset;
-            WallOffset = wallOffset;
-            DateTimeZone = dateTimeZone;
-        }
+    public TimeZone(string timeZoneId, Offset standardOffset, Offset wallOffset, DateTimeZone dateTimeZone)
+    {
+        TimeZoneId = timeZoneId;
+        StandardOffset = standardOffset;
+        WallOffset = wallOffset;
+        DateTimeZone = dateTimeZone;
+    }
 
-        public override string ToString()
-        {
-            return $"(GMT{StandardOffset}) {TimeZoneId} ({WallOffset:+HH:mm})";
-        }
+    public override string ToString()
+    {
+        return $"(GMT{StandardOffset}) {TimeZoneId} ({WallOffset:+HH:mm})";
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Modules/ModularBackgroundService.cs b/src/OrchardCore/OrchardCore/Modules/ModularBackgroundService.cs
index ef8c40c0428..d63c2d14e7f 100644
--- a/src/OrchardCore/OrchardCore/Modules/ModularBackgroundService.cs
+++ b/src/OrchardCore/OrchardCore/Modules/ModularBackgroundService.cs
@@ -17,425 +17,424 @@
 using OrchardCore.Locking.Distributed;
 using OrchardCore.Settings;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+internal sealed class ModularBackgroundService : BackgroundService
 {
-    internal sealed class ModularBackgroundService : BackgroundService
+    private static readonly TimeSpan _pollingTime = TimeSpan.FromMinutes(1);
+    private static readonly TimeSpan _minIdleTime = TimeSpan.FromSeconds(10);
+
+    private readonly ConcurrentDictionary<string, BackgroundTaskScheduler> _schedulers = new();
+    private readonly ConcurrentDictionary<string, IChangeToken> _changeTokens = new();
+
+    private readonly IShellHost _shellHost;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly BackgroundServiceOptions _options;
+    private readonly ILogger _logger;
+    private readonly IClock _clock;
+
+    public ModularBackgroundService(
+        IShellHost shellHost,
+        IHttpContextAccessor httpContextAccessor,
+        IOptions<BackgroundServiceOptions> options,
+        ILogger<ModularBackgroundService> logger,
+        IClock clock)
+    {
+        _shellHost = shellHost;
+        _httpContextAccessor = httpContextAccessor;
+        _options = options.Value;
+        _logger = logger;
+        _clock = clock;
+    }
+
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
-        private static readonly TimeSpan _pollingTime = TimeSpan.FromMinutes(1);
-        private static readonly TimeSpan _minIdleTime = TimeSpan.FromSeconds(10);
-
-        private readonly ConcurrentDictionary<string, BackgroundTaskScheduler> _schedulers = new();
-        private readonly ConcurrentDictionary<string, IChangeToken> _changeTokens = new();
-
-        private readonly IShellHost _shellHost;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly BackgroundServiceOptions _options;
-        private readonly ILogger _logger;
-        private readonly IClock _clock;
-
-        public ModularBackgroundService(
-            IShellHost shellHost,
-            IHttpContextAccessor httpContextAccessor,
-            IOptions<BackgroundServiceOptions> options,
-            ILogger<ModularBackgroundService> logger,
-            IClock clock)
+        stoppingToken.Register(() =>
         {
-            _shellHost = shellHost;
-            _httpContextAccessor = httpContextAccessor;
-            _options = options.Value;
-            _logger = logger;
-            _clock = clock;
+            _logger.LogInformation("'{ServiceName}' is stopping.", nameof(ModularBackgroundService));
+        });
+
+        if (_options.ShellWarmup)
+        {
+            try
+            {
+                // Ensure all tenants are pre-loaded.
+                await _shellHost.InitializeAsync();
+            }
+            catch (Exception ex) when (!ex.IsFatal())
+            {
+                _logger.LogError(ex, "Failed to warm up the tenants from '{ServiceName}'.", nameof(ModularBackgroundService));
+            }
         }
 
-        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+        while (GetRunningShells().Length == 0)
         {
-            stoppingToken.Register(() =>
+            try
             {
-                _logger.LogInformation("'{ServiceName}' is stopping.", nameof(ModularBackgroundService));
-            });
+                await Task.Delay(_minIdleTime, stoppingToken);
+            }
+            catch (TaskCanceledException)
+            {
+                break;
+            }
+        }
 
-            if (_options.ShellWarmup)
+        var previousShells = Array.Empty<(string Tenant, long UtcTicks)>();
+        while (!stoppingToken.IsCancellationRequested)
+        {
+            // Init the delay first to be also waited on exception.
+            var pollingDelay = Task.Delay(_pollingTime, stoppingToken);
+            try
             {
-                try
-                {
-                    // Ensure all tenants are pre-loaded.
-                    await _shellHost.InitializeAsync();
-                }
-                catch (Exception ex) when (!ex.IsFatal())
-                {
-                    _logger.LogError(ex, "Failed to warm up the tenants from '{ServiceName}'.", nameof(ModularBackgroundService));
-                }
+                var runningShells = GetRunningShells();
+                await UpdateAsync(previousShells, runningShells, stoppingToken);
+                await RunAsync(runningShells, stoppingToken);
+                previousShells = runningShells;
+            }
+            catch (Exception ex) when (!ex.IsFatal())
+            {
+                _logger.LogError(ex, "Error while executing '{ServiceName}'.", nameof(ModularBackgroundService));
             }
 
-            while (GetRunningShells().Length == 0)
+            await WaitAsync(pollingDelay, stoppingToken);
+        }
+    }
+
+    private async Task RunAsync(IEnumerable<(string Tenant, long UtcTicks)> runningShells, CancellationToken stoppingToken)
+    {
+        await Parallel.ForEachAsync(GetShellsToRun(runningShells), async (tenant, cancellationToken) =>
+        {
+            // Check if the shell is still registered and running.
+            if (!_shellHost.TryGetShellContext(tenant, out var shell) || !shell.Settings.IsRunning())
             {
-                try
-                {
-                    await Task.Delay(_minIdleTime, stoppingToken);
-                }
-                catch (TaskCanceledException)
-                {
-                    break;
-                }
+                return;
             }
 
-            var previousShells = Array.Empty<(string Tenant, long UtcTicks)>();
-            while (!stoppingToken.IsCancellationRequested)
+            // Create a new 'HttpContext' to be used in the background.
+            _httpContextAccessor.HttpContext = shell.CreateHttpContext();
+
+            var schedulers = GetSchedulersToRun(tenant);
+            foreach (var scheduler in schedulers)
             {
-                // Init the delay first to be also waited on exception.
-                var pollingDelay = Task.Delay(_pollingTime, stoppingToken);
-                try
+                if (stoppingToken.IsCancellationRequested)
                 {
-                    var runningShells = GetRunningShells();
-                    await UpdateAsync(previousShells, runningShells, stoppingToken);
-                    await RunAsync(runningShells, stoppingToken);
-                    previousShells = runningShells;
+                    break;
                 }
-                catch (Exception ex) when (!ex.IsFatal())
+
+                // Try to create a shell scope on this shell context.
+                var (shellScope, success) = await _shellHost.TryGetScopeAsync(shell.Settings.Name);
+                if (!success)
                 {
-                    _logger.LogError(ex, "Error while executing '{ServiceName}'.", nameof(ModularBackgroundService));
+                    break;
                 }
 
-                await WaitAsync(pollingDelay, stoppingToken);
-            }
-        }
-
-        private async Task RunAsync(IEnumerable<(string Tenant, long UtcTicks)> runningShells, CancellationToken stoppingToken)
-        {
-            await Parallel.ForEachAsync(GetShellsToRun(runningShells), async (tenant, cancellationToken) =>
-            {
-                // Check if the shell is still registered and running.
-                if (!_shellHost.TryGetShellContext(tenant, out var shell) || !shell.Settings.IsRunning())
+                // Check if the shell has no pipeline and should not be warmed up.
+                if (!_options.ShellWarmup && !shellScope.ShellContext.HasPipeline())
                 {
-                    return;
+                    await shellScope.TerminateShellAsync();
+                    break;
                 }
 
-                // Create a new 'HttpContext' to be used in the background.
-                _httpContextAccessor.HttpContext = shell.CreateHttpContext();
-
-                var schedulers = GetSchedulersToRun(tenant);
-                foreach (var scheduler in schedulers)
+                var locked = false;
+                ILocker locker = null;
+                try
                 {
-                    if (stoppingToken.IsCancellationRequested)
+                    // Try to acquire a lock before using the scope, so that a next process gets the last committed data.
+                    var distributedLock = shellScope.ShellContext.ServiceProvider.GetRequiredService<IDistributedLock>();
+                    (locker, locked) = await distributedLock.TryAcquireBackgroundTaskLockAsync(scheduler.Settings);
+                    if (!locked)
                     {
+                        await shellScope.TerminateShellAsync();
+                        _logger.LogInformation("Timeout to acquire a lock on background task '{TaskName}' on tenant '{TenantName}'.", scheduler.Name, tenant);
                         break;
                     }
+                }
+                catch (Exception ex) when (!ex.IsFatal())
+                {
+                    await shellScope.TerminateShellAsync();
+                    _logger.LogError(ex, "Failed to acquire a lock on background task '{TaskName}' on tenant '{TenantName}'.", scheduler.Name, tenant);
+                    break;
+                }
+
+                await using var acquiredLock = locker;
+
+                await shellScope.UsingAsync(async scope =>
+                {
+                    var taskName = scheduler.Name;
 
-                    // Try to create a shell scope on this shell context.
-                    var (shellScope, success) = await _shellHost.TryGetScopeAsync(shell.Settings.Name);
-                    if (!success)
+                    var task = scope.ServiceProvider.GetServices<IBackgroundTask>().GetTaskByName(taskName);
+                    if (task is null)
                     {
-                        break;
+                        return;
                     }
 
-                    // Check if the shell has no pipeline and should not be warmed up.
-                    if (!_options.ShellWarmup && !shellScope.ShellContext.HasPipeline())
+                    var siteService = scope.ServiceProvider.GetService<ISiteService>();
+                    if (siteService is not null)
                     {
-                        await shellScope.TerminateShellAsync();
-                        break;
+                        try
+                        {
+                            // Use the base url, if defined, to override the 'Scheme', 'Host' and 'PathBase'.
+                            _httpContextAccessor.HttpContext.SetBaseUrl((await siteService.GetSiteSettingsAsync()).BaseUrl);
+                        }
+                        catch (Exception ex) when (!ex.IsFatal())
+                        {
+                            _logger.LogError(ex, "Error while getting the base url from the site settings of the tenant '{TenantName}'.", tenant);
+                        }
                     }
 
-                    var locked = false;
-                    ILocker locker = null;
                     try
                     {
-                        // Try to acquire a lock before using the scope, so that a next process gets the last committed data.
-                        var distributedLock = shellScope.ShellContext.ServiceProvider.GetRequiredService<IDistributedLock>();
-                        (locker, locked) = await distributedLock.TryAcquireBackgroundTaskLockAsync(scheduler.Settings);
-                        if (!locked)
+                        if (scheduler.Settings.UsePipeline)
                         {
-                            await shellScope.TerminateShellAsync();
-                            _logger.LogInformation("Timeout to acquire a lock on background task '{TaskName}' on tenant '{TenantName}'.", scheduler.Name, tenant);
-                            break;
+                            if (!scope.ShellContext.HasPipeline())
+                            {
+                                // Build the shell pipeline to configure endpoint data sources.
+                                await scope.ShellContext.BuildPipelineAsync();
+                            }
+
+                            // Run the pipeline to make the 'HttpContext' aware of endpoints.
+                            await scope.ShellContext.Pipeline.Invoke(_httpContextAccessor.HttpContext);
                         }
                     }
                     catch (Exception ex) when (!ex.IsFatal())
                     {
-                        await shellScope.TerminateShellAsync();
-                        _logger.LogError(ex, "Failed to acquire a lock on background task '{TaskName}' on tenant '{TenantName}'.", scheduler.Name, tenant);
-                        break;
+                        _logger.LogError(ex, "Error while running in the background the pipeline of tenant '{TenantName}'.", tenant);
                     }
 
-                    await using var acquiredLock = locker;
+                    var context = new BackgroundTaskEventContext(taskName, scope);
+                    var handlers = scope.ServiceProvider.GetServices<IBackgroundTaskEventHandler>();
 
-                    await shellScope.UsingAsync(async scope =>
-                    {
-                        var taskName = scheduler.Name;
+                    await handlers.InvokeAsync((handler, context, token) => handler.ExecutingAsync(context, token), context, stoppingToken, _logger);
 
-                        var task = scope.ServiceProvider.GetServices<IBackgroundTask>().GetTaskByName(taskName);
-                        if (task is null)
-                        {
-                            return;
-                        }
+                    try
+                    {
+                        _logger.LogInformation("Start processing background task '{TaskName}' on tenant '{TenantName}'.", taskName, tenant);
 
-                        var siteService = scope.ServiceProvider.GetService<ISiteService>();
-                        if (siteService is not null)
-                        {
-                            try
-                            {
-                                // Use the base url, if defined, to override the 'Scheme', 'Host' and 'PathBase'.
-                                _httpContextAccessor.HttpContext.SetBaseUrl((await siteService.GetSiteSettingsAsync()).BaseUrl);
-                            }
-                            catch (Exception ex) when (!ex.IsFatal())
-                            {
-                                _logger.LogError(ex, "Error while getting the base url from the site settings of the tenant '{TenantName}'.", tenant);
-                            }
-                        }
+                        scheduler.Run();
+                        await task.DoWorkAsync(scope.ServiceProvider, stoppingToken);
 
-                        try
-                        {
-                            if (scheduler.Settings.UsePipeline)
-                            {
-                                if (!scope.ShellContext.HasPipeline())
-                                {
-                                    // Build the shell pipeline to configure endpoint data sources.
-                                    await scope.ShellContext.BuildPipelineAsync();
-                                }
-
-                                // Run the pipeline to make the 'HttpContext' aware of endpoints.
-                                await scope.ShellContext.Pipeline.Invoke(_httpContextAccessor.HttpContext);
-                            }
-                        }
-                        catch (Exception ex) when (!ex.IsFatal())
-                        {
-                            _logger.LogError(ex, "Error while running in the background the pipeline of tenant '{TenantName}'.", tenant);
-                        }
+                        _logger.LogInformation("Finished processing background task '{TaskName}' on tenant '{TenantName}'.", taskName, tenant);
+                    }
+                    catch (Exception ex) when (!ex.IsFatal())
+                    {
+                        _logger.LogError(ex, "Error while processing background task '{TaskName}' on tenant '{TenantName}'.", taskName, tenant);
+                        context.Exception = ex;
 
-                        var context = new BackgroundTaskEventContext(taskName, scope);
-                        var handlers = scope.ServiceProvider.GetServices<IBackgroundTaskEventHandler>();
+                        await scope.HandleExceptionAsync(ex);
+                    }
 
-                        await handlers.InvokeAsync((handler, context, token) => handler.ExecutingAsync(context, token), context, stoppingToken, _logger);
+                    await handlers.InvokeAsync((handler, context, token) => handler.ExecutedAsync(context, token), context, stoppingToken, _logger);
+                });
+            }
 
-                        try
-                        {
-                            _logger.LogInformation("Start processing background task '{TaskName}' on tenant '{TenantName}'.", taskName, tenant);
+            // Clear the 'HttpContext' for this async flow.
+            _httpContextAccessor.HttpContext = null;
+        });
+    }
 
-                            scheduler.Run();
-                            await task.DoWorkAsync(scope.ServiceProvider, stoppingToken);
+    private async Task UpdateAsync(
+        (string Tenant, long UtcTicks)[] previousShells,
+        (string Tenant, long UtcTicks)[] runningShells, CancellationToken stoppingToken)
+    {
+        var referenceTime = DateTime.UtcNow;
 
-                            _logger.LogInformation("Finished processing background task '{TaskName}' on tenant '{TenantName}'.", taskName, tenant);
-                        }
-                        catch (Exception ex) when (!ex.IsFatal())
-                        {
-                            _logger.LogError(ex, "Error while processing background task '{TaskName}' on tenant '{TenantName}'.", taskName, tenant);
-                            context.Exception = ex;
+        await Parallel.ForEachAsync(GetShellsToUpdate(previousShells, runningShells), async (tenant, cancellationToken) =>
+        {
+            if (stoppingToken.IsCancellationRequested)
+            {
+                return;
+            }
 
-                            await scope.HandleExceptionAsync(ex);
-                        }
+            // Check if the shell is still registered and running.
+            if (!_shellHost.TryGetShellContext(tenant, out var shell) || !shell.Settings.IsRunning())
+            {
+                return;
+            }
 
-                        await handlers.InvokeAsync((handler, context, token) => handler.ExecutedAsync(context, token), context, stoppingToken, _logger);
-                    });
-                }
+            // Try to create a shell scope on this shell context.
+            var (shellScope, success) = await _shellHost.TryGetScopeAsync(shell.Settings.Name);
+            if (!success)
+            {
+                return;
+            }
 
-                // Clear the 'HttpContext' for this async flow.
-                _httpContextAccessor.HttpContext = null;
-            });
-        }
+            // Check if the shell has no pipeline and should not be warmed up.
+            if (!_options.ShellWarmup && !shellScope.ShellContext.HasPipeline())
+            {
+                await shellScope.TerminateShellAsync();
+                return;
+            }
 
-        private async Task UpdateAsync(
-            (string Tenant, long UtcTicks)[] previousShells,
-            (string Tenant, long UtcTicks)[] runningShells, CancellationToken stoppingToken)
-        {
-            var referenceTime = DateTime.UtcNow;
+            // Create a new 'HttpContext' to be used in the background.
+            _httpContextAccessor.HttpContext = shell.CreateHttpContext();
 
-            await Parallel.ForEachAsync(GetShellsToUpdate(previousShells, runningShells), async (tenant, cancellationToken) =>
+            await shellScope.UsingAsync(async scope =>
             {
-                if (stoppingToken.IsCancellationRequested)
-                {
-                    return;
-                }
+                var tasks = scope.ServiceProvider.GetServices<IBackgroundTask>();
 
-                // Check if the shell is still registered and running.
-                if (!_shellHost.TryGetShellContext(tenant, out var shell) || !shell.Settings.IsRunning())
-                {
-                    return;
-                }
+                CleanSchedulers(tenant, tasks);
 
-                // Try to create a shell scope on this shell context.
-                var (shellScope, success) = await _shellHost.TryGetScopeAsync(shell.Settings.Name);
-                if (!success)
+                if (!tasks.Any())
                 {
                     return;
                 }
 
-                // Check if the shell has no pipeline and should not be warmed up.
-                if (!_options.ShellWarmup && !shellScope.ShellContext.HasPipeline())
+                var settingsProvider = scope.ServiceProvider.GetService<IBackgroundTaskSettingsProvider>();
+                _changeTokens[tenant] = settingsProvider?.ChangeToken ?? NullChangeToken.Singleton;
+
+                ITimeZone timeZone = null;
+                var siteService = scope.ServiceProvider.GetService<ISiteService>();
+                if (siteService is not null)
                 {
-                    await shellScope.TerminateShellAsync();
-                    return;
+                    try
+                    {
+                        timeZone = _clock.GetTimeZone((await siteService.GetSiteSettingsAsync()).TimeZoneId);
+                    }
+                    catch (Exception ex) when (!ex.IsFatal())
+                    {
+                        _logger.LogError(ex, "Error while getting the time zone from the site settings of the tenant '{TenantName}'.", tenant);
+                    }
                 }
 
-                // Create a new 'HttpContext' to be used in the background.
-                _httpContextAccessor.HttpContext = shell.CreateHttpContext();
-
-                await shellScope.UsingAsync(async scope =>
+                foreach (var task in tasks)
                 {
-                    var tasks = scope.ServiceProvider.GetServices<IBackgroundTask>();
-
-                    CleanSchedulers(tenant, tasks);
-
-                    if (!tasks.Any())
+                    var taskName = task.GetTaskName();
+                    var tenantTaskName = tenant + taskName;
+                    if (!_schedulers.TryGetValue(tenantTaskName, out var scheduler))
                     {
-                        return;
+                        _schedulers[tenantTaskName] = scheduler = new BackgroundTaskScheduler(tenant, taskName, referenceTime, _clock);
                     }
 
-                    var settingsProvider = scope.ServiceProvider.GetService<IBackgroundTaskSettingsProvider>();
-                    _changeTokens[tenant] = settingsProvider?.ChangeToken ?? NullChangeToken.Singleton;
+                    scheduler.TimeZone = timeZone;
+                    if (!scheduler.Released && scheduler.Updated)
+                    {
+                        continue;
+                    }
 
-                    ITimeZone timeZone = null;
-                    var siteService = scope.ServiceProvider.GetService<ISiteService>();
-                    if (siteService is not null)
+                    BackgroundTaskSettings settings = null;
+                    if (settingsProvider is not null)
                     {
                         try
                         {
-                            timeZone = _clock.GetTimeZone((await siteService.GetSiteSettingsAsync()).TimeZoneId);
+                            settings = await settingsProvider.GetSettingsAsync(task);
                         }
                         catch (Exception ex) when (!ex.IsFatal())
                         {
-                            _logger.LogError(ex, "Error while getting the time zone from the site settings of the tenant '{TenantName}'.", tenant);
+                            _logger.LogError(ex, "Error while updating settings of background task '{TaskName}' on tenant '{TenantName}'.", taskName, tenant);
                         }
                     }
 
-                    foreach (var task in tasks)
+                    settings ??= task.GetDefaultSettings();
+                    if (scheduler.Released || !scheduler.Settings.Schedule.Equals(settings.Schedule, StringComparison.Ordinal))
                     {
-                        var taskName = task.GetTaskName();
-                        var tenantTaskName = tenant + taskName;
-                        if (!_schedulers.TryGetValue(tenantTaskName, out var scheduler))
-                        {
-                            _schedulers[tenantTaskName] = scheduler = new BackgroundTaskScheduler(tenant, taskName, referenceTime, _clock);
-                        }
-
-                        scheduler.TimeZone = timeZone;
-                        if (!scheduler.Released && scheduler.Updated)
-                        {
-                            continue;
-                        }
-
-                        BackgroundTaskSettings settings = null;
-                        if (settingsProvider is not null)
-                        {
-                            try
-                            {
-                                settings = await settingsProvider.GetSettingsAsync(task);
-                            }
-                            catch (Exception ex) when (!ex.IsFatal())
-                            {
-                                _logger.LogError(ex, "Error while updating settings of background task '{TaskName}' on tenant '{TenantName}'.", taskName, tenant);
-                            }
-                        }
-
-                        settings ??= task.GetDefaultSettings();
-                        if (scheduler.Released || !scheduler.Settings.Schedule.Equals(settings.Schedule, StringComparison.Ordinal))
-                        {
-                            scheduler.ReferenceTime = referenceTime;
-                        }
-
-                        scheduler.Settings = settings;
-                        scheduler.Released = false;
-                        scheduler.Updated = true;
+                        scheduler.ReferenceTime = referenceTime;
                     }
-                });
 
-                // Clear the 'HttpContext' for this async flow.
-                _httpContextAccessor.HttpContext = null;
+                    scheduler.Settings = settings;
+                    scheduler.Released = false;
+                    scheduler.Updated = true;
+                }
             });
-        }
 
-        private static async Task WaitAsync(Task pollingDelay, CancellationToken stoppingToken)
+            // Clear the 'HttpContext' for this async flow.
+            _httpContextAccessor.HttpContext = null;
+        });
+    }
+
+    private static async Task WaitAsync(Task pollingDelay, CancellationToken stoppingToken)
+    {
+        try
         {
-            try
-            {
-                await Task.Delay(_minIdleTime, stoppingToken);
-                await pollingDelay;
-            }
-            catch (OperationCanceledException)
-            {
-            }
+            await Task.Delay(_minIdleTime, stoppingToken);
+            await pollingDelay;
         }
-
-        private (string Tenant, long UtcTicks)[] GetRunningShells() => _shellHost
-            .ListShellContexts()
-            .Where(shell => shell.Settings.IsRunning() && (_options.ShellWarmup || shell.HasPipeline()))
-            .Select(shell => (shell.Settings.Name, shell.UtcTicks))
-            .ToArray();
-
-        private string[] GetShellsToRun(IEnumerable<(string Tenant, long UtcTicks)> shells)
+        catch (OperationCanceledException)
         {
-            var tenantsToRun = _schedulers
-                .Where(scheduler => scheduler.Value.CanRun())
-                .Select(scheduler => scheduler.Value.Tenant)
-                .Distinct()
-                .ToArray();
-
-            return shells
-                .Select(shell => shell.Tenant)
-                .Where(tenant => tenantsToRun.Contains(tenant))
-                .ToArray();
         }
+    }
 
-        private string[] GetShellsToUpdate((string Tenant, long UtcTicks)[] previousShells, (string Tenant, long UtcTicks)[] runningShells)
-        {
-            var previousTenants = previousShells.Select(shell => shell.Tenant);
+    private (string Tenant, long UtcTicks)[] GetRunningShells() => _shellHost
+        .ListShellContexts()
+        .Where(shell => shell.Settings.IsRunning() && (_options.ShellWarmup || shell.HasPipeline()))
+        .Select(shell => (shell.Settings.Name, shell.UtcTicks))
+        .ToArray();
 
-            var releasedTenants = new List<string>();
-            foreach (var (tenant, utcTicks) in previousShells)
-            {
-                if (_shellHost.TryGetShellContext(tenant, out var existing) &&
-                    existing.UtcTicks == utcTicks &&
-                    !existing.Released)
-                {
-                    continue;
-                }
+    private string[] GetShellsToRun(IEnumerable<(string Tenant, long UtcTicks)> shells)
+    {
+        var tenantsToRun = _schedulers
+            .Where(scheduler => scheduler.Value.CanRun())
+            .Select(scheduler => scheduler.Value.Tenant)
+            .Distinct()
+            .ToArray();
 
-                releasedTenants.Add(tenant);
-            }
+        return shells
+            .Select(shell => shell.Tenant)
+            .Where(tenant => tenantsToRun.Contains(tenant))
+            .ToArray();
+    }
 
-            if (releasedTenants.Count > 0)
-            {
-                UpdateSchedulers(releasedTenants.ToArray(), scheduler => scheduler.Released = true);
-            }
+    private string[] GetShellsToUpdate((string Tenant, long UtcTicks)[] previousShells, (string Tenant, long UtcTicks)[] runningShells)
+    {
+        var previousTenants = previousShells.Select(shell => shell.Tenant);
 
-            var changedTenants = _changeTokens.Where(token => token.Value.HasChanged).Select(token => token.Key).ToArray();
-            if (changedTenants.Length > 0)
+        var releasedTenants = new List<string>();
+        foreach (var (tenant, utcTicks) in previousShells)
+        {
+            if (_shellHost.TryGetShellContext(tenant, out var existing) &&
+                existing.UtcTicks == utcTicks &&
+                !existing.Released)
             {
-                UpdateSchedulers(changedTenants, scheduler => scheduler.Updated = false);
+                continue;
             }
 
-            var runningTenants = runningShells.Select(shell => shell.Tenant);
-            var validTenants = previousTenants.Except(releasedTenants).Except(changedTenants);
-            var tenantsToUpdate = runningTenants.Except(validTenants).ToArray();
+            releasedTenants.Add(tenant);
+        }
 
-            return runningTenants.Where(tenant => tenantsToUpdate.Contains(tenant)).ToArray();
+        if (releasedTenants.Count > 0)
+        {
+            UpdateSchedulers(releasedTenants.ToArray(), scheduler => scheduler.Released = true);
         }
 
-        private BackgroundTaskScheduler[] GetSchedulersToRun(string tenant) => _schedulers
-            .Where(scheduler => scheduler.Value.Tenant == tenant && scheduler.Value.CanRun())
-            .Select(scheduler => scheduler.Value)
-            .ToArray();
+        var changedTenants = _changeTokens.Where(token => token.Value.HasChanged).Select(token => token.Key).ToArray();
+        if (changedTenants.Length > 0)
+        {
+            UpdateSchedulers(changedTenants, scheduler => scheduler.Updated = false);
+        }
+
+        var runningTenants = runningShells.Select(shell => shell.Tenant);
+        var validTenants = previousTenants.Except(releasedTenants).Except(changedTenants);
+        var tenantsToUpdate = runningTenants.Except(validTenants).ToArray();
+
+        return runningTenants.Where(tenant => tenantsToUpdate.Contains(tenant)).ToArray();
+    }
 
-        private void UpdateSchedulers(string[] tenants, Action<BackgroundTaskScheduler> action)
+    private BackgroundTaskScheduler[] GetSchedulersToRun(string tenant) => _schedulers
+        .Where(scheduler => scheduler.Value.Tenant == tenant && scheduler.Value.CanRun())
+        .Select(scheduler => scheduler.Value)
+        .ToArray();
+
+    private void UpdateSchedulers(string[] tenants, Action<BackgroundTaskScheduler> action)
+    {
+        var keys = _schedulers.Where(kv => tenants.Contains(kv.Value.Tenant)).Select(kv => kv.Key).ToArray();
+        foreach (var key in keys)
         {
-            var keys = _schedulers.Where(kv => tenants.Contains(kv.Value.Tenant)).Select(kv => kv.Key).ToArray();
-            foreach (var key in keys)
+            if (_schedulers.TryGetValue(key, out var scheduler))
             {
-                if (_schedulers.TryGetValue(key, out var scheduler))
-                {
-                    action(scheduler);
-                }
+                action(scheduler);
             }
         }
+    }
 
-        private void CleanSchedulers(string tenant, IEnumerable<IBackgroundTask> tasks)
-        {
-            var validKeys = tasks.Select(task => tenant + task.GetTaskName()).ToArray();
+    private void CleanSchedulers(string tenant, IEnumerable<IBackgroundTask> tasks)
+    {
+        var validKeys = tasks.Select(task => tenant + task.GetTaskName()).ToArray();
 
-            var keys = _schedulers.Where(kv => kv.Value.Tenant == tenant).Select(kv => kv.Key).ToArray();
-            foreach (var key in keys)
+        var keys = _schedulers.Where(kv => kv.Value.Tenant == tenant).Select(kv => kv.Key).ToArray();
+        foreach (var key in keys)
+        {
+            if (!validKeys.Contains(key))
             {
-                if (!validKeys.Contains(key))
-                {
-                    _schedulers.TryRemove(key, out _);
-                }
+                _schedulers.TryRemove(key, out _);
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore/Modules/ModularTenantContainerMiddleware.cs b/src/OrchardCore/OrchardCore/Modules/ModularTenantContainerMiddleware.cs
index c0bc28dcba8..1f74a7ec08c 100644
--- a/src/OrchardCore/OrchardCore/Modules/ModularTenantContainerMiddleware.cs
+++ b/src/OrchardCore/OrchardCore/Modules/ModularTenantContainerMiddleware.cs
@@ -4,69 +4,68 @@
 using Microsoft.Net.Http.Headers;
 using OrchardCore.Environment.Shell;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+/// <summary>
+/// This middleware replaces the default service provider by the one for the current tenant.
+/// </summary>
+public class ModularTenantContainerMiddleware
 {
-    /// <summary>
-    /// This middleware replaces the default service provider by the one for the current tenant.
-    /// </summary>
-    public class ModularTenantContainerMiddleware
-    {
-        private readonly RequestDelegate _next;
-        private readonly IShellHost _shellHost;
-        private readonly IRunningShellTable _runningShellTable;
+    private readonly RequestDelegate _next;
+    private readonly IShellHost _shellHost;
+    private readonly IRunningShellTable _runningShellTable;
 
-        public ModularTenantContainerMiddleware(
-            RequestDelegate next,
-            IShellHost shellHost,
-            IRunningShellTable runningShellTable)
-        {
-            _next = next;
-            _shellHost = shellHost;
-            _runningShellTable = runningShellTable;
-        }
+    public ModularTenantContainerMiddleware(
+        RequestDelegate next,
+        IShellHost shellHost,
+        IRunningShellTable runningShellTable)
+    {
+        _next = next;
+        _shellHost = shellHost;
+        _runningShellTable = runningShellTable;
+    }
 
-        public async Task Invoke(HttpContext httpContext)
-        {
-            // Ensure all ShellContext are loaded and available.
-            await _shellHost.InitializeAsync();
+    public async Task Invoke(HttpContext httpContext)
+    {
+        // Ensure all ShellContext are loaded and available.
+        await _shellHost.InitializeAsync();
 
-            var shellSettings = _runningShellTable.Match(httpContext);
+        var shellSettings = _runningShellTable.Match(httpContext);
 
-            // We only serve the next request if the tenant has been resolved.
-            if (shellSettings is not null)
+        // We only serve the next request if the tenant has been resolved.
+        if (shellSettings is not null)
+        {
+            if (shellSettings.IsInitializing())
             {
-                if (shellSettings.IsInitializing())
-                {
-                    httpContext.Response.Headers.Append(HeaderNames.RetryAfter, "10");
-                    httpContext.Response.StatusCode = StatusCodes.Status503ServiceUnavailable;
-                    await httpContext.Response.WriteAsync("The requested tenant is currently initializing.");
-                    return;
-                }
+                httpContext.Response.Headers.Append(HeaderNames.RetryAfter, "10");
+                httpContext.Response.StatusCode = StatusCodes.Status503ServiceUnavailable;
+                await httpContext.Response.WriteAsync("The requested tenant is currently initializing.");
+                return;
+            }
 
-                // Makes 'RequestServices' aware of the current 'ShellScope'.
-                httpContext.UseShellScopeServices();
+            // Makes 'RequestServices' aware of the current 'ShellScope'.
+            httpContext.UseShellScopeServices();
 
-                var shellScope = await _shellHost.GetScopeAsync(shellSettings);
+            var shellScope = await _shellHost.GetScopeAsync(shellSettings);
 
-                // Holds the 'ShellContext' for the full request.
-                httpContext.Features.Set(new ShellContextFeature
-                {
-                    ShellContext = shellScope.ShellContext,
-                    OriginalPath = httpContext.Request.Path,
-                    OriginalPathBase = httpContext.Request.PathBase
-                });
+            // Holds the 'ShellContext' for the full request.
+            httpContext.Features.Set(new ShellContextFeature
+            {
+                ShellContext = shellScope.ShellContext,
+                OriginalPath = httpContext.Request.Path,
+                OriginalPathBase = httpContext.Request.PathBase
+            });
 
-                await shellScope.UsingAsync(async scope =>
-                {
-                    await _next.Invoke(httpContext);
+            await shellScope.UsingAsync(async scope =>
+            {
+                await _next.Invoke(httpContext);
 
-                    var feature = httpContext.Features.Get<IExceptionHandlerFeature>();
-                    if (feature?.Error is not null)
-                    {
-                        await scope.HandleExceptionAsync(feature.Error);
-                    }
-                });
-            }
+                var feature = httpContext.Features.Get<IExceptionHandlerFeature>();
+                if (feature?.Error is not null)
+                {
+                    await scope.HandleExceptionAsync(feature.Error);
+                }
+            });
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Modules/ModularTenantRouterMiddleware.cs b/src/OrchardCore/OrchardCore/Modules/ModularTenantRouterMiddleware.cs
index b344ff717e0..5f8da59f31f 100644
--- a/src/OrchardCore/OrchardCore/Modules/ModularTenantRouterMiddleware.cs
+++ b/src/OrchardCore/OrchardCore/Modules/ModularTenantRouterMiddleware.cs
@@ -5,46 +5,45 @@
 using OrchardCore.Environment.Shell;
 using OrchardCore.Environment.Shell.Scope;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+/// <summary>
+/// Handles a request by forwarding it to the tenant specific pipeline.
+/// It also initializes the middlewares for the requested tenant on the first request.
+/// </summary>
+public class ModularTenantRouterMiddleware
 {
-    /// <summary>
-    /// Handles a request by forwarding it to the tenant specific pipeline.
-    /// It also initializes the middlewares for the requested tenant on the first request.
-    /// </summary>
-    public class ModularTenantRouterMiddleware
+    private readonly ILogger _logger;
+
+    public ModularTenantRouterMiddleware(RequestDelegate _, ILogger<ModularTenantRouterMiddleware> logger)
+        => _logger = logger;
+
+    public async Task Invoke(HttpContext httpContext)
     {
-        private readonly ILogger _logger;
+        if (_logger.IsEnabled(LogLevel.Information))
+        {
+            _logger.LogInformation("Begin Routing Request");
+        }
 
-        public ModularTenantRouterMiddleware(RequestDelegate _, ILogger<ModularTenantRouterMiddleware> logger)
-            => _logger = logger;
+        var shellContext = ShellScope.Context;
 
-        public async Task Invoke(HttpContext httpContext)
+        // Define a new 'PathBase' for the current request based on the tenant 'RequestUrlPrefix'.
+        // Because IIS or another middleware might have already set it, we just append the prefix.
+        // This allows to use any helper accepting the '~/' path to resolve the tenant's base url.
+        if (!string.IsNullOrEmpty(shellContext.Settings.RequestUrlPrefix))
         {
-            if (_logger.IsEnabled(LogLevel.Information))
-            {
-                _logger.LogInformation("Begin Routing Request");
-            }
-
-            var shellContext = ShellScope.Context;
-
-            // Define a new 'PathBase' for the current request based on the tenant 'RequestUrlPrefix'.
-            // Because IIS or another middleware might have already set it, we just append the prefix.
-            // This allows to use any helper accepting the '~/' path to resolve the tenant's base url.
-            if (!string.IsNullOrEmpty(shellContext.Settings.RequestUrlPrefix))
-            {
-                PathString prefix = "/" + shellContext.Settings.RequestUrlPrefix;
-                httpContext.Request.PathBase += prefix;
-                httpContext.Request.Path.StartsWithSegments(prefix, StringComparison.OrdinalIgnoreCase, out var remainingPath);
-                httpContext.Request.Path = remainingPath;
-            }
-
-            // Do we need to rebuild the pipeline?
-            if (!shellContext.HasPipeline())
-            {
-                await shellContext.BuildPipelineAsync();
-            }
-
-            await shellContext.Pipeline.Invoke(httpContext);
+            PathString prefix = "/" + shellContext.Settings.RequestUrlPrefix;
+            httpContext.Request.PathBase += prefix;
+            httpContext.Request.Path.StartsWithSegments(prefix, StringComparison.OrdinalIgnoreCase, out var remainingPath);
+            httpContext.Request.Path = remainingPath;
         }
+
+        // Do we need to rebuild the pipeline?
+        if (!shellContext.HasPipeline())
+        {
+            await shellContext.BuildPipelineAsync();
+        }
+
+        await shellContext.Pipeline.Invoke(httpContext);
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/ActiveHandlerTrackingEntry.cs b/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/ActiveHandlerTrackingEntry.cs
index 1a2493023d6..355fc75946b 100644
--- a/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/ActiveHandlerTrackingEntry.cs
+++ b/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/ActiveHandlerTrackingEntry.cs
@@ -7,114 +7,113 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.Extensions.Http
+namespace Microsoft.Extensions.Http;
+
+// Thread-safety: We treat this class as immutable except for the timer. Creating a new object
+// for the 'expiry' pool simplifies the threading requirements significantly.
+internal sealed class ActiveHandlerTrackingEntry : IDisposable
 {
-    // Thread-safety: We treat this class as immutable except for the timer. Creating a new object
-    // for the 'expiry' pool simplifies the threading requirements significantly.
-    internal sealed class ActiveHandlerTrackingEntry : IDisposable
+    private static readonly TimerCallback _timerCallback = (s) => ((ActiveHandlerTrackingEntry)s!).Timer_Tick();
+    private readonly object _lock;
+    private bool _timerInitialized;
+    private Timer _timer;
+    private TimerCallback _callback;
+
+    // OC: Implement IDisposable.
+    private bool _disposed;
+
+    public ActiveHandlerTrackingEntry(
+        string name,
+        LifetimeTrackingHttpMessageHandler handler,
+        IServiceScope scope,
+        TimeSpan lifetime)
     {
-        private static readonly TimerCallback _timerCallback = (s) => ((ActiveHandlerTrackingEntry)s!).Timer_Tick();
-        private readonly object _lock;
-        private bool _timerInitialized;
-        private Timer _timer;
-        private TimerCallback _callback;
-
-        // OC: Implement IDisposable.
-        private bool _disposed;
-
-        public ActiveHandlerTrackingEntry(
-            string name,
-            LifetimeTrackingHttpMessageHandler handler,
-            IServiceScope scope,
-            TimeSpan lifetime)
-        {
-            Name = name;
-            Handler = handler;
-            Scope = scope;
-            Lifetime = lifetime;
+        Name = name;
+        Handler = handler;
+        Scope = scope;
+        Lifetime = lifetime;
 
-            _lock = new object();
-        }
+        _lock = new object();
+    }
 
-        public LifetimeTrackingHttpMessageHandler Handler { get; private set; }
+    public LifetimeTrackingHttpMessageHandler Handler { get; private set; }
 
-        public TimeSpan Lifetime { get; }
+    public TimeSpan Lifetime { get; }
 
-        public string Name { get; }
+    public string Name { get; }
 
-        public IServiceScope Scope { get; set; }
+    public IServiceScope Scope { get; set; }
 
-        public void StartExpiryTimer(TimerCallback callback)
+    public void StartExpiryTimer(TimerCallback callback)
+    {
+        if (Lifetime == Timeout.InfiniteTimeSpan)
         {
-            if (Lifetime == Timeout.InfiniteTimeSpan)
-            {
-                return; // never expires.
-            }
+            return; // never expires.
+        }
 
+        if (Volatile.Read(ref _timerInitialized))
+        {
+            return;
+        }
+
+        StartExpiryTimerSlow(callback);
+    }
+
+    private void StartExpiryTimerSlow(TimerCallback callback)
+    {
+        Debug.Assert(Lifetime != Timeout.InfiniteTimeSpan);
+
+        lock (_lock)
+        {
             if (Volatile.Read(ref _timerInitialized))
             {
                 return;
             }
 
-            StartExpiryTimerSlow(callback);
+            _callback = callback;
+            _timer = NonCapturingTimer.Create(_timerCallback, this, Lifetime, Timeout.InfiniteTimeSpan);
+            _timerInitialized = true;
         }
+    }
 
-        private void StartExpiryTimerSlow(TimerCallback callback)
+    private void Timer_Tick()
+    {
+        // OC: Check if disposed.
+        if (_disposed)
         {
-            Debug.Assert(Lifetime != Timeout.InfiniteTimeSpan);
-
-            lock (_lock)
-            {
-                if (Volatile.Read(ref _timerInitialized))
-                {
-                    return;
-                }
-
-                _callback = callback;
-                _timer = NonCapturingTimer.Create(_timerCallback, this, Lifetime, Timeout.InfiniteTimeSpan);
-                _timerInitialized = true;
-            }
+            return;
         }
 
-        private void Timer_Tick()
-        {
-            // OC: Check if disposed.
-            if (_disposed)
-            {
-                return;
-            }
-
-            Debug.Assert(_callback != null);
-            Debug.Assert(_timer != null);
+        Debug.Assert(_callback != null);
+        Debug.Assert(_timer != null);
 
-            lock (_lock)
+        lock (_lock)
+        {
+            if (_timer != null)
             {
-                if (_timer != null)
-                {
-                    _timer.Dispose();
-                    _timer = null;
+                _timer.Dispose();
+                _timer = null;
 
-                    _callback(this);
-                }
+                _callback(this);
             }
         }
+    }
 
-        // OC: Implement IDisposable.
-        public void Dispose()
+    // OC: Implement IDisposable.
+    public void Dispose()
+    {
+        if (_disposed)
         {
-            if (_disposed)
-            {
-                return;
-            }
+            return;
+        }
 
-            _disposed = true;
+        _disposed = true;
 
-            _timer?.Dispose();
-            _timer = null;
-            Handler?.Dispose();
-            Handler = null;
-            Scope?.Dispose();
-            Scope = null;
-        }
+        _timer?.Dispose();
+        _timer = null;
+        Handler?.Dispose();
+        Handler = null;
+        Scope?.Dispose();
+        Scope = null;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/ExpiredHandlerTrackingEntry.cs b/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/ExpiredHandlerTrackingEntry.cs
index 15d8724ea60..7c09c72ee9a 100644
--- a/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/ExpiredHandlerTrackingEntry.cs
+++ b/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/ExpiredHandlerTrackingEntry.cs
@@ -5,30 +5,29 @@
 using System.Net.Http;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.Extensions.Http
+namespace Microsoft.Extensions.Http;
+
+// Thread-safety: This class is immutable.
+internal sealed class ExpiredHandlerTrackingEntry
 {
-    // Thread-safety: This class is immutable.
-    internal sealed class ExpiredHandlerTrackingEntry
-    {
-        private readonly WeakReference _livenessTracker;
+    private readonly WeakReference _livenessTracker;
 
-        // IMPORTANT: don't cache a reference to `other` or `other.Handler` here.
-        // We need to allow it to be collected by the GC.
-        public ExpiredHandlerTrackingEntry(ActiveHandlerTrackingEntry other)
-        {
-            Name = other.Name;
-            Scope = other.Scope;
+    // IMPORTANT: don't cache a reference to `other` or `other.Handler` here.
+    // We need to allow it to be collected by the GC.
+    public ExpiredHandlerTrackingEntry(ActiveHandlerTrackingEntry other)
+    {
+        Name = other.Name;
+        Scope = other.Scope;
 
-            _livenessTracker = new WeakReference(other.Handler);
-            InnerHandler = other.Handler.InnerHandler!;
-        }
+        _livenessTracker = new WeakReference(other.Handler);
+        InnerHandler = other.Handler.InnerHandler!;
+    }
 
-        public bool CanDispose => !_livenessTracker.IsAlive;
+    public bool CanDispose => !_livenessTracker.IsAlive;
 
-        public HttpMessageHandler InnerHandler { get; set; }
+    public HttpMessageHandler InnerHandler { get; set; }
 
-        public string Name { get; }
+    public string Name { get; }
 
-        public IServiceScope Scope { get; set; }
-    }
+    public IServiceScope Scope { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/LifetimeTrackingHttpMessageHandler.cs b/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/LifetimeTrackingHttpMessageHandler.cs
index 212a4933b22..3e62854f128 100644
--- a/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/LifetimeTrackingHttpMessageHandler.cs
+++ b/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/LifetimeTrackingHttpMessageHandler.cs
@@ -3,23 +3,22 @@
 
 using System.Net.Http;
 
-namespace Microsoft.Extensions.Http
+namespace Microsoft.Extensions.Http;
+
+// This is a marker used to check if the underlying handler should be disposed. HttpClients
+// share a reference to an instance of this class, and when it goes out of scope the inner handler
+// is eligible to be disposed.
+internal sealed class LifetimeTrackingHttpMessageHandler : DelegatingHandler
 {
-    // This is a marker used to check if the underlying handler should be disposed. HttpClients
-    // share a reference to an instance of this class, and when it goes out of scope the inner handler
-    // is eligible to be disposed.
-    internal sealed class LifetimeTrackingHttpMessageHandler : DelegatingHandler
+    public LifetimeTrackingHttpMessageHandler(HttpMessageHandler innerHandler)
+        : base(innerHandler)
     {
-        public LifetimeTrackingHttpMessageHandler(HttpMessageHandler innerHandler)
-            : base(innerHandler)
-        {
-        }
+    }
 
 #pragma warning disable CA2215 // Dispose methods should call base class dispose
-        protected override void Dispose(bool disposing)
+    protected override void Dispose(bool disposing)
 #pragma warning restore CA2215
-        {
-            // The lifetime of this is tracked separately by ActiveHandlerTrackingEntry.
-        }
+    {
+        // The lifetime of this is tracked separately by ActiveHandlerTrackingEntry.
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/NonCapturingTimer.cs b/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/NonCapturingTimer.cs
index 3733913b1ca..c9a95b7e5d8 100644
--- a/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/NonCapturingTimer.cs
+++ b/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/NonCapturingTimer.cs
@@ -4,36 +4,35 @@
 using System;
 using System.Threading;
 
-namespace Microsoft.Extensions.Internal
+namespace Microsoft.Extensions.Internal;
+
+// A convenience API for interacting with System.Threading.Timer in a way
+// that doesn't capture the ExecutionContext. We should be using this (or equivalent)
+// everywhere we use timers to avoid rooting any values stored in async locals.
+internal static class NonCapturingTimer
 {
-    // A convenience API for interacting with System.Threading.Timer in a way
-    // that doesn't capture the ExecutionContext. We should be using this (or equivalent)
-    // everywhere we use timers to avoid rooting any values stored in async locals.
-    internal static class NonCapturingTimer
+    public static Timer Create(TimerCallback callback, object state, TimeSpan dueTime, TimeSpan period)
     {
-        public static Timer Create(TimerCallback callback, object state, TimeSpan dueTime, TimeSpan period)
-        {
-            ArgumentNullException.ThrowIfNull(callback);
+        ArgumentNullException.ThrowIfNull(callback);
 
-            // Don't capture the current ExecutionContext and its AsyncLocals onto the timer.
-            var restoreFlow = false;
-            try
+        // Don't capture the current ExecutionContext and its AsyncLocals onto the timer.
+        var restoreFlow = false;
+        try
+        {
+            if (!ExecutionContext.IsFlowSuppressed())
             {
-                if (!ExecutionContext.IsFlowSuppressed())
-                {
-                    ExecutionContext.SuppressFlow();
-                    restoreFlow = true;
-                }
-
-                return new Timer(callback, state, dueTime, period);
+                ExecutionContext.SuppressFlow();
+                restoreFlow = true;
             }
-            finally
+
+            return new Timer(callback, state, dueTime, period);
+        }
+        finally
+        {
+            // Restore the current ExecutionContext.
+            if (restoreFlow)
             {
-                // Restore the current ExecutionContext.
-                if (restoreFlow)
-                {
-                    ExecutionContext.RestoreFlow();
-                }
+                ExecutionContext.RestoreFlow();
             }
         }
     }
diff --git a/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/TenantHttpClientFactory.cs b/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/TenantHttpClientFactory.cs
index 752de2a90a9..41539c74d0d 100644
--- a/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/TenantHttpClientFactory.cs
+++ b/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/TenantHttpClientFactory.cs
@@ -17,436 +17,435 @@
 
 #nullable enable
 
-namespace Microsoft.Extensions.Http
+namespace Microsoft.Extensions.Http;
+
+internal sealed class TenantHttpClientFactory : IHttpClientFactory, IHttpMessageHandlerFactory, IDisposable
 {
-    internal sealed class TenantHttpClientFactory : IHttpClientFactory, IHttpMessageHandlerFactory, IDisposable
+    private static readonly TimerCallback _cleanupCallback = (s) => ((TenantHttpClientFactory)s!).CleanupTimer_Tick();
+    private IServiceProvider? _services;
+    private IServiceScopeFactory? _scopeFactory;
+    private IOptionsMonitor<HttpClientFactoryOptions>? _optionsMonitor;
+    private IHttpMessageHandlerBuilderFilter[]? _filters;
+    private Func<string, Lazy<ActiveHandlerTrackingEntry>>? _entryFactory;
+    private readonly Lazy<ILogger> _logger;
+
+    // OC: Implement IDisposable.
+    private bool _disposed;
+
+    // Default time of 10s for cleanup seems reasonable.
+    // Quick math:
+    // 10 distinct named clients * expiry time >= 1s = approximate cleanup queue of 100 items
+    //
+    // This seems frequent enough. We also rely on GC occurring to actually trigger disposal.
+    private readonly TimeSpan _defaultCleanupInterval = TimeSpan.FromSeconds(10);
+
+    // We use a new timer for each regular cleanup cycle, protected with a lock. Note that this scheme
+    // doesn't give us anything to dispose, as the timer is started/stopped as needed.
+    //
+    // There's no need for the factory itself to be disposable. If you stop using it, eventually everything will
+    // get reclaimed.
+    private Timer? _cleanupTimer;
+    private readonly object _cleanupTimerLock;
+    private readonly object _cleanupActiveLock;
+
+    // Collection of 'active' handlers.
+    //
+    // Using lazy for synchronization to ensure that only one instance of HttpMessageHandler is created
+    // for each name.
+    //
+    // internal for tests
+    internal readonly ConcurrentDictionary<string, Lazy<ActiveHandlerTrackingEntry>> _activeHandlers;
+
+    // Collection of 'expired' but not yet disposed handlers.
+    //
+    // Used when we're rotating handlers so that we can dispose HttpMessageHandler instances once they
+    // are eligible for garbage collection.
+    //
+    // internal for tests
+    internal readonly ConcurrentQueue<ExpiredHandlerTrackingEntry> _expiredHandlers;
+    private readonly TimerCallback _expiryCallback;
+
+    public TenantHttpClientFactory(
+        IServiceProvider services,
+        IServiceScopeFactory scopeFactory,
+        IOptionsMonitor<HttpClientFactoryOptions> optionsMonitor,
+        IEnumerable<IHttpMessageHandlerBuilderFilter> filters)
     {
-        private static readonly TimerCallback _cleanupCallback = (s) => ((TenantHttpClientFactory)s!).CleanupTimer_Tick();
-        private IServiceProvider? _services;
-        private IServiceScopeFactory? _scopeFactory;
-        private IOptionsMonitor<HttpClientFactoryOptions>? _optionsMonitor;
-        private IHttpMessageHandlerBuilderFilter[]? _filters;
-        private Func<string, Lazy<ActiveHandlerTrackingEntry>>? _entryFactory;
-        private readonly Lazy<ILogger> _logger;
-
-        // OC: Implement IDisposable.
-        private bool _disposed;
-
-        // Default time of 10s for cleanup seems reasonable.
-        // Quick math:
-        // 10 distinct named clients * expiry time >= 1s = approximate cleanup queue of 100 items
-        //
-        // This seems frequent enough. We also rely on GC occurring to actually trigger disposal.
-        private readonly TimeSpan _defaultCleanupInterval = TimeSpan.FromSeconds(10);
+        // ThrowHelper.ThrowIfNull(services);
+        // ThrowHelper.ThrowIfNull(scopeFactory);
+        // ThrowHelper.ThrowIfNull(optionsMonitor);
+        // ThrowHelper.ThrowIfNull(filters);
+
+        ArgumentNullException.ThrowIfNull(services);
+        ArgumentNullException.ThrowIfNull(scopeFactory);
+        ArgumentNullException.ThrowIfNull(optionsMonitor);
+        ArgumentNullException.ThrowIfNull(filters);
+
+        _services = services;
+        _scopeFactory = scopeFactory;
+        _optionsMonitor = optionsMonitor;
+        _filters = filters.ToArray();
+
+        // case-sensitive because named options is.
+        _activeHandlers = new ConcurrentDictionary<string, Lazy<ActiveHandlerTrackingEntry>>(StringComparer.Ordinal);
+        _entryFactory = (name) =>
+        {
+            return new Lazy<ActiveHandlerTrackingEntry>(() =>
+            {
+                return CreateHandlerEntry(name);
+            }, LazyThreadSafetyMode.ExecutionAndPublication);
+        };
+
+        _expiredHandlers = new ConcurrentQueue<ExpiredHandlerTrackingEntry>();
+        _expiryCallback = ExpiryTimer_Tick;
+
+        _cleanupTimerLock = new object();
+        _cleanupActiveLock = new object();
+
+        // We want to prevent a circular dependency between ILoggerFactory and IHttpClientFactory, in case
+        // any of ILoggerProvider instances use IHttpClientFactory to send logs to an external server.
+        // Logger will be created during the first ExpiryTimer_Tick execution. Lazy guarantees thread safety
+        // to prevent creation of unnecessary ILogger objects in case several handlers expired at the same time.
+
+        // OC: Null check on '_services'.
+        _logger = new Lazy<ILogger>(() =>
+            _services is not null
+                ? _services.GetRequiredService<ILoggerFactory>().CreateLogger<TenantHttpClientFactory>()
+                : NullLogger.Instance,
+            LazyThreadSafetyMode.ExecutionAndPublication);
+    }
 
-        // We use a new timer for each regular cleanup cycle, protected with a lock. Note that this scheme
-        // doesn't give us anything to dispose, as the timer is started/stopped as needed.
-        //
-        // There's no need for the factory itself to be disposable. If you stop using it, eventually everything will
-        // get reclaimed.
-        private Timer? _cleanupTimer;
-        private readonly object _cleanupTimerLock;
-        private readonly object _cleanupActiveLock;
+    public HttpClient CreateClient(string name)
+    {
+        // ThrowHelper.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(name);
 
-        // Collection of 'active' handlers.
-        //
-        // Using lazy for synchronization to ensure that only one instance of HttpMessageHandler is created
-        // for each name.
-        //
-        // internal for tests
-        internal readonly ConcurrentDictionary<string, Lazy<ActiveHandlerTrackingEntry>> _activeHandlers;
+        var handler = CreateHandler(name);
+        var client = new HttpClient(handler, disposeHandler: false);
 
-        // Collection of 'expired' but not yet disposed handlers.
-        //
-        // Used when we're rotating handlers so that we can dispose HttpMessageHandler instances once they
-        // are eligible for garbage collection.
-        //
-        // internal for tests
-        internal readonly ConcurrentQueue<ExpiredHandlerTrackingEntry> _expiredHandlers;
-        private readonly TimerCallback _expiryCallback;
-
-        public TenantHttpClientFactory(
-            IServiceProvider services,
-            IServiceScopeFactory scopeFactory,
-            IOptionsMonitor<HttpClientFactoryOptions> optionsMonitor,
-            IEnumerable<IHttpMessageHandlerBuilderFilter> filters)
+        var options = _optionsMonitor!.Get(name);
+        for (var i = 0; i < options.HttpClientActions.Count; i++)
         {
-            // ThrowHelper.ThrowIfNull(services);
-            // ThrowHelper.ThrowIfNull(scopeFactory);
-            // ThrowHelper.ThrowIfNull(optionsMonitor);
-            // ThrowHelper.ThrowIfNull(filters);
-
-            ArgumentNullException.ThrowIfNull(services);
-            ArgumentNullException.ThrowIfNull(scopeFactory);
-            ArgumentNullException.ThrowIfNull(optionsMonitor);
-            ArgumentNullException.ThrowIfNull(filters);
-
-            _services = services;
-            _scopeFactory = scopeFactory;
-            _optionsMonitor = optionsMonitor;
-            _filters = filters.ToArray();
-
-            // case-sensitive because named options is.
-            _activeHandlers = new ConcurrentDictionary<string, Lazy<ActiveHandlerTrackingEntry>>(StringComparer.Ordinal);
-            _entryFactory = (name) =>
-            {
-                return new Lazy<ActiveHandlerTrackingEntry>(() =>
-                {
-                    return CreateHandlerEntry(name);
-                }, LazyThreadSafetyMode.ExecutionAndPublication);
-            };
-
-            _expiredHandlers = new ConcurrentQueue<ExpiredHandlerTrackingEntry>();
-            _expiryCallback = ExpiryTimer_Tick;
-
-            _cleanupTimerLock = new object();
-            _cleanupActiveLock = new object();
-
-            // We want to prevent a circular dependency between ILoggerFactory and IHttpClientFactory, in case
-            // any of ILoggerProvider instances use IHttpClientFactory to send logs to an external server.
-            // Logger will be created during the first ExpiryTimer_Tick execution. Lazy guarantees thread safety
-            // to prevent creation of unnecessary ILogger objects in case several handlers expired at the same time.
-
-            // OC: Null check on '_services'.
-            _logger = new Lazy<ILogger>(() =>
-                _services is not null
-                    ? _services.GetRequiredService<ILoggerFactory>().CreateLogger<TenantHttpClientFactory>()
-                    : NullLogger.Instance,
-                LazyThreadSafetyMode.ExecutionAndPublication);
+            options.HttpClientActions[i](client);
         }
 
-        public HttpClient CreateClient(string name)
-        {
-            // ThrowHelper.ThrowIfNull(name);
-            ArgumentNullException.ThrowIfNull(name);
-
-            var handler = CreateHandler(name);
-            var client = new HttpClient(handler, disposeHandler: false);
+        return client;
+    }
 
-            var options = _optionsMonitor!.Get(name);
-            for (var i = 0; i < options.HttpClientActions.Count; i++)
-            {
-                options.HttpClientActions[i](client);
-            }
+    public HttpMessageHandler CreateHandler(string name)
+    {
+        // ThrowHelper.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(name);
 
-            return client;
-        }
+        var entry = _activeHandlers.GetOrAdd(name, _entryFactory!).Value;
 
-        public HttpMessageHandler CreateHandler(string name)
-        {
-            // ThrowHelper.ThrowIfNull(name);
-            ArgumentNullException.ThrowIfNull(name);
+        StartHandlerEntryTimer(entry);
 
-            var entry = _activeHandlers.GetOrAdd(name, _entryFactory!).Value;
+        return entry.Handler;
+    }
 
-            StartHandlerEntryTimer(entry);
+    // Internal for tests
+    internal ActiveHandlerTrackingEntry CreateHandlerEntry(string name)
+    {
+        var services = _services;
+        var scope = (IServiceScope?)null;
 
-            return entry.Handler;
+        var options = _optionsMonitor!.Get(name);
+        if (!options.SuppressHandlerScope)
+        {
+            scope = _scopeFactory!.CreateScope();
+            services = scope.ServiceProvider;
         }
 
-        // Internal for tests
-        internal ActiveHandlerTrackingEntry CreateHandlerEntry(string name)
+        try
         {
-            var services = _services;
-            var scope = (IServiceScope?)null;
+            var builder = services!.GetRequiredService<HttpMessageHandlerBuilder>();
+            builder.Name = name;
 
-            var options = _optionsMonitor!.Get(name);
-            if (!options.SuppressHandlerScope)
+            // This is similar to the initialization pattern in:
+            // https://github.com/aspnet/Hosting/blob/e892ed8bbdcd25a0dafc1850033398dc57f65fe1/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs#L188
+            Action<HttpMessageHandlerBuilder> configure = Configure;
+            for (var i = _filters!.Length - 1; i >= 0; i--)
             {
-                scope = _scopeFactory!.CreateScope();
-                services = scope.ServiceProvider;
+                configure = _filters[i].Configure(configure);
             }
 
-            try
-            {
-                var builder = services!.GetRequiredService<HttpMessageHandlerBuilder>();
-                builder.Name = name;
-
-                // This is similar to the initialization pattern in:
-                // https://github.com/aspnet/Hosting/blob/e892ed8bbdcd25a0dafc1850033398dc57f65fe1/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs#L188
-                Action<HttpMessageHandlerBuilder> configure = Configure;
-                for (var i = _filters!.Length - 1; i >= 0; i--)
-                {
-                    configure = _filters[i].Configure(configure);
-                }
-
-                configure(builder);
+            configure(builder);
 
-                // Wrap the handler so we can ensure the inner handler outlives the outer handler.
-                var handler = new LifetimeTrackingHttpMessageHandler(builder.Build());
+            // Wrap the handler so we can ensure the inner handler outlives the outer handler.
+            var handler = new LifetimeTrackingHttpMessageHandler(builder.Build());
 
-                // Note that we can't start the timer here. That would introduce a very very subtle race condition
-                // with very short expiry times. We need to wait until we've actually handed out the handler once
-                // to start the timer.
-                //
-                // Otherwise it would be possible that we start the timer here, immediately expire it (very short
-                // timer) and then dispose it without ever creating a client. That would be bad. It's unlikely
-                // this would happen, but we want to be sure.
-                var entry = new ActiveHandlerTrackingEntry(name, handler, scope, options.HandlerLifetime);
+            // Note that we can't start the timer here. That would introduce a very very subtle race condition
+            // with very short expiry times. We need to wait until we've actually handed out the handler once
+            // to start the timer.
+            //
+            // Otherwise it would be possible that we start the timer here, immediately expire it (very short
+            // timer) and then dispose it without ever creating a client. That would be bad. It's unlikely
+            // this would happen, but we want to be sure.
+            var entry = new ActiveHandlerTrackingEntry(name, handler, scope, options.HandlerLifetime);
 
-                return entry;
+            return entry;
 
-                void Configure(HttpMessageHandlerBuilder b)
+            void Configure(HttpMessageHandlerBuilder b)
+            {
+                for (var i = 0; i < options.HttpMessageHandlerBuilderActions.Count; i++)
                 {
-                    for (var i = 0; i < options.HttpMessageHandlerBuilderActions.Count; i++)
-                    {
-                        options.HttpMessageHandlerBuilderActions[i](b);
-                    }
+                    options.HttpMessageHandlerBuilderActions[i](b);
+                }
 
-                    // OC: 'options.LoggingBuilderActions' is an internal field.
+                // OC: 'options.LoggingBuilderActions' is an internal field.
 
-                    // Logging is added separately in the end. But for now it should be still possible to override it via filters...
-                    // foreach (Action<HttpMessageHandlerBuilder> action in options.LoggingBuilderActions)
-                    // {
-                    //     action(b);
-                    // }
-                }
-            }
-            catch
-            {
-                // If something fails while creating the handler, dispose the services.
-                scope?.Dispose();
-                throw;
+                // Logging is added separately in the end. But for now it should be still possible to override it via filters...
+                // foreach (Action<HttpMessageHandlerBuilder> action in options.LoggingBuilderActions)
+                // {
+                //     action(b);
+                // }
             }
         }
+        catch
+        {
+            // If something fails while creating the handler, dispose the services.
+            scope?.Dispose();
+            throw;
+        }
+    }
 
-        // Internal for tests
-        internal void ExpiryTimer_Tick(object? state)
+    // Internal for tests
+    internal void ExpiryTimer_Tick(object? state)
+    {
+        // OC: Check if disposed.
+        if (_disposed)
         {
-            // OC: Check if disposed.
-            if (_disposed)
-            {
-                return;
-            }
+            return;
+        }
 
-            var active = (ActiveHandlerTrackingEntry)state!;
+        var active = (ActiveHandlerTrackingEntry)state!;
 
-            // The timer callback should be the only one removing from the active collection. If we can't find
-            // our entry in the collection, then this is a bug.
-            var removed = _activeHandlers.TryRemove(active.Name, out var found);
-            Debug.Assert(removed, "Entry not found. We should always be able to remove the entry");
-            Debug.Assert(object.ReferenceEquals(active, found!.Value), "Different entry found. The entry should not have been replaced");
+        // The timer callback should be the only one removing from the active collection. If we can't find
+        // our entry in the collection, then this is a bug.
+        var removed = _activeHandlers.TryRemove(active.Name, out var found);
+        Debug.Assert(removed, "Entry not found. We should always be able to remove the entry");
+        Debug.Assert(object.ReferenceEquals(active, found!.Value), "Different entry found. The entry should not have been replaced");
 
-            // At this point the handler is no longer 'active' and will not be handed out to any new clients.
-            // However we haven't dropped our strong reference to the handler, so we can't yet determine if
-            // there are still any other outstanding references (we know there is at least one).
-            //
-            // We use a different state object to track expired handlers. This allows any other thread that acquired
-            // the 'active' entry to use it without safety problems.
-            var expired = new ExpiredHandlerTrackingEntry(active);
-            _expiredHandlers.Enqueue(expired);
+        // At this point the handler is no longer 'active' and will not be handed out to any new clients.
+        // However we haven't dropped our strong reference to the handler, so we can't yet determine if
+        // there are still any other outstanding references (we know there is at least one).
+        //
+        // We use a different state object to track expired handlers. This allows any other thread that acquired
+        // the 'active' entry to use it without safety problems.
+        var expired = new ExpiredHandlerTrackingEntry(active);
+        _expiredHandlers.Enqueue(expired);
 
-            Log.HandlerExpired(_logger, active.Name, active.Lifetime);
+        Log.HandlerExpired(_logger, active.Name, active.Lifetime);
 
-            StartCleanupTimer();
-        }
+        StartCleanupTimer();
+    }
 
-        // Internal so it can be overridden in tests.
-        internal void StartHandlerEntryTimer(ActiveHandlerTrackingEntry entry)
-        {
-            entry.StartExpiryTimer(_expiryCallback);
-        }
+    // Internal so it can be overridden in tests.
+    internal void StartHandlerEntryTimer(ActiveHandlerTrackingEntry entry)
+    {
+        entry.StartExpiryTimer(_expiryCallback);
+    }
 
-        // Internal so it can be overridden in tests.
-        internal void StartCleanupTimer()
+    // Internal so it can be overridden in tests.
+    internal void StartCleanupTimer()
+    {
+        lock (_cleanupTimerLock)
         {
-            lock (_cleanupTimerLock)
-            {
-                _cleanupTimer ??= NonCapturingTimer.Create(_cleanupCallback, this, _defaultCleanupInterval, Timeout.InfiniteTimeSpan);
-            }
+            _cleanupTimer ??= NonCapturingTimer.Create(_cleanupCallback, this, _defaultCleanupInterval, Timeout.InfiniteTimeSpan);
         }
+    }
 
-        // Internal so it can be overridden in tests.
-        internal void StopCleanupTimer()
+    // Internal so it can be overridden in tests.
+    internal void StopCleanupTimer()
+    {
+        lock (_cleanupTimerLock)
         {
-            lock (_cleanupTimerLock)
-            {
-                _cleanupTimer?.Dispose();
-                _cleanupTimer = null;
-            }
+            _cleanupTimer?.Dispose();
+            _cleanupTimer = null;
         }
+    }
 
-        // Internal for tests.
-        internal void CleanupTimer_Tick()
+    // Internal for tests.
+    internal void CleanupTimer_Tick()
+    {
+        // Stop any pending timers, we'll restart the timer if there's anything left to process after cleanup.
+        //
+        // With the scheme we're using it's possible we could end up with some redundant cleanup operations.
+        // This is expected and fine.
+        //
+        // An alternative would be to take a lock during the whole cleanup process. This isn't ideal because it
+        // would result in threads executing ExpiryTimer_Tick as they would need to block on cleanup to figure out
+        // whether we need to start the timer.
+        StopCleanupTimer();
+
+        if (!Monitor.TryEnter(_cleanupActiveLock))
         {
-            // Stop any pending timers, we'll restart the timer if there's anything left to process after cleanup.
+            // We don't want to run a concurrent cleanup cycle. This can happen if the cleanup cycle takes
+            // a long time for some reason. Since we're running user code inside Dispose, it's definitely
+            // possible.
             //
-            // With the scheme we're using it's possible we could end up with some redundant cleanup operations.
-            // This is expected and fine.
+            // If we end up in that position, just make sure the timer gets started again. It should be cheap
+            // to run a 'no-op' cleanup.
             //
-            // An alternative would be to take a lock during the whole cleanup process. This isn't ideal because it
-            // would result in threads executing ExpiryTimer_Tick as they would need to block on cleanup to figure out
-            // whether we need to start the timer.
-            StopCleanupTimer();
 
-            if (!Monitor.TryEnter(_cleanupActiveLock))
-            {
-                // We don't want to run a concurrent cleanup cycle. This can happen if the cleanup cycle takes
-                // a long time for some reason. Since we're running user code inside Dispose, it's definitely
-                // possible.
-                //
-                // If we end up in that position, just make sure the timer gets started again. It should be cheap
-                // to run a 'no-op' cleanup.
-                //
-
-                // OC: May also happen if called while disposing.
-                StartCleanupTimer();
-
-                return;
-            }
+            // OC: May also happen if called while disposing.
+            StartCleanupTimer();
 
-            try
-            {
-                var initialCount = _expiredHandlers.Count;
-                Log.CleanupCycleStart(_logger, initialCount);
+            return;
+        }
 
-                var stopwatch = ValueStopwatch.StartNew();
+        try
+        {
+            var initialCount = _expiredHandlers.Count;
+            Log.CleanupCycleStart(_logger, initialCount);
 
-                var disposedCount = 0;
-                for (var i = 0; i < initialCount; i++)
-                {
-                    // Since we're the only one removing from _expired, TryDequeue must always succeed.
-                    _expiredHandlers.TryDequeue(out var entry);
-                    Debug.Assert(entry != null, "Entry was null, we should always get an entry back from TryDequeue");
+            var stopwatch = ValueStopwatch.StartNew();
+
+            var disposedCount = 0;
+            for (var i = 0; i < initialCount; i++)
+            {
+                // Since we're the only one removing from _expired, TryDequeue must always succeed.
+                _expiredHandlers.TryDequeue(out var entry);
+                Debug.Assert(entry != null, "Entry was null, we should always get an entry back from TryDequeue");
 
-                    // OC: Also check if disposed.
-                    if (entry.CanDispose || _disposed)
+                // OC: Also check if disposed.
+                if (entry.CanDispose || _disposed)
+                {
+                    try
                     {
-                        try
-                        {
-                            entry.InnerHandler?.Dispose();
-                            entry.InnerHandler = null;
-                            entry.Scope?.Dispose();
-                            entry.Scope = null;
-                            disposedCount++;
-                        }
-                        catch (Exception ex)
-                        {
-                            Log.CleanupItemFailed(_logger, entry.Name, ex);
-                        }
+                        entry.InnerHandler?.Dispose();
+                        entry.InnerHandler = null;
+                        entry.Scope?.Dispose();
+                        entry.Scope = null;
+                        disposedCount++;
                     }
-                    else
+                    catch (Exception ex)
                     {
-                        // If the entry is still live, put it back in the queue so we can process it
-                        // during the next cleanup cycle.
-                        _expiredHandlers.Enqueue(entry);
+                        Log.CleanupItemFailed(_logger, entry.Name, ex);
                     }
                 }
-
-                Log.CleanupCycleEnd(_logger, stopwatch.GetElapsedTime(), disposedCount, _expiredHandlers.Count);
-            }
-            finally
-            {
-                Monitor.Exit(_cleanupActiveLock);
+                else
+                {
+                    // If the entry is still live, put it back in the queue so we can process it
+                    // during the next cleanup cycle.
+                    _expiredHandlers.Enqueue(entry);
+                }
             }
 
-            // We didn't totally empty the cleanup queue, try again later.
-            if (!_expiredHandlers.IsEmpty)
-            {
-                StartCleanupTimer();
-            }
+            Log.CleanupCycleEnd(_logger, stopwatch.GetElapsedTime(), disposedCount, _expiredHandlers.Count);
+        }
+        finally
+        {
+            Monitor.Exit(_cleanupActiveLock);
         }
 
-        // OC: Implement IDisposable.
-        public void Dispose()
+        // We didn't totally empty the cleanup queue, try again later.
+        if (!_expiredHandlers.IsEmpty)
         {
-            if (_disposed)
-            {
-                return;
-            }
+            StartCleanupTimer();
+        }
+    }
 
-            _disposed = true;
+    // OC: Implement IDisposable.
+    public void Dispose()
+    {
+        if (_disposed)
+        {
+            return;
+        }
 
-            foreach (var entry in _activeHandlers.Values)
-            {
-                entry.Value.Dispose();
-            }
+        _disposed = true;
 
-            _activeHandlers.Clear();
+        foreach (var entry in _activeHandlers.Values)
+        {
+            entry.Value.Dispose();
+        }
 
-            _services = null;
-            CleanupTimer_Tick();
+        _activeHandlers.Clear();
 
-            _scopeFactory = null;
-            _optionsMonitor = null;
-            _filters = null;
-            _entryFactory = null;
-        }
+        _services = null;
+        CleanupTimer_Tick();
+
+        _scopeFactory = null;
+        _optionsMonitor = null;
+        _filters = null;
+        _entryFactory = null;
+    }
 
-        private static class Log
+    private static class Log
+    {
+        public static class EventIds
         {
-            public static class EventIds
-            {
-                public static readonly EventId CleanupCycleStart = new(100, "CleanupCycleStart");
-                public static readonly EventId CleanupCycleEnd = new(101, "CleanupCycleEnd");
-                public static readonly EventId CleanupItemFailed = new(102, "CleanupItemFailed");
-                public static readonly EventId HandlerExpired = new(103, "HandlerExpired");
-            }
+            public static readonly EventId CleanupCycleStart = new(100, "CleanupCycleStart");
+            public static readonly EventId CleanupCycleEnd = new(101, "CleanupCycleEnd");
+            public static readonly EventId CleanupItemFailed = new(102, "CleanupItemFailed");
+            public static readonly EventId HandlerExpired = new(103, "HandlerExpired");
+        }
 
-            private static readonly Action<ILogger, int, Exception?> _cleanupCycleStart = LoggerMessage.Define<int>(
-                LogLevel.Debug,
-                EventIds.CleanupCycleStart,
-                "Starting HttpMessageHandler cleanup cycle with {InitialCount} items");
+        private static readonly Action<ILogger, int, Exception?> _cleanupCycleStart = LoggerMessage.Define<int>(
+            LogLevel.Debug,
+            EventIds.CleanupCycleStart,
+            "Starting HttpMessageHandler cleanup cycle with {InitialCount} items");
 
-            private static readonly Action<ILogger, double, int, int, Exception?> _cleanupCycleEnd = LoggerMessage.Define<double, int, int>(
-                LogLevel.Debug,
-                EventIds.CleanupCycleEnd,
-                "Ending HttpMessageHandler cleanup cycle after {ElapsedMilliseconds}ms - processed: {DisposedCount} items - remaining: {RemainingItems} items");
+        private static readonly Action<ILogger, double, int, int, Exception?> _cleanupCycleEnd = LoggerMessage.Define<double, int, int>(
+            LogLevel.Debug,
+            EventIds.CleanupCycleEnd,
+            "Ending HttpMessageHandler cleanup cycle after {ElapsedMilliseconds}ms - processed: {DisposedCount} items - remaining: {RemainingItems} items");
 
-            private static readonly Action<ILogger, string, Exception?> _cleanupItemFailed = LoggerMessage.Define<string>(
-                LogLevel.Error,
-                EventIds.CleanupItemFailed,
-                "HttpMessageHandler.Dispose() threw an unhandled exception for client: '{ClientName}'");
+        private static readonly Action<ILogger, string, Exception?> _cleanupItemFailed = LoggerMessage.Define<string>(
+            LogLevel.Error,
+            EventIds.CleanupItemFailed,
+            "HttpMessageHandler.Dispose() threw an unhandled exception for client: '{ClientName}'");
 
-            private static readonly Action<ILogger, double, string, Exception?> _handlerExpired = LoggerMessage.Define<double, string>(
-                LogLevel.Debug,
-                EventIds.HandlerExpired,
-                "HttpMessageHandler expired after {HandlerLifetime}ms for client '{ClientName}'");
+        private static readonly Action<ILogger, double, string, Exception?> _handlerExpired = LoggerMessage.Define<double, string>(
+            LogLevel.Debug,
+            EventIds.HandlerExpired,
+            "HttpMessageHandler expired after {HandlerLifetime}ms for client '{ClientName}'");
 
 
-            public static void CleanupCycleStart(Lazy<ILogger> loggerLazy, int initialCount)
+        public static void CleanupCycleStart(Lazy<ILogger> loggerLazy, int initialCount)
+        {
+            if (TryGetLogger(loggerLazy, out var logger))
             {
-                if (TryGetLogger(loggerLazy, out var logger))
-                {
-                    _cleanupCycleStart(logger, initialCount, null);
-                }
+                _cleanupCycleStart(logger, initialCount, null);
             }
+        }
 
-            public static void CleanupCycleEnd(Lazy<ILogger> loggerLazy, TimeSpan duration, int disposedCount, int finalCount)
+        public static void CleanupCycleEnd(Lazy<ILogger> loggerLazy, TimeSpan duration, int disposedCount, int finalCount)
+        {
+            if (TryGetLogger(loggerLazy, out var logger))
             {
-                if (TryGetLogger(loggerLazy, out var logger))
-                {
-                    _cleanupCycleEnd(logger, duration.TotalMilliseconds, disposedCount, finalCount, null);
-                }
+                _cleanupCycleEnd(logger, duration.TotalMilliseconds, disposedCount, finalCount, null);
             }
+        }
 
-            public static void CleanupItemFailed(Lazy<ILogger> loggerLazy, string clientName, Exception exception)
+        public static void CleanupItemFailed(Lazy<ILogger> loggerLazy, string clientName, Exception exception)
+        {
+            if (TryGetLogger(loggerLazy, out var logger))
             {
-                if (TryGetLogger(loggerLazy, out var logger))
-                {
-                    _cleanupItemFailed(logger, clientName, exception);
-                }
+                _cleanupItemFailed(logger, clientName, exception);
             }
+        }
 
-            public static void HandlerExpired(Lazy<ILogger> loggerLazy, string clientName, TimeSpan lifetime)
+        public static void HandlerExpired(Lazy<ILogger> loggerLazy, string clientName, TimeSpan lifetime)
+        {
+            if (TryGetLogger(loggerLazy, out var logger))
             {
-                if (TryGetLogger(loggerLazy, out var logger))
-                {
-                    _handlerExpired(logger, lifetime.TotalMilliseconds, clientName, null);
-                }
+                _handlerExpired(logger, lifetime.TotalMilliseconds, clientName, null);
             }
+        }
 
-            private static bool TryGetLogger(Lazy<ILogger> loggerLazy, [NotNullWhen(true)] out ILogger? logger)
+        private static bool TryGetLogger(Lazy<ILogger> loggerLazy, [NotNullWhen(true)] out ILogger? logger)
+        {
+            logger = null;
+            try
             {
-                logger = null;
-                try
-                {
-                    logger = loggerLazy.Value;
-                }
-                catch { } // Not throwing in logs.
-
-                return logger is not null;
+                logger = loggerLazy.Value;
             }
+            catch { } // Not throwing in logs.
+
+            return logger is not null;
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Modules/PoweredByMiddleware.cs b/src/OrchardCore/OrchardCore/Modules/PoweredByMiddleware.cs
index f9680811e27..7ce92552da0 100644
--- a/src/OrchardCore/OrchardCore/Modules/PoweredByMiddleware.cs
+++ b/src/OrchardCore/OrchardCore/Modules/PoweredByMiddleware.cs
@@ -1,48 +1,47 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+/// <summary>
+/// Adds the X-Powered-By header with values OrchardCore.
+/// </summary>
+public class PoweredByMiddleware
 {
-    /// <summary>
-    /// Adds the X-Powered-By header with values OrchardCore.
-    /// </summary>
-    public class PoweredByMiddleware
+    private readonly RequestDelegate _next;
+    private readonly IPoweredByMiddlewareOptions _options;
+
+    public PoweredByMiddleware(RequestDelegate next, IPoweredByMiddlewareOptions options)
     {
-        private readonly RequestDelegate _next;
-        private readonly IPoweredByMiddlewareOptions _options;
+        _next = next;
+        _options = options;
+    }
 
-        public PoweredByMiddleware(RequestDelegate next, IPoweredByMiddlewareOptions options)
+    public Task Invoke(HttpContext httpContext)
+    {
+        if (_options.Enabled)
         {
-            _next = next;
-            _options = options;
+            httpContext.Response.Headers[_options.HeaderName] = _options.HeaderValue;
         }
 
-        public Task Invoke(HttpContext httpContext)
-        {
-            if (_options.Enabled)
-            {
-                httpContext.Response.Headers[_options.HeaderName] = _options.HeaderValue;
-            }
-
-            return _next.Invoke(httpContext);
-        }
+        return _next.Invoke(httpContext);
     }
+}
 
-    public interface IPoweredByMiddlewareOptions
-    {
-        bool Enabled { get; set; }
-        string HeaderName { get; }
-        string HeaderValue { get; set; }
-    }
+public interface IPoweredByMiddlewareOptions
+{
+    bool Enabled { get; set; }
+    string HeaderName { get; }
+    string HeaderValue { get; set; }
+}
 
-    internal sealed class PoweredByMiddlewareOptions : IPoweredByMiddlewareOptions
-    {
-        private const string PoweredByHeaderName = "X-Powered-By";
-        private const string PoweredByHeaderValue = "OrchardCore";
+internal sealed class PoweredByMiddlewareOptions : IPoweredByMiddlewareOptions
+{
+    private const string PoweredByHeaderName = "X-Powered-By";
+    private const string PoweredByHeaderValue = "OrchardCore";
 
-        public string HeaderName => PoweredByHeaderName;
-        public string HeaderValue { get; set; } = PoweredByHeaderValue;
+    public string HeaderName => PoweredByHeaderName;
+    public string HeaderValue { get; set; } = PoweredByHeaderValue;
 
-        public bool Enabled { get; set; } = true;
-    }
+    public bool Enabled { get; set; } = true;
 }
diff --git a/src/OrchardCore/OrchardCore/Modules/Services/Clock.cs b/src/OrchardCore/OrchardCore/Modules/Services/Clock.cs
index a85ad0a2adb..102ad94a2e4 100644
--- a/src/OrchardCore/OrchardCore/Modules/Services/Clock.cs
+++ b/src/OrchardCore/OrchardCore/Modules/Services/Clock.cs
@@ -3,88 +3,87 @@
 using NodaTime;
 using NodaTime.TimeZones;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+public class Clock : IClock
 {
-    public class Clock : IClock
+    private static Instant CurrentInstant => SystemClock.Instance.GetCurrentInstant();
+
+    /// <summary>
+    /// Returns a Datetime Kind.Utc that is "Now".
+    /// </summary>
+    /// <inheritdoc />
+    public DateTime UtcNow => CurrentInstant.ToDateTimeUtc();
+
+    /// <summary>
+    /// Returns a list of valid timezones as a ITimeZone[], where the key is
+    /// the timezone id(string), and the value can be used for display. The list is filtered to contain only
+    /// choices that are reasonably valid for the present and near future for real places. The list is
+    /// also sorted first by UTC Offset and then by timezone name.
+    /// </summary>
+    public ITimeZone[] GetTimeZones()
+    {
+        var list =
+            from location in TzdbDateTimeZoneSource.Default.ZoneLocations
+            let zoneId = location.ZoneId
+            let tz = DateTimeZoneProviders.Tzdb[zoneId]
+            let zoneInterval = tz.GetZoneInterval(CurrentInstant)
+            orderby zoneInterval.StandardOffset, zoneId
+            select new TimeZone(zoneId, zoneInterval.StandardOffset, zoneInterval.WallOffset, tz);
+
+        return list.ToArray();
+    }
+
+    public ITimeZone GetTimeZone(string timeZoneId)
     {
-        private static Instant CurrentInstant => SystemClock.Instance.GetCurrentInstant();
-
-        /// <summary>
-        /// Returns a Datetime Kind.Utc that is "Now".
-        /// </summary>
-        /// <inheritdoc />
-        public DateTime UtcNow => CurrentInstant.ToDateTimeUtc();
-
-        /// <summary>
-        /// Returns a list of valid timezones as a ITimeZone[], where the key is
-        /// the timezone id(string), and the value can be used for display. The list is filtered to contain only
-        /// choices that are reasonably valid for the present and near future for real places. The list is
-        /// also sorted first by UTC Offset and then by timezone name.
-        /// </summary>
-        public ITimeZone[] GetTimeZones()
+        if (string.IsNullOrEmpty(timeZoneId))
         {
-            var list =
-                from location in TzdbDateTimeZoneSource.Default.ZoneLocations
-                let zoneId = location.ZoneId
-                let tz = DateTimeZoneProviders.Tzdb[zoneId]
-                let zoneInterval = tz.GetZoneInterval(CurrentInstant)
-                orderby zoneInterval.StandardOffset, zoneId
-                select new TimeZone(zoneId, zoneInterval.StandardOffset, zoneInterval.WallOffset, tz);
-
-            return list.ToArray();
+            return GetSystemTimeZone();
         }
 
-        public ITimeZone GetTimeZone(string timeZoneId)
-        {
-            if (string.IsNullOrEmpty(timeZoneId))
-            {
-                return GetSystemTimeZone();
-            }
+        var dateTimeZone = GetDateTimeZone(timeZoneId);
 
-            var dateTimeZone = GetDateTimeZone(timeZoneId);
+        return CreateTimeZone(dateTimeZone);
+    }
 
-            return CreateTimeZone(dateTimeZone);
+    public ITimeZone GetSystemTimeZone()
+    {
+        var timezone = DateTimeZoneProviders.Tzdb.GetSystemDefault();
+        if (TzdbDateTimeZoneSource.Default.CanonicalIdMap.TryGetValue(timezone.Id, out var canonicalTimeZoneId))
+        {
+            timezone = GetDateTimeZone(canonicalTimeZoneId);
         }
 
-        public ITimeZone GetSystemTimeZone()
-        {
-            var timezone = DateTimeZoneProviders.Tzdb.GetSystemDefault();
-            if (TzdbDateTimeZoneSource.Default.CanonicalIdMap.TryGetValue(timezone.Id, out var canonicalTimeZoneId))
-            {
-                timezone = GetDateTimeZone(canonicalTimeZoneId);
-            }
+        return CreateTimeZone(timezone);
+    }
 
-            return CreateTimeZone(timezone);
-        }
+    public DateTimeOffset ConvertToTimeZone(DateTimeOffset dateTimeOffSet, ITimeZone timeZone)
+    {
+        var offsetDateTime = OffsetDateTime.FromDateTimeOffset(dateTimeOffSet);
+        return offsetDateTime.InZone(((TimeZone)timeZone).DateTimeZone).ToDateTimeOffset();
+    }
 
-        public DateTimeOffset ConvertToTimeZone(DateTimeOffset dateTimeOffSet, ITimeZone timeZone)
+    internal static DateTimeZone GetDateTimeZone(string timeZone)
+    {
+        if (!string.IsNullOrEmpty(timeZone) && IsValidTimeZone(DateTimeZoneProviders.Tzdb, timeZone))
         {
-            var offsetDateTime = OffsetDateTime.FromDateTimeOffset(dateTimeOffSet);
-            return offsetDateTime.InZone(((TimeZone)timeZone).DateTimeZone).ToDateTimeOffset();
+            return DateTimeZoneProviders.Tzdb[timeZone];
         }
 
-        internal static DateTimeZone GetDateTimeZone(string timeZone)
-        {
-            if (!string.IsNullOrEmpty(timeZone) && IsValidTimeZone(DateTimeZoneProviders.Tzdb, timeZone))
-            {
-                return DateTimeZoneProviders.Tzdb[timeZone];
-            }
-
-            return DateTimeZoneProviders.Tzdb.GetSystemDefault();
-        }
+        return DateTimeZoneProviders.Tzdb.GetSystemDefault();
+    }
 
-        private static TimeZone CreateTimeZone(DateTimeZone dateTimeZone)
-        {
-            ArgumentNullException.ThrowIfNull(dateTimeZone);
+    private static TimeZone CreateTimeZone(DateTimeZone dateTimeZone)
+    {
+        ArgumentNullException.ThrowIfNull(dateTimeZone);
 
-            var zoneInterval = dateTimeZone.GetZoneInterval(CurrentInstant);
+        var zoneInterval = dateTimeZone.GetZoneInterval(CurrentInstant);
 
-            return new TimeZone(dateTimeZone.Id, zoneInterval.StandardOffset, zoneInterval.WallOffset, dateTimeZone);
-        }
+        return new TimeZone(dateTimeZone.Id, zoneInterval.StandardOffset, zoneInterval.WallOffset, dateTimeZone);
+    }
 
-        private static bool IsValidTimeZone(IDateTimeZoneProvider provider, string timeZoneId)
-        {
-            return provider.GetZoneOrNull(timeZoneId) != null;
-        }
+    private static bool IsValidTimeZone(IDateTimeZoneProvider provider, string timeZoneId)
+    {
+        return provider.GetZoneOrNull(timeZoneId) != null;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Modules/Services/LocalClock.cs b/src/OrchardCore/OrchardCore/Modules/Services/LocalClock.cs
index 6c6661e2642..6b89075764e 100644
--- a/src/OrchardCore/OrchardCore/Modules/Services/LocalClock.cs
+++ b/src/OrchardCore/OrchardCore/Modules/Services/LocalClock.cs
@@ -4,90 +4,89 @@
 using NodaTime;
 using OrchardCore.Localization;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+public class LocalClock : ILocalClock
 {
-    public class LocalClock : ILocalClock
+    private readonly IEnumerable<ITimeZoneSelector> _timeZoneSelectors;
+    private readonly IClock _clock;
+    private readonly ICalendarManager _calendarManager;
+    private ITimeZone _timeZone;
+
+    public LocalClock(IEnumerable<ITimeZoneSelector> timeZoneSelectors, IClock clock, ICalendarManager calendarManager)
     {
-        private readonly IEnumerable<ITimeZoneSelector> _timeZoneSelectors;
-        private readonly IClock _clock;
-        private readonly ICalendarManager _calendarManager;
-        private ITimeZone _timeZone;
+        _timeZoneSelectors = timeZoneSelectors;
+        _clock = clock;
+        _calendarManager = calendarManager;
+    }
 
-        public LocalClock(IEnumerable<ITimeZoneSelector> timeZoneSelectors, IClock clock, ICalendarManager calendarManager)
+    public Task<DateTimeOffset> LocalNowAsync
+    {
+        get
         {
-            _timeZoneSelectors = timeZoneSelectors;
-            _clock = clock;
-            _calendarManager = calendarManager;
+            return GetLocalNowAsync();
         }
+    }
 
-        public Task<DateTimeOffset> LocalNowAsync
-        {
-            get
-            {
-                return GetLocalNowAsync();
-            }
-        }
+    private async Task<DateTimeOffset> GetLocalNowAsync()
+    {
+        return _clock.ConvertToTimeZone(_clock.UtcNow, await GetLocalTimeZoneAsync());
+    }
 
-        private async Task<DateTimeOffset> GetLocalNowAsync()
-        {
-            return _clock.ConvertToTimeZone(_clock.UtcNow, await GetLocalTimeZoneAsync());
-        }
+    // Caching the result per request.
+    public async Task<ITimeZone> GetLocalTimeZoneAsync() => _timeZone ??= await LoadLocalTimeZoneAsync();
 
-        // Caching the result per request.
-        public async Task<ITimeZone> GetLocalTimeZoneAsync() => _timeZone ??= await LoadLocalTimeZoneAsync();
+    public async Task<DateTimeOffset> ConvertToLocalAsync(DateTimeOffset dateTimeOffSet)
+    {
+        var localTimeZone = await GetLocalTimeZoneAsync();
+        var dateTimeZone = ((TimeZone)localTimeZone).DateTimeZone;
+        var offsetDateTime = OffsetDateTime.FromDateTimeOffset(dateTimeOffSet);
+        var currentCalendar = BclCalendars.GetCalendarByName(await _calendarManager.GetCurrentCalendar());
 
-        public async Task<DateTimeOffset> ConvertToLocalAsync(DateTimeOffset dateTimeOffSet)
-        {
-            var localTimeZone = await GetLocalTimeZoneAsync();
-            var dateTimeZone = ((TimeZone)localTimeZone).DateTimeZone;
-            var offsetDateTime = OffsetDateTime.FromDateTimeOffset(dateTimeOffSet);
-            var currentCalendar = BclCalendars.GetCalendarByName(await _calendarManager.GetCurrentCalendar());
+        return offsetDateTime.InZone(dateTimeZone).WithCalendar(currentCalendar).ToDateTimeOffset();
+    }
 
-            return offsetDateTime.InZone(dateTimeZone).WithCalendar(currentCalendar).ToDateTimeOffset();
-        }
+    public async Task<DateTime> ConvertToUtcAsync(DateTime dateTime)
+    {
+        var localTimeZone = await GetLocalTimeZoneAsync();
+        var dateTimeZone = ((TimeZone)localTimeZone).DateTimeZone;
+        var localDate = LocalDateTime.FromDateTime(dateTime);
+        return dateTimeZone.AtStrictly(localDate).ToDateTimeUtc();
+    }
 
-        public async Task<DateTime> ConvertToUtcAsync(DateTime dateTime)
-        {
-            var localTimeZone = await GetLocalTimeZoneAsync();
-            var dateTimeZone = ((TimeZone)localTimeZone).DateTimeZone;
-            var localDate = LocalDateTime.FromDateTime(dateTime);
-            return dateTimeZone.AtStrictly(localDate).ToDateTimeUtc();
-        }
+    private async Task<ITimeZone> LoadLocalTimeZoneAsync()
+    {
+        var timeZoneResults = new List<TimeZoneSelectorResult>();
 
-        private async Task<ITimeZone> LoadLocalTimeZoneAsync()
+        foreach (var timeZoneSelector in _timeZoneSelectors)
         {
-            var timeZoneResults = new List<TimeZoneSelectorResult>();
+            var timeZoneResult = await timeZoneSelector.GetTimeZoneAsync();
 
-            foreach (var timeZoneSelector in _timeZoneSelectors)
+            if (timeZoneResult != null)
             {
-                var timeZoneResult = await timeZoneSelector.GetTimeZoneAsync();
-
-                if (timeZoneResult != null)
-                {
-                    timeZoneResults.Add(timeZoneResult);
-                }
+                timeZoneResults.Add(timeZoneResult);
             }
+        }
 
-            if (timeZoneResults.Count == 0)
-            {
-                return _clock.GetSystemTimeZone();
-            }
-            else if (timeZoneResults.Count > 1)
-            {
-                timeZoneResults.Sort((x, y) => y.Priority.CompareTo(x.Priority));
-            }
+        if (timeZoneResults.Count == 0)
+        {
+            return _clock.GetSystemTimeZone();
+        }
+        else if (timeZoneResults.Count > 1)
+        {
+            timeZoneResults.Sort((x, y) => y.Priority.CompareTo(x.Priority));
+        }
 
-            foreach (var result in timeZoneResults)
-            {
-                var value = await result.TimeZoneId();
+        foreach (var result in timeZoneResults)
+        {
+            var value = await result.TimeZoneId();
 
-                if (!string.IsNullOrEmpty(value))
-                {
-                    return _clock.GetTimeZone(value);
-                }
+            if (!string.IsNullOrEmpty(value))
+            {
+                return _clock.GetTimeZone(value);
             }
-
-            return _clock.GetSystemTimeZone();
         }
+
+        return _clock.GetSystemTimeZone();
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Modules/Services/SlugService.cs b/src/OrchardCore/OrchardCore/Modules/Services/SlugService.cs
index 5cc8b7cd6b1..7490bb7c7e9 100644
--- a/src/OrchardCore/OrchardCore/Modules/Services/SlugService.cs
+++ b/src/OrchardCore/OrchardCore/Modules/Services/SlugService.cs
@@ -3,87 +3,86 @@
 using System.Text;
 using Cysharp.Text;
 
-namespace OrchardCore.Modules.Services
+namespace OrchardCore.Modules.Services;
+
+public class SlugService : ISlugService
 {
-    public class SlugService : ISlugService
+    private const char Hyphen = '-';
+    private const int MaxLength = 1000;
+
+    public string Slugify(string text, char separator)
     {
-        private const char Hyphen = '-';
-        private const int MaxLength = 1000;
+        throw new NotImplementedException();
+    }
 
-        public string Slugify(string text, char separator)
+    public string Slugify(string text)
+    {
+        if (string.IsNullOrEmpty(text))
         {
-            throw new NotImplementedException();
+            return text;
         }
 
-        public string Slugify(string text)
-        {
-            if (string.IsNullOrEmpty(text))
-            {
-                return text;
-            }
+        var appendHyphen = false;
+        var normalizedText = text.Normalize(NormalizationForm.FormKD);
 
-            var appendHyphen = false;
-            var normalizedText = text.Normalize(NormalizationForm.FormKD);
+        using var slug = ZString.CreateStringBuilder();
 
-            using var slug = ZString.CreateStringBuilder();
+        for (var i = 0; i < normalizedText.Length; i++)
+        {
+            var currentChar = char.ToLowerInvariant(normalizedText[i]);
 
-            for (var i = 0; i < normalizedText.Length; i++)
+            if (CharUnicodeInfo.GetUnicodeCategory(currentChar) == UnicodeCategory.NonSpacingMark)
             {
-                var currentChar = char.ToLowerInvariant(normalizedText[i]);
-
-                if (CharUnicodeInfo.GetUnicodeCategory(currentChar) == UnicodeCategory.NonSpacingMark)
-                {
-                    continue;
-                }
+                continue;
+            }
 
-                if (char.IsLetterOrDigit(currentChar))
-                {
-                    slug.Append(currentChar);
+            if (char.IsLetterOrDigit(currentChar))
+            {
+                slug.Append(currentChar);
 
-                    appendHyphen = true;
-                }
-                else if (currentChar is Hyphen)
-                {
-                    if (appendHyphen && i != normalizedText.Length - 1)
-                    {
-                        slug.Append(currentChar);
-                        appendHyphen = false;
-                    }
-                }
-                else if (currentChar == '_' || currentChar == '~')
+                appendHyphen = true;
+            }
+            else if (currentChar is Hyphen)
+            {
+                if (appendHyphen && i != normalizedText.Length - 1)
                 {
                     slug.Append(currentChar);
+                    appendHyphen = false;
                 }
-                else
+            }
+            else if (currentChar == '_' || currentChar == '~')
+            {
+                slug.Append(currentChar);
+            }
+            else
+            {
+                if (appendHyphen)
                 {
-                    if (appendHyphen)
-                    {
-                        slug.Append(Hyphen);
+                    slug.Append(Hyphen);
 
-                        appendHyphen = false;
-                    }
+                    appendHyphen = false;
                 }
             }
+        }
 
-            var length = Math.Min(slug.Length - GetTrailingHyphenCount(slug.AsSpan()), MaxLength);
+        var length = Math.Min(slug.Length - GetTrailingHyphenCount(slug.AsSpan()), MaxLength);
 
-            return new string(slug.AsSpan()[..length]).Normalize(NormalizationForm.FormC);
-        }
+        return new string(slug.AsSpan()[..length]).Normalize(NormalizationForm.FormC);
+    }
 
-        private static int GetTrailingHyphenCount(ReadOnlySpan<char> input)
+    private static int GetTrailingHyphenCount(ReadOnlySpan<char> input)
+    {
+        var hyphenCount = 0;
+        for (var i = input.Length - 1; i >= 0; i--)
         {
-            var hyphenCount = 0;
-            for (var i = input.Length - 1; i >= 0; i--)
+            if (input[i] != Hyphen)
             {
-                if (input[i] != Hyphen)
-                {
-                    break;
-                }
-
-                ++hyphenCount;
+                break;
             }
 
-            return hyphenCount;
+            ++hyphenCount;
         }
+
+        return hyphenCount;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/Builders/CompositionStrategy.cs b/src/OrchardCore/OrchardCore/Shell/Builders/CompositionStrategy.cs
index aedbfa8eb44..0db4df15096 100644
--- a/src/OrchardCore/OrchardCore/Shell/Builders/CompositionStrategy.cs
+++ b/src/OrchardCore/OrchardCore/Shell/Builders/CompositionStrategy.cs
@@ -9,72 +9,71 @@
 using OrchardCore.Environment.Shell.Descriptor.Models;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Environment.Shell.Builders
+namespace OrchardCore.Environment.Shell.Builders;
+
+public class CompositionStrategy : ICompositionStrategy
 {
-    public class CompositionStrategy : ICompositionStrategy
+    private readonly IExtensionManager _extensionManager;
+    private readonly ITypeFeatureProvider _typeFeatureProvider;
+    private readonly ILogger _logger;
+
+    public CompositionStrategy(
+        IExtensionManager extensionManager,
+        ITypeFeatureProvider typeFeatureProvider,
+        ILogger<CompositionStrategy> logger)
     {
-        private readonly IExtensionManager _extensionManager;
-        private readonly ITypeFeatureProvider _typeFeatureProvider;
-        private readonly ILogger _logger;
+        _extensionManager = extensionManager;
+        _typeFeatureProvider = typeFeatureProvider;
+        _logger = logger;
+    }
 
-        public CompositionStrategy(
-            IExtensionManager extensionManager,
-            ITypeFeatureProvider typeFeatureProvider,
-            ILogger<CompositionStrategy> logger)
+    public async Task<ShellBlueprint> ComposeAsync(ShellSettings settings, ShellDescriptor descriptor)
+    {
+        if (_logger.IsEnabled(LogLevel.Debug))
         {
-            _extensionManager = extensionManager;
-            _typeFeatureProvider = typeFeatureProvider;
-            _logger = logger;
+            _logger.LogDebug("Composing blueprint");
         }
 
-        public async Task<ShellBlueprint> ComposeAsync(ShellSettings settings, ShellDescriptor descriptor)
-        {
-            if (_logger.IsEnabled(LogLevel.Debug))
-            {
-                _logger.LogDebug("Composing blueprint");
-            }
-
-            var featureNames = descriptor.Features.Select(x => x.Id).ToArray();
+        var featureNames = descriptor.Features.Select(x => x.Id).ToArray();
 
-            var features = await _extensionManager.LoadFeaturesAsync(featureNames);
+        var features = await _extensionManager.LoadFeaturesAsync(featureNames);
 
-            var entries = new Dictionary<Type, IEnumerable<IFeatureInfo>>();
+        var entries = new Dictionary<Type, IEnumerable<IFeatureInfo>>();
 
-            foreach (var feature in features)
+        foreach (var feature in features)
+        {
+            foreach (var exportedType in _typeFeatureProvider.GetTypesForFeature(feature))
             {
-                foreach (var exportedType in _typeFeatureProvider.GetTypesForFeature(feature))
-                {
-                    var requiredFeatures = RequireFeaturesAttribute.GetRequiredFeatureNamesForType(exportedType);
+                var requiredFeatures = RequireFeaturesAttribute.GetRequiredFeatureNamesForType(exportedType);
 
-                    if (requiredFeatures.All(x => featureNames.Contains(x)))
+                if (requiredFeatures.All(x => featureNames.Contains(x)))
+                {
+                    if (entries.TryGetValue(exportedType, out var featureDependencies))
                     {
-                        if (entries.TryGetValue(exportedType, out var featureDependencies))
-                        {
-                            featureDependencies = featureDependencies.Append(feature).ToArray();
-                        }
-                        else
-                        {
-                            featureDependencies = [feature];
-                        }
-
-                        entries[exportedType] = featureDependencies;
+                        featureDependencies = featureDependencies.Append(feature).ToArray();
                     }
+                    else
+                    {
+                        featureDependencies = [feature];
+                    }
+
+                    entries[exportedType] = featureDependencies;
                 }
             }
+        }
 
-            var result = new ShellBlueprint
-            {
-                Settings = settings,
-                Descriptor = descriptor,
-                Dependencies = entries
-            };
-
-            if (_logger.IsEnabled(LogLevel.Debug))
-            {
-                _logger.LogDebug("Done composing blueprint");
-            }
+        var result = new ShellBlueprint
+        {
+            Settings = settings,
+            Descriptor = descriptor,
+            Dependencies = entries
+        };
 
-            return result;
+        if (_logger.IsEnabled(LogLevel.Debug))
+        {
+            _logger.LogDebug("Done composing blueprint");
         }
+
+        return result;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/Builders/Extensions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore/Shell/Builders/Extensions/ServiceCollectionExtensions.cs
index eb726a706d9..c8a01e413ec 100644
--- a/src/OrchardCore/OrchardCore/Shell/Builders/Extensions/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore/Shell/Builders/Extensions/ServiceCollectionExtensions.cs
@@ -3,44 +3,43 @@
 
 #nullable enable
 
-namespace OrchardCore.Environment.Shell.Builders
+namespace OrchardCore.Environment.Shell.Builders;
+
+internal static class ServiceCollectionExtensions
 {
-    internal static class ServiceCollectionExtensions
+    public static IServiceCollection CloneSingleton(
+        this IServiceCollection services,
+        ServiceDescriptor parent,
+        object implementationInstance)
+    {
+        var cloned = parent.ServiceKey is not null
+            ? new ClonedSingletonDescriptor(parent, parent.ServiceKey, implementationInstance)
+            : new ClonedSingletonDescriptor(parent, implementationInstance);
+
+        services.Add(cloned);
+
+        return services;
+    }
+
+    public static IServiceCollection CloneSingleton(
+        this IServiceCollection collection,
+        ServiceDescriptor parent,
+        Func<IServiceProvider, object> implementationFactory)
     {
-        public static IServiceCollection CloneSingleton(
-            this IServiceCollection services,
-            ServiceDescriptor parent,
-            object implementationInstance)
-        {
-            var cloned = parent.ServiceKey is not null
-                ? new ClonedSingletonDescriptor(parent, parent.ServiceKey, implementationInstance)
-                : new ClonedSingletonDescriptor(parent, implementationInstance);
-
-            services.Add(cloned);
-
-            return services;
-        }
-
-        public static IServiceCollection CloneSingleton(
-            this IServiceCollection collection,
-            ServiceDescriptor parent,
-            Func<IServiceProvider, object> implementationFactory)
-        {
-            var cloned = new ClonedSingletonDescriptor(parent, implementationFactory);
-            collection.Add(cloned);
-
-            return collection;
-        }
-
-        public static IServiceCollection CloneSingleton(
-            this IServiceCollection collection,
-            ServiceDescriptor parent,
-            Func<IServiceProvider, object?, object> implementationFactory)
-        {
-            var cloned = new ClonedSingletonDescriptor(parent, parent.ServiceKey, implementationFactory);
-            collection.Add(cloned);
-
-            return collection;
-        }
+        var cloned = new ClonedSingletonDescriptor(parent, implementationFactory);
+        collection.Add(cloned);
+
+        return collection;
+    }
+
+    public static IServiceCollection CloneSingleton(
+        this IServiceCollection collection,
+        ServiceDescriptor parent,
+        Func<IServiceProvider, object?, object> implementationFactory)
+    {
+        var cloned = new ClonedSingletonDescriptor(parent, parent.ServiceKey, implementationFactory);
+        collection.Add(cloned);
+
+        return collection;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/Builders/Extensions/ServiceProviderExtensions.cs b/src/OrchardCore/OrchardCore/Shell/Builders/Extensions/ServiceProviderExtensions.cs
index c874b81a44d..6c22794cc32 100644
--- a/src/OrchardCore/OrchardCore/Shell/Builders/Extensions/ServiceProviderExtensions.cs
+++ b/src/OrchardCore/OrchardCore/Shell/Builders/Extensions/ServiceProviderExtensions.cs
@@ -5,116 +5,115 @@
 
 #nullable enable
 
-namespace OrchardCore.Environment.Shell.Builders
+namespace OrchardCore.Environment.Shell.Builders;
+
+public static class ServiceProviderExtensions
 {
-    public static class ServiceProviderExtensions
+    /// <summary>
+    /// Creates a child container.
+    /// </summary>
+    /// <param name="serviceProvider">The service provider to create a child container for.</param>
+    /// <param name="serviceCollection">The services to clone.</param>
+    public static IServiceCollection CreateChildContainer(this IServiceProvider serviceProvider, IServiceCollection serviceCollection)
     {
-        /// <summary>
-        /// Creates a child container.
-        /// </summary>
-        /// <param name="serviceProvider">The service provider to create a child container for.</param>
-        /// <param name="serviceCollection">The services to clone.</param>
-        public static IServiceCollection CreateChildContainer(this IServiceProvider serviceProvider, IServiceCollection serviceCollection)
+        IServiceCollection clonedCollection = new ServiceCollection();
+
+        var servicesByType = serviceCollection.GroupBy(s => (s.ServiceType, s.ServiceKey));
+        foreach (var services in servicesByType)
         {
-            IServiceCollection clonedCollection = new ServiceCollection();
+            // Prevent hosting 'IStartupFilter' to re-add middleware to the tenant pipeline.
+            if (services.Key.ServiceType == typeof(IStartupFilter))
+            {
+                continue;
+            }
 
-            var servicesByType = serviceCollection.GroupBy(s => (s.ServiceType, s.ServiceKey));
-            foreach (var services in servicesByType)
+            // A generic type definition is rather used to create other constructed generic types.
+            if (services.Key.ServiceType.IsGenericTypeDefinition)
             {
-                // Prevent hosting 'IStartupFilter' to re-add middleware to the tenant pipeline.
-                if (services.Key.ServiceType == typeof(IStartupFilter))
+                // So, we just need to pass the descriptor.
+                foreach (var service in services)
                 {
-                    continue;
+                    clonedCollection.Add(service);
                 }
+            }
 
-                // A generic type definition is rather used to create other constructed generic types.
-                if (services.Key.ServiceType.IsGenericTypeDefinition)
+            // If only one service of a given type.
+            else if (services.Count() == 1)
+            {
+                var service = services.First();
+                if (service.Lifetime == ServiceLifetime.Singleton)
                 {
-                    // So, we just need to pass the descriptor.
-                    foreach (var service in services)
+                    // An host singleton is shared across tenant containers but only registered instances are not disposed
+                    // by the DI, so we check if it is disposable or if it uses a factory which may return a different type.
+                    if (typeof(IDisposable).IsAssignableFrom(service.GetImplementationType()) ||
+                        service.GetImplementationFactory() is not null)
                     {
-                        clonedCollection.Add(service);
-                    }
-                }
+                        // If disposable, register an instance that we resolve immediately from the main container.
+                        var instance = service.IsKeyedService
+                            ? serviceProvider.GetRequiredKeyedService(services.Key.ServiceType, services.Key.ServiceKey)
+                            : serviceProvider.GetRequiredService(services.Key.ServiceType);
 
-                // If only one service of a given type.
-                else if (services.Count() == 1)
-                {
-                    var service = services.First();
-                    if (service.Lifetime == ServiceLifetime.Singleton)
+                        clonedCollection.CloneSingleton(service, instance);
+                    }
+                    else if (!service.IsKeyedService)
                     {
-                        // An host singleton is shared across tenant containers but only registered instances are not disposed
-                        // by the DI, so we check if it is disposable or if it uses a factory which may return a different type.
-                        if (typeof(IDisposable).IsAssignableFrom(service.GetImplementationType()) ||
-                            service.GetImplementationFactory() is not null)
-                        {
-                            // If disposable, register an instance that we resolve immediately from the main container.
-                            var instance = service.IsKeyedService
-                                ? serviceProvider.GetRequiredKeyedService(services.Key.ServiceType, services.Key.ServiceKey)
-                                : serviceProvider.GetRequiredService(services.Key.ServiceType);
-
-                            clonedCollection.CloneSingleton(service, instance);
-                        }
-                        else if (!service.IsKeyedService)
-                        {
-                            // If not disposable, the singleton can be resolved through a factory when first requested.
-                            clonedCollection.CloneSingleton(service, sp =>
-                                serviceProvider.GetRequiredService(service.ServiceType));
+                        // If not disposable, the singleton can be resolved through a factory when first requested.
+                        clonedCollection.CloneSingleton(service, sp =>
+                            serviceProvider.GetRequiredService(service.ServiceType));
 
-                            // Note: Most of the time a singleton of a given type is unique and not disposable. So,
-                            // most of the time it will be resolved when first requested through a tenant container.
-                        }
-                        else
-                        {
-                            clonedCollection.CloneSingleton(service, (sp, key) =>
-                                serviceProvider.GetRequiredKeyedService(service.ServiceType, key));
-                        }
+                        // Note: Most of the time a singleton of a given type is unique and not disposable. So,
+                        // most of the time it will be resolved when first requested through a tenant container.
                     }
                     else
                     {
-                        clonedCollection.Add(service);
+                        clonedCollection.CloneSingleton(service, (sp, key) =>
+                            serviceProvider.GetRequiredKeyedService(service.ServiceType, key));
                     }
                 }
-
-                // If services of the same type have at least one singleton.
-                else if (services.Any(s => s.Lifetime == ServiceLifetime.Singleton))
+                else
                 {
-                    // We can resolve them from the main container.
-                    var instances = services.Key.ServiceKey is not null
-                        ? serviceProvider.GetKeyedServices(services.Key.ServiceType, services.Key.ServiceKey)
-                        : serviceProvider.GetServices(services.Key.ServiceType);
+                    clonedCollection.Add(service);
+                }
+            }
 
-                    // Then we only keep singleton instances.
-                    for (var i = 0; i < services.Count(); i++)
-                    {
-                        var service = services.ElementAt(i);
-                        if (service.Lifetime == ServiceLifetime.Singleton)
-                        {
-                            var instance = instances.ElementAt(i);
-                            if (instance is null)
-                            {
-                                continue;
-                            }
+            // If services of the same type have at least one singleton.
+            else if (services.Any(s => s.Lifetime == ServiceLifetime.Singleton))
+            {
+                // We can resolve them from the main container.
+                var instances = services.Key.ServiceKey is not null
+                    ? serviceProvider.GetKeyedServices(services.Key.ServiceType, services.Key.ServiceKey)
+                    : serviceProvider.GetServices(services.Key.ServiceType);
 
-                            clonedCollection.CloneSingleton(service, instance);
-                        }
-                        else
+                // Then we only keep singleton instances.
+                for (var i = 0; i < services.Count(); i++)
+                {
+                    var service = services.ElementAt(i);
+                    if (service.Lifetime == ServiceLifetime.Singleton)
+                    {
+                        var instance = instances.ElementAt(i);
+                        if (instance is null)
                         {
-                            clonedCollection.Add(service);
+                            continue;
                         }
+
+                        clonedCollection.CloneSingleton(service, instance);
                     }
-                }
-                else    // If all services of the same type are not singletons.
-                {
-                    // We don't need to resolve them.
-                    foreach (var service in services)
+                    else
                     {
                         clonedCollection.Add(service);
                     }
                 }
             }
-
-            return clonedCollection;
+            else    // If all services of the same type are not singletons.
+            {
+                // We don't need to resolve them.
+                foreach (var service in services)
+                {
+                    clonedCollection.Add(service);
+                }
+            }
         }
+
+        return clonedCollection;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/Builders/FeatureAwareServiceCollection.cs b/src/OrchardCore/OrchardCore/Shell/Builders/FeatureAwareServiceCollection.cs
index 30079daaa23..cfcbed2fbed 100644
--- a/src/OrchardCore/OrchardCore/Shell/Builders/FeatureAwareServiceCollection.cs
+++ b/src/OrchardCore/OrchardCore/Shell/Builders/FeatureAwareServiceCollection.cs
@@ -4,101 +4,100 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.Environment.Shell.Builders
+namespace OrchardCore.Environment.Shell.Builders;
+
+/// <summary>
+/// A service collection that keeps track of the <see cref="IFeatureInfo"/> for each added service.
+/// </summary>
+public class FeatureAwareServiceCollection : IServiceCollection
 {
-    /// <summary>
-    /// A service collection that keeps track of the <see cref="IFeatureInfo"/> for each added service.
-    /// </summary>
-    public class FeatureAwareServiceCollection : IServiceCollection
-    {
-        private readonly IServiceCollection _innerServiceCollection;
+    private readonly IServiceCollection _innerServiceCollection;
 
-        private readonly Dictionary<IFeatureInfo, ServiceCollection> _featureServiceCollections = [];
-        private ServiceCollection _currentFeatureServiceCollection;
+    private readonly Dictionary<IFeatureInfo, ServiceCollection> _featureServiceCollections = [];
+    private ServiceCollection _currentFeatureServiceCollection;
 
-        public FeatureAwareServiceCollection(IServiceCollection innerServiceCollection)
-        {
-            _innerServiceCollection = innerServiceCollection;
-        }
+    public FeatureAwareServiceCollection(IServiceCollection innerServiceCollection)
+    {
+        _innerServiceCollection = innerServiceCollection;
+    }
 
-        /// <summary>
-        /// A collection of services grouped by their feature information.
-        /// </summary>
-        public IDictionary<IFeatureInfo, ServiceCollection> FeatureCollections => _featureServiceCollections;
+    /// <summary>
+    /// A collection of services grouped by their feature information.
+    /// </summary>
+    public IDictionary<IFeatureInfo, ServiceCollection> FeatureCollections => _featureServiceCollections;
 
-        /// <summary>
-        /// Sets the current feature that services will be assigned when added to this collection.
-        /// </summary>
-        /// <param name="feature">The feature for services to be assigned.</param>
-        public void SetCurrentFeature(IFeatureInfo feature)
+    /// <summary>
+    /// Sets the current feature that services will be assigned when added to this collection.
+    /// </summary>
+    /// <param name="feature">The feature for services to be assigned.</param>
+    public void SetCurrentFeature(IFeatureInfo feature)
+    {
+        if (!_featureServiceCollections.TryGetValue(feature, out _currentFeatureServiceCollection))
         {
-            if (!_featureServiceCollections.TryGetValue(feature, out _currentFeatureServiceCollection))
-            {
-                _featureServiceCollections.Add(feature, _currentFeatureServiceCollection = []);
-            }
+            _featureServiceCollections.Add(feature, _currentFeatureServiceCollection = []);
         }
+    }
 
-        public IEnumerator<ServiceDescriptor> GetEnumerator()
-        {
-            return _innerServiceCollection.GetEnumerator();
-        }
+    public IEnumerator<ServiceDescriptor> GetEnumerator()
+    {
+        return _innerServiceCollection.GetEnumerator();
+    }
 
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return GetEnumerator();
+    }
 
-        void ICollection<ServiceDescriptor>.Add(ServiceDescriptor item)
-        {
-            _innerServiceCollection.Add(item);
-            _currentFeatureServiceCollection?.Add(item);
-        }
+    void ICollection<ServiceDescriptor>.Add(ServiceDescriptor item)
+    {
+        _innerServiceCollection.Add(item);
+        _currentFeatureServiceCollection?.Add(item);
+    }
 
-        public void Clear()
-        {
-            _innerServiceCollection.Clear();
-            _featureServiceCollections.Clear();
-        }
+    public void Clear()
+    {
+        _innerServiceCollection.Clear();
+        _featureServiceCollections.Clear();
+    }
 
-        public bool Contains(ServiceDescriptor item)
-        {
-            return _innerServiceCollection.Contains(item);
-        }
+    public bool Contains(ServiceDescriptor item)
+    {
+        return _innerServiceCollection.Contains(item);
+    }
 
-        public void CopyTo(ServiceDescriptor[] array, int arrayIndex)
-        {
-            _innerServiceCollection.CopyTo(array, arrayIndex);
-        }
+    public void CopyTo(ServiceDescriptor[] array, int arrayIndex)
+    {
+        _innerServiceCollection.CopyTo(array, arrayIndex);
+    }
 
-        public bool Remove(ServiceDescriptor item)
-        {
-            return _innerServiceCollection.Remove(item);
-        }
+    public bool Remove(ServiceDescriptor item)
+    {
+        return _innerServiceCollection.Remove(item);
+    }
 
-        public int Count => _innerServiceCollection.Count;
+    public int Count => _innerServiceCollection.Count;
 
-        public bool IsReadOnly => _innerServiceCollection.IsReadOnly;
+    public bool IsReadOnly => _innerServiceCollection.IsReadOnly;
 
-        public int IndexOf(ServiceDescriptor item)
-        {
-            return _innerServiceCollection.IndexOf(item);
-        }
+    public int IndexOf(ServiceDescriptor item)
+    {
+        return _innerServiceCollection.IndexOf(item);
+    }
 
-        public void Insert(int index, ServiceDescriptor item)
-        {
-            _innerServiceCollection.Insert(index, item);
-            _currentFeatureServiceCollection?.Add(item);
-        }
+    public void Insert(int index, ServiceDescriptor item)
+    {
+        _innerServiceCollection.Insert(index, item);
+        _currentFeatureServiceCollection?.Add(item);
+    }
 
-        public void RemoveAt(int index)
-        {
-            _innerServiceCollection.RemoveAt(index);
-        }
+    public void RemoveAt(int index)
+    {
+        _innerServiceCollection.RemoveAt(index);
+    }
 
-        public ServiceDescriptor this[int index]
-        {
-            get => _innerServiceCollection[index];
-            set => _innerServiceCollection[index] = value;
-        }
+    public ServiceDescriptor this[int index]
+    {
+        get => _innerServiceCollection[index];
+        set => _innerServiceCollection[index] = value;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/Builders/ShellContainerFactory.cs b/src/OrchardCore/OrchardCore/Shell/Builders/ShellContainerFactory.cs
index ce30f98decd..c64e6c6380d 100644
--- a/src/OrchardCore/OrchardCore/Shell/Builders/ShellContainerFactory.cs
+++ b/src/OrchardCore/OrchardCore/Shell/Builders/ShellContainerFactory.cs
@@ -10,173 +10,172 @@
 using OrchardCore.Environment.Shell.Builders.Models;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Environment.Shell.Builders
+namespace OrchardCore.Environment.Shell.Builders;
+
+public class ShellContainerFactory : IShellContainerFactory
 {
-    public class ShellContainerFactory : IShellContainerFactory
+    private IFeatureInfo _applicationFeature;
+
+    private readonly IHostEnvironment _hostingEnvironment;
+    private readonly IExtensionManager _extensionManager;
+    private readonly IServiceProvider _serviceProvider;
+    private readonly IServiceCollection _applicationServices;
+
+    public ShellContainerFactory(
+        IHostEnvironment hostingEnvironment,
+        IExtensionManager extensionManager,
+        IServiceProvider serviceProvider,
+        IServiceCollection applicationServices)
     {
-        private IFeatureInfo _applicationFeature;
-
-        private readonly IHostEnvironment _hostingEnvironment;
-        private readonly IExtensionManager _extensionManager;
-        private readonly IServiceProvider _serviceProvider;
-        private readonly IServiceCollection _applicationServices;
-
-        public ShellContainerFactory(
-            IHostEnvironment hostingEnvironment,
-            IExtensionManager extensionManager,
-            IServiceProvider serviceProvider,
-            IServiceCollection applicationServices)
-        {
-            _hostingEnvironment = hostingEnvironment;
-            _extensionManager = extensionManager;
-            _applicationServices = applicationServices;
-            _serviceProvider = serviceProvider;
-        }
+        _hostingEnvironment = hostingEnvironment;
+        _extensionManager = extensionManager;
+        _applicationServices = applicationServices;
+        _serviceProvider = serviceProvider;
+    }
+
+    public async Task<IServiceProvider> CreateContainerAsync(ShellSettings settings, ShellBlueprint blueprint)
+    {
+        var tenantServiceCollection = _serviceProvider.CreateChildContainer(_applicationServices);
 
-        public async Task<IServiceProvider> CreateContainerAsync(ShellSettings settings, ShellBlueprint blueprint)
+        tenantServiceCollection.AddSingleton(settings);
+        tenantServiceCollection.AddSingleton(sp =>
         {
-            var tenantServiceCollection = _serviceProvider.CreateChildContainer(_applicationServices);
+            // Resolve it lazily as it's constructed lazily
+            var shellSettings = sp.GetRequiredService<ShellSettings>();
+            return shellSettings.ShellConfiguration;
+        });
 
-            tenantServiceCollection.AddSingleton(settings);
-            tenantServiceCollection.AddSingleton(sp =>
-            {
-                // Resolve it lazily as it's constructed lazily
-                var shellSettings = sp.GetRequiredService<ShellSettings>();
-                return shellSettings.ShellConfiguration;
-            });
+        tenantServiceCollection.AddSingleton(blueprint.Descriptor);
+        tenantServiceCollection.AddSingleton(blueprint);
 
-            tenantServiceCollection.AddSingleton(blueprint.Descriptor);
-            tenantServiceCollection.AddSingleton(blueprint);
+        // Execute IStartup registrations
 
-            // Execute IStartup registrations
+        foreach (var dependency in blueprint.Dependencies.Where(t => typeof(IStartup).IsAssignableFrom(t.Key)))
+        {
+            tenantServiceCollection.TryAddEnumerable(ServiceDescriptor.Singleton(typeof(IStartup), dependency.Key));
+        }
 
-            foreach (var dependency in blueprint.Dependencies.Where(t => typeof(IStartup).IsAssignableFrom(t.Key)))
+        // To not trigger features loading before it is normally done by 'ShellHost',
+        // init here the application feature in place of doing it in the constructor.
+        EnsureApplicationFeature();
+
+        foreach (var rawStartup in blueprint.Dependencies.Keys.Where(t => t.Name == "Startup"))
+        {
+            // Startup classes inheriting from IStartup are already treated
+            if (typeof(IStartup).IsAssignableFrom(rawStartup))
             {
-                tenantServiceCollection.TryAddEnumerable(ServiceDescriptor.Singleton(typeof(IStartup), dependency.Key));
+                continue;
             }
 
-            // To not trigger features loading before it is normally done by 'ShellHost',
-            // init here the application feature in place of doing it in the constructor.
-            EnsureApplicationFeature();
-
-            foreach (var rawStartup in blueprint.Dependencies.Keys.Where(t => t.Name == "Startup"))
+            // Ignore Startup class from main application.
+            if (blueprint.Dependencies.TryGetValue(rawStartup, out var startupFeatures) && startupFeatures.Any(f => f.Id == _applicationFeature.Id))
             {
-                // Startup classes inheriting from IStartup are already treated
-                if (typeof(IStartup).IsAssignableFrom(rawStartup))
-                {
-                    continue;
-                }
-
-                // Ignore Startup class from main application.
-                if (blueprint.Dependencies.TryGetValue(rawStartup, out var startupFeatures) && startupFeatures.Any(f => f.Id == _applicationFeature.Id))
-                {
-                    continue;
-                }
+                continue;
+            }
 
-                // Create a wrapper around this method
-                var configureServicesMethod = rawStartup.GetMethod(
-                    nameof(IStartup.ConfigureServices),
-                    BindingFlags.Public | BindingFlags.Instance,
-                    null,
-                    CallingConventions.Any,
-                    [typeof(IServiceCollection)],
-                    null);
+            // Create a wrapper around this method
+            var configureServicesMethod = rawStartup.GetMethod(
+                nameof(IStartup.ConfigureServices),
+                BindingFlags.Public | BindingFlags.Instance,
+                null,
+                CallingConventions.Any,
+                [typeof(IServiceCollection)],
+                null);
 
-                var configureMethod = rawStartup.GetMethod(
-                    nameof(IStartup.Configure),
-                    BindingFlags.Public | BindingFlags.Instance);
+            var configureMethod = rawStartup.GetMethod(
+                nameof(IStartup.Configure),
+                BindingFlags.Public | BindingFlags.Instance);
 
-                var orderProperty = rawStartup.GetProperty(
-                    nameof(IStartup.Order),
-                    BindingFlags.Public | BindingFlags.Instance);
+            var orderProperty = rawStartup.GetProperty(
+                nameof(IStartup.Order),
+                BindingFlags.Public | BindingFlags.Instance);
 
-                var configureOrderProperty = rawStartup.GetProperty(
-                    nameof(IStartup.ConfigureOrder),
-                    BindingFlags.Public | BindingFlags.Instance);
+            var configureOrderProperty = rawStartup.GetProperty(
+                nameof(IStartup.ConfigureOrder),
+                BindingFlags.Public | BindingFlags.Instance);
 
-                // Add the startup class to the DI so we can instantiate it with
-                // valid ctor arguments
-                tenantServiceCollection.AddSingleton(rawStartup);
+            // Add the startup class to the DI so we can instantiate it with
+            // valid ctor arguments
+            tenantServiceCollection.AddSingleton(rawStartup);
 
-                tenantServiceCollection.AddSingleton<IStartup>(sp =>
-                {
-                    var startupInstance = sp.GetService(rawStartup);
-                    return new StartupBaseMock(startupInstance, configureServicesMethod, configureMethod, orderProperty, configureOrderProperty);
-                });
-            }
+            tenantServiceCollection.AddSingleton<IStartup>(sp =>
+            {
+                var startupInstance = sp.GetService(rawStartup);
+                return new StartupBaseMock(startupInstance, configureServicesMethod, configureMethod, orderProperty, configureOrderProperty);
+            });
+        }
 
-            // Index all service descriptors by their feature id
-            var featureAwareServiceCollection = new FeatureAwareServiceCollection(tenantServiceCollection);
+        // Index all service descriptors by their feature id
+        var featureAwareServiceCollection = new FeatureAwareServiceCollection(tenantServiceCollection);
 
-            var shellServiceProvider = tenantServiceCollection.BuildServiceProvider(true);
-            var startups = shellServiceProvider.GetServices<IStartup>();
+        var shellServiceProvider = tenantServiceCollection.BuildServiceProvider(true);
+        var startups = shellServiceProvider.GetServices<IStartup>();
 
-            // IStartup instances are ordered by module dependency with an Order of 0 by default.
-            // OrderBy performs a stable sort so order is preserved among equal Order values.
-            startups = startups.OrderBy(s => s.Order);
+        // IStartup instances are ordered by module dependency with an Order of 0 by default.
+        // OrderBy performs a stable sort so order is preserved among equal Order values.
+        startups = startups.OrderBy(s => s.Order);
 
-            // Let any module add custom service descriptors to the tenant.
-            foreach (var startup in startups)
-            {
-                var feature = blueprint.Dependencies.FirstOrDefault(x => x.Key == startup.GetType()).Value?.FirstOrDefault();
+        // Let any module add custom service descriptors to the tenant.
+        foreach (var startup in startups)
+        {
+            var feature = blueprint.Dependencies.FirstOrDefault(x => x.Key == startup.GetType()).Value?.FirstOrDefault();
 
-                // If the startup is not coming from an extension, associate it to the application feature.
-                // For instance when Startup classes are registered with Configure<Startup>() from the application.
+            // If the startup is not coming from an extension, associate it to the application feature.
+            // For instance when Startup classes are registered with Configure<Startup>() from the application.
 
-                featureAwareServiceCollection.SetCurrentFeature(feature ?? _applicationFeature);
-                startup.ConfigureServices(featureAwareServiceCollection);
-            }
+            featureAwareServiceCollection.SetCurrentFeature(feature ?? _applicationFeature);
+            startup.ConfigureServices(featureAwareServiceCollection);
+        }
 
-            await shellServiceProvider.DisposeAsync();
+        await shellServiceProvider.DisposeAsync();
 
-            // Rebuild the service provider from the updated collection.
-            shellServiceProvider = tenantServiceCollection.BuildServiceProvider(true);
+        // Rebuild the service provider from the updated collection.
+        shellServiceProvider = tenantServiceCollection.BuildServiceProvider(true);
 
-            var typeFeatureProvider = shellServiceProvider.GetRequiredService<ITypeFeatureProvider>();
-            PopulateTypeFeatureProvider(typeFeatureProvider, featureAwareServiceCollection);
+        var typeFeatureProvider = shellServiceProvider.GetRequiredService<ITypeFeatureProvider>();
+        PopulateTypeFeatureProvider(typeFeatureProvider, featureAwareServiceCollection);
 
-            return shellServiceProvider;
-        }
+        return shellServiceProvider;
+    }
 
-        private void EnsureApplicationFeature()
+    private void EnsureApplicationFeature()
+    {
+        if (_applicationFeature is null)
         {
-            if (_applicationFeature is null)
+            lock (this)
             {
-                lock (this)
-                {
-                    _applicationFeature ??= _extensionManager.GetFeatures()
-                            .FirstOrDefault(f => f.Id == _hostingEnvironment.ApplicationName);
-                }
+                _applicationFeature ??= _extensionManager.GetFeatures()
+                        .FirstOrDefault(f => f.Id == _hostingEnvironment.ApplicationName);
             }
         }
+    }
 
-        private void PopulateTypeFeatureProvider(ITypeFeatureProvider typeFeatureProvider, FeatureAwareServiceCollection featureAwareServiceCollection)
+    private void PopulateTypeFeatureProvider(ITypeFeatureProvider typeFeatureProvider, FeatureAwareServiceCollection featureAwareServiceCollection)
+    {
+        // Register all DIed types in ITypeFeatureProvider.
+        foreach (var featureServiceCollection in featureAwareServiceCollection.FeatureCollections)
         {
-            // Register all DIed types in ITypeFeatureProvider.
-            foreach (var featureServiceCollection in featureAwareServiceCollection.FeatureCollections)
+            foreach (var serviceDescriptor in featureServiceCollection.Value)
             {
-                foreach (var serviceDescriptor in featureServiceCollection.Value)
+                var type = serviceDescriptor.GetImplementationType();
+
+                if (type is not null)
                 {
-                    var type = serviceDescriptor.GetImplementationType();
+                    var feature = featureServiceCollection.Key;
 
-                    if (type is not null)
+                    if (feature == _applicationFeature)
                     {
-                        var feature = featureServiceCollection.Key;
+                        var attribute = type.GetCustomAttributes<FeatureAttribute>(false).FirstOrDefault();
 
-                        if (feature == _applicationFeature)
+                        if (attribute is not null)
                         {
-                            var attribute = type.GetCustomAttributes<FeatureAttribute>(false).FirstOrDefault();
-
-                            if (attribute is not null)
-                            {
-                                feature = featureServiceCollection.Key.Extension.Features
-                                    .FirstOrDefault(f => f.Id == attribute.FeatureName)
-                                    ?? feature;
-                            }
+                            feature = featureServiceCollection.Key.Extension.Features
+                                .FirstOrDefault(f => f.Id == attribute.FeatureName)
+                                ?? feature;
                         }
-
-                        typeFeatureProvider.TryAdd(type, feature);
                     }
+
+                    typeFeatureProvider.TryAdd(type, feature);
                 }
             }
         }
diff --git a/src/OrchardCore/OrchardCore/Shell/Builders/ShellContextFactory.cs b/src/OrchardCore/OrchardCore/Shell/Builders/ShellContextFactory.cs
index f06f0d477cd..3046482813c 100644
--- a/src/OrchardCore/OrchardCore/Shell/Builders/ShellContextFactory.cs
+++ b/src/OrchardCore/OrchardCore/Shell/Builders/ShellContextFactory.cs
@@ -7,115 +7,114 @@
 using OrchardCore.Environment.Shell.Descriptor;
 using OrchardCore.Environment.Shell.Descriptor.Models;
 
-namespace OrchardCore.Environment.Shell.Builders
+namespace OrchardCore.Environment.Shell.Builders;
+
+public class ShellContextFactory : IShellContextFactory
 {
-    public class ShellContextFactory : IShellContextFactory
+    private readonly ICompositionStrategy _compositionStrategy;
+    private readonly IShellContainerFactory _shellContainerFactory;
+    private readonly IEnumerable<ShellFeature> _shellFeatures;
+    private readonly ILogger _logger;
+
+    public ShellContextFactory(
+        ICompositionStrategy compositionStrategy,
+        IShellContainerFactory shellContainerFactory,
+        IEnumerable<ShellFeature> shellFeatures,
+        ILogger<ShellContextFactory> logger)
     {
-        private readonly ICompositionStrategy _compositionStrategy;
-        private readonly IShellContainerFactory _shellContainerFactory;
-        private readonly IEnumerable<ShellFeature> _shellFeatures;
-        private readonly ILogger _logger;
-
-        public ShellContextFactory(
-            ICompositionStrategy compositionStrategy,
-            IShellContainerFactory shellContainerFactory,
-            IEnumerable<ShellFeature> shellFeatures,
-            ILogger<ShellContextFactory> logger)
+        _compositionStrategy = compositionStrategy;
+        _shellContainerFactory = shellContainerFactory;
+        _shellFeatures = shellFeatures;
+        _logger = logger;
+    }
+
+    async Task<ShellContext> IShellContextFactory.CreateShellContextAsync(ShellSettings settings)
+    {
+        if (_logger.IsEnabled(LogLevel.Information))
         {
-            _compositionStrategy = compositionStrategy;
-            _shellContainerFactory = shellContainerFactory;
-            _shellFeatures = shellFeatures;
-            _logger = logger;
+            _logger.LogInformation("Creating shell context for tenant '{TenantName}'", settings.Name);
         }
 
-        async Task<ShellContext> IShellContextFactory.CreateShellContextAsync(ShellSettings settings)
-        {
-            if (_logger.IsEnabled(LogLevel.Information))
-            {
-                _logger.LogInformation("Creating shell context for tenant '{TenantName}'", settings.Name);
-            }
+        var describedContext = await CreateDescribedContextAsync(settings, new ShellDescriptor());
 
-            var describedContext = await CreateDescribedContextAsync(settings, new ShellDescriptor());
+        ShellDescriptor currentDescriptor = null;
+        await (await describedContext.CreateScopeAsync()).UsingServiceScopeAsync(async scope =>
+        {
+            var shellDescriptorManager = scope.ServiceProvider.GetService<IShellDescriptorManager>();
+            currentDescriptor = await shellDescriptorManager.GetShellDescriptorAsync();
+        });
 
-            ShellDescriptor currentDescriptor = null;
-            await (await describedContext.CreateScopeAsync()).UsingServiceScopeAsync(async scope =>
-            {
-                var shellDescriptorManager = scope.ServiceProvider.GetService<IShellDescriptorManager>();
-                currentDescriptor = await shellDescriptorManager.GetShellDescriptorAsync();
-            });
+        if (currentDescriptor is not null)
+        {
+            // Mark as using shared setting that should not be disposed.
+            await describedContext.WithSharedSettings().DisposeAsync();
+            return await CreateDescribedContextAsync(settings, currentDescriptor);
+        }
 
-            if (currentDescriptor is not null)
-            {
-                // Mark as using shared setting that should not be disposed.
-                await describedContext.WithSharedSettings().DisposeAsync();
-                return await CreateDescribedContextAsync(settings, currentDescriptor);
-            }
+        return describedContext;
+    }
 
-            return describedContext;
+    Task<ShellContext> IShellContextFactory.CreateSetupContextAsync(ShellSettings settings)
+    {
+        if (_logger.IsEnabled(LogLevel.Debug))
+        {
+            _logger.LogDebug("No shell settings available. Creating shell context for setup");
         }
 
-        Task<ShellContext> IShellContextFactory.CreateSetupContextAsync(ShellSettings settings)
-        {
-            if (_logger.IsEnabled(LogLevel.Debug))
-            {
-                _logger.LogDebug("No shell settings available. Creating shell context for setup");
-            }
+        var descriptor = MinimumShellDescriptor();
 
-            var descriptor = MinimumShellDescriptor();
+        return CreateDescribedContextAsync(settings, descriptor);
+    }
 
-            return CreateDescribedContextAsync(settings, descriptor);
+    public async Task<ShellContext> CreateDescribedContextAsync(ShellSettings settings, ShellDescriptor shellDescriptor)
+    {
+        if (_logger.IsEnabled(LogLevel.Debug))
+        {
+            _logger.LogDebug("Creating described context for tenant '{TenantName}'", settings.Name);
         }
 
-        public async Task<ShellContext> CreateDescribedContextAsync(ShellSettings settings, ShellDescriptor shellDescriptor)
+        // Prevent settings from being disposed when an intermediate container is disposed.
+        Interlocked.Increment(ref settings._shellCreating);
+        try
         {
-            if (_logger.IsEnabled(LogLevel.Debug))
-            {
-                _logger.LogDebug("Creating described context for tenant '{TenantName}'", settings.Name);
-            }
+            await settings.EnsureConfigurationAsync();
 
-            // Prevent settings from being disposed when an intermediate container is disposed.
-            Interlocked.Increment(ref settings._shellCreating);
-            try
-            {
-                await settings.EnsureConfigurationAsync();
-
-                var blueprint = await _compositionStrategy.ComposeAsync(settings, shellDescriptor);
-                var provider = await _shellContainerFactory.CreateContainerAsync(settings, blueprint);
-
-                var options = provider.GetService<IOptions<ShellContainerOptions>>().Value;
-                foreach (var initializeAsync in options.Initializers)
-                {
-                    await initializeAsync(provider);
-                }
-
-                return new ShellContext
-                {
-                    Settings = settings,
-                    Blueprint = blueprint,
-                    ServiceProvider = provider
-                };
-            }
-            finally
+            var blueprint = await _compositionStrategy.ComposeAsync(settings, shellDescriptor);
+            var provider = await _shellContainerFactory.CreateContainerAsync(settings, blueprint);
+
+            var options = provider.GetService<IOptions<ShellContainerOptions>>().Value;
+            foreach (var initializeAsync in options.Initializers)
             {
-                Interlocked.Decrement(ref settings._shellCreating);
+                await initializeAsync(provider);
             }
-        }
 
-        /// <summary>
-        /// The minimum shell descriptor is used to bootstrap the first container that will be used
-        /// to call all module IStartup implementation. It's composed of module names that reference
-        /// core components necessary for the desired scenario.
-        /// </summary>
-        /// <returns></returns>
-        private ShellDescriptor MinimumShellDescriptor()
-        {
-            // Load default features from the list of registered ShellFeature instances in the DI
-
-            return new ShellDescriptor
+            return new ShellContext
             {
-                SerialNumber = -1,
-                Features = new List<ShellFeature>(_shellFeatures)
+                Settings = settings,
+                Blueprint = blueprint,
+                ServiceProvider = provider
             };
         }
+        finally
+        {
+            Interlocked.Decrement(ref settings._shellCreating);
+        }
+    }
+
+    /// <summary>
+    /// The minimum shell descriptor is used to bootstrap the first container that will be used
+    /// to call all module IStartup implementation. It's composed of module names that reference
+    /// core components necessary for the desired scenario.
+    /// </summary>
+    /// <returns></returns>
+    private ShellDescriptor MinimumShellDescriptor()
+    {
+        // Load default features from the list of registered ShellFeature instances in the DI
+
+        return new ShellDescriptor
+        {
+            SerialNumber = -1,
+            Features = new List<ShellFeature>(_shellFeatures)
+        };
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/Builders/ShellContextOptionsSetup.cs b/src/OrchardCore/OrchardCore/Shell/Builders/ShellContextOptionsSetup.cs
index 966b1329219..384a28307f6 100644
--- a/src/OrchardCore/OrchardCore/Shell/Builders/ShellContextOptionsSetup.cs
+++ b/src/OrchardCore/OrchardCore/Shell/Builders/ShellContextOptionsSetup.cs
@@ -2,41 +2,40 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Environment.Shell.Configuration;
 
-namespace OrchardCore.Environment.Shell.Builders
+namespace OrchardCore.Environment.Shell.Builders;
+
+public sealed class ShellContextOptionsSetup : IConfigureOptions<ShellContextOptions>
 {
-    public sealed class ShellContextOptionsSetup : IConfigureOptions<ShellContextOptions>
+    private readonly IShellConfiguration _shellConfiguration;
+
+    public ShellContextOptionsSetup(IShellConfiguration shellConfiguration)
+    {
+        _shellConfiguration = shellConfiguration;
+    }
+
+    public void Configure(ShellContextOptions options)
     {
-        private readonly IShellConfiguration _shellConfiguration;
+        _shellConfiguration.Bind(options);
+
+        // Only used if the current distributed lock implementation is not a local lock.
+        if (options.ShellActivateLockTimeout <= 0)
+        {
+            options.ShellActivateLockTimeout = 30_000;
+        }
+
+        if (options.ShellActivateLockExpiration <= 0)
+        {
+            options.ShellActivateLockExpiration = 30_000;
+        }
 
-        public ShellContextOptionsSetup(IShellConfiguration shellConfiguration)
+        if (options.ShellRemovingLockTimeout <= 0)
         {
-            _shellConfiguration = shellConfiguration;
+            options.ShellRemovingLockTimeout = 1_000;
         }
 
-        public void Configure(ShellContextOptions options)
+        if (options.ShellRemovingLockExpiration <= 0)
         {
-            _shellConfiguration.Bind(options);
-
-            // Only used if the current distributed lock implementation is not a local lock.
-            if (options.ShellActivateLockTimeout <= 0)
-            {
-                options.ShellActivateLockTimeout = 30_000;
-            }
-
-            if (options.ShellActivateLockExpiration <= 0)
-            {
-                options.ShellActivateLockExpiration = 30_000;
-            }
-
-            if (options.ShellRemovingLockTimeout <= 0)
-            {
-                options.ShellRemovingLockTimeout = 1_000;
-            }
-
-            if (options.ShellRemovingLockExpiration <= 0)
-            {
-                options.ShellRemovingLockExpiration = 60_000;
-            }
+            options.ShellRemovingLockExpiration = 60_000;
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/Builders/StartupBaseMock.cs b/src/OrchardCore/OrchardCore/Shell/Builders/StartupBaseMock.cs
index 8d678a0b694..f4cac8c8a6c 100644
--- a/src/OrchardCore/OrchardCore/Shell/Builders/StartupBaseMock.cs
+++ b/src/OrchardCore/OrchardCore/Shell/Builders/StartupBaseMock.cs
@@ -6,76 +6,75 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Environment.Shell.Builders
+namespace OrchardCore.Environment.Shell.Builders;
+
+internal sealed class StartupBaseMock : StartupBase
 {
-    internal sealed class StartupBaseMock : StartupBase
-    {
-        private readonly object _startup;
-        private readonly MethodInfo _configureService;
-        private readonly MethodInfo _configure;
+    private readonly object _startup;
+    private readonly MethodInfo _configureService;
+    private readonly MethodInfo _configure;
 
-        public StartupBaseMock(
-            object startup,
-            MethodInfo configureService,
-            MethodInfo configure,
-            PropertyInfo order,
-            PropertyInfo configureOrder)
-        {
-            _startup = startup;
-            _configureService = configureService;
-            _configure = configure;
+    public StartupBaseMock(
+        object startup,
+        MethodInfo configureService,
+        MethodInfo configure,
+        PropertyInfo order,
+        PropertyInfo configureOrder)
+    {
+        _startup = startup;
+        _configureService = configureService;
+        _configure = configure;
 
-            var orderValue = order?.GetValue(_startup);
-            var configureOrderValue = configureOrder?.GetValue(_startup);
+        var orderValue = order?.GetValue(_startup);
+        var configureOrderValue = configureOrder?.GetValue(_startup);
 
-            Order = orderValue != null ? (int)orderValue : default;
-            ConfigureOrder = configureOrderValue != null ? (int)configureOrderValue : Order;
-        }
+        Order = orderValue != null ? (int)orderValue : default;
+        ConfigureOrder = configureOrderValue != null ? (int)configureOrderValue : Order;
+    }
 
-        /// <inheritdoc />
-        public override int Order { get; }
+    /// <inheritdoc />
+    public override int Order { get; }
 
-        /// <inheritdoc />
-        public override int ConfigureOrder { get; }
+    /// <inheritdoc />
+    public override int ConfigureOrder { get; }
 
-        public override void ConfigureServices(IServiceCollection services)
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        if (_configureService == null)
         {
-            if (_configureService == null)
-            {
-                return;
-            }
+            return;
+        }
 
-            _configureService.Invoke(_startup, [services]);
+        _configureService.Invoke(_startup, [services]);
+    }
+
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+    {
+        if (_configure == null)
+        {
+            return;
         }
 
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+        // Resolve all services
+
+        var parameters = _configure.GetParameters().Select(x =>
         {
-            if (_configure == null)
+            if (x.ParameterType == typeof(IServiceProvider))
             {
-                return;
+                return serviceProvider;
             }
-
-            // Resolve all services
-
-            var parameters = _configure.GetParameters().Select(x =>
+            else if (x.ParameterType == typeof(IApplicationBuilder))
+            {
+                return app;
+            }
+            else if (x.ParameterType == typeof(IEndpointRouteBuilder))
             {
-                if (x.ParameterType == typeof(IServiceProvider))
-                {
-                    return serviceProvider;
-                }
-                else if (x.ParameterType == typeof(IApplicationBuilder))
-                {
-                    return app;
-                }
-                else if (x.ParameterType == typeof(IEndpointRouteBuilder))
-                {
-                    return routes;
-                }
+                return routes;
+            }
 
-                return serviceProvider.GetService(x.ParameterType);
-            });
+            return serviceProvider.GetService(x.ParameterType);
+        });
 
-            _configure.Invoke(_startup, parameters.ToArray());
-        }
+        _configure.Invoke(_startup, parameters.ToArray());
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/Configuration/ShellConfigurationSources.cs b/src/OrchardCore/OrchardCore/Shell/Configuration/ShellConfigurationSources.cs
index 5fa363f22da..2fbee81c52b 100644
--- a/src/OrchardCore/OrchardCore/Shell/Configuration/ShellConfigurationSources.cs
+++ b/src/OrchardCore/OrchardCore/Shell/Configuration/ShellConfigurationSources.cs
@@ -7,84 +7,83 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Environment.Shell.Configuration.Internal;
 
-namespace OrchardCore.Environment.Shell.Configuration
+namespace OrchardCore.Environment.Shell.Configuration;
+
+public class ShellConfigurationSources : IShellConfigurationSources
 {
-    public class ShellConfigurationSources : IShellConfigurationSources
+    private readonly string _container;
+    private readonly ILogger _logger;
+
+    public ShellConfigurationSources(IOptions<ShellOptions> shellOptions, ILogger<ShellConfigurationSources> logger)
+    {
+        // e.g., App_Data/Sites
+        _container = Path.Combine(shellOptions.Value.ShellsApplicationDataPath, shellOptions.Value.ShellsContainerName);
+        Directory.CreateDirectory(_container);
+        _logger = logger;
+    }
+
+    public Task AddSourcesAsync(string tenant, IConfigurationBuilder builder)
+    {
+        builder.AddTenantJsonFile(Path.Combine(_container, tenant, "appsettings.json"), optional: true);
+        return Task.CompletedTask;
+    }
+
+    public async Task SaveAsync(string tenant, IDictionary<string, string> data)
     {
-        private readonly string _container;
-        private readonly ILogger _logger;
+        var tenantFolder = Path.Combine(_container, tenant);
+        var appsettings = Path.Combine(tenantFolder, "appsettings.json");
+
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance
+        IDictionary<string, string> configData;
+#pragma warning restore CA1859 // Use concrete types when possible for improved performance
 
-        public ShellConfigurationSources(IOptions<ShellOptions> shellOptions, ILogger<ShellConfigurationSources> logger)
+        if (File.Exists(appsettings))
         {
-            // e.g., App_Data/Sites
-            _container = Path.Combine(shellOptions.Value.ShellsApplicationDataPath, shellOptions.Value.ShellsContainerName);
-            Directory.CreateDirectory(_container);
-            _logger = logger;
+            using var streamReader = File.OpenRead(appsettings);
+            configData = await JsonConfigurationParser.ParseAsync(streamReader);
         }
-
-        public Task AddSourcesAsync(string tenant, IConfigurationBuilder builder)
+        else
         {
-            builder.AddTenantJsonFile(Path.Combine(_container, tenant, "appsettings.json"), optional: true);
-            return Task.CompletedTask;
+            configData = new Dictionary<string, string>();
         }
 
-        public async Task SaveAsync(string tenant, IDictionary<string, string> data)
+        foreach (var key in data.Keys)
         {
-            var tenantFolder = Path.Combine(_container, tenant);
-            var appsettings = Path.Combine(tenantFolder, "appsettings.json");
-
-#pragma warning disable CA1859 // Use concrete types when possible for improved performance
-            IDictionary<string, string> configData;
-#pragma warning restore CA1859 // Use concrete types when possible for improved performance
-
-            if (File.Exists(appsettings))
+            if (data[key] is not null)
             {
-                using var streamReader = File.OpenRead(appsettings);
-                configData = await JsonConfigurationParser.ParseAsync(streamReader);
+                configData[key] = data[key];
             }
             else
             {
-                configData = new Dictionary<string, string>();
+                configData.Remove(key);
             }
+        }
 
-            foreach (var key in data.Keys)
-            {
-                if (data[key] is not null)
-                {
-                    configData[key] = data[key];
-                }
-                else
-                {
-                    configData.Remove(key);
-                }
-            }
+        Directory.CreateDirectory(tenantFolder);
 
-            Directory.CreateDirectory(tenantFolder);
+        using var streamWriter = File.Create(appsettings);
+        await JsonSerializer.SerializeAsync(streamWriter, configData.ToJsonObject(), JOptions.Indented);
+    }
 
-            using var streamWriter = File.Create(appsettings);
-            await JsonSerializer.SerializeAsync(streamWriter, configData.ToJsonObject(), JOptions.Indented);
-        }
+    public Task RemoveAsync(string tenant)
+    {
+        var tenantFolder = Path.Combine(_container, tenant);
+        var appsettings = Path.Combine(tenantFolder, "appsettings.json");
 
-        public Task RemoveAsync(string tenant)
+        if (File.Exists(appsettings))
         {
-            var tenantFolder = Path.Combine(_container, tenant);
-            var appsettings = Path.Combine(tenantFolder, "appsettings.json");
-
-            if (File.Exists(appsettings))
+            try
             {
-                try
-                {
-                    File.Delete(appsettings);
-                }
-                catch (IOException ex)
-                {
-                    _logger.LogError(
-                        ex,
-                        "Error while deleting the '{AppSettings}' file of tenant '{TenantName}'", appsettings, tenant);
-                }
+                File.Delete(appsettings);
+            }
+            catch (IOException ex)
+            {
+                _logger.LogError(
+                    ex,
+                    "Error while deleting the '{AppSettings}' file of tenant '{TenantName}'", appsettings, tenant);
             }
-
-            return Task.CompletedTask;
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/Configuration/ShellsConfigurationSources.cs b/src/OrchardCore/OrchardCore/Shell/Configuration/ShellsConfigurationSources.cs
index 811d0bf6324..ac9a7f0f885 100644
--- a/src/OrchardCore/OrchardCore/Shell/Configuration/ShellsConfigurationSources.cs
+++ b/src/OrchardCore/OrchardCore/Shell/Configuration/ShellsConfigurationSources.cs
@@ -4,26 +4,25 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Environment.Shell.Configuration
+namespace OrchardCore.Environment.Shell.Configuration;
+
+public class ShellsConfigurationSources : IShellsConfigurationSources
 {
-    public class ShellsConfigurationSources : IShellsConfigurationSources
-    {
-        private readonly string _environment;
-        private readonly string _appsettings;
+    private readonly string _environment;
+    private readonly string _appsettings;
 
-        public ShellsConfigurationSources(IHostEnvironment hostingEnvironment, IOptions<ShellOptions> shellOptions)
-        {
-            _environment = hostingEnvironment.EnvironmentName;
-            _appsettings = Path.Combine(shellOptions.Value.ShellsApplicationDataPath, "appsettings");
-        }
+    public ShellsConfigurationSources(IHostEnvironment hostingEnvironment, IOptions<ShellOptions> shellOptions)
+    {
+        _environment = hostingEnvironment.EnvironmentName;
+        _appsettings = Path.Combine(shellOptions.Value.ShellsApplicationDataPath, "appsettings");
+    }
 
-        public Task AddSourcesAsync(IConfigurationBuilder builder)
-        {
-            builder
-                .AddTenantJsonFile($"{_appsettings}.json", optional: true)
-                .AddTenantJsonFile($"{_appsettings}.{_environment}.json", optional: true);
+    public Task AddSourcesAsync(IConfigurationBuilder builder)
+    {
+        builder
+            .AddTenantJsonFile($"{_appsettings}.json", optional: true)
+            .AddTenantJsonFile($"{_appsettings}.{_environment}.json", optional: true);
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/Configuration/ShellsSettingsSources.cs b/src/OrchardCore/OrchardCore/Shell/Configuration/ShellsSettingsSources.cs
index 66948c5f939..cee02bc2210 100644
--- a/src/OrchardCore/OrchardCore/Shell/Configuration/ShellsSettingsSources.cs
+++ b/src/OrchardCore/OrchardCore/Shell/Configuration/ShellsSettingsSources.cs
@@ -6,72 +6,71 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Environment.Shell.Configuration
+namespace OrchardCore.Environment.Shell.Configuration;
+
+public class ShellsSettingsSources : IShellsSettingsSources
 {
-    public class ShellsSettingsSources : IShellsSettingsSources
+    private readonly string _tenants;
+
+    public ShellsSettingsSources(IOptions<ShellOptions> shellOptions)
     {
-        private readonly string _tenants;
+        _tenants = Path.Combine(shellOptions.Value.ShellsApplicationDataPath, OrchardCoreConstants.Shell.TenantsFileName);
+    }
+
+    public Task AddSourcesAsync(IConfigurationBuilder builder)
+    {
+        builder.AddTenantJsonFile(_tenants, optional: true);
+        return Task.CompletedTask;
+    }
+
+    public Task AddSourcesAsync(string tenant, IConfigurationBuilder builder) => AddSourcesAsync(builder);
 
-        public ShellsSettingsSources(IOptions<ShellOptions> shellOptions)
+    public async Task SaveAsync(string tenant, IDictionary<string, string> data)
+    {
+        JsonObject tenantsSettings;
+        if (File.Exists(_tenants))
         {
-            _tenants = Path.Combine(shellOptions.Value.ShellsApplicationDataPath, OrchardCoreConstants.Shell.TenantsFileName);
+            using var streamReader = File.OpenRead(_tenants);
+            tenantsSettings = await JObject.LoadAsync(streamReader);
         }
-
-        public Task AddSourcesAsync(IConfigurationBuilder builder)
+        else
         {
-            builder.AddTenantJsonFile(_tenants, optional: true);
-            return Task.CompletedTask;
+            tenantsSettings = [];
         }
 
-        public Task AddSourcesAsync(string tenant, IConfigurationBuilder builder) => AddSourcesAsync(builder);
-
-        public async Task SaveAsync(string tenant, IDictionary<string, string> data)
+        var settings = tenantsSettings[tenant] as JsonObject ?? [];
+        foreach (var key in data.Keys)
         {
-            JsonObject tenantsSettings;
-            if (File.Exists(_tenants))
+            if (data[key] is not null)
             {
-                using var streamReader = File.OpenRead(_tenants);
-                tenantsSettings = await JObject.LoadAsync(streamReader);
+                settings[key] = data[key];
             }
             else
             {
-                tenantsSettings = [];
-            }
-
-            var settings = tenantsSettings[tenant] as JsonObject ?? [];
-            foreach (var key in data.Keys)
-            {
-                if (data[key] is not null)
-                {
-                    settings[key] = data[key];
-                }
-                else
-                {
-                    settings.Remove(key);
-                }
+                settings.Remove(key);
             }
+        }
 
-            tenantsSettings[tenant] = settings;
+        tenantsSettings[tenant] = settings;
 
-            using var streamWriter = File.Create(_tenants);
-            await JsonSerializer.SerializeAsync(streamWriter, tenantsSettings, JOptions.Indented);
-        }
+        using var streamWriter = File.Create(_tenants);
+        await JsonSerializer.SerializeAsync(streamWriter, tenantsSettings, JOptions.Indented);
+    }
 
-        public async Task RemoveAsync(string tenant)
+    public async Task RemoveAsync(string tenant)
+    {
+        if (File.Exists(_tenants))
         {
-            if (File.Exists(_tenants))
+            JsonObject tenantsSettings;
+            using (var streamReader = File.OpenRead(_tenants))
             {
-                JsonObject tenantsSettings;
-                using (var streamReader = File.OpenRead(_tenants))
-                {
-                    tenantsSettings = await JObject.LoadAsync(streamReader);
-                }
+                tenantsSettings = await JObject.LoadAsync(streamReader);
+            }
 
-                tenantsSettings.Remove(tenant);
+            tenantsSettings.Remove(tenant);
 
-                using var streamWriter = File.Create(_tenants);
-                await JsonSerializer.SerializeAsync(streamWriter, tenantsSettings, JOptions.Indented);
-            }
+            using var streamWriter = File.Create(_tenants);
+            await JsonSerializer.SerializeAsync(streamWriter, tenantsSettings, JOptions.Indented);
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/DefaultTenantOnlyFeatureValidationProvider.cs b/src/OrchardCore/OrchardCore/Shell/DefaultTenantOnlyFeatureValidationProvider.cs
index cd116b720b0..dc40a972f27 100644
--- a/src/OrchardCore/OrchardCore/Shell/DefaultTenantOnlyFeatureValidationProvider.cs
+++ b/src/OrchardCore/OrchardCore/Shell/DefaultTenantOnlyFeatureValidationProvider.cs
@@ -2,36 +2,35 @@
 using System.Threading.Tasks;
 using OrchardCore.Environment.Extensions;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+public class DefaultTenantOnlyFeatureValidationProvider : IFeatureValidationProvider
 {
-    public class DefaultTenantOnlyFeatureValidationProvider : IFeatureValidationProvider
+    private readonly IExtensionManager _extensionManager;
+    private readonly ShellSettings _shellSettings;
+
+    public DefaultTenantOnlyFeatureValidationProvider(
+        IExtensionManager extensionManager,
+        ShellSettings shellSettings
+        )
     {
-        private readonly IExtensionManager _extensionManager;
-        private readonly ShellSettings _shellSettings;
+        _extensionManager = extensionManager;
+        _shellSettings = shellSettings;
+    }
 
-        public DefaultTenantOnlyFeatureValidationProvider(
-            IExtensionManager extensionManager,
-            ShellSettings shellSettings
-            )
+    public ValueTask<bool> IsFeatureValidAsync(string id)
+    {
+        var features = _extensionManager.GetFeatures([id]);
+        if (!features.Any())
         {
-            _extensionManager = extensionManager;
-            _shellSettings = shellSettings;
+            return new ValueTask<bool>(false);
         }
 
-        public ValueTask<bool> IsFeatureValidAsync(string id)
+        if (_shellSettings.IsDefaultShell())
         {
-            var features = _extensionManager.GetFeatures([id]);
-            if (!features.Any())
-            {
-                return new ValueTask<bool>(false);
-            }
-
-            if (_shellSettings.IsDefaultShell())
-            {
-                return new ValueTask<bool>(true);
-            }
-
-            return new ValueTask<bool>(!features.Any(f => f.DefaultTenantOnly));
+            return new ValueTask<bool>(true);
         }
+
+        return new ValueTask<bool>(!features.Any(f => f.DefaultTenantOnly));
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/Descriptor/Settings/AllFeaturesShellDescriptorManager.cs b/src/OrchardCore/OrchardCore/Shell/Descriptor/Settings/AllFeaturesShellDescriptorManager.cs
index 28141776802..4e76d920397 100644
--- a/src/OrchardCore/OrchardCore/Shell/Descriptor/Settings/AllFeaturesShellDescriptorManager.cs
+++ b/src/OrchardCore/OrchardCore/Shell/Descriptor/Settings/AllFeaturesShellDescriptorManager.cs
@@ -4,35 +4,34 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Environment.Shell.Descriptor.Models;
 
-namespace OrchardCore.Environment.Shell.Descriptor.Settings
+namespace OrchardCore.Environment.Shell.Descriptor.Settings;
+
+/// <summary>
+/// Implements <see cref="IShellDescriptorManager"/> by returning a single tenant with all the available
+/// extensions.
+/// </summary>
+public class AllFeaturesShellDescriptorManager : IShellDescriptorManager
 {
-    /// <summary>
-    /// Implements <see cref="IShellDescriptorManager"/> by returning a single tenant with all the available
-    /// extensions.
-    /// </summary>
-    public class AllFeaturesShellDescriptorManager : IShellDescriptorManager
-    {
-        private readonly IExtensionManager _extensionManager;
-        private ShellDescriptor _shellDescriptor;
+    private readonly IExtensionManager _extensionManager;
+    private ShellDescriptor _shellDescriptor;
 
-        public AllFeaturesShellDescriptorManager(IExtensionManager extensionManager)
-        {
-            _extensionManager = extensionManager;
-        }
+    public AllFeaturesShellDescriptorManager(IExtensionManager extensionManager)
+    {
+        _extensionManager = extensionManager;
+    }
 
-        public Task<ShellDescriptor> GetShellDescriptorAsync()
+    public Task<ShellDescriptor> GetShellDescriptorAsync()
+    {
+        _shellDescriptor ??= new ShellDescriptor
         {
-            _shellDescriptor ??= new ShellDescriptor
-            {
-                Features = _extensionManager.GetFeatures().Select(x => new ShellFeature { Id = x.Id }).ToList(),
-            };
+            Features = _extensionManager.GetFeatures().Select(x => new ShellFeature { Id = x.Id }).ToList(),
+        };
 
-            return Task.FromResult(_shellDescriptor);
-        }
+        return Task.FromResult(_shellDescriptor);
+    }
 
-        public Task UpdateShellDescriptorAsync(int priorSerialNumber, IEnumerable<ShellFeature> enabledFeatures)
-        {
-            return Task.CompletedTask;
-        }
+    public Task UpdateShellDescriptorAsync(int priorSerialNumber, IEnumerable<ShellFeature> enabledFeatures)
+    {
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/Descriptor/Settings/ConfiguredFeaturesShellDescriptorManager.cs b/src/OrchardCore/OrchardCore/Shell/Descriptor/Settings/ConfiguredFeaturesShellDescriptorManager.cs
index d2d88eac1b8..a9b6a07175e 100644
--- a/src/OrchardCore/OrchardCore/Shell/Descriptor/Settings/ConfiguredFeaturesShellDescriptorManager.cs
+++ b/src/OrchardCore/OrchardCore/Shell/Descriptor/Settings/ConfiguredFeaturesShellDescriptorManager.cs
@@ -6,66 +6,65 @@
 using OrchardCore.Environment.Shell.Configuration;
 using OrchardCore.Environment.Shell.Descriptor.Models;
 
-namespace OrchardCore.Environment.Shell.Descriptor.Settings
+namespace OrchardCore.Environment.Shell.Descriptor.Settings;
+
+/// <summary>
+/// Implements <see cref="IShellDescriptorManager"/> by returning the features from configuration.
+/// </summary>
+public class ConfiguredFeaturesShellDescriptorManager : IShellDescriptorManager
 {
-    /// <summary>
-    /// Implements <see cref="IShellDescriptorManager"/> by returning the features from configuration.
-    /// </summary>
-    public class ConfiguredFeaturesShellDescriptorManager : IShellDescriptorManager
-    {
-        private readonly IShellConfiguration _shellConfiguration;
-        private readonly IEnumerable<ShellFeature> _alwaysEnabledFeatures;
-        private readonly IExtensionManager _extensionManager;
+    private readonly IShellConfiguration _shellConfiguration;
+    private readonly IEnumerable<ShellFeature> _alwaysEnabledFeatures;
+    private readonly IExtensionManager _extensionManager;
 
-        private ShellDescriptor _shellDescriptor;
+    private ShellDescriptor _shellDescriptor;
 
-        public ConfiguredFeaturesShellDescriptorManager(
-            IShellConfiguration shellConfiguration,
-            IEnumerable<ShellFeature> shellFeatures,
-            IExtensionManager extensionManager)
-        {
-            _shellConfiguration = shellConfiguration;
-            _alwaysEnabledFeatures = shellFeatures.Where(f => f.AlwaysEnabled).ToArray();
-            _extensionManager = extensionManager;
-        }
+    public ConfiguredFeaturesShellDescriptorManager(
+        IShellConfiguration shellConfiguration,
+        IEnumerable<ShellFeature> shellFeatures,
+        IExtensionManager extensionManager)
+    {
+        _shellConfiguration = shellConfiguration;
+        _alwaysEnabledFeatures = shellFeatures.Where(f => f.AlwaysEnabled).ToArray();
+        _extensionManager = extensionManager;
+    }
 
-        public async Task<ShellDescriptor> GetShellDescriptorAsync()
+    public async Task<ShellDescriptor> GetShellDescriptorAsync()
+    {
+        if (_shellDescriptor == null)
         {
-            if (_shellDescriptor == null)
-            {
-                var configuredFeatures = new ConfiguredFeatures();
-                _shellConfiguration.Bind(configuredFeatures);
+            var configuredFeatures = new ConfiguredFeatures();
+            _shellConfiguration.Bind(configuredFeatures);
 
-                var features = _alwaysEnabledFeatures
-                    .Concat(configuredFeatures.Features.Select(id => new ShellFeature(id) { AlwaysEnabled = true }))
-                    .Distinct();
+            var features = _alwaysEnabledFeatures
+                .Concat(configuredFeatures.Features.Select(id => new ShellFeature(id) { AlwaysEnabled = true }))
+                .Distinct();
 
-                var featureIds = features.Select(sf => sf.Id).ToArray();
+            var featureIds = features.Select(sf => sf.Id).ToArray();
 
-                var missingDependencies = (await _extensionManager.LoadFeaturesAsync(featureIds))
-                    .Select(entry => entry.Id)
-                    .Except(featureIds)
-                    .Select(id => new ShellFeature(id));
+            var missingDependencies = (await _extensionManager.LoadFeaturesAsync(featureIds))
+                .Select(entry => entry.Id)
+                .Except(featureIds)
+                .Select(id => new ShellFeature(id));
 
-                _shellDescriptor = new ShellDescriptor
-                {
-                    Features = features
-                        .Concat(missingDependencies)
-                        .ToList()
-                };
-            }
-
-            return _shellDescriptor;
+            _shellDescriptor = new ShellDescriptor
+            {
+                Features = features
+                    .Concat(missingDependencies)
+                    .ToList()
+            };
         }
 
-        public Task UpdateShellDescriptorAsync(int priorSerialNumber, IEnumerable<ShellFeature> enabledFeatures)
-        {
-            return Task.CompletedTask;
-        }
+        return _shellDescriptor;
+    }
 
-        private sealed class ConfiguredFeatures
-        {
-            public string[] Features { get; set; } = [];
-        }
+    public Task UpdateShellDescriptorAsync(int priorSerialNumber, IEnumerable<ShellFeature> enabledFeatures)
+    {
+        return Task.CompletedTask;
+    }
+
+    private sealed class ConfiguredFeatures
+    {
+        public string[] Features { get; set; } = [];
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/Descriptor/Settings/SetFeaturesShellDescriptorManager.cs b/src/OrchardCore/OrchardCore/Shell/Descriptor/Settings/SetFeaturesShellDescriptorManager.cs
index 010289ecd46..e9cbddec05f 100644
--- a/src/OrchardCore/OrchardCore/Shell/Descriptor/Settings/SetFeaturesShellDescriptorManager.cs
+++ b/src/OrchardCore/OrchardCore/Shell/Descriptor/Settings/SetFeaturesShellDescriptorManager.cs
@@ -4,50 +4,49 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Environment.Shell.Descriptor.Models;
 
-namespace OrchardCore.Environment.Shell.Descriptor.Settings
+namespace OrchardCore.Environment.Shell.Descriptor.Settings;
+
+/// <summary>
+/// Implements <see cref="IShellDescriptorManager"/> by returning a single tenant with a specified set
+/// of features. This class can be registered as a singleton as its state never changes.
+/// </summary>
+public class SetFeaturesShellDescriptorManager : IShellDescriptorManager
 {
-    /// <summary>
-    /// Implements <see cref="IShellDescriptorManager"/> by returning a single tenant with a specified set
-    /// of features. This class can be registered as a singleton as its state never changes.
-    /// </summary>
-    public class SetFeaturesShellDescriptorManager : IShellDescriptorManager
-    {
-        private readonly IEnumerable<ShellFeature> _shellFeatures;
-        private readonly IExtensionManager _extensionManager;
+    private readonly IEnumerable<ShellFeature> _shellFeatures;
+    private readonly IExtensionManager _extensionManager;
 
-        private ShellDescriptor _shellDescriptor;
+    private ShellDescriptor _shellDescriptor;
 
-        public SetFeaturesShellDescriptorManager(IEnumerable<ShellFeature> shellFeatures, IExtensionManager extensionManager)
-        {
-            _shellFeatures = shellFeatures;
-            _extensionManager = extensionManager;
-        }
+    public SetFeaturesShellDescriptorManager(IEnumerable<ShellFeature> shellFeatures, IExtensionManager extensionManager)
+    {
+        _shellFeatures = shellFeatures;
+        _extensionManager = extensionManager;
+    }
 
-        public async Task<ShellDescriptor> GetShellDescriptorAsync()
+    public async Task<ShellDescriptor> GetShellDescriptorAsync()
+    {
+        if (_shellDescriptor == null)
         {
-            if (_shellDescriptor == null)
+            var featureIds = _shellFeatures.Distinct().Select(sf => sf.Id).ToArray();
+
+            var missingDependencies = (await _extensionManager.LoadFeaturesAsync(featureIds))
+                .Select(entry => entry.Id)
+                .Except(featureIds)
+                .Select(id => new ShellFeature(id));
+
+            _shellDescriptor = new ShellDescriptor
             {
-                var featureIds = _shellFeatures.Distinct().Select(sf => sf.Id).ToArray();
-
-                var missingDependencies = (await _extensionManager.LoadFeaturesAsync(featureIds))
-                    .Select(entry => entry.Id)
-                    .Except(featureIds)
-                    .Select(id => new ShellFeature(id));
-
-                _shellDescriptor = new ShellDescriptor
-                {
-                    Features = _shellFeatures
-                        .Concat(missingDependencies)
-                        .ToList()
-                };
-            }
-
-            return _shellDescriptor;
+                Features = _shellFeatures
+                    .Concat(missingDependencies)
+                    .ToList()
+            };
         }
 
-        public Task UpdateShellDescriptorAsync(int priorSerialNumber, IEnumerable<ShellFeature> enabledFeatures)
-        {
-            return Task.CompletedTask;
-        }
+        return _shellDescriptor;
+    }
+
+    public Task UpdateShellDescriptorAsync(int priorSerialNumber, IEnumerable<ShellFeature> enabledFeatures)
+    {
+        return Task.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/Distributed/DistributedContext.cs b/src/OrchardCore/OrchardCore/Shell/Distributed/DistributedContext.cs
index b49cf5e38fd..088f49162a8 100644
--- a/src/OrchardCore/OrchardCore/Shell/Distributed/DistributedContext.cs
+++ b/src/OrchardCore/OrchardCore/Shell/Distributed/DistributedContext.cs
@@ -5,127 +5,126 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Environment.Shell.Builders;
 
-namespace OrchardCore.Environment.Shell.Distributed
+namespace OrchardCore.Environment.Shell.Distributed;
+
+/// <summary>
+/// Isolated context based on the default tenant settings used to resolve the <see cref="IDistributedCache"/>.
+/// </summary>
+internal sealed class DistributedContext : IDisposable, IAsyncDisposable
 {
+    private readonly ShellContext _context;
+    private volatile int _count;
+    private bool _released;
+
     /// <summary>
-    /// Isolated context based on the default tenant settings used to resolve the <see cref="IDistributedCache"/>.
+    /// Initializes a new <see cref="DistributedContext"/>.
     /// </summary>
-    internal sealed class DistributedContext : IDisposable, IAsyncDisposable
+    public DistributedContext(ShellContext context)
     {
-        private readonly ShellContext _context;
-        private volatile int _count;
-        private bool _released;
-
-        /// <summary>
-        /// Initializes a new <see cref="DistributedContext"/>.
-        /// </summary>
-        public DistributedContext(ShellContext context)
-        {
-            Interlocked.Increment(ref _count);
+        Interlocked.Increment(ref _count);
 
-            // By default marked as using shared settings that should not be disposed.
-            _context = context.WithSharedSettings();
+        // By default marked as using shared settings that should not be disposed.
+        _context = context.WithSharedSettings();
 
-            // If the distributed feature is not enabled, the distributed cache is not set.
-            if (context.ServiceProvider.GetService<DistributedShellMarkerService>() is null)
-            {
-                return;
-            }
-
-            // If the current cache is an in memory cache, the distributed cache is not set.
-            var distributedCache = context.ServiceProvider.GetService<IDistributedCache>();
-            if (distributedCache is null || distributedCache is MemoryDistributedCache)
-            {
-                return;
-            }
+        // If the distributed feature is not enabled, the distributed cache is not set.
+        if (context.ServiceProvider.GetService<DistributedShellMarkerService>() is null)
+        {
+            return;
+        }
 
-            DistributedCache = distributedCache;
+        // If the current cache is an in memory cache, the distributed cache is not set.
+        var distributedCache = context.ServiceProvider.GetService<IDistributedCache>();
+        if (distributedCache is null || distributedCache is MemoryDistributedCache)
+        {
+            return;
         }
 
-        /// <summary>
-        /// Gets the inner <see cref="ShellContext"/>.
-        /// </summary>
-        public ShellContext Context => _context;
+        DistributedCache = distributedCache;
+    }
 
-        /// <summary>
-        /// Gets the resolved <see cref="IDistributedCache"/>.
-        /// </summary>
-        public IDistributedCache DistributedCache { get; }
+    /// <summary>
+    /// Gets the inner <see cref="ShellContext"/>.
+    /// </summary>
+    public ShellContext Context => _context;
 
-        /// <summary>
-        /// Marks this instance as using unshared settings that can be disposed.
-        /// </summary>
-        public DistributedContext WithoutSharedSettings()
-        {
-            _context.WithoutSharedSettings();
-            return this;
-        }
+    /// <summary>
+    /// Gets the resolved <see cref="IDistributedCache"/>.
+    /// </summary>
+    public IDistributedCache DistributedCache { get; }
 
-        /// <summary>
-        /// Tries to acquire this instance.
-        /// </summary>
-        public DistributedContext Acquire()
+    /// <summary>
+    /// Marks this instance as using unshared settings that can be disposed.
+    /// </summary>
+    public DistributedContext WithoutSharedSettings()
+    {
+        _context.WithoutSharedSettings();
+        return this;
+    }
+
+    /// <summary>
+    /// Tries to acquire this instance.
+    /// </summary>
+    public DistributedContext Acquire()
+    {
+        // Don't acquire a released context.
+        if (_released)
         {
-            // Don't acquire a released context.
-            if (_released)
-            {
-                return null;
-            }
-
-            Interlocked.Increment(ref _count);
-
-            // Don't start using a released context.
-            if (_released)
-            {
-                Dispose();
-                return null;
-            }
-
-            return this;
+            return null;
         }
 
-        /// <summary>
-        /// Releases once this instance.
-        /// </summary>
-        public void Release()
+        Interlocked.Increment(ref _count);
+
+        // Don't start using a released context.
+        if (_released)
         {
-            _released = true;
             Dispose();
+            return null;
         }
 
-        /// <summary>
-        /// Releases once this instance.
-        /// </summary>
-        public async Task ReleaseAsync()
-        {
-            _released = true;
-            await DisposeAsync();
-        }
+        return this;
+    }
+
+    /// <summary>
+    /// Releases once this instance.
+    /// </summary>
+    public void Release()
+    {
+        _released = true;
+        Dispose();
+    }
+
+    /// <summary>
+    /// Releases once this instance.
+    /// </summary>
+    public async Task ReleaseAsync()
+    {
+        _released = true;
+        await DisposeAsync();
+    }
 
-        /// <summary>
-        /// Disposes this instance, the last owner dispose the inner <see cref="ShellContext"/>.
-        /// </summary>
-        public void Dispose()
+    /// <summary>
+    /// Disposes this instance, the last owner dispose the inner <see cref="ShellContext"/>.
+    /// </summary>
+    public void Dispose()
+    {
+        // The last use disposes the shell context.
+        if (Interlocked.Decrement(ref _count) == 0)
         {
-            // The last use disposes the shell context.
-            if (Interlocked.Decrement(ref _count) == 0)
-            {
-                _context.Dispose();
-            }
+            _context.Dispose();
         }
+    }
 
-        /// <summary>
-        /// Disposes this instance, the last owner dispose the inner <see cref="ShellContext"/>.
-        /// </summary>
-        public ValueTask DisposeAsync()
+    /// <summary>
+    /// Disposes this instance, the last owner dispose the inner <see cref="ShellContext"/>.
+    /// </summary>
+    public ValueTask DisposeAsync()
+    {
+        // The last use disposes the shell context.
+        if (Interlocked.Decrement(ref _count) == 0)
         {
-            // The last use disposes the shell context.
-            if (Interlocked.Decrement(ref _count) == 0)
-            {
-                return _context.DisposeAsync();
-            }
-
-            return ValueTask.CompletedTask;
+            return _context.DisposeAsync();
         }
+
+        return ValueTask.CompletedTask;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/Distributed/DistributedShellHostedService.cs b/src/OrchardCore/OrchardCore/Shell/Distributed/DistributedShellHostedService.cs
index b78e1ec5797..2a7fc4c12aa 100644
--- a/src/OrchardCore/OrchardCore/Shell/Distributed/DistributedShellHostedService.cs
+++ b/src/OrchardCore/OrchardCore/Shell/Distributed/DistributedShellHostedService.cs
@@ -11,821 +11,820 @@
 using OrchardCore.Environment.Shell.Removing;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Environment.Shell.Distributed
+namespace OrchardCore.Environment.Shell.Distributed;
+
+/// <summary>
+/// Keep in sync tenants by sharing shell identifiers through an <see cref="IDistributedCache"/>.
+/// </summary>
+internal sealed class DistributedShellHostedService : BackgroundService
 {
-    /// <summary>
-    /// Keep in sync tenants by sharing shell identifiers through an <see cref="IDistributedCache"/>.
-    /// </summary>
-    internal sealed class DistributedShellHostedService : BackgroundService
-    {
-        private const string DistributedFeatureId = "OrchardCore.Tenants.Distributed";
+    private const string DistributedFeatureId = "OrchardCore.Tenants.Distributed";
 
-        private const string ShellChangedIdKey = "SHELL_CHANGED_ID";
-        private const string ShellCountChangedIdKey = "SHELL_COUNT_CHANGED_ID";
-        private const string ReleaseIdKeySuffix = "_RELEASE_ID";
-        private const string ReloadIdKeySuffix = "_RELOAD_ID";
+    private const string ShellChangedIdKey = "SHELL_CHANGED_ID";
+    private const string ShellCountChangedIdKey = "SHELL_COUNT_CHANGED_ID";
+    private const string ReleaseIdKeySuffix = "_RELEASE_ID";
+    private const string ReloadIdKeySuffix = "_RELOAD_ID";
 
-        private static readonly TimeSpan _minIdleTime = TimeSpan.FromSeconds(1);
-        private static readonly TimeSpan _maxRetryTime = TimeSpan.FromMinutes(1);
-        private static readonly TimeSpan _maxBusyTime = TimeSpan.FromSeconds(2);
+    private static readonly TimeSpan _minIdleTime = TimeSpan.FromSeconds(1);
+    private static readonly TimeSpan _maxRetryTime = TimeSpan.FromMinutes(1);
+    private static readonly TimeSpan _maxBusyTime = TimeSpan.FromSeconds(2);
 
-        private readonly IShellHost _shellHost;
-        private readonly IShellContextFactory _shellContextFactory;
-        private readonly IShellSettingsManager _shellSettingsManager;
-        private readonly IShellRemovalManager _shellRemovingManager;
-        private readonly ILogger _logger;
+    private readonly IShellHost _shellHost;
+    private readonly IShellContextFactory _shellContextFactory;
+    private readonly IShellSettingsManager _shellSettingsManager;
+    private readonly IShellRemovalManager _shellRemovingManager;
+    private readonly ILogger _logger;
 
-        private readonly ConcurrentDictionary<string, ShellIdentifier> _identifiers = new();
-        private readonly ConcurrentDictionary<string, SemaphoreSlim> _semaphores = new();
+    private readonly ConcurrentDictionary<string, ShellIdentifier> _identifiers = new();
+    private readonly ConcurrentDictionary<string, SemaphoreSlim> _semaphores = new();
 
-        private string _shellChangedId;
-        private string _shellCountChangedId;
+    private string _shellChangedId;
+    private string _shellCountChangedId;
 
-        private long _defaultContextUtcTicks;
-        private DistributedContext _context;
+    private long _defaultContextUtcTicks;
+    private DistributedContext _context;
 
-        private DateTime _busyStartTime;
-        private bool _terminated;
+    private DateTime _busyStartTime;
+    private bool _terminated;
 
-        public DistributedShellHostedService(
-            IShellHost shellHost,
-            IShellContextFactory shellContextFactory,
-            IShellSettingsManager shellSettingsManager,
-            IShellRemovalManager shellRemovingManager,
-            ILogger<DistributedShellHostedService> logger)
-        {
-            _shellHost = shellHost;
-            _shellContextFactory = shellContextFactory;
-            _shellSettingsManager = shellSettingsManager;
-            _shellRemovingManager = shellRemovingManager;
-            _logger = logger;
+    public DistributedShellHostedService(
+        IShellHost shellHost,
+        IShellContextFactory shellContextFactory,
+        IShellSettingsManager shellSettingsManager,
+        IShellRemovalManager shellRemovingManager,
+        ILogger<DistributedShellHostedService> logger)
+    {
+        _shellHost = shellHost;
+        _shellContextFactory = shellContextFactory;
+        _shellSettingsManager = shellSettingsManager;
+        _shellRemovingManager = shellRemovingManager;
+        _logger = logger;
+
+        shellHost.LoadingAsync += LoadingAsync;
+        shellHost.ReleasingAsync += ReleasingAsync;
+        shellHost.ReloadingAsync += ReloadingAsync;
+        shellHost.RemovingAsync += RemovingAsync;
+    }
 
-            shellHost.LoadingAsync += LoadingAsync;
-            shellHost.ReleasingAsync += ReleasingAsync;
-            shellHost.ReloadingAsync += ReloadingAsync;
-            shellHost.RemovingAsync += RemovingAsync;
-        }
+    /// <summary>
+    /// Keep in sync tenants by sharing shell identifiers through an <see cref="IDistributedCache"/>.
+    /// </summary>
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        // The syncing period in seconds of the default tenant while it is 'Uninitialized'.
+        const int DefaultTenantSyncingPeriod = 20;
 
-        /// <summary>
-        /// Keep in sync tenants by sharing shell identifiers through an <see cref="IDistributedCache"/>.
-        /// </summary>
-        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+        stoppingToken.Register(() =>
         {
-            // The syncing period in seconds of the default tenant while it is 'Uninitialized'.
-            const int DefaultTenantSyncingPeriod = 20;
+            _logger.LogInformation("'{ServiceName}' is stopping.", nameof(DistributedShellHostedService));
+        });
 
-            stoppingToken.Register(() =>
+        // Init the idle time.
+        var idleTime = _minIdleTime;
+
+        // Init the second counter used to sync the default tenant while it is 'Uninitialized'.
+        var defaultTenantSyncingSeconds = 0;
+
+        while (!stoppingToken.IsCancellationRequested)
+        {
+            try
             {
-                _logger.LogInformation("'{ServiceName}' is stopping.", nameof(DistributedShellHostedService));
-            });
+                // Wait for the current idle time on each loop.
+                if (!await TryWaitAsync(idleTime, stoppingToken))
+                {
+                    break;
+                }
 
-            // Init the idle time.
-            var idleTime = _minIdleTime;
+                // If there is no default tenant, nothing to do.
+                if (!_shellHost.TryGetShellContext(ShellSettings.DefaultShellName, out var defaultContext))
+                {
+                    continue;
+                }
 
-            // Init the second counter used to sync the default tenant while it is 'Uninitialized'.
-            var defaultTenantSyncingSeconds = 0;
+                // Manage the second counter used to sync the default tenant while it is 'Uninitialized'.
+                defaultTenantSyncingSeconds = defaultContext.Settings.IsUninitialized()
+                    ? defaultTenantSyncingSeconds
+                    : 0;
 
-            while (!stoppingToken.IsCancellationRequested)
-            {
-                try
+                // Check periodically if the default tenant is still 'Uninitialized'.
+                if (defaultTenantSyncingSeconds++ > DefaultTenantSyncingPeriod)
                 {
-                    // Wait for the current idle time on each loop.
-                    if (!await TryWaitAsync(idleTime, stoppingToken))
-                    {
-                        break;
-                    }
+                    defaultTenantSyncingSeconds = 0;
+
+                    // Load the settings of the default tenant that may have been setup by another instance.
+                    using var loadedDefaultSettings = (await _shellSettingsManager
+                        .LoadSettingsAsync(ShellSettings.DefaultShellName))
+                        .AsDisposable();
 
-                    // If there is no default tenant, nothing to do.
-                    if (!_shellHost.TryGetShellContext(ShellSettings.DefaultShellName, out var defaultContext))
+                    if (loadedDefaultSettings.IsRunning())
                     {
-                        continue;
+                        // If the default tenant has been setup by another instance, reload it locally.
+                        await _shellHost.ReloadShellContextAsync(defaultContext.Settings, eventSource: false);
                     }
 
-                    // Manage the second counter used to sync the default tenant while it is 'Uninitialized'.
-                    defaultTenantSyncingSeconds = defaultContext.Settings.IsUninitialized()
-                        ? defaultTenantSyncingSeconds
-                        : 0;
+                    continue;
+                }
 
-                    // Check periodically if the default tenant is still 'Uninitialized'.
-                    if (defaultTenantSyncingSeconds++ > DefaultTenantSyncingPeriod)
-                    {
-                        defaultTenantSyncingSeconds = 0;
+                // If the default tenant is not running, nothing to do.
+                if (!defaultContext.Settings.IsRunning())
+                {
+                    continue;
+                }
 
-                        // Load the settings of the default tenant that may have been setup by another instance.
-                        using var loadedDefaultSettings = (await _shellSettingsManager
-                            .LoadSettingsAsync(ShellSettings.DefaultShellName))
-                            .AsDisposable();
+                // Get or create a new distributed context if the default tenant has changed.
+                var context = await GetOrCreateDistributedContextAsync(defaultContext);
 
-                        if (loadedDefaultSettings.IsRunning())
-                        {
-                            // If the default tenant has been setup by another instance, reload it locally.
-                            await _shellHost.ReloadShellContextAsync(defaultContext.Settings, eventSource: false);
-                        }
+                // If the required distributed features are not enabled, nothing to do.
+                var distributedCache = context?.DistributedCache;
+                if (distributedCache is null)
+                {
+                    continue;
+                }
 
-                        continue;
-                    }
+                // Try to retrieve the tenant changed global identifier from the distributed cache.
+                string shellChangedId;
+                try
+                {
+                    shellChangedId = await distributedCache.GetStringAsync(ShellChangedIdKey, CancellationToken.None);
+                }
+                catch (Exception ex) when (!ex.IsFatal())
+                {
+                    // Get the next idle time before retrying to read the distributed cache.
+                    idleTime = NextIdleTimeBeforeRetry(idleTime, ex);
+                    continue;
+                }
 
-                    // If the default tenant is not running, nothing to do.
-                    if (!defaultContext.Settings.IsRunning())
-                    {
-                        continue;
-                    }
+                // Reset the idle time.
+                idleTime = _minIdleTime;
 
-                    // Get or create a new distributed context if the default tenant has changed.
-                    var context = await GetOrCreateDistributedContextAsync(defaultContext);
+                // Check if at least one tenant has changed.
+                if (shellChangedId is null || _shellChangedId == shellChangedId)
+                {
+                    continue;
+                }
 
-                    // If the required distributed features are not enabled, nothing to do.
-                    var distributedCache = context?.DistributedCache;
-                    if (distributedCache is null)
-                    {
-                        continue;
-                    }
+                // Try to retrieve the tenant list changed global identifier from the distributed cache.
+                string shellCountChangedId;
+                try
+                {
+                    shellCountChangedId = await distributedCache.GetStringAsync(ShellCountChangedIdKey, CancellationToken.None);
+                }
+                catch (Exception ex) when (!ex.IsFatal())
+                {
+                    _logger.LogError(ex, "Unable to read the distributed cache before checking if a tenant has been created or removed.");
+                    continue;
+                }
 
-                    // Try to retrieve the tenant changed global identifier from the distributed cache.
-                    string shellChangedId;
-                    try
-                    {
-                        shellChangedId = await distributedCache.GetStringAsync(ShellChangedIdKey, CancellationToken.None);
-                    }
-                    catch (Exception ex) when (!ex.IsFatal())
-                    {
-                        // Get the next idle time before retrying to read the distributed cache.
-                        idleTime = NextIdleTimeBeforeRetry(idleTime, ex);
-                        continue;
-                    }
+                // Retrieve all tenant settings that are loaded locally.
+                var loadedSettings = _shellHost.GetAllSettings().ToList();
+                var tenantsToRemove = Array.Empty<string>();
+                var tenantsToCreate = Array.Empty<string>();
 
-                    // Reset the idle time.
-                    idleTime = _minIdleTime;
+                // Check if at least one tenant has been created or removed.
+                if (shellCountChangedId is not null && _shellCountChangedId != shellCountChangedId)
+                {
+                    var sharedTenants = await _shellSettingsManager.LoadSettingsNamesAsync();
+                    var loadedTenants = loadedSettings.Select(s => s.Name);
 
-                    // Check if at least one tenant has changed.
-                    if (shellChangedId is null || _shellChangedId == shellChangedId)
-                    {
-                        continue;
-                    }
+                    // Retrieve all new created tenants that are not already loaded.
+                    tenantsToCreate = sharedTenants.Except(loadedTenants).ToArray();
 
-                    // Try to retrieve the tenant list changed global identifier from the distributed cache.
-                    string shellCountChangedId;
-                    try
-                    {
-                        shellCountChangedId = await distributedCache.GetStringAsync(ShellCountChangedIdKey, CancellationToken.None);
-                    }
-                    catch (Exception ex) when (!ex.IsFatal())
+                    // Load all new created tenants.
+                    foreach (var tenant in tenantsToCreate)
                     {
-                        _logger.LogError(ex, "Unable to read the distributed cache before checking if a tenant has been created or removed.");
-                        continue;
+                        loadedSettings.Add((await _shellSettingsManager
+                            .LoadSettingsAsync(tenant))
+                            .AsDisposable());
                     }
 
-                    // Retrieve all tenant settings that are loaded locally.
-                    var loadedSettings = _shellHost.GetAllSettings().ToList();
-                    var tenantsToRemove = Array.Empty<string>();
-                    var tenantsToCreate = Array.Empty<string>();
-
-                    // Check if at least one tenant has been created or removed.
-                    if (shellCountChangedId is not null && _shellCountChangedId != shellCountChangedId)
-                    {
-                        var sharedTenants = await _shellSettingsManager.LoadSettingsNamesAsync();
-                        var loadedTenants = loadedSettings.Select(s => s.Name);
+                    // Retrieve all removed tenants that are not yet removed locally.
+                    tenantsToRemove = loadedTenants.Except(sharedTenants).ToArray();
+                }
 
-                        // Retrieve all new created tenants that are not already loaded.
-                        tenantsToCreate = sharedTenants.Except(loadedTenants).ToArray();
+                // Init the busy start time.
+                var _busyStartTime = DateTime.UtcNow;
+                var syncingSuccess = true;
 
-                        // Load all new created tenants.
-                        foreach (var tenant in tenantsToCreate)
-                        {
-                            loadedSettings.Add((await _shellSettingsManager
-                                .LoadSettingsAsync(tenant))
-                                .AsDisposable());
-                        }
+                // Keep in sync all tenants by checking their specific identifiers.
+                foreach (var settings in loadedSettings)
+                {
+                    // Newly loaded settings from the configuration should be disposed.
+                    using var disposable = tenantsToCreate.Contains(settings.Name) ? settings : null;
 
-                        // Retrieve all removed tenants that are not yet removed locally.
-                        tenantsToRemove = loadedTenants.Except(sharedTenants).ToArray();
+                    // Wait for the min idle time after the max busy time.
+                    if (!await TryWaitAfterBusyTime(stoppingToken))
+                    {
+                        break;
                     }
 
-                    // Init the busy start time.
-                    var _busyStartTime = DateTime.UtcNow;
-                    var syncingSuccess = true;
-
-                    // Keep in sync all tenants by checking their specific identifiers.
-                    foreach (var settings in loadedSettings)
+                    var semaphore = _semaphores.GetOrAdd(settings.Name, name => new SemaphoreSlim(1));
+                    await semaphore.WaitAsync(CancellationToken.None);
+                    try
                     {
-                        // Newly loaded settings from the configuration should be disposed.
-                        using var disposable = tenantsToCreate.Contains(settings.Name) ? settings : null;
-
-                        // Wait for the min idle time after the max busy time.
-                        if (!await TryWaitAfterBusyTime(stoppingToken))
+                        // Try to retrieve the release identifier of this tenant from the distributed cache.
+                        var releaseId = await distributedCache.GetStringAsync(ReleaseIdKey(settings.Name), CancellationToken.None);
+                        if (releaseId is not null && !tenantsToCreate.Contains(settings.Name))
                         {
-                            break;
+                            // Check if the release identifier of this tenant has changed.
+                            var identifier = _identifiers.GetOrAdd(settings.Name, name => new ShellIdentifier());
+                            if (identifier.ReleaseId != releaseId)
+                            {
+                                // Update the local identifier.
+                                identifier.ReleaseId = releaseId;
+
+                                // Keep in sync this tenant by releasing it locally.
+                                await _shellHost.ReleaseShellContextAsync(settings, eventSource: false);
+                            }
                         }
 
-                        var semaphore = _semaphores.GetOrAdd(settings.Name, name => new SemaphoreSlim(1));
-                        await semaphore.WaitAsync(CancellationToken.None);
-                        try
+                        // Try to retrieve the reload identifier of this tenant from the distributed cache.
+                        var reloadId = await distributedCache.GetStringAsync(ReloadIdKey(settings.Name), CancellationToken.None);
+                        if (reloadId is not null)
                         {
-                            // Try to retrieve the release identifier of this tenant from the distributed cache.
-                            var releaseId = await distributedCache.GetStringAsync(ReleaseIdKey(settings.Name), CancellationToken.None);
-                            if (releaseId is not null && !tenantsToCreate.Contains(settings.Name))
+                            // Check if the reload identifier of this tenant has changed.
+                            var identifier = _identifiers.GetOrAdd(settings.Name, name => new ShellIdentifier());
+                            if (identifier.ReloadId != reloadId)
                             {
-                                // Check if the release identifier of this tenant has changed.
-                                var identifier = _identifiers.GetOrAdd(settings.Name, name => new ShellIdentifier());
-                                if (identifier.ReleaseId != releaseId)
+                                // Update the local identifier.
+                                identifier.ReloadId = reloadId;
+
+                                // For a new tenant also update the release identifier.
+                                if (tenantsToCreate.Contains(settings.Name))
                                 {
-                                    // Update the local identifier.
                                     identifier.ReleaseId = releaseId;
-
-                                    // Keep in sync this tenant by releasing it locally.
-                                    await _shellHost.ReleaseShellContextAsync(settings, eventSource: false);
                                 }
+
+                                // Keep in sync this tenant by reloading it locally.
+                                await _shellHost.ReloadShellContextAsync(settings, eventSource: false);
                             }
+                        }
 
-                            // Try to retrieve the reload identifier of this tenant from the distributed cache.
-                            var reloadId = await distributedCache.GetStringAsync(ReloadIdKey(settings.Name), CancellationToken.None);
-                            if (reloadId is not null)
+                        // Check if the tenant needs to be removed locally.
+                        if (!settings.IsDefaultShell() && tenantsToRemove.Contains(settings.Name))
+                        {
+                            // The local resources can only be removed if the tenant is 'Disabled' or 'Uninitialized'.
+                            if (settings.IsRemovable())
                             {
-                                // Check if the reload identifier of this tenant has changed.
-                                var identifier = _identifiers.GetOrAdd(settings.Name, name => new ShellIdentifier());
-                                if (identifier.ReloadId != reloadId)
+                                // Keep in sync this tenant by removing its local (non shared) resources.
+                                var removingContext = await _shellRemovingManager.RemoveAsync(settings, localResourcesOnly: true);
+                                if (removingContext.FailedOnLockTimeout)
                                 {
-                                    // Update the local identifier.
-                                    identifier.ReloadId = reloadId;
-
-                                    // For a new tenant also update the release identifier.
-                                    if (tenantsToCreate.Contains(settings.Name))
-                                    {
-                                        identifier.ReleaseId = releaseId;
-                                    }
-
-                                    // Keep in sync this tenant by reloading it locally.
-                                    await _shellHost.ReloadShellContextAsync(settings, eventSource: false);
+                                    // If it only failed to acquire a lock, let it retry on the next loop.
+                                    syncingSuccess = false;
                                 }
-                            }
-
-                            // Check if the tenant needs to be removed locally.
-                            if (!settings.IsDefaultShell() && tenantsToRemove.Contains(settings.Name))
-                            {
-                                // The local resources can only be removed if the tenant is 'Disabled' or 'Uninitialized'.
-                                if (settings.IsRemovable())
+                                else
                                 {
-                                    // Keep in sync this tenant by removing its local (non shared) resources.
-                                    var removingContext = await _shellRemovingManager.RemoveAsync(settings, localResourcesOnly: true);
-                                    if (removingContext.FailedOnLockTimeout)
-                                    {
-                                        // If it only failed to acquire a lock, let it retry on the next loop.
-                                        syncingSuccess = false;
-                                    }
-                                    else
-                                    {
-                                        // Otherwise, keep in sync this tenant by removing the shell locally.
-                                        await _shellHost.RemoveShellContextAsync(settings, eventSource: false);
-
-                                        // Cleanup local dictionaries.
-                                        _identifiers.TryRemove(settings.Name, out _);
-                                        _semaphores.TryRemove(settings.Name, out _);
-                                    }
+                                    // Otherwise, keep in sync this tenant by removing the shell locally.
+                                    await _shellHost.RemoveShellContextAsync(settings, eventSource: false);
+
+                                    // Cleanup local dictionaries.
+                                    _identifiers.TryRemove(settings.Name, out _);
+                                    _semaphores.TryRemove(settings.Name, out _);
                                 }
                             }
                         }
-                        catch (Exception ex) when (!ex.IsFatal())
-                        {
-                            syncingSuccess = false;
-                            _logger.LogError(ex, "Unexpected error while syncing the tenant '{TenantName}'.", settings.Name);
-                            break;
-                        }
-                        finally
-                        {
-                            semaphore.Release();
-                        }
                     }
-
-                    // Keep in sync the tenant global identifiers.
-                    if (syncingSuccess)
+                    catch (Exception ex) when (!ex.IsFatal())
+                    {
+                        syncingSuccess = false;
+                        _logger.LogError(ex, "Unexpected error while syncing the tenant '{TenantName}'.", settings.Name);
+                        break;
+                    }
+                    finally
                     {
-                        _shellChangedId = shellChangedId;
-                        _shellCountChangedId = shellCountChangedId;
+                        semaphore.Release();
                     }
                 }
-                catch (Exception ex) when (!ex.IsFatal())
+
+                // Keep in sync the tenant global identifiers.
+                if (syncingSuccess)
                 {
-                    _logger.LogError(ex, "Error while executing '{ServiceName}'", nameof(DistributedShellHostedService));
+                    _shellChangedId = shellChangedId;
+                    _shellCountChangedId = shellCountChangedId;
                 }
             }
-
-            _terminated = true;
-
-            _shellHost.LoadingAsync -= LoadingAsync;
-            _shellHost.ReleasingAsync -= ReleasingAsync;
-            _shellHost.ReloadingAsync -= ReloadingAsync;
-            _shellHost.RemovingAsync -= RemovingAsync;
-
-            if (_context is not null)
+            catch (Exception ex) when (!ex.IsFatal())
             {
-                await _context.ReleaseAsync();
+                _logger.LogError(ex, "Error while executing '{ServiceName}'", nameof(DistributedShellHostedService));
             }
+        }
 
-            _context = null;
-
-            foreach (var semaphore in _semaphores.Values)
-            {
-                semaphore.Dispose();
-            }
+        _terminated = true;
 
-            _semaphores.Clear();
-        }
+        _shellHost.LoadingAsync -= LoadingAsync;
+        _shellHost.ReleasingAsync -= ReleasingAsync;
+        _shellHost.ReloadingAsync -= ReloadingAsync;
+        _shellHost.RemovingAsync -= RemovingAsync;
 
-        /// <summary>
-        /// Called before loading all tenants to initialize the local shell identifiers from the distributed cache.
-        /// </summary>
-        public async Task LoadingAsync()
+        if (_context is not null)
         {
-            if (_terminated)
-            {
-                return;
-            }
+            await _context.ReleaseAsync();
+        }
 
-            // Load a first isolated configuration before the default context is initialized.
-            var defaultSettings = (await _shellSettingsManager
-                .LoadSettingsAsync(ShellSettings.DefaultShellName))
-                .AsDisposable();
+        _context = null;
 
-            // If there is no default tenant or it is not running, nothing to do.
-            if (!defaultSettings.IsRunning())
-            {
-                defaultSettings.Dispose();
-                return;
-            }
+        foreach (var semaphore in _semaphores.Values)
+        {
+            semaphore.Dispose();
+        }
 
-            // Create a distributed context based on the first loaded isolated configuration.
-            var context = _context = (await CreateDistributedContextAsync(defaultSettings))
-                ?.WithoutSharedSettings();
+        _semaphores.Clear();
+    }
 
-            if (context is null)
-            {
-                defaultSettings.Dispose();
-                return;
-            }
+    /// <summary>
+    /// Called before loading all tenants to initialize the local shell identifiers from the distributed cache.
+    /// </summary>
+    public async Task LoadingAsync()
+    {
+        if (_terminated)
+        {
+            return;
+        }
 
-            // If the required distributed features are not enabled, nothing to do.
-            var distributedCache = context.DistributedCache;
-            if (distributedCache is null)
-            {
-                return;
-            }
+        // Load a first isolated configuration before the default context is initialized.
+        var defaultSettings = (await _shellSettingsManager
+            .LoadSettingsAsync(ShellSettings.DefaultShellName))
+            .AsDisposable();
 
-            try
-            {
-                // Retrieve the tenant global identifiers from the distributed cache.
-                var shellChangedId = await distributedCache.GetStringAsync(ShellChangedIdKey);
-                var shellCountChangedId = await distributedCache.GetStringAsync(ShellCountChangedIdKey);
+        // If there is no default tenant or it is not running, nothing to do.
+        if (!defaultSettings.IsRunning())
+        {
+            defaultSettings.Dispose();
+            return;
+        }
 
-                // Retrieve the names of all the tenants.
-                var names = await _shellSettingsManager.LoadSettingsNamesAsync();
-                foreach (var name in names)
-                {
-                    // Retrieve the release identifier of this tenant from the distributed cache.
-                    var releaseId = await distributedCache.GetStringAsync(ReleaseIdKey(name));
-                    if (releaseId is not null)
-                    {
-                        // Initialize the release identifier of this tenant in the local collection.
-                        var identifier = _identifiers.GetOrAdd(name, name => new ShellIdentifier());
-                        identifier.ReleaseId = releaseId;
-                    }
+        // Create a distributed context based on the first loaded isolated configuration.
+        var context = _context = (await CreateDistributedContextAsync(defaultSettings))
+            ?.WithoutSharedSettings();
 
-                    // Retrieve the reload identifier of this tenant from the distributed cache.
-                    var reloadId = await distributedCache.GetStringAsync(ReloadIdKey(name));
-                    if (reloadId is not null)
-                    {
-                        // Initialize the reload identifier of this tenant in the local collection.
-                        var identifier = _identifiers.GetOrAdd(name, name => new ShellIdentifier());
-                        identifier.ReloadId = reloadId;
-                    }
-                }
+        if (context is null)
+        {
+            defaultSettings.Dispose();
+            return;
+        }
 
-                // Keep in sync the tenant global identifiers.
-                _shellChangedId = shellChangedId;
-                _shellCountChangedId = shellCountChangedId;
-            }
-            catch (Exception ex) when (!ex.IsFatal())
-            {
-                _logger.LogError(ex, "Unable to read the distributed cache before loading all tenants.");
-            }
+        // If the required distributed features are not enabled, nothing to do.
+        var distributedCache = context.DistributedCache;
+        if (distributedCache is null)
+        {
+            return;
         }
 
-        /// <summary>
-        /// Called before releasing a tenant to update the related shell identifiers, locally and in the distributed cache.
-        /// </summary>
-        public async Task ReleasingAsync(string name)
+        try
         {
-            if (_terminated)
-            {
-                return;
-            }
+            // Retrieve the tenant global identifiers from the distributed cache.
+            var shellChangedId = await distributedCache.GetStringAsync(ShellChangedIdKey);
+            var shellCountChangedId = await distributedCache.GetStringAsync(ShellCountChangedIdKey);
 
-            // If there is no default tenant or it is not running, nothing to do.
-            if (!_shellHost.TryGetShellContext(ShellSettings.DefaultShellName, out var defaultContext) ||
-                !defaultContext.Settings.IsRunning())
+            // Retrieve the names of all the tenants.
+            var names = await _shellSettingsManager.LoadSettingsNamesAsync();
+            foreach (var name in names)
             {
-                return;
-            }
-
-            // Acquire the distributed context or create a new one if not yet built.
-            await using var context = await AcquireOrCreateDistributedContextAsync(defaultContext);
+                // Retrieve the release identifier of this tenant from the distributed cache.
+                var releaseId = await distributedCache.GetStringAsync(ReleaseIdKey(name));
+                if (releaseId is not null)
+                {
+                    // Initialize the release identifier of this tenant in the local collection.
+                    var identifier = _identifiers.GetOrAdd(name, name => new ShellIdentifier());
+                    identifier.ReleaseId = releaseId;
+                }
 
-            // If the required distributed features are not enabled, nothing to do.
-            var distributedCache = context?.DistributedCache;
-            if (distributedCache is null)
-            {
-                return;
+                // Retrieve the reload identifier of this tenant from the distributed cache.
+                var reloadId = await distributedCache.GetStringAsync(ReloadIdKey(name));
+                if (reloadId is not null)
+                {
+                    // Initialize the reload identifier of this tenant in the local collection.
+                    var identifier = _identifiers.GetOrAdd(name, name => new ShellIdentifier());
+                    identifier.ReloadId = reloadId;
+                }
             }
 
-            var semaphore = _semaphores.GetOrAdd(name, name => new SemaphoreSlim(1));
-            await semaphore.WaitAsync();
-            try
-            {
-                // Update this tenant in the local collection with a new release identifier.
-                var identifier = _identifiers.GetOrAdd(name, name => new ShellIdentifier());
-                identifier.ReleaseId = IdGenerator.GenerateId();
-
-                // Update the release identifier of this tenant in the distributed cache.
-                await distributedCache.SetStringAsync(ReleaseIdKey(name), identifier.ReleaseId);
+            // Keep in sync the tenant global identifiers.
+            _shellChangedId = shellChangedId;
+            _shellCountChangedId = shellCountChangedId;
+        }
+        catch (Exception ex) when (!ex.IsFatal())
+        {
+            _logger.LogError(ex, "Unable to read the distributed cache before loading all tenants.");
+        }
+    }
 
-                // Also update the global identifier specifying that a tenant has changed.
-                await distributedCache.SetStringAsync(ShellChangedIdKey, identifier.ReleaseId);
-            }
-            catch (Exception ex) when (!ex.IsFatal())
-            {
-                _logger.LogError(ex, "Unable to update the distributed cache before releasing the tenant '{TenantName}'.", name);
-            }
-            finally
-            {
-                semaphore.Release();
-            }
+    /// <summary>
+    /// Called before releasing a tenant to update the related shell identifiers, locally and in the distributed cache.
+    /// </summary>
+    public async Task ReleasingAsync(string name)
+    {
+        if (_terminated)
+        {
+            return;
         }
 
-        /// <summary>
-        /// Called before reloading a tenant to update the related shell identifiers, locally and in the distributed cache.
-        /// </summary>
-        public async Task ReloadingAsync(string name)
+        // If there is no default tenant or it is not running, nothing to do.
+        if (!_shellHost.TryGetShellContext(ShellSettings.DefaultShellName, out var defaultContext) ||
+            !defaultContext.Settings.IsRunning())
         {
-            if (_terminated)
-            {
-                return;
-            }
+            return;
+        }
 
-            // If there is no default tenant or it is not running, nothing to do.
-            if (!_shellHost.TryGetShellContext(ShellSettings.DefaultShellName, out var defaultContext) ||
-                !defaultContext.Settings.IsRunning())
-            {
-                return;
-            }
+        // Acquire the distributed context or create a new one if not yet built.
+        await using var context = await AcquireOrCreateDistributedContextAsync(defaultContext);
 
-            // Acquire the distributed context or create a new one if not yet built.
-            await using var context = await AcquireOrCreateDistributedContextAsync(defaultContext);
+        // If the required distributed features are not enabled, nothing to do.
+        var distributedCache = context?.DistributedCache;
+        if (distributedCache is null)
+        {
+            return;
+        }
 
-            // If the context still uses the first isolated configuration.
-            if (context is not null && !context.Context.SharedSettings)
-            {
-                // Reset the serial number so that a new context will be built.
-                context.Context.Blueprint.Descriptor.SerialNumber = 0;
-            }
+        var semaphore = _semaphores.GetOrAdd(name, name => new SemaphoreSlim(1));
+        await semaphore.WaitAsync();
+        try
+        {
+            // Update this tenant in the local collection with a new release identifier.
+            var identifier = _identifiers.GetOrAdd(name, name => new ShellIdentifier());
+            identifier.ReleaseId = IdGenerator.GenerateId();
 
-            // If the required distributed features are not enabled, nothing to do.
-            var distributedCache = context?.DistributedCache;
-            if (distributedCache is null)
-            {
-                return;
-            }
+            // Update the release identifier of this tenant in the distributed cache.
+            await distributedCache.SetStringAsync(ReleaseIdKey(name), identifier.ReleaseId);
 
-            var semaphore = _semaphores.GetOrAdd(name, name => new SemaphoreSlim(1));
-            await semaphore.WaitAsync();
-            try
-            {
-                // Update this tenant in the local collection with a new reload identifier.
-                var identifier = _identifiers.GetOrAdd(name, name => new ShellIdentifier());
-                identifier.ReloadId = IdGenerator.GenerateId();
+            // Also update the global identifier specifying that a tenant has changed.
+            await distributedCache.SetStringAsync(ShellChangedIdKey, identifier.ReleaseId);
+        }
+        catch (Exception ex) when (!ex.IsFatal())
+        {
+            _logger.LogError(ex, "Unable to update the distributed cache before releasing the tenant '{TenantName}'.", name);
+        }
+        finally
+        {
+            semaphore.Release();
+        }
+    }
 
-                // Update the reload identifier of this tenant in the distributed cache.
-                await distributedCache.SetStringAsync(ReloadIdKey(name), identifier.ReloadId);
+    /// <summary>
+    /// Called before reloading a tenant to update the related shell identifiers, locally and in the distributed cache.
+    /// </summary>
+    public async Task ReloadingAsync(string name)
+    {
+        if (_terminated)
+        {
+            return;
+        }
 
-                // Check if it is a new created tenant that has not been already loaded.
-                if (!name.IsDefaultShellName() && !_shellHost.TryGetSettings(name, out _))
-                {
-                    // Also update the global identifier specifying that a tenant has been created.
-                    await distributedCache.SetStringAsync(ShellCountChangedIdKey, identifier.ReloadId);
-                }
+        // If there is no default tenant or it is not running, nothing to do.
+        if (!_shellHost.TryGetShellContext(ShellSettings.DefaultShellName, out var defaultContext) ||
+            !defaultContext.Settings.IsRunning())
+        {
+            return;
+        }
 
-                // Also update the global identifier specifying that a tenant has changed.
-                await distributedCache.SetStringAsync(ShellChangedIdKey, identifier.ReloadId);
-            }
-            catch (Exception ex) when (!ex.IsFatal())
-            {
-                _logger.LogError(ex, "Unable to update the distributed cache before reloading the tenant '{TenantName}'.", name);
-            }
-            finally
-            {
-                semaphore.Release();
-            }
+        // Acquire the distributed context or create a new one if not yet built.
+        await using var context = await AcquireOrCreateDistributedContextAsync(defaultContext);
+
+        // If the context still uses the first isolated configuration.
+        if (context is not null && !context.Context.SharedSettings)
+        {
+            // Reset the serial number so that a new context will be built.
+            context.Context.Blueprint.Descriptor.SerialNumber = 0;
         }
 
-        /// <summary>
-        /// Called before removing a tenant to update the related shell identifiers, locally and in the distributed cache.
-        /// </summary>
-        public async Task RemovingAsync(string name)
+        // If the required distributed features are not enabled, nothing to do.
+        var distributedCache = context?.DistributedCache;
+        if (distributedCache is null)
         {
-            // The 'Default' tenant can't be removed.
-            if (_terminated || name.IsDefaultShellName())
-            {
-                return;
-            }
+            return;
+        }
 
-            // If there is no default tenant or it is not running, nothing to do.
-            if (!_shellHost.TryGetShellContext(ShellSettings.DefaultShellName, out var defaultContext) ||
-                !defaultContext.Settings.IsRunning())
-            {
-                return;
-            }
+        var semaphore = _semaphores.GetOrAdd(name, name => new SemaphoreSlim(1));
+        await semaphore.WaitAsync();
+        try
+        {
+            // Update this tenant in the local collection with a new reload identifier.
+            var identifier = _identifiers.GetOrAdd(name, name => new ShellIdentifier());
+            identifier.ReloadId = IdGenerator.GenerateId();
 
-            // Acquire the distributed context or create a new one if not yet built.
-            await using var context = await AcquireOrCreateDistributedContextAsync(defaultContext);
+            // Update the reload identifier of this tenant in the distributed cache.
+            await distributedCache.SetStringAsync(ReloadIdKey(name), identifier.ReloadId);
 
-            // If the required distributed features are not enabled, nothing to do.
-            var distributedCache = context?.DistributedCache;
-            if (distributedCache is null)
+            // Check if it is a new created tenant that has not been already loaded.
+            if (!name.IsDefaultShellName() && !_shellHost.TryGetSettings(name, out _))
             {
-                return;
+                // Also update the global identifier specifying that a tenant has been created.
+                await distributedCache.SetStringAsync(ShellCountChangedIdKey, identifier.ReloadId);
             }
 
-            var semaphore = _semaphores.GetOrAdd(name, name => new SemaphoreSlim(1));
-            await semaphore.WaitAsync();
-            try
-            {
-                var removedId = IdGenerator.GenerateId();
+            // Also update the global identifier specifying that a tenant has changed.
+            await distributedCache.SetStringAsync(ShellChangedIdKey, identifier.ReloadId);
+        }
+        catch (Exception ex) when (!ex.IsFatal())
+        {
+            _logger.LogError(ex, "Unable to update the distributed cache before reloading the tenant '{TenantName}'.", name);
+        }
+        finally
+        {
+            semaphore.Release();
+        }
+    }
 
-                // Also update the global identifier specifying that a tenant has been removed.
-                await distributedCache.SetStringAsync(ShellCountChangedIdKey, removedId);
+    /// <summary>
+    /// Called before removing a tenant to update the related shell identifiers, locally and in the distributed cache.
+    /// </summary>
+    public async Task RemovingAsync(string name)
+    {
+        // The 'Default' tenant can't be removed.
+        if (_terminated || name.IsDefaultShellName())
+        {
+            return;
+        }
 
-                // Also update the global identifier specifying that a tenant has changed.
-                await distributedCache.SetStringAsync(ShellChangedIdKey, removedId);
-            }
-            catch (Exception ex) when (!ex.IsFatal())
-            {
-                _logger.LogError(ex, "Unable to update the distributed cache before removing the tenant '{TenantName}'.", name);
-            }
-            finally
-            {
-                semaphore.Release();
-            }
+        // If there is no default tenant or it is not running, nothing to do.
+        if (!_shellHost.TryGetShellContext(ShellSettings.DefaultShellName, out var defaultContext) ||
+            !defaultContext.Settings.IsRunning())
+        {
+            return;
         }
 
-        private static string ReleaseIdKey(string name) => $"{name}{ReleaseIdKeySuffix}";
-        private static string ReloadIdKey(string name) => $"{name}{ReloadIdKeySuffix}";
+        // Acquire the distributed context or create a new one if not yet built.
+        await using var context = await AcquireOrCreateDistributedContextAsync(defaultContext);
 
-        /// <summary>
-        /// Gets or creates a new distributed context if the default tenant has changed.
-        /// </summary>
-        private async Task<DistributedContext> GetOrCreateDistributedContextAsync(ShellContext defaultContext)
+        // If the required distributed features are not enabled, nothing to do.
+        var distributedCache = context?.DistributedCache;
+        if (distributedCache is null)
         {
-            // Check if the default tenant has changed.
-            if (_defaultContextUtcTicks != defaultContext.UtcTicks)
-            {
-                var previousContext = _context;
-
-                // Reuse or create a new context based on the default tenant.
-                _context = await ReuseOrCreateDistributedContextAsync(defaultContext);
+            return;
+        }
 
-                // Cache the default context.
-                _defaultContextUtcTicks = defaultContext.UtcTicks;
+        var semaphore = _semaphores.GetOrAdd(name, name => new SemaphoreSlim(1));
+        await semaphore.WaitAsync();
+        try
+        {
+            var removedId = IdGenerator.GenerateId();
 
-                // If the context is not reused.
-                if (_context != previousContext && previousContext is not null)
-                {
-                    // Release the previous one.
-                    await previousContext.ReleaseAsync();
-                }
-            }
+            // Also update the global identifier specifying that a tenant has been removed.
+            await distributedCache.SetStringAsync(ShellCountChangedIdKey, removedId);
 
-            return _context;
+            // Also update the global identifier specifying that a tenant has changed.
+            await distributedCache.SetStringAsync(ShellChangedIdKey, removedId);
+        }
+        catch (Exception ex) when (!ex.IsFatal())
+        {
+            _logger.LogError(ex, "Unable to update the distributed cache before removing the tenant '{TenantName}'.", name);
         }
+        finally
+        {
+            semaphore.Release();
+        }
+    }
 
-        /// <summary>
-        /// Reuses or creates a new distributed context based on the default tenant context.
-        /// </summary>
-        private async Task<DistributedContext> ReuseOrCreateDistributedContextAsync(ShellContext defaultContext)
+    private static string ReleaseIdKey(string name) => $"{name}{ReleaseIdKeySuffix}";
+    private static string ReloadIdKey(string name) => $"{name}{ReloadIdKeySuffix}";
+
+    /// <summary>
+    /// Gets or creates a new distributed context if the default tenant has changed.
+    /// </summary>
+    private async Task<DistributedContext> GetOrCreateDistributedContextAsync(ShellContext defaultContext)
+    {
+        // Check if the default tenant has changed.
+        if (_defaultContextUtcTicks != defaultContext.UtcTicks)
         {
-            // If no context.
-            if (_context is null)
-            {
-                // Create a new context based on the default context.
-                return await CreateDistributedContextAsync(defaultContext);
-            }
+            var previousContext = _context;
 
-            // Check if the default context is still the placeholder pre-created on first loading.
-            if (defaultContext.IsPreCreated())
-            {
-                // Reuse the current context.
-                return _context;
-            }
+            // Reuse or create a new context based on the default tenant.
+            _context = await ReuseOrCreateDistributedContextAsync(defaultContext);
 
-            // Get the default tenant descriptor.
-            var descriptor = await GetDefaultShellDescriptorAsync(defaultContext);
+            // Cache the default context.
+            _defaultContextUtcTicks = defaultContext.UtcTicks;
 
-            // If no descriptor.
-            if (descriptor is null)
+            // If the context is not reused.
+            if (_context != previousContext && previousContext is not null)
             {
-                // Nothing to create.
-                return null;
+                // Release the previous one.
+                await previousContext.ReleaseAsync();
             }
+        }
 
-            // Check if the default tenant descriptor or tenant configuration was updated.
-            if (_context.Context.Blueprint.Descriptor.SerialNumber != descriptor.SerialNumber ||
-                !_context.Context.Settings.HasConfiguration())
-            {
-                // Creates a new context based on the default settings and descriptor.
-                return await CreateDistributedContextAsync(defaultContext.Settings, descriptor);
-            }
+        return _context;
+    }
+
+    /// <summary>
+    /// Reuses or creates a new distributed context based on the default tenant context.
+    /// </summary>
+    private async Task<DistributedContext> ReuseOrCreateDistributedContextAsync(ShellContext defaultContext)
+    {
+        // If no context.
+        if (_context is null)
+        {
+            // Create a new context based on the default context.
+            return await CreateDistributedContextAsync(defaultContext);
+        }
 
+        // Check if the default context is still the placeholder pre-created on first loading.
+        if (defaultContext.IsPreCreated())
+        {
             // Reuse the current context.
             return _context;
         }
 
-        /// <summary>
-        /// Acquires the distributed context or creates a new one if not yet initialized.
-        /// </summary>
-        private Task<DistributedContext> AcquireOrCreateDistributedContextAsync(ShellContext defaultContext)
-        {
-            // Acquire the current context.
-            var distributedContext = _context?.Acquire();
-            if (distributedContext is null)
-            {
-                // Create a new context based on the default context.
-                return CreateDistributedContextAsync(defaultContext);
-            }
+        // Get the default tenant descriptor.
+        var descriptor = await GetDefaultShellDescriptorAsync(defaultContext);
 
-            return Task.FromResult(distributedContext);
+        // If no descriptor.
+        if (descriptor is null)
+        {
+            // Nothing to create.
+            return null;
         }
 
-        /// <summary>
-        /// Creates a distributed context based on the default tenant context.
-        /// </summary>
-        private async Task<DistributedContext> CreateDistributedContextAsync(ShellContext defaultContext)
+        // Check if the default tenant descriptor or tenant configuration was updated.
+        if (_context.Context.Blueprint.Descriptor.SerialNumber != descriptor.SerialNumber ||
+            !_context.Context.Settings.HasConfiguration())
         {
-            // Get the default tenant descriptor.
-            var descriptor = await GetDefaultShellDescriptorAsync(defaultContext);
-
-            // If no descriptor.
-            if (descriptor is null)
-            {
-                // Nothing to create.
-                return null;
-            }
-
             // Creates a new context based on the default settings and descriptor.
             return await CreateDistributedContextAsync(defaultContext.Settings, descriptor);
         }
 
-        /// <summary>
-        /// Creates a distributed context based on the default tenant settings.
-        /// </summary>
-        private async Task<DistributedContext> CreateDistributedContextAsync(ShellSettings defaultSettings)
+        // Reuse the current context.
+        return _context;
+    }
+
+    /// <summary>
+    /// Acquires the distributed context or creates a new one if not yet initialized.
+    /// </summary>
+    private Task<DistributedContext> AcquireOrCreateDistributedContextAsync(ShellContext defaultContext)
+    {
+        // Acquire the current context.
+        var distributedContext = _context?.Acquire();
+        if (distributedContext is null)
         {
-            // Get the default tenant descriptor.
-            var descriptor = await GetDefaultShellDescriptorAsync(defaultSettings);
+            // Create a new context based on the default context.
+            return CreateDistributedContextAsync(defaultContext);
+        }
 
-            // If no descriptor.
-            if (descriptor is null)
-            {
-                // Nothing to create.
-                return null;
-            }
+        return Task.FromResult(distributedContext);
+    }
 
-            // Creates a new context based on the default settings and descriptor.
-            return await CreateDistributedContextAsync(defaultSettings, descriptor);
-        }
+    /// <summary>
+    /// Creates a distributed context based on the default tenant context.
+    /// </summary>
+    private async Task<DistributedContext> CreateDistributedContextAsync(ShellContext defaultContext)
+    {
+        // Get the default tenant descriptor.
+        var descriptor = await GetDefaultShellDescriptorAsync(defaultContext);
 
-        /// <summary>
-        /// Creates a distributed context based on the default tenant settings and descriptor.
-        /// </summary>
-        private async Task<DistributedContext> CreateDistributedContextAsync(ShellSettings defaultSettings, ShellDescriptor descriptor)
+        // If no descriptor.
+        if (descriptor is null)
         {
-            // Using the current shell descriptor prevents a database access, and a race condition
-            // when resolving `IStore` while the default tenant is activating and does migrations.
-            try
-            {
-                return new DistributedContext(await _shellContextFactory.CreateDescribedContextAsync(defaultSettings, descriptor));
-            }
-            catch
-            {
-                return null;
-            }
+            // Nothing to create.
+            return null;
         }
 
-        /// <summary>
-        /// Gets the default tenant descriptor based on the default tenant context.
-        /// </summary>
-        private Task<ShellDescriptor> GetDefaultShellDescriptorAsync(ShellContext defaultContext)
-        {
-            // Check if the configuration has been disposed.
-            if (!defaultContext.Settings.HasConfiguration())
-            {
-                return Task.FromResult<ShellDescriptor>(null);
-            }
+        // Creates a new context based on the default settings and descriptor.
+        return await CreateDistributedContextAsync(defaultContext.Settings, descriptor);
+    }
 
-            // Capture the descriptor as the blueprint may be set to null right after.
-            var descriptor = defaultContext.Blueprint?.Descriptor;
+    /// <summary>
+    /// Creates a distributed context based on the default tenant settings.
+    /// </summary>
+    private async Task<DistributedContext> CreateDistributedContextAsync(ShellSettings defaultSettings)
+    {
+        // Get the default tenant descriptor.
+        var descriptor = await GetDefaultShellDescriptorAsync(defaultSettings);
 
-            // Check if the distributed feature is enabled.
-            if (descriptor?.Features.Any(feature => feature.Id == DistributedFeatureId) ?? false)
-            {
-                return Task.FromResult(descriptor);
-            }
+        // If no descriptor.
+        if (descriptor is null)
+        {
+            // Nothing to create.
+            return null;
+        }
 
-            // No descriptor if the default context is a placeholder without blueprint.
-            if (descriptor is null)
-            {
-                // Get the default tenant descriptor from the store.
-                return GetDefaultShellDescriptorAsync(defaultContext.Settings);
-            }
+        // Creates a new context based on the default settings and descriptor.
+        return await CreateDistributedContextAsync(defaultSettings, descriptor);
+    }
 
-            return Task.FromResult<ShellDescriptor>(null);
+    /// <summary>
+    /// Creates a distributed context based on the default tenant settings and descriptor.
+    /// </summary>
+    private async Task<DistributedContext> CreateDistributedContextAsync(ShellSettings defaultSettings, ShellDescriptor descriptor)
+    {
+        // Using the current shell descriptor prevents a database access, and a race condition
+        // when resolving `IStore` while the default tenant is activating and does migrations.
+        try
+        {
+            return new DistributedContext(await _shellContextFactory.CreateDescribedContextAsync(defaultSettings, descriptor));
         }
+        catch
+        {
+            return null;
+        }
+    }
 
-        /// <summary>
-        /// Gets the default tenant descriptor from the store based on the default tenant configuration.
-        /// </summary>
-        private async Task<ShellDescriptor> GetDefaultShellDescriptorAsync(ShellSettings defaultSettings)
+    /// <summary>
+    /// Gets the default tenant descriptor based on the default tenant context.
+    /// </summary>
+    private Task<ShellDescriptor> GetDefaultShellDescriptorAsync(ShellContext defaultContext)
+    {
+        // Check if the configuration has been disposed.
+        if (!defaultContext.Settings.HasConfiguration())
         {
-            // Check if the configuration has been disposed.
-            if (!defaultSettings.HasConfiguration())
-            {
-                return null;
-            }
+            return Task.FromResult<ShellDescriptor>(null);
+        }
 
-            try
-            {
-                // Get the descriptor from the store and check if the distributed feature is enabled.
-                var descriptor = await _shellContextFactory.GetShellDescriptorAsync(defaultSettings);
-                if (descriptor?.Features.Any(feature => feature.Id == DistributedFeatureId) ?? false)
-                {
-                    return descriptor;
-                }
-            }
-            catch
-            {
-            }
+        // Capture the descriptor as the blueprint may be set to null right after.
+        var descriptor = defaultContext.Blueprint?.Descriptor;
 
-            return null;
+        // Check if the distributed feature is enabled.
+        if (descriptor?.Features.Any(feature => feature.Id == DistributedFeatureId) ?? false)
+        {
+            return Task.FromResult(descriptor);
         }
 
-        /// <summary>
-        /// Gets the next idle time before retrying to read the distributed cache.
-        /// </summary>
-        private TimeSpan NextIdleTimeBeforeRetry(TimeSpan idleTime, Exception ex)
+        // No descriptor if the default context is a placeholder without blueprint.
+        if (descriptor is null)
         {
-            if (idleTime < _maxRetryTime)
-            {
-                // Log an error on each retry, but only before reaching the 'MaxRetryTime', to not fill out the log.
-                _logger.LogError(ex, "Unable to read the distributed cache before checking if a tenant has changed.");
+            // Get the default tenant descriptor from the store.
+            return GetDefaultShellDescriptorAsync(defaultContext.Settings);
+        }
 
-                idleTime *= 2;
-                if (idleTime > _maxRetryTime)
-                {
-                    idleTime = _maxRetryTime;
-                }
-            }
+        return Task.FromResult<ShellDescriptor>(null);
+    }
 
-            return idleTime;
+    /// <summary>
+    /// Gets the default tenant descriptor from the store based on the default tenant configuration.
+    /// </summary>
+    private async Task<ShellDescriptor> GetDefaultShellDescriptorAsync(ShellSettings defaultSettings)
+    {
+        // Check if the configuration has been disposed.
+        if (!defaultSettings.HasConfiguration())
+        {
+            return null;
         }
 
-        /// <summary>
-        /// Tries to wait for the min idle time after the max busy time, returns false if it was cancelled.
-        /// </summary>
-        private async Task<bool> TryWaitAfterBusyTime(CancellationToken stoppingToken)
+        try
         {
-            if (DateTime.UtcNow - _busyStartTime > _maxBusyTime)
+            // Get the descriptor from the store and check if the distributed feature is enabled.
+            var descriptor = await _shellContextFactory.GetShellDescriptorAsync(defaultSettings);
+            if (descriptor?.Features.Any(feature => feature.Id == DistributedFeatureId) ?? false)
             {
-                if (!await TryWaitAsync(_minIdleTime, stoppingToken))
-                {
-                    return false;
-                }
-
-                _busyStartTime = DateTime.UtcNow;
+                return descriptor;
             }
-
-            return true;
+        }
+        catch
+        {
         }
 
-        /// <summary>
-        /// Tries to wait for a given delay, returns false if it was cancelled.
-        /// </summary>
-        private static async Task<bool> TryWaitAsync(TimeSpan delay, CancellationToken stoppingToken)
+        return null;
+    }
+
+    /// <summary>
+    /// Gets the next idle time before retrying to read the distributed cache.
+    /// </summary>
+    private TimeSpan NextIdleTimeBeforeRetry(TimeSpan idleTime, Exception ex)
+    {
+        if (idleTime < _maxRetryTime)
         {
-            try
+            // Log an error on each retry, but only before reaching the 'MaxRetryTime', to not fill out the log.
+            _logger.LogError(ex, "Unable to read the distributed cache before checking if a tenant has changed.");
+
+            idleTime *= 2;
+            if (idleTime > _maxRetryTime)
             {
-                await Task.Delay(delay, stoppingToken);
-                return true;
+                idleTime = _maxRetryTime;
             }
-            catch (TaskCanceledException)
+        }
+
+        return idleTime;
+    }
+
+    /// <summary>
+    /// Tries to wait for the min idle time after the max busy time, returns false if it was cancelled.
+    /// </summary>
+    private async Task<bool> TryWaitAfterBusyTime(CancellationToken stoppingToken)
+    {
+        if (DateTime.UtcNow - _busyStartTime > _maxBusyTime)
+        {
+            if (!await TryWaitAsync(_minIdleTime, stoppingToken))
             {
                 return false;
             }
+
+            _busyStartTime = DateTime.UtcNow;
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Tries to wait for a given delay, returns false if it was cancelled.
+    /// </summary>
+    private static async Task<bool> TryWaitAsync(TimeSpan delay, CancellationToken stoppingToken)
+    {
+        try
+        {
+            await Task.Delay(delay, stoppingToken);
+            return true;
+        }
+        catch (TaskCanceledException)
+        {
+            return false;
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/Distributed/ShellIdentifier.cs b/src/OrchardCore/OrchardCore/Shell/Distributed/ShellIdentifier.cs
index 518e9a68ccb..9b4f663dc2c 100644
--- a/src/OrchardCore/OrchardCore/Shell/Distributed/ShellIdentifier.cs
+++ b/src/OrchardCore/OrchardCore/Shell/Distributed/ShellIdentifier.cs
@@ -1,8 +1,7 @@
-namespace OrchardCore.Environment.Shell.Distributed
+namespace OrchardCore.Environment.Shell.Distributed;
+
+internal sealed class ShellIdentifier
 {
-    internal sealed class ShellIdentifier
-    {
-        public string ReleaseId { get; set; }
-        public string ReloadId { get; set; }
-    }
+    public string ReleaseId { get; set; }
+    public string ReloadId { get; set; }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/FeatureProfilesValidationProvider.cs b/src/OrchardCore/OrchardCore/Shell/FeatureProfilesValidationProvider.cs
index 24d06442117..aa1bf5b6c50 100644
--- a/src/OrchardCore/OrchardCore/Shell/FeatureProfilesValidationProvider.cs
+++ b/src/OrchardCore/OrchardCore/Shell/FeatureProfilesValidationProvider.cs
@@ -6,110 +6,109 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Environment.Shell.Models;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+public class FeatureProfilesValidationProvider : IFeatureValidationProvider
 {
-    public class FeatureProfilesValidationProvider : IFeatureValidationProvider
+    private readonly IExtensionManager _extensionManager;
+    private readonly FeatureProfilesRuleOptions _featureProfilesRuleOptions;
+    private readonly IShellHost _shellHost;
+    private readonly ShellSettings _shellSettings;
+
+    // Cached across requests as this is called a lot and can be calculated once.
+    private readonly Dictionary<string, bool> _allowed = new(StringComparer.OrdinalIgnoreCase);
+    private (bool NotFound, FeatureProfile FeatureProfile) _featureProfileLookup;
+
+    public FeatureProfilesValidationProvider(
+        IExtensionManager extensionManager,
+        IShellHost shellHost,
+        ShellSettings shellSettings,
+        IOptions<FeatureProfilesRuleOptions> featureOptions)
     {
-        private readonly IExtensionManager _extensionManager;
-        private readonly FeatureProfilesRuleOptions _featureProfilesRuleOptions;
-        private readonly IShellHost _shellHost;
-        private readonly ShellSettings _shellSettings;
-
-        // Cached across requests as this is called a lot and can be calculated once.
-        private readonly Dictionary<string, bool> _allowed = new(StringComparer.OrdinalIgnoreCase);
-        private (bool NotFound, FeatureProfile FeatureProfile) _featureProfileLookup;
-
-        public FeatureProfilesValidationProvider(
-            IExtensionManager extensionManager,
-            IShellHost shellHost,
-            ShellSettings shellSettings,
-            IOptions<FeatureProfilesRuleOptions> featureOptions)
+        _extensionManager = extensionManager;
+        _shellHost = shellHost;
+        _shellSettings = shellSettings;
+        _featureProfilesRuleOptions = featureOptions.Value;
+    }
+
+    public async ValueTask<bool> IsFeatureValidAsync(string id)
+    {
+        var profileNames = _shellSettings["FeatureProfile"];
+
+        if (string.IsNullOrWhiteSpace(profileNames))
         {
-            _extensionManager = extensionManager;
-            _shellHost = shellHost;
-            _shellSettings = shellSettings;
-            _featureProfilesRuleOptions = featureOptions.Value;
+            return true;
         }
 
-        public async ValueTask<bool> IsFeatureValidAsync(string id)
+        if (!_featureProfileLookup.NotFound)
         {
-            var profileNames = _shellSettings["FeatureProfile"];
+            var scope = await _shellHost.GetScopeAsync(ShellSettings.DefaultShellName);
 
-            if (string.IsNullOrWhiteSpace(profileNames))
+            await scope.UsingAsync(async (scope) =>
             {
-                return true;
-            }
+                var featureProfilesService = scope.ServiceProvider.GetService<IFeatureProfilesService>();
 
-            if (!_featureProfileLookup.NotFound)
-            {
-                var scope = await _shellHost.GetScopeAsync(ShellSettings.DefaultShellName);
+                var featureProfiles = await featureProfilesService.GetFeatureProfilesAsync();
 
-                await scope.UsingAsync(async (scope) =>
+                foreach (var profileName in profileNames.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries))
                 {
-                    var featureProfilesService = scope.ServiceProvider.GetService<IFeatureProfilesService>();
-
-                    var featureProfiles = await featureProfilesService.GetFeatureProfilesAsync();
-
-                    foreach (var profileName in profileNames.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries))
+                    if (featureProfiles.TryGetValue(profileName, out var featureProfile))
                     {
-                        if (featureProfiles.TryGetValue(profileName, out var featureProfile))
-                        {
-                            _featureProfileLookup = (false, featureProfile);
-
-                            continue;
-                        }
+                        _featureProfileLookup = (false, featureProfile);
 
-                        _featureProfileLookup = (true, null);
+                        continue;
                     }
-                });
-            }
 
-            // When the management feature is not enabled we need to pass feature validation.
-            if (_featureProfileLookup.NotFound || _featureProfileLookup.FeatureProfile is null)
-            {
-                return true;
-            }
+                    _featureProfileLookup = (true, null);
+                }
+            });
+        }
+
+        // When the management feature is not enabled we need to pass feature validation.
+        if (_featureProfileLookup.NotFound || _featureProfileLookup.FeatureProfile is null)
+        {
+            return true;
+        }
+
+        var isAllowed = IsAllowed(id);
+        if (!isAllowed)
+        {
+            return false;
+        }
 
-            var isAllowed = IsAllowed(id);
+        var dependencies = _extensionManager.GetFeatureDependencies(id);
+        foreach (var dependency in dependencies)
+        {
+            isAllowed = IsAllowed(dependency.Id);
             if (!isAllowed)
             {
                 return false;
             }
-
-            var dependencies = _extensionManager.GetFeatureDependencies(id);
-            foreach (var dependency in dependencies)
-            {
-                isAllowed = IsAllowed(dependency.Id);
-                if (!isAllowed)
-                {
-                    return false;
-                }
-            }
-
-            return true;
         }
 
-        private bool IsAllowed(string id)
+        return true;
+    }
+
+    private bool IsAllowed(string id)
+    {
+        if (!_allowed.TryGetValue(id, out var isAllowed))
         {
-            if (!_allowed.TryGetValue(id, out var isAllowed))
+            isAllowed = true;
+            foreach (var rule in _featureProfileLookup.FeatureProfile.FeatureRules)
             {
-                isAllowed = true;
-                foreach (var rule in _featureProfileLookup.FeatureProfile.FeatureRules)
+                if (_featureProfilesRuleOptions.Rules.TryGetValue(rule.Rule, out var ruleSet))
                 {
-                    if (_featureProfilesRuleOptions.Rules.TryGetValue(rule.Rule, out var ruleSet))
+                    // Does rule match?
+                    var result = ruleSet(rule.Expression, id);
+                    if (result.isMatch)
                     {
-                        // Does rule match?
-                        var result = ruleSet(rule.Expression, id);
-                        if (result.isMatch)
-                        {
-                            isAllowed = result.isAllowed;
-                        }
+                        isAllowed = result.isAllowed;
                     }
                 }
-                _allowed[id] = isAllowed;
             }
-
-            return isAllowed;
+            _allowed[id] = isAllowed;
         }
+
+        return isAllowed;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/NullFeatureProfilesService.cs b/src/OrchardCore/OrchardCore/Shell/NullFeatureProfilesService.cs
index 8652f9101ea..fe7d3e699cb 100644
--- a/src/OrchardCore/OrchardCore/Shell/NullFeatureProfilesService.cs
+++ b/src/OrchardCore/OrchardCore/Shell/NullFeatureProfilesService.cs
@@ -2,13 +2,12 @@
 using System.Threading.Tasks;
 using OrchardCore.Environment.Shell.Models;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+public class NullFeatureProfilesService : IFeatureProfilesService
 {
-    public class NullFeatureProfilesService : IFeatureProfilesService
-    {
-        private static readonly IDictionary<string, FeatureProfile> _featureProfiles = new Dictionary<string, FeatureProfile>();
+    private static readonly IDictionary<string, FeatureProfile> _featureProfiles = new Dictionary<string, FeatureProfile>();
 
-        public Task<IDictionary<string, FeatureProfile>> GetFeatureProfilesAsync()
-            => Task.FromResult(_featureProfiles);
-    }
+    public Task<IDictionary<string, FeatureProfile>> GetFeatureProfilesAsync()
+        => Task.FromResult(_featureProfiles);
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/RunningShellTable.cs b/src/OrchardCore/OrchardCore/Shell/RunningShellTable.cs
index c400044b203..ed8c57406fb 100644
--- a/src/OrchardCore/OrchardCore/Shell/RunningShellTable.cs
+++ b/src/OrchardCore/OrchardCore/Shell/RunningShellTable.cs
@@ -5,176 +5,175 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Primitives;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+public class RunningShellTable : IRunningShellTable
 {
-    public class RunningShellTable : IRunningShellTable
-    {
-        private ImmutableDictionary<string, ShellSettings> _shellsByHostAndPrefix = ImmutableDictionary<string, ShellSettings>.Empty.WithComparers(StringComparer.OrdinalIgnoreCase);
-        private ShellSettings _default;
-        private bool _hasStarMapping;
+    private ImmutableDictionary<string, ShellSettings> _shellsByHostAndPrefix = ImmutableDictionary<string, ShellSettings>.Empty.WithComparers(StringComparer.OrdinalIgnoreCase);
+    private ShellSettings _default;
+    private bool _hasStarMapping;
 
-        public void Add(ShellSettings settings)
+    public void Add(ShellSettings settings)
+    {
+        if (settings.IsDefaultShell())
         {
-            if (settings.IsDefaultShell())
-            {
-                _default = settings;
-            }
+            _default = settings;
+        }
 
-            var allHostsAndPrefix = GetAllHostsAndPrefix(settings);
+        var allHostsAndPrefix = GetAllHostsAndPrefix(settings);
 
-            var settingsByHostAndPrefix = new Dictionary<string, ShellSettings>();
+        var settingsByHostAndPrefix = new Dictionary<string, ShellSettings>();
 
-            foreach (var hostAndPrefix in allHostsAndPrefix)
-            {
-                _hasStarMapping = _hasStarMapping || hostAndPrefix.StartsWith('*');
-                settingsByHostAndPrefix.TryAdd(hostAndPrefix, settings);
-            }
-
-            lock (this)
-            {
-                _shellsByHostAndPrefix = _shellsByHostAndPrefix.SetItems(settingsByHostAndPrefix);
-            }
+        foreach (var hostAndPrefix in allHostsAndPrefix)
+        {
+            _hasStarMapping = _hasStarMapping || hostAndPrefix.StartsWith('*');
+            settingsByHostAndPrefix.TryAdd(hostAndPrefix, settings);
         }
 
-        public void Remove(ShellSettings settings)
+        lock (this)
         {
-            var allHostsAndPrefix = _shellsByHostAndPrefix
-                .Where(kv => kv.Value.Name == settings.Name)
-                .Select(kv => kv.Key)
-                .ToArray();
+            _shellsByHostAndPrefix = _shellsByHostAndPrefix.SetItems(settingsByHostAndPrefix);
+        }
+    }
 
-            lock (this)
-            {
-                _shellsByHostAndPrefix = _shellsByHostAndPrefix.RemoveRange(allHostsAndPrefix);
-            }
+    public void Remove(ShellSettings settings)
+    {
+        var allHostsAndPrefix = _shellsByHostAndPrefix
+            .Where(kv => kv.Value.Name == settings.Name)
+            .Select(kv => kv.Key)
+            .ToArray();
 
-            if (settings.IsDefaultShell())
-            {
-                _default = null;
-            }
+        lock (this)
+        {
+            _shellsByHostAndPrefix = _shellsByHostAndPrefix.RemoveRange(allHostsAndPrefix);
         }
 
-        public ShellSettings Match(HostString host, PathString path, bool fallbackToDefault = true)
+        if (settings.IsDefaultShell())
         {
-            // Supports IPv6 format.
-            var hostOnly = host.Host;
+            _default = null;
+        }
+    }
 
-            // Specific match?
-            if (TryMatchInternal(host.Value, hostOnly, path.Value, out var result))
-            {
-                return result;
-            }
+    public ShellSettings Match(HostString host, PathString path, bool fallbackToDefault = true)
+    {
+        // Supports IPv6 format.
+        var hostOnly = host.Host;
 
-            // Search for star mapping
-            // Optimization: only if a mapping with a '*' has been added
+        // Specific match?
+        if (TryMatchInternal(host.Value, hostOnly, path.Value, out var result))
+        {
+            return result;
+        }
 
-            if (_hasStarMapping && TryMatchStarMapping(host.Value, hostOnly, path.Value, out result))
-            {
-                return result;
-            }
+        // Search for star mapping
+        // Optimization: only if a mapping with a '*' has been added
 
-            // Check if the Default tenant is a catch-all
-            if (fallbackToDefault && DefaultIsCatchAll())
-            {
-                return _default;
-            }
+        if (_hasStarMapping && TryMatchStarMapping(host.Value, hostOnly, path.Value, out result))
+        {
+            return result;
+        }
 
-            // Search for another catch-all
-            if (fallbackToDefault && TryMatchInternal("", "", "/", out result))
-            {
-                return result;
-            }
+        // Check if the Default tenant is a catch-all
+        if (fallbackToDefault && DefaultIsCatchAll())
+        {
+            return _default;
+        }
 
-            return null;
+        // Search for another catch-all
+        if (fallbackToDefault && TryMatchInternal("", "", "/", out result))
+        {
+            return result;
         }
 
-        private bool TryMatchInternal(StringSegment host, StringSegment hostOnly, StringSegment path, out ShellSettings result)
+        return null;
+    }
+
+    private bool TryMatchInternal(StringSegment host, StringSegment hostOnly, StringSegment path, out ShellSettings result)
+    {
+        // 1. Search for Host:Port + Prefix match
+
+        if (host.Length == 0 || !_shellsByHostAndPrefix.TryGetValue(GetHostAndPrefix(host, path), out result))
         {
-            // 1. Search for Host:Port + Prefix match
+            // 2. Search for Host + Prefix match
 
-            if (host.Length == 0 || !_shellsByHostAndPrefix.TryGetValue(GetHostAndPrefix(host, path), out result))
+            if (host.Length == hostOnly.Length || !_shellsByHostAndPrefix.TryGetValue(GetHostAndPrefix(hostOnly, path), out result))
             {
-                // 2. Search for Host + Prefix match
+                // 3. Search for Host:Port only match
 
-                if (host.Length == hostOnly.Length || !_shellsByHostAndPrefix.TryGetValue(GetHostAndPrefix(hostOnly, path), out result))
+                if (host.Length == 0 || !_shellsByHostAndPrefix.TryGetValue(GetHostAndPrefix(host, "/"), out result))
                 {
-                    // 3. Search for Host:Port only match
+                    // 4. Search for Host only match
 
-                    if (host.Length == 0 || !_shellsByHostAndPrefix.TryGetValue(GetHostAndPrefix(host, "/"), out result))
+                    if (host.Length == hostOnly.Length || !_shellsByHostAndPrefix.TryGetValue(GetHostAndPrefix(hostOnly, "/"), out result))
                     {
-                        // 4. Search for Host only match
+                        // 5. Search for Prefix only match
 
-                        if (host.Length == hostOnly.Length || !_shellsByHostAndPrefix.TryGetValue(GetHostAndPrefix(hostOnly, "/"), out result))
+                        if (!_shellsByHostAndPrefix.TryGetValue(GetHostAndPrefix("", path), out result))
                         {
-                            // 5. Search for Prefix only match
-
-                            if (!_shellsByHostAndPrefix.TryGetValue(GetHostAndPrefix("", path), out result))
-                            {
-                                result = null;
-                                return false;
-                            }
+                            result = null;
+                            return false;
                         }
                     }
                 }
             }
+        }
+
+        return true;
+    }
 
+    private bool TryMatchStarMapping(StringSegment host, StringSegment hostOnly, StringSegment path, out ShellSettings result)
+    {
+        if (TryMatchInternal("*." + host, "*." + hostOnly, path, out result))
+        {
             return true;
         }
 
-        private bool TryMatchStarMapping(StringSegment host, StringSegment hostOnly, StringSegment path, out ShellSettings result)
+        var index = -1;
+
+        // Take the longest subdomain and look for a mapping
+        while (-1 != (index = host.IndexOf('.', index + 1)))
         {
-            if (TryMatchInternal("*." + host, "*." + hostOnly, path, out result))
+            if (TryMatchInternal("*" + host.Subsegment(index), "*" + hostOnly.Subsegment(index), path, out result))
             {
                 return true;
             }
-
-            var index = -1;
-
-            // Take the longest subdomain and look for a mapping
-            while (-1 != (index = host.IndexOf('.', index + 1)))
-            {
-                if (TryMatchInternal("*" + host.Subsegment(index), "*" + hostOnly.Subsegment(index), path, out result))
-                {
-                    return true;
-                }
-            }
-
-            result = null;
-            return false;
         }
 
-        private static string GetHostAndPrefix(StringSegment host, StringSegment path)
+        result = null;
+        return false;
+    }
+
+    private static string GetHostAndPrefix(StringSegment host, StringSegment path)
+    {
+        // The request path starts with a leading '/'
+        var firstSegmentIndex = path.Length > 0 ? path.IndexOf('/', 1) : -1;
+        if (firstSegmentIndex > -1)
         {
-            // The request path starts with a leading '/'
-            var firstSegmentIndex = path.Length > 0 ? path.IndexOf('/', 1) : -1;
-            if (firstSegmentIndex > -1)
-            {
-                return host + path.Subsegment(0, firstSegmentIndex).Value;
-            }
-            else
-            {
-                return host + path.Value;
-            }
+            return host + path.Subsegment(0, firstSegmentIndex).Value;
         }
-
-        private static string[] GetAllHostsAndPrefix(ShellSettings shellSettings)
+        else
         {
-            // For each host entry return HOST/PREFIX
-
-            if (string.IsNullOrWhiteSpace(shellSettings.RequestUrlHost))
-            {
-                return ["/" + shellSettings.RequestUrlPrefix];
-            }
-
-            return shellSettings
-                .RequestUrlHosts
-                .Select(ruh => ruh + "/" + shellSettings.RequestUrlPrefix)
-                .ToArray();
+            return host + path.Value;
         }
+    }
+
+    private static string[] GetAllHostsAndPrefix(ShellSettings shellSettings)
+    {
+        // For each host entry return HOST/PREFIX
 
-        private bool DefaultIsCatchAll()
+        if (string.IsNullOrWhiteSpace(shellSettings.RequestUrlHost))
         {
-            return _default != null && string.IsNullOrEmpty(_default.RequestUrlHost) && string.IsNullOrEmpty(_default.RequestUrlPrefix);
+            return ["/" + shellSettings.RequestUrlPrefix];
         }
+
+        return shellSettings
+            .RequestUrlHosts
+            .Select(ruh => ruh + "/" + shellSettings.RequestUrlPrefix)
+            .ToArray();
+    }
+
+    private bool DefaultIsCatchAll()
+    {
+        return _default != null && string.IsNullOrEmpty(_default.RequestUrlHost) && string.IsNullOrEmpty(_default.RequestUrlPrefix);
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore/Shell/ServiceCollectionExtensions.cs
index 09fe1a06ff5..3b9b7aae088 100644
--- a/src/OrchardCore/OrchardCore/Shell/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore/Shell/ServiceCollectionExtensions.cs
@@ -9,85 +9,84 @@
 using OrchardCore.Environment.Shell.Models;
 using OrchardCore.Environment.Shell.Removing;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    public static IServiceCollection AddHostingShellServices(this IServiceCollection services)
     {
-        public static IServiceCollection AddHostingShellServices(this IServiceCollection services)
+        services.AddSingleton<IShellHost, ShellHost>();
+        services.AddSingleton<IShellDescriptorManagerEventHandler>(sp => sp.GetRequiredService<IShellHost>());
+
         {
-            services.AddSingleton<IShellHost, ShellHost>();
-            services.AddSingleton<IShellDescriptorManagerEventHandler>(sp => sp.GetRequiredService<IShellHost>());
+            // Use a single default site by default, i.e. if WithTenants hasn't been called before
+            services.TryAddSingleton<IShellSettingsManager, SingleShellSettingsManager>();
+            services.AddTransient<IConfigureOptions<ShellOptions>, ShellOptionsSetup>();
 
+            services.AddSingleton<IShellContextFactory, ShellContextFactory>();
             {
-                // Use a single default site by default, i.e. if WithTenants hasn't been called before
-                services.TryAddSingleton<IShellSettingsManager, SingleShellSettingsManager>();
-                services.AddTransient<IConfigureOptions<ShellOptions>, ShellOptionsSetup>();
+                services.AddSingleton<ICompositionStrategy, CompositionStrategy>();
 
-                services.AddSingleton<IShellContextFactory, ShellContextFactory>();
-                {
-                    services.AddSingleton<ICompositionStrategy, CompositionStrategy>();
-
-                    services.AddSingleton<IShellContainerFactory, ShellContainerFactory>();
-                }
+                services.AddSingleton<IShellContainerFactory, ShellContainerFactory>();
             }
+        }
 
-            services.AddSingleton<IRunningShellTable, RunningShellTable>();
+        services.AddSingleton<IRunningShellTable, RunningShellTable>();
 
-            services.AddHostedService<DistributedShellHostedService>();
+        services.AddHostedService<DistributedShellHostedService>();
 
-            services.AddSingleton<IShellRemovalManager, ShellRemovalManager>();
-            services.AddSingleton<IShellRemovingHandler, ShellWebRootRemovingHandler>();
-            services.AddSingleton<IShellRemovingHandler, ShellSiteFolderRemovingHandler>();
-            services.AddSingleton<IShellRemovingHandler, ShellSettingsRemovingHandler>();
+        services.AddSingleton<IShellRemovalManager, ShellRemovalManager>();
+        services.AddSingleton<IShellRemovingHandler, ShellWebRootRemovingHandler>();
+        services.AddSingleton<IShellRemovingHandler, ShellSiteFolderRemovingHandler>();
+        services.AddSingleton<IShellRemovingHandler, ShellSettingsRemovingHandler>();
 
-            return services;
-        }
+        return services;
+    }
 
-        public static IServiceCollection AddAllFeaturesDescriptor(this IServiceCollection services)
-        {
-            services.AddScoped<IShellDescriptorManager, AllFeaturesShellDescriptorManager>();
+    public static IServiceCollection AddAllFeaturesDescriptor(this IServiceCollection services)
+    {
+        services.AddScoped<IShellDescriptorManager, AllFeaturesShellDescriptorManager>();
 
-            return services;
-        }
+        return services;
+    }
 
-        public static IServiceCollection AddSetFeaturesDescriptor(this IServiceCollection services)
-        {
-            services.AddSingleton<IShellDescriptorManager, SetFeaturesShellDescriptorManager>();
+    public static IServiceCollection AddSetFeaturesDescriptor(this IServiceCollection services)
+    {
+        services.AddSingleton<IShellDescriptorManager, SetFeaturesShellDescriptorManager>();
 
-            return services;
-        }
+        return services;
+    }
 
-        public static IServiceCollection AddNullFeatureProfilesService(this IServiceCollection services)
-            => services.AddScoped<IFeatureProfilesService, NullFeatureProfilesService>();
+    public static IServiceCollection AddNullFeatureProfilesService(this IServiceCollection services)
+        => services.AddScoped<IFeatureProfilesService, NullFeatureProfilesService>();
 
-        public static IServiceCollection AddFeatureValidation(this IServiceCollection services)
-            => services
-                .AddScoped<IFeatureValidationProvider, FeatureProfilesValidationProvider>()
-                .AddScoped<IFeatureValidationProvider, DefaultTenantOnlyFeatureValidationProvider>();
+    public static IServiceCollection AddFeatureValidation(this IServiceCollection services)
+        => services
+            .AddScoped<IFeatureValidationProvider, FeatureProfilesValidationProvider>()
+            .AddScoped<IFeatureValidationProvider, DefaultTenantOnlyFeatureValidationProvider>();
 
-        public static IServiceCollection ConfigureFeatureProfilesRuleOptions(this IServiceCollection services)
-            => services
-                .Configure<FeatureProfilesRuleOptions>(o =>
+    public static IServiceCollection ConfigureFeatureProfilesRuleOptions(this IServiceCollection services)
+        => services
+            .Configure<FeatureProfilesRuleOptions>(o =>
+            {
+                o.Rules["Include"] = (expression, name) =>
                 {
-                    o.Rules["Include"] = (expression, name) =>
+                    if (FileSystemName.MatchesSimpleExpression(expression, name))
                     {
-                        if (FileSystemName.MatchesSimpleExpression(expression, name))
-                        {
-                            return (true, true);
-                        }
+                        return (true, true);
+                    }
 
-                        return (false, false);
-                    };
+                    return (false, false);
+                };
 
-                    o.Rules["Exclude"] = (expression, name) =>
+                o.Rules["Exclude"] = (expression, name) =>
+                {
+                    if (FileSystemName.MatchesSimpleExpression(expression, name))
                     {
-                        if (FileSystemName.MatchesSimpleExpression(expression, name))
-                        {
-                            return (true, false);
-                        }
-
-                        return (false, false);
-                    };
-                });
-    }
+                        return (true, false);
+                    }
+
+                    return (false, false);
+                };
+            });
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/ShellDescriptorFeaturesManager.cs b/src/OrchardCore/OrchardCore/Shell/ShellDescriptorFeaturesManager.cs
index f86d77a8bab..845f9c0d0d4 100644
--- a/src/OrchardCore/OrchardCore/Shell/ShellDescriptorFeaturesManager.cs
+++ b/src/OrchardCore/OrchardCore/Shell/ShellDescriptorFeaturesManager.cs
@@ -10,204 +10,203 @@
 using OrchardCore.Environment.Shell.Scope;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+public class ShellDescriptorFeaturesManager : IShellDescriptorFeaturesManager
 {
-    public class ShellDescriptorFeaturesManager : IShellDescriptorFeaturesManager
+    private readonly IExtensionManager _extensionManager;
+    private readonly IEnumerable<ShellFeature> _alwaysEnabledFeatures;
+    private readonly IShellDescriptorManager _shellDescriptorManager;
+    private readonly ILogger _logger;
+
+    public ShellDescriptorFeaturesManager(
+        IExtensionManager extensionManager,
+        IEnumerable<ShellFeature> shellFeatures,
+        IShellDescriptorManager shellDescriptorManager,
+        ILogger<ShellFeaturesManager> logger)
     {
-        private readonly IExtensionManager _extensionManager;
-        private readonly IEnumerable<ShellFeature> _alwaysEnabledFeatures;
-        private readonly IShellDescriptorManager _shellDescriptorManager;
-        private readonly ILogger _logger;
-
-        public ShellDescriptorFeaturesManager(
-            IExtensionManager extensionManager,
-            IEnumerable<ShellFeature> shellFeatures,
-            IShellDescriptorManager shellDescriptorManager,
-            ILogger<ShellFeaturesManager> logger)
-        {
-            _extensionManager = extensionManager;
-            _alwaysEnabledFeatures = shellFeatures.Where(f => f.AlwaysEnabled).ToArray();
-            _shellDescriptorManager = shellDescriptorManager;
-            _logger = logger;
-        }
-
-        public async Task<(IEnumerable<IFeatureInfo>, IEnumerable<IFeatureInfo>)> UpdateFeaturesAsync(ShellDescriptor shellDescriptor,
-            IEnumerable<IFeatureInfo> featuresToDisable, IEnumerable<IFeatureInfo> featuresToEnable, bool force)
-        {
-            var featureEventHandlers = ShellScope.Services.GetServices<IFeatureEventHandler>();
+        _extensionManager = extensionManager;
+        _alwaysEnabledFeatures = shellFeatures.Where(f => f.AlwaysEnabled).ToArray();
+        _shellDescriptorManager = shellDescriptorManager;
+        _logger = logger;
+    }
 
-            var enabledFeatures = _extensionManager.GetFeatures()
-                .Where(feature => shellDescriptor.Features.Any(shellFeature => shellFeature.Id == feature.Id))
-                .ToArray();
+    public async Task<(IEnumerable<IFeatureInfo>, IEnumerable<IFeatureInfo>)> UpdateFeaturesAsync(ShellDescriptor shellDescriptor,
+        IEnumerable<IFeatureInfo> featuresToDisable, IEnumerable<IFeatureInfo> featuresToEnable, bool force)
+    {
+        var featureEventHandlers = ShellScope.Services.GetServices<IFeatureEventHandler>();
 
-            var enabledFeatureIds = enabledFeatures
-                .Select(feature => feature.Id)
-                .ToHashSet();
+        var enabledFeatures = _extensionManager.GetFeatures()
+            .Where(feature => shellDescriptor.Features.Any(shellFeature => shellFeature.Id == feature.Id))
+            .ToArray();
 
-            var installedFeatureIds = enabledFeatureIds
-                .Concat(shellDescriptor.Installed.Select(shellFeature => shellFeature.Id))
-                .ToHashSet();
+        var enabledFeatureIds = enabledFeatures
+            .Select(feature => feature.Id)
+            .ToHashSet();
 
-            var alwaysEnabledIds = _alwaysEnabledFeatures.Select(shellFeature => shellFeature.Id).ToArray();
+        var installedFeatureIds = enabledFeatureIds
+            .Concat(shellDescriptor.Installed.Select(shellFeature => shellFeature.Id))
+            .ToHashSet();
 
-            var byDependencyOnlyFeaturesToDisable = enabledFeatures
-                .Where(feature => feature.EnabledByDependencyOnly);
+        var alwaysEnabledIds = _alwaysEnabledFeatures.Select(shellFeature => shellFeature.Id).ToArray();
 
-            var allFeaturesToDisable = featuresToDisable
-                .Where(feature => !feature.EnabledByDependencyOnly && !alwaysEnabledIds.Contains(feature.Id))
-                .SelectMany(feature => GetFeaturesToDisable(feature, enabledFeatureIds, force))
-                // Always attempt to disable 'EnabledByDependencyOnly' features
-                // to ensure we auto disable any feature that is no longer needed.
-                .Union(byDependencyOnlyFeaturesToDisable)
-                .Distinct()
-                .Reverse()
-                .ToList();
+        var byDependencyOnlyFeaturesToDisable = enabledFeatures
+            .Where(feature => feature.EnabledByDependencyOnly);
 
-            foreach (var feature in allFeaturesToDisable)
-            {
-                enabledFeatureIds.Remove(feature.Id);
+        var allFeaturesToDisable = featuresToDisable
+            .Where(feature => !feature.EnabledByDependencyOnly && !alwaysEnabledIds.Contains(feature.Id))
+            .SelectMany(feature => GetFeaturesToDisable(feature, enabledFeatureIds, force))
+            // Always attempt to disable 'EnabledByDependencyOnly' features
+            // to ensure we auto disable any feature that is no longer needed.
+            .Union(byDependencyOnlyFeaturesToDisable)
+            .Distinct()
+            .Reverse()
+            .ToList();
 
-                if (_logger.IsEnabled(LogLevel.Information))
-                {
-                    _logger.LogInformation("Disabling feature '{FeatureName}'", feature.Id);
-                }
+        foreach (var feature in allFeaturesToDisable)
+        {
+            enabledFeatureIds.Remove(feature.Id);
 
-                await featureEventHandlers.InvokeAsync((handler, featureInfo) => handler.DisablingAsync(featureInfo), feature, _logger);
+            if (_logger.IsEnabled(LogLevel.Information))
+            {
+                _logger.LogInformation("Disabling feature '{FeatureName}'", feature.Id);
             }
 
-            var allFeaturesToEnable = featuresToEnable
-                .Where(feature => !feature.EnabledByDependencyOnly)
-                .SelectMany(feature => GetFeaturesToEnable(feature, enabledFeatureIds, force))
-                .Distinct()
-                .ToList();
+            await featureEventHandlers.InvokeAsync((handler, featureInfo) => handler.DisablingAsync(featureInfo), feature, _logger);
+        }
 
-            foreach (var feature in allFeaturesToEnable)
-            {
-                if (_logger.IsEnabled(LogLevel.Information))
-                {
-                    _logger.LogInformation("Enabling feature '{FeatureName}'", feature.Id);
-                }
+        var allFeaturesToEnable = featuresToEnable
+            .Where(feature => !feature.EnabledByDependencyOnly)
+            .SelectMany(feature => GetFeaturesToEnable(feature, enabledFeatureIds, force))
+            .Distinct()
+            .ToList();
 
-                await featureEventHandlers.InvokeAsync((handler, featureInfo) => handler.EnablingAsync(featureInfo), feature, _logger);
+        foreach (var feature in allFeaturesToEnable)
+        {
+            if (_logger.IsEnabled(LogLevel.Information))
+            {
+                _logger.LogInformation("Enabling feature '{FeatureName}'", feature.Id);
             }
 
-            var allFeaturesToInstall = allFeaturesToEnable
-                .Where(f => !installedFeatureIds.Contains(f.Id))
-                .ToList();
-
-            foreach (var feature in allFeaturesToInstall)
-            {
-                if (_logger.IsEnabled(LogLevel.Information))
-                {
-                    _logger.LogInformation("Installing feature '{FeatureName}'", feature.Id);
-                }
+            await featureEventHandlers.InvokeAsync((handler, featureInfo) => handler.EnablingAsync(featureInfo), feature, _logger);
+        }
 
-                await featureEventHandlers.InvokeAsync((handler, featureInfo) => handler.InstallingAsync(featureInfo), feature, _logger);
-            }
+        var allFeaturesToInstall = allFeaturesToEnable
+            .Where(f => !installedFeatureIds.Contains(f.Id))
+            .ToList();
 
-            if (allFeaturesToEnable.Count > 0)
+        foreach (var feature in allFeaturesToInstall)
+        {
+            if (_logger.IsEnabled(LogLevel.Information))
             {
-                enabledFeatureIds.UnionWith(allFeaturesToEnable.Select(f => f.Id));
+                _logger.LogInformation("Installing feature '{FeatureName}'", feature.Id);
             }
 
-            if (allFeaturesToDisable.Count > 0 || allFeaturesToEnable.Count > 0)
+            await featureEventHandlers.InvokeAsync((handler, featureInfo) => handler.InstallingAsync(featureInfo), feature, _logger);
+        }
+
+        if (allFeaturesToEnable.Count > 0)
+        {
+            enabledFeatureIds.UnionWith(allFeaturesToEnable.Select(f => f.Id));
+        }
+
+        if (allFeaturesToDisable.Count > 0 || allFeaturesToEnable.Count > 0)
+        {
+            await _shellDescriptorManager.UpdateShellDescriptorAsync(
+                shellDescriptor.SerialNumber,
+                enabledFeatureIds.Select(id => new ShellFeature(id)).ToArray());
+
+            ShellScope.AddDeferredTask(async scope =>
             {
-                await _shellDescriptorManager.UpdateShellDescriptorAsync(
-                    shellDescriptor.SerialNumber,
-                    enabledFeatureIds.Select(id => new ShellFeature(id)).ToArray());
+                var featureEventHandlers = scope.ServiceProvider.GetServices<IFeatureEventHandler>();
+                var logger = scope.ServiceProvider.GetRequiredService<ILogger<ShellFeaturesManager>>();
 
-                ShellScope.AddDeferredTask(async scope =>
+                foreach (var feature in allFeaturesToInstall)
                 {
-                    var featureEventHandlers = scope.ServiceProvider.GetServices<IFeatureEventHandler>();
-                    var logger = scope.ServiceProvider.GetRequiredService<ILogger<ShellFeaturesManager>>();
-
-                    foreach (var feature in allFeaturesToInstall)
+                    if (logger.IsEnabled(LogLevel.Information))
                     {
-                        if (logger.IsEnabled(LogLevel.Information))
-                        {
-                            logger.LogInformation("Feature '{FeatureName}' was installed", feature.Id);
-                        }
-
-                        await featureEventHandlers.InvokeAsync((handler, featureInfo) => handler.InstalledAsync(featureInfo), feature, logger);
+                        logger.LogInformation("Feature '{FeatureName}' was installed", feature.Id);
                     }
 
-                    foreach (var feature in allFeaturesToEnable)
-                    {
-                        if (logger.IsEnabled(LogLevel.Information))
-                        {
-                            logger.LogInformation("Feature '{FeatureName}' was enabled", feature.Id);
-                        }
+                    await featureEventHandlers.InvokeAsync((handler, featureInfo) => handler.InstalledAsync(featureInfo), feature, logger);
+                }
 
-                        await featureEventHandlers.InvokeAsync((handler, featureInfo) => handler.EnabledAsync(featureInfo), feature, logger);
+                foreach (var feature in allFeaturesToEnable)
+                {
+                    if (logger.IsEnabled(LogLevel.Information))
+                    {
+                        logger.LogInformation("Feature '{FeatureName}' was enabled", feature.Id);
                     }
 
-                    foreach (var feature in allFeaturesToDisable)
-                    {
-                        if (logger.IsEnabled(LogLevel.Information))
-                        {
-                            logger.LogInformation("Feature '{FeatureName}' was disabled", feature.Id);
-                        }
+                    await featureEventHandlers.InvokeAsync((handler, featureInfo) => handler.EnabledAsync(featureInfo), feature, logger);
+                }
 
-                        await featureEventHandlers.InvokeAsync((handler, featureInfo) => handler.DisabledAsync(featureInfo), feature, logger);
+                foreach (var feature in allFeaturesToDisable)
+                {
+                    if (logger.IsEnabled(LogLevel.Information))
+                    {
+                        logger.LogInformation("Feature '{FeatureName}' was disabled", feature.Id);
                     }
-                });
-            }
 
-            return (allFeaturesToDisable, allFeaturesToEnable);
+                    await featureEventHandlers.InvokeAsync((handler, featureInfo) => handler.DisabledAsync(featureInfo), feature, logger);
+                }
+            });
         }
 
-        /// <summary>
-        /// Enables a feature.
-        /// </summary>
-        /// <param name="featureInfo">The info of the feature to be enabled.</param>
-        /// <param name="enabledFeatureIds">The list of feature ids which are currently enabled.</param>
-        /// <param name="force">Boolean parameter indicating if the feature should enable it's dependencies.</param>
-        /// <returns>An enumeration of the features to disable, empty if 'force' = true and a dependency is disabled.</returns>
-        private List<IFeatureInfo> GetFeaturesToEnable(IFeatureInfo featureInfo, IEnumerable<string> enabledFeatureIds, bool force)
-        {
-            var featuresToEnable = _extensionManager
-                .GetFeatureDependencies(featureInfo.Id)
-                .Where(f => !enabledFeatureIds.Contains(f.Id))
-                .ToList();
+        return (allFeaturesToDisable, allFeaturesToEnable);
+    }
 
-            if (featuresToEnable.Count > 1 && !force)
-            {
-                if (_logger.IsEnabled(LogLevel.Warning))
-                {
-                    _logger.LogWarning(" To enable '{FeatureId}', additional features need to be enabled.", featureInfo.Id);
-                }
+    /// <summary>
+    /// Enables a feature.
+    /// </summary>
+    /// <param name="featureInfo">The info of the feature to be enabled.</param>
+    /// <param name="enabledFeatureIds">The list of feature ids which are currently enabled.</param>
+    /// <param name="force">Boolean parameter indicating if the feature should enable it's dependencies.</param>
+    /// <returns>An enumeration of the features to disable, empty if 'force' = true and a dependency is disabled.</returns>
+    private List<IFeatureInfo> GetFeaturesToEnable(IFeatureInfo featureInfo, IEnumerable<string> enabledFeatureIds, bool force)
+    {
+        var featuresToEnable = _extensionManager
+            .GetFeatureDependencies(featureInfo.Id)
+            .Where(f => !enabledFeatureIds.Contains(f.Id))
+            .ToList();
 
-                return [];
+        if (featuresToEnable.Count > 1 && !force)
+        {
+            if (_logger.IsEnabled(LogLevel.Warning))
+            {
+                _logger.LogWarning(" To enable '{FeatureId}', additional features need to be enabled.", featureInfo.Id);
             }
 
-            return featuresToEnable;
+            return [];
         }
 
-        /// <summary>
-        /// Disables a feature.
-        /// </summary>
-        /// <param name="featureInfo">The info of the feature to be disabled.</param>
-        /// <param name="enabledFeatureIds">The list of feature ids which are currently enabled.</param>
-        /// <param name="force">Boolean parameter indicating if the feature should disable it's dependents.</param>
-        /// <returns>An enumeration of the features to enable, empty if 'force' = true and a dependent is enabled.</returns>
-        private List<IFeatureInfo> GetFeaturesToDisable(IFeatureInfo featureInfo, IEnumerable<string> enabledFeatureIds, bool force)
-        {
-            var featuresToDisable = _extensionManager
-                .GetDependentFeatures(featureInfo.Id)
-                .Where(f => enabledFeatureIds.Contains(f.Id))
-                .ToList();
+        return featuresToEnable;
+    }
 
-            if (featuresToDisable.Count > 1 && !force)
-            {
-                if (_logger.IsEnabled(LogLevel.Warning))
-                {
-                    _logger.LogWarning(" To disable '{FeatureId}', additional features need to be disabled.", featureInfo.Id);
-                }
+    /// <summary>
+    /// Disables a feature.
+    /// </summary>
+    /// <param name="featureInfo">The info of the feature to be disabled.</param>
+    /// <param name="enabledFeatureIds">The list of feature ids which are currently enabled.</param>
+    /// <param name="force">Boolean parameter indicating if the feature should disable it's dependents.</param>
+    /// <returns>An enumeration of the features to enable, empty if 'force' = true and a dependent is enabled.</returns>
+    private List<IFeatureInfo> GetFeaturesToDisable(IFeatureInfo featureInfo, IEnumerable<string> enabledFeatureIds, bool force)
+    {
+        var featuresToDisable = _extensionManager
+            .GetDependentFeatures(featureInfo.Id)
+            .Where(f => enabledFeatureIds.Contains(f.Id))
+            .ToList();
 
-                return [];
+        if (featuresToDisable.Count > 1 && !force)
+        {
+            if (_logger.IsEnabled(LogLevel.Warning))
+            {
+                _logger.LogWarning(" To disable '{FeatureId}', additional features need to be disabled.", featureInfo.Id);
             }
 
-            return featuresToDisable;
+            return [];
         }
+
+        return featuresToDisable;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/ShellFeaturesManager.cs b/src/OrchardCore/OrchardCore/Shell/ShellFeaturesManager.cs
index 1245c4904c3..da7dfe56b7b 100644
--- a/src/OrchardCore/OrchardCore/Shell/ShellFeaturesManager.cs
+++ b/src/OrchardCore/OrchardCore/Shell/ShellFeaturesManager.cs
@@ -5,81 +5,80 @@
 using OrchardCore.Environment.Extensions.Features;
 using OrchardCore.Environment.Shell.Descriptor.Models;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+public class ShellFeaturesManager : IShellFeaturesManager
 {
-    public class ShellFeaturesManager : IShellFeaturesManager
-    {
-        private readonly IExtensionManager _extensionManager;
-        private readonly ShellDescriptor _shellDescriptor;
-        private readonly IShellDescriptorFeaturesManager _shellDescriptorFeaturesManager;
-        private readonly IEnumerable<IFeatureValidationProvider> _featureValidators;
+    private readonly IExtensionManager _extensionManager;
+    private readonly ShellDescriptor _shellDescriptor;
+    private readonly IShellDescriptorFeaturesManager _shellDescriptorFeaturesManager;
+    private readonly IEnumerable<IFeatureValidationProvider> _featureValidators;
 
-        public ShellFeaturesManager(
-            IExtensionManager extensionManager,
-            ShellDescriptor shellDescriptor,
-            IShellDescriptorFeaturesManager shellDescriptorFeaturesManager,
-            IEnumerable<IFeatureValidationProvider> featureValidators)
-        {
-            _extensionManager = extensionManager;
-            _shellDescriptor = shellDescriptor;
-            _shellDescriptorFeaturesManager = shellDescriptorFeaturesManager;
-            _featureValidators = featureValidators;
-        }
+    public ShellFeaturesManager(
+        IExtensionManager extensionManager,
+        ShellDescriptor shellDescriptor,
+        IShellDescriptorFeaturesManager shellDescriptorFeaturesManager,
+        IEnumerable<IFeatureValidationProvider> featureValidators)
+    {
+        _extensionManager = extensionManager;
+        _shellDescriptor = shellDescriptor;
+        _shellDescriptorFeaturesManager = shellDescriptorFeaturesManager;
+        _featureValidators = featureValidators;
+    }
 
-        public async Task<IEnumerable<IFeatureInfo>> GetAvailableFeaturesAsync()
+    public async Task<IEnumerable<IFeatureInfo>> GetAvailableFeaturesAsync()
+    {
+        var features = _extensionManager.GetFeatures();
+        var result = new List<IFeatureInfo>();
+        foreach (var feature in features)
         {
-            var features = _extensionManager.GetFeatures();
-            var result = new List<IFeatureInfo>();
-            foreach (var feature in features)
+            var isFeatureValid = true;
+            foreach (var validator in _featureValidators)
             {
-                var isFeatureValid = true;
-                foreach (var validator in _featureValidators)
+                isFeatureValid = await validator.IsFeatureValidAsync(feature.Id);
+                // When a feature is marked as invalid it cannot be reintroduced.
+                if (!isFeatureValid)
                 {
-                    isFeatureValid = await validator.IsFeatureValidAsync(feature.Id);
-                    // When a feature is marked as invalid it cannot be reintroduced.
-                    if (!isFeatureValid)
-                    {
-                        break;
-                    }
-                }
-
-                if (isFeatureValid)
-                {
-                    result.Add(feature);
+                    break;
                 }
             }
 
-            return result;
+            if (isFeatureValid)
+            {
+                result.Add(feature);
+            }
         }
 
-        public Task<IEnumerable<IFeatureInfo>> GetEnabledFeaturesAsync()
-        {
-            return Task.FromResult(_extensionManager.GetFeatures().Where(f => _shellDescriptor.Features.Any(sf => sf.Id == f.Id)));
-        }
+        return result;
+    }
 
-        public Task<IEnumerable<IFeatureInfo>> GetAlwaysEnabledFeaturesAsync()
-        {
-            return Task.FromResult(_extensionManager.GetFeatures().Where(f => f.IsAlwaysEnabled || _shellDescriptor.Features.Any(sf => sf.Id == f.Id && sf.AlwaysEnabled)));
-        }
+    public Task<IEnumerable<IFeatureInfo>> GetEnabledFeaturesAsync()
+    {
+        return Task.FromResult(_extensionManager.GetFeatures().Where(f => _shellDescriptor.Features.Any(sf => sf.Id == f.Id)));
+    }
 
-        public Task<IEnumerable<IFeatureInfo>> GetDisabledFeaturesAsync()
-        {
-            return Task.FromResult(_extensionManager.GetFeatures().Where(f => _shellDescriptor.Features.All(sf => sf.Id != f.Id)));
-        }
+    public Task<IEnumerable<IFeatureInfo>> GetAlwaysEnabledFeaturesAsync()
+    {
+        return Task.FromResult(_extensionManager.GetFeatures().Where(f => f.IsAlwaysEnabled || _shellDescriptor.Features.Any(sf => sf.Id == f.Id && sf.AlwaysEnabled)));
+    }
 
-        public Task<(IEnumerable<IFeatureInfo>, IEnumerable<IFeatureInfo>)> UpdateFeaturesAsync(IEnumerable<IFeatureInfo> featuresToDisable, IEnumerable<IFeatureInfo> featuresToEnable, bool force)
-        {
-            return _shellDescriptorFeaturesManager.UpdateFeaturesAsync(_shellDescriptor, featuresToDisable, featuresToEnable, force);
-        }
+    public Task<IEnumerable<IFeatureInfo>> GetDisabledFeaturesAsync()
+    {
+        return Task.FromResult(_extensionManager.GetFeatures().Where(f => _shellDescriptor.Features.All(sf => sf.Id != f.Id)));
+    }
 
-        public Task<IEnumerable<IExtensionInfo>> GetEnabledExtensionsAsync()
-        {
-            // enabled extensions are those which have at least one enabled feature.
-            var enabledIds = _extensionManager.GetFeatures().Where(f => _shellDescriptor
-                .Features.Any(sf => sf.Id == f.Id)).Select(f => f.Extension.Id).Distinct().ToArray();
+    public Task<(IEnumerable<IFeatureInfo>, IEnumerable<IFeatureInfo>)> UpdateFeaturesAsync(IEnumerable<IFeatureInfo> featuresToDisable, IEnumerable<IFeatureInfo> featuresToEnable, bool force)
+    {
+        return _shellDescriptorFeaturesManager.UpdateFeaturesAsync(_shellDescriptor, featuresToDisable, featuresToEnable, force);
+    }
 
-            // Extensions are still ordered according to the weight of their first features.
-            return Task.FromResult(_extensionManager.GetExtensions().Where(e => enabledIds.Contains(e.Id)));
-        }
+    public Task<IEnumerable<IExtensionInfo>> GetEnabledExtensionsAsync()
+    {
+        // enabled extensions are those which have at least one enabled feature.
+        var enabledIds = _extensionManager.GetFeatures().Where(f => _shellDescriptor
+            .Features.Any(sf => sf.Id == f.Id)).Select(f => f.Extension.Id).Distinct().ToArray();
+
+        // Extensions are still ordered according to the weight of their first features.
+        return Task.FromResult(_extensionManager.GetExtensions().Where(e => enabledIds.Contains(e.Id)));
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/ShellHost.cs b/src/OrchardCore/OrchardCore/Shell/ShellHost.cs
index f2f6b68c354..a3fa288ad84 100644
--- a/src/OrchardCore/OrchardCore/Shell/ShellHost.cs
+++ b/src/OrchardCore/OrchardCore/Shell/ShellHost.cs
@@ -11,547 +11,546 @@
 using OrchardCore.Environment.Shell.Events;
 using OrchardCore.Environment.Shell.Scope;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+/// <summary>
+/// All <see cref="ShellContext"/> are pre-created when <see cref="InitializeAsync"/> is called on startup and where we first load
+/// all <see cref="ShellSettings"/> that we also need to register in the <see cref="IRunningShellTable"/> to serve incoming requests.
+/// For each <see cref="ShellContext"/> a service container and then a request pipeline are only built on the first matching request.
+/// </summary>
+public sealed class ShellHost : IShellHost, IDisposable, IAsyncDisposable
 {
+    private const int ReloadShellMaxRetriesCount = 9;
+
+    private readonly IShellSettingsManager _shellSettingsManager;
+    private readonly IShellContextFactory _shellContextFactory;
+    private readonly IRunningShellTable _runningShellTable;
+    private readonly IExtensionManager _extensionManager;
+    private readonly ILogger _logger;
+
+    private bool _initialized;
+    private readonly ConcurrentDictionary<string, ShellContext> _shellContexts = new(StringComparer.OrdinalIgnoreCase);
+    private readonly ConcurrentDictionary<string, ShellSettings> _shellSettings = new(StringComparer.OrdinalIgnoreCase);
+    private readonly ConcurrentDictionary<string, SemaphoreSlim> _shellSemaphores = new();
+    private readonly SemaphoreSlim _initializingSemaphore = new(1);
+
+    public ShellHost(
+        IShellSettingsManager shellSettingsManager,
+        IShellContextFactory shellContextFactory,
+        IRunningShellTable runningShellTable,
+        IExtensionManager extensionManager,
+        ILogger<ShellHost> logger)
+    {
+        _shellSettingsManager = shellSettingsManager;
+        _shellContextFactory = shellContextFactory;
+        _runningShellTable = runningShellTable;
+        _extensionManager = extensionManager;
+        _logger = logger;
+    }
+
+    public ShellsEvent LoadingAsync { get; set; }
+    public ShellEvent ReleasingAsync { get; set; }
+    public ShellEvent ReloadingAsync { get; set; }
+    public ShellEvent RemovingAsync { get; set; }
+
     /// <summary>
-    /// All <see cref="ShellContext"/> are pre-created when <see cref="InitializeAsync"/> is called on startup and where we first load
-    /// all <see cref="ShellSettings"/> that we also need to register in the <see cref="IRunningShellTable"/> to serve incoming requests.
-    /// For each <see cref="ShellContext"/> a service container and then a request pipeline are only built on the first matching request.
+    /// Ensures that all the <see cref="ShellContext"/> are pre-created and available to process requests.
     /// </summary>
-    public sealed class ShellHost : IShellHost, IDisposable, IAsyncDisposable
+    public async Task InitializeAsync()
     {
-        private const int ReloadShellMaxRetriesCount = 9;
-
-        private readonly IShellSettingsManager _shellSettingsManager;
-        private readonly IShellContextFactory _shellContextFactory;
-        private readonly IRunningShellTable _runningShellTable;
-        private readonly IExtensionManager _extensionManager;
-        private readonly ILogger _logger;
-
-        private bool _initialized;
-        private readonly ConcurrentDictionary<string, ShellContext> _shellContexts = new(StringComparer.OrdinalIgnoreCase);
-        private readonly ConcurrentDictionary<string, ShellSettings> _shellSettings = new(StringComparer.OrdinalIgnoreCase);
-        private readonly ConcurrentDictionary<string, SemaphoreSlim> _shellSemaphores = new();
-        private readonly SemaphoreSlim _initializingSemaphore = new(1);
-
-        public ShellHost(
-            IShellSettingsManager shellSettingsManager,
-            IShellContextFactory shellContextFactory,
-            IRunningShellTable runningShellTable,
-            IExtensionManager extensionManager,
-            ILogger<ShellHost> logger)
-        {
-            _shellSettingsManager = shellSettingsManager;
-            _shellContextFactory = shellContextFactory;
-            _runningShellTable = runningShellTable;
-            _extensionManager = extensionManager;
-            _logger = logger;
-        }
-
-        public ShellsEvent LoadingAsync { get; set; }
-        public ShellEvent ReleasingAsync { get; set; }
-        public ShellEvent ReloadingAsync { get; set; }
-        public ShellEvent RemovingAsync { get; set; }
-
-        /// <summary>
-        /// Ensures that all the <see cref="ShellContext"/> are pre-created and available to process requests.
-        /// </summary>
-        public async Task InitializeAsync()
-        {
-            if (_initialized)
-            {
-                return;
-            }
+        if (_initialized)
+        {
+            return;
+        }
 
-            // Prevent concurrent requests from creating all shells multiple times.
-            await _initializingSemaphore.WaitAsync();
-            try
-            {
-                if (!_initialized)
-                {
-                    await PreCreateAndRegisterShellsAsync();
-                    _initialized = true;
-                }
-            }
-            finally
+        // Prevent concurrent requests from creating all shells multiple times.
+        await _initializingSemaphore.WaitAsync();
+        try
+        {
+            if (!_initialized)
             {
-                _initializingSemaphore.Release();
+                await PreCreateAndRegisterShellsAsync();
+                _initialized = true;
             }
         }
+        finally
+        {
+            _initializingSemaphore.Release();
+        }
+    }
 
-        /// <summary>
-        /// Returns an existing <see cref="ShellContext"/> or creates a new one if necessary.
-        /// </summary>
-        public async Task<ShellContext> GetOrCreateShellContextAsync(ShellSettings settings)
+    /// <summary>
+    /// Returns an existing <see cref="ShellContext"/> or creates a new one if necessary.
+    /// </summary>
+    public async Task<ShellContext> GetOrCreateShellContextAsync(ShellSettings settings)
+    {
+        ShellContext shell = null;
+        while (shell is null)
         {
-            ShellContext shell = null;
-            while (shell is null)
+            if (!_shellContexts.TryGetValue(settings.Name, out shell))
             {
-                if (!_shellContexts.TryGetValue(settings.Name, out shell))
-                {
-                    var semaphore = _shellSemaphores.GetOrAdd(settings.Name, (name) => new SemaphoreSlim(1));
+                var semaphore = _shellSemaphores.GetOrAdd(settings.Name, (name) => new SemaphoreSlim(1));
 
-                    await semaphore.WaitAsync();
-                    try
+                await semaphore.WaitAsync();
+                try
+                {
+                    if (!_shellContexts.TryGetValue(settings.Name, out shell))
                     {
-                        if (!_shellContexts.TryGetValue(settings.Name, out shell))
+                        if (!settings.HasConfiguration())
                         {
-                            if (!settings.HasConfiguration())
-                            {
-                                settings = await _shellSettingsManager.LoadSettingsAsync(settings.Name);
-                            }
-
-                            shell = await CreateShellContextAsync(settings);
-                            AddAndRegisterShell(shell);
+                            settings = await _shellSettingsManager.LoadSettingsAsync(settings.Name);
                         }
-                    }
-                    finally
-                    {
-                        semaphore.Release();
+
+                        shell = await CreateShellContextAsync(settings);
+                        AddAndRegisterShell(shell);
                     }
                 }
-
-                if (shell.Released)
+                finally
                 {
-                    // If the context is released, it is removed from the dictionary so that the next iteration
-                    // or a new call on 'GetOrCreateShellContextAsync()' will recreate a new shell context.
-                    _shellContexts.TryRemove(settings.Name, out _);
-                    shell = null;
+                    semaphore.Release();
                 }
             }
 
-            return shell;
+            if (shell.Released)
+            {
+                // If the context is released, it is removed from the dictionary so that the next iteration
+                // or a new call on 'GetOrCreateShellContextAsync()' will recreate a new shell context.
+                _shellContexts.TryRemove(settings.Name, out _);
+                shell = null;
+            }
         }
 
-        /// <summary>
-        /// Creates a standalone service scope that can be used to resolve local services.
-        /// </summary>
-        public async Task<ShellScope> GetScopeAsync(ShellSettings settings)
+        return shell;
+    }
+
+    /// <summary>
+    /// Creates a standalone service scope that can be used to resolve local services.
+    /// </summary>
+    public async Task<ShellScope> GetScopeAsync(ShellSettings settings)
+    {
+        ShellScope scope = null;
+        while (scope is null)
         {
-            ShellScope scope = null;
-            while (scope is null)
+            if (!_shellContexts.TryGetValue(settings.Name, out var shellContext))
             {
-                if (!_shellContexts.TryGetValue(settings.Name, out var shellContext))
-                {
-                    shellContext = await GetOrCreateShellContextAsync(settings);
-                }
+                shellContext = await GetOrCreateShellContextAsync(settings);
+            }
 
-                // We create a scope before checking if the shell has been released.
-                scope = await shellContext.CreateScopeAsync();
+            // We create a scope before checking if the shell has been released.
+            scope = await shellContext.CreateScopeAsync();
 
-                // If 'CreateScope()' returned null, the shell is released. We then remove it and
-                // retry with the hope to get one that won't be released before we create a scope.
-                if (scope is null)
-                {
-                    // If the context is released, it is removed from the dictionary so that the next
-                    // iteration or a new call on 'GetScopeAsync()' will recreate a new shell context.
-                    _shellContexts.TryRemove(settings.Name, out _);
-                }
+            // If 'CreateScope()' returned null, the shell is released. We then remove it and
+            // retry with the hope to get one that won't be released before we create a scope.
+            if (scope is null)
+            {
+                // If the context is released, it is removed from the dictionary so that the next
+                // iteration or a new call on 'GetScopeAsync()' will recreate a new shell context.
+                _shellContexts.TryRemove(settings.Name, out _);
             }
+        }
+
+        return scope;
+    }
+
+    /// <summary>
+    /// Updates an existing shell configuration and then reloads the shell.
+    /// </summary>
+    public async Task UpdateShellSettingsAsync(ShellSettings settings)
+    {
+        settings.VersionId = IdGenerator.GenerateId();
+        await _shellSettingsManager.SaveSettingsAsync(settings);
+        await ReloadShellContextAsync(settings);
+    }
+
+    /// <summary>
+    /// Removes a shell context and its settings from memory and from the storage.
+    /// </summary>
+    public async Task RemoveShellSettingsAsync(ShellSettings settings)
+    {
+        CheckCanRemoveShell(settings);
+        await _shellSettingsManager.RemoveSettingsAsync(settings);
+        await RemoveShellContextAsync(settings);
+    }
 
-            return scope;
+    /// <summary>
+    /// A feature is enabled / disabled, the tenant needs to be released so that a new shell will be built.
+    /// </summary>
+    public Task ChangedAsync(ShellDescriptor descriptor, ShellSettings settings)
+        => ReleaseShellContextAsync(settings);
+
+    /// <summary>
+    /// Reloads the settings and releases the shell so that a new one will be
+    /// built for subsequent requests, while existing requests get flushed.
+    /// </summary>
+    /// <param name="settings">The <see cref="ShellSettings"/> to reload.</param>
+    /// <param name="eventSource">Whether the related <see cref="ShellEvent"/> is invoked.</param>
+    public async Task ReloadShellContextAsync(ShellSettings settings, bool eventSource = true)
+    {
+        // A shell can't be reloaded while it is initializing, only released.
+        if (settings.IsInitializing())
+        {
+            return;
         }
 
-        /// <summary>
-        /// Updates an existing shell configuration and then reloads the shell.
-        /// </summary>
-        public async Task UpdateShellSettingsAsync(ShellSettings settings)
+        if (ReloadingAsync is not null && eventSource)
         {
-            settings.VersionId = IdGenerator.GenerateId();
-            await _shellSettingsManager.SaveSettingsAsync(settings);
-            await ReloadShellContextAsync(settings);
+            foreach (var d in ReloadingAsync.GetInvocationList())
+            {
+                await ((ShellEvent)d)(settings.Name);
+            }
         }
 
-        /// <summary>
-        /// Removes a shell context and its settings from memory and from the storage.
-        /// </summary>
-        public async Task RemoveShellSettingsAsync(ShellSettings settings)
+        // A disabled shell still in use will be released by its last scope.
+        if (!CanReleaseShell(settings))
         {
-            CheckCanRemoveShell(settings);
-            await _shellSettingsManager.RemoveSettingsAsync(settings);
-            await RemoveShellContextAsync(settings);
+            _runningShellTable.Remove(settings);
+            return;
         }
 
-        /// <summary>
-        /// A feature is enabled / disabled, the tenant needs to be released so that a new shell will be built.
-        /// </summary>
-        public Task ChangedAsync(ShellDescriptor descriptor, ShellSettings settings)
-            => ReleaseShellContextAsync(settings);
+        // Reload the shell settings from the configuration.
+        settings = await _shellSettingsManager.LoadSettingsAsync(settings.Name);
 
-        /// <summary>
-        /// Reloads the settings and releases the shell so that a new one will be
-        /// built for subsequent requests, while existing requests get flushed.
-        /// </summary>
-        /// <param name="settings">The <see cref="ShellSettings"/> to reload.</param>
-        /// <param name="eventSource">Whether the related <see cref="ShellEvent"/> is invoked.</param>
-        public async Task ReloadShellContextAsync(ShellSettings settings, bool eventSource = true)
+        var count = 0;
+        while (count++ < ReloadShellMaxRetriesCount)
         {
-            // A shell can't be reloaded while it is initializing, only released.
-            if (settings.IsInitializing())
+            if (_shellContexts.TryRemove(settings.Name, out var context))
             {
-                return;
+                _runningShellTable.Remove(settings);
+                context.Settings.AsDisposable();
+                await context.ReleaseAsync();
             }
 
-            if (ReloadingAsync is not null && eventSource)
+            // Add a 'PlaceHolder' allowing to retrieve the settings until the shell will be rebuilt.
+            if (!_shellContexts.TryAdd(settings.Name, new ShellContext.PlaceHolder { Settings = settings }))
             {
-                foreach (var d in ReloadingAsync.GetInvocationList())
-                {
-                    await ((ShellEvent)d)(settings.Name);
-                }
+                // Atomicity: We may have been the last to load the settings but unable to add the shell.
+                continue;
             }
 
-            // A disabled shell still in use will be released by its last scope.
-            if (!CanReleaseShell(settings))
+            _shellSettings[settings.Name] = settings;
+
+            if (CanRegisterShell(settings))
             {
-                _runningShellTable.Remove(settings);
-                return;
+                _runningShellTable.Add(settings);
             }
 
-            // Reload the shell settings from the configuration.
-            settings = await _shellSettingsManager.LoadSettingsAsync(settings.Name);
-
-            var count = 0;
-            while (count++ < ReloadShellMaxRetriesCount)
+            // Consistency: We may have been the last to add the shell but not with the last settings.
+            var loaded = await _shellSettingsManager.LoadSettingsAsync(settings.Name);
+            if (settings.VersionId == loaded.VersionId)
             {
-                if (_shellContexts.TryRemove(settings.Name, out var context))
-                {
-                    _runningShellTable.Remove(settings);
-                    context.Settings.AsDisposable();
-                    await context.ReleaseAsync();
-                }
-
-                // Add a 'PlaceHolder' allowing to retrieve the settings until the shell will be rebuilt.
-                if (!_shellContexts.TryAdd(settings.Name, new ShellContext.PlaceHolder { Settings = settings }))
-                {
-                    // Atomicity: We may have been the last to load the settings but unable to add the shell.
-                    continue;
-                }
-
-                _shellSettings[settings.Name] = settings;
-
-                if (CanRegisterShell(settings))
-                {
-                    _runningShellTable.Add(settings);
-                }
-
-                // Consistency: We may have been the last to add the shell but not with the last settings.
-                var loaded = await _shellSettingsManager.LoadSettingsAsync(settings.Name);
-                if (settings.VersionId == loaded.VersionId)
-                {
-                    loaded.AsDisposable().Dispose();
-                    return;
-                }
-
-                settings = loaded;
+                loaded.AsDisposable().Dispose();
+                return;
             }
 
-            throw new ShellHostReloadException(
-                $"Unable to reload the tenant '{settings.Name}' as too many concurrent processes are trying to do so.");
+            settings = loaded;
         }
 
-        /// <summary>
-        /// Releases a shell so that a new one will be built for subsequent requests.
-        /// Note: Can be used to free up resources after a given time of inactivity.
-        /// </summary>
-        /// <param name="settings">The <see cref="ShellSettings"/> to reload.</param>
-        /// <param name="eventSource">Whether the related <see cref="ShellEvent"/> is invoked.</param>
-        public async Task ReleaseShellContextAsync(ShellSettings settings, bool eventSource = true)
-        {
-            if (ReleasingAsync is not null && eventSource && !settings.IsInitializing())
-            {
-                foreach (var d in ReleasingAsync.GetInvocationList())
-                {
-                    await ((ShellEvent)d)(settings.Name);
-                }
-            }
+        throw new ShellHostReloadException(
+            $"Unable to reload the tenant '{settings.Name}' as too many concurrent processes are trying to do so.");
+    }
 
-            // A disabled shell still in use will be released by its last scope.
-            if (!CanReleaseShell(settings))
+    /// <summary>
+    /// Releases a shell so that a new one will be built for subsequent requests.
+    /// Note: Can be used to free up resources after a given time of inactivity.
+    /// </summary>
+    /// <param name="settings">The <see cref="ShellSettings"/> to reload.</param>
+    /// <param name="eventSource">Whether the related <see cref="ShellEvent"/> is invoked.</param>
+    public async Task ReleaseShellContextAsync(ShellSettings settings, bool eventSource = true)
+    {
+        if (ReleasingAsync is not null && eventSource && !settings.IsInitializing())
+        {
+            foreach (var d in ReleasingAsync.GetInvocationList())
             {
-                return;
+                await ((ShellEvent)d)(settings.Name);
             }
+        }
 
-            if (_shellContexts.TryRemove(settings.Name, out var context))
-            {
-                await context.ReleaseAsync();
-            }
+        // A disabled shell still in use will be released by its last scope.
+        if (!CanReleaseShell(settings))
+        {
+            return;
+        }
 
-            // Add a 'PlaceHolder' allowing to retrieve the settings until the shell will be rebuilt.
-            if (_shellContexts.TryAdd(settings.Name, new ShellContext.PlaceHolder { Settings = settings }))
-            {
-                _shellSettings[settings.Name] = settings;
-            }
+        if (_shellContexts.TryRemove(settings.Name, out var context))
+        {
+            await context.ReleaseAsync();
         }
 
-        /// <summary>
-        /// Removes a shell context and its settings but only from memory, used for syncing
-        /// when the settings has been already removed from the storage by another instance.
-        /// </summary>
-        /// <param name="settings">The <see cref="ShellSettings"/> of the shell to remove.</param>
-        /// <param name="eventSource">Whether the related <see cref="ShellEvent"/> is invoked.</param>
-        public async Task RemoveShellContextAsync(ShellSettings settings, bool eventSource = true)
+        // Add a 'PlaceHolder' allowing to retrieve the settings until the shell will be rebuilt.
+        if (_shellContexts.TryAdd(settings.Name, new ShellContext.PlaceHolder { Settings = settings }))
         {
-            CheckCanRemoveShell(settings);
+            _shellSettings[settings.Name] = settings;
+        }
+    }
 
-            if (RemovingAsync is not null && eventSource && !settings.IsInitializing())
-            {
-                foreach (var d in RemovingAsync.GetInvocationList())
-                {
-                    await ((ShellEvent)d)(settings.Name);
-                }
-            }
+    /// <summary>
+    /// Removes a shell context and its settings but only from memory, used for syncing
+    /// when the settings has been already removed from the storage by another instance.
+    /// </summary>
+    /// <param name="settings">The <see cref="ShellSettings"/> of the shell to remove.</param>
+    /// <param name="eventSource">Whether the related <see cref="ShellEvent"/> is invoked.</param>
+    public async Task RemoveShellContextAsync(ShellSettings settings, bool eventSource = true)
+    {
+        CheckCanRemoveShell(settings);
 
-            if (_shellContexts.TryRemove(settings.Name, out var context))
+        if (RemovingAsync is not null && eventSource && !settings.IsInitializing())
+        {
+            foreach (var d in RemovingAsync.GetInvocationList())
             {
-                context.Settings.AsDisposable();
-                await context.ReleaseAsync();
+                await ((ShellEvent)d)(settings.Name);
             }
+        }
 
-            _shellSettings.TryRemove(settings.Name, out _);
+        if (_shellContexts.TryRemove(settings.Name, out var context))
+        {
+            context.Settings.AsDisposable();
+            await context.ReleaseAsync();
         }
 
-        /// <summary>
-        /// Lists all available <see cref="ShellContext"/> instances.
-        /// A shell might have been released or not yet built, if so 'shell.Released' is true and
-        /// 'shell.CreateScopeAsync()' return null, but you can still use 'GetScopeAsync(shell.Settings)'.
-        /// </summary>
-        public IEnumerable<ShellContext> ListShellContexts() => _shellContexts.Values.ToArray();
+        _shellSettings.TryRemove(settings.Name, out _);
+    }
+
+    /// <summary>
+    /// Lists all available <see cref="ShellContext"/> instances.
+    /// A shell might have been released or not yet built, if so 'shell.Released' is true and
+    /// 'shell.CreateScopeAsync()' return null, but you can still use 'GetScopeAsync(shell.Settings)'.
+    /// </summary>
+    public IEnumerable<ShellContext> ListShellContexts() => _shellContexts.Values.ToArray();
 
-        /// <summary>
-        /// Tries to retrieve the shell context associated with the specified tenant.
-        /// The shell may have been temporarily removed while releasing or reloading.
-        /// </summary>
-        public bool TryGetShellContext(string name, out ShellContext shellContext) => _shellContexts.TryGetValue(name, out shellContext);
+    /// <summary>
+    /// Tries to retrieve the shell context associated with the specified tenant.
+    /// The shell may have been temporarily removed while releasing or reloading.
+    /// </summary>
+    public bool TryGetShellContext(string name, out ShellContext shellContext) => _shellContexts.TryGetValue(name, out shellContext);
 
-        /// <summary>
-        /// Tries to retrieve the shell settings associated with the specified tenant.
-        /// </summary>
-        public bool TryGetSettings(string name, out ShellSettings settings) => _shellSettings.TryGetValue(name, out settings);
+    /// <summary>
+    /// Tries to retrieve the shell settings associated with the specified tenant.
+    /// </summary>
+    public bool TryGetSettings(string name, out ShellSettings settings) => _shellSettings.TryGetValue(name, out settings);
 
-        /// <summary>
-        /// Retrieves all shell settings.
-        /// </summary>
-        public IEnumerable<ShellSettings> GetAllSettings() => _shellSettings.Values.ToArray();
+    /// <summary>
+    /// Retrieves all shell settings.
+    /// </summary>
+    public IEnumerable<ShellSettings> GetAllSettings() => _shellSettings.Values.ToArray();
 
-        /// <summary>
-        /// Pre-creates and registers all shells, if the 'Default' shell is not running, a setup context is built.
-        /// On first loading only a placeholder is pre-created for each shell that is then fully built on request.
-        /// </summary>
-        private async Task PreCreateAndRegisterShellsAsync()
+    /// <summary>
+    /// Pre-creates and registers all shells, if the 'Default' shell is not running, a setup context is built.
+    /// On first loading only a placeholder is pre-created for each shell that is then fully built on request.
+    /// </summary>
+    private async Task PreCreateAndRegisterShellsAsync()
+    {
+        if (_logger.IsEnabled(LogLevel.Information))
         {
-            if (_logger.IsEnabled(LogLevel.Information))
-            {
-                _logger.LogInformation("Start creation of shells");
-            }
+            _logger.LogInformation("Start creation of shells");
+        }
 
-            // Load all extensions and features and register their components.
-            await _extensionManager.LoadFeaturesAsync();
+        // Load all extensions and features and register their components.
+        await _extensionManager.LoadFeaturesAsync();
 
-            if (LoadingAsync is not null)
+        if (LoadingAsync is not null)
+        {
+            foreach (var d in LoadingAsync.GetInvocationList())
             {
-                foreach (var d in LoadingAsync.GetInvocationList())
-                {
-                    await ((ShellsEvent)d)();
-                }
+                await ((ShellsEvent)d)();
             }
+        }
 
-            // Is there any tenant right now?
-            var allSettings = (await _shellSettingsManager.LoadSettingsAsync()).Where(CanCreateShell).ToArray();
-            var defaultSettings = allSettings.FirstOrDefault(s => s.IsDefaultShell());
+        // Is there any tenant right now?
+        var allSettings = (await _shellSettingsManager.LoadSettingsAsync()).Where(CanCreateShell).ToArray();
+        var defaultSettings = allSettings.FirstOrDefault(s => s.IsDefaultShell());
 
-            // The 'Default' tenant is not running, run the Setup.
-            if (!defaultSettings.IsRunning())
-            {
-                var setupContext = await CreateSetupContextAsync(defaultSettings);
-                AddAndRegisterShell(setupContext);
-            }
+        // The 'Default' tenant is not running, run the Setup.
+        if (!defaultSettings.IsRunning())
+        {
+            var setupContext = await CreateSetupContextAsync(defaultSettings);
+            AddAndRegisterShell(setupContext);
+        }
 
-            // Pre-create and register all tenant shells.
-            foreach (var settings in allSettings)
-            {
-                AddAndRegisterShell(new ShellContext.PlaceHolder { Settings = settings, PreCreated = true });
-            };
+        // Pre-create and register all tenant shells.
+        foreach (var settings in allSettings)
+        {
+            AddAndRegisterShell(new ShellContext.PlaceHolder { Settings = settings, PreCreated = true });
+        };
 
-            if (_logger.IsEnabled(LogLevel.Information))
-            {
-                _logger.LogInformation("Done pre-creating and registering shells");
-            }
+        if (_logger.IsEnabled(LogLevel.Information))
+        {
+            _logger.LogInformation("Done pre-creating and registering shells");
         }
+    }
 
-        /// <summary>
-        /// Creates a shell context based on shell settings.
-        /// </summary>
-        private Task<ShellContext> CreateShellContextAsync(ShellSettings settings)
+    /// <summary>
+    /// Creates a shell context based on shell settings.
+    /// </summary>
+    private Task<ShellContext> CreateShellContextAsync(ShellSettings settings)
+    {
+        if (settings.IsUninitialized())
         {
-            if (settings.IsUninitialized())
-            {
-                if (_logger.IsEnabled(LogLevel.Debug))
-                {
-                    _logger.LogDebug("Creating shell context for tenant '{TenantName}' setup", settings.Name);
-                }
-
-                return _shellContextFactory.CreateSetupContextAsync(settings);
-            }
-            else if (settings.IsDisabled())
+            if (_logger.IsEnabled(LogLevel.Debug))
             {
-                if (_logger.IsEnabled(LogLevel.Debug))
-                {
-                    _logger.LogDebug("Creating disabled shell context for tenant '{TenantName}'", settings.Name);
-                }
-
-                return Task.FromResult(new ShellContext { Settings = settings });
+                _logger.LogDebug("Creating shell context for tenant '{TenantName}' setup", settings.Name);
             }
-            else if (settings.IsRunning() || settings.IsInitializing())
-            {
-                if (_logger.IsEnabled(LogLevel.Debug))
-                {
-                    _logger.LogDebug("Creating shell context for tenant '{TenantName}'", settings.Name);
-                }
 
-                return _shellContextFactory.CreateShellContextAsync(settings);
-            }
-            else
-            {
-                throw new InvalidOperationException("Unexpected shell state for " + settings.Name);
-            }
+            return _shellContextFactory.CreateSetupContextAsync(settings);
         }
-
-        /// <summary>
-        /// Creates a transient shell for the default tenant's setup.
-        /// </summary>
-        private async Task<ShellContext> CreateSetupContextAsync(ShellSettings defaultSettings)
+        else if (settings.IsDisabled())
         {
             if (_logger.IsEnabled(LogLevel.Debug))
             {
-                _logger.LogDebug("Creating shell context for root setup.");
+                _logger.LogDebug("Creating disabled shell context for tenant '{TenantName}'", settings.Name);
             }
 
-            if (defaultSettings is null)
+            return Task.FromResult(new ShellContext { Settings = settings });
+        }
+        else if (settings.IsRunning() || settings.IsInitializing())
+        {
+            if (_logger.IsEnabled(LogLevel.Debug))
             {
-                // Creates a default shell settings based on the configuration.
-                defaultSettings = _shellSettingsManager
-                    .CreateDefaultSettings()
-                    .AsDefaultShell()
-                    .AsUninitialized()
-                    .AsDisposable();
-
-                await UpdateShellSettingsAsync(defaultSettings);
+                _logger.LogDebug("Creating shell context for tenant '{TenantName}'", settings.Name);
             }
 
-            return await _shellContextFactory.CreateSetupContextAsync(defaultSettings);
+            return _shellContextFactory.CreateShellContextAsync(settings);
+        }
+        else
+        {
+            throw new InvalidOperationException("Unexpected shell state for " + settings.Name);
         }
+    }
 
-        /// <summary>
-        /// Adds the shell and registers its settings in 'RunningShellTable'.
-        /// </summary>
-        private void AddAndRegisterShell(ShellContext context)
+    /// <summary>
+    /// Creates a transient shell for the default tenant's setup.
+    /// </summary>
+    private async Task<ShellContext> CreateSetupContextAsync(ShellSettings defaultSettings)
+    {
+        if (_logger.IsEnabled(LogLevel.Debug))
         {
-            if (_shellContexts.TryAdd(context.Settings.Name, context))
-            {
-                _shellSettings[context.Settings.Name] = context.Settings;
+            _logger.LogDebug("Creating shell context for root setup.");
+        }
 
-                if (CanRegisterShell(context))
-                {
-                    RegisterShellSettings(context.Settings);
-                }
-            }
+        if (defaultSettings is null)
+        {
+            // Creates a default shell settings based on the configuration.
+            defaultSettings = _shellSettingsManager
+                .CreateDefaultSettings()
+                .AsDefaultShell()
+                .AsUninitialized()
+                .AsDisposable();
+
+            await UpdateShellSettingsAsync(defaultSettings);
         }
 
-        /// <summary>
-        /// Whether or not a shell can be activated and added to the running shells.
-        /// </summary>
-        private bool CanRegisterShell(ShellContext context)
+        return await _shellContextFactory.CreateSetupContextAsync(defaultSettings);
+    }
+
+    /// <summary>
+    /// Adds the shell and registers its settings in 'RunningShellTable'.
+    /// </summary>
+    private void AddAndRegisterShell(ShellContext context)
+    {
+        if (_shellContexts.TryAdd(context.Settings.Name, context))
         {
-            if (!CanRegisterShell(context.Settings))
-            {
-                if (_logger.IsEnabled(LogLevel.Debug))
-                {
-                    _logger.LogDebug("Skipping shell context registration for tenant '{TenantName}'", context.Settings.Name);
-                }
+            _shellSettings[context.Settings.Name] = context.Settings;
 
-                return false;
+            if (CanRegisterShell(context))
+            {
+                RegisterShellSettings(context.Settings);
             }
-
-            return true;
         }
+    }
 
-        /// <summary>
-        /// Registers the shell settings in 'RunningShellTable'.
-        /// </summary>
-        private void RegisterShellSettings(ShellSettings settings)
+    /// <summary>
+    /// Whether or not a shell can be activated and added to the running shells.
+    /// </summary>
+    private bool CanRegisterShell(ShellContext context)
+    {
+        if (!CanRegisterShell(context.Settings))
         {
             if (_logger.IsEnabled(LogLevel.Debug))
             {
-                _logger.LogDebug("Registering shell context for tenant '{TenantName}'", settings.Name);
+                _logger.LogDebug("Skipping shell context registration for tenant '{TenantName}'", context.Settings.Name);
             }
 
-            _runningShellTable.Add(settings);
-        }
-
-        /// <summary>
-        /// Whether or not a shell can be added to the list of available shells.
-        /// </summary>
-        private static bool CanCreateShell(ShellSettings shellSettings) =>
-            shellSettings.IsRunning() ||
-            shellSettings.IsUninitialized() ||
-            shellSettings.IsInitializing() ||
-            shellSettings.IsDisabled();
-
-        /// <summary>
-        /// Whether or not a shell can be activated and added to the running shells.
-        /// </summary>
-        private static bool CanRegisterShell(ShellSettings shellSettings) =>
-            shellSettings.IsRunning() ||
-            shellSettings.IsUninitialized() ||
-            shellSettings.IsInitializing();
-
-        /// <summary>
-        /// Whether or not a shell can be released and removed from the list, false if disabled and still in use.
-        /// Note: A disabled shell still in use will be released by its last scope, and keeping it in the list
-        /// prevents a consumer from creating a new one that would have a null service provider.
-        /// </summary>
-        private bool CanReleaseShell(ShellSettings settings) => !settings.IsDisabled() || !IsShellActive(settings);
-
-        /// <summary>
-        /// Checks if a shell can be removed, throws an exception if the shell is neither uninitialized nor disabled.
-        /// </summary>
-        private void CheckCanRemoveShell(ShellSettings settings)
-        {
-            if (settings.IsDefaultShell())
-            {
-                throw new InvalidOperationException($"The '{ShellSettings.DefaultShellName}' tenant can't be removed.");
-            }
+            return false;
+        }
 
-            // A disabled shell may be still in use in at least one active scope.
-            if (!settings.IsRemovable() || IsShellActive(settings))
-            {
-                throw new InvalidOperationException(
-                    $"The tenant '{settings.Name}' can't be removed as it is neither uninitialized nor disabled.");
-            }
+        return true;
+    }
+
+    /// <summary>
+    /// Registers the shell settings in 'RunningShellTable'.
+    /// </summary>
+    private void RegisterShellSettings(ShellSettings settings)
+    {
+        if (_logger.IsEnabled(LogLevel.Debug))
+        {
+            _logger.LogDebug("Registering shell context for tenant '{TenantName}'", settings.Name);
         }
 
-        /// <summary>
-        /// Whether or not a shell is in use in at least one active scope.
-        /// </summary>
-        private bool IsShellActive(ShellSettings settings) =>
-            settings is { Name: not null } &&
-            _shellContexts.TryGetValue(settings.Name, out var context) &&
-            context.IsActive();
+        _runningShellTable.Add(settings);
+    }
+
+    /// <summary>
+    /// Whether or not a shell can be added to the list of available shells.
+    /// </summary>
+    private static bool CanCreateShell(ShellSettings shellSettings) =>
+        shellSettings.IsRunning() ||
+        shellSettings.IsUninitialized() ||
+        shellSettings.IsInitializing() ||
+        shellSettings.IsDisabled();
 
-        public void Dispose()
+    /// <summary>
+    /// Whether or not a shell can be activated and added to the running shells.
+    /// </summary>
+    private static bool CanRegisterShell(ShellSettings shellSettings) =>
+        shellSettings.IsRunning() ||
+        shellSettings.IsUninitialized() ||
+        shellSettings.IsInitializing();
+
+    /// <summary>
+    /// Whether or not a shell can be released and removed from the list, false if disabled and still in use.
+    /// Note: A disabled shell still in use will be released by its last scope, and keeping it in the list
+    /// prevents a consumer from creating a new one that would have a null service provider.
+    /// </summary>
+    private bool CanReleaseShell(ShellSettings settings) => !settings.IsDisabled() || !IsShellActive(settings);
+
+    /// <summary>
+    /// Checks if a shell can be removed, throws an exception if the shell is neither uninitialized nor disabled.
+    /// </summary>
+    private void CheckCanRemoveShell(ShellSettings settings)
+    {
+        if (settings.IsDefaultShell())
         {
-            foreach (var shell in ListShellContexts())
-            {
-                shell.Dispose();
-            }
+            throw new InvalidOperationException($"The '{ShellSettings.DefaultShellName}' tenant can't be removed.");
         }
 
-        public async ValueTask DisposeAsync()
+        // A disabled shell may be still in use in at least one active scope.
+        if (!settings.IsRemovable() || IsShellActive(settings))
         {
-            foreach (var shell in ListShellContexts())
-            {
-                await shell.DisposeAsync();
-            }
+            throw new InvalidOperationException(
+                $"The tenant '{settings.Name}' can't be removed as it is neither uninitialized nor disabled.");
+        }
+    }
+
+    /// <summary>
+    /// Whether or not a shell is in use in at least one active scope.
+    /// </summary>
+    private bool IsShellActive(ShellSettings settings) =>
+        settings is { Name: not null } &&
+        _shellContexts.TryGetValue(settings.Name, out var context) &&
+        context.IsActive();
+
+    public void Dispose()
+    {
+        foreach (var shell in ListShellContexts())
+        {
+            shell.Dispose();
+        }
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        foreach (var shell in ListShellContexts())
+        {
+            await shell.DisposeAsync();
         }
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/ShellOptionsSetup.cs b/src/OrchardCore/OrchardCore/Shell/ShellOptionsSetup.cs
index 3ca476ab71e..11f9fa00ae0 100644
--- a/src/OrchardCore/OrchardCore/Shell/ShellOptionsSetup.cs
+++ b/src/OrchardCore/OrchardCore/Shell/ShellOptionsSetup.cs
@@ -2,34 +2,33 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+/// <summary>
+/// Sets up default options for <see cref="ShellOptions"/>.
+/// </summary>
+public sealed class ShellOptionsSetup : IConfigureOptions<ShellOptions>
 {
-    /// <summary>
-    /// Sets up default options for <see cref="ShellOptions"/>.
-    /// </summary>
-    public sealed class ShellOptionsSetup : IConfigureOptions<ShellOptions>
+    private readonly IHostEnvironment _hostingEnvironment;
+
+    public ShellOptionsSetup(IHostEnvironment hostingEnvironment)
+    {
+        _hostingEnvironment = hostingEnvironment;
+    }
+
+    public void Configure(ShellOptions options)
     {
-        private readonly IHostEnvironment _hostingEnvironment;
+        var appData = System.Environment.GetEnvironmentVariable(ShellOptionConstants.OrchardAppData);
 
-        public ShellOptionsSetup(IHostEnvironment hostingEnvironment)
+        if (!string.IsNullOrEmpty(appData))
         {
-            _hostingEnvironment = hostingEnvironment;
+            options.ShellsApplicationDataPath = Path.Combine(_hostingEnvironment.ContentRootPath, appData);
         }
-
-        public void Configure(ShellOptions options)
+        else
         {
-            var appData = System.Environment.GetEnvironmentVariable(ShellOptionConstants.OrchardAppData);
-
-            if (!string.IsNullOrEmpty(appData))
-            {
-                options.ShellsApplicationDataPath = Path.Combine(_hostingEnvironment.ContentRootPath, appData);
-            }
-            else
-            {
-                options.ShellsApplicationDataPath = Path.Combine(_hostingEnvironment.ContentRootPath, ShellOptionConstants.DefaultAppDataPath);
-            }
-
-            options.ShellsContainerName = ShellOptionConstants.DefaultSitesPath;
+            options.ShellsApplicationDataPath = Path.Combine(_hostingEnvironment.ContentRootPath, ShellOptionConstants.DefaultAppDataPath);
         }
+
+        options.ShellsContainerName = ShellOptionConstants.DefaultSitesPath;
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/ShellSettingsManager.cs b/src/OrchardCore/OrchardCore/Shell/ShellSettingsManager.cs
index e391ba70d65..6d0829a0cb9 100644
--- a/src/OrchardCore/OrchardCore/Shell/ShellSettingsManager.cs
+++ b/src/OrchardCore/OrchardCore/Shell/ShellSettingsManager.cs
@@ -10,314 +10,313 @@
 using OrchardCore.Environment.Shell.Configuration;
 using OrchardCore.Environment.Shell.Models;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+public class ShellSettingsManager : IShellSettingsManager, IDisposable
 {
-    public class ShellSettingsManager : IShellSettingsManager, IDisposable
+    private readonly IConfiguration _applicationConfiguration;
+    private readonly IShellsConfigurationSources _tenantsConfigSources;
+    private readonly IShellConfigurationSources _tenantConfigSources;
+    private readonly IShellsSettingsSources _tenantsSettingsSources;
+
+    private IConfiguration _configuration;
+    private IConfigurationRoot _configurationRoot;
+    private IConfigurationRoot _tenantsSettingsRoot;
+    private IEnumerable<string> _configuredTenants;
+    private readonly SemaphoreSlim _semaphore = new(1);
+
+    private Func<string, Action<IConfigurationBuilder>, Task<IConfigurationRoot>> _tenantConfigFactoryAsync;
+    private readonly SemaphoreSlim _tenantConfigSemaphore = new(1);
+    private bool _disposed;
+
+    public ShellSettingsManager(
+        IConfiguration applicationConfiguration,
+        IShellsConfigurationSources tenantsConfigSources,
+        IShellConfigurationSources tenantConfigSources,
+        IShellsSettingsSources tenantsSettingsSources)
     {
-        private readonly IConfiguration _applicationConfiguration;
-        private readonly IShellsConfigurationSources _tenantsConfigSources;
-        private readonly IShellConfigurationSources _tenantConfigSources;
-        private readonly IShellsSettingsSources _tenantsSettingsSources;
-
-        private IConfiguration _configuration;
-        private IConfigurationRoot _configurationRoot;
-        private IConfigurationRoot _tenantsSettingsRoot;
-        private IEnumerable<string> _configuredTenants;
-        private readonly SemaphoreSlim _semaphore = new(1);
-
-        private Func<string, Action<IConfigurationBuilder>, Task<IConfigurationRoot>> _tenantConfigFactoryAsync;
-        private readonly SemaphoreSlim _tenantConfigSemaphore = new(1);
-        private bool _disposed;
-
-        public ShellSettingsManager(
-            IConfiguration applicationConfiguration,
-            IShellsConfigurationSources tenantsConfigSources,
-            IShellConfigurationSources tenantConfigSources,
-            IShellsSettingsSources tenantsSettingsSources)
-        {
-            _applicationConfiguration = applicationConfiguration;
-            _tenantsConfigSources = tenantsConfigSources;
-            _tenantConfigSources = tenantConfigSources;
-            _tenantsSettingsSources = tenantsSettingsSources;
-        }
+        _applicationConfiguration = applicationConfiguration;
+        _tenantsConfigSources = tenantsConfigSources;
+        _tenantConfigSources = tenantConfigSources;
+        _tenantsSettingsSources = tenantsSettingsSources;
+    }
 
-        public ShellSettings CreateDefaultSettings()
-        {
-            return new ShellSettings
-            (
-                new ShellConfiguration(_configuration),
-                new ShellConfiguration(_configuration)
-            );
-        }
+    public ShellSettings CreateDefaultSettings()
+    {
+        return new ShellSettings
+        (
+            new ShellConfiguration(_configuration),
+            new ShellConfiguration(_configuration)
+        );
+    }
 
-        public async Task<IEnumerable<ShellSettings>> LoadSettingsAsync()
+    public async Task<IEnumerable<ShellSettings>> LoadSettingsAsync()
+    {
+        await _semaphore.WaitAsync();
+        try
         {
-            await _semaphore.WaitAsync();
-            try
-            {
-                await EnsureConfigurationAsync();
-                await ReloadTenantsSettingsAsync();
+            await EnsureConfigurationAsync();
+            await ReloadTenantsSettingsAsync();
 
-                var tenants = _tenantsSettingsRoot.GetChildren().Select(section => section.Key);
-                var allTenants = _configuredTenants.Concat(tenants).Distinct().ToArray();
+            var tenants = _tenantsSettingsRoot.GetChildren().Select(section => section.Key);
+            var allTenants = _configuredTenants.Concat(tenants).Distinct().ToArray();
 
-                var allSettings = new List<ShellSettings>();
-
-                foreach (var tenant in allTenants)
-                {
-                    var tenantSettingsBuilder = new ConfigurationBuilder()
-                        .AddConfiguration(_configuration)
-                        .AddConfiguration(_configuration.GetSection(tenant))
-                        .AddConfiguration(_tenantsSettingsRoot.GetSection(tenant));
+            var allSettings = new List<ShellSettings>();
 
-                    var settings = new ShellConfiguration(tenantSettingsBuilder);
-                    var configuration = new ShellConfiguration(tenant, _tenantConfigFactoryAsync);
+            foreach (var tenant in allTenants)
+            {
+                var tenantSettingsBuilder = new ConfigurationBuilder()
+                    .AddConfiguration(_configuration)
+                    .AddConfiguration(_configuration.GetSection(tenant))
+                    .AddConfiguration(_tenantsSettingsRoot.GetSection(tenant));
 
-                    var shellSettings = new ShellSettings(settings, configuration)
-                    {
-                        Name = tenant,
-                    };
+                var settings = new ShellConfiguration(tenantSettingsBuilder);
+                var configuration = new ShellConfiguration(tenant, _tenantConfigFactoryAsync);
 
-                    allSettings.Add(shellSettings);
+                var shellSettings = new ShellSettings(settings, configuration)
+                {
+                    Name = tenant,
                 };
 
-                return allSettings;
-            }
-            finally
-            {
-                _semaphore.Release();
-            }
+                allSettings.Add(shellSettings);
+            };
+
+            return allSettings;
+        }
+        finally
+        {
+            _semaphore.Release();
         }
+    }
 
-        public async Task<IEnumerable<string>> LoadSettingsNamesAsync()
+    public async Task<IEnumerable<string>> LoadSettingsNamesAsync()
+    {
+        await _semaphore.WaitAsync();
+        try
         {
-            await _semaphore.WaitAsync();
-            try
-            {
-                await EnsureConfigurationAsync();
-                await ReloadTenantsSettingsAsync();
+            await EnsureConfigurationAsync();
+            await ReloadTenantsSettingsAsync();
 
-                var tenants = _tenantsSettingsRoot.GetChildren().Select(section => section.Key);
-                return _configuredTenants.Concat(tenants).Distinct().ToArray();
-            }
-            finally
-            {
-                _semaphore.Release();
-            }
+            var tenants = _tenantsSettingsRoot.GetChildren().Select(section => section.Key);
+            return _configuredTenants.Concat(tenants).Distinct().ToArray();
+        }
+        finally
+        {
+            _semaphore.Release();
         }
+    }
 
-        public async Task<ShellSettings> LoadSettingsAsync(string tenant)
+    public async Task<ShellSettings> LoadSettingsAsync(string tenant)
+    {
+        await _semaphore.WaitAsync();
+        try
         {
-            await _semaphore.WaitAsync();
-            try
-            {
-                await EnsureConfigurationAsync();
-                await ReloadTenantsSettingsAsync();
+            await EnsureConfigurationAsync();
+            await ReloadTenantsSettingsAsync();
 
-                var tenantSettingsBuilder = new ConfigurationBuilder()
-                    .AddConfiguration(_configuration)
-                    .AddConfiguration(_configuration.GetSection(tenant))
-                    .AddConfiguration(_tenantsSettingsRoot.GetSection(tenant));
+            var tenantSettingsBuilder = new ConfigurationBuilder()
+                .AddConfiguration(_configuration)
+                .AddConfiguration(_configuration.GetSection(tenant))
+                .AddConfiguration(_tenantsSettingsRoot.GetSection(tenant));
 
-                var settings = new ShellConfiguration(tenantSettingsBuilder);
-                var configuration = new ShellConfiguration(tenant, _tenantConfigFactoryAsync);
+            var settings = new ShellConfiguration(tenantSettingsBuilder);
+            var configuration = new ShellConfiguration(tenant, _tenantConfigFactoryAsync);
 
-                return new ShellSettings(settings, configuration)
-                {
-                    Name = tenant,
-                };
-            }
-            finally
+            return new ShellSettings(settings, configuration)
             {
-                _semaphore.Release();
-            }
+                Name = tenant,
+            };
         }
+        finally
+        {
+            _semaphore.Release();
+        }
+    }
 
-        public async Task SaveSettingsAsync(ShellSettings settings)
+    public async Task SaveSettingsAsync(ShellSettings settings)
+    {
+        await _semaphore.WaitAsync();
+        try
         {
-            await _semaphore.WaitAsync();
-            try
-            {
-                await EnsureConfigurationAsync();
+            await EnsureConfigurationAsync();
 
-                ArgumentNullException.ThrowIfNull(settings);
+            ArgumentNullException.ThrowIfNull(settings);
 
-                var configuration = new ConfigurationBuilder()
-                    .AddConfiguration(_configuration)
-                    .AddConfiguration(_configuration.GetSection(settings.Name))
-                    .Build();
+            var configuration = new ConfigurationBuilder()
+                .AddConfiguration(_configuration)
+                .AddConfiguration(_configuration.GetSection(settings.Name))
+                .Build();
 
-                var shellSettings = new ShellSettings()
-                {
-                    Name = settings.Name
-                };
+            var shellSettings = new ShellSettings()
+            {
+                Name = settings.Name
+            };
 
-                configuration.Bind(shellSettings);
+            configuration.Bind(shellSettings);
 
-                var configSettings = JObject.FromObject(shellSettings);
-                var tenantSettings = JObject.FromObject(settings);
+            var configSettings = JObject.FromObject(shellSettings);
+            var tenantSettings = JObject.FromObject(settings);
 
-                foreach (var property in configSettings)
+            foreach (var property in configSettings)
+            {
+                var tenantValue = tenantSettings.Value<string>(property.Key);
+                var configValue = configSettings.Value<string>(property.Key);
+
+                if (tenantValue != configValue)
+                {
+                    tenantSettings[property.Key] = tenantValue;
+                }
+                else
                 {
-                    var tenantValue = tenantSettings.Value<string>(property.Key);
-                    var configValue = configSettings.Value<string>(property.Key);
-
-                    if (tenantValue != configValue)
-                    {
-                        tenantSettings[property.Key] = tenantValue;
-                    }
-                    else
-                    {
-                        tenantSettings[property.Key] = null;
-                    }
+                    tenantSettings[property.Key] = null;
                 }
+            }
 
-                tenantSettings.Remove("Name");
+            tenantSettings.Remove("Name");
 
-                await _tenantsSettingsSources.SaveAsync(settings.Name, tenantSettings.ToObject<Dictionary<string, string>>());
+            await _tenantsSettingsSources.SaveAsync(settings.Name, tenantSettings.ToObject<Dictionary<string, string>>());
 
-                var tenantConfig = new Dictionary<string, string>();
-                foreach (var config in settings.ShellConfiguration.AsEnumerable())
+            var tenantConfig = new Dictionary<string, string>();
+            foreach (var config in settings.ShellConfiguration.AsEnumerable())
+            {
+                if (settings.ShellConfiguration.GetSection(config.Key).GetChildren().Any())
                 {
-                    if (settings.ShellConfiguration.GetSection(config.Key).GetChildren().Any())
-                    {
-                        continue;
-                    }
-
-                    if (settings[config.Key] != configuration[config.Key])
-                    {
-                        tenantConfig[config.Key] = settings[config.Key];
-                    }
-                    else
-                    {
-                        tenantConfig[config.Key] = null;
-                    }
+                    continue;
                 }
 
-                tenantConfig.Remove("Name");
-
-                await _tenantConfigSemaphore.WaitAsync();
-                try
+                if (settings[config.Key] != configuration[config.Key])
                 {
-                    await _tenantConfigSources.SaveAsync(settings.Name, tenantConfig);
+                    tenantConfig[config.Key] = settings[config.Key];
                 }
-                finally
+                else
                 {
-                    _tenantConfigSemaphore.Release();
+                    tenantConfig[config.Key] = null;
                 }
             }
+
+            tenantConfig.Remove("Name");
+
+            await _tenantConfigSemaphore.WaitAsync();
+            try
+            {
+                await _tenantConfigSources.SaveAsync(settings.Name, tenantConfig);
+            }
             finally
             {
-                _semaphore.Release();
+                _tenantConfigSemaphore.Release();
             }
         }
+        finally
+        {
+            _semaphore.Release();
+        }
+    }
 
-        public async Task RemoveSettingsAsync(ShellSettings settings)
+    public async Task RemoveSettingsAsync(ShellSettings settings)
+    {
+        await _semaphore.WaitAsync();
+        try
         {
-            await _semaphore.WaitAsync();
-            try
-            {
-                await EnsureConfigurationAsync();
+            await EnsureConfigurationAsync();
 
-                ArgumentNullException.ThrowIfNull(settings);
+            ArgumentNullException.ThrowIfNull(settings);
 
-                await _tenantsSettingsSources.RemoveAsync(settings.Name);
+            await _tenantsSettingsSources.RemoveAsync(settings.Name);
 
-                await _tenantConfigSemaphore.WaitAsync();
-                try
-                {
-                    await _tenantConfigSources.RemoveAsync(settings.Name);
-                }
-                finally
-                {
-                    _tenantConfigSemaphore.Release();
-                }
+            await _tenantConfigSemaphore.WaitAsync();
+            try
+            {
+                await _tenantConfigSources.RemoveAsync(settings.Name);
             }
             finally
             {
-                _semaphore.Release();
+                _tenantConfigSemaphore.Release();
             }
         }
+        finally
+        {
+            _semaphore.Release();
+        }
+    }
 
-        private async Task EnsureConfigurationAsync()
+    private async Task EnsureConfigurationAsync()
+    {
+        if (_configuration is not null)
         {
-            if (_configuration is not null)
-            {
-                return;
-            }
+            return;
+        }
 
-            var lastProviders = (_applicationConfiguration as IConfigurationRoot)?.Providers
-                .Where(p => p is EnvironmentVariablesConfigurationProvider ||
-                            p is CommandLineConfigurationProvider)
-                .ToArray()
-                ?? [];
+        var lastProviders = (_applicationConfiguration as IConfigurationRoot)?.Providers
+            .Where(p => p is EnvironmentVariablesConfigurationProvider ||
+                        p is CommandLineConfigurationProvider)
+            .ToArray()
+            ?? [];
 
-            var configurationBuilder = await new ConfigurationBuilder()
-                .AddConfiguration(_applicationConfiguration)
-                .AddSourcesAsync(_tenantsConfigSources);
+        var configurationBuilder = await new ConfigurationBuilder()
+            .AddConfiguration(_applicationConfiguration)
+            .AddSourcesAsync(_tenantsConfigSources);
 
-            if (lastProviders.Length > 0)
-            {
-                configurationBuilder.AddConfiguration(new ConfigurationRoot(lastProviders));
-            }
+        if (lastProviders.Length > 0)
+        {
+            configurationBuilder.AddConfiguration(new ConfigurationRoot(lastProviders));
+        }
 
-            _configurationRoot = configurationBuilder.Build();
-            var configuration = _configurationRoot.GetSection("OrchardCore");
+        _configurationRoot = configurationBuilder.Build();
+        var configuration = _configurationRoot.GetSection("OrchardCore");
 
-            _configuredTenants = configuration.GetChildren()
-                .Where(section => Enum.TryParse<TenantState>(section["State"], ignoreCase: true, out _))
-                .Select(section => section.Key)
-                .Distinct()
-                .ToArray();
+        _configuredTenants = configuration.GetChildren()
+            .Where(section => Enum.TryParse<TenantState>(section["State"], ignoreCase: true, out _))
+            .Select(section => section.Key)
+            .Distinct()
+            .ToArray();
 
-            _tenantConfigFactoryAsync = async (tenant, configure) =>
+        _tenantConfigFactoryAsync = async (tenant, configure) =>
+        {
+            await _tenantConfigSemaphore.WaitAsync();
+            try
             {
-                await _tenantConfigSemaphore.WaitAsync();
-                try
-                {
-                    var builder = await new ConfigurationBuilder()
-                        .AddConfiguration(_configuration)
-                        .AddConfiguration(_configuration.GetSection(tenant))
-                        .AddSourcesAsync(tenant, _tenantConfigSources);
+                var builder = await new ConfigurationBuilder()
+                    .AddConfiguration(_configuration)
+                    .AddConfiguration(_configuration.GetSection(tenant))
+                    .AddSourcesAsync(tenant, _tenantConfigSources);
 
-                    configure(builder);
+                configure(builder);
 
-                    return builder.Build();
-                }
-                finally
-                {
-                    _tenantConfigSemaphore.Release();
-                }
-            };
+                return builder.Build();
+            }
+            finally
+            {
+                _tenantConfigSemaphore.Release();
+            }
+        };
 
-            _configuration = configuration;
-        }
+        _configuration = configuration;
+    }
 
-        private async Task ReloadTenantsSettingsAsync()
-        {
-            using var disposable = _tenantsSettingsRoot as IDisposable;
+    private async Task ReloadTenantsSettingsAsync()
+    {
+        using var disposable = _tenantsSettingsRoot as IDisposable;
 
-            _tenantsSettingsRoot = (await new ConfigurationBuilder()
-                .AddSourcesAsync(_tenantsSettingsSources))
-                .Build();
-        }
+        _tenantsSettingsRoot = (await new ConfigurationBuilder()
+            .AddSourcesAsync(_tenantsSettingsSources))
+            .Build();
+    }
 
-        public void Dispose()
+    public void Dispose()
+    {
+        if (_disposed)
         {
-            if (_disposed)
-            {
-                return;
-            }
+            return;
+        }
 
-            _disposed = true;
+        _disposed = true;
 
-            (_configurationRoot as IDisposable)?.Dispose();
-            (_tenantsSettingsRoot as IDisposable)?.Dispose();
+        (_configurationRoot as IDisposable)?.Dispose();
+        (_tenantsSettingsRoot as IDisposable)?.Dispose();
 
-            _semaphore?.Dispose();
-            _tenantConfigSemaphore?.Dispose();
+        _semaphore?.Dispose();
+        _tenantConfigSemaphore?.Dispose();
 
-            GC.SuppressFinalize(this);
-        }
+        GC.SuppressFinalize(this);
     }
 }
diff --git a/src/OrchardCore/OrchardCore/Shell/SingleShellSettingsManager.cs b/src/OrchardCore/OrchardCore/Shell/SingleShellSettingsManager.cs
index 2b00c386274..d480b8f188d 100644
--- a/src/OrchardCore/OrchardCore/Shell/SingleShellSettingsManager.cs
+++ b/src/OrchardCore/OrchardCore/Shell/SingleShellSettingsManager.cs
@@ -2,22 +2,21 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace OrchardCore.Environment.Shell
+namespace OrchardCore.Environment.Shell;
+
+public class SingleShellSettingsManager : IShellSettingsManager
 {
-    public class SingleShellSettingsManager : IShellSettingsManager
-    {
-        public ShellSettings CreateDefaultSettings() => new ShellSettings().AsDefaultShell().AsRunning();
+    public ShellSettings CreateDefaultSettings() => new ShellSettings().AsDefaultShell().AsRunning();
 
-        public Task<IEnumerable<ShellSettings>> LoadSettingsAsync() =>
-            Task.FromResult((new ShellSettings[] { CreateDefaultSettings() }).AsEnumerable());
+    public Task<IEnumerable<ShellSettings>> LoadSettingsAsync() =>
+        Task.FromResult((new ShellSettings[] { CreateDefaultSettings() }).AsEnumerable());
 
-        public Task<IEnumerable<string>> LoadSettingsNamesAsync() =>
-            Task.FromResult((new string[] { ShellSettings.DefaultShellName }).AsEnumerable());
+    public Task<IEnumerable<string>> LoadSettingsNamesAsync() =>
+        Task.FromResult((new string[] { ShellSettings.DefaultShellName }).AsEnumerable());
 
-        public Task<ShellSettings> LoadSettingsAsync(string tenant) => Task.FromResult(CreateDefaultSettings());
+    public Task<ShellSettings> LoadSettingsAsync(string tenant) => Task.FromResult(CreateDefaultSettings());
 
-        public Task SaveSettingsAsync(ShellSettings shellSettings) => Task.CompletedTask;
+    public Task SaveSettingsAsync(ShellSettings shellSettings) => Task.CompletedTask;
 
-        public Task RemoveSettingsAsync(ShellSettings shellSettings) => Task.CompletedTask;
-    }
+    public Task RemoveSettingsAsync(ShellSettings shellSettings) => Task.CompletedTask;
 }
diff --git a/test/OrchardCore.Abstractions.Tests/Modules/Manifest/FeatureAttributeTests.Attribute.cs b/test/OrchardCore.Abstractions.Tests/Modules/Manifest/FeatureAttributeTests.Attribute.cs
index 7246778b64a..c7e46dbd148 100644
--- a/test/OrchardCore.Abstractions.Tests/Modules/Manifest/FeatureAttributeTests.Attribute.cs
+++ b/test/OrchardCore.Abstractions.Tests/Modules/Manifest/FeatureAttributeTests.Attribute.cs
@@ -4,392 +4,391 @@
 using System.Linq;
 using System.Reflection;
 
-namespace OrchardCore.Modules.Manifest
+namespace OrchardCore.Modules.Manifest;
+
+using Xunit;
+using Xunit.Abstractions;
+using static BindingFlags;
+
+// TODO: TBD: now to test I want to look at actually doing this in a demo-assembly if possible...
+// TODO: TBD: which will be a bit tricky considering ModuleAttribute can appear exactly once...
+// TODO: TBD: testing via the CSPROJ aspect... i.e. to load the assembly in reference and check that it 'works' ...
+/// <summary>
+/// Provides some <see cref="ModuleAttribute"/> tests.
+/// </summary>
+/// <typeparam name="TAttribute"></typeparam>
+public abstract class FeatureAttributeTests<TAttribute>
+    where TAttribute : FeatureAttribute
 {
-    using Xunit;
-    using Xunit.Abstractions;
-    using static BindingFlags;
+    // TODO: TBD: in addition to constructors... should be able to still set properties in the same way...
+    // TODO: TBD: in effect the constructors are 'sugar' after a sort that provide some shorthand
 
-    // TODO: TBD: now to test I want to look at actually doing this in a demo-assembly if possible...
-    // TODO: TBD: which will be a bit tricky considering ModuleAttribute can appear exactly once...
-    // TODO: TBD: testing via the CSPROJ aspect... i.e. to load the assembly in reference and check that it 'works' ...
     /// <summary>
-    /// Provides some <see cref="ModuleAttribute"/> tests.
+    /// Gets the OutputHelper for the tests.
     /// </summary>
-    /// <typeparam name="TAttribute"></typeparam>
-    public abstract class FeatureAttributeTests<TAttribute>
-        where TAttribute : FeatureAttribute
-    {
-        // TODO: TBD: in addition to constructors... should be able to still set properties in the same way...
-        // TODO: TBD: in effect the constructors are 'sugar' after a sort that provide some shorthand
+    protected virtual ITestOutputHelper OutputHelper { get; }
 
-        /// <summary>
-        /// Gets the OutputHelper for the tests.
-        /// </summary>
-        protected virtual ITestOutputHelper OutputHelper { get; }
+    /// <summary>
+    /// Gets the <see cref="FeatureAttribute.DefaultName"/>.
+    /// </summary>
+    protected static string DefaultName => FeatureAttribute.DefaultName;
 
-        /// <summary>
-        /// Gets the <see cref="FeatureAttribute.DefaultName"/>.
-        /// </summary>
-        protected static string DefaultName => FeatureAttribute.DefaultName;
+    /// <summary>
+    /// Gets the <see cref="FeatureAttribute.DefaultCategory"/>.
+    /// </summary>
+    protected static string DefaultCategory => FeatureAttribute.DefaultCategory;
 
-        /// <summary>
-        /// Gets the <see cref="FeatureAttribute.DefaultCategory"/>.
-        /// </summary>
-        protected static string DefaultCategory => FeatureAttribute.DefaultCategory;
+    /// <summary>
+    /// Gets the <see cref="FeatureAttribute.DefaultPriority"/>.
+    /// </summary>
+    protected static int DefaultPriority => FeatureAttribute.DefaultPriority;
 
-        /// <summary>
-        /// Gets the <see cref="FeatureAttribute.DefaultPriority"/>.
-        /// </summary>
-        protected static int DefaultPriority => FeatureAttribute.DefaultPriority;
+    /// <summary>
+    /// Gets the <see cref="FeatureAttribute.DefaultDescription"/>.
+    /// </summary>
+    protected static string DefaultDescription => FeatureAttribute.DefaultDescription;
 
-        /// <summary>
-        /// Gets the <see cref="FeatureAttribute.DefaultDescription"/>.
-        /// </summary>
-        protected static string DefaultDescription => FeatureAttribute.DefaultDescription;
+    /// <summary>
+    /// Gets the <see cref="FeatureAttribute.DefaultFeatureDependencies"/>.
+    /// </summary>
+    protected static string DefaultFeatureDependencies => FeatureAttribute.DefaultFeatureDependencies;
 
-        /// <summary>
-        /// Gets the <see cref="FeatureAttribute.DefaultFeatureDependencies"/>.
-        /// </summary>
-        protected static string DefaultFeatureDependencies => FeatureAttribute.DefaultFeatureDependencies;
+    /// <summary>
+    /// Gets the <see cref="FeatureAttribute.DefaultDefaultTenantOnly"/>.
+    /// </summary>
+    protected static bool DefaultDefaultTenantOnly => FeatureAttribute.DefaultDefaultTenantOnly;
 
-        /// <summary>
-        /// Gets the <see cref="FeatureAttribute.DefaultDefaultTenantOnly"/>.
-        /// </summary>
-        protected static bool DefaultDefaultTenantOnly => FeatureAttribute.DefaultDefaultTenantOnly;
+    /// <summary>
+    /// Gets the <see cref="FeatureAttribute.DefaultAlwaysEnabled"/>.
+    /// </summary>
+    protected static bool DefaultAlwaysEnabled => FeatureAttribute.DefaultAlwaysEnabled;
 
-        /// <summary>
-        /// Gets the <see cref="FeatureAttribute.DefaultAlwaysEnabled"/>.
-        /// </summary>
-        protected static bool DefaultAlwaysEnabled => FeatureAttribute.DefaultAlwaysEnabled;
+    /// <summary>
+    /// Gets the <see cref="FeatureAttribute.ListDelims"/>.
+    /// </summary>
+    protected static IEnumerable<char> ListDelims => FeatureAttribute.ListDelims;
 
-        /// <summary>
-        /// Gets the <see cref="FeatureAttribute.ListDelims"/>.
-        /// </summary>
-        protected static IEnumerable<char> ListDelims => FeatureAttribute.ListDelims;
+    /// <summary>
+    /// Returns a <paramref name="count"/> of Lorem Ipsum Words.
+    /// </summary>
+    /// <param name="count"></param>
+    /// <returns></returns>
+    protected static string LoremWords(int count) => LoremNET.Lorem.Words(count);
 
-        /// <summary>
-        /// Returns a <paramref name="count"/> of Lorem Ipsum Words.
-        /// </summary>
-        /// <param name="count"></param>
-        /// <returns></returns>
-        protected static string LoremWords(int count) => LoremNET.Lorem.Words(count);
+    /// <summary>
+    /// Public|Instance
+    /// </summary>
+    private const BindingFlags CtorFlags = Public | Instance;
 
-        /// <summary>
-        /// Public|Instance
-        /// </summary>
-        private const BindingFlags CtorFlags = Public | Instance;
+    /// <summary>
+    /// Creates a <typeparamref name="TAttribute"/> from its <paramref name="args"/>, with
+    /// the ability to apply a <paramref name="classifier"/> to each of the arguments. We
+    /// classify the <see cref="Type"/> of each argument this way because each one may be
+    /// Null, particularly, <see cref="string"/> arguments, which is okay for Features,
+    /// Modules, etc.
+    /// </summary>
+    /// <param name="classifier"></param>
+    /// <param name="args"></param>
+    /// <returns></returns>
+    /// <exception cref="ArgumentException"></exception>
+    protected virtual TAttribute CreateFromArgs(Func<int, object, Type> classifier, params object[] args)
+    {
+        static Type ParameterlessCtorClassifier(int index, object arg) => typeof(object);
 
-        /// <summary>
-        /// Creates a <typeparamref name="TAttribute"/> from its <paramref name="args"/>, with
-        /// the ability to apply a <paramref name="classifier"/> to each of the arguments. We
-        /// classify the <see cref="Type"/> of each argument this way because each one may be
-        /// Null, particularly, <see cref="string"/> arguments, which is okay for Features,
-        /// Modules, etc.
-        /// </summary>
-        /// <param name="classifier"></param>
-        /// <param name="args"></param>
-        /// <returns></returns>
-        /// <exception cref="ArgumentException"></exception>
-        protected virtual TAttribute CreateFromArgs(Func<int, object, Type> classifier, params object[] args)
+        if (args.Length == 0 || classifier == null)
         {
-            static Type ParameterlessCtorClassifier(int index, object arg) => typeof(object);
+            classifier ??= ParameterlessCtorClassifier;
+        }
 
-            if (args.Length == 0 || classifier == null)
-            {
-                classifier ??= ParameterlessCtorClassifier;
-            }
+        // Classify each Argument, not simply getting its type, because each may be Null, which is okay.
+        var types = args.Select((arg, index) => classifier.Invoke(index, arg)).ToArray();
 
-            // Classify each Argument, not simply getting its type, because each may be Null, which is okay.
-            var types = args.Select((arg, index) => classifier.Invoke(index, arg)).ToArray();
+        var allAttributeCtors = typeof(TAttribute).GetConstructors(CtorFlags);
 
-            var allAttributeCtors = typeof(TAttribute).GetConstructors(CtorFlags);
+        // Identify the Ctor with the Parameters aligned to the Classified Arguments.
+        var allAttributeCtorWithParameterTypes = allAttributeCtors.Select(ctor => new
+        {
+            Callback = ctor,
+            Types = ctor.GetParameters().Select(_ => _.ParameterType).ToArray(),
+        }).ToArray();
 
-            // Identify the Ctor with the Parameters aligned to the Classified Arguments.
-            var allAttributeCtorWithParameterTypes = allAttributeCtors.Select(ctor => new
-            {
-                Callback = ctor,
-                Types = ctor.GetParameters().Select(_ => _.ParameterType).ToArray(),
-            }).ToArray();
+        var attributeCtor = allAttributeCtorWithParameterTypes.SingleOrDefault(_ => _.Types.SequenceEqual(types))
+            ?.Callback
+            ?? throw new ArgumentException($"Unable to align ctor to args({args.Length}).", nameof(args));
 
-            var attributeCtor = allAttributeCtorWithParameterTypes.SingleOrDefault(_ => _.Types.SequenceEqual(types))
-                ?.Callback
-                ?? throw new ArgumentException($"Unable to align ctor to args({args.Length}).", nameof(args));
+        var feature = attributeCtor.Invoke(args);
 
-            var feature = attributeCtor.Invoke(args);
+        return Assert.IsType<TAttribute>(feature);
+    }
 
-            return Assert.IsType<TAttribute>(feature);
-        }
+    /// <summary>
+    /// Classifier supporting
+    /// <see cref="FeatureAttribute(string, string, string, bool, bool, bool)"/>, arguments in
+    /// order, <c>id, description, featureDependencies, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    /// <param name="index"></param>
+    /// <param name="arg"></param>
+    /// <returns></returns>
+    protected virtual Type FeatureString3Object3CtorClassifier(int index, object arg) =>
+        index switch
+        {
+            3 or 4 or 5 => typeof(object),
+            _ => typeof(string),
+        };
 
-        /// <summary>
-        /// Classifier supporting
-        /// <see cref="FeatureAttribute(string, string, string, bool, bool, bool)"/>, arguments in
-        /// order, <c>id, description, featureDependencies, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        /// <param name="index"></param>
-        /// <param name="arg"></param>
-        /// <returns></returns>
-        protected virtual Type FeatureString3Object3CtorClassifier(int index, object arg) =>
-            index switch
-            {
-                3 or 4 or 5 => typeof(object),
-                _ => typeof(string),
-            };
+    /// <summary>
+    /// Classifier supporting
+    /// <see cref="FeatureAttribute(string, string, string, string, bool, bool, bool)"/>, arguments in
+    /// order, <c>id, name, description, featureDependencies, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    /// <param name="index"></param>
+    /// <param name="arg"></param>
+    /// <returns></returns>
+    protected virtual Type FeatureString4Object3CtorClassifier(int index, object arg) =>
+        index switch
+        {
+            4 or 5 or 6 => typeof(object),
+            _ => typeof(string),
+        };
 
-        /// <summary>
-        /// Classifier supporting
-        /// <see cref="FeatureAttribute(string, string, string, string, bool, bool, bool)"/>, arguments in
-        /// order, <c>id, name, description, featureDependencies, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        /// <param name="index"></param>
-        /// <param name="arg"></param>
-        /// <returns></returns>
-        protected virtual Type FeatureString4Object3CtorClassifier(int index, object arg) =>
-            index switch
-            {
-                4 or 5 or 6 => typeof(object),
-                _ => typeof(string),
-            };
+    /// <summary>
+    /// Classifier supporting
+    /// <see cref="FeatureAttribute(string, string, string, string, string, string, bool, bool, bool)"/>, arguments in
+    /// order, <c>id, name, category, priority, description, featureDependencies, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    /// <param name="index"></param>
+    /// <param name="arg"></param>
+    /// <returns></returns>
+    protected virtual Type FeatureString6Object3CtorClassifier(int index, object arg) =>
+        index switch
+        {
+            6 or 7 or 8 => typeof(object),
+            _ => typeof(string),
+        };
 
-        /// <summary>
-        /// Classifier supporting
-        /// <see cref="FeatureAttribute(string, string, string, string, string, string, bool, bool, bool)"/>, arguments in
-        /// order, <c>id, name, category, priority, description, featureDependencies, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        /// <param name="index"></param>
-        /// <param name="arg"></param>
-        /// <returns></returns>
-        protected virtual Type FeatureString6Object3CtorClassifier(int index, object arg) =>
-            index switch
-            {
-                6 or 7 or 8 => typeof(object),
-                _ => typeof(string),
-            };
+    /// <summary>
+    /// When this function is invoked it is because we expect there to be a parameterless ctor
+    /// which may be invoked.
+    /// </summary>
+    /// <returns></returns>
+    private static TAttribute DefaultFactory()
+    {
+        var paramlessCtor = typeof(TAttribute).GetConstructor(CtorFlags, []);
+        Assert.NotNull(paramlessCtor);
+        var instance = paramlessCtor.Invoke([]);
+        var feature = Assert.IsType<TAttribute>(instance);
+        return feature;
+    }
 
-        /// <summary>
-        /// When this function is invoked it is because we expect there to be a parameterless ctor
-        /// which may be invoked.
-        /// </summary>
-        /// <returns></returns>
-        private static TAttribute DefaultFactory()
+    /// <summary>
+    /// Creates a new <typeparamref name="TAttribute"/> Instance given the
+    /// <paramref name="factory"/>. Defaults to <see cref="DefaultFactory"/> as the
+    /// injected callback.
+    /// </summary>
+    /// <param name="factory"></param>
+    /// <returns></returns>
+    protected virtual TAttribute CreateFromFactory(Func<TAttribute> factory = null) => (factory ?? DefaultFactory).Invoke();
+
+    /// <summary>
+    /// Constructor.
+    /// </summary>
+    /// <param name="outputHelper"></param>
+    public FeatureAttributeTests(ITestOutputHelper outputHelper)
+    {
+        OutputHelper = outputHelper;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="values"></param>
+    /// <returns></returns>
+    protected static IEnumerable<T> GetValues<T>(params T[] values)
+    {
+        foreach (var value in values)
         {
-            var paramlessCtor = typeof(TAttribute).GetConstructor(CtorFlags, []);
-            Assert.NotNull(paramlessCtor);
-            var instance = paramlessCtor.Invoke([]);
-            var feature = Assert.IsType<TAttribute>(instance);
-            return feature;
+            yield return value;
         }
+    }
 
-        /// <summary>
-        /// Creates a new <typeparamref name="TAttribute"/> Instance given the
-        /// <paramref name="factory"/>. Defaults to <see cref="DefaultFactory"/> as the
-        /// injected callback.
-        /// </summary>
-        /// <param name="factory"></param>
-        /// <returns></returns>
-        protected virtual TAttribute CreateFromFactory(Func<TAttribute> factory = null) => (factory ?? DefaultFactory).Invoke();
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="values"></param>
+    /// <returns></returns>
+    protected static T[] GetArray<T>(params T[] values) => GetValues(values).ToArray();
 
+    /// <summary>
+    /// Provides a Pair that may be rendered to <see cref="string"/>.
+    /// </summary>
+    protected readonly struct RenderKeyValuePair
+    {
         /// <summary>
-        /// Constructor.
+        /// Pair instance supporting the Render.
         /// </summary>
-        /// <param name="outputHelper"></param>
-        public FeatureAttributeTests(ITestOutputHelper outputHelper)
-        {
-            OutputHelper = outputHelper;
-        }
+        private readonly KeyValuePair<string, object> _pair;
 
         /// <summary>
-        /// 
+        /// Gets the pair Key.
         /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="values"></param>
-        /// <returns></returns>
-        protected static IEnumerable<T> GetValues<T>(params T[] values)
-        {
-            foreach (var value in values)
-            {
-                yield return value;
-            }
-        }
+        public string Key => _pair.Key;
 
         /// <summary>
-        /// 
+        /// Gets the pair Value.
         /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="values"></param>
-        /// <returns></returns>
-        protected static T[] GetArray<T>(params T[] values) => GetValues(values).ToArray();
+        public object Value => _pair.Value;
 
         /// <summary>
-        /// Provides a Pair that may be rendered to <see cref="string"/>.
+        /// Default <see cref="Render"/> callback.
         /// </summary>
-        protected readonly struct RenderKeyValuePair
+        /// <param name="_"></param>
+        /// <returns></returns>
+        /// <remarks>Given value may be Null, Nullable, String, or Boolean. Otherwise,
+        /// makes a best effort to convert directly to string.</remarks>
+        private static string DefaultRender(object _)
         {
-            /// <summary>
-            /// Pair instance supporting the Render.
-            /// </summary>
-            private readonly KeyValuePair<string, object> _pair;
-
-            /// <summary>
-            /// Gets the pair Key.
-            /// </summary>
-            public string Key => _pair.Key;
-
-            /// <summary>
-            /// Gets the pair Value.
-            /// </summary>
-            public object Value => _pair.Value;
-
-            /// <summary>
-            /// Default <see cref="Render"/> callback.
-            /// </summary>
-            /// <param name="_"></param>
-            /// <returns></returns>
-            /// <remarks>Given value may be Null, Nullable, String, or Boolean. Otherwise,
-            /// makes a best effort to convert directly to string.</remarks>
-            private static string DefaultRender(object _)
+            // Renders null as "null" as such.
+            if (_ == null)
             {
-                // Renders null as "null" as such.
-                if (_ == null)
-                {
-                    return "null";
-                }
-
-                // Renders the Value as a string, with enclosing quotes.
-                if (_ is string s)
-                {
-                    return $"\"{s}\"";
-                }
-
-                // Renders a Boolean as lowecase, i.e. true|false.
-                if (_ is bool b)
-                {
-                    return $"{b}".ToLower();
-                }
-
-                // Otherwise makes a best effort to simply render using string interpolation.
-                return $"{_}";
+                return "null";
             }
 
-            /// <summary>
-            /// Gets the Render callback.
-            /// </summary>
-            private Func<object, string> Render { get; }
-
-            /// <summary>
-            /// Constructs an instance of the pair.
-            /// </summary>
-            /// <param name="key"></param>
-            /// <param name="value"></param>
-            /// <param name="render"></param>
-            internal RenderKeyValuePair(string key, object value, Func<object, string> render = null)
+            // Renders the Value as a string, with enclosing quotes.
+            if (_ is string s)
             {
-                _pair = new KeyValuePair<string, object>(key, value);
-                Render = render ?? DefaultRender;
+                return $"\"{s}\"";
             }
 
-            /// <summary>
-            /// Deconstructs the instance, not including the <see cref="Render"/> callback..
-            /// </summary>
-            /// <param name="key"></param>
-            /// <param name="value"></param>
-            [EditorBrowsable(EditorBrowsableState.Never)]
-            internal void Deconstruct(out string key, out object value)
+            // Renders a Boolean as lowecase, i.e. true|false.
+            if (_ is bool b)
             {
-                key = _pair.Key;
-                value = _pair.Value;
+                return $"{b}".ToLower();
             }
 
-            /// <summary>
-            /// Deconstructs the instance, including the <see cref="Render"/> callback.
-            /// </summary>
-            /// <param name="key"></param>
-            /// <param name="value"></param>
-            /// <param name="render"></param>
-            [EditorBrowsable(EditorBrowsableState.Never)]
-            internal void Deconstruct(out string key, out object value, out Func<object, string> render)
-            {
-                key = _pair.Key;
-                value = _pair.Value;
-                render = Render;
-            }
-
-            /// <inheritdoc/>
-            public override string ToString() => string.Join(": ", $"\"{Key}\"", Render.Invoke(Value));
+            // Otherwise makes a best effort to simply render using string interpolation.
+            return $"{_}";
         }
 
         /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="pairs"></param>
-        /// <returns></returns>
-        protected virtual string RenderKeyValuePairs(params RenderKeyValuePair[] pairs) =>
-            string.Join(
-                string.Join(", ", pairs.Select(_ => $"{_}")), "{}".ToCharArray().Select(_ => $"{_}")
-            );
-
-        /// <summary>
-        /// 
+        /// Gets the Render callback.
         /// </summary>
-        /// <param name="pairs"></param>
-        protected virtual void ReportKeyValuePairs(params RenderKeyValuePair[] pairs) =>
-            OutputHelper.WriteLine($"{RenderKeyValuePairs(pairs)}");
+        private Func<object, string> Render { get; }
 
         /// <summary>
-        /// Override in order to enhance the Default coverage.
+        /// Constructs an instance of the pair.
         /// </summary>
-        /// <param name="feature"></param>
-        protected virtual void VerifyDefault(TAttribute feature)
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <param name="render"></param>
+        internal RenderKeyValuePair(string key, object value, Func<object, string> render = null)
         {
-            Assert.False(feature.Dependencies.Length > 0);
-            Assert.False(feature.DefaultTenantOnly);
-            Assert.False(feature.IsAlwaysEnabled);
-            Assert.False(feature.Exists);
-            // Indeed the default-default Id is 'null' however in more of a context I think we would actually expect a value there
-            Assert.Null(feature.Id);
-            // Name, OTOH, different story, Id is the fallback response when Name is not provided
-            Assert.Null(feature.Name);
-            Assert.Empty(feature.Category);
-            Assert.Equal(DefaultDescription, feature.Description);
-            Assert.Equal($"{DefaultPriority}", feature.Priority);
+            _pair = new KeyValuePair<string, object>(key, value);
+            Render = render ?? DefaultRender;
         }
 
-        private static bool DefaultAssemblyAttribPredicate<T>(T _) where T : Attribute => _ is not null;
-
         /// <summary>
-        /// Returns the Attributes of type <typeparamref name="T"/> exposed by the
-        /// <em>Assembly</em> anchored by the <paramref name="rootType"/>.
+        /// Deconstructs the instance, not including the <see cref="Render"/> callback..
         /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="rootType"></param>
-        /// <param name="predicate">Caller specified predicate, defaults to
-        /// <see cref="DefaultAssemblyAttribPredicate{T}(T)"/>.</param>
-        /// <returns></returns>
-        protected virtual T[] GetAssemblyAttributes<T>(Type rootType, Func<T, bool> predicate = null)
-            where T : Attribute
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal void Deconstruct(out string key, out object value)
         {
-            predicate ??= DefaultAssemblyAttribPredicate;
-            var attribs = rootType.Assembly.GetCustomAttributes<T>().Where(predicate).ToArray();
-            return attribs;
+            key = _pair.Key;
+            value = _pair.Value;
         }
 
         /// <summary>
-        /// Returns the Attribute of type <typeparamref name="T"/> exposed by the
-        /// <em>Assembly</em> anchored by the <paramref name="rootType"/>. Expecting there
-        /// to be a single instance only aligned with the <paramref name="predicate"/>.
+        /// Deconstructs the instance, including the <see cref="Render"/> callback.
         /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="rootType"></param>
-        /// <param name="predicate">Caller specified predicate, defaults to <see cref="DefaultAssemblyAttribPredicate{T}(T)"/>.</param>
-        /// <returns></returns>
-        /// <remarks>Caller responsibility to vet on conditions such as Null or Not Null.
-        /// Obviously, however, would throw when more than one is detected.</remarks>
-        protected virtual T GetAssemblyAttribute<T>(Type rootType, Func<T, bool> predicate = null)
-            where T : Attribute
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <param name="render"></param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal void Deconstruct(out string key, out object value, out Func<object, string> render)
         {
-            // TODO: MWP: the danger in providing a predicate such as this, we potentially mask the issues such as ModuleMarker+Module...
-            var attrib = GetAssemblyAttributes(rootType, predicate).SingleOrDefault();
-            return attrib;
+            key = _pair.Key;
+            value = _pair.Value;
+            render = Render;
         }
+
+        /// <inheritdoc/>
+        public override string ToString() => string.Join(": ", $"\"{Key}\"", Render.Invoke(Value));
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="pairs"></param>
+    /// <returns></returns>
+    protected virtual string RenderKeyValuePairs(params RenderKeyValuePair[] pairs) =>
+        string.Join(
+            string.Join(", ", pairs.Select(_ => $"{_}")), "{}".ToCharArray().Select(_ => $"{_}")
+        );
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="pairs"></param>
+    protected virtual void ReportKeyValuePairs(params RenderKeyValuePair[] pairs) =>
+        OutputHelper.WriteLine($"{RenderKeyValuePairs(pairs)}");
+
+    /// <summary>
+    /// Override in order to enhance the Default coverage.
+    /// </summary>
+    /// <param name="feature"></param>
+    protected virtual void VerifyDefault(TAttribute feature)
+    {
+        Assert.False(feature.Dependencies.Length > 0);
+        Assert.False(feature.DefaultTenantOnly);
+        Assert.False(feature.IsAlwaysEnabled);
+        Assert.False(feature.Exists);
+        // Indeed the default-default Id is 'null' however in more of a context I think we would actually expect a value there
+        Assert.Null(feature.Id);
+        // Name, OTOH, different story, Id is the fallback response when Name is not provided
+        Assert.Null(feature.Name);
+        Assert.Empty(feature.Category);
+        Assert.Equal(DefaultDescription, feature.Description);
+        Assert.Equal($"{DefaultPriority}", feature.Priority);
+    }
+
+    private static bool DefaultAssemblyAttribPredicate<T>(T _) where T : Attribute => _ is not null;
+
+    /// <summary>
+    /// Returns the Attributes of type <typeparamref name="T"/> exposed by the
+    /// <em>Assembly</em> anchored by the <paramref name="rootType"/>.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="rootType"></param>
+    /// <param name="predicate">Caller specified predicate, defaults to
+    /// <see cref="DefaultAssemblyAttribPredicate{T}(T)"/>.</param>
+    /// <returns></returns>
+    protected virtual T[] GetAssemblyAttributes<T>(Type rootType, Func<T, bool> predicate = null)
+        where T : Attribute
+    {
+        predicate ??= DefaultAssemblyAttribPredicate;
+        var attribs = rootType.Assembly.GetCustomAttributes<T>().Where(predicate).ToArray();
+        return attribs;
+    }
+
+    /// <summary>
+    /// Returns the Attribute of type <typeparamref name="T"/> exposed by the
+    /// <em>Assembly</em> anchored by the <paramref name="rootType"/>. Expecting there
+    /// to be a single instance only aligned with the <paramref name="predicate"/>.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="rootType"></param>
+    /// <param name="predicate">Caller specified predicate, defaults to <see cref="DefaultAssemblyAttribPredicate{T}(T)"/>.</param>
+    /// <returns></returns>
+    /// <remarks>Caller responsibility to vet on conditions such as Null or Not Null.
+    /// Obviously, however, would throw when more than one is detected.</remarks>
+    protected virtual T GetAssemblyAttribute<T>(Type rootType, Func<T, bool> predicate = null)
+        where T : Attribute
+    {
+        // TODO: MWP: the danger in providing a predicate such as this, we potentially mask the issues such as ModuleMarker+Module...
+        var attrib = GetAssemblyAttributes(rootType, predicate).SingleOrDefault();
+        return attrib;
     }
 }
diff --git a/test/OrchardCore.Abstractions.Tests/Modules/Manifest/FeatureAttributeTests.cs b/test/OrchardCore.Abstractions.Tests/Modules/Manifest/FeatureAttributeTests.cs
index e9077c9a376..50a4ffca8dd 100644
--- a/test/OrchardCore.Abstractions.Tests/Modules/Manifest/FeatureAttributeTests.cs
+++ b/test/OrchardCore.Abstractions.Tests/Modules/Manifest/FeatureAttributeTests.cs
@@ -1,433 +1,432 @@
 using System;
 using System.Linq;
 
-namespace OrchardCore.Modules.Manifest
-{
-    using Xunit;
-    using Xunit.Abstractions;
+namespace OrchardCore.Modules.Manifest;
+
+using Xunit;
+using Xunit.Abstractions;
 
+/// <summary>
+/// 
+/// </summary>
+public class FeatureAttributeTests : FeatureAttributeTests<FeatureAttribute>
+{
     /// <summary>
-    /// 
+    /// Constructor.
     /// </summary>
-    public class FeatureAttributeTests : FeatureAttributeTests<FeatureAttribute>
+    /// <param name="outputHelper"></param>
+    public FeatureAttributeTests(ITestOutputHelper outputHelper)
+        : base(outputHelper)
     {
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <param name="outputHelper"></param>
-        public FeatureAttributeTests(ITestOutputHelper outputHelper)
-            : base(outputHelper)
-        {
-        }
-
-        /// <summary>
-        /// Verifies default Static and Constant assets, as exposed by fixture properties.
-        /// </summary>
-        [Fact]
-        public virtual void Default_Static_Consts()
-        {
-            Assert.Empty(DefaultName);
-            Assert.Empty(DefaultCategory);
-            Assert.Equal(0, DefaultPriority);
-            Assert.Empty(DefaultDescription);
-            Assert.Empty(DefaultFeatureDependencies);
-            Assert.False(DefaultDefaultTenantOnly);
-            Assert.False(DefaultAlwaysEnabled);
-            Assert.Equal(GetArray(';', ',', ' '), ListDelims);
-        }
+    }
 
-        /// <summary>
-        /// Verify the <see cref="FeatureAttribute(string, string, string, bool, bool, bool)"/>
-        /// ctor, arguments
-        /// <c>id, description, featureDependencies, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        [Fact]
-        public virtual void Ipsum_Ctor_Id()
-        {
-            var id = LoremWords(1);
-            var description = LoremWords(7);
-            var deps = LoremWords(5).Split(' ');
-            const bool defaultTenant = default;
-            const bool alwaysEnabled = default;
-            const bool enabledByDependencyOnly = default;
+    /// <summary>
+    /// Verifies default Static and Constant assets, as exposed by fixture properties.
+    /// </summary>
+    [Fact]
+    public virtual void Default_Static_Consts()
+    {
+        Assert.Empty(DefaultName);
+        Assert.Empty(DefaultCategory);
+        Assert.Equal(0, DefaultPriority);
+        Assert.Empty(DefaultDescription);
+        Assert.Empty(DefaultFeatureDependencies);
+        Assert.False(DefaultDefaultTenantOnly);
+        Assert.False(DefaultAlwaysEnabled);
+        Assert.Equal(GetArray(';', ',', ' '), ListDelims);
+    }
 
-            var depString = string.Join(';', deps);
+    /// <summary>
+    /// Verify the <see cref="FeatureAttribute(string, string, string, bool, bool, bool)"/>
+    /// ctor, arguments
+    /// <c>id, description, featureDependencies, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    [Fact]
+    public virtual void Ipsum_Ctor_Id()
+    {
+        var id = LoremWords(1);
+        var description = LoremWords(7);
+        var deps = LoremWords(5).Split(' ');
+        const bool defaultTenant = default;
+        const bool alwaysEnabled = default;
+        const bool enabledByDependencyOnly = default;
 
-            ReportKeyValuePairs(
-                new RenderKeyValuePair(nameof(id), id),
-                new RenderKeyValuePair(nameof(description), description),
-                new RenderKeyValuePair(nameof(deps), depString),
-                new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
-                new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
-                new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
-            );
+        var depString = string.Join(';', deps);
 
-            var feature = CreateFromArgs(FeatureString3Object3CtorClassifier, id, description, depString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
+        ReportKeyValuePairs(
+            new RenderKeyValuePair(nameof(id), id),
+            new RenderKeyValuePair(nameof(description), description),
+            new RenderKeyValuePair(nameof(deps), depString),
+            new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
+            new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
+            new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
+        );
 
-            Assert.True(feature.Exists);
-            Assert.Equal(id, feature.Id);
-            Assert.Equal(id, feature.Name);
+        var feature = CreateFromArgs(FeatureString3Object3CtorClassifier, id, description, depString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
 
-            Assert.Empty(feature.Category);
-            Assert.Equal(description, feature.Description);
+        Assert.True(feature.Exists);
+        Assert.Equal(id, feature.Id);
+        Assert.Equal(id, feature.Name);
 
-            Assert.Null(feature.InternalPriority);
-            Assert.Equal(string.Empty, feature.Priority);
+        Assert.Empty(feature.Category);
+        Assert.Equal(description, feature.Description);
 
-            Assert.NotNull(feature.Dependencies);
-            Assert.Equal(deps, feature.Dependencies);
+        Assert.Null(feature.InternalPriority);
+        Assert.Equal(string.Empty, feature.Priority);
 
-            Assert.Equal(defaultTenant, feature.DefaultTenantOnly);
-            Assert.Equal(alwaysEnabled, feature.IsAlwaysEnabled);
-        }
+        Assert.NotNull(feature.Dependencies);
+        Assert.Equal(deps, feature.Dependencies);
 
-        /// <summary>
-        /// Verify the <see cref="FeatureAttribute(string, string, string, string, bool, bool, bool)"/>
-        /// ctor, arguments
-        /// <c>id, name, description, featureDependencies, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        [Fact]
-        public virtual void Ipsum_Ctor_Id_Name()
-        {
-            var id = LoremWords(1);
-            var name = LoremWords(1);
-            var description = LoremWords(7);
-            var deps = LoremWords(5).Split(' ');
-            const bool defaultTenant = default;
-            const bool alwaysEnabled = default;
-            const bool enabledByDependencyOnly = default;
-
-            var depString = string.Join(';', deps);
-
-            ReportKeyValuePairs(
-                new RenderKeyValuePair(nameof(id), id),
-                new RenderKeyValuePair(nameof(name), name),
-                new RenderKeyValuePair(nameof(description), description),
-                new RenderKeyValuePair(nameof(deps), depString),
-                new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
-                new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
-                new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
-            );
-
-            var feature = CreateFromArgs(FeatureString4Object3CtorClassifier, id, name, description, depString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
-
-            Assert.True(feature.Exists);
-            Assert.Equal(id, feature.Id);
-            Assert.Equal(name, feature.Name);
-
-            Assert.Empty(feature.Category);
-            Assert.Equal(description, feature.Description);
-
-            Assert.Null(feature.InternalPriority);
-            Assert.Equal(string.Empty, feature.Priority);
-
-            Assert.NotNull(feature.Dependencies);
-            Assert.Equal(deps, feature.Dependencies);
+        Assert.Equal(defaultTenant, feature.DefaultTenantOnly);
+        Assert.Equal(alwaysEnabled, feature.IsAlwaysEnabled);
+    }
 
-            Assert.Equal(defaultTenant, feature.DefaultTenantOnly);
-            Assert.Equal(alwaysEnabled, feature.IsAlwaysEnabled);
-        }
+    /// <summary>
+    /// Verify the <see cref="FeatureAttribute(string, string, string, string, bool, bool, bool)"/>
+    /// ctor, arguments
+    /// <c>id, name, description, featureDependencies, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    [Fact]
+    public virtual void Ipsum_Ctor_Id_Name()
+    {
+        var id = LoremWords(1);
+        var name = LoremWords(1);
+        var description = LoremWords(7);
+        var deps = LoremWords(5).Split(' ');
+        const bool defaultTenant = default;
+        const bool alwaysEnabled = default;
+        const bool enabledByDependencyOnly = default;
+
+        var depString = string.Join(';', deps);
+
+        ReportKeyValuePairs(
+            new RenderKeyValuePair(nameof(id), id),
+            new RenderKeyValuePair(nameof(name), name),
+            new RenderKeyValuePair(nameof(description), description),
+            new RenderKeyValuePair(nameof(deps), depString),
+            new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
+            new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
+            new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
+        );
+
+        var feature = CreateFromArgs(FeatureString4Object3CtorClassifier, id, name, description, depString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
+
+        Assert.True(feature.Exists);
+        Assert.Equal(id, feature.Id);
+        Assert.Equal(name, feature.Name);
+
+        Assert.Empty(feature.Category);
+        Assert.Equal(description, feature.Description);
+
+        Assert.Null(feature.InternalPriority);
+        Assert.Equal(string.Empty, feature.Priority);
+
+        Assert.NotNull(feature.Dependencies);
+        Assert.Equal(deps, feature.Dependencies);
+
+        Assert.Equal(defaultTenant, feature.DefaultTenantOnly);
+        Assert.Equal(alwaysEnabled, feature.IsAlwaysEnabled);
+    }
 
-        /// <summary>
-        /// Verify the <see cref="FeatureAttribute(string, string, string, string, string, string, bool, bool, bool)"/>
-        /// ctor, arguments
-        /// <c>id, name, category, priority, description, featureDependencies, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        [Fact]
-        public virtual void Ipsum_Ctor_Id_Name_Cat_Pri()
-        {
-            var id = LoremWords(1);
-            var name = LoremWords(1);
-            var category = LoremWords(1);
-            var priority = DefaultPriority + 1;
-            var description = LoremWords(7);
-            var deps = LoremWords(5).Split(' ');
-            const bool defaultTenant = default;
-            const bool alwaysEnabled = default;
-            const bool enabledByDependencyOnly = default;
-
-            var depString = string.Join(';', deps);
-            var priString = $"{priority}";
-
-            ReportKeyValuePairs(
-                new RenderKeyValuePair(nameof(id), id),
-                new RenderKeyValuePair(nameof(name), name),
-                new RenderKeyValuePair(nameof(category), category),
-                new RenderKeyValuePair(nameof(priority), priority),
-                new RenderKeyValuePair(nameof(description), description),
-                new RenderKeyValuePair(nameof(deps), depString),
-                new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
-                new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
-                new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
-            );
-
-            var feature = CreateFromArgs(FeatureString6Object3CtorClassifier, id, name, category, priString, description, depString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
-
-            Assert.True(feature.Exists);
-            Assert.Equal(id, feature.Id);
-            Assert.Equal(name, feature.Name);
-
-            Assert.Equal(category, feature.Category);
-            Assert.Equal(description, feature.Description);
-
-            Assert.Equal(priority, feature.InternalPriority);
-            Assert.Equal(priString, feature.Priority);
-
-            Assert.NotNull(feature.Dependencies);
-            Assert.Equal(deps, feature.Dependencies);
+    /// <summary>
+    /// Verify the <see cref="FeatureAttribute(string, string, string, string, string, string, bool, bool, bool)"/>
+    /// ctor, arguments
+    /// <c>id, name, category, priority, description, featureDependencies, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    [Fact]
+    public virtual void Ipsum_Ctor_Id_Name_Cat_Pri()
+    {
+        var id = LoremWords(1);
+        var name = LoremWords(1);
+        var category = LoremWords(1);
+        var priority = DefaultPriority + 1;
+        var description = LoremWords(7);
+        var deps = LoremWords(5).Split(' ');
+        const bool defaultTenant = default;
+        const bool alwaysEnabled = default;
+        const bool enabledByDependencyOnly = default;
+
+        var depString = string.Join(';', deps);
+        var priString = $"{priority}";
+
+        ReportKeyValuePairs(
+            new RenderKeyValuePair(nameof(id), id),
+            new RenderKeyValuePair(nameof(name), name),
+            new RenderKeyValuePair(nameof(category), category),
+            new RenderKeyValuePair(nameof(priority), priority),
+            new RenderKeyValuePair(nameof(description), description),
+            new RenderKeyValuePair(nameof(deps), depString),
+            new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
+            new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
+            new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
+        );
+
+        var feature = CreateFromArgs(FeatureString6Object3CtorClassifier, id, name, category, priString, description, depString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
+
+        Assert.True(feature.Exists);
+        Assert.Equal(id, feature.Id);
+        Assert.Equal(name, feature.Name);
+
+        Assert.Equal(category, feature.Category);
+        Assert.Equal(description, feature.Description);
+
+        Assert.Equal(priority, feature.InternalPriority);
+        Assert.Equal(priString, feature.Priority);
+
+        Assert.NotNull(feature.Dependencies);
+        Assert.Equal(deps, feature.Dependencies);
+
+        Assert.Equal(defaultTenant, feature.DefaultTenantOnly);
+        Assert.Equal(alwaysEnabled, feature.IsAlwaysEnabled);
+    }
 
-            Assert.Equal(defaultTenant, feature.DefaultTenantOnly);
-            Assert.Equal(alwaysEnabled, feature.IsAlwaysEnabled);
-        }
+    // OrchardCore.Manifest.Features
 
-        // OrchardCore.Manifest.Features
+    /// <summary>
+    /// Which depends on <c>ItemGroup</c> items defined by <c>OrchardCoreFeatures</c>.
+    /// </summary>
+    [Fact]
+    public virtual void Csproj_AssyAttrib_EmbedFeatures_Target()
+    {
+        //// TODO: MWP: devote a bit of thought to how better to test these...
+        //var id = "one";
+        //var name = "two";
+        //var category = "three";
+        //const int priority = 4;
+        //var description = "five";
+        //var author = "six";
+        //var semVer = "7.8.9";
+        //var website = LoremAssyAttribIpsumUrl;
+        //var deps = GetArray("nine", "ten", "eleven");
+        //var tags = GetArray("ten", "eleven", "twelve");
+        //const bool defaultTenant = true;
+        //const bool alwaysEnabled = true;
+
+        //var priString = $"{priority}";
+        //var depString = string.Join(';', deps);
+        //var tagString = string.Join(';', tags);
+
+        // Would inject via Theory but for issues xUnit failing to discover the cases
+        var rootType = typeof(Examples.Features.AssyAttrib.Root);
+
+        //ReportKeyValuePairs(
+        //    new RenderKeyValuePair(nameof(id), id),
+        //    new RenderKeyValuePair(nameof(name), name),
+        //    new RenderKeyValuePair(nameof(category), category),
+        //    new RenderKeyValuePair(nameof(priority), priority),
+        //    new RenderKeyValuePair(nameof(description), description),
+        //    new RenderKeyValuePair(nameof(author), author),
+        //    new RenderKeyValuePair(nameof(semVer), semVer),
+        //    new RenderKeyValuePair(nameof(website), website),
+        //    new RenderKeyValuePair(nameof(deps), depString),
+        //    new RenderKeyValuePair(nameof(tags), tagString),
+        //    new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
+        //    new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled)
+        //);
+
+        var features = GetAssemblyAttributes<FeatureAttribute>(rootType, _ => _.GetType() == typeof(FeatureAttribute));
+
+        Assert.NotNull(features);
+
+        //// We are looking for one instance of ModuleAttribute in particular in this case
+        //var module = GetAssemblyAttribute<ModuleAttribute>(rootType, _ => _.GetType() == typeof(ModuleAttribute));
+        //// TODO: MWP: note that targets are mining for project properties and are also injecting a ModuleMarkerAttribute...
+        //// TODO: MWP: ...which is also a 'Module', which is a possible source of confusion, spoofing, counterfeit, fraud, etc
+        //Assert.NotNull(module);
+
+        //Assert.Equal(id, module.Id);
+        //Assert.Equal(name, module.Name);
+
+        //Assert.Equal(category, module.Category);
+        //Assert.Equal(priority, module.InternalPriority);
+        //Assert.Equal(priString, module.Priority);
+
+        //Assert.Equal(description, module.Description);
+
+        //Assert.Equal(author, module.Author);
+        //Assert.Equal(semVer, module.Version);
+        //Assert.Equal(website, module.Website);
+
+        //Assert.NotNull(module.Dependencies);
+        //Assert.Equal(deps, module.Dependencies);
+
+        //Assert.NotNull(module.Tags);
+        //Assert.Equal(tags, module.Tags);
+
+        //Assert.Equal(defaultTenant, module.DefaultTenantOnly);
+        //Assert.Equal(alwaysEnabled, module.IsAlwaysEnabled);
+
+        //Assert.NotNull(module.Features);
+        //Assert.Empty(module.Features);
+    }
 
-        /// <summary>
-        /// Which depends on <c>ItemGroup</c> items defined by <c>OrchardCoreFeatures</c>.
-        /// </summary>
-        [Fact]
-        public virtual void Csproj_AssyAttrib_EmbedFeatures_Target()
-        {
-            //// TODO: MWP: devote a bit of thought to how better to test these...
-            //var id = "one";
-            //var name = "two";
-            //var category = "three";
-            //const int priority = 4;
-            //var description = "five";
-            //var author = "six";
-            //var semVer = "7.8.9";
-            //var website = LoremAssyAttribIpsumUrl;
-            //var deps = GetArray("nine", "ten", "eleven");
-            //var tags = GetArray("ten", "eleven", "twelve");
-            //const bool defaultTenant = true;
-            //const bool alwaysEnabled = true;
-
-            //var priString = $"{priority}";
-            //var depString = string.Join(';', deps);
-            //var tagString = string.Join(';', tags);
-
-            // Would inject via Theory but for issues xUnit failing to discover the cases
-            var rootType = typeof(Examples.Features.AssyAttrib.Root);
-
-            //ReportKeyValuePairs(
-            //    new RenderKeyValuePair(nameof(id), id),
-            //    new RenderKeyValuePair(nameof(name), name),
-            //    new RenderKeyValuePair(nameof(category), category),
-            //    new RenderKeyValuePair(nameof(priority), priority),
-            //    new RenderKeyValuePair(nameof(description), description),
-            //    new RenderKeyValuePair(nameof(author), author),
-            //    new RenderKeyValuePair(nameof(semVer), semVer),
-            //    new RenderKeyValuePair(nameof(website), website),
-            //    new RenderKeyValuePair(nameof(deps), depString),
-            //    new RenderKeyValuePair(nameof(tags), tagString),
-            //    new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
-            //    new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled)
-            //);
-
-            var features = GetAssemblyAttributes<FeatureAttribute>(rootType, _ => _.GetType() == typeof(FeatureAttribute));
-
-            Assert.NotNull(features);
-
-            //// We are looking for one instance of ModuleAttribute in particular in this case
-            //var module = GetAssemblyAttribute<ModuleAttribute>(rootType, _ => _.GetType() == typeof(ModuleAttribute));
-            //// TODO: MWP: note that targets are mining for project properties and are also injecting a ModuleMarkerAttribute...
-            //// TODO: MWP: ...which is also a 'Module', which is a possible source of confusion, spoofing, counterfeit, fraud, etc
-            //Assert.NotNull(module);
-
-            //Assert.Equal(id, module.Id);
-            //Assert.Equal(name, module.Name);
-
-            //Assert.Equal(category, module.Category);
-            //Assert.Equal(priority, module.InternalPriority);
-            //Assert.Equal(priString, module.Priority);
-
-            //Assert.Equal(description, module.Description);
-
-            //Assert.Equal(author, module.Author);
-            //Assert.Equal(semVer, module.Version);
-            //Assert.Equal(website, module.Website);
-
-            //Assert.NotNull(module.Dependencies);
-            //Assert.Equal(deps, module.Dependencies);
-
-            //Assert.NotNull(module.Tags);
-            //Assert.Equal(tags, module.Tags);
-
-            //Assert.Equal(defaultTenant, module.DefaultTenantOnly);
-            //Assert.Equal(alwaysEnabled, module.IsAlwaysEnabled);
-
-            //Assert.NotNull(module.Features);
-            //Assert.Empty(module.Features);
-        }
+    /// <summary>
+    /// Verifies the <see cref="FeatureAttribute.Prioritize(FeatureAttribute[])"/> method in a
+    /// handful of scenarios.
+    /// </summary>
+    [Fact]
+    public virtual void Prioritize()
+    {
+        const string name = null;
+        const string category = null;
+        const string description = null;
+        const string depString = null;
+        const bool defaultTenant = default;
+        const bool alwaysEnabled = default;
+        const bool enabledByDependencyOnly = default;
+
+        var priority = DefaultPriority;
+        var expected = priority + 1;
+
+        // TODO: TBD: also for attributes created using property initializers
+        FeatureAttribute CreateForPriority(string priString = null) => CreateFromArgs(
+            FeatureString6Object3CtorClassifier,
+            LoremWords(1),
+            name,
+            category,
+            priString ?? string.Empty,
+            description,
+            depString,
+            defaultTenant,
+            alwaysEnabled,
+            enabledByDependencyOnly
+        );
+
+        var alpha = CreateForPriority();
+        var bravo = CreateForPriority($"{expected}");
+
+        // Verifies that we can Prioritize as the root and a couple of argument positions
+        Assert.Equal(expected, bravo.Prioritize(alpha, alpha));
+        Assert.Equal(expected, alpha.Prioritize(bravo, alpha));
+        Assert.Equal(expected, alpha.Prioritize(alpha, bravo));
+        Assert.Equal(priority, alpha.Prioritize(alpha, alpha));
+    }
 
-        /// <summary>
-        /// Verifies the <see cref="FeatureAttribute.Prioritize(FeatureAttribute[])"/> method in a
-        /// handful of scenarios.
-        /// </summary>
-        [Fact]
-        public virtual void Prioritize()
-        {
-            const string name = null;
-            const string category = null;
-            const string description = null;
-            const string depString = null;
-            const bool defaultTenant = default;
-            const bool alwaysEnabled = default;
-            const bool enabledByDependencyOnly = default;
-
-            var priority = DefaultPriority;
-            var expected = priority + 1;
-
-            // TODO: TBD: also for attributes created using property initializers
-            FeatureAttribute CreateForPriority(string priString = null) => CreateFromArgs(
-                FeatureString6Object3CtorClassifier,
-                LoremWords(1),
-                name,
-                category,
-                priString ?? string.Empty,
-                description,
-                depString,
-                defaultTenant,
-                alwaysEnabled,
-                enabledByDependencyOnly
-            );
-
-            var alpha = CreateForPriority();
-            var bravo = CreateForPriority($"{expected}");
-
-            // Verifies that we can Prioritize as the root and a couple of argument positions
-            Assert.Equal(expected, bravo.Prioritize(alpha, alpha));
-            Assert.Equal(expected, alpha.Prioritize(bravo, alpha));
-            Assert.Equal(expected, alpha.Prioritize(alpha, bravo));
-            Assert.Equal(priority, alpha.Prioritize(alpha, alpha));
-        }
+    /// <summary>
+    /// Verifies the <see cref="FeatureAttribute.Describe(FeatureAttribute[])"/> method in a
+    /// handful of scenarios.
+    /// </summary>
+    [Fact]
+    public virtual void Describe()
+    {
+        const string name = null;
+        const string category = null;
+        const string priority = null;
+        const string depString = null;
+        const bool defaultTenant = default;
+        const bool alwaysEnabled = default;
+        const bool enabledByDependencyOnly = default;
+
+        var expected = LoremWords(7);
+
+        // TODO: TBD: also for attributes created using property initializers
+        FeatureAttribute CreateForDescription(string description = null) => CreateFromArgs(
+            FeatureString6Object3CtorClassifier,
+            LoremWords(1),
+            name,
+            category,
+            priority,
+            description,
+            depString,
+            defaultTenant,
+            alwaysEnabled,
+            enabledByDependencyOnly
+        );
+
+        var alpha = CreateForDescription();
+        var bravo = CreateForDescription(expected);
+
+        // Verifies that we can Describe as the root Feature, and a couple of argument positions
+        Assert.Equal(expected, bravo.Describe(alpha, alpha));
+        Assert.Equal(expected, alpha.Describe(bravo, alpha));
+        Assert.Equal(expected, alpha.Describe(alpha, bravo));
+        Assert.Equal(FeatureAttribute.DefaultDescription, alpha.Describe(alpha, alpha));
+    }
 
-        /// <summary>
-        /// Verifies the <see cref="FeatureAttribute.Describe(FeatureAttribute[])"/> method in a
-        /// handful of scenarios.
-        /// </summary>
-        [Fact]
-        public virtual void Describe()
-        {
-            const string name = null;
-            const string category = null;
-            const string priority = null;
-            const string depString = null;
-            const bool defaultTenant = default;
-            const bool alwaysEnabled = default;
-            const bool enabledByDependencyOnly = default;
-
-            var expected = LoremWords(7);
-
-            // TODO: TBD: also for attributes created using property initializers
-            FeatureAttribute CreateForDescription(string description = null) => CreateFromArgs(
-                FeatureString6Object3CtorClassifier,
-                LoremWords(1),
-                name,
-                category,
-                priority,
-                description,
-                depString,
-                defaultTenant,
-                alwaysEnabled,
-                enabledByDependencyOnly
-            );
-
-            var alpha = CreateForDescription();
-            var bravo = CreateForDescription(expected);
-
-            // Verifies that we can Describe as the root Feature, and a couple of argument positions
-            Assert.Equal(expected, bravo.Describe(alpha, alpha));
-            Assert.Equal(expected, alpha.Describe(bravo, alpha));
-            Assert.Equal(expected, alpha.Describe(alpha, bravo));
-            Assert.Equal(FeatureAttribute.DefaultDescription, alpha.Describe(alpha, alpha));
-        }
+    /// <summary>
+    /// Verifies the <see cref="FeatureAttribute.Categorize(FeatureAttribute[])"/> method in a
+    /// handful of scenarios.
+    /// </summary>
+    [Fact]
+    public virtual void Categorize()
+    {
+        const string name = null;
+        const string priority = null;
+        const string description = null;
+        const string depString = null;
+        const bool defaultTenant = default;
+        const bool alwaysEnabled = default;
+        const bool enabledByDependencyOnly = default;
+
+        var expected = LoremWords(1);
+
+        // TODO: TBD: also for attributes created using property initializers
+        FeatureAttribute CreateForCategory(string category = null) => CreateFromArgs(
+            FeatureString6Object3CtorClassifier,
+            LoremWords(1),
+            name,
+            category,
+            priority,
+            description,
+            depString,
+            defaultTenant,
+            alwaysEnabled,
+            enabledByDependencyOnly
+        );
+
+        var alpha = CreateForCategory();
+        var bravo = CreateForCategory(expected);
+
+        // Verifies that we can Describe as the root Feature, and a couple of argument positions
+        Assert.Equal(expected, bravo.Categorize(alpha, alpha));
+        Assert.Equal(expected, alpha.Categorize(bravo, alpha));
+        Assert.Equal(expected, alpha.Categorize(alpha, bravo));
+        Assert.Equal(FeatureAttribute.Uncategorized, alpha.Categorize(alpha, alpha));
+    }
 
-        /// <summary>
-        /// Verifies the <see cref="FeatureAttribute.Categorize(FeatureAttribute[])"/> method in a
-        /// handful of scenarios.
-        /// </summary>
-        [Fact]
-        public virtual void Categorize()
+    /// <summary>
+    /// Verifies that <see cref="FeatureAttribute.Dependencies"/> functions correctly in
+    /// a handful of delimiter scenarios.
+    /// </summary>
+    /// <param name="delim"></param>
+    [
+        Theory,
+        InlineData(';'),
+        InlineData(','),
+        InlineData(' '),
+        InlineData(':')
+    ]
+    public virtual void Dependencies(char delim)
+    {
+        var deps = LoremWords(5).Split(' ');
+        var depString = string.Join(delim, deps);
+
+        var listDelims = FeatureAttribute.ListDelims;
+
+        FeatureAttribute CreateForDeps(params string[] deps) => CreateFromArgs(
+            FeatureString6Object3CtorClassifier,
+            LoremWords(1),
+            null,
+            null,
+            null,
+            null,
+            depString,
+            default(bool),
+            default(bool),
+            default(bool)
+        );
+
+        var feature = CreateForDeps(deps);
+
+        if (listDelims.Contains(delim))
         {
-            const string name = null;
-            const string priority = null;
-            const string description = null;
-            const string depString = null;
-            const bool defaultTenant = default;
-            const bool alwaysEnabled = default;
-            const bool enabledByDependencyOnly = default;
-
-            var expected = LoremWords(1);
-
-            // TODO: TBD: also for attributes created using property initializers
-            FeatureAttribute CreateForCategory(string category = null) => CreateFromArgs(
-                FeatureString6Object3CtorClassifier,
-                LoremWords(1),
-                name,
-                category,
-                priority,
-                description,
-                depString,
-                defaultTenant,
-                alwaysEnabled,
-                enabledByDependencyOnly
-            );
-
-            var alpha = CreateForCategory();
-            var bravo = CreateForCategory(expected);
-
-            // Verifies that we can Describe as the root Feature, and a couple of argument positions
-            Assert.Equal(expected, bravo.Categorize(alpha, alpha));
-            Assert.Equal(expected, alpha.Categorize(bravo, alpha));
-            Assert.Equal(expected, alpha.Categorize(alpha, bravo));
-            Assert.Equal(FeatureAttribute.Uncategorized, alpha.Categorize(alpha, alpha));
+            // Validity reflected by the Deps via the Delim
+            Assert.Equal(deps, feature.Dependencies);
         }
-
-        /// <summary>
-        /// Verifies that <see cref="FeatureAttribute.Dependencies"/> functions correctly in
-        /// a handful of delimiter scenarios.
-        /// </summary>
-        /// <param name="delim"></param>
-        [
-            Theory,
-            InlineData(';'),
-            InlineData(','),
-            InlineData(' '),
-            InlineData(':')
-        ]
-        public virtual void Dependencies(char delim)
+        else
         {
-            var deps = LoremWords(5).Split(' ');
-            var depString = string.Join(delim, deps);
-
-            var listDelims = FeatureAttribute.ListDelims;
-
-            FeatureAttribute CreateForDeps(params string[] deps) => CreateFromArgs(
-                FeatureString6Object3CtorClassifier,
-                LoremWords(1),
-                null,
-                null,
-                null,
-                null,
-                depString,
-                default(bool),
-                default(bool),
-                default(bool)
-            );
-
-            var feature = CreateForDeps(deps);
-
-            if (listDelims.Contains(delim))
-            {
-                // Validity reflected by the Deps via the Delim
-                Assert.Equal(deps, feature.Dependencies);
-            }
-            else
-            {
-                // Which in this case 'correctly' yields, although semantically not what we expected, given an invalid delim
-                Assert.Equal(GetValues(depString), feature.Dependencies);
-            }
+            // Which in this case 'correctly' yields, although semantically not what we expected, given an invalid delim
+            Assert.Equal(GetValues(depString), feature.Dependencies);
         }
     }
 }
diff --git a/test/OrchardCore.Abstractions.Tests/Modules/Manifest/ModuleAttributeTests.Attribute.cs b/test/OrchardCore.Abstractions.Tests/Modules/Manifest/ModuleAttributeTests.Attribute.cs
index 7fa7b08462d..4a446b77fe8 100644
--- a/test/OrchardCore.Abstractions.Tests/Modules/Manifest/ModuleAttributeTests.Attribute.cs
+++ b/test/OrchardCore.Abstractions.Tests/Modules/Manifest/ModuleAttributeTests.Attribute.cs
@@ -1,188 +1,187 @@
 using System;
 using System.Reflection;
 
-namespace OrchardCore.Modules.Manifest
+namespace OrchardCore.Modules.Manifest;
+
+using Xunit;
+using Xunit.Abstractions;
+
+/// <inheritdoc/>
+public abstract class ModuleAttributeTests<TAttribute> : FeatureAttributeTests<TAttribute>
+    where TAttribute : ModuleAttribute
 {
-    using Xunit;
-    using Xunit.Abstractions;
+    /// <summary>
+    /// Gets the <see cref="ModuleAttribute.DefaultAuthor"/>.
+    /// </summary>
+    protected static string DefaultAuthor => ModuleAttribute.DefaultAuthor;
+
+    /// <summary>
+    /// Gets the <see cref="ModuleAttribute.DefaultVersionZero"/>.
+    /// </summary>
+    protected static string DefaultVersionZero => ModuleAttribute.DefaultVersionZero;
+
+    /// <summary>
+    /// Gets the <see cref="ModuleAttribute.DefaultWebsiteUrl"/>.
+    /// </summary>
+    protected static string DefaultWebsiteUrl => ModuleAttribute.DefaultWebsiteUrl;
+
+    /// <summary>
+    /// &quot;lorem://assyattrib.ipsum&quot;
+    /// </summary>
+    protected const string LoremAssyAttribIpsumUrl = "lorem://assyattrib.ipsum";
+
+    /// <summary>
+    /// Returns a Lorem Ipsum based Url. Completely fictional, folks, for test purposes only.
+    /// </summary>
+    /// <returns></returns>
+    protected virtual string LoremWebsiteUrl() => $"lorem://{LoremWords(1)}.ipsum";
+
+    /// <summary>
+    /// Constructor.
+    /// </summary>
+    /// <param name="outputHelper"></param>
+    public ModuleAttributeTests(ITestOutputHelper outputHelper) : base(outputHelper)
+    {
+    }
 
-    /// <inheritdoc/>
-    public abstract class ModuleAttributeTests<TAttribute> : FeatureAttributeTests<TAttribute>
-        where TAttribute : ModuleAttribute
+    /// <summary>
+    /// Returns the <typeparamref name="TDetails"/> based on the given
+    /// <paramref name="assembly"/>.
+    /// </summary>
+    /// <typeparam name="TDetails"></typeparam>
+    /// <param name="assembly"></param>
+    /// <param name="extract"></param>
+    /// <returns></returns>
+    protected static TDetails GetAssemblyDetails<TDetails>(Assembly assembly, Func<Assembly, AssemblyName, TDetails> extract) =>
+        extract.Invoke(assembly, assembly.GetName());
+
+    protected override void VerifyDefault(TAttribute module)
     {
-        /// <summary>
-        /// Gets the <see cref="ModuleAttribute.DefaultAuthor"/>.
-        /// </summary>
-        protected static string DefaultAuthor => ModuleAttribute.DefaultAuthor;
-
-        /// <summary>
-        /// Gets the <see cref="ModuleAttribute.DefaultVersionZero"/>.
-        /// </summary>
-        protected static string DefaultVersionZero => ModuleAttribute.DefaultVersionZero;
-
-        /// <summary>
-        /// Gets the <see cref="ModuleAttribute.DefaultWebsiteUrl"/>.
-        /// </summary>
-        protected static string DefaultWebsiteUrl => ModuleAttribute.DefaultWebsiteUrl;
-
-        /// <summary>
-        /// &quot;lorem://assyattrib.ipsum&quot;
-        /// </summary>
-        protected const string LoremAssyAttribIpsumUrl = "lorem://assyattrib.ipsum";
-
-        /// <summary>
-        /// Returns a Lorem Ipsum based Url. Completely fictional, folks, for test purposes only.
-        /// </summary>
-        /// <returns></returns>
-        protected virtual string LoremWebsiteUrl() => $"lorem://{LoremWords(1)}.ipsum";
-
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <param name="outputHelper"></param>
-        public ModuleAttributeTests(ITestOutputHelper outputHelper) : base(outputHelper)
-        {
-        }
-
-        /// <summary>
-        /// Returns the <typeparamref name="TDetails"/> based on the given
-        /// <paramref name="assembly"/>.
-        /// </summary>
-        /// <typeparam name="TDetails"></typeparam>
-        /// <param name="assembly"></param>
-        /// <param name="extract"></param>
-        /// <returns></returns>
-        protected static TDetails GetAssemblyDetails<TDetails>(Assembly assembly, Func<Assembly, AssemblyName, TDetails> extract) =>
-            extract.Invoke(assembly, assembly.GetName());
-
-        protected override void VerifyDefault(TAttribute module)
-        {
-            base.VerifyDefault(module);
-
-            Assert.Equal(DefaultAuthor, module.Author);
-            Assert.Equal(DefaultVersionZero, module.Version);
-            Assert.Equal(DefaultWebsiteUrl, module.Website);
-
-            Assert.NotNull(module.Tags);
-            Assert.Empty(module.Tags);
-
-            Assert.NotNull(module.Features);
-            Assert.Empty(module.Features);
-        }
-
-        /// <summary>
-        /// Verifies the Default <paramref name="module"/> aspects, including
-        /// <see cref="ModuleAttribute.Type"/>.
-        /// </summary>
-        /// <param name="module">The module to consider.</param>
-        /// <param name="type">Type to consider.</param>
-        protected virtual void VerifyDefault(TAttribute module, string type)
-        {
-            VerifyDefault(module);
+        base.VerifyDefault(module);
+
+        Assert.Equal(DefaultAuthor, module.Author);
+        Assert.Equal(DefaultVersionZero, module.Version);
+        Assert.Equal(DefaultWebsiteUrl, module.Website);
 
-            Assert.Equal(type, module.Type);
-        }
+        Assert.NotNull(module.Tags);
+        Assert.Empty(module.Tags);
+
+        Assert.NotNull(module.Features);
+        Assert.Empty(module.Features);
+    }
+
+    /// <summary>
+    /// Verifies the Default <paramref name="module"/> aspects, including
+    /// <see cref="ModuleAttribute.Type"/>.
+    /// </summary>
+    /// <param name="module">The module to consider.</param>
+    /// <param name="type">Type to consider.</param>
+    protected virtual void VerifyDefault(TAttribute module, string type)
+    {
+        VerifyDefault(module);
+
+        Assert.Equal(type, module.Type);
+    }
 
 #pragma warning disable xUnit1013 // Public method on test class should be marked as a Theory
 #pragma warning disable xUnit1003 // Test data fulfilled by derived tests
-        /// <summary>
-        /// Verifies that the Default instance values, etc, are appropriate.
-        /// </summary>
-        /// <remarks>Re: pragma warnings, should be, etc, which it is. However, we separated
-        /// Theory+Data between classes, appropriately so.</remarks>
-        [Theory]
-        public virtual void Default(string type) => VerifyDefault(CreateFromArgs(classifier: null), type);
+    /// <summary>
+    /// Verifies that the Default instance values, etc, are appropriate.
+    /// </summary>
+    /// <remarks>Re: pragma warnings, should be, etc, which it is. However, we separated
+    /// Theory+Data between classes, appropriately so.</remarks>
+    [Theory]
+    public virtual void Default(string type) => VerifyDefault(CreateFromArgs(classifier: null), type);
 #pragma warning restore xUnit1003
 #pragma warning restore xUnit1013
 
-        /// <summary>
-        /// Verifies the <paramref name="expected"/> <see cref="Version"/>, including
-        /// <paramref name="fieldCount"/> aligned with the <em>OrchardCore</em> usage. Note
-        /// that <paramref name="expected"/> may require trailing zeros on account of how
-        /// <em>MSBuild</em> treats versions during target attribute code generation.
-        /// </summary>
-        /// <param name="module"></param>
-        /// <param name="assembly"></param>
-        /// <param name="expected"></param>
-        /// <param name="fieldCount"></param>
-        protected virtual void VerifyVersion(TAttribute module, Assembly assembly, Version expected, int fieldCount)
-        {
-            Assert.NotNull(module);
-            Assert.NotNull(assembly);
-            Assert.NotNull(expected);
-            Assert.True(fieldCount >= 0 && fieldCount <= 3);
-
-            // Overall, not too concerned care trailing zero octets, but for test purposes we need to be aware.
-            var assyName = assembly.GetName();
-            var assyVersion = assyName.Version;
-            // Because a zero Revision octet is assumed by MSBuild et al.
-            Assert.Equal(expected, assyVersion);
-            // And along similar lines, only render the field count octets, aligned with the Module Version for test purposes.
-            Assert.Equal(assyVersion.ToString(fieldCount), module.Version);
-        }
-
-        /// <summary>
-        /// Classifier supporting
-        /// <see cref="ModuleAttribute(string, string, string, string, string, string, string, bool, bool, bool)"/>,
-        /// arguments in order,
-        /// <c>id, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        /// <param name="index"></param>
-        /// <param name="arg"></param>
-        /// <returns></returns>
-        protected virtual Type ModuleString7Object3CtorClassifier(int index, object arg) =>
-            index switch
-            {
-                7 or 8 or 9 => typeof(object),
-                _ => typeof(string),
-            };
-
-        /// <summary>
-        /// Classifier supporting
-        /// <see cref="ModuleAttribute(string, string, string, string, string, string, string, string, bool, bool, bool)"/>,
-        /// arguments in order,
-        /// <c>id, name, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        /// <param name="index"></param>
-        /// <param name="arg"></param>
-        /// <returns></returns>
-        protected virtual Type ModuleString8Object3CtorClassifier(int index, object arg) =>
-            index switch
-            {
-                8 or 9 or 10 => typeof(object),
-                _ => typeof(string),
-            };
-
-        /// <summary>
-        /// Classifier supporting
-        /// <see cref="ModuleAttribute(string, string, string, string, string, string, string, string, string, string, bool, bool, bool)"/>,
-        /// arguments in order,
-        /// <c>id, name, category, priority, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        /// <param name="index"></param>
-        /// <param name="arg"></param>
-        /// <returns></returns>
-        protected virtual Type ModuleString10Object3CtorClassifier(int index, object arg) =>
-            index switch
-            {
-                10 or 11 or 12 => typeof(object),
-                _ => typeof(string),
-            };
-
-        /// <summary>
-        /// Classifier supporting
-        /// <see cref="ModuleAttribute(string, string, string, string, string, string, string, string, string, string, string, bool, bool, bool)"/>,
-        /// arguments in order,
-        /// <c>id, name, type, category, priority, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        /// <param name="index"></param>
-        /// <param name="arg"></param>
-        /// <returns></returns>
-        protected virtual Type ModuleString11Object3CtorClassifier(int index, object arg) =>
-            index switch
-            {
-                11 or 12 or 13 => typeof(object),
-                _ => typeof(string),
-            };
+    /// <summary>
+    /// Verifies the <paramref name="expected"/> <see cref="Version"/>, including
+    /// <paramref name="fieldCount"/> aligned with the <em>OrchardCore</em> usage. Note
+    /// that <paramref name="expected"/> may require trailing zeros on account of how
+    /// <em>MSBuild</em> treats versions during target attribute code generation.
+    /// </summary>
+    /// <param name="module"></param>
+    /// <param name="assembly"></param>
+    /// <param name="expected"></param>
+    /// <param name="fieldCount"></param>
+    protected virtual void VerifyVersion(TAttribute module, Assembly assembly, Version expected, int fieldCount)
+    {
+        Assert.NotNull(module);
+        Assert.NotNull(assembly);
+        Assert.NotNull(expected);
+        Assert.True(fieldCount >= 0 && fieldCount <= 3);
+
+        // Overall, not too concerned care trailing zero octets, but for test purposes we need to be aware.
+        var assyName = assembly.GetName();
+        var assyVersion = assyName.Version;
+        // Because a zero Revision octet is assumed by MSBuild et al.
+        Assert.Equal(expected, assyVersion);
+        // And along similar lines, only render the field count octets, aligned with the Module Version for test purposes.
+        Assert.Equal(assyVersion.ToString(fieldCount), module.Version);
     }
+
+    /// <summary>
+    /// Classifier supporting
+    /// <see cref="ModuleAttribute(string, string, string, string, string, string, string, bool, bool, bool)"/>,
+    /// arguments in order,
+    /// <c>id, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    /// <param name="index"></param>
+    /// <param name="arg"></param>
+    /// <returns></returns>
+    protected virtual Type ModuleString7Object3CtorClassifier(int index, object arg) =>
+        index switch
+        {
+            7 or 8 or 9 => typeof(object),
+            _ => typeof(string),
+        };
+
+    /// <summary>
+    /// Classifier supporting
+    /// <see cref="ModuleAttribute(string, string, string, string, string, string, string, string, bool, bool, bool)"/>,
+    /// arguments in order,
+    /// <c>id, name, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    /// <param name="index"></param>
+    /// <param name="arg"></param>
+    /// <returns></returns>
+    protected virtual Type ModuleString8Object3CtorClassifier(int index, object arg) =>
+        index switch
+        {
+            8 or 9 or 10 => typeof(object),
+            _ => typeof(string),
+        };
+
+    /// <summary>
+    /// Classifier supporting
+    /// <see cref="ModuleAttribute(string, string, string, string, string, string, string, string, string, string, bool, bool, bool)"/>,
+    /// arguments in order,
+    /// <c>id, name, category, priority, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    /// <param name="index"></param>
+    /// <param name="arg"></param>
+    /// <returns></returns>
+    protected virtual Type ModuleString10Object3CtorClassifier(int index, object arg) =>
+        index switch
+        {
+            10 or 11 or 12 => typeof(object),
+            _ => typeof(string),
+        };
+
+    /// <summary>
+    /// Classifier supporting
+    /// <see cref="ModuleAttribute(string, string, string, string, string, string, string, string, string, string, string, bool, bool, bool)"/>,
+    /// arguments in order,
+    /// <c>id, name, type, category, priority, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    /// <param name="index"></param>
+    /// <param name="arg"></param>
+    /// <returns></returns>
+    protected virtual Type ModuleString11Object3CtorClassifier(int index, object arg) =>
+        index switch
+        {
+            11 or 12 or 13 => typeof(object),
+            _ => typeof(string),
+        };
 }
diff --git a/test/OrchardCore.Abstractions.Tests/Modules/Manifest/ModuleAttributeTests.cs b/test/OrchardCore.Abstractions.Tests/Modules/Manifest/ModuleAttributeTests.cs
index d4bafa397ef..fa4dacff049 100644
--- a/test/OrchardCore.Abstractions.Tests/Modules/Manifest/ModuleAttributeTests.cs
+++ b/test/OrchardCore.Abstractions.Tests/Modules/Manifest/ModuleAttributeTests.cs
@@ -1,675 +1,674 @@
 using System;
 using System.Linq;
 
-namespace OrchardCore.Modules.Manifest
+namespace OrchardCore.Modules.Manifest;
+
+using DisplayManagement.Manifest;
+using Xunit;
+using Xunit.Abstractions;
+
+// TODO: TBD: add tests that help us expose non-named ctor args...
+// TODO: TBD: i.e. avoid ambiguous args...
+/// <inheritdoc/>
+public class ModuleAttributeTests : ModuleAttributeTests<ModuleAttribute>
 {
-    using DisplayManagement.Manifest;
-    using Xunit;
-    using Xunit.Abstractions;
-
-    // TODO: TBD: add tests that help us expose non-named ctor args...
-    // TODO: TBD: i.e. avoid ambiguous args...
-    /// <inheritdoc/>
-    public class ModuleAttributeTests : ModuleAttributeTests<ModuleAttribute>
+    // TODO: TBD: also include tests which verify known project/assembly references
+    // TODO: TBD: with the idea that we introduce them in the csproj like we might otherwise expect
+
+    /// <summary>
+    /// Constructor.
+    /// </summary>
+    /// <param name="outputHelper"></param>
+    public ModuleAttributeTests(ITestOutputHelper outputHelper) : base(outputHelper)
     {
-        // TODO: TBD: also include tests which verify known project/assembly references
-        // TODO: TBD: with the idea that we introduce them in the csproj like we might otherwise expect
-
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <param name="outputHelper"></param>
-        public ModuleAttributeTests(ITestOutputHelper outputHelper) : base(outputHelper)
-        {
-        }
-
-        /// <summary>
-        /// &quot;Module&quot;
-        /// </summary>
-        private const string Module = nameof(Module);
+    }
+
+    /// <summary>
+    /// &quot;Module&quot;
+    /// </summary>
+    private const string Module = nameof(Module);
 
 #pragma warning disable xUnit1008 // Fulfulling base class Theory method test data
-        [InlineData(Module)]
-        public override void Default(string type) => base.Default(type);
+    [InlineData(Module)]
+    public override void Default(string type) => base.Default(type);
 #pragma warning restore xUnit1008
 
 #pragma warning disable CA1018 // Specify AttributeUsage...
-        // No need since the attribute is only here in order to verify Prefix extraction
+    // No need since the attribute is only here in order to verify Prefix extraction
 #pragma warning disable CA1710 // Rename to end in 'Attribute'
-        public class TestAttributePrefix : Attribute { }
+    public class TestAttributePrefix : Attribute { }
 #pragma warning restore CA1710
 #pragma warning restore CA1018
 
-        // TODO: MWP: could probably separate this between classes, Theory at one level, InlineData at another...
-        // TODO: MWP: plus separate out DisplayManagement tests to its own assembly, potentialy...
-        /// <summary>
-        /// Verify a couple of scenarios parsing an Attribute Prefix.
-        /// </summary>
-        /// <param name="attributeType"></param>
-        /// <param name="expected"></param>
-        [
-            Theory,
-            InlineData(typeof(ModuleAttribute), "Module"),
-            InlineData(typeof(ThemeAttribute), "Theme"),
-            InlineData(typeof(TestAttributePrefix), nameof(TestAttributePrefix))
-        ]
-        public virtual void AttributePrefix(Type attributeType, string expected)
-        {
-            Assert.Equal(expected, ModuleAttribute.GetAttributePrefix(attributeType));
-        }
-
-        /// <summary>
-        /// Verify the <see cref="ModuleAttribute(string, string, string, string, string, string, string, bool, bool, bool)"/>
-        /// ctor, arguments
-        /// <c>id, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        [Fact]
-        public virtual void Ipsum_Ctor_Id()
-        {
-            var id = LoremWords(1);
-            var description = LoremWords(7);
-            var author = LoremWords(2);
-            var semVer = string.Join('.', GetValues(1, 2, 3, 4).Select(_ => $"{_}"));
-            var website = LoremWebsiteUrl();
-            var deps = LoremWords(5).Split(' ');
-            var tags = LoremWords(5).Split(' ');
-            const bool defaultTenant = default;
-            const bool alwaysEnabled = default;
-            const bool enabledByDependencyOnly = default;
-
-            var priString = string.Empty;
-            var depString = string.Join(';', deps);
-            var tagString = string.Join(';', tags);
-
-            ReportKeyValuePairs(
-                new RenderKeyValuePair(nameof(id), id),
-                new RenderKeyValuePair(nameof(description), description),
-                new RenderKeyValuePair(nameof(author), author),
-                new RenderKeyValuePair(nameof(semVer), semVer),
-                new RenderKeyValuePair(nameof(website), website),
-                new RenderKeyValuePair(nameof(deps), depString),
-                new RenderKeyValuePair(nameof(tags), tagString),
-                new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
-                new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
-                new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
-            );
-
-            var module = CreateFromArgs(ModuleString7Object3CtorClassifier, id, description, author, semVer, website, depString, tagString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
-
-            Assert.Equal(id, module.Id);
-            Assert.Equal(id, module.Name);
-
-            Assert.NotNull(module.Category);
-            Assert.Empty(module.Category);
-
-            Assert.Null(module.InternalPriority);
-            Assert.Equal(priString, module.Priority);
-
-            Assert.Equal(description, module.Description);
-
-            Assert.Equal(author, module.Author);
-            Assert.Equal(semVer, module.Version);
-            Assert.Equal(website, module.Website);
-
-            Assert.NotNull(module.Dependencies);
-            Assert.Equal(deps, module.Dependencies);
-
-            Assert.NotNull(module.Tags);
-            Assert.Equal(tags, module.Tags);
-
-            Assert.Equal(defaultTenant, module.DefaultTenantOnly);
-            Assert.Equal(alwaysEnabled, module.IsAlwaysEnabled);
-
-            Assert.NotNull(module.Features);
-            Assert.Empty(module.Features);
-        }
-
-        // TODO: TBD: add the ArgumentException path for the bool (object) variations...
-        /// <summary>
-        /// Verify the <see cref="ModuleAttribute(string, string, string, string, string, string, string, string, bool, bool, bool)"/>
-        /// ctor, arguments
-        /// <c>id, name, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        [Fact]
-        public virtual void Ipsum_Ctor_Id_Name()
-        {
-            var id = LoremWords(1);
-            var name = LoremWords(1);
-            var description = LoremWords(7);
-            var author = LoremWords(2);
-            var semVer = string.Join('.', GetValues(1, 2, 3, 4).Select(_ => $"{_}"));
-            var website = LoremWebsiteUrl();
-            var deps = LoremWords(5).Split(' ');
-            var tags = LoremWords(5).Split(' ');
-            const bool defaultTenant = default;
-            const bool alwaysEnabled = default;
-            const bool enabledByDependencyOnly = default;
-
-            var priString = string.Empty;
-            var depString = string.Join(';', deps);
-            var tagString = string.Join(';', tags);
-
-            ReportKeyValuePairs(
-                new RenderKeyValuePair(nameof(id), id),
-                new RenderKeyValuePair(nameof(name), name),
-                new RenderKeyValuePair(nameof(description), description),
-                new RenderKeyValuePair(nameof(author), author),
-                new RenderKeyValuePair(nameof(semVer), semVer),
-                new RenderKeyValuePair(nameof(website), website),
-                new RenderKeyValuePair(nameof(deps), depString),
-                new RenderKeyValuePair(nameof(tags), tagString),
-                new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
-                new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
-                new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
-            );
-
-            var module = CreateFromArgs(ModuleString8Object3CtorClassifier, id, name, description, author, semVer, website, depString, tagString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
-
-            Assert.Equal(id, module.Id);
-            Assert.Equal(name, module.Name);
-
-            Assert.NotNull(module.Category);
-            Assert.Empty(module.Category);
-
-            Assert.Null(module.InternalPriority);
-            Assert.Equal(priString, module.Priority);
-
-            Assert.Equal(description, module.Description);
-
-            Assert.Equal(author, module.Author);
-            Assert.Equal(semVer, module.Version);
-            Assert.Equal(website, module.Website);
-
-            Assert.NotNull(module.Dependencies);
-            Assert.Equal(deps, module.Dependencies);
-
-            Assert.NotNull(module.Tags);
-            Assert.Equal(tags, module.Tags);
-
-            Assert.Equal(defaultTenant, module.DefaultTenantOnly);
-            Assert.Equal(alwaysEnabled, module.IsAlwaysEnabled);
-
-            Assert.NotNull(module.Features);
-            Assert.Empty(module.Features);
-        }
-
-        /// <summary>
-        /// Verify the <see cref="ModuleAttribute(string, string, string, string, string, string, string, string, string, string, bool, bool, bool)"/>
-        /// ctor, arguments
-        /// <c>id, name, category, priority, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        [Fact]
-        public virtual void Ipsum_Ctor_Id_Name_Cat_Pri()
-        {
-            var id = LoremWords(1);
-            var name = LoremWords(1);
-            var category = LoremWords(1);
-            var priority = DefaultPriority + 1;
-            var description = LoremWords(7);
-            var author = LoremWords(2);
-            var semVer = string.Join('.', GetValues(1, 2, 3, 4).Select(_ => $"{_}"));
-            var website = LoremWebsiteUrl();
-            var deps = LoremWords(5).Split(' ');
-            var tags = LoremWords(5).Split(' ');
-            const bool defaultTenant = default;
-            const bool alwaysEnabled = default;
-            const bool enabledByDependencyOnly = default;
-
-            var priString = $"{priority}";
-            var depString = string.Join(';', deps);
-            var tagString = string.Join(';', tags);
-
-            ReportKeyValuePairs(
-                new RenderKeyValuePair(nameof(id), id),
-                new RenderKeyValuePair(nameof(name), name),
-                new RenderKeyValuePair(nameof(category), category),
-                new RenderKeyValuePair(nameof(priority), priority),
-                new RenderKeyValuePair(nameof(description), description),
-                new RenderKeyValuePair(nameof(author), author),
-                new RenderKeyValuePair(nameof(semVer), semVer),
-                new RenderKeyValuePair(nameof(website), website),
-                new RenderKeyValuePair(nameof(deps), depString),
-                new RenderKeyValuePair(nameof(tags), tagString),
-                new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
-                new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
-                new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
-            );
-
-            var module = CreateFromArgs(ModuleString10Object3CtorClassifier, id, name, category, priString, description, author, semVer, website, depString, tagString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
-
-            Assert.Equal(id, module.Id);
-            Assert.Equal(name, module.Name);
-
-            Assert.Equal(category, module.Category);
-            Assert.Equal(priority, module.InternalPriority);
-            Assert.Equal(priString, module.Priority);
-
-            Assert.Equal(description, module.Description);
-
-            Assert.Equal(author, module.Author);
-            Assert.Equal(semVer, module.Version);
-            Assert.Equal(website, module.Website);
-
-            Assert.NotNull(module.Dependencies);
-            Assert.Equal(deps, module.Dependencies);
-
-            Assert.NotNull(module.Tags);
-            Assert.Equal(tags, module.Tags);
-
-            Assert.Equal(defaultTenant, module.DefaultTenantOnly);
-            Assert.Equal(alwaysEnabled, module.IsAlwaysEnabled);
-
-            Assert.NotNull(module.Features);
-            Assert.Empty(module.Features);
-        }
-
-        /// <summary>
-        /// Verify the <see cref="ModuleAttribute(string, string, string, string, string, string, string, string, string, string, string, bool, bool, bool)"/>
-        /// ctor, arguments
-        /// <c>id, name, type, category, priority, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        [Fact]
-        public virtual void Ipsum_Ctor_Id_Name_Type_Cat_Pri()
-        {
-            var id = LoremWords(1);
-            var name = LoremWords(1);
-            var type = LoremWords(1);
-            var category = LoremWords(1);
-            var priority = DefaultPriority + 1;
-            var description = LoremWords(7);
-            var author = LoremWords(2);
-            var semVer = string.Join('.', GetValues(1, 2, 3, 4).Select(_ => $"{_}"));
-            var website = LoremWebsiteUrl();
-            var deps = LoremWords(5).Split(' ');
-            var tags = LoremWords(5).Split(' ');
-            const bool defaultTenant = default;
-            const bool alwaysEnabled = default;
-            const bool enabledByDependencyOnly = default;
-
-            var priString = $"{priority}";
-            var depString = string.Join(';', deps);
-            var tagString = string.Join(';', tags);
-
-            ReportKeyValuePairs(
-                new RenderKeyValuePair(nameof(id), id),
-                new RenderKeyValuePair(nameof(name), name),
-                new RenderKeyValuePair(nameof(type), type),
-                new RenderKeyValuePair(nameof(category), category),
-                new RenderKeyValuePair(nameof(priority), priority),
-                new RenderKeyValuePair(nameof(description), description),
-                new RenderKeyValuePair(nameof(author), author),
-                new RenderKeyValuePair(nameof(semVer), semVer),
-                new RenderKeyValuePair(nameof(website), website),
-                new RenderKeyValuePair(nameof(deps), depString),
-                new RenderKeyValuePair(nameof(tags), tagString),
-                new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
-                new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
-                new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
-            );
-
-            var module = CreateFromArgs(ModuleString11Object3CtorClassifier, id, name, type, category, priString, description, author, semVer, website, depString, tagString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
-
-            Assert.Equal(id, module.Id);
-            Assert.Equal(name, module.Name);
-            Assert.Equal(type, module.Type);
-
-            Assert.Equal(category, module.Category);
-            Assert.Equal(priority, module.InternalPriority);
-            Assert.Equal(priString, module.Priority);
-
-            Assert.Equal(description, module.Description);
-
-            Assert.Equal(author, module.Author);
-            Assert.Equal(semVer, module.Version);
-            Assert.Equal(website, module.Website);
-
-            Assert.NotNull(module.Dependencies);
-            Assert.Equal(deps, module.Dependencies);
-
-            Assert.NotNull(module.Tags);
-            Assert.Equal(tags, module.Tags);
-
-            Assert.Equal(defaultTenant, module.DefaultTenantOnly);
-            Assert.Equal(alwaysEnabled, module.IsAlwaysEnabled);
-
-            Assert.NotNull(module.Features);
-            Assert.Empty(module.Features);
-        }
-
-        /////// TODO: MWP: so far so good... review, rinse, and repeat with ThemeAttribute in view...
-        /////// TODO: MWP: then need to (re-)consider whether ModuleMarkerAttribute is a desirable thing after all?
-        /////// TODO: MWP: what purpose d(oes/id) it serve, would a simple ctor on ModuleAttribute itself be sufficient?
-        ///// TODO: MWP: possible xUnit issue discovering this as a Theory... / https://github.com/xunit/xunit/discussions/2508
-        ///// <param name = "rootType" ></ param >
-        //[
-        //    Theory,
-        //    InlineData(typeof(Abstractions.AssyAttrib.Alpha.Root))
-        //]
-        //public virtual void Csproj_AssyAttrib_Id_Name_Cat_Pri(Type rootType)
-
-        // TODO: MWP: verify as well, if there are services, contexts, infos, etc, that are more actively involved...
-        // TODO: MWP: involved how, discovering, dissecting, disseminating, distributing, bits of Module details
-        /// <summary>
-        /// Same as <see cref="Ipsum_Ctor_Id"/> except via <em>MSBuild</em> <c>AssemblyAttribute</c>.
-        /// </summary>
-        [Fact]
-        public virtual void Csproj_AssyAttrib_Id()
-        {
-            // Would inject via Theory but for issues xUnit failing to discover the cases
-            var rootType = typeof(Examples.Modules.AssyAttrib.Charlie.Root);
-
-            var id = "one";
-            var description = "two";
-            var category = DefaultCategory;
-            var author = "three";
-            var semVer = "4.5.6";
-            var website = LoremAssyAttribIpsumUrl;
-            var deps = GetArray("six", "seven", "eight");
-            var tags = GetArray("seven", "eight", "nine");
-            const bool defaultTenant = true;
-            const bool alwaysEnabled = true;
-            const bool enabledByDependencyOnly = default;
-
-            var priString = string.Empty;
-            var depString = string.Join(';', deps);
-            var tagString = string.Join(';', tags);
-
-            ReportKeyValuePairs(
-                new RenderKeyValuePair(nameof(id), id),
-                new RenderKeyValuePair(nameof(description), description),
-                new RenderKeyValuePair(nameof(author), author),
-                new RenderKeyValuePair(nameof(semVer), semVer),
-                new RenderKeyValuePair(nameof(website), website),
-                new RenderKeyValuePair(nameof(deps), depString),
-                new RenderKeyValuePair(nameof(tags), tagString),
-                new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
-                new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
-                new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
-            );
-
-            // We are looking for one instance of ModuleAttribute in particular in this case
-            var module = GetAssemblyAttribute<ModuleAttribute>(rootType, _ => _.GetType() == typeof(ModuleAttribute));
-            // TODO: MWP: note that targets are mining for project properties and are also injecting a ModuleMarkerAttribute...
-            // TODO: MWP: ...which is also a 'Module', which is a possible source of confusion, spoofing, counterfeit, fraud, etc
-            Assert.NotNull(module);
-
-            Assert.Equal(id, module.Id);
-            Assert.Equal(id, module.Name);
-
-            Assert.Equal(category, module.Category);
-            Assert.Null(module.InternalPriority);
-            Assert.Equal(priString, module.Priority);
-
-            Assert.Equal(description, module.Description);
-
-            Assert.Equal(author, module.Author);
-            Assert.Equal(semVer, module.Version);
-            Assert.Equal(website, module.Website);
-
-            Assert.NotNull(module.Dependencies);
-            Assert.Equal(deps, module.Dependencies);
-
-            Assert.NotNull(module.Tags);
-            Assert.Equal(tags, module.Tags);
-
-            Assert.Equal(defaultTenant, module.DefaultTenantOnly);
-            Assert.Equal(alwaysEnabled, module.IsAlwaysEnabled);
-
-            Assert.NotNull(module.Features);
-            Assert.Empty(module.Features);
-        }
-
-        /// <summary>
-        /// Same as <see cref="Ipsum_Ctor_Id_Name"/> except via <em>MSBuild</em> <c>AssemblyAttribute</c>.
-        /// </summary>
-        [Fact]
-        public virtual void Csproj_AssyAttrib_Id_Name()
-        {
-            // Would inject via Theory but for issues xUnit failing to discover the cases
-            var rootType = typeof(Examples.Modules.AssyAttrib.Bravo.Root);
-
-            var id = "one";
-            var name = "two";
-            var description = "three";
-            var category = DefaultCategory;
-            var author = "four";
-            var semVer = "5.6.7";
-            var website = LoremAssyAttribIpsumUrl;
-            var deps = GetArray("seven", "eight", "nine");
-            var tags = GetArray("eight", "nine", "ten");
-            const bool defaultTenant = true;
-            const bool alwaysEnabled = true;
-            const bool enabledByDependencyOnly = default;
-
-            var priString = string.Empty;
-            var depString = string.Join(';', deps);
-            var tagString = string.Join(';', tags);
-
-            ReportKeyValuePairs(
-                new RenderKeyValuePair(nameof(id), id),
-                new RenderKeyValuePair(nameof(name), name),
-                new RenderKeyValuePair(nameof(description), description),
-                new RenderKeyValuePair(nameof(author), author),
-                new RenderKeyValuePair(nameof(semVer), semVer),
-                new RenderKeyValuePair(nameof(website), website),
-                new RenderKeyValuePair(nameof(deps), depString),
-                new RenderKeyValuePair(nameof(tags), tagString),
-                new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
-                new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
-                new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
-            );
-
-            // We are looking for one instance of ModuleAttribute in particular in this case
-            var module = GetAssemblyAttribute<ModuleAttribute>(rootType, _ => _.GetType() == typeof(ModuleAttribute));
-            // TODO: MWP: note that targets are mining for project properties and are also injecting a ModuleMarkerAttribute...
-            // TODO: MWP: ...which is also a 'Module', which is a possible source of confusion, spoofing, counterfeit, fraud, etc
-            Assert.NotNull(module);
-
-            Assert.Equal(id, module.Id);
-            Assert.Equal(name, module.Name);
-
-            Assert.Equal(category, module.Category);
-            Assert.Null(module.InternalPriority);
-            Assert.Equal(priString, module.Priority);
-
-            Assert.Equal(description, module.Description);
-
-            Assert.Equal(author, module.Author);
-            Assert.Equal(semVer, module.Version);
-            Assert.Equal(website, module.Website);
-
-            Assert.NotNull(module.Dependencies);
-            Assert.Equal(deps, module.Dependencies);
-
-            Assert.NotNull(module.Tags);
-            Assert.Equal(tags, module.Tags);
-
-            Assert.Equal(defaultTenant, module.DefaultTenantOnly);
-            Assert.Equal(alwaysEnabled, module.IsAlwaysEnabled);
-
-            Assert.NotNull(module.Features);
-            Assert.Empty(module.Features);
-        }
-
-        /// <summary>
-        /// Same as <see cref="Ipsum_Ctor_Id_Name_Cat_Pri"/> except via <em>MSBuild</em> <c>AssemblyAttribute</c>.
-        /// </summary>
-        [Fact]
-        public virtual void Csproj_AssyAttrib_Id_Name_Cat_Pri()
-        {
-            // Would inject via Theory but for issues xUnit failing to discover the cases
-            var rootType = typeof(Examples.Modules.AssyAttrib.Alpha.Root);
-
-            var id = "one";
-            var name = "two";
-            var category = "three";
-            const int priority = 4;
-            var description = "five";
-            var author = "six";
-            var semVer = "7.8.9";
-            var website = LoremAssyAttribIpsumUrl;
-            var deps = GetArray("nine", "ten", "eleven");
-            var tags = GetArray("ten", "eleven", "twelve");
-            const bool defaultTenant = true;
-            const bool alwaysEnabled = true;
-            const bool enabledByDependencyOnly = default;
-
-            var priString = $"{priority}";
-            var depString = string.Join(';', deps);
-            var tagString = string.Join(';', tags);
-
-            ReportKeyValuePairs(
-                new RenderKeyValuePair(nameof(id), id),
-                new RenderKeyValuePair(nameof(name), name),
-                new RenderKeyValuePair(nameof(category), category),
-                new RenderKeyValuePair(nameof(priority), priority),
-                new RenderKeyValuePair(nameof(description), description),
-                new RenderKeyValuePair(nameof(author), author),
-                new RenderKeyValuePair(nameof(semVer), semVer),
-                new RenderKeyValuePair(nameof(website), website),
-                new RenderKeyValuePair(nameof(deps), depString),
-                new RenderKeyValuePair(nameof(tags), tagString),
-                new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
-                new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
-                new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
-            );
-
-            // We are looking for one instance of ModuleAttribute in particular in this case
-            var module = GetAssemblyAttribute<ModuleAttribute>(rootType, _ => _.GetType() == typeof(ModuleAttribute));
-            // TODO: MWP: note that targets are mining for project properties and are also injecting a ModuleMarkerAttribute...
-            // TODO: MWP: ...which is also a 'Module', which is a possible source of confusion, spoofing, counterfeit, fraud, etc
-            Assert.NotNull(module);
-
-            Assert.Equal(id, module.Id);
-            Assert.Equal(name, module.Name);
-
-            Assert.Equal(category, module.Category);
-            Assert.Equal(priority, module.InternalPriority);
-            Assert.Equal(priString, module.Priority);
-
-            Assert.Equal(description, module.Description);
-
-            Assert.Equal(author, module.Author);
-            Assert.Equal(semVer, module.Version);
-            Assert.Equal(website, module.Website);
-
-            Assert.NotNull(module.Dependencies);
-            Assert.Equal(deps, module.Dependencies);
-
-            Assert.NotNull(module.Tags);
-            Assert.Equal(tags, module.Tags);
-
-            Assert.Equal(defaultTenant, module.DefaultTenantOnly);
-            Assert.Equal(alwaysEnabled, module.IsAlwaysEnabled);
-
-            Assert.NotNull(module.Features);
-            Assert.Empty(module.Features);
-        }
-
-        /// <summary>
-        /// Same as <see cref="Ipsum_Ctor_Id_Name_Cat_Pri"/> except via <em>MSBuild</em>
-        /// <c>OrchardCoreModules</c> list items. We also pick up the <c>OrchardCoreFeatures</c>
-        /// list items in this case as well.
-        /// </summary>
-        [Fact]
-        public virtual void Csproj_OrchardCoreModules_MSBuild_ItemLists()
-        {
-            // Would inject via Theory but for issues xUnit failing to discover the cases
-            var rootType = typeof(Examples.OrchardCoreModules.Alpha.Root);
-            var baseId = rootType.Assembly.GetName().Name;
-
-            const string One = nameof(One);
-            const string Two = nameof(Two);
-            const string three = nameof(three);
-            const string four = nameof(four);
-            const string five = nameof(five);
-            const string six = nameof(six);
-            const string seven = nameof(seven);
-            const string eight = nameof(eight);
-            const string nine = nameof(nine);
-            const string ten = nameof(ten);
-            const string eleven = nameof(eleven);
-            const string twelve = nameof(twelve);
-            const string thirteen = nameof(thirteen);
-            const bool tenant = true;
-            const bool enabled = true;
-
-            const int _3 = 3;
-            const int _4 = 4;
-
-            const string Module = nameof(Module);
-
-            // TODO: TBD: may report what is being tested also for Module, Features, etc...
-
-            // We are looking for one instance of ModuleAttribute in particular in this case
-            var module = GetAssemblyAttribute<ModuleAttribute>(rootType, _ => _.GetType() == typeof(ModuleAttribute));
-            var features = GetAssemblyAttributes<FeatureAttribute>(rootType, _ => _.GetType() == typeof(FeatureAttribute))
-                // We shall assume the test case includes a valid sortable Priority
-                .OrderBy(_ => _.InternalPriority).ToArray();
-
-            // TODO: MWP: note that targets are mining for project properties and are also injecting a ModuleMarkerAttribute...
-            // TODO: MWP: ...which is also a 'Module', which is a possible source of confusion, spoofing, counterfeit, fraud, etc
-            Assert.NotNull(module);
-
-            Assert.Equal(baseId, module.Id);
-            Assert.Equal(baseId, module.Name);
-            Assert.Equal(Module, module.Type);
-
-            Assert.Equal(three, module.Category);
-            Assert.Equal(_4, module.InternalPriority);
-            Assert.Equal($"{_4}", module.Priority);
-
-            Assert.Equal(five, module.Description);
-
-            Assert.Equal(six, module.Author);
-            Assert.Equal("oc://moduleandfeaturesmsbuilditemlists.prop", module.Website);
-
-            // Mind the trailing zeros that is intentional, and the field count, also intentional
-            VerifyVersion(module, rootType.Assembly, new Version(7, 8, 9, 0), 3);
-            //                                                   ^^^^^^^^^^   ^
-
-            Assert.NotNull(module.Dependencies);
-            Assert.Equal(GetValues(nine, ten, eleven), module.Dependencies);
-
-            Assert.NotNull(module.Tags);
-            Assert.Equal(GetValues(ten, eleven, twelve), module.Tags);
-
-            Assert.Equal(tenant, module.DefaultTenantOnly);
-            Assert.Equal(enabled, module.IsAlwaysEnabled);
-
-            Assert.NotNull(module.Features);
-            Assert.Empty(module.Features);
-
-            /* Features should contain the following composites as well, which, by definition,
-             * should contain 'two' in the following shapes:
-             */
-            Assert.Contains(features, _ =>
-                _.Id == string.Join(".", baseId, One) &&
-                _.Name == _.Id &&
-                _.Category.Equals(Two, StringComparison.OrdinalIgnoreCase) &&
-                _.InternalPriority == _3 &&
-                _.Description == four &&
-                _.Dependencies.SequenceEqual(GetValues(five, six, seven)) &&
-                _.DefaultTenantOnly == tenant &&
-                _.IsAlwaysEnabled == enabled
-            );
-
-            Assert.Contains(features, _ =>
-                _.Id == string.Join(".", baseId, Two) &&
-                _.Name == _.Id &&
-                _.Category == three &&
-                _.InternalPriority == _4 &&
-                _.Description == five &&
-                _.Dependencies.SequenceEqual(GetValues(six, seven, eight)) &&
-                _.DefaultTenantOnly == tenant &&
-                _.IsAlwaysEnabled == enabled
-            );
-        }
-
-        /* TODO: TBD: might be interesting to add tests that allow projects to be built in
-         * process, and to gauge the status codes in response accordingly... The supporting
-         * projects are 'there' already, and all we would need to do is load them in an
-         * appropriate Build context, try to build, and monitor.
+    // TODO: MWP: could probably separate this between classes, Theory at one level, InlineData at another...
+    // TODO: MWP: plus separate out DisplayManagement tests to its own assembly, potentialy...
+    /// <summary>
+    /// Verify a couple of scenarios parsing an Attribute Prefix.
+    /// </summary>
+    /// <param name="attributeType"></param>
+    /// <param name="expected"></param>
+    [
+        Theory,
+        InlineData(typeof(ModuleAttribute), "Module"),
+        InlineData(typeof(ThemeAttribute), "Theme"),
+        InlineData(typeof(TestAttributePrefix), nameof(TestAttributePrefix))
+    ]
+    public virtual void AttributePrefix(Type attributeType, string expected)
+    {
+        Assert.Equal(expected, ModuleAttribute.GetAttributePrefix(attributeType));
+    }
+
+    /// <summary>
+    /// Verify the <see cref="ModuleAttribute(string, string, string, string, string, string, string, bool, bool, bool)"/>
+    /// ctor, arguments
+    /// <c>id, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    [Fact]
+    public virtual void Ipsum_Ctor_Id()
+    {
+        var id = LoremWords(1);
+        var description = LoremWords(7);
+        var author = LoremWords(2);
+        var semVer = string.Join('.', GetValues(1, 2, 3, 4).Select(_ => $"{_}"));
+        var website = LoremWebsiteUrl();
+        var deps = LoremWords(5).Split(' ');
+        var tags = LoremWords(5).Split(' ');
+        const bool defaultTenant = default;
+        const bool alwaysEnabled = default;
+        const bool enabledByDependencyOnly = default;
+
+        var priString = string.Empty;
+        var depString = string.Join(';', deps);
+        var tagString = string.Join(';', tags);
+
+        ReportKeyValuePairs(
+            new RenderKeyValuePair(nameof(id), id),
+            new RenderKeyValuePair(nameof(description), description),
+            new RenderKeyValuePair(nameof(author), author),
+            new RenderKeyValuePair(nameof(semVer), semVer),
+            new RenderKeyValuePair(nameof(website), website),
+            new RenderKeyValuePair(nameof(deps), depString),
+            new RenderKeyValuePair(nameof(tags), tagString),
+            new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
+            new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
+            new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
+        );
+
+        var module = CreateFromArgs(ModuleString7Object3CtorClassifier, id, description, author, semVer, website, depString, tagString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
+
+        Assert.Equal(id, module.Id);
+        Assert.Equal(id, module.Name);
+
+        Assert.NotNull(module.Category);
+        Assert.Empty(module.Category);
+
+        Assert.Null(module.InternalPriority);
+        Assert.Equal(priString, module.Priority);
+
+        Assert.Equal(description, module.Description);
+
+        Assert.Equal(author, module.Author);
+        Assert.Equal(semVer, module.Version);
+        Assert.Equal(website, module.Website);
+
+        Assert.NotNull(module.Dependencies);
+        Assert.Equal(deps, module.Dependencies);
+
+        Assert.NotNull(module.Tags);
+        Assert.Equal(tags, module.Tags);
+
+        Assert.Equal(defaultTenant, module.DefaultTenantOnly);
+        Assert.Equal(alwaysEnabled, module.IsAlwaysEnabled);
+
+        Assert.NotNull(module.Features);
+        Assert.Empty(module.Features);
+    }
+
+    // TODO: TBD: add the ArgumentException path for the bool (object) variations...
+    /// <summary>
+    /// Verify the <see cref="ModuleAttribute(string, string, string, string, string, string, string, string, bool, bool, bool)"/>
+    /// ctor, arguments
+    /// <c>id, name, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    [Fact]
+    public virtual void Ipsum_Ctor_Id_Name()
+    {
+        var id = LoremWords(1);
+        var name = LoremWords(1);
+        var description = LoremWords(7);
+        var author = LoremWords(2);
+        var semVer = string.Join('.', GetValues(1, 2, 3, 4).Select(_ => $"{_}"));
+        var website = LoremWebsiteUrl();
+        var deps = LoremWords(5).Split(' ');
+        var tags = LoremWords(5).Split(' ');
+        const bool defaultTenant = default;
+        const bool alwaysEnabled = default;
+        const bool enabledByDependencyOnly = default;
+
+        var priString = string.Empty;
+        var depString = string.Join(';', deps);
+        var tagString = string.Join(';', tags);
+
+        ReportKeyValuePairs(
+            new RenderKeyValuePair(nameof(id), id),
+            new RenderKeyValuePair(nameof(name), name),
+            new RenderKeyValuePair(nameof(description), description),
+            new RenderKeyValuePair(nameof(author), author),
+            new RenderKeyValuePair(nameof(semVer), semVer),
+            new RenderKeyValuePair(nameof(website), website),
+            new RenderKeyValuePair(nameof(deps), depString),
+            new RenderKeyValuePair(nameof(tags), tagString),
+            new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
+            new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
+            new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
+        );
+
+        var module = CreateFromArgs(ModuleString8Object3CtorClassifier, id, name, description, author, semVer, website, depString, tagString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
+
+        Assert.Equal(id, module.Id);
+        Assert.Equal(name, module.Name);
+
+        Assert.NotNull(module.Category);
+        Assert.Empty(module.Category);
+
+        Assert.Null(module.InternalPriority);
+        Assert.Equal(priString, module.Priority);
+
+        Assert.Equal(description, module.Description);
+
+        Assert.Equal(author, module.Author);
+        Assert.Equal(semVer, module.Version);
+        Assert.Equal(website, module.Website);
+
+        Assert.NotNull(module.Dependencies);
+        Assert.Equal(deps, module.Dependencies);
+
+        Assert.NotNull(module.Tags);
+        Assert.Equal(tags, module.Tags);
+
+        Assert.Equal(defaultTenant, module.DefaultTenantOnly);
+        Assert.Equal(alwaysEnabled, module.IsAlwaysEnabled);
+
+        Assert.NotNull(module.Features);
+        Assert.Empty(module.Features);
+    }
+
+    /// <summary>
+    /// Verify the <see cref="ModuleAttribute(string, string, string, string, string, string, string, string, string, string, bool, bool, bool)"/>
+    /// ctor, arguments
+    /// <c>id, name, category, priority, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    [Fact]
+    public virtual void Ipsum_Ctor_Id_Name_Cat_Pri()
+    {
+        var id = LoremWords(1);
+        var name = LoremWords(1);
+        var category = LoremWords(1);
+        var priority = DefaultPriority + 1;
+        var description = LoremWords(7);
+        var author = LoremWords(2);
+        var semVer = string.Join('.', GetValues(1, 2, 3, 4).Select(_ => $"{_}"));
+        var website = LoremWebsiteUrl();
+        var deps = LoremWords(5).Split(' ');
+        var tags = LoremWords(5).Split(' ');
+        const bool defaultTenant = default;
+        const bool alwaysEnabled = default;
+        const bool enabledByDependencyOnly = default;
+
+        var priString = $"{priority}";
+        var depString = string.Join(';', deps);
+        var tagString = string.Join(';', tags);
+
+        ReportKeyValuePairs(
+            new RenderKeyValuePair(nameof(id), id),
+            new RenderKeyValuePair(nameof(name), name),
+            new RenderKeyValuePair(nameof(category), category),
+            new RenderKeyValuePair(nameof(priority), priority),
+            new RenderKeyValuePair(nameof(description), description),
+            new RenderKeyValuePair(nameof(author), author),
+            new RenderKeyValuePair(nameof(semVer), semVer),
+            new RenderKeyValuePair(nameof(website), website),
+            new RenderKeyValuePair(nameof(deps), depString),
+            new RenderKeyValuePair(nameof(tags), tagString),
+            new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
+            new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
+            new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
+        );
+
+        var module = CreateFromArgs(ModuleString10Object3CtorClassifier, id, name, category, priString, description, author, semVer, website, depString, tagString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
+
+        Assert.Equal(id, module.Id);
+        Assert.Equal(name, module.Name);
+
+        Assert.Equal(category, module.Category);
+        Assert.Equal(priority, module.InternalPriority);
+        Assert.Equal(priString, module.Priority);
+
+        Assert.Equal(description, module.Description);
+
+        Assert.Equal(author, module.Author);
+        Assert.Equal(semVer, module.Version);
+        Assert.Equal(website, module.Website);
+
+        Assert.NotNull(module.Dependencies);
+        Assert.Equal(deps, module.Dependencies);
+
+        Assert.NotNull(module.Tags);
+        Assert.Equal(tags, module.Tags);
+
+        Assert.Equal(defaultTenant, module.DefaultTenantOnly);
+        Assert.Equal(alwaysEnabled, module.IsAlwaysEnabled);
+
+        Assert.NotNull(module.Features);
+        Assert.Empty(module.Features);
+    }
+
+    /// <summary>
+    /// Verify the <see cref="ModuleAttribute(string, string, string, string, string, string, string, string, string, string, string, bool, bool, bool)"/>
+    /// ctor, arguments
+    /// <c>id, name, type, category, priority, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    [Fact]
+    public virtual void Ipsum_Ctor_Id_Name_Type_Cat_Pri()
+    {
+        var id = LoremWords(1);
+        var name = LoremWords(1);
+        var type = LoremWords(1);
+        var category = LoremWords(1);
+        var priority = DefaultPriority + 1;
+        var description = LoremWords(7);
+        var author = LoremWords(2);
+        var semVer = string.Join('.', GetValues(1, 2, 3, 4).Select(_ => $"{_}"));
+        var website = LoremWebsiteUrl();
+        var deps = LoremWords(5).Split(' ');
+        var tags = LoremWords(5).Split(' ');
+        const bool defaultTenant = default;
+        const bool alwaysEnabled = default;
+        const bool enabledByDependencyOnly = default;
+
+        var priString = $"{priority}";
+        var depString = string.Join(';', deps);
+        var tagString = string.Join(';', tags);
+
+        ReportKeyValuePairs(
+            new RenderKeyValuePair(nameof(id), id),
+            new RenderKeyValuePair(nameof(name), name),
+            new RenderKeyValuePair(nameof(type), type),
+            new RenderKeyValuePair(nameof(category), category),
+            new RenderKeyValuePair(nameof(priority), priority),
+            new RenderKeyValuePair(nameof(description), description),
+            new RenderKeyValuePair(nameof(author), author),
+            new RenderKeyValuePair(nameof(semVer), semVer),
+            new RenderKeyValuePair(nameof(website), website),
+            new RenderKeyValuePair(nameof(deps), depString),
+            new RenderKeyValuePair(nameof(tags), tagString),
+            new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
+            new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
+            new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
+        );
+
+        var module = CreateFromArgs(ModuleString11Object3CtorClassifier, id, name, type, category, priString, description, author, semVer, website, depString, tagString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
+
+        Assert.Equal(id, module.Id);
+        Assert.Equal(name, module.Name);
+        Assert.Equal(type, module.Type);
+
+        Assert.Equal(category, module.Category);
+        Assert.Equal(priority, module.InternalPriority);
+        Assert.Equal(priString, module.Priority);
+
+        Assert.Equal(description, module.Description);
+
+        Assert.Equal(author, module.Author);
+        Assert.Equal(semVer, module.Version);
+        Assert.Equal(website, module.Website);
+
+        Assert.NotNull(module.Dependencies);
+        Assert.Equal(deps, module.Dependencies);
+
+        Assert.NotNull(module.Tags);
+        Assert.Equal(tags, module.Tags);
+
+        Assert.Equal(defaultTenant, module.DefaultTenantOnly);
+        Assert.Equal(alwaysEnabled, module.IsAlwaysEnabled);
+
+        Assert.NotNull(module.Features);
+        Assert.Empty(module.Features);
+    }
+
+    /////// TODO: MWP: so far so good... review, rinse, and repeat with ThemeAttribute in view...
+    /////// TODO: MWP: then need to (re-)consider whether ModuleMarkerAttribute is a desirable thing after all?
+    /////// TODO: MWP: what purpose d(oes/id) it serve, would a simple ctor on ModuleAttribute itself be sufficient?
+    ///// TODO: MWP: possible xUnit issue discovering this as a Theory... / https://github.com/xunit/xunit/discussions/2508
+    ///// <param name = "rootType" ></ param >
+    //[
+    //    Theory,
+    //    InlineData(typeof(Abstractions.AssyAttrib.Alpha.Root))
+    //]
+    //public virtual void Csproj_AssyAttrib_Id_Name_Cat_Pri(Type rootType)
+
+    // TODO: MWP: verify as well, if there are services, contexts, infos, etc, that are more actively involved...
+    // TODO: MWP: involved how, discovering, dissecting, disseminating, distributing, bits of Module details
+    /// <summary>
+    /// Same as <see cref="Ipsum_Ctor_Id"/> except via <em>MSBuild</em> <c>AssemblyAttribute</c>.
+    /// </summary>
+    [Fact]
+    public virtual void Csproj_AssyAttrib_Id()
+    {
+        // Would inject via Theory but for issues xUnit failing to discover the cases
+        var rootType = typeof(Examples.Modules.AssyAttrib.Charlie.Root);
+
+        var id = "one";
+        var description = "two";
+        var category = DefaultCategory;
+        var author = "three";
+        var semVer = "4.5.6";
+        var website = LoremAssyAttribIpsumUrl;
+        var deps = GetArray("six", "seven", "eight");
+        var tags = GetArray("seven", "eight", "nine");
+        const bool defaultTenant = true;
+        const bool alwaysEnabled = true;
+        const bool enabledByDependencyOnly = default;
+
+        var priString = string.Empty;
+        var depString = string.Join(';', deps);
+        var tagString = string.Join(';', tags);
+
+        ReportKeyValuePairs(
+            new RenderKeyValuePair(nameof(id), id),
+            new RenderKeyValuePair(nameof(description), description),
+            new RenderKeyValuePair(nameof(author), author),
+            new RenderKeyValuePair(nameof(semVer), semVer),
+            new RenderKeyValuePair(nameof(website), website),
+            new RenderKeyValuePair(nameof(deps), depString),
+            new RenderKeyValuePair(nameof(tags), tagString),
+            new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
+            new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
+            new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
+        );
+
+        // We are looking for one instance of ModuleAttribute in particular in this case
+        var module = GetAssemblyAttribute<ModuleAttribute>(rootType, _ => _.GetType() == typeof(ModuleAttribute));
+        // TODO: MWP: note that targets are mining for project properties and are also injecting a ModuleMarkerAttribute...
+        // TODO: MWP: ...which is also a 'Module', which is a possible source of confusion, spoofing, counterfeit, fraud, etc
+        Assert.NotNull(module);
+
+        Assert.Equal(id, module.Id);
+        Assert.Equal(id, module.Name);
+
+        Assert.Equal(category, module.Category);
+        Assert.Null(module.InternalPriority);
+        Assert.Equal(priString, module.Priority);
+
+        Assert.Equal(description, module.Description);
+
+        Assert.Equal(author, module.Author);
+        Assert.Equal(semVer, module.Version);
+        Assert.Equal(website, module.Website);
+
+        Assert.NotNull(module.Dependencies);
+        Assert.Equal(deps, module.Dependencies);
+
+        Assert.NotNull(module.Tags);
+        Assert.Equal(tags, module.Tags);
+
+        Assert.Equal(defaultTenant, module.DefaultTenantOnly);
+        Assert.Equal(alwaysEnabled, module.IsAlwaysEnabled);
+
+        Assert.NotNull(module.Features);
+        Assert.Empty(module.Features);
+    }
+
+    /// <summary>
+    /// Same as <see cref="Ipsum_Ctor_Id_Name"/> except via <em>MSBuild</em> <c>AssemblyAttribute</c>.
+    /// </summary>
+    [Fact]
+    public virtual void Csproj_AssyAttrib_Id_Name()
+    {
+        // Would inject via Theory but for issues xUnit failing to discover the cases
+        var rootType = typeof(Examples.Modules.AssyAttrib.Bravo.Root);
+
+        var id = "one";
+        var name = "two";
+        var description = "three";
+        var category = DefaultCategory;
+        var author = "four";
+        var semVer = "5.6.7";
+        var website = LoremAssyAttribIpsumUrl;
+        var deps = GetArray("seven", "eight", "nine");
+        var tags = GetArray("eight", "nine", "ten");
+        const bool defaultTenant = true;
+        const bool alwaysEnabled = true;
+        const bool enabledByDependencyOnly = default;
+
+        var priString = string.Empty;
+        var depString = string.Join(';', deps);
+        var tagString = string.Join(';', tags);
+
+        ReportKeyValuePairs(
+            new RenderKeyValuePair(nameof(id), id),
+            new RenderKeyValuePair(nameof(name), name),
+            new RenderKeyValuePair(nameof(description), description),
+            new RenderKeyValuePair(nameof(author), author),
+            new RenderKeyValuePair(nameof(semVer), semVer),
+            new RenderKeyValuePair(nameof(website), website),
+            new RenderKeyValuePair(nameof(deps), depString),
+            new RenderKeyValuePair(nameof(tags), tagString),
+            new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
+            new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
+            new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
+        );
+
+        // We are looking for one instance of ModuleAttribute in particular in this case
+        var module = GetAssemblyAttribute<ModuleAttribute>(rootType, _ => _.GetType() == typeof(ModuleAttribute));
+        // TODO: MWP: note that targets are mining for project properties and are also injecting a ModuleMarkerAttribute...
+        // TODO: MWP: ...which is also a 'Module', which is a possible source of confusion, spoofing, counterfeit, fraud, etc
+        Assert.NotNull(module);
+
+        Assert.Equal(id, module.Id);
+        Assert.Equal(name, module.Name);
+
+        Assert.Equal(category, module.Category);
+        Assert.Null(module.InternalPriority);
+        Assert.Equal(priString, module.Priority);
+
+        Assert.Equal(description, module.Description);
+
+        Assert.Equal(author, module.Author);
+        Assert.Equal(semVer, module.Version);
+        Assert.Equal(website, module.Website);
+
+        Assert.NotNull(module.Dependencies);
+        Assert.Equal(deps, module.Dependencies);
+
+        Assert.NotNull(module.Tags);
+        Assert.Equal(tags, module.Tags);
+
+        Assert.Equal(defaultTenant, module.DefaultTenantOnly);
+        Assert.Equal(alwaysEnabled, module.IsAlwaysEnabled);
+
+        Assert.NotNull(module.Features);
+        Assert.Empty(module.Features);
+    }
+
+    /// <summary>
+    /// Same as <see cref="Ipsum_Ctor_Id_Name_Cat_Pri"/> except via <em>MSBuild</em> <c>AssemblyAttribute</c>.
+    /// </summary>
+    [Fact]
+    public virtual void Csproj_AssyAttrib_Id_Name_Cat_Pri()
+    {
+        // Would inject via Theory but for issues xUnit failing to discover the cases
+        var rootType = typeof(Examples.Modules.AssyAttrib.Alpha.Root);
+
+        var id = "one";
+        var name = "two";
+        var category = "three";
+        const int priority = 4;
+        var description = "five";
+        var author = "six";
+        var semVer = "7.8.9";
+        var website = LoremAssyAttribIpsumUrl;
+        var deps = GetArray("nine", "ten", "eleven");
+        var tags = GetArray("ten", "eleven", "twelve");
+        const bool defaultTenant = true;
+        const bool alwaysEnabled = true;
+        const bool enabledByDependencyOnly = default;
+
+        var priString = $"{priority}";
+        var depString = string.Join(';', deps);
+        var tagString = string.Join(';', tags);
+
+        ReportKeyValuePairs(
+            new RenderKeyValuePair(nameof(id), id),
+            new RenderKeyValuePair(nameof(name), name),
+            new RenderKeyValuePair(nameof(category), category),
+            new RenderKeyValuePair(nameof(priority), priority),
+            new RenderKeyValuePair(nameof(description), description),
+            new RenderKeyValuePair(nameof(author), author),
+            new RenderKeyValuePair(nameof(semVer), semVer),
+            new RenderKeyValuePair(nameof(website), website),
+            new RenderKeyValuePair(nameof(deps), depString),
+            new RenderKeyValuePair(nameof(tags), tagString),
+            new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
+            new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
+            new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
+        );
+
+        // We are looking for one instance of ModuleAttribute in particular in this case
+        var module = GetAssemblyAttribute<ModuleAttribute>(rootType, _ => _.GetType() == typeof(ModuleAttribute));
+        // TODO: MWP: note that targets are mining for project properties and are also injecting a ModuleMarkerAttribute...
+        // TODO: MWP: ...which is also a 'Module', which is a possible source of confusion, spoofing, counterfeit, fraud, etc
+        Assert.NotNull(module);
+
+        Assert.Equal(id, module.Id);
+        Assert.Equal(name, module.Name);
+
+        Assert.Equal(category, module.Category);
+        Assert.Equal(priority, module.InternalPriority);
+        Assert.Equal(priString, module.Priority);
+
+        Assert.Equal(description, module.Description);
+
+        Assert.Equal(author, module.Author);
+        Assert.Equal(semVer, module.Version);
+        Assert.Equal(website, module.Website);
+
+        Assert.NotNull(module.Dependencies);
+        Assert.Equal(deps, module.Dependencies);
+
+        Assert.NotNull(module.Tags);
+        Assert.Equal(tags, module.Tags);
+
+        Assert.Equal(defaultTenant, module.DefaultTenantOnly);
+        Assert.Equal(alwaysEnabled, module.IsAlwaysEnabled);
+
+        Assert.NotNull(module.Features);
+        Assert.Empty(module.Features);
+    }
+
+    /// <summary>
+    /// Same as <see cref="Ipsum_Ctor_Id_Name_Cat_Pri"/> except via <em>MSBuild</em>
+    /// <c>OrchardCoreModules</c> list items. We also pick up the <c>OrchardCoreFeatures</c>
+    /// list items in this case as well.
+    /// </summary>
+    [Fact]
+    public virtual void Csproj_OrchardCoreModules_MSBuild_ItemLists()
+    {
+        // Would inject via Theory but for issues xUnit failing to discover the cases
+        var rootType = typeof(Examples.OrchardCoreModules.Alpha.Root);
+        var baseId = rootType.Assembly.GetName().Name;
+
+        const string One = nameof(One);
+        const string Two = nameof(Two);
+        const string three = nameof(three);
+        const string four = nameof(four);
+        const string five = nameof(five);
+        const string six = nameof(six);
+        const string seven = nameof(seven);
+        const string eight = nameof(eight);
+        const string nine = nameof(nine);
+        const string ten = nameof(ten);
+        const string eleven = nameof(eleven);
+        const string twelve = nameof(twelve);
+        const string thirteen = nameof(thirteen);
+        const bool tenant = true;
+        const bool enabled = true;
+
+        const int _3 = 3;
+        const int _4 = 4;
+
+        const string Module = nameof(Module);
+
+        // TODO: TBD: may report what is being tested also for Module, Features, etc...
+
+        // We are looking for one instance of ModuleAttribute in particular in this case
+        var module = GetAssemblyAttribute<ModuleAttribute>(rootType, _ => _.GetType() == typeof(ModuleAttribute));
+        var features = GetAssemblyAttributes<FeatureAttribute>(rootType, _ => _.GetType() == typeof(FeatureAttribute))
+            // We shall assume the test case includes a valid sortable Priority
+            .OrderBy(_ => _.InternalPriority).ToArray();
+
+        // TODO: MWP: note that targets are mining for project properties and are also injecting a ModuleMarkerAttribute...
+        // TODO: MWP: ...which is also a 'Module', which is a possible source of confusion, spoofing, counterfeit, fraud, etc
+        Assert.NotNull(module);
+
+        Assert.Equal(baseId, module.Id);
+        Assert.Equal(baseId, module.Name);
+        Assert.Equal(Module, module.Type);
+
+        Assert.Equal(three, module.Category);
+        Assert.Equal(_4, module.InternalPriority);
+        Assert.Equal($"{_4}", module.Priority);
+
+        Assert.Equal(five, module.Description);
+
+        Assert.Equal(six, module.Author);
+        Assert.Equal("oc://moduleandfeaturesmsbuilditemlists.prop", module.Website);
+
+        // Mind the trailing zeros that is intentional, and the field count, also intentional
+        VerifyVersion(module, rootType.Assembly, new Version(7, 8, 9, 0), 3);
+        //                                                   ^^^^^^^^^^   ^
+
+        Assert.NotNull(module.Dependencies);
+        Assert.Equal(GetValues(nine, ten, eleven), module.Dependencies);
+
+        Assert.NotNull(module.Tags);
+        Assert.Equal(GetValues(ten, eleven, twelve), module.Tags);
+
+        Assert.Equal(tenant, module.DefaultTenantOnly);
+        Assert.Equal(enabled, module.IsAlwaysEnabled);
+
+        Assert.NotNull(module.Features);
+        Assert.Empty(module.Features);
+
+        /* Features should contain the following composites as well, which, by definition,
+         * should contain 'two' in the following shapes:
          */
+        Assert.Contains(features, _ =>
+            _.Id == string.Join(".", baseId, One) &&
+            _.Name == _.Id &&
+            _.Category.Equals(Two, StringComparison.OrdinalIgnoreCase) &&
+            _.InternalPriority == _3 &&
+            _.Description == four &&
+            _.Dependencies.SequenceEqual(GetValues(five, six, seven)) &&
+            _.DefaultTenantOnly == tenant &&
+            _.IsAlwaysEnabled == enabled
+        );
+
+        Assert.Contains(features, _ =>
+            _.Id == string.Join(".", baseId, Two) &&
+            _.Name == _.Id &&
+            _.Category == three &&
+            _.InternalPriority == _4 &&
+            _.Description == five &&
+            _.Dependencies.SequenceEqual(GetValues(six, seven, eight)) &&
+            _.DefaultTenantOnly == tenant &&
+            _.IsAlwaysEnabled == enabled
+        );
     }
+
+    /* TODO: TBD: might be interesting to add tests that allow projects to be built in
+     * process, and to gauge the status codes in response accordingly... The supporting
+     * projects are 'there' already, and all we would need to do is load them in an
+     * appropriate Build context, try to build, and monitor.
+     */
 }
diff --git a/test/OrchardCore.Abstractions.Tests/Modules/Manifest/ThemeAttributeTests.cs b/test/OrchardCore.Abstractions.Tests/Modules/Manifest/ThemeAttributeTests.cs
index 8ef3aeedea3..1bc19836731 100644
--- a/test/OrchardCore.Abstractions.Tests/Modules/Manifest/ThemeAttributeTests.cs
+++ b/test/OrchardCore.Abstractions.Tests/Modules/Manifest/ThemeAttributeTests.cs
@@ -3,592 +3,591 @@
 using System;
 using System.Linq;
 
-namespace OrchardCore.DisplayManagement.Manifest
-{
-    using Modules.Manifest;
-    using Xunit;
-    using Xunit.Abstractions;
+namespace OrchardCore.DisplayManagement.Manifest;
+
+using Modules.Manifest;
+using Xunit;
+using Xunit.Abstractions;
 
-    /// <inheritdoc/>
-    public class ThemeAttributeTests : ModuleAttributeTests<ThemeAttribute>
+/// <inheritdoc/>
+public class ThemeAttributeTests : ModuleAttributeTests<ThemeAttribute>
+{
+    /// <summary>
+    /// Constructor.
+    /// </summary>
+    /// <param name="outputHelper"></param>
+    public ThemeAttributeTests(ITestOutputHelper outputHelper) : base(outputHelper)
     {
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <param name="outputHelper"></param>
-        public ThemeAttributeTests(ITestOutputHelper outputHelper) : base(outputHelper)
+    }
+
+    /// <summary>
+    /// Classifier supporting
+    /// <see cref="ThemeAttribute(string, string, string, string, string, string, string, string, bool, bool, bool)"/>,
+    /// arguments in order,
+    /// <c>id, baseTheme, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    /// <param name="index">The parameter index.</param>
+    /// <param name="_">The argument, unused.</param>
+    /// <returns></returns>
+    private static Type ThemeString8Bool3CtorClassifier(int index, object _) =>
+        index switch
         {
-        }
-
-        /// <summary>
-        /// Classifier supporting
-        /// <see cref="ThemeAttribute(string, string, string, string, string, string, string, string, bool, bool, bool)"/>,
-        /// arguments in order,
-        /// <c>id, baseTheme, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        /// <param name="index">The parameter index.</param>
-        /// <param name="_">The argument, unused.</param>
-        /// <returns></returns>
-        private static Type ThemeString8Bool3CtorClassifier(int index, object _) =>
-            index switch
-            {
-                8 or 9 or 10 => typeof(object),
-                _ => typeof(string),
-            };
-
-        /// <summary>
-        /// &quot;Module&quot;
-        /// </summary>
-        private const string Theme = nameof(Theme);
+            8 or 9 or 10 => typeof(object),
+            _ => typeof(string),
+        };
+
+    /// <summary>
+    /// &quot;Module&quot;
+    /// </summary>
+    private const string Theme = nameof(Theme);
 
 #pragma warning disable xUnit1008 // Fulfulling base class Theory method test data
-        [InlineData(Theme)]
-        public override void Default(string type) => base.Default(type);
+    [InlineData(Theme)]
+    public override void Default(string type) => base.Default(type);
 #pragma warning restore xUnit1008
 
-        /// <summary>
-        /// Classifier supporting
-        /// <see cref="ThemeAttribute(string, string, string, string, string, string, string, string, string, bool, bool, bool)"/>,
-        /// arguments in order,
-        /// <c>id, name, baseTheme, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        /// <param name="index">The parameter index.</param>
-        /// <param name="_">The argument, unused.</param>
-        /// <returns></returns>
-        private static Type ThemeString9Bool3CtorClassifier(int index, object _) =>
-            index switch
-            {
-                9 or 10 or 11 => typeof(object),
-                _ => typeof(string),
-            };
-
-        /// <summary>
-        /// Classifier supporting
-        /// <see cref="ThemeAttribute(string, string, string, string, string, string, string, string, string, string, string, bool, bool, bool)"/>,
-        /// arguments in order,
-        /// <c>id, name, baseTheme, category, priority, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        /// <param name="index">The parameter index.</param>
-        /// <param name="_">The argument, unused.</param>
-        /// <returns></returns>
-        private static Type ThemeString11Bool3CtorClassifier(int index, object _) =>
-            index switch
-            {
-                11 or 12 or 13 => typeof(object),
-                _ => typeof(string),
-            };
-
-        /// <summary>
-        /// Verify the <see cref="ThemeAttribute(string, string, string, string, string, string, string ,string, bool, bool, bool)"/>
-        /// ctor, arguments
-        /// <c>id, baseTheme, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        [Fact]
-        public virtual void Ipsum_Ctor_Id()
-        {
-            var id = LoremWords(1);
-            var baseTheme = LoremWords(1);
-            var description = LoremWords(7);
-            var author = LoremWords(2);
-            var semVer = string.Join('.', GetValues(1, 2, 3, 4).Select(_ => $"{_}"));
-            var deps = LoremWords(5).Split(' ');
-            var website = LoremWebsiteUrl();
-            var tags = LoremWords(5).Split(' ');
-            const bool defaultTenant = default;
-            const bool alwaysEnabled = default;
-            const bool enabledByDependencyOnly = default;
-
-            var depString = string.Join(';', deps);
-            var tagString = string.Join(';', tags);
-
-            ReportKeyValuePairs(
-                new RenderKeyValuePair(nameof(id), id),
-                new RenderKeyValuePair(nameof(baseTheme), baseTheme),
-                new RenderKeyValuePair(nameof(description), description),
-                new RenderKeyValuePair(nameof(author), author),
-                new RenderKeyValuePair(nameof(semVer), semVer),
-                new RenderKeyValuePair(nameof(website), website),
-                new RenderKeyValuePair(nameof(deps), depString),
-                new RenderKeyValuePair(nameof(tags), tagString),
-                new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
-                new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
-                new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
-            );
-
-            var theme = CreateFromArgs(ThemeString8Bool3CtorClassifier, id, baseTheme, description, author, semVer, website, depString, tagString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
-
-            Assert.Equal(id, theme.Id);
-            Assert.Equal(id, theme.Name);
-            Assert.Equal(baseTheme, theme.BaseTheme);
-
-            Assert.Equal(string.Empty, theme.Category);
-            Assert.Null(theme.InternalPriority);
-            Assert.Equal(string.Empty, theme.Priority);
-
-            Assert.Equal(description, theme.Description);
-
-            Assert.NotNull(theme.Dependencies);
-            Assert.Equal(deps, theme.Dependencies);
-
-            Assert.NotNull(theme.Tags);
-            Assert.Equal(tags, theme.Tags);
-
-            Assert.Equal(author, theme.Author);
-            Assert.Equal(semVer, theme.Version);
-            Assert.Equal(website, theme.Website);
-
-            Assert.Equal(defaultTenant, theme.DefaultTenantOnly);
-            Assert.Equal(alwaysEnabled, theme.IsAlwaysEnabled);
-
-            Assert.NotNull(theme.Features);
-            Assert.Empty(theme.Features);
-        }
-
-        /// <summary>
-        /// Verify the <see cref="ThemeAttribute(string, string, string, string, string, string, string, string ,string, bool, bool, bool)"/>
-        /// ctor, arguments
-        /// <c>id, name, baseTheme, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        [Fact]
-        public virtual void Ipsum_Ctor_Id_Name()
-        {
-            var id = LoremWords(1);
-            var name = LoremWords(1);
-            var baseTheme = LoremWords(1);
-            var description = LoremWords(7);
-            var author = LoremWords(2);
-            var semVer = string.Join('.', GetValues(1, 2, 3, 4).Select(_ => $"{_}"));
-            var deps = LoremWords(5).Split(' ');
-            var website = LoremWebsiteUrl();
-            var tags = LoremWords(5).Split(' ');
-            const bool defaultTenant = default;
-            const bool alwaysEnabled = default;
-            const bool enabledByDependencyOnly = default;
-
-            var depString = string.Join(';', deps);
-            var tagString = string.Join(';', tags);
-
-            ReportKeyValuePairs(
-                new RenderKeyValuePair(nameof(id), id),
-                new RenderKeyValuePair(nameof(name), name),
-                new RenderKeyValuePair(nameof(baseTheme), baseTheme),
-                new RenderKeyValuePair(nameof(description), description),
-                new RenderKeyValuePair(nameof(author), author),
-                new RenderKeyValuePair(nameof(semVer), semVer),
-                new RenderKeyValuePair(nameof(website), website),
-                new RenderKeyValuePair(nameof(deps), depString),
-                new RenderKeyValuePair(nameof(tags), tagString),
-                new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
-                new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
-                new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
-            );
-
-            var theme = CreateFromArgs(ThemeString9Bool3CtorClassifier, id, name, baseTheme, description, author, semVer, website, depString, tagString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
-
-            Assert.Equal(id, theme.Id);
-            Assert.Equal(name, theme.Name);
-            Assert.Equal(baseTheme, theme.BaseTheme);
-
-            Assert.Equal(string.Empty, theme.Category);
-            Assert.Null(theme.InternalPriority);
-            Assert.Equal(string.Empty, theme.Priority);
-
-            Assert.Equal(description, theme.Description);
-
-            Assert.NotNull(theme.Dependencies);
-            Assert.Equal(deps, theme.Dependencies);
-
-            Assert.NotNull(theme.Tags);
-            Assert.Equal(tags, theme.Tags);
-
-            Assert.Equal(author, theme.Author);
-            Assert.Equal(semVer, theme.Version);
-            Assert.Equal(website, theme.Website);
-
-            Assert.Equal(defaultTenant, theme.DefaultTenantOnly);
-            Assert.Equal(alwaysEnabled, theme.IsAlwaysEnabled);
-
-            Assert.NotNull(theme.Features);
-            Assert.Empty(theme.Features);
-        }
-
-        /// <summary>
-        /// Verify the <see cref="ThemeAttribute(string, string, string, string, string, string, string, string, string, string ,string, bool, bool, bool)"/>
-        /// ctor, arguments
-        /// <c>id, name, baseTheme, category, priority, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
-        /// </summary>
-        [Fact]
-        public virtual void Ipsum_Ctor_Id_Name_Cat_Pri()
+    /// <summary>
+    /// Classifier supporting
+    /// <see cref="ThemeAttribute(string, string, string, string, string, string, string, string, string, bool, bool, bool)"/>,
+    /// arguments in order,
+    /// <c>id, name, baseTheme, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    /// <param name="index">The parameter index.</param>
+    /// <param name="_">The argument, unused.</param>
+    /// <returns></returns>
+    private static Type ThemeString9Bool3CtorClassifier(int index, object _) =>
+        index switch
         {
-            var id = LoremWords(1);
-            var name = LoremWords(1);
-            var baseTheme = LoremWords(1);
-            var category = LoremWords(1);
-            var priority = DefaultPriority + 1;
-            var description = LoremWords(7);
-            var author = LoremWords(2);
-            var semVer = string.Join('.', GetValues(1, 2, 3, 4).Select(_ => $"{_}"));
-            var deps = LoremWords(5).Split(' ');
-            var website = LoremWebsiteUrl();
-            var tags = LoremWords(5).Split(' ');
-            const bool defaultTenant = default;
-            const bool alwaysEnabled = default;
-            const bool enabledByDependencyOnly = default;
-
-            var depString = string.Join(';', deps);
-            var tagString = string.Join(';', tags);
-            var priString = $"{priority}";
-
-            ReportKeyValuePairs(
-                new RenderKeyValuePair(nameof(id), id),
-                new RenderKeyValuePair(nameof(name), name),
-                new RenderKeyValuePair(nameof(baseTheme), baseTheme),
-                new RenderKeyValuePair(nameof(category), category),
-                new RenderKeyValuePair(nameof(priority), priority),
-                new RenderKeyValuePair(nameof(description), description),
-                new RenderKeyValuePair(nameof(author), author),
-                new RenderKeyValuePair(nameof(semVer), semVer),
-                new RenderKeyValuePair(nameof(website), website),
-                new RenderKeyValuePair(nameof(deps), depString),
-                new RenderKeyValuePair(nameof(tags), tagString),
-                new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
-                new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
-                new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
-            );
-
-            var theme = CreateFromArgs(ThemeString11Bool3CtorClassifier, id, name, baseTheme, category, priString, description, author, semVer, website, depString, tagString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
-
-            Assert.Equal(id, theme.Id);
-            Assert.Equal(name, theme.Name);
-            Assert.Equal(baseTheme, theme.BaseTheme);
-
-            Assert.Equal(category, theme.Category);
-            Assert.Equal(priority, theme.InternalPriority);
-            Assert.Equal(priString, theme.Priority);
-
-            Assert.Equal(description, theme.Description);
-
-            Assert.NotNull(theme.Dependencies);
-            Assert.Equal(deps, theme.Dependencies);
-
-            Assert.NotNull(theme.Tags);
-            Assert.Equal(tags, theme.Tags);
-
-            Assert.Equal(author, theme.Author);
-            Assert.Equal(semVer, theme.Version);
-            Assert.Equal(website, theme.Website);
-
-            Assert.Equal(defaultTenant, theme.DefaultTenantOnly);
-            Assert.Equal(alwaysEnabled, theme.IsAlwaysEnabled);
-
-            Assert.NotNull(theme.Features);
-            Assert.Empty(theme.Features);
-        }
-
-        /// <summary>
-        /// Same as <see cref="Ipsum_Ctor_Id"/> except via <em>MSBuild</em> <c>AssemblyAttribute</c>.
-        /// </summary>
-        [Fact]
-        public virtual void Csproj_AssyAttrib_Id()
+            9 or 10 or 11 => typeof(object),
+            _ => typeof(string),
+        };
+
+    /// <summary>
+    /// Classifier supporting
+    /// <see cref="ThemeAttribute(string, string, string, string, string, string, string, string, string, string, string, bool, bool, bool)"/>,
+    /// arguments in order,
+    /// <c>id, name, baseTheme, category, priority, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    /// <param name="index">The parameter index.</param>
+    /// <param name="_">The argument, unused.</param>
+    /// <returns></returns>
+    private static Type ThemeString11Bool3CtorClassifier(int index, object _) =>
+        index switch
         {
-            var id = "one";
-            var baseTheme = "two";
-            var category = string.Empty;
-            var description = "three";
-            var author = "four";
-            var semVer = "5.6.7";
-            var website = LoremAssyAttribIpsumUrl;
-            var deps = GetArray("seven", "eight", "nine");
-            var tags = GetArray("eight", "nine", "ten");
-            const bool defaultTenant = true;
-            const bool alwaysEnabled = true;
-            const bool enabledByDependencyOnly = default;
-
-            var priString = string.Empty;
-            var depString = string.Join(';', deps);
-            var tagString = string.Join(';', tags);
-
-            // Would inject via Theory but for issues xUnit failing to discover the cases
-            var rootType = typeof(Examples.Themes.AssyAttrib.Charlie.Root);
-
-            ReportKeyValuePairs(
-                new RenderKeyValuePair(nameof(id), id),
-                new RenderKeyValuePair(nameof(baseTheme), baseTheme),
-                new RenderKeyValuePair(nameof(description), description),
-                new RenderKeyValuePair(nameof(author), author),
-                new RenderKeyValuePair(nameof(semVer), semVer),
-                new RenderKeyValuePair(nameof(website), website),
-                new RenderKeyValuePair(nameof(deps), depString),
-                new RenderKeyValuePair(nameof(tags), tagString),
-                new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
-                new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
-                new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
-            );
-
-            // We are looking for one instance of ThemeAttribute in particular in this case
-            var theme = GetAssemblyAttribute<ThemeAttribute>(rootType, _ => _.GetType() == typeof(ThemeAttribute));
-            // We are also not expecting any other strict ModuleAttribute match
-            var module = GetAssemblyAttribute<ModuleAttribute>(rootType, _ => _.GetType() == typeof(ModuleAttribute) && _.GetType() != typeof(ThemeAttribute));
-            // TODO: MWP: note that targets are mining for project properties and are also injecting a ModuleMarkerAttribute...
-            // TODO: MWP: ...which is also a 'Module', which is a possible source of confusion, spoofing, counterfeit, fraud, etc
-            Assert.NotNull(theme);
-            Assert.Null(module);
-
-            Assert.Equal(id, theme.Id);
-            Assert.Equal(id, theme.Name);
-            Assert.Equal(baseTheme, theme.BaseTheme);
-
-            Assert.Equal(category, theme.Category);
-            Assert.Null(theme.InternalPriority);
-            Assert.Equal(priString, theme.Priority);
-
-            Assert.Equal(description, theme.Description);
-
-            Assert.Equal(author, theme.Author);
-            Assert.Equal(semVer, theme.Version);
-            Assert.Equal(website, theme.Website);
-
-            Assert.NotNull(theme.Dependencies);
-            Assert.Equal(deps, theme.Dependencies);
-
-            Assert.NotNull(theme.Tags);
-            Assert.Equal(tags, theme.Tags);
-
-            Assert.Equal(defaultTenant, theme.DefaultTenantOnly);
-            Assert.Equal(alwaysEnabled, theme.IsAlwaysEnabled);
-
-            Assert.NotNull(theme.Features);
-            Assert.Empty(theme.Features);
-        }
-
-        /// <summary>
-        /// Same as <see cref="Ipsum_Ctor_Id_Name"/> except via <em>MSBuild</em> <c>AssemblyAttribute</c>.
-        /// </summary>
-        [Fact]
-        public virtual void Csproj_AssyAttrib_Id_Name()
-        {
-            var id = "one";
-            var name = "two";
-            var baseTheme = "three";
-            var category = string.Empty;
-            var description = "four";
-            var author = "five";
-            var semVer = "6.7.8";
-            var website = LoremAssyAttribIpsumUrl;
-            var deps = GetArray("eight", "nine", "ten");
-            var tags = GetArray("nine", "ten", "eleven");
-            const bool defaultTenant = true;
-            const bool alwaysEnabled = true;
-            const bool enabledByDependencyOnly = default;
-
-            var priString = string.Empty;
-            var depString = string.Join(';', deps);
-            var tagString = string.Join(';', tags);
-
-            // Would inject via Theory but for issues xUnit failing to discover the cases
-            var rootType = typeof(Examples.Themes.AssyAttrib.Bravo.Root);
-
-            ReportKeyValuePairs(
-                new RenderKeyValuePair(nameof(id), id),
-                new RenderKeyValuePair(nameof(name), name),
-                new RenderKeyValuePair(nameof(baseTheme), baseTheme),
-                new RenderKeyValuePair(nameof(description), description),
-                new RenderKeyValuePair(nameof(author), author),
-                new RenderKeyValuePair(nameof(semVer), semVer),
-                new RenderKeyValuePair(nameof(website), website),
-                new RenderKeyValuePair(nameof(deps), depString),
-                new RenderKeyValuePair(nameof(tags), tagString),
-                new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
-                new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
-                new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
-            );
-
-            // We are looking for one instance of ThemeAttribute in particular in this case
-            var theme = GetAssemblyAttribute<ThemeAttribute>(rootType, _ => _.GetType() == typeof(ThemeAttribute));
-            // We are also not expecting any other strict ModuleAttribute match
-            var module = GetAssemblyAttribute<ModuleAttribute>(rootType, _ => _.GetType() == typeof(ModuleAttribute) && _.GetType() != typeof(ThemeAttribute));
-            // TODO: MWP: note that targets are mining for project properties and are also injecting a ModuleMarkerAttribute...
-            // TODO: MWP: ...which is also a 'Module', which is a possible source of confusion, spoofing, counterfeit, fraud, etc
-            Assert.NotNull(theme);
-            Assert.Null(module);
-
-            Assert.Equal(id, theme.Id);
-            Assert.Equal(name, theme.Name);
-            Assert.Equal(baseTheme, theme.BaseTheme);
-
-            Assert.Equal(category, theme.Category);
-            Assert.Null(theme.InternalPriority);
-            Assert.Equal(priString, theme.Priority);
-
-            Assert.Equal(description, theme.Description);
-
-            Assert.Equal(author, theme.Author);
-            Assert.Equal(semVer, theme.Version);
-            Assert.Equal(website, theme.Website);
-
-            Assert.NotNull(theme.Dependencies);
-            Assert.Equal(deps, theme.Dependencies);
-
-            Assert.NotNull(theme.Tags);
-            Assert.Equal(tags, theme.Tags);
-
-            Assert.Equal(defaultTenant, theme.DefaultTenantOnly);
-            Assert.Equal(alwaysEnabled, theme.IsAlwaysEnabled);
-
-            Assert.NotNull(theme.Features);
-            Assert.Empty(theme.Features);
-        }
-
-        /// <summary>
-        /// Same as <see cref="Ipsum_Ctor_Id_Name_Cat_Pri"/> except via <em>MSBuild</em> <c>AssemblyAttribute</c>.
-        /// </summary>
-        [Fact]
-        public virtual void Csproj_AssyAttrib_Id_Name_Cat_Pri()
-        {
-            var id = "one";
-            var name = "two";
-            var baseTheme = "three";
-            var category = "four";
-            const int priority = 5;
-            var description = "six";
-            var author = "seven";
-            var semVer = "8.9.10";
-            var website = LoremAssyAttribIpsumUrl;
-            var deps = GetArray("ten", "eleven", "twelve");
-            var tags = GetArray("eleven", "twelve", "thirteen");
-            const bool defaultTenant = true;
-            const bool alwaysEnabled = true;
-            const bool enabledByDependencyOnly = default;
-
-            var priString = $"{priority}";
-            var depString = string.Join(';', deps);
-            var tagString = string.Join(';', tags);
-
-            // Would inject via Theory but for issues xUnit failing to discover the cases
-            var rootType = typeof(Examples.Themes.AssyAttrib.Alpha.Root);
-
-            ReportKeyValuePairs(
-                new RenderKeyValuePair(nameof(id), id),
-                new RenderKeyValuePair(nameof(name), name),
-                new RenderKeyValuePair(nameof(baseTheme), baseTheme),
-                new RenderKeyValuePair(nameof(category), category),
-                new RenderKeyValuePair(nameof(priority), priority),
-                new RenderKeyValuePair(nameof(description), description),
-                new RenderKeyValuePair(nameof(author), author),
-                new RenderKeyValuePair(nameof(semVer), semVer),
-                new RenderKeyValuePair(nameof(website), website),
-                new RenderKeyValuePair(nameof(deps), depString),
-                new RenderKeyValuePair(nameof(tags), tagString),
-                new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
-                new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
-                new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
-            );
-
-            // We are looking for one instance of ThemeAttribute in particular in this case
-            var theme = GetAssemblyAttribute<ThemeAttribute>(rootType, _ => _.GetType() == typeof(ThemeAttribute));
-            // We are also not expecting any other strict ModuleAttribute match
-            var module = GetAssemblyAttribute<ModuleAttribute>(rootType, _ => _.GetType() == typeof(ModuleAttribute) && _.GetType() != typeof(ThemeAttribute));
-            // TODO: MWP: note that targets are mining for project properties and are also injecting a ModuleMarkerAttribute...
-            // TODO: MWP: ...which is also a 'Module', which is a possible source of confusion, spoofing, counterfeit, fraud, etc
-            Assert.NotNull(theme);
-            Assert.Null(module);
-
-            Assert.Equal(id, theme.Id);
-            Assert.Equal(name, theme.Name);
-            Assert.Equal(baseTheme, theme.BaseTheme);
-
-            Assert.Equal(category, theme.Category);
-            Assert.Equal(priority, theme.InternalPriority);
-            Assert.Equal(priString, theme.Priority);
-
-            Assert.Equal(description, theme.Description);
-
-            Assert.Equal(author, theme.Author);
-            Assert.Equal(semVer, theme.Version);
-            Assert.Equal(website, theme.Website);
-
-            Assert.NotNull(theme.Dependencies);
-            Assert.Equal(deps, theme.Dependencies);
-
-            Assert.NotNull(theme.Tags);
-            Assert.Equal(tags, theme.Tags);
-
-            Assert.Equal(defaultTenant, theme.DefaultTenantOnly);
-            Assert.Equal(alwaysEnabled, theme.IsAlwaysEnabled);
-
-            Assert.NotNull(theme.Features);
-            Assert.Empty(theme.Features);
-        }
-
-        /// <summary>
-        /// Same as <see cref="Ipsum_Ctor_Id_Name_Cat_Pri"/> except via <em>MSBuild</em>
-        /// <c>OrchardCoreThemes</c> list items. Not going to be concerned with any
-        /// <c>OrchardCoreFeatures</c> at this level, this has been handled by the similarly
-        /// named <em>Modules</em> tests.
-        /// </summary>
-        [Fact]
-        public virtual void Csproj_OrchardCoreThemes_MSBuild_ItemLists()
-        {
-            // Would inject via Theory but for issues xUnit failing to discover the cases
-            var rootType = typeof(Examples.OrchardCoreThemes.Alpha.Root);
-            var baseId = rootType.Assembly.GetName().Name;
+            11 or 12 or 13 => typeof(object),
+            _ => typeof(string),
+        };
+
+    /// <summary>
+    /// Verify the <see cref="ThemeAttribute(string, string, string, string, string, string, string ,string, bool, bool, bool)"/>
+    /// ctor, arguments
+    /// <c>id, baseTheme, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    [Fact]
+    public virtual void Ipsum_Ctor_Id()
+    {
+        var id = LoremWords(1);
+        var baseTheme = LoremWords(1);
+        var description = LoremWords(7);
+        var author = LoremWords(2);
+        var semVer = string.Join('.', GetValues(1, 2, 3, 4).Select(_ => $"{_}"));
+        var deps = LoremWords(5).Split(' ');
+        var website = LoremWebsiteUrl();
+        var tags = LoremWords(5).Split(' ');
+        const bool defaultTenant = default;
+        const bool alwaysEnabled = default;
+        const bool enabledByDependencyOnly = default;
+
+        var depString = string.Join(';', deps);
+        var tagString = string.Join(';', tags);
+
+        ReportKeyValuePairs(
+            new RenderKeyValuePair(nameof(id), id),
+            new RenderKeyValuePair(nameof(baseTheme), baseTheme),
+            new RenderKeyValuePair(nameof(description), description),
+            new RenderKeyValuePair(nameof(author), author),
+            new RenderKeyValuePair(nameof(semVer), semVer),
+            new RenderKeyValuePair(nameof(website), website),
+            new RenderKeyValuePair(nameof(deps), depString),
+            new RenderKeyValuePair(nameof(tags), tagString),
+            new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
+            new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
+            new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
+        );
+
+        var theme = CreateFromArgs(ThemeString8Bool3CtorClassifier, id, baseTheme, description, author, semVer, website, depString, tagString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
+
+        Assert.Equal(id, theme.Id);
+        Assert.Equal(id, theme.Name);
+        Assert.Equal(baseTheme, theme.BaseTheme);
+
+        Assert.Equal(string.Empty, theme.Category);
+        Assert.Null(theme.InternalPriority);
+        Assert.Equal(string.Empty, theme.Priority);
+
+        Assert.Equal(description, theme.Description);
+
+        Assert.NotNull(theme.Dependencies);
+        Assert.Equal(deps, theme.Dependencies);
+
+        Assert.NotNull(theme.Tags);
+        Assert.Equal(tags, theme.Tags);
+
+        Assert.Equal(author, theme.Author);
+        Assert.Equal(semVer, theme.Version);
+        Assert.Equal(website, theme.Website);
+
+        Assert.Equal(defaultTenant, theme.DefaultTenantOnly);
+        Assert.Equal(alwaysEnabled, theme.IsAlwaysEnabled);
+
+        Assert.NotNull(theme.Features);
+        Assert.Empty(theme.Features);
+    }
+
+    /// <summary>
+    /// Verify the <see cref="ThemeAttribute(string, string, string, string, string, string, string, string ,string, bool, bool, bool)"/>
+    /// ctor, arguments
+    /// <c>id, name, baseTheme, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    [Fact]
+    public virtual void Ipsum_Ctor_Id_Name()
+    {
+        var id = LoremWords(1);
+        var name = LoremWords(1);
+        var baseTheme = LoremWords(1);
+        var description = LoremWords(7);
+        var author = LoremWords(2);
+        var semVer = string.Join('.', GetValues(1, 2, 3, 4).Select(_ => $"{_}"));
+        var deps = LoremWords(5).Split(' ');
+        var website = LoremWebsiteUrl();
+        var tags = LoremWords(5).Split(' ');
+        const bool defaultTenant = default;
+        const bool alwaysEnabled = default;
+        const bool enabledByDependencyOnly = default;
+
+        var depString = string.Join(';', deps);
+        var tagString = string.Join(';', tags);
+
+        ReportKeyValuePairs(
+            new RenderKeyValuePair(nameof(id), id),
+            new RenderKeyValuePair(nameof(name), name),
+            new RenderKeyValuePair(nameof(baseTheme), baseTheme),
+            new RenderKeyValuePair(nameof(description), description),
+            new RenderKeyValuePair(nameof(author), author),
+            new RenderKeyValuePair(nameof(semVer), semVer),
+            new RenderKeyValuePair(nameof(website), website),
+            new RenderKeyValuePair(nameof(deps), depString),
+            new RenderKeyValuePair(nameof(tags), tagString),
+            new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
+            new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
+            new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
+        );
+
+        var theme = CreateFromArgs(ThemeString9Bool3CtorClassifier, id, name, baseTheme, description, author, semVer, website, depString, tagString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
+
+        Assert.Equal(id, theme.Id);
+        Assert.Equal(name, theme.Name);
+        Assert.Equal(baseTheme, theme.BaseTheme);
+
+        Assert.Equal(string.Empty, theme.Category);
+        Assert.Null(theme.InternalPriority);
+        Assert.Equal(string.Empty, theme.Priority);
+
+        Assert.Equal(description, theme.Description);
+
+        Assert.NotNull(theme.Dependencies);
+        Assert.Equal(deps, theme.Dependencies);
+
+        Assert.NotNull(theme.Tags);
+        Assert.Equal(tags, theme.Tags);
+
+        Assert.Equal(author, theme.Author);
+        Assert.Equal(semVer, theme.Version);
+        Assert.Equal(website, theme.Website);
+
+        Assert.Equal(defaultTenant, theme.DefaultTenantOnly);
+        Assert.Equal(alwaysEnabled, theme.IsAlwaysEnabled);
+
+        Assert.NotNull(theme.Features);
+        Assert.Empty(theme.Features);
+    }
 
-            const string three = nameof(three);
-            const string four = nameof(four);
-            const string six = nameof(six);
-            const string seven = nameof(seven);
-            const string ten = nameof(ten);
-            const string eleven = nameof(eleven);
-            const string twelve = nameof(twelve);
-            const string thirteen = nameof(thirteen);
-            const bool tenant = true;
-            const bool enabled = true;
+    /// <summary>
+    /// Verify the <see cref="ThemeAttribute(string, string, string, string, string, string, string, string, string, string ,string, bool, bool, bool)"/>
+    /// ctor, arguments
+    /// <c>id, name, baseTheme, category, priority, description, author, semVer, featureDependencies, websiteUrl, tags, defaultTenant, alwaysEnabled, enabledByDependencyOnly</c>.
+    /// </summary>
+    [Fact]
+    public virtual void Ipsum_Ctor_Id_Name_Cat_Pri()
+    {
+        var id = LoremWords(1);
+        var name = LoremWords(1);
+        var baseTheme = LoremWords(1);
+        var category = LoremWords(1);
+        var priority = DefaultPriority + 1;
+        var description = LoremWords(7);
+        var author = LoremWords(2);
+        var semVer = string.Join('.', GetValues(1, 2, 3, 4).Select(_ => $"{_}"));
+        var deps = LoremWords(5).Split(' ');
+        var website = LoremWebsiteUrl();
+        var tags = LoremWords(5).Split(' ');
+        const bool defaultTenant = default;
+        const bool alwaysEnabled = default;
+        const bool enabledByDependencyOnly = default;
+
+        var depString = string.Join(';', deps);
+        var tagString = string.Join(';', tags);
+        var priString = $"{priority}";
+
+        ReportKeyValuePairs(
+            new RenderKeyValuePair(nameof(id), id),
+            new RenderKeyValuePair(nameof(name), name),
+            new RenderKeyValuePair(nameof(baseTheme), baseTheme),
+            new RenderKeyValuePair(nameof(category), category),
+            new RenderKeyValuePair(nameof(priority), priority),
+            new RenderKeyValuePair(nameof(description), description),
+            new RenderKeyValuePair(nameof(author), author),
+            new RenderKeyValuePair(nameof(semVer), semVer),
+            new RenderKeyValuePair(nameof(website), website),
+            new RenderKeyValuePair(nameof(deps), depString),
+            new RenderKeyValuePair(nameof(tags), tagString),
+            new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
+            new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
+            new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
+        );
+
+        var theme = CreateFromArgs(ThemeString11Bool3CtorClassifier, id, name, baseTheme, category, priString, description, author, semVer, website, depString, tagString, defaultTenant, alwaysEnabled, enabledByDependencyOnly);
+
+        Assert.Equal(id, theme.Id);
+        Assert.Equal(name, theme.Name);
+        Assert.Equal(baseTheme, theme.BaseTheme);
+
+        Assert.Equal(category, theme.Category);
+        Assert.Equal(priority, theme.InternalPriority);
+        Assert.Equal(priString, theme.Priority);
+
+        Assert.Equal(description, theme.Description);
+
+        Assert.NotNull(theme.Dependencies);
+        Assert.Equal(deps, theme.Dependencies);
+
+        Assert.NotNull(theme.Tags);
+        Assert.Equal(tags, theme.Tags);
+
+        Assert.Equal(author, theme.Author);
+        Assert.Equal(semVer, theme.Version);
+        Assert.Equal(website, theme.Website);
+
+        Assert.Equal(defaultTenant, theme.DefaultTenantOnly);
+        Assert.Equal(alwaysEnabled, theme.IsAlwaysEnabled);
+
+        Assert.NotNull(theme.Features);
+        Assert.Empty(theme.Features);
+    }
 
-            const int _5 = 5;
+    /// <summary>
+    /// Same as <see cref="Ipsum_Ctor_Id"/> except via <em>MSBuild</em> <c>AssemblyAttribute</c>.
+    /// </summary>
+    [Fact]
+    public virtual void Csproj_AssyAttrib_Id()
+    {
+        var id = "one";
+        var baseTheme = "two";
+        var category = string.Empty;
+        var description = "three";
+        var author = "four";
+        var semVer = "5.6.7";
+        var website = LoremAssyAttribIpsumUrl;
+        var deps = GetArray("seven", "eight", "nine");
+        var tags = GetArray("eight", "nine", "ten");
+        const bool defaultTenant = true;
+        const bool alwaysEnabled = true;
+        const bool enabledByDependencyOnly = default;
+
+        var priString = string.Empty;
+        var depString = string.Join(';', deps);
+        var tagString = string.Join(';', tags);
+
+        // Would inject via Theory but for issues xUnit failing to discover the cases
+        var rootType = typeof(Examples.Themes.AssyAttrib.Charlie.Root);
+
+        ReportKeyValuePairs(
+            new RenderKeyValuePair(nameof(id), id),
+            new RenderKeyValuePair(nameof(baseTheme), baseTheme),
+            new RenderKeyValuePair(nameof(description), description),
+            new RenderKeyValuePair(nameof(author), author),
+            new RenderKeyValuePair(nameof(semVer), semVer),
+            new RenderKeyValuePair(nameof(website), website),
+            new RenderKeyValuePair(nameof(deps), depString),
+            new RenderKeyValuePair(nameof(tags), tagString),
+            new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
+            new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
+            new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
+        );
+
+        // We are looking for one instance of ThemeAttribute in particular in this case
+        var theme = GetAssemblyAttribute<ThemeAttribute>(rootType, _ => _.GetType() == typeof(ThemeAttribute));
+        // We are also not expecting any other strict ModuleAttribute match
+        var module = GetAssemblyAttribute<ModuleAttribute>(rootType, _ => _.GetType() == typeof(ModuleAttribute) && _.GetType() != typeof(ThemeAttribute));
+        // TODO: MWP: note that targets are mining for project properties and are also injecting a ModuleMarkerAttribute...
+        // TODO: MWP: ...which is also a 'Module', which is a possible source of confusion, spoofing, counterfeit, fraud, etc
+        Assert.NotNull(theme);
+        Assert.Null(module);
+
+        Assert.Equal(id, theme.Id);
+        Assert.Equal(id, theme.Name);
+        Assert.Equal(baseTheme, theme.BaseTheme);
+
+        Assert.Equal(category, theme.Category);
+        Assert.Null(theme.InternalPriority);
+        Assert.Equal(priString, theme.Priority);
+
+        Assert.Equal(description, theme.Description);
+
+        Assert.Equal(author, theme.Author);
+        Assert.Equal(semVer, theme.Version);
+        Assert.Equal(website, theme.Website);
+
+        Assert.NotNull(theme.Dependencies);
+        Assert.Equal(deps, theme.Dependencies);
+
+        Assert.NotNull(theme.Tags);
+        Assert.Equal(tags, theme.Tags);
+
+        Assert.Equal(defaultTenant, theme.DefaultTenantOnly);
+        Assert.Equal(alwaysEnabled, theme.IsAlwaysEnabled);
+
+        Assert.NotNull(theme.Features);
+        Assert.Empty(theme.Features);
+    }
 
-            const string Theme = nameof(Theme);
+    /// <summary>
+    /// Same as <see cref="Ipsum_Ctor_Id_Name"/> except via <em>MSBuild</em> <c>AssemblyAttribute</c>.
+    /// </summary>
+    [Fact]
+    public virtual void Csproj_AssyAttrib_Id_Name()
+    {
+        var id = "one";
+        var name = "two";
+        var baseTheme = "three";
+        var category = string.Empty;
+        var description = "four";
+        var author = "five";
+        var semVer = "6.7.8";
+        var website = LoremAssyAttribIpsumUrl;
+        var deps = GetArray("eight", "nine", "ten");
+        var tags = GetArray("nine", "ten", "eleven");
+        const bool defaultTenant = true;
+        const bool alwaysEnabled = true;
+        const bool enabledByDependencyOnly = default;
+
+        var priString = string.Empty;
+        var depString = string.Join(';', deps);
+        var tagString = string.Join(';', tags);
+
+        // Would inject via Theory but for issues xUnit failing to discover the cases
+        var rootType = typeof(Examples.Themes.AssyAttrib.Bravo.Root);
+
+        ReportKeyValuePairs(
+            new RenderKeyValuePair(nameof(id), id),
+            new RenderKeyValuePair(nameof(name), name),
+            new RenderKeyValuePair(nameof(baseTheme), baseTheme),
+            new RenderKeyValuePair(nameof(description), description),
+            new RenderKeyValuePair(nameof(author), author),
+            new RenderKeyValuePair(nameof(semVer), semVer),
+            new RenderKeyValuePair(nameof(website), website),
+            new RenderKeyValuePair(nameof(deps), depString),
+            new RenderKeyValuePair(nameof(tags), tagString),
+            new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
+            new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
+            new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
+        );
+
+        // We are looking for one instance of ThemeAttribute in particular in this case
+        var theme = GetAssemblyAttribute<ThemeAttribute>(rootType, _ => _.GetType() == typeof(ThemeAttribute));
+        // We are also not expecting any other strict ModuleAttribute match
+        var module = GetAssemblyAttribute<ModuleAttribute>(rootType, _ => _.GetType() == typeof(ModuleAttribute) && _.GetType() != typeof(ThemeAttribute));
+        // TODO: MWP: note that targets are mining for project properties and are also injecting a ModuleMarkerAttribute...
+        // TODO: MWP: ...which is also a 'Module', which is a possible source of confusion, spoofing, counterfeit, fraud, etc
+        Assert.NotNull(theme);
+        Assert.Null(module);
+
+        Assert.Equal(id, theme.Id);
+        Assert.Equal(name, theme.Name);
+        Assert.Equal(baseTheme, theme.BaseTheme);
+
+        Assert.Equal(category, theme.Category);
+        Assert.Null(theme.InternalPriority);
+        Assert.Equal(priString, theme.Priority);
+
+        Assert.Equal(description, theme.Description);
+
+        Assert.Equal(author, theme.Author);
+        Assert.Equal(semVer, theme.Version);
+        Assert.Equal(website, theme.Website);
+
+        Assert.NotNull(theme.Dependencies);
+        Assert.Equal(deps, theme.Dependencies);
+
+        Assert.NotNull(theme.Tags);
+        Assert.Equal(tags, theme.Tags);
+
+        Assert.Equal(defaultTenant, theme.DefaultTenantOnly);
+        Assert.Equal(alwaysEnabled, theme.IsAlwaysEnabled);
+
+        Assert.NotNull(theme.Features);
+        Assert.Empty(theme.Features);
+    }
 
-            // TODO: TBD: may report what is being tested also for Module, Features, etc...
+    /// <summary>
+    /// Same as <see cref="Ipsum_Ctor_Id_Name_Cat_Pri"/> except via <em>MSBuild</em> <c>AssemblyAttribute</c>.
+    /// </summary>
+    [Fact]
+    public virtual void Csproj_AssyAttrib_Id_Name_Cat_Pri()
+    {
+        var id = "one";
+        var name = "two";
+        var baseTheme = "three";
+        var category = "four";
+        const int priority = 5;
+        var description = "six";
+        var author = "seven";
+        var semVer = "8.9.10";
+        var website = LoremAssyAttribIpsumUrl;
+        var deps = GetArray("ten", "eleven", "twelve");
+        var tags = GetArray("eleven", "twelve", "thirteen");
+        const bool defaultTenant = true;
+        const bool alwaysEnabled = true;
+        const bool enabledByDependencyOnly = default;
+
+        var priString = $"{priority}";
+        var depString = string.Join(';', deps);
+        var tagString = string.Join(';', tags);
+
+        // Would inject via Theory but for issues xUnit failing to discover the cases
+        var rootType = typeof(Examples.Themes.AssyAttrib.Alpha.Root);
+
+        ReportKeyValuePairs(
+            new RenderKeyValuePair(nameof(id), id),
+            new RenderKeyValuePair(nameof(name), name),
+            new RenderKeyValuePair(nameof(baseTheme), baseTheme),
+            new RenderKeyValuePair(nameof(category), category),
+            new RenderKeyValuePair(nameof(priority), priority),
+            new RenderKeyValuePair(nameof(description), description),
+            new RenderKeyValuePair(nameof(author), author),
+            new RenderKeyValuePair(nameof(semVer), semVer),
+            new RenderKeyValuePair(nameof(website), website),
+            new RenderKeyValuePair(nameof(deps), depString),
+            new RenderKeyValuePair(nameof(tags), tagString),
+            new RenderKeyValuePair(nameof(defaultTenant), defaultTenant),
+            new RenderKeyValuePair(nameof(alwaysEnabled), alwaysEnabled),
+            new RenderKeyValuePair(nameof(enabledByDependencyOnly), enabledByDependencyOnly)
+        );
+
+        // We are looking for one instance of ThemeAttribute in particular in this case
+        var theme = GetAssemblyAttribute<ThemeAttribute>(rootType, _ => _.GetType() == typeof(ThemeAttribute));
+        // We are also not expecting any other strict ModuleAttribute match
+        var module = GetAssemblyAttribute<ModuleAttribute>(rootType, _ => _.GetType() == typeof(ModuleAttribute) && _.GetType() != typeof(ThemeAttribute));
+        // TODO: MWP: note that targets are mining for project properties and are also injecting a ModuleMarkerAttribute...
+        // TODO: MWP: ...which is also a 'Module', which is a possible source of confusion, spoofing, counterfeit, fraud, etc
+        Assert.NotNull(theme);
+        Assert.Null(module);
+
+        Assert.Equal(id, theme.Id);
+        Assert.Equal(name, theme.Name);
+        Assert.Equal(baseTheme, theme.BaseTheme);
+
+        Assert.Equal(category, theme.Category);
+        Assert.Equal(priority, theme.InternalPriority);
+        Assert.Equal(priString, theme.Priority);
+
+        Assert.Equal(description, theme.Description);
+
+        Assert.Equal(author, theme.Author);
+        Assert.Equal(semVer, theme.Version);
+        Assert.Equal(website, theme.Website);
+
+        Assert.NotNull(theme.Dependencies);
+        Assert.Equal(deps, theme.Dependencies);
+
+        Assert.NotNull(theme.Tags);
+        Assert.Equal(tags, theme.Tags);
+
+        Assert.Equal(defaultTenant, theme.DefaultTenantOnly);
+        Assert.Equal(alwaysEnabled, theme.IsAlwaysEnabled);
+
+        Assert.NotNull(theme.Features);
+        Assert.Empty(theme.Features);
+    }
+
+    /// <summary>
+    /// Same as <see cref="Ipsum_Ctor_Id_Name_Cat_Pri"/> except via <em>MSBuild</em>
+    /// <c>OrchardCoreThemes</c> list items. Not going to be concerned with any
+    /// <c>OrchardCoreFeatures</c> at this level, this has been handled by the similarly
+    /// named <em>Modules</em> tests.
+    /// </summary>
+    [Fact]
+    public virtual void Csproj_OrchardCoreThemes_MSBuild_ItemLists()
+    {
+        // Would inject via Theory but for issues xUnit failing to discover the cases
+        var rootType = typeof(Examples.OrchardCoreThemes.Alpha.Root);
+        var baseId = rootType.Assembly.GetName().Name;
+
+        const string three = nameof(three);
+        const string four = nameof(four);
+        const string six = nameof(six);
+        const string seven = nameof(seven);
+        const string ten = nameof(ten);
+        const string eleven = nameof(eleven);
+        const string twelve = nameof(twelve);
+        const string thirteen = nameof(thirteen);
+        const bool tenant = true;
+        const bool enabled = true;
 
-            // We are looking for one instance of ModuleAttribute in particular in this case
-            var theme = GetAssemblyAttribute<ThemeAttribute>(rootType, _ => _.GetType() == typeof(ThemeAttribute));
+        const int _5 = 5;
 
-            // TODO: MWP: note that targets are mining for project properties and are also injecting a ModuleMarkerAttribute...
-            // TODO: MWP: ...which is also a 'Module', which is a possible source of confusion, spoofing, counterfeit, fraud, etc
-            Assert.NotNull(theme);
+        const string Theme = nameof(Theme);
 
-            Assert.Equal(baseId, theme.Id);
-            Assert.Equal(baseId, theme.Name);
-            Assert.Equal(Theme, theme.Type);
+        // TODO: TBD: may report what is being tested also for Module, Features, etc...
 
-            Assert.Equal(three, theme.BaseTheme);
+        // We are looking for one instance of ModuleAttribute in particular in this case
+        var theme = GetAssemblyAttribute<ThemeAttribute>(rootType, _ => _.GetType() == typeof(ThemeAttribute));
 
-            Assert.Equal(four, theme.Category);
-            Assert.Equal(_5, theme.InternalPriority);
-            Assert.Equal($"{_5}", theme.Priority);
+        // TODO: MWP: note that targets are mining for project properties and are also injecting a ModuleMarkerAttribute...
+        // TODO: MWP: ...which is also a 'Module', which is a possible source of confusion, spoofing, counterfeit, fraud, etc
+        Assert.NotNull(theme);
 
-            Assert.Equal(six, theme.Description);
+        Assert.Equal(baseId, theme.Id);
+        Assert.Equal(baseId, theme.Name);
+        Assert.Equal(Theme, theme.Type);
 
-            Assert.Equal(seven, theme.Author);
-            Assert.Equal("oc://msbuildthemeitemlists.prop", theme.Website);
+        Assert.Equal(three, theme.BaseTheme);
 
-            // Mind the trailing zeros that is intentional, and the field count, also intentional
-            VerifyVersion(theme, rootType.Assembly, new Version(8, 9, 10, 0), 3);
-            //                                                  ^^^^^^^^^^^   ^
+        Assert.Equal(four, theme.Category);
+        Assert.Equal(_5, theme.InternalPriority);
+        Assert.Equal($"{_5}", theme.Priority);
 
-            Assert.NotNull(theme.Dependencies);
-            Assert.Equal(GetValues(ten, eleven, twelve), theme.Dependencies);
+        Assert.Equal(six, theme.Description);
 
-            Assert.NotNull(theme.Tags);
-            Assert.Equal(GetValues(eleven, twelve, thirteen), theme.Tags);
+        Assert.Equal(seven, theme.Author);
+        Assert.Equal("oc://msbuildthemeitemlists.prop", theme.Website);
 
-            Assert.Equal(tenant, theme.DefaultTenantOnly);
-            Assert.Equal(enabled, theme.IsAlwaysEnabled);
+        // Mind the trailing zeros that is intentional, and the field count, also intentional
+        VerifyVersion(theme, rootType.Assembly, new Version(8, 9, 10, 0), 3);
+        //                                                  ^^^^^^^^^^^   ^
 
-            Assert.NotNull(theme.Features);
-            Assert.Empty(theme.Features);
-        }
+        Assert.NotNull(theme.Dependencies);
+        Assert.Equal(GetValues(ten, eleven, twelve), theme.Dependencies);
 
-        // TODO: TBD: ditto ModuleAttributeTests re: in process Build scaffold
+        Assert.NotNull(theme.Tags);
+        Assert.Equal(GetValues(eleven, twelve, thirteen), theme.Tags);
+
+        Assert.Equal(tenant, theme.DefaultTenantOnly);
+        Assert.Equal(enabled, theme.IsAlwaysEnabled);
+
+        Assert.NotNull(theme.Features);
+        Assert.Empty(theme.Features);
     }
+
+    // TODO: TBD: ditto ModuleAttributeTests re: in process Build scaffold
 }
diff --git a/test/OrchardCore.Abstractions.Tests/Modules/StringExtensionsTests.cs b/test/OrchardCore.Abstractions.Tests/Modules/StringExtensionsTests.cs
index 0e2e76b3185..b40bb0980bd 100644
--- a/test/OrchardCore.Abstractions.Tests/Modules/StringExtensionsTests.cs
+++ b/test/OrchardCore.Abstractions.Tests/Modules/StringExtensionsTests.cs
@@ -1,43 +1,42 @@
 using System;
 using Xunit;
 
-namespace OrchardCore.Modules
+namespace OrchardCore.Modules;
+
+public class StringExtensionsTests
 {
-    public class StringExtensionsTests
+    [Theory]
+    [InlineData("414243", new byte[] { 0x41, 0x42, 0x43 })]
+    [InlineData("48656C6C6F20576F726C64", new byte[] { 0x48, 0x65, 0x6C, 0x6C, 0x6F, 0x20, 0x57, 0x6F, 0x72, 0x6C, 0x64 })]
+    [InlineData("", new byte[0])]
+    public void ToByteArray_ShouldConvertToByteArray(string hex, byte[] expected)
+    {
+        // Arrange
+
+        // Act
+        var result = hex.ToByteArray();
+
+        // Assert
+        Assert.Equal(expected, result);
+    }
+
+    [Fact]
+    public void ToByteArray_ShouldThrowException_WhenHexContainsOddNumberOfCharacters()
     {
-        [Theory]
-        [InlineData("414243", new byte[] { 0x41, 0x42, 0x43 })]
-        [InlineData("48656C6C6F20576F726C64", new byte[] { 0x48, 0x65, 0x6C, 0x6C, 0x6F, 0x20, 0x57, 0x6F, 0x72, 0x6C, 0x64 })]
-        [InlineData("", new byte[0])]
-        public void ToByteArray_ShouldConvertToByteArray(string hex, byte[] expected)
-        {
-            // Arrange
-
-            // Act
-            var result = hex.ToByteArray();
-
-            // Assert
-            Assert.Equal(expected, result);
-        }
-
-        [Fact]
-        public void ToByteArray_ShouldThrowException_WhenHexContainsOddNumberOfCharacters()
-        {
-            // Arrange
-            var hex = "41424";
-
-            // Act & Assert
-            Assert.Throws<ArgumentOutOfRangeException>(() => hex.ToByteArray());
-        }
-
-        [Fact]
-        public void ToByteArray_ShouldThrowException_WhenHexIsNotValid()
-        {
-            // Arrange
-            var hex = "GHIJK";
-
-            // Act & Assert
-            Assert.Throws<FormatException>(() => hex.ToByteArray());
-        }
+        // Arrange
+        var hex = "41424";
+
+        // Act & Assert
+        Assert.Throws<ArgumentOutOfRangeException>(() => hex.ToByteArray());
+    }
+
+    [Fact]
+    public void ToByteArray_ShouldThrowException_WhenHexIsNotValid()
+    {
+        // Arrange
+        var hex = "GHIJK";
+
+        // Act & Assert
+        Assert.Throws<FormatException>(() => hex.ToByteArray());
     }
 }
diff --git a/test/OrchardCore.Benchmarks/FluidShapeRenderBenchmark.cs b/test/OrchardCore.Benchmarks/FluidShapeRenderBenchmark.cs
index 330c30e9ef5..d63f5803e26 100644
--- a/test/OrchardCore.Benchmarks/FluidShapeRenderBenchmark.cs
+++ b/test/OrchardCore.Benchmarks/FluidShapeRenderBenchmark.cs
@@ -12,133 +12,132 @@
 using OrchardCore.DisplayManagement.Liquid.Filters;
 using OrchardCore.Liquid;
 
-namespace OrchardCore.Benchmark
+namespace OrchardCore.Benchmark;
+
+[MemoryDiagnoser]
+public class FluidShapeRenderBenchmark
 {
-    [MemoryDiagnoser]
-    public class FluidShapeRenderBenchmark
-    {
-        private static readonly FilterArguments _filterArguments = new FilterArguments().Add("utc", new DateTimeValue(DateTime.UtcNow)).Add("format", StringValue.Create("MMMM dd, yyyy"));
-        private static readonly FluidValue _input = ObjectValue.Create(HtmlString.Empty, new TemplateOptions());
-        private static readonly LiquidFilterDelegateResolver<ShapeRenderFilter> _liquidFilterDelegateResolver;
-        private static readonly IServiceProvider _serviceProvider;
+    private static readonly FilterArguments _filterArguments = new FilterArguments().Add("utc", new DateTimeValue(DateTime.UtcNow)).Add("format", StringValue.Create("MMMM dd, yyyy"));
+    private static readonly FluidValue _input = ObjectValue.Create(HtmlString.Empty, new TemplateOptions());
+    private static readonly LiquidFilterDelegateResolver<ShapeRenderFilter> _liquidFilterDelegateResolver;
+    private static readonly IServiceProvider _serviceProvider;
 
-        static FluidShapeRenderBenchmark()
-        {
-            var htmlDisplay = new DefaultHtmlDisplay(null, null, null, null, null, null);
+    static FluidShapeRenderBenchmark()
+    {
+        var htmlDisplay = new DefaultHtmlDisplay(null, null, null, null, null, null);
 
-            _serviceProvider = new ServiceCollection()
-                .AddScoped<IDisplayHelper>(sp => new DisplayHelper(htmlDisplay, null, null))
-                .AddTransient<ShapeRenderFilter>()
-                .BuildServiceProvider();
+        _serviceProvider = new ServiceCollection()
+            .AddScoped<IDisplayHelper>(sp => new DisplayHelper(htmlDisplay, null, null))
+            .AddTransient<ShapeRenderFilter>()
+            .BuildServiceProvider();
 
-            _liquidFilterDelegateResolver = new LiquidFilterDelegateResolver<ShapeRenderFilter>();
-        }
+        _liquidFilterDelegateResolver = new LiquidFilterDelegateResolver<ShapeRenderFilter>();
+    }
 
-        [Benchmark(Baseline = true)]
+    [Benchmark(Baseline = true)]
 #pragma warning disable CA1822 // Mark members as static
-        public async Task OriginalShapeRenderDynamic()
-        {
-            var templateContext = new LiquidTemplateContext(_serviceProvider, new TemplateOptions());
-            var displayHelper = _serviceProvider.GetRequiredService<IDisplayHelper>();
-            templateContext.AmbientValues["DisplayHelper"] = displayHelper;
-            await OriginalShapeRenderDynamic(_input, _filterArguments, templateContext);
-        }
+    public async Task OriginalShapeRenderDynamic()
+    {
+        var templateContext = new LiquidTemplateContext(_serviceProvider, new TemplateOptions());
+        var displayHelper = _serviceProvider.GetRequiredService<IDisplayHelper>();
+        templateContext.AmbientValues["DisplayHelper"] = displayHelper;
+        await OriginalShapeRenderDynamic(_input, _filterArguments, templateContext);
+    }
 
-        [Benchmark]
-        public async Task ShapeRenderWithAmbientValues()
-        {
-            var templateContext = new LiquidTemplateContext(_serviceProvider, new TemplateOptions());
-            var displayHelper = _serviceProvider.GetRequiredService<IDisplayHelper>();
-            templateContext.AmbientValues["DisplayHelper"] = displayHelper;
-            await ShapeRenderWithAmbientValues(_input, _filterArguments, templateContext);
-        }
+    [Benchmark]
+    public async Task ShapeRenderWithAmbientValues()
+    {
+        var templateContext = new LiquidTemplateContext(_serviceProvider, new TemplateOptions());
+        var displayHelper = _serviceProvider.GetRequiredService<IDisplayHelper>();
+        templateContext.AmbientValues["DisplayHelper"] = displayHelper;
+        await ShapeRenderWithAmbientValues(_input, _filterArguments, templateContext);
+    }
 
-        [Benchmark]
-        public async Task ShapeRenderStatic()
-        {
-            var templateContext = new LiquidTemplateContext(_serviceProvider, new TemplateOptions());
-            await ShapeRenderStatic(_input, _filterArguments, templateContext);
-        }
+    [Benchmark]
+    public async Task ShapeRenderStatic()
+    {
+        var templateContext = new LiquidTemplateContext(_serviceProvider, new TemplateOptions());
+        await ShapeRenderStatic(_input, _filterArguments, templateContext);
+    }
 
-        [Benchmark]
-        public async Task ShapeRenderWithResolver()
+    [Benchmark]
+    public async Task ShapeRenderWithResolver()
 #pragma warning restore CA1822 // Mark members as static
+    {
+        var templateContext = new LiquidTemplateContext(_serviceProvider, new TemplateOptions());
+        await _liquidFilterDelegateResolver.ResolveAsync(_input, _filterArguments, templateContext);
+    }
+
+    private static async ValueTask<FluidValue> OriginalShapeRenderDynamic(FluidValue input, FilterArguments _, TemplateContext context)
+    {
+        if (!context.AmbientValues.TryGetValue("DisplayHelper", out dynamic displayHelper))
         {
-            var templateContext = new LiquidTemplateContext(_serviceProvider, new TemplateOptions());
-            await _liquidFilterDelegateResolver.ResolveAsync(_input, _filterArguments, templateContext);
+            throw new ArgumentException("DisplayHelper missing while invoking 'shape_render'");
         }
 
-        private static async ValueTask<FluidValue> OriginalShapeRenderDynamic(FluidValue input, FilterArguments _, TemplateContext context)
+        // This is marginally different than the exact original as we currently pass any non null object to the display helper.
+        // And the original benchmark was if (input.ToObjectValue() is IShape shape) where input was never IShape.
+        // The original benchmark noop'd here and didn't hit the dynamic display helper.
+        if (input != null)
         {
-            if (!context.AmbientValues.TryGetValue("DisplayHelper", out dynamic displayHelper))
-            {
-                throw new ArgumentException("DisplayHelper missing while invoking 'shape_render'");
-            }
+            return new HtmlContentValue(await (Task<IHtmlContent>)displayHelper(input));
+        }
 
-            // This is marginally different than the exact original as we currently pass any non null object to the display helper.
-            // And the original benchmark was if (input.ToObjectValue() is IShape shape) where input was never IShape.
-            // The original benchmark noop'd here and didn't hit the dynamic display helper.
-            if (input != null)
-            {
-                return new HtmlContentValue(await (Task<IHtmlContent>)displayHelper(input));
-            }
+        return NilValue.Instance;
+    }
 
-            return NilValue.Instance;
+    private static ValueTask<FluidValue> ShapeRenderWithAmbientValues(FluidValue input, FilterArguments _, TemplateContext context)
+    {
+        static async ValueTask<FluidValue> Awaited(Task<IHtmlContent> task)
+        {
+            return new HtmlContentValue(await task);
         }
 
-        private static ValueTask<FluidValue> ShapeRenderWithAmbientValues(FluidValue input, FilterArguments _, TemplateContext context)
+        if (input.ToObjectValue() is IShape shape)
         {
-            static async ValueTask<FluidValue> Awaited(Task<IHtmlContent> task)
+            if (!context.AmbientValues.TryGetValue("DisplayHelper", out var item) || item is not IDisplayHelper displayHelper)
             {
-                return new HtmlContentValue(await task);
+                return ThrowArgumentException<ValueTask<FluidValue>>("DisplayHelper missing while invoking 'shape_render'");
             }
 
-            if (input.ToObjectValue() is IShape shape)
+            var task = displayHelper.ShapeExecuteAsync(shape);
+            if (!task.IsCompletedSuccessfully)
             {
-                if (!context.AmbientValues.TryGetValue("DisplayHelper", out var item) || item is not IDisplayHelper displayHelper)
-                {
-                    return ThrowArgumentException<ValueTask<FluidValue>>("DisplayHelper missing while invoking 'shape_render'");
-                }
-
-                var task = displayHelper.ShapeExecuteAsync(shape);
-                if (!task.IsCompletedSuccessfully)
-                {
-                    return Awaited(task);
-                }
-                return new ValueTask<FluidValue>(new HtmlContentValue(task.Result));
+                return Awaited(task);
             }
-
-            return new ValueTask<FluidValue>(NilValue.Instance);
+            return new ValueTask<FluidValue>(new HtmlContentValue(task.Result));
         }
 
-        private static ValueTask<FluidValue> ShapeRenderStatic(FluidValue input, FilterArguments _, TemplateContext context)
+        return new ValueTask<FluidValue>(NilValue.Instance);
+    }
+
+    private static ValueTask<FluidValue> ShapeRenderStatic(FluidValue input, FilterArguments _, TemplateContext context)
+    {
+        static async ValueTask<FluidValue> Awaited(Task<IHtmlContent> task)
         {
-            static async ValueTask<FluidValue> Awaited(Task<IHtmlContent> task)
-            {
-                return new HtmlContentValue(await task);
-            }
+            return new HtmlContentValue(await task);
+        }
 
-            if (input.ToObjectValue() is IShape shape)
-            {
-                var services = ((LiquidTemplateContext)context).Services;
+        if (input.ToObjectValue() is IShape shape)
+        {
+            var services = ((LiquidTemplateContext)context).Services;
 
-                var displayHelper = services.GetRequiredService<IDisplayHelper>();
+            var displayHelper = services.GetRequiredService<IDisplayHelper>();
 
-                var task = displayHelper.ShapeExecuteAsync(shape);
-                if (!task.IsCompletedSuccessfully)
-                {
-                    return Awaited(task);
-                }
-                return new ValueTask<FluidValue>(new HtmlContentValue(task.Result));
+            var task = displayHelper.ShapeExecuteAsync(shape);
+            if (!task.IsCompletedSuccessfully)
+            {
+                return Awaited(task);
             }
-
-            return new ValueTask<FluidValue>(NilValue.Instance);
+            return new ValueTask<FluidValue>(new HtmlContentValue(task.Result));
         }
 
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static T ThrowArgumentException<T>(string message)
-        {
-            throw new ArgumentException(message);
-        }
+        return new ValueTask<FluidValue>(NilValue.Instance);
+    }
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private static T ThrowArgumentException<T>(string message)
+    {
+        throw new ArgumentException(message);
     }
 }
diff --git a/test/OrchardCore.Benchmarks/MediaTokenServiceBenchmark.cs b/test/OrchardCore.Benchmarks/MediaTokenServiceBenchmark.cs
index 4676971ef6b..37c0568878d 100644
--- a/test/OrchardCore.Benchmarks/MediaTokenServiceBenchmark.cs
+++ b/test/OrchardCore.Benchmarks/MediaTokenServiceBenchmark.cs
@@ -9,102 +9,101 @@
 using SixLabors.ImageSharp.Web.Middleware;
 using SixLabors.ImageSharp.Web.Processors;
 
-namespace OrchardCore.Benchmark
+namespace OrchardCore.Benchmark;
+
+[MemoryDiagnoser]
+public class MediaTokenServiceBenchmark
 {
-    [MemoryDiagnoser]
-    public class MediaTokenServiceBenchmark
+    private static readonly MediaTokenService _mediaTokenService;
+    private static readonly MediaTokenService _mediaTokenServiceWithoutCache;
+
+    static MediaTokenServiceBenchmark()
     {
-        private static readonly MediaTokenService _mediaTokenService;
-        private static readonly MediaTokenService _mediaTokenServiceWithoutCache;
+        IMemoryCache memoryCache = new MemoryCache(Options.Create(new MemoryCacheOptions()));
+        IMemoryCache nullCache = new NullCache();
+
+        using var rng = RandomNumberGenerator.Create();
+        var hashKey = new byte[64];
+        rng.GetBytes(hashKey);
 
-        static MediaTokenServiceBenchmark()
+        // mimic default configuration
+        var options = Options.Create(new MediaTokenOptions { HashKey = hashKey });
+        var processors = new IImageWebProcessor[]
         {
-            IMemoryCache memoryCache = new MemoryCache(Options.Create(new MemoryCacheOptions()));
-            IMemoryCache nullCache = new NullCache();
-
-            using var rng = RandomNumberGenerator.Create();
-            var hashKey = new byte[64];
-            rng.GetBytes(hashKey);
-
-            // mimic default configuration
-            var options = Options.Create(new MediaTokenOptions { HashKey = hashKey });
-            var processors = new IImageWebProcessor[]
-            {
-                new ResizeWebProcessor(),
-                new FormatWebProcessor(Options.Create(new ImageSharpMiddlewareOptions())),
-                new BackgroundColorWebProcessor(),
-                new QualityWebProcessor(),
-                new ImageVersionProcessor(),
-                new TokenCommandProcessor()
-            };
-
-            _mediaTokenService = new MediaTokenService(memoryCache, options, processors);
-            _mediaTokenServiceWithoutCache = new MediaTokenService(nullCache, options, processors);
-        }
+            new ResizeWebProcessor(),
+            new FormatWebProcessor(Options.Create(new ImageSharpMiddlewareOptions())),
+            new BackgroundColorWebProcessor(),
+            new QualityWebProcessor(),
+            new ImageVersionProcessor(),
+            new TokenCommandProcessor()
+        };
+
+        _mediaTokenService = new MediaTokenService(memoryCache, options, processors);
+        _mediaTokenServiceWithoutCache = new MediaTokenService(nullCache, options, processors);
+    }
 
-        [Benchmark]
+    [Benchmark]
 #pragma warning disable CA1822 // Mark members as static
-        public string AddTokenToPath()
-        {
-            return _mediaTokenService.AddTokenToPath("/media/portfolio/1.jpg?width=600&height=480&rmode=stretch");
-        }
+    public string AddTokenToPath()
+    {
+        return _mediaTokenService.AddTokenToPath("/media/portfolio/1.jpg?width=600&height=480&rmode=stretch");
+    }
 
-        [Benchmark]
-        public string AddTokenToPath_NoCache()
-        {
-            return _mediaTokenServiceWithoutCache.AddTokenToPath("/media/portfolio/1.jpg?width=600&height=480&rmode=stretch");
-        }
+    [Benchmark]
+    public string AddTokenToPath_NoCache()
+    {
+        return _mediaTokenServiceWithoutCache.AddTokenToPath("/media/portfolio/1.jpg?width=600&height=480&rmode=stretch");
+    }
 
-        [Benchmark]
-        public string AddTokenToPath_LongPath()
-        {
-            return _mediaTokenService.AddTokenToPath("/media/portfolio/1.jpg?width=LOOOOOOOOOOOOOOONG&height=LOOOOOOOOOOOOOOONG&rmode=LOOOOOOOOOOOOOOONG&rxy=LOOOOOOOOOOOOOOONG&rsampler=LOOOOOOOOOOOOOOONG&ranchor=LOOOOOOOOOOOOOOONG&compand=LOOOOOOOOOOOOOOONG&token=LOOOOOOOOOOOOOOONG&quality=LOOOOOOOOOOOOOOONG");
-        }
+    [Benchmark]
+    public string AddTokenToPath_LongPath()
+    {
+        return _mediaTokenService.AddTokenToPath("/media/portfolio/1.jpg?width=LOOOOOOOOOOOOOOONG&height=LOOOOOOOOOOOOOOONG&rmode=LOOOOOOOOOOOOOOONG&rxy=LOOOOOOOOOOOOOOONG&rsampler=LOOOOOOOOOOOOOOONG&ranchor=LOOOOOOOOOOOOOOONG&compand=LOOOOOOOOOOOOOOONG&token=LOOOOOOOOOOOOOOONG&quality=LOOOOOOOOOOOOOOONG");
+    }
 
-        [Benchmark]
-        public string AddTokenToPath_LongPath_NoCache()
-        {
-            return _mediaTokenServiceWithoutCache.AddTokenToPath("/media/portfolio/1.jpg?width=LOOOOOOOOOOOOOOONG&height=LOOOOOOOOOOOOOOONG&rmode=LOOOOOOOOOOOOOOONG&rxy=LOOOOOOOOOOOOOOONG&rsampler=LOOOOOOOOOOOOOOONG&ranchor=LOOOOOOOOOOOOOOONG&compand=LOOOOOOOOOOOOOOONG&token=LOOOOOOOOOOOOOOONG&quality=LOOOOOOOOOOOOOOONG");
-        }
+    [Benchmark]
+    public string AddTokenToPath_LongPath_NoCache()
+    {
+        return _mediaTokenServiceWithoutCache.AddTokenToPath("/media/portfolio/1.jpg?width=LOOOOOOOOOOOOOOONG&height=LOOOOOOOOOOOOOOONG&rmode=LOOOOOOOOOOOOOOONG&rxy=LOOOOOOOOOOOOOOONG&rsampler=LOOOOOOOOOOOOOOONG&ranchor=LOOOOOOOOOOOOOOONG&compand=LOOOOOOOOOOOOOOONG&token=LOOOOOOOOOOOOOOONG&quality=LOOOOOOOOOOOOOOONG");
+    }
 #pragma warning restore CA1822 // Mark members as static
+}
+
+public sealed class NullCache : IMemoryCache
+{
+    public ICacheEntry CreateEntry(object key)
+    {
+        return new NullCacheEntry();
     }
 
-    public sealed class NullCache : IMemoryCache
+    public void Remove(object key)
     {
-        public ICacheEntry CreateEntry(object key)
-        {
-            return new NullCacheEntry();
-        }
+    }
 
-        public void Remove(object key)
-        {
-        }
+    public bool TryGetValue(object key, out object value)
+    {
+        value = default;
+        return false;
+    }
 
-        public bool TryGetValue(object key, out object value)
-        {
-            value = default;
-            return false;
-        }
+    public void Dispose()
+    {
+    }
 
-        public void Dispose()
-        {
-        }
+    private sealed class NullCacheEntry : ICacheEntry
+    {
+        public DateTimeOffset? AbsoluteExpiration { get; set; }
+        public TimeSpan? AbsoluteExpirationRelativeToNow { get; set; }
+        public IList<IChangeToken> ExpirationTokens { get; set; }
+        public object Key { get; set; }
+        public IList<PostEvictionCallbackRegistration> PostEvictionCallbacks { get; set; }
+        public CacheItemPriority Priority { get; set; }
+        public long? Size { get; set; }
+        public TimeSpan? SlidingExpiration { get; set; }
+        public object Value { get; set; }
 
-        private sealed class NullCacheEntry : ICacheEntry
+        public void Dispose()
         {
-            public DateTimeOffset? AbsoluteExpiration { get; set; }
-            public TimeSpan? AbsoluteExpirationRelativeToNow { get; set; }
-            public IList<IChangeToken> ExpirationTokens { get; set; }
-            public object Key { get; set; }
-            public IList<PostEvictionCallbackRegistration> PostEvictionCallbacks { get; set; }
-            public CacheItemPriority Priority { get; set; }
-            public long? Size { get; set; }
-            public TimeSpan? SlidingExpiration { get; set; }
-            public object Value { get; set; }
-
-            public void Dispose()
-            {
-            }
         }
     }
 }
diff --git a/test/OrchardCore.Benchmarks/Program.cs b/test/OrchardCore.Benchmarks/Program.cs
index cc2dce8b84b..f05e40724e4 100644
--- a/test/OrchardCore.Benchmarks/Program.cs
+++ b/test/OrchardCore.Benchmarks/Program.cs
@@ -1,12 +1,11 @@
 using BenchmarkDotNet.Running;
 
-namespace OrchardCore.Benchmark
+namespace OrchardCore.Benchmark;
+
+public static class Program
 {
-    public static class Program
+    public static void Main(string[] args)
     {
-        public static void Main(string[] args)
-        {
-            BenchmarkSwitcher.FromAssembly(typeof(ShapeFactoryBenchmark).Assembly).Run(args);
-        }
+        BenchmarkSwitcher.FromAssembly(typeof(ShapeFactoryBenchmark).Assembly).Run(args);
     }
 }
diff --git a/test/OrchardCore.Benchmarks/ResourceManagerBenchmark.cs b/test/OrchardCore.Benchmarks/ResourceManagerBenchmark.cs
index 889878f420d..6a626a6b0ef 100644
--- a/test/OrchardCore.Benchmarks/ResourceManagerBenchmark.cs
+++ b/test/OrchardCore.Benchmarks/ResourceManagerBenchmark.cs
@@ -6,54 +6,53 @@
 using OrchardCore.Mvc;
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Benchmark
+namespace OrchardCore.Benchmark;
+
+[MemoryDiagnoser]
+public class ResourceManagerBenchmark
 {
-    [MemoryDiagnoser]
-    public class ResourceManagerBenchmark
-    {
-        private static readonly ShellFileVersionProvider _fileVersionProvider = new(
-            [],
-            new FakeWebHostEnvironment(),
-            new MemoryCache(Options.Create(new MemoryCacheOptions())));
+    private static readonly ShellFileVersionProvider _fileVersionProvider = new(
+        [],
+        new FakeWebHostEnvironment(),
+        new MemoryCache(Options.Create(new MemoryCacheOptions())));
 
-        private static readonly OptionsWrapper<ResourceManagementOptions> _options;
+    private static readonly OptionsWrapper<ResourceManagementOptions> _options;
 
-        static ResourceManagerBenchmark()
-        {
-            var options = new ResourceManagementOptions();
+    static ResourceManagerBenchmark()
+    {
+        var options = new ResourceManagementOptions();
 
-            var manifest1 = new ResourceManifest();
-            manifest1.DefineStyle("some1").SetDependencies("dependency1").SetUrl("file://some1.txt").SetVersion("1.0.0");
-            options.ResourceManifests.Add(manifest1);
+        var manifest1 = new ResourceManifest();
+        manifest1.DefineStyle("some1").SetDependencies("dependency1").SetUrl("file://some1.txt").SetVersion("1.0.0");
+        options.ResourceManifests.Add(manifest1);
 
-            var manifest2 = new ResourceManifest();
-            manifest2.DefineStyle("some2").SetDependencies("dependency2").SetUrl("file://some2.txt").SetVersion("1.0.0");
-            options.ResourceManifests.Add(manifest2);
+        var manifest2 = new ResourceManifest();
+        manifest2.DefineStyle("some2").SetDependencies("dependency2").SetUrl("file://some2.txt").SetVersion("1.0.0");
+        options.ResourceManifests.Add(manifest2);
 
-            var dependency1 = new ResourceManifest();
-            dependency1.DefineStyle("dependency1").SetUrl("file://dependency1.txt").SetVersion("1.0.0");
-            options.ResourceManifests.Add(dependency1);
+        var dependency1 = new ResourceManifest();
+        dependency1.DefineStyle("dependency1").SetUrl("file://dependency1.txt").SetVersion("1.0.0");
+        options.ResourceManifests.Add(dependency1);
 
-            var dependency2 = new ResourceManifest();
-            dependency2.DefineStyle("dependency2").SetUrl("file://dependency2.txt").SetVersion("1.0.0");
-            options.ResourceManifests.Add(dependency2);
+        var dependency2 = new ResourceManifest();
+        dependency2.DefineStyle("dependency2").SetUrl("file://dependency2.txt").SetVersion("1.0.0");
+        options.ResourceManifests.Add(dependency2);
 
-            _options = new OptionsWrapper<ResourceManagementOptions>(options);
-        }
+        _options = new OptionsWrapper<ResourceManagementOptions>(options);
+    }
 
-        [Benchmark]
+    [Benchmark]
 #pragma warning disable CA1822 // Mark members as static
-        public void RenderStylesheet()
+    public void RenderStylesheet()
 #pragma warning restore CA1822 // Mark members as static
-        {
-            var manager = new ResourceManager(
-                options: _options,
-                fileVersionProvider: _fileVersionProvider);
-
-            manager.RegisterResource("stylesheet", "some1").UseVersion("1.0.0").ShouldAppendVersion(true);
-            manager.RegisterResource("stylesheet", "some2").UseVersion("1.0.0").ShouldAppendVersion(true);
-            using var sw = new StringWriter();
-            manager.RenderStylesheet(sw);
-        }
+    {
+        var manager = new ResourceManager(
+            options: _options,
+            fileVersionProvider: _fileVersionProvider);
+
+        manager.RegisterResource("stylesheet", "some1").UseVersion("1.0.0").ShouldAppendVersion(true);
+        manager.RegisterResource("stylesheet", "some2").UseVersion("1.0.0").ShouldAppendVersion(true);
+        using var sw = new StringWriter();
+        manager.RenderStylesheet(sw);
     }
 }
diff --git a/test/OrchardCore.Benchmarks/RuleBenchmark.cs b/test/OrchardCore.Benchmarks/RuleBenchmark.cs
index da716353937..ed565a73223 100644
--- a/test/OrchardCore.Benchmarks/RuleBenchmark.cs
+++ b/test/OrchardCore.Benchmarks/RuleBenchmark.cs
@@ -13,58 +13,57 @@
 using OrchardCore.Scripting.JavaScript;
 using OrchardCore.Tests.Modules.OrchardCore.Rules;
 
-namespace OrchardCore.Benchmark
+namespace OrchardCore.Benchmark;
+
+[MemoryDiagnoser]
+public class RuleBenchmark
 {
-    [MemoryDiagnoser]
-    public class RuleBenchmark
-    {
-        private static readonly IScriptingEngine _engine;
-        private static readonly IScriptingScope _scope;
-        private static readonly IRuleService _ruleService;
-        private static readonly Rule _rule;
+    private static readonly IScriptingEngine _engine;
+    private static readonly IScriptingScope _scope;
+    private static readonly IRuleService _ruleService;
+    private static readonly Rule _rule;
 
-        static RuleBenchmark()
-        {
-            var services = RuleTests.CreateRuleServiceCollection()
-                .AddRuleCondition<HomepageCondition, HomepageConditionEvaluator>()
-                .AddSingleton<IGlobalMethodProvider, DefaultLayersMethodProvider>()
-                .AddMemoryCache()
-                .AddScripting()
-                .AddJavaScriptEngine();
+    static RuleBenchmark()
+    {
+        var services = RuleTests.CreateRuleServiceCollection()
+            .AddRuleCondition<HomepageCondition, HomepageConditionEvaluator>()
+            .AddSingleton<IGlobalMethodProvider, DefaultLayersMethodProvider>()
+            .AddMemoryCache()
+            .AddScripting()
+            .AddJavaScriptEngine();
 
-            var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
-            var context = new DefaultHttpContext();
-            context.Request.Path = new PathString("/");
-            mockHttpContextAccessor.Setup(_ => _.HttpContext).Returns(context);
+        var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
+        var context = new DefaultHttpContext();
+        context.Request.Path = new PathString("/");
+        mockHttpContextAccessor.Setup(_ => _.HttpContext).Returns(context);
 
-            services.AddSingleton<IHttpContextAccessor>(mockHttpContextAccessor.Object);
+        services.AddSingleton<IHttpContextAccessor>(mockHttpContextAccessor.Object);
 
-            var serviceProvider = services.BuildServiceProvider();
+        var serviceProvider = services.BuildServiceProvider();
 
-            var scriptingManager = serviceProvider.GetRequiredService<IScriptingManager>();
+        var scriptingManager = serviceProvider.GetRequiredService<IScriptingManager>();
 
-            _engine = scriptingManager.GetScriptingEngine("js");
-            _scope = _engine.CreateScope(scriptingManager.GlobalMethodProviders.SelectMany(x => x.GetMethods()), serviceProvider, null, null);
+        _engine = scriptingManager.GetScriptingEngine("js");
+        _scope = _engine.CreateScope(scriptingManager.GlobalMethodProviders.SelectMany(x => x.GetMethods()), serviceProvider, null, null);
 
-            _ruleService = serviceProvider.GetRequiredService<IRuleService>();
-            _rule = new Rule
-            {
-                Conditions =
-                [
-                    new HomepageCondition
-                    {
-                        Value = true
-                    }
-                ]
-            };
-        }
+        _ruleService = serviceProvider.GetRequiredService<IRuleService>();
+        _rule = new Rule
+        {
+            Conditions =
+            [
+                new HomepageCondition
+                {
+                    Value = true
+                }
+            ]
+        };
+    }
 
-        [Benchmark(Baseline = true)]
+    [Benchmark(Baseline = true)]
 #pragma warning disable CA1822 // Mark members as static
-        public void EvaluateIsHomepageWithJavascript() => _engine.Evaluate(_scope, "isHomepage()");
+    public void EvaluateIsHomepageWithJavascript() => _engine.Evaluate(_scope, "isHomepage()");
 
-        [Benchmark]
-        public async Task EvaluateIsHomepageWithRule() => await _ruleService.EvaluateAsync(_rule);
+    [Benchmark]
+    public async Task EvaluateIsHomepageWithRule() => await _ruleService.EvaluateAsync(_rule);
 #pragma warning restore CA1822 // Mark members as static
-    }
 }
diff --git a/test/OrchardCore.Benchmarks/ShapeFactoryBenchmark.cs b/test/OrchardCore.Benchmarks/ShapeFactoryBenchmark.cs
index 0a6c8f7d7aa..619a4837ca8 100644
--- a/test/OrchardCore.Benchmarks/ShapeFactoryBenchmark.cs
+++ b/test/OrchardCore.Benchmarks/ShapeFactoryBenchmark.cs
@@ -15,62 +15,61 @@
 using OrchardCore.Modules.Manifest;
 using OrchardCore.Tests.Stubs;
 
-namespace OrchardCore.Benchmark
+namespace OrchardCore.Benchmark;
+
+[MemoryDiagnoser]
+public class ShapeFactoryBenchmark
 {
-    [MemoryDiagnoser]
-    public class ShapeFactoryBenchmark
-    {
-        private static readonly FilterArguments _filterArguments = new FilterArguments().Add("utc", new DateTimeValue(DateTime.UtcNow)).Add("format", StringValue.Create("MMMM dd, yyyy"));
-        private static readonly FluidValue _input = StringValue.Create("DateTime");
-        private static readonly TemplateContext _templateContext;
+    private static readonly FilterArguments _filterArguments = new FilterArguments().Add("utc", new DateTimeValue(DateTime.UtcNow)).Add("format", StringValue.Create("MMMM dd, yyyy"));
+    private static readonly FluidValue _input = StringValue.Create("DateTime");
+    private static readonly TemplateContext _templateContext;
 
-        static ShapeFactoryBenchmark()
-        {
-            _templateContext = new TemplateContext();
-            var defaultShapeTable = new ShapeTable
-            (
-                new Dictionary<string, ShapeDescriptor>(),
-                new Dictionary<string, ShapeBinding>()
-            );
+    static ShapeFactoryBenchmark()
+    {
+        _templateContext = new TemplateContext();
+        var defaultShapeTable = new ShapeTable
+        (
+            new Dictionary<string, ShapeDescriptor>(),
+            new Dictionary<string, ShapeBinding>()
+        );
 
-            var shapeFactory = new DefaultShapeFactory(
-                serviceProvider: new ServiceCollection().BuildServiceProvider(),
-                events: [],
-                shapeTableManager: new TestShapeTableManager(defaultShapeTable),
-                themeManager: new MockThemeManager(new ExtensionInfo("path", new ManifestInfo(new ModuleAttribute()), (x, y) => [])));
+        var shapeFactory = new DefaultShapeFactory(
+            serviceProvider: new ServiceCollection().BuildServiceProvider(),
+            events: [],
+            shapeTableManager: new TestShapeTableManager(defaultShapeTable),
+            themeManager: new MockThemeManager(new ExtensionInfo("path", new ManifestInfo(new ModuleAttribute()), (x, y) => [])));
 
-            _templateContext.AmbientValues["DisplayHelper"] = new DisplayHelper(null, shapeFactory, null);
-        }
+        _templateContext.AmbientValues["DisplayHelper"] = new DisplayHelper(null, shapeFactory, null);
+    }
 
-        // TODO this benchmark is meaningless as the benchmark noops as the input is not a shape.
-        [Benchmark(Baseline = true)]
+    // TODO this benchmark is meaningless as the benchmark noops as the input is not a shape.
+    [Benchmark(Baseline = true)]
 #pragma warning disable CA1822 // Mark members as static
-        public async Task OriginalShapeRender()
+    public async Task OriginalShapeRender()
 #pragma warning restore CA1822 // Mark members as static
-        {
-            await ShapeRenderOriginal(_input, _filterArguments, _templateContext);
-        }
+    {
+        await ShapeRenderOriginal(_input, _filterArguments, _templateContext);
+    }
 
 
-        // [Benchmark]
-        // public async Task NewShapeRender()
-        // {
-        //     await LiquidViewFilters.ShapeRender(input, _filterArguments, _templateContext);
-        // }
+    // [Benchmark]
+    // public async Task NewShapeRender()
+    // {
+    //     await LiquidViewFilters.ShapeRender(input, _filterArguments, _templateContext);
+    // }
 
-        private static async ValueTask<FluidValue> ShapeRenderOriginal(FluidValue input, FilterArguments _, TemplateContext context)
+    private static async ValueTask<FluidValue> ShapeRenderOriginal(FluidValue input, FilterArguments _, TemplateContext context)
+    {
+        if (!context.AmbientValues.TryGetValue("DisplayHelper", out dynamic displayHelper))
         {
-            if (!context.AmbientValues.TryGetValue("DisplayHelper", out dynamic displayHelper))
-            {
-                throw new ArgumentException("DisplayHelper missing while invoking 'shape_render'");
-            }
-
-            if (input.ToObjectValue() is IShape shape)
-            {
-                return new HtmlContentValue(await (Task<IHtmlContent>)displayHelper(shape));
-            }
+            throw new ArgumentException("DisplayHelper missing while invoking 'shape_render'");
+        }
 
-            return NilValue.Instance;
+        if (input.ToObjectValue() is IShape shape)
+        {
+            return new HtmlContentValue(await (Task<IHtmlContent>)displayHelper(shape));
         }
+
+        return NilValue.Instance;
     }
 }
diff --git a/test/OrchardCore.Benchmarks/ShapeProxyBenchmark.cs b/test/OrchardCore.Benchmarks/ShapeProxyBenchmark.cs
index 1e9c96b49f1..ed4e538080d 100644
--- a/test/OrchardCore.Benchmarks/ShapeProxyBenchmark.cs
+++ b/test/OrchardCore.Benchmarks/ShapeProxyBenchmark.cs
@@ -8,66 +8,65 @@
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Navigation;
 
-namespace OrchardCore.Benchmark
+namespace OrchardCore.Benchmark;
+
+/*
+| Method                       | Mean       | Error      | StdDev    | Gen0   | Allocated |
+|----------------------------- |-----------:|-----------:|----------:|-------:|----------:|
+| CreateInstance               |   9.774 ns |  17.795 ns | 0.9754 ns | 0.0093 |      88 B |
+| CreateDynamicProxy           | 722.913 ns | 121.855 ns | 6.6793 ns | 0.2222 |    2096 B |
+| CreateCachedProxy            | 233.722 ns |  65.978 ns | 3.6165 ns | 0.0756 |     712 B |
+*/
+
+[MemoryDiagnoser]
+[ShortRunJob]
+[SuppressMessage(
+    "Performance",
+    "CA1822:Mark members as static",
+    Justification = "BenchmarkDotNet needs all benchmark methods to be instance-level.")]
+public class ShapeProxyBenchmark
 {
-    /*
-    | Method                       | Mean       | Error      | StdDev    | Gen0   | Allocated |
-    |----------------------------- |-----------:|-----------:|----------:|-------:|----------:|
-    | CreateInstance               |   9.774 ns |  17.795 ns | 0.9754 ns | 0.0093 |      88 B |
-    | CreateDynamicProxy           | 722.913 ns | 121.855 ns | 6.6793 ns | 0.2222 |    2096 B |
-    | CreateCachedProxy            | 233.722 ns |  65.978 ns | 3.6165 ns | 0.0756 |     712 B |
-    */
+    private static ConcurrentDictionary<Type, Type> _proxyTypesCache = [];
+    private static readonly ProxyGenerator _proxyGenerator = new();
+    private static readonly Type _proxyType;
 
-    [MemoryDiagnoser]
-    [ShortRunJob]
-    [SuppressMessage(
-        "Performance",
-        "CA1822:Mark members as static",
-        Justification = "BenchmarkDotNet needs all benchmark methods to be instance-level.")]
-    public class ShapeProxyBenchmark
+    static ShapeProxyBenchmark()
     {
-        private static ConcurrentDictionary<Type, Type> _proxyTypesCache = [];
-        private static readonly ProxyGenerator _proxyGenerator = new();
-        private static readonly Type _proxyType;
+        var options = new ProxyGenerationOptions();
+        options.AddMixinInstance(new ShapeViewModel());
+        _proxyType = _proxyGenerator.CreateClassProxy<MenuItem>(options).GetType();
+    }
 
-        static ShapeProxyBenchmark()
-        {
-            var options = new ProxyGenerationOptions();
-            options.AddMixinInstance(new ShapeViewModel());
-            _proxyType = _proxyGenerator.CreateClassProxy<MenuItem>(options).GetType();
-        }
+    [Benchmark]
+    public object CreateInstance()
+    {
+        var shape = Activator.CreateInstance<ContentItemViewModel>();
+        return shape;
+    }
 
-        [Benchmark]
-        public object CreateInstance()
-        {
-            var shape = Activator.CreateInstance<ContentItemViewModel>();
-            return shape;
-        }
+    [Benchmark]
+    public object CreateDynamicProxy()
+    {
+        var options = new ProxyGenerationOptions();
+        options.AddMixinInstance(new ShapeViewModel());
+        return (IShape)_proxyGenerator.CreateClassProxy<MenuItem>(options);
+    }
 
-        [Benchmark]
-        public object CreateDynamicProxy()
+    [Benchmark]
+    public object CreateCachedProxy()
+    {
+        if (_proxyTypesCache.TryGetValue(typeof(MenuItem), out var proxyType))
         {
-            var options = new ProxyGenerationOptions();
-            options.AddMixinInstance(new ShapeViewModel());
-            return (IShape)_proxyGenerator.CreateClassProxy<MenuItem>(options);
+            var model = new ShapeViewModel();
+            return (IShape)Activator.CreateInstance(_proxyType, model, model, Array.Empty<IInterceptor>());
         }
 
-        [Benchmark]
-        public object CreateCachedProxy()
-        {
-            if (_proxyTypesCache.TryGetValue(typeof(MenuItem), out var proxyType))
-            {
-                var model = new ShapeViewModel();
-                return (IShape)Activator.CreateInstance(_proxyType, model, model, Array.Empty<IInterceptor>());
-            }
-
-            var options = new ProxyGenerationOptions();
-            options.AddMixinInstance(new ShapeViewModel());
-            var shape = (IShape)_proxyGenerator.CreateClassProxy<MenuItem>(options);
+        var options = new ProxyGenerationOptions();
+        options.AddMixinInstance(new ShapeViewModel());
+        var shape = (IShape)_proxyGenerator.CreateClassProxy<MenuItem>(options);
 
-            _proxyTypesCache.TryAdd(typeof(MenuItem), shape.GetType());
+        _proxyTypesCache.TryAdd(typeof(MenuItem), shape.GetType());
 
-            return shape;
-        }
+        return shape;
     }
 }
diff --git a/test/OrchardCore.Benchmarks/SlugBenchmark.cs b/test/OrchardCore.Benchmarks/SlugBenchmark.cs
index 45436553f14..c4ea2542934 100644
--- a/test/OrchardCore.Benchmarks/SlugBenchmark.cs
+++ b/test/OrchardCore.Benchmarks/SlugBenchmark.cs
@@ -1,30 +1,29 @@
 using BenchmarkDotNet.Attributes;
 using OrchardCore.Modules.Services;
 
-namespace OrchardCore.Benchmark
+namespace OrchardCore.Benchmark;
+
+[MemoryDiagnoser]
+public class SlugBenchmark
 {
-    [MemoryDiagnoser]
-    public class SlugBenchmark
-    {
-        private static readonly SlugService _slugService;
+    private static readonly SlugService _slugService;
 
-        static SlugBenchmark()
-        {
-            _slugService = new SlugService();
-        }
+    static SlugBenchmark()
+    {
+        _slugService = new SlugService();
+    }
 
-        [Benchmark]
+    [Benchmark]
 #pragma warning disable CA1822 // Mark members as static
-        public void EvaluateSlugifyWithShortSlug()
-        {
-            _slugService.Slugify("Je veux aller à Saint-Étienne");
-        }
+    public void EvaluateSlugifyWithShortSlug()
+    {
+        _slugService.Slugify("Je veux aller à Saint-Étienne");
+    }
 
-        [Benchmark]
-        public void EvaluateSlugifyWithLongSlug()
-        {
-            _slugService.Slugify("Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne");
-        }
-#pragma warning restore CA1822 // Mark members as static
+    [Benchmark]
+    public void EvaluateSlugifyWithLongSlug()
+    {
+        _slugService.Slugify("Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne Je veux aller à Saint-Étienne");
     }
+#pragma warning restore CA1822 // Mark members as static
 }
diff --git a/test/OrchardCore.Benchmarks/Support/FakeFileProvider.cs b/test/OrchardCore.Benchmarks/Support/FakeFileProvider.cs
index 2b58fddffb1..6d7c38baf96 100644
--- a/test/OrchardCore.Benchmarks/Support/FakeFileProvider.cs
+++ b/test/OrchardCore.Benchmarks/Support/FakeFileProvider.cs
@@ -3,23 +3,22 @@
 using Microsoft.Extensions.Primitives;
 using OrchardCore.DisplayManagement.FileProviders;
 
-namespace OrchardCore.Benchmark.Support
+namespace OrchardCore.Benchmark.Support;
+
+internal sealed class FakeFileProvider : IFileProvider
 {
-    internal sealed class FakeFileProvider : IFileProvider
+    public IDirectoryContents GetDirectoryContents(string subpath)
     {
-        public IDirectoryContents GetDirectoryContents(string subpath)
-        {
-            return new NotFoundDirectoryContents();
-        }
+        return new NotFoundDirectoryContents();
+    }
 
-        public IFileInfo GetFileInfo(string subpath)
-        {
-            return new ContentFileInfo("name", "content");
-        }
+    public IFileInfo GetFileInfo(string subpath)
+    {
+        return new ContentFileInfo("name", "content");
+    }
 
-        public IChangeToken Watch(string filter)
-        {
-            return new CancellationChangeToken(CancellationToken.None);
-        }
+    public IChangeToken Watch(string filter)
+    {
+        return new CancellationChangeToken(CancellationToken.None);
     }
 }
diff --git a/test/OrchardCore.Benchmarks/Support/FakeWebHostEnvironment.cs b/test/OrchardCore.Benchmarks/Support/FakeWebHostEnvironment.cs
index 542fd6b7f47..3e2f76242ad 100644
--- a/test/OrchardCore.Benchmarks/Support/FakeWebHostEnvironment.cs
+++ b/test/OrchardCore.Benchmarks/Support/FakeWebHostEnvironment.cs
@@ -1,20 +1,19 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.FileProviders;
 
-namespace OrchardCore.Benchmark.Support
+namespace OrchardCore.Benchmark.Support;
+
+internal sealed class FakeWebHostEnvironment : IWebHostEnvironment
 {
-    internal sealed class FakeWebHostEnvironment : IWebHostEnvironment
-    {
-        public string ApplicationName { get; set; } = "Benchmark";
+    public string ApplicationName { get; set; } = "Benchmark";
 
-        public IFileProvider ContentRootFileProvider { get; set; } = new FakeFileProvider();
+    public IFileProvider ContentRootFileProvider { get; set; } = new FakeFileProvider();
 
-        public string ContentRootPath { get; set; }
+    public string ContentRootPath { get; set; }
 
-        public string EnvironmentName { get; set; }
+    public string EnvironmentName { get; set; }
 
-        public IFileProvider WebRootFileProvider { get; set; } = new FakeFileProvider();
+    public IFileProvider WebRootFileProvider { get; set; } = new FakeFileProvider();
 
-        public string WebRootPath { get; set; }
-    }
+    public string WebRootPath { get; set; }
 }
diff --git a/test/OrchardCore.Tests.Features/Examples.Features.AssyAttrib/Root.cs b/test/OrchardCore.Tests.Features/Examples.Features.AssyAttrib/Root.cs
index 30bd702b09b..bc48b474bea 100644
--- a/test/OrchardCore.Tests.Features/Examples.Features.AssyAttrib/Root.cs
+++ b/test/OrchardCore.Tests.Features/Examples.Features.AssyAttrib/Root.cs
@@ -1,9 +1,8 @@
-namespace Examples.Features.AssyAttrib
+namespace Examples.Features.AssyAttrib;
+
+/// <summary>
+/// Hooks provided for purposes of identifying the class and assembly context.
+/// </summary>
+internal sealed class Root
 {
-    /// <summary>
-    /// Hooks provided for purposes of identifying the class and assembly context.
-    /// </summary>
-    internal sealed class Root
-    {
-    }
 }
diff --git a/test/OrchardCore.Tests.Modules/BaseThemeSample/DependentTypes.cs b/test/OrchardCore.Tests.Modules/BaseThemeSample/DependentTypes.cs
index 59ec8278bdb..572bb052aad 100644
--- a/test/OrchardCore.Tests.Modules/BaseThemeSample/DependentTypes.cs
+++ b/test/OrchardCore.Tests.Modules/BaseThemeSample/DependentTypes.cs
@@ -7,11 +7,11 @@
 
 namespace BaseThemeSample;
 
-public class BaseThemeFeatureIndependentStartup : StartupBase 
-{ 
+public class BaseThemeFeatureIndependentStartup : StartupBase
+{
 }
 
 [Feature("BaseThemeSample")]
-public class BaseThemeSampleStartup : StartupBase 
+public class BaseThemeSampleStartup : StartupBase
 {
 }
diff --git a/test/OrchardCore.Tests.Modules/Errors.OrchardCoreModules.TwoPlus/Root.cs b/test/OrchardCore.Tests.Modules/Errors.OrchardCoreModules.TwoPlus/Root.cs
index 89e0aa79e5a..0b9b87d5b3b 100644
--- a/test/OrchardCore.Tests.Modules/Errors.OrchardCoreModules.TwoPlus/Root.cs
+++ b/test/OrchardCore.Tests.Modules/Errors.OrchardCoreModules.TwoPlus/Root.cs
@@ -1,12 +1,11 @@
 // This project intentional left out of the build configuration, it SHOULD error, that is expected
-namespace Errors.OrchardCoreModules.TwoPlus
+namespace Errors.OrchardCoreModules.TwoPlus;
+
+/// <summary>
+/// Hooks provided for purposes of identifying the class and assembly context.
+/// </summary>
+internal sealed class Root
 {
-    /// <summary>
-    /// Hooks provided for purposes of identifying the class and assembly context.
-    /// </summary>
-    internal sealed class Root
-    {
-    }
 }
 // TODO: MWP: would be better if perhaps we could verify a BUILD cycle from code
 // TODO: MWP: but this would also require a bit of xUnit scaffold to support
diff --git a/test/OrchardCore.Tests.Modules/Examples.Modules.AssyAttrib.Alpha/Root.cs b/test/OrchardCore.Tests.Modules/Examples.Modules.AssyAttrib.Alpha/Root.cs
index 97795e40c7e..9dc99c14d40 100644
--- a/test/OrchardCore.Tests.Modules/Examples.Modules.AssyAttrib.Alpha/Root.cs
+++ b/test/OrchardCore.Tests.Modules/Examples.Modules.AssyAttrib.Alpha/Root.cs
@@ -1,9 +1,8 @@
-namespace Examples.Modules.AssyAttrib.Alpha
+namespace Examples.Modules.AssyAttrib.Alpha;
+
+/// <summary>
+/// Hooks provided for purposes of identifying the class and assembly context.
+/// </summary>
+internal sealed class Root
 {
-    /// <summary>
-    /// Hooks provided for purposes of identifying the class and assembly context.
-    /// </summary>
-    internal sealed class Root
-    {
-    }
 }
diff --git a/test/OrchardCore.Tests.Modules/Examples.Modules.AssyAttrib.Bravo/Root.cs b/test/OrchardCore.Tests.Modules/Examples.Modules.AssyAttrib.Bravo/Root.cs
index 6d5cf452738..ea8b64866c1 100644
--- a/test/OrchardCore.Tests.Modules/Examples.Modules.AssyAttrib.Bravo/Root.cs
+++ b/test/OrchardCore.Tests.Modules/Examples.Modules.AssyAttrib.Bravo/Root.cs
@@ -1,9 +1,8 @@
-namespace Examples.Modules.AssyAttrib.Bravo
+namespace Examples.Modules.AssyAttrib.Bravo;
+
+/// <summary>
+/// Hooks provided for purposes of identifying the class and assembly context.
+/// </summary>
+internal sealed class Root
 {
-    /// <summary>
-    /// Hooks provided for purposes of identifying the class and assembly context.
-    /// </summary>
-    internal sealed class Root
-    {
-    }
 }
diff --git a/test/OrchardCore.Tests.Modules/Examples.Modules.AssyAttrib.Charlie/Root.cs b/test/OrchardCore.Tests.Modules/Examples.Modules.AssyAttrib.Charlie/Root.cs
index e39135c8784..43879855a49 100644
--- a/test/OrchardCore.Tests.Modules/Examples.Modules.AssyAttrib.Charlie/Root.cs
+++ b/test/OrchardCore.Tests.Modules/Examples.Modules.AssyAttrib.Charlie/Root.cs
@@ -1,9 +1,8 @@
-namespace Examples.Modules.AssyAttrib.Charlie
+namespace Examples.Modules.AssyAttrib.Charlie;
+
+/// <summary>
+/// Hooks provided for purposes of identifying the class and assembly context.
+/// </summary>
+internal sealed class Root
 {
-    /// <summary>
-    /// Hooks provided for purposes of identifying the class and assembly context.
-    /// </summary>
-    internal sealed class Root
-    {
-    }
 }
diff --git a/test/OrchardCore.Tests.Modules/Examples.OrchardCoreModules.Alpha/Root.cs b/test/OrchardCore.Tests.Modules/Examples.OrchardCoreModules.Alpha/Root.cs
index bdc119b8cb3..0f63ce5f161 100644
--- a/test/OrchardCore.Tests.Modules/Examples.OrchardCoreModules.Alpha/Root.cs
+++ b/test/OrchardCore.Tests.Modules/Examples.OrchardCoreModules.Alpha/Root.cs
@@ -1,9 +1,8 @@
-namespace Examples.OrchardCoreModules.Alpha
+namespace Examples.OrchardCoreModules.Alpha;
+
+/// <summary>
+/// Hooks provided for purposes of identifying the class and assembly context.
+/// </summary>
+internal sealed class Root
 {
-    /// <summary>
-    /// Hooks provided for purposes of identifying the class and assembly context.
-    /// </summary>
-    internal sealed class Root
-    {
-    }
 }
diff --git a/test/OrchardCore.Tests.Modules/ModuleSample/DependentTypes.cs b/test/OrchardCore.Tests.Modules/ModuleSample/DependentTypes.cs
index 1baf0e9f14c..a13c09420c6 100644
--- a/test/OrchardCore.Tests.Modules/ModuleSample/DependentTypes.cs
+++ b/test/OrchardCore.Tests.Modules/ModuleSample/DependentTypes.cs
@@ -6,12 +6,12 @@ namespace ModuleSample;
 public class FeatureIndependentStartup : StartupBase { }
 
 [Feature("Sample1")]
-public class Sample1Startup : StartupBase 
+public class Sample1Startup : StartupBase
 {
 }
 
 [Feature("Sample2")]
 [FeatureTypeDiscovery(SkipExtension = true)]
-public class SkippedDependentType 
+public class SkippedDependentType
 {
 }
diff --git a/test/OrchardCore.Tests.Pages/OrchardCore.Application.Pages/Program.cs b/test/OrchardCore.Tests.Pages/OrchardCore.Application.Pages/Program.cs
index 5c3c9d26a24..90ecf97af35 100644
--- a/test/OrchardCore.Tests.Pages/OrchardCore.Application.Pages/Program.cs
+++ b/test/OrchardCore.Tests.Pages/OrchardCore.Application.Pages/Program.cs
@@ -1,20 +1,19 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 
-namespace OrchardCore.Application.Pages
+namespace OrchardCore.Application.Pages;
+
+public class Program
 {
-    public class Program
+    public static void Main(string[] args)
     {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
-
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
+        CreateHostBuilder(args).Build().Run();
     }
+
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        Host.CreateDefaultBuilder(args)
+            .ConfigureWebHostDefaults(webBuilder =>
+            {
+                webBuilder.UseStartup<Startup>();
+            });
 }
diff --git a/test/OrchardCore.Tests.Pages/OrchardCore.Application.Pages/Startup.cs b/test/OrchardCore.Tests.Pages/OrchardCore.Application.Pages/Startup.cs
index ed624a83076..2023528918d 100644
--- a/test/OrchardCore.Tests.Pages/OrchardCore.Application.Pages/Startup.cs
+++ b/test/OrchardCore.Tests.Pages/OrchardCore.Application.Pages/Startup.cs
@@ -2,25 +2,24 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
-namespace OrchardCore.Application.Pages
+namespace OrchardCore.Application.Pages;
+
+public sealed class Startup
 {
-    public sealed class Startup
+    public void ConfigureServices(IServiceCollection services)
     {
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddOrchardCms();
-        }
+        services.AddOrchardCms();
+    }
 
-        public void Configure(IApplicationBuilder app, IHostEnvironment env)
+    public void Configure(IApplicationBuilder app, IHostEnvironment env)
+    {
+        if (env.IsDevelopment())
         {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
+            app.UseDeveloperExceptionPage();
+        }
 
-            app.UseStaticFiles();
+        app.UseStaticFiles();
 
-            app.UseOrchardCore();
-        }
+        app.UseOrchardCore();
     }
 }
diff --git a/test/OrchardCore.Tests.Pages/OrchardCore.Modules.Pages/Module.Pages/Startup.cs b/test/OrchardCore.Tests.Pages/OrchardCore.Modules.Pages/Module.Pages/Startup.cs
index 9cc3e4680a2..9e1fcd3b1b9 100644
--- a/test/OrchardCore.Tests.Pages/OrchardCore.Modules.Pages/Module.Pages/Startup.cs
+++ b/test/OrchardCore.Tests.Pages/OrchardCore.Modules.Pages/Module.Pages/Startup.cs
@@ -3,23 +3,22 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Modules;
 
-namespace Module.Pages
+namespace Module.Pages;
+
+public sealed class Startup : StartupBase
 {
-    public sealed class Startup : StartupBase
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
+        services.Configure<RazorPagesOptions>(options =>
         {
-            services.Configure<RazorPagesOptions>(options =>
-            {
-                // Add a custom folder route
-                options.Conventions.AddAreaFolderRoute("Module.Pages", "/", "");
+            // Add a custom folder route
+            options.Conventions.AddAreaFolderRoute("Module.Pages", "/", "");
 
-                // Add a custom page route
-                // options.Conventions.AddAreaPageRoute("Module.Pages", "/Foo", "Foo");
+            // Add a custom page route
+            // options.Conventions.AddAreaPageRoute("Module.Pages", "/Foo", "Foo");
 
-                // This declaration would define an home page
-                // options.Conventions.AddAreaPageRoute("Module.Pages", "/Foo", "");
-            });
-        }
+            // This declaration would define an home page
+            // options.Conventions.AddAreaPageRoute("Module.Pages", "/Foo", "");
+        });
     }
 }
diff --git a/test/OrchardCore.Tests.Pages/OrchardCore.Themes.Pages/Theme.Pages/PlaceHolder.cs b/test/OrchardCore.Tests.Pages/OrchardCore.Themes.Pages/Theme.Pages/PlaceHolder.cs
index e402868238f..687766adc7f 100644
--- a/test/OrchardCore.Tests.Pages/OrchardCore.Themes.Pages/Theme.Pages/PlaceHolder.cs
+++ b/test/OrchardCore.Tests.Pages/OrchardCore.Themes.Pages/Theme.Pages/PlaceHolder.cs
@@ -1,7 +1,6 @@
-namespace Theme.Pages
+namespace Theme.Pages;
+
+// Just a class so that an assembly gets created
+public class Placeholder
 {
-    // Just a class so that an assembly gets created
-    public class Placeholder
-    {
-    }
 }
diff --git a/test/OrchardCore.Tests.Themes/Errors.OrchardCoreThemes.ThemeAndModule/Root.cs b/test/OrchardCore.Tests.Themes/Errors.OrchardCoreThemes.ThemeAndModule/Root.cs
index 509485a9328..12e08739b10 100644
--- a/test/OrchardCore.Tests.Themes/Errors.OrchardCoreThemes.ThemeAndModule/Root.cs
+++ b/test/OrchardCore.Tests.Themes/Errors.OrchardCoreThemes.ThemeAndModule/Root.cs
@@ -1,12 +1,11 @@
 // This project intentional left out of the build configuration, it SHOULD error, that is expected
-namespace Errors.OrchardCoreThemes.ThemeAndModule
+namespace Errors.OrchardCoreThemes.ThemeAndModule;
+
+/// <summary>
+/// Hooks provided for purposes of identifying the class and assembly context.
+/// </summary>
+internal sealed class Root
 {
-    /// <summary>
-    /// Hooks provided for purposes of identifying the class and assembly context.
-    /// </summary>
-    internal sealed class Root
-    {
-    }
 }
 // TODO: MWP: would be better if perhaps we could verify a BUILD cycle from code
 // TODO: MWP: but this would also require a bit of xUnit scaffold to support
diff --git a/test/OrchardCore.Tests.Themes/Errors.OrchardCoreThemes.TwoPlus/Root.cs b/test/OrchardCore.Tests.Themes/Errors.OrchardCoreThemes.TwoPlus/Root.cs
index e2aac42decc..f939c123e3d 100644
--- a/test/OrchardCore.Tests.Themes/Errors.OrchardCoreThemes.TwoPlus/Root.cs
+++ b/test/OrchardCore.Tests.Themes/Errors.OrchardCoreThemes.TwoPlus/Root.cs
@@ -1,12 +1,11 @@
 // This project intentional left out of the build configuration, it SHOULD error, that is expected
-namespace Errors.OrchardCoreThemes.TwoPlus
+namespace Errors.OrchardCoreThemes.TwoPlus;
+
+/// <summary>
+/// Hooks provided for purposes of identifying the class and assembly context.
+/// </summary>
+internal sealed class Root
 {
-    /// <summary>
-    /// Hooks provided for purposes of identifying the class and assembly context.
-    /// </summary>
-    internal sealed class Root
-    {
-    }
 }
 // TODO: MWP: would be better if perhaps we could verify a BUILD cycle from code
 // TODO: MWP: but this would also require a bit of xUnit scaffold to support
diff --git a/test/OrchardCore.Tests.Themes/Examples.OrchardCoreThemes.Alpha/Root.cs b/test/OrchardCore.Tests.Themes/Examples.OrchardCoreThemes.Alpha/Root.cs
index 6dffccf0752..4d6dfc136f9 100644
--- a/test/OrchardCore.Tests.Themes/Examples.OrchardCoreThemes.Alpha/Root.cs
+++ b/test/OrchardCore.Tests.Themes/Examples.OrchardCoreThemes.Alpha/Root.cs
@@ -1,9 +1,8 @@
-namespace Examples.OrchardCoreThemes.Alpha
+namespace Examples.OrchardCoreThemes.Alpha;
+
+/// <summary>
+/// Hooks provided for purposes of identifying the class and assembly context.
+/// </summary>
+internal sealed class Root
 {
-    /// <summary>
-    /// Hooks provided for purposes of identifying the class and assembly context.
-    /// </summary>
-    internal sealed class Root
-    {
-    }
 }
diff --git a/test/OrchardCore.Tests.Themes/Examples.Themes.AssyAttrib.Alpha/Root.cs b/test/OrchardCore.Tests.Themes/Examples.Themes.AssyAttrib.Alpha/Root.cs
index 8793a663963..f27c59d11de 100644
--- a/test/OrchardCore.Tests.Themes/Examples.Themes.AssyAttrib.Alpha/Root.cs
+++ b/test/OrchardCore.Tests.Themes/Examples.Themes.AssyAttrib.Alpha/Root.cs
@@ -1,9 +1,8 @@
-namespace Examples.Themes.AssyAttrib.Alpha
+namespace Examples.Themes.AssyAttrib.Alpha;
+
+/// <summary>
+/// Hooks provided for purposes of identifying the class and assembly context.
+/// </summary>
+internal sealed class Root
 {
-    /// <summary>
-    /// Hooks provided for purposes of identifying the class and assembly context.
-    /// </summary>
-    internal sealed class Root
-    {
-    }
 }
diff --git a/test/OrchardCore.Tests.Themes/Examples.Themes.AssyAttrib.Bravo/Root.cs b/test/OrchardCore.Tests.Themes/Examples.Themes.AssyAttrib.Bravo/Root.cs
index 8cae58487e5..e34a65ca306 100644
--- a/test/OrchardCore.Tests.Themes/Examples.Themes.AssyAttrib.Bravo/Root.cs
+++ b/test/OrchardCore.Tests.Themes/Examples.Themes.AssyAttrib.Bravo/Root.cs
@@ -1,9 +1,8 @@
-namespace Examples.Themes.AssyAttrib.Bravo
+namespace Examples.Themes.AssyAttrib.Bravo;
+
+/// <summary>
+/// Hooks provided for purposes of identifying the class and assembly context.
+/// </summary>
+internal sealed class Root
 {
-    /// <summary>
-    /// Hooks provided for purposes of identifying the class and assembly context.
-    /// </summary>
-    internal sealed class Root
-    {
-    }
 }
diff --git a/test/OrchardCore.Tests.Themes/Examples.Themes.AssyAttrib.Charlie/Root.cs b/test/OrchardCore.Tests.Themes/Examples.Themes.AssyAttrib.Charlie/Root.cs
index 257e3e35e8b..216afe8728c 100644
--- a/test/OrchardCore.Tests.Themes/Examples.Themes.AssyAttrib.Charlie/Root.cs
+++ b/test/OrchardCore.Tests.Themes/Examples.Themes.AssyAttrib.Charlie/Root.cs
@@ -1,9 +1,8 @@
-namespace Examples.Themes.AssyAttrib.Charlie
+namespace Examples.Themes.AssyAttrib.Charlie;
+
+/// <summary>
+/// Hooks provided for purposes of identifying the class and assembly context.
+/// </summary>
+internal sealed class Root
 {
-    /// <summary>
-    /// Hooks provided for purposes of identifying the class and assembly context.
-    /// </summary>
-    internal sealed class Root
-    {
-    }
 }
diff --git a/test/OrchardCore.Tests/Apis/ContentManagement/ContentApiController/BlogPostApiControllerTests.cs b/test/OrchardCore.Tests/Apis/ContentManagement/ContentApiController/BlogPostApiControllerTests.cs
index ca0181cb5f0..c5218548dfa 100644
--- a/test/OrchardCore.Tests/Apis/ContentManagement/ContentApiController/BlogPostApiControllerTests.cs
+++ b/test/OrchardCore.Tests/Apis/ContentManagement/ContentApiController/BlogPostApiControllerTests.cs
@@ -7,309 +7,308 @@
 using OrchardCore.Tests.Apis.Context;
 using ISession = YesSql.ISession;
 
-namespace OrchardCore.Tests.Apis.ContentManagement.ContentApiController
+namespace OrchardCore.Tests.Apis.ContentManagement.ContentApiController;
+
+public class BlogPostApiControllerTests
 {
-    public class BlogPostApiControllerTests
+    [Fact]
+    public async Task ShouldCreateDraftOfExistingContentItem()
     {
-        [Fact]
-        public async Task ShouldCreateDraftOfExistingContentItem()
-        {
-            using var context = new BlogPostApiControllerContext();
+        using var context = new BlogPostApiControllerContext();
 
-            await context.InitializeAsync();
+        await context.InitializeAsync();
 
-            context.BlogPost.Latest = false;
-            context.BlogPost.Published = true; // Deliberately set these incorrectly.
+        context.BlogPost.Latest = false;
+        context.BlogPost.Published = true; // Deliberately set these incorrectly.
 
-            // Act
-            var content = await context.Client.PostAsJsonAsync("api/content?draft=true", context.BlogPost);
-            var draftContentItem = await content.Content.ReadAsAsync<ContentItem>();
+        // Act
+        var content = await context.Client.PostAsJsonAsync("api/content?draft=true", context.BlogPost);
+        var draftContentItem = await content.Content.ReadAsAsync<ContentItem>();
 
-            // Test
-            Assert.True(draftContentItem.Latest);
-            Assert.False(draftContentItem.Published);
-        }
+        // Test
+        Assert.True(draftContentItem.Latest);
+        Assert.False(draftContentItem.Published);
+    }
 
-        [Fact]
-        public async Task ShouldCreateAndPublishExistingContentItem()
-        {
-            using var context = new BlogPostApiControllerContext();
+    [Fact]
+    public async Task ShouldCreateAndPublishExistingContentItem()
+    {
+        using var context = new BlogPostApiControllerContext();
+
+        // Setup
+        await context.InitializeAsync();
+
+        context.BlogPost.Latest = false;
+        context.BlogPost.Published = false; // Deliberately set these incorrectly.
+
+        // Act
+        var content = await context.Client.PostAsJsonAsync("api/content", context.BlogPost);
+        var draftContentItem = await content.Content.ReadAsAsync<ContentItem>();
+
+        // Test
+        Assert.True(draftContentItem.Latest);
+        Assert.True(draftContentItem.Published);
+    }
 
-            // Setup
-            await context.InitializeAsync();
+    [Fact]
+    public async Task ShouldOnlyCreateTwoContentItemRecordsForExistingContentItem()
+    {
+        using var context = new BlogPostApiControllerContext();
 
-            context.BlogPost.Latest = false;
-            context.BlogPost.Published = false; // Deliberately set these incorrectly.
+        // Setup
+        await context.InitializeAsync();
 
-            // Act
-            var content = await context.Client.PostAsJsonAsync("api/content", context.BlogPost);
-            var draftContentItem = await content.Content.ReadAsAsync<ContentItem>();
+        context.BlogPost.Latest = false;
+        context.BlogPost.Published = false; // Deliberately set these incorrectly.
 
-            // Test
-            Assert.True(draftContentItem.Latest);
-            Assert.True(draftContentItem.Published);
-        }
+        // Act
+        await context.Client.PostAsJsonAsync("api/content", context.BlogPost);
 
-        [Fact]
-        public async Task ShouldOnlyCreateTwoContentItemRecordsForExistingContentItem()
+        // Test
+        await context.UsingTenantScopeAsync(async scope =>
         {
-            using var context = new BlogPostApiControllerContext();
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
+            var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
+                x.ContentType == "BlogPost").ListAsync();
 
-            // Setup
-            await context.InitializeAsync();
+            Assert.Equal(2, blogPosts.Count());
+        });
+    }
 
-            context.BlogPost.Latest = false;
-            context.BlogPost.Published = false; // Deliberately set these incorrectly.
+    [Fact]
+    public async Task ShouldCreateDraftOfNewContentItem()
+    {
+        using var context = new BlogPostApiControllerContext();
 
-            // Act
-            await context.Client.PostAsJsonAsync("api/content", context.BlogPost);
+        // Setup
+        var displayText = "some other blog post";
+        await context.InitializeAsync();
 
-            // Test
-            await context.UsingTenantScopeAsync(async scope =>
+        var contentItem = new ContentItem
+        {
+            ContentType = "BlogPost",
+            DisplayText = displayText,
+            Latest = true,
+            Published = true, // Deliberately set these values incorrectly.
+        };
+
+        contentItem
+            .Weld(new AutoroutePart
             {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
-                var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
-                    x.ContentType == "BlogPost").ListAsync();
-
-                Assert.Equal(2, blogPosts.Count());
+                Path = "Path2",
             });
-        }
 
-        [Fact]
-        public async Task ShouldCreateDraftOfNewContentItem()
-        {
-            using var context = new BlogPostApiControllerContext();
+        contentItem
+            .Weld(new ContainedPart
+            {
+                ListContentItemId = context.BlogContentItemId
+            });
 
-            // Setup
-            var displayText = "some other blog post";
-            await context.InitializeAsync();
+        var blogFields = new ContentPart();
+        blogFields
+            .Weld("Categories", new TaxonomyField
+            {
+                TaxonomyContentItemId = context.CategoriesTaxonomyContentItemId,
+            });
 
-            var contentItem = new ContentItem
+        blogFields
+            .Weld("Tags", new TaxonomyField
             {
-                ContentType = "BlogPost",
-                DisplayText = displayText,
-                Latest = true,
-                Published = true, // Deliberately set these values incorrectly.
-            };
-
-            contentItem
-                .Weld(new AutoroutePart
-                {
-                    Path = "Path2",
-                });
-
-            contentItem
-                .Weld(new ContainedPart
-                {
-                    ListContentItemId = context.BlogContentItemId
-                });
-
-            var blogFields = new ContentPart();
-            blogFields
-                .Weld("Categories", new TaxonomyField
-                {
-                    TaxonomyContentItemId = context.CategoriesTaxonomyContentItemId,
-                });
-
-            blogFields
-                .Weld("Tags", new TaxonomyField
-                {
-                    TaxonomyContentItemId = context.TagsTaxonomyContentItemId,
-                });
-
-            contentItem
-                .Weld("BlogPost", blogFields);
-
-            // Act
-            var content = await context.Client.PostAsJsonAsync("api/content?draft=true", contentItem);
-            var draftContentItem = await content.Content.ReadAsAsync<ContentItem>();
-
-            // Test
-            Assert.True(draftContentItem.Latest);
-            Assert.False(draftContentItem.Published);
-            Assert.Equal(displayText, draftContentItem.DisplayText);
-            Assert.NotNull(draftContentItem.As<AutoroutePart>());
-        }
-
-        [Fact]
-        public async Task ShouldCreateAndPublishNewContentItem()
+                TaxonomyContentItemId = context.TagsTaxonomyContentItemId,
+            });
+
+        contentItem
+            .Weld("BlogPost", blogFields);
+
+        // Act
+        var content = await context.Client.PostAsJsonAsync("api/content?draft=true", contentItem);
+        var draftContentItem = await content.Content.ReadAsAsync<ContentItem>();
+
+        // Test
+        Assert.True(draftContentItem.Latest);
+        Assert.False(draftContentItem.Published);
+        Assert.Equal(displayText, draftContentItem.DisplayText);
+        Assert.NotNull(draftContentItem.As<AutoroutePart>());
+    }
+
+    [Fact]
+    public async Task ShouldCreateAndPublishNewContentItem()
+    {
+        using var context = new BlogPostApiControllerContext();
+
+        // Setup
+        var displayText = "some other blog post";
+        var path = "path2";
+        await context.InitializeAsync();
+
+        var contentItem = new ContentItem
         {
-            using var context = new BlogPostApiControllerContext();
+            ContentType = "BlogPost",
+            DisplayText = displayText,
+            Latest = false,
+            Published = false, // Deliberately set these values incorrectly.
+        };
+
+        contentItem
+            .Weld(new AutoroutePart
+            {
+                Path = path,
+            });
 
-            // Setup
-            var displayText = "some other blog post";
-            var path = "path2";
-            await context.InitializeAsync();
+        contentItem
+            .Weld(new ContainedPart
+            {
+                ListContentItemId = context.BlogContentItemId,
+            });
 
-            var contentItem = new ContentItem
+        var blogFields = new ContentPart();
+        blogFields
+            .Weld("Categories", new TaxonomyField
             {
-                ContentType = "BlogPost",
-                DisplayText = displayText,
-                Latest = false,
-                Published = false, // Deliberately set these values incorrectly.
-            };
-
-            contentItem
-                .Weld(new AutoroutePart
-                {
-                    Path = path,
-                });
-
-            contentItem
-                .Weld(new ContainedPart
-                {
-                    ListContentItemId = context.BlogContentItemId,
-                });
-
-            var blogFields = new ContentPart();
-            blogFields
-                .Weld("Categories", new TaxonomyField
-                {
-                    TaxonomyContentItemId = context.CategoriesTaxonomyContentItemId,
-                });
-
-            blogFields
-                .Weld("Tags", new TaxonomyField
-                {
-                    TaxonomyContentItemId = context.TagsTaxonomyContentItemId,
-                });
-
-            contentItem
-                .Weld("BlogPost", blogFields);
-
-            // Act
-            var content = await context.Client.PostAsJsonAsync("api/content", contentItem);
-            var publishedContentItem = await content.Content.ReadAsAsync<ContentItem>();
-
-            // Test
-            Assert.True(publishedContentItem.Latest);
-            Assert.True(publishedContentItem.Published);
-            Assert.Equal(displayText, publishedContentItem.DisplayText);
-            Assert.Equal(path, publishedContentItem.As<AutoroutePart>()?.Path);
-        }
-
-        [Fact]
-        public async Task ShouldFailValidationWhenAutoroutePathIsNotUnique()
-        {
-            using var context = new BlogPostApiControllerContext();
+                TaxonomyContentItemId = context.CategoriesTaxonomyContentItemId,
+            });
 
-            // Setup
-            await context.InitializeAsync();
+        blogFields
+            .Weld("Tags", new TaxonomyField
+            {
+                TaxonomyContentItemId = context.TagsTaxonomyContentItemId,
+            });
+
+        contentItem
+            .Weld("BlogPost", blogFields);
+
+        // Act
+        var content = await context.Client.PostAsJsonAsync("api/content", contentItem);
+        var publishedContentItem = await content.Content.ReadAsAsync<ContentItem>();
+
+        // Test
+        Assert.True(publishedContentItem.Latest);
+        Assert.True(publishedContentItem.Published);
+        Assert.Equal(displayText, publishedContentItem.DisplayText);
+        Assert.Equal(path, publishedContentItem.As<AutoroutePart>()?.Path);
+    }
+
+    [Fact]
+    public async Task ShouldFailValidationWhenAutoroutePathIsNotUnique()
+    {
+        using var context = new BlogPostApiControllerContext();
+
+        // Setup
+        await context.InitializeAsync();
 
-            var contentItem = new ContentItem
+        var contentItem = new ContentItem
+        {
+            ContentType = "BlogPost",
+            DisplayText = "some other blog post",
+            Latest = false,
+            Published = false, // Deliberately set these values incorrectly.
+        };
+
+        contentItem
+            .Weld(new AutoroutePart
+            {
+                Path = "blog/post-1", // Deliberately set to an existing path.
+            });
+
+        contentItem
+            .Weld(new ContainedPart
             {
-                ContentType = "BlogPost",
-                DisplayText = "some other blog post",
-                Latest = false,
-                Published = false, // Deliberately set these values incorrectly.
-            };
-
-            contentItem
-                .Weld(new AutoroutePart
-                {
-                    Path = "blog/post-1", // Deliberately set to an existing path.
-                });
-
-            contentItem
-                .Weld(new ContainedPart
-                {
-                    ListContentItemId = context.BlogContentItemId,
-                });
-
-            var blogFields = new ContentPart();
-            blogFields
-                .Weld("Categories", new TaxonomyField
-                {
-                    TaxonomyContentItemId = context.CategoriesTaxonomyContentItemId,
-                });
-
-            blogFields
-                .Weld("Tags", new TaxonomyField
-                {
-                    TaxonomyContentItemId = context.TagsTaxonomyContentItemId,
-                });
-
-            contentItem
-                .Weld("BlogPost", blogFields);
-
-            // Act
-            var result = await context.Client.PostAsJsonAsync("api/content", contentItem);
-            var problemDetails = await result.Content.ReadAsAsync<ProblemDetails>();
-
-            // Test
-            Assert.Equal(HttpStatusCode.BadRequest, result.StatusCode);
-            Assert.Contains("Your permalink is already in use.", problemDetails.Detail);
-
-            await context.UsingTenantScopeAsync(async scope =>
+                ListContentItemId = context.BlogContentItemId,
+            });
+
+        var blogFields = new ContentPart();
+        blogFields
+            .Weld("Categories", new TaxonomyField
             {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
-                var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
-                    x.ContentType == "BlogPost").ListAsync();
+                TaxonomyContentItemId = context.CategoriesTaxonomyContentItemId,
+            });
 
-                Assert.Single(blogPosts);
+        blogFields
+            .Weld("Tags", new TaxonomyField
+            {
+                TaxonomyContentItemId = context.TagsTaxonomyContentItemId,
             });
-        }
 
-        [Fact]
-        public async Task ShouldGenerateUniqueAutoroutePath()
+        contentItem
+            .Weld("BlogPost", blogFields);
+
+        // Act
+        var result = await context.Client.PostAsJsonAsync("api/content", contentItem);
+        var problemDetails = await result.Content.ReadAsAsync<ProblemDetails>();
+
+        // Test
+        Assert.Equal(HttpStatusCode.BadRequest, result.StatusCode);
+        Assert.Contains("Your permalink is already in use.", problemDetails.Detail);
+
+        await context.UsingTenantScopeAsync(async scope =>
         {
-            using var context = new BlogPostApiControllerContext();
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
+            var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
+                x.ContentType == "BlogPost").ListAsync();
 
-            // Setup
-            await context.InitializeAsync();
+            Assert.Single(blogPosts);
+        });
+    }
 
-            var contentItem = new ContentItem
+    [Fact]
+    public async Task ShouldGenerateUniqueAutoroutePath()
+    {
+        using var context = new BlogPostApiControllerContext();
+
+        // Setup
+        await context.InitializeAsync();
+
+        var contentItem = new ContentItem
+        {
+            ContentType = "BlogPost",
+            DisplayText = "some other blog post",
+            Latest = false,
+            Published = false, // Deliberately set these values incorrectly.
+        };
+
+        contentItem
+            .Weld(new ContainedPart
             {
-                ContentType = "BlogPost",
-                DisplayText = "some other blog post",
-                Latest = false,
-                Published = false, // Deliberately set these values incorrectly.
-            };
-
-            contentItem
-                .Weld(new ContainedPart
-                {
-                    ListContentItemId = context.BlogContentItemId,
-                });
-
-            var blogFields = new ContentPart();
-            blogFields
-                .Weld("Categories", new TaxonomyField
-                {
-                    TaxonomyContentItemId = context.CategoriesTaxonomyContentItemId,
-                });
-
-            blogFields
-                .Weld("Tags", new TaxonomyField
-                {
-                    TaxonomyContentItemId = context.TagsTaxonomyContentItemId,
-                });
-
-            contentItem
-                .Weld("BlogPost", blogFields);
-
-            // Act
-            var content = await context.Client.PostAsJsonAsync("api/content", contentItem);
-            var publishedContentItem = await content.Content.ReadAsAsync<ContentItem>();
-
-            // Test
-            var blogPostContentItemIds = new List<string>
+                ListContentItemId = context.BlogContentItemId,
+            });
+
+        var blogFields = new ContentPart();
+        blogFields
+            .Weld("Categories", new TaxonomyField
             {
-                context.BlogPost.ContentItemId,
-                publishedContentItem.ContentItemId,
-            };
+                TaxonomyContentItemId = context.CategoriesTaxonomyContentItemId,
+            });
 
-            await context.UsingTenantScopeAsync(async scope =>
+        blogFields
+            .Weld("Tags", new TaxonomyField
             {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
-                var newAutoroutePartIndex = await session
-                    .QueryIndex<AutoroutePartIndex>(o => o.Published && o.ContentItemId == publishedContentItem.ContentItemId)
-                    .FirstOrDefaultAsync();
-
-                // The Autoroute part was not welded on, so ContentManager.NewAsync should add it
-                // with an empty path and then generate a unique path from the liquid pattern.
-                Assert.Equal("blog/some-other-blog-post", publishedContentItem.As<AutoroutePart>().Path);
+                TaxonomyContentItemId = context.TagsTaxonomyContentItemId,
             });
-        }
+
+        contentItem
+            .Weld("BlogPost", blogFields);
+
+        // Act
+        var content = await context.Client.PostAsJsonAsync("api/content", contentItem);
+        var publishedContentItem = await content.Content.ReadAsAsync<ContentItem>();
+
+        // Test
+        var blogPostContentItemIds = new List<string>
+        {
+            context.BlogPost.ContentItemId,
+            publishedContentItem.ContentItemId,
+        };
+
+        await context.UsingTenantScopeAsync(async scope =>
+        {
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
+            var newAutoroutePartIndex = await session
+                .QueryIndex<AutoroutePartIndex>(o => o.Published && o.ContentItemId == publishedContentItem.ContentItemId)
+                .FirstOrDefaultAsync();
+
+            // The Autoroute part was not welded on, so ContentManager.NewAsync should add it
+            // with an empty path and then generate a unique path from the liquid pattern.
+            Assert.Equal("blog/some-other-blog-post", publishedContentItem.As<AutoroutePart>().Path);
+        });
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/ContentManagement/DeploymentPlans/BlogPostContentStepIdempotentTests.cs b/test/OrchardCore.Tests/Apis/ContentManagement/DeploymentPlans/BlogPostContentStepIdempotentTests.cs
index 9e464944ad5..763d0b31eb7 100644
--- a/test/OrchardCore.Tests/Apis/ContentManagement/DeploymentPlans/BlogPostContentStepIdempotentTests.cs
+++ b/test/OrchardCore.Tests/Apis/ContentManagement/DeploymentPlans/BlogPostContentStepIdempotentTests.cs
@@ -3,81 +3,80 @@
 using OrchardCore.Tests.Apis.Context;
 using ISession = YesSql.ISession;
 
-namespace OrchardCore.Tests.Apis.ContentManagement.DeploymentPlans
+namespace OrchardCore.Tests.Apis.ContentManagement.DeploymentPlans;
+
+public class BlogPostContentStepIdempotentTests
 {
-    public class BlogPostContentStepIdempotentTests
+    [Fact]
+    public async Task ShouldProduceSameOutcomeForNewContentOnMultipleExecutions()
     {
-        [Fact]
-        public async Task ShouldProduceSameOutcomeForNewContentOnMultipleExecutions()
+        using var context = new BlogPostDeploymentContext();
+
+        // Setup
+        await context.InitializeAsync();
+
+        // Act
+        var recipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
         {
-            using var context = new BlogPostDeploymentContext();
+            jItem[nameof(ContentItem.ContentItemVersionId)] = "newversion";
+            jItem[nameof(ContentItem.DisplayText)] = "new version";
+        });
 
-            // Setup
-            await context.InitializeAsync();
+        for (var i = 0; i < 2; i++)
+        {
+            await context.PostRecipeAsync(recipe);
 
-            // Act
-            var recipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
+            // Test
+            await context.UsingTenantScopeAsync(async scope =>
             {
-                jItem[nameof(ContentItem.ContentItemVersionId)] = "newversion";
-                jItem[nameof(ContentItem.DisplayText)] = "new version";
-            });
+                var session = scope.ServiceProvider.GetRequiredService<ISession>();
+                var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
+                    x.ContentType == "BlogPost").ListAsync();
 
-            for (var i = 0; i < 2; i++)
-            {
-                await context.PostRecipeAsync(recipe);
-
-                // Test
-                await context.UsingTenantScopeAsync(async scope =>
-                {
-                    var session = scope.ServiceProvider.GetRequiredService<ISession>();
-                    var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
-                        x.ContentType == "BlogPost").ListAsync();
-
-                    Assert.Equal(2, blogPosts.Count());
-
-                    var originalVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == context.OriginalBlogPostVersionId);
-                    Assert.False(originalVersion?.Latest);
-                    Assert.False(originalVersion?.Published);
-
-                    var newVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == "newversion");
-                    Assert.Equal("new version", newVersion?.DisplayText);
-                    Assert.True(newVersion?.Latest);
-                    Assert.True(newVersion?.Published);
-                });
-            }
+                Assert.Equal(2, blogPosts.Count());
+
+                var originalVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == context.OriginalBlogPostVersionId);
+                Assert.False(originalVersion?.Latest);
+                Assert.False(originalVersion?.Published);
+
+                var newVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == "newversion");
+                Assert.Equal("new version", newVersion?.DisplayText);
+                Assert.True(newVersion?.Latest);
+                Assert.True(newVersion?.Published);
+            });
         }
+    }
 
-        [Fact]
-        public async Task ShouldProduceSameOutcomeForExistingContentItemVersionOnMultipleExecutions()
+    [Fact]
+    public async Task ShouldProduceSameOutcomeForExistingContentItemVersionOnMultipleExecutions()
+    {
+        using var context = new BlogPostDeploymentContext();
+
+        // Setup
+        await context.InitializeAsync();
+
+        // Act
+        var recipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
         {
-            using var context = new BlogPostDeploymentContext();
+            jItem[nameof(ContentItem.DisplayText)] = "existing version mutated";
+        });
 
-            // Setup
-            await context.InitializeAsync();
+        for (var i = 0; i < 2; i++)
+        {
+            await context.PostRecipeAsync(recipe);
 
-            // Act
-            var recipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
+            // Test
+            await context.UsingTenantScopeAsync(async scope =>
             {
-                jItem[nameof(ContentItem.DisplayText)] = "existing version mutated";
-            });
+                var session = scope.ServiceProvider.GetRequiredService<ISession>();
+                var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
+                    x.ContentType == "BlogPost").ListAsync();
 
-            for (var i = 0; i < 2; i++)
-            {
-                await context.PostRecipeAsync(recipe);
-
-                // Test
-                await context.UsingTenantScopeAsync(async scope =>
-                {
-                    var session = scope.ServiceProvider.GetRequiredService<ISession>();
-                    var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
-                        x.ContentType == "BlogPost").ListAsync();
-
-                    Assert.Single(blogPosts);
-                    var mutatedVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == context.OriginalBlogPostVersionId);
-                    Assert.Equal("existing version mutated", mutatedVersion?.DisplayText);
-                });
-            }
+                Assert.Single(blogPosts);
+                var mutatedVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == context.OriginalBlogPostVersionId);
+                Assert.Equal("existing version mutated", mutatedVersion?.DisplayText);
+            });
         }
-
     }
+
 }
diff --git a/test/OrchardCore.Tests/Apis/ContentManagement/DeploymentPlans/BlogPostCreateDeploymentPlanTests.cs b/test/OrchardCore.Tests/Apis/ContentManagement/DeploymentPlans/BlogPostCreateDeploymentPlanTests.cs
index 7fc2d37872f..ab4e39944ef 100644
--- a/test/OrchardCore.Tests/Apis/ContentManagement/DeploymentPlans/BlogPostCreateDeploymentPlanTests.cs
+++ b/test/OrchardCore.Tests/Apis/ContentManagement/DeploymentPlans/BlogPostCreateDeploymentPlanTests.cs
@@ -5,207 +5,206 @@
 using OrchardCore.Tests.Apis.Context;
 using ISession = YesSql.ISession;
 
-namespace OrchardCore.Tests.Apis.ContentManagement.DeploymentPlans
+namespace OrchardCore.Tests.Apis.ContentManagement.DeploymentPlans;
+
+public class BlogPostCreateDeploymentPlanTests
 {
-    public class BlogPostCreateDeploymentPlanTests
+    [Fact]
+    public async Task ShouldCreateNewPublishedContentItemVersion()
     {
-        [Fact]
-        public async Task ShouldCreateNewPublishedContentItemVersion()
-        {
-            using var context = new BlogPostDeploymentContext();
+        using var context = new BlogPostDeploymentContext();
 
-            // Setup
-            await context.InitializeAsync();
-
-            // Act
-            var recipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
-            {
-                jItem[nameof(ContentItem.ContentItemVersionId)] = "newversion";
-                jItem[nameof(ContentItem.DisplayText)] = "new version";
-            });
+        // Setup
+        await context.InitializeAsync();
 
-            await context.PostRecipeAsync(recipe);
-
-            // Test
-            await context.UsingTenantScopeAsync(async scope =>
-            {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
-                var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
-                    x.ContentType == "BlogPost").ListAsync();
+        // Act
+        var recipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
+        {
+            jItem[nameof(ContentItem.ContentItemVersionId)] = "newversion";
+            jItem[nameof(ContentItem.DisplayText)] = "new version";
+        });
 
-                Assert.Equal(2, blogPosts.Count());
+        await context.PostRecipeAsync(recipe);
 
-                var originalVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == context.OriginalBlogPostVersionId);
-                Assert.False(originalVersion?.Latest);
-                Assert.False(originalVersion?.Published);
+        // Test
+        await context.UsingTenantScopeAsync(async scope =>
+        {
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
+            var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
+                x.ContentType == "BlogPost").ListAsync();
 
-                var newVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == "newversion");
-                Assert.Equal("new version", newVersion?.DisplayText);
-                Assert.True(newVersion?.Latest);
-                Assert.True(newVersion?.Published);
-            });
-        }
+            Assert.Equal(2, blogPosts.Count());
 
-        [Fact]
-        public async Task ShouldDiscardDraftThenCreateNewPublishedContentItemVersion()
-        {
-            using var context = new BlogPostDeploymentContext();
+            var originalVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == context.OriginalBlogPostVersionId);
+            Assert.False(originalVersion?.Latest);
+            Assert.False(originalVersion?.Published);
 
-            // Setup
-            await context.InitializeAsync();
+            var newVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == "newversion");
+            Assert.Equal("new version", newVersion?.DisplayText);
+            Assert.True(newVersion?.Latest);
+            Assert.True(newVersion?.Published);
+        });
+    }
 
-            var content = await context.Client.PostAsJsonAsync("api/content?draft=true", context.OriginalBlogPost);
-            var draftContentItemVersionId = (await content.Content.ReadAsAsync<ContentItem>()).ContentItemVersionId;
+    [Fact]
+    public async Task ShouldDiscardDraftThenCreateNewPublishedContentItemVersion()
+    {
+        using var context = new BlogPostDeploymentContext();
 
-            // Act
-            var recipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
-                {
-                    jItem[nameof(ContentItem.ContentItemVersionId)] = "newversion";
-                    jItem[nameof(ContentItem.DisplayText)] = "new version";
-                });
+        // Setup
+        await context.InitializeAsync();
 
-            await context.PostRecipeAsync(recipe);
+        var content = await context.Client.PostAsJsonAsync("api/content?draft=true", context.OriginalBlogPost);
+        var draftContentItemVersionId = (await content.Content.ReadAsAsync<ContentItem>()).ContentItemVersionId;
 
-            // Test
-            await context.UsingTenantScopeAsync(async scope =>
+        // Act
+        var recipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
             {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
-                var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
-                    x.ContentType == "BlogPost").ListAsync();
-
-                Assert.Equal(3, blogPosts.Count());
-                var originalVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == context.OriginalBlogPostVersionId);
-                Assert.False(originalVersion?.Latest);
-                Assert.False(originalVersion?.Published);
-
-                var draftVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == draftContentItemVersionId);
-                Assert.False(draftVersion?.Latest);
-                Assert.False(draftVersion?.Published);
-
-                var newVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == "newversion");
-                Assert.Equal("new version", newVersion?.DisplayText);
-                Assert.True(newVersion?.Latest);
-                Assert.True(newVersion?.Published);
+                jItem[nameof(ContentItem.ContentItemVersionId)] = "newversion";
+                jItem[nameof(ContentItem.DisplayText)] = "new version";
             });
-        }
 
-        [Fact]
-        public async Task ShouldDiscardDraftThenCreateNewDraftContentItemVersion()
-        {
-            using var context = new BlogPostDeploymentContext();
+        await context.PostRecipeAsync(recipe);
 
-            // Setup
-            await context.InitializeAsync();
+        // Test
+        await context.UsingTenantScopeAsync(async scope =>
+        {
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
+            var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
+                x.ContentType == "BlogPost").ListAsync();
+
+            Assert.Equal(3, blogPosts.Count());
+            var originalVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == context.OriginalBlogPostVersionId);
+            Assert.False(originalVersion?.Latest);
+            Assert.False(originalVersion?.Published);
+
+            var draftVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == draftContentItemVersionId);
+            Assert.False(draftVersion?.Latest);
+            Assert.False(draftVersion?.Published);
+
+            var newVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == "newversion");
+            Assert.Equal("new version", newVersion?.DisplayText);
+            Assert.True(newVersion?.Latest);
+            Assert.True(newVersion?.Published);
+        });
+    }
 
-            var content = await context.Client.PostAsJsonAsync("api/content?draft=true", context.OriginalBlogPost);
-            var draftContentItemVersionId = (await content.Content.ReadAsAsync<ContentItem>()).ContentItemVersionId;
+    [Fact]
+    public async Task ShouldDiscardDraftThenCreateNewDraftContentItemVersion()
+    {
+        using var context = new BlogPostDeploymentContext();
 
-            // Act
-            var recipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
-            {
-                jItem[nameof(ContentItem.ContentItemVersionId)] = "newdraftversion";
-                jItem[nameof(ContentItem.DisplayText)] = "new draft version";
-                jItem[nameof(ContentItem.Published)] = false;
-            });
+        // Setup
+        await context.InitializeAsync();
 
-            await context.PostRecipeAsync(recipe);
+        var content = await context.Client.PostAsJsonAsync("api/content?draft=true", context.OriginalBlogPost);
+        var draftContentItemVersionId = (await content.Content.ReadAsAsync<ContentItem>()).ContentItemVersionId;
 
-            // Test
-            await context.UsingTenantScopeAsync(async scope =>
-            {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
-                var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
-                    x.ContentType == "BlogPost").ListAsync();
+        // Act
+        var recipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
+        {
+            jItem[nameof(ContentItem.ContentItemVersionId)] = "newdraftversion";
+            jItem[nameof(ContentItem.DisplayText)] = "new draft version";
+            jItem[nameof(ContentItem.Published)] = false;
+        });
 
-                Assert.Equal(3, blogPosts.Count());
+        await context.PostRecipeAsync(recipe);
 
-                var originalVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == context.OriginalBlogPostVersionId);
-                Assert.False(originalVersion?.Latest);
-                Assert.True(originalVersion?.Published);
+        // Test
+        await context.UsingTenantScopeAsync(async scope =>
+        {
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
+            var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
+                x.ContentType == "BlogPost").ListAsync();
 
-                var draftVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == draftContentItemVersionId);
-                Assert.False(draftVersion?.Latest);
-                Assert.False(draftVersion?.Published);
+            Assert.Equal(3, blogPosts.Count());
 
-                var newDraftVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == "newdraftversion");
-                Assert.Equal("new draft version", newDraftVersion?.DisplayText);
-                Assert.True(newDraftVersion?.Latest);
-                Assert.False(newDraftVersion?.Published);
-            });
-        }
+            var originalVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == context.OriginalBlogPostVersionId);
+            Assert.False(originalVersion?.Latest);
+            Assert.True(originalVersion?.Published);
 
-        [Fact]
-        public async Task ShouldCreateNewPublishedContentItem()
-        {
-            using var context = new BlogPostDeploymentContext();
+            var draftVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == draftContentItemVersionId);
+            Assert.False(draftVersion?.Latest);
+            Assert.False(draftVersion?.Published);
 
-            // Setup
-            await context.InitializeAsync();
+            var newDraftVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == "newdraftversion");
+            Assert.Equal("new draft version", newDraftVersion?.DisplayText);
+            Assert.True(newDraftVersion?.Latest);
+            Assert.False(newDraftVersion?.Published);
+        });
+    }
 
-            // Act
-            var recipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
-            {
-                jItem[nameof(ContentItem.ContentItemId)] = "newcontentitemid";
-                jItem[nameof(ContentItem.ContentItemVersionId)] = "newversion";
-                jItem[nameof(ContentItem.DisplayText)] = "new version";
-                jItem[nameof(AutoroutePart)][nameof(AutoroutePart.Path)] = "blog/another";
-            });
+    [Fact]
+    public async Task ShouldCreateNewPublishedContentItem()
+    {
+        using var context = new BlogPostDeploymentContext();
 
-            await context.PostRecipeAsync(recipe);
+        // Setup
+        await context.InitializeAsync();
 
-            // Test
-            await context.UsingTenantScopeAsync(async scope =>
-            {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
-                var blogPostsCount = await session.Query<ContentItem, ContentItemIndex>(x =>
-                    x.ContentType == "BlogPost").CountAsync();
+        // Act
+        var recipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
+        {
+            jItem[nameof(ContentItem.ContentItemId)] = "newcontentitemid";
+            jItem[nameof(ContentItem.ContentItemVersionId)] = "newversion";
+            jItem[nameof(ContentItem.DisplayText)] = "new version";
+            jItem[nameof(AutoroutePart)][nameof(AutoroutePart.Path)] = "blog/another";
+        });
 
-                Assert.Equal(2, blogPostsCount);
-            });
-        }
+        await context.PostRecipeAsync(recipe);
 
-        [Fact]
-        public async Task ShouldIgnoreDuplicateContentItems()
+        // Test
+        await context.UsingTenantScopeAsync(async scope =>
         {
-            using var context = new BlogPostDeploymentContext();
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
+            var blogPostsCount = await session.Query<ContentItem, ContentItemIndex>(x =>
+                x.ContentType == "BlogPost").CountAsync();
 
-            // Setup
-            await context.InitializeAsync();
+            Assert.Equal(2, blogPostsCount);
+        });
+    }
 
-            // Create a recipe with two content items and the same version id.
-            var firstRecipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
-            {
-                jItem[nameof(ContentItem.ContentItemId)] = "newcontentitemid";
-                jItem[nameof(ContentItem.ContentItemVersionId)] = "dupversion";
-                jItem[nameof(ContentItem.DisplayText)] = "duplicate version";
-                jItem[nameof(AutoroutePart)][nameof(AutoroutePart.Path)] = "blog/another";
-            });
+    [Fact]
+    public async Task ShouldIgnoreDuplicateContentItems()
+    {
+        using var context = new BlogPostDeploymentContext();
 
-            var secondRecipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
-            {
-                jItem[nameof(ContentItem.ContentItemId)] = "newcontentitemid";
-                jItem[nameof(ContentItem.ContentItemVersionId)] = "dupversion";
-                jItem[nameof(ContentItem.DisplayText)] = "duplicate version";
-                jItem[nameof(AutoroutePart)][nameof(AutoroutePart.Path)] = "blog/another";
-            });
+        // Setup
+        await context.InitializeAsync();
+
+        // Create a recipe with two content items and the same version id.
+        var firstRecipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
+        {
+            jItem[nameof(ContentItem.ContentItemId)] = "newcontentitemid";
+            jItem[nameof(ContentItem.ContentItemVersionId)] = "dupversion";
+            jItem[nameof(ContentItem.DisplayText)] = "duplicate version";
+            jItem[nameof(AutoroutePart)][nameof(AutoroutePart.Path)] = "blog/another";
+        });
 
-            var firstRecipeData = firstRecipe.SelectNode("steps[0].Data").AsArray();
+        var secondRecipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
+        {
+            jItem[nameof(ContentItem.ContentItemId)] = "newcontentitemid";
+            jItem[nameof(ContentItem.ContentItemVersionId)] = "dupversion";
+            jItem[nameof(ContentItem.DisplayText)] = "duplicate version";
+            jItem[nameof(AutoroutePart)][nameof(AutoroutePart.Path)] = "blog/another";
+        });
 
-            var secondContentItem = secondRecipe.SelectNode("steps[0].Data[0]");
+        var firstRecipeData = firstRecipe.SelectNode("steps[0].Data").AsArray();
 
-            firstRecipeData.Add(secondContentItem.Clone());
+        var secondContentItem = secondRecipe.SelectNode("steps[0].Data[0]");
 
-            await context.PostRecipeAsync(firstRecipe);
+        firstRecipeData.Add(secondContentItem.Clone());
 
-            // Test
-            await context.UsingTenantScopeAsync(async scope =>
-            {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
-                var blogPostsCount = await session.Query<ContentItem, ContentItemIndex>(x =>
-                    x.ContentType == "BlogPost" && x.ContentItemVersionId == "dupversion").CountAsync();
+        await context.PostRecipeAsync(firstRecipe);
 
-                Assert.Equal(1, blogPostsCount);
-            });
-        }
+        // Test
+        await context.UsingTenantScopeAsync(async scope =>
+        {
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
+            var blogPostsCount = await session.Query<ContentItem, ContentItemIndex>(x =>
+                x.ContentType == "BlogPost" && x.ContentItemVersionId == "dupversion").CountAsync();
+
+            Assert.Equal(1, blogPostsCount);
+        });
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/ContentManagement/DeploymentPlans/BlogPostUpdateDeploymentPlanTests.cs b/test/OrchardCore.Tests/Apis/ContentManagement/DeploymentPlans/BlogPostUpdateDeploymentPlanTests.cs
index 81c8c979f69..387f19bb67c 100644
--- a/test/OrchardCore.Tests/Apis/ContentManagement/DeploymentPlans/BlogPostUpdateDeploymentPlanTests.cs
+++ b/test/OrchardCore.Tests/Apis/ContentManagement/DeploymentPlans/BlogPostUpdateDeploymentPlanTests.cs
@@ -3,116 +3,115 @@
 using OrchardCore.Tests.Apis.Context;
 using ISession = YesSql.ISession;
 
-namespace OrchardCore.Tests.Apis.ContentManagement.DeploymentPlans
+namespace OrchardCore.Tests.Apis.ContentManagement.DeploymentPlans;
+
+public class BlogPostUpdateDeploymentPlanTests
 {
-    public class BlogPostUpdateDeploymentPlanTests
+    [Fact]
+    public async Task ShouldUpdateExistingContentItemVersion()
     {
-        [Fact]
-        public async Task ShouldUpdateExistingContentItemVersion()
+        using var context = new BlogPostDeploymentContext();
+
+        // Setup
+        await context.InitializeAsync();
+
+        // Act
+        var recipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
         {
-            using var context = new BlogPostDeploymentContext();
-
-            // Setup
-            await context.InitializeAsync();
-
-            // Act
-            var recipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
-            {
-                jItem[nameof(ContentItem.DisplayText)] = "existing version mutated";
-            });
-
-            await context.PostRecipeAsync(recipe);
-
-            // Test
-            await context.UsingTenantScopeAsync(async scope =>
-            {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
-                var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
-                    x.ContentType == "BlogPost").ListAsync();
-
-                Assert.Single(blogPosts);
-                var mutatedVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == context.OriginalBlogPostVersionId);
-                Assert.Equal("existing version mutated", mutatedVersion?.DisplayText);
-            });
-        }
-
-        [Fact]
-        public async Task ShouldDiscardDraftThenUpdateExistingContentItemVersion()
+            jItem[nameof(ContentItem.DisplayText)] = "existing version mutated";
+        });
+
+        await context.PostRecipeAsync(recipe);
+
+        // Test
+        await context.UsingTenantScopeAsync(async scope =>
         {
-            using var context = new BlogPostDeploymentContext();
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
+            var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
+                x.ContentType == "BlogPost").ListAsync();
+
+            Assert.Single(blogPosts);
+            var mutatedVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == context.OriginalBlogPostVersionId);
+            Assert.Equal("existing version mutated", mutatedVersion?.DisplayText);
+        });
+    }
 
-            // Setup
-            await context.InitializeAsync();
+    [Fact]
+    public async Task ShouldDiscardDraftThenUpdateExistingContentItemVersion()
+    {
+        using var context = new BlogPostDeploymentContext();
 
-            var content = await context.Client.PostAsJsonAsync("api/content?draft=true", context.OriginalBlogPost);
-            var draftContentItemVersionId = (await content.Content.ReadAsAsync<ContentItem>()).ContentItemVersionId;
+        // Setup
+        await context.InitializeAsync();
 
-            // Act
-            var recipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
-            {
-                jItem[nameof(ContentItem.DisplayText)] = "existing version mutated";
-            });
+        var content = await context.Client.PostAsJsonAsync("api/content?draft=true", context.OriginalBlogPost);
+        var draftContentItemVersionId = (await content.Content.ReadAsAsync<ContentItem>()).ContentItemVersionId;
 
-            await context.PostRecipeAsync(recipe);
+        // Act
+        var recipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
+        {
+            jItem[nameof(ContentItem.DisplayText)] = "existing version mutated";
+        });
 
-            // Test
-            await context.UsingTenantScopeAsync(async scope =>
-            {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
-                var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
-                    x.ContentType == "BlogPost").ListAsync();
+        await context.PostRecipeAsync(recipe);
 
-                Assert.Equal(2, blogPosts.Count());
+        // Test
+        await context.UsingTenantScopeAsync(async scope =>
+        {
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
+            var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
+                x.ContentType == "BlogPost").ListAsync();
 
-                var mutatedVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == context.OriginalBlogPostVersionId);
-                Assert.True(mutatedVersion?.Latest);
-                Assert.True(mutatedVersion?.Published);
-                Assert.Equal("existing version mutated", mutatedVersion?.DisplayText);
+            Assert.Equal(2, blogPosts.Count());
 
-                var draftVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == draftContentItemVersionId);
-                Assert.False(draftVersion.Latest);
-            });
-        }
+            var mutatedVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == context.OriginalBlogPostVersionId);
+            Assert.True(mutatedVersion?.Latest);
+            Assert.True(mutatedVersion?.Published);
+            Assert.Equal("existing version mutated", mutatedVersion?.DisplayText);
+
+            var draftVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == draftContentItemVersionId);
+            Assert.False(draftVersion.Latest);
+        });
+    }
 
-        [Fact]
-        public async Task ShouldUpdateDraftThenPublishExistingContentItemVersion()
+    [Fact]
+    public async Task ShouldUpdateDraftThenPublishExistingContentItemVersion()
+    {
+        using var context = new BlogPostDeploymentContext();
+
+        // Setup
+        await context.InitializeAsync();
+
+        var content = await context.Client.PostAsJsonAsync("api/content?draft=true", context.OriginalBlogPost);
+        var draftContentItem = (await content.Content.ReadAsAsync<ContentItem>());
+
+        // Act
+        var recipe = BlogPostDeploymentContext.GetContentStepRecipe(draftContentItem, jItem =>
+        {
+            jItem[nameof(ContentItem.DisplayText)] = "draft version mutated";
+            jItem[nameof(ContentItem.Published)] = true;
+            jItem[nameof(ContentItem.Latest)] = true;
+        });
+
+        await context.PostRecipeAsync(recipe);
+
+        // Test
+        await context.UsingTenantScopeAsync(async scope =>
         {
-            using var context = new BlogPostDeploymentContext();
-
-            // Setup
-            await context.InitializeAsync();
-
-            var content = await context.Client.PostAsJsonAsync("api/content?draft=true", context.OriginalBlogPost);
-            var draftContentItem = (await content.Content.ReadAsAsync<ContentItem>());
-
-            // Act
-            var recipe = BlogPostDeploymentContext.GetContentStepRecipe(draftContentItem, jItem =>
-            {
-                jItem[nameof(ContentItem.DisplayText)] = "draft version mutated";
-                jItem[nameof(ContentItem.Published)] = true;
-                jItem[nameof(ContentItem.Latest)] = true;
-            });
-
-            await context.PostRecipeAsync(recipe);
-
-            // Test
-            await context.UsingTenantScopeAsync(async scope =>
-            {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
-                var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
-                    x.ContentType == "BlogPost").ListAsync();
-
-                Assert.Equal(2, blogPosts.Count());
-
-                var originalVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == context.OriginalBlogPostVersionId);
-                Assert.False(originalVersion?.Latest);
-                Assert.False(originalVersion?.Published);
-
-                var draftVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == draftContentItem.ContentItemVersionId);
-                Assert.True(draftVersion?.Latest);
-                Assert.True(draftVersion?.Published);
-                Assert.Equal("draft version mutated", draftVersion?.DisplayText);
-            });
-        }
+            var session = scope.ServiceProvider.GetRequiredService<ISession>();
+            var blogPosts = await session.Query<ContentItem, ContentItemIndex>(x =>
+                x.ContentType == "BlogPost").ListAsync();
+
+            Assert.Equal(2, blogPosts.Count());
+
+            var originalVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == context.OriginalBlogPostVersionId);
+            Assert.False(originalVersion?.Latest);
+            Assert.False(originalVersion?.Published);
+
+            var draftVersion = blogPosts.FirstOrDefault(x => x.ContentItemVersionId == draftContentItem.ContentItemVersionId);
+            Assert.True(draftVersion?.Latest);
+            Assert.True(draftVersion?.Published);
+            Assert.Equal("draft version mutated", draftVersion?.DisplayText);
+        });
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/ContentManagement/DeploymentPlans/ContentStepLuceneQueryTests.cs b/test/OrchardCore.Tests/Apis/ContentManagement/DeploymentPlans/ContentStepLuceneQueryTests.cs
index b9a180a298c..23fe26ad81f 100644
--- a/test/OrchardCore.Tests/Apis/ContentManagement/DeploymentPlans/ContentStepLuceneQueryTests.cs
+++ b/test/OrchardCore.Tests/Apis/ContentManagement/DeploymentPlans/ContentStepLuceneQueryTests.cs
@@ -3,52 +3,51 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Tests.Apis.Context;
 
-namespace OrchardCore.Tests.Apis.ContentManagement.DeploymentPlans
+namespace OrchardCore.Tests.Apis.ContentManagement.DeploymentPlans;
+
+public class ContentStepLuceneQueryTests
 {
-    public class ContentStepLuceneQueryTests
+    [Fact]
+    public async Task ShouldUpdateLuceneIndexesOnImport()
     {
-        [Fact]
-        public async Task ShouldUpdateLuceneIndexesOnImport()
-        {
-            using var context = new BlogPostDeploymentContext();
+        using var context = new BlogPostDeploymentContext();
 
-            // Setup
-            await context.InitializeAsync();
+        // Setup
+        await context.InitializeAsync();
 
-            // Act
-            var recipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
+        // Act
+        var recipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
+        {
+            jItem[nameof(ContentItem.ContentItemVersionId)] = "newVersion";
+            jItem[nameof(ContentItem.DisplayText)] = "new version";
+        });
+
+        // Create a second content item in the recipe data so we can confirm the behavior
+        // of the LuceneIndexingContentHandler.
+        var data = recipe["steps"][0]["Data"].AsArray();
+        var secondContentItem = JObject.FromObject(context.OriginalBlogPost);
+        secondContentItem[nameof(ContentItem.ContentItemId)] = "secondcontentitemid";
+        secondContentItem[nameof(ContentItem.ContentItemVersionId)] = "secondcontentitemversionid";
+        secondContentItem[nameof(ContentItem.DisplayText)] = "second content item display text";
+        secondContentItem[nameof(AutoroutePart)][nameof(AutoroutePart.Path)] = "new-path";
+        data.Add(secondContentItem);
+
+        await context.PostRecipeAsync(recipe);
+
+        // Test
+        var result = await context
+            .GraphQLClient
+            .Content
+            .Query("RecentBlogPosts", builder =>
             {
-                jItem[nameof(ContentItem.ContentItemVersionId)] = "newVersion";
-                jItem[nameof(ContentItem.DisplayText)] = "new version";
+                builder
+                    .WithField("displayText");
             });
 
-            // Create a second content item in the recipe data so we can confirm the behavior
-            // of the LuceneIndexingContentHandler.
-            var data = recipe["steps"][0]["Data"].AsArray();
-            var secondContentItem = JObject.FromObject(context.OriginalBlogPost);
-            secondContentItem[nameof(ContentItem.ContentItemId)] = "secondcontentitemid";
-            secondContentItem[nameof(ContentItem.ContentItemVersionId)] = "secondcontentitemversionid";
-            secondContentItem[nameof(ContentItem.DisplayText)] = "second content item display text";
-            secondContentItem[nameof(AutoroutePart)][nameof(AutoroutePart.Path)] = "new-path";
-            data.Add(secondContentItem);
-
-            await context.PostRecipeAsync(recipe);
-
-            // Test
-            var result = await context
-                .GraphQLClient
-                .Content
-                .Query("RecentBlogPosts", builder =>
-                {
-                    builder
-                        .WithField("displayText");
-                });
-
-            var nodes = result["data"]["recentBlogPosts"];
-
-            Assert.Equal(2, nodes.AsArray().Count);
-            Assert.Equal("new version", nodes[0]["displayText"].ToString());
-            Assert.Equal("second content item display text", nodes[1]["displayText"].ToString());
-        }
+        var nodes = result["data"]["recentBlogPosts"];
+
+        Assert.Equal(2, nodes.AsArray().Count);
+        Assert.Equal("new version", nodes[0]["displayText"].ToString());
+        Assert.Equal("second content item display text", nodes[1]["displayText"].ToString());
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/Context/AgencyContext.cs b/test/OrchardCore.Tests/Apis/Context/AgencyContext.cs
index e0bf460b3f8..67826cf45ad 100644
--- a/test/OrchardCore.Tests/Apis/Context/AgencyContext.cs
+++ b/test/OrchardCore.Tests/Apis/Context/AgencyContext.cs
@@ -1,14 +1,13 @@
-namespace OrchardCore.Tests.Apis.Context
+namespace OrchardCore.Tests.Apis.Context;
+
+public class AgencyContext : SiteContext
 {
-    public class AgencyContext : SiteContext
+    static AgencyContext()
     {
-        static AgencyContext()
-        {
-        }
+    }
 
-        public AgencyContext()
-        {
-            this.WithRecipe("Agency");
-        }
+    public AgencyContext()
+    {
+        this.WithRecipe("Agency");
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/Context/AuthenticationContext.cs b/test/OrchardCore.Tests/Apis/Context/AuthenticationContext.cs
index 5fc75dec3f0..1bbeda67f25 100644
--- a/test/OrchardCore.Tests/Apis/Context/AuthenticationContext.cs
+++ b/test/OrchardCore.Tests/Apis/Context/AuthenticationContext.cs
@@ -1,107 +1,106 @@
 using OrchardCore.Security;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Tests.Apis.Context
+namespace OrchardCore.Tests.Apis.Context;
+
+internal sealed class PermissionContextAuthorizationHandler : AuthorizationHandler<PermissionRequirement>
 {
-    internal sealed class PermissionContextAuthorizationHandler : AuthorizationHandler<PermissionRequirement>
+    private readonly PermissionsContext _permissionsContext;
+
+    // Used for http based graphql tests, marries a permission context to a request
+    public PermissionContextAuthorizationHandler(IHttpContextAccessor httpContextAccessor, IDictionary<string, PermissionsContext> permissionsContexts)
     {
-        private readonly PermissionsContext _permissionsContext;
+        _permissionsContext = new PermissionsContext();
 
-        // Used for http based graphql tests, marries a permission context to a request
-        public PermissionContextAuthorizationHandler(IHttpContextAccessor httpContextAccessor, IDictionary<string, PermissionsContext> permissionsContexts)
+        if (httpContextAccessor.HttpContext == null)
         {
-            _permissionsContext = new PermissionsContext();
-
-            if (httpContextAccessor.HttpContext == null)
-            {
-                return;
-            }
-
-            var requestContext = httpContextAccessor.HttpContext.Request;
-
-            if (requestContext?.Headers.ContainsKey("PermissionsContext") == true &&
-                permissionsContexts.TryGetValue(requestContext.Headers["PermissionsContext"], out var permissionsContext))
-            {
-                _permissionsContext = permissionsContext;
-            }
+            return;
         }
 
-        // Used for static graphql test; passes a permissionsContext directly
-        public PermissionContextAuthorizationHandler(PermissionsContext permissionsContext)
+        var requestContext = httpContextAccessor.HttpContext.Request;
+
+        if (requestContext?.Headers.ContainsKey("PermissionsContext") == true &&
+            permissionsContexts.TryGetValue(requestContext.Headers["PermissionsContext"], out var permissionsContext))
         {
             _permissionsContext = permissionsContext;
         }
+    }
+
+    // Used for static graphql test; passes a permissionsContext directly
+    public PermissionContextAuthorizationHandler(PermissionsContext permissionsContext)
+    {
+        _permissionsContext = permissionsContext;
+    }
+
+    protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement)
+    {
+        var permissions = (_permissionsContext.AuthorizedPermissions ?? []).ToList();
 
-        protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement)
+        if (!_permissionsContext.UsePermissionsContext)
+        {
+            context.Succeed(requirement);
+        }
+        else if (permissions.Contains(requirement.Permission))
         {
-            var permissions = (_permissionsContext.AuthorizedPermissions ?? []).ToList();
+            context.Succeed(requirement);
+        }
+        else
+        {
+            var grantingNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
-            if (!_permissionsContext.UsePermissionsContext)
-            {
-                context.Succeed(requirement);
-            }
-            else if (permissions.Contains(requirement.Permission))
+            GetGrantingNamesInternal(requirement.Permission, grantingNames);
+
+            // SiteOwner permission grants them all
+            grantingNames.Add(StandardPermissions.SiteOwner.Name);
+
+            if (permissions.Any(p => grantingNames.Contains(p.Name)))
             {
                 context.Succeed(requirement);
             }
             else
             {
-                var grantingNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-
-                GetGrantingNamesInternal(requirement.Permission, grantingNames);
-
-                // SiteOwner permission grants them all
-                grantingNames.Add(StandardPermissions.SiteOwner.Name);
-
-                if (permissions.Any(p => grantingNames.Contains(p.Name)))
-                {
-                    context.Succeed(requirement);
-                }
-                else
-                {
-                    context.Fail();
-                }
+                context.Fail();
             }
-
-            return Task.CompletedTask;
         }
 
-        private static void GetGrantingNamesInternal(Permission permission, HashSet<string> stack)
-        {
-            // The given name is tested
-            stack.Add(permission.Name);
+        return Task.CompletedTask;
+    }
 
-            // Iterate implied permissions to grant, it present
-            if (permission.ImpliedBy != null && permission.ImpliedBy.Any())
+    private static void GetGrantingNamesInternal(Permission permission, HashSet<string> stack)
+    {
+        // The given name is tested
+        stack.Add(permission.Name);
+
+        // Iterate implied permissions to grant, it present
+        if (permission.ImpliedBy != null && permission.ImpliedBy.Any())
+        {
+            foreach (var impliedBy in permission.ImpliedBy)
             {
-                foreach (var impliedBy in permission.ImpliedBy)
+                // Avoid potential recursion
+                if (impliedBy == null || stack.Contains(impliedBy.Name))
                 {
-                    // Avoid potential recursion
-                    if (impliedBy == null || stack.Contains(impliedBy.Name))
-                    {
-                        continue;
-                    }
-
-                    // Otherwise accumulate the implied permission names recursively
-                    GetGrantingNamesInternal(impliedBy, stack);
+                    continue;
                 }
+
+                // Otherwise accumulate the implied permission names recursively
+                GetGrantingNamesInternal(impliedBy, stack);
             }
         }
     }
+}
 
-    public class PermissionsContext
-    {
-        public IEnumerable<Permission> AuthorizedPermissions { get; set; } = [];
+public class PermissionsContext
+{
+    public IEnumerable<Permission> AuthorizedPermissions { get; set; } = [];
 
-        public bool UsePermissionsContext { get; set; }
-    }
+    public bool UsePermissionsContext { get; set; }
+}
 
-    internal sealed class StubIdentity : IIdentity
-    {
-        public string AuthenticationType => "TEST TEST";
+internal sealed class StubIdentity : IIdentity
+{
+    public string AuthenticationType => "TEST TEST";
 
-        public bool IsAuthenticated => true;
+    public bool IsAuthenticated => true;
 
-        public string Name => "Mr Robot";
-    }
+    public string Name => "Mr Robot";
 }
diff --git a/test/OrchardCore.Tests/Apis/Context/BlogContext.cs b/test/OrchardCore.Tests/Apis/Context/BlogContext.cs
index f93dcc10314..8915c3572ef 100644
--- a/test/OrchardCore.Tests/Apis/Context/BlogContext.cs
+++ b/test/OrchardCore.Tests/Apis/Context/BlogContext.cs
@@ -1,34 +1,33 @@
 using OrchardCore.Recipes;
 
-namespace OrchardCore.Tests.Apis.Context
+namespace OrchardCore.Tests.Apis.Context;
+
+public class BlogContext : SiteContext
 {
-    public class BlogContext : SiteContext
-    {
-        public const string luceneRecipePath = $"Areas/TheBlogTheme/{RecipesConstants.RecipesFolderName}";
-        public const string luceneRecipeName = $"blog.lucene.query{RecipesConstants.RecipeExtension}";
-        public const string luceneIndexName = "Search";
+    public const string luceneRecipePath = $"Areas/TheBlogTheme/{RecipesConstants.RecipesFolderName}";
+    public const string luceneRecipeName = $"blog.lucene.query{RecipesConstants.RecipeExtension}";
+    public const string luceneIndexName = "Search";
 
-        public string BlogContentItemId { get; private set; }
+    public string BlogContentItemId { get; private set; }
 
-        static BlogContext()
-        {
-        }
+    static BlogContext()
+    {
+    }
 
-        public override async Task InitializeAsync()
-        {
-            await base.InitializeAsync();
-            await RunRecipeAsync(luceneRecipeName, luceneRecipePath);
-            await ResetLuceneIndiciesAsync(luceneIndexName);
+    public override async Task InitializeAsync()
+    {
+        await base.InitializeAsync();
+        await RunRecipeAsync(luceneRecipeName, luceneRecipePath);
+        await ResetLuceneIndiciesAsync(luceneIndexName);
 
-            var result = await GraphQLClient
-                .Content
-                .Query("blog", builder =>
-                {
-                    builder
-                        .WithField("contentItemId");
-                });
+        var result = await GraphQLClient
+            .Content
+            .Query("blog", builder =>
+            {
+                builder
+                    .WithField("contentItemId");
+            });
 
-            BlogContentItemId = result["data"]["blog"][0]["contentItemId"].ToString();
-        }
+        BlogContentItemId = result["data"]["blog"][0]["contentItemId"].ToString();
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/Context/BlogPostApiControllerContext.cs b/test/OrchardCore.Tests/Apis/Context/BlogPostApiControllerContext.cs
index 45e4e1d6c57..00e8aa61a02 100644
--- a/test/OrchardCore.Tests/Apis/Context/BlogPostApiControllerContext.cs
+++ b/test/OrchardCore.Tests/Apis/Context/BlogPostApiControllerContext.cs
@@ -1,40 +1,39 @@
 using OrchardCore.Apis.GraphQL.Client;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Tests.Apis.Context
+namespace OrchardCore.Tests.Apis.Context;
+
+public class BlogPostApiControllerContext : SiteContext
 {
-    public class BlogPostApiControllerContext : SiteContext
-    {
-        public string BlogContentItemId { get; private set; }
-        public ContentItem BlogPost { get; private set; }
-        public string CategoriesTaxonomyContentItemId { get; private set; }
-        public string TagsTaxonomyContentItemId { get; private set; }
+    public string BlogContentItemId { get; private set; }
+    public ContentItem BlogPost { get; private set; }
+    public string CategoriesTaxonomyContentItemId { get; private set; }
+    public string TagsTaxonomyContentItemId { get; private set; }
 
-        static BlogPostApiControllerContext()
-        {
-        }
+    static BlogPostApiControllerContext()
+    {
+    }
 
-        public override async Task InitializeAsync()
-        {
-            await base.InitializeAsync();
+    public override async Task InitializeAsync()
+    {
+        await base.InitializeAsync();
 
-            var body = new ContentTypeQueryResourceBuilder("blogPost")
-                    .WithField("contentItemId").Build() +
-                 new ContentTypeQueryResourceBuilder("blog")
-                    .WithField("contentItemId").Build() +
-                 new ContentTypeQueryResourceBuilder("taxonomy")
-                    .WithField("contentItemId").Build();
+        var body = new ContentTypeQueryResourceBuilder("blogPost")
+                .WithField("contentItemId").Build() +
+             new ContentTypeQueryResourceBuilder("blog")
+                .WithField("contentItemId").Build() +
+             new ContentTypeQueryResourceBuilder("taxonomy")
+                .WithField("contentItemId").Build();
 
-            var result = await GraphQLClient.Content.Query(body);
+        var result = await GraphQLClient.Content.Query(body);
 
-            var blogPostContentItemId = result["data"]["blogPost"].AsArray()[0]["contentItemId"].ToString();
+        var blogPostContentItemId = result["data"]["blogPost"].AsArray()[0]["contentItemId"].ToString();
 
-            var content = await Client.GetAsync($"api/content/{blogPostContentItemId}");
-            BlogPost = await content.Content.ReadAsAsync<ContentItem>();
+        var content = await Client.GetAsync($"api/content/{blogPostContentItemId}");
+        BlogPost = await content.Content.ReadAsAsync<ContentItem>();
 
-            BlogContentItemId = result["data"]["blog"].AsArray()[0]["contentItemId"].ToString();
+        BlogContentItemId = result["data"]["blog"].AsArray()[0]["contentItemId"].ToString();
 
-            TagsTaxonomyContentItemId = result["data"]["taxonomy"][1]["contentItemId"].ToString();
-        }
+        TagsTaxonomyContentItemId = result["data"]["taxonomy"][1]["contentItemId"].ToString();
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/Context/BlogPostDeploymentContext.cs b/test/OrchardCore.Tests/Apis/Context/BlogPostDeploymentContext.cs
index a70f524020f..97bc5f6faa7 100644
--- a/test/OrchardCore.Tests/Apis/Context/BlogPostDeploymentContext.cs
+++ b/test/OrchardCore.Tests/Apis/Context/BlogPostDeploymentContext.cs
@@ -4,93 +4,92 @@
 using OrchardCore.Deployment.Remote.Services;
 using OrchardCore.Deployment.Remote.ViewModels;
 
-namespace OrchardCore.Tests.Apis.Context
+namespace OrchardCore.Tests.Apis.Context;
+
+public class BlogPostDeploymentContext : SiteContext
 {
-    public class BlogPostDeploymentContext : SiteContext
+    public const string RemoteDeploymentClientName = "testserver";
+    public const string RemoteDeploymentApiKey = "testkey";
+    public string BlogPostContentItemId { get; private set; }
+    public ContentItem OriginalBlogPost { get; private set; }
+    public string OriginalBlogPostVersionId { get; private set; }
+
+    static BlogPostDeploymentContext()
     {
-        public const string RemoteDeploymentClientName = "testserver";
-        public const string RemoteDeploymentApiKey = "testkey";
-        public string BlogPostContentItemId { get; private set; }
-        public ContentItem OriginalBlogPost { get; private set; }
-        public string OriginalBlogPostVersionId { get; private set; }
+    }
 
-        static BlogPostDeploymentContext()
-        {
-        }
+    public override async Task InitializeAsync()
+    {
+        await base.InitializeAsync();
+        await RunRecipeAsync(BlogContext.luceneRecipeName, BlogContext.luceneRecipePath);
 
-        public override async Task InitializeAsync()
-        {
-            await base.InitializeAsync();
-            await RunRecipeAsync(BlogContext.luceneRecipeName, BlogContext.luceneRecipePath);
+        var result = await GraphQLClient
+            .Content
+            .Query("blogPost", builder =>
+            {
+                builder
+                    .WithField("contentItemId");
+            });
 
-            var result = await GraphQLClient
-                .Content
-                .Query("blogPost", builder =>
-                {
-                    builder
-                        .WithField("contentItemId");
-                });
+        BlogPostContentItemId = result["data"]["blogPost"][0]["contentItemId"].ToString();
 
-            BlogPostContentItemId = result["data"]["blogPost"][0]["contentItemId"].ToString();
+        var content = await Client.GetAsync($"api/content/{BlogPostContentItemId}");
+        OriginalBlogPost = await content.Content.ReadAsAsync<ContentItem>();
+        OriginalBlogPostVersionId = OriginalBlogPost.ContentItemVersionId;
 
-            var content = await Client.GetAsync($"api/content/{BlogPostContentItemId}");
-            OriginalBlogPost = await content.Content.ReadAsAsync<ContentItem>();
-            OriginalBlogPostVersionId = OriginalBlogPost.ContentItemVersionId;
+        await UsingTenantScopeAsync(async scope =>
+        {
+            var remoteClientService = scope.ServiceProvider.GetRequiredService<RemoteClientService>();
 
-            await UsingTenantScopeAsync(async scope =>
-            {
-                var remoteClientService = scope.ServiceProvider.GetRequiredService<RemoteClientService>();
+            await remoteClientService.CreateRemoteClientAsync(RemoteDeploymentClientName, RemoteDeploymentApiKey);
+        });
+    }
 
-                await remoteClientService.CreateRemoteClientAsync(RemoteDeploymentClientName, RemoteDeploymentApiKey);
-            });
-        }
+    public static JsonObject GetContentStepRecipe(ContentItem contentItem, Action<JsonObject> mutation)
+    {
+        var jContentItem = JObject.FromObject(contentItem);
+        mutation.Invoke(jContentItem);
 
-        public static JsonObject GetContentStepRecipe(ContentItem contentItem, Action<JsonObject> mutation)
+        var recipe = new JsonObject
         {
-            var jContentItem = JObject.FromObject(contentItem);
-            mutation.Invoke(jContentItem);
-
-            var recipe = new JsonObject
+            ["steps"] = new JsonArray
             {
-                ["steps"] = new JsonArray
+                new JsonObject
                 {
-                    new JsonObject
-                    {
-                        ["name"] = "content",
-                        ["Data"] = new JsonArray { jContentItem }
-                    }
+                    ["name"] = "content",
+                    ["Data"] = new JsonArray { jContentItem }
                 }
-            };
+            }
+        };
 
-            return recipe;
-        }
+        return recipe;
+    }
 
-        public async Task<HttpResponseMessage> PostRecipeAsync(JsonObject recipe, bool ensureSuccess = true)
+    public async Task<HttpResponseMessage> PostRecipeAsync(JsonObject recipe, bool ensureSuccess = true)
+    {
+        using var zipStream = new MemoryStream();
+        using (var zip = new ZipArchive(zipStream, ZipArchiveMode.Create, true))
         {
-            using var zipStream = new MemoryStream();
-            using (var zip = new ZipArchive(zipStream, ZipArchiveMode.Create, true))
-            {
-                var entry = zip.CreateEntry("Recipe.json");
-                using var streamWriter = new Utf8JsonWriter(entry.Open());
-                recipe.WriteTo(streamWriter);
-            }
-
-            zipStream.Position = 0;
+            var entry = zip.CreateEntry("Recipe.json");
+            using var streamWriter = new Utf8JsonWriter(entry.Open());
+            recipe.WriteTo(streamWriter);
+        }
 
-            using var requestContent = new MultipartFormDataContent
-            {
-                { new StreamContent(zipStream), nameof(ImportViewModel.Content), "Recipe.zip" },
-                { new StringContent(RemoteDeploymentClientName), nameof(ImportViewModel.ClientName) },
-                { new StringContent(RemoteDeploymentApiKey), nameof(ImportViewModel.ApiKey) },
-            };
+        zipStream.Position = 0;
 
-            var response = await Client.PostAsync("OrchardCore.Deployment.Remote/ImportRemoteInstance/Import", requestContent);
-            if (ensureSuccess)
-            {
-                response.EnsureSuccessStatusCode();
-            }
+        using var requestContent = new MultipartFormDataContent
+        {
+            { new StreamContent(zipStream), nameof(ImportViewModel.Content), "Recipe.zip" },
+            { new StringContent(RemoteDeploymentClientName), nameof(ImportViewModel.ClientName) },
+            { new StringContent(RemoteDeploymentApiKey), nameof(ImportViewModel.ApiKey) },
+        };
 
-            return response;
+        var response = await Client.PostAsync("OrchardCore.Deployment.Remote/ImportRemoteInstance/Import", requestContent);
+        if (ensureSuccess)
+        {
+            response.EnsureSuccessStatusCode();
         }
+
+        return response;
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/Context/Extensions/HttpContentExtensions.cs b/test/OrchardCore.Tests/Apis/Context/Extensions/HttpContentExtensions.cs
index 9db2c945bf6..70cf01743a9 100644
--- a/test/OrchardCore.Tests/Apis/Context/Extensions/HttpContentExtensions.cs
+++ b/test/OrchardCore.Tests/Apis/Context/Extensions/HttpContentExtensions.cs
@@ -1,16 +1,15 @@
 using System.Text.Json;
 
-namespace OrchardCore.Tests.Apis.Context
+namespace OrchardCore.Tests.Apis.Context;
+
+internal static class HttpContentExtensions
 {
-    internal static class HttpContentExtensions
+    public static async Task<T> ReadAsAsync<T>(this HttpContent content)
     {
-        public static async Task<T> ReadAsAsync<T>(this HttpContent content)
-        {
-            using var data = await content.ReadAsStreamAsync();
-            return await data.ReadAsAsync<T>();
-        }
-
-        public static ValueTask<T> ReadAsAsync<T>(this Stream stream) =>
-            JsonSerializer.DeserializeAsync<T>(stream, JOptions.Default);
+        using var data = await content.ReadAsStreamAsync();
+        return await data.ReadAsAsync<T>();
     }
+
+    public static ValueTask<T> ReadAsAsync<T>(this Stream stream) =>
+        JsonSerializer.DeserializeAsync<T>(stream, JOptions.Default);
 }
diff --git a/test/OrchardCore.Tests/Apis/Context/Extensions/HttpRequestExtensions.cs b/test/OrchardCore.Tests/Apis/Context/Extensions/HttpRequestExtensions.cs
index b8af0735c68..3663a6a6ea9 100644
--- a/test/OrchardCore.Tests/Apis/Context/Extensions/HttpRequestExtensions.cs
+++ b/test/OrchardCore.Tests/Apis/Context/Extensions/HttpRequestExtensions.cs
@@ -1,196 +1,195 @@
 using System.Text.Json;
 
-namespace OrchardCore.Tests.Apis.Context
+namespace OrchardCore.Tests.Apis.Context;
+
+/// <summary>
+/// The http request extensions.
+/// </summary>
+internal static class HttpRequestExtensions
 {
     /// <summary>
-    /// The http request extensions.
+    /// The patch as json async.
     /// </summary>
-    internal static class HttpRequestExtensions
+    /// <param name="client">
+    /// The client.
+    /// </param>
+    /// <param name="requestUri">
+    /// The request uri.
+    /// </param>
+    /// <param name="value">
+    /// The value.
+    /// </param>
+    /// <param name="settings">
+    /// The serializer settings.
+    /// </param>
+    /// <typeparam name="T">
+    /// </typeparam>
+    /// <returns>
+    /// The <see cref="Task"/>.
+    /// </returns>
+    public static Task<HttpResponseMessage> PatchAsJsonAsync<T>(
+        this HttpClient client,
+        string requestUri,
+        T value,
+        JsonSerializerOptions options = null)
     {
-        /// <summary>
-        /// The patch as json async.
-        /// </summary>
-        /// <param name="client">
-        /// The client.
-        /// </param>
-        /// <param name="requestUri">
-        /// The request uri.
-        /// </param>
-        /// <param name="value">
-        /// The value.
-        /// </param>
-        /// <param name="settings">
-        /// The serializer settings.
-        /// </param>
-        /// <typeparam name="T">
-        /// </typeparam>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        public static Task<HttpResponseMessage> PatchAsJsonAsync<T>(
-            this HttpClient client,
-            string requestUri,
-            T value,
-            JsonSerializerOptions options = null)
-        {
-            var content = new StringContent(
-                JConvert.SerializeObject(value, options),
-                Encoding.UTF8,
-                "application/json");
-
-            return PatchAsync(client, requestUri, content);
-        }
-
-        /// <summary>
-        /// The patch async.
-        /// </summary>
-        /// <param name="client">
-        /// The client.
-        /// </param>
-        /// <param name="requestUri">
-        /// The request uri.
-        /// </param>
-        /// <param name="content">
-        /// The content.
-        /// </param>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        public static Task<HttpResponseMessage> PatchAsync(
-            this HttpClient client,
-            string requestUri,
-            HttpContent content)
-        {
-            var request = new HttpRequestMessage
-            {
-                Method = new HttpMethod("PATCH"),
-                RequestUri = new Uri(client.BaseAddress + requestUri),
-                Content = content,
-            };
-
-            request.Headers.ExpectContinue = false;
-            return client.SendAsync(request);
-        }
-
-        /// <summary>
-        /// The put as json async.
-        /// </summary>
-        /// <param name="client">
-        /// The client.
-        /// </param>
-        /// <param name="requestUri">
-        /// The request uri.
-        /// </param>
-        /// <param name="value">
-        /// The value.
-        /// </param>
-        /// <param name="settings">
-        /// The serializer settings.
-        /// </param>
-        /// <typeparam name="T">
-        /// </typeparam>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        public static Task<HttpResponseMessage> PutAsJsonAsync<T>(
-            this HttpClient client,
-            string requestUri,
-            T value,
-            JsonSerializerOptions options = null)
+        var content = new StringContent(
+            JConvert.SerializeObject(value, options),
+            Encoding.UTF8,
+            "application/json");
+
+        return PatchAsync(client, requestUri, content);
+    }
+
+    /// <summary>
+    /// The patch async.
+    /// </summary>
+    /// <param name="client">
+    /// The client.
+    /// </param>
+    /// <param name="requestUri">
+    /// The request uri.
+    /// </param>
+    /// <param name="content">
+    /// The content.
+    /// </param>
+    /// <returns>
+    /// The <see cref="Task"/>.
+    /// </returns>
+    public static Task<HttpResponseMessage> PatchAsync(
+        this HttpClient client,
+        string requestUri,
+        HttpContent content)
+    {
+        var request = new HttpRequestMessage
         {
-            var content = new StringContent(
-                JConvert.SerializeObject(value, options),
-                Encoding.UTF8,
-                "application/json");
-
-            return client.PutAsync(requestUri, content);
-        }
-
-        /// <summary>
-        /// PostAsJsonAsync
-        /// </summary>
-        /// <param name="client">
-        /// The client.
-        /// </param>
-        /// <param name="requestUri">
-        /// The request uri.
-        /// </param>
-        /// <param name="value">
-        /// The value.
-        /// </param>
-        /// <param name="settings">
-        /// The serializer settings.
-        /// </param>
-        /// <typeparam name="T">
-        /// </typeparam>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        public static Task<HttpResponseMessage> PostAsJsonAsync<T>(
-            this HttpClient client,
-            string requestUri,
-            T value,
-            JsonSerializerOptions options = null)
+            Method = new HttpMethod("PATCH"),
+            RequestUri = new Uri(client.BaseAddress + requestUri),
+            Content = content,
+        };
+
+        request.Headers.ExpectContinue = false;
+        return client.SendAsync(request);
+    }
+
+    /// <summary>
+    /// The put as json async.
+    /// </summary>
+    /// <param name="client">
+    /// The client.
+    /// </param>
+    /// <param name="requestUri">
+    /// The request uri.
+    /// </param>
+    /// <param name="value">
+    /// The value.
+    /// </param>
+    /// <param name="settings">
+    /// The serializer settings.
+    /// </param>
+    /// <typeparam name="T">
+    /// </typeparam>
+    /// <returns>
+    /// The <see cref="Task"/>.
+    /// </returns>
+    public static Task<HttpResponseMessage> PutAsJsonAsync<T>(
+        this HttpClient client,
+        string requestUri,
+        T value,
+        JsonSerializerOptions options = null)
+    {
+        var content = new StringContent(
+            JConvert.SerializeObject(value, options),
+            Encoding.UTF8,
+            "application/json");
+
+        return client.PutAsync(requestUri, content);
+    }
+
+    /// <summary>
+    /// PostAsJsonAsync
+    /// </summary>
+    /// <param name="client">
+    /// The client.
+    /// </param>
+    /// <param name="requestUri">
+    /// The request uri.
+    /// </param>
+    /// <param name="value">
+    /// The value.
+    /// </param>
+    /// <param name="settings">
+    /// The serializer settings.
+    /// </param>
+    /// <typeparam name="T">
+    /// </typeparam>
+    /// <returns>
+    /// The <see cref="Task"/>.
+    /// </returns>
+    public static Task<HttpResponseMessage> PostAsJsonAsync<T>(
+        this HttpClient client,
+        string requestUri,
+        T value,
+        JsonSerializerOptions options = null)
+    {
+        var content = new StringContent(
+            JConvert.SerializeObject(value, options),
+            Encoding.UTF8,
+            "application/json");
+
+        var request = new HttpRequestMessage(HttpMethod.Post, requestUri)
         {
-            var content = new StringContent(
-                JConvert.SerializeObject(value, options),
-                Encoding.UTF8,
-                "application/json");
-
-            var request = new HttpRequestMessage(HttpMethod.Post, requestUri)
-            {
-                Content = content,
-            };
-
-            request.Headers
-                .Accept
-                .Add(new MediaTypeWithQualityHeaderValue("application/json"));
-
-            return client.SendAsync(request);
-        }
-
-        public static Task<HttpResponseMessage> PostJsonAsync(
-            this HttpClient client,
-            string requestUri,
-            string json)
+            Content = content,
+        };
+
+        request.Headers
+            .Accept
+            .Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+        return client.SendAsync(request);
+    }
+
+    public static Task<HttpResponseMessage> PostJsonAsync(
+        this HttpClient client,
+        string requestUri,
+        string json)
+    {
+        var content = new StringContent(
+            json,
+            Encoding.UTF8,
+            "application/json");
+
+        var request = new HttpRequestMessage(HttpMethod.Post, requestUri)
         {
-            var content = new StringContent(
-                json,
-                Encoding.UTF8,
-                "application/json");
-
-            var request = new HttpRequestMessage(HttpMethod.Post, requestUri)
-            {
-                Content = content,
-            };
-
-            request.Headers
-                .Accept
-                .Add(new MediaTypeWithQualityHeaderValue("application/json"));
-
-            return client.SendAsync(request);
-        }
-
-        public static Task<HttpResponseMessage> PostJsonApiAsync(
-            this HttpClient client,
-            string requestUri,
-            string json)
+            Content = content,
+        };
+
+        request.Headers
+            .Accept
+            .Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+        return client.SendAsync(request);
+    }
+
+    public static Task<HttpResponseMessage> PostJsonApiAsync(
+        this HttpClient client,
+        string requestUri,
+        string json)
+    {
+        var content = new StringContent(
+            json,
+            Encoding.UTF8,
+            "application/vnd.api+json");
+
+        var request = new HttpRequestMessage(HttpMethod.Post, requestUri)
         {
-            var content = new StringContent(
-                json,
-                Encoding.UTF8,
-                "application/vnd.api+json");
-
-            var request = new HttpRequestMessage(HttpMethod.Post, requestUri)
-            {
-                Content = content,
-            };
-
-            request.Headers
-                .Accept
-                .Add(new MediaTypeWithQualityHeaderValue("application/vnd.api+json"));
-
-            return client.SendAsync(request);
-        }
+            Content = content,
+        };
+
+        request.Headers
+            .Accept
+            .Add(new MediaTypeWithQualityHeaderValue("application/vnd.api+json"));
+
+        return client.SendAsync(request);
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/Context/MvcTestFixture.cs b/test/OrchardCore.Tests/Apis/Context/MvcTestFixture.cs
index 39344a8b46c..75e8b051548 100644
--- a/test/OrchardCore.Tests/Apis/Context/MvcTestFixture.cs
+++ b/test/OrchardCore.Tests/Apis/Context/MvcTestFixture.cs
@@ -1,29 +1,28 @@
-namespace OrchardCore.Tests.Apis.Context
+namespace OrchardCore.Tests.Apis.Context;
+
+public class OrchardTestFixture<TStartup> : WebApplicationFactory<TStartup>
+    where TStartup : class
 {
-    public class OrchardTestFixture<TStartup> : WebApplicationFactory<TStartup>
-        where TStartup : class
+    protected override void ConfigureWebHost(IWebHostBuilder builder)
     {
-        protected override void ConfigureWebHost(IWebHostBuilder builder)
-        {
-            var shellsApplicationDataPath = Path.Combine(Directory.GetCurrentDirectory(), "App_Data");
-
-            if (Directory.Exists(shellsApplicationDataPath))
-            {
-                Directory.Delete(shellsApplicationDataPath, true);
-            }
-
-            builder.UseContentRoot(Directory.GetCurrentDirectory());
-        }
+        var shellsApplicationDataPath = Path.Combine(Directory.GetCurrentDirectory(), "App_Data");
 
-        protected override IWebHostBuilder CreateWebHostBuilder()
+        if (Directory.Exists(shellsApplicationDataPath))
         {
-            return WebHostBuilderFactory.CreateFromAssemblyEntryPoint(
-                typeof(Program).Assembly, []);
+            Directory.Delete(shellsApplicationDataPath, true);
         }
 
-        protected override IHostBuilder CreateHostBuilder()
-            => Host.CreateDefaultBuilder()
-                .ConfigureWebHostDefaults(webBuilder =>
-                    webBuilder.UseStartup<TStartup>());
+        builder.UseContentRoot(Directory.GetCurrentDirectory());
     }
+
+    protected override IWebHostBuilder CreateWebHostBuilder()
+    {
+        return WebHostBuilderFactory.CreateFromAssemblyEntryPoint(
+            typeof(Program).Assembly, []);
+    }
+
+    protected override IHostBuilder CreateHostBuilder()
+        => Host.CreateDefaultBuilder()
+            .ConfigureWebHostDefaults(webBuilder =>
+                webBuilder.UseStartup<TStartup>());
 }
diff --git a/test/OrchardCore.Tests/Apis/Context/SiteContext.cs b/test/OrchardCore.Tests/Apis/Context/SiteContext.cs
index 827aa1e9336..976b08b2474 100644
--- a/test/OrchardCore.Tests/Apis/Context/SiteContext.cs
+++ b/test/OrchardCore.Tests/Apis/Context/SiteContext.cs
@@ -6,193 +6,192 @@
 using OrchardCore.Recipes.Services;
 using OrchardCore.Search.Lucene;
 
-namespace OrchardCore.Tests.Apis.Context
+namespace OrchardCore.Tests.Apis.Context;
+
+public class SiteContext : IDisposable
 {
-    public class SiteContext : IDisposable
+    private static readonly TablePrefixGenerator _tablePrefixGenerator = new();
+    public static OrchardTestFixture<SiteStartup> Site { get; }
+    public static IShellHost ShellHost { get; private set; }
+    public static IShellSettingsManager ShellSettingsManager { get; private set; }
+    public static IHttpContextAccessor HttpContextAccessor { get; }
+    public static HttpClient DefaultTenantClient { get; }
+
+    public string RecipeName { get; set; } = "Blog";
+    public string DatabaseProvider { get; set; } = "Sqlite";
+    public string ConnectionString { get; set; }
+    public PermissionsContext PermissionsContext { get; set; }
+
+    public HttpClient Client { get; private set; }
+    public string TenantName { get; private set; }
+    public OrchardGraphQLClient GraphQLClient { get; private set; }
+
+    static SiteContext()
+    {
+        Site = new OrchardTestFixture<SiteStartup>();
+        ShellHost = Site.Services.GetRequiredService<IShellHost>();
+        ShellSettingsManager = Site.Services.GetRequiredService<IShellSettingsManager>();
+        HttpContextAccessor = Site.Services.GetRequiredService<IHttpContextAccessor>();
+        DefaultTenantClient = Site.CreateDefaultClient();
+    }
+
+    public virtual async Task InitializeAsync()
     {
-        private static readonly TablePrefixGenerator _tablePrefixGenerator = new();
-        public static OrchardTestFixture<SiteStartup> Site { get; }
-        public static IShellHost ShellHost { get; private set; }
-        public static IShellSettingsManager ShellSettingsManager { get; private set; }
-        public static IHttpContextAccessor HttpContextAccessor { get; }
-        public static HttpClient DefaultTenantClient { get; }
-
-        public string RecipeName { get; set; } = "Blog";
-        public string DatabaseProvider { get; set; } = "Sqlite";
-        public string ConnectionString { get; set; }
-        public PermissionsContext PermissionsContext { get; set; }
-
-        public HttpClient Client { get; private set; }
-        public string TenantName { get; private set; }
-        public OrchardGraphQLClient GraphQLClient { get; private set; }
-
-        static SiteContext()
+        var tenantName = Guid.NewGuid().ToString("n");
+        var tablePrefix = await _tablePrefixGenerator.GeneratePrefixAsync();
+
+        var createModel = new Tenants.Models.TenantApiModel
         {
-            Site = new OrchardTestFixture<SiteStartup>();
-            ShellHost = Site.Services.GetRequiredService<IShellHost>();
-            ShellSettingsManager = Site.Services.GetRequiredService<IShellSettingsManager>();
-            HttpContextAccessor = Site.Services.GetRequiredService<IHttpContextAccessor>();
-            DefaultTenantClient = Site.CreateDefaultClient();
-        }
+            DatabaseProvider = DatabaseProvider,
+            TablePrefix = tablePrefix,
+            ConnectionString = ConnectionString,
+            RecipeName = RecipeName,
+            Name = tenantName,
+            RequestUrlPrefix = tenantName,
+            Schema = null,
+        };
+
+        var createResult = await DefaultTenantClient.PostAsJsonAsync("api/tenants/create", createModel);
+        createResult.EnsureSuccessStatusCode();
 
-        public virtual async Task InitializeAsync()
+        var content = await createResult.Content.ReadAsStringAsync();
+
+        var url = new Uri(content.Trim('"'));
+        url = new Uri(url.Scheme + "://" + url.Authority + url.LocalPath + "/");
+
+        var setupModel = new Tenants.ViewModels.SetupApiViewModel
+        {
+            SiteName = "Test Site",
+            DatabaseProvider = DatabaseProvider,
+            TablePrefix = tablePrefix,
+            ConnectionString = ConnectionString,
+            RecipeName = RecipeName,
+            UserName = "admin",
+            Password = "Password01_",
+            Name = tenantName,
+            Email = "Nick@Orchard",
+        };
+
+        var setupResult = await DefaultTenantClient.PostAsJsonAsync("api/tenants/setup", setupModel);
+        setupResult.EnsureSuccessStatusCode();
+
+        lock (Site)
         {
-            var tenantName = Guid.NewGuid().ToString("n");
-            var tablePrefix = await _tablePrefixGenerator.GeneratePrefixAsync();
-
-            var createModel = new Tenants.Models.TenantApiModel
-            {
-                DatabaseProvider = DatabaseProvider,
-                TablePrefix = tablePrefix,
-                ConnectionString = ConnectionString,
-                RecipeName = RecipeName,
-                Name = tenantName,
-                RequestUrlPrefix = tenantName,
-                Schema = null,
-            };
-
-            var createResult = await DefaultTenantClient.PostAsJsonAsync("api/tenants/create", createModel);
-            createResult.EnsureSuccessStatusCode();
-
-            var content = await createResult.Content.ReadAsStringAsync();
-
-            var url = new Uri(content.Trim('"'));
-            url = new Uri(url.Scheme + "://" + url.Authority + url.LocalPath + "/");
-
-            var setupModel = new Tenants.ViewModels.SetupApiViewModel
-            {
-                SiteName = "Test Site",
-                DatabaseProvider = DatabaseProvider,
-                TablePrefix = tablePrefix,
-                ConnectionString = ConnectionString,
-                RecipeName = RecipeName,
-                UserName = "admin",
-                Password = "Password01_",
-                Name = tenantName,
-                Email = "Nick@Orchard",
-            };
-
-            var setupResult = await DefaultTenantClient.PostAsJsonAsync("api/tenants/setup", setupModel);
-            setupResult.EnsureSuccessStatusCode();
-
-            lock (Site)
-            {
-                Client = Site.CreateDefaultClient(url);
-                TenantName = tenantName;
-            }
-
-            if (PermissionsContext != null)
-            {
-                var permissionContextKey = Guid.NewGuid().ToString();
-                SiteStartup.PermissionsContexts.TryAdd(permissionContextKey, PermissionsContext);
-                Client.DefaultRequestHeaders.Add("PermissionsContext", permissionContextKey);
-            }
-
-            GraphQLClient = new OrchardGraphQLClient(Client);
+            Client = Site.CreateDefaultClient(url);
+            TenantName = tenantName;
         }
 
-        public async Task UsingTenantScopeAsync(Func<ShellScope, Task> execute, bool activateShell = true)
+        if (PermissionsContext != null)
         {
-            // Ensure that 'HttpContext' is not null before using a 'ShellScope'.
-            var shellScope = await ShellHost.GetScopeAsync(TenantName);
-            HttpContextAccessor.HttpContext = shellScope.ShellContext.CreateHttpContext();
-            await shellScope.UsingAsync(execute, activateShell);
+            var permissionContextKey = Guid.NewGuid().ToString();
+            SiteStartup.PermissionsContexts.TryAdd(permissionContextKey, PermissionsContext);
+            Client.DefaultRequestHeaders.Add("PermissionsContext", permissionContextKey);
         }
 
-        public async Task RunRecipeAsync(string recipeName, string recipePath)
+        GraphQLClient = new OrchardGraphQLClient(Client);
+    }
+
+    public async Task UsingTenantScopeAsync(Func<ShellScope, Task> execute, bool activateShell = true)
+    {
+        // Ensure that 'HttpContext' is not null before using a 'ShellScope'.
+        var shellScope = await ShellHost.GetScopeAsync(TenantName);
+        HttpContextAccessor.HttpContext = shellScope.ShellContext.CreateHttpContext();
+        await shellScope.UsingAsync(execute, activateShell);
+    }
+
+    public async Task RunRecipeAsync(string recipeName, string recipePath)
+    {
+        await UsingTenantScopeAsync(async scope =>
         {
-            await UsingTenantScopeAsync(async scope =>
-            {
-                var shellFeaturesManager = scope.ServiceProvider.GetRequiredService<IShellFeaturesManager>();
-                var recipeHarvesters = scope.ServiceProvider.GetRequiredService<IEnumerable<IRecipeHarvester>>();
-                var recipeExecutor = scope.ServiceProvider.GetRequiredService<IRecipeExecutor>();
-
-                var recipeCollections = await Task.WhenAll(
-                    recipeHarvesters.Select(recipe => recipe.HarvestRecipesAsync()));
-
-                var recipes = recipeCollections.SelectMany(recipeCollection => recipeCollection);
-                var recipe = recipes
-                    .FirstOrDefault(recipe => recipe.RecipeFileInfo.Name == recipeName && recipe.BasePath == recipePath);
-
-                var executionId = Guid.NewGuid().ToString("n");
-
-                await recipeExecutor.ExecuteAsync(
-                    executionId,
-                    recipe,
-                    new Dictionary<string, object>(),
-                    CancellationToken.None);
-            });
-        }
+            var shellFeaturesManager = scope.ServiceProvider.GetRequiredService<IShellFeaturesManager>();
+            var recipeHarvesters = scope.ServiceProvider.GetRequiredService<IEnumerable<IRecipeHarvester>>();
+            var recipeExecutor = scope.ServiceProvider.GetRequiredService<IRecipeExecutor>();
+
+            var recipeCollections = await Task.WhenAll(
+                recipeHarvesters.Select(recipe => recipe.HarvestRecipesAsync()));
+
+            var recipes = recipeCollections.SelectMany(recipeCollection => recipeCollection);
+            var recipe = recipes
+                .FirstOrDefault(recipe => recipe.RecipeFileInfo.Name == recipeName && recipe.BasePath == recipePath);
+
+            var executionId = Guid.NewGuid().ToString("n");
 
-        public async Task ResetLuceneIndiciesAsync(string indexName)
+            await recipeExecutor.ExecuteAsync(
+                executionId,
+                recipe,
+                new Dictionary<string, object>(),
+                CancellationToken.None);
+        });
+    }
+
+    public async Task ResetLuceneIndiciesAsync(string indexName)
+    {
+        await UsingTenantScopeAsync(async scope =>
         {
-            await UsingTenantScopeAsync(async scope =>
-            {
-                var luceneIndexSettingsService = scope.ServiceProvider.GetRequiredService<LuceneIndexSettingsService>();
-                var luceneIndexingService = scope.ServiceProvider.GetRequiredService<LuceneIndexingService>();
+            var luceneIndexSettingsService = scope.ServiceProvider.GetRequiredService<LuceneIndexSettingsService>();
+            var luceneIndexingService = scope.ServiceProvider.GetRequiredService<LuceneIndexingService>();
 
-                var luceneIndexSettings = await luceneIndexSettingsService.GetSettingsAsync(indexName);
+            var luceneIndexSettings = await luceneIndexSettingsService.GetSettingsAsync(indexName);
 
-                luceneIndexingService.ResetIndexAsync(indexName);
-                await luceneIndexingService.ProcessContentItemsAsync(indexName);
-            });
-        }
+            luceneIndexingService.ResetIndexAsync(indexName);
+            await luceneIndexingService.ProcessContentItemsAsync(indexName);
+        });
+    }
 
-        public async Task<string> CreateContentItem(string contentType, Action<ContentItem> func, bool draft = false)
+    public async Task<string> CreateContentItem(string contentType, Action<ContentItem> func, bool draft = false)
+    {
+        // Never generate a fake ContentItemId here as it should be created by the ContentManager.NewAsync() method.
+        // Controllers should use the proper sequence so that they call their event handlers.
+        // In that case it would skip calling ActivatingAsync, ActivatedAsync, InitializingAsync, InitializedAsync events
+        var contentItem = new ContentItem
         {
-            // Never generate a fake ContentItemId here as it should be created by the ContentManager.NewAsync() method.
-            // Controllers should use the proper sequence so that they call their event handlers.
-            // In that case it would skip calling ActivatingAsync, ActivatedAsync, InitializingAsync, InitializedAsync events
-            var contentItem = new ContentItem
-            {
-                ContentType = contentType
-            };
+            ContentType = contentType
+        };
 
-            func(contentItem);
+        func(contentItem);
 
-            var content = await Client.PostAsJsonAsync("api/content" + (draft ? "?draft=true" : ""), contentItem);
-            var response = await content.Content.ReadAsAsync<ContentItem>();
+        var content = await Client.PostAsJsonAsync("api/content" + (draft ? "?draft=true" : ""), contentItem);
+        var response = await content.Content.ReadAsAsync<ContentItem>();
 
-            return response.ContentItemId;
-        }
+        return response.ContentItemId;
+    }
 
-        public Task DeleteContentItem(string contentItemId)
-        {
-            return Client.DeleteAsync("api/content/" + contentItemId);
-        }
+    public Task DeleteContentItem(string contentItemId)
+    {
+        return Client.DeleteAsync("api/content/" + contentItemId);
+    }
 
 #pragma warning disable CA1816 // Change SiteContext.Dispose() to call GC.SuppressFinalize(object). This will prevent derived types that introduce a finalizer from needing to re-implement 'IDisposable' to call it.
-        public void Dispose()
+    public void Dispose()
 #pragma warning restore CA1816
-        {
-            Client?.Dispose();
-        }
+    {
+        Client?.Dispose();
     }
+}
 
-    public static class SiteContextExtensions
+public static class SiteContextExtensions
+{
+    public static T WithDatabaseProvider<T>(this T siteContext, string databaseProvider) where T : SiteContext
     {
-        public static T WithDatabaseProvider<T>(this T siteContext, string databaseProvider) where T : SiteContext
-        {
-            siteContext.DatabaseProvider = databaseProvider;
-            return siteContext;
-        }
+        siteContext.DatabaseProvider = databaseProvider;
+        return siteContext;
+    }
 
-        public static T WithConnectionString<T>(this T siteContext, string connectionString) where T : SiteContext
-        {
-            siteContext.ConnectionString = connectionString;
-            return siteContext;
-        }
+    public static T WithConnectionString<T>(this T siteContext, string connectionString) where T : SiteContext
+    {
+        siteContext.ConnectionString = connectionString;
+        return siteContext;
+    }
 
-        public static T WithPermissionsContext<T>(this T siteContext, PermissionsContext permissionsContext) where T : SiteContext
-        {
-            siteContext.PermissionsContext = permissionsContext;
-            return siteContext;
-        }
+    public static T WithPermissionsContext<T>(this T siteContext, PermissionsContext permissionsContext) where T : SiteContext
+    {
+        siteContext.PermissionsContext = permissionsContext;
+        return siteContext;
+    }
 
-        public static T WithRecipe<T>(this T siteContext, string recipeName) where T : SiteContext
-        {
-            siteContext.RecipeName = recipeName;
-            return siteContext;
-        }
+    public static T WithRecipe<T>(this T siteContext, string recipeName) where T : SiteContext
+    {
+        siteContext.RecipeName = recipeName;
+        return siteContext;
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/Context/SiteStartup.cs b/test/OrchardCore.Tests/Apis/Context/SiteStartup.cs
index d96cca600b0..78c0dc5f03d 100644
--- a/test/OrchardCore.Tests/Apis/Context/SiteStartup.cs
+++ b/test/OrchardCore.Tests/Apis/Context/SiteStartup.cs
@@ -3,69 +3,68 @@
 using OrchardCore.Modules.Manifest;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Tests.Apis.Context
+namespace OrchardCore.Tests.Apis.Context;
+
+public class SiteStartup
 {
-    public class SiteStartup
-    {
-        public static readonly ConcurrentDictionary<string, PermissionsContext> PermissionsContexts;
+    public static readonly ConcurrentDictionary<string, PermissionsContext> PermissionsContexts;
 
-        static SiteStartup()
-        {
-            PermissionsContexts = new ConcurrentDictionary<string, PermissionsContext>();
-        }
+    static SiteStartup()
+    {
+        PermissionsContexts = new ConcurrentDictionary<string, PermissionsContext>();
+    }
 
 #pragma warning disable CA1822 // Mark members as static
-        public void ConfigureServices(IServiceCollection services)
+    public void ConfigureServices(IServiceCollection services)
 #pragma warning restore CA1822 // Mark members as static
-        {
-            services.AddOrchardCms(builder =>
-                builder.AddSetupFeatures(
-                    "OrchardCore.Tenants"
-                )
-                .AddTenantFeatures(
-                    "OrchardCore.Apis.GraphQL"
-                )
-                .ConfigureServices(collection =>
+    {
+        services.AddOrchardCms(builder =>
+            builder.AddSetupFeatures(
+                "OrchardCore.Tenants"
+            )
+            .AddTenantFeatures(
+                "OrchardCore.Apis.GraphQL"
+            )
+            .ConfigureServices(collection =>
+            {
+                collection.Configure<YesSqlOptions>(options =>
                 {
-                    collection.Configure<YesSqlOptions>(options =>
-                    {
-                        // To ensure we don't encounter any concurrent issue, enable EnableThreadSafetyChecks for all test.
-                        options.EnableThreadSafetyChecks = true;
-                    });
+                    // To ensure we don't encounter any concurrent issue, enable EnableThreadSafetyChecks for all test.
+                    options.EnableThreadSafetyChecks = true;
+                });
 
-                    collection.AddScoped<IRecipeHarvester, TestRecipeHarvester>();
+                collection.AddScoped<IRecipeHarvester, TestRecipeHarvester>();
 
-                    collection.AddScoped<IAuthorizationHandler, PermissionContextAuthorizationHandler>(sp =>
-                    {
-                        return new PermissionContextAuthorizationHandler(sp.GetRequiredService<IHttpContextAccessor>(), PermissionsContexts);
-                    });
-                })
-                .Configure(appBuilder => appBuilder.UseAuthorization()));
+                collection.AddScoped<IAuthorizationHandler, PermissionContextAuthorizationHandler>(sp =>
+                {
+                    return new PermissionContextAuthorizationHandler(sp.GetRequiredService<IHttpContextAccessor>(), PermissionsContexts);
+                });
+            })
+            .Configure(appBuilder => appBuilder.UseAuthorization()));
 
-            services.AddSingleton<IModuleNamesProvider, ModuleNamesProvider>();
-        }
+        services.AddSingleton<IModuleNamesProvider, ModuleNamesProvider>();
+    }
 
 #pragma warning disable CA1822 // Mark members as static
-        public void Configure(IApplicationBuilder app)
+    public void Configure(IApplicationBuilder app)
 #pragma warning restore CA1822 // Mark members as static
+    {
+        app.UseOrchardCore();
+    }
+
+    private sealed class ModuleNamesProvider : IModuleNamesProvider
+    {
+        private readonly string[] _moduleNames;
+
+        public ModuleNamesProvider()
         {
-            app.UseOrchardCore();
+            var assembly = Assembly.Load(new AssemblyName(typeof(Program).Assembly.GetName().Name));
+            _moduleNames = assembly.GetCustomAttributes<ModuleNameAttribute>().Select(m => m.Name).ToArray();
         }
 
-        private sealed class ModuleNamesProvider : IModuleNamesProvider
+        public IEnumerable<string> GetModuleNames()
         {
-            private readonly string[] _moduleNames;
-
-            public ModuleNamesProvider()
-            {
-                var assembly = Assembly.Load(new AssemblyName(typeof(Program).Assembly.GetName().Name));
-                _moduleNames = assembly.GetCustomAttributes<ModuleNameAttribute>().Select(m => m.Name).ToArray();
-            }
-
-            public IEnumerable<string> GetModuleNames()
-            {
-                return _moduleNames;
-            }
+            return _moduleNames;
         }
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/Context/TablePrefixGenerator.cs b/test/OrchardCore.Tests/Apis/Context/TablePrefixGenerator.cs
index 485241cc3ca..33ad3d23cfa 100644
--- a/test/OrchardCore.Tests/Apis/Context/TablePrefixGenerator.cs
+++ b/test/OrchardCore.Tests/Apis/Context/TablePrefixGenerator.cs
@@ -1,31 +1,30 @@
-namespace OrchardCore.Tests.Apis.Context
+namespace OrchardCore.Tests.Apis.Context;
+
+/// <summary>
+/// This is an internal table prefix generator which uses a timestamp to generate a table prefix
+/// is unique during a test run and within the character limits of the supported sql databases.
+/// </summary>
+/// <remarks>
+/// Does not guarantee uniqueness.
+/// </remarks>
+internal sealed class TablePrefixGenerator
 {
-    /// <summary>
-    /// This is an internal table prefix generator which uses a timestamp to generate a table prefix
-    /// is unique during a test run and within the character limits of the supported sql databases.
-    /// </summary>
-    /// <remarks>
-    /// Does not guarantee uniqueness.
-    /// </remarks>
-    internal sealed class TablePrefixGenerator
-    {
-        private static readonly char[] _charList = "abcdefghijklmnopqrstuvwxyz".ToCharArray();
+    private static readonly char[] _charList = "abcdefghijklmnopqrstuvwxyz".ToCharArray();
 
 #pragma warning disable CA1822 // Mark members as static
-        internal async Task<string> GeneratePrefixAsync()
+    internal async Task<string> GeneratePrefixAsync()
 #pragma warning restore CA1822 // Mark members as static
-        {
-            await Task.Delay(1);
-            var ticks = DateTime.Now.Ticks;
-
-            var result = new StringBuilder();
-            while (ticks != 0)
-            {
-                result.Append(_charList[ticks % _charList.Length]);
-                ticks /= _charList.Length;
-            }
+    {
+        await Task.Delay(1);
+        var ticks = DateTime.Now.Ticks;
 
-            return result.ToString();
+        var result = new StringBuilder();
+        while (ticks != 0)
+        {
+            result.Append(_charList[ticks % _charList.Length]);
+            ticks /= _charList.Length;
         }
+
+        return result.ToString();
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/Context/TablePrefixGeneratorTests.cs b/test/OrchardCore.Tests/Apis/Context/TablePrefixGeneratorTests.cs
index a2ce7b8016b..2b77d5440c6 100644
--- a/test/OrchardCore.Tests/Apis/Context/TablePrefixGeneratorTests.cs
+++ b/test/OrchardCore.Tests/Apis/Context/TablePrefixGeneratorTests.cs
@@ -1,19 +1,18 @@
-namespace OrchardCore.Tests.Apis.Context
+namespace OrchardCore.Tests.Apis.Context;
+
+public class TablePrefixGeneratorTests
 {
-    public class TablePrefixGeneratorTests
+    [Fact]
+    public async Task TenantPrefixShouldBeUnique()
     {
-        [Fact]
-        public async Task TenantPrefixShouldBeUnique()
-        {
-            var tablePrefixGenerator = new TablePrefixGenerator();
-            var prefixes = new HashSet<string>();
+        var tablePrefixGenerator = new TablePrefixGenerator();
+        var prefixes = new HashSet<string>();
 
-            for (var i = 0; i < 200; i++)
-            {
-                var prefix = await tablePrefixGenerator.GeneratePrefixAsync();
-                Assert.DoesNotContain(prefix, prefixes);
-                prefixes.Add(prefix);
-            }
+        for (var i = 0; i < 200; i++)
+        {
+            var prefix = await tablePrefixGenerator.GeneratePrefixAsync();
+            Assert.DoesNotContain(prefix, prefixes);
+            prefixes.Add(prefix);
         }
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/Context/TestRecipeHarvester.cs b/test/OrchardCore.Tests/Apis/Context/TestRecipeHarvester.cs
index 19bef681e49..4f01fd3bff1 100644
--- a/test/OrchardCore.Tests/Apis/Context/TestRecipeHarvester.cs
+++ b/test/OrchardCore.Tests/Apis/Context/TestRecipeHarvester.cs
@@ -1,52 +1,51 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
-namespace OrchardCore.Tests.Apis.Context
+namespace OrchardCore.Tests.Apis.Context;
+
+public class TestRecipeHarvester : IRecipeHarvester
 {
-    public class TestRecipeHarvester : IRecipeHarvester
+    private readonly IRecipeReader _recipeReader;
+
+    public TestRecipeHarvester(IRecipeReader recipeReader)
     {
-        private readonly IRecipeReader _recipeReader;
+        _recipeReader = recipeReader;
+    }
 
-        public TestRecipeHarvester(IRecipeReader recipeReader)
-        {
-            _recipeReader = recipeReader;
-        }
+    public Task<IEnumerable<RecipeDescriptor>> HarvestRecipesAsync()
+        => HarvestRecipesAsync(
+        [
+            "Apis/Lucene/Recipes/luceneQueryTest.json",
+            "Apis/GraphQL/ContentManagement/Recipes/DynamicContentTypeQueryTest.json",
+            "OrchardCore.Users/Recipes/UserSettingsTest.json"
+        ]);
 
-        public Task<IEnumerable<RecipeDescriptor>> HarvestRecipesAsync()
-            => HarvestRecipesAsync(
-            [
-                "Apis/Lucene/Recipes/luceneQueryTest.json",
-                "Apis/GraphQL/ContentManagement/Recipes/DynamicContentTypeQueryTest.json",
-                "OrchardCore.Users/Recipes/UserSettingsTest.json"
-            ]);
+    private async Task<IEnumerable<RecipeDescriptor>> HarvestRecipesAsync(string[] paths)
+    {
+        var recipeDescriptors = new List<RecipeDescriptor>();
+        var testAssemblyFileProvider = new EmbeddedFileProvider(GetType().GetTypeInfo().Assembly);
+        var fileInfos = new List<IFileInfo>();
 
-        private async Task<IEnumerable<RecipeDescriptor>> HarvestRecipesAsync(string[] paths)
+        foreach (var path in paths)
         {
-            var recipeDescriptors = new List<RecipeDescriptor>();
-            var testAssemblyFileProvider = new EmbeddedFileProvider(GetType().GetTypeInfo().Assembly);
-            var fileInfos = new List<IFileInfo>();
+            // EmbeddedFileProvider doesn't list directory contents.
+            var fileInfo = testAssemblyFileProvider.GetFileInfo(path);
+            Assert.True(fileInfo.Exists);
+            fileInfos.Add(fileInfo);
+        }
 
-            foreach (var path in paths)
-            {
-                // EmbeddedFileProvider doesn't list directory contents.
-                var fileInfo = testAssemblyFileProvider.GetFileInfo(path);
-                Assert.True(fileInfo.Exists);
-                fileInfos.Add(fileInfo);
-            }
+        foreach (var fileInfo in fileInfos)
+        {
+            var descriptor = await _recipeReader.GetRecipeDescriptorAsync(fileInfo.PhysicalPath, fileInfo, testAssemblyFileProvider);
 
-            foreach (var fileInfo in fileInfos)
+            if (descriptor == null)
             {
-                var descriptor = await _recipeReader.GetRecipeDescriptorAsync(fileInfo.PhysicalPath, fileInfo, testAssemblyFileProvider);
-
-                if (descriptor == null)
-                {
-                    continue;
-                }
-
-                recipeDescriptors.Add(descriptor);
+                continue;
             }
 
-            return recipeDescriptors;
+            recipeDescriptors.Add(descriptor);
         }
+
+        return recipeDescriptors;
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/GraphQL/Blog/BlogPostTests.cs b/test/OrchardCore.Tests/Apis/GraphQL/Blog/BlogPostTests.cs
index a7ff667f377..09c5a0888f9 100644
--- a/test/OrchardCore.Tests/Apis/GraphQL/Blog/BlogPostTests.cs
+++ b/test/OrchardCore.Tests/Apis/GraphQL/Blog/BlogPostTests.cs
@@ -7,282 +7,281 @@
 using OrchardCore.Tests.Apis.Context;
 using GraphQLApi = OrchardCore.Apis.GraphQL;
 
-namespace OrchardCore.Tests.Apis.GraphQL
+namespace OrchardCore.Tests.Apis.GraphQL;
+
+public class BlogPostTests
 {
-    public class BlogPostTests
+    [Fact]
+
+    public async Task ShouldListAllBlogs()
     {
-        [Fact]
-
-        public async Task ShouldListAllBlogs()
-        {
-            using var context = new BlogContext();
-            await context.InitializeAsync();
-
-            var result = await context
-                .GraphQLClient
-                .Content
-                .Query("Blog", builder =>
-                {
-                    builder
-                        .WithField("contentItemId");
-                });
-
-            Assert.Single(
-                result["data"]["blog"].AsArray().Where(node => node["contentItemId"].ToString() == context.BlogContentItemId));
-        }
-
-        [Fact]
-        public async Task ShouldQueryByBlogPostAutoroutePart()
-        {
-            using var context = new BlogContext();
-            await context.InitializeAsync();
-
-            var blogPostContentItemId1 = await context
-                .CreateContentItem("BlogPost", builder =>
-                {
-                    builder
-                        .DisplayText = "Some sorta blogpost!";
-
-                    builder
-                        .Weld(new AutoroutePart
-                        {
-                            Path = "Path1",
-                        });
+        using var context = new BlogContext();
+        await context.InitializeAsync();
+
+        var result = await context
+            .GraphQLClient
+            .Content
+            .Query("Blog", builder =>
+            {
+                builder
+                    .WithField("contentItemId");
+            });
+
+        Assert.Single(
+            result["data"]["blog"].AsArray().Where(node => node["contentItemId"].ToString() == context.BlogContentItemId));
+    }
 
-                    builder
-                        .Weld(new ContainedPart
-                        {
-                            ListContentItemId = context.BlogContentItemId,
-                        });
-                });
+    [Fact]
+    public async Task ShouldQueryByBlogPostAutoroutePart()
+    {
+        using var context = new BlogContext();
+        await context.InitializeAsync();
+
+        var blogPostContentItemId1 = await context
+            .CreateContentItem("BlogPost", builder =>
+            {
+                builder
+                    .DisplayText = "Some sorta blogpost!";
+
+                builder
+                    .Weld(new AutoroutePart
+                    {
+                        Path = "Path1",
+                    });
+
+                builder
+                    .Weld(new ContainedPart
+                    {
+                        ListContentItemId = context.BlogContentItemId,
+                    });
+            });
+
+        var blogPostContentItemId2 = await context
+            .CreateContentItem("BlogPost", builder =>
+            {
+                builder
+                    .DisplayText = "Some sorta other blogpost!";
+
+                builder
+                    .Weld(new AutoroutePart
+                    {
+                        Path = "Path2",
+                    });
+
+                builder
+                    .Weld(new ContainedPart
+                    {
+                        ListContentItemId = context.BlogContentItemId,
+                    });
+            });
+
+        var result = await context
+            .GraphQLClient
+            .Content
+            .Query("BlogPost", builder =>
+            {
+                builder
+                    .WithQueryStringArgument("where", "path", "Path1");
+
+                builder
+                    .WithField("DisplayText");
+            });
+
+        Assert.Equal(
+            "Some sorta blogpost!",
+            result["data"]["blogPost"][0]["displayText"].ToString());
+    }
 
-            var blogPostContentItemId2 = await context
-                .CreateContentItem("BlogPost", builder =>
-                {
-                    builder
-                        .DisplayText = "Some sorta other blogpost!";
+    [Fact]
+    public async Task WhenThePartHasTheSameNameAsTheContentTypeShouldCollapseFieldsToContentType()
+    {
+        using var context = new BlogContext();
+        await context.InitializeAsync();
+
+        var result = await context
+            .GraphQLClient
+            .Content
+            .Query("BlogPost", builder =>
+            {
+                builder.WithField("Subtitle");
+            });
+
+        Assert.Equal(
+            "Problems look mighty small from 150 miles up",
+            result["data"]["blogPost"][0]["subtitle"].ToString());
+    }
 
-                    builder
-                        .Weld(new AutoroutePart
-                        {
-                            Path = "Path2",
-                        });
+    [Fact]
+    public async Task WhenCreatingABlogPostShouldBeAbleToPopulateField()
+    {
+        using var context = new BlogContext();
+        await context.InitializeAsync();
 
-                    builder
-                        .Weld(new ContainedPart
-                        {
-                            ListContentItemId = context.BlogContentItemId,
-                        });
-                });
-
-            var result = await context
-                .GraphQLClient
-                .Content
-                .Query("BlogPost", builder =>
-                {
-                    builder
-                        .WithQueryStringArgument("where", "path", "Path1");
-
-                    builder
-                        .WithField("DisplayText");
-                });
-
-            Assert.Equal(
-                "Some sorta blogpost!",
-                result["data"]["blogPost"][0]["displayText"].ToString());
-        }
-
-        [Fact]
-        public async Task WhenThePartHasTheSameNameAsTheContentTypeShouldCollapseFieldsToContentType()
-        {
-            using var context = new BlogContext();
-            await context.InitializeAsync();
-
-            var result = await context
-                .GraphQLClient
-                .Content
-                .Query("BlogPost", builder =>
-                {
-                    builder.WithField("Subtitle");
-                });
-
-            Assert.Equal(
-                "Problems look mighty small from 150 miles up",
-                result["data"]["blogPost"][0]["subtitle"].ToString());
-        }
-
-        [Fact]
-        public async Task WhenCreatingABlogPostShouldBeAbleToPopulateField()
-        {
-            using var context = new BlogContext();
-            await context.InitializeAsync();
-
-            var blogPostContentItemId = await context
-                .CreateContentItem("BlogPost", builder =>
-                {
-                    builder
-                        .DisplayText = "Some sorta blogpost!";
-
-                    builder
-                        .Weld("BlogPost", new ContentPart());
-
-                    builder
-                        .Alter<ContentPart>("BlogPost", (cp) =>
-                        {
-                            cp.Weld("Subtitle", new TextField());
+        var blogPostContentItemId = await context
+            .CreateContentItem("BlogPost", builder =>
+            {
+                builder
+                    .DisplayText = "Some sorta blogpost!";
 
-                            cp.Alter<TextField>("Subtitle", tf =>
-                            {
-                                tf.Text = "Hey - Is this working!?!?!?!?";
-                            });
-                        });
+                builder
+                    .Weld("BlogPost", new ContentPart());
 
-                    builder
-                        .Weld(new ContainedPart
-                        {
-                            ListContentItemId = context.BlogContentItemId,
-                        });
-                });
-
-            var result = await context
-                .GraphQLClient
-                .Content
-                .Query("BlogPost", builder =>
-                {
-                    builder
-                        .WithQueryStringArgument("where", "ContentItemId", blogPostContentItemId);
-
-                    builder
-                        .WithField("Subtitle");
-                });
-
-            Assert.Equal(
-                "Hey - Is this working!?!?!?!?",
-                result["data"]["blogPost"][0]["subtitle"].ToString());
-        }
-
-        [Fact]
-        public async Task ShouldQueryByStatus()
-        {
-            using var context = new BlogContext();
-            await context.InitializeAsync();
-
-            var draft = await context
-                .CreateContentItem("BlogPost", builder =>
-                {
-                    builder.DisplayText = "Draft blog post";
-                    builder.Published = false;
-                    builder.Latest = true;
-
-                    builder
-                        .Weld(new ContainedPart
+                builder
+                    .Alter<ContentPart>("BlogPost", (cp) =>
+                    {
+                        cp.Weld("Subtitle", new TextField());
+
+                        cp.Alter<TextField>("Subtitle", tf =>
                         {
-                            ListContentItemId = context.BlogContentItemId,
+                            tf.Text = "Hey - Is this working!?!?!?!?";
                         });
-                }, draft: true);
-
-            var result = await context.GraphQLClient.Content
-                .Query("blogPost(status: PUBLISHED) { displayText, published }");
-
-            Assert.Single(result["data"]["blogPost"].AsArray());
-            Assert.True(result["data"]["blogPost"][0]["published"].Value<bool>());
-
-            result = await context.GraphQLClient.Content
-                .Query("blogPost(status: DRAFT) { displayText, published }");
-
-            Assert.Single(result["data"]["blogPost"].AsArray());
-            Assert.False(result["data"]["blogPost"][0]["published"].Value<bool>());
-
-            result = await context.GraphQLClient.Content
-                .Query("blogPost(status: LATEST) { displayText, published }");
-
-            Assert.Equal(2, result["data"]["blogPost"].AsArray().Count);
-        }
-
-        [Fact]
-        public async Task ShouldNotBeAbleToExecuteAnyQueriesWithoutPermission()
-        {
-            using var context = new SiteContext()
-                .WithPermissionsContext(new PermissionsContext { UsePermissionsContext = true });
-
-            await context.InitializeAsync();
-
-            var response = await context.GraphQLClient.Client.GetAsync("api/graphql");
-            Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
-        }
-
-        [Fact]
-        public async Task ShouldReturnBlogsWithViewBlogContentPermission()
-        {
-            using var context = new SiteContext()
-                .WithPermissionsContext(new PermissionsContext
-                {
-                    UsePermissionsContext = true,
-                    AuthorizedPermissions =
-                    [
-                        CommonPermissions.ExecuteGraphQL,
-                        Contents.CommonPermissions.ViewContent,
-                    ],
-                });
-
-            await context.InitializeAsync();
-
-            var result = await context.GraphQLClient.Content
-                .Query("blog", builder =>
-                {
-                    builder.WithField("contentItemId");
-                });
-
-            Assert.NotEmpty(result["data"]["blog"].AsArray());
-        }
-
-        [Fact]
-        public async Task ShouldNotReturnBlogsWithViewOwnBlogContentPermission()
-        {
-            using var context = new SiteContext()
-                .WithPermissionsContext(new PermissionsContext
-                {
-                    UsePermissionsContext = true,
-                    AuthorizedPermissions =
-                    [
-                        CommonPermissions.ExecuteGraphQL,
-                        Contents.CommonPermissions.ViewOwnContent,
-                    ],
-                });
-
-            await context.InitializeAsync();
-
-            var result = await context.GraphQLClient.Content
-                .Query("blog", builder =>
-                {
-                    builder.WithField("contentItemId");
-                });
-
-            Assert.Empty(result["data"]["blog"].AsArray());
-        }
-
-        [Fact]
-        public async Task ShouldNotReturnBlogsWithoutViewBlogContentPermission()
-        {
-            using var context = new SiteContext()
-                .WithPermissionsContext(new PermissionsContext
-                {
-                    UsePermissionsContext = true,
-                    AuthorizedPermissions =
-                    [
-                        CommonPermissions.ExecuteGraphQL,
-                    ],
-                });
-
-            await context.InitializeAsync();
-
-            var result = await context.GraphQLClient.Content
-                .Query("blog", builder =>
-                {
-                    builder.WithField("contentItemId");
-                });
-
-            Assert.Equal(GraphQLApi.ValidationRules.RequiresPermissionValidationRule.ErrorCode, result["errors"][0]["extensions"]["number"].ToString());
-        }
+                    });
+
+                builder
+                    .Weld(new ContainedPart
+                    {
+                        ListContentItemId = context.BlogContentItemId,
+                    });
+            });
+
+        var result = await context
+            .GraphQLClient
+            .Content
+            .Query("BlogPost", builder =>
+            {
+                builder
+                    .WithQueryStringArgument("where", "ContentItemId", blogPostContentItemId);
+
+                builder
+                    .WithField("Subtitle");
+            });
+
+        Assert.Equal(
+            "Hey - Is this working!?!?!?!?",
+            result["data"]["blogPost"][0]["subtitle"].ToString());
+    }
+
+    [Fact]
+    public async Task ShouldQueryByStatus()
+    {
+        using var context = new BlogContext();
+        await context.InitializeAsync();
+
+        var draft = await context
+            .CreateContentItem("BlogPost", builder =>
+            {
+                builder.DisplayText = "Draft blog post";
+                builder.Published = false;
+                builder.Latest = true;
+
+                builder
+                    .Weld(new ContainedPart
+                    {
+                        ListContentItemId = context.BlogContentItemId,
+                    });
+            }, draft: true);
+
+        var result = await context.GraphQLClient.Content
+            .Query("blogPost(status: PUBLISHED) { displayText, published }");
+
+        Assert.Single(result["data"]["blogPost"].AsArray());
+        Assert.True(result["data"]["blogPost"][0]["published"].Value<bool>());
+
+        result = await context.GraphQLClient.Content
+            .Query("blogPost(status: DRAFT) { displayText, published }");
+
+        Assert.Single(result["data"]["blogPost"].AsArray());
+        Assert.False(result["data"]["blogPost"][0]["published"].Value<bool>());
+
+        result = await context.GraphQLClient.Content
+            .Query("blogPost(status: LATEST) { displayText, published }");
+
+        Assert.Equal(2, result["data"]["blogPost"].AsArray().Count);
+    }
+
+    [Fact]
+    public async Task ShouldNotBeAbleToExecuteAnyQueriesWithoutPermission()
+    {
+        using var context = new SiteContext()
+            .WithPermissionsContext(new PermissionsContext { UsePermissionsContext = true });
+
+        await context.InitializeAsync();
+
+        var response = await context.GraphQLClient.Client.GetAsync("api/graphql");
+        Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
+    }
+
+    [Fact]
+    public async Task ShouldReturnBlogsWithViewBlogContentPermission()
+    {
+        using var context = new SiteContext()
+            .WithPermissionsContext(new PermissionsContext
+            {
+                UsePermissionsContext = true,
+                AuthorizedPermissions =
+                [
+                    CommonPermissions.ExecuteGraphQL,
+                    Contents.CommonPermissions.ViewContent,
+                ],
+            });
+
+        await context.InitializeAsync();
+
+        var result = await context.GraphQLClient.Content
+            .Query("blog", builder =>
+            {
+                builder.WithField("contentItemId");
+            });
+
+        Assert.NotEmpty(result["data"]["blog"].AsArray());
+    }
+
+    [Fact]
+    public async Task ShouldNotReturnBlogsWithViewOwnBlogContentPermission()
+    {
+        using var context = new SiteContext()
+            .WithPermissionsContext(new PermissionsContext
+            {
+                UsePermissionsContext = true,
+                AuthorizedPermissions =
+                [
+                    CommonPermissions.ExecuteGraphQL,
+                    Contents.CommonPermissions.ViewOwnContent,
+                ],
+            });
+
+        await context.InitializeAsync();
+
+        var result = await context.GraphQLClient.Content
+            .Query("blog", builder =>
+            {
+                builder.WithField("contentItemId");
+            });
+
+        Assert.Empty(result["data"]["blog"].AsArray());
+    }
+
+    [Fact]
+    public async Task ShouldNotReturnBlogsWithoutViewBlogContentPermission()
+    {
+        using var context = new SiteContext()
+            .WithPermissionsContext(new PermissionsContext
+            {
+                UsePermissionsContext = true,
+                AuthorizedPermissions =
+                [
+                    CommonPermissions.ExecuteGraphQL,
+                ],
+            });
+
+        await context.InitializeAsync();
+
+        var result = await context.GraphQLClient.Content
+            .Query("blog", builder =>
+            {
+                builder.WithField("contentItemId");
+            });
+
+        Assert.Equal(GraphQLApi.ValidationRules.RequiresPermissionValidationRule.ErrorCode, result["errors"][0]["extensions"]["number"].ToString());
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/GraphQL/Client/ContentTypeQueryResourceBuilderTests.cs b/test/OrchardCore.Tests/Apis/GraphQL/Client/ContentTypeQueryResourceBuilderTests.cs
index 0aab6c9ee33..758983845f6 100644
--- a/test/OrchardCore.Tests/Apis/GraphQL/Client/ContentTypeQueryResourceBuilderTests.cs
+++ b/test/OrchardCore.Tests/Apis/GraphQL/Client/ContentTypeQueryResourceBuilderTests.cs
@@ -1,120 +1,119 @@
 using OrchardCore.Apis.GraphQL.Client;
 
-namespace OrchardCore.Tests.Apis.GraphQL.Client
+namespace OrchardCore.Tests.Apis.GraphQL.Client;
+
+public class ContentTypeQueryResourceBuilderTests
 {
-    public class ContentTypeQueryResourceBuilderTests
+    [Theory]
+    [InlineData("someContentType")]
+    [InlineData("SomeContentType")]
+    public void ShouldReturnContentTypeNameAsPascalCase(string contentType)
+    {
+        var result = new ContentTypeQueryResourceBuilder(contentType)
+                        .Build();
+
+        Assert.Equal("someContentType {}", result);
+    }
+
+    [Fact]
+    public void ShouldbeAbleToAddArgument()
+    {
+        var builder = new ContentTypeQueryResourceBuilder("someContentType");
+        builder.WithQueryArgument("arg", "1");
+
+        Assert.Equal("someContentType(arg: 1) {}", builder.Build());
+    }
+
+    [Fact]
+    public void ShouldbeAbleToAddMultipleArguments()
+    {
+        var builder = new ContentTypeQueryResourceBuilder("someContentType");
+        builder.WithQueryArgument("arg", "1");
+        builder.WithQueryArgument("arg2", "2");
+
+        Assert.Equal("someContentType(arg: 1 arg2: 2) {}", builder.Build());
+    }
+
+    [Fact]
+    public void ShouldbeAbleToAddStringArgument()
+    {
+        var builder = new ContentTypeQueryResourceBuilder("someContentType");
+        builder.WithQueryStringArgument("arg", "a string");
+
+        Assert.Equal("someContentType(arg: \"a string\") {}", builder.Build());
+    }
+
+    [Fact]
+    public void ShouldbeAbleToAddMultiInputArgument()
+    {
+        var builder = new ContentTypeQueryResourceBuilder("someContentType");
+        builder.WithQueryArgument("arg", "a", "1");
+        builder.WithQueryArgument("arg", "b", "2");
+
+        Assert.Equal("someContentType(arg:{a: 1, b: 2}) {}", builder.Build());
+    }
+
+    [Fact]
+    public void ShouldNotBeAbleToAddDuplicateArguments()
     {
-        [Theory]
-        [InlineData("someContentType")]
-        [InlineData("SomeContentType")]
-        public void ShouldReturnContentTypeNameAsPascalCase(string contentType)
-        {
-            var result = new ContentTypeQueryResourceBuilder(contentType)
-                            .Build();
-
-            Assert.Equal("someContentType {}", result);
-        }
-
-        [Fact]
-        public void ShouldbeAbleToAddArgument()
-        {
-            var builder = new ContentTypeQueryResourceBuilder("someContentType");
-            builder.WithQueryArgument("arg", "1");
-
-            Assert.Equal("someContentType(arg: 1) {}", builder.Build());
-        }
-
-        [Fact]
-        public void ShouldbeAbleToAddMultipleArguments()
-        {
-            var builder = new ContentTypeQueryResourceBuilder("someContentType");
-            builder.WithQueryArgument("arg", "1");
-            builder.WithQueryArgument("arg2", "2");
-
-            Assert.Equal("someContentType(arg: 1 arg2: 2) {}", builder.Build());
-        }
-
-        [Fact]
-        public void ShouldbeAbleToAddStringArgument()
-        {
-            var builder = new ContentTypeQueryResourceBuilder("someContentType");
-            builder.WithQueryStringArgument("arg", "a string");
-
-            Assert.Equal("someContentType(arg: \"a string\") {}", builder.Build());
-        }
-
-        [Fact]
-        public void ShouldbeAbleToAddMultiInputArgument()
-        {
-            var builder = new ContentTypeQueryResourceBuilder("someContentType");
-            builder.WithQueryArgument("arg", "a", "1");
-            builder.WithQueryArgument("arg", "b", "2");
-
-            Assert.Equal("someContentType(arg:{a: 1, b: 2}) {}", builder.Build());
-        }
-
-        [Fact]
-        public void ShouldNotBeAbleToAddDuplicateArguments()
-        {
-            var builder = new ContentTypeQueryResourceBuilder("someContentType");
-            builder.WithQueryArgument("arg", "a");
-
-            Assert.Throws<Exception>(() => builder.WithQueryArgument("arg", "b"));
-            Assert.Throws<Exception>(() => builder.WithQueryArgument("arg", "b", "2"));
-            Assert.Throws<Exception>(() => builder.WithNestedQueryArgument("arg", "b", "2"));
-        }
-
-        [Theory]
-        [InlineData("someField")]
-        [InlineData("SomeField")]
-        public void ShouldAddFieldWithNameAsPascalCase(string fieldName)
-        {
-            var builder = new ContentTypeQueryResourceBuilder("someContentType");
-            builder.WithField(fieldName);
-
-            Assert.Equal("someContentType { someField }", builder.Build());
-        }
-
-        [Theory]
-        [InlineData("someNestedField")]
-        [InlineData("SomeNestedField")]
-        public void ShouldAddNestedFieldWithNameAsPascalCase(string fieldName)
-        {
-            var builder = new ContentTypeQueryResourceBuilder("someContentType");
-            builder.WithNestedField(fieldName);
-
-            Assert.Equal("someContentType { someNestedField {} }", builder.Build());
-        }
-
-        [Fact]
-        public void ShouldbeAbleToAddMultipleNestedFields()
-        {
-            var builder = new ContentTypeQueryResourceBuilder("someContentType");
-            builder.WithField("field");
-            builder.WithNestedField("nestedField").WithField("nestedChild");
-            builder.WithNestedField("nestedField2").WithField("nestedChild2");
-
-            Assert.Equal("someContentType { field nestedField { nestedChild } nestedField2 { nestedChild2 } }", builder.Build());
-        }
-
-        [Fact]
-        public void ShouldbeAbleToCombineNonNestedAndNestedFields()
-        {
-            var builder = new ContentTypeQueryResourceBuilder("someContentType");
-            builder.WithField("field");
-            builder.WithNestedField("nestedField").WithField("nestedChild");
-
-            Assert.Equal("someContentType { field nestedField { nestedChild } }", builder.Build());
-        }
-
-        [Fact]
-        public void ShouldbeAbleToAddNestedFieldsMultipleLevelsDeep()
-        {
-            var builder = new ContentTypeQueryResourceBuilder("someContentType");
-            builder.WithField("field");
-            builder.WithNestedField("nestedField").WithNestedField("nestednestedField").WithField("nestedChild");
-
-            Assert.Equal("someContentType { field nestedField { nestednestedField { nestedChild } } }", builder.Build());
-        }
+        var builder = new ContentTypeQueryResourceBuilder("someContentType");
+        builder.WithQueryArgument("arg", "a");
+
+        Assert.Throws<Exception>(() => builder.WithQueryArgument("arg", "b"));
+        Assert.Throws<Exception>(() => builder.WithQueryArgument("arg", "b", "2"));
+        Assert.Throws<Exception>(() => builder.WithNestedQueryArgument("arg", "b", "2"));
+    }
+
+    [Theory]
+    [InlineData("someField")]
+    [InlineData("SomeField")]
+    public void ShouldAddFieldWithNameAsPascalCase(string fieldName)
+    {
+        var builder = new ContentTypeQueryResourceBuilder("someContentType");
+        builder.WithField(fieldName);
+
+        Assert.Equal("someContentType { someField }", builder.Build());
+    }
+
+    [Theory]
+    [InlineData("someNestedField")]
+    [InlineData("SomeNestedField")]
+    public void ShouldAddNestedFieldWithNameAsPascalCase(string fieldName)
+    {
+        var builder = new ContentTypeQueryResourceBuilder("someContentType");
+        builder.WithNestedField(fieldName);
+
+        Assert.Equal("someContentType { someNestedField {} }", builder.Build());
+    }
+
+    [Fact]
+    public void ShouldbeAbleToAddMultipleNestedFields()
+    {
+        var builder = new ContentTypeQueryResourceBuilder("someContentType");
+        builder.WithField("field");
+        builder.WithNestedField("nestedField").WithField("nestedChild");
+        builder.WithNestedField("nestedField2").WithField("nestedChild2");
+
+        Assert.Equal("someContentType { field nestedField { nestedChild } nestedField2 { nestedChild2 } }", builder.Build());
+    }
+
+    [Fact]
+    public void ShouldbeAbleToCombineNonNestedAndNestedFields()
+    {
+        var builder = new ContentTypeQueryResourceBuilder("someContentType");
+        builder.WithField("field");
+        builder.WithNestedField("nestedField").WithField("nestedChild");
+
+        Assert.Equal("someContentType { field nestedField { nestedChild } }", builder.Build());
+    }
+
+    [Fact]
+    public void ShouldbeAbleToAddNestedFieldsMultipleLevelsDeep()
+    {
+        var builder = new ContentTypeQueryResourceBuilder("someContentType");
+        builder.WithField("field");
+        builder.WithNestedField("nestedField").WithNestedField("nestednestedField").WithField("nestedChild");
+
+        Assert.Equal("someContentType { field nestedField { nestednestedField { nestedChild } } }", builder.Build());
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/GraphQL/ContentItemsFieldTypeTests.cs b/test/OrchardCore.Tests/Apis/GraphQL/ContentItemsFieldTypeTests.cs
index e45a0f058d2..cafc2c3cb14 100644
--- a/test/OrchardCore.Tests/Apis/GraphQL/ContentItemsFieldTypeTests.cs
+++ b/test/OrchardCore.Tests/Apis/GraphQL/ContentItemsFieldTypeTests.cs
@@ -19,597 +19,596 @@
 using YesSql.Sql;
 using ISession = YesSql.ISession;
 
-namespace OrchardCore.Tests.Apis.GraphQL
+namespace OrchardCore.Tests.Apis.GraphQL;
+
+public class ContentItemsFieldTypeTests : IAsyncLifetime
 {
-    public class ContentItemsFieldTypeTests : IAsyncLifetime
-    {
-        protected IStore _store;
-        protected IStore _prefixedStore;
-        protected string _prefix;
-        protected string _tempFilename;
+    protected IStore _store;
+    protected IStore _prefixedStore;
+    protected string _prefix;
+    protected string _tempFilename;
 
-        public async Task InitializeAsync()
-        {
-            var connectionStringTemplate = @"Data Source={0};Cache=Shared";
+    public async Task InitializeAsync()
+    {
+        var connectionStringTemplate = @"Data Source={0};Cache=Shared";
 
-            _tempFilename = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-            _store = await StoreFactory.CreateAndInitializeAsync(new Configuration().UseSqLite(string.Format(connectionStringTemplate, _tempFilename)));
+        _tempFilename = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+        _store = await StoreFactory.CreateAndInitializeAsync(new Configuration().UseSqLite(string.Format(connectionStringTemplate, _tempFilename)));
 
-            _prefix = "tp";
-            _prefixedStore = await StoreFactory.CreateAndInitializeAsync(new Configuration().UseSqLite(string.Format(connectionStringTemplate, _tempFilename + _prefix)).SetTablePrefix(_prefix + "_"));
+        _prefix = "tp";
+        _prefixedStore = await StoreFactory.CreateAndInitializeAsync(new Configuration().UseSqLite(string.Format(connectionStringTemplate, _tempFilename + _prefix)).SetTablePrefix(_prefix + "_"));
 
-            var derivedOptions = new Mock<IOptions<JsonDerivedTypesOptions>>();
-            derivedOptions.Setup(x => x.Value)
-                .Returns(new JsonDerivedTypesOptions());
+        var derivedOptions = new Mock<IOptions<JsonDerivedTypesOptions>>();
+        derivedOptions.Setup(x => x.Value)
+            .Returns(new JsonDerivedTypesOptions());
 
-            var configuration = new DocumentJsonSerializerOptionsConfiguration(derivedOptions.Object);
+        var configuration = new DocumentJsonSerializerOptionsConfiguration(derivedOptions.Object);
 
-            var jsonOptions = new DocumentJsonSerializerOptions();
-            configuration.Configure(jsonOptions);
+        var jsonOptions = new DocumentJsonSerializerOptions();
+        configuration.Configure(jsonOptions);
 
-            var jsonSerializerOptions = new Mock<IOptions<DocumentJsonSerializerOptions>>();
-            jsonSerializerOptions.Setup(x => x.Value)
-                .Returns(jsonOptions);
+        var jsonSerializerOptions = new Mock<IOptions<DocumentJsonSerializerOptions>>();
+        jsonSerializerOptions.Setup(x => x.Value)
+            .Returns(jsonOptions);
 
-            var contentSerializer = new DefaultContentJsonSerializer(jsonSerializerOptions.Object);
+        var contentSerializer = new DefaultContentJsonSerializer(jsonSerializerOptions.Object);
 
-            _store.Configuration.ContentSerializer = contentSerializer;
-            _prefixedStore.Configuration.ContentSerializer = contentSerializer;
+        _store.Configuration.ContentSerializer = contentSerializer;
+        _prefixedStore.Configuration.ContentSerializer = contentSerializer;
 
-            await CreateTablesAsync(_store);
-            await CreateTablesAsync(_prefixedStore);
-        }
+        await CreateTablesAsync(_store);
+        await CreateTablesAsync(_prefixedStore);
+    }
 
-        public Task DisposeAsync()
-        {
-            _store.Dispose();
-            _store = null;
+    public Task DisposeAsync()
+    {
+        _store.Dispose();
+        _store = null;
 
-            _prefixedStore.Dispose();
-            _prefixedStore = null;
+        _prefixedStore.Dispose();
+        _prefixedStore = null;
 
-            if (File.Exists(_tempFilename))
+        if (File.Exists(_tempFilename))
+        {
+            try
             {
-                try
-                {
-                    File.Delete(_tempFilename);
-                }
-                catch
-                {
-
-                }
+                File.Delete(_tempFilename);
             }
-
-            var prefixFilename = _tempFilename + _prefix;
-
-            if (File.Exists(prefixFilename))
+            catch
             {
-                try
-                {
-                    File.Delete(prefixFilename);
-                }
-                catch
-                {
 
-                }
             }
-
-            return Task.CompletedTask;
         }
 
-        private static async Task CreateTablesAsync(IStore store)
+        var prefixFilename = _tempFilename + _prefix;
+
+        if (File.Exists(prefixFilename))
         {
-            await using (var session = store.CreateSession())
+            try
             {
-                var builder = new SchemaBuilder(store.Configuration, await session.BeginTransactionAsync());
-
-                await builder.CreateMapIndexTableAsync<ContentItemIndex>(table => table
-                    .Column<string>("ContentItemId", c => c.WithLength(26))
-                    .Column<string>("ContentItemVersionId", c => c.WithLength(26))
-                    .Column<bool>("Latest")
-                    .Column<bool>("Published")
-                    .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
-                    .Column<DateTime>("ModifiedUtc", column => column.Nullable())
-                    .Column<DateTime>("PublishedUtc", column => column.Nullable())
-                    .Column<DateTime>("CreatedUtc", column => column.Nullable())
-                    .Column<string>("Owner", column => column.Nullable().WithLength(ContentItemIndex.MaxOwnerSize))
-                    .Column<string>("Author", column => column.Nullable().WithLength(ContentItemIndex.MaxAuthorSize))
-                    .Column<string>("DisplayText", column => column.Nullable().WithLength(ContentItemIndex.MaxDisplayTextSize))
-                );
-
-                await builder.CreateMapIndexTableAsync<AnimalIndex>(table => table
-                    .Column<string>(nameof(AnimalIndex.Name))
-                );
-
-                await builder.CreateMapIndexTableAsync<AnimalTraitsIndex>(table => table
-                    .Column<bool>(nameof(AnimalTraitsIndex.IsHappy))
-                    .Column<bool>(nameof(AnimalTraitsIndex.IsScary))
-                );
-
-                await session.SaveChangesAsync();
+                File.Delete(prefixFilename);
             }
+            catch
+            {
 
-            store.RegisterIndexes<ContentItemIndexProvider>();
+            }
         }
 
-        [Fact]
-        public async Task ShouldFilterByContentItemIndex()
+        return Task.CompletedTask;
+    }
+
+    private static async Task CreateTablesAsync(IStore store)
+    {
+        await using (var session = store.CreateSession())
         {
-            _store.RegisterIndexes<AnimalIndexProvider>();
+            var builder = new SchemaBuilder(store.Configuration, await session.BeginTransactionAsync());
+
+            await builder.CreateMapIndexTableAsync<ContentItemIndex>(table => table
+                .Column<string>("ContentItemId", c => c.WithLength(26))
+                .Column<string>("ContentItemVersionId", c => c.WithLength(26))
+                .Column<bool>("Latest")
+                .Column<bool>("Published")
+                .Column<string>("ContentType", column => column.WithLength(ContentItemIndex.MaxContentTypeSize))
+                .Column<DateTime>("ModifiedUtc", column => column.Nullable())
+                .Column<DateTime>("PublishedUtc", column => column.Nullable())
+                .Column<DateTime>("CreatedUtc", column => column.Nullable())
+                .Column<string>("Owner", column => column.Nullable().WithLength(ContentItemIndex.MaxOwnerSize))
+                .Column<string>("Author", column => column.Nullable().WithLength(ContentItemIndex.MaxAuthorSize))
+                .Column<string>("DisplayText", column => column.Nullable().WithLength(ContentItemIndex.MaxDisplayTextSize))
+            );
+
+            await builder.CreateMapIndexTableAsync<AnimalIndex>(table => table
+                .Column<string>(nameof(AnimalIndex.Name))
+            );
+
+            await builder.CreateMapIndexTableAsync<AnimalTraitsIndex>(table => table
+                .Column<bool>(nameof(AnimalTraitsIndex.IsHappy))
+                .Column<bool>(nameof(AnimalTraitsIndex.IsScary))
+            );
 
-            using var services = new FakeServiceCollection();
-            services.Populate(new ServiceCollection());
-            services.Services.AddScoped(x => _store.CreateSession());
-            services.Services.AddScoped(x => new ShellSettings());
-            services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<ContentItemIndex>>();
-            services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<AnimalIndex>>();
-            services.Build();
+            await session.SaveChangesAsync();
+        }
 
-            var context = CreateAnimalFieldContext(services);
+        store.RegisterIndexes<ContentItemIndexProvider>();
+    }
 
-            var ci = new ContentItem { ContentType = "Animal", Published = true, ContentItemId = "1", ContentItemVersionId = "1" };
-            ci.Weld(new AnimalPart { Name = "doug" });
+    [Fact]
+    public async Task ShouldFilterByContentItemIndex()
+    {
+        _store.RegisterIndexes<AnimalIndexProvider>();
 
-            var session = context.RequestServices.GetService<ISession>();
-            await session.SaveAsync(ci);
-            await session.SaveChangesAsync();
+        using var services = new FakeServiceCollection();
+        services.Populate(new ServiceCollection());
+        services.Services.AddScoped(x => _store.CreateSession());
+        services.Services.AddScoped(x => new ShellSettings());
+        services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<ContentItemIndex>>();
+        services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<AnimalIndex>>();
+        services.Build();
 
-            var type = new ContentItemsFieldType("Animal", new Schema(services), Options.Create(new GraphQLContentOptions()), Options.Create(new GraphQLSettings { DefaultNumberOfResults = 10 }));
+        var context = CreateAnimalFieldContext(services);
 
-            context.Arguments["where"] = new ArgumentValue(JObject.Parse("{ \"contentItemId\": \"1\" }"), ArgumentSource.Variable);
-            var dogs = await ((LockedAsyncFieldResolver<IEnumerable<ContentItem>>)type.Resolver)
-                            .ResolveAsync(context) as IEnumerable<ContentItem>;
+        var ci = new ContentItem { ContentType = "Animal", Published = true, ContentItemId = "1", ContentItemVersionId = "1" };
+        ci.Weld(new AnimalPart { Name = "doug" });
 
-            Assert.Single(dogs);
-            Assert.Equal("doug", dogs.First().As<AnimalPart>().Name);
-        }
+        var session = context.RequestServices.GetService<ISession>();
+        await session.SaveAsync(ci);
+        await session.SaveChangesAsync();
 
-        [Fact]
-        public async Task ShouldFilterByContentItemIndexWhenSqlTablePrefixIsUsed()
-        {
-            _prefixedStore.RegisterIndexes<AnimalIndexProvider>();
+        var type = new ContentItemsFieldType("Animal", new Schema(services), Options.Create(new GraphQLContentOptions()), Options.Create(new GraphQLSettings { DefaultNumberOfResults = 10 }));
 
-            using var services = new FakeServiceCollection();
-            services.Populate(new ServiceCollection());
-            services.Services.AddScoped(x => _prefixedStore.CreateSession());
-            services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<ContentItemIndex>>();
-            services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<AnimalIndex>>();
-            services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<AnimalTraitsIndex>>();
+        context.Arguments["where"] = new ArgumentValue(JObject.Parse("{ \"contentItemId\": \"1\" }"), ArgumentSource.Variable);
+        var dogs = await ((LockedAsyncFieldResolver<IEnumerable<ContentItem>>)type.Resolver)
+                        .ResolveAsync(context) as IEnumerable<ContentItem>;
 
-            var shellSettings = new ShellSettings();
-            shellSettings["TablePrefix"] = _prefix;
+        Assert.Single(dogs);
+        Assert.Equal("doug", dogs.First().As<AnimalPart>().Name);
+    }
 
-            services.Services.AddScoped(x => shellSettings);
-            services.Build();
+    [Fact]
+    public async Task ShouldFilterByContentItemIndexWhenSqlTablePrefixIsUsed()
+    {
+        _prefixedStore.RegisterIndexes<AnimalIndexProvider>();
 
-            var context = CreateAnimalFieldContext(services);
+        using var services = new FakeServiceCollection();
+        services.Populate(new ServiceCollection());
+        services.Services.AddScoped(x => _prefixedStore.CreateSession());
+        services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<ContentItemIndex>>();
+        services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<AnimalIndex>>();
+        services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<AnimalTraitsIndex>>();
 
-            var ci = new ContentItem { ContentType = "Animal", Published = true, ContentItemId = "1", ContentItemVersionId = "1" };
-            ci.Weld(new AnimalPart { Name = "doug" });
+        var shellSettings = new ShellSettings();
+        shellSettings["TablePrefix"] = _prefix;
 
-            var session = context.RequestServices.GetService<ISession>();
-            await session.SaveAsync(ci);
-            await session.SaveChangesAsync();
+        services.Services.AddScoped(x => shellSettings);
+        services.Build();
 
-            var type = new ContentItemsFieldType("Animal", new Schema(services), Options.Create(new GraphQLContentOptions()), Options.Create(new GraphQLSettings { DefaultNumberOfResults = 10 }));
+        var context = CreateAnimalFieldContext(services);
 
-            context.Arguments["where"] = new ArgumentValue(JObject.Parse("{ \"contentItemId\": \"1\" }"), ArgumentSource.Variable);
-            var dogs = await ResolveContentItems(type, context);
+        var ci = new ContentItem { ContentType = "Animal", Published = true, ContentItemId = "1", ContentItemVersionId = "1" };
+        ci.Weld(new AnimalPart { Name = "doug" });
 
-            Assert.Single(dogs);
-            Assert.Equal("doug", dogs.First().As<AnimalPart>().Name);
-        }
+        var session = context.RequestServices.GetService<ISession>();
+        await session.SaveAsync(ci);
+        await session.SaveChangesAsync();
 
-        [Theory]
-        [InlineData("animal")]
-        [InlineData("ANIMAL")]
-        [InlineData("Animal")]
-        public async Task ShouldFilterByAliasIndexRegardlessOfInputFieldCase(string fieldName)
-        {
-            _store.RegisterIndexes<AnimalIndexProvider>();
+        var type = new ContentItemsFieldType("Animal", new Schema(services), Options.Create(new GraphQLContentOptions()), Options.Create(new GraphQLSettings { DefaultNumberOfResults = 10 }));
 
-            using var services = new FakeServiceCollection();
-            services.Populate(new ServiceCollection());
-            services.Services.AddScoped(x => _store.CreateSession());
-            services.Services.AddScoped(x => new ShellSettings());
-            services.Services.AddIndexProvider<AnimalIndexProvider>();
-            services.Services.AddScoped<IIndexAliasProvider, MultipleAliasIndexProvider>();
-            services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<AnimalIndex>>();
-            services.Build();
+        context.Arguments["where"] = new ArgumentValue(JObject.Parse("{ \"contentItemId\": \"1\" }"), ArgumentSource.Variable);
+        var dogs = await ResolveContentItems(type, context);
 
-            var context = CreateAnimalFieldContext(services, fieldName);
+        Assert.Single(dogs);
+        Assert.Equal("doug", dogs.First().As<AnimalPart>().Name);
+    }
 
-            var ci = new ContentItem { ContentType = "Animal", Published = true, ContentItemId = "1", ContentItemVersionId = "1" };
-            ci.Weld(new AnimalPart { Name = "doug" });
+    [Theory]
+    [InlineData("animal")]
+    [InlineData("ANIMAL")]
+    [InlineData("Animal")]
+    public async Task ShouldFilterByAliasIndexRegardlessOfInputFieldCase(string fieldName)
+    {
+        _store.RegisterIndexes<AnimalIndexProvider>();
 
-            var session = context.RequestServices.GetService<ISession>();
-            await session.SaveAsync(ci);
-            await session.SaveChangesAsync();
+        using var services = new FakeServiceCollection();
+        services.Populate(new ServiceCollection());
+        services.Services.AddScoped(x => _store.CreateSession());
+        services.Services.AddScoped(x => new ShellSettings());
+        services.Services.AddIndexProvider<AnimalIndexProvider>();
+        services.Services.AddScoped<IIndexAliasProvider, MultipleAliasIndexProvider>();
+        services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<AnimalIndex>>();
+        services.Build();
 
-            var type = new ContentItemsFieldType("Animal",
-                new Schema(services),
-                Options.Create(new GraphQLContentOptions()),
-                Options.Create(new GraphQLSettings { DefaultNumberOfResults = 10 }));
+        var context = CreateAnimalFieldContext(services, fieldName);
 
-            context.Arguments["where"] = new ArgumentValue(JObject.Parse($"{{\"{fieldName}\" : {{ \"name\": \"doug\" }} }}"), ArgumentSource.Variable);
-            var dogs = await ResolveContentItems(type, context);
+        var ci = new ContentItem { ContentType = "Animal", Published = true, ContentItemId = "1", ContentItemVersionId = "1" };
+        ci.Weld(new AnimalPart { Name = "doug" });
 
-            Assert.Single(dogs);
-            Assert.Equal("doug", dogs.First().As<AnimalPart>().Name);
-        }
+        var session = context.RequestServices.GetService<ISession>();
+        await session.SaveAsync(ci);
+        await session.SaveChangesAsync();
 
-        [Fact]
-        public async Task ShouldBeAbleToUseTheSameIndexForMultipleAliases()
-        {
-            _store.RegisterIndexes<AnimalIndexProvider>();
+        var type = new ContentItemsFieldType("Animal",
+            new Schema(services),
+            Options.Create(new GraphQLContentOptions()),
+            Options.Create(new GraphQLSettings { DefaultNumberOfResults = 10 }));
 
-            using var services = new FakeServiceCollection();
-            services.Populate(new ServiceCollection());
-            services.Services.AddScoped(x => new ShellSettings());
-            services.Services.AddScoped(x => _store.CreateSession());
-            services.Services.AddIndexProvider<ContentItemIndexProvider>();
-            services.Services.AddIndexProvider<AnimalIndexProvider>();
-            services.Services.AddScoped<IIndexAliasProvider, MultipleAliasIndexProvider>();
-            services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<AnimalIndex>>();
+        context.Arguments["where"] = new ArgumentValue(JObject.Parse($"{{\"{fieldName}\" : {{ \"name\": \"doug\" }} }}"), ArgumentSource.Variable);
+        var dogs = await ResolveContentItems(type, context);
 
-            services.Build();
-            var context = CreateAnimalFieldContext(services);
+        Assert.Single(dogs);
+        Assert.Equal("doug", dogs.First().As<AnimalPart>().Name);
+    }
 
-            var ci = new ContentItem { ContentType = "Animal", Published = true, ContentItemId = "1", ContentItemVersionId = "1" };
-            ci.Weld(new Animal { Name = "doug" });
+    [Fact]
+    public async Task ShouldBeAbleToUseTheSameIndexForMultipleAliases()
+    {
+        _store.RegisterIndexes<AnimalIndexProvider>();
 
-            var session = context.RequestServices.GetService<ISession>();
-            await session.SaveAsync(ci);
-            await session.SaveChangesAsync();
+        using var services = new FakeServiceCollection();
+        services.Populate(new ServiceCollection());
+        services.Services.AddScoped(x => new ShellSettings());
+        services.Services.AddScoped(x => _store.CreateSession());
+        services.Services.AddIndexProvider<ContentItemIndexProvider>();
+        services.Services.AddIndexProvider<AnimalIndexProvider>();
+        services.Services.AddScoped<IIndexAliasProvider, MultipleAliasIndexProvider>();
+        services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<AnimalIndex>>();
 
-            var type = new ContentItemsFieldType("Animal", new Schema(), Options.Create(new GraphQLContentOptions()), Options.Create(new GraphQLSettings { DefaultNumberOfResults = 10 }));
+        services.Build();
+        var context = CreateAnimalFieldContext(services);
 
-            context.Arguments["where"] = new ArgumentValue(JObject.Parse("{ \"cats\": { \"name\": \"doug\" } }"), ArgumentSource.Variable);
-            var cats = await ResolveContentItems(type, context);
+        var ci = new ContentItem { ContentType = "Animal", Published = true, ContentItemId = "1", ContentItemVersionId = "1" };
+        ci.Weld(new Animal { Name = "doug" });
 
-            Assert.Single(cats);
-            Assert.Equal("doug", cats.First().As<Animal>().Name);
+        var session = context.RequestServices.GetService<ISession>();
+        await session.SaveAsync(ci);
+        await session.SaveChangesAsync();
 
-            context.Arguments["where"] = new ArgumentValue(JObject.Parse("{ \"dogs\": { \"name\": \"doug\" } }"), ArgumentSource.Variable);
-            var dogs = await ResolveContentItems(type, context);
+        var type = new ContentItemsFieldType("Animal", new Schema(), Options.Create(new GraphQLContentOptions()), Options.Create(new GraphQLSettings { DefaultNumberOfResults = 10 }));
 
-            Assert.Single(dogs);
-            Assert.Equal("doug", dogs.First().As<Animal>().Name);
-        }
+        context.Arguments["where"] = new ArgumentValue(JObject.Parse("{ \"cats\": { \"name\": \"doug\" } }"), ArgumentSource.Variable);
+        var cats = await ResolveContentItems(type, context);
 
-        [Fact]
-        public async Task ShouldFilterOnMultipleIndexesOnSameAlias()
-        {
-            _store.RegisterIndexes<AnimalIndexProvider>();
-            _store.RegisterIndexes<AnimalTraitsIndexProvider>();
+        Assert.Single(cats);
+        Assert.Equal("doug", cats.First().As<Animal>().Name);
 
-            using var services = new FakeServiceCollection();
-            services.Populate(new ServiceCollection());
-            services.Services.AddScoped(x => new ShellSettings());
-            services.Services.AddScoped(x => _store.CreateSession());
-            services.Services.AddIndexProvider<ContentItemIndexProvider>();
-            services.Services.AddIndexProvider<AnimalIndexProvider>();
-            services.Services.AddIndexProvider<AnimalTraitsIndexProvider>();
-            services.Services.AddScoped<IIndexAliasProvider, MultipleIndexesIndexProvider>();
+        context.Arguments["where"] = new ArgumentValue(JObject.Parse("{ \"dogs\": { \"name\": \"doug\" } }"), ArgumentSource.Variable);
+        var dogs = await ResolveContentItems(type, context);
 
-            services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<AnimalIndex>>();
-            services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<AnimalTraitsIndex>>();
-            services.Build();
+        Assert.Single(dogs);
+        Assert.Equal("doug", dogs.First().As<Animal>().Name);
+    }
 
-            var context = CreateAnimalFieldContext(services);
+    [Fact]
+    public async Task ShouldFilterOnMultipleIndexesOnSameAlias()
+    {
+        _store.RegisterIndexes<AnimalIndexProvider>();
+        _store.RegisterIndexes<AnimalTraitsIndexProvider>();
 
-            var ci = new ContentItem { ContentType = "Animal", Published = true, ContentItemId = "1", ContentItemVersionId = "1" };
-            ci.Weld(new Animal { Name = "doug", IsHappy = true, IsScary = false });
+        using var services = new FakeServiceCollection();
+        services.Populate(new ServiceCollection());
+        services.Services.AddScoped(x => new ShellSettings());
+        services.Services.AddScoped(x => _store.CreateSession());
+        services.Services.AddIndexProvider<ContentItemIndexProvider>();
+        services.Services.AddIndexProvider<AnimalIndexProvider>();
+        services.Services.AddIndexProvider<AnimalTraitsIndexProvider>();
+        services.Services.AddScoped<IIndexAliasProvider, MultipleIndexesIndexProvider>();
 
-            var ci1 = new ContentItem { ContentType = "Animal", Published = true, ContentItemId = "2", ContentItemVersionId = "2" };
-            ci1.Weld(new Animal { Name = "doug", IsHappy = false, IsScary = true });
+        services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<AnimalIndex>>();
+        services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<AnimalTraitsIndex>>();
+        services.Build();
 
-            var ci2 = new ContentItem { ContentType = "Animal", Published = true, ContentItemId = "3", ContentItemVersionId = "3" };
-            ci2.Weld(new Animal { Name = "tommy", IsHappy = false, IsScary = true });
+        var context = CreateAnimalFieldContext(services);
 
-            var session = context.RequestServices.GetService<ISession>();
-            await session.SaveAsync(ci);
-            await session.SaveAsync(ci1);
-            await session.SaveAsync(ci2);
-            await session.SaveChangesAsync();
+        var ci = new ContentItem { ContentType = "Animal", Published = true, ContentItemId = "1", ContentItemVersionId = "1" };
+        ci.Weld(new Animal { Name = "doug", IsHappy = true, IsScary = false });
 
-            var type = new ContentItemsFieldType("Animal", new Schema(), Options.Create(new GraphQLContentOptions()), Options.Create(new GraphQLSettings { DefaultNumberOfResults = 10 }));
+        var ci1 = new ContentItem { ContentType = "Animal", Published = true, ContentItemId = "2", ContentItemVersionId = "2" };
+        ci1.Weld(new Animal { Name = "doug", IsHappy = false, IsScary = true });
 
-            context.Arguments["where"] = new ArgumentValue(JObject.Parse("{ \"animals\": { \"name\": \"doug\", \"isScary\": true } }"), ArgumentSource.Variable);
-            var animals = await ResolveContentItems(type, context);
+        var ci2 = new ContentItem { ContentType = "Animal", Published = true, ContentItemId = "3", ContentItemVersionId = "3" };
+        ci2.Weld(new Animal { Name = "tommy", IsHappy = false, IsScary = true });
 
-            Assert.Single(animals);
-            Assert.Equal("doug", animals.First().As<Animal>().Name);
-            Assert.True(animals.First().As<Animal>().IsScary);
-            Assert.False(animals.First().As<Animal>().IsHappy);
-        }
+        var session = context.RequestServices.GetService<ISession>();
+        await session.SaveAsync(ci);
+        await session.SaveAsync(ci1);
+        await session.SaveAsync(ci2);
+        await session.SaveChangesAsync();
 
-        [Fact]
-        public async Task ShouldFilterPartsWithoutAPrefixWhenThePartHasNoPrefix()
-        {
-            _store.RegisterIndexes<AnimalIndexProvider>();
+        var type = new ContentItemsFieldType("Animal", new Schema(), Options.Create(new GraphQLContentOptions()), Options.Create(new GraphQLSettings { DefaultNumberOfResults = 10 }));
 
-            using var services = new FakeServiceCollection();
-            services.Populate(new ServiceCollection());
-            services.Services.AddScoped(x => _store.CreateSession());
-            services.Services.AddScoped(x => new ShellSettings());
-            services.Services.AddIndexProvider<ContentItemIndexProvider>();
-            services.Services.AddIndexProvider<AnimalIndexProvider>();
-            services.Services.AddScoped<IIndexAliasProvider, MultipleAliasIndexProvider>();
-            services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<AnimalIndex>>();
-            services.Build();
+        context.Arguments["where"] = new ArgumentValue(JObject.Parse("{ \"animals\": { \"name\": \"doug\", \"isScary\": true } }"), ArgumentSource.Variable);
+        var animals = await ResolveContentItems(type, context);
 
-            var context = CreateAnimalFieldContext(services);
+        Assert.Single(animals);
+        Assert.Equal("doug", animals.First().As<Animal>().Name);
+        Assert.True(animals.First().As<Animal>().IsScary);
+        Assert.False(animals.First().As<Animal>().IsHappy);
+    }
 
-            var ci = new ContentItem { ContentType = "Animal", Published = true, ContentItemId = "1", ContentItemVersionId = "1" };
-            ci.Weld(new AnimalPart { Name = "doug" });
+    [Fact]
+    public async Task ShouldFilterPartsWithoutAPrefixWhenThePartHasNoPrefix()
+    {
+        _store.RegisterIndexes<AnimalIndexProvider>();
 
-            var session = context.RequestServices.GetService<ISession>();
-            await session.SaveAsync(ci);
-            await session.SaveChangesAsync();
+        using var services = new FakeServiceCollection();
+        services.Populate(new ServiceCollection());
+        services.Services.AddScoped(x => _store.CreateSession());
+        services.Services.AddScoped(x => new ShellSettings());
+        services.Services.AddIndexProvider<ContentItemIndexProvider>();
+        services.Services.AddIndexProvider<AnimalIndexProvider>();
+        services.Services.AddScoped<IIndexAliasProvider, MultipleAliasIndexProvider>();
+        services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<AnimalIndex>>();
+        services.Build();
 
-            var type = new ContentItemsFieldType("Animal", new Schema(), Options.Create(new GraphQLContentOptions()), Options.Create(new GraphQLSettings { DefaultNumberOfResults = 10 }));
+        var context = CreateAnimalFieldContext(services);
 
-            context.Arguments["where"] = new ArgumentValue(JObject.Parse("{ \"animal\": { \"name\": \"doug\" } }"), ArgumentSource.Variable);
-            var dogs = await ResolveContentItems(type, context);
+        var ci = new ContentItem { ContentType = "Animal", Published = true, ContentItemId = "1", ContentItemVersionId = "1" };
+        ci.Weld(new AnimalPart { Name = "doug" });
 
-            Assert.Single(dogs);
-            Assert.Equal("doug", dogs.First().As<AnimalPart>().Name);
-        }
+        var session = context.RequestServices.GetService<ISession>();
+        await session.SaveAsync(ci);
+        await session.SaveChangesAsync();
 
-        [Fact]
-        public async Task ShouldFilterByCollapsedWhereInputForCollapsedParts()
-        {
-            _store.RegisterIndexes<AnimalIndexProvider>();
+        var type = new ContentItemsFieldType("Animal", new Schema(), Options.Create(new GraphQLContentOptions()), Options.Create(new GraphQLSettings { DefaultNumberOfResults = 10 }));
 
-            using var services = new FakeServiceCollection();
-            services.Populate(new ServiceCollection());
-            services.Services.AddScoped(x => new ShellSettings());
-            services.Services.AddScoped(x => _store.CreateSession());
-            services.Services.AddIndexProvider<ContentItemIndexProvider>();
-            services.Services.AddIndexProvider<AnimalIndexProvider>();
-            services.Services.AddScoped<IIndexAliasProvider, MultipleAliasIndexProvider>();
-            services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<AnimalIndex>>();
-            services.Build();
+        context.Arguments["where"] = new ArgumentValue(JObject.Parse("{ \"animal\": { \"name\": \"doug\" } }"), ArgumentSource.Variable);
+        var dogs = await ResolveContentItems(type, context);
 
-            var context = CreateAnimalFieldContext(services, collapsed: true);
+        Assert.Single(dogs);
+        Assert.Equal("doug", dogs.First().As<AnimalPart>().Name);
+    }
 
-            var ci = new ContentItem { ContentType = "Animal", Published = true, ContentItemId = "1", ContentItemVersionId = "1" };
-            ci.Weld(new AnimalPart { Name = "doug" });
+    [Fact]
+    public async Task ShouldFilterByCollapsedWhereInputForCollapsedParts()
+    {
+        _store.RegisterIndexes<AnimalIndexProvider>();
 
-            var session = context.RequestServices.GetService<ISession>();
-            await session.SaveAsync(ci);
-            await session.SaveChangesAsync();
+        using var services = new FakeServiceCollection();
+        services.Populate(new ServiceCollection());
+        services.Services.AddScoped(x => new ShellSettings());
+        services.Services.AddScoped(x => _store.CreateSession());
+        services.Services.AddIndexProvider<ContentItemIndexProvider>();
+        services.Services.AddIndexProvider<AnimalIndexProvider>();
+        services.Services.AddScoped<IIndexAliasProvider, MultipleAliasIndexProvider>();
+        services.Services.AddSingleton<IIndexPropertyProvider, IndexPropertyProvider<AnimalIndex>>();
+        services.Build();
 
-            var type = new ContentItemsFieldType("Animal", new Schema(), Options.Create(new GraphQLContentOptions()), Options.Create(new GraphQLSettings { DefaultNumberOfResults = 10 }));
+        var context = CreateAnimalFieldContext(services, collapsed: true);
 
-            context.Arguments["where"] = new ArgumentValue(JObject.Parse("{ \"name\": \"doug\" }"), ArgumentSource.Variable);
-            var dogs = await ResolveContentItems(type, context);
+        var ci = new ContentItem { ContentType = "Animal", Published = true, ContentItemId = "1", ContentItemVersionId = "1" };
+        ci.Weld(new AnimalPart { Name = "doug" });
 
-            Assert.Single(dogs);
-            Assert.Equal("doug", dogs.First().As<AnimalPart>().Name);
-        }
+        var session = context.RequestServices.GetService<ISession>();
+        await session.SaveAsync(ci);
+        await session.SaveChangesAsync();
 
-        private static async Task<IEnumerable<ContentItem>> ResolveContentItems(ContentItemsFieldType type, ResolveFieldContext context)
-        {
-            return (await ((LockedAsyncFieldResolver<IEnumerable<ContentItem>>)type.Resolver).ResolveAsync(context)) as IEnumerable<ContentItem>;
-        }
-        private static ResolveFieldContext CreateAnimalFieldContext(IServiceProvider services, string fieldName = null, bool collapsed = false)
-        {
-            IGraphType where;
+        var type = new ContentItemsFieldType("Animal", new Schema(), Options.Create(new GraphQLContentOptions()), Options.Create(new GraphQLSettings { DefaultNumberOfResults = 10 }));
 
-            if (!collapsed)
-            {
-                where = new AnimalPartWhereInput(fieldName ?? "Animal");
-            }
-            else
-            {
-                where = new AnimalPartCollapsedWhereInput();
-            }
+        context.Arguments["where"] = new ArgumentValue(JObject.Parse("{ \"name\": \"doug\" }"), ArgumentSource.Variable);
+        var dogs = await ResolveContentItems(type, context);
 
-            return new ResolveFieldContext
-            {
-                Arguments = new Dictionary<string, ArgumentValue>(),
-                UserContext = new GraphQLUserContext(),
-                FieldDefinition = new FieldType
-                {
-                    Name = "Inputs",
-                    ResolvedType = new ListGraphType(new StringGraphType() { Name = "Animal" }),
-                    Arguments = [
-                            new QueryArgument<WhereInputObjectGraphType>
-                            {
-                                Name = "where",
-                                Description = "filters the animals",
-                                ResolvedType = where
-                            }
-                        ]
-                },
-                RequestServices = services
-            };
-        }
+        Assert.Single(dogs);
+        Assert.Equal("doug", dogs.First().As<AnimalPart>().Name);
     }
 
-    public class AnimalPartWhereInput : WhereInputObjectGraphType
+    private static async Task<IEnumerable<ContentItem>> ResolveContentItems(ContentItemsFieldType type, ResolveFieldContext context)
     {
-        public AnimalPartWhereInput(string fieldName)
-        {
-            Name = "Test";
-            Description = "Foo";
-            var fieldType = new FieldType { Name = fieldName, Type = typeof(StringGraphType) };
-            fieldType.Metadata["PartName"] = "AnimalPart";
-            AddField(fieldType);
-        }
+        return (await ((LockedAsyncFieldResolver<IEnumerable<ContentItem>>)type.Resolver).ResolveAsync(context)) as IEnumerable<ContentItem>;
     }
-
-    public class AnimalPartCollapsedWhereInput : WhereInputObjectGraphType
+    private static ResolveFieldContext CreateAnimalFieldContext(IServiceProvider services, string fieldName = null, bool collapsed = false)
     {
-        public AnimalPartCollapsedWhereInput()
+        IGraphType where;
+
+        if (!collapsed)
         {
-            Name = "Test";
-            Description = "Foo";
-            var fieldType = new FieldType { Name = "Name", Type = typeof(StringGraphType) };
-            fieldType.Metadata["PartName"] = "AnimalPart";
-            fieldType.Metadata["PartCollapsed"] = true;
-            AddField(fieldType);
+            where = new AnimalPartWhereInput(fieldName ?? "Animal");
+        }
+        else
+        {
+            where = new AnimalPartCollapsedWhereInput();
         }
-    }
 
-    public class Animal : ContentPart
-    {
-        public string Name { get; set; }
-        public bool IsHappy { get; set; }
-        public bool IsScary { get; set; }
+        return new ResolveFieldContext
+        {
+            Arguments = new Dictionary<string, ArgumentValue>(),
+            UserContext = new GraphQLUserContext(),
+            FieldDefinition = new FieldType
+            {
+                Name = "Inputs",
+                ResolvedType = new ListGraphType(new StringGraphType() { Name = "Animal" }),
+                Arguments = [
+                        new QueryArgument<WhereInputObjectGraphType>
+                        {
+                            Name = "where",
+                            Description = "filters the animals",
+                            ResolvedType = where
+                        }
+                    ]
+            },
+            RequestServices = services
+        };
     }
+}
 
-    public class AnimalPart : Animal { };
-
-    public class AnimalIndex : MapIndex
+public class AnimalPartWhereInput : WhereInputObjectGraphType
+{
+    public AnimalPartWhereInput(string fieldName)
     {
-        public string Name { get; set; }
+        Name = "Test";
+        Description = "Foo";
+        var fieldType = new FieldType { Name = fieldName, Type = typeof(StringGraphType) };
+        fieldType.Metadata["PartName"] = "AnimalPart";
+        AddField(fieldType);
     }
+}
 
-    public class AnimalIndexProvider : IndexProvider<ContentItem>
+public class AnimalPartCollapsedWhereInput : WhereInputObjectGraphType
+{
+    public AnimalPartCollapsedWhereInput()
     {
-        public override void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<AnimalIndex>()
-                .Map(contentItem =>
-                {
-                    return new AnimalIndex
-                    {
-                        Name = contentItem.As<Animal>() != null
-                            ? contentItem.As<Animal>().Name
-                            : contentItem.As<AnimalPart>().Name
-                    };
-                });
-        }
+        Name = "Test";
+        Description = "Foo";
+        var fieldType = new FieldType { Name = "Name", Type = typeof(StringGraphType) };
+        fieldType.Metadata["PartName"] = "AnimalPart";
+        fieldType.Metadata["PartCollapsed"] = true;
+        AddField(fieldType);
     }
+}
 
-    public class AnimalTraitsIndex : MapIndex
-    {
-        public bool IsHappy { get; set; }
-        public bool IsScary { get; set; }
-    }
+public class Animal : ContentPart
+{
+    public string Name { get; set; }
+    public bool IsHappy { get; set; }
+    public bool IsScary { get; set; }
+}
+
+public class AnimalPart : Animal { };
+
+public class AnimalIndex : MapIndex
+{
+    public string Name { get; set; }
+}
 
-    public class AnimalTraitsIndexProvider : IndexProvider<ContentItem>
+public class AnimalIndexProvider : IndexProvider<ContentItem>
+{
+    public override void Describe(DescribeContext<ContentItem> context)
     {
-        public override void Describe(DescribeContext<ContentItem> context)
-        {
-            context.For<AnimalTraitsIndex>()
-                .Map(contentItem =>
+        context.For<AnimalIndex>()
+            .Map(contentItem =>
+            {
+                return new AnimalIndex
                 {
-                    var animal = contentItem.As<Animal>();
+                    Name = contentItem.As<Animal>() != null
+                        ? contentItem.As<Animal>().Name
+                        : contentItem.As<AnimalPart>().Name
+                };
+            });
+    }
+}
 
-                    if (animal != null)
-                    {
-                        return new AnimalTraitsIndex
-                        {
-                            IsHappy = contentItem.As<Animal>().IsHappy,
-                            IsScary = contentItem.As<Animal>().IsScary
-                        };
-                    }
+public class AnimalTraitsIndex : MapIndex
+{
+    public bool IsHappy { get; set; }
+    public bool IsScary { get; set; }
+}
 
-                    var animalPartSuffix = contentItem.As<AnimalPart>();
+public class AnimalTraitsIndexProvider : IndexProvider<ContentItem>
+{
+    public override void Describe(DescribeContext<ContentItem> context)
+    {
+        context.For<AnimalTraitsIndex>()
+            .Map(contentItem =>
+            {
+                var animal = contentItem.As<Animal>();
 
+                if (animal != null)
+                {
                     return new AnimalTraitsIndex
                     {
-                        IsHappy = animalPartSuffix.IsHappy,
-                        IsScary = animalPartSuffix.IsScary
+                        IsHappy = contentItem.As<Animal>().IsHappy,
+                        IsScary = contentItem.As<Animal>().IsScary
                     };
-                });
-        }
-    }
+                }
 
-    public class MultipleAliasIndexProvider : IIndexAliasProvider
-    {
-        private static readonly IndexAlias[] _aliases =
-        [
-            new IndexAlias
-            {
-                Alias = "cats",
-                Index = nameof(AnimalIndex),
-                IndexType = typeof(AnimalIndex)
-            },
-            new IndexAlias
-            {
-                Alias = "dogs",
-                Index = nameof(AnimalIndex),
-                IndexType = typeof(AnimalIndex)
-            },
-            new IndexAlias
-            {
-                Alias = nameof(AnimalPart),
-                Index = nameof(AnimalIndex),
-                IndexType = typeof(AnimalIndex)
-            }
-        ];
+                var animalPartSuffix = contentItem.As<AnimalPart>();
+
+                return new AnimalTraitsIndex
+                {
+                    IsHappy = animalPartSuffix.IsHappy,
+                    IsScary = animalPartSuffix.IsScary
+                };
+            });
+    }
+}
 
-        public ValueTask<IEnumerable<IndexAlias>> GetAliasesAsync()
+public class MultipleAliasIndexProvider : IIndexAliasProvider
+{
+    private static readonly IndexAlias[] _aliases =
+    [
+        new IndexAlias
+        {
+            Alias = "cats",
+            Index = nameof(AnimalIndex),
+            IndexType = typeof(AnimalIndex)
+        },
+        new IndexAlias
+        {
+            Alias = "dogs",
+            Index = nameof(AnimalIndex),
+            IndexType = typeof(AnimalIndex)
+        },
+        new IndexAlias
         {
-            return ValueTask.FromResult<IEnumerable<IndexAlias>>(_aliases);
+            Alias = nameof(AnimalPart),
+            Index = nameof(AnimalIndex),
+            IndexType = typeof(AnimalIndex)
         }
-    }
+    ];
 
-    public class MultipleIndexesIndexProvider : IIndexAliasProvider
+    public ValueTask<IEnumerable<IndexAlias>> GetAliasesAsync()
     {
-        private static readonly IndexAlias[] _aliases =
-        [
-            new IndexAlias
-            {
-                Alias = "animals.name",
-                Index = $"Name",
-                IndexType = typeof(AnimalIndex)
-            },
-            new IndexAlias
-            {
-                Alias = "animals.isHappy",
-                Index = $"IsHappy",
-                IndexType = typeof(AnimalTraitsIndex)
-            },
-            new IndexAlias
-            {
-                Alias = "animals.isScary",
-                Index = $"IsScary",
-                IndexType = typeof(AnimalTraitsIndex)
-            }
-        ];
+        return ValueTask.FromResult<IEnumerable<IndexAlias>>(_aliases);
+    }
+}
 
-        public ValueTask<IEnumerable<IndexAlias>> GetAliasesAsync()
+public class MultipleIndexesIndexProvider : IIndexAliasProvider
+{
+    private static readonly IndexAlias[] _aliases =
+    [
+        new IndexAlias
+        {
+            Alias = "animals.name",
+            Index = $"Name",
+            IndexType = typeof(AnimalIndex)
+        },
+        new IndexAlias
+        {
+            Alias = "animals.isHappy",
+            Index = $"IsHappy",
+            IndexType = typeof(AnimalTraitsIndex)
+        },
+        new IndexAlias
         {
-            return ValueTask.FromResult<IEnumerable<IndexAlias>>(_aliases);
+            Alias = "animals.isScary",
+            Index = $"IsScary",
+            IndexType = typeof(AnimalTraitsIndex)
         }
-    }
+    ];
 
-    public class FakeServiceCollection : IServiceProvider, IDisposable
+    public ValueTask<IEnumerable<IndexAlias>> GetAliasesAsync()
     {
-        private ServiceProvider _inner;
-        private IServiceCollection _services;
+        return ValueTask.FromResult<IEnumerable<IndexAlias>>(_aliases);
+    }
+}
 
-        public IServiceCollection Services => _services;
+public class FakeServiceCollection : IServiceProvider, IDisposable
+{
+    private ServiceProvider _inner;
+    private IServiceCollection _services;
 
-        public string State { get; set; }
+    public IServiceCollection Services => _services;
 
-        public object GetService(Type serviceType)
-        {
-            return _inner.GetService(serviceType);
-        }
+    public string State { get; set; }
 
-        public void Populate(IServiceCollection services)
-        {
-            _services = services;
-            _services.AddSingleton(this);
-        }
+    public object GetService(Type serviceType)
+    {
+        return _inner.GetService(serviceType);
+    }
 
-        public void Build()
-        {
-            _inner = _services.BuildServiceProvider();
-        }
+    public void Populate(IServiceCollection services)
+    {
+        _services = services;
+        _services.AddSingleton(this);
+    }
+
+    public void Build()
+    {
+        _inner = _services.BuildServiceProvider();
+    }
 
 #pragma warning disable CA1816 // Dispose methods should call SuppressFinalize
-        public void Dispose()
+    public void Dispose()
 #pragma warning restore CA1816 // Dispose methods should call SuppressFinalize
-        {
-            (_inner as IDisposable)?.Dispose();
-        }
+    {
+        (_inner as IDisposable)?.Dispose();
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/GraphQL/Queries/PredicateQueryTests.cs b/test/OrchardCore.Tests/Apis/GraphQL/Queries/PredicateQueryTests.cs
index 99b567547dc..b0b60f4e9a2 100644
--- a/test/OrchardCore.Tests/Apis/GraphQL/Queries/PredicateQueryTests.cs
+++ b/test/OrchardCore.Tests/Apis/GraphQL/Queries/PredicateQueryTests.cs
@@ -1,4 +1,4 @@
-using OrchardCore.ContentManagement.GraphQL.Queries;
+using OrchardCore.ContentManagement.GraphQL.Queries;
 using OrchardCore.ContentManagement.GraphQL.Queries.Predicates;
 using YesSql.Indexes;
 
diff --git a/test/OrchardCore.Tests/Apis/GraphQL/Queries/RecentBlogPostsQueryTests.cs b/test/OrchardCore.Tests/Apis/GraphQL/Queries/RecentBlogPostsQueryTests.cs
index 79a0033299b..f9d9830618a 100644
--- a/test/OrchardCore.Tests/Apis/GraphQL/Queries/RecentBlogPostsQueryTests.cs
+++ b/test/OrchardCore.Tests/Apis/GraphQL/Queries/RecentBlogPostsQueryTests.cs
@@ -2,52 +2,51 @@
 using OrchardCore.Lists.Models;
 using OrchardCore.Tests.Apis.Context;
 
-namespace OrchardCore.Tests.Apis.GraphQL
+namespace OrchardCore.Tests.Apis.GraphQL;
+
+public class RecentBlogPostsQueryTests
 {
-    public class RecentBlogPostsQueryTests
+    [Fact]
+    public async Task ShouldListBlogPostWhenCallingAQuery()
     {
-        [Fact]
-        public async Task ShouldListBlogPostWhenCallingAQuery()
-        {
-            using var context = new BlogContext();
-            await context.InitializeAsync();
-
-            var blogPostContentItemId = await context
-                .CreateContentItem("BlogPost", builder =>
-                {
-                    builder.Published = true;
-                    builder.Latest = true;
-                    builder.DisplayText = "Some sorta blogpost in a Query!";
-
-                    builder
-                        .Weld(new ContainedPart
-                        {
-                            ListContentItemId = context.BlogContentItemId
-                        });
-                });
-
-            var result = await context
-                .GraphQLClient
-                .Content
-                .Query("RecentBlogPosts", builder =>
-                {
-                    builder
-                        .WithField("displayText");
-                });
-
-            var jsonArray = result["data"]?["recentBlogPosts"]?.AsArray();
-
-            Assert.NotNull(jsonArray);
-            Assert.Equal(2, jsonArray.Count);
-
-            // The RecentBlogPosts query sorts the content items by CreatedUtc. If the
-            // test is executing too fast, both blog entries may have the same CreatedUtc
-            // value and ordering becomes random. Because of this, we do not assert the order
-            // of the result.
-            var displayTexts = jsonArray.Select(node => node["displayText"]?.ToString());
-
-            Assert.Contains("Some sorta blogpost in a Query!", displayTexts);
-            Assert.Contains("Man must explore, and this is exploration at its greatest", displayTexts);
-        }
+        using var context = new BlogContext();
+        await context.InitializeAsync();
+
+        var blogPostContentItemId = await context
+            .CreateContentItem("BlogPost", builder =>
+            {
+                builder.Published = true;
+                builder.Latest = true;
+                builder.DisplayText = "Some sorta blogpost in a Query!";
+
+                builder
+                    .Weld(new ContainedPart
+                    {
+                        ListContentItemId = context.BlogContentItemId
+                    });
+            });
+
+        var result = await context
+            .GraphQLClient
+            .Content
+            .Query("RecentBlogPosts", builder =>
+            {
+                builder
+                    .WithField("displayText");
+            });
+
+        var jsonArray = result["data"]?["recentBlogPosts"]?.AsArray();
+
+        Assert.NotNull(jsonArray);
+        Assert.Equal(2, jsonArray.Count);
+
+        // The RecentBlogPosts query sorts the content items by CreatedUtc. If the
+        // test is executing too fast, both blog entries may have the same CreatedUtc
+        // value and ordering becomes random. Because of this, we do not assert the order
+        // of the result.
+        var displayTexts = jsonArray.Select(node => node["displayText"]?.ToString());
+
+        Assert.Contains("Some sorta blogpost in a Query!", displayTexts);
+        Assert.Contains("Man must explore, and this is exploration at its greatest", displayTexts);
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/GraphQL/ValidationRules/RequiresPermissionValidationRuleTests.cs b/test/OrchardCore.Tests/Apis/GraphQL/ValidationRules/RequiresPermissionValidationRuleTests.cs
index 161e7b0f84d..f323976b2c5 100644
--- a/test/OrchardCore.Tests/Apis/GraphQL/ValidationRules/RequiresPermissionValidationRuleTests.cs
+++ b/test/OrchardCore.Tests/Apis/GraphQL/ValidationRules/RequiresPermissionValidationRuleTests.cs
@@ -9,172 +9,171 @@
 using OrchardCore.Security.Permissions;
 using OrchardCore.Tests.Apis.Context;
 
-namespace OrchardCore.Tests.Apis.GraphQL.ValidationRules
+namespace OrchardCore.Tests.Apis.GraphQL.ValidationRules;
+
+public class RequiresPermissionValidationRuleTests
 {
-    public class RequiresPermissionValidationRuleTests
+    internal readonly static Dictionary<string, Permission> _permissions = new()
     {
-        internal readonly static Dictionary<string, Permission> _permissions = new()
-        {
-            { "permissionOne",  new Permission("TestPermissionOne", "TestPermissionOne") },
-            { "permissionTwo",  new Permission("TestPermissionTwo", "TestPermissionTwo") }
-        };
+        { "permissionOne",  new Permission("TestPermissionOne", "TestPermissionOne") },
+        { "permissionTwo",  new Permission("TestPermissionTwo", "TestPermissionTwo") }
+    };
 
-        [Fact]
-        public async Task FieldsWithNoRequirePermissionsShouldResolve()
-        {
-            var options = BuildExecutionOptions("query { test { noPermissions } }",
-                            new PermissionsContext
-                            {
-                                UsePermissionsContext = true
-                            });
+    [Fact]
+    public async Task FieldsWithNoRequirePermissionsShouldResolve()
+    {
+        var options = BuildExecutionOptions("query { test { noPermissions } }",
+                        new PermissionsContext
+                        {
+                            UsePermissionsContext = true
+                        });
 
-            var executer = new DocumentExecuter();
+        var executer = new DocumentExecuter();
 
-            var executionResult = await executer.ExecuteAsync(options);
+        var executionResult = await executer.ExecuteAsync(options);
 
-            Assert.Null(executionResult.Errors);
+        Assert.Null(executionResult.Errors);
 
-            var writer = new GraphQLSerializer();
-            var result = JsonObject.Parse(writer.Serialize(executionResult));
+        var writer = new GraphQLSerializer();
+        var result = JsonObject.Parse(writer.Serialize(executionResult));
 
-            Assert.Equal("Fantastic Fox Hates Permissions", result["data"]["test"]["noPermissions"].ToString());
-        }
+        Assert.Equal("Fantastic Fox Hates Permissions", result["data"]["test"]["noPermissions"].ToString());
+    }
 
-        [Theory]
-        [InlineData("permissionOne", "Fantastic Fox Loves Permission One")]
-        [InlineData("permissionTwo", "Fantastic Fox Loves Permission Two")]
-        public async Task FieldsWithRequirePermissionsShouldResolveWhenUserHasPermissions(string fieldName, string expectedFieldValue)
-        {
-            var options = BuildExecutionOptions($"query {{ test {{{fieldName}}} }}",
-                            new PermissionsContext
-                            {
-                                UsePermissionsContext = true,
-                                AuthorizedPermissions = new[] { _permissions[fieldName] }
-                            });
+    [Theory]
+    [InlineData("permissionOne", "Fantastic Fox Loves Permission One")]
+    [InlineData("permissionTwo", "Fantastic Fox Loves Permission Two")]
+    public async Task FieldsWithRequirePermissionsShouldResolveWhenUserHasPermissions(string fieldName, string expectedFieldValue)
+    {
+        var options = BuildExecutionOptions($"query {{ test {{{fieldName}}} }}",
+                        new PermissionsContext
+                        {
+                            UsePermissionsContext = true,
+                            AuthorizedPermissions = new[] { _permissions[fieldName] }
+                        });
 
-            var executer = new DocumentExecuter();
+        var executer = new DocumentExecuter();
 
-            var executionResult = await executer.ExecuteAsync(options);
+        var executionResult = await executer.ExecuteAsync(options);
 
-            Assert.Null(executionResult.Errors);
+        Assert.Null(executionResult.Errors);
 
-            var writer = new GraphQLSerializer();
-            var result = JObject.Parse(writer.Serialize(executionResult));
+        var writer = new GraphQLSerializer();
+        var result = JObject.Parse(writer.Serialize(executionResult));
 
-            Assert.Equal(expectedFieldValue, result["data"]["test"][fieldName].ToString());
-        }
+        Assert.Equal(expectedFieldValue, result["data"]["test"][fieldName].ToString());
+    }
 
-        [Fact]
-        public async Task FieldsWithRequirePermissionsShouldNotResolveWhenUserDoesntHavePermissions()
-        {
-            var options = BuildExecutionOptions("query { test { permissionOne } }",
-                new PermissionsContext
-                {
-                    UsePermissionsContext = true
-                });
+    [Fact]
+    public async Task FieldsWithRequirePermissionsShouldNotResolveWhenUserDoesntHavePermissions()
+    {
+        var options = BuildExecutionOptions("query { test { permissionOne } }",
+            new PermissionsContext
+            {
+                UsePermissionsContext = true
+            });
 
-            var executer = new DocumentExecuter();
+        var executer = new DocumentExecuter();
 
-            var executionResult = await executer.ExecuteAsync(options);
+        var executionResult = await executer.ExecuteAsync(options);
 
-            Assert.NotEmpty(executionResult.Errors);
-        }
+        Assert.NotEmpty(executionResult.Errors);
+    }
 
-        [Fact]
-        public async Task FieldsWithMultipleRequirePermissionsShouldResolveWhenUserHasAllPermissions()
-        {
-            var options = BuildExecutionOptions("query { test { permissionMultiple  } }",
-                            new PermissionsContext
-                            {
-                                UsePermissionsContext = true,
-                                AuthorizedPermissions = _permissions.Values
-                            });
+    [Fact]
+    public async Task FieldsWithMultipleRequirePermissionsShouldResolveWhenUserHasAllPermissions()
+    {
+        var options = BuildExecutionOptions("query { test { permissionMultiple  } }",
+                        new PermissionsContext
+                        {
+                            UsePermissionsContext = true,
+                            AuthorizedPermissions = _permissions.Values
+                        });
 
-            var executer = new DocumentExecuter();
+        var executer = new DocumentExecuter();
 
-            var executionResult = await executer.ExecuteAsync(options);
+        var executionResult = await executer.ExecuteAsync(options);
 
-            Assert.Null(executionResult.Errors);
+        Assert.Null(executionResult.Errors);
 
-            var writer = new GraphQLSerializer();
-            var result = JObject.Parse(writer.Serialize(executionResult));
+        var writer = new GraphQLSerializer();
+        var result = JObject.Parse(writer.Serialize(executionResult));
 
-            Assert.Equal("Fantastic Fox Loves Multiple Permissions", result["data"]["test"]["permissionMultiple"].ToString());
-        }
+        Assert.Equal("Fantastic Fox Loves Multiple Permissions", result["data"]["test"]["permissionMultiple"].ToString());
+    }
 
-        private static ExecutionOptions BuildExecutionOptions(string query, PermissionsContext permissionsContext)
-        {
-            var services = new ServiceCollection();
-            services.AddAuthorization();
-            services.AddLogging();
-            services.AddOptions();
-            services.AddLocalization();
+    private static ExecutionOptions BuildExecutionOptions(string query, PermissionsContext permissionsContext)
+    {
+        var services = new ServiceCollection();
+        services.AddAuthorization();
+        services.AddLogging();
+        services.AddOptions();
+        services.AddLocalization();
 
-            services.AddScoped<IAuthorizationHandler, PermissionContextAuthorizationHandler>(x =>
-            {
-                return new PermissionContextAuthorizationHandler(permissionsContext);
-            });
+        services.AddScoped<IAuthorizationHandler, PermissionContextAuthorizationHandler>(x =>
+        {
+            return new PermissionContextAuthorizationHandler(permissionsContext);
+        });
 
-            services.AddScoped<IValidationRule, RequiresPermissionValidationRule>();
-            services.AddLocalization();
-            var serviceProvider = services.BuildServiceProvider();
+        services.AddScoped<IValidationRule, RequiresPermissionValidationRule>();
+        services.AddLocalization();
+        var serviceProvider = services.BuildServiceProvider();
 
-            return new ExecutionOptions
+        return new ExecutionOptions
+        {
+            Query = query,
+            Schema = new ValidationSchema(),
+            UserContext = new GraphQLUserContext
             {
-                Query = query,
-                Schema = new ValidationSchema(),
-                UserContext = new GraphQLUserContext
-                {
-                    User = new ClaimsPrincipal(new StubIdentity())
-                },
-                ValidationRules = DocumentValidator.CoreRules.Concat(serviceProvider.GetServices<IValidationRule>())
-            };
-        }
+                User = new ClaimsPrincipal(new StubIdentity())
+            },
+            ValidationRules = DocumentValidator.CoreRules.Concat(serviceProvider.GetServices<IValidationRule>())
+        };
+    }
 
-        private sealed class ValidationSchema : Schema
+    private sealed class ValidationSchema : Schema
+    {
+        public ValidationSchema()
         {
-            public ValidationSchema()
-            {
-                RegisterType(typeof(TestField));
-                Query = new ValidationQueryRoot { Name = "Query" };
-                NameConverter = new CamelCaseNameConverter();
-            }
+            RegisterType(typeof(TestField));
+            Query = new ValidationQueryRoot { Name = "Query" };
+            NameConverter = new CamelCaseNameConverter();
         }
+    }
 
-        private sealed class ValidationQueryRoot : ObjectGraphType
+    private sealed class ValidationQueryRoot : ObjectGraphType
+    {
+        public ValidationQueryRoot()
         {
-            public ValidationQueryRoot()
-            {
-                Field<TestField>("test")
-                    .Returns<object>()
-                    .Resolve(_ => new object());
-            }
+            Field<TestField>("test")
+                .Returns<object>()
+                .Resolve(_ => new object());
         }
+    }
 
-        private sealed class TestField : ObjectGraphType
+    private sealed class TestField : ObjectGraphType
+    {
+        public TestField()
         {
-            public TestField()
-            {
-                Field<StringGraphType>("NoPermissions")
-                     .Returns<string>()
-                     .Resolve(_ => "Fantastic Fox Hates Permissions");
-
-                Field<StringGraphType>("PermissionOne")
-                    .Returns<string>()
-                    .RequirePermission(_permissions["permissionOne"])
-                    .Resolve(_ => "Fantastic Fox Loves Permission One");
-
-                Field<StringGraphType>("PermissionTwo")
-                     .Returns<string>()
-                     .RequirePermission(_permissions["permissionTwo"])
-                     .Resolve(_ => "Fantastic Fox Loves Permission Two");
-
-                Field<StringGraphType>("PermissionMultiple")
-                     .Returns<string>()
-                     .RequirePermission(_permissions["permissionOne"])
-                     .RequirePermission(_permissions["permissionTwo"])
-                     .Resolve(_ => "Fantastic Fox Loves Multiple Permissions");
-            }
+            Field<StringGraphType>("NoPermissions")
+                 .Returns<string>()
+                 .Resolve(_ => "Fantastic Fox Hates Permissions");
+
+            Field<StringGraphType>("PermissionOne")
+                .Returns<string>()
+                .RequirePermission(_permissions["permissionOne"])
+                .Resolve(_ => "Fantastic Fox Loves Permission One");
+
+            Field<StringGraphType>("PermissionTwo")
+                 .Returns<string>()
+                 .RequirePermission(_permissions["permissionTwo"])
+                 .Resolve(_ => "Fantastic Fox Loves Permission Two");
+
+            Field<StringGraphType>("PermissionMultiple")
+                 .Returns<string>()
+                 .RequirePermission(_permissions["permissionOne"])
+                 .RequirePermission(_permissions["permissionTwo"])
+                 .Resolve(_ => "Fantastic Fox Loves Multiple Permissions");
         }
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/Lucene/LuceneContext.cs b/test/OrchardCore.Tests/Apis/Lucene/LuceneContext.cs
index 534713bc0c5..c04d49726cd 100644
--- a/test/OrchardCore.Tests/Apis/Lucene/LuceneContext.cs
+++ b/test/OrchardCore.Tests/Apis/Lucene/LuceneContext.cs
@@ -1,16 +1,15 @@
 using OrchardCore.Tests.Apis.Context;
 
-namespace OrchardCore.Tests.Apis.Lucene
+namespace OrchardCore.Tests.Apis.Lucene;
+
+public class LuceneContext : SiteContext
 {
-    public class LuceneContext : SiteContext
+    static LuceneContext()
     {
-        static LuceneContext()
-        {
-        }
+    }
 
-        public LuceneContext()
-        {
-            this.WithRecipe("luceneQueryTest");
-        }
+    public LuceneContext()
+    {
+        this.WithRecipe("luceneQueryTest");
     }
 }
diff --git a/test/OrchardCore.Tests/Apis/Lucene/LuceneQueryTests.cs b/test/OrchardCore.Tests/Apis/Lucene/LuceneQueryTests.cs
index f21781cae36..2e9f335a2c8 100644
--- a/test/OrchardCore.Tests/Apis/Lucene/LuceneQueryTests.cs
+++ b/test/OrchardCore.Tests/Apis/Lucene/LuceneQueryTests.cs
@@ -5,152 +5,151 @@
 using OrchardCore.Search.Lucene;
 using OrchardCore.Tests.Apis.Context;
 
-namespace OrchardCore.Tests.Apis.Lucene
+namespace OrchardCore.Tests.Apis.Lucene;
+
+public class LuceneQueryTests
 {
-    public class LuceneQueryTests
+    [Fact]
+    public async Task BoostingTitleShouldHaveTitlesContainingOrchardAppearFirst()
     {
-        [Fact]
-        public async Task BoostingTitleShouldHaveTitlesContainingOrchardAppearFirst()
-        {
-            using var context = new LuceneContext();
-            await context.InitializeAsync();
+        using var context = new LuceneContext();
+        await context.InitializeAsync();
 
-            // Act
-            var index = "ArticleIndex";
-            // { "from": 0, "size": 2, "query": { "simple_query_string": { "analyze_wildcard": true, "fields": ["Content.ContentItem.DisplayText_Normalized^2", "Content.BodyAspect.Body"], "query": "orchard*" } } }
-            var dynamicQuery = new
+        // Act
+        var index = "ArticleIndex";
+        // { "from": 0, "size": 2, "query": { "simple_query_string": { "analyze_wildcard": true, "fields": ["Content.ContentItem.DisplayText_Normalized^2", "Content.BodyAspect.Body"], "query": "orchard*" } } }
+        var dynamicQuery = new
+        {
+            from = 0,
+            size = 2,
+            query = new
             {
-                from = 0,
-                size = 2,
-                query = new
+                simple_query_string = new
                 {
-                    simple_query_string = new
-                    {
-                        analyze_wildcard = true,
-                        fields = new string[] { "Content.ContentItem.DisplayText.Normalized^2", "Content.BodyAspect.Body" },
-                        query = "orchard*",
-                    },
+                    analyze_wildcard = true,
+                    fields = new string[] { "Content.ContentItem.DisplayText.Normalized^2", "Content.BodyAspect.Body" },
+                    query = "orchard*",
                 },
-            };
+            },
+        };
 
-            var query = JConvert.SerializeObject(dynamicQuery);
+        var query = JConvert.SerializeObject(dynamicQuery);
 
-            var content = await context.Client.GetAsync($"api/lucene/content?indexName={index}&query={query}");
-            var queryResults = await content.Content.ReadAsAsync<LuceneQueryResults>();
+        var content = await context.Client.GetAsync($"api/lucene/content?indexName={index}&query={query}");
+        var queryResults = await content.Content.ReadAsAsync<LuceneQueryResults>();
 
-            // Test
-            Assert.Equal(2, queryResults.Items.Count());
-            var contentItems = queryResults.Items.Select(x => JObject.FromObject(x).Deserialize<ContentItem>());
+        // Test
+        Assert.Equal(2, queryResults.Items.Count());
+        var contentItems = queryResults.Items.Select(x => JObject.FromObject(x).Deserialize<ContentItem>());
 
-            Assert.True(contentItems.All(x => x.DisplayText.Contains("Orchard", StringComparison.OrdinalIgnoreCase)));
-        }
+        Assert.True(contentItems.All(x => x.DisplayText.Contains("Orchard", StringComparison.OrdinalIgnoreCase)));
+    }
 
-        [Fact]
-        public async Task BoostingBodyShouldHaveTitlesNotContainingOrchardAppearFirst()
-        {
-            using var context = new LuceneContext();
-            await context.InitializeAsync();
+    [Fact]
+    public async Task BoostingBodyShouldHaveTitlesNotContainingOrchardAppearFirst()
+    {
+        using var context = new LuceneContext();
+        await context.InitializeAsync();
 
-            // Act
-            var index = "ArticleIndex";
-            // { "from": 0, "size": 2, "query": { "simple_query_string": { "analyze_wildcard": true, "fields": ["Content.ContentItem.DisplayText_Normalized", "Content.BodyAspect.Body^2"], "query": "orchard*" } } }
-            var dynamicQuery = new
+        // Act
+        var index = "ArticleIndex";
+        // { "from": 0, "size": 2, "query": { "simple_query_string": { "analyze_wildcard": true, "fields": ["Content.ContentItem.DisplayText_Normalized", "Content.BodyAspect.Body^2"], "query": "orchard*" } } }
+        var dynamicQuery = new
+        {
+            from = 0,
+            size = 2,
+            query = new
             {
-                from = 0,
-                size = 2,
-                query = new
+                simple_query_string = new
                 {
-                    simple_query_string = new
-                    {
-                        analyze_wildcard = true,
-                        fields = new string[] { "Content.ContentItem.DisplayText_Normalized", "Content.BodyAspect.Body^2" },
-                        query = "orchard*",
-                    },
+                    analyze_wildcard = true,
+                    fields = new string[] { "Content.ContentItem.DisplayText_Normalized", "Content.BodyAspect.Body^2" },
+                    query = "orchard*",
                 },
-            };
+            },
+        };
 
-            var query = JConvert.SerializeObject(dynamicQuery);
-            var content = await context.Client.GetAsync($"api/lucene/content?indexName={index}&query={query}");
-            var queryResults = await content.Content.ReadAsAsync<LuceneQueryResults>();
+        var query = JConvert.SerializeObject(dynamicQuery);
+        var content = await context.Client.GetAsync($"api/lucene/content?indexName={index}&query={query}");
+        var queryResults = await content.Content.ReadAsAsync<LuceneQueryResults>();
 
-            // Test
-            Assert.Equal(2, queryResults.Items.Count());
-            var contentItems = queryResults.Items.Select(x => JObject.FromObject(x).Deserialize<ContentItem>());
+        // Test
+        Assert.Equal(2, queryResults.Items.Count());
+        var contentItems = queryResults.Items.Select(x => JObject.FromObject(x).Deserialize<ContentItem>());
 
-            Assert.False(contentItems.All(x => x.DisplayText.Contains("Orchard", StringComparison.OrdinalIgnoreCase)));
-        }
+        Assert.False(contentItems.All(x => x.DisplayText.Contains("Orchard", StringComparison.OrdinalIgnoreCase)));
+    }
 
-        [Fact]
-        public async Task SimpleQueryWildcardHasResults()
-        {
-            using var context = new LuceneContext();
-            await context.InitializeAsync();
+    [Fact]
+    public async Task SimpleQueryWildcardHasResults()
+    {
+        using var context = new LuceneContext();
+        await context.InitializeAsync();
 
-            // Act
-            // Should find articles with "Orchard" in the title.
+        // Act
+        // Should find articles with "Orchard" in the title.
 
-            var index = "ArticleIndex";
+        var index = "ArticleIndex";
 
-            // { "from": 0, "size": 1, "query": { "simple_query_string": { "analyze_wildcard": true, "fields": ["Content.ContentItem.DisplayText.Normalized"], "query": "orch*" } } }
-            object dynamicQuery = new
+        // { "from": 0, "size": 1, "query": { "simple_query_string": { "analyze_wildcard": true, "fields": ["Content.ContentItem.DisplayText.Normalized"], "query": "orch*" } } }
+        object dynamicQuery = new
+        {
+            from = 0,
+            size = 1,
+            query = new
             {
-                from = 0,
-                size = 1,
-                query = new
+                simple_query_string = new
                 {
-                    simple_query_string = new
-                    {
-                        analyze_wildcard = true,
-                        fields = new string[] { "Content.ContentItem.DisplayText.Normalized" },
-                        query = "orch*",
-                    },
+                    analyze_wildcard = true,
+                    fields = new string[] { "Content.ContentItem.DisplayText.Normalized" },
+                    query = "orch*",
                 },
-            };
+            },
+        };
 
-            var query = JConvert.SerializeObject(dynamicQuery);
+        var query = JConvert.SerializeObject(dynamicQuery);
 
-            var content = await context.Client.GetAsync($"api/lucene/content?indexName={index}&query={query}");
-            var queryResults = await content.Content.ReadAsAsync<LuceneQueryResults>();
+        var content = await context.Client.GetAsync($"api/lucene/content?indexName={index}&query={query}");
+        var queryResults = await content.Content.ReadAsAsync<LuceneQueryResults>();
 
-            // Test
-            Assert.NotEmpty(queryResults.Items);
-            var contentItems = queryResults.Items.Select(x => JObject.FromObject(x).Deserialize<ContentItem>());
+        // Test
+        Assert.NotEmpty(queryResults.Items);
+        var contentItems = queryResults.Items.Select(x => JObject.FromObject(x).Deserialize<ContentItem>());
 
-            Assert.Contains("Orchard", contentItems.First().DisplayText, StringComparison.OrdinalIgnoreCase);
-        }
+        Assert.Contains("Orchard", contentItems.First().DisplayText, StringComparison.OrdinalIgnoreCase);
+    }
 
-        [Fact]
-        public async Task TwoWildcardQueriesWithBoostHasResults()
+    [Fact]
+    public async Task TwoWildcardQueriesWithBoostHasResults()
+    {
+        using (var context = new LuceneContext())
         {
-            using (var context = new LuceneContext())
-            {
-                await context.InitializeAsync();
-
-                // Act
-                // Should find articles with "Orchard" in the title
-                var index = "ArticleIndex";
-
-                // { "from": 0, "size": 10, "query":{ "bool": { "should": [ { "wildcard": {  "Content.ContentItem.DisplayText.Normalized": { "value": "orch*", "boost": 2 } } },{ "wildcard": { "Content.BodyAspect.Body": { "value": "orchar*", "boost": 5 } } } ] } } }
-                var query =
-                    "{ \"from\": 0, \"size\": 10, \"query\":" +
-                        "{ \"bool\": { \"should\": [ " +
-                            "{ \"wildcard\": {  \"Content.ContentItem.DisplayText.Normalized\": { \"value\": \"orch*\", \"boost\": 2 } } }," +
-                            "{ \"wildcard\": { \"Content.BodyAspect.Body\": { \"value\": \"orchar*\", \"boost\": 5 } } }" +
-                        "] } } }";
-
-                var content = await context.Client.GetAsync($"api/lucene/content?indexName={index}&query={query}");
-                var queryResults = await content.Content.ReadAsAsync<LuceneQueryResults>();
-                var contentItems = queryResults.Items.Select(x => JObject.FromObject(x).Deserialize<ContentItem>());
-
-                // Test
-                Assert.NotEmpty(contentItems);
-                Assert.True(contentItems.Count() >= 4);
-
-                Assert.Contains("Orchard", contentItems.ElementAt(0).As<HtmlBodyPart>().Html, StringComparison.OrdinalIgnoreCase);
-                Assert.Contains("Orchard", contentItems.ElementAt(1).As<HtmlBodyPart>().Html, StringComparison.OrdinalIgnoreCase);
-                Assert.Contains("Orchard", contentItems.ElementAt(2).DisplayText, StringComparison.OrdinalIgnoreCase);
-                Assert.Contains("Orchard", contentItems.ElementAt(3).DisplayText, StringComparison.OrdinalIgnoreCase);
-            };
-        }
+            await context.InitializeAsync();
+
+            // Act
+            // Should find articles with "Orchard" in the title
+            var index = "ArticleIndex";
+
+            // { "from": 0, "size": 10, "query":{ "bool": { "should": [ { "wildcard": {  "Content.ContentItem.DisplayText.Normalized": { "value": "orch*", "boost": 2 } } },{ "wildcard": { "Content.BodyAspect.Body": { "value": "orchar*", "boost": 5 } } } ] } } }
+            var query =
+                "{ \"from\": 0, \"size\": 10, \"query\":" +
+                    "{ \"bool\": { \"should\": [ " +
+                        "{ \"wildcard\": {  \"Content.ContentItem.DisplayText.Normalized\": { \"value\": \"orch*\", \"boost\": 2 } } }," +
+                        "{ \"wildcard\": { \"Content.BodyAspect.Body\": { \"value\": \"orchar*\", \"boost\": 5 } } }" +
+                    "] } } }";
+
+            var content = await context.Client.GetAsync($"api/lucene/content?indexName={index}&query={query}");
+            var queryResults = await content.Content.ReadAsAsync<LuceneQueryResults>();
+            var contentItems = queryResults.Items.Select(x => JObject.FromObject(x).Deserialize<ContentItem>());
+
+            // Test
+            Assert.NotEmpty(contentItems);
+            Assert.True(contentItems.Count() >= 4);
+
+            Assert.Contains("Orchard", contentItems.ElementAt(0).As<HtmlBodyPart>().Html, StringComparison.OrdinalIgnoreCase);
+            Assert.Contains("Orchard", contentItems.ElementAt(1).As<HtmlBodyPart>().Html, StringComparison.OrdinalIgnoreCase);
+            Assert.Contains("Orchard", contentItems.ElementAt(2).DisplayText, StringComparison.OrdinalIgnoreCase);
+            Assert.Contains("Orchard", contentItems.ElementAt(3).DisplayText, StringComparison.OrdinalIgnoreCase);
+        };
     }
 }
diff --git a/test/OrchardCore.Tests/Commands/CommandHandlerDescriptorBuilderTests.cs b/test/OrchardCore.Tests/Commands/CommandHandlerDescriptorBuilderTests.cs
index a795bd865e1..14d2bf63544 100644
--- a/test/OrchardCore.Tests/Commands/CommandHandlerDescriptorBuilderTests.cs
+++ b/test/OrchardCore.Tests/Commands/CommandHandlerDescriptorBuilderTests.cs
@@ -1,101 +1,100 @@
 using OrchardCore.Environment.Commands;
 
-namespace OrchardCore.Tests.Commands
+namespace OrchardCore.Tests.Commands;
+
+public class CommandHandlerDescriptorBuilderTests
 {
-    public class CommandHandlerDescriptorBuilderTests
+    [Fact]
+    public void BuilderShouldCreateDescriptor()
     {
-        [Fact]
-        public void BuilderShouldCreateDescriptor()
-        {
-            var builder = new CommandHandlerDescriptorBuilder();
-            var descriptor = builder.Build(typeof(MyCommand));
-            Assert.NotNull(descriptor);
-            Assert.Equal(4, descriptor.Commands.Count());
-            Assert.NotNull(descriptor.Commands.SingleOrDefault(d => d.Names.Contains("FooBar")));
-            Assert.Equal(typeof(MyCommand).GetMethod("FooBar"), descriptor.Commands.Single(d => d.Names.Contains("FooBar")).MethodInfo);
-            Assert.NotNull(descriptor.Commands.SingleOrDefault(d => d.Names.Contains("MyCommand")));
-            Assert.Equal(typeof(MyCommand).GetMethod("FooBar2"), descriptor.Commands.Single(d => d.Names.Contains("MyCommand")).MethodInfo);
-            Assert.NotNull(descriptor.Commands.SingleOrDefault(d => d.Names.Contains("Foo Bar")));
-            Assert.Equal(typeof(MyCommand).GetMethod("Foo_Bar"), descriptor.Commands.Single(d => d.Names.Contains("Foo Bar")).MethodInfo);
-            Assert.NotNull(descriptor.Commands.SingleOrDefault(d => d.Names.Contains("Foo_Bar")));
-            Assert.Equal(typeof(MyCommand).GetMethod("Foo_Bar3"), descriptor.Commands.Single(d => d.Names.Contains("Foo_Bar")).MethodInfo);
-        }
+        var builder = new CommandHandlerDescriptorBuilder();
+        var descriptor = builder.Build(typeof(MyCommand));
+        Assert.NotNull(descriptor);
+        Assert.Equal(4, descriptor.Commands.Count());
+        Assert.NotNull(descriptor.Commands.SingleOrDefault(d => d.Names.Contains("FooBar")));
+        Assert.Equal(typeof(MyCommand).GetMethod("FooBar"), descriptor.Commands.Single(d => d.Names.Contains("FooBar")).MethodInfo);
+        Assert.NotNull(descriptor.Commands.SingleOrDefault(d => d.Names.Contains("MyCommand")));
+        Assert.Equal(typeof(MyCommand).GetMethod("FooBar2"), descriptor.Commands.Single(d => d.Names.Contains("MyCommand")).MethodInfo);
+        Assert.NotNull(descriptor.Commands.SingleOrDefault(d => d.Names.Contains("Foo Bar")));
+        Assert.Equal(typeof(MyCommand).GetMethod("Foo_Bar"), descriptor.Commands.Single(d => d.Names.Contains("Foo Bar")).MethodInfo);
+        Assert.NotNull(descriptor.Commands.SingleOrDefault(d => d.Names.Contains("Foo_Bar")));
+        Assert.Equal(typeof(MyCommand).GetMethod("Foo_Bar3"), descriptor.Commands.Single(d => d.Names.Contains("Foo_Bar")).MethodInfo);
+    }
 
-        public class MyCommand : DefaultCommandHandler
+    public class MyCommand : DefaultCommandHandler
+    {
+        public MyCommand() : base(null)
         {
-            public MyCommand() : base(null)
-            {
-            }
+        }
 
 #pragma warning disable CA1822 // Mark members as static
-            public void FooBar()
-            {
-            }
-
-            [CommandName("MyCommand")]
-            public void FooBar2()
-            {
-            }
+        public void FooBar()
+        {
+        }
 
-            [CommandName("Foo Bar")]
-            public void Foo_Bar()
-            {
-            }
+        [CommandName("MyCommand")]
+        public void FooBar2()
+        {
+        }
 
-            [CommandName("Foo_Bar")]
-            public void Foo_Bar3()
-            {
-            }
-#pragma warning restore CA1822 // Mark members as static
+        [CommandName("Foo Bar")]
+        public void Foo_Bar()
+        {
         }
 
-        [Fact]
-        public void BuilderShouldReturnPublicMethodsOnly()
+        [CommandName("Foo_Bar")]
+        public void Foo_Bar3()
         {
-            var builder = new CommandHandlerDescriptorBuilder();
-            var descriptor = builder.Build(typeof(PublicMethodsOnly));
-            Assert.NotNull(descriptor);
-            Assert.Single(descriptor.Commands);
-            Assert.NotNull(descriptor.Commands.SingleOrDefault(d => d.Names.Contains("Method")));
         }
+#pragma warning restore CA1822 // Mark members as static
+    }
+
+    [Fact]
+    public void BuilderShouldReturnPublicMethodsOnly()
+    {
+        var builder = new CommandHandlerDescriptorBuilder();
+        var descriptor = builder.Build(typeof(PublicMethodsOnly));
+        Assert.NotNull(descriptor);
+        Assert.Single(descriptor.Commands);
+        Assert.NotNull(descriptor.Commands.SingleOrDefault(d => d.Names.Contains("Method")));
+    }
 
 #pragma warning disable 660,661
-        public class PublicMethodsOnly
-        {
+    public class PublicMethodsOnly
+    {
 #pragma warning restore 660,661
-            public bool Bar { get; set; }   // No accessors.
-            public bool Field = true;       // No field.
+        public bool Bar { get; set; }   // No accessors.
+        public bool Field = true;       // No field.
 
-            // No private method.
+        // No private method.
 #pragma warning disable CA1822 // Mark members as static
 #pragma warning disable IDE0051 // Remove unused private members
-            private void Blah()
+        private void Blah()
 #pragma warning restore IDE0051 // Remove unused private members
 #pragma warning restore CA1822 // Mark members as static
-            {
-            }
+        {
+        }
 
-            // No private method.
-            public static void Foo()
-            {
-            }
+        // No private method.
+        public static void Foo()
+        {
+        }
 
-            // No operator.
-            public static bool operator ==(PublicMethodsOnly _1, PublicMethodsOnly _2)
-            {
-                return false;
-            }
+        // No operator.
+        public static bool operator ==(PublicMethodsOnly _1, PublicMethodsOnly _2)
+        {
+            return false;
+        }
 
-            public static bool operator !=(PublicMethodsOnly _1, PublicMethodsOnly _2)
-            {
-                return false;
-            }
+        public static bool operator !=(PublicMethodsOnly _1, PublicMethodsOnly _2)
+        {
+            return false;
+        }
 
 #pragma warning disable CA1822 // Mark members as static
-            public void Method()
+        public void Method()
 #pragma warning restore CA1822 // Mark members as static
-            {
-            }
+        {
         }
     }
 }
diff --git a/test/OrchardCore.Tests/Commands/CommandHandlerTests.cs b/test/OrchardCore.Tests/Commands/CommandHandlerTests.cs
index db8a9328b40..cf6664093e4 100644
--- a/test/OrchardCore.Tests/Commands/CommandHandlerTests.cs
+++ b/test/OrchardCore.Tests/Commands/CommandHandlerTests.cs
@@ -1,278 +1,277 @@
 using OrchardCore.Environment.Commands;
 using OrchardCore.Localization;
 
-namespace OrchardCore.Tests.Commands
-{
-    public class CommandsTests
-    {
-        private readonly StubCommandHandler _handler;
+namespace OrchardCore.Tests.Commands;
 
-        public CommandsTests()
-        {
-            _handler = new StubCommandHandler();
-        }
+public class CommandsTests
+{
+    private readonly StubCommandHandler _handler;
 
-        private static CommandContext CreateCommandContext(string commandName)
-        {
-            return CreateCommandContext(commandName, new Dictionary<string, string>(), []);
-        }
+    public CommandsTests()
+    {
+        _handler = new StubCommandHandler();
+    }
 
-        private static CommandContext CreateCommandContext(string commandName, IDictionary<string, string> switches)
-        {
-            return CreateCommandContext(commandName, switches, []);
-        }
+    private static CommandContext CreateCommandContext(string commandName)
+    {
+        return CreateCommandContext(commandName, new Dictionary<string, string>(), []);
+    }
 
-        private static CommandContext CreateCommandContext(string commandName, IDictionary<string, string> switches, string[] args)
-        {
-            var builder = new CommandHandlerDescriptorBuilder();
+    private static CommandContext CreateCommandContext(string commandName, IDictionary<string, string> switches)
+    {
+        return CreateCommandContext(commandName, switches, []);
+    }
 
-            var descriptor = builder.Build(typeof(StubCommandHandler));
+    private static CommandContext CreateCommandContext(string commandName, IDictionary<string, string> switches, string[] args)
+    {
+        var builder = new CommandHandlerDescriptorBuilder();
 
-            var commandDescriptor = descriptor.Commands.Single(d => d.Names.Any(x => string.Equals(x, commandName, StringComparison.OrdinalIgnoreCase)));
+        var descriptor = builder.Build(typeof(StubCommandHandler));
 
-            return new CommandContext
-            {
-                Command = commandName,
-                Switches = switches,
-                CommandDescriptor = commandDescriptor,
-                Arguments = args,
-                Input = new StringReader(string.Empty),
-                Output = new StringWriter(),
-            };
-        }
+        var commandDescriptor = descriptor.Commands.Single(d => d.Names.Any(x => string.Equals(x, commandName, StringComparison.OrdinalIgnoreCase)));
 
-        [Fact]
-        public async Task TestFooCommand()
+        return new CommandContext
         {
-            var commandContext = CreateCommandContext("Foo");
-            await _handler.ExecuteAsync(commandContext);
-            Assert.Equal("Command Foo Executed", commandContext.Output.ToString());
-        }
+            Command = commandName,
+            Switches = switches,
+            CommandDescriptor = commandDescriptor,
+            Arguments = args,
+            Input = new StringReader(string.Empty),
+            Output = new StringWriter(),
+        };
+    }
 
-        [Fact]
-        public async Task TestNotExistingCommand()
-        {
-            await Assert.ThrowsAsync<InvalidOperationException>(async Task () =>
-            {
-                var commandContext = CreateCommandContext("NoSuchCommand");
-                await _handler.ExecuteAsync(commandContext);
-            });
-        }
+    [Fact]
+    public async Task TestFooCommand()
+    {
+        var commandContext = CreateCommandContext("Foo");
+        await _handler.ExecuteAsync(commandContext);
+        Assert.Equal("Command Foo Executed", commandContext.Output.ToString());
+    }
 
-        [Fact]
-        public async Task TestCommandWithCustomAlias()
+    [Fact]
+    public async Task TestNotExistingCommand()
+    {
+        await Assert.ThrowsAsync<InvalidOperationException>(async Task () =>
         {
-            var commandContext = CreateCommandContext("Bar");
+            var commandContext = CreateCommandContext("NoSuchCommand");
             await _handler.ExecuteAsync(commandContext);
-            Assert.Equal("Hello World!", commandContext.Output.ToString());
-        }
-
-        [Fact]
-        public void TestHelpText()
-        {
-            var commandContext = CreateCommandContext("Baz");
-            Assert.Equal("Baz help", commandContext.CommandDescriptor.HelpText);
-        }
-
-        [Fact]
-        public void TestEmptyHelpText()
-        {
-            var commandContext = CreateCommandContext("Foo");
-            Assert.Empty(commandContext.CommandDescriptor.HelpText);
-        }
+        });
+    }
 
-        [Fact]
-        public async Task TestCaseInsensitiveForCommand()
-        {
-            var commandContext = CreateCommandContext("BAZ", new Dictionary<string, string> { { "VERBOSE", "true" } });
-            await _handler.ExecuteAsync(commandContext);
-            Assert.Equal("Command Baz Called : This was a test", commandContext.Output.ToString());
-        }
+    [Fact]
+    public async Task TestCommandWithCustomAlias()
+    {
+        var commandContext = CreateCommandContext("Bar");
+        await _handler.ExecuteAsync(commandContext);
+        Assert.Equal("Hello World!", commandContext.Output.ToString());
+    }
 
-        [Fact]
-        public async Task TestBooleanSwitchForCommand()
-        {
-            var commandContext = CreateCommandContext("Baz", new Dictionary<string, string> { { "Verbose", "true" } });
-            await _handler.ExecuteAsync(commandContext);
-            Assert.Equal("Command Baz Called : This was a test", commandContext.Output.ToString());
-        }
+    [Fact]
+    public void TestHelpText()
+    {
+        var commandContext = CreateCommandContext("Baz");
+        Assert.Equal("Baz help", commandContext.CommandDescriptor.HelpText);
+    }
 
-        [Fact]
-        public async Task TestIntSwitchForCommand()
-        {
-            var commandContext = CreateCommandContext("Baz", new Dictionary<string, string> { { "Level", "2" } });
-            await _handler.ExecuteAsync(commandContext);
-            Assert.Equal("Command Baz Called : Entering Level 2", commandContext.Output.ToString());
-        }
+    [Fact]
+    public void TestEmptyHelpText()
+    {
+        var commandContext = CreateCommandContext("Foo");
+        Assert.Empty(commandContext.CommandDescriptor.HelpText);
+    }
 
-        [Fact]
-        public async Task TestStringSwitchForCommand()
-        {
-            var commandContext = CreateCommandContext("Baz", new Dictionary<string, string> { { "User", "OrchardUser" } });
-            await _handler.ExecuteAsync(commandContext);
-            Assert.Equal("Command Baz Called : current user is OrchardUser", commandContext.Output.ToString());
-        }
+    [Fact]
+    public async Task TestCaseInsensitiveForCommand()
+    {
+        var commandContext = CreateCommandContext("BAZ", new Dictionary<string, string> { { "VERBOSE", "true" } });
+        await _handler.ExecuteAsync(commandContext);
+        Assert.Equal("Command Baz Called : This was a test", commandContext.Output.ToString());
+    }
 
-        [Fact]
-        public async Task TestSwitchForCommandWithoutSupportForIt()
-        {
-            var switches = new Dictionary<string, string> { { "User", "OrchardUser" } };
-            var commandContext = CreateCommandContext("Foo", switches);
-            await Assert.ThrowsAsync<InvalidOperationException>(async Task () => await _handler.ExecuteAsync(commandContext));
-        }
+    [Fact]
+    public async Task TestBooleanSwitchForCommand()
+    {
+        var commandContext = CreateCommandContext("Baz", new Dictionary<string, string> { { "Verbose", "true" } });
+        await _handler.ExecuteAsync(commandContext);
+        Assert.Equal("Command Baz Called : This was a test", commandContext.Output.ToString());
+    }
 
-        [Fact]
-        public async Task TestCommandThatDoesNotReturnAValue()
-        {
-            var commandContext = CreateCommandContext("Log");
-            await _handler.ExecuteAsync(commandContext);
-            Assert.Empty(commandContext.Output.ToString());
-        }
+    [Fact]
+    public async Task TestIntSwitchForCommand()
+    {
+        var commandContext = CreateCommandContext("Baz", new Dictionary<string, string> { { "Level", "2" } });
+        await _handler.ExecuteAsync(commandContext);
+        Assert.Equal("Command Baz Called : Entering Level 2", commandContext.Output.ToString());
+    }
 
-        [Fact]
-        public async Task TestNotExistingSwitch()
-        {
-            var switches = new Dictionary<string, string> { { "ThisSwitchDoesNotExist", "Insignificant" } };
-            var commandContext = CreateCommandContext("Foo", switches);
-            await Assert.ThrowsAsync<InvalidOperationException>(async Task () => await _handler.ExecuteAsync(commandContext));
-        }
+    [Fact]
+    public async Task TestStringSwitchForCommand()
+    {
+        var commandContext = CreateCommandContext("Baz", new Dictionary<string, string> { { "User", "OrchardUser" } });
+        await _handler.ExecuteAsync(commandContext);
+        Assert.Equal("Command Baz Called : current user is OrchardUser", commandContext.Output.ToString());
+    }
 
-        [Fact]
-        public async Task TestCommandArgumentsArePassedCorrectly()
-        {
-            var commandContext = CreateCommandContext("Concat", new Dictionary<string, string>(), ["left to ", "right"]);
-            await _handler.ExecuteAsync(commandContext);
-            Assert.Equal("left to right", commandContext.Output.ToString());
-        }
+    [Fact]
+    public async Task TestSwitchForCommandWithoutSupportForIt()
+    {
+        var switches = new Dictionary<string, string> { { "User", "OrchardUser" } };
+        var commandContext = CreateCommandContext("Foo", switches);
+        await Assert.ThrowsAsync<InvalidOperationException>(async Task () => await _handler.ExecuteAsync(commandContext));
+    }
 
-        [Fact]
-        public async Task TestCommandArgumentsArePassedCorrectlyWithAParamsParameters()
-        {
-            var commandContext = CreateCommandContext("ConcatParams", new Dictionary<string, string>(), ["left to ", "right"]);
-            await _handler.ExecuteAsync(commandContext);
-            Assert.Equal("left to right", commandContext.Output.ToString());
-        }
+    [Fact]
+    public async Task TestCommandThatDoesNotReturnAValue()
+    {
+        var commandContext = CreateCommandContext("Log");
+        await _handler.ExecuteAsync(commandContext);
+        Assert.Empty(commandContext.Output.ToString());
+    }
 
-        [Fact]
-        public async Task TestCommandArgumentsArePassedCorrectlyWithAParamsParameterAndNoArguments()
-        {
-            var commandContext = CreateCommandContext("ConcatParams", new Dictionary<string, string>());
-            await _handler.ExecuteAsync(commandContext);
-            Assert.Empty(commandContext.Output.ToString());
-        }
+    [Fact]
+    public async Task TestNotExistingSwitch()
+    {
+        var switches = new Dictionary<string, string> { { "ThisSwitchDoesNotExist", "Insignificant" } };
+        var commandContext = CreateCommandContext("Foo", switches);
+        await Assert.ThrowsAsync<InvalidOperationException>(async Task () => await _handler.ExecuteAsync(commandContext));
+    }
 
-        [Fact]
-        public async Task TestCommandArgumentsArePassedCorrectlyWithNormalParametersAndAParamsParameters()
-        {
-            var commandContext = CreateCommandContext("ConcatAllParams",
-                new Dictionary<string, string>(),
-                ["left-", "center-", "right"]);
-            await _handler.ExecuteAsync(commandContext);
-            Assert.Equal("left-center-right", commandContext.Output.ToString());
-        }
+    [Fact]
+    public async Task TestCommandArgumentsArePassedCorrectly()
+    {
+        var commandContext = CreateCommandContext("Concat", new Dictionary<string, string>(), ["left to ", "right"]);
+        await _handler.ExecuteAsync(commandContext);
+        Assert.Equal("left to right", commandContext.Output.ToString());
+    }
 
-        [Fact]
-        public async Task TestCommandParamsMismatchWithoutParamsNotEnoughArguments()
-        {
-            var commandContext = CreateCommandContext("Concat", new Dictionary<string, string>(), ["left to "]);
-            await Assert.ThrowsAsync<InvalidOperationException>(async Task () => await _handler.ExecuteAsync(commandContext));
-        }
+    [Fact]
+    public async Task TestCommandArgumentsArePassedCorrectlyWithAParamsParameters()
+    {
+        var commandContext = CreateCommandContext("ConcatParams", new Dictionary<string, string>(), ["left to ", "right"]);
+        await _handler.ExecuteAsync(commandContext);
+        Assert.Equal("left to right", commandContext.Output.ToString());
+    }
 
-        [Fact]
-        public async Task TestCommandParamsMismatchWithoutParamsTooManyArguments()
-        {
-            var commandContext = CreateCommandContext("Foo", new Dictionary<string, string>(), ["left to "]);
-            await Assert.ThrowsAsync<InvalidOperationException>(async Task () => await _handler.ExecuteAsync(commandContext));
-        }
+    [Fact]
+    public async Task TestCommandArgumentsArePassedCorrectlyWithAParamsParameterAndNoArguments()
+    {
+        var commandContext = CreateCommandContext("ConcatParams", new Dictionary<string, string>());
+        await _handler.ExecuteAsync(commandContext);
+        Assert.Empty(commandContext.Output.ToString());
+    }
 
-        [Fact]
-        public async Task TestCommandParamsMismatchWithParamsButNotEnoughArguments()
-        {
-            var commandContext = CreateCommandContext("ConcatAllParams", new Dictionary<string, string>());
-            await Assert.ThrowsAsync<InvalidOperationException>(async Task () => await _handler.ExecuteAsync(commandContext));
-        }
+    [Fact]
+    public async Task TestCommandArgumentsArePassedCorrectlyWithNormalParametersAndAParamsParameters()
+    {
+        var commandContext = CreateCommandContext("ConcatAllParams",
+            new Dictionary<string, string>(),
+            ["left-", "center-", "right"]);
+        await _handler.ExecuteAsync(commandContext);
+        Assert.Equal("left-center-right", commandContext.Output.ToString());
     }
 
-    public class StubCommandHandler : DefaultCommandHandler
+    [Fact]
+    public async Task TestCommandParamsMismatchWithoutParamsNotEnoughArguments()
     {
-        public StubCommandHandler() : base(new NullStringLocalizerFactory().Create(typeof(object)))
-        {
-        }
+        var commandContext = CreateCommandContext("Concat", new Dictionary<string, string>(), ["left to "]);
+        await Assert.ThrowsAsync<InvalidOperationException>(async Task () => await _handler.ExecuteAsync(commandContext));
+    }
 
-        [OrchardSwitch]
-        public bool Verbose { get; set; }
+    [Fact]
+    public async Task TestCommandParamsMismatchWithoutParamsTooManyArguments()
+    {
+        var commandContext = CreateCommandContext("Foo", new Dictionary<string, string>(), ["left to "]);
+        await Assert.ThrowsAsync<InvalidOperationException>(async Task () => await _handler.ExecuteAsync(commandContext));
+    }
 
-        [OrchardSwitch]
-        public int Level { get; set; }
+    [Fact]
+    public async Task TestCommandParamsMismatchWithParamsButNotEnoughArguments()
+    {
+        var commandContext = CreateCommandContext("ConcatAllParams", new Dictionary<string, string>());
+        await Assert.ThrowsAsync<InvalidOperationException>(async Task () => await _handler.ExecuteAsync(commandContext));
+    }
+}
 
-        [OrchardSwitch]
-        public string User { get; set; }
+public class StubCommandHandler : DefaultCommandHandler
+{
+    public StubCommandHandler() : base(new NullStringLocalizerFactory().Create(typeof(object)))
+    {
+    }
 
-#pragma warning disable CA1822 // Mark members as static
-        public string Foo()
-        {
-            return "Command Foo Executed";
-        }
+    [OrchardSwitch]
+    public bool Verbose { get; set; }
 
-        [CommandName("Bar")]
-        public string Hello()
-        {
-            return "Hello World!";
-        }
+    [OrchardSwitch]
+    public int Level { get; set; }
 
-        [OrchardSwitches("Verbose, Level, User")]
-        [CommandHelp("Baz help")]
-        public string Baz()
-        {
-            var trace = "Command Baz Called";
+    [OrchardSwitch]
+    public string User { get; set; }
 
-            if (Verbose)
-            {
-                trace += " : This was a test";
-            }
+#pragma warning disable CA1822 // Mark members as static
+    public string Foo()
+    {
+        return "Command Foo Executed";
+    }
 
-            if (Level == 2)
-            {
-                trace += " : Entering Level 2";
-            }
+    [CommandName("Bar")]
+    public string Hello()
+    {
+        return "Hello World!";
+    }
 
-            if (!string.IsNullOrEmpty(User))
-            {
-                trace += " : current user is " + User;
-            }
+    [OrchardSwitches("Verbose, Level, User")]
+    [CommandHelp("Baz help")]
+    public string Baz()
+    {
+        var trace = "Command Baz Called";
 
-            return trace;
+        if (Verbose)
+        {
+            trace += " : This was a test";
         }
 
-        public string Concat(string left, string right)
+        if (Level == 2)
         {
-            return left + right;
+            trace += " : Entering Level 2";
         }
 
-        public string ConcatParams(params string[] parameters)
+        if (!string.IsNullOrEmpty(User))
         {
-            var concatenated = "";
-            foreach (var s in parameters)
-            {
-                concatenated += s;
-            }
-            return concatenated;
+            trace += " : current user is " + User;
         }
 
-        public string ConcatAllParams(string leftmost, params string[] rest)
+        return trace;
+    }
+
+    public string Concat(string left, string right)
+    {
+        return left + right;
+    }
+
+    public string ConcatParams(params string[] parameters)
+    {
+        var concatenated = "";
+        foreach (var s in parameters)
         {
-            var concatenated = leftmost;
-            foreach (var s in rest)
-            {
-                concatenated += s;
-            }
-            return concatenated;
+            concatenated += s;
         }
+        return concatenated;
+    }
 
-        public void Log()
+    public string ConcatAllParams(string leftmost, params string[] rest)
+    {
+        var concatenated = leftmost;
+        foreach (var s in rest)
         {
-            return;
+            concatenated += s;
         }
-#pragma warning restore CA1822 // Mark members as static
+        return concatenated;
     }
+
+    public void Log()
+    {
+        return;
+    }
+#pragma warning restore CA1822 // Mark members as static
 }
diff --git a/test/OrchardCore.Tests/Commands/CommandManagerTests.cs b/test/OrchardCore.Tests/Commands/CommandManagerTests.cs
index 1c8956ea0d6..b90a8ce970d 100644
--- a/test/OrchardCore.Tests/Commands/CommandManagerTests.cs
+++ b/test/OrchardCore.Tests/Commands/CommandManagerTests.cs
@@ -1,58 +1,57 @@
 using OrchardCore.Environment.Commands;
 using OrchardCore.Localization;
 
-namespace OrchardCore.Tests.Commands
+namespace OrchardCore.Tests.Commands;
+
+public class CommandManagerTests
 {
-    public class CommandManagerTests
+    private readonly ICommandManager _manager;
+
+    public CommandManagerTests()
     {
-        private readonly ICommandManager _manager;
+        var services = new ServiceCollection();
 
-        public CommandManagerTests()
-        {
-            var services = new ServiceCollection();
+        services.AddScoped<ICommandManager, DefaultCommandManager>();
+        services.AddScoped<ICommandHandler, MyCommand>();
+        services.AddSingleton<IStringLocalizerFactory, NullStringLocalizerFactory>();
+        services.AddTransient(typeof(IStringLocalizer<>), typeof(StringLocalizer<>));
+
+        _manager = services.BuildServiceProvider().GetService<ICommandManager>();
+    }
 
-            services.AddScoped<ICommandManager, DefaultCommandManager>();
-            services.AddScoped<ICommandHandler, MyCommand>();
-            services.AddSingleton<IStringLocalizerFactory, NullStringLocalizerFactory>();
-            services.AddTransient(typeof(IStringLocalizer<>), typeof(StringLocalizer<>));
+    [Fact]
+    public async Task ManagerCanRunACommand()
+    {
+        var context = new CommandParameters { Arguments = new string[] { "FooBar" }, Output = new StringWriter() };
+        await _manager.ExecuteAsync(context);
+        Assert.Equal("success!", context.Output.ToString());
+    }
 
-            _manager = services.BuildServiceProvider().GetService<ICommandManager>();
-        }
+    [Fact]
+    public async Task ManagerCanRunACompositeCommand()
+    {
+        var context = new CommandParameters { Arguments = ("Foo Bar Bleah").Split(' '), Output = new StringWriter() };
+        await _manager.ExecuteAsync(context);
+        Assert.Equal("Bleah", context.Output.ToString());
+    }
 
-        [Fact]
-        public async Task ManagerCanRunACommand()
+    public class MyCommand : DefaultCommandHandler
+    {
+        public MyCommand() : base(null)
         {
-            var context = new CommandParameters { Arguments = new string[] { "FooBar" }, Output = new StringWriter() };
-            await _manager.ExecuteAsync(context);
-            Assert.Equal("success!", context.Output.ToString());
         }
 
-        [Fact]
-        public async Task ManagerCanRunACompositeCommand()
+#pragma warning disable CA1822 // Mark members as static
+        public string FooBar()
         {
-            var context = new CommandParameters { Arguments = ("Foo Bar Bleah").Split(' '), Output = new StringWriter() };
-            await _manager.ExecuteAsync(context);
-            Assert.Equal("Bleah", context.Output.ToString());
+            return "success!";
         }
 
-        public class MyCommand : DefaultCommandHandler
+        [CommandName("Foo Bar")]
+        public string Foo_Bar(string bleah)
         {
-            public MyCommand() : base(null)
-            {
-            }
-
-#pragma warning disable CA1822 // Mark members as static
-            public string FooBar()
-            {
-                return "success!";
-            }
-
-            [CommandName("Foo Bar")]
-            public string Foo_Bar(string bleah)
-            {
-                return bleah;
-            }
-#pragma warning restore CA1822 // Mark members as static
+            return bleah;
         }
+#pragma warning restore CA1822 // Mark members as static
     }
 }
diff --git a/test/OrchardCore.Tests/Data/ContentItemExtensions.cs b/test/OrchardCore.Tests/Data/ContentItemExtensions.cs
index a9289997014..e67158da0af 100644
--- a/test/OrchardCore.Tests/Data/ContentItemExtensions.cs
+++ b/test/OrchardCore.Tests/Data/ContentItemExtensions.cs
@@ -2,132 +2,131 @@
 using OrchardCore.ContentFields.Fields;
 using OrchardCore.ContentManagement;
 
-namespace OrchardCore.Tests.Data
+namespace OrchardCore.Tests.Data;
+
+public class ContentItemExtensions
 {
-    public class ContentItemExtensions
+    [Fact]
+    public void GetReflectsChangesMadeByApply()
+    {
+        // arrange
+        var value = "changed value";
+        var contentItem = new ContentItem();
+        contentItem.Weld<CustomPart>();
+        var part = new CustomPart { Value = value };
+
+        // act
+        contentItem.Apply(nameof(CustomPart), part);
+
+        // assert
+        var actual = contentItem.Get<CustomPart>(nameof(CustomPart));
+        Assert.Equal(actual.Value, value);
+    }
+
+    [Fact]
+    public void GetReflectsChangesToFieldMadeByApply()
+    {
+        // arrange
+        var value = "changed value";
+        var contentItem = new ContentItem();
+        contentItem.Weld<CustomPart>();
+        var part = contentItem.Get<CustomPart>(nameof(CustomPart));
+        var field = part.GetOrCreate<TextField>(nameof(CustomPart.Field));
+        field.Text = value;
+
+        // act
+        part.Apply(nameof(CustomPart.Field), field);
+
+        // assert
+        var actual = contentItem.Get<CustomPart>(nameof(CustomPart));
+        Assert.Equal(actual.Field?.Text, value);
+    }
+
+    [Fact]
+    public void MergeReflectsChangesToWellKnownProperties()
     {
-        [Fact]
-        public void GetReflectsChangesMadeByApply()
+        // Setup
+        var contentItem = new ContentItem
         {
-            // arrange
-            var value = "changed value";
-            var contentItem = new ContentItem();
-            contentItem.Weld<CustomPart>();
-            var part = new CustomPart { Value = value };
-
-            // act
-            contentItem.Apply(nameof(CustomPart), part);
-
-            // assert
-            var actual = contentItem.Get<CustomPart>(nameof(CustomPart));
-            Assert.Equal(actual.Value, value);
-        }
-
-        [Fact]
-        public void GetReflectsChangesToFieldMadeByApply()
+            DisplayText = "original value"
+        };
+
+        var newContentItem = new ContentItem
         {
-            // arrange
-            var value = "changed value";
-            var contentItem = new ContentItem();
-            contentItem.Weld<CustomPart>();
-            var part = contentItem.Get<CustomPart>(nameof(CustomPart));
-            var field = part.GetOrCreate<TextField>(nameof(CustomPart.Field));
-            field.Text = value;
-
-            // act
-            part.Apply(nameof(CustomPart.Field), field);
-
-            // assert
-            var actual = contentItem.Get<CustomPart>(nameof(CustomPart));
-            Assert.Equal(actual.Field?.Text, value);
-        }
-
-        [Fact]
-        public void MergeReflectsChangesToWellKnownProperties()
+            DisplayText = "merged value"
+        };
+
+        // Act
+        contentItem.Merge(newContentItem);
+
+        // Test
+        Assert.False(contentItem.Content.ContainsKey(nameof(contentItem.DisplayText)));
+    }
+
+    [Fact]
+    public void MergeRemovesWellKnownPropertiesFromData()
+    {
+        // Setup
+        var contentItem = new ContentItem
         {
-            // Setup
-            var contentItem = new ContentItem
-            {
-                DisplayText = "original value"
-            };
-
-            var newContentItem = new ContentItem
-            {
-                DisplayText = "merged value"
-            };
-
-            // Act
-            contentItem.Merge(newContentItem);
-
-            // Test
-            Assert.False(contentItem.Content.ContainsKey(nameof(contentItem.DisplayText)));
-        }
-
-        [Fact]
-        public void MergeRemovesWellKnownPropertiesFromData()
+            DisplayText = "original value"
+        };
+
+        var newContentItem = new ContentItem
         {
-            // Setup
-            var contentItem = new ContentItem
-            {
-                DisplayText = "original value"
-            };
-
-            var newContentItem = new ContentItem
-            {
-                DisplayText = "merged value"
-            };
-
-            // Act
-            contentItem.Merge(newContentItem);
-
-            // Test
-            Assert.False(contentItem.Content.ContainsKey(nameof(contentItem.DisplayText)));
-        }
-
-        [Fact]
-        public void MergeMaintainsDocumentId()
+            DisplayText = "merged value"
+        };
+
+        // Act
+        contentItem.Merge(newContentItem);
+
+        // Test
+        Assert.False(contentItem.Content.ContainsKey(nameof(contentItem.DisplayText)));
+    }
+
+    [Fact]
+    public void MergeMaintainsDocumentId()
+    {
+        // Setup
+        var contentItem = new ContentItem
         {
-            // Setup
-            var contentItem = new ContentItem
-            {
-                Id = 1,
-            };
-
-            var newContentItem = new ContentItem
-            {
-                Id = 2
-            };
-
-            // Act
-            contentItem.Merge(newContentItem);
-
-            // Test
-            Assert.Equal(contentItem.Id, contentItem.Id);
-        }
-
-        [Fact]
-        public void MergeReflectsChangesToElements()
+            Id = 1,
+        };
+
+        var newContentItem = new ContentItem
         {
-            // Setup
-            var value = "merged value";
-            var contentItem = new ContentItem();
+            Id = 2
+        };
+
+        // Act
+        contentItem.Merge(newContentItem);
 
-            var newContentItem = new ContentItem();
-            newContentItem.Weld<CustomPart>();
-            newContentItem.Alter<CustomPart>(x => x.Value = value);
+        // Test
+        Assert.Equal(contentItem.Id, contentItem.Id);
+    }
+
+    [Fact]
+    public void MergeReflectsChangesToElements()
+    {
+        // Setup
+        var value = "merged value";
+        var contentItem = new ContentItem();
 
-            // Act
-            contentItem.Merge(newContentItem);
+        var newContentItem = new ContentItem();
+        newContentItem.Weld<CustomPart>();
+        newContentItem.Alter<CustomPart>(x => x.Value = value);
 
-            // Test
-            var mergedPart = contentItem.As<CustomPart>();
-            Assert.Equal(value, mergedPart?.Value);
-        }
+        // Act
+        contentItem.Merge(newContentItem);
 
-        public class CustomPart : ContentPart
-        {
-            public string Value { get; set; }
-            public TextField Field { get; set; }
-        }
+        // Test
+        var mergedPart = contentItem.As<CustomPart>();
+        Assert.Equal(value, mergedPart?.Value);
+    }
+
+    public class CustomPart : ContentPart
+    {
+        public string Value { get; set; }
+        public TextField Field { get; set; }
     }
 }
diff --git a/test/OrchardCore.Tests/Data/ContentItemTests.cs b/test/OrchardCore.Tests/Data/ContentItemTests.cs
index 91494ff1605..d0b6da62d2b 100644
--- a/test/OrchardCore.Tests/Data/ContentItemTests.cs
+++ b/test/OrchardCore.Tests/Data/ContentItemTests.cs
@@ -5,332 +5,331 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Json.Serialization;
 
-namespace OrchardCore.Tests.Data
+namespace OrchardCore.Tests.Data;
+
+public class ContentItemTests
 {
-    public class ContentItemTests
+    /// <summary>
+    /// To validate <see cref="DateTimeJsonConverter"/>
+    /// and <seealso cref="TimeSpanJsonConverter"/>
+    /// </summary>
+    [Fact]
+    public void JsonNode_WhenParseCalled_ConvertShortTimeFormatToTimeField()
     {
-        /// <summary>
-        /// To validate <see cref="DateTimeJsonConverter"/>
-        /// and <seealso cref="TimeSpanJsonConverter"/>
-        /// </summary>
-        [Fact]
-        public void JsonNode_WhenParseCalled_ConvertShortTimeFormatToTimeField()
-        {
-            // Arrange
-            var jsonStr = """
-             {
-                "TimeFieldTest": {
-                    "Value": "13:05"
-                },
-                "DateTimeFieldTest": {
-                    "Value": "2024-5-31 13:05"
-                },
-                "TimezoneDateTimeFieldTest": {
-                    "Value": "2022-12-13T21:02:18.399-05:00"
-                },
-                "DateFieldTest": {
-                    "Value": "2024-5-31"
-                }
+        // Arrange
+        var jsonStr = """
+         {
+            "TimeFieldTest": {
+                "Value": "13:05"
+            },
+            "DateTimeFieldTest": {
+                "Value": "2024-5-31 13:05"
+            },
+            "TimezoneDateTimeFieldTest": {
+                "Value": "2022-12-13T21:02:18.399-05:00"
+            },
+            "DateFieldTest": {
+                "Value": "2024-5-31"
             }
-            """;
-
-            // Act
-            var jobject = JsonNode.Parse(jsonStr);
-            var timeField = jobject.SelectNode("TimeFieldTest").ToObject<TimeField>();
-            var dateField = jobject.SelectNode("DateFieldTest").ToObject<DateField>();
-            var dateTimeField = jobject.SelectNode("DateTimeFieldTest").ToObject<DateTimeField>();
-            var timezoneDateTimeFieldTest = jobject.SelectNode("TimezoneDateTimeFieldTest").ToObject<DateTimeField>();
-
-            // Assert
-            Assert.Equal("13:05:00", timeField.Value.Value.ToString());
-            Assert.Equal("2024-05-31", dateField.Value.Value.ToString("yyyy-MM-dd"));
-            Assert.Equal("2024-05-31 13:05", dateTimeField.Value.Value.ToString("yyyy-MM-dd HH:mm"));
-            Assert.Equal("13:05:00", JObject.FromObject(timeField).SelectNode("Value").ToString());
-            Assert.Equal("2024-05-31T00:00:00Z", JObject.FromObject(dateField).SelectNode("Value").ToString());
-            Assert.Equal("2024-05-31T13:05:00Z", JObject.FromObject(dateTimeField).SelectNode("Value").ToString());
-
-            var utcTime = TimeZoneInfo.ConvertTimeToUtc(timezoneDateTimeFieldTest.Value.Value);
-            Assert.Equal("2022-12-14 02:02:18", utcTime.ToString("yyyy-MM-dd HH:mm:ss"));
         }
+        """;
+
+        // Act
+        var jobject = JsonNode.Parse(jsonStr);
+        var timeField = jobject.SelectNode("TimeFieldTest").ToObject<TimeField>();
+        var dateField = jobject.SelectNode("DateFieldTest").ToObject<DateField>();
+        var dateTimeField = jobject.SelectNode("DateTimeFieldTest").ToObject<DateTimeField>();
+        var timezoneDateTimeFieldTest = jobject.SelectNode("TimezoneDateTimeFieldTest").ToObject<DateTimeField>();
+
+        // Assert
+        Assert.Equal("13:05:00", timeField.Value.Value.ToString());
+        Assert.Equal("2024-05-31", dateField.Value.Value.ToString("yyyy-MM-dd"));
+        Assert.Equal("2024-05-31 13:05", dateTimeField.Value.Value.ToString("yyyy-MM-dd HH:mm"));
+        Assert.Equal("13:05:00", JObject.FromObject(timeField).SelectNode("Value").ToString());
+        Assert.Equal("2024-05-31T00:00:00Z", JObject.FromObject(dateField).SelectNode("Value").ToString());
+        Assert.Equal("2024-05-31T13:05:00Z", JObject.FromObject(dateTimeField).SelectNode("Value").ToString());
+
+        var utcTime = TimeZoneInfo.ConvertTimeToUtc(timezoneDateTimeFieldTest.Value.Value);
+        Assert.Equal("2022-12-14 02:02:18", utcTime.ToString("yyyy-MM-dd HH:mm:ss"));
+    }
 
-        [Fact]
-        public void ShouldSerializeContent()
+    [Fact]
+    public void ShouldSerializeContent()
+    {
+        var contentItem = new ContentItem
         {
-            var contentItem = new ContentItem
-            {
-                Id = 1,
-                ContentItemId = "2",
-                ContentType = "Page",
-                Latest = true,
-                Published = true,
-            };
-
-            var json = JConvert.SerializeObject(contentItem);
-
-            var contentItem2 = JConvert.DeserializeObject<ContentItem>(json);
-
-            Assert.Equal(0, contentItem2.Id); // Should be 0 as we dont serialize it.
-            Assert.Equal(contentItem.ContentItemId, contentItem2.ContentItemId);
-            Assert.Equal(contentItem.ContentType, contentItem2.ContentType);
-            Assert.Equal(contentItem.Latest, contentItem2.Latest);
-            Assert.Equal(contentItem.Published, contentItem2.Published);
-        }
+            Id = 1,
+            ContentItemId = "2",
+            ContentType = "Page",
+            Latest = true,
+            Published = true,
+        };
+
+        var json = JConvert.SerializeObject(contentItem);
+
+        var contentItem2 = JConvert.DeserializeObject<ContentItem>(json);
+
+        Assert.Equal(0, contentItem2.Id); // Should be 0 as we dont serialize it.
+        Assert.Equal(contentItem.ContentItemId, contentItem2.ContentItemId);
+        Assert.Equal(contentItem.ContentType, contentItem2.ContentType);
+        Assert.Equal(contentItem.Latest, contentItem2.Latest);
+        Assert.Equal(contentItem.Published, contentItem2.Published);
+    }
 
-        [Fact]
-        public void ShouldSerializeParts()
-        {
-            var contentItem = new ContentItem();
-            var myPart = new MyPart { Text = "test" };
-            contentItem.Weld(myPart);
+    [Fact]
+    public void ShouldSerializeParts()
+    {
+        var contentItem = new ContentItem();
+        var myPart = new MyPart { Text = "test" };
+        contentItem.Weld(myPart);
 
-            var json = JConvert.SerializeObject(contentItem);
+        var json = JConvert.SerializeObject(contentItem);
 
-            var contentItem2 = JConvert.DeserializeObject<ContentItem>(json);
+        var contentItem2 = JConvert.DeserializeObject<ContentItem>(json);
 
-            Assert.NotNull(contentItem2.Content.MyPart);
-            Assert.Equal("test", (string)contentItem2.Content.MyPart.Text);
-        }
+        Assert.NotNull(contentItem2.Content.MyPart);
+        Assert.Equal("test", (string)contentItem2.Content.MyPart.Text);
+    }
 
-        [Fact]
-        public void ShouldAlterPart()
-        {
-            var contentItem = CreateContentItemWithMyPart();
+    [Fact]
+    public void ShouldAlterPart()
+    {
+        var contentItem = CreateContentItemWithMyPart();
 
-            var json = JConvert.SerializeObject(contentItem);
+        var json = JConvert.SerializeObject(contentItem);
 
-            var contentItem2 = JConvert.DeserializeObject<ContentItem>(json);
+        var contentItem2 = JConvert.DeserializeObject<ContentItem>(json);
 
-            Assert.NotNull(contentItem2.Content.MyPart);
-            Assert.Equal("test", (string)contentItem2.Content.MyPart.Text);
-        }
+        Assert.NotNull(contentItem2.Content.MyPart);
+        Assert.Equal("test", (string)contentItem2.Content.MyPart.Text);
+    }
 
-        [Fact]
-        public void ContentShouldOnlyContainParts()
-        {
-            var contentItem = CreateContentItemWithMyPart();
+    [Fact]
+    public void ContentShouldOnlyContainParts()
+    {
+        var contentItem = CreateContentItemWithMyPart();
 
-            var json = JConvert.SerializeObject(contentItem);
+        var json = JConvert.SerializeObject(contentItem);
 
-            Assert.Contains(@"""MyPart"":{""Text"":""test""}", json);
-        }
+        Assert.Contains(@"""MyPart"":{""Text"":""test""}", json);
+    }
 
-        [Fact]
-        public void ContentShouldStoreFields()
+    [Fact]
+    public void ContentShouldStoreFields()
+    {
+        var contentItem = CreateContentItemWithMyPart();
+        contentItem.Alter<MyPart>(x =>
         {
-            var contentItem = CreateContentItemWithMyPart();
-            contentItem.Alter<MyPart>(x =>
-            {
-                x.GetOrCreate<MyField>("myField");
-                x.Alter<MyField>("myField", f => f.Value = 123);
-            });
+            x.GetOrCreate<MyField>("myField");
+            x.Alter<MyField>("myField", f => f.Value = 123);
+        });
 
-            var json = JConvert.SerializeObject(contentItem);
+        var json = JConvert.SerializeObject(contentItem);
 
-            Assert.Contains(@"""MyPart"":{""Text"":""test"",""myField"":{""Value"":123}}", json);
-        }
+        Assert.Contains(@"""MyPart"":{""Text"":""test"",""myField"":{""Value"":123}}", json);
+    }
 
-        [Fact]
-        public void ContentShouldBeJsonPathQueryable()
-        {
-            var contentItem = CreateContentItemWithMyPart();
-            JsonNode contentItemJson = contentItem.Content;
-            JsonNode contentPartJson = contentItem.As<MyPart>().Content;
-
-            // The content part should be selectable from the content item.
-            var selectedItemNode = contentItemJson.SelectNode("MyPart");
-            Assert.NotNull(selectedItemNode);
-            Assert.Equal(selectedItemNode.ToJsonString(), contentPartJson.ToJsonString());
-
-            // Verify that SelectNode queries the subtree of the node it's called on (not the document root).
-            var textPropertyNode = selectedItemNode.SelectNode("Text");
-            AssertJsonEqual(textPropertyNode, JObject.Parse(selectedItemNode.ToJsonString()).SelectNode("Text"));
-
-            // Verify consistent results when targeting the same node in different ways.
-            AssertJsonEqual(textPropertyNode, contentPartJson.SelectNode("Text"));
-            AssertJsonEqual(textPropertyNode, contentItemJson.SelectNode("MyPart.Text"));
-            AssertJsonEqual(textPropertyNode, contentItemJson.SelectNode("$..Text"));
-        }
+    [Fact]
+    public void ContentShouldBeJsonPathQueryable()
+    {
+        var contentItem = CreateContentItemWithMyPart();
+        JsonNode contentItemJson = contentItem.Content;
+        JsonNode contentPartJson = contentItem.As<MyPart>().Content;
+
+        // The content part should be selectable from the content item.
+        var selectedItemNode = contentItemJson.SelectNode("MyPart");
+        Assert.NotNull(selectedItemNode);
+        Assert.Equal(selectedItemNode.ToJsonString(), contentPartJson.ToJsonString());
+
+        // Verify that SelectNode queries the subtree of the node it's called on (not the document root).
+        var textPropertyNode = selectedItemNode.SelectNode("Text");
+        AssertJsonEqual(textPropertyNode, JObject.Parse(selectedItemNode.ToJsonString()).SelectNode("Text"));
+
+        // Verify consistent results when targeting the same node in different ways.
+        AssertJsonEqual(textPropertyNode, contentPartJson.SelectNode("Text"));
+        AssertJsonEqual(textPropertyNode, contentItemJson.SelectNode("MyPart.Text"));
+        AssertJsonEqual(textPropertyNode, contentItemJson.SelectNode("$..Text"));
+    }
 
-        [Fact]
-        public void RemovingPropertyShouldWork()
-        {
-            var contentItem = new ContentItem();
-            contentItem.GetOrCreate<MyPart>();
-            contentItem.Alter<MyPart>(x => x.Text = "test");
+    [Fact]
+    public void RemovingPropertyShouldWork()
+    {
+        var contentItem = new ContentItem();
+        contentItem.GetOrCreate<MyPart>();
+        contentItem.Alter<MyPart>(x => x.Text = "test");
 
-            JsonDynamicObject content = contentItem.Content;
-            Assert.Null(content.GetValue("not real property")); // Properties that don't exist return null.
-            Assert.NotNull(content.GetValue(nameof(MyPart))); // Right now this property exists.
+        JsonDynamicObject content = contentItem.Content;
+        Assert.Null(content.GetValue("not real property")); // Properties that don't exist return null.
+        Assert.NotNull(content.GetValue(nameof(MyPart))); // Right now this property exists.
 
-            content.Remove(nameof(MyPart));
-            Assert.Null(content.GetValue(nameof(MyPart)));
-        }
+        content.Remove(nameof(MyPart));
+        Assert.Null(content.GetValue(nameof(MyPart)));
+    }
 
-        [Fact]
-        public void ContentShouldCanCallRemoveMethod()
-        {
-            var contentItem = CreateContentItemWithMyPart();
-            contentItem.Alter<MyPart>(x => x.Text = "test");
-            Assert.Equal("test", contentItem.As<MyPart>().Text);
-            Assert.True(contentItem.Content.Remove("MyPart"));
-        }
+    [Fact]
+    public void ContentShouldCanCallRemoveMethod()
+    {
+        var contentItem = CreateContentItemWithMyPart();
+        contentItem.Alter<MyPart>(x => x.Text = "test");
+        Assert.Equal("test", contentItem.As<MyPart>().Text);
+        Assert.True(contentItem.Content.Remove("MyPart"));
+    }
 
-        [Fact]
-        public void ShouldDeserializeContentField()
+    [Fact]
+    public void ShouldDeserializeContentField()
+    {
+        var contentItem = CreateContentItemWithMyPart();
+        contentItem.Alter<MyPart>(x => x.Text = "test");
+        contentItem.Alter<MyPart>(x =>
         {
-            var contentItem = CreateContentItemWithMyPart();
-            contentItem.Alter<MyPart>(x => x.Text = "test");
-            contentItem.Alter<MyPart>(x =>
-            {
-                x.GetOrCreate<MyField>("myField");
-                x.Alter<MyField>("myField", f => f.Value = 123);
-            });
+            x.GetOrCreate<MyField>("myField");
+            x.Alter<MyField>("myField", f => f.Value = 123);
+        });
 
-            var json = JConvert.SerializeObject(contentItem);
+        var json = JConvert.SerializeObject(contentItem);
 
-            var contentItem2 = JConvert.DeserializeObject<ContentItem>(json);
+        var contentItem2 = JConvert.DeserializeObject<ContentItem>(json);
 
-            Assert.NotNull(contentItem2.Content.MyPart);
-            Assert.NotNull(contentItem2.Content.MyPart.myField);
-            Assert.Equal(123, (int)contentItem2.Content.MyPart.myField.Value);
-        }
+        Assert.NotNull(contentItem2.Content.MyPart);
+        Assert.NotNull(contentItem2.Content.MyPart.myField);
+        Assert.Equal(123, (int)contentItem2.Content.MyPart.myField.Value);
+    }
 
-        [Fact]
-        public void ContentShouldStoreDateTimeFields()
+    [Fact]
+    public void ContentShouldStoreDateTimeFields()
+    {
+        var contentItem = new ContentItem();
+        contentItem.GetOrCreate<MyPart>();
+        contentItem.Alter<MyPart>(x => x.Text = "test");
+        contentItem.Alter<MyPart>(x =>
         {
-            var contentItem = new ContentItem();
-            contentItem.GetOrCreate<MyPart>();
-            contentItem.Alter<MyPart>(x => x.Text = "test");
-            contentItem.Alter<MyPart>(x =>
-            {
-                x.GetOrCreate<MyDateTimeField>("myField");
-                x.Alter<MyDateTimeField>("myField", f => f.Value = new DateTime(2024, 1, 1, 10, 42, 0));
-            });
-
-            var json = JConvert.SerializeObject(contentItem);
-
-            Assert.Contains(@"""MyPart"":{""Text"":""test"",""myField"":{""Value"":""2024-01-01T10:42:00Z""}}", json);
-        }
+            x.GetOrCreate<MyDateTimeField>("myField");
+            x.Alter<MyDateTimeField>("myField", f => f.Value = new DateTime(2024, 1, 1, 10, 42, 0));
+        });
 
-        [Fact]
-        public void ShouldDeserializeDateTimeFields()
-        {
-            var contentItem = new ContentItem();
-            contentItem.GetOrCreate<MyPart>();
-            contentItem.Alter<MyPart>(x => x.Text = "test");
-            contentItem.Alter<MyPart>(x =>
-            {
-                x.GetOrCreate<MyDateTimeField>("myField");
-                x.Alter<MyDateTimeField>("myField", f => f.Value = new DateTime(2024, 1, 1, 10, 42, 0));
-            });
-
-            var json = JConvert.SerializeObject(contentItem);
-
-            var contentItem2 = JConvert.DeserializeObject<ContentItem>(json);
-
-            Assert.NotNull(contentItem2.Content.MyPart);
-            Assert.NotNull(contentItem2.Content.MyPart.myField);
-            Assert.Equal(new DateTime(2024, 1, 1, 10, 42, 0), (DateTime?)contentItem2.Content.MyPart.myField.Value);
-        }
+        var json = JConvert.SerializeObject(contentItem);
 
-        [Fact]
-        public void ContentShouldStoreUtcDateTimeFields()
-        {
-            var contentItem = new ContentItem();
-            contentItem.GetOrCreate<MyPart>();
-            contentItem.Alter<MyPart>(x => x.Text = "test");
-            contentItem.Alter<MyPart>(x =>
-            {
-                x.GetOrCreate<MyDateTimeField>("myField");
-                x.Alter<MyDateTimeField>("myField", f => f.Value = new DateTime(2024, 1, 1, 10, 42, 0, DateTimeKind.Utc));
-            });
-
-            var json = JConvert.SerializeObject(contentItem);
-
-            Assert.Contains(@"""MyPart"":{""Text"":""test"",""myField"":{""Value"":""2024-01-01T10:42:00Z""}}", json);
-        }
-
-        [Fact]
-        public void ShouldDeserializeUtcDateTimeFields()
-        {
-            var contentItem = new ContentItem();
-            contentItem.GetOrCreate<MyPart>();
-            contentItem.Alter<MyPart>(x => x.Text = "test");
-            contentItem.Alter<MyPart>(x =>
-            {
-                x.GetOrCreate<MyDateTimeField>("myField");
-                x.Alter<MyDateTimeField>("myField", f => f.Value = new DateTime(2024, 1, 1, 10, 42, 0, DateTimeKind.Utc));
-            });
-
-            var json = JConvert.SerializeObject(contentItem);
-
-            var contentItem2 = JConvert.DeserializeObject<ContentItem>(json);
-
-            Assert.NotNull(contentItem2.Content.MyPart);
-            Assert.NotNull(contentItem2.Content.MyPart.myField);
-            Assert.Equal(new DateTime(2024, 1, 1, 10, 42, 0, DateTimeKind.Utc), (DateTime?)contentItem2.Content.MyPart.myField.Value);
-        }
+        Assert.Contains(@"""MyPart"":{""Text"":""test"",""myField"":{""Value"":""2024-01-01T10:42:00Z""}}", json);
+    }
 
-        [Fact]
-        public void ShouldDeserializeTextFields()
+    [Fact]
+    public void ShouldDeserializeDateTimeFields()
+    {
+        var contentItem = new ContentItem();
+        contentItem.GetOrCreate<MyPart>();
+        contentItem.Alter<MyPart>(x => x.Text = "test");
+        contentItem.Alter<MyPart>(x =>
         {
-            var contentItem = new ContentItem();
-            contentItem.GetOrCreate<MyPart>();
-            contentItem.Alter<MyPart>(x => x.Text = "test");
-            contentItem.Alter<MyPart>(x =>
-            {
-                x.GetOrCreate<MyTextField>("myField");
-                x.Alter<MyTextField>("myField", f => f.Text = "This is a test field entry");
-            });
-
-            var json = JConvert.SerializeObject(contentItem);
-
-            var contentItem2 = JConvert.DeserializeObject<ContentItem>(json);
-
-            Assert.NotNull(contentItem2.Content.MyPart);
-            Assert.NotNull(contentItem2.Content.MyPart.myField);
-            Assert.Equal("This is a test field entry", (string)contentItem2.Content.MyPart.myField.Text);
-        }
+            x.GetOrCreate<MyDateTimeField>("myField");
+            x.Alter<MyDateTimeField>("myField", f => f.Value = new DateTime(2024, 1, 1, 10, 42, 0));
+        });
 
-        private static ContentItem CreateContentItemWithMyPart(string text = "test")
-        {
-            var contentItem = new ContentItem();
-            contentItem.GetOrCreate<MyPart>();
-            contentItem.Alter<MyPart>(x => x.Text = text);
+        var json = JConvert.SerializeObject(contentItem);
 
-            return contentItem;
-        }
+        var contentItem2 = JConvert.DeserializeObject<ContentItem>(json);
 
-        private static void AssertJsonEqual(JsonNode expected, JsonNode actual)
-        {
-            Assert.NotNull(expected);
-            Assert.NotNull(actual);
-            Assert.Equal(expected.ToJsonString(), actual.ToJsonString());
-        }
+        Assert.NotNull(contentItem2.Content.MyPart);
+        Assert.NotNull(contentItem2.Content.MyPart.myField);
+        Assert.Equal(new DateTime(2024, 1, 1, 10, 42, 0), (DateTime?)contentItem2.Content.MyPart.myField.Value);
     }
 
-    public sealed class MyPart : ContentPart
+    [Fact]
+    public void ContentShouldStoreUtcDateTimeFields()
     {
-        public string Text { get; set; }
+        var contentItem = new ContentItem();
+        contentItem.GetOrCreate<MyPart>();
+        contentItem.Alter<MyPart>(x => x.Text = "test");
+        contentItem.Alter<MyPart>(x =>
+        {
+            x.GetOrCreate<MyDateTimeField>("myField");
+            x.Alter<MyDateTimeField>("myField", f => f.Value = new DateTime(2024, 1, 1, 10, 42, 0, DateTimeKind.Utc));
+        });
+
+        var json = JConvert.SerializeObject(contentItem);
+
+        Assert.Contains(@"""MyPart"":{""Text"":""test"",""myField"":{""Value"":""2024-01-01T10:42:00Z""}}", json);
     }
 
-    public sealed class MyField : ContentField
+    [Fact]
+    public void ShouldDeserializeUtcDateTimeFields()
     {
-        public int Value { get; set; }
+        var contentItem = new ContentItem();
+        contentItem.GetOrCreate<MyPart>();
+        contentItem.Alter<MyPart>(x => x.Text = "test");
+        contentItem.Alter<MyPart>(x =>
+        {
+            x.GetOrCreate<MyDateTimeField>("myField");
+            x.Alter<MyDateTimeField>("myField", f => f.Value = new DateTime(2024, 1, 1, 10, 42, 0, DateTimeKind.Utc));
+        });
+
+        var json = JConvert.SerializeObject(contentItem);
+
+        var contentItem2 = JConvert.DeserializeObject<ContentItem>(json);
+
+        Assert.NotNull(contentItem2.Content.MyPart);
+        Assert.NotNull(contentItem2.Content.MyPart.myField);
+        Assert.Equal(new DateTime(2024, 1, 1, 10, 42, 0, DateTimeKind.Utc), (DateTime?)contentItem2.Content.MyPart.myField.Value);
     }
 
-    public sealed class MyDateTimeField : ContentField
+    [Fact]
+    public void ShouldDeserializeTextFields()
     {
-        public DateTime? Value { get; set; }
+        var contentItem = new ContentItem();
+        contentItem.GetOrCreate<MyPart>();
+        contentItem.Alter<MyPart>(x => x.Text = "test");
+        contentItem.Alter<MyPart>(x =>
+        {
+            x.GetOrCreate<MyTextField>("myField");
+            x.Alter<MyTextField>("myField", f => f.Text = "This is a test field entry");
+        });
+
+        var json = JConvert.SerializeObject(contentItem);
+
+        var contentItem2 = JConvert.DeserializeObject<ContentItem>(json);
+
+        Assert.NotNull(contentItem2.Content.MyPart);
+        Assert.NotNull(contentItem2.Content.MyPart.myField);
+        Assert.Equal("This is a test field entry", (string)contentItem2.Content.MyPart.myField.Text);
     }
 
-    public sealed class MyTextField : ContentField
+    private static ContentItem CreateContentItemWithMyPart(string text = "test")
     {
-        public string Text { get; set; }
+        var contentItem = new ContentItem();
+        contentItem.GetOrCreate<MyPart>();
+        contentItem.Alter<MyPart>(x => x.Text = text);
+
+        return contentItem;
     }
 
-    public sealed class GetOnlyListPart : ContentPart
+    private static void AssertJsonEqual(JsonNode expected, JsonNode actual)
     {
-        public IList<string> Texts { get; } = [];
+        Assert.NotNull(expected);
+        Assert.NotNull(actual);
+        Assert.Equal(expected.ToJsonString(), actual.ToJsonString());
     }
 }
+
+public sealed class MyPart : ContentPart
+{
+    public string Text { get; set; }
+}
+
+public sealed class MyField : ContentField
+{
+    public int Value { get; set; }
+}
+
+public sealed class MyDateTimeField : ContentField
+{
+    public DateTime? Value { get; set; }
+}
+
+public sealed class MyTextField : ContentField
+{
+    public string Text { get; set; }
+}
+
+public sealed class GetOnlyListPart : ContentPart
+{
+    public IList<string> Texts { get; } = [];
+}
diff --git a/test/OrchardCore.Tests/Data/JsonDynamicTests.cs b/test/OrchardCore.Tests/Data/JsonDynamicTests.cs
index a9108ca3886..ce3f0c501f1 100644
--- a/test/OrchardCore.Tests/Data/JsonDynamicTests.cs
+++ b/test/OrchardCore.Tests/Data/JsonDynamicTests.cs
@@ -799,7 +799,7 @@ public void SerializingJsonDynamicValueMustWriteValueOnly()
         var contentItem = GetContentTestData();
         dynamic contentExpando = new ExpandoObject();
         contentExpando.content = contentItem.Content;
-        
+
         // Act
         var contentStr = JConvert.SerializeObject((ExpandoObject)contentExpando);
 
@@ -822,7 +822,7 @@ await context.UsingTenantScopeAsync(scope =>
             };
             var scriptingEngine = scope.ServiceProvider.GetRequiredService<IScriptingEngine>();
             var scriptingScope = scriptingEngine.CreateScope([getTestContent], scope.ServiceProvider, null, null);
-            
+
             // Act
             var contentStr = (string)scriptingEngine.Evaluate(scriptingScope, "return JSON.stringify(getTestContent().Content)");
 
diff --git a/test/OrchardCore.Tests/DisplayManagement/ArgsUtility.cs b/test/OrchardCore.Tests/DisplayManagement/ArgsUtility.cs
index 8a5eae5f815..d3465187241 100644
--- a/test/OrchardCore.Tests/DisplayManagement/ArgsUtility.cs
+++ b/test/OrchardCore.Tests/DisplayManagement/ArgsUtility.cs
@@ -1,36 +1,35 @@
 using OrchardCore.DisplayManagement;
 using Arguments = OrchardCore.DisplayManagement.Arguments;
 
-namespace OrchardCore.Tests.DisplayManagement
+namespace OrchardCore.Tests.DisplayManagement;
+
+public static class ArgsUtility
 {
-    public static class ArgsUtility
+    public static INamedEnumerable<T> Named<T>(IDictionary<string, T> args)
     {
-        public static INamedEnumerable<T> Named<T>(IDictionary<string, T> args)
-        {
-            return FromDictionary(args);
-        }
+        return FromDictionary(args);
+    }
 
-        public static INamedEnumerable<object> Named(object args)
-        {
-            return FromDictionary(new RouteValueDictionary(args));
-        }
-        public static INamedEnumerable<T> Empty<T>()
-        {
-            return Arguments.FromT(Array.Empty<T>(), []);
-        }
-        public static INamedEnumerable<object> Empty()
-        {
-            return Empty<object>();
-        }
+    public static INamedEnumerable<object> Named(object args)
+    {
+        return FromDictionary(new RouteValueDictionary(args));
+    }
+    public static INamedEnumerable<T> Empty<T>()
+    {
+        return Arguments.FromT(Array.Empty<T>(), []);
+    }
+    public static INamedEnumerable<object> Empty()
+    {
+        return Empty<object>();
+    }
 
-        private static INamedEnumerable<T> FromDictionary<T>(IDictionary<string, T> args)
-        {
-            return Arguments.FromT(args.Values, args.Keys);
-        }
+    private static INamedEnumerable<T> FromDictionary<T>(IDictionary<string, T> args)
+    {
+        return Arguments.FromT(args.Values, args.Keys);
+    }
 
-        public static INamedEnumerable<object> Positional(params object[] args)
-        {
-            return Arguments.From(args, []);
-        }
+    public static INamedEnumerable<object> Positional(params object[] args)
+    {
+        return Arguments.From(args, []);
     }
 }
diff --git a/test/OrchardCore.Tests/DisplayManagement/CompositeTests.cs b/test/OrchardCore.Tests/DisplayManagement/CompositeTests.cs
index 74bd96bb1a9..1c5a8f7da22 100644
--- a/test/OrchardCore.Tests/DisplayManagement/CompositeTests.cs
+++ b/test/OrchardCore.Tests/DisplayManagement/CompositeTests.cs
@@ -1,72 +1,71 @@
 using OrchardCore.DisplayManagement.Shapes;
 
-namespace OrchardCore.Tests.DisplayManagement
+namespace OrchardCore.Tests.DisplayManagement;
+
+public class CompositeTests
 {
-    public class CompositeTests
+    [Fact]
+    public void CompositesShouldNotOverrideExistingMembers()
     {
-        [Fact]
-        public void CompositesShouldNotOverrideExistingMembers()
-        {
-            var composite = new Animal { Color = "Pink" };
-
-            Assert.Equal("Pink", composite.Color);
-        }
-
-        [Fact]
-        public void CompositesShouldNotOverrideExistingMembersWhenUsedAsDynamic()
-        {
-            dynamic composite = new Animal();
-
-            composite.Color = "Pink";
-            Assert.Equal("Pink", composite.Color);
-        }
-
-        [Fact]
-        public void CompositesShouldAccessUnknownProperties()
-        {
-            dynamic composite = new Animal();
+        var composite = new Animal { Color = "Pink" };
 
-            composite.Fake = 42;
-            Assert.Equal(42, composite.Fake);
-        }
+        Assert.Equal("Pink", composite.Color);
+    }
 
-        [Fact]
-        public void CompositesShouldAccessUnknownPropertiesByIndex()
-        {
-            dynamic composite = new Animal();
+    [Fact]
+    public void CompositesShouldNotOverrideExistingMembersWhenUsedAsDynamic()
+    {
+        dynamic composite = new Animal();
 
-            composite["Fake"] = 42;
-            Assert.Equal(42, composite["Fake"]);
-        }
+        composite.Color = "Pink";
+        Assert.Equal("Pink", composite.Color);
+    }
 
-        [Fact]
-        public void CompositesShouldAccessKnownPropertiesByIndex()
-        {
-            dynamic composite = new Animal();
+    [Fact]
+    public void CompositesShouldAccessUnknownProperties()
+    {
+        dynamic composite = new Animal();
 
-            composite["Pink"] = "Pink";
-            Assert.Equal("Pink", composite["Pink"]);
-        }
+        composite.Fake = 42;
+        Assert.Equal(42, composite.Fake);
+    }
 
-        [Fact]
-        public void ChainProperties()
-        {
-            dynamic foo = new Animal();
-            foo.Bar("bar");
+    [Fact]
+    public void CompositesShouldAccessUnknownPropertiesByIndex()
+    {
+        dynamic composite = new Animal();
 
-            Assert.Equal("bar", foo.Bar);
-            Assert.False(foo.Bar == null);
-        }
+        composite["Fake"] = 42;
+        Assert.Equal(42, composite["Fake"]);
     }
 
-    public class Animal : Composite
+    [Fact]
+    public void CompositesShouldAccessKnownPropertiesByIndex()
     {
-        public string Kind { get; set; }
-        public string Color { get; set; }
+        dynamic composite = new Animal();
+
+        composite["Pink"] = "Pink";
+        Assert.Equal("Pink", composite["Pink"]);
     }
 
-    public interface ISized
+    [Fact]
+    public void ChainProperties()
     {
-        int Size { get; set; }
+        dynamic foo = new Animal();
+        foo.Bar("bar");
+
+        Assert.Equal("bar", foo.Bar);
+        Assert.False(foo.Bar == null);
     }
 }
+
+public class Animal : Composite
+{
+    public string Kind { get; set; }
+    public string Color { get; set; }
+}
+
+public interface ISized
+{
+    int Size { get; set; }
+}
diff --git a/test/OrchardCore.Tests/DisplayManagement/Decriptors/BasicShapeTemplateHarvesterTests.cs b/test/OrchardCore.Tests/DisplayManagement/Decriptors/BasicShapeTemplateHarvesterTests.cs
index 98ec192971b..34e4eec10f3 100644
--- a/test/OrchardCore.Tests/DisplayManagement/Decriptors/BasicShapeTemplateHarvesterTests.cs
+++ b/test/OrchardCore.Tests/DisplayManagement/Decriptors/BasicShapeTemplateHarvesterTests.cs
@@ -1,137 +1,136 @@
 using OrchardCore.DisplayManagement.Descriptors.ShapeTemplateStrategy;
 
-namespace OrchardCore.Tests.DisplayManagement.Decriptors
+namespace OrchardCore.Tests.DisplayManagement.Decriptors;
+
+public class BasicShapeTemplateHarvesterTests
 {
-    public class BasicShapeTemplateHarvesterTests
-    {
-        private static void VerifyShapeType(string givenSubPath, string givenFileName, string expectedShapeType)
-        {
-            var harvester = new BasicShapeTemplateHarvester();
-            var harvestShapeHits = harvester.HarvestShape(new HarvestShapeInfo { SubPath = givenSubPath, FileName = givenFileName });
-            Assert.Single(harvestShapeHits);
-            Assert.Equal(expectedShapeType, harvestShapeHits.Single().ShapeType, ignoreCase: true);
-        }
-
-        [Fact]
-        public void BasicFileNamesComeBackAsShapes()
-        {
-            VerifyShapeType("Views", "Hello", "Hello");
-            VerifyShapeType("Views", "World", "World");
-        }
-
-        [Fact]
-        public void DashBecomesBreakingSeperator()
-        {
-            VerifyShapeType("Views", "Hello-World", "Hello__World");
-        }
-
-        [Fact]
-        public void DotBecomesNonBreakingSeperator()
-        {
-            VerifyShapeType("Views", "Hello.World", "Hello_World");
-        }
-
-        [Fact]
-        public void DefaultItemsContentTemplate()
-        {
-            VerifyShapeType("Views/Items", "Content", "Content");
-        }
-
-        [Fact]
-        public void ImplicitSpecializationOfItemsContentTemplate()
-        {
-            VerifyShapeType("Views/Items", "MyType", "MyType");
-        }
-
-        [Fact]
-        public void ExplicitSpecializationOfItemsContentTemplate()
-        {
-            VerifyShapeType("Views/Items", "Content-MyType", "Content__MyType");
-        }
-
-        [Fact]
-        public void ContentItemDisplayTypes()
-        {
-            VerifyShapeType("Views/Items", "Content", "Content");
-            VerifyShapeType("Views/Items", "Content.Summary", "Content_Summary");
-            VerifyShapeType("Views/Items", "Content.Edit", "Content_Edit");
-        }
-
-        [Fact]
-        public void ExplicitSpecializationMixedWithDisplayTypes()
-        {
-            VerifyShapeType("Views/Items", "Content-MyType", "Content__MyType");
-            VerifyShapeType("Views/Items", "Content-MyType.Summary", "Content_Summary__MyType");
-            VerifyShapeType("Views/Items", "Content-MyType.Edit", "Content_Edit__MyType");
-        }
-
-        [Fact]
-        public void DefaultItemsContentTemplate2()
-        {
-            VerifyShapeType("Views", "Content", "Content");
-        }
-
-        [Fact]
-        public void ImplicitSpecializationOfItemsContentTemplate2()
-        {
-            VerifyShapeType("Views", "MyType", "MyType");
-        }
-
-        [Fact]
-        public void ExplicitSpecializationOfItemsContentTemplate2()
-        {
-            VerifyShapeType("Views", "Content-MyType", "Content__MyType");
-        }
-
-        [Fact]
-        public void ContentItemDisplayTypes2()
-        {
-            VerifyShapeType("Views", "Content", "Content");
-            VerifyShapeType("Views", "Content.Summary", "Content_Summary");
-            VerifyShapeType("Views", "Content.Edit", "Content_Edit");
-        }
-
-        [Fact]
-        public void ExplicitSpecializationMixedWithDisplayTypes2()
-        {
-            VerifyShapeType("Views", "Content-MyType", "Content__MyType");
-            VerifyShapeType("Views", "Content-MyType.Summary", "Content_Summary__MyType");
-            VerifyShapeType("Views", "Content-MyType.Edit", "Content_Edit__MyType");
-        }
-
-        [Fact]
-        public void MultipleDotsAreNormalizedToUnderscore()
-        {
-            VerifyShapeType("Views/Parts", "Common.Body", "Parts_Common_Body");
-            VerifyShapeType("Views/Parts", "Common.Body.Summary", "Parts_Common_Body_Summary");
-            VerifyShapeType("Views/Parts", "Localization.ContentTranslations.Summary", "Parts_Localization_ContentTranslations_Summary");
-        }
-
-        [Fact]
-        public void MultipleDotsAreNormalizedToUnderscore2()
-        {
-            VerifyShapeType("Views", "Parts.Common.Body", "Parts_Common_Body");
-            VerifyShapeType("Views", "Parts.Common.Body.Summary", "Parts_Common_Body_Summary");
-            VerifyShapeType("Views", "Parts.Localization.ContentTranslations.Summary", "Parts_Localization_ContentTranslations_Summary");
-        }
-
-        [Fact]
-        public void FieldNamesMayBeInSubfolderOrPrefixed()
-        {
-            VerifyShapeType("Views/Fields", "Common.Text", "Fields_Common_Text");
-            VerifyShapeType("Views", "Fields.Common.Text", "Fields_Common_Text");
-        }
-
-        [Fact]
-        public void FieldNamesMayHaveLongOrShortAlternates()
-        {
-            VerifyShapeType("Views/Fields", "Common.Text-FirstName", "Fields_Common_Text__FirstName");
-            VerifyShapeType("Views/Fields", "Common.Text-FirstName.SpecialCase", "Fields_Common_Text_SpecialCase__FirstName");
-            VerifyShapeType("Views/Fields", "Common.Text-FirstName-MyContentType", "Fields_Common_Text__FirstName__MyContentType");
-
-            VerifyShapeType("Views", "Fields.Common.Text-FirstName", "Fields_Common_Text__FirstName");
-            VerifyShapeType("Views", "Fields.Common.Text-FirstName.SpecialCase", "Fields_Common_Text_SpecialCase__FirstName");
-            VerifyShapeType("Views", "Fields.Common.Text-FirstName-MyContentType", "Fields_Common_Text__FirstName__MyContentType");
-        }
+    private static void VerifyShapeType(string givenSubPath, string givenFileName, string expectedShapeType)
+    {
+        var harvester = new BasicShapeTemplateHarvester();
+        var harvestShapeHits = harvester.HarvestShape(new HarvestShapeInfo { SubPath = givenSubPath, FileName = givenFileName });
+        Assert.Single(harvestShapeHits);
+        Assert.Equal(expectedShapeType, harvestShapeHits.Single().ShapeType, ignoreCase: true);
+    }
+
+    [Fact]
+    public void BasicFileNamesComeBackAsShapes()
+    {
+        VerifyShapeType("Views", "Hello", "Hello");
+        VerifyShapeType("Views", "World", "World");
+    }
+
+    [Fact]
+    public void DashBecomesBreakingSeperator()
+    {
+        VerifyShapeType("Views", "Hello-World", "Hello__World");
+    }
+
+    [Fact]
+    public void DotBecomesNonBreakingSeperator()
+    {
+        VerifyShapeType("Views", "Hello.World", "Hello_World");
+    }
+
+    [Fact]
+    public void DefaultItemsContentTemplate()
+    {
+        VerifyShapeType("Views/Items", "Content", "Content");
+    }
+
+    [Fact]
+    public void ImplicitSpecializationOfItemsContentTemplate()
+    {
+        VerifyShapeType("Views/Items", "MyType", "MyType");
+    }
+
+    [Fact]
+    public void ExplicitSpecializationOfItemsContentTemplate()
+    {
+        VerifyShapeType("Views/Items", "Content-MyType", "Content__MyType");
+    }
+
+    [Fact]
+    public void ContentItemDisplayTypes()
+    {
+        VerifyShapeType("Views/Items", "Content", "Content");
+        VerifyShapeType("Views/Items", "Content.Summary", "Content_Summary");
+        VerifyShapeType("Views/Items", "Content.Edit", "Content_Edit");
+    }
+
+    [Fact]
+    public void ExplicitSpecializationMixedWithDisplayTypes()
+    {
+        VerifyShapeType("Views/Items", "Content-MyType", "Content__MyType");
+        VerifyShapeType("Views/Items", "Content-MyType.Summary", "Content_Summary__MyType");
+        VerifyShapeType("Views/Items", "Content-MyType.Edit", "Content_Edit__MyType");
+    }
+
+    [Fact]
+    public void DefaultItemsContentTemplate2()
+    {
+        VerifyShapeType("Views", "Content", "Content");
+    }
+
+    [Fact]
+    public void ImplicitSpecializationOfItemsContentTemplate2()
+    {
+        VerifyShapeType("Views", "MyType", "MyType");
+    }
+
+    [Fact]
+    public void ExplicitSpecializationOfItemsContentTemplate2()
+    {
+        VerifyShapeType("Views", "Content-MyType", "Content__MyType");
+    }
+
+    [Fact]
+    public void ContentItemDisplayTypes2()
+    {
+        VerifyShapeType("Views", "Content", "Content");
+        VerifyShapeType("Views", "Content.Summary", "Content_Summary");
+        VerifyShapeType("Views", "Content.Edit", "Content_Edit");
+    }
+
+    [Fact]
+    public void ExplicitSpecializationMixedWithDisplayTypes2()
+    {
+        VerifyShapeType("Views", "Content-MyType", "Content__MyType");
+        VerifyShapeType("Views", "Content-MyType.Summary", "Content_Summary__MyType");
+        VerifyShapeType("Views", "Content-MyType.Edit", "Content_Edit__MyType");
+    }
+
+    [Fact]
+    public void MultipleDotsAreNormalizedToUnderscore()
+    {
+        VerifyShapeType("Views/Parts", "Common.Body", "Parts_Common_Body");
+        VerifyShapeType("Views/Parts", "Common.Body.Summary", "Parts_Common_Body_Summary");
+        VerifyShapeType("Views/Parts", "Localization.ContentTranslations.Summary", "Parts_Localization_ContentTranslations_Summary");
+    }
+
+    [Fact]
+    public void MultipleDotsAreNormalizedToUnderscore2()
+    {
+        VerifyShapeType("Views", "Parts.Common.Body", "Parts_Common_Body");
+        VerifyShapeType("Views", "Parts.Common.Body.Summary", "Parts_Common_Body_Summary");
+        VerifyShapeType("Views", "Parts.Localization.ContentTranslations.Summary", "Parts_Localization_ContentTranslations_Summary");
+    }
+
+    [Fact]
+    public void FieldNamesMayBeInSubfolderOrPrefixed()
+    {
+        VerifyShapeType("Views/Fields", "Common.Text", "Fields_Common_Text");
+        VerifyShapeType("Views", "Fields.Common.Text", "Fields_Common_Text");
+    }
+
+    [Fact]
+    public void FieldNamesMayHaveLongOrShortAlternates()
+    {
+        VerifyShapeType("Views/Fields", "Common.Text-FirstName", "Fields_Common_Text__FirstName");
+        VerifyShapeType("Views/Fields", "Common.Text-FirstName.SpecialCase", "Fields_Common_Text_SpecialCase__FirstName");
+        VerifyShapeType("Views/Fields", "Common.Text-FirstName-MyContentType", "Fields_Common_Text__FirstName__MyContentType");
+
+        VerifyShapeType("Views", "Fields.Common.Text-FirstName", "Fields_Common_Text__FirstName");
+        VerifyShapeType("Views", "Fields.Common.Text-FirstName.SpecialCase", "Fields_Common_Text_SpecialCase__FirstName");
+        VerifyShapeType("Views", "Fields.Common.Text-FirstName-MyContentType", "Fields_Common_Text__FirstName__MyContentType");
     }
 }
diff --git a/test/OrchardCore.Tests/DisplayManagement/Decriptors/DefaultShapeTableManagerTests.cs b/test/OrchardCore.Tests/DisplayManagement/Decriptors/DefaultShapeTableManagerTests.cs
index ff971ff35cc..32e396c81d2 100644
--- a/test/OrchardCore.Tests/DisplayManagement/Decriptors/DefaultShapeTableManagerTests.cs
+++ b/test/OrchardCore.Tests/DisplayManagement/Decriptors/DefaultShapeTableManagerTests.cs
@@ -9,496 +9,495 @@
 using OrchardCore.Modules.Manifest;
 using OrchardCore.Tests.Stubs;
 
-namespace OrchardCore.Tests.DisplayManagement.Descriptors
+namespace OrchardCore.Tests.DisplayManagement.Descriptors;
+
+public class DefaultShapeTableManagerTests : IDisposable
 {
-    public class DefaultShapeTableManagerTests : IDisposable
-    {
-        private readonly IServiceProvider _serviceProvider;
+    private readonly IServiceProvider _serviceProvider;
 
-        private sealed class TestModuleExtensionInfo : IExtensionInfo
+    private sealed class TestModuleExtensionInfo : IExtensionInfo
+    {
+        public TestModuleExtensionInfo(string name)
         {
-            public TestModuleExtensionInfo(string name)
+            var dic1 = new Dictionary<string, string>()
             {
-                var dic1 = new Dictionary<string, string>()
-                {
-                    {"name", name},
-                    {"description", name},
-                    {"type", "module"},
-                };
-
-                var memConfigSrc1 = new MemoryConfigurationSource { InitialData = dic1 };
-                var configurationBuilder = new ConfigurationBuilder();
-                configurationBuilder.Add(memConfigSrc1);
+                {"name", name},
+                {"description", name},
+                {"type", "module"},
+            };
 
-                Manifest = new ManifestInfo(new ModuleAttribute());
+            var memConfigSrc1 = new MemoryConfigurationSource { InitialData = dic1 };
+            var configurationBuilder = new ConfigurationBuilder();
+            configurationBuilder.Add(memConfigSrc1);
 
-                var features =
-                    new List<IFeatureInfo>()
-                    {
-                        { new FeatureInfo(name, name, 0, string.Empty, string.Empty, this, [], false, false, false) }
-                    };
+            Manifest = new ManifestInfo(new ModuleAttribute());
 
-                Features = features;
-            }
+            var features =
+                new List<IFeatureInfo>()
+                {
+                    { new FeatureInfo(name, name, 0, string.Empty, string.Empty, this, [], false, false, false) }
+                };
 
-            public IFileInfo ExtensionFileInfo { get; set; }
-            public IEnumerable<IFeatureInfo> Features { get; set; }
-            public string Id { get; set; }
-            public IManifestInfo Manifest { get; set; }
-            public string SubPath { get; set; }
-            public bool Exists => true;
+            Features = features;
         }
 
-        private sealed class TestThemeExtensionInfo : IThemeExtensionInfo
+        public IFileInfo ExtensionFileInfo { get; set; }
+        public IEnumerable<IFeatureInfo> Features { get; set; }
+        public string Id { get; set; }
+        public IManifestInfo Manifest { get; set; }
+        public string SubPath { get; set; }
+        public bool Exists => true;
+    }
+
+    private sealed class TestThemeExtensionInfo : IThemeExtensionInfo
+    {
+        public TestThemeExtensionInfo(string name)
         {
-            public TestThemeExtensionInfo(string name)
+            var dic1 = new Dictionary<string, string>()
             {
-                var dic1 = new Dictionary<string, string>()
-                {
-                    {"name", name},
-                    {"description", name},
-                    {"type", "theme"},
-                };
+                {"name", name},
+                {"description", name},
+                {"type", "theme"},
+            };
 
-                var memConfigSrc1 = new MemoryConfigurationSource { InitialData = dic1 };
-                var configurationBuilder = new ConfigurationBuilder();
-                configurationBuilder.Add(memConfigSrc1);
+            var memConfigSrc1 = new MemoryConfigurationSource { InitialData = dic1 };
+            var configurationBuilder = new ConfigurationBuilder();
+            configurationBuilder.Add(memConfigSrc1);
 
-                Manifest = new ManifestInfo(new ThemeAttribute());
+            Manifest = new ManifestInfo(new ThemeAttribute());
 
-                var features =
-                    new List<IFeatureInfo>()
-                    {
-                        { new FeatureInfo(name, name, 0, string.Empty, string.Empty, this, [], false, false, false) }
-                    };
+            var features =
+                new List<IFeatureInfo>()
+                {
+                    { new FeatureInfo(name, name, 0, string.Empty, string.Empty, this, [], false, false, false) }
+                };
 
-                Features = features;
+            Features = features;
 
-                Id = name;
-            }
+            Id = name;
+        }
 
-            public TestThemeExtensionInfo(string name, IFeatureInfo baseTheme)
+        public TestThemeExtensionInfo(string name, IFeatureInfo baseTheme)
+        {
+            var dic1 = new Dictionary<string, string>()
             {
-                var dic1 = new Dictionary<string, string>()
-                {
-                    {"name", name},
-                    {"description", name},
-                    {"type", "theme"},
-                    {"basetheme", baseTheme.Id }
-                };
-
-                var memConfigSrc1 = new MemoryConfigurationSource { InitialData = dic1 };
-                var configurationBuilder = new ConfigurationBuilder();
-                configurationBuilder.Add(memConfigSrc1);
+                {"name", name},
+                {"description", name},
+                {"type", "theme"},
+                {"basetheme", baseTheme.Id }
+            };
 
-                Manifest = new ManifestInfo(new ThemeAttribute());
+            var memConfigSrc1 = new MemoryConfigurationSource { InitialData = dic1 };
+            var configurationBuilder = new ConfigurationBuilder();
+            configurationBuilder.Add(memConfigSrc1);
 
-                Features =
-                    new List<IFeatureInfo>()
-                    {
-                        { new FeatureInfo(name, name, 0, string.Empty, string.Empty, this, [baseTheme.Id], false, false, false) }
-                    };
+            Manifest = new ManifestInfo(new ThemeAttribute());
 
-                Id = name;
-            }
+            Features =
+                new List<IFeatureInfo>()
+                {
+                    { new FeatureInfo(name, name, 0, string.Empty, string.Empty, this, [baseTheme.Id], false, false, false) }
+                };
 
-            public IFileInfo ExtensionFileInfo { get; set; }
-            public IEnumerable<IFeatureInfo> Features { get; set; }
-            public string Id { get; set; }
-            public IManifestInfo Manifest { get; set; }
-            public string SubPath { get; set; }
-            public bool Exists => true;
+            Id = name;
         }
 
-        public DefaultShapeTableManagerTests()
-        {
-            IServiceCollection serviceCollection = new ServiceCollection();
-
-            serviceCollection.AddLogging();
-            serviceCollection.AddMemoryCache();
-            serviceCollection.AddScoped<IShellFeaturesManager, TestShellFeaturesManager>();
-            serviceCollection.AddScoped<IShapeTableManager, DefaultShapeTableManager>();
-            serviceCollection.AddKeyedSingleton<IDictionary<string, ShapeTable>>(nameof(DefaultShapeTableManager), new ConcurrentDictionary<string, ShapeTable>());
-            serviceCollection.AddSingleton<ITypeFeatureProvider, TypeFeatureProvider>();
-            serviceCollection.AddSingleton<IHostEnvironment>(new StubHostingEnvironment());
-
-            var testFeatureExtensionInfo = new TestModuleExtensionInfo("Testing");
-            var theme1FeatureExtensionInfo = new TestThemeExtensionInfo("Theme1");
-            var baseThemeFeatureExtensionInfo = new TestThemeExtensionInfo("BaseTheme");
-            var derivedThemeFeatureExtensionInfo = new TestThemeExtensionInfo("DerivedTheme", baseThemeFeatureExtensionInfo.Features.First());
-
-            var features = new[] {
-                testFeatureExtensionInfo.Features.First(),
-                theme1FeatureExtensionInfo.Features.First(),
-                baseThemeFeatureExtensionInfo.Features.First(),
-                derivedThemeFeatureExtensionInfo.Features.First()
-            };
+        public IFileInfo ExtensionFileInfo { get; set; }
+        public IEnumerable<IFeatureInfo> Features { get; set; }
+        public string Id { get; set; }
+        public IManifestInfo Manifest { get; set; }
+        public string SubPath { get; set; }
+        public bool Exists => true;
+    }
 
-            serviceCollection.AddSingleton<IExtensionManager>(new TestExtensionManager(features));
+    public DefaultShapeTableManagerTests()
+    {
+        IServiceCollection serviceCollection = new ServiceCollection();
+
+        serviceCollection.AddLogging();
+        serviceCollection.AddMemoryCache();
+        serviceCollection.AddScoped<IShellFeaturesManager, TestShellFeaturesManager>();
+        serviceCollection.AddScoped<IShapeTableManager, DefaultShapeTableManager>();
+        serviceCollection.AddKeyedSingleton<IDictionary<string, ShapeTable>>(nameof(DefaultShapeTableManager), new ConcurrentDictionary<string, ShapeTable>());
+        serviceCollection.AddSingleton<ITypeFeatureProvider, TypeFeatureProvider>();
+        serviceCollection.AddSingleton<IHostEnvironment>(new StubHostingEnvironment());
+
+        var testFeatureExtensionInfo = new TestModuleExtensionInfo("Testing");
+        var theme1FeatureExtensionInfo = new TestThemeExtensionInfo("Theme1");
+        var baseThemeFeatureExtensionInfo = new TestThemeExtensionInfo("BaseTheme");
+        var derivedThemeFeatureExtensionInfo = new TestThemeExtensionInfo("DerivedTheme", baseThemeFeatureExtensionInfo.Features.First());
+
+        var features = new[] {
+            testFeatureExtensionInfo.Features.First(),
+            theme1FeatureExtensionInfo.Features.First(),
+            baseThemeFeatureExtensionInfo.Features.First(),
+            derivedThemeFeatureExtensionInfo.Features.First()
+        };
+
+        serviceCollection.AddSingleton<IExtensionManager>(new TestExtensionManager(features));
 
 #pragma warning disable CA1861 // Avoid constant arrays as arguments
-            TestShapeProvider.InitFeatureShapes(new Dictionary<IFeatureInfo, IEnumerable<string>>
-            {
-                { TestFeature(), new[] {"Hello"} },
-                { features[1], new[] {"Theme1Shape"} },
-                { features[2], new[] {"DerivedShape", "OverriddenShape"} },
-                { features[3], new[] {"BaseShape", "OverriddenShape"} },
-            });
+        TestShapeProvider.InitFeatureShapes(new Dictionary<IFeatureInfo, IEnumerable<string>>
+        {
+            { TestFeature(), new[] {"Hello"} },
+            { features[1], new[] {"Theme1Shape"} },
+            { features[2], new[] {"DerivedShape", "OverriddenShape"} },
+            { features[3], new[] {"BaseShape", "OverriddenShape"} },
+        });
 #pragma warning restore CA1861 // Avoid constant arrays as arguments
 
-            serviceCollection.AddScoped<IShapeTableProvider, TestShapeProvider>();
-            serviceCollection.AddScoped(sp => (TestShapeProvider)sp.GetService<IShapeTableProvider>());
+        serviceCollection.AddScoped<IShapeTableProvider, TestShapeProvider>();
+        serviceCollection.AddScoped(sp => (TestShapeProvider)sp.GetService<IShapeTableProvider>());
 
-            _serviceProvider = serviceCollection.BuildServiceProvider();
+        _serviceProvider = serviceCollection.BuildServiceProvider();
 
-            var typeFeatureProvider = _serviceProvider.GetService<ITypeFeatureProvider>();
-            typeFeatureProvider.TryAdd(typeof(TestShapeProvider), TestFeature());
-        }
+        var typeFeatureProvider = _serviceProvider.GetService<ITypeFeatureProvider>();
+        typeFeatureProvider.TryAdd(typeof(TestShapeProvider), TestFeature());
+    }
 
-        private static FeatureInfo TestFeature()
+    private static FeatureInfo TestFeature()
+    {
+        return new FeatureInfo("Testing", new TestModuleExtensionInfo("Testing"));
+    }
+
+    public class TestShellFeaturesManager : IShellFeaturesManager
+    {
+        private readonly IExtensionManager _extensionManager;
+
+        public TestShellFeaturesManager(IExtensionManager extensionManager)
         {
-            return new FeatureInfo("Testing", new TestModuleExtensionInfo("Testing"));
+            _extensionManager = extensionManager;
         }
 
-        public class TestShellFeaturesManager : IShellFeaturesManager
+        public Task<IEnumerable<IFeatureInfo>> GetEnabledFeaturesAsync()
         {
-            private readonly IExtensionManager _extensionManager;
-
-            public TestShellFeaturesManager(IExtensionManager extensionManager)
-            {
-                _extensionManager = extensionManager;
-            }
-
-            public Task<IEnumerable<IFeatureInfo>> GetEnabledFeaturesAsync()
-            {
-                return Task.FromResult(_extensionManager.GetFeatures());
-            }
+            return Task.FromResult(_extensionManager.GetFeatures());
+        }
 
-            public Task<IEnumerable<IFeatureInfo>> GetAlwaysEnabledFeaturesAsync()
-            {
-                throw new NotImplementedException();
-            }
+        public Task<IEnumerable<IFeatureInfo>> GetAlwaysEnabledFeaturesAsync()
+        {
+            throw new NotImplementedException();
+        }
 
-            public Task<IEnumerable<IFeatureInfo>> GetDisabledFeaturesAsync()
-            {
-                throw new NotImplementedException();
-            }
+        public Task<IEnumerable<IFeatureInfo>> GetDisabledFeaturesAsync()
+        {
+            throw new NotImplementedException();
+        }
 
-            public Task<(IEnumerable<IFeatureInfo>, IEnumerable<IFeatureInfo>)> UpdateFeaturesAsync(IEnumerable<IFeatureInfo> featuresToDisable, IEnumerable<IFeatureInfo> featuresToEnable, bool force)
-            {
-                throw new NotImplementedException();
-            }
+        public Task<(IEnumerable<IFeatureInfo>, IEnumerable<IFeatureInfo>)> UpdateFeaturesAsync(IEnumerable<IFeatureInfo> featuresToDisable, IEnumerable<IFeatureInfo> featuresToEnable, bool force)
+        {
+            throw new NotImplementedException();
+        }
 
-            public Task<IEnumerable<IExtensionInfo>> GetEnabledExtensionsAsync()
-            {
-                return Task.FromResult(_extensionManager.GetExtensions());
-            }
+        public Task<IEnumerable<IExtensionInfo>> GetEnabledExtensionsAsync()
+        {
+            return Task.FromResult(_extensionManager.GetExtensions());
+        }
 
-            public Task<IEnumerable<IFeatureInfo>> GetAvailableFeaturesAsync()
-            {
-                return Task.FromResult(_extensionManager.GetFeatures());
-            }
+        public Task<IEnumerable<IFeatureInfo>> GetAvailableFeaturesAsync()
+        {
+            return Task.FromResult(_extensionManager.GetFeatures());
+        }
 
-            public Task<IEnumerable<IExtensionInfo>> GetAvailableExtensionsAsync()
-            {
-                return Task.FromResult(_extensionManager.GetExtensions());
-            }
+        public Task<IEnumerable<IExtensionInfo>> GetAvailableExtensionsAsync()
+        {
+            return Task.FromResult(_extensionManager.GetExtensions());
         }
+    }
 
-        public class TestExtensionManager : IExtensionManager
+    public class TestExtensionManager : IExtensionManager
+    {
+        private readonly IEnumerable<IFeatureInfo> _features;
+        public TestExtensionManager(IEnumerable<IFeatureInfo> features)
         {
-            private readonly IEnumerable<IFeatureInfo> _features;
-            public TestExtensionManager(IEnumerable<IFeatureInfo> features)
-            {
-                _features = features;
-            }
+            _features = features;
+        }
 
-            public IEnumerable<IFeatureInfo> GetFeatureDependencies(string featureId)
-            {
-                var feature = _features.First(x => x.Id == featureId);
+        public IEnumerable<IFeatureInfo> GetFeatureDependencies(string featureId)
+        {
+            var feature = _features.First(x => x.Id == featureId);
 
-                return _features.Where(x => feature.Dependencies.Contains(x.Id));
-            }
+            return _features.Where(x => feature.Dependencies.Contains(x.Id));
+        }
 
-            public IExtensionInfo GetExtension(string extensionId)
-            {
-                return _features.Select(x => x.Extension).First(x => x.Id == extensionId);
-            }
+        public IExtensionInfo GetExtension(string extensionId)
+        {
+            return _features.Select(x => x.Extension).First(x => x.Id == extensionId);
+        }
 
-            public IEnumerable<IExtensionInfo> GetExtensions()
-            {
-                return _features.Select(x => x.Extension).Distinct();
-            }
+        public IEnumerable<IExtensionInfo> GetExtensions()
+        {
+            return _features.Select(x => x.Extension).Distinct();
+        }
 
-            public Task<ExtensionEntry> LoadExtensionAsync(IExtensionInfo extensionInfo)
-            {
-                throw new NotImplementedException();
-            }
+        public Task<ExtensionEntry> LoadExtensionAsync(IExtensionInfo extensionInfo)
+        {
+            throw new NotImplementedException();
+        }
 
-            public Task<IEnumerable<ExtensionEntry>> LoadExtensionsAsync(IEnumerable<IExtensionInfo> extensionInfos)
-            {
-                throw new NotImplementedException();
-            }
+        public Task<IEnumerable<ExtensionEntry>> LoadExtensionsAsync(IEnumerable<IExtensionInfo> extensionInfos)
+        {
+            throw new NotImplementedException();
+        }
 
 #pragma warning disable CA1822 // Mark members as static
-            public Task<IFeatureInfo> LoadFeatureAsync(IFeatureInfo feature)
-            {
-                return Task.FromResult(feature);
-            }
+        public Task<IFeatureInfo> LoadFeatureAsync(IFeatureInfo feature)
+        {
+            return Task.FromResult(feature);
+        }
 
-            public Task<IEnumerable<IFeatureInfo>> LoadFeaturesAsync(IEnumerable<IFeatureInfo> features)
-            {
-                return Task.FromResult(features);
-            }
+        public Task<IEnumerable<IFeatureInfo>> LoadFeaturesAsync(IEnumerable<IFeatureInfo> features)
+        {
+            return Task.FromResult(features);
+        }
 #pragma warning restore CA1822 // Mark members as static
 
-            public IEnumerable<IFeatureInfo> GetFeatures()
-            {
-                return _features;
-            }
-
-            public IEnumerable<IFeatureInfo> GetFeatures(string[] featureIdsToLoad)
-            {
-                return _features.Where(x => featureIdsToLoad.Contains(x.Id));
-            }
-
-            public IEnumerable<IFeatureInfo> GetDependentFeatures(string featureId)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task<IEnumerable<IFeatureInfo>> LoadFeaturesAsync()
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task<IEnumerable<IFeatureInfo>> LoadFeaturesAsync(string[] featureIdsToLoad)
-            {
-                throw new NotImplementedException();
-            }
+        public IEnumerable<IFeatureInfo> GetFeatures()
+        {
+            return _features;
         }
 
-        public class TestShapeProvider : IShapeTableProvider
+        public IEnumerable<IFeatureInfo> GetFeatures(string[] featureIdsToLoad)
         {
-            private static IDictionary<IFeatureInfo, IEnumerable<string>> _featureShapes;
-
-            public static IDictionary<IFeatureInfo, IEnumerable<string>> FeatureShapes => _featureShapes;
-
-            public Action<ShapeTableBuilder> Discover = x => { };
-
-            public static void InitFeatureShapes(IDictionary<IFeatureInfo, IEnumerable<string>> featureShapes)
-                => _featureShapes = featureShapes;
-
-            ValueTask IShapeTableProvider.DiscoverAsync(ShapeTableBuilder builder)
-            {
-                foreach (var pair in FeatureShapes)
-                {
-                    foreach (var shape in pair.Value)
-                    {
-                        builder.Describe(shape).From(pair.Key).BoundAs(pair.Key.Id, null);
-                    }
-                }
-
-                Discover(builder);
-
-                return ValueTask.CompletedTask;
-            }
+            return _features.Where(x => featureIdsToLoad.Contains(x.Id));
         }
 
-        [Fact]
-        public void ManagerCanBeResolved()
+        public IEnumerable<IFeatureInfo> GetDependentFeatures(string featureId)
         {
-            var manager = _serviceProvider.GetService<IShapeTableManager>();
-            Assert.NotNull(manager);
+            throw new NotImplementedException();
         }
 
-        [Fact]
-        public async Task DefaultShapeTableIsReturnedForNullOrEmpty()
+        public Task<IEnumerable<IFeatureInfo>> LoadFeaturesAsync()
         {
-            var manager = _serviceProvider.GetService<IShapeTableManager>();
-            var shapeTable1 = await manager.GetShapeTableAsync(null);
-            var shapeTable2 = await manager.GetShapeTableAsync(string.Empty);
-            Assert.NotNull(shapeTable1.Descriptors["Hello"]);
-            Assert.NotNull(shapeTable2.Descriptors["Hello"]);
+            throw new NotImplementedException();
         }
 
-        [Fact]
-        public async Task CallbackAlterationsContributeToDescriptor()
+        public Task<IEnumerable<IFeatureInfo>> LoadFeaturesAsync(string[] featureIdsToLoad)
         {
-            Func<ShapeCreatingContext, Task> cb1 = x => { return Task.CompletedTask; };
-            Func<ShapeCreatedContext, Task> cb2 = x => { return Task.CompletedTask; };
-            Func<ShapeDisplayContext, Task> cb3 = x => { return Task.CompletedTask; };
-            Func<ShapeDisplayContext, Task> cb4 = x => { return Task.CompletedTask; };
+            throw new NotImplementedException();
+        }
+    }
 
-            _serviceProvider.GetService<TestShapeProvider>().Discover =
-                builder => builder.Describe("Foo").From(TestFeature())
-                               .OnCreating(cb1)
-                               .OnCreated(cb2)
-                               .OnDisplaying(cb3)
-                               .OnDisplayed(cb4);
+    public class TestShapeProvider : IShapeTableProvider
+    {
+        private static IDictionary<IFeatureInfo, IEnumerable<string>> _featureShapes;
 
-            var manager = _serviceProvider.GetService<IShapeTableManager>();
+        public static IDictionary<IFeatureInfo, IEnumerable<string>> FeatureShapes => _featureShapes;
 
-            var foo = (await manager.GetShapeTableAsync(null)).Descriptors["Foo"];
+        public Action<ShapeTableBuilder> Discover = x => { };
 
-            Assert.Same(cb1, foo.CreatingAsync.Single());
-            Assert.Same(cb2, foo.CreatedAsync.Single());
-            Assert.Same(cb3, foo.DisplayingAsync.Single());
-            Assert.Same(cb4, foo.DisplayedAsync.Single());
-        }
+        public static void InitFeatureShapes(IDictionary<IFeatureInfo, IEnumerable<string>> featureShapes)
+            => _featureShapes = featureShapes;
 
-        [Fact]
-        public async Task DefaultPlacementIsReturnedByDefault()
+        ValueTask IShapeTableProvider.DiscoverAsync(ShapeTableBuilder builder)
         {
-            var manager = _serviceProvider.GetService<IShapeTableManager>();
+            foreach (var pair in FeatureShapes)
+            {
+                foreach (var shape in pair.Value)
+                {
+                    builder.Describe(shape).From(pair.Key).BoundAs(pair.Key.Id, null);
+                }
+            }
 
-            var hello = (await manager.GetShapeTableAsync(null)).Descriptors["Hello"];
-            hello.DefaultPlacement = "Header:5";
-            var result = hello.Placement(null);
-            Assert.Equal("Header:5", result.Location);
+            Discover(builder);
+
+            return ValueTask.CompletedTask;
         }
+    }
 
-        [Fact]
-        public async Task DescribedPlacementIsReturnedIfNotNull()
-        {
-            var shapeDetail = new ShapePlacementContext("Foo", "Detail", string.Empty, null);
-            var shapeSummary = new ShapePlacementContext("Foo", "Summary", string.Empty, null);
-            var shapeTitle = new ShapePlacementContext("Foo", "Title", string.Empty, null);
+    [Fact]
+    public void ManagerCanBeResolved()
+    {
+        var manager = _serviceProvider.GetService<IShapeTableManager>();
+        Assert.NotNull(manager);
+    }
 
-            _serviceProvider.GetService<TestShapeProvider>().Discover =
-                builder => builder.Describe("Hello1").From(TestFeature())
-                    .Placement(ctx => ctx.DisplayType == "Detail" ? new PlacementInfo { Location = "Main" } : null)
-                    .Placement(ctx => ctx.DisplayType == "Summary" ? new PlacementInfo { Location = string.Empty } : null);
+    [Fact]
+    public async Task DefaultShapeTableIsReturnedForNullOrEmpty()
+    {
+        var manager = _serviceProvider.GetService<IShapeTableManager>();
+        var shapeTable1 = await manager.GetShapeTableAsync(null);
+        var shapeTable2 = await manager.GetShapeTableAsync(string.Empty);
+        Assert.NotNull(shapeTable1.Descriptors["Hello"]);
+        Assert.NotNull(shapeTable2.Descriptors["Hello"]);
+    }
 
-            var manager = _serviceProvider.GetService<IShapeTableManager>();
-            var hello = (await manager.GetShapeTableAsync(null)).Descriptors["Hello1"];
-            var result1 = hello.Placement(shapeDetail);
-            var result2 = hello.Placement(shapeSummary);
-            var result3 = hello.Placement(shapeTitle);
-            hello.DefaultPlacement = "Header:5";
-            var result4 = hello.Placement(shapeDetail);
-            var result5 = hello.Placement(shapeSummary);
-            var result6 = hello.Placement(shapeTitle);
-
-            Assert.Equal("Main", result1.Location);
-            Assert.Empty(result2.Location);
-            Assert.Null(result3);
-            Assert.Equal("Main", result4.Location);
-            Assert.Empty(result5.Location);
-            Assert.Equal("Header:5", result6.Location);
-        }
+    [Fact]
+    public async Task CallbackAlterationsContributeToDescriptor()
+    {
+        Func<ShapeCreatingContext, Task> cb1 = x => { return Task.CompletedTask; };
+        Func<ShapeCreatedContext, Task> cb2 = x => { return Task.CompletedTask; };
+        Func<ShapeDisplayContext, Task> cb3 = x => { return Task.CompletedTask; };
+        Func<ShapeDisplayContext, Task> cb4 = x => { return Task.CompletedTask; };
+
+        _serviceProvider.GetService<TestShapeProvider>().Discover =
+            builder => builder.Describe("Foo").From(TestFeature())
+                           .OnCreating(cb1)
+                           .OnCreated(cb2)
+                           .OnDisplaying(cb3)
+                           .OnDisplayed(cb4);
+
+        var manager = _serviceProvider.GetService<IShapeTableManager>();
+
+        var foo = (await manager.GetShapeTableAsync(null)).Descriptors["Foo"];
+
+        Assert.Same(cb1, foo.CreatingAsync.Single());
+        Assert.Same(cb2, foo.CreatedAsync.Single());
+        Assert.Same(cb3, foo.DisplayingAsync.Single());
+        Assert.Same(cb4, foo.DisplayedAsync.Single());
+    }
 
-        [Fact]
-        public async Task TwoArgumentVariationDoesSameThing()
-        {
-            var shapeDetail = new ShapePlacementContext("Foo", "Detail", string.Empty, null);
-            var shapeSummary = new ShapePlacementContext("Foo", "Summary", string.Empty, null);
-            var shapeTitle = new ShapePlacementContext("Foo", "Title", string.Empty, null);
+    [Fact]
+    public async Task DefaultPlacementIsReturnedByDefault()
+    {
+        var manager = _serviceProvider.GetService<IShapeTableManager>();
 
-            _serviceProvider.GetService<TestShapeProvider>().Discover =
-                builder => builder.Describe("Hello2").From(TestFeature())
-                    .Placement(ctx => ctx.DisplayType == "Detail", new PlacementInfo { Location = "Main" })
-                    .Placement(ctx => ctx.DisplayType == "Summary", new PlacementInfo { Location = string.Empty });
+        var hello = (await manager.GetShapeTableAsync(null)).Descriptors["Hello"];
+        hello.DefaultPlacement = "Header:5";
+        var result = hello.Placement(null);
+        Assert.Equal("Header:5", result.Location);
+    }
 
-            var manager = _serviceProvider.GetService<IShapeTableManager>();
-            var hello = (await manager.GetShapeTableAsync(null)).Descriptors["Hello2"];
-            var result1 = hello.Placement(shapeDetail);
-            var result2 = hello.Placement(shapeSummary);
-            var result3 = hello.Placement(shapeTitle);
-            hello.DefaultPlacement = "Header:5";
-            var result4 = hello.Placement(shapeDetail);
-            var result5 = hello.Placement(shapeSummary);
-            var result6 = hello.Placement(shapeTitle);
-
-            Assert.Equal("Main", result1.Location);
-            Assert.Empty(result2.Location);
-            Assert.Null(result3);
-            Assert.Equal("Main", result4.Location);
-            Assert.Empty(result5.Location);
-            Assert.Equal("Header:5", result6.Location);
-        }
+    [Fact]
+    public async Task DescribedPlacementIsReturnedIfNotNull()
+    {
+        var shapeDetail = new ShapePlacementContext("Foo", "Detail", string.Empty, null);
+        var shapeSummary = new ShapePlacementContext("Foo", "Summary", string.Empty, null);
+        var shapeTitle = new ShapePlacementContext("Foo", "Title", string.Empty, null);
+
+        _serviceProvider.GetService<TestShapeProvider>().Discover =
+            builder => builder.Describe("Hello1").From(TestFeature())
+                .Placement(ctx => ctx.DisplayType == "Detail" ? new PlacementInfo { Location = "Main" } : null)
+                .Placement(ctx => ctx.DisplayType == "Summary" ? new PlacementInfo { Location = string.Empty } : null);
+
+        var manager = _serviceProvider.GetService<IShapeTableManager>();
+        var hello = (await manager.GetShapeTableAsync(null)).Descriptors["Hello1"];
+        var result1 = hello.Placement(shapeDetail);
+        var result2 = hello.Placement(shapeSummary);
+        var result3 = hello.Placement(shapeTitle);
+        hello.DefaultPlacement = "Header:5";
+        var result4 = hello.Placement(shapeDetail);
+        var result5 = hello.Placement(shapeSummary);
+        var result6 = hello.Placement(shapeTitle);
+
+        Assert.Equal("Main", result1.Location);
+        Assert.Empty(result2.Location);
+        Assert.Null(result3);
+        Assert.Equal("Main", result4.Location);
+        Assert.Empty(result5.Location);
+        Assert.Equal("Header:5", result6.Location);
+    }
+
+    [Fact]
+    public async Task TwoArgumentVariationDoesSameThing()
+    {
+        var shapeDetail = new ShapePlacementContext("Foo", "Detail", string.Empty, null);
+        var shapeSummary = new ShapePlacementContext("Foo", "Summary", string.Empty, null);
+        var shapeTitle = new ShapePlacementContext("Foo", "Title", string.Empty, null);
+
+        _serviceProvider.GetService<TestShapeProvider>().Discover =
+            builder => builder.Describe("Hello2").From(TestFeature())
+                .Placement(ctx => ctx.DisplayType == "Detail", new PlacementInfo { Location = "Main" })
+                .Placement(ctx => ctx.DisplayType == "Summary", new PlacementInfo { Location = string.Empty });
+
+        var manager = _serviceProvider.GetService<IShapeTableManager>();
+        var hello = (await manager.GetShapeTableAsync(null)).Descriptors["Hello2"];
+        var result1 = hello.Placement(shapeDetail);
+        var result2 = hello.Placement(shapeSummary);
+        var result3 = hello.Placement(shapeTitle);
+        hello.DefaultPlacement = "Header:5";
+        var result4 = hello.Placement(shapeDetail);
+        var result5 = hello.Placement(shapeSummary);
+        var result6 = hello.Placement(shapeTitle);
+
+        Assert.Equal("Main", result1.Location);
+        Assert.Empty(result2.Location);
+        Assert.Null(result3);
+        Assert.Equal("Main", result4.Location);
+        Assert.Empty(result5.Location);
+        Assert.Equal("Header:5", result6.Location);
+    }
 
-        // "Path not supported yet"
-        [Fact]
-        internal async Task PathConstraintShouldMatch()
+    // "Path not supported yet"
+    [Fact]
+    internal async Task PathConstraintShouldMatch()
+    {
+        // all path have a trailing / as per the current implementation
+        // todo: (sebros) find a way to 'use' the current implementation in DefaultContentDisplay.BindPlacement instead of emulating it
+
+        var rules = new[] {
+            Tuple.Create("~/my-blog", "~/my-blog/", true),
+            Tuple.Create("~/my-blog/", "~/my-blog/", true),
+
+            // star match
+            Tuple.Create("~/my-blog*", "~/my-blog/", true),
+            Tuple.Create("~/my-blog*", "~/my-blog/my-post/", true),
+            Tuple.Create("~/my-blog/*", "~/my-blog/", true),
+            Tuple.Create("~/my-blog/*", "~/my-blog123/", false),
+            Tuple.Create("~/my-blog*", "~/my-blog123/", true)
+        };
+
+        foreach (var rule in rules)
         {
-            // all path have a trailing / as per the current implementation
-            // todo: (sebros) find a way to 'use' the current implementation in DefaultContentDisplay.BindPlacement instead of emulating it
-
-            var rules = new[] {
-                Tuple.Create("~/my-blog", "~/my-blog/", true),
-                Tuple.Create("~/my-blog/", "~/my-blog/", true),
-
-                // star match
-                Tuple.Create("~/my-blog*", "~/my-blog/", true),
-                Tuple.Create("~/my-blog*", "~/my-blog/my-post/", true),
-                Tuple.Create("~/my-blog/*", "~/my-blog/", true),
-                Tuple.Create("~/my-blog/*", "~/my-blog123/", false),
-                Tuple.Create("~/my-blog*", "~/my-blog123/", true)
-            };
+            var path = rule.Item1;
+            var context = rule.Item2;
+            var match = rule.Item3;
 
-            foreach (var rule in rules)
-            {
-                var path = rule.Item1;
-                var context = rule.Item2;
-                var match = rule.Item3;
-
-                _serviceProvider.GetService<TestShapeProvider>().Discover =
-                    builder => builder.Describe("Hello").From(TestFeature())
-                                   .Placement(ctx => true, new PlacementInfo { Location = "Match" });
-
-                var manager = _serviceProvider.GetService<IShapeTableManager>();
-                var hello = (await manager.GetShapeTableAsync(null)).Descriptors["Hello"];
-                //var result = hello.Placement(new ShapePlacementContext { Path = context });
-
-                //if (match)
-                //{
-                //    Assert.Equal("Match", result.Location);
-                //}
-                //else
-                //{
-                //    Assert.Null(result.Location);
-                //}
-            }
-        }
+            _serviceProvider.GetService<TestShapeProvider>().Discover =
+                builder => builder.Describe("Hello").From(TestFeature())
+                               .Placement(ctx => true, new PlacementInfo { Location = "Match" });
 
-        [Fact]
-        public async Task OnlyShapesFromTheGivenThemeAreProvided()
-        {
-            _serviceProvider.GetService<TestShapeProvider>();
             var manager = _serviceProvider.GetService<IShapeTableManager>();
-            var table = await manager.GetShapeTableAsync("Theme1");
-            Assert.True(table.Descriptors.ContainsKey("Theme1Shape"));
-            Assert.False(table.Descriptors.ContainsKey("DerivedShape"));
-            Assert.False(table.Descriptors.ContainsKey("BaseShape"));
+            var hello = (await manager.GetShapeTableAsync(null)).Descriptors["Hello"];
+            //var result = hello.Placement(new ShapePlacementContext { Path = context });
+
+            //if (match)
+            //{
+            //    Assert.Equal("Match", result.Location);
+            //}
+            //else
+            //{
+            //    Assert.Null(result.Location);
+            //}
         }
+    }
 
-        [Fact]
-        public async Task ShapesFromTheBaseThemeAreProvided()
-        {
-            _serviceProvider.GetService<TestShapeProvider>();
-            var manager = _serviceProvider.GetService<IShapeTableManager>();
-            var table = await manager.GetShapeTableAsync("DerivedTheme");
-            Assert.False(table.Descriptors.ContainsKey("Theme1Shape"));
-            Assert.True(table.Descriptors.ContainsKey("DerivedShape"));
-            Assert.True(table.Descriptors.ContainsKey("BaseShape"));
-        }
+    [Fact]
+    public async Task OnlyShapesFromTheGivenThemeAreProvided()
+    {
+        _serviceProvider.GetService<TestShapeProvider>();
+        var manager = _serviceProvider.GetService<IShapeTableManager>();
+        var table = await manager.GetShapeTableAsync("Theme1");
+        Assert.True(table.Descriptors.ContainsKey("Theme1Shape"));
+        Assert.False(table.Descriptors.ContainsKey("DerivedShape"));
+        Assert.False(table.Descriptors.ContainsKey("BaseShape"));
+    }
 
-        [Fact]
-        public async Task DerivedThemesCanOverrideBaseThemeShapeBindings()
-        {
-            _serviceProvider.GetService<TestShapeProvider>();
-            var manager = _serviceProvider.GetService<IShapeTableManager>();
-            var table = await manager.GetShapeTableAsync("DerivedTheme");
-            Assert.True(table.Bindings.TryGetValue("OverriddenShape", out _));
-            Assert.Equal("DerivedTheme", table.Descriptors["OverriddenShape"].BindingSource);
-        }
+    [Fact]
+    public async Task ShapesFromTheBaseThemeAreProvided()
+    {
+        _serviceProvider.GetService<TestShapeProvider>();
+        var manager = _serviceProvider.GetService<IShapeTableManager>();
+        var table = await manager.GetShapeTableAsync("DerivedTheme");
+        Assert.False(table.Descriptors.ContainsKey("Theme1Shape"));
+        Assert.True(table.Descriptors.ContainsKey("DerivedShape"));
+        Assert.True(table.Descriptors.ContainsKey("BaseShape"));
+    }
+
+    [Fact]
+    public async Task DerivedThemesCanOverrideBaseThemeShapeBindings()
+    {
+        _serviceProvider.GetService<TestShapeProvider>();
+        var manager = _serviceProvider.GetService<IShapeTableManager>();
+        var table = await manager.GetShapeTableAsync("DerivedTheme");
+        Assert.True(table.Bindings.TryGetValue("OverriddenShape", out _));
+        Assert.Equal("DerivedTheme", table.Descriptors["OverriddenShape"].BindingSource);
+    }
 
 #pragma warning disable CA1816 // Dispose methods should call SuppressFinalize
-        public void Dispose()
+    public void Dispose()
 #pragma warning restore CA1816 // Dispose methods should call SuppressFinalize
-        {
-            (_serviceProvider as IDisposable)?.Dispose();
-        }
+    {
+        (_serviceProvider as IDisposable)?.Dispose();
     }
 }
diff --git a/test/OrchardCore.Tests/DisplayManagement/Decriptors/LocationParserTests.cs b/test/OrchardCore.Tests/DisplayManagement/Decriptors/LocationParserTests.cs
index 1ae2452d947..b8e85220ed3 100644
--- a/test/OrchardCore.Tests/DisplayManagement/Decriptors/LocationParserTests.cs
+++ b/test/OrchardCore.Tests/DisplayManagement/Decriptors/LocationParserTests.cs
@@ -1,287 +1,286 @@
 using OrchardCore.DisplayManagement.Descriptors;
 
-namespace OrchardCore.Tests.DisplayManagement.Decriptors
+namespace OrchardCore.Tests.DisplayManagement.Decriptors;
+
+public class LocationParserTests
 {
-    public class LocationParserTests
+    [Theory]
+    [InlineData("Content")]
+    [InlineData("Content:5")]
+    [InlineData("Content:5#Tab1")]
+    [InlineData("Content:5@Group1")]
+    [InlineData("Content:5@Group1#Tab1")]
+    [InlineData("/Content")]
+    [InlineData("/Content:5")]
+    [InlineData("/Content:5#Tab1")]
+    [InlineData("/Content:5#Card1")]
+    [InlineData("/Content:5#Col1")]
+    [InlineData("/Content:5@Group1")]
+    [InlineData("/Content:5@Group1%Card1")]
+    [InlineData("/Content:5@Group1#Tab1")]
+    [InlineData("/Content:5@Group1#Tab1%Card1")]
+    [InlineData("/Content:5@Group1#Tab1%Card1|Col1")]
+    public void ZoneShouldBeParsed(string location)
     {
-        [Theory]
-        [InlineData("Content")]
-        [InlineData("Content:5")]
-        [InlineData("Content:5#Tab1")]
-        [InlineData("Content:5@Group1")]
-        [InlineData("Content:5@Group1#Tab1")]
-        [InlineData("/Content")]
-        [InlineData("/Content:5")]
-        [InlineData("/Content:5#Tab1")]
-        [InlineData("/Content:5#Card1")]
-        [InlineData("/Content:5#Col1")]
-        [InlineData("/Content:5@Group1")]
-        [InlineData("/Content:5@Group1%Card1")]
-        [InlineData("/Content:5@Group1#Tab1")]
-        [InlineData("/Content:5@Group1#Tab1%Card1")]
-        [InlineData("/Content:5@Group1#Tab1%Card1|Col1")]
-        public void ZoneShouldBeParsed(string location)
-        {
-            Assert.Equal("Content", new PlacementInfo { Location = location }.GetZones().FirstOrDefault());
-        }
+        Assert.Equal("Content", new PlacementInfo { Location = location }.GetZones().FirstOrDefault());
+    }
 
-        [Theory]
-        [InlineData("Content", "")]
-        [InlineData("Content:5", "5")]
-        [InlineData("Content:5%Card1", "5")]
-        [InlineData("Content:5%Col1", "5")]
-        [InlineData("Content:5#Tab1", "5")]
-        [InlineData("Content:5#Tab1%Card1", "5")]
-        [InlineData("Content:5#Tab1|Col1", "5")]
-        [InlineData("Content:5.1#Tab1", "5.1")]
-        [InlineData("Content:5@Group1", "5")]
-        [InlineData("Content:5@Group1%Card1", "5")]
-        [InlineData("Content:5@Group1|Col1", "5")]
-        [InlineData("Content:5@Group1#Tab1", "5")]
-        [InlineData("Content:5@Group1#Tab1%Card1", "5")]
-        [InlineData("Content:5@Group1#Tab1|Col1", "5")]
-        [InlineData("/Content", "")]
-        [InlineData("/Content:5", "5")]
-        [InlineData("/Content:5#Tab1", "5")]
-        [InlineData("/Content:5%Card1", "5")]
-        [InlineData("/Content:5|Col1", "5")]
-        [InlineData("/Content:5.1#Tab1", "5.1")]
-        [InlineData("/Content:5.1%Card1", "5.1")]
-        [InlineData("/Content:5.1|Col1", "5.1")]
-        [InlineData("/Content:5@Group1", "5")]
-        [InlineData("/Content:5@Group1%Card1", "5")]
-        [InlineData("/Content:5@Group1|Col1", "5")]
-        [InlineData("/Content:5@Group1#Tab1", "5")]
-        [InlineData("/Content:5@Group1#Tab1%Card1", "5")]
-        [InlineData("/Content:5@Group1#Tab1|Col1", "5")]
-        [InlineData("/Content:5@Group1#Tab1%Card1|Col1", "5")]
-        public void PositionShouldBeParsed(string location, string expectedPosition)
-        {
-            Assert.Equal(expectedPosition, new PlacementInfo { Location = location }.GetPosition());
-        }
+    [Theory]
+    [InlineData("Content", "")]
+    [InlineData("Content:5", "5")]
+    [InlineData("Content:5%Card1", "5")]
+    [InlineData("Content:5%Col1", "5")]
+    [InlineData("Content:5#Tab1", "5")]
+    [InlineData("Content:5#Tab1%Card1", "5")]
+    [InlineData("Content:5#Tab1|Col1", "5")]
+    [InlineData("Content:5.1#Tab1", "5.1")]
+    [InlineData("Content:5@Group1", "5")]
+    [InlineData("Content:5@Group1%Card1", "5")]
+    [InlineData("Content:5@Group1|Col1", "5")]
+    [InlineData("Content:5@Group1#Tab1", "5")]
+    [InlineData("Content:5@Group1#Tab1%Card1", "5")]
+    [InlineData("Content:5@Group1#Tab1|Col1", "5")]
+    [InlineData("/Content", "")]
+    [InlineData("/Content:5", "5")]
+    [InlineData("/Content:5#Tab1", "5")]
+    [InlineData("/Content:5%Card1", "5")]
+    [InlineData("/Content:5|Col1", "5")]
+    [InlineData("/Content:5.1#Tab1", "5.1")]
+    [InlineData("/Content:5.1%Card1", "5.1")]
+    [InlineData("/Content:5.1|Col1", "5.1")]
+    [InlineData("/Content:5@Group1", "5")]
+    [InlineData("/Content:5@Group1%Card1", "5")]
+    [InlineData("/Content:5@Group1|Col1", "5")]
+    [InlineData("/Content:5@Group1#Tab1", "5")]
+    [InlineData("/Content:5@Group1#Tab1%Card1", "5")]
+    [InlineData("/Content:5@Group1#Tab1|Col1", "5")]
+    [InlineData("/Content:5@Group1#Tab1%Card1|Col1", "5")]
+    public void PositionShouldBeParsed(string location, string expectedPosition)
+    {
+        Assert.Equal(expectedPosition, new PlacementInfo { Location = location }.GetPosition());
+    }
 
-        [Theory]
-        [InlineData("Content", false)]
-        [InlineData("Content:5", false)]
-        [InlineData("Content:5#Tab1", false)]
-        [InlineData("Content:5%Card1", false)]
-        [InlineData("Content:5|Col1", false)]
-        [InlineData("Content:5.1#Tab1", false)]
-        [InlineData("Content:5.1%Card1", false)]
-        [InlineData("Content:5.1#Col1", false)]
-        [InlineData("Content:5@Group1", false)]
-        [InlineData("Content:5@Group1%Card1", false)]
-        [InlineData("Content:5@Group1|Col1", false)]
-        [InlineData("Content:5@Group1#Tab1", false)]
-        [InlineData("Content:5@Group1#Tab1|Card1", false)]
-        [InlineData("Content:5@Group1#Tab1%Col1", false)]
-        [InlineData("/Content", true)]
-        [InlineData("/Content:5", true)]
-        [InlineData("/Content:5#Tab1", true)]
-        [InlineData("/Content:5%Card1", true)]
-        [InlineData("/Content:5|Col1", true)]
-        [InlineData("/Content:5.1#Tab1", true)]
-        [InlineData("/Content:5.1%Card1", true)]
-        [InlineData("/Content:5.1|Col1", true)]
-        [InlineData("/Content:5@Group1", true)]
-        [InlineData("/Content:5@Group1%Card1", true)]
-        [InlineData("/Content:5@Group1|Col1", true)]
-        [InlineData("/Content:5@Group1%Card1|Col1", true)]
-        [InlineData("/Content:5@Group1#Tab1", true)]
-        [InlineData("/Content:5@Group1#Tab1%Card1", true)]
-        [InlineData("/Content:5@Group1#Tab1|Col1", true)]
-        [InlineData("/Content:5@Group1#Tab1|Card1%Col1", true)]
-        public void LayoutZoneShouldBeParsed(string location, bool expectedIsLayoutZone)
-        {
-            Assert.Equal(expectedIsLayoutZone, new PlacementInfo { Location = location }.IsLayoutZone());
-        }
+    [Theory]
+    [InlineData("Content", false)]
+    [InlineData("Content:5", false)]
+    [InlineData("Content:5#Tab1", false)]
+    [InlineData("Content:5%Card1", false)]
+    [InlineData("Content:5|Col1", false)]
+    [InlineData("Content:5.1#Tab1", false)]
+    [InlineData("Content:5.1%Card1", false)]
+    [InlineData("Content:5.1#Col1", false)]
+    [InlineData("Content:5@Group1", false)]
+    [InlineData("Content:5@Group1%Card1", false)]
+    [InlineData("Content:5@Group1|Col1", false)]
+    [InlineData("Content:5@Group1#Tab1", false)]
+    [InlineData("Content:5@Group1#Tab1|Card1", false)]
+    [InlineData("Content:5@Group1#Tab1%Col1", false)]
+    [InlineData("/Content", true)]
+    [InlineData("/Content:5", true)]
+    [InlineData("/Content:5#Tab1", true)]
+    [InlineData("/Content:5%Card1", true)]
+    [InlineData("/Content:5|Col1", true)]
+    [InlineData("/Content:5.1#Tab1", true)]
+    [InlineData("/Content:5.1%Card1", true)]
+    [InlineData("/Content:5.1|Col1", true)]
+    [InlineData("/Content:5@Group1", true)]
+    [InlineData("/Content:5@Group1%Card1", true)]
+    [InlineData("/Content:5@Group1|Col1", true)]
+    [InlineData("/Content:5@Group1%Card1|Col1", true)]
+    [InlineData("/Content:5@Group1#Tab1", true)]
+    [InlineData("/Content:5@Group1#Tab1%Card1", true)]
+    [InlineData("/Content:5@Group1#Tab1|Col1", true)]
+    [InlineData("/Content:5@Group1#Tab1|Card1%Col1", true)]
+    public void LayoutZoneShouldBeParsed(string location, bool expectedIsLayoutZone)
+    {
+        Assert.Equal(expectedIsLayoutZone, new PlacementInfo { Location = location }.IsLayoutZone());
+    }
 
-        [Theory]
-        [InlineData("Content", "")]
-        [InlineData("Content:5", "")]
-        [InlineData("Content:5#Tab1", "Tab1")]
-        [InlineData("Content:5.1#Tab1", "Tab1")]
-        [InlineData("Content:5#Tab1%Card1", "Tab1")]
-        [InlineData("Content:5.1#Tab1|Card1", "Tab1")]
-        [InlineData("Content:5#Tab1|Col1", "Tab1")]
-        [InlineData("Content:5.1#Tab1|Col1", "Tab1")]
-        [InlineData("Content:5#Tab1%Card1|Col1", "Tab1")]
-        [InlineData("Content:5.1#Tab1%Card1|Col1", "Tab1")]
-        [InlineData("Content:5@Group1", "")]
-        [InlineData("Content:5@Group1%Card1", "")]
-        [InlineData("Content:5@Group1|Col1", "")]
-        [InlineData("Content:5@Group1%Card1|Col1", "")]
-        [InlineData("Content:5@Group1#Tab1", "Tab1")]
-        [InlineData("Content:5@Group1#Tab1%Card1", "Tab1")]
-        [InlineData("Content:5@Group1#Tab1|Col1", "Tab1")]
-        [InlineData("Content:5@Group1#Tab1%Card1|Col1", "Tab1")]
-        [InlineData("/Content", "")]
-        [InlineData("/Content:5", "")]
-        [InlineData("/Content:5#Tab1", "Tab1")]
-        [InlineData("/Content:5.1#Tab1", "Tab1")]
-        [InlineData("/Content:5#Tab1%Card1", "Tab1")]
-        [InlineData("/Content:5.1#Tab1|Card1", "Tab1")]
-        [InlineData("/Content:5#Tab1%Col1", "Tab1")]
-        [InlineData("/Content:5.1#Tab1%Col1", "Tab1")]
-        [InlineData("/Content:5#Tab1%Card1|Col1", "Tab1")]
-        [InlineData("/Content:5.1#Tab1%Card1|Col1", "Tab1")]
-        [InlineData("/Content:5@Group1", "")]
-        [InlineData("/Content:5@Group1%Card1", "")]
-        [InlineData("/Content:5@Group1|Col1", "")]
-        [InlineData("/Content:5@Group1#Tab1", "Tab1")]
-        [InlineData("/Content:5@Group1#Tab1%Card1", "Tab1")]
-        [InlineData("/Content:5@Group1#Tab1|Col1", "Tab1")]
-        [InlineData("/Content:5@Group1#Tab1%Card1|Col1", "Tab1")]
-        [InlineData("/Content:5#Tab1@Group1", "Tab1")]
-        [InlineData("/Content:5#Tab1@Group1%Card1", "Tab1")]
-        [InlineData("/Content:5#Tab1@Group1|Col1", "Tab1")]
-        [InlineData("/Content:5#Tab1@Group1%Card1|Col1", "Tab1")]
-        public void TabShouldBeParsed(string location, string expectedTab)
-        {
-            Assert.Equal(expectedTab, new PlacementInfo { Location = location }.GetTab());
-        }
+    [Theory]
+    [InlineData("Content", "")]
+    [InlineData("Content:5", "")]
+    [InlineData("Content:5#Tab1", "Tab1")]
+    [InlineData("Content:5.1#Tab1", "Tab1")]
+    [InlineData("Content:5#Tab1%Card1", "Tab1")]
+    [InlineData("Content:5.1#Tab1|Card1", "Tab1")]
+    [InlineData("Content:5#Tab1|Col1", "Tab1")]
+    [InlineData("Content:5.1#Tab1|Col1", "Tab1")]
+    [InlineData("Content:5#Tab1%Card1|Col1", "Tab1")]
+    [InlineData("Content:5.1#Tab1%Card1|Col1", "Tab1")]
+    [InlineData("Content:5@Group1", "")]
+    [InlineData("Content:5@Group1%Card1", "")]
+    [InlineData("Content:5@Group1|Col1", "")]
+    [InlineData("Content:5@Group1%Card1|Col1", "")]
+    [InlineData("Content:5@Group1#Tab1", "Tab1")]
+    [InlineData("Content:5@Group1#Tab1%Card1", "Tab1")]
+    [InlineData("Content:5@Group1#Tab1|Col1", "Tab1")]
+    [InlineData("Content:5@Group1#Tab1%Card1|Col1", "Tab1")]
+    [InlineData("/Content", "")]
+    [InlineData("/Content:5", "")]
+    [InlineData("/Content:5#Tab1", "Tab1")]
+    [InlineData("/Content:5.1#Tab1", "Tab1")]
+    [InlineData("/Content:5#Tab1%Card1", "Tab1")]
+    [InlineData("/Content:5.1#Tab1|Card1", "Tab1")]
+    [InlineData("/Content:5#Tab1%Col1", "Tab1")]
+    [InlineData("/Content:5.1#Tab1%Col1", "Tab1")]
+    [InlineData("/Content:5#Tab1%Card1|Col1", "Tab1")]
+    [InlineData("/Content:5.1#Tab1%Card1|Col1", "Tab1")]
+    [InlineData("/Content:5@Group1", "")]
+    [InlineData("/Content:5@Group1%Card1", "")]
+    [InlineData("/Content:5@Group1|Col1", "")]
+    [InlineData("/Content:5@Group1#Tab1", "Tab1")]
+    [InlineData("/Content:5@Group1#Tab1%Card1", "Tab1")]
+    [InlineData("/Content:5@Group1#Tab1|Col1", "Tab1")]
+    [InlineData("/Content:5@Group1#Tab1%Card1|Col1", "Tab1")]
+    [InlineData("/Content:5#Tab1@Group1", "Tab1")]
+    [InlineData("/Content:5#Tab1@Group1%Card1", "Tab1")]
+    [InlineData("/Content:5#Tab1@Group1|Col1", "Tab1")]
+    [InlineData("/Content:5#Tab1@Group1%Card1|Col1", "Tab1")]
+    public void TabShouldBeParsed(string location, string expectedTab)
+    {
+        Assert.Equal(expectedTab, new PlacementInfo { Location = location }.GetTab());
+    }
 
-        [Theory]
-        [InlineData("Content", null)]
-        [InlineData("Content:5", null)]
-        [InlineData("Content:5#Tab1", null)]
-        [InlineData("Content:5.1#Tab1", null)]
-        [InlineData("Content:5%Card1", null)]
-        [InlineData("Content:5.1|Col1", null)]
-        [InlineData("Content:5#Tab1%Card1", null)]
-        [InlineData("Content:5.1#Tab1|Col1", null)]
-        [InlineData("Content:5#Tab1%Card1|Col1", null)]
-        [InlineData("Content:5.1#Tab1%Card1|Col1", null)]
-        [InlineData("Content:5@Group1", "Group1")]
-        [InlineData("Content:5@Group1%Card1", "Group1")]
-        [InlineData("Content:5@Group1%Col1", "Group1")]
-        [InlineData("Content:5@Group1#Tab1", "Group1")]
-        [InlineData("Content:5@Group1#Tab1%Card1", "Group1")]
-        [InlineData("Content:5@Group1#Tab1|Col1", "Group1")]
-        [InlineData("Content:5@Group1#Tab1%Card1|Col1", "Group1")]
-        [InlineData("Content:5#Tab1@Group1", "Group1")]
-        [InlineData("Content:5#Tab1@Group1%Card1", "Group1")]
-        [InlineData("Content:5#Tab1@Group1|Col1", "Group1")]
-        [InlineData("Content:5#Tab1@Group1%Card1|Col1", "Group1")]
-        [InlineData("/Content", null)]
-        [InlineData("/Content:5", null)]
-        [InlineData("/Content:5#Tab1", null)]
-        [InlineData("/Content:5.1#Tab1", null)]
-        [InlineData("/Content:5%Card1", null)]
-        [InlineData("/Content:5.1%Card1", null)]
-        [InlineData("/Content:5|Col1", null)]
-        [InlineData("/Content:5.1|Col1", null)]
-        [InlineData("/Content:5%Card1|Col1", null)]
-        [InlineData("/Content:5.1%Card1|Col1", null)]
-        [InlineData("/Content:5@Group1", "Group1")]
-        [InlineData("/Content:5@Group1%Card1", "Group1")]
-        [InlineData("/Content:5@Group1|Col1", "Group1")]
-        [InlineData("/Content:5@Group1%Card1|Col1", "Group1")]
-        [InlineData("/Content:5@Group1#Tab1", "Group1")]
-        [InlineData("/Content:5@Group1#Tab1%Card1", "Group1")]
-        [InlineData("/Content:5@Group1#Tab1|Col1", "Group1")]
-        [InlineData("/Content:5@Group1#Tab1%Card1|Col1", "Group1")]
-        [InlineData("/Content:5#Tab1@Group1", "Group1")]
-        [InlineData("/Content:5#Tab1@Group1%Card1", "Group1")]
-        [InlineData("/Content:5#Tab1@Group1|Col1", "Group1")]
-        [InlineData("/Content:5#Tab1@Group1%Card1|Col1", "Group1")]
-        public void GroupShouldBeParsed(string location, string expectedGroup)
-        {
-            Assert.Equal(expectedGroup, new PlacementInfo { Location = location }.GetGroup());
-        }
+    [Theory]
+    [InlineData("Content", null)]
+    [InlineData("Content:5", null)]
+    [InlineData("Content:5#Tab1", null)]
+    [InlineData("Content:5.1#Tab1", null)]
+    [InlineData("Content:5%Card1", null)]
+    [InlineData("Content:5.1|Col1", null)]
+    [InlineData("Content:5#Tab1%Card1", null)]
+    [InlineData("Content:5.1#Tab1|Col1", null)]
+    [InlineData("Content:5#Tab1%Card1|Col1", null)]
+    [InlineData("Content:5.1#Tab1%Card1|Col1", null)]
+    [InlineData("Content:5@Group1", "Group1")]
+    [InlineData("Content:5@Group1%Card1", "Group1")]
+    [InlineData("Content:5@Group1%Col1", "Group1")]
+    [InlineData("Content:5@Group1#Tab1", "Group1")]
+    [InlineData("Content:5@Group1#Tab1%Card1", "Group1")]
+    [InlineData("Content:5@Group1#Tab1|Col1", "Group1")]
+    [InlineData("Content:5@Group1#Tab1%Card1|Col1", "Group1")]
+    [InlineData("Content:5#Tab1@Group1", "Group1")]
+    [InlineData("Content:5#Tab1@Group1%Card1", "Group1")]
+    [InlineData("Content:5#Tab1@Group1|Col1", "Group1")]
+    [InlineData("Content:5#Tab1@Group1%Card1|Col1", "Group1")]
+    [InlineData("/Content", null)]
+    [InlineData("/Content:5", null)]
+    [InlineData("/Content:5#Tab1", null)]
+    [InlineData("/Content:5.1#Tab1", null)]
+    [InlineData("/Content:5%Card1", null)]
+    [InlineData("/Content:5.1%Card1", null)]
+    [InlineData("/Content:5|Col1", null)]
+    [InlineData("/Content:5.1|Col1", null)]
+    [InlineData("/Content:5%Card1|Col1", null)]
+    [InlineData("/Content:5.1%Card1|Col1", null)]
+    [InlineData("/Content:5@Group1", "Group1")]
+    [InlineData("/Content:5@Group1%Card1", "Group1")]
+    [InlineData("/Content:5@Group1|Col1", "Group1")]
+    [InlineData("/Content:5@Group1%Card1|Col1", "Group1")]
+    [InlineData("/Content:5@Group1#Tab1", "Group1")]
+    [InlineData("/Content:5@Group1#Tab1%Card1", "Group1")]
+    [InlineData("/Content:5@Group1#Tab1|Col1", "Group1")]
+    [InlineData("/Content:5@Group1#Tab1%Card1|Col1", "Group1")]
+    [InlineData("/Content:5#Tab1@Group1", "Group1")]
+    [InlineData("/Content:5#Tab1@Group1%Card1", "Group1")]
+    [InlineData("/Content:5#Tab1@Group1|Col1", "Group1")]
+    [InlineData("/Content:5#Tab1@Group1%Card1|Col1", "Group1")]
+    public void GroupShouldBeParsed(string location, string expectedGroup)
+    {
+        Assert.Equal(expectedGroup, new PlacementInfo { Location = location }.GetGroup());
+    }
 
-        [Theory]
-        [InlineData("Content", null)]
-        [InlineData("Content:5", null)]
-        [InlineData("Content:5#Tab1", null)]
-        [InlineData("Content:5.1#Tab1", null)]
-        [InlineData("Content:5@Group1", null)]
-        [InlineData("Content:5#Tab1@Group1", null)]
-        [InlineData("Content:5.1#Tab1@Group1", null)]
-        [InlineData("Content:5#Tab1@Group1|Col1", null)]
-        [InlineData("Content:5.1#Tab1@Group1|Col1", null)]
-        [InlineData("Content:5%Card1", "Card1")]
-        [InlineData("Content:5%Card1@Group1", "Card1")]
-        [InlineData("Content:5%Card1%Col1", "Card1")]
-        [InlineData("Content:5%Card1#Tab1", "Card1")]
-        [InlineData("Content:5%Card1#Tab1@Group1", "Card1")]
-        [InlineData("Content:5%Card1#Tab1|Col1", "Card1")]
-        [InlineData("Content:5%Card1#Tab1@Group1|Col1", "Card1")]
-        [InlineData("Content:5#Tab1%Card1", "Card1")]
-        [InlineData("Content:5#Tab1%Card1@Group1", "Card1")]
-        [InlineData("Content:5#Tab1%Card1|Col1", "Card1")]
-        [InlineData("Content:5#Tab1%Card1@Group1|Col1", "Card1")]
-        [InlineData("/Content", null)]
-        [InlineData("/Content:5", null)]
-        [InlineData("/Content:5#Tab1", null)]
-        [InlineData("/Content:5.1#Tab1", null)]
-        [InlineData("/Content:5@Group1", null)]
-        [InlineData("/Content:5.1@Group1", null)]
-        [InlineData("/Content:5|Col1", null)]
-        [InlineData("/Content:5.1|Col1", null)]
-        [InlineData("/Content:5%Card1|Col1", "Card1")]
-        [InlineData("/Content:5.1%Card1|Col1", "Card1")]
-        [InlineData("/Content:5%Card1", "Card1")]
-        [InlineData("/Content:5%Card1@Group1", "Card1")]
-        [InlineData("/Content:5%Card1#Tab1", "Card1")]
-        [InlineData("/Content:5%Card1#Tab1@Group1", "Card1")]
-        [InlineData("/Content:5%Card1#Tab1|Col1", "Card1")]
-        [InlineData("/Content:5%Card1#Tab1@Group1|Col1", "Card1")]
-        [InlineData("/Content:5#Tab1%Card1", "Card1")]
-        [InlineData("/Content:5#Tab1%Card1@Group1", "Card1")]
-        [InlineData("/Content:5#Tab1%Card1|Col1", "Card1")]
-        [InlineData("/Content:5#Tab1%Card1@Group1|Col1", "Card1")]
-        public void CardShouldBeParsed(string location, string expectedCard)
-        {
-            Assert.Equal(expectedCard, new PlacementInfo { Location = location }.GetCard());
-        }
+    [Theory]
+    [InlineData("Content", null)]
+    [InlineData("Content:5", null)]
+    [InlineData("Content:5#Tab1", null)]
+    [InlineData("Content:5.1#Tab1", null)]
+    [InlineData("Content:5@Group1", null)]
+    [InlineData("Content:5#Tab1@Group1", null)]
+    [InlineData("Content:5.1#Tab1@Group1", null)]
+    [InlineData("Content:5#Tab1@Group1|Col1", null)]
+    [InlineData("Content:5.1#Tab1@Group1|Col1", null)]
+    [InlineData("Content:5%Card1", "Card1")]
+    [InlineData("Content:5%Card1@Group1", "Card1")]
+    [InlineData("Content:5%Card1%Col1", "Card1")]
+    [InlineData("Content:5%Card1#Tab1", "Card1")]
+    [InlineData("Content:5%Card1#Tab1@Group1", "Card1")]
+    [InlineData("Content:5%Card1#Tab1|Col1", "Card1")]
+    [InlineData("Content:5%Card1#Tab1@Group1|Col1", "Card1")]
+    [InlineData("Content:5#Tab1%Card1", "Card1")]
+    [InlineData("Content:5#Tab1%Card1@Group1", "Card1")]
+    [InlineData("Content:5#Tab1%Card1|Col1", "Card1")]
+    [InlineData("Content:5#Tab1%Card1@Group1|Col1", "Card1")]
+    [InlineData("/Content", null)]
+    [InlineData("/Content:5", null)]
+    [InlineData("/Content:5#Tab1", null)]
+    [InlineData("/Content:5.1#Tab1", null)]
+    [InlineData("/Content:5@Group1", null)]
+    [InlineData("/Content:5.1@Group1", null)]
+    [InlineData("/Content:5|Col1", null)]
+    [InlineData("/Content:5.1|Col1", null)]
+    [InlineData("/Content:5%Card1|Col1", "Card1")]
+    [InlineData("/Content:5.1%Card1|Col1", "Card1")]
+    [InlineData("/Content:5%Card1", "Card1")]
+    [InlineData("/Content:5%Card1@Group1", "Card1")]
+    [InlineData("/Content:5%Card1#Tab1", "Card1")]
+    [InlineData("/Content:5%Card1#Tab1@Group1", "Card1")]
+    [InlineData("/Content:5%Card1#Tab1|Col1", "Card1")]
+    [InlineData("/Content:5%Card1#Tab1@Group1|Col1", "Card1")]
+    [InlineData("/Content:5#Tab1%Card1", "Card1")]
+    [InlineData("/Content:5#Tab1%Card1@Group1", "Card1")]
+    [InlineData("/Content:5#Tab1%Card1|Col1", "Card1")]
+    [InlineData("/Content:5#Tab1%Card1@Group1|Col1", "Card1")]
+    public void CardShouldBeParsed(string location, string expectedCard)
+    {
+        Assert.Equal(expectedCard, new PlacementInfo { Location = location }.GetCard());
+    }
 
-        [Theory]
-        [InlineData("Content", null)]
-        [InlineData("Content:5", null)]
-        [InlineData("Content:5#Tab1", null)]
-        [InlineData("Content:5.1#Tab1", null)]
-        [InlineData("Content:5@Group1", null)]
-        [InlineData("Content:5#Tab1@Group1", null)]
-        [InlineData("Content:5.1#Tab1@Group1", null)]
-        [InlineData("Content:5#Tab1@Group1%Card1", null)]
-        [InlineData("Content:5.1#Tab1@Group1%Card", null)]
-        [InlineData("Content:5|Col1", "Col1")]
-        [InlineData("Content:5@Group1|Col1", "Col1")]
-        [InlineData("Content:5@Group1%Card1|Col1", "Col1")]
-        [InlineData("Content:5|Col1#Tab1", "Col1")]
-        [InlineData("Content:5|Col1#Tab1%Card1", "Col1")]
-        [InlineData("Content:5@Group1#Tab1|Col1", "Col1")]
-        [InlineData("Content:5@Group1#Tab1%Card1|Col1", "Col1")]
-        [InlineData("Content:5#Tab1|Col1", "Col1")]
-        [InlineData("Content:5#Tab1%Card1|Col1", "Col1")]
-        [InlineData("Content:5#Tab1@Group1|Col1", "Col1")]
-        [InlineData("Content:5#Tab1@Group1%Card1|Col1", "Col1")]
-        [InlineData("/Content", null)]
-        [InlineData("/Content:5", null)]
-        [InlineData("/Content:5#Tab1", null)]
-        [InlineData("/Content:5.1#Tab1", null)]
-        [InlineData("/Content:5%Card1", null)]
-        [InlineData("/Content:5.1%Card1", null)]
-        [InlineData("/Content:5@Group1", null)]
-        [InlineData("/Content:5.1@Group1", null)]
-        [InlineData("/Content:5%Card1@Group1", null)]
-        [InlineData("/Content:5.1%Card1@Group1", null)]
-        [InlineData("/Content:5|Col1", "Col1")]
-        [InlineData("/Content:5%Card1|Col1", "Col1")]
-        [InlineData("/Content:5@Group1|Col1", "Col1")]
-        [InlineData("/Content:5@Group1%Card1|Col1", "Col1")]
-        [InlineData("/Content:5|Col1#Tab1", "Col1")]
-        [InlineData("/Content:5|Col1#Tab1%Card1", "Col1")]
-        [InlineData("/Content:5@Group1#Tab1|Col1", "Col1")]
-        [InlineData("/Content:5@Group1#Tab1%Card1|Col1", "Col1")]
-        [InlineData("/Content:5#Tab1|Col1", "Col1")]
-        [InlineData("/Content:5#Tab1%Card1|Col1", "Col1")]
-        [InlineData("/Content:5#Tab1@Group1|Col1", "Col1")]
-        [InlineData("/Content:5#Tab1%Card1@Group1|Col1", "Col1")]
-        public void ColumnShouldBeParsed(string location, string expectedColumn)
-        {
-            Assert.Equal(expectedColumn, new PlacementInfo { Location = location }.GetColumn());
-        }
+    [Theory]
+    [InlineData("Content", null)]
+    [InlineData("Content:5", null)]
+    [InlineData("Content:5#Tab1", null)]
+    [InlineData("Content:5.1#Tab1", null)]
+    [InlineData("Content:5@Group1", null)]
+    [InlineData("Content:5#Tab1@Group1", null)]
+    [InlineData("Content:5.1#Tab1@Group1", null)]
+    [InlineData("Content:5#Tab1@Group1%Card1", null)]
+    [InlineData("Content:5.1#Tab1@Group1%Card", null)]
+    [InlineData("Content:5|Col1", "Col1")]
+    [InlineData("Content:5@Group1|Col1", "Col1")]
+    [InlineData("Content:5@Group1%Card1|Col1", "Col1")]
+    [InlineData("Content:5|Col1#Tab1", "Col1")]
+    [InlineData("Content:5|Col1#Tab1%Card1", "Col1")]
+    [InlineData("Content:5@Group1#Tab1|Col1", "Col1")]
+    [InlineData("Content:5@Group1#Tab1%Card1|Col1", "Col1")]
+    [InlineData("Content:5#Tab1|Col1", "Col1")]
+    [InlineData("Content:5#Tab1%Card1|Col1", "Col1")]
+    [InlineData("Content:5#Tab1@Group1|Col1", "Col1")]
+    [InlineData("Content:5#Tab1@Group1%Card1|Col1", "Col1")]
+    [InlineData("/Content", null)]
+    [InlineData("/Content:5", null)]
+    [InlineData("/Content:5#Tab1", null)]
+    [InlineData("/Content:5.1#Tab1", null)]
+    [InlineData("/Content:5%Card1", null)]
+    [InlineData("/Content:5.1%Card1", null)]
+    [InlineData("/Content:5@Group1", null)]
+    [InlineData("/Content:5.1@Group1", null)]
+    [InlineData("/Content:5%Card1@Group1", null)]
+    [InlineData("/Content:5.1%Card1@Group1", null)]
+    [InlineData("/Content:5|Col1", "Col1")]
+    [InlineData("/Content:5%Card1|Col1", "Col1")]
+    [InlineData("/Content:5@Group1|Col1", "Col1")]
+    [InlineData("/Content:5@Group1%Card1|Col1", "Col1")]
+    [InlineData("/Content:5|Col1#Tab1", "Col1")]
+    [InlineData("/Content:5|Col1#Tab1%Card1", "Col1")]
+    [InlineData("/Content:5@Group1#Tab1|Col1", "Col1")]
+    [InlineData("/Content:5@Group1#Tab1%Card1|Col1", "Col1")]
+    [InlineData("/Content:5#Tab1|Col1", "Col1")]
+    [InlineData("/Content:5#Tab1%Card1|Col1", "Col1")]
+    [InlineData("/Content:5#Tab1@Group1|Col1", "Col1")]
+    [InlineData("/Content:5#Tab1%Card1@Group1|Col1", "Col1")]
+    public void ColumnShouldBeParsed(string location, string expectedColumn)
+    {
+        Assert.Equal(expectedColumn, new PlacementInfo { Location = location }.GetColumn());
     }
 }
diff --git a/test/OrchardCore.Tests/DisplayManagement/DefaultDisplayManagerTests.cs b/test/OrchardCore.Tests/DisplayManagement/DefaultDisplayManagerTests.cs
index 8fc3a58b0f0..f7d30efe56e 100644
--- a/test/OrchardCore.Tests/DisplayManagement/DefaultDisplayManagerTests.cs
+++ b/test/OrchardCore.Tests/DisplayManagement/DefaultDisplayManagerTests.cs
@@ -7,426 +7,425 @@
 using OrchardCore.Localization;
 using OrchardCore.Tests.Stubs;
 
-namespace OrchardCore.Tests.DisplayManagement
+namespace OrchardCore.Tests.DisplayManagement;
+
+public class DefaultDisplayManagerTests
 {
-    public class DefaultDisplayManagerTests
+    private readonly ShapeTable _defaultShapeTable;
+    private readonly TestShapeBindingsDictionary _additionalBindings;
+    private readonly IServiceProvider _serviceProvider;
+
+    public DefaultDisplayManagerTests()
+    {
+        _defaultShapeTable = new ShapeTable
+        (
+            new Dictionary<string, ShapeDescriptor>(StringComparer.OrdinalIgnoreCase),
+            new Dictionary<string, ShapeBinding>(StringComparer.OrdinalIgnoreCase)
+        );
+        _additionalBindings = [];
+
+        IServiceCollection serviceCollection = new ServiceCollection();
+
+        serviceCollection.AddScoped<IThemeManager, ThemeManager>();
+        serviceCollection.AddScoped<IHtmlDisplay, DefaultHtmlDisplay>();
+        serviceCollection.AddScoped<IShapeTableManager, TestShapeTableManager>();
+        serviceCollection.AddScoped<IShapeBindingResolver, TestShapeBindingResolver>();
+        serviceCollection.AddScoped<IShapeDisplayEvents, TestDisplayEvents>();
+        serviceCollection.AddScoped<IExtensionManager, StubExtensionManager>();
+        serviceCollection.AddSingleton<IStringLocalizerFactory, NullStringLocalizerFactory>();
+        serviceCollection.AddTransient(typeof(IStringLocalizer<>), typeof(StringLocalizer<>));
+
+        serviceCollection.AddLogging();
+
+        serviceCollection.AddSingleton(_defaultShapeTable);
+        serviceCollection.AddSingleton(_additionalBindings);
+        serviceCollection.AddWebEncoders();
+
+        _serviceProvider = serviceCollection.BuildServiceProvider();
+    }
+
+    private sealed class TestDisplayEvents : IShapeDisplayEvents
     {
-        private readonly ShapeTable _defaultShapeTable;
-        private readonly TestShapeBindingsDictionary _additionalBindings;
-        private readonly IServiceProvider _serviceProvider;
+        public Action<ShapeDisplayContext> Displaying = ctx => { };
+        public Action<ShapeDisplayContext> Displayed = ctx => { };
+        public Action<ShapeDisplayContext> Finalized = ctx => { };
 
-        public DefaultDisplayManagerTests()
+        Task IShapeDisplayEvents.DisplayingAsync(ShapeDisplayContext context)
         {
-            _defaultShapeTable = new ShapeTable
-            (
-                new Dictionary<string, ShapeDescriptor>(StringComparer.OrdinalIgnoreCase),
-                new Dictionary<string, ShapeBinding>(StringComparer.OrdinalIgnoreCase)
-            );
-            _additionalBindings = [];
-
-            IServiceCollection serviceCollection = new ServiceCollection();
-
-            serviceCollection.AddScoped<IThemeManager, ThemeManager>();
-            serviceCollection.AddScoped<IHtmlDisplay, DefaultHtmlDisplay>();
-            serviceCollection.AddScoped<IShapeTableManager, TestShapeTableManager>();
-            serviceCollection.AddScoped<IShapeBindingResolver, TestShapeBindingResolver>();
-            serviceCollection.AddScoped<IShapeDisplayEvents, TestDisplayEvents>();
-            serviceCollection.AddScoped<IExtensionManager, StubExtensionManager>();
-            serviceCollection.AddSingleton<IStringLocalizerFactory, NullStringLocalizerFactory>();
-            serviceCollection.AddTransient(typeof(IStringLocalizer<>), typeof(StringLocalizer<>));
-
-            serviceCollection.AddLogging();
-
-            serviceCollection.AddSingleton(_defaultShapeTable);
-            serviceCollection.AddSingleton(_additionalBindings);
-            serviceCollection.AddWebEncoders();
-
-            _serviceProvider = serviceCollection.BuildServiceProvider();
+            Displaying(context); return Task.CompletedTask;
         }
-
-        private sealed class TestDisplayEvents : IShapeDisplayEvents
+        Task IShapeDisplayEvents.DisplayedAsync(ShapeDisplayContext context)
         {
-            public Action<ShapeDisplayContext> Displaying = ctx => { };
-            public Action<ShapeDisplayContext> Displayed = ctx => { };
-            public Action<ShapeDisplayContext> Finalized = ctx => { };
-
-            Task IShapeDisplayEvents.DisplayingAsync(ShapeDisplayContext context)
-            {
-                Displaying(context); return Task.CompletedTask;
-            }
-            Task IShapeDisplayEvents.DisplayedAsync(ShapeDisplayContext context)
-            {
-                Displayed(context); return Task.CompletedTask;
-            }
-            Task IShapeDisplayEvents.DisplayingFinalizedAsync(ShapeDisplayContext context)
-            {
-                Finalized(context); return Task.CompletedTask;
-            }
+            Displayed(context); return Task.CompletedTask;
         }
-
-        private void AddShapeDescriptor(ShapeDescriptor shapeDescriptor)
+        Task IShapeDisplayEvents.DisplayingFinalizedAsync(ShapeDisplayContext context)
         {
-            _defaultShapeTable.Descriptors[shapeDescriptor.ShapeType] = shapeDescriptor;
-            foreach (var binding in shapeDescriptor.Bindings)
-            {
-                _defaultShapeTable.Bindings[binding.Key] = binding.Value;
-            }
+            Finalized(context); return Task.CompletedTask;
         }
+    }
 
-        private static DisplayContext CreateDisplayContext(Shape shape)
+    private void AddShapeDescriptor(ShapeDescriptor shapeDescriptor)
+    {
+        _defaultShapeTable.Descriptors[shapeDescriptor.ShapeType] = shapeDescriptor;
+        foreach (var binding in shapeDescriptor.Bindings)
         {
-            return new DisplayContext
-            {
-                Value = shape
-            };
+            _defaultShapeTable.Bindings[binding.Key] = binding.Value;
         }
+    }
 
-        [Fact]
-        public async Task RenderSimpleShape()
+    private static DisplayContext CreateDisplayContext(Shape shape)
+    {
+        return new DisplayContext
         {
-            var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
+            Value = shape
+        };
+    }
 
-            var shape = new Shape();
-            shape.Metadata.Type = "Foo";
+    [Fact]
+    public async Task RenderSimpleShape()
+    {
+        var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
 
-            var descriptor = new ShapeDescriptor
-            {
-                ShapeType = "Foo"
-            };
-            descriptor.Bindings["Foo"] = new ShapeBinding
-            {
-                BindingName = "Foo",
-                BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Hi there!"))
-            };
-            AddShapeDescriptor(descriptor);
+        var shape = new Shape();
+        shape.Metadata.Type = "Foo";
 
-            var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
-            Assert.Equal("Hi there!", result.ToString());
-        }
+        var descriptor = new ShapeDescriptor
+        {
+            ShapeType = "Foo"
+        };
+        descriptor.Bindings["Foo"] = new ShapeBinding
+        {
+            BindingName = "Foo",
+            BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Hi there!"))
+        };
+        AddShapeDescriptor(descriptor);
+
+        var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
+        Assert.Equal("Hi there!", result.ToString());
+    }
+
+    [Fact]
+    public async Task RenderIShapeBindingResolverProvidedShapes()
+    {
+        var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
 
-        [Fact]
-        public async Task RenderIShapeBindingResolverProvidedShapes()
+        var shape = new Shape();
+        shape.Metadata.Type = "Baz";
+
+        _additionalBindings["Baz"] = new ShapeBinding
         {
-            var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
+            BindingName = "Baz",
+            BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Hi from IShapeBindingResolver."))
+        };
 
-            var shape = new Shape();
-            shape.Metadata.Type = "Baz";
+        var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
 
-            _additionalBindings["Baz"] = new ShapeBinding
-            {
-                BindingName = "Baz",
-                BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Hi from IShapeBindingResolver."))
-            };
+        // Cleanup
+        _additionalBindings.Clear();
 
-            var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
+        Assert.Equal("Hi from IShapeBindingResolver.", result.ToString());
+    }
 
-            // Cleanup
-            _additionalBindings.Clear();
+    [Fact]
+    public async Task RenderPreCalculatedShape()
+    {
+        var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
 
-            Assert.Equal("Hi from IShapeBindingResolver.", result.ToString());
-        }
+        var shape = new Shape();
+        shape.Metadata.Type = "Foo";
+        shape.Metadata.OnDisplaying(
+            context =>
+            {
+                context.ChildContent = new HtmlString("Bar");
+            });
 
-        [Fact]
-        public async Task RenderPreCalculatedShape()
+        var descriptor = new ShapeDescriptor
         {
-            var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
+            ShapeType = "Foo"
+        };
+        descriptor.Bindings["Foo"] = new ShapeBinding
+        {
+            BindingName = "Foo",
+            BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Hi there!"))
+        };
+        AddShapeDescriptor(descriptor);
 
-            var shape = new Shape();
-            shape.Metadata.Type = "Foo";
-            shape.Metadata.OnDisplaying(
-                context =>
-                {
-                    context.ChildContent = new HtmlString("Bar");
-                });
+        var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
+        Assert.Equal("Bar", result.ToString());
+    }
 
-            var descriptor = new ShapeDescriptor
-            {
-                ShapeType = "Foo"
-            };
-            descriptor.Bindings["Foo"] = new ShapeBinding
-            {
-                BindingName = "Foo",
-                BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Hi there!"))
-            };
-            AddShapeDescriptor(descriptor);
+    [Fact]
+    public async Task IShapeBindingResolverProvidedShapesDoesNotOverrideShapeDescriptor()
+    {
+        var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
 
-            var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
-            Assert.Equal("Bar", result.ToString());
-        }
+        var shape = new Shape();
+        shape.Metadata.Type = "Foo";
 
-        [Fact]
-        public async Task IShapeBindingResolverProvidedShapesDoesNotOverrideShapeDescriptor()
+        var descriptor = new ShapeDescriptor
         {
-            var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
+            ShapeType = "Foo",
+            ProcessingAsync = new Func<ShapeDisplayContext, Task>[] {
+                context =>
+                {
+                    dynamic dynamicShape = context.Shape;
+                    dynamicShape.Data = "some data";
+                    return Task.CompletedTask;
+                }
+            }
+        };
+        descriptor.Bindings["Foo"] = new ShapeBinding
+        {
+            BindingName = "Foo",
+            BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Is there any data ?"))
+        };
+        AddShapeDescriptor(descriptor);
 
-            var shape = new Shape();
-            shape.Metadata.Type = "Foo";
+        _additionalBindings["Foo"] = new ShapeBinding
+        {
+            BindingName = "Foo",
+            BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString($"Yes there is {((dynamic)ctx.Value).Data}."))
+        };
 
-            var descriptor = new ShapeDescriptor
-            {
-                ShapeType = "Foo",
-                ProcessingAsync = new Func<ShapeDisplayContext, Task>[] {
-                    context =>
-                    {
-                        dynamic dynamicShape = context.Shape;
-                        dynamicShape.Data = "some data";
-                        return Task.CompletedTask;
-                    }
-                }
-            };
-            descriptor.Bindings["Foo"] = new ShapeBinding
-            {
-                BindingName = "Foo",
-                BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Is there any data ?"))
-            };
-            AddShapeDescriptor(descriptor);
+        var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
 
-            _additionalBindings["Foo"] = new ShapeBinding
-            {
-                BindingName = "Foo",
-                BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString($"Yes there is {((dynamic)ctx.Value).Data}."))
-            };
+        // Cleanup
+        _additionalBindings.Clear();
 
-            var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
+        Assert.Equal("Yes there is some data.", result.ToString());
+    }
 
-            // Cleanup
-            _additionalBindings.Clear();
+    [Fact]
+    public async Task RenderFallbackShape()
+    {
+        var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
 
-            Assert.Equal("Yes there is some data.", result.ToString());
-        }
+        var shape = new Shape();
+        shape.Metadata.Type = "Foo__2";
 
-        [Fact]
-        public async Task RenderFallbackShape()
+        var descriptor = new ShapeDescriptor
         {
-            var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
+            ShapeType = "Foo"
+        };
+        descriptor.Bindings["Foo"] = new ShapeBinding
+        {
+            BindingName = "Foo",
+            BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Hi there!"))
+        };
+        AddShapeDescriptor(descriptor);
 
-            var shape = new Shape();
-            shape.Metadata.Type = "Foo__2";
+        var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
+        Assert.Equal("Hi there!", result.ToString());
+    }
 
-            var descriptor = new ShapeDescriptor
-            {
-                ShapeType = "Foo"
-            };
-            descriptor.Bindings["Foo"] = new ShapeBinding
-            {
-                BindingName = "Foo",
-                BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Hi there!"))
-            };
-            AddShapeDescriptor(descriptor);
+    [Fact]
+    public async Task AddAlternatesOnDisplaying()
+    {
+        var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
 
-            var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
-            Assert.Equal("Hi there!", result.ToString());
-        }
+        var shape = new Shape();
+        shape.Metadata.Type = "Foo";
 
-        [Fact]
-        public async Task AddAlternatesOnDisplaying()
+        var descriptor = new ShapeDescriptor
+        {
+            ShapeType = "Foo",
+            DisplayingAsync = new Func<ShapeDisplayContext, Task>[] {
+                context =>
+                {
+                        context.Shape.Metadata.Alternates.Add("Bar");
+                        return Task.CompletedTask;
+                }
+            }
+        };
+        descriptor.Bindings["Foo"] = new ShapeBinding
+        {
+            BindingName = "Foo",
+            BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Foo"))
+        };
+        descriptor.Bindings["Bar"] = new ShapeBinding
         {
-            var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
+            BindingName = "Bar",
+            BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Bar"))
+        };
+        AddShapeDescriptor(descriptor);
 
-            var shape = new Shape();
-            shape.Metadata.Type = "Foo";
+        var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
+        Assert.Equal("Bar", result.ToString());
+    }
 
-            var descriptor = new ShapeDescriptor
-            {
-                ShapeType = "Foo",
-                DisplayingAsync = new Func<ShapeDisplayContext, Task>[] {
-                    context =>
-                    {
-                            context.Shape.Metadata.Alternates.Add("Bar");
-                            return Task.CompletedTask;
-                    }
-                }
-            };
-            descriptor.Bindings["Foo"] = new ShapeBinding
-            {
-                BindingName = "Foo",
-                BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Foo"))
-            };
-            descriptor.Bindings["Bar"] = new ShapeBinding
-            {
-                BindingName = "Bar",
-                BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Bar"))
-            };
-            AddShapeDescriptor(descriptor);
+    [Fact]
+    public async Task AddAlternatesOnProcessing()
+    {
+        var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
 
-            var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
-            Assert.Equal("Bar", result.ToString());
-        }
+        var shape = new Shape();
+        shape.Metadata.Type = "Foo";
 
-        [Fact]
-        public async Task AddAlternatesOnProcessing()
+        var descriptor = new ShapeDescriptor
+        {
+            ShapeType = "Foo",
+            ProcessingAsync = new Func<ShapeDisplayContext, Task>[] {
+                context =>
+                {
+                        context.Shape.Metadata.Alternates.Add("Bar");
+                        return Task.CompletedTask;
+                }
+            }
+        };
+        descriptor.Bindings["Foo"] = new ShapeBinding
+        {
+            BindingName = "Foo",
+            BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Foo"))
+        };
+        descriptor.Bindings["Bar"] = new ShapeBinding
         {
-            var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
+            BindingName = "Bar",
+            BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Bar"))
+        };
+        AddShapeDescriptor(descriptor);
 
-            var shape = new Shape();
-            shape.Metadata.Type = "Foo";
+        var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
+        Assert.Equal("Bar", result.ToString());
+    }
 
-            var descriptor = new ShapeDescriptor
-            {
-                ShapeType = "Foo",
-                ProcessingAsync = new Func<ShapeDisplayContext, Task>[] {
-                    context =>
-                    {
-                            context.Shape.Metadata.Alternates.Add("Bar");
-                            return Task.CompletedTask;
-                    }
-                }
-            };
-            descriptor.Bindings["Foo"] = new ShapeBinding
-            {
-                BindingName = "Foo",
-                BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Foo"))
-            };
-            descriptor.Bindings["Bar"] = new ShapeBinding
-            {
-                BindingName = "Bar",
-                BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Bar"))
-            };
-            AddShapeDescriptor(descriptor);
+    [Fact]
+    public async Task RenderAlternateShapeExplicitly()
+    {
+        var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
 
-            var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
-            Assert.Equal("Bar", result.ToString());
-        }
+        var shape = new Shape();
+        shape.Metadata.Type = "Foo__2";
 
-        [Fact]
-        public async Task RenderAlternateShapeExplicitly()
+        var descriptor = new ShapeDescriptor
+        {
+            ShapeType = "Foo"
+        };
+        descriptor.Bindings["Foo"] = new ShapeBinding
         {
-            var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
+            BindingName = "Foo",
+            BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Hi there!"))
+        };
+        descriptor.Bindings["Foo__2"] = new ShapeBinding
+        {
+            BindingName = "Foo__2",
+            BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Hello again!"))
+        };
+        AddShapeDescriptor(descriptor);
 
-            var shape = new Shape();
-            shape.Metadata.Type = "Foo__2";
+        var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
+        Assert.Equal("Hello again!", result.ToString());
+    }
 
-            var descriptor = new ShapeDescriptor
-            {
-                ShapeType = "Foo"
-            };
-            descriptor.Bindings["Foo"] = new ShapeBinding
-            {
-                BindingName = "Foo",
-                BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Hi there!"))
-            };
-            descriptor.Bindings["Foo__2"] = new ShapeBinding
-            {
-                BindingName = "Foo__2",
-                BindingAsync = ctx => Task.FromResult<IHtmlContent>(new HtmlString("Hello again!"))
-            };
-            AddShapeDescriptor(descriptor);
+    [Fact]
+    public async Task RenderAlternateShapeByMostRecentlyAddedMatchingAlternate()
+    {
+        var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
 
-            var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
-            Assert.Equal("Hello again!", result.ToString());
-        }
+        var shape = new Shape();
+        shape.Metadata.Type = "Foo";
+        shape.Metadata.Alternates.Add("Foo__1");
+        shape.Metadata.Alternates.Add("Foo__2");
+        shape.Metadata.Alternates.Add("Foo__3");
 
-        [Fact]
-        public async Task RenderAlternateShapeByMostRecentlyAddedMatchingAlternate()
+        var descriptor = new ShapeDescriptor
         {
-            var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
+            ShapeType = "Foo"
+        };
+        AddBinding(descriptor, "Foo", ctx => Task.FromResult<IHtmlContent>(new HtmlString("Hi there!")));
+        AddBinding(descriptor, "Foo__1", ctx => Task.FromResult<IHtmlContent>(new HtmlString("Hello (1)!")));
+        AddBinding(descriptor, "Foo__2", ctx => Task.FromResult<IHtmlContent>(new HtmlString("Hello (2)!")));
+        AddShapeDescriptor(descriptor);
+
+        var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
+        Assert.Equal("Hello (2)!", result.ToString());
+    }
 
-            var shape = new Shape();
-            shape.Metadata.Type = "Foo";
-            shape.Metadata.Alternates.Add("Foo__1");
-            shape.Metadata.Alternates.Add("Foo__2");
-            shape.Metadata.Alternates.Add("Foo__3");
+    private static void AddBinding(ShapeDescriptor descriptor, string bindingName, Func<DisplayContext, Task<IHtmlContent>> binding)
+    {
+        descriptor.Bindings[bindingName] = new ShapeBinding
+        {
+            BindingName = bindingName,
+            BindingAsync = binding
+        };
+    }
 
-            var descriptor = new ShapeDescriptor
-            {
-                ShapeType = "Foo"
-            };
-            AddBinding(descriptor, "Foo", ctx => Task.FromResult<IHtmlContent>(new HtmlString("Hi there!")));
-            AddBinding(descriptor, "Foo__1", ctx => Task.FromResult<IHtmlContent>(new HtmlString("Hello (1)!")));
-            AddBinding(descriptor, "Foo__2", ctx => Task.FromResult<IHtmlContent>(new HtmlString("Hello (2)!")));
-            AddShapeDescriptor(descriptor);
-
-            var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
-            Assert.Equal("Hello (2)!", result.ToString());
-        }
+    [Fact]
+    public async Task ShapeDescriptorDisplayingAndDisplayedAreCalled()
+    {
+        var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
 
-        private static void AddBinding(ShapeDescriptor descriptor, string bindingName, Func<DisplayContext, Task<IHtmlContent>> binding)
-        {
-            descriptor.Bindings[bindingName] = new ShapeBinding
-            {
-                BindingName = bindingName,
-                BindingAsync = binding
-            };
-        }
+        var shape = new Shape();
+        shape.Metadata.Type = "Foo";
 
-        [Fact]
-        public async Task ShapeDescriptorDisplayingAndDisplayedAreCalled()
+        var descriptor = new ShapeDescriptor
         {
-            var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
+            ShapeType = "Foo"
+        };
+        AddBinding(descriptor, "Foo", ctx => Task.FromResult<IHtmlContent>(new HtmlString("yarg")));
+        AddShapeDescriptor(descriptor);
 
-            var shape = new Shape();
-            shape.Metadata.Type = "Foo";
+        var displayingEventCount = 0;
+        var displayedEventCount = 0;
+        descriptor.DisplayingAsync = new Func<ShapeDisplayContext, Task>[] { ctx => { ++displayingEventCount; return Task.CompletedTask; } };
+        descriptor.DisplayedAsync = new Func<ShapeDisplayContext, Task>[] { ctx => { ++displayedEventCount; ctx.ChildContent = new HtmlString("[" + ctx.ChildContent.ToString() + "]"); return Task.CompletedTask; } };
 
-            var descriptor = new ShapeDescriptor
-            {
-                ShapeType = "Foo"
-            };
-            AddBinding(descriptor, "Foo", ctx => Task.FromResult<IHtmlContent>(new HtmlString("yarg")));
-            AddShapeDescriptor(descriptor);
+        var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
 
-            var displayingEventCount = 0;
-            var displayedEventCount = 0;
-            descriptor.DisplayingAsync = new Func<ShapeDisplayContext, Task>[] { ctx => { ++displayingEventCount; return Task.CompletedTask; } };
-            descriptor.DisplayedAsync = new Func<ShapeDisplayContext, Task>[] { ctx => { ++displayedEventCount; ctx.ChildContent = new HtmlString("[" + ctx.ChildContent.ToString() + "]"); return Task.CompletedTask; } };
+        Assert.Equal(1, displayingEventCount);
+        Assert.Equal(1, displayedEventCount);
+        Assert.Equal("[yarg]", result.ToString());
+    }
 
-            var result = await displayManager.ExecuteAsync(CreateDisplayContext(shape));
+    [Fact]
+    public async Task DisplayingEventFiresEarlyEnoughToAddAlternateShapeBindingNames()
+    {
+        var htmlDisplay = _serviceProvider.GetService<IHtmlDisplay>();
 
-            Assert.Equal(1, displayingEventCount);
-            Assert.Equal(1, displayedEventCount);
-            Assert.Equal("[yarg]", result.ToString());
-        }
+        var shapeFoo = new Shape();
+        shapeFoo.Metadata.Type = "Foo";
 
-        [Fact]
-        public async Task DisplayingEventFiresEarlyEnoughToAddAlternateShapeBindingNames()
+        var descriptorFoo = new ShapeDescriptor
         {
-            var htmlDisplay = _serviceProvider.GetService<IHtmlDisplay>();
+            ShapeType = "Foo"
+        };
+        AddBinding(descriptorFoo, "Foo", ctx => Task.FromResult<IHtmlContent>(new HtmlString("alpha")));
+        AddShapeDescriptor(descriptorFoo);
 
-            var shapeFoo = new Shape();
-            shapeFoo.Metadata.Type = "Foo";
+        var descriptorBar = new ShapeDescriptor
+        {
+            ShapeType = "Bar"
+        };
+        AddBinding(descriptorBar, "Bar", ctx => Task.FromResult<IHtmlContent>(new HtmlString("beta")));
+        AddShapeDescriptor(descriptorBar);
 
-            var descriptorFoo = new ShapeDescriptor
-            {
-                ShapeType = "Foo"
-            };
-            AddBinding(descriptorFoo, "Foo", ctx => Task.FromResult<IHtmlContent>(new HtmlString("alpha")));
-            AddShapeDescriptor(descriptorFoo);
+        var resultNormally = await htmlDisplay.ExecuteAsync(CreateDisplayContext(shapeFoo));
 
-            var descriptorBar = new ShapeDescriptor
-            {
-                ShapeType = "Bar"
-            };
-            AddBinding(descriptorBar, "Bar", ctx => Task.FromResult<IHtmlContent>(new HtmlString("beta")));
-            AddShapeDescriptor(descriptorBar);
+        shapeFoo = new Shape();
+        shapeFoo.Metadata.Type = "Foo";
+        descriptorFoo.DisplayingAsync = new Func<ShapeDisplayContext, Task>[] { ctx => { ctx.Shape.Metadata.Alternates.Add("Bar"); return Task.CompletedTask; } };
+        var resultWithOverride = await htmlDisplay.ExecuteAsync(CreateDisplayContext(shapeFoo));
 
-            var resultNormally = await htmlDisplay.ExecuteAsync(CreateDisplayContext(shapeFoo));
+        Assert.Equal("alpha", resultNormally.ToString());
+        Assert.Equal("beta", resultWithOverride.ToString());
+    }
 
-            shapeFoo = new Shape();
-            shapeFoo.Metadata.Type = "Foo";
-            descriptorFoo.DisplayingAsync = new Func<ShapeDisplayContext, Task>[] { ctx => { ctx.Shape.Metadata.Alternates.Add("Bar"); return Task.CompletedTask; } };
-            var resultWithOverride = await htmlDisplay.ExecuteAsync(CreateDisplayContext(shapeFoo));
+    [Fact]
+    public async Task ShapeTypeAndBindingNamesAreNotCaseSensitive()
+    {
+        var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
 
-            Assert.Equal("alpha", resultNormally.ToString());
-            Assert.Equal("beta", resultWithOverride.ToString());
-        }
+        var shapeFoo = new Shape();
+        shapeFoo.Metadata.Type = "Foo";
 
-        [Fact]
-        public async Task ShapeTypeAndBindingNamesAreNotCaseSensitive()
+        var descriptorFoo = new ShapeDescriptor
         {
-            var displayManager = _serviceProvider.GetService<IHtmlDisplay>();
+            ShapeType = "Foo"
+        };
+        AddBinding(descriptorFoo, "Foo", ctx => Task.FromResult<IHtmlContent>(new HtmlString("alpha")));
+        AddShapeDescriptor(descriptorFoo);
 
-            var shapeFoo = new Shape();
-            shapeFoo.Metadata.Type = "Foo";
+        var result = await displayManager.ExecuteAsync(CreateDisplayContext(shapeFoo));
 
-            var descriptorFoo = new ShapeDescriptor
-            {
-                ShapeType = "Foo"
-            };
-            AddBinding(descriptorFoo, "Foo", ctx => Task.FromResult<IHtmlContent>(new HtmlString("alpha")));
-            AddShapeDescriptor(descriptorFoo);
-
-            var result = await displayManager.ExecuteAsync(CreateDisplayContext(shapeFoo));
-
-            Assert.Equal("alpha", result.ToString());
-        }
+        Assert.Equal("alpha", result.ToString());
     }
 }
diff --git a/test/OrchardCore.Tests/DisplayManagement/NilTests.cs b/test/OrchardCore.Tests/DisplayManagement/NilTests.cs
index 94ba468ced9..20676bffb60 100644
--- a/test/OrchardCore.Tests/DisplayManagement/NilTests.cs
+++ b/test/OrchardCore.Tests/DisplayManagement/NilTests.cs
@@ -1,50 +1,49 @@
 using OrchardCore.DisplayManagement.Shapes;
 
-namespace OrchardCore.Tests.DisplayManagement
+namespace OrchardCore.Tests.DisplayManagement;
+
+public class NilTests
 {
-    public class NilTests
+    [Fact]
+    public void NilShouldEqualToNull()
+    {
+        var nil = Nil.Instance;
+
+        Assert.True(nil == null);
+        Assert.False(nil != null);
+
+        Assert.True(nil == Nil.Instance);
+        Assert.False(nil != Nil.Instance);
+    }
+
+    [Fact]
+    public void NilShouldBeRecursive()
+    {
+        dynamic nil = Nil.Instance;
+
+        Assert.True(nil == null);
+        Assert.True(nil.Foo == null);
+        Assert.True(nil.Foo.Bar == null);
+    }
+
+    [Fact]
+    public void CallingToStringOnNilShouldReturnEmpty()
+    {
+        var nil = Nil.Instance;
+        Assert.Equal("", nil.ToString());
+    }
+
+    [Fact]
+    public void CallingToStringOnDynamicNilShouldReturnEmpty()
+    {
+        dynamic nil = Nil.Instance;
+        Assert.Equal("", nil.Foo.Bar.ToString());
+    }
+
+    [Fact]
+    public void ConvertingToStringShouldReturnNullString()
     {
-        [Fact]
-        public void NilShouldEqualToNull()
-        {
-            var nil = Nil.Instance;
-
-            Assert.True(nil == null);
-            Assert.False(nil != null);
-
-            Assert.True(nil == Nil.Instance);
-            Assert.False(nil != Nil.Instance);
-        }
-
-        [Fact]
-        public void NilShouldBeRecursive()
-        {
-            dynamic nil = Nil.Instance;
-
-            Assert.True(nil == null);
-            Assert.True(nil.Foo == null);
-            Assert.True(nil.Foo.Bar == null);
-        }
-
-        [Fact]
-        public void CallingToStringOnNilShouldReturnEmpty()
-        {
-            var nil = Nil.Instance;
-            Assert.Equal("", nil.ToString());
-        }
-
-        [Fact]
-        public void CallingToStringOnDynamicNilShouldReturnEmpty()
-        {
-            dynamic nil = Nil.Instance;
-            Assert.Equal("", nil.Foo.Bar.ToString());
-        }
-
-        [Fact]
-        public void ConvertingToStringShouldReturnNullString()
-        {
-            dynamic nil = Nil.Instance;
-            Assert.True((string)nil == null);
-        }
+        dynamic nil = Nil.Instance;
+        Assert.True((string)nil == null);
     }
 }
diff --git a/test/OrchardCore.Tests/DisplayManagement/ShapeFactoryTests.cs b/test/OrchardCore.Tests/DisplayManagement/ShapeFactoryTests.cs
index e656f4cead5..688090de40d 100644
--- a/test/OrchardCore.Tests/DisplayManagement/ShapeFactoryTests.cs
+++ b/test/OrchardCore.Tests/DisplayManagement/ShapeFactoryTests.cs
@@ -6,128 +6,127 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Tests.Stubs;
 
-namespace OrchardCore.Tests.DisplayManagement
+namespace OrchardCore.Tests.DisplayManagement;
+
+public class ShapeFactoryTests
 {
-    public class ShapeFactoryTests
+    private readonly IServiceProvider _serviceProvider;
+    private readonly ShapeTable _shapeTable;
+
+    public ShapeFactoryTests()
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly ShapeTable _shapeTable;
+        IServiceCollection serviceCollection = new ServiceCollection();
 
-        public ShapeFactoryTests()
-        {
-            IServiceCollection serviceCollection = new ServiceCollection();
+        serviceCollection.AddScoped<ILoggerFactory, NullLoggerFactory>();
+        serviceCollection.AddScoped<IThemeManager, ThemeManager>();
+        serviceCollection.AddScoped<IShapeFactory, DefaultShapeFactory>();
+        serviceCollection.AddScoped<IExtensionManager, StubExtensionManager>();
+        serviceCollection.AddScoped<IShapeTableManager, TestShapeTableManager>();
 
-            serviceCollection.AddScoped<ILoggerFactory, NullLoggerFactory>();
-            serviceCollection.AddScoped<IThemeManager, ThemeManager>();
-            serviceCollection.AddScoped<IShapeFactory, DefaultShapeFactory>();
-            serviceCollection.AddScoped<IExtensionManager, StubExtensionManager>();
-            serviceCollection.AddScoped<IShapeTableManager, TestShapeTableManager>();
+        _shapeTable = new ShapeTable
+        (
+            new Dictionary<string, ShapeDescriptor>(StringComparer.OrdinalIgnoreCase),
+            new Dictionary<string, ShapeBinding>(StringComparer.OrdinalIgnoreCase)
+        );
 
-            _shapeTable = new ShapeTable
-            (
-                new Dictionary<string, ShapeDescriptor>(StringComparer.OrdinalIgnoreCase),
-                new Dictionary<string, ShapeBinding>(StringComparer.OrdinalIgnoreCase)
-            );
+        serviceCollection.AddSingleton(_shapeTable);
 
-            serviceCollection.AddSingleton(_shapeTable);
+        _serviceProvider = serviceCollection.BuildServiceProvider();
+    }
 
-            _serviceProvider = serviceCollection.BuildServiceProvider();
-        }
+    [Fact]
+    public async Task ShapeHasAttributesType()
+    {
+        var factory = _serviceProvider.GetService<IShapeFactory>();
+        dynamic foo = await factory.CreateAsync("Foo", ArgsUtility.Empty());
+        ShapeMetadata metadata = foo.Metadata;
+        Assert.Equal("Foo", metadata.Type);
+    }
 
-        [Fact]
-        public async Task ShapeHasAttributesType()
-        {
-            var factory = _serviceProvider.GetService<IShapeFactory>();
-            dynamic foo = await factory.CreateAsync("Foo", ArgsUtility.Empty());
-            ShapeMetadata metadata = foo.Metadata;
-            Assert.Equal("Foo", metadata.Type);
-        }
-
-        [Fact]
-        public async Task CreateShapeWithNamedArguments()
-        {
-            var factory = _serviceProvider.GetService<IShapeFactory>();
-            dynamic foo = await factory.CreateAsync("Foo", ArgsUtility.Named(new { one = 1, two = "dos" }));
-            Assert.Equal(1, foo.one);
-            Assert.Equal("dos", foo.two);
-        }
-
-        [Fact]
-        public async Task CallSyntax()
-        {
-            dynamic factory = _serviceProvider.GetService<IShapeFactory>();
-            var foo = await factory.Foo();
-            ShapeMetadata metadata = foo.Metadata;
-            Assert.Equal("Foo", metadata.Type);
-        }
-
-        [Fact]
-        public async Task CallSyntaxAsync()
-        {
-            dynamic factory = _serviceProvider.GetService<IShapeFactory>();
-            var foo = await factory.FooAsync();
-            ShapeMetadata metadata = foo.Metadata;
-            Assert.Equal("Foo", metadata.Type);
-        }
-
-        [Fact]
-        public async Task CallInitializer()
-        {
-            dynamic factory = _serviceProvider.GetService<IShapeFactory>();
-            var bar = new { One = 1, Two = "two" };
-            var foo = await factory.Foo(bar);
+    [Fact]
+    public async Task CreateShapeWithNamedArguments()
+    {
+        var factory = _serviceProvider.GetService<IShapeFactory>();
+        dynamic foo = await factory.CreateAsync("Foo", ArgsUtility.Named(new { one = 1, two = "dos" }));
+        Assert.Equal(1, foo.one);
+        Assert.Equal("dos", foo.two);
+    }
+
+    [Fact]
+    public async Task CallSyntax()
+    {
+        dynamic factory = _serviceProvider.GetService<IShapeFactory>();
+        var foo = await factory.Foo();
+        ShapeMetadata metadata = foo.Metadata;
+        Assert.Equal("Foo", metadata.Type);
+    }
+
+    [Fact]
+    public async Task CallSyntaxAsync()
+    {
+        dynamic factory = _serviceProvider.GetService<IShapeFactory>();
+        var foo = await factory.FooAsync();
+        ShapeMetadata metadata = foo.Metadata;
+        Assert.Equal("Foo", metadata.Type);
+    }
+
+    [Fact]
+    public async Task CallInitializer()
+    {
+        dynamic factory = _serviceProvider.GetService<IShapeFactory>();
+        var bar = new { One = 1, Two = "two" };
+        var foo = await factory.Foo(bar);
 
-            Assert.Equal(1, foo.One);
-            Assert.Equal("two", foo.Two);
-        }
+        Assert.Equal(1, foo.One);
+        Assert.Equal("two", foo.Two);
+    }
 
-        [Fact]
-        public async Task ShapeFactoryUsesCustomShapeType()
+    [Fact]
+    public async Task ShapeFactoryUsesCustomShapeType()
+    {
+        var descriptor = new ShapeDescriptor
         {
-            var descriptor = new ShapeDescriptor
+            CreatingAsync = new List<Func<ShapeCreatingContext, Task>>()
             {
-                CreatingAsync = new List<Func<ShapeCreatingContext, Task>>()
+                (ctx) =>
                 {
-                    (ctx) =>
-                    {
-                        ctx.Create = () => new SubShape();
-                        return Task.CompletedTask;
-                    },
+                    ctx.Create = () => new SubShape();
+                    return Task.CompletedTask;
                 },
-            };
+            },
+        };
 
-            _shapeTable.Descriptors.Add("Foo", descriptor);
-            dynamic factory = _serviceProvider.GetService<IShapeFactory>();
-            var foo = await factory.Foo();
+        _shapeTable.Descriptors.Add("Foo", descriptor);
+        dynamic factory = _serviceProvider.GetService<IShapeFactory>();
+        var foo = await factory.Foo();
 
-            Assert.IsType<SubShape>(foo);
-        }
+        Assert.IsType<SubShape>(foo);
+    }
 
-        [Fact]
-        public async Task ShapeFactoryWithCustomShapeTypeAppliesArguments()
+    [Fact]
+    public async Task ShapeFactoryWithCustomShapeTypeAppliesArguments()
+    {
+        var descriptor = new ShapeDescriptor
         {
-            var descriptor = new ShapeDescriptor
+            CreatingAsync = new List<Func<ShapeCreatingContext, Task>>()
             {
-                CreatingAsync = new List<Func<ShapeCreatingContext, Task>>()
+                (ctx) =>
                 {
-                    (ctx) =>
-                    {
-                        ctx.Create = () => new SubShape();
-                        return Task.CompletedTask;
-                    },
+                    ctx.Create = () => new SubShape();
+                    return Task.CompletedTask;
                 },
-            };
+            },
+        };
 
-            _shapeTable.Descriptors.Add("Foo", descriptor);
-            dynamic factory = _serviceProvider.GetService<IShapeFactory>();
-            var foo = await factory.Foo(Bar: "Bar", Baz: "Baz");
+        _shapeTable.Descriptors.Add("Foo", descriptor);
+        dynamic factory = _serviceProvider.GetService<IShapeFactory>();
+        var foo = await factory.Foo(Bar: "Bar", Baz: "Baz");
 
-            Assert.Equal("Bar", foo.Bar);
-            Assert.Equal("Baz", foo.Baz);
-        }
+        Assert.Equal("Bar", foo.Bar);
+        Assert.Equal("Baz", foo.Baz);
+    }
 
-        private sealed class SubShape : Shape
-        {
-        }
+    private sealed class SubShape : Shape
+    {
     }
 }
diff --git a/test/OrchardCore.Tests/DisplayManagement/ShapeHelperTests.cs b/test/OrchardCore.Tests/DisplayManagement/ShapeHelperTests.cs
index 91ec5426fb0..ce9d6574e8a 100644
--- a/test/OrchardCore.Tests/DisplayManagement/ShapeHelperTests.cs
+++ b/test/OrchardCore.Tests/DisplayManagement/ShapeHelperTests.cs
@@ -5,66 +5,65 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Tests.Stubs;
 
-namespace OrchardCore.Tests.DisplayManagement
+namespace OrchardCore.Tests.DisplayManagement;
+
+public class ShapeHelperTests
 {
-    public class ShapeHelperTests
-    {
-        private readonly IServiceProvider _serviceProvider;
+    private readonly IServiceProvider _serviceProvider;
 
-        public ShapeHelperTests()
-        {
-            IServiceCollection serviceCollection = new ServiceCollection();
+    public ShapeHelperTests()
+    {
+        IServiceCollection serviceCollection = new ServiceCollection();
 
-            serviceCollection.AddLogging();
-            serviceCollection.AddScoped<IHtmlDisplay, DefaultHtmlDisplay>();
-            serviceCollection.AddScoped<IExtensionManager, StubExtensionManager>();
-            serviceCollection.AddScoped<IThemeManager, ThemeManager>();
-            serviceCollection.AddScoped<IShapeFactory, DefaultShapeFactory>();
-            serviceCollection.AddScoped<IShapeTableManager, TestShapeTableManager>();
+        serviceCollection.AddLogging();
+        serviceCollection.AddScoped<IHtmlDisplay, DefaultHtmlDisplay>();
+        serviceCollection.AddScoped<IExtensionManager, StubExtensionManager>();
+        serviceCollection.AddScoped<IThemeManager, ThemeManager>();
+        serviceCollection.AddScoped<IShapeFactory, DefaultShapeFactory>();
+        serviceCollection.AddScoped<IShapeTableManager, TestShapeTableManager>();
 
-            var defaultShapeTable = new ShapeTable
-            (
-                new Dictionary<string, ShapeDescriptor>(StringComparer.OrdinalIgnoreCase),
-                new Dictionary<string, ShapeBinding>(StringComparer.OrdinalIgnoreCase)
-            );
+        var defaultShapeTable = new ShapeTable
+        (
+            new Dictionary<string, ShapeDescriptor>(StringComparer.OrdinalIgnoreCase),
+            new Dictionary<string, ShapeBinding>(StringComparer.OrdinalIgnoreCase)
+        );
 
-            serviceCollection.AddSingleton(defaultShapeTable);
+        serviceCollection.AddSingleton(defaultShapeTable);
 
-            _serviceProvider = serviceCollection.BuildServiceProvider();
-        }
+        _serviceProvider = serviceCollection.BuildServiceProvider();
+    }
 
-        [Fact]
-        public async Task CreatingNewShapeTypeByName()
-        {
-            dynamic shape = _serviceProvider.GetService<IShapeFactory>();
+    [Fact]
+    public async Task CreatingNewShapeTypeByName()
+    {
+        dynamic shape = _serviceProvider.GetService<IShapeFactory>();
 
-            var alpha = await shape.Alpha();
+        var alpha = await shape.Alpha();
 
-            Assert.Equal("Alpha", alpha.Metadata.Type);
-        }
+        Assert.Equal("Alpha", alpha.Metadata.Type);
+    }
 
-        [Fact]
-        public async Task CreatingShapeWithAdditionalNamedParameters()
-        {
-            dynamic shape = _serviceProvider.GetService<IShapeFactory>();
+    [Fact]
+    public async Task CreatingShapeWithAdditionalNamedParameters()
+    {
+        dynamic shape = _serviceProvider.GetService<IShapeFactory>();
 
-            var alpha = await shape.Alpha(one: 1, two: "dos");
+        var alpha = await shape.Alpha(one: 1, two: "dos");
 
-            Assert.Equal("Alpha", alpha.Metadata.Type);
-            Assert.Equal(1, alpha.one);
-            Assert.Equal("dos", alpha.two);
-        }
+        Assert.Equal("Alpha", alpha.Metadata.Type);
+        Assert.Equal(1, alpha.one);
+        Assert.Equal("dos", alpha.two);
+    }
 
-        [Fact]
-        public async Task WithPropertyBearingObjectInsteadOfNamedParameters()
-        {
-            dynamic shape = _serviceProvider.GetService<IShapeFactory>();
+    [Fact]
+    public async Task WithPropertyBearingObjectInsteadOfNamedParameters()
+    {
+        dynamic shape = _serviceProvider.GetService<IShapeFactory>();
 
-            var alpha = await shape.Alpha(new { one = 1, two = "dos" });
+        var alpha = await shape.Alpha(new { one = 1, two = "dos" });
 
-            Assert.Equal("Alpha", alpha.Metadata.Type);
-            Assert.Equal(1, alpha.one);
-            Assert.Equal("dos", alpha.two);
-        }
+        Assert.Equal("Alpha", alpha.Metadata.Type);
+        Assert.Equal(1, alpha.one);
+        Assert.Equal("dos", alpha.two);
     }
 }
diff --git a/test/OrchardCore.Tests/DisplayManagement/ShapeSerializerTests.cs b/test/OrchardCore.Tests/DisplayManagement/ShapeSerializerTests.cs
index 7af5b74c231..8abb4db4b59 100644
--- a/test/OrchardCore.Tests/DisplayManagement/ShapeSerializerTests.cs
+++ b/test/OrchardCore.Tests/DisplayManagement/ShapeSerializerTests.cs
@@ -6,61 +6,60 @@
 using OrchardCore.Tests.Stubs;
 using Arguments = OrchardCore.DisplayManagement.Arguments;
 
-namespace OrchardCore.Tests.DisplayManagement
+namespace OrchardCore.Tests.DisplayManagement;
+
+public class ShapeSerializerTests
 {
-    public class ShapeSerializerTests
-    {
-        private readonly IServiceProvider _serviceProvider;
+    private readonly IServiceProvider _serviceProvider;
 
-        public ShapeSerializerTests()
-        {
-            IServiceCollection serviceCollection = new ServiceCollection();
+    public ShapeSerializerTests()
+    {
+        IServiceCollection serviceCollection = new ServiceCollection();
 
-            serviceCollection.AddLogging();
-            serviceCollection.AddScoped<IHtmlDisplay, DefaultHtmlDisplay>();
-            serviceCollection.AddScoped<IExtensionManager, StubExtensionManager>();
-            serviceCollection.AddScoped<IThemeManager, ThemeManager>();
-            serviceCollection.AddScoped<IShapeFactory, DefaultShapeFactory>();
-            serviceCollection.AddScoped<IShapeTableManager, TestShapeTableManager>();
+        serviceCollection.AddLogging();
+        serviceCollection.AddScoped<IHtmlDisplay, DefaultHtmlDisplay>();
+        serviceCollection.AddScoped<IExtensionManager, StubExtensionManager>();
+        serviceCollection.AddScoped<IThemeManager, ThemeManager>();
+        serviceCollection.AddScoped<IShapeFactory, DefaultShapeFactory>();
+        serviceCollection.AddScoped<IShapeTableManager, TestShapeTableManager>();
 
-            var defaultShapeTable = new ShapeTable
-            (
-                new Dictionary<string, ShapeDescriptor>(StringComparer.OrdinalIgnoreCase),
-                new Dictionary<string, ShapeBinding>(StringComparer.OrdinalIgnoreCase)
-            );
+        var defaultShapeTable = new ShapeTable
+        (
+            new Dictionary<string, ShapeDescriptor>(StringComparer.OrdinalIgnoreCase),
+            new Dictionary<string, ShapeBinding>(StringComparer.OrdinalIgnoreCase)
+        );
 
-            serviceCollection.AddSingleton(defaultShapeTable);
+        serviceCollection.AddSingleton(defaultShapeTable);
 
-            _serviceProvider = serviceCollection.BuildServiceProvider();
-        }
+        _serviceProvider = serviceCollection.BuildServiceProvider();
+    }
 
-        [Fact]
-        public async Task ShouldSerialize()
-        {
-            var shape = _serviceProvider.GetService<IShapeFactory>();
+    [Fact]
+    public async Task ShouldSerialize()
+    {
+        var shape = _serviceProvider.GetService<IShapeFactory>();
 
-            var alpha = await shape.CreateAsync("Alpha");
-            var serialized = alpha.ShapeToJson();
+        var alpha = await shape.CreateAsync("Alpha");
+        var serialized = alpha.ShapeToJson();
 
-            Assert.Contains("Alpha", serialized.ToString());
-        }
+        Assert.Contains("Alpha", serialized.ToString());
+    }
 
-        [Fact]
-        public async Task ShouldSkipRecursiveShapes()
-        {
-            var shape = _serviceProvider.GetService<IShapeFactory>();
+    [Fact]
+    public async Task ShouldSkipRecursiveShapes()
+    {
+        var shape = _serviceProvider.GetService<IShapeFactory>();
 
-            var alpha = await shape.CreateAsync("Alpha");
+        var alpha = await shape.CreateAsync("Alpha");
 
-            var beta = await shape.CreateAsync("Beta", Arguments.From(new
-            {
-                Alpha = alpha
-            }));
+        var beta = await shape.CreateAsync("Beta", Arguments.From(new
+        {
+            Alpha = alpha
+        }));
 
-            await alpha.AddAsync(beta);
-            var serialized = alpha.ShapeToJson();
+        await alpha.AddAsync(beta);
+        var serialized = alpha.ShapeToJson();
 
-            Assert.Contains("Beta", serialized.ToString());
-        }
+        Assert.Contains("Beta", serialized.ToString());
     }
 }
diff --git a/test/OrchardCore.Tests/DisplayManagement/Title/PageTitleBuilderTests.cs b/test/OrchardCore.Tests/DisplayManagement/Title/PageTitleBuilderTests.cs
index 6ec26ae27b8..305b087cd39 100644
--- a/test/OrchardCore.Tests/DisplayManagement/Title/PageTitleBuilderTests.cs
+++ b/test/OrchardCore.Tests/DisplayManagement/Title/PageTitleBuilderTests.cs
@@ -1,149 +1,148 @@
 using Cysharp.Text;
 
-namespace OrchardCore.DisplayManagement.Title
+namespace OrchardCore.DisplayManagement.Title;
+
+public class PageTitleBuilderTests
 {
-    public class PageTitleBuilderTests
+    private const string Separator = " - ";
+    private const string SimpleTitle = "I'm a title";
+    private const string FirstPartTitle = "first part";
+    private const string SecondPartTitle = "second part";
+
+    private readonly IServiceProvider _serviceProvider;
+
+    public PageTitleBuilderTests()
     {
-        private const string Separator = " - ";
-        private const string SimpleTitle = "I'm a title";
-        private const string FirstPartTitle = "first part";
-        private const string SecondPartTitle = "second part";
+        var serviceCollection = new ServiceCollection();
+        serviceCollection.AddScoped<IPageTitleBuilder, PageTitleBuilder>();
 
-        private readonly IServiceProvider _serviceProvider;
+        _serviceProvider = serviceCollection.BuildServiceProvider();
+    }
 
-        public PageTitleBuilderTests()
-        {
-            var serviceCollection = new ServiceCollection();
-            serviceCollection.AddScoped<IPageTitleBuilder, PageTitleBuilder>();
+    [Fact]
+    public void GenerateTitleEmpty()
+    {
+        // Arrange
+        var pageTitleBuilder = _serviceProvider.GetService<IPageTitleBuilder>();
 
-            _serviceProvider = serviceCollection.BuildServiceProvider();
-        }
+        // Act & Assert
+        Assert.Equal(string.Empty, ToString(pageTitleBuilder.GenerateTitle()));
+    }
 
-        [Fact]
-        public void GenerateTitleEmpty()
-        {
-            // Arrange
-            var pageTitleBuilder = _serviceProvider.GetService<IPageTitleBuilder>();
+    [Fact]
+    public void FixedTitleSet()
+    {
+        // Arrange
+        var pageTitleBuilder = _serviceProvider.GetService<IPageTitleBuilder>();
+        pageTitleBuilder.SetFixedTitle(new HtmlString(SimpleTitle));
 
-            // Act & Assert
-            Assert.Equal(string.Empty, ToString(pageTitleBuilder.GenerateTitle()));
-        }
+        // Act & Assert
+        Assert.Equal(SimpleTitle, ToString(pageTitleBuilder.GenerateTitle()));
+    }
 
-        [Fact]
-        public void FixedTitleSet()
-        {
-            // Arrange
-            var pageTitleBuilder = _serviceProvider.GetService<IPageTitleBuilder>();
-            pageTitleBuilder.SetFixedTitle(new HtmlString(SimpleTitle));
+    [Fact]
+    public void FixedTitleClearAndCheck()
+    {
+        // Arrange
+        var pageTitleBuilder = _serviceProvider.GetService<IPageTitleBuilder>();
+        pageTitleBuilder.SetFixedTitle(new HtmlString(SimpleTitle));
+        pageTitleBuilder.Clear();
 
-            // Act & Assert
-            Assert.Equal(SimpleTitle, ToString(pageTitleBuilder.GenerateTitle()));
-        }
+        // Act & Assert
+        Assert.Equal(string.Empty, ToString(pageTitleBuilder.GenerateTitle()));
+    }
 
-        [Fact]
-        public void FixedTitleClearAndCheck()
-        {
-            // Arrange
-            var pageTitleBuilder = _serviceProvider.GetService<IPageTitleBuilder>();
-            pageTitleBuilder.SetFixedTitle(new HtmlString(SimpleTitle));
-            pageTitleBuilder.Clear();
+    [Fact]
+    public void FixedTitleAddSegment()
+    {
+        // Arrange
+        var pageTitleBuilder = _serviceProvider.GetService<IPageTitleBuilder>();
+        pageTitleBuilder.SetFixedTitle(new HtmlString(SimpleTitle));
 
-            // Act & Assert
-            Assert.Equal(string.Empty, ToString(pageTitleBuilder.GenerateTitle()));
-        }
+        // Act & Assert
+        pageTitleBuilder.AddSegment(new HtmlString("you don't see me"));
+        Assert.Equal(SimpleTitle, ToString(pageTitleBuilder.GenerateTitle()));
+    }
 
-        [Fact]
-        public void FixedTitleAddSegment()
-        {
-            // Arrange
-            var pageTitleBuilder = _serviceProvider.GetService<IPageTitleBuilder>();
-            pageTitleBuilder.SetFixedTitle(new HtmlString(SimpleTitle));
+    [Fact]
+    public void TitleAddSegment()
+    {
+        // Arrange
+        var pageTitleBuilder = _serviceProvider.GetService<IPageTitleBuilder>();
+        pageTitleBuilder.Clear();
 
-            // Act & Assert
-            pageTitleBuilder.AddSegment(new HtmlString("you don't see me"));
-            Assert.Equal(SimpleTitle, ToString(pageTitleBuilder.GenerateTitle()));
-        }
+        // Act & Assert
+        pageTitleBuilder.AddSegment(new HtmlString(SimpleTitle), "after");
+        Assert.Equal(SimpleTitle, ToString(pageTitleBuilder.GenerateTitle()));
+    }
 
-        [Fact]
-        public void TitleAddSegment()
-        {
-            // Arrange
-            var pageTitleBuilder = _serviceProvider.GetService<IPageTitleBuilder>();
-            pageTitleBuilder.Clear();
+    [Fact]
+    public void TitleMultiAddSegment()
+    {
+        // Arrange
+        var pageTitleBuilder = _serviceProvider.GetService<IPageTitleBuilder>();
+        pageTitleBuilder.Clear();
+
+        // Act & Assert
+        pageTitleBuilder.AddSegment(new HtmlString(FirstPartTitle), "after");
+        Assert.Equal(FirstPartTitle, ToString(pageTitleBuilder.GenerateTitle(new HtmlString(Separator))));
+        pageTitleBuilder.AddSegment(new HtmlString(SecondPartTitle), "after");
+        Assert.Equal($"{FirstPartTitle}{Separator}{SecondPartTitle}", ToString(pageTitleBuilder.GenerateTitle(new HtmlString(Separator))));
+    }
 
-            // Act & Assert
-            pageTitleBuilder.AddSegment(new HtmlString(SimpleTitle), "after");
-            Assert.Equal(SimpleTitle, ToString(pageTitleBuilder.GenerateTitle()));
-        }
+    [Fact]
+    public void TitleAddAndClear()
+    {
+        // Arrange
+        var pageTitleBuilder = _serviceProvider.GetService<IPageTitleBuilder>();
+        pageTitleBuilder.Clear();
+
+        // Act & Assert
+        pageTitleBuilder.AddSegment(new HtmlString(FirstPartTitle), "after");
+        Assert.Equal(FirstPartTitle, ToString(pageTitleBuilder.GenerateTitle(new HtmlString(Separator))));
+        pageTitleBuilder.Clear();
+        Assert.Equal(string.Empty, ToString(pageTitleBuilder.GenerateTitle(new HtmlString(Separator))));
+    }
 
-        [Fact]
-        public void TitleMultiAddSegment()
-        {
-            // Arrange
-            var pageTitleBuilder = _serviceProvider.GetService<IPageTitleBuilder>();
-            pageTitleBuilder.Clear();
-
-            // Act & Assert
-            pageTitleBuilder.AddSegment(new HtmlString(FirstPartTitle), "after");
-            Assert.Equal(FirstPartTitle, ToString(pageTitleBuilder.GenerateTitle(new HtmlString(Separator))));
-            pageTitleBuilder.AddSegment(new HtmlString(SecondPartTitle), "after");
-            Assert.Equal($"{FirstPartTitle}{Separator}{SecondPartTitle}", ToString(pageTitleBuilder.GenerateTitle(new HtmlString(Separator))));
-        }
-
-        [Fact]
-        public void TitleAddAndClear()
-        {
-            // Arrange
-            var pageTitleBuilder = _serviceProvider.GetService<IPageTitleBuilder>();
-            pageTitleBuilder.Clear();
-
-            // Act & Assert
-            pageTitleBuilder.AddSegment(new HtmlString(FirstPartTitle), "after");
-            Assert.Equal(FirstPartTitle, ToString(pageTitleBuilder.GenerateTitle(new HtmlString(Separator))));
-            pageTitleBuilder.Clear();
-            Assert.Equal(string.Empty, ToString(pageTitleBuilder.GenerateTitle(new HtmlString(Separator))));
-        }
-
-        [Fact]
-        public void TitleMultiGenerateTitle()
-        {
-            // Arrange
-            var pageTitleBuilder = _serviceProvider.GetService<IPageTitleBuilder>();
-            pageTitleBuilder.Clear();
+    [Fact]
+    public void TitleMultiGenerateTitle()
+    {
+        // Arrange
+        var pageTitleBuilder = _serviceProvider.GetService<IPageTitleBuilder>();
+        pageTitleBuilder.Clear();
 
-            // Act
-            pageTitleBuilder.AddSegment(new HtmlString(FirstPartTitle), "after");
+        // Act
+        pageTitleBuilder.AddSegment(new HtmlString(FirstPartTitle), "after");
 
-            // Assert
-            Assert.Equal(FirstPartTitle, ToString(pageTitleBuilder.GenerateTitle(new HtmlString(Separator))));
-            Assert.Equal(FirstPartTitle, ToString(pageTitleBuilder.GenerateTitle(new HtmlString(Separator))));
-        }
+        // Assert
+        Assert.Equal(FirstPartTitle, ToString(pageTitleBuilder.GenerateTitle(new HtmlString(Separator))));
+        Assert.Equal(FirstPartTitle, ToString(pageTitleBuilder.GenerateTitle(new HtmlString(Separator))));
+    }
 
-        [Fact]
-        public void TitleAddSegments()
-        {
-            // Arrange
-            var pageTitleBuilder = (PageTitleBuilder)_serviceProvider.GetService<IPageTitleBuilder>();
-            pageTitleBuilder.Clear();
+    [Fact]
+    public void TitleAddSegments()
+    {
+        // Arrange
+        var pageTitleBuilder = (PageTitleBuilder)_serviceProvider.GetService<IPageTitleBuilder>();
+        pageTitleBuilder.Clear();
 
-            var elements = new IHtmlContent[]
-            {
-                new HtmlString(FirstPartTitle),
-                new HtmlString(SecondPartTitle)
-            };
+        var elements = new IHtmlContent[]
+        {
+            new HtmlString(FirstPartTitle),
+            new HtmlString(SecondPartTitle)
+        };
 
-            pageTitleBuilder.AddSegments(elements, "after");
+        pageTitleBuilder.AddSegments(elements, "after");
 
-            // Act & Assert
-            Assert.Equal($"{FirstPartTitle}{Separator}{SecondPartTitle}", ToString(pageTitleBuilder.GenerateTitle(new HtmlString(Separator))));
-        }
+        // Act & Assert
+        Assert.Equal($"{FirstPartTitle}{Separator}{SecondPartTitle}", ToString(pageTitleBuilder.GenerateTitle(new HtmlString(Separator))));
+    }
 
-        private static string ToString(IHtmlContent content)
-        {
-            using var writer = new ZStringWriter();
-            content.WriteTo(writer, HtmlEncoder.Default);
+    private static string ToString(IHtmlContent content)
+    {
+        using var writer = new ZStringWriter();
+        content.WriteTo(writer, HtmlEncoder.Default);
 
-            return writer.ToString();
-        }
+        return writer.ToString();
     }
 }
diff --git a/test/OrchardCore.Tests/DisplayManagement/ViewBufferTextWriterContentTests.cs b/test/OrchardCore.Tests/DisplayManagement/ViewBufferTextWriterContentTests.cs
index 0a232424da5..e77bf40946f 100644
--- a/test/OrchardCore.Tests/DisplayManagement/ViewBufferTextWriterContentTests.cs
+++ b/test/OrchardCore.Tests/DisplayManagement/ViewBufferTextWriterContentTests.cs
@@ -1,132 +1,131 @@
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.Liquid;
 
-namespace OrchardCore.Tests.DisplayManagement
+namespace OrchardCore.Tests.DisplayManagement;
+
+public class ViewBufferTextWriterContentTests
 {
-    public class ViewBufferTextWriterContentTests
+    private static string Serialize(ViewBufferTextWriterContent buffer)
     {
-        private static string Serialize(ViewBufferTextWriterContent buffer)
-        {
-            using var sw = new StringWriter();
-            buffer.WriteTo(sw, HtmlEncoder.Default);
-            return sw.ToString();
-        }
+        using var sw = new StringWriter();
+        buffer.WriteTo(sw, HtmlEncoder.Default);
+        return sw.ToString();
+    }
 
-        [Fact]
-        public void ShouldWriteString()
-        {
-            var buffer = new ViewBufferTextWriterContent();
+    [Fact]
+    public void ShouldWriteString()
+    {
+        var buffer = new ViewBufferTextWriterContent();
 
-            buffer.Write("<div>");
+        buffer.Write("<div>");
 
-            var result = Serialize(buffer);
+        var result = Serialize(buffer);
 
-            Assert.Equal("<div>", result);
-        }
+        Assert.Equal("<div>", result);
+    }
 
-        [Fact]
-        public void ShouldWriteChar()
-        {
-            var buffer = new ViewBufferTextWriterContent();
+    [Fact]
+    public void ShouldWriteChar()
+    {
+        var buffer = new ViewBufferTextWriterContent();
 
-            buffer.Write('a');
+        buffer.Write('a');
 
-            var result = Serialize(buffer);
+        var result = Serialize(buffer);
 
-            Assert.Equal("a", result);
-        }
+        Assert.Equal("a", result);
+    }
 
-        [Fact]
-        public void ShouldWriteBufferFragment()
-        {
-            var buffer = new ViewBufferTextWriterContent();
+    [Fact]
+    public void ShouldWriteBufferFragment()
+    {
+        var buffer = new ViewBufferTextWriterContent();
 
-            buffer.Write("abcd".ToCharArray(), 1, 2);
+        buffer.Write("abcd".ToCharArray(), 1, 2);
 
-            var result = Serialize(buffer);
+        var result = Serialize(buffer);
 
-            Assert.Equal("bc", result);
-        }
+        Assert.Equal("bc", result);
+    }
 
-        [Fact]
-        public void ShouldWriteBuffer()
-        {
-            var buffer = new ViewBufferTextWriterContent();
+    [Fact]
+    public void ShouldWriteBuffer()
+    {
+        var buffer = new ViewBufferTextWriterContent();
 
-            buffer.Write("abcd".ToCharArray());
+        buffer.Write("abcd".ToCharArray());
 
-            var result = Serialize(buffer);
+        var result = Serialize(buffer);
 
-            Assert.Equal("abcd", result);
-        }
+        Assert.Equal("abcd", result);
+    }
 
-        [Fact]
-        public void ShouldWriteObject()
-        {
-            var buffer = new ViewBufferTextWriterContent();
+    [Fact]
+    public void ShouldWriteObject()
+    {
+        var buffer = new ViewBufferTextWriterContent();
 
-            buffer.Write((object)"abcd");
+        buffer.Write((object)"abcd");
 
-            var result = Serialize(buffer);
+        var result = Serialize(buffer);
 
-            Assert.Equal("abcd", result);
-        }
+        Assert.Equal("abcd", result);
+    }
 
-        [Fact]
-        public void ShouldWriteMultipleFragments()
-        {
-            var buffer = new ViewBufferTextWriterContent();
+    [Fact]
+    public void ShouldWriteMultipleFragments()
+    {
+        var buffer = new ViewBufferTextWriterContent();
 
-            buffer.Write("ab");
-            buffer.Write("cd");
+        buffer.Write("ab");
+        buffer.Write("cd");
 
-            var result = Serialize(buffer);
+        var result = Serialize(buffer);
 
-            Assert.Equal("abcd", result);
-        }
+        Assert.Equal("abcd", result);
+    }
 
-        [Fact]
-        public void ShouldWriteMultipleStringPages()
-        {
-            var buffer = new ViewBufferTextWriterContent();
+    [Fact]
+    public void ShouldWriteMultipleStringPages()
+    {
+        var buffer = new ViewBufferTextWriterContent();
 
-            var capacity = StringBuilderPool.GetInstance().Builder.Capacity;
-            var page = new string('x', capacity);
+        var capacity = StringBuilderPool.GetInstance().Builder.Capacity;
+        var page = new string('x', capacity);
 
-            buffer.Write(page);
-            buffer.Write(page);
-            var result = Serialize(buffer);
+        buffer.Write(page);
+        buffer.Write(page);
+        var result = Serialize(buffer);
 
-            Assert.Equal(page + page, result);
-        }
+        Assert.Equal(page + page, result);
+    }
 
-        [Fact]
-        public void ShouldWriteMultipleCharPages()
-        {
-            var buffer = new ViewBufferTextWriterContent();
+    [Fact]
+    public void ShouldWriteMultipleCharPages()
+    {
+        var buffer = new ViewBufferTextWriterContent();
 
-            var capacity = StringBuilderPool.GetInstance().Builder.Capacity;
+        var capacity = StringBuilderPool.GetInstance().Builder.Capacity;
 
-            buffer.Write(new string('x', capacity - 1));
-            buffer.Write('x');
-            buffer.Write('x');
-            var result = Serialize(buffer);
+        buffer.Write(new string('x', capacity - 1));
+        buffer.Write('x');
+        buffer.Write('x');
+        var result = Serialize(buffer);
 
-            Assert.Equal(capacity + 1, result.Length);
-        }
+        Assert.Equal(capacity + 1, result.Length);
+    }
 
-        [Fact]
-        public void ShouldWriteMultipleBufferFragmentPages()
-        {
-            var buffer = new ViewBufferTextWriterContent();
+    [Fact]
+    public void ShouldWriteMultipleBufferFragmentPages()
+    {
+        var buffer = new ViewBufferTextWriterContent();
 
-            var capacity = StringBuilderPool.GetInstance().Builder.Capacity;
+        var capacity = StringBuilderPool.GetInstance().Builder.Capacity;
 
-            buffer.Write(new string('x', capacity - 1).ToCharArray());
-            buffer.Write(new string('x', 11).ToCharArray(), 1, 3);
-            var result = Serialize(buffer);
+        buffer.Write(new string('x', capacity - 1).ToCharArray());
+        buffer.Write(new string('x', 11).ToCharArray(), 1, 3);
+        var result = Serialize(buffer);
 
-            Assert.Equal(capacity + 2, result.Length);
-        }
+        Assert.Equal(capacity + 2, result.Length);
     }
 }
diff --git a/test/OrchardCore.Tests/DisplayManagement/ZoneonDemandTests.cs b/test/OrchardCore.Tests/DisplayManagement/ZoneonDemandTests.cs
index c8222ac384a..3b9551d7588 100644
--- a/test/OrchardCore.Tests/DisplayManagement/ZoneonDemandTests.cs
+++ b/test/OrchardCore.Tests/DisplayManagement/ZoneonDemandTests.cs
@@ -2,192 +2,191 @@
 using OrchardCore.DisplayManagement.Shapes;
 using OrchardCore.DisplayManagement.Zones;
 
-namespace OrchardCore.Tests.DisplayManagement
+namespace OrchardCore.Tests.DisplayManagement;
+
+public class ZoneOnDemandTests
 {
-    public class ZoneOnDemandTests
+    [Fact]
+    public void ZoneOnDemandIsEqualToNull()
+    {
+        var zoneOnDemand = CreateZoneOnDemand("SomeZone");
+
+        Assert.True(zoneOnDemand == null);
+        Assert.False(zoneOnDemand != null);
+        Assert.True(zoneOnDemand == Nil.Instance);
+        Assert.False(zoneOnDemand != Nil.Instance);
+    }
+
+    [Fact]
+    public void DynamicZoneOnDemandIsEqualToNull()
+    {
+        dynamic zoneOnDemand = CreateZoneOnDemand("SomeZone");
+
+        Assert.True(zoneOnDemand == null);
+        Assert.False(zoneOnDemand != null);
+        Assert.True(zoneOnDemand == Nil.Instance);
+        Assert.False(zoneOnDemand != Nil.Instance);
+    }
+
+    [Fact]
+    public void ZoneOnDemandAsBaseTypeIsNotEqualToNull()
+    {
+        var zoneOnDemand = CreateZoneOnDemand("SomeZone");
+
+        Shape zoneShape = zoneOnDemand;
+        Composite zoneComposite = zoneOnDemand;
+        object zoneObject = zoneOnDemand;
+
+        Assert.False(zoneShape == null);
+        Assert.False(zoneComposite == null);
+        Assert.False(zoneObject == null);
+    }
+
+    [Fact]
+    public void ZoneOnDemandIsNotEqualToItself()
+    {
+        var zoneOnDemand1 = CreateZoneOnDemand("SomeZone");
+        var zoneOnDemand2 = zoneOnDemand1;
+
+        Assert.False(zoneOnDemand1 == zoneOnDemand2);
+        Assert.True(ReferenceEquals(zoneOnDemand1, zoneOnDemand2));
+    }
+
+    [Fact]
+    public void DynamicZoneOnDemandIsNotEqualToItself()
     {
-        [Fact]
-        public void ZoneOnDemandIsEqualToNull()
-        {
-            var zoneOnDemand = CreateZoneOnDemand("SomeZone");
-
-            Assert.True(zoneOnDemand == null);
-            Assert.False(zoneOnDemand != null);
-            Assert.True(zoneOnDemand == Nil.Instance);
-            Assert.False(zoneOnDemand != Nil.Instance);
-        }
-
-        [Fact]
-        public void DynamicZoneOnDemandIsEqualToNull()
-        {
-            dynamic zoneOnDemand = CreateZoneOnDemand("SomeZone");
-
-            Assert.True(zoneOnDemand == null);
-            Assert.False(zoneOnDemand != null);
-            Assert.True(zoneOnDemand == Nil.Instance);
-            Assert.False(zoneOnDemand != Nil.Instance);
-        }
-
-        [Fact]
-        public void ZoneOnDemandAsBaseTypeIsNotEqualToNull()
-        {
-            var zoneOnDemand = CreateZoneOnDemand("SomeZone");
-
-            Shape zoneShape = zoneOnDemand;
-            Composite zoneComposite = zoneOnDemand;
-            object zoneObject = zoneOnDemand;
-
-            Assert.False(zoneShape == null);
-            Assert.False(zoneComposite == null);
-            Assert.False(zoneObject == null);
-        }
-
-        [Fact]
-        public void ZoneOnDemandIsNotEqualToItself()
-        {
-            var zoneOnDemand1 = CreateZoneOnDemand("SomeZone");
-            var zoneOnDemand2 = zoneOnDemand1;
-
-            Assert.False(zoneOnDemand1 == zoneOnDemand2);
-            Assert.True(ReferenceEquals(zoneOnDemand1, zoneOnDemand2));
-        }
-
-        [Fact]
-        public void DynamicZoneOnDemandIsNotEqualToItself()
-        {
-            dynamic zoneOnDemand1 = CreateZoneOnDemand("SomeZone");
-            dynamic zoneOnDemand2 = zoneOnDemand1;
-
-            Assert.False(zoneOnDemand1 == zoneOnDemand2);
-            Assert.True(ReferenceEquals(zoneOnDemand1, zoneOnDemand2));
-        }
-
-        [Fact]
-        public void ZoneOnDemandAsBaseTypeIsEqualToItself()
-        {
-            var zoneOnDemand = CreateZoneOnDemand("SomeZone");
-
-            Shape zoneShape1 = zoneOnDemand, zoneShape2 = zoneOnDemand;
-            Composite zoneComposite1 = zoneOnDemand, zoneComposite2 = zoneOnDemand;
-            object zoneObject1 = zoneOnDemand, zoneObject2 = zoneOnDemand;
-
-            // Intended reference comparison.
-            Assert.True(zoneShape1 == zoneShape2);
-            Assert.True(zoneComposite1 == zoneComposite2);
-            Assert.True(zoneObject1 == zoneObject2);
-        }
-
-        [Fact]
-        public void ZoneHoldingPropertiesMissingIndexThrows()
-        {
-            Assert.Throws<KeyNotFoundException>(() => { _ = CreateZoneHolding().Properties["SomeZone"]; });
-        }
-
-        [Fact]
-        public void DynamicZoneHoldingMissingIndexIsNull()
-        {
-            dynamic zoneHolding = CreateZoneHolding();
-            var zone = zoneHolding["SomeZone"];
-
-            Assert.False(zone is ZoneOnDemand);
-            Assert.True(zone == null);
-        }
-
-        [Fact]
-        public void DynamicZoneHoldingMissingPropertyAddsAnEmptyZoneOnDemand()
-        {
-            dynamic zoneHolding = CreateZoneHolding();
-            var someZone = zoneHolding.SomeZone;
-
-            Assert.True(someZone is ZoneOnDemand);
-            Assert.True(someZone == null);
-
-            Assert.True(object.ReferenceEquals(zoneHolding.SomeZone, someZone));
-            Assert.True(object.ReferenceEquals(zoneHolding["SomeZone"], someZone));
-            Assert.True(object.ReferenceEquals((zoneHolding as ZoneHolding).Properties["SomeZone"], someZone));
-
-            var dynamicZone = zoneHolding["SomeZone"];
-            Assert.True(dynamicZone is ZoneOnDemand);
-            Assert.True(dynamicZone == null);
-
-            var zoneObject = (zoneHolding as ZoneHolding).Properties["SomeZone"];
-            Assert.True(zoneObject is ZoneOnDemand);
-            Assert.False(zoneObject == null);
-        }
-
-        [Fact]
-        public void DynamicZonesMissingPropertyReturnsATemporaryZoneOnDemand()
-        {
-            dynamic zoneHolding = CreateZoneHolding();
-            var zoneOnDemand = zoneHolding.Zones.SomeZone;
-
-            Assert.True(zoneOnDemand is ZoneOnDemand);
-            Assert.True(zoneOnDemand == null);
-
-            Assert.False(object.ReferenceEquals(zoneHolding.Zones.SomeZone, zoneOnDemand));
-
-            var someZone = zoneHolding["SomeZone"];
-
-            Assert.False(someZone is ZoneOnDemand);
-            Assert.False(someZone is Shape);
-            Assert.True(someZone == null);
-        }
-
-        [Fact]
-        public async Task AddingAnItemToAZoneOnDemandAddsAZoneShapeToItsParent()
-        {
-            dynamic zoneHolding = CreateZoneHolding();
-            var zoneOnDemand = zoneHolding.Zones.SomeZone;
-
-            await zoneOnDemand.AddAsync(new object());
-
-            var someZone = zoneHolding["SomeZone"];
-
-            Assert.False(someZone is ZoneOnDemand);
-            Assert.True(someZone is Shape);
-            Assert.False(someZone == null);
-
-            Assert.True(object.ReferenceEquals(zoneHolding.SomeZone, someZone));
-            Assert.True(object.ReferenceEquals(zoneHolding["SomeZone"], someZone));
-            Assert.True(object.ReferenceEquals(zoneHolding.Zones.SomeZone, someZone));
-            Assert.True(object.ReferenceEquals(zoneHolding.Zones["SomeZone"], someZone));
-            Assert.True(object.ReferenceEquals((zoneHolding as ZoneHolding).Properties["SomeZone"], someZone));
-        }
-
-        [Fact]
-        public void DynamicZoneOnDemandShouldBeRecursive()
-        {
-            dynamic zoneOnDemand = CreateZoneOnDemand("SomeZone");
-
-            Assert.True(zoneOnDemand.Foo == null);
-            Assert.True(zoneOnDemand.Foo.Bar == null);
-            Assert.True(zoneOnDemand.Foo.Bar == Nil.Instance);
-        }
-
-        [Fact]
-        public void CallingToStringOnZoneOnDemandShouldReturnEmpty()
-        {
-            var zoneOnDemand = CreateZoneOnDemand("SomeZone");
-            Assert.Equal("", zoneOnDemand.ToString());
-        }
-
-        [Fact]
-        public void CallingToStringOnDynamicZoneOnDemandShouldReturnEmpty()
-        {
-            dynamic zoneOnDemand = CreateZoneOnDemand("SomeZone");
-            Assert.Equal("", zoneOnDemand.Foo.Bar.ToString());
-        }
-
-        [Fact]
-        public void ConvertingZoneOnDemandToStringShouldReturnNullString()
-        {
-            dynamic zoneOnDemand = CreateZoneOnDemand("SomeZone");
-            Assert.True((string)zoneOnDemand == null);
-        }
-
-        private static ZoneHolding CreateZoneHolding() => new(() => new ValueTask<IShape>(new Shape()));
-
-        private static ZoneOnDemand CreateZoneOnDemand(string name, ZoneHolding zoneHolding = null) =>
-            new(() => new ValueTask<IShape>(new Shape()), zoneHolding ?? CreateZoneHolding(), name);
+        dynamic zoneOnDemand1 = CreateZoneOnDemand("SomeZone");
+        dynamic zoneOnDemand2 = zoneOnDemand1;
+
+        Assert.False(zoneOnDemand1 == zoneOnDemand2);
+        Assert.True(ReferenceEquals(zoneOnDemand1, zoneOnDemand2));
     }
+
+    [Fact]
+    public void ZoneOnDemandAsBaseTypeIsEqualToItself()
+    {
+        var zoneOnDemand = CreateZoneOnDemand("SomeZone");
+
+        Shape zoneShape1 = zoneOnDemand, zoneShape2 = zoneOnDemand;
+        Composite zoneComposite1 = zoneOnDemand, zoneComposite2 = zoneOnDemand;
+        object zoneObject1 = zoneOnDemand, zoneObject2 = zoneOnDemand;
+
+        // Intended reference comparison.
+        Assert.True(zoneShape1 == zoneShape2);
+        Assert.True(zoneComposite1 == zoneComposite2);
+        Assert.True(zoneObject1 == zoneObject2);
+    }
+
+    [Fact]
+    public void ZoneHoldingPropertiesMissingIndexThrows()
+    {
+        Assert.Throws<KeyNotFoundException>(() => { _ = CreateZoneHolding().Properties["SomeZone"]; });
+    }
+
+    [Fact]
+    public void DynamicZoneHoldingMissingIndexIsNull()
+    {
+        dynamic zoneHolding = CreateZoneHolding();
+        var zone = zoneHolding["SomeZone"];
+
+        Assert.False(zone is ZoneOnDemand);
+        Assert.True(zone == null);
+    }
+
+    [Fact]
+    public void DynamicZoneHoldingMissingPropertyAddsAnEmptyZoneOnDemand()
+    {
+        dynamic zoneHolding = CreateZoneHolding();
+        var someZone = zoneHolding.SomeZone;
+
+        Assert.True(someZone is ZoneOnDemand);
+        Assert.True(someZone == null);
+
+        Assert.True(object.ReferenceEquals(zoneHolding.SomeZone, someZone));
+        Assert.True(object.ReferenceEquals(zoneHolding["SomeZone"], someZone));
+        Assert.True(object.ReferenceEquals((zoneHolding as ZoneHolding).Properties["SomeZone"], someZone));
+
+        var dynamicZone = zoneHolding["SomeZone"];
+        Assert.True(dynamicZone is ZoneOnDemand);
+        Assert.True(dynamicZone == null);
+
+        var zoneObject = (zoneHolding as ZoneHolding).Properties["SomeZone"];
+        Assert.True(zoneObject is ZoneOnDemand);
+        Assert.False(zoneObject == null);
+    }
+
+    [Fact]
+    public void DynamicZonesMissingPropertyReturnsATemporaryZoneOnDemand()
+    {
+        dynamic zoneHolding = CreateZoneHolding();
+        var zoneOnDemand = zoneHolding.Zones.SomeZone;
+
+        Assert.True(zoneOnDemand is ZoneOnDemand);
+        Assert.True(zoneOnDemand == null);
+
+        Assert.False(object.ReferenceEquals(zoneHolding.Zones.SomeZone, zoneOnDemand));
+
+        var someZone = zoneHolding["SomeZone"];
+
+        Assert.False(someZone is ZoneOnDemand);
+        Assert.False(someZone is Shape);
+        Assert.True(someZone == null);
+    }
+
+    [Fact]
+    public async Task AddingAnItemToAZoneOnDemandAddsAZoneShapeToItsParent()
+    {
+        dynamic zoneHolding = CreateZoneHolding();
+        var zoneOnDemand = zoneHolding.Zones.SomeZone;
+
+        await zoneOnDemand.AddAsync(new object());
+
+        var someZone = zoneHolding["SomeZone"];
+
+        Assert.False(someZone is ZoneOnDemand);
+        Assert.True(someZone is Shape);
+        Assert.False(someZone == null);
+
+        Assert.True(object.ReferenceEquals(zoneHolding.SomeZone, someZone));
+        Assert.True(object.ReferenceEquals(zoneHolding["SomeZone"], someZone));
+        Assert.True(object.ReferenceEquals(zoneHolding.Zones.SomeZone, someZone));
+        Assert.True(object.ReferenceEquals(zoneHolding.Zones["SomeZone"], someZone));
+        Assert.True(object.ReferenceEquals((zoneHolding as ZoneHolding).Properties["SomeZone"], someZone));
+    }
+
+    [Fact]
+    public void DynamicZoneOnDemandShouldBeRecursive()
+    {
+        dynamic zoneOnDemand = CreateZoneOnDemand("SomeZone");
+
+        Assert.True(zoneOnDemand.Foo == null);
+        Assert.True(zoneOnDemand.Foo.Bar == null);
+        Assert.True(zoneOnDemand.Foo.Bar == Nil.Instance);
+    }
+
+    [Fact]
+    public void CallingToStringOnZoneOnDemandShouldReturnEmpty()
+    {
+        var zoneOnDemand = CreateZoneOnDemand("SomeZone");
+        Assert.Equal("", zoneOnDemand.ToString());
+    }
+
+    [Fact]
+    public void CallingToStringOnDynamicZoneOnDemandShouldReturnEmpty()
+    {
+        dynamic zoneOnDemand = CreateZoneOnDemand("SomeZone");
+        Assert.Equal("", zoneOnDemand.Foo.Bar.ToString());
+    }
+
+    [Fact]
+    public void ConvertingZoneOnDemandToStringShouldReturnNullString()
+    {
+        dynamic zoneOnDemand = CreateZoneOnDemand("SomeZone");
+        Assert.True((string)zoneOnDemand == null);
+    }
+
+    private static ZoneHolding CreateZoneHolding() => new(() => new ValueTask<IShape>(new Shape()));
+
+    private static ZoneOnDemand CreateZoneOnDemand(string name, ZoneHolding zoneHolding = null) =>
+        new(() => new ValueTask<IShape>(new Shape()), zoneHolding ?? CreateZoneHolding(), name);
 }
diff --git a/test/OrchardCore.Tests/Email/EmailAddressValidatorTests.cs b/test/OrchardCore.Tests/Email/EmailAddressValidatorTests.cs
index ec477eeb8b2..75aa9d700f0 100644
--- a/test/OrchardCore.Tests/Email/EmailAddressValidatorTests.cs
+++ b/test/OrchardCore.Tests/Email/EmailAddressValidatorTests.cs
@@ -1,40 +1,39 @@
 using OrchardCore.Email;
 
-namespace OrchardCore.Tests.Email
+namespace OrchardCore.Tests.Email;
+
+public class EmailAddressValidatorTests
 {
-    public class EmailAddressValidatorTests
+    [Theory]
+    [InlineData("mailbox@domain.com", true)]
+    [InlineData("mailbox_domain.com", false)]
+    [InlineData("mailbox@domain", true)]
+    [InlineData(null, false)]
+    [InlineData("", false)]
+    public void ValidateEmailAddress(string address, bool isValid)
     {
-        [Theory]
-        [InlineData("mailbox@domain.com", true)]
-        [InlineData("mailbox_domain.com", false)]
-        [InlineData("mailbox@domain", true)]
-        [InlineData(null, false)]
-        [InlineData("", false)]
-        public void ValidateEmailAddress(string address, bool isValid)
-        {
-            // Arrange
-            var emailAddressValidator = new EmailAddressValidator();
+        // Arrange
+        var emailAddressValidator = new EmailAddressValidator();
 
-            // Act & Assert
-            Assert.Equal(isValid, emailAddressValidator.Validate(address));
-        }
+        // Act & Assert
+        Assert.Equal(isValid, emailAddressValidator.Validate(address));
+    }
 
-        [Theory]
-        [InlineData("hishamco_2007@hotmail.com", false)]
-        [InlineData("hishamco@orchardcore.net", true)]
-        public void UseCustomEmailAddressValidator(string address, bool isValid)
-        {
-            // Arrange
-            var emailAddressValidator = new OrchardCoreEmailValidator();
+    [Theory]
+    [InlineData("hishamco_2007@hotmail.com", false)]
+    [InlineData("hishamco@orchardcore.net", true)]
+    public void UseCustomEmailAddressValidator(string address, bool isValid)
+    {
+        // Arrange
+        var emailAddressValidator = new OrchardCoreEmailValidator();
 
-            // Act & Assert
-            Assert.Equal(isValid, emailAddressValidator.Validate(address));
-        }
+        // Act & Assert
+        Assert.Equal(isValid, emailAddressValidator.Validate(address));
+    }
 
-        private sealed class OrchardCoreEmailValidator : IEmailAddressValidator
-        {
-            public bool Validate(string emailAddress)
-                => emailAddress.EndsWith("@orchardcore.net");
-        }
+    private sealed class OrchardCoreEmailValidator : IEmailAddressValidator
+    {
+        public bool Validate(string emailAddress)
+            => emailAddress.EndsWith("@orchardcore.net");
     }
 }
diff --git a/test/OrchardCore.Tests/Email/EmailTests.cs b/test/OrchardCore.Tests/Email/EmailTests.cs
index f376c30d50b..bb0f397801f 100644
--- a/test/OrchardCore.Tests/Email/EmailTests.cs
+++ b/test/OrchardCore.Tests/Email/EmailTests.cs
@@ -2,271 +2,270 @@
 using OrchardCore.Email;
 using OrchardCore.Email.Smtp.Services;
 
-namespace OrchardCore.Tests.Email
+namespace OrchardCore.Tests.Email;
+
+public class EmailTests
 {
-    public class EmailTests
+    [Fact]
+    public async Task SendEmail_UsesDefaultSender()
     {
-        [Fact]
-        public async Task SendEmail_UsesDefaultSender()
+        // Arrange
+        var message = new MailMessage
         {
-            // Arrange
-            var message = new MailMessage
-            {
-                To = "info@oc.com",
-                Subject = "Test",
-                Body = "Test Message"
-            };
-
-            // Act
-            var content = await SendEmailAsync(message, "Your Name <youraddress@host.com>");
-
-            // Assert
-            Assert.Contains("From: Your Name <youraddress@host.com>", content);
-        }
+            To = "info@oc.com",
+            Subject = "Test",
+            Body = "Test Message"
+        };
 
-        [Fact]
-        public async Task SendEmail_WithCcHeader()
-        {
-            // Arrange
-            var message = new MailMessage
-            {
-                Cc = "info@oc.com",
-                Subject = "Test",
-                Body = "Test Message"
-            };
-
-            // Act
-            var content = await SendEmailAsync(message);
-
-            // Assert
-            Assert.Contains("Cc: info@oc.com", content);
-        }
+        // Act
+        var content = await SendEmailAsync(message, "Your Name <youraddress@host.com>");
 
-        [Fact]
-        public async Task SendEmail_WithBccHeader()
+        // Assert
+        Assert.Contains("From: Your Name <youraddress@host.com>", content);
+    }
+
+    [Fact]
+    public async Task SendEmail_WithCcHeader()
+    {
+        // Arrange
+        var message = new MailMessage
         {
-            // Arrange
-            var message = new MailMessage
-            {
-                Bcc = "info@oc.com",
-                Subject = "Test",
-                Body = "Test Message"
-            };
-
-            // Act
-            var content = await SendEmailAsync(message);
-
-            // Assert
-            Assert.Contains("Bcc: info@oc.com", content);
-        }
+            Cc = "info@oc.com",
+            Subject = "Test",
+            Body = "Test Message"
+        };
 
-        [Fact]
-        public async Task SendEmail_WithDisplayName()
+        // Act
+        var content = await SendEmailAsync(message);
+
+        // Assert
+        Assert.Contains("Cc: info@oc.com", content);
+    }
+
+    [Fact]
+    public async Task SendEmail_WithBccHeader()
+    {
+        // Arrange
+        var message = new MailMessage
         {
-            var message = new MailMessage
-            {
-                To = "info@oc.com",
-                Subject = "Test",
-                Body = "Test Message"
-            };
-
-            await SendEmailAsync(message, "Your Name <youraddress@host.com>");
-        }
+            Bcc = "info@oc.com",
+            Subject = "Test",
+            Body = "Test Message"
+        };
+
+        // Act
+        var content = await SendEmailAsync(message);
+
+        // Assert
+        Assert.Contains("Bcc: info@oc.com", content);
+    }
 
-        [Fact]
-        public async Task SendEmail_UsesCustomSender()
+    [Fact]
+    public async Task SendEmail_WithDisplayName()
+    {
+        var message = new MailMessage
         {
-            var message = new MailMessage
-            {
-                To = "info@oc.com",
-                Subject = "Test",
-                Body = "Test Message",
-                From = "My Name <youraddress@host.com>",
-            };
-            var content = await SendEmailAsync(message, "Your Name <youraddress@host.com>");
-
-            Assert.Contains("From: My Name <youraddress@host.com>", content);
-            Assert.Contains("Sender: Your Name <youraddress@host.com>", content);
-        }
+            To = "info@oc.com",
+            Subject = "Test",
+            Body = "Test Message"
+        };
+
+        await SendEmailAsync(message, "Your Name <youraddress@host.com>");
+    }
 
-        [Fact]
-        public async Task SendEmail_UsesCustomAuthorAndSender()
+    [Fact]
+    public async Task SendEmail_UsesCustomSender()
+    {
+        var message = new MailMessage
         {
-            var message = new MailMessage
-            {
-                To = "info@oc.com",
-                Subject = "Test",
-                Body = "Test Message",
-                Sender = "Hisham Bin Ateya <hishamco_2007@hotmail.com>",
-            };
-            var content = await SendEmailAsync(message, "Sebastien Ros <sebastienros@gmail.com>");
-
-            Assert.Contains("From: Sebastien Ros <sebastienros@gmail.com>", content);
-            Assert.Contains("Sender: Hisham Bin Ateya <hishamco_2007@hotmail.com>", content);
-        }
+            To = "info@oc.com",
+            Subject = "Test",
+            Body = "Test Message",
+            From = "My Name <youraddress@host.com>",
+        };
+        var content = await SendEmailAsync(message, "Your Name <youraddress@host.com>");
+
+        Assert.Contains("From: My Name <youraddress@host.com>", content);
+        Assert.Contains("Sender: Your Name <youraddress@host.com>", content);
+    }
 
-        [Fact]
-        public async Task SendEmail_UsesMultipleAuthors()
+    [Fact]
+    public async Task SendEmail_UsesCustomAuthorAndSender()
+    {
+        var message = new MailMessage
         {
-            var message = new MailMessage
-            {
-                To = "info@oc.com",
-                Subject = "Test",
-                Body = "Test Message",
-                From = "sebastienros@gmail.com,hishamco_2007@hotmail.com"
-            };
-            var content = await SendEmailAsync(message, "Hisham Bin Ateya <hishamco_2007@hotmail.com>");
-
-            Assert.Contains("From: sebastienros@gmail.com, hishamco_2007@hotmail.com", content);
-            Assert.Contains("Sender: Hisham Bin Ateya <hishamco_2007@hotmail.com>", content);
-        }
+            To = "info@oc.com",
+            Subject = "Test",
+            Body = "Test Message",
+            Sender = "Hisham Bin Ateya <hishamco_2007@hotmail.com>",
+        };
+        var content = await SendEmailAsync(message, "Sebastien Ros <sebastienros@gmail.com>");
+
+        Assert.Contains("From: Sebastien Ros <sebastienros@gmail.com>", content);
+        Assert.Contains("Sender: Hisham Bin Ateya <hishamco_2007@hotmail.com>", content);
+    }
 
-        [Fact]
-        public async Task SendEmail_UsesReplyTo()
+    [Fact]
+    public async Task SendEmail_UsesMultipleAuthors()
+    {
+        var message = new MailMessage
         {
-            var message = new MailMessage
-            {
-                To = "Hisham Bin Ateya <hishamco_2007@hotmail.com>",
-                Subject = "Test",
-                Body = "Test Message",
-                From = "Hisham Bin Ateya <hishamco_2007@hotmail.com>",
-                ReplyTo = "Hisham Bin Ateya <hishamco_2007@yahoo.com>",
-            };
-            var content = await SendEmailAsync(message, "Your Name <youraddress@host.com>");
-
-            Assert.Contains("From: Hisham Bin Ateya <hishamco_2007@hotmail.com>", content);
-            Assert.Contains("Reply-To: Hisham Bin Ateya <hishamco_2007@yahoo.com>", content);
-        }
+            To = "info@oc.com",
+            Subject = "Test",
+            Body = "Test Message",
+            From = "sebastienros@gmail.com,hishamco_2007@hotmail.com"
+        };
+        var content = await SendEmailAsync(message, "Hisham Bin Ateya <hishamco_2007@hotmail.com>");
+
+        Assert.Contains("From: sebastienros@gmail.com, hishamco_2007@hotmail.com", content);
+        Assert.Contains("Sender: Hisham Bin Ateya <hishamco_2007@hotmail.com>", content);
+    }
 
-        [Fact]
-        public async Task ReplyTo_ShouldHaveAuthors_IfNotSet()
+    [Fact]
+    public async Task SendEmail_UsesReplyTo()
+    {
+        var message = new MailMessage
         {
-            var message = new MailMessage
-            {
-                To = "info@oc.com",
-                Subject = "Test",
-                Body = "Test Message",
-                From = "Sebastien Ros <sebastienros@gmail.com>"
-            };
-            var content = await SendEmailAsync(message, "Your Name <youraddress@host.com>");
-
-            Assert.Contains("From: Sebastien Ros <sebastienros@gmail.com>", content);
-            Assert.Contains("Reply-To: Sebastien Ros <sebastienros@gmail.com>", content);
-        }
+            To = "Hisham Bin Ateya <hishamco_2007@hotmail.com>",
+            Subject = "Test",
+            Body = "Test Message",
+            From = "Hisham Bin Ateya <hishamco_2007@hotmail.com>",
+            ReplyTo = "Hisham Bin Ateya <hishamco_2007@yahoo.com>",
+        };
+        var content = await SendEmailAsync(message, "Your Name <youraddress@host.com>");
+
+        Assert.Contains("From: Hisham Bin Ateya <hishamco_2007@hotmail.com>", content);
+        Assert.Contains("Reply-To: Hisham Bin Ateya <hishamco_2007@yahoo.com>", content);
+    }
 
-        [Theory]
-        [InlineData("me <mailbox@domain.com>", "me", "mailbox@domain.com")]
-        [InlineData("me<mailbox@domain.com>", "me", "mailbox@domain.com")]
-        [InlineData("me     <mailbox@domain.com>", "me", "mailbox@domain.com")]
-        [InlineData("<mailbox@domain.com>", "", "mailbox@domain.com")]
-        [InlineData("mailbox@domain.com", "", "mailbox@domain.com")]
-        [InlineData("(comment)mailbox(comment)@(comment)domain.com(me) ", "me", "mailbox@domain.com")]
-        [InlineData("Sébastien <sébastien@domain.com>", "Sébastien", "sébastien@domain.com")]
-        public void MailBoxAddress_ShouldParseEmail(string text, string name, string address)
+    [Fact]
+    public async Task ReplyTo_ShouldHaveAuthors_IfNotSet()
+    {
+        var message = new MailMessage
         {
-            Assert.True(MailboxAddress.TryParse(text, out var mailboxAddress));
-            Assert.Equal(name, mailboxAddress.Name);
-            Assert.Equal(address, mailboxAddress.Address);
-        }
+            To = "info@oc.com",
+            Subject = "Test",
+            Body = "Test Message",
+            From = "Sebastien Ros <sebastienros@gmail.com>"
+        };
+        var content = await SendEmailAsync(message, "Your Name <youraddress@host.com>");
+
+        Assert.Contains("From: Sebastien Ros <sebastienros@gmail.com>", content);
+        Assert.Contains("Reply-To: Sebastien Ros <sebastienros@gmail.com>", content);
+    }
+
+    [Theory]
+    [InlineData("me <mailbox@domain.com>", "me", "mailbox@domain.com")]
+    [InlineData("me<mailbox@domain.com>", "me", "mailbox@domain.com")]
+    [InlineData("me     <mailbox@domain.com>", "me", "mailbox@domain.com")]
+    [InlineData("<mailbox@domain.com>", "", "mailbox@domain.com")]
+    [InlineData("mailbox@domain.com", "", "mailbox@domain.com")]
+    [InlineData("(comment)mailbox(comment)@(comment)domain.com(me) ", "me", "mailbox@domain.com")]
+    [InlineData("Sébastien <sébastien@domain.com>", "Sébastien", "sébastien@domain.com")]
+    public void MailBoxAddress_ShouldParseEmail(string text, string name, string address)
+    {
+        Assert.True(MailboxAddress.TryParse(text, out var mailboxAddress));
+        Assert.Equal(name, mailboxAddress.Name);
+        Assert.Equal(address, mailboxAddress.Address);
+    }
 
-        [Fact]
-        public async Task SendEmail_WithoutToAndCcAndBccHeaders_ShouldThrowsException()
+    [Fact]
+    public async Task SendEmail_WithoutToAndCcAndBccHeaders_ShouldThrowsException()
+    {
+        // Arrange
+        var message = new MailMessage
         {
-            // Arrange
-            var message = new MailMessage
-            {
-                Subject = "Test",
-                Body = "Test Message"
-            };
+            Subject = "Test",
+            Body = "Test Message"
+        };
 
-            var options = new SmtpOptions
-            {
-                DeliveryMethod = SmtpDeliveryMethod.SpecifiedPickupDirectory
-            };
+        var options = new SmtpOptions
+        {
+            DeliveryMethod = SmtpDeliveryMethod.SpecifiedPickupDirectory
+        };
 
-            var smtp = CreateSmtpService(options);
+        var smtp = CreateSmtpService(options);
 
-            // Act
-            var result = await smtp.SendAsync(message);
+        // Act
+        var result = await smtp.SendAsync(message);
 
-            // Assert
-            Assert.True(result.Errors.Any());
-        }
+        // Assert
+        Assert.True(result.Errors.Any());
+    }
 
-        [Fact]
-        public async Task SendOfflineEmailHasNoResponse()
+    [Fact]
+    public async Task SendOfflineEmailHasNoResponse()
+    {
+        // Arrange
+        var message = new MailMessage
         {
-            // Arrange
-            var message = new MailMessage
-            {
-                To = "info@oc.com",
-                Subject = "Test",
-                Body = "Test Message"
-            };
-            var settings = new SmtpOptions
-            {
-                DeliveryMethod = SmtpDeliveryMethod.SpecifiedPickupDirectory
-            };
-
-            var smtp = CreateSmtpService(settings);
-
-            // Act
-            var result = await smtp.SendAsync(message);
-
-            // Assert
-            Assert.Null(result.Response);
-        }
-
-        private static async Task<string> SendEmailAsync(MailMessage message, string defaultSender = null)
+            To = "info@oc.com",
+            Subject = "Test",
+            Body = "Test Message"
+        };
+        var settings = new SmtpOptions
         {
-            var pickupDirectoryPath = Path.Combine(Directory.GetCurrentDirectory(), "Email");
+            DeliveryMethod = SmtpDeliveryMethod.SpecifiedPickupDirectory
+        };
 
-            if (Directory.Exists(pickupDirectoryPath))
-            {
-                var directory = new DirectoryInfo(pickupDirectoryPath);
-                directory.GetFiles().ToList().ForEach(f => f.Delete());
-            }
+        var smtp = CreateSmtpService(settings);
 
-            Directory.CreateDirectory(pickupDirectoryPath);
+        // Act
+        var result = await smtp.SendAsync(message);
 
-            var options = new SmtpOptions
-            {
-                DefaultSender = defaultSender,
-                DeliveryMethod = SmtpDeliveryMethod.SpecifiedPickupDirectory,
-                PickupDirectoryLocation = pickupDirectoryPath,
-                IsEnabled = true,
-            };
-            var smtp = CreateSmtpService(options);
+        // Assert
+        Assert.Null(result.Response);
+    }
 
-            var result = await smtp.SendAsync(message);
+    private static async Task<string> SendEmailAsync(MailMessage message, string defaultSender = null)
+    {
+        var pickupDirectoryPath = Path.Combine(Directory.GetCurrentDirectory(), "Email");
 
-            Assert.True(result.Succeeded);
+        if (Directory.Exists(pickupDirectoryPath))
+        {
+            var directory = new DirectoryInfo(pickupDirectoryPath);
+            directory.GetFiles().ToList().ForEach(f => f.Delete());
+        }
 
-            var file = new DirectoryInfo(pickupDirectoryPath).GetFiles().FirstOrDefault();
+        Directory.CreateDirectory(pickupDirectoryPath);
 
-            Assert.NotNull(file);
+        var options = new SmtpOptions
+        {
+            DefaultSender = defaultSender,
+            DeliveryMethod = SmtpDeliveryMethod.SpecifiedPickupDirectory,
+            PickupDirectoryLocation = pickupDirectoryPath,
+            IsEnabled = true,
+        };
+        var smtp = CreateSmtpService(options);
 
-            var content = File.ReadAllText(file.FullName);
+        var result = await smtp.SendAsync(message);
 
-            return content;
-        }
+        Assert.True(result.Succeeded);
 
-        private static SmtpEmailProvider CreateSmtpService(SmtpOptions smtpOptions)
-        {
-            var options = new Mock<IOptions<SmtpOptions>>();
-            options.Setup(o => o.Value)
-                .Returns(smtpOptions);
+        var file = new DirectoryInfo(pickupDirectoryPath).GetFiles().FirstOrDefault();
 
-            var logger = new Mock<ILogger<SmtpEmailProvider>>();
-            var localizer = new Mock<IStringLocalizer<SmtpEmailProvider>>();
-            var emailValidator = new Mock<IEmailAddressValidator>();
+        Assert.NotNull(file);
 
-            emailValidator.Setup(x => x.Validate(It.IsAny<string>()))
-                .Returns(true);
+        var content = File.ReadAllText(file.FullName);
 
-            var smtp = new SmtpEmailProvider(options.Object, emailValidator.Object, logger.Object, localizer.Object);
+        return content;
+    }
 
-            return smtp;
-        }
+    private static SmtpEmailProvider CreateSmtpService(SmtpOptions smtpOptions)
+    {
+        var options = new Mock<IOptions<SmtpOptions>>();
+        options.Setup(o => o.Value)
+            .Returns(smtpOptions);
+
+        var logger = new Mock<ILogger<SmtpEmailProvider>>();
+        var localizer = new Mock<IStringLocalizer<SmtpEmailProvider>>();
+        var emailValidator = new Mock<IEmailAddressValidator>();
+
+        emailValidator.Setup(x => x.Validate(It.IsAny<string>()))
+            .Returns(true);
+
+        var smtp = new SmtpEmailProvider(options.Object, emailValidator.Object, logger.Object, localizer.Object);
+
+        return smtp;
     }
 }
diff --git a/test/OrchardCore.Tests/Extensions/ExtensionManagerTests.cs b/test/OrchardCore.Tests/Extensions/ExtensionManagerTests.cs
index d8d589829c5..a367db4650c 100644
--- a/test/OrchardCore.Tests/Extensions/ExtensionManagerTests.cs
+++ b/test/OrchardCore.Tests/Extensions/ExtensionManagerTests.cs
@@ -7,293 +7,292 @@
 using OrchardCore.Modules;
 using OrchardCore.Tests.Stubs;
 
-namespace OrchardCore.Tests.Extensions
+namespace OrchardCore.Tests.Extensions;
+
+public class ExtensionManagerTests
 {
-    public class ExtensionManagerTests
-    {
-        private static readonly IHostEnvironment _hostingEnvironment
-            = new StubHostingEnvironment();
+    private static readonly IHostEnvironment _hostingEnvironment
+        = new StubHostingEnvironment();
+
+    private static readonly IApplicationContext _applicationContext
+        = new ModularApplicationContext(_hostingEnvironment, [new ModuleNamesProvider()]);
 
-        private static readonly IApplicationContext _applicationContext
-            = new ModularApplicationContext(_hostingEnvironment, [new ModuleNamesProvider()]);
+    private static readonly IFeaturesProvider _moduleFeatureProvider =
+        new FeaturesProvider(new[] { new ThemeFeatureBuilderEvents() });
 
-        private static readonly IFeaturesProvider _moduleFeatureProvider =
-            new FeaturesProvider(new[] { new ThemeFeatureBuilderEvents() });
+    private static readonly IFeaturesProvider _themeFeatureProvider =
+        new FeaturesProvider(new[] { new ThemeFeatureBuilderEvents() });
 
-        private static readonly IFeaturesProvider _themeFeatureProvider =
-            new FeaturesProvider(new[] { new ThemeFeatureBuilderEvents() });
+    private readonly ExtensionManager _moduleScopedExtensionManager;
+    private readonly ExtensionManager _themeScopedExtensionManager;
+    private readonly ExtensionManager _moduleThemeScopedExtensionManager;
 
-        private readonly ExtensionManager _moduleScopedExtensionManager;
-        private readonly ExtensionManager _themeScopedExtensionManager;
-        private readonly ExtensionManager _moduleThemeScopedExtensionManager;
-        
-        private readonly TypeFeatureProvider _moduleScopedTypeFeatureProvider = new TypeFeatureProvider();
+    private readonly TypeFeatureProvider _moduleScopedTypeFeatureProvider = new TypeFeatureProvider();
+
+    public ExtensionManagerTests()
+    {
+        _moduleScopedExtensionManager = CreateExtensionManager(
+            [new ExtensionDependencyStrategy()],
+            [new ExtensionPriorityStrategy()],
+            _moduleScopedTypeFeatureProvider,
+            _moduleFeatureProvider
+            );
+
+        _themeScopedExtensionManager = CreateExtensionManager(
+            [new ExtensionDependencyStrategy()],
+            [new ExtensionPriorityStrategy()],
+            new TypeFeatureProvider(),
+            _themeFeatureProvider
+            );
+
+        _moduleThemeScopedExtensionManager = CreateExtensionManager(
+            [new ExtensionDependencyStrategy(), new ThemeExtensionDependencyStrategy()],
+            [new ExtensionPriorityStrategy()],
+            new TypeFeatureProvider(),
+            _themeFeatureProvider
+            );
+    }
 
-        public ExtensionManagerTests()
+    private sealed class ModuleNamesProvider : IModuleNamesProvider
+    {
+        private readonly string[] _moduleNames;
+
+        public ModuleNamesProvider()
         {
-            _moduleScopedExtensionManager = CreateExtensionManager(
-                [new ExtensionDependencyStrategy()],
-                [new ExtensionPriorityStrategy()],
-                _moduleScopedTypeFeatureProvider,
-                _moduleFeatureProvider
-                );
-
-            _themeScopedExtensionManager = CreateExtensionManager(
-                [new ExtensionDependencyStrategy()],
-                [new ExtensionPriorityStrategy()],
-                new TypeFeatureProvider(),
-                _themeFeatureProvider
-                );
-
-            _moduleThemeScopedExtensionManager = CreateExtensionManager(
-                [new ExtensionDependencyStrategy(), new ThemeExtensionDependencyStrategy()],
-                [new ExtensionPriorityStrategy()],
-                new TypeFeatureProvider(),
-                _themeFeatureProvider
-                );
+            _moduleNames =
+            [
+                "BaseThemeSample",
+                "BaseThemeSample2",
+                "DerivedThemeSample",
+                "DerivedThemeSample2",
+                "ModuleSample"
+            ];
         }
 
-        private sealed class ModuleNamesProvider : IModuleNamesProvider
+        public IEnumerable<string> GetModuleNames()
         {
-            private readonly string[] _moduleNames;
-
-            public ModuleNamesProvider()
-            {
-                _moduleNames =
-                [
-                    "BaseThemeSample",
-                    "BaseThemeSample2",
-                    "DerivedThemeSample",
-                    "DerivedThemeSample2",
-                    "ModuleSample"
-                ];
-            }
-
-            public IEnumerable<string> GetModuleNames()
-            {
-                return _moduleNames;
-            }
+            return _moduleNames;
         }
+    }
 
-        [Fact]
-        public void ShouldReturnExtension()
-        {
-            var extensions = _moduleThemeScopedExtensionManager.GetExtensions()
-                .Where(e => e.Manifest.ModuleInfo.Category == "Test");
+    [Fact]
+    public void ShouldReturnExtension()
+    {
+        var extensions = _moduleThemeScopedExtensionManager.GetExtensions()
+            .Where(e => e.Manifest.ModuleInfo.Category == "Test");
 
-            Assert.Equal(5, extensions.Count());
-        }
+        Assert.Equal(5, extensions.Count());
+    }
 
-        [Fact]
-        public void ShouldReturnAllDependenciesIncludingFeatureForAGivenFeatureOrdered()
-        {
-            var features = _moduleScopedExtensionManager.GetFeatureDependencies("Sample3");
+    [Fact]
+    public void ShouldReturnAllDependenciesIncludingFeatureForAGivenFeatureOrdered()
+    {
+        var features = _moduleScopedExtensionManager.GetFeatureDependencies("Sample3");
 
-            Assert.Equal(3, features.Count());
-            Assert.Equal("Sample1", features.ElementAt(0).Id);
-            Assert.Equal("Sample2", features.ElementAt(1).Id);
-            Assert.Equal("Sample3", features.ElementAt(2).Id);
-        }
+        Assert.Equal(3, features.Count());
+        Assert.Equal("Sample1", features.ElementAt(0).Id);
+        Assert.Equal("Sample2", features.ElementAt(1).Id);
+        Assert.Equal("Sample3", features.ElementAt(2).Id);
+    }
 
-        [Fact]
-        public void ShouldNotReturnFeaturesNotDependentOn()
-        {
-            var features = _moduleScopedExtensionManager.GetFeatureDependencies("Sample2");
+    [Fact]
+    public void ShouldNotReturnFeaturesNotDependentOn()
+    {
+        var features = _moduleScopedExtensionManager.GetFeatureDependencies("Sample2");
 
-            Assert.Equal(2, features.Count());
-            Assert.Equal("Sample1", features.ElementAt(0).Id);
-            Assert.Equal("Sample2", features.ElementAt(1).Id);
-        }
+        Assert.Equal(2, features.Count());
+        Assert.Equal("Sample1", features.ElementAt(0).Id);
+        Assert.Equal("Sample2", features.ElementAt(1).Id);
+    }
 
-        [Fact]
-        public void GetDependentFeaturesShouldReturnAllFeaturesThatHaveADependencyOnAFeature()
-        {
-            var features = _moduleScopedExtensionManager.GetDependentFeatures("Sample1");
+    [Fact]
+    public void GetDependentFeaturesShouldReturnAllFeaturesThatHaveADependencyOnAFeature()
+    {
+        var features = _moduleScopedExtensionManager.GetDependentFeatures("Sample1");
 
-            Assert.Equal(4, features.Count());
-            Assert.Equal("Sample1", features.ElementAt(0).Id);
-            Assert.Equal("Sample2", features.ElementAt(1).Id);
-            Assert.Equal("Sample3", features.ElementAt(2).Id);
-            Assert.Equal("Sample4", features.ElementAt(3).Id);
-        }
+        Assert.Equal(4, features.Count());
+        Assert.Equal("Sample1", features.ElementAt(0).Id);
+        Assert.Equal("Sample2", features.ElementAt(1).Id);
+        Assert.Equal("Sample3", features.ElementAt(2).Id);
+        Assert.Equal("Sample4", features.ElementAt(3).Id);
+    }
 
-        [Fact]
-        public void GetFeaturesShouldReturnAllFeaturesOrderedByDependency()
-        {
-            var features = _moduleScopedExtensionManager.GetFeatures()
-                .Where(f => f.Category == "Test" && !f.IsTheme());
-
-            Assert.Equal(4, features.Count());
-            Assert.Equal("Sample1", features.ElementAt(0).Id);
-            Assert.Equal("Sample2", features.ElementAt(1).Id);
-            Assert.Equal("Sample3", features.ElementAt(2).Id);
-            Assert.Equal("Sample4", features.ElementAt(3).Id);
-        }
+    [Fact]
+    public void GetFeaturesShouldReturnAllFeaturesOrderedByDependency()
+    {
+        var features = _moduleScopedExtensionManager.GetFeatures()
+            .Where(f => f.Category == "Test" && !f.IsTheme());
+
+        Assert.Equal(4, features.Count());
+        Assert.Equal("Sample1", features.ElementAt(0).Id);
+        Assert.Equal("Sample2", features.ElementAt(1).Id);
+        Assert.Equal("Sample3", features.ElementAt(2).Id);
+        Assert.Equal("Sample4", features.ElementAt(3).Id);
+    }
 
-        [Fact]
-        public void GetFeaturesWithAIdShouldReturnThatFeatureWithDependenciesOrdered()
-        {
-            var features = _moduleScopedExtensionManager.GetFeatures(["Sample2"]);
+    [Fact]
+    public void GetFeaturesWithAIdShouldReturnThatFeatureWithDependenciesOrdered()
+    {
+        var features = _moduleScopedExtensionManager.GetFeatures(["Sample2"]);
 
-            Assert.Equal(2, features.Count());
-            Assert.Equal("Sample1", features.ElementAt(0).Id);
-            Assert.Equal("Sample2", features.ElementAt(1).Id);
-        }
+        Assert.Equal(2, features.Count());
+        Assert.Equal("Sample1", features.ElementAt(0).Id);
+        Assert.Equal("Sample2", features.ElementAt(1).Id);
+    }
 
-        [Fact]
-        public void GetFeaturesWithAIdShouldReturnThatFeatureWithDependenciesOrderedWithNoDuplicates()
-        {
-            var features = _moduleScopedExtensionManager.GetFeatures(["Sample2", "Sample3"]);
+    [Fact]
+    public void GetFeaturesWithAIdShouldReturnThatFeatureWithDependenciesOrderedWithNoDuplicates()
+    {
+        var features = _moduleScopedExtensionManager.GetFeatures(["Sample2", "Sample3"]);
 
-            Assert.Equal(3, features.Count());
-            Assert.Equal("Sample1", features.ElementAt(0).Id);
-            Assert.Equal("Sample2", features.ElementAt(1).Id);
-            Assert.Equal("Sample3", features.ElementAt(2).Id);
-        }
+        Assert.Equal(3, features.Count());
+        Assert.Equal("Sample1", features.ElementAt(0).Id);
+        Assert.Equal("Sample2", features.ElementAt(1).Id);
+        Assert.Equal("Sample3", features.ElementAt(2).Id);
+    }
 
-        [Fact]
-        public void GetFeaturesWithAIdShouldNotReturnFeaturesTheHaveADependencyOutsideOfGraph()
-        {
-            var features = _moduleScopedExtensionManager.GetFeatures(["Sample4"]);
+    [Fact]
+    public void GetFeaturesWithAIdShouldNotReturnFeaturesTheHaveADependencyOutsideOfGraph()
+    {
+        var features = _moduleScopedExtensionManager.GetFeatures(["Sample4"]);
 
-            Assert.Equal(3, features.Count());
-            Assert.Equal("Sample1", features.ElementAt(0).Id);
-            Assert.Equal("Sample2", features.ElementAt(1).Id);
-            Assert.Equal("Sample4", features.ElementAt(2).Id);
-        }
+        Assert.Equal(3, features.Count());
+        Assert.Equal("Sample1", features.ElementAt(0).Id);
+        Assert.Equal("Sample2", features.ElementAt(1).Id);
+        Assert.Equal("Sample4", features.ElementAt(2).Id);
+    }
 
-        /* Theme Base Theme Dependencies */
+    /* Theme Base Theme Dependencies */
 
-        [Fact]
-        public void GetFeaturesShouldReturnCorrectThemeHierarchy()
-        {
-            var features = _themeScopedExtensionManager.GetFeatures(["DerivedThemeSample"]);
+    [Fact]
+    public void GetFeaturesShouldReturnCorrectThemeHierarchy()
+    {
+        var features = _themeScopedExtensionManager.GetFeatures(["DerivedThemeSample"]);
 
-            Assert.Equal(2, features.Count());
-            Assert.Equal("BaseThemeSample", features.ElementAt(0).Id);
-            Assert.Equal("DerivedThemeSample", features.ElementAt(1).Id);
-        }
+        Assert.Equal(2, features.Count());
+        Assert.Equal("BaseThemeSample", features.ElementAt(0).Id);
+        Assert.Equal("DerivedThemeSample", features.ElementAt(1).Id);
+    }
 
-        /* Theme and Module Dependencies */
+    /* Theme and Module Dependencies */
 
-        [Fact]
-        public void GetFeaturesShouldReturnBothThemesAndModules()
-        {
-            var features = _moduleThemeScopedExtensionManager.GetFeatures()
-                .Where(f => f.Category == "Test");
+    [Fact]
+    public void GetFeaturesShouldReturnBothThemesAndModules()
+    {
+        var features = _moduleThemeScopedExtensionManager.GetFeatures()
+            .Where(f => f.Category == "Test");
 
-            Assert.Equal(8, features.Count());
-        }
+        Assert.Equal(8, features.Count());
+    }
 
-        [Fact]
-        public void GetFeaturesShouldReturnThemesAfterModules()
-        {
-            var features = _moduleThemeScopedExtensionManager.GetFeatures()
-                .Where(f => f.Category == "Test");
-
-            Assert.Equal("Sample1", features.ElementAt(0).Id);
-            Assert.Equal("Sample2", features.ElementAt(1).Id);
-            Assert.Equal("Sample3", features.ElementAt(2).Id);
-            Assert.Equal("Sample4", features.ElementAt(3).Id);
-            Assert.Equal("BaseThemeSample", features.ElementAt(4).Id);
-            Assert.Equal("BaseThemeSample2", features.ElementAt(5).Id);
-            Assert.Equal("DerivedThemeSample", features.ElementAt(6).Id);
-            Assert.Equal("DerivedThemeSample2", features.ElementAt(7).Id);
-        }
+    [Fact]
+    public void GetFeaturesShouldReturnThemesAfterModules()
+    {
+        var features = _moduleThemeScopedExtensionManager.GetFeatures()
+            .Where(f => f.Category == "Test");
+
+        Assert.Equal("Sample1", features.ElementAt(0).Id);
+        Assert.Equal("Sample2", features.ElementAt(1).Id);
+        Assert.Equal("Sample3", features.ElementAt(2).Id);
+        Assert.Equal("Sample4", features.ElementAt(3).Id);
+        Assert.Equal("BaseThemeSample", features.ElementAt(4).Id);
+        Assert.Equal("BaseThemeSample2", features.ElementAt(5).Id);
+        Assert.Equal("DerivedThemeSample", features.ElementAt(6).Id);
+        Assert.Equal("DerivedThemeSample2", features.ElementAt(7).Id);
+    }
 
-        [Fact]
-        public void GetFeaturesShouldReturnThemesAfterModulesWhenRequestingBoth()
-        {
-            var features = _moduleThemeScopedExtensionManager.GetFeatures(["DerivedThemeSample", "Sample3"]);
+    [Fact]
+    public void GetFeaturesShouldReturnThemesAfterModulesWhenRequestingBoth()
+    {
+        var features = _moduleThemeScopedExtensionManager.GetFeatures(["DerivedThemeSample", "Sample3"]);
 
-            Assert.Equal("Sample1", features.ElementAt(0).Id);
-            Assert.Equal("Sample2", features.ElementAt(1).Id);
-            Assert.Equal("Sample3", features.ElementAt(2).Id);
-            Assert.Equal("BaseThemeSample", features.ElementAt(3).Id);
-            Assert.Equal("DerivedThemeSample", features.ElementAt(4).Id);
-        }
+        Assert.Equal("Sample1", features.ElementAt(0).Id);
+        Assert.Equal("Sample2", features.ElementAt(1).Id);
+        Assert.Equal("Sample3", features.ElementAt(2).Id);
+        Assert.Equal("BaseThemeSample", features.ElementAt(3).Id);
+        Assert.Equal("DerivedThemeSample", features.ElementAt(4).Id);
+    }
 
-        [Fact]
-        public void ShouldReturnNotFoundExtensionInfoWhenNotFound()
-        {
-            var extension = _moduleThemeScopedExtensionManager.GetExtension("NotFound");
+    [Fact]
+    public void ShouldReturnNotFoundExtensionInfoWhenNotFound()
+    {
+        var extension = _moduleThemeScopedExtensionManager.GetExtension("NotFound");
 
-            Assert.False(extension.Exists);
-        }
+        Assert.False(extension.Exists);
+    }
+
+    /* The extension manager must populate the ITypeFeatureProvider correctly */
+
+    [Fact]
+    public void TypeFeatureProviderIsPopulatedWithComponentTypes()
+    {
+        var feature = _moduleScopedExtensionManager.GetFeatures(["Sample1"]).First();
+        var types = _moduleScopedTypeFeatureProvider.GetTypesForFeature(feature);
+
+        Assert.Equal(2, types.Count());
+        Assert.Contains(typeof(Sample1Startup), types);
+        Assert.Contains(typeof(FeatureIndependentStartup), types);
+    }
 
-        /* The extension manager must populate the ITypeFeatureProvider correctly */
+    [Fact]
+    public void TypeFeatureProviderTypeMustBeMappedToAllFeatures()
+    {
+        // Types in modules that have no feature that matches the extension ID must be mapped to all features.
+        var features = _moduleScopedExtensionManager.GetFeatures(["Sample1", "Sample2", "Sample3", "Sample4"]);
 
-        [Fact]
-        public void TypeFeatureProviderIsPopulatedWithComponentTypes()
+        foreach (var feature in features)
         {
-            var feature = _moduleScopedExtensionManager.GetFeatures(["Sample1"]).First();
             var types = _moduleScopedTypeFeatureProvider.GetTypesForFeature(feature);
 
-            Assert.Equal(2, types.Count());
-            Assert.Contains(typeof(Sample1Startup), types);
             Assert.Contains(typeof(FeatureIndependentStartup), types);
         }
+    }
 
-        [Fact]
-        public void TypeFeatureProviderTypeMustBeMappedToAllFeatures()
-        {
-            // Types in modules that have no feature that matches the extension ID must be mapped to all features.
-            var features = _moduleScopedExtensionManager.GetFeatures(["Sample1", "Sample2", "Sample3", "Sample4"]);
+    [Fact]
+    public void TypeFeatureProviderTypeMustBeMappedToExtensionFeature()
+    {
+        // Types in modules that have a feature that matches the extension ID must be mapped to that feature.
+        var feature = _moduleScopedExtensionManager.GetFeatures(["BaseThemeSample"]).First();
+        var types = _moduleScopedTypeFeatureProvider.GetTypesForFeature(feature);
 
-            foreach (var feature in features)
-            {
-                var types = _moduleScopedTypeFeatureProvider.GetTypesForFeature(feature);
+        Assert.Equal(2, types.Count());
+        Assert.Contains(typeof(BaseThemeSampleStartup), types);
+        Assert.Contains(typeof(BaseThemeFeatureIndependentStartup), types);
+    }
 
-                Assert.Contains(typeof(FeatureIndependentStartup), types);
-            }
-        }
+    [Fact]
+    public void TypeFeatureProviderTypeMustBeSkipped()
+    {
+        var feature = _moduleScopedExtensionManager.GetFeatures(["Sample2"]).First();
+        var types = _moduleScopedTypeFeatureProvider.GetTypesForFeature(feature);
 
-        [Fact]
-        public void TypeFeatureProviderTypeMustBeMappedToExtensionFeature()
-        {
-            // Types in modules that have a feature that matches the extension ID must be mapped to that feature.
-            var feature = _moduleScopedExtensionManager.GetFeatures(["BaseThemeSample"]).First();
-            var types = _moduleScopedTypeFeatureProvider.GetTypesForFeature(feature);
+        Assert.DoesNotContain(typeof(SkippedDependentType), types);
+    }
 
-            Assert.Equal(2, types.Count());
-            Assert.Contains(typeof(BaseThemeSampleStartup), types);
-            Assert.Contains(typeof(BaseThemeFeatureIndependentStartup), types);
-        }
+    private static ExtensionManager CreateExtensionManager(
+        IExtensionDependencyStrategy[] extensionDependencyStrategies,
+        IExtensionPriorityStrategy[] extensionPriorityStrategies,
+        ITypeFeatureProvider typeFeatureProvider,
+        IFeaturesProvider featuresProvider)
+    {
+        var services = new ServiceCollection();
+        services
+            .AddSingleton(_applicationContext)
+            .AddSingleton(typeFeatureProvider)
+            .AddSingleton(featuresProvider);
 
-        [Fact]
-        public void TypeFeatureProviderTypeMustBeSkipped()
+        foreach (var extensionDependencyStrategy in extensionDependencyStrategies)
         {
-            var feature = _moduleScopedExtensionManager.GetFeatures(["Sample2"]).First();
-            var types = _moduleScopedTypeFeatureProvider.GetTypesForFeature(feature);
-
-            Assert.DoesNotContain(typeof(SkippedDependentType), types);
+            services.AddSingleton(extensionDependencyStrategy);
         }
 
-        private static ExtensionManager CreateExtensionManager(
-            IExtensionDependencyStrategy[] extensionDependencyStrategies,
-            IExtensionPriorityStrategy[] extensionPriorityStrategies,
-            ITypeFeatureProvider typeFeatureProvider,
-            IFeaturesProvider featuresProvider)
+        foreach (var extensionPriorityStrategy in extensionPriorityStrategies)
         {
-            var services = new ServiceCollection();
-            services
-                .AddSingleton(_applicationContext)
-                .AddSingleton(typeFeatureProvider)
-                .AddSingleton(featuresProvider);
-
-            foreach (var extensionDependencyStrategy in extensionDependencyStrategies)
-            {
-                services.AddSingleton(extensionDependencyStrategy);
-            }
-
-            foreach (var extensionPriorityStrategy in extensionPriorityStrategies)
-            {
-                services.AddSingleton(extensionPriorityStrategy);
-            }
+            services.AddSingleton(extensionPriorityStrategy);
+        }
 
-            var serviceProvider = services.BuildServiceProvider();
+        var serviceProvider = services.BuildServiceProvider();
 
-            return new ExtensionManager(serviceProvider, new NullLogger<ExtensionManager>());
-        }
+        return new ExtensionManager(serviceProvider, new NullLogger<ExtensionManager>());
     }
 }
diff --git a/test/OrchardCore.Tests/Hosting/Console/CommandParserTests.cs b/test/OrchardCore.Tests/Hosting/Console/CommandParserTests.cs
index 47c054dd58e..9c755ff5a83 100644
--- a/test/OrchardCore.Tests/Hosting/Console/CommandParserTests.cs
+++ b/test/OrchardCore.Tests/Hosting/Console/CommandParserTests.cs
@@ -1,197 +1,196 @@
 using OrchardCore.Environment.Commands.Parameters;
 
-namespace OrchardCore.Tests.Hosting.Console
+namespace OrchardCore.Tests.Hosting.Console;
+
+public class CommandParserTests
 {
-    public class CommandParserTests
+    [Fact]
+    public void ParserUnderstandsSimpleArguments()
     {
-        [Fact]
-        public void ParserUnderstandsSimpleArguments()
-        {
-            // a b cdef
-            // => a
-            // => b
-            // => cdef
-            var result = new CommandParser().Parse("a b cdef").ToList();
-            Assert.NotNull(result);
-            Assert.Equal(3, result.Count);
-            Assert.Equal("a", result[0]);
-            Assert.Equal("b", result[1]);
-            Assert.Equal("cdef", result[2]);
-        }
+        // a b cdef
+        // => a
+        // => b
+        // => cdef
+        var result = new CommandParser().Parse("a b cdef").ToList();
+        Assert.NotNull(result);
+        Assert.Equal(3, result.Count);
+        Assert.Equal("a", result[0]);
+        Assert.Equal("b", result[1]);
+        Assert.Equal("cdef", result[2]);
+    }
 
-        [Fact]
-        public void ParserIgnoresExtraSpaces()
-        {
-            //  a    b    cdef
-            // => a
-            // => b
-            // => cdef
-            var result = new CommandParser().Parse("  a    b    cdef   ").ToList();
-            Assert.NotNull(result);
-            Assert.Equal(3, result.Count);
-            Assert.Equal("a", result[0]);
-            Assert.Equal("b", result[1]);
-            Assert.Equal("cdef", result[2]);
-        }
+    [Fact]
+    public void ParserIgnoresExtraSpaces()
+    {
+        //  a    b    cdef
+        // => a
+        // => b
+        // => cdef
+        var result = new CommandParser().Parse("  a    b    cdef   ").ToList();
+        Assert.NotNull(result);
+        Assert.Equal(3, result.Count);
+        Assert.Equal("a", result[0]);
+        Assert.Equal("b", result[1]);
+        Assert.Equal("cdef", result[2]);
+    }
 
-        [Fact]
-        public void ParserGroupsQuotedArguments()
-        {
-            // feature enable "a b cdef"
-            // => feature
-            // => enable
-            // => a b cdef
-            var result = new CommandParser().Parse("feature enable \"a b cdef\"").ToList();
-            Assert.NotNull(result);
-            Assert.Equal(3, result.Count);
-            Assert.Equal("feature", result[0]);
-            Assert.Equal("enable", result[1]);
-            Assert.Equal("a b cdef", result[2]);
-        }
+    [Fact]
+    public void ParserGroupsQuotedArguments()
+    {
+        // feature enable "a b cdef"
+        // => feature
+        // => enable
+        // => a b cdef
+        var result = new CommandParser().Parse("feature enable \"a b cdef\"").ToList();
+        Assert.NotNull(result);
+        Assert.Equal(3, result.Count);
+        Assert.Equal("feature", result[0]);
+        Assert.Equal("enable", result[1]);
+        Assert.Equal("a b cdef", result[2]);
+    }
 
-        [Fact]
-        public void ParserUnderstandsQuotesInsideArgument()
-        {
-            // feature enable /foo:"a b cdef"
-            // => feature
-            // => enable
-            // => /foo:a b cdef
-            var result = new CommandParser().Parse("feature enable /foo:\"a b cdef\"").ToList();
-            Assert.NotNull(result);
-            Assert.Equal(3, result.Count);
-            Assert.Equal("feature", result[0]);
-            Assert.Equal("enable", result[1]);
-            Assert.Equal("/foo:a b cdef", result[2]);
-        }
+    [Fact]
+    public void ParserUnderstandsQuotesInsideArgument()
+    {
+        // feature enable /foo:"a b cdef"
+        // => feature
+        // => enable
+        // => /foo:a b cdef
+        var result = new CommandParser().Parse("feature enable /foo:\"a b cdef\"").ToList();
+        Assert.NotNull(result);
+        Assert.Equal(3, result.Count);
+        Assert.Equal("feature", result[0]);
+        Assert.Equal("enable", result[1]);
+        Assert.Equal("/foo:a b cdef", result[2]);
+    }
 
-        [Fact]
-        public void ParserBackslashEscapesQuote()
-        {
-            // feature enable \"a b cdef\"
-            // => feature
-            // => enable
-            // => "a
-            // => b
-            // => cdef"
-            var result = new CommandParser().Parse("feature enable \\\"a b cdef\\\"").ToList();
-            Assert.NotNull(result);
-            Assert.Equal(5, result.Count);
-            Assert.Equal("feature", result[0]);
-            Assert.Equal("enable", result[1]);
-            Assert.Equal("\"a", result[2]);
-            Assert.Equal("b", result[3]);
-            Assert.Equal("cdef\"", result[4]);
-        }
+    [Fact]
+    public void ParserBackslashEscapesQuote()
+    {
+        // feature enable \"a b cdef\"
+        // => feature
+        // => enable
+        // => "a
+        // => b
+        // => cdef"
+        var result = new CommandParser().Parse("feature enable \\\"a b cdef\\\"").ToList();
+        Assert.NotNull(result);
+        Assert.Equal(5, result.Count);
+        Assert.Equal("feature", result[0]);
+        Assert.Equal("enable", result[1]);
+        Assert.Equal("\"a", result[2]);
+        Assert.Equal("b", result[3]);
+        Assert.Equal("cdef\"", result[4]);
+    }
 
-        [Fact]
-        public void ParserBackslashDoesnotEscapeBackslash()
-        {
-            // feature enable \\a
-            // => feature
-            // => enable
-            // => \\a
-            var result = new CommandParser().Parse("feature enable \\\\a").ToList();
-            Assert.NotNull(result);
-            Assert.Equal(3, result.Count);
-            Assert.Equal("feature", result[0]);
-            Assert.Equal("enable", result[1]);
-            Assert.Equal("\\\\a", result[2]);
-        }
+    [Fact]
+    public void ParserBackslashDoesnotEscapeBackslash()
+    {
+        // feature enable \\a
+        // => feature
+        // => enable
+        // => \\a
+        var result = new CommandParser().Parse("feature enable \\\\a").ToList();
+        Assert.NotNull(result);
+        Assert.Equal(3, result.Count);
+        Assert.Equal("feature", result[0]);
+        Assert.Equal("enable", result[1]);
+        Assert.Equal("\\\\a", result[2]);
+    }
 
-        [Fact]
-        public void ParserBackslashDoesnotEscapeOtherCharacters()
-        {
-            // feature enable \a
-            // => feature
-            // => enable
-            // => \a
-            var result = new CommandParser().Parse("feature enable \\a").ToList();
-            Assert.NotNull(result);
-            Assert.Equal(3, result.Count);
-            Assert.Equal("feature", result[0]);
-            Assert.Equal("enable", result[1]);
-            Assert.Equal("\\a", result[2]);
-        }
+    [Fact]
+    public void ParserBackslashDoesnotEscapeOtherCharacters()
+    {
+        // feature enable \a
+        // => feature
+        // => enable
+        // => \a
+        var result = new CommandParser().Parse("feature enable \\a").ToList();
+        Assert.NotNull(result);
+        Assert.Equal(3, result.Count);
+        Assert.Equal("feature", result[0]);
+        Assert.Equal("enable", result[1]);
+        Assert.Equal("\\a", result[2]);
+    }
 
-        [Fact]
-        public void ParserUnderstandsTrailingBackslash()
-        {
-            // feature enable \
-            // => feature
-            // => enable
-            // => \
-            var result = new CommandParser().Parse("feature enable \\").ToList();
-            Assert.NotNull(result);
-            Assert.Equal(3, result.Count);
-            Assert.Equal("feature", result[0]);
-            Assert.Equal("enable", result[1]);
-            Assert.Equal("\\", result[2]);
-        }
+    [Fact]
+    public void ParserUnderstandsTrailingBackslash()
+    {
+        // feature enable \
+        // => feature
+        // => enable
+        // => \
+        var result = new CommandParser().Parse("feature enable \\").ToList();
+        Assert.NotNull(result);
+        Assert.Equal(3, result.Count);
+        Assert.Equal("feature", result[0]);
+        Assert.Equal("enable", result[1]);
+        Assert.Equal("\\", result[2]);
+    }
 
-        [Fact]
-        public void ParserUnderstandsTrailingBackslash2()
-        {
-            // feature enable b\
-            // => feature
-            // => enable
-            // => b\
-            var result = new CommandParser().Parse("feature enable b\\").ToList();
-            Assert.NotNull(result);
-            Assert.Equal(3, result.Count);
-            Assert.Equal("feature", result[0]);
-            Assert.Equal("enable", result[1]);
-            Assert.Equal("b\\", result[2]);
-        }
+    [Fact]
+    public void ParserUnderstandsTrailingBackslash2()
+    {
+        // feature enable b\
+        // => feature
+        // => enable
+        // => b\
+        var result = new CommandParser().Parse("feature enable b\\").ToList();
+        Assert.NotNull(result);
+        Assert.Equal(3, result.Count);
+        Assert.Equal("feature", result[0]);
+        Assert.Equal("enable", result[1]);
+        Assert.Equal("b\\", result[2]);
+    }
 
-        [Fact]
-        public void ParserUnderstandsEmptyArgument()
-        {
-            // feature enable ""
-            // => feature
-            // => enable
-            // => <empty arg>
-            var result = new CommandParser().Parse("feature enable \"\"").ToList();
-            Assert.NotNull(result);
-            Assert.Equal(3, result.Count);
-            Assert.Equal("feature", result[0]);
-            Assert.Equal("enable", result[1]);
-            Assert.Equal("", result[2]);
-        }
+    [Fact]
+    public void ParserUnderstandsEmptyArgument()
+    {
+        // feature enable ""
+        // => feature
+        // => enable
+        // => <empty arg>
+        var result = new CommandParser().Parse("feature enable \"\"").ToList();
+        Assert.NotNull(result);
+        Assert.Equal(3, result.Count);
+        Assert.Equal("feature", result[0]);
+        Assert.Equal("enable", result[1]);
+        Assert.Equal("", result[2]);
+    }
 
-        [Fact]
-        public void ParserUnderstandsTrailingQuote()
-        {
-            // feature enable "
-            // => feature
-            // => enable
-            // => <empty arg>
-            var result = new CommandParser().Parse("feature enable \"").ToList();
-            Assert.NotNull(result);
-            Assert.Equal(3, result.Count);
-            Assert.Equal("feature", result[0]);
-            Assert.Equal("enable", result[1]);
-            Assert.Equal("", result[2]);
-        }
+    [Fact]
+    public void ParserUnderstandsTrailingQuote()
+    {
+        // feature enable "
+        // => feature
+        // => enable
+        // => <empty arg>
+        var result = new CommandParser().Parse("feature enable \"").ToList();
+        Assert.NotNull(result);
+        Assert.Equal(3, result.Count);
+        Assert.Equal("feature", result[0]);
+        Assert.Equal("enable", result[1]);
+        Assert.Equal("", result[2]);
+    }
 
-        [Fact]
-        public void ParserUnderstandsEmptyArgument2()
-        {
-            // "
-            // => <empty arg>
-            var result = new CommandParser().Parse("\"").ToList();
-            Assert.NotNull(result);
-            Assert.Single(result);
-            Assert.Equal("", result[0]);
-        }
-        [Fact]
-        public void ParserUnderstandsEmptyArgument3()
-        {
-            // ""
-            // => <empty arg>
-            var result = new CommandParser().Parse("\"\"").ToList();
-            Assert.NotNull(result);
-            Assert.Single(result);
-            Assert.Equal("", result[0]);
-        }
+    [Fact]
+    public void ParserUnderstandsEmptyArgument2()
+    {
+        // "
+        // => <empty arg>
+        var result = new CommandParser().Parse("\"").ToList();
+        Assert.NotNull(result);
+        Assert.Single(result);
+        Assert.Equal("", result[0]);
+    }
+    [Fact]
+    public void ParserUnderstandsEmptyArgument3()
+    {
+        // ""
+        // => <empty arg>
+        var result = new CommandParser().Parse("\"\"").ToList();
+        Assert.NotNull(result);
+        Assert.Single(result);
+        Assert.Equal("", result[0]);
     }
 }
diff --git a/test/OrchardCore.Tests/Html/HtmlSanitizerTests.cs b/test/OrchardCore.Tests/Html/HtmlSanitizerTests.cs
index 0568a9f3398..a515c09ff2a 100644
--- a/test/OrchardCore.Tests/Html/HtmlSanitizerTests.cs
+++ b/test/OrchardCore.Tests/Html/HtmlSanitizerTests.cs
@@ -1,69 +1,68 @@
 using OrchardCore.Infrastructure.Html;
 
-namespace OrchardCore.Tests.Html
+namespace OrchardCore.Tests.Html;
+
+public class HtmlSanitizerTests
 {
-    public class HtmlSanitizerTests
-    {
-        private static readonly HtmlSanitizerService _sanitizer = new(Options.Create(new HtmlSanitizerOptions()));
+    private static readonly HtmlSanitizerService _sanitizer = new(Options.Create(new HtmlSanitizerOptions()));
 
-        [Theory]
-        [InlineData("<script>alert('xss')</script><div onload=\"alert('xss')\">Test<img src=\"test.gif\" style=\"background-image: url(javascript:alert('xss')); margin: 10px\"></div>", "<div>Test<img src=\"test.gif\" style=\"margin: 10px\"></div>")]
-        [InlineData("<IMG SRC=javascript:alert(\"XSS\")>", @"<img>")]
-        [InlineData("<a href=\"javascript: alert('xss')\">Click me</a>", @"<a>Click me</a>")]
-        [InlineData("<a href=\"[locale 'en']javascript: alert('xss')[/locale]\">Click me</a>", @"<a>Click me</a>")]
-        public void ShouldSanitizeHTML(string html, string sanitized)
-        {
-            // Setup
-            var output = _sanitizer.Sanitize(html);
+    [Theory]
+    [InlineData("<script>alert('xss')</script><div onload=\"alert('xss')\">Test<img src=\"test.gif\" style=\"background-image: url(javascript:alert('xss')); margin: 10px\"></div>", "<div>Test<img src=\"test.gif\" style=\"margin: 10px\"></div>")]
+    [InlineData("<IMG SRC=javascript:alert(\"XSS\")>", @"<img>")]
+    [InlineData("<a href=\"javascript: alert('xss')\">Click me</a>", @"<a>Click me</a>")]
+    [InlineData("<a href=\"[locale 'en']javascript: alert('xss')[/locale]\">Click me</a>", @"<a>Click me</a>")]
+    public void ShouldSanitizeHTML(string html, string sanitized)
+    {
+        // Setup
+        var output = _sanitizer.Sanitize(html);
 
-            // Test
-            Assert.Equal(output, sanitized);
-        }
+        // Test
+        Assert.Equal(output, sanitized);
+    }
 
-        [Fact]
-        public void ShouldConfigureSanitizer()
+    [Fact]
+    public void ShouldConfigureSanitizer()
+    {
+        var services = new ServiceCollection();
+        services.AddOptions<HtmlSanitizerOptions>();
+        services.ConfigureHtmlSanitizer((sanitizer) =>
         {
-            var services = new ServiceCollection();
-            services.AddOptions<HtmlSanitizerOptions>();
-            services.ConfigureHtmlSanitizer((sanitizer) =>
-            {
-                sanitizer.AllowedAttributes.Add("class");
-            });
+            sanitizer.AllowedAttributes.Add("class");
+        });
 
-            services.AddScoped<IHtmlSanitizerService, HtmlSanitizerService>();
+        services.AddScoped<IHtmlSanitizerService, HtmlSanitizerService>();
 
-            var sanitizer = services.BuildServiceProvider().GetService<IHtmlSanitizerService>();
+        var sanitizer = services.BuildServiceProvider().GetService<IHtmlSanitizerService>();
 
-            var input = @"<a href=""bar"" class=""foo"">baz</a>";
-            var sanitized = sanitizer.Sanitize(input);
-            Assert.Equal(input, sanitized);
-        }
+        var input = @"<a href=""bar"" class=""foo"">baz</a>";
+        var sanitized = sanitizer.Sanitize(input);
+        Assert.Equal(input, sanitized);
+    }
 
-        [Fact]
-        public void ShouldReconfigureSanitizer()
+    [Fact]
+    public void ShouldReconfigureSanitizer()
+    {
+        // Setup. With defaults.
+        var services = new ServiceCollection();
+        services.AddOptions<HtmlSanitizerOptions>();
+        services.ConfigureHtmlSanitizer((sanitizer) =>
         {
-            // Setup. With defaults.
-            var services = new ServiceCollection();
-            services.AddOptions<HtmlSanitizerOptions>();
-            services.ConfigureHtmlSanitizer((sanitizer) =>
-            {
-                sanitizer.AllowedAttributes.Add("class");
-            });
+            sanitizer.AllowedAttributes.Add("class");
+        });
 
-            // Act. Reconfigure to remove defaults.
-            services.Configure<HtmlSanitizerOptions>(o =>
-            {
-                o.Configure.Clear();
-            });
+        // Act. Reconfigure to remove defaults.
+        services.Configure<HtmlSanitizerOptions>(o =>
+        {
+            o.Configure.Clear();
+        });
 
-            // Test.
-            services.AddScoped<IHtmlSanitizerService, HtmlSanitizerService>();
+        // Test.
+        services.AddScoped<IHtmlSanitizerService, HtmlSanitizerService>();
 
-            var sanitizer = services.BuildServiceProvider().GetService<IHtmlSanitizerService>();
+        var sanitizer = services.BuildServiceProvider().GetService<IHtmlSanitizerService>();
 
-            var input = @"<a href=""bar"" class=""foo"">baz</a>";
-            var sanitized = sanitizer.Sanitize(input);
-            Assert.Equal(@"<a href=""bar"">baz</a>", sanitized);
-        }
+        var input = @"<a href=""bar"" class=""foo"">baz</a>";
+        var sanitized = sanitizer.Sanitize(input);
+        Assert.Equal(@"<a href=""bar"">baz</a>", sanitized);
     }
 }
diff --git a/test/OrchardCore.Tests/Localization/CultureDictionaryTests.cs b/test/OrchardCore.Tests/Localization/CultureDictionaryTests.cs
index 939c638a0b7..e5e03b61f0c 100644
--- a/test/OrchardCore.Tests/Localization/CultureDictionaryTests.cs
+++ b/test/OrchardCore.Tests/Localization/CultureDictionaryTests.cs
@@ -1,79 +1,78 @@
 using OrchardCore.Localization;
 
-namespace OrchardCore.Tests.Localization
+namespace OrchardCore.Tests.Localization;
+
+public class CultureDictionaryTests
 {
-    public class CultureDictionaryTests
+    [Fact]
+    public void MergeAddsRecordToEmptyDictionary()
     {
-        [Fact]
-        public void MergeAddsRecordToEmptyDictionary()
-        {
-            var dictionary = new CultureDictionary("cs", PluralizationRule.Czech);
-            var record = new CultureDictionaryRecord("ball", "míč", "míče", "míčů");
+        var dictionary = new CultureDictionary("cs", PluralizationRule.Czech);
+        var record = new CultureDictionaryRecord("ball", "míč", "míče", "míčů");
 
-            dictionary.MergeTranslations(new[] { record });
+        dictionary.MergeTranslations(new[] { record });
 
-            Assert.Equal(dictionary.Translations[record.Key], record.Translations);
-        }
+        Assert.Equal(dictionary.Translations[record.Key], record.Translations);
+    }
 
-        [Fact]
-        public void MergeOverwritesTranslationsForSameKeys()
-        {
-            var dictionary = new CultureDictionary("cs", PluralizationRule.Czech);
-            var record = new CultureDictionaryRecord("ball", "míč", "míče", "míčů");
-            var record2 = new CultureDictionaryRecord("ball", "balón", "balóny", "balónů");
+    [Fact]
+    public void MergeOverwritesTranslationsForSameKeys()
+    {
+        var dictionary = new CultureDictionary("cs", PluralizationRule.Czech);
+        var record = new CultureDictionaryRecord("ball", "míč", "míče", "míčů");
+        var record2 = new CultureDictionaryRecord("ball", "balón", "balóny", "balónů");
 
-            dictionary.MergeTranslations(new[] { record });
-            dictionary.MergeTranslations(new[] { record2 });
+        dictionary.MergeTranslations(new[] { record });
+        dictionary.MergeTranslations(new[] { record2 });
 
-            Assert.Equal(dictionary.Translations[record.Key], record2.Translations);
-        }
+        Assert.Equal(dictionary.Translations[record.Key], record2.Translations);
+    }
 
-        [Fact]
-        public void IndexerReturnNullIfKeyDoesntExist()
-        {
-            var dictionary = new CultureDictionary("cs", PluralizationRule.Czech);
-            var key = new CultureDictionaryRecordKey { MessageId = "ball" };
-            var translation = dictionary[key];
+    [Fact]
+    public void IndexerReturnNullIfKeyDoesntExist()
+    {
+        var dictionary = new CultureDictionary("cs", PluralizationRule.Czech);
+        var key = new CultureDictionaryRecordKey { MessageId = "ball" };
+        var translation = dictionary[key];
 
-            Assert.Null(translation);
-        }
+        Assert.Null(translation);
+    }
 
-        [Fact]
-        public void IndexerThrowsPluralFormNotFoundExceptionIfSpecifiedPluralFormDoesntExist()
+    [Fact]
+    public void IndexerThrowsPluralFormNotFoundExceptionIfSpecifiedPluralFormDoesntExist()
+    {
+        // Arrange
+        var dictionary = new CultureDictionary("cs", PluralizationRule.Czech);
+        var record = new CultureDictionaryRecord("ball", "míč", "míče");
+        dictionary.MergeTranslations(new[] { record });
+
+        Assert.Throws<PluralFormNotFoundException>(() =>
         {
-            // Arrange
-            var dictionary = new CultureDictionary("cs", PluralizationRule.Czech);
-            var record = new CultureDictionaryRecord("ball", "míč", "míče");
-            dictionary.MergeTranslations(new[] { record });
+            var key = new CultureDictionaryRecordKey { MessageId = "ball" };
 
-            Assert.Throws<PluralFormNotFoundException>(() =>
-            {
-                var key = new CultureDictionaryRecordKey { MessageId = "ball" };
+            return dictionary[key, 5];
+        });
+    }
 
-                return dictionary[key, 5];
-            });
-        }
+    [Fact]
+    public void EnumerateCultureDictionary()
+    {
+        // Arrange
+        var dictionary = new CultureDictionary("ar", PluralizationRule.Arabic);
+        dictionary.MergeTranslations(
+        [
+            new("Hello", "مرحبا"),
+            new("Bye", "مع السلامة")
+        ]);
 
-        [Fact]
-        public void EnumerateCultureDictionary()
+        // Act & Assert
+        Assert.NotEmpty(dictionary);
+
+        foreach (var record in dictionary)
         {
-            // Arrange
-            var dictionary = new CultureDictionary("ar", PluralizationRule.Arabic);
-            dictionary.MergeTranslations(
-            [
-                new("Hello", "مرحبا"),
-                new("Bye", "مع السلامة")
-            ]);
-
-            // Act & Assert
-            Assert.NotEmpty(dictionary);
-
-            foreach (var record in dictionary)
-            {
-                Assert.Single(record.Translations);
-            }
-
-            Assert.Equal(2, dictionary.Count());
+            Assert.Single(record.Translations);
         }
+
+        Assert.Equal(2, dictionary.Count());
     }
 }
diff --git a/test/OrchardCore.Tests/Localization/CultureScopeTests.cs b/test/OrchardCore.Tests/Localization/CultureScopeTests.cs
index 748fa03cdd8..bd80bffca77 100644
--- a/test/OrchardCore.Tests/Localization/CultureScopeTests.cs
+++ b/test/OrchardCore.Tests/Localization/CultureScopeTests.cs
@@ -1,72 +1,71 @@
 using OrchardCore.Localization;
 
-namespace OrchardCore.Tests.Localization
+namespace OrchardCore.Tests.Localization;
+
+public class CultureScopeTests
 {
-    public class CultureScopeTests
+    [Fact]
+    public void CultureScopeSetsUICultureIfNotProvided()
     {
-        [Fact]
-        public void CultureScopeSetsUICultureIfNotProvided()
-        {
-            // Arrange
-            var culture = "ar-YE";
+        // Arrange
+        var culture = "ar-YE";
 
-            // Act
-            using var cultureScope = CultureScope.Create(culture);
+        // Act
+        using var cultureScope = CultureScope.Create(culture);
 
-            // Assert
-            Assert.Equal(culture, CultureInfo.CurrentCulture.Name);
-            Assert.Equal(culture, CultureInfo.CurrentUICulture.Name);
-        }
+        // Assert
+        Assert.Equal(culture, CultureInfo.CurrentCulture.Name);
+        Assert.Equal(culture, CultureInfo.CurrentUICulture.Name);
+    }
 
-        [Fact]
-        public void CultureScopeSetsBothCultureAndUICulture()
-        {
-            // Arrange
-            var culture = "ar";
-            var uiCulture = "ar-YE";
+    [Fact]
+    public void CultureScopeSetsBothCultureAndUICulture()
+    {
+        // Arrange
+        var culture = "ar";
+        var uiCulture = "ar-YE";
 
-            // Act
-            using var cultureScope = CultureScope.Create(culture, uiCulture);
+        // Act
+        using var cultureScope = CultureScope.Create(culture, uiCulture);
 
-            // Assert
-            Assert.Equal(culture, CultureInfo.CurrentCulture.Name);
-            Assert.Equal(uiCulture, CultureInfo.CurrentUICulture.Name);
-        }
+        // Assert
+        Assert.Equal(culture, CultureInfo.CurrentCulture.Name);
+        Assert.Equal(uiCulture, CultureInfo.CurrentUICulture.Name);
+    }
 
-        [Fact]
-        public void CultureScopeSetsOrginalCulturesAfterEndOfScope()
+    [Fact]
+    public void CultureScopeSetsOrginalCulturesAfterEndOfScope()
+    {
+        // Arrange
+        var culture = CultureInfo.CurrentCulture;
+        var uiCulture = CultureInfo.CurrentUICulture;
+
+        // Act
+        using (var cultureScope = CultureScope.Create("FR"))
         {
-            // Arrange
-            var culture = CultureInfo.CurrentCulture;
-            var uiCulture = CultureInfo.CurrentUICulture;
 
-            // Act
-            using (var cultureScope = CultureScope.Create("FR"))
-            {
+        }
 
-            }
+        // Assert
+        Assert.Equal(culture, CultureInfo.CurrentCulture);
+        Assert.Equal(uiCulture, CultureInfo.CurrentUICulture);
+    }
 
-            // Assert
-            Assert.Equal(culture, CultureInfo.CurrentCulture);
-            Assert.Equal(uiCulture, CultureInfo.CurrentUICulture);
-        }
+    [Fact]
+    public async Task CultureScopeSetsOrginalCulturesOnException()
+    {
+        // Arrange
+        var culture = CultureInfo.CurrentCulture;
+        var uiCulture = CultureInfo.CurrentUICulture;
 
-        [Fact]
-        public async Task CultureScopeSetsOrginalCulturesOnException()
+        // Act & Assert
+        await Assert.ThrowsAsync<Exception>(Task () =>
         {
-            // Arrange
-            var culture = CultureInfo.CurrentCulture;
-            var uiCulture = CultureInfo.CurrentUICulture;
+            using var cultureScope = CultureScope.Create("FR");
+            throw new Exception("Something goes wrong!!");
+        });
 
-            // Act & Assert
-            await Assert.ThrowsAsync<Exception>(Task () =>
-            {
-                using var cultureScope = CultureScope.Create("FR");
-                throw new Exception("Something goes wrong!!");
-            });
-
-            Assert.Equal(culture, CultureInfo.CurrentCulture);
-            Assert.Equal(uiCulture, CultureInfo.CurrentUICulture);
-        }
+        Assert.Equal(culture, CultureInfo.CurrentCulture);
+        Assert.Equal(uiCulture, CultureInfo.CurrentUICulture);
     }
 }
diff --git a/test/OrchardCore.Tests/Localization/DefaultPluralRuleProviderTests.cs b/test/OrchardCore.Tests/Localization/DefaultPluralRuleProviderTests.cs
index f180a60e594..a0658095fed 100644
--- a/test/OrchardCore.Tests/Localization/DefaultPluralRuleProviderTests.cs
+++ b/test/OrchardCore.Tests/Localization/DefaultPluralRuleProviderTests.cs
@@ -1,29 +1,28 @@
 using OrchardCore.Localization;
 
-namespace OrchardCore.Tests.Localization
+namespace OrchardCore.Tests.Localization;
+
+public class DefaultPluralRuleProviderTests
 {
-    public class DefaultPluralRuleProviderTests
+    [Theory]
+    [InlineData("en-US", "en")]
+    [InlineData("zh-TW", "zh")]
+    [InlineData("zh-HanT-TW", "zh")]
+    [InlineData("zh-CN", "zh")]
+    [InlineData("zh-Hans-CN", "zh")]
+    [InlineData("zh-Hans", "zh")]
+    [InlineData("zh-Hant", "zh")]
+    public void TryGetRuleShouldReturnRuleForTopCulture(string culture, string expected)
     {
-        [Theory]
-        [InlineData("en-US", "en")]
-        [InlineData("zh-TW", "zh")]
-        [InlineData("zh-HanT-TW", "zh")]
-        [InlineData("zh-CN", "zh")]
-        [InlineData("zh-Hans-CN", "zh")]
-        [InlineData("zh-Hans", "zh")]
-        [InlineData("zh-Hant", "zh")]
-        public void TryGetRuleShouldReturnRuleForTopCulture(string culture, string expected)
-        {
-            var expectedCulture = CultureInfo.GetCultureInfo(expected);
-            var testCulture = CultureInfo.GetCultureInfo(culture);
+        var expectedCulture = CultureInfo.GetCultureInfo(expected);
+        var testCulture = CultureInfo.GetCultureInfo(culture);
 
-            var pluralProvider = new DefaultPluralRuleProvider();
-            pluralProvider.TryGetRule(expectedCulture, out var expectedPlural);
-            pluralProvider.TryGetRule(testCulture, out var testPlural);
+        var pluralProvider = new DefaultPluralRuleProvider();
+        pluralProvider.TryGetRule(expectedCulture, out var expectedPlural);
+        pluralProvider.TryGetRule(testCulture, out var testPlural);
 
-            Assert.NotNull(expectedPlural);
-            Assert.NotNull(testPlural);
-            Assert.Same(expectedPlural, testPlural);
-        }
+        Assert.NotNull(expectedPlural);
+        Assert.NotNull(testPlural);
+        Assert.Same(expectedPlural, testPlural);
     }
 }
diff --git a/test/OrchardCore.Tests/Localization/LocalizationManagerTests.cs b/test/OrchardCore.Tests/Localization/LocalizationManagerTests.cs
index 3b0052cf3aa..bcd3aa1f005 100644
--- a/test/OrchardCore.Tests/Localization/LocalizationManagerTests.cs
+++ b/test/OrchardCore.Tests/Localization/LocalizationManagerTests.cs
@@ -1,77 +1,76 @@
 using OrchardCore.Localization;
 
-namespace OrchardCore.Tests.Localization
+namespace OrchardCore.Tests.Localization;
+
+public class LocalizationManagerTests
 {
-    public class LocalizationManagerTests
-    {
-        private readonly Mock<IPluralRuleProvider> _pluralRuleProvider;
-        private readonly Mock<ITranslationProvider> _translationProvider;
-        private readonly IMemoryCache _memoryCache;
+    private readonly Mock<IPluralRuleProvider> _pluralRuleProvider;
+    private readonly Mock<ITranslationProvider> _translationProvider;
+    private readonly IMemoryCache _memoryCache;
 
-        public LocalizationManagerTests()
-        {
-            var csPluralRule = PluralizationRule.Czech;
-            _pluralRuleProvider = new Mock<IPluralRuleProvider>();
-            _pluralRuleProvider.SetupGet(o => o.Order).Returns(0);
-            _pluralRuleProvider.Setup(o => o.TryGetRule(It.Is<CultureInfo>(culture => culture.Name == "cs"), out csPluralRule)).Returns(true);
+    public LocalizationManagerTests()
+    {
+        var csPluralRule = PluralizationRule.Czech;
+        _pluralRuleProvider = new Mock<IPluralRuleProvider>();
+        _pluralRuleProvider.SetupGet(o => o.Order).Returns(0);
+        _pluralRuleProvider.Setup(o => o.TryGetRule(It.Is<CultureInfo>(culture => culture.Name == "cs"), out csPluralRule)).Returns(true);
 
-            _translationProvider = new Mock<ITranslationProvider>();
-            _memoryCache = new MemoryCache(new MemoryCacheOptions());
-        }
+        _translationProvider = new Mock<ITranslationProvider>();
+        _memoryCache = new MemoryCache(new MemoryCacheOptions());
+    }
 
-        [Fact]
-        public void GetDictionaryReturnsDictionaryWithPluralRuleAndCultureIfNoTranslationsExists()
-        {
-            _translationProvider.Setup(o => o.LoadTranslations(
-                It.Is<string>(culture => culture == "cs"),
-                It.IsAny<CultureDictionary>())
-            );
+    [Fact]
+    public void GetDictionaryReturnsDictionaryWithPluralRuleAndCultureIfNoTranslationsExists()
+    {
+        _translationProvider.Setup(o => o.LoadTranslations(
+            It.Is<string>(culture => culture == "cs"),
+            It.IsAny<CultureDictionary>())
+        );
 
-            var manager = new LocalizationManager(new[] { _pluralRuleProvider.Object }, new[] { _translationProvider.Object }, _memoryCache);
+        var manager = new LocalizationManager(new[] { _pluralRuleProvider.Object }, new[] { _translationProvider.Object }, _memoryCache);
 
-            var dictionary = manager.GetDictionary(CultureInfo.GetCultureInfo("cs"));
+        var dictionary = manager.GetDictionary(CultureInfo.GetCultureInfo("cs"));
 
-            Assert.Equal("cs", dictionary.CultureName);
-            Assert.Equal(PluralizationRule.Czech, dictionary.PluralRule);
-        }
+        Assert.Equal("cs", dictionary.CultureName);
+        Assert.Equal(PluralizationRule.Czech, dictionary.PluralRule);
+    }
 
-        [Fact]
-        public void GetDictionaryReturnsDictionaryWithTranslationsFromProvider()
-        {
-            var dictionaryRecord = new CultureDictionaryRecord("ball", "míč", "míče", "míčů");
-            _translationProvider
-                .Setup(o => o.LoadTranslations(It.Is<string>(culture => culture == "cs"), It.IsAny<CultureDictionary>()))
-                .Callback<string, CultureDictionary>((culture, dictioanry) => dictioanry.MergeTranslations(new[] { dictionaryRecord }));
+    [Fact]
+    public void GetDictionaryReturnsDictionaryWithTranslationsFromProvider()
+    {
+        var dictionaryRecord = new CultureDictionaryRecord("ball", "míč", "míče", "míčů");
+        _translationProvider
+            .Setup(o => o.LoadTranslations(It.Is<string>(culture => culture == "cs"), It.IsAny<CultureDictionary>()))
+            .Callback<string, CultureDictionary>((culture, dictioanry) => dictioanry.MergeTranslations(new[] { dictionaryRecord }));
 
-            var manager = new LocalizationManager(new[] { _pluralRuleProvider.Object }, new[] { _translationProvider.Object }, _memoryCache);
+        var manager = new LocalizationManager(new[] { _pluralRuleProvider.Object }, new[] { _translationProvider.Object }, _memoryCache);
 
-            var dictionary = manager.GetDictionary(CultureInfo.GetCultureInfo("cs"));
-            var key = new CultureDictionaryRecordKey { MessageId = "ball" };
+        var dictionary = manager.GetDictionary(CultureInfo.GetCultureInfo("cs"));
+        var key = new CultureDictionaryRecordKey { MessageId = "ball" };
 
-            dictionary.Translations.TryGetValue(key, out var translations);
+        dictionary.Translations.TryGetValue(key, out var translations);
 
-            Assert.Equal(translations, dictionaryRecord.Translations);
-        }
+        Assert.Equal(translations, dictionaryRecord.Translations);
+    }
 
-        [Fact]
-        public void GetDictionarySelectsPluralRuleFromProviderWithHigherPriority()
-        {
-            PluralizationRuleDelegate csPluralRuleOverride = n => ((n == 1) ? 0 : (n >= 2 && n <= 4) ? 1 : 0);
+    [Fact]
+    public void GetDictionarySelectsPluralRuleFromProviderWithHigherPriority()
+    {
+        PluralizationRuleDelegate csPluralRuleOverride = n => ((n == 1) ? 0 : (n >= 2 && n <= 4) ? 1 : 0);
 
-            var highPriorityRuleProvider = new Mock<IPluralRuleProvider>();
-            highPriorityRuleProvider.SetupGet(o => o.Order).Returns(-1);
-            highPriorityRuleProvider.Setup(o => o.TryGetRule(It.Is<CultureInfo>(culture => culture.Name == "cs"), out csPluralRuleOverride)).Returns(true);
+        var highPriorityRuleProvider = new Mock<IPluralRuleProvider>();
+        highPriorityRuleProvider.SetupGet(o => o.Order).Returns(-1);
+        highPriorityRuleProvider.Setup(o => o.TryGetRule(It.Is<CultureInfo>(culture => culture.Name == "cs"), out csPluralRuleOverride)).Returns(true);
 
-            _translationProvider.Setup(o => o.LoadTranslations(
-                It.Is<string>(culture => culture == "cs"),
-                It.IsAny<CultureDictionary>())
-            );
+        _translationProvider.Setup(o => o.LoadTranslations(
+            It.Is<string>(culture => culture == "cs"),
+            It.IsAny<CultureDictionary>())
+        );
 
-            var manager = new LocalizationManager(new[] { _pluralRuleProvider.Object, highPriorityRuleProvider.Object }, new[] { _translationProvider.Object }, _memoryCache);
+        var manager = new LocalizationManager(new[] { _pluralRuleProvider.Object, highPriorityRuleProvider.Object }, new[] { _translationProvider.Object }, _memoryCache);
 
-            var dictionary = manager.GetDictionary(CultureInfo.GetCultureInfo("cs"));
+        var dictionary = manager.GetDictionary(CultureInfo.GetCultureInfo("cs"));
 
-            Assert.Equal(dictionary.PluralRule, csPluralRuleOverride);
-        }
+        Assert.Equal(dictionary.PluralRule, csPluralRuleOverride);
     }
 }
diff --git a/test/OrchardCore.Tests/Localization/NullHtmlLocalizerTests.cs b/test/OrchardCore.Tests/Localization/NullHtmlLocalizerTests.cs
index bb6e8d5f50a..22fa917fe8a 100644
--- a/test/OrchardCore.Tests/Localization/NullHtmlLocalizerTests.cs
+++ b/test/OrchardCore.Tests/Localization/NullHtmlLocalizerTests.cs
@@ -1,27 +1,26 @@
 using OrchardCore.Localization;
 
-namespace OrchardCore.Tests.Localization
+namespace OrchardCore.Tests.Localization;
+
+public class HtmlStringLocalizerTests
 {
-    public class HtmlStringLocalizerTests
+    [Theory]
+    [InlineData("there is one", 1, "there is one", "there are more")]
+    [InlineData("there are more", 2, "there is one", "there are more")]
+    [InlineData("there is one (1)", 1, "there is one ({0})", "there are more ({0})")]
+    [InlineData("there are more (2)", 2, "there is one ({0})", "there are more ({0})")]
+    [InlineData("there is one (1) thing", 1, "there is one ({0}) {1}", "there are more ({0}) {1}", "thing")]
+    [InlineData("there are more (2) thing", 2, "there is one ({0}) {1}", "there are more ({0}) {1}", "thing")]
+    [InlineData("there is one (1) &lt;br/&gt;", 1, "there is one ({0}) {1}", "there are more ({0}) {1}", "<br/>")]
+    [InlineData("there are more (2) &lt;br/&gt;", 2, "there is one ({0}) {1}", "there are more ({0}) {1}", "<br/>")]
+    [InlineData("1 minute ago", 1, "{0} minute ago", "{0} minutes ago")]
+    [InlineData("20 minutes ago", 20, "{0} minute ago", "{0} minutes ago")]
+    public void HtmlNullLocalizerSupportsPlural(string expected, int count, string singular, string plural, params object[] arguments)
     {
-        [Theory]
-        [InlineData("there is one", 1, "there is one", "there are more")]
-        [InlineData("there are more", 2, "there is one", "there are more")]
-        [InlineData("there is one (1)", 1, "there is one ({0})", "there are more ({0})")]
-        [InlineData("there are more (2)", 2, "there is one ({0})", "there are more ({0})")]
-        [InlineData("there is one (1) thing", 1, "there is one ({0}) {1}", "there are more ({0}) {1}", "thing")]
-        [InlineData("there are more (2) thing", 2, "there is one ({0}) {1}", "there are more ({0}) {1}", "thing")]
-        [InlineData("there is one (1) &lt;br/&gt;", 1, "there is one ({0}) {1}", "there are more ({0}) {1}", "<br/>")]
-        [InlineData("there are more (2) &lt;br/&gt;", 2, "there is one ({0}) {1}", "there are more ({0}) {1}", "<br/>")]
-        [InlineData("1 minute ago", 1, "{0} minute ago", "{0} minutes ago")]
-        [InlineData("20 minutes ago", 20, "{0} minute ago", "{0} minutes ago")]
-        public void HtmlNullLocalizerSupportsPlural(string expected, int count, string singular, string plural, params object[] arguments)
-        {
-            var localizer = NullHtmlLocalizer.Instance;
+        var localizer = NullHtmlLocalizer.Instance;
 
-            using var writer = new StringWriter();
-            localizer.Plural(count, singular, plural, arguments).WriteTo(writer, HtmlEncoder.Default);
-            Assert.Equal(expected, writer.ToString());
-        }
+        using var writer = new StringWriter();
+        localizer.Plural(count, singular, plural, arguments).WriteTo(writer, HtmlEncoder.Default);
+        Assert.Equal(expected, writer.ToString());
     }
 }
diff --git a/test/OrchardCore.Tests/Localization/NullStringLocalizerTests.cs b/test/OrchardCore.Tests/Localization/NullStringLocalizerTests.cs
index fa785725730..9d537d84c82 100644
--- a/test/OrchardCore.Tests/Localization/NullStringLocalizerTests.cs
+++ b/test/OrchardCore.Tests/Localization/NullStringLocalizerTests.cs
@@ -1,46 +1,45 @@
 using OrchardCore.Localization;
 
-namespace OrchardCore.Tests.Localization
+namespace OrchardCore.Tests.Localization;
+
+public class NullStringLocalizerTests
 {
-    public class NullStringLocalizerTests
+    [Theory]
+    [InlineData("there is one", 1, "there is one", "there are more")]
+    [InlineData("there are more", 2, "there is one", "there are more")]
+    [InlineData("there is one (1)", 1, "there is one ({0})", "there are more ({0})")]
+    [InlineData("there are more (2)", 2, "there is one ({0})", "there are more ({0})")]
+    [InlineData("there is one (1) thing", 1, "there is one ({0}) {1}", "there are more ({0}) {1}", "thing")]
+    [InlineData("there are more (2) thing", 2, "there is one ({0}) {1}", "there are more ({0}) {1}", "thing")]
+    [InlineData("there is one (1) &lt;br/&gt;", 1, "there is one ({0}) {1}", "there are more ({0}) {1}", "<br/>")]
+    [InlineData("there are more (2) &lt;br/&gt;", 2, "there is one ({0}) {1}", "there are more ({0}) {1}", "<br/>")]
+    [InlineData("1 minute ago", 1, "{0} minute ago", "{0} minutes ago")]
+    [InlineData("20 minutes ago", 20, "{0} minute ago", "{0} minutes ago")]
+    public void HtmlNullLocalizerSupportsPlural(string expected, int count, string singular, string plural, params object[] arguments)
     {
-        [Theory]
-        [InlineData("there is one", 1, "there is one", "there are more")]
-        [InlineData("there are more", 2, "there is one", "there are more")]
-        [InlineData("there is one (1)", 1, "there is one ({0})", "there are more ({0})")]
-        [InlineData("there are more (2)", 2, "there is one ({0})", "there are more ({0})")]
-        [InlineData("there is one (1) thing", 1, "there is one ({0}) {1}", "there are more ({0}) {1}", "thing")]
-        [InlineData("there are more (2) thing", 2, "there is one ({0}) {1}", "there are more ({0}) {1}", "thing")]
-        [InlineData("there is one (1) &lt;br/&gt;", 1, "there is one ({0}) {1}", "there are more ({0}) {1}", "<br/>")]
-        [InlineData("there are more (2) &lt;br/&gt;", 2, "there is one ({0}) {1}", "there are more ({0}) {1}", "<br/>")]
-        [InlineData("1 minute ago", 1, "{0} minute ago", "{0} minutes ago")]
-        [InlineData("20 minutes ago", 20, "{0} minute ago", "{0} minutes ago")]
-        public void HtmlNullLocalizerSupportsPlural(string expected, int count, string singular, string plural, params object[] arguments)
-        {
-            var localizer = new NullHtmlLocalizerFactory().Create(typeof(object));
+        var localizer = new NullHtmlLocalizerFactory().Create(typeof(object));
 
-            using var writer = new StringWriter();
-            localizer.Plural(count, singular, plural, arguments).WriteTo(writer, HtmlEncoder.Default);
-            Assert.Equal(expected, writer.ToString());
-        }
+        using var writer = new StringWriter();
+        localizer.Plural(count, singular, plural, arguments).WriteTo(writer, HtmlEncoder.Default);
+        Assert.Equal(expected, writer.ToString());
+    }
 
-        [Theory]
-        [InlineData("there is one", 1, "there is one", "there are more")]
-        [InlineData("there are more", 2, "there is one", "there are more")]
-        [InlineData("there is one (1)", 1, "there is one ({0})", "there are more ({0})")]
-        [InlineData("there are more (2)", 2, "there is one ({0})", "there are more ({0})")]
-        [InlineData("there is one (1) thing", 1, "there is one ({0}) {1}", "there are more ({0}) {1}", "thing")]
-        [InlineData("there are more (2) thing", 2, "there is one ({0}) {1}", "there are more ({0}) {1}", "thing")]
-        [InlineData("there is one (1) <br/>", 1, "there is one ({0}) {1}", "there are more ({0}) {1}", "<br/>")]
-        [InlineData("there are more (2) <br/>", 2, "there is one ({0}) {1}", "there are more ({0}) {1}", "<br/>")]
-        [InlineData("1 minute ago", 1, "{0} minute ago", "{0} minutes ago")]
-        [InlineData("20 minutes ago", 20, "{0} minute ago", "{0} minutes ago")]
-        public void StringNullLocalizerSupportsPlural(string expected, int count, string singular, string plural, params object[] arguments)
-        {
-            var localizer = NullStringLocalizer.Instance;
+    [Theory]
+    [InlineData("there is one", 1, "there is one", "there are more")]
+    [InlineData("there are more", 2, "there is one", "there are more")]
+    [InlineData("there is one (1)", 1, "there is one ({0})", "there are more ({0})")]
+    [InlineData("there are more (2)", 2, "there is one ({0})", "there are more ({0})")]
+    [InlineData("there is one (1) thing", 1, "there is one ({0}) {1}", "there are more ({0}) {1}", "thing")]
+    [InlineData("there are more (2) thing", 2, "there is one ({0}) {1}", "there are more ({0}) {1}", "thing")]
+    [InlineData("there is one (1) <br/>", 1, "there is one ({0}) {1}", "there are more ({0}) {1}", "<br/>")]
+    [InlineData("there are more (2) <br/>", 2, "there is one ({0}) {1}", "there are more ({0}) {1}", "<br/>")]
+    [InlineData("1 minute ago", 1, "{0} minute ago", "{0} minutes ago")]
+    [InlineData("20 minutes ago", 20, "{0} minute ago", "{0} minutes ago")]
+    public void StringNullLocalizerSupportsPlural(string expected, int count, string singular, string plural, params object[] arguments)
+    {
+        var localizer = NullStringLocalizer.Instance;
 
-            var value = localizer.Plural(count, singular, plural, arguments).Value;
-            Assert.Equal(expected, value);
-        }
+        var value = localizer.Plural(count, singular, plural, arguments).Value;
+        Assert.Equal(expected, value);
     }
 }
diff --git a/test/OrchardCore.Tests/Localization/PoParserTests.cs b/test/OrchardCore.Tests/Localization/PoParserTests.cs
index f392905e5b1..1fa026943f8 100644
--- a/test/OrchardCore.Tests/Localization/PoParserTests.cs
+++ b/test/OrchardCore.Tests/Localization/PoParserTests.cs
@@ -1,214 +1,213 @@
 using OrchardCore.Localization;
 using OrchardCore.Localization.PortableObject;
 
-namespace OrchardCore.Tests.Localization
+namespace OrchardCore.Tests.Localization;
+
+public class PoParserTests
 {
-    public class PoParserTests
+    [Fact]
+    public void ParseRetursSimpleEntry()
+    {
+        // msgid "Unknown system error"
+        // msgstr "Error desconegut del sistema"
+        var entries = ParseText("SimpleEntry");
+
+        Assert.Equal("Unknown system error", entries[0].Key);
+        Assert.Equal("Error desconegut del sistema", entries[0].Translations[0]);
+    }
+
+    [Fact]
+    public void ParseIgnoresEntryWithoutTranslation()
     {
-        [Fact]
-        public void ParseRetursSimpleEntry()
-        {
-            // msgid "Unknown system error"
-            // msgstr "Error desconegut del sistema"
-            var entries = ParseText("SimpleEntry");
-
-            Assert.Equal("Unknown system error", entries[0].Key);
-            Assert.Equal("Error desconegut del sistema", entries[0].Translations[0]);
-        }
-
-        [Fact]
-        public void ParseIgnoresEntryWithoutTranslation()
-        {
-            // "msgid "Unknown system error"
-            // "msgstr ""
-            var entries = ParseText("EntryWithoutTranslation");
-
-            Assert.Empty(entries);
-        }
-
-        [Fact]
-        public void ParseIgnoresPoeditHeader()
-        {
-            // # Translation of kstars.po into Spanish.
-            // # This file is distributed under the same license as the kdeedu package.
-            // # Pablo de Vicente <pablo@foo.com>, 2005, 2006, 2007, 2008.
-            // # Eloy Cuadra <eloy@bar.net>, 2007, 2008.
-            // msgid ""
-            // msgstr ""
-            // "Project-Id-Version: kstars\n"
-            // "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-            // "POT-Creation-Date: 2008-09-01 09:37+0200\n"
-            // "PO-Revision-Date: 2008-07-22 18:13+0200\n"
-            // "Last-Translator: Eloy Cuadra <eloy@bar.net>\n"
-            // "Language-Team: Spanish <kde-l10n-es@kde.org>\n"
-            // "MIME-Version: 1.0\n"
-            // "Content-Type: text/plain; charset=UTF-8\n"
-            // "Content-Transfer-Encoding: 8bit\n"
-            // "Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-            // msgid "Unknown system error"
-            // msgstr "Error desconegut del sistema"
-            var entries = ParseText("PoeditHeader");
-
-            Assert.True(entries.Length == 1);
-            Assert.True(entries[0].Translations.Length == 1);
-        }
-
-        [Fact]
-        public void ParseSetsContext()
-        {
-            // msgctxt "OrchardCore.Localization"
-            // msgid "Unknown system error"
-            // msgstr "Error desconegut del sistema"
-            var entries = ParseText("EntryWithContext");
-
-            Assert.Equal("OrchardCore.Localization|Unknown system error", entries[0].Key, ignoreCase: true);
-        }
-
-        [Fact]
-        public void ParseIgnoresComments()
-        {
-            // # translator-comments
-            // #. extracted-comments
-            // #: reference…
-            // #, flag
-
-            // #| msgctxt previous-context
-            // #| msgid previous-untranslated-string
-            // msgctxt "OrchardCore.Localization"
-            // msgid "Unknown system error"
-            // msgstr "Error desconegut del sistema"
-
-            var entries = ParseText("EntryWithComments");
-
-            Assert.Equal("OrchardCore.Localization|Unknown system error", entries[0].Key, ignoreCase: true);
-            Assert.Equal("Error desconegut del sistema", entries[0].Translations[0]);
-        }
-
-        [Fact]
-        public void ParseOnlyTrimsLeadingAndTrailingQuotes()
-        {
-            // msgid "\"{0}\""
-            // msgstr "\"{0}\""
-
-            var entries = ParseText("EntryWithQuotes");
-
-            Assert.Equal("\"{0}\"", entries[0].Key);
-            Assert.Equal("\"{0}\"", entries[0].Translations[0]);
-        }
-
-        [Fact]
-        public void ParseHandleUnclosedQuote()
-        {
-            // msgctxt "
-            // msgid "Foo \"{0}\""
-            // msgstr "Foo \"{0}\""
-
-            var entries = ParseText("EntryWithUnclosedQuote");
-
-            Assert.Equal("Foo \"{0}\"", entries[0].Key);
-        }
-
-        [Fact]
-        public void ParseHandlesMultilineEntry()
-        {
-            // msgid ""
-            // "Here is an example of how one might continue a very long string\n"
-            // "for the common case the string represents multi-line output."
-            // msgstr ""
-            // "Here is an example of how one might continue a very long translation\n"
-            // "for the common case the string represents multi-line output."
-
-            var entries = ParseText("EntryWithMultilineText");
-
-            Assert.Equal("Here is an example of how one might continue a very long string\nfor the common case the string represents multi-line output.", entries[0].Key);
-            Assert.Equal("Here is an example of how one might continue a very long translation\nfor the common case the string represents multi-line output.", entries[0].Translations[0]);
-        }
-
-        [Fact]
-        public void ParsePreservesEscapedCharacters()
-        {
-            // msgid "Line:\t\"{0}\"\n"
-            // msgstr "Line:\t\"{0}\"\n"
-
-            var entries = ParseText("EntryWithEscapedCharacters");
-
-            Assert.Equal("Line:\t\"{0}\"\n", entries[0].Key);
-            Assert.Equal("Line:\t\"{0}\"\n", entries[0].Translations[0]);
-        }
-
-        [Fact]
-        public void ParseReadsPluralTranslations()
-        {
-            // msgid "book"
-            // msgid_plural "books"
-            // msgstr[0] "kniha"
-            // msgstr[1] "knihy"
-            // msgstr[2] "knih"
-
-            var entries = ParseText("EntryWithPlural");
-
-            Assert.Equal("book", entries[0].Key);
-            Assert.Equal("kniha", entries[0].Translations[0]);
-            Assert.Equal("knihy", entries[0].Translations[1]);
-            Assert.Equal("knih", entries[0].Translations[2]);
-        }
-
-        [Fact]
-        public void ParseReadsPluralAndMultilineText()
-        {
-            // msgid ""
-            // "Here is an example of how one might continue a very long string\n"
-            // "for the common case the string represents multi-line output."
-            // msgid_plural ""
-            // "Here are examples of how one might continue a very long string\n"
-            // "for the common case the string represents multi-line output."
-            // msgstr[0] ""
-            // "Here is an example of how one might continue a very long translation\n"
-            // "for the common case the string represents multi-line output."
-            // msgstr[1] ""
-            // "Here are examples of how one might continue a very long translation\n"
-            // "for the common case the string represents multi-line output."
-
-            var entries = ParseText("EntryWithPluralAndMultilineText");
-
-            Assert.Equal("Here is an example of how one might continue a very long string\nfor the common case the string represents multi-line output.", entries[0].Key);
-            Assert.Equal("Here is an example of how one might continue a very long translation\nfor the common case the string represents multi-line output.", entries[0].Translations[0]);
-            Assert.Equal("Here are examples of how one might continue a very long translation\nfor the common case the string represents multi-line output.", entries[0].Translations[1]);
-        }
-
-        [Fact]
-        public void ParseReadsMultipleEntries()
-        {
-            // #. "File {0} does not exist"
-            // msgctxt "OrchardCore.FileSystems.Media.FileSystemStorageProvider"
-            // msgid "File {0} does not exist"
-            // msgstr "Soubor {0} neexistuje"
-
-            // #. "Directory {0} does not exist"
-            // msgctxt "OrchardCore.FileSystems.Media.Directory"
-            // msgid "Directory {0} does not exist"
-            // msgstr "Složka {0} neexistuje"
-
-            var entries = ParseText("MultipleEntries");
-
-            Assert.Equal(2, entries.Length);
-
-            Assert.Equal("OrchardCore.FileSystems.Media.FileSystemStorageProvider|File {0} does not exist", entries[0].Key, ignoreCase: true);
-            Assert.Equal("Soubor {0} neexistuje", entries[0].Translations[0]);
-
-            Assert.Equal("OrchardCore.FileSystems.Media.Directory|Directory {0} does not exist", entries[1].Key, ignoreCase: true);
-            Assert.Equal("Složka {0} neexistuje", entries[1].Translations[0]);
-        }
-
-        private static CultureDictionaryRecord[] ParseText(string resourceName)
-        {
-            var parser = new PoParser();
-
-            var testAssembly = typeof(PoParserTests).Assembly;
-            using var resource = testAssembly.GetManifestResourceStream("OrchardCore.Tests.Localization.PoFiles." + resourceName + ".po");
-            using var reader = new StreamReader(resource);
-            return parser.Parse(reader).ToArray();
-        }
+        // "msgid "Unknown system error"
+        // "msgstr ""
+        var entries = ParseText("EntryWithoutTranslation");
+
+        Assert.Empty(entries);
+    }
+
+    [Fact]
+    public void ParseIgnoresPoeditHeader()
+    {
+        // # Translation of kstars.po into Spanish.
+        // # This file is distributed under the same license as the kdeedu package.
+        // # Pablo de Vicente <pablo@foo.com>, 2005, 2006, 2007, 2008.
+        // # Eloy Cuadra <eloy@bar.net>, 2007, 2008.
+        // msgid ""
+        // msgstr ""
+        // "Project-Id-Version: kstars\n"
+        // "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+        // "POT-Creation-Date: 2008-09-01 09:37+0200\n"
+        // "PO-Revision-Date: 2008-07-22 18:13+0200\n"
+        // "Last-Translator: Eloy Cuadra <eloy@bar.net>\n"
+        // "Language-Team: Spanish <kde-l10n-es@kde.org>\n"
+        // "MIME-Version: 1.0\n"
+        // "Content-Type: text/plain; charset=UTF-8\n"
+        // "Content-Transfer-Encoding: 8bit\n"
+        // "Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+        // msgid "Unknown system error"
+        // msgstr "Error desconegut del sistema"
+        var entries = ParseText("PoeditHeader");
+
+        Assert.True(entries.Length == 1);
+        Assert.True(entries[0].Translations.Length == 1);
+    }
+
+    [Fact]
+    public void ParseSetsContext()
+    {
+        // msgctxt "OrchardCore.Localization"
+        // msgid "Unknown system error"
+        // msgstr "Error desconegut del sistema"
+        var entries = ParseText("EntryWithContext");
+
+        Assert.Equal("OrchardCore.Localization|Unknown system error", entries[0].Key, ignoreCase: true);
+    }
+
+    [Fact]
+    public void ParseIgnoresComments()
+    {
+        // # translator-comments
+        // #. extracted-comments
+        // #: reference…
+        // #, flag
+
+        // #| msgctxt previous-context
+        // #| msgid previous-untranslated-string
+        // msgctxt "OrchardCore.Localization"
+        // msgid "Unknown system error"
+        // msgstr "Error desconegut del sistema"
+
+        var entries = ParseText("EntryWithComments");
+
+        Assert.Equal("OrchardCore.Localization|Unknown system error", entries[0].Key, ignoreCase: true);
+        Assert.Equal("Error desconegut del sistema", entries[0].Translations[0]);
+    }
+
+    [Fact]
+    public void ParseOnlyTrimsLeadingAndTrailingQuotes()
+    {
+        // msgid "\"{0}\""
+        // msgstr "\"{0}\""
+
+        var entries = ParseText("EntryWithQuotes");
+
+        Assert.Equal("\"{0}\"", entries[0].Key);
+        Assert.Equal("\"{0}\"", entries[0].Translations[0]);
+    }
+
+    [Fact]
+    public void ParseHandleUnclosedQuote()
+    {
+        // msgctxt "
+        // msgid "Foo \"{0}\""
+        // msgstr "Foo \"{0}\""
+
+        var entries = ParseText("EntryWithUnclosedQuote");
+
+        Assert.Equal("Foo \"{0}\"", entries[0].Key);
+    }
+
+    [Fact]
+    public void ParseHandlesMultilineEntry()
+    {
+        // msgid ""
+        // "Here is an example of how one might continue a very long string\n"
+        // "for the common case the string represents multi-line output."
+        // msgstr ""
+        // "Here is an example of how one might continue a very long translation\n"
+        // "for the common case the string represents multi-line output."
+
+        var entries = ParseText("EntryWithMultilineText");
+
+        Assert.Equal("Here is an example of how one might continue a very long string\nfor the common case the string represents multi-line output.", entries[0].Key);
+        Assert.Equal("Here is an example of how one might continue a very long translation\nfor the common case the string represents multi-line output.", entries[0].Translations[0]);
+    }
+
+    [Fact]
+    public void ParsePreservesEscapedCharacters()
+    {
+        // msgid "Line:\t\"{0}\"\n"
+        // msgstr "Line:\t\"{0}\"\n"
+
+        var entries = ParseText("EntryWithEscapedCharacters");
+
+        Assert.Equal("Line:\t\"{0}\"\n", entries[0].Key);
+        Assert.Equal("Line:\t\"{0}\"\n", entries[0].Translations[0]);
+    }
+
+    [Fact]
+    public void ParseReadsPluralTranslations()
+    {
+        // msgid "book"
+        // msgid_plural "books"
+        // msgstr[0] "kniha"
+        // msgstr[1] "knihy"
+        // msgstr[2] "knih"
+
+        var entries = ParseText("EntryWithPlural");
+
+        Assert.Equal("book", entries[0].Key);
+        Assert.Equal("kniha", entries[0].Translations[0]);
+        Assert.Equal("knihy", entries[0].Translations[1]);
+        Assert.Equal("knih", entries[0].Translations[2]);
+    }
+
+    [Fact]
+    public void ParseReadsPluralAndMultilineText()
+    {
+        // msgid ""
+        // "Here is an example of how one might continue a very long string\n"
+        // "for the common case the string represents multi-line output."
+        // msgid_plural ""
+        // "Here are examples of how one might continue a very long string\n"
+        // "for the common case the string represents multi-line output."
+        // msgstr[0] ""
+        // "Here is an example of how one might continue a very long translation\n"
+        // "for the common case the string represents multi-line output."
+        // msgstr[1] ""
+        // "Here are examples of how one might continue a very long translation\n"
+        // "for the common case the string represents multi-line output."
+
+        var entries = ParseText("EntryWithPluralAndMultilineText");
+
+        Assert.Equal("Here is an example of how one might continue a very long string\nfor the common case the string represents multi-line output.", entries[0].Key);
+        Assert.Equal("Here is an example of how one might continue a very long translation\nfor the common case the string represents multi-line output.", entries[0].Translations[0]);
+        Assert.Equal("Here are examples of how one might continue a very long translation\nfor the common case the string represents multi-line output.", entries[0].Translations[1]);
+    }
+
+    [Fact]
+    public void ParseReadsMultipleEntries()
+    {
+        // #. "File {0} does not exist"
+        // msgctxt "OrchardCore.FileSystems.Media.FileSystemStorageProvider"
+        // msgid "File {0} does not exist"
+        // msgstr "Soubor {0} neexistuje"
+
+        // #. "Directory {0} does not exist"
+        // msgctxt "OrchardCore.FileSystems.Media.Directory"
+        // msgid "Directory {0} does not exist"
+        // msgstr "Složka {0} neexistuje"
+
+        var entries = ParseText("MultipleEntries");
+
+        Assert.Equal(2, entries.Length);
+
+        Assert.Equal("OrchardCore.FileSystems.Media.FileSystemStorageProvider|File {0} does not exist", entries[0].Key, ignoreCase: true);
+        Assert.Equal("Soubor {0} neexistuje", entries[0].Translations[0]);
+
+        Assert.Equal("OrchardCore.FileSystems.Media.Directory|Directory {0} does not exist", entries[1].Key, ignoreCase: true);
+        Assert.Equal("Složka {0} neexistuje", entries[1].Translations[0]);
+    }
+
+    private static CultureDictionaryRecord[] ParseText(string resourceName)
+    {
+        var parser = new PoParser();
+
+        var testAssembly = typeof(PoParserTests).Assembly;
+        using var resource = testAssembly.GetManifestResourceStream("OrchardCore.Tests.Localization.PoFiles." + resourceName + ".po");
+        using var reader = new StreamReader(resource);
+        return parser.Parse(reader).ToArray();
     }
 }
diff --git a/test/OrchardCore.Tests/Localization/PortableObjectStringLocalizerFactoryTests.cs b/test/OrchardCore.Tests/Localization/PortableObjectStringLocalizerFactoryTests.cs
index 50f35a1734d..7f63bec3627 100644
--- a/test/OrchardCore.Tests/Localization/PortableObjectStringLocalizerFactoryTests.cs
+++ b/test/OrchardCore.Tests/Localization/PortableObjectStringLocalizerFactoryTests.cs
@@ -1,49 +1,48 @@
 using OrchardCore.Localization;
 
-namespace OrchardCore.Tests.Localization
+namespace OrchardCore.Tests.Localization;
+
+public class PortableObjectStringLocalizerFactoryTests
 {
-    public class PortableObjectStringLocalizerFactoryTests
-    {
-        [Fact]
-        public async Task LocalizerReturnsTranslationFromInnerClass()
-            => await StartupRunner.Run(typeof(PortableObjectStringLocalizerFactory), "ar", "مرحبا");
+    [Fact]
+    public async Task LocalizerReturnsTranslationFromInnerClass()
+        => await StartupRunner.Run(typeof(PortableObjectStringLocalizerFactory), "ar", "مرحبا");
 
-        public class PortableObjectStringLocalizerFactory
-        {
+    public class PortableObjectStringLocalizerFactory
+    {
 #pragma warning disable CA1822 // Mark members as static
-            public void ConfigureServices(IServiceCollection services)
+        public void ConfigureServices(IServiceCollection services)
 #pragma warning restore CA1822 // Mark members as static
-            {
-                services.AddMvc();
-                services.AddLocalization();
-                services.AddPortableObjectLocalization(options => options.ResourcesPath = "Localization/PoFiles");
-                services.Replace(ServiceDescriptor.Singleton<ILocalizationFileLocationProvider, StubPoFileLocationProvider>());
-            }
+        {
+            services.AddMvc();
+            services.AddLocalization();
+            services.AddPortableObjectLocalization(options => options.ResourcesPath = "Localization/PoFiles");
+            services.Replace(ServiceDescriptor.Singleton<ILocalizationFileLocationProvider, StubPoFileLocationProvider>());
+        }
 
 #pragma warning disable CA1822 // Mark members as static
-            public void Configure(
+        public void Configure(
 #pragma warning restore CA1822 // Mark members as static
-                IApplicationBuilder app,
-                IStringLocalizer<Model> localizer)
-            {
-                var supportedCultures = new[] { "ar", "en" };
-                app.UseRequestLocalization(options =>
-                    options
-                        .AddSupportedCultures(supportedCultures)
-                        .AddSupportedUICultures(supportedCultures)
-                        .SetDefaultCulture("ar")
-                );
+            IApplicationBuilder app,
+            IStringLocalizer<Model> localizer)
+        {
+            var supportedCultures = new[] { "ar", "en" };
+            app.UseRequestLocalization(options =>
+                options
+                    .AddSupportedCultures(supportedCultures)
+                    .AddSupportedUICultures(supportedCultures)
+                    .SetDefaultCulture("ar")
+            );
 
-                app.Run(async (context) =>
-                {
-                    await context.Response.WriteAsync(localizer["Hello"]);
-                });
-            }
+            app.Run(async (context) =>
+            {
+                await context.Response.WriteAsync(localizer["Hello"]);
+            });
         }
+    }
 
-        public class Model
-        {
-            public string Hello { get; set; }
-        }
+    public class Model
+    {
+        public string Hello { get; set; }
     }
 }
diff --git a/test/OrchardCore.Tests/Localization/PortableObjectStringLocalizerTests.cs b/test/OrchardCore.Tests/Localization/PortableObjectStringLocalizerTests.cs
index e4b9e4bb742..e6fa51feb97 100644
--- a/test/OrchardCore.Tests/Localization/PortableObjectStringLocalizerTests.cs
+++ b/test/OrchardCore.Tests/Localization/PortableObjectStringLocalizerTests.cs
@@ -1,396 +1,395 @@
 using OrchardCore.Localization;
 using OrchardCore.Localization.PortableObject;
 
-namespace OrchardCore.Tests.Localization
+namespace OrchardCore.Tests.Localization;
+
+public class PortableObjectStringLocalizerTests
 {
-    public class PortableObjectStringLocalizerTests
+    private readonly Mock<ILocalizationManager> _localizationManager;
+    private readonly Mock<ILogger> _logger;
+
+    public PortableObjectStringLocalizerTests()
     {
-        private readonly Mock<ILocalizationManager> _localizationManager;
-        private readonly Mock<ILogger> _logger;
+        _localizationManager = new Mock<ILocalizationManager>();
+        _logger = new Mock<ILogger>();
+    }
 
-        public PortableObjectStringLocalizerTests()
-        {
-            _localizationManager = new Mock<ILocalizationManager>();
-            _logger = new Mock<ILogger>();
-        }
+    [Fact]
+    public void LocalizerReturnsTranslationsFromProvidedDictionary()
+    {
+        SetupDictionary("cs", new[] {
+            new CultureDictionaryRecord("ball", "míč", "míče", "míčů")
+        });
 
-        [Fact]
-        public void LocalizerReturnsTranslationsFromProvidedDictionary()
+        var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+        using (CultureScope.Create("cs"))
         {
-            SetupDictionary("cs", new[] {
-                new CultureDictionaryRecord("ball", "míč", "míče", "míčů")
-            });
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
-            using (CultureScope.Create("cs"))
-            {
+            var translation = localizer["ball"];
 
-                var translation = localizer["ball"];
-
-                Assert.Equal("míč", translation);
-            }
+            Assert.Equal("míč", translation);
         }
+    }
 
-        [Fact]
-        public void LocalizerReturnsOriginalTextIfTranslationsDoesntExistInProvidedDictionary()
-        {
-            SetupDictionary("cs", new[] {
-                new CultureDictionaryRecord("ball", "míč", "míče", "míčů")
-            });
+    [Fact]
+    public void LocalizerReturnsOriginalTextIfTranslationsDoesntExistInProvidedDictionary()
+    {
+        SetupDictionary("cs", new[] {
+            new CultureDictionaryRecord("ball", "míč", "míče", "míčů")
+        });
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
-            using (CultureScope.Create("cs"))
-            {
-                var translation = localizer["car"];
+        var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+        using (CultureScope.Create("cs"))
+        {
+            var translation = localizer["car"];
 
-                Assert.Equal("car", translation);
-            }
+            Assert.Equal("car", translation);
         }
+    }
 
-        [Fact]
-        public void LocalizerReturnsOriginalTextIfDictionaryIsEmpty()
-        {
-            SetupDictionary("cs", Array.Empty<CultureDictionaryRecord>());
+    [Fact]
+    public void LocalizerReturnsOriginalTextIfDictionaryIsEmpty()
+    {
+        SetupDictionary("cs", Array.Empty<CultureDictionaryRecord>());
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
-            using (CultureScope.Create("cs"))
-            {
-                var translation = localizer["car"];
+        var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+        using (CultureScope.Create("cs"))
+        {
+            var translation = localizer["car"];
 
-                Assert.Equal("car", translation);
-            }
+            Assert.Equal("car", translation);
         }
+    }
 
-        [Fact]
-        public void LocalizerFallbacksToParentCultureIfTranslationDoesntExistInSpecificCulture()
-        {
-            SetupDictionary("cs", new[] {
-                new CultureDictionaryRecord("ball", "míč", "míče", "míčů")
-            });
+    [Fact]
+    public void LocalizerFallbacksToParentCultureIfTranslationDoesntExistInSpecificCulture()
+    {
+        SetupDictionary("cs", new[] {
+            new CultureDictionaryRecord("ball", "míč", "míče", "míčů")
+        });
 
-            SetupDictionary("cs-CZ", new[] {
-                new CultureDictionaryRecord("car", "auto", "auta", "aut")
-            });
+        SetupDictionary("cs-CZ", new[] {
+            new CultureDictionaryRecord("car", "auto", "auta", "aut")
+        });
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
-            using (CultureScope.Create("cs-cz"))
-            {
-                var translation = localizer["ball"];
+        var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+        using (CultureScope.Create("cs-cz"))
+        {
+            var translation = localizer["ball"];
 
-                Assert.Equal("míč", translation);
-            }
+            Assert.Equal("míč", translation);
         }
+    }
 
-        [Fact]
-        public void LocalizerReturnsTranslationFromSpecificCultureIfItExists()
-        {
-            SetupDictionary("cs", new[] {
-                new CultureDictionaryRecord("ball", "míč", "míče", "míčů")
-            });
+    [Fact]
+    public void LocalizerReturnsTranslationFromSpecificCultureIfItExists()
+    {
+        SetupDictionary("cs", new[] {
+            new CultureDictionaryRecord("ball", "míč", "míče", "míčů")
+        });
 
-            SetupDictionary("cs-CZ", new[] {
-                new CultureDictionaryRecord("ball", "balón", "balóny", "balónů")
-            });
+        SetupDictionary("cs-CZ", new[] {
+            new CultureDictionaryRecord("ball", "balón", "balóny", "balónů")
+        });
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
-            using (CultureScope.Create("cs-CZ"))
-            {
-                var translation = localizer["ball"];
+        var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+        using (CultureScope.Create("cs-CZ"))
+        {
+            var translation = localizer["ball"];
 
-                Assert.Equal("balón", translation);
-            }
+            Assert.Equal("balón", translation);
         }
+    }
 
-        [Fact]
-        public void LocalizerReturnsTranslationWithSpecificContext()
-        {
-            SetupDictionary("cs", new[] {
-                new CultureDictionaryRecord("ball", "míč", "míče", "míčů"),
-                new CultureDictionaryRecord("ball", "small", ["míček", "míčky", "míčků"])
-            });
+    [Fact]
+    public void LocalizerReturnsTranslationWithSpecificContext()
+    {
+        SetupDictionary("cs", new[] {
+            new CultureDictionaryRecord("ball", "míč", "míče", "míčů"),
+            new CultureDictionaryRecord("ball", "small", ["míček", "míčky", "míčků"])
+        });
 
-            var localizer = new PortableObjectStringLocalizer("small", _localizationManager.Object, true, _logger.Object);
-            using (CultureScope.Create("cs"))
-            {
-                var translation = localizer["ball"];
+        var localizer = new PortableObjectStringLocalizer("small", _localizationManager.Object, true, _logger.Object);
+        using (CultureScope.Create("cs"))
+        {
+            var translation = localizer["ball"];
 
-                Assert.Equal("míček", translation);
-            }
+            Assert.Equal("míček", translation);
         }
+    }
 
-        [Fact]
-        public void LocalizerReturnsTranslationWithoutContextIfTranslationWithContextDoesntExist()
-        {
-            SetupDictionary("cs", new[] {
-                new CultureDictionaryRecord("ball", "míč", "míče", "míčů"),
-                new CultureDictionaryRecord("ball", "big", ["míček", "míčky", "míčků"])
-            });
+    [Fact]
+    public void LocalizerReturnsTranslationWithoutContextIfTranslationWithContextDoesntExist()
+    {
+        SetupDictionary("cs", new[] {
+            new CultureDictionaryRecord("ball", "míč", "míče", "míčů"),
+            new CultureDictionaryRecord("ball", "big", ["míček", "míčky", "míčků"])
+        });
 
-            var localizer = new PortableObjectStringLocalizer("small", _localizationManager.Object, true, _logger.Object);
-            using (CultureScope.Create("cs"))
-            {
-                var translation = localizer["ball"];
+        var localizer = new PortableObjectStringLocalizer("small", _localizationManager.Object, true, _logger.Object);
+        using (CultureScope.Create("cs"))
+        {
+            var translation = localizer["ball"];
 
-                Assert.Equal("míč", translation);
-            }
+            Assert.Equal("míč", translation);
         }
+    }
 
-        [Fact]
-        public void LocalizerReturnsFormattedTranslation()
-        {
-            SetupDictionary("cs", new[] {
-                new CultureDictionaryRecord("The page (ID:{0}) was deleted.", "Stránka (ID:{0}) byla smazána.")
-            });
+    [Fact]
+    public void LocalizerReturnsFormattedTranslation()
+    {
+        SetupDictionary("cs", new[] {
+            new CultureDictionaryRecord("The page (ID:{0}) was deleted.", "Stránka (ID:{0}) byla smazána.")
+        });
 
-            var localizer = new PortableObjectStringLocalizer("small", _localizationManager.Object, true, _logger.Object);
-            using (CultureScope.Create("cs"))
-            {
-                var translation = localizer["The page (ID:{0}) was deleted.", 1];
+        var localizer = new PortableObjectStringLocalizer("small", _localizationManager.Object, true, _logger.Object);
+        using (CultureScope.Create("cs"))
+        {
+            var translation = localizer["The page (ID:{0}) was deleted.", 1];
 
-                Assert.Equal("Stránka (ID:1) byla smazána.", translation);
-            }
+            Assert.Equal("Stránka (ID:1) byla smazána.", translation);
         }
+    }
 
-        [Fact]
-        public void HtmlLocalizerDoesNotFormatTwiceIfFormattedTranslationContainsCurlyBraces()
-        {
-            SetupDictionary("cs", new[] {
-                new CultureDictionaryRecord("The page (ID:{0}) was deleted.", "Stránka (ID:{0}) byla smazána.")
-            });
+    [Fact]
+    public void HtmlLocalizerDoesNotFormatTwiceIfFormattedTranslationContainsCurlyBraces()
+    {
+        SetupDictionary("cs", new[] {
+            new CultureDictionaryRecord("The page (ID:{0}) was deleted.", "Stránka (ID:{0}) byla smazána.")
+        });
 
-            var localizer = new PortableObjectStringLocalizer("small", _localizationManager.Object, true, _logger.Object);
-            using (CultureScope.Create("cs"))
-            {
-                var htmlLocalizer = new PortableObjectHtmlLocalizer(localizer);
-                var unformatted = htmlLocalizer["The page (ID:{0}) was deleted.", "{1}"];
-                var memStream = new MemoryStream();
-                var textWriter = new StreamWriter(memStream);
-                var textReader = new StreamReader(memStream);
+        var localizer = new PortableObjectStringLocalizer("small", _localizationManager.Object, true, _logger.Object);
+        using (CultureScope.Create("cs"))
+        {
+            var htmlLocalizer = new PortableObjectHtmlLocalizer(localizer);
+            var unformatted = htmlLocalizer["The page (ID:{0}) was deleted.", "{1}"];
+            var memStream = new MemoryStream();
+            var textWriter = new StreamWriter(memStream);
+            var textReader = new StreamReader(memStream);
 
-                unformatted.WriteTo(textWriter, HtmlEncoder.Default);
+            unformatted.WriteTo(textWriter, HtmlEncoder.Default);
 
-                textWriter.Flush();
-                memStream.Seek(0, SeekOrigin.Begin);
-                var formatted = textReader.ReadToEnd();
+            textWriter.Flush();
+            memStream.Seek(0, SeekOrigin.Begin);
+            var formatted = textReader.ReadToEnd();
 
-                textWriter.Dispose();
-                textReader.Dispose();
-                memStream.Dispose();
+            textWriter.Dispose();
+            textReader.Dispose();
+            memStream.Dispose();
 
-                Assert.Equal("Stránka (ID:{1}) byla smazána.", formatted);
-            }
+            Assert.Equal("Stránka (ID:{1}) byla smazána.", formatted);
         }
+    }
 
-        [Theory]
-        [InlineData("car", 1)]
-        [InlineData("cars", 2)]
-        public void LocalizerReturnsOriginalTextForPluralIfTranslationDoesntExist(string expected, int count)
-        {
-            SetupDictionary("cs", new[] {
-                new CultureDictionaryRecord("ball", "míč", "míče", "míčů"),
-            });
+    [Theory]
+    [InlineData("car", 1)]
+    [InlineData("cars", 2)]
+    public void LocalizerReturnsOriginalTextForPluralIfTranslationDoesntExist(string expected, int count)
+    {
+        SetupDictionary("cs", new[] {
+            new CultureDictionaryRecord("ball", "míč", "míče", "míčů"),
+        });
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
-            using (CultureScope.Create("cs"))
-            {
-                var translation = localizer.Plural(count, "car", "cars");
-                Assert.Equal(expected, translation);
-            }
+        var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+        using (CultureScope.Create("cs"))
+        {
+            var translation = localizer.Plural(count, "car", "cars");
+            Assert.Equal(expected, translation);
         }
+    }
 
-        [Theory]
-        [InlineData("zh-Hans", "球", 1, new string[] { "球" })]
-        [InlineData("zh-Hans", "球", 2, new string[] { "球" })]
-        public void LocalizerReturnsCorrectTranslationForPluralIfNoPluralFormsSpecified(string culture, string expected, int count, string[] translations)
-        {
-            using var cultureScope = CultureScope.Create(culture);
+    [Theory]
+    [InlineData("zh-Hans", "球", 1, new string[] { "球" })]
+    [InlineData("zh-Hans", "球", 2, new string[] { "球" })]
+    public void LocalizerReturnsCorrectTranslationForPluralIfNoPluralFormsSpecified(string culture, string expected, int count, string[] translations)
+    {
+        using var cultureScope = CultureScope.Create(culture);
 
-            // using DefaultPluralRuleProvider to test it returns correct rule.
-            TryGetRuleFromDefaultPluralRuleProvider(cultureScope.UICulture, out var rule);
+        // using DefaultPluralRuleProvider to test it returns correct rule.
+        TryGetRuleFromDefaultPluralRuleProvider(cultureScope.UICulture, out var rule);
 
-            Assert.NotNull(rule);
+        Assert.NotNull(rule);
 
-            SetupDictionary(culture, new[] { new CultureDictionaryRecord("ball", translations), }, rule);
+        SetupDictionary(culture, new[] { new CultureDictionaryRecord("ball", translations), }, rule);
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
-            var translation = localizer.Plural(count, "ball", "{0} balls", count);
+        var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+        var translation = localizer.Plural(count, "ball", "{0} balls", count);
 
-            Assert.Equal(expected, translation);
-        }
+        Assert.Equal(expected, translation);
+    }
 
-        [Theory]
-        [InlineData("míč", 1)]
-        [InlineData("2 míče", 2)]
-        [InlineData("5 míčů", 5)]
-        public void LocalizerReturnsTranslationInCorrectPluralForm(string expected, int count)
-        {
-            SetupDictionary("cs", new[] {
-                new CultureDictionaryRecord("ball", "míč", "{0} míče", "{0} míčů"),
-            });
+    [Theory]
+    [InlineData("míč", 1)]
+    [InlineData("2 míče", 2)]
+    [InlineData("5 míčů", 5)]
+    public void LocalizerReturnsTranslationInCorrectPluralForm(string expected, int count)
+    {
+        SetupDictionary("cs", new[] {
+            new CultureDictionaryRecord("ball", "míč", "{0} míče", "{0} míčů"),
+        });
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
-            using (CultureScope.Create("cs"))
-            {
-                var translation = localizer.Plural(count, "ball", "{0} balls", count);
+        var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+        using (CultureScope.Create("cs"))
+        {
+            var translation = localizer.Plural(count, "ball", "{0} balls", count);
 
-                Assert.Equal(expected, translation);
-            }
+            Assert.Equal(expected, translation);
         }
+    }
 
-        [Theory]
-        [InlineData("míč", 1)]
-        [InlineData("2 míče", 2)]
-        [InlineData("5 míčů", 5)]
-        public void LocalizerReturnsOriginalValuesIfTranslationDoesntExistAndMultiplePluraflFormsAreSpecified(string expected, int count)
-        {
-            SetupDictionary("en", Array.Empty<CultureDictionaryRecord>());
+    [Theory]
+    [InlineData("míč", 1)]
+    [InlineData("2 míče", 2)]
+    [InlineData("5 míčů", 5)]
+    public void LocalizerReturnsOriginalValuesIfTranslationDoesntExistAndMultiplePluraflFormsAreSpecified(string expected, int count)
+    {
+        SetupDictionary("en", Array.Empty<CultureDictionaryRecord>());
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
-            using (CultureScope.Create("en"))
-            {
-                var translation = localizer.Plural(count, ["míč", "{0} míče", "{0} míčů"], count);
+        var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+        using (CultureScope.Create("en"))
+        {
+            var translation = localizer.Plural(count, ["míč", "{0} míče", "{0} míčů"], count);
 
-                Assert.Equal(expected, translation);
-            }
+            Assert.Equal(expected, translation);
         }
+    }
 
-        [Theory]
-        [InlineData("ball", 1)]
-        [InlineData("2 balls", 2)]
-        public void LocalizerReturnsCorrectPluralFormIfMultiplePluraflFormsAreSpecified(string expected, int count)
+    [Theory]
+    [InlineData("ball", 1)]
+    [InlineData("2 balls", 2)]
+    public void LocalizerReturnsCorrectPluralFormIfMultiplePluraflFormsAreSpecified(string expected, int count)
+    {
+        SetupDictionary("en", new CultureDictionaryRecord[]
         {
-            SetupDictionary("en", new CultureDictionaryRecord[]
-            {
-                new("míč", "ball", "{0} balls")
-            }, PluralizationRule.English);
+            new("míč", "ball", "{0} balls")
+        }, PluralizationRule.English);
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
-            using (CultureScope.Create("en"))
-            {
-                var translation = localizer.Plural(count, ["míč", "{0} míče", "{0} míčů"], count);
+        var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+        using (CultureScope.Create("en"))
+        {
+            var translation = localizer.Plural(count, ["míč", "{0} míče", "{0} míčů"], count);
 
-                Assert.Equal(expected, translation);
-            }
+            Assert.Equal(expected, translation);
         }
+    }
 
-        [Theory]
-        [InlineData(false, "hello", "hello")]
-        [InlineData(true, "hello", "مرحبا")]
-        public void LocalizerFallBackToParentCultureIfFallBackToParentUICulturesIsTrue(bool fallBackToParentCulture, string resourceKey, string expected)
+    [Theory]
+    [InlineData(false, "hello", "hello")]
+    [InlineData(true, "hello", "مرحبا")]
+    public void LocalizerFallBackToParentCultureIfFallBackToParentUICulturesIsTrue(bool fallBackToParentCulture, string resourceKey, string expected)
+    {
+        SetupDictionary("ar", new CultureDictionaryRecord[]
         {
-            SetupDictionary("ar", new CultureDictionaryRecord[]
-            {
-                new("hello", "مرحبا")
-            }, PluralizationRule.Arabic);
+            new("hello", "مرحبا")
+        }, PluralizationRule.Arabic);
 
-            SetupDictionary("ar-YE", Array.Empty<CultureDictionaryRecord>(), PluralizationRule.Arabic);
+        SetupDictionary("ar-YE", Array.Empty<CultureDictionaryRecord>(), PluralizationRule.Arabic);
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, fallBackToParentCulture, _logger.Object);
-            using (CultureScope.Create("ar-YE"))
-            {
-                var translation = localizer[resourceKey];
+        var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, fallBackToParentCulture, _logger.Object);
+        using (CultureScope.Create("ar-YE"))
+        {
+            var translation = localizer[resourceKey];
 
-                Assert.Equal(expected, translation);
-            }
+            Assert.Equal(expected, translation);
         }
+    }
 
-        [Theory]
-        [InlineData(false, new[] { "مدونة", "منتج" })]
-        [InlineData(true, new[] { "مدونة", "منتج", "قائمة", "صفحة", "مقالة" })]
-        public void LocalizerReturnsGetAllStrings(bool includeParentCultures, string[] expected)
+    [Theory]
+    [InlineData(false, new[] { "مدونة", "منتج" })]
+    [InlineData(true, new[] { "مدونة", "منتج", "قائمة", "صفحة", "مقالة" })]
+    public void LocalizerReturnsGetAllStrings(bool includeParentCultures, string[] expected)
+    {
+        SetupDictionary("ar", new CultureDictionaryRecord[]
         {
-            SetupDictionary("ar", new CultureDictionaryRecord[]
-            {
-                new("Blog", "مدونة"),
-                new("Menu", "قائمة"),
-                new("Page", "صفحة"),
-                new("Article", "مقالة")
-            }, PluralizationRule.Arabic);
+            new("Blog", "مدونة"),
+            new("Menu", "قائمة"),
+            new("Page", "صفحة"),
+            new("Article", "مقالة")
+        }, PluralizationRule.Arabic);
 
-            SetupDictionary("ar-YE", new CultureDictionaryRecord[]
-            {
-                new("Blog", "مدونة"),
-                new("Product", "منتج")
-            }, PluralizationRule.Arabic);
+        SetupDictionary("ar-YE", new CultureDictionaryRecord[]
+        {
+            new("Blog", "مدونة"),
+            new("Product", "منتج")
+        }, PluralizationRule.Arabic);
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, false, _logger.Object);
-            using (CultureScope.Create("ar-YE"))
-            {
-                var translations = localizer.GetAllStrings(includeParentCultures).Select(l => l.Value).ToArray();
+        var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, false, _logger.Object);
+        using (CultureScope.Create("ar-YE"))
+        {
+            var translations = localizer.GetAllStrings(includeParentCultures).Select(l => l.Value).ToArray();
 
-                Assert.Equal(expected.Length, translations.Length);
-            }
+            Assert.Equal(expected.Length, translations.Length);
         }
+    }
 
-        [Fact]
-        public async Task PortableObjectStringLocalizerShouldRegisterIStringLocalizerOfT()
-            => await StartupRunner.Run(typeof(PortableObjectLocalizationStartup), "en", "Hello");
+    [Fact]
+    public async Task PortableObjectStringLocalizerShouldRegisterIStringLocalizerOfT()
+        => await StartupRunner.Run(typeof(PortableObjectLocalizationStartup), "en", "Hello");
 
-        [Theory]
-        [InlineData("ar", 1)]
-        [InlineData("ar-YE", 2)]
-        [InlineData("zh-Hans-CN", 3)]
-        [InlineData("zh-Hant-TW", 3)]
-        public void LocalizerWithContextShouldCallGetDictionaryOncePerCulture(string culture, int expectedCalls)
-        {
-            // Arrange
-            SetupDictionary(culture, Array.Empty<CultureDictionaryRecord>());
+    [Theory]
+    [InlineData("ar", 1)]
+    [InlineData("ar-YE", 2)]
+    [InlineData("zh-Hans-CN", 3)]
+    [InlineData("zh-Hant-TW", 3)]
+    public void LocalizerWithContextShouldCallGetDictionaryOncePerCulture(string culture, int expectedCalls)
+    {
+        // Arrange
+        SetupDictionary(culture, Array.Empty<CultureDictionaryRecord>());
 
-            var localizer = new PortableObjectStringLocalizer("context", _localizationManager.Object, true, _logger.Object);
-            CultureInfo.CurrentUICulture = CultureInfo.GetCultureInfo(culture);
+        var localizer = new PortableObjectStringLocalizer("context", _localizationManager.Object, true, _logger.Object);
+        CultureInfo.CurrentUICulture = CultureInfo.GetCultureInfo(culture);
 
-            // Act
-            var translation = localizer["Hello"];
+        // Act
+        var translation = localizer["Hello"];
 
-            // Assert
-            _localizationManager.Verify(lm => lm.GetDictionary(It.IsAny<CultureInfo>()), Times.Exactly(expectedCalls));
+        // Assert
+        _localizationManager.Verify(lm => lm.GetDictionary(It.IsAny<CultureInfo>()), Times.Exactly(expectedCalls));
 
-            Assert.Equal("Hello", translation);
-        }
+        Assert.Equal("Hello", translation);
+    }
 
-        private static bool TryGetRuleFromDefaultPluralRuleProvider(CultureInfo culture, out PluralizationRuleDelegate rule)
-            => ((IPluralRuleProvider)new DefaultPluralRuleProvider()).TryGetRule(culture, out rule);
+    private static bool TryGetRuleFromDefaultPluralRuleProvider(CultureInfo culture, out PluralizationRuleDelegate rule)
+        => ((IPluralRuleProvider)new DefaultPluralRuleProvider()).TryGetRule(culture, out rule);
 
-        private void SetupDictionary(string cultureName, IEnumerable<CultureDictionaryRecord> records)
-            => SetupDictionary(cultureName, records, PluralizationRule.Czech);
+    private void SetupDictionary(string cultureName, IEnumerable<CultureDictionaryRecord> records)
+        => SetupDictionary(cultureName, records, PluralizationRule.Czech);
 
-        private void SetupDictionary(string cultureName, IEnumerable<CultureDictionaryRecord> records, PluralizationRuleDelegate pluralRule)
-        {
-            var dictionary = new CultureDictionary(cultureName, pluralRule);
-            dictionary.MergeTranslations(records);
+    private void SetupDictionary(string cultureName, IEnumerable<CultureDictionaryRecord> records, PluralizationRuleDelegate pluralRule)
+    {
+        var dictionary = new CultureDictionary(cultureName, pluralRule);
+        dictionary.MergeTranslations(records);
 
-            _localizationManager.Setup(o => o.GetDictionary(It.Is<CultureInfo>(c => c.Name == cultureName))).Returns(dictionary);
-        }
+        _localizationManager.Setup(o => o.GetDictionary(It.Is<CultureInfo>(c => c.Name == cultureName))).Returns(dictionary);
+    }
 
-        public class PortableObjectLocalizationStartup
-        {
+    public class PortableObjectLocalizationStartup
+    {
 #pragma warning disable CA1822 // Mark members as static
-            public void ConfigureServices(IServiceCollection services)
+        public void ConfigureServices(IServiceCollection services)
 #pragma warning restore CA1822 // Mark members as static
-            {
-                services.AddMvc();
-                services.AddPortableObjectLocalization();
-            }
+        {
+            services.AddMvc();
+            services.AddPortableObjectLocalization();
+        }
 
 #pragma warning disable CA1822 // Mark members as static
-            public void Configure(
+        public void Configure(
 #pragma warning restore CA1822 // Mark members as static
-                IApplicationBuilder app,
-                IStringLocalizer<PortableObjectLocalizationStartup> localizer)
+            IApplicationBuilder app,
+            IStringLocalizer<PortableObjectLocalizationStartup> localizer)
+        {
+            var supportedCultures = new[] { "ar", "en" };
+            app.UseRequestLocalization(options =>
+                options
+                    .AddSupportedCultures(supportedCultures)
+                    .AddSupportedUICultures(supportedCultures)
+                    .SetDefaultCulture("en")
+            );
+
+            app.Run(async (context) =>
             {
-                var supportedCultures = new[] { "ar", "en" };
-                app.UseRequestLocalization(options =>
-                    options
-                        .AddSupportedCultures(supportedCultures)
-                        .AddSupportedUICultures(supportedCultures)
-                        .SetDefaultCulture("en")
-                );
-
-                app.Run(async (context) =>
-                {
-                    await context.Response.WriteAsync(localizer["Hello"]);
-                });
-            }
+                await context.Response.WriteAsync(localizer["Hello"]);
+            });
         }
     }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.AuditTrail/DateTimeParserTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.AuditTrail/DateTimeParserTests.cs
index b200e7ad4d9..8f6ab17d4d5 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.AuditTrail/DateTimeParserTests.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.AuditTrail/DateTimeParserTests.cs
@@ -1,26 +1,25 @@
 using OrchardCore.AuditTrail.Services;
 using OrchardCore.Modules;
 
-namespace OrchardCore.Tests.Modules.OrchardCore.AuditTrail
+namespace OrchardCore.Tests.Modules.OrchardCore.AuditTrail;
+
+public class DateTimeRangeTests
 {
-    public class DateTimeRangeTests
+    [Theory]
+    [InlineData("@now", "@now")]
+    [InlineData("@now-1", "@now-1")]
+    [InlineData("@now-2..@now-1", "@now-2..@now-1")]
+    [InlineData("@now+2", "@now2")]
+    [InlineData(">@now", ">@now")]
+    [InlineData(">=@now", ">=@now")]
+    //[InlineData("2019-10-12", "2019-10-12T00:00:00.0000000")]
+    //[InlineData(">2019-10-12", ">2019-10-12T00:00:00.0000000")]
+    //[InlineData("2017-01-01T01:00:00+07:00", "2017-01-01T01:00:00.0000000+07:00")]
+    //[InlineData("2017-01-01T01:00:00+07:00..2017-01-01T01:00:00+07:00", "2017-01-01T01:00:00.0000000+07:00..2017-01-01T01:00:00.0000000+07:00")]
+    public void DateParserTests(string text, string expected)
     {
-        [Theory]
-        [InlineData("@now", "@now")]
-        [InlineData("@now-1", "@now-1")]
-        [InlineData("@now-2..@now-1", "@now-2..@now-1")]
-        [InlineData("@now+2", "@now2")]
-        [InlineData(">@now", ">@now")]
-        [InlineData(">=@now", ">=@now")]
-        //[InlineData("2019-10-12", "2019-10-12T00:00:00.0000000")]
-        //[InlineData(">2019-10-12", ">2019-10-12T00:00:00.0000000")]
-        //[InlineData("2017-01-01T01:00:00+07:00", "2017-01-01T01:00:00.0000000+07:00")]
-        //[InlineData("2017-01-01T01:00:00+07:00..2017-01-01T01:00:00+07:00", "2017-01-01T01:00:00.0000000+07:00..2017-01-01T01:00:00.0000000+07:00")]
-        public void DateParserTests(string text, string expected)
-        {
-            var context = new DateTimeParseContext(CultureInfo.InvariantCulture, Mock.Of<IClock>(), Mock.Of<ITimeZone>(), new Scanner(text));
-            Assert.True(DateTimeParser.Parser.TryParse(context, out var result, out _));
-            Assert.StartsWith(expected, result.ToString());
-        }
+        var context = new DateTimeParseContext(CultureInfo.InvariantCulture, Mock.Of<IClock>(), Mock.Of<ITimeZone>(), new Scanner(text));
+        Assert.True(DateTimeParser.Parser.TryParse(context, out var result, out _));
+        Assert.StartsWith(expected, result.ToString());
     }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Contents/Feeds/RssFeedTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Contents/Feeds/RssFeedTests.cs
index 2e46b5e8878..89cb60f8cf0 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.Contents/Feeds/RssFeedTests.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.Contents/Feeds/RssFeedTests.cs
@@ -5,90 +5,89 @@
 using OrchardCore.Feeds.Models;
 using OrchardCore.Feeds.Rss;
 
-namespace OrchardCore.Tests.Modules.Contents.Feeds
+namespace OrchardCore.Tests.Modules.Contents.Feeds;
+
+public class RssFeedTests
 {
-    public class RssFeedTests
+    [Theory]
+    [InlineData("rss")]
+    [InlineData("non rss")]
+    public async Task AvoidDoubleEncodeCDATA(string format)
+    {
+        // Arrange
+        var contentManagerMock = new Mock<IContentManager>();
+        var commonFeedItemBuilder = new CommonFeedItemBuilder(contentManagerMock.Object);
+        var feedContext = CreateFeedContext(format);
+
+        contentManagerMock.SetReturnsDefault(Task.FromResult(new ContentItemMetadata
+        {
+            DisplayRouteValues = []
+        }));
+
+        contentManagerMock.SetReturnsDefault(Task.FromResult(new BodyAspect
+        {
+            Body = new HtmlString("<p>The news description goes here ...</p>")
+        }));
+
+        feedContext.Builder.AddItem(feedContext, new ContentItem
+        {
+            DisplayText = "News",
+            PublishedUtc = DateTime.UtcNow
+        });
+
+        // Act
+        await commonFeedItemBuilder.PopulateAsync(feedContext);
+
+        // Assert
+        var description = feedContext.Response.Items[0].Element.Element("description").ToString();
+
+        Assert.NotEqual("<description>&lt;![CDATA[&lt;p&gt;The news description goes here ...&lt;/p&gt;]]&gt;</description>", description);
+        Assert.Equal("<description><![CDATA[<p>The news description goes here ...</p>]]></description>", description);
+    }
+
+    [Theory]
+    [InlineData("rss")]
+    [InlineData("non rss")]
+    public async Task ShouldOnlyHtmlEntityEscapeFeedTitle(string format)
     {
-        [Theory]
-        [InlineData("rss")]
-        [InlineData("non rss")]
-        public async Task AvoidDoubleEncodeCDATA(string format)
+        // Arrange
+        var contentManagerMock = new Mock<IContentManager>();
+        var commonFeedItemBuilder = new CommonFeedItemBuilder(contentManagerMock.Object);
+        var feedContext = CreateFeedContext(format);
+
+        contentManagerMock.SetReturnsDefault(Task.FromResult(new ContentItemMetadata
         {
-            // Arrange
-            var contentManagerMock = new Mock<IContentManager>();
-            var commonFeedItemBuilder = new CommonFeedItemBuilder(contentManagerMock.Object);
-            var feedContext = CreateFeedContext(format);
-
-            contentManagerMock.SetReturnsDefault(Task.FromResult(new ContentItemMetadata
-            {
-                DisplayRouteValues = []
-            }));
-
-            contentManagerMock.SetReturnsDefault(Task.FromResult(new BodyAspect
-            {
-                Body = new HtmlString("<p>The news description goes here ...</p>")
-            }));
-
-            feedContext.Builder.AddItem(feedContext, new ContentItem
-            {
-                DisplayText = "News",
-                PublishedUtc = DateTime.UtcNow
-            });
-
-            // Act
-            await commonFeedItemBuilder.PopulateAsync(feedContext);
-
-            // Assert
-            var description = feedContext.Response.Items[0].Element.Element("description").ToString();
-
-            Assert.NotEqual("<description>&lt;![CDATA[&lt;p&gt;The news description goes here ...&lt;/p&gt;]]&gt;</description>", description);
-            Assert.Equal("<description><![CDATA[<p>The news description goes here ...</p>]]></description>", description);
-        }
-
-        [Theory]
-        [InlineData("rss")]
-        [InlineData("non rss")]
-        public async Task ShouldOnlyHtmlEntityEscapeFeedTitle(string format)
+            DisplayRouteValues = []
+        }));
+
+        contentManagerMock.SetReturnsDefault(Task.FromResult(new BodyAspect
         {
-            // Arrange
-            var contentManagerMock = new Mock<IContentManager>();
-            var commonFeedItemBuilder = new CommonFeedItemBuilder(contentManagerMock.Object);
-            var feedContext = CreateFeedContext(format);
-
-            contentManagerMock.SetReturnsDefault(Task.FromResult(new ContentItemMetadata
-            {
-                DisplayRouteValues = []
-            }));
-
-            contentManagerMock.SetReturnsDefault(Task.FromResult(new BodyAspect
-            {
-                Body = new HtmlString("<p>The news description goes here ...</p>")
-            }));
-
-            feedContext.Builder.AddItem(feedContext, new ContentItem
-            {
-                DisplayText = "It's a great title & so much > than anybody's!",
-                PublishedUtc = DateTime.UtcNow
-            });
-
-            // Act
-            await commonFeedItemBuilder.PopulateAsync(feedContext);
-
-            // Assert
-            var title = feedContext.Response.Items[0].Element.Element("title").ToString();
-
-            // Test to ensure that double encoding of title does not occur and complies with XML requirements
-            Assert.Equal("<title>It's a great title &amp; so much &gt; than anybody's!</title>", title);
-        }
-
-        private static FeedContext CreateFeedContext(string format)
+            Body = new HtmlString("<p>The news description goes here ...</p>")
+        }));
+
+        feedContext.Builder.AddItem(feedContext, new ContentItem
         {
-            var feedContextMock = new Mock<FeedContext>(Mock.Of<IUpdateModel>(), format);
+            DisplayText = "It's a great title & so much > than anybody's!",
+            PublishedUtc = DateTime.UtcNow
+        });
+
+        // Act
+        await commonFeedItemBuilder.PopulateAsync(feedContext);
+
+        // Assert
+        var title = feedContext.Response.Items[0].Element.Element("title").ToString();
+
+        // Test to ensure that double encoding of title does not occur and complies with XML requirements
+        Assert.Equal("<title>It's a great title &amp; so much &gt; than anybody's!</title>", title);
+    }
+
+    private static FeedContext CreateFeedContext(string format)
+    {
+        var feedContextMock = new Mock<FeedContext>(Mock.Of<IUpdateModel>(), format);
 
-            feedContextMock.Object.Response.Element = new XElement("Feed");
-            feedContextMock.Object.Builder = new RssFeedBuilder();
+        feedContextMock.Object.Response.Element = new XElement("Feed");
+        feedContextMock.Object.Builder = new RssFeedBuilder();
 
-            return feedContextMock.Object;
-        }
+        return feedContextMock.Object;
     }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Email/Workflows/EmailTaskTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Email/Workflows/EmailTaskTests.cs
index 8e59910f676..3fd6158dc71 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.Email/Workflows/EmailTaskTests.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.Email/Workflows/EmailTaskTests.cs
@@ -5,84 +5,83 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Tests.Modules.OrchardCore.Email.Workflows
+namespace OrchardCore.Tests.Modules.OrchardCore.Email.Workflows;
+
+public class EmailTaskTests
 {
-    public class EmailTaskTests
-    {
-        private static readonly IDictionary<string, object> _emptyDictionary = new Dictionary<string, object>();
+    private static readonly IDictionary<string, object> _emptyDictionary = new Dictionary<string, object>();
 
-        [Fact]
-        public async Task ExecuteTask_WhenToAndCcAndBccAreNotSet_ShouldFail()
+    [Fact]
+    public async Task ExecuteTask_WhenToAndCcAndBccAreNotSet_ShouldFail()
+    {
+        // Arrange
+        var emailService = CreateSmtpService(new SmtpOptions()
         {
-            // Arrange
-            var emailService = CreateSmtpService(new SmtpOptions()
-            {
-                IsEnabled = true,
-            });
-
-            var task = new EmailTask(
-                emailService,
-                new SimpleWorkflowExpressionEvaluator(),
-                Mock.Of<IStringLocalizer<EmailTask>>(),
-                HtmlEncoder.Default)
-            {
-                Subject = new WorkflowExpression<string>("Test"),
-                Body = new WorkflowExpression<string>("Test message!!")
-            };
-
-            var executionContext = new WorkflowExecutionContext(
-                new WorkflowType(),
-                new Workflow(),
-                _emptyDictionary,
-                _emptyDictionary,
-                _emptyDictionary,
-                [],
-                default,
-                []);
-            var activityContext = Mock.Of<ActivityContext>();
-
-            // Act
-            var result = await task.ExecuteAsync(executionContext, activityContext);
-
-            // Assert
-            Assert.Equal("Failed", result.Outcomes.First());
-        }
-
-        private static DefaultEmailService CreateSmtpService(SmtpOptions smtpOptions)
+            IsEnabled = true,
+        });
+
+        var task = new EmailTask(
+            emailService,
+            new SimpleWorkflowExpressionEvaluator(),
+            Mock.Of<IStringLocalizer<EmailTask>>(),
+            HtmlEncoder.Default)
         {
-            var options = new Mock<IOptions<SmtpOptions>>();
-            var logger = new Mock<ILogger<SmtpEmailProvider>>();
-            var logger2 = new Mock<ILogger<DefaultEmailService>>();
+            Subject = new WorkflowExpression<string>("Test"),
+            Body = new WorkflowExpression<string>("Test message!!")
+        };
 
-            var localizer = new Mock<IStringLocalizer<SmtpEmailProvider>>();
-            var emailServiceLocalizer = new Mock<IStringLocalizer<DefaultEmailService>>();
-            var emailValidator = new Mock<IEmailAddressValidator>();
+        var executionContext = new WorkflowExecutionContext(
+            new WorkflowType(),
+            new Workflow(),
+            _emptyDictionary,
+            _emptyDictionary,
+            _emptyDictionary,
+            [],
+            default,
+            []);
+        var activityContext = Mock.Of<ActivityContext>();
 
-            emailValidator.Setup(x => x.Validate(It.IsAny<string>()))
-                .Returns(true);
+        // Act
+        var result = await task.ExecuteAsync(executionContext, activityContext);
 
-            options.Setup(o => o.Value)
-                .Returns(smtpOptions);
+        // Assert
+        Assert.Equal("Failed", result.Outcomes.First());
+    }
 
-            var smtp = new SmtpEmailProvider(options.Object, emailValidator.Object, logger.Object, localizer.Object);
+    private static DefaultEmailService CreateSmtpService(SmtpOptions smtpOptions)
+    {
+        var options = new Mock<IOptions<SmtpOptions>>();
+        var logger = new Mock<ILogger<SmtpEmailProvider>>();
+        var logger2 = new Mock<ILogger<DefaultEmailService>>();
 
-            var resolver = new Mock<IEmailProviderResolver>();
-            resolver.Setup(x => x.GetAsync(It.IsAny<string>()))
-                .ReturnsAsync(smtp);
+        var localizer = new Mock<IStringLocalizer<SmtpEmailProvider>>();
+        var emailServiceLocalizer = new Mock<IStringLocalizer<DefaultEmailService>>();
+        var emailValidator = new Mock<IEmailAddressValidator>();
 
-            var emailService = new Mock<IEmailService>();
+        emailValidator.Setup(x => x.Validate(It.IsAny<string>()))
+            .Returns(true);
 
-            return new DefaultEmailService(
-                resolver.Object,
-                [],
-                logger2.Object,
-                emailServiceLocalizer.Object);
-        }
+        options.Setup(o => o.Value)
+            .Returns(smtpOptions);
 
-        private sealed class SimpleWorkflowExpressionEvaluator : IWorkflowExpressionEvaluator
-        {
-            public async Task<T> EvaluateAsync<T>(WorkflowExpression<T> expression, WorkflowExecutionContext workflowContext, TextEncoder encoder)
-                => await Task.FromResult((T)Convert.ChangeType(expression.Expression, typeof(T)));
-        }
+        var smtp = new SmtpEmailProvider(options.Object, emailValidator.Object, logger.Object, localizer.Object);
+
+        var resolver = new Mock<IEmailProviderResolver>();
+        resolver.Setup(x => x.GetAsync(It.IsAny<string>()))
+            .ReturnsAsync(smtp);
+
+        var emailService = new Mock<IEmailService>();
+
+        return new DefaultEmailService(
+            resolver.Object,
+            [],
+            logger2.Object,
+            emailServiceLocalizer.Object);
+    }
+
+    private sealed class SimpleWorkflowExpressionEvaluator : IWorkflowExpressionEvaluator
+    {
+        public async Task<T> EvaluateAsync<T>(WorkflowExpression<T> expression, WorkflowExecutionContext workflowContext, TextEncoder encoder)
+            => await Task.FromResult((T)Convert.ChangeType(expression.Expression, typeof(T)));
     }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Markdown/MarkdownTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Markdown/MarkdownTests.cs
index 28ca820a30b..806d3f30c65 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.Markdown/MarkdownTests.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.Markdown/MarkdownTests.cs
@@ -1,49 +1,48 @@
 using OrchardCore.Markdown.Services;
 
-namespace OrchardCore.Tests.Modules.OrchardCore.Markdown
+namespace OrchardCore.Tests.Modules.OrchardCore.Markdown;
+
+public class MarkdownTests
 {
-    public class MarkdownTests
+    [Fact]
+    public void ShouldConfigureMarkdownPipeline()
     {
-        [Fact]
-        public void ShouldConfigureMarkdownPipeline()
-        {
-            var services = new ServiceCollection();
-            services.AddOptions<MarkdownPipelineOptions>();
-            services.ConfigureMarkdownPipeline((pipeline) => pipeline.DisableHtml());
+        var services = new ServiceCollection();
+        services.AddOptions<MarkdownPipelineOptions>();
+        services.ConfigureMarkdownPipeline((pipeline) => pipeline.DisableHtml());
+
+        services.AddScoped<IMarkdownService, DefaultMarkdownService>();
+
+        var markdownService = services.BuildServiceProvider().GetService<IMarkdownService>();
 
-            services.AddScoped<IMarkdownService, DefaultMarkdownService>();
+        var markdown = @"<h1>foo</h1>";
+        var html = markdownService.ToHtml(markdown);
+        html = html.Replace("\n", "");
+        Assert.Equal(@"<p>&lt;h1&gt;foo&lt;/h1&gt;</p>", html);
+    }
 
-            var markdownService = services.BuildServiceProvider().GetService<IMarkdownService>();
+    [Fact]
+    public void ShouldReconfigureMarkdownPipeline()
+    {
+        // Setup. With defaults.
+        var services = new ServiceCollection();
+        services.AddOptions<MarkdownPipelineOptions>();
+        services.ConfigureMarkdownPipeline((pipeline) => pipeline.DisableHtml());
 
-            var markdown = @"<h1>foo</h1>";
-            var html = markdownService.ToHtml(markdown);
-            html = html.Replace("\n", "");
-            Assert.Equal(@"<p>&lt;h1&gt;foo&lt;/h1&gt;</p>", html);
-        }
+        services.AddScoped<IMarkdownService, DefaultMarkdownService>();
 
-        [Fact]
-        public void ShouldReconfigureMarkdownPipeline()
+        // Act. Clear configuration
+        services.Configure<MarkdownPipelineOptions>(o =>
         {
-            // Setup. With defaults.
-            var services = new ServiceCollection();
-            services.AddOptions<MarkdownPipelineOptions>();
-            services.ConfigureMarkdownPipeline((pipeline) => pipeline.DisableHtml());
-
-            services.AddScoped<IMarkdownService, DefaultMarkdownService>();
-
-            // Act. Clear configuration
-            services.Configure<MarkdownPipelineOptions>(o =>
-            {
-                o.Configure.Clear();
-            });
-
-            // Test.
-            var markdownService = services.BuildServiceProvider().GetService<IMarkdownService>();
-
-            var markdown = @"<h1>foo</h1>";
-            var html = markdownService.ToHtml(markdown);
-            html = html.Replace("\n", "");
-            Assert.Equal(@"<h1>foo</h1>", html);
-        }
+            o.Configure.Clear();
+        });
+
+        // Test.
+        var markdownService = services.BuildServiceProvider().GetService<IMarkdownService>();
+
+        var markdown = @"<h1>foo</h1>";
+        var html = markdownService.ToHtml(markdown);
+        html = html.Replace("\n", "");
+        Assert.Equal(@"<h1>foo</h1>", html);
     }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Media/AssetUrlShortcodeTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Media/AssetUrlShortcodeTests.cs
index 6bd411e89dd..b151fbaf3e5 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.Media/AssetUrlShortcodeTests.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.Media/AssetUrlShortcodeTests.cs
@@ -5,60 +5,59 @@
 using OrchardCore.ResourceManagement;
 using OrchardCore.Shortcodes.Services;
 
-namespace OrchardCore.Tests.Modules.OrchardCore.Media
+namespace OrchardCore.Tests.Modules.OrchardCore.Media;
+
+public class AssetUrlShortcodeTests
 {
-    public class AssetUrlShortcodeTests
+    [Theory]
+    [InlineData("", "foo [asset_url]bar baz", "foo [asset_url]bar baz")]
+    [InlineData("", @"foo [asset_url ""bar""] baz", @"foo /media/bar baz")]
+    [InlineData("", @"foo [asset_url src=""bar""] baz", @"foo /media/bar baz")]
+    [InlineData("https://cdn.com", @"foo [asset_url src=""bar""] baz", @"foo https://cdn.com/media/bar baz")]
+    [InlineData("", "foo [asset_url]~/bar[/asset_url] baz", @"foo /tenant/bar baz")]
+    [InlineData("https://cdn.com", "foo [asset_url]~/bar[/asset_url] baz", @"foo https://cdn.com/tenant/bar baz")]
+    [InlineData("", "foo [asset_url]http://bar[/asset_url] baz", @"foo http://bar baz")]
+    [InlineData("", "foo [asset_url]//bar[/asset_url] baz", @"foo //bar baz")]
+    [InlineData("", "foo [asset_url]bar[/asset_url] baz", @"foo /media/bar baz")]
+    [InlineData("", @"foo [asset_url width=""100""]bar[/asset_url] baz", @"foo /media/bar?width=100 baz")]
+    [InlineData("", @"foo [asset_url width=""100"" height=""50"" mode=""stretch""]bar[/asset_url] baz", @"foo /media/bar?width=100&height=50&rmode=stretch baz")]
+    [InlineData("", "foo [asset_url]bar[/asset_url] baz foo [asset_url]bar[/asset_url] baz", @"foo /media/bar baz foo /media/bar baz")]
+    [InlineData("", @"foo <a href=""[asset_url]bàr.jpeg[/asset_url]"">baz</a>", @"foo <a href=""/media/b%C3%A0r.jpeg"">baz</a>")]
+    [InlineData("", @"foo <a href=""[asset_url]bàr.jpeg?width=100[/asset_url]"">baz</a>", @"foo <a href=""/media/b%C3%A0r.jpeg?width=100"">baz</a>")]
+    public async Task ShouldProcess(string cdnBaseUrl, string text, string expected)
     {
-        [Theory]
-        [InlineData("", "foo [asset_url]bar baz", "foo [asset_url]bar baz")]
-        [InlineData("", @"foo [asset_url ""bar""] baz", @"foo /media/bar baz")]
-        [InlineData("", @"foo [asset_url src=""bar""] baz", @"foo /media/bar baz")]
-        [InlineData("https://cdn.com", @"foo [asset_url src=""bar""] baz", @"foo https://cdn.com/media/bar baz")]
-        [InlineData("", "foo [asset_url]~/bar[/asset_url] baz", @"foo /tenant/bar baz")]
-        [InlineData("https://cdn.com", "foo [asset_url]~/bar[/asset_url] baz", @"foo https://cdn.com/tenant/bar baz")]
-        [InlineData("", "foo [asset_url]http://bar[/asset_url] baz", @"foo http://bar baz")]
-        [InlineData("", "foo [asset_url]//bar[/asset_url] baz", @"foo //bar baz")]
-        [InlineData("", "foo [asset_url]bar[/asset_url] baz", @"foo /media/bar baz")]
-        [InlineData("", @"foo [asset_url width=""100""]bar[/asset_url] baz", @"foo /media/bar?width=100 baz")]
-        [InlineData("", @"foo [asset_url width=""100"" height=""50"" mode=""stretch""]bar[/asset_url] baz", @"foo /media/bar?width=100&height=50&rmode=stretch baz")]
-        [InlineData("", "foo [asset_url]bar[/asset_url] baz foo [asset_url]bar[/asset_url] baz", @"foo /media/bar baz foo /media/bar baz")]
-        [InlineData("", @"foo <a href=""[asset_url]bàr.jpeg[/asset_url]"">baz</a>", @"foo <a href=""/media/b%C3%A0r.jpeg"">baz</a>")]
-        [InlineData("", @"foo <a href=""[asset_url]bàr.jpeg?width=100[/asset_url]"">baz</a>", @"foo <a href=""/media/b%C3%A0r.jpeg?width=100"">baz</a>")]
-        public async Task ShouldProcess(string cdnBaseUrl, string text, string expected)
-        {
-            var fileStore = new DefaultMediaFileStore(
-                Mock.Of<IFileStore>(),
-                "/media",
-                cdnBaseUrl,
-                [],
-                [],
-                Mock.Of<ILogger<DefaultMediaFileStore>>());
+        var fileStore = new DefaultMediaFileStore(
+            Mock.Of<IFileStore>(),
+            "/media",
+            cdnBaseUrl,
+            [],
+            [],
+            Mock.Of<ILogger<DefaultMediaFileStore>>());
 
-            var defaultHttpContext = new DefaultHttpContext();
-            defaultHttpContext.Request.PathBase = new PathString("/tenant");
-            var httpContextAccessor = Mock.Of<IHttpContextAccessor>(hca => hca.HttpContext == defaultHttpContext);
+        var defaultHttpContext = new DefaultHttpContext();
+        defaultHttpContext.Request.PathBase = new PathString("/tenant");
+        var httpContextAccessor = Mock.Of<IHttpContextAccessor>(hca => hca.HttpContext == defaultHttpContext);
 
-            var options = Options.Create(new ResourceManagementOptions { CdnBaseUrl = cdnBaseUrl });
+        var options = Options.Create(new ResourceManagementOptions { CdnBaseUrl = cdnBaseUrl });
 
-            var assetUrlProvider = new AssetUrlShortcodeProvider(fileStore, httpContextAccessor, options);
+        var assetUrlProvider = new AssetUrlShortcodeProvider(fileStore, httpContextAccessor, options);
 
-            var processor = new ShortcodeService(new IShortcodeProvider[] { assetUrlProvider }, []);
+        var processor = new ShortcodeService(new IShortcodeProvider[] { assetUrlProvider }, []);
 
-            var processed = await processor.ProcessAsync(text);
+        var processed = await processor.ProcessAsync(text);
 
-            Assert.Equal(expected, processed);
-        }
+        Assert.Equal(expected, processed);
+    }
 
-        [Theory]
-        [InlineData(@"foo <a href=""[asset_url]bàr.jpeg[/asset_url]"">baz</a>", @"foo <a href=""[asset_url]bàr.jpeg[/asset_url]"">baz</a>")]
-        // Sanitizing strips the closing shortcode tag when it finds onload. This is fine, as the user cannot expect a good shortcode when they attempt xss
-        [InlineData(@"foo <a href=""[asset_url]bàr.jpeg?width=100 onload=""javascript: alert('XSS')""[/asset_url]"">baz</a>", @"foo <a href=""[asset_url]bàr.jpeg?width=100 onload="">baz</a>")]
-        public void ShouldSanitizeUnprocessed(string text, string expected)
-        {
-            // The html parts santize on save, so do not process the shortcode first.
-            var sanitizer = new HtmlSanitizerService(Options.Create(new HtmlSanitizerOptions()));
-            var sanitized = sanitizer.Sanitize(text);
-            Assert.Equal(expected, sanitized);
-        }
+    [Theory]
+    [InlineData(@"foo <a href=""[asset_url]bàr.jpeg[/asset_url]"">baz</a>", @"foo <a href=""[asset_url]bàr.jpeg[/asset_url]"">baz</a>")]
+    // Sanitizing strips the closing shortcode tag when it finds onload. This is fine, as the user cannot expect a good shortcode when they attempt xss
+    [InlineData(@"foo <a href=""[asset_url]bàr.jpeg?width=100 onload=""javascript: alert('XSS')""[/asset_url]"">baz</a>", @"foo <a href=""[asset_url]bàr.jpeg?width=100 onload="">baz</a>")]
+    public void ShouldSanitizeUnprocessed(string text, string expected)
+    {
+        // The html parts santize on save, so do not process the shortcode first.
+        var sanitizer = new HtmlSanitizerService(Options.Create(new HtmlSanitizerOptions()));
+        var sanitized = sanitizer.Sanitize(text);
+        Assert.Equal(expected, sanitized);
     }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Media/ImageShortcodeTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Media/ImageShortcodeTests.cs
index 2f3a9381c9b..46817307e8e 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.Media/ImageShortcodeTests.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.Media/ImageShortcodeTests.cs
@@ -5,65 +5,64 @@
 using OrchardCore.ResourceManagement;
 using OrchardCore.Shortcodes.Services;
 
-namespace OrchardCore.Tests.Modules.OrchardCore.Media
+namespace OrchardCore.Tests.Modules.OrchardCore.Media;
+
+public class ImageShortcodeTests
 {
-    public class ImageShortcodeTests
+    [Theory]
+    [InlineData("", "foo bar baz", "foo bar baz")]
+    [InlineData("", "foo [media]bar[/media] baz", @"foo <img src=""/media/bar""> baz")]
+    [InlineData("", "foo [media]bar[/media] baz foo [media]bar[/media] baz", @"foo <img src=""/media/bar""> baz foo <img src=""/media/bar""> baz")]
+    [InlineData("", "foo [media]bàr.jpeg?width=100[/media] baz", @"foo <img src=""/media/b%C3%A0r.jpeg?width=100""> baz")]
+    [InlineData("", "foo [media]bàr.jpeg?width=100 onload=\"javascript: alert('XSS')[/media] baz", @"foo <img src=""/media/b%C3%A0r.jpeg?width=100 onload=""> baz")]
+    [InlineData("", "foo [image]bar baz", "foo [image]bar baz")]
+    [InlineData("", @"foo [image ""bar""] baz", @"foo <img src=""/media/bar""> baz")]
+    [InlineData("", @"foo [image src=""bar""] baz", @"foo <img src=""/media/bar""> baz")]
+    [InlineData("https://cdn.com", @"foo [image src=""bar""] baz", @"foo <img src=""https://cdn.com/media/bar""> baz")]
+    [InlineData("", "foo [image]~/bar[/image] baz", @"foo <img src=""/tenant/bar""> baz")]
+    [InlineData("https://cdn.com", "foo [image]~/bar[/image] baz", @"foo <img src=""https://cdn.com/tenant/bar""> baz")] // new
+    [InlineData("", "foo [image]http://bar[/image] baz", @"foo <img src=""http://bar""> baz")]
+    [InlineData("", "foo [image]//bar[/image] baz", @"foo <img src=""//bar""> baz")]
+    [InlineData("", "foo [image]bar[/image] baz", @"foo <img src=""/media/bar""> baz")]
+    [InlineData("", @"foo [image width=""100""]bar[/image] baz", @"foo <img src=""/media/bar?width=100""> baz")]
+    [InlineData("", @"foo [image width=""100"" height=""50"" mode=""stretch""]bar[/image] baz", @"foo <img src=""/media/bar?width=100&amp;height=50&amp;rmode=stretch""> baz")]
+    [InlineData("", @"foo [image class=""className""]bar[/image] baz", @"foo <img class=""className"" src=""/media/bar""> baz")]
+    [InlineData("", @"foo [image alt=""text""]bar[/image] baz", @"foo <img alt=""text"" src=""/media/bar""> baz")]
+    [InlineData("", @"foo [image width=""100"" height=""50"" mode=""stretch"" alt=""text"" class=""className""]bar[/image] baz", @"foo <img alt=""text"" class=""className"" src=""/media/bar?width=100&amp;height=50&amp;rmode=stretch""> baz")]
+    [InlineData("", "foo [image]bar[/image] baz foo [image]bar[/image] baz", @"foo <img src=""/media/bar""> baz foo <img src=""/media/bar""> baz")]
+    [InlineData("", "foo [image]bar[/image] baz foo [image]bar[/image] baz foo [image]bar[/image] baz", @"foo <img src=""/media/bar""> baz foo <img src=""/media/bar""> baz foo <img src=""/media/bar""> baz")]
+    [InlineData("", "foo [image]bar.png[/image] baz foo-extended [image]bar-extended.png[/image] baz-extended", @"foo <img src=""/media/bar.png""> baz foo-extended <img src=""/media/bar-extended.png""> baz-extended")]
+    [InlineData("", "foo [media]bar[/media] baz foo [image]bar[/image] baz", @"foo <img src=""/media/bar""> baz foo <img src=""/media/bar""> baz")]
+    [InlineData("", "foo [image]bàr.jpeg?width=100[/image] baz", @"foo <img src=""/media/b%C3%A0r.jpeg?width=100""> baz")]
+    [InlineData("", "foo [image]bàr.jpeg?width=100 onload=\"javascript: alert('XSS')\"[/image] baz", @"foo <img src=""/media/b%C3%A0r.jpeg?width=100 onload=""> baz")]
+    public async Task ShouldProcess(string cdnBaseUrl, string text, string expected)
     {
-        [Theory]
-        [InlineData("", "foo bar baz", "foo bar baz")]
-        [InlineData("", "foo [media]bar[/media] baz", @"foo <img src=""/media/bar""> baz")]
-        [InlineData("", "foo [media]bar[/media] baz foo [media]bar[/media] baz", @"foo <img src=""/media/bar""> baz foo <img src=""/media/bar""> baz")]
-        [InlineData("", "foo [media]bàr.jpeg?width=100[/media] baz", @"foo <img src=""/media/b%C3%A0r.jpeg?width=100""> baz")]
-        [InlineData("", "foo [media]bàr.jpeg?width=100 onload=\"javascript: alert('XSS')[/media] baz", @"foo <img src=""/media/b%C3%A0r.jpeg?width=100 onload=""> baz")]
-        [InlineData("", "foo [image]bar baz", "foo [image]bar baz")]
-        [InlineData("", @"foo [image ""bar""] baz", @"foo <img src=""/media/bar""> baz")]
-        [InlineData("", @"foo [image src=""bar""] baz", @"foo <img src=""/media/bar""> baz")]
-        [InlineData("https://cdn.com", @"foo [image src=""bar""] baz", @"foo <img src=""https://cdn.com/media/bar""> baz")]
-        [InlineData("", "foo [image]~/bar[/image] baz", @"foo <img src=""/tenant/bar""> baz")]
-        [InlineData("https://cdn.com", "foo [image]~/bar[/image] baz", @"foo <img src=""https://cdn.com/tenant/bar""> baz")] // new
-        [InlineData("", "foo [image]http://bar[/image] baz", @"foo <img src=""http://bar""> baz")]
-        [InlineData("", "foo [image]//bar[/image] baz", @"foo <img src=""//bar""> baz")]
-        [InlineData("", "foo [image]bar[/image] baz", @"foo <img src=""/media/bar""> baz")]
-        [InlineData("", @"foo [image width=""100""]bar[/image] baz", @"foo <img src=""/media/bar?width=100""> baz")]
-        [InlineData("", @"foo [image width=""100"" height=""50"" mode=""stretch""]bar[/image] baz", @"foo <img src=""/media/bar?width=100&amp;height=50&amp;rmode=stretch""> baz")]
-        [InlineData("", @"foo [image class=""className""]bar[/image] baz", @"foo <img class=""className"" src=""/media/bar""> baz")]
-        [InlineData("", @"foo [image alt=""text""]bar[/image] baz", @"foo <img alt=""text"" src=""/media/bar""> baz")]
-        [InlineData("", @"foo [image width=""100"" height=""50"" mode=""stretch"" alt=""text"" class=""className""]bar[/image] baz", @"foo <img alt=""text"" class=""className"" src=""/media/bar?width=100&amp;height=50&amp;rmode=stretch""> baz")]
-        [InlineData("", "foo [image]bar[/image] baz foo [image]bar[/image] baz", @"foo <img src=""/media/bar""> baz foo <img src=""/media/bar""> baz")]
-        [InlineData("", "foo [image]bar[/image] baz foo [image]bar[/image] baz foo [image]bar[/image] baz", @"foo <img src=""/media/bar""> baz foo <img src=""/media/bar""> baz foo <img src=""/media/bar""> baz")]
-        [InlineData("", "foo [image]bar.png[/image] baz foo-extended [image]bar-extended.png[/image] baz-extended", @"foo <img src=""/media/bar.png""> baz foo-extended <img src=""/media/bar-extended.png""> baz-extended")]
-        [InlineData("", "foo [media]bar[/media] baz foo [image]bar[/image] baz", @"foo <img src=""/media/bar""> baz foo <img src=""/media/bar""> baz")]
-        [InlineData("", "foo [image]bàr.jpeg?width=100[/image] baz", @"foo <img src=""/media/b%C3%A0r.jpeg?width=100""> baz")]
-        [InlineData("", "foo [image]bàr.jpeg?width=100 onload=\"javascript: alert('XSS')\"[/image] baz", @"foo <img src=""/media/b%C3%A0r.jpeg?width=100 onload=""> baz")]
-        public async Task ShouldProcess(string cdnBaseUrl, string text, string expected)
-        {
-            var sanitizerOptions = new HtmlSanitizerOptions();
-            sanitizerOptions.Configure.Add(opt => opt.AllowedAttributes.Add("class"));
+        var sanitizerOptions = new HtmlSanitizerOptions();
+        sanitizerOptions.Configure.Add(opt => opt.AllowedAttributes.Add("class"));
 
-            var fileStore = new DefaultMediaFileStore(
-                Mock.Of<IFileStore>(),
-                "/media",
-                cdnBaseUrl,
-                [],
-                [],
-                Mock.Of<ILogger<DefaultMediaFileStore>>());
+        var fileStore = new DefaultMediaFileStore(
+            Mock.Of<IFileStore>(),
+            "/media",
+            cdnBaseUrl,
+            [],
+            [],
+            Mock.Of<ILogger<DefaultMediaFileStore>>());
 
-            var fileVersionProvider = Mock.Of<IFileVersionProvider>();
+        var fileVersionProvider = Mock.Of<IFileVersionProvider>();
 
-            var sanitizer = new HtmlSanitizerService(Options.Create(sanitizerOptions));
+        var sanitizer = new HtmlSanitizerService(Options.Create(sanitizerOptions));
 
-            var defaultHttpContext = new DefaultHttpContext();
-            defaultHttpContext.Request.PathBase = new PathString("/tenant");
-            var httpContextAccessor = Mock.Of<IHttpContextAccessor>(hca => hca.HttpContext == defaultHttpContext);
+        var defaultHttpContext = new DefaultHttpContext();
+        defaultHttpContext.Request.PathBase = new PathString("/tenant");
+        var httpContextAccessor = Mock.Of<IHttpContextAccessor>(hca => hca.HttpContext == defaultHttpContext);
 
-            var options = Options.Create(new ResourceManagementOptions { CdnBaseUrl = cdnBaseUrl });
+        var options = Options.Create(new ResourceManagementOptions { CdnBaseUrl = cdnBaseUrl });
 
-            var imageProvider = new ImageShortcodeProvider(fileStore, sanitizer, httpContextAccessor, options, fileVersionProvider);
+        var imageProvider = new ImageShortcodeProvider(fileStore, sanitizer, httpContextAccessor, options, fileVersionProvider);
 
-            var processor = new ShortcodeService(new IShortcodeProvider[] { imageProvider }, []);
+        var processor = new ShortcodeService(new IShortcodeProvider[] { imageProvider }, []);
 
-            var processed = await processor.ProcessAsync(text);
-            Assert.Equal(expected, processed);
-        }
+        var processed = await processor.ProcessAsync(text);
+        Assert.Equal(expected, processed);
     }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Media/MediaEventTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Media/MediaEventTests.cs
index aa7da31adf3..e4e7b84ef26 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.Media/MediaEventTests.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.Media/MediaEventTests.cs
@@ -1,87 +1,86 @@
 using OrchardCore.Media.Events;
 
-namespace OrchardCore.Tests.Modules.OrchardCore.Media
+namespace OrchardCore.Tests.Modules.OrchardCore.Media;
+
+public class MediaEventTests
 {
-    public class MediaEventTests
+    [Fact]
+    public async Task DisposesMediaCreatingStreams()
     {
-        [Fact]
-        public async Task DisposesMediaCreatingStreams()
+        var streams = new List<Stream>();
+        var creatingEventHandlers = new List<IMediaCreatingEventHandler>()
         {
-            var streams = new List<Stream>();
-            var creatingEventHandlers = new List<IMediaCreatingEventHandler>()
-            {
-                new TestMediaEventHandler(),
-                new TestMediaEventHandler()
-            };
+            new TestMediaEventHandler(),
+            new TestMediaEventHandler()
+        };
 
-            Stream originalStream = null;
+        Stream originalStream = null;
 
-            var path = string.Empty;
+        var path = string.Empty;
 
-            // This stream will be disposed by the creating stream, or the finally block.
+        // This stream will be disposed by the creating stream, or the finally block.
 #pragma warning disable CA1859 // Change type of variable 'inputStream' from 'System.IO.Stream' to 'System.IO.MemoryStream?' for improved performance
-            Stream inputStream = null;
+        Stream inputStream = null;
 #pragma warning restore CA1859
-            try
-            {
-                inputStream = new MemoryStream();
-                originalStream = inputStream;
+        try
+        {
+            inputStream = new MemoryStream();
+            originalStream = inputStream;
 
-                // Add original stream to streams to maintain reference to test disposal.
-                streams.Add(originalStream);
+            // Add original stream to streams to maintain reference to test disposal.
+            streams.Add(originalStream);
 
-                var outputStream = inputStream;
-                try
+            var outputStream = inputStream;
+            try
+            {
+                var context = new MediaCreatingContext
                 {
-                    var context = new MediaCreatingContext
-                    {
-                        Path = path
-                    };
-
-                    foreach (var eventHandler in creatingEventHandlers)
-                    {
-                        // Creating stream disposed by using.
-                        using var creatingStream = outputStream;
+                    Path = path
+                };
 
-                        // Add to streams to maintain reference to test disposal.
-                        streams.Add(creatingStream);
-                        inputStream = null;
-                        outputStream = null;
-                        outputStream = await eventHandler.MediaCreatingAsync(context, creatingStream);
-                    }
-                }
-                finally
+                foreach (var eventHandler in creatingEventHandlers)
                 {
-                    // This disposes the final outputStream.
-                    if (outputStream != null)
-                    {
-                        await outputStream.DisposeAsync();
-                    }
+                    // Creating stream disposed by using.
+                    using var creatingStream = outputStream;
+
+                    // Add to streams to maintain reference to test disposal.
+                    streams.Add(creatingStream);
+                    inputStream = null;
+                    outputStream = null;
+                    outputStream = await eventHandler.MediaCreatingAsync(context, creatingStream);
                 }
             }
             finally
             {
-                if (inputStream != null)
+                // This disposes the final outputStream.
+                if (outputStream != null)
                 {
-                    await inputStream.DisposeAsync();
+                    await outputStream.DisposeAsync();
                 }
             }
-
-            foreach (var stream in streams)
+        }
+        finally
+        {
+            if (inputStream != null)
             {
-                Assert.Throws<ObjectDisposedException>(() => stream.ReadByte());
+                await inputStream.DisposeAsync();
             }
         }
+
+        foreach (var stream in streams)
+        {
+            Assert.Throws<ObjectDisposedException>(() => stream.ReadByte());
+        }
     }
+}
 
-    public class TestMediaEventHandler : IMediaCreatingEventHandler
+public class TestMediaEventHandler : IMediaCreatingEventHandler
+{
+    public async Task<Stream> MediaCreatingAsync(MediaCreatingContext context, Stream inputStream)
     {
-        public async Task<Stream> MediaCreatingAsync(MediaCreatingContext context, Stream inputStream)
-        {
-            var outStream = new MemoryStream();
-            await inputStream.CopyToAsync(outStream);
+        var outStream = new MemoryStream();
+        await inputStream.CopyToAsync(outStream);
 
-            return outStream;
-        }
+        return outStream;
     }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Media/MediaTokenTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Media/MediaTokenTests.cs
index 461f0ae53fe..090d8cc8c6a 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.Media/MediaTokenTests.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.Media/MediaTokenTests.cs
@@ -3,151 +3,150 @@
 using OrchardCore.Settings;
 using OrchardCore.Tests.Utilities;
 
-namespace OrchardCore.Tests.Modules.OrchardCore.Media
+namespace OrchardCore.Tests.Modules.OrchardCore.Media;
+
+public class MediaTokenTests
 {
-    public class MediaTokenTests
+    private readonly MediaTokenSettings _mediaTokenSettings;
+
+    // use static value for repeatable tests
+    private readonly byte[] _hashKey =
+    [
+        88,
+        204,
+        124,
+        2,
+        54,
+        72,
+        44,
+        8,
+        207,
+        85,
+        88,
+        9,
+        245,
+        129,
+        200,
+        41,
+        13,
+        169,
+        54,
+        213,
+        202,
+        118,
+        197,
+        9,
+        26,
+        20,
+        108,
+        197,
+        123,
+        168,
+        140,
+        79,
+        32,
+        184,
+        144,
+        72,
+        254,
+        201,
+        91,
+        73,
+        230,
+        56,
+        190,
+        40,
+        11,
+        21,
+        229,
+        94,
+        118,
+        120,
+        84,
+        75,
+        174,
+        181,
+        168,
+        94,
+        30,
+        191,
+        169,
+        41,
+        222,
+        12,
+        239,
+        106
+    ];
+
+    public MediaTokenTests()
     {
-        private readonly MediaTokenSettings _mediaTokenSettings;
-
-        // use static value for repeatable tests
-        private readonly byte[] _hashKey =
-        [
-            88,
-            204,
-            124,
-            2,
-            54,
-            72,
-            44,
-            8,
-            207,
-            85,
-            88,
-            9,
-            245,
-            129,
-            200,
-            41,
-            13,
-            169,
-            54,
-            213,
-            202,
-            118,
-            197,
-            9,
-            26,
-            20,
-            108,
-            197,
-            123,
-            168,
-            140,
-            79,
-            32,
-            184,
-            144,
-            72,
-            254,
-            201,
-            91,
-            73,
-            230,
-            56,
-            190,
-            40,
-            11,
-            21,
-            229,
-            94,
-            118,
-            120,
-            84,
-            75,
-            174,
-            181,
-            168,
-            94,
-            30,
-            191,
-            169,
-            41,
-            222,
-            12,
-            239,
-            106
-        ];
-
-        public MediaTokenTests()
+        _mediaTokenSettings = new MediaTokenSettings
         {
-            _mediaTokenSettings = new MediaTokenSettings
-            {
-                HashKey = _hashKey,
-            };
-        }
+            HashKey = _hashKey,
+        };
+    }
 
-        [Theory]
-        [InlineData("/media/blog.jpg?width=100&height=100", "/media/blog.jpg?width=100&height=100&token=eVmmj09NoysPASEiuhCuUHJR%2BSrUtSafBo738SuL2eU%3D")]
-        [InlineData("/media/blog.jpg?width=100&height=100&foo=bar", "/media/blog.jpg?width=100&height=100&token=eVmmj09NoysPASEiuhCuUHJR%2BSrUtSafBo738SuL2eU%3D&foo=bar")]
-        public void ShouldAddToken(string path, string expected)
-        {
-            var serviceProvider = CreateServiceProvider();
-            var mediaTokenService = serviceProvider.GetRequiredService<IMediaTokenService>();
-
-            // Make sure we also hit cache.
-            for (var i = 0; i < 2; ++i)
-            {
-                var tokenizedPath = mediaTokenService.AddTokenToPath(path);
-                Assert.Equal(expected, tokenizedPath);
-            }
-        }
+    [Theory]
+    [InlineData("/media/blog.jpg?width=100&height=100", "/media/blog.jpg?width=100&height=100&token=eVmmj09NoysPASEiuhCuUHJR%2BSrUtSafBo738SuL2eU%3D")]
+    [InlineData("/media/blog.jpg?width=100&height=100&foo=bar", "/media/blog.jpg?width=100&height=100&token=eVmmj09NoysPASEiuhCuUHJR%2BSrUtSafBo738SuL2eU%3D&foo=bar")]
+    public void ShouldAddToken(string path, string expected)
+    {
+        var serviceProvider = CreateServiceProvider();
+        var mediaTokenService = serviceProvider.GetRequiredService<IMediaTokenService>();
 
-        [Theory]
-        [InlineData("/media/blog.jpg?v=version")]
-        [InlineData("/media/blog.jpg")]
-        public void ShouldNotAddTokens(string path)
+        // Make sure we also hit cache.
+        for (var i = 0; i < 2; ++i)
         {
-            var serviceProvider = CreateServiceProvider();
-            var mediaTokenService = serviceProvider.GetRequiredService<IMediaTokenService>();
-
             var tokenizedPath = mediaTokenService.AddTokenToPath(path);
-            Assert.Equal(path, tokenizedPath);
+            Assert.Equal(expected, tokenizedPath);
         }
+    }
 
-        [Fact]
-        public void ShouldGenerateConsistentToken()
-        {
-            var sp1 = CreateServiceProvider();
-            var sp2 = CreateServiceProvider();
-            var mts1 = sp1.GetRequiredService<IMediaTokenService>();
-            var mts2 = sp2.GetRequiredService<IMediaTokenService>();
-            var path = "/media/blog.jpg?width=100&height=100";
-
-            var tokenizedPath1 = mts1.AddTokenToPath(path);
-            var tokenizedPath2 = mts2.AddTokenToPath(path);
-            Assert.Equal(tokenizedPath1, tokenizedPath2);
-        }
+    [Theory]
+    [InlineData("/media/blog.jpg?v=version")]
+    [InlineData("/media/blog.jpg")]
+    public void ShouldNotAddTokens(string path)
+    {
+        var serviceProvider = CreateServiceProvider();
+        var mediaTokenService = serviceProvider.GetRequiredService<IMediaTokenService>();
 
-        private ServiceProvider CreateServiceProvider()
-        {
-            var services = new ServiceCollection();
+        var tokenizedPath = mediaTokenService.AddTokenToPath(path);
+        Assert.Equal(path, tokenizedPath);
+    }
 
-            var mockSite = SiteMockHelper.GetSite(_mediaTokenSettings);
+    [Fact]
+    public void ShouldGenerateConsistentToken()
+    {
+        var sp1 = CreateServiceProvider();
+        var sp2 = CreateServiceProvider();
+        var mts1 = sp1.GetRequiredService<IMediaTokenService>();
+        var mts2 = sp2.GetRequiredService<IMediaTokenService>();
+        var path = "/media/blog.jpg?width=100&height=100";
+
+        var tokenizedPath1 = mts1.AddTokenToPath(path);
+        var tokenizedPath2 = mts2.AddTokenToPath(path);
+        Assert.Equal(tokenizedPath1, tokenizedPath2);
+    }
 
-            var mockSiteService = Mock.Of<ISiteService>(ss => ss.GetSiteSettingsAsync() == Task.FromResult(mockSite.Object));
+    private ServiceProvider CreateServiceProvider()
+    {
+        var services = new ServiceCollection();
 
-            services.AddMemoryCache();
+        var mockSite = SiteMockHelper.GetSite(_mediaTokenSettings);
 
-            services.AddSingleton(mockSiteService);
-            services.AddSingleton<IImageWebProcessor, TokenCommandProcessor>();
-            services.AddSingleton<IImageWebProcessor, TokenCommandProcessor>();
-            services.AddSingleton<IImageWebProcessor, ResizeWebProcessor>();
-            services.AddScoped<IMediaTokenService, MediaTokenService>();
-            services.AddTransient<IConfigureOptions<MediaTokenOptions>, MediaTokenOptionsConfiguration>();
+        var mockSiteService = Mock.Of<ISiteService>(ss => ss.GetSiteSettingsAsync() == Task.FromResult(mockSite.Object));
 
-            var serviceProvider = services.BuildServiceProvider();
+        services.AddMemoryCache();
 
-            return serviceProvider;
-        }
+        services.AddSingleton(mockSiteService);
+        services.AddSingleton<IImageWebProcessor, TokenCommandProcessor>();
+        services.AddSingleton<IImageWebProcessor, TokenCommandProcessor>();
+        services.AddSingleton<IImageWebProcessor, ResizeWebProcessor>();
+        services.AddScoped<IMediaTokenService, MediaTokenService>();
+        services.AddTransient<IConfigureOptions<MediaTokenOptions>, MediaTokenOptionsConfiguration>();
+
+        var serviceProvider = services.BuildServiceProvider();
+
+        return serviceProvider;
     }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/ApplicationControllerTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/ApplicationControllerTests.cs
index da001c03095..8bcf62e0190 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/ApplicationControllerTests.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/ApplicationControllerTests.cs
@@ -6,182 +6,181 @@
 using OrchardCore.OpenId.Controllers;
 using OrchardCore.OpenId.ViewModels;
 
-namespace OrchardCore.Tests.Modules.OrchardCore.OpenId
+namespace OrchardCore.Tests.Modules.OrchardCore.OpenId;
+
+public class ApplicationControllerTests
 {
-    public class ApplicationControllerTests
+    [Fact]
+    public async Task UsersShouldNotBeAbleToCreateIfNotAllowed()
+    {
+        var controller = new ApplicationController(
+            Mock.Of<IShapeFactory>(),
+            Mock.Of<IOptions<PagerOptions>>(),
+            Mock.Of<IStringLocalizer<ApplicationController>>(),
+            Mock.Of<IAuthorizationService>(),
+            Mock.Of<IOpenIdApplicationManager>(),
+            Mock.Of<IOpenIdScopeManager>(),
+            Mock.Of<IHtmlLocalizer<ApplicationController>>(),
+            Mock.Of<INotifier>(),
+            Mock.Of<ShellDescriptor>());
+
+        var result = await controller.Create();
+        Assert.IsType<ForbidResult>(result);
+    }
+
+    [Fact]
+    public async Task UsersShouldBeAbleToCreateApplicationIfAllowed()
     {
-        [Fact]
-        public async Task UsersShouldNotBeAbleToCreateIfNotAllowed()
+        var mockOpenIdScopeManager = new Mock<IOpenIdScopeManager>();
+        var mockData = Array.Empty<object>();
+        mockOpenIdScopeManager.Setup(m => m.ListAsync(null, null, default)).Returns(mockData.ToAsyncEnumerable());
+        var controller = new ApplicationController(
+            Mock.Of<IShapeFactory>(),
+            Mock.Of<IOptions<PagerOptions>>(),
+            Mock.Of<IStringLocalizer<ApplicationController>>(),
+            MockAuthorizationServiceMock().Object,
+            Mock.Of<IOpenIdApplicationManager>(),
+            mockOpenIdScopeManager.Object,
+            Mock.Of<IHtmlLocalizer<ApplicationController>>(),
+            Mock.Of<INotifier>(),
+            Mock.Of<ShellDescriptor>())
         {
-            var controller = new ApplicationController(
-                Mock.Of<IShapeFactory>(),
-                Mock.Of<IOptions<PagerOptions>>(),
-                Mock.Of<IStringLocalizer<ApplicationController>>(),
-                Mock.Of<IAuthorizationService>(),
-                Mock.Of<IOpenIdApplicationManager>(),
-                Mock.Of<IOpenIdScopeManager>(),
-                Mock.Of<IHtmlLocalizer<ApplicationController>>(),
-                Mock.Of<INotifier>(),
-                Mock.Of<ShellDescriptor>());
-
-            var result = await controller.Create();
-            Assert.IsType<ForbidResult>(result);
-        }
+            ControllerContext = CreateControllerContext(),
+        };
 
-        [Fact]
-        public async Task UsersShouldBeAbleToCreateApplicationIfAllowed()
+        var result = await controller.Create();
+        Assert.IsType<ViewResult>(result);
+    }
+
+    [Theory]
+    [InlineData(OpenIddictConstants.ClientTypes.Public, "ClientSecret", true, false, false)]
+    [InlineData(OpenIddictConstants.ClientTypes.Public, "", true, false, true)]
+    [InlineData(OpenIddictConstants.ClientTypes.Confidential, "ClientSecret", true, false, true)]
+    [InlineData(OpenIddictConstants.ClientTypes.Confidential, "", true, false, false)]
+    public async Task ConfidentionalClientNeedsSecret(string clientType, string clientSecret, bool allowAuthFlow, bool allowPasswordFlow, bool expectValidModel)
+    {
+        var controller = new ApplicationController(
+            Mock.Of<IShapeFactory>(),
+            Mock.Of<IOptions<PagerOptions>>(),
+            MockStringLocalizer().Object,
+            MockAuthorizationServiceMock().Object,
+            Mock.Of<IOpenIdApplicationManager>(),
+            Mock.Of<IOpenIdScopeManager>(),
+            Mock.Of<IHtmlLocalizer<ApplicationController>>(),
+            Mock.Of<INotifier>(),
+            Mock.Of<ShellDescriptor>())
+        {
+            ControllerContext = CreateControllerContext(),
+        };
+
+        var model = new CreateOpenIdApplicationViewModel
+        {
+            Type = clientType,
+            ClientSecret = clientSecret,
+            AllowAuthorizationCodeFlow = allowAuthFlow,
+            AllowPasswordFlow = allowPasswordFlow,
+        };
+
+        var result = await controller.Create(model);
+        if (expectValidModel)
+        {
+            Assert.IsType<RedirectToActionResult>(result);
+        }
+        else
         {
-            var mockOpenIdScopeManager = new Mock<IOpenIdScopeManager>();
-            var mockData = Array.Empty<object>();
-            mockOpenIdScopeManager.Setup(m => m.ListAsync(null, null, default)).Returns(mockData.ToAsyncEnumerable());
-            var controller = new ApplicationController(
-                Mock.Of<IShapeFactory>(),
-                Mock.Of<IOptions<PagerOptions>>(),
-                Mock.Of<IStringLocalizer<ApplicationController>>(),
-                MockAuthorizationServiceMock().Object,
-                Mock.Of<IOpenIdApplicationManager>(),
-                mockOpenIdScopeManager.Object,
-                Mock.Of<IHtmlLocalizer<ApplicationController>>(),
-                Mock.Of<INotifier>(),
-                Mock.Of<ShellDescriptor>())
-            {
-                ControllerContext = CreateControllerContext(),
-            };
-
-            var result = await controller.Create();
             Assert.IsType<ViewResult>(result);
         }
+        Assert.Equal(expectValidModel, controller.ModelState.IsValid);
+    }
 
-        [Theory]
-        [InlineData(OpenIddictConstants.ClientTypes.Public, "ClientSecret", true, false, false)]
-        [InlineData(OpenIddictConstants.ClientTypes.Public, "", true, false, true)]
-        [InlineData(OpenIddictConstants.ClientTypes.Confidential, "ClientSecret", true, false, true)]
-        [InlineData(OpenIddictConstants.ClientTypes.Confidential, "", true, false, false)]
-        public async Task ConfidentionalClientNeedsSecret(string clientType, string clientSecret, bool allowAuthFlow, bool allowPasswordFlow, bool expectValidModel)
+    [Theory]
+    [InlineData("nonUrlString", false)]
+    [InlineData("http://localhost http://localhost:8080 nonUrlString", false)]
+    [InlineData("http://localhost http://localhost:8080", true)]
+    public async Task RedirectUrisAreValid(string uris, bool expectValidModel)
+    {
+        // Arrange
+        var controller = new ApplicationController(
+            Mock.Of<IShapeFactory>(),
+            Mock.Of<IOptions<PagerOptions>>(),
+            MockStringLocalizer().Object,
+            MockAuthorizationServiceMock().Object,
+            Mock.Of<IOpenIdApplicationManager>(),
+            Mock.Of<IOpenIdScopeManager>(),
+            Mock.Of<IHtmlLocalizer<ApplicationController>>(),
+            Mock.Of<INotifier>(),
+            Mock.Of<ShellDescriptor>())
         {
-            var controller = new ApplicationController(
-                Mock.Of<IShapeFactory>(),
-                Mock.Of<IOptions<PagerOptions>>(),
-                MockStringLocalizer().Object,
-                MockAuthorizationServiceMock().Object,
-                Mock.Of<IOpenIdApplicationManager>(),
-                Mock.Of<IOpenIdScopeManager>(),
-                Mock.Of<IHtmlLocalizer<ApplicationController>>(),
-                Mock.Of<INotifier>(),
-                Mock.Of<ShellDescriptor>())
-            {
-                ControllerContext = CreateControllerContext(),
-            };
-
-            var model = new CreateOpenIdApplicationViewModel
-            {
-                Type = clientType,
-                ClientSecret = clientSecret,
-                AllowAuthorizationCodeFlow = allowAuthFlow,
-                AllowPasswordFlow = allowPasswordFlow,
-            };
-
-            var result = await controller.Create(model);
-            if (expectValidModel)
-            {
-                Assert.IsType<RedirectToActionResult>(result);
-            }
-            else
-            {
-                Assert.IsType<ViewResult>(result);
-            }
-            Assert.Equal(expectValidModel, controller.ModelState.IsValid);
-        }
+            ControllerContext = CreateControllerContext(),
+        };
+
+        var model = new CreateOpenIdApplicationViewModel
+        {
+            Type = OpenIddictConstants.ClientTypes.Public,
+            AllowAuthorizationCodeFlow = true,
+            ClientId = "123",
+            DisplayName = "Name",
+            RedirectUris = uris
+        };
+
+        ValidateControllerModel(controller, model);
+
+        // Act
+        var result = await controller.Create(model);
+
+        // Assert
+        Assert.Equal(expectValidModel, controller.ModelState.IsValid);
 
-        [Theory]
-        [InlineData("nonUrlString", false)]
-        [InlineData("http://localhost http://localhost:8080 nonUrlString", false)]
-        [InlineData("http://localhost http://localhost:8080", true)]
-        public async Task RedirectUrisAreValid(string uris, bool expectValidModel)
+        if (expectValidModel)
         {
-            // Arrange
-            var controller = new ApplicationController(
-                Mock.Of<IShapeFactory>(),
-                Mock.Of<IOptions<PagerOptions>>(),
-                MockStringLocalizer().Object,
-                MockAuthorizationServiceMock().Object,
-                Mock.Of<IOpenIdApplicationManager>(),
-                Mock.Of<IOpenIdScopeManager>(),
-                Mock.Of<IHtmlLocalizer<ApplicationController>>(),
-                Mock.Of<INotifier>(),
-                Mock.Of<ShellDescriptor>())
-            {
-                ControllerContext = CreateControllerContext(),
-            };
-
-            var model = new CreateOpenIdApplicationViewModel
-            {
-                Type = OpenIddictConstants.ClientTypes.Public,
-                AllowAuthorizationCodeFlow = true,
-                ClientId = "123",
-                DisplayName = "Name",
-                RedirectUris = uris
-            };
-
-            ValidateControllerModel(controller, model);
-
-            // Act
-            var result = await controller.Create(model);
-
-            // Assert
-            Assert.Equal(expectValidModel, controller.ModelState.IsValid);
-
-            if (expectValidModel)
-            {
-                Assert.IsType<RedirectToActionResult>(result);
-            }
-            else
-            {
-                Assert.IsType<ViewResult>(result);
-            }
+            Assert.IsType<RedirectToActionResult>(result);
         }
+        else
+        {
+            Assert.IsType<ViewResult>(result);
+        }
+    }
 
 #pragma warning disable CA1822 // Mark members as static
-        public Mock<IAuthorizationService> MockAuthorizationServiceMock()
-        {
-            var securityMock = new Mock<IAuthorizationService>(MockBehavior.Strict);
+    public Mock<IAuthorizationService> MockAuthorizationServiceMock()
+    {
+        var securityMock = new Mock<IAuthorizationService>(MockBehavior.Strict);
 
-            securityMock.Setup(x => x.AuthorizeAsync(It.IsAny<ClaimsPrincipal>(), It.IsAny<object>(), It.IsAny<IEnumerable<IAuthorizationRequirement>>())).Returns(Task.FromResult(AuthorizationResult.Success()));
-            securityMock.Setup(x => x.AuthorizeAsync(It.IsAny<ClaimsPrincipal>(), It.IsAny<object>(), It.IsAny<string>())).Returns(Task.FromResult(AuthorizationResult.Success()));
-            return securityMock;
-        }
+        securityMock.Setup(x => x.AuthorizeAsync(It.IsAny<ClaimsPrincipal>(), It.IsAny<object>(), It.IsAny<IEnumerable<IAuthorizationRequirement>>())).Returns(Task.FromResult(AuthorizationResult.Success()));
+        securityMock.Setup(x => x.AuthorizeAsync(It.IsAny<ClaimsPrincipal>(), It.IsAny<object>(), It.IsAny<string>())).Returns(Task.FromResult(AuthorizationResult.Success()));
+        return securityMock;
+    }
 
-        public ControllerContext CreateControllerContext()
-        {
-            var mockContext = new Mock<HttpContext>(MockBehavior.Loose);
-            mockContext.SetupGet(hc => hc.User).Returns(new ClaimsPrincipal());
+    public ControllerContext CreateControllerContext()
+    {
+        var mockContext = new Mock<HttpContext>(MockBehavior.Loose);
+        mockContext.SetupGet(hc => hc.User).Returns(new ClaimsPrincipal());
 
-            return new ControllerContext()
-            {
-                HttpContext = mockContext.Object,
-            };
-        }
+        return new ControllerContext()
+        {
+            HttpContext = mockContext.Object,
+        };
+    }
 
-        public Mock<IStringLocalizer<ApplicationController>> MockStringLocalizer()
+    public Mock<IStringLocalizer<ApplicationController>> MockStringLocalizer()
 #pragma warning restore CA1822 // Mark members as static
-        {
-            var localizerMock = new Mock<IStringLocalizer<ApplicationController>>();
-            localizerMock.Setup(x => x[It.IsAny<string>()]).Returns(new LocalizedString("TextToLocalize", "localizedText"));
+    {
+        var localizerMock = new Mock<IStringLocalizer<ApplicationController>>();
+        localizerMock.Setup(x => x[It.IsAny<string>()]).Returns(new LocalizedString("TextToLocalize", "localizedText"));
 
-            return localizerMock;
-        }
+        return localizerMock;
+    }
 
-        private static void ValidateControllerModel(Controller controller, object model)
-        {
-            var results = new List<ValidationResult>();
-            var context = new ValidationContext(model, null, null);
+    private static void ValidateControllerModel(Controller controller, object model)
+    {
+        var results = new List<ValidationResult>();
+        var context = new ValidationContext(model, null, null);
 
-            Validator.TryValidateObject(model, context, results, true);
+        Validator.TryValidateObject(model, context, results, true);
 
-            foreach (var result in results)
-            {
-                controller.ModelState.AddModelError(result.MemberNames.First(), result.ErrorMessage);
-            }
+        foreach (var result in results)
+        {
+            controller.ModelState.AddModelError(result.MemberNames.First(), result.ErrorMessage);
         }
     }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdApplicationStepTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdApplicationStepTests.cs
index 21340c8a500..5d9c2922b94 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdApplicationStepTests.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdApplicationStepTests.cs
@@ -6,165 +6,164 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Tests.Utilities;
 
-namespace OrchardCore.Tests.Modules.OrchardCore.OpenId
+namespace OrchardCore.Tests.Modules.OrchardCore.OpenId;
+
+public class OpenIdApplicationStepTests
 {
-    public class OpenIdApplicationStepTests
+    [Theory]
+    [ClassData(typeof(OpenIdApplicationStepTestsData))]
+    public async Task OpenIdApplicationCanBeParsed(string recipeName, OpenIdApplicationDescriptor expected)
+    {
+        // Arrange
+        OpenIdApplicationDescriptor actual = null;
+        var appManagerMock = new Mock<IOpenIdApplicationManager>(MockBehavior.Strict);
+
+        appManagerMock.Setup(m =>
+            m.FindByClientIdAsync(
+                It.IsAny<string>(),
+                It.IsAny<CancellationToken>()))
+            .Returns(
+                new ValueTask<object>(actual));
+
+        appManagerMock.Setup(m =>
+            m.CreateAsync(
+                It.IsAny<OpenIdApplicationDescriptor>(),
+                It.IsAny<CancellationToken>()))
+            .Callback<object, CancellationToken>((app, c) =>
+                actual = (OpenIdApplicationDescriptor)app)
+            .Returns(
+                new ValueTask<object>(actual));
+
+
+        var step = new OpenIdApplicationStep(appManagerMock.Object);
+        var recipe = JsonNode.Parse(GetRecipeFileContent(recipeName));
+        var context = new RecipeExecutionContext
+        {
+            Name = recipe["steps"][0].Value<string>("name"),
+            Step = (JsonObject)recipe["steps"][0],
+        };
+
+        // Act
+        await step.ExecuteAsync(context);
+
+        // Assert
+        appManagerMock.Verify(m =>
+            m.FindByClientIdAsync(
+                It.Is<string>(ci => ci == expected.ClientId),
+                It.IsAny<CancellationToken>()));
+
+        appManagerMock.Verify(m =>
+            m.CreateAsync(
+                It.IsAny<OpenIdApplicationDescriptor>(),
+                It.IsAny<CancellationToken>()));
+
+        Assert.Equal(expected.ClientId, actual.ClientId);
+        Assert.Equal(expected.ClientSecret, actual.ClientSecret);
+        Assert.Equal(expected.ClientType, actual.ClientType);
+        Assert.Equal(expected.ConsentType, actual.ConsentType);
+        Assert.Equal(expected.DisplayName, actual.DisplayName);
+        Assert.Equal(expected.Permissions, actual.Permissions);
+        Assert.Equal(expected.PostLogoutRedirectUris, actual.PostLogoutRedirectUris);
+        Assert.Equal(expected.RedirectUris, actual.RedirectUris);
+        Assert.Equal(expected.Roles, actual.Roles);
+    }
+
+    [Fact]
+    public async Task OpenIdApplicationCanBeUpdated()
     {
-        [Theory]
-        [ClassData(typeof(OpenIdApplicationStepTestsData))]
-        public async Task OpenIdApplicationCanBeParsed(string recipeName, OpenIdApplicationDescriptor expected)
+        // Arrange
+        var recipeName = "app-recipe3";
+        var clientId = "a1";
+        var expected = new OpenIdApplicationDescriptor
         {
-            // Arrange
-            OpenIdApplicationDescriptor actual = null;
-            var appManagerMock = new Mock<IOpenIdApplicationManager>(MockBehavior.Strict);
-
-            appManagerMock.Setup(m =>
-                m.FindByClientIdAsync(
-                    It.IsAny<string>(),
-                    It.IsAny<CancellationToken>()))
-                .Returns(
-                    new ValueTask<object>(actual));
-
-            appManagerMock.Setup(m =>
-                m.CreateAsync(
-                    It.IsAny<OpenIdApplicationDescriptor>(),
-                    It.IsAny<CancellationToken>()))
-                .Callback<object, CancellationToken>((app, c) =>
-                    actual = (OpenIdApplicationDescriptor)app)
-                .Returns(
-                    new ValueTask<object>(actual));
-
-
-            var step = new OpenIdApplicationStep(appManagerMock.Object);
-            var recipe = JsonNode.Parse(GetRecipeFileContent(recipeName));
-            var context = new RecipeExecutionContext
-            {
-                Name = recipe["steps"][0].Value<string>("name"),
-                Step = (JsonObject)recipe["steps"][0],
-            };
-
-            // Act
-            await step.ExecuteAsync(context);
-
-            // Assert
-            appManagerMock.Verify(m =>
-                m.FindByClientIdAsync(
-                    It.Is<string>(ci => ci == expected.ClientId),
-                    It.IsAny<CancellationToken>()));
-
-            appManagerMock.Verify(m =>
-                m.CreateAsync(
-                    It.IsAny<OpenIdApplicationDescriptor>(),
-                    It.IsAny<CancellationToken>()));
-
-            Assert.Equal(expected.ClientId, actual.ClientId);
-            Assert.Equal(expected.ClientSecret, actual.ClientSecret);
-            Assert.Equal(expected.ClientType, actual.ClientType);
-            Assert.Equal(expected.ConsentType, actual.ConsentType);
-            Assert.Equal(expected.DisplayName, actual.DisplayName);
-            Assert.Equal(expected.Permissions, actual.Permissions);
-            Assert.Equal(expected.PostLogoutRedirectUris, actual.PostLogoutRedirectUris);
-            Assert.Equal(expected.RedirectUris, actual.RedirectUris);
-            Assert.Equal(expected.Roles, actual.Roles);
-        }
-
-        [Fact]
-        public async Task OpenIdApplicationCanBeUpdated()
+            ClientId = clientId,
+            DisplayName = "Expected Name"
+        };
+        expected.RedirectUris.UnionWith(new[] { new Uri("https://localhost/redirect") });
+
+        var actual = new OpenIdApplicationDescriptor
+        {
+            ClientId = clientId,
+            DisplayName = "Actual Name"
+        };
+        actual.RedirectUris.UnionWith(new[] { new Uri("https://localhost/x") });
+        actual.Roles.UnionWith(new[] { "x" });
+        actual.Permissions.UnionWith(new[] { $"{OpenIddictConstants.Permissions.Prefixes.Scope}x" });
+
+        var actualDb = new OpenIdApplication
         {
-            // Arrange
-            var recipeName = "app-recipe3";
-            var clientId = "a1";
-            var expected = new OpenIdApplicationDescriptor
-            {
-                ClientId = clientId,
-                DisplayName = "Expected Name"
-            };
-            expected.RedirectUris.UnionWith(new[] { new Uri("https://localhost/redirect") });
-
-            var actual = new OpenIdApplicationDescriptor
-            {
-                ClientId = clientId,
-                DisplayName = "Actual Name"
-            };
-            actual.RedirectUris.UnionWith(new[] { new Uri("https://localhost/x") });
-            actual.Roles.UnionWith(new[] { "x" });
-            actual.Permissions.UnionWith(new[] { $"{OpenIddictConstants.Permissions.Prefixes.Scope}x" });
-
-            var actualDb = new OpenIdApplication
-            {
-                ClientId = actual.ClientId,
-                DisplayName = actual.DisplayName,
-                RedirectUris = actual.RedirectUris.Select(u => u.AbsoluteUri).ToImmutableArray(),
-                Roles = actual.Roles.ToImmutableArray(),
-                Permissions = actual.Permissions.ToImmutableArray()
-            };
-
-            var appManagerMock = new Mock<IOpenIdApplicationManager>(MockBehavior.Strict);
-
-            appManagerMock.Setup(m =>
-                m.FindByClientIdAsync(
-                    It.IsAny<string>(),
-                    It.IsAny<CancellationToken>()))
-                .Returns(
-                    new ValueTask<object>(actualDb));
-
-            appManagerMock.Setup(m =>
-                m.PopulateAsync(
-                    It.IsAny<OpenIddictApplicationDescriptor>(),
-                    It.IsAny<object>(),
-                    It.IsAny<CancellationToken>()))
-                .Returns(
-                    new ValueTask());
-
-            appManagerMock.Setup(m =>
-                m.UpdateAsync(
-                    It.IsAny<object>(),
-                    It.IsAny<OpenIdApplicationDescriptor>(),
-                    It.IsAny<CancellationToken>()))
-                .Callback<object, OpenIddictApplicationDescriptor, CancellationToken>((app, desc, c) =>
-                    actual = (OpenIdApplicationDescriptor)desc)
-                .Returns(
-                    new ValueTask());
-
-            var step = new OpenIdApplicationStep(appManagerMock.Object);
-            var recipe = JsonNode.Parse(GetRecipeFileContent(recipeName));
-            var context = new RecipeExecutionContext
-            {
-                Name = recipe["steps"][0].Value<string>("name"),
-                Step = (JsonObject)recipe["steps"][0],
-            };
-
-            // Act
-            await step.ExecuteAsync(context);
-
-            // Assert
-            appManagerMock.Verify(m =>
-                m.FindByClientIdAsync(
-                    It.Is<string>(ci => ci == expected.ClientId),
-                    It.IsAny<CancellationToken>()));
-
-            appManagerMock.Verify(m =>
-                m.UpdateAsync(
-                    It.IsAny<object>(),
-                    It.IsAny<OpenIdApplicationDescriptor>(),
-                    It.IsAny<CancellationToken>()));
-
-            Assert.Equal(expected.ClientId, actual.ClientId);
-            Assert.Equal(expected.ClientSecret, actual.ClientSecret);
-            Assert.Equal(expected.ClientType, actual.ClientType);
-            Assert.Equal(expected.ConsentType, actual.ConsentType);
-            Assert.Equal(expected.DisplayName, actual.DisplayName);
-            Assert.Equal(expected.Permissions, actual.Permissions);
-            Assert.Equal(expected.PostLogoutRedirectUris, actual.PostLogoutRedirectUris);
-            Assert.Equal(expected.RedirectUris, actual.RedirectUris);
-            Assert.Equal(expected.Roles, actual.Roles);
-        }
-
-        private string GetRecipeFileContent(string recipeName)
+            ClientId = actual.ClientId,
+            DisplayName = actual.DisplayName,
+            RedirectUris = actual.RedirectUris.Select(u => u.AbsoluteUri).ToImmutableArray(),
+            Roles = actual.Roles.ToImmutableArray(),
+            Permissions = actual.Permissions.ToImmutableArray()
+        };
+
+        var appManagerMock = new Mock<IOpenIdApplicationManager>(MockBehavior.Strict);
+
+        appManagerMock.Setup(m =>
+            m.FindByClientIdAsync(
+                It.IsAny<string>(),
+                It.IsAny<CancellationToken>()))
+            .Returns(
+                new ValueTask<object>(actualDb));
+
+        appManagerMock.Setup(m =>
+            m.PopulateAsync(
+                It.IsAny<OpenIddictApplicationDescriptor>(),
+                It.IsAny<object>(),
+                It.IsAny<CancellationToken>()))
+            .Returns(
+                new ValueTask());
+
+        appManagerMock.Setup(m =>
+            m.UpdateAsync(
+                It.IsAny<object>(),
+                It.IsAny<OpenIdApplicationDescriptor>(),
+                It.IsAny<CancellationToken>()))
+            .Callback<object, OpenIddictApplicationDescriptor, CancellationToken>((app, desc, c) =>
+                actual = (OpenIdApplicationDescriptor)desc)
+            .Returns(
+                new ValueTask());
+
+        var step = new OpenIdApplicationStep(appManagerMock.Object);
+        var recipe = JsonNode.Parse(GetRecipeFileContent(recipeName));
+        var context = new RecipeExecutionContext
         {
-            return new EmbeddedFileProvider(GetType().Assembly)
-                .GetFileInfo($"Modules.OrchardCore.OpenId.RecipeFiles.{recipeName}.json")
-                .ReadToEnd();
-        }
+            Name = recipe["steps"][0].Value<string>("name"),
+            Step = (JsonObject)recipe["steps"][0],
+        };
+
+        // Act
+        await step.ExecuteAsync(context);
+
+        // Assert
+        appManagerMock.Verify(m =>
+            m.FindByClientIdAsync(
+                It.Is<string>(ci => ci == expected.ClientId),
+                It.IsAny<CancellationToken>()));
+
+        appManagerMock.Verify(m =>
+            m.UpdateAsync(
+                It.IsAny<object>(),
+                It.IsAny<OpenIdApplicationDescriptor>(),
+                It.IsAny<CancellationToken>()));
+
+        Assert.Equal(expected.ClientId, actual.ClientId);
+        Assert.Equal(expected.ClientSecret, actual.ClientSecret);
+        Assert.Equal(expected.ClientType, actual.ClientType);
+        Assert.Equal(expected.ConsentType, actual.ConsentType);
+        Assert.Equal(expected.DisplayName, actual.DisplayName);
+        Assert.Equal(expected.Permissions, actual.Permissions);
+        Assert.Equal(expected.PostLogoutRedirectUris, actual.PostLogoutRedirectUris);
+        Assert.Equal(expected.RedirectUris, actual.RedirectUris);
+        Assert.Equal(expected.Roles, actual.Roles);
+    }
+
+    private string GetRecipeFileContent(string recipeName)
+    {
+        return new EmbeddedFileProvider(GetType().Assembly)
+            .GetFileInfo($"Modules.OrchardCore.OpenId.RecipeFiles.{recipeName}.json")
+            .ReadToEnd();
     }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdApplicationStepTestsData.cs b/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdApplicationStepTestsData.cs
index 7bf842091ca..ecca1e5d06f 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdApplicationStepTestsData.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdApplicationStepTestsData.cs
@@ -1,75 +1,74 @@
 using OrchardCore.OpenId.Abstractions.Descriptors;
 
-namespace OrchardCore.Tests.Modules.OrchardCore.OpenId
+namespace OrchardCore.Tests.Modules.OrchardCore.OpenId;
+
+internal sealed class OpenIdApplicationStepTestsData
+    : TheoryData<string, OpenIdApplicationDescriptor>
 {
-    internal sealed class OpenIdApplicationStepTestsData
-        : TheoryData<string, OpenIdApplicationDescriptor>
+    public OpenIdApplicationStepTestsData()
     {
-        public OpenIdApplicationStepTestsData()
-        {
-            AddWithHashsets(
-                "app-recipe1",
-                new OpenIdApplicationDescriptor
-                {
-                    ClientId = "a1",
-                    ClientSecret = "test-secret",
-                    ClientType = "confidential",
-                    ConsentType = "explicit",
-                    DisplayName = "Test Application"
-                },
-                new[] { new Uri("https://localhost:111/logout-redirect"), new Uri("https://localhost:222/logout-redirect") },
-                new[] { new Uri("https://localhost:111/redirect"), new Uri("https://localhost:222/redirect") },
-                null,
-                new[] {
-                    OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode,
-                    OpenIddictConstants.Permissions.GrantTypes.RefreshToken,
-                    OpenIddictConstants.Permissions.Endpoints.Authorization,
-                    OpenIddictConstants.Permissions.Endpoints.Logout,
-                    OpenIddictConstants.Permissions.Endpoints.Token,
-                    OpenIddictConstants.Permissions.ResponseTypes.Code,
-                });
-
-            AddWithHashsets(
-                "app-recipe2",
-                new OpenIdApplicationDescriptor
-                {
-                    ClientId = "a2",
-                    ClientSecret = "test-secret",
-                    ClientType = "confidential",
-                    ConsentType = "explicit",
-                    DisplayName = "Test Application"
-                },
-                new[] { new Uri("https://localhost/logout-redirect") },
-                new[] { new Uri("https://localhost/redirect") },
-                new[] { "role1", "role2" },
-                new[] {
-                    OpenIddictConstants.Permissions.GrantTypes.ClientCredentials,
-                    OpenIddictConstants.Permissions.Endpoints.Token,
-                    $"{OpenIddictConstants.Permissions.Prefixes.Scope}scope1"
-                });
-        }
+        AddWithHashsets(
+            "app-recipe1",
+            new OpenIdApplicationDescriptor
+            {
+                ClientId = "a1",
+                ClientSecret = "test-secret",
+                ClientType = "confidential",
+                ConsentType = "explicit",
+                DisplayName = "Test Application"
+            },
+            new[] { new Uri("https://localhost:111/logout-redirect"), new Uri("https://localhost:222/logout-redirect") },
+            new[] { new Uri("https://localhost:111/redirect"), new Uri("https://localhost:222/redirect") },
+            null,
+            new[] {
+                OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode,
+                OpenIddictConstants.Permissions.GrantTypes.RefreshToken,
+                OpenIddictConstants.Permissions.Endpoints.Authorization,
+                OpenIddictConstants.Permissions.Endpoints.Logout,
+                OpenIddictConstants.Permissions.Endpoints.Token,
+                OpenIddictConstants.Permissions.ResponseTypes.Code,
+            });
 
-        private static void UnionIfNotNull<TItem>(ISet<TItem> itemSet, IEnumerable<TItem> items)
-        {
-            if (items != null)
+        AddWithHashsets(
+            "app-recipe2",
+            new OpenIdApplicationDescriptor
             {
-                itemSet.UnionWith(items);
-            }
-        }
+                ClientId = "a2",
+                ClientSecret = "test-secret",
+                ClientType = "confidential",
+                ConsentType = "explicit",
+                DisplayName = "Test Application"
+            },
+            new[] { new Uri("https://localhost/logout-redirect") },
+            new[] { new Uri("https://localhost/redirect") },
+            new[] { "role1", "role2" },
+            new[] {
+                OpenIddictConstants.Permissions.GrantTypes.ClientCredentials,
+                OpenIddictConstants.Permissions.Endpoints.Token,
+                $"{OpenIddictConstants.Permissions.Prefixes.Scope}scope1"
+            });
+    }
 
-        private void AddWithHashsets(
-            string recipeFile,
-            OpenIdApplicationDescriptor app,
-            IEnumerable<Uri> postLogoutRedirectUris,
-            IEnumerable<Uri> redirectUris,
-            IEnumerable<string> roles,
-            IEnumerable<string> permissions)
+    private static void UnionIfNotNull<TItem>(ISet<TItem> itemSet, IEnumerable<TItem> items)
+    {
+        if (items != null)
         {
-            UnionIfNotNull(app.PostLogoutRedirectUris, postLogoutRedirectUris);
-            UnionIfNotNull(app.RedirectUris, redirectUris);
-            UnionIfNotNull(app.Roles, roles);
-            UnionIfNotNull(app.Permissions, permissions);
-            Add(recipeFile, app);
+            itemSet.UnionWith(items);
         }
     }
+
+    private void AddWithHashsets(
+        string recipeFile,
+        OpenIdApplicationDescriptor app,
+        IEnumerable<Uri> postLogoutRedirectUris,
+        IEnumerable<Uri> redirectUris,
+        IEnumerable<string> roles,
+        IEnumerable<string> permissions)
+    {
+        UnionIfNotNull(app.PostLogoutRedirectUris, postLogoutRedirectUris);
+        UnionIfNotNull(app.RedirectUris, redirectUris);
+        UnionIfNotNull(app.Roles, roles);
+        UnionIfNotNull(app.Permissions, permissions);
+        Add(recipeFile, app);
+    }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdScopeStepTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdScopeStepTests.cs
index 486edb0a2c8..b95abf31d2a 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdScopeStepTests.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdScopeStepTests.cs
@@ -6,160 +6,159 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Tests.Utilities;
 
-namespace OrchardCore.Tests.Modules.OrchardCore.OpenId
+namespace OrchardCore.Tests.Modules.OrchardCore.OpenId;
+
+public class OpenIdScopeStepTests
 {
-    public class OpenIdScopeStepTests
+    private string GetRecipeFileContent(string recipeName)
     {
-        private string GetRecipeFileContent(string recipeName)
+        return new EmbeddedFileProvider(GetType().Assembly)
+            .GetFileInfo($"Modules.OrchardCore.OpenId.RecipeFiles.{recipeName}.json")
+            .ReadToEnd();
+    }
+
+    private static OpenIdScopeDescriptor CreateScopeDescriptor(string name, string suffix, params string[] resources)
+    {
+        var scope = new OpenIdScopeDescriptor
         {
-            return new EmbeddedFileProvider(GetType().Assembly)
-                .GetFileInfo($"Modules.OrchardCore.OpenId.RecipeFiles.{recipeName}.json")
-                .ReadToEnd();
-        }
+            Name = name,
+            DisplayName = $"Test Scope {suffix}",
+            Description = $"Unit test scope {suffix}."
+        };
+        scope.Resources.UnionWith(resources);
+        return scope;
+    }
 
-        private static OpenIdScopeDescriptor CreateScopeDescriptor(string name, string suffix, params string[] resources)
+    [Fact]
+    public async Task OpenIdScopeCanBeParsed()
+    {
+        // Arrange
+
+        // Match expected with scope-recipe.json
+        var expected = CreateScopeDescriptor(
+            "test_scope", "A", "res1", "res2", "res3");
+        OpenIdScopeDescriptor actual = null;
+        var scopeManagerMock = new Mock<IOpenIdScopeManager>(MockBehavior.Strict);
+
+        scopeManagerMock.Setup(m =>
+            m.FindByNameAsync(
+                It.IsAny<string>(),
+                It.IsAny<CancellationToken>()))
+            .Returns(
+                new ValueTask<object>(actual));
+
+        scopeManagerMock.Setup(m =>
+            m.CreateAsync(
+                It.IsAny<OpenIdScopeDescriptor>(),
+                It.IsAny<CancellationToken>()))
+            .Callback<OpenIddictScopeDescriptor, CancellationToken>((s, c) =>
+                actual = (OpenIdScopeDescriptor)s)
+            .Returns(
+                new ValueTask<object>());
+
+        var step = new OpenIdScopeStep(scopeManagerMock.Object);
+        var recipe = JsonNode.Parse(GetRecipeFileContent("scope-recipe"));
+        var context = new RecipeExecutionContext
         {
-            var scope = new OpenIdScopeDescriptor
-            {
-                Name = name,
-                DisplayName = $"Test Scope {suffix}",
-                Description = $"Unit test scope {suffix}."
-            };
-            scope.Resources.UnionWith(resources);
-            return scope;
-        }
-
-        [Fact]
-        public async Task OpenIdScopeCanBeParsed()
+            Name = recipe["steps"][0].Value<string>("name"),
+            Step = (JsonObject)recipe["steps"][0],
+        };
+
+        // Act
+        await step.ExecuteAsync(context);
+
+        // Assert
+        scopeManagerMock.Verify(m =>
+            m.FindByNameAsync(
+                It.Is<string>(v => v == expected.Name),
+                It.IsAny<CancellationToken>()));
+
+        scopeManagerMock.Verify(m =>
+            m.CreateAsync(
+                It.IsAny<OpenIdScopeDescriptor>(),
+                It.IsAny<CancellationToken>()));
+
+        Assert.Equal(expected.Name, actual.Name);
+        Assert.Equal(expected.DisplayName, actual.DisplayName);
+        Assert.Equal(expected.Description, actual.Description);
+        Assert.Equal(expected.Resources.ToArray(), actual.Resources.ToArray());
+    }
+
+    [Fact]
+    public async Task OpenIdScopeCanBeUpdated()
+    {
+        // Arrange
+
+        // Match expected with scope-recipe.json
+        var scopeName = "test_scope";
+        var expected = CreateScopeDescriptor(
+            scopeName, "A", "res1", "res2", "res3");
+        var actual = CreateScopeDescriptor(
+            scopeName, "B", "res");
+        var dbActual = new OpenIdScope
         {
-            // Arrange
-
-            // Match expected with scope-recipe.json
-            var expected = CreateScopeDescriptor(
-                "test_scope", "A", "res1", "res2", "res3");
-            OpenIdScopeDescriptor actual = null;
-            var scopeManagerMock = new Mock<IOpenIdScopeManager>(MockBehavior.Strict);
-
-            scopeManagerMock.Setup(m =>
-                m.FindByNameAsync(
-                    It.IsAny<string>(),
-                    It.IsAny<CancellationToken>()))
-                .Returns(
-                    new ValueTask<object>(actual));
-
-            scopeManagerMock.Setup(m =>
-                m.CreateAsync(
-                    It.IsAny<OpenIdScopeDescriptor>(),
-                    It.IsAny<CancellationToken>()))
-                .Callback<OpenIddictScopeDescriptor, CancellationToken>((s, c) =>
-                    actual = (OpenIdScopeDescriptor)s)
-                .Returns(
-                    new ValueTask<object>());
-
-            var step = new OpenIdScopeStep(scopeManagerMock.Object);
-            var recipe = JsonNode.Parse(GetRecipeFileContent("scope-recipe"));
-            var context = new RecipeExecutionContext
-            {
-                Name = recipe["steps"][0].Value<string>("name"),
-                Step = (JsonObject)recipe["steps"][0],
-            };
-
-            // Act
-            await step.ExecuteAsync(context);
-
-            // Assert
-            scopeManagerMock.Verify(m =>
-                m.FindByNameAsync(
-                    It.Is<string>(v => v == expected.Name),
-                    It.IsAny<CancellationToken>()));
-
-            scopeManagerMock.Verify(m =>
-                m.CreateAsync(
-                    It.IsAny<OpenIdScopeDescriptor>(),
-                    It.IsAny<CancellationToken>()));
-
-            Assert.Equal(expected.Name, actual.Name);
-            Assert.Equal(expected.DisplayName, actual.DisplayName);
-            Assert.Equal(expected.Description, actual.Description);
-            Assert.Equal(expected.Resources.ToArray(), actual.Resources.ToArray());
-        }
-
-        [Fact]
-        public async Task OpenIdScopeCanBeUpdated()
+            Name = actual.Name,
+            Resources = actual.Resources.ToImmutableArray()
+        };
+        var scopeManagerMock = new Mock<IOpenIdScopeManager>(MockBehavior.Strict);
+
+        scopeManagerMock.Setup(m =>
+            m.FindByNameAsync(
+                It.IsAny<string>(),
+                It.IsAny<CancellationToken>()))
+            .Returns(
+                new ValueTask<object>(dbActual));
+
+        scopeManagerMock.Setup(m =>
+            m.PopulateAsync(
+                It.IsAny<object>(),
+                It.IsAny<OpenIdScopeDescriptor>(),
+                It.IsAny<CancellationToken>()))
+            .Returns(
+                new ValueTask());
+
+        scopeManagerMock.Setup(m =>
+            m.UpdateAsync(
+                It.IsAny<object>(),
+                It.IsAny<OpenIdScopeDescriptor>(),
+                It.IsAny<CancellationToken>()))
+            .Callback<object, OpenIddictScopeDescriptor, CancellationToken>((s, desc, c) =>
+                actual = (OpenIdScopeDescriptor)desc)
+            .Returns(
+                new ValueTask());
+
+        var step = new OpenIdScopeStep(scopeManagerMock.Object);
+        var recipe = JsonNode.Parse(GetRecipeFileContent("scope-recipe"));
+        var context = new RecipeExecutionContext
         {
-            // Arrange
-
-            // Match expected with scope-recipe.json
-            var scopeName = "test_scope";
-            var expected = CreateScopeDescriptor(
-                scopeName, "A", "res1", "res2", "res3");
-            var actual = CreateScopeDescriptor(
-                scopeName, "B", "res");
-            var dbActual = new OpenIdScope
-            {
-                Name = actual.Name,
-                Resources = actual.Resources.ToImmutableArray()
-            };
-            var scopeManagerMock = new Mock<IOpenIdScopeManager>(MockBehavior.Strict);
-
-            scopeManagerMock.Setup(m =>
-                m.FindByNameAsync(
-                    It.IsAny<string>(),
-                    It.IsAny<CancellationToken>()))
-                .Returns(
-                    new ValueTask<object>(dbActual));
-
-            scopeManagerMock.Setup(m =>
-                m.PopulateAsync(
-                    It.IsAny<object>(),
-                    It.IsAny<OpenIdScopeDescriptor>(),
-                    It.IsAny<CancellationToken>()))
-                .Returns(
-                    new ValueTask());
-
-            scopeManagerMock.Setup(m =>
-                m.UpdateAsync(
-                    It.IsAny<object>(),
-                    It.IsAny<OpenIdScopeDescriptor>(),
-                    It.IsAny<CancellationToken>()))
-                .Callback<object, OpenIddictScopeDescriptor, CancellationToken>((s, desc, c) =>
-                    actual = (OpenIdScopeDescriptor)desc)
-                .Returns(
-                    new ValueTask());
-
-            var step = new OpenIdScopeStep(scopeManagerMock.Object);
-            var recipe = JsonNode.Parse(GetRecipeFileContent("scope-recipe"));
-            var context = new RecipeExecutionContext
-            {
-                Name = recipe["steps"][0].Value<string>("name"),
-                Step = (JsonObject)recipe["steps"][0],
-            };
-
-            // Act
-            await step.ExecuteAsync(context);
-
-            // Assert
-            scopeManagerMock.Verify(m =>
-                m.FindByNameAsync(
-                    It.Is<string>(v => v == expected.Name),
-                    It.IsAny<CancellationToken>()));
-
-            scopeManagerMock.Verify(m =>
-                m.PopulateAsync(
-                    It.IsAny<object>(),
-                    It.IsAny<OpenIdScopeDescriptor>(),
-                    It.IsAny<CancellationToken>()));
-
-            scopeManagerMock.Verify(m =>
-                m.UpdateAsync(
-                    It.IsAny<object>(),
-                    It.IsAny<OpenIdScopeDescriptor>(),
-                    It.IsAny<CancellationToken>()));
-
-            Assert.Equal(expected.Name, actual.Name);
-            Assert.Equal(expected.DisplayName, actual.DisplayName);
-            Assert.Equal(expected.Description, actual.Description);
-            Assert.Equal(expected.Resources.ToArray(), actual.Resources.ToArray());
-        }
+            Name = recipe["steps"][0].Value<string>("name"),
+            Step = (JsonObject)recipe["steps"][0],
+        };
+
+        // Act
+        await step.ExecuteAsync(context);
+
+        // Assert
+        scopeManagerMock.Verify(m =>
+            m.FindByNameAsync(
+                It.Is<string>(v => v == expected.Name),
+                It.IsAny<CancellationToken>()));
+
+        scopeManagerMock.Verify(m =>
+            m.PopulateAsync(
+                It.IsAny<object>(),
+                It.IsAny<OpenIdScopeDescriptor>(),
+                It.IsAny<CancellationToken>()));
+
+        scopeManagerMock.Verify(m =>
+            m.UpdateAsync(
+                It.IsAny<object>(),
+                It.IsAny<OpenIdScopeDescriptor>(),
+                It.IsAny<CancellationToken>()));
+
+        Assert.Equal(expected.Name, actual.Name);
+        Assert.Equal(expected.DisplayName, actual.DisplayName);
+        Assert.Equal(expected.Description, actual.Description);
+        Assert.Equal(expected.Resources.ToArray(), actual.Resources.ToArray());
     }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdServerDeploymentSourceTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdServerDeploymentSourceTests.cs
index cd6f0dfd020..a2c12a9309c 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdServerDeploymentSourceTests.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdServerDeploymentSourceTests.cs
@@ -9,124 +9,123 @@
 using OrchardCore.Recipes.Models;
 using OrchardCore.Tests.Stubs;
 
-namespace OrchardCore.Tests.Modules.OrchardCore.OpenId
+namespace OrchardCore.Tests.Modules.OrchardCore.OpenId;
+
+public class OpenIdServerDeploymentSourceTests
 {
-    public class OpenIdServerDeploymentSourceTests
+    private static OpenIdServerSettings CreateSettings(string authority, OpenIdServerSettings.TokenFormat tokenFormat, bool initializeAllProperties)
     {
-        private static OpenIdServerSettings CreateSettings(string authority, OpenIdServerSettings.TokenFormat tokenFormat, bool initializeAllProperties)
+        var result = new OpenIdServerSettings
         {
-            var result = new OpenIdServerSettings
-            {
-                Authority = new Uri(authority),
-                AccessTokenFormat = tokenFormat
-            };
-
-            if (initializeAllProperties)
-            {
-                result.TokenEndpointPath = "/connect/token";
-                result.AuthorizationEndpointPath = "/connect/authorize";
-                result.LogoutEndpointPath = "/connect/logout";
-                result.UserinfoEndpointPath = "/connect/userinfo";
-                result.IntrospectionEndpointPath = "/connect/introspect";
-                result.RevocationEndpointPath = "/connect/revoke";
-
-                result.EncryptionCertificateStoreLocation = StoreLocation.LocalMachine;
-                result.EncryptionCertificateStoreName = StoreName.My;
-                result.EncryptionCertificateThumbprint = Guid.NewGuid().ToString();
-
-                result.SigningCertificateStoreLocation = StoreLocation.LocalMachine;
-                result.SigningCertificateStoreName = StoreName.My;
-                result.SigningCertificateThumbprint = Guid.NewGuid().ToString();
-
-                result.AllowAuthorizationCodeFlow = true;
-                result.AllowClientCredentialsFlow = true;
-                result.AllowHybridFlow = true;
-                result.AllowImplicitFlow = true;
-                result.AllowPasswordFlow = true;
-                result.AllowRefreshTokenFlow = true;
-
-                result.DisableAccessTokenEncryption = true;
-                result.DisableRollingRefreshTokens = true;
-                result.UseReferenceAccessTokens = true;
-                result.RequireProofKeyForCodeExchange = true;
-            }
-
-            return result;
-        }
+            Authority = new Uri(authority),
+            AccessTokenFormat = tokenFormat
+        };
 
-        private static Mock<IOpenIdServerService> CreateServerServiceWithSettingsMock(OpenIdServerSettings settings)
+        if (initializeAllProperties)
         {
-            var serverService = new Mock<IOpenIdServerService>();
+            result.TokenEndpointPath = "/connect/token";
+            result.AuthorizationEndpointPath = "/connect/authorize";
+            result.LogoutEndpointPath = "/connect/logout";
+            result.UserinfoEndpointPath = "/connect/userinfo";
+            result.IntrospectionEndpointPath = "/connect/introspect";
+            result.RevocationEndpointPath = "/connect/revoke";
+
+            result.EncryptionCertificateStoreLocation = StoreLocation.LocalMachine;
+            result.EncryptionCertificateStoreName = StoreName.My;
+            result.EncryptionCertificateThumbprint = Guid.NewGuid().ToString();
+
+            result.SigningCertificateStoreLocation = StoreLocation.LocalMachine;
+            result.SigningCertificateStoreName = StoreName.My;
+            result.SigningCertificateThumbprint = Guid.NewGuid().ToString();
+
+            result.AllowAuthorizationCodeFlow = true;
+            result.AllowClientCredentialsFlow = true;
+            result.AllowHybridFlow = true;
+            result.AllowImplicitFlow = true;
+            result.AllowPasswordFlow = true;
+            result.AllowRefreshTokenFlow = true;
+
+            result.DisableAccessTokenEncryption = true;
+            result.DisableRollingRefreshTokens = true;
+            result.UseReferenceAccessTokens = true;
+            result.RequireProofKeyForCodeExchange = true;
+        }
+
+        return result;
+    }
+
+    private static Mock<IOpenIdServerService> CreateServerServiceWithSettingsMock(OpenIdServerSettings settings)
+    {
+        var serverService = new Mock<IOpenIdServerService>();
+
+        serverService
+            .Setup(m => m.GetSettingsAsync())
+            .ReturnsAsync(settings);
+
+        serverService
+            .Setup(m => m.LoadSettingsAsync())
+            .ReturnsAsync(settings);
 
-            serverService
-                .Setup(m => m.GetSettingsAsync())
-                .ReturnsAsync(settings);
+        return serverService;
+    }
+
+    [Fact]
+    public async Task ServerDeploymentSourceIsReadableByRecipe()
+    {
+        // Arrange
+        var recipeFile = "Recipe.json";
 
-            serverService
-                .Setup(m => m.LoadSettingsAsync())
-                .ReturnsAsync(settings);
+        var expectedSettings = CreateSettings("https://deploy.localhost", OpenIdServerSettings.TokenFormat.JsonWebToken, true);
+        var deployServerServiceMock = CreateServerServiceWithSettingsMock(expectedSettings);
 
-            return serverService;
+        var actualSettings = CreateSettings("https://recipe.localhost", OpenIdServerSettings.TokenFormat.DataProtection, false);
+        var recipeServerServiceMock = CreateServerServiceWithSettingsMock(actualSettings);
+
+        var settingsProperties = typeof(OpenIdServerSettings)
+            .GetProperties();
+
+        foreach (var property in settingsProperties)
+        {
+            Assert.NotEqual(
+                property.GetValue(expectedSettings),
+                property.GetValue(actualSettings));
         }
 
-        [Fact]
-        public async Task ServerDeploymentSourceIsReadableByRecipe()
+        var fileBuilder = new MemoryFileBuilder();
+        var descriptor = new RecipeDescriptor();
+        var result = new DeploymentPlanResult(fileBuilder, descriptor);
+
+        var jsonOptions = new JsonSerializerOptions(JOptions.Base);
+        jsonOptions.Converters.Add(System.Text.Json.Serialization.DynamicJsonConverter.Instance);
+        jsonOptions.Converters.Add(PathStringJsonConverter.Instance);
+
+        var deploymentSource = new OpenIdServerDeploymentSource(deployServerServiceMock.Object);
+
+        // Act
+        await deploymentSource.ProcessDeploymentStepAsync(new OpenIdServerDeploymentStep(), result);
+        await result.FinalizeAsync();
+
+        var deploy = JsonNode.Parse(
+            fileBuilder.GetFileContents(
+                recipeFile,
+                Encoding.UTF8));
+
+        var recipeContext = new RecipeExecutionContext
+        {
+            RecipeDescriptor = descriptor,
+            Name = deploy["steps"][0].Value<string>("name"),
+            Step = (JsonObject)deploy["steps"][0],
+        };
+
+        var recipeStep = new OpenIdServerSettingsStep(recipeServerServiceMock.Object);
+        await recipeStep.ExecuteAsync(recipeContext);
+
+        // Assert
+        foreach (var property in settingsProperties)
         {
-            // Arrange
-            var recipeFile = "Recipe.json";
-
-            var expectedSettings = CreateSettings("https://deploy.localhost", OpenIdServerSettings.TokenFormat.JsonWebToken, true);
-            var deployServerServiceMock = CreateServerServiceWithSettingsMock(expectedSettings);
-
-            var actualSettings = CreateSettings("https://recipe.localhost", OpenIdServerSettings.TokenFormat.DataProtection, false);
-            var recipeServerServiceMock = CreateServerServiceWithSettingsMock(actualSettings);
-
-            var settingsProperties = typeof(OpenIdServerSettings)
-                .GetProperties();
-
-            foreach (var property in settingsProperties)
-            {
-                Assert.NotEqual(
-                    property.GetValue(expectedSettings),
-                    property.GetValue(actualSettings));
-            }
-
-            var fileBuilder = new MemoryFileBuilder();
-            var descriptor = new RecipeDescriptor();
-            var result = new DeploymentPlanResult(fileBuilder, descriptor);
-
-            var jsonOptions = new JsonSerializerOptions(JOptions.Base);
-            jsonOptions.Converters.Add(System.Text.Json.Serialization.DynamicJsonConverter.Instance);
-            jsonOptions.Converters.Add(PathStringJsonConverter.Instance);
-
-            var deploymentSource = new OpenIdServerDeploymentSource(deployServerServiceMock.Object);
-
-            // Act
-            await deploymentSource.ProcessDeploymentStepAsync(new OpenIdServerDeploymentStep(), result);
-            await result.FinalizeAsync();
-
-            var deploy = JsonNode.Parse(
-                fileBuilder.GetFileContents(
-                    recipeFile,
-                    Encoding.UTF8));
-
-            var recipeContext = new RecipeExecutionContext
-            {
-                RecipeDescriptor = descriptor,
-                Name = deploy["steps"][0].Value<string>("name"),
-                Step = (JsonObject)deploy["steps"][0],
-            };
-
-            var recipeStep = new OpenIdServerSettingsStep(recipeServerServiceMock.Object);
-            await recipeStep.ExecuteAsync(recipeContext);
-
-            // Assert
-            foreach (var property in settingsProperties)
-            {
-                Assert.Equal(
-                    property.GetValue(expectedSettings),
-                    property.GetValue(actualSettings));
-            }
+            Assert.Equal(
+                property.GetValue(expectedSettings),
+                property.GetValue(actualSettings));
         }
     }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Roles/RolesMockHelper.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Roles/RolesMockHelper.cs
index fc1131de564..ce49c777835 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.Roles/RolesMockHelper.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.Roles/RolesMockHelper.cs
@@ -1,18 +1,17 @@
-namespace OrchardCore.Tests.Modules.OrchardCore.Roles
+namespace OrchardCore.Tests.Modules.OrchardCore.Roles;
+
+public static class RolesMockHelper
 {
-    public static class RolesMockHelper
+    public static Mock<RoleManager<TRole>> MockRoleManager<TRole>()
+        where TRole : class
     {
-        public static Mock<RoleManager<TRole>> MockRoleManager<TRole>()
-            where TRole : class
-        {
-            var store = new Mock<IRoleStore<TRole>>().Object;
+        var store = new Mock<IRoleStore<TRole>>().Object;
 
-            var validators = new List<IRoleValidator<TRole>>
-            {
-                new RoleValidator<TRole>(),
-            };
+        var validators = new List<IRoleValidator<TRole>>
+        {
+            new RoleValidator<TRole>(),
+        };
 
-            return new Mock<RoleManager<TRole>>(store, validators, new UpperInvariantLookupNormalizer(), new IdentityErrorDescriber(), null);
-        }
+        return new Mock<RoleManager<TRole>>(store, validators, new UpperInvariantLookupNormalizer(), new IdentityErrorDescriber(), null);
     }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Roles/RolesPermissionsHandlerTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Roles/RolesPermissionsHandlerTests.cs
index 6c8cafde0ba..9ff5929e327 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.Roles/RolesPermissionsHandlerTests.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.Roles/RolesPermissionsHandlerTests.cs
@@ -3,136 +3,135 @@
 using OrchardCore.Security.Permissions;
 using OrchardCore.Tests.Security;
 
-namespace OrchardCore.Tests.Modules.OrchardCore.Roles
+namespace OrchardCore.Tests.Modules.OrchardCore.Roles;
+
+public class RolesPermissionsHandlerTests
 {
-    public class RolesPermissionsHandlerTests
+    [Theory]
+    [InlineData("AllowAnonymous", true, true)]
+    [InlineData("AllowAnonymous", false, true)]
+    [InlineData("AllowAuthenticated", true, true)]
+    [InlineData("AllowAuthenticated", false, false)]
+    public async Task GrantsRolesPermissions(string required, bool authenticated, bool success)
     {
-        [Theory]
-        [InlineData("AllowAnonymous", true, true)]
-        [InlineData("AllowAnonymous", false, true)]
-        [InlineData("AllowAuthenticated", true, true)]
-        [InlineData("AllowAuthenticated", false, false)]
-        public async Task GrantsRolesPermissions(string required, bool authenticated, bool success)
-        {
-            // Arrange
-            var context = PermissionHandlerHelper.CreateTestAuthorizationHandlerContext(new Permission(required), authenticated: authenticated);
-
-            var permissionHandler = CreatePermissionHandler(
-                new Role
-                {
-                    RoleName = OrchardCoreConstants.Roles.Anonymous,
-                    RoleClaims =
-                    [
-                        new() { ClaimType = Permission.ClaimType, ClaimValue = "AllowAnonymous" }
-                    ]
-                },
-                new Role
-                {
-                    RoleName = OrchardCoreConstants.Roles.Authenticated,
-                    RoleClaims =
-                    [
-                        new() { ClaimType = Permission.ClaimType, ClaimValue = "AllowAuthenticated" }
-                    ]
-                }
-            );
-
-            // Act
-            await permissionHandler.HandleAsync(context);
-
-            // Assert
-            Assert.Equal(success, context.HasSucceeded);
-        }
+        // Arrange
+        var context = PermissionHandlerHelper.CreateTestAuthorizationHandlerContext(new Permission(required), authenticated: authenticated);
 
-        [Fact]
-        public async Task DontRevokeExistingGrants()
-        {
-            // Arrange
-            var context = PermissionHandlerHelper.CreateTestAuthorizationHandlerContext(new Permission("Required"), ["Other"], true);
+        var permissionHandler = CreatePermissionHandler(
+            new Role
+            {
+                RoleName = OrchardCoreConstants.Roles.Anonymous,
+                RoleClaims =
+                [
+                    new() { ClaimType = Permission.ClaimType, ClaimValue = "AllowAnonymous" }
+                ]
+            },
+            new Role
+            {
+                RoleName = OrchardCoreConstants.Roles.Authenticated,
+                RoleClaims =
+                [
+                    new() { ClaimType = Permission.ClaimType, ClaimValue = "AllowAuthenticated" }
+                ]
+            }
+        );
 
-            var permissionHandler = CreatePermissionHandler();
+        // Act
+        await permissionHandler.HandleAsync(context);
+
+        // Assert
+        Assert.Equal(success, context.HasSucceeded);
+    }
 
-            await context.SuccessAsync("Required");
+    [Fact]
+    public async Task DontRevokeExistingGrants()
+    {
+        // Arrange
+        var context = PermissionHandlerHelper.CreateTestAuthorizationHandlerContext(new Permission("Required"), ["Other"], true);
 
-            // Act
-            await permissionHandler.HandleAsync(context);
+        var permissionHandler = CreatePermissionHandler();
 
-            // Assert
-            Assert.True(context.HasSucceeded);
-        }
+        await context.SuccessAsync("Required");
 
-        [Fact]
-        public async Task GrantsInheritedPermissions()
-        {
-            // Arrange
-            var level2 = new Permission("Implicit2");
-            var level1 = new Permission("Implicit1", "Foo", new[] { level2 });
-            var required = new Permission("Required", "Foo", new[] { level1 });
-
-            var context = PermissionHandlerHelper.CreateTestAuthorizationHandlerContext(required);
-
-            var permissionHandler = CreatePermissionHandler(
-                new Role
-                {
-                    RoleName = OrchardCoreConstants.Roles.Anonymous,
-                    RoleClaims =
-                    [
-                        new() { ClaimType = Permission.ClaimType, ClaimValue = "Implicit2" }
-                    ]
-                }
-            );
-
-            // Act
-            await permissionHandler.HandleAsync(context);
-
-            // Assert
-            Assert.True(context.HasSucceeded);
-        }
+        // Act
+        await permissionHandler.HandleAsync(context);
 
-        [Theory]
-        [InlineData("AllowAnonymous", true)]
-        [InlineData("AllowAuthenticated", true)]
-        public async Task IsCaseIsensitive(string required, bool authenticated)
-        {
-            // Arrange
-            var context = PermissionHandlerHelper.CreateTestAuthorizationHandlerContext(new Permission(required), authenticated: authenticated);
-
-            var permissionHandler = CreatePermissionHandler(
-                new Role
-                {
-                    RoleName = OrchardCoreConstants.Roles.Anonymous,
-                    RoleClaims =
-                    [
-                        new() { ClaimType = Permission.ClaimType, ClaimValue = "aLlOwAnOnYmOuS" }
-                    ]
-                },
-                new Role
-                {
-                    RoleName = OrchardCoreConstants.Roles.Authenticated,
-                    RoleClaims =
-                    [
-                        new() { ClaimType = Permission.ClaimType, ClaimValue = "aLlOwAuThEnTiCaTeD" }
-                    ]
-                }
-            );
-
-            // Act
-            await permissionHandler.HandleAsync(context);
-
-            // Assert
-            Assert.True(context.HasSucceeded);
-        }
+        // Assert
+        Assert.True(context.HasSucceeded);
+    }
 
-        private static RolesPermissionsHandler CreatePermissionHandler(params Role[] roles)
-        {
-            var roleManager = RolesMockHelper.MockRoleManager<IRole>();
+    [Fact]
+    public async Task GrantsInheritedPermissions()
+    {
+        // Arrange
+        var level2 = new Permission("Implicit2");
+        var level1 = new Permission("Implicit1", "Foo", new[] { level2 });
+        var required = new Permission("Required", "Foo", new[] { level1 });
 
-            foreach (var role in roles)
+        var context = PermissionHandlerHelper.CreateTestAuthorizationHandlerContext(required);
+
+        var permissionHandler = CreatePermissionHandler(
+            new Role
             {
-                roleManager.Setup(m => m.FindByNameAsync(role.RoleName)).ReturnsAsync(role);
+                RoleName = OrchardCoreConstants.Roles.Anonymous,
+                RoleClaims =
+                [
+                    new() { ClaimType = Permission.ClaimType, ClaimValue = "Implicit2" }
+                ]
             }
+        );
+
+        // Act
+        await permissionHandler.HandleAsync(context);
 
-            var permissionGrantingService = new DefaultPermissionGrantingService();
-            return new RolesPermissionsHandler(roleManager.Object, permissionGrantingService);
+        // Assert
+        Assert.True(context.HasSucceeded);
+    }
+
+    [Theory]
+    [InlineData("AllowAnonymous", true)]
+    [InlineData("AllowAuthenticated", true)]
+    public async Task IsCaseIsensitive(string required, bool authenticated)
+    {
+        // Arrange
+        var context = PermissionHandlerHelper.CreateTestAuthorizationHandlerContext(new Permission(required), authenticated: authenticated);
+
+        var permissionHandler = CreatePermissionHandler(
+            new Role
+            {
+                RoleName = OrchardCoreConstants.Roles.Anonymous,
+                RoleClaims =
+                [
+                    new() { ClaimType = Permission.ClaimType, ClaimValue = "aLlOwAnOnYmOuS" }
+                ]
+            },
+            new Role
+            {
+                RoleName = OrchardCoreConstants.Roles.Authenticated,
+                RoleClaims =
+                [
+                    new() { ClaimType = Permission.ClaimType, ClaimValue = "aLlOwAuThEnTiCaTeD" }
+                ]
+            }
+        );
+
+        // Act
+        await permissionHandler.HandleAsync(context);
+
+        // Assert
+        Assert.True(context.HasSucceeded);
+    }
+
+    private static RolesPermissionsHandler CreatePermissionHandler(params Role[] roles)
+    {
+        var roleManager = RolesMockHelper.MockRoleManager<IRole>();
+
+        foreach (var role in roles)
+        {
+            roleManager.Setup(m => m.FindByNameAsync(role.RoleName)).ReturnsAsync(role);
         }
+
+        var permissionGrantingService = new DefaultPermissionGrantingService();
+        return new RolesPermissionsHandler(roleManager.Object, permissionGrantingService);
     }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Rules/RuleTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Rules/RuleTests.cs
index 1f6752437ed..94d472a2552 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.Rules/RuleTests.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.Rules/RuleTests.cs
@@ -6,201 +6,200 @@
 using OrchardCore.Scripting;
 using OrchardCore.Scripting.JavaScript;
 
-namespace OrchardCore.Tests.Modules.OrchardCore.Rules
+namespace OrchardCore.Tests.Modules.OrchardCore.Rules;
+
+public class RuleTests
 {
-    public class RuleTests
+    [Fact]
+    public async Task ShouldEvaluateRuleFalseWhenNoConditions()
     {
-        [Fact]
-        public async Task ShouldEvaluateRuleFalseWhenNoConditions()
-        {
-            var rule = new Rule();
+        var rule = new Rule();
 
-            var services = CreateRuleServiceCollection();
+        var services = CreateRuleServiceCollection();
 
-            var serviceProvider = services.BuildServiceProvider();
+        var serviceProvider = services.BuildServiceProvider();
 
-            var ruleService = serviceProvider.GetRequiredService<IRuleService>();
+        var ruleService = serviceProvider.GetRequiredService<IRuleService>();
 
-            Assert.False(await ruleService.EvaluateAsync(rule));
-        }
+        Assert.False(await ruleService.EvaluateAsync(rule));
+    }
 
-        [Theory]
-        [InlineData("/", true, true)]
-        [InlineData("/notthehomepage", true, false)]
-        [InlineData("/", false, false)]
-        [InlineData("/notthehomepage", false, true)]
-        public async Task ShouldEvaluateHomepage(string path, bool isHomepage, bool expected)
-        {
-            var rule = new Rule
-            {
-                Conditions =
-                [
-                    new HomepageCondition
-                    {
-                        Value = isHomepage
-                    }
-                ]
-            };
-
-            var services = CreateRuleServiceCollection()
-                .AddRuleCondition<HomepageCondition, HomepageConditionEvaluator>();
-
-            var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
-            var context = new DefaultHttpContext();
-            context.Request.Path = new PathString(path);
-            mockHttpContextAccessor.Setup(_ => _.HttpContext).Returns(context);
-
-            services.AddSingleton<IHttpContextAccessor>(mockHttpContextAccessor.Object);
-
-            var serviceProvider = services.BuildServiceProvider();
-
-            var ruleService = serviceProvider.GetRequiredService<IRuleService>();
-
-            Assert.Equal(expected, await ruleService.EvaluateAsync(rule));
-        }
-
-        [Theory]
-        [InlineData(true, true)]
-        [InlineData(false, false)]
-        public async Task ShouldEvaluateBoolean(bool boolean, bool expected)
+    [Theory]
+    [InlineData("/", true, true)]
+    [InlineData("/notthehomepage", true, false)]
+    [InlineData("/", false, false)]
+    [InlineData("/notthehomepage", false, true)]
+    public async Task ShouldEvaluateHomepage(string path, bool isHomepage, bool expected)
+    {
+        var rule = new Rule
         {
-            var rule = new Rule
-            {
-                Conditions =
-                [
-                    new BooleanCondition { Value = boolean }
-                ]
-            };
+            Conditions =
+            [
+                new HomepageCondition
+                {
+                    Value = isHomepage
+                }
+            ]
+        };
+
+        var services = CreateRuleServiceCollection()
+            .AddRuleCondition<HomepageCondition, HomepageConditionEvaluator>();
 
-            var services = CreateRuleServiceCollection()
-                .AddRuleCondition<BooleanCondition, BooleanConditionEvaluator>();
+        var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
+        var context = new DefaultHttpContext();
+        context.Request.Path = new PathString(path);
+        mockHttpContextAccessor.Setup(_ => _.HttpContext).Returns(context);
 
-            var serviceProvider = services.BuildServiceProvider();
+        services.AddSingleton<IHttpContextAccessor>(mockHttpContextAccessor.Object);
 
-            var ruleService = serviceProvider.GetRequiredService<IRuleService>();
+        var serviceProvider = services.BuildServiceProvider();
 
-            Assert.Equal(expected, await ruleService.EvaluateAsync(rule));
-        }
+        var ruleService = serviceProvider.GetRequiredService<IRuleService>();
+
+        Assert.Equal(expected, await ruleService.EvaluateAsync(rule));
+    }
 
-        [Theory]
-        [InlineData(false, true, true)]
-        [InlineData(true, true, true)]
-        [InlineData(false, false, false)]
-        public async Task ShouldEvaluateAny(bool first, bool second, bool expected)
+    [Theory]
+    [InlineData(true, true)]
+    [InlineData(false, false)]
+    public async Task ShouldEvaluateBoolean(bool boolean, bool expected)
+    {
+        var rule = new Rule
         {
-            var rule = new Rule
-            {
-                Conditions =
-                [
-                    new AnyConditionGroup
-                    {
-                        Conditions =
-                        [
-                            new BooleanCondition { Value = first },
-                            new BooleanCondition { Value = second }
-                        ]
-                    }
-                ]
-            };
-
-            var services = CreateRuleServiceCollection()
-                .AddRuleCondition<AnyConditionGroup, AnyConditionEvaluator>()
-                .AddRuleCondition<BooleanCondition, BooleanConditionEvaluator>();
-
-            var serviceProvider = services.BuildServiceProvider();
-
-            var ruleService = serviceProvider.GetRequiredService<IRuleService>();
-
-            Assert.Equal(expected, await ruleService.EvaluateAsync(rule));
-        }
-
-        [Theory]
-        [InlineData("/foo", "/foo", true)]
-        [InlineData("/bar", "/foo", false)]
-        public async Task ShouldEvaluateUrlEquals(string path, string requestPath, bool expected)
+            Conditions =
+            [
+                new BooleanCondition { Value = boolean }
+            ]
+        };
+
+        var services = CreateRuleServiceCollection()
+            .AddRuleCondition<BooleanCondition, BooleanConditionEvaluator>();
+
+        var serviceProvider = services.BuildServiceProvider();
+
+        var ruleService = serviceProvider.GetRequiredService<IRuleService>();
+
+        Assert.Equal(expected, await ruleService.EvaluateAsync(rule));
+    }
+
+    [Theory]
+    [InlineData(false, true, true)]
+    [InlineData(true, true, true)]
+    [InlineData(false, false, false)]
+    public async Task ShouldEvaluateAny(bool first, bool second, bool expected)
+    {
+        var rule = new Rule
         {
-            var rule = new Rule
-            {
-                Conditions =
-                [
-                    new UrlCondition
-                    {
-                        Value = path,
-                        Operation = new StringEqualsOperator()
-                    }
-                ]
-            };
-
-            var services = CreateRuleServiceCollection()
-                .AddRuleCondition<UrlCondition, UrlConditionEvaluator>();
-
-            var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
-            var context = new DefaultHttpContext();
-            context.Request.Path = new PathString(requestPath);
-            mockHttpContextAccessor.Setup(_ => _.HttpContext).Returns(context);
-
-            services.AddSingleton<IHttpContextAccessor>(mockHttpContextAccessor.Object);
-
-            var serviceProvider = services.BuildServiceProvider();
-
-            var ruleService = serviceProvider.GetRequiredService<IRuleService>();
-
-            Assert.Equal(expected, await ruleService.EvaluateAsync(rule));
-        }
-
-        [Theory]
-        [InlineData("isHomepage()", "/", true)]
-        [InlineData("isHomepage()", "/foo", false)]
-        public async Task ShouldEvaluateJavascriptCondition(string script, string requestPath, bool expected)
+            Conditions =
+            [
+                new AnyConditionGroup
+                {
+                    Conditions =
+                    [
+                        new BooleanCondition { Value = first },
+                        new BooleanCondition { Value = second }
+                    ]
+                }
+            ]
+        };
+
+        var services = CreateRuleServiceCollection()
+            .AddRuleCondition<AnyConditionGroup, AnyConditionEvaluator>()
+            .AddRuleCondition<BooleanCondition, BooleanConditionEvaluator>();
+
+        var serviceProvider = services.BuildServiceProvider();
+
+        var ruleService = serviceProvider.GetRequiredService<IRuleService>();
+
+        Assert.Equal(expected, await ruleService.EvaluateAsync(rule));
+    }
+
+    [Theory]
+    [InlineData("/foo", "/foo", true)]
+    [InlineData("/bar", "/foo", false)]
+    public async Task ShouldEvaluateUrlEquals(string path, string requestPath, bool expected)
+    {
+        var rule = new Rule
         {
-            var rule = new Rule
-            {
-                Conditions =
-                [
-                    new JavascriptCondition
-                    {
-                        Script = script
-                    }
-                ]
-            };
-
-            var services = CreateRuleServiceCollection()
-                .AddRuleCondition<JavascriptCondition, JavascriptConditionEvaluator>()
-                .AddSingleton<IGlobalMethodProvider, DefaultLayersMethodProvider>()
-                .AddMemoryCache()
-                .AddScripting()
-                .AddJavaScriptEngine();
-
-            var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
-            var context = new DefaultHttpContext();
-            context.Request.Path = new PathString(requestPath);
-            mockHttpContextAccessor.Setup(_ => _.HttpContext).Returns(context);
-
-            services.AddSingleton<IHttpContextAccessor>(mockHttpContextAccessor.Object);
-
-            var serviceProvider = services.BuildServiceProvider();
-
-            var ruleService = serviceProvider.GetRequiredService<IRuleService>();
-            Assert.Equal(expected, await ruleService.EvaluateAsync(rule));
-        }
-
-        public static ServiceCollection CreateRuleServiceCollection()
+            Conditions =
+            [
+                new UrlCondition
+                {
+                    Value = path,
+                    Operation = new StringEqualsOperator()
+                }
+            ]
+        };
+
+        var services = CreateRuleServiceCollection()
+            .AddRuleCondition<UrlCondition, UrlConditionEvaluator>();
+
+        var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
+        var context = new DefaultHttpContext();
+        context.Request.Path = new PathString(requestPath);
+        mockHttpContextAccessor.Setup(_ => _.HttpContext).Returns(context);
+
+        services.AddSingleton<IHttpContextAccessor>(mockHttpContextAccessor.Object);
+
+        var serviceProvider = services.BuildServiceProvider();
+
+        var ruleService = serviceProvider.GetRequiredService<IRuleService>();
+
+        Assert.Equal(expected, await ruleService.EvaluateAsync(rule));
+    }
+
+    [Theory]
+    [InlineData("isHomepage()", "/", true)]
+    [InlineData("isHomepage()", "/foo", false)]
+    public async Task ShouldEvaluateJavascriptCondition(string script, string requestPath, bool expected)
+    {
+        var rule = new Rule
         {
-            var services = new ServiceCollection();
-            services.AddOptions<ConditionOptions>();
+            Conditions =
+            [
+                new JavascriptCondition
+                {
+                    Script = script
+                }
+            ]
+        };
+
+        var services = CreateRuleServiceCollection()
+            .AddRuleCondition<JavascriptCondition, JavascriptConditionEvaluator>()
+            .AddSingleton<IGlobalMethodProvider, DefaultLayersMethodProvider>()
+            .AddMemoryCache()
+            .AddScripting()
+            .AddJavaScriptEngine();
+
+        var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
+        var context = new DefaultHttpContext();
+        context.Request.Path = new PathString(requestPath);
+        mockHttpContextAccessor.Setup(_ => _.HttpContext).Returns(context);
+
+        services.AddSingleton<IHttpContextAccessor>(mockHttpContextAccessor.Object);
+
+        var serviceProvider = services.BuildServiceProvider();
+
+        var ruleService = serviceProvider.GetRequiredService<IRuleService>();
+        Assert.Equal(expected, await ruleService.EvaluateAsync(rule));
+    }
+
+    public static ServiceCollection CreateRuleServiceCollection()
+    {
+        var services = new ServiceCollection();
+        services.AddOptions<ConditionOptions>();
 
-            services.AddTransient<IConditionResolver, ConditionResolver>();
-            services.AddTransient<IConditionOperatorResolver, ConditionOperatorResolver>();
+        services.AddTransient<IConditionResolver, ConditionResolver>();
+        services.AddTransient<IConditionOperatorResolver, ConditionOperatorResolver>();
 
-            services.AddTransient<IRuleService, RuleService>();
+        services.AddTransient<IRuleService, RuleService>();
 
-            services.AddTransient<AllConditionEvaluator>();
+        services.AddTransient<AllConditionEvaluator>();
 
-            services.AddLocalization();
-            services.AddSingleton<IStringLocalizerFactory, NullStringLocalizerFactory>();
-            services.AddTransient<IConfigureOptions<ConditionOperatorOptions>, ConditionOperatorConfigureOptions>();
+        services.AddLocalization();
+        services.AddSingleton<IStringLocalizerFactory, NullStringLocalizerFactory>();
+        services.AddTransient<IConfigureOptions<ConditionOperatorOptions>, ConditionOperatorConfigureOptions>();
 
-            return services;
-        }
+        return services;
     }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Security/Extensions/SecurityHeadersApplicationBuilderExtensionsTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Security/Extensions/SecurityHeadersApplicationBuilderExtensionsTests.cs
index 2028940ced3..016eedc9801 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.Security/Extensions/SecurityHeadersApplicationBuilderExtensionsTests.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.Security/Extensions/SecurityHeadersApplicationBuilderExtensionsTests.cs
@@ -1,107 +1,106 @@
 using OrchardCore.Security.Options;
 
-namespace OrchardCore.Security.Extensions.Tests
+namespace OrchardCore.Security.Extensions.Tests;
+
+public class SecurityHeadersApplicationBuilderExtensionsTests
 {
-    public class SecurityHeadersApplicationBuilderExtensionsTests
+    [Fact]
+    public void SecurityHeadersShouldBeAddedWithDefaultValues()
     {
-        [Fact]
-        public void SecurityHeadersShouldBeAddedWithDefaultValues()
-        {
-            // Arrange
-            var context = new DefaultHttpContext();
-            var applicationBuilder = CreateApplicationBuilder();
+        // Arrange
+        var context = new DefaultHttpContext();
+        var applicationBuilder = CreateApplicationBuilder();
 
-            // Act
-            applicationBuilder.UseSecurityHeaders();
+        // Act
+        applicationBuilder.UseSecurityHeaders();
 
-            applicationBuilder
-                .Build()
-                .Invoke(context);
+        applicationBuilder
+            .Build()
+            .Invoke(context);
 
-            // Assert
-            Assert.Equal(SecurityHeaderDefaults.ContentSecurityPolicy, context.Response.Headers[SecurityHeaderNames.ContentSecurityPolicy]);
-            Assert.Equal(ContentTypeOptionsValue.NoSniff, context.Response.Headers[SecurityHeaderNames.XContentTypeOptions]);
-            Assert.Equal(SecurityHeaderDefaults.PermissionsPolicy, context.Response.Headers[SecurityHeaderNames.PermissionsPolicy]);
-            Assert.Equal(SecurityHeaderDefaults.ReferrerPolicy, context.Response.Headers[SecurityHeaderNames.ReferrerPolicy]);
-        }
+        // Assert
+        Assert.Equal(SecurityHeaderDefaults.ContentSecurityPolicy, context.Response.Headers[SecurityHeaderNames.ContentSecurityPolicy]);
+        Assert.Equal(ContentTypeOptionsValue.NoSniff, context.Response.Headers[SecurityHeaderNames.XContentTypeOptions]);
+        Assert.Equal(SecurityHeaderDefaults.PermissionsPolicy, context.Response.Headers[SecurityHeaderNames.PermissionsPolicy]);
+        Assert.Equal(SecurityHeaderDefaults.ReferrerPolicy, context.Response.Headers[SecurityHeaderNames.ReferrerPolicy]);
+    }
 
-        [Fact]
-        public void SecurityHeadersShouldAddedAccordingSuppliedOptions()
+    [Fact]
+    public void SecurityHeadersShouldAddedAccordingSuppliedOptions()
+    {
+        // Arrange
+        var context = new DefaultHttpContext();
+        var options = new SecurityHeadersOptions
         {
-            // Arrange
-            var context = new DefaultHttpContext();
-            var options = new SecurityHeadersOptions
-            {
-                ContentSecurityPolicy =
-                [
-                    $"{ContentSecurityPolicyValue.ChildSource} {ContentSecurityPolicyOriginValue.None}",
-                    $"{ContentSecurityPolicyValue.ConnectSource} {ContentSecurityPolicyOriginValue.Self} https://www.domain1.com https://www.domain2.com",
-                    $"{ContentSecurityPolicyValue.DefaultSource} {ContentSecurityPolicyOriginValue.Any}",
-                ],
-                ContentTypeOptions = ContentTypeOptionsValue.NoSniff,
-                PermissionsPolicy =
-                [
-                    $"{PermissionsPolicyValue.Camera}={PermissionsPolicyOriginValue.Self}",
-                    $"{PermissionsPolicyValue.Microphone}={PermissionsPolicyOriginValue.Any}",
-                    $"{PermissionsPolicyValue.SpeakerSelection}={PermissionsPolicyOriginValue.Self} https://www.domain1.com https://www.domain2.com"
-                ],
-                ReferrerPolicy = ReferrerPolicyValue.Origin
-            };
-            var applicationBuilder = CreateApplicationBuilder();
+            ContentSecurityPolicy =
+            [
+                $"{ContentSecurityPolicyValue.ChildSource} {ContentSecurityPolicyOriginValue.None}",
+                $"{ContentSecurityPolicyValue.ConnectSource} {ContentSecurityPolicyOriginValue.Self} https://www.domain1.com https://www.domain2.com",
+                $"{ContentSecurityPolicyValue.DefaultSource} {ContentSecurityPolicyOriginValue.Any}",
+            ],
+            ContentTypeOptions = ContentTypeOptionsValue.NoSniff,
+            PermissionsPolicy =
+            [
+                $"{PermissionsPolicyValue.Camera}={PermissionsPolicyOriginValue.Self}",
+                $"{PermissionsPolicyValue.Microphone}={PermissionsPolicyOriginValue.Any}",
+                $"{PermissionsPolicyValue.SpeakerSelection}={PermissionsPolicyOriginValue.Self} https://www.domain1.com https://www.domain2.com"
+            ],
+            ReferrerPolicy = ReferrerPolicyValue.Origin
+        };
+        var applicationBuilder = CreateApplicationBuilder();
 
-            // Act
-            applicationBuilder.UseSecurityHeaders(options);
+        // Act
+        applicationBuilder.UseSecurityHeaders(options);
 
-            applicationBuilder
-                .Build()
-                .Invoke(context);
+        applicationBuilder
+            .Build()
+            .Invoke(context);
 
-            // Assert
-            Assert.Equal("child-src 'none',connect-src 'self' https://www.domain1.com https://www.domain2.com,default-src *", context.Response.Headers[SecurityHeaderNames.ContentSecurityPolicy]);
-            Assert.Equal(ContentTypeOptionsValue.NoSniff, context.Response.Headers[SecurityHeaderNames.XContentTypeOptions]);
-            Assert.Equal("camera=self,microphone=*,speaker-selection=self https://www.domain1.com https://www.domain2.com", context.Response.Headers[SecurityHeaderNames.PermissionsPolicy]);
-            Assert.Equal(ReferrerPolicyValue.Origin, context.Response.Headers[SecurityHeaderNames.ReferrerPolicy]);
-        }
+        // Assert
+        Assert.Equal("child-src 'none',connect-src 'self' https://www.domain1.com https://www.domain2.com,default-src *", context.Response.Headers[SecurityHeaderNames.ContentSecurityPolicy]);
+        Assert.Equal(ContentTypeOptionsValue.NoSniff, context.Response.Headers[SecurityHeaderNames.XContentTypeOptions]);
+        Assert.Equal("camera=self,microphone=*,speaker-selection=self https://www.domain1.com https://www.domain2.com", context.Response.Headers[SecurityHeaderNames.PermissionsPolicy]);
+        Assert.Equal(ReferrerPolicyValue.Origin, context.Response.Headers[SecurityHeaderNames.ReferrerPolicy]);
+    }
 
-        [Fact]
-        public void SecurityHeadersShouldBeAddedAccordingBuildConfiguration()
-        {
-            // Arrange
-            var context = new DefaultHttpContext();
-            var applicationBuilder = CreateApplicationBuilder();
+    [Fact]
+    public void SecurityHeadersShouldBeAddedAccordingBuildConfiguration()
+    {
+        // Arrange
+        var context = new DefaultHttpContext();
+        var applicationBuilder = CreateApplicationBuilder();
 
-            // Act
-            applicationBuilder.UseSecurityHeaders(config =>
-            {
-                config
-                    .AddContentSecurityPolicy("child-src 'none'", "connect-src 'self' https://www.domain1.com https://www.domain2.com", "default-src *")
-                    .AddContentTypeOptions()
-                    .AddPermissionsPolicy(new Dictionary<string, string>
-                    {
-                        { "camera", "self"},
-                        { "microphone", "*" },
-                        { "speaker", "self https://www.domain1.com https://www.domain2.com"}
-                    })
-                    .AddReferrerPolicy(ReferrerPolicyValue.Origin);
-            });
+        // Act
+        applicationBuilder.UseSecurityHeaders(config =>
+        {
+            config
+                .AddContentSecurityPolicy("child-src 'none'", "connect-src 'self' https://www.domain1.com https://www.domain2.com", "default-src *")
+                .AddContentTypeOptions()
+                .AddPermissionsPolicy(new Dictionary<string, string>
+                {
+                    { "camera", "self"},
+                    { "microphone", "*" },
+                    { "speaker", "self https://www.domain1.com https://www.domain2.com"}
+                })
+                .AddReferrerPolicy(ReferrerPolicyValue.Origin);
+        });
 
-            applicationBuilder
-                .Build()
-                .Invoke(context);
+        applicationBuilder
+            .Build()
+            .Invoke(context);
 
-            // Assert
-            Assert.Equal("child-src 'none',connect-src 'self' https://www.domain1.com https://www.domain2.com,default-src *", context.Response.Headers[SecurityHeaderNames.ContentSecurityPolicy]);
-            Assert.Equal(ContentTypeOptionsValue.NoSniff, context.Response.Headers[SecurityHeaderNames.XContentTypeOptions]);
-            Assert.Equal("camera=self,microphone=*,speaker=self https://www.domain1.com https://www.domain2.com", context.Response.Headers[SecurityHeaderNames.PermissionsPolicy]);
-            Assert.Equal(ReferrerPolicyValue.Origin, context.Response.Headers[SecurityHeaderNames.ReferrerPolicy]);
-        }
+        // Assert
+        Assert.Equal("child-src 'none',connect-src 'self' https://www.domain1.com https://www.domain2.com,default-src *", context.Response.Headers[SecurityHeaderNames.ContentSecurityPolicy]);
+        Assert.Equal(ContentTypeOptionsValue.NoSniff, context.Response.Headers[SecurityHeaderNames.XContentTypeOptions]);
+        Assert.Equal("camera=self,microphone=*,speaker=self https://www.domain1.com https://www.domain2.com", context.Response.Headers[SecurityHeaderNames.PermissionsPolicy]);
+        Assert.Equal(ReferrerPolicyValue.Origin, context.Response.Headers[SecurityHeaderNames.ReferrerPolicy]);
+    }
 
-        private static ApplicationBuilder CreateApplicationBuilder()
-        {
-            var services = new ServiceCollection();
-            var serviceProvider = services.BuildServiceProvider();
+    private static ApplicationBuilder CreateApplicationBuilder()
+    {
+        var services = new ServiceCollection();
+        var serviceProvider = services.BuildServiceProvider();
 
-            return new ApplicationBuilder(serviceProvider);
-        }
+        return new ApplicationBuilder(serviceProvider);
     }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Security/SecurityHeadersMiddlewareTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Security/SecurityHeadersMiddlewareTests.cs
index 843d746a6df..39b8f842479 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.Security/SecurityHeadersMiddlewareTests.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.Security/SecurityHeadersMiddlewareTests.cs
@@ -1,129 +1,128 @@
 using OrchardCore.Security.Options;
 using OrchardCore.Security.Services;
 
-namespace OrchardCore.Security.Tests
+namespace OrchardCore.Security.Tests;
+
+public class SecurityMiddlewareTests
 {
-    public class SecurityMiddlewareTests
+    public static IEnumerable<object[]> ContentSecurityPolicies =>
+        new List<object[]>
+        {
+            new object[] { new[] { $"{ContentSecurityPolicyValue.BaseUri} {ContentSecurityPolicyOriginValue.None}"}, "base-uri 'none'" },
+            new object[] { new[] { $"{ContentSecurityPolicyValue.ChildSource} {ContentSecurityPolicyOriginValue.Self}"}, "child-src 'self'" },
+            new object[] { new[] { $"{ContentSecurityPolicyValue.ConnectSource} {ContentSecurityPolicyOriginValue.Self} https://www.domain.com/" }, "connect-src 'self' https://www.domain.com/" },
+            new object[] { new[] { $"{ContentSecurityPolicyValue.DefaultSource} {ContentSecurityPolicyOriginValue.Self} https://www.domain1.com/ https://www.domain2.com/" }, "default-src 'self' https://www.domain1.com/ https://www.domain2.com/" },
+            new object[] { new[] { $"{ContentSecurityPolicyValue.FontSource} {ContentSecurityPolicyOriginValue.Any}"}, "font-src *" },
+            new object[] { new[] { $"{ContentSecurityPolicyValue.ScriptSource} {ContentSecurityPolicyOriginValue.Self} https://www.domain.com/", $"{ContentSecurityPolicyValue.StyleSource} {ContentSecurityPolicyOriginValue.Self} https://www.domain.com/" }, "script-src 'self' https://www.domain.com/,style-src 'self' https://www.domain.com/" },
+            new object[] { new[] { $"{ContentSecurityPolicyValue.Sandbox}"}, "sandbox" },
+            new object[] { new[] { $"{ContentSecurityPolicyValue.Sandbox} allow-scripts" }, "sandbox allow-scripts" },
+            new object[] { new[] { $"{ContentSecurityPolicyValue.UpgradeInsecureRequests}"}, "upgrade-insecure-requests" },
+        };
+
+    public static IEnumerable<object[]> PermissionsPolicies =>
+        new List<object[]>
+        {
+            new object[] { new[] { $"{PermissionsPolicyValue.Accelerometer}={PermissionsPolicyOriginValue.None}"}, "accelerometer=()" },
+            new object[] { new[] { $"{PermissionsPolicyValue.AmbientLightSensor}={PermissionsPolicyOriginValue.Any}"}, "ambient-light-sensor=*" },
+            new object[] { new[] { $"{PermissionsPolicyValue.Camera}={PermissionsPolicyOriginValue.Self}"}, "camera=self" },
+            new object[] { new[] { $"{PermissionsPolicyValue.EncryptedMedia}={PermissionsPolicyOriginValue.Self} https://www.domain.com" }, "encrypted-media=self https://www.domain.com" },
+            new object[] { new[] { $"{PermissionsPolicyValue.FullScreen}={PermissionsPolicyOriginValue.Self} https://www.domain.com https://www.sub.domain.com" }, "fullscreen=self https://www.domain.com https://www.sub.domain.com" },
+            new object[] { new[] { $"{PermissionsPolicyValue.Geolocation}={PermissionsPolicyOriginValue.None}", $"{PermissionsPolicyValue.Gyroscope}={PermissionsPolicyOriginValue.Any}" }, "geolocation=(),gyroscope=*" },
+            new object[] { new[] { $"{PermissionsPolicyValue.Magnetometer}={PermissionsPolicyOriginValue.None}", $"{PermissionsPolicyValue.Microphone}={PermissionsPolicyOriginValue.Any}", $"{PermissionsPolicyValue.Midi}={PermissionsPolicyOriginValue.Self}" }, "magnetometer=(),microphone=*,midi=self" },
+            new object[] { new[] { $"{PermissionsPolicyValue.Usb}={PermissionsPolicyOriginValue.Self}", $"{PermissionsPolicyValue.Payment}={PermissionsPolicyOriginValue.Self} https://www.domain.com", $"{PermissionsPolicyValue.PictureInPicture}={PermissionsPolicyOriginValue.Self}", $"{PermissionsPolicyValue.Push}={PermissionsPolicyOriginValue.Self} https://www.domain.com https://www.sub.domain.com" }, "usb=self,payment=self https://www.domain.com,picture-in-picture=self,push=self https://www.domain.com https://www.sub.domain.com" }
+        };
+
+    public static IEnumerable<object[]> ReferrerPolicies =>
+        new List<object[]>
+        {
+            new object[] { ReferrerPolicyValue.NoReferrer, "no-referrer" },
+            new object[] { ReferrerPolicyValue.NoReferrerWhenDowngrade, "no-referrer-when-downgrade" },
+            new object[] { ReferrerPolicyValue.Origin, "origin" },
+            new object[] { ReferrerPolicyValue.OriginWhenCrossOrigin, "origin-when-cross-origin" },
+            new object[] { ReferrerPolicyValue.SameOrigin, "same-origin" },
+            new object[] { ReferrerPolicyValue.StrictOrigin, "strict-origin" },
+            new object[] { ReferrerPolicyValue.StrictOriginWhenCrossOrigin, "strict-origin-when-cross-origin" },
+            new object[] { ReferrerPolicyValue.UnsafeUrl, "unsafe-url" }
+        };
+
+    [Theory]
+    [MemberData(nameof(ContentSecurityPolicies))]
+    public async Task ContentSecurityPolicyHeaderShouldBeAdded(string[] contentSecurityPolicies, string expectedValue)
     {
-        public static IEnumerable<object[]> ContentSecurityPolicies =>
-            new List<object[]>
-            {
-                new object[] { new[] { $"{ContentSecurityPolicyValue.BaseUri} {ContentSecurityPolicyOriginValue.None}"}, "base-uri 'none'" },
-                new object[] { new[] { $"{ContentSecurityPolicyValue.ChildSource} {ContentSecurityPolicyOriginValue.Self}"}, "child-src 'self'" },
-                new object[] { new[] { $"{ContentSecurityPolicyValue.ConnectSource} {ContentSecurityPolicyOriginValue.Self} https://www.domain.com/" }, "connect-src 'self' https://www.domain.com/" },
-                new object[] { new[] { $"{ContentSecurityPolicyValue.DefaultSource} {ContentSecurityPolicyOriginValue.Self} https://www.domain1.com/ https://www.domain2.com/" }, "default-src 'self' https://www.domain1.com/ https://www.domain2.com/" },
-                new object[] { new[] { $"{ContentSecurityPolicyValue.FontSource} {ContentSecurityPolicyOriginValue.Any}"}, "font-src *" },
-                new object[] { new[] { $"{ContentSecurityPolicyValue.ScriptSource} {ContentSecurityPolicyOriginValue.Self} https://www.domain.com/", $"{ContentSecurityPolicyValue.StyleSource} {ContentSecurityPolicyOriginValue.Self} https://www.domain.com/" }, "script-src 'self' https://www.domain.com/,style-src 'self' https://www.domain.com/" },
-                new object[] { new[] { $"{ContentSecurityPolicyValue.Sandbox}"}, "sandbox" },
-                new object[] { new[] { $"{ContentSecurityPolicyValue.Sandbox} allow-scripts" }, "sandbox allow-scripts" },
-                new object[] { new[] { $"{ContentSecurityPolicyValue.UpgradeInsecureRequests}"}, "upgrade-insecure-requests" },
-            };
-
-        public static IEnumerable<object[]> PermissionsPolicies =>
-            new List<object[]>
-            {
-                new object[] { new[] { $"{PermissionsPolicyValue.Accelerometer}={PermissionsPolicyOriginValue.None}"}, "accelerometer=()" },
-                new object[] { new[] { $"{PermissionsPolicyValue.AmbientLightSensor}={PermissionsPolicyOriginValue.Any}"}, "ambient-light-sensor=*" },
-                new object[] { new[] { $"{PermissionsPolicyValue.Camera}={PermissionsPolicyOriginValue.Self}"}, "camera=self" },
-                new object[] { new[] { $"{PermissionsPolicyValue.EncryptedMedia}={PermissionsPolicyOriginValue.Self} https://www.domain.com" }, "encrypted-media=self https://www.domain.com" },
-                new object[] { new[] { $"{PermissionsPolicyValue.FullScreen}={PermissionsPolicyOriginValue.Self} https://www.domain.com https://www.sub.domain.com" }, "fullscreen=self https://www.domain.com https://www.sub.domain.com" },
-                new object[] { new[] { $"{PermissionsPolicyValue.Geolocation}={PermissionsPolicyOriginValue.None}", $"{PermissionsPolicyValue.Gyroscope}={PermissionsPolicyOriginValue.Any}" }, "geolocation=(),gyroscope=*" },
-                new object[] { new[] { $"{PermissionsPolicyValue.Magnetometer}={PermissionsPolicyOriginValue.None}", $"{PermissionsPolicyValue.Microphone}={PermissionsPolicyOriginValue.Any}", $"{PermissionsPolicyValue.Midi}={PermissionsPolicyOriginValue.Self}" }, "magnetometer=(),microphone=*,midi=self" },
-                new object[] { new[] { $"{PermissionsPolicyValue.Usb}={PermissionsPolicyOriginValue.Self}", $"{PermissionsPolicyValue.Payment}={PermissionsPolicyOriginValue.Self} https://www.domain.com", $"{PermissionsPolicyValue.PictureInPicture}={PermissionsPolicyOriginValue.Self}", $"{PermissionsPolicyValue.Push}={PermissionsPolicyOriginValue.Self} https://www.domain.com https://www.sub.domain.com" }, "usb=self,payment=self https://www.domain.com,picture-in-picture=self,push=self https://www.domain.com https://www.sub.domain.com" }
-            };
-
-        public static IEnumerable<object[]> ReferrerPolicies =>
-            new List<object[]>
-            {
-                new object[] { ReferrerPolicyValue.NoReferrer, "no-referrer" },
-                new object[] { ReferrerPolicyValue.NoReferrerWhenDowngrade, "no-referrer-when-downgrade" },
-                new object[] { ReferrerPolicyValue.Origin, "origin" },
-                new object[] { ReferrerPolicyValue.OriginWhenCrossOrigin, "origin-when-cross-origin" },
-                new object[] { ReferrerPolicyValue.SameOrigin, "same-origin" },
-                new object[] { ReferrerPolicyValue.StrictOrigin, "strict-origin" },
-                new object[] { ReferrerPolicyValue.StrictOriginWhenCrossOrigin, "strict-origin-when-cross-origin" },
-                new object[] { ReferrerPolicyValue.UnsafeUrl, "unsafe-url" }
-            };
-
-        [Theory]
-        [MemberData(nameof(ContentSecurityPolicies))]
-        public async Task ContentSecurityPolicyHeaderShouldBeAdded(string[] contentSecurityPolicies, string expectedValue)
+        // Arrange
+        var options = new SecurityHeadersOptions
         {
-            // Arrange
-            var options = new SecurityHeadersOptions
-            {
-                ContentSecurityPolicy = contentSecurityPolicies
-            };
-            var middleware = new SecurityHeadersMiddleware(options, Request);
-            var context = new DefaultHttpContext();
-
-            // Act
-            await middleware.Invoke(context);
-
-            // Assert
-            Assert.True(context.Response.Headers.ContainsKey(SecurityHeaderNames.ContentSecurityPolicy));
-            Assert.Equal(expectedValue, context.Response.Headers[SecurityHeaderNames.ContentSecurityPolicy]);
-        }
-
-        [Fact]
-        public async Task ContentTypeOptionsHeaderShouldBeAdded()
+            ContentSecurityPolicy = contentSecurityPolicies
+        };
+        var middleware = new SecurityHeadersMiddleware(options, Request);
+        var context = new DefaultHttpContext();
+
+        // Act
+        await middleware.Invoke(context);
+
+        // Assert
+        Assert.True(context.Response.Headers.ContainsKey(SecurityHeaderNames.ContentSecurityPolicy));
+        Assert.Equal(expectedValue, context.Response.Headers[SecurityHeaderNames.ContentSecurityPolicy]);
+    }
+
+    [Fact]
+    public async Task ContentTypeOptionsHeaderShouldBeAdded()
+    {
+        // Arrange
+        var options = new SecurityHeadersOptions
         {
-            // Arrange
-            var options = new SecurityHeadersOptions
-            {
-                ContentTypeOptions = ContentTypeOptionsValue.NoSniff
-            };
-            var middleware = new SecurityHeadersMiddleware(options, Request);
-            var context = new DefaultHttpContext();
-
-            // Act
-            await middleware.Invoke(context);
-
-            // Assert
-            Assert.True(context.Response.Headers.ContainsKey(SecurityHeaderNames.XContentTypeOptions));
-            Assert.Equal(ContentTypeOptionsValue.NoSniff, context.Response.Headers[SecurityHeaderNames.XContentTypeOptions]);
-        }
-
-        [Theory]
-        [MemberData(nameof(PermissionsPolicies))]
-        public async Task PermissionsPolicyHeaderShouldBeAdded(string[] permissionsPolicies, string expectedValue)
+            ContentTypeOptions = ContentTypeOptionsValue.NoSniff
+        };
+        var middleware = new SecurityHeadersMiddleware(options, Request);
+        var context = new DefaultHttpContext();
+
+        // Act
+        await middleware.Invoke(context);
+
+        // Assert
+        Assert.True(context.Response.Headers.ContainsKey(SecurityHeaderNames.XContentTypeOptions));
+        Assert.Equal(ContentTypeOptionsValue.NoSniff, context.Response.Headers[SecurityHeaderNames.XContentTypeOptions]);
+    }
+
+    [Theory]
+    [MemberData(nameof(PermissionsPolicies))]
+    public async Task PermissionsPolicyHeaderShouldBeAdded(string[] permissionsPolicies, string expectedValue)
+    {
+        // Arrange
+        var options = new SecurityHeadersOptions
         {
-            // Arrange
-            var options = new SecurityHeadersOptions
-            {
-                PermissionsPolicy = permissionsPolicies
-            };
-            var middleware = new SecurityHeadersMiddleware(options, Request);
-            var context = new DefaultHttpContext();
-
-            // Act
-            await middleware.Invoke(context);
-
-            // Assert
-            Assert.True(context.Response.Headers.ContainsKey(SecurityHeaderNames.PermissionsPolicy));
-            Assert.Equal(expectedValue, context.Response.Headers[SecurityHeaderNames.PermissionsPolicy]);
-        }
-
-        [Theory]
-        [MemberData(nameof(ReferrerPolicies))]
-        public async Task ReferrerPolicyHeaderShouldBeAdded(string policy, string expectedValue)
+            PermissionsPolicy = permissionsPolicies
+        };
+        var middleware = new SecurityHeadersMiddleware(options, Request);
+        var context = new DefaultHttpContext();
+
+        // Act
+        await middleware.Invoke(context);
+
+        // Assert
+        Assert.True(context.Response.Headers.ContainsKey(SecurityHeaderNames.PermissionsPolicy));
+        Assert.Equal(expectedValue, context.Response.Headers[SecurityHeaderNames.PermissionsPolicy]);
+    }
+
+    [Theory]
+    [MemberData(nameof(ReferrerPolicies))]
+    public async Task ReferrerPolicyHeaderShouldBeAdded(string policy, string expectedValue)
+    {
+        // Arrange
+        var options = new SecurityHeadersOptions
         {
-            // Arrange
-            var options = new SecurityHeadersOptions
-            {
-                ReferrerPolicy = policy
-            };
-            var middleware = new SecurityHeadersMiddleware(options, Request);
-            var context = new DefaultHttpContext();
-
-            // Act
-            await middleware.Invoke(context);
-
-            // Assert
-            Assert.True(context.Response.Headers.ContainsKey(SecurityHeaderNames.ReferrerPolicy));
-            Assert.Equal(expectedValue, context.Response.Headers[SecurityHeaderNames.ReferrerPolicy]);
-        }
-
-        private static Task Request(HttpContext context) => Task.CompletedTask;
+            ReferrerPolicy = policy
+        };
+        var middleware = new SecurityHeadersMiddleware(options, Request);
+        var context = new DefaultHttpContext();
+
+        // Act
+        await middleware.Invoke(context);
+
+        // Assert
+        Assert.True(context.Response.Headers.ContainsKey(SecurityHeaderNames.ReferrerPolicy));
+        Assert.Equal(expectedValue, context.Response.Headers[SecurityHeaderNames.ReferrerPolicy]);
     }
+
+    private static Task Request(HttpContext context) => Task.CompletedTask;
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Shortcodes/LocaleShortcodeTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Shortcodes/LocaleShortcodeTests.cs
index 99346cd8943..e3936efeb9c 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.Shortcodes/LocaleShortcodeTests.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.Shortcodes/LocaleShortcodeTests.cs
@@ -1,27 +1,26 @@
 using OrchardCore.Shortcodes.Providers;
 using OrchardCore.Shortcodes.Services;
 
-namespace OrchardCore.Tests.Modules.OrchardCore.Shortcodes
+namespace OrchardCore.Tests.Modules.OrchardCore.Shortcodes;
+
+public class LocaleShortcodeTests
 {
-    public class LocaleShortcodeTests
+    [Theory]
+    [InlineData("en", "foo bar baz", "foo bar baz")]
+    [InlineData("en", "foo [locale 'en']bar[/locale][locale 'fr']far[/locale] baz", @"foo bar baz")]
+    [InlineData("en", "foo [locale en]bar[/locale][locale fr]far[/locale] baz", @"foo bar baz")]
+    [InlineData("en-CA", "foo [locale 'en']bar[/locale][locale 'fr']far[/locale] baz", @"foo bar baz")]
+    [InlineData("en-CA", "foo [locale en false]bar[/locale][locale fr]far[/locale] baz", @"foo  baz")]
+    [InlineData("fr", "foo [locale 'en']bar[/locale][locale 'fr']far[/locale] baz", @"foo far baz")]
+    [InlineData("fr", "foo [locale en]bar[/locale][locale fr]far[/locale] baz", @"foo far baz")]
+    public async Task ShouldProcess(string currentCulture, string text, string expected)
     {
-        [Theory]
-        [InlineData("en", "foo bar baz", "foo bar baz")]
-        [InlineData("en", "foo [locale 'en']bar[/locale][locale 'fr']far[/locale] baz", @"foo bar baz")]
-        [InlineData("en", "foo [locale en]bar[/locale][locale fr]far[/locale] baz", @"foo bar baz")]
-        [InlineData("en-CA", "foo [locale 'en']bar[/locale][locale 'fr']far[/locale] baz", @"foo bar baz")]
-        [InlineData("en-CA", "foo [locale en false]bar[/locale][locale fr]far[/locale] baz", @"foo  baz")]
-        [InlineData("fr", "foo [locale 'en']bar[/locale][locale 'fr']far[/locale] baz", @"foo far baz")]
-        [InlineData("fr", "foo [locale en]bar[/locale][locale fr]far[/locale] baz", @"foo far baz")]
-        public async Task ShouldProcess(string currentCulture, string text, string expected)
-        {
-            CultureInfo.CurrentUICulture = CultureInfo.GetCultureInfo(currentCulture);
+        CultureInfo.CurrentUICulture = CultureInfo.GetCultureInfo(currentCulture);
 
-            var localeProvider = new LocaleShortcodeProvider();
-            var processor = new ShortcodeService(new IShortcodeProvider[] { localeProvider }, []);
-            var processed = await processor.ProcessAsync(text);
+        var localeProvider = new LocaleShortcodeProvider();
+        var processor = new ShortcodeService(new IShortcodeProvider[] { localeProvider }, []);
+        var processed = await processor.ProcessAsync(text);
 
-            Assert.Equal(expected, processed);
-        }
+        Assert.Equal(expected, processed);
     }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Tenants/Services/TenantValidatorTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Tenants/Services/TenantValidatorTests.cs
index 849ed49fc92..f6b3a59820b 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.Tenants/Services/TenantValidatorTests.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.Tenants/Services/TenantValidatorTests.cs
@@ -5,140 +5,139 @@
 using OrchardCore.Tenants.ViewModels;
 using OrchardCore.Tests.Apis.Context;
 
-namespace OrchardCore.Modules.Tenants.Services.Tests
+namespace OrchardCore.Modules.Tenants.Services.Tests;
+
+public class TenantValidatorTests : SiteContext
 {
-    public class TenantValidatorTests : SiteContext
+    static TenantValidatorTests()
     {
-        static TenantValidatorTests()
-        {
-        }
+    }
 
-        [Theory]
-        [InlineData("Tenant1", "tenant1", "", "Feature Profile", new[] { "A tenant with the same name already exists." })]
-        [InlineData("tEnAnT1", "tenant1", "", "Feature Profile", new[] { "A tenant with the same name already exists." })]
-        [InlineData("dEfAuLt", "", "", "Feature Profile", new[] { "The tenant name is in conflict with the 'Default' tenant." })]
-        [InlineData("Tenant5", "tenant3", "", "Feature Profile", new[] { "A tenant with the same host and prefix already exists." })]
-        [InlineData("Tenant5", "tenant3", null, "Feature Profile", new[] { "A tenant with the same host and prefix already exists." })]
-        [InlineData("Tenant5", "", "example2.com", "Feature Profile", new[] { "A tenant with the same host and prefix already exists." })]
-        [InlineData("Tenant5", null, "example2.com", "Feature Profile", new[] { "A tenant with the same host and prefix already exists." })]
-        [InlineData("Tenant6", "tenant4", "example4.com", "Feature Profile", new[] { "A tenant with the same host and prefix already exists." })]
-        [InlineData("", "tenant7", "example1.com", "Feature Profile", new[] { "The tenant name is mandatory." })]
-        [InlineData("Tenant7", "tenant7", "", "Feature", new[] { "The feature profile does not exist." })]
-        [InlineData("@Invalid Tenant", "tenant7", "example1.com", "Feature Profile", new[] { "Invalid tenant name. Must contain characters only and no spaces." })]
-        [InlineData("Tenant7", null, "  ", "Feature Profile", new[] { "A tenant with the same host and prefix already exists." })]
-        [InlineData("Tenant7", "/tenant7", "", "Feature Profile", new[] { "The url prefix can not contain more than one segment." })]
-        [InlineData("@Invalid Tenant", "/tenant7", "", "Feature Profile", new[] { "Invalid tenant name. Must contain characters only and no spaces.", "The url prefix can not contain more than one segment." })]
-        [InlineData("Tenant8", "tenant4", "example6.com,example4.com, example5.com", "Feature Profile", new[] { "A tenant with the same host and prefix already exists." })]
-        [InlineData("Tenant9", "tenant9", "", "Feature Profile", new string[] { })]
-        [InlineData("Tenant9", "", "example6.com", "Feature Profile", new string[] { })]
-        [InlineData("Tenant9", "tenant9", "example6.com", "Feature Profile", new string[] { })]
-        public async Task TenantValidationFailsIfInvalidConfigurationsWasProvided(string name, string urlPrefix, string hostName, string featureProfile, string[] errorMessages)
-        {
-            // Arrange
-            await ShellHost.InitializeAsync();
-            await SeedTenantsAsync();
+    [Theory]
+    [InlineData("Tenant1", "tenant1", "", "Feature Profile", new[] { "A tenant with the same name already exists." })]
+    [InlineData("tEnAnT1", "tenant1", "", "Feature Profile", new[] { "A tenant with the same name already exists." })]
+    [InlineData("dEfAuLt", "", "", "Feature Profile", new[] { "The tenant name is in conflict with the 'Default' tenant." })]
+    [InlineData("Tenant5", "tenant3", "", "Feature Profile", new[] { "A tenant with the same host and prefix already exists." })]
+    [InlineData("Tenant5", "tenant3", null, "Feature Profile", new[] { "A tenant with the same host and prefix already exists." })]
+    [InlineData("Tenant5", "", "example2.com", "Feature Profile", new[] { "A tenant with the same host and prefix already exists." })]
+    [InlineData("Tenant5", null, "example2.com", "Feature Profile", new[] { "A tenant with the same host and prefix already exists." })]
+    [InlineData("Tenant6", "tenant4", "example4.com", "Feature Profile", new[] { "A tenant with the same host and prefix already exists." })]
+    [InlineData("", "tenant7", "example1.com", "Feature Profile", new[] { "The tenant name is mandatory." })]
+    [InlineData("Tenant7", "tenant7", "", "Feature", new[] { "The feature profile does not exist." })]
+    [InlineData("@Invalid Tenant", "tenant7", "example1.com", "Feature Profile", new[] { "Invalid tenant name. Must contain characters only and no spaces." })]
+    [InlineData("Tenant7", null, "  ", "Feature Profile", new[] { "A tenant with the same host and prefix already exists." })]
+    [InlineData("Tenant7", "/tenant7", "", "Feature Profile", new[] { "The url prefix can not contain more than one segment." })]
+    [InlineData("@Invalid Tenant", "/tenant7", "", "Feature Profile", new[] { "Invalid tenant name. Must contain characters only and no spaces.", "The url prefix can not contain more than one segment." })]
+    [InlineData("Tenant8", "tenant4", "example6.com,example4.com, example5.com", "Feature Profile", new[] { "A tenant with the same host and prefix already exists." })]
+    [InlineData("Tenant9", "tenant9", "", "Feature Profile", new string[] { })]
+    [InlineData("Tenant9", "", "example6.com", "Feature Profile", new string[] { })]
+    [InlineData("Tenant9", "tenant9", "example6.com", "Feature Profile", new string[] { })]
+    public async Task TenantValidationFailsIfInvalidConfigurationsWasProvided(string name, string urlPrefix, string hostName, string featureProfile, string[] errorMessages)
+    {
+        // Arrange
+        await ShellHost.InitializeAsync();
+        await SeedTenantsAsync();
 
-            var tenantValidator = CreateTenantValidator(defaultTenant: false);
+        var tenantValidator = CreateTenantValidator(defaultTenant: false);
 
-            // Act
-            var viewModel = new EditTenantViewModel
-            {
-                Name = name,
-                RequestUrlPrefix = urlPrefix,
-                RequestUrlHost = hostName,
-                FeatureProfiles = [featureProfile],
-                IsNewTenant = true
-            };
+        // Act
+        var viewModel = new EditTenantViewModel
+        {
+            Name = name,
+            RequestUrlPrefix = urlPrefix,
+            RequestUrlHost = hostName,
+            FeatureProfiles = [featureProfile],
+            IsNewTenant = true
+        };
 
-            var errors = await tenantValidator.ValidateAsync(viewModel);
+        var errors = await tenantValidator.ValidateAsync(viewModel);
 
-            // Assert
-            Assert.Equal(errorMessages.Length, errors.Count());
+        // Assert
+        Assert.Equal(errorMessages.Length, errors.Count());
 
-            for (var i = 0; i < errors.Count(); i++)
-            {
-                Assert.Equal(errorMessages[i], errors.ElementAt(i).Message);
-            }
+        for (var i = 0; i < errors.Count(); i++)
+        {
+            Assert.Equal(errorMessages[i], errors.ElementAt(i).Message);
         }
+    }
 
-        [Theory]
-        [InlineData(false)]
-        [InlineData(true)]
-        public async Task DuplicateTenantHostOrPrefixShouldFailValidation(bool isNewTenant)
-        {
-            // Arrange
-            await ShellHost.InitializeAsync();
-            await SeedTenantsAsync();
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task DuplicateTenantHostOrPrefixShouldFailValidation(bool isNewTenant)
+    {
+        // Arrange
+        await ShellHost.InitializeAsync();
+        await SeedTenantsAsync();
 
-            var tenantValidator = CreateTenantValidator();
+        var tenantValidator = CreateTenantValidator();
 
-            var viewModel = new EditTenantViewModel
-            {
-                Name = "Tenant5",
-                RequestUrlPrefix = "tenant4",
-                RequestUrlHost = "example5.com",
-                FeatureProfiles = ["Feature Profile"],
-                IsNewTenant = isNewTenant
-            };
-
-            // Act
-            var errors = await tenantValidator.ValidateAsync(viewModel);
-
-            // Assert
-            if (isNewTenant)
-            {
-                Assert.Single(errors);
-                Assert.Equal("A tenant with the same host and prefix already exists.", errors.Single().Message);
-            }
-            else
-            {
-                Assert.Equal(2, errors.Count());
-                Assert.Equal("A tenant with the same host and prefix already exists.", errors.ElementAt(0).Message);
-                Assert.Equal("The existing tenant to be validated was not found.", errors.ElementAt(1).Message);
-            }
-        }
-
-        private static TenantValidator CreateTenantValidator(bool defaultTenant = true)
+        var viewModel = new EditTenantViewModel
         {
-            var featureProfilesServiceMock = new Mock<IFeatureProfilesService>();
-            featureProfilesServiceMock.Setup(fp => fp.GetFeatureProfilesAsync())
-                .Returns(Task.FromResult((IDictionary<string, FeatureProfile>)new Dictionary<string, FeatureProfile>
-                {
-                    { "Feature Profile", new FeatureProfile() }
-                }));
-
-            var stringLocalizerMock = new Mock<IStringLocalizer<TenantValidator>>();
-            stringLocalizerMock
-                .Setup(l => l[It.IsAny<string>()])
-                .Returns<string>(n => new LocalizedString(n, n));
-            stringLocalizerMock
-                .Setup(l => l[It.IsAny<string>(), It.IsAny<object[]>()])
-                .Returns<string, object[]>((n, a) => new LocalizedString(n, n));
-
-            var shellSettings = defaultTenant
-                ? ShellHost.GetSettings(ShellSettings.DefaultShellName)
-                : new ShellSettings();
-
-            var dbConnectionValidatorMock = new Mock<IDbConnectionValidator>();
-            var validationContext = new DbConnectionValidatorContext(shellSettings);
-
-            dbConnectionValidatorMock.Setup(v => v.ValidateAsync(validationContext));
-
-            return new TenantValidator(
-                ShellHost,
-                ShellSettingsManager,
-                featureProfilesServiceMock.Object,
-                dbConnectionValidatorMock.Object,
-                stringLocalizerMock.Object
-                );
+            Name = "Tenant5",
+            RequestUrlPrefix = "tenant4",
+            RequestUrlHost = "example5.com",
+            FeatureProfiles = ["Feature Profile"],
+            IsNewTenant = isNewTenant
+        };
+
+        // Act
+        var errors = await tenantValidator.ValidateAsync(viewModel);
+
+        // Assert
+        if (isNewTenant)
+        {
+            Assert.Single(errors);
+            Assert.Equal("A tenant with the same host and prefix already exists.", errors.Single().Message);
         }
-
-        private static async Task SeedTenantsAsync()
+        else
         {
-            await ShellHost.GetOrCreateShellContextAsync(new ShellSettings { Name = "Tenant1", RequestUrlPrefix = "tenant1" }.AsUninitialized());
-            await ShellHost.GetOrCreateShellContextAsync(new ShellSettings { Name = "Tenant2", RequestUrlPrefix = string.Empty, RequestUrlHost = "example2.com" }.AsUninitialized());
-            await ShellHost.GetOrCreateShellContextAsync(new ShellSettings { Name = "Tenant3", RequestUrlPrefix = "tenant3", RequestUrlHost = string.Empty }.AsUninitialized());
-            await ShellHost.GetOrCreateShellContextAsync(new ShellSettings { Name = "Tenant4", RequestUrlPrefix = "tenant4", RequestUrlHost = "example4.com, example5.com" }.AsUninitialized());
+            Assert.Equal(2, errors.Count());
+            Assert.Equal("A tenant with the same host and prefix already exists.", errors.ElementAt(0).Message);
+            Assert.Equal("The existing tenant to be validated was not found.", errors.ElementAt(1).Message);
         }
     }
+
+    private static TenantValidator CreateTenantValidator(bool defaultTenant = true)
+    {
+        var featureProfilesServiceMock = new Mock<IFeatureProfilesService>();
+        featureProfilesServiceMock.Setup(fp => fp.GetFeatureProfilesAsync())
+            .Returns(Task.FromResult((IDictionary<string, FeatureProfile>)new Dictionary<string, FeatureProfile>
+            {
+                { "Feature Profile", new FeatureProfile() }
+            }));
+
+        var stringLocalizerMock = new Mock<IStringLocalizer<TenantValidator>>();
+        stringLocalizerMock
+            .Setup(l => l[It.IsAny<string>()])
+            .Returns<string>(n => new LocalizedString(n, n));
+        stringLocalizerMock
+            .Setup(l => l[It.IsAny<string>(), It.IsAny<object[]>()])
+            .Returns<string, object[]>((n, a) => new LocalizedString(n, n));
+
+        var shellSettings = defaultTenant
+            ? ShellHost.GetSettings(ShellSettings.DefaultShellName)
+            : new ShellSettings();
+
+        var dbConnectionValidatorMock = new Mock<IDbConnectionValidator>();
+        var validationContext = new DbConnectionValidatorContext(shellSettings);
+
+        dbConnectionValidatorMock.Setup(v => v.ValidateAsync(validationContext));
+
+        return new TenantValidator(
+            ShellHost,
+            ShellSettingsManager,
+            featureProfilesServiceMock.Object,
+            dbConnectionValidatorMock.Object,
+            stringLocalizerMock.Object
+            );
+    }
+
+    private static async Task SeedTenantsAsync()
+    {
+        await ShellHost.GetOrCreateShellContextAsync(new ShellSettings { Name = "Tenant1", RequestUrlPrefix = "tenant1" }.AsUninitialized());
+        await ShellHost.GetOrCreateShellContextAsync(new ShellSettings { Name = "Tenant2", RequestUrlPrefix = string.Empty, RequestUrlHost = "example2.com" }.AsUninitialized());
+        await ShellHost.GetOrCreateShellContextAsync(new ShellSettings { Name = "Tenant3", RequestUrlPrefix = "tenant3", RequestUrlHost = string.Empty }.AsUninitialized());
+        await ShellHost.GetOrCreateShellContextAsync(new ShellSettings { Name = "Tenant4", RequestUrlPrefix = "tenant4", RequestUrlHost = "example4.com, example5.com" }.AsUninitialized());
+    }
 }
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Twitter/TwitterClientTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Twitter/TwitterClientTests.cs
index aaca240d555..458a09e462f 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.Twitter/TwitterClientTests.cs
+++ b/test/OrchardCore.Tests/Modules/OrchardCore.Twitter/TwitterClientTests.cs
@@ -3,114 +3,113 @@
 using OrchardCore.Twitter.Settings;
 using OrchardCore.Twitter.Signin.Settings;
 
-namespace OrchardCore.Tests.Modules.OrchardCore.Twitter
+namespace OrchardCore.Tests.Modules.OrchardCore.Twitter;
+
+public class TwitterClientTests
 {
-    public class TwitterClientTests
+    private const string ExpectedOauthHeader = "OAuth oauth_consumer_key=\"xvz1evFS4wEEPTGEFPHBog\", oauth_nonce=\"kYjzVBB8Y0ZFabxSWbWovY3uYSQ2pTgmZeNu2VS4cg\", oauth_signature=\"hCtSmYh%2BiHYCEqBWrE7C7hYmtUk%3D\", oauth_signature_method=\"HMAC-SHA1\", oauth_timestamp=\"1318622958\", oauth_token=\"370773112-GmHxMAgYyLbNEtIKZeRNFsMKPR9EyMZeS9weJAEb\", oauth_version=\"1.0\"";
+    private const string UpdateStatusResponse = "{\r\n  \"created_at\": \"Fri Jan 25 22:04:26 +0000 2019\",\r\n  \"id\": 1088920554520961000,\r\n  \"id_str\": \"1088920554520961026\",\r\n  \"text\": \"okay\",\r\n  \"truncated\": false,\r\n  \"entities\": {\r\n    \"hashtags\": [],\r\n    \"symbols\": [],\r\n    \"user_mentions\": [],\r\n    \"urls\": []\r\n  },\r\n  \"source\": \"<a>Learning Twitter API - Jess Gars</a>\",\r\n  \"in_reply_to_status_id\": null,\r\n  \"in_reply_to_status_id_str\": null,\r\n  \"in_reply_to_user_id\": null,\r\n  \"in_reply_to_user_id_str\": null,\r\n  \"in_reply_to_screen_name\": null,\r\n  \"user\": {\r\n    \"id\": 15772978,\r\n    \"id_str\": \"15772978\",\r\n    \"name\": \"Jessica Garson\uD83E\uDD95\",\r\n    \"screen_name\": \"jessicagarson\",\r\n    \"location\": \"Brooklyn, NY\",\r\n    \"description\": \"Developer Advocate @Twitter. Python programmer. Noted thought leader on vegan snacks. Known sometimes as Messica Arson. She/They.\",\r\n    \"url\": \"https://t.co/ai7MDeRPa5\",\r\n    \"entities\": {\r\n      \"url\": {\r\n        \"urls\": [\r\n          {\r\n            \"url\": \"https://t.co/ai7MDeRPa5\",\r\n            \"expanded_url\": \"http://jessicagarson.com\",\r\n            \"display_url\": \"jessicagarson.com\",\r\n            \"indices\": [\r\n              0,\r\n              23\r\n            ]\r\n          }\r\n        ]\r\n      },\r\n      \"description\": {\r\n        \"urls\": []\r\n      }\r\n    },\r\n    \"protected\": false,\r\n    \"followers_count\": 2097,\r\n    \"friends_count\": 1986,\r\n    \"listed_count\": 88,\r\n    \"created_at\": \"Fri Aug 08 02:16:23 +0000 2008\",\r\n    \"favourites_count\": 9946,\r\n    \"utc_offset\": null,\r\n    \"time_zone\": null,\r\n    \"geo_enabled\": true,\r\n    \"verified\": false,\r\n    \"statuses_count\": 5514,\r\n    \"lang\": \"en\",\r\n    \"contributors_enabled\": false,\r\n    \"is_translator\": false,\r\n    \"is_translation_enabled\": false,\r\n    \"profile_background_color\": \"000000\",\r\n    \"profile_background_image_url\": \"http://abs.twimg.com/images/themes/theme6/bg.gif\",\r\n    \"profile_background_image_url_https\": \"https://abs.twimg.com/images/themes/theme6/bg.gif\",\r\n    \"profile_background_tile\": false,\r\n    \"profile_image_url\": \"http://pbs.twimg.com/profile_images/971062453453905920/DKzs-vf8_normal.jpg\",\r\n    \"profile_image_url_https\": \"https://pbs.twimg.com/profile_images/971062453453905920/DKzs-vf8_normal.jpg\",\r\n    \"profile_banner_url\": \"https://pbs.twimg.com/profile_banners/15772978/1520354408\",\r\n    \"profile_link_color\": \"FA743E\",\r\n    \"profile_sidebar_border_color\": \"000000\",\r\n    \"profile_sidebar_fill_color\": \"000000\",\r\n    \"profile_text_color\": \"000000\",\r\n    \"profile_use_background_image\": false,\r\n    \"has_extended_profile\": false,\r\n    \"default_profile\": false,\r\n    \"default_profile_image\": false,\r\n    \"following\": false,\r\n    \"follow_request_sent\": false,\r\n    \"notifications\": false,\r\n    \"translator_type\": \"none\"\r\n  },\r\n  \"geo\": null,\r\n  \"coordinates\": null,\r\n  \"place\": null,\r\n  \"contributors\": null,\r\n  \"is_quote_status\": false,\r\n  \"retweet_count\": 0,\r\n  \"favorite_count\": 0,\r\n  \"favorited\": false,\r\n  \"retweeted\": false,\r\n  \"lang\": \"en\"\r\n}";
+
+    private readonly Mock<TwitterClientMessageHandler> _mockHttpMessageHandler;
+    private readonly Mock<FakeHttpMessageHandler> _mockFakeHttpMessageHandler;
+    private readonly IDataProtectionProvider _mockDataProtectionProvider;
+    public TwitterClientTests()
     {
-        private const string ExpectedOauthHeader = "OAuth oauth_consumer_key=\"xvz1evFS4wEEPTGEFPHBog\", oauth_nonce=\"kYjzVBB8Y0ZFabxSWbWovY3uYSQ2pTgmZeNu2VS4cg\", oauth_signature=\"hCtSmYh%2BiHYCEqBWrE7C7hYmtUk%3D\", oauth_signature_method=\"HMAC-SHA1\", oauth_timestamp=\"1318622958\", oauth_token=\"370773112-GmHxMAgYyLbNEtIKZeRNFsMKPR9EyMZeS9weJAEb\", oauth_version=\"1.0\"";
-        private const string UpdateStatusResponse = "{\r\n  \"created_at\": \"Fri Jan 25 22:04:26 +0000 2019\",\r\n  \"id\": 1088920554520961000,\r\n  \"id_str\": \"1088920554520961026\",\r\n  \"text\": \"okay\",\r\n  \"truncated\": false,\r\n  \"entities\": {\r\n    \"hashtags\": [],\r\n    \"symbols\": [],\r\n    \"user_mentions\": [],\r\n    \"urls\": []\r\n  },\r\n  \"source\": \"<a>Learning Twitter API - Jess Gars</a>\",\r\n  \"in_reply_to_status_id\": null,\r\n  \"in_reply_to_status_id_str\": null,\r\n  \"in_reply_to_user_id\": null,\r\n  \"in_reply_to_user_id_str\": null,\r\n  \"in_reply_to_screen_name\": null,\r\n  \"user\": {\r\n    \"id\": 15772978,\r\n    \"id_str\": \"15772978\",\r\n    \"name\": \"Jessica Garson\uD83E\uDD95\",\r\n    \"screen_name\": \"jessicagarson\",\r\n    \"location\": \"Brooklyn, NY\",\r\n    \"description\": \"Developer Advocate @Twitter. Python programmer. Noted thought leader on vegan snacks. Known sometimes as Messica Arson. She/They.\",\r\n    \"url\": \"https://t.co/ai7MDeRPa5\",\r\n    \"entities\": {\r\n      \"url\": {\r\n        \"urls\": [\r\n          {\r\n            \"url\": \"https://t.co/ai7MDeRPa5\",\r\n            \"expanded_url\": \"http://jessicagarson.com\",\r\n            \"display_url\": \"jessicagarson.com\",\r\n            \"indices\": [\r\n              0,\r\n              23\r\n            ]\r\n          }\r\n        ]\r\n      },\r\n      \"description\": {\r\n        \"urls\": []\r\n      }\r\n    },\r\n    \"protected\": false,\r\n    \"followers_count\": 2097,\r\n    \"friends_count\": 1986,\r\n    \"listed_count\": 88,\r\n    \"created_at\": \"Fri Aug 08 02:16:23 +0000 2008\",\r\n    \"favourites_count\": 9946,\r\n    \"utc_offset\": null,\r\n    \"time_zone\": null,\r\n    \"geo_enabled\": true,\r\n    \"verified\": false,\r\n    \"statuses_count\": 5514,\r\n    \"lang\": \"en\",\r\n    \"contributors_enabled\": false,\r\n    \"is_translator\": false,\r\n    \"is_translation_enabled\": false,\r\n    \"profile_background_color\": \"000000\",\r\n    \"profile_background_image_url\": \"http://abs.twimg.com/images/themes/theme6/bg.gif\",\r\n    \"profile_background_image_url_https\": \"https://abs.twimg.com/images/themes/theme6/bg.gif\",\r\n    \"profile_background_tile\": false,\r\n    \"profile_image_url\": \"http://pbs.twimg.com/profile_images/971062453453905920/DKzs-vf8_normal.jpg\",\r\n    \"profile_image_url_https\": \"https://pbs.twimg.com/profile_images/971062453453905920/DKzs-vf8_normal.jpg\",\r\n    \"profile_banner_url\": \"https://pbs.twimg.com/profile_banners/15772978/1520354408\",\r\n    \"profile_link_color\": \"FA743E\",\r\n    \"profile_sidebar_border_color\": \"000000\",\r\n    \"profile_sidebar_fill_color\": \"000000\",\r\n    \"profile_text_color\": \"000000\",\r\n    \"profile_use_background_image\": false,\r\n    \"has_extended_profile\": false,\r\n    \"default_profile\": false,\r\n    \"default_profile_image\": false,\r\n    \"following\": false,\r\n    \"follow_request_sent\": false,\r\n    \"notifications\": false,\r\n    \"translator_type\": \"none\"\r\n  },\r\n  \"geo\": null,\r\n  \"coordinates\": null,\r\n  \"place\": null,\r\n  \"contributors\": null,\r\n  \"is_quote_status\": false,\r\n  \"retweet_count\": 0,\r\n  \"favorite_count\": 0,\r\n  \"favorited\": false,\r\n  \"retweeted\": false,\r\n  \"lang\": \"en\"\r\n}";
+        _mockFakeHttpMessageHandler = new Mock<FakeHttpMessageHandler>() { CallBase = true };
 
-        private readonly Mock<TwitterClientMessageHandler> _mockHttpMessageHandler;
-        private readonly Mock<FakeHttpMessageHandler> _mockFakeHttpMessageHandler;
-        private readonly IDataProtectionProvider _mockDataProtectionProvider;
-        public TwitterClientTests()
+        var fakeDataProtector = new FakeDataProtector();
+        var settings = new TwitterSettings
         {
-            _mockFakeHttpMessageHandler = new Mock<FakeHttpMessageHandler>() { CallBase = true };
-
-            var fakeDataProtector = new FakeDataProtector();
-            var settings = new TwitterSettings
-            {
-                AccessToken = "370773112-GmHxMAgYyLbNEtIKZeRNFsMKPR9EyMZeS9weJAEb",
-                AccessTokenSecret = "LswwdoUaIvS8ltyTt5jkRh4J50vUPVVHtR2YPi5kE",
-                ConsumerKey = "xvz1evFS4wEEPTGEFPHBog",
-                ConsumerSecret = "kAcSOqF21Fu85e7zjz7ZN2U4ZRhfV3WpwPAoE3Z7kBw"
-            };
-
-            settings.AccessTokenSecret = fakeDataProtector.Protect(settings.AccessTokenSecret);
-            settings.ConsumerSecret = fakeDataProtector.Protect(settings.ConsumerSecret);
-
-            var signinSettings = new TwitterSigninSettings
-            {
-                CallbackPath = null,
-            };
-
-            _mockDataProtectionProvider = Mock.Of<IDataProtectionProvider>(dpp =>
-                dpp.CreateProtector(It.IsAny<string>()) == fakeDataProtector
-            );
+            AccessToken = "370773112-GmHxMAgYyLbNEtIKZeRNFsMKPR9EyMZeS9weJAEb",
+            AccessTokenSecret = "LswwdoUaIvS8ltyTt5jkRh4J50vUPVVHtR2YPi5kE",
+            ConsumerKey = "xvz1evFS4wEEPTGEFPHBog",
+            ConsumerSecret = "kAcSOqF21Fu85e7zjz7ZN2U4ZRhfV3WpwPAoE3Z7kBw"
+        };
+
+        settings.AccessTokenSecret = fakeDataProtector.Protect(settings.AccessTokenSecret);
+        settings.ConsumerSecret = fakeDataProtector.Protect(settings.ConsumerSecret);
 
-            var ticks = 13186229580000000 + 621355968000000000;
-            _mockHttpMessageHandler = new Mock<TwitterClientMessageHandler>(
-                Mock.Of<IClock>(i => i.UtcNow == new DateTime(ticks)),
-                Options.Create(settings),
-                _mockDataProtectionProvider);
-        }
-
-        [Fact]
-        /// <summary>
-        /// Uses data from twitter's example to test the correct OAuth signature generation
-        /// https://developer.twitter.com/en/docs/basics/authentication/guides/creating-a-signature.html
-        /// </summary>
-        public async Task HttpRequestMessageShouldHaveCorrectSignedOAuthHeader()
+        var signinSettings = new TwitterSigninSettings
         {
-            HttpRequestMessage message = null;
-
-            _mockFakeHttpMessageHandler.Setup(c => c.Send(
-                    It.IsAny<HttpRequestMessage>())
-                ).Returns((HttpRequestMessage request) =>
-                    new HttpResponseMessage(HttpStatusCode.OK)
-                    {
-                        Content = new StringContent(UpdateStatusResponse),
-                    }
-                ).Callback<HttpRequestMessage>((msg) =>
-                    message = msg
-                );
-
-            var mockTwitterClient = new Mock<TwitterClient>(
-                new HttpClient(_mockFakeHttpMessageHandler.Object), Mock.Of<ILogger<TwitterClient>>())
-            {
-                CallBase = true,
-            };
-
-            _mockHttpMessageHandler.Setup(c => c.GetNonce())
-                .Returns(() => "kYjzVBB8Y0ZFabxSWbWovY3uYSQ2pTgmZeNu2VS4cg");
-
-            var result = await mockTwitterClient.Object.UpdateStatus("Hello Ladies + Gentlemen, a signed OAuth request!", "include_entities=true");
-
-            await _mockHttpMessageHandler.Object.ConfigureOAuthAsync(message);
-
-            Assert.NotNull(message.Headers.Authorization);
-            Assert.Equal(ExpectedOauthHeader, message.Headers.Authorization.ToString());
-        }
+            CallbackPath = null,
+        };
+
+        _mockDataProtectionProvider = Mock.Of<IDataProtectionProvider>(dpp =>
+            dpp.CreateProtector(It.IsAny<string>()) == fakeDataProtector
+        );
+
+        var ticks = 13186229580000000 + 621355968000000000;
+        _mockHttpMessageHandler = new Mock<TwitterClientMessageHandler>(
+            Mock.Of<IClock>(i => i.UtcNow == new DateTime(ticks)),
+            Options.Create(settings),
+            _mockDataProtectionProvider);
     }
 
-    public class FakeHttpMessageHandler : HttpMessageHandler
+    [Fact]
+    /// <summary>
+    /// Uses data from twitter's example to test the correct OAuth signature generation
+    /// https://developer.twitter.com/en/docs/basics/authentication/guides/creating-a-signature.html
+    /// </summary>
+    public async Task HttpRequestMessageShouldHaveCorrectSignedOAuthHeader()
     {
-        public virtual HttpResponseMessage Send(HttpRequestMessage request)
-        {
-            throw new NotImplementedException("Now we can setup this method with our mocking framework");
-        }
+        HttpRequestMessage message = null;
+
+        _mockFakeHttpMessageHandler.Setup(c => c.Send(
+                It.IsAny<HttpRequestMessage>())
+            ).Returns((HttpRequestMessage request) =>
+                new HttpResponseMessage(HttpStatusCode.OK)
+                {
+                    Content = new StringContent(UpdateStatusResponse),
+                }
+            ).Callback<HttpRequestMessage>((msg) =>
+                message = msg
+            );
 
-        protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken)
+        var mockTwitterClient = new Mock<TwitterClient>(
+            new HttpClient(_mockFakeHttpMessageHandler.Object), Mock.Of<ILogger<TwitterClient>>())
         {
-            return Task.FromResult(Send(request));
-        }
+            CallBase = true,
+        };
+
+        _mockHttpMessageHandler.Setup(c => c.GetNonce())
+            .Returns(() => "kYjzVBB8Y0ZFabxSWbWovY3uYSQ2pTgmZeNu2VS4cg");
+
+        var result = await mockTwitterClient.Object.UpdateStatus("Hello Ladies + Gentlemen, a signed OAuth request!", "include_entities=true");
+
+        await _mockHttpMessageHandler.Object.ConfigureOAuthAsync(message);
+
+        Assert.NotNull(message.Headers.Authorization);
+        Assert.Equal(ExpectedOauthHeader, message.Headers.Authorization.ToString());
     }
+}
 
-    public class FakeDataProtector : IDataProtector
+public class FakeHttpMessageHandler : HttpMessageHandler
+{
+    public virtual HttpResponseMessage Send(HttpRequestMessage request)
     {
-        public IDataProtector CreateProtector(string purpose)
-        {
-            throw new NotImplementedException();
-        }
+        throw new NotImplementedException("Now we can setup this method with our mocking framework");
+    }
 
-        public byte[] Protect(byte[] plaintext)
-        {
-            return plaintext;
-        }
+    protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken)
+    {
+        return Task.FromResult(Send(request));
+    }
+}
 
-        public byte[] Unprotect(byte[] protectedData)
-        {
-            return protectedData;
-        }
+public class FakeDataProtector : IDataProtector
+{
+    public IDataProtector CreateProtector(string purpose)
+    {
+        throw new NotImplementedException();
+    }
+
+    public byte[] Protect(byte[] plaintext)
+    {
+        return plaintext;
+    }
+
+    public byte[] Unprotect(byte[] protectedData)
+    {
+        return protectedData;
     }
 }
diff --git a/test/OrchardCore.Tests/Modules/PoweredByMiddlewareTests.cs b/test/OrchardCore.Tests/Modules/PoweredByMiddlewareTests.cs
index d9b1a55a40f..183af46709f 100644
--- a/test/OrchardCore.Tests/Modules/PoweredByMiddlewareTests.cs
+++ b/test/OrchardCore.Tests/Modules/PoweredByMiddlewareTests.cs
@@ -1,69 +1,68 @@
 using OrchardCore.Modules;
 
-namespace OrchardCore.Tests.Modules
+namespace OrchardCore.Tests.Modules;
+
+public class PoweredByMiddlewareTests
 {
-    public class PoweredByMiddlewareTests
+    [Fact]
+    public async Task InjectPoweredByHeader()
     {
-        [Fact]
-        public async Task InjectPoweredByHeader()
-        {
-            // Arrange
-            string key = "X-Powered-By", value = "OrchardCore";
-            var headersArray = new Dictionary<string, StringValues>() { { key, string.Empty } };
-            var headersDic = new HeaderDictionary(headersArray);
-            var httpResponseMock = new Mock<HttpResponse>();
-            httpResponseMock.SetupGet(r => r.Headers).Returns(headersDic);
+        // Arrange
+        string key = "X-Powered-By", value = "OrchardCore";
+        var headersArray = new Dictionary<string, StringValues>() { { key, string.Empty } };
+        var headersDic = new HeaderDictionary(headersArray);
+        var httpResponseMock = new Mock<HttpResponse>();
+        httpResponseMock.SetupGet(r => r.Headers).Returns(headersDic);
 
-            var httpContextMock = new Mock<HttpContext>();
-            httpContextMock.Setup(c => c.Response).Returns(httpResponseMock.Object);
+        var httpContextMock = new Mock<HttpContext>();
+        httpContextMock.Setup(c => c.Response).Returns(httpResponseMock.Object);
 
-            var optionsMock = new Mock<IPoweredByMiddlewareOptions>();
-            optionsMock.SetupGet(o => o.Enabled).Returns(true);
-            optionsMock.SetupGet(o => o.HeaderName).Returns(key);
-            optionsMock.SetupGet(o => o.HeaderValue).Returns(value);
-            static Task requestDelegate(HttpContext context) => Task.CompletedTask;
-            var middleware = new PoweredByMiddleware(next: requestDelegate, options: optionsMock.Object);
+        var optionsMock = new Mock<IPoweredByMiddlewareOptions>();
+        optionsMock.SetupGet(o => o.Enabled).Returns(true);
+        optionsMock.SetupGet(o => o.HeaderName).Returns(key);
+        optionsMock.SetupGet(o => o.HeaderValue).Returns(value);
+        static Task requestDelegate(HttpContext context) => Task.CompletedTask;
+        var middleware = new PoweredByMiddleware(next: requestDelegate, options: optionsMock.Object);
 
-            // Act
-            await middleware.Invoke(httpContextMock.Object);
+        // Act
+        await middleware.Invoke(httpContextMock.Object);
 
-            // Assert
-            Assert.Equal(value, headersArray[key]);
-            httpResponseMock.Verify(r => r.Headers, Times.Once);
-        }
+        // Assert
+        Assert.Equal(value, headersArray[key]);
+        httpResponseMock.Verify(r => r.Headers, Times.Once);
+    }
 
-        [Fact]
-        public async Task DoNotInjectPoweredByHeaderIfDisabled()
-        {
-            // Arrange
-            string key = "X-Powered-By", value = "OrchardCore";
-            var httpResponseMock = new Mock<HttpResponse>();
+    [Fact]
+    public async Task DoNotInjectPoweredByHeaderIfDisabled()
+    {
+        // Arrange
+        string key = "X-Powered-By", value = "OrchardCore";
+        var httpResponseMock = new Mock<HttpResponse>();
 #pragma warning disable ASP0019 // Suggest using IHeaderDictionary.Append or the indexer
-            _ = httpResponseMock.Setup(r => r.Headers.Add(key, value));
+        _ = httpResponseMock.Setup(r => r.Headers.Add(key, value));
 #pragma warning restore ASP0019 // Suggest using IHeaderDictionary.Append or the indexer
 
-            Func<Task> dueTask = null;
-            httpResponseMock.Setup(r => r.OnStarting(It.IsAny<Func<Task>>()))
-                            .Callback<Func<Task>>((f) => dueTask = f);
+        Func<Task> dueTask = null;
+        httpResponseMock.Setup(r => r.OnStarting(It.IsAny<Func<Task>>()))
+                        .Callback<Func<Task>>((f) => dueTask = f);
 
-            var httpContextMock = new Mock<HttpContext>();
-            httpContextMock.Setup(c => c.Response).Returns(httpResponseMock.Object);
+        var httpContextMock = new Mock<HttpContext>();
+        httpContextMock.Setup(c => c.Response).Returns(httpResponseMock.Object);
 
-            var optionsMock = new Mock<IPoweredByMiddlewareOptions>();
-            optionsMock.SetupGet(o => o.Enabled).Returns(false);
-            optionsMock.SetupGet(o => o.HeaderName).Returns(key);
-            optionsMock.SetupGet(o => o.HeaderValue).Returns(value);
-            static Task requestDelegate(HttpContext context) => Task.CompletedTask;
-            var middleware = new PoweredByMiddleware(next: requestDelegate, options: optionsMock.Object);
+        var optionsMock = new Mock<IPoweredByMiddlewareOptions>();
+        optionsMock.SetupGet(o => o.Enabled).Returns(false);
+        optionsMock.SetupGet(o => o.HeaderName).Returns(key);
+        optionsMock.SetupGet(o => o.HeaderValue).Returns(value);
+        static Task requestDelegate(HttpContext context) => Task.CompletedTask;
+        var middleware = new PoweredByMiddleware(next: requestDelegate, options: optionsMock.Object);
 
-            // Act
-            await middleware.Invoke(httpContextMock.Object);
+        // Act
+        await middleware.Invoke(httpContextMock.Object);
 
-            // Assert
-            Assert.Null(dueTask);
+        // Assert
+        Assert.Null(dueTask);
 #pragma warning disable ASP0019 // Suggest using IHeaderDictionary.Append or the indexer
-            httpResponseMock.Verify(r => r.Headers.Add(key, value), Times.Never);
+        httpResponseMock.Verify(r => r.Headers.Add(key, value), Times.Never);
 #pragma warning restore ASP0019 // Suggest using IHeaderDictionary.Append or the indexer
-        }
     }
 }
diff --git a/test/OrchardCore.Tests/Orchard.Queries/SqlParserTests.cs b/test/OrchardCore.Tests/Orchard.Queries/SqlParserTests.cs
index ecb13a75136..a7f392fe2c2 100644
--- a/test/OrchardCore.Tests/Orchard.Queries/SqlParserTests.cs
+++ b/test/OrchardCore.Tests/Orchard.Queries/SqlParserTests.cs
@@ -1,247 +1,246 @@
 using OrchardCore.Queries.Sql;
 
-namespace OrchardCore.Tests.OrchardCore.Queries
+namespace OrchardCore.Tests.OrchardCore.Queries;
+
+public class SqlParserTests
 {
-    public class SqlParserTests
-    {
-        private readonly ISqlDialect _defaultDialect = new SqlServerDialect();
-        private readonly string _schema = new Configuration().Schema;
-        private readonly string _defaultTablePrefix = "tp_";
-
-        private static string FormatSql(string sql)
-        {
-            return sql.Replace("\r\n", " ").Replace('\n', ' ');
-        }
-
-        [Theory]
-        [InlineData("select a", "SELECT [a];")]
-        [InlineData("select *", "SELECT *;")]
-        [InlineData("SELECT a", "SELECT [a];")]
-        [InlineData("SELECT a, b", "SELECT [a], [b];")]
-        [InlineData("SELECT a.b", "SELECT [tp_a].[b];")]
-        [InlineData("SELECT a.b, c.d", "SELECT [tp_a].[b], [tp_c].[d];")]
-        [InlineData("SELECT a as a1", "SELECT [a] AS a1;")]
-        [InlineData("SELECT a as a1, b as b1", "SELECT [a] AS a1, [b] AS b1;")]
-        [InlineData("select Avg(a)", "SELECT Avg([a]);")]
-        [InlineData("select Min(*)", "SELECT Min(*);")]
-        [InlineData("select distinct a", "SELECT DISTINCT [a];")]
-        public void ShouldParseSelectClause(string sql, string expectedSql)
-        {
-            var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
-            Assert.True(result);
-            Assert.Equal(expectedSql, FormatSql(rawQuery));
-        }
-
-        [Theory]
-        [InlineData("select a from t", "SELECT [a] FROM [tp_t];")]
-        [InlineData("SELECT a FROM t", "SELECT [a] FROM [tp_t];")]
-        [InlineData("SELECT a FROM t as t1", "SELECT [a] FROM [tp_t] AS t1;")]
-        [InlineData("SELECT a FROM t1, t2", "SELECT [a] FROM [tp_t1], [tp_t2];")]
-        public void ShouldParseFromClause(string sql, string expectedSql)
-        {
-            var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
-            Assert.True(result);
-            Assert.Equal(expectedSql, FormatSql(rawQuery));
-        }
-
-        [Theory]
-        [InlineData("select a where b", "SELECT [a] WHERE [b];")]
-        [InlineData("select a where b.b1", "SELECT [a] WHERE [tp_b].[b1];")]
-        [InlineData("select a where b = c", "SELECT [a] WHERE [b] = [c];")]
-        [InlineData("select a where b = c and d", "SELECT [a] WHERE [b] = [c] AND [d];")]
-        public void ShouldParseWhereClause(string sql, string expectedSql)
-        {
-            var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
-            Assert.True(result);
-            Assert.Equal(expectedSql, FormatSql(rawQuery));
-        }
-
-        [Theory]
-        [InlineData("select a where a", "SELECT [a] WHERE [a];")]
-        [InlineData("select a where ~a", "SELECT [a] WHERE ~[a];")]
-        [InlineData("select a where a = b", "SELECT [a] WHERE [a] = [b];")]
-        [InlineData("select a where a = true", "SELECT [a] WHERE [a] = 1;")]
-        [InlineData("select a where a = false", "SELECT [a] WHERE [a] = 0;")]
-        [InlineData("select a where a = 1", "SELECT [a] WHERE [a] = 1;")]
-        [InlineData("select a where a = 1.234", "SELECT [a] WHERE [a] = 1.234;")]
-        [InlineData("select a where a = 'foo'", "SELECT [a] WHERE [a] = N'foo';")]
-        [InlineData("select a where a like '%foo%'", "SELECT [a] WHERE [a] LIKE N'%foo%';")]
-        [InlineData("select a where a not like '%foo%'", "SELECT [a] WHERE [a] NOT LIKE N'%foo%';")]
-        [InlineData("select a where a between b and c", "SELECT [a] WHERE [a] BETWEEN [b] AND [c];")]
-        [InlineData("select a where a not between b and c", "SELECT [a] WHERE [a] NOT BETWEEN [b] AND [c];")]
-        [InlineData("select a where a = b or c = d", "SELECT [a] WHERE [a] = [b] OR [c] = [d];")]
-        [InlineData("select a where (a = b) or (c = d)", "SELECT [a] WHERE ([a] = [b]) OR ([c] = [d]);")]
-        [InlineData("select a where (a = b) or (c = d) and e", "SELECT [a] WHERE ([a] = [b]) OR ([c] = [d]) AND [e];")]
-        [InlineData("select a where test(arg)", "SELECT [a] WHERE test([arg]);")]
-        [InlineData("select a where b in (1,2,3)", "SELECT [a] WHERE [b] IN (1, 2, 3);")]
-        [InlineData("select a where b in (select b)", "SELECT [a] WHERE [b] IN (SELECT [b]);")]
-        [InlineData("select a where b not in (1,2,3)", "SELECT [a] WHERE [b] NOT IN (1, 2, 3);")]
-        [InlineData("select a where b not in (select b)", "SELECT [a] WHERE [b] NOT IN (SELECT [b]);")]
-        [InlineData("select a where b = (select Avg(c) from d)", "SELECT [a] WHERE [b] = (SELECT Avg([c]) FROM [tp_d]);")]
-        public void ShouldParseExpression(string sql, string expectedSql)
-        {
-            var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
-            Assert.True(result);
-            Assert.Equal(expectedSql, FormatSql(rawQuery));
-        }
-
-        [Theory]
-        [InlineData("select a where a = @b", "SELECT [a] WHERE [a] = @b;")]
-        [InlineData("select a where a = @b limit @limit", "SELECT TOP (@limit) [a] WHERE [a] = @b;")]
-        [InlineData("select a where a = @b limit @limit:10", "SELECT TOP (@limit) [a] WHERE [a] = @b;")]
-        public void ShouldParseParameters(string sql, string expectedSql)
-        {
-            var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
-            Assert.True(result);
-            Assert.Equal(expectedSql, FormatSql(rawQuery));
-        }
-
-        [Fact]
-        public void ShouldDefineDefaultParametersValue()
-        {
-            var parameters = new Dictionary<string, object>();
-            var result = SqlParser.TryParse("select a where a = @b:10", _schema, _defaultDialect, _defaultTablePrefix, parameters, out _, out _);
-            Assert.True(result);
-            Assert.Equal(10, parameters["b"]);
-        }
-
-        [Theory]
-        [InlineData("select a from b inner join c on b.b1 = c.c1", "SELECT [a] FROM [tp_b] INNER JOIN [tp_c] ON [tp_b].[b1] = [tp_c].[c1];")]
-        [InlineData("select a from b as ba inner join c as ca on ba.b1 = ca.c1", "SELECT [a] FROM [tp_b] AS ba INNER JOIN [tp_c] AS ca ON ba.[b1] = ca.[c1];")]
-        [InlineData("select a from b inner join c on b.b1 = c.c1 left join d on d.a = d.b", "SELECT [a] FROM [tp_b] INNER JOIN [tp_c] ON [tp_b].[b1] = [tp_c].[c1] LEFT JOIN [tp_d] ON [tp_d].[a] = [tp_d].[b];")]
-        [InlineData("select a from b inner join c on b.b1 = c.c1 and b.b2 = c.c2", "SELECT [a] FROM [tp_b] INNER JOIN [tp_c] ON [tp_b].[b1] = [tp_c].[c1] AND [tp_b].[b2] = [tp_c].[c2];")]
-        [InlineData("select a from b inner join c on b.b1 = c.c1 and b.b2 = @param", "SELECT [a] FROM [tp_b] INNER JOIN [tp_c] ON [tp_b].[b1] = [tp_c].[c1] AND [tp_b].[b2] = @param;")]
-        [InlineData("select a from b inner join c on 1 = 1 and @param = 'foo'", "SELECT [a] FROM [tp_b] INNER JOIN [tp_c] ON 1 = 1 AND @param = N'foo';")]
-        [InlineData("select a from b inner join c on 1 = @param left join d on d.a = @param left join e on e.a = 'foo'", "SELECT [a] FROM [tp_b] INNER JOIN [tp_c] ON 1 = @param LEFT JOIN [tp_d] ON [tp_d].[a] = @param LEFT JOIN [tp_e] ON [tp_e].[a] = N'foo';")]
-        public void ShouldParseJoinClause(string sql, string expectedSql)
-        {
-            var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
-            Assert.True(result);
-            Assert.Equal(expectedSql, FormatSql(rawQuery));
-        }
-
-        [Theory]
-        [InlineData("select a order by b", "SELECT [a] ORDER BY [b];")]
-        [InlineData("select a order by b, c", "SELECT [a] ORDER BY [b], [c];")]
-        [InlineData("select a order by b.c", "SELECT [a] ORDER BY [tp_b].[c];")]
-        [InlineData("select a from b as b1 order by b1.c", "SELECT [a] FROM [tp_b] AS b1 ORDER BY b1.[c];")]
-        [InlineData("select a order by b asc", "SELECT [a] ORDER BY [b] ASC;")]
-        [InlineData("select a order by b desc", "SELECT [a] ORDER BY [b] DESC;")]
-        public void ShouldParseOrderByClause(string sql, string expectedSql)
-        {
-            var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
-            Assert.True(result);
-            Assert.Equal(expectedSql, FormatSql(rawQuery));
-        }
-
-        [Theory]
-        [InlineData("select a limit 100", "SELECT TOP (100) [a];")]
-        [InlineData("select a limit 100 offset 10", "SELECT [a] OFFSET 10 ROWS FETCH NEXT 100 ROWS ONLY;")]
-        [InlineData("select a offset 10", "SELECT [a] OFFSET 10 ROWS;")]
-        public void ShouldParseLimitOffsetClause(string sql, string expectedSql)
-        {
-            var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
-            Assert.True(result);
-            Assert.Equal(expectedSql, FormatSql(rawQuery));
-        }
-
-        [Theory]
-        [InlineData("select count(a) group by b", "SELECT count([a]) GROUP BY [b];")]
-        [InlineData("select count(a) group by b, c", "SELECT count([a]) GROUP BY [b], [c];")]
-        [InlineData("select count(a) group by b.c", "SELECT count([a]) GROUP BY [tp_b].[c];")]
-        [InlineData("select count(a) from b as b1 group by b1.c", "SELECT count([a]) FROM [tp_b] AS b1 GROUP BY b1.[c];")]
-        [InlineData("select Month(a) as m group by Month(a)", "SELECT Month([a]) AS m GROUP BY Month([a]);")]
-        public void ShouldParseGroupByClause(string sql, string expectedSql)
-        {
-            var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
-            Assert.True(result);
-            Assert.Equal(expectedSql, FormatSql(rawQuery));
-        }
-
-        [Theory]
-        [InlineData("SELECT COUNT(CustomerID) GROUP BY Country HAVING COUNT(CustomerID) > 5", "SELECT COUNT([CustomerID]) GROUP BY [Country] HAVING COUNT([CustomerID]) > 5;")]
-        public void ShouldParseHavingClause(string sql, string expectedSql)
-        {
-            var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
-            Assert.True(result);
-            Assert.Equal(expectedSql, FormatSql(rawQuery));
-        }
-
-        [Fact]
-        public void ShouldReturnErrorMessage()
-        {
-            var result = SqlParser.TryParse("SEL a", _schema, _defaultDialect, _defaultTablePrefix, null, out _, out var messages);
-
-            Assert.False(result);
-            Assert.Single(messages);
-            Assert.Contains("at line:0, col:0", messages.First());
-        }
-
-        [Theory]
-        [InlineData("SELECT a; -- this is a comment", "SELECT [a];")]
-        [InlineData("SELECT a; \n-- this is a comment", "SELECT [a];")]
-        [InlineData("SELECT /* comment */ a;", "SELECT [a];")]
-        [InlineData("SELECT /* comment \n comment */ a;", "SELECT [a];")]
-        public void ShouldParseComments(string sql, string expectedSql)
-        {
-            var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
-            Assert.True(result);
-            Assert.Equal(expectedSql, FormatSql(rawQuery));
-        }
-
-        [Theory]
-        [InlineData("select COUNT(1) over () from a", "SELECT COUNT(1) OVER () FROM [tp_a];")]
-        [InlineData("select COUNT(1) over () a from b", "SELECT COUNT(1) OVER () AS a FROM [tp_b];")]
-        [InlineData("select COUNT(1) over (partition by a) from b", "SELECT COUNT(1) OVER (PARTITION BY [a]) FROM [tp_b];")]
-        [InlineData("select COUNT(1) over (order by a) from b", "SELECT COUNT(1) OVER (ORDER BY [a]) FROM [tp_b];")]
-        [InlineData("select COUNT(1) over (order by a, b) from c", "SELECT COUNT(1) OVER (ORDER BY [a], [b]) FROM [tp_c];")]
-        [InlineData("select COUNT(1) over (order by a asc, b desc, c desc) from d", "SELECT COUNT(1) OVER (ORDER BY [a] ASC, [b] DESC, [c] DESC) FROM [tp_d];")]
-        [InlineData("select COUNT(1) over (partition by a order by b) from c", "SELECT COUNT(1) OVER (PARTITION BY [a] ORDER BY [b]) FROM [tp_c];")]
-        [InlineData("select COUNT(1) over () a, MAX(b) over () c from d", "SELECT COUNT(1) OVER () AS a, MAX([b]) OVER () AS c FROM [tp_d];")]
-        public void ShouldParseWindowFunction(string sql, string expectedSql)
-        {
-            var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
-            Assert.True(result);
-            Assert.Equal(expectedSql, FormatSql(rawQuery));
-        }
-
-        [Theory]
-        [InlineData("select a from b union select c from d", "SELECT [a] FROM [tp_b] UNION SELECT [c] FROM [tp_d];")]
-        [InlineData("select a from b union all select c from d", "SELECT [a] FROM [tp_b] UNION ALL SELECT [c] FROM [tp_d];")]
-        [InlineData("select a from b union all select c from d union select e from f", "SELECT [a] FROM [tp_b] UNION ALL SELECT [c] FROM [tp_d] UNION SELECT [e] FROM [tp_f];")]
-        public void ShouldParseUnionClause(string sql, string expectedSql)
-        {
-            var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
-            Assert.True(result);
-            Assert.Equal(expectedSql, FormatSql(rawQuery));
-        }
-
-        [Theory]
-        [InlineData("with cte as (select a from t) select * from cte", "WITH cte AS (SELECT [a] FROM [tp_t]) SELECT * FROM [cte];")]
-        [InlineData("with cte as (select a from t), cte2 as (select b from t) select * from cte2", "WITH cte AS (SELECT [a] FROM [tp_t]), cte2 AS (SELECT [b] FROM [tp_t]) SELECT * FROM [cte2];")]
-        [InlineData("with cte as (select a from t union all select b from t) select * from cte", "WITH cte AS (SELECT [a] FROM [tp_t] UNION ALL SELECT [b] FROM [tp_t]) SELECT * FROM [cte];")]
-        [InlineData("with cte1(abc, def) as (select id as abc, id as def from t), cte2(ghi,jkl) as (select abc as ghi, def as jkl from cte1) select ghi, jkl from cte2", "WITH cte1(abc, def) AS (SELECT [id] AS abc, [id] AS def FROM [tp_t]), cte2(ghi, jkl) AS (SELECT [abc] AS ghi, [def] AS jkl FROM [cte1]) SELECT [ghi], [jkl] FROM [cte2];")]
-        [InlineData("with test(test) as (select a as test from t) select test from test", "WITH test(test) AS (SELECT [a] AS test FROM [tp_t]) SELECT [test] FROM [test];")]
-        public void ShouldParseCte(string sql, string expectedSql)
-        {
-            var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
-            Assert.True(result);
-            Assert.Equal(expectedSql, FormatSql(rawQuery));
-        }
-
-        [Theory]
-        [InlineData("select * from (select * from t) as b", "SELECT * FROM (SELECT * FROM [tp_t]) AS b;")]
-        [InlineData("select b.a from (select a from t) as b where b.a = b.a", "SELECT b.[a] FROM (SELECT [a] FROM [tp_t]) AS b WHERE b.[a] = b.[a];")]
-        [InlineData("select c.b from (select a as b from t) as c", "SELECT c.[b] FROM (SELECT [a] AS b FROM [tp_t]) AS c;")]
-        [InlineData("select b.a from (select a from t where [a] = 1) as b where b.a = 1", "SELECT b.[a] FROM (SELECT [a] FROM [tp_t] WHERE [a] = 1) AS b WHERE b.[a] = 1;")]
-        [InlineData("select b.a from (select a from t where [a] = 1 union all select a from t where [a] = 2) as b", "SELECT b.[a] FROM (SELECT [a] FROM [tp_t] WHERE [a] = 1 UNION ALL SELECT [a] FROM [tp_t] WHERE [a] = 2) AS b;")]
-        [InlineData("select d.b, g.b from (select a as b from c) as d, (select e as b from f) as g", "SELECT d.[b], g.[b] FROM (SELECT [a] AS b FROM [tp_c]) AS d, (SELECT [e] AS b FROM [tp_f]) AS g;")]
-        [InlineData("select * from (select d as e from (select c as d from (select b as c from (select a as b from t) as l4) as l3) as l2) as l1", "SELECT * FROM (SELECT [d] AS e FROM (SELECT [c] AS d FROM (SELECT [b] AS c FROM (SELECT [a] AS b FROM [tp_t]) AS l4) AS l3) AS l2) AS l1;")]
-        public void ShouldParseSubquery(string sql, string expectedSql)
-        {
-            var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
-            Assert.True(result);
-            Assert.Equal(expectedSql, FormatSql(rawQuery));
-        }
+    private readonly ISqlDialect _defaultDialect = new SqlServerDialect();
+    private readonly string _schema = new Configuration().Schema;
+    private readonly string _defaultTablePrefix = "tp_";
+
+    private static string FormatSql(string sql)
+    {
+        return sql.Replace("\r\n", " ").Replace('\n', ' ');
+    }
+
+    [Theory]
+    [InlineData("select a", "SELECT [a];")]
+    [InlineData("select *", "SELECT *;")]
+    [InlineData("SELECT a", "SELECT [a];")]
+    [InlineData("SELECT a, b", "SELECT [a], [b];")]
+    [InlineData("SELECT a.b", "SELECT [tp_a].[b];")]
+    [InlineData("SELECT a.b, c.d", "SELECT [tp_a].[b], [tp_c].[d];")]
+    [InlineData("SELECT a as a1", "SELECT [a] AS a1;")]
+    [InlineData("SELECT a as a1, b as b1", "SELECT [a] AS a1, [b] AS b1;")]
+    [InlineData("select Avg(a)", "SELECT Avg([a]);")]
+    [InlineData("select Min(*)", "SELECT Min(*);")]
+    [InlineData("select distinct a", "SELECT DISTINCT [a];")]
+    public void ShouldParseSelectClause(string sql, string expectedSql)
+    {
+        var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
+        Assert.True(result);
+        Assert.Equal(expectedSql, FormatSql(rawQuery));
+    }
+
+    [Theory]
+    [InlineData("select a from t", "SELECT [a] FROM [tp_t];")]
+    [InlineData("SELECT a FROM t", "SELECT [a] FROM [tp_t];")]
+    [InlineData("SELECT a FROM t as t1", "SELECT [a] FROM [tp_t] AS t1;")]
+    [InlineData("SELECT a FROM t1, t2", "SELECT [a] FROM [tp_t1], [tp_t2];")]
+    public void ShouldParseFromClause(string sql, string expectedSql)
+    {
+        var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
+        Assert.True(result);
+        Assert.Equal(expectedSql, FormatSql(rawQuery));
+    }
+
+    [Theory]
+    [InlineData("select a where b", "SELECT [a] WHERE [b];")]
+    [InlineData("select a where b.b1", "SELECT [a] WHERE [tp_b].[b1];")]
+    [InlineData("select a where b = c", "SELECT [a] WHERE [b] = [c];")]
+    [InlineData("select a where b = c and d", "SELECT [a] WHERE [b] = [c] AND [d];")]
+    public void ShouldParseWhereClause(string sql, string expectedSql)
+    {
+        var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
+        Assert.True(result);
+        Assert.Equal(expectedSql, FormatSql(rawQuery));
+    }
+
+    [Theory]
+    [InlineData("select a where a", "SELECT [a] WHERE [a];")]
+    [InlineData("select a where ~a", "SELECT [a] WHERE ~[a];")]
+    [InlineData("select a where a = b", "SELECT [a] WHERE [a] = [b];")]
+    [InlineData("select a where a = true", "SELECT [a] WHERE [a] = 1;")]
+    [InlineData("select a where a = false", "SELECT [a] WHERE [a] = 0;")]
+    [InlineData("select a where a = 1", "SELECT [a] WHERE [a] = 1;")]
+    [InlineData("select a where a = 1.234", "SELECT [a] WHERE [a] = 1.234;")]
+    [InlineData("select a where a = 'foo'", "SELECT [a] WHERE [a] = N'foo';")]
+    [InlineData("select a where a like '%foo%'", "SELECT [a] WHERE [a] LIKE N'%foo%';")]
+    [InlineData("select a where a not like '%foo%'", "SELECT [a] WHERE [a] NOT LIKE N'%foo%';")]
+    [InlineData("select a where a between b and c", "SELECT [a] WHERE [a] BETWEEN [b] AND [c];")]
+    [InlineData("select a where a not between b and c", "SELECT [a] WHERE [a] NOT BETWEEN [b] AND [c];")]
+    [InlineData("select a where a = b or c = d", "SELECT [a] WHERE [a] = [b] OR [c] = [d];")]
+    [InlineData("select a where (a = b) or (c = d)", "SELECT [a] WHERE ([a] = [b]) OR ([c] = [d]);")]
+    [InlineData("select a where (a = b) or (c = d) and e", "SELECT [a] WHERE ([a] = [b]) OR ([c] = [d]) AND [e];")]
+    [InlineData("select a where test(arg)", "SELECT [a] WHERE test([arg]);")]
+    [InlineData("select a where b in (1,2,3)", "SELECT [a] WHERE [b] IN (1, 2, 3);")]
+    [InlineData("select a where b in (select b)", "SELECT [a] WHERE [b] IN (SELECT [b]);")]
+    [InlineData("select a where b not in (1,2,3)", "SELECT [a] WHERE [b] NOT IN (1, 2, 3);")]
+    [InlineData("select a where b not in (select b)", "SELECT [a] WHERE [b] NOT IN (SELECT [b]);")]
+    [InlineData("select a where b = (select Avg(c) from d)", "SELECT [a] WHERE [b] = (SELECT Avg([c]) FROM [tp_d]);")]
+    public void ShouldParseExpression(string sql, string expectedSql)
+    {
+        var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
+        Assert.True(result);
+        Assert.Equal(expectedSql, FormatSql(rawQuery));
+    }
+
+    [Theory]
+    [InlineData("select a where a = @b", "SELECT [a] WHERE [a] = @b;")]
+    [InlineData("select a where a = @b limit @limit", "SELECT TOP (@limit) [a] WHERE [a] = @b;")]
+    [InlineData("select a where a = @b limit @limit:10", "SELECT TOP (@limit) [a] WHERE [a] = @b;")]
+    public void ShouldParseParameters(string sql, string expectedSql)
+    {
+        var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
+        Assert.True(result);
+        Assert.Equal(expectedSql, FormatSql(rawQuery));
+    }
+
+    [Fact]
+    public void ShouldDefineDefaultParametersValue()
+    {
+        var parameters = new Dictionary<string, object>();
+        var result = SqlParser.TryParse("select a where a = @b:10", _schema, _defaultDialect, _defaultTablePrefix, parameters, out _, out _);
+        Assert.True(result);
+        Assert.Equal(10, parameters["b"]);
+    }
+
+    [Theory]
+    [InlineData("select a from b inner join c on b.b1 = c.c1", "SELECT [a] FROM [tp_b] INNER JOIN [tp_c] ON [tp_b].[b1] = [tp_c].[c1];")]
+    [InlineData("select a from b as ba inner join c as ca on ba.b1 = ca.c1", "SELECT [a] FROM [tp_b] AS ba INNER JOIN [tp_c] AS ca ON ba.[b1] = ca.[c1];")]
+    [InlineData("select a from b inner join c on b.b1 = c.c1 left join d on d.a = d.b", "SELECT [a] FROM [tp_b] INNER JOIN [tp_c] ON [tp_b].[b1] = [tp_c].[c1] LEFT JOIN [tp_d] ON [tp_d].[a] = [tp_d].[b];")]
+    [InlineData("select a from b inner join c on b.b1 = c.c1 and b.b2 = c.c2", "SELECT [a] FROM [tp_b] INNER JOIN [tp_c] ON [tp_b].[b1] = [tp_c].[c1] AND [tp_b].[b2] = [tp_c].[c2];")]
+    [InlineData("select a from b inner join c on b.b1 = c.c1 and b.b2 = @param", "SELECT [a] FROM [tp_b] INNER JOIN [tp_c] ON [tp_b].[b1] = [tp_c].[c1] AND [tp_b].[b2] = @param;")]
+    [InlineData("select a from b inner join c on 1 = 1 and @param = 'foo'", "SELECT [a] FROM [tp_b] INNER JOIN [tp_c] ON 1 = 1 AND @param = N'foo';")]
+    [InlineData("select a from b inner join c on 1 = @param left join d on d.a = @param left join e on e.a = 'foo'", "SELECT [a] FROM [tp_b] INNER JOIN [tp_c] ON 1 = @param LEFT JOIN [tp_d] ON [tp_d].[a] = @param LEFT JOIN [tp_e] ON [tp_e].[a] = N'foo';")]
+    public void ShouldParseJoinClause(string sql, string expectedSql)
+    {
+        var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
+        Assert.True(result);
+        Assert.Equal(expectedSql, FormatSql(rawQuery));
+    }
+
+    [Theory]
+    [InlineData("select a order by b", "SELECT [a] ORDER BY [b];")]
+    [InlineData("select a order by b, c", "SELECT [a] ORDER BY [b], [c];")]
+    [InlineData("select a order by b.c", "SELECT [a] ORDER BY [tp_b].[c];")]
+    [InlineData("select a from b as b1 order by b1.c", "SELECT [a] FROM [tp_b] AS b1 ORDER BY b1.[c];")]
+    [InlineData("select a order by b asc", "SELECT [a] ORDER BY [b] ASC;")]
+    [InlineData("select a order by b desc", "SELECT [a] ORDER BY [b] DESC;")]
+    public void ShouldParseOrderByClause(string sql, string expectedSql)
+    {
+        var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
+        Assert.True(result);
+        Assert.Equal(expectedSql, FormatSql(rawQuery));
+    }
+
+    [Theory]
+    [InlineData("select a limit 100", "SELECT TOP (100) [a];")]
+    [InlineData("select a limit 100 offset 10", "SELECT [a] OFFSET 10 ROWS FETCH NEXT 100 ROWS ONLY;")]
+    [InlineData("select a offset 10", "SELECT [a] OFFSET 10 ROWS;")]
+    public void ShouldParseLimitOffsetClause(string sql, string expectedSql)
+    {
+        var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
+        Assert.True(result);
+        Assert.Equal(expectedSql, FormatSql(rawQuery));
+    }
+
+    [Theory]
+    [InlineData("select count(a) group by b", "SELECT count([a]) GROUP BY [b];")]
+    [InlineData("select count(a) group by b, c", "SELECT count([a]) GROUP BY [b], [c];")]
+    [InlineData("select count(a) group by b.c", "SELECT count([a]) GROUP BY [tp_b].[c];")]
+    [InlineData("select count(a) from b as b1 group by b1.c", "SELECT count([a]) FROM [tp_b] AS b1 GROUP BY b1.[c];")]
+    [InlineData("select Month(a) as m group by Month(a)", "SELECT Month([a]) AS m GROUP BY Month([a]);")]
+    public void ShouldParseGroupByClause(string sql, string expectedSql)
+    {
+        var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
+        Assert.True(result);
+        Assert.Equal(expectedSql, FormatSql(rawQuery));
+    }
+
+    [Theory]
+    [InlineData("SELECT COUNT(CustomerID) GROUP BY Country HAVING COUNT(CustomerID) > 5", "SELECT COUNT([CustomerID]) GROUP BY [Country] HAVING COUNT([CustomerID]) > 5;")]
+    public void ShouldParseHavingClause(string sql, string expectedSql)
+    {
+        var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
+        Assert.True(result);
+        Assert.Equal(expectedSql, FormatSql(rawQuery));
+    }
+
+    [Fact]
+    public void ShouldReturnErrorMessage()
+    {
+        var result = SqlParser.TryParse("SEL a", _schema, _defaultDialect, _defaultTablePrefix, null, out _, out var messages);
+
+        Assert.False(result);
+        Assert.Single(messages);
+        Assert.Contains("at line:0, col:0", messages.First());
+    }
+
+    [Theory]
+    [InlineData("SELECT a; -- this is a comment", "SELECT [a];")]
+    [InlineData("SELECT a; \n-- this is a comment", "SELECT [a];")]
+    [InlineData("SELECT /* comment */ a;", "SELECT [a];")]
+    [InlineData("SELECT /* comment \n comment */ a;", "SELECT [a];")]
+    public void ShouldParseComments(string sql, string expectedSql)
+    {
+        var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
+        Assert.True(result);
+        Assert.Equal(expectedSql, FormatSql(rawQuery));
+    }
+
+    [Theory]
+    [InlineData("select COUNT(1) over () from a", "SELECT COUNT(1) OVER () FROM [tp_a];")]
+    [InlineData("select COUNT(1) over () a from b", "SELECT COUNT(1) OVER () AS a FROM [tp_b];")]
+    [InlineData("select COUNT(1) over (partition by a) from b", "SELECT COUNT(1) OVER (PARTITION BY [a]) FROM [tp_b];")]
+    [InlineData("select COUNT(1) over (order by a) from b", "SELECT COUNT(1) OVER (ORDER BY [a]) FROM [tp_b];")]
+    [InlineData("select COUNT(1) over (order by a, b) from c", "SELECT COUNT(1) OVER (ORDER BY [a], [b]) FROM [tp_c];")]
+    [InlineData("select COUNT(1) over (order by a asc, b desc, c desc) from d", "SELECT COUNT(1) OVER (ORDER BY [a] ASC, [b] DESC, [c] DESC) FROM [tp_d];")]
+    [InlineData("select COUNT(1) over (partition by a order by b) from c", "SELECT COUNT(1) OVER (PARTITION BY [a] ORDER BY [b]) FROM [tp_c];")]
+    [InlineData("select COUNT(1) over () a, MAX(b) over () c from d", "SELECT COUNT(1) OVER () AS a, MAX([b]) OVER () AS c FROM [tp_d];")]
+    public void ShouldParseWindowFunction(string sql, string expectedSql)
+    {
+        var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
+        Assert.True(result);
+        Assert.Equal(expectedSql, FormatSql(rawQuery));
+    }
+
+    [Theory]
+    [InlineData("select a from b union select c from d", "SELECT [a] FROM [tp_b] UNION SELECT [c] FROM [tp_d];")]
+    [InlineData("select a from b union all select c from d", "SELECT [a] FROM [tp_b] UNION ALL SELECT [c] FROM [tp_d];")]
+    [InlineData("select a from b union all select c from d union select e from f", "SELECT [a] FROM [tp_b] UNION ALL SELECT [c] FROM [tp_d] UNION SELECT [e] FROM [tp_f];")]
+    public void ShouldParseUnionClause(string sql, string expectedSql)
+    {
+        var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
+        Assert.True(result);
+        Assert.Equal(expectedSql, FormatSql(rawQuery));
+    }
+
+    [Theory]
+    [InlineData("with cte as (select a from t) select * from cte", "WITH cte AS (SELECT [a] FROM [tp_t]) SELECT * FROM [cte];")]
+    [InlineData("with cte as (select a from t), cte2 as (select b from t) select * from cte2", "WITH cte AS (SELECT [a] FROM [tp_t]), cte2 AS (SELECT [b] FROM [tp_t]) SELECT * FROM [cte2];")]
+    [InlineData("with cte as (select a from t union all select b from t) select * from cte", "WITH cte AS (SELECT [a] FROM [tp_t] UNION ALL SELECT [b] FROM [tp_t]) SELECT * FROM [cte];")]
+    [InlineData("with cte1(abc, def) as (select id as abc, id as def from t), cte2(ghi,jkl) as (select abc as ghi, def as jkl from cte1) select ghi, jkl from cte2", "WITH cte1(abc, def) AS (SELECT [id] AS abc, [id] AS def FROM [tp_t]), cte2(ghi, jkl) AS (SELECT [abc] AS ghi, [def] AS jkl FROM [cte1]) SELECT [ghi], [jkl] FROM [cte2];")]
+    [InlineData("with test(test) as (select a as test from t) select test from test", "WITH test(test) AS (SELECT [a] AS test FROM [tp_t]) SELECT [test] FROM [test];")]
+    public void ShouldParseCte(string sql, string expectedSql)
+    {
+        var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
+        Assert.True(result);
+        Assert.Equal(expectedSql, FormatSql(rawQuery));
+    }
+
+    [Theory]
+    [InlineData("select * from (select * from t) as b", "SELECT * FROM (SELECT * FROM [tp_t]) AS b;")]
+    [InlineData("select b.a from (select a from t) as b where b.a = b.a", "SELECT b.[a] FROM (SELECT [a] FROM [tp_t]) AS b WHERE b.[a] = b.[a];")]
+    [InlineData("select c.b from (select a as b from t) as c", "SELECT c.[b] FROM (SELECT [a] AS b FROM [tp_t]) AS c;")]
+    [InlineData("select b.a from (select a from t where [a] = 1) as b where b.a = 1", "SELECT b.[a] FROM (SELECT [a] FROM [tp_t] WHERE [a] = 1) AS b WHERE b.[a] = 1;")]
+    [InlineData("select b.a from (select a from t where [a] = 1 union all select a from t where [a] = 2) as b", "SELECT b.[a] FROM (SELECT [a] FROM [tp_t] WHERE [a] = 1 UNION ALL SELECT [a] FROM [tp_t] WHERE [a] = 2) AS b;")]
+    [InlineData("select d.b, g.b from (select a as b from c) as d, (select e as b from f) as g", "SELECT d.[b], g.[b] FROM (SELECT [a] AS b FROM [tp_c]) AS d, (SELECT [e] AS b FROM [tp_f]) AS g;")]
+    [InlineData("select * from (select d as e from (select c as d from (select b as c from (select a as b from t) as l4) as l3) as l2) as l1", "SELECT * FROM (SELECT [d] AS e FROM (SELECT [c] AS d FROM (SELECT [b] AS c FROM (SELECT [a] AS b FROM [tp_t]) AS l4) AS l3) AS l2) AS l1;")]
+    public void ShouldParseSubquery(string sql, string expectedSql)
+    {
+        var result = SqlParser.TryParse(sql, _schema, _defaultDialect, _defaultTablePrefix, null, out var rawQuery, out _);
+        Assert.True(result);
+        Assert.Equal(expectedSql, FormatSql(rawQuery));
     }
 }
diff --git a/test/OrchardCore.Tests/OrchardCore.Environment.Cache/CacheScopeManagerTests.cs b/test/OrchardCore.Tests/OrchardCore.Environment.Cache/CacheScopeManagerTests.cs
index c2d1bbd611f..5a8b370bc34 100644
--- a/test/OrchardCore.Tests/OrchardCore.Environment.Cache/CacheScopeManagerTests.cs
+++ b/test/OrchardCore.Tests/OrchardCore.Environment.Cache/CacheScopeManagerTests.cs
@@ -1,393 +1,392 @@
 using OrchardCore.Environment.Cache;
 
-namespace OrchardCore.Tests.Environment.Cache
+namespace OrchardCore.Tests.Environment.Cache;
+
+public class CacheScopeManagerTests
 {
-    public class CacheScopeManagerTests
+    [Fact]
+    public void ScopesCanBeEnteredAndExited()
     {
-        [Fact]
-        public void ScopesCanBeEnteredAndExited()
-        {
-            var scopeA = new CacheContext("a");
-            var scopeB = new CacheContext("b");
-            var scopeC = new CacheContext("c");
-            var scopeD = new CacheContext("d");
+        var scopeA = new CacheContext("a");
+        var scopeB = new CacheContext("b");
+        var scopeC = new CacheContext("c");
+        var scopeD = new CacheContext("d");
 
-            var sut = new CacheScopeManager();
+        var sut = new CacheScopeManager();
 
-            sut.EnterScope(scopeA);
-            sut.EnterScope(scopeB);
+        sut.EnterScope(scopeA);
+        sut.EnterScope(scopeB);
 
-            sut.ExitScope();
+        sut.ExitScope();
 
-            sut.EnterScope(scopeC);
+        sut.EnterScope(scopeC);
 
-            sut.ExitScope();
-            sut.ExitScope();
+        sut.ExitScope();
+        sut.ExitScope();
 
-            sut.EnterScope(scopeD);
+        sut.EnterScope(scopeD);
 
-            sut.ExitScope();
-        }
+        sut.ExitScope();
+    }
 
-        [Fact]
-        public void ContextsAreBubbledUp1()
-        {
-            var scopeA = new CacheContext("a");
-            var scopeB = new CacheContext("b").AddContext("1", "2");
+    [Fact]
+    public void ContextsAreBubbledUp1()
+    {
+        var scopeA = new CacheContext("a");
+        var scopeB = new CacheContext("b").AddContext("1", "2");
 
-            var sut = new CacheScopeManager();
+        var sut = new CacheScopeManager();
 
-            sut.EnterScope(scopeA);
-            sut.EnterScope(scopeB);
+        sut.EnterScope(scopeA);
+        sut.EnterScope(scopeB);
 
-            sut.ExitScope();
-            sut.ExitScope();
+        sut.ExitScope();
+        sut.ExitScope();
 
-            Assert.Collection(scopeA.Contexts, context => Assert.Contains("1", context),
-                                               context => Assert.Contains("2", context));
+        Assert.Collection(scopeA.Contexts, context => Assert.Contains("1", context),
+                                           context => Assert.Contains("2", context));
 
-            Assert.Collection(scopeB.Contexts, context => Assert.Contains("1", context),
-                                               context => Assert.Contains("2", context));
-        }
+        Assert.Collection(scopeB.Contexts, context => Assert.Contains("1", context),
+                                           context => Assert.Contains("2", context));
+    }
 
-        [Fact]
-        public void ContextsAreBubbledUp2()
-        {
-            var scopeA = new CacheContext("a").AddContext("1", "2");
-            var scopeB = new CacheContext("b");
+    [Fact]
+    public void ContextsAreBubbledUp2()
+    {
+        var scopeA = new CacheContext("a").AddContext("1", "2");
+        var scopeB = new CacheContext("b");
 
-            var sut = new CacheScopeManager();
+        var sut = new CacheScopeManager();
 
-            sut.EnterScope(scopeA);
-            sut.EnterScope(scopeB);
+        sut.EnterScope(scopeA);
+        sut.EnterScope(scopeB);
 
-            sut.ExitScope();
-            sut.ExitScope();
+        sut.ExitScope();
+        sut.ExitScope();
 
-            Assert.Collection(scopeA.Contexts, context => Assert.Contains("1", context),
-                                               context => Assert.Contains("2", context));
+        Assert.Collection(scopeA.Contexts, context => Assert.Contains("1", context),
+                                           context => Assert.Contains("2", context));
 
-            Assert.Empty(scopeB.Contexts);
-        }
+        Assert.Empty(scopeB.Contexts);
+    }
 
-        [Fact]
-        public void ContextsAreBubbledUp3()
-        {
-            var scopeA = new CacheContext("a").AddContext("3", "4");
-            var scopeB = new CacheContext("b").AddContext("1", "2");
+    [Fact]
+    public void ContextsAreBubbledUp3()
+    {
+        var scopeA = new CacheContext("a").AddContext("3", "4");
+        var scopeB = new CacheContext("b").AddContext("1", "2");
 
-            var sut = new CacheScopeManager();
+        var sut = new CacheScopeManager();
 
-            sut.EnterScope(scopeA);
-            sut.EnterScope(scopeB);
+        sut.EnterScope(scopeA);
+        sut.EnterScope(scopeB);
 
-            sut.ExitScope();
-            sut.ExitScope();
+        sut.ExitScope();
+        sut.ExitScope();
 
-            Assert.Collection(scopeA.Contexts, context => Assert.Contains("3", context),
-                                               context => Assert.Contains("4", context),
-                                               context => Assert.Contains("1", context),
-                                               context => Assert.Contains("2", context));
+        Assert.Collection(scopeA.Contexts, context => Assert.Contains("3", context),
+                                           context => Assert.Contains("4", context),
+                                           context => Assert.Contains("1", context),
+                                           context => Assert.Contains("2", context));
 
-            Assert.Collection(scopeB.Contexts, context => Assert.Contains("1", context),
-                                               context => Assert.Contains("2", context));
-        }
+        Assert.Collection(scopeB.Contexts, context => Assert.Contains("1", context),
+                                           context => Assert.Contains("2", context));
+    }
 
-        [Fact]
-        public void TagsAreBubbledUp1()
-        {
-            var scopeA = new CacheContext("a");
-            var scopeB = new CacheContext("b").AddTag("1", "2");
+    [Fact]
+    public void TagsAreBubbledUp1()
+    {
+        var scopeA = new CacheContext("a");
+        var scopeB = new CacheContext("b").AddTag("1", "2");
 
-            var sut = new CacheScopeManager();
+        var sut = new CacheScopeManager();
 
-            sut.EnterScope(scopeA);
-            sut.EnterScope(scopeB);
+        sut.EnterScope(scopeA);
+        sut.EnterScope(scopeB);
 
-            sut.ExitScope();
-            sut.ExitScope();
+        sut.ExitScope();
+        sut.ExitScope();
 
-            Assert.Collection(scopeA.Tags, tag => Assert.Contains("1", tag),
-                                           tag => Assert.Contains("2", tag));
+        Assert.Collection(scopeA.Tags, tag => Assert.Contains("1", tag),
+                                       tag => Assert.Contains("2", tag));
 
-            Assert.Collection(scopeB.Tags, tag => Assert.Contains("1", tag),
-                                           tag => Assert.Contains("2", tag));
-        }
+        Assert.Collection(scopeB.Tags, tag => Assert.Contains("1", tag),
+                                       tag => Assert.Contains("2", tag));
+    }
 
-        [Fact]
-        public void TagsAreBubbledUp2()
-        {
-            var scopeA = new CacheContext("a").AddTag("1", "2");
-            var scopeB = new CacheContext("b");
+    [Fact]
+    public void TagsAreBubbledUp2()
+    {
+        var scopeA = new CacheContext("a").AddTag("1", "2");
+        var scopeB = new CacheContext("b");
 
-            var sut = new CacheScopeManager();
+        var sut = new CacheScopeManager();
 
-            sut.EnterScope(scopeA);
-            sut.EnterScope(scopeB);
+        sut.EnterScope(scopeA);
+        sut.EnterScope(scopeB);
 
-            sut.ExitScope();
-            sut.ExitScope();
+        sut.ExitScope();
+        sut.ExitScope();
 
-            Assert.Collection(scopeA.Tags, tag => Assert.Contains("1", tag),
-                                           tag => Assert.Contains("2", tag));
+        Assert.Collection(scopeA.Tags, tag => Assert.Contains("1", tag),
+                                       tag => Assert.Contains("2", tag));
 
-            Assert.False(scopeB.Tags.Any());
-        }
+        Assert.False(scopeB.Tags.Any());
+    }
 
-        [Fact]
-        public void TagsAreBubbledUp3()
-        {
-            var scopeA = new CacheContext("a").AddTag("3", "4");
-            var scopeB = new CacheContext("b").AddTag("1", "2");
+    [Fact]
+    public void TagsAreBubbledUp3()
+    {
+        var scopeA = new CacheContext("a").AddTag("3", "4");
+        var scopeB = new CacheContext("b").AddTag("1", "2");
 
-            var sut = new CacheScopeManager();
+        var sut = new CacheScopeManager();
 
-            sut.EnterScope(scopeA);
-            sut.EnterScope(scopeB);
+        sut.EnterScope(scopeA);
+        sut.EnterScope(scopeB);
 
-            sut.ExitScope();
-            sut.ExitScope();
+        sut.ExitScope();
+        sut.ExitScope();
 
-            Assert.Collection(scopeA.Tags, tag => Assert.Contains("3", tag),
-                                           tag => Assert.Contains("4", tag),
-                                           tag => Assert.Contains("1", tag),
-                                           tag => Assert.Contains("2", tag));
+        Assert.Collection(scopeA.Tags, tag => Assert.Contains("3", tag),
+                                       tag => Assert.Contains("4", tag),
+                                       tag => Assert.Contains("1", tag),
+                                       tag => Assert.Contains("2", tag));
 
-            Assert.Collection(scopeB.Tags, tag => Assert.Contains("1", tag),
-                                           tag => Assert.Contains("2", tag));
-        }
+        Assert.Collection(scopeB.Tags, tag => Assert.Contains("1", tag),
+                                       tag => Assert.Contains("2", tag));
+    }
 
-        [Fact]
-        public void ExpiryOnIsBubbledUp1()
-        {
-            var scopeA = new CacheContext("a");
-            var scopeB = new CacheContext("b").WithExpiryOn(new DateTime(2018, 10, 26));
+    [Fact]
+    public void ExpiryOnIsBubbledUp1()
+    {
+        var scopeA = new CacheContext("a");
+        var scopeB = new CacheContext("b").WithExpiryOn(new DateTime(2018, 10, 26));
 
-            var sut = new CacheScopeManager();
+        var sut = new CacheScopeManager();
 
-            sut.EnterScope(scopeA);
-            sut.EnterScope(scopeB);
+        sut.EnterScope(scopeA);
+        sut.EnterScope(scopeB);
 
-            sut.ExitScope();
-            sut.ExitScope();
+        sut.ExitScope();
+        sut.ExitScope();
 
-            Assert.Equal(new DateTime(2018, 10, 26), scopeA.ExpiresOn);
-            Assert.Equal(new DateTime(2018, 10, 26), scopeB.ExpiresOn);
-        }
+        Assert.Equal(new DateTime(2018, 10, 26), scopeA.ExpiresOn);
+        Assert.Equal(new DateTime(2018, 10, 26), scopeB.ExpiresOn);
+    }
 
-        [Fact]
-        public void ExpiryOnIsBubbledUp2()
-        {
-            var scopeA = new CacheContext("a").WithExpiryOn(new DateTime(2018, 10, 26));
-            var scopeB = new CacheContext("b");
+    [Fact]
+    public void ExpiryOnIsBubbledUp2()
+    {
+        var scopeA = new CacheContext("a").WithExpiryOn(new DateTime(2018, 10, 26));
+        var scopeB = new CacheContext("b");
 
-            var sut = new CacheScopeManager();
+        var sut = new CacheScopeManager();
 
-            sut.EnterScope(scopeA);
-            sut.EnterScope(scopeB);
+        sut.EnterScope(scopeA);
+        sut.EnterScope(scopeB);
 
-            sut.ExitScope();
-            sut.ExitScope();
+        sut.ExitScope();
+        sut.ExitScope();
 
-            Assert.Equal(new DateTime(2018, 10, 26), scopeA.ExpiresOn);
-            Assert.Null(scopeB.ExpiresOn);
-        }
+        Assert.Equal(new DateTime(2018, 10, 26), scopeA.ExpiresOn);
+        Assert.Null(scopeB.ExpiresOn);
+    }
 
-        [Fact]
-        public void ExpiryOnIsBubbledUp3()
-        {
-            var scopeA = new CacheContext("a").WithExpiryOn(new DateTime(2020, 10, 26));
-            var scopeB = new CacheContext("b").WithExpiryOn(new DateTime(2018, 10, 26));
+    [Fact]
+    public void ExpiryOnIsBubbledUp3()
+    {
+        var scopeA = new CacheContext("a").WithExpiryOn(new DateTime(2020, 10, 26));
+        var scopeB = new CacheContext("b").WithExpiryOn(new DateTime(2018, 10, 26));
 
-            var sut = new CacheScopeManager();
+        var sut = new CacheScopeManager();
 
-            sut.EnterScope(scopeA);
-            sut.EnterScope(scopeB);
+        sut.EnterScope(scopeA);
+        sut.EnterScope(scopeB);
 
-            sut.ExitScope();
-            sut.ExitScope();
+        sut.ExitScope();
+        sut.ExitScope();
 
-            Assert.Equal(new DateTime(2018, 10, 26), scopeA.ExpiresOn);
-            Assert.Equal(new DateTime(2018, 10, 26), scopeB.ExpiresOn);
-        }
+        Assert.Equal(new DateTime(2018, 10, 26), scopeA.ExpiresOn);
+        Assert.Equal(new DateTime(2018, 10, 26), scopeB.ExpiresOn);
+    }
 
-        [Fact]
-        public void ExpiryAfterIsBubbledUp1()
-        {
-            var scopeA = new CacheContext("a");
-            var scopeB = new CacheContext("b").WithExpiryAfter(new TimeSpan(3, 30, 26));
+    [Fact]
+    public void ExpiryAfterIsBubbledUp1()
+    {
+        var scopeA = new CacheContext("a");
+        var scopeB = new CacheContext("b").WithExpiryAfter(new TimeSpan(3, 30, 26));
 
-            var sut = new CacheScopeManager();
+        var sut = new CacheScopeManager();
 
-            sut.EnterScope(scopeA);
-            sut.EnterScope(scopeB);
+        sut.EnterScope(scopeA);
+        sut.EnterScope(scopeB);
 
-            sut.ExitScope();
-            sut.ExitScope();
+        sut.ExitScope();
+        sut.ExitScope();
 
-            Assert.Equal(new TimeSpan(3, 30, 26), scopeA.ExpiresAfter);
-            Assert.Equal(new TimeSpan(3, 30, 26), scopeB.ExpiresAfter);
-        }
+        Assert.Equal(new TimeSpan(3, 30, 26), scopeA.ExpiresAfter);
+        Assert.Equal(new TimeSpan(3, 30, 26), scopeB.ExpiresAfter);
+    }
 
-        [Fact]
-        public void ExpiryAfterIsBubbledUp2()
-        {
-            var scopeA = new CacheContext("a").WithExpiryAfter(new TimeSpan(3, 30, 26));
-            var scopeB = new CacheContext("b");
+    [Fact]
+    public void ExpiryAfterIsBubbledUp2()
+    {
+        var scopeA = new CacheContext("a").WithExpiryAfter(new TimeSpan(3, 30, 26));
+        var scopeB = new CacheContext("b");
 
-            var sut = new CacheScopeManager();
+        var sut = new CacheScopeManager();
 
-            sut.EnterScope(scopeA);
-            sut.EnterScope(scopeB);
+        sut.EnterScope(scopeA);
+        sut.EnterScope(scopeB);
 
-            sut.ExitScope();
-            sut.ExitScope();
+        sut.ExitScope();
+        sut.ExitScope();
 
-            Assert.Equal(new TimeSpan(3, 30, 26), scopeA.ExpiresAfter);
-            Assert.Null(scopeB.ExpiresAfter);
-        }
+        Assert.Equal(new TimeSpan(3, 30, 26), scopeA.ExpiresAfter);
+        Assert.Null(scopeB.ExpiresAfter);
+    }
 
-        [Fact]
-        public void ExpiryAfterIsBubbledUp3()
-        {
-            var scopeA = new CacheContext("a").WithExpiryAfter(new TimeSpan(5, 30, 26));
-            var scopeB = new CacheContext("b").WithExpiryAfter(new TimeSpan(3, 30, 26));
+    [Fact]
+    public void ExpiryAfterIsBubbledUp3()
+    {
+        var scopeA = new CacheContext("a").WithExpiryAfter(new TimeSpan(5, 30, 26));
+        var scopeB = new CacheContext("b").WithExpiryAfter(new TimeSpan(3, 30, 26));
 
-            var sut = new CacheScopeManager();
+        var sut = new CacheScopeManager();
 
-            sut.EnterScope(scopeA);
-            sut.EnterScope(scopeB);
+        sut.EnterScope(scopeA);
+        sut.EnterScope(scopeB);
 
-            sut.ExitScope();
-            sut.ExitScope();
+        sut.ExitScope();
+        sut.ExitScope();
 
-            Assert.Equal(new TimeSpan(3, 30, 26), scopeA.ExpiresAfter);
-            Assert.Equal(new TimeSpan(3, 30, 26), scopeB.ExpiresAfter);
-        }
+        Assert.Equal(new TimeSpan(3, 30, 26), scopeA.ExpiresAfter);
+        Assert.Equal(new TimeSpan(3, 30, 26), scopeB.ExpiresAfter);
+    }
 
-        [Fact]
-        public void ExpirySlidingIsBubbledUp1()
-        {
-            var scopeA = new CacheContext("a");
-            var scopeB = new CacheContext("b").WithExpirySliding(new TimeSpan(3, 30, 26));
+    [Fact]
+    public void ExpirySlidingIsBubbledUp1()
+    {
+        var scopeA = new CacheContext("a");
+        var scopeB = new CacheContext("b").WithExpirySliding(new TimeSpan(3, 30, 26));
 
-            var sut = new CacheScopeManager();
+        var sut = new CacheScopeManager();
 
-            sut.EnterScope(scopeA);
-            sut.EnterScope(scopeB);
+        sut.EnterScope(scopeA);
+        sut.EnterScope(scopeB);
 
-            sut.ExitScope();
-            sut.ExitScope();
+        sut.ExitScope();
+        sut.ExitScope();
 
-            Assert.Equal(new TimeSpan(3, 30, 26), scopeA.ExpiresSliding);
-            Assert.Equal(new TimeSpan(3, 30, 26), scopeB.ExpiresSliding);
-        }
+        Assert.Equal(new TimeSpan(3, 30, 26), scopeA.ExpiresSliding);
+        Assert.Equal(new TimeSpan(3, 30, 26), scopeB.ExpiresSliding);
+    }
 
-        [Fact]
-        public void ExpirySlidingIsBubbledUp2()
-        {
-            var scopeA = new CacheContext("a").WithExpirySliding(new TimeSpan(3, 30, 26));
-            var scopeB = new CacheContext("b");
+    [Fact]
+    public void ExpirySlidingIsBubbledUp2()
+    {
+        var scopeA = new CacheContext("a").WithExpirySliding(new TimeSpan(3, 30, 26));
+        var scopeB = new CacheContext("b");
 
-            var sut = new CacheScopeManager();
+        var sut = new CacheScopeManager();
 
-            sut.EnterScope(scopeA);
-            sut.EnterScope(scopeB);
+        sut.EnterScope(scopeA);
+        sut.EnterScope(scopeB);
 
-            sut.ExitScope();
-            sut.ExitScope();
+        sut.ExitScope();
+        sut.ExitScope();
 
-            Assert.Equal(new TimeSpan(3, 30, 26), scopeA.ExpiresSliding);
-            Assert.Null(scopeB.ExpiresAfter);
-        }
+        Assert.Equal(new TimeSpan(3, 30, 26), scopeA.ExpiresSliding);
+        Assert.Null(scopeB.ExpiresAfter);
+    }
 
-        [Fact]
-        public void ExpirySlidingIsBubbledUp3()
-        {
-            var scopeA = new CacheContext("a").WithExpirySliding(new TimeSpan(5, 30, 26));
-            var scopeB = new CacheContext("b").WithExpirySliding(new TimeSpan(3, 30, 26));
+    [Fact]
+    public void ExpirySlidingIsBubbledUp3()
+    {
+        var scopeA = new CacheContext("a").WithExpirySliding(new TimeSpan(5, 30, 26));
+        var scopeB = new CacheContext("b").WithExpirySliding(new TimeSpan(3, 30, 26));
 
-            var sut = new CacheScopeManager();
+        var sut = new CacheScopeManager();
 
-            sut.EnterScope(scopeA);
-            sut.EnterScope(scopeB);
+        sut.EnterScope(scopeA);
+        sut.EnterScope(scopeB);
 
-            sut.ExitScope();
-            sut.ExitScope();
+        sut.ExitScope();
+        sut.ExitScope();
 
-            Assert.Equal(new TimeSpan(3, 30, 26), scopeA.ExpiresSliding);
-            Assert.Equal(new TimeSpan(3, 30, 26), scopeB.ExpiresSliding);
-        }
+        Assert.Equal(new TimeSpan(3, 30, 26), scopeA.ExpiresSliding);
+        Assert.Equal(new TimeSpan(3, 30, 26), scopeB.ExpiresSliding);
+    }
 
-        [Fact]
-        public void ComplexNesting()
-        {
-            var scopeA = new CacheContext("a")
-                .AddContext("c1")
-                .AddTag("t1");
+    [Fact]
+    public void ComplexNesting()
+    {
+        var scopeA = new CacheContext("a")
+            .AddContext("c1")
+            .AddTag("t1");
 
-            var scopeAA = new CacheContext("aa")
-                .AddContext("c2")
-                .WithExpiryAfter(new TimeSpan(0, 1, 0));
+        var scopeAA = new CacheContext("aa")
+            .AddContext("c2")
+            .WithExpiryAfter(new TimeSpan(0, 1, 0));
 
-            var scopeAB = new CacheContext("ab")
-                .WithExpirySliding(new TimeSpan(3, 30, 26))
-                .WithExpiryAfter(new TimeSpan(0, 5, 0));
+        var scopeAB = new CacheContext("ab")
+            .WithExpirySliding(new TimeSpan(3, 30, 26))
+            .WithExpiryAfter(new TimeSpan(0, 5, 0));
 
-            var scopeABA = new CacheContext("aaa")
-                .AddContext("deepestcontext")
-                .AddTag("deepesttag")
-                .WithExpiryOn(new DateTime(2018, 10, 26));
+        var scopeABA = new CacheContext("aaa")
+            .AddContext("deepestcontext")
+            .AddTag("deepesttag")
+            .WithExpiryOn(new DateTime(2018, 10, 26));
 
-            var sut = new CacheScopeManager();
+        var sut = new CacheScopeManager();
 
-            sut.EnterScope(scopeA);
-            sut.EnterScope(scopeAA);
-            sut.ExitScope(); // scopeAA
-            sut.EnterScope(scopeAB);
-            sut.EnterScope(scopeABA);
-            sut.ExitScope(); // scopeABA
-            sut.ExitScope(); // scopeAB
-            sut.ExitScope(); // scopeA
+        sut.EnterScope(scopeA);
+        sut.EnterScope(scopeAA);
+        sut.ExitScope(); // scopeAA
+        sut.EnterScope(scopeAB);
+        sut.EnterScope(scopeABA);
+        sut.ExitScope(); // scopeABA
+        sut.ExitScope(); // scopeAB
+        sut.ExitScope(); // scopeA
 
-            // Scope A
-            Assert.Collection(scopeA.Contexts, context => Assert.Contains("c1", context),
-                                               context => Assert.Contains("c2", context),
-                                               context => Assert.Contains("deepestcontext", context));
+        // Scope A
+        Assert.Collection(scopeA.Contexts, context => Assert.Contains("c1", context),
+                                           context => Assert.Contains("c2", context),
+                                           context => Assert.Contains("deepestcontext", context));
 
-            Assert.Collection(scopeA.Tags, tag => Assert.Contains("t1", tag),
-                                           tag => Assert.Contains("deepesttag", tag));
+        Assert.Collection(scopeA.Tags, tag => Assert.Contains("t1", tag),
+                                       tag => Assert.Contains("deepesttag", tag));
 
-            Assert.Equal(new TimeSpan(0, 1, 0), scopeA.ExpiresAfter);
-            Assert.Equal(new TimeSpan(3, 30, 26), scopeA.ExpiresSliding);
-            Assert.Equal(new DateTime(2018, 10, 26), scopeA.ExpiresOn);
+        Assert.Equal(new TimeSpan(0, 1, 0), scopeA.ExpiresAfter);
+        Assert.Equal(new TimeSpan(3, 30, 26), scopeA.ExpiresSliding);
+        Assert.Equal(new DateTime(2018, 10, 26), scopeA.ExpiresOn);
 
-            // Scope AA
-            Assert.Collection(scopeAA.Contexts, context => Assert.Contains("c2", context));
+        // Scope AA
+        Assert.Collection(scopeAA.Contexts, context => Assert.Contains("c2", context));
 
-            Assert.False(scopeAA.Tags.Any());
+        Assert.False(scopeAA.Tags.Any());
 
-            Assert.Equal(new TimeSpan(0, 1, 0), scopeAA.ExpiresAfter);
-            Assert.Null(scopeAA.ExpiresSliding);
-            Assert.Null(scopeAA.ExpiresOn);
+        Assert.Equal(new TimeSpan(0, 1, 0), scopeAA.ExpiresAfter);
+        Assert.Null(scopeAA.ExpiresSliding);
+        Assert.Null(scopeAA.ExpiresOn);
 
-            // Scope AB
-            Assert.Collection(scopeAB.Contexts, context => Assert.Contains("deepestcontext", context));
+        // Scope AB
+        Assert.Collection(scopeAB.Contexts, context => Assert.Contains("deepestcontext", context));
 
-            Assert.Collection(scopeAB.Tags, tag => Assert.Contains("deepesttag", tag));
+        Assert.Collection(scopeAB.Tags, tag => Assert.Contains("deepesttag", tag));
 
-            Assert.Equal(new TimeSpan(0, 5, 0), scopeAB.ExpiresAfter);
-            Assert.Equal(new TimeSpan(3, 30, 26), scopeAB.ExpiresSliding);
-            Assert.Equal(new DateTime(2018, 10, 26), scopeAB.ExpiresOn);
+        Assert.Equal(new TimeSpan(0, 5, 0), scopeAB.ExpiresAfter);
+        Assert.Equal(new TimeSpan(3, 30, 26), scopeAB.ExpiresSliding);
+        Assert.Equal(new DateTime(2018, 10, 26), scopeAB.ExpiresOn);
 
-            // Scope ABA
-            Assert.Collection(scopeABA.Contexts, context => Assert.Contains("deepestcontext", context));
+        // Scope ABA
+        Assert.Collection(scopeABA.Contexts, context => Assert.Contains("deepestcontext", context));
 
-            Assert.Collection(scopeABA.Tags, tag => Assert.Contains("deepesttag", tag));
+        Assert.Collection(scopeABA.Tags, tag => Assert.Contains("deepesttag", tag));
 
-            Assert.Equal(new DateTime(2018, 10, 26), scopeABA.ExpiresOn);
-            Assert.Null(scopeABA.ExpiresSliding);
-            Assert.Null(scopeABA.ExpiresAfter);
-        }
+        Assert.Equal(new DateTime(2018, 10, 26), scopeABA.ExpiresOn);
+        Assert.Null(scopeABA.ExpiresSliding);
+        Assert.Null(scopeABA.ExpiresAfter);
     }
 }
diff --git a/test/OrchardCore.Tests/OrchardCore.Users/AccountControllerTests.cs b/test/OrchardCore.Tests/OrchardCore.Users/AccountControllerTests.cs
index 259f2002bbc..a61ca667837 100644
--- a/test/OrchardCore.Tests/OrchardCore.Users/AccountControllerTests.cs
+++ b/test/OrchardCore.Tests/OrchardCore.Users/AccountControllerTests.cs
@@ -105,7 +105,7 @@ await context.UsingTenantScopeAsync(async scope =>
                     .FirstOrDefaultAsync();
             Assert.NotNull(sam);
 
-             var claimsDict = sam.UserClaims.ToDictionary(claim => claim.ClaimType, claim => claim.ClaimValue);
+            var claimsDict = sam.UserClaims.ToDictionary(claim => claim.ClaimType, claim => claim.ClaimValue);
             Assert.Equal("Sam", claimsDict["firstName"]);
             Assert.Equal("Zhang", claimsDict["lastName"]);
             Assert.Equal("CEO", claimsDict["jobTitle"]);
diff --git a/test/OrchardCore.Tests/OrchardCore.Users/OrchardCore.Users.Core/DefaultUserClaimsPrincipalProviderFactoryTests.cs b/test/OrchardCore.Tests/OrchardCore.Users/OrchardCore.Users.Core/DefaultUserClaimsPrincipalProviderFactoryTests.cs
index 31b78fe2553..055be82e3fb 100644
--- a/test/OrchardCore.Tests/OrchardCore.Users/OrchardCore.Users.Core/DefaultUserClaimsPrincipalProviderFactoryTests.cs
+++ b/test/OrchardCore.Tests/OrchardCore.Users/OrchardCore.Users.Core/DefaultUserClaimsPrincipalProviderFactoryTests.cs
@@ -3,58 +3,56 @@
 using OrchardCore.Users.Models;
 using OrchardCore.Users.Services;
 
-namespace OrchardCore.Tests.OrchardCore.Users.Core
+namespace OrchardCore.Tests.OrchardCore.Users.Core;
+
+public class DefaultUserClaimsPrincipalProviderFactoryTests
 {
-    public class DefaultUserClaimsPrincipalProviderFactoryTests
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task EnsurePrincipalHasExpectedClaims(bool emailVerified)
     {
-        [Theory]
-        [InlineData(true)]
-        [InlineData(false)]
-        public async Task EnsurePrincipalHasExpectedClaims(bool emailVerified)
+        //Arrange
+        var userManager = UsersMockHelper.MockUserManager<IUser>();
+        var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo", Email = "foo@foo.com" };
+        userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
+        userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
+        userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
+
+        if (emailVerified)
         {
-            //Arrange
-            var userManager = UsersMockHelper.MockUserManager<IUser>();
-            var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo", Email = "foo@foo.com" };
-            userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
-            userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
-            userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
-
-            if (emailVerified)
-            {
-                userManager.Setup(m => m.IsEmailConfirmedAsync(user)).ReturnsAsync(emailVerified);
-            }
+            userManager.Setup(m => m.IsEmailConfirmedAsync(user)).ReturnsAsync(emailVerified);
+        }
 
-            var roleManager = UsersMockHelper.MockRoleManager<IRole>().Object;
+        var roleManager = UsersMockHelper.MockRoleManager<IRole>().Object;
 
-            var options = new Mock<IOptions<IdentityOptions>>();
-            options.Setup(a => a.Value).Returns(new IdentityOptions());
+        var options = new Mock<IOptions<IdentityOptions>>();
+        options.Setup(a => a.Value).Returns(new IdentityOptions());
 
-            var claimsProviders = new List<IUserClaimsProvider>()
-            {
-                new EmailClaimsProvider(userManager.Object)
-            };
+        var claimsProviders = new List<IUserClaimsProvider>()
+        {
+            new EmailClaimsProvider(userManager.Object)
+        };
 
-            var factory = new DefaultUserClaimsPrincipalProviderFactory(userManager.Object, roleManager, options.Object, claimsProviders, null);
+        var factory = new DefaultUserClaimsPrincipalProviderFactory(userManager.Object, roleManager, options.Object, claimsProviders, null);
 
-            //Act
-            var principal = await factory.CreateAsync(user);
+        //Act
+        var principal = await factory.CreateAsync(user);
 
-            //Assert
-            var identity = principal.Identities.First();
-            Assert.NotNull(identity);
+        //Assert
+        var identity = principal.Identities.First();
+        Assert.NotNull(identity);
 
-            var claims = identity.Claims.ToList();
-            Assert.NotNull(claims);
+        var claims = identity.Claims.ToList();
+        Assert.NotNull(claims);
 
-            var emailClaim = claims.FirstOrDefault(c => c.Type == "email");
-            Assert.NotNull(emailClaim);
-            Assert.Equal(user.Email, emailClaim.Value);
+        var emailClaim = claims.FirstOrDefault(c => c.Type == "email");
+        Assert.NotNull(emailClaim);
+        Assert.Equal(user.Email, emailClaim.Value);
 
-            var emailVerifiedClaim = claims.FirstOrDefault(c => c.Type == "email_verified");
-            Assert.NotNull(emailVerifiedClaim);
-            Assert.Equal(ClaimValueTypes.Boolean, emailVerifiedClaim.ValueType);
-            Assert.Equal(emailVerified.ToString(), emailVerifiedClaim.Value);
-        }
+        var emailVerifiedClaim = claims.FirstOrDefault(c => c.Type == "email_verified");
+        Assert.NotNull(emailVerifiedClaim);
+        Assert.Equal(ClaimValueTypes.Boolean, emailVerifiedClaim.ValueType);
+        Assert.Equal(emailVerified.ToString(), emailVerifiedClaim.Value);
     }
-
 }
diff --git a/test/OrchardCore.Tests/OrchardCore.Users/UserValidatorTests.cs b/test/OrchardCore.Tests/OrchardCore.Users/UserValidatorTests.cs
index f5531c4471b..986f83074ca 100644
--- a/test/OrchardCore.Tests/OrchardCore.Users/UserValidatorTests.cs
+++ b/test/OrchardCore.Tests/OrchardCore.Users/UserValidatorTests.cs
@@ -1,140 +1,139 @@
 using OrchardCore.Users;
 using OrchardCore.Users.Models;
 
-namespace OrchardCore.Tests.OrchardCore.Users
+namespace OrchardCore.Tests.OrchardCore.Users;
+
+public class UserValidatorTests
 {
-    public class UserValidatorTests
+    [Fact]
+    public async Task CanValidateUser()
+    {
+        // Arrange
+        var userManager = UsersMockHelper.MockUserManager<IUser>();
+        var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo", Email = "foo@foo.com" };
+        userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
+        userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
+        userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
+
+        // Act
+        var validator = userManager.Object.UserValidators.FirstOrDefault();
+        var result = await validator.ValidateAsync(userManager.Object, user);
+
+        // Test
+        Assert.True(result.Succeeded);
+    }
+
+    [Fact]
+    public async Task ShouldRequireEmail()
+    {
+        // Arrange
+        var describer = new IdentityErrorDescriber();
+        var userManager = UsersMockHelper.MockUserManager<IUser>();
+        var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo" };
+        userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
+        userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
+        userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
+
+        // Act
+        var validator = userManager.Object.UserValidators.FirstOrDefault();
+        var result = await validator.ValidateAsync(userManager.Object, user);
+
+        // Test
+        Assert.False(result.Succeeded);
+        Assert.Equal(describer.InvalidEmail(user.Email).Code, result.Errors.First().Code);
+    }
+
+    [Fact]
+    public async Task ShouldRequireValidEmail()
+    {
+        // Arrange
+        var describer = new IdentityErrorDescriber();
+        var userManager = UsersMockHelper.MockUserManager<IUser>();
+        var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo", Email = "foo" };
+        userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
+        userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
+        userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
+
+        // Act
+        var validator = userManager.Object.UserValidators.FirstOrDefault();
+        var result = await validator.ValidateAsync(userManager.Object, user);
+
+        // Test
+        Assert.False(result.Succeeded);
+        Assert.Equal(describer.InvalidEmail(user.Email).Code, result.Errors.First().Code);
+    }
+
+    [Fact]
+    public async Task ShouldRequireUniqueEmail()
+    {
+        // Arrange
+        var describer = new IdentityErrorDescriber();
+        var userManager = UsersMockHelper.MockUserManager<IUser>();
+        var existingUser = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo", Email = "foo@foo.com" };
+        userManager.Setup(m => m.GetUserIdAsync(existingUser)).ReturnsAsync(existingUser.UserId);
+        userManager.Setup(m => m.GetUserNameAsync(existingUser)).ReturnsAsync(existingUser.UserName);
+        userManager.Setup(m => m.GetEmailAsync(existingUser)).ReturnsAsync(existingUser.Email);
+        userManager.Setup(m => m.FindByEmailAsync(existingUser.Email)).ReturnsAsync(existingUser);
+        userManager.Setup(m => m.FindByNameAsync(existingUser.UserName)).ReturnsAsync(existingUser);
+
+        var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Bar", Email = "foo@foo.com" };
+        userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
+        userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
+        userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
+
+        // Act
+        var validator = userManager.Object.UserValidators.FirstOrDefault();
+        var result = await validator.ValidateAsync(userManager.Object, user);
+
+        // Test
+        Assert.False(result.Succeeded);
+        Assert.Equal(describer.DuplicateEmail(user.Email).Code, result.Errors.First().Code);
+    }
+
+    [Fact]
+    public async Task ShouldRequireUserNameIsNotAnEmailAddress()
+    {
+        // Arrange
+        var describer = new IdentityErrorDescriber();
+        var userManager = UsersMockHelper.MockUserManager<IUser>();
+        var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "foo@foo.com", Email = "foo" };
+        userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
+        userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
+        userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
+
+        // Act
+        var validator = userManager.Object.UserValidators.FirstOrDefault();
+        var result = await validator.ValidateAsync(userManager.Object, user);
+
+        // Test
+        Assert.False(result.Succeeded);
+        Assert.Equal(describer.InvalidUserName(user.UserName).Code, result.Errors.First().Code);
+    }
+
+    [Fact]
+    public async Task ShouldRequireUniqueUserName()
     {
-        [Fact]
-        public async Task CanValidateUser()
-        {
-            // Arrange
-            var userManager = UsersMockHelper.MockUserManager<IUser>();
-            var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo", Email = "foo@foo.com" };
-            userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
-            userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
-            userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
-
-            // Act
-            var validator = userManager.Object.UserValidators.FirstOrDefault();
-            var result = await validator.ValidateAsync(userManager.Object, user);
-
-            // Test
-            Assert.True(result.Succeeded);
-        }
-
-        [Fact]
-        public async Task ShouldRequireEmail()
-        {
-            // Arrange
-            var describer = new IdentityErrorDescriber();
-            var userManager = UsersMockHelper.MockUserManager<IUser>();
-            var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo" };
-            userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
-            userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
-            userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
-
-            // Act
-            var validator = userManager.Object.UserValidators.FirstOrDefault();
-            var result = await validator.ValidateAsync(userManager.Object, user);
-
-            // Test
-            Assert.False(result.Succeeded);
-            Assert.Equal(describer.InvalidEmail(user.Email).Code, result.Errors.First().Code);
-        }
-
-        [Fact]
-        public async Task ShouldRequireValidEmail()
-        {
-            // Arrange
-            var describer = new IdentityErrorDescriber();
-            var userManager = UsersMockHelper.MockUserManager<IUser>();
-            var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo", Email = "foo" };
-            userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
-            userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
-            userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
-
-            // Act
-            var validator = userManager.Object.UserValidators.FirstOrDefault();
-            var result = await validator.ValidateAsync(userManager.Object, user);
-
-            // Test
-            Assert.False(result.Succeeded);
-            Assert.Equal(describer.InvalidEmail(user.Email).Code, result.Errors.First().Code);
-        }
-
-        [Fact]
-        public async Task ShouldRequireUniqueEmail()
-        {
-            // Arrange
-            var describer = new IdentityErrorDescriber();
-            var userManager = UsersMockHelper.MockUserManager<IUser>();
-            var existingUser = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo", Email = "foo@foo.com" };
-            userManager.Setup(m => m.GetUserIdAsync(existingUser)).ReturnsAsync(existingUser.UserId);
-            userManager.Setup(m => m.GetUserNameAsync(existingUser)).ReturnsAsync(existingUser.UserName);
-            userManager.Setup(m => m.GetEmailAsync(existingUser)).ReturnsAsync(existingUser.Email);
-            userManager.Setup(m => m.FindByEmailAsync(existingUser.Email)).ReturnsAsync(existingUser);
-            userManager.Setup(m => m.FindByNameAsync(existingUser.UserName)).ReturnsAsync(existingUser);
-
-            var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Bar", Email = "foo@foo.com" };
-            userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
-            userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
-            userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
-
-            // Act
-            var validator = userManager.Object.UserValidators.FirstOrDefault();
-            var result = await validator.ValidateAsync(userManager.Object, user);
-
-            // Test
-            Assert.False(result.Succeeded);
-            Assert.Equal(describer.DuplicateEmail(user.Email).Code, result.Errors.First().Code);
-        }
-
-        [Fact]
-        public async Task ShouldRequireUserNameIsNotAnEmailAddress()
-        {
-            // Arrange
-            var describer = new IdentityErrorDescriber();
-            var userManager = UsersMockHelper.MockUserManager<IUser>();
-            var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "foo@foo.com", Email = "foo" };
-            userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
-            userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
-            userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
-
-            // Act
-            var validator = userManager.Object.UserValidators.FirstOrDefault();
-            var result = await validator.ValidateAsync(userManager.Object, user);
-
-            // Test
-            Assert.False(result.Succeeded);
-            Assert.Equal(describer.InvalidUserName(user.UserName).Code, result.Errors.First().Code);
-        }
-
-        [Fact]
-        public async Task ShouldRequireUniqueUserName()
-        {
-            // Arrange
-            var describer = new IdentityErrorDescriber();
-            var userManager = UsersMockHelper.MockUserManager<IUser>();
-            var existingUser = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo", Email = "bar@bar.com" };
-            userManager.Setup(m => m.GetUserIdAsync(existingUser)).ReturnsAsync(existingUser.UserId);
-            userManager.Setup(m => m.GetUserNameAsync(existingUser)).ReturnsAsync(existingUser.UserName);
-            userManager.Setup(m => m.GetEmailAsync(existingUser)).ReturnsAsync(existingUser.Email);
-            userManager.Setup(m => m.FindByEmailAsync(existingUser.Email)).ReturnsAsync(existingUser);
-            userManager.Setup(m => m.FindByNameAsync(existingUser.UserName)).ReturnsAsync(existingUser);
-
-            var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo", Email = "foo@foo.com" };
-            userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
-            userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
-            userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
-
-            // Act
-            var validator = userManager.Object.UserValidators.FirstOrDefault();
-            var result = await validator.ValidateAsync(userManager.Object, user);
-
-            // Test
-            Assert.False(result.Succeeded);
-            Assert.Equal(describer.DuplicateUserName(user.UserName).Code, result.Errors.First().Code);
-        }
+        // Arrange
+        var describer = new IdentityErrorDescriber();
+        var userManager = UsersMockHelper.MockUserManager<IUser>();
+        var existingUser = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo", Email = "bar@bar.com" };
+        userManager.Setup(m => m.GetUserIdAsync(existingUser)).ReturnsAsync(existingUser.UserId);
+        userManager.Setup(m => m.GetUserNameAsync(existingUser)).ReturnsAsync(existingUser.UserName);
+        userManager.Setup(m => m.GetEmailAsync(existingUser)).ReturnsAsync(existingUser.Email);
+        userManager.Setup(m => m.FindByEmailAsync(existingUser.Email)).ReturnsAsync(existingUser);
+        userManager.Setup(m => m.FindByNameAsync(existingUser.UserName)).ReturnsAsync(existingUser);
+
+        var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo", Email = "foo@foo.com" };
+        userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
+        userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
+        userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
+
+        // Act
+        var validator = userManager.Object.UserValidators.FirstOrDefault();
+        var result = await validator.ValidateAsync(userManager.Object, user);
+
+        // Test
+        Assert.False(result.Succeeded);
+        Assert.Equal(describer.DuplicateUserName(user.UserName).Code, result.Errors.First().Code);
     }
 }
diff --git a/test/OrchardCore.Tests/OrchardCore.Users/UsersMockHelper.cs b/test/OrchardCore.Tests/OrchardCore.Users/UsersMockHelper.cs
index d221ca37482..7f6872a724d 100644
--- a/test/OrchardCore.Tests/OrchardCore.Users/UsersMockHelper.cs
+++ b/test/OrchardCore.Tests/OrchardCore.Users/UsersMockHelper.cs
@@ -1,31 +1,30 @@
-namespace OrchardCore.Tests.OrchardCore.Users
+namespace OrchardCore.Tests.OrchardCore.Users;
+
+public static class UsersMockHelper
 {
-    public static class UsersMockHelper
+    public static Mock<UserManager<TUser>> MockUserManager<TUser>() where TUser : class
     {
-        public static Mock<UserManager<TUser>> MockUserManager<TUser>() where TUser : class
-        {
-            var store = new Mock<IUserStore<TUser>>();
-            var identityOptions = new IdentityOptions();
-            identityOptions.User.AllowedUserNameCharacters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._+";
-            identityOptions.User.RequireUniqueEmail = true;
+        var store = new Mock<IUserStore<TUser>>();
+        var identityOptions = new IdentityOptions();
+        identityOptions.User.AllowedUserNameCharacters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._+";
+        identityOptions.User.RequireUniqueEmail = true;
+
+        var mgr = new Mock<UserManager<TUser>>(store.Object, Options.Create(identityOptions), null, null, null, null, null, null, null);
+        mgr.Object.UserValidators.Add(new UserValidator<TUser>(new IdentityErrorDescriber()));
+        mgr.Object.PasswordValidators.Add(new PasswordValidator<TUser>());
 
-            var mgr = new Mock<UserManager<TUser>>(store.Object, Options.Create(identityOptions), null, null, null, null, null, null, null);
-            mgr.Object.UserValidators.Add(new UserValidator<TUser>(new IdentityErrorDescriber()));
-            mgr.Object.PasswordValidators.Add(new PasswordValidator<TUser>());
+        return mgr;
+    }
 
-            return mgr;
-        }
+    public static Mock<RoleManager<TRole>> MockRoleManager<TRole>() where TRole : class
+    {
+        var store = new Mock<IRoleStore<TRole>>().Object;
 
-        public static Mock<RoleManager<TRole>> MockRoleManager<TRole>() where TRole : class
+        var roles = new List<IRoleValidator<TRole>>
         {
-            var store = new Mock<IRoleStore<TRole>>().Object;
-
-            var roles = new List<IRoleValidator<TRole>>
-            {
-                new RoleValidator<TRole>(),
-            };
+            new RoleValidator<TRole>(),
+        };
 
-            return new Mock<RoleManager<TRole>>(store, roles, new UpperInvariantLookupNormalizer(), new IdentityErrorDescriber(), null);
-        }
+        return new Mock<RoleManager<TRole>>(store, roles, new UpperInvariantLookupNormalizer(), new IdentityErrorDescriber(), null);
     }
 }
diff --git a/test/OrchardCore.Tests/Recipes/RecipeExecutorTests.cs b/test/OrchardCore.Tests/Recipes/RecipeExecutorTests.cs
index 7ef6968115b..4c658bcd6af 100644
--- a/test/OrchardCore.Tests/Recipes/RecipeExecutorTests.cs
+++ b/test/OrchardCore.Tests/Recipes/RecipeExecutorTests.cs
@@ -10,116 +10,115 @@
 using OrchardCore.Scripting;
 using OrchardCore.Tests.Apis.Context;
 
-namespace OrchardCore.Recipes
+namespace OrchardCore.Recipes;
+
+public class RecipeExecutorTests
 {
-    public class RecipeExecutorTests
+    [Theory]
+    [InlineData("recipe1", "[locale en]You have successfully registered![/locale][locale fr]Vous vous êtes inscrit avec succès![/locale]")]
+    [InlineData("recipe2", "[1js: valiables('now')]")]
+    [InlineData("recipe3", "js: valiables('now')")]
+    [InlineData("recipe4", "[locale en]This text contains a colon ':' symbol[/locale][locale fr]Ce texte contient un deux-points ':'[/locale]")]
+    [InlineData("recipe5", "[sc text='some : text'/]")]
+    public async Task ShouldTrimValidScriptExpression(string recipeName, string expected)
     {
-        [Theory]
-        [InlineData("recipe1", "[locale en]You have successfully registered![/locale][locale fr]Vous vous êtes inscrit avec succès![/locale]")]
-        [InlineData("recipe2", "[1js: valiables('now')]")]
-        [InlineData("recipe3", "js: valiables('now')")]
-        [InlineData("recipe4", "[locale en]This text contains a colon ':' symbol[/locale][locale fr]Ce texte contient un deux-points ':'[/locale]")]
-        [InlineData("recipe5", "[sc text='some : text'/]")]
-        public async Task ShouldTrimValidScriptExpression(string recipeName, string expected)
+        await (await CreateShellContext().CreateScopeAsync()).UsingAsync(async scope =>
         {
-            await (await CreateShellContext().CreateScopeAsync()).UsingAsync(async scope =>
-            {
-                // Arrange
-                var shellHostMock = new Mock<IShellHost>();
+            // Arrange
+            var shellHostMock = new Mock<IShellHost>();
 
-                shellHostMock.Setup(h => h.GetScopeAsync(It.IsAny<ShellSettings>()))
-                    .Returns(GetScopeAsync);
+            shellHostMock.Setup(h => h.GetScopeAsync(It.IsAny<ShellSettings>()))
+                .Returns(GetScopeAsync);
 
-                var recipeEventHandlers = new List<IRecipeEventHandler> { new RecipeEventHandler() };
-                var loggerMock = new Mock<ILogger<RecipeExecutor>>();
-                var localizerMock = new Mock<IStringLocalizer<RecipeExecutor>>();
+            var recipeEventHandlers = new List<IRecipeEventHandler> { new RecipeEventHandler() };
+            var loggerMock = new Mock<ILogger<RecipeExecutor>>();
+            var localizerMock = new Mock<IStringLocalizer<RecipeExecutor>>();
 
-                localizerMock.Setup(localizer => localizer[It.IsAny<string>()])
-                .Returns((string name) => new LocalizedString(name, name));
+            localizerMock.Setup(localizer => localizer[It.IsAny<string>()])
+            .Returns((string name) => new LocalizedString(name, name));
 
-                var recipeExecutor = new RecipeExecutor(
-                    shellHostMock.Object,
-                    scope.ShellContext.Settings,
-                    recipeEventHandlers,
-                    loggerMock.Object,
-                    localizerMock.Object);
+            var recipeExecutor = new RecipeExecutor(
+                shellHostMock.Object,
+                scope.ShellContext.Settings,
+                recipeEventHandlers,
+                loggerMock.Object,
+                localizerMock.Object);
 
-                // Act
-                var executionId = Guid.NewGuid().ToString("n");
-                var recipeDescriptor = new RecipeDescriptor { RecipeFileInfo = GetRecipeFileInfo(recipeName) };
-                await recipeExecutor.ExecuteAsync(executionId, recipeDescriptor, new Dictionary<string, object>(), CancellationToken.None);
+            // Act
+            var executionId = Guid.NewGuid().ToString("n");
+            var recipeDescriptor = new RecipeDescriptor { RecipeFileInfo = GetRecipeFileInfo(recipeName) };
+            await recipeExecutor.ExecuteAsync(executionId, recipeDescriptor, new Dictionary<string, object>(), CancellationToken.None);
 
-                // Assert
-                var recipeStep = (recipeEventHandlers.Single() as RecipeEventHandler).Context.Step;
+            // Assert
+            var recipeStep = (recipeEventHandlers.Single() as RecipeEventHandler).Context.Step;
 
-                Assert.Equal(expected, recipeStep.SelectNode("data[0].TitlePart.Title").ToString());
-            });
-        }
+            Assert.Equal(expected, recipeStep.SelectNode("data[0].TitlePart.Title").ToString());
+        });
+    }
 
-        [Fact]
-        public async Task ContentDefinitionStep_WhenPartNameIsMissing_RecipeExecutionException()
+    [Fact]
+    public async Task ContentDefinitionStep_WhenPartNameIsMissing_RecipeExecutionException()
+    {
+        var context = new BlogContext();
+        await context.InitializeAsync();
+        await context.UsingTenantScopeAsync(async scope =>
         {
-            var context = new BlogContext();
-            await context.InitializeAsync();
-            await context.UsingTenantScopeAsync(async scope =>
+            var recipeExecutor = scope.ServiceProvider.GetRequiredService<IRecipeExecutor>();
+            // Act
+            var executionId = Guid.NewGuid().ToString("n");
+            var recipeDescriptor = new RecipeDescriptor { RecipeFileInfo = GetRecipeFileInfo("recipe6") };
+
+            var exception = await Assert.ThrowsAsync<RecipeExecutionException>(async () =>
             {
-                var recipeExecutor = scope.ServiceProvider.GetRequiredService<IRecipeExecutor>();
-                // Act
-                var executionId = Guid.NewGuid().ToString("n");
-                var recipeDescriptor = new RecipeDescriptor { RecipeFileInfo = GetRecipeFileInfo("recipe6") };
+                await recipeExecutor.ExecuteAsync(executionId, recipeDescriptor, new Dictionary<string, object>(), CancellationToken.None);
+            });
 
-                var exception = await Assert.ThrowsAsync<RecipeExecutionException>(async () =>
-                {
-                    await recipeExecutor.ExecuteAsync(executionId, recipeDescriptor, new Dictionary<string, object>(), CancellationToken.None);
-                });
+            Assert.Contains("Unable to add content-part to the 'Message' content-type. The part name cannot be null or empty.", exception.StepResult.Errors);
+        });
+    }
 
-                Assert.Contains("Unable to add content-part to the 'Message' content-type. The part name cannot be null or empty.", exception.StepResult.Errors);
-            });
-        }
+    private static Task<ShellScope> GetScopeAsync() => ShellScope.Context.CreateScopeAsync();
 
-        private static Task<ShellScope> GetScopeAsync() => ShellScope.Context.CreateScopeAsync();
+    private static ShellContext CreateShellContext() => new()
+    {
+        Settings = new ShellSettings().AsDefaultShell().AsRunning(),
+        ServiceProvider = CreateServiceProvider(),
+    };
 
-        private static ShellContext CreateShellContext() => new()
-        {
-            Settings = new ShellSettings().AsDefaultShell().AsRunning(),
-            ServiceProvider = CreateServiceProvider(),
-        };
+    private static ServiceProvider CreateServiceProvider() => new ServiceCollection()
+        .AddScripting()
+        .AddSingleton<IDistributedLock, LocalLock>()
+        .AddLogging()
+        .BuildServiceProvider();
 
-        private static ServiceProvider CreateServiceProvider() => new ServiceCollection()
-            .AddScripting()
-            .AddSingleton<IDistributedLock, LocalLock>()
-            .AddLogging()
-            .BuildServiceProvider();
+    private IFileInfo GetRecipeFileInfo(string recipeName)
+    {
+        var assembly = GetType().Assembly;
+        var path = $"Recipes.RecipeFiles.{recipeName}.json";
 
-        private IFileInfo GetRecipeFileInfo(string recipeName)
-        {
-            var assembly = GetType().Assembly;
-            var path = $"Recipes.RecipeFiles.{recipeName}.json";
+        return new EmbeddedFileProvider(assembly).GetFileInfo(path);
+    }
 
-            return new EmbeddedFileProvider(assembly).GetFileInfo(path);
-        }
+    private sealed class RecipeEventHandler : IRecipeEventHandler
+    {
+        public RecipeExecutionContext Context { get; private set; }
 
-        private sealed class RecipeEventHandler : IRecipeEventHandler
+        public Task RecipeStepExecutedAsync(RecipeExecutionContext context)
         {
-            public RecipeExecutionContext Context { get; private set; }
-
-            public Task RecipeStepExecutedAsync(RecipeExecutionContext context)
+            if (string.Equals(context.Name, "Content", StringComparison.OrdinalIgnoreCase))
             {
-                if (string.Equals(context.Name, "Content", StringComparison.OrdinalIgnoreCase))
-                {
-                    Context = context;
-                }
-
-                return Task.CompletedTask;
+                Context = context;
             }
 
-            public Task ExecutionFailedAsync(string executionId, RecipeDescriptor descriptor) => Task.CompletedTask;
+            return Task.CompletedTask;
+        }
 
-            public Task RecipeExecutedAsync(string executionId, RecipeDescriptor descriptor) => Task.CompletedTask;
+        public Task ExecutionFailedAsync(string executionId, RecipeDescriptor descriptor) => Task.CompletedTask;
 
-            public Task RecipeExecutingAsync(string executionId, RecipeDescriptor descriptor) => Task.CompletedTask;
+        public Task RecipeExecutedAsync(string executionId, RecipeDescriptor descriptor) => Task.CompletedTask;
 
-            public Task RecipeStepExecutingAsync(RecipeExecutionContext context) => Task.CompletedTask;
-        }
+        public Task RecipeExecutingAsync(string executionId, RecipeDescriptor descriptor) => Task.CompletedTask;
+
+        public Task RecipeStepExecutingAsync(RecipeExecutionContext context) => Task.CompletedTask;
     }
 }
diff --git a/test/OrchardCore.Tests/ResourceManagement/ResourceDefinitionTests.cs b/test/OrchardCore.Tests/ResourceManagement/ResourceDefinitionTests.cs
index 845053cd42a..7251e64ec85 100644
--- a/test/OrchardCore.Tests/ResourceManagement/ResourceDefinitionTests.cs
+++ b/test/OrchardCore.Tests/ResourceManagement/ResourceDefinitionTests.cs
@@ -1,298 +1,297 @@
 using OrchardCore.ResourceManagement;
 
-namespace OrchardCore.Tests.ResourceManagement
+namespace OrchardCore.Tests.ResourceManagement;
+
+public class ResourceDefinitionTests
 {
-    public class ResourceDefinitionTests
+    private readonly ResourceManifest _resourceManifest;
+
+    public ResourceDefinitionTests()
     {
-        private readonly ResourceManifest _resourceManifest;
+        _resourceManifest = new ResourceManifest();
+    }
 
-        public ResourceDefinitionTests()
-        {
-            _resourceManifest = new ResourceManifest();
-        }
+    // The application path is empty if it is the host site
+    // or contains the base path of a tenant.
+    [Theory]
+    [InlineData("")]
+    [InlineData("/tenant")]
+    [InlineData("/virtualpath/tenant")]
+    public void GetScriptResourceWithUrl(string applicationPath)
+    {
+        var resourceDefinition = _resourceManifest.DefineScript("foo")
+            .SetUrl("~/foo.js", "~/foo.debug.js")
+            .SetCdn("https://cdn.tld/foo.js", "https://cdn.tld/foo.debug.js");
 
-        // The application path is empty if it is the host site
-        // or contains the base path of a tenant.
-        [Theory]
-        [InlineData("")]
-        [InlineData("/tenant")]
-        [InlineData("/virtualpath/tenant")]
-        public void GetScriptResourceWithUrl(string applicationPath)
-        {
-            var resourceDefinition = _resourceManifest.DefineScript("foo")
-                .SetUrl("~/foo.js", "~/foo.debug.js")
-                .SetCdn("https://cdn.tld/foo.js", "https://cdn.tld/foo.debug.js");
+        var requireSettings = new RequireSettings { DebugMode = false, CdnMode = false };
+        var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
 
-            var requireSettings = new RequireSettings { DebugMode = false, CdnMode = false };
-            var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
+        Assert.Equal("script", tagBuilder.TagName);
+        Assert.Equal($"{applicationPath}/foo.js", tagBuilder.Attributes["src"]);
+    }
 
-            Assert.Equal("script", tagBuilder.TagName);
-            Assert.Equal($"{applicationPath}/foo.js", tagBuilder.Attributes["src"]);
-        }
+    [Theory]
+    [InlineData("/base")]
+    public void GetScriptResourceWithBasePath(string basePath)
+    {
+        var resourceDefinition = _resourceManifest.DefineScript("foo")
+            .SetUrl("~/foo.js", "~/foo.debug.js")
+            .SetBasePath(basePath);
 
-        [Theory]
-        [InlineData("/base")]
-        public void GetScriptResourceWithBasePath(string basePath)
-        {
-            var resourceDefinition = _resourceManifest.DefineScript("foo")
-                .SetUrl("~/foo.js", "~/foo.debug.js")
-                .SetBasePath(basePath);
+        var requireSettings = new RequireSettings { DebugMode = false, CdnMode = false };
+        var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, string.Empty, StubFileVersionProvider.Instance);
 
-            var requireSettings = new RequireSettings { DebugMode = false, CdnMode = false };
-            var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, string.Empty, StubFileVersionProvider.Instance);
+        Assert.Equal("script", tagBuilder.TagName);
+        Assert.Equal($"{basePath}/foo.js", tagBuilder.Attributes["src"]);
+    }
 
-            Assert.Equal("script", tagBuilder.TagName);
-            Assert.Equal($"{basePath}/foo.js", tagBuilder.Attributes["src"]);
-        }
+    [Theory]
+    [InlineData("")]
+    [InlineData("/tenant")]
+    [InlineData("/virtualpath/tenant")]
+    public void GetScriptResourceWithDebugUrl(string applicationPath)
+    {
+        var resourceDefinition = _resourceManifest.DefineScript("foo")
+            .SetUrl("~/foo.js", "~/foo.debug.js")
+            .SetCdn("https://cdn.tld/foo.js", "https://cdn.tld/foo.debug.js");
 
-        [Theory]
-        [InlineData("")]
-        [InlineData("/tenant")]
-        [InlineData("/virtualpath/tenant")]
-        public void GetScriptResourceWithDebugUrl(string applicationPath)
-        {
-            var resourceDefinition = _resourceManifest.DefineScript("foo")
-                .SetUrl("~/foo.js", "~/foo.debug.js")
-                .SetCdn("https://cdn.tld/foo.js", "https://cdn.tld/foo.debug.js");
+        var requireSettings = new RequireSettings { DebugMode = true, CdnMode = false };
+        var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
 
-            var requireSettings = new RequireSettings { DebugMode = true, CdnMode = false };
-            var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
+        Assert.Equal("script", tagBuilder.TagName);
+        Assert.Equal($"{applicationPath}/foo.debug.js", tagBuilder.Attributes["src"]);
+    }
 
-            Assert.Equal("script", tagBuilder.TagName);
-            Assert.Equal($"{applicationPath}/foo.debug.js", tagBuilder.Attributes["src"]);
-        }
+    [Theory]
+    [InlineData("")]
+    [InlineData("/tenant")]
+    [InlineData("/virtualpath/tenant")]
+    public void GetScriptResourceWithCdnUrl(string applicationPath)
+    {
+        var resourceDefinition = _resourceManifest.DefineScript("foo")
+            .SetUrl("~/foo.js", "~/foo.debug.js")
+            .SetCdn("https://cdn.tld/foo.js", "https://cdn.tld/foo.debug.js");
 
-        [Theory]
-        [InlineData("")]
-        [InlineData("/tenant")]
-        [InlineData("/virtualpath/tenant")]
-        public void GetScriptResourceWithCdnUrl(string applicationPath)
-        {
-            var resourceDefinition = _resourceManifest.DefineScript("foo")
-                .SetUrl("~/foo.js", "~/foo.debug.js")
-                .SetCdn("https://cdn.tld/foo.js", "https://cdn.tld/foo.debug.js");
+        var requireSettings = new RequireSettings { DebugMode = false, CdnMode = true };
+        var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
 
-            var requireSettings = new RequireSettings { DebugMode = false, CdnMode = true };
-            var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
+        Assert.Equal("script", tagBuilder.TagName);
+        Assert.Equal("https://cdn.tld/foo.js", tagBuilder.Attributes["src"]);
+    }
 
-            Assert.Equal("script", tagBuilder.TagName);
-            Assert.Equal("https://cdn.tld/foo.js", tagBuilder.Attributes["src"]);
-        }
+    [Theory]
+    [InlineData("")]
+    [InlineData("/tenant")]
+    [InlineData("/virtualpath/tenant")]
+    public void GetScriptResourceWithDebugCdnUrl(string applicationPath)
+    {
+        var resourceDefinition = _resourceManifest.DefineScript("foo")
+            .SetUrl("~/foo.js", "~/foo.debug.js")
+            .SetCdn("https://cdn.tld/foo.js", "https://cdn.tld/foo.debug.js");
 
-        [Theory]
-        [InlineData("")]
-        [InlineData("/tenant")]
-        [InlineData("/virtualpath/tenant")]
-        public void GetScriptResourceWithDebugCdnUrl(string applicationPath)
-        {
-            var resourceDefinition = _resourceManifest.DefineScript("foo")
-                .SetUrl("~/foo.js", "~/foo.debug.js")
-                .SetCdn("https://cdn.tld/foo.js", "https://cdn.tld/foo.debug.js");
+        var requireSettings = new RequireSettings { DebugMode = true, CdnMode = true, CdnBaseUrl = "https://hostcdn.net" };
+        var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
 
-            var requireSettings = new RequireSettings { DebugMode = true, CdnMode = true, CdnBaseUrl = "https://hostcdn.net" };
-            var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
+        Assert.Equal("script", tagBuilder.TagName);
+        Assert.Equal("https://cdn.tld/foo.debug.js", tagBuilder.Attributes["src"]);
+    }
 
-            Assert.Equal("script", tagBuilder.TagName);
-            Assert.Equal("https://cdn.tld/foo.debug.js", tagBuilder.Attributes["src"]);
-        }
+    [Theory]
+    [InlineData("", "~/foo.js", "https://hostcdn.net/foo.js")]
+    [InlineData("/tenant", "~/foo.js", "https://hostcdn.net/tenant/foo.js")]
+    [InlineData("", "//external.com/foo.js", "//external.com/foo.js")]
+    [InlineData("/tenant", "//external.com/foo.js", "//external.com/foo.js")]
+    [InlineData("", "http://external.com/foo.js", "http://external.com/foo.js")]
+    [InlineData("/tenant", "http://external.com/foo.js", "http://external.com/foo.js")]
+    [InlineData("", "https://external.com/foo.js", "https://external.com/foo.js")]
+    [InlineData("/tenant", "https://external.com/foo.js", "https://external.com/foo.js")]
+    public void GetLocalScriptResourceWithCdnBaseUrl(string applicationPath, string url, string expected)
+    {
+        var resourceDefinition = _resourceManifest.DefineScript("foo")
+            .SetUrl(url, url);
 
-        [Theory]
-        [InlineData("", "~/foo.js", "https://hostcdn.net/foo.js")]
-        [InlineData("/tenant", "~/foo.js", "https://hostcdn.net/tenant/foo.js")]
-        [InlineData("", "//external.com/foo.js", "//external.com/foo.js")]
-        [InlineData("/tenant", "//external.com/foo.js", "//external.com/foo.js")]
-        [InlineData("", "http://external.com/foo.js", "http://external.com/foo.js")]
-        [InlineData("/tenant", "http://external.com/foo.js", "http://external.com/foo.js")]
-        [InlineData("", "https://external.com/foo.js", "https://external.com/foo.js")]
-        [InlineData("/tenant", "https://external.com/foo.js", "https://external.com/foo.js")]
-        public void GetLocalScriptResourceWithCdnBaseUrl(string applicationPath, string url, string expected)
-        {
-            var resourceDefinition = _resourceManifest.DefineScript("foo")
-                .SetUrl(url, url);
+        var requireSettings = new RequireSettings { DebugMode = false, CdnMode = true, CdnBaseUrl = "https://hostcdn.net" };
+        var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
 
-            var requireSettings = new RequireSettings { DebugMode = false, CdnMode = true, CdnBaseUrl = "https://hostcdn.net" };
-            var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
+        Assert.Equal("script", tagBuilder.TagName);
+        Assert.Equal(expected, tagBuilder.Attributes["src"]);
+    }
 
-            Assert.Equal("script", tagBuilder.TagName);
-            Assert.Equal(expected, tagBuilder.Attributes["src"]);
-        }
+    [Theory]
+    [InlineData("")]
+    [InlineData("/tenant")]
+    [InlineData("/virtualpath/tenant")]
+    public void GetScriptResourceWithInlineContent(string applicationPath)
+    {
+        var resourceDefinition = _resourceManifest.DefineScript("foo")
+            .SetInnerContent("console.log('foo');");
 
-        [Theory]
-        [InlineData("")]
-        [InlineData("/tenant")]
-        [InlineData("/virtualpath/tenant")]
-        public void GetScriptResourceWithInlineContent(string applicationPath)
-        {
-            var resourceDefinition = _resourceManifest.DefineScript("foo")
-                .SetInnerContent("console.log('foo');");
+        var requireSettings = new RequireSettings()
+            .UseCdnBaseUrl("https://hostcdn.net");
+        var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
 
-            var requireSettings = new RequireSettings()
-                .UseCdnBaseUrl("https://hostcdn.net");
-            var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
+        Assert.Equal("script", tagBuilder.TagName);
+        Assert.Equal("console.log('foo');", ReadIHtmlContent(tagBuilder.InnerHtml));
+    }
 
-            Assert.Equal("script", tagBuilder.TagName);
-            Assert.Equal("console.log('foo');", ReadIHtmlContent(tagBuilder.InnerHtml));
-        }
+    [Theory]
+    [InlineData("")]
+    [InlineData("/tenant")]
+    [InlineData("/virtualpath/tenant")]
+    public void GetStyleResourceWithUrl(string applicationPath)
+    {
+        var resourceDefinition = _resourceManifest.DefineStyle("foo")
+            .SetUrl("~/foo.css", "~/foo.debug.css")
+            .SetCdn("https://cdn.tld/foo.css", "https://cdn.tld/foo.debug.css");
 
-        [Theory]
-        [InlineData("")]
-        [InlineData("/tenant")]
-        [InlineData("/virtualpath/tenant")]
-        public void GetStyleResourceWithUrl(string applicationPath)
-        {
-            var resourceDefinition = _resourceManifest.DefineStyle("foo")
-                .SetUrl("~/foo.css", "~/foo.debug.css")
-                .SetCdn("https://cdn.tld/foo.css", "https://cdn.tld/foo.debug.css");
+        var requireSettings = new RequireSettings { DebugMode = false, CdnMode = false };
+        var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
 
-            var requireSettings = new RequireSettings { DebugMode = false, CdnMode = false };
-            var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
+        Assert.Equal("link", tagBuilder.TagName);
+        Assert.Equal("text/css", tagBuilder.Attributes["type"]);
+        Assert.Equal("stylesheet", tagBuilder.Attributes["rel"]);
+        Assert.Equal($"{applicationPath}/foo.css", tagBuilder.Attributes["href"]);
+    }
 
-            Assert.Equal("link", tagBuilder.TagName);
-            Assert.Equal("text/css", tagBuilder.Attributes["type"]);
-            Assert.Equal("stylesheet", tagBuilder.Attributes["rel"]);
-            Assert.Equal($"{applicationPath}/foo.css", tagBuilder.Attributes["href"]);
-        }
+    [Theory]
+    [InlineData("")]
+    [InlineData("/tenant")]
+    [InlineData("/virtualpath/tenant")]
+    public void GetStyleResourceWithDebugUrl(string applicationPath)
+    {
+        var resourceDefinition = _resourceManifest.DefineStyle("foo")
+            .SetUrl("~/foo.css", "~/foo.debug.css")
+            .SetCdn("https://cdn.tld/foo.css", "https://cdn.tld/foo.debug.css");
 
-        [Theory]
-        [InlineData("")]
-        [InlineData("/tenant")]
-        [InlineData("/virtualpath/tenant")]
-        public void GetStyleResourceWithDebugUrl(string applicationPath)
-        {
-            var resourceDefinition = _resourceManifest.DefineStyle("foo")
-                .SetUrl("~/foo.css", "~/foo.debug.css")
-                .SetCdn("https://cdn.tld/foo.css", "https://cdn.tld/foo.debug.css");
+        var requireSettings = new RequireSettings { DebugMode = true, CdnMode = false };
+        var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
 
-            var requireSettings = new RequireSettings { DebugMode = true, CdnMode = false };
-            var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
+        Assert.Equal("link", tagBuilder.TagName);
+        Assert.Equal("text/css", tagBuilder.Attributes["type"]);
+        Assert.Equal("stylesheet", tagBuilder.Attributes["rel"]);
+        Assert.Equal($"{applicationPath}/foo.debug.css", tagBuilder.Attributes["href"]);
+    }
 
-            Assert.Equal("link", tagBuilder.TagName);
-            Assert.Equal("text/css", tagBuilder.Attributes["type"]);
-            Assert.Equal("stylesheet", tagBuilder.Attributes["rel"]);
-            Assert.Equal($"{applicationPath}/foo.debug.css", tagBuilder.Attributes["href"]);
-        }
+    [Theory]
+    [InlineData("")]
+    [InlineData("/tenant")]
+    [InlineData("/virtualpath/tenant")]
+    public void GetStyleResourceWithCdnUrl(string applicationPath)
+    {
+        var resourceDefinition = _resourceManifest.DefineStyle("foo")
+            .SetUrl("~/foo.css", "~/foo.debug.css")
+            .SetCdn("https://cdn.tld/foo.css", "https://cdn.tld/foo.debug.css");
 
-        [Theory]
-        [InlineData("")]
-        [InlineData("/tenant")]
-        [InlineData("/virtualpath/tenant")]
-        public void GetStyleResourceWithCdnUrl(string applicationPath)
-        {
-            var resourceDefinition = _resourceManifest.DefineStyle("foo")
-                .SetUrl("~/foo.css", "~/foo.debug.css")
-                .SetCdn("https://cdn.tld/foo.css", "https://cdn.tld/foo.debug.css");
+        var requireSettings = new RequireSettings { DebugMode = false, CdnMode = true };
+        var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
 
-            var requireSettings = new RequireSettings { DebugMode = false, CdnMode = true };
-            var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
+        Assert.Equal("link", tagBuilder.TagName);
+        Assert.Equal("text/css", tagBuilder.Attributes["type"]);
+        Assert.Equal("stylesheet", tagBuilder.Attributes["rel"]);
+        Assert.Equal("https://cdn.tld/foo.css", tagBuilder.Attributes["href"]);
+    }
 
-            Assert.Equal("link", tagBuilder.TagName);
-            Assert.Equal("text/css", tagBuilder.Attributes["type"]);
-            Assert.Equal("stylesheet", tagBuilder.Attributes["rel"]);
-            Assert.Equal("https://cdn.tld/foo.css", tagBuilder.Attributes["href"]);
-        }
+    [Theory]
+    [InlineData("", "~/foo.css", "https://hostcdn.net/foo.css")]
+    [InlineData("/tenant", "~/foo.css", "https://hostcdn.net/tenant/foo.css")]
+    [InlineData("", "//external.com/foo.css", "//external.com/foo.css")]
+    [InlineData("/tenant", "//external.com/foo.css", "//external.com/foo.css")]
+    [InlineData("", "http://external.com/foo.css", "http://external.com/foo.css")]
+    [InlineData("/tenant", "http://external.com/foo.css", "http://external.com/foo.css")]
+    [InlineData("", "https://external.com/foo.css", "https://external.com/foo.css")]
+    [InlineData("/tenant", "https://external.com/foo.css", "https://external.com/foo.css")]
+    public void GetLocalStyleResourceWithCdnBaseUrl(string applicationPath, string url, string expected)
+    {
+        var resourceDefinition = _resourceManifest.DefineStyle("foo")
+            .SetUrl(url, url);
 
-        [Theory]
-        [InlineData("", "~/foo.css", "https://hostcdn.net/foo.css")]
-        [InlineData("/tenant", "~/foo.css", "https://hostcdn.net/tenant/foo.css")]
-        [InlineData("", "//external.com/foo.css", "//external.com/foo.css")]
-        [InlineData("/tenant", "//external.com/foo.css", "//external.com/foo.css")]
-        [InlineData("", "http://external.com/foo.css", "http://external.com/foo.css")]
-        [InlineData("/tenant", "http://external.com/foo.css", "http://external.com/foo.css")]
-        [InlineData("", "https://external.com/foo.css", "https://external.com/foo.css")]
-        [InlineData("/tenant", "https://external.com/foo.css", "https://external.com/foo.css")]
-        public void GetLocalStyleResourceWithCdnBaseUrl(string applicationPath, string url, string expected)
-        {
-            var resourceDefinition = _resourceManifest.DefineStyle("foo")
-                .SetUrl(url, url);
+        var requireSettings = new RequireSettings { DebugMode = false, CdnMode = true, CdnBaseUrl = "https://hostcdn.net" };
+        var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
 
-            var requireSettings = new RequireSettings { DebugMode = false, CdnMode = true, CdnBaseUrl = "https://hostcdn.net" };
-            var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
+        Assert.Equal("link", tagBuilder.TagName);
+        Assert.Equal("text/css", tagBuilder.Attributes["type"]);
+        Assert.Equal("stylesheet", tagBuilder.Attributes["rel"]);
+        Assert.Equal(expected, tagBuilder.Attributes["href"]);
+    }
 
-            Assert.Equal("link", tagBuilder.TagName);
-            Assert.Equal("text/css", tagBuilder.Attributes["type"]);
-            Assert.Equal("stylesheet", tagBuilder.Attributes["rel"]);
-            Assert.Equal(expected, tagBuilder.Attributes["href"]);
-        }
+    [Theory]
+    [InlineData("")]
+    [InlineData("/tenant")]
+    [InlineData("/virtualpath/tenant")]
+    public void GetStyleResourceWithDebugCdnUrl(string applicationPath)
+    {
+        var resourceDefinition = _resourceManifest.DefineStyle("foo")
+            .SetUrl("~/foo.css", "~/foo.debug.css")
+            .SetCdn("https://cdn.tld/foo.css", "https://cdn.tld/foo.debug.css");
 
-        [Theory]
-        [InlineData("")]
-        [InlineData("/tenant")]
-        [InlineData("/virtualpath/tenant")]
-        public void GetStyleResourceWithDebugCdnUrl(string applicationPath)
-        {
-            var resourceDefinition = _resourceManifest.DefineStyle("foo")
-                .SetUrl("~/foo.css", "~/foo.debug.css")
-                .SetCdn("https://cdn.tld/foo.css", "https://cdn.tld/foo.debug.css");
+        var requireSettings = new RequireSettings { DebugMode = true, CdnMode = true };
+        var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
 
-            var requireSettings = new RequireSettings { DebugMode = true, CdnMode = true };
-            var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
+        Assert.Equal("link", tagBuilder.TagName);
+        Assert.Equal("text/css", tagBuilder.Attributes["type"]);
+        Assert.Equal("stylesheet", tagBuilder.Attributes["rel"]);
+        Assert.Equal("https://cdn.tld/foo.debug.css", tagBuilder.Attributes["href"]);
+    }
 
-            Assert.Equal("link", tagBuilder.TagName);
-            Assert.Equal("text/css", tagBuilder.Attributes["type"]);
-            Assert.Equal("stylesheet", tagBuilder.Attributes["rel"]);
-            Assert.Equal("https://cdn.tld/foo.debug.css", tagBuilder.Attributes["href"]);
-        }
+    [Theory]
+    [InlineData("")]
+    [InlineData("/tenant")]
+    [InlineData("/virtualpath/tenant")]
+    public void GetStyleResourceWithAttributes(string applicationPath)
+    {
+        var resourceDefinition = _resourceManifest.DefineStyle("foo")
+            .SetUrl("~/foo.css", "~/foo.debug.css")
+            .SetAttribute("id", "foo")
+            .SetAttribute("media", "all");
+
+        var requireSettings = new RequireSettings { DebugMode = false, CdnMode = false };
+        var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
+
+        Assert.Equal("link", tagBuilder.TagName);
+        Assert.Equal("text/css", tagBuilder.Attributes["type"]);
+        Assert.Equal("stylesheet", tagBuilder.Attributes["rel"]);
+        Assert.Equal("foo", tagBuilder.Attributes["id"]);
+        Assert.Equal("all", tagBuilder.Attributes["media"]);
+    }
 
-        [Theory]
-        [InlineData("")]
-        [InlineData("/tenant")]
-        [InlineData("/virtualpath/tenant")]
-        public void GetStyleResourceWithAttributes(string applicationPath)
-        {
-            var resourceDefinition = _resourceManifest.DefineStyle("foo")
-                .SetUrl("~/foo.css", "~/foo.debug.css")
-                .SetAttribute("id", "foo")
-                .SetAttribute("media", "all");
-
-            var requireSettings = new RequireSettings { DebugMode = false, CdnMode = false };
-            var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
-
-            Assert.Equal("link", tagBuilder.TagName);
-            Assert.Equal("text/css", tagBuilder.Attributes["type"]);
-            Assert.Equal("stylesheet", tagBuilder.Attributes["rel"]);
-            Assert.Equal("foo", tagBuilder.Attributes["id"]);
-            Assert.Equal("all", tagBuilder.Attributes["media"]);
-        }
+    [Theory]
+    [InlineData("")]
+    [InlineData("/tenant")]
+    [InlineData("/virtualpath/tenant")]
+    public void GetStyleResourceWithInlineContent(string applicationPath)
+    {
+        var resourceDefinition = _resourceManifest.DefineStyle("foo")
+            .SetInnerContent("body { background-color: white; }");
 
-        [Theory]
-        [InlineData("")]
-        [InlineData("/tenant")]
-        [InlineData("/virtualpath/tenant")]
-        public void GetStyleResourceWithInlineContent(string applicationPath)
-        {
-            var resourceDefinition = _resourceManifest.DefineStyle("foo")
-                .SetInnerContent("body { background-color: white; }");
+        var requireSettings = new RequireSettings()
+            .UseCdnBaseUrl("https://cdn.net");
+        var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
 
-            var requireSettings = new RequireSettings()
-                .UseCdnBaseUrl("https://cdn.net");
-            var tagBuilder = resourceDefinition.GetTagBuilder(requireSettings, applicationPath, StubFileVersionProvider.Instance);
+        Assert.Equal("style", tagBuilder.TagName);
+        Assert.Equal("text/css", tagBuilder.Attributes["type"]);
+        Assert.Equal("body { background-color: white; }", ReadIHtmlContent(tagBuilder.InnerHtml));
+    }
 
-            Assert.Equal("style", tagBuilder.TagName);
-            Assert.Equal("text/css", tagBuilder.Attributes["type"]);
-            Assert.Equal("body { background-color: white; }", ReadIHtmlContent(tagBuilder.InnerHtml));
-        }
+    #region Helpers
+    private static string ReadIHtmlContent(IHtmlContent content)
+    {
+        using var writer = new StringWriter();
+        content?.WriteTo(writer, HtmlEncoder.Default);
+        return writer.ToString();
+    }
 
-        #region Helpers
-        private static string ReadIHtmlContent(IHtmlContent content)
-        {
-            using var writer = new StringWriter();
-            content?.WriteTo(writer, HtmlEncoder.Default);
-            return writer.ToString();
-        }
+    #endregion
 
-        #endregion
+    #region Stubs
+    private sealed class StubFileVersionProvider : IFileVersionProvider
+    {
+        public static StubFileVersionProvider Instance { get; } = new StubFileVersionProvider();
 
-        #region Stubs
-        private sealed class StubFileVersionProvider : IFileVersionProvider
+        public string AddFileVersionToPath(PathString requestPathBase, string path)
         {
-            public static StubFileVersionProvider Instance { get; } = new StubFileVersionProvider();
-
-            public string AddFileVersionToPath(PathString requestPathBase, string path)
-            {
-                return path;
-            }
+            return path;
         }
-
-        #endregion
     }
+
+    #endregion
 }
diff --git a/test/OrchardCore.Tests/ResourceManagement/ResourceManagerTests.cs b/test/OrchardCore.Tests/ResourceManagement/ResourceManagerTests.cs
index faae186a564..cb1c3377660 100644
--- a/test/OrchardCore.Tests/ResourceManagement/ResourceManagerTests.cs
+++ b/test/OrchardCore.Tests/ResourceManagement/ResourceManagerTests.cs
@@ -4,927 +4,926 @@
 using OrchardCore.ResourceManagement;
 using ResourceLocation = OrchardCore.ResourceManagement.ResourceLocation;
 
-namespace OrchardCore.Tests.ResourceManagement
+namespace OrchardCore.Tests.ResourceManagement;
+
+public class ResourceManagerTests
 {
-    public class ResourceManagerTests
-    {
-        private const string BasePath = "http://host";
+    private const string BasePath = "http://host";
 
-        private readonly IBrowsingContext _browsingContext;
+    private readonly IBrowsingContext _browsingContext;
 
-        public ResourceManagerTests()
-        {
-            _browsingContext = BrowsingContext.New();
-        }
+    public ResourceManagerTests()
+    {
+        _browsingContext = BrowsingContext.New();
+    }
 
-        [Fact]
-        public void FindResourceFromManifestProviders()
-        {
-            var options = new ResourceManagementOptions();
-            var manifest = new ResourceManifest();
+    [Fact]
+    public void FindResourceFromManifestProviders()
+    {
+        var options = new ResourceManagementOptions();
+        var manifest = new ResourceManifest();
 
-            manifest.DefineResource("foo", "bar1").SetAttribute("attr", "bar1");
-            manifest.DefineResource("foo", "bar2").SetAttribute("attr", "bar2");
-            manifest.DefineResource("foo", "bar3").SetAttribute("attr", "bar3");
+        manifest.DefineResource("foo", "bar1").SetAttribute("attr", "bar1");
+        manifest.DefineResource("foo", "bar2").SetAttribute("attr", "bar2");
+        manifest.DefineResource("foo", "bar3").SetAttribute("attr", "bar3");
 
-            options.ResourceManifests.Add(manifest);
+        options.ResourceManifests.Add(manifest);
 
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(options),
-                StubFileVersionProvider.Instance
-            );
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(options),
+            StubFileVersionProvider.Instance
+        );
 
-            var resourceDefinition = resourceManager.FindResource(new RequireSettings { Type = "foo", Name = "bar2" });
+        var resourceDefinition = resourceManager.FindResource(new RequireSettings { Type = "foo", Name = "bar2" });
 
-            Assert.NotNull(resourceDefinition);
-            Assert.Equal("foo", resourceDefinition.Type);
-            Assert.Equal("bar2", resourceDefinition.Name);
-            Assert.Contains("bar2", ((IDictionary<string, string>)resourceDefinition.Attributes).Values);
-            Assert.Contains("attr", ((IDictionary<string, string>)resourceDefinition.Attributes).Keys);
-        }
+        Assert.NotNull(resourceDefinition);
+        Assert.Equal("foo", resourceDefinition.Type);
+        Assert.Equal("bar2", resourceDefinition.Name);
+        Assert.Contains("bar2", ((IDictionary<string, string>)resourceDefinition.Attributes).Values);
+        Assert.Contains("attr", ((IDictionary<string, string>)resourceDefinition.Attributes).Keys);
+    }
 
-        [Fact]
-        public void FindHighestVersionedResourceFromManifest()
-        {
-            var options = new ResourceManagementOptions();
-            var manifest = new ResourceManifest();
-
-            manifest.DefineResource("foo", "bar")
-                .SetUrl("~/bar1.js");
-            manifest.DefineResource("foo", "bar")
-                .SetUrl("~/bar2.js")
-                .SetVersion("1.0.0");
-            manifest.DefineResource("foo", "bar")
-                .SetUrl("~/bar3.js")
-                .SetVersion("2.0.0");
-            manifest.DefineResource("foo", "bar")
-                .SetUrl("~/bar4.js");
-
-            options.ResourceManifests.Add(manifest);
-
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(options),
-                StubFileVersionProvider.Instance
-            );
-
-            var resourceDefinition = resourceManager.FindResource(new RequireSettings { Type = "foo", Name = "bar" });
-            Assert.NotNull(resourceDefinition);
-            Assert.Equal("foo", resourceDefinition.Type);
-            Assert.Equal("bar", resourceDefinition.Name);
-            Assert.Contains("~/bar3.js", resourceDefinition.Url);
-            Assert.Contains("2.0.0", resourceDefinition.Version);
-        }
+    [Fact]
+    public void FindHighestVersionedResourceFromManifest()
+    {
+        var options = new ResourceManagementOptions();
+        var manifest = new ResourceManifest();
+
+        manifest.DefineResource("foo", "bar")
+            .SetUrl("~/bar1.js");
+        manifest.DefineResource("foo", "bar")
+            .SetUrl("~/bar2.js")
+            .SetVersion("1.0.0");
+        manifest.DefineResource("foo", "bar")
+            .SetUrl("~/bar3.js")
+            .SetVersion("2.0.0");
+        manifest.DefineResource("foo", "bar")
+            .SetUrl("~/bar4.js");
+
+        options.ResourceManifests.Add(manifest);
+
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(options),
+            StubFileVersionProvider.Instance
+        );
+
+        var resourceDefinition = resourceManager.FindResource(new RequireSettings { Type = "foo", Name = "bar" });
+        Assert.NotNull(resourceDefinition);
+        Assert.Equal("foo", resourceDefinition.Type);
+        Assert.Equal("bar", resourceDefinition.Name);
+        Assert.Contains("~/bar3.js", resourceDefinition.Url);
+        Assert.Contains("2.0.0", resourceDefinition.Version);
+    }
 
-        [Fact]
-        public void RegisterResouceUrl()
-        {
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
-                StubFileVersionProvider.Instance
-            );
-
-            var requireSetting = resourceManager.RegisterUrl("foo", "schema://domain.ext/resource", "schema://domain.ext/resource.debug");
-
-            var resourceDefinition = resourceManager.FindResource(requireSetting);
-            Assert.NotNull(resourceDefinition);
-            Assert.Equal("foo", resourceDefinition.Type);
-            Assert.Equal("schema://domain.ext/resource", resourceDefinition.Url);
-            Assert.Equal("schema://domain.ext/resource.debug", resourceDefinition.UrlDebug);
-        }
+    [Fact]
+    public void RegisterResouceUrl()
+    {
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
+            StubFileVersionProvider.Instance
+        );
+
+        var requireSetting = resourceManager.RegisterUrl("foo", "schema://domain.ext/resource", "schema://domain.ext/resource.debug");
+
+        var resourceDefinition = resourceManager.FindResource(requireSetting);
+        Assert.NotNull(resourceDefinition);
+        Assert.Equal("foo", resourceDefinition.Type);
+        Assert.Equal("schema://domain.ext/resource", resourceDefinition.Url);
+        Assert.Equal("schema://domain.ext/resource.debug", resourceDefinition.UrlDebug);
+    }
 
-        [Fact]
-        public void RegisteredResouceUrlIsRequired()
-        {
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
-                StubFileVersionProvider.Instance
-            );
+    [Fact]
+    public void RegisteredResouceUrlIsRequired()
+    {
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
+            StubFileVersionProvider.Instance
+        );
 
-            resourceManager.RegisterUrl("foo", "schema://domain.ext/resource", "schema://domain.ext/resource.debug");
+        resourceManager.RegisterUrl("foo", "schema://domain.ext/resource", "schema://domain.ext/resource.debug");
 
-            var requiredResourceContexts = resourceManager.GetRequiredResources("foo");
-            var resourceDefinition = requiredResourceContexts.FirstOrDefault()?.Resource;
+        var requiredResourceContexts = resourceManager.GetRequiredResources("foo");
+        var resourceDefinition = requiredResourceContexts.FirstOrDefault()?.Resource;
 
-            Assert.NotNull(resourceDefinition);
-            Assert.Equal("foo", resourceDefinition.Type);
-            Assert.Equal("schema://domain.ext/resource", resourceDefinition.Url);
-            Assert.Equal("schema://domain.ext/resource.debug", resourceDefinition.UrlDebug);
-        }
+        Assert.NotNull(resourceDefinition);
+        Assert.Equal("foo", resourceDefinition.Type);
+        Assert.Equal("schema://domain.ext/resource", resourceDefinition.Url);
+        Assert.Equal("schema://domain.ext/resource.debug", resourceDefinition.UrlDebug);
+    }
 
-        [Fact]
-        public void RegisteredResouceNameIsRequired()
-        {
-            var options = new ResourceManagementOptions();
-            var manifest = new ResourceManifest();
+    [Fact]
+    public void RegisteredResouceNameIsRequired()
+    {
+        var options = new ResourceManagementOptions();
+        var manifest = new ResourceManifest();
 
-            manifest.DefineResource("foo", "bar").SetUrl("schema://domain.ext/resource", "schema://domain.ext/resource.debug");
+        manifest.DefineResource("foo", "bar").SetUrl("schema://domain.ext/resource", "schema://domain.ext/resource.debug");
 
-            options.ResourceManifests.Add(manifest);
+        options.ResourceManifests.Add(manifest);
 
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(options),
-                StubFileVersionProvider.Instance
-            );
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(options),
+            StubFileVersionProvider.Instance
+        );
 
-            resourceManager.RegisterResource("foo", "bar");
+        resourceManager.RegisterResource("foo", "bar");
 
-            var requiredResourceContexts = resourceManager.GetRequiredResources("foo");
-            var resourceDefinition = requiredResourceContexts.FirstOrDefault()?.Resource;
+        var requiredResourceContexts = resourceManager.GetRequiredResources("foo");
+        var resourceDefinition = requiredResourceContexts.FirstOrDefault()?.Resource;
 
-            Assert.NotNull(resourceDefinition);
-            Assert.Equal("foo", resourceDefinition.Type);
-            Assert.Equal("schema://domain.ext/resource", resourceDefinition.Url);
-            Assert.Equal("schema://domain.ext/resource.debug", resourceDefinition.UrlDebug);
-        }
+        Assert.NotNull(resourceDefinition);
+        Assert.Equal("foo", resourceDefinition.Type);
+        Assert.Equal("schema://domain.ext/resource", resourceDefinition.Url);
+        Assert.Equal("schema://domain.ext/resource.debug", resourceDefinition.UrlDebug);
+    }
 
-        [Fact]
-        public void RequireDependencies()
-        {
-            var options = new ResourceManagementOptions();
-            var manifest = new ResourceManifest();
-
-            manifest.DefineResource("foo", "first-resource")
-                .SetDependencies("first-dependency")
-                .SetPosition(ResourcePosition.First);
-            manifest.DefineResource("foo", "requires-dependency")
-                .SetDependencies("dependency");
-            manifest.DefineResource("foo", "dependency");
-            manifest.DefineResource("foo", "another-dependency")
-                .SetDependencies("first-dependency");
-            manifest.DefineResource("foo", "first-dependency");
-            manifest.DefineResource("foo", "last-dependency")
-                .SetPosition(ResourcePosition.Last)
-                .SetDependencies("another-dependency");
-            manifest.DefineResource("foo", "simple-resource")
-                .SetDependencies("first-dependency");
-            manifest.DefineResource("foo", "last-resource")
-                .SetPosition(ResourcePosition.Last)
-                .SetDependencies("last-dependency");
-            manifest.DefineResource("foo", "not-used-resource");
-
-            options.ResourceManifests.Add(manifest);
-
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(options),
-                StubFileVersionProvider.Instance
-            );
-
-            resourceManager.RegisterResource("foo", "last-resource");
-            resourceManager.RegisterResource("foo", "requires-dependency");
-            resourceManager.RegisterResource("foo", "first-resource");
-            resourceManager.RegisterResource("foo", "simple-resource");
-
-            var requiredResources = resourceManager.GetRequiredResources("foo")
-                .Select(ctx => ctx.Resource)
-                .ToList();
-
-            // Ensure dependencies loaded
-            Assert.True(requiredResources.Count == 8);
-
-            // Ensure order
-            var firstDependencyIndex = requiredResources.FindIndex(resource => resource.Name == "first-dependency");
-            var firstResourceIndex = requiredResources.FindIndex(resource => resource.Name == "first-resource");
-            var anotherDependencyIndex = requiredResources.FindIndex(resource => resource.Name == "another-dependency");
-            var dependencyIndex = requiredResources.FindIndex(resource => resource.Name == "dependency");
-            var requiresDependencyIndex = requiredResources.FindIndex(resource => resource.Name == "requires-dependency");
-            var simpleResourceIndex = requiredResources.FindIndex(resource => resource.Name == "simple-resource");
-            var lastDependecyIndex = requiredResources.FindIndex(resource => resource.Name == "last-dependency");
-            var lastResourceIndex = requiredResources.FindIndex(resource => resource.Name == "last-resource");
-
-            Assert.True(firstResourceIndex > firstDependencyIndex);
-            Assert.True(anotherDependencyIndex > firstResourceIndex);
-            Assert.True(dependencyIndex > anotherDependencyIndex);
-            Assert.True(requiresDependencyIndex > dependencyIndex);
-            Assert.True(simpleResourceIndex > requiresDependencyIndex);
-            Assert.True(lastDependecyIndex > simpleResourceIndex);
-            Assert.True(lastResourceIndex > lastDependecyIndex);
-        }
+    [Fact]
+    public void RequireDependencies()
+    {
+        var options = new ResourceManagementOptions();
+        var manifest = new ResourceManifest();
+
+        manifest.DefineResource("foo", "first-resource")
+            .SetDependencies("first-dependency")
+            .SetPosition(ResourcePosition.First);
+        manifest.DefineResource("foo", "requires-dependency")
+            .SetDependencies("dependency");
+        manifest.DefineResource("foo", "dependency");
+        manifest.DefineResource("foo", "another-dependency")
+            .SetDependencies("first-dependency");
+        manifest.DefineResource("foo", "first-dependency");
+        manifest.DefineResource("foo", "last-dependency")
+            .SetPosition(ResourcePosition.Last)
+            .SetDependencies("another-dependency");
+        manifest.DefineResource("foo", "simple-resource")
+            .SetDependencies("first-dependency");
+        manifest.DefineResource("foo", "last-resource")
+            .SetPosition(ResourcePosition.Last)
+            .SetDependencies("last-dependency");
+        manifest.DefineResource("foo", "not-used-resource");
+
+        options.ResourceManifests.Add(manifest);
+
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(options),
+            StubFileVersionProvider.Instance
+        );
+
+        resourceManager.RegisterResource("foo", "last-resource");
+        resourceManager.RegisterResource("foo", "requires-dependency");
+        resourceManager.RegisterResource("foo", "first-resource");
+        resourceManager.RegisterResource("foo", "simple-resource");
+
+        var requiredResources = resourceManager.GetRequiredResources("foo")
+            .Select(ctx => ctx.Resource)
+            .ToList();
+
+        // Ensure dependencies loaded
+        Assert.True(requiredResources.Count == 8);
+
+        // Ensure order
+        var firstDependencyIndex = requiredResources.FindIndex(resource => resource.Name == "first-dependency");
+        var firstResourceIndex = requiredResources.FindIndex(resource => resource.Name == "first-resource");
+        var anotherDependencyIndex = requiredResources.FindIndex(resource => resource.Name == "another-dependency");
+        var dependencyIndex = requiredResources.FindIndex(resource => resource.Name == "dependency");
+        var requiresDependencyIndex = requiredResources.FindIndex(resource => resource.Name == "requires-dependency");
+        var simpleResourceIndex = requiredResources.FindIndex(resource => resource.Name == "simple-resource");
+        var lastDependecyIndex = requiredResources.FindIndex(resource => resource.Name == "last-dependency");
+        var lastResourceIndex = requiredResources.FindIndex(resource => resource.Name == "last-resource");
+
+        Assert.True(firstResourceIndex > firstDependencyIndex);
+        Assert.True(anotherDependencyIndex > firstResourceIndex);
+        Assert.True(dependencyIndex > anotherDependencyIndex);
+        Assert.True(requiresDependencyIndex > dependencyIndex);
+        Assert.True(simpleResourceIndex > requiresDependencyIndex);
+        Assert.True(lastDependecyIndex > simpleResourceIndex);
+        Assert.True(lastResourceIndex > lastDependecyIndex);
+    }
 
-        [Fact]
-        public void RequireCircularDependenciesShouldThrowException()
-        {
-            var options = new ResourceManagementOptions();
-            var manifest = new ResourceManifest();
+    [Fact]
+    public void RequireCircularDependenciesShouldThrowException()
+    {
+        var options = new ResourceManagementOptions();
+        var manifest = new ResourceManifest();
 
-            manifest.DefineResource("foo", "required")
-                .SetDependencies("dependency");
-            manifest.DefineResource("foo", "dependency")
-                .SetDependencies("required");
+        manifest.DefineResource("foo", "required")
+            .SetDependencies("dependency");
+        manifest.DefineResource("foo", "dependency")
+            .SetDependencies("required");
 
-            options.ResourceManifests.Add(manifest);
+        options.ResourceManifests.Add(manifest);
 
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(options),
-                StubFileVersionProvider.Instance
-            );
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(options),
+            StubFileVersionProvider.Instance
+        );
 
-            resourceManager.RegisterResource("foo", "required");
+        resourceManager.RegisterResource("foo", "required");
 
-            var ex = Assert.Throws<InvalidOperationException>(() => resourceManager.GetRequiredResources("foo"));
-            Assert.StartsWith("Circular dependency", ex.Message);
-        }
+        var ex = Assert.Throws<InvalidOperationException>(() => resourceManager.GetRequiredResources("foo"));
+        Assert.StartsWith("Circular dependency", ex.Message);
+    }
 
-        [Fact]
-        public void RequireCircularNestedDependencyShouldThrowException()
-        {
-            var options = new ResourceManagementOptions();
-            var manifest = new ResourceManifest();
+    [Fact]
+    public void RequireCircularNestedDependencyShouldThrowException()
+    {
+        var options = new ResourceManagementOptions();
+        var manifest = new ResourceManifest();
 
-            manifest.DefineResource("foo", "requires-dependency")
-                .SetDependencies("dependency");
-            manifest.DefineResource("foo", "requires-indirect-dependency")
-                .SetDependencies("requires-dependency");
-            manifest.DefineResource("foo", "dependency")
-                .SetDependencies("requires-indirect-dependency");
+        manifest.DefineResource("foo", "requires-dependency")
+            .SetDependencies("dependency");
+        manifest.DefineResource("foo", "requires-indirect-dependency")
+            .SetDependencies("requires-dependency");
+        manifest.DefineResource("foo", "dependency")
+            .SetDependencies("requires-indirect-dependency");
 
-            options.ResourceManifests.Add(manifest);
+        options.ResourceManifests.Add(manifest);
 
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(options),
-                StubFileVersionProvider.Instance
-            );
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(options),
+            StubFileVersionProvider.Instance
+        );
 
-            resourceManager.RegisterResource("foo", "requires-indirect-dependency");
-            resourceManager.RegisterResource("foo", "requires-dependency");
+        resourceManager.RegisterResource("foo", "requires-indirect-dependency");
+        resourceManager.RegisterResource("foo", "requires-dependency");
 
-            var ex = Assert.Throws<InvalidOperationException>(() => resourceManager.GetRequiredResources("foo"));
-            Assert.StartsWith("Circular dependency", ex.Message);
-        }
+        var ex = Assert.Throws<InvalidOperationException>(() => resourceManager.GetRequiredResources("foo"));
+        Assert.StartsWith("Circular dependency", ex.Message);
+    }
 
-        [Fact]
-        public void RequireByDependencyResourceThatDependsOnLastPositionedResourceShouldRegisterResourceLast()
-        {
-            var options = new ResourceManagementOptions();
-            var manifest = new ResourceManifest();
+    [Fact]
+    public void RequireByDependencyResourceThatDependsOnLastPositionedResourceShouldRegisterResourceLast()
+    {
+        var options = new ResourceManagementOptions();
+        var manifest = new ResourceManifest();
 
-            manifest.DefineResource("foo", "resource")
-                .SetDependencies("last-resource");
-            manifest.DefineResource("foo", "last-resource")
-                .SetPosition(ResourcePosition.Last);
+        manifest.DefineResource("foo", "resource")
+            .SetDependencies("last-resource");
+        manifest.DefineResource("foo", "last-resource")
+            .SetPosition(ResourcePosition.Last);
 
-            options.ResourceManifests.Add(manifest);
+        options.ResourceManifests.Add(manifest);
 
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(options),
-                StubFileVersionProvider.Instance
-            );
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(options),
+            StubFileVersionProvider.Instance
+        );
 
-            resourceManager.RegisterResource("foo", "resource");
+        resourceManager.RegisterResource("foo", "resource");
 
-            var requiredResources = resourceManager.GetRequiredResources("foo")
-                .Select(ctx => ctx.Resource)
-                .ToList();
+        var requiredResources = resourceManager.GetRequiredResources("foo")
+            .Select(ctx => ctx.Resource)
+            .ToList();
 
-            // Ensure dependencies loaded
-            Assert.True(requiredResources.Count == 2);
+        // Ensure dependencies loaded
+        Assert.True(requiredResources.Count == 2);
 
-            // Ensure order
-            var resourceIndex = requiredResources.FindIndex(resource => resource.Name == "resource");
-            var lastResourceIndex = requiredResources.FindIndex(resource => resource.Name == "last-resource");
+        // Ensure order
+        var resourceIndex = requiredResources.FindIndex(resource => resource.Name == "resource");
+        var lastResourceIndex = requiredResources.FindIndex(resource => resource.Name == "last-resource");
 
-            Assert.True(resourceIndex > lastResourceIndex);
-        }
+        Assert.True(resourceIndex > lastResourceIndex);
+    }
 
-        [Fact]
-        public void RequireFirstPositionedResourceThatDependsOnByDependencyResourceShouldRegisterDependencyFirst()
-        {
-            var options = new ResourceManagementOptions();
-            var manifest = new ResourceManifest();
+    [Fact]
+    public void RequireFirstPositionedResourceThatDependsOnByDependencyResourceShouldRegisterDependencyFirst()
+    {
+        var options = new ResourceManagementOptions();
+        var manifest = new ResourceManifest();
 
-            manifest.DefineResource("foo", "dependency");
-            manifest.DefineResource("foo", "first-resource")
-                .SetDependencies("dependency")
-                .SetPosition(ResourcePosition.First);
+        manifest.DefineResource("foo", "dependency");
+        manifest.DefineResource("foo", "first-resource")
+            .SetDependencies("dependency")
+            .SetPosition(ResourcePosition.First);
 
-            options.ResourceManifests.Add(manifest);
+        options.ResourceManifests.Add(manifest);
 
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(options),
-                StubFileVersionProvider.Instance
-            );
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(options),
+            StubFileVersionProvider.Instance
+        );
 
-            resourceManager.RegisterResource("foo", "first-resource");
+        resourceManager.RegisterResource("foo", "first-resource");
 
-            var requiredResources = resourceManager.GetRequiredResources("foo")
-                .Select(ctx => ctx.Resource)
-                .ToList();
+        var requiredResources = resourceManager.GetRequiredResources("foo")
+            .Select(ctx => ctx.Resource)
+            .ToList();
 
-            // Ensure dependencies loaded
-            Assert.True(requiredResources.Count == 2);
+        // Ensure dependencies loaded
+        Assert.True(requiredResources.Count == 2);
 
-            // Ensure order
-            var dependencyIndex = requiredResources.FindIndex(resource => resource.Name == "dependency");
-            var firstResourceIndex = requiredResources.FindIndex(resource => resource.Name == "first-resource");
+        // Ensure order
+        var dependencyIndex = requiredResources.FindIndex(resource => resource.Name == "dependency");
+        var firstResourceIndex = requiredResources.FindIndex(resource => resource.Name == "first-resource");
 
-            Assert.True(firstResourceIndex > dependencyIndex);
-        }
+        Assert.True(firstResourceIndex > dependencyIndex);
+    }
 
-        [Fact]
-        public void RequireFirstPositionedResourceWithDependencyToResourcePositionedLastShouldThrowException()
-        {
-            var options = new ResourceManagementOptions();
-            var manifest = new ResourceManifest();
+    [Fact]
+    public void RequireFirstPositionedResourceWithDependencyToResourcePositionedLastShouldThrowException()
+    {
+        var options = new ResourceManagementOptions();
+        var manifest = new ResourceManifest();
 
-            manifest.DefineResource("foo", "resource")
-                .SetDependencies("last-resource");
-            manifest.DefineResource("foo", "last-resource")
-                .SetPosition(ResourcePosition.Last);
-            manifest.DefineResource("foo", "first-resource")
-                .SetPosition(ResourcePosition.First)
-                .SetDependencies("resource");
+        manifest.DefineResource("foo", "resource")
+            .SetDependencies("last-resource");
+        manifest.DefineResource("foo", "last-resource")
+            .SetPosition(ResourcePosition.Last);
+        manifest.DefineResource("foo", "first-resource")
+            .SetPosition(ResourcePosition.First)
+            .SetDependencies("resource");
 
-            options.ResourceManifests.Add(manifest);
+        options.ResourceManifests.Add(manifest);
 
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(options),
-                StubFileVersionProvider.Instance
-            );
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(options),
+            StubFileVersionProvider.Instance
+        );
 
-            resourceManager.RegisterResource("foo", "first-resource");
-            resourceManager.RegisterResource("foo", "last-resource");
+        resourceManager.RegisterResource("foo", "first-resource");
+        resourceManager.RegisterResource("foo", "last-resource");
 
-            var ex = Assert.Throws<InvalidOperationException>(() => resourceManager.GetRequiredResources("foo"));
-            Assert.StartsWith("Invalid dependency position", ex.Message);
-        }
+        var ex = Assert.Throws<InvalidOperationException>(() => resourceManager.GetRequiredResources("foo"));
+        Assert.StartsWith("Invalid dependency position", ex.Message);
+    }
 
-        [Fact]
-        public void RemoveRequiredResource()
-        {
-            var options = new ResourceManagementOptions();
-            var manifest = new ResourceManifest();
+    [Fact]
+    public void RemoveRequiredResource()
+    {
+        var options = new ResourceManagementOptions();
+        var manifest = new ResourceManifest();
 
-            manifest.DefineResource("foo", "required");
-            manifest.DefineResource("foo", "to-remove");
-            manifest.DefineResource("foo", "not-required");
+        manifest.DefineResource("foo", "required");
+        manifest.DefineResource("foo", "to-remove");
+        manifest.DefineResource("foo", "not-required");
 
-            options.ResourceManifests.Add(manifest);
+        options.ResourceManifests.Add(manifest);
 
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(options),
-                StubFileVersionProvider.Instance
-            );
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(options),
+            StubFileVersionProvider.Instance
+        );
 
-            resourceManager.RegisterResource("foo", "required");
-            resourceManager.RegisterResource("foo", "to-remove");
+        resourceManager.RegisterResource("foo", "required");
+        resourceManager.RegisterResource("foo", "to-remove");
 
-            resourceManager.NotRequired("foo", "to-remove");
+        resourceManager.NotRequired("foo", "to-remove");
 
-            var requiredResources = resourceManager.GetRequiredResources("foo")
-                .Select(ctx => ctx.Resource)
-                .ToList();
+        var requiredResources = resourceManager.GetRequiredResources("foo")
+            .Select(ctx => ctx.Resource)
+            .ToList();
 
-            Assert.Contains(requiredResources, resource => resource.Name == "required");
-            Assert.DoesNotContain(requiredResources, resource => resource.Name == "to-remove");
-            Assert.DoesNotContain(requiredResources, resource => resource.Name == "not-required");
-        }
+        Assert.Contains(requiredResources, resource => resource.Name == "required");
+        Assert.DoesNotContain(requiredResources, resource => resource.Name == "to-remove");
+        Assert.DoesNotContain(requiredResources, resource => resource.Name == "not-required");
+    }
 
-        [Fact]
-        public void RemoveRequiredResourceDependency()
-        {
-            var options = new ResourceManagementOptions();
-            var manifest = new ResourceManifest();
+    [Fact]
+    public void RemoveRequiredResourceDependency()
+    {
+        var options = new ResourceManagementOptions();
+        var manifest = new ResourceManifest();
 
-            manifest.DefineResource("foo", "required");
-            manifest.DefineResource("foo", "to-remove")
-                .SetDependencies("dependency");
-            manifest.DefineResource("foo", "dependency");
-            manifest.DefineResource("foo", "not-required");
+        manifest.DefineResource("foo", "required");
+        manifest.DefineResource("foo", "to-remove")
+            .SetDependencies("dependency");
+        manifest.DefineResource("foo", "dependency");
+        manifest.DefineResource("foo", "not-required");
 
-            options.ResourceManifests.Add(manifest);
+        options.ResourceManifests.Add(manifest);
 
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(options),
-                StubFileVersionProvider.Instance
-            );
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(options),
+            StubFileVersionProvider.Instance
+        );
 
-            resourceManager.RegisterResource("foo", "required");
-            resourceManager.RegisterResource("foo", "to-remove");
+        resourceManager.RegisterResource("foo", "required");
+        resourceManager.RegisterResource("foo", "to-remove");
 
-            resourceManager.NotRequired("foo", "to-remove");
+        resourceManager.NotRequired("foo", "to-remove");
 
-            var requiredResources = resourceManager.GetRequiredResources("foo")
-                .Select(ctx => ctx.Resource)
-                .ToList();
+        var requiredResources = resourceManager.GetRequiredResources("foo")
+            .Select(ctx => ctx.Resource)
+            .ToList();
 
-            Assert.Contains(requiredResources, resource => resource.Name == "required");
-            Assert.DoesNotContain(requiredResources, resource => resource.Name == "to-remove");
-            Assert.DoesNotContain(requiredResources, resource => resource.Name == "dependency");
-            Assert.DoesNotContain(requiredResources, resource => resource.Name == "not-required");
-        }
+        Assert.Contains(requiredResources, resource => resource.Name == "required");
+        Assert.DoesNotContain(requiredResources, resource => resource.Name == "to-remove");
+        Assert.DoesNotContain(requiredResources, resource => resource.Name == "dependency");
+        Assert.DoesNotContain(requiredResources, resource => resource.Name == "not-required");
+    }
 
-        [Fact]
-        public void RegisterHeadScript()
-        {
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
-                StubFileVersionProvider.Instance
-            );
+    [Fact]
+    public void RegisterHeadScript()
+    {
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
+            StubFileVersionProvider.Instance
+        );
 
-            var customScript = "<script>doSomeAction();</script>";
-            resourceManager.RegisterHeadScript(new HtmlString(customScript));
+        var customScript = "<script>doSomeAction();</script>";
+        resourceManager.RegisterHeadScript(new HtmlString(customScript));
 
-            var registeredScripts = resourceManager.GetRegisteredHeadScripts();
+        var registeredScripts = resourceManager.GetRegisteredHeadScripts();
 
-            Assert.Contains(registeredScripts, script => script.ToString() == customScript);
-        }
+        Assert.Contains(registeredScripts, script => script.ToString() == customScript);
+    }
 
-        [Fact]
-        public void RegisterFootScript()
-        {
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
-                StubFileVersionProvider.Instance
-            );
+    [Fact]
+    public void RegisterFootScript()
+    {
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
+            StubFileVersionProvider.Instance
+        );
 
-            var customScript = "<script>doSomeAction();</script>";
-            resourceManager.RegisterFootScript(new HtmlString(customScript));
+        var customScript = "<script>doSomeAction();</script>";
+        resourceManager.RegisterFootScript(new HtmlString(customScript));
 
-            var registeredScripts = resourceManager.GetRegisteredFootScripts();
+        var registeredScripts = resourceManager.GetRegisteredFootScripts();
 
-            Assert.Contains(registeredScripts, script => script.ToString() == customScript);
-        }
+        Assert.Contains(registeredScripts, script => script.ToString() == customScript);
+    }
 
-        [Fact]
-        public void RegisterStyle()
-        {
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
-                StubFileVersionProvider.Instance
-            );
+    [Fact]
+    public void RegisterStyle()
+    {
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
+            StubFileVersionProvider.Instance
+        );
 
-            var customStyle = "<style>.my-class { prop: value; }</style>";
-            resourceManager.RegisterStyle(new HtmlString(customStyle));
+        var customStyle = "<style>.my-class { prop: value; }</style>";
+        resourceManager.RegisterStyle(new HtmlString(customStyle));
 
-            var registeredStyles = resourceManager.GetRegisteredStyles();
+        var registeredStyles = resourceManager.GetRegisteredStyles();
 
-            Assert.Contains(registeredStyles, style => style.ToString() == customStyle);
-        }
+        Assert.Contains(registeredStyles, style => style.ToString() == customStyle);
+    }
+
+    [Fact]
+    public void RegisterLink()
+    {
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
+            StubFileVersionProvider.Instance
+        );
 
-        [Fact]
-        public void RegisterLink()
+        var linkEntry = new LinkEntry
         {
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
-                StubFileVersionProvider.Instance
-            );
+            Rel = "foo",
+            Href = "bar.ext"
+        };
 
-            var linkEntry = new LinkEntry
-            {
-                Rel = "foo",
-                Href = "bar.ext"
-            };
+        resourceManager.RegisterLink(linkEntry);
 
-            resourceManager.RegisterLink(linkEntry);
+        var registeredLinks = resourceManager.GetRegisteredLinks();
 
-            var registeredLinks = resourceManager.GetRegisteredLinks();
+        Assert.Contains(linkEntry, registeredLinks);
+    }
 
-            Assert.Contains(linkEntry, registeredLinks);
-        }
+    [Fact]
+    public void RegisterMeta()
+    {
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
+            StubFileVersionProvider.Instance
+        );
 
-        [Fact]
-        public void RegisterMeta()
-        {
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
-                StubFileVersionProvider.Instance
-            );
+        var metaEntry = new MetaEntry(name: "foo", content: "bar");
 
-            var metaEntry = new MetaEntry(name: "foo", content: "bar");
+        resourceManager.RegisterMeta(metaEntry);
 
-            resourceManager.RegisterMeta(metaEntry);
+        var registeredMetas = resourceManager.GetRegisteredMetas();
 
-            var registeredMetas = resourceManager.GetRegisteredMetas();
+        Assert.Contains(metaEntry, registeredMetas);
+    }
 
-            Assert.Contains(metaEntry, registeredMetas);
-        }
+    [Fact]
+    public async Task AppendMeta()
+    {
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
+            StubFileVersionProvider.Instance
+        );
 
-        [Fact]
-        public async Task AppendMeta()
-        {
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
-                StubFileVersionProvider.Instance
-            );
+        var first = new MetaEntry(name: "keywords", content: "bar")
+            .AddAttribute("attr1", "val1");
+        var second = new MetaEntry(name: "keywords", content: "baz")
+            .AddAttribute("attr2", "val2");
 
-            var first = new MetaEntry(name: "keywords", content: "bar")
-                .AddAttribute("attr1", "val1");
-            var second = new MetaEntry(name: "keywords", content: "baz")
-                .AddAttribute("attr2", "val2");
+        resourceManager.AppendMeta(first, ",");
+        resourceManager.AppendMeta(second, ",");
 
-            resourceManager.AppendMeta(first, ",");
-            resourceManager.AppendMeta(second, ",");
+        var keywordsMeta = resourceManager.GetRegisteredMetas()
+            .FirstOrDefault(entry => entry.Name == "keywords");
 
-            var keywordsMeta = resourceManager.GetRegisteredMetas()
-                .FirstOrDefault(entry => entry.Name == "keywords");
+        var document = await ParseHtmlAsync(keywordsMeta.GetTag());
+        var meta = document
+            .QuerySelector<IHtmlMetaElement>("meta[name=keywords]");
 
-            var document = await ParseHtmlAsync(keywordsMeta.GetTag());
-            var meta = document
-                .QuerySelector<IHtmlMetaElement>("meta[name=keywords]");
+        Assert.Equal("bar,baz", meta.Content);
+        Assert.Contains(meta.Attributes, attr => attr.Name == "attr1" && attr.Value == "val1");
+        Assert.Contains(meta.Attributes, attr => attr.Name == "attr2" && attr.Value == "val2");
+    }
 
-            Assert.Equal("bar,baz", meta.Content);
-            Assert.Contains(meta.Attributes, attr => attr.Name == "attr1" && attr.Value == "val1");
-            Assert.Contains(meta.Attributes, attr => attr.Name == "attr2" && attr.Value == "val2");
-        }
+    [Fact]
+    public async Task RenderMeta()
+    {
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
+            StubFileVersionProvider.Instance
+        );
+
+        resourceManager.RegisterMeta(new MetaEntry { Charset = "utf-8" });
+        resourceManager.RegisterMeta(new MetaEntry { Name = "description", Content = "Some content" });
+        resourceManager.RegisterMeta(new MetaEntry { HttpEquiv = "refresh", Content = "3;url=https://www.orchardcore.net/" });
+
+        using var sw = new StringWriter();
+        resourceManager.RenderMeta(sw);
+        var htmlBuilder = new HtmlContentBuilder();
+        htmlBuilder.AppendHtml(sw.ToString());
+
+        var document = await ParseHtmlAsync(htmlBuilder);
+        var metas = document
+            .QuerySelectorAll<IHtmlMetaElement>("meta");
+
+        Assert.Equal(3, metas.Count());
+        Assert.Contains(metas, meta => meta.Charset == "utf-8");
+        Assert.Contains(metas, meta => meta.Name == "description" && meta.Content == "Some content");
+        Assert.Contains(metas, meta => meta.HttpEquivalent == "refresh" && meta.Content == "3;url=https://www.orchardcore.net/");
+    }
 
-        [Fact]
-        public async Task RenderMeta()
-        {
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
-                StubFileVersionProvider.Instance
-            );
-
-            resourceManager.RegisterMeta(new MetaEntry { Charset = "utf-8" });
-            resourceManager.RegisterMeta(new MetaEntry { Name = "description", Content = "Some content" });
-            resourceManager.RegisterMeta(new MetaEntry { HttpEquiv = "refresh", Content = "3;url=https://www.orchardcore.net/" });
-
-            using var sw = new StringWriter();
-            resourceManager.RenderMeta(sw);
-            var htmlBuilder = new HtmlContentBuilder();
-            htmlBuilder.AppendHtml(sw.ToString());
-
-            var document = await ParseHtmlAsync(htmlBuilder);
-            var metas = document
-                .QuerySelectorAll<IHtmlMetaElement>("meta");
-
-            Assert.Equal(3, metas.Count());
-            Assert.Contains(metas, meta => meta.Charset == "utf-8");
-            Assert.Contains(metas, meta => meta.Name == "description" && meta.Content == "Some content");
-            Assert.Contains(metas, meta => meta.HttpEquivalent == "refresh" && meta.Content == "3;url=https://www.orchardcore.net/");
-        }
+    [Fact]
+    public async Task RenderHeadLink()
+    {
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
+            StubFileVersionProvider.Instance
+        );
+
+        resourceManager.RegisterUrl("stylesheet", "other.min.css", "other.css");    // Should not be rendered
+        resourceManager.RegisterLink(new LinkEntry { Rel = "icon", Href = "/favicon.ico" });
+        resourceManager.RegisterLink(new LinkEntry { Rel = "alternate", Type = "application/pdf", Href = "/pdf" });
+
+        using var sw = new StringWriter();
+        resourceManager.RenderHeadLink(sw);
+        var htmlBuilder = new HtmlContentBuilder();
+        htmlBuilder.AppendHtml(sw.ToString());
+
+        var document = await ParseHtmlAsync(htmlBuilder);
+        var links = document
+            .QuerySelectorAll<IHtmlLinkElement>("link");
+
+        Assert.Equal(2, links.Count());
+        Assert.Contains(links, link => link.Relation == "icon" && link.Href == $"{BasePath}/favicon.ico");
+        Assert.Contains(links, link => link.Relation == "alternate" && link.Type == "application/pdf" && link.Href == $"{BasePath}/pdf");
+    }
 
-        [Fact]
-        public async Task RenderHeadLink()
-        {
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),
-                StubFileVersionProvider.Instance
-            );
-
-            resourceManager.RegisterUrl("stylesheet", "other.min.css", "other.css");    // Should not be rendered
-            resourceManager.RegisterLink(new LinkEntry { Rel = "icon", Href = "/favicon.ico" });
-            resourceManager.RegisterLink(new LinkEntry { Rel = "alternate", Type = "application/pdf", Href = "/pdf" });
-
-            using var sw = new StringWriter();
-            resourceManager.RenderHeadLink(sw);
-            var htmlBuilder = new HtmlContentBuilder();
-            htmlBuilder.AppendHtml(sw.ToString());
-
-            var document = await ParseHtmlAsync(htmlBuilder);
-            var links = document
-                .QuerySelectorAll<IHtmlLinkElement>("link");
-
-            Assert.Equal(2, links.Count());
-            Assert.Contains(links, link => link.Relation == "icon" && link.Href == $"{BasePath}/favicon.ico");
-            Assert.Contains(links, link => link.Relation == "alternate" && link.Type == "application/pdf" && link.Href == $"{BasePath}/pdf");
-        }
+    [Fact]
+    public async Task RenderStylesheet()
+    {
+        var options = new ResourceManagementOptions();
+        var manifest = new ResourceManifest();
+
+        manifest.DefineStyle("required").SetUrl("required.css")
+            .SetDependencies("dependency");
+        manifest.DefineStyle("dependency").SetUrl("dependency.css");
+        manifest.DefineStyle("not-required").SetUrl("not-required.css");
+
+        options.ResourceManifests.Add(manifest);
+
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(options),
+            StubFileVersionProvider.Instance
+        );
+
+        resourceManager.RegisterLink(new LinkEntry { Rel = "icon", Href = "/favicon.ico" });    // Should not be rendered
+
+        // Require resource
+        resourceManager.RegisterResource("stylesheet", "required");
+
+        // Register custom style
+        var customStyle = ".my-class { prop: value; }";
+        resourceManager.RegisterStyle(new HtmlString($"<style>{customStyle}</style>"));
+
+        using var sw = new StringWriter();
+        resourceManager.RenderStylesheet(sw);
+        var htmlBuilder = new HtmlContentBuilder();
+        htmlBuilder.AppendHtml(sw.ToString());
+
+        var document = await ParseHtmlAsync(htmlBuilder);
+        var links = document
+            .QuerySelectorAll<IHtmlLinkElement>("link");
+        var styles = document
+            .QuerySelectorAll<IHtmlStyleElement>("style");
+
+        Assert.Equal(2, links.Count());
+        Assert.Contains(links, link => link.Href == $"{BasePath}/dependency.css");
+        Assert.Contains(links, link => link.Href == $"{BasePath}/required.css");
+        Assert.Single(styles);
+        Assert.Contains(styles, style => style.InnerHtml == customStyle);
+        // Required stylesheet after its dependency
+        Assert.Equal(DocumentPositions.Following, links.First(link => link.Href == $"{BasePath}/dependency.css")
+            .CompareDocumentPosition(
+                links.First(link => link.Href == $"{BasePath}/required.css")
+            )
+        );
+        // Custom style after resources
+        Assert.Equal(DocumentPositions.Following, links.First(link => link.Href == $"{BasePath}/required.css")
+            .CompareDocumentPosition(
+                styles.First(style => style.InnerHtml == customStyle)
+            )
+        );
+    }
 
-        [Fact]
-        public async Task RenderStylesheet()
-        {
-            var options = new ResourceManagementOptions();
-            var manifest = new ResourceManifest();
-
-            manifest.DefineStyle("required").SetUrl("required.css")
-                .SetDependencies("dependency");
-            manifest.DefineStyle("dependency").SetUrl("dependency.css");
-            manifest.DefineStyle("not-required").SetUrl("not-required.css");
-
-            options.ResourceManifests.Add(manifest);
-
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(options),
-                StubFileVersionProvider.Instance
-            );
-
-            resourceManager.RegisterLink(new LinkEntry { Rel = "icon", Href = "/favicon.ico" });    // Should not be rendered
-
-            // Require resource
-            resourceManager.RegisterResource("stylesheet", "required");
-
-            // Register custom style
-            var customStyle = ".my-class { prop: value; }";
-            resourceManager.RegisterStyle(new HtmlString($"<style>{customStyle}</style>"));
-
-            using var sw = new StringWriter();
-            resourceManager.RenderStylesheet(sw);
-            var htmlBuilder = new HtmlContentBuilder();
-            htmlBuilder.AppendHtml(sw.ToString());
-
-            var document = await ParseHtmlAsync(htmlBuilder);
-            var links = document
-                .QuerySelectorAll<IHtmlLinkElement>("link");
-            var styles = document
-                .QuerySelectorAll<IHtmlStyleElement>("style");
-
-            Assert.Equal(2, links.Count());
-            Assert.Contains(links, link => link.Href == $"{BasePath}/dependency.css");
-            Assert.Contains(links, link => link.Href == $"{BasePath}/required.css");
-            Assert.Single(styles);
-            Assert.Contains(styles, style => style.InnerHtml == customStyle);
-            // Required stylesheet after its dependency
-            Assert.Equal(DocumentPositions.Following, links.First(link => link.Href == $"{BasePath}/dependency.css")
-                .CompareDocumentPosition(
-                    links.First(link => link.Href == $"{BasePath}/required.css")
-                )
-            );
-            // Custom style after resources
-            Assert.Equal(DocumentPositions.Following, links.First(link => link.Href == $"{BasePath}/required.css")
-                .CompareDocumentPosition(
-                    styles.First(style => style.InnerHtml == customStyle)
-                )
-            );
-        }
+    [Fact]
+    public async Task RenderHeadScript()
+    {
+        var options = new ResourceManagementOptions();
+        var manifest = new ResourceManifest();
+
+        manifest.DefineScript("required").SetUrl("required.js")
+            .SetDependencies("dependency");
+        manifest.DefineScript("dependency").SetUrl("dependency.js");
+        manifest.DefineScript("not-required").SetUrl("not-required.js");
+
+        options.ResourceManifests.Add(manifest);
+
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(options),
+            StubFileVersionProvider.Instance
+        );
+
+        // Require resource
+        resourceManager.RegisterResource("script", "required").AtHead();
+
+        // Register custom script
+        var customScript = "doSomeAction();";
+        resourceManager.RegisterHeadScript(new HtmlString($"<script>{customScript}</script>"));
+
+        using var sw = new StringWriter();
+        resourceManager.RenderHeadScript(sw);
+        var htmlBuilder = new HtmlContentBuilder();
+        htmlBuilder.AppendHtml(sw.ToString());
+
+        var document = await ParseHtmlAsync(htmlBuilder);
+        var scripts = document
+            .QuerySelectorAll<IHtmlScriptElement>("script");
+
+        Assert.Equal(3, scripts.Count());
+        Assert.Contains(scripts, script => script.Source == "dependency.js");
+        Assert.Contains(scripts, script => script.Source == "required.js");
+        Assert.Contains(scripts, script => script.Text == customScript);
+        // Required script after its dependency
+        Assert.Equal(DocumentPositions.Following, scripts.First(script => script.Source == "dependency.js")
+            .CompareDocumentPosition(
+                scripts.First(script => script.Source == "required.js")
+            )
+        );
+        // Custom script after resources
+        Assert.Equal(DocumentPositions.Following, scripts.First(script => script.Source == "required.js")
+            .CompareDocumentPosition(
+                scripts.First(script => script.Text == customScript)
+            )
+        );
+    }
 
-        [Fact]
-        public async Task RenderHeadScript()
-        {
-            var options = new ResourceManagementOptions();
-            var manifest = new ResourceManifest();
-
-            manifest.DefineScript("required").SetUrl("required.js")
-                .SetDependencies("dependency");
-            manifest.DefineScript("dependency").SetUrl("dependency.js");
-            manifest.DefineScript("not-required").SetUrl("not-required.js");
-
-            options.ResourceManifests.Add(manifest);
-
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(options),
-                StubFileVersionProvider.Instance
-            );
-
-            // Require resource
-            resourceManager.RegisterResource("script", "required").AtHead();
-
-            // Register custom script
-            var customScript = "doSomeAction();";
-            resourceManager.RegisterHeadScript(new HtmlString($"<script>{customScript}</script>"));
-
-            using var sw = new StringWriter();
-            resourceManager.RenderHeadScript(sw);
-            var htmlBuilder = new HtmlContentBuilder();
-            htmlBuilder.AppendHtml(sw.ToString());
-
-            var document = await ParseHtmlAsync(htmlBuilder);
-            var scripts = document
-                .QuerySelectorAll<IHtmlScriptElement>("script");
-
-            Assert.Equal(3, scripts.Count());
-            Assert.Contains(scripts, script => script.Source == "dependency.js");
-            Assert.Contains(scripts, script => script.Source == "required.js");
-            Assert.Contains(scripts, script => script.Text == customScript);
-            // Required script after its dependency
-            Assert.Equal(DocumentPositions.Following, scripts.First(script => script.Source == "dependency.js")
-                .CompareDocumentPosition(
-                    scripts.First(script => script.Source == "required.js")
-                )
-            );
-            // Custom script after resources
-            Assert.Equal(DocumentPositions.Following, scripts.First(script => script.Source == "required.js")
-                .CompareDocumentPosition(
-                    scripts.First(script => script.Text == customScript)
-                )
-            );
-        }
+    [Fact]
+    public async Task RenderFootScript()
+    {
+        var options = new ResourceManagementOptions();
+        var manifest = new ResourceManifest();
+
+        manifest.DefineScript("required").SetUrl("required.js")
+            .SetDependencies("dependency");
+        manifest.DefineScript("dependency").SetUrl("dependency.js");
+        manifest.DefineScript("not-required").SetUrl("not-required.js");
+
+        options.ResourceManifests.Add(manifest);
+
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(options),
+            StubFileVersionProvider.Instance
+        );
+
+        // Require resource
+        resourceManager.RegisterResource("script", "required").AtFoot();
+
+        // Register custom script
+        var customScript = "doSomeAction();";
+        resourceManager.RegisterFootScript(new HtmlString($"<script>{customScript}</script>"));
+
+        using var sw = new StringWriter();
+        resourceManager.RenderFootScript(sw);
+        var htmlBuilder = new HtmlContentBuilder();
+        htmlBuilder.AppendHtml(sw.ToString());
+
+        var document = await ParseHtmlAsync(htmlBuilder);
+        var scripts = document
+            .QuerySelectorAll<IHtmlScriptElement>("script");
+
+        Assert.Equal(3, scripts.Count());
+        Assert.Contains(scripts, script => script.Source == "dependency.js");
+        Assert.Contains(scripts, script => script.Source == "required.js");
+        Assert.Contains(scripts, script => script.Text == customScript);
+        // Required script after its dependency
+        Assert.Equal(DocumentPositions.Following, scripts.First(script => script.Source == "dependency.js")
+            .CompareDocumentPosition(
+                scripts.First(script => script.Source == "required.js")
+            )
+        );
+        // Custom script after resources
+        Assert.Equal(DocumentPositions.Following, scripts.First(script => script.Source == "required.js")
+            .CompareDocumentPosition(
+                scripts.First(script => script.Text == customScript)
+            )
+        );
+    }
 
-        [Fact]
-        public async Task RenderFootScript()
-        {
-            var options = new ResourceManagementOptions();
-            var manifest = new ResourceManifest();
-
-            manifest.DefineScript("required").SetUrl("required.js")
-                .SetDependencies("dependency");
-            manifest.DefineScript("dependency").SetUrl("dependency.js");
-            manifest.DefineScript("not-required").SetUrl("not-required.js");
-
-            options.ResourceManifests.Add(manifest);
-
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(options),
-                StubFileVersionProvider.Instance
-            );
-
-            // Require resource
-            resourceManager.RegisterResource("script", "required").AtFoot();
-
-            // Register custom script
-            var customScript = "doSomeAction();";
-            resourceManager.RegisterFootScript(new HtmlString($"<script>{customScript}</script>"));
-
-            using var sw = new StringWriter();
-            resourceManager.RenderFootScript(sw);
-            var htmlBuilder = new HtmlContentBuilder();
-            htmlBuilder.AppendHtml(sw.ToString());
-
-            var document = await ParseHtmlAsync(htmlBuilder);
-            var scripts = document
-                .QuerySelectorAll<IHtmlScriptElement>("script");
-
-            Assert.Equal(3, scripts.Count());
-            Assert.Contains(scripts, script => script.Source == "dependency.js");
-            Assert.Contains(scripts, script => script.Source == "required.js");
-            Assert.Contains(scripts, script => script.Text == customScript);
-            // Required script after its dependency
-            Assert.Equal(DocumentPositions.Following, scripts.First(script => script.Source == "dependency.js")
-                .CompareDocumentPosition(
-                    scripts.First(script => script.Source == "required.js")
-                )
-            );
-            // Custom script after resources
-            Assert.Equal(DocumentPositions.Following, scripts.First(script => script.Source == "required.js")
-                .CompareDocumentPosition(
-                    scripts.First(script => script.Text == customScript)
-                )
-            );
-        }
+    [Fact]
+    public async Task RenderHeadAndFootScriptWithSameDependency()
+    {
+        var options = new ResourceManagementOptions();
+        var manifest = new ResourceManifest();
 
-        [Fact]
-        public async Task RenderHeadAndFootScriptWithSameDependency()
-        {
-            var options = new ResourceManagementOptions();
-            var manifest = new ResourceManifest();
+        manifest.DefineScript("required")
+            .SetUrl("required.js")
+            .SetDependencies("dependency");
 
-            manifest.DefineScript("required")
-                .SetUrl("required.js")
-                .SetDependencies("dependency");
+        manifest.DefineScript("dependency")
+            .SetUrl("dependency.js");
 
-            manifest.DefineScript("dependency")
-                .SetUrl("dependency.js");
+        manifest.DefineScript("required-at-foot")
+            .SetUrl("required-at-foot.js")
+            .SetDependencies("dependency");
 
-            manifest.DefineScript("required-at-foot")
-                .SetUrl("required-at-foot.js")
-                .SetDependencies("dependency");
+        manifest.DefineScript("not-required")
+            .SetUrl("not-required.js");
 
-            manifest.DefineScript("not-required")
-                .SetUrl("not-required.js");
+        options.ResourceManifests.Add(manifest);
 
-            options.ResourceManifests.Add(manifest);
+        var resourceManager = new ResourceManager
+        (
+            new OptionsWrapper<ResourceManagementOptions>(options),
+            StubFileVersionProvider.Instance
+        );
 
-            var resourceManager = new ResourceManager
-            (
-                new OptionsWrapper<ResourceManagementOptions>(options),
-                StubFileVersionProvider.Instance
-            );
+        // Require resource.
+        resourceManager.RegisterResource("script", "required").AtHead();
 
-            // Require resource.
-            resourceManager.RegisterResource("script", "required").AtHead();
+        // Register custom script.
+        var customScript = "doSomeAction();";
+        resourceManager.RegisterHeadScript(new HtmlString($"<script>{customScript}</script>"));
 
-            // Register custom script.
-            var customScript = "doSomeAction();";
-            resourceManager.RegisterHeadScript(new HtmlString($"<script>{customScript}</script>"));
+        // Require resource at Foot with same dependency at Head
+        resourceManager.RegisterResource("script", "required-at-foot").AtFoot();
 
-            // Require resource at Foot with same dependency at Head
-            resourceManager.RegisterResource("script", "required-at-foot").AtFoot();
+        using var sw1 = new StringWriter();
+        resourceManager.RenderHeadScript(sw1);
+        var htmlBuilder = new HtmlContentBuilder();
+        htmlBuilder.AppendHtml(sw1.ToString());
 
-            using var sw1 = new StringWriter();
-            resourceManager.RenderHeadScript(sw1);
-            var htmlBuilder = new HtmlContentBuilder();
-            htmlBuilder.AppendHtml(sw1.ToString());
+        var document = await ParseHtmlAsync(htmlBuilder);
+        var headScripts = document
+            .QuerySelectorAll<IHtmlScriptElement>("script");
 
-            var document = await ParseHtmlAsync(htmlBuilder);
-            var headScripts = document
-                .QuerySelectorAll<IHtmlScriptElement>("script");
+        using var sw2 = new StringWriter();
+        resourceManager.RenderFootScript(sw2);
+        htmlBuilder = new HtmlContentBuilder();
+        htmlBuilder.AppendHtml(sw2.ToString());
 
-            using var sw2 = new StringWriter();
-            resourceManager.RenderFootScript(sw2);
-            htmlBuilder = new HtmlContentBuilder();
-            htmlBuilder.AppendHtml(sw2.ToString());
+        document = await ParseHtmlAsync(htmlBuilder);
+        var footScripts = document
+            .QuerySelectorAll<IHtmlScriptElement>("script");
 
-            document = await ParseHtmlAsync(htmlBuilder);
-            var footScripts = document
-                .QuerySelectorAll<IHtmlScriptElement>("script");
+        // Should render 4 scripts in total, 3 at head and 1 at foot.
+        Assert.Equal(4, headScripts.Count() + footScripts.Count());
 
-            // Should render 4 scripts in total, 3 at head and 1 at foot.
-            Assert.Equal(4, headScripts.Count() + footScripts.Count());
+        //Check head script positions.
+        Assert.Contains("dependency.js", headScripts.ElementAt(0).Source);
+        Assert.Contains("required.js", headScripts.ElementAt(1).Source);
+        Assert.Contains(customScript, headScripts.ElementAt(2).Text);
 
-            //Check head script positions.
-            Assert.Contains("dependency.js", headScripts.ElementAt(0).Source);
-            Assert.Contains("required.js", headScripts.ElementAt(1).Source);
-            Assert.Contains(customScript, headScripts.ElementAt(2).Text);
+        //Check foot script positions.
+        Assert.Contains("required-at-foot.js", footScripts.ElementAt(0).Source);
+    }
 
-            //Check foot script positions.
-            Assert.Contains("required-at-foot.js", footScripts.ElementAt(0).Source);
-        }
+    [Fact]
+    public async Task RenderLocalScript()
+    {
+        var options = new ResourceManagementOptions();
+        var manifest = new ResourceManifest();
 
-        [Fact]
-        public async Task RenderLocalScript()
-        {
-            var options = new ResourceManagementOptions();
-            var manifest = new ResourceManifest();
+        manifest.DefineScript("required").SetUrl("required.js")
+            .SetDependencies("dependency");
+        manifest.DefineScript("dependency").SetUrl("dependency.js");
+        manifest.DefineScript("not-required").SetUrl("not-required.js");
 
-            manifest.DefineScript("required").SetUrl("required.js")
-                .SetDependencies("dependency");
-            manifest.DefineScript("dependency").SetUrl("dependency.js");
-            manifest.DefineScript("not-required").SetUrl("not-required.js");
+        options.ResourceManifests.Add(manifest);
 
-            options.ResourceManifests.Add(manifest);
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(options),
+            StubFileVersionProvider.Instance
+        );
 
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(options),
-                StubFileVersionProvider.Instance
-            );
+        var requireSetting = resourceManager.RegisterResource("script", "required");
 
-            var requireSetting = resourceManager.RegisterResource("script", "required");
+        using var sw = new StringWriter();
+        resourceManager.RenderLocalScript(requireSetting, sw);
+        var htmlBuilder = new HtmlContentBuilder();
+        htmlBuilder.AppendHtml(sw.ToString());
 
-            using var sw = new StringWriter();
-            resourceManager.RenderLocalScript(requireSetting, sw);
-            var htmlBuilder = new HtmlContentBuilder();
-            htmlBuilder.AppendHtml(sw.ToString());
 
+        var document = await ParseHtmlAsync(htmlBuilder);
+        var scripts = document
+            .QuerySelectorAll<IHtmlScriptElement>("script");
 
-            var document = await ParseHtmlAsync(htmlBuilder);
-            var scripts = document
-                .QuerySelectorAll<IHtmlScriptElement>("script");
+        Assert.Equal(2, scripts.Count());
+        Assert.Contains(scripts, script => script.Source == "dependency.js");
+        Assert.Contains(scripts, script => script.Source == "required.js");
+        Assert.Equal(DocumentPositions.Following, scripts.First(script => script.Source == "dependency.js")
+            .CompareDocumentPosition(
+                scripts.First(script => script.Source == "required.js")
+            )
+        );
+    }
 
-            Assert.Equal(2, scripts.Count());
-            Assert.Contains(scripts, script => script.Source == "dependency.js");
-            Assert.Contains(scripts, script => script.Source == "required.js");
-            Assert.Equal(DocumentPositions.Following, scripts.First(script => script.Source == "dependency.js")
-                .CompareDocumentPosition(
-                    scripts.First(script => script.Source == "required.js")
-                )
-            );
-        }
+    [Fact]
+    public async Task RenderLocalStyle()
+    {
+        var options = new ResourceManagementOptions();
+        var manifest = new ResourceManifest();
+
+        manifest.DefineStyle("required").SetUrl("required.css")
+            .SetDependencies("dependency");
+        manifest.DefineStyle("dependency").SetUrl("dependency.css");
+        manifest.DefineStyle("not-required").SetUrl("not-required.css");
+
+        options.ResourceManifests.Add(manifest);
+
+        var resourceManager = new ResourceManager(
+            new OptionsWrapper<ResourceManagementOptions>(options),
+            StubFileVersionProvider.Instance
+        );
+
+        var requireSetting = resourceManager.RegisterResource("stylesheet", "required").AtLocation(ResourceLocation.Inline);
+
+        using var sw = new StringWriter();
+        resourceManager.RenderLocalStyle(requireSetting, sw);
+        var htmlBuilder = new HtmlContentBuilder();
+        htmlBuilder.AppendHtml(sw.ToString());
+
+        var document = await ParseHtmlAsync(htmlBuilder);
+        var scripts = document
+            .QuerySelectorAll<IHtmlLinkElement>("link");
+
+        Assert.Equal(2, scripts.Count());
+        Assert.Contains(scripts, script => script.Href.EndsWith("dependency.css"));
+        Assert.Contains(scripts, script => script.Href.EndsWith("required.css"));
+        Assert.Equal(DocumentPositions.Following, scripts.First(script => script.Href.EndsWith("dependency.css"))
+            .CompareDocumentPosition(
+                scripts.First(script => script.Href.EndsWith("required.css"))
+            )
+        );
+    }
 
-        [Fact]
-        public async Task RenderLocalStyle()
-        {
-            var options = new ResourceManagementOptions();
-            var manifest = new ResourceManifest();
-
-            manifest.DefineStyle("required").SetUrl("required.css")
-                .SetDependencies("dependency");
-            manifest.DefineStyle("dependency").SetUrl("dependency.css");
-            manifest.DefineStyle("not-required").SetUrl("not-required.css");
-
-            options.ResourceManifests.Add(manifest);
-
-            var resourceManager = new ResourceManager(
-                new OptionsWrapper<ResourceManagementOptions>(options),
-                StubFileVersionProvider.Instance
-            );
-
-            var requireSetting = resourceManager.RegisterResource("stylesheet", "required").AtLocation(ResourceLocation.Inline);
-
-            using var sw = new StringWriter();
-            resourceManager.RenderLocalStyle(requireSetting, sw);
-            var htmlBuilder = new HtmlContentBuilder();
-            htmlBuilder.AppendHtml(sw.ToString());
-
-            var document = await ParseHtmlAsync(htmlBuilder);
-            var scripts = document
-                .QuerySelectorAll<IHtmlLinkElement>("link");
-
-            Assert.Equal(2, scripts.Count());
-            Assert.Contains(scripts, script => script.Href.EndsWith("dependency.css"));
-            Assert.Contains(scripts, script => script.Href.EndsWith("required.css"));
-            Assert.Equal(DocumentPositions.Following, scripts.First(script => script.Href.EndsWith("dependency.css"))
-                .CompareDocumentPosition(
-                    scripts.First(script => script.Href.EndsWith("required.css"))
-                )
-            );
-        }
+    #region Helpers
+    private async Task<IDocument> ParseHtmlAsync(IHtmlContent content)
+    {
+        using var writer = new StringWriter();
 
-        #region Helpers
-        private async Task<IDocument> ParseHtmlAsync(IHtmlContent content)
-        {
-            using var writer = new StringWriter();
+        content.WriteTo(writer, HtmlEncoder.Default);
 
-            content.WriteTo(writer, HtmlEncoder.Default);
+        return await _browsingContext.OpenAsync(res => res.Content(writer.ToString()).Address(BasePath));
+    }
 
-            return await _browsingContext.OpenAsync(res => res.Content(writer.ToString()).Address(BasePath));
-        }
+    #endregion
 
-        #endregion
+    #region Stubs
+    private sealed class StubResourceManifestProvider : IConfigureOptions<ResourceManagementOptions>
+    {
+        private readonly Action<ResourceManagementOptions> _configureManifestAction;
 
-        #region Stubs
-        private sealed class StubResourceManifestProvider : IConfigureOptions<ResourceManagementOptions>
+        public StubResourceManifestProvider(Action<ResourceManagementOptions> configureManifestAction)
         {
-            private readonly Action<ResourceManagementOptions> _configureManifestAction;
-
-            public StubResourceManifestProvider(Action<ResourceManagementOptions> configureManifestAction)
-            {
-                _configureManifestAction = configureManifestAction;
-            }
-
-            public void Configure(ResourceManagementOptions options)
-            {
-                _configureManifestAction?.Invoke(options);
-            }
+            _configureManifestAction = configureManifestAction;
         }
 
-        private sealed class StubFileVersionProvider : IFileVersionProvider
+        public void Configure(ResourceManagementOptions options)
         {
-            public static StubFileVersionProvider Instance { get; } = new StubFileVersionProvider();
-
-            public string AddFileVersionToPath(PathString requestPathBase, string path)
-            {
-                return path;
-            }
+            _configureManifestAction?.Invoke(options);
         }
+    }
+
+    private sealed class StubFileVersionProvider : IFileVersionProvider
+    {
+        public static StubFileVersionProvider Instance { get; } = new StubFileVersionProvider();
 
-        #endregion
+        public string AddFileVersionToPath(PathString requestPathBase, string path)
+        {
+            return path;
+        }
     }
+
+    #endregion
 }
diff --git a/test/OrchardCore.Tests/Routing/AutorouteEntriesTests.cs b/test/OrchardCore.Tests/Routing/AutorouteEntriesTests.cs
index b9dc80f0c85..35d32d4f48a 100644
--- a/test/OrchardCore.Tests/Routing/AutorouteEntriesTests.cs
+++ b/test/OrchardCore.Tests/Routing/AutorouteEntriesTests.cs
@@ -5,254 +5,253 @@
 using OrchardCore.Locking;
 using OrchardCore.Locking.Distributed;
 
-namespace OrchardCore.Tests.Routing
+namespace OrchardCore.Tests.Routing;
+
+public class AutorouteEntriesTests
 {
-    public class AutorouteEntriesTests
+    [Fact]
+    public async Task ShouldGetContainedEntryByPath()
     {
-        [Fact]
-        public async Task ShouldGetContainedEntryByPath()
+        // Setup
+        var shellContext = CreateShellContext();
+
+        await (await shellContext.CreateScopeAsync()).UsingAsync(scope =>
         {
-            // Setup
-            var shellContext = CreateShellContext();
+            var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
 
-            await (await shellContext.CreateScopeAsync()).UsingAsync(scope =>
+            // Act
+            var initialEntries = new List<AutorouteEntry>()
             {
-                var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
+                new("container", "container-path"),
+                new("container", "contained-path", "contained")
+            };
 
-                // Act
-                var initialEntries = new List<AutorouteEntry>()
-                {
-                    new("container", "container-path"),
-                    new("container", "contained-path", "contained")
-                };
+            entries.AddEntries(initialEntries);
 
-                entries.AddEntries(initialEntries);
+            return Task.CompletedTask;
+        });
 
-                return Task.CompletedTask;
-            });
+        await (await shellContext.CreateScopeAsync()).UsingAsync(async scope =>
+        {
+            var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
 
-            await (await shellContext.CreateScopeAsync()).UsingAsync(async scope =>
-            {
-                var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
+            // Test
+            (var result, var containedEntry) = await entries.TryGetEntryByPathAsync("/contained-path");
 
-                // Test
-                (var result, var containedEntry) = await entries.TryGetEntryByPathAsync("/contained-path");
+            Assert.True(result);
+            Assert.Equal("contained", containedEntry.ContainedContentItemId);
+        });
+    }
 
-                Assert.True(result);
-                Assert.Equal("contained", containedEntry.ContainedContentItemId);
-            });
-        }
+    [Fact]
+    public async Task ShouldGetEntryByContainedContentItemId()
+    {
+        // Setup
+        var shellContext = CreateShellContext();
 
-        [Fact]
-        public async Task ShouldGetEntryByContainedContentItemId()
+        await (await shellContext.CreateScopeAsync()).UsingAsync(scope =>
         {
-            // Setup
-            var shellContext = CreateShellContext();
+            var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
 
-            await (await shellContext.CreateScopeAsync()).UsingAsync(scope =>
+            // Act
+            var initialEntries = new List<AutorouteEntry>()
             {
-                var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
+                new("container", "container-path"),
+                new("container", "contained-path", "contained")
+            };
 
-                // Act
-                var initialEntries = new List<AutorouteEntry>()
-                {
-                    new("container", "container-path"),
-                    new("container", "contained-path", "contained")
-                };
+            entries.AddEntries(initialEntries);
 
-                entries.AddEntries(initialEntries);
+            return Task.CompletedTask;
+        });
 
-                return Task.CompletedTask;
-            });
+        await (await shellContext.CreateScopeAsync()).UsingAsync(async scope =>
+        {
+            var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
 
-            await (await shellContext.CreateScopeAsync()).UsingAsync(async scope =>
-            {
-                var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
+            // Test
+            (var result, var containedEntry) = await entries.TryGetEntryByContentItemIdAsync("contained");
 
-                // Test
-                (var result, var containedEntry) = await entries.TryGetEntryByContentItemIdAsync("contained");
+            Assert.True(result);
+            Assert.Equal("/contained-path", containedEntry.Path);
+        });
+    }
 
-                Assert.True(result);
-                Assert.Equal("/contained-path", containedEntry.Path);
-            });
-        }
+    [Fact]
+    public async Task RemovesContainedEntriesWhenContainerRemoved()
+    {
+        // Setup
+        var shellContext = CreateShellContext();
 
-        [Fact]
-        public async Task RemovesContainedEntriesWhenContainerRemoved()
+        await (await shellContext.CreateScopeAsync()).UsingAsync(scope =>
         {
-            // Setup
-            var shellContext = CreateShellContext();
+            var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
 
-            await (await shellContext.CreateScopeAsync()).UsingAsync(scope =>
+            // Act
+            var initialEntries = new List<AutorouteEntry>()
             {
-                var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
+                new("container", "container-path"),
+                new("container", "contained-path", "contained")
+            };
 
-                // Act
-                var initialEntries = new List<AutorouteEntry>()
-                {
-                    new("container", "container-path"),
-                    new("container", "contained-path", "contained")
-                };
+            entries.AddEntries(initialEntries);
 
-                entries.AddEntries(initialEntries);
+            entries.RemoveEntries(new[] { new AutorouteEntry("container", "container-path", null, null) });
 
-                entries.RemoveEntries(new[] { new AutorouteEntry("container", "container-path", null, null) });
+            return Task.CompletedTask;
+        });
 
-                return Task.CompletedTask;
-            });
+        await (await shellContext.CreateScopeAsync()).UsingAsync(async scope =>
+        {
+            var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
 
-            await (await shellContext.CreateScopeAsync()).UsingAsync(async scope =>
-            {
-                var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
+            // Test
+            (var result, var containedEntry) = await entries.TryGetEntryByPathAsync("/contained-path");
 
-                // Test
-                (var result, var containedEntry) = await entries.TryGetEntryByPathAsync("/contained-path");
+            Assert.False(result);
+        });
+    }
 
-                Assert.False(result);
-            });
-        }
+    [Fact]
+    public async Task RemovesContainedEntriesWhenDeleted()
+    {
+        // Setup
+        var shellContext = CreateShellContext();
 
-        [Fact]
-        public async Task RemovesContainedEntriesWhenDeleted()
+        await (await shellContext.CreateScopeAsync()).UsingAsync(scope =>
         {
-            // Setup
-            var shellContext = CreateShellContext();
+            var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
 
-            await (await shellContext.CreateScopeAsync()).UsingAsync(scope =>
+            // Act
+            var initialEntries = new List<AutorouteEntry>()
             {
-                var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
+                new("container", "container-path"),
+                new("container", "contained-path1", "contained1"),
+                new("container", "contained-path2", "contained2")
+            };
 
-                // Act
-                var initialEntries = new List<AutorouteEntry>()
-                {
-                    new("container", "container-path"),
-                    new("container", "contained-path1", "contained1"),
-                    new("container", "contained-path2", "contained2")
-                };
+            entries.AddEntries(initialEntries);
 
-                entries.AddEntries(initialEntries);
+            var updatedEntries = new List<AutorouteEntry>()
+            {
+                new("container", "container-path"),
+                new("container", "contained-path1", "contained1")
+            };
 
-                var updatedEntries = new List<AutorouteEntry>()
-                {
-                    new("container", "container-path"),
-                    new("container", "contained-path1", "contained1")
-                };
+            entries.AddEntries(updatedEntries);
 
-                entries.AddEntries(updatedEntries);
+            return Task.CompletedTask;
+        });
 
-                return Task.CompletedTask;
-            });
+        await (await shellContext.CreateScopeAsync()).UsingAsync(async scope =>
+        {
+            var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
 
-            await (await shellContext.CreateScopeAsync()).UsingAsync(async scope =>
-            {
-                var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
+            // Test
+            (var result, var containedEntry) = await entries.TryGetEntryByPathAsync("/contained-path2");
 
-                // Test
-                (var result, var containedEntry) = await entries.TryGetEntryByPathAsync("/contained-path2");
+            Assert.False(result);
+        });
+    }
 
-                Assert.False(result);
-            });
-        }
+    [Fact]
+    public async Task RemovesOldContainedPaths()
+    {
+        // Setup
+        var shellContext = CreateShellContext();
 
-        [Fact]
-        public async Task RemovesOldContainedPaths()
+        await (await shellContext.CreateScopeAsync()).UsingAsync(scope =>
         {
-            // Setup
-            var shellContext = CreateShellContext();
+            var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
 
-            await (await shellContext.CreateScopeAsync()).UsingAsync(scope =>
+            // Act
+            var initialEntries = new List<AutorouteEntry>()
             {
-                var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
+                new("container", "container-path"),
+                new("container", "contained-path-old", "contained")
+            };
 
-                // Act
-                var initialEntries = new List<AutorouteEntry>()
-                {
-                    new("container", "container-path"),
-                    new("container", "contained-path-old", "contained")
-                };
+            entries.AddEntries(initialEntries);
 
-                entries.AddEntries(initialEntries);
+            var updatedEntries = new List<AutorouteEntry>()
+            {
+                new("container", "container-path"),
+                new("container", "contained-path-new", "contained")
+            };
 
-                var updatedEntries = new List<AutorouteEntry>()
-                {
-                    new("container", "container-path"),
-                    new("container", "contained-path-new", "contained")
-                };
+            entries.AddEntries(updatedEntries);
 
-                entries.AddEntries(updatedEntries);
+            return Task.CompletedTask;
+        });
 
-                return Task.CompletedTask;
-            });
+        await (await shellContext.CreateScopeAsync()).UsingAsync(async scope =>
+        {
+            var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
 
-            await (await shellContext.CreateScopeAsync()).UsingAsync(async scope =>
-            {
-                var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
+            // Test
+            (var result, var containedEntry) = await entries.TryGetEntryByPathAsync("/contained-path-old");
 
-                // Test
-                (var result, var containedEntry) = await entries.TryGetEntryByPathAsync("/contained-path-old");
+            Assert.False(result);
+        });
+    }
 
-                Assert.False(result);
-            });
-        }
+    [Fact]
+    public async Task RemovesOldPaths()
+    {
+        // Setup
+        var shellContext = CreateShellContext();
 
-        [Fact]
-        public async Task RemovesOldPaths()
+        await (await shellContext.CreateScopeAsync()).UsingAsync(scope =>
         {
-            // Setup
-            var shellContext = CreateShellContext();
-
-            await (await shellContext.CreateScopeAsync()).UsingAsync(scope =>
-            {
-                var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
+            var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
 
-                // Act
-                entries.AddEntries(new[] { new AutorouteEntry("container", "container-path", null, null) });
+            // Act
+            entries.AddEntries(new[] { new AutorouteEntry("container", "container-path", null, null) });
 
-                entries.RemoveEntries(new[] { new AutorouteEntry("container", "container-path", null, null) });
+            entries.RemoveEntries(new[] { new AutorouteEntry("container", "container-path", null, null) });
 
-                return Task.CompletedTask;
-            });
+            return Task.CompletedTask;
+        });
 
-            await (await shellContext.CreateScopeAsync()).UsingAsync(async scope =>
-            {
-                var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
+        await (await shellContext.CreateScopeAsync()).UsingAsync(async scope =>
+        {
+            var entries = scope.ServiceProvider.GetRequiredService<IStubAutorouteEntries>();
 
-                // Test
-                (var result, var containedEntry) = await entries.TryGetEntryByPathAsync("/container-path");
+            // Test
+            (var result, var containedEntry) = await entries.TryGetEntryByPathAsync("/container-path");
 
-                Assert.False(result);
-            });
-        }
+            Assert.False(result);
+        });
+    }
 
-        private static ShellContext CreateShellContext()
+    private static ShellContext CreateShellContext()
+    {
+        return new ShellContext()
         {
-            return new ShellContext()
-            {
-                Settings = new ShellSettings().AsDefaultShell().AsRunning(),
-                ServiceProvider = CreateServiceProvider()
-            };
-        }
+            Settings = new ShellSettings().AsDefaultShell().AsRunning(),
+            ServiceProvider = CreateServiceProvider()
+        };
+    }
 
-        private static ServiceProvider CreateServiceProvider()
-        {
-            var services = new ServiceCollection();
-            services.AddSingleton<IStubAutorouteEntries, StubAutorouteEntries>();
-            services.AddSingleton<IDistributedLock, LocalLock>();
-            return services.AddLogging().BuildServiceProvider();
-        }
+    private static ServiceProvider CreateServiceProvider()
+    {
+        var services = new ServiceCollection();
+        services.AddSingleton<IStubAutorouteEntries, StubAutorouteEntries>();
+        services.AddSingleton<IDistributedLock, LocalLock>();
+        return services.AddLogging().BuildServiceProvider();
+    }
 
-        public interface IStubAutorouteEntries : IAutorouteEntries
-        {
-            void AddEntries(IEnumerable<AutorouteEntry> entries);
-            void RemoveEntries(IEnumerable<AutorouteEntry> entries);
-        }
+    public interface IStubAutorouteEntries : IAutorouteEntries
+    {
+        void AddEntries(IEnumerable<AutorouteEntry> entries);
+        void RemoveEntries(IEnumerable<AutorouteEntry> entries);
+    }
 
-        private sealed class StubAutorouteEntries : AutorouteEntries, IStubAutorouteEntries
-        {
-            public StubAutorouteEntries() : base(null) { }
-            public new void AddEntries(IEnumerable<AutorouteEntry> entries) => base.AddEntries(entries);
-            public new void RemoveEntries(IEnumerable<AutorouteEntry> entries) => base.RemoveEntries(entries);
-            protected override Task InitializeEntriesAsync() => Task.CompletedTask;
-        }
+    private sealed class StubAutorouteEntries : AutorouteEntries, IStubAutorouteEntries
+    {
+        public StubAutorouteEntries() : base(null) { }
+        public new void AddEntries(IEnumerable<AutorouteEntry> entries) => base.AddEntries(entries);
+        public new void RemoveEntries(IEnumerable<AutorouteEntry> entries) => base.RemoveEntries(entries);
+        protected override Task InitializeEntriesAsync() => Task.CompletedTask;
     }
 }
diff --git a/test/OrchardCore.Tests/Security/PermissionHandlerHelper.cs b/test/OrchardCore.Tests/Security/PermissionHandlerHelper.cs
index 86f6609d3c9..c0e25b4bc81 100644
--- a/test/OrchardCore.Tests/Security/PermissionHandlerHelper.cs
+++ b/test/OrchardCore.Tests/Security/PermissionHandlerHelper.cs
@@ -1,56 +1,55 @@
 using OrchardCore.Security;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Tests.Security
+namespace OrchardCore.Tests.Security;
+
+public static class PermissionHandlerHelper
 {
-    public static class PermissionHandlerHelper
+    public static AuthorizationHandlerContext CreateTestAuthorizationHandlerContext(Permission required, string[] allowed = null, bool authenticated = false, object resource = null)
     {
-        public static AuthorizationHandlerContext CreateTestAuthorizationHandlerContext(Permission required, string[] allowed = null, bool authenticated = false, object resource = null)
-        {
-            var identity = authenticated ? new ClaimsIdentity("Test") : new ClaimsIdentity();
+        var identity = authenticated ? new ClaimsIdentity("Test") : new ClaimsIdentity();
 
-            if (allowed != null)
+        if (allowed != null)
+        {
+            foreach (var permissionName in allowed)
             {
-                foreach (var permissionName in allowed)
-                {
-                    var permission = new Permission(permissionName);
-                    identity.AddClaim(permission);
-                }
-
+                var permission = new Permission(permissionName);
+                identity.AddClaim(permission);
             }
 
-            var principal = new ClaimsPrincipal(identity);
-
-            return new AuthorizationHandlerContext(
-                new[] { new PermissionRequirement(required) },
-                principal,
-                resource);
         }
 
-        public static async Task SuccessAsync(this AuthorizationHandlerContext context, params string[] permissionNames)
+        var principal = new ClaimsPrincipal(identity);
+
+        return new AuthorizationHandlerContext(
+            new[] { new PermissionRequirement(required) },
+            principal,
+            resource);
+    }
+
+    public static async Task SuccessAsync(this AuthorizationHandlerContext context, params string[] permissionNames)
+    {
+        var handler = new FakePermissionHandler(permissionNames);
+        await handler.HandleAsync(context);
+    }
+
+    private sealed class FakePermissionHandler : AuthorizationHandler<PermissionRequirement>
+    {
+        private readonly HashSet<string> _permissionNames;
+
+        public FakePermissionHandler(string[] permissionNames)
         {
-            var handler = new FakePermissionHandler(permissionNames);
-            await handler.HandleAsync(context);
+            _permissionNames = new HashSet<string>(permissionNames, StringComparer.OrdinalIgnoreCase);
         }
 
-        private sealed class FakePermissionHandler : AuthorizationHandler<PermissionRequirement>
+        protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement)
         {
-            private readonly HashSet<string> _permissionNames;
-
-            public FakePermissionHandler(string[] permissionNames)
+            if (_permissionNames.Contains(requirement.Permission.Name))
             {
-                _permissionNames = new HashSet<string>(permissionNames, StringComparer.OrdinalIgnoreCase);
+                context.Succeed(requirement);
             }
 
-            protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement)
-            {
-                if (_permissionNames.Contains(requirement.Permission.Name))
-                {
-                    context.Succeed(requirement);
-                }
-
-                return Task.CompletedTask;
-            }
+            return Task.CompletedTask;
         }
     }
 }
diff --git a/test/OrchardCore.Tests/Security/PermissionHandlerTests.cs b/test/OrchardCore.Tests/Security/PermissionHandlerTests.cs
index 508fee2ff7b..1b0212d55f6 100644
--- a/test/OrchardCore.Tests/Security/PermissionHandlerTests.cs
+++ b/test/OrchardCore.Tests/Security/PermissionHandlerTests.cs
@@ -2,94 +2,93 @@
 using OrchardCore.Security.AuthorizationHandlers;
 using OrchardCore.Security.Permissions;
 
-namespace OrchardCore.Tests.Security
+namespace OrchardCore.Tests.Security;
+
+public class PermissionHandlerTests
 {
-    public class PermissionHandlerTests
+    [Theory]
+    [InlineData("Allowed", true)]
+    [InlineData("NotAllowed", false)]
+    public async Task GrantsClaimsPermissions(string required, bool success)
+    {
+        // Arrange
+        var context = PermissionHandlerHelper.CreateTestAuthorizationHandlerContext(new Permission(required), ["Allowed"], true);
+        var permissionHandler = CreatePermissionHandler();
+
+        // Act
+        await permissionHandler.HandleAsync(context);
+
+        // Assert
+        Assert.Equal(success, context.HasSucceeded);
+    }
+
+    [Fact]
+    public async Task DontRevokeExistingGrants()
+    {
+        // Arrange
+        var context = PermissionHandlerHelper.CreateTestAuthorizationHandlerContext(new Permission("Required"), ["Other"], true);
+        var permissionHandler = CreatePermissionHandler();
+
+        await context.SuccessAsync("Required");
+
+        // Act
+        await permissionHandler.HandleAsync(context);
+
+        // Assert
+        Assert.True(context.HasSucceeded);
+    }
+
+    [Fact]
+    public async Task DontHandleNonAuthenticated()
+    {
+        // Arrange
+        var context = PermissionHandlerHelper.CreateTestAuthorizationHandlerContext(new Permission("Allowed"), ["Allowed"]);
+        var permissionHandler = CreatePermissionHandler();
+
+        // Act
+        await permissionHandler.HandleAsync(context);
+
+        // Assert
+        Assert.False(context.HasSucceeded);
+    }
+
+    [Fact]
+    public async Task GrantsInheritedPermissions()
+    {
+        // Arrange
+        var level2 = new Permission("Implicit2");
+        var level1 = new Permission("Implicit1", "Foo", new[] { level2 });
+        var required = new Permission("Required", "Foo", new[] { level1 });
+
+        var context = PermissionHandlerHelper.CreateTestAuthorizationHandlerContext(required, ["Implicit2"], true);
+        var permissionHandler = CreatePermissionHandler();
+
+        // Act
+        await permissionHandler.HandleAsync(context);
+
+        // Assert
+        Assert.True(context.HasSucceeded);
+    }
+
+    [Fact]
+    public async Task IsCaseInsensitive()
+    {
+        // Arrange
+        var required = new Permission("required");
+
+        var context = PermissionHandlerHelper.CreateTestAuthorizationHandlerContext(required, ["ReQuIrEd"], true);
+        var permissionHandler = CreatePermissionHandler();
+
+        // Act
+        await permissionHandler.HandleAsync(context);
+
+        // Assert
+        Assert.True(context.HasSucceeded);
+    }
+
+    private static PermissionHandler CreatePermissionHandler()
     {
-        [Theory]
-        [InlineData("Allowed", true)]
-        [InlineData("NotAllowed", false)]
-        public async Task GrantsClaimsPermissions(string required, bool success)
-        {
-            // Arrange
-            var context = PermissionHandlerHelper.CreateTestAuthorizationHandlerContext(new Permission(required), ["Allowed"], true);
-            var permissionHandler = CreatePermissionHandler();
-
-            // Act
-            await permissionHandler.HandleAsync(context);
-
-            // Assert
-            Assert.Equal(success, context.HasSucceeded);
-        }
-
-        [Fact]
-        public async Task DontRevokeExistingGrants()
-        {
-            // Arrange
-            var context = PermissionHandlerHelper.CreateTestAuthorizationHandlerContext(new Permission("Required"), ["Other"], true);
-            var permissionHandler = CreatePermissionHandler();
-
-            await context.SuccessAsync("Required");
-
-            // Act
-            await permissionHandler.HandleAsync(context);
-
-            // Assert
-            Assert.True(context.HasSucceeded);
-        }
-
-        [Fact]
-        public async Task DontHandleNonAuthenticated()
-        {
-            // Arrange
-            var context = PermissionHandlerHelper.CreateTestAuthorizationHandlerContext(new Permission("Allowed"), ["Allowed"]);
-            var permissionHandler = CreatePermissionHandler();
-
-            // Act
-            await permissionHandler.HandleAsync(context);
-
-            // Assert
-            Assert.False(context.HasSucceeded);
-        }
-
-        [Fact]
-        public async Task GrantsInheritedPermissions()
-        {
-            // Arrange
-            var level2 = new Permission("Implicit2");
-            var level1 = new Permission("Implicit1", "Foo", new[] { level2 });
-            var required = new Permission("Required", "Foo", new[] { level1 });
-
-            var context = PermissionHandlerHelper.CreateTestAuthorizationHandlerContext(required, ["Implicit2"], true);
-            var permissionHandler = CreatePermissionHandler();
-
-            // Act
-            await permissionHandler.HandleAsync(context);
-
-            // Assert
-            Assert.True(context.HasSucceeded);
-        }
-
-        [Fact]
-        public async Task IsCaseInsensitive()
-        {
-            // Arrange
-            var required = new Permission("required");
-
-            var context = PermissionHandlerHelper.CreateTestAuthorizationHandlerContext(required, ["ReQuIrEd"], true);
-            var permissionHandler = CreatePermissionHandler();
-
-            // Act
-            await permissionHandler.HandleAsync(context);
-
-            // Assert
-            Assert.True(context.HasSucceeded);
-        }
-
-        private static PermissionHandler CreatePermissionHandler()
-        {
-            var permissionGrantingService = new DefaultPermissionGrantingService();
-            return new PermissionHandler(permissionGrantingService);
-        }
+        var permissionGrantingService = new DefaultPermissionGrantingService();
+        return new PermissionHandler(permissionGrantingService);
     }
 }
diff --git a/test/OrchardCore.Tests/Shell/RunningShellTableTests.cs b/test/OrchardCore.Tests/Shell/RunningShellTableTests.cs
index ea9d54feadc..4745bdea881 100644
--- a/test/OrchardCore.Tests/Shell/RunningShellTableTests.cs
+++ b/test/OrchardCore.Tests/Shell/RunningShellTableTests.cs
@@ -1,343 +1,342 @@
 using OrchardCore.Environment.Shell;
 
-namespace OrchardCore.Tests.Shell
+namespace OrchardCore.Tests.Shell;
+
+public class RunningShellTableTests
 {
-    public class RunningShellTableTests
+    [Fact]
+    public void NoShellsGiveNoMatch()
+    {
+        var table = new RunningShellTable();
+        var match = table.Match(new HostString("localhost"), "/yadda");
+        Assert.Null(match);
+    }
+
+    [Fact]
+    public void DefaultShellMatchesByDefault()
+    {
+        var table = new RunningShellTable();
+        var settings = new ShellSettings().AsDefaultShell();
+        table.Add(settings);
+        var match = table.Match(new HostString("localhost"), "/yadda");
+        Assert.Equal(settings, match);
+    }
+
+    [Fact]
+    public void DefaultShellMatchesAllPortsByDefault()
+    {
+        var table = new RunningShellTable();
+        var settings = new ShellSettings().AsDefaultShell();
+        table.Add(settings);
+        var match = table.Match(new HostString("localhost:443"), "/yadda");
+        Assert.Equal(settings, match);
+    }
+
+    [Fact]
+    public void AnotherShellMatchesByHostHeader()
+    {
+        var table = new RunningShellTable();
+        var settings = new ShellSettings().AsDefaultShell();
+        var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "a.example.com" };
+        table.Add(settings);
+        table.Add(settingsA);
+        var match = table.Match(new HostString("a.example.com"), "/foo/bar");
+        Assert.Equal(settingsA, match);
+    }
+
+    [Fact]
+    public void DefaultStillCatchesWhenOtherShellsMiss()
+    {
+        var table = new RunningShellTable();
+        var settings = new ShellSettings().AsDefaultShell();
+        var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "a.example.com" };
+        table.Add(settings);
+        table.Add(settingsA);
+        var match = table.Match(new HostString("b.example.com"), "/foo/bar");
+        Assert.Equal(settings, match);
+    }
+
+    [Fact]
+    public void DefaultWontFallbackIfItHasCriteria()
+    {
+        var table = new RunningShellTable();
+        var settings = new ShellSettings { RequestUrlHost = "www.example.com" }.AsDefaultShell();
+        var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "a.example.com" };
+        table.Add(settings);
+        table.Add(settingsA);
+        var match = table.Match(new HostString("b.example.com"), "/foo/bar");
+        Assert.Null(match);
+    }
+
+    [Fact]
+    public void DefaultWillCatchRequestsIfItMatchesCriteria()
+    {
+        var table = new RunningShellTable();
+        var settings = new ShellSettings { RequestUrlHost = "www.example.com" }.AsDefaultShell();
+        var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "a.example.com" };
+        table.Add(settings);
+        table.Add(settingsA);
+        var match = table.Match(new HostString("www.example.com"), "/foo/bar");
+        Assert.Equal(settings, match);
+    }
+
+    [Fact]
+    public void NonDefaultCatchallWillFallbackIfNothingElseMatches()
+    {
+        var table = new RunningShellTable();
+        var settings = new ShellSettings { RequestUrlHost = "www.example.com" }.AsDefaultShell();
+        var settingsA = new ShellSettings { Name = "Alpha" };
+        table.Add(settings);
+        table.Add(settingsA);
+        var match = table.Match(new HostString("b.example.com"), "/foo/bar");
+        Assert.Equal(settingsA, match);
+    }
+
+    [Fact]
+    public void DefaultCatchallIsFallbackEvenWhenOthersAreUnqualified()
+    {
+        var table = new RunningShellTable();
+        var settings = new ShellSettings().AsDefaultShell();
+        var settingsA = new ShellSettings { Name = "Alpha" };
+        var settingsB = new ShellSettings { Name = "Beta", RequestUrlHost = "b.example.com" };
+        var settingsG = new ShellSettings { Name = "Gamma" };
+        table.Add(settings);
+        table.Add(settingsA);
+        table.Add(settingsB);
+        table.Add(settingsG);
+        var match = table.Match(new HostString("a.example.com"), "/foo/bar");
+        Assert.Equal(settings, match);
+    }
+
+    [Fact]
+    public void PathAlsoCausesMatch()
+    {
+        var table = new RunningShellTable();
+        var settings = new ShellSettings().AsDefaultShell();
+        var settingsA = new ShellSettings { Name = "Alpha", RequestUrlPrefix = "foo" };
+        table.Add(settings);
+        table.Add(settingsA);
+        var match = table.Match(new HostString("a.example.com"), "/foo/bar");
+        Assert.Equal(settingsA, match);
+    }
+
+    [Fact]
+    public void PathAndHostMustBothMatch()
+    {
+        var table = new RunningShellTable();
+        var settings = new ShellSettings { RequestUrlHost = "www.example.com" }.AsDefaultShell();
+        var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "wiki.example.com", RequestUrlPrefix = "foo" };
+        var settingsB = new ShellSettings { Name = "Beta", RequestUrlHost = "wiki.example.com", RequestUrlPrefix = "bar" };
+        var settingsG = new ShellSettings { Name = "Gamma", RequestUrlHost = "wiki.example.com" };
+        var settingsD = new ShellSettings { Name = "Delta", RequestUrlPrefix = "Quux" };
+        table.Add(settings);
+        table.Add(settingsA);
+        table.Add(settingsB);
+        table.Add(settingsG);
+        table.Add(settingsD);
+
+        Assert.Equal(settingsA, table.Match(new HostString("wiki.example.com"), "/foo/bar"));
+        Assert.Equal(settingsB, table.Match(new HostString("wiki.example.com"), "/bar/foo"));
+        Assert.Equal(settingsG, table.Match(new HostString("wiki.example.com"), "/"));
+        Assert.Equal(settingsG, table.Match(new HostString("wiki.example.com"), "/baaz"));
+        Assert.Equal(settings, table.Match(new HostString("www.example.com"), "/foo/bar"));
+        Assert.Equal(settings, table.Match(new HostString("www.example.com"), "/bar/foo"));
+        Assert.Equal(settings, table.Match(new HostString("www.example.com"), "/baaz"));
+        Assert.Null(table.Match(new HostString("a.example.com"), "/foo/bar"));
+
+        Assert.Equal(settingsG, table.Match(new HostString("wiki.example.com"), "/quux/quad"));
+        Assert.Equal(settings, table.Match(new HostString("www.example.com"), "/quux/quad"));
+        Assert.Equal(settingsD, table.Match(new HostString("a.example.com"), "/quux/quad"));
+        Assert.Equal(settingsG, table.Match(new HostString("wiki.example.com"), "/yarg"));
+        Assert.Equal(settings, table.Match(new HostString("www.example.com"), "/yarg"));
+        Assert.Null(table.Match(new HostString("a.example.com"), "/yarg"));
+    }
+
+    [Fact]
+    public void PathAndHostMustMatchOnFullUrl()
+    {
+        var table = new RunningShellTable();
+        var settings = new ShellSettings { RequestUrlHost = "www.example.com" }.AsDefaultShell();
+        var settingsB = new ShellSettings { Name = "Beta", RequestUrlHost = "wiki.example.com", RequestUrlPrefix = "bar" };
+        var settingsG = new ShellSettings { Name = "Gamma", RequestUrlHost = "wiki.example.com" };
+        table.Add(settings);
+        table.Add(settingsB);
+        table.Add(settingsG);
+
+        Assert.Equal(settingsB, table.Match(new HostString("wiki.example.com"), "/bar/foo"));
+        Assert.Equal(settingsG, table.Match(new HostString("wiki.example.com"), "/"));
+        Assert.Equal(settingsG, table.Match(new HostString("wiki.example.com"), "/baaz"));
+        Assert.Equal(settingsG, table.Match(new HostString("wiki.example.com"), "/barbaz"));
+    }
+    [Fact]
+    public void PathAloneWillMatch()
+    {
+        var table = new RunningShellTable();
+        var settingsA = new ShellSettings { Name = "Alpha", RequestUrlPrefix = "foo" };
+        table.Add(settingsA);
+
+        Assert.Equal(settingsA, table.Match(new HostString("wiki.example.com"), "/foo/bar"));
+        Assert.Null(table.Match(new HostString("wiki.example.com"), "/bar/foo"));
+    }
+
+    [Fact]
+    public void HostNameMatchesRightmostIfRequestIsLonger()
+    {
+        var table = new RunningShellTable();
+        var settings = new ShellSettings().AsDefaultShell();
+        var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "example.com" };
+        table.Add(settings);
+        table.Add(settingsA);
+        Assert.Equal(settings, table.Match(new HostString("www.example.com"), "/foo/bar"));
+        Assert.Equal(settings, table.Match(new HostString("wiki.example.com"), "/foo/bar"));
+        Assert.Equal(settingsA, table.Match(new HostString("example.com"), "/foo/bar"));
+        Assert.Equal(settings, table.Match(new HostString("localhost"), "/foo/bar"));
+    }
+
+    [Fact]
+    public void HostNameMatchesRightmostIfStar()
+    {
+        var table = new RunningShellTable();
+        var settings = new ShellSettings().AsDefaultShell();
+        var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "*.example.com" };
+        table.Add(settings);
+        table.Add(settingsA);
+        Assert.Equal(settingsA, table.Match(new HostString("www.example.com"), "/foo/bar"));
+        Assert.Equal(settingsA, table.Match(new HostString("wiki.example.com"), "/foo/bar"));
+        Assert.Equal(settingsA, table.Match(new HostString("example.com"), "/foo/bar"));
+        Assert.Equal(settings, table.Match(new HostString("localhost"), "/foo/bar"));
+    }
+
+    [Fact]
+    public void LongestMatchingHostHasPriority()
+    {
+        var table = new RunningShellTable();
+        var settings = new ShellSettings().AsDefaultShell();
+        var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "www.example.com" };
+        var settingsB = new ShellSettings { Name = "Beta", RequestUrlHost = "*.example.com" };
+        var settingsG = new ShellSettings { Name = "Gamma", RequestUrlHost = "wiki.example.com" };
+        table.Add(settings);
+        table.Add(settingsA);
+        table.Add(settingsB);
+        table.Add(settingsG);
+
+        Assert.Equal(settingsA, table.Match(new HostString("www.example.com"), "/foo/bar"));
+        Assert.Equal(settingsG, table.Match(new HostString("wiki.example.com"), "/foo/bar"));
+        Assert.Equal(settingsB, table.Match(new HostString("username.example.com"), "/foo/bar"));
+        Assert.Equal(settings, table.Match(new HostString("localhost"), "/foo/bar"));
+    }
+
+    [Fact]
+    public void ShellNameUsedToDistinctThingsAsTheyAreAdded()
+    {
+        var table = new RunningShellTable();
+        var settings = new ShellSettings().AsDefaultShell();
+        var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "removed.example.com" };
+        var settingsB = new ShellSettings { Name = "Alpha", RequestUrlHost = "added.example.com" };
+        table.Add(settings);
+        table.Add(settingsA);
+        table.Remove(settingsA);
+        table.Add(settingsB);
+
+        Assert.Equal(settings, table.Match(new HostString("removed.example.com"), "/foo/bar"));
+        Assert.Equal(settingsB, table.Match(new HostString("added.example.com"), "/foo/bar"));
+        Assert.Equal(settings, table.Match(new HostString("localhost"), "/foo/bar"));
+    }
+
+    [Fact]
+    public void MultipleHostsOnShellAreAdded()
+    {
+        var table = new RunningShellTable();
+        var settingsAlpha = new ShellSettings { Name = "Alpha", RequestUrlHost = "a.example.com,b.example.com" };
+        var settingsBeta = new ShellSettings { Name = "Beta", RequestUrlHost = "c.example.com,d.example.com,e.example.com" };
+        table.Add(settingsAlpha);
+        table.Add(settingsBeta);
+
+        Assert.Equal(settingsAlpha, table.Match(new HostString("a.example.com"), "/foo/bar"));
+        Assert.Equal(settingsAlpha, table.Match(new HostString("b.example.com"), "/foo/bar"));
+        Assert.Equal(settingsBeta, table.Match(new HostString("c.example.com"), "/foo/bar"));
+        Assert.Equal(settingsBeta, table.Match(new HostString("d.example.com"), "/foo/bar"));
+        Assert.Equal(settingsBeta, table.Match(new HostString("e.example.com"), "/foo/bar"));
+    }
+
+    [Fact]
+    public void HostContainsSpaces()
+    {
+        var table = new RunningShellTable();
+        var settingsAlpha = new ShellSettings { Name = "Alpha", RequestUrlHost = "   a.example.com,  b.example.com     " };
+        table.Add(settingsAlpha);
+
+        Assert.Equal(settingsAlpha, table.Match(new HostString("a.example.com"), "/foo/bar"));
+        Assert.Equal(settingsAlpha, table.Match(new HostString("b.example.com"), "/foo/bar"));
+    }
+
+    [Fact]
+    public void PortAreIgnoredIfNotSetInSettings()
+    {
+        var table = new RunningShellTable();
+        var settings = new ShellSettings().AsDefaultShell();
+        var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "a.example.com" };
+        table.Add(settings);
+        table.Add(settingsA);
+        Assert.Equal(settingsA, table.Match(new HostString("a.example.com:80"), "/foo/bar"));
+        Assert.Equal(settings, table.Match(new HostString("foo.com:80"), "/foo/bar"));
+    }
+
+    [Fact]
+    public void ShouldNotFallBackToDefault()
+    {
+        var table = new RunningShellTable();
+        var settings = new ShellSettings().AsDefaultShell();
+        var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "a.example.com" };
+        table.Add(settings);
+        table.Add(settingsA);
+        Assert.Equal(settingsA, table.Match(new HostString("a.example.com"), "/foo/bar"));
+        Assert.Equal(settings, table.Match(new HostString("foo.com"), "/foo/bar"));
+        Assert.Null(table.Match(new HostString("foo.com"), "/foo/bar", false));
+    }
+
+    [Fact]
+    public void PortAreNotIgnoredIfSetInSettings()
+    {
+        var table = new RunningShellTable();
+        var settings = new ShellSettings().AsDefaultShell();
+        var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "a.example.com:80" };
+        var settingsB = new ShellSettings { Name = "Beta", RequestUrlHost = "a.example.com:8080" };
+        table.Add(settings);
+        table.Add(settingsA);
+        table.Add(settingsB);
+        Assert.Equal(settingsA, table.Match(new HostString("a.example.com:80"), "/foo/bar"));
+        Assert.Equal(settingsB, table.Match(new HostString("a.example.com:8080"), "/foo/bar"));
+        Assert.Equal(settings, table.Match(new HostString("a.example.com:123"), "/foo/bar"));
+        Assert.Null(table.Match(new HostString("a.example.com:123"), "/foo/bar", false));
+    }
+
+    [Fact]
+    public void IPv6AddressesAreSupported()
     {
-        [Fact]
-        public void NoShellsGiveNoMatch()
-        {
-            var table = new RunningShellTable();
-            var match = table.Match(new HostString("localhost"), "/yadda");
-            Assert.Null(match);
-        }
-
-        [Fact]
-        public void DefaultShellMatchesByDefault()
-        {
-            var table = new RunningShellTable();
-            var settings = new ShellSettings().AsDefaultShell();
-            table.Add(settings);
-            var match = table.Match(new HostString("localhost"), "/yadda");
-            Assert.Equal(settings, match);
-        }
-
-        [Fact]
-        public void DefaultShellMatchesAllPortsByDefault()
-        {
-            var table = new RunningShellTable();
-            var settings = new ShellSettings().AsDefaultShell();
-            table.Add(settings);
-            var match = table.Match(new HostString("localhost:443"), "/yadda");
-            Assert.Equal(settings, match);
-        }
-
-        [Fact]
-        public void AnotherShellMatchesByHostHeader()
-        {
-            var table = new RunningShellTable();
-            var settings = new ShellSettings().AsDefaultShell();
-            var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "a.example.com" };
-            table.Add(settings);
-            table.Add(settingsA);
-            var match = table.Match(new HostString("a.example.com"), "/foo/bar");
-            Assert.Equal(settingsA, match);
-        }
-
-        [Fact]
-        public void DefaultStillCatchesWhenOtherShellsMiss()
-        {
-            var table = new RunningShellTable();
-            var settings = new ShellSettings().AsDefaultShell();
-            var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "a.example.com" };
-            table.Add(settings);
-            table.Add(settingsA);
-            var match = table.Match(new HostString("b.example.com"), "/foo/bar");
-            Assert.Equal(settings, match);
-        }
-
-        [Fact]
-        public void DefaultWontFallbackIfItHasCriteria()
-        {
-            var table = new RunningShellTable();
-            var settings = new ShellSettings { RequestUrlHost = "www.example.com" }.AsDefaultShell();
-            var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "a.example.com" };
-            table.Add(settings);
-            table.Add(settingsA);
-            var match = table.Match(new HostString("b.example.com"), "/foo/bar");
-            Assert.Null(match);
-        }
-
-        [Fact]
-        public void DefaultWillCatchRequestsIfItMatchesCriteria()
-        {
-            var table = new RunningShellTable();
-            var settings = new ShellSettings { RequestUrlHost = "www.example.com" }.AsDefaultShell();
-            var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "a.example.com" };
-            table.Add(settings);
-            table.Add(settingsA);
-            var match = table.Match(new HostString("www.example.com"), "/foo/bar");
-            Assert.Equal(settings, match);
-        }
-
-        [Fact]
-        public void NonDefaultCatchallWillFallbackIfNothingElseMatches()
-        {
-            var table = new RunningShellTable();
-            var settings = new ShellSettings { RequestUrlHost = "www.example.com" }.AsDefaultShell();
-            var settingsA = new ShellSettings { Name = "Alpha" };
-            table.Add(settings);
-            table.Add(settingsA);
-            var match = table.Match(new HostString("b.example.com"), "/foo/bar");
-            Assert.Equal(settingsA, match);
-        }
-
-        [Fact]
-        public void DefaultCatchallIsFallbackEvenWhenOthersAreUnqualified()
-        {
-            var table = new RunningShellTable();
-            var settings = new ShellSettings().AsDefaultShell();
-            var settingsA = new ShellSettings { Name = "Alpha" };
-            var settingsB = new ShellSettings { Name = "Beta", RequestUrlHost = "b.example.com" };
-            var settingsG = new ShellSettings { Name = "Gamma" };
-            table.Add(settings);
-            table.Add(settingsA);
-            table.Add(settingsB);
-            table.Add(settingsG);
-            var match = table.Match(new HostString("a.example.com"), "/foo/bar");
-            Assert.Equal(settings, match);
-        }
-
-        [Fact]
-        public void PathAlsoCausesMatch()
-        {
-            var table = new RunningShellTable();
-            var settings = new ShellSettings().AsDefaultShell();
-            var settingsA = new ShellSettings { Name = "Alpha", RequestUrlPrefix = "foo" };
-            table.Add(settings);
-            table.Add(settingsA);
-            var match = table.Match(new HostString("a.example.com"), "/foo/bar");
-            Assert.Equal(settingsA, match);
-        }
-
-        [Fact]
-        public void PathAndHostMustBothMatch()
-        {
-            var table = new RunningShellTable();
-            var settings = new ShellSettings { RequestUrlHost = "www.example.com" }.AsDefaultShell();
-            var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "wiki.example.com", RequestUrlPrefix = "foo" };
-            var settingsB = new ShellSettings { Name = "Beta", RequestUrlHost = "wiki.example.com", RequestUrlPrefix = "bar" };
-            var settingsG = new ShellSettings { Name = "Gamma", RequestUrlHost = "wiki.example.com" };
-            var settingsD = new ShellSettings { Name = "Delta", RequestUrlPrefix = "Quux" };
-            table.Add(settings);
-            table.Add(settingsA);
-            table.Add(settingsB);
-            table.Add(settingsG);
-            table.Add(settingsD);
-
-            Assert.Equal(settingsA, table.Match(new HostString("wiki.example.com"), "/foo/bar"));
-            Assert.Equal(settingsB, table.Match(new HostString("wiki.example.com"), "/bar/foo"));
-            Assert.Equal(settingsG, table.Match(new HostString("wiki.example.com"), "/"));
-            Assert.Equal(settingsG, table.Match(new HostString("wiki.example.com"), "/baaz"));
-            Assert.Equal(settings, table.Match(new HostString("www.example.com"), "/foo/bar"));
-            Assert.Equal(settings, table.Match(new HostString("www.example.com"), "/bar/foo"));
-            Assert.Equal(settings, table.Match(new HostString("www.example.com"), "/baaz"));
-            Assert.Null(table.Match(new HostString("a.example.com"), "/foo/bar"));
-
-            Assert.Equal(settingsG, table.Match(new HostString("wiki.example.com"), "/quux/quad"));
-            Assert.Equal(settings, table.Match(new HostString("www.example.com"), "/quux/quad"));
-            Assert.Equal(settingsD, table.Match(new HostString("a.example.com"), "/quux/quad"));
-            Assert.Equal(settingsG, table.Match(new HostString("wiki.example.com"), "/yarg"));
-            Assert.Equal(settings, table.Match(new HostString("www.example.com"), "/yarg"));
-            Assert.Null(table.Match(new HostString("a.example.com"), "/yarg"));
-        }
-
-        [Fact]
-        public void PathAndHostMustMatchOnFullUrl()
-        {
-            var table = new RunningShellTable();
-            var settings = new ShellSettings { RequestUrlHost = "www.example.com" }.AsDefaultShell();
-            var settingsB = new ShellSettings { Name = "Beta", RequestUrlHost = "wiki.example.com", RequestUrlPrefix = "bar" };
-            var settingsG = new ShellSettings { Name = "Gamma", RequestUrlHost = "wiki.example.com" };
-            table.Add(settings);
-            table.Add(settingsB);
-            table.Add(settingsG);
-
-            Assert.Equal(settingsB, table.Match(new HostString("wiki.example.com"), "/bar/foo"));
-            Assert.Equal(settingsG, table.Match(new HostString("wiki.example.com"), "/"));
-            Assert.Equal(settingsG, table.Match(new HostString("wiki.example.com"), "/baaz"));
-            Assert.Equal(settingsG, table.Match(new HostString("wiki.example.com"), "/barbaz"));
-        }
-        [Fact]
-        public void PathAloneWillMatch()
-        {
-            var table = new RunningShellTable();
-            var settingsA = new ShellSettings { Name = "Alpha", RequestUrlPrefix = "foo" };
-            table.Add(settingsA);
-
-            Assert.Equal(settingsA, table.Match(new HostString("wiki.example.com"), "/foo/bar"));
-            Assert.Null(table.Match(new HostString("wiki.example.com"), "/bar/foo"));
-        }
-
-        [Fact]
-        public void HostNameMatchesRightmostIfRequestIsLonger()
-        {
-            var table = new RunningShellTable();
-            var settings = new ShellSettings().AsDefaultShell();
-            var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "example.com" };
-            table.Add(settings);
-            table.Add(settingsA);
-            Assert.Equal(settings, table.Match(new HostString("www.example.com"), "/foo/bar"));
-            Assert.Equal(settings, table.Match(new HostString("wiki.example.com"), "/foo/bar"));
-            Assert.Equal(settingsA, table.Match(new HostString("example.com"), "/foo/bar"));
-            Assert.Equal(settings, table.Match(new HostString("localhost"), "/foo/bar"));
-        }
-
-        [Fact]
-        public void HostNameMatchesRightmostIfStar()
-        {
-            var table = new RunningShellTable();
-            var settings = new ShellSettings().AsDefaultShell();
-            var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "*.example.com" };
-            table.Add(settings);
-            table.Add(settingsA);
-            Assert.Equal(settingsA, table.Match(new HostString("www.example.com"), "/foo/bar"));
-            Assert.Equal(settingsA, table.Match(new HostString("wiki.example.com"), "/foo/bar"));
-            Assert.Equal(settingsA, table.Match(new HostString("example.com"), "/foo/bar"));
-            Assert.Equal(settings, table.Match(new HostString("localhost"), "/foo/bar"));
-        }
-
-        [Fact]
-        public void LongestMatchingHostHasPriority()
-        {
-            var table = new RunningShellTable();
-            var settings = new ShellSettings().AsDefaultShell();
-            var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "www.example.com" };
-            var settingsB = new ShellSettings { Name = "Beta", RequestUrlHost = "*.example.com" };
-            var settingsG = new ShellSettings { Name = "Gamma", RequestUrlHost = "wiki.example.com" };
-            table.Add(settings);
-            table.Add(settingsA);
-            table.Add(settingsB);
-            table.Add(settingsG);
-
-            Assert.Equal(settingsA, table.Match(new HostString("www.example.com"), "/foo/bar"));
-            Assert.Equal(settingsG, table.Match(new HostString("wiki.example.com"), "/foo/bar"));
-            Assert.Equal(settingsB, table.Match(new HostString("username.example.com"), "/foo/bar"));
-            Assert.Equal(settings, table.Match(new HostString("localhost"), "/foo/bar"));
-        }
-
-        [Fact]
-        public void ShellNameUsedToDistinctThingsAsTheyAreAdded()
-        {
-            var table = new RunningShellTable();
-            var settings = new ShellSettings().AsDefaultShell();
-            var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "removed.example.com" };
-            var settingsB = new ShellSettings { Name = "Alpha", RequestUrlHost = "added.example.com" };
-            table.Add(settings);
-            table.Add(settingsA);
-            table.Remove(settingsA);
-            table.Add(settingsB);
-
-            Assert.Equal(settings, table.Match(new HostString("removed.example.com"), "/foo/bar"));
-            Assert.Equal(settingsB, table.Match(new HostString("added.example.com"), "/foo/bar"));
-            Assert.Equal(settings, table.Match(new HostString("localhost"), "/foo/bar"));
-        }
-
-        [Fact]
-        public void MultipleHostsOnShellAreAdded()
-        {
-            var table = new RunningShellTable();
-            var settingsAlpha = new ShellSettings { Name = "Alpha", RequestUrlHost = "a.example.com,b.example.com" };
-            var settingsBeta = new ShellSettings { Name = "Beta", RequestUrlHost = "c.example.com,d.example.com,e.example.com" };
-            table.Add(settingsAlpha);
-            table.Add(settingsBeta);
-
-            Assert.Equal(settingsAlpha, table.Match(new HostString("a.example.com"), "/foo/bar"));
-            Assert.Equal(settingsAlpha, table.Match(new HostString("b.example.com"), "/foo/bar"));
-            Assert.Equal(settingsBeta, table.Match(new HostString("c.example.com"), "/foo/bar"));
-            Assert.Equal(settingsBeta, table.Match(new HostString("d.example.com"), "/foo/bar"));
-            Assert.Equal(settingsBeta, table.Match(new HostString("e.example.com"), "/foo/bar"));
-        }
-
-        [Fact]
-        public void HostContainsSpaces()
-        {
-            var table = new RunningShellTable();
-            var settingsAlpha = new ShellSettings { Name = "Alpha", RequestUrlHost = "   a.example.com,  b.example.com     " };
-            table.Add(settingsAlpha);
-
-            Assert.Equal(settingsAlpha, table.Match(new HostString("a.example.com"), "/foo/bar"));
-            Assert.Equal(settingsAlpha, table.Match(new HostString("b.example.com"), "/foo/bar"));
-        }
-
-        [Fact]
-        public void PortAreIgnoredIfNotSetInSettings()
-        {
-            var table = new RunningShellTable();
-            var settings = new ShellSettings().AsDefaultShell();
-            var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "a.example.com" };
-            table.Add(settings);
-            table.Add(settingsA);
-            Assert.Equal(settingsA, table.Match(new HostString("a.example.com:80"), "/foo/bar"));
-            Assert.Equal(settings, table.Match(new HostString("foo.com:80"), "/foo/bar"));
-        }
-
-        [Fact]
-        public void ShouldNotFallBackToDefault()
-        {
-            var table = new RunningShellTable();
-            var settings = new ShellSettings().AsDefaultShell();
-            var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "a.example.com" };
-            table.Add(settings);
-            table.Add(settingsA);
-            Assert.Equal(settingsA, table.Match(new HostString("a.example.com"), "/foo/bar"));
-            Assert.Equal(settings, table.Match(new HostString("foo.com"), "/foo/bar"));
-            Assert.Null(table.Match(new HostString("foo.com"), "/foo/bar", false));
-        }
-
-        [Fact]
-        public void PortAreNotIgnoredIfSetInSettings()
-        {
-            var table = new RunningShellTable();
-            var settings = new ShellSettings().AsDefaultShell();
-            var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "a.example.com:80" };
-            var settingsB = new ShellSettings { Name = "Beta", RequestUrlHost = "a.example.com:8080" };
-            table.Add(settings);
-            table.Add(settingsA);
-            table.Add(settingsB);
-            Assert.Equal(settingsA, table.Match(new HostString("a.example.com:80"), "/foo/bar"));
-            Assert.Equal(settingsB, table.Match(new HostString("a.example.com:8080"), "/foo/bar"));
-            Assert.Equal(settings, table.Match(new HostString("a.example.com:123"), "/foo/bar"));
-            Assert.Null(table.Match(new HostString("a.example.com:123"), "/foo/bar", false));
-        }
-
-        [Fact]
-        public void IPv6AddressesAreSupported()
-        {
-            var table = new RunningShellTable();
-            var settings = new ShellSettings().AsDefaultShell();
-            var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "[::abc]" };
-            var settingsB = new ShellSettings { Name = "Beta", RequestUrlHost = "[::1]:123" };
-
-            table.Add(settings);
-            table.Add(settingsA);
-            table.Add(settingsB);
-
-            Assert.Equal(settingsA, table.Match(new HostString("::abc"), "/foo/bar"));
-            Assert.Equal(settingsA, table.Match(new HostString("[::abc]"), "/foo/bar"));
-            Assert.Equal(settingsA, table.Match(new HostString("[::ABC]"), "/foo/bar"));
-            Assert.Equal(settingsA, table.Match(new HostString("[::abc]:"), "/foo/bar"));
-            Assert.Equal(settingsA, table.Match(new HostString("[::abc]:123"), "/foo/bar"));
-
-            Assert.Equal(settingsB, table.Match(new HostString("[::1]:123"), "/foo/bar"));
-
-            Assert.Equal(settings, table.Match(new HostString("[::1]:321"), "/foo/bar"));
-            Assert.Equal(settings, table.Match(new HostString("[::1]:"), "/foo/bar"));
-            Assert.Equal(settings, table.Match(new HostString("[::1]"), "/foo/bar"));
-            Assert.Equal(settings, table.Match(new HostString("::1"), "/foo/bar"));
-            Assert.Equal(settings, table.Match(new HostString(":"), "/foo/bar"));
-
-            Assert.Null(table.Match(new HostString("::1"), "/foo/bar", false));
-        }
+        var table = new RunningShellTable();
+        var settings = new ShellSettings().AsDefaultShell();
+        var settingsA = new ShellSettings { Name = "Alpha", RequestUrlHost = "[::abc]" };
+        var settingsB = new ShellSettings { Name = "Beta", RequestUrlHost = "[::1]:123" };
+
+        table.Add(settings);
+        table.Add(settingsA);
+        table.Add(settingsB);
+
+        Assert.Equal(settingsA, table.Match(new HostString("::abc"), "/foo/bar"));
+        Assert.Equal(settingsA, table.Match(new HostString("[::abc]"), "/foo/bar"));
+        Assert.Equal(settingsA, table.Match(new HostString("[::ABC]"), "/foo/bar"));
+        Assert.Equal(settingsA, table.Match(new HostString("[::abc]:"), "/foo/bar"));
+        Assert.Equal(settingsA, table.Match(new HostString("[::abc]:123"), "/foo/bar"));
+
+        Assert.Equal(settingsB, table.Match(new HostString("[::1]:123"), "/foo/bar"));
+
+        Assert.Equal(settings, table.Match(new HostString("[::1]:321"), "/foo/bar"));
+        Assert.Equal(settings, table.Match(new HostString("[::1]:"), "/foo/bar"));
+        Assert.Equal(settings, table.Match(new HostString("[::1]"), "/foo/bar"));
+        Assert.Equal(settings, table.Match(new HostString("::1"), "/foo/bar"));
+        Assert.Equal(settings, table.Match(new HostString(":"), "/foo/bar"));
+
+        Assert.Null(table.Match(new HostString("::1"), "/foo/bar", false));
     }
 }
diff --git a/test/OrchardCore.Tests/Shell/ShellContainerFactoryTests.cs b/test/OrchardCore.Tests/Shell/ShellContainerFactoryTests.cs
index 95d6418ec17..e5691cd936c 100644
--- a/test/OrchardCore.Tests/Shell/ShellContainerFactoryTests.cs
+++ b/test/OrchardCore.Tests/Shell/ShellContainerFactoryTests.cs
@@ -7,278 +7,277 @@
 using OrchardCore.Tests.Stubs;
 using StartupBase = OrchardCore.Modules.StartupBase;
 
-namespace OrchardCore.Tests.Shell
+namespace OrchardCore.Tests.Shell;
+
+public class ShellContainerFactoryTests
 {
-    public class ShellContainerFactoryTests
-    {
-        private static readonly ShellSettings _uninitializedDefaultShell = new ShellSettings()
-            .AsDefaultShell()
-            .AsUninitialized();
+    private static readonly ShellSettings _uninitializedDefaultShell = new ShellSettings()
+        .AsDefaultShell()
+        .AsUninitialized();
 
-        private readonly ShellContainerFactory _shellContainerFactory;
-        private readonly IServiceProvider _applicationServiceProvider;
+    private readonly ShellContainerFactory _shellContainerFactory;
+    private readonly IServiceProvider _applicationServiceProvider;
 
-        public ShellContainerFactoryTests()
-        {
-            var applicationServices = new ServiceCollection();
-            applicationServices.AddSingleton<ITypeFeatureProvider, TypeFeatureProvider>();
+    public ShellContainerFactoryTests()
+    {
+        var applicationServices = new ServiceCollection();
+        applicationServices.AddSingleton<ITypeFeatureProvider, TypeFeatureProvider>();
 
-            applicationServices.AddSingleton<ITestSingleton, TestSingleton>();
-            applicationServices.AddTransient<ITestTransient, TestTransient>();
-            applicationServices.AddScoped<ITestScoped, TestScoped>();
+        applicationServices.AddSingleton<ITestSingleton, TestSingleton>();
+        applicationServices.AddTransient<ITestTransient, TestTransient>();
+        applicationServices.AddScoped<ITestScoped, TestScoped>();
 
-            applicationServices.AddSingleton<ITwoHostSingletonsOfTheSameType, FirstHostSingletonsOfTheSameType>();
-            applicationServices.AddSingleton<ITwoHostSingletonsOfTheSameType, SecondHostSingletonsOfTheSameType>();
+        applicationServices.AddSingleton<ITwoHostSingletonsOfTheSameType, FirstHostSingletonsOfTheSameType>();
+        applicationServices.AddSingleton<ITwoHostSingletonsOfTheSameType, SecondHostSingletonsOfTheSameType>();
 
-            applicationServices.AddSingleton<IHostSingletonAndScopedOfTheSameType, HostSingletonOfTheSameTypeAsScoped>();
-            applicationServices.AddScoped<IHostSingletonAndScopedOfTheSameType, HostScopedOfTheSameTypeAsSingleton>();
+        applicationServices.AddSingleton<IHostSingletonAndScopedOfTheSameType, HostSingletonOfTheSameTypeAsScoped>();
+        applicationServices.AddScoped<IHostSingletonAndScopedOfTheSameType, HostScopedOfTheSameTypeAsSingleton>();
 
-            _shellContainerFactory = new ShellContainerFactory(
-                new StubHostingEnvironment(),
-                new StubExtensionManager(),
-                _applicationServiceProvider = applicationServices.BuildServiceProvider(),
-                applicationServices
-            );
-        }
+        _shellContainerFactory = new ShellContainerFactory(
+            new StubHostingEnvironment(),
+            new StubExtensionManager(),
+            _applicationServiceProvider = applicationServices.BuildServiceProvider(),
+            applicationServices
+        );
+    }
 
-        [Fact]
-        public async Task CanRegisterDefaultServiceWithFeatureInfo()
-        {
-            var shellBlueprint = CreateBlueprint();
+    [Fact]
+    public async Task CanRegisterDefaultServiceWithFeatureInfo()
+    {
+        var shellBlueprint = CreateBlueprint();
 
-            var expectedFeatureInfo = AddStartup(shellBlueprint, typeof(RegisterServiceStartup));
+        var expectedFeatureInfo = AddStartup(shellBlueprint, typeof(RegisterServiceStartup));
 
-            var container = (await _shellContainerFactory
-                .CreateContainerAsync(_uninitializedDefaultShell, shellBlueprint))
-                .CreateScope()
-                .ServiceProvider;
+        var container = (await _shellContainerFactory
+            .CreateContainerAsync(_uninitializedDefaultShell, shellBlueprint))
+            .CreateScope()
+            .ServiceProvider;
 
-            var typeFeatureProvider = _applicationServiceProvider.GetService<ITypeFeatureProvider>();
+        var typeFeatureProvider = _applicationServiceProvider.GetService<ITypeFeatureProvider>();
 
-            Assert.IsType<TestService>(container.GetRequiredService(typeof(ITestService)));
-            Assert.Same(expectedFeatureInfo, typeFeatureProvider.GetFeatureForDependency(typeof(TestService)));
-        }
+        Assert.IsType<TestService>(container.GetRequiredService(typeof(ITestService)));
+        Assert.Same(expectedFeatureInfo, typeFeatureProvider.GetFeatureForDependency(typeof(TestService)));
+    }
 
-        [Fact]
-        public async Task CanReplaceDefaultServiceWithCustomService()
-        {
-            var shellBlueprint = CreateBlueprint();
+    [Fact]
+    public async Task CanReplaceDefaultServiceWithCustomService()
+    {
+        var shellBlueprint = CreateBlueprint();
 
-            var expectedFeatureInfo = AddStartup(shellBlueprint, typeof(ReplaceServiceStartup));
-            AddStartup(shellBlueprint, typeof(RegisterServiceStartup));
+        var expectedFeatureInfo = AddStartup(shellBlueprint, typeof(ReplaceServiceStartup));
+        AddStartup(shellBlueprint, typeof(RegisterServiceStartup));
 
-            var container = (await _shellContainerFactory
-                .CreateContainerAsync(_uninitializedDefaultShell, shellBlueprint))
-                .CreateScope()
-                .ServiceProvider;
+        var container = (await _shellContainerFactory
+            .CreateContainerAsync(_uninitializedDefaultShell, shellBlueprint))
+            .CreateScope()
+            .ServiceProvider;
 
-            var typeFeatureProvider = _applicationServiceProvider.GetService<ITypeFeatureProvider>();
+        var typeFeatureProvider = _applicationServiceProvider.GetService<ITypeFeatureProvider>();
 
-            // Check that the default service has been replaced with the custom service and that the feature info is correct.
-            Assert.IsType<CustomTestService>(container.GetRequiredService(typeof(ITestService)));
-            Assert.Same(expectedFeatureInfo, typeFeatureProvider.GetFeatureForDependency(typeof(CustomTestService)));
-        }
+        // Check that the default service has been replaced with the custom service and that the feature info is correct.
+        Assert.IsType<CustomTestService>(container.GetRequiredService(typeof(ITestService)));
+        Assert.Same(expectedFeatureInfo, typeFeatureProvider.GetFeatureForDependency(typeof(CustomTestService)));
+    }
 
-        [Fact]
-        public async Task HostServiceLifeTimesShouldBePreserved()
+    [Fact]
+    public async Task HostServiceLifeTimesShouldBePreserved()
+    {
+        var shellBlueprint = CreateBlueprint();
+        var container = (await _shellContainerFactory
+            .CreateContainerAsync(_uninitializedDefaultShell, shellBlueprint))
+            .CreateScope()
+            .ServiceProvider;
+
+        var appSingleton = _applicationServiceProvider.GetRequiredService<ITestSingleton>();
+
+        var singleton1 = container.GetRequiredService<ITestSingleton>();
+        var singleton2 = container.GetRequiredService<ITestSingleton>();
+        var transient1 = container.GetRequiredService<ITestTransient>();
+        var transient2 = container.GetRequiredService<ITestTransient>();
+        var scoped1 = container.GetRequiredService<ITestScoped>();
+        var scoped2 = container.GetRequiredService<ITestScoped>();
+
+        ITestScoped scoped3, scoped4;
+        using (var scope = container.CreateScope())
         {
-            var shellBlueprint = CreateBlueprint();
-            var container = (await _shellContainerFactory
-                .CreateContainerAsync(_uninitializedDefaultShell, shellBlueprint))
-                .CreateScope()
-                .ServiceProvider;
-
-            var appSingleton = _applicationServiceProvider.GetRequiredService<ITestSingleton>();
-
-            var singleton1 = container.GetRequiredService<ITestSingleton>();
-            var singleton2 = container.GetRequiredService<ITestSingleton>();
-            var transient1 = container.GetRequiredService<ITestTransient>();
-            var transient2 = container.GetRequiredService<ITestTransient>();
-            var scoped1 = container.GetRequiredService<ITestScoped>();
-            var scoped2 = container.GetRequiredService<ITestScoped>();
-
-            ITestScoped scoped3, scoped4;
-            using (var scope = container.CreateScope())
-            {
-                scoped3 = scope.ServiceProvider.GetRequiredService<ITestScoped>();
-                scoped4 = scope.ServiceProvider.GetRequiredService<ITestScoped>();
-            }
-
-            Assert.IsType<TestSingleton>(singleton1);
-            Assert.IsType<TestTransient>(transient1);
-            Assert.IsType<TestTransient>(transient2);
-            Assert.IsType<TestScoped>(scoped1);
-            Assert.IsType<TestScoped>(scoped3);
-
-            Assert.Equal(singleton1, singleton2);
-            Assert.Same(appSingleton, singleton1);
-            Assert.NotEqual(transient1, transient2);
-            Assert.NotEqual(scoped1, scoped3);
-            Assert.Equal(scoped1, scoped2);
-            Assert.Equal(scoped3, scoped4);
+            scoped3 = scope.ServiceProvider.GetRequiredService<ITestScoped>();
+            scoped4 = scope.ServiceProvider.GetRequiredService<ITestScoped>();
         }
 
-        [Fact]
-        public async Task WhenTwoHostSingletons_GetServices_Returns_HostAndShellServices()
-        {
-            var shellBlueprint = CreateBlueprint();
-            AddStartup(shellBlueprint, typeof(ServicesOfTheSameTypeStartup));
+        Assert.IsType<TestSingleton>(singleton1);
+        Assert.IsType<TestTransient>(transient1);
+        Assert.IsType<TestTransient>(transient2);
+        Assert.IsType<TestScoped>(scoped1);
+        Assert.IsType<TestScoped>(scoped3);
+
+        Assert.Equal(singleton1, singleton2);
+        Assert.Same(appSingleton, singleton1);
+        Assert.NotEqual(transient1, transient2);
+        Assert.NotEqual(scoped1, scoped3);
+        Assert.Equal(scoped1, scoped2);
+        Assert.Equal(scoped3, scoped4);
+    }
 
-            var container = (await _shellContainerFactory
-                .CreateContainerAsync(_uninitializedDefaultShell, shellBlueprint))
-                .CreateScope()
-                .ServiceProvider;
+    [Fact]
+    public async Task WhenTwoHostSingletons_GetServices_Returns_HostAndShellServices()
+    {
+        var shellBlueprint = CreateBlueprint();
+        AddStartup(shellBlueprint, typeof(ServicesOfTheSameTypeStartup));
 
-            var services = container.GetServices<ITwoHostSingletonsOfTheSameType>();
+        var container = (await _shellContainerFactory
+            .CreateContainerAsync(_uninitializedDefaultShell, shellBlueprint))
+            .CreateScope()
+            .ServiceProvider;
 
-            Assert.Equal(5, services.Count());
-        }
+        var services = container.GetServices<ITwoHostSingletonsOfTheSameType>();
 
-        [Fact]
-        public async Task WhenHostSingletonAndScoped_GetServices_Returns_CorrectImplementations()
-        {
-            var shellBlueprint = CreateBlueprint();
+        Assert.Equal(5, services.Count());
+    }
 
-            var container = (await _shellContainerFactory
-                .CreateContainerAsync(_uninitializedDefaultShell, shellBlueprint))
-                .CreateScope()
-                .ServiceProvider;
+    [Fact]
+    public async Task WhenHostSingletonAndScoped_GetServices_Returns_CorrectImplementations()
+    {
+        var shellBlueprint = CreateBlueprint();
 
-            var services = container.GetServices<IHostSingletonAndScopedOfTheSameType>();
+        var container = (await _shellContainerFactory
+            .CreateContainerAsync(_uninitializedDefaultShell, shellBlueprint))
+            .CreateScope()
+            .ServiceProvider;
 
-            Assert.Equal(2, services.Count());
-            Assert.IsType<HostSingletonOfTheSameTypeAsScoped>(services.ElementAt(0));
-            Assert.IsType<HostScopedOfTheSameTypeAsSingleton>(services.ElementAt(1));
-        }
+        var services = container.GetServices<IHostSingletonAndScopedOfTheSameType>();
 
-        [Fact]
-        public async Task AssignsTypeToMultipleFeatures()
-        {
-            var shellBlueprint = CreateBlueprint();
+        Assert.Equal(2, services.Count());
+        Assert.IsType<HostSingletonOfTheSameTypeAsScoped>(services.ElementAt(0));
+        Assert.IsType<HostScopedOfTheSameTypeAsSingleton>(services.ElementAt(1));
+    }
 
-            var expectedFeatureInfos = AddStartups(shellBlueprint, typeof(RegisterServiceStartup), typeof(RegisterSecondServiceStartup));
+    [Fact]
+    public async Task AssignsTypeToMultipleFeatures()
+    {
+        var shellBlueprint = CreateBlueprint();
 
-            var container = (await _shellContainerFactory
-                .CreateContainerAsync(_uninitializedDefaultShell, shellBlueprint))
-                .CreateScope()
-                .ServiceProvider;
+        var expectedFeatureInfos = AddStartups(shellBlueprint, typeof(RegisterServiceStartup), typeof(RegisterSecondServiceStartup));
 
-            var typeFeatureProvider = _applicationServiceProvider.GetService<ITypeFeatureProvider>();
+        var container = (await _shellContainerFactory
+            .CreateContainerAsync(_uninitializedDefaultShell, shellBlueprint))
+            .CreateScope()
+            .ServiceProvider;
 
-            Assert.IsType<TestService>(container.GetRequiredService(typeof(ITestService)));
-            Assert.Equal(expectedFeatureInfos, typeFeatureProvider.GetFeaturesForDependency(typeof(TestService)));
-        }
+        var typeFeatureProvider = _applicationServiceProvider.GetService<ITypeFeatureProvider>();
 
-        private static ShellBlueprint CreateBlueprint()
-        {
-            return new ShellBlueprint
-            {
-                Settings = new ShellSettings(),
-                Descriptor = new ShellDescriptor(),
-                Dependencies = new Dictionary<Type, IEnumerable<IFeatureInfo>>()
-            };
-        }
+        Assert.IsType<TestService>(container.GetRequiredService(typeof(ITestService)));
+        Assert.Equal(expectedFeatureInfos, typeFeatureProvider.GetFeaturesForDependency(typeof(TestService)));
+    }
 
-        public static IFeatureInfo AddStartup(ShellBlueprint shellBlueprint, Type startupType)
+    private static ShellBlueprint CreateBlueprint()
+    {
+        return new ShellBlueprint
         {
-            var featureInfo = new FeatureInfo(startupType.Name, startupType.Name, 1, "Tests", null, new ExtensionInfo(startupType.Name), null, false, false, false);
-            shellBlueprint.Dependencies.Add(startupType, [featureInfo]);
+            Settings = new ShellSettings(),
+            Descriptor = new ShellDescriptor(),
+            Dependencies = new Dictionary<Type, IEnumerable<IFeatureInfo>>()
+        };
+    }
 
-            return featureInfo;
-        }
+    public static IFeatureInfo AddStartup(ShellBlueprint shellBlueprint, Type startupType)
+    {
+        var featureInfo = new FeatureInfo(startupType.Name, startupType.Name, 1, "Tests", null, new ExtensionInfo(startupType.Name), null, false, false, false);
+        shellBlueprint.Dependencies.Add(startupType, [featureInfo]);
 
-        public static IFeatureInfo[] AddStartups(ShellBlueprint shellBlueprint, Type startupType1, Type startupType2)
-        {
-            var featureInfo1 = new FeatureInfo(startupType1.Name, startupType1.Name, 1, "Tests", null, new ExtensionInfo(startupType1.Name), null, false, false, false);
-            var featureInfo2 = new FeatureInfo(startupType2.Name, startupType2.Name, 1, "Tests", null, new ExtensionInfo(startupType2.Name), null, false, false, false);
-            shellBlueprint.Dependencies.Add(startupType1, [featureInfo1]);
-            shellBlueprint.Dependencies.Add(startupType2, [featureInfo2]);
+        return featureInfo;
+    }
 
-            return [featureInfo1, featureInfo2];
-        }
+    public static IFeatureInfo[] AddStartups(ShellBlueprint shellBlueprint, Type startupType1, Type startupType2)
+    {
+        var featureInfo1 = new FeatureInfo(startupType1.Name, startupType1.Name, 1, "Tests", null, new ExtensionInfo(startupType1.Name), null, false, false, false);
+        var featureInfo2 = new FeatureInfo(startupType2.Name, startupType2.Name, 1, "Tests", null, new ExtensionInfo(startupType2.Name), null, false, false, false);
+        shellBlueprint.Dependencies.Add(startupType1, [featureInfo1]);
+        shellBlueprint.Dependencies.Add(startupType2, [featureInfo2]);
 
-        private interface ITestService
-        {
-        }
+        return [featureInfo1, featureInfo2];
+    }
 
-        private sealed class TestService : ITestService
-        {
-        }
+    private interface ITestService
+    {
+    }
 
-        private sealed class CustomTestService : ITestService
-        {
-        }
+    private sealed class TestService : ITestService
+    {
+    }
 
-        private sealed class RegisterServiceStartup : StartupBase
-        {
-            public override int Order => 1;
+    private sealed class CustomTestService : ITestService
+    {
+    }
 
-            public override void ConfigureServices(IServiceCollection services)
-            {
-                services.AddScoped<ITestService, TestService>();
-            }
-        }
+    private sealed class RegisterServiceStartup : StartupBase
+    {
+        public override int Order => 1;
 
-        private sealed class RegisterSecondServiceStartup : StartupBase
+        public override void ConfigureServices(IServiceCollection services)
         {
-            public override int Order => 1;
-
-            public override void ConfigureServices(IServiceCollection services)
-            {
-                services.AddScoped<ITestService, TestService>();
-            }
+            services.AddScoped<ITestService, TestService>();
         }
+    }
+
+    private sealed class RegisterSecondServiceStartup : StartupBase
+    {
+        public override int Order => 1;
 
-        private sealed class ReplaceServiceStartup : StartupBase
+        public override void ConfigureServices(IServiceCollection services)
         {
-            public override int Order => 2;
+            services.AddScoped<ITestService, TestService>();
+        }
+    }
+
+    private sealed class ReplaceServiceStartup : StartupBase
+    {
+        public override int Order => 2;
 
-            public override void ConfigureServices(IServiceCollection services)
-            {
-                services.Replace(ServiceDescriptor.Scoped(typeof(ITestService), typeof(CustomTestService)));
-            }
+        public override void ConfigureServices(IServiceCollection services)
+        {
+            services.Replace(ServiceDescriptor.Scoped(typeof(ITestService), typeof(CustomTestService)));
         }
+    }
 
-        private interface ITestSingleton { }
+    private interface ITestSingleton { }
 
-        private interface ITestTransient { }
+    private interface ITestTransient { }
 
-        private interface ITestScoped { }
+    private interface ITestScoped { }
 
-        private sealed class TestSingleton : ITestSingleton { }
+    private sealed class TestSingleton : ITestSingleton { }
 
-        private sealed class TestTransient : ITestTransient { }
+    private sealed class TestTransient : ITestTransient { }
 
-        private sealed class TestScoped : ITestScoped { }
+    private sealed class TestScoped : ITestScoped { }
 
-        private interface ITwoHostSingletonsOfTheSameType { }
+    private interface ITwoHostSingletonsOfTheSameType { }
 
-        private sealed class FirstHostSingletonsOfTheSameType : ITwoHostSingletonsOfTheSameType { }
+    private sealed class FirstHostSingletonsOfTheSameType : ITwoHostSingletonsOfTheSameType { }
 
-        private sealed class SecondHostSingletonsOfTheSameType : ITwoHostSingletonsOfTheSameType { }
+    private sealed class SecondHostSingletonsOfTheSameType : ITwoHostSingletonsOfTheSameType { }
 
-        private sealed class ShellSingletonOfTheSametype : ITwoHostSingletonsOfTheSameType { }
+    private sealed class ShellSingletonOfTheSametype : ITwoHostSingletonsOfTheSameType { }
 
-        private sealed class ShellTransientOfTheSametype : ITwoHostSingletonsOfTheSameType { }
+    private sealed class ShellTransientOfTheSametype : ITwoHostSingletonsOfTheSameType { }
 
-        private sealed class ShellScopedOfTheSametype : ITwoHostSingletonsOfTheSameType { }
+    private sealed class ShellScopedOfTheSametype : ITwoHostSingletonsOfTheSameType { }
 
-        private interface IHostSingletonAndScopedOfTheSameType { }
+    private interface IHostSingletonAndScopedOfTheSameType { }
 
-        private sealed class HostSingletonOfTheSameTypeAsScoped : IHostSingletonAndScopedOfTheSameType { }
+    private sealed class HostSingletonOfTheSameTypeAsScoped : IHostSingletonAndScopedOfTheSameType { }
 
-        private sealed class HostScopedOfTheSameTypeAsSingleton : IHostSingletonAndScopedOfTheSameType { }
+    private sealed class HostScopedOfTheSameTypeAsSingleton : IHostSingletonAndScopedOfTheSameType { }
+
+    private sealed class ServicesOfTheSameTypeStartup : StartupBase
+    {
+        public override int Order => 1;
 
-        private sealed class ServicesOfTheSameTypeStartup : StartupBase
+        public override void ConfigureServices(IServiceCollection services)
         {
-            public override int Order => 1;
-
-            public override void ConfigureServices(IServiceCollection services)
-            {
-                services.AddSingleton<ITwoHostSingletonsOfTheSameType, ShellSingletonOfTheSametype>();
-                services.AddTransient<ITwoHostSingletonsOfTheSameType, ShellTransientOfTheSametype>();
-                services.AddScoped<ITwoHostSingletonsOfTheSameType, ShellScopedOfTheSametype>();
-            }
+            services.AddSingleton<ITwoHostSingletonsOfTheSameType, ShellSingletonOfTheSametype>();
+            services.AddTransient<ITwoHostSingletonsOfTheSameType, ShellTransientOfTheSametype>();
+            services.AddScoped<ITwoHostSingletonsOfTheSameType, ShellScopedOfTheSametype>();
         }
     }
 }
diff --git a/test/OrchardCore.Tests/Stubs/MemoryFileBuilder.cs b/test/OrchardCore.Tests/Stubs/MemoryFileBuilder.cs
index 43cb29b63b7..1896687c859 100644
--- a/test/OrchardCore.Tests/Stubs/MemoryFileBuilder.cs
+++ b/test/OrchardCore.Tests/Stubs/MemoryFileBuilder.cs
@@ -1,32 +1,31 @@
 using OrchardCore.Deployment;
 
-namespace OrchardCore.Tests.Stubs
+namespace OrchardCore.Tests.Stubs;
+
+/// <summary>
+/// In memory file builder that uses a dictionary as virtual file system.
+/// Intended for unit testing.
+/// </summary>
+public class MemoryFileBuilder
+    : IFileBuilder
 {
+    public Dictionary<string, byte[]> VirtualFiles { get; private set; } = [];
+
+    public async Task SetFileAsync(string subpath, Stream stream)
+    {
+        using var ms = new MemoryStream();
+        await stream.CopyToAsync(ms);
+        VirtualFiles[subpath] = ms.ToArray();
+    }
+
     /// <summary>
-    /// In memory file builder that uses a dictionary as virtual file system.
-    /// Intended for unit testing.
+    /// Read the contents of a file built with this file builder, using the specified encoding.
     /// </summary>
-    public class MemoryFileBuilder
-        : IFileBuilder
+    /// <param name="subpath">Path and/or file name</param>
+    /// <param name="encoding">Encoding used to convert the byte array to string</param>
+    /// <returns></returns>
+    public string GetFileContents(string subpath, Encoding encoding)
     {
-        public Dictionary<string, byte[]> VirtualFiles { get; private set; } = [];
-
-        public async Task SetFileAsync(string subpath, Stream stream)
-        {
-            using var ms = new MemoryStream();
-            await stream.CopyToAsync(ms);
-            VirtualFiles[subpath] = ms.ToArray();
-        }
-
-        /// <summary>
-        /// Read the contents of a file built with this file builder, using the specified encoding.
-        /// </summary>
-        /// <param name="subpath">Path and/or file name</param>
-        /// <param name="encoding">Encoding used to convert the byte array to string</param>
-        /// <returns></returns>
-        public string GetFileContents(string subpath, Encoding encoding)
-        {
-            return encoding.GetString(VirtualFiles[subpath]);
-        }
+        return encoding.GetString(VirtualFiles[subpath]);
     }
 }
diff --git a/test/OrchardCore.Tests/Stubs/StubExtensionManager.cs b/test/OrchardCore.Tests/Stubs/StubExtensionManager.cs
index bfc0c988776..85e88474799 100644
--- a/test/OrchardCore.Tests/Stubs/StubExtensionManager.cs
+++ b/test/OrchardCore.Tests/Stubs/StubExtensionManager.cs
@@ -1,53 +1,52 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Environment.Extensions.Features;
 
-namespace OrchardCore.Tests.Stubs
+namespace OrchardCore.Tests.Stubs;
+
+public class StubExtensionManager : IExtensionManager
 {
-    public class StubExtensionManager : IExtensionManager
-    {
-        public IEnumerable<IFeatureInfo> GetDependentFeatures(string featureId)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IExtensionInfo GetExtension(string extensionId)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IEnumerable<IExtensionInfo> GetExtensions()
-        {
-            return [];
-        }
-
-        public IEnumerable<IFeatureInfo> GetFeatureDependencies(string featureId)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IEnumerable<IFeatureInfo> GetFeatures()
-        {
-            return [];
-        }
-
-        public IEnumerable<IFeatureInfo> GetFeatures(string[] featureIdsToLoad)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<ExtensionEntry> LoadExtensionAsync(IExtensionInfo extensionInfo)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<IEnumerable<IFeatureInfo>> LoadFeaturesAsync()
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<IEnumerable<IFeatureInfo>> LoadFeaturesAsync(string[] featureIdsToLoad)
-        {
-            throw new NotImplementedException();
-        }
+    public IEnumerable<IFeatureInfo> GetDependentFeatures(string featureId)
+    {
+        throw new NotImplementedException();
+    }
+
+    public IExtensionInfo GetExtension(string extensionId)
+    {
+        throw new NotImplementedException();
+    }
+
+    public IEnumerable<IExtensionInfo> GetExtensions()
+    {
+        return [];
+    }
+
+    public IEnumerable<IFeatureInfo> GetFeatureDependencies(string featureId)
+    {
+        throw new NotImplementedException();
+    }
+
+    public IEnumerable<IFeatureInfo> GetFeatures()
+    {
+        return [];
+    }
+
+    public IEnumerable<IFeatureInfo> GetFeatures(string[] featureIdsToLoad)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task<ExtensionEntry> LoadExtensionAsync(IExtensionInfo extensionInfo)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task<IEnumerable<IFeatureInfo>> LoadFeaturesAsync()
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task<IEnumerable<IFeatureInfo>> LoadFeaturesAsync(string[] featureIdsToLoad)
+    {
+        throw new NotImplementedException();
     }
 }
diff --git a/test/OrchardCore.Tests/Stubs/StubHostingEnvironment.cs b/test/OrchardCore.Tests/Stubs/StubHostingEnvironment.cs
index 1ea1f97456e..0afeac6e15d 100644
--- a/test/OrchardCore.Tests/Stubs/StubHostingEnvironment.cs
+++ b/test/OrchardCore.Tests/Stubs/StubHostingEnvironment.cs
@@ -1,37 +1,36 @@
-namespace OrchardCore.Tests.Stubs
+namespace OrchardCore.Tests.Stubs;
+
+public class StubHostingEnvironment : IHostEnvironment
 {
-    public class StubHostingEnvironment : IHostEnvironment
-    {
-        private string _rootPath;
-        private IFileProvider _contentRootFileProvider;
+    private string _rootPath;
+    private IFileProvider _contentRootFileProvider;
 
-        public StubHostingEnvironment()
-        {
-            ApplicationName = GetType().Assembly.GetName().Name;
-        }
+    public StubHostingEnvironment()
+    {
+        ApplicationName = GetType().Assembly.GetName().Name;
+    }
 
-        public string EnvironmentName { get; set; } = "Stub";
+    public string EnvironmentName { get; set; } = "Stub";
 
-        public string ApplicationName { get; set; }
+    public string ApplicationName { get; set; }
 
-        public string WebRootPath { get; set; }
+    public string WebRootPath { get; set; }
 
-        public IFileProvider WebRootFileProvider { get; set; }
+    public IFileProvider WebRootFileProvider { get; set; }
 
-        public string ContentRootPath
+    public string ContentRootPath
+    {
+        get { return _rootPath ?? Directory.GetCurrentDirectory(); }
+        set
         {
-            get { return _rootPath ?? Directory.GetCurrentDirectory(); }
-            set
-            {
-                _contentRootFileProvider = new PhysicalFileProvider(value);
-                _rootPath = value;
-            }
+            _contentRootFileProvider = new PhysicalFileProvider(value);
+            _rootPath = value;
         }
+    }
 
-        public IFileProvider ContentRootFileProvider
-        {
-            get { return _contentRootFileProvider; }
-            set { _contentRootFileProvider = value; }
-        }
+    public IFileProvider ContentRootFileProvider
+    {
+        get { return _contentRootFileProvider; }
+        set { _contentRootFileProvider = value; }
     }
 }
diff --git a/test/OrchardCore.Tests/Stubs/StubPoFileLocationProvider.cs b/test/OrchardCore.Tests/Stubs/StubPoFileLocationProvider.cs
index 58c4b3534af..c4c3805f1fb 100644
--- a/test/OrchardCore.Tests/Stubs/StubPoFileLocationProvider.cs
+++ b/test/OrchardCore.Tests/Stubs/StubPoFileLocationProvider.cs
@@ -1,22 +1,21 @@
 using OrchardCore.Localization;
 
-namespace OrchardCore.Tests
+namespace OrchardCore.Tests;
+
+public class StubPoFileLocationProvider : ILocalizationFileLocationProvider
 {
-    public class StubPoFileLocationProvider : ILocalizationFileLocationProvider
-    {
-        private readonly PhysicalFileProvider _fileProvider;
-        private readonly string _resourcesContainer;
+    private readonly PhysicalFileProvider _fileProvider;
+    private readonly string _resourcesContainer;
 
-        public StubPoFileLocationProvider(IHostEnvironment hostingEnvironment, IOptions<LocalizationOptions> localizationOptions)
-        {
-            var rootPath = new DirectoryInfo(hostingEnvironment.ContentRootPath).Parent.Parent.Parent.FullName;
-            _fileProvider = new PhysicalFileProvider(rootPath);
-            _resourcesContainer = localizationOptions.Value.ResourcesPath;
-        }
+    public StubPoFileLocationProvider(IHostEnvironment hostingEnvironment, IOptions<LocalizationOptions> localizationOptions)
+    {
+        var rootPath = new DirectoryInfo(hostingEnvironment.ContentRootPath).Parent.Parent.Parent.FullName;
+        _fileProvider = new PhysicalFileProvider(rootPath);
+        _resourcesContainer = localizationOptions.Value.ResourcesPath;
+    }
 
-        public IEnumerable<IFileInfo> GetLocations(string cultureName)
-        {
-            yield return _fileProvider.GetFileInfo(Path.Combine(_resourcesContainer, cultureName + ".po"));
-        }
+    public IEnumerable<IFileInfo> GetLocations(string cultureName)
+    {
+        yield return _fileProvider.GetFileInfo(Path.Combine(_resourcesContainer, cultureName + ".po"));
     }
 }
diff --git a/test/OrchardCore.Tests/Stubs/TestShapeBindingResolver.cs b/test/OrchardCore.Tests/Stubs/TestShapeBindingResolver.cs
index d3e36ada12b..fc52377c3e4 100644
--- a/test/OrchardCore.Tests/Stubs/TestShapeBindingResolver.cs
+++ b/test/OrchardCore.Tests/Stubs/TestShapeBindingResolver.cs
@@ -1,33 +1,32 @@
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.Descriptors;
 
-namespace OrchardCore.Tests.Stubs
+namespace OrchardCore.Tests.Stubs;
+
+public class TestShapeBindingsDictionary : Dictionary<string, ShapeBinding>
+{
+    public TestShapeBindingsDictionary()
+        : base(StringComparer.OrdinalIgnoreCase) { }
+}
+
+public class TestShapeBindingResolver : IShapeBindingResolver
 {
-    public class TestShapeBindingsDictionary : Dictionary<string, ShapeBinding>
+    private readonly TestShapeBindingsDictionary _shapeBindings;
+
+    public TestShapeBindingResolver(TestShapeBindingsDictionary shapeBindings)
     {
-        public TestShapeBindingsDictionary()
-            : base(StringComparer.OrdinalIgnoreCase) { }
+        _shapeBindings = shapeBindings;
     }
 
-    public class TestShapeBindingResolver : IShapeBindingResolver
+    public Task<ShapeBinding> GetShapeBindingAsync(string shapeType)
     {
-        private readonly TestShapeBindingsDictionary _shapeBindings;
-
-        public TestShapeBindingResolver(TestShapeBindingsDictionary shapeBindings)
+        if (_shapeBindings.TryGetValue(shapeType, out var binding))
         {
-            _shapeBindings = shapeBindings;
+            return Task.FromResult(binding);
         }
-
-        public Task<ShapeBinding> GetShapeBindingAsync(string shapeType)
+        else
         {
-            if (_shapeBindings.TryGetValue(shapeType, out var binding))
-            {
-                return Task.FromResult(binding);
-            }
-            else
-            {
-                return Task.FromResult<ShapeBinding>(null);
-            }
+            return Task.FromResult<ShapeBinding>(null);
         }
     }
 }
diff --git a/test/OrchardCore.Tests/Tokens.Content/SlugServiceTests.cs b/test/OrchardCore.Tests/Tokens.Content/SlugServiceTests.cs
index 400ff58b8cd..1631c88411a 100644
--- a/test/OrchardCore.Tests/Tokens.Content/SlugServiceTests.cs
+++ b/test/OrchardCore.Tests/Tokens.Content/SlugServiceTests.cs
@@ -1,81 +1,80 @@
 using OrchardCore.Modules.Services;
 
-namespace OrchardCore.Tests.Tokens.Content
+namespace OrchardCore.Tests.Tokens.Content;
+
+public class SlugServiceTests
 {
-    public class SlugServiceTests
-    {
-        private readonly SlugService _slugService;
+    private readonly SlugService _slugService;
 
-        public SlugServiceTests()
-        {
-            _slugService = new SlugService();
-        }
+    public SlugServiceTests()
+    {
+        _slugService = new SlugService();
+    }
 
-        [Theory]
-        [InlineData("a - b", "a-b")]
-        [InlineData("a  -  -      -  -   -   -b", "a-b")]
-        [InlineData("a - b - c-- d", "a-b-c-d")]
-        public void ShouldStripContiguousDashes(string input, string expected)
-        {
-            var slug = _slugService.Slugify(input);
-            Assert.Equal(expected, slug);
-        }
+    [Theory]
+    [InlineData("a - b", "a-b")]
+    [InlineData("a  -  -      -  -   -   -b", "a-b")]
+    [InlineData("a - b - c-- d", "a-b-c-d")]
+    public void ShouldStripContiguousDashes(string input, string expected)
+    {
+        var slug = _slugService.Slugify(input);
+        Assert.Equal(expected, slug);
+    }
 
-        [Fact]
-        public void ShouldChangePercentSymbolsToHyphans()
-        {
-            var slug = _slugService.Slugify("a%d");
-            Assert.Equal("a-d", slug);
-        }
+    [Fact]
+    public void ShouldChangePercentSymbolsToHyphans()
+    {
+        var slug = _slugService.Slugify("a%d");
+        Assert.Equal("a-d", slug);
+    }
 
-        [Fact]
-        public void ShouldChangeDotSymbolsToHyphans()
-        {
-            var slug = _slugService.Slugify("a,d");
-            Assert.Equal("a-d", slug);
-        }
+    [Fact]
+    public void ShouldChangeDotSymbolsToHyphans()
+    {
+        var slug = _slugService.Slugify("a,d");
+        Assert.Equal("a-d", slug);
+    }
 
-        [Theory]
-        [InlineData("Smith, John B.")]
-        [InlineData("Smith, John B...")]
-        public void ShouldRemoveHyphansFromEnd(string input)
-        {
-            // Act
-            var slug = _slugService.Slugify(input);
-            Assert.Equal("smith-john-b", slug);
-        }
+    [Theory]
+    [InlineData("Smith, John B.")]
+    [InlineData("Smith, John B...")]
+    public void ShouldRemoveHyphansFromEnd(string input)
+    {
+        // Act
+        var slug = _slugService.Slugify(input);
+        Assert.Equal("smith-john-b", slug);
+    }
 
-        [Fact]
-        public void ShouldMakeSureFunkycharactersAndHyphansOnlyReturnSingleHyphan()
-        {
-            var slug = _slugService.Slugify("«a»\"'-%-.d");
-            Assert.Equal("a-d", slug);
-        }
+    [Fact]
+    public void ShouldMakeSureFunkycharactersAndHyphansOnlyReturnSingleHyphan()
+    {
+        var slug = _slugService.Slugify("«a»\"'-%-.d");
+        Assert.Equal("a-d", slug);
+    }
 
-        [Fact]
-        public void ShouldConvertToLowercase()
-        {
-            var slug = _slugService.Slugify("ABCDE");
-            Assert.Equal("abcde", slug);
-        }
+    [Fact]
+    public void ShouldConvertToLowercase()
+    {
+        var slug = _slugService.Slugify("ABCDE");
+        Assert.Equal("abcde", slug);
+    }
 
-        [Fact]
-        public void ShouldRemoveDiacritics()
-        {
-            var slug = _slugService.Slugify("àçéïôù");
-            Assert.Equal("aceiou", slug);
-        }
+    [Fact]
+    public void ShouldRemoveDiacritics()
+    {
+        var slug = _slugService.Slugify("àçéïôù");
+        Assert.Equal("aceiou", slug);
+    }
 
-        [Theory]
-        [InlineData("джинсы_клеш", "джинсы_клеш")]
-        [InlineData("צוות_אורצ_רד", "צוות_אורצ_רד")]
-        [InlineData("调度模块允许后台任务调度", "调度模块允许后台任务调度")]
-        [InlineData("فريق_الاورشارد", "فريق_الاورشارد")]
-        [InlineData("不正なコンテナ", "不正なコンテナ")]
-        public void ShouldPreserveNonLatinCharacters(string input, string expected)
-        {
-            var slug = _slugService.Slugify(input);
-            Assert.Equal(expected, slug);
-        }
+    [Theory]
+    [InlineData("джинсы_клеш", "джинсы_клеш")]
+    [InlineData("צוות_אורצ_רד", "צוות_אורצ_רד")]
+    [InlineData("调度模块允许后台任务调度", "调度模块允许后台任务调度")]
+    [InlineData("فريق_الاورشارد", "فريق_الاورشارد")]
+    [InlineData("不正なコンテナ", "不正なコンテナ")]
+    public void ShouldPreserveNonLatinCharacters(string input, string expected)
+    {
+        var slug = _slugService.Slugify(input);
+        Assert.Equal(expected, slug);
     }
 }
diff --git a/test/OrchardCore.Tests/Utilities/StartupRunner.cs b/test/OrchardCore.Tests/Utilities/StartupRunner.cs
index abdba0b4eba..9d7e8f5c30c 100644
--- a/test/OrchardCore.Tests/Utilities/StartupRunner.cs
+++ b/test/OrchardCore.Tests/Utilities/StartupRunner.cs
@@ -1,21 +1,20 @@
-namespace OrchardCore.Tests
+namespace OrchardCore.Tests;
+
+internal static class StartupRunner
 {
-    internal static class StartupRunner
+    public static async Task Run(Type startupType, string culture, string expected)
     {
-        public static async Task Run(Type startupType, string culture, string expected)
-        {
-            var webHostBuilder = new WebHostBuilder().UseStartup(startupType);
-            var testHost = new TestServer(webHostBuilder);
+        var webHostBuilder = new WebHostBuilder().UseStartup(startupType);
+        var testHost = new TestServer(webHostBuilder);
 
-            var client = testHost.CreateClient();
-            var request = new HttpRequestMessage();
-            var cookieValue = $"c={culture}|uic={culture}";
-            request.Headers.Add("Cookie", $"{CookieRequestCultureProvider.DefaultCookieName}={cookieValue}");
+        var client = testHost.CreateClient();
+        var request = new HttpRequestMessage();
+        var cookieValue = $"c={culture}|uic={culture}";
+        request.Headers.Add("Cookie", $"{CookieRequestCultureProvider.DefaultCookieName}={cookieValue}");
 
-            var response = await client.SendAsync(request);
+        var response = await client.SendAsync(request);
 
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            Assert.Equal(expected, await response.Content.ReadAsStringAsync());
-        }
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        Assert.Equal(expected, await response.Content.ReadAsStringAsync());
     }
 }
diff --git a/test/OrchardCore.Tests/Workflows/Activities/AddTask.cs b/test/OrchardCore.Tests/Workflows/Activities/AddTask.cs
index a2d6e651390..7e78ca9ecbf 100644
--- a/test/OrchardCore.Tests/Workflows/Activities/AddTask.cs
+++ b/test/OrchardCore.Tests/Workflows/Activities/AddTask.cs
@@ -3,48 +3,47 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Tests.Workflows.Activities
+namespace OrchardCore.Tests.Workflows.Activities;
+
+public class AddTask : TaskActivity<AddTask>
 {
-    public class AddTask : TaskActivity<AddTask>
+    private readonly IWorkflowScriptEvaluator _scriptEvaluator;
+    protected readonly IStringLocalizer S;
+
+    public AddTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<AddTask> stringLocalizer)
     {
-        private readonly IWorkflowScriptEvaluator _scriptEvaluator;
-        protected readonly IStringLocalizer S;
-
-        public AddTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<AddTask> stringLocalizer)
-        {
-            _scriptEvaluator = scriptEvaluator;
-            S = stringLocalizer;
-        }
-
-        public override LocalizedString DisplayText => S["Add Task"];
-
-        public override LocalizedString Category => S["Test"];
-
-        public WorkflowExpression<double> A
-        {
-            get => GetProperty<WorkflowExpression<double>>();
-            set => SetProperty(value);
-        }
-
-        public WorkflowExpression<double> B
-        {
-            get => GetProperty<WorkflowExpression<double>>();
-            set => SetProperty(value);
-        }
-
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"]);
-        }
-
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var a = await _scriptEvaluator.EvaluateAsync(A, workflowContext);
-            var b = await _scriptEvaluator.EvaluateAsync(B, workflowContext);
-            var result = a + b;
-
-            workflowContext.LastResult = result;
-            return Outcomes("Done");
-        }
+        _scriptEvaluator = scriptEvaluator;
+        S = stringLocalizer;
+    }
+
+    public override LocalizedString DisplayText => S["Add Task"];
+
+    public override LocalizedString Category => S["Test"];
+
+    public WorkflowExpression<double> A
+    {
+        get => GetProperty<WorkflowExpression<double>>();
+        set => SetProperty(value);
+    }
+
+    public WorkflowExpression<double> B
+    {
+        get => GetProperty<WorkflowExpression<double>>();
+        set => SetProperty(value);
+    }
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"]);
+    }
+
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        var a = await _scriptEvaluator.EvaluateAsync(A, workflowContext);
+        var b = await _scriptEvaluator.EvaluateAsync(B, workflowContext);
+        var result = a + b;
+
+        workflowContext.LastResult = result;
+        return Outcomes("Done");
     }
 }
diff --git a/test/OrchardCore.Tests/Workflows/Activities/WriteLineTask.cs b/test/OrchardCore.Tests/Workflows/Activities/WriteLineTask.cs
index eaba090f7e7..c314b9fb355 100644
--- a/test/OrchardCore.Tests/Workflows/Activities/WriteLineTask.cs
+++ b/test/OrchardCore.Tests/Workflows/Activities/WriteLineTask.cs
@@ -3,41 +3,40 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 
-namespace OrchardCore.Tests.Workflows.Activities
+namespace OrchardCore.Tests.Workflows.Activities;
+
+public class WriteLineTask : TaskActivity<WriteLineTask>
 {
-    public class WriteLineTask : TaskActivity<WriteLineTask>
+    private readonly IWorkflowScriptEvaluator _scriptEvaluator;
+    private readonly TextWriter _output;
+    protected readonly IStringLocalizer S;
+
+    public WriteLineTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer stringLocalizer, TextWriter output)
+    {
+        _scriptEvaluator = scriptEvaluator;
+        _output = output;
+        S = stringLocalizer;
+    }
+
+    public override LocalizedString DisplayText => S["Write Line Task"];
+
+    public override LocalizedString Category => S["Test"];
+
+    public WorkflowExpression<string> Text
+    {
+        get => GetProperty<WorkflowExpression<string>>();
+        set => SetProperty(value);
+    }
+
+    public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+    {
+        return Outcomes(S["Done"]);
+    }
+
+    public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
     {
-        private readonly IWorkflowScriptEvaluator _scriptEvaluator;
-        private readonly TextWriter _output;
-        protected readonly IStringLocalizer S;
-
-        public WriteLineTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer stringLocalizer, TextWriter output)
-        {
-            _scriptEvaluator = scriptEvaluator;
-            _output = output;
-            S = stringLocalizer;
-        }
-
-        public override LocalizedString DisplayText => S["Write Line Task"];
-
-        public override LocalizedString Category => S["Test"];
-
-        public WorkflowExpression<string> Text
-        {
-            get => GetProperty<WorkflowExpression<string>>();
-            set => SetProperty(value);
-        }
-
-        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            return Outcomes(S["Done"]);
-        }
-
-        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
-        {
-            var text = await _scriptEvaluator.EvaluateAsync(Text, workflowContext);
-            await _output.WriteLineAsync(text);
-            return Outcomes("Done");
-        }
+        var text = await _scriptEvaluator.EvaluateAsync(Text, workflowContext);
+        await _output.WriteLineAsync(text);
+        return Outcomes("Done");
     }
 }
diff --git a/test/OrchardCore.Tests/Workflows/WorkflowManagerTests.cs b/test/OrchardCore.Tests/Workflows/WorkflowManagerTests.cs
index 07a21797490..16ca15d3357 100644
--- a/test/OrchardCore.Tests/Workflows/WorkflowManagerTests.cs
+++ b/test/OrchardCore.Tests/Workflows/WorkflowManagerTests.cs
@@ -12,135 +12,134 @@
 using OrchardCore.Workflows.Services;
 using OrchardCore.Workflows.WorkflowContextProviders;
 
-namespace OrchardCore.Tests.Workflows
+namespace OrchardCore.Tests.Workflows;
+
+public class WorkflowManagerTests
 {
-    public class WorkflowManagerTests
+    [Fact]
+    public async Task CanExecuteSimpleWorkflow()
     {
-        [Fact]
-        public async Task CanExecuteSimpleWorkflow()
-        {
-            var serviceProvider = CreateServiceProvider();
-            var scriptEvaluator = CreateWorkflowScriptEvaluator(serviceProvider);
-            var localizer = new Mock<IStringLocalizer<AddTask>>();
+        var serviceProvider = CreateServiceProvider();
+        var scriptEvaluator = CreateWorkflowScriptEvaluator(serviceProvider);
+        var localizer = new Mock<IStringLocalizer<AddTask>>();
 
-            var stringBuilder = new StringBuilder();
-            var output = new StringWriter(stringBuilder);
-            var addTask = new AddTask(scriptEvaluator, localizer.Object);
-            var writeLineTask = new WriteLineTask(scriptEvaluator, localizer.Object, output);
-            var setOutputTask = new SetOutputTask(scriptEvaluator, new Mock<IStringLocalizer<SetOutputTask>>().Object);
-            var workflowType = new WorkflowType
-            {
-                Id = 1,
-                WorkflowTypeId = IdGenerator.GenerateId(),
-                Activities =
-                [
-                    new()
+        var stringBuilder = new StringBuilder();
+        var output = new StringWriter(stringBuilder);
+        var addTask = new AddTask(scriptEvaluator, localizer.Object);
+        var writeLineTask = new WriteLineTask(scriptEvaluator, localizer.Object, output);
+        var setOutputTask = new SetOutputTask(scriptEvaluator, new Mock<IStringLocalizer<SetOutputTask>>().Object);
+        var workflowType = new WorkflowType
+        {
+            Id = 1,
+            WorkflowTypeId = IdGenerator.GenerateId(),
+            Activities =
+            [
+                new()
+                {
+                    ActivityId = "1",
+                    IsStart = true,
+                    Name = addTask.Name,
+                    Properties = JObject.FromObject(new
                     {
-                        ActivityId = "1",
-                        IsStart = true,
-                        Name = addTask.Name,
-                        Properties = JObject.FromObject(new
-                        {
-                            A = new WorkflowExpression<double>("input(\"A\")"),
-                            B = new WorkflowExpression<double>("input(\"B\")"),
-                        })
-                    },
-                    new() { ActivityId = "2", Name = writeLineTask.Name, Properties = JObject.FromObject(new { Text = new WorkflowExpression<string>("lastResult().toString()") }) },
-                    new() { ActivityId = "3", Name = setOutputTask.Name, Properties = JObject.FromObject(new { Value = new WorkflowExpression<string>("lastResult()"), OutputName = "Sum" }) }
-                ],
-                Transitions =
-                [
-                    new() { SourceActivityId = "1", SourceOutcomeName = "Done", DestinationActivityId = "2" },
-                    new() { SourceActivityId = "2", SourceOutcomeName = "Done", DestinationActivityId = "3" }
-                ]
-            };
+                        A = new WorkflowExpression<double>("input(\"A\")"),
+                        B = new WorkflowExpression<double>("input(\"B\")"),
+                    })
+                },
+                new() { ActivityId = "2", Name = writeLineTask.Name, Properties = JObject.FromObject(new { Text = new WorkflowExpression<string>("lastResult().toString()") }) },
+                new() { ActivityId = "3", Name = setOutputTask.Name, Properties = JObject.FromObject(new { Value = new WorkflowExpression<string>("lastResult()"), OutputName = "Sum" }) }
+            ],
+            Transitions =
+            [
+                new() { SourceActivityId = "1", SourceOutcomeName = "Done", DestinationActivityId = "2" },
+                new() { SourceActivityId = "2", SourceOutcomeName = "Done", DestinationActivityId = "3" }
+            ]
+        };
 
-            var workflowManager = CreateWorkflowManager(serviceProvider, [addTask, writeLineTask, setOutputTask], workflowType);
-            var a = 10d;
-            var b = 22d;
-            var expectedSum = a + b;
-            var expectedResult = expectedSum.ToString() + System.Environment.NewLine;
+        var workflowManager = CreateWorkflowManager(serviceProvider, [addTask, writeLineTask, setOutputTask], workflowType);
+        var a = 10d;
+        var b = 22d;
+        var expectedSum = a + b;
+        var expectedResult = expectedSum.ToString() + System.Environment.NewLine;
 
-            var workflowExecutionContext = await workflowManager.StartWorkflowAsync(workflowType, input: new RouteValueDictionary(new { A = a, B = b }));
-            var actualResult = stringBuilder.ToString();
+        var workflowExecutionContext = await workflowManager.StartWorkflowAsync(workflowType, input: new RouteValueDictionary(new { A = a, B = b }));
+        var actualResult = stringBuilder.ToString();
 
-            Assert.Equal(expectedResult, actualResult);
-            Assert.True(workflowExecutionContext.Output.ContainsKey("Sum"));
-            Assert.Equal(expectedSum, (double)workflowExecutionContext.Output["Sum"]);
-        }
+        Assert.Equal(expectedResult, actualResult);
+        Assert.True(workflowExecutionContext.Output.ContainsKey("Sum"));
+        Assert.Equal(expectedSum, (double)workflowExecutionContext.Output["Sum"]);
+    }
 
-        private static ServiceProvider CreateServiceProvider()
-        {
-            var services = new ServiceCollection();
-            services.AddScoped(typeof(Resolver<>));
-            services.AddScoped(provider => new Mock<IShapeFactory>().Object);
-            services.AddScoped(provider => new Mock<IViewLocalizer>().Object);
-            services.AddScoped<IWorkflowExecutionContextHandler, DefaultWorkflowExecutionContextHandler>();
+    private static ServiceProvider CreateServiceProvider()
+    {
+        var services = new ServiceCollection();
+        services.AddScoped(typeof(Resolver<>));
+        services.AddScoped(provider => new Mock<IShapeFactory>().Object);
+        services.AddScoped(provider => new Mock<IViewLocalizer>().Object);
+        services.AddScoped<IWorkflowExecutionContextHandler, DefaultWorkflowExecutionContextHandler>();
 
-            return services.BuildServiceProvider();
-        }
+        return services.BuildServiceProvider();
+    }
 
-        private static JavaScriptWorkflowScriptEvaluator CreateWorkflowScriptEvaluator(IServiceProvider serviceProvider)
-        {
-            var memoryCache = new MemoryCache(new MemoryCacheOptions());
-            var javaScriptEngine = new JavaScriptEngine(memoryCache);
-            var workflowContextHandlers = new Resolver<IEnumerable<IWorkflowExecutionContextHandler>>(serviceProvider);
-            var globalMethodProviders = Array.Empty<IGlobalMethodProvider>();
-            var scriptingManager = new DefaultScriptingManager(new[] { javaScriptEngine }, globalMethodProviders);
+    private static JavaScriptWorkflowScriptEvaluator CreateWorkflowScriptEvaluator(IServiceProvider serviceProvider)
+    {
+        var memoryCache = new MemoryCache(new MemoryCacheOptions());
+        var javaScriptEngine = new JavaScriptEngine(memoryCache);
+        var workflowContextHandlers = new Resolver<IEnumerable<IWorkflowExecutionContextHandler>>(serviceProvider);
+        var globalMethodProviders = Array.Empty<IGlobalMethodProvider>();
+        var scriptingManager = new DefaultScriptingManager(new[] { javaScriptEngine }, globalMethodProviders);
 
-            return new JavaScriptWorkflowScriptEvaluator(
-                scriptingManager,
-                workflowContextHandlers.Resolve(),
-                new Mock<ILogger<JavaScriptWorkflowScriptEvaluator>>().Object
-            );
-        }
+        return new JavaScriptWorkflowScriptEvaluator(
+            scriptingManager,
+            workflowContextHandlers.Resolve(),
+            new Mock<ILogger<JavaScriptWorkflowScriptEvaluator>>().Object
+        );
+    }
 
-        private static WorkflowManager CreateWorkflowManager(
-            IServiceProvider serviceProvider,
-            IEnumerable<IActivity> activities,
-            WorkflowType workflowType
-        )
-        {
-            var workflowValueSerializers = new Resolver<IEnumerable<IWorkflowValueSerializer>>(serviceProvider);
-            var activityLibrary = new Mock<IActivityLibrary>();
-            var workflowTypeStore = new Mock<IWorkflowTypeStore>();
-            var workflowStore = new Mock<IWorkflowStore>();
-            var workflowIdGenerator = new Mock<IWorkflowIdGenerator>();
-            workflowIdGenerator.Setup(x => x.GenerateUniqueId(It.IsAny<Workflow>())).Returns(IdGenerator.GenerateId());
-            var distributedLock = new Mock<IDistributedLock>();
-            var workflowManagerLogger = new Mock<ILogger<WorkflowManager>>();
-            var workflowContextLogger = new Mock<ILogger<WorkflowExecutionContext>>();
-            var missingActivityLogger = new Mock<ILogger<MissingActivity>>();
-            var missingActivityLocalizer = new Mock<IStringLocalizer<MissingActivity>>();
-            var clock = new Mock<IClock>();
-            var workflowFaultHandler = new Mock<IWorkflowFaultHandler>();
-            var jsonOptionsMock = new Mock<IOptions<DocumentJsonSerializerOptions>>();
-            jsonOptionsMock.Setup(x => x.Value)
-                .Returns(new DocumentJsonSerializerOptions());
+    private static WorkflowManager CreateWorkflowManager(
+        IServiceProvider serviceProvider,
+        IEnumerable<IActivity> activities,
+        WorkflowType workflowType
+    )
+    {
+        var workflowValueSerializers = new Resolver<IEnumerable<IWorkflowValueSerializer>>(serviceProvider);
+        var activityLibrary = new Mock<IActivityLibrary>();
+        var workflowTypeStore = new Mock<IWorkflowTypeStore>();
+        var workflowStore = new Mock<IWorkflowStore>();
+        var workflowIdGenerator = new Mock<IWorkflowIdGenerator>();
+        workflowIdGenerator.Setup(x => x.GenerateUniqueId(It.IsAny<Workflow>())).Returns(IdGenerator.GenerateId());
+        var distributedLock = new Mock<IDistributedLock>();
+        var workflowManagerLogger = new Mock<ILogger<WorkflowManager>>();
+        var workflowContextLogger = new Mock<ILogger<WorkflowExecutionContext>>();
+        var missingActivityLogger = new Mock<ILogger<MissingActivity>>();
+        var missingActivityLocalizer = new Mock<IStringLocalizer<MissingActivity>>();
+        var clock = new Mock<IClock>();
+        var workflowFaultHandler = new Mock<IWorkflowFaultHandler>();
+        var jsonOptionsMock = new Mock<IOptions<DocumentJsonSerializerOptions>>();
+        jsonOptionsMock.Setup(x => x.Value)
+            .Returns(new DocumentJsonSerializerOptions());
 
-            var workflowManager = new WorkflowManager(
-                activityLibrary.Object,
-                workflowTypeStore.Object,
-                workflowStore.Object,
-                workflowIdGenerator.Object,
-                workflowValueSerializers,
-                workflowFaultHandler.Object,
-                distributedLock.Object,
-                workflowManagerLogger.Object,
-                missingActivityLogger.Object,
-                missingActivityLocalizer.Object,
-                jsonOptionsMock.Object,
-                clock.Object
-                );
+        var workflowManager = new WorkflowManager(
+            activityLibrary.Object,
+            workflowTypeStore.Object,
+            workflowStore.Object,
+            workflowIdGenerator.Object,
+            workflowValueSerializers,
+            workflowFaultHandler.Object,
+            distributedLock.Object,
+            workflowManagerLogger.Object,
+            missingActivityLogger.Object,
+            missingActivityLocalizer.Object,
+            jsonOptionsMock.Object,
+            clock.Object
+            );
 
-            foreach (var activity in activities)
-            {
-                activityLibrary.Setup(x => x.InstantiateActivity(activity.Name)).Returns(activity);
-            }
+        foreach (var activity in activities)
+        {
+            activityLibrary.Setup(x => x.InstantiateActivity(activity.Name)).Returns(activity);
+        }
 
-            workflowTypeStore.Setup(x => x.GetAsync(workflowType.Id)).Returns(Task.FromResult(workflowType));
+        workflowTypeStore.Setup(x => x.GetAsync(workflowType.Id)).Returns(Task.FromResult(workflowType));
 
-            return workflowManager;
-        }
+        return workflowManager;
     }
 }

From 17160a6db11f232d9802a10cd078338797a1b2f9 Mon Sep 17 00:00:00 2001
From: David Puplava <dpuplava@lavatg.com>
Date: Thu, 15 Aug 2024 22:41:45 -0500
Subject: [PATCH 06/13] Refactor Twitter to X migration to simplify database
 logic; edited names to still include Twitter with X

---
 .../Migrations/TwitterMigrations.cs           | 67 ------------------
 .../Migrations/TwitterToXMigrations.cs        | 69 +++++++++++++++++++
 .../Services/TwitterSettingsConfiguration.cs  |  2 +-
 .../TwitterOptionsConfiguration.cs            |  8 +--
 .../OrchardCore.Twitter/Startup.cs            |  2 +-
 ...teXTwitterStatusTask.Fields.Design.cshtml} |  4 +-
 ...dateXTwitterStatusTask.Fields.Edit.cshtml} |  2 +-
 ...TwitterStatusTask.Fields.Thumbnail.cshtml} |  2 +-
 .../Views/NavigationItemText-x.Id.cshtml      |  2 +-
 .../Views/TwitterSettings.Edit.cshtml         | 10 +--
 .../Views/TwitterSigninSettings.Edit.cshtml   |  2 +-
 ...tusTask.cs => UpdateXTwitterStatusTask.cs} |  8 +--
 .../UpdateTwitterStatusTaskDisplayDriver.cs   |  6 +-
 .../OrchardCore.Twitter/Workflows/Startup.cs  |  2 +-
 14 files changed, 94 insertions(+), 92 deletions(-)
 delete mode 100644 src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterMigrations.cs
 create mode 100644 src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterToXMigrations.cs
 rename src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/{UpdateTwitterStatusTask.Fields.Design.cshtml => UpdateXTwitterStatusTask.Fields.Design.cshtml} (61%)
 rename src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/{UpdateTwitterStatusTask.Fields.Edit.cshtml => UpdateXTwitterStatusTask.Fields.Edit.cshtml} (90%)
 rename src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/{UpdateTwitterStatusTask.Fields.Thumbnail.cshtml => UpdateXTwitterStatusTask.Fields.Thumbnail.cshtml} (63%)
 rename src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/{UpdateXStatusTask.cs => UpdateXTwitterStatusTask.cs} (88%)

diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterMigrations.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterMigrations.cs
deleted file mode 100644
index 61fa9fa6d18..00000000000
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterMigrations.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using Dapper;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using OrchardCore.Data;
-using OrchardCore.Data.Migration;
-using OrchardCore.Environment.Shell;
-using OrchardCore.Environment.Shell.Descriptor.Models;
-using OrchardCore.Environment.Shell.Scope;
-using YesSql;
-
-namespace OrchardCore.Twitter.Migrations;
-
-public class TwitterMigrations : DataMigration
-{
-    private readonly ShellDescriptor _shellDescriptor;
-
-    public TwitterMigrations(ShellDescriptor shellDescriptor)
-    {
-        _shellDescriptor = shellDescriptor;
-    }
-
-    public int Create()
-    {
-        if (_shellDescriptor.WasFeatureAlreadyInstalled("OrchardCore.Twitter"))
-        {
-            ShellScope.AddDeferredTask(async scope =>
-            {
-                var session = scope.ServiceProvider.GetRequiredService<ISession>();
-                var dbConnectionAccessor = scope.ServiceProvider.GetService<IDbConnectionAccessor>();
-                var logger = scope.ServiceProvider.GetService<ILogger<TwitterMigrations>>();
-                var tablePrefix = session.Store.Configuration.TablePrefix;
-                var documentTableName = session.Store.Configuration.TableNameConvention.GetDocumentTable();
-                var table = $"{session.Store.Configuration.TablePrefix}{documentTableName}";
-
-                logger.LogDebug("Updating Twitter/X Workflow Items");
-
-                await using var connection = dbConnectionAccessor.CreateConnection();
-                await connection.OpenAsync();
-                await using var transaction = await connection.BeginTransactionAsync(session.Store.Configuration.IsolationLevel);
-                var dialect = session.Store.Configuration.SqlDialect;
-
-                try
-                {
-                    var quotedTableName = dialect.QuoteForTableName(table, session.Store.Configuration.Schema);
-                    var quotedContentColumnName = dialect.QuoteForColumnName("Content");
-                    var quotedTypeColumnName = dialect.QuoteForColumnName("Type");
-
-                    var updateCmd = $"UPDATE {quotedTableName} SET {quotedContentColumnName} = REPLACE({quotedContentColumnName}, 'UpdateTwitterStatusTask', 'UpdateXStatusTask') WHERE {quotedTypeColumnName} = 'OrchardCore.Workflows.Models.WorkflowType, OrchardCore.Workflows.Abstractions'";
-
-                    await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
-
-                    await transaction.CommitAsync();
-                }
-                catch (Exception e)
-                {
-                    await transaction.RollbackAsync();
-                    logger.LogError(e, "An error occurred while updating Twitter/X Workflow Items");
-
-                    throw;
-                }
-            });
-        }
-
-        return 1;
-    }
-}
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterToXMigrations.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterToXMigrations.cs
new file mode 100644
index 00000000000..216671e2fb2
--- /dev/null
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterToXMigrations.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Threading.Tasks;
+using Dapper;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using OrchardCore.Data;
+using OrchardCore.Data.Migration;
+using OrchardCore.Environment.Shell;
+using OrchardCore.Environment.Shell.Descriptor.Models;
+using OrchardCore.Environment.Shell.Scope;
+using YesSql;
+
+namespace OrchardCore.Twitter.Migrations;
+
+public sealed class TwitterToXMigrations : DataMigration
+{
+    private readonly IDbConnectionAccessor _dbAccessor;
+    private readonly IStore _store;
+    private readonly ILogger<TwitterToXMigrations> _logger;
+    private readonly string _tablePrefix;
+
+    public TwitterToXMigrations(IDbConnectionAccessor dbAccessor, IStore store, ILogger<TwitterToXMigrations> logger, ShellSettings settings)
+    {
+        _dbAccessor = dbAccessor;
+        _store = store;
+        _logger = logger;
+        _tablePrefix = settings["TablePrefix"];
+    }
+
+    public async Task<int> CreateAsync()
+    {
+        await using (var connection = _dbAccessor.CreateConnection())
+        {
+            await connection.OpenAsync();
+
+            using (var transaction = await connection.BeginTransactionAsync())
+            {
+                _logger.LogDebug("Updating X (Twitter) Workflow Items");
+                try
+                {
+                    var dialect = _store.Configuration.SqlDialect;
+                    var documentTableName = _store.Configuration.TableNameConvention.GetDocumentTable();
+
+                    var table = dialect.QuoteForTableName($"{_tablePrefix}{documentTableName}", _store.Configuration.Schema);
+                    var contentColumn = dialect.QuoteForColumnName("Content");
+                    var typeColumn = dialect.QuoteForColumnName("Type");
+
+                    var updateCmd = $"UPDATE {table} SET {contentColumn} = REPLACE({contentColumn}, 'UpdateTwitterStatusTask', 'UpdateXTwitterStatusTask') WHERE {typeColumn} = 'OrchardCore.Workflows.Models.WorkflowType, OrchardCore.Workflows.Abstractions'";
+
+                    await connection.ExecuteAsync(updateCmd, null, transaction);
+
+                    await transaction.CommitAsync();
+
+                    _logger.LogDebug("Updated X (Twitter) Workflow Items");
+                }
+                catch (Exception e)
+                {
+                    await transaction.RollbackAsync();
+                    _logger.LogError(e, "An error occurred while updating X (Twitter) Workflow Items");
+
+                    throw;
+                }
+            }
+        }
+
+        return 1;
+    }
+}
+
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Services/TwitterSettingsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Services/TwitterSettingsConfiguration.cs
index e04bbfc0054..b53c6e5b276 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Services/TwitterSettingsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Services/TwitterSettingsConfiguration.cs
@@ -47,7 +47,7 @@ private async Task<TwitterSettings> GetTwitterSettingsAsync()
         {
             if (_shellSettings.IsRunning())
             {
-                _logger.LogWarning("Twitter is not correctly configured.");
+                _logger.LogWarning("X (Twitter) is not correctly configured.");
             }
 
             return null;
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Configuration/TwitterOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Configuration/TwitterOptionsConfiguration.cs
index ddedec3c1da..c6bc0eb2027 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Configuration/TwitterOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Configuration/TwitterOptionsConfiguration.cs
@@ -62,14 +62,14 @@ public void Configure(AuthenticationOptions options)
         if (string.IsNullOrWhiteSpace(settings.Item1.ConsumerKey) ||
             string.IsNullOrWhiteSpace(settings.Item1.ConsumerSecret))
         {
-            _logger.LogWarning("The Twitter login provider is enabled but not configured.");
+            _logger.LogWarning("The X (Twitter) login provider is enabled but not configured.");
 
             return;
         }
 
         options.AddScheme(TwitterDefaults.AuthenticationScheme, builder =>
         {
-            builder.DisplayName = "Twitter";
+            builder.DisplayName = "X (Twitter)";
             builder.HandlerType = typeof(TwitterHandler);
         });
     }
@@ -94,7 +94,7 @@ public void Configure(string name, TwitterOptions options)
         }
         catch
         {
-            _logger.LogError("The Twitter Consumer Secret could not be decrypted. It may have been encrypted using a different key.");
+            _logger.LogError("The X (Twitter) Consumer Secret could not be decrypted. It may have been encrypted using a different key.");
         }
 
         if (settings.Item2.CallbackPath.HasValue)
@@ -117,7 +117,7 @@ private async Task<Tuple<TwitterSettings, TwitterSigninSettings>> GetSettingsAsy
         {
             if (_shellSettings.IsRunning())
             {
-                _logger.LogWarning("Integration with Twitter is not correctly configured.");
+                _logger.LogWarning("Integration with X (Twitter) is not correctly configured.");
             }
 
             return null;
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs
index 8bb17d0ff62..a7693364b0b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs
@@ -62,7 +62,7 @@ public override void ConfigureServices(IServiceCollection services)
                     }
                 })
             );
-        services.AddDataMigration<TwitterMigrations>();
+        services.AddDataMigration<TwitterToXMigrations>();
     }
 }
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Design.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXTwitterStatusTask.Fields.Design.cshtml
similarity index 61%
rename from src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Design.cshtml
rename to src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXTwitterStatusTask.Fields.Design.cshtml
index 746cc079599..43f17668158 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Design.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXTwitterStatusTask.Fields.Design.cshtml
@@ -2,8 +2,8 @@
 @using OrchardCore.Workflows.ViewModels
 @using OrchardCore.Twitter.Workflows.Activities
 
-@model ActivityViewModel<UpdateXStatusTask>
+@model ActivityViewModel<UpdateXTwitterStatusTask>
 
 <header>
-    <h4><i class="fa-brands fa-x-twitter" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Update X Status"])</h4>
+    <h4><i class="fa-brands fa-x-twitter" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Update X (Twitter) Status"])</h4>
 </header>
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXTwitterStatusTask.Fields.Edit.cshtml
similarity index 90%
rename from src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Edit.cshtml
rename to src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXTwitterStatusTask.Fields.Edit.cshtml
index 88126bb1d84..aac0c9ddfad 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXTwitterStatusTask.Fields.Edit.cshtml
@@ -3,7 +3,7 @@
 @model UpdateTwitterStatusTaskViewModel
 
 <div class="mb-3" asp-validation-class-for="StatusTemplate">
-    <label asp-for="StatusTemplate" class="form-label">@T["Template for updating twitter status"]</label>
+    <label asp-for="StatusTemplate" class="form-label">@T["Template for updating X (Twitter) status"]</label>
     <input type="text" asp-for="StatusTemplate" class="form-control code" />
     <span asp-validation-for="StatusTemplate"></span>
     <span class="hint">@T["The status text of the post."]</span>
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Thumbnail.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXTwitterStatusTask.Fields.Thumbnail.cshtml
similarity index 63%
rename from src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Thumbnail.cshtml
rename to src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXTwitterStatusTask.Fields.Thumbnail.cshtml
index d61af88ad37..cdeef93a38b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Thumbnail.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXTwitterStatusTask.Fields.Thumbnail.cshtml
@@ -1,2 +1,2 @@
-<h4 class="card-title"><i class="fa-brands fa-x-twitter" aria-hidden="true"></i>@T["Update X Status"]</h4>
+<h4 class="card-title"><i class="fa-brands fa-x-twitter" aria-hidden="true"></i>@T["Update X (Twitter) Status"]</h4>
 <p>@T["Create a post"]</p>
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/NavigationItemText-x.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/NavigationItemText-x.Id.cshtml
index 34bcc9e92da..f343d0a4bb5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/NavigationItemText-x.Id.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/NavigationItemText-x.Id.cshtml
@@ -1 +1 @@
-<span class="icon"><i class="fa-brands fa-x-twitter" aria-hidden="true"></i></span><span class="title">@T["X"]</span>
+<span class="icon"><i class="fa-brands fa-x-twitter" aria-hidden="true"></i></span><span class="title">@T["X (Twitter)"]</span>
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSettings.Edit.cshtml
index 5793b1707f0..bd838e99263 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSettings.Edit.cshtml
@@ -11,14 +11,14 @@
     <p class="alert alert-danger">@T["An error occurred while decrypting a setting. Please apply and save."]</p>
 }
 
-<h3>@T["X Integration Settings"]</h3>
+<h3>@T["X (Twitter) Integration Settings"]</h3>
 
 <div class="mb-3 row" asp-validation-class-for="APIKey">
     <div class="col-large col-12 col-sm-12 col-md-12 col-lg-12 col-xl-9">
         <label asp-for="APIKey" class="form-label">@T["API key"]</label>
         <input asp-for="APIKey" class="form-control" autocomplete="off" />
         <span asp-validation-for="APIKey"></span>
-        <span class="hint">@T["The API key defined in the Keys and tokens tab of twitter app dashboard."]</span>
+        <span class="hint">@T["The API key defined in the Keys and tokens tab of X (Twitter) app dashboard."]</span>
     </div>
 </div>
 
@@ -27,7 +27,7 @@
         <label asp-for="APISecretKey" class="form-label">@T["API secret key"]</label>
         <input asp-for="APISecretKey" class="form-control" type="password" value="@Model.APISecretKey" autocomplete="off" />
         <span asp-validation-for="APISecretKey"></span>
-        <span class="hint">@T["The API secret defined in the Keys and tokens tab of twitter app dashboard."]</span>
+        <span class="hint">@T["The API secret defined in the Keys and tokens tab of X (Twitter) app dashboard."]</span>
     </div>
 </div>
 
@@ -36,7 +36,7 @@
         <label asp-for="AccessToken" class="form-label">@T["Access Token"]</label>
         <input asp-for="AccessToken" class="form-control" autocomplete="off" />
         <span asp-validation-for="AccessToken"></span>
-        <span class="hint">@T["The Access Token defined in the Keys and tokens tab of twitter app dashboard."]</span>
+        <span class="hint">@T["The Access Token defined in the Keys and tokens tab of X (Twitter) app dashboard."]</span>
     </div>
 </div>
 
@@ -45,6 +45,6 @@
         <label asp-for="AccessTokenSecret" class="form-label">@T["Access Token Secret"]</label>
         <input asp-for="AccessTokenSecret" class="form-control" type="password" value="@Model.AccessTokenSecret" autocomplete="off" />
         <span asp-validation-for="AccessTokenSecret"></span>
-        <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of twitter app dashboard."]</span>
+        <span class="hint">@T["The Access Token Secret in the Keys and tokens tab of X (Twitter) app dashboard."]</span>
     </div>
 </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSigninSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSigninSettings.Edit.cshtml
index 8eb987c506d..398bd83787f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSigninSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSigninSettings.Edit.cshtml
@@ -6,7 +6,7 @@
     <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#sign-in-with-x" target="_blank">@T["See documentation"]</a>
 </p>
 
-<h3>@T["Sign in with X Settings"]</h3>
+<h3>@T["Sign in with X (Twitter) Settings"]</h3>
 
 <div class="mb-3 row" asp-validation-class-for="CallbackPath">
     <div class="col-large col-12 col-sm-12 col-md-12 col-lg-12 col-xl-9">
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateXStatusTask.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateXTwitterStatusTask.cs
similarity index 88%
rename from src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateXStatusTask.cs
rename to src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateXTwitterStatusTask.cs
index ea6a21222cc..aed3f8171ab 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateXStatusTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateXTwitterStatusTask.cs
@@ -9,16 +9,16 @@
 
 namespace OrchardCore.Twitter.Workflows.Activities;
 
-public class UpdateXStatusTask : TaskActivity<UpdateXStatusTask>
+public class UpdateXTwitterStatusTask : TaskActivity<UpdateXTwitterStatusTask>
 {
     private readonly TwitterClient _twitterClient;
     private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
     protected readonly IStringLocalizer S;
 
-    public UpdateXStatusTask(
+    public UpdateXTwitterStatusTask(
         TwitterClient twitterClient,
         IWorkflowExpressionEvaluator expressionEvaluator,
-        IStringLocalizer<UpdateXStatusTask> localizer
+        IStringLocalizer<UpdateXTwitterStatusTask> localizer
         )
     {
         _twitterClient = twitterClient;
@@ -26,7 +26,7 @@ IStringLocalizer<UpdateXStatusTask> localizer
         S = localizer;
     }
 
-    public override LocalizedString DisplayText => S["Update X Status Task"];
+    public override LocalizedString DisplayText => S["Update X (Twitter) Status Task"];
 
     // The category to which this activity belongs. The activity picker groups activities by this category.
     public override LocalizedString Category => S["Social"];
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Drivers/UpdateTwitterStatusTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Drivers/UpdateTwitterStatusTaskDisplayDriver.cs
index 248afa82260..58ba79333c6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Drivers/UpdateTwitterStatusTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Drivers/UpdateTwitterStatusTaskDisplayDriver.cs
@@ -5,14 +5,14 @@
 
 namespace OrchardCore.Twitter.Workflows.Drivers;
 
-public sealed class UpdateTwitterStatusTaskDisplayDriver : ActivityDisplayDriver<UpdateXStatusTask, UpdateTwitterStatusTaskViewModel>
+public sealed class UpdateTwitterStatusTaskDisplayDriver : ActivityDisplayDriver<UpdateXTwitterStatusTask, UpdateTwitterStatusTaskViewModel>
 {
-    protected override void EditActivity(UpdateXStatusTask activity, UpdateTwitterStatusTaskViewModel model)
+    protected override void EditActivity(UpdateXTwitterStatusTask activity, UpdateTwitterStatusTaskViewModel model)
     {
         model.StatusTemplate = activity.StatusTemplate.Expression;
     }
 
-    protected override void UpdateActivity(UpdateTwitterStatusTaskViewModel model, UpdateXStatusTask activity)
+    protected override void UpdateActivity(UpdateTwitterStatusTaskViewModel model, UpdateXTwitterStatusTask activity)
     {
         activity.StatusTemplate = new WorkflowExpression<string>(model.StatusTemplate);
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
index 84df846e6b5..a5c1bbd186e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
@@ -13,6 +13,6 @@ public sealed class Startup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddActivity<UpdateXStatusTask, UpdateTwitterStatusTaskDisplayDriver>();
+        services.AddActivity<UpdateXTwitterStatusTask, UpdateTwitterStatusTaskDisplayDriver>();
     }
 }

From 2916586efd3230a9200a4dedf9d3d93e252f969b Mon Sep 17 00:00:00 2001
From: David Puplava <dpuplava@lavatg.com>
Date: Thu, 15 Aug 2024 22:56:10 -0500
Subject: [PATCH 07/13] Simplify using expressions for database operations

---
 .../Migrations/TwitterToXMigrations.cs        | 48 +++++++++----------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterToXMigrations.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterToXMigrations.cs
index 216671e2fb2..6627c5c7540 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterToXMigrations.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterToXMigrations.cs
@@ -29,38 +29,36 @@ public TwitterToXMigrations(IDbConnectionAccessor dbAccessor, IStore store, ILog
 
     public async Task<int> CreateAsync()
     {
-        await using (var connection = _dbAccessor.CreateConnection())
-        {
-            await connection.OpenAsync();
+        await using var connection = _dbAccessor.CreateConnection();
+        await connection.OpenAsync();
+
+        using var transaction = await connection.BeginTransactionAsync();
+
+        _logger.LogDebug("Updating X (Twitter) Workflow Items");
 
-            using (var transaction = await connection.BeginTransactionAsync())
-            {
-                _logger.LogDebug("Updating X (Twitter) Workflow Items");
-                try
-                {
-                    var dialect = _store.Configuration.SqlDialect;
-                    var documentTableName = _store.Configuration.TableNameConvention.GetDocumentTable();
+        try
+        {
+            var dialect = _store.Configuration.SqlDialect;
+            var documentTableName = _store.Configuration.TableNameConvention.GetDocumentTable();
 
-                    var table = dialect.QuoteForTableName($"{_tablePrefix}{documentTableName}", _store.Configuration.Schema);
-                    var contentColumn = dialect.QuoteForColumnName("Content");
-                    var typeColumn = dialect.QuoteForColumnName("Type");
+            var table = dialect.QuoteForTableName($"{_tablePrefix}{documentTableName}", _store.Configuration.Schema);
+            var contentColumn = dialect.QuoteForColumnName("Content");
+            var typeColumn = dialect.QuoteForColumnName("Type");
 
-                    var updateCmd = $"UPDATE {table} SET {contentColumn} = REPLACE({contentColumn}, 'UpdateTwitterStatusTask', 'UpdateXTwitterStatusTask') WHERE {typeColumn} = 'OrchardCore.Workflows.Models.WorkflowType, OrchardCore.Workflows.Abstractions'";
+            var updateCmd = $"UPDATE {table} SET {contentColumn} = REPLACE({contentColumn}, 'UpdateTwitterStatusTask', 'UpdateXTwitterStatusTask') WHERE {typeColumn} = 'OrchardCore.Workflows.Models.WorkflowType, OrchardCore.Workflows.Abstractions'";
 
-                    await connection.ExecuteAsync(updateCmd, null, transaction);
+            await connection.ExecuteAsync(updateCmd, null, transaction);
 
-                    await transaction.CommitAsync();
+            await transaction.CommitAsync();
 
-                    _logger.LogDebug("Updated X (Twitter) Workflow Items");
-                }
-                catch (Exception e)
-                {
-                    await transaction.RollbackAsync();
-                    _logger.LogError(e, "An error occurred while updating X (Twitter) Workflow Items");
+            _logger.LogDebug("Updated X (Twitter) Workflow Items");
+        }
+        catch (Exception e)
+        {
+            await transaction.RollbackAsync();
+            _logger.LogError(e, "An error occurred while updating X (Twitter) Workflow Items");
 
-                    throw;
-                }
-            }
+            throw;
         }
 
         return 1;

From ba890432789c18655b38f10683965baa05a85765 Mon Sep 17 00:00:00 2001
From: David Puplava <dpuplava@lavatg.com>
Date: Sat, 17 Aug 2024 15:10:43 -0500
Subject: [PATCH 08/13] Rename types/classes/ids back to before X/Twitter
 rebrand; removed migration since workflow task is no longer changed

---
 .../OrchardCore.Twitter/AdminMenuSignin.cs    | 10 +--
 .../OrchardCore.Twitter/Manifest.cs           | 10 +--
 .../Migrations/TwitterToXMigrations.cs        | 67 -------------------
 .../OrchardCore.Twitter/Permissions.cs        |  4 +-
 .../OrchardCore.Twitter/Startup.cs            |  2 -
 ...ateTwitterStatusTask.Fields.Design.cshtml} |  2 +-
 ...pdateTwitterStatusTask.Fields.Edit.cshtml} |  0
 ...TwitterStatusTask.Fields.Thumbnail.cshtml} |  0
 ...l => NavigationItemText-twitter.Id.cshtml} |  0
 ...atusTask.cs => UpdateTwitterStatusTask.cs} |  6 +-
 .../UpdateTwitterStatusTaskDisplayDriver.cs   |  6 +-
 .../OrchardCore.Twitter/Workflows/Startup.cs  |  3 +-
 12 files changed, 20 insertions(+), 90 deletions(-)
 delete mode 100644 src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterToXMigrations.cs
 rename src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/{UpdateXTwitterStatusTask.Fields.Design.cshtml => UpdateTwitterStatusTask.Fields.Design.cshtml} (84%)
 rename src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/{UpdateXTwitterStatusTask.Fields.Edit.cshtml => UpdateTwitterStatusTask.Fields.Edit.cshtml} (100%)
 rename src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/{UpdateXTwitterStatusTask.Fields.Thumbnail.cshtml => UpdateTwitterStatusTask.Fields.Thumbnail.cshtml} (100%)
 rename src/OrchardCore.Modules/OrchardCore.Twitter/Views/{NavigationItemText-x.Id.cshtml => NavigationItemText-twitter.Id.cshtml} (100%)
 rename src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/{UpdateXTwitterStatusTask.cs => UpdateTwitterStatusTask.cs} (92%)

diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs
index 4b901c40c86..1add9f36949 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs
@@ -29,9 +29,9 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
         builder
             .Add(S["Security"], security => security
                 .Add(S["Authentication"], authentication => authentication
-                .Add(S["Sign in with X"], S["Sign in with X"].PrefixPosition(), x => x
-                    .AddClass("x")
-                    .Id("x")
+                .Add(S["Sign in with X (Twitter)"], S["Sign in with X (Twitter)"].PrefixPosition(), twitter => twitter
+                    .AddClass("twitter")
+                    .Id("twitter")
                     .Action("Index", "Admin", _routeValues)
                     .Permission(Permissions.ManageTwitterSignin)
                     .LocalNav())
@@ -67,8 +67,8 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
         builder
             .Add(S["Configuration"], configuration => configuration
                 .Add(S["Settings"], settings => settings
-                    .Add(S["X"], S["X"].PrefixPosition(), twitter => twitter
-                        .AddClass("x").Id("x")
+                    .Add(S["X (Twitter)"], S["X (Twitter)"].PrefixPosition(), twitter => twitter
+                        .AddClass("twitter").Id("twitter")
                         .Action("Index", "Admin", _routeValues)
                         .Permission(Permissions.ManageTwitter)
                         .LocalNav()
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Manifest.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Manifest.cs
index 4b6859ee54d..338b41b6184 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Manifest.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Manifest.cs
@@ -6,20 +6,20 @@
     Author = ManifestConstants.OrchardCoreTeam,
     Website = ManifestConstants.OrchardCoreWebsite,
     Version = ManifestConstants.OrchardCoreVersion,
-    Category = "X"
+    Category = "X (Twitter)"
 )]
 
 [assembly: Feature(
     Id = TwitterConstants.Features.Twitter,
     Name = "X (Twitter) Integration",
-    Category = "X",
-    Description = "Provides a TwitterClient and Workflow Activities to integrate with X"
+    Category = "X (Twitter)",
+    Description = "Provides a TwitterClient and Workflow Activities to integrate with X (Twitter)"
 )]
 
 [assembly: Feature(
     Id = TwitterConstants.Features.Signin,
     Name = "Sign in with X (Twitter)",
-    Category = "X",
-    Description = "Authenticates users with their X Account.",
+    Category = "X (Twitter)",
+    Description = "Authenticates users with their X (Twitter) Account.",
     Dependencies = [TwitterConstants.Features.Twitter]
 )]
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterToXMigrations.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterToXMigrations.cs
deleted file mode 100644
index 6627c5c7540..00000000000
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Migrations/TwitterToXMigrations.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Dapper;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using OrchardCore.Data;
-using OrchardCore.Data.Migration;
-using OrchardCore.Environment.Shell;
-using OrchardCore.Environment.Shell.Descriptor.Models;
-using OrchardCore.Environment.Shell.Scope;
-using YesSql;
-
-namespace OrchardCore.Twitter.Migrations;
-
-public sealed class TwitterToXMigrations : DataMigration
-{
-    private readonly IDbConnectionAccessor _dbAccessor;
-    private readonly IStore _store;
-    private readonly ILogger<TwitterToXMigrations> _logger;
-    private readonly string _tablePrefix;
-
-    public TwitterToXMigrations(IDbConnectionAccessor dbAccessor, IStore store, ILogger<TwitterToXMigrations> logger, ShellSettings settings)
-    {
-        _dbAccessor = dbAccessor;
-        _store = store;
-        _logger = logger;
-        _tablePrefix = settings["TablePrefix"];
-    }
-
-    public async Task<int> CreateAsync()
-    {
-        await using var connection = _dbAccessor.CreateConnection();
-        await connection.OpenAsync();
-
-        using var transaction = await connection.BeginTransactionAsync();
-
-        _logger.LogDebug("Updating X (Twitter) Workflow Items");
-
-        try
-        {
-            var dialect = _store.Configuration.SqlDialect;
-            var documentTableName = _store.Configuration.TableNameConvention.GetDocumentTable();
-
-            var table = dialect.QuoteForTableName($"{_tablePrefix}{documentTableName}", _store.Configuration.Schema);
-            var contentColumn = dialect.QuoteForColumnName("Content");
-            var typeColumn = dialect.QuoteForColumnName("Type");
-
-            var updateCmd = $"UPDATE {table} SET {contentColumn} = REPLACE({contentColumn}, 'UpdateTwitterStatusTask', 'UpdateXTwitterStatusTask') WHERE {typeColumn} = 'OrchardCore.Workflows.Models.WorkflowType, OrchardCore.Workflows.Abstractions'";
-
-            await connection.ExecuteAsync(updateCmd, null, transaction);
-
-            await transaction.CommitAsync();
-
-            _logger.LogDebug("Updated X (Twitter) Workflow Items");
-        }
-        catch (Exception e)
-        {
-            await transaction.RollbackAsync();
-            _logger.LogError(e, "An error occurred while updating X (Twitter) Workflow Items");
-
-            throw;
-        }
-
-        return 1;
-    }
-}
-
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Permissions.cs
index 3cb9d30bee5..3a746b6266f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Permissions.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Permissions.cs
@@ -4,9 +4,9 @@ namespace OrchardCore.Twitter;
 
 public sealed class Permissions : IPermissionProvider
 {
-    public static readonly Permission ManageTwitter = new("ManageTwitter", "Manage Twitter settings");
+    public static readonly Permission ManageTwitter = new("ManageTwitter", "Manage X (Twitter) settings");
 
-    public static readonly Permission ManageTwitterSignin = new("ManageTwitterSignin", "Manage Sign in with Twitter settings");
+    public static readonly Permission ManageTwitterSignin = new("ManageTwitterSignin", "Manage Sign in with X (Twitter) settings");
 
     private readonly IEnumerable<Permission> _allPermissions =
     [
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs
index 84c469e3b1e..08a04506541 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs
@@ -12,7 +12,6 @@
 using OrchardCore.Security.Permissions;
 using OrchardCore.Settings;
 using OrchardCore.Twitter.Drivers;
-using OrchardCore.Twitter.Migrations;
 using OrchardCore.Twitter.Recipes;
 using OrchardCore.Twitter.Services;
 using OrchardCore.Twitter.Settings;
@@ -60,7 +59,6 @@ public override void ConfigureServices(IServiceCollection services)
                     }
                 })
             );
-        services.AddDataMigration<TwitterToXMigrations>();
     }
 }
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXTwitterStatusTask.Fields.Design.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Design.cshtml
similarity index 84%
rename from src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXTwitterStatusTask.Fields.Design.cshtml
rename to src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Design.cshtml
index 43f17668158..a615694bcbb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXTwitterStatusTask.Fields.Design.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Design.cshtml
@@ -2,7 +2,7 @@
 @using OrchardCore.Workflows.ViewModels
 @using OrchardCore.Twitter.Workflows.Activities
 
-@model ActivityViewModel<UpdateXTwitterStatusTask>
+@model ActivityViewModel<UpdateTwitterStatusTask>
 
 <header>
     <h4><i class="fa-brands fa-x-twitter" aria-hidden="true"></i>@Model.Activity.GetTitleOrDefault(() => T["Update X (Twitter) Status"])</h4>
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXTwitterStatusTask.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Edit.cshtml
similarity index 100%
rename from src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXTwitterStatusTask.Fields.Edit.cshtml
rename to src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Edit.cshtml
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXTwitterStatusTask.Fields.Thumbnail.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Thumbnail.cshtml
similarity index 100%
rename from src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXTwitterStatusTask.Fields.Thumbnail.cshtml
rename to src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Thumbnail.cshtml
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/NavigationItemText-x.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/NavigationItemText-twitter.Id.cshtml
similarity index 100%
rename from src/OrchardCore.Modules/OrchardCore.Twitter/Views/NavigationItemText-x.Id.cshtml
rename to src/OrchardCore.Modules/OrchardCore.Twitter/Views/NavigationItemText-twitter.Id.cshtml
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateXTwitterStatusTask.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateTwitterStatusTask.cs
similarity index 92%
rename from src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateXTwitterStatusTask.cs
rename to src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateTwitterStatusTask.cs
index a1139fc49af..429223c56e8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateXTwitterStatusTask.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Activities/UpdateTwitterStatusTask.cs
@@ -7,16 +7,16 @@
 
 namespace OrchardCore.Twitter.Workflows.Activities;
 
-public class UpdateXTwitterStatusTask : TaskActivity<UpdateXTwitterStatusTask>
+public class UpdateTwitterStatusTask : TaskActivity<UpdateTwitterStatusTask>
 {
     private readonly TwitterClient _twitterClient;
     private readonly IWorkflowExpressionEvaluator _expressionEvaluator;
     protected readonly IStringLocalizer S;
 
-    public UpdateXTwitterStatusTask(
+    public UpdateTwitterStatusTask(
         TwitterClient twitterClient,
         IWorkflowExpressionEvaluator expressionEvaluator,
-        IStringLocalizer<UpdateXTwitterStatusTask> localizer
+        IStringLocalizer<UpdateTwitterStatusTask> localizer
         )
     {
         _twitterClient = twitterClient;
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Drivers/UpdateTwitterStatusTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Drivers/UpdateTwitterStatusTaskDisplayDriver.cs
index 58ba79333c6..2f6c8a7729f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Drivers/UpdateTwitterStatusTaskDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Drivers/UpdateTwitterStatusTaskDisplayDriver.cs
@@ -5,14 +5,14 @@
 
 namespace OrchardCore.Twitter.Workflows.Drivers;
 
-public sealed class UpdateTwitterStatusTaskDisplayDriver : ActivityDisplayDriver<UpdateXTwitterStatusTask, UpdateTwitterStatusTaskViewModel>
+public sealed class UpdateTwitterStatusTaskDisplayDriver : ActivityDisplayDriver<UpdateTwitterStatusTask, UpdateTwitterStatusTaskViewModel>
 {
-    protected override void EditActivity(UpdateXTwitterStatusTask activity, UpdateTwitterStatusTaskViewModel model)
+    protected override void EditActivity(UpdateTwitterStatusTask activity, UpdateTwitterStatusTaskViewModel model)
     {
         model.StatusTemplate = activity.StatusTemplate.Expression;
     }
 
-    protected override void UpdateActivity(UpdateTwitterStatusTaskViewModel model, UpdateXTwitterStatusTask activity)
+    protected override void UpdateActivity(UpdateTwitterStatusTaskViewModel model, UpdateTwitterStatusTask activity)
     {
         activity.StatusTemplate = new WorkflowExpression<string>(model.StatusTemplate);
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
index a5c1bbd186e..c1494c60907 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Data.Migration;
 using OrchardCore.Modules;
-using OrchardCore.Twitter.Migrations;
 using OrchardCore.Twitter.Workflows.Activities;
 using OrchardCore.Twitter.Workflows.Drivers;
 using OrchardCore.Workflows.Helpers;
@@ -13,6 +12,6 @@ public sealed class Startup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddActivity<UpdateXTwitterStatusTask, UpdateTwitterStatusTaskDisplayDriver>();
+        services.AddActivity<UpdateTwitterStatusTask, UpdateTwitterStatusTaskDisplayDriver>();
     }
 }

From e1679a4919938c1d5b8704fba2a7b7d293407990 Mon Sep 17 00:00:00 2001
From: David Puplava <dpuplava@lavatg.com>
Date: Mon, 19 Aug 2024 08:40:35 -0500
Subject: [PATCH 09/13] Update X/Twitter documentation links in Admin UI

---
 .../OrchardCore.Twitter/Views/TwitterSettings.Edit.cshtml       | 2 +-
 .../OrchardCore.Twitter/Views/TwitterSigninSettings.Edit.cshtml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSettings.Edit.cshtml
index bd838e99263..80a7e758298 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSettings.Edit.cshtml
@@ -3,7 +3,7 @@
 
 <p class="alert alert-warning" role="alert">
     @T["The website might be restarted upon saving the settings, potentially leading to temporary unresponsiveness during the process."]
-    <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#twitter-integration" target="_blank">@T["See documentation"]</a>
+    <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/X/#-xtwitter-integration" target="_blank">@T["See documentation"]</a>
 </p>
 
 @if (Model.HasDecryptionError)
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSigninSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSigninSettings.Edit.cshtml
index 398bd83787f..5df8f72ef02 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSigninSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSigninSettings.Edit.cshtml
@@ -3,7 +3,7 @@
 
 <p class="alert alert-warning" role="alert">
     @T["The website might be restarted upon saving the settings, potentially leading to temporary unresponsiveness during the process."]
-    <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/Twitter/#sign-in-with-x" target="_blank">@T["See documentation"]</a>
+    <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/X/#sign-in-with-x-twitter" target="_blank">@T["See documentation"]</a>
 </p>
 
 <h3>@T["Sign in with X (Twitter) Settings"]</h3>

From 14e60dc062be2f292a39073c36e1083e9d67b652 Mon Sep 17 00:00:00 2001
From: David Puplava <dpuplava@lavatg.com>
Date: Mon, 19 Aug 2024 21:48:23 -0500
Subject: [PATCH 10/13] Remove reference to YesSql project previously added
 when Migration existed to update workflow task names in Documents table

---
 .../OrchardCore.Twitter/OrchardCore.Twitter.csproj               | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/OrchardCore.Twitter.csproj b/src/OrchardCore.Modules/OrchardCore.Twitter/OrchardCore.Twitter.csproj
index 4a3f0c8417e..e5ae7e3dc0b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/OrchardCore.Twitter.csproj
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/OrchardCore.Twitter.csproj
@@ -20,7 +20,6 @@
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Admin.Abstractions\OrchardCore.Admin.Abstractions.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.ContentManagement.Abstractions\OrchardCore.ContentManagement.Abstractions.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Data.Abstractions\OrchardCore.Data.Abstractions.csproj" />
-    <ProjectReference Include="..\..\OrchardCore\OrchardCore.Data.YesSql\OrchardCore.Data.YesSql.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.DisplayManagement\OrchardCore.DisplayManagement.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Module.Targets\OrchardCore.Module.Targets.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Navigation.Core\OrchardCore.Navigation.Core.csproj" />

From c9cecb0947c285c2308e89b8e179973718500590 Mon Sep 17 00:00:00 2001
From: David Puplava <5144137+davidpuplava@users.noreply.github.com>
Date: Tue, 20 Aug 2024 16:19:21 -0500
Subject: [PATCH 11/13] Remove unused using statement
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Zoltán Lehóczky <zoltan.lehoczky@lombiq.com>
---
 src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
index c1494c60907..980a9d5b1a5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Workflows/Startup.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using OrchardCore.Data.Migration;
 using OrchardCore.Modules;
 using OrchardCore.Twitter.Workflows.Activities;
 using OrchardCore.Twitter.Workflows.Drivers;

From 84542b9259ccc2082e53c798be8cf8b47811eca6 Mon Sep 17 00:00:00 2001
From: David Puplava <5144137+davidpuplava@users.noreply.github.com>
Date: Tue, 20 Aug 2024 16:20:25 -0500
Subject: [PATCH 12/13] Fix typo in documentation link to X/Twitter integration
 docs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Zoltán Lehóczky <zoltan.lehoczky@lombiq.com>
---
 .../OrchardCore.Twitter/Views/TwitterSettings.Edit.cshtml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSettings.Edit.cshtml
index 80a7e758298..3530c701c9c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSettings.Edit.cshtml
@@ -3,7 +3,7 @@
 
 <p class="alert alert-warning" role="alert">
     @T["The website might be restarted upon saving the settings, potentially leading to temporary unresponsiveness during the process."]
-    <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/X/#-xtwitter-integration" target="_blank">@T["See documentation"]</a>
+    <a class="seedoc" href="@(OrchardCore.Admin.Constants.DocsUrl)reference/modules/X/#x-twitter-integration" target="_blank">@T["See documentation"]</a>
 </p>
 
 @if (Model.HasDecryptionError)

From a4504f3bbb56cbf58b83328e9eb6b630b13372e0 Mon Sep 17 00:00:00 2001
From: David Puplava <dpuplava@lavatg.com>
Date: Tue, 20 Aug 2024 16:33:13 -0500
Subject: [PATCH 13/13] Remove another unused using statement

---
 src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs
index 08a04506541..8c0fcfb076e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs
@@ -4,7 +4,6 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Http.Resilience;
 using Microsoft.Extensions.Options;
-using OrchardCore.Data.Migration;
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.Modules;
 using OrchardCore.Navigation;